diff --git a/Engine/Binaries/ThirdParty/AppLocalDependencies/WinDbg.tps b/Engine/Binaries/ThirdParty/AppLocalDependencies/WinDbg.tps
new file mode 100644
index 000000000000..5da1716a34d6
--- /dev/null
+++ b/Engine/Binaries/ThirdParty/AppLocalDependencies/WinDbg.tps
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1 (WinDbg)</Name>
+  <Location>Engine/Binaries/ThirdParty/AppLocalDependencies/Win64/DbgHelp/dbghelp.dll</Location>
+  <Function>Used for retrieving a callstack from a minidump.</Function>
+  <Eula>https://www.microsoft.com/en-us/download/details.aspx?id=3138</Eula>
+  <RedistributeTo>
+	<EndUserGroup>Licensees</EndUserGroup>
+    <EndUserGroup>Git</EndUserGroup>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>N/A</LicenseFolder>
+</TpsData>
\ No newline at end of file
diff --git a/Engine/Build/Android/Java/aar-imports-ant.txt b/Engine/Build/Android/Java/aar-imports-ant.txt
new file mode 100644
index 000000000000..93e43560a672
--- /dev/null
+++ b/Engine/Build/Android/Java/aar-imports-ant.txt
@@ -0,0 +1,6 @@
+repositories $(ANDROID_HOME)/extras
+repositories $(ENGINEDIR)/Source/ThirdParty/Android/extras
+com.google.android.gms,play-services-auth,11.0.4
+com.google.android.gms,play-services-games,11.0.4
+com.google.android.gms,play-services-nearby,11.0.4
+com.google.android.gms,play-services-plus,11.0.4
diff --git a/Engine/Build/Android/Java/aar-imports.txt b/Engine/Build/Android/Java/aar-imports.txt
index 93e43560a672..dd637110b367 100644
--- a/Engine/Build/Android/Java/aar-imports.txt
+++ b/Engine/Build/Android/Java/aar-imports.txt
@@ -1,6 +1,6 @@
 repositories $(ANDROID_HOME)/extras
 repositories $(ENGINEDIR)/Source/ThirdParty/Android/extras
-com.google.android.gms,play-services-auth,11.0.4
-com.google.android.gms,play-services-games,11.0.4
-com.google.android.gms,play-services-nearby,11.0.4
-com.google.android.gms,play-services-plus,11.0.4
+com.google.android.gms,play-services-auth,11.8.0
+com.google.android.gms,play-services-games,11.8.0
+com.google.android.gms,play-services-nearby,11.8.0
+com.google.android.gms,play-services-plus,11.8.0
diff --git a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
similarity index 89%
rename from Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java
rename to Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
index 45c55f37147f..c970f873e60d 100644
--- a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java
+++ b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
@@ -45,6 +45,7 @@ import android.text.TextWatcher;
 import android.view.inputmethod.EditorInfo;
 import android.content.ClipboardManager;
 import android.content.ClipData;
+import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -58,6 +59,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.FeatureInfo;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.content.pm.PackageInfo;
 
@@ -153,24 +155,35 @@ import android.content.BroadcastReceiver;
 public class GameActivity extends NativeActivity implements SurfaceHolder.Callback2,
 															GoogleApiClient.ConnectionCallbacks,
 															GoogleApiClient.OnConnectionFailedListener,
-															SensorEventListener
+															SensorEventListener,
+															ComponentCallbacks2
 {
+	private boolean bAllowIMU = true;
 	private SensorManager sensorManager;
 	private Sensor accelerometer;
 	private Sensor magnetometer;
 	private Sensor gyroscope;
+	static boolean first_acceleration_sample = true;
+	static final float SampleDecayRate = 0.85f;
 	
 	private final float[] rotationMatrix = new float[9];
 	private final float[] orientationAngles = new float[3];
 
-	static float[] last_accelerometer = new float[]{0, 0, 0};
-	static float[] last_magnetometer = new float[]{0, 0, 0};
-	// Buffered, historical, motion data.
-	static float[] last_tilt = new float[]{0, 0, 0};
-	static float[] last_gravity = new float[]{0, 0, 0};
+	static float[] current_accelerometer = new float[]{0, 0, 0};
+	static float[] current_gyroscope = new float[]{0, 0, 0};
+	static float[] current_magnetometer = new float[]{0, 0, 0};
+
+	static float[] filtered_gravity = new float[]{0, 0, 0};
+	static float[] last_gravity = new float[]{0, 0, 0};
+	static float[] last_tilt = new float[]{0, 0, 0};
+
+	// active motion state to return to application on request
+	boolean bSensorDataUpdated = false;
+	float[] current_tilt = new float[]{0, 0, 0};
+	static float[] current_rotation_rate = new float[]{0, 0, 0};
+	static float[] current_gravity = new float[]{0, 0, 0};
+	static float[] current_acceleration = new float[]{0, 0, 0};
 
-	static boolean first_acceleration_sample = true;
-	static final float SampleDecayRate = 0.85f;
 	public static Logger Log = new Logger("UE4");
 
 	// From cpufeatures.h AndroidCpuFamily enum
@@ -181,6 +194,15 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	private static final int ANDROID_CPU_FAMILY_ARM64 = 4;
 	private static final int ANDROID_CPU_FAMILY_X86_64 = 5;
 	private static final int ANDROID_CPU_FAMILY_MIPS64 = 6;
+
+	// For GetNetworkConnectionType
+	private static final int CONNECTION_TYPE_NONE = 0;
+	private static final int CONNECTION_TYPE_AIRPLANEMODE = 1;
+	private static final int CONNECTION_TYPE_ETHERNET = 2;
+	private static final int CONNECTION_TYPE_CELL = 3;
+	private static final int CONNECTION_TYPE_WIFI = 4;
+	private static final int CONNECTION_TYPE_WIMAX = 5;
+	private static final int CONNECTION_TYPE_BLUETOOTH = 6;
 	
 	public static final int DOWNLOAD_ACTIVITY_ID = 80001; // so we can identify the activity later
 	public static final int DOWNLOAD_NO_RETURN_CODE = 0; // we didn't get a return code - will need to log and debug as this shouldn't happen
@@ -195,9 +217,11 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	public static enum VirtualKeyboardCommand { VK_CMD_NONE, VK_CMD_SHOW, VK_CMD_HIDE };
 	public static VirtualKeyboardCommand lastVirtualKeyboardCommand = VirtualKeyboardCommand.VK_CMD_NONE;
 	public static final int lastVirtualKeyboardCommandDelay = 200;
+	public static final int checkLastVirtualKeyboardCommandDelay = 500;
 	
 	static GameActivity _activity;
 	static Bundle _bundle;
+	static Bundle _extrasBundle;
 
 	protected Dialog mSplashDialog;
 	private int noActionAnimID = -1;
@@ -422,18 +446,23 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 		magnetometer = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
 		gyroscope = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+
 		// create splashscreen dialog (if launched by SplashActivity)
-		Bundle intentBundle = getIntent().getExtras();
-		if (intentBundle != null)
+		_extrasBundle = getIntent().getExtras();
+		if (_extrasBundle != null)
 		{
-			ShouldHideUI = intentBundle.getString("ShouldHideUI") != null;
-			if (intentBundle.getString("UseSplashScreen") != null)
+			ShouldHideUI = _extrasBundle.getString("ShouldHideUI") != null;
+			if (_extrasBundle.getString("UseSplashScreen") != null)
 			{
 				try {
 					// try to get the splash theme (can't use R.style.UE4SplashTheme since we don't know the package name until runtime)
 					int SplashThemeId = getResources().getIdentifier("UE4SplashTheme", "style", getPackageName());
 					mSplashDialog = new Dialog(this, SplashThemeId);
 					mSplashDialog.setCancelable(false);
+
+					// Setting NOT_FOCUSABLE prevents the splash dialog from kicking some devices out of immersive mode.
+					mSplashDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+					
 					if (ShouldHideUI)
 					{
 						View decorView = mSplashDialog.getWindow().getDecorView(); 
@@ -762,6 +791,12 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
                 Log.debug( "bUseExternalFilesDir not found. Leaving as " + UseExternalFilesDir);
             }
 
+			if(bundle.containsKey("com.epicgames.ue4.GameActivity.bAllowIMU"))
+			{
+				bAllowIMU = bundle.getBoolean("com.epicgames.ue4.GameActivity.bAllowIMU");
+				Log.debug( "AllowIMU set to " + bAllowIMU);
+			}
+
 //$${gameActivityReadMetadataAdditions}$$
 		}
 		catch (NameNotFoundException e)
@@ -775,7 +810,7 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 
 		Log.debug("APK path: " + getPackageResourcePath());
 		Log.debug("OBB in APK: " + (PackageDataInsideApkValue==1));
-		nativeSetGlobalActivity(UseExternalFilesDir, PackageDataInsideApkValue==1, getPackageResourcePath());
+		nativeSetGlobalActivity(UseExternalFilesDir, getFilesDir().getPath(), getExternalFilesDir(null).getPath(), PackageDataInsideApkValue==1, getPackageResourcePath());
 
 		// tell the engine if this is a portrait app
 		nativeSetWindowInfo(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT, DepthBufferPreference);
@@ -784,10 +819,14 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		// note: this may need to be Locale.getDefault().getLanguage()
 		String Language = java.util.Locale.getDefault().toString();
 
+		boolean bDebuggerAttached = android.os.Debug.isDebuggerConnected();
+		nativeSetAndroidStartupState(bDebuggerAttached);
+
 		Log.debug( "Android version is " + android.os.Build.VERSION.RELEASE );
 		Log.debug( "Android manufacturer is " + android.os.Build.MANUFACTURER );
 		Log.debug( "Android model is " + android.os.Build.MODEL );
 		Log.debug( "OS language is set to " + Language );
+		Log.debug( "Debugger attached is " + bDebuggerAttached );
 
 		nativeSetAndroidVersionInformation( android.os.Build.VERSION.RELEASE, android.os.Build.MANUFACTURER, android.os.Build.MODEL, Language );
 
@@ -1188,9 +1227,23 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 			return;
 		}
 
-		sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
-		sensorManager.registerListener(this, magnetometer, SensorManager.SENSOR_DELAY_GAME);
-		sensorManager.registerListener(this, gyroscope, SensorManager.SENSOR_DELAY_GAME);
+		if (bAllowIMU)
+		{
+			Log.debug("Registering sensor listeners");
+			if (accelerometer != null)
+			{
+				sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+			}
+			if (magnetometer != null)
+			{
+				sensorManager.registerListener(this, magnetometer, SensorManager.SENSOR_DELAY_GAME);
+			}
+			if (gyroscope != null)
+			{
+				sensorManager.registerListener(this, gyroscope, SensorManager.SENSOR_DELAY_GAME);
+			}
+		}
+
 		// invalidate window cache
 		nativeSetWindowInfo(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT, DepthBufferPreference);
 		
@@ -1258,7 +1311,12 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	protected void onPause()
 	{
 		super.onPause();
-		sensorManager.unregisterListener(this);
+
+		if (bAllowIMU)
+		{
+			Log.debug("Unregistering sensor listeners");
+			sensorManager.unregisterListener(this);
+		}
 
 		// hide virtual keyboard before going into the background
 		if( bKeyboardShowing )
@@ -1297,127 +1355,99 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	@Override
 	public void onSensorChanged(SensorEvent event)
 	{
-		float[] current_accelerometer = new float[]{0, 0, 0};
-		float[] current_gyroscope = new float[]{0, 0, 0};
-		float[] current_magnetometer = new float[]{0, 0, 0};
-		int current_accelerometer_sample_count = 0;
-		int current_gyroscope_sample_count = 0;
-		int current_magnetometer_sample_count = 0;
-
-		if (accelerometer != null && magnetometer != null)
+		if (bAllowIMU && accelerometer != null && magnetometer != null)
 		{
+			boolean bUpdate = false;
+			boolean bGyroUpdate = false;
+
 			if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER)
 			{
-			  System.arraycopy(event.values, 0, current_accelerometer, 0, current_accelerometer.length);
-			  ++current_accelerometer_sample_count;
+				System.arraycopy(event.values, 0, current_accelerometer, 0, 3);
+				bUpdate = true;
+
+				// We use a low-pass filter to synthesize the gravity vector.
+				if (!first_acceleration_sample)
+				{
+					filtered_gravity[0] = last_gravity[0] * SampleDecayRate + current_accelerometer[0]*(1.0f - SampleDecayRate);
+					filtered_gravity[1] = last_gravity[1] * SampleDecayRate + current_accelerometer[1]*(1.0f - SampleDecayRate);
+					filtered_gravity[2] = last_gravity[2] * SampleDecayRate + current_accelerometer[2]*(1.0f - SampleDecayRate);
+				}
+				first_acceleration_sample = false;
+				last_gravity = filtered_gravity;
 			}
 			else if (event.sensor.getType() == Sensor.TYPE_MAGNETIC_FIELD)
 			{
-			  System.arraycopy(event.values, 0, current_magnetometer, 0, current_magnetometer.length);
-			  ++current_magnetometer_sample_count;
+				System.arraycopy(event.values, 0, current_magnetometer, 0, 3);
+				bUpdate = true;
 			}
 			else if (event.sensor.getType() == Sensor.TYPE_GYROSCOPE)
 			{
-			  System.arraycopy(event.values, 0, current_gyroscope, 0, current_gyroscope.length);
-			  ++current_gyroscope_sample_count;
-			}
-
-			if (current_accelerometer_sample_count > 0)
-			{
-				// Do simple average of the samples we just got.
-				for(int i = 0; i < current_accelerometer.length; i++)
-					current_accelerometer[i] /= (float)current_accelerometer_sample_count;
-				last_accelerometer = current_accelerometer;
-			}
-			else
-			{
-				current_accelerometer = last_accelerometer;
-			}
-
-			if (current_gyroscope_sample_count > 0)
-			{
-				// Do simple average of the samples we just got.
-				for(int i = 0; i < current_gyroscope.length; i++)
-					current_gyroscope[i] /= (float)current_gyroscope_sample_count;
-			}
-
-			if (current_magnetometer_sample_count > 0)
-			{
-				// Do simple average of the samples we just got.
-				for(int i = 0; i < current_magnetometer.length; i++)
-					current_magnetometer[i] /= (float)current_magnetometer_sample_count;
-				last_magnetometer = current_magnetometer;
-			}
-			else
-			{
-				current_magnetometer = last_magnetometer;
+				System.arraycopy(event.values, 0, current_gyroscope, 0, 3);
+				bUpdate = true;
+				bGyroUpdate = true;
 			}
 
 			// If we have motion samples we generate the single event.
-			if (current_accelerometer_sample_count > 0 || current_gyroscope_sample_count > 0 ||	current_magnetometer_sample_count > 0)
+			if (bUpdate)
 			{
-				// The data we compose the motion event from.
-				float[] current_tilt = new float[]{0, 0, 0};
-				float[] current_rotation_rate = new float[]{0, 0, 0};
-				float[] current_gravity = new float[]{0, 0, 0};
-				float[] current_acceleration = new float[]{0, 0, 0};
-
-				
-
-				// We use a low-pass filter to synthesize the gravity
-				// vector.
-				
-				if (!first_acceleration_sample)
-				{
-					current_gravity[0] = last_gravity[0] * SampleDecayRate + current_accelerometer[0]*(1.0f - SampleDecayRate);
-					current_gravity[1] = last_gravity[1] * SampleDecayRate + current_accelerometer[1]*(1.0f - SampleDecayRate);
-					current_gravity[2] = last_gravity[2] * SampleDecayRate + current_accelerometer[2]*(1.0f - SampleDecayRate);
-				}
-				first_acceleration_sample = false;
-
 				// get the rotation matrix value, the convert those to Euler angle rotation values
-				updateOrientationAngles(current_accelerometer, current_magnetometer);
+				sensorManager.getRotationMatrix(rotationMatrix, null, current_accelerometer, current_magnetometer);
+				sensorManager.getOrientation(rotationMatrix, orientationAngles);
 
-				current_tilt = new float[]{orientationAngles[1], orientationAngles[2], orientationAngles[0]};
-
-				// And take out the gravity from the accel to get
-				// the linear acceleration.
-				for (int i = 0; i < current_acceleration.length; ++i)
-					current_acceleration[i] = current_accelerometer[i] - current_gravity[i];
-
-				if (current_gyroscope_sample_count > 0)
+				// protect against request from other thread
+				synchronized(this)
 				{
-					// The rotation rate is the what the gyroscope gives us.
-					current_rotation_rate = current_gyroscope;
-				}
-				else if (null == gyroscope)
-				{
-					// If we don't have a gyroscope at all we need to calc a rotation
-					// rate from our calculated tilt and a delta.
-					for (int index = 0; index < current_rotation_rate.length; ++index)
-						current_rotation_rate[index] = current_tilt[index] - last_tilt[index];
+					// remember gravity
+					current_gravity = filtered_gravity;
+
+					// fix up the tilt mapping to proper coordinate frame
+					current_tilt[0] = orientationAngles[1];
+					current_tilt[1] = orientationAngles[2];
+					current_tilt[2] = orientationAngles[0];
+
+					// And take out the gravity from the accel to get the linear acceleration.
+					current_acceleration[0] = current_accelerometer[0] - current_gravity[0];
+					current_acceleration[1] = current_accelerometer[1] - current_gravity[1];
+					current_acceleration[2] = current_accelerometer[2] - current_gravity[2];
+
+					// Figure out the rotation rate
+					if (bGyroUpdate)
+					{
+						// The rotation rate is the what the gyroscope gives us.
+						current_rotation_rate = current_gyroscope;
+					}
+					else if (null == gyroscope)
+					{
+						// If we don't have a gyroscope at all we need to calc a rotation rate from delta from previous tilt.
+						current_rotation_rate[0] = current_tilt[0] - last_tilt[0];
+						current_rotation_rate[1] = current_tilt[1] - last_tilt[1];
+						current_rotation_rate[2] = current_tilt[2] - last_tilt[2];
+					}
+					last_tilt = current_tilt;
 				}
 
-				// Finally record the motion event with all the data.
-				
-				nativeHandleSensorEvents(current_tilt, current_rotation_rate, current_gravity, current_acceleration);
-
-				// Update history values.
-				last_tilt = current_tilt;
-				last_gravity = current_gravity;
+				// flag new sensor data ready
+				bSensorDataUpdated = true;
 			}
 		}
 	}
 
-	
-	public void updateOrientationAngles(float[] accelerometerReading, float[] magnetometerReading)
+	public void AndroidThunkJava_PushSensorEvents()
 	{
-
-		sensorManager.getRotationMatrix(rotationMatrix, null, accelerometerReading, magnetometerReading);
-
-		sensorManager.getOrientation(rotationMatrix, orientationAngles);
+		if (bAllowIMU)
+		{
+			// protect against other thread updating the values
+			synchronized(this)
+			{
+				if (bSensorDataUpdated)
+				{
+					nativeHandleSensorEvents(current_tilt, current_rotation_rate, current_gravity, current_acceleration);
+					bSensorDataUpdated = false;
+				}
+			}
+		}
 	}
-	
+
 	@Override
 	public void onNewIntent(Intent newIntent)
 	{
@@ -1426,6 +1456,46 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 //$${gameActivityOnNewIntentAdditions}$$
 	}
 
+	public void onTrimMemory(int level)
+	{
+		// Determine which lifecycle or system event was raised.
+		switch (level) {
+			// user interface is in background, release UI memory
+			case ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN:
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_UI_HIDDEN) called!");
+				break;
+
+			// app is running but getting low on memory
+			case ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE:
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_RUNNING_MODERATE) called!");
+				break;
+			case ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW:
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_RUNNING_LOW) called!");
+				break;
+			case ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL:
+				// system will begin killing background processes
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_RUNNING_CRITICAL) called!");
+				break;
+
+			// app is on LRU list (background), release what you can
+			case ComponentCallbacks2.TRIM_MEMORY_BACKGROUND:
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_BACKGROUND) called!");
+				break;
+			case ComponentCallbacks2.TRIM_MEMORY_MODERATE:
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_MODERATE) called!");
+				break;
+			case ComponentCallbacks2.TRIM_MEMORY_COMPLETE:
+				// this process up first to kill for more memory!
+				Log.debug("==============> GameActive.onTrimMemory(TRIM_MEMORY_COMPLETE) called!");
+				break;
+
+			// unrecognized level; generic low memory situation
+			default:
+				Log.debug("==============> GameActive.onTrimMemory(" + level + ") called!");
+				break;
+		}
+	}
+
 	@Override
 	public void onStop()
 	{
@@ -1740,8 +1810,6 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 
 					//TYPE: disable text suggestion
 					newVirtualKeyboardInputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
-					//TYPE: disable autocorrect
-					newVirtualKeyboardInputType &= ~InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
 				
 					//TYPE: set input type flags
 					newVirtualKeyboardInput.setInputType(newVirtualKeyboardInputType);
@@ -1794,6 +1862,8 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 
 						nativeVirtualKeyboardVisible(true);
 						bKeyboardShowing = true;
+
+						CheckKeyboardDisplayed();
 					}
 				}
 				break;
@@ -1822,6 +1892,25 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		lastVirtualKeyboardCommand = VirtualKeyboardCommand.VK_CMD_NONE;
 	}
 
+	// timer to check if the onGlobalLayout callback was correctly called when displaying the virtual keyboard
+	private void CheckKeyboardDisplayed()
+	{
+		virtualKeyboardHandler.postDelayed(new Runnable()
+		{
+			public void run() 
+			{
+				synchronized(this) 
+				{
+					if(bKeyboardShowing && newVirtualKeyboardInput.getY() < 0) 
+					{
+						//couldn't show the VK input. Force layout refresh
+						mainView.requestLayout();
+					}
+				}
+			}
+		}, checkLastVirtualKeyboardCommandDelay);
+	}
+
 	public void AndroidThunkJava_LaunchURL(String URL)
 	{
 		Log.debug("[JAVA} AndroidThunkJava_LaunchURL: URL = " + URL);
@@ -1866,6 +1955,32 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		return null;
 	}
 
+	public void AndroidThunkJava_ShareURL(String URL, String Description, String Prompt, int LocationX, int LocationY)
+	{
+		Log.debug("[JAVA} AndroidThunkJava_ShareURL: URL = " + URL);
+
+		if (!URL.contains("://"))
+		{
+			URL = "http://" + URL;
+			Log.debug("[JAVA} AndroidThunkJava_ShareURL: corrected URL = " + URL);
+		}
+
+		try
+		{
+			Intent SendIntent = new Intent(Intent.ACTION_SEND);
+			SendIntent.setType("text/plain");
+			SendIntent.putExtra(Intent.EXTRA_SUBJECT, Description);
+			SendIntent.putExtra(Intent.EXTRA_TEXT, URL);
+			
+			Log.debug("[JAVA} AndroidThunkJava_ShareURL: Sharing URL");
+			startActivity(Intent.createChooser(SendIntent, Prompt));
+		}
+		catch (Exception e)
+		{
+			Log.debug("[JAVA} AndroidThunkJava_ShareURL: Failed with exception " + e.getMessage());
+		}
+	}
+
 	public void AndroidThunkJava_ResetAchievements()
 	{
 		/* Disable so don't need GET_ACCOUNTS - we don't need this
@@ -2688,17 +2803,67 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		return false;
 	}
 
-	public boolean AndroidThunkJava_HasActiveWiFiConnection()
+	@SuppressWarnings("deprecation")
+	@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+	public static boolean isAirplaneModeOn(Context context)
 	{
-		ConnectivityManager cm = (ConnectivityManager)this.getSystemService(Context.CONNECTIVITY_SERVICE);
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
+		{
+			return Settings.System.getInt(context.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) != 0;
+		}
+		return Settings.Global.getInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+	}
+
+	public String getConnectionType()
+	{
+		if (isAirplaneModeOn(getApplicationContext()))
+		{
+			return "AirplaneMode";
+		}
+
+		ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-		
-		boolean isConnected = (activeNetwork != null && activeNetwork.isConnectedOrConnecting());
+
+		boolean isConnected = (activeNetwork != null && activeNetwork.isAvailable() && activeNetwork.isConnectedOrConnecting());
 		if (isConnected)
 		{
-			return (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI);
+			int connType = activeNetwork.getType();
+			switch (connType)
+			{
+				case ConnectivityManager.TYPE_WIFI: return "WiFi";
+				case ConnectivityManager.TYPE_BLUETOOTH: return "Bluetooth";
+				case ConnectivityManager.TYPE_ETHERNET: return "Ethernet";
+				case ConnectivityManager.TYPE_WIMAX: return "WiMAX";
+			}
+			return "Cell";
 		}
-		return false;
+		return "None";
+    }
+
+	public int AndroidThunkJava_GetNetworkConnectionType()
+	{
+		if (isAirplaneModeOn(getApplicationContext()))
+		{
+			return CONNECTION_TYPE_AIRPLANEMODE;
+		}
+
+		ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+		NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+
+		boolean isConnected = (activeNetwork != null && activeNetwork.isAvailable() && activeNetwork.isConnectedOrConnecting());
+		if (isConnected)
+		{
+			int connType = activeNetwork.getType();
+			switch (connType)
+			{
+				case ConnectivityManager.TYPE_WIFI: return CONNECTION_TYPE_WIFI;
+				case ConnectivityManager.TYPE_BLUETOOTH: return CONNECTION_TYPE_BLUETOOTH;
+				case ConnectivityManager.TYPE_ETHERNET: return CONNECTION_TYPE_ETHERNET;
+				case ConnectivityManager.TYPE_WIMAX: return CONNECTION_TYPE_WIMAX;
+			}
+			return CONNECTION_TYPE_CELL;
+		}
+		return CONNECTION_TYPE_NONE;
 	}
 	
 	public boolean AndroidThunkJava_HasMetaDataKey(String key)
@@ -2829,6 +2994,41 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		return _bundle.getString(key);
 	}
 
+	public boolean AndroidThunkJava_HasIntentExtrasKey(String key)
+	{
+		if (_extrasBundle == null || key == null)
+		{
+			return false;
+		}
+		return _extrasBundle.containsKey(key);
+	}
+
+	public boolean AndroidThunkJava_GetIntentExtrasBoolean(String key)
+	{
+		if (_extrasBundle == null || key == null)
+		{
+			return false;
+		}
+		return _extrasBundle.getBoolean(key);
+	}
+
+	public int AndroidThunkJava_GetIntentExtrasInt(String key)
+	{
+		if (_extrasBundle == null || key == null)
+		{
+			return 0;
+		}
+		return _extrasBundle.getInt(key);
+	}
+
+	public String AndroidThunkJava_GetIntentExtrasString(String key)
+	{
+		if (_extrasBundle == null || key == null)
+		{
+			return null;
+		}
+		return _extrasBundle.getString(key);
+	}
 
 	public void AndroidThunkJava_SetSustainedPerformanceMode(final boolean bEnable)
 	{
@@ -3193,6 +3393,22 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 		return false;
 	}
 	
+
+	public boolean AndroidThunkJava_LaunchPackage(String packageName, String extraKey, String extraValue)
+	{
+		Intent launchIntent = getPackageManager().getLaunchIntentForPackage(packageName);
+		if (launchIntent != null)
+		{
+			if (extraKey != "")
+			{
+				launchIntent.putExtra(extraKey, extraValue);
+			}
+			startActivity(launchIntent);
+			System.exit(0);
+		}
+		return false;
+	}
+
 	public void AndroidThunkJava_RestartApplication() 
 	{
 		Context context = getApplicationContext();
@@ -3229,7 +3445,8 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	public native boolean nativeSupportsNEON();
 
 	public native boolean nativeIsShippingBuild();
-	public native void nativeSetGlobalActivity(boolean bUseExternalFilesDir, boolean bOBBInAPK, String APKPath);
+	public native void nativeSetAndroidStartupState(boolean bDebuggerAttached);
+	public native void nativeSetGlobalActivity(boolean bUseExternalFilesDir, String internalFilePath, String externalFilePath, boolean bOBBInAPK, String APKPath);
 	public native void nativeSetWindowInfo(boolean bIsPortrait, int DepthBufferPreference);
 	public native void nativeSetObbInfo(String ProjectName, String PackageName, int Version, int PatchVersion, String AppType);
 	public native void nativeSetAndroidVersionInformation( String AndroidVersion, String PhoneMake, String PhoneModel, String OSLanguage );
@@ -3266,4 +3483,3 @@ public class GameActivity extends NativeActivity implements SurfaceHolder.Callba
 	private static ClipboardManager clipboardManager;
 
 }
-
diff --git a/Engine/Build/Android/Java/src/com/epicgames/ue4/GooglePlayStoreHelper.java b/Engine/Build/Android/Java/src/com/epicgames/ue4/GooglePlayStoreHelper.java
index 31ab4c0cf36c..3c08b8b16c94 100644
--- a/Engine/Build/Android/Java/src/com/epicgames/ue4/GooglePlayStoreHelper.java
+++ b/Engine/Build/Android/Java/src/com/epicgames/ue4/GooglePlayStoreHelper.java
@@ -19,6 +19,7 @@ import com.android.vending.billing.util.Base64;
 import com.android.vending.billing.IInAppBillingService;
 import com.android.vending.billing.util.Purchase;
 import java.util.ArrayList;
+import java.util.List;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -50,6 +51,9 @@ public class GooglePlayStoreHelper implements StoreHelper
 	public static final String RESPONSE_INAPP_SIGNATURE_LIST = "INAPP_DATA_SIGNATURE_LIST";
 	public static final String INAPP_CONTINUATION_TOKEN = "INAPP_CONTINUATION_TOKEN";
 
+    // Max number of offers to query at once (see getSkuDetails in IInAppbillingServer.aidl)
+	public static final int QueryPurchaseMaxCount = 20;
+
 	// Item types
 	public static final String ITEM_TYPE_INAPP = "inapp";
 
@@ -73,6 +77,22 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 	private final int UndefinedFailureResponse = -1;
 
+	private class GooglePlayProductDescription
+	{
+		// Product offer id 
+		public String id;
+		// Product friendly name
+		public String title;
+		// Product description
+		public String description;
+		// Currency friendly string 
+		public String price;
+		// Raw price in currency units
+		public Float priceRaw;
+		// Local currency code
+		public String currencyCode;
+	}
+
 	public interface PurchaseLaunchCallback
 	{
 		void launchForResult(PendingIntent pendingIntent, int requestCode);
@@ -88,13 +108,13 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 		gameActivity = InGameActivity;
 		productKey = InProductKey;
-		
+
 		Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
 		serviceIntent.setPackage("com.android.vending");
 		gameActivity.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
 	}
 
-	
+
 	///////////////////////////////////////////////////////
 	// The StoreHelper interfaces implementation for Google Play Store.
 
@@ -113,87 +133,129 @@ public class GooglePlayStoreHelper implements StoreHelper
 	public boolean QueryInAppPurchases(String[] InProductIDs)
 	{
 		Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases");
-		ArrayList<String> skuList = new ArrayList<String> ();
-		
-		for (String productId : InProductIDs)
+
+		if (InProductIDs.length > 0)
 		{
-			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Querying " + productId);
-			skuList.add(productId);
-		}
+			ArrayList<String> skuList = new ArrayList<String>(InProductIDs.length);
 
-		Bundle querySkus = new Bundle();
-		querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuList);
-
-		try
-		{
-			Bundle skuDetails = mService.getSkuDetails(3, gameActivity.getPackageName(), ITEM_TYPE_INAPP, querySkus);
-
-			int response = skuDetails.getInt(RESPONSE_CODE);
-			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Response " + response + " Bundle:" + skuDetails.toString());
-			if (response == BILLING_RESPONSE_RESULT_OK)
+			for (String productId : InProductIDs)
 			{
-				ArrayList<String> productIds = new ArrayList<String>();
-				ArrayList<String> titles = new ArrayList<String>();
-				ArrayList<String> descriptions = new ArrayList<String>();
-				ArrayList<String> prices = new ArrayList<String>();
-				ArrayList<Float> pricesRaw = new ArrayList<Float>();
-				ArrayList<String> currencyCodes = new ArrayList<String>();
+				Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Querying " + productId);
+				skuList.add(productId);
+			}
 
-				ArrayList<String> responseList = skuDetails.getStringArrayList(RESPONSE_GET_SKU_DETAILS_LIST);
-				for (String thisResponse : responseList)
+			ArrayList<String> productIds = new ArrayList<String>();
+			ArrayList<String> titles = new ArrayList<String>();
+			ArrayList<String> descriptions = new ArrayList<String>();
+			ArrayList<String> prices = new ArrayList<String>();
+			ArrayList<Float> pricesRaw = new ArrayList<Float>();
+			ArrayList<String> currencyCodes = new ArrayList<String>();
+
+			while (skuList.size() > 0)
+			{
+				Log.debug("[GooglePlayStoreHelper] - NumSkus: " + skuList.size());
+				int numSkus = Math.min(QueryPurchaseMaxCount, skuList.size());
+				Log.debug("[GooglePlayStoreHelper] - Grabbing from 0 to " + numSkus);
+				List<String> skuSubList = skuList.subList(0, numSkus);
+				ArrayList<String> realSubList = new ArrayList<String>(skuSubList);
+				ArrayList<GooglePlayProductDescription> productDescriptions = new ArrayList<GooglePlayProductDescription>();
+
+				int response = QueryInAppPurchasesInternal(realSubList, productDescriptions);
+				if (response == BILLING_RESPONSE_RESULT_OK)
 				{
-					JSONObject object = new JSONObject(thisResponse);
-				
-					String productId = object.getString("productId");
-					productIds.add(productId);
-					Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Parsing details for: " + productId);
-				
-					String title = object.getString("title");
-					titles.add(title);
-					Log.debug("[GooglePlayStoreHelper] - title: " + title);
+					for (GooglePlayProductDescription product : productDescriptions)
+					{
+						productIds.add(product.id);
+						Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Parsing details for: " + product.id);
 
-					String description = object.getString("description");
-					descriptions.add(description);
-					Log.debug("[GooglePlayStoreHelper] - description: " + description);
+						titles.add(product.title);
+						Log.debug("[GooglePlayStoreHelper] - title: " + product.title);
 
-					String price = object.getString("price");
-					prices.add(price);
-					Log.debug("[GooglePlayStoreHelper] - price: " + price);
+						descriptions.add(product.description);
+						Log.debug("[GooglePlayStoreHelper] - description: " + product.description);
 
-					double priceRaw = object.getDouble("price_amount_micros") / 1000000.0;
-					pricesRaw.add((float)priceRaw);
-					Log.debug("[GooglePlayStoreHelper] - price_amount_micros: " + priceRaw);
+						prices.add(product.price);
+						Log.debug("[GooglePlayStoreHelper] - price: " + product.price);
 
-					String currencyCode = object.getString("price_currency_code");
-					currencyCodes.add(currencyCode);
-					Log.debug("[GooglePlayStoreHelper] - price_currency_code: " + currencyCode);
+						pricesRaw.add(product.priceRaw);
+						Log.debug("[GooglePlayStoreHelper] - price_amount_micros: " + product.priceRaw);
+
+						currencyCodes.add(product.currencyCode);
+						Log.debug("[GooglePlayStoreHelper] - price_currency_code: " + product.currencyCode);
+					}
+				}
+				else
+				{
+					Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Failed with: " + response);
+					// If anything fails right now, stop immediately, not sure how to reconcile partial success/failure
+					nativeQueryComplete(response, null, null, null, null, null, null);
+					return false;
 				}
 
-				float[] pricesRawPrimitive = new float[pricesRaw.size()];
-				for (int i = 0; i < pricesRaw.size(); i++)
-				{
-					pricesRawPrimitive[i] = pricesRaw.get(i);
-				}
+				skuSubList.clear();
+			}
 
-				Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases " + productIds.size() + " items - Success!");
-				nativeQueryComplete(response, productIds.toArray(new String[productIds.size()]), titles.toArray(new String[titles.size()]), descriptions.toArray(new String[descriptions.size()]), prices.toArray(new String[prices.size()]), pricesRawPrimitive, currencyCodes.toArray(new String[currencyCodes.size()]));
-				Log.debug("[GooglePlayStoreHelper] - nativeQueryComplete done!");
-			}
-			else
+			float[] pricesRawPrimitive = new float[pricesRaw.size()];
+			for (int i = 0; i < pricesRaw.size(); i++)
 			{
-				Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Failed!");
-				nativeQueryComplete(response, null, null, null, null, null, null);
+				pricesRawPrimitive[i] = pricesRaw.get(i);
 			}
+
+			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases " + productIds.size() + " items - Success!");
+			nativeQueryComplete(BILLING_RESPONSE_RESULT_OK, productIds.toArray(new String[productIds.size()]), titles.toArray(new String[titles.size()]), descriptions.toArray(new String[descriptions.size()]), prices.toArray(new String[prices.size()]), pricesRawPrimitive, currencyCodes.toArray(new String[currencyCodes.size()]));
+			Log.debug("[GooglePlayStoreHelper] - nativeQueryComplete done!");
 		}
-		catch(Exception e)
+		else
 		{
-			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Failed! " + e.getMessage());
+			// nothing to query
+			Log.debug("[GooglePlayStoreHelper] - no products given to query");
 			nativeQueryComplete(UndefinedFailureResponse, null, null, null, null, null, null);
 		}
 
 		return true;
 	}
-	
+
+	public int QueryInAppPurchasesInternal(ArrayList<String> skuList, ArrayList<GooglePlayProductDescription> outProducts)
+	{
+		Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchasesInternal");
+
+		Bundle querySkus = new Bundle();
+		querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuList);
+
+		int response = UndefinedFailureResponse;
+		try
+		{
+			Bundle skuDetails = mService.getSkuDetails(3, gameActivity.getPackageName(), ITEM_TYPE_INAPP, querySkus);
+
+			response = skuDetails.getInt(RESPONSE_CODE);
+			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchases - Response " + response + " Bundle:" + skuDetails.toString());
+			if (response == BILLING_RESPONSE_RESULT_OK)
+			{
+				ArrayList<String> responseList = skuDetails.getStringArrayList(RESPONSE_GET_SKU_DETAILS_LIST);
+				for (String thisResponse : responseList)
+				{
+					JSONObject object = new JSONObject(thisResponse);
+
+					GooglePlayProductDescription newDescription = new GooglePlayProductDescription();
+					newDescription.id = object.getString("productId");
+					newDescription.title = object.getString("title");
+					newDescription.description = object.getString("description");
+					newDescription.price = object.getString("price");
+					double priceRaw = object.getDouble("price_amount_micros") / 1000000.0;
+					newDescription.priceRaw = (float)priceRaw;
+					newDescription.currencyCode = object.getString("price_currency_code");
+					outProducts.add(newDescription);
+				}
+			}
+		}
+		catch(Exception e)
+		{
+			Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryInAppPurchasesInternal - Failed! " + e.getMessage());
+		}
+
+		return response;
+	}
+
 	/**
 	 * Start the purchase flow for a particular sku
 	 */
@@ -215,7 +277,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 				{
 					Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::BeginPurchase - v7 VR purchase" + ProductID);
 					buyIntentBundle = mService.getBuyIntentExtraParams(7, gameActivity.getPackageName(), ProductID, ITEM_TYPE_INAPP, devPayload, bundle);
-				} 
+				}
 				else
 				{
 					Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::BeginPurchase - v3 IAB purchase:" + ProductID);
@@ -275,8 +337,8 @@ public class GooglePlayStoreHelper implements StoreHelper
 		ArrayList<String> ownedSkus = new ArrayList<String>();
 		ArrayList<String> purchaseDataList = new ArrayList<String>();
 		ArrayList<String> signatureList = new ArrayList<String>();
-		
-		// On first pass the continuation token should be null. 
+
+		// On first pass the continuation token should be null.
 		// This will allow us to gather large sets of purchased items recursively
 		int responseCode = GatherOwnedPurchaseData(ownedSkus, purchaseDataList, signatureList, null);
 		if (responseCode == BILLING_RESPONSE_RESULT_OK)
@@ -315,7 +377,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 								boolean bTryToConsume = false;
 								int consumeResponse = 0;
-							
+
 								// This is assuming that all purchases should be consumed. Consuming a purchase that is meant to be a one-time purchase makes it so the
 								// user is able to buy it again. Also, it makes it so the purchase will not be able to be restored again in the future.
 
@@ -385,8 +447,8 @@ public class GooglePlayStoreHelper implements StoreHelper
 		ArrayList<String> ownedSkus = new ArrayList<String>();
 		ArrayList<String> purchaseDataList = new ArrayList<String>();
 		ArrayList<String> signatureList = new ArrayList<String>();
-		
-		// On first pass the continuation token should be null. 
+
+		// On first pass the continuation token should be null.
 		// This will allow us to gather large sets of purchased items recursively
 		int responseCode = GatherOwnedPurchaseData(ownedSkus, purchaseDataList, signatureList, null);
 		if (responseCode == BILLING_RESPONSE_RESULT_OK)
@@ -408,7 +470,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 					String receipt = Base64.encode(purchase.getOriginalJson().getBytes());
 					receipts.add(receipt);
-				}			
+				}
 				catch (JSONException e)
 				{
 					Log.debug("[GooglePlayStoreHelper] - GooglePlayStoreHelper::QueryExistingPurchases - Failed to parse receipt! " + e.getMessage());
@@ -482,13 +544,13 @@ public class GooglePlayStoreHelper implements StoreHelper
 			mService = IInAppBillingService.Stub.asInterface(service);
 			bIsIapSetup = true;
 
-			try 
+			try
 			{
                 Log.debug("Checking for in-app billing 3 support.");
 
                 // check for in-app billing v3 support
                 int response = mService.isBillingSupported(3, gameActivity.getPackageName(), ITEM_TYPE_INAPP);
-                if (response != BILLING_RESPONSE_RESULT_OK) 
+                if (response != BILLING_RESPONSE_RESULT_OK)
 				{
 					Log.debug("In-app billing version 3 NOT supported for " + gameActivity.getPackageName() + " error " + response);
                 }
@@ -505,10 +567,10 @@ public class GooglePlayStoreHelper implements StoreHelper
 		}
 	};
 
-	
+
 	///////////////////////////////////////////////////////
 	// Game Activity/Context driven methods we need to listen for.
-	
+
 	/**
 	 * On Destory we should unbind our IInAppBillingService service
 	 */
@@ -521,7 +583,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 			gameActivity.unbindService(mServiceConn);
 		}
 	}
-	
+
 	/**
 	 * Route taken by the Purchase workflow. We listen for our purchaseIntentIdentifier request code and
 	 * handle the response accordingly
@@ -532,7 +594,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 		if (requestCode == purchaseIntentIdentifier)
 		{
-		    if (data == null) 
+		    if (data == null)
 			{
 				Log.debug("Null data in purchase activity result.");
 				nativePurchaseComplete(UndefinedFailureResponse, "", "", "", "");
@@ -612,10 +674,10 @@ public class GooglePlayStoreHelper implements StoreHelper
 		return false;
 	}
 
-	
+
 	///////////////////////////////////////////////////////
 	// Internal helper functions that deal assist with various IAB related events
-	
+
 	/**
 	 * Create a UE4 specific unique string that will be used to verify purchases are legit.
 	 */
@@ -623,7 +685,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 	{
 		return "ue4." + ProductId;
 	}
-	
+
 	/**
 	 * Check the returned payload matches one for the product we are buying.
 	 */
@@ -635,7 +697,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 
 		return ExistingPayload.equals(GeneratedPayload);
 	}
-	
+
 	/**
 	 * Get a text tranlation of the Response Codes returned by google play.
 	 */
@@ -666,7 +728,7 @@ public class GooglePlayStoreHelper implements StoreHelper
 				return "Unknown Server Response Code";
 		}
 	}
-	
+
 	/**
 	 * Recursive functionality to gather all of the purchases owned by a user.
 	 * if the user owns a lot of products then we need to getPurchases again with a continuationToken
diff --git a/Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java b/Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java
index 88748004613b..2197df78ddff 100644
--- a/Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java
+++ b/Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java
@@ -563,6 +563,11 @@ public class MediaPlayer14
 
 	public void reset()
 	{
+		synchronized(this)
+		{
+			Prepared = false;
+			Completed = false;
+		}
 		if (null != mOESTextureRenderer)
 		{
 			while (WaitOnBitmapRender) ;
diff --git a/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
index 17832fb3d81a..d427193adbca 100644
--- a/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
+++ b/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
@@ -204,11 +204,7 @@ public class DownloadNotification implements IDownloaderClient {
         mLabel = applicationLabel;
         mNotificationManager = (NotificationManager)
                 mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            mActiveDownloadBuilder = new V4CustomNotificationBuilder(ctx);
-        } else {
-            mActiveDownloadBuilder = new NotificationCompat.Builder(ctx);
-        }
+		mActiveDownloadBuilder = new NotificationCompat.Builder(ctx);
         mBuilder = new NotificationCompat.Builder(ctx);
 
         // Set Notification category and priorities to something that makes sense for a long
diff --git a/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/V4CustomNotificationBuilder.java b/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/V4CustomNotificationBuilder.java
deleted file mode 100644
index 42057a082a47..000000000000
--- a/Engine/Build/Android/Java/src/com/google/android/vending/expansion/downloader/impl/V4CustomNotificationBuilder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.vending.expansion.downloader.impl;
-
-import com.android.vending.expansion.downloader.R;
-import com.google.android.vending.expansion.downloader.Helpers;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.support.v4.app.NotificationCompat;
-import android.view.View;
-import android.widget.RemoteViews;
-
-/**
- * This class wraps NotificationCompat to give us similar progress functionality on Donut-Honeycomb.
- */
-public class V4CustomNotificationBuilder extends NotificationCompat.Builder {
-
-    public V4CustomNotificationBuilder(Context context) {
-        super(context);
-    }
-
-    @Override
-    public NotificationCompat.Builder setProgress(int max, int progress, boolean indeterminate) {
-        mTotalBytes = max;
-        mCurrentBytes = progress;
-        return super.setProgress(max, progress, indeterminate);
-    }
-
-    @Override
-    public NotificationCompat.Builder setContentInfo(CharSequence info) {
-        mContentInfo = info;
-        return super.setContentInfo(info);
-    }
-
-    int mTotalBytes = -1;
-    int mCurrentBytes = -1;
-    int mIcon;
-    CharSequence mContentInfo = "";
-
-    @Override
-    public Notification build() {
-        if (android.os.Build.VERSION.SDK_INT > 10) {
-            // only matters for Honeycomb
-            setOnlyAlertOnce(true);
-        }
-
-        // Build the RemoteView object
-        RemoteViews expandedView = new RemoteViews(
-                mContext.getPackageName(),
-                R.layout.status_bar_ongoing_event_progress_bar);
-
-        expandedView.setTextViewText(R.id.title, mContentTitle);
-        // look at strings
-        expandedView.setViewVisibility(R.id.description, View.VISIBLE);
-        expandedView.setTextViewText(R.id.description,
-                Helpers.getDownloadProgressString(this.mCurrentBytes, mTotalBytes));
-        expandedView.setViewVisibility(R.id.progress_bar_frame, View.VISIBLE);
-        expandedView.setProgressBar(R.id.progress_bar,
-                (int) (mTotalBytes >> 8),
-                (int) (mCurrentBytes >> 8),
-                mTotalBytes <= 0);
-        expandedView.setViewVisibility(R.id.time_remaining, View.VISIBLE);
-        expandedView.setTextViewText(
-                R.id.time_remaining,
-                mContentInfo);
-        expandedView.setTextViewText(R.id.progress_text,
-                Helpers.getDownloadProgressPercent(mCurrentBytes, mTotalBytes));
-        expandedView.setImageViewResource(R.id.appIcon, mIcon);
-
-        Notification n = super.build();
-        n.contentView = expandedView;
-        return n;
-    }
-}
diff --git a/Engine/Build/BatchFiles/Mac/SetupMono.sh b/Engine/Build/BatchFiles/Mac/SetupMono.sh
index 74d8cdf0f1de..c1fcdb69edf5 100755
--- a/Engine/Build/BatchFiles/Mac/SetupMono.sh
+++ b/Engine/Build/BatchFiles/Mac/SetupMono.sh
@@ -6,13 +6,27 @@ sh FixDependencyFiles.sh
 
 IS_MONO_INSTALLED=0
 MONO_VERSION_PATH=`which mono` || true
+
+# if we can't find mono path, try one last hail mary of a standard install location
+if [ "$MONO_VERSION_PATH" == "" ] || [ ! -f $MONO_VERSION_PATH ]; then
+	MONO_VERSION_PATH="/Library/Frameworks/Mono.framework/Versions/Current/Commands/mono"
+	# if it's found, then add it to the path
+	if [ ! $MONO_VERSION_PATH == "" ] && [ -f $MONO_VERSION_PATH ]; then
+		echo "Found mono via known Mono.framework path"
+		export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH
+	fi
+fi
+
 if [ ! $MONO_VERSION_PATH == "" ] && [ -f $MONO_VERSION_PATH ]; then
 	# If Mono is installed, check if it's 4.0.2 or higher
 	MONO_VERSION_PREFIX="Mono JIT compiler version "
 	MONO_VERSION_PREFIX_LEN=${#MONO_VERSION_PREFIX}
 	MONO_VERSION=`"${MONO_VERSION_PATH}" --version |grep "$MONO_VERSION_PREFIX"`
+	echo "Running installed mono, version: " ${MONO_VERSION}
 	MONO_VERSION=(`echo ${MONO_VERSION:MONO_VERSION_PREFIX_LEN} |tr '.' ' '`)
-	if [ ${MONO_VERSION[0]} -ge 4 ]; then
+	if [ ${MONO_VERSION[0]} -ge 5 ]; then # Allow any Mono 5.x and up
+		IS_MONO_INSTALLED=1
+	elif [ ${MONO_VERSION[0]} -eq 4 ]; then
 		if [ ${MONO_VERSION[1]} -eq 0 ] && [ ${MONO_VERSION[2]} -ge 2 ]; then
 			IS_MONO_INSTALLED=1
 		elif [ ${MONO_VERSION[1]} -gt 0 ] && [ ${MONO_VERSION[1]} -lt 6 ]; then # Mono 4.6 has issues on macOS 10.12
diff --git a/Engine/Build/BuildFarm/PostpExtensions.pl b/Engine/Build/BuildFarm/PostpExtensions.pl
index 3f3c6015f482..fff3b3a34506 100644
--- a/Engine/Build/BuildFarm/PostpExtensions.pl
+++ b/Engine/Build/BuildFarm/PostpExtensions.pl
@@ -145,12 +145,12 @@ unshift @::gMatchers, (
     {
         id =>               "clErrorMultiline",
         pattern =>          q{([^(]+)(\([\d,]+\))? ?: (fatal )?error [a-zA-Z]+[\d]+},
-        action =>           q{incValue("errors"); my ($file_only) = ($1 =~ /([^\\\\]+)$/); diagnostic($file_only || $1, "error", 0, forwardWhile("^(    |^([^(]+)\\\\([\\\\d,]+\\\\) ?: note)"))},
+        action =>           q{my $line = logLine($::gCurrentLine); $line =~ /^( *)/; my $indent = ' ' x length($1); incValue("errors"); my ($file_only) = ($1 =~ /([^\\\\]+)$/); diagnostic($file_only || $1, "error", 0, forwardWhile("^$indent "))},
     },
     {
         id =>               "clWarningMultiline",
         pattern =>          q{([^(]+)(\([\d,]+\))? ?: warning[ :]},
-        action =>           q{incValue("warnings"); my ($file_only) = ($1 =~ /([^\\\\]+)$/); diagnostic($file_only || $1, "warning", 0, forwardWhile("^(    |^([^(]+)\\\\([\\\\d,]+\\\\) ?: note)")) },
+        action =>           q{my $line = logLine($::gCurrentLine); $line =~ /^( *)/; my $indent = ' ' x length($1); incValue("warnings"); my ($file_only) = ($1 =~ /([^\\\\]+)$/); diagnostic($file_only || $1, "warning", 0, forwardWhile("^$indent "))},
     },
     {
         id =>               "clangError",
diff --git a/Engine/Build/Commit.gitdeps.xml b/Engine/Build/Commit.gitdeps.xml
index 8c731bc4a8a6..951cd4d4d22c 100644
--- a/Engine/Build/Commit.gitdeps.xml
+++ b/Engine/Build/Commit.gitdeps.xml
@@ -5,10 +5,11 @@
     <File Name="Engine/Binaries/DotNET/AgentInterface.dll" Hash="2a45d6cc11ec86fedec55ff7202470c93491d6df" />
     <File Name="Engine/Binaries/DotNET/HTML5LaunchHelper.exe" Hash="e0ff73fbdd275698128946889b620dadd89d7e28" IsExecutable="true" />
     <File Name="Engine/Binaries/DotNET/Ionic.Zip.Reduced.dll" Hash="a991703deda7721e68adfaded64291bbdda85a12" />
-    <File Name="Engine/Binaries/DotNET/IOS/DeploymentInterface.dll" Hash="d20bcaf8a1423a6c2bb507061f3ecdf6a756f75f" />
-    <File Name="Engine/Binaries/DotNET/IOS/DeploymentServer.exe" Hash="ca01408cf8c7a53bfc83997f2d806932f8029e73" />
-    <File Name="Engine/Binaries/DotNET/IOS/IPhonePackager.exe" Hash="597bdbcf6b789fe51f618b8a28e7eebd985a9055" />
-    <File Name="Engine/Binaries/DotNET/IOS/MobileDeviceInterface.dll" Hash="449a522f2b3f69cd477e437c46b0af9a388ec0c0" />
+    <File Name="Engine/Binaries/DotNET/IOS/DeploymentInterface.dll" Hash="63c870810630a46b142d047c8928d2c893906529" />
+    <File Name="Engine/Binaries/DotNET/IOS/DeploymentServer.exe" Hash="7cb3baa614f5cce40ce3ae302bae356ba286694e" />
+    <File Name="Engine/Binaries/DotNET/IOS/DotNETUtilities.dll" Hash="d51bc05c958fea168ded3856ad7f5e74cdaa04fa" />
+    <File Name="Engine/Binaries/DotNET/IOS/IPhonePackager.exe" Hash="5cad53cf8d753ed881e8d241703e80c3b17c74c2" />
+    <File Name="Engine/Binaries/DotNET/IOS/MobileDeviceInterface.dll" Hash="35ca88585634c8f42c6f85ce9dc5c1b41356291a" />
     <File Name="Engine/Binaries/DotNET/IOS/openssl.exe" Hash="f4d2d872d8efc2662ff4785fb164f968ec8349c4" />
     <File Name="Engine/Binaries/DotNET/NetworkProfiler.exe" Hash="87f4ff15bcd84c3b35f5da39b56e16ec3df9a1c0" IsExecutable="true" />
     <File Name="Engine/Binaries/DotNET/OneSky.dll" Hash="19bd773d37565a24b3cd18dd79c9c6c26bd26282" />
@@ -28,7 +29,9 @@
     <File Name="Engine/Binaries/Linux/libnvmath.so" Hash="9f501e713af3bd907bc94f1459b35ca7b9c7f712" />
     <File Name="Engine/Binaries/Linux/libnvtt.so" Hash="cec81224d7dfa49894da21de7ffad83ce61e1bed" />
     <File Name="Engine/Binaries/Linux/UnrealCEFSubProcess" Hash="7aefc25f427c9ba84aef0c3bb8a598080708a468" IsExecutable="true" />
-    <File Name="Engine/Binaries/Linux/UnrealPak" Hash="88665cab8c6efde1fa3b8146d647615530223925" IsExecutable="true" />
+    <File Name="Engine/Binaries/Linux/UnrealPak" Hash="4c4402bf75d76dfd1e99164cd0743d1c0c82bcf2" IsExecutable="true" />
+    <File Name="Engine/Binaries/Linux/UnrealPak.debug" Hash="ba88b28d5bc37e253a578bc4a033d01668093e57" />
+    <File Name="Engine/Binaries/Linux/UnrealPak.sym" Hash="6d819bff4f1c07ec7722ec7085009ee20c2a382d" />
     <File Name="Engine/Binaries/Linux/UnrealVersionSelector-Linux-Shipping" Hash="3ab58698a42c7d5466bdaa04c1839a34d5784f86" IsExecutable="true" />
     <File Name="Engine/Binaries/Linux/UnrealVersionSelector-Linux-Shipping.target" Hash="07c51a867296d2cc485f05b9a8f61e8664a82174" />
     <File Name="Engine/Binaries/Mac/BootstrapPackagedGame.app/Contents/Info.plist" Hash="4b4a37f081829bc1d281dff01f0ce115e103c882" />
@@ -54,8 +57,8 @@
     <File Name="Engine/Binaries/Mac/UnrealCEFSubProcess.app/Contents/MacOS/UnrealCEFSubProcess" Hash="7df27e5c48159c97974b554046338d44702c3b7c" IsExecutable="true" />
     <File Name="Engine/Binaries/Mac/UnrealCEFSubProcess.app/Contents/PkgInfo" Hash="9f9eea0cfe2d65f2c3d6b092e375b40782d08f31" IsExecutable="true" />
     <File Name="Engine/Binaries/Mac/UnrealCEFSubProcess.app/Contents/Resources/UnrealCEFSubProcess.icns" Hash="1d5474e52f06b7538636fc5e1c06cc3a18dcba36" />
-    <File Name="Engine/Binaries/Mac/UnrealPak" Hash="1d01bb9c8f69ded3fa1e49dfd6545411e82a4dd6" IsExecutable="true" />
-    <File Name="Engine/Binaries/Mac/UnrealPak.dsym" Hash="9e08191d19f5e53af7ac67bc442ae97e15c9ae97" />
+    <File Name="Engine/Binaries/Mac/UnrealPak" Hash="816ebfe47bf8c431687f56e0a6e9d099bc143954" IsExecutable="true" />
+    <File Name="Engine/Binaries/Mac/UnrealPak.dsym" Hash="e570daa4bede3198b068ac791518d079ff1b3dbe" />
     <File Name="Engine/Binaries/Mac/UnrealSync.app/Contents/Info.plist" Hash="5b72b224f144dba1a6f463157f45fa1625317bbd" />
     <File Name="Engine/Binaries/Mac/UnrealSync.app/Contents/MacOS/UnrealSync" Hash="6bbb80f881edfedf850b4ad5d34100076b3e5c6f" IsExecutable="true" />
     <File Name="Engine/Binaries/Mac/UnrealSync.app/Contents/MacOS/UnrealSync.dsym" Hash="f150e7355efb6f72df571b59d465d1ec98c745b4" />
@@ -168,7 +171,9 @@
     <File Name="Engine/Binaries/ThirdParty/ARM/Win32/astcenc.exe" Hash="d49575f93f193b343ebbd66a8e093ed43a7d2fa3" />
     <File Name="Engine/Binaries/ThirdParty/AWSSDK/AWS.SessionProvider.dll" Hash="fe864852e69ca1c0826263ecd2dabb9a1ffdd599" />
     <File Name="Engine/Binaries/ThirdParty/AWSSDK/AWS.TraceListener.dll" Hash="ed569abceaa38942d15b4203e90b1f30bf3c70fd" />
+    <File Name="Engine/Binaries/ThirdParty/AWSSDK/AWSSDK.Core.dll" Hash="741184016f1a1bbaa4666d9dbf07f1249c3f43b4" />
     <File Name="Engine/Binaries/ThirdParty/AWSSDK/AWSSDK.dll" Hash="0b67e04141d9948d0ad748c6e541eed8d1751512" />
+    <File Name="Engine/Binaries/ThirdParty/AWSSDK/AWSSDK.S3.dll" Hash="16d217438910ed2cc58a697020347ec982750964" />
     <File Name="Engine/Binaries/ThirdParty/CEF3/Linux/icudtl.dat" Hash="aa954098e3ae4c00f67bace45b39a7b4a8242c6a" />
     <File Name="Engine/Binaries/ThirdParty/CEF3/Linux/libcef.so" Hash="82bf65e628e0112588e307732019e763eea14ba7" />
     <File Name="Engine/Binaries/ThirdParty/CEF3/Linux/natives_blob.bin" Hash="f4c95f1abd24c715a3dd4b3e4c9cff5decda7250" />
@@ -2136,7 +2141,7 @@
     <File Name="Engine/Binaries/ThirdParty/Mono/Mac/share/man/man5/mono-config.5" Hash="30235021b95ac465adc0633130224d46dfe507a7" />
     <File Name="Engine/Binaries/ThirdParty/NETDiscUtils/DiscUtils.dll" Hash="c664658585563c55c79101bc579bd0be195e489d" />
     <File Name="Engine/Binaries/ThirdParty/Newtonsoft/Newtonsoft.Json.dll" Hash="6b0da75617a2269493dc1a685d7a0b07f2e48c75" />
-    <File Name="Engine/Binaries/ThirdParty/NVIDIA/NVaftermath/Win64/GFSDK_Aftermath_Lib.x64.dll" Hash="c91b14bd430e7d6460238c84cf19cea5e47a8d32" />
+    <File Name="Engine/Binaries/ThirdParty/NVIDIA/NVaftermath/Win64/GFSDK_Aftermath_Lib.x64.dll" Hash="26fc0fa7d47ac99c99465a7a5176b3de49bb14d9" />
     <File Name="Engine/Binaries/ThirdParty/nvTextureTools/Win32/nvtt.dll" Hash="e734f48554e0298a8469787a52e4b00a7afd7760" />
     <File Name="Engine/Binaries/ThirdParty/nvTextureTools/Win64/nvtt_64.dll" Hash="9d721a93565de22c31bf3893e78ff4a11a1f80db" />
     <File Name="Engine/Binaries/ThirdParty/Oculus/Audio/Win64/ovraudio64.dll" Hash="7fe171041d48b0216d9018e29bdf3a2193f9d2fb" />
@@ -2399,159 +2404,159 @@
     <File Name="Engine/Binaries/ThirdParty/PhysX/Win64/VS2015/PxPvdSDKCHECKED_x64.pdb" Hash="e3faca0d678edc44310f8fac6b641a6a84bd5141" />
     <File Name="Engine/Binaries/ThirdParty/PhysX/Win64/VS2015/PxPvdSDKPROFILE_x64.dll" Hash="9eb71a30aab6501252443b0390748844f98310f6" />
     <File Name="Engine/Binaries/ThirdParty/PhysX/Win64/VS2015/PxPvdSDKPROFILE_x64.pdb" Hash="99aa30ed3fc1172303ba55b78ffb55713faffc01" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Clothing.so" Hash="f77e50e28ac1ff90d5a1b46f9c9bb989b72e55bb" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Clothing.so" Hash="c3b857a6bb665283aede6b1fe7812cdec349c4e8" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Clothing.sym" Hash="938e8be8e5360a662298396303ea3e63f5d5a499" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingCHECKED.so" Hash="edf6aeb5bdf93805a34d08623152e38a3327ce55" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingCHECKED.so" Hash="d8f6b836f7c94f0cb221765b0d6a817655606229" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingCHECKED.sym" Hash="9ee18b1b3480a898bb9a5b1d45322dd170882365" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingPROFILE.so" Hash="3af0f182a8dbca5d94ee4523fa29782d3503fddc" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingPROFILE.so" Hash="b12595762f222499882d52621c9a0bb1875aa027" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_ClothingPROFILE.sym" Hash="6f933aa0a132ff1e653bf84648f6f66ebf4d3759" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Destructible.so" Hash="52a5ed43c6625a77dccfed4864762443b3d30173" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Destructible.so" Hash="7882128cee711c0cd7734933548a2d378ed43916" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Destructible.sym" Hash="8db97382ed9c700e07e19125ee8c08992ab9d62a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructibleCHECKED.so" Hash="a2365f073e3a63dedaf6adb77ad0d9ae0c68ca2f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructibleCHECKED.so" Hash="32651649598b2abdfd6a86f94725c7984ede3e9d" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructibleCHECKED.sym" Hash="b5d024316811bc10860e059f23b1d2393af6dbcc" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructiblePROFILE.so" Hash="9123f306dfa43e5e0fbf435b65c4a2fa75ed0dfc" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructiblePROFILE.so" Hash="733782f6cf737e3ac8a5771fcd539a3a006565d8" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_DestructiblePROFILE.sym" Hash="6fd1795e0b2a5a7385dbb1fb60b79c7057ae1bd9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Legacy.so" Hash="8de9a6a8c366a287274d66c60cd2af749b102eff" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Legacy.so" Hash="93f940c07f7c2f63a4db6a2c517d2ac77a5468bd" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Legacy.sym" Hash="37dcd452e603a64798bad21c96403639d051f420" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyCHECKED.so" Hash="b0b37eeb471e326121dea843b2faf5b27c65fe56" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyCHECKED.so" Hash="17195a241f51bb1e0be8d9a6d1e42ba1dc60ae3a" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyCHECKED.sym" Hash="fb189ecb91472af7e7d449172af227efae618608" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyPROFILE.so" Hash="3796c8f9c31dc5d2f7070f905f74ef5b1872d9e0" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyPROFILE.so" Hash="62cfa5639465375e2e076354deaddcf10a8faa36" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LegacyPROFILE.sym" Hash="37dcd452e603a64798bad21c96403639d051f420" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Loader.so" Hash="09d163652be19c853ba565f4639118aa9e2e620f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Loader.so" Hash="624daaedbd0d4e18398fddcd7286d93d84b8c564" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_Loader.sym" Hash="3c115d13b34e9e48eb7f5631e54e176f3d65c1ee" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderCHECKED.so" Hash="83c9525657cecaaa157de4a74662d7ad11c2d79f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderCHECKED.so" Hash="5a6e3020cdb33cb083c0b7798ba119680920849b" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderCHECKED.sym" Hash="7bd8ea5ba380dccd1e5111e7eec0dae59e5198f3" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderPROFILE.so" Hash="c70f955af760e625983bb4cc96b6115a125ca00b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderPROFILE.so" Hash="b539d3a3243d81ecc9ae1194d114816208528d6c" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libAPEX_LoaderPROFILE.sym" Hash="7f316e830c54a876a0cdb8fd398516c711922af7" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommon.so" Hash="119ec54f8833c3ee057914437689c5a00a759f44" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommon.so" Hash="9717043b2248d34142f30f3ef5b527aca7f0b991" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommon.sym" Hash="ba6c377717083580eda20383f125e4b33aff5636" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonCHECKED.so" Hash="1ae207a22de07d84755dc25640e9e05ff5629549" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonCHECKED.so" Hash="3974ea0db1a28fdaebe5fa9cf1be71795f52ddf8" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonCHECKED.sym" Hash="7acb810dcd7bfdb335d97874325a5b501eefe628" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonPROFILE.so" Hash="72751e3abb13682cd763bde931ae0811f6a438ca" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonPROFILE.so" Hash="d33cc836c7e33d491f3305d152475eaccba5aa44" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexCommonPROFILE.sym" Hash="f66cbc8d0dc2192cf34271385ce63107cb3e260a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFramework.so" Hash="03e24557c7fef0d44192e3d0c3b37c55d33fface" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFramework.so" Hash="8f1a327f47bd5014499d65e9361800c70244388c" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFramework.sym" Hash="5fdcd504747cb758bee8d5c69872a7b3f7c2d197" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkCHECKED.so" Hash="2d9fb5e66354c9b0c3faeeeb8c7af2b512f1fa81" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkCHECKED.so" Hash="fe6f1f2584cdb9895978e214728e345ba7e8fcda" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkCHECKED.sym" Hash="f8b73ee896cc169f3b6b3098bd7e5c388d773774" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkPROFILE.so" Hash="8e8b25e00cf9ff0c5cba056f907104e0abc60318" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkPROFILE.so" Hash="0a2f1fc15f0f1abc79a2f898645887b79a26b869" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexFrameworkPROFILE.sym" Hash="6723ff7842331024949ab531100aa2aecf63041a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexShared.so" Hash="6e811b431ab23e53372312561b70889a4ccab0d6" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexShared.so" Hash="7b94c847a3ab2eaf22230569fbacd2ce56122760" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexShared.sym" Hash="70a6f6d4685d433126fd9767a56f8cb48a9a0f6e" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedCHECKED.so" Hash="d3ae3febb43772c2bb51cadd04f0d8452dd926bc" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedCHECKED.so" Hash="dd5b21b48b33907c93448fe30f3155ba3b520dec" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedCHECKED.sym" Hash="26f72b9cc503148f7cc349560ad459c15697b7cf" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedPROFILE.so" Hash="9e74967e28af9c28438df886d47d0e6cd5deb132" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedPROFILE.so" Hash="a5c256edb818f69e707e1e14a542b1e1cf6432a9" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libApexSharedPROFILE.sym" Hash="bba17f7d4f781b62e711608baf080a69342ad5ac" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterized.so" Hash="bbc4cb6db28b04faa035228ec85c9276340b3558" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterized.so" Hash="57d7b27c046f983d8d7d5994e48ae3a3a81a2d94" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterized.sym" Hash="c85c55fa8f2b01ce4d8837e0fe35c03e49f38eb5" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedCHECKED.so" Hash="ab79244bfdd76067cb7363d798bd3c5d718d0e6a" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedCHECKED.so" Hash="4aaf63cac75c61496ab318849e4fa500a2eb3f11" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedCHECKED.sym" Hash="6db3ac952415ac92d65439e4f5fde67dcf172538" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedPROFILE.so" Hash="b99a302de7dc7c60ec6e9ed392dc80a70f7b78ec" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedPROFILE.so" Hash="ffbca271a3eeb960c49c3fc647c16075a4242fc0" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libNvParameterizedPROFILE.sym" Hash="a01441505d1e2becebef1805c2a768fd08cb4cba" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebug.so" Hash="89ce2ec7de75965d98a44602b444a19f258b9d72" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebug.so" Hash="0265a90b30e3b7f20d26a6f84ff856c8b58da9a4" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebug.sym" Hash="7de9d5685b80f4bdf2655e15d0aea88cd59f374d" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugCHECKED.so" Hash="07c03ff79e2feca4c61af4e2c562efac7b996be4" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugCHECKED.so" Hash="84e0bf94156133de761c36cc6766dc4bc9e83f25" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugCHECKED.sym" Hash="5f9041672d7b850c475a7069c60e94c6f7846eea" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugPROFILE.so" Hash="0912a340f0056a020310677cf7c8d10ba4b300ba" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugPROFILE.so" Hash="81f0c10044850cac38ea383fdd8aa08b823dc431" />
     <File Name="Engine/Binaries/ThirdParty/PhysX3/Linux/x86_64-unknown-linux-gnu/libRenderDebugPROFILE.sym" Hash="f3a1cc06751edd146256c4dbb0caf26cbcd06f72" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Clothing.dylib" Hash="3ba45307ea50680c01292c35a853d13c2c693f7e" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_ClothingCHECKED.dylib" Hash="735e6e03c1a4decadf28d05575277755eab26739" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_ClothingPROFILE.dylib" Hash="6f91eb55c3c64337e8eab9ddd9d16dd75bc49553" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Destructible.dylib" Hash="b4750cf28db758200ffefe1e8ef6533ac9f1997f" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_DestructibleCHECKED.dylib" Hash="9fec75801453e33cde16b505470134c9d8829a85" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_DestructiblePROFILE.dylib" Hash="737ff55ecc52d699820893eb4e19757f9d575aa9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Legacy.dylib" Hash="f9a75cca8c6b18955ac2d2e47b7a6da87858bebf" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LegacyCHECKED.dylib" Hash="17cf5d3ef865621c9d3f96ec0941d2442358ed9f" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LegacyPROFILE.dylib" Hash="924dbc6b400c788c582dae9f5324600acc761b2a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Loader.dylib" Hash="a39078d8544e34e9b1c9c887f2b1f668116278cb" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LoaderCHECKED.dylib" Hash="dfd008ea63485bf796bb9010103657cc95d21cfb" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LoaderPROFILE.dylib" Hash="b818d9e007df7571d45876643a421d1450a73196" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFramework.dylib" Hash="777f649e2c88d0dc0cc4340a6ac2f80d7c4761e5" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFrameworkCHECKED.dylib" Hash="0c027c61e01ba16516e22bf32a2bda33214bdb86" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFrameworkPROFILE.dylib" Hash="bc6212de48f41301d37a44730e11a6c271361bb6" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvCloth.dylib" Hash="a124d392c847379a3e137fddffb76ddc4905a15e" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvClothCHECKED.dylib" Hash="0c6dba40a00a4db7b526ea5468ffcd78c5b668bf" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvClothPROFILE.dylib" Hash="a4ddd4a8418992997829c2c153680420dda0ef90" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3.dylib" Hash="2cc966e5953139a1d17340b8d2aeeca093be86e2" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CHECKED.dylib" Hash="e409cc5fc1eab9e5718b0fc07874befbae7e9a28" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3Common.dylib" Hash="842bfe54e2b89ad73f843d2092c70f87c3047ce5" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CommonCHECKED.dylib" Hash="5290aa5b90fc715824a8c19494b0ee4bfbb01152" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CommonPROFILE.dylib" Hash="b33df60375dc6280ff8af42b9a2be93c4be4b775" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3Cooking.dylib" Hash="3596847caa75b37624662fa96333d83b77d9dc77" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CookingCHECKED.dylib" Hash="b99c0a8ee9509d05fa6e8586ba98bdcb54aee5b3" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CookingPROFILE.dylib" Hash="a7ec5d4398df35a92ff2f2b3ed9d120e21756c46" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3PROFILE.dylib" Hash="2e16c1bf9b7870dd4b1c5296561b00aa547a80a6" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundation.dylib" Hash="28864dfca72db20b6a8a054107ac62b99e9fed54" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundationCHECKED.dylib" Hash="59a29c5b5d96d9a83cbca398417bba281b9d3aff" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundationPROFILE.dylib" Hash="99a01526135568818616717b9b3f9ca2101143a4" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDK.dylib" Hash="aef385f6450ed203f2a61a5025be0ce51fea6db9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDKCHECKED.dylib" Hash="0335d605bdc0906ca6ace740aadf2b37cb4286e9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDKPROFILE.dylib" Hash="0cfed61d27289cb58800f954b00502ec029f40cc" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Clothing_x86.dll" Hash="f830328d722188485d4933308e70b450162ce525" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_ClothingCHECKED_x86.dll" Hash="0fb115c49993948b0ecd61df9780eac9d661c728" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_ClothingPROFILE_x86.dll" Hash="b1f579878a4606c1146603abd5e2370d85c2ace4" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Destructible_x86.dll" Hash="6012c15c65de6a50f77b50ecacd49d9e6248ad7d" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_DestructibleCHECKED_x86.dll" Hash="4f76db515c1cdd02c3c2af8fadbfc5f058b5ff14" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_DestructiblePROFILE_x86.dll" Hash="dd89ce70abd5100b538c2f122fb717459992f939" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Legacy_x86.dll" Hash="2956dfc045b6f95720ccf5a37ee02e48a18efd58" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LegacyCHECKED_x86.dll" Hash="fcedfb9b6b88551dfc1274413fbe82aec8494828" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LegacyPROFILE_x86.dll" Hash="fbfd7fa9203114500ac0c219cbbbe6f1b4e385a6" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Loader_x86.dll" Hash="a649692b7e8b4f5bd13bd21651c465ba8ccc2220" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LoaderCHECKED_x86.dll" Hash="9e7c48faca745427a3e7eeb8753c8ae821580ca4" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LoaderPROFILE_x86.dll" Hash="7428c4bcd490d435fdde303db3abd94f9217c96d" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFramework_x86.dll" Hash="b66876dbaab051cd490e8b9bb3748f9099bbdb97" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFrameworkCHECKED_x86.dll" Hash="5c3c830cbd1c0d310cc93cf16bc4cf9512ae8996" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFrameworkPROFILE_x86.dll" Hash="975c036e8ba74a05770269a56c5df179e9862475" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvCloth_x86.dll" Hash="d8ba99d5fffb9af2b89278fcded0e33927494897" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvClothCHECKED_x86.dll" Hash="30fbffdabf25140dc92654a78d3c62582bca37a2" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvClothPROFILE_x86.dll" Hash="621cb18d4d9b88cd6f4225d9d93488a0540b289a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3_x86.dll" Hash="4f4979881627c72c8dc249bbf2c18408bbf7c39a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CHECKED_x86.dll" Hash="9c6b4371215bfbb7b74e739a7260e441db8a3ed3" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3Common_x86.dll" Hash="a328ca32109f94d5b4b735b7e4631540d7e3a183" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CommonCHECKED_x86.dll" Hash="76aab40da418b1bb252dfd364a62d76ff84b8c80" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CommonPROFILE_x86.dll" Hash="fb651936934580a849ce8ffd00beaaafdc5ddcd8" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3Cooking_x86.dll" Hash="7df93f8009104c4e474664ec3dc29420f3421145" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CookingCHECKED_x86.dll" Hash="499e38fede97e17a37ab935550230b48b586720e" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CookingPROFILE_x86.dll" Hash="9006d062e2f3501d90c9e52f976f985e564a051b" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3PROFILE_x86.dll" Hash="fd36c9ae10127f2b58f6a0cd9294d6dc6c30a139" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundation_x86.dll" Hash="e7f217f2f1d071626326a52b3b4ceeae1cab28f6" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundationCHECKED_x86.dll" Hash="43b30781188587b668b25586edd1e3b3886d9bc9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundationPROFILE_x86.dll" Hash="8c6364be6c1873a41a184c80324945bfc60e6801" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDK_x86.dll" Hash="38e87eb9ab5b11eef9f1614d36e39312f02755ad" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDKCHECKED_x86.dll" Hash="c4c5336be1473ef98eea802a8120d60f67ac7258" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDKPROFILE_x86.dll" Hash="80767b32d8ec94fa66b312c89d632b3ddecee300" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Clothing_x64.dll" Hash="f484bf68a414685cb0fcd20f6e25e6a2ebc9f225" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_ClothingCHECKED_x64.dll" Hash="165d73c22ac21ac7a0caf381d296cfe862fa1712" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_ClothingPROFILE_x64.dll" Hash="552ae554caf3f4a685465f7c9a5b9336ed7ad1d8" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Destructible_x64.dll" Hash="f5093cadc43e3e86f4ff524a3047533276504c46" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_DestructibleCHECKED_x64.dll" Hash="5a24b3387863d0c9b3c37fc2dbd448f78ae486fb" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_DestructiblePROFILE_x64.dll" Hash="7932dab4a4fac0e60d84c22fc98be5b8797780f2" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Legacy_x64.dll" Hash="b63879e61f95fb0d409a43905e3cefddb8f20492" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LegacyCHECKED_x64.dll" Hash="00283db582e336da2a54b16b1e2040b46d7db8f9" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LegacyPROFILE_x64.dll" Hash="2ac06b777b725a70451784d1a0a0975670582ab2" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Loader_x64.dll" Hash="db7d69138207783eccc921a998ec8741b6a563ff" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LoaderCHECKED_x64.dll" Hash="72529efbf0f918713b34d77578d6180e62332543" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LoaderPROFILE_x64.dll" Hash="45d72d086d55ce54c548f2bd506d2d1e10b66d96" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFramework_x64.dll" Hash="bb6089e9c42b215a3322281d01115bdf15a5b77c" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFrameworkCHECKED_x64.dll" Hash="ce05d1119a7103620f3b8d53dcb5d437d335ee76" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFrameworkPROFILE_x64.dll" Hash="a4b5c06c4a07647fcb8da5675ec533628c0a4294" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvCloth_x64.dll" Hash="f16ef95facb41435ec7dc084543e8af889daf90a" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvClothCHECKED_x64.dll" Hash="36aeb7774dfc357eeeed14ed9875b0c8a904d4d5" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvClothPROFILE_x64.dll" Hash="00834601c180b56bd2b86fb532a1d7c66f3c5a63" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3_x64.dll" Hash="ad6fe76105d415d4da47838147103ad2249e908e" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CHECKED_x64.dll" Hash="f8eec2951b91339b3bf5b21fe7950e4002516961" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3Common_x64.dll" Hash="887d83e99b55bfe607e8cc4e21b47e6485c920e3" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CommonCHECKED_x64.dll" Hash="c78e3c39b26d871f12f38bb3eb62b86e2a18f090" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CommonPROFILE_x64.dll" Hash="52a6798b9146ec1ad3bb156ee3a9ea669dc2e27d" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3Cooking_x64.dll" Hash="8b4ec79c7e170ac031933e8aedc459d4e2559b64" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CookingCHECKED_x64.dll" Hash="5b197772b6c23dc72c0b018437b89d3e1a201359" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CookingPROFILE_x64.dll" Hash="35a54c4e3302c17c4b71dea7964d9b8cee0731a0" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3PROFILE_x64.dll" Hash="a49bea50ad0bc0b74e3035c98bb782160abcfc59" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundation_x64.dll" Hash="40c20df104f72aa88c324687d6c0ecef7574c3c1" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundationCHECKED_x64.dll" Hash="e243a5ef6d613bff76a06e9f0c8a9f88f6459f07" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundationPROFILE_x64.dll" Hash="f0f8755bd3c23c18b37f38047c587025dc26df48" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDK_x64.dll" Hash="8170e226249287b34e12f2561c32cad6ee6882e0" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDKCHECKED_x64.dll" Hash="bf72d96dddd709ed8f039e824c627cabcf19dbca" />
-    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDKPROFILE_x64.dll" Hash="0ba6435bac1297b4843efbbf53c33c1e34b66217" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Clothing.dylib" Hash="58dfaa18621ba6fc4926649fca309bd1eae97fc7" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_ClothingCHECKED.dylib" Hash="1b230a69ed1666ce93b6859f69fa8a31922aaf11" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_ClothingPROFILE.dylib" Hash="b28a10fceba869982bebb946ab1fde4a7380cd58" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Destructible.dylib" Hash="11b45ae237252c736db04d5e1aa7906da75c03ad" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_DestructibleCHECKED.dylib" Hash="4965afe8a6f85a1672d0d85baec12be53452c6af" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_DestructiblePROFILE.dylib" Hash="17b0008e2e66201a78b3101e6954c936a6f751b0" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Legacy.dylib" Hash="c9095ae67fa7f236cd029f9bfb176d4aa0335ac0" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LegacyCHECKED.dylib" Hash="d3c00cdd66ef136eaf9982e947884d1a21eae7b2" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LegacyPROFILE.dylib" Hash="79d9bdd67133309c7cae40bc3de8b416c84c3c23" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_Loader.dylib" Hash="58d1050d7d8208c7c1f0bbf450776fdb71d3e465" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LoaderCHECKED.dylib" Hash="1b7eae552c005a9858e7f8aca321942528c274b4" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libAPEX_LoaderPROFILE.dylib" Hash="13ebd67df94197a29e06475c4082efd8ffed88cb" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFramework.dylib" Hash="68c1de26d47f9194d3e15e1d1b4da551b41087ea" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFrameworkCHECKED.dylib" Hash="bbd8c3bdcc1e130ca614c66f287d8df17bf46ee8" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libApexFrameworkPROFILE.dylib" Hash="63b44b589a9ab65d12457a57560058a4151d228a" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvCloth.dylib" Hash="b346a43834157f52721608700f19e7ee9437ba80" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvClothCHECKED.dylib" Hash="e1e04389563a7ef0b45bac48f3b9da4f58835c18" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libNvClothPROFILE.dylib" Hash="d8b76739c696bee1e2b3d2dccf3bdcbf13985dc6" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3.dylib" Hash="d127e393402fe8562185a6e1c9e55d00d81928ff" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CHECKED.dylib" Hash="47fc435cb8f2c45543d10cef0ff348b1c075da7a" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3Common.dylib" Hash="f93c2e860858e098ca421096c6a9203816d5e229" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CommonCHECKED.dylib" Hash="6ed5445fba26ed2a098f273dbb2252328a70d7af" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CommonPROFILE.dylib" Hash="87790c604f96d875df776fcc310b634674ed6939" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3Cooking.dylib" Hash="542a94f337ca14fc83431e8816405645189e1da9" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CookingCHECKED.dylib" Hash="599ccc44b67b2e502ef880da192940080d80c594" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3CookingPROFILE.dylib" Hash="d85973fb8b4983590a989111583bde71594b7033" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPhysX3PROFILE.dylib" Hash="37ff54552ab36835e0139b35a9166e50c4a7259b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundation.dylib" Hash="e2d05afae0cd28a5a9c519168560cebcb3bf4123" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundationCHECKED.dylib" Hash="9b60bb00f0f1c2f999096e43e2fdca28cb731568" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxFoundationPROFILE.dylib" Hash="bc63ab245348f82bd3f9eade5f7ede8a5f2ba642" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDK.dylib" Hash="3798242be9140bd53865f82bbeefe7eca540b06f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDKCHECKED.dylib" Hash="026ed8198d224a572eb597a81c3ca273a8f9aa50" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Mac/libPxPvdSDKPROFILE.dylib" Hash="4f67308bc14dc24480c1752943713acc13d7ae64" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Clothing_x86.dll" Hash="6159218f33bcd7857c4dcd4e885088c040c3cf19" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_ClothingCHECKED_x86.dll" Hash="1a7b717ab1c96366d800aefe2920c5eb4917af69" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_ClothingPROFILE_x86.dll" Hash="ead70a122d6b48ff92926b2f08daebc2e8b5ee6b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Destructible_x86.dll" Hash="d4dcf216baf67366af13a499051226596efbce3d" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_DestructibleCHECKED_x86.dll" Hash="d3b244f72b151b60c7275e5078572a1e37ef1bde" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_DestructiblePROFILE_x86.dll" Hash="31951e66b1c1299d04435dd841f92108783aad1b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Legacy_x86.dll" Hash="dc9ce22fbcc592a22b1570238990bfc7c77b771d" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LegacyCHECKED_x86.dll" Hash="dfe87cf222c8e2517a66d55c4262ffc0bd8e858d" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LegacyPROFILE_x86.dll" Hash="38b29e6a93d6e906ce2f3131209de9c4d158931c" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_Loader_x86.dll" Hash="e4917df6fbab3c32121a5468837aa6840077b2ec" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LoaderCHECKED_x86.dll" Hash="8cd1e13869dcaf7ea0c0788f44a01c9627bac17f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/APEX_LoaderPROFILE_x86.dll" Hash="573d3c54ff69bd693e4997f48dceacb9941ff171" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFramework_x86.dll" Hash="639857cd7b9b8196a3cad6baa8412a09165f23b4" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFrameworkCHECKED_x86.dll" Hash="ccc0fa61f44a67ccfc924d5ee70804c0ca0f4793" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/ApexFrameworkPROFILE_x86.dll" Hash="d0f27c2e907bee02f253629229a678141296985c" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvCloth_x86.dll" Hash="989c5c1c8b69f1a2547ed10f3ab0e65425b25315" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvClothCHECKED_x86.dll" Hash="3e2d93e65956de9eb80cc2d1f61e5b7958711330" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/NvClothPROFILE_x86.dll" Hash="b5f56597652c4b3b49a87ee53f2df342648473f6" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3_x86.dll" Hash="33f4cbbb9d813dbe7013f29a8d93f599ff338326" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CHECKED_x86.dll" Hash="b16547fe68e38a99b7594694bc8b832a8cdbd88d" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3Common_x86.dll" Hash="b7da1ff9e9125c3c284e443da2c4e8e8fafd9950" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CommonCHECKED_x86.dll" Hash="f0abb17b3d436a095e8349854a5f19f93f87df70" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CommonPROFILE_x86.dll" Hash="c9efc27d56b9ada9eb7f971cef2495ac0ce02283" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3Cooking_x86.dll" Hash="cc891430b356124a88c4e0373b3c076e3588289b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CookingCHECKED_x86.dll" Hash="bc5ca3bce0409e0bfe002d0b1d8e54c481cf86fa" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3CookingPROFILE_x86.dll" Hash="b95a9814cdcf208b0858d2b5d7d997bca44f1b66" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PhysX3PROFILE_x86.dll" Hash="c50919bbf859e67455c30ebf308d3c0c1b6601b3" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundation_x86.dll" Hash="751e575065e8cf2c5daf1b15be5f12f2bb96a244" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundationCHECKED_x86.dll" Hash="e2c1f2ee2e367fc42ab12cc072ae1c5155461964" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxFoundationPROFILE_x86.dll" Hash="1be597f11bdb7477c6099a082c7b9915971a43d2" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDK_x86.dll" Hash="0017abf5dd27c4ba214d51a16254cc7834ca0528" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDKCHECKED_x86.dll" Hash="753a4b804c3de170a7c3456fd53344a5e978482f" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win32/VS2015/PxPvdSDKPROFILE_x86.dll" Hash="4a079aec90dceafa33ca9d66c8a7b4a82867f67b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Clothing_x64.dll" Hash="26513f0840da686fbc5cc3566cac759156ee4231" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_ClothingCHECKED_x64.dll" Hash="0960627a1e5fdb07839a9b5acbbead47806f54b1" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_ClothingPROFILE_x64.dll" Hash="a00d4d45542d74c905c3afdf771c7211e3421ad5" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Destructible_x64.dll" Hash="9c5ccfa6289ec2619d9f1d0e2185c0520ad5daca" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_DestructibleCHECKED_x64.dll" Hash="2010de50eac357ef34cd49f3a8523c7a4c962abe" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_DestructiblePROFILE_x64.dll" Hash="235b9984b688f227e79f95ac7a66d08016dad126" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Legacy_x64.dll" Hash="129c583522f76a3c0244bf2a2c5c0e609929a835" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LegacyCHECKED_x64.dll" Hash="470df5a50d5b1bf08750efe51c43cdf99c826ef2" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LegacyPROFILE_x64.dll" Hash="9cf7530f3981921a946151eecd23f95cc239628c" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_Loader_x64.dll" Hash="c1694c64fbbad7a8cba0061eeb32171ecbdcf9c0" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LoaderCHECKED_x64.dll" Hash="306c00c6958d70442f2b2ff72755efe217eeba75" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/APEX_LoaderPROFILE_x64.dll" Hash="8bd1a3871291273619debe6777758fec367edf30" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFramework_x64.dll" Hash="f3f7394f11a5f883be0754a725ab3995aabf8472" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFrameworkCHECKED_x64.dll" Hash="9d664cabeace8f83bf719e96959375b83b4364b4" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/ApexFrameworkPROFILE_x64.dll" Hash="a71df503fab3ad2b8d26b29ffbee96361a83ef16" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvCloth_x64.dll" Hash="52ec2d446e53fc6f15cee538a3c0eec0bc3f1812" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvClothCHECKED_x64.dll" Hash="b31dbff358bdf706650805769ae7782236a48c9a" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/NvClothPROFILE_x64.dll" Hash="c0bc163f6a5e2b1a733de3f0483e192eefa42a64" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3_x64.dll" Hash="f24fa9496bc9400ecb134e9a90f63ea714a4543b" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CHECKED_x64.dll" Hash="5fc54f598d49c54fcac88bff3a3f501421e8ad53" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3Common_x64.dll" Hash="ffc1e727aa13a3d2abf2e98835325c90597bfd9c" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CommonCHECKED_x64.dll" Hash="2e5de6c4a8ee884084d03eb93431682d9f0f11b0" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CommonPROFILE_x64.dll" Hash="2c6c67c09ade993fdbf20a52e29d642d6534d744" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3Cooking_x64.dll" Hash="de44a04626ee507d016b9c9e25d4755647157ded" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CookingCHECKED_x64.dll" Hash="1a4e13067fa4dc8958f86d3051074a277979e411" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3CookingPROFILE_x64.dll" Hash="865b618c6b28ea92999e9be685155a986bd4d194" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PhysX3PROFILE_x64.dll" Hash="2c47b8afe930e075870bfea16f908f70efbbaf9c" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundation_x64.dll" Hash="45f8a9df27c8ab83a901a5385d23a1ce52f8a048" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundationCHECKED_x64.dll" Hash="20d912b80b145dfe4b1bbd0bf07ab0c21f58f762" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxFoundationPROFILE_x64.dll" Hash="decc4c2de42e9347ac9d4c1ee1ffe5243ca482c2" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDK_x64.dll" Hash="f584d8f0c66114e83d0dd29a11c2e8b79eeabb75" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDKCHECKED_x64.dll" Hash="704abac9cfab39398d9135e7a058e7a12669b247" />
+    <File Name="Engine/Binaries/ThirdParty/PhysX3/Win64/VS2015/PxPvdSDKPROFILE_x64.dll" Hash="04fdacdc71054684b1248260b645ed8e49a8cc85" />
     <File Name="Engine/Binaries/ThirdParty/protobuf-net/protobuf-net.dll" Hash="21bd9a51a0e5a5af6e12e685533f96b3d705df0c" />
     <File Name="Engine/Binaries/ThirdParty/Qualcomm/Linux/libTextureConverter.so" Hash="b673a49de2387ca4021739f8c0c2e4b907ef6285" />
     <File Name="Engine/Binaries/ThirdParty/Qualcomm/Win64/TextureConverter.dll" Hash="a99eaca9858f46cf82753552843cc45d6bfbc063" />
@@ -3381,12 +3386,12 @@
     <File Name="Engine/Binaries/Win64/tbb.dll" Hash="948747ed8e1ca3b4307e79adba30e886d9b08780" />
     <File Name="Engine/Binaries/Win64/tbbmalloc.dll" Hash="69165a1bbd3619ca3bc21a363d34e43001db6f26" />
     <File Name="Engine/Binaries/Win64/UnrealCEFSubProcess.exe" Hash="c2051e1573ccaa942fb4ff043386c989df2dbf7e" />
-    <File Name="Engine/Binaries/Win64/UnrealPak.exe" Hash="9856f700ab8ca6cb5c18a0df6c6214b125733ab4" />
+    <File Name="Engine/Binaries/Win64/UnrealPak.exe" Hash="71beaac3dd754b654954acdd709b4a91296c6835" />
     <File Name="Engine/Binaries/Win64/UnrealVersionSelector-Win64-Shipping.exe" Hash="843b127b5a09dc2c0070f062c74e53b318265851" />
-    <File Name="Engine/Build/Android/Java/gradle/app/build.gradle" Hash="a35cc7cc1037ef5ec6ee2a855dcf49e906ca57e9" />
-    <File Name="Engine/Build/Android/Java/gradle/build.gradle" Hash="78e8c36d009273a970eda15f2363c2fe6577b63a" />
+    <File Name="Engine/Build/Android/Java/gradle/app/build.gradle" Hash="5e3bcb6e392586d02804694c428763a00672c6ab" />
+    <File Name="Engine/Build/Android/Java/gradle/build.gradle" Hash="3b9ca9783f28abc1086001fdb45f582664a9c0c8" />
     <File Name="Engine/Build/Android/Java/gradle/gradle/wrapper/gradle-wrapper.jar" Hash="92d0b85fb15ec7ca7aa72eaab4d5f7faac9297d1" />
-    <File Name="Engine/Build/Android/Java/gradle/gradle/wrapper/gradle-wrapper.properties" Hash="aac19721a1193bb92f2c3cba00147b82d82f56e1" />
+    <File Name="Engine/Build/Android/Java/gradle/gradle/wrapper/gradle-wrapper.properties" Hash="80a9a3cee9b672b3923de107a62b950908ea9ae6" />
     <File Name="Engine/Build/Android/Java/gradle/gradlew" Hash="6409d6256df6b2f9e2142183b4c6408823a10f6a" />
     <File Name="Engine/Build/Android/Java/JavaLibs/downloader_library/project.properties" Hash="a674aaa1775d7be4f09a68b45a49a8589ad4937e" />
     <File Name="Engine/Build/Android/Java/JavaLibs/downloader_library/res/drawable-hdpi/notify_panel_notification_icon_bg.png" Hash="58dcc555d077d5c27b8a92fc03b584da346df81d" />
@@ -3415,10 +3420,10 @@
     <File Name="Engine/Build/BatchFiles/SyncToRemotePC.exclude" Hash="b3212a94d187c614717ed7607cb9ac4d4cd9bdf7" />
     <File Name="Engine/Build/Build.number" Hash="ec21267b15b6e5e580ef3051084e8f373037c2f9" />
     <File Name="Engine/Build/Build.number.test" Hash="d583c3aa489ed954df3be71e71deae3a9895857e" />
-    <File Name="Engine/Build/BuildFarm/Build.pm" Hash="06fa780ee959a7f3df92075548f3df41f60bad6f" />
+    <File Name="Engine/Build/BuildFarm/Build.pm" Hash="61436c437fa3258050062534a585ec7b004d08f9" />
     <File Name="Engine/Build/BuildFarm/Commands.pm" Hash="b53ac8e7c9576d9892d4099f626d4b2ede2890e4" />
-    <File Name="Engine/Build/BuildFarm/Dashboard.pm" Hash="06768b4016a2ba5bd4c4f9c090a6bf54b66e0e1d" />
-    <File Name="Engine/Build/BuildFarm/Notifications.pm" Hash="2597962f6d685d1025b4e8b783530f47b074f086" />
+    <File Name="Engine/Build/BuildFarm/Dashboard.pm" Hash="94689c9b95f9d5aaf68bac127bc2d41c9c709c1f" />
+    <File Name="Engine/Build/BuildFarm/Notifications.pm" Hash="5e9682d28838e91c83792346b9e4870717784689" />
     <File Name="Engine/Build/BuildFarm/SafeDeleteDirectory.exe" Hash="324feb4fc1f41a602d739945335f53487675f4ba" />
     <File Name="Engine/Build/BuildFarm/Utility.pm" Hash="d7553784c18585bc44e06d09fe4e6728734e5b32" />
     <File Name="Engine/Build/BuildFarm/Workspace.pm" Hash="2a519fe65edc4567a3f1b6f501357895dc8203dd" />
@@ -3616,7 +3621,7 @@
     <File Name="Engine/Content/ArtTools/RenderToTexture/Textures/TilingTexturePreview.uasset" Hash="d99a3209481f876fb761ab296b4d0a0373a72b25" />
     <File Name="Engine/Content/Automation/bower.json" Hash="5c938e34b53f03794faef0647636c032f51459c3" />
     <File Name="Engine/Content/Automation/img/ScreenshotBrowser.png" Hash="742f1a4a34051c766ba20528f49cbbaaa72827ee" />
-    <File Name="Engine/Content/Automation/Report-Template.html" Hash="738337870e8284d43e1255f9f49e0c145a2ea2cd" />
+    <File Name="Engine/Content/Automation/Report-Template.html" Hash="214f46e69db767215bef01deb78679cbf1f4e69e" />
     <File Name="Engine/Content/BasicShapes/BasicShapeMaterial.uasset" Hash="3eec17b8e82aecf070e41b024a56dd27add9eacf" />
     <File Name="Engine/Content/BasicShapes/Cone.uasset" Hash="f32c978931ca10daa6cd032943dd99f4fee17ca1" />
     <File Name="Engine/Content/BasicShapes/Cube.uasset" Hash="75ec3a1a0293c07ae3dbb982d2f0703f1f6f8a62" />
@@ -5856,6 +5861,9 @@
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/AnchorGizmo/topright.png" Hash="bdd29287f273eec4ac5aa1c86ffbcf2f0876aea3" />
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/AnchorGrid.png" Hash="d04a5f5636e8ceb7bea4163d228e6c83cf396ad8" />
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/Fit_16x.png" Hash="c873061705d2cf50c64d5ef66bfb53e2fe0140be" />
+    <File Name="Engine/Content/Editor/Slate/Icons/UMG/Icon_Landscape_v2.png" Hash="433f1e2ebc05e94a2debf19af639f5b05bfba7fc" />
+    <File Name="Engine/Content/Editor/Slate/Icons/UMG/Icon_Mirror_v3.png" Hash="40a4398cdbbfb7e43890f029a3f3cdd9721526b9" />
+    <File Name="Engine/Content/Editor/Slate/Icons/UMG/Icon_Portrait_v2.png" Hash="c2a3b50bac088af2d2510642462d2729c1458537" />
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/Layout_TransformMode_16x.png" Hash="2d71523c13c252ecdc9c1720c4f005c16c5b9d23" />
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/Render_TransformMode_16x.png" Hash="b5d60665dfd661c7b32a67bf06209c791f25b7c9" />
     <File Name="Engine/Content/Editor/Slate/Icons/UMG/ResizeAreaHandle.png" Hash="6242c54270b3fed8c1d74deb7ba67f4f5d38e0d2" />
@@ -6799,7 +6807,7 @@
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeGizmoHeight_Mat.uasset" Hash="8421cd8fc42be1c6601e0d465b1180de1c9f12f1" />
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeGizmoHeight_UnderMat.uasset" Hash="200eeaccbbfa55f27ae6c780da58588ce720944a" />
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeGizmoHeightLookup.uasset" Hash="e794e1bfa100db0cf0fbd46606cad94ec25df04b" />
-    <File Name="Engine/Content/EditorLandscapeResources/LandscapeLayerUsageMaterial.uasset" Hash="e01a9a8cda8411b7de8a87c8d5e885f3bbb97f35" />
+    <File Name="Engine/Content/EditorLandscapeResources/LandscapeLayerUsageMaterial.uasset" Hash="31ce418c20e1d60f72476a5f9961eae3274c8a1c" />
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeLightingMaterial.uasset" Hash="fabf3ae13290e7f9694a9f2ebf079b6c4600e134" />
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeThumbnailHeightmap.uasset" Hash="5f2984112ce9ccff0e39f0c541fe5181749b90e4" />
     <File Name="Engine/Content/EditorLandscapeResources/LandscapeThumbnailWeightmap.uasset" Hash="c4c33c4042c29bcdd194c94f8b34b953e7124ef1" />
@@ -7164,6 +7172,8 @@
     <File Name="Engine/Content/EngineDamageTypes/DmgTypeBP_Environmental.uasset" Hash="2a830b2c7fee7b3fa00387db596fa2fb78b1ef65" />
     <File Name="Engine/Content/EngineDebugMaterials/BlackUnlitMaterial.uasset" Hash="37ccdfdf93083e1faaa6c2a59812232b6496f1b8" />
     <File Name="Engine/Content/EngineDebugMaterials/BoneWeightMaterial.uasset" Hash="d982d9b3bf0a77169629966f48828c62317ff947" />
+    <File Name="Engine/Content/EngineDebugMaterials/CASC_Cross.uasset" Hash="e2dc47861a05369b1b2dcf4a1cdf9388311407a6" />
+    <File Name="Engine/Content/EngineDebugMaterials/CASC_None.uasset" Hash="5643e6cb7e0ba43b384705a070c1ca19800a52fa" />
     <File Name="Engine/Content/EngineDebugMaterials/ClothMaterial.uasset" Hash="2c5aefaae7b623b707a4ebf48f93a73453541202" />
     <File Name="Engine/Content/EngineDebugMaterials/ClothMaterial_WF.uasset" Hash="984738645c3c5cfad1ee96d0e5b0e3d4a495475d" />
     <File Name="Engine/Content/EngineDebugMaterials/DebugEditorMaterial.uasset" Hash="b4ac1fbe0930bc1dc14c22eb14c59cf4f22125bf" />
@@ -7183,8 +7193,10 @@
     <File Name="Engine/Content/EngineDebugMaterials/MaterialError_Mat.uasset" Hash="23df9c64a6a5c47ff93c0936655d904a158d7bed" />
     <File Name="Engine/Content/EngineDebugMaterials/ShadedLevelColorationLitMaterial.uasset" Hash="0118eb3d76f347dc17a80c39c7175281999fcd39" />
     <File Name="Engine/Content/EngineDebugMaterials/ShadedLevelColorationUnlitMateri.uasset" Hash="41aa72b1ea9ee13678a6e959ca0a3ab761342a28" />
+    <File Name="Engine/Content/EngineDebugMaterials/T_1x1_Grid.uasset" Hash="8c981c73feed7dda4b5fb32ca0f48ebc05c7e4b4" />
     <File Name="Engine/Content/EngineDebugMaterials/TangentColorMap.uasset" Hash="901b4a9d560c63bcf044d92cb57bc2d50c34d4be" />
     <File Name="Engine/Content/EngineDebugMaterials/TangentColorMaterial.uasset" Hash="9edbda53fab92c88c06249f4acfe2f526f1d7cab" />
+    <File Name="Engine/Content/EngineDebugMaterials/TargetIcon.uasset" Hash="3d94d232477a1e3bbf628278e97426485abb034f" />
     <File Name="Engine/Content/EngineDebugMaterials/TerrainCollisionMaterial.uasset" Hash="9c1855d6b06aa8c88a218c236edb05041b43831f" />
     <File Name="Engine/Content/EngineDebugMaterials/TexturePaint_2Tex_Color.uasset" Hash="a0a648e83a94c3e008f91062904dfc9973545537" />
     <File Name="Engine/Content/EngineDebugMaterials/VertexColorMaterial.uasset" Hash="25b8bcc7f81d2bb1f9ef385dbacb0b7072dc6d41" />
@@ -7221,7 +7233,7 @@
     <File Name="Engine/Content/EngineMaterials/BaseFlattenDiffuseMap.uasset" Hash="8daa4d5cd11d75eb3d75e66ca1bd69ec64b88b44" />
     <File Name="Engine/Content/EngineMaterials/BaseFlattenEmissiveMap.uasset" Hash="6176a8d7be78901b04a67b27d31f291edb23a708" />
     <File Name="Engine/Content/EngineMaterials/BaseFlattenGrayscaleMap.uasset" Hash="35b06338b66cd25def9576cf3bebe936797df7a7" />
-    <File Name="Engine/Content/EngineMaterials/BaseFlattenMaterial.uasset" Hash="0070b9041735272ad1af720d6428f5e4d19e22fc" />
+    <File Name="Engine/Content/EngineMaterials/BaseFlattenMaterial.uasset" Hash="1603835a3cdd077c3873316bf7bec2b63b3beafc" />
     <File Name="Engine/Content/EngineMaterials/BaseFlattenNormalMap.uasset" Hash="3f01011b99351d849261ee641814ce48a5839069" />
     <File Name="Engine/Content/EngineMaterials/BlendFunc_DefBase.uasset" Hash="0c937928131445e0c5a3c8db89a9a111321792f8" />
     <File Name="Engine/Content/EngineMaterials/BlendFunc_DefBlend.uasset" Hash="715760fa7300a033e4a686aa68be1a5bfc0fc9e4" />
@@ -7499,6 +7511,8 @@
     <File Name="Engine/Content/FbxEditorAutomation/Keys_custom_240Hz.json" Hash="3d4c6ab580919c9fc2dfcaed6ce1dd8ba56678e7" />
     <File Name="Engine/Content/FbxEditorAutomation/LOD_StaticMesh.fbx" Hash="4785d515208f19dfb5b872abcf5bb1b36bf8623d" />
     <File Name="Engine/Content/FbxEditorAutomation/LOD_StaticMesh.json" Hash="566792ea7802b359cbf8b48caf5789ac67f79f54" />
+    <File Name="Engine/Content/FbxEditorAutomation/LodGroupStaticMesh.fbx" Hash="06cc1f02c003a70d3783ff6db6c4311d23679970" />
+    <File Name="Engine/Content/FbxEditorAutomation/LodGroupStaticMesh.json" Hash="a0341e2306c4c985fd1d7ea92f28250a93694af3" />
     <File Name="Engine/Content/FbxEditorAutomation/MaterialNameClash.FBX" Hash="210badc49a0ae080f2756160063d796b62e0b288" />
     <File Name="Engine/Content/FbxEditorAutomation/MaterialNameClash.json" Hash="d8353797b6db387324f4f265b73f14f6f36b88df" />
     <File Name="Engine/Content/FbxEditorAutomation/MaterialReorder.fbx" Hash="09998a89a2223bcb6fc44fc4f447f959d54826b5" />
@@ -7544,13 +7558,13 @@
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Coordinates/WorldPosition-XY.uasset" Hash="4c8cfe45e809095623b096f9debd2bd29aebb204" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Coordinates/WorldUnitsInPixel.uasset" Hash="2d2b3eb89b19674aa9650e8834a09aca29e2feb7" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Cubemaps/InteriorCubemap.uasset" Hash="4d15e4f5576b6865feae49cbbb553dd9ecc2d862" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/DebugBinaryValues-Float.uasset" Hash="57389d0a615763bfed546dc091ddc8977ec5748f" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/DebugBinaryValues-Int.uasset" Hash="b4488cd27dc637e3f70589f3e18b97d3da184d86" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/DebugBinaryValues-Float.uasset" Hash="e7364bec4fb97c154afab724196c2e1fa495860d" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/DebugBinaryValues-Int.uasset" Hash="8c772c3e35197b62d65bacafcc09d1f4541fbbb8" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/DebugIntValues.uasset" Hash="1479b0ce35423e73a9630d7241812035a09ac461" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/FunctionGraphSetup.uasset" Hash="9a31e63bafbbb223b319da219537488c1c0d7479" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph.uasset" Hash="b748adb28471c2b572d6f4a2734946390f6745c6" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph_Derivative.uasset" Hash="88d7b932596e88efec88e1d8c4594edb58168a79" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph_Setup_Input.uasset" Hash="e1b7717f6307157b1204696ab71619750ce96c01" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph.uasset" Hash="c92f97e652a4568dc41745209d5407866d10617b" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph_Derivative.uasset" Hash="dff2d0e003ce0e6e5a500b7b4fad25d8f9add13b" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/PlotFunctionOnGraph_Setup_Input.uasset" Hash="f0be1c3f739019c16085111e15a33a640c112681" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Debug/T_Grid.uasset" Hash="4d0326893dbf062ba177ff27f2b54711d842379c" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Density/ExponentialDensity.uasset" Hash="fea348e4251a63c474ecaa1b9ec3139556e3b8ba" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions01/Density/RayMarchHeightMap.uasset" Hash="46b9bca804bdcb19c1f0388a1ed7d135ad3e8486" />
@@ -7716,6 +7730,7 @@
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/FixRotateAboutAxisNormals2.uasset" Hash="acd2ecb0538702c65b03dd2e767aa6de0509ad29" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Fresnel.uasset" Hash="d31dd15dc3d5b1b99bc03ae7b35b5154a0929d09" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Fresnel_Function.uasset" Hash="6e313f4f5cbef5e89cdecabe2ce7f38eb62e6714" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Gradients/GetGradientMapRow.uasset" Hash="dd6f685e06d15d9b2ca6b7d12474eaf64fc1d9fa" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Gradients/GradientMap_Multi.uasset" Hash="eba635b50319fc8d02301cef80d1336fe97bd57a" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Gradients/RayTraceSphereFalloff.uasset" Hash="54f92156d8bce39600b541ecd66349e282c3a8f3" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Gradients/SmoothCurve.uasset" Hash="97b028bd646320d3138b09d3389d02df04e35c5e" />
@@ -7723,6 +7738,7 @@
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/HighQualityWorldAlignedNormals.uasset" Hash="87bd9c9dcb40d24dca0eba2553da633531671cb3" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/HueShift.uasset" Hash="06cf8ca65816644ab228a0e5df3f6ee5744a09d0" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Lerp_Multiple.uasset" Hash="4f758692b665570d57ac4dbc11a458b5b2cd0358" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Lerp_Multiple_Float.uasset" Hash="a3d6dccce90440d3fec4e204bb76c6c7fded9508" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Lerp_Multiple_Float2.uasset" Hash="d9fcfba0a59cdb36c224a1fd4e8d0857271bfc24" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Lerp_Multiple_Float3.uasset" Hash="e0affb06ac2e44eefaff36a8d2f0217a3e3d2b3c" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/Lerp_Multiple_Float4.uasset" Hash="18978b88eca4eb1717b1735e5a57c76934c1944a" />
@@ -7758,7 +7774,9 @@
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MS_MultiNormal_VertexColorNormals.uasset" Hash="b6e822880a479172e592eb16b3b1a6fa80605dd6" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MS_SequencePainter_Sequence.uasset" Hash="6ecf460f7762155b3a7d2314e43884bd31f3aa5b" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MS_SequencePainter_SequenceFlipbook.uasset" Hash="995c6c62bb11b2fabb6f42e72caf8701450d38a9" />
-    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MS_VertexAnimationTools_MorphTargets.uasset" Hash="cbb2bdf32e18f6f1fb67443543e90e5f7627c819" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/ms_StaticMeshSkeletalAnimation.uasset" Hash="eff9ac142cc9260fdd4384a56d4e89a22d7bb8c5" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/ms_StaticMeshSkeletalAnimationHighQuality.uasset" Hash="1a76e2013279263da0a7a689a03c69087b5c05d2" />
+    <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MS_VertexAnimationTools_MorphTargets.uasset" Hash="c9721f30a778ce2879ea41786d16b94242bfcfa8" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MultiNormalScript_UVs.uasset" Hash="280a67cb786eb9973145a7bf2d671bafd51ed20d" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/MultiNormalScript_VertexColors.uasset" Hash="bb341895ad89a7a5c2abb268ae24628744a41c31" />
     <File Name="Engine/Content/Functions/Engine_MaterialFunctions02/MAXScripts/SecondVertNormalSet_Script.uasset" Hash="0bf1683772202c6c613a79bec844a610b33da7fd" />
@@ -15910,7 +15928,7 @@
     <File Name="Engine/Content/Localization/PropertyNames/pt-BR/PropertyNames_FromXLoc.po" Hash="e33f1a8d282e6d89fbc77bb524c429b2a3b13a37" />
     <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames.archive" Hash="858426a70ea16eafecda2f12da319c8b3ae9a920" />
     <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames.locres" Hash="220250117a0408c2ae9e5520cd39ced7d3d73573" />
-    <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames.po" Hash="9a0b4cd85d7397b3f391c174b3e3ef9ac773a518" />
+    <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames.po" Hash="0c30e976b30fadeeee987e5bb49e66d5616954cf" />
     <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames_FromOneSky.po" Hash="3466ffd716598708dea6f2103b59c27823619286" />
     <File Name="Engine/Content/Localization/PropertyNames/zh-CN/PropertyNames_FromXLoc.po" Hash="8b71eae5de72ec06ecb220c598930b8bb3d5d623" />
     <File Name="Engine/Content/Localization/ToolTips/ar/ToolTips.archive" Hash="847c74057338e3a8d1873bc5a66cb5ef8bd206b4" />
@@ -20075,6 +20093,7 @@
     <File Name="Engine/Extras/3dsMaxScripts/PivotPainter2.ms" Hash="9a82d04a479f462b537cbc075e867c44928d4949" />
     <File Name="Engine/Extras/3dsMaxScripts/RenderAnArrayToATexture.ms" Hash="6171fb50869a8887ae72042866e23d18e1195856" />
     <File Name="Engine/Extras/3dsMaxScripts/StaticMeshMorpher.ms" Hash="0522acef7aa515076d588668be57b39436d948e2" />
+    <File Name="Engine/Extras/3dsMaxScripts/StaticMeshSkeletalAnimation.ms" Hash="4e38b0d711e2f63aaa7f0bc8bfcab20a1f500474" />
     <File Name="Engine/Extras/3dsMaxScripts/VertexAnimationTools.ms" Hash="6562c428458912176a521678752dee6d69d15d37" />
     <File Name="Engine/Extras/AndroidWorks/Linux/CodeWorksforAndroid-1R6u1-linux-x64.run" Hash="4ca00940c1a6988e6ddd72588afe414b3c1cb791" />
     <File Name="Engine/Extras/AndroidWorks/Mac/CodeWorksforAndroid-1R6u1-osx.dmg" Hash="89369cf720722dfcf68c0e23f55fd2a4f4efc556" />
@@ -21699,6 +21718,7 @@
     <File Name="Engine/Extras/MayaLiveLink/LiveLinkMaya.zip" Hash="1a4ef97b57d53e2b073e35ba4af163bc5f78e8ae" />
     <File Name="Engine/Extras/MayaVelocityGridExporter/Icons/fga.png" Hash="1fa9613e26ece18b32b7c0e8fbb2c20650a0653c" />
     <File Name="Engine/Extras/MayaVelocityGridExporter/Shelves/shelf_UE4velocityGridExporter.mel" Hash="512f04d970f831070239dc73ee40d913358a403b" />
+    <File Name="Engine/Extras/Perforce/p4ignore" Hash="f6d8e858e69737a26c8e06ea1495112468d2798d" />
     <File Name="Engine/Extras/Redist/en-us/UE4PrereqSetup_x64.exe" Hash="417e12c4582ee2fcfcdf255a1174703b78c41a2c" />
     <File Name="Engine/Extras/Redist/en-us/UE4PrereqSetup_x86.exe" Hash="ec63d65debd768bf63e03650e9e7986c48e841a1" />
     <File Name="Engine/Extras/ThirdPartyNotUE/CMake/bin/cmake" Hash="2f93715b9bb888d1a47041c668e720219d4d997f" />
@@ -25585,9 +25605,9 @@
     <File Name="Engine/Extras/ThirdPartyNotUE/putty/putty.exe" Hash="89c19274ad51b6fbd12fb59908316088c1135307" />
     <File Name="Engine/Extras/UnrealEngineLauncher/EpicGamesLauncher.dmg" Hash="b19c58165e0788a052f02d6f9067ec302957c6ec" />
     <File Name="Engine/Extras/UnrealEngineLauncher/EpicGamesLauncherInstaller.msi" Hash="a7db013369152ba499ddffe6ac4c3f77da269def" />
-    <File Name="Engine/Extras/UnrealVS/VS2015/UnrealVS.vsix" Hash="28f5e20ca843bfd2cd1ecd09494770de32bc5f60" />
+    <File Name="Engine/Extras/UnrealVS/VS2015/UnrealVS.vsix" Hash="2128c32bc9da9db0814dc710e0c6b25edaa3331d" />
     <File Name="Engine/Extras/UnrealVS/VS2017/UnrealVS.vsix" Hash="5c078da1b42048ec0caa223c462a21f3588800dc" />
-    <File Name="Engine/Extras/VisualStudioDebugging/UE4.natvis" Hash="c3f45d3c13adb7f5d9042f18e4bae2cdf1fd985d" />
+    <File Name="Engine/Extras/VisualStudioDebugging/UE4.natvis" Hash="305211cf60482aec9bdb7f9ee97bd1057a69cac5" />
     <File Name="Engine/Extras/VisualStudioDebugging/UE4_Android_Nsight.dat" Hash="6529564713f47b0a7dee6e03e776cd4c28887501" />
     <File Name="Engine/Extras/VisualStudioDebugging/usertype.dat_ForHLSL" Hash="b504120990a654a5f6ce6dc5afc5a4b8c40525f0" />
     <File Name="Engine/Plugins/2D/Paper2D/Content/DefaultLitSpriteMaterial.uasset" Hash="307379b26bb9a64535537c489ae3b2d21da308f1" />
@@ -27197,7 +27217,7 @@
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/boost/numeric/odeint/util/ublas_matrix_expression.patch" Hash="ef2a0f1acd258e156849b97860c22904e624ec44" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/boost/system/detail/error_code.ipp" Hash="2b64d16dbd7e0c6354c2f46476daa20e8fcd617e" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Debug/DirectXMesh.lib" Hash="676862b43ca46e90d16598706cbcd36fe39199ec" />
-    <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Debug/OpenVDB.lib" Hash="5c338748b83164045cdd5d92233b1d302c35b1f6" />
+    <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Debug/OpenVDB.lib" Hash="813b46f21daea24166cc92ca0cd3bcaea8d04933" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Debug/UVAtlas.lib" Hash="8a06e40942df43c9bf932d81751634cc6b491535" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/IntelTBB-4.4u3/Debug-MT/tbb_debug.dll" Hash="47f9f7f4b21a80990fed83a0641aff18daadee5d" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/IntelTBB-4.4u3/Debug-MT/tbb_debug.lib" Hash="6cd7079e33f24bed98e17ea44ba783dfc330c2ad" />
@@ -27216,7 +27236,7 @@
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/IntelTBB-4.4u3/Release-MT/tbbmalloc_proxy.lib" Hash="fdce6131dc8268f70fc81888858ae0d8cddcf68f" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/IntelTBB-4.4u3/Release-MT/tbbmalloc_proxy.map" Hash="0cee9c82fb7e68385563cf1374960c14ebcc533a" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Release/DirectXMesh.lib" Hash="6ead97965f11ffdda4beddb7716909c398dc8bef" />
-    <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Release/OpenVDB.lib" Hash="eb2355b264c37b15574ac179947648115050b507" />
+    <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Release/OpenVDB.lib" Hash="69fda8050b85c5ea7bee5fcbc4753a37eda869b7" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/Deploy/VS2015/lib/x64/Release/UVAtlas.lib" Hash="cba13ca3e6072d45683bd93e6310dbbbeaa2de8d" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/DirectXMeshCode/Meshconvert/Bin/Desktop_2015/x64/Debug/Meshconvert_Desktop_2015.vcxprojResolveAssemblyReference.cache" Hash="ea1ef30dded7ba756938aab78ec7ec48432d258a" />
     <File Name="Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/DirectXMeshCode/Meshconvert/Bin/Desktop_2015/x64/Release/Meshconvert_Desktop_2015.vcxprojResolveAssemblyReference.cache" Hash="67860f317cbc7883101d779dc17cee1ab818aceb" />
@@ -28015,109 +28035,109 @@
     <File Name="Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Content/Localization/OnlineSubsystemIOS/zh-Hans/OnlineSubsystemIOS_FromXLoc.po" Hash="87dae3ef20da36da66c95ae6248ab9007aa99ce1" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ar/OnlineFramework.archive" Hash="ceccec107d142214809783dd551a4e1fef917413" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ar/OnlineFramework.locres" Hash="739cadeb89cb5b9f7ea704a634b68874d8675bc5" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ar/OnlineFramework.po" Hash="0e19a47e18557f160716198aceb2285b3457b1dd" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ar/OnlineFramework.po" Hash="5e6b15dede9a85b2aa2621f6fca53a3076427e8c" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ar/OnlineFramework_FromXLoc.po" Hash="239b7fca281f2492b29e68bda15c231a38c1e179" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/de/OnlineFramework.archive" Hash="a8b8a38be109b30332c6995a36758e6ed5257f60" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/de/OnlineFramework.locres" Hash="62ec9e3e67c7db3ccbab7e61429cd73fcb9bd8ba" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/de/OnlineFramework.po" Hash="e3a7ad1ce9c04a61a06c72531067b83cd042ef80" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/de/OnlineFramework.po" Hash="0ba024db7f8f125727de1d24c14bdefd0af384a0" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/de/OnlineFramework_FromXLoc.po" Hash="52bf1329e86733f9fb111721a2da419764ee0fb9" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/en/OnlineFramework.archive" Hash="736ede162ce8487623d24eccf109cecfda9eb088" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/en/OnlineFramework.locres" Hash="c3bee56beebd4e43bbb67728154956483666f37f" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/en/OnlineFramework.po" Hash="deff26efed8588bc7bb07fb0110d1b52c5d143d5" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/en/OnlineFramework.po" Hash="51ea093e872d3ec749757f1b2e179bd769282ba8" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es/OnlineFramework.archive" Hash="3d9b091f92e0bc2ba8661bd3cf356a54838723bb" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es/OnlineFramework.locres" Hash="dce6cdc5417a0f534058b9940088d3f0edb241fc" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es/OnlineFramework.po" Hash="1e55eef07e9766975839300077822cb3d4305a37" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es/OnlineFramework.po" Hash="9664f5f95e0702a857a7bc73a9caaf0f0d6f4a2e" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es/OnlineFramework_FromXLoc.po" Hash="58a0101149af04500d0edc9ce3638fb295f4cdf6" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es-419/OnlineFramework.archive" Hash="2285a908294d85bb6fe65497f4cb7b8f9e9b4e03" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es-419/OnlineFramework.locres" Hash="20113056b8ddc880f7ddf9d1e1a4ea60f0d82679" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es-419/OnlineFramework.po" Hash="122d95a7ff5663639a42dcc9e22def9f80038800" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es-419/OnlineFramework.po" Hash="f62df376c71ae7bd0ef88b8591da74550c5d5af3" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/es-419/OnlineFramework_FromXLoc.po" Hash="aaf7572dd6259910d9406ef8c5180c74cc98fb3a" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/fr/OnlineFramework.archive" Hash="cf087028bb1780985b02b6282f900ea8a56bde8b" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/fr/OnlineFramework.locres" Hash="7c3eba988f50d147c650e8584aea912cf6040740" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/fr/OnlineFramework.po" Hash="1b2584bf67096acf71821c5ee8b37e51ac1ecade" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/fr/OnlineFramework.po" Hash="f60fcd1978a0798d26d82223b75b07f5fa178e55" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/fr/OnlineFramework_FromXLoc.po" Hash="c6255345f378c99fcdd1f6394e4b44489847cc09" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/it/OnlineFramework.archive" Hash="2573baec77d842fc6bfde17977f1c92c98fea15a" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/it/OnlineFramework.locres" Hash="b68f089cf2137a2ca73004bd849eb6eee4b8d7e7" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/it/OnlineFramework.po" Hash="663610385e00660aacc586f7affe10a12ec802de" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/it/OnlineFramework.po" Hash="1c4afa36328362bf1fcd0f76461c894fdcd8dd8b" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/it/OnlineFramework_FromXLoc.po" Hash="fdb05081c0b16650d4162088e064e7085564c8a8" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ja/OnlineFramework.archive" Hash="736ede162ce8487623d24eccf109cecfda9eb088" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ja/OnlineFramework.locres" Hash="c3bee56beebd4e43bbb67728154956483666f37f" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ja/OnlineFramework.po" Hash="5240a8f921e3b2d9ad8cc174265a8eb6a26893a7" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ja/OnlineFramework.po" Hash="c2c611be7f9b920bdf525eac9a94394e67eaf203" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ja/OnlineFramework_FromXLoc.po" Hash="075e58a9825fa3daa1601e451353afd1c0715534" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ko/OnlineFramework.archive" Hash="729e94aa79999068bae1d0d9c9d0d0830102b184" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ko/OnlineFramework.locres" Hash="8cca5f536eb8505779a1452fc6146c403119dbb2" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ko/OnlineFramework.po" Hash="0d4802cc36ac35a4d4735ee3f333347c8bb526a5" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ko/OnlineFramework.po" Hash="eb8d21158bed51463354028d4bc530e950d83fe9" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ko/OnlineFramework_FromXLoc.po" Hash="8869f0cf97ae43c8842c5d77f9d6141335de4d2b" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/OnlineFramework.locmeta" Hash="06e674ef2dc45d0b862ac285859b43a5304adb03" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/OnlineFramework.manifest" Hash="acc1a0052226b8ee4632ea963a68fec098df7e2f" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/OnlineFramework.manifest" Hash="afdcc642597c718e81599b2bc038d260a2af2398" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pl/OnlineFramework.archive" Hash="c9b8f31f3b10c5f30cfde345d07f38922bff1d07" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pl/OnlineFramework.locres" Hash="3c2138dcbdce5799f9e4d40a52dc122bde4101b8" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pl/OnlineFramework.po" Hash="77efb8198ebe72f4ab170c3ee55db7be80194feb" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pl/OnlineFramework.po" Hash="a47030015aca033c175bab53262726864afdc3dd" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pl/OnlineFramework_FromXLoc.po" Hash="47bab7e11905ad1567e89f9aefc19e24c82fa7eb" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pt-BR/OnlineFramework.archive" Hash="179407794e494b85115b575f8487d66e68419bc4" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pt-BR/OnlineFramework.locres" Hash="e4ba5c95b9530466cf8322b772118510a9a43819" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pt-BR/OnlineFramework.po" Hash="b62db68cb4af44aa51e6f03751880d07b8deb16a" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pt-BR/OnlineFramework.po" Hash="0fc4d1eabc234ec46c4046653c8522a583b1feb3" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/pt-BR/OnlineFramework_FromXLoc.po" Hash="176ebf247eba3489dcf7e16cf777807fc1b30e59" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ru/OnlineFramework.archive" Hash="2eec4b1616f3c838ab65b853a84671a94a057a60" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ru/OnlineFramework.locres" Hash="1346b21d500f5109448091559d208f10ac80476c" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ru/OnlineFramework.po" Hash="a51dacb29beb2f1d2b3549af017457efbc63d79c" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ru/OnlineFramework.po" Hash="7bec8f1793b06b5f0e0d2e3e8b50c67bfcb35178" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/ru/OnlineFramework_FromXLoc.po" Hash="a9832c0e93ef7c61dcefba6e7af666a76986682e" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/zh-Hans/OnlineFramework.archive" Hash="9469ec7122f53ff07be7ea20a4b7e2d124a57d74" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/zh-Hans/OnlineFramework.locres" Hash="15539960e26d6c1452c54163d8b1d497aa540850" />
-    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/zh-Hans/OnlineFramework.po" Hash="a844404f9b5b65df4a83dbd701cb9bbfb2681dbf" />
+    <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/zh-Hans/OnlineFramework.po" Hash="b56f3fab51c8658847d7323d798e825e6b13d53a" />
     <File Name="Engine/Plugins/Online/OnlineFramework/Content/Localization/OnlineFramework/zh-Hans/OnlineFramework_FromXLoc.po" Hash="59b82705f2414fe6edafabde755b4b6f5d9351a5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ar/OnlineSubsystem.archive" Hash="b6cb13ea4f0cc32051a194dd1a464f9014ff80f5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ar/OnlineSubsystem.locres" Hash="92ddbcf3363f22733fea6c8bc9729566c880ba58" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ar/OnlineSubsystem.po" Hash="1ced1d922039e6d425158d6aa73a0d83d60fd18c" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ar/OnlineSubsystem.po" Hash="83aea9c9ae31c76316266181c91cd1ab0bc855f2" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ar/OnlineSubsystem_FromXLoc.po" Hash="53e4d6dbf4dffdd835ab1b231745c1e934eff9a6" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/de/OnlineSubsystem.archive" Hash="57312ae30d91a6a9c2ca76f8e9862f33747bf79b" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/de/OnlineSubsystem.locres" Hash="0b75b02c2f1add0651d3d3a39fd855b405f07e3a" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/de/OnlineSubsystem.po" Hash="23e646872d5457a61330c1f9324d0848ec7cd055" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/de/OnlineSubsystem.po" Hash="8b6ab4d8e9246efe1f9a41b7afcf7baf4693f560" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/de/OnlineSubsystem_FromXLoc.po" Hash="0dadc711455eba9ee8b90ffe96138d145866399f" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/en/OnlineSubsystem.archive" Hash="c5d0f1b4a7c6692345b4f0d7cc8bf9f9b4409cfb" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/en/OnlineSubsystem.locres" Hash="3494cdcee9a147092f393329001619d45d471bc5" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/en/OnlineSubsystem.po" Hash="6da2836d425fb56fa018d3f980a3a8723c5475e5" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/en/OnlineSubsystem.po" Hash="2ef89c72fa4f8c478d2e29b684746b8097efa65d" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es/OnlineSubsystem.archive" Hash="b074ac134dfe51961eb2e1194225f79d4b9843b8" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es/OnlineSubsystem.locres" Hash="30cd46b2a33d91d210a03028f79652bff98c06f7" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es/OnlineSubsystem.po" Hash="4eb44c4ed4045315f6aee91dc39197941de16fa9" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es/OnlineSubsystem.po" Hash="2c451aabdafec45db57d01335a41b2feda6a5a9d" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es/OnlineSubsystem_FromXLoc.po" Hash="aa7fc2be86fede0901b105f98f860a870d26a42e" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es-419/OnlineSubsystem.archive" Hash="34fb2f2b10f0f7cea7bf1b7fa465bf51e844cc4c" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es-419/OnlineSubsystem.locres" Hash="94685410d856e22f70d4f57a0c2c4c45c81a8be7" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es-419/OnlineSubsystem.po" Hash="6e0cf4b30ab207bad65bf86a94926e297b12c97f" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es-419/OnlineSubsystem.po" Hash="a0346df149b8fcab567b63c4dbf9d0a421646a61" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/es-419/OnlineSubsystem_FromXLoc.po" Hash="7ed9cbd854adfafc390568584f35621dd4b50256" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/fr/OnlineSubsystem.archive" Hash="4b09b34655d930382fdd761bf38d4eaad18e9868" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/fr/OnlineSubsystem.locres" Hash="c94e79daed3f9b812706f3b28dcf52f7fffc3fdd" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/fr/OnlineSubsystem.po" Hash="82835e98e8327d2f5b5cc665808a3fef1bc59911" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/fr/OnlineSubsystem.po" Hash="95f6802d58a78a41ad1604960b54c54b0a69bfc3" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/fr/OnlineSubsystem_FromXLoc.po" Hash="df55ceac2a48476705e61810170c0f520bf5fd29" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/it/OnlineSubsystem.archive" Hash="c30ca497de2cfd223a149f4339e81a9ae5c84e6f" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/it/OnlineSubsystem.locres" Hash="81975919c58ffaecccdcd33a3610c40878f61424" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/it/OnlineSubsystem.po" Hash="d9d374ce6a5ee40ece5c8eca71f0c5d8101d9195" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/it/OnlineSubsystem.po" Hash="199f2bbfd676f7626360a6a13a3df124e80356a9" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/it/OnlineSubsystem_FromXLoc.po" Hash="486dd7c066124c3cab4d5b442adf27800ba7f669" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ja/OnlineSubsystem.archive" Hash="c5d0f1b4a7c6692345b4f0d7cc8bf9f9b4409cfb" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ja/OnlineSubsystem.locres" Hash="3494cdcee9a147092f393329001619d45d471bc5" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ja/OnlineSubsystem.po" Hash="e87e2c4ce808aa1ba306e95e52973a292f8e38b7" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ja/OnlineSubsystem.po" Hash="2b32839aa588149987f6ee957a5c1ed188de0457" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ja/OnlineSubsystem_FromXLoc.po" Hash="0276dfe1cc18df50d048893e926ce43110949990" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ko/OnlineSubsystem.archive" Hash="9ebb882d35546d79f8b1dc3b3e8c5fdff5fbf48e" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ko/OnlineSubsystem.locres" Hash="3b4ff2785f35ce61129450303a1176de7a01e82b" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ko/OnlineSubsystem.po" Hash="99c00580c3b61c2b243824a0c10768eaf63bf698" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ko/OnlineSubsystem.po" Hash="6dec1b730336735a9e92d24064bdf1a9909d0169" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ko/OnlineSubsystem_FromXLoc.po" Hash="d0360ab9980c8e6caa82cb71de862aa05fe95f98" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/OnlineSubsystem.locmeta" Hash="e5c1a3ff4b4c9b91a209c73248a70bc7d05410b6" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/OnlineSubsystem.manifest" Hash="696fec063728d52f3e8a24a46cd8aa10e2d353cf" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/OnlineSubsystem.manifest" Hash="683132b313e7b5fa1d380e9232b1237ae95eb83b" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pl/OnlineSubsystem.archive" Hash="2b10928e0526a7855eb4c6e0b88c90cec9309daa" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pl/OnlineSubsystem.locres" Hash="bd9cd8c244d2e6348215c5ce2712e9eddb381a2b" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pl/OnlineSubsystem.po" Hash="7eedced43af7283251a014eb6e2f9785a4526d72" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pl/OnlineSubsystem.po" Hash="6a4d7312a688598cd248ff606169182fea7cdde0" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pl/OnlineSubsystem_FromXLoc.po" Hash="1c26c0f01fd74b25efca5b4749218fba145a81e7" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pt-BR/OnlineSubsystem.archive" Hash="003394f1ef90c84039113a975ce6f0792843855a" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pt-BR/OnlineSubsystem.locres" Hash="83b28101c6dadbf32f3567046366657391a0be20" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pt-BR/OnlineSubsystem.po" Hash="90ec8305b56424840f0411755d29a52e22749d86" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pt-BR/OnlineSubsystem.po" Hash="0994b23046c94a79868f4c4f6ebf19a9d1d24b38" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/pt-BR/OnlineSubsystem_FromXLoc.po" Hash="a020195c8a4ccd69ce544939bba76247c3521dc0" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ru/OnlineSubsystem.archive" Hash="2f340cb915d674b3b559d0d95842617bfcc3388b" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ru/OnlineSubsystem.locres" Hash="2664fc50a90e442fad3b38dceeaeb76d25fdf5c0" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ru/OnlineSubsystem.po" Hash="411c2c2a5328bb7423c71e2198b679f11f36e4b7" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ru/OnlineSubsystem.po" Hash="d2f2f050fb9acf3b439cd1c159368d0e70bd5a91" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/ru/OnlineSubsystem_FromXLoc.po" Hash="509469ffe2defdc95b563e74d33008862e607840" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/zh-Hans/OnlineSubsystem.archive" Hash="9a3bfda9feb32976d68eeb27b38c988e5ef47c95" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/zh-Hans/OnlineSubsystem.locres" Hash="dfeaa353a435eae37ea8d5fbe4ee242e452dd0a2" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/zh-Hans/OnlineSubsystem.po" Hash="5fd09b7b3fdc26ea992650dacc003fb2dcec8b41" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/zh-Hans/OnlineSubsystem.po" Hash="147028c844ec445c4302daafe9a02fec14b0bd51" />
     <File Name="Engine/Plugins/Online/OnlineSubsystem/Content/Localization/OnlineSubsystem/zh-Hans/OnlineSubsystem_FromXLoc.po" Hash="adb3962281d715fbf0f050568adc2dfa59df3988" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemAmazon/Content/Localization/OnlineSubsystemAmazon/ar/OnlineSubsystemAmazon.archive" Hash="378d88d65b79adf54dab344734cc5384e87d3651" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemAmazon/Content/Localization/OnlineSubsystemAmazon/ar/OnlineSubsystemAmazon.locres" Hash="a2c49f7adaa0bd4db5817e2b94b16acd920d3503" />
@@ -28225,11 +28245,9 @@
     <File Name="Engine/Plugins/Online/OnlineSubsystemFacebook/Content/Localization/OnlineSubsystemFacebook/zh-Hans/OnlineSubsystemFacebook.locres" Hash="99167c6023bd9eedc0f1c609364e93f708c990be" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemFacebook/Content/Localization/OnlineSubsystemFacebook/zh-Hans/OnlineSubsystemFacebook.po" Hash="cb10fe757811a2de3ea9c237d1818d7527dce414" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemFacebook/Content/Localization/OnlineSubsystemFacebook/zh-Hans/OnlineSubsystemFacebook_FromXLoc.po" Hash="529de2c6bddb777024b38233f2f1d3a5e5bf0404" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleAppUtilities.embeddedframework.zip" Hash="f618da1ec51023559f8ff07f4c881923853b236b" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleSignIn.embeddedframework.zip" Hash="c9cfb293c2dc51c94e405df6b4eba90e7f6f2a4a" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleSignInDependencies.embeddedframework.zip" Hash="e3c57168801d5cb2e6b751f533a90f0bb5eec1fa" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleSymbolUtilities.embeddedframework.zip" Hash="3c0fd0c0e4247a08dc1bfc433aa87276e7da3549" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/Sample/Sample.zip" Hash="34b960167a6a7fecc8e333041827a397f92d5097" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleSignIn.embeddedframework.zip" Hash="1eb26a3eec9d0e4d55773367a96a910a89156ed8" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/GoogleSignInSDK/GoogleSignInDependencies.embeddedframework.zip" Hash="291971c5469e0c01e4cffe6fb084e37f5c417131" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/Sample/Sample.zip" Hash="bc9f28cfe74ce1c9cf761d6d1dd9b0115c7c657e" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemOculus/Content/Localization/OnlineSubsystemOculus/ar/OnlineSubsystemOculus.archive" Hash="c5a4197a566db1084280148c0e8dd734216fd7b1" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemOculus/Content/Localization/OnlineSubsystemOculus/ar/OnlineSubsystemOculus.locres" Hash="a1fc94b244b33470c4e1291729cef0e21df06a38" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemOculus/Content/Localization/OnlineSubsystemOculus/ar/OnlineSubsystemOculus.po" Hash="60e6595ea227722f76759af8554be22374d86094" />
@@ -28327,56 +28345,56 @@
     <File Name="Engine/Plugins/Online/OnlineSubsystemSteam/Content/Localization/OnlineSubsystemSteam/zh-Hans/OnlineSubsystemSteam_FromXLoc.po" Hash="90cf83a921fdde41469c9a62db01c05d29ff69a6" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ar/OnlineSubsystemUtils.archive" Hash="cd1af9b6b0c2fc0fb9655c9f09cf116a57368171" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ar/OnlineSubsystemUtils.locres" Hash="9f251452f1b65b89aa8e9f7e44cb548c5e34f09b" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ar/OnlineSubsystemUtils.po" Hash="bcc824ddd2fd5971a985cddd79f533e091fa73c6" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ar/OnlineSubsystemUtils.po" Hash="f9835740d5e891b9cd7fd993d08530c0457dbfc1" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ar/OnlineSubsystemUtils_FromXLoc.po" Hash="a33f54873e663e8917110756e1afe60c8d5ea1d5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/de/OnlineSubsystemUtils.archive" Hash="b94481a6c93a904e731e5000364788b8b2a768d0" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/de/OnlineSubsystemUtils.locres" Hash="dafb288a1dacc159ae7fc2d767d50fd21c9ed1ce" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/de/OnlineSubsystemUtils.po" Hash="21e73884ff6927a315f17a3c9e8e5c88cea7cca8" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/de/OnlineSubsystemUtils.po" Hash="ac6c83a88f7d98714359b8e5dcabcb1e0d1da317" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/de/OnlineSubsystemUtils_FromXLoc.po" Hash="f68ac56ce5a7cd14eaa9f8c459ad1ad0d49632b8" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/en/OnlineSubsystemUtils.archive" Hash="1e973e4f7562622c9740be8bbdfbc9325ca6eae5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/en/OnlineSubsystemUtils.locres" Hash="269d7da0b7e90c7e1df429a376b6ab626d5e8678" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/en/OnlineSubsystemUtils.po" Hash="0e2fc848124c44592befd5baebf662ad6aa72315" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/en/OnlineSubsystemUtils.po" Hash="93120c063af1f5399b4129137b03fabcafd079b9" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es/OnlineSubsystemUtils.archive" Hash="31928437f3b8dee133c8fabe1e2f0c1abfbb057a" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es/OnlineSubsystemUtils.locres" Hash="2663c26da8d5a99fb826b2e5a348a0b35670e31e" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es/OnlineSubsystemUtils.po" Hash="7ba6a160e4420581336fa014a2e10395470d18bb" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es/OnlineSubsystemUtils.po" Hash="eb46400735aa9e4e6858672e8a6aad262f0e2821" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es/OnlineSubsystemUtils_FromXLoc.po" Hash="1df21b4625a4aab9159dde02e9370b8febf31ce2" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es-419/OnlineSubsystemUtils.archive" Hash="b165482f16fbd488fa9856da121c1802558c87df" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es-419/OnlineSubsystemUtils.locres" Hash="2beeb6d685ceed1f65a2947c305e0fc39aa9df34" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es-419/OnlineSubsystemUtils.po" Hash="d3a1ee5e1ca8a8cb4b5ffc888766210149d7e94e" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es-419/OnlineSubsystemUtils.po" Hash="acdb37bc6faf0d82fb13b0ad96de36564689222f" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/es-419/OnlineSubsystemUtils_FromXLoc.po" Hash="1bd31fa1041990a4b4693967b8aeed6bf61b3ae7" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/fr/OnlineSubsystemUtils.archive" Hash="dc9a92a6c78c86896b0af4ac532f1aeed0c67412" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/fr/OnlineSubsystemUtils.locres" Hash="f9281bf27064621edcf327275dc0b17a17245d51" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/fr/OnlineSubsystemUtils.po" Hash="378e3882d467a6d546805bde8a73df525a5ec6cb" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/fr/OnlineSubsystemUtils.po" Hash="71d04521b5aa01bb5f316c9b18738cf37fdb4ac5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/fr/OnlineSubsystemUtils_FromXLoc.po" Hash="8602fd682696b5a4586d0d5cd9f17f67660b894b" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/it/OnlineSubsystemUtils.archive" Hash="58a8cc40683ac0a6fb4d6f770cb153b3505ee5cf" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/it/OnlineSubsystemUtils.locres" Hash="f291af78e86bb894a7a8bceb7b4761e437f1c563" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/it/OnlineSubsystemUtils.po" Hash="94fa428d416e816d45689a0b4538a6d9d2467fce" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/it/OnlineSubsystemUtils.po" Hash="ce0fc70f7f7ffabb7a994f2ad4e2013fea634402" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/it/OnlineSubsystemUtils_FromXLoc.po" Hash="8104948976b6eb3281f184b79677b3dcd8e78dad" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ja/OnlineSubsystemUtils.archive" Hash="1e973e4f7562622c9740be8bbdfbc9325ca6eae5" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ja/OnlineSubsystemUtils.locres" Hash="269d7da0b7e90c7e1df429a376b6ab626d5e8678" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ja/OnlineSubsystemUtils.po" Hash="4aaec69bf315cffe8fbf986364a37d8b237b22e4" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ja/OnlineSubsystemUtils.po" Hash="15535b2d5a79e102c2409eb2f5f535d3acc68bdf" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ja/OnlineSubsystemUtils_FromXLoc.po" Hash="359cd4d95deafd38c72c6e73546727af287eb86d" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ko/OnlineSubsystemUtils.archive" Hash="10de837ed312d4afe6891f1cbd02c8a6c6adb5d8" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ko/OnlineSubsystemUtils.locres" Hash="a6a821820f96712fe10d5b3ffb4b8c64bc4e0f93" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ko/OnlineSubsystemUtils.po" Hash="d49789746ff59ce0e8048dbeb26c48f501ac5c18" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ko/OnlineSubsystemUtils.po" Hash="e08b5999286386441867a258577dba20b3d7ec9f" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ko/OnlineSubsystemUtils_FromXLoc.po" Hash="6d53ddf4bdca2b7b5ef952196c2341d3602b4062" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/OnlineSubsystemUtils.locmeta" Hash="af961d73be50de82df4c67d2a202f98eb924df0e" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/OnlineSubsystemUtils.manifest" Hash="40def62265fc309691b0c4bdc9f9d5c173d74997" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/OnlineSubsystemUtils.manifest" Hash="247e42f43e525214750bd55011a28c219118ee93" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pl/OnlineSubsystemUtils.archive" Hash="6580ec24e7d96ce63d03d92213a4adbd63bb4507" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pl/OnlineSubsystemUtils.locres" Hash="c002a540a80753dc1b5027c8711b76624b1b3064" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pl/OnlineSubsystemUtils.po" Hash="8b0c21da9a0ed15178134d6295f4d8ab952a6ee8" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pl/OnlineSubsystemUtils.po" Hash="fe2b8a23138b483e5af5f246db2eaa206f090aa0" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pl/OnlineSubsystemUtils_FromXLoc.po" Hash="75613ce7bb0881e67158b25bcd78c4649a1276ba" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pt-BR/OnlineSubsystemUtils.archive" Hash="84172df5c7865f1aa53345cff59acc6e34f2548a" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pt-BR/OnlineSubsystemUtils.locres" Hash="b8269bb7c888d2f1aa9fd90045e24ea680f28e1a" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pt-BR/OnlineSubsystemUtils.po" Hash="18c91a5ced98199d42cdf23dc905a4228661f368" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pt-BR/OnlineSubsystemUtils.po" Hash="54b8b4dc7fcb8e6a9b46b3dcba627e8f652cf039" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/pt-BR/OnlineSubsystemUtils_FromXLoc.po" Hash="090388655127e41ecc7f220ccd067ee2324c17e1" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ru/OnlineSubsystemUtils.archive" Hash="fabf84bc7f1b55e8bc4e7f0d138937e8ea7cf8e2" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ru/OnlineSubsystemUtils.locres" Hash="3286ffecee8543f2e09483054bd898a483889b2a" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ru/OnlineSubsystemUtils.po" Hash="f7aee623d7d7510fc38991f80f54b08b884ec2d4" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ru/OnlineSubsystemUtils.po" Hash="dcaa69242976456d722d49656734cae8e99acd0d" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/ru/OnlineSubsystemUtils_FromXLoc.po" Hash="146897029795da7f333dbfd583fba65969daaada" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/zh-Hans/OnlineSubsystemUtils.archive" Hash="b7001dfa036e8a1397a921dfc42db92bf0f33ddf" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/zh-Hans/OnlineSubsystemUtils.locres" Hash="fb615e2bfc7a6151ce20b149453b37bc234d47d4" />
-    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/zh-Hans/OnlineSubsystemUtils.po" Hash="56fd53dd82e182dc069f3bd2fbd7fb2f59765101" />
+    <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/zh-Hans/OnlineSubsystemUtils.po" Hash="e7e6cfff7c89ba0351f161d3fce527c645ca3225" />
     <File Name="Engine/Plugins/Online/OnlineSubsystemUtils/Content/Localization/OnlineSubsystemUtils/zh-Hans/OnlineSubsystemUtils_FromXLoc.po" Hash="1454aa80ef22e2cd6fd35669c407569ad2ce46d2" />
     <File Name="Engine/Plugins/Runtime/Advertising/IOSTapJoy/ThirdPartyFrameworks/Tapjoy.embeddedframework.zip" Hash="9e3126c5956052df1c00a1b5696f188fce408775" />
     <File Name="Engine/Plugins/Runtime/Analytics/Adjust/Source/AndroidAdjust/ThirdParty/adjust_library/libs/adjust-android-4.10.2.jar" Hash="a148a86b1e91134d0c3971b3ceb27c66df50a87e" />
@@ -28603,6 +28621,10 @@
     <File Name="Engine/Plugins/Runtime/Oculus/OculusVR/Content/Textures/OculusGoController_albedo.uasset" Hash="e8a2c17f5d727f476b78f8e73b9f9d631f265cc4" />
     <File Name="Engine/Plugins/Runtime/Oculus/OculusVR/Content/Textures/touchController_albedo.uasset" Hash="ac2a6bd9870dc0cad29e6d8b4d228fcc390fbe1f" />
     <File Name="Engine/Plugins/Runtime/Oculus/OculusVR/Content/Textures/touchController_controlmap.uasset" Hash="5abb8c422a2b2bd3bc5cf63e85d0b3114c671ec8" />
+    <File Name="Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.xcodeproj/project.pbxproj" Hash="702a65387ffcf5b71afcc8a50279166719573e84" />
+    <File Name="Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata" Hash="8d95e63bcb7a5fcb5b2faf30888ced37b05a5fa9" />
+    <File Name="Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist" Hash="77563fd7f4e692ba0e7a40dbd65e1f1cd2c16ba0" />
+    <File Name="Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings" Hash="a52715d26fd27033bb8a842fb664993290304328" />
     <File Name="Engine/Plugins/Runtime/PhysXVehicles/Resources/Icon128.png" Hash="f3034aa50a68d1cbd8f6db6aa86d4e493285d2c4" />
     <File Name="Engine/Plugins/Runtime/ProceduralMeshComponent/Resources/Icon128.png" Hash="68268b4ec0d48a520ebf9a2f0d646fb795c6e7bf" />
     <File Name="Engine/Plugins/Runtime/ResonanceAudio/Content/ResonanceAudioReverbPluginPreset_16.png" Hash="76668e8119506042f84853e541aa282b1f449bf9" />
@@ -28893,7 +28915,7 @@
     <File Name="Engine/Source/Programs/UnrealVS/TargetManifests/VS14d.source.extension.vsixmanifest" Hash="6d1e06b88ce71aa92f227e0c00cc73574a732dca" />
     <File Name="Engine/Source/Programs/UnrealVS/TargetManifests/VS15.source.extension.vsixmanifest" Hash="77ecbf2331572770a86add90ba14d0fb1a611ebd" />
     <File Name="Engine/Source/Programs/UnrealVS/TargetManifests/VS15d.source.extension.vsixmanifest" Hash="77ecbf2331572770a86add90ba14d0fb1a611ebd" />
-    <File Name="Engine/Source/Programs/UnrealVS/UnrealVS.vsct" Hash="11b4ef6ba49ebf7ed2911f26364cecaae2a68d14" />
+    <File Name="Engine/Source/Programs/UnrealVS/UnrealVS.vsct" Hash="ab7609512aa15c8f8b658bd8214285868bd83fa3" />
     <File Name="Engine/Source/Programs/Windows/BootstrapPackagedGame/Resources/Windows/BootstrapPackagedGame.ico" Hash="b7d8e1442aec4db421d5c5d8427bbd5846a2cbd4" />
     <File Name="Engine/Source/Runtime/Apple/MetalRHI/Public/ue4_stdlib.metal" Hash="6d0f5b2191165b3d681f0db6f512e0b45df22d8a" />
     <File Name="Engine/Source/Runtime/Launch/Resources/Linux/UE4.png" Hash="4688c77b5e432dfa60db778aa36b0ef907bb0d69" />
@@ -29855,7 +29877,7 @@
     <File Name="Engine/Source/ThirdParty/Android/extras/google/m2repository/com/google/firebase/firebase-storage-common/11.0.4/firebase-storage-common-11.0.4.pom.md5" Hash="06ac5000e9ee8095320a8b666abbbd8d0e8dfde0" />
     <File Name="Engine/Source/ThirdParty/Android/extras/google/m2repository/com/google/firebase/firebase-storage-common/11.0.4/firebase-storage-common-11.0.4.pom.sha1" Hash="be1bdec0aa74b4dcb079943e70528096cca985f8" />
     <File Name="Engine/Source/ThirdParty/Android/extras/google/source.properties" Hash="8d04c08f1488801637d84160a3c4bb1c44ecb0f9" />
-    <File Name="Engine/Source/ThirdParty/AndroidPermission/permission_library/additions.gradle" Hash="a0dd87f5522aa33fbae43371cde9ab890ad289c4" />
+    <File Name="Engine/Source/ThirdParty/AndroidPermission/permission_library/additions.gradle" Hash="64ea839fe0a11b12022e54bb5a418750479404fe" />
     <File Name="Engine/Source/ThirdParty/AndroidPermission/permission_library/project.properties" Hash="9aa2c3ba4cf6be55e34dc914ab2bfd2c0f04cdd0" />
     <File Name="Engine/Source/ThirdParty/ANGLE/lib/libEGL.dll" Hash="a9d19b9df61ba0fc6d7f985c96cc1eed8958d94b" />
     <File Name="Engine/Source/ThirdParty/ANGLE/lib/libEGL.lib" Hash="7dd6e4df69894ef066f9f6582ab98d5b2cc1ec44" />
@@ -30056,6 +30078,7 @@
     <File Name="Engine/Source/ThirdParty/Breakpad/src/third_party/musl/COPYRIGHT" Hash="79bd499d23d05c08f4a43950671585ffaaa13ee1" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/third_party/musl/README.breakpad" Hash="57fd5ea77f2ceaa65ddfc029a87098478ab265f7" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/linux/tools_linux.gypi" Hash="ea4120e2c1d66ad17effefc2bafa3c5c1cdf07bd" />
+    <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/mac/binaries/dump_syms" Hash="0cfd349ac0060b205d8d7aa3e9c7906962ef43b5" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj" Hash="b7a3ea341fbe26e21329471b43d7e2c962b9c5d6" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj" Hash="acab1b2f5cc7f83c8b9d2ff96a1a39a313c12655" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj" Hash="d58373106098b9be72731408e2784528b6421715" />
@@ -30066,7 +30089,7 @@
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.stabs" Hash="c42f29b6604fa3c5003fc4747b1c9dcd50812370" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.sym" Hash="2fd74a46030e88a78d2c36b47764adf8c1564d5f" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/tools.gyp" Hash="ce388253a8eea05f88d82e021f5f41298a8423c8" />
-    <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/windows/binaries/dump_syms.exe" Hash="3cce72764041e2893ec3b9d853e9edba2eeeb1f7" />
+    <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/windows/binaries/dump_syms.exe" Hash="e9d490212cfba87986da167108aebea03f07b9bd" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/windows/binaries/symupload.exe" Hash="86216f3b4236565a65c3d1572aa2e4dc2bd101d9" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/windows/converter/ms_symbol_server_converter.gyp" Hash="d3c0f4f3f75d1d95cc498aa791a835e6f2245612" />
     <File Name="Engine/Source/ThirdParty/Breakpad/src/tools/windows/dump_syms/dump_syms.gyp" Hash="aa70cd28b8ea3ee696c1fbb019902bd58efaeeee" />
@@ -30624,166 +30647,32 @@
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/doc/xmlwf.1" Hash="c25fff29f57411e71b29999a0a7c086b8ef24642" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/expat.pc.in" Hash="c148e573e8eff9734960b7c77e1cc51dbd19823e" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/expat_config.h.in" Hash="7189361b54b257e1c856267f9ad649d65a4871f7" />
-    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/IOS/Debug/libexpat.a" Hash="bca8e9796159c9695143ef1d25b248e47b145ed1" />
-    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/IOS/Release/libexpat.a" Hash="f8f2d7c3390598d60de0a707a1819b12794d535c" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/IOS/Debug/libexpat.a" Hash="cd16508dbd9d75d10d0ca440c4854829b99b59d3" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/IOS/Release/libexpat.a" Hash="4d39179cb85b407e6ac7f9a1c40b3f27920048bb" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/m4/libtool.m4" Hash="4c1e40d5c03e93df27a78a37f8c7bcd8c3becf89" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/m4/lt~obsolete.m4" Hash="a0d25cfa601ade10ea9f801055f02e5d362de6dc" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/m4/ltoptions.m4" Hash="9195138dea3f2bb3e34cd6e9e1f336d900c295ab" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/m4/ltsugar.m4" Hash="24052a5ea302265f82fd26e22b5f4ee9ed241e41" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/m4/ltversion.m4" Hash="7a310811375e57fde6898f037e020bc576e74419" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/Mac/Debug/libexpat.a" Hash="6619a4490235ad21406174bd97c34c4afa5a04e3" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/Mac/Release/libexpat.a" Hash="1cca659fd62ee07761b24ee7f86361fcb20d40cf" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/MANIFEST" Hash="3aed954e3927eb89819ea511d231386d4fb0522e" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/vms/descrip.mms" Hash="479e90fc8fccf5ccfb7e5410621144aa2811d1d0" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/vms/README.vms" Hash="da11c36548a0d284dde32490cd8a5cd0d93e6c49" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/win32/expat.iss" Hash="7e7b10a49690b0f02fef4321ec45f7d70461545a" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/win32/VS2015/Debug/expatd.lib" Hash="079b1fe86f8cbd662c371541ca5c29a6967786f6" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/win32/VS2015/Release/expat.lib" Hash="4430c063df90112f2e81f98f2463b4e0511487ef" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/Win64/VS2015/Debug/expatd.lib" Hash="0b0eb67d3f3a3090dcf872f54fa1e88cb07fe751" />
+    <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/Win64/VS2015/Release/expat.lib" Hash="fcbbb622cc4abcc6c6bd2f442944ff4f1baeae15" />
     <File Name="Engine/Source/ThirdParty/Expat/expat-2.2.0/xmlwf/xmlwin32url.cxx" Hash="cba86f95518021fcdbfa5990196125231a2ad98e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Info.plist" Hash="e72c3eb944fbeab80da3d6efde309d32079a3b7a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.dsidx" Hash="f41df452562ef2b088b3a9312636ba1232a3191e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.dsidx-shm" Hash="ac6d9b5546c321a6fc8b87626275f2dd8eee3cba" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.dsidx-wal" Hash="299c7235b03a6c89138a722392d667f41eb40755" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.mom" Hash="60d4a2f49eca73291ff3b6d7935b6cf943118c94" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.skidx" Hash="a030644095ee3706423b133cb033f1b4211bc374" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.toc" Hash="2722afe608d34dee828bb609c4b1ef700ea25b24" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/docSet.tokencache" Hash="6a272c0e97ea0bf48e3cd8d0bdcfe0538d60d5e0" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/img (1)/button_bar_background.png" Hash="ca0c243ae0ab331c7e1aeb4d8ed7a4a73dd9ab97" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/img (1)/disclosure.png" Hash="511f507864edaedae784e18c218093054c2329fc" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/img (1)/disclosure_open.png" Hash="ced0d282c09519571dc9441f4c96b5afcb494c0d" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/img (1)/library_background.png" Hash="a26806f5d9a18815e7005f435cf01a8e3501cb6e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/img (1)/title_background.png" Hash="6e4182943028ef2542afeae0c48eabd19d4b2536" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Info.plist" Hash="1aa47193908e39ba47fbb24b911b99a439984481" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.dsidx" Hash="ff39ef4f2a7d17b625a5c49999b82c2cce08aefe" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.dsidx-shm" Hash="4b0acdc27182b9148c916fd34fc3a341b819ef7e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.dsidx-wal" Hash="0a9692f9b05e465ce7182e355c7d1a8890462bad" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.mom" Hash="60d4a2f49eca73291ff3b6d7935b6cf943118c94" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.skidx" Hash="c2691ccb0dca6f302de7e8d23420b3dba859f05b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.toc" Hash="0eb1df461a66feab0eeab1a533809306665de17b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/docSet.tokencache" Hash="34091df34137a0efbbcdb9a6b32a5d7df8c744cc" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/img/button_bar_background.png" Hash="ca0c243ae0ab331c7e1aeb4d8ed7a4a73dd9ab97" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/img/disclosure.png" Hash="511f507864edaedae784e18c218093054c2329fc" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/img/disclosure_open.png" Hash="ced0d282c09519571dc9441f4c96b5afcb494c0d" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/img/library_background.png" Hash="a26806f5d9a18815e7005f435cf01a8e3501cb6e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/img/title_background.png" Hash="6e4182943028ef2542afeae0c48eabd19d4b2536" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Info.plist" Hash="f6e1647811eb9e4bb97595a6013d2833f75a834f" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.dsidx" Hash="e4abc6d3a03356074ef453ff06c6e0f71b54f1cd" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.dsidx-shm" Hash="9d356e019c4019f14fc5b1cdc54df1d8241a38c4" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.dsidx-wal" Hash="c6b7f5219c4056caa9d2b91149fbf25879df0e1f" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.mom" Hash="60d4a2f49eca73291ff3b6d7935b6cf943118c94" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.skidx" Hash="c28e7edc7d8900e21a0d4f525b29b33765f42dff" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.toc" Hash="b3b7a4b8de73a92679f9c650d255d84437edb46a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/docSet.tokencache" Hash="e9a1d1ec273e9c9d739af991affe7f61aa894e1a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/img/button_bar_background.png" Hash="ca0c243ae0ab331c7e1aeb4d8ed7a4a73dd9ab97" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/img/disclosure.png" Hash="511f507864edaedae784e18c218093054c2329fc" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/img/disclosure_open.png" Hash="ced0d282c09519571dc9441f4c96b5afcb494c0d" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/img/library_background.png" Hash="a26806f5d9a18815e7005f435cf01a8e3501cb6e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/img/title_background.png" Hash="6e4182943028ef2542afeae0c48eabd19d4b2536" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/AccountKit.embeddedframework.zip" Hash="7cc29fcc6ed3faa157ff9e777ef73f7246adc38f" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/Bolts.embeddedframework.zip" Hash="99d7ef928878553a616f2e45ed14fb3613aa97aa" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FacebookSDK.strings" Hash="686c4aa50fe812e8d0edecb1f560f5125ed7b091" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBAudienceNetwork.embeddedframework.zip" Hash="bc78e993831e15af2f3e96d6156c2defd54c6a30" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBNotifications.embeddedframework.zip" Hash="131777364edb9a1b0a05c1d4fdf322283b791d59" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKCoreKit.embeddedframework.zip" Hash="2b43eae7277e51d4e6fa7977af665b30b192772e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKLoginKit.embeddedframework.zip" Hash="982f107a13f0e0f3a543c48036cc629065fe109b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKMessengerShareKit.embeddedframework.zip" Hash="d7a6a6937465e9d940396df0d75c38b1cdad2245" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKShareKit.embeddedframework.zip" Hash="e9e1a7720727387841c51c1abb6916cbc5c5b1c0" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample.xcodeproj/project.pbxproj" Hash="8206d2853de3a6b08864b2356be0ad78806866dd" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample.xcodeproj/xcshareddata/xcschemes/AdUnitsSample.xcscheme" Hash="ca704ef2a6e48dd96edd2781e0bcdb8815bbb811" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AdUnitsSample.entitlements" Hash="6cf4e339a029d9486b28bf4b80acb2716bafac2a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Default.png" Hash="819e561756677da88f410e2b04f94e8da91778e6" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Default@2x.png" Hash="5ffc9178c533c99435db9dbe2358f7037b9d68d9" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Default-568h@2x.png" Hash="8162ddcecaa6ddedd67c853b1a93fe0ca64c169a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon.png" Hash="c1356f0f964a1737ff696326f95502c204929c5c" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon@2x.png" Hash="607b06610365e49a31bcefc0f87ad884b568f725" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png" Hash="ef53701c374ddb77d6be177c46927271d1d696a3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png" Hash="a93f825c00d5b32245e8ed527e1b6f0d0b9a04ef" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-72.png" Hash="80531c0da40f8032fc05886c0b76ffd00c463622" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png" Hash="5e5dd38dd3f1766d52ddb4ab715c6c1525f8d098" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-76.png" Hash="5f7a9b82a3227f65b9cd94c5099f7e61f80adf35" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png" Hash="ff5e36d4ffc10c346429b45477b36a9b37739310" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small.png" Hash="f2823efc465b5e7c195c19db1aa4122be6371e37" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png" Hash="fd95e629e772068c0730ccf825716ce535b01312" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png" Hash="944e9cf891671edb18c25d8c54b825fa92f9b741" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png" Hash="159f8e3870425a7bf9be4439897f17b7e9ccecf9" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png" Hash="c8911c926cf1c0b8c0243dd32372c29ffa5ea860" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png" Hash="ef53701c374ddb77d6be177c46927271d1d696a3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png" Hash="e50aed4eadd1d90f3fd8619aad0b3996d4f059db" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png" Hash="8d79593a5d1af493a8b931c2f8cfce72f4f03f28" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Sample App Icon @1.5x.png" Hash="a93f825c00d5b32245e8ed527e1b6f0d0b9a04ef" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Sample App Icon @1x.png" Hash="a2ef8ba837ab1bef7f522fe7ed614ffeaafe95cf" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Gear.png" Hash="d9a0c76a7cdf2b0a0795fac0ffcc78b68706b156" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Gear@2x.png" Hash="0cbeea16d969c16ed7c1ff95a46b0759e9675481" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Gear@3x.png" Hash="72bf9ccd2c51d4da750333e6bba7a3043b6c4e03" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/TabBanner.png" Hash="61b22f575a11587fdd9b25785f647efb77570462" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/TabBanner@2x.png" Hash="a7088bc59790ee8f8fc2f35eef91b4410bde9ef9" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/TabBanner@3x.png" Hash="bb75723e538ed82c7fb2c5b247c5c0cb72433a89" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/TabInterstitial.png" Hash="5b56c974ab607e11aee5328cae9248f9bf9e64b3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/TabInterstitial@2x.png" Hash="4090acb0b9915431386b3962e8a503f1df15b3da" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/TabInterstitial@3x.png" Hash="bc0939a180f60ca8f92ce074e1b45c87d49fbe94" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/TabMediumRect.png" Hash="bee4765f9ab4ce0e7823129aeac902b11f227234" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/TabMediumRect@2x.png" Hash="6b0d6b37d79684f951ad0b74e40adb128e42d921" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/TabMediumRect@3x.png" Hash="9acb9bf7e87cfd43cced968f966a3226a1d0553a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Info.plist" Hash="3a2bd25ee5973616e8f590cb439891771d5908bb" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InfoPlist.strings" Hash="c3b87f4a1d0b7a81c08b54aa19dfcd34db210ae2" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/LaunchScreen.xib" Hash="09e640b915a806d5f3dd9970158f091f02a9c721" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MainStoryboard.storyboard" Hash="f20e4334412114ef823a4e1e1353f19fce2df1d4" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample.xcodeproj/project.pbxproj" Hash="72a1a1a350b856817b5f8648ac7e391577973c25" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample.xcodeproj/xcshareddata/xcschemes/InstreamAdSample.xcscheme" Hash="d66766b4b61863a5dd895e4db03c35566e42a727" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon.png" Hash="c1356f0f964a1737ff696326f95502c204929c5c" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon@2x.png" Hash="607b06610365e49a31bcefc0f87ad884b568f725" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png" Hash="ef53701c374ddb77d6be177c46927271d1d696a3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png" Hash="a93f825c00d5b32245e8ed527e1b6f0d0b9a04ef" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-72.png" Hash="80531c0da40f8032fc05886c0b76ffd00c463622" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-72@2x.png" Hash="5e5dd38dd3f1766d52ddb4ab715c6c1525f8d098" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-76.png" Hash="5f7a9b82a3227f65b9cd94c5099f7e61f80adf35" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png" Hash="ff5e36d4ffc10c346429b45477b36a9b37739310" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small.png" Hash="f2823efc465b5e7c195c19db1aa4122be6371e37" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png" Hash="fd95e629e772068c0730ccf825716ce535b01312" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png" Hash="944e9cf891671edb18c25d8c54b825fa92f9b741" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png" Hash="159f8e3870425a7bf9be4439897f17b7e9ccecf9" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png" Hash="c8911c926cf1c0b8c0243dd32372c29ffa5ea860" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png" Hash="ef53701c374ddb77d6be177c46927271d1d696a3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small-50.png" Hash="e50aed4eadd1d90f3fd8619aad0b3996d4f059db" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png" Hash="8d79593a5d1af493a8b931c2f8cfce72f4f03f28" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Sample App Icon @1.5x.png" Hash="a93f825c00d5b32245e8ed527e1b6f0d0b9a04ef" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Sample App Icon @1x.png" Hash="a2ef8ba837ab1bef7f522fe7ed614ffeaafe95cf" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/first.imageset/first.pdf" Hash="a85f8a730d302fec6e1403a9e048f2a4502c3f9c" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Gear.png" Hash="d9a0c76a7cdf2b0a0795fac0ffcc78b68706b156" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Gear@2x.png" Hash="0cbeea16d969c16ed7c1ff95a46b0759e9675481" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Gear@3x.png" Hash="72bf9ccd2c51d4da750333e6bba7a3043b6c4e03" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/second.imageset/second.pdf" Hash="7df5c561e3c1e2e26cae02035de74e7736de77d9" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Base.lproj/LaunchScreen.storyboard" Hash="e7a946d34193c40095e4ac17158c75da3b5aa7d8" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Base.lproj/Main.storyboard" Hash="5fc05d7446fd55761b028efdc4c3a99b63fb02d3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Info.plist" Hash="be7f90e350619c628621ef32b23c9af100f59d16" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample.xcodeproj/project.pbxproj" Hash="3cde24ec59ee2c64a8eb5a901acb12ed5a36edff" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample.xcodeproj/xcshareddata/xcschemes/NativeAdSample.xcscheme" Hash="e9b8f099d50f944a15f1457ff25cbd4a0138accd" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.xib" Hash="089665839d10189e3b2c59e20b419adb3c435082" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon.png" Hash="7dd637abe697399c1a585eb9a67d395b163e774c" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon@2x.png" Hash="be58fbfe554f0ada7cadeb9f9450d7c2f5816ec8" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png" Hash="a968699984439d3eb893a0fe4773874b9caa993b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png" Hash="380398d75ffa424ce1ca0b0d1423c46003c2ed30" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-72.png" Hash="730b871bc5d664bfd23340ebc5a9af9a9018dbb2" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png" Hash="59f1d4e106df289695f7eef8599fbda2300bb939" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-76.png" Hash="caccd408c463a4333e5131ee4a10e00b7d5b5a48" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png" Hash="e7d2246e4a95130880c8f3b8de8dd0b3ebb061b0" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small.png" Hash="3fd5a661a93932c46c5ddf52d7049591c0feb837" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png" Hash="0f1fee297b55cc82b12b3340b05e79f7da31e13f" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png" Hash="cce3db40d56210f508b68b2c54f4dc6cbfeedb4f" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png" Hash="b113a6f30d25ec941467406beb900ca97c7d0a7a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png" Hash="28975c9bd75e5001afb7216567dc598b6828264e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png" Hash="a968699984439d3eb893a0fe4773874b9caa993b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png" Hash="b225691bac1734cc83c9c598c6df22781318ba59" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png" Hash="e4c36cf25a4e91b269ba24a92c7756e33a9f31da" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Sample App Icon @1.5x.png" Hash="380398d75ffa424ce1ca0b0d1423c46003c2ed30" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Sample App Icon @1x.png" Hash="f0619eb1192794a47d078f639ed7e3c324abc32e" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Gear.png" Hash="d9a0c76a7cdf2b0a0795fac0ffcc78b68706b156" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Gear@2x.png" Hash="0cbeea16d969c16ed7c1ff95a46b0759e9675481" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Gear@3x.png" Hash="72bf9ccd2c51d4da750333e6bba7a3043b6c4e03" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Info.plist" Hash="145ff94b8a57e11b9e4a92979ff5851e702f8a6d" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/InfoPlist.strings" Hash="c3b87f4a1d0b7a81c08b54aa19dfcd34db210ae2" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/LaunchScreen.xib" Hash="b65f2d12471c4ae3d1fb18a66d4674ef59aee64a" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/NativeAdSample.entitlements" Hash="2ea065835169386753d67243fbc21c5ef90917b0" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.xib" Hash="9a348351b19716daddc6f368db2c5f275333dfb3" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.xib" Hash="5f145a5a5b9d8a97026529b460603066032ebe1b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.xib" Hash="89388c1b2e31ef18ea13cb8a475974c672ccd56b" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.xib" Hash="4b4270b7746d0332e4eb386ba5e95a186c942c98" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/AccountKit.embeddedframework.zip" Hash="1448c4c1d51d5e10e6f1770070b7206b764fb1e0" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/Bolts.embeddedframework.zip" Hash="0be2ede45586b38063fb218f03e7dc9fd5804793" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBNotifications.embeddedframework.zip" Hash="ac2f55022d3654c607fa4e961f0f8fff5cc11660" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKCoreKit.embeddedframework.zip" Hash="79597cd37c94069f42c288687646ee19f39a6a03" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKLoginKit.embeddedframework.zip" Hash="0838e639394a5c8efc8b8c05098b82eb89261d63" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKMessengerShareKit.embeddedframework.zip" Hash="e1dd37eb4ead8c7fc0a7668dea46eb51aab6c667" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKPlacesKit.embeddedframework.zip" Hash="050550836ae974552f352b1a49497b95676cea5f" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/FacebookSDK/FBSDKShareKit.embeddedframework.zip" Hash="d401d6e444669870f039139f1e32029b87ce8e7a" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus.xcodeproj/project.pbxproj" Hash="d7921514327fc1a306e097120a587efdf2a9da83" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus.xcodeproj/xcshareddata/xcschemes/Iconicus.xcscheme" Hash="72f554bd877f42b6cca8f219db526c347d9aa528" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus/Base.lproj/LaunchScreen.xib" Hash="121eaeaad6fd9768a822869f4c98c09d498a9ad4" />
@@ -30857,7 +30746,7 @@
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/right-scissors-128.png" Hash="d096daf3dba610019c4e552288333ac77f6a811d" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/right-scissors-88.png" Hash="03d9865a482298731f1b600016b1a01a927ed2fd" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSAppLinkedViewController.xib" Hash="62eb76ad3fea58e0ff2de2a664effe34528dbe24" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSSample-Info.plist" Hash="8bbcb2be70c4fba9c86d1e8b57c0fbee77e5310c" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSSample-Info.plist" Hash="482ae2a9cf85718f5ff38a9f9ad1693b4bb8fb1d" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj" Hash="4678c84b634042b8efd1aa959a4f4e7330e993d5" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/Scrumptious.xcodeproj/xcshareddata/xcschemes/Scrumptious.xcscheme" Hash="084d88b7908d87267b2758c9f20d0835942f30a2" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/en.lproj/InfoPlist.strings" Hash="c3b87f4a1d0b7a81c08b54aa19dfcd34db210ae2" />
@@ -30899,7 +30788,7 @@
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/scrumptious-Info.plist" Hash="f3c7d6f9cdf005f1be5ae9ab80c80246af61e01d" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt.xcodeproj/project.pbxproj" Hash="fd4f7e66cc5c6d00a202dd6378a7de90e460145e" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt.xcodeproj/xcshareddata/xcschemes/ShareIt.xcscheme" Hash="47efbaac34e2293c1dac5786a66fd027ec825728" />
-    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/Base.lproj/Main.storyboard" Hash="645ce19c6f5fdb638bef00429a3d6da4e87a8c61" />
+    <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/Base.lproj/Main.storyboard" Hash="66f238e107228787484e13de1fe1078beb782487" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/en.lproj/InfoPlist.strings" Hash="c3b87f4a1d0b7a81c08b54aa19dfcd34db210ae2" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/Images.xcassets/AppIcon.appiconset/Icon-29.png" Hash="e5563f82b0e68b742b6fdd3d9141dc18167a4548" />
     <File Name="Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png" Hash="fff5a5552246e9356d0ba5f4d06e2d0f13d805ec" />
@@ -31200,7 +31089,7 @@
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/android/x86_64/libgvr.so" Hash="2cd06fe763ae8d2b9db2ffe3ca5f8b1f2540e2f9" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/android/x86_64/libgvr_audio.so" Hash="48b41e30e1379711939f562fce012ad1485f668a" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/android/x86_64/libgvr_shim_static.a" Hash="fae21f0efb4f8f4e04e8fd8c8b6da1e0e7a0d0e3" />
-    <File Name="Engine/Source/ThirdParty/GoogleVR/lib/common_library/additions.gradle" Hash="492502c6b0f870310fd686e6191647e7383a7840" />
+    <File Name="Engine/Source/ThirdParty/GoogleVR/lib/common_library/additions.gradle" Hash="50ad355048c303f37c8ac417cd5e8aef95ee87fb" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/common_library/libs/common_library.jar" Hash="b67ebefe6a678e6067861ffb3ad7af67fb80297a" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/common_library/libs/protobuf-javanano-3.1.0.jar" Hash="5110f05deac8f15244897b3f70e9ce413468771d" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/common_library/local.properties" Hash="cf7cd7f13c8fb3328380c82edd3f82897503ef4d" />
@@ -31221,7 +31110,7 @@
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/ios/ThirdPartyFrameworks/GVRSDK.embeddedframework.zip" Hash="c6400daab867eb032a79ad20dffa4d9249994498" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/mac/libgvr.a" Hash="77f63a7799b1e73a408191f5a8d5b66277d5e947" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/mac/libgvraux.a" Hash="18fc511ce709eae860427c3780735004b53cae4d" />
-    <File Name="Engine/Source/ThirdParty/GoogleVR/lib/transition_library/additions.gradle" Hash="550fd1b362b56e7a9a9067002e4f562eb6041ffe" />
+    <File Name="Engine/Source/ThirdParty/GoogleVR/lib/transition_library/additions.gradle" Hash="2ebc43d26fb148df870a0dc893d091028c3a35d7" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/transition_library/project.properties" Hash="85616173a95fa91310852a2308880e6731f22c68" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/win32/libgvr.lib" Hash="fedd9a578ad8e9ef2f228e5ad95667a7cf0cb4e9" />
     <File Name="Engine/Source/ThirdParty/GoogleVR/lib/win32/libgvraux.lib" Hash="586487bd7958c560fb8e3f3ec0c30c261b7c12b9" />
@@ -32870,20 +32759,26 @@
     <File Name="Engine/Source/ThirdParty/libSampleRate/Private/config.h.in" Hash="6fbd9c38bf659a822f80d571e9a33fa298bf300c" />
     <File Name="Engine/Source/ThirdParty/libSampleRate/Private/Version_script.in" Hash="73ec4c28867867573cab01541be66f81033f6793" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/.travis.yml" Hash="9da969d2bbc3dc37f4110bed72cc1f0fa45d905a" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Debug/arm64/libstrophe.a" Hash="a8c70986ac7aabe4bdfc65db7b55bad16da3dbe8" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Debug/armv7/libstrophe.a" Hash="32fc26539ab714c0b3171b01422c0cd3119f48e3" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Release/arm64/libstrophe.a" Hash="79be80fb83525def15c3132c90dddd85ba8a9d93" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Release/armv7/libstrophe.a" Hash="2f129dcfa2d91759cf268ac4cbb36bfc55969a04" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Debug/arm64/libstrophe.a" Hash="2a91039a3505994ddaf842089c5bb76ddf0c569b" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Debug/armv7/libstrophe.a" Hash="0322e09c028e5770dd6d06ef529091f7291c9744" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Release/arm64/libstrophe.a" Hash="5d28d29fd24f9030665042cf29f2d5c760b33036" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Android/Release/armv7/libstrophe.a" Hash="b4d55ccf61cd830e761ad936a3ca6f368f42f272" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/configure.ac" Hash="d5511f290f000aacd07c4eee951b62cfe4e9fb4c" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/COPYING" Hash="b5b02b379634c047dd3bfe612165a81e6857d319" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Doxyfile" Hash="14c579e73bb3d3be509f7cbaa3164991f3ce6774" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/IOS/Debug/libstrophe.a" Hash="e07a3ef5a4b0ebf8149b349182e93dd90ce3e451" />
-    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/IOS/Release/libstrophe.a" Hash="f6ef54e8fe7ca95f6c69d2b8771158fb9167ab61" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/IOS/Debug/libstrophe.a" Hash="c63aeb18c695bfae16baf15c41806cdb684beb08" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/IOS/Release/libstrophe.a" Hash="a2a85f5a3a359f32b034a1405c25fa68fd8e7294" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/libstrophe.pc.in" Hash="d50cb67e238567df16607ffbad4eaf203541231a" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Mac/Debug/libstrophe.a" Hash="50c105c52f10cbe1e9505873e33f32a3c007f8c8" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Mac/Release/libstrophe.a" Hash="2b6f8d50448e8455f695c36a0c2304b1926f11c8" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/NEWS" Hash="da39a3ee5e6b4b0d3255bfef95601890afd80709" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/README.markdown" Hash="7d2a01c643c3856f5fe44fa742cbe441de54986f" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/rpm/libstrophe.spec" Hash="b520ff3b2afbe4fd818ea7c144f96fcf91df68b6" />
     <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/TODO" Hash="da39a3ee5e6b4b0d3255bfef95601890afd80709" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Win32/VS2015/Debug/strophe.lib" Hash="8b749e7c8115a74521fab19ca25f269e6a470cf4" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Win32/VS2015/Release/strophe.lib" Hash="334854461e9972049c640a91910c0cd5654ea5a7" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Win64/VS2015/Debug/strophe.lib" Hash="d063b53190a970d9ae1145f87f5bd05bb65bde55" />
+    <File Name="Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/Win64/VS2015/Release/strophe.lib" Hash="46bafe894f8c9743761e8eb1a16a6c14d2f08fb4" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/ARM64/Debug/libwebsockets.a" Hash="37044601608fa9bb5076dca85001fa4feec69cd1" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/ARM64/Release/libwebsockets.a" Hash="2eaa628d671f2eb5b5724cbea13f5f84eab9d252" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/ARMv7/Debug/libwebsockets.a" Hash="a22f1d741aee13141978d7f18c56dfd6fc3ebc0e" />
@@ -32892,8 +32787,8 @@
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/x64/Release/libwebsockets.a" Hash="2e77aea1dc49b15c39fe945e007ac388caf6fa76" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/x86/Debug/libwebsockets.a" Hash="7a8970224dfa8b8bf758d7e441492932c29e7f33" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Android/x86/Release/libwebsockets.a" Hash="bcea39949265fd482f0b9112374e9f402325d429" />
-    <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/IOS/Debug/libwebsockets.a" Hash="32855959f3a4a9868c130315c64027cdd39b99a3" />
-    <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/IOS/Release/libwebsockets.a" Hash="dbec6ee2810cb3d69f80e1f53e35c6d96c08335d" />
+    <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/IOS/Debug/libwebsockets.a" Hash="c59ae9f6d3a7468e49be4b041484a214dd5d18c8" />
+    <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/IOS/Release/libwebsockets.a" Hash="aa688132166c54ae9d338e734c999436f2cafe04" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Linux/aarch64-unknown-linux-gnueabi/Debug/libwebsockets.a" Hash="8614277b280decc4ed5f455a378d6596edb6389d" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Linux/aarch64-unknown-linux-gnueabi/Release/libwebsockets.a" Hash="3a68729f288c3b18db3332a78023f1ccc34868c4" />
     <File Name="Engine/Source/ThirdParty/libWebSockets/libwebsockets/lib/Linux/arm-unknown-linux-gnueabihf/Debug/libwebsockets.a" Hash="eef17231ecab004689a2e57b1b7a6971b62158cc" />
@@ -34570,117 +34465,117 @@
     <File Name="Engine/Source/ThirdParty/PhysX3/Externals/nvToolsExt/1/lib/armv7/libnvToolsExt.a" Hash="e4dd8cc6d9230b474d19372050f694700b373251" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Externals/nvToolsExt/1/lib/Win32/nvToolsExt32_1.lib" Hash="b7726d05e8a007056b0905be8917011d7e86b9b3" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Externals/nvToolsExt/1/lib/x64/nvToolsExt64_1.lib" Hash="a24ae3d78b248fa6ad2aeda09399d439293b73a7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3.a" Hash="fa12a61eccb5a1612e287f8a6fc5401c530279ec" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematic.a" Hash="78da8dee47cf708d075e28bda1ebf2c6559acd7f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematicCHECKED.a" Hash="aa66e660e109b52bb8244cd64c8b78edc2f88d2a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematicPROFILE.a" Hash="003817c5a360fe27116306e9f4b92c58a981161a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CHECKED.a" Hash="331623f5ca85e549c55069829eebd4e66704ed14" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Common.a" Hash="57d151385f5e2e99f536031b528989cde6023506" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CommonCHECKED.a" Hash="0a25d51364ba9e4de8b3e75804c8de2488904854" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CommonPROFILE.a" Hash="e8ab5a6b396ad90309d40bef8f96a96b9a5c0038" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Cooking.a" Hash="dd3df5f573825b171381e9582b27cb4f5b62d65a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CookingCHECKED.a" Hash="28cd048f59d37fa2102a215df8a936b26b7ddf44" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CookingPROFILE.a" Hash="0453cbdbff5e57db5adfbfc6c9959831dbfeba23" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Extensions.a" Hash="dcb1c4fdf204779da8f0925469c30a28738d1c45" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3ExtensionsCHECKED.a" Hash="81363f314948085ab85ec29a9c11b9bc3343a02f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3ExtensionsPROFILE.a" Hash="e782dff9a80709e48dcec7f0182452bcbb9b65ee" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3PROFILE.a" Hash="cbaa1a327be10d223a04a826388fce25b1afde80" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Vehicle.a" Hash="2ba1731e42009ad27f049a7fd0d3fb8798c1d977" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3VehicleCHECKED.a" Hash="bb15c29f01189f8d7a9bffa5195ca347c42d7133" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3VehiclePROFILE.a" Hash="37025d4a5cd5df0faf23099fb7873909fcc64512" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXml.a" Hash="ecf725f213cb6115f9cfe83ac48e4001f7e1a96a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXmlCHECKED.a" Hash="de4f5f32997ab8c78e7e8b8bee2d838ca8905a67" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXmlPROFILE.a" Hash="33b9e2ef4a0ad66fa3a37e7a45bb5ab178330689" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundation.a" Hash="0a7898482306503b3d282fabd8ce1b67413eca19" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundationCHECKED.a" Hash="6e77aac2bd41076fddd6c91515a8fb3a56dd2e1f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundationPROFILE.a" Hash="6e0a614da893915ebe57bbdc7e2c602a5886f3f7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDK.a" Hash="60518eb2906bf482da8217f22f70d6513936add2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDKCHECKED.a" Hash="da1a90b77429e833840884d42bab85be164ef05d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDKPROFILE.a" Hash="9da393a8710618eaabbc2ec25cc7ce21588c2441" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3.a" Hash="ab51933bb27d0a5e581def41b181e444c4f222c6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematic.a" Hash="da8c8ea204116370686ed75cea85b7346ccfd1da" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematicCHECKED.a" Hash="f4edcd97dbc115e48adc31fe20aab22dcd98ab7f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematicPROFILE.a" Hash="d563a86a2c60aa1a53570b219752dbb6089810fe" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CHECKED.a" Hash="a697e1e86b98c7cbda9c8bf23688b2fcca9083c8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Common.a" Hash="c83f2d111654d5dc57feab25de949b1bcd660366" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CommonCHECKED.a" Hash="34eb0ccf4667f521a66b8510293e18f61f3f34f0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CommonPROFILE.a" Hash="10baadf5db8dad4aafc6b7d4eb65963e629eb295" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Cooking.a" Hash="d8a659e7d5943b2d940c45ce6c64f038a6196075" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CookingCHECKED.a" Hash="2ab9c5e199b9f07f6a35f5d9161aa7b0f3d5a65b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CookingPROFILE.a" Hash="57d26d4e7204922b6e90d6c3b455a9cba83d6445" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Extensions.a" Hash="8e7334bcb1fbe079077fadb2cdf927e4bd0e924d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3ExtensionsCHECKED.a" Hash="ede10d6e75c35ccccc495f2e41cd25ec849fde32" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3ExtensionsPROFILE.a" Hash="cc5966ff9c17bcead7bf9d1e9ba6322d7e75ad9d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3PROFILE.a" Hash="3fb9b7ad569998ff4d83673c2a4dc255c82e0595" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Vehicle.a" Hash="38c54c90cc3c86e013d9b1bb45e0b6d031b943a0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3VehicleCHECKED.a" Hash="6b91dbcfa43c9ebf07573c27e72c45b29654cca9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3VehiclePROFILE.a" Hash="dde1ed0ab5e8faffb8dc432aa123d8fc14a30a16" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXml.a" Hash="f6e6433a4d2eb24211d8e1440b38bd2b6394f816" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXmlCHECKED.a" Hash="39d66c41850d0b1d501e279b20e62872d86e1ce6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXmlPROFILE.a" Hash="36f5279204e9af6b3db062bdf2fa5f6ff2bf6d54" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundation.a" Hash="9f8171a920ddc1f873c4f47870e6c6e3b5667893" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundationCHECKED.a" Hash="fe37a18ff8f360f74de0115c69f6e45830f4ece0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundationPROFILE.a" Hash="b35bbc38fc73ac3d8ebf504230982bde85e17496" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDK.a" Hash="180fd06256f98d3c220af11feef1df1d1b28eb48" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDKCHECKED.a" Hash="fa6725e2629dc3c0afdc3e26fbe10731667c3576" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDKPROFILE.a" Hash="2a06ef6f3c5b1bbe019cf75466e17b9a5f273832" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3.a" Hash="c6674e4af3bee9e246037324edad5c49853e6701" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematic.a" Hash="7aaf7106bf30bcb6335f2c6a13ca26ecd3760e2c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematicCHECKED.a" Hash="7328cb24d18044eb819e8e52df0054f171d4c52b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematicPROFILE.a" Hash="ffc9f6f2e4ca68a01f8dce758294435349c8a843" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CHECKED.a" Hash="bf950f18a478d7ca9d8b9667da1ca6635c51c093" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Common.a" Hash="1535664ad3b4435e2426b2dadbde80ea7049c467" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CommonCHECKED.a" Hash="47b623a96775b27e0fcaee556cb03a89d283ff7a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CommonPROFILE.a" Hash="20cdb429775d8d4c0760606c923bb237e595190e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Cooking.a" Hash="4750d342c87dd63ba84d73028a17f1884a3b4a6f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CookingCHECKED.a" Hash="52dd326467ea4de96fa4873bc60dba97c6e1aa2c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CookingPROFILE.a" Hash="e85b2c2a68f95a6224b8ada5b430acaa120f9d6f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Extensions.a" Hash="c0d2ae75226d1ca7d89ce37994a1ab956f26b496" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3ExtensionsCHECKED.a" Hash="6f38892678a9207c491b55d959e7656216dc85a8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3ExtensionsPROFILE.a" Hash="d63209187217dc28aae0e787a436c5864e00708d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3PROFILE.a" Hash="6021a1e865a32de2659eb4622faac8c08d2108e0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Vehicle.a" Hash="826ec8eb872db93218874a90a879c7f5b6302d95" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3VehicleCHECKED.a" Hash="0b578509cbfaa94a227343aa261ac285e23748ad" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3VehiclePROFILE.a" Hash="ba20d65a6b7b4a07ab5a01321677588b4a3970a8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXml.a" Hash="93e4e081a556845b348ad99736ee95d126eb1005" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXmlCHECKED.a" Hash="e3382bf776f737b2b2ede3df5251b3375af29dc3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXmlPROFILE.a" Hash="da38fb8585bd6017a82f6cff643c8c216951336b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundation.a" Hash="ab8212b58d3e94614bdd6f32b696bc3d80401f17" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundationCHECKED.a" Hash="2dc0787186f2637754b8f0591512501c870bc1d7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundationPROFILE.a" Hash="a6d1e093ab83d4a349dbeda3c655ccef59313fa5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDK.a" Hash="fe4050febfc92f53d20a5347ee34825caf9d9ca8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDKCHECKED.a" Hash="bb0bb6b67eb4cd1ad26dc1d9761325d33edf67db" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDKPROFILE.a" Hash="981a73ab619741d7a5ba44123916ea73f1d4eee6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3.a" Hash="ac541480b5f1b17190aea36cb4bb4bfade57e266" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematic.a" Hash="b11fdcc2eef8fd007fe5e551d88b03aa43be9473" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematicCHECKED.a" Hash="d846708647aaffcb19699d0259fd856f5112ab6c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematicPROFILE.a" Hash="b0d9f758fa40a2c5609cb68f563714e3a26fe9f9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CHECKED.a" Hash="ecb80f6fe71d2e50f546f43d1456b339d604b570" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Common.a" Hash="231a017387e840465451258c56ebafcb65e55ac2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CommonCHECKED.a" Hash="fef499921598e7d69953ce8a36f2d56f2b581480" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CommonPROFILE.a" Hash="c39e2750aec2b8e02a33a4dfec26d9bb127e8d3a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Cooking.a" Hash="d6664578a7cb8068599653199c9ae45c196fb049" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CookingCHECKED.a" Hash="b2a950d808501df6799f3ade41b9af575ce99225" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CookingPROFILE.a" Hash="68275e1ebc691185d8ea8b4100e771733d3ee25d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Extensions.a" Hash="4e29c8e10cd62a15019464080cb330982d0efc83" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3ExtensionsCHECKED.a" Hash="a306381b69887270e2066a1cd4d6a4f6620ede8b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3ExtensionsPROFILE.a" Hash="d908e7a9dc216987330d1647871b92bdc13a54fc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3PROFILE.a" Hash="dc0505762b04f0dbb9e07d31b4dae1fdd686af86" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Vehicle.a" Hash="f818a2e00f55d3a2c60a71a83c1d69106ccafcbd" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3VehicleCHECKED.a" Hash="e6bdcd40ab7a9c997a710fa4049a2ad01879eb96" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3VehiclePROFILE.a" Hash="63a26eb818418cb22750767d841be671a45bffd2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXml.a" Hash="9d04c36fbed560d6dc34a1b4a37026df166a7871" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXmlCHECKED.a" Hash="2badc24c56a04e3e33e95798d85feb42881f983d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXmlPROFILE.a" Hash="23606a961858209a42280a946b33bc20a01005af" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundation.a" Hash="0eb78a423f117f2c82db74b22e35be9e9d89c2a6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundationCHECKED.a" Hash="b7af08e0f06ccf3b0cd50260533fb7bad9238fa7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundationPROFILE.a" Hash="15585bb1f4cf07fdc4c41005bde027569231a94d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDK.a" Hash="666394f34a217159874fab5c24b845ef05ee0b6a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDKCHECKED.a" Hash="539aa3d424061dc4fb25ef1142c0e10e63f22315" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDKPROFILE.a" Hash="41d8e71320aa04ec1c629a45deb3f5129321e61f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_O2.bc" Hash="990a93c45a64293fb3af68d4718b9fd0eb99dd3d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_O3.bc" Hash="990a93c45a64293fb3af68d4718b9fd0eb99dd3d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_Oz.bc" Hash="639eec45ed690582700b2fc4e03f970934c3d67b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3.a" Hash="b20ddd0ed971268859358f5476413b86ce79f24d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematic.a" Hash="04ecbbd0224b62ec68b141551b8c48d85a2e7d69" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematicCHECKED.a" Hash="71b5f71b8aefe7d6f657247138b57a46a51cd0c0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CharacterKinematicPROFILE.a" Hash="7b497f461447999aca6116be760a8b36acd8fe14" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CHECKED.a" Hash="8ceacc101b115a75d6fcc8f9588a372ab10acf5b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Common.a" Hash="1f0b7f69541b0b1a88c5982491e3c8964a7b691f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CommonCHECKED.a" Hash="8e4a6d9180e62d2e78ab2ff7b8dffb87f023cc5c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CommonPROFILE.a" Hash="1166db230fffea82dd9fc967a124c2226fd7d8ce" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Cooking.a" Hash="811462ace759213deb399240c8e2b9f62951c8c2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CookingCHECKED.a" Hash="8d39a5762ccb96a5b1306167732090837397dd8e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3CookingPROFILE.a" Hash="a4b0ce93282209cedf9c8334024f6bf70d8a17d5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Extensions.a" Hash="d7ef895cda649a1225df610e15a9b11d0a1bfa69" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3ExtensionsCHECKED.a" Hash="8351473ed1a9c0e3d2141099be8167a469e7df03" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3ExtensionsPROFILE.a" Hash="62f9bf444b1f1166e35ee919bfeaeb06c37bdb74" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3PROFILE.a" Hash="5404a0f8194a2c30743284e766d52e0c95a09975" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3Vehicle.a" Hash="d7b411c800c76f5d0c7d0649a12cc20b1746a233" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3VehicleCHECKED.a" Hash="a05496af73506db35a419feb8330d9469105f9fe" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPhysX3VehiclePROFILE.a" Hash="d4e5a08dfcbf1a0a4de3c27a00eb54e1ce91ab1f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXml.a" Hash="72e61e23e3b70a7e0cc35c307db6d0e069707562" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXmlCHECKED.a" Hash="6d642ed16babdbb13abc5644809c5d2e25d68710" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPsFastXmlPROFILE.a" Hash="8afec87c3041f7751fa910e3bdada8dc07fc78e7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundation.a" Hash="3dc950b436aaeec4a796cec927e64592ebcad47f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundationCHECKED.a" Hash="3f0490ff43f14424e23d6be7837d68b0ab15f61c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxFoundationPROFILE.a" Hash="63fb633ea22231a1b3235e51fd836b0849ff727c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDK.a" Hash="49f89c011f72988f0894184b529e46059252be93" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDKCHECKED.a" Hash="8ebb1f6a6e84cfa71fd2f92dccedca759799e955" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARM64/libPxPvdSDKPROFILE.a" Hash="7f3c828924d45d4d5731c6b6c891d724e638b00f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3.a" Hash="26929ac034a1b0e0c88ff80fb9f78cb3d1851340" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematic.a" Hash="0c0d658087672ec514ed2258f1727ddeb144f9af" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematicCHECKED.a" Hash="12a3b8fbe0186601d51253213b152af6d42e5af3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CharacterKinematicPROFILE.a" Hash="d0598808e4f767497314434f6c4233b19c17fa1b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CHECKED.a" Hash="39322c21d799aeaa08aae75d799325f38de65985" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Common.a" Hash="c4ce04638d0d5c4066dedeaff25644c02def733e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CommonCHECKED.a" Hash="59a56c838660e52e9a5807bbf3ea694b0a281e3e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CommonPROFILE.a" Hash="e97b15445ed437e54b06471f50ccbc0c3b74b994" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Cooking.a" Hash="7ea95761f2719e137ad00e304ec5cd1642fcd615" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CookingCHECKED.a" Hash="4b430c66f92733ac559a59636c968627931ff3b5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3CookingPROFILE.a" Hash="4e1d6723f3148efb23883052652f1149ae201886" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Extensions.a" Hash="bca2f6c663b216cc435415ed938e94173dade33c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3ExtensionsCHECKED.a" Hash="1b8ea6fdec8839420906a113d17960a11fb7a0a0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3ExtensionsPROFILE.a" Hash="40f3c7d2b293f67a12050ba95e58e5607aa28880" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3PROFILE.a" Hash="57db7eeb12c90f4410139a69752d8e96938f1ed1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3Vehicle.a" Hash="94c298da5b3942a193ed47ebd496651e209e88cf" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3VehicleCHECKED.a" Hash="35c5b02e96935066ded91d5d33a921940ae12a16" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPhysX3VehiclePROFILE.a" Hash="1a2fffd609b531f0b6f0a802ba5e29fac08e7eba" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXml.a" Hash="f4cb8956ff4a1ccf38852971a1d5317cf4c6e8b9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXmlCHECKED.a" Hash="d6d58640493cbb6330582f346714225fc503435f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPsFastXmlPROFILE.a" Hash="4c07c98fc255a5470442af06855cc8ac957dbd75" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundation.a" Hash="412bd8386b73a231a3f150cf650bc2285928dc94" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundationCHECKED.a" Hash="f1134721d7e6aad9657865e2674d974f0dd4b1ca" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxFoundationPROFILE.a" Hash="3e077f8092a10f1d1a0704b34c49b7ad0e16f878" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDK.a" Hash="dd7a5bb4ec48e868672d21a4b4ae0c1a13235a14" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDKCHECKED.a" Hash="b472b6f566acf48cc3bd46fd3b69d74326a5e1a8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/ARMv7/libPxPvdSDKPROFILE.a" Hash="f8fa9c8a6bde9d91cfaf53cfc279000f78509220" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3.a" Hash="f48d8dcce333074a1196b65b88b8ce28a387b61a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematic.a" Hash="e165b2cda4785ce8279db91d3923f5367e8335bd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematicCHECKED.a" Hash="f3b042620af3fecb7020df0f5c62b8325870fb37" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CharacterKinematicPROFILE.a" Hash="d41cd589c496ed39a9b92d443a3a2ee6b78f0c06" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CHECKED.a" Hash="2a4d3e958fb5afd2e4bbfaf316f88aa7177b02b5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Common.a" Hash="a14f0c77600b567085904d8eba33fd4b2965d453" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CommonCHECKED.a" Hash="206570be2532f12ec38a279d1f7e77d8bb9b9659" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CommonPROFILE.a" Hash="6803740b8a87893d82e11a9bd9e1f4018a3bf26b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Cooking.a" Hash="937bb9aafe6d9d42b1ed270b6d674170bfe66d5f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CookingCHECKED.a" Hash="8897f4af3617434aef31db5dba61e22be0572ef4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3CookingPROFILE.a" Hash="744eeeb8f016c6df645536575f1594b88039cab2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Extensions.a" Hash="12ef269c13cb3fa2fd253ad7a59aa15cc3cf82c3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3ExtensionsCHECKED.a" Hash="9b1a29e5021cb50b2b0e3a8e75c0252e41a08460" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3ExtensionsPROFILE.a" Hash="44c1dd9897ed90d79f9fdf67e5e677236e33a01a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3PROFILE.a" Hash="06983b4e3c02b941c40c59c59d72967bc199f992" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3Vehicle.a" Hash="dcab754c1508d2aeecbca15b69f8b762bab60d11" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3VehicleCHECKED.a" Hash="ab41c245dbba22c64521a5c5919f2d89c24a60e3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPhysX3VehiclePROFILE.a" Hash="5b2c84294d95bbe41189135ef215cb09689086d0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXml.a" Hash="58af952cb0a166bf4f25a42ef3a6e76556e8f701" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXmlCHECKED.a" Hash="b1039893bc50743766a07bdf52ffcea944e59454" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPsFastXmlPROFILE.a" Hash="d52e5821ad0230e7d117b48ab6267a1123a17c82" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundation.a" Hash="9cd36ab693ebc7ec86b6494e261e1dec81a3af9b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundationCHECKED.a" Hash="e9681be0c7d24e7664efb60984b65b9e23a3bb59" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxFoundationPROFILE.a" Hash="32c4f73e142615b27bd4c158eab153fe27d69c6c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDK.a" Hash="08158e85c65cf563a67d95dd7e0f4a4a4448dc6f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDKCHECKED.a" Hash="3bc380f31f2c5951a0fc841fa221b534bda79c9a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x64/libPxPvdSDKPROFILE.a" Hash="5d763ad6d5023e0317b59022d4206b6f795053f0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3.a" Hash="501faadf0a05c91f29eb341c126018f38ab0e897" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematic.a" Hash="4478c5af9da5f6a781c3492f1b4a1bb0db0eae95" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematicCHECKED.a" Hash="8f9126fa55bc481fdba34665887bacfeee1b525d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CharacterKinematicPROFILE.a" Hash="01da4878854b2f6edd3aa462cb72389e0073a27d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CHECKED.a" Hash="19367c2a7f68248f2ec2ecba1b19f477df236110" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Common.a" Hash="c5275d79c2444cd1031ff47b5baee36975940a2a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CommonCHECKED.a" Hash="259cbbb1bd40851af440b3cc7f10822edb8de360" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CommonPROFILE.a" Hash="107fceae72328da4ebf126bc4b6e7b7713d354b4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Cooking.a" Hash="0c05dea8c0e9591d3b10c65a0a92c73d329e1515" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CookingCHECKED.a" Hash="c22e2c2fe3c67c6ea45d0f39d7b5a100a44febc6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3CookingPROFILE.a" Hash="7d633c89317c724d17344da6af363b51bea8745c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Extensions.a" Hash="ccba55c078bf007f1c20acad521c6565bb13dc52" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3ExtensionsCHECKED.a" Hash="1007cc58469513f23a424bd647c652cec29a323f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3ExtensionsPROFILE.a" Hash="2deb9bc60d0dd255633990c6fd6fd8af8120f12a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3PROFILE.a" Hash="6d615f2a80f4889f438a8708041dc0baa4497ba9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3Vehicle.a" Hash="6f4b492d7cd87f5d14ea6598d6ff801a63d5d934" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3VehicleCHECKED.a" Hash="167e1d1c0484c545f20b8b07f22249a9a82c0dd0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPhysX3VehiclePROFILE.a" Hash="7a11bddfcb427b5b9bfcccc3792bc0a74fbc0dbe" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXml.a" Hash="ce139af307c7820eb7156d66cac32f1a8531ee96" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXmlCHECKED.a" Hash="6dc4e3cb0135d8f4b17fcf62aec7a6026b324854" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPsFastXmlPROFILE.a" Hash="f4c74db94c434f87b9e6e7a7d9c02d936981f76b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundation.a" Hash="0a8d96e2222740e98dd646de911374c9a9059a69" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundationCHECKED.a" Hash="42e923aff99d9ff5bd793327c9c35b55f8000915" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxFoundationPROFILE.a" Hash="ccc9f8684de301f0b7cd71847f7e95a921238ab6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDK.a" Hash="3dd7bb568f7d12c16581a95e3dab1fe4ce3c6c65" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDKCHECKED.a" Hash="d402025a1202f5e0a2e840db360d51b73edb4ddb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Android/x86/libPxPvdSDKPROFILE.a" Hash="4fe19f506e2e4391ecc08786c5ee0125136dc11c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_O2.bc" Hash="6b8e6f0ada5d0b6e5b8dfb57810ede412c585920" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_O3.bc" Hash="6b8e6f0ada5d0b6e5b8dfb57810ede412c585920" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevel_Oz.bc" Hash="20c4619eb66dc171754b270d8a32259d85e43cc7" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelAABB_O2.bc" Hash="03115b9813e5e8ea820a85ecafa103f9c41552dc" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelAABB_O3.bc" Hash="03115b9813e5e8ea820a85ecafa103f9c41552dc" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelAABB_Oz.bc" Hash="8acea8f86a2009b8cfd5719994deeec4abda1fe2" />
@@ -34693,24 +34588,24 @@
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelParticles_O2.bc" Hash="6e15641510f02de9f14e21217e5491776b2d56c2" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelParticles_O3.bc" Hash="6e15641510f02de9f14e21217e5491776b2d56c2" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/LowLevelParticles_Oz.bc" Hash="a62a95d415b936c0e2b5f27954ff3cc9bd6c3385" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_O2.bc" Hash="380824ae20d35922be825051c38b7d028c84d5a6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_O3.bc" Hash="380824ae20d35922be825051c38b7d028c84d5a6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_Oz.bc" Hash="f01fb60c85f7d3fbd7d91bcbda656b3502de64e9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_O2.bc" Hash="5bbb59ef74262e4473744876fd4ec458700d3f02" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_O3.bc" Hash="5bbb59ef74262e4473744876fd4ec458700d3f02" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_Oz.bc" Hash="17dc5c2a8e67395cc24cabc1b1d232dc4129d145" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_O2.bc" Hash="11536186a4e91ca2cabc5578381c1cae5a736a42" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_O3.bc" Hash="11536186a4e91ca2cabc5578381c1cae5a736a42" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3_Oz.bc" Hash="d299173fffd6baefae04a629358b4fa6e114effa" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_O2.bc" Hash="40db7ee7946362e9b88de46cae16621fdb025ae6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_O3.bc" Hash="40db7ee7946362e9b88de46cae16621fdb025ae6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3CharacterKinematic_Oz.bc" Hash="f04e9c361859be30d226925e0af25d75c262b9e6" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Common_O2.bc" Hash="67106806723e67ec6764050bd1f89110bb804790" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Common_O3.bc" Hash="67106806723e67ec6764050bd1f89110bb804790" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Common_Oz.bc" Hash="32b68bcad51f54ec96a21ccd106255c6ffff39b9" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Cooking_O2.bc" Hash="6c26d57d5e9b7d6b2bd247a9ecd2829ab4606706" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Cooking_O3.bc" Hash="6c26d57d5e9b7d6b2bd247a9ecd2829ab4606706" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Cooking_Oz.bc" Hash="b474dc5d6f63c689c8b08ec59ce7be5e1836d43a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_O2.bc" Hash="e0ca246215a309af5ff2c2a1aa77cf0538ba0ad3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_O3.bc" Hash="e0ca246215a309af5ff2c2a1aa77cf0538ba0ad3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_Oz.bc" Hash="75d478f91f6912c7089deb5e2520d8306eb778ed" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_O2.bc" Hash="af16759c765a48eeeeb525248cbcd3b6937ae12a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_O3.bc" Hash="af16759c765a48eeeeb525248cbcd3b6937ae12a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_Oz.bc" Hash="0d769e98eb7d0f05a980708ab19b4226c0d9ed33" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_O2.bc" Hash="11ca42f3fc3e884b44b2e99653a033cfe5a029fc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_O3.bc" Hash="11ca42f3fc3e884b44b2e99653a033cfe5a029fc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Extensions_Oz.bc" Hash="a303038b2bc9119465e13010f6e176c70cf7c003" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_O2.bc" Hash="b76cc018b5d1fdfd62bc6bc4dada09f5a4f8ca0d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_O3.bc" Hash="b76cc018b5d1fdfd62bc6bc4dada09f5a4f8ca0d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PhysX3Vehicle_Oz.bc" Hash="d2bc381f6192b4bdf3c3e4e0ba3750c17e562bdd" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PsFastXml_O2.bc" Hash="ab8e1e1d4b1ac40dc2c6d3d3f438863a0fc5eaf3" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PsFastXml_O3.bc" Hash="ab8e1e1d4b1ac40dc2c6d3d3f438863a0fc5eaf3" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PsFastXml_Oz.bc" Hash="91e58817d8273c6a043b32e83a9a4acac163db66" />
@@ -34723,63 +34618,63 @@
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PxTask_O2.bc" Hash="1246a98630ff365b6de7c027fdbc8cfc8ed13e51" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PxTask_O3.bc" Hash="1246a98630ff365b6de7c027fdbc8cfc8ed13e51" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/PxTask_Oz.bc" Hash="89f4b018633ce97147cb8a7a3c99805f4aefa8f6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_O2.bc" Hash="4f908fae395825913133106ba4683ff36471d086" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_O3.bc" Hash="4f908fae395825913133106ba4683ff36471d086" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_Oz.bc" Hash="d2ea73163be272d8f9ac9c0dbb3daf2c23053a05" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_O2.bc" Hash="9c3c8799e3b016527ae4547c4e319a9839ab73f3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_O3.bc" Hash="9c3c8799e3b016527ae4547c4e319a9839ab73f3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_Oz.bc" Hash="9313d00909fbbd3f89be90228fe838fc0bb9fb21" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevel.a" Hash="8500b6375881428551f328382bc7113c10631bb8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABB.a" Hash="38bdc3e84baf3196d0fe5ab94bdd8ac5b8e6f35d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABBCHECKED.a" Hash="295629c204390279c602d5037884c5426957c065" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABBPROFILE.a" Hash="a502f94af3d1e7885cd7bd2f4cceb9d7df0579e6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelCHECKED.a" Hash="ede1b9f466ce4e4c2657e1ecfb5f83331b058982" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelCloth.a" Hash="5b43c254fedc15c3e432ad5c077cd75c35a60cb8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelClothCHECKED.a" Hash="82553b5726640e4778b8bb749aa01e2e61474a81" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelClothPROFILE.a" Hash="8425636a31606fd6d44fd9c1f7210bbb7de05808" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamics.a" Hash="6cb7b8a5ba3fbf3bf2648c93d4daf01031292bf3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamicsCHECKED.a" Hash="3480c8de2be253ab79264984bb5221b7b1a18221" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamicsPROFILE.a" Hash="24b1e9866fe16055704f071d2a6255c3cad0973f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticles.a" Hash="b85cef95ad592d860cc67bf7f2f0c66147f51adf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticlesCHECKED.a" Hash="03f735d4979f3656837b39b4fe7844c7adeaa2db" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticlesPROFILE.a" Hash="134d27d5f4ea13c648dc9cfb17d4e5c2ea9f3cec" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelPROFILE.a" Hash="60a0f3800b53c89cd526340e9514528e2f2e81f2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3.a" Hash="71dca98f367a89352b7df52d92acd804b4a3e7fd" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematic.a" Hash="32b00192cabb61d0635aa9d919f4aedd141c9f26" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematicCHECKED.a" Hash="5358c4ec804cc442eaacfa0c6b80c794b7188fc6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematicPROFILE.a" Hash="d6251629ae7a311de65eaa75adcd28cc85dcc44a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CHECKED.a" Hash="dc458620028e34bcb38c21ebe01725ff46b831f5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Common.a" Hash="ba80d958adc27e4ebf942665787a3bf0983b37ad" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CommonCHECKED.a" Hash="1f1761bcaace5755a54469253d31123fa6983ecc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CommonPROFILE.a" Hash="18ac2ee3dcbf2ea69e13159784a45b390c30d8a9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Cooking.a" Hash="5aa0968bcc4c29772619e01f89ca1cdbd0e4ccc5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CookingCHECKED.a" Hash="6931c91cb003c83c364a1f9fa237525da1a1c21a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CookingPROFILE.a" Hash="eff14e23ffd5341acc5e64e7e9e52ef22d35dc22" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Extensions.a" Hash="82f864af93f3db7e58458abcfd88dce6514ca275" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3ExtensionsCHECKED.a" Hash="cebdd88a6670457e33b10a753ad177e037fc45c6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3ExtensionsPROFILE.a" Hash="c05b9e5fa1a3831302c185824499f75de6764f27" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3PROFILE.a" Hash="1673c98e35cba9d2b968abd9cb9c628d8677810a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Vehicle.a" Hash="a022bf82af59e5e645be54fd08b699501fc0dd7f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3VehicleCHECKED.a" Hash="9c98b95aa4b61bd9c1aca9873c567e5c9b3eaecd" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3VehiclePROFILE.a" Hash="8290c7d8e0d1215456a79973061cb4e8bb7ba077" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXml.a" Hash="ea74b83e4f0f7b66d6816ac8c294bdc3dee96e4b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXmlCHECKED.a" Hash="3a1a4461c133c90e58f3728cfc100b650ea79e29" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXmlPROFILE.a" Hash="955af2dda42e1e248f59efef4bbbc931f496564f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundation.a" Hash="59eabf44c38d1cc1b9e699770f8ac2dd5ead9176" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundationCHECKED.a" Hash="7ebed6ca64371bf1fbf3edd74c2cb3cab3b6926b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundationPROFILE.a" Hash="ae4727664f74eea70ca0ca6903a65327f8e71b10" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDK.a" Hash="e0e74d161a342802c9ffd53f6ceeaf177055e217" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDKCHECKED.a" Hash="6f41ff971c6f34d07ac693fb975798eeb859720d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDKPROFILE.a" Hash="120f33f9f06648b5239d41935dca2287e5efc003" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTask.a" Hash="8f45b42ac41d6cf26427c8183005dd3b25e19566" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTaskCHECKED.a" Hash="9fb6f269d6da18d0c1e355fb433256f9807e0593" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTaskPROFILE.a" Hash="d272233d5a579dc78c159cb0ee42fc017c805ce1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQuery.a" Hash="db4f618534fe17b98fad971a648f22a12b4b2d34" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQueryCHECKED.a" Hash="c360e5e1a11c8ece56c582f29dd72bdea31c72a7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQueryPROFILE.a" Hash="4cfe719837b3706d5642e95be46bbb4c3259559e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationController.a" Hash="24fade4326b13f7a70046eb2281286ed7c90559c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationControllerCHECKED.a" Hash="23742c576f6c13b58ae81be87b8fd4575337b745" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationControllerPROFILE.a" Hash="8bc849e5cd71936066bae9ccbe179297a5e40fd4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_O2.bc" Hash="38322c6bbfbc33a344fd1ebffb634a00866b3682" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_O3.bc" Hash="38322c6bbfbc33a344fd1ebffb634a00866b3682" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SceneQuery_Oz.bc" Hash="e92357106f6a0747a2e788bbd74bf8f8b6832c06" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_O2.bc" Hash="3fdd57cf0850575928ff3b5105b47e5f6a1d0286" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_O3.bc" Hash="3fdd57cf0850575928ff3b5105b47e5f6a1d0286" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/HTML5/SimulationController_Oz.bc" Hash="4699bccc09f199ca77b64e7d05ecf740c8b1d9fe" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevel.a" Hash="3e2f51c5e236c5c16d347bd3f303fa6c0cf34709" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABB.a" Hash="9b51b91672e0a804c628a74e85b6d9ce99da73a4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABBCHECKED.a" Hash="f910cd5afb9a2bda66716b8b28ad1fefcd1943dc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelAABBPROFILE.a" Hash="7581c7de7ca8ffd128f9561a0188e4afc8d6c289" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelCHECKED.a" Hash="b0d6fa139c1e144072c0e95508804848d3a76b3d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelCloth.a" Hash="3f7450ce465a117076afc29e66be3664208f407c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelClothCHECKED.a" Hash="f5503204de0dfb9713aa60cebfefa0359e308154" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelClothPROFILE.a" Hash="f5232953c5c99e7bc7dcd44c597e72f0d51ae305" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamics.a" Hash="175b0dfca79c63307f9965fab7d08221b6891482" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamicsCHECKED.a" Hash="9114f67bbe4bdcf48eb63422c82dbc36641ee595" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelDynamicsPROFILE.a" Hash="6566b2e2315b037d1e0d0c41d4a84c687a698659" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticles.a" Hash="d93dd084c21cd7ab071f83faa63db41e4a7ea1c6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticlesCHECKED.a" Hash="4f3e2902776ae2e0e84b135c0309bf09f6897928" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelParticlesPROFILE.a" Hash="06e025387999727ae8bd92c388aae533bd595e2b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libLowLevelPROFILE.a" Hash="ef4718b7f84661123c3e16fbe591e29a8163e232" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3.a" Hash="ea2f61c31378fbecb7b4891e48311129761f4211" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematic.a" Hash="9594c8291b302f525ad9f492bd9119ab0be9218b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematicCHECKED.a" Hash="7aa9390bea6bbb7d2f83ca52b60c1a35abb0b872" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CharacterKinematicPROFILE.a" Hash="61c7eab24fad6be3886053fc7cbfd68b1aeb7a64" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CHECKED.a" Hash="8e6ad604329f698d6da5259d48e8f69c08bdb9cd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Common.a" Hash="0672364a5b3cd6a1d984644d068ca79cdb60dec2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CommonCHECKED.a" Hash="341f9ddeda5a0b5714652a39964111028b9e3902" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CommonPROFILE.a" Hash="cab43ba563005e7dbbc30db067e3af85b35182d1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Cooking.a" Hash="513b8afbb3c835bf138e0006ddf603dda59c4824" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CookingCHECKED.a" Hash="d4085b5450990274b80e212f2eeedbdda5d81cc8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3CookingPROFILE.a" Hash="7a91df0b249ba5cf573518ba299ffe01d3c1f390" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Extensions.a" Hash="20baabdf2a1655081e6e88c9d8711d8a3b005343" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3ExtensionsCHECKED.a" Hash="fbb7c19a589419e497017c5749f91cf14cd93ee6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3ExtensionsPROFILE.a" Hash="4165edce4fa3c576287f9c8f22a0679b5eea61e3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3PROFILE.a" Hash="85e7d4ff35591010255a59965237861d80c3bcb9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3Vehicle.a" Hash="cdfe53e6263693625f79a628efdd222443bc4123" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3VehicleCHECKED.a" Hash="9218d80b6c13aba03391e90ca3c630cb7155355a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPhysX3VehiclePROFILE.a" Hash="174a13150abc28e92e29b1e5a3c54753c3e08abf" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXml.a" Hash="2cbbf6e5bf38a54c03de19c0ea1228521283bcba" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXmlCHECKED.a" Hash="77f244f3f0b75538de58b9d651a5e2f4d002f8b7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPsFastXmlPROFILE.a" Hash="825964cc9eefd2549fbe845c5dbb4e584077417a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundation.a" Hash="40b73e86cd0c449d39ed6dce010f4ba59d51ac4b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundationCHECKED.a" Hash="fd259d2d86730f62ddfa73c33887b6c655d4898f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxFoundationPROFILE.a" Hash="cda2a4906f21410376df43ce7dfc37c5463367ad" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDK.a" Hash="eee3869b9202853631e3b8e3a00826936a14af22" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDKCHECKED.a" Hash="43913081df88ee0d4a10fbedb400f587853b7dc2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxPvdSDKPROFILE.a" Hash="d755f0b969740a152f76ae1ea4fcefe4acefa2a2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTask.a" Hash="19beb0a49e8611dc52309c771e3eddbfa04bc169" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTaskCHECKED.a" Hash="6c217b2f08399750189a9303208bc1c321b4af70" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libPxTaskPROFILE.a" Hash="13509391f29a2b8543782efe4b42cfda6d583152" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQuery.a" Hash="a89183568f97cf98b94dcc70ce8986fc24197b64" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQueryCHECKED.a" Hash="56fb56f5ad5a5b78c9e4f24997513828b6b4f7f5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSceneQueryPROFILE.a" Hash="cb6f080aedddc5c0eeabad1ef1513577aab68254" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationController.a" Hash="5ed40681dc0ccaedaada2c070cc748a783d5faee" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationControllerCHECKED.a" Hash="e183e8ed227969e1b257c433bcb4e191318271b2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/IOS/libSimulationControllerPROFILE.a" Hash="5f9c0a0381ae064c1c6e448bff6c66e71e59b923" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPhysX3.a" Hash="241e6ed126ebca6eb35acd6bfddd59162e81ccba" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPhysX3CharacterKinematic.a" Hash="9719d39d465dd04dde0d4d0e4cf77fe5945bdd3e" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPhysX3CharacterKinematicCHECKED.a" Hash="f87ade875d8dcd824def8260260dd979f5c8e992" />
@@ -34807,324 +34702,324 @@
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPxPvdSDK.a" Hash="1ba89c8b0fa98e63519c6e582b9a63a9483d15b0" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPxPvdSDKCHECKED.a" Hash="b6425bad2fa948159bd162cc42befb3fb29784b6" />
     <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/aarch64-unknown-linux-gnueabi/libPxPvdSDKPROFILE.a" Hash="6138bc3217aff3a152443991d37ba70b096ef3d3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3.a" Hash="5d7a8696fa1ee9229c71c05cd67f3e73f4868e50" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematic.a" Hash="50e00a1a7e7adfdcbf68aa3cfbfae9d6e0412519" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematicCHECKED.a" Hash="fcff1c6395688cce7fbcd2f2eef5c1fd6b587662" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematicPROFILE.a" Hash="5c5395d8b945ea720e4d1764e8f6490ba870e009" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CHECKED.a" Hash="e551548875e91804e05d239cf4d8cddac0078147" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Common.a" Hash="b6ef68d3e8459e17c23a99c2478504273556f042" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CommonCHECKED.a" Hash="1d566253f5711b49f57b00a3344b5334dcaf91ed" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CommonPROFILE.a" Hash="4aad22a4d04c0ef5f67a3486921021178e8b5e7b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Cooking.a" Hash="96542b710d967186b0b8883b801849959c67b73b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CookingCHECKED.a" Hash="3652d3fbdbc31eabbfea308c4f4fc003e1d03b10" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CookingPROFILE.a" Hash="47d5dfc3d92cbd638ca8ea5bc1d4ec84a0c8bbf1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Extensions.a" Hash="c41453810aefc7dfcbcdd89422198e76ef6d903c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3ExtensionsCHECKED.a" Hash="097e2061e187bf78d479686b8d937e9a683fd19f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3ExtensionsPROFILE.a" Hash="ac73ebb1eee96beeca5a35ddb4403b73ed7c8a8d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3PROFILE.a" Hash="285f0661c133efab5bc12d2b7c6c1c5722b85abf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Vehicle.a" Hash="e89436ae6d884cbe4bd7e2c3723fe917944c77f9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3VehicleCHECKED.a" Hash="52d86cd0e73063d017b1c808ea05b3b135805045" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3VehiclePROFILE.a" Hash="8e5e6478741130d78e2695746ea66058825427e4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXml.a" Hash="b95a02732905d9fff1db5b3749319bb3fee3c775" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXmlCHECKED.a" Hash="01469e9324f3acbb1807d82ec212cb189e97e4e6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXmlPROFILE.a" Hash="d4e489765367712d36aa024779b00e9c6732f3fc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundation.a" Hash="c776a677b5fc929d114e686e82150037b4f60116" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundationCHECKED.a" Hash="c1ae6a779805b7625c11a60b4fbd93b654c58b96" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundationPROFILE.a" Hash="149f6b29e1196853c681bb798a3dfb356b14b5e6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDK.a" Hash="ac6bf32b94ce34b7bc1fd8c6fc8bb8bfd399500d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDKCHECKED.a" Hash="fb12670f394591367a1e002fa4080ccb45d7322a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDKPROFILE.a" Hash="9c4225f042a372ad650857a8f4d6914daec0801d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvCloth.a" Hash="878e361abfc2f517f9df266d8d88b122ddbc5928" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvClothCHECKED.a" Hash="8f25e49793a020671c10c9ba9928a4f473442252" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvClothPROFILE.a" Hash="a036c8ea4e190eeed03e7cfbebaa57fcdb7bd5af" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3.a" Hash="fbd2f22cd623bd4f7add2f58990b2c91d6d287d3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematic.a" Hash="1a7b7b037f045d56ed3d4c926ad74acac6c375c0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematicCHECKED.a" Hash="912f524b8ece2d5666af7385cff96ec055b759f0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematicPROFILE.a" Hash="455714f47e21f05e0b5c7132569f3c7dc6d537fc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CHECKED.a" Hash="560a3fb676fd6abdd4dd4a2498d257e88d64fe42" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Common.a" Hash="fad22ffa100939286af5c50ea4f68829795e0632" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CommonCHECKED.a" Hash="aec577ea31fa8798bc2b978ecb23785f98bc574a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CommonPROFILE.a" Hash="7511d60c5a1950089a37ee7c7c98a44684352f12" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Cooking.a" Hash="1cf2ca84597b7ce18d8fb06b282f73304c52b028" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CookingCHECKED.a" Hash="ff643993967f60dac2071c0efeeee9361d165a74" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CookingPROFILE.a" Hash="9069400ce408ced58f915d05621bc54141880e70" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Extensions.a" Hash="0dd8b8dd1e28db83cd161265918d6eba820d3942" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3ExtensionsCHECKED.a" Hash="3ef579906d1101468c37e5857ce98d374cbc7e12" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3ExtensionsPROFILE.a" Hash="4112583bb921fd0ed83edc2a69d6a65412f31ecc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3PROFILE.a" Hash="115772872a2a47126e4ffd34805444ac44b121c4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Vehicle.a" Hash="9f36d5a0b263bc766d65c7dc9567665389f9359e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3VehicleCHECKED.a" Hash="475f72506b5543e2f68324862429b86b0e6b509a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3VehiclePROFILE.a" Hash="88abd39228efee2001b0d98b95145bb853e03f19" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXml.a" Hash="e4437e6abbecd37396083f3133143df501d3a1dc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXmlCHECKED.a" Hash="249d3a0447399ce7440488396276d75d00fc87c5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXmlPROFILE.a" Hash="1a55fd5202ab749687bca4c4971dd907a3d52682" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundation.a" Hash="d9310fd8d4dd7c863f3393da11116bbc3ba33b14" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundationCHECKED.a" Hash="105957ddbd425ffc43708121800e5f0e309ae906" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundationPROFILE.a" Hash="9df16153907bcc8f916a74fffcf0de819f317df7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDK.a" Hash="c4bce0be9ff33b594987d81a279244c22523a699" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDKCHECKED.a" Hash="451e48b0aa2c2aaab2f7739f9833302344243a3e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDKPROFILE.a" Hash="d34ba2d99fd56d4779cf6fa5877580202587e9b8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommon.a" Hash="f8d1b9fb5a5b24e8a7eb85032567f8be57c0d155" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommonCHECKED.a" Hash="0b5686746d46c45c7c0cf250728e2a26e7da24cc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommonPROFILE.a" Hash="941bdc04d31331ac17aac4505118601cab13124c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexShared.a" Hash="d3a7d7eb2331a7c4fd27758fc00a9b16df515934" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexSharedCHECKED.a" Hash="a995923c0c70ab1b37958068b6c469a1eeb388d4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexSharedPROFILE.a" Hash="723bd7a92f2f2cbb16cb8d6efb1960f2abff068a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevel.a" Hash="2aac5e33a06e49cf5c347f066acf3a25a1f5f1da" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABB.a" Hash="1d073fda06162db5d11f6066eae99e2fd8192c1e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABBCHECKED.a" Hash="a1d1405a0a6136ed9dd875ce819dd2a2da778f99" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABBPROFILE.a" Hash="6b3b27080fdd1e438fbba3dfed1574e12f6e9702" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelCHECKED.a" Hash="f6ba632481d0f4b13d8ae638305c53e1c54dba36" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelCloth.a" Hash="6b7433231a289c23044d3a9e8acf0ab50765883b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelClothCHECKED.a" Hash="50b968963a8741ddd0a28af446a696dab0f3be0e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelClothPROFILE.a" Hash="446e72f0d55bb0be32bfa5f5b0861c2a4b2f2230" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamics.a" Hash="fc5f98a2d07d438d729e3beae0fdc2c4fe2f03ac" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamicsCHECKED.a" Hash="cb2f660da0ef720a52f552655a00260fcab0e342" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamicsPROFILE.a" Hash="e47ccb65662be7c8c53af3f2e6481451f5e6f6ba" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticles.a" Hash="58e5fffc0c1e89b6bbeed348786ff4264ad0176b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticlesCHECKED.a" Hash="6fc8e6a2703af34b56a21423d6e6683676d8baf7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticlesPROFILE.a" Hash="f38d1a33b233ba62ce8e8aa463717402b8fa608b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelPROFILE.a" Hash="e0c5debac16b697b0e543452901e16da0117dfed" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterized.a" Hash="de584bed3a134d2cba6797049a5873cc9172d3b3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterizedCHECKED.a" Hash="9e5a8928469517c9b37eedd66b05ebfb577de712" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterizedPROFILE.a" Hash="48a3f849056119c7cc0acfc38020b5aab1011334" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematic.a" Hash="62025b85f843ef495ce5d971df794276fde3e79d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematicCHECKED.a" Hash="890eb2b09c68513c3f916052940ec9cb9ff9c84d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematicPROFILE.a" Hash="46cb1a4fd04d6f2d130d5999cc779a0c370e1699" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3Extensions.a" Hash="2c11e184503f5ce1bf5d23aa9accbc230b4fb64c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3ExtensionsCHECKED.a" Hash="be08293c6254e29dd43edf0fd20cf63e377179f2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3ExtensionsPROFILE.a" Hash="0017781cd84322d5635a2289d023ad8e8280c76c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3Vehicle.a" Hash="3557e329a82a0994751f3c6d1f898ee9ef1fc2a1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3VehicleCHECKED.a" Hash="df6a4ea61b1b95c4b976114371e5d3e127a5a64e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3VehiclePROFILE.a" Hash="25d1a9eef82ebb86dbca55df8165791eb6ee48ad" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXml.a" Hash="a6fa99a919dff1ffb8e4d035081fa7e0bfdd01b2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXmlCHECKED.a" Hash="2afd5470e8aec9db3eb413f5b9cac65fd6d58ff9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXmlPROFILE.a" Hash="844fb62a317e1a3d6fc828412ea5357d96e7a77f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTask.a" Hash="e15177822bf808d3e13e1eec72cdcb661181fadb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTaskCHECKED.a" Hash="90cfe2bf4630c5e428200e619dd32665f5cb0595" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTaskPROFILE.a" Hash="1fd1919ff15d77a1dc51e1b5b2aa376d3adbc4d5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebug.a" Hash="f7ae65b0b74b4b892079f335bdea92ebd2dcdcbf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebugCHECKED.a" Hash="35f9aa5032eba8f9480c45191b2a68a61308c626" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebugPROFILE.a" Hash="64659ecf8fbb7a2bf73aa1cbe619d3a1a5ffa65a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQuery.a" Hash="d74756b7f442abbccb38107795c040d8b66d2baf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQueryCHECKED.a" Hash="cdc05b707256501236a6e6bb1c9d49d9a4360659" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQueryPROFILE.a" Hash="61a5f98c224040c603620da8877ebacd4330cd6c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationController.a" Hash="b80775a63dc8c3df4223a04c4c5672ee9bc39191" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationControllerCHECKED.a" Hash="b70539ce7844e2dc495a27efe7ad1a99d69f1cb1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationControllerPROFILE.a" Hash="9ebdbc9eaea202ec79b140d37f274451d7630a73" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevel.a" Hash="73344b2b10fd475adf3d4e33d64be57f32d8c37b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABB.a" Hash="4bb81ed995bd9cc5f32cac6948d8760cb574c379" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABBCHECKED.a" Hash="58c74522d4ffc69ca4f37851e062aebcdb134215" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABBPROFILE.a" Hash="6624d11277aca67e1ede522cc1a4731aa609aded" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelCHECKED.a" Hash="d57898553225b76f1d282c6b8205b45bf72e0009" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelCloth.a" Hash="efbf16435da5ddbf54129617dee82196cba86272" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelClothCHECKED.a" Hash="c996d1d583adc6b3993baf53524080ad6a23bef3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelClothPROFILE.a" Hash="4a80f7c0f13d5c3886b1ed7073b5949e589ee852" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamics.a" Hash="ee445e65b9ec00068beda04d0fd9e5efc7ec217d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamicsCHECKED.a" Hash="bb233c9c51d26bfeec5c89aec9ab46e171677a6e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamicsPROFILE.a" Hash="861690fe09779ce728e83395a57e35076d802873" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticles.a" Hash="19f680eee8f068068cb24220b8ccd00d43cd2794" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticlesCHECKED.a" Hash="c80b72b8b7b2130593d261836ccb7abfe4bb462a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticlesPROFILE.a" Hash="6e8d182a89092bc183b718f87f705f20e28125f6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelPROFILE.a" Hash="7e94d9274e57aaf6de040e358fcdc5dcfc64ed3a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3.a" Hash="53e119fabfbf460b90a91eb7e219c048bf9d8178" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematic.a" Hash="24425968cddaf40fc7ad4970d79ce71b90dedbe2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematicCHECKED.a" Hash="47ddd1dfee38a38db607c25a497807fcd33ce14e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematicPROFILE.a" Hash="99a0153ed6a961567c3647b803d5515062d56cc3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CHECKED.a" Hash="365659a8a12d9dbc6f27ada0bd296d5fcdd20365" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Common.a" Hash="8a4775e95d45540bac5a1d87a799b726c1806c96" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CommonCHECKED.a" Hash="5935cf6c81b8af557e9b1141a72326ac775328c6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CommonPROFILE.a" Hash="6868133848d66a326ceed64304df6d6dacff9cdd" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Cooking.a" Hash="0f13da8908cbfa6b293f346c19e7736585c4d5b5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CookingCHECKED.a" Hash="13eb4794877129e78336ecb5d7bb88334e01acf0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CookingPROFILE.a" Hash="2fc0035ed93b02afede9307b3ddeee7268bd7818" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Extensions.a" Hash="f1473c330d21943db4fb7650a2883c65da0a2603" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3ExtensionsCHECKED.a" Hash="7651cffbca065a4d93e7de0fcc20aac2cb696863" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3ExtensionsPROFILE.a" Hash="28cbd85d9d64f380ada740a8b6f1de7384ede752" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3PROFILE.a" Hash="71f2745342463f41b4374ec67c1c2873e370b6ba" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Vehicle.a" Hash="c3a2f0ba06181993d8ae15d9d3b3333d02c05bb8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3VehicleCHECKED.a" Hash="8c6eb2b6598f773638e24fee8a0dbb78ce5cd09e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3VehiclePROFILE.a" Hash="7a521c9e2917b6e7014f134ef9d7a208aea11760" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXml.a" Hash="5dc4ec299ce558d7e1a2c2dff90af20302fc11f8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXmlCHECKED.a" Hash="d692f2399987159e0a2eaddbe114e59948fbb445" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXmlPROFILE.a" Hash="4d8ca9c2a909ed8b1b98a6159cd7a293c17c9ec4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundation.a" Hash="2df339c801776e305bacad20893d774c2002202b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundationCHECKED.a" Hash="fad0bb0cbde3fdf3a3bca6f135acf00ad6e38bc4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundationPROFILE.a" Hash="628d580228fcde001d308520802fbf581a12d6f5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDK.a" Hash="ed573df73b8c0efe1032c4c1922e25517706f7d8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDKCHECKED.a" Hash="bb26f4778404f822166b6c8c39d53755d2f2a0df" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDKPROFILE.a" Hash="65c4f3ecde888aaa603a08430068aa0323c12f4c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTask.a" Hash="2c666b7bfebf12d0a767763de430e8520f59f898" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTaskCHECKED.a" Hash="c812413dba8bd29b4e9d6b44366efc2a8f286aaf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTaskPROFILE.a" Hash="98d3c21b0a7590e0a03af2c3a5e64b137f495e3c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQuery.a" Hash="1f1c7dd0329e26a32f9e92497b6af342b2bfcec9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQueryCHECKED.a" Hash="2d146d1aa350b1000ed831868853bdd68066324a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQueryPROFILE.a" Hash="726cb08d5be05674c6ce1ba74307274aa6689905" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationController.a" Hash="901bc7fb67e608e98ac31653c318bd037c31551e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationControllerCHECKED.a" Hash="9827ceea53a0a32bbbd89992380130363d48f71d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationControllerPROFILE.a" Hash="2d54a22bce1451b30c96acedcc7f9e6103fd8723" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Clothing_x86.lib" Hash="8ee1f850f992ca99039b0db91fb854f954198809" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_ClothingCHECKED_x86.lib" Hash="84f3122f3de9436df4129d1d3485a4f1c0110c49" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_ClothingPROFILE_x86.lib" Hash="dd0558d1ab9de5a4456d44ec8cbf65050b2f41f8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Destructible_x86.lib" Hash="2cec0cca7dccc565f2079f1cd9991cc48522d16c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_DestructibleCHECKED_x86.lib" Hash="631e9d792f0f2c006555d9a8c0ff369fea9b38fe" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_DestructiblePROFILE_x86.lib" Hash="5450732aa346c20b4445399f3ddd8cfb7a95b8e1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Legacy_x86.lib" Hash="b64fc59d11c4b3cb176c7ed5a0c8947d31e9c404" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LegacyCHECKED_x86.lib" Hash="0ddc92fa7809661abc85612efc21b1f2c2db1038" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LegacyPROFILE_x86.lib" Hash="d5fa087198894320f807fb5911d386478bad1fd9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Loader_x86.lib" Hash="56f0f8d315186893625f6001263e8d1ea54953c3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LoaderCHECKED_x86.lib" Hash="96c8da0fc00ad304dd6e53bd4db8adb5f00a33cb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LoaderPROFILE_x86.lib" Hash="8c6f5c6fc2ce0f60a10d4b3037e0dec54322035b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommon_x86.lib" Hash="c997d68c685a34e52a28e36e4814637f9afb30a2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommonCHECKED_x86.lib" Hash="a439042fbd54a97edf9bb2e5862ef780240cff85" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommonPROFILE_x86.lib" Hash="20a57c2cdd4da164a531425b8d78c6cf7f34ffa5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFramework_x86.lib" Hash="04ec368cb5bba867d24dac9d52f82d0d68cbc24c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFrameworkCHECKED_x86.lib" Hash="ccbf8b67205dba85cfe2a5dc765815a681f74982" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFrameworkPROFILE_x86.lib" Hash="01f7944ae3a3f67fa94efd9dcda30f6df5b99065" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexShared_x86.lib" Hash="572484b4373d1e525acc00c2d0b3e27012f163bc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexSharedCHECKED_x86.lib" Hash="7973feba8a1e20f21bfc93c8d8909a66842a799a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexSharedPROFILE_x86.lib" Hash="bd4018426fc9ffbec3a971436a97d5b7a6a33082" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevel_x86.lib" Hash="78a0622043dc7bfc8bf1a7c8aaa791a72ac4264d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABB_x86.lib" Hash="a7221bf9284e3182f8da224a11c2cf70687eb217" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABBCHECKED_x86.lib" Hash="483a019007a64a65ec80517a890f3c3e30161f13" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABBPROFILE_x86.lib" Hash="a458727a54b076e4e11da2e5dbbf104f017d7da3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelCHECKED_x86.lib" Hash="e7a824366b740a23b92e8aefff67c45576be96f6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelCloth_x86.lib" Hash="b4588fbcb519c81314d0bc03fb86504a7c58097a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelClothCHECKED_x86.lib" Hash="048e1add1240e1b233f6c3a558db6c4b008d664a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelClothPROFILE_x86.lib" Hash="f2a2b3bff6877a7b7e03af3e9bf929d04878944c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamics_x86.lib" Hash="49f9cd5517920e02fb675779ec6f9fd368b409f1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamicsCHECKED_x86.lib" Hash="c8c58ae04d38bf58622b156c64243ec865ee0aa1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamicsPROFILE_x86.lib" Hash="65b7839cc0d87bdfba59ebff21081d870ef67773" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticles_x86.lib" Hash="6a3ca627deaae874014d07cb03c4c95eb528605e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticlesCHECKED_x86.lib" Hash="674746b0bea112cf707dd15bab4af56061c68de0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticlesPROFILE_x86.lib" Hash="57307a2e84a5cf49a6f7a227babd89376fc001f1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelPROFILE_x86.lib" Hash="a68b87d40df7bbc2e1795d2bae6f712da104f75b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvCloth_x86.lib" Hash="7c77450faad7779f0717a13c543e1143e229801e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvClothCHECKED_x86.lib" Hash="b7cf115fefe6f991047d7b9c2b4efa40b2699eaa" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvClothPROFILE_x86.lib" Hash="7156585f0d83052dc93ac823e892b669b34af21b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterized_x86.lib" Hash="2bc16a8fbad8b9b1fecb87abbbbc6fe04b7efc40" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterizedCHECKED_x86.lib" Hash="5401d41c0da48ec3d8597ed91c500ac3a30c00e7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterizedPROFILE_x86.lib" Hash="f40608155e6f6e2291655585c4c2525423507bb1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3_x86.lib" Hash="e543368b5991b1591e5d1762e51252cae347512c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematic_x86.lib" Hash="c920d0db70eb7b8680dec895fb5dfc6ca964c6bc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematicCHECKED_x86.lib" Hash="1b71545bfc0a45ecffc514a93c3eb902d8be99e3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematicPROFILE_x86.lib" Hash="0f634f089b5a78994ef04db05db91051100f08bb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CHECKED_x86.lib" Hash="53b3d4bcfdb19b416558c0e70664c00eeb2e6ef1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Common_x86.lib" Hash="adb5c2b20f0c1b507dee0ced241ca7d21e4391a7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CommonCHECKED_x86.lib" Hash="c8be7bd1aec1d77dc4994175217a32e91cae80cb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CommonPROFILE_x86.lib" Hash="8311634a175de8a2456f0acb30e73dec4e12cfdf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Cooking_x86.lib" Hash="45ab7ae8050089783c7c0875b661d4fd31f649ea" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CookingCHECKED_x86.lib" Hash="7b4643511fed1b92a54751787b7303967ef31ed0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CookingPROFILE_x86.lib" Hash="060699a2fa6f8670bfcc301a496d5cd05b069473" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Extensions_x86.lib" Hash="280ae4d1e78e0e877c877490d27d966920e7357f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3ExtensionsCHECKED_x86.lib" Hash="b3ccb1e50b20f11430f9807bb6878d77499635d4" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3ExtensionsPROFILE_x86.lib" Hash="0cbf481aa2f6fc8549e87a3bf5cd1541a85c687d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3PROFILE_x86.lib" Hash="044f429569380bf0a373412a9267bf059b5f9c6d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Vehicle_x86.lib" Hash="17d010dde0c45bee9e5de174f7959bb0e0032598" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3VehicleCHECKED_x86.lib" Hash="7b8bafc31763db78f0d17bae1f08eabbb8b1d356" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3VehiclePROFILE_x86.lib" Hash="8f07a7246d1cb3a81047021dcede849f5d5a75ef" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXml_x86.lib" Hash="08e8cc9ce8e5a793e64116f6c72d964529dea6cb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXmlCHECKED_x86.lib" Hash="fa8e7464c05905faf2f7de77b6db9cd23c283495" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXmlPROFILE_x86.lib" Hash="b61aacfbff8ed17a56e587879721b728a516ff6a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundation_x86.lib" Hash="9c323b211658ec5bdd47166c92bb4e9c3baa4936" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundationCHECKED_x86.lib" Hash="c17a342345465ecd6933ebb8d1c61da53faf13d6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundationPROFILE_x86.lib" Hash="78924b7eeca566460c59dc9ffe7817dfe108de92" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDK_x86.lib" Hash="b2becee77da8c16e1005a91bdfd13b0a91ffff77" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDKCHECKED_x86.lib" Hash="ba0c1a0e488e46c33a85a6a8ae254a84f674b892" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDKPROFILE_x86.lib" Hash="1069db466547c5dbb55b63fcd683482698d2b594" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTask_x86.lib" Hash="73bb96b2641649766ae00ad56f782581a8a2df58" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTaskCHECKED_x86.lib" Hash="c60b7ee4ab4ff04eef655c69d3d587fda73b83fe" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTaskPROFILE_x86.lib" Hash="2af09cf793840c6a1c0b3a8cf5e192fc01c35e1b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebug_x86.lib" Hash="108731119b5d67a3feef9ed27e84d49dbfbf3807" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebugCHECKED_x86.lib" Hash="22e9b6fa28495d7f350844e4bfb3bca6f05e083a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebugPROFILE_x86.lib" Hash="e3ce3c50793d8b6f46d0e752b0b3763f9d0e6093" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQuery_x86.lib" Hash="47a91d57e1478c782c0728dcd9cfac110e8d2faf" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQueryCHECKED_x86.lib" Hash="5d4b3cac591e30f07a46aca41bb2f7ad2814002e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQueryPROFILE_x86.lib" Hash="6ff241a7239cf2d124fc999b7b1e981dd44d6778" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationController_x86.lib" Hash="e7f20d840370cb20a4c23d566a2970eccc833673" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationControllerCHECKED_x86.lib" Hash="33a2744a7047212a051359be4a670a2047b6fc41" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationControllerPROFILE_x86.lib" Hash="2264067c49f1306e53b3509fef4d6b506efceca8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Clothing_x64.lib" Hash="ab67969c9dca97b087f9430218af13786e451675" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_ClothingCHECKED_x64.lib" Hash="d8705072668d5576198ec6ae931025238298df10" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_ClothingPROFILE_x64.lib" Hash="1f9cd7f2518c3e1ca3da1a9cf11bf46f7c2cc67c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Destructible_x64.lib" Hash="9b1ae50efafbb4a62231d4bb8b471c88c84262bd" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_DestructibleCHECKED_x64.lib" Hash="9b0c7cf7e692f0b441fe32733025dee893257ce8" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_DestructiblePROFILE_x64.lib" Hash="ca40fdbb3702597970ddfb0eb5cf604757eb421c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Legacy_x64.lib" Hash="6704b0fee79fa4795dc04e0111fac4fc46f611f0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LegacyCHECKED_x64.lib" Hash="5843def316e6fffef3dd2a75891d2fa36a8ef012" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LegacyPROFILE_x64.lib" Hash="e300f74822107a808e8480bff515594965150750" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Loader_x64.lib" Hash="8eb4617fc91f9c2543d0d7aa46463aa9a5ab5ceb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LoaderCHECKED_x64.lib" Hash="56f53a4cdabfc5119a8ec297dd56091de012acff" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LoaderPROFILE_x64.lib" Hash="4223ecda63c63ba3f0de16e1622d1a43d8d31ef9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommon_x64.lib" Hash="7890a4486c1360c6e40ace45fdae73db7d0b4ea3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommonCHECKED_x64.lib" Hash="a2570cc9dc6a0b79dd3a04b6621f79437d37bf3f" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommonPROFILE_x64.lib" Hash="0146d3629c92dcfed9b544aec9fa359ec46a615c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFramework_x64.lib" Hash="c8339291db65e241f1f424ec1f76d70a57eb7a87" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFrameworkCHECKED_x64.lib" Hash="4563a8dce39ee8eeed3d3f053cddb9dd398f8123" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFrameworkPROFILE_x64.lib" Hash="de5b05a44f9d574df45b8225beb43a93f31ccbbe" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexShared_x64.lib" Hash="ee30398056d6a6a0b78423be269060c9801c131b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexSharedCHECKED_x64.lib" Hash="4f919a53badf56a7821545c9a0e42c70705b38e9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexSharedPROFILE_x64.lib" Hash="ea97cefcd875633ce85d4094d9ccb95bfa60eb65" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevel_x64.lib" Hash="acec8914deea187423a04e735eab5d4801814636" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABB_x64.lib" Hash="f541b76e31b1e131101f404333885cb3126b2816" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABBCHECKED_x64.lib" Hash="a8024ecdde5b7f04151a01714ac5adfad5d6f760" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABBPROFILE_x64.lib" Hash="e874c99470e7138277177741804432c162d90e0d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelCHECKED_x64.lib" Hash="f69a58e383c49c3ba90ecc0a15cad2d419710028" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelCloth_x64.lib" Hash="a2ead2c79d6487cec7affe7769f6ca3137912230" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelClothCHECKED_x64.lib" Hash="04abbddc21bc33b5debc65b7b4489cd9a8ebf36c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelClothPROFILE_x64.lib" Hash="a962e330bb69a362734632bde23e6b1e21932fb5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamics_x64.lib" Hash="af7e7e755e6a50fde533abf50b97f0537bf9e7a0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamicsCHECKED_x64.lib" Hash="13c004763fbda1e2ea66e03bcca5b40d718cb6d0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamicsPROFILE_x64.lib" Hash="5891e3049072207efbc6956900a794936488b176" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticles_x64.lib" Hash="4dd5fceccb7ab358b0450527554d1fc0934ea66a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticlesCHECKED_x64.lib" Hash="fb7bacb232a14f64cf00a4857bb028d94adfd4fb" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticlesPROFILE_x64.lib" Hash="64e5c83f6c6eaa367cea599508e8cfc84d9d53d5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelPROFILE_x64.lib" Hash="475d07a4912fd77ac68a1eebbf856bd398f72287" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvCloth_x64.lib" Hash="f58772c14918861a9c36bd54b271db0463040147" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvClothCHECKED_x64.lib" Hash="7a410ef7c67731badf0678f244404ba7eee912cc" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvClothPROFILE_x64.lib" Hash="6785acfbe0ce5a0101388f8af41fd24e17262a75" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterized_x64.lib" Hash="a54fd412731b9e7eb710b18d12f87c12617968c6" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterizedCHECKED_x64.lib" Hash="e391fee08e8b07d8d84dd4913279aa5674069e76" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterizedPROFILE_x64.lib" Hash="45022461e2b0446550def0cb237d347b83165a08" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3_x64.lib" Hash="0b9fea303bf96c1988066bc13dfb7a620f9521ca" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematic_x64.lib" Hash="127574a5e478faada11b6828cfc38a7472a1b648" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematicCHECKED_x64.lib" Hash="a4c9f7af55a6869397eec65dc1588d873164643b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematicPROFILE_x64.lib" Hash="109c7362927673d425dbfc15c013891d184f9e03" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CHECKED_x64.lib" Hash="8eb9800ec4735ffa5ff5130ccd9c2b4305d8635c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Common_x64.lib" Hash="cccd7f6990e035793948beb42bfa58fe45423a01" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CommonCHECKED_x64.lib" Hash="341af608ec8be742836b8d7e4748bef7659b6e8d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CommonPROFILE_x64.lib" Hash="6e1d611eb001b6410e2e2efcee43d9ad687ac8f2" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Cooking_x64.lib" Hash="39aef5baa0ba866299fa54d7b3435e95fc87e96c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CookingCHECKED_x64.lib" Hash="8f21109217beada9d168988ccbf857f2d6bf2f53" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CookingPROFILE_x64.lib" Hash="5a220e00fd0360ee0e141f455c7723465916c84a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Extensions_x64.lib" Hash="76114e28d00e831a84552f42b5099e7041de864e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3ExtensionsCHECKED_x64.lib" Hash="64b916219ec64de69911c7c085b6528d4b04774c" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3ExtensionsPROFILE_x64.lib" Hash="76754529eca97cab5068b348849b1f6c7818bcda" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3PROFILE_x64.lib" Hash="77078b4ea125d8002255e58e12f99c8bead084d1" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Vehicle_x64.lib" Hash="4dffca64c08a51d73bb13c11e2738da0c43e3559" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3VehicleCHECKED_x64.lib" Hash="dd6622cd06fe40cc2f4a2f12cb76d8d0ae1d4b8d" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3VehiclePROFILE_x64.lib" Hash="3e480f1175ba6f167b5087765fc40e0ebdb76171" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXml_x64.lib" Hash="6a9147cca096169b28773dd079b530471c7f03e9" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXmlCHECKED_x64.lib" Hash="bde0d9a872aa31c82b2b42659117157538d14f29" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXmlPROFILE_x64.lib" Hash="8e532b9e76a6ad0df6171893c9fa570e8ad9b8c0" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundation_x64.lib" Hash="744fa3a27240f5e62153fb6807f62bfcd2e53e1b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundationCHECKED_x64.lib" Hash="3d8c573bbbc46c3fe5210d8168a313e8de30e700" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundationPROFILE_x64.lib" Hash="d61930bf0d017f48bbd73df85ae6352c79607e32" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDK_x64.lib" Hash="63af9e548a4f9e0df236131bf6ec70f4fb59bb74" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDKCHECKED_x64.lib" Hash="d172867450f4fab4583f9b60d57e9514a0a3dd1a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDKPROFILE_x64.lib" Hash="6523cf46d2c9c5774dc5fe3249e28ee1ab906916" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTask_x64.lib" Hash="6e0929b6d335cb6757daad2365718bf84a79470e" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTaskCHECKED_x64.lib" Hash="66756c000691762c338a347919ff8b03c85b17b3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTaskPROFILE_x64.lib" Hash="2705a1c9a2ccaddbdc54ebb278e605b62af405e7" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebug_x64.lib" Hash="d9a1a6a7616a5ed37a66110cb53ae8096736d5f3" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebugCHECKED_x64.lib" Hash="053829ea18c3433228a11bb69566ecd87a5db415" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebugPROFILE_x64.lib" Hash="37408222a58373c53a1eda9c7e6f88bf86830487" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQuery_x64.lib" Hash="5330a63cacb5fae39d693226d285eb47a47431fa" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQueryCHECKED_x64.lib" Hash="a3821eda2123a0930699fe2dcc2e87d31d5ba2b5" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQueryPROFILE_x64.lib" Hash="4488f3cc0679315ef65d7fbd5496b539d263700a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationController_x64.lib" Hash="76746d71c4062c099162d103c6fd24dfdf59ed2b" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationControllerCHECKED_x64.lib" Hash="e6f852f94348866814b6d322ed68da52cb23ed4a" />
-    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationControllerPROFILE_x64.lib" Hash="36d01e3ccd0926a7fee2c20cb376400f70386729" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3.a" Hash="a015fa32127b420e839e9c719a7a80890ec27344" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematic.a" Hash="64ce7ac69da694f83f30da3ada9151a0e0a49ecb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematicCHECKED.a" Hash="abe4a64e9865c97200eef327809a7fafd4dbfa43" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CharacterKinematicPROFILE.a" Hash="68f5756c8b4a9a0fd26df0c760d36f5c13e67158" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CHECKED.a" Hash="7eb91e8f764bac0a63d3fab53a4b02fb3e9d45d1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Common.a" Hash="ed3d055a45aaeb4012a7ac5c9565a1595b6bae67" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CommonCHECKED.a" Hash="818da93d0c6c5df090c79958bc0fc61794593c5c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CommonPROFILE.a" Hash="a4b47fa870d270266f5666df51bf5f8aef676ebc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Cooking.a" Hash="f38a96d82edcc76b8366d563d0cb75788471f6c7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CookingCHECKED.a" Hash="2a9c047f10ed74639a88ce0aec42fa31f5627461" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3CookingPROFILE.a" Hash="475e8eb14abe7bdf4cde048b8d28abe36af22b80" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Extensions.a" Hash="4ea9af47997c61d6d7a71aa13f3ba6b85961e7b6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3ExtensionsCHECKED.a" Hash="ba760fd8c9dc922519ad5243ae13c1d1ac3b76fc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3ExtensionsPROFILE.a" Hash="c1f69f6fdadbc60533bde7418019d9267676fb08" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3PROFILE.a" Hash="41989ce3b745867c55b2d7368fc38940d238e7d4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3Vehicle.a" Hash="605036b45be86aee661d31507f4e1382980fa7bd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3VehicleCHECKED.a" Hash="2224ff3b4658124ee575013e58eb6c22539893e1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPhysX3VehiclePROFILE.a" Hash="684de9963f3f44352d8f325eb38095785d87dc24" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXml.a" Hash="3006b4579afc2a90432dee5ba5970a87018fc71c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXmlCHECKED.a" Hash="5faf9dab5c6cde2d39be22f381ca538aacc45254" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPsFastXmlPROFILE.a" Hash="285d13006c6b2e05f964ee940a5f634c7170053b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundation.a" Hash="56c2d3cb8549375483dd17ae61040d889bdc8e97" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundationCHECKED.a" Hash="ded88299886b85bb55806f9faa1e5df81ba28efb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxFoundationPROFILE.a" Hash="93301f8891f89bf7a842ab2f59567f3df87f4d1e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDK.a" Hash="9bab7d196727c05f53ceebeafd7a0722c555afe9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDKCHECKED.a" Hash="8943d53b8938d6dfdd3ea75e47a3518acb943a63" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/arm-unknown-linux-gnueabihf/libPxPvdSDKPROFILE.a" Hash="9f7d5dbf6db7db8064e99f1a91348ad8d1dbffa0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvCloth.a" Hash="6288d07bddea86c4c34f01e7de409b01158ce68c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvClothCHECKED.a" Hash="e13603c07c9bd8fe4895a823cb7a5f607f557011" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libNvClothPROFILE.a" Hash="4a9c88bcd24355eb37d3578e49e96a6533513886" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3.a" Hash="a16bb92d0bf7a95f4d90afae30ac6e83607364c6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematic.a" Hash="6c28c05360a22d0c34958d1d047a18182bf93123" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematicCHECKED.a" Hash="5e7da5fc56bc977842ad07b06899f4360a4aa2f4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CharacterKinematicPROFILE.a" Hash="5cc53421b303adc692aa327fb8bf86a8ae6d515c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CHECKED.a" Hash="45700f11169555164977a58b8138b4b602900bca" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Common.a" Hash="984eb310e10eb319041c2bbb1f80c6339ea8048a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CommonCHECKED.a" Hash="00b28aa3e11ffa9a76926aa20161c75e36339c65" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CommonPROFILE.a" Hash="c04c9559015b73a62dda6e465b30a08e4c056da1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Cooking.a" Hash="0139f2e8ee19a91a4d5418dcdfc3055235bc2700" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CookingCHECKED.a" Hash="fd9948cad6e217b14785efceeae4422ab21e7238" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3CookingPROFILE.a" Hash="63b0f99c12b36386ea6992089b1160132ea87636" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Extensions.a" Hash="1731a27c3f3ef1abe0cc0120169e2eb1e21f9154" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3ExtensionsCHECKED.a" Hash="ab0f9a2af25bfb6a53168b8a76bde6b0b14577aa" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3ExtensionsPROFILE.a" Hash="0f3559cf760f1cc9aab074cb889786b5999d5f23" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3PROFILE.a" Hash="49c0654f571b7bb744067d1c06c9db6ca414250e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3Vehicle.a" Hash="9ab4b27082a9bbc7ca669c61c214f742cc8ca328" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3VehicleCHECKED.a" Hash="86722eb6b722c3bba377509177704ab6537d8ebc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPhysX3VehiclePROFILE.a" Hash="5b52c608ad802e1f45d5e5ac85d9a04643a0b3d1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXml.a" Hash="c85247fba8818c11d0f03db53b7623197f1201ba" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXmlCHECKED.a" Hash="7d174a922957d201f74e622edfc403ea06d523a8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPsFastXmlPROFILE.a" Hash="b9f8d75803766ce3ef8f36e5ece9aa5158b39cd3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundation.a" Hash="8de0a75e54e5ebe3d137020b831f3b69295a5d41" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundationCHECKED.a" Hash="ae7c98d648b740d1adcd38359516e89f1dd42b46" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxFoundationPROFILE.a" Hash="8ad5e2dee552b589e28c9d7a6904e0d59d3327a0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDK.a" Hash="f3915fb27e346100ecbc7ede22d9f8dd51b9cc5d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDKCHECKED.a" Hash="61ed40606ea5682a86f0a665d04ad5793d26a849" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Linux/x86_64-unknown-linux-gnu/libPxPvdSDKPROFILE.a" Hash="21f81ba337d0e38e979508ad11492e14e42df260" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommon.a" Hash="679cbb38e8dccdae85576e76ee82e0c0e9c13a48" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommonCHECKED.a" Hash="e82220f31636dcc239c03b600d361884fb4f8237" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexCommonPROFILE.a" Hash="979f745e9ed9d96fc3f033a491cce660000875b6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexShared.a" Hash="03048e4646511d8b1d326c88caf0f46f13bacdaa" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexSharedCHECKED.a" Hash="0be235a1f85287024d44d229bc300865171d5e67" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libApexSharedPROFILE.a" Hash="b4d98cd1e01baf3fd8b85f28a4aff2ad2ae0a363" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevel.a" Hash="31b96be5a9bd69d654c6e0a2a7091766111e4c29" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABB.a" Hash="2437201104a3ab3dd0425facef7a07d6a81ad947" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABBCHECKED.a" Hash="cf94952f3ef44d8ecf331e8ef6710d4635ce0253" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelAABBPROFILE.a" Hash="088384cf906d6ce0a9f55a5348f3cf802b0b1dcd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelCHECKED.a" Hash="0c6b9e23d7cfe8307565e42499849c9a1ce9c85a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelCloth.a" Hash="11490bca713cdcffbd79fa39a071984b6be1e0d8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelClothCHECKED.a" Hash="304c037aaf7f1eaf92dab415c69fce0a85dfd5b0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelClothPROFILE.a" Hash="f3fd60f57fe782850703b642dd4f789fe516a857" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamics.a" Hash="3546da27acf0cc49d0d6d2947a22aa7a7968c0ae" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamicsCHECKED.a" Hash="026377594dc1906bea07f03d248db4a940e403b7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelDynamicsPROFILE.a" Hash="e382955c23ab03ede7e6681c39e3ef836cfb38d4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticles.a" Hash="8a04f6ef9d3f265168da658f91ecef673c5b21dd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticlesCHECKED.a" Hash="f7d38dd68f8ed4897893ddd948b804c50ea891d9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelParticlesPROFILE.a" Hash="a1602b6b17d9cd2afccc2111757da16d1eecb1a2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libLowLevelPROFILE.a" Hash="4defb059213e2e750e419ca3613cf0033d7a2e8d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterized.a" Hash="84ac22242f907726a1de2ce20c739ff3f9c70477" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterizedCHECKED.a" Hash="99693f30327f6e1ada099b300fdf927cf9a2b236" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libNvParameterizedPROFILE.a" Hash="d9e8fbfa081de563db8019567ecc754f91c83e60" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematic.a" Hash="38647438ab1b42119f2667854d30d74095652798" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematicCHECKED.a" Hash="5576f000ea566a499316c59bd935b831dc3236e7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3CharacterKinematicPROFILE.a" Hash="bf5d8e1d04a487def48b75fcaf3fe050a34231cb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3Extensions.a" Hash="c5baef29641d7a8036b3a048ac59bef01d3f1934" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3ExtensionsCHECKED.a" Hash="87a6f334893c12abc8ba7e6312417e8b87ab0a39" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3ExtensionsPROFILE.a" Hash="46ed542d9a0eb6a059095bfd2197c19d53bcf942" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3Vehicle.a" Hash="944ca96c2c84f1fedaa5cf712b1b5a32dfbe857c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3VehicleCHECKED.a" Hash="62237976ef5cab03e5bd59552a63cf7ef996146d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPhysX3VehiclePROFILE.a" Hash="240fdcdc81b7e781349ce4fe8ca8c7302471d6f6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXml.a" Hash="9c601438e901fa3e4cb9b0d1ded2524da37ad1d7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXmlCHECKED.a" Hash="7ba78a043d1791b7e3320936e355b8d179737d2b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPsFastXmlPROFILE.a" Hash="ef8541beae3ee70e8f3cf3b07384d6d96725fe86" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTask.a" Hash="65e09a37069c4e436219f63461cf98282503c446" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTaskCHECKED.a" Hash="da70bafb31d437ea5f5e90376f052073c2fc296a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libPxTaskPROFILE.a" Hash="98dac36f7cafa45e50313156048ba53ef54895c7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebug.a" Hash="125c4c58c7e16b76fb5e87e55efedf5150426b72" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebugCHECKED.a" Hash="657a5271b616cba038a2b450238f6ab7b0ade443" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libRenderDebugPROFILE.a" Hash="0912f449d2a6f21d034c7ca4680fdd3e4172df33" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQuery.a" Hash="4fb3f38f4e4aaa671ddbee0c95fad7fafb19a7ec" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQueryCHECKED.a" Hash="a13400386413a324fd00aa6b7dc8cbda04fe364c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSceneQueryPROFILE.a" Hash="632e6cff28ba44d6436ac3a0523b93d179452960" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationController.a" Hash="3749a4e1ee47245ae5f1b47492fc6079b85228da" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationControllerCHECKED.a" Hash="edfa618162dd967ea5dfc852d2ee6e5e0142189b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Mac/libSimulationControllerPROFILE.a" Hash="8a156222134ce0371f9247536260bf1bb88372e9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevel.a" Hash="bdb3007639d5eb9e58956aa3a0176c57aaf5038f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABB.a" Hash="3a2448d90ba491ea5cf55141e0bd1925c1a595c3" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABBCHECKED.a" Hash="329c17f10834173dad1e4a444642d270e16a1413" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelAABBPROFILE.a" Hash="3962c64f4873c7744c1ff2d18adf3e150a906e9c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelCHECKED.a" Hash="bc87f29dde5e24625550a1f76fc28d39f578c3da" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelCloth.a" Hash="661097b5cb5e6e9c0e4fad4574971f41d0c57b24" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelClothCHECKED.a" Hash="a1351b80ad4f9bf7d4e201af46c261387e1059f4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelClothPROFILE.a" Hash="085532cf421d441547e95939961c4cc90483613f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamics.a" Hash="d4a77f7ec68db9c3c6cad56f0b7feb59b21702d5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamicsCHECKED.a" Hash="d0402e2b702fb4d132e73e7604e68307452570af" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelDynamicsPROFILE.a" Hash="58d77f4b5a8b566e2fec947570421671dc5d7a6e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticles.a" Hash="e9df1cb4ed317395439c3ab273d322ee47095d91" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticlesCHECKED.a" Hash="c479ec708c53b3f9be5a633c7e4600c713785e1f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelParticlesPROFILE.a" Hash="6c867436d795f6cb129e14e9776acd55b5d57f52" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libLowLevelPROFILE.a" Hash="8ec0a5ff34ed24805338d38ec4e4df640c0dd52a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3.a" Hash="175bb8a1b4efb3be2f1367b26d261e1acaea87a2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematic.a" Hash="da7ddc9f478b789b47b4965a6f3d9a4b427f9c75" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematicCHECKED.a" Hash="9e17061a909e7fa6dcf8b426a6a9576ed450d78d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CharacterKinematicPROFILE.a" Hash="f6da0c537b66378881e821ecb1d6f23b3c2d75a7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CHECKED.a" Hash="30f6f3a83fee4576963b9f15548520d26e770116" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Common.a" Hash="a93824cbf8fb83971fa92bd6597aeb3a14b03508" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CommonCHECKED.a" Hash="04bf63c398aad9fa56958a36c724f65039239c33" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CommonPROFILE.a" Hash="99d0f55d302950c633eaf5dfa70c07fa177eeff7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Cooking.a" Hash="5d37c73e3b649900171c1ebd87732a34aa07597c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CookingCHECKED.a" Hash="295cd103027b00559567ce9bb9f01b6efc9d25b8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3CookingPROFILE.a" Hash="ee5a7254648d88bcd35cb149703e06568b0656ae" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Extensions.a" Hash="af400ab5f168d0e293fc7b4452a6b80bd9fb0be9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3ExtensionsCHECKED.a" Hash="95ac9954859d3b726aeb86ad688c9632f51a3002" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3ExtensionsPROFILE.a" Hash="f832c907f5a3a79040a37c31b3211046f566ea0e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3PROFILE.a" Hash="0384898869a74d11175fdf040ec1bdc0e7e0be48" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3Vehicle.a" Hash="b20fe0dedb742b23223720fcc3d5e66ef4e5cae0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3VehicleCHECKED.a" Hash="f9670f3db559802845e4bc0b4d209f656de376d9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPhysX3VehiclePROFILE.a" Hash="8bcae293d614aca368947b0f56a8f6f0e7f52306" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXml.a" Hash="523998bab45497d7cfc982d312f0ba47e07a1303" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXmlCHECKED.a" Hash="62ea24b345059c858da1e37b3f01bbf3bcc37895" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPsFastXmlPROFILE.a" Hash="bf9bc5eab19e9bedafc822128915aaa8809b3e0d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundation.a" Hash="6f6fd38c714bada66551c759f6a658b214fcdb98" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundationCHECKED.a" Hash="18f7ecedba09f77513b56d283dfda91f79983444" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxFoundationPROFILE.a" Hash="b6925ebb7f9f06d7e88c81f4d743e8b8463da691" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDK.a" Hash="b8ae10d1a192e4f67f14c44bc51c1cf471ad263a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDKCHECKED.a" Hash="c0b2c2726042d4e4b4eb33b07af9b9b88cfd4549" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxPvdSDKPROFILE.a" Hash="ec92630c8a3f2dd999f92ee104f1eb91df3929a5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTask.a" Hash="d1c6c39ed1d4e5a3caf10375f1042bb3d59a8d43" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTaskCHECKED.a" Hash="7bdb0e42f2c2255975e76abe579bcdba83deab64" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libPxTaskPROFILE.a" Hash="fdc91da002aaea2022e73d5353d1962b7c38aafb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQuery.a" Hash="8e33efa9bf2c171519437065ddbd344db77bea74" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQueryCHECKED.a" Hash="7c0c9e2d1dfe3baa46e993881eb2f58d46386888" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSceneQueryPROFILE.a" Hash="d9df538ae68edaa3d7105000698dec418d504eef" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationController.a" Hash="0d97a96177e2970cd28c71e5aa7c9a47bede4ca8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationControllerCHECKED.a" Hash="421573e8c74e7bb53d32cd9673cf99169f0d68cd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/TVOS/libSimulationControllerPROFILE.a" Hash="b11dee6eb47f5e0e4f70984779c5f26321539197" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Clothing_x86.lib" Hash="d989a781d83a764d9c098616eade182729535a2f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_ClothingCHECKED_x86.lib" Hash="232cb5685d097296a027071ccc4988a0b5be730b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_ClothingPROFILE_x86.lib" Hash="4bb21e2978f22b9b0b9aefde11dd991115e51aa2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Destructible_x86.lib" Hash="910ed25198c0c37b2416eb7feefc1d2cd761e259" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_DestructibleCHECKED_x86.lib" Hash="e43b08d43eec3c5b365eb634728d23661b9ef7fb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_DestructiblePROFILE_x86.lib" Hash="09539065acd68c93f79ab49c73e9358f3d157143" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Legacy_x86.lib" Hash="8f3f6112f2eb1394e1a5cee5c22e223ed847c318" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LegacyCHECKED_x86.lib" Hash="a306f877546aa2d9782a86d919bb5d48946353af" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LegacyPROFILE_x86.lib" Hash="b6b0c4a8308042bfd755317d8c0b6c49c26d73e7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_Loader_x86.lib" Hash="62b4083f73b81cbe1e0e93ab15725ef48d674280" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LoaderCHECKED_x86.lib" Hash="8a187f1c57feff58efc91269ceafcf178b9370ac" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/APEX_LoaderPROFILE_x86.lib" Hash="ee2b4d7c6a9032fe032539265f32f33cfe5574eb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommon_x86.lib" Hash="4b8b5e02b0274d401d51096f031cfa523fa4bae2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommonCHECKED_x86.lib" Hash="bb7e172ec4662385476d65207af1c1c85d5fc7c6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexCommonPROFILE_x86.lib" Hash="fa4af1f8406caeb241a21e2fe2d2f72071d9f29c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFramework_x86.lib" Hash="fac0631db0c25a4a39eae68005778d84b5477801" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFrameworkCHECKED_x86.lib" Hash="9516d6a2472788624b1a37604da6874f3252fdbc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexFrameworkPROFILE_x86.lib" Hash="513311c55b521e69162c4e9e83fa4cc5c7129f6e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexShared_x86.lib" Hash="78be617fb907713b1089d3738325b43f0dcabdc5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexSharedCHECKED_x86.lib" Hash="a53da6afc994f48f3ff399d17d8fa8904d1af9fe" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/ApexSharedPROFILE_x86.lib" Hash="79fb5e5c4789a3c69d33d1c0517c93d7f64110ab" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevel_x86.lib" Hash="81d6f1b1361600a9a1902a36623b451c0c55fab8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABB_x86.lib" Hash="37f24aab7db130729593ee62f7471206a812c5d0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABBCHECKED_x86.lib" Hash="a5b82f44bb1dedb8016f0b75b1beb6562db03820" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelAABBPROFILE_x86.lib" Hash="fc27944a83a02650016de87b45b23f8daf05fec0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelCHECKED_x86.lib" Hash="87d7f61486547f70213e9a9371b5082fad65d1a7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelCloth_x86.lib" Hash="f0ab5fd064273af0bef56b3f45d193605d5e1d7f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelClothCHECKED_x86.lib" Hash="42c03f8adc6d8cf3641ec220a28f72a1ebd5a5d2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelClothPROFILE_x86.lib" Hash="9dc4be525487852e2a49a2975de775d341212cf8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamics_x86.lib" Hash="b0f52ceacd8d36ba5313eedb2dd3552a0d2b66ad" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamicsCHECKED_x86.lib" Hash="f0c5cfd759faeb043d5293b4d1db854dc11e2cbe" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelDynamicsPROFILE_x86.lib" Hash="b8880121423dd97fe74874d55fa9cdebc0bfa630" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticles_x86.lib" Hash="1ff67013dcab0c05688b66263edf518109d56838" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticlesCHECKED_x86.lib" Hash="cd3c1901ec9b6420e1c291a2d0061020c114b77d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelParticlesPROFILE_x86.lib" Hash="df2268f9a043d8b91eaac2c7bf4c14fa5b107779" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/LowLevelPROFILE_x86.lib" Hash="52c2b69d04c1f03db65ae2c06ef8066d6c54b917" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvCloth_x86.lib" Hash="8393fd32b5b028b62a00d2356ac0def52a1c9230" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvClothCHECKED_x86.lib" Hash="105aea1349325feea1c1ca3e96adf2b3a2e97961" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvClothPROFILE_x86.lib" Hash="13e727e07aa42cdce67621b99a38e23c459b7d9c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterized_x86.lib" Hash="03b82f3af31f61a72f735bf08f71c65e2a20d3dc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterizedCHECKED_x86.lib" Hash="6a2cf693897d99564744ddd1270fb86ff53cd3de" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/NvParameterizedPROFILE_x86.lib" Hash="fc1f23365c54e52e654b2771ffaa97bc17f186bc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3_x86.lib" Hash="2af00826f4682ff004b2954882caa10d5592d978" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematic_x86.lib" Hash="dfda83899e410e1d4bde1a9b5039cc1a367cf2bc" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematicCHECKED_x86.lib" Hash="419694f76fd8c8805ab3fb9fb3b332d385ce2383" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CharacterKinematicPROFILE_x86.lib" Hash="029c39081a85e6b9d4ff7bcb13a0e401d5df7049" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CHECKED_x86.lib" Hash="db8b303e8c3695db7574200c287346755abae2cd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Common_x86.lib" Hash="e1324add3ac7293133b3ccbf649dcfb1abbfe51b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CommonCHECKED_x86.lib" Hash="90f693c50b5f41b451a01b06a51ebb3574a2c39a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CommonPROFILE_x86.lib" Hash="5f849c83a42b25c406dc8b09645a3acbfea5b7c8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Cooking_x86.lib" Hash="d7b5cdaaf94c1f442773fbb93b6baacdb3e646ef" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CookingCHECKED_x86.lib" Hash="602126bcd06a67f4828f14e7a93f4c493bd768b2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3CookingPROFILE_x86.lib" Hash="f8348cd95cce95f071df01cf14fde77d099a94b7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Extensions_x86.lib" Hash="53f20de307eb22555eb2f66eecb97679c98cd374" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3ExtensionsCHECKED_x86.lib" Hash="4d2c12094ec75b95b3fbbdd48194693259328495" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3ExtensionsPROFILE_x86.lib" Hash="6abea1f481b9522d811347807d364eaff6f0b92b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3PROFILE_x86.lib" Hash="b2eccb65bba8796b06bdf50ccb89d26b4af478f2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3Vehicle_x86.lib" Hash="819f027a0984717833efe14fa812f3c0cfbf0802" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3VehicleCHECKED_x86.lib" Hash="ea4feb0db3b7b75df699ad8f48298c5e1adf5319" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PhysX3VehiclePROFILE_x86.lib" Hash="cb297904437fda95915430ea4eeccc0425a0978d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXml_x86.lib" Hash="b1847de88f8005cd9c409a86798a225aea60aaac" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXmlCHECKED_x86.lib" Hash="41baf020b5ff03bc9b036b4b3cc755d785f7964a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PsFastXmlPROFILE_x86.lib" Hash="7d29da4d554370accf38b1cc88e304e4e1f0dfd6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundation_x86.lib" Hash="fdcc9823313376b7a9d7b5142f572e0143a64b63" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundationCHECKED_x86.lib" Hash="a2666c03d4b659ca3f4a08d1deb3c1948eaba728" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxFoundationPROFILE_x86.lib" Hash="476e0d6e5762dc8b8bf4047c66ee27d6e6c4609b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDK_x86.lib" Hash="88d9bf65697b4643dc41e46331577d1ae31f7e3f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDKCHECKED_x86.lib" Hash="ee5f710283a921c1fe255afc9d618edda9d1b7ea" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxPvdSDKPROFILE_x86.lib" Hash="82a6083ccfa3f5beb54e45edc5c6885eba4660ca" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTask_x86.lib" Hash="1e01dbff71e154615c0c0362cc211a6cc73a3475" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTaskCHECKED_x86.lib" Hash="947aaca4e3db7ef6587368e74ca6373f713d0982" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/PxTaskPROFILE_x86.lib" Hash="62910b920a0d36039573fe9b727b8052e23d34a6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebug_x86.lib" Hash="ef189f971797ba80f908af28eecf7430bdb97a8c" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebugCHECKED_x86.lib" Hash="292bb991822c195861ad12816d5bee4373f122ca" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/RenderDebugPROFILE_x86.lib" Hash="6b8475d49a1415ad982740aca26ff4c6044fb727" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQuery_x86.lib" Hash="f9e66e2c8fb13749823b87ee1531e7e31adc6ea2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQueryCHECKED_x86.lib" Hash="f2d74b5adaf5b793e681b7dc99e78c72fbf51bae" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SceneQueryPROFILE_x86.lib" Hash="ac78271db5a86af8de56fffdb803869bb4f8998e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationController_x86.lib" Hash="8790a702fbecf1c27ed4e4958ed943d7300de578" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationControllerCHECKED_x86.lib" Hash="24d0a2cbe72cc1c61844d421ebd8ccca5bed7c4d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win32/VS2015/SimulationControllerPROFILE_x86.lib" Hash="2fb899e985b3e7aca3305c428f80c32dd16adc27" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Clothing_x64.lib" Hash="8915cd52965c17c6730a0f4cbe9d275da5d6bf72" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_ClothingCHECKED_x64.lib" Hash="1dc1d241ac6216c06ae81e90f3c9c31f267f42ff" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_ClothingPROFILE_x64.lib" Hash="834928e2fa8c88135d3095c20d5b4d9b097fcdf6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Destructible_x64.lib" Hash="20dbe52af319c876cc7414c0e3fd84233afc7739" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_DestructibleCHECKED_x64.lib" Hash="2a34a79730d1d2285da994feef71c7eecfa97d84" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_DestructiblePROFILE_x64.lib" Hash="7926f3894429e6a3ffb945ceda75b70311bd0305" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Legacy_x64.lib" Hash="fe8300156d4378f11d3e641c46162c2512b9e8bb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LegacyCHECKED_x64.lib" Hash="1f2979436c815398049051b6c74edd624c79419d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LegacyPROFILE_x64.lib" Hash="13a96ad9c8d9e37396621d4540b9a5e597dc2811" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_Loader_x64.lib" Hash="057f9bca429f8adabbe1d3ab438060d001965e02" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LoaderCHECKED_x64.lib" Hash="745816883db8b8378c764f8d915b44c289090e76" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/APEX_LoaderPROFILE_x64.lib" Hash="f60b19a9c532c72255e24b6aca0dc4aa2eb3c8ee" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommon_x64.lib" Hash="04ab36c28e7f9498ac67696575e83b816d8500aa" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommonCHECKED_x64.lib" Hash="826aaca5d32d0dfbdc6dd12624bfd422e57bb8fd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexCommonPROFILE_x64.lib" Hash="55e1838230af7e424e6b35812d7f72a8b6cfd029" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFramework_x64.lib" Hash="e8b6480c5d722aab48d5675b5fb7b612294a2c3b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFrameworkCHECKED_x64.lib" Hash="b67c65f2211828643a33007325b999e865b03f2b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexFrameworkPROFILE_x64.lib" Hash="270a840e85ea4b6bc14d0a0ff88fb7056d3359b0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexShared_x64.lib" Hash="78fdcc1bda01350ede0f65a85579e00546dd5097" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexSharedCHECKED_x64.lib" Hash="2f82e30a071e0d98ed01100521e34452134a5106" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/ApexSharedPROFILE_x64.lib" Hash="8af9633db06fde687091d2fdf1fa3460a6d7c75a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevel_x64.lib" Hash="4b79a4726dea651c6629020c52d7fdce8a85f00e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABB_x64.lib" Hash="32151486a01e405761c95a3917aa3ee47d4f83a1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABBCHECKED_x64.lib" Hash="0c12f88f8b8273b9dce8b5abd6127dc022457b1f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelAABBPROFILE_x64.lib" Hash="522df2cb178692f314cabcefc8c7896b495fd52f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelCHECKED_x64.lib" Hash="ee1da6231e5e58130f26f71aa3288c5fac388fd4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelCloth_x64.lib" Hash="1fcbea8c259114e52b1ee1616ff30f639ca66f11" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelClothCHECKED_x64.lib" Hash="e6bcc432357d26d68034004666b59615950ff700" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelClothPROFILE_x64.lib" Hash="8b4efa2d6f6dbed754e85c1745062b0da712de56" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamics_x64.lib" Hash="42cf2c62405db554e3295995c415903323285bd2" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamicsCHECKED_x64.lib" Hash="2439549cb5afa3bf7c36ae88988ebe6f4bc39123" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelDynamicsPROFILE_x64.lib" Hash="b486a50f604a0cba8d55ff6cd8d82ef669132e4f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticles_x64.lib" Hash="826aabb920d8e967cd14b40e1f11eb42c3ba3521" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticlesCHECKED_x64.lib" Hash="1ce2b862dc46f2e86523769a5241227222c54ea7" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelParticlesPROFILE_x64.lib" Hash="e345ef1c4f362e85147c1eab870284fac5deb384" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/LowLevelPROFILE_x64.lib" Hash="c98c45afda9f064917ea5efa2bc4be3eb7a513f8" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvCloth_x64.lib" Hash="3be509ff4267bd67497dee93f3362801c254bc1b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvClothCHECKED_x64.lib" Hash="c37e2291ec269faa847d14e9ce17fbf9f0b19c61" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvClothPROFILE_x64.lib" Hash="4fbd2d2e03386dd632f3a10cb5f0af129b372f0e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterized_x64.lib" Hash="a3fbd3c6a52e40941fec9a3f8d271509a233c796" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterizedCHECKED_x64.lib" Hash="e227257f14fc1da9826149ad23cd0366ef3b25e1" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/NvParameterizedPROFILE_x64.lib" Hash="e3e8b83098ca0eb695ef7851bc5054fc28041f46" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3_x64.lib" Hash="3d5589d4bfdf96aa536a10cfa1882d715d71007e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematic_x64.lib" Hash="cc2ee39d5425a0824e83471e92bf6a65cb3c717d" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematicCHECKED_x64.lib" Hash="f2233a5b1b372d37f255a22b4d15e2f89a4c50ed" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CharacterKinematicPROFILE_x64.lib" Hash="bc5b53463684a42ac6040b19ecf71bb1c3966661" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CHECKED_x64.lib" Hash="bb84cb0f64828a70547c85205c1fbfdc84e77ddb" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Common_x64.lib" Hash="9cb6c64dfdd34e993b16e251fff3311e4550cb76" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CommonCHECKED_x64.lib" Hash="716d61242e0eede7be74444af53e59855bb14481" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CommonPROFILE_x64.lib" Hash="4d4825e25b6055d014c40ad543c803e134075e77" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Cooking_x64.lib" Hash="b81a0a367a84436fdc3eb14c3949d0bbbefdb925" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CookingCHECKED_x64.lib" Hash="82b4701fa68dd344c763165db500ab1e95614b0a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3CookingPROFILE_x64.lib" Hash="d9730ac2f1f35e3033e0484de5c72abfade6df51" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Extensions_x64.lib" Hash="2664f27118d2e3c790d7e97ca7fa78d60660fe35" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3ExtensionsCHECKED_x64.lib" Hash="a763747f9cb3ad10436ddff2cb50dbcec1a0ed6e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3ExtensionsPROFILE_x64.lib" Hash="b715146cf6efdf88bd2355d65dee34b979ec7fb9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3PROFILE_x64.lib" Hash="c0d30a4f4a89b90348288e725e9774035a4d12c5" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3Vehicle_x64.lib" Hash="c88839fe7e69f3818d3f4a144f4ca6cc093373fd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3VehicleCHECKED_x64.lib" Hash="ab3fb1d473264fef433e2aa885061d7d8770a61a" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PhysX3VehiclePROFILE_x64.lib" Hash="f1497765d935880471bfdc5d259983dd4338ab2e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXml_x64.lib" Hash="9aaca826d17d0284ed067129a6a928bb7a9814f4" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXmlCHECKED_x64.lib" Hash="070f49b5770a36598c2c9b45f02673761b9115fd" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PsFastXmlPROFILE_x64.lib" Hash="e99543d000d12c18076a0f984bb6365188bec3f6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundation_x64.lib" Hash="f9aa2f1101f883e7278e8091725b89968ad54b7f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundationCHECKED_x64.lib" Hash="e526607071904e4bccff87cf41364d1b4b4b0dc9" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxFoundationPROFILE_x64.lib" Hash="6dfd18363160ea4cdcb6466edbb449709130bbd6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDK_x64.lib" Hash="d8fcee1d5bc426562debcaebd8ae73d6faf71196" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDKCHECKED_x64.lib" Hash="cc0fa8abd39da6de552e825da057f4a1f38361a0" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxPvdSDKPROFILE_x64.lib" Hash="a8abcaaa21bca620c2d925bac3081d9aee5c1a67" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTask_x64.lib" Hash="0eba41ea22fb1b46930753067c5c5a1f9fd03984" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTaskCHECKED_x64.lib" Hash="2513e13700ac14538dfb1571b9ccb1d850808136" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/PxTaskPROFILE_x64.lib" Hash="fe89deded3fe4f5d622830e0051b80f5cee7c41e" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebug_x64.lib" Hash="110d762b5dbb0a31e4bca5b28b73049204156847" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebugCHECKED_x64.lib" Hash="2c4a43e5ddb89b0f22ab449ea6ffe46ea6555e2f" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/RenderDebugPROFILE_x64.lib" Hash="44908b060475453aaacc0d4f6ad62bdcf9020aea" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQuery_x64.lib" Hash="0d64c2de1d2463895f979bcd6b6baaa59be81f2b" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQueryCHECKED_x64.lib" Hash="adf98ecaebc9a08e4360a4f502933a9ca384f704" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SceneQueryPROFILE_x64.lib" Hash="9d02571bb1be6131e70fe06aa3e5613223906218" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationController_x64.lib" Hash="b6ff12c8ea2926ef4727317d94e9292722bfac86" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationControllerCHECKED_x64.lib" Hash="fd35f437a4118aaaaad0ff0d94d43ebeafc475f6" />
+    <File Name="Engine/Source/ThirdParty/PhysX3/Lib/Win64/VS2015/SimulationControllerPROFILE_x64.lib" Hash="0966b7806cd288e678a34e068ed44b881878da38" />
     <File Name="Engine/Source/ThirdParty/PhysX3/NvCloth/docs/documentation/_static/collapse.png" Hash="1dffd49cf631ea4df128f654b820c28fd777dfe2" />
     <File Name="Engine/Source/ThirdParty/PhysX3/NvCloth/docs/documentation/_static/developerzone_gameworks_logo.png" Hash="3c9cb6b40439b39bc540c552bd15125e182d95f9" />
     <File Name="Engine/Source/ThirdParty/PhysX3/NvCloth/docs/documentation/_static/expand.png" Hash="b687958fa413872c1fa9e88218cb4b0c84c7cddf" />
@@ -39119,18 +39014,16 @@
     <Blob Hash="000dc241c67cf754660cebf47be10089a018a222" Size="132924" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="1120908" />
     <Blob Hash="000e9b13a614c03e2bfecd7b3aec343b145702aa" Size="116879" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="8" />
     <Blob Hash="001033d1952d2f8b5fe84edad80650bb6c1b9f93" Size="31156" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="594608" />
-    <Blob Hash="0017781cd84322d5635a2289d023ad8e8280c76c" Size="18796264" PackHash="e63aa9fc03c950b352b86eea3c733e41e8dbd609" PackOffset="8" />
+    <Blob Hash="0017abf5dd27c4ba214d51a16254cc7834ca0528" Size="133120" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="1566728" />
     <Blob Hash="001a887e297caa89da82b2467a44686f74a19556" Size="179000" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="944509" />
     <Blob Hash="0023653df46c9e577c177b81a05433d8764f716d" Size="299" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="935160" />
-    <Blob Hash="0023a56fc7d6ab1b65ddbf7776a5ef66219260e2" Size="3692" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2087993" />
+    <Blob Hash="0023a56fc7d6ab1b65ddbf7776a5ef66219260e2" Size="3692" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1987857" />
     <Blob Hash="00259c6f5e36f89b434648edbd2dd1f6c0c88744" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1175369" />
     <Blob Hash="0026cbc8fb140c9f629954f662e28c2d8194d1cd" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="645128" />
-    <Blob Hash="00283db582e336da2a54b16b1e2040b46d7db8f9" Size="4194304" PackHash="bdf7cd9f03c873d2499106d7e7d6925bcc5e4ff6" PackOffset="8" />
     <Blob Hash="003195b9eacb0e775faad6b0503151707357be0b" Size="3771" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1431659" />
     <Blob Hash="00326cd2a7d7b7c3236a9db340c3a73ac886c5c2" Size="2229" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2045976" />
-    <Blob Hash="003394f1ef90c84039113a975ce6f0792843855a" Size="2212" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1393623" />
+    <Blob Hash="003394f1ef90c84039113a975ce6f0792843855a" Size="2212" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1842525" />
     <Blob Hash="0033b92da8c91965a851735113a32313beb7df02" Size="7038" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1389419" />
-    <Blob Hash="003817c5a360fe27116306e9f4b92c58a981161a" Size="5302014" PackHash="170dc5a09e18eb4e9ac0ba3ff12f540fd6ef0432" PackOffset="8" />
     <Blob Hash="0040b491d88930220ccf6c917f08c7c0002ad776" Size="696208" PackHash="59331b16c59b616e30c4a3c7524419dbf031fa9a" PackOffset="8" />
     <Blob Hash="0043660214c15e3cabbff55f5033043405da3196" Size="3012" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="750882" />
     <Blob Hash="00453f7f7a86ab7aa7acf95a9868e105e553081f" Size="1716" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1492927" />
@@ -39147,7 +39040,6 @@
     <Blob Hash="006d5802f0e8e2352898ca96dec56015690aa0ab" Size="18451" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1076131" />
     <Blob Hash="006fe4f9ede082f5435793abc650d18bc32f5e83" Size="137496" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1116228" />
     <Blob Hash="0070a2ed2db905e91a9a8cdceb1925d75d6cbd35" Size="3130" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="903328" />
-    <Blob Hash="0070b9041735272ad1af720d6428f5e4d19e22fc" Size="111620" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="1857095" />
     <Blob Hash="0071d9b3d1867ea58f5b0b7c8df01de697c50822" Size="10557" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2070064" />
     <Blob Hash="0073e65ad2861c07d83117febf1bed0806542bcd" Size="2545" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1728185" />
     <Blob Hash="007819588e7911e148483a50d750098ff186074c" Size="17715" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="168243" />
@@ -39155,7 +39047,6 @@
     <Blob Hash="00786b2e06fd27a4bc9de08ad2dcd9276c20554a" Size="95468" PackHash="1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" PackOffset="1637205" />
     <Blob Hash="007a930ba8853a6b600c70429eec9ce1273fc16f" Size="2867" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1073976" />
     <Blob Hash="007ac676849f67fa7fe0609c5ef91c000f31c315" Size="555938" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="75794" />
-    <Blob Hash="00834601c180b56bd2b86fb532a1d7c66f3c5a63" Size="263680" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="1596424" />
     <Blob Hash="00858ff6ed1627d39018ddfda673526ff71bdfa2" Size="76501" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1172407" />
     <Blob Hash="0087db5df840dabf77bb4206aa8433f88fe8058b" Size="18732" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1570622" />
     <Blob Hash="008cbec753422caebfb14720b71b6b4f6971f4b8" Size="24384" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1671044" />
@@ -39166,24 +39057,25 @@
     <Blob Hash="00900f0addb7526c63c67ca1662c038e95a79245" Size="6945" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="629248" />
     <Blob Hash="009320234ad31b7b8a99abcd3e0390f84b154e43" Size="5329" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1169923" />
     <Blob Hash="0093d68c40053f513280a959605434f9bfe4912e" Size="152064" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="1670410" />
-    <Blob Hash="009958a32cc1e84689dc426be75821e80edfc0ef" Size="2450" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2089605" />
+    <Blob Hash="009958a32cc1e84689dc426be75821e80edfc0ef" Size="2450" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2090664" />
     <Blob Hash="009ab7d4ba1767743a124421fc078e4447fedc1a" Size="3588" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="2075327" />
     <Blob Hash="009fa03cc1141fda2b5cc16df67385f86027bcf4" Size="889" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2082401" />
     <Blob Hash="00a2018300198f06fb2071bf78d453f706a84d07" Size="3660" PackHash="e2844d1cb41a532700afd48dffec9acdf53a5ba6" PackOffset="2081247" />
     <Blob Hash="00a375c996d472f26baac8ce750b7ee3072f50f6" Size="1141" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="2095973" />
     <Blob Hash="00ad543d78e82d77bbb453a8f91ca8beddfa9da2" Size="14209024" PackHash="a1aca51bf21ab264eebc189dd4345d94c24279db" PackOffset="8" />
+    <Blob Hash="00b28aa3e11ffa9a76926aa20161c75e36339c65" Size="39611642" PackHash="2c56131f5d144a87ddd7a647132b3a97320d5fc0" PackOffset="8" />
     <Blob Hash="00b2ec0d31574601fb9b9958635672bda9177f96" Size="123138" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1692343" />
     <Blob Hash="00b36c757f997bc875bccd17e037eaa155bbbaa9" Size="136" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1801896" />
     <Blob Hash="00b5f851a1192a901d1c00a7ea0eb64cce9fe3d3" Size="1652" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="135538" />
     <Blob Hash="00b72725d46fd7235fe6bf0d16c94aecaa9fc7d1" Size="1035" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="2095244" />
     <Blob Hash="00b83fbc0a06ae7d41daf202fe32de79f218e2d9" Size="79632" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="1306847" />
-    <Blob Hash="00bb2c34d030722b8dfe5b6dd86752e75f8e70a8" Size="48" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2097111" />
+    <Blob Hash="00bb2c34d030722b8dfe5b6dd86752e75f8e70a8" Size="48" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2097110" />
     <Blob Hash="00bec0f74f4a420e23344c20a4b8a30e609e4a88" Size="224768" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="1866248" />
     <Blob Hash="00bf70e8da90454801f368d59f7149d59e80a95c" Size="152" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1958480" />
     <Blob Hash="00c75ae4f4aba9496527a9dd5336ea276794faed" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1743196" />
     <Blob Hash="00c859f5f8513e760c990cf2b47d01fce055d872" Size="4708" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="860701" />
     <Blob Hash="00c85f011b54432feb63d3aa9c8dc43770f7c4eb" Size="8288" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1999717" />
-    <Blob Hash="00ca10955a44913e2b2cf109665036de68cba3af" Size="239616" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="8" />
+    <Blob Hash="00ca10955a44913e2b2cf109665036de68cba3af" Size="239616" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="8" />
     <Blob Hash="00cd963ec834cc13d94b67a4f1872716486b010a" Size="245248" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="1668842" />
     <Blob Hash="00ceb1c07776772d8ba33187ea58f64861968d57" Size="301656" PackHash="faa641df952d93274d1774a37ecd0e58a425c5a1" PackOffset="1196934" />
     <Blob Hash="00cfe2540f1b717edf914c5eb9589ab66c02ecd0" Size="118690" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="319587" />
@@ -39221,13 +39113,13 @@
     <Blob Hash="010a1313383d636a642012683ab4ca9912954b95" Size="234" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1351152" />
     <Blob Hash="010bd31817ee54b0c0f6dc0c96ffc02b1ee9582e" Size="1376" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="341179" />
     <Blob Hash="01145649cd36703e8eaee5dc1dbb6a86e54a9c4c" Size="4298082" PackHash="1c870a21bd12a7d4d3dd7e888e05e67cc7beebf6" PackOffset="8" />
-    <Blob Hash="0118eb3d76f347dc17a80c39c7175281999fcd39" Size="20817" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="2065068" />
+    <Blob Hash="0118eb3d76f347dc17a80c39c7175281999fcd39" Size="20817" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="2040948" />
     <Blob Hash="01193727cfb24ec7bffff404b8c514b6e2b776eb" Size="3656" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1710218" />
     <Blob Hash="011dc0de2d74bec7a9b8ee8502b2df405aa0ebff" Size="218451" PackHash="df0144f50704728f42fccc36e1dfe60d6e88afb0" PackOffset="8" />
     <Blob Hash="011eaa347a6b8e44354b5309f8f7eb5687d88aa0" Size="211" PackHash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" PackOffset="2096948" />
     <Blob Hash="0120125aae7ab6e1dba4f2476869e5e033320ca0" Size="340" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="733870" />
     <Blob Hash="012033fb377bdb701e191b20b645c3b849b4a5df" Size="2984" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="431153" />
-    <Blob Hash="0124406409364a75416b5232165219fd8da49214" Size="1545" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="2095614" />
+    <Blob Hash="0124406409364a75416b5232165219fd8da49214" Size="1545" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2094715" />
     <Blob Hash="012c9d0941f92cdbf6888003105f34221e5acbbd" Size="2495" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1561397" />
     <Blob Hash="012dbb9ce62f874c4828c4cf5bf9971b3632a214" Size="1395014" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="8" />
     <Blob Hash="012fc8c733b9d83ee807357a2e6d554e767fda78" Size="11336" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1542566" />
@@ -39235,13 +39127,12 @@
     <Blob Hash="01346cc143c0014f3ff9d54da0be03ae75b5c7e1" Size="4705" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1040375" />
     <Blob Hash="0138f9ffba5051c1391d617086336e5fa80d4599" Size="453" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="457759" />
     <Blob Hash="0139af34a0011b33da5f477d52d826d39ceb59de" Size="4494" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="691862" />
+    <Blob Hash="0139f2e8ee19a91a4d5418dcdfc3055235bc2700" Size="3712190" PackHash="ad6562942603c5bfa6b08cdbb9204573b9d35b89" PackOffset="8" />
     <Blob Hash="013b405ca5edfc5126e361ca1056468d811a5afd" Size="2570156" PackHash="afcc169d2950b8be7c7677bcb6cd73bc3ee5c7d0" PackOffset="8" />
     <Blob Hash="013c935f11870af9509707612144c8a0cde9a04a" Size="66" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="622793" />
     <Blob Hash="0140088fec8aaa013c192a4e7109db20e1a03b38" Size="12288" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1568632" />
     <Blob Hash="014025761c22c41ad3138216614e82abeab91903" Size="32685" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1745308" />
     <Blob Hash="01454ff87304e402dcc389bb7a77f29eb77d5a47" Size="5001" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="990507" />
-    <Blob Hash="01469e9324f3acbb1807d82ec212cb189e97e4e6" Size="52576" PackHash="7966ce69e1ca589fd320f02bbfda4db14a641042" PackOffset="1987240" />
-    <Blob Hash="0146d3629c92dcfed9b544aec9fa359ec46a615c" Size="3844532" PackHash="90c3323cc2ee458edb44c5bdbe79ae3529230605" PackOffset="8" />
     <Blob Hash="01471db1bb41da6dee78c695ce4fc50a2dfc5024" Size="4785" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="2090224" />
     <Blob Hash="0147de2b4e2ae3e9a9e9679ba0a2d27c00625183" Size="143442" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="1143005" />
     <Blob Hash="014e089ae6eaa6bb325268b47368a98c47e196c3" Size="3377" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="954042" />
@@ -39258,7 +39149,7 @@
     <Blob Hash="01637316b5f7c45e09267156e104244d53461c4b" Size="202562" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="412922" />
     <Blob Hash="0163eb9eaf921247e0092ee13b4634842595581c" Size="12632" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="259768" />
     <Blob Hash="0163f9b50eca299a9b961d1e7bd582a638fc63a9" Size="10763" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1981797" />
-    <Blob Hash="0165c3ac2cb62da81828a2798004847eae92c5ae" Size="4578" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2082007" />
+    <Blob Hash="0165c3ac2cb62da81828a2798004847eae92c5ae" Size="4578" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2033938" />
     <Blob Hash="016a73859f914b2921a95c1ac1e36e220591097b" Size="10496" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="812488" />
     <Blob Hash="016b10d3f879aa07377e1718d8cb1a15ad64403c" Size="2389" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1327994" />
     <Blob Hash="016c9aca8cd814083273db786179c0e917081537" Size="31084" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="815144" />
@@ -39267,13 +39158,13 @@
     <Blob Hash="016faba38dd3aad4552a6a5cd8e2e51f16b5f215" Size="30192" PackHash="83127d14d8403a98dd6220dc7c9068fb0d569cc5" PackOffset="2064907" />
     <Blob Hash="0170032eec03c58c2add6d87946fbb033c58e15f" Size="2890" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="2087142" />
     <Blob Hash="0173e6e889ac8f08fd1766bd4af10e85992870ea" Size="5068966" PackHash="9320016c7c1419a5621e462af7b3e27a1f60d6a3" PackOffset="8" />
-    <Blob Hash="0174da4cc6a6c628800a328c78a8470c16775d92" Size="1110016" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="8" />
+    <Blob Hash="0174da4cc6a6c628800a328c78a8470c16775d92" Size="1110016" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="8" />
     <Blob Hash="01753fbcce6e990df85ee602eb6cc259c8e5122e" Size="294" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2090803" />
     <Blob Hash="0176a7ea5cd02540c62b63ae8c97e07183985fdb" Size="4909" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="340827" />
-    <Blob Hash="0178f24611094f5d3f501e7febe1cec6f2ab6300" Size="24357" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1665486" />
-    <Blob Hash="01791f9c0f95f16bfb84f1c183284a9600b68275" Size="21523" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2070048" />
+    <Blob Hash="0178f24611094f5d3f501e7febe1cec6f2ab6300" Size="24357" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1877205" />
+    <Blob Hash="01791f9c0f95f16bfb84f1c183284a9600b68275" Size="21523" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2036826" />
     <Blob Hash="0179eb46ebc837c2bf898ee6e706df657560c246" Size="5091" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1263500" />
-    <Blob Hash="01810540cf3138382a34678e360a040ad8b41946" Size="321" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1607054" />
+    <Blob Hash="01810540cf3138382a34678e360a040ad8b41946" Size="321" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1726286" />
     <Blob Hash="018283260539a655af0430146f72d500eea48469" Size="8428" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1532293" />
     <Blob Hash="01873bced23a6556d4cdaa40165ba68d590f6441" Size="255" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="179728" />
     <Blob Hash="0189bef7a05a4696e69cfa81ccb8364bd240ec1d" Size="84" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2097035" />
@@ -39295,11 +39186,11 @@
     <Blob Hash="01a7f689882b3db20d26e4ba8568f80880955a91" Size="24412" PackHash="c6da47930b010c6bb3249d411d7760fd5e32320f" PackOffset="1831631" />
     <Blob Hash="01a87497909a24ca318ea2b708bda21386a1d0dd" Size="46075" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1671839" />
     <Blob Hash="01a9110f01f481963dd4ef7a4d73c0078cbd60c7" Size="36514" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1672241" />
-    <Blob Hash="01aa1f74e70c8b2c80518c18bae12bd877dbc649" Size="3693" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1113841" />
+    <Blob Hash="01aa1f74e70c8b2c80518c18bae12bd877dbc649" Size="3693" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2059857" />
     <Blob Hash="01aa8d50bae0fc7a60c2cd22cbac40022e2b1abd" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2086021" />
     <Blob Hash="01adc7b1f9ae817eb8754a83a77e619302978d75" Size="490" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="177449" />
     <Blob Hash="01af68bd2d8d8932d6bdcb84da66f043ab3161e0" Size="2478080" PackHash="a41cc049fb6018644b7d6560f888ebf5364d9340" PackOffset="8" />
-    <Blob Hash="01af6c4b0c300fef2c1d2e709573e245d82fbe96" Size="5854" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1899462" />
+    <Blob Hash="01af6c4b0c300fef2c1d2e709573e245d82fbe96" Size="5854" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1840720" />
     <Blob Hash="01af8989ef2cf432295b109e2254fc26df03d696" Size="39012" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="645607" />
     <Blob Hash="01b067f63939cc8c119d01db8334b2fb34b60e24" Size="3683" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="8" />
     <Blob Hash="01b38d6a58633b9fff4c2c32ac3255c8f34f067e" Size="32424" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="442592" />
@@ -39317,18 +39208,18 @@
     <Blob Hash="01cd37e5c185fc7410fda6a6292e78e98a57c275" Size="21762" PackHash="77e0b57b01b65dac3277a08c2b0b1b18d4ff0c34" PackOffset="2009608" />
     <Blob Hash="01d00ddb3aeb92c6d912ba14857ae641f3f8c3f6" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2075457" />
     <Blob Hash="01d071dad28257f30dfa223fe3c457c560968d73" Size="81295" PackHash="84971b97551b9fd0778515853aa2a15a261a1afe" PackOffset="164428" />
-    <Blob Hash="01d3e9e5b313600ae94f43ea40f12743e43d32fe" Size="1731" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1696930" />
+    <Blob Hash="01d3e9e5b313600ae94f43ea40f12743e43d32fe" Size="1731" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1908649" />
     <Blob Hash="01d48f5273aab7b5be23c79f46447d8fa821153d" Size="101361" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="568009" />
     <Blob Hash="01d7d1494cfb78a7f2630be655ee2bd8521b03f2" Size="20858" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="593358" />
     <Blob Hash="01d9bf444a1013ea035ad75221ffa3e5d94c4585" Size="16946" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1445888" />
     <Blob Hash="01d9d4e362e62701d2304192ed754b6dfaccff01" Size="104" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1001564" />
+    <Blob Hash="01da4878854b2f6edd3aa462cb72389e0073a27d" Size="3467736" PackHash="fa17111dbcba7819276fabab00c33aa4ee83c642" PackOffset="8" />
     <Blob Hash="01dbe64ec259a8277ae1554043160f1d6982dfd3" Size="2067" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="2087643" />
     <Blob Hash="01ebdc3cdcd48724d68aef11790e6e18dd22a0a2" Size="47784" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="223411" />
     <Blob Hash="01ed5afde72bf5b32a6c8d06a7fdda469f08f9af" Size="120832" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="918695" />
-    <Blob Hash="01efec6cc6020608bd18d1c3d79f55cb93af76aa" Size="191" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1585189" />
+    <Blob Hash="01efec6cc6020608bd18d1c3d79f55cb93af76aa" Size="191" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1704421" />
     <Blob Hash="01f32dc27a3f43e23e16004db9d54894565505cc" Size="3245" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="821707" />
     <Blob Hash="01f60a0f401d080fe2cba7d4b83a2b34bb9936a4" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2095315" />
-    <Blob Hash="01f7944ae3a3f67fa94efd9dcda30f6df5b99065" Size="3538" PackHash="135bfc1f44c204b13050e403d578d595d413ba96" PackOffset="2089516" />
     <Blob Hash="01f8d6cf534eef8ef72fc463f7a26d9e153f79fa" Size="23847" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="2028988" />
     <Blob Hash="01f8e211ee2e7b5f7dbfddee0e020984876c8e87" Size="32" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="2097068" />
     <Blob Hash="01fb051e8c8c93ac51d835e7158f549f4e08cdb0" Size="1866" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2094550" />
@@ -39346,7 +39237,7 @@
     <Blob Hash="0221f7bb3838fcb4bc207d721de1b44f0e328d83" Size="3658" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2042552" />
     <Blob Hash="02241efed2761a66214c3d328825e074e1ce21e8" Size="6706" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="939974" />
     <Blob Hash="022b15680d708244e5b9b28b77a8d563c6943355" Size="4051" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="112613" />
-    <Blob Hash="022c4230decc01bce3309c41e7dca5c33ea213c5" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552125" />
+    <Blob Hash="022c4230decc01bce3309c41e7dca5c33ea213c5" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671357" />
     <Blob Hash="023163fed0d9f4e19d7f21a15b025d7cc96428ff" Size="1369" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="2095750" />
     <Blob Hash="02362dd00db98b9bb67ee9fb93c4c25a3d110c1c" Size="3887" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="868649" />
     <Blob Hash="023d9caae39c329188fa36a6b7815fa55af871e6" Size="1558" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1254633" />
@@ -39359,7 +39250,7 @@
     <Blob Hash="024c047aa70601fa82dc45d4c428fac52426917f" Size="4639" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="981368" />
     <Blob Hash="024dcde2c081f2962cd26aab97384262ebc882a4" Size="3704" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1402441" />
     <Blob Hash="024f391bbbb9a1254e1500a912bba64c891df6d0" Size="1095" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="339772" />
-    <Blob Hash="0250368b7eaa4911dac0f29a799859f7b9a3361e" Size="4102" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1122737" />
+    <Blob Hash="0250368b7eaa4911dac0f29a799859f7b9a3361e" Size="4102" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1890218" />
     <Blob Hash="02512cd4fee260b69f34e448dbdc35b42aefd1dc" Size="3229" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2069716" />
     <Blob Hash="0251f2b9091f7b25f662e7aad6fb663aa231ee52" Size="135297" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="300606" />
     <Blob Hash="025438c0949565589c0b8b58115c17a9e68fb302" Size="726" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="736315" />
@@ -39367,16 +39258,20 @@
     <Blob Hash="025a523e030b14992660690b8eba6cd8f3c6d9ff" Size="910" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="831156" />
     <Blob Hash="025b10f7c9dd84cbb17c6d74e45d20b0f538a13d" Size="2949" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1120719" />
     <Blob Hash="02609ad125e6f4c89fb825dbdf6a0919093152ef" Size="200457" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1715778" />
+    <Blob Hash="026377594dc1906bea07f03d248db4a940e403b7" Size="5393384" PackHash="cc0e3ca596819781928571b7f304f2a4e1d1c983" PackOffset="8" />
+    <Blob Hash="0265a90b30e3b7f20d26a6f84ff856c8b58da9a4" Size="1431160" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="8" />
     <Blob Hash="0265e4f4de1c247b5ce6d1d07d0d7b993a937182" Size="131018" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="8" />
     <Blob Hash="02679d3f71b02f801e82100f2b5d7e138a67c5e4" Size="5023" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1214545" />
     <Blob Hash="026a5fad57c08d1e2682f852c04d16a1eb7c670b" Size="5085154" PackHash="d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0" PackOffset="8" />
     <Blob Hash="026e70b8f2083c4a459d8cf00d0a60c0985296a2" Size="3135" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1968504" />
+    <Blob Hash="026ed8198d224a572eb597a81c3ca273a8f9aa50" Size="379272" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="1101832" />
     <Blob Hash="0276006a81034bca19b6e155f609651615ecb392" Size="5086536" PackHash="59717f7d7697f047103bbfbca63b68088e7172bd" PackOffset="8" />
-    <Blob Hash="0276dfe1cc18df50d048893e926ce43110949990" Size="2149" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1374431" />
+    <Blob Hash="0276dfe1cc18df50d048893e926ce43110949990" Size="2149" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1823333" />
     <Blob Hash="027754f6790f7c2ac73c221dbb0e637035912515" Size="246784" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="1654537" />
     <Blob Hash="028aa3c972ec5929e8c89641f3832c70f2ffbada" Size="443392" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="8" />
     <Blob Hash="028cda5f8651b75ce5fee6cd485389cc96232e1f" Size="354628" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="8" />
     <Blob Hash="0290aa1530b55cff91e9fb11a8cd13162ee13bfd" Size="5723" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1299746" />
+    <Blob Hash="029c39081a85e6b9d4ff7bcb13a0e401d5df7049" Size="1064578" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="142084" />
     <Blob Hash="02a00211fcb3d7c5c2cc5e3960ab0408d6917294" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="705180" />
     <Blob Hash="02a1ae350021b0befb8d86be0d2209f5f88c56b4" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1182926" />
     <Blob Hash="02a1eed4d0fd01555dce7591782012ad260896b9" Size="2987" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1800308" />
@@ -39417,8 +39312,9 @@
     <Blob Hash="02fb9c6172e5704b1b6d8609c5e9dc15db3367d7" Size="350092" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="1352590" />
     <Blob Hash="02fd53d2d4c768183d41135dc8cf8c56ec0ed98b" Size="44910" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1427976" />
     <Blob Hash="0301104eb3107ab042e13700ebab66304e09bc7b" Size="35812" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="755012" />
-    <Blob Hash="03038a8f845982aefdc3dfb2cfcbfb6bf9d4ea04" Size="49726" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="608860" />
+    <Blob Hash="03038a8f845982aefdc3dfb2cfcbfb6bf9d4ea04" Size="49726" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="1920683" />
     <Blob Hash="03040c6af2b2ddebcf70cbe4e955a1c03c4e00df" Size="4831" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="728437" />
+    <Blob Hash="03048e4646511d8b1d326c88caf0f46f13bacdaa" Size="7379600" PackHash="02327b55d449f7ee8ed81121bce17f9da3e30c85" PackOffset="8" />
     <Blob Hash="03055292b8475dd1bde10d24925bcc54895f448b" Size="132932" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="476028" />
     <Blob Hash="03060bb82e2b1d92c05b55dc63874f2c7be48ecf" Size="187904" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="1608200" />
     <Blob Hash="030b774afc7397d38a1b793db397954ff65e4c30" Size="143216" PackHash="69524cb8a63c006267120fffbd8a5e2729e9d5af" PackOffset="1690184" />
@@ -39432,11 +39328,11 @@
     <Blob Hash="031d37d4c7b129ea1c2c6704ba895d01e631d919" Size="211" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="898748" />
     <Blob Hash="031e3a4832529b03b56dbe10951929097b0a37be" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="458525" />
     <Blob Hash="031f3434cfa17d47892e1a31fcbcf628562da854" Size="139992" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1266396" />
+    <Blob Hash="0322e09c028e5770dd6d06ef529091f7291c9744" Size="576394" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="681298" />
     <Blob Hash="032516d90b9cafe4aecb64950741df780c5eef80" Size="1397" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="602697" />
     <Blob Hash="032a3dfed5cbf8480128df4588e16b0bd785b486" Size="164352" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1235605" />
     <Blob Hash="032cb4676db86143d7a3f9a394de68ed83c7f9e1" Size="946" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="578209" />
     <Blob Hash="0334c21c8316ed2ee16fc98b1e8867d5e0916c00" Size="11373" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1744113" />
-    <Blob Hash="0335d605bdc0906ca6ace740aadf2b37cb4286e9" Size="380512" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="1101832" />
     <Blob Hash="03396892ce5fada06f86bf5c38a57818532e6f10" Size="69349" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="154062" />
     <Blob Hash="033ea4732fac99b1a1ccc9aa84a34696352fdf90" Size="17920" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="2057736" />
     <Blob Hash="033ebae4bbaafe439cef51e9c4259df5f41efa0e" Size="240" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="205566" />
@@ -39445,7 +39341,7 @@
     <Blob Hash="0344bbb9ce133210c31a57299b2a0afe9697a6ca" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="178877" />
     <Blob Hash="03499f405553ece58de295caaebff9a85f69baca" Size="5267544" PackHash="a18cebf9d16dc2e5a99da03353e404d64bce3ae6" PackOffset="8" />
     <Blob Hash="034ed7f64b7f4c169e39296032cb76cbb715eaad" Size="7329224" PackHash="d0291e3428f076681d4a30df8f1e2bc87d1bb6a5" PackOffset="8" />
-    <Blob Hash="035805df1ad991114c5d50d03d6993046a3da3ea" Size="1324" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="977976" />
+    <Blob Hash="035805df1ad991114c5d50d03d6993046a3da3ea" Size="1324" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2024858" />
     <Blob Hash="03581fd7e34b0ee87e45e398fcd301d68ec3563e" Size="2952" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="610766" />
     <Blob Hash="035d24a714e427eca7810a047be0a8072fb2f46b" Size="1256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="862873" />
     <Blob Hash="035d88f1af072f3d412f960c068a55cfae145690" Size="2903" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1858468" />
@@ -39460,16 +39356,17 @@
     <Blob Hash="036b92982e7abd788f013cfe52b8f29453a8e2bd" Size="3108" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2082242" />
     <Blob Hash="036c1cc1837243923ee27afec3bbf1a0c5e362bb" Size="1877" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1140914" />
     <Blob Hash="03722f09ef229616f416306975a4d769cf1f2a61" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1134632" />
-    <Blob Hash="0372c2e7e0d46337b8a52d96a5ba3347a86fa826" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549234" />
+    <Blob Hash="0372c2e7e0d46337b8a52d96a5ba3347a86fa826" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668512" />
     <Blob Hash="03770aa1d2f86cfeb7a29d87a674064cb85e7860" Size="1478" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1114641" />
     <Blob Hash="037801f8b90b34cbc9fad052d4ad6db8966e7335" Size="3044" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1582068" />
     <Blob Hash="0378ca6db543d02fa492ae5a6da2c18b4119e200" Size="4243" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="891803" />
-    <Blob Hash="037935254beb62d75b3ef78b827650302075f967" Size="678" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1701749" />
+    <Blob Hash="037935254beb62d75b3ef78b827650302075f967" Size="678" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1910930" />
     <Blob Hash="037e4c67c39d62a599287f2365788393ddf476e4" Size="96330" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1535491" />
     <Blob Hash="03801d01649c76ff92e3cf9b26b779b4f306977b" Size="842" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="2094097" />
-    <Blob Hash="0380a8dcc522512cd725ae2508c080524df1cadc" Size="761" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1429001" />
+    <Blob Hash="0380a8dcc522512cd725ae2508c080524df1cadc" Size="761" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1878054" />
     <Blob Hash="03829c6fbe18da520cdc497aa5046a108de86be4" Size="4870" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="636519" />
     <Blob Hash="038430fd04b82bd2584748bc0aa41687a2eab1f9" Size="33922" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="231208" />
+    <Blob Hash="0384898869a74d11175fdf040ec1bdc0e7e0be48" Size="51293112" PackHash="897a7552e0022da017cb90d0b681212266fc0cfc" PackOffset="8" />
     <Blob Hash="038499849e9b912a2bd5a93611d28f2af908d69a" Size="446464" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="1239560" />
     <Blob Hash="03863e5d7a41cdfb0c34d01aa81033056c08e4f0" Size="34244" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1997660" />
     <Blob Hash="038989915f32db838f797349d1be6f1ea0f6a696" Size="1843" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2094735" />
@@ -39482,9 +39379,10 @@
     <Blob Hash="03a2d5b5b4bd3bff6fc9356fcfea1be90c7897ff" Size="3354624" PackHash="4e3319c6def38fc3572ee0ebb3794b12c2ff5081" PackOffset="8" />
     <Blob Hash="03a84f9bfd498e19b207886a73d9c8c1e9e09f68" Size="344" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2078560" />
     <Blob Hash="03b017a2de26ccd2c80850a612aff6a958423c44" Size="10776" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="8" />
-    <Blob Hash="03b33245f5bdc903172921e73b87d832b11443f4" Size="5657" PackHash="a1ae4592cfa3c36b6209520e0665ffa9280d2635" PackOffset="2090576" />
+    <Blob Hash="03b33245f5bdc903172921e73b87d832b11443f4" Size="5657" PackHash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" PackOffset="2090808" />
     <Blob Hash="03b4e21f5c17207d376bc587dfc436e38fd57282" Size="4332" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="707969" />
     <Blob Hash="03b65b7b27c59f364bcdf6c8f8e7a32fecfd6cf0" Size="1781" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1819585" />
+    <Blob Hash="03b82f3af31f61a72f735bf08f71c65e2a20d3dc" Size="2159436" PackHash="28a417dc98d4b75631b9b2dda598d9fdecd9ff16" PackOffset="8" />
     <Blob Hash="03c358c45c3f5b15592dfb1603bf4037cda17cf8" Size="11032" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="453868" />
     <Blob Hash="03c4632a7a70172a6731d7496f91cf5fa32d7411" Size="7966" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="2011988" />
     <Blob Hash="03c5762fc759d8f261b6396cd1a0cb4dc8adc69f" Size="39500" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1855848" />
@@ -39492,19 +39390,17 @@
     <Blob Hash="03c91eecf7aa635d0335d9a2e5a173f44cd3bfde" Size="8472" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="434950" />
     <Blob Hash="03cad62e4a0c36615bc511f1b09c8e8f8970bd66" Size="2871" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="814791" />
     <Blob Hash="03ce96a3b3ebfc16c9ed192dd2127fb265a7ed49" Size="196" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="628511" />
-    <Blob Hash="03d9865a482298731f1b600016b1a01a927ed2fd" Size="10767" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1888465" />
+    <Blob Hash="03d9865a482298731f1b600016b1a01a927ed2fd" Size="10767" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1958681" />
     <Blob Hash="03de5c202ca429eb6b3f6b7278f03e7fcd302165" Size="211" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1233962" />
-    <Blob Hash="03e24557c7fef0d44192e3d0c3b37c55d33fface" Size="6581704" PackHash="d1013afa1c5e53875c4b7b7de8385e976711af23" PackOffset="8" />
     <Blob Hash="03e5bfd0bfc0b43e871e148b8814f6171ac6880d" Size="194" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="218199" />
     <Blob Hash="03e6ab688a064ecd3f6fc42e5c5201a3b04f1c2a" Size="6898" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1983794" />
     <Blob Hash="03e85498f5b124c37bc89ea5f5b0a05dae0b2620" Size="269" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="370549" />
     <Blob Hash="03edf4683a326a69f5c44d20ded5a48139ee3a48" Size="3321" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="380393" />
     <Blob Hash="03ef5b2f279e3e3623acf7ce79ac73bede23f277" Size="2962" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="763697" />
-    <Blob Hash="03f1655a4834008b211af46b7de910d02295b5f5" Size="52393" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="2006617" />
+    <Blob Hash="03f1655a4834008b211af46b7de910d02295b5f5" Size="52393" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="1825552" />
     <Blob Hash="03f2b5b848a51ee52980bf8595c559b89865de07" Size="18624" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="2016680" />
     <Blob Hash="03f3b1de3cd46ca9945258953b37e5db2061213f" Size="175304" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="1873395" />
     <Blob Hash="03f598cfc9aede2f588339b439b2361f2ebde34f" Size="251" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1662125" />
-    <Blob Hash="03f735d4979f3656837b39b4fe7844c7adeaa2db" Size="7319512" PackHash="8104cdbe10e35400d4bb0aa7905a07c2996eb727" PackOffset="8" />
     <Blob Hash="03f8243d227fb8a48ac0e084f4833bd0cc515cf1" Size="64" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="926802" />
     <Blob Hash="03f8b4151f412011efb6acc6c21a02316f8349ff" Size="16896" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="2053640" />
     <Blob Hash="0407311da0cb676e100cc4e29c24930364f3b33e" Size="402000" PackHash="d9bf4d84f582f3576f96983c74e250001676d51f" PackOffset="732116" />
@@ -39536,8 +39432,6 @@
     <Blob Hash="0446f49f25a1bc2d4e76ab67f84ae9eada180649" Size="4240" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1970305" />
     <Blob Hash="044d3b3fe966c75be8147a6f92e840313f7ec3cb" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2051252" />
     <Blob Hash="044e240fff9623f62d59c5977e97ae0d29a0f6bd" Size="449" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="2085770" />
-    <Blob Hash="044f429569380bf0a373412a9267bf059b5f9c6d" Size="67114" PackHash="2b07bf25fb2698584c163bbdbe0e9fc6c6870f49" PackOffset="2012946" />
-    <Blob Hash="0453cbdbff5e57db5adfbfc6c9959831dbfeba23" Size="6187980" PackHash="99ebbab482f97864318c1bb7ef98fb030e998a8f" PackOffset="8" />
     <Blob Hash="04577788148d0955d9e4714142a3f25f714dac90" Size="2802" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="728957" />
     <Blob Hash="0462971118790037b04e7a5dc90d1d4ddeaaa992" Size="25623" PackHash="6028c6247770e169982f50ed839356448f3d93f5" PackOffset="2020363" />
     <Blob Hash="046460719ab42170513bc18ba4b20dde27129fa1" Size="100738" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1947794" />
@@ -39552,12 +39446,11 @@
     <Blob Hash="0476888577d919aa3c5f2099a70fabbc0b80d36d" Size="29726" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="8" />
     <Blob Hash="047b1c9af7e6689258e5e02d4a0bb0678c0b9a39" Size="1692" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1251454" />
     <Blob Hash="047f4d84958cd8f7cd62df7dcc715ca0a726e478" Size="2064" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1853644" />
-    <Blob Hash="04870ce397f44747c14d058fd63282b7ead5d6d5" Size="328" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2064570" />
+    <Blob Hash="04870ce397f44747c14d058fd63282b7ead5d6d5" Size="328" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2084578" />
     <Blob Hash="048af97a3265123877e35c36592e81f1ba17eed2" Size="6143" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="2081450" />
     <Blob Hash="048bffdbabedbb0f01eefc7d52e0a41c93352382" Size="150867" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="103666" />
     <Blob Hash="048d9502ed4b7a91fb6a0ce42a4834d7037723c5" Size="343" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1146525" />
     <Blob Hash="048da26f23e98f1e9a7306ac7f2e62650d851a9b" Size="76729" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="1369947" />
-    <Blob Hash="048e1add1240e1b233f6c3a558db6c4b008d664a" Size="1297476" PackHash="31dd9591243d030e4aa920c6b1711cd82672e2af" PackOffset="8" />
     <Blob Hash="048fd00e941d0d82f5fb4d0c10eea8b32111347f" Size="943" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="580101" />
     <Blob Hash="0491772b63cc0f184b710886d1c7de00e34bec46" Size="3297" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="912876" />
     <Blob Hash="049914aec94f8d3cda54216a3a88f96c9833c0c7" Size="163226" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1396457" />
@@ -39565,11 +39458,12 @@
     <Blob Hash="04a113a64abc544cf268fd13cce42ba9b904a8e8" Size="3383" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="692815" />
     <Blob Hash="04a1a92d55facbf86a5a72015001c4ecdbb29a87" Size="50555" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1681099" />
     <Blob Hash="04a24dc4a3c2a0d7c9c8e0001e320662778a78bf" Size="6843" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1278530" />
-    <Blob Hash="04abbddc21bc33b5debc65b7b4489cd9a8ebf36c" Size="1588454" PackHash="21700ddc7d4239d542aa1f75c38315a9fdd9f2a4" PackOffset="8" />
+    <Blob Hash="04ab36c28e7f9498ac67696575e83b816d8500aa" Size="3843840" PackHash="f4e47ebe5ee91fe66b10d35e7ce8d5a2793238a3" PackOffset="8" />
     <Blob Hash="04b08508df8ee0b0da9a534e3b9c25e3df4a4809" Size="184" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1403420" />
     <Blob Hash="04b39409ae414fd94c7fe89f4c0ea9bebb2d336b" Size="201030" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="786803" />
     <Blob Hash="04b7864f63dce8bfb25b38164993a1c2b320f42d" Size="38922" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1654832" />
     <Blob Hash="04bc3368307eaa49623dd36cdadea13039838743" Size="19237" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="515711" />
+    <Blob Hash="04bf63c398aad9fa56958a36c724f65039239c33" Size="26390664" PackHash="48ab102a2ee4ad6a0c69db1f545b88e4d8121f9d" PackOffset="8" />
     <Blob Hash="04bf81813ae934a466374595c5c12dbb2ef55bba" Size="588" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="26402" />
     <Blob Hash="04c3bf56d87a0828935bd6b4aee859995f321693" Size="44432" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="2017491" />
     <Blob Hash="04c739164442bb47beec891b5ee1a8840e5949cb" Size="4299" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="2068511" />
@@ -39591,8 +39485,8 @@
     <Blob Hash="04e88a104b571c8c65a92dc0951d191d899ffe42" Size="7782" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2000212" />
     <Blob Hash="04e8c3d0f5f74e3bda22635e1c3fa60d524ce8e8" Size="224532" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="1005452" />
     <Blob Hash="04eb89a7168eeb1ee1e70a43d6b2ced59517996f" Size="71768" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="1756182" />
-    <Blob Hash="04ec368cb5bba867d24dac9d52f82d0d68cbc24c" Size="3404" PackHash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" PackOffset="2089348" />
     <Blob Hash="04ec9d54bbbca976f91aa80261e6aec9a246283e" Size="8761490" PackHash="149f4809e544a467503b66fcd4c9a8e80a53c021" PackOffset="8" />
+    <Blob Hash="04ecbbd0224b62ec68b141551b8c48d85a2e7d69" Size="5280206" PackHash="1dc7e628016bed533e465b759ad5f17b3261d991" PackOffset="8" />
     <Blob Hash="04ecc416ab5d3c3558e185bd2919e9687d60b2c6" Size="177503" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="324448" />
     <Blob Hash="04f199f3d623bca1b8e158a13a5f074f1df7f622" Size="5443" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1294908" />
     <Blob Hash="04f1b3ad3aebee3c5730cf643bbeefee9176da6d" Size="451148" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="573908" />
@@ -39600,9 +39494,11 @@
     <Blob Hash="04f631d20b24a50ffb3c207355233573e199df05" Size="26346" PackHash="c52ad5d5dc97d3425d95ae17988831ac9410b438" PackOffset="2064890" />
     <Blob Hash="04f96f778c4a7084b10b59cfb0bb6341667c8a3c" Size="35442" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="506077" />
     <Blob Hash="04fa3deff8d627540c6a8938a623423055bb200f" Size="7964" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="63527" />
+    <Blob Hash="04fdacdc71054684b1248260b645ed8e49a8cc85" Size="267776" PackHash="0a5f18beec683918579defc535c5cd097d71f4e6" PackOffset="1825140" />
     <Blob Hash="04febccfd611c1904006ccb29bac1146d9de9bbc" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2077920" />
     <Blob Hash="04ff9d58e532c8e75bf30eda54aa948b694567f2" Size="6802797" PackHash="236853b6c6758929b568b6c55706094e24b4cb25" PackOffset="8" />
-    <Blob Hash="05060335bb97eafc96ed492b9b281de02b1696c3" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549187" />
+    <Blob Hash="050550836ae974552f352b1a49497b95676cea5f" Size="494790" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="1542036" />
+    <Blob Hash="05060335bb97eafc96ed492b9b281de02b1696c3" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668465" />
     <Blob Hash="0508beadc3acc18caa8824934bdd95f5caabd19f" Size="6787" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="104352" />
     <Blob Hash="0508da658ecb2fbf1b2561e95963e68db3a4f79e" Size="1601" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1837844" />
     <Blob Hash="0509e80afb379d16560e9e47bdd7d888bebdebc6" Size="61" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2093115" />
@@ -39610,7 +39506,7 @@
     <Blob Hash="050c8d79bb10d47f0c82230f4065e80e7ee9fda3" Size="310" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2094876" />
     <Blob Hash="050c97418bb205c92165b2f67c9d06d0e7320b08" Size="5515" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="240190" />
     <Blob Hash="050cd6b8702fb00584f450410dbc84eec4eeefd3" Size="42840" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1833610" />
-    <Blob Hash="050eb2b0f7c444f6d46a3240e2f0341299831d3f" Size="626" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1408998" />
+    <Blob Hash="050eb2b0f7c444f6d46a3240e2f0341299831d3f" Size="626" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1527947" />
     <Blob Hash="050eb4a95775ed4f89a73b3b15aff5c1c1715347" Size="1092" PackHash="4c90070f3985d7708ef21790aa75b3597f50e984" PackOffset="2094773" />
     <Blob Hash="05110b27b69414144e96ede6f198964bb75fb317" Size="4865" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1521494" />
     <Blob Hash="0513ceb3c94f666ff21f6edbc66857a876075cc8" Size="14" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096132" />
@@ -39625,34 +39521,34 @@
     <Blob Hash="05352b48e46938077345bc05873620cdc0454749" Size="568" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="2096300" />
     <Blob Hash="0535a6490505971f4dbd4655ba78619a2065f9fa" Size="6713" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2003221" />
     <Blob Hash="0537570861d1b2bac0920473eb91d51de4bf1543" Size="29423" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="195266" />
-    <Blob Hash="053829ea18c3433228a11bb69566ecd87a5db415" Size="1558382" PackHash="e76365940d8a76c2ebe7935e866bbe26c5a3ebe7" PackOffset="8" />
     <Blob Hash="053c10d85c61dc8fd3b06be33de75b3031cf0c96" Size="1473" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1658649" />
     <Blob Hash="053c152d46e2a4d41e517a5dc3b7fcaa20865c9d" Size="35611" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="1651317" />
     <Blob Hash="053cc845a63979f35b80bcd64a2623cb5b0a3e41" Size="1440" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2033222" />
     <Blob Hash="053e01567042b883ea2a6d8fda92a806dd5f9acf" Size="5109" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1777086" />
     <Blob Hash="053e73ee8773649effd1c33c2b24bdc721b074c8" Size="18504" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1561132" />
-    <Blob Hash="053e8f014dd68578f2b14accfa5399cd2c8a6fad" Size="90556" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="1977436" />
+    <Blob Hash="053e8f014dd68578f2b14accfa5399cd2c8a6fad" Size="90556" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="8" />
     <Blob Hash="053f58bdd59b75e41b9bec21822c98c758312c60" Size="1208" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="207080" />
     <Blob Hash="0545b9792daea6a2ba86e30073b6549a1e6358b3" Size="378" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="262645" />
-    <Blob Hash="05462bf7b5300793d0147f5ee604c42faa0d793c" Size="2500" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="2089692" />
+    <Blob Hash="05462bf7b5300793d0147f5ee604c42faa0d793c" Size="2500" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2016182" />
     <Blob Hash="0547e5688a029960d6ee782087ba8b855036da40" Size="105580" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="1933168" />
     <Blob Hash="054d0ba7603ac9db777d9e0f93fdf6d100a18ed2" Size="518" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="768075" />
     <Blob Hash="055092a8f04a5833b30ac399bf8f5d8d47468257" Size="2885" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="674628" />
     <Blob Hash="05530dd51f00f1f81190de190d0d2d6ae4073798" Size="44109" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="462804" />
     <Blob Hash="0554cec8d1bcea486361732421bab1b96a0de573" Size="808" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="198673" />
     <Blob Hash="0556411e5f72e05665dcc8f578dd3dd41c55baf2" Size="74877" PackHash="4d7d1e4d2f147c32d57c60683c7aa26c4f9d10cf" PackOffset="879669" />
-    <Blob Hash="05616debdd2239e0a5ac4665a46482b1e544b09f" Size="3750" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1101033" />
+    <Blob Hash="05616debdd2239e0a5ac4665a46482b1e544b09f" Size="3750" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2047049" />
     <Blob Hash="056314f010130bcecd5bfefa7273d142688f6652" Size="1197" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="199481" />
     <Blob Hash="056778bfe795b46b51df9b732baadaa22adadcf1" Size="14976" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1744588" />
     <Blob Hash="0567dc6ef1962028b1b7a647ac918374dab82d38" Size="288768" PackHash="39094453c710536eef32c9e4bc7ae6d6a32fcca6" PackOffset="538149" />
     <Blob Hash="0569725ad240eee089f747aab5fe3fb2107b7eae" Size="7402" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="2000296" />
-    <Blob Hash="056cceae82cac34f9beed10344163e71d7f26275" Size="5623" PackHash="495a03cfec4638fdaa630d336ffc1650693e7422" PackOffset="2090112" />
+    <Blob Hash="056cceae82cac34f9beed10344163e71d7f26275" Size="5623" PackHash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" PackOffset="2090982" />
     <Blob Hash="056cd071d2c8e5f1f10664d31d920e7d2e1fbccb" Size="4429" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="486792" />
     <Blob Hash="057202de44883343c054ea42d137315f2989bd3c" Size="1705" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1662299" />
     <Blob Hash="05724a8e8c771c79944a4e821ce5643bb9bbde4c" Size="244441" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="8" />
     <Blob Hash="0578f26ec2e8476aebcb6dd6a9e790ad269a12f4" Size="1775" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1987498" />
     <Blob Hash="0579edbad744a4ef323e53e1c7c8fd0d572f5080" Size="1780" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1646118" />
     <Blob Hash="057ead133d7e7ec5373122280516e94fffc51cdd" Size="147488" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="8" />
+    <Blob Hash="057f9bca429f8adabbe1d3ab438060d001965e02" Size="2306" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2093752" />
     <Blob Hash="058a6bfb3893e02bdbea21b7059f1b6133ff707f" Size="1160" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="352964" />
     <Blob Hash="058a6f62f5142b5f4f210cc0a5236b8858d569ab" Size="1017344" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="8" />
     <Blob Hash="058cab2835e3ef42676e49255dd122f55a6116d3" Size="29620" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="637416" />
@@ -39674,10 +39570,10 @@
     <Blob Hash="05acf261eae1d5d173c5afe2bbf1ea6721df8b8d" Size="5538" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="117984" />
     <Blob Hash="05af174f714e236b170f1bf19f038d358aeaa43c" Size="43507" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="738198" />
     <Blob Hash="05b22833534b29e67c136831ab2a06d19b092b28" Size="3432" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="2089982" />
-    <Blob Hash="05b3f936562558c7a44dba3fef5a076dcc9f3bd7" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554287" />
+    <Blob Hash="05b3f936562558c7a44dba3fef5a076dcc9f3bd7" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673519" />
     <Blob Hash="05b469218196f0700d77540c7d400f09ae47a764" Size="24064" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="1218886" />
-    <Blob Hash="05b51dda99eadcb83b0cbae473a34b751ed1c4ab" Size="72084" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="1785011" />
-    <Blob Hash="05b5c3871f99cf512d921f9bbc5c9115f0101ea1" Size="21804" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1555253" />
+    <Blob Hash="05b51dda99eadcb83b0cbae473a34b751ed1c4ab" Size="72084" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="1834320" />
+    <Blob Hash="05b5c3871f99cf512d921f9bbc5c9115f0101ea1" Size="21804" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="2018123" />
     <Blob Hash="05b8299f952f780ca0c02ca81624620d13521ffa" Size="2982686" PackHash="c64839804e94445b7c1ac409d5d0f8f1ea36e54c" PackOffset="8" />
     <Blob Hash="05ba083cd0fd485a4e9eb90d2bbd20f3fb215393" Size="1870" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="553009" />
     <Blob Hash="05ba65d22f0d8b40e7ae88aee8e24e46deb8090c" Size="48073" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1813659" />
@@ -39685,10 +39581,10 @@
     <Blob Hash="05bcd0ab20f5f43148a9f14fcc68dc68f3d9b998" Size="4198912" PackHash="ab75e23ed7c490b1ced0b7464d11ebbd6d1e4a59" PackOffset="8" />
     <Blob Hash="05bdb5f04c7e1206ecb53a265ce430fa00060791" Size="58824" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="378758" />
     <Blob Hash="05c164d2f8bb109ab90d62c8b8176191ae077299" Size="18779" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="490808" />
-    <Blob Hash="05c361d9ac96ea8173e95678bc9304ca6577a8bd" Size="2130" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1935270" />
+    <Blob Hash="05c361d9ac96ea8173e95678bc9304ca6577a8bd" Size="2130" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2094871" />
     <Blob Hash="05c4ffb6b9b9ba8a56b7a3187b7d100ab20fe8d5" Size="457512" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="248632" />
     <Blob Hash="05c57acad0ad6e8be75ff2f6fd0ec298c1511ea6" Size="95534" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="1805484" />
-    <Blob Hash="05c86a7249c1587492d5d7f158ea51db6a0450ea" Size="5060" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1910540" />
+    <Blob Hash="05c86a7249c1587492d5d7f158ea51db6a0450ea" Size="5060" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1851719" />
     <Blob Hash="05ca9000e18d645bfb23db9d9311758ea5997209" Size="38278" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="14286" />
     <Blob Hash="05cae62fa96a37b72e688c81cb5514f0578eebbf" Size="9216" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1435510" />
     <Blob Hash="05cd83880f03b018b8ef39d1a08a2bd0f9d2b252" Size="127377" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="1363023" />
@@ -39719,7 +39615,6 @@
     <Blob Hash="05fe343a39f6edd7185bf125d281aa95c7dcbe8e" Size="16997376" PackHash="b756ee46c576668a89e2282d95289e8f29497760" PackOffset="8" />
     <Blob Hash="05fe4cf1748a23653188eb44fee3c1d2e7a7ded5" Size="4901" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="2091426" />
     <Blob Hash="06052307cb8e6a4335254edcf2060a375a8904e1" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="608319" />
-    <Blob Hash="060699a2fa6f8670bfcc301a496d5cd05b069473" Size="2326" PackHash="08af72aefbeb7863aa09c79bcfbabae24cf8f811" PackOffset="2094022" />
     <Blob Hash="060aabb02af29f215a60f00e0afa52526577c07e" Size="6631" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="799892" />
     <Blob Hash="0610ede187e87f53471b86ff5ee50bb5b61ad5d0" Size="220162" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1782099" />
     <Blob Hash="0614bc122f661b3a5709bc2efc587fe71457e02f" Size="52442" PackHash="3eeb2f03152b2114d56a8804fb8d634405321569" PackOffset="2020336" />
@@ -39742,7 +39637,7 @@
     <Blob Hash="06371c681fcbb41c192decc43bbbfb5084ded45c" Size="230" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2096701" />
     <Blob Hash="06390a7f454ebe887872ff1500bdcfee31bec096" Size="3611" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2091623" />
     <Blob Hash="063a5672e53a7f846a660c806206e8767d67f374" Size="1968" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="612340" />
-    <Blob Hash="063da622d97d313ae4b9414f3fc0239f42c8f612" Size="627" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1579365" />
+    <Blob Hash="063da622d97d313ae4b9414f3fc0239f42c8f612" Size="627" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1698597" />
     <Blob Hash="064b486ae7528323edaa8bf85f921d939512ced2" Size="964" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="653859" />
     <Blob Hash="064c5c32bb03b4c8216598696dccd09b95527b45" Size="1128" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1201393" />
     <Blob Hash="064cf6f9bcb0a008ffe3b58c4b1013ab8c649cff" Size="105084" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="247532" />
@@ -39754,14 +39649,14 @@
     <Blob Hash="065d69dfdd7986a8a596b0571b00dee5e37d4c45" Size="2327040" PackHash="cef842a41674f683267c1fdef46348d56abcdf0d" PackOffset="8" />
     <Blob Hash="065e5e07c292708a68c3dccbd7570e37a5fa502b" Size="676" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="248305" />
     <Blob Hash="065eb40e178c1e43503d88960caadc6ca35c4d58" Size="3469" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="569817" />
-    <Blob Hash="06605e7f1980a738adc800e893fe0a6fc6c3eaf7" Size="1566" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1322998" />
+    <Blob Hash="06605e7f1980a738adc800e893fe0a6fc6c3eaf7" Size="1566" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2095463" />
     <Blob Hash="066543a9ba8f0ba86fa31e810ba7af9fc1748768" Size="893" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1857411" />
     <Blob Hash="066546028b9383729088362a854665a2dea05f05" Size="7532" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="258748" />
     <Blob Hash="066a8e31e0f265dd02b3083d1ce24dcfae6eb795" Size="2845" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="793240" />
     <Blob Hash="066b43c28264ba965d288f9952414faf382d821e" Size="3" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2097037" />
     <Blob Hash="06700fb2b1e308ac0a15990408e2a89fd3cfba2c" Size="29696" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1270050" />
     <Blob Hash="0671b435cfdbbb24bdc586af79cb5c6ca9d70a84" Size="100070" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="753855" />
-    <Blob Hash="06768b4016a2ba5bd4c4f9c090a6bf54b66e0e1d" Size="38578" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="2057756" />
+    <Blob Hash="0672364a5b3cd6a1d984644d068ca79cdb60dec2" Size="76437360" PackHash="72d376c84c843790f796bff00a81a2818e70b3d6" PackOffset="8" />
     <Blob Hash="0676bc4e43dd30b45fa83ab044307bbd2df2d189" Size="9450" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="471946" />
     <Blob Hash="0677b61466f0b59c614ddd3a47810053fd33b3a6" Size="31187" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="799785" />
     <Blob Hash="0677fed67c1333a9a74d50642e5214701a57e2af" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2028566" />
@@ -39771,9 +39666,10 @@
     <Blob Hash="067e9b8cd828003749448b32c5e9ead54ef2305b" Size="3562" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="321959" />
     <Blob Hash="068735aa7236d85d2b47a9722fd322cf81ce568f" Size="1944" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2089412" />
     <Blob Hash="068e219a6a189278c973869c63dc01f68f3fea32" Size="11312" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1925884" />
-    <Blob Hash="068f70a987b1bde97d0c0298d1f929194cfdd61e" Size="51206" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="513465" />
+    <Blob Hash="068f70a987b1bde97d0c0298d1f929194cfdd61e" Size="51206" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="1825288" />
     <Blob Hash="0692b49190fbd7b6299be36924b40e56217c756a" Size="12567" PackHash="aaff771bff40e67acec754ff6a73103840091d71" PackOffset="2072610" />
     <Blob Hash="0696fbef8ebcb01c34e236a3118e10bfb37bf6cd" Size="5891" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="636783" />
+    <Blob Hash="06983b4e3c02b941c40c59c59d72967bc199f992" Size="183234292" PackHash="14ed1523b362401fc18a0cc6be0aacba8a3fbf35" PackOffset="8" />
     <Blob Hash="06986857217a1fd2d3ecce155b0dfd57654b591b" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1838898" />
     <Blob Hash="06a323b76358fdd450431316f4e2262c023c3e56" Size="30999" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1901942" />
     <Blob Hash="06a4898135cfbfe90697f522e2e0a5e5a4a2c50a" Size="11617917" PackHash="0b65847315b6c2c97cf1cb6e6d159e22233c8251" PackOffset="8" />
@@ -39786,6 +39682,7 @@
     <Blob Hash="06c4d61c69c1ed911bbc6a7cbff21eadd56846c5" Size="37795" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="7667" />
     <Blob Hash="06c5aaff0897679bda82bf74480d92066b0aa93d" Size="10728" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1720998" />
     <Blob Hash="06c6593058560b6cf71b510badc5e0f0df80a79c" Size="11100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1549460" />
+    <Blob Hash="06cc1f02c003a70d3783ff6db6c4311d23679970" Size="80992" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="1710190" />
     <Blob Hash="06cdce25a90170080171e66f82a0d35e800086e9" Size="1430" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="493725" />
     <Blob Hash="06cf8ca65816644ab228a0e5df3f6ee5744a09d0" Size="85716" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="1854711" />
     <Blob Hash="06d0ec8333c2ddc2e9333c8ca43ef7345c14748c" Size="2370" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="310966" />
@@ -39794,12 +39691,13 @@
     <Blob Hash="06d91fdd8feedc299e40079569372f97a9ac6f04" Size="10353" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1184259" />
     <Blob Hash="06d9637ae89e03d744f1a180c33ee6da020b0b7a" Size="4793" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="762909" />
     <Blob Hash="06da1cf858f8d7aca55ea1f127bf6801ef4fc436" Size="26" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="1317976" />
-    <Blob Hash="06dac5d68cb2e01b207846cfb4f57456ed37f555" Size="808" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1434582" />
+    <Blob Hash="06dac5d68cb2e01b207846cfb4f57456ed37f555" Size="808" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1883635" />
     <Blob Hash="06dee30dfc3f3043d5663857630c4edb6b26f834" Size="2959" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="387200" />
+    <Blob Hash="06e025387999727ae8bd92c388aae533bd595e2b" Size="7308976" PackHash="c72235b763392aba5b1a7915129d2fb9f13a5f63" PackOffset="8" />
     <Blob Hash="06e2fed0a3bdf62f3d390a4054b6a2d7c1863dd3" Size="8410" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1669436" />
     <Blob Hash="06e4235ef8979364f67bb91a0e552ec72f76afaa" Size="1698" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="2095298" />
     <Blob Hash="06e4acce1bb6870ad44c44e8e0c41d106e3bc205" Size="1097402" PackHash="eae9d7f0c647ab3277c5345bdbb0b69c19d0c6bf" PackOffset="8" />
-    <Blob Hash="06e674ef2dc45d0b862ac285859b43a5304adb03" Size="54" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1826805" />
+    <Blob Hash="06e674ef2dc45d0b862ac285859b43a5304adb03" Size="54" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2097010" />
     <Blob Hash="06e7196cf1dcf4ea70a28405866306b875cc3c6b" Size="1057" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="610059" />
     <Blob Hash="06eb650443396f775fcdfb53bb0eeedafa19c737" Size="12228" PackHash="ddad05592e192eebafd8842ac556d92572eef1aa" PackOffset="2008768" />
     <Blob Hash="06edf04051f8a876018170df5b885e2b3a1ae136" Size="3140" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="91747" />
@@ -39808,7 +39706,6 @@
     <Blob Hash="06f2892897a59015ecc8d46287c55f012e659df3" Size="32" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="2097105" />
     <Blob Hash="06f3209716fa5eda4d73f884e111235f8e64694a" Size="961" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="289653" />
     <Blob Hash="06f6a185b673b02c201a5ff5353babb4416a2f15" Size="182" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1401204" />
-    <Blob Hash="06fa780ee959a7f3df92075548f3df41f60bad6f" Size="60517" PackHash="c483f02f330e734086b012df57c4ed8ab1dd6ed5" PackOffset="8" />
     <Blob Hash="06fe662fecfa41d11f59d939a57a3512f2aa247c" Size="2301" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1185045" />
     <Blob Hash="070549ed1ba2fd4157743859fa92e0a3e92234b9" Size="85686" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1454822" />
     <Blob Hash="07078d31849d7c6f1a29d35befeccbb1c366f549" Size="3075" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1764654" />
@@ -39817,6 +39714,7 @@
     <Blob Hash="0709ecbd91c2c3932b6d60ea62afbddaa7fce2e6" Size="6342" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="339715" />
     <Blob Hash="070a6fd2d50e89b412dc01b55d0502ae54e6dec8" Size="8445378" PackHash="c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b" PackOffset="8" />
     <Blob Hash="070b6b52d44fbffb726c223cc4b881453d97edc8" Size="186" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1232696" />
+    <Blob Hash="070f49b5770a36598c2c9b45f02673761b9115fd" Size="45070" PackHash="158cdadc204fb774e3ce74edc80832a66cd38867" PackOffset="2039654" />
     <Blob Hash="070fb0fb4ecd4be496df2c737e9f46eac5b42628" Size="257392" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="345103" />
     <Blob Hash="070fb8aad21d5002dd3c4b92ce57d08ac2272d2b" Size="2828866" PackHash="3e4e7c8ee5cc1a36ab2ceb1c5a4d37d013145048" PackOffset="8" />
     <Blob Hash="0710230327545456e0810de5739bacf8bc382374" Size="278" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="402133" />
@@ -39828,12 +39726,12 @@
     <Blob Hash="071e6218cdf412dd60bfba57d2709c28f4df48bd" Size="4576" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1456998" />
     <Blob Hash="0720a5e14b36deac210122632ef7626fdf4bd8d3" Size="37852" PackHash="a223063132a00fd7e9af3c58ba28d6ba14fc65b8" PackOffset="2011656" />
     <Blob Hash="0722192fc8c8dc6882df3c8d3fbda532a5d0a310" Size="678" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2095965" />
-    <Blob Hash="0724c41890a037d16eff9a4b2816b668f2c045ef" Size="54" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2097103" />
+    <Blob Hash="0724c41890a037d16eff9a4b2816b668f2c045ef" Size="54" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2097075" />
     <Blob Hash="07270b2bcd4fdf63bf48c912240462ef96435e79" Size="2985" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="924151" />
     <Blob Hash="072cd01b845dca8b12bd8becdea7418cd9b899a0" Size="128" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2089872" />
     <Blob Hash="072d2cd301fc9a90e5ef6123a9fed395f4bab7d1" Size="203" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="349564" />
     <Blob Hash="07314577e3bc7b73873c25aa7032269b41f64eb8" Size="1471" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="983898" />
-    <Blob Hash="07329962fd18b5c55ab555de86a1bd055eff3bde" Size="59" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1618984" />
+    <Blob Hash="07329962fd18b5c55ab555de86a1bd055eff3bde" Size="59" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1738216" />
     <Blob Hash="0732a39a965ac149b110446e741014d87f9065f3" Size="537153" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="8" />
     <Blob Hash="0736b8a537bae290ba7dfe38ff63063dc81ed6cb" Size="7763984" PackHash="e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8" PackOffset="8" />
     <Blob Hash="073a1e8911b938f3926a6e9a5b8cc87d290ef4e8" Size="132" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="443367" />
@@ -39852,10 +39750,10 @@
     <Blob Hash="0756a7a4b1da748df9ad39d356e20ad97fcd5669" Size="37270" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="100993" />
     <Blob Hash="0757950bf45ab73f016c0bd72e82caa827611b59" Size="302" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1406295" />
     <Blob Hash="0757b0bd981c5847aca1aff5f0abda96afe8ca2d" Size="893940" PackHash="6a62a64a9601d1028e98c3f9d8d1ce2dbb93b1e9" PackOffset="8" />
-    <Blob Hash="0757ca80377118b73e643b4e9b3ec772da79eed9" Size="4742" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1294000" />
+    <Blob Hash="0757ca80377118b73e643b4e9b3ec772da79eed9" Size="4742" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2075618" />
     <Blob Hash="075c0616c14130301b407c35f5c75175331be97e" Size="17964" PackHash="44a7a3545294cce6ffdb1ccec3cafef699066c12" PackOffset="13868" />
     <Blob Hash="075ca125f8af6a4906cb41951e4c1d9bf6ab5add" Size="17293" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="719404" />
-    <Blob Hash="075e58a9825fa3daa1601e451353afd1c0715534" Size="1026" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1305876" />
+    <Blob Hash="075e58a9825fa3daa1601e451353afd1c0715534" Size="1026" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1754778" />
     <Blob Hash="0760c0e0ed374a408e0598e3fe134f9ac5f329bc" Size="3768" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1934680" />
     <Blob Hash="0762332429b50c140f8f5732a1a19b749f6c6a01" Size="5260" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="396176" />
     <Blob Hash="07639c8957393e62bb1e7067741ced25a0d0e973" Size="8352" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1877124" />
@@ -39868,20 +39766,21 @@
     <Blob Hash="07734f3fb14381b3d41835fe3cd605328619ac2e" Size="73280" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="436203" />
     <Blob Hash="0774cd9a4122ab99e6e936ad437e3ce0ccad8ec0" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2083744" />
     <Blob Hash="0776bbe7fd68bfea3ecea5092a899f8b48994a07" Size="12390" PackHash="facdac3a6fac0054fca28cc5b11b8b443ad627a1" PackOffset="11962" />
-    <Blob Hash="0777322213811368f4328ff984277e2af3122d96" Size="8149" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2062392" />
+    <Blob Hash="0777322213811368f4328ff984277e2af3122d96" Size="8149" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="44514" />
     <Blob Hash="077f4d994307c6893623b05e20ed8b1a0ec7ca8a" Size="1264" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1076724" />
     <Blob Hash="07800ddff4b22deb1c589acaf9a6292122365320" Size="342" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="2096334" />
     <Blob Hash="078052de9cf998dafd5e9eb74cea18bd51e9242c" Size="15076" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="44824" />
     <Blob Hash="078079bba92893f725cc51d37d4bdb680f1249d2" Size="100" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="75173" />
     <Blob Hash="0780d6fc8eb463d7bda6af5f0c472fc3d331b075" Size="48141" PackHash="4f65d69acee548a54f8329d2457356d425bee4a7" PackOffset="2031422" />
-    <Blob Hash="07858a694bd50da63cce331b0002adac37015e6e" Size="1149" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1727664" />
+    <Blob Hash="07858a694bd50da63cce331b0002adac37015e6e" Size="1149" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1961404" />
     <Blob Hash="07863f6a57d0f9daa66e68927c682344b1f6f4cd" Size="2623788" PackHash="bea2292084151c031f25bad15c8a704cdf80688a" PackOffset="8" />
     <Blob Hash="078939078fba0e34470538c58aa38073b2372eb8" Size="279" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="2096702" />
     <Blob Hash="078a931bac66065eb0ddea6739459b8008736f4e" Size="19467642" PackHash="ab9ab23f53c65699955f61bab401e7f62ff9f839" PackOffset="8" />
     <Blob Hash="078fce532f2ce2f4327423159aa85e55d9029d5f" Size="4470" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="83516" />
     <Blob Hash="07943fa0b77cb6e111844ebd472c50f01c0069a6" Size="394" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1459850" />
-    <Blob Hash="0796cba05b52ee647ea66c72723dd67b31957064" Size="4125" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1108085" />
+    <Blob Hash="0796cba05b52ee647ea66c72723dd67b31957064" Size="4125" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1878029" />
     <Blob Hash="0798e2b71762a113220cc7f7693c0937a0e1b2f1" Size="184" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="252056" />
+    <Blob Hash="079b1fe86f8cbd662c371541ca5c29a6967786f6" Size="515668" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1183464" />
     <Blob Hash="079be8569c417faa70ce2334c82de409b09f047d" Size="12180" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1175304" />
     <Blob Hash="079d8e3b388d441d8d27ea0efd281eb3bf9554e7" Size="1057" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="308021" />
     <Blob Hash="079e6c6490458353d0eb8a57504cedcb3bc804ec" Size="4860" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="619784" />
@@ -39895,7 +39794,6 @@
     <Blob Hash="07bcaf8e61de583c6bbf794ed55531bd946630e1" Size="28640" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1865190" />
     <Blob Hash="07be252d8712eb587df921e3df3fc3bc3fc2ce98" Size="5536" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2081153" />
     <Blob Hash="07be3535033ab35ab08c8a98151362937268fd0d" Size="265" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2078682" />
-    <Blob Hash="07c03ff79e2feca4c61af4e2c562efac7b996be4" Size="1417872" PackHash="fb276d1bd30c33019a2a41af75e8a82e43b80637" PackOffset="8" />
     <Blob Hash="07c0ffac59cf320d3826fc030ff6f80bea9156fa" Size="8664" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1810768" />
     <Blob Hash="07c2c76902bcf9a385ee2aa7096dd5eac223f7a3" Size="658659" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="786496" />
     <Blob Hash="07c445885dc9c12a36bdf7bac28b87063b7060f7" Size="4554" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="777885" />
@@ -39933,6 +39831,7 @@
     <Blob Hash="08124a9e6f17dd3f4059f69599900ff8832faab7" Size="104329" PackHash="03d2b700b5ea970da10b691861e3cbc3ffb3ee29" PackOffset="797006" />
     <Blob Hash="0812ba1d59532b8cbf6aaaf8bcc4a62393b1af44" Size="3089" PackHash="faa641df952d93274d1774a37ecd0e58a425c5a1" PackOffset="2091426" />
     <Blob Hash="081568f894fc77dc0f0b3da7db3296f3f3639fd3" Size="316" PackHash="bf53b8893ad6da3a5972310cd4ae83e37c57310d" PackOffset="2096742" />
+    <Blob Hash="08158e85c65cf563a67d95dd7e0f4a4a4448dc6f" Size="856146" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="1156800" />
     <Blob Hash="08170b8d24fdd737bb2a937999be8464f11b75bc" Size="3280" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1928592" />
     <Blob Hash="08175001b989eb60ddb950aa5f34b6b0596ba075" Size="183" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="407752" />
     <Blob Hash="0818a3b2235af22571ff61fd81717e4a9a74b9a9" Size="14577" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="856812" />
@@ -39944,14 +39843,16 @@
     <Blob Hash="082c47b934c3e2d2661419b09bd83f1f0a4ed77e" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1161870" />
     <Blob Hash="082cbd1f534d652b5dc829b2cfa5224e88a35c41" Size="7655" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2070358" />
     <Blob Hash="082ecbd88a2718bb3353381fcf7607f16cc1ce4c" Size="13313" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="873203" />
-    <Blob Hash="083712f281dab7e1348e2f2cb940ee141296b935" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548742" />
+    <Blob Hash="083712f281dab7e1348e2f2cb940ee141296b935" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667973" />
     <Blob Hash="0837361ca5e6b165c1c6249b82e15e21aeb41fca" Size="1380" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1368980" />
+    <Blob Hash="0838e639394a5c8efc8b8c05098b82eb89261d63" Size="2400055" PackHash="efa3ad383e6fff1ee04226f5902ca9da4f433f37" PackOffset="8" />
     <Blob Hash="083966f31b869a289147739c43b9ebb8d7a903b4" Size="103936" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="1288200" />
     <Blob Hash="0839b5cc2dfebdcbbb6d13082a5114dc2f7a21e4" Size="21501" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="757456" />
     <Blob Hash="083a5789562cbe8a62f3a262f70fea8789c76f6a" Size="593" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2039731" />
-    <Blob Hash="084d88b7908d87267b2758c9f20d0835942f30a2" Size="3442" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1927077" />
+    <Blob Hash="084d88b7908d87267b2758c9f20d0835942f30a2" Size="3442" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2091248" />
     <Blob Hash="084f6e38f2f3d7774748bfae82cb020e90dbdaa6" Size="1237" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1324552" />
-    <Blob Hash="085315fff5071d998b4dbd03be71f3aa13792fd7" Size="660" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2031313" />
+    <Blob Hash="085315fff5071d998b4dbd03be71f3aa13792fd7" Size="660" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1921524" />
+    <Blob Hash="085532cf421d441547e95939961c4cc90483613f" Size="2065936" PackHash="f2222f469d6fd56f096ce2e7e5bc8835f6809f5b" PackOffset="8" />
     <Blob Hash="0855b3d69a9fd6d3ed283e83c75c471841b41b9e" Size="2732" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1596002" />
     <Blob Hash="08578c7cb3c25a242dc3c46b9dd36ded9c067063" Size="4337718" PackHash="4a2c3f44a84a2cd7b8dceb45c3082d11299543af" PackOffset="8" />
     <Blob Hash="0857b5236b866d23dae7aed70412683129b29dab" Size="3878" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1716831" />
@@ -39978,13 +39879,13 @@
     <Blob Hash="0881369e263cea8af8b742a240307f3ccdf088fa" Size="3596" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="229476" />
     <Blob Hash="088186863145b544eca03449fc7a061010cfcf4f" Size="18637" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="639119" />
     <Blob Hash="0881fefdcbfb343e71b022b571db864298d914db" Size="132" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="443088" />
+    <Blob Hash="088384cf906d6ce0a9f55a5348f3cf802b0b1dcd" Size="1640952" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="8" />
     <Blob Hash="08842ff1adf17a558d11c06376d23b9227767047" Size="100275" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1150920" />
     <Blob Hash="088c27fe4f15eb8de7152d09906710e7ec78930b" Size="38230" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="948847" />
     <Blob Hash="088d4f571f50863e136fd1f045b8cf182920778c" Size="16424" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1738801" />
     <Blob Hash="089079f2ff671b0ed0d345bb90923716346f8f79" Size="193735" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="8" />
     <Blob Hash="0890c182f9a1815724cb231c6191bde29d61c7fa" Size="2656" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1850284" />
     <Blob Hash="0893bf4e9e1050cc6ee891cfa95fec2545490449" Size="3434" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1844751" />
-    <Blob Hash="089665839d10189e3b2c59e20b419adb3c435082" Size="5403" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1908462" />
     <Blob Hash="089842c08b59ba384f69fd4f4ab830f4850e843b" Size="1700" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2081468" />
     <Blob Hash="08988e48ab9f3adc1f7a538f2be8a1642c2328f8" Size="17149" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1769456" />
     <Blob Hash="089c78a9528f8fcf8b0a8d283ffc96550be7f1ef" Size="4963" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="269436" />
@@ -39993,9 +39894,9 @@
     <Blob Hash="08a5a4bc54e3b1346e5ac0eb6d90cf51daf07c88" Size="159256" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="1784498" />
     <Blob Hash="08a90605af4fe865dcbe967112ac567c52efc558" Size="131584" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1721208" />
     <Blob Hash="08a997b7e86c69129c91d02f76456e092513f752" Size="854" PackHash="60fb5701eed18af817e516eab0fbf9f94fd39be0" PackOffset="2095910" />
-    <Blob Hash="08a9d366f5f4d30609bbadf7508898b0c97edd3b" Size="3695" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1056264" />
+    <Blob Hash="08a9d366f5f4d30609bbadf7508898b0c97edd3b" Size="3695" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1996998" />
     <Blob Hash="08abf3d2f8c7a4b704334901178fcc5083e669bc" Size="4554" PackHash="09a4bae3cf3add2e8bada69dabfacec664d677bd" PackOffset="2076667" />
-    <Blob Hash="08afa1b9af41aef2f2e4b8d5a8b926aa055a153b" Size="1167" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="981936" />
+    <Blob Hash="08afa1b9af41aef2f2e4b8d5a8b926aa055a153b" Size="1167" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2028818" />
     <Blob Hash="08afd40f9c10ed622ec4f9843114967be54bea28" Size="2949772" PackHash="2e5c63bcccfed8efe826b868119dca0a2383755f" PackOffset="8" />
     <Blob Hash="08b11474822e670deab8f0ea168baed7d5e3dbe1" Size="163" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="203799" />
     <Blob Hash="08b36378b46dab2a57c939ec4b50e5923571f21f" Size="3291" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="546095" />
@@ -40022,9 +39923,8 @@
     <Blob Hash="08d711e84d4ca86eaf097cbbd6e576fa578ee467" Size="5715" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1949562" />
     <Blob Hash="08dfba435cb5576b6c7155c0c28a6d867c78c77d" Size="3643" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2041663" />
     <Blob Hash="08e0418fb944e29ebe72fa363d7db06b3595a5a8" Size="31516" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1751009" />
-    <Blob Hash="08e516909ebf2d3aedb8ce8636d36ce221e2ab84" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550385" />
+    <Blob Hash="08e516909ebf2d3aedb8ce8636d36ce221e2ab84" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669617" />
     <Blob Hash="08e76e72d9e621a57b667f4b9b5cf09b0bc8f571" Size="1110" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="964374" />
-    <Blob Hash="08e8cc9ce8e5a793e64116f6c72d964529dea6cb" Size="41248" PackHash="d9cd996ea5042b0d08c555ef2559111b5494e3a1" PackOffset="2042422" />
     <Blob Hash="08ebc18a3bcb24496e3fd836493ad10c9c80bdb1" Size="690954" PackHash="e2d7166acd41c0c247e9b29409121222eeaf4c7e" PackOffset="1359443" />
     <Blob Hash="08ebf0afddeec30c36b4740a68ac6cfa45e27807" Size="3333" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1602176" />
     <Blob Hash="08ecd541b76f5aff80b7307269381ea7a8e95fbf" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="860260" />
@@ -40041,30 +39941,30 @@
     <Blob Hash="0900492cd376686238742c704cd9b68139edb4c4" Size="63522" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1267147" />
     <Blob Hash="0900c3a71012132882ee2bb93e764ac3614c8ad7" Size="798" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2047088" />
     <Blob Hash="0901464007bdd0367a2219aeaf6f4001c4bf913d" Size="278" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="60327" />
-    <Blob Hash="0902489e1c981495a4ac820ab3769bf677dd5159" Size="145" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1422520" />
-    <Blob Hash="090388655127e41ecc7f220ccd067ee2324c17e1" Size="7955" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1762050" />
+    <Blob Hash="0902489e1c981495a4ac820ab3769bf677dd5159" Size="145" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1871573" />
+    <Blob Hash="090388655127e41ecc7f220ccd067ee2324c17e1" Size="7955" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1777816" />
     <Blob Hash="09058ac37ebc93d95a44a9f0d68ceec2e9f416c1" Size="387190" PackHash="b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" PackOffset="870764" />
     <Blob Hash="09061f9e5a0440e07b0dec483f3a799b979f490d" Size="131637" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="8" />
-    <Blob Hash="0907db16b7d49cec5134be9a6f9b70b16fdd2acf" Size="260" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1609711" />
+    <Blob Hash="0907db16b7d49cec5134be9a6f9b70b16fdd2acf" Size="260" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1728943" />
     <Blob Hash="09091b6889807fcce25427e4a623b712d2e99628" Size="15360" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1003810" />
     <Blob Hash="090a1d75d700db58ed53276588b31e646805ae94" Size="2967" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1890223" />
-    <Blob Hash="090afd9fe8da8e54f6e7deb128b8a98e1a7d099a" Size="3152" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1638946" />
+    <Blob Hash="090afd9fe8da8e54f6e7deb128b8a98e1a7d099a" Size="3152" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1851055" />
     <Blob Hash="090ca3bea4d12b590eec705ee851c88727cb0160" Size="340" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="395933" />
     <Blob Hash="090d7fa62423df33dd1aca52529424a184690f1b" Size="144" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="481170" />
     <Blob Hash="090dd0e10506020110a9c05c25b3d8697f4c8a43" Size="40" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2097107" />
     <Blob Hash="090ff1107860966f542d1b13fa35c37e6a5691ae" Size="3737" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="6636" />
     <Blob Hash="0910c0e3a28214ddbc47d096bedeb85ebf550bc4" Size="12886" PackHash="5f434ba2d925cd558af2bc1af03b657a443bcdd1" PackOffset="2059254" />
-    <Blob Hash="0912a340f0056a020310677cf7c8d10ba4b300ba" Size="1432888" PackHash="c186e17712d48f5c0290a0dd22d99e6357fe7ecb" PackOffset="8" />
+    <Blob Hash="0912f449d2a6f21d034c7ca4680fdd3e4172df33" Size="1829944" PackHash="5f963ef76a4402af9c0b249886115df21f3833e4" PackOffset="8" />
     <Blob Hash="0918ab638a8b33b9fb258cd30f5100a0751ac2a1" Size="19345408" PackHash="47f84e6135b3befd4159cdb0627ba6d78bd96423" PackOffset="8" />
     <Blob Hash="091b6e52bf4bae4d33c64be86d539af25427ded0" Size="417257" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="846106" />
-    <Blob Hash="091d8a8c4de7be32d9c9bbd4f2ab4009f73d4345" Size="1313" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1972812" />
+    <Blob Hash="091d8a8c4de7be32d9c9bbd4f2ab4009f73d4345" Size="1313" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2081563" />
     <Blob Hash="092bed6184542cb2e2419399adc4c06d6e3319be" Size="374" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="996195" />
     <Blob Hash="092bf524cb19fabe7f2b9dec3a4ddec95e97317a" Size="870" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="499781" />
     <Blob Hash="092c2f237f9b22a35f869d709554fe808ae5b895" Size="12292" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="507943" />
     <Blob Hash="092cb7951e1b0e36c2ed12c0e6062570175d85f9" Size="418686" PackHash="199e5450e36e8e41f08f9a1139e9c747f2e9610c" PackOffset="601429" />
     <Blob Hash="092cf9ea020478adf91d08231ac3080ddf70cc53" Size="4820" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1036580" />
     <Blob Hash="0931bdd810596a16d325bf386080fbc1f31b317f" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2095283" />
-    <Blob Hash="09327f5bcabbdcb85da2868b017e1da69979b52b" Size="1199" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1636753" />
+    <Blob Hash="09327f5bcabbdcb85da2868b017e1da69979b52b" Size="1199" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1848862" />
     <Blob Hash="0933f5b0adfd2fbf349d3769e6475ee533d32a33" Size="44944" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="8" />
     <Blob Hash="0934adbd9ab758a85e33823a025bb820f40cd931" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="258548" />
     <Blob Hash="0936e4adf439bcfbb0335c250a5b471ea2123b13" Size="10213" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1674897" />
@@ -40076,19 +39976,22 @@
     <Blob Hash="09487f92d803cec5e616466c974f4cb9babd3819" Size="153" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="461751" />
     <Blob Hash="0950c8fcbc8c3e0e5d0511b46cda876cf86b5b79" Size="6045" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1242261" />
     <Blob Hash="0950e4cadd562d1675453f4b48037800ab6ff24b" Size="90624" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="1708040" />
+    <Blob Hash="09539065acd68c93f79ab49c73e9358f3d157143" Size="2510" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="2086220" />
     <Blob Hash="0954f7906dd8d7c202debc71c2b91dc946aaff08" Size="3118" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="932226" />
     <Blob Hash="095878dddc4b5e4609798b57cd782eb376f19855" Size="218848" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="457555" />
-    <Blob Hash="0958c74c8b3a94bc9876fded583f38e698c25db5" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553528" />
-    <Blob Hash="09599b5d1faf5c5a70ac2eb262e1d9497fdf8335" Size="1143" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1613961" />
+    <Blob Hash="0958c74c8b3a94bc9876fded583f38e698c25db5" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672760" />
+    <Blob Hash="09599b5d1faf5c5a70ac2eb262e1d9497fdf8335" Size="1143" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1733193" />
     <Blob Hash="095a7edce387c87bcd7b4cb9b810f7315f3f7e7c" Size="3370" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="639318" />
     <Blob Hash="095d3484d4af680e30d9769a029ba2b1c818deee" Size="895" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2089393" />
     <Blob Hash="095ea64bfe47c7958d213fbdf54cd168a30f72d8" Size="3513" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1595699" />
+    <Blob Hash="0960627a1e5fdb07839a9b5acbbead47806f54b1" Size="1586688" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="8" />
     <Blob Hash="0960646417a61e8c31d408ae00b36a1284d0300e" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1043138" />
     <Blob Hash="0961e1481cd4e0e857bb80c87b553f33f313d68f" Size="120056" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1513688" />
     <Blob Hash="0964561882c0195a36c7ad6ffdaed6d5104570f3" Size="16540" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2075612" />
     <Blob Hash="09655baa6ec031e9a3165ec6b09e3f8a3f8bab55" Size="4733" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1860911" />
     <Blob Hash="09657accbf5dde7ed5d3064464e5c3f681de99dd" Size="18944" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1682440" />
     <Blob Hash="0965e5ca1971559bd4aa2f87b35ea65df2061913" Size="1251621" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="669551" />
+    <Blob Hash="0966b7806cd288e678a34e068ed44b881878da38" Size="8514404" PackHash="8adae05a9b0849cbbd4aa9583897eac102d41c4f" PackOffset="8" />
     <Blob Hash="0971e4c099fbc3f1b56fc7610777f500f5f744f6" Size="705" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2084043" />
     <Blob Hash="09725dafbb66a5018bba7c375de14471f37036f2" Size="66" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2096420" />
     <Blob Hash="0975d0930f2fa1f7e51035fe3673c9391f9b4ca2" Size="1888" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="309078" />
@@ -40100,9 +40003,8 @@
     <Blob Hash="097bdb01f5da6de298f79e178fe5720816b5b2e3" Size="4633088" PackHash="1fd7c05041c04a7d51a7854be311d5d20549d840" PackOffset="8" />
     <Blob Hash="097be29ecc0597b6d8ae7a01a50a93087d4691a7" Size="3188" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1453632" />
     <Blob Hash="097d267c46a419e646ddac9077726dca1fd76b29" Size="22656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1945507" />
-    <Blob Hash="097e2061e187bf78d479686b8d937e9a683fd19f" Size="17260854" PackHash="75c28c22834f4cdff4572257a43313d57b889034" PackOffset="8" />
     <Blob Hash="097f569a59d2b42b6ab347bc30a671a965260f0e" Size="253" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2031106" />
-    <Blob Hash="098266166e01db5edc32b222868b369d3510ec7f" Size="113" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095567" />
+    <Blob Hash="098266166e01db5edc32b222868b369d3510ec7f" Size="113" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2096755" />
     <Blob Hash="0983fc01f6631a6077d52798e647651fc27feff4" Size="19070808" PackHash="a05f4a78f552dd58ff03eef4fd64a04c73d9cfa1" PackOffset="8" />
     <Blob Hash="09860da38fc611688c652ed45321ec4fc921a916" Size="6003861" PackHash="faba81626c5f860448c791adbafc7b966d456a2f" PackOffset="8" />
     <Blob Hash="0987d5c58cb5994a4f551fcf7bd8e035c8c257fc" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1100628" />
@@ -40111,10 +40013,11 @@
     <Blob Hash="098dc29a2bc2ae2ac59aefce795797d9a00489d7" Size="3791" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1055465" />
     <Blob Hash="098f08919f49c0de051b171b2dd5f0e21bd33d9e" Size="8816339" PackHash="f7d4e3a2a8bc249ccb2b03cd019f1768f5b1e095" PackOffset="8" />
     <Blob Hash="0990c84e6ddc9bd072c559ed665b8c5cd8aad5aa" Size="264" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1353895" />
-    <Blob Hash="0990fe85caf740177e71e5b70fa70614762d38ae" Size="5068" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="1978082" />
+    <Blob Hash="0990fe85caf740177e71e5b70fa70614762d38ae" Size="5068" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2089602" />
     <Blob Hash="099118f17eecb9fcd4185ed02b7d565f5f2c0661" Size="10752" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1247233" />
     <Blob Hash="0991725b14ecfa25e18af4a65d459c4b815a2ff5" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096916" />
     <Blob Hash="099433d149352298b0dc11ba3f508cd45f349f63" Size="26528" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1771004" />
+    <Blob Hash="0994b23046c94a79868f4c4f6ebf19a9d1d24b38" Size="2168" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1845096" />
     <Blob Hash="0998e107b42a7cc72b4b4106baaed5777e1d8548" Size="68078" PackHash="bc58e4bcfc6ab53fc7bd2ea0e7d1c74c30d1f295" PackOffset="2022732" />
     <Blob Hash="09998a89a2223bcb6fc44fc4f447f959d54826b5" Size="29340" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1119916" />
     <Blob Hash="09a017c7e3107d5f9a618a57a476483e6fa9cd18" Size="2924" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="996831" />
@@ -40140,14 +40043,12 @@
     <Blob Hash="09c0c5c4caa5ba092d2725911a6f8f83487f9072" Size="105984" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="1792008" />
     <Blob Hash="09c5a243e9e12238424ce1b51e4eb6395d5a99dc" Size="2220108" PackHash="cf9fc3a314d8463902b6f242df8deb582ea73f6d" PackOffset="8" />
     <Blob Hash="09c6698fbfcb51f559864186501c55b3d4297693" Size="2670" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="1402144" />
-    <Blob Hash="09d163652be19c853ba565f4639118aa9e2e620f" Size="161656" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="8" />
     <Blob Hash="09d2439d91d4e95098afc9646a35272cf1884752" Size="16092672" PackHash="2299110528ab83abf184bdd40f7f9a41b3e753e2" PackOffset="8" />
     <Blob Hash="09d3a4a979536abd1a2dfb49b6e777012daea2c3" Size="2512" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2093122" />
     <Blob Hash="09d856e8d174e6dbb426cb194b89b4f87af68eb5" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="507424" />
     <Blob Hash="09dc8b810d256ca964b8b9b23b8c1679f9780697" Size="30220" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="626434" />
     <Blob Hash="09dfda4fe4b0833c147d940c51141e2c1d41b3bc" Size="4844200" PackHash="1f44158f21e0e2b85fdf4b056ccdc94e3935927e" PackOffset="8" />
     <Blob Hash="09e4000ce320f779e2dfca2ffd6b9258ffba6ce4" Size="172" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="191171" />
-    <Blob Hash="09e640b915a806d5f3dd9970158f091f02a9c721" Size="3973" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1787195" />
     <Blob Hash="09e701fad1101b9cc198abc1bae727e78a523513" Size="4507" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="709166" />
     <Blob Hash="09ed089fc2c1ab1791af894da2b6094e9cd02410" Size="68078" PackHash="bc58e4bcfc6ab53fc7bd2ea0e7d1c74c30d1f295" PackOffset="1954654" />
     <Blob Hash="09ee152d4af3699d6690b783dd8162dfbc41a013" Size="99045" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="980127" />
@@ -40156,7 +40057,7 @@
     <Blob Hash="09f2c758e04baf1bf7a6c4c7dadf415832d23e9a" Size="71128" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="82013" />
     <Blob Hash="09f2cec837b3dc4a28503b8470fc227551b1e66b" Size="5805" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1976652" />
     <Blob Hash="09f2f3a6c57d5d37e0477fe19ec8f47541aaac1e" Size="1163264" PackHash="9688199a0f65bf7f500e7abc3aa9160ee8df76b0" PackOffset="8" />
-    <Blob Hash="09f3ef7f5cae78a55e68449d373990eb6ae11742" Size="3364" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1063891" />
+    <Blob Hash="09f3ef7f5cae78a55e68449d373990eb6ae11742" Size="3364" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1233925" />
     <Blob Hash="09f4b1051b8c5a1cced6a8fbe9aea26d9cfd8249" Size="37302" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1109034" />
     <Blob Hash="09f54abd12082a218bc8e8ec4a91cb2afaa2f7ee" Size="6214" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1993998" />
     <Blob Hash="09f78576dc80584db27a847ae186c9e61d629d01" Size="12288" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="133640" />
@@ -40177,19 +40078,19 @@
     <Blob Hash="0a16d91fb543fb72a0ffa905e43f8d0cf925c680" Size="28316" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="217560" />
     <Blob Hash="0a1abd2c2e48d1794de163ddcf6bc3fd8e5c7c27" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1958740" />
     <Blob Hash="0a1dde57b42053bab234541550741a10911cd1aa" Size="61716" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="330650" />
-    <Blob Hash="0a1e76cb2cedf5bb2269000934f3e3a9e10c6426" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550982" />
+    <Blob Hash="0a1e76cb2cedf5bb2269000934f3e3a9e10c6426" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670214" />
     <Blob Hash="0a1f3c7a123e6a7c27e218fb7d5e068c78673a1b" Size="116" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1699048" />
     <Blob Hash="0a1f7b9eb1dca37665750ec1090a1150111065ea" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1829596" />
     <Blob Hash="0a22dba518a77f9d0c9b963257da214b74fcc4fb" Size="30787" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1937998" />
     <Blob Hash="0a22e7e34b58ed6876706e6ed7e050da4c96ec8a" Size="3442" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1947447" />
     <Blob Hash="0a257e5cd5af0414b5d82622d035c00506974d0a" Size="277696" PackHash="c9dcd3efa15d86693a0fbc9073cbb3b57a6b7143" PackOffset="1365615" />
-    <Blob Hash="0a25d51364ba9e4de8b3e75804c8de2488904854" Size="89783640" PackHash="13eb117b008bb50733d2545ce9464548e577dd93" PackOffset="8" />
     <Blob Hash="0a2d87c49840aca698ee850a80cd78d842fffd11" Size="129712" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="764197" />
+    <Blob Hash="0a2f1fc15f0f1abc79a2f898645887b79a26b869" Size="6581312" PackHash="a98c63b9a68c05587e2576d8eab01c15b388b3cd" PackOffset="8" />
     <Blob Hash="0a30c6584ae96f006e5c5e5b242a4e7cc815f04f" Size="1516" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2006347" />
     <Blob Hash="0a312c3a7c6921013616e14ac15f331535bc1313" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1381896" />
     <Blob Hash="0a3699779e2c4c2ef5f29eb04c44a2b2c66afd02" Size="78989" PackHash="e92d4170b08f1bd72b86cdbfeefce851a8db9871" PackOffset="8" />
     <Blob Hash="0a3f961bff31bb89ac9f10928ab85716d704efb0" Size="2086" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="686431" />
-    <Blob Hash="0a40fd80c3ee4ffbbd04389a536775d93aeb8288" Size="425" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2065230" />
+    <Blob Hash="0a40fd80c3ee4ffbbd04389a536775d93aeb8288" Size="425" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2085238" />
     <Blob Hash="0a44203e850385b01e33fcd1ce35dde2f037143d" Size="170" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2096771" />
     <Blob Hash="0a45ec95874761d6857083c43499f0ad731e8f2e" Size="2988" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="769650" />
     <Blob Hash="0a4843673c18e3ed6290a90b356dac4324f104a4" Size="501625" PackHash="91639ede60c084c481daea6546adf05ba88aeb17" PackOffset="929401" />
@@ -40203,26 +40104,25 @@
     <Blob Hash="0a549b85e26973b06a1a9929fbec774cce3d0115" Size="7332" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="639965" />
     <Blob Hash="0a5a7d6131d3433b04bebcf04e0efdfed46bd7c1" Size="10248" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1228333" />
     <Blob Hash="0a5b2dea5efcc2beb90a516ddab73888d71c4e3b" Size="121" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="391528" />
-    <Blob Hash="0a62678f45a49aac4006323482933a6c5a9a14e6" Size="5145" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1905395" />
+    <Blob Hash="0a62678f45a49aac4006323482933a6c5a9a14e6" Size="5145" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1846574" />
     <Blob Hash="0a64243d91272f10c4708394c1c8050cdcbc73bb" Size="1686" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="2091296" />
     <Blob Hash="0a6616c496c12f46108c185198c620f16c7ddfca" Size="9728" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="341000" />
     <Blob Hash="0a671046b6b8c25d82048ec9c66efedc9c2fb90c" Size="2483" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1561266" />
     <Blob Hash="0a6a3433f039b41406e450f0833d1a081f08a6c3" Size="7143" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="2070407" />
-    <Blob Hash="0a6a6e2104445f3fed945a74f16fda94066e6ffd" Size="5282" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1752721" />
+    <Blob Hash="0a6a6e2104445f3fed945a74f16fda94066e6ffd" Size="5282" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2036366" />
     <Blob Hash="0a6cce1cedc34f05b2cbf12349219ab63eb44231" Size="674" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="260771" />
     <Blob Hash="0a6d0fa3d54036b3e9665804dd72cbd1eb9154af" Size="5009" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="185655" />
     <Blob Hash="0a74d7ee40bb48a0c88145fe80409a3ab95952d7" Size="1940" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="975082" />
     <Blob Hash="0a75e27a263e924f4f9b80ea7fdd5a9fb2cd63ba" Size="122182" PackHash="e23187f494893d459aee2428f603a4f93c6eebe0" PackOffset="148148" />
-    <Blob Hash="0a7898482306503b3d282fabd8ce1b67413eca19" Size="150882" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1205584" />
     <Blob Hash="0a79a5db2700699f55e52b3af51dd7042c647ee1" Size="8192" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1201594" />
     <Blob Hash="0a8008011c20bf1f9d60cf0d308afbd6a06043dc" Size="1695" PackHash="73fd8cb116df3b06c350fbc539c34905c8779635" PackOffset="83171" />
     <Blob Hash="0a85dcba1874be6d9a7a8d9400a3bed1487ecb70" Size="957" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="58684" />
     <Blob Hash="0a86f74e3c98daacd81f05237ff7360363b6ebf1" Size="21994" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="2036733" />
+    <Blob Hash="0a8d96e2222740e98dd646de911374c9a9059a69" Size="147800" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1886170" />
     <Blob Hash="0a907b29b24e4917d851c840ccf4e880b84ce1cb" Size="38" PackHash="bf53b8893ad6da3a5972310cd4ae83e37c57310d" PackOffset="2097116" />
     <Blob Hash="0a934241b93898cef0fccf01771d5f3a92747277" Size="2143432" PackHash="b632733c371f4c7a132407624f012a00cc2a762c" PackOffset="8" />
     <Blob Hash="0a947f84d012a0a1b54cbe44496f8e4756f1a101" Size="108651" PackHash="ba3453fc941ddadc98a5ce22af3f077500d8c0cd" PackOffset="106105" />
     <Blob Hash="0a94a73826b5b3641ce1fc46cae2187e2c197150" Size="20258" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="436259" />
-    <Blob Hash="0a9692f9b05e465ce7182e355c7d1a8890462bad" Size="922912" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="763437" />
     <Blob Hash="0a9b1255bd85b60d3620ae61370f54748ab7a182" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1111948" />
     <Blob Hash="0aa2c6c7a216b32f148d1be762c72b48856301f3" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="615839" />
     <Blob Hash="0aa38acffe9d232620d708f7420f978476cb4892" Size="428412" PackHash="b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" PackOffset="8" />
@@ -40263,7 +40163,8 @@
     <Blob Hash="0b032e1c10cd269fe4754ef8c99af9cb3b9c482b" Size="124" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1635112" />
     <Blob Hash="0b0bebe1f16ccde7d40c9e9c73096c44c4e8b6c7" Size="3415" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1730547" />
     <Blob Hash="0b0e326007fc69e7a4210e8b25909b8d71c56275" Size="932" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1387684" />
-    <Blob Hash="0b108d75f97e0e5c56ef628dc0ec7b1c936cf8ef" Size="355024" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="1459460" />
+    <Blob Hash="0b0eb67d3f3a3090dcf872f54fa1e88cb07fe751" Size="591600" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="8" />
+    <Blob Hash="0b108d75f97e0e5c56ef628dc0ec7b1c936cf8ef" Size="355024" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="261252" />
     <Blob Hash="0b13bca2d1f507509b58d79a2d4c417d1f4f11b8" Size="3461" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2091415" />
     <Blob Hash="0b188d3529a77c2fc4c922ce9b4500e888b6b62d" Size="3155" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1773730" />
     <Blob Hash="0b18981a0f77146d06073e39e8f695fb620fe338" Size="1377753" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="8" />
@@ -40281,7 +40182,7 @@
     <Blob Hash="0b334ff34d670e7dfb1aabbfa216f15fde4b1863" Size="2854" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="757735" />
     <Blob Hash="0b37e86267d0c6782e18f734b710817b8b03da76" Size="19648" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1519592" />
     <Blob Hash="0b38bd65dc2d8e66be335c3454bab56e8f6ec69c" Size="8481752" PackHash="c153bd5b93624e74e6e9faf7be24f8f35d273047" PackOffset="8" />
-    <Blob Hash="0b39034a65f48c9e8e47966dd8cbf629751e909e" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548694" />
+    <Blob Hash="0b39034a65f48c9e8e47966dd8cbf629751e909e" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667925" />
     <Blob Hash="0b3b805b764ef0cd552a6d0641a7e56bc8bb6f8d" Size="2686" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="873564" />
     <Blob Hash="0b420258516421d7ac10daf1eead9482a3c7a247" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2087861" />
     <Blob Hash="0b4293b090c5fb5369dbac39327756d7c8b5f53a" Size="7054" PackHash="3916bee22b29bf0f3646551966da018814907e1f" PackOffset="2089168" />
@@ -40292,10 +40193,8 @@
     <Blob Hash="0b5304bd2d9df5c58e1e184771b4c48640a7106f" Size="335" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="2096637" />
     <Blob Hash="0b533798155e6e4d1a02b8156ceb76a0c061cfad" Size="10970" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="329603" />
     <Blob Hash="0b54f1dc2200877cfca796231d5e57e333ec3c0d" Size="246784" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="1321732" />
-    <Blob Hash="0b5686746d46c45c7c0cf250728e2a26e7da24cc" Size="5820864" PackHash="708797ade74a9a50071b9512c44a63bf48722fb6" PackOffset="8" />
     <Blob Hash="0b568d1dd02bc9647960e04de3534e250746ca40" Size="32026" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1684459" />
     <Blob Hash="0b56c83bed43cb08a17624d48af3823ed327d626" Size="144372" PackHash="1a7fb4d3ec15d2096a4fe532191d9957b1a711d0" PackOffset="631570" />
-    <Blob Hash="0b578509cbfaa94a227343aa261ac285e23748ad" Size="19308012" PackHash="26123e7c676e1bc5f072819c34749f7ab491c7c6" PackOffset="8" />
     <Blob Hash="0b59624154869657f4785baa0ec084113d0ba197" Size="1198" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="839271" />
     <Blob Hash="0b5d7fce22fdcb15524b70d91a34a4d80d708cf1" Size="3268712" PackHash="a744790bed001ed939d533b58c7d7132d8599ee6" PackOffset="8" />
     <Blob Hash="0b609471b2cf1b435dc54359e471ae9b686720ec" Size="19968" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="1922310" />
@@ -40309,7 +40208,7 @@
     <Blob Hash="0b70ef542887f0798c649473b7b3b45c6a71607d" Size="111599" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="321841" />
     <Blob Hash="0b71764820ed59fe3a95bea278b88e54754c8b13" Size="3451" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="488426" />
     <Blob Hash="0b747a8844e44d7f43286a5f30309ceb23931554" Size="2296168" PackHash="250480eb00f98b6d9a7b3c48810c19ea3d8b5c3f" PackOffset="8" />
-    <Blob Hash="0b75b02c2f1add0651d3d3a39fd855b405f07e3a" Size="371" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1335086" />
+    <Blob Hash="0b75b02c2f1add0651d3d3a39fd855b405f07e3a" Size="371" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1783988" />
     <Blob Hash="0b7628c08a2c2474e51a638eca00243794f462d9" Size="17785" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="257848" />
     <Blob Hash="0b791a8c1daaa55281324e469426cb859c4a96fc" Size="11261" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1873874" />
     <Blob Hash="0b795817ee253961253ffea6c0651c8cb2cea458" Size="4380" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="213213" />
@@ -40335,11 +40234,10 @@
     <Blob Hash="0b9cf420b6e798094ddb3504d1640c6e4714bb7c" Size="274" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1997839" />
     <Blob Hash="0b9e5be0c0ffaea0a97d35dc9b680dac985c7592" Size="41973" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1774263" />
     <Blob Hash="0b9fc0cd03d1927d61d34f8e55c9100d846080ec" Size="292352" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="8" />
-    <Blob Hash="0b9fea303bf96c1988066bc13dfb7a620f9521ca" Size="66798" PackHash="a073071503c503582f72ed848f112b19ebc5846c" PackOffset="2028348" />
+    <Blob Hash="0ba024db7f8f125727de1d24c14bdefd0af384a0" Size="1031" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1735440" />
     <Blob Hash="0ba2f23c27d3b3b20292eb950d5430ea3a44c053" Size="1617" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="603677" />
     <Blob Hash="0ba343c8ce0f0bf76a1ec97870e48dbdd6500e79" Size="195326" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="519565" />
     <Blob Hash="0ba5a8efb985c422b7c2d9982f43446bbeeee4a7" Size="289" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="494436" />
-    <Blob Hash="0ba6435bac1297b4843efbbf53c33c1e34b66217" Size="267776" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="1795096" />
     <Blob Hash="0ba841d55d69d2e4124544ee742c6af4aff6f24f" Size="6240" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1167559" />
     <Blob Hash="0bad4d27a86a2a79a6cc02a4df58ec7eb4388fca" Size="913" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="266828" />
     <Blob Hash="0bb0312c742cc0097df033656ae3d10723035c30" Size="198" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="625914" />
@@ -40358,9 +40256,11 @@
     <Blob Hash="0bdcf6e3cbb6750a8fd8abe9ce7bb95bfdcd63b7" Size="14917" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1289057" />
     <Blob Hash="0bdd07e681c88f1e44421df8a25e8c6773ec406a" Size="8539" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1253334" />
     <Blob Hash="0bdff64c129c1af7145e1846d1d07f437b44994e" Size="7917" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1003771" />
-    <Blob Hash="0be014bd19399d5b33162a96329d2093f06d1950" Size="749" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1461544" />
+    <Blob Hash="0be014bd19399d5b33162a96329d2093f06d1950" Size="749" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1998626" />
     <Blob Hash="0be1d0f64d89dfe22636b0a97b3fe720be57b2ad" Size="10752" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="489480" />
     <Blob Hash="0be1fc7ef54b3d4915b860eb88fe914fbd7b2b3f" Size="180" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1999901" />
+    <Blob Hash="0be235a1f85287024d44d229bc300865171d5e67" Size="7316432" PackHash="4f9df2f518e7b1ce3daa72d515d0a874d1aaaab3" PackOffset="8" />
+    <Blob Hash="0be2ede45586b38063fb218f03e7dc9fd5804793" Size="1725720" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="8" />
     <Blob Hash="0be32cdb403b056584c039fdb16627b334415ae4" Size="4086" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1569428" />
     <Blob Hash="0be38986e3697200ef6c80f0d96f846bebbaf2e9" Size="274" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="737041" />
     <Blob Hash="0be3a6f914ca9723093442c46471f309e5cedd34" Size="8087" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="563420" />
@@ -40369,17 +40269,17 @@
     <Blob Hash="0be8c6cf2147332c7a5136e687f2ff61465e244e" Size="8753839" PackHash="815ceaba7a67e678c4a7187990c7367805ed6d7c" PackOffset="8" />
     <Blob Hash="0be8f47bd076f36bf53c2a74e11d4b180f2d811f" Size="599" PackHash="44a7a3545294cce6ffdb1ccec3cafef699066c12" PackOffset="2529" />
     <Blob Hash="0bec6679a00b4349a1e0326ea4af5ac6dba22c2d" Size="18536" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1916315" />
-    <Blob Hash="0befe7dcb39c3996802038849dafcdf777f46f2a" Size="71736" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="1989802" />
+    <Blob Hash="0befe7dcb39c3996802038849dafcdf777f46f2a" Size="71736" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="1990088" />
     <Blob Hash="0bf077fb0d03afa3b5330c5d41c317d297111e19" Size="87470" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="1575109" />
-    <Blob Hash="0bf1683772202c6c613a79bec844a610b33da7fd" Size="1191" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="2094256" />
+    <Blob Hash="0bf1683772202c6c613a79bec844a610b33da7fd" Size="1191" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="2094760" />
     <Blob Hash="0bf17cfd3d07d401eae158bf01d1a1fbbf2982ba" Size="67928" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="1866312" />
     <Blob Hash="0bf26aedd2c4b36f190f0eacf6ae2f2f4fee3d48" Size="147" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="1420899" />
     <Blob Hash="0bf5c42cc257313a54c91e91be820d1587f5317a" Size="3143" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="689672" />
     <Blob Hash="0bf95232e63ea76dfc9d43bebe74b34240642175" Size="1790" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2033080" />
     <Blob Hash="0bfd94524b54043558d2c0dda56c239641b8e2c1" Size="3617" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="545887" />
     <Blob Hash="0c01bd140593ed46e7bfbdc9534a9f991992d8e0" Size="2600" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1984577" />
-    <Blob Hash="0c027c61e01ba16516e22bf32a2bda33214bdb86" Size="1866572" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="8" />
     <Blob Hash="0c02a7373ca16d64c370351f6a0dd5fd67e1551a" Size="1821" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="2089897" />
+    <Blob Hash="0c05dea8c0e9591d3b10c65a0a92c73d329e1515" Size="3597474" PackHash="fb6df148b3c44e09ed57d040766a96f51c03d315" PackOffset="8" />
     <Blob Hash="0c05f9953d1de191fa0726b56799580938f4423b" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1184546" />
     <Blob Hash="0c06043a092c46b50b4814ce21188d5a1563b266" Size="21374" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="142707" />
     <Blob Hash="0c0755a689cf39106818a19c56948a64fd36a2c0" Size="4430" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="311176" />
@@ -40388,17 +40288,20 @@
     <Blob Hash="0c0cbd3a88028d005a8592e0e8a8a7386e3d6d99" Size="86428" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="1216565" />
     <Blob Hash="0c0cc2094729e310b9a67a453ccbd0f5d1bf2b04" Size="13479592" PackHash="f232f993f553b765d97eecc857839131bf8547dd" PackOffset="8" />
     <Blob Hash="0c0ce0163ff17bb964002df7acd1596f794b3f0b" Size="41116" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1208570" />
+    <Blob Hash="0c0d658087672ec514ed2258f1727ddeb144f9af" Size="3486076" PackHash="de87c539cbb90fb0d0369dc29328c5ba440622d9" PackOffset="8" />
     <Blob Hash="0c0db6d0c8c3e5cc5ce1186bc87aba09eeaee045" Size="730" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="265654" />
     <Blob Hash="0c0e422ab79cf324ee48b561e41436ec67fa720d" Size="1081947" PackHash="f38889741341129aaa57f66f2c36e093673c46ea" PackOffset="693350" />
     <Blob Hash="0c0e6efceed4f4eb4c6342dcef4a84fcfa9575a3" Size="48674" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1989213" />
     <Blob Hash="0c0fad306aac759927b9ed897d43b1ac38c29caa" Size="2155" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1401881" />
     <Blob Hash="0c10e9db805aebd18882640146e703a4249504ac" Size="11125942" PackHash="d89e655babcda8595979a4f13033d2150562a171" PackOffset="8" />
+    <Blob Hash="0c12f88f8b8273b9dce8b5abd6127dc022457b1f" Size="1152814" PackHash="933fffd8aa26bca6b889760ec442e900ba92317c" PackOffset="8" />
     <Blob Hash="0c13fd4476633545d240ff466a7c4921ba793db9" Size="98352" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="1360512" />
-    <Blob Hash="0c1f0b44b95b67a248bd92372e913156a06da9e1" Size="174" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1597467" />
+    <Blob Hash="0c1f0b44b95b67a248bd92372e913156a06da9e1" Size="174" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1716699" />
     <Blob Hash="0c20b569484a5c85d70dbc34fdfec6aca8e72688" Size="317390" PackHash="f12fcad677aebdda530c1768cf6a4c571cea68bc" PackOffset="8" />
     <Blob Hash="0c238ddc0c54c9d07208d203b86761d5e5602747" Size="17352" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="815113" />
     <Blob Hash="0c23c2d922fa3a1025f406afd2954153de219d51" Size="666" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="2094357" />
     <Blob Hash="0c272e6fb9c112c3612c22aee7f8ee065d9ae24b" Size="11130" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="658361" />
+    <Blob Hash="0c30e976b30fadeeee987e5bb49e66d5616954cf" Size="10955124" PackHash="ebc874b5f53a7e12571b9d6035148b38e50d6b7f" PackOffset="8" />
     <Blob Hash="0c3d8652f2fb03cf3e486692439a3197c7bc758c" Size="9229" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2087642" />
     <Blob Hash="0c3e50e445a5b9bf225455360d39f693cb546857" Size="1516" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1378608" />
     <Blob Hash="0c422b8f19b386c3207e38c0e5322855b4e48b96" Size="136945" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="1272849" />
@@ -40417,8 +40320,8 @@
     <Blob Hash="0c5d1fb02a687ed0c721cf00fd8a757cb165001f" Size="11564" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2055579" />
     <Blob Hash="0c68253f9d1825cefec1c580a597001af3f52c30" Size="21995520" PackHash="6b95ce562e820f2071515ba753afedbe3df9c1bb" PackOffset="8" />
     <Blob Hash="0c6b11d511c12f745553765164a82bbb893da646" Size="3171904" PackHash="3ab17699ce95c427b0c0f3466b4226e2e30b92d0" PackOffset="8" />
+    <Blob Hash="0c6b9e23d7cfe8307565e42499849c9a1ce9c85a" Size="4028904" PackHash="84d08623387371fd62655826fdf28874cc21aa57" PackOffset="8" />
     <Blob Hash="0c6c96c12ec1e0a23779f1711487860e51d4f9fc" Size="1952" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2064084" />
-    <Blob Hash="0c6dba40a00a4db7b526ea5468ffcd78c5b668bf" Size="350264" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="1219592" />
     <Blob Hash="0c6f4de044c23e4ed7787805f2bbfb369bee2a26" Size="6697" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2035215" />
     <Blob Hash="0c6f877e2a197dfc1c2efaee754e66fc04d86b57" Size="7869402" PackHash="60c5bb5120f6c73b23af87c97dd5179f0ade011f" PackOffset="8" />
     <Blob Hash="0c7133c8ba0df958383ec0545df6a1f44d3bcc96" Size="18944" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1477324" />
@@ -40428,7 +40331,7 @@
     <Blob Hash="0c7c24a0b3ec7fcc98e650aae3ff1eebd85034ce" Size="34684" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="1331682" />
     <Blob Hash="0c816066f9c1171fa83e70f8f42c55bf7855fed9" Size="84989" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="522796" />
     <Blob Hash="0c826398c19c09ef5325cbaa6656d1320468327c" Size="36549" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="571575" />
-    <Blob Hash="0c875b0d3033df67acef467e813e7850bf155cf9" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548485" />
+    <Blob Hash="0c875b0d3033df67acef467e813e7850bf155cf9" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667716" />
     <Blob Hash="0c8892002ae780685a77bee3758d4c480bccd1f9" Size="3133" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2085607" />
     <Blob Hash="0c8ace9b66338aac7f9148e7ef3bf850d7ae2566" Size="44302" PackHash="83483b879ca4d4508d64bd7176b1101533718a2a" PackOffset="2005736" />
     <Blob Hash="0c8cce75faa7a68db3947df5e7b8a01fc25c4095" Size="148502" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="1186997" />
@@ -40437,7 +40340,7 @@
     <Blob Hash="0c95c52db39feeb855741f03a416f93068d8f5a0" Size="40608" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1813036" />
     <Blob Hash="0c970ce28a65b7ad6d65729f612089129971ac6a" Size="2542" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2085911" />
     <Blob Hash="0c97c0a3b9938546f183b0dec36a4f8c693ae38b" Size="8148" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1664340" />
-    <Blob Hash="0c98148ee0a6bd8718d19272e800aa39bf76a330" Size="7250" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1302501" />
+    <Blob Hash="0c98148ee0a6bd8718d19272e800aa39bf76a330" Size="7250" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2084119" />
     <Blob Hash="0c9b4a8cb154578c7830f8f7898ecdcadda542e8" Size="2668" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1381832" />
     <Blob Hash="0c9eb8d7f8248225421b054500ff642286259ab7" Size="84142" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="223523" />
     <Blob Hash="0c9ff6d3d386ba466696733484cbf07bd84b91bb" Size="161925" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="1539873" />
@@ -40452,8 +40355,6 @@
     <Blob Hash="0cbb15cb743cf750664c650e7acf79fa1a7b46b4" Size="3555" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="649409" />
     <Blob Hash="0cbd0b570d88f8c108b816795dadea028775cf9c" Size="928" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="375858" />
     <Blob Hash="0cbdf8f8d033505af2bc649efc685719174522db" Size="111083" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="869007" />
-    <Blob Hash="0cbeea16d969c16ed7c1ff95a46b0759e9675481" Size="1333" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1780279" />
-    <Blob Hash="0cbf481aa2f6fc8549e87a3bf5cd1541a85c687d" Size="14659518" PackHash="1c802468b7c24981b8a13e9368ce487aede6c6e9" PackOffset="8" />
     <Blob Hash="0cc5e4dbfcf1d55c7e23b467055812bdc55711d1" Size="20276" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1558500" />
     <Blob Hash="0cc6aadf6bc8cc2c5a4aad4518fd5754d4265781" Size="81093" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="304591" />
     <Blob Hash="0cc80f9d32d65dbe223465f0016186aad22b23a4" Size="88" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2086653" />
@@ -40465,7 +40366,7 @@
     <Blob Hash="0cd783755ed6a4ecdede3670a19a29bc09318836" Size="18992" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="39324" />
     <Blob Hash="0ceaaefb7421a86530683d065f907844a86edda1" Size="122285" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="626270" />
     <Blob Hash="0cee9c82fb7e68385563cf1374960c14ebcc533a" Size="313665" PackHash="fdb42faf93278243c4602e932eed4c1728f8ea7c" PackOffset="1688823" />
-    <Blob Hash="0cf1cfb988a70be2f51f634c9de1eee963c0d4bf" Size="839" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1616481" />
+    <Blob Hash="0cf1cfb988a70be2f51f634c9de1eee963c0d4bf" Size="839" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1735713" />
     <Blob Hash="0cf2491548aeb9b9c2efacb1448dd6d84d83c8e1" Size="1008" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="191815" />
     <Blob Hash="0cf3e0619b096befc8d1cadbbf3eb16c46f1ee75" Size="158" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2041704" />
     <Blob Hash="0cf470b16fb63d79f23bf4469fbced7abc46a44c" Size="2765" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1297950" />
@@ -40473,7 +40374,7 @@
     <Blob Hash="0cfb5dc0a3f148d63c7ebc074fe230ea324325f2" Size="13191054" PackHash="9b898e83d956bca143184428441336e8d87e6941" PackOffset="8" />
     <Blob Hash="0cfca39fc369aa7a0ebe3f874738f2dd4cfa26a1" Size="82354" PackHash="82788599ad2583d437e6cde9e247d16ba5059dac" PackOffset="1997656" />
     <Blob Hash="0cfd30191e0eb3adb0bf1ea2550b69bf6554d60a" Size="5964" PackHash="ce17010a1af2358e1ab4c9c88ca24a6e59f34064" PackOffset="335640" />
-    <Blob Hash="0cfed61d27289cb58800f954b00502ec029f40cc" Size="372024" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="1482344" />
+    <Blob Hash="0cfd349ac0060b205d8d7aa3e9c7906962ef43b5" Size="445212" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1074585" />
     <Blob Hash="0d02814a888a04fa3447c150d36945cb46e5c069" Size="9432" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="566153" />
     <Blob Hash="0d030ae370f6d9626f87fcc0e3e587c06a5a4a92" Size="867" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1775041" />
     <Blob Hash="0d0858570698757b253d0a20bdfc8618c6d2a9a5" Size="6433" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="269355" />
@@ -40505,7 +40406,6 @@
     <Blob Hash="0d3e7b649c4aaa99904803aff9b77c2e8735847f" Size="78939" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1813174" />
     <Blob Hash="0d3e9d966b227eb6c9241e97d0aff4a7b48246f9" Size="224300" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="359688" />
     <Blob Hash="0d425449deda19b4b2eeb85eb557974ab4d843d2" Size="29424" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1390485" />
-    <Blob Hash="0d4802cc36ac35a4d4735ee3f333347c8bb526a5" Size="1030" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1308229" />
     <Blob Hash="0d5073afb8120d95e01f4bb130f327301a960161" Size="48922" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1333944" />
     <Blob Hash="0d5241d2688c47d71aa9ce267176b0b64a3654b2" Size="18743" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1651121" />
     <Blob Hash="0d532a82f9a212eb2f8bf19ef984893b1a6442e5" Size="93630" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1415625" />
@@ -40514,6 +40414,7 @@
     <Blob Hash="0d5b5e8a2e52ee40dec13f507344c2d41cc49b9c" Size="802824" PackHash="faa641df952d93274d1774a37ecd0e58a425c5a1" PackOffset="8" />
     <Blob Hash="0d5e0ebf9d13ef3c784bed6b1cca989a8072631f" Size="3718" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1975387" />
     <Blob Hash="0d607691f1e7d593a8773c5853389dbabcced5f5" Size="182829" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="638213" />
+    <Blob Hash="0d64c2de1d2463895f979bcd6b6baaa59be81f2b" Size="1902828" PackHash="0ed315ae5ece5f85a8eefa1895110d8eb69a8a46" PackOffset="8" />
     <Blob Hash="0d65728eecce725c16199b7f4641b22a9c3a87c5" Size="3004" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1051463" />
     <Blob Hash="0d6a1b54841eb836cd08d6c391d3d4e0e111c4df" Size="389144" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="442147" />
     <Blob Hash="0d6aa723e3b2ef8b59c1cccab1373d4915fe148b" Size="2051" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="116664" />
@@ -40522,10 +40423,9 @@
     <Blob Hash="0d736f64dfaa4bc8baa9a3bed8f9398fdb2196fb" Size="10322202" PackHash="03e914bf92c5d192b640e04d9bc4acc3abb71c0b" PackOffset="8" />
     <Blob Hash="0d740d4cbcaa97293f9656e9d938204a1b2ac91b" Size="8113" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="606833" />
     <Blob Hash="0d765a8f75b28e274ea28745f5a80ac10208edd8" Size="4914" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="553247" />
-    <Blob Hash="0d769e98eb7d0f05a980708ab19b4226c0d9ed33" Size="2374840" PackHash="9b79af1504a518aa077fb7b1a0d622be3efeedfc" PackOffset="8" />
     <Blob Hash="0d77149b770023aa2e16591006cf242cce5496cb" Size="107595" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="1451426" />
     <Blob Hash="0d78d1a55d6d6436b465b48af8a965635d50b051" Size="29444" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1027468" />
-    <Blob Hash="0d7b44ddc1f9a067d27bb8b9ace41fdac23eb277" Size="2694" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1545408" />
+    <Blob Hash="0d7b44ddc1f9a067d27bb8b9ace41fdac23eb277" Size="2694" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1664639" />
     <Blob Hash="0d7e872b1cf954466ab7fcebdc743f31cfd3645c" Size="3459" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="583677" />
     <Blob Hash="0d7ff5a522247c8035e50593b317d02501c7ae4a" Size="222" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="223968" />
     <Blob Hash="0d8a2b2bd0e0872e38cad0cbdf7d14c9d4034d48" Size="10235" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="727963" />
@@ -40537,8 +40437,9 @@
     <Blob Hash="0d9192e71d356d9d202fd6729d04ef211e00e4e8" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="234965" />
     <Blob Hash="0d9348c72453e99c8e3c067c6fb070f2b50feb2c" Size="203" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1347211" />
     <Blob Hash="0d970452a1b4f51eb42336bd3d4b636fc57487ad" Size="3032" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="549284" />
+    <Blob Hash="0d97a96177e2970cd28c71e5aa7c9a47bede4ca8" Size="34363768" PackHash="cbb12a0cb253814aab713d03f253bb74ebd38917" PackOffset="8" />
     <Blob Hash="0d984e05d6fc07925634c2df4913d31d62fe596b" Size="565" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="236657" />
-    <Blob Hash="0d9a0d22e75fa8af58fe8cbd786e796c4ad7b55f" Size="1199" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1250678" />
+    <Blob Hash="0d9a0d22e75fa8af58fe8cbd786e796c4ad7b55f" Size="1199" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1699580" />
     <Blob Hash="0d9b77119f00afbcd95f4be9dcdc69f1058dc5d9" Size="184" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="838755" />
     <Blob Hash="0da0b33a5577c7da3afa56e34e4ccc290fa4bf66" Size="5322" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1759406" />
     <Blob Hash="0da2c20d7dc73e405aff6e6304b193bd338e239f" Size="2440" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2078453" />
@@ -40549,7 +40450,7 @@
     <Blob Hash="0da905ae30abff7029c758b737a31f9ae6e5d025" Size="1101" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2085775" />
     <Blob Hash="0dab18e23d72e2f1d2d946760c73d0843427cc4e" Size="6661" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="458423" />
     <Blob Hash="0dac717ab3778d5c76c132998935c0091bf91f0b" Size="120919" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="438277" />
-    <Blob Hash="0dadc711455eba9ee8b90ffe96138d145866399f" Size="2151" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1337607" />
+    <Blob Hash="0dadc711455eba9ee8b90ffe96138d145866399f" Size="2151" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1786509" />
     <Blob Hash="0daea5afccc54292ec7f405232698608eaba29a0" Size="586" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1871494" />
     <Blob Hash="0db2caf5d5a7f680b41d6dd2adf58b57ba4346c0" Size="81920" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="259080" />
     <Blob Hash="0db9ee69a5fec56fc31641018fc9252d87b249eb" Size="35798" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1976247" />
@@ -40559,19 +40460,17 @@
     <Blob Hash="0dc4bbe7fb7acd4b0b3e217a5688c649675ef23e" Size="23237" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="851303" />
     <Blob Hash="0dc739638576b9a88db62dddb03abee57ca7bb10" Size="3816" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1996480" />
     <Blob Hash="0dc7ed73680e8c36cc5f5d5f38f2c2b3816912f9" Size="2371" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1734903" />
-    <Blob Hash="0dc8c369b767f9a1f0e9af01e1a9efc6b2e2e4f4" Size="758" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1418098" />
-    <Blob Hash="0dd110f064cf8e4216ec48cac7e7dd3cb4451320" Size="14853" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1756504" />
+    <Blob Hash="0dc8c369b767f9a1f0e9af01e1a9efc6b2e2e4f4" Size="758" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1867151" />
+    <Blob Hash="0dd110f064cf8e4216ec48cac7e7dd3cb4451320" Size="14853" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1875736" />
     <Blob Hash="0dd290f48d92f72735349d93e3afa8d7eed642ed" Size="2101760" PackHash="fe3864d8f78137012c76c1d77ec00fd35bbd8d33" PackOffset="8" />
     <Blob Hash="0dd2e410c911db9cacaf137bd13d6325dfa8d549" Size="496" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="945028" />
     <Blob Hash="0dd440eeb55edd438334f604be950709b28332d0" Size="3326" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="2031687" />
     <Blob Hash="0dd576e94c49f8fa436738298bef4a8e02c101f1" Size="61818" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="258316" />
     <Blob Hash="0dd5b9871fe5f932b991a67287c0f791c03d43ca" Size="6046" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1784008" />
     <Blob Hash="0dd6b722f52a252785aca96c70813c0f98322c4d" Size="881" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1328345" />
-    <Blob Hash="0dd8b8dd1e28db83cd161265918d6eba820d3942" Size="2718398" PackHash="6841b20c3e3c4c56009eca3de39a55098c449b77" PackOffset="8" />
     <Blob Hash="0dda24e081d41023627790d123e7e1817d34ee53" Size="12800" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="2057080" />
     <Blob Hash="0ddb9a49cb83ddf2396b2eca85093260710496c2" Size="847" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1031898" />
     <Blob Hash="0ddc40da95a07489c132905032b6078b8bc72446" Size="971" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="823230" />
-    <Blob Hash="0ddc92fa7809661abc85612efc21b1f2c2db1038" Size="2420" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="2092824" />
     <Blob Hash="0dddb0498b01e28dd787d8a4af053f93693ccc9c" Size="6872" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1601452" />
     <Blob Hash="0dde25ce61ebb0bf0e7d43ee0f401e50534bf860" Size="43025020" PackHash="adf456643946e9d859c01bfaf7f5ab2df8e7db6e" PackOffset="8" />
     <Blob Hash="0dde31e563ec5771542319449401ec0442297033" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="548019" />
@@ -40582,7 +40481,7 @@
     <Blob Hash="0de9eb2e78d391e9bc53e116736eac017245dd8e" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1986494" />
     <Blob Hash="0dec1d100cb50467fcc31555a0f135bca9e5c1a0" Size="29129" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="811875" />
     <Blob Hash="0df12997917a6990f322ea0cbc3a8b9868fef6d5" Size="206848" PackHash="4e7e810806daa53af602a84d64ae8277b20e8884" PackOffset="1760776" />
-    <Blob Hash="0dfa861e7b9ab4ab579180c530b7630dd74697b0" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552332" />
+    <Blob Hash="0dfa861e7b9ab4ab579180c530b7630dd74697b0" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671564" />
     <Blob Hash="0dfb76884d2a07e05644afc3914f450c35311a3e" Size="3588" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1405484" />
     <Blob Hash="0e05607b77f68d3a4385f0c7c149a6ab40cd1551" Size="130053" PackHash="31ada4c269dbc1fe2d7767f6c437634f661132d2" PackOffset="184497" />
     <Blob Hash="0e0869b61a01cc0734e0ffb2eddba7efd7c6a994" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081172" />
@@ -40593,7 +40492,6 @@
     <Blob Hash="0e130b01b46ead02b98a8aefad79bc0901573969" Size="115025" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="1426864" />
     <Blob Hash="0e171612a0c1c24a829b4b199130110af2ac222a" Size="2924" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="607842" />
     <Blob Hash="0e17da472f5a9c9983937dd97638e2c7a597beb3" Size="408" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1351386" />
-    <Blob Hash="0e19a47e18557f160716198aceb2285b3457b1dd" Size="1122" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1282971" />
     <Blob Hash="0e1b5b2be7103ad040418958289c3aa7d20ea426" Size="528" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2092014" />
     <Blob Hash="0e1b7b81de3469a31047ad394345357553dd23da" Size="65039" PackHash="6a3c422a237075366d803f78e1e9f44d6424c3f4" PackOffset="2030088" />
     <Blob Hash="0e1bc972de31f3ec8e7b366adaf574b565fe9c55" Size="659160" PackHash="ef3d362ea0edd293eb99aeae543ee8b77ce4183b" PackOffset="8" />
@@ -40604,14 +40502,13 @@
     <Blob Hash="0e29a1c276d91d910c5dd3249134a4d75f148e39" Size="568" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1806444" />
     <Blob Hash="0e2d3c68a4e334dbbf2ac0649d6749be792c82cd" Size="50176" PackHash="908ab3d68a65d4d823608b2ddd04dd8a6d70cebc" PackOffset="1734152" />
     <Blob Hash="0e2f3f408277f9856cfdcf3e734a66fc88ff5726" Size="27888" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="2059940" />
-    <Blob Hash="0e2fc848124c44592befd5baebf662ad6aa72315" Size="7924" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1540070" />
     <Blob Hash="0e3180ad0dbd0219c0cbcdc6d5c442f560e55b2d" Size="11399" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="545439" />
     <Blob Hash="0e33dcccc9d0285171571932f42366293de670fa" Size="11815" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="45838" />
     <Blob Hash="0e36b83e78e83d555e52e191867a00186ad3b8f3" Size="514" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2001431" />
     <Blob Hash="0e3836c87caf627bc2cfa448a793ebbc9430fba3" Size="8729" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1310638" />
     <Blob Hash="0e38f362aa804ce5e92add89f05b17fbc5f15d97" Size="169" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="464060" />
     <Blob Hash="0e3c529c16e1a29d44bf006dc34186b9c784e80e" Size="222" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1352026" />
-    <Blob Hash="0e3ee98b4f527e0bcdc9535414dc3052fb9a589e" Size="186" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2096851" />
+    <Blob Hash="0e3ee98b4f527e0bcdc9535414dc3052fb9a589e" Size="186" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2096718" />
     <Blob Hash="0e4240fcefafa5a48bcdce9f2e20374e094d3dd2" Size="7792" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2079902" />
     <Blob Hash="0e46309f2423c0d7321cc2a0928f4e411b82aee9" Size="955429" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="580500" />
     <Blob Hash="0e496cd1f8b98ea3813f965d6dc907277721eb8f" Size="2830848" PackHash="302c67f641bf8991f415985d99d84e5c4533963b" PackOffset="8" />
@@ -40640,7 +40537,7 @@
     <Blob Hash="0e908091783a79cf9ca9874f1cf718686c5f374e" Size="1195" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="2095624" />
     <Blob Hash="0e9147b3f507206b57e15691cf3c3104267ec438" Size="18791" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="262327" />
     <Blob Hash="0e9449189dbb02fd07288ddaab0dd4c726223e8f" Size="3158" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1155505" />
-    <Blob Hash="0e946191e35fb9dc6dff80a95415cae2acafec11" Size="9272" PackHash="8b5291f3f8f3ddb9d9fc8ad444abd28ce12847cb" PackOffset="2084082" />
+    <Blob Hash="0e946191e35fb9dc6dff80a95415cae2acafec11" Size="9272" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="2085968" />
     <Blob Hash="0e9aeedd00ff7aafc037237396ce66caa6ebeb2c" Size="40960" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="2024968" />
     <Blob Hash="0e9dbac91ca774a91ee0403c0e33e6e969d7b2bc" Size="75009" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="78558" />
     <Blob Hash="0e9e06dc3d69d32add1ee291d46eb26c66ba331e" Size="342" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="180875" />
@@ -40654,19 +40551,18 @@
     <Blob Hash="0eaa83f9f7ccd7af8d6ec37e3fe0e056b2982fb2" Size="2073" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1107758" />
     <Blob Hash="0eaaa6913825e87ed0a5b01b23cf3ae3d80d5aa4" Size="37328" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="8" />
     <Blob Hash="0eadfeb23bb5f519e71f38ab9d9509fbbac3d06c" Size="7838" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1552577" />
-    <Blob Hash="0eb1df461a66feab0eeab1a533809306665de17b" Size="2214" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1731405" />
     <Blob Hash="0eb3b36b6ffefad6d5cef857be4f68b43c03b76d" Size="10070" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2086859" />
     <Blob Hash="0eb64cd4eb7e5040f79ffd0c1ed8c34f142b37d8" Size="3760" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2072536" />
     <Blob Hash="0eb6b1daa835b1f2ae9a59f3ac3daaede3b08aae" Size="189" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2095215" />
-    <Blob Hash="0eb78a423f117f2c82db74b22e35be9e9d89c2a6" Size="147800" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="1678128" />
     <Blob Hash="0eb9c62a857a458c9ace75e2f9ec20bb4917a484" Size="13184016" PackHash="4d574bc90d5341f27005ddb5aa066056af87c096" PackOffset="8" />
     <Blob Hash="0eba0955cb8780480e2ebbe1dad0147dc088cda9" Size="4676" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="2089778" />
+    <Blob Hash="0eba41ea22fb1b46930753067c5c5a1f9fd03984" Size="97744" PackHash="f11b05acf069a23b5a58dd054c9e055241e06bcd" PackOffset="1869588" />
     <Blob Hash="0eba6e72f197b24d230ec7e7dbeca00ccf7d7247" Size="20480" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1562535" />
-    <Blob Hash="0ebab4a29684d8df1ff23464832fe42b6b90a985" Size="2450" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2092055" />
+    <Blob Hash="0ebab4a29684d8df1ff23464832fe42b6b90a985" Size="2450" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2093114" />
     <Blob Hash="0ebb0d49f5afc1489b77ed9433334b32e577bacb" Size="3997" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1801900" />
-    <Blob Hash="0ebeaab3b4de93deecf2c1559fb49881a41914eb" Size="2463" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1970349" />
+    <Blob Hash="0ebeaab3b4de93deecf2c1559fb49881a41914eb" Size="2463" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2079100" />
     <Blob Hash="0ec2d8e4dfb9a03b2ffeab75cb3a8201b99e1096" Size="4004578" PackHash="b3b95b2e8e55684fab72a3063757156f7634397b" PackOffset="8" />
-    <Blob Hash="0ec3a3229fe87a97209f433ea36a32b581384755" Size="165" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2096211" />
+    <Blob Hash="0ec3a3229fe87a97209f433ea36a32b581384755" Size="165" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2096501" />
     <Blob Hash="0ec57eed244d9b7615d0795679c8fb173738361e" Size="326814" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="8" />
     <Blob Hash="0ecb1b67b60e26e40e16194f5566b8ead9ffd0d6" Size="5287" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="1600272" />
     <Blob Hash="0ecdf00ca49005560eb7cdd8d3b1f20934fdf198" Size="100628" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="408033" />
@@ -40686,11 +40582,11 @@
     <Blob Hash="0eed1e762c256904798e211d3ec89410ec305c79" Size="3388640" PackHash="b90100372464773f201eb4fcb81c127b3bfc0c17" PackOffset="8" />
     <Blob Hash="0ef01f9938ae3786f53dc0dce0b8e103f2c425ca" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1366410" />
     <Blob Hash="0ef06dfbed48d31afe18a9d0e8df2d859be51760" Size="1074859" PackHash="9b85c2fa156837a820c7e7ae27d2ade465850441" PackOffset="8" />
-    <Blob Hash="0ef0b555803363152115bbb33c214b54b74adb9b" Size="947" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2060178" />
+    <Blob Hash="0ef0b555803363152115bbb33c214b54b74adb9b" Size="947" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2079777" />
     <Blob Hash="0ef3b18dc856a5b053b348acad305e3a2d6ec69b" Size="56439" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="87986" />
     <Blob Hash="0ef42a201c102899a1e214a81bc826135143fd20" Size="3144" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1389356" />
     <Blob Hash="0ef5302d13489cdbb3533991a2e7f174c29f2831" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1838166" />
-    <Blob Hash="0ef7bb89c385f750da0f526e169bf7befcfa38b6" Size="2639" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2036219" />
+    <Blob Hash="0ef7bb89c385f750da0f526e169bf7befcfa38b6" Size="2639" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2087537" />
     <Blob Hash="0ef91f89be42cad8122f5ddfad50cc20b3a18727" Size="78848" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="1982696" />
     <Blob Hash="0ef9b4e341c5eeca2660300b7a8603f817947bbf" Size="266945" PackHash="e23187f494893d459aee2428f603a4f93c6eebe0" PackOffset="1103474" />
     <Blob Hash="0efa028aa493e00ec2252fdcc13127a56886fd78" Size="4703" PackHash="15ae862d7e6c16dd10b324f1cbb6e1c3b6cb1f27" PackOffset="2091787" />
@@ -40702,10 +40598,8 @@
     <Blob Hash="0f0c2d439fdb4f5afbc4bed8c935e3a6e5ea2bf6" Size="77721" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="236794" />
     <Blob Hash="0f0e474b6544ed84187ecb8af3765972e614225a" Size="4880879" PackHash="ef6e0ab725edacea0f29fa7450d2b00321e31740" PackOffset="8" />
     <Blob Hash="0f0f28a26521de9fcfdb06273e5a2ebc6661b3fc" Size="31725" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1369274" />
-    <Blob Hash="0f13da8908cbfa6b293f346c19e7736585c4d5b5" Size="2537912" PackHash="66a42eb4601f471938c9dff7247777d481f1cb76" PackOffset="8" />
     <Blob Hash="0f17725bab3d7171da38b3090128a09878f92815" Size="48456852" PackHash="c565d2dc22f7302041550ec8a8b028b779a3307d" PackOffset="8" />
     <Blob Hash="0f1df33bfffde6a1adbba57c36fd8f8f3d31b9f1" Size="2498" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="883409" />
-    <Blob Hash="0f1fee297b55cc82b12b3340b05e79f7da31e13f" Size="5943" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2063235" />
     <Blob Hash="0f2721e135483b7cdf1056f9a98cbb3ea2b9ed91" Size="313994" PackHash="12468bf1be869d88d9a8104ffde7c4887839843d" PackOffset="1775662" />
     <Blob Hash="0f272f877726a563de23c0388fb479da2ed95db8" Size="23564" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1568396" />
     <Blob Hash="0f2784d528debfc645241c7fc3295ed84a8f4f3c" Size="178" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2047694" />
@@ -40714,9 +40608,10 @@
     <Blob Hash="0f2f3dd5fadb7305711eb2bc683ea810d5cdb745" Size="94461" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="1896856" />
     <Blob Hash="0f3250ade57f7777fc23668be370846078ac15a7" Size="149" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2080468" />
     <Blob Hash="0f33a314ccefdacf5faf60d8bf53511e776d07c0" Size="64811" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="601680" />
+    <Blob Hash="0f3559cf760f1cc9aab074cb889786b5999d5f23" Size="22925358" PackHash="3f8e71027960e46b38c51764d31f0151ca1cf8d3" PackOffset="8" />
     <Blob Hash="0f357cf3abe188fe74e14f15c712ba7d20911472" Size="3403" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1291310" />
     <Blob Hash="0f36883424c2680ef8708639cb4d2543e0e41d4a" Size="3299" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1857612" />
-    <Blob Hash="0f37d5357853f46a04a70a3cda713ec2b655aa74" Size="17884" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="2057906" />
+    <Blob Hash="0f37d5357853f46a04a70a3cda713ec2b655aa74" Size="17884" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1951894" />
     <Blob Hash="0f3d6a3885cf86f846e1e937e59dad563ec3c864" Size="174089" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="1413497" />
     <Blob Hash="0f408b68a513e5472f6f12dc3077021309052eb3" Size="927" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2080105" />
     <Blob Hash="0f42113a9106360f2abd004eb10d150beeeded58" Size="5225" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="292568" />
@@ -40728,11 +40623,10 @@
     <Blob Hash="0f52b5bd7ef46db2567ed9d92f87f0753fc5482c" Size="419" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="949308" />
     <Blob Hash="0f593fbf56ee43e0b12f51882373380f48f713e5" Size="84599" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1378630" />
     <Blob Hash="0f5c013bb5f76d4ee57df167db8a911fb1b0ffc6" Size="468" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="171440" />
-    <Blob Hash="0f5d60062ebbdbc06c1e45e7748f6ed1e1344a7a" Size="1576" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1016781" />
+    <Blob Hash="0f5d60062ebbdbc06c1e45e7748f6ed1e1344a7a" Size="1576" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2064298" />
     <Blob Hash="0f5f64dad828cfcd1d7135a01463cda6c37b7c7c" Size="24709" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1937572" />
     <Blob Hash="0f5fd7fb04517148ef231085fee9b84f3ad18d7a" Size="7677" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="166821" />
     <Blob Hash="0f62e4c48058d8cd6c93d9ebc4802eb01497a58e" Size="168" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096824" />
-    <Blob Hash="0f634f089b5a78994ef04db05db91051100f08bb" Size="1064234" PackHash="5000419f0499a3ba2f837311ed0dd939c4356b58" PackOffset="8" />
     <Blob Hash="0f642603202fec85fe8fe5a05c1b6136be3daefc" Size="20562" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="439916" />
     <Blob Hash="0f66881d0ce622f897a72ba6910ec234cfb36601" Size="40" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096990" />
     <Blob Hash="0f6a5fde0509879bd98536a1066e5e089717f272" Size="2591" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1243207" />
@@ -40766,18 +40660,18 @@
     <Blob Hash="0fadc05d797ce463e13b61b3cecacf87837b3521" Size="232503" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="1706416" />
     <Blob Hash="0fafb6ad63710f18a750699f576301cb2437f12c" Size="103417" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="61287" />
     <Blob Hash="0fafe5a10c6e755f62493182e96e212a53c0e8cf" Size="37187" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1554535" />
-    <Blob Hash="0fb115c49993948b0ecd61df9780eac9d661c728" Size="1215488" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="8" />
     <Blob Hash="0fb47fdce6382730643f5d6a564e688f47543a65" Size="55294" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="1734756" />
     <Blob Hash="0fb698de22b6edcd8ddaa7e3244d5505f57f5e5d" Size="1783" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2094967" />
-    <Blob Hash="0fba58ceb987dd17f74e20810d20334ec13798b1" Size="17677" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2002284" />
+    <Blob Hash="0fba58ceb987dd17f74e20810d20334ec13798b1" Size="17677" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2059687" />
     <Blob Hash="0fbacd5b149ad490a92294b625bee9575b88643c" Size="67584" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1727587" />
     <Blob Hash="0fbadef7dc02232b17e745aa00d7cf1e6324a31f" Size="683083" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="947888" />
-    <Blob Hash="0fbcdfb685807abb0b6ed10101925896c648ce54" Size="1269" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1112572" />
+    <Blob Hash="0fbcdfb685807abb0b6ed10101925896c648ce54" Size="1269" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2058588" />
     <Blob Hash="0fbee4e968c2c0837bd657e142955f6391f3c597" Size="3087" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1854525" />
     <Blob Hash="0fc11a44f5c76620370c5d209334cb29609883db" Size="19952938" PackHash="e0a14030fd6ca4b291475b202b8ad9ca709fddf5" PackOffset="8" />
+    <Blob Hash="0fc4d1eabc234ec46c4046653c8522a583b1feb3" Size="1043" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1765544" />
     <Blob Hash="0fc8009e8083832bc8b709b910a526355659daed" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081068" />
     <Blob Hash="0fcab8b7bf53b11034671c017d128fc0bf859947" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="611139" />
-    <Blob Hash="0fce19b1ff07da2fa766a38b59c1ca8f589eb93d" Size="797" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2096078" />
+    <Blob Hash="0fce19b1ff07da2fa766a38b59c1ca8f589eb93d" Size="797" PackHash="0a5f18beec683918579defc535c5cd097d71f4e6" PackOffset="2096263" />
     <Blob Hash="0fcfe0dd79a951a593256a7257a7410a0294f546" Size="904" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="939378" />
     <Blob Hash="0fd015d7d120ce4a89fab86a3cd9ed012db3232a" Size="66306" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="531814" />
     <Blob Hash="0fd09dafd28fa6c3065163ba6ae396b91d95d694" Size="23552" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1857159" />
@@ -40795,7 +40689,7 @@
     <Blob Hash="0fecf218e6778476c817897613a01e363a13b400" Size="2863" PackHash="6127c305de0e48f8d5572ec15328dbfc52bd989e" PackOffset="1308044" />
     <Blob Hash="0fee4e39037f4dc843ad030d44026e212c9f8c86" Size="8994" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="214133" />
     <Blob Hash="0fef9ef6a6c664aeb2ce63bd045834d053a9f243" Size="200" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1914556" />
-    <Blob Hash="0fefe8acfde1d0284599d8633a959e6a5670ae9b" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553776" />
+    <Blob Hash="0fefe8acfde1d0284599d8633a959e6a5670ae9b" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673008" />
     <Blob Hash="0ff1563eea7006d1f177bcb1904cd9b8ac2daab8" Size="5425" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="102159" />
     <Blob Hash="0ff1fdcfbc7f3004f0c16e208f83c9ff70a00d90" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1102114" />
     <Blob Hash="0ff3dace17520538b1a4fe2e8741efd4da0e55fa" Size="2670" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="1404814" />
@@ -40810,6 +40704,7 @@
     <Blob Hash="10043cedb5eaaed9ada7936bc2433bbab17e5d95" Size="15126" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="2072810" />
     <Blob Hash="1004da662065dae086c8cf258250d8461df4cd22" Size="1114" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="259657" />
     <Blob Hash="100553efd421acbf68939d8ce21dec31dcaf4b6a" Size="89783" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="501951" />
+    <Blob Hash="1007cc58469513f23a424bd647c652cec29a323f" Size="31350636" PackHash="4d1f6f258386c25e96c9943f52c6b5f9133e84e0" PackOffset="8" />
     <Blob Hash="10092d6e526cb6c3d2f39c95ab871c0f3928c36b" Size="18854" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="466461" />
     <Blob Hash="100e6b531ca48e6684f98e0d82793a8f81228c5c" Size="2880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1955994" />
     <Blob Hash="10100a4d742ebacafdbbdd7db94ba5d0d9166f39" Size="411" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="369967" />
@@ -40818,15 +40713,15 @@
     <Blob Hash="1013a5ebb578e3cd539d92dec73f941dc3719ecc" Size="3246" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="749550" />
     <Blob Hash="1018eb18d62893fcf8d3b3f1405a9edd304af2e8" Size="78987" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1091812" />
     <Blob Hash="1019286c797775fb38e25f4c2067955870e99bd4" Size="16396" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="798717" />
-    <Blob Hash="101b8777d7c47f015f79b0634715ae277a1d2ab4" Size="64" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556025" />
+    <Blob Hash="101b8777d7c47f015f79b0634715ae277a1d2ab4" Size="64" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675257" />
     <Blob Hash="101f556813acaa6fe87127a6528baaca25451187" Size="19456" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1981960" />
     <Blob Hash="101f5f1c02e2d966404bf9a4799300120f5a9be3" Size="2676740" PackHash="fd63513879784b9901479056b82fc51c57ba8666" PackOffset="8" />
     <Blob Hash="10225df5181706b6abd3a4ec2cc59f267df54b96" Size="5415290" PackHash="8ae41d0c7d8fe2a00251726554c48ce1dec9ca04" PackOffset="8" />
     <Blob Hash="102507e362ed38434309c6ac32903f75eb4d4603" Size="127338496" PackHash="e95c41f528c90604e041b493ac16032dc040e0b8" PackOffset="8" />
-    <Blob Hash="10252b52a10ba7d73ab1c8b3785232e1fabc3bdf" Size="1759" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1001131" />
+    <Blob Hash="10252b52a10ba7d73ab1c8b3785232e1fabc3bdf" Size="1759" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2048648" />
     <Blob Hash="1026926ab4ecda8b19adfa18a1986b9e2d3a22b6" Size="15982" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="30604" />
     <Blob Hash="10312beb9d74f850c10c93a7e2d3e9af4e2e7b34" Size="73592" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="1146169" />
-    <Blob Hash="1031caa799c9429430af2fe9357f833c38ad1a28" Size="217" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1823107" />
+    <Blob Hash="1031caa799c9429430af2fe9357f833c38ad1a28" Size="217" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1942339" />
     <Blob Hash="104102aae9aacf2cecfcae0a1f4c14c140872e2f" Size="135642" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="1385927" />
     <Blob Hash="1043b5a82c0470231bdc2809dd65256e7a083999" Size="88128" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1526477" />
     <Blob Hash="1043e24f0334f95ed4c006ecafae53f900035574" Size="137" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="440019" />
@@ -40847,7 +40742,7 @@
     <Blob Hash="10550ad690c2ef6b34225b1648596cffeb0e8fef" Size="1145" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="431454" />
     <Blob Hash="105619675bdb8961fab455bc98679c96b50280dc" Size="5632" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1179413" />
     <Blob Hash="1057f0840c0204f946c873e7127723c875ee60a8" Size="5616" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1915420" />
-    <Blob Hash="105957ddbd425ffc43708121800e5f0e309ae906" Size="757618" PackHash="bb022a63fffc9c5c6ff480c0a6e1727d0b035c7b" PackOffset="1137694" />
+    <Blob Hash="105aea1349325feea1c1ca3e96adf2b3a2e97961" Size="7078" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2075686" />
     <Blob Hash="105bec852cb982f3814052e002ed06dbb3d0aa22" Size="164529" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="705710" />
     <Blob Hash="105cc9cc77247716068fd28186b8a1adffe169cf" Size="4788" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="692280" />
     <Blob Hash="105d5ddbc6c3d6879b938540f46a2433978eb29e" Size="95829" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="732318" />
@@ -40855,7 +40750,6 @@
     <Blob Hash="10633737281e697224661c57ed81ca83e4af965e" Size="6059" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1334832" />
     <Blob Hash="106714a0712ef5d8c229c52131c324d1537aa365" Size="4012" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1762041" />
     <Blob Hash="10689deb72a2fc8e3905061cab1d904d94deb143" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="601739" />
-    <Blob Hash="1069db466547c5dbb55b63fcd683482698d2b594" Size="18230" PackHash="e5b3b0b0e0fcf3b7cd35801b8fc4b29528e1254c" PackOffset="2058090" />
     <Blob Hash="106a808417061a91977cfc5381469f935572d882" Size="954368" PackHash="bc4cf9d4758f107d90920f50b55c8d1240dfe8bb" PackOffset="1134600" />
     <Blob Hash="106ccc8f7fec8cba73a34fa1ff9b94f8a66cebb7" Size="422526" PackHash="12eb0444499ce41f101b1b5f9dd6b87894949511" PackOffset="1475955" />
     <Blob Hash="106e893cc744b275a70be4048025e97c81dcf325" Size="5717" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1209729" />
@@ -40865,16 +40759,15 @@
     <Blob Hash="1078543ae3352043041a4b3158a137cd9f5a3cf6" Size="2660" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="464900" />
     <Blob Hash="107859f2c28470bb6fcc7e80dc7eac6c8cc91ea1" Size="152" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2093520" />
     <Blob Hash="107d635b7ebdbec8269768c80f82c5810cc99514" Size="2579231" PackHash="28f28af32374399fd5038c49bbc925c725658cd2" PackOffset="8" />
+    <Blob Hash="107fceae72328da4ebf126bc4b6e7b7713d354b4" Size="47211590" PackHash="a10aeba2dc6e4e25fc6b8fab46bd066ea6e0d62f" PackOffset="8" />
     <Blob Hash="10834cea599124d35d45b204a654ce9fa12a898c" Size="5044" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1942750" />
-    <Blob Hash="108731119b5d67a3feef9ed27e84d49dbfbf3807" Size="1441598" PackHash="633cc93192c20b93236f72ee9aff7d4935f3b714" PackOffset="8" />
     <Blob Hash="108a29f72f0f169db53dc39bac81b73154cdb02a" Size="1013" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1789284" />
     <Blob Hash="108c350eb81716296139182a316d1eccf5ec21e6" Size="15218" PackHash="a26c64f13ec689d9891c68f7e106bd1e1bef4345" PackOffset="2081274" />
     <Blob Hash="108c42af6d73ceb4282e2146753a76000d996900" Size="3387" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1939363" />
-    <Blob Hash="108f38e1f70188853106f668b902e3ad5f6a1299" Size="4092" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1258459" />
+    <Blob Hash="108f38e1f70188853106f668b902e3ad5f6a1299" Size="4092" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1707361" />
     <Blob Hash="10950eca798f24a7c405b3e18b559ccc0c056ec1" Size="1025" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1075021" />
     <Blob Hash="1097af1494425b0cc675ce87c4afced457e273e5" Size="11033643" PackHash="786bf5de2572ab7c7e504b2b82788b0feb90da46" PackOffset="8" />
     <Blob Hash="109c64cdc5f02078b05b68ef72eb580a025c84ab" Size="585" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="404005" />
-    <Blob Hash="109c7362927673d425dbfc15c013891d184f9e03" Size="1181964" PackHash="9336e2776e5a12bccb3132d9ca25fbaa7206fde0" PackOffset="8" />
     <Blob Hash="109dcf93b6e9969a541e063af82b2f3e28051cc9" Size="47706" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="2016814" />
     <Blob Hash="109edf3ff7c638b78363e485769e9683e785fec3" Size="1256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2095535" />
     <Blob Hash="10a22da8085606eb021c2fb2212c79e824f427c6" Size="718696" PackHash="53f4b5b01e02d052c81a4d478905d84d17f624f7" PackOffset="8" />
@@ -40891,10 +40784,9 @@
     <Blob Hash="10b70115a2f91b96e1b2be66b53330909428ed47" Size="35544192" PackHash="47f95a951cdf631d7403b512f1881ad64a1a45de" PackOffset="8" />
     <Blob Hash="10b7bd089a695e64a5f39cab9501c32f8ea09363" Size="220041" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="1669462" />
     <Blob Hash="10b9743f7d8ccc198df0dd6edd6e29e34b9067dc" Size="2222080" PackHash="e1c1bf258f98af21806a3c9f2af05ec8529525d6" PackOffset="8" />
-    <Blob Hash="10baadf5db8dad4aafc6b7d4eb65963e629eb295" Size="37187266" PackHash="ff962dd75779d160015d7a57a53e98e44f47d7af" PackOffset="8" />
     <Blob Hash="10be7169138efe2da7af1ce3cab91ee6b2125638" Size="2708" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="536960" />
     <Blob Hash="10c006446a10406a5644c4033665e877ebf72af7" Size="347" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1126435" />
-    <Blob Hash="10c2dd35a83d28b9ace01ccde8c1cb7f8c2bd493" Size="673" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1395460" />
+    <Blob Hash="10c2dd35a83d28b9ace01ccde8c1cb7f8c2bd493" Size="673" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1514920" />
     <Blob Hash="10c3df877c85ddeff6c0c89e32484db282ce7ead" Size="225999" PackHash="f4fed3583021f5ff06710749a1c7c47f83deef12" PackOffset="166043" />
     <Blob Hash="10c3f227ef0ec7aeb3046880c037076c3d3ae96b" Size="13184" PackHash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" PackOffset="1989189" />
     <Blob Hash="10c85a1f98bd1ae3d8252a44ef2c3da1daa477b5" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1443000" />
@@ -40902,13 +40794,13 @@
     <Blob Hash="10ce39d5c1bd901a3ddeecc6edd3a76b6c9623fb" Size="597192" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="745062" />
     <Blob Hash="10ce6ca31cb30be3025b9fa812edb82193b56912" Size="3340" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="105833" />
     <Blob Hash="10d5fc8a1a7a7e0155f1308a633452ec1267979c" Size="24424" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1797580" />
-    <Blob Hash="10d796f74ad5253221f5c4975c4fa2d1a9696154" Size="4135" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2092995" />
+    <Blob Hash="10d796f74ad5253221f5c4975c4fa2d1a9696154" Size="4135" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1983881" />
     <Blob Hash="10d7c1696bc5a4fa04699d8f9dce872f81070b24" Size="5205" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="939762" />
     <Blob Hash="10d834acf094e5e0e7fc1882e866a4ca7f1f7c05" Size="46158716" PackHash="911361f8e8713d6e626bc528a2410bc530f71a6e" PackOffset="8" />
     <Blob Hash="10d946f6721355747f947a6c8cecd03e9b06dec6" Size="3929" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="235571" />
     <Blob Hash="10dba922a6fcb762552ba63684b206b6ef25df17" Size="13594" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="970760" />
     <Blob Hash="10dbc383f7c49de17fc50e830e3cb494cc873dd1" Size="26816" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1726824" />
-    <Blob Hash="10de837ed312d4afe6891f1cbd02c8a6c6adb5d8" Size="8522" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1675548" />
+    <Blob Hash="10de837ed312d4afe6891f1cbd02c8a6c6adb5d8" Size="8522" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1691373" />
     <Blob Hash="10df56cfe4922e6f7d3ff86b152e197d1726f1ea" Size="46030" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1953654" />
     <Blob Hash="10df6a5a0c38368dba7f432d07711d1b576c11cb" Size="23593" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="417741" />
     <Blob Hash="10df81c04dbf221d4fc5b44294900b98e3856d80" Size="43889" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="532657" />
@@ -40922,7 +40814,7 @@
     <Blob Hash="10ed7dc06d1b0d496da4e195bd4e7c253659f54a" Size="5295" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1131336" />
     <Blob Hash="10eeb187cd7a3bc110c991374dc52c24fda13d16" Size="643" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="1803645" />
     <Blob Hash="10f40aacebe7548f8e48701e01a4712fe1d3df0e" Size="9973760" PackHash="73205aed24a567c47e434f10a23d7c0433040c04" PackOffset="8" />
-    <Blob Hash="10f52933d77aa1d9a39a922d8cf5131162892cf0" Size="1504" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2091218" />
+    <Blob Hash="10f52933d77aa1d9a39a922d8cf5131162892cf0" Size="1504" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2086682" />
     <Blob Hash="10f6ea60847a7702d54a5c7fc52c435706111197" Size="4266" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1613120" />
     <Blob Hash="10ff8c5a57bc95928cb4ececb3615f3f21ce3e53" Size="2999" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="950087" />
     <Blob Hash="110372382ca696744afb59be1ef7cf20f576bd82" Size="54600" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="1996645" />
@@ -40932,6 +40824,7 @@
     <Blob Hash="1108b808429de55977ad90e55e167d36e54bf0a4" Size="19903" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="78762" />
     <Blob Hash="1108d3901059be93ec68f185103a62c7dd9ba45b" Size="6930" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1842653" />
     <Blob Hash="110b85a3e10f4418ceac8b96f1848e3486af5c4e" Size="1247" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="625352" />
+    <Blob Hash="110d762b5dbb0a31e4bca5b28b73049204156847" Size="1591714" PackHash="efb18c0b48ac0e26ab7348b2a7929dc882a93c97" PackOffset="8" />
     <Blob Hash="110fb50579e358c31b1b9155a9ed7adadf7299fe" Size="2864" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2071512" />
     <Blob Hash="11108cb0e9576c21731ab486e0b2ac5f74e0d008" Size="1981" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="734163" />
     <Blob Hash="1110a6909d2067bfd940fe74dda3621d14810015" Size="400060" PackHash="06f561a38764b8e9c4087a97ed512c995363927c" PackOffset="1595514" />
@@ -40939,7 +40832,7 @@
     <Blob Hash="1112ea49dff8a1373848a3e57a3a6cd998cf40d2" Size="7317" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="1970914" />
     <Blob Hash="1114856ffb847b2d0a798bd050f9de78c7ebaca9" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1910257" />
     <Blob Hash="1117027e8f4fd78e116902551cacce6f136ca263" Size="26987" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1105536" />
-    <Blob Hash="111a670d0ff5714da07074e3b753be8d8a600ca0" Size="418" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1611282" />
+    <Blob Hash="111a670d0ff5714da07074e3b753be8d8a600ca0" Size="418" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1730514" />
     <Blob Hash="111c09be21174f472efb43cc803c769316f4a854" Size="10330" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="2073374" />
     <Blob Hash="111ddc1e1fc44f89b34318897a57a289a3645757" Size="5119" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="2081126" />
     <Blob Hash="111fdcb162f49eb54bc6265244671af532112bf2" Size="125" PackHash="1a59312b7071dfe1ec3cc2477256fd82fd2b01fc" PackOffset="2097001" />
@@ -40959,27 +40852,29 @@
     <Blob Hash="1139b8f4efde61a6df0243ca4787d3666931b8ac" Size="1291" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="55137" />
     <Blob Hash="113b9af7b62321844946a0973ed80e9e55b2d189" Size="85928256" PackHash="bd0074eda451f9864389d34ed5720ad1086a8482" PackOffset="8" />
     <Blob Hash="113e3489f78741411c8bed25f6bfbc287befd6ad" Size="19654" PackHash="d95d0dfee072d179a0e04916b7b80ef37d1f6fca" PackOffset="2074706" />
-    <Blob Hash="1140821c8809d36a8c3918ee2784a4cd9b840ecd" Size="18921" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1946768" />
+    <Blob Hash="1140821c8809d36a8c3918ee2784a4cd9b840ecd" Size="18921" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="1846264" />
     <Blob Hash="1142aeb2a2e967c41f5da2d69816223d235c0549" Size="39349" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1144861" />
-    <Blob Hash="11487214bbc0d1b2e058e8e6334aa4bbabcac0c8" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549282" />
+    <Blob Hash="11487214bbc0d1b2e058e8e6334aa4bbabcac0c8" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668560" />
+    <Blob Hash="11490bca713cdcffbd79fa39a071984b6be1e0d8" Size="2212160" PackHash="a10e44b65416386cbd7552fb1e5eac6368582e74" PackOffset="8" />
     <Blob Hash="114dcc7092d6aed2ba7280027b641623d55c8b4e" Size="12433" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1001592" />
     <Blob Hash="114dedad20db91dde4e94dcd8ff95234f8d6af7c" Size="3157" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="214218" />
     <Blob Hash="114f53cb48ec038ce5ee8694904d7f54544fac09" Size="415504" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1477273" />
     <Blob Hash="1151bd3ddb648943cf6ba89b66546c28b7b09edc" Size="3388564" PackHash="730822767c19d479de3afc2e926cfd7438e23852" PackOffset="8" />
+    <Blob Hash="11536186a4e91ca2cabc5578381c1cae5a736a42" Size="2447688" PackHash="1ffca679392547067aab2bffb13252e6c744507d" PackOffset="8" />
     <Blob Hash="1153b8359d0c8b039d80c4dafbe1fa2482f3df71" Size="96605" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="973675" />
     <Blob Hash="1153fe413dfe2d6ffe0eeac83859dbb803da91ca" Size="908" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2042102" />
-    <Blob Hash="115772872a2a47126e4ffd34805444ac44b121c4" Size="7517466" PackHash="d2b27f78e444d9a3a5905bf3be2dd414dd52baf7" PackOffset="8" />
     <Blob Hash="11585dca02a5edacc200fb4ac5c37c3e2363978b" Size="190268" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="673605" />
     <Blob Hash="115d655b172c6cc4e52a6365e1905c6a8cfe082f" Size="172" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="2067232" />
     <Blob Hash="115e1a9e6720aba6c90c7b80cbe94547e689ac1c" Size="25664" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1248436" />
     <Blob Hash="11627d947cac80b683074a8924e7ddc0c3140ba6" Size="2860264" PackHash="95296a5d7f35c591ee27c60a427abc7ae30eb0b1" PackOffset="8" />
     <Blob Hash="116317c32bd49e704a1f1ec378041e374e3942e1" Size="212" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="2096565" />
+    <Blob Hash="1166db230fffea82dd9fc967a124c2226fd7d8ce" Size="89555518" PackHash="a037026fe85950ebccc0ba9fd0f2c5b003aaf28e" PackOffset="8" />
     <Blob Hash="116d331a2833be6787d082ea521df83d35906c44" Size="1479" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="730315" />
     <Blob Hash="116db12c4059a930632660eca635d79ea0e3faa8" Size="5353" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="506923" />
     <Blob Hash="116ed212991ed404b00e0cdf768c0bc577cf1cbd" Size="1450" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2089353" />
     <Blob Hash="11730b81de379b3be03bfe9ea3aee60f8e936b3f" Size="10240" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="245256" />
     <Blob Hash="1173bd70fe7392315330064964a9259b518c7355" Size="6109" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="399916" />
-    <Blob Hash="11747f891fc378f95492009a797fc8aca0500886" Size="2967" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2045898" />
+    <Blob Hash="11747f891fc378f95492009a797fc8aca0500886" Size="2967" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2085182" />
     <Blob Hash="117526e3d07ca8de616cdc1b7a795cf26367ec07" Size="191" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2053965" />
     <Blob Hash="117576ebf07fa7434545bfd5530ce9ed8342b731" Size="21043" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1939617" />
     <Blob Hash="11766ac0231553679cff330625d3b8ba6d221450" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1921474" />
@@ -40993,7 +40888,6 @@
     <Blob Hash="118bbf4bb7d1a0305736967fb82db88b499257fe" Size="23192" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="32785" />
     <Blob Hash="1194bc19df5b3d919e1c3c3639828d1d66797e42" Size="88646" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="826394" />
     <Blob Hash="119759b78f7a945ad87cc9d5fd94ab08ffc1f57f" Size="1246" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1766066" />
-    <Blob Hash="119ec54f8833c3ee057914437689c5a00a759f44" Size="3342584" PackHash="aa96a9dee18d1a197012bbe25ad7e482199ea49a" PackOffset="8" />
     <Blob Hash="119fcc7394d89aee12b00c8ebeca1a7fac88c73d" Size="405" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="226321" />
     <Blob Hash="11a1794a50b0cb640a7cc1825cd96748b9a756e1" Size="147931" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="518098" />
     <Blob Hash="11a2eaea19c224a577aee9025127960c1995a6d9" Size="36272" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1922177" />
@@ -41004,7 +40898,7 @@
     <Blob Hash="11aa1c543181c0f17a06cfa361e2bd2afba8ffd0" Size="77427" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1509255" />
     <Blob Hash="11ad26d5086da68db36ae15d06f81284a62d7b77" Size="937984" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="1134600" />
     <Blob Hash="11add269786515b6c03da7dfeb3a12d51afe91bc" Size="2948" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="99677" />
-    <Blob Hash="11b4ef6ba49ebf7ed2911f26364cecaae2a68d14" Size="29788" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2063525" />
+    <Blob Hash="11b45ae237252c736db04d5e1aa7906da75c03ad" Size="2740224" PackHash="169c16f72285688d1689d6a43d1dd08c35f2952a" PackOffset="8" />
     <Blob Hash="11b5e1f0129a244b7118bafafe6d991ceed9be7b" Size="3189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="12244" />
     <Blob Hash="11b634d0587f4500ba5ca9e776953e9177e6ede8" Size="3192" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1450440" />
     <Blob Hash="11b9ede0e7e11060db22bcef345b88079939f55c" Size="1929216" PackHash="e235435af47d241bf8a32655040bb6bcca173961" PackOffset="8" />
@@ -41014,6 +40908,7 @@
     <Blob Hash="11c2efaf63a983970149356b8c84d51b55bef270" Size="1700" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1725155" />
     <Blob Hash="11c62bb1628f382ffaed7b759b21c5be0e5bb9a9" Size="3274" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="665455" />
     <Blob Hash="11c69ac4a43d85fa72c33be5844da352fd0e9d11" Size="2168" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="180543" />
+    <Blob Hash="11ca42f3fc3e884b44b2e99653a033cfe5a029fc" Size="4146432" PackHash="6824b3d1876fe7dc3f2d179a8ff690fda731080f" PackOffset="8" />
     <Blob Hash="11cbf2864fbc205b10dfb29d50cf1def95ae486e" Size="1132" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1973453" />
     <Blob Hash="11cce189612f0dccd728e1bf8978f204c671093c" Size="202" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="152343" />
     <Blob Hash="11cf6ec0519490845040a6f0f4e033dc665fdce9" Size="503483" PackHash="1916cbea932d8ec4cbe73743294b2456b6f82f4d" PackOffset="879853" />
@@ -41039,27 +40934,25 @@
     <Blob Hash="1209e5b53da9dc8b22a4afc20efac852d9d1518e" Size="2363" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1635079" />
     <Blob Hash="120d06dbbc25fbdec2b4a0b156b1a60a43092e9a" Size="10760" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1095216" />
     <Blob Hash="120dbf971f0e1c71dc411584ed52e64f8dbe94ce" Size="125" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="2097028" />
-    <Blob Hash="120f33f9f06648b5239d41935dca2287e5efc003" Size="7521568" PackHash="59f96b60d02c9e09d0a430c7dec8271602dcb74e" PackOffset="8" />
     <Blob Hash="121055425037d66bdc493f55378d733264695281" Size="124" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1958852" />
     <Blob Hash="121303331223925bfb708918baed3cd2f0e33c60" Size="7541" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="495954" />
     <Blob Hash="1213908cc1ddef8e8e23ba803c157b98443e0331" Size="79355" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="929820" />
     <Blob Hash="1213e649278b4e0c722d66738414e7fb3305c9cd" Size="3829" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="995578" />
-    <Blob Hash="1216495c5ccd5555fe98fb48db771b3ae06adf42" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553628" />
-    <Blob Hash="12173660d1e7238d6b307cbc4673515d2a7b7e2e" Size="492" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2062361" />
+    <Blob Hash="1216495c5ccd5555fe98fb48db771b3ae06adf42" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672860" />
+    <Blob Hash="12173660d1e7238d6b307cbc4673515d2a7b7e2e" Size="492" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2081960" />
     <Blob Hash="12183107279f17d42b0fb6a0c1e94e87a3049291" Size="37761" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="702710" />
-    <Blob Hash="121b98f45b8efdb08991c775fc539e7fcc95c5ae" Size="7636" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2067255" />
+    <Blob Hash="121b98f45b8efdb08991c775fc539e7fcc95c5ae" Size="7636" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2087023" />
     <Blob Hash="121cc24eeb7fa85ede907bb31b5b946ebde7216e" Size="2863" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="912684" />
     <Blob Hash="121e31fa59168945d9aed9c24e8258b4b377d585" Size="9573" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1253041" />
-    <Blob Hash="121eaeaad6fd9768a822869f4c98c09d498a9ad4" Size="3747" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1765686" />
+    <Blob Hash="121eaeaad6fd9768a822869f4c98c09d498a9ad4" Size="3747" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2086756" />
     <Blob Hash="121f11597f9c333564a138b32c9cbb954d22d1c9" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1124752" />
     <Blob Hash="121f4d3d607d7549a36c165dd79a034503953ba0" Size="918016" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="372944" />
     <Blob Hash="121f7117621bb3adae46a550bf38147777b1a123" Size="244" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="225771" />
     <Blob Hash="12200fa9f9980dd9c2635fbb566e3f94d6a5d0d7" Size="21070" PackHash="b631e3c32bd27c8c824ec6ec629c9aa8d48dbecb" PackOffset="2075413" />
-    <Blob Hash="1224380c9e387a52cc7e1744eea9ebe7836e3304" Size="44189" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="564671" />
+    <Blob Hash="1224380c9e387a52cc7e1744eea9ebe7836e3304" Size="44189" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="1876494" />
     <Blob Hash="1228000c143d4c460ddf0a9763bd546f04dfe995" Size="92" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1742678" />
     <Blob Hash="12291f799cd8a1a71fa91adc8a0e5dd3e70063b2" Size="20016" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="574592" />
     <Blob Hash="122a4cf065459e3940bdc0d8eeae127806657e24" Size="38799" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="8" />
-    <Blob Hash="122d95a7ff5663639a42dcc9e22def9f80038800" Size="1054" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1295878" />
     <Blob Hash="122de5521f6ea933684d89a9273c77d6fce52d87" Size="4864" PackHash="1cb0a16db6f4f3cff25cd2585257353b73810e04" PackOffset="1473765" />
     <Blob Hash="122ff3b104849a14f4f2fc52de305092babb1194" Size="1050880" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="507424" />
     <Blob Hash="1237bd5f02a21ce1617403138e5f1e74bea2085e" Size="616536" PackHash="6800c550338fea7b195e2b332127959f20c7d3fe" PackOffset="1236860" />
@@ -41076,6 +40969,7 @@
     <Blob Hash="124d4b417c758186ef690fa749544c7910999955" Size="355" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="281014" />
     <Blob Hash="1253e12068315324525d7766e7eeaf2a1ba10ce3" Size="56742" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="828147" />
     <Blob Hash="12575cb37f3fc0c68d62cf287e00913f91f47767" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="860360" />
+    <Blob Hash="125c4c58c7e16b76fb5e87e55efedf5150426b72" Size="1829944" PackHash="44621fa100827af0f1dd9c96f1f14135aa85da68" PackOffset="8" />
     <Blob Hash="125f9c625084b0326d6d4fbd2fa506ff49aa0a99" Size="27326" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="520988" />
     <Blob Hash="1263fb840ac4955ca052c37f1b0283eaca77d3f8" Size="1696" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1692" />
     <Blob Hash="126e57c2c7bd10179b2dbc90bfb8af0c3576f6ea" Size="23164" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="481443" />
@@ -41083,9 +40977,8 @@
     <Blob Hash="1272b1611ad772dcb87293ed396387905cd4ac22" Size="361" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="933835" />
     <Blob Hash="1273ad761785e2d4f755021e4d45a70b12c30c2c" Size="3192" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="2071609" />
     <Blob Hash="127456a67cba04bceea66aed858056c2e09aa9bb" Size="18781" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1382365" />
-    <Blob Hash="127574a5e478faada11b6828cfc38a7472a1b648" Size="1172332" PackHash="d24d9db79effe09252916efa3aa7697ca3bb78a4" PackOffset="8" />
     <Blob Hash="1275aac37eb58bec3f09a42d3051beeae353a3c7" Size="5064" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="517994" />
-    <Blob Hash="1276ef26ed520f57c7c9c01aa57d7cce9eea7d4e" Size="3298" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1251877" />
+    <Blob Hash="1276ef26ed520f57c7c9c01aa57d7cce9eea7d4e" Size="3298" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1700779" />
     <Blob Hash="12772847aa4817c459368e091e13f0d1ee550ea9" Size="1342" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="2095717" />
     <Blob Hash="127c6b08fcd3c30d6f048ffe578eb1692da12b2b" Size="2437" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2002698" />
     <Blob Hash="127d4ad4c4c4bb67f26edea732f4db484e25eb5d" Size="467" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2045423" />
@@ -41101,11 +40994,13 @@
     <Blob Hash="128f638c7998ec6a198b0888e7a9ebb621cdc95f" Size="2176" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="855610" />
     <Blob Hash="12915fe8fdf14ac31eca359541878b16551b03b4" Size="118" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="203054" />
     <Blob Hash="1293319af2744e78657ad525da6806b492c5c38a" Size="36928" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="1981890" />
-    <Blob Hash="129674c1360f433485823e11566b73e38600bdec" Size="1160" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="704096" />
+    <Blob Hash="129674c1360f433485823e11566b73e38600bdec" Size="1160" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2080352" />
     <Blob Hash="129c3fc4de3b04d326152506ba85bca26c91b3c6" Size="670" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="245081" />
+    <Blob Hash="129c583522f76a3c0244bf2a2c5c0e609929a835" Size="3329536" PackHash="3726283edc9360f29cdd257bfce664aa29395ae7" PackOffset="8" />
     <Blob Hash="129c9f457b497c7237738801b3d90328521fde64" Size="2802" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1270061" />
-    <Blob Hash="129f29429b329a1b2c64664a9c2802160a0c1143" Size="688458" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="1379848" />
+    <Blob Hash="129f29429b329a1b2c64664a9c2802160a0c1143" Size="688458" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="826384" />
     <Blob Hash="12a0401026c5c036144fd1d544173aab39969f61" Size="7675" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="488090" />
+    <Blob Hash="12a3b8fbe0186601d51253213b152af6d42e5af3" Size="3385064" PackHash="513e09cd9ad596a1f1f9aced15971670187b34db" PackOffset="8" />
     <Blob Hash="12a410f2e099a65db5c188688aaab62fed4dda4d" Size="6754" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1117493" />
     <Blob Hash="12a8119a7006e0c8941039ddcff5f78e7c24487e" Size="7936" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1329533" />
     <Blob Hash="12a9f0f9f9b0dcdb544424ba1045aadc484c9a87" Size="35859672" PackHash="c9e1c5c93a25b5410ba6e40b82950367bc3ebcd8" PackOffset="8" />
@@ -41138,6 +41033,7 @@
     <Blob Hash="12e57ed557e16940c6d1a4969f19a6de2faca8aa" Size="109461" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1531681" />
     <Blob Hash="12e772de7e1278c57dc8f85149d1f9057d688a3f" Size="2104" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1126691" />
     <Blob Hash="12ec64b32018e596f1924bd7dca4c8b6e3c00c9b" Size="3062" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="389610" />
+    <Blob Hash="12ef269c13cb3fa2fd253ad7a59aa15cc3cf82c3" Size="43037772" PackHash="7f90803950ab1a6103fc4e9770016325c39094a7" PackOffset="8" />
     <Blob Hash="12f1cdb30e532827c6f0c6b432dac6d9ca0b3df7" Size="3973" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1259527" />
     <Blob Hash="12f3868e6144c09ede93dd3ed99a1977b86740d2" Size="387062" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="8" />
     <Blob Hash="12f4a547cd7952638669129105d5b5f04cb58d09" Size="88" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1010584" />
@@ -41151,15 +41047,14 @@
     <Blob Hash="1307f19150821f1c5516b266cb9e53ed6876d668" Size="8653" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="190252" />
     <Blob Hash="130d7548dffebce74969962e335b40299d7c5c54" Size="187" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1849072" />
     <Blob Hash="131747a61acabcfffb556d9604cbfc675a5a92ab" Size="4329" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1608791" />
-    <Blob Hash="131777364edb9a1b0a05c1d4fdf322283b791d59" Size="1496638" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="8" />
     <Blob Hash="1319785bd5be6858574d1b15cecb874553c0e03c" Size="266" PackHash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" PackOffset="2096857" />
     <Blob Hash="1319a05db33bbce76fdac33eb6b068ea32aa5c10" Size="56744" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1603546" />
     <Blob Hash="131a18ec2745e0fa66090e798f5ee26c0a7af14c" Size="4194" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="2048063" />
     <Blob Hash="131c0b1f81fb1dc5f913a9aec2e2e43832207cf8" Size="52224" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="868080" />
-    <Blob Hash="1322402a2ce355df5d8df333e4770c4dbf09fefc" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548159" />
+    <Blob Hash="1322402a2ce355df5d8df333e4770c4dbf09fefc" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667390" />
     <Blob Hash="1324221f7f59420ce13bf1e18620fb0805fbeea8" Size="79544" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="1261877" />
     <Blob Hash="13276acfcbdac41a77cb6616b9f5d5e640b5dea1" Size="116451" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="1524494" />
-    <Blob Hash="1327991372f8a6a6f3d1914579d363b3b20a4440" Size="189762" PackHash="3491acd3495d393fddd95e53ae58e13b61e6eced" PackOffset="1833356" />
+    <Blob Hash="1327991372f8a6a6f3d1914579d363b3b20a4440" Size="189762" PackHash="63d57bc7338d3f2c7d705c91585c8a1688cc8906" PackOffset="1869685" />
     <Blob Hash="132a6c182d227d47f319b259f0395a2158c2d6e7" Size="9975848" PackHash="fc4098e00456e3c821dd7e28955fab11c1e120f3" PackOffset="8" />
     <Blob Hash="1331c90245afe453483af5c94e835eb267425a5c" Size="46526" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1971100" />
     <Blob Hash="1335d82ba69f2e6581b56e82c2ece9759baedbf8" Size="4025" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="427195" />
@@ -41169,18 +41064,18 @@
     <Blob Hash="1340c4850ec39a3f96f691ed2d3d2d342925b220" Size="5257" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1542398" />
     <Blob Hash="13414abe7c0c59cfb0a9352a5e32a93e54d14af3" Size="7888" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1365504" />
     <Blob Hash="1342bb2e91d5f62737bbcd3daa498505fd87c042" Size="149475" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="8" />
-    <Blob Hash="1346b21d500f5109448091559d208f10ac80476c" Size="259" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1319850" />
+    <Blob Hash="1346b21d500f5109448091559d208f10ac80476c" Size="259" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1768752" />
     <Blob Hash="1347a9bc86532b13357baa22becaf3f1d644e2ae" Size="8264" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1759644" />
     <Blob Hash="13482ebbf2ce30a533e5c9305fdb5ef906a64a58" Size="171005" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="8" />
     <Blob Hash="13487667acd5d344577ff2669fa1e26c17e17a53" Size="293888" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="827736" />
     <Blob Hash="13488e4f28676f1e0ce383f80d13510f07198b99" Size="3889" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="2091819" />
     <Blob Hash="134b1c488d72f85461bd1bd39a34f1878911690c" Size="38" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="2097084" />
-    <Blob Hash="134d27d5f4ea13c648dc9cfb17d4e5c2ea9f3cec" Size="7152832" PackHash="75491222529ccc0d4e28b2e2dbc238f8be5d220f" PackOffset="8" />
     <Blob Hash="134db7c1231b2583e6072111f330b0ad4c9069f6" Size="3300" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="624644" />
     <Blob Hash="134e23da1d193af847de6eacd1a7270a5cf618c2" Size="3632" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1755731" />
     <Blob Hash="134ee00356e5c3875e94e11cd6fce55181db4b3e" Size="161727" PackHash="6a62a64a9601d1028e98c3f9d8d1ce2dbb93b1e9" PackOffset="1701982" />
     <Blob Hash="134f74a3ffe9ae357d0899c63c3059bfd7cd6865" Size="58675" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="620053" />
     <Blob Hash="134fb86e9f019d4e6b6cce7c5e687b840ff80fb3" Size="7892" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="993700" />
+    <Blob Hash="13509391f29a2b8543782efe4b42cfda6d583152" Size="315704" PackHash="1bfd9b85a7181c944374fc8a94632065574a0029" PackOffset="1781372" />
     <Blob Hash="1352ee31a42a0f4a5ee1e5806f8fa1eb506d1de0" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2083290" />
     <Blob Hash="13545db64de8491ea860b85c524cef88596420db" Size="198" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2088962" />
     <Blob Hash="13620bd26ae3fa2426bbfead3f20e974e4356c43" Size="51" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2096919" />
@@ -41193,8 +41088,8 @@
     <Blob Hash="13744d571cccd9910e3f2821790f43b939dd6dcd" Size="100166" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="51445" />
     <Blob Hash="13751f1cb9991eb7b6afa3f93759ef8647287a17" Size="237" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="383439" />
     <Blob Hash="137ac8cca23f39e7a16c4050ea9a3a8731e9aad7" Size="166" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="561016" />
-    <Blob Hash="137b1d7870490be4bc4a142e4ef18d4789123e41" Size="1286" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1969063" />
-    <Blob Hash="137be3b9865096090c0aa955def1575d7dfa6771" Size="18016" PackHash="772be2a1b26f994f4af5928b9a48434ff28b41b2" PackOffset="2073192" />
+    <Blob Hash="137b1d7870490be4bc4a142e4ef18d4789123e41" Size="1286" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2077814" />
+    <Blob Hash="137be3b9865096090c0aa955def1575d7dfa6771" Size="18016" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="2022934" />
     <Blob Hash="137de871f88a0e965ab9b0e847d5b2a0c2e44497" Size="3695" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1995263" />
     <Blob Hash="138383c904fc979eac993944af7f3300cc24f36a" Size="219" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="606164" />
     <Blob Hash="1383cd0fd40fd5fcc17a60f3d5a415a22a153a21" Size="2742" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="499435" />
@@ -41209,8 +41104,9 @@
     <Blob Hash="139fd5ff0c7d8911cbf43d44f84c398f87dec82b" Size="3354" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1008279" />
     <Blob Hash="13a0063b9b25b90ce943ee25836a52dc13b37a4d" Size="3378" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="2093039" />
     <Blob Hash="13a5ce50fdd99f2cee537add77d6f6170aa90009" Size="142573" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="1947217" />
-    <Blob Hash="13a673e9b52e80f93e24b2e45b7913efdc4dea43" Size="237" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1584291" />
+    <Blob Hash="13a673e9b52e80f93e24b2e45b7913efdc4dea43" Size="237" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1703523" />
     <Blob Hash="13a712c79cfbf62a81b634b28fc224d59c64e7b7" Size="63256" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="656240" />
+    <Blob Hash="13a96ad9c8d9e37396621d4540b9a5e597dc2811" Size="2410" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2091342" />
     <Blob Hash="13aa348f63873c81cb2f84a4c123a84544c6e534" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2015736" />
     <Blob Hash="13ae226e86d5add12d1a4183e129459e09f2f69e" Size="4933" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="971537" />
     <Blob Hash="13b1074a90055e9ea061a6206a9c004da29967a9" Size="1113" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2046391" />
@@ -41222,7 +41118,6 @@
     <Blob Hash="13bcce0811b6776787ae2033bb44905f5e339851" Size="4116" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1720709" />
     <Blob Hash="13bf445c8dd7c3d932bff867dab21671149fb2b8" Size="616" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="406815" />
     <Blob Hash="13bf5e474f7ae86a9e40cae2b0d2d92b30dc3754" Size="545" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1610975" />
-    <Blob Hash="13c004763fbda1e2ea66e03bcca5b40d718cb6d0" Size="3198658" PackHash="37cf5e0249572446e4c01ad736b46e37352b6c81" PackOffset="8" />
     <Blob Hash="13c0dcda60896a0c20584c439d97d6d22168f871" Size="7656" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1742625" />
     <Blob Hash="13c229e8b573add6bc67f85220e3426fbd9ceded" Size="772287" PackHash="3b0711ac8e0d8edb111efc26b713e0bf02b98604" PackOffset="1273648" />
     <Blob Hash="13c3844716106e3c6329eb0262dfcb2cb3bbb777" Size="3895464" PackHash="5f9154e4057c01ac8876dc6010beb883ae04c417" PackOffset="8" />
@@ -41244,12 +41139,13 @@
     <Blob Hash="13e2b734fdcfadbe328d43b5d149f9c2d65c9169" Size="80151" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="1929811" />
     <Blob Hash="13e43fb593d14688ad77fdded7f28a930767e650" Size="221780" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="1117104" />
     <Blob Hash="13e4e0c00f1b20116e2b14fd15897814bfb80d5d" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="745888" />
+    <Blob Hash="13e727e07aa42cdce67621b99a38e23c459b7d9c" Size="7078" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2082764" />
     <Blob Hash="13e84b21f72f34a36439744c7f4e555e9f0bfa70" Size="30880" PackHash="532f738b3573e1e4caf1bd23cd03fea7e6f49947" PackOffset="209251" />
     <Blob Hash="13e89027b81c5903a927cf4b5cf9f9e74f35063a" Size="4034" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1077376" />
     <Blob Hash="13ea97607d946e0f1b0c260460c0dcc092e389fd" Size="30672" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="932767" />
-    <Blob Hash="13eadbc476969bbad32e97a23564334786f35e1d" Size="3284" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1255175" />
-    <Blob Hash="13eb4794877129e78336ecb5d7bb88334e01acf0" Size="2507448" PackHash="fd05c2b0d7b0ac8c6ca25fb163bb4af2f3dd689d" PackOffset="8" />
+    <Blob Hash="13eadbc476969bbad32e97a23564334786f35e1d" Size="3284" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1704077" />
     <Blob Hash="13eb7d999fc05cabdf73decbe91243d6fb55678f" Size="68702" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="906190" />
+    <Blob Hash="13ebd67df94197a29e06475c4082efd8ffed88cb" Size="46784" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="1645344" />
     <Blob Hash="13ecc9ef9acc507a94a72f7e18132475059f2e18" Size="20954" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1380087" />
     <Blob Hash="13f1906399934e2b6050c4ef1789d981af588932" Size="1593" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2041674" />
     <Blob Hash="13f22918e6abf132719110b5436c3cb4c5c9e76a" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1616171" />
@@ -41271,7 +41167,7 @@
     <Blob Hash="140e963e43f4caea4e1e083bee982bc58e8abb51" Size="4727" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="202231" />
     <Blob Hash="140f08abc40b59c2650d8690025bf87b6a30ad18" Size="6891" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="921895" />
     <Blob Hash="14150c88b535c9607a5198f36500f3ab761738bd" Size="51" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070576" />
-    <Blob Hash="14168eac88ad47d9366db66a492cb432e64356e1" Size="188" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1949360" />
+    <Blob Hash="14168eac88ad47d9366db66a492cb432e64356e1" Size="188" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2077414" />
     <Blob Hash="1418f13a76081dad729f23142fc00307f08b5da2" Size="4237" PackHash="40005a1aabe3d025923ee68528a8dc3918f23e54" PackOffset="2092912" />
     <Blob Hash="141acea4e7f449b70e85287e30e4b0e0335ff882" Size="8853" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1789988" />
     <Blob Hash="141beb5ee2e733675b301f68680bea89110ca254" Size="6195" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="982472" />
@@ -41289,31 +41185,32 @@
     <Blob Hash="144254613d42663b547226b48d2941421a242aad" Size="123" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1178949" />
     <Blob Hash="1445f0550c201a00fb1a350317fa07119a104e1a" Size="25600" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="1952264" />
     <Blob Hash="1446798289ef4371443fec4604a1a7d7bb5487fd" Size="894" PackHash="10917aeabcd8089492835f6fdf0cc16d5545cb80" PackOffset="2093634" />
+    <Blob Hash="1448c4c1d51d5e10e6f1770070b7206b764fb1e0" Size="13246697" PackHash="2fd9587cba98baccb93b3648f21de02063c018d0" PackOffset="8" />
     <Blob Hash="144c47d9a53619e4da1806da45aa5e44095253fa" Size="15732" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1782120" />
     <Blob Hash="144e605d9fd0d4121d4c8454bbe765f13c5294fb" Size="3186" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1133466" />
-    <Blob Hash="1454aa80ef22e2cd6fd35669c407569ad2ce46d2" Size="7874" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1817080" />
+    <Blob Hash="1454aa80ef22e2cd6fd35669c407569ad2ce46d2" Size="7874" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1832846" />
     <Blob Hash="145963ac698f205a79624f89d622784eab9aeaf6" Size="7250" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="843129" />
     <Blob Hash="1459e2ec044ad01a697828be6415d615b1fd6957" Size="92729" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="401942" />
     <Blob Hash="145d0e1d79794fc612d836e22eb7919ded53aa76" Size="3741" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="317144" />
-    <Blob Hash="145eebaef05f42dde4f18bc7911750ed8aebbaea" Size="3795" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2026410" />
-    <Blob Hash="145ff94b8a57e11b9e4a92979ff5851e702f8a6d" Size="1552" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2093763" />
+    <Blob Hash="145eebaef05f42dde4f18bc7911750ed8aebbaea" Size="3795" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2084966" />
     <Blob Hash="14621d5feeb11f3d480a0ecc24478ca421bcb764" Size="1634" PackHash="10917aeabcd8089492835f6fdf0cc16d5545cb80" PackOffset="2088721" />
     <Blob Hash="1463c8f491df8dc9668d006bf27c393b029de154" Size="3440" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1010672" />
     <Blob Hash="146501faa26212046d4c88f9eadea2eb35c0c717" Size="908" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="409730" />
     <Blob Hash="146687168188e29fc7fad7c62e26abeaef56cfd1" Size="904" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="154524" />
     <Blob Hash="14686f0795234383148e1c38adf4e49018af812b" Size="4791" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="617014" />
-    <Blob Hash="146897029795da7f333dbfd583fba65969daaada" Size="8569" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1790505" />
+    <Blob Hash="146897029795da7f333dbfd583fba65969daaada" Size="8569" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1806271" />
     <Blob Hash="146a38a638c4bc4d718a44a3b5b9ada658f688c5" Size="10882792" PackHash="236633a6e0745c5413ea190b0e07deb9e9b9d409" PackOffset="8" />
     <Blob Hash="146aa665c27323bfdda72ce2cf63f6b9c5a68fc9" Size="101451088" PackHash="098cc946780539c40bbfa63f414c91ab8e9b6ca6" PackOffset="8" />
     <Blob Hash="146c3d4e98d3b11660c5f4c5262a666201347bb8" Size="640" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="219695" />
     <Blob Hash="146c54a725f3b37d3cc171b61a6a7ad666928cb8" Size="3401" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="349488" />
     <Blob Hash="146fcd7d65147ec469fac785c3bc8f8b8368c275" Size="30457" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1221856" />
     <Blob Hash="147008a39a3ecdc563c47053dd768849cac2bde4" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="711102" />
+    <Blob Hash="147028c844ec445c4302daafe9a02fec14b0bd51" Size="2163" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1858944" />
     <Blob Hash="14720cc06ebca79600fdddf5c5a740c73ba91e3e" Size="16384" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="2076888" />
     <Blob Hash="1476ce8ea223095094b6d25d171e6319c96669f4" Size="111" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="558923" />
     <Blob Hash="1476ef30d69c93bea813381a51eaee68eb04706f" Size="7676468" PackHash="c5d1736b78a8df5140f78123622b8db3883d02a0" PackOffset="8" />
     <Blob Hash="147875dab024bc949af30dd22edf39da68f5546d" Size="12496" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1274961" />
-    <Blob Hash="1479b0ce35423e73a9630d7241812035a09ac461" Size="179405" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="361965" />
+    <Blob Hash="1479b0ce35423e73a9630d7241812035a09ac461" Size="179405" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="1605640" />
     <Blob Hash="147b796f3900505a4c88a3fd30bef308ce4564d0" Size="1417674" PackHash="fa09585b9d6d07f49e9f66b7bc0c064ae5b342ca" PackOffset="8" />
     <Blob Hash="147bbc130689c268c16a25e7e207c0ca4f93d46c" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2097083" />
     <Blob Hash="148cdb90dadf9ea3fbc6516035928186cd0d983e" Size="360510" PackHash="d2d500e0cdeedaa2e1dac0af1e2bf48ef99b358d" PackOffset="1131488" />
@@ -41324,7 +41221,6 @@
     <Blob Hash="149d32db2a0570bdf7740366d8d4e5c8f1adfc5a" Size="3669" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1309097" />
     <Blob Hash="149dbff7348e8ad84cfce5bd184faed6b7364623" Size="723" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1734954" />
     <Blob Hash="149ed721c2ba737a073483a144b3526ef6286476" Size="32108" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1155041" />
-    <Blob Hash="149f6b29e1196853c681bb798a3dfb356b14b5e6" Size="554614" PackHash="3f51332114ca5aedc3ab7920c6238f9dc6912e29" PackOffset="1419536" />
     <Blob Hash="14a35ffc062ca6c3050c3d57566b71518874aa00" Size="372936" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="1008492" />
     <Blob Hash="14a6e8cee9188fee1d9ace61a43411ad5e3c9c13" Size="1121344" PackHash="247159e28ded6d0a9508b9732f70dce33ce3364e" PackOffset="754696" />
     <Blob Hash="14abebdfe075f04fbdd4cc4aad74ee65ae8ff38a" Size="234" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2096892" />
@@ -41336,7 +41232,7 @@
     <Blob Hash="14b6c4a40e29b90eb765876944cee0590533afd3" Size="20424" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="2076449" />
     <Blob Hash="14b8d6d00e3f8d5c473aa1502189a40a9aa1d791" Size="13659" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="2060297" />
     <Blob Hash="14bbac8465aee72db07c319bba329fa1fc24302a" Size="134730" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="782736" />
-    <Blob Hash="14c0472dc47abdc725b06d14a2863160375796f6" Size="122654" PackHash="31dd9591243d030e4aa920c6b1711cd82672e2af" PackOffset="1868575" />
+    <Blob Hash="14c0472dc47abdc725b06d14a2863160375796f6" Size="122654" PackHash="0c6976e514586ffb89833a5350ff91c4ff47c343" PackOffset="1889878" />
     <Blob Hash="14c28cbf8c82e57219f650eb41af44cf6f05141a" Size="152" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1593691" />
     <Blob Hash="14c579e73bb3d3be509f7cbaa3164991f3ce6774" Size="102966" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1410528" />
     <Blob Hash="14cab0a8d977ee88211e6a6d95559ee5fc77e3d7" Size="19208" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="2045024" />
@@ -41344,7 +41240,7 @@
     <Blob Hash="14cdc40376bbc1648583321e9b5742d92f611d22" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="757584" />
     <Blob Hash="14cf10d6aabbaf7bae42b3b9641d8469c206567f" Size="169" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2002871" />
     <Blob Hash="14d11bea2284b2dafcd49fa66402ee6de2a3ce6a" Size="909" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2085971" />
-    <Blob Hash="14d282448ee9a88a9db96d65e8d70f111d168588" Size="5862" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2076145" />
+    <Blob Hash="14d282448ee9a88a9db96d65e8d70f111d168588" Size="5862" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2028076" />
     <Blob Hash="14d6adcfdf8a6d36644b0075724da9c794555914" Size="207676" PackHash="67f9a57842391bca1072e56b907d2adde02d2d34" PackOffset="1337401" />
     <Blob Hash="14d70471927be893878a7cdfcfd3f4624527ec7e" Size="25102" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1856672" />
     <Blob Hash="14da1d515d6918e150ccc1ddc33564ebcc563be9" Size="601435" PackHash="82e5aa963ea68a807353f97c6dca1b8d32bfbc80" PackOffset="1159782" />
@@ -41361,7 +41257,7 @@
     <Blob Hash="14f693e137dbaac913438e424e02f53634c4f89f" Size="276766" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="1415112" />
     <Blob Hash="14f6fe1e6c2eb990c84134ec9e43a3df29f51f6b" Size="112" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1357517" />
     <Blob Hash="14f7b816d15b205ec05b8b4cade124841b18b625" Size="426413" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="943166" />
-    <Blob Hash="14fb34e2a78025497867b7db5306cd4cfe7b5729" Size="14816" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2080893" />
+    <Blob Hash="14fb34e2a78025497867b7db5306cd4cfe7b5729" Size="14816" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="52663" />
     <Blob Hash="14fbb5b437f8b99ae41a28d6e9004e2a0038c59b" Size="4366" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2050456" />
     <Blob Hash="14ffc0ab2e4ba23ce8b5b4465e2765ae0b4c2b01" Size="1683" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1959464" />
     <Blob Hash="151373b5dc5db78aab8b1ba143a6ab7a774b5d6c" Size="11660" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="75418" />
@@ -41382,24 +41278,23 @@
     <Blob Hash="1533b891bfe070b0fd5e1b4a871c1170ffcbdf65" Size="13819" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1968136" />
     <Blob Hash="1534a8e3aa79540959ccea7bf1ebe6810e7e4ee2" Size="7166" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1157309" />
     <Blob Hash="1535522cf52663455e5ccbc62af3eae57056b9d0" Size="11625" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="952555" />
-    <Blob Hash="1535664ad3b4435e2426b2dadbde80ea7049c467" Size="81522336" PackHash="5bf74f4545dc1109e54ee0d536c263e88925c3ad" PackOffset="8" />
     <Blob Hash="1535cc4dd9ca92624f5bb9346a9ccccc06a3120a" Size="1537" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="492188" />
-    <Blob Hash="1536461d6093eaeb699958f6959d8a3bb73272ae" Size="174" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2096602" />
+    <Blob Hash="1536461d6093eaeb699958f6959d8a3bb73272ae" Size="174" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2096752" />
     <Blob Hash="1538e3f22dd7f969a49d86c63e29648ef60b4600" Size="15844" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1642805" />
     <Blob Hash="153c21ac6bbc3b7d525ea12baa3a01683296b0b3" Size="874" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2095634" />
-    <Blob Hash="153e7566eba4d5166ef3edc3a36dfe70468cff9f" Size="67" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555732" />
+    <Blob Hash="153e7566eba4d5166ef3edc3a36dfe70468cff9f" Size="67" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674964" />
     <Blob Hash="153fc8dd81a35343d2d4e31c429a06e24fbb3b7d" Size="26329" PackHash="1846a8eaf700005d638680c1ccd94ded8ff6d5fc" PackOffset="25314" />
     <Blob Hash="15416a2687a029113e76f4aa29b507727cc8a7dc" Size="155" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="606383" />
     <Blob Hash="1542029397e342fcda1767c173c85e24610a19f3" Size="1777" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1975937" />
     <Blob Hash="1542b3be74f2a5d96ff09d6405eecb66b29f3bb3" Size="31856" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="697218" />
     <Blob Hash="15430cfeb9dc5563ee001382a6147fa4e52245b8" Size="77825" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="655217" />
     <Blob Hash="1548ef0bb42b2e0b55c5bd9d62709189d87d9220" Size="144272" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="966862" />
-    <Blob Hash="154a317204534269aea555576bc082e970d1aef4" Size="255" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2096776" />
+    <Blob Hash="154a317204534269aea555576bc082e970d1aef4" Size="255" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2096845" />
     <Blob Hash="15530917c93fc4bcba7bdf98ca0473656fda0dd6" Size="19351" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1181301" />
-    <Blob Hash="15539960e26d6c1452c54163d8b1d497aa540850" Size="211" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1323383" />
-    <Blob Hash="15557693777f4cc80c9407840c0d2ce8b9adb86f" Size="3950" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2040996" />
-    <Blob Hash="15585bb1f4cf07fdc4c41005bde027569231a94d" Size="151816" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="1295362" />
-    <Blob Hash="155a386525338a2a7bd8c83b0fb72d7600a646f1" Size="63259" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="2014216" />
+    <Blob Hash="15535b2d5a79e102c2409eb2f5f535d3acc68bdf" Size="7918" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1675531" />
+    <Blob Hash="15539960e26d6c1452c54163d8b1d497aa540850" Size="211" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1772285" />
+    <Blob Hash="15557693777f4cc80c9407840c0d2ce8b9adb86f" Size="3950" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1932127" />
+    <Blob Hash="155a386525338a2a7bd8c83b0fb72d7600a646f1" Size="63259" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="1864840" />
     <Blob Hash="155bad686dbc5d5d37533fc81ae7965c9573732f" Size="135168" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="678408" />
     <Blob Hash="155cd7a77f5e5e1f3d8d31a3ee70910323eb0f50" Size="5799" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1494674" />
     <Blob Hash="1562234bbce875ec082b6441f87966a0b7e1c8a5" Size="64241" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="501269" />
@@ -41423,7 +41318,6 @@
     <Blob Hash="159266a144afcc3262b1c5767ace82efa113d88d" Size="133248" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="1642609" />
     <Blob Hash="159de48e2f7df96218a3aebe4a5d309e4c3aa465" Size="34862" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="2045755" />
     <Blob Hash="159f2f0d5d19b589370749165348941f81b73a6a" Size="3844" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="738247" />
-    <Blob Hash="159f8e3870425a7bf9be4439897f17b7e9ccecf9" Size="2776" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2093067" />
     <Blob Hash="15a3f1324e0da2680403d49ba9ddee233490b9c5" Size="2893768" PackHash="a251c4e7d42ea3a35fed5104d4baf8ac71cfe407" PackOffset="8" />
     <Blob Hash="15a45a1050e5821c748c501f6e817ca6d1ec0400" Size="4868" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1517883" />
     <Blob Hash="15a56c340829a63e84157b069f5dcc790cb9f4f9" Size="7384" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="43056" />
@@ -41441,11 +41335,11 @@
     <Blob Hash="15ca64015d13be57b5feaf550e0ae46143c452af" Size="16805" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1838061" />
     <Blob Hash="15cf9da6f19c7fb97682aa55d897e60296007413" Size="188" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="757268" />
     <Blob Hash="15d3ac4597a1a24eb2187596aed184ab6bbf746f" Size="54737576" PackHash="99ac023a72466f050012816ed19a4de8771192a5" PackOffset="8" />
-    <Blob Hash="15d4c6435db8248d4a1c2525a48ca08052aaf3fa" Size="295071" PackHash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" PackOffset="1677584" />
+    <Blob Hash="15d4c6435db8248d4a1c2525a48ca08052aaf3fa" Size="295071" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="1366245" />
     <Blob Hash="15d587675c9918c240f954314757d68a21e37a34" Size="486" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1525174" />
-    <Blob Hash="15d67ea2e8cdcd672b4bfcac9cd69f6a15feba35" Size="191" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1602637" />
+    <Blob Hash="15d67ea2e8cdcd672b4bfcac9cd69f6a15feba35" Size="191" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1721869" />
     <Blob Hash="15d9ed034390872faeea69da66c8aec713151c3a" Size="10752" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="2074044" />
-    <Blob Hash="15da7bf9d7306250421c5f517bc9e740cbc5bda5" Size="26560" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1769433" />
+    <Blob Hash="15da7bf9d7306250421c5f517bc9e740cbc5bda5" Size="26560" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1960608" />
     <Blob Hash="15dab67f31e03b6f6d6262742bc14d1de53b707f" Size="66941" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="1843072" />
     <Blob Hash="15dad580f6e7596e01517e0c2c5ebabe179e5025" Size="4442" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="651826" />
     <Blob Hash="15dd0c953f64931b2fcf9900086cd0d0e98170ca" Size="15145696" PackHash="34b38730a025a0c75cff4caa03512a0054d0695c" PackOffset="8" />
@@ -41459,11 +41353,12 @@
     <Blob Hash="15fef2060c018e3e100e7019c58c9de2722e50e6" Size="7019" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1053531" />
     <Blob Hash="15ffc0f51c97d0b5120c8f32e413c0e3e6c79d81" Size="14832" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="766204" />
     <Blob Hash="160345e07bcad40b674bc6dc3122882e43900991" Size="3435" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="842556" />
+    <Blob Hash="1603835a3cdd077c3873316bf7bec2b63b3beafc" Size="109924" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="1906404" />
     <Blob Hash="1606636939d83873f4e8a3b54ae68956a9d6d933" Size="71817" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2851" />
     <Blob Hash="16079289d989fe2b9268e57561c1187fdaf9fd82" Size="9697" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="659854" />
     <Blob Hash="1609dd7037623b4df84ee5c254c93fc79a47fd26" Size="1990" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1817482" />
     <Blob Hash="1609f16d77095d8ae8e31dfb3f48859f744351c4" Size="49196" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1554846" />
-    <Blob Hash="160b387d7ddb122fe603d9339e4f65cc400617af" Size="53452" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="694218" />
+    <Blob Hash="160b387d7ddb122fe603d9339e4f65cc400617af" Size="53452" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2006041" />
     <Blob Hash="160ba3058c416771274916c3db7e2b0d68304cb7" Size="4670" PackHash="40005a1aabe3d025923ee68528a8dc3918f23e54" PackOffset="2088242" />
     <Blob Hash="160bfd7d88a0522671398cee07b8fa1aee8b81a6" Size="3308" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1255647" />
     <Blob Hash="161268b4871d0a9fedce8a40e9b86869bbf6f4ba" Size="12588" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1046946" />
@@ -41483,33 +41378,32 @@
     <Blob Hash="162f47a2ae7f7e0dfc0c98536d39be7ca4428adf" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2014433" />
     <Blob Hash="1637444552ed9175c55ef07f9fe2e5fc57626c03" Size="8" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069213" />
     <Blob Hash="16384d0c05f53e15b82c2e5e6bb53cf3fb64ae41" Size="84" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1869980" />
-    <Blob Hash="163acc85b5c41b59aa673764db1dd5a26f575d70" Size="3687" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1091945" />
+    <Blob Hash="163acc85b5c41b59aa673764db1dd5a26f575d70" Size="3687" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2032679" />
     <Blob Hash="16410667bdbdf70fdcddf376fa87bf72b24249b3" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1486720" />
     <Blob Hash="1642d8040144469b5c359e80693e68036f87b849" Size="1129" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1091820" />
     <Blob Hash="1647a85d6859a307157f1ca20ec32a2778ca1ef3" Size="17920" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="982469" />
     <Blob Hash="164b5ad3e02eb4b6b9ded793fdd525e958512988" Size="464" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="2072142" />
     <Blob Hash="164c0ecab5a962f21aee581e4835de1e5ed886b1" Size="583" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="234988" />
     <Blob Hash="164fd1109c3832a1b80bb77e5a278629055f2721" Size="346707" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="1043953" />
-    <Blob Hash="1650f86bf76a363c13a06b7b67423fcbe475726b" Size="1313" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1125353" />
+    <Blob Hash="1650f86bf76a363c13a06b7b67423fcbe475726b" Size="1313" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2071369" />
     <Blob Hash="1651c2b232519753a789f6a7345e4e2a37ba5664" Size="243" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1088810" />
     <Blob Hash="1658e7c04760fc9e47328cf5552568f27b8fdc96" Size="14336" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1945776" />
     <Blob Hash="165944424740b1fa9b4b3b8e622198abd0bda0f8" Size="110" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="199848" />
     <Blob Hash="165cf1fbd522d95cc7c437795917fd0acc2a287e" Size="1485" PackHash="c9dcd3efa15d86693a0fbc9073cbb3b57a6b7143" PackOffset="937787" />
-    <Blob Hash="165d73c22ac21ac7a0caf381d296cfe862fa1712" Size="1586688" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="8" />
     <Blob Hash="165e6caeb315f02c43f6c404fe345089c3160b54" Size="845" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2096150" />
     <Blob Hash="1664a039b2bec0bc7f79063b475c76d771218b3e" Size="61952" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="1986156" />
     <Blob Hash="166ac491ac9583f948b2391ee225c0606bb418f1" Size="8264" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="198724" />
     <Blob Hash="166cb97f55deee5aa623a895bfd3b6828e4b1262" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1122082" />
     <Blob Hash="166e23beff69b813f2453dcb61d61c7ad23fc75a" Size="232" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2091608" />
     <Blob Hash="16712c3cce739d45d42ac1babb4d7bedaf3655cc" Size="22220" PackHash="2541352b0d8e22e6fe8137c01db1be4afe710d8f" PackOffset="17431" />
-    <Blob Hash="1673c98e35cba9d2b968abd9cb9c628d8677810a" Size="156215120" PackHash="3b3e130fc165f5ca00134d4189b6805108f907cd" PackOffset="8" />
     <Blob Hash="1674efd5e885696302739cd536d1f13d6a5874b2" Size="83892" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1113650" />
-    <Blob Hash="167f2c236e4ef1b787f15b6e08db9947b154aed1" Size="806" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1469154" />
+    <Blob Hash="167e1d1c0484c545f20b8b07f22249a9a82c0dd0" Size="11842834" PackHash="c64d62e230a53a7f10bf1b3f41715ece130d60ec" PackOffset="8" />
+    <Blob Hash="167f2c236e4ef1b787f15b6e08db9947b154aed1" Size="806" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2006236" />
     <Blob Hash="168206e93a99b8ebb8f737bc2e6f8a20e869f79c" Size="23584" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1255218" />
     <Blob Hash="1682ee04511212789b84e0f2f6af611fee4e94f6" Size="1576" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2079559" />
     <Blob Hash="1684217fee10353eee0e7396055a79fe15274b6f" Size="1945136" PackHash="d32c7be5b4d30387ec996764f5226c0e3e1a3a88" PackOffset="8" />
     <Blob Hash="16856d14be6a985c49d39ce71890ab4ef2478bad" Size="1572" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2082128" />
-    <Blob Hash="168874e51d10d13d704cb46e85b7d0c5e858e6bf" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551372" />
+    <Blob Hash="168874e51d10d13d704cb46e85b7d0c5e858e6bf" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670604" />
     <Blob Hash="1690aaaeafae7c7f03e46f08079978cb2e073ee7" Size="17763" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="809737" />
     <Blob Hash="1690e0fd4ce8432e9153ed9b6661368298a3bf43" Size="5511" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1873825" />
     <Blob Hash="16939174b5931d2589ae2e2194d941ecd19a7ed2" Size="5143" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="969487" />
@@ -41522,7 +41416,7 @@
     <Blob Hash="169e7380de3b95d8274a835b6aa6e69333139aa3" Size="5117" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="505808" />
     <Blob Hash="16a60f214d8df0d7a7932f42d45a2916a1c8640d" Size="30056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="383513" />
     <Blob Hash="16aa1b4f16d315a40c6158394fb8c67d33b25c96" Size="54179" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="921767" />
-    <Blob Hash="16ab269dcc5b1b9dcbdc0cc3394956065b5b75a2" Size="1531" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1365270" />
+    <Blob Hash="16ab269dcc5b1b9dcbdc0cc3394956065b5b75a2" Size="1531" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1484730" />
     <Blob Hash="16b025a4ca3fb506a319d5652d1327594b55cd2d" Size="1767936" PackHash="c79b3d3d81375c25019c997c0e81af6b84d805c1" PackOffset="8" />
     <Blob Hash="16b2e2b3484710719136d46efc16c0c5b4f19cf2" Size="2823" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="198105" />
     <Blob Hash="16b3cdfc10f11f100ed8d08f31794ede81bcd922" Size="177" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="384729" />
@@ -41531,12 +41425,12 @@
     <Blob Hash="16b967cf2b412366928c09fd65652fe43de1954e" Size="136" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2095520" />
     <Blob Hash="16b9a2f50f1fccddc05e16d6a1aa318abcc67d12" Size="2739" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="162296" />
     <Blob Hash="16b9ea9637a4201b25cdd9e596331eef8f10c547" Size="2680494" PackHash="7d1f61f60321e34520d7f474dab182ec9c5f1e2d" PackOffset="8" />
-    <Blob Hash="16baa7abbb4bbe6c2127218238fb15750ed22d58" Size="18246" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1984185" />
+    <Blob Hash="16baa7abbb4bbe6c2127218238fb15750ed22d58" Size="18246" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="1883681" />
     <Blob Hash="16bc939a6fad143ddfa0eb8973d238760a3211bf" Size="4661" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1422827" />
     <Blob Hash="16bcf3b23d401043c67089d2c5e403594dd1b937" Size="5586" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1952605" />
     <Blob Hash="16bd506926e0bdd79409f923eb997bb0008a707b" Size="139" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2096655" />
     <Blob Hash="16bf38e72a67c30506b8deab39455f7f5b91463a" Size="25998" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="408643" />
-    <Blob Hash="16bf6b9283aae63f6fdd3dae3402020a235996da" Size="2852" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2059615" />
+    <Blob Hash="16bf6b9283aae63f6fdd3dae3402020a235996da" Size="2852" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2086713" />
     <Blob Hash="16bfaacc5e68d2483b32019f8d27d05aba833692" Size="3620" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1205235" />
     <Blob Hash="16bfb74e6b3d2c658fdc8a8c404ba9fe4bae3e74" Size="336672" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="1308854" />
     <Blob Hash="16c79b235b7227fb0a22c6a338860d3a2b203e8d" Size="1434" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1782147" />
@@ -41546,6 +41440,7 @@
     <Blob Hash="16cac6eeca88cccc4561b6b8595124a4d697d8ad" Size="75294" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1384159" />
     <Blob Hash="16cc254c8066506fc7d29d5e4ad6fd7ba36bb629" Size="17298" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1605308" />
     <Blob Hash="16ce00b9149a74cd39b0b8d4769485d604e0b72e" Size="3778" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="890660" />
+    <Blob Hash="16d217438910ed2cc58a697020347ec982750964" Size="538624" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="1232392" />
     <Blob Hash="16d84fccdddf06dfc116b8be474abff2cf2b5155" Size="1445442" PackHash="d9cd996ea5042b0d08c555ef2559111b5494e3a1" PackOffset="8" />
     <Blob Hash="16df80e893b830e6a9b039af51c2a8136dd4288c" Size="7345" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1469585" />
     <Blob Hash="16e01fdfd2848f7d86e199f9ce60aace1e744a1c" Size="5079816" PackHash="2b997fb6bb46633ddf3dcc659bd0d91d75319d79" PackOffset="8" />
@@ -41580,11 +41475,13 @@
     <Blob Hash="1716e316d15d47bc2f665a1ba14da162def52dda" Size="939" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1628312" />
     <Blob Hash="17182d1b31844ee0b6efbf4d4820fc924815956f" Size="1884841" PackHash="7d2cd67e5409d984a518119f088c05600971a174" PackOffset="8" />
     <Blob Hash="1718e708a2c1f4a0e3051c75a1d6a34017fd11da" Size="5832" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="995830" />
+    <Blob Hash="17195a241f51bb1e0be8d9a6d1e42ba1dc60ae3a" Size="28170368" PackHash="2be65450504267f27231a353bd6c14c54f2dc46c" PackOffset="8" />
     <Blob Hash="171f6543dbaaa014e9c3ed80fea4c01931cea222" Size="13230" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1260642" />
     <Blob Hash="172280f78219006db7410744c029d711818e4369" Size="1106" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="286674" />
     <Blob Hash="1726e7973d7d647cda79cd925b109ef960f3192c" Size="38" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1191113" />
     <Blob Hash="172e2a596d37e0e989eb1e284986f81b9f9590ab" Size="127688" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1581489" />
     <Blob Hash="17300893b8d72a98ad03be2d93a71aa9f6b91434" Size="644" PackHash="9925ec5c177c6bf6faada1514039ed1b19874a51" PackOffset="2095817" />
+    <Blob Hash="1731a27c3f3ef1abe0cc0120169e2eb1e21f9154" Size="21473846" PackHash="6b6c351ea29639e9ea1c91307904c84dc6750774" PackOffset="8" />
     <Blob Hash="17320cb12258c84d93c94cb012f35e430a811992" Size="8948" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1415368" />
     <Blob Hash="1733467c8fccd551f0a944de166cbfcd91e6611a" Size="74677" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="132510" />
     <Blob Hash="1734bdb2c28f88adec206976c2ef85f707e57bcc" Size="59" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="2096932" />
@@ -41597,6 +41494,7 @@
     <Blob Hash="1740b16d2847140536cbac7270c86f796ef3ae7f" Size="8428" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1624925" />
     <Blob Hash="1744357ce6340d179924ea58f43f4b6654c786bf" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="153953" />
     <Blob Hash="1745f03150e3d1620164c8a35019d6653579408f" Size="119494" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1305968" />
+    <Blob Hash="174a13150abc28e92e29b1e5a3c54753c3e08abf" Size="19909216" PackHash="8d550033e655bda81fb9052060b94905a553d83b" PackOffset="8" />
     <Blob Hash="174fdde6235a93dd5c56d78e9451bad19588b644" Size="4753" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="130976" />
     <Blob Hash="175184f3011f09983039a298491d2b79e4ba902a" Size="4423" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1852178" />
     <Blob Hash="17529f1026c7f522da6b72ca5209810c01d89461" Size="2976" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2069322" />
@@ -41605,16 +41503,18 @@
     <Blob Hash="1755f9a7781cd1b18ff10848c362f561675e113a" Size="361" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="611116" />
     <Blob Hash="17580a5d58738a4231145c0aa98505626125d0ff" Size="342" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="392007" />
     <Blob Hash="1759716a57d57baf5f3d5d94821bbca9cf1c8900" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2096908" />
+    <Blob Hash="175b0dfca79c63307f9965fab7d08221b6891482" Size="13461176" PackHash="6d7d5bf0c64832dd651e2479b8637f734e663814" PackOffset="8" />
+    <Blob Hash="175bb8a1b4efb3be2f1367b26d261e1acaea87a2" Size="41720248" PackHash="f428da968a0ea943708076c893f2def3c4b65015" PackOffset="8" />
     <Blob Hash="175bf9cfd4fee9f4a8004b9b747313c302b866cc" Size="118968" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="1796049" />
     <Blob Hash="175d654a2bedfe11d29402082f1066d90c9466d7" Size="22708" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1295176" />
     <Blob Hash="175fe047efe6cd0333254db3307f818fef0ead7d" Size="511" PackHash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" PackOffset="2091262" />
     <Blob Hash="176557c056196bc0cae32feadcfcd57ad93aeb8a" Size="2376" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1773227" />
     <Blob Hash="176d36ee22ce978ae44c9c38815c3bd8bcbb84c6" Size="620" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="2093974" />
-    <Blob Hash="176ebf247eba3489dcf7e16cf777807fc1b30e59" Size="1029" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1317685" />
+    <Blob Hash="176ebf247eba3489dcf7e16cf777807fc1b30e59" Size="1029" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1766587" />
     <Blob Hash="176f8ec5b1221b670413aef8883eb1185d325d40" Size="159209" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1195321" />
     <Blob Hash="1770c9b8fe47b8aa08d6902a71136b5e5aa8b4b6" Size="20516" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1029620" />
     <Blob Hash="1770caf858cd4751e6626cd4406a036104dc8b18" Size="2589360" PackHash="3a19f265a12a4d13608ed31823eea904eeb1bc95" PackOffset="8" />
-    <Blob Hash="17714a62730e4cacb17d169dba5f88df3bbc5229" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551322" />
+    <Blob Hash="17714a62730e4cacb17d169dba5f88df3bbc5229" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670554" />
     <Blob Hash="17733b514b2de4a7899c1e4c898377d07b46a474" Size="39517596" PackHash="5d2c60408188df38f073184ccbd0fc8cc080ab62" PackOffset="8" />
     <Blob Hash="1774079de9090ea962d5543437f6c757a43adb6f" Size="5745" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1583937" />
     <Blob Hash="177559c914d57565127400c048ec284d9910a21d" Size="228" PackHash="f12fcad677aebdda530c1768cf6a4c571cea68bc" PackOffset="2096870" />
@@ -41626,7 +41526,7 @@
     <Blob Hash="1791c936e9af0c0c23892394c3a49f493aac5a0f" Size="19237" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1075788" />
     <Blob Hash="179351b17605b0ba6239ffb7bab965cd47a85846" Size="2006" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="1444054" />
     <Blob Hash="1793634156eee8329522aaaece322d638b8367ce" Size="958" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="277169" />
-    <Blob Hash="179407794e494b85115b575f8487d66e68419bc4" Size="1136" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1315247" />
+    <Blob Hash="179407794e494b85115b575f8487d66e68419bc4" Size="1136" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1764149" />
     <Blob Hash="179577fe1f5d4530c322541e0905ef4b9133d005" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096740" />
     <Blob Hash="1798b68b1b5be039c3d9aa66b24415b4d5cf3679" Size="68458" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="704338" />
     <Blob Hash="179bd2457c6134ee04cd1c9e920f2b052b437482" Size="1168" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="520235" />
@@ -41637,6 +41537,7 @@
     <Blob Hash="17ad4e0a7a83a2e044b253601a449449181bf2a4" Size="1570749" PackHash="61edd2f04c73c5c3eca0bfae13c92213516504e3" PackOffset="8" />
     <Blob Hash="17ada2f6ce70fa0a697a34f3580ac3f7fa40e3a0" Size="120" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="202343" />
     <Blob Hash="17af63ab5b07fd326440627907c2c8111c4f6f1c" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1028386" />
+    <Blob Hash="17b0008e2e66201a78b3101e6954c936a6f751b0" Size="2894008" PackHash="889d66b9b8a0ba8c11ca8f848537e018bbf6311b" PackOffset="8" />
     <Blob Hash="17b02caabb62077b51d64c8363a76473cd574274" Size="2295" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1992304" />
     <Blob Hash="17b29c13bd250a4447451a7c333c8a18f1b209e7" Size="891037" PackHash="c5ae184eaa6760174706ff03095aa041150e0bc7" PackOffset="196029" />
     <Blob Hash="17b4f154afd1855bb5c012abd4a231c440cce349" Size="1930" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2075421" />
@@ -41652,13 +41553,10 @@
     <Blob Hash="17c90921b0d1ce53912bf1bdf7e3125f532a7409" Size="112" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1700832" />
     <Blob Hash="17ccff780ce8a38c3fda408ba69593ae419351ca" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="724439" />
     <Blob Hash="17ce52dbe69357833e2b4e2ef4bd4b5f97810dc6" Size="967" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="733025" />
-    <Blob Hash="17cf5d3ef865621c9d3f96ec0941d2442358ed9f" Size="20077896" PackHash="f923dfb477de6f5f798a2dda3616085a117b4944" PackOffset="8" />
-    <Blob Hash="17d010dde0c45bee9e5de174f7959bb0e0032598" Size="5546444" PackHash="fe5b8d0a57a1c463ccee18bf51db4f50e147ef22" PackOffset="8" />
-    <Blob Hash="17d3f37c623159a0d295394d1921eea975e16935" Size="118992" PackHash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" PackOffset="1854946" />
+    <Blob Hash="17d3f37c623159a0d295394d1921eea975e16935" Size="118992" PackHash="48417a383086ddd15fbf2c4f33ed8e96f024699d" PackOffset="1960708" />
     <Blob Hash="17d40ca2fbc894c475042da8b71308dbfa1c9adf" Size="140579552" PackHash="c4ceb0caf8c161a1da6f383c8b0f24b8ce43d5b9" PackOffset="8" />
     <Blob Hash="17d49369437fbdd8a5fa4e705e169cb5cc72df03" Size="680" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="518036" />
-    <Blob Hash="17dc5c2a8e67395cc24cabc1b1d232dc4129d145" Size="410100" PackHash="76ceae49acaae4eaab40e99ad6e585de490ee865" PackOffset="1460136" />
-    <Blob Hash="17dc965794d62459858a51df0865364d69cb54b4" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555168" />
+    <Blob Hash="17dc965794d62459858a51df0865364d69cb54b4" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674400" />
     <Blob Hash="17dcc73dfbb77ff5ed013d77d93328459c67c91e" Size="4218" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="933704" />
     <Blob Hash="17df195463019816985dab16ca190752dce18c50" Size="16285016" PackHash="b8434b5284e1aa695502fe9c399e329c5c88a11d" PackOffset="8" />
     <Blob Hash="17e1625c59cea6e6de457949da463ae9b2a679b4" Size="7377" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1791040" />
@@ -41670,12 +41568,11 @@
     <Blob Hash="17f8621f5432a13e1fbb410f37d99c696976b671" Size="17719" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1815548" />
     <Blob Hash="17fa07690bda9ec45859a4da2073dff423ee5223" Size="11621392" PackHash="7ba89ad415dac138be18aeefe3423e3ebd56c0ee" PackOffset="8" />
     <Blob Hash="17fcbedc8268770e907cb2aad8ade21555e1699b" Size="46935" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="774389" />
-    <Blob Hash="17ff585c651b67954c680706414c526cdb463142" Size="120" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1618864" />
+    <Blob Hash="17ff585c651b67954c680706414c526cdb463142" Size="120" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1738096" />
     <Blob Hash="1802c5567e25c723f99c5faf238ade2e6d4cfa27" Size="903" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="899385" />
     <Blob Hash="180413e3dac5bf4ee8f3b4cdd578501b666364bd" Size="12241" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="355026" />
     <Blob Hash="1805db17f1af0511d23162d9ce1adaecf8990da1" Size="9163" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="864040" />
     <Blob Hash="180838227a6d8900a7facd488caa76ebf7bf2e3b" Size="89300" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1636526" />
-    <Blob Hash="180fd06256f98d3c220af11feef1df1d1b28eb48" Size="803538" PackHash="2573092c7861b9d182a4d6cab4457397e81d6bf6" PackOffset="1067498" />
     <Blob Hash="1812ef70ea4d01290795ae82709768990d8ea144" Size="11798" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="983613" />
     <Blob Hash="1812f847e0aa02767bf785ee1aa556edf04e12cb" Size="9229" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1248908" />
     <Blob Hash="1814db89307036f2432c957de060a908e5154f4f" Size="5188" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2068736" />
@@ -41731,22 +41628,20 @@
     <Blob Hash="1898ea2528e12eb7015ed38998ceb72289bc53a5" Size="2107" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1105651" />
     <Blob Hash="189d00905e48635609c00369892ce4740e7523a1" Size="1840" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="737420" />
     <Blob Hash="189e685c3af7f23df1e1acfe72dd5e1b7770038b" Size="2072" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1995001" />
-    <Blob Hash="18a51c03219ca7143598e50298e4db79e5e22264" Size="950" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2037466" />
+    <Blob Hash="18a51c03219ca7143598e50298e4db79e5e22264" Size="950" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1928597" />
     <Blob Hash="18a51eb9d95e39aeb15c90acd27e8a1e79e37397" Size="2934" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="830992" />
     <Blob Hash="18a88ca80b7fece8b7d973782ec4ef09516503e2" Size="297" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2096706" />
     <Blob Hash="18aa0c2224ddd29e6b14021c78a8d3a5956a9f8f" Size="2878" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="505778" />
     <Blob Hash="18ac21b638188b542455ba3da91f958df1724e68" Size="188" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="163934" />
-    <Blob Hash="18ac2ee3dcbf2ea69e13159784a45b390c30d8a9" Size="73803776" PackHash="806767890f38dc746e2ab64feb16967521b8a467" PackOffset="8" />
     <Blob Hash="18ac50d1d6f9cc826e6b76f4107cacc1e5ac55f4" Size="257" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="2096289" />
-    <Blob Hash="18acdda2147dec2abd55979b9b375ffbce06e740" Size="4096" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1193443" />
+    <Blob Hash="18acdda2147dec2abd55979b9b375ffbce06e740" Size="4096" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1638274" />
     <Blob Hash="18b19f6371c938b3bb0d728011d9813ccc3d48da" Size="2958" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="999407" />
     <Blob Hash="18b666ef1ae7e1bbf55b5e9d9d592234d584c9b7" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096996" />
-    <Blob Hash="18b75367bd45900ffff2ec420d0592dece675f7e" Size="5260" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1814809" />
+    <Blob Hash="18b75367bd45900ffff2ec420d0592dece675f7e" Size="5260" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1934041" />
     <Blob Hash="18bc3a36c08ee6f81d2baf80fd783763d32e14fc" Size="23080" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1744536" />
     <Blob Hash="18be42979f2e16e099d5d4939230db24d6368491" Size="83968" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1577676" />
     <Blob Hash="18c30ce4285cf1885b59bec26668099e89a1d8f2" Size="109171" PackHash="17535b203a83b5f4d46d9a777399a1ecb5c548c9" PackOffset="8" />
     <Blob Hash="18c7c88e0a1bb96a151882a8842129f91d9419fe" Size="279060" PackHash="6d263531086a2ac8abcd381816ca4bbebeb2bb89" PackOffset="1634972" />
-    <Blob Hash="18c91a5ced98199d42cdf23dc905a4228661f368" Size="7969" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1754081" />
     <Blob Hash="18cc8a7dc969b476c3e1230df12be413f41b644e" Size="13776" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2009889" />
     <Blob Hash="18cece51be2d78e7c654983d97182a1545873d89" Size="1078" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="578254" />
     <Blob Hash="18cf90c1efa37c3427530484638277a692eb52d5" Size="21504" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1322700" />
@@ -41755,7 +41650,7 @@
     <Blob Hash="18d34777d88938b1d4877866fb050afe2b7ebca1" Size="65160" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1885479" />
     <Blob Hash="18d608f3ba341e845b2d60fbfc5e46775f929fd8" Size="1468" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="2058772" />
     <Blob Hash="18d8dd8d48e24a64625ff3d86bee3ecfa5572189" Size="184" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="500890" />
-    <Blob Hash="18d90f78c4c3bef2f460dc35bcfe5402b6a7ee6d" Size="968" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="992947" />
+    <Blob Hash="18d90f78c4c3bef2f460dc35bcfe5402b6a7ee6d" Size="968" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2040464" />
     <Blob Hash="18d926a0bb4e96d2fddd242e82cf6dbc733af662" Size="12800" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1762795" />
     <Blob Hash="18da97b2a4e50b4ebe1257bf7710774fc7ee79fe" Size="3735" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1448295" />
     <Blob Hash="18dd1453b0ecceabf22b25ae6d571e7cec0487f1" Size="32" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2096997" />
@@ -41771,6 +41666,7 @@
     <Blob Hash="18f73edf986326bbdca4db3b333a209d89babd6d" Size="1060" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="2093272" />
     <Blob Hash="18f7cb7276c96fb079b9cca968bdd9ebd6981d98" Size="63256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="63264" />
     <Blob Hash="18f7d340f04484c27f5e195dcdfbd70847926226" Size="43680" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="503212" />
+    <Blob Hash="18f7ecedba09f77513b56d283dfda91f79983444" Size="556592" PackHash="344190ba3bc0e09a4f0f7283782da8cb56b6a794" PackOffset="1420664" />
     <Blob Hash="18fa03f229941bef2351120e84984853201d14d9" Size="140476" PackHash="c179a00f7b3f95d459e9dc03d8cf5f197851686e" PackOffset="911795" />
     <Blob Hash="18fc511ce709eae860427c3780735004b53cae4d" Size="1680" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="509070" />
     <Blob Hash="1900d9f79be8dcf1871036fe7e5ab0526b0700c6" Size="4211" PackHash="2a24d8dbf5e6fb22f92e636ec3c56667f17ce5c0" PackOffset="93701" />
@@ -41781,7 +41677,7 @@
     <Blob Hash="191116b20408602f818efc4ffb00c40f39b1ef7d" Size="166" PackHash="c3fbded8b604db5841a7a3cb89b7ab9159e69e47" PackOffset="2096985" />
     <Blob Hash="1914dfca953a3101cf30dd1956e0d9d4d9bd4d3c" Size="116" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1703992" />
     <Blob Hash="191826b9643e3f124d865d617ae609db6a2ce203" Size="2140" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1608552" />
-    <Blob Hash="191b63b5f0b0e7bd52451ceb2974ffd528a63c66" Size="14683" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1144290" />
+    <Blob Hash="191b63b5f0b0e7bd52451ceb2974ffd528a63c66" Size="14683" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1911771" />
     <Blob Hash="191d02b86ab11ca8f27d926f41861ee236d59625" Size="257312" PackHash="97bf3c322ba6683a01fbcd8d8f6e07b7000af8de" PackOffset="1831440" />
     <Blob Hash="191df87363ef9fcc0e48528c8219d5edbec2aff0" Size="118509" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="528633" />
     <Blob Hash="19201c0fb48ed20effd74de7989c2fa45326e35e" Size="417320" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="327742" />
@@ -41796,6 +41692,7 @@
     <Blob Hash="193361d02c7f5c9a49bd83ae44f95911ff283f61" Size="537" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="1458347" />
     <Blob Hash="19357db9a93f96d4bf84843dc70ef672f7231e7f" Size="242" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="238741" />
     <Blob Hash="19365bf5b0ff93677fe586593d90f1e11914098e" Size="912" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="615964" />
+    <Blob Hash="19367c2a7f68248f2ec2ecba1b19f477df236110" Size="118313842" PackHash="00835f04b5eb625818e10d989fcf27cade8e0460" PackOffset="8" />
     <Blob Hash="1936f87f8e60d5d765c3d1df2ae861016e90cf22" Size="2806" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="443110" />
     <Blob Hash="193a722afb81dfa2ba0e3e50036786740ed268d4" Size="12824" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1867742" />
     <Blob Hash="193b15e3fdfc1e57a14f70fc5c0d941170516857" Size="2225" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1751740" />
@@ -41810,7 +41707,7 @@
     <Blob Hash="194fe99f4c71ce89017fcbd2d9828bc92d49d8aa" Size="146" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="2096999" />
     <Blob Hash="1951f84281a8b2b53334fc691af0c233168a1110" Size="1154" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="2085434" />
     <Blob Hash="1952db664dbfc99c92f8603ae23cbcd40b143365" Size="5174" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="803170" />
-    <Blob Hash="1954159b3dd2f72d6ca536e337c175dc25c8922e" Size="118" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2096977" />
+    <Blob Hash="1954159b3dd2f72d6ca536e337c175dc25c8922e" Size="118" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2097001" />
     <Blob Hash="195bceda12d5ae6db1756fcd7171cc7d5968a949" Size="37058" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1802065" />
     <Blob Hash="196016d02b26181591ea737142d99eb456427253" Size="115200" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1459208" />
     <Blob Hash="197265e32c0d5c7061d272a99b2aed2e0f155a38" Size="235" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1578222" />
@@ -41828,6 +41725,7 @@
     <Blob Hash="199a3eece2947b22e08d2181c2be1376f6d39066" Size="6689704" PackHash="6de64ca166d32e77d49bee4d0acbb47fb54df48d" PackOffset="8" />
     <Blob Hash="199cfa88674f591979a1bb9c6e1b14c0d1b6bfba" Size="692" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2076205" />
     <Blob Hash="199de9ca76a8b3a658bfd11a30a67fb4c7dd3f53" Size="2863" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="457704" />
+    <Blob Hash="199f2bbfd676f7626360a6a13a3df124e80356a9" Size="2163" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1816864" />
     <Blob Hash="19a108df660e9d1a2a946e43a2160cf064db2944" Size="2203280" PackHash="459747b8723fac3f5dedb4453231266db6ae4337" PackOffset="8" />
     <Blob Hash="19a14853747d9e543f6bda8b3d77b03e73d5f793" Size="308810" PackHash="be4271ae98e83036ec8697bbb7a162a3f3890449" PackOffset="8" />
     <Blob Hash="19a2252707e224d34388dc5b24d2f515cb25a667" Size="1203" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="604309" />
@@ -41840,23 +41738,23 @@
     <Blob Hash="19b8c5241f7e6d29a4e1a3a5b35b55c60e612503" Size="5531" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2082555" />
     <Blob Hash="19bba5eb944f681966b1f59063bf211b5a260054" Size="3238" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="283037" />
     <Blob Hash="19bd773d37565a24b3cd18dd79c9c6c26bd26282" Size="48128" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="8" />
+    <Blob Hash="19beb0a49e8611dc52309c771e3eddbfa04bc169" Size="315704" PackHash="65292930f06c2bb49ec85a293869511324a919d3" PackOffset="1595522" />
     <Blob Hash="19bfffdb92b0aa7968c9673a9a6dcaf1d4c4ce4b" Size="119582" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1552390" />
     <Blob Hash="19c433229970cb722752ec19349ba43b3b9d11a1" Size="442417" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1633353" />
     <Blob Hash="19c625d9a3c9e14dd9fbfc411fb9700b88d2de85" Size="2251452" PackHash="3c6183080d96335ed1e395100df77013e84788d4" PackOffset="8" />
     <Blob Hash="19ca2a08b91dbd8d8c301effc69c22326f0f547f" Size="89564" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="113463" />
     <Blob Hash="19cb3ae0b63a0ca5f3052a8270cc52cafc3aef25" Size="13964" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="697776" />
-    <Blob Hash="19d499da1e06c2069036709b820f181158af98c3" Size="60" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1424179" />
+    <Blob Hash="19d499da1e06c2069036709b820f181158af98c3" Size="60" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1873232" />
     <Blob Hash="19d7a93246a8221558aff38d441bf5c7e1c60cd6" Size="534" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2044889" />
     <Blob Hash="19dd5ae2d3f05deda54c49b7b757075d7373e4c1" Size="2091" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="399868" />
     <Blob Hash="19de5db809d87510534e50611d18ea6c4fc4c768" Size="106722" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1794520" />
-    <Blob Hash="19e047fb051727312893c8284217f2611752b966" Size="1412" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="976564" />
+    <Blob Hash="19e047fb051727312893c8284217f2611752b966" Size="1412" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2023446" />
     <Blob Hash="19e30de36fa944fa1254c44c8fbfea8f17a2d7fc" Size="2312708" PackHash="afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d" PackOffset="8" />
-    <Blob Hash="19e49f31f2d04514cd5d784ac1c8cbfa0ca91ce1" Size="123" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1582951" />
+    <Blob Hash="19e49f31f2d04514cd5d784ac1c8cbfa0ca91ce1" Size="123" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1702183" />
     <Blob Hash="19f1d6ea0ede9598f1be2c4d81cc4ea01dd7d909" Size="195792" PackHash="69524cb8a63c006267120fffbd8a5e2729e9d5af" PackOffset="1833400" />
     <Blob Hash="19f24a198aa7d3a0d435c853d73b34617088ad82" Size="217377" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="1774328" />
-    <Blob Hash="19f680eee8f068068cb24220b8ccd00d43cd2794" Size="2341672" PackHash="75ae69fcafee8616cc703f605cdc02e5d6a9972e" PackOffset="8" />
     <Blob Hash="19fa7a6a0c4c96ea7d210ef3efb5776b5fa5d0e7" Size="5055" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1203275" />
-    <Blob Hash="19fd9695415f3e7714c9f3099bb77535c92e563b" Size="3109" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2021077" />
+    <Blob Hash="19fd9695415f3e7714c9f3099bb77535c92e563b" Size="3109" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2088743" />
     <Blob Hash="1a022de0ea9c42fe1fef08bb6d130503e26f8225" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1164301" />
     <Blob Hash="1a0320b67349620e6f682bc174270846a65852d0" Size="6483" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1392043" />
     <Blob Hash="1a0751c8825fa760ecef5e1657e9513090a4b745" Size="8130" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="639331" />
@@ -41873,20 +41771,22 @@
     <Blob Hash="1a25c52231c8e70a3ac24bbebe84d75e5c20245e" Size="7056" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1321776" />
     <Blob Hash="1a2a050ac2529886cf8cffd0168145b206e4aee5" Size="56753" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="8" />
     <Blob Hash="1a2c309b3526bcaa98338f67e15ac29ddf6ab4e4" Size="80218" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1029766" />
-    <Blob Hash="1a2c6fd911dfcf8479c22ea339f866731f49508f" Size="788" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1433794" />
+    <Blob Hash="1a2c6fd911dfcf8479c22ea339f866731f49508f" Size="788" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1882847" />
     <Blob Hash="1a2caa0f8fce1d2a8f27ed0352a9afe2b854723f" Size="24796" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="117911" />
-    <Blob Hash="1a2cf3a192ac8cc1e3c87eb59bcc8c7e0d1406a0" Size="1435" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1069069" />
+    <Blob Hash="1a2cf3a192ac8cc1e3c87eb59bcc8c7e0d1406a0" Size="1435" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1239103" />
     <Blob Hash="1a2eddfaac030fbc5d4133e1def6212138bc507a" Size="38933" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1867788" />
     <Blob Hash="1a2f9ec435a69ca7b130689e55b5a53e0e837d8d" Size="610944" PackHash="fa09585b9d6d07f49e9f66b7bc0c064ae5b342ca" PackOffset="1417682" />
-    <Blob Hash="1a334b814ac5e8e56cd33cb7d9f4c26f0d57b5aa" Size="3404" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2086552" />
+    <Blob Hash="1a2fffd609b531f0b6f0a802ba5e29fac08e7eba" Size="12156532" PackHash="f385fbe56b0c15fe9003d3ab7d1878d59d64ed29" PackOffset="8" />
+    <Blob Hash="1a334b814ac5e8e56cd33cb7d9f4c26f0d57b5aa" Size="3404" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2072128" />
     <Blob Hash="1a337b6c6e88fa7b50641e53313f090c471b150a" Size="4781" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="342909" />
     <Blob Hash="1a34c5205ab82fb063c8dae0f8b86df9b2dd406c" Size="421" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="901811" />
     <Blob Hash="1a3f5a5c70f6023a2a93c4497958a7c05e8afaeb" Size="124735" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="666029" />
-    <Blob Hash="1a4283647722568d8322ec1100c050a828d12fbd" Size="3618" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1134662" />
+    <Blob Hash="1a4283647722568d8322ec1100c050a828d12fbd" Size="3618" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2080678" />
     <Blob Hash="1a44fd5d5b38c569ceaf737be876df191cab65e1" Size="12370" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1823124" />
     <Blob Hash="1a4637266a074dcca4ac058e0dce518fe2c7f1ef" Size="117560" PackHash="879da85ee7839263b362a6d69f41f3d4477d2263" PackOffset="1978318" />
     <Blob Hash="1a4655e04fa7b9d08f1de0eab93bb1744c4e6795" Size="16122112" PackHash="7bd3a7f4677db221286783d1135c9b57a1db4225" PackOffset="8" />
     <Blob Hash="1a4a960f3e4626b8ce1ccef59a5e6b4b4acf8813" Size="583874" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="941977" />
+    <Blob Hash="1a4e13067fa4dc8958f86d3051074a277979e411" Size="331264" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="1660904" />
     <Blob Hash="1a4e64adab280dcf3ac278055e749cfaf35ea509" Size="5359" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1577187" />
     <Blob Hash="1a4ef97b57d53e2b073e35ba4af163bc5f78e8ae" Size="12146408" PackHash="a38f7b4228aa23a3dab120750d20976dab9cf1be" PackOffset="8" />
     <Blob Hash="1a4fe2832062ebc1ecd27affeca8cbf7d91881dd" Size="96" PackHash="5983c069abdec3469db5b5874ac27c17341e3f27" PackOffset="2096935" />
@@ -41896,15 +41796,14 @@
     <Blob Hash="1a5362a9d16a40166e391fa17223eb1d9a41686c" Size="175" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1258070" />
     <Blob Hash="1a53ee76955bc7f2bd3c29fbda069ceb7d1c59f9" Size="6748" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="846440" />
     <Blob Hash="1a552adde2d395ad1e2d86b9f144c7f6039230f6" Size="2525" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1451111" />
-    <Blob Hash="1a55fd5202ab749687bca4c4971dd907a3d52682" Size="68792" PackHash="fb276d1bd30c33019a2a41af75e8a82e43b80637" PackOffset="1954888" />
     <Blob Hash="1a59768093c5354c4d1fa430fa7d802bbc159e49" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="680679" />
-    <Blob Hash="1a5aa2a51ce29fec2e12f30cbc16ef86049be5b9" Size="876" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2023414" />
+    <Blob Hash="1a5aa2a51ce29fec2e12f30cbc16ef86049be5b9" Size="876" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1912749" />
     <Blob Hash="1a5aaa38bf5d266e40b159e7c3288031fbfc8123" Size="5703168" PackHash="11fc972b2f88e9035190e6aa5d4197f9524c63cd" PackOffset="8" />
-    <Blob Hash="1a5dd134bc410cf26b0a40973baec1489a43b6e4" Size="1226" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1362573" />
+    <Blob Hash="1a5dd134bc410cf26b0a40973baec1489a43b6e4" Size="1226" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1482033" />
     <Blob Hash="1a5dd200747ff4deb0ec9c84a9c545af15382f77" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2087016" />
     <Blob Hash="1a63a00d1dcc2a4e4c70cdcbed1ac8093a110126" Size="26128" PackHash="33f3679a1b6d3e7da34456a34dca2562859d1801" PackOffset="2031812" />
     <Blob Hash="1a6a8848121376b0ab3d777fa216fe12f2c787a5" Size="184" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2096923" />
-    <Blob Hash="1a6b4b24774600dec4f83c1af9c00941f8ff0703" Size="81648" PackHash="c09475c98de55014475979ce14a54515e210de6c" PackOffset="2006192" />
+    <Blob Hash="1a6b4b24774600dec4f83c1af9c00941f8ff0703" Size="81648" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="1892396" />
     <Blob Hash="1a6bc8bf1bb64b0b285402a03b9d30c1067a34d8" Size="6011938" PackHash="5de0da60b1dfe010d0ca5c25d6fdc6adf9d0798f" PackOffset="8" />
     <Blob Hash="1a6d54db5b287737d24edeea7ae170d402830b83" Size="388486" PackHash="0b650b20c8c8aba9b4ffbfff4555352296b8026d" PackOffset="344738" />
     <Blob Hash="1a6f1687b7a221f9f2c834b0b360d3c8463b6daf" Size="64" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2096052" />
@@ -41914,20 +41813,21 @@
     <Blob Hash="1a736d61a6797295eec8c094aed432171e98578e" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="625725" />
     <Blob Hash="1a7679c231550a88f0f34eb4b2e749122d18cfff" Size="1098" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1087712" />
     <Blob Hash="1a7681f203db720a79d6aec42814ab4ad38d67b6" Size="9354" PackHash="52dcb8e824841448b75821e4a33b694072617ecb" PackOffset="2083888" />
+    <Blob Hash="1a76e2013279263da0a7a689a03c69087b5c05d2" Size="151574" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1520175" />
     <Blob Hash="1a7701ce0010f3959df7bb5c7fdaea25059de3eb" Size="6697" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="113601" />
     <Blob Hash="1a7841750281d9af41c6868034999587bf3d9e58" Size="8768" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="778500" />
     <Blob Hash="1a7885270edbc4f759212b3ba28a79cdc8a881d9" Size="71606" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="8" />
     <Blob Hash="1a79860b4116a5c8c6493463c0b6ac4941917dab" Size="5320" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1218903" />
     <Blob Hash="1a79e54fd40ada6a3b2b7169a8dadd8ac258abd1" Size="240309" PackHash="36a132c9f653eef8303192fea1f02b6c80bdaf81" PackOffset="1105709" />
-    <Blob Hash="1a7b7b037f045d56ed3d4c926ad74acac6c375c0" Size="267604" PackHash="fb276d1bd30c33019a2a41af75e8a82e43b80637" PackOffset="1417880" />
-    <Blob Hash="1a7be56c0f2e1def8c0dc90d05d655021aae477f" Size="45530" PackHash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" PackOffset="2017783" />
+    <Blob Hash="1a7b717ab1c96366d800aefe2920c5eb4917af69" Size="1215488" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="8" />
+    <Blob Hash="1a7be56c0f2e1def8c0dc90d05d655021aae477f" Size="45530" PackHash="b6dfbd00039d6429b88b17309b9194259ee93a62" PackOffset="2035284" />
     <Blob Hash="1a7d98c82260226dbe347151fefed5b4d3346526" Size="524" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2087946" />
-    <Blob Hash="1a7db1e777a889b99d748994c7dd78f3cd85c7a9" Size="899" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2027794" />
+    <Blob Hash="1a7db1e777a889b99d748994c7dd78f3cd85c7a9" Size="899" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1918005" />
     <Blob Hash="1a7dbf40f3928453b69563c964b20223b3ae3d48" Size="3477" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1658903" />
     <Blob Hash="1a80c658063ec25c382fe21787da9c4e14f81d70" Size="960" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1990236" />
     <Blob Hash="1a80e38432706ba96f09f45f817822b6126cfba8" Size="3226336" PackHash="d4a128141eb4c40e6be2d2ce7229e78e801d1956" PackOffset="8" />
     <Blob Hash="1a82d175d921f6761d33e864eb9cf540c4eb49d9" Size="2184793" PackHash="357fc4cd09e4eea77faa70a271346bfd5d0b8417" PackOffset="8" />
-    <Blob Hash="1a8c1b69769fd02168ca7a93756b9f17ef8905f9" Size="62223" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="1944394" />
+    <Blob Hash="1a8c1b69769fd02168ca7a93756b9f17ef8905f9" Size="62223" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="2030676" />
     <Blob Hash="1a8c3546e11aa6f541e04789368ed6a006c65c3a" Size="5633" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1106786" />
     <Blob Hash="1a9062a33a9c2e8c23289d1800b7c4c3883d9f5e" Size="27340" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1323270" />
     <Blob Hash="1a90974b6ec31508f58875fabf8b72d6e8cb09ec" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="646207" />
@@ -41943,7 +41843,6 @@
     <Blob Hash="1a9eff30d34596d1dff4600b6279f071659791c9" Size="19237" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1689328" />
     <Blob Hash="1aa074c8e256842ef3a7944ae2dca7e03b1d1083" Size="670768" PackHash="bebbdbb60be5af7d028ddfaa2a719af3d6269dbe" PackOffset="908284" />
     <Blob Hash="1aa369e4143bfa18e13b387504f420978ce509fc" Size="20480" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1302220" />
-    <Blob Hash="1aa47193908e39ba47fbb24b911b99a439984481" Size="1071" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="475646" />
     <Blob Hash="1aa8579aa13d4075c4082245317cb1dcc4ba6b4e" Size="18624" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="1938600" />
     <Blob Hash="1aa935a8a7951de3f838ee1b35de9a1affa1b60a" Size="1998" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1583309" />
     <Blob Hash="1aadb0d46d5c7e057b49de8fb62b0c1dbfabf619" Size="32769" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="587369" />
@@ -41951,12 +41850,11 @@
     <Blob Hash="1ab20bc33829378e3332a66b5cb5c1e71fb8a5cb" Size="805358" PackHash="d9bda84de8db2b30024997e133bba904f53f98db" PackOffset="803930" />
     <Blob Hash="1ab42bdeb5067c534dca89b40bce4e442e0d44ee" Size="5652668" PackHash="69c755cf7e4f4d56e0e66357a73cbbffcdb81211" PackOffset="8" />
     <Blob Hash="1ab601f03e4c38d13a84ad2267e501bb3fd7cf39" Size="996142" PackHash="ba59a62dae63fc2d143e0cf4c7c65185055b6cfc" PackOffset="824542" />
-    <Blob Hash="1acf696a1c406b22da3c7e1adf7f21359c79bfdb" Size="169" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1448848" />
+    <Blob Hash="1acf696a1c406b22da3c7e1adf7f21359c79bfdb" Size="169" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1985930" />
     <Blob Hash="1ad3cf08375090cd46c73f8b01b1499102a96390" Size="801" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="741616" />
     <Blob Hash="1ad4daeddcb34dcf695b0e05e1eb7e32fc9ac1fb" Size="3880" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1816792" />
     <Blob Hash="1adb32bde2201ac4c0780edb64bb3f6fd5390e7b" Size="11253" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="2070226" />
     <Blob Hash="1adde429cfbfacbf40d94a756366b53d20c638f1" Size="866" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1260735" />
-    <Blob Hash="1ae207a22de07d84755dc25640e9e05ff5629549" Size="3265768" PackHash="9623422488cd2bad59e5a474b9f1adb5780e75b8" PackOffset="8" />
     <Blob Hash="1ae3ec33b0d7c38ac628274431f5fb517c065623" Size="13567" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1908610" />
     <Blob Hash="1ae40b93e0d768e2ce749cc2da2e90028a753fe1" Size="5483" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1108570" />
     <Blob Hash="1ae64296809b0b75d3fff3b9c6a97b841b5a2de5" Size="24732" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1668465" />
@@ -41982,7 +41880,7 @@
     <Blob Hash="1b1d91a14ab483c21562841dbb13c77c7a7aa41a" Size="1333" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1470013" />
     <Blob Hash="1b209d42946af4b3cab900109b984af7a4430549" Size="1284608" PackHash="6a67f7a815e887377e17dc82a86617bcbfd74f12" PackOffset="8" />
     <Blob Hash="1b219784a4a8e19a547b3839ba49425474ec9857" Size="2796128" PackHash="203e868d9d1fb23173d44bd19b325254e6ee550e" PackOffset="8" />
-    <Blob Hash="1b2584bf67096acf71821c5ee8b37e51ac1ecade" Size="1031" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1299369" />
+    <Blob Hash="1b230a69ed1666ce93b6859f69fa8a31922aaf11" Size="1825132" PackHash="0a5f18beec683918579defc535c5cd097d71f4e6" PackOffset="8" />
     <Blob Hash="1b28bba599292492f28b86fd1bafbe5cb4ae3fa8" Size="145820" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="821042" />
     <Blob Hash="1b2b28fe1b44a14a7ce720b73b21c001c1ff7cbd" Size="540" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1232156" />
     <Blob Hash="1b2d1a6937fabaaedae9c5dcc16ec91e6ba0a02e" Size="162039" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="1073628" />
@@ -42001,7 +41899,7 @@
     <Blob Hash="1b3d84086eebc03e564ace6525b57cfb8a8ef7d5" Size="10752" PackHash="6a67f7a815e887377e17dc82a86617bcbfd74f12" PackOffset="2082824" />
     <Blob Hash="1b415a66d4d9ac5296053e9c27d48eb09660792c" Size="172" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="444872" />
     <Blob Hash="1b425fbfeec4fe08082ea6235c446a32195b4b80" Size="4060" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="426976" />
-    <Blob Hash="1b44c603e2ea15906d040b85d1618643647ab76f" Size="13859" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2081902" />
+    <Blob Hash="1b44c603e2ea15906d040b85d1618643647ab76f" Size="13859" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2066670" />
     <Blob Hash="1b47bbd78a4832b769dd48bcbc813b42ec9a0112" Size="59107" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1223611" />
     <Blob Hash="1b492b22ecbe6759fb5a9128c5be9b9dbba7cd8b" Size="50" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070479" />
     <Blob Hash="1b4bc756072027494f92092a6634f0f512510b51" Size="238764" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="371233" />
@@ -42021,15 +41919,16 @@
     <Blob Hash="1b6e1c0066ec094f9557293aa171c610525a3549" Size="97792" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="559395" />
     <Blob Hash="1b6ea80ed469d02560c902e36a2af70b3ba890b4" Size="14440" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1204414" />
     <Blob Hash="1b7075a4465de86905981580e779beb556e7b989" Size="1176" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1918352" />
-    <Blob Hash="1b71545bfc0a45ecffc514a93c3eb902d8be99e3" Size="1021952" PackHash="aa29e83247e30bb95e845eec97d2557aa776271d" PackOffset="1056984" />
     <Blob Hash="1b720ba251b28e4cb42e3fdfc3def62f6d88ce74" Size="7589528" PackHash="585efc4a175c688208acdb256212dd88a9246dc5" PackOffset="8" />
     <Blob Hash="1b78b8135304920220198ac9a4a8605a4b5cc10a" Size="4325" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="2089320" />
     <Blob Hash="1b78c2c121c7894c1008ae01c7d9eebce73ecabb" Size="3259814" PackHash="a17bc4d37d2b33d12922e15b67bbd12e3ffd16e1" PackOffset="8" />
     <Blob Hash="1b7af9e23f24987be99e2f6b194a2f21e7e8d851" Size="43744" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1916147" />
     <Blob Hash="1b7e51222c5d93637350407f117dcb4deab0f6f1" Size="10752" PackHash="0438814196df435595bbb951822bf81d0364af0c" PackOffset="2083304" />
+    <Blob Hash="1b7eae552c005a9858e7f8aca321942528c274b4" Size="48264" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="1597080" />
     <Blob Hash="1b7fce1af93d2375ce8db1e0ae110b42a711c7e2" Size="1486648" PackHash="31c3cfc83aaaeecb25f86f0fe14191d04caa818b" PackOffset="8" />
     <Blob Hash="1b884054604c30c6a09bdad9cce1c5dfee2bb145" Size="7752966" PackHash="a26c042b2c912ba5dc3205a2bfe9865a510cc6b4" PackOffset="8" />
-    <Blob Hash="1b8d0c3da2fcdeb39c25cba40b99f708814e6bd9" Size="354" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1588912" />
+    <Blob Hash="1b8d0c3da2fcdeb39c25cba40b99f708814e6bd9" Size="354" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1708144" />
+    <Blob Hash="1b8ea6fdec8839420906a113d17960a11fb7a0a0" Size="32382468" PackHash="b458e8cd68fc066335eb87f1402dd08b87024f15" PackOffset="8" />
     <Blob Hash="1b8f3d0bda334f7577a398eb9dc93753e2796a66" Size="202" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2075754" />
     <Blob Hash="1b9230eaa8c678006300048b6f1c21428a175d4b" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1347448" />
     <Blob Hash="1b966d2bf79440e123282c480d5fca07964e4229" Size="12664" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1653794" />
@@ -42058,20 +41957,21 @@
     <Blob Hash="1bccc1be46306def8a9ca249de8fa11fc57cc04d" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="495765" />
     <Blob Hash="1bccf245a86e803afa2148b57930bacc45ef9903" Size="3699" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="150254" />
     <Blob Hash="1bd23a3b223e5f3df75960bf1dd76ed5e0567007" Size="2477" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="2045336" />
-    <Blob Hash="1bd31fa1041990a4b4693967b8aeed6bf61b3ae7" Size="8028" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1595386" />
+    <Blob Hash="1bd31fa1041990a4b4693967b8aeed6bf61b3ae7" Size="8028" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1611211" />
     <Blob Hash="1bd82924d3d75b912beaa821b4627e8008c0d924" Size="14563" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1747531" />
     <Blob Hash="1bdb67b129044540bbd02e26ac48565bb6e80cf1" Size="9681" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2053797" />
     <Blob Hash="1bddb0cbd3a868b81387d20b2209a0038a5f02fa" Size="9512" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="483248" />
-    <Blob Hash="1bdf610903f2da58dfb528e5ffa0e7feebfa0712" Size="12867" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1131423" />
+    <Blob Hash="1bdf610903f2da58dfb528e5ffa0e7feebfa0712" Size="12867" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1898904" />
     <Blob Hash="1bdf977c003868bdccb93478a5651145ddf4abc3" Size="2913" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="651618" />
     <Blob Hash="1be08cb29ae5c4ac2b742b4ae6c715be3c6407a1" Size="525" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="8" />
     <Blob Hash="1be0adfd62c6c572b1f4d439040fa4e19525a899" Size="9568" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1471518" />
     <Blob Hash="1be3b96b659b76237ac2d67697976ab462a7ba59" Size="38761" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1945709" />
+    <Blob Hash="1be597f11bdb7477c6099a082c7b9915971a43d2" Size="78848" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2001956" />
     <Blob Hash="1be5d42bdbd146b201d1a7e36278cdc5581a6cda" Size="22473" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1785411" />
     <Blob Hash="1be76e1657f1d1fae2217c027481b9a9c88e8fec" Size="20471" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="379700" />
     <Blob Hash="1be8f30c85b05daa2a18bb0332af36750e375ce0" Size="314684" PackHash="83483b879ca4d4508d64bd7176b1101533718a2a" PackOffset="1691052" />
     <Blob Hash="1be93348a3e2e90a99bbeeb140b5b366bcb51625" Size="4982722" PackHash="de74434214aa307a9b0fd7f9d71b839fc98c45e1" PackOffset="8" />
-    <Blob Hash="1be9fb4dd978d6a89696dba514eafe56e9699228" Size="769" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1463042" />
+    <Blob Hash="1be9fb4dd978d6a89696dba514eafe56e9699228" Size="769" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2000124" />
     <Blob Hash="1beaeee2c84bae0c3e950b5cc41682e8b5dc50dd" Size="1907" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2083700" />
     <Blob Hash="1bec85166a8393c590f6870ae48f25dabc17123c" Size="12800" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1593208" />
     <Blob Hash="1bf24ad58ecc3eece3cd342842087a3eadc8ef82" Size="2118" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2070308" />
@@ -42094,7 +41994,7 @@
     <Blob Hash="1c219363ef4abaa99adb821c1b7a4930009a4027" Size="164427366" PackHash="e9f2970e25d30e5663d97f87975406775b2efc8c" PackOffset="8" />
     <Blob Hash="1c2316a5ab2115ffce07be03fded56aeec519f97" Size="1845155" PackHash="44550fffb2c3c4bd3e389a62349314f917149551" PackOffset="8" />
     <Blob Hash="1c2350715adc5e9ff6b2a45c21f5c31ed2cc57d1" Size="3299" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="978069" />
-    <Blob Hash="1c26c0f01fd74b25efca5b4749218fba145a81e7" Size="2148" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1391475" />
+    <Blob Hash="1c26c0f01fd74b25efca5b4749218fba145a81e7" Size="2148" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1840377" />
     <Blob Hash="1c295b7d4b111e47eafe5df374ec70d6dd54a70f" Size="7514" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1126276" />
     <Blob Hash="1c2a659e40f2b92d2e34aa3db7223aa0bc5ef7bc" Size="4363" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1143213" />
     <Blob Hash="1c2bf55c9c0543db15e7e8769230e12e9218d637" Size="1697" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="2091157" />
@@ -42103,7 +42003,7 @@
     <Blob Hash="1c2f8095fd0d32d401f4b114875b00b1a10580f7" Size="147097" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="745413" />
     <Blob Hash="1c2fb74c1b2aa173262734c1f616148f1648cfd6" Size="4064" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1611008" />
     <Blob Hash="1c3027cad4f46dc82dfd68dcee88372f4505fd1f" Size="8573" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1318215" />
-    <Blob Hash="1c30d60ca273556be54338ee1a137be4a74d82ca" Size="1207" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="2095447" />
+    <Blob Hash="1c30d60ca273556be54338ee1a137be4a74d82ca" Size="1207" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="2095951" />
     <Blob Hash="1c32dcae49d39acc5ab5543dc514b0ee44289356" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1928980" />
     <Blob Hash="1c333c18a48bc749fae4be9969dd28c3f616951d" Size="441947" PackHash="1d65dd4bc54fb708e89f184268c81d7711313128" PackOffset="1405770" />
     <Blob Hash="1c395da84a7751626176293d2c6f7b8756cb5d8c" Size="3711" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1084983" />
@@ -42114,8 +42014,9 @@
     <Blob Hash="1c44308e65e3de4d59e22e2576a4649de404f27f" Size="39514788" PackHash="5f056dfebebe14fd70877883bfa9872c5a1daab1" PackOffset="8" />
     <Blob Hash="1c47b09fc8c86481a2baed0d6b52d716ee94f26e" Size="7056" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2034618" />
     <Blob Hash="1c483fc95459ec6f1d5fe4dd275879a9ebca1718" Size="9509" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="294982" />
-    <Blob Hash="1c48471296061c09469e0df0d0c9687481cb7dbd" Size="103" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1597641" />
+    <Blob Hash="1c48471296061c09469e0df0d0c9687481cb7dbd" Size="103" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1716873" />
     <Blob Hash="1c4a214ff3b722e80c0ecaca0ffd5dff302f6ae9" Size="183" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="304491" />
+    <Blob Hash="1c4afa36328362bf1fcd0f76461c894fdcd8dd8b" Size="1024" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1751710" />
     <Blob Hash="1c4e186f2d53c0a1e6a82a6d33b172e403a41d6d" Size="187" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="542584" />
     <Blob Hash="1c559a8f8e9474c1896ee1f5135f19dc1abe5702" Size="5075" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1536417" />
     <Blob Hash="1c58b1b4957e51e07cd2f38c3534b490bafdedb1" Size="132462" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="1875313" />
@@ -42148,7 +42049,7 @@
     <Blob Hash="1ca20a1d7c1e7320c981a221170908882b653023" Size="65321" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="171406" />
     <Blob Hash="1ca29bfb7a72138e445a1530094cef7ab5670277" Size="5401" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="988512" />
     <Blob Hash="1ca4dee8c5383e67f13afaced74198509266ed03" Size="5940" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1178071" />
-    <Blob Hash="1ca55eec04abe10d65fb88224e83474ea5f3d745" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552011" />
+    <Blob Hash="1ca55eec04abe10d65fb88224e83474ea5f3d745" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671243" />
     <Blob Hash="1ca5cc84ed7404af3a1fed4678a69195e41b9bde" Size="94149" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="1974387" />
     <Blob Hash="1ca6c1c679dd0bb55ad1e37c0e4e1232d929b750" Size="30114" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="746314" />
     <Blob Hash="1ca7e0daebfa1c09e34c9cee9b99d27b516ba6e6" Size="1381" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2080893" />
@@ -42162,7 +42063,7 @@
     <Blob Hash="1cb70c493063078a6948612a76975c1f96134826" Size="7509" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="2001389" />
     <Blob Hash="1cba2555cfc3f77544aecad4acabda2780811df1" Size="4416320" PackHash="44335da603936c3c4bde73d397211c5608124a14" PackOffset="8" />
     <Blob Hash="1cbba122792c933ea20382c8ee6e40f12e8a3375" Size="157202" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="139754" />
-    <Blob Hash="1cbc2601e7c85ad177eabce71295474fc0ea377b" Size="36162" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2008508" />
+    <Blob Hash="1cbc2601e7c85ad177eabce71295474fc0ea377b" Size="36162" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2049020" />
     <Blob Hash="1cbd72cc5d61fd79ffc5d8392c469ef434574da5" Size="939" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1790297" />
     <Blob Hash="1cbfcbf3e6c3f7861fbb6bac2199e08069f739af" Size="874" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1775908" />
     <Blob Hash="1cc18171483883bfcbdff8987e8fa555c0851f46" Size="182" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1573198" />
@@ -42170,6 +42071,7 @@
     <Blob Hash="1cc357558e09cdea49f821826d2aea9a6ef2c824" Size="171" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="614405" />
     <Blob Hash="1cc4a66408f24a509ab639d22382d16ee11dd92b" Size="140" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1375612" />
     <Blob Hash="1cc7a4c977fdac0b56cab47a568c672a3ecbd5a3" Size="1450600" PackHash="b37cd4fa8dc271ee7cb82371299fa481e5c35ada" PackOffset="8" />
+    <Blob Hash="1cca659fd62ee07761b24ee7f86361fcb20d40cf" Size="194840" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="1889928" />
     <Blob Hash="1ccbefc485047cfa82850aaf662b227edc0183c7" Size="3260" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="904964" />
     <Blob Hash="1ccdc9443bae71a5455eff93a304eae16f087be7" Size="19648" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="941920" />
     <Blob Hash="1ccfd4d41316686f9f41e2f3bf8d577904b01553" Size="526" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="716547" />
@@ -42178,23 +42080,20 @@
     <Blob Hash="1cd497fb26d396166d9c0e14262221df8c3cfabf" Size="280" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="675077" />
     <Blob Hash="1cd52ece4a0bebbb87942c8615e51ad4a9535da2" Size="18010" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="468542" />
     <Blob Hash="1cd8ed1aba19c6ffc2c07c1ff8edb1026bd5dbe7" Size="5174" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="2074351" />
-    <Blob Hash="1cdd170eb1ae896b72a539c4b4ee984c3c8d6acf" Size="194" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1823503" />
+    <Blob Hash="1cdd170eb1ae896b72a539c4b4ee984c3c8d6acf" Size="194" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1942735" />
     <Blob Hash="1cde791c0abf8edc045ba69d948f242200e59a5a" Size="360056" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="360062" />
+    <Blob Hash="1ce2b862dc46f2e86523769a5241227222c54ea7" Size="1773942" PackHash="dcb3503036400494b05d6a300549c66555bfb883" PackOffset="8" />
     <Blob Hash="1ce593c47b0cdde7d344a914a8499e22561f04e0" Size="136" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1550572" />
     <Blob Hash="1ce79fd84a6c0ae131baa6262dd76a2b7ac0d269" Size="17084" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="2055726" />
     <Blob Hash="1ced014b435e53d39c842a291509b0c8cac6f85e" Size="1100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="733940" />
-    <Blob Hash="1ced1d922039e6d425158d6aa73a0d83d60fd18c" Size="2322" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1328322" />
     <Blob Hash="1cee6e83b58eda48230b5dc1a44355b66e339163" Size="196" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="2095454" />
     <Blob Hash="1cefb22575ccff8b7dcd29557091e3d191841e60" Size="1534688" PackHash="6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20" PackOffset="8" />
     <Blob Hash="1cf2c89cc66f47c77a7c216014ee29aa2d68480c" Size="19237" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1761928" />
-    <Blob Hash="1cf2ca84597b7ce18d8fb06b282f73304c52b028" Size="500142" PackHash="c186e17712d48f5c0290a0dd22d99e6357fe7ecb" PackOffset="1432896" />
     <Blob Hash="1cf4dc03759cbf70183034f3d2c711b2103b73e3" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1081872" />
     <Blob Hash="1cf508429dfc40643b1fab336a249a3a287d8c7c" Size="159" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="558585" />
     <Blob Hash="1cf6363f5e0e3d2e826d69af1300492a2a2ba616" Size="21811" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="2068395" />
     <Blob Hash="1cf99367bd2ae154beeed79191f4dbf5397bdb2f" Size="13019" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1913883" />
-    <Blob Hash="1d01bb9c8f69ded3fa1e49dfd6545411e82a4dd6" Size="15492200" PackHash="93876550c301d3bf8bcb6200afb12ab8113c11ad" PackOffset="8" />
-    <Blob Hash="1d036bbc1e191ac645af2ea97feb0127dd298224" Size="8616" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2055560" />
-    <Blob Hash="1d073fda06162db5d11f6066eae99e2fd8192c1e" Size="1585544" PackHash="9914ebb44e7e5640a37d1eea68fd99aec8f8aec7" PackOffset="8" />
+    <Blob Hash="1d036bbc1e191ac645af2ea97feb0127dd298224" Size="8616" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2058208" />
     <Blob Hash="1d0e7b97f8c8ac504a6b375fbf497918590a48e2" Size="33502" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2056430" />
     <Blob Hash="1d0ea6faed5e15712c5678a634f0aff0c63b10df" Size="23659" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1010699" />
     <Blob Hash="1d130a792996ce588baf690eac342b61c1db2ee1" Size="3674" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="1748012" />
@@ -42220,7 +42119,6 @@
     <Blob Hash="1d4e3b162baf3d74e4bab976c895fced20929a9a" Size="128066" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="396601" />
     <Blob Hash="1d5346516d5f1f7546d4400ca3eea55022ddd9bd" Size="246209" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="1476190" />
     <Blob Hash="1d5474e52f06b7538636fc5e1c06cc3a18dcba36" Size="224583" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="126167" />
-    <Blob Hash="1d566253f5711b49f57b00a3344b5334dcaf91ed" Size="21000080" PackHash="8964b1842eb2e86f576ccad00a692f179d7ccf8d" PackOffset="8" />
     <Blob Hash="1d56e5e372e97caedb748579d516528735685ba4" Size="66543" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="915926" />
     <Blob Hash="1d573dfc18fffaa5e9f1dd41eb49f862e0e2cb65" Size="125" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1257247" />
     <Blob Hash="1d5d8644f8956d4f59bbf17267214e0f99e846a9" Size="85384" PackHash="e23187f494893d459aee2428f603a4f93c6eebe0" PackOffset="358850" />
@@ -42233,7 +42131,7 @@
     <Blob Hash="1d6ebfc6ed9b805496c7ea7c3ce79bd6eddc486c" Size="317" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="2072606" />
     <Blob Hash="1d6fb3d992e8508c343df8936d0234e5f06f2ca2" Size="371" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2096712" />
     <Blob Hash="1d72ba4aa1e0d72da22f046663e36f5e3b5541de" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1188008" />
-    <Blob Hash="1d750107400743bfaa22a5d694ce839ba9d3cd9c" Size="879" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2036587" />
+    <Blob Hash="1d750107400743bfaa22a5d694ce839ba9d3cd9c" Size="879" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1927718" />
     <Blob Hash="1d79cb4227428a36ceeb400cec58eaa656b65056" Size="141" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2096968" />
     <Blob Hash="1d7dc26bb9c78c4499514fb3529b3478aecf7340" Size="19648" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1827048" />
     <Blob Hash="1d7f43f4ecf97ecc386e7a25e0ed00b1baa3ce4e" Size="3268048" PackHash="23c8fa2f3b7f4e1d904830c09d55536158ad6493" PackOffset="8" />
@@ -42245,7 +42143,7 @@
     <Blob Hash="1d8d080c9dcd5366f5e0be872efc1dcdf5b68eff" Size="1581" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1210182" />
     <Blob Hash="1d8fb173bb3345cba6a059a1933962264ea49ee5" Size="331719" PackHash="10917aeabcd8089492835f6fdf0cc16d5545cb80" PackOffset="8" />
     <Blob Hash="1d93267314fa3f6ce2acd1e99f8a700c41262eb4" Size="305" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2096535" />
-    <Blob Hash="1d940f6a14260c90c99894921ccb9ce3b04555c6" Size="1395" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="996246" />
+    <Blob Hash="1d940f6a14260c90c99894921ccb9ce3b04555c6" Size="1395" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2043763" />
     <Blob Hash="1d983b6cfc950a1538af5cad01650263e9dae760" Size="88391" PackHash="fb8c31646887718de45e229d7015c658f3c1bf5e" PackOffset="477529" />
     <Blob Hash="1d9ac4a83ca6914e70e001426d9dcae557aef0fa" Size="297895" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="1530470" />
     <Blob Hash="1d9ee3fc0838785c0092ae7c32af6248ce954f22" Size="824" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2048685" />
@@ -42253,7 +42151,7 @@
     <Blob Hash="1da2ee898e7cb759353ac0d7c2fb0b2482c4e784" Size="8879" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1829927" />
     <Blob Hash="1da71be3d52824ac0c21570782477d6ec1b9f6b0" Size="12416360" PackHash="affeb01103bad44d9d8e6c5c1c3d8ffc3682a1dd" PackOffset="8" />
     <Blob Hash="1da8f3bef23bfab054b492d0637bc962b285c005" Size="9944" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="78448" />
-    <Blob Hash="1dab9db4c3556311b19ac5fc018de63b1f49b564" Size="261" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2096457" />
+    <Blob Hash="1dab9db4c3556311b19ac5fc018de63b1f49b564" Size="261" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2095293" />
     <Blob Hash="1daf04d78d88cc4eb0301575483a39a16f3a5e27" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="462354" />
     <Blob Hash="1daf57aaea01d60bdb7c63faf18a419df955e321" Size="127488" PackHash="85b191ae1844ad6da93fa57876c8850de342b4ca" PackOffset="1964856" />
     <Blob Hash="1daf5eee147274a99a14e37801e051c69da296c4" Size="253" PackHash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" PackOffset="2096413" />
@@ -42262,6 +42160,7 @@
     <Blob Hash="1db2bdbb9c0b8b89025e4d6a1aab3dd58099f46b" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1194274" />
     <Blob Hash="1db8a1ed5b5f6006850001f3006c2f301d27ec42" Size="3493" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1028557" />
     <Blob Hash="1dbbac4a25ee8b631e1f42aefb11b1e13a3386b5" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1177920" />
+    <Blob Hash="1dc1d241ac6216c06ae81e90f3c9c31f267f42ff" Size="2440" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="2088428" />
     <Blob Hash="1dc34439b020d5b8309efc9d1bf301906cc647e1" Size="19256" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1446152" />
     <Blob Hash="1dc60b83629967aeb50cb29cd98137995069744f" Size="15360" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="2031320" />
     <Blob Hash="1dc62bb941c642daba3fe7348619405dedb8e81a" Size="27384" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1285903" />
@@ -42273,10 +42172,10 @@
     <Blob Hash="1dd4499340ec0d4838a0484e177dc7b2b4c0d139" Size="4537" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1452030" />
     <Blob Hash="1dd566cba13a68892751a1c90976eddb5953664d" Size="10842" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="596782" />
     <Blob Hash="1dd5d4bcafa4261c69f8fea48690f0cd5a68b812" Size="240" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1469659" />
-    <Blob Hash="1dd931cf742793ddd82845336f1d4fbbde23b45b" Size="406" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2095652" />
+    <Blob Hash="1dd931cf742793ddd82845336f1d4fbbde23b45b" Size="406" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2095817" />
     <Blob Hash="1dd987f7e48b33a8eb01947a5ba9afd0878ca1af" Size="28672" PackHash="65b22cf1b5681d751dd1073c0d445ef1a54d473e" PackOffset="2067924" />
     <Blob Hash="1ddad60c89ed183405e16fab9395b19a660f88e6" Size="5261834" PackHash="493aaa81b0823e6133709597b3cc35d17f0a5d2c" PackOffset="8" />
-    <Blob Hash="1ddc2012950cf9b191ed0384db16a0ee3af268c6" Size="2965" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1811301" />
+    <Blob Hash="1ddc2012950cf9b191ed0384db16a0ee3af268c6" Size="2965" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1930533" />
     <Blob Hash="1dddba99644b8b5c0ed679dfd50578829c4a3d93" Size="840285" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="730351" />
     <Blob Hash="1dddcc4265d7b980b867fee674bef2fd87d823f7" Size="248" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1100476" />
     <Blob Hash="1ddfcc0515b08025b1e208a359caacb3792115ef" Size="19144" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1730688" />
@@ -42285,13 +42184,14 @@
     <Blob Hash="1dee1f847e0681d78ab66161730cb2de984d3a9d" Size="261" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719357" />
     <Blob Hash="1dee3bc7f6714edf3c21ee71826ebab54ae02077" Size="193567" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="8" />
     <Blob Hash="1df10a565467836e594d15ca6895fc6fbed3b084" Size="12329" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="2074064" />
-    <Blob Hash="1df21b4625a4aab9159dde02e9370b8febf31ce2" Size="7997" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1567604" />
-    <Blob Hash="1df65999794aaf7a33f7f1d4d5fc24de4c23a193" Size="1219584" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="8" />
+    <Blob Hash="1df21b4625a4aab9159dde02e9370b8febf31ce2" Size="7997" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1583429" />
+    <Blob Hash="1df65999794aaf7a33f7f1d4d5fc24de4c23a193" Size="1219584" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="8" />
     <Blob Hash="1dfb0a4a5b4168411cdccc4463a87816fb0827ce" Size="77534" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="887157" />
     <Blob Hash="1dfc79e06410b47c8a2982192d0eb2af5af63668" Size="4782" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1572242" />
     <Blob Hash="1dfc872e68fcb6697dc3f078a72d7991570dc40e" Size="16724" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1745971" />
-    <Blob Hash="1dffd49cf631ea4df128f654b820c28fd777dfe2" Size="268" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2095267" />
+    <Blob Hash="1dffd49cf631ea4df128f654b820c28fd777dfe2" Size="268" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2096812" />
     <Blob Hash="1e01013d7fd3d3922f2a69d30f60ee3338d1cae8" Size="2664" PackHash="f56edcc07a586e9b6792c219e9e8eca444362bfa" PackOffset="2094424" />
+    <Blob Hash="1e01dbff71e154615c0c0362cc211a6cc73a3475" Size="82576" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="2004980" />
     <Blob Hash="1e02102d6e129478089f00d16834bd01d2fd9006" Size="9229" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="69362" />
     <Blob Hash="1e0ff9fb10d6f7a17dc6e7941efb5a7bc6461c36" Size="217760" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="651220" />
     <Blob Hash="1e10b182dd094c6abff1ccced60abe1f31536e80" Size="49138" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="549040" />
@@ -42314,23 +42214,22 @@
     <Blob Hash="1e35fac6aa918b9218223813e7e7e6a45fb9086c" Size="238404" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="293843" />
     <Blob Hash="1e378ad4a25985708e32f1dca0d1716a9959331f" Size="2624464" PackHash="0e28d0cacb35ac8074187e3d2bef8935b8c7b8c6" PackOffset="8" />
     <Blob Hash="1e3e22230c14be0f120f11ecff1d2c8636bf595b" Size="7678" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="2083695" />
-    <Blob Hash="1e3eaa724763cfe9599f734309dc8cf2835f8f59" Size="300" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2096415" />
+    <Blob Hash="1e3eaa724763cfe9599f734309dc8cf2835f8f59" Size="300" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2096630" />
     <Blob Hash="1e40068736bb59fe54e2c376793cc1b8c8193f03" Size="24973" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="394422" />
     <Blob Hash="1e43a5fd1514090d2e67e224a497b57381dbdeb5" Size="5460546" PackHash="b432e5a7e570f9f15b64fbddbeafb874490b4ee9" PackOffset="8" />
     <Blob Hash="1e46ad39587fad30afc74351f2d7f03089e9e0a2" Size="100892" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1946186" />
     <Blob Hash="1e4a9454b4393656163d6bbdac018a5d0f69c470" Size="76927" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="231129" />
-    <Blob Hash="1e4b5e22a3ee0dcb4b49f00f8721986688d2f56c" Size="554" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1750815" />
+    <Blob Hash="1e4b5e22a3ee0dcb4b49f00f8721986688d2f56c" Size="554" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1870047" />
     <Blob Hash="1e50224262c95e4df419267bf36e3ede2326d18d" Size="21423" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1138407" />
     <Blob Hash="1e520af6d4740601543589e87d63d801246f77d1" Size="377" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2020208" />
     <Blob Hash="1e52314f2b93add8285081c99d2483f191a37b57" Size="7806" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1252530" />
     <Blob Hash="1e52fe2f301dfc17f5b651ab888e0e4023b2c876" Size="970" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="573467" />
-    <Blob Hash="1e55eef07e9766975839300077822cb3d4305a37" Size="1029" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1292405" />
     <Blob Hash="1e57698c1269d63a2a9ebe00d45330eeac3c3b35" Size="17184" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="118880" />
     <Blob Hash="1e58be8c81a17c4e617b26ff5f0c060c2c19cb7d" Size="474622" PackHash="9bc19f3cb48e1f3fb37f1a5c35b2e6f213545d1d" PackOffset="8" />
     <Blob Hash="1e5dcce316e6003d1743aaad58d1dd4794648d62" Size="88028" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="482305" />
     <Blob Hash="1e5edbf21ee86b5beb54a6acb86a91457bb0cb9e" Size="7778" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1325124" />
     <Blob Hash="1e619f8180b84451acdca95c12e293b71bb61511" Size="2929" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1059713" />
-    <Blob Hash="1e63ce99756ac3c9f6209af42af5e164392eb1c2" Size="69" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552647" />
+    <Blob Hash="1e63ce99756ac3c9f6209af42af5e164392eb1c2" Size="69" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671879" />
     <Blob Hash="1e685fda0bf690b7f304f64a8ad9633fd3f359fb" Size="133185" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="516228" />
     <Blob Hash="1e69c4194020312e2f32265568d6ca8bbb3337b3" Size="8715" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1669864" />
     <Blob Hash="1e6b225de5ea34707dd033a8e2ab8e4990946bb2" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2084924" />
@@ -42351,10 +42250,10 @@
     <Blob Hash="1e87e4260e2ddf2828291617a7b533600aae20c8" Size="9728" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="2085896" />
     <Blob Hash="1e88ebfd809da2d0f65fd72eac27bc7a253b4f16" Size="4942" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1329592" />
     <Blob Hash="1e8a5e1e0f135e607ad5442a1ba772e9500d48cc" Size="30738" PackHash="4c5e613dbc080d544e62bd42771a406a1f7743ad" PackOffset="2057280" />
-    <Blob Hash="1e8d4b7cde8a0d8ea9f9926ed39bb0e431762f59" Size="13289" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2023487" />
-    <Blob Hash="1e8f48f87913c9c8688b3fca6ed485d1c77d4da7" Size="787" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1432219" />
+    <Blob Hash="1e8d4b7cde8a0d8ea9f9926ed39bb0e431762f59" Size="13289" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1763714" />
+    <Blob Hash="1e8f48f87913c9c8688b3fca6ed485d1c77d4da7" Size="787" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1881272" />
     <Blob Hash="1e95f19e1b8e1c13561611deb17615b26d4e387f" Size="84952" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="943708" />
-    <Blob Hash="1e973e4f7562622c9740be8bbdfbc9325ca6eae5" Size="8956" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1528709" />
+    <Blob Hash="1e973e4f7562622c9740be8bbdfbc9325ca6eae5" Size="8956" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2065791" />
     <Blob Hash="1e9747dd951ae9b351a421cf985aa7c0c4156eb8" Size="26838" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="356714" />
     <Blob Hash="1e9830cff019004eb1f7457dccbb97b00c9110d5" Size="6364" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="505876" />
     <Blob Hash="1e9dfbd02148d0ec59ec12fb4708a54a28441718" Size="2215" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="2087983" />
@@ -42366,17 +42265,18 @@
     <Blob Hash="1eaec9e032a4249f25feed91953bb1f24dc94eda" Size="3075" PackHash="0876bced82b841d9ac51a902abbee0a72c97489a" PackOffset="8" />
     <Blob Hash="1eb03d1a9993a7962fc0aa11c1ce58d2e066a46f" Size="1665794" PackHash="b4a7011b1f4b663e34e08b5caa1fe927463eb914" PackOffset="282049" />
     <Blob Hash="1eb050da348aa7a90df4aaf066f59e3803000a63" Size="5552" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2025128" />
+    <Blob Hash="1eb26a3eec9d0e4d55773367a96a910a89156ed8" Size="1485702" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="8" />
     <Blob Hash="1eb2a328b36ffbbd8c7aedc4ecba50440645a136" Size="1913" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2090078" />
     <Blob Hash="1eb41ab15639ef37f31e20e53b5cb806b544e080" Size="3050" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="492944" />
     <Blob Hash="1eb4d5b65c9a475cf1667beee414adb2f84075f8" Size="910" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="830548" />
     <Blob Hash="1eb611ef57f4e965c67487bb6f3b64fe85dcdfcb" Size="73373" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="284376" />
-    <Blob Hash="1ebcff87bd369eb9b28835b27ed380f1b0dc37e9" Size="4060" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2053703" />
+    <Blob Hash="1ebcff87bd369eb9b28835b27ed380f1b0dc37e9" Size="4060" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1944834" />
     <Blob Hash="1ebf827b4218d4931777da75a21e1a35157caa15" Size="53" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070085" />
     <Blob Hash="1ec105f112969e9b7cefc86430bafc3cd85d5127" Size="3461" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1562292" />
     <Blob Hash="1ec12ab52fb39cff9a6453151c5465896b0a768f" Size="10284" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="841804" />
     <Blob Hash="1ec1d2982e6078bf10e2cd847d5dc01a6a73286b" Size="524" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="1941582" />
     <Blob Hash="1ec2371f962cd5125efacd634c880ae248cc76ef" Size="884" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1380948" />
-    <Blob Hash="1ec45bcb4ad0af4dd74955af7c142c9019459a60" Size="32560" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="2062872" />
+    <Blob Hash="1ec45bcb4ad0af4dd74955af7c142c9019459a60" Size="32560" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="1914676" />
     <Blob Hash="1ec53907b186fc47bca5b9ecdc4d8431f1214650" Size="11983" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="2078241" />
     <Blob Hash="1ec6a493be9ec76fdb04dd2e23902e4155838097" Size="15517" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="315543" />
     <Blob Hash="1ec72c48ac6d9fd52f795ac258a368eb027f03c7" Size="3843" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="2077893" />
@@ -42389,7 +42289,7 @@
     <Blob Hash="1ed9b69bafbbda9d0e337eb0839e480f6ebb41b8" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1991336" />
     <Blob Hash="1edc5afc2ec6f94950cf5ebb30c079bc5a19f42f" Size="14860" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="464692" />
     <Blob Hash="1edec6c18c1c9544f736f865ba1b3149d11f385d" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="668202" />
-    <Blob Hash="1ee3a94c29caa1471bc38ad6e1749f2061a12687" Size="834" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1440165" />
+    <Blob Hash="1ee3a94c29caa1471bc38ad6e1749f2061a12687" Size="834" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1889218" />
     <Blob Hash="1ee8defadd22dce32cb05474f9565d100d89db84" Size="437" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="364386" />
     <Blob Hash="1eef3ca77dc364a54c6d687dbd95e66e28959148" Size="24208" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1044363" />
     <Blob Hash="1ef6659f5b811d0c52ffe7be0367938f059b95a0" Size="2924" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="211905" />
@@ -42406,22 +42306,22 @@
     <Blob Hash="1f0719cf3c40619819c67c95bd90c67be4044f77" Size="2902776" PackHash="4eaf9c67004bee0f9f60124e6f267195f2d2ec3f" PackOffset="8" />
     <Blob Hash="1f09393b674442a38045e1a46cb61cf3f9128a1d" Size="3242" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2050435" />
     <Blob Hash="1f0ab8231cf1abe9719fbd80df9eb8e51b77f69a" Size="4507208" PackHash="16bc6e217fb6d6e8e2cb1268a003ceaf39705809" PackOffset="8" />
+    <Blob Hash="1f0b7f69541b0b1a88c5982491e3c8964a7b691f" Size="89556902" PackHash="d3234cd69048539f786386a6eea28d392be33e8c" PackOffset="8" />
     <Blob Hash="1f0ce4bf2e90b079ef3af1aeb7983fb93e10c03c" Size="33718" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="2048581" />
     <Blob Hash="1f0d214780ed494525a17d25cae4ebc62c320716" Size="289" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="701415" />
     <Blob Hash="1f1187c728962a82edca13b4f3269f7f26e95f3c" Size="21374" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="2003836" />
     <Blob Hash="1f12dc864e27f033a9ba365132cd4f43fee85ef4" Size="426343" PackHash="c9dcd3efa15d86693a0fbc9073cbb3b57a6b7143" PackOffset="939272" />
     <Blob Hash="1f13922ba59e60594776905d29181fc20f61c11f" Size="384" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1012870" />
-    <Blob Hash="1f14068a5f95cc0b20a5ada71ea5574078e9ce75" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551586" />
+    <Blob Hash="1f14068a5f95cc0b20a5ada71ea5574078e9ce75" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670818" />
     <Blob Hash="1f155d5ba0d8e8a85399342c06e6e73ac8421f6d" Size="3188" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1474696" />
-    <Blob Hash="1f1761bcaace5755a54469253d31123fa6983ecc" Size="73954616" PackHash="2328782f33107e77f35f405881655369a9634520" PackOffset="8" />
     <Blob Hash="1f18502a0e6a033877eb4a4087864ee264b21e2d" Size="470" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="285095" />
-    <Blob Hash="1f18c47a8ce8e7770b1771d4a142d8b49e9b725e" Size="1380352" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="8" />
-    <Blob Hash="1f1c7dd0329e26a32f9e92497b6af342b2bfcec9" Size="4157704" PackHash="8d9ba5e7bb4e9d3e863b91d9bb8ba39bd348f28e" PackOffset="8" />
+    <Blob Hash="1f18c47a8ce8e7770b1771d4a142d8b49e9b725e" Size="1380352" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="8" />
     <Blob Hash="1f1d13bce3dbc29d8f92a1fec0d708fb6df4a00d" Size="706" PackHash="3916bee22b29bf0f3646551966da018814907e1f" PackOffset="2096222" />
     <Blob Hash="1f1fa69b168925ba18355b090d3586cf8d12db59" Size="196798" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="371211" />
     <Blob Hash="1f23c81d7f179cc2365003417ad3f3414d49678c" Size="2959" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1614578" />
     <Blob Hash="1f244d9afa39bbec1ed9a48e4e785326dbe5f620" Size="2685465" PackHash="be6c1ac56f7b742b9f733b29f46549c5b46f7644" PackOffset="8" />
     <Blob Hash="1f282aaea2a910b57c91482395aeee69724aa232" Size="5566" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2068170" />
+    <Blob Hash="1f2979436c815398049051b6c74edd624c79419d" Size="2410" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2088932" />
     <Blob Hash="1f29e2718bb4bf9f2babb49607429ef2425686ac" Size="54807" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1739546" />
     <Blob Hash="1f2a15e921d2d380242ba93562c3919f4e00d368" Size="42127" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1013338" />
     <Blob Hash="1f2a97f111ce6fbe953527854e9105c99a2e60d5" Size="10414" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1530898" />
@@ -42470,13 +42370,12 @@
     <Blob Hash="1f8e466574c55f25f3556e6b8fd4c3f99f5bab01" Size="5302" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1466138" />
     <Blob Hash="1f915dcf7b822ec610c6096270c21c1df58c5143" Size="3450" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="906806" />
     <Blob Hash="1f95af0aff64f36ea29dfc427c4f8e7c678bbae3" Size="82005" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="8" />
-    <Blob Hash="1f9695d36394f49044278bde57584e83dc272c3d" Size="3725" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2084318" />
+    <Blob Hash="1f9695d36394f49044278bde57584e83dc272c3d" Size="3725" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2077364" />
     <Blob Hash="1f96d6f4add50c83aa2cedc0ec4ee4435083e6a3" Size="37029739" PackHash="3edeaad6b42fdaf605ce122a906ed25425af2090" PackOffset="8" />
     <Blob Hash="1f973fb9021dbc937fd350daf6570105a5028363" Size="943" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="648108" />
     <Blob Hash="1f9963c314e66105125ad258c77df9132e101a3f" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="672264" />
     <Blob Hash="1f9a3d56b62efb110da2b3e63bacff389cbbbac2" Size="216" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2093348" />
     <Blob Hash="1f9c9ac578ac1f7f5a66d5da12cee3ece24513cf" Size="38761" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2023231" />
-    <Blob Hash="1f9cd7f2518c3e1ca3da1a9cf11bf46f7c2cc67c" Size="2440" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="2093752" />
     <Blob Hash="1f9cde51ad38d4b309bc4b40e22932071e08c058" Size="6088404" PackHash="bd8855dcb70378eaeb4b21b70ab69e0686dc2796" PackOffset="8" />
     <Blob Hash="1f9f6dd436f285ece5af89ef8f45df87de8be3de" Size="16102" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="2073324" />
     <Blob Hash="1fa232ff6e9f514e2f58b9718e15f65a125e3a32" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2097113" />
@@ -42497,11 +42396,11 @@
     <Blob Hash="1fc1c123ba28ff3861f366c47e297331c3dbae2e" Size="2802" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1978194" />
     <Blob Hash="1fc214a11aea4a0dea645e5916d352b39941bb7a" Size="8756" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1372192" />
     <Blob Hash="1fc849a6856d71a1ac2663a6fa588b6a5941b6a6" Size="157054" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="487719" />
+    <Blob Hash="1fcbea8c259114e52b1ee1616ff30f639ca66f11" Size="1524394" PackHash="42988cf68b3eebfaaaa4411480d670f1347021fb" PackOffset="8" />
     <Blob Hash="1fcda15046c1422f742a4911638332e0c40bcded" Size="175" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="378513" />
-    <Blob Hash="1fd1919ff15d77a1dc51e1b5b2aa376d3adbc4d5" Size="113320" PackHash="76ceae49acaae4eaab40e99ad6e585de490ee865" PackOffset="1870236" />
     <Blob Hash="1fd1e1110c230c075e4841d2390f85c0faa8059c" Size="90882" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="8" />
     <Blob Hash="1fd3b08f7eb3de554a616b2f6c2ac78faa6bf06f" Size="7460" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1098076" />
-    <Blob Hash="1fd53f88db6989e05bd3c438724ec1931f997ff3" Size="7087" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1689843" />
+    <Blob Hash="1fd53f88db6989e05bd3c438724ec1931f997ff3" Size="7087" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1901562" />
     <Blob Hash="1fd5ff6136fba36e9ee22598ecd250af3180ee53" Size="75264" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1618411" />
     <Blob Hash="1fd94dbbddbdf6017ab699c79f58f067718ddae8" Size="752" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1963724" />
     <Blob Hash="1fda58bd2885c4080746203f4bf8478e8ee6d795" Size="1149" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2077299" />
@@ -42515,6 +42414,7 @@
     <Blob Hash="1fe68261ee74ba635cb69387712247d93b5734e3" Size="322288" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="8" />
     <Blob Hash="1fefb331d3865c4867d72d3a44f01f9babe16e00" Size="163366" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="941532" />
     <Blob Hash="1ff46e27ceb85b55f1680bf4735b55c940110ec2" Size="284" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="256485" />
+    <Blob Hash="1ff67013dcab0c05688b66263edf518109d56838" Size="1736080" PackHash="0c6976e514586ffb89833a5350ff91c4ff47c343" PackOffset="8" />
     <Blob Hash="1ff87ecf0a5acce022a447e5302cbe373c7c8568" Size="12128" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1065368" />
     <Blob Hash="1ff954b9201a4dfc7689d3709e20dbbcd71d58f9" Size="7359" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1209511" />
     <Blob Hash="200151b44cf9232205f20779e90160ff302977b5" Size="141344" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="280587" />
@@ -42524,7 +42424,8 @@
     <Blob Hash="200796bae83032c0f88942892666bfdbd136747b" Size="5020" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1501555" />
     <Blob Hash="200ba475746559cd154d44dd2f19977d90c83382" Size="770510" PackHash="c8fe39e90583da82b2773c6df823f7c535ff9097" PackOffset="249566" />
     <Blob Hash="200eeaccbbfa55f27ae6c780da58588ce720944a" Size="64324" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="741547" />
-    <Blob Hash="20113056b8ddc880f7ddf9d1e1a4ea60f0d82679" Size="269" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1295609" />
+    <Blob Hash="2010de50eac357ef34cd49f3a8523c7a4c962abe" Size="2774528" PackHash="63e4984c81c2177180c5a82af5261f058e893413" PackOffset="8" />
+    <Blob Hash="20113056b8ddc880f7ddf9d1e1a4ea60f0d82679" Size="269" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1744511" />
     <Blob Hash="2015dbca927b71eafafe7978bd1931d0f40b4093" Size="244689" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="244449" />
     <Blob Hash="20180de5c13232f932042efed7911e68fc93b9df" Size="704" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1767908" />
     <Blob Hash="2019d077e8d7ae4ad53439564f362574c83c0d82" Size="38421" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="942766" />
@@ -42533,7 +42434,7 @@
     <Blob Hash="201fd6f9d95d56b386cadd1f0d8e33aa2c4cd367" Size="172" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1573026" />
     <Blob Hash="202685c4d6b83d586849f03b0ab102635e4f4ecf" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2076541" />
     <Blob Hash="20268cf2859b7a6a5ba614f83845dc375184036e" Size="19638" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1608712" />
-    <Blob Hash="202a9035df3094d618b16c87ee9eefedc76d0c8d" Size="5641" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1179386" />
+    <Blob Hash="202a9035df3094d618b16c87ee9eefedc76d0c8d" Size="5641" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1944370" />
     <Blob Hash="203030c14f09c2e9b9a2cdf71e03a533671bee2d" Size="700" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2080296" />
     <Blob Hash="20377c45b83f08a86978051d877efbf0d0fead20" Size="60897" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="1028660" />
     <Blob Hash="20397eac6d1a15fdc2f04d0c7e5afefe32bdfbec" Size="5048" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1994669" />
@@ -42543,8 +42444,8 @@
     <Blob Hash="203b4dcb138af533efebede84aba5b55e5ac3af3" Size="193067" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="615512" />
     <Blob Hash="203b784ef428056c7b33986bed227095f02c403d" Size="8304" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1945988" />
     <Blob Hash="203bf5564d2644e8782ce1467b0c71970f53b25e" Size="2312" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="16720" />
-    <Blob Hash="203ed8b5801ab612048dba23f41cfb87e477706b" Size="2670" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1028173" />
-    <Blob Hash="204209797c5b1b83605cfb20b6a88c445a06b5ef" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553174" />
+    <Blob Hash="203ed8b5801ab612048dba23f41cfb87e477706b" Size="2670" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2076149" />
+    <Blob Hash="204209797c5b1b83605cfb20b6a88c445a06b5ef" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672406" />
     <Blob Hash="20435e6be2dacd8e6c8d24cca194703b5694a9b3" Size="53559" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1621695" />
     <Blob Hash="204cc9c54f7db826d68d31478145cf626cda3dc8" Size="179799" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="1160945" />
     <Blob Hash="204e0c19bfca5323ac83a54886e85bb5e298c0b4" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1998251" />
@@ -42553,6 +42454,7 @@
     <Blob Hash="205edd09bd3d141cc9580f650109556cc28b22cb" Size="1966" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1615072" />
     <Blob Hash="2062415e33e11f36f0c9b111b5a4b802d960f26c" Size="6603341" PackHash="03eac14bed108c28a0a4450fa4f534d145c12179" PackOffset="8" />
     <Blob Hash="20642c0bdb45f546830f7b325422d3abc41be162" Size="183" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2096895" />
+    <Blob Hash="206570be2532f12ec38a279d1f7e77d8bb9b9659" Size="81770180" PackHash="0f943b6d08d84030764eb5569053c6be48373bbf" PackOffset="8" />
     <Blob Hash="2067bdc3f01cf00d94d393b88f2c356ce04e95b0" Size="2838" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1137382" />
     <Blob Hash="2070bdb21d3680f22e4ac0c614d25246b4094505" Size="37485" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="867234" />
     <Blob Hash="207632f77576330b13e50a38a648aa5935ff223e" Size="22890" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1426913" />
@@ -42577,19 +42479,19 @@
     <Blob Hash="2098d69c71ba2129fe1d31df5b817953869bb289" Size="2735616" PackHash="25fb1f0514b985b230ff8c6eb90676160ef77048" PackOffset="8" />
     <Blob Hash="209a488af9b7a2cc0b438e7c7fc9cf2a0b7b4904" Size="1165" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="991920" />
     <Blob Hash="20a53495ed4969cea8224b021d041c867892f447" Size="5943" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1791961" />
-    <Blob Hash="20a57c2cdd4da164a531425b8d78c6cf7f34ffa5" Size="3489130" PackHash="a953fbf4433c785f7cbef4d2a003b00e890b5573" PackOffset="8" />
     <Blob Hash="20a82fa0b10b8114c53275abc4123d21a5b816d8" Size="196293" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="8" />
     <Blob Hash="20a8c7f4f2ea7e169914b6067fda464aaf5c6520" Size="26996" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="509580" />
     <Blob Hash="20ad47ed52874202585c90fe362663f060e064d3" Size="206" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="627938" />
     <Blob Hash="20b7738a6f341ac864a19d6e8b8221b46f501f32" Size="44944" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="130744" />
-    <Blob Hash="20bad3a09d301fff980afb5b83b901761d587c2f" Size="118177" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1605640" />
+    <Blob Hash="20baabdf2a1655081e6e88c9d8711d8a3b005343" Size="47041616" PackHash="1fedda872795db8d7bb5a40c6f0bd43ba939edbd" PackOffset="8" />
+    <Blob Hash="20bad3a09d301fff980afb5b83b901761d587c2f" Size="118177" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1820806" />
     <Blob Hash="20bc7354fdd7bb4e4e79f52110f129584fc2edb4" Size="387020" PackHash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" PackOffset="1642673" />
     <Blob Hash="20bd3d6ee1778334acb472d41e330f0025509989" Size="344" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="607673" />
     <Blob Hash="20c0887e4c759d59544da8889bc8ed20fcaff10a" Size="329194" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="35859" />
     <Blob Hash="20c23927440b72e217509f346b49d858c6329210" Size="842" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="393277" />
+    <Blob Hash="20c4619eb66dc171754b270d8a32259d85e43cc7" Size="734860" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="8" />
     <Blob Hash="20c880fb1cd6c259a54b4959dbb83da9c9d7c7b8" Size="56768" PackHash="becf420f3d19078ede00fc28d42cd811e7d8bb60" PackOffset="1991768" />
     <Blob Hash="20ccd1c74b3e1c822dc55648c0c5498105598c79" Size="4581" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="2088941" />
-    <Blob Hash="20cdb429775d8d4c0760606c923bb237e595190e" Size="81523712" PackHash="30c121a8a201c1fb51737b1b088de3a5bd3c3fca" PackOffset="8" />
     <Blob Hash="20cde2d2bdebf1f5876687bc097bab42aed64eb5" Size="3057" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1800955" />
     <Blob Hash="20cf14987280af310b11c439940185ba343a02a4" Size="3367" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="193334" />
     <Blob Hash="20d21ceeb6ab03a1ef20aaced15858692659495c" Size="103" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="833399" />
@@ -42599,14 +42501,16 @@
     <Blob Hash="20d6ef566e5a5c4980741dba499eacc25685e883" Size="1343" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="865674" />
     <Blob Hash="20d7a03adc927d23e5e781b1db36b59dab293702" Size="226" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="59107" />
     <Blob Hash="20d8950cc639005bd0b7ed928b4be32635c38a22" Size="101328" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1311228" />
+    <Blob Hash="20d912b80b145dfe4b1bbd0bf07ab0c21f58f762" Size="101888" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="1916424" />
     <Blob Hash="20d9211a12c1aff75601bf37a84577b72fa5e3da" Size="27488" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="693656" />
     <Blob Hash="20dad02494cf98d41da1d3cd7464823ff99feb6d" Size="3367" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="735327" />
+    <Blob Hash="20dbe52af319c876cc7414c0e3fd84233afc7739" Size="2396" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="2093308" />
     <Blob Hash="20e0f5b7fa4836b9db9d1cf0a19db24c2834e266" Size="190123" PackHash="53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" PackOffset="940019" />
     <Blob Hash="20e1025b10288a9ec8722fb3fbd2a4375b589bc1" Size="5631" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="223840" />
     <Blob Hash="20e327751930475d64e18c1dee87bcb17586855f" Size="5068" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="831291" />
     <Blob Hash="20e5eb1cc533982bdb4305aa1d3404f8cb345853" Size="3713" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="920789" />
     <Blob Hash="20e6ab0f39ba247f64dc2b65f7a9cc24bcc3fd59" Size="50620" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1087950" />
-    <Blob Hash="20e81a906792cf2b7dffceee557463cefaab55f8" Size="14880" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2068306" />
+    <Blob Hash="20e81a906792cf2b7dffceee557463cefaab55f8" Size="14880" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2066594" />
     <Blob Hash="20ef73d54f8796e0d9bfd9efca6d3d30cf47d632" Size="3393" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="607993" />
     <Blob Hash="20f3066d9b3af8284e493c95c3b42b6b37ad8e2d" Size="3246" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="221482" />
     <Blob Hash="20f4a3f4db6b3422c04ebb6b21a568e4c173f9c1" Size="1116" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2045275" />
@@ -42627,25 +42531,27 @@
     <Blob Hash="212083d66d3aadb82a9756644935013c374e933c" Size="2941" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1947363" />
     <Blob Hash="2120fef85071b7cfc613bf322acea1290d2aebec" Size="208636" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="8" />
     <Blob Hash="21230ba34397dbf4f8ae07ad38b9e062ff893f3a" Size="283" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="446068" />
+    <Blob Hash="2128c32bc9da9db0814dc710e0c6b25edaa3331d" Size="278303" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1249763" />
     <Blob Hash="212be0fef7039c0cdb8af509927f4c03d8f72d22" Size="195" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="165659" />
     <Blob Hash="212ea482a37f1063ac3a70e716c39046e6810006" Size="7156" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1409615" />
     <Blob Hash="212ec12b7a319a0131afaaff3562875e07253111" Size="708826" PackHash="0b650b20c8c8aba9b4ffbfff4555352296b8026d" PackOffset="733224" />
     <Blob Hash="212f06da20af508e94c4ba6e63b92da07dbd126f" Size="204208" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="881452" />
-    <Blob Hash="21303ced9d4db6477c85115b7a0a1da8ce008049" Size="373" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2066472" />
+    <Blob Hash="21303ced9d4db6477c85115b7a0a1da8ce008049" Size="373" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2086240" />
     <Blob Hash="2137986338fb4bc0ca6d4a27b6f5a42f0184d9ab" Size="834499" PackHash="eae9d7f0c647ab3277c5345bdbb0b69c19d0c6bf" PackOffset="1097410" />
     <Blob Hash="2137cc3d9a800f764318f0b788be552319544ec6" Size="26913" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1004874" />
     <Blob Hash="2137d9f563dc573847c89a7fb5db1538ffd1cd00" Size="21762" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1455394" />
     <Blob Hash="213adab4e230c37738e74ada1b60a8a566ceb833" Size="2704" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1100728" />
     <Blob Hash="2142560a1723d6d1708de46de23aaafa0c3b712e" Size="3421" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="696619" />
     <Blob Hash="2144e61a8fef6ecc5e14bfd5e2979bc9ed9cfaa6" Size="18188" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1916606" />
+    <Blob Hash="214f46e69db767215bef01deb78679cbf1f4e69e" Size="21058" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="2070048" />
     <Blob Hash="21503def8773021f4132331c6173d7b52bf466d5" Size="14603" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1364456" />
     <Blob Hash="2152655f679cf605b4c741c58228197060fa6c91" Size="4620" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1761013" />
-    <Blob Hash="21584b704baf6538949bbee0a4aac6d6b47782a8" Size="5980" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2087675" />
+    <Blob Hash="21584b704baf6538949bbee0a4aac6d6b47782a8" Size="5980" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="2091106" />
     <Blob Hash="2160623947634257ac6c69692bba115eea5554b8" Size="1375661" PackHash="d575eedfe9e359ca88b4e1d9bb737ee7f1afcde4" PackOffset="8" />
     <Blob Hash="2165b1604e14934326673bd94995c9100bc7babc" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="606439" />
     <Blob Hash="2166a03e0ba4e56db8d58c68410c1283ea7cfc1a" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="840518" />
     <Blob Hash="216eae28ceb5dddce914e6c1892ab548da08758c" Size="538" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="242747" />
-    <Blob Hash="217240c6297366d98480871ccb154ff860825c17" Size="583280" PackHash="8ea495aa16f5c28059de7b17b493fc094f400049" PackOffset="1219080" />
+    <Blob Hash="217240c6297366d98480871ccb154ff860825c17" Size="583280" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="1379848" />
     <Blob Hash="217792a84c06b7a87b656927dfcd907a10c4203c" Size="14420" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="757772" />
     <Blob Hash="2177ee7f8072b2d054f31eccd251656d46840277" Size="29312" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="8" />
     <Blob Hash="21780eba3ff5256ec201bd34570c31c17bf8b146" Size="34257" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="284128" />
@@ -42653,7 +42559,7 @@
     <Blob Hash="217ea99364e5c01ce51b9d6e106a17a5c5d8a6fd" Size="108357" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="455063" />
     <Blob Hash="217fda0488d18d24d09e8df63c3c53360c1b261d" Size="1696467" PackHash="e85ad2ef6896adbbc28a46b023af6b64deb29b88" PackOffset="8" />
     <Blob Hash="2183060670c98ddfb2596ce5c9252d8792233e5a" Size="1912315" PackHash="7fabc2d6c64f187fabb70ba2d24fd36158d4dc24" PackOffset="168476" />
-    <Blob Hash="21840c1dcf7b82f97aa76c44025845347e5f9d26" Size="874" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2028693" />
+    <Blob Hash="21840c1dcf7b82f97aa76c44025845347e5f9d26" Size="874" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1918904" />
     <Blob Hash="21846d81777d0b94b562fca365ca49e3f1a3fb0b" Size="412" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1347828" />
     <Blob Hash="2187267d966ffd10f52b775b70248dcd8dae6649" Size="196" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2041290" />
     <Blob Hash="2189d5b303846e413a46a87284605573296678a4" Size="8962" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="55977" />
@@ -42664,16 +42570,16 @@
     <Blob Hash="219b3634223168b5f1809e99477dfe6fba200545" Size="4193" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1172812" />
     <Blob Hash="219c5f96321083eb825e4fdf0e650fa44422b1d6" Size="6170460" PackHash="570d8588964623061b63445e58b837354c6f701f" PackOffset="8" />
     <Blob Hash="219d0db65aae0ce9ee229e319af8c85af249c883" Size="222" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="2095881" />
-    <Blob Hash="219ebfb724e470e285a3f07d13de60d8e59085fc" Size="254" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1615104" />
+    <Blob Hash="219ebfb724e470e285a3f07d13de60d8e59085fc" Size="254" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1734336" />
     <Blob Hash="219ec98b8f82f1bc3a17e6e90358317d1d92deeb" Size="10104" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1335510" />
-    <Blob Hash="21a0193cc396a58addbc447b872f0e61c134b5eb" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548271" />
+    <Blob Hash="21a0193cc396a58addbc447b872f0e61c134b5eb" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667502" />
     <Blob Hash="21aa439ce9ebfcc671538e3584a400e25790e4af" Size="25768" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1317884" />
     <Blob Hash="21b04a6b379a2c5c913da403d138b7ef767b8056" Size="12313" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="963106" />
     <Blob Hash="21b09e2034c7e99a0995b48a6d08de1c212217e5" Size="6547" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="146801" />
     <Blob Hash="21b286e2be1d8295ad2b530c636fb7c1bafeadfa" Size="44" PackHash="6a3c422a237075366d803f78e1e9f44d6424c3f4" PackOffset="2097114" />
     <Blob Hash="21b3458d698290233162b3c85bbe2ef0ac5b5887" Size="248" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1705832" />
     <Blob Hash="21b954fd184929a1b1f8d4d33054885b4bbe2bac" Size="465938" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="470156" />
-    <Blob Hash="21bb729896b315937acd21aff85ba11ba02ab40a" Size="419549" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="1522184" />
+    <Blob Hash="21bb729896b315937acd21aff85ba11ba02ab40a" Size="419549" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="1215496" />
     <Blob Hash="21bcbe62526eda326a5a3b15824f98e02110f0c9" Size="2864" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1202172" />
     <Blob Hash="21bd9a51a0e5a5af6e12e685533f96b3d705df0c" Size="199680" PackHash="f984c4f393a376587f48a24076e62578e975f8ea" PackOffset="47112" />
     <Blob Hash="21c53b1ed52a9b79265c6e905726e92e6f48c69f" Size="5296" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="692244" />
@@ -42689,7 +42595,6 @@
     <Blob Hash="21e2905da43cfed820d0e7901a611161214b9790" Size="7535" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="445901" />
     <Blob Hash="21e47c462fa98fbced944d1bd1b3b854fa4c7f3a" Size="912" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="2090216" />
     <Blob Hash="21e58c2821207edd214663645a93c06c67e6c9b8" Size="5192988" PackHash="1de56cfe8e5653b9fc45db6c7bbda287dd73ac20" PackOffset="8" />
-    <Blob Hash="21e73884ff6927a315f17a3c9e8e5c88cea7cca8" Size="8092" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1512524" />
     <Blob Hash="21e7f2ecd1896ffdc1ee8049b852cd5773b294df" Size="1700" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="2089992" />
     <Blob Hash="21e81b8a5e72ed876020c90f8d544fb10e979be5" Size="630552" PackHash="d7a56916778ad1fa03472f47ec92e8a9eed66219" PackOffset="8" />
     <Blob Hash="21ea2664649b22f3d236fc4c9cb13abb466868b8" Size="5358" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="600049" />
@@ -42699,6 +42604,7 @@
     <Blob Hash="21f5d72bea6388add2e8f7cc5db72a890d798ef0" Size="761" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="123871" />
     <Blob Hash="21f5eb6d1b5f0d3c2658c0e74390d251fc3eb693" Size="140024" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="574619" />
     <Blob Hash="21f70cc1ab339dff3287606dca7e57da1e633ebf" Size="6048" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2005624" />
+    <Blob Hash="21f81ba337d0e38e979508ad11492e14e42df260" Size="4365700" PackHash="608cc586d18c1d6191c06a72aa214941a0e9310f" PackOffset="8" />
     <Blob Hash="21f870db0152cf0291e5387a3cc602eb256bc119" Size="613" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="514408" />
     <Blob Hash="21f89a7cfdcbdb4720fe506c29a409e9d3d53c13" Size="77902" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1361894" />
     <Blob Hash="21fc9c0d1b7f6cf4f5d25a622f2cc927da182283" Size="19237" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1660537" />
@@ -42713,13 +42619,14 @@
     <Blob Hash="22111310c612f16b2f47ddcfd6c08a84f794e08a" Size="411" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="96653" />
     <Blob Hash="2212dc90aa0c65f78258273a2f31f3c3ee779ae8" Size="415" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1346301" />
     <Blob Hash="2222e4ec4b5ca7ad97d21ba1c506cc39f32f009a" Size="3218" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="953498" />
+    <Blob Hash="2224ff3b4658124ee575013e58eb6c22539893e1" Size="7147190" PackHash="8f2dcd4464bb68ae4798466fc0a56174228ded74" PackOffset="8" />
     <Blob Hash="222546fe42edbce0ab70a338ebe54a15c15f112f" Size="3584" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1097616" />
     <Blob Hash="222c694b6f3acf788e33b2249ab49e4067a8b82f" Size="360" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1342672" />
     <Blob Hash="223075db875a670d597f47c3c003bbd60d45ef0d" Size="7290" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1504828" />
     <Blob Hash="22308ed7075f1ee20ac44e1545098500d57f2fb9" Size="11259" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1849463" />
     <Blob Hash="2231df5afaf53cfdd689b635791299d65c00b7b1" Size="3409" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="2090971" />
     <Blob Hash="223224c883db39d060181d0b5cf03f2e2ef2e878" Size="26816" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="844256" />
-    <Blob Hash="2234c614bac768d2838a7c8e269e28ad38686def" Size="2946" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="2094057" />
+    <Blob Hash="2234c614bac768d2838a7c8e269e28ad38686def" Size="2946" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2093362" />
     <Blob Hash="22356ea10286444e893e3c969b7a99d4684f5f8b" Size="5314" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="262972" />
     <Blob Hash="223747a8f6d93fbbe8c1988838e27cce16e5a462" Size="549702" PackHash="c840da0835818272e18eacdd15f50e802453c69c" PackOffset="796288" />
     <Blob Hash="2237a6d01ba427f35a41f47c1da9a9baefeab736" Size="146548" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1187336" />
@@ -42740,9 +42647,8 @@
     <Blob Hash="225594972df74fede4a2a032f0e55d55d57a291a" Size="1899" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1553731" />
     <Blob Hash="225b0f89a71b23a79ed026812be08b3c6526186b" Size="14272" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1436068" />
     <Blob Hash="22601ce629ef132a9b1b742fc725a21dbc88a4e7" Size="9359943" PackHash="16ff1b3c00e3fef8b809b49a5b63be510b23dc97" PackOffset="8" />
-    <Blob Hash="2262705677b969d38cd0ccde935e38ad956a536d" Size="10628" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2066872" />
+    <Blob Hash="2262705677b969d38cd0ccde935e38ad956a536d" Size="10628" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1930705" />
     <Blob Hash="226378505908645df4d77a2575419f72ca415ad0" Size="849" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2068537" />
-    <Blob Hash="2264067c49f1306e53b3509fef4d6b506efceca8" Size="7663704" PackHash="e98244029da7ed44473df1959f403919bfbd7a58" PackOffset="8" />
     <Blob Hash="22656470d55ff49d395faf912ced0b4329b8370e" Size="94208" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1585820" />
     <Blob Hash="2269089cd99bb6633b6e9202583ffedaa0889e4e" Size="266833" PackHash="73bae428e969b828d72a1c4b71208bd855b67233" PackOffset="8" />
     <Blob Hash="226a1847b54afc23bbcd54b16135863d36eba35c" Size="1028976" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="8" />
@@ -42757,18 +42663,18 @@
     <Blob Hash="2282abb798de963c1800a4f7292989c45c01eb47" Size="2054" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1173115" />
     <Blob Hash="2284271b98e96d18d69b6ca22f892ff44cd9f27a" Size="2944" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="803140" />
     <Blob Hash="2284c2237b0fef47fd798feada98c159f2038df7" Size="47802" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="884320" />
-    <Blob Hash="2285a908294d85bb6fe65497f4cb7b8f9e9b4e03" Size="1146" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1294463" />
+    <Blob Hash="2285a908294d85bb6fe65497f4cb7b8f9e9b4e03" Size="1146" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1743365" />
     <Blob Hash="2287d3fe66a92551820b3eb158e87b0ecafd3cf1" Size="145" PackHash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" PackOffset="2096929" />
     <Blob Hash="228b977af78efa3383a08d02512c5eaa98d43d52" Size="184" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2037667" />
     <Blob Hash="228eb28e629a01ec2832c47d562a17278193bca2" Size="182030" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="8" />
     <Blob Hash="2292e526a115d8be309688f1ff7f010d9cc8da1a" Size="18055" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1919752" />
-    <Blob Hash="2295521d61723075927002347dd0b591766fdfa0" Size="57" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2097067" />
+    <Blob Hash="2295521d61723075927002347dd0b591766fdfa0" Size="57" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2097029" />
     <Blob Hash="22958800d211a12733debf7bcb622fb2ee88175d" Size="297" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1042626" />
     <Blob Hash="229625a2b0e8d53de8065549bbf0f2c6a152544e" Size="349" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="175435" />
     <Blob Hash="2296a65178ef1c0151b4307e23142d4aaf9e21bc" Size="128578" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1420030" />
     <Blob Hash="22970d15c710368682b4b2803047642f962d7f39" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="997896" />
     <Blob Hash="22975c64b8acf3ca1f6bda2e35c8be60fc661f38" Size="4892128" PackHash="9f53e4f1699e9eae5cf10479cd054c92a805af34" PackOffset="8" />
-    <Blob Hash="229eedf6a3cb48805ba105c229f8e69f78bca287" Size="1940" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2090907" />
+    <Blob Hash="229eedf6a3cb48805ba105c229f8e69f78bca287" Size="1940" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2094690" />
     <Blob Hash="229feb22de65959dffffa567c303afeea8325837" Size="11188" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="1679622" />
     <Blob Hash="22a0232f571d47deec93c9301de24e5ba7aeee06" Size="4134" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="773748" />
     <Blob Hash="22a067dc8a8b93473143c5f40546a7773cfbe015" Size="2817" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="100820" />
@@ -42800,16 +42706,15 @@
     <Blob Hash="22e3a71d2ef80392d1fc4f862950955fe0740364" Size="136496" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1648172" />
     <Blob Hash="22e78b57a56b35e2a43c5db6136f5f871d27f52f" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1655715" />
     <Blob Hash="22e9566352e77ab15a917b45a86c0dc548431692" Size="73408" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1753640" />
-    <Blob Hash="22e9b6fa28495d7f350844e4bfb3bca6f05e083a" Size="1416700" PackHash="a1056077d574e9ce203221947d190336d2e27c39" PackOffset="8" />
     <Blob Hash="22eaf2f3a9628cd696735e8088ddfe49130811d9" Size="2500" PackHash="cad6744ce15f118a59a2092dcd6d52e7a0f0fbe0" PackOffset="2094324" />
     <Blob Hash="22eddd73254dd0231760201dff308f0002d359a2" Size="12255" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="742003" />
     <Blob Hash="22eec2a6a4e39b5ef9fb0a0f8be6669c8a1a202b" Size="2912" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="143632" />
     <Blob Hash="22f1ac06b9a097fd19ab8232de67a8be33bb138d" Size="59" PackHash="e235435af47d241bf8a32655040bb6bcca173961" PackOffset="2097041" />
-    <Blob Hash="22f4029b1fd3fc433348882fafed6b8e977b1fd8" Size="9360" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="2086558" />
+    <Blob Hash="22f4029b1fd3fc433348882fafed6b8e977b1fd8" Size="9360" PackHash="158cdadc204fb774e3ce74edc80832a66cd38867" PackOffset="2084724" />
     <Blob Hash="22f77d119c70caebf14f57442d1eb63918b51a48" Size="6056" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1608668" />
     <Blob Hash="22fd68c8a94e4cdd7623b3856a960857de263ed4" Size="55330" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="734078" />
     <Blob Hash="22ff1bd1f0560f4078f894750e824200d0374f09" Size="2344" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1242076" />
-    <Blob Hash="23026596dbc70ebec69050597e1167d56adc88ff" Size="1982" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1041055" />
+    <Blob Hash="23026596dbc70ebec69050597e1167d56adc88ff" Size="1982" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2089031" />
     <Blob Hash="2304bbbd76f16d98dc76a220fd87826b156784ab" Size="217469" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1561989" />
     <Blob Hash="23051cbfe35c9a80f038fbd7796e6b0760256828" Size="3425" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="647297" />
     <Blob Hash="23053d23802f6ac28c16d5be42841730b69f0511" Size="5986" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="278428" />
@@ -42817,17 +42722,17 @@
     <Blob Hash="230bfb4f4986861b2a69547d88aa28aab9ca0aef" Size="2200" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="857411" />
     <Blob Hash="230ca4562ddef802836a315b278d85e5de2957ca" Size="674" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2032312" />
     <Blob Hash="230e53b5d988b669108955c182b36aad02f6e6fd" Size="5220" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="227749" />
-    <Blob Hash="230edfea79d58f37b763fb75b42571b9ae76d292" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552922" />
+    <Blob Hash="230edfea79d58f37b763fb75b42571b9ae76d292" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672154" />
     <Blob Hash="231011167a782f5a784f8dccf0af211b860cdd9b" Size="8425016" PackHash="9dbfef75d408cdb654ade3c7cdcc61f90475bba4" PackOffset="8" />
     <Blob Hash="231557d821a3e77e35a98e12f1664ac5b8b32bf2" Size="848" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1841528" />
     <Blob Hash="231935da4203f641ad8c0c16b64c5c2ef7d3a342" Size="98897" PackHash="966e9526128705bd78c6bf131dc22fa29f0cd007" PackOffset="1988896" />
-    <Blob Hash="231a017387e840465451258c56ebafcb65e55ac2" Size="47208698" PackHash="997a50d30ef033feeb0d363c8c8509158ebd1392" PackOffset="8" />
     <Blob Hash="231c526a160e0974ddc9b7316207ed34c7814acb" Size="6736" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="742091" />
-    <Blob Hash="231e21ba05326cc28b26037da018251302ac1268" Size="429" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1753515" />
+    <Blob Hash="231e21ba05326cc28b26037da018251302ac1268" Size="429" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1872747" />
     <Blob Hash="232108449b1c3d78e329cf4c384c81670c54ec0d" Size="13425" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="434018" />
     <Blob Hash="2325701ef942f77951b6eb3f3129b9210d89306c" Size="17079" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1786150" />
     <Blob Hash="232779488f2712343dac7f2e1554c29a27c01b88" Size="12632" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="755768" />
     <Blob Hash="23280fa9fac7b20e931c17a995a63e07399b8ff5" Size="2453713" PackHash="0640edac4b2d3d5a7d92a6a57d24b14fef282603" PackOffset="8" />
+    <Blob Hash="232cb5685d097296a027071ccc4988a0b5be730b" Size="2450" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="2094412" />
     <Blob Hash="232e75062a882ce7db47bc97a080460faadb87f3" Size="731" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1308240" />
     <Blob Hash="233143b80feffd1b1b41d7ec8bc00a9e3950b3f5" Size="3942721" PackHash="febd332f49f9423f039b17714b62dba75575a451" PackOffset="8" />
     <Blob Hash="23383303d6cb8ceec7502c0ec4f9a45efbab9546" Size="11672" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1588720" />
@@ -42838,16 +42743,16 @@
     <Blob Hash="2341e4c49e882b7ee9ff241ce165b1f296ca4b35" Size="3670" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="472319" />
     <Blob Hash="2344450fe3f1da7dd8f9384ab8c451ef2761659c" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097060" />
     <Blob Hash="234462daa906c8596196b3767d9d497ce64ec413" Size="60162" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="55042" />
-    <Blob Hash="2346fef90602eb0e1735d5cb3fed6bf0c92c566e" Size="6989" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="2085885" />
+    <Blob Hash="2346fef90602eb0e1735d5cb3fed6bf0c92c566e" Size="6989" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2079702" />
     <Blob Hash="234826f9281f557456f891e2153b0157f03e7293" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="200954" />
     <Blob Hash="234a631252ff535991cb86471a6fda66ea2f9d94" Size="119464" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1813264" />
     <Blob Hash="2351496283bcfc8e8815bad3e474502cf24f6f9c" Size="96" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="517840" />
     <Blob Hash="23552db7453ca2eb1313ee6d351053fd3657d42e" Size="5288" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="2064067" />
-    <Blob Hash="2358f6404556fdd7161b4e027ef2f789e5b3c9fd" Size="641" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1601846" />
-    <Blob Hash="235b37a370ba54e98163e7c9d41062363f869461" Size="758" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1417340" />
+    <Blob Hash="2358f6404556fdd7161b4e027ef2f789e5b3c9fd" Size="641" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1721078" />
+    <Blob Hash="235b37a370ba54e98163e7c9d41062363f869461" Size="758" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1866393" />
+    <Blob Hash="235b9984b688f227e79f95ac7a66d08016dad126" Size="2735616" PackHash="dcf05455c4ef932f6c2b56c69a3b86c93eed1ffd" PackOffset="8" />
     <Blob Hash="235e0867dc4dcc05c9c80cca909b2c7c162eccb2" Size="3193" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="477259" />
-    <Blob Hash="235e5ce27b0736a1cd00d3709a334e49c874ca58" Size="1123" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2044946" />
-    <Blob Hash="23606a961858209a42280a946b33bc20a01005af" Size="14198" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="2073584" />
+    <Blob Hash="235e5ce27b0736a1cd00d3709a334e49c874ca58" Size="1123" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1936077" />
     <Blob Hash="236619cf1c7e350320430071390376bc31260338" Size="1726" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="2095178" />
     <Blob Hash="2367a6b58b8d7dccbdf5b5a125207ba10ff79f5e" Size="3008" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="333714" />
     <Blob Hash="236ca04b242d3203b0f77b9df7ffea3f2aa76523" Size="2212" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="252875" />
@@ -42855,7 +42760,6 @@
     <Blob Hash="23704657c07bd86a3953ebe78cbfb1af411fe427" Size="739" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="2094995" />
     <Blob Hash="23720a9ee5d58a5ff5ff38f9e83596d29cbf09cf" Size="5916" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="453580" />
     <Blob Hash="237324e2e0673a6d9638908384ca8594aae73033" Size="3361" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2065890" />
-    <Blob Hash="23742c576f6c13b58ae81be87b8fd4575337b745" Size="90380640" PackHash="4fcf39094c278491c0faab57d6ab591d2955fd31" PackOffset="8" />
     <Blob Hash="237600f1957d260c497f6201a751ffdfd57f0849" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2084820" />
     <Blob Hash="2376e4656eaa234d983b7ff2a0f738cc2fa5b0f0" Size="3333" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="919482" />
     <Blob Hash="237982278946ce43efee3ac6bf23af4609f3d5e3" Size="1923" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1578062" />
@@ -42863,7 +42767,7 @@
     <Blob Hash="237c0af775ff8ab1322cb0e9ea68ded6b261df8f" Size="89527" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="98520" />
     <Blob Hash="237d5ddf7969a422991f17021244d13a2bb0de92" Size="1116" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2041927" />
     <Blob Hash="23815c0eda96ea14dd5f61341b3ce027cb7af874" Size="3485" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="2062849" />
-    <Blob Hash="2382332d4edacb828b7c7da009c929e3e8c423b9" Size="1254" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2074891" />
+    <Blob Hash="2382332d4edacb828b7c7da009c929e3e8c423b9" Size="1254" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2094659" />
     <Blob Hash="238250c607cf60105f78e8b8f85179c9627bdfc3" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2080152" />
     <Blob Hash="238473ef44a84f78c55aef9e86b53c4844e1ade1" Size="9215" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="138287" />
     <Blob Hash="238478b0ac1e641bdccc3137f55a6d0c389c7ffc" Size="675" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="238066" />
@@ -42877,11 +42781,11 @@
     <Blob Hash="2399477b9cbecb44ba1cb5ebbffd56421487e81d" Size="101240" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1144883" />
     <Blob Hash="239ae5043b30181b2f4af3c95ac38c8231e98ae3" Size="116118" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="1615571" />
     <Blob Hash="239b6b709db33e6ef78ae028906fc7c97dda314d" Size="4640" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="730595" />
-    <Blob Hash="239b7fca281f2492b29e68bda15c231a38c1e179" Size="1038" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1284093" />
+    <Blob Hash="239b7fca281f2492b29e68bda15c231a38c1e179" Size="1038" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1732995" />
     <Blob Hash="239d73e6549d96c7d89b4127582fc3be395d4b26" Size="6728" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1615322" />
     <Blob Hash="23a8654db02a38cd97eee2fb73d8246530c10d30" Size="3396" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1432392" />
     <Blob Hash="23ae8cc2845e6554c01201b796432076e036d71a" Size="6755" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1803809" />
-    <Blob Hash="23aee70b80367adac05eb5a0802d0f81f877a7fa" Size="11897" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1819780" />
+    <Blob Hash="23aee70b80367adac05eb5a0802d0f81f877a7fa" Size="11897" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2003552" />
     <Blob Hash="23afdb40c05344a09854c364063664a3e4725ecc" Size="77424" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="896795" />
     <Blob Hash="23b00f4a982f1f2a41fc1f3cf5a41b667b368fae" Size="2957" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="107374" />
     <Blob Hash="23b0acd77c344bd29b3f81d6d1823d564fa7a36d" Size="292628" PackHash="743194775f917f2ee758966c7b2e865b19c63c50" PackOffset="8" />
@@ -42895,20 +42799,19 @@
     <Blob Hash="23d4c5f2d694c63252bde88a58e83acc34bd5fd7" Size="3272" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="909569" />
     <Blob Hash="23d544c040fd6bbfd6757890648e89adb6bdf48b" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="509472" />
     <Blob Hash="23d554c9eb9d136a5ceefc72fcd132c658f87cb3" Size="2738" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="735704" />
-    <Blob Hash="23d90efa66ee453c5a31ab5b7772895025ba570a" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549527" />
+    <Blob Hash="23d90efa66ee453c5a31ab5b7772895025ba570a" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668805" />
     <Blob Hash="23daac644b378756b827df5022855b28579e2566" Size="172098" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1568201" />
     <Blob Hash="23dc802f6d9150b89d0163a0ed060ce1cb5ce446" Size="5361" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2069386" />
     <Blob Hash="23df9c64a6a5c47ff93c0936655d904a158d7bed" Size="148268" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="1307872" />
     <Blob Hash="23e42b7d2fc9a25f01f796134adea70db804ca77" Size="1352704" PackHash="b0ddc60100e1e18faab8ce443ddb5bae4e5c9851" PackOffset="8" />
     <Blob Hash="23e5338ccf23da7d715491afb2d6165f29dd8571" Size="13359" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2047596" />
-    <Blob Hash="23e646872d5457a61330c1f9324d0848ec7cd055" Size="2150" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1335457" />
     <Blob Hash="23e65dbbcbb52a1c0de277ba15fb8dd5fdaaa950" Size="79" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2086215" />
     <Blob Hash="23e6ad2e3a23a417777668827a63e54721b502e9" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2096968" />
     <Blob Hash="23e9467682e0c586c617da7db65524c60c351979" Size="4726" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="47003" />
     <Blob Hash="23e9b80c44cae6c3371d6f55603e53fa8886454d" Size="5519" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1938382" />
     <Blob Hash="23ea3f985dea69578f2c91d52a2f4938c5c5f315" Size="393216" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1227784" />
     <Blob Hash="23eb7583aba6e7fec2db40bad42a9b9f09a6b1ea" Size="3063" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="933763" />
-    <Blob Hash="23ec9c54a7b96235dbeceab51d982c6e7c083b1b" Size="1530704" PackHash="1bdfb2089d50fef664ddd40f88773779551a6963" PackOffset="8" />
+    <Blob Hash="23ec9c54a7b96235dbeceab51d982c6e7c083b1b" Size="1530704" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="8" />
     <Blob Hash="23ef3c6749349286b1dd6f2a56327eec529a993c" Size="994816" PackHash="39094453c710536eef32c9e4bc7ae6d6a32fcca6" PackOffset="826917" />
     <Blob Hash="23f1d8e08cbc967016fac8ee73f9f0b12514facb" Size="1933078" PackHash="5d524f45336386979cbd3fa1d7aa7207cd48444e" PackOffset="89370" />
     <Blob Hash="23fb16763a8f11ef48e805e4f453c2f812d48fc4" Size="1112" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2050847" />
@@ -42925,7 +42828,8 @@
     <Blob Hash="24052a5ea302265f82fd26e22b5f4ee9ed241e41" Size="4508" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1343584" />
     <Blob Hash="240baa8aea5a2022cb575f34b14a71790f6c7fed" Size="28412" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="58316" />
     <Blob Hash="240bedc24b8a4cd9a673167a1bbed07efe7a0154" Size="1814528" PackHash="c64ef0980920bd362bf26c9e31d253c145d848ab" PackOffset="8" />
-    <Blob Hash="240e6fcda7e9fd2c7f00d7de687bcdbe470bd25f" Size="153790" PackHash="3407b695bf7b722711de14f998e247a6aca6b747" PackOffset="1838388" />
+    <Blob Hash="240e6fcda7e9fd2c7f00d7de687bcdbe470bd25f" Size="153790" PackHash="0c6976e514586ffb89833a5350ff91c4ff47c343" PackOffset="1736088" />
+    <Blob Hash="240fdcdc81b7e781349ce4fe8ca8c7302471d6f6" Size="7013208" PackHash="96647cad6ccf49261e27bdb65e5af72dc6d6d04b" PackOffset="8" />
     <Blob Hash="24122f09032ee94b918f0f8e6f394f54eeca62b6" Size="340480" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1233928" />
     <Blob Hash="24125fe5b2e8d916cf1b3f6e830dcf9be3ba16c0" Size="508148" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="8" />
     <Blob Hash="2414b6be8d315a07b45b7a8aad89ad125e707936" Size="38363" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="910943" />
@@ -42942,13 +42846,14 @@
     <Blob Hash="2428f1b4ef7e09494fb636d8181dcfbe6840ddac" Size="2069" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1132173" />
     <Blob Hash="2429ab3f936c26ddb93d67b9b189e6355a5f2bfb" Size="31242" PackHash="c38a58ebaed4f4113a72a83d4c9eed961e2b9d98" PackOffset="1903686" />
     <Blob Hash="242a55c2362980976589c9035e9e5183f88e89d0" Size="1284472" PackHash="a932e5be1e422bafdc2ecf4d621038afd8b29904" PackOffset="8" />
-    <Blob Hash="2434a9af1bdd99bc48fc47f9df3ce703ae01f709" Size="792" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1439311" />
+    <Blob Hash="2434a9af1bdd99bc48fc47f9df3ce703ae01f709" Size="792" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1888364" />
     <Blob Hash="24350733c1e7e90f451464c68c674333faaae426" Size="37607" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1134464" />
     <Blob Hash="2435284b49a835a766f98989160fb7d40f645983" Size="8428" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1578609" />
     <Blob Hash="24356e7a984aa9b8ea2b41046cd12663b38d7bbf" Size="5140" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1851862" />
+    <Blob Hash="2437201104a3ab3dd0425facef7a07d6a81ad947" Size="1621680" PackHash="f11b05acf069a23b5a58dd054c9e055241e06bcd" PackOffset="8" />
+    <Blob Hash="2439549cb5afa3bf7c36ae88988ebe6f4bc39123" Size="3199210" PackHash="365f1de3d82c954c2d632438b23b30f6678096f6" PackOffset="8" />
     <Blob Hash="243b82f17e67e7b266f977af7270a594c0f58eff" Size="154" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="447799" />
     <Blob Hash="244240a51bc149b96568a13df6253c7afcc7edf6" Size="3124" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="930462" />
-    <Blob Hash="24425968cddaf40fc7ad4970d79ce71b90dedbe2" Size="2847376" PackHash="27b4f4e7de9fda2b204ae93882859d3dffe5ca0a" PackOffset="8" />
     <Blob Hash="2446a15128b224983bcb1603db68eb2986cb02d4" Size="12372" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1505396" />
     <Blob Hash="24472493e980336f60d765381faf55e2e199dfba" Size="154" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="559622" />
     <Blob Hash="2448212edeb7264e970b66646bbd145c1785ff37" Size="1116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1385500" />
@@ -42969,15 +42874,16 @@
     <Blob Hash="24744f7e61fa754511b82bdf222c7d4bf1bf9ecd" Size="3820" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="358562" />
     <Blob Hash="2475e2ee604413672e07d122a4038fbee032b963" Size="3007" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="622733" />
     <Blob Hash="247783b0c04e339fb3026f9b24ade33e428faa24" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1042722" />
-    <Blob Hash="2479d96380835000d3633a63c3378befed03e3e6" Size="548596" PackHash="b88c02646bff51270468e11717b11aca34a7c3df" PackOffset="1394792" />
+    <Blob Hash="2479d96380835000d3633a63c3378befed03e3e6" Size="548596" PackHash="f56183ef9a51b04c0311b5a5de384e805b4e41fb" PackOffset="1436736" />
     <Blob Hash="247a49928fe9946c24434e0a73bc2cfe46a9b8a5" Size="20804" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="2047078" />
     <Blob Hash="247cf97626246c8b40569660958367adb9d7f8d0" Size="6541" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1857151" />
+    <Blob Hash="247e42f43e525214750bd55011a28c219118ee93" Size="12364" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1718000" />
     <Blob Hash="247f80e1c115e03c1360265e24d724c7b5eb8a74" Size="92" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="580336" />
     <Blob Hash="2480c42eeba718c2902107a65eea981242599a3d" Size="2893" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="115004" />
     <Blob Hash="2481115cbc578ab8681c91633687b1cba189be14" Size="3335" PackHash="3eeaef9b20127af038eac7ad0b2944759c734d1d" PackOffset="8" />
     <Blob Hash="24834235bea9fcc8abb7b5a6ffcad514a79e350c" Size="73248" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1427208" />
     <Blob Hash="248384cb9a59f0569f053115555e89068c9f7e93" Size="1841" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2042565" />
-    <Blob Hash="24844594cc97f99e6dca3a457aa9be90be2f1537" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551222" />
+    <Blob Hash="24844594cc97f99e6dca3a457aa9be90be2f1537" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670454" />
     <Blob Hash="248bcf4cac924c08d8bb6d74a94c93fc1dd0ea33" Size="162430" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1460824" />
     <Blob Hash="248cd74447dab99cd45deab332b9cfa6051a1b72" Size="40" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="2097100" />
     <Blob Hash="248f0a60bf94523662bb81471d73ede9f714ecf6" Size="7231" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1443880" />
@@ -42985,21 +42891,19 @@
     <Blob Hash="24922f434800fb330f382b118c3c755b6bd30676" Size="15806" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2052364" />
     <Blob Hash="2493cc96f9830b332e4f54defc4bf278e7c85529" Size="580" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="632900" />
     <Blob Hash="2494d96d59e53428872280e208fb04d79a16feab" Size="4218" PackHash="7a2bf1344816a13e39f9fe74bb22c30a74396fc5" PackOffset="8" />
-    <Blob Hash="24965f70664b11ef73d5ac2bbc3aa751b5228667" Size="234840" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="1825288" />
+    <Blob Hash="24965f70664b11ef73d5ac2bbc3aa751b5228667" Size="234840" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="1485710" />
     <Blob Hash="24978f236c7cfd25e95c47bca418d92be8ac64f5" Size="11507" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1189894" />
     <Blob Hash="249af2f835ede4b34e0b972b490af748b8e3eb25" Size="834" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="903066" />
     <Blob Hash="249b0329964e35481e8e6217220f474e3076d35a" Size="10583" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2042269" />
     <Blob Hash="249cb0dd82269b57c150b09355943010e3fd093e" Size="506" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2095848" />
     <Blob Hash="249cf2526ca9cba3b644aff107a81c7364c51c82" Size="3012696" PackHash="d99d9ac57832a3ab169785439868ff7456fb2248" PackOffset="8" />
-    <Blob Hash="249d3a0447399ce7440488396276d75d00fc87c5" Size="68792" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="1989408" />
     <Blob Hash="249d6d530b101c14236e7ac56b487e26f28f5499" Size="7553391" PackHash="c54921d21c20e7c27fee9dadcf212291b32f32de" PackOffset="8" />
     <Blob Hash="249e80261c7c204690b4b9ad569e4771e30385dd" Size="738169" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="8" />
     <Blob Hash="24a307995572ed067240431e54382181c2d1c1fd" Size="2038" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="1994735" />
-    <Blob Hash="24a416a2b9357b1817bfdbe9706fcd42df8ca584" Size="56762" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="840394" />
+    <Blob Hash="24a416a2b9357b1817bfdbe9706fcd42df8ca584" Size="56762" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="1908284" />
     <Blob Hash="24a447d50b9d3ad7191815dde91a8b045d7a08b2" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1501192" />
     <Blob Hash="24a6c3d47d7fe8ced9adb47669929c587c2e352e" Size="6450" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="19764" />
     <Blob Hash="24b0ce6369ea28f33e5d6ed91f6739431f2664ad" Size="8477982" PackHash="4c6d83d8ae1f5c651086ace466fe1cf5a42097de" PackOffset="8" />
-    <Blob Hash="24b1e9866fe16055704f071d2a6255c3cad0973f" Size="13455880" PackHash="cc36213f286f005b6235b2278c33fa5b3826c930" PackOffset="8" />
     <Blob Hash="24b2eb56eeba2b0fd5bde46c5c8fa81cab062870" Size="113889" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1755258" />
     <Blob Hash="24b6c94f6b7fe83cc27e6350869aa2bc0e3d6ddf" Size="695" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2092620" />
     <Blob Hash="24be62d3e0a542737784bbe05218548991e0f22d" Size="55475" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="1880769" />
@@ -43014,6 +42918,7 @@
     <Blob Hash="24cd71d80a766fba712fb0b59eb64fb661016564" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="916862" />
     <Blob Hash="24ce79a2588b26c33d309e3d0846ebe9010c4f45" Size="266560" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="624516" />
     <Blob Hash="24cff28a2729c8101c87fc4dd3c70d9932695411" Size="47568" PackHash="e106ce3ce1a7bafe780e72f090f349e0d66c2db2" PackOffset="1970604" />
+    <Blob Hash="24d0a2cbe72cc1c61844d421ebd8ccca5bed7c4d" Size="6741002" PackHash="5aa9a89419ae366aaf86966d0fb121ed28534d1c" PackOffset="8" />
     <Blob Hash="24d887877db549ee4cd7ce6cb91148c56477af1e" Size="3292" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="487278" />
     <Blob Hash="24dcf4e939957f082159b4469e376f2a0a0e79b9" Size="6373" PackHash="de91426e5f3e3df5e3245d6aeb1634e9c47ced52" PackOffset="2088251" />
     <Blob Hash="24dfda128555ed5d460eb950f3685827eb343fe5" Size="212" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="2096914" />
@@ -43024,15 +42929,15 @@
     <Blob Hash="24ef324d7bab357779934422c3bcd332f7983187" Size="1728" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1844660" />
     <Blob Hash="24fa7d023114088083dbc9b51d6d8147a9f5f206" Size="4103" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="412806" />
     <Blob Hash="24fab5f748999c4104701d18230f291aadfaccfa" Size="42294" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1821483" />
-    <Blob Hash="24fade4326b13f7a70046eb2281286ed7c90559c" Size="105498688" PackHash="a4f27c4aa7ff8a7698c42d7df2b7f626857d1bcf" PackOffset="8" />
-    <Blob Hash="24fb3d9342cb160c2499faa1033aea3b7378fe0c" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553020" />
+    <Blob Hash="24fb3d9342cb160c2499faa1033aea3b7378fe0c" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672252" />
     <Blob Hash="24fe9df18939def1c3b1288f8cc65e8e242b0cb5" Size="5652444" PackHash="af6641f5adef0fdeb5d23bc902a3113e64ad4dce" PackOffset="8" />
     <Blob Hash="24ffa9d794e312bca9611fe082cda7054e4fbc4b" Size="6112" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1267283" />
     <Blob Hash="2509b2cfc49ad9ac4493c1f870c4a28fb5961a70" Size="30028" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1198792" />
     <Blob Hash="250c18165b6feec587dd1481f8344a5c3c0dc0d1" Size="7656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="2007475" />
     <Blob Hash="250c1c624dd7132f7289f31202eba7028a69e092" Size="156" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2096332" />
     <Blob Hash="250c326d378a805ebc404f8e210cec00160139dd" Size="37888" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1053704" />
-    <Blob Hash="2510b78016132095b145e94f0b90f6cc07a1906f" Size="229" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2096576" />
+    <Blob Hash="2510b78016132095b145e94f0b90f6cc07a1906f" Size="229" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2096866" />
+    <Blob Hash="2513e13700ac14538dfb1571b9ccb1d850808136" Size="89400" PackHash="f11b05acf069a23b5a58dd054c9e055241e06bcd" PackOffset="1967332" />
     <Blob Hash="2515dc8195ea5995b3735667f1009e7653e96135" Size="2192" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1700944" />
     <Blob Hash="251d5b4edc04ca2d9e15d259f5cc7bf726d5cfdc" Size="24864026" PackHash="15e6fe90e6ae6df3926328f7bf7ba63205fe3fc1" PackOffset="8" />
     <Blob Hash="251e466c4f52270a9b0f8a3a84b3bb3b1aa8751e" Size="546" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1723992" />
@@ -43048,7 +42953,7 @@
     <Blob Hash="2532af7a64ef4b5154752f61290dcf9ebeea290f" Size="21184" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="424480" />
     <Blob Hash="253303928888df182cedc4a4f4cc61b59f254170" Size="1728" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="2080530" />
     <Blob Hash="25375a1b2f8a449fd97263a1b85d242ec9146101" Size="395574" PackHash="796f0c398bb010288b3688e6743420cfb681a4b8" PackOffset="1302513" />
-    <Blob Hash="253e140bc6a96d14e8026c88d3240261d870126b" Size="279" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1591783" />
+    <Blob Hash="253e140bc6a96d14e8026c88d3240261d870126b" Size="279" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1711015" />
     <Blob Hash="25421a7f1c475682f127c02a5b9c6169ed0dcbce" Size="180" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2078816" />
     <Blob Hash="254c81271aa2131bc21432f435d39628d2bb2fd1" Size="769" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="471346" />
     <Blob Hash="254de1ad4a69802ec5508a6b994e09f1a424a442" Size="74831" PackHash="e6d6170217e3ab596bcc10a49c297cbbac27c3e4" PackOffset="1880080" />
@@ -43062,14 +42967,14 @@
     <Blob Hash="256d153e45c4045125f476be54afdfb9e475a6bc" Size="32844" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="777812" />
     <Blob Hash="256d2c71b8aa4345d3a9bb5a87c805a7566bace8" Size="60" PackHash="4e6589080dee402938809771299985e1428734e4" PackOffset="2096978" />
     <Blob Hash="256da33a083931b8fb7228af492035a959014d02" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="672974" />
-    <Blob Hash="256ea59dc8e6db4e99ecb0d44a41fc15ca2b58af" Size="756" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1419634" />
+    <Blob Hash="256ea59dc8e6db4e99ecb0d44a41fc15ca2b58af" Size="756" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1868687" />
     <Blob Hash="257037c8ac9c069046e8660c05145203900922eb" Size="4451" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="832015" />
     <Blob Hash="257158c5026f714a89cc104842e5a5126a54ae87" Size="8987647" PackHash="7d4898488ea0b589fd1090d978c9ee7928a09626" PackOffset="8" />
-    <Blob Hash="2573baec77d842fc6bfde17977f1c92c98fea15a" Size="1126" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1301433" />
+    <Blob Hash="2573baec77d842fc6bfde17977f1c92c98fea15a" Size="1126" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1750335" />
     <Blob Hash="25744f301e0573c782c5a5619cd74ca0ccb49ba9" Size="2140" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1899381" />
     <Blob Hash="257759fea542e5f5f1fab8a164bf8483c83b4e5a" Size="3587" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1968658" />
     <Blob Hash="25782e3e24723b47e77a1225c5767a91dc5503eb" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="641474" />
-    <Blob Hash="257e186ab0659d01bfd11279c926996a8bcd7f39" Size="135870" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1615674" />
+    <Blob Hash="257e186ab0659d01bfd11279c926996a8bcd7f39" Size="135870" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1572461" />
     <Blob Hash="2583dd248ee4a8cd049d2c92ce380266776f5a7b" Size="460810" PackHash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" PackOffset="1192984" />
     <Blob Hash="2585b9cca30ff3c91069896df84e8823f15a6a96" Size="7714" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1317410" />
     <Blob Hash="258759dd6dcac31d1379f91f20f1b928c395573d" Size="240" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="678435" />
@@ -43079,10 +42984,10 @@
     <Blob Hash="258e3e1bd476058e770f05d79df0f5fb6708822e" Size="590" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2040324" />
     <Blob Hash="258e6625c772da4a738afc28731a9011c7427383" Size="18309672" PackHash="2cd227711e286f7384ce59e88078b54bdc79de3d" PackOffset="8" />
     <Blob Hash="25948f087b95a3456fa94780801a8fbaffd18970" Size="793" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="1024660" />
-    <Blob Hash="2597962f6d685d1025b4e8b783530f47b074f086" Size="47463" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="88295" />
     <Blob Hash="2597a6c4b3d8c910bde04d34f88cbdada3156e9e" Size="146523" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="1303316" />
     <Blob Hash="2597aa16b2de75ab0b38403ea38f49a142b81687" Size="4822" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1644607" />
     <Blob Hash="259c7c03c7c53085c8f57eded93faa9dbe21324f" Size="2769" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1871056" />
+    <Blob Hash="259cbbb1bd40851af440b3cc7f10822edb8de360" Size="47295006" PackHash="ed1f2952a6be399c0ed89aec8c4997a7ad369984" PackOffset="8" />
     <Blob Hash="259fb280b59b46a23d332f536e14023dba8d27c7" Size="4529" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1506575" />
     <Blob Hash="25a25dd6c7348e9942db24ce0078d4f605cb3cc7" Size="2132" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1554791" />
     <Blob Hash="25a303d7c477180c1861a87cb4773f8dc9c482ef" Size="104260" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="521422" />
@@ -43104,7 +43009,6 @@
     <Blob Hash="25cbbf8e77e4b9f2b396d18b7acba599033f455a" Size="178" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="1736231" />
     <Blob Hash="25cfac3dc1273e9e401afdcf677e341b2d2235be" Size="2851" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="999856" />
     <Blob Hash="25d02869623e94789495d5cdc3053629524929e4" Size="100461" PackHash="1be30bac2f567e402ae48b89e8355a4b4e609b8a" PackOffset="272778" />
-    <Blob Hash="25d1a9eef82ebb86dbca55df8165791eb6ee48ad" Size="6907856" PackHash="8643ce201c9432be306a13893bfa474c42681210" PackOffset="8" />
     <Blob Hash="25dac0f0082df1539fc992e51e2aba83fcd35b23" Size="337668" PackHash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" PackOffset="1563336" />
     <Blob Hash="25dbf951dbc49762290e84370e26969e902de8bf" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="726024" />
     <Blob Hash="25dcc8353291c268d650e53ce9b7acf811fc0633" Size="4272" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1011797" />
@@ -43116,7 +43020,7 @@
     <Blob Hash="25e18bead377851bbf8ab55a3aed67d8d38e248e" Size="4948" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1394803" />
     <Blob Hash="25e3b1c580bbe4e182e46bf84c74645dd85e787e" Size="11816584" PackHash="f1463549aa4f2556fe3f6cda7fdf02409c63f1d9" PackOffset="8" />
     <Blob Hash="25e55b2b46b647e19a6b9293216e4fe5d21dfb7c" Size="162677" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="1256211" />
-    <Blob Hash="25e7204ff5738b5fd57643c456188b3b5475adc4" Size="2445" PackHash="09358de240dc340ba067bd03e6077676ab6a6908" PackOffset="2094712" />
+    <Blob Hash="25e7204ff5738b5fd57643c456188b3b5475adc4" Size="2445" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="2094604" />
     <Blob Hash="25e82b1515ea2779561b8c3138814c59ce24c947" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2071684" />
     <Blob Hash="25e92621f76767d59dbe3d44624b147da81fd750" Size="304416" PackHash="bcfe437fdab5b703b8578a6d457f2908890a58ff" PackOffset="1180055" />
     <Blob Hash="25e95ea3b6a556c9ff9ae1717cd2799a2656c96c" Size="9223" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="243842" />
@@ -43156,21 +43060,23 @@
     <Blob Hash="264e29e7ddfc9ab9bc9f0663a9226f313898fc97" Size="56677" PackHash="3a67e1db726b175c76ac9b14ceffe3b434745c6c" PackOffset="108572" />
     <Blob Hash="264f1de90953c5f639dac898aac340886e546bfe" Size="3152" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="857453" />
     <Blob Hash="264f962b035e327bda7ba6fb8651154a2059bbe3" Size="33482" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1718170" />
+    <Blob Hash="26513f0840da686fbc5cc3566cac759156ee4231" Size="1219072" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="8" />
     <Blob Hash="265179388f89a4f36a0ec6f738ca1052ac2e1e66" Size="3611" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="254294" />
     <Blob Hash="2652ca1e2347c0ed698850c5a1a5a0ab61744a52" Size="151" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2038191" />
     <Blob Hash="26533295145c6bc53085847ccd2bfc0f9ba32750" Size="775895" PackHash="242303d3de81eced62c855f4d06c4f7abe1e4356" PackOffset="8" />
     <Blob Hash="2657dd9e1cec4e070fb72603e9d813bd841a2c17" Size="3677" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1100810" />
     <Blob Hash="265879cc31a76bb387e77b7fdb71b1a19808d949" Size="16532" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1100772" />
     <Blob Hash="26595dcb55c86f0993138cc38c8ca3bb7f6fa08c" Size="2849" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="467949" />
-    <Blob Hash="2660a97515b632e5d6b212c340dfbccc4cf3738f" Size="93508" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="1883928" />
-    <Blob Hash="2663c26da8d5a99fb826b2e5a348a0b35670e31e" Size="2531" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1557076" />
-    <Blob Hash="2664fc50a90e442fad3b38dceeaeb76d25fdf5c0" Size="381" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1402730" />
+    <Blob Hash="2660a97515b632e5d6b212c340dfbccc4cf3738f" Size="93508" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="1941336" />
+    <Blob Hash="2663c26da8d5a99fb826b2e5a348a0b35670e31e" Size="2531" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2094158" />
+    <Blob Hash="2664f27118d2e3c790d7e97ca7fa78d60660fe35" Size="13190990" PackHash="5cd94f7a9a6bec529174cd8aa109dcb0516e2517" PackOffset="8" />
+    <Blob Hash="2664fc50a90e442fad3b38dceeaeb76d25fdf5c0" Size="381" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1851632" />
     <Blob Hash="266cc9f167c241f12c89d2191c53113bea1a5d91" Size="31106" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2054456" />
     <Blob Hash="266ec69871aa74ed46448d3688332277114576c2" Size="147" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="453615" />
-    <Blob Hash="266edb4fedbaa8f1957caf57bc96be6c4d4ff55f" Size="55792" PackHash="772be2a1b26f994f4af5928b9a48434ff28b41b2" PackOffset="2017400" />
+    <Blob Hash="266edb4fedbaa8f1957caf57bc96be6c4d4ff55f" Size="55792" PackHash="f56183ef9a51b04c0311b5a5de384e805b4e41fb" PackOffset="1985332" />
     <Blob Hash="2673de6d3c4197334a75035692a1af16a5b6dbd1" Size="74240" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="507348" />
     <Blob Hash="267a9520c4390221dce50177e789a4ebd590f484" Size="5473" PackHash="752108efcce0f1353b7bf7b6788e6d82a9890a4e" PackOffset="2084737" />
-    <Blob Hash="267ad31b4f5c358b2f2654d5c81ef5db3fbcf145" Size="7165" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2049063" />
+    <Blob Hash="267ad31b4f5c358b2f2654d5c81ef5db3fbcf145" Size="7165" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1912896" />
     <Blob Hash="267d11d56009f3ebe86ae0e86d6a7bbeae11d309" Size="512" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="2092217" />
     <Blob Hash="267f71450058dc6066ab0ae974617298bec62925" Size="1442" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="338273" />
     <Blob Hash="267fddd26cf63911ccf3daf292854a24f7efc8cc" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="847084" />
@@ -43179,9 +43085,10 @@
     <Blob Hash="269010a31f9c7d46c8adb1c461aee3a9c5b19bce" Size="1117" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1985341" />
     <Blob Hash="2690d3a6ff380705f74fee1c67be0c22f74c3ec6" Size="651298" PackHash="788022e3bc41bf23e517d88df0ca24f715b1cad4" PackOffset="1249195" />
     <Blob Hash="2691c1bbbdedfcfbca94a878e9f940d32ae0daec" Size="12170" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1577024" />
+    <Blob Hash="26929ac034a1b0e0c88ff80fb9f78cb3d1851340" Size="116688680" PackHash="08b494ecaf9cdcdd1231a9fb9f8ac58f25caa61d" PackOffset="8" />
     <Blob Hash="2697b7386a4be1c1803d26d18ff49bbe694087d1" Size="3164" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="510868" />
     <Blob Hash="2698a88d07f8a5d325bfaf35000f3478ce1b24a3" Size="100833" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1048382" />
-    <Blob Hash="269d7da0b7e90c7e1df429a376b6ab626d5e8678" Size="2405" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1537665" />
+    <Blob Hash="269d7da0b7e90c7e1df429a376b6ab626d5e8678" Size="2405" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2074747" />
     <Blob Hash="26a2477c970c67c081e01993f52cc287beaae7fe" Size="559184" PackHash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" PackOffset="1477488" />
     <Blob Hash="26a3f01a87177fb6a4b6f553c96283ca9f9d5a50" Size="18576" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="159712" />
     <Blob Hash="26a7116b50044ef67cfe11e6d7e2c941722243b9" Size="20402" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1437753" />
@@ -43211,19 +43118,20 @@
     <Blob Hash="26f0054c285dca528c84f0fe1738e89c96c09d02" Size="15942" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1432407" />
     <Blob Hash="26f02245a44094e6ecad51204aae93de16889f63" Size="607" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="291536" />
     <Blob Hash="26f255dd5305c8080a6762db98f92d30857852ba" Size="496" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="595530" />
-    <Blob Hash="26f327d02e281a662f90bf288faeb8dc25063cce" Size="1114" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1564622" />
+    <Blob Hash="26f327d02e281a662f90bf288faeb8dc25063cce" Size="1114" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1683854" />
     <Blob Hash="26f72b9cc503148f7cc349560ad459c15697b7cf" Size="1359435" PackHash="e2d7166acd41c0c247e9b29409121222eeaf4c7e" PackOffset="8" />
     <Blob Hash="26f73bb15aead5ba9459f0092a1f47a77c045266" Size="3064" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1213744" />
+    <Blob Hash="26fc0fa7d47ac99c99465a7a5176b3de49bb14d9" Size="117760" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="1962592" />
     <Blob Hash="26fe565b6f29c39c28d13ec1b2c6dc0d1d49dc96" Size="27332" PackHash="32ccfca2d36198e2e02d586f020244bb1cfec0eb" PackOffset="1254408" />
     <Blob Hash="26ff41e7d2898e808057b997ad0d7a51974e0bcc" Size="40" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2096885" />
     <Blob Hash="27013e6467bed3b4291305505a1307683e2a4315" Size="65561" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="8" />
     <Blob Hash="27016621a85c1c2ef1d17e74d297eefea5a7cce9" Size="2893" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1828089" />
     <Blob Hash="27048d1bfd5b986e6c64a44f0fb0077b40665369" Size="888040" PackHash="25344fa25c82ba6a18b52493684d5fc3900592c5" PackOffset="1053196" />
-    <Blob Hash="2705a1c9a2ccaddbdc54ebb278e605b62af405e7" Size="97752" PackHash="5d27bdeb9d64abf65499f00a1952e59a73cde03e" PackOffset="1929182" />
     <Blob Hash="2706e889828b3f7fa2d766900d35acbbbdf8477c" Size="85194" PackHash="2712036814539c2a4f91c20f323dcad0fecc9943" PackOffset="2002464" />
     <Blob Hash="2707162e36e33a7295cc88e5c4b2a62f6c965c38" Size="631800" PackHash="e738e4d1dd54a93f4fba800a115c25fed788b22c" PackOffset="1445522" />
     <Blob Hash="270a661cd859fcfa05104adab0f0fea599e2fea6" Size="1421312" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="8" />
     <Blob Hash="270a79e486bec4aed0f4e839d560ae4cf678ae84" Size="120832" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="1470984" />
+    <Blob Hash="270a840e85ea4b6bc14d0a0ff88fb7056d3359b0" Size="3512" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="2091406" />
     <Blob Hash="270b2c3c8f5a2efd47e4dfa22521e36cefd5a774" Size="6841" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1662376" />
     <Blob Hash="270b89df543a7e48e206a2d830c0e10e5265c630" Size="3428" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1619866" />
     <Blob Hash="270e21dfd18ef6ce026ae097bba83a54330abfa6" Size="1071605" PackHash="1a8fd2a2ad993894a34201f56091c085b0cff150" PackOffset="8" />
@@ -43232,7 +43140,6 @@
     <Blob Hash="271a089ff1e78c077b79f9ac5cfe5fe308543a75" Size="8100" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1755486" />
     <Blob Hash="271a9beaa69924dfe3cf77be98f6c442b7383a1e" Size="112" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="611477" />
     <Blob Hash="271eb8a0a885ec69b81437cca19599acdc578997" Size="5685592" PackHash="46bd206e62625ccbdb9d81ec65d5a5247f8d0374" PackOffset="8" />
-    <Blob Hash="2722afe608d34dee828bb609c4b1ef700ea25b24" Size="7272" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="406954" />
     <Blob Hash="2722da3c5253c37d420fdebe50de536072818f00" Size="37459" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1146336" />
     <Blob Hash="2723cc8d0e86f39145a2b3cc3d999be8b405f107" Size="29627" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="154820" />
     <Blob Hash="272718dfa2b6efae70d9f913367d9ad9e68576f8" Size="2439920" PackHash="2f778d711060aef5876bdfc867b9e1788334e0e9" PackOffset="8" />
@@ -43291,11 +43198,11 @@
     <Blob Hash="27bcf9bcce6873f2362000e10b4eb948c03a4580" Size="219" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="223359" />
     <Blob Hash="27c16b587cad20db2927e14205df6f26ca91204e" Size="272" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1747685" />
     <Blob Hash="27c21bba2d9b941d7666a0a7df7e771a408b355c" Size="7803810" PackHash="e997f5bba3b4d4b283427ec3ca644a876f6dee7d" PackOffset="8" />
-    <Blob Hash="27c24a3ef805e79b43777c074a2d2865612d48b2" Size="4082" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1181496" />
+    <Blob Hash="27c24a3ef805e79b43777c074a2d2865612d48b2" Size="4082" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1626327" />
     <Blob Hash="27c30ebf689a11425137ad5e52de08106eec3d2a" Size="4734280" PackHash="f2cac297ce2f765216f7b03ab60d477fa783bed0" PackOffset="8" />
     <Blob Hash="27ca3fcc21e564e35b82fdddaf12e596175dc4d9" Size="7251" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1829503" />
     <Blob Hash="27cd696ccb7406cc49e5a86a55a75c763b978da6" Size="126234" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="1579261" />
-    <Blob Hash="27d070c0f24984edf7d51117d73c72edf025222f" Size="2234" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1367558" />
+    <Blob Hash="27d070c0f24984edf7d51117d73c72edf025222f" Size="2234" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1487018" />
     <Blob Hash="27d522e5b694ae4817d5c9998930982c0cd97a65" Size="9364" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="514996" />
     <Blob Hash="27d7c413661a79324769d0d3d1946cd38b07f6dc" Size="2061936" PackHash="232b49d50dbc53eb15158f9570e94aa843779afe" PackOffset="8" />
     <Blob Hash="27da02dc88d9a22ed689fdc268a353df2ef506bd" Size="26439" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1276761" />
@@ -43309,7 +43216,7 @@
     <Blob Hash="27efd8bca11bf322ccfd9bb86ef2d900d7ed954b" Size="5117" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1287718" />
     <Blob Hash="27f1d6416e43d5c5236ef86afb891024cb61c40e" Size="1282" PackHash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" PackOffset="2095758" />
     <Blob Hash="27f22c13b0e3d7a932244b3a70d31c2e72e3a203" Size="164696" PackHash="1d65dd4bc54fb708e89f184268c81d7711313128" PackOffset="1241074" />
-    <Blob Hash="27f44886fea26a225329e0525d25baf09d20af9d" Size="3608" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1079977" />
+    <Blob Hash="27f44886fea26a225329e0525d25baf09d20af9d" Size="3608" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2020711" />
     <Blob Hash="27f7a86b223650675fe0f6fdeaaec8d169ea7790" Size="1188039" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="151608" />
     <Blob Hash="27fb2de7c7a98fb94607d9b80fa42403eb67897f" Size="136" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1163424" />
     <Blob Hash="27fb7e0b1db3469b9f9b8968baa0f12498429c75" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="452256" />
@@ -43321,13 +43228,12 @@
     <Blob Hash="280983814edf452e38ca528bba500c88e46972b4" Size="2428085" PackHash="17776652e1ca155fb61327f3fb532b6b999f8c20" PackOffset="8" />
     <Blob Hash="280a67cb786eb9973145a7bf2d671bafd51ed20d" Size="1147" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="2095618" />
     <Blob Hash="280a8473d22ab95cee421e9d752cff1a00a40f17" Size="1143" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="2054166" />
-    <Blob Hash="280ae4d1e78e0e877c877490d27d966920e7357f" Size="11239972" PackHash="9a5383e360c2de98b90d8617a8cc6ee2db6e7d1c" PackOffset="8" />
     <Blob Hash="280bd5922bbb1754d6a5553f830e8cdc7cfe7db9" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="718724" />
     <Blob Hash="280cf06d9de26fd0f087f8fbc25e22668258fae4" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="211976" />
     <Blob Hash="280db70a27406c12c20f04ec05a1504f72f079fe" Size="434124" PackHash="94cfed4a88c4801ef537b65413db4cc3326b0a89" PackOffset="1552755" />
     <Blob Hash="2810faabd5fb1c77d21f63ae766250166a49c9a3" Size="6240" PackHash="f673955a77882976d5085992a28ee72f5faffe27" PackOffset="2083605" />
     <Blob Hash="2816c2e041cae702134c4abebfb8d7f3863c5b82" Size="1045" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="2094678" />
-    <Blob Hash="281813059548c48e5027c8bf8838901bbebc235f" Size="933" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1068136" />
+    <Blob Hash="281813059548c48e5027c8bf8838901bbebc235f" Size="933" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1238170" />
     <Blob Hash="2819aefac73b8cd1b8136c199c5612e78c39af66" Size="39072" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1488930" />
     <Blob Hash="281c797f575ee3f81a6ad51fa866dcb357900a36" Size="30699" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="487994" />
     <Blob Hash="281f7436208f9f96536d62c26388589e584f0404" Size="1979" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1241061" />
@@ -43359,7 +43265,7 @@
     <Blob Hash="2856ae2b6cb59eada235ddb36bb56f9f44908fac" Size="3715574" PackHash="a038911e9714e898d92b083b656358f7a15b7aad" PackOffset="8" />
     <Blob Hash="285a96cc40d7cce104fb4b407c7f0c400aa8f9cb" Size="1114" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2022992" />
     <Blob Hash="285be80e4a5844d6f27078170794e363df82fe68" Size="2995" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1916875" />
-    <Blob Hash="285f0661c133efab5bc12d2b7c6c1c5722b85abf" Size="6456624" PackHash="985bf5af6a33156133b920df787e305a6a148da5" PackOffset="8" />
+    <Blob Hash="285d13006c6b2e05f964ee940a5f634c7170053b" Size="59440" PackHash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" PackOffset="1994592" />
     <Blob Hash="2860ac6832638eb4a2966dad15aaaca7a7b87bbe" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1912114" />
     <Blob Hash="2863c7eeab4006120fade694f1a53019fc2e62d2" Size="185" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2002326" />
     <Blob Hash="2864bff28bf390ac2277781a2f13cb77e7b99870" Size="33942" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1521260" />
@@ -43375,9 +43281,8 @@
     <Blob Hash="2879a32d3b5063a19b62d3460af41982e336c66a" Size="144" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="446781" />
     <Blob Hash="287d71948472e0e11eafbd6d9815c9cdbe4ac28e" Size="235" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2094980" />
     <Blob Hash="288431ba5378e07849f49cc9bedbb30f1a3d0fe2" Size="205434" PackHash="97c7cbc1022b352e100f1ebe5482f2517a13f901" PackOffset="1880584" />
-    <Blob Hash="28864dfca72db20b6a8a054107ac62b99e9fed54" Size="90044" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="1956888" />
     <Blob Hash="288bc0bf44bd729bcf0f27212d607a7996e39d18" Size="985" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="831458" />
-    <Blob Hash="288cb5b02ae8b879801b294a4c28fb9b24227323" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550289" />
+    <Blob Hash="288cb5b02ae8b879801b294a4c28fb9b24227323" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669521" />
     <Blob Hash="288e777185c6beb9396f70ac523c4768f6130b34" Size="144543" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="1148074" />
     <Blob Hash="2890a554fd106cc6572213e55c3a932be6eaadcd" Size="18624" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="2053928" />
     <Blob Hash="2892ccd4c222fe8540ffe936370bf9f501ce6586" Size="3168" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1345194" />
@@ -43387,14 +43292,13 @@
     <Blob Hash="2895b02e5413eb14267f333df4aa9c7db13db6da" Size="908" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2087773" />
     <Blob Hash="2895c22bcaba9bbb0cfbcc3c29eb557af0da8fa0" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="500256" />
     <Blob Hash="2896d1ee561f306e5755bfe2f41c7fe052284335" Size="1107" PackHash="f673955a77882976d5085992a28ee72f5faffe27" PackOffset="2095639" />
-    <Blob Hash="28975c9bd75e5001afb7216567dc598b6828264e" Size="9876" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2083887" />
     <Blob Hash="289ab6edc2406dbf12d573ce0a72ae9d1df4bd3f" Size="149" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="441234" />
     <Blob Hash="289b11568bd92405c43b0cd503413a6c4b33616f" Size="924" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="2091128" />
     <Blob Hash="289c6c91c1a31ec404ca919b5e9506cf70a8be96" Size="22029" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="386614" />
     <Blob Hash="289ec8b23e24ef8213078114f841dd7abaee6902" Size="1446" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="717895" />
     <Blob Hash="28a89892b693ed84c0090a826b7c7d8b31ac79e6" Size="11838554" PackHash="1f8a7b587e8133a13a9ea9a805fa8a61c1ab039f" PackOffset="8" />
     <Blob Hash="28a9debea6068ef4b678e3376f914e94550dcd72" Size="130944" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="1690060" />
-    <Blob Hash="28ad7bb9ee69cc7dfe12124b27b5f03d76cbfbc7" Size="1435648" PackHash="09358de240dc340ba067bd03e6077676ab6a6908" PackOffset="8" />
+    <Blob Hash="28ad7bb9ee69cc7dfe12124b27b5f03d76cbfbc7" Size="1435648" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="8" />
     <Blob Hash="28b58dc43f1389e7a9c9c546dfbb38030fe7221f" Size="3389" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1756024" />
     <Blob Hash="28b8ec115ee572c26326a7fe9e5b31b3a705643a" Size="340" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="2094878" />
     <Blob Hash="28bab1ea1392388a787121b2372ea94351b22751" Size="1122792" PackHash="b4a776853600eb2669faace5cd18754eef79284b" PackOffset="8" />
@@ -43403,14 +43307,12 @@
     <Blob Hash="28c4a2876d415dfcf3f86202cc803b7c318db212" Size="3829" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="2092983" />
     <Blob Hash="28c5138b84a1bcf17c3e68781ab5ee5c15fabae5" Size="1251" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="124171" />
     <Blob Hash="28c5cb48ad2b0d7626434a6da8b8d38a2c3c6943" Size="2141" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1829624" />
-    <Blob Hash="28cbd85d9d64f380ada740a8b6f1de7384ede752" Size="18089016" PackHash="e6bf28011e3d92593638eaeeb6da426a5691e32c" PackOffset="8" />
     <Blob Hash="28cc2b921e0619d492f7bd7cb240ab9970d36a5f" Size="14336" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="2075656" />
-    <Blob Hash="28cd048f59d37fa2102a215df8a936b26b7ddf44" Size="6092814" PackHash="1f9a8d0bb7201d7683ebf836f6d5fb1253ad9e72" PackOffset="8" />
     <Blob Hash="28cf9e98c062c6e7ce0fd9045fb663cd99f88ae7" Size="2901" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2080699" />
     <Blob Hash="28d14fb5336ee17e2d91728597fdcb34069601bc" Size="8102" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="119796" />
     <Blob Hash="28d4b9d0263f58e5ac23b2f546b3333883631315" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="173760" />
     <Blob Hash="28d86f0dc18d7c455a754a1a4d3f3c6334a363a6" Size="71736" PackHash="32a83d508234ffa544d0570813e08e4f8b6379f7" PackOffset="1991416" />
-    <Blob Hash="28daf75604dace7c3a77a2d224ce713b1d9798a3" Size="7976" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1963152" />
+    <Blob Hash="28daf75604dace7c3a77a2d224ce713b1d9798a3" Size="7976" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2020555" />
     <Blob Hash="28e3982f010b09213e8f11425cbc85800607f274" Size="5145" PackHash="adecd2c644904747c3cdc204c4e4d0c59ab35970" PackOffset="2089261" />
     <Blob Hash="28e3fede46363ca1cff054e052d644395f895e00" Size="15360" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1424760" />
     <Blob Hash="28e4b5a2c6033d13bb6c38b3dbe72efe40217340" Size="2951" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="785118" />
@@ -43420,7 +43322,6 @@
     <Blob Hash="28ed9dd10c5f170b9516f48acaa8fe51fd4ac9ec" Size="1596120" PackHash="f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" PackOffset="8" />
     <Blob Hash="28edece619a7812f571b1f5fb1e353dd5cf792e8" Size="2139" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1478962" />
     <Blob Hash="28f073bd160bda3860600a9ba4d8e48742c07648" Size="549" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="2096546" />
-    <Blob Hash="28f5e20ca843bfd2cd1ecd09494770de32bc5f60" Size="277279" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1079729" />
     <Blob Hash="28fc4f5f12e4c86ac7ed122bd7cc0a6e3e08163d" Size="2869" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="702953" />
     <Blob Hash="28fd7ec6832d8368c984410f03bafaf1eddcc019" Size="1419" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="535647" />
     <Blob Hash="29087bdd52779eb6ce6000b1989c42e9c81f8bf0" Size="67062" PackHash="1ef5c21107774059ed6c5010dd2d5f3373c81445" PackOffset="2019081" />
@@ -43431,6 +43332,7 @@
     <Blob Hash="291486bd1c2c8453254e353deb381dceb21f80c1" Size="399872" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="259080" />
     <Blob Hash="2915f5d60c850e8fce82bd95fe5a90c7b112533b" Size="11104" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1041744" />
     <Blob Hash="2917cc4b96f43b22388225403b9b2d6e07d17fc4" Size="21811" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="403803" />
+    <Blob Hash="291971c5469e0c01e4cffe6fb084e37f5c417131" Size="2434487" PackHash="38f352a8d8f0030a00e4f31e987916b7b0756798" PackOffset="8" />
     <Blob Hash="291d1f070fe2f7f3eebcd50c72435ff1e28a5267" Size="6075" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1531999" />
     <Blob Hash="291d90d821e9ca703e22b98618852b8af6f99461" Size="7184" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="281118" />
     <Blob Hash="2920498347df311342b727580aa4edf609d12e14" Size="705" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1731484" />
@@ -43443,6 +43345,7 @@
     <Blob Hash="292a9f135d5b0bf6c0db4e250548b2dc9f1d549a" Size="6955" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="880241" />
     <Blob Hash="292b575558b8627ad82f50d868db03fe32cc4824" Size="1463648" PackHash="12582f0c651cdaf8a3d2ed39d6d5c41ff2045005" PackOffset="8" />
     <Blob Hash="292b5bb5c2337cce40a936a1881de3ff49cd9be7" Size="136704" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="774152" />
+    <Blob Hash="292bb991822c195861ad12816d5bee4373f122ca" Size="1416700" PackHash="5296a9019552cfa52cf9a1c3004f4ca87ebf88ef" PackOffset="8" />
     <Blob Hash="292e5becf7c54793e99a1e1dbc301b7008d97859" Size="3486288" PackHash="33902cc01c7eda10161025651275a129da5ead6e" PackOffset="8" />
     <Blob Hash="292faf66bffb02ee3ea020e0032600579e819e82" Size="528" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="808290" />
     <Blob Hash="2930e7fdfaa456936527d6383318ddf624faec9e" Size="17846" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="927392" />
@@ -43452,18 +43355,17 @@
     <Blob Hash="293d62c2e43dbbe0e961b206f75a1496a345c92e" Size="766236" PackHash="123cfc7b4f950bd4f688a3a67f65ce112acdbebd" PackOffset="8" />
     <Blob Hash="293db81557129bc82d0ab70d129e6666b44ee8ad" Size="293" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2079252" />
     <Blob Hash="293f96b8bbf82f647d74922b5de016c85e4fbc33" Size="111563" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1613464" />
-    <Blob Hash="2942288ad9ca61b492a6b8a56001b0e0e7e89186" Size="2715" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2091016" />
+    <Blob Hash="2942288ad9ca61b492a6b8a56001b0e0e7e89186" Size="2715" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2075606" />
     <Blob Hash="29430d4abf8c1c70b637f0b80ffcc98bd0a5a122" Size="23040" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="244144" />
     <Blob Hash="2943c74db6d4346ab8c6531adac91fa05c137c40" Size="21786" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2053639" />
     <Blob Hash="2947f3dffa52c1a92bae64e04c5254c5ab8cb0ec" Size="4640" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="542218" />
     <Blob Hash="294d4aac81e1752a8bea9de14304b95186d96a65" Size="16133" PackHash="03d2b700b5ea970da10b691861e3cbc3ffb3ee29" PackOffset="1004913" />
     <Blob Hash="295599cf190443e476fb8565ab3ff4a680a1f303" Size="3444" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="688686" />
-    <Blob Hash="295629c204390279c602d5037884c5426957c065" Size="4265032" PackHash="ed231b00e4cfda36fffe2344aa7faddd06695b48" PackOffset="8" />
-    <Blob Hash="2956dfc045b6f95720ccf5a37ee02e48a18efd58" Size="2556416" PackHash="a3bbf64d91389a7d48e5298b0dfc21add57c0c2c" PackOffset="8" />
     <Blob Hash="2957ffe8c438148306ccbafcbed8c576cf8710fa" Size="510" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1564402" />
     <Blob Hash="295802889ae6275341f60e9af62699d2f8947154" Size="120054" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1128730" />
     <Blob Hash="2958a44fdef223e8c1fa05e35b38758dc27ee8e3" Size="13312" PackHash="232b49d50dbc53eb15158f9570e94aa843779afe" PackOffset="2076792" />
     <Blob Hash="295a1b1cbe23949f1a784f21dbed97d84d9cfb7a" Size="201" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1101554" />
+    <Blob Hash="295cd103027b00559567ce9bb9f01b6efc9d25b8" Size="2575968" PackHash="2d76ccbbb86174fce5c802133467dd9d27c7ed5b" PackOffset="8" />
     <Blob Hash="295ed48048a63cf8d7d7e10e6c8ee07fead6a16a" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2075390" />
     <Blob Hash="295f12e661526a27eac4ec4ad3ffe9324244416d" Size="27910" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1730074" />
     <Blob Hash="295fd71f96ee60eb4f7b16ae78344228835b786a" Size="6756" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="808018" />
@@ -43482,7 +43384,7 @@
     <Blob Hash="296f49f63fcb0b8a629a7635a4aed0881ab72648" Size="8090" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="806689" />
     <Blob Hash="2976c9bca2fb569fef6f6a98feeab3679ad98fb7" Size="9266" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1724736" />
     <Blob Hash="297e6e8fb9fbda2326943a9fb21c0012bdd6bc7e" Size="941969" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="8" />
-    <Blob Hash="297f8950b709a43a7f8998a4fbd739bae73f839d" Size="2533" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2032639" />
+    <Blob Hash="297f8950b709a43a7f8998a4fbd739bae73f839d" Size="2533" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2091195" />
     <Blob Hash="2983b2041a3134d289a0617cee69fa254bcbf39b" Size="10032" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="401436" />
     <Blob Hash="298472de8575399a796ea7955803912d9d1c319b" Size="1476303" PackHash="60f481b9e0149933c045fafa2e119c902e698d0e" PackOffset="8" />
     <Blob Hash="29867370767f2cf7d3530d112ad1efa696bd77fb" Size="12525" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1906380" />
@@ -43494,7 +43396,6 @@
     <Blob Hash="2998c5223e305be4f653e51a10644780795a6382" Size="139718" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="389562" />
     <Blob Hash="299b31343eb66dae7d2ad168307e33ec2e9fca2f" Size="13922" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="2080525" />
     <Blob Hash="299c45cfae3eac780cd458c9538dc00b0fc3b273" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081987" />
-    <Blob Hash="299c7235b03a6c89138a722392d667f41eb40755" Size="2447312" PackHash="dd8fe67bd041ba3a16589de0f1b932cb9c59e5e5" PackOffset="8" />
     <Blob Hash="299d930149e3973b4c9b0c3aea5f7b126939d7b8" Size="115762278" PackHash="ea73750f0e68e45f3d65380b98bc15ec80292967" PackOffset="8" />
     <Blob Hash="299e5e6ac8563f5790d57637acb0e13a45800e6a" Size="69178" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="1845530" />
     <Blob Hash="29a26a16353fa6061adec5b672bd689e98766ab1" Size="17622528" PackHash="e1146fbe19589cba2bfd875e65360b1038f71d69" PackOffset="8" />
@@ -43533,7 +43434,6 @@
     <Blob Hash="29ef0e7ed27955ba04ee3e1da5d8bc89f7dee8c4" Size="37402" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1781503" />
     <Blob Hash="29ef266ee738d5a21dd2737c17847ca85641afb9" Size="937" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="117074" />
     <Blob Hash="29f3a5fd569c7cfb885c18dcd1be428ead3cdd91" Size="3397" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1589682" />
-    <Blob Hash="2a06ef6f3c5b1bbe019cf75466e17b9a5f273832" Size="803538" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="1075566" />
     <Blob Hash="2a08031ee82cb3fd659655ed5d47e0ba181b0d59" Size="42" PackHash="c40e5337fb15243fce02dcae546c81693c08866e" PackOffset="2097035" />
     <Blob Hash="2a098f2ccc931317749501d5f76a773f26f4dc74" Size="2904" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="824959" />
     <Blob Hash="2a13e44177e5cac6d83485824080db24ccabc58a" Size="55562" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="1062383" />
@@ -43544,23 +43444,25 @@
     <Blob Hash="2a1e5de835b85cb9283857f5befc499b962c3a6f" Size="401182" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="1014431" />
     <Blob Hash="2a1f772b5f1a6c30510df574bfbca005f41a24f3" Size="4470976" PackHash="c8d32adbc51365b195aa2ec0ff4068f1db4a5b63" PackOffset="8" />
     <Blob Hash="2a20e4c148d87cd6a2d8320d05b54259a8030ce7" Size="1351" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="292488" />
-    <Blob Hash="2a252c677da83c6ffe1b2b04ec5ee20f11f598f4" Size="2964" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2092799" />
+    <Blob Hash="2a252c677da83c6ffe1b2b04ec5ee20f11f598f4" Size="2964" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2083400" />
     <Blob Hash="2a2a06c531a12c32e8ee00284fa5060ac8e91895" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2096883" />
     <Blob Hash="2a2b3c1ef225237ca6f1a89ef6417bae180dc854" Size="158513" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="212720" />
     <Blob Hash="2a2eb59a2f723c5aa51d3a5bddac549429c83011" Size="83516" PackHash="5359b58ffbb9ae76a120a6563e2ee1d6677eda38" PackOffset="1903399" />
     <Blob Hash="2a31317bc9e505a0aa77358713b8a72e434ce626" Size="243" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1182890" />
+    <Blob Hash="2a34a79730d1d2285da994feef71c7eecfa97d84" Size="2500" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2081626" />
     <Blob Hash="2a353c270b6729703cac0b39575c9cb3d0ebffdc" Size="22528" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1164826" />
     <Blob Hash="2a379a1ac406f70002f200e1af4fed95b62e7cb8" Size="18624" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="658208" />
     <Blob Hash="2a39859e60381b2e165e0b379c5eea035dfc83e2" Size="1756" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2019039" />
-    <Blob Hash="2a3a3a35183be84a234fe1cfb0c93a10cbb89725" Size="18230" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="2070140" />
+    <Blob Hash="2a3a3a35183be84a234fe1cfb0c93a10cbb89725" Size="18230" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1988340" />
     <Blob Hash="2a3cb3e4301e0648d1846bf6eab72a9f43f38af9" Size="3141" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="767537" />
     <Blob Hash="2a3f009678475862b9ab3e615df0695e6c79e594" Size="2693" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1329879" />
     <Blob Hash="2a3f28e27742a6c02466ec8cf0f6d38c172a8462" Size="2524" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="382067" />
     <Blob Hash="2a411ba30d4fcc860b46018e30dfe9e5a2b0597c" Size="13636" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2014119" />
     <Blob Hash="2a45d6cc11ec86fedec55ff7202470c93491d6df" Size="12288" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="8" />
-    <Blob Hash="2a47d5ea6de7342c02d8cd4341468a24e36538a4" Size="10644" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2056228" />
-    <Blob Hash="2a4a9f973be23f947a69eb4e1fa4a909e2de53c1" Size="29413" PackHash="b221596f9694d342526ce34110f4e329b8f905b2" PackOffset="2062514" />
+    <Blob Hash="2a47d5ea6de7342c02d8cd4341468a24e36538a4" Size="10644" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1920061" />
+    <Blob Hash="2a4a9f973be23f947a69eb4e1fa4a909e2de53c1" Size="29413" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="2005645" />
     <Blob Hash="2a4af9e68781b4c0bf1e7be99afc42ce1956bc17" Size="5504250" PackHash="a6287affa4b828301aafa84f7bd9ce71935997b1" PackOffset="8" />
+    <Blob Hash="2a4d3e958fb5afd2e4bbfaf316f88aa7177b02b5" Size="170586894" PackHash="e319937ef387e4166aa2bb796e363d0bdc326655" PackOffset="8" />
     <Blob Hash="2a4f9f4c06039a822bc8413800a3740ec0c8d2c6" Size="82423" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="112843" />
     <Blob Hash="2a519fe65edc4567a3f1b6f501357895dc8203dd" Size="39979" PackHash="40bbf84ca6f41261515705ea95ae2597aec12054" PackOffset="28002" />
     <Blob Hash="2a55917d6d909ca7b1b9aff3b4be04d98b4389fa" Size="597243" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="1227461" />
@@ -43585,6 +43487,7 @@
     <Blob Hash="2a8543b994e93e54bd50eaa78463905e6a8ebe74" Size="182" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="164909" />
     <Blob Hash="2a8fe16282c5e46a2a05a34122d238f9b3aead77" Size="793" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="2095396" />
     <Blob Hash="2a90e9ce3aba27953bc99ce9f9b2c520c2a557d2" Size="228" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2091380" />
+    <Blob Hash="2a91039a3505994ddaf842089c5bb76ddf0c569b" Size="681290" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="8" />
     <Blob Hash="2a91579fc823c8bb3f9c7878ace0bf28219fa5e4" Size="9631" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="2085516" />
     <Blob Hash="2a929d3c3026fec4a5a7fc5262e6ec4adb7ff5d1" Size="2728" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1014112" />
     <Blob Hash="2a93e7c48177031a383e0cd3a261b3cdb78a5ac7" Size="214528" PackHash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" PackOffset="1775364" />
@@ -43592,20 +43495,18 @@
     <Blob Hash="2a967a9accf3d1b8d26861a7c8a093a06deb3a05" Size="561" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2065591" />
     <Blob Hash="2a97fe5596d84df9f48a039549dce3af6baa8193" Size="2828" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="701510" />
     <Blob Hash="2a9b37eb3b5904862cc8825ca2832b4113c51ee8" Size="40706" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="986762" />
+    <Blob Hash="2a9c047f10ed74639a88ce0aec42fa31f5627461" Size="2910118" PackHash="48469e5d42bbfeab317ebbd7c2788f4d78b45066" PackOffset="8" />
     <Blob Hash="2a9decfb7b72c99e28ec420f1c2167ea8e0a998d" Size="9216" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="571331" />
     <Blob Hash="2aa34259512f4ac084fbb291a6de700459a8343b" Size="193622" PackHash="06f8551ab53e55ac8547d5a0944df478384dcbea" PackOffset="1884848" />
     <Blob Hash="2aa635e1d46558ef07d0f5584bcd6347143e1668" Size="940" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="902818" />
     <Blob Hash="2aab0b4c955feb5fc5547f7ff119017004c1fc34" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096969" />
     <Blob Hash="2aab8756e594e96e9cc224d262101af64b712cee" Size="110354" PackHash="c8fe39e90583da82b2773c6df823f7c535ff9097" PackOffset="1020076" />
-    <Blob Hash="2aac5e33a06e49cf5c347f066acf3a25a1f5f1da" Size="3871416" PackHash="92a5cb4f0e0166cb3a3ccf2a70afc5b327bb3d47" PackOffset="8" />
     <Blob Hash="2aac7b940a47d2e4247ac769416fa1375593ee00" Size="172" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2090600" />
     <Blob Hash="2aacf3c4d84daecfc81e62b991935a65c8c648ea" Size="9892" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="187424" />
     <Blob Hash="2aaec24cf4c60a401f1d3a080c1d11675176c560" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2071724" />
     <Blob Hash="2ab1c930b906f115451945ca59d8a9b344936740" Size="24959" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="118859" />
     <Blob Hash="2ab3fed1a59c7c4df7c3636837f661da95c6e62a" Size="402553" PackHash="ee8662030dbca92bd70af3ba1550ece5c275d13e" PackOffset="8" />
-    <Blob Hash="2ab9c5e199b9f07f6a35f5d9161aa7b0f3d5a65b" Size="3334650" PackHash="67d41024ece83b57565733013f229ef772f8ad66" PackOffset="8" />
     <Blob Hash="2abb2244e92fa4e8dcba44cdb827b2888d9ba03b" Size="7030104" PackHash="a29cdfff111a1f8e138a6dbd2e3f666cf77cbdd6" PackOffset="8" />
-    <Blob Hash="2ac06b777b725a70451784d1a0a0975670582ab2" Size="4198400" PackHash="088a8d2b68dd145c199dd346a9dd8b17d9ed0547" PackOffset="8" />
     <Blob Hash="2ac384a4ca7b03da5ee92825ebf15e60574b5f0b" Size="5051" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1219670" />
     <Blob Hash="2ac3de7272ad02dab8ae14a9b2f72333aee9c4b0" Size="10085" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="285758" />
     <Blob Hash="2aca958140ebec6cda6db1439c0cd1a8c1a1b0aa" Size="552544" PackHash="69524cb8a63c006267120fffbd8a5e2729e9d5af" PackOffset="957704" />
@@ -43622,19 +43523,18 @@
     <Blob Hash="2ae9ff782af172b9e7970a14a0afa4cf008e6877" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="127916" />
     <Blob Hash="2aea52822a1177be4d79d47bd6f742c4bed037f0" Size="21935" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="683026" />
     <Blob Hash="2aedb244c8eee9448ddaa850927ab812824edfb9" Size="3045" PackHash="2c1210d318f1def793c3c9c4c827f8e9d756557f" PackOffset="1330" />
-    <Blob Hash="2af09cf793840c6a1c0b3a8cf5e192fc01c35e1b" Size="82584" PackHash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" PackOffset="1868258" />
+    <Blob Hash="2af00826f4682ff004b2954882caa10d5592d978" Size="65866" PackHash="65292930f06c2bb49ec85a293869511324a919d3" PackOffset="2023418" />
     <Blob Hash="2af19e85807e67eb05314ccb8b6f2085c26897b1" Size="130775" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="524667" />
     <Blob Hash="2af31f7d12e4fe0f68ad8a2afff7933e2dc71312" Size="13279" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1790530" />
     <Blob Hash="2af54c9bd47e1b31fb930c90379a74a082f357d4" Size="1562112" PackHash="638489a089df7fb447a4d5149c4fec6d4faa0dbb" PackOffset="8" />
     <Blob Hash="2af5ff5aac3a3c4184258172aa5a396a14e880b3" Size="11318" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="589132" />
     <Blob Hash="2afcba5007c5bc46d37e111655519e62017f2a78" Size="46643" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="300428" />
-    <Blob Hash="2afd5470e8aec9db3eb413f5b9cac65fd6d58ff9" Size="42416" PackHash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" PackOffset="2045712" />
     <Blob Hash="2afe2e215378ae7d268595961fcc9289927659c6" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1845887" />
     <Blob Hash="2b0152116b284333f35cdd6a25d3a591e6b412fa" Size="434" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="2096498" />
     <Blob Hash="2b0344dc498508e3fb67ca7985cdedc1752da640" Size="2560" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2055790" />
     <Blob Hash="2b0e378121ab38fc38bbf804679d38ae6fd22bcc" Size="40069" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1475665" />
     <Blob Hash="2b10095e605f6aa96f9b3f8d27cfd2a81cd3d597" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="260126" />
-    <Blob Hash="2b10928e0526a7855eb4c6e0b88c90cec9309daa" Size="2202" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1386699" />
+    <Blob Hash="2b10928e0526a7855eb4c6e0b88c90cec9309daa" Size="2202" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1835601" />
     <Blob Hash="2b10c3904d9f31837ac4e61881e374e37ea7a670" Size="20200" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="489380" />
     <Blob Hash="2b1366390ba859e939f0995d1cb0cf5ee8f3571f" Size="211" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1258394" />
     <Blob Hash="2b143c75f437de0d1e70564651642af5fbf5992d" Size="3323" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1207461" />
@@ -43651,10 +43551,10 @@
     <Blob Hash="2b2f13367732fb630d13a5f069675c91a4bbffbd" Size="92870" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1339760" />
     <Blob Hash="2b2f85f8dd6802eb88da268f994045e7f492302c" Size="38172" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="231120" />
     <Blob Hash="2b30010608f876f3a5267e42cecf73c3e8142e78" Size="5509" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1735568" />
+    <Blob Hash="2b32839aa588149987f6ee957a5c1ed188de0457" Size="2143" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1821190" />
     <Blob Hash="2b3c77801343f55cbaee02e212b3160a16dad574" Size="87552" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1633656" />
     <Blob Hash="2b3e057b4184cddf4769e562c09dbe72e957dff3" Size="21056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1036776" />
     <Blob Hash="2b41e03f58ce967ebd293fc0345668641a32a463" Size="5657" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1414845" />
-    <Blob Hash="2b43eae7277e51d4e6fa7977af665b30b192772e" Size="10719981" PackHash="590b9790e4812e31301187e21c780f3da9b31257" PackOffset="8" />
     <Blob Hash="2b45527b0faf640c8a4973ad0a0d377f6668a8ed" Size="1477906" PackHash="ae5a80d9f6baf190f4ab62d63ddec6bd58b356d0" PackOffset="8" />
     <Blob Hash="2b45b280ed8a8cb787229b710fe0ec73f71331f6" Size="13620" PackHash="a223063132a00fd7e9af3c58ba28d6ba14fc65b8" PackOffset="2079380" />
     <Blob Hash="2b466c90d302f82c0d7ac2927560296e9585ba37" Size="1181088" PackHash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" PackOffset="515184" />
@@ -43665,7 +43565,7 @@
     <Blob Hash="2b50ef4c0c8b2a85a829949a2bb28fd2e0339d6c" Size="53628" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1382866" />
     <Blob Hash="2b51679f43f5a8f6cb5732007e6d3331cf75637b" Size="31633" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1612963" />
     <Blob Hash="2b56ed53e3b921ddc821f5e0febfbdca4236d482" Size="559762" PackHash="9bc19f3cb48e1f3fb37f1a5c35b2e6f213545d1d" PackOffset="474630" />
-    <Blob Hash="2b577f271175c5da1250ba812da689bdea45d84c" Size="57" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1807266" />
+    <Blob Hash="2b577f271175c5da1250ba812da689bdea45d84c" Size="57" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2096953" />
     <Blob Hash="2b58bfad3ab34d30f6e91494e0f4598febdb8219" Size="198856" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1421320" />
     <Blob Hash="2b5d90469308ba78e5af5a2c1d658ea3183f20e1" Size="233" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="381688" />
     <Blob Hash="2b5fd87b8b18591ea8fb0f2c962b6f0ff9316036" Size="184" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2094612" />
@@ -43673,28 +43573,26 @@
     <Blob Hash="2b64d16dbd7e0c6354c2f46476daa20e8fcd617e" Size="21440" PackHash="256d7fb5a72ad9474639a3af999411bc858d0b00" PackOffset="2071957" />
     <Blob Hash="2b6625c3764f27a4ad6fd3ca2d98af98752827bf" Size="151" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1958986" />
     <Blob Hash="2b66f3a310b08bb2b6e2423462b3067267e9eccd" Size="1594802" PackHash="4d6f9c6d7a261e35898225b1fade32da175cb530" PackOffset="8" />
+    <Blob Hash="2b6f8d50448e8455f695c36a0c2304b1926f11c8" Size="144480" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="1760686" />
     <Blob Hash="2b76013593d886b0724d82849fd1840b20922902" Size="260" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1080304" />
-    <Blob Hash="2b7a9798a5def443aaf95588800d2bfb38484530" Size="334" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1563194" />
+    <Blob Hash="2b7a9798a5def443aaf95588800d2bfb38484530" Size="334" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1682426" />
     <Blob Hash="2b7d1280e02e039c44809a9c5c95d58d1fe8285b" Size="1558" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="955869" />
-    <Blob Hash="2b7f82b2b609ef0ba09a2ee13d76ae2f344d0430" Size="224480" PackHash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" PackOffset="1630466" />
+    <Blob Hash="2b7f82b2b609ef0ba09a2ee13d76ae2f344d0430" Size="224480" PackHash="48417a383086ddd15fbf2c4f33ed8e96f024699d" PackOffset="1736228" />
     <Blob Hash="2b886678658bf29378353922dacd562b5c8c81c2" Size="3895466" PackHash="a8c3c5c06509128462e2d8dd583e4e0eb47be634" PackOffset="8" />
     <Blob Hash="2b8a73d1b5febf37f63d3641ec303ac1eb641287" Size="1056" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="2079606" />
     <Blob Hash="2b993d4f347b95ec92ce035dbbe80b5b098805c3" Size="8331" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="699817" />
     <Blob Hash="2b9bc643ff48518e9cea7cf32510ea9dcf42b28f" Size="681" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2093983" />
     <Blob Hash="2ba00421955e71d36c5eb0d837d884dda7184b01" Size="35222" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="81852" />
-    <Blob Hash="2ba1731e42009ad27f049a7fd0d3fb8798c1d977" Size="19754064" PackHash="d1520bfaab38f3061d25e8115b7c19d4d3b50927" PackOffset="8" />
     <Blob Hash="2ba1e492d993e4d608e912d66a0a7a74c13d5096" Size="6505" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1577432" />
     <Blob Hash="2ba2b7baeb10f252c4f6220eb638409566c823d4" Size="3100" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2021757" />
     <Blob Hash="2ba306e2a5d3155ddb0c5afaabfeaa95f043b21c" Size="2233" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1503181" />
     <Blob Hash="2ba3c39ec8629231de2b32b604d34d2d51d1cdb5" Size="36820" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="404727" />
     <Blob Hash="2ba91a4b0799af0402653f63682160e65d733865" Size="32" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2096853" />
-    <Blob Hash="2ba9d685fa6017c0233af9bfddfd3508ce85e489" Size="2326" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2091864" />
+    <Blob Hash="2ba9d685fa6017c0233af9bfddfd3508ce85e489" Size="2326" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1949568" />
     <Blob Hash="2babd827d77b57613d36f0bb760d739dbf003bd5" Size="29592" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="521403" />
-    <Blob Hash="2badc24c56a04e3e33e95798d85feb42881f983d" Size="14198" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="2059386" />
     <Blob Hash="2bb14ff6822ce9e7d74ba11515beaa547deb7831" Size="1976" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="2059716" />
     <Blob Hash="2bb337df9e9e662214464cd2eb2822e96334cfa0" Size="4238" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="879171" />
     <Blob Hash="2bba4f38c1c0c187bed167586f9ee20e9ae7758b" Size="3012" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1721484" />
-    <Blob Hash="2bc16a8fbad8b9b1fecb87abbbbc6fe04b7efc40" Size="2159436" PackHash="3b638bf2293f0e9f19ed41b1fdb3549b21108b03" PackOffset="8" />
     <Blob Hash="2bccbb7627e379b91284e4c5032cec795c2fcac1" Size="42393" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="192006" />
     <Blob Hash="2bce278d5eb5aa7131a1652519dd66c228c9193b" Size="511" PackHash="4c90070f3985d7708ef21790aa75b3597f50e984" PackOffset="2095865" />
     <Blob Hash="2bd91bd850028712f35a2ddb2555036fbf6e8114" Size="1032" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1048508" />
@@ -43711,10 +43609,10 @@
     <Blob Hash="2beb688f06ad4039d0517bfaaf2b56c68fa85b8c" Size="2541240" PackHash="8841fb311dd68b47eb7608fe703ded3dcbdf54ca" PackOffset="8" />
     <Blob Hash="2beb68f97f68c8262d61826a0e398ad304d04fc0" Size="4769705" PackHash="0579846434d53b52d2ba093fc5dfd7d0205f73be" PackOffset="8" />
     <Blob Hash="2bed23c918ab8094dc078dace76bf845cbfaf968" Size="203829" PackHash="f26725553888bf1a0cb10b2f2ea94dc7801c0c27" PackOffset="8" />
-    <Blob Hash="2bed6f26f13b8a1740c5e30f6eae657dcf1c9bdc" Size="1629" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1360944" />
+    <Blob Hash="2bed6f26f13b8a1740c5e30f6eae657dcf1c9bdc" Size="1629" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1480404" />
     <Blob Hash="2bed8ff737267287062189ad84867fc81c80612e" Size="58" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="614308" />
     <Blob Hash="2beeb1eed21434db134febb9f730c488b143c0f6" Size="5364" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1904551" />
-    <Blob Hash="2beeb6d685ceed1f65a2947c305e0fc39aa9df34" Size="2593" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1584745" />
+    <Blob Hash="2beeb6d685ceed1f65a2947c305e0fc39aa9df34" Size="2593" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1600570" />
     <Blob Hash="2bef2e3cbd82bb937b3f5db8b9687d93d5853736" Size="15723" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1166157" />
     <Blob Hash="2bf14303bb1bba616a7afcc24447a698e3a14d7d" Size="3305" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="188883" />
     <Blob Hash="2bf53397a5f9f4e15aa8e85db632846f9def60fc" Size="7488" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="542771" />
@@ -43725,7 +43623,7 @@
     <Blob Hash="2bf9a4f19788889cba87766b8859f91c55646eb0" Size="1621" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="615016" />
     <Blob Hash="2bfa1cd8b0f9849a434d78733539863e07158e5c" Size="11165" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2063031" />
     <Blob Hash="2bfa1de44c9331b9b99dc5d78f0fdfef8f861d90" Size="3362" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1050566" />
-    <Blob Hash="2bfc2edfa62913001839222b0fd787c81d00a308" Size="960" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2022454" />
+    <Blob Hash="2bfc2edfa62913001839222b0fd787c81d00a308" Size="960" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1911789" />
     <Blob Hash="2bfd509d61c5ef5a9cab2a501a0f9aa50fe4c494" Size="2050" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="720260" />
     <Blob Hash="2bffe831795ee2c087854cfb7deadecbd3652c88" Size="1464" PackHash="35ebdfdf49c250eec03bfe601c7b1b0dc2c2b69c" PackOffset="2095515" />
     <Blob Hash="2c017511690d34844cdf076c0aaafc35082af23b" Size="67114" PackHash="a90123bb85c3d4b8e9fc4d9b4e402d77e3f4092d" PackOffset="1807364" />
@@ -43734,9 +43632,8 @@
     <Blob Hash="2c07d570d37c3b818d23db2a4fee2b6df5e11885" Size="42936" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="498696" />
     <Blob Hash="2c07e5960efd464d86f2da6f5c25411baf0542df" Size="1722" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2078032" />
     <Blob Hash="2c0d6121db49cdab6fbaa81398be2e44be4e1110" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1827680" />
-    <Blob Hash="2c11e184503f5ce1bf5d23aa9accbc230b4fb64c" Size="16439104" PackHash="ee129033a4120c9e504d6cfb1f3c8dfbc6b8c6a8" PackOffset="8" />
     <Blob Hash="2c1f4d0700f528841d53a9a6b09302e1a18d6787" Size="3724" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="2053608" />
-    <Blob Hash="2c1f5da83cd94b7c60b07fe9c87817de426dc700" Size="3400" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1154639" />
+    <Blob Hash="2c1f5da83cd94b7c60b07fe9c87817de426dc700" Size="3400" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1591255" />
     <Blob Hash="2c2174cb16f490689e6fac17b6d18f4a0dbd2dc9" Size="231" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1487772" />
     <Blob Hash="2c25b498ae1e70271765acf944730bce9219a71d" Size="779" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1698229" />
     <Blob Hash="2c26e57d10b330467479c6845dbe11a0605bfe71" Size="4181" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="2043900" />
@@ -43758,29 +43655,32 @@
     <Blob Hash="2c3e153074857d3c93ff3f80f5d85b128f45df68" Size="466" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="2091173" />
     <Blob Hash="2c3e34665a00be1f25886a935734036dbc3cf11e" Size="3587" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="217375" />
     <Blob Hash="2c3f56e3c6be4b9787c78072633b9d410c802443" Size="176" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="275335" />
+    <Blob Hash="2c451aabdafec45db57d01335a41b2feda6a5a9d" Size="2164" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1796015" />
     <Blob Hash="2c45c67fc946926745a4cf237c84660007ac5077" Size="5133" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="913493" />
     <Blob Hash="2c4639fec30419521d5bdb6384e3113afe73cdf9" Size="85" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="738679" />
+    <Blob Hash="2c47b8afe930e075870bfea16f908f70efbbaf9c" Size="3130880" PackHash="30ba0bdd1c68f813fff4959b4f11948a0d750426" PackOffset="8" />
     <Blob Hash="2c47c7210b7cec6d74ccdd863f8dc9bfb35d501c" Size="92" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1001752" />
     <Blob Hash="2c47dc243f006199432745a16b9c90359472ee34" Size="10178336" PackHash="e911b3aa49e5da096e90b8a4524b6e47de6ee95f" PackOffset="8" />
     <Blob Hash="2c4a3a2d258bb8df2e2bff54f32b104e9b987c92" Size="19125" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="1149466" />
+    <Blob Hash="2c4a43e5ddb89b0f22ab449ea6ffe46ea6555e2f" Size="1558382" PackHash="0ed14b33f38a079eab41685991300558ffebc7b3" PackOffset="8" />
     <Blob Hash="2c4aab48dc4422700aeba8e3c4fefcdb9c0536d8" Size="38956" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="2021129" />
     <Blob Hash="2c4eea901f4ad0488b774354ec7f36370a6e4548" Size="2974" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="669070" />
     <Blob Hash="2c507cf113a00054944a54f6b8d9ab0efe83031c" Size="111488" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="6954" />
     <Blob Hash="2c516bdffbd433c7c42f5a7a4ad2163e726c341d" Size="12800" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1590075" />
     <Blob Hash="2c53b9c0412b60cc33660c7a62a4049ba5ec77e9" Size="55808" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1989216" />
     <Blob Hash="2c550a338f4e04146363ed7d4357ee8939ed4e9c" Size="879" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="145688" />
-    <Blob Hash="2c560b104629960ff6ff37a5b2f9edc8371b574d" Size="2306" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2094834" />
+    <Blob Hash="2c560b104629960ff6ff37a5b2f9edc8371b574d" Size="2306" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2018682" />
     <Blob Hash="2c57f9d96e0a7d9332c5e15746b30a2b36eede92" Size="4664" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1526234" />
-    <Blob Hash="2c5aefaae7b623b707a4ebf48f93a73453541202" Size="68311" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2011620" />
+    <Blob Hash="2c5aefaae7b623b707a4ebf48f93a73453541202" Size="68311" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="2013704" />
     <Blob Hash="2c5c8761e79977765c8de00ad1d0f145b5c780bb" Size="4623" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1914572" />
     <Blob Hash="2c5ca2c5d05264530716f1f648556bc4566d7f79" Size="101395" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1853559" />
     <Blob Hash="2c5d7e85f1bed63fe70dff6d484662c9e5cab33e" Size="18006" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1061093" />
     <Blob Hash="2c5f07401a90b67dabd2492229f0067b2afad20c" Size="3254914" PackHash="7234d3aeb7840986efb5412f43318f9f8e24c962" PackOffset="8" />
     <Blob Hash="2c6129114d4ced51d04de8da59b5150c04276d4c" Size="5092" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1115627" />
-    <Blob Hash="2c666b7bfebf12d0a767763de430e8520f59f898" Size="109632" PackHash="76ceae49acaae4eaab40e99ad6e585de490ee865" PackOffset="1983556" />
     <Blob Hash="2c66eaf34b90d1c32215759c183ac2299f238d14" Size="982" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2072420" />
     <Blob Hash="2c685256a24c52737f23011d61daf65dfd7686bc" Size="550" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="900840" />
     <Blob Hash="2c6a0d56bf5385ea60455b7011c685ebfcb25497" Size="675" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1302906" />
+    <Blob Hash="2c6c67c09ade993fdbf20a52e29d642d6534d744" Size="2031104" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="8" />
     <Blob Hash="2c6ec406559e346f49c05aa545a41e6369163bd4" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="546480" />
     <Blob Hash="2c6eebd7dec5d92d1f6c06c1a244aa857194be67" Size="2279292" PackHash="1bbc3311955d3d138277baa75f554a0ba230eeea" PackOffset="8" />
     <Blob Hash="2c6fba8fa8a75cca002ddfe2bc57b8250cefba13" Size="980" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1086604" />
@@ -43809,14 +43709,14 @@
     <Blob Hash="2cb9e60a339bd60a70dd6370c4e75a037cc8eb78" Size="4773164" PackHash="41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3" PackOffset="8" />
     <Blob Hash="2cbaba6db5dd17026be77f5bc95228e8f97bdb34" Size="3753" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="2089172" />
     <Blob Hash="2cbba35fcc75c0d25a975414275e0c2ea922ab39" Size="3335" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="481465" />
+    <Blob Hash="2cbbf6e5bf38a54c03de19c0ea1228521283bcba" Size="115488" PackHash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" PackOffset="1879104" />
     <Blob Hash="2cbc34dac5a09ee2320b6795ebc16486933274f4" Size="34349" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="207319" />
     <Blob Hash="2cbd50abd5b69903d208780fcc6aec7838232140" Size="791395" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="720118" />
     <Blob Hash="2cbd664e36e183c2b2482aefc756f49a33030737" Size="435" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1709177" />
     <Blob Hash="2cbe705e23683114f4e70c0066e91a61c01e9e3c" Size="30692" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="860867" />
     <Blob Hash="2cbe92b852845210facaef0a0ae8d8f26094e039" Size="157818" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="115204" />
     <Blob Hash="2cc3cf174428c5d825793f0ec2694065e1e41fbc" Size="3829" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2078088" />
-    <Blob Hash="2cc865298e55db9a2ac9b95d50d2cd70ae237b0d" Size="5053" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1963576" />
-    <Blob Hash="2cc966e5953139a1d17340b8d2aeeca093be86e2" Size="3741924" PackHash="77c9a1411d2bf7e175d99ce92f9e8b7156be8e1a" PackOffset="8" />
+    <Blob Hash="2cc865298e55db9a2ac9b95d50d2cd70ae237b0d" Size="5053" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1904698" />
     <Blob Hash="2ccde7aa86e117742df190ae55ea5d995b3829a9" Size="37967" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="138529" />
     <Blob Hash="2cce9a6096047e1ee7dcc75c9672124f3f6d49cd" Size="17840" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1413819" />
     <Blob Hash="2cd06fe763ae8d2b9db2ffe3ca5f8b1f2540e2f9" Size="2252840" PackHash="20624c8eb99a0f2e5485813c0aa9911805fdf794" PackOffset="8" />
@@ -43828,7 +43728,6 @@
     <Blob Hash="2ce48072b6d3fda9656e93016b7756a93f1cb149" Size="387" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="32289" />
     <Blob Hash="2ce865f012340d634f1e599ea2e148ca2b43cba2" Size="78770" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1437919" />
     <Blob Hash="2ce8d6f8de81ffa7fd570836a21be4aa05846c59" Size="1926494" PackHash="de91426e5f3e3df5e3245d6aeb1634e9c47ced52" PackOffset="8" />
-    <Blob Hash="2cec0cca7dccc565f2079f1cd9991cc48522d16c" Size="2400" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2091260" />
     <Blob Hash="2cef4235ba640f681e445c4c1dcdc46f571d43fd" Size="184" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1373782" />
     <Blob Hash="2cef8006f9e63008e9bf8296cff865abce06c3fa" Size="55373" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="305448" />
     <Blob Hash="2cf05261a43d2741b2c15ceebf482d1644d004f4" Size="7824" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="64268" />
@@ -43843,13 +43742,12 @@
     <Blob Hash="2d06d91d002134b6a39d8bef0bbbff06f794e43e" Size="235904" PackHash="68d38951ca4d3d30a245076c500b265ca391d43b" PackOffset="960554" />
     <Blob Hash="2d074139831e47d537d5a91a66543ab1a45e5612" Size="12172" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="960850" />
     <Blob Hash="2d13feba8382b8f21acd15adbb51fc487807e46b" Size="1876" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1887004" />
-    <Blob Hash="2d146d1aa350b1000ed831868853bdd68066324a" Size="4100712" PackHash="9f27c3a28773bd51d459d3f7d4d54aa7c142e475" PackOffset="8" />
     <Blob Hash="2d152be14961aeb037fbeb8e43853bd248a497f8" Size="12143204" PackHash="8b75c0186f469959c83c3e4cfd0af6896caff305" PackOffset="8" />
     <Blob Hash="2d15bc50a5c12f67c2b24870b89b6c37d907749d" Size="6416" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1019545" />
     <Blob Hash="2d1b0ef67c4563bbe77b11af0a10947f80cf7066" Size="1244444" PackHash="fb0187e8327789c02149729f407e8b9296df854f" PackOffset="8" />
     <Blob Hash="2d1b3dc6c19fd24af37819942b0a1c195712d14f" Size="19193" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="2067882" />
     <Blob Hash="2d1d51faab7d150bc223be5bf4d06315525d4c57" Size="67072" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="435208" />
-    <Blob Hash="2d21212a86e1eba7be0c7904a2bc77c0df38019f" Size="1271" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1412395" />
+    <Blob Hash="2d21212a86e1eba7be0c7904a2bc77c0df38019f" Size="1271" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1531626" />
     <Blob Hash="2d21ebaf5804c4fbf719afa9b034c8da01f9a849" Size="118" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="202700" />
     <Blob Hash="2d2393fba41d8e18893d6e636962eaf8a8068ade" Size="243" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2063219" />
     <Blob Hash="2d28e9e2d8a2ae07937014a7a961fbca8c6fd9b9" Size="283" PackHash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" PackOffset="2096860" />
@@ -43866,11 +43764,10 @@
     <Blob Hash="2d4449449b3ac829fd026c807850d088fdee9970" Size="4441" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1698796" />
     <Blob Hash="2d46110de2840d0e8fb893247a9de373d29ba3ee" Size="4047" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="770323" />
     <Blob Hash="2d4a97e6835260cb8d66ff9b65375e0f0460af27" Size="74237" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="991683" />
-    <Blob Hash="2d4bf26fbbbc1b879dcb4d2894a2d5b0626f3405" Size="4354" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1956638" />
+    <Blob Hash="2d4bf26fbbbc1b879dcb4d2894a2d5b0626f3405" Size="4354" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1696865" />
     <Blob Hash="2d4bf640e3e86f66106bdb362c5feae45d7f2fa3" Size="15968" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="554964" />
     <Blob Hash="2d4ddf3149b69e7eba1eac77c1fc195190906a9d" Size="6698" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="1948144" />
     <Blob Hash="2d53d2cbec1952be0203047c4b239f027def7004" Size="6763" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1527402" />
-    <Blob Hash="2d54a22bce1451b30c96acedcc7f9e6103fd8723" Size="34150160" PackHash="62e9b2a08039ffa1e414a910c21261962e0b9ea0" PackOffset="8" />
     <Blob Hash="2d5afe5b168858dc4ec7c32fb3e09c0033ffcce6" Size="23152" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="583988" />
     <Blob Hash="2d5cafa65a2f23de3d6380497ce97bf7854daadf" Size="24820" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="551425" />
     <Blob Hash="2d646e1bae9d4866986bbc7e08ef7faee79a2529" Size="692" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2095998" />
@@ -43893,14 +43790,13 @@
     <Blob Hash="2d88a3d92d6102317265936d414da4998757c368" Size="145799" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="1754414" />
     <Blob Hash="2d8a6c53db5a174ff2cde92b483870811284e616" Size="10490" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="174572" />
     <Blob Hash="2d8c36240b85c2ca6dfd06dd65764e470740edfe" Size="159087" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="1504466" />
-    <Blob Hash="2d8c70bdb14225c2bdaa3dd60a3ededa592ad320" Size="24711" PackHash="0c3b6ea6bcbe567cf7a0cf2d8d4492dad4d91257" PackOffset="2021784" />
+    <Blob Hash="2d8c70bdb14225c2bdaa3dd60a3ededa592ad320" Size="24711" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="2061433" />
     <Blob Hash="2d8e12abf83029e2baf47c4e958c3386187fe7a8" Size="2843" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="406763" />
     <Blob Hash="2d925872bc0e06bfaeba23a66a92986642c4556d" Size="297" PackHash="bebbdbb60be5af7d028ddfaa2a719af3d6269dbe" PackOffset="212643" />
     <Blob Hash="2d92b4fe4e89cdefc20be9cde554e707ea3220d6" Size="3600594" PackHash="4aa8393f140b2d6a1d8cbef974555395b2f8bbbd" PackOffset="8" />
     <Blob Hash="2d98d7bfa7e5dd9e2d3ddf41dbfd8259ad537c60" Size="26649557" PackHash="9115f9c7dc7945be7635da41acb70c29c0c79f9f" PackOffset="8" />
     <Blob Hash="2d9957b16ab7b01c741f617ab040384d491736a7" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2096924" />
     <Blob Hash="2d9a0f6f0c4788d0a6da7526795767536e1bd835" Size="334" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="1566789" />
-    <Blob Hash="2d9fb5e66354c9b0c3faeeeb8c7af2b512f1fa81" Size="6560240" PackHash="9382db5490104bdd40ff525b307f4dc798d56585" PackOffset="8" />
     <Blob Hash="2d9ff158ffa0161aac3aa2197c361bc56369a308" Size="898048" PackHash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" PackOffset="8" />
     <Blob Hash="2da218d4f532e8d8db46331253b0da99c3223dd1" Size="4572" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1108407" />
     <Blob Hash="2da3da01cdc8b3f4dd97a348c5ffddb6353be935" Size="1230" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="1413882" />
@@ -43917,12 +43813,11 @@
     <Blob Hash="2dbd0ade6144022e48a2292896eda195aa0a46da" Size="2963" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1065920" />
     <Blob Hash="2dbf630a76a6406abfd735f7bad1621c70959b80" Size="35525" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="723177" />
     <Blob Hash="2dc02f359db64fa3df7e5ee69f982adf54c59b9a" Size="906" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="439964" />
-    <Blob Hash="2dc0787186f2637754b8f0591512501c870bc1d7" Size="195106" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="1303732" />
     <Blob Hash="2dc0f96b2cd407fd8fc22218afd20fd2a71f0f7f" Size="3880" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="184670" />
     <Blob Hash="2dc1cf445cf58c5ed2684d553dc4487d23c4977a" Size="2939" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1713874" />
     <Blob Hash="2dc472157c35bf8fb01d5cd219b2041c67b6bfc5" Size="33280" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="246280" />
     <Blob Hash="2dcd46acf51785cfef5bc0a797e0f8bc73314fbf" Size="349282" PackHash="68d38951ca4d3d30a245076c500b265ca391d43b" PackOffset="309386" />
-    <Blob Hash="2dcfb58b3796cb4942c0180d21a3de6c07a282a1" Size="199" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2096403" />
+    <Blob Hash="2dcfb58b3796cb4942c0180d21a3de6c07a282a1" Size="199" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2096553" />
     <Blob Hash="2dcfc69f13e289368fabda1d58da7f186914d5d5" Size="468112" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="1193235" />
     <Blob Hash="2dd531b2b5190bd8fa047dae4fbea9dbaccf2c2e" Size="1891" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1545757" />
     <Blob Hash="2dd72e1296b1514def04cc898194da1b7eac2f56" Size="249558" PackHash="c8fe39e90583da82b2773c6df823f7c535ff9097" PackOffset="8" />
@@ -43934,10 +43829,10 @@
     <Blob Hash="2de6e5b8765459f84e40083ffb325031d224bba2" Size="2475" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="389570" />
     <Blob Hash="2de98b6a9383abbcfd32b5424aeb5c6b93c06be6" Size="976" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="78195" />
     <Blob Hash="2dea50fad7caa5efba33934a67c966fea2608d25" Size="5616" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1481144" />
+    <Blob Hash="2deb9bc60d0dd255633990c6fd6fd8af8120f12a" Size="31024640" PackHash="566b5dbf1b638c04f5cca131cc6df5d36bf64c18" PackOffset="8" />
     <Blob Hash="2dedcc9f78dc3991ef0aa715f77587bbf97bf279" Size="4355" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1046098" />
     <Blob Hash="2def3c2783c1054137f5f25af515c44c5ec93b68" Size="18546544" PackHash="101a54dc6c97ee4664931b0fe1132667f3b1332a" PackOffset="8" />
     <Blob Hash="2df0d0ed242a3b01e91988dabeaf60611ca373f4" Size="92395" PackHash="48f3081d1a9290c5aa4944724e4068aae5ac2301" PackOffset="8" />
-    <Blob Hash="2df339c801776e305bacad20893d774c2002202b" Size="483632" PackHash="9914ebb44e7e5640a37d1eea68fd99aec8f8aec7" PackOffset="1585552" />
     <Blob Hash="2df3e5ed98f2002e6190bd932b17b36e488ef488" Size="20996" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="900813" />
     <Blob Hash="2df4ee3ccc602612d2bd2929cd37b56c3853ebbe" Size="199522" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="205294" />
     <Blob Hash="2df79450e2f33a195515b027e23ab2b3beaae674" Size="158" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1523493" />
@@ -43948,14 +43843,13 @@
     <Blob Hash="2e04ab29ba9362ae7150a0e9397e42ada2f2760e" Size="112366" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="1683683" />
     <Blob Hash="2e052c64668c41ee31e91600b39073637f64c727" Size="2343" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="624571" />
     <Blob Hash="2e083ed20c317cdb8b41c81229b4885e957acfea" Size="11205" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1961272" />
-    <Blob Hash="2e0a50263f15e2e653091d232d76ae818e2bb446" Size="5750" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2081515" />
+    <Blob Hash="2e0a50263f15e2e653091d232d76ae818e2bb446" Size="5750" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2088272" />
     <Blob Hash="2e0ad287333f9358aa3f14e38b0917e7fc30b52c" Size="576" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1309602" />
     <Blob Hash="2e0e212d958db56440e0a9ae22d0aea7eb73b491" Size="137964" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="278119" />
-    <Blob Hash="2e1196d386efe032d41df343beba0bb3b7091aaf" Size="441" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2095189" />
+    <Blob Hash="2e1196d386efe032d41df343beba0bb3b7091aaf" Size="441" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2096671" />
     <Blob Hash="2e14ab4c42c332e48269ac313f6142c2b654aec1" Size="1413" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="2089354" />
-    <Blob Hash="2e15cb2f8b17893ff9c08e732dac086d82005224" Size="37649" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="466994" />
+    <Blob Hash="2e15cb2f8b17893ff9c08e732dac086d82005224" Size="37649" PackHash="097882ff4f782476be1a4962baf5872eeb7e54df" PackOffset="2037394" />
     <Blob Hash="2e15e1f76a8128584b48b742f03e0bb11eccddee" Size="19648" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="638560" />
-    <Blob Hash="2e16c1bf9b7870dd4b1c5296561b00aa547a80a6" Size="4120932" PackHash="f3354cb72d0922bba45c8d1de1a1569b8096c050" PackOffset="8" />
     <Blob Hash="2e1837664aeb5a0b48c28c6a1a59023c86a7dd7b" Size="7852" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1792560" />
     <Blob Hash="2e1d89b32f561f9d3cdf693638f2d805940ed7c1" Size="235377" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="8" />
     <Blob Hash="2e207c4c66ecacbc3792cfc34baf49853ad9281a" Size="94256" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="900132" />
@@ -43991,23 +43885,24 @@
     <Blob Hash="2e56c38cca0e42d3aa814001a4d75f1f36ad81a7" Size="52540" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="285631" />
     <Blob Hash="2e57eeee71b310f0f722f86fa804cd859371fed5" Size="2883" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="291310" />
     <Blob Hash="2e5a522500bd349b48369f7704f948a608585f60" Size="908" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="199577" />
-    <Blob Hash="2e62416cc1014eb729eddbc84fc9a572a277e886" Size="390" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1664206" />
+    <Blob Hash="2e5de6c4a8ee884084d03eb93431682d9f0f11b0" Size="2039808" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="8" />
+    <Blob Hash="2e62416cc1014eb729eddbc84fc9a572a277e886" Size="390" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2096717" />
     <Blob Hash="2e65b16b74f8c148fc1bc907952dc1805f07ac64" Size="20040" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="536576" />
     <Blob Hash="2e68686d9630c5d40c2009af14df760e36af8aa9" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096788" />
     <Blob Hash="2e6b9679155b471e3f0d5ccb9e627edbd3b04cb7" Size="2988864" PackHash="8e0206d2950603ea039f5efeb7b7c5cacaad6e85" PackOffset="8" />
     <Blob Hash="2e6c581feaabc49814c7024e76184f3bc1612a97" Size="9216" PackHash="c007855aa7a0479a01364a56f831920abf69f840" PackOffset="2077469" />
     <Blob Hash="2e6c932600013f50dfe16b7ac314a1072b2214e4" Size="20239360" PackHash="b45935576e9b149ac01ad6ea7a115cd48f8b1131" PackOffset="8" />
-    <Blob Hash="2e724603c95f5486c810b59919f464a7e7218df6" Size="3766" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2092847" />
-    <Blob Hash="2e77aea1dc49b15c39fe945e007ac388caf6fa76" Size="455306" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="1418996" />
+    <Blob Hash="2e724603c95f5486c810b59919f464a7e7218df6" Size="3766" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2083953" />
+    <Blob Hash="2e77aea1dc49b15c39fe945e007ac388caf6fa76" Size="455306" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="8" />
     <Blob Hash="2e7a4d2e38654cdd005d815f22e53b8d6f96eb54" Size="2421" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1440322" />
     <Blob Hash="2e7c3f5991d2d56885e3bf1e2c49daefa6f99e46" Size="3571" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="202420" />
-    <Blob Hash="2e7e22dee259faf5cc06387a538a996c4a6dd821" Size="32806" PackHash="8557924e60fcdd015907d69d205b21d58fccf17f" PackOffset="2059963" />
+    <Blob Hash="2e7e22dee259faf5cc06387a538a996c4a6dd821" Size="32806" PackHash="63d57bc7338d3f2c7d705c91585c8a1688cc8906" PackOffset="2059447" />
     <Blob Hash="2e7eac2a29336fa5d41855a3fcca3af926e1e93a" Size="1070708" PackHash="04e83b9b704ff752417e560945db286740e82003" PackOffset="8" />
     <Blob Hash="2e7fc515eef2bdd3d44442a9ac1bb7227f221040" Size="52704" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="466072" />
     <Blob Hash="2e838d96c81105ff240b01e9a2f3570ddb75c378" Size="24606" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="993578" />
     <Blob Hash="2e86524cf5f551d5e4d2b297f39535b26802cfd8" Size="120970" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1329322" />
     <Blob Hash="2e86831d589769127ac1f51f3ff29f0de6034016" Size="1506" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="2094996" />
-    <Blob Hash="2e869631ada763ddbbe65cdc4793bb72a9404159" Size="228" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2096883" />
+    <Blob Hash="2e869631ada763ddbbe65cdc4793bb72a9404159" Size="228" PackHash="0bb21cd291f2eac4434972c081154105a9672abc" PackOffset="2096901" />
     <Blob Hash="2e87684d7514f3a8c05563b1e55b2b6084476ee6" Size="71" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1606217" />
     <Blob Hash="2e882f6d0bb90ac8b91ce30544315daf673bfe34" Size="4444" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1822084" />
     <Blob Hash="2e88d8b85f36cac2513fdbe006145036683cbddc" Size="2847963" PackHash="76417e11f618fd5b0414dae11219bb6d46b1d2dc" PackOffset="8" />
@@ -44020,20 +43915,20 @@
     <Blob Hash="2e9b782dcaa3fe25a2d547f4e19ff9fe2d8fbdef" Size="108024" PackHash="3890ff79bdeaaedd21c338bf90b727a0405d0e85" PackOffset="1586740" />
     <Blob Hash="2e9dcf2fa96cff48224053390c9d43cf138f23c8" Size="25104" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="411298" />
     <Blob Hash="2e9e50cc1bf3a7c8a6b86f4043700d796499cb50" Size="11166" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1220990" />
-    <Blob Hash="2ea065835169386753d67243fbc21c5ef90917b0" Size="337" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2095315" />
     <Blob Hash="2ea5265eb786b74feb716f5331e201322fbe28d0" Size="21176" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="2059640" />
     <Blob Hash="2ea59c09937826bd12dc56f13e40ebeb525848f8" Size="2660" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="666287" />
     <Blob Hash="2ea64c292651880135f2bb867d04b810a8506f4f" Size="219305" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="418908" />
     <Blob Hash="2ea6a0f3e27a3948a23960c769f9c3b725fd4bd6" Size="80896" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="840712" />
-    <Blob Hash="2eaa628d671f2eb5b5724cbea13f5f84eab9d252" Size="448130" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="1596936" />
+    <Blob Hash="2eaa628d671f2eb5b5724cbea13f5f84eab9d252" Size="448130" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="1163922" />
     <Blob Hash="2eb02be3fd35f105b59847892a78f1aa21754541" Size="170" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="557623" />
-    <Blob Hash="2eb13d81a53db0f6b218eee3ad3bd053d90dcaa1" Size="160" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="2096913" />
+    <Blob Hash="2eb13d81a53db0f6b218eee3ad3bd053d90dcaa1" Size="160" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2095912" />
     <Blob Hash="2eb480f1ede2d0ecd94e95147d22517e47d9a8ea" Size="8829490" PackHash="7db350110118d3076728f890e80db47042b1c9c4" PackOffset="8" />
     <Blob Hash="2eb5011d9c854b0995bd93cc2bc213add07edea8" Size="21940" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1894294" />
     <Blob Hash="2eb72277b7926bc22dfcf590e00f249dc3cf9a2a" Size="38555" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="2014985" />
     <Blob Hash="2eb840f75e1af9f09718179963ad03ba14b3b156" Size="3594" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="73991" />
     <Blob Hash="2eb9ba0123cebab2d325427777aa87cfbf2cffe6" Size="377" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1356149" />
     <Blob Hash="2ebb657a5df8fce81d0b190d73ff6763ad0eea94" Size="3087" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="900241" />
+    <Blob Hash="2ebc43d26fb148df870a0dc893d091028c3a35d7" Size="63" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2097096" />
     <Blob Hash="2ebc758c16c1f6698e3d4ae68a29bbfb17ac65e3" Size="155300" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="1861316" />
     <Blob Hash="2ebfe335045321c7a4a8608782419da67f1f0cd8" Size="17692" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="2078702" />
     <Blob Hash="2ec2fe2d1278a94e26270a4c3d34bacfecdf12c0" Size="51532" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1915277" />
@@ -44050,26 +43945,26 @@
     <Blob Hash="2ed82c5d6cb80be5edfa827762ec3869c7f5b540" Size="503" PackHash="b76d486fada8c753603e4d514d4980ee46190b33" PackOffset="5283" />
     <Blob Hash="2edcacc662eaa52786600fe9b44fc54f73f04866" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="785040" />
     <Blob Hash="2edcf589069628dc9d401867f0a878ee0e842c54" Size="8194" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="568052" />
-    <Blob Hash="2ee3d87b9f3950f0db8b77f54d6ee7dd541905b0" Size="303" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1405701" />
+    <Blob Hash="2ee3d87b9f3950f0db8b77f54d6ee7dd541905b0" Size="303" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="2096850" />
     <Blob Hash="2ee53eb6e80aaedc3949c9cfcf8a5d11e23cefe6" Size="1298890" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="8" />
     <Blob Hash="2ee55ac5b7d1d931d70b02cd05930d45c1fb844a" Size="1617575" PackHash="c0890e191c0abbf571bc8e71dd0996ecee557a66" PackOffset="8" />
     <Blob Hash="2ee56dd39a93ff7f09e5533d5c472d2d2ad77192" Size="3311" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="322428" />
-    <Blob Hash="2ee5d7fde2134db44b3f4176b0836c95f0c97478" Size="235716" PackHash="a61134b7a1700b0b5382c542f42c22afc23a614a" PackOffset="1803488" />
+    <Blob Hash="2ee5d7fde2134db44b3f4176b0836c95f0c97478" Size="235716" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="1661316" />
     <Blob Hash="2ee8613dc04a6fa84ab38fd5f3a2aa3fe330625b" Size="204" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2022666" />
     <Blob Hash="2eeb4e458e5c369bf532bace7b6557b575c875c2" Size="2478" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="937792" />
-    <Blob Hash="2eec4b1616f3c838ab65b853a84671a94a057a60" Size="1136" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1318714" />
+    <Blob Hash="2eec4b1616f3c838ab65b853a84671a94a057a60" Size="1136" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1767616" />
     <Blob Hash="2eed2238e6fbb51692ec15b0bb867a5462ca84dd" Size="31417" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1517169" />
     <Blob Hash="2ef046ba9d6a8d6864b1ac8566b6cfbd1ae095ce" Size="7819" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="328398" />
     <Blob Hash="2ef20d0ae8e843812beab5350c5c3b02a106ea3d" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096857" />
     <Blob Hash="2ef5c6f291496255edc13443986f7c3e6faada89" Size="1688367" PackHash="867356c5b5f0807c0afb8d5314ac09fc3e1b9a72" PackOffset="8" />
-    <Blob Hash="2f025b0106ec16fe460fcf8cae5d5fc64a7adfd0" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550736" />
+    <Blob Hash="2ef89c72fa4f8c478d2e29b684746b8097efa65d" Size="2149" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1791235" />
+    <Blob Hash="2f025b0106ec16fe460fcf8cae5d5fc64a7adfd0" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669968" />
     <Blob Hash="2f0580746ce33cadf09ce2394222a00d9d094ddc" Size="4750" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2032239" />
     <Blob Hash="2f0788faac212aa0d4e4e096dc505593d2a32acb" Size="4611" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2008858" />
     <Blob Hash="2f07bf361761697bfd565f4a3bd8830084ea2bf5" Size="103936" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="1008136" />
     <Blob Hash="2f0e90f4ce8f7ad18e2f9b2d839a8f5b90bb4cc2" Size="252" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2090472" />
     <Blob Hash="2f100c3331371a8cebb5d4802fd54edf82e91cc7" Size="10403" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="124403" />
     <Blob Hash="2f1223c8aca22f24a46724406cb7ef222fe0c351" Size="4385" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="405147" />
-    <Blob Hash="2f129dcfa2d91759cf268ac4cbb36bfc55969a04" Size="205404" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="1833804" />
     <Blob Hash="2f135d0910143644f6cfe31f4663008e3f22594b" Size="991610" PackHash="74a0d5b9efb352121b2c377d743a4af6df9b49eb" PackOffset="962875" />
     <Blob Hash="2f164ec5c045476f895b3afca612c716bce67d76" Size="2269" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="369783" />
     <Blob Hash="2f18d900772ba7804576289c5ba85f2db4744aa0" Size="123896" PackHash="d3acc379a342b085eeedf4f71d1cb1d4b38e42b8" PackOffset="118044" />
@@ -44083,7 +43978,7 @@
     <Blob Hash="2f31764f3e5f05dbead0b7d8934e29023bfe5c55" Size="4970" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="108605" />
     <Blob Hash="2f320075587526612b27d0709168e12adf592d2d" Size="1340" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1540191" />
     <Blob Hash="2f33cc4a9cb9f41ad167a38f8b396643a908ef9a" Size="402" PackHash="8391db3b6cbd9a4b24f6114d956cbf68bff737da" PackOffset="2096435" />
-    <Blob Hash="2f340cb915d674b3b559d0d95842617bfcc3388b" Size="2214" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1400516" />
+    <Blob Hash="2f340cb915d674b3b559d0d95842617bfcc3388b" Size="2214" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1849418" />
     <Blob Hash="2f34530b444c44e6cf394515005bbe6a95904645" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1838231" />
     <Blob Hash="2f34970f988f6cd1f95d7772698dedffcd674603" Size="3260" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1108956" />
     <Blob Hash="2f3a04f68fbe5bf1289f1c174b245d51e71a56a4" Size="130088" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="658974" />
@@ -44101,7 +43996,7 @@
     <Blob Hash="2f51faecca13bb21ff95315899e5498fdfd974b0" Size="115758" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="1396206" />
     <Blob Hash="2f5209ac448b126e717bac65346a5da95e70df27" Size="720420" PackHash="e106ce3ce1a7bafe780e72f090f349e0d66c2db2" PackOffset="8" />
     <Blob Hash="2f52f83dcfa7802d07dcb7a1f89ac42c02069868" Size="10266" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="705847" />
-    <Blob Hash="2f534e9221cbc7e9355bd3ca312f12252d7b88a9" Size="620" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1458447" />
+    <Blob Hash="2f534e9221cbc7e9355bd3ca312f12252d7b88a9" Size="620" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1995529" />
     <Blob Hash="2f5612b0fe8dfa00708bef630205b26a1858f408" Size="637" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1566186" />
     <Blob Hash="2f56a0657c8b3b56d29fd6aed5bc4d798c61130f" Size="7887958" PackHash="e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378" PackOffset="8" />
     <Blob Hash="2f5751420e8bbe4d3357d612f396656af2101709" Size="1537" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2000259" />
@@ -44114,12 +44009,13 @@
     <Blob Hash="2f67ab6d4525ccd26f5500130e1c78e69d0601eb" Size="9229" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="9237" />
     <Blob Hash="2f6894077c8e543d8a9fcb4f954a7e3b36365fb5" Size="42835" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1491363" />
     <Blob Hash="2f6d1c68b4df85139af5813d42c510c674f7fdfa" Size="600" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="406409" />
-    <Blob Hash="2f70711bab2c635ab5cbc4dd08226fd51bae591e" Size="4140" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1121213" />
+    <Blob Hash="2f70711bab2c635ab5cbc4dd08226fd51bae591e" Size="4140" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2067229" />
     <Blob Hash="2f72a8335d44fda70e9d0bf3e7fbc26c60d6116a" Size="13411" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1207192" />
     <Blob Hash="2f739b5eb307eb6fbd381a52b55824bf5ba9b1ca" Size="38873" PackHash="74f149795a7f4347983025a723f82d13141d13b6" PackOffset="2052832" />
     <Blob Hash="2f74dd826722fa8efbf7b8b2d8cda9702b62ee90" Size="3829" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1317876" />
     <Blob Hash="2f776a093941d080abb34e3834239e4bb1a09a4e" Size="9941" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="811498" />
     <Blob Hash="2f7aa8ca1fcc85b1a72304e72da0c966679cae95" Size="32863" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="570820" />
+    <Blob Hash="2f82e30a071e0d98ed01100521e34452134a5106" Size="6213820" PackHash="b7d7bb1d70476b368faee15ef6739ee49c3c05f1" PackOffset="8" />
     <Blob Hash="2f831946616f96773e4f25e09977ab5efee38bb6" Size="2762" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="923965" />
     <Blob Hash="2f872fda6c1630677935e0b6be34be209ffe5d19" Size="5404" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="2066334" />
     <Blob Hash="2f8bca10ef6767cf9af95b92a0ca560fac6a2b67" Size="2540" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="617244" />
@@ -44134,20 +44030,20 @@
     <Blob Hash="2f9da04d46f593eac24cff399140169175e3265a" Size="2211" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1010659" />
     <Blob Hash="2f9e4a27b0a19c79337f61e0bd0decd9e5472d72" Size="152683" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="1926807" />
     <Blob Hash="2fa1f30b492f825f8698151d114beb19cea4f940" Size="1350" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="944925" />
-    <Blob Hash="2fac1177da9a730a1ac8df9c274aa56d7d53d9a5" Size="401" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1591044" />
+    <Blob Hash="2fac1177da9a730a1ac8df9c274aa56d7d53d9a5" Size="401" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1710276" />
     <Blob Hash="2fac87d831475b2dc051913f7035f2302b1a0d21" Size="2960" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="129344" />
     <Blob Hash="2fafa3075e9aa28c608e26df883547cb97de60a3" Size="1066061" PackHash="2efd964b62d457693b93d311acd7d54dc4e7f177" PackOffset="8" />
-    <Blob Hash="2fb2a0210338232a62547ff4866234a04658f024" Size="140" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2096997" />
-    <Blob Hash="2fb32edf008a1acb91d5c4507e62aa7eb5a33bd3" Size="421" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1582530" />
+    <Blob Hash="2fb2a0210338232a62547ff4866234a04658f024" Size="140" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="2097009" />
+    <Blob Hash="2fb32edf008a1acb91d5c4507e62aa7eb5a33bd3" Size="421" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1701762" />
     <Blob Hash="2fb6ff7a0de49a2541d058650336a6def5b51d25" Size="578" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="737988" />
     <Blob Hash="2fb8091115765079d0ee038b82c4021f745db24e" Size="725" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="76038" />
     <Blob Hash="2fb81f9b80f84e0f881eb358bf7bbc3471ac7c21" Size="2149" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="72315" />
+    <Blob Hash="2fb899e985b3e7aca3305c428f80c32dd16adc27" Size="7666684" PackHash="0417652ce3e7fade505b77ccc205311ba7e7fb6d" PackOffset="8" />
     <Blob Hash="2fb8ea79a74a959d9ad9de2e61efd0f9532fd6fc" Size="47104" PackHash="c79b3d3d81375c25019c997c0e81af6b84d805c1" PackOffset="1997260" />
     <Blob Hash="2fb9fdaf90f402a9600b65d2917994b7f9ebfa76" Size="40107" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="247210" />
     <Blob Hash="2fbbf7b83f5f6e54ec9cb349f13482ca78e9a0c2" Size="3119" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="357327" />
     <Blob Hash="2fbdd36458c0dc6df68010f6a6badd13120c8ac9" Size="4521" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1929725" />
     <Blob Hash="2fbeddb4e9ca942dd9ee23a4012aee32f92bfd56" Size="16304" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="832909" />
-    <Blob Hash="2fc0035ed93b02afede9307b3ddeee7268bd7818" Size="2537912" PackHash="0d43c6797854f8d46f9bdbaa0bbb9cfe2594f506" PackOffset="8" />
     <Blob Hash="2fc0ba654caf0a903d33b7984deb2a0e283060ab" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="198624" />
     <Blob Hash="2fc102692dc770cd50b1607ad3ed95adbaba11fe" Size="40930" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="75968" />
     <Blob Hash="2fc19652612479123ffa240431b10b6aeadae4af" Size="11074" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1190090" />
@@ -44177,9 +44073,10 @@
     <Blob Hash="2ff91d0c345a7be7bc805e2b6d046f7bd14e1b6e" Size="3452" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1018233" />
     <Blob Hash="30030566170ecf20e20cc486386a98a1ec230213" Size="142521" PackHash="9a3106f71b0fbae7c935c63362a16d9a0419c9c3" PackOffset="1502895" />
     <Blob Hash="30066558b68ee25448a173d973cd33e5349d7d6c" Size="1612" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1128636" />
+    <Blob Hash="3006b4579afc2a90432dee5ba5970a87018fc71c" Size="59440" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="2033970" />
     <Blob Hash="300b16166605e9bf28cd6d60ad5055a9e524766f" Size="139746" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="8" />
     <Blob Hash="300dba95b419c4d226703c8e53ba82760cc7f452" Size="29628" PackHash="f048ee5712bdc546a5ae30754de51176363dab5c" PackOffset="8" />
-    <Blob Hash="3010c8ed65d05c2b8d14ebba16373c299f2b92d8" Size="3543" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1142625" />
+    <Blob Hash="3010c8ed65d05c2b8d14ebba16373c299f2b92d8" Size="3543" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2088641" />
     <Blob Hash="30130c178d7ac53ed2f85aa38a70c2bc49a1819b" Size="57" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="835537" />
     <Blob Hash="3013691819762d75746e4a99e9bc574472624562" Size="923" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1792179" />
     <Blob Hash="3013f3d206574ce2b94683a0f98b5cc7be31b36c" Size="5126" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2074746" />
@@ -44207,14 +44104,17 @@
     <Blob Hash="30486bb838ee2bce98d87ca5ff3f8006be0e6302" Size="32" PackHash="56ad07543c03a217630a832be8abe7b278adfbc4" PackOffset="2097127" />
     <Blob Hash="304898d48b9f2791c30d07ba84996145b10d01ac" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1879351" />
     <Blob Hash="304a07b704845630f345e51437f6e1bd05af7dd0" Size="1058" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="2046762" />
+    <Blob Hash="304c037aaf7f1eaf92dab415c69fce0a85dfd5b0" Size="2256808" PackHash="a72a95c652908e945ebfb8c8e50ed7228e3ebef2" PackOffset="8" />
     <Blob Hash="304df6f6c3b1211423572008d31b806ad25ab8c5" Size="345" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="2096691" />
     <Blob Hash="30504f22dfdec98e034d27847c8ba7d2d19a7f7e" Size="345" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="259130" />
     <Blob Hash="3050936169b2cc64a2e8298b95171dfc45f92e9b" Size="10454816" PackHash="bff26fc3466de88f1c0dd0e563e0e6797e4ac4c5" PackOffset="8" />
+    <Blob Hash="305211cf60482aec9bdb7f9ee97bd1057a69cac5" Size="41013" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="101071" />
     <Blob Hash="305c3f6bee73e63b28ac23a5eb1d541d646cd69f" Size="2495446" PackHash="fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8" PackOffset="8" />
     <Blob Hash="305d3dae98e5c69adcffda70f8b3e6038dc2d808" Size="412903" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="948601" />
     <Blob Hash="305df0331c4d90bf45898fe4e5f94ab27980e9e2" Size="2028737" PackHash="4b316bef0e3604c7f3f9e8b578622da8fa75f36d" PackOffset="8" />
     <Blob Hash="306421ddcae951150aac39400053dd3451566f2b" Size="44929" PackHash="4c90070f3985d7708ef21790aa75b3597f50e984" PackOffset="2014783" />
     <Blob Hash="306aa4bc80a7c47f84e65a303b79e684026d1328" Size="23552" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="1796104" />
+    <Blob Hash="306c00c6958d70442f2b2ff72755efe217eeba75" Size="59392" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="2034268" />
     <Blob Hash="306da66e2c724d4212f0d37fb448c9faca6b5b05" Size="181" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2047513" />
     <Blob Hash="306e75e5cc3afbbbadeafa98393d10d0ae6c2d48" Size="224929" PackHash="ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" PackOffset="1093778" />
     <Blob Hash="306e856e50354caa1d57de12a395fa7a9b0ec20b" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1440796" />
@@ -44247,14 +44147,14 @@
     <Blob Hash="30c4bc5ec0fded4f7099266ec506dc23ce2117e9" Size="17900" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1327626" />
     <Blob Hash="30c903e2ecb013060d434dfc7e42e49b8a2fc25e" Size="290" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="162727" />
     <Blob Hash="30ca0d83fed17fe26e4cd57a60d155a07d321730" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2079360" />
-    <Blob Hash="30cd46b2a33d91d210a03028f79652bff98c06f7" Size="399" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1346714" />
+    <Blob Hash="30cd46b2a33d91d210a03028f79652bff98c06f7" Size="399" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1795616" />
     <Blob Hash="30cebd3d1b5b9ada231e38adf37504ddbdf2a933" Size="1615" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="2094651" />
     <Blob Hash="30d09a001bfbe440a7a3db0df6496de03f4f602d" Size="58880" PackHash="4e7e810806daa53af602a84d64ae8277b20e8884" PackOffset="1967624" />
     <Blob Hash="30d10e22eaf9fe2e26c6cccdea2aeff3439f3d31" Size="239" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="2096748" />
     <Blob Hash="30d1cb28e25b24e33211f94c8b87726e8b55caa2" Size="23218" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="644728" />
     <Blob Hash="30d2dffb4ca482d34feecaef06f372afd13980cb" Size="3679" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="465084" />
     <Blob Hash="30d2e7e20619300cd3b8fcb7f091887ab85fd6b6" Size="385632" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="676248" />
-    <Blob Hash="30da28ab5433ec24a40bb48dc7cf47a25be6e14d" Size="2560" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1977798" />
+    <Blob Hash="30da28ab5433ec24a40bb48dc7cf47a25be6e14d" Size="2560" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2086549" />
     <Blob Hash="30db1e658dfa6b180886ad36c32997ba61f7a4c9" Size="295115" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="1021080" />
     <Blob Hash="30db2cec2b5e2383c7642bd6291cfe7c861db4bd" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2012712" />
     <Blob Hash="30db5ba50824d536934601fb24c8deb69e7c4b0d" Size="2600" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="504750" />
@@ -44264,15 +44164,15 @@
     <Blob Hash="30e489994d3c31f5e6b9a782b9d8652ffb3f6641" Size="4204" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="400072" />
     <Blob Hash="30eac92b3ad346ec089224071db03fcb925fe07f" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1812836" />
     <Blob Hash="30f10a011c3ab112bce64af7a79554439029982a" Size="690" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1725733" />
-    <Blob Hash="30f17a32f96562a9a820b325aae23b2b32c4e8cd" Size="1386" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556750" />
+    <Blob Hash="30f17a32f96562a9a820b325aae23b2b32c4e8cd" Size="1386" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675982" />
     <Blob Hash="30f2e751034475cd6c41b212751167d9e8b20a32" Size="335004" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="8" />
     <Blob Hash="30f32662898ef75e26d36376e9cd9b887ebff490" Size="293466" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="51637" />
     <Blob Hash="30f5900fa1f143263c8b418fec87722ebc860a67" Size="19237" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="551836" />
-    <Blob Hash="30f8b5a60cc0d9a49e11f5887a16875f4547a6b3" Size="2442" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2023968" />
+    <Blob Hash="30f6f3a83fee4576963b9f15548520d26e770116" Size="46921536" PackHash="201898ebb9a6071e0636fe3fcd2ab788f6f8aceb" PackOffset="8" />
+    <Blob Hash="30f8b5a60cc0d9a49e11f5887a16875f4547a6b3" Size="2442" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2082524" />
     <Blob Hash="30f8ee2bd9ae963d91ead56655303ed789f8dca1" Size="3986" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="953086" />
     <Blob Hash="30fb5964ef2a8663446896ba138c8125fcec05d9" Size="211240" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="1817040" />
     <Blob Hash="30fbf7d6e05f1e9fb00c2a8b0691c66968ba4c93" Size="73817" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="207187" />
-    <Blob Hash="30fbffdabf25140dc92654a78d3c62582bca37a2" Size="213504" PackHash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" PackOffset="1814024" />
     <Blob Hash="30fe168c6fa3ee276248951d5d49b6f9b459566c" Size="3388" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1944059" />
     <Blob Hash="30fef11fe9b64871b351dded8ee077541837b562" Size="530" PackHash="acdaf99b12d98a617d40b9fa06d235043e85ccd6" PackOffset="2096460" />
     <Blob Hash="3100b6f10185f8f35939db9e4f101f49f936cc86" Size="1150" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1996678" />
@@ -44291,11 +44191,11 @@
     <Blob Hash="3135d019609961aa7b7563c0ec54ecaa4b9ba699" Size="5202" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="741509" />
     <Blob Hash="3135eea0dc64b2f0422b8e2186835445679f7ddf" Size="8841" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="656508" />
     <Blob Hash="3137e5740b0e4a790fbcdb553ee18e7548774ca6" Size="189" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="516877" />
-    <Blob Hash="313d14d8b2666b2da644f90cc484dc572b701886" Size="815" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1425045" />
+    <Blob Hash="313d14d8b2666b2da644f90cc484dc572b701886" Size="815" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1874098" />
     <Blob Hash="313d4ae87f3e84cf8b6ad1499f762c5776df135d" Size="6678" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="468763" />
     <Blob Hash="313da8da08c06c79235a23b5537877f4c887e7fe" Size="43609" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="502177" />
-    <Blob Hash="313e7cf7473fcf7867c822078b4047e8a4ab761d" Size="132578" PackHash="b911df4ae64ab3f8f9aa7c7cbaa8b0d078cd39f3" PackOffset="1736088" />
-    <Blob Hash="313f4578ce8795d50d47e48c67842e1f05797403" Size="29683" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1866580" />
+    <Blob Hash="313e7cf7473fcf7867c822078b4047e8a4ab761d" Size="132578" PackHash="2e859b9ceef48f55e7e7f6c05869680f93148f93" PackOffset="1627609" />
+    <Blob Hash="313f4578ce8795d50d47e48c67842e1f05797403" Size="29683" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="1947236" />
     <Blob Hash="3140bdec5641d14221f21a791b39541fb021b1b0" Size="10128" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="610328" />
     <Blob Hash="31472f5628f8cb3824f11d061244824331da7e47" Size="2807" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1135811" />
     <Blob Hash="3147bde25e436c9463a2915f0aceca339d088864" Size="15360" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="803336" />
@@ -44315,7 +44215,7 @@
     <Blob Hash="316620a3f5439d66d500df769d1fc28df3af3fb3" Size="264" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="143950" />
     <Blob Hash="316a58b6ad46550eb3bd9e805870706e25867e21" Size="5622" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="590876" />
     <Blob Hash="316afc6c05ffd148b3bddaed04cf8742be5fd54b" Size="4226" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="956666" />
-    <Blob Hash="316f8b0b12e6d36b3f66f59bcffec94eaf5e5590" Size="353" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1608017" />
+    <Blob Hash="316f8b0b12e6d36b3f66f59bcffec94eaf5e5590" Size="353" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1727249" />
     <Blob Hash="3172ed08b2cacc13eb887d29bbebaa02f3420ec3" Size="220" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1812616" />
     <Blob Hash="31739926e507f53e4ddb9d309a37f2a3f9721b26" Size="2814" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="705822" />
     <Blob Hash="31756982cc5fec93d4b2c188b3eb095f1942bb2c" Size="13496" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1799772" />
@@ -44327,14 +44227,15 @@
     <Blob Hash="317f899a556be98acf0c614efe3a867673a3d67e" Size="106104" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="758602" />
     <Blob Hash="3186077946b675b81f817eb457a7ba52c0c949cd" Size="162121" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="1180211" />
     <Blob Hash="3188a908092d849d70c31b02df39cae7516303dc" Size="20113478" PackHash="2a0e6634f5f2df2448dd861f9343efe3d6dca71e" PackOffset="8" />
-    <Blob Hash="3188e1f43764f3164c1b7a46741ca91604227143" Size="3264" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1210621" />
+    <Blob Hash="3188e1f43764f3164c1b7a46741ca91604227143" Size="3264" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1655452" />
     <Blob Hash="3188f87a126b979f0b3a1b9e3daef2e37ef0ea85" Size="5740" PackHash="bd780b06eba19a17c46ce7aba89fa66e87bd0cab" PackOffset="2085016" />
     <Blob Hash="31891613416d61551d04b603a77fd8776d316b7b" Size="547840" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="8" />
     <Blob Hash="318d7234201f822c866632d1e10e17170f8dd32e" Size="858376" PackHash="aaf3a012f48b24c193628af42ef3302d96784c3f" PackOffset="272588" />
     <Blob Hash="318f10e3e038620da2b2c1a815ea7865d66c7761" Size="11649" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1173777" />
-    <Blob Hash="318f4f5cd67d17e3350fdd066c2cebb5b173aafd" Size="352" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="2096516" />
-    <Blob Hash="3190b46112903578368d0a58f1857cb8d75d6c27" Size="1227" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1238760" />
-    <Blob Hash="31928437f3b8dee133c8fabe1e2f0c1abfbb057a" Size="9082" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1547994" />
+    <Blob Hash="318f4f5cd67d17e3350fdd066c2cebb5b173aafd" Size="352" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2096636" />
+    <Blob Hash="3190b46112903578368d0a58f1857cb8d75d6c27" Size="1227" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1687662" />
+    <Blob Hash="31928437f3b8dee133c8fabe1e2f0c1abfbb057a" Size="9082" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2085076" />
+    <Blob Hash="31951e66b1c1299d04435dd841f92108783aad1b" Size="2162176" PackHash="22595898f1eb48e14fa3d51be2ab34af5deb56e2" PackOffset="8" />
     <Blob Hash="3198c61c758bde8978c1f71797cecd3b3c9cbff2" Size="1060" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="1724700" />
     <Blob Hash="31994cd4c2da677d027d1f7c91dcf047563a20c8" Size="38374" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="35546" />
     <Blob Hash="3199af5cace65a905e4bbedd7b4e160237057acb" Size="37494" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="829740" />
@@ -44345,10 +44246,12 @@
     <Blob Hash="31ac9cb455836cb9b9eb9cc5862623a3ba1197e0" Size="6483" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="163281" />
     <Blob Hash="31ad05f5e528ab5fe91df14f7a4f551d68c50753" Size="19872" PackHash="54b1f91ec773e40dd9e245020576fe5b2999d4d0" PackOffset="2074860" />
     <Blob Hash="31afea740b9b99ebc8fc297ade690299d146b455" Size="20240" PackHash="a256d63248e60ea748a2577552e6a02d3e75e23a" PackOffset="565956" />
+    <Blob Hash="31b96be5a9bd69d654c6e0a2a7091766111e4c29" Size="3910328" PackHash="54c763f3d19357f4fab6a3044a7d67cc94b4ac56" PackOffset="8" />
     <Blob Hash="31c2469ad2fd2b7b7f63fd8fdbcc2931320df486" Size="424" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2066104" />
     <Blob Hash="31c6a374e4ab96e26fe4f7c8da34d0fcf31302f6" Size="98125" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1884846" />
     <Blob Hash="31c9147eacdee8f18a5a245baf610c5353f0977f" Size="30208" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="875229" />
     <Blob Hash="31ccc128afc3f5b79fcaa5a46931662a4df8814a" Size="52375" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="360497" />
+    <Blob Hash="31ce418c20e1d60f72476a5f9961eae3274c8a1c" Size="127360" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="1919875" />
     <Blob Hash="31cfe4a59267d501e6ddc9c4424de61371e39a03" Size="954" PackHash="09732d6bf762ba4d866616248b46adff0e12d76b" PackOffset="2096136" />
     <Blob Hash="31d2af304318a86f7ac2dfdaeb3a9f15b5244971" Size="1167" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1759846" />
     <Blob Hash="31d493b517de740f5006e4c80ae04f7ad647e97c" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096825" />
@@ -44368,6 +44271,7 @@
     <Blob Hash="32140e1d22c597959c430c1afe7c918af1dcb6af" Size="9795" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="314849" />
     <Blob Hash="3214238703db15cf2d6302c7445a394c5cda1df0" Size="13824" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="1804864" />
     <Blob Hash="3214fc73bbd2389e756dc34cd13fa40155746776" Size="13824" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="2074120" />
+    <Blob Hash="32151486a01e405761c95a3917aa3ee47d4f83a1" Size="1147938" PackHash="8e3f307bb80f932a91768170722593196cf9c0d3" PackOffset="8" />
     <Blob Hash="321e578ec8b07fb8f9ee80eee474257bec1305a2" Size="9496" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1194918" />
     <Blob Hash="321ee9c3b2c460c68e262284f09d9e0412527665" Size="456" PackHash="56ad07543c03a217630a832be8abe7b278adfbc4" PackOffset="2096624" />
     <Blob Hash="321fbc9e69824ec2b46faa101f0ec9e376477af7" Size="38157" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1099040" />
@@ -44378,7 +44282,7 @@
     <Blob Hash="322e689cedb8514878d92bf6e4dca9db3b4795e7" Size="88" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2087524" />
     <Blob Hash="323101f7dfb753786ce0388b8ff6f12d06524bb5" Size="1672" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1143947" />
     <Blob Hash="32350cd43f186c067b73e972d354c9b468cf09eb" Size="256" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="61951" />
-    <Blob Hash="323e4aeabdb343d8ed143ccf2d5a4414e2f4dcb8" Size="225" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1611700" />
+    <Blob Hash="323e4aeabdb343d8ed143ccf2d5a4414e2f4dcb8" Size="225" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1730932" />
     <Blob Hash="323f34a08c556c34c491a71ab56e209f8aae5d74" Size="144147" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="798756" />
     <Blob Hash="323f4147eb466eb5f4aa84e5c38330f6ee137483" Size="14782" PackHash="673cd162413f6198a7b19aa631bd9739afdc2d97" PackOffset="2038836" />
     <Blob Hash="323fbccb5fb182f75807a54dc40eb068e60d5e44" Size="5952" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1959302" />
@@ -44407,11 +44311,12 @@
     <Blob Hash="325d6589b97c4063e613c9c1ffb38d8b672872d2" Size="46553" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1190353" />
     <Blob Hash="325dbb33191a56e003a31d5be2ee85d08b2e1a53" Size="10635" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1728553" />
     <Blob Hash="325ff451419cda8889e01dcea35aeddf95155934" Size="120" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="202463" />
+    <Blob Hash="32651649598b2abdfd6a86f94725c7984ede3e9d" Size="8726824" PackHash="c057168268be0c71b44ba5858cab2058329c5191" PackOffset="8" />
     <Blob Hash="32672f09a71c8f0bbbf76b4c8034e3cb6c7a245a" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="625239" />
     <Blob Hash="3267fa598333766c37a7ea5640da8b7216c3fcbc" Size="72543" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="543531" />
     <Blob Hash="326964f3b5b253f4a95cae5df278a1c77e4a8fb8" Size="69632" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="1844744" />
     <Blob Hash="32698bd1d3a0ff6cf441770d1b2b816285068d19" Size="65536" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1552875" />
-    <Blob Hash="3269e231cd6409c77537c18bd03438a6167ba504" Size="332" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2064898" />
+    <Blob Hash="3269e231cd6409c77537c18bd03438a6167ba504" Size="332" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2084906" />
     <Blob Hash="326c4b13ba7dce33eaad7fbe6c0b17b4ff6c8d20" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="638618" />
     <Blob Hash="326d4103f657919048456c78b40f9e942277205a" Size="3425" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="962640" />
     <Blob Hash="326f7314ecd73718c7ec185a8bf8b622b78a3670" Size="350" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="808179" />
@@ -44421,10 +44326,10 @@
     <Blob Hash="3278b8896acf0bd8bb45d93870302604c0c65164" Size="35422" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="422837" />
     <Blob Hash="327b851510b0e5863302f117a55f36454c60b029" Size="212" PackHash="b76d486fada8c753603e4d514d4980ee46190b33" PackOffset="5071" />
     <Blob Hash="32823a5123e182d3b11e15ee74764aaecf784018" Size="4446208" PackHash="311d9931051f3cac3bcd4fb51fca6cb2abfdfa41" PackOffset="8" />
-    <Blob Hash="32855959f3a4a9868c130315c64027cdd39b99a3" Size="3737280" PackHash="122452a137c024d8c707aa25425fc869781dd9e3" PackOffset="8" />
-    <Blob Hash="3286ffecee8543f2e09483054bd898a483889b2a" Size="2653" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1779209" />
+    <Blob Hash="3286ffecee8543f2e09483054bd898a483889b2a" Size="2653" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1794975" />
     <Blob Hash="328d56c1e118005b3fdc0b6139fcad727310b6f0" Size="36337" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1415237" />
     <Blob Hash="329a59231b90326820711b389ac3b0c0d75f746f" Size="204" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1849259" />
+    <Blob Hash="329c17f10834173dad1e4a444642d270e16a1413" Size="1499832" PackHash="63d57bc7338d3f2c7d705c91585c8a1688cc8906" PackOffset="8" />
     <Blob Hash="32a0acabd07cdc64c63b024b4339703a5af095c6" Size="118401" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="975766" />
     <Blob Hash="32a3dc9e1aadd197b8e5c94cddeb362e1b56f3fb" Size="4727" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2070180" />
     <Blob Hash="32a70408492fce016daf13302ec63d4cbd5399f3" Size="20480" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="397320" />
@@ -44433,10 +44338,9 @@
     <Blob Hash="32aa0d038dd1e3a4c4e8ecc3c14733c6f54bef3b" Size="38915" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="1737106" />
     <Blob Hash="32aed4a93fc295833d5193b817efdfaa2e56cb03" Size="100781" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1767945" />
     <Blob Hash="32aefecf46458f02c575fdb0aaf487d31339edc0" Size="231" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1354661" />
-    <Blob Hash="32b00192cabb61d0635aa9d919f4aedd141c9f26" Size="8688456" PackHash="ba65258f8e421c9e9d4f1b4a8e307fb2910959c6" PackOffset="8" />
     <Blob Hash="32b100f889e82a269502b6ef1050eefb0d2ac0e2" Size="2802" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1975392" />
     <Blob Hash="32b164c5ac0056a36bf393094421feb176062d18" Size="126" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="439893" />
-    <Blob Hash="32b1dedfec5ea50bc50a31e2f13a881ff3614afc" Size="2713" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1949548" />
+    <Blob Hash="32b1dedfec5ea50bc50a31e2f13a881ff3614afc" Size="2713" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2077602" />
     <Blob Hash="32b20dcf9913a16868341859d54ef9548d3d0f84" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1187264" />
     <Blob Hash="32b68bcad51f54ec96a21ccd106255c6ffff39b9" Size="2659184" PackHash="ad0cf4510503541ea353d88c573bc6a79f2142da" PackOffset="8" />
     <Blob Hash="32bd7b3017f7108a43f9bfc1b97734b6767a3105" Size="271" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1564337" />
@@ -44449,6 +44353,7 @@
     <Blob Hash="32c3ef4168a809b6160400450bafef757d2700d3" Size="214732" PackHash="fb8c31646887718de45e229d7015c658f3c1bf5e" PackOffset="723790" />
     <Blob Hash="32c4061e5d71e675c85839006a1cda6e48deede9" Size="271" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2047422" />
     <Blob Hash="32c4dbd9dcc52c2a4bdf74d9cbe878b8fb70aa90" Size="7341" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="2076078" />
+    <Blob Hash="32c4f73e142615b27bd4c158eab153fe27d69c6c" Size="179290" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1664286" />
     <Blob Hash="32c7da3778d7f2da683eb30eeeeccbacc8e6f19f" Size="32" PackHash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" PackOffset="2097124" />
     <Blob Hash="32c974bcceaad45816ddcc03b7fa2d8c7a9fc91a" Size="240288" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="224707" />
     <Blob Hash="32cdfb85d7fbee688e9f8494de8b1ee4fe616144" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721511" />
@@ -44471,10 +44376,9 @@
     <Blob Hash="32ed715f8846360b5dbffd61e6470e6974e748ea" Size="107767" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="1490400" />
     <Blob Hash="32f0b4cd1a29f987a213260906ae8c79510b8c2b" Size="1355" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1837822" />
     <Blob Hash="32f9c882d148bb9568f719099b3dce25b53fb43c" Size="7035" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1684497" />
-    <Blob Hash="32fc26539ab714c0b3171b01422c0cd3119f48e3" Size="560612" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="8" />
     <Blob Hash="32fe5f88ed297b2656c8cde0d098ecfe401635b5" Size="8326301" PackHash="dbe75239cd713a39f272a0de6cac2dfb95039ebb" PackOffset="8" />
     <Blob Hash="32ffce66e4a4ee235462de06ddf49348062b9649" Size="151235" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="1721928" />
-    <Blob Hash="330103753b09e319bd04802cab39c91c0171dd70" Size="5072" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1983957" />
+    <Blob Hash="330103753b09e319bd04802cab39c91c0171dd70" Size="5072" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1925079" />
     <Blob Hash="330448b0ccf93dea5a4a14ad0185eb131d37529c" Size="6338" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2019023" />
     <Blob Hash="3305e072e46cef5400fd548309917ec9bf781912" Size="19623" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="504831" />
     <Blob Hash="3306844e0cb2c5483dd532d280912d8fde0ec456" Size="348" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2022144" />
@@ -44484,14 +44388,13 @@
     <Blob Hash="330eadc19ddeb318b0740ce8f5e180f7078f18a2" Size="3038" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="34669" />
     <Blob Hash="3313f8a3be6c12c72f8d304e9713de46c8475087" Size="9622" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="2080901" />
     <Blob Hash="3315f5d56dcab819ef2f65ca1f843657dc354256" Size="30661" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="687669" />
-    <Blob Hash="331623f5ca85e549c55069829eebd4e66704ed14" Size="170110372" PackHash="8108e1fe719b49a68115d9d1a3ed00d1787bf925" PackOffset="8" />
     <Blob Hash="331752d35888e63a5cf4092064cb53fcb7a098d0" Size="154" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1608954" />
     <Blob Hash="3319a1ddf837b73565f20b24b048d410cd18babf" Size="3054952" PackHash="e2e2347e195fcb6908121d1d8252b675c0225733" PackOffset="8" />
     <Blob Hash="331d84f2ef6fd97d525582a2ebab4ea9f91cdb10" Size="242" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="187959" />
     <Blob Hash="331ebd15da3a81dcc6edae6e203df382fdcbb491" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="466183" />
     <Blob Hash="33250fcf355fccede2ab57c722b7178ec4687642" Size="3052" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="227681" />
     <Blob Hash="3325726ccbdc9a63f1398b7c314a3ff75ac54165" Size="271" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1473761" />
-    <Blob Hash="3327e217d5db06456723aceb020e701128a76cfa" Size="684" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2025165" />
+    <Blob Hash="3327e217d5db06456723aceb020e701128a76cfa" Size="684" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1915376" />
     <Blob Hash="3327f2b6fc4839ebdcae8278c7ea2e454deac533" Size="18528" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1925512" />
     <Blob Hash="332828f64d2005804808f75306cef17f4f6e2621" Size="94366" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="1704565" />
     <Blob Hash="332936899bb3adc594f5dbdc90ddbb9f199dafce" Size="6814" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="468416" />
@@ -44502,9 +44405,10 @@
     <Blob Hash="333e0f67b1f2313a4da7f516097cf2e50bc7521b" Size="686" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1282133" />
     <Blob Hash="334203a82cf834f3aaa1fbc2900ba97770b4e233" Size="12739" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2068118" />
     <Blob Hash="33435f6ee63e194011ea1c8ce5813f8bb12c6aae" Size="61021" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="202553" />
+    <Blob Hash="334854461e9972049c640a91910c0cd5654ea5a7" Size="200198" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="8" />
     <Blob Hash="33485ba9224f4225ca440ad8db4c8d00dd15c43c" Size="679" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="452260" />
     <Blob Hash="334881f08c536ea36eda503742ff8ec0af9622fe" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="219813" />
-    <Blob Hash="33508f70a4c834fec53dc7eb6b15871d2f7fbc1d" Size="22917" PackHash="9914ebb44e7e5640a37d1eea68fd99aec8f8aec7" PackOffset="2069184" />
+    <Blob Hash="33508f70a4c834fec53dc7eb6b15871d2f7fbc1d" Size="22917" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1524892" />
     <Blob Hash="33543a238d46ba58fe542c97f1e1c74a7579d09c" Size="638" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1977933" />
     <Blob Hash="33567af47a56b31160cc31872ed2ab214260d8c9" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1037684" />
     <Blob Hash="335729155c80d92a5087dfa5d7df984d4b46ed89" Size="1235" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="451703" />
@@ -44517,7 +44421,7 @@
     <Blob Hash="336b636f6cd85abe438ead0f0c452b46d9a7764e" Size="56492" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="1906024" />
     <Blob Hash="3372ffd4de1c212221d01caff8da23753b0ab920" Size="3066" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1201467" />
     <Blob Hash="33779292cdf194363a1137dc0d30dfa17dc27c30" Size="20780" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1187464" />
-    <Blob Hash="337a093949d6d354b3d85e3a1897e3387c707bb0" Size="758" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1420390" />
+    <Blob Hash="337a093949d6d354b3d85e3a1897e3387c707bb0" Size="758" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1869443" />
     <Blob Hash="337c571e7574ebc43ee5a9999c858cbb10e34075" Size="4286" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="9726" />
     <Blob Hash="337ce4580c9b2873330b7003a7dd598c5f23bec0" Size="5412244" PackHash="30c853f7b6cb7d3667f78239b253f855b63711ef" PackOffset="8" />
     <Blob Hash="33826704683355596ededb774162b1ecec22ac1d" Size="9256" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="136064" />
@@ -44529,32 +44433,31 @@
     <Blob Hash="3396b56ab6b16d4b79866a99b74a59f07b8c9475" Size="92677" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="1593745" />
     <Blob Hash="339f45e253c9e13c98d5103930f1e03f17dac89c" Size="18658" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="382732" />
     <Blob Hash="33a128fd8f2e53c7f2520122aa746b6f5142d6be" Size="593631" PackHash="6b0f64a3a5090f00c5d8405cb5c1684a396951ac" PackOffset="8" />
-    <Blob Hash="33a2744a7047212a051359be4a670a2047b6fc41" Size="6737602" PackHash="a1e8a28aab5ff7e6491e3c1967d758d9e0895e6c" PackOffset="8" />
     <Blob Hash="33a4884343a38e9ff4da90c94baa46657078eed2" Size="1723" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2094310" />
     <Blob Hash="33a5e4efedc0c0c1d7049289de5c62f7bba29c29" Size="41629" PackHash="53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" PackOffset="898390" />
     <Blob Hash="33abb1b426d66d3ac3dbb992d1d57f7aa57d9b03" Size="99485" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="8" />
     <Blob Hash="33b3a57237fb229ba24a2651cbc5a315f8d1b952" Size="2814" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="852939" />
-    <Blob Hash="33b9e2ef4a0ad66fa3a37e7a45bb5ab178330689" Size="14880" PackHash="fc72e25fae938ebaa984b54bd0d8766882030b42" PackOffset="2074684" />
     <Blob Hash="33c14d0ff38c183925ed64092d7cdc9a1aa83e09" Size="177" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="387023" />
     <Blob Hash="33c29d3d787a3efff782d35b7cc83bd7ce81294f" Size="362136" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="1237790" />
     <Blob Hash="33c434b1c76c481458dbbdabe0167e2943196190" Size="1147760" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="8" />
-    <Blob Hash="33c4e0c1d313691964385523e609c7e3e90977ea" Size="15086" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2009096" />
+    <Blob Hash="33c4e0c1d313691964385523e609c7e3e90977ea" Size="15086" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2040182" />
     <Blob Hash="33ca89d981895d0daf463ef02fce9e0d70be3638" Size="9520" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="2041694" />
-    <Blob Hash="33cd1b769d099dbaf61ba47038b42f21f5a7ff17" Size="92930" PackHash="3407b695bf7b722711de14f998e247a6aca6b747" PackOffset="1992178" />
+    <Blob Hash="33cd1b769d099dbaf61ba47038b42f21f5a7ff17" Size="92930" PackHash="fc21197f05ffa1e1cb73441cb5cb45012227bfee" PackOffset="1991568" />
     <Blob Hash="33d06a968f04cb25e46fbf1022fd44ac4911fd57" Size="16017" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="65835" />
     <Blob Hash="33d2d64d91e6eb9aa26c2d1e745fdaf93f71051b" Size="3975" PackHash="908ab3d68a65d4d823608b2ddd04dd8a6d70cebc" PackOffset="2090887" />
     <Blob Hash="33d4f59c2e46b8b97e90486fdf6b051fca7ee2c4" Size="3899872" PackHash="ea11508ef61cc1bb97bc48294aaa21c81dfc25b0" PackOffset="8" />
     <Blob Hash="33d4fcacde0d9a1022bec465e01bd1f457c16443" Size="73551" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="1661347" />
-    <Blob Hash="33d8b48d38a9db18c29821f96299bd65d9e13df9" Size="674" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1072459" />
+    <Blob Hash="33d8b48d38a9db18c29821f96299bd65d9e13df9" Size="674" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1242493" />
     <Blob Hash="33d98273ae5188bfcb91b499beaec0945830cb68" Size="300" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="355646" />
     <Blob Hash="33dc58aacc4a687d63471e29c9ccb9c464ccd796" Size="5426" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1625168" />
     <Blob Hash="33e30398e85b877227a869388d7504b024acc9a3" Size="88518" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="8" />
     <Blob Hash="33e6b8f40010c66bf04d4c58eef9085d37c9d0bc" Size="39545" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1321080" />
-    <Blob Hash="33e878f914688d0b936f25a0e601d88df56e980d" Size="104" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="2097041" />
+    <Blob Hash="33e878f914688d0b936f25a0e601d88df56e980d" Size="104" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2097029" />
     <Blob Hash="33ea89d54a9d1fd5c2f09a5956be23051a96e8ca" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2087396" />
     <Blob Hash="33ef1925ff690106e3c45be35d67800443a32271" Size="15872" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1896071" />
     <Blob Hash="33f14697b9abb0153c991aa99ad4e2576eb38e5c" Size="284" PackHash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" PackOffset="2096349" />
     <Blob Hash="33f41acc6c44f8d1f309688d1cb2d35ab616eaa1" Size="4106" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2073472" />
+    <Blob Hash="33f4cbbb9d813dbe7013f29a8d93f599ff338326" Size="1611776" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="8" />
     <Blob Hash="33f793fd6a28673e766ad11ee1cf8eb8ef351bc0" Size="19136" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1940648" />
     <Blob Hash="33f7a443af6c0a7803e85b1e1d01a65b50627615" Size="754" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="397941" />
     <Blob Hash="33f7c7318b0c8ac6576be8d49dec2634ce083edc" Size="44537" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="601070" />
@@ -44565,17 +44468,16 @@
     <Blob Hash="34014a93b825dd128925c4008ce0e79e7990626d" Size="595" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="270622" />
     <Blob Hash="3406795005282fc3e30454c2452d995513134160" Size="1974" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="694206" />
     <Blob Hash="3408cf8f3deaffe9a6970a7b761efb75fa8ad8e6" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1768136" />
-    <Blob Hash="34091df34137a0efbbcdb9a6b32a5d7df8c744cc" Size="12935" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1733619" />
     <Blob Hash="340987f6976a9b4395b29dba99568c98fe02b6d0" Size="91199" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="224689" />
     <Blob Hash="3409d6a1a661a4cd5810168918e21dd4ac25b093" Size="7776" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="297444" />
     <Blob Hash="340ec9c1ec154d4c12d7a06a8cc07336ea3911c5" Size="3161" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="168279" />
     <Blob Hash="340f6eb63fd3fbe4979c2c684bacf026c752c8a8" Size="354304" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="32264" />
     <Blob Hash="340fbdf56cb21a09b5f535ef30774beac14fc928" Size="2390" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1917466" />
-    <Blob Hash="3416a09e80a2e7b2c1065ae41a670f8d2965eb35" Size="1089002" PackHash="8fa3b7b9dfcdd86814c8d31b88442e487b319bd9" PackOffset="8" />
+    <Blob Hash="3416a09e80a2e7b2c1065ae41a670f8d2965eb35" Size="1089002" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="8" />
     <Blob Hash="3417bf7dc4f23cf2b2eba529d94c1d2b96e0ae7f" Size="72368" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1933454" />
-    <Blob Hash="341af608ec8be742836b8d7e4748bef7659b6e8d" Size="254110" PackHash="772be2a1b26f994f4af5928b9a48434ff28b41b2" PackOffset="1763290" />
     <Blob Hash="341ed5ed8c9c5bcba3465477c13523b6f15c63fa" Size="23495" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721655" />
     <Blob Hash="341ee7e9c2e85271c2a74018771a2ba4d4914bd5" Size="5632" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1228578" />
+    <Blob Hash="341f9ddeda5a0b5714652a39964111028b9e3902" Size="76592080" PackHash="2d0cd957c5df15c5aa81f9a307736e1cf58a5165" PackOffset="8" />
     <Blob Hash="341ff8ceca9793ce54de9f88d1ee31faa83f0556" Size="83760" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="1794056" />
     <Blob Hash="342297feda88f70d48209b9e832fa2a30b69bdb8" Size="946" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="577263" />
     <Blob Hash="34268608f7ad75ec1a0c6cd4eb3a39781ea8f28f" Size="13304" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="735040" />
@@ -44608,7 +44510,7 @@
     <Blob Hash="3466ffd716598708dea6f2103b59c27823619286" Size="6747" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="2078020" />
     <Blob Hash="346741f91e64f6cdb90acccedcded0fe48f23e62" Size="20340" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1123596" />
     <Blob Hash="34688a0fb4ca310116b28b4e65831ef393d8f294" Size="727" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1313308" />
-    <Blob Hash="346a9b1f4db174477c2289c57c591720d467c061" Size="4096" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1108476" />
+    <Blob Hash="346a9b1f4db174477c2289c57c591720d467c061" Size="4096" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2054492" />
     <Blob Hash="346d1adeeb49f094d28a3238e4f9c073a2425f4f" Size="2216275" PackHash="beb291b3d9800b1c4c17797e20923cb2d5fb9439" PackOffset="8" />
     <Blob Hash="3470da20ad90aa7e704e823255f224aa30e71db3" Size="143" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="358244" />
     <Blob Hash="34713f52023a61c445624aa735fc1db009739b2d" Size="1296" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="833661" />
@@ -44618,13 +44520,12 @@
     <Blob Hash="3479b963bb39563c19ef7da35a894c6aa28767ca" Size="146346" PackHash="0851da62d0e5f3dd0e00512bd0e43cf65963ca41" PackOffset="166495" />
     <Blob Hash="347bd576c195cb58ba49cc163c2950ca7524b157" Size="225" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1874567" />
     <Blob Hash="347f8128f6d2e2b8cc8a12d6a70648f684114094" Size="14848" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1222664" />
-    <Blob Hash="3480c8de2be253ab79264984bb5221b7b1a18221" Size="14040848" PackHash="480712d04fe4475658a3fde6e2f9b8a8d9e326c6" PackOffset="8" />
     <Blob Hash="3488d72e630779ce57822c3c206b42385e6f1541" Size="68608" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1146485" />
     <Blob Hash="3489c36be5b19feea10c42c8dc68417f45222b09" Size="3112" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1742426" />
     <Blob Hash="348a7dccd5002285854101aac90946cc17a23f4d" Size="13312" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1134456" />
     <Blob Hash="348a81a5d537d759b5db7c1713f0fcda6aaed47c" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097140" />
     <Blob Hash="348cdbed80058f61ec095b657e22fe215373a30c" Size="574" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="249016" />
-    <Blob Hash="3494cdcee9a147092f393329001619d45d471bc5" Size="371" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1341962" />
+    <Blob Hash="3494cdcee9a147092f393329001619d45d471bc5" Size="371" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1790864" />
     <Blob Hash="3495df9d6d2563147a0d709c7104f3e6d44ab38c" Size="18428" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1968552" />
     <Blob Hash="34967af967eee42c4d925f9e4d546397cf4a194d" Size="1478656" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="169992" />
     <Blob Hash="349809a18086d81e542b71367ad37f0e8cc7d5ce" Size="1489" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1326856" />
@@ -44635,7 +44536,6 @@
     <Blob Hash="34a351ce824e3a280aa7066ee7289cd671e0278b" Size="6110" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1555202" />
     <Blob Hash="34b1bf1fa33aefad4c6d459d2b68dc8aa3b857cc" Size="1859" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="272448" />
     <Blob Hash="34b8f625347cb225deaaba133fd8ba8900f0928e" Size="21482" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="535084" />
-    <Blob Hash="34b960167a6a7fecc8e333041827a397f92d5097" Size="88166" PackHash="ea39a3af16b4dc43d157490fb9de27c641489d45" PackOffset="1801665" />
     <Blob Hash="34b97342a032e1dcf8afcb7004c657d04832a4e9" Size="268868" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="8" />
     <Blob Hash="34bc2f418d95986b8e14ee5cce466be351fbaa03" Size="221" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="212222" />
     <Blob Hash="34bce355fcead6f06d400b1e6843b61fb35b519f" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1093672" />
@@ -44654,9 +44554,8 @@
     <Blob Hash="34de69e6bf7769f96b01df03e4497753cf17cb88" Size="9627" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1700174" />
     <Blob Hash="34e04c0a0e0d139deb4327c775244c820ae1fcc7" Size="2311" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2078448" />
     <Blob Hash="34e3a8920bf6a653c55b9eaf7336e8fc5af1b088" Size="14848" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="397320" />
-    <Blob Hash="34e888fbda89a72740a5dff26f3a185a66ad5930" Size="2420" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2092756" />
+    <Blob Hash="34e888fbda89a72740a5dff26f3a185a66ad5930" Size="2420" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2069708" />
     <Blob Hash="34e93903f1019915793967b945798cb03cf5afb8" Size="2400" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="575392" />
-    <Blob Hash="34eb0ccf4667f521a66b8510293e18f61f3f34f0" Size="37247382" PackHash="4dd6f5ad72ee50340f47bab3dbcdf03118f807d2" PackOffset="8" />
     <Blob Hash="34ecd90be5ffb01a9df4afb11dd68d3e6353c709" Size="88" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="2097070" />
     <Blob Hash="34ece01f4c242b7a35e4559a1e7b5ce000cf9ef9" Size="232192" PackHash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" PackOffset="1400630" />
     <Blob Hash="34f008ef69fb769e868443bdd33f243bd151ea24" Size="35195" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1932941" />
@@ -44664,17 +44563,17 @@
     <Blob Hash="34f059d084ad1a25ba14e6a606d2d62bb8ba25c1" Size="2992" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="642674" />
     <Blob Hash="34f77170b779d8c49f90c8573892843e3aded264" Size="2543" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="192188" />
     <Blob Hash="34fa9465c78752e6e69fa50c51c8e356b77100ba" Size="83237" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="205344" />
-    <Blob Hash="34fb2f2b10f0f7cea7bf1b7fa465bf51e844cc4c" Size="2226" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1351441" />
+    <Blob Hash="34fb2f2b10f0f7cea7bf1b7fa465bf51e844cc4c" Size="2226" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1800343" />
     <Blob Hash="350020e82c5e3e13cea2a6523088213202e8ec15" Size="654" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1781445" />
     <Blob Hash="35005f5549e2583f5770590135984dcfce6f3d58" Size="850208" PackHash="a260cd8d85a752caa55d8857af979f5ae8a68d97" PackOffset="8" />
     <Blob Hash="35060b8dcfc3890d5efa1595c89851b010a7bca7" Size="101919" PackHash="66f3a69afc09dae5b1c60855f816c149a2ea7bfb" PackOffset="232187" />
-    <Blob Hash="350b0a18aad38eb2a51d069f3663512cc5fa14ed" Size="684" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1592062" />
+    <Blob Hash="350b0a18aad38eb2a51d069f3663512cc5fa14ed" Size="684" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1711294" />
     <Blob Hash="3511ff5c1647150595846ac414c595cccac34f18" Size="1483" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1625814" />
     <Blob Hash="35178a2d7c4675ed35b412af2213c419f3301ac3" Size="1652" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="551357" />
     <Blob Hash="351a1b70c6bad4defde4b23d12cf2c9c8c8be6e8" Size="8310" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="628301" />
     <Blob Hash="35226241b6c8619ca3010822f7a3e03285cebe6c" Size="14208" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="296370" />
     <Blob Hash="35229e653c500c1ea51174be8c4a6f20f73267e9" Size="40848" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="44952" />
-    <Blob Hash="3525c4686a6725fc9c61e3e813eab94b410ebe7c" Size="6870" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2052266" />
+    <Blob Hash="3525c4686a6725fc9c61e3e813eab94b410ebe7c" Size="6870" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2086691" />
     <Blob Hash="352b8010abdfd96ce36f31f352e52c32e29bc788" Size="14999" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1435900" />
     <Blob Hash="352cb42023ff98a992ea767f4186bfb0dbfd5c17" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1926861" />
     <Blob Hash="352f851aa0fb2c834e19977efda1564ef1d7f78e" Size="112" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1700492" />
@@ -44687,17 +44586,17 @@
     <Blob Hash="3540181b56e3c1def4720fcbbebba3aaadef9353" Size="7341" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1541533" />
     <Blob Hash="3545482c901000b300cec3bfc4e5511d6f708b5b" Size="796274" PackHash="618449250b93c28bb8f15751ff6bb653143e5ff0" PackOffset="1054389" />
     <Blob Hash="35467bc2eb156d3ce3e2d0ee1cf1c912e985d513" Size="175" PackHash="061feaf0a3f0d9f379cc7d1dc90e7865fda457d1" PackOffset="2096899" />
+    <Blob Hash="3546da27acf0cc49d0d6d2947a22aa7a7968c0ae" Size="5165632" PackHash="3362bc37abc9c08ccd2012a805c06e65cd75c5ab" PackOffset="8" />
     <Blob Hash="3547a9a95922499647849648a677cc8d2acb4f02" Size="118123" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1866557" />
     <Blob Hash="3547e631424416ce3b93afb189ebf0683c043c98" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="680240" />
     <Blob Hash="354e101a7c4382eaa8db72096f3579520035f447" Size="38912" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="1956872" />
     <Blob Hash="354e682baaeff6ea3fc00ad337e35a45119de300" Size="2868202" PackHash="47c3dd6d524f1923aa08644c2e4083ced4d481a0" PackOffset="8" />
-    <Blob Hash="35507cbd9d37a60a5f996e0c3cb797cb9eccdf9f" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549574" />
+    <Blob Hash="35507cbd9d37a60a5f996e0c3cb797cb9eccdf9f" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668852" />
     <Blob Hash="35509492cba7fddb6dab4128085f6b9e8441bf82" Size="3214" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2046421" />
     <Blob Hash="35527bba9bd93e936219a5cb07489df0ad79d6be" Size="637" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1564912" />
     <Blob Hash="355488931f176c9c9ca6508363439acd816a3d12" Size="64620" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="638116" />
     <Blob Hash="355495195ea2c1e59ffe3aae58e5fa953e5e39af" Size="5971" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="322447" />
-    <Blob Hash="3555834aacd0c202fabd73d41c176a87f46590c0" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552488" />
-    <Blob Hash="3557e329a82a0994751f3c6d1f898ee9ef1fc2a1" Size="6901600" PackHash="7dca2bd6e88debf4a4edee16fa07758d5c861bc0" PackOffset="8" />
+    <Blob Hash="3555834aacd0c202fabd73d41c176a87f46590c0" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671720" />
     <Blob Hash="35589f27134bd1ae0748000df577f3c308eef878" Size="3213824" PackHash="363c62068c7257d61805bbb2cb98ce6f83c2da7f" PackOffset="8" />
     <Blob Hash="355bee41160a2dcb582bbd52ad257b7736596035" Size="3051" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="243627" />
     <Blob Hash="355cd03c4c3240818a6741c778589a011918aed9" Size="326" PackHash="6efc780c466db7177e8a59e693d673c4f6ddaff0" PackOffset="2096760" />
@@ -44709,7 +44608,7 @@
     <Blob Hash="3574678cb5d3b5ecc41f98850bb6e83c7cdc6b39" Size="1515096" PackHash="5d27bdeb9d64abf65499f00a1952e59a73cde03e" PackOffset="8" />
     <Blob Hash="357497aefc5482d31725f9d269299c021a437316" Size="9512" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="143328" />
     <Blob Hash="3574bf6e925ca41112430b5d81b8a07cd2674aa3" Size="1092" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2083585" />
-    <Blob Hash="357a771daeba4e1ac78a051c78787309caf45630" Size="1582" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1381125" />
+    <Blob Hash="357a771daeba4e1ac78a051c78787309caf45630" Size="1582" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1500585" />
     <Blob Hash="357b65d3820fbc4dfbbc583eb371eb3044e82c05" Size="685" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1325827" />
     <Blob Hash="357b84c8fa89fd5019a9719219edeb187d83b0f7" Size="245586" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="1369462" />
     <Blob Hash="357d5907ebf0500c77c09f3729412102f43e7169" Size="266" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="487724" />
@@ -44723,20 +44622,18 @@
     <Blob Hash="3595df0a196bd46d607688987980f00fad9e7572" Size="32179" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="911594" />
     <Blob Hash="3595e0418c0548f0b863c1f4492464c3820239dd" Size="4956" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1485344" />
     <Blob Hash="3595fb99847ef9a64907097c8820fce2e992fc70" Size="2814" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1765029" />
-    <Blob Hash="3596847caa75b37624662fa96333d83b77d9dc77" Size="332084" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="1587720" />
     <Blob Hash="3598d3eaf258077f0ca462bb2a65e2f3c87bc0d9" Size="192512" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="1762844" />
     <Blob Hash="359968204b025cad89274f78dc621069b346a711" Size="424427" PackHash="183546a339ebc6cbda54cb8ba6beccec1dc9a02d" PackOffset="8" />
-    <Blob Hash="359cd4d95deafd38c72c6e73546727af287eb86d" Size="7924" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1667624" />
+    <Blob Hash="359cd4d95deafd38c72c6e73546727af287eb86d" Size="7924" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1683449" />
     <Blob Hash="35a14682f32167278ceaba51b3edb82c3db3270a" Size="1131031" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="565510" />
     <Blob Hash="35a4e87e91e8e8616a84c04bb4ed3db398dc1df8" Size="8572676" PackHash="811edfe694b7d1e14c43c90c20f6e697d97b0f9a" PackOffset="8" />
-    <Blob Hash="35a54c4e3302c17c4b71dea7964d9b8cee0731a0" Size="244736" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="1805356" />
-    <Blob Hash="35a617da85b46746fa6674daa80656b2facbd2f9" Size="65" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2097042" />
+    <Blob Hash="35a617da85b46746fa6674daa80656b2facbd2f9" Size="65" PackHash="0a5f18beec683918579defc535c5cd097d71f4e6" PackOffset="2097060" />
     <Blob Hash="35a95fb11f5247f8642f4a8136c10e0068756de6" Size="20476" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="18848" />
     <Blob Hash="35a9c06a8fe6126af658cd0d386b5ab69c87d0f2" Size="3874432" PackHash="845ed53afc1290397fec3abf061fc285e9999f6a" PackOffset="8" />
     <Blob Hash="35aceede507eae8a795e7445519977d462b0c2a9" Size="3462" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="606597" />
     <Blob Hash="35af2fa99644781468caa2cf7a569c9c32f993f3" Size="99648" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1994218" />
     <Blob Hash="35b0254cff7873311b71e00d86bc469930eab4ce" Size="2797" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="918317" />
-    <Blob Hash="35b06338b66cd25def9576cf3bebe936797df7a7" Size="4103" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2084489" />
+    <Blob Hash="35b06338b66cd25def9576cf3bebe936797df7a7" Size="4103" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2087922" />
     <Blob Hash="35b17f6479e75d2976df49a6e28c074dd5a445f0" Size="149" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="2096983" />
     <Blob Hash="35b81b3c0a5a08d6dab15232fa346521d7f6612a" Size="285" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="374958" />
     <Blob Hash="35ba90b27d138845e40c5d183dcba26058603dc2" Size="2684" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1587236" />
@@ -44744,12 +44641,14 @@
     <Blob Hash="35bbfc4b9acb5196521f41e08a96a0bcb89cdc9e" Size="3382" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="290676" />
     <Blob Hash="35bd6492ff0e447842326ae72bc205fc96b1f903" Size="149946" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1869077" />
     <Blob Hash="35bf355ab2ab62ab8942853084dc6121bfadc09d" Size="1206" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1842376" />
+    <Blob Hash="35c5b02e96935066ded91d5d33a921940ae12a16" Size="12302490" PackHash="28b4c60ca1457e18c59ad75b677738358200e7b1" PackOffset="8" />
     <Blob Hash="35c694e90577f7295d1301260350e2cdf1b791a8" Size="36152" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1391824" />
     <Blob Hash="35c7219a416b2a2d5e7876f6f9973e2cf4460b28" Size="26598" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="2047472" />
     <Blob Hash="35c735d60dfa9b7c9c6f2b03241a49cd2fd0eeae" Size="1047" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="230037" />
     <Blob Hash="35c82edb4c4cff55f64614179b4bafa356789a78" Size="1898" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1316870" />
     <Blob Hash="35c85e836c75e64da9ff6097c93544ac084c6759" Size="476008" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="1198056" />
     <Blob Hash="35c9f7e5aef7c6f73dd08995e00bdd33393221e3" Size="5312" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="294058" />
+    <Blob Hash="35ca88585634c8f42c6f85ce9dc5c1b41356291a" Size="71680" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="345608" />
     <Blob Hash="35cc08c52dd28741905d39ff0a7c53ae3d6c66d6" Size="18923" PackHash="1cb0a16db6f4f3cff25cd2585257353b73810e04" PackOffset="1478629" />
     <Blob Hash="35cdc899bc87bf76a17c59ab18cfad438bab02dd" Size="65866" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="1968096" />
     <Blob Hash="35d10281680e397f75f2c99eac2b8c28bd995003" Size="41255" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="210541" />
@@ -44757,14 +44656,14 @@
     <Blob Hash="35d95df990a4ca2e200d229609e3fc090574339e" Size="10240" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="469000" />
     <Blob Hash="35d9a9d33360f0e1b561e8aee9424e0114a30ea1" Size="2384" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1352378" />
     <Blob Hash="35da1e640b01f10bbc94c75c723d3addf8b0fa71" Size="206848" PackHash="b4d8e0b490d2a1157340644482cc429e03d9575a" PackOffset="1876348" />
-    <Blob Hash="35db340e1d5dafd0a1115e27d4a8061148671698" Size="275404" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="1813920" />
-    <Blob Hash="35dc5e58a2cf0b09009d5933d66956d984d46e3f" Size="1055" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1062836" />
+    <Blob Hash="35db340e1d5dafd0a1115e27d4a8061148671698" Size="275404" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="1657802" />
+    <Blob Hash="35dc5e58a2cf0b09009d5933d66956d984d46e3f" Size="1055" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1232870" />
     <Blob Hash="35df464bf38baab9699c2551dac5dac77c22954f" Size="901" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2040298" />
     <Blob Hash="35e16cf01722b0fe65b547f436e8fa57db313a7e" Size="3165" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="151655" />
     <Blob Hash="35e462f531c9e5173183c26dba5a32d4e3f634c9" Size="67114" PackHash="a90123bb85c3d4b8e9fc4d9b4e402d77e3f4092d" PackOffset="1874478" />
     <Blob Hash="35e47495c94ff45b35343be95756496e2ae83d91" Size="239148" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="988313" />
     <Blob Hash="35e5196a69727a432bc387f17aa5a668886b9900" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2093084" />
-    <Blob Hash="35e7230d0763749ef8007cb0d4e1c80ee54be98a" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553226" />
+    <Blob Hash="35e7230d0763749ef8007cb0d4e1c80ee54be98a" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672458" />
     <Blob Hash="35e72673b948dfe0ae44c9a97e0384fb3fab50bd" Size="48718" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2016786" />
     <Blob Hash="35e742f1f1d78ae6e0bdf874d17eb9251ee7fd2d" Size="5325" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1032359" />
     <Blob Hash="35e88c1b6a61c451e8bdd20886580e41abda64ef" Size="115888" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="580575" />
@@ -44774,7 +44673,6 @@
     <Blob Hash="35f3a9485f20c0365c7f6ea6fcbd43b86a690bea" Size="5687" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="98665" />
     <Blob Hash="35f6c066edf5f0cf364c361ca4358916aa4f164d" Size="1473" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="160064" />
     <Blob Hash="35f84ec9771d7ffaea7c05a2a7d59caabfb7f2e0" Size="1180" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1894712" />
-    <Blob Hash="35f9aa5032eba8f9480c45191b2a68a61308c626" Size="1799592" PackHash="8983a85b417d4dfab9181da926c6653da0f6d483" PackOffset="8" />
     <Blob Hash="35fbf1ec39bdbf094060c57d81c834d73fb8a0f9" Size="2020355" PackHash="6028c6247770e169982f50ed839356448f3d93f5" PackOffset="8" />
     <Blob Hash="35fc544abec5ca4dcea3170762a94ea1505b9e28" Size="1596" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="987248" />
     <Blob Hash="360149c40bd4b1e84bd538956e056b46d1c839fe" Size="3433" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="726106" />
@@ -44795,7 +44693,7 @@
     <Blob Hash="3631b1ffe90ce48070068104d0b850695a46d16d" Size="212" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2088152" />
     <Blob Hash="3634693b71ab90b8b3e7f3af863688f4aab2ea64" Size="6729" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2019031" />
     <Blob Hash="36377fd0fda1a2ab8ac7f1577fe74ba62bcd1d5a" Size="297" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="358885" />
-    <Blob Hash="363b76b136a8ff149799fd506578fb7909ccd161" Size="266" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1607751" />
+    <Blob Hash="363b76b136a8ff149799fd506578fb7909ccd161" Size="266" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1726983" />
     <Blob Hash="363d62096298bb44979271c15989217d8d9e6451" Size="4669" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1004075" />
     <Blob Hash="363e1c80eb60f74e628ed0b4026282024467e4b1" Size="1702" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1980799" />
     <Blob Hash="364bf4dc384aae252d4c4db90305e20a38a5d331" Size="910" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="936101" />
@@ -44804,8 +44702,6 @@
     <Blob Hash="364dfe60ae828c9c955d44f9563602462f0bab64" Size="2959" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="668729" />
     <Blob Hash="364e50106cc8498d97b48ea9c6254867d874b3e7" Size="655" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="17290" />
     <Blob Hash="364ebd13b22dbf3c988d34b2f2bafff469aaee77" Size="5229" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1989051" />
-    <Blob Hash="3652d3fbdbc31eabbfea308c4f4fc003e1d03b10" Size="2693290" PackHash="efedfece58a5b9d68bc3e19a99048d8c382c9552" PackOffset="8" />
-    <Blob Hash="365659a8a12d9dbc6f27ada0bd296d5fcdd20365" Size="46442352" PackHash="41285a1c1509b6f4d8d5c829457c338dde5a4210" PackOffset="8" />
     <Blob Hash="3657c25c0140f4b00dd7dfc850fffb646432f305" Size="4391" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2050098" />
     <Blob Hash="36582868e9a635b9177bd9e6971fc0b06db66b84" Size="1021" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="2095629" />
     <Blob Hash="3659ad2316ddf0cd43e48fbc60e27c2792907bfa" Size="30014" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="792330" />
@@ -44814,7 +44710,7 @@
     <Blob Hash="366228f25392708fa799e9cc0830ce9917ef6ca7" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1819910" />
     <Blob Hash="3669a6f65c605d7480808cd64e6b38fa64b08b8f" Size="5311" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="709924" />
     <Blob Hash="366c93fcafaee957a53afe1bfe84200da92053f2" Size="2721245" PackHash="09007b1cd8b9f90a5ab85549323903759f18b852" PackOffset="8" />
-    <Blob Hash="3674a766cde461ed17d66efd39e6efd0b1708e23" Size="6786" PackHash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" PackOffset="2083032" />
+    <Blob Hash="3674a766cde461ed17d66efd39e6efd0b1708e23" Size="6786" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2082608" />
     <Blob Hash="3674b3ca879c1579f0faf1619e3e6dc6f7d0e73e" Size="45747" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="459843" />
     <Blob Hash="3676fba36c333657624eede043e1c695adaa0a80" Size="53751" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1601081" />
     <Blob Hash="36777724c7640180a368ba43ee0eebba5861d897" Size="530" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="769435" />
@@ -44826,7 +44722,7 @@
     <Blob Hash="368597b1fbcd5b86d2bb4efee3eb9c26370ea1c9" Size="9296" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1248662" />
     <Blob Hash="368837e741b097b83af61e8d5f2547dea99567c8" Size="149" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="560226" />
     <Blob Hash="3689877b4e102b80eb08a62b68894d9ba31aaf30" Size="317" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="217140" />
-    <Blob Hash="368eba5becc568b75966dfe8cfce7ac2147764f0" Size="15290" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1261289" />
+    <Blob Hash="368eba5becc568b75966dfe8cfce7ac2147764f0" Size="15290" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2042907" />
     <Blob Hash="36926010187121285d1ba02f415277943fc3b455" Size="11024" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1275132" />
     <Blob Hash="36950cda772a5da64de2d641fe3a12064b708d00" Size="37888" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1540721" />
     <Blob Hash="36957fdb2b7e15c99b2d513d953189cc6fa62e95" Size="906" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2089590" />
@@ -44838,7 +44734,6 @@
     <Blob Hash="36a3a52f2b0251c47ae2b86d510a29ff649c9fb8" Size="34300" PackHash="588da7d9d36957b582f13620b0c6af8de55ff4d3" PackOffset="81112" />
     <Blob Hash="36aaabeb59800a6864c93c88821917ad4934318e" Size="4891" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="368977" />
     <Blob Hash="36ae3b6f4631f5e6ff0d6ab831a1abfe95e99230" Size="102" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="274875" />
-    <Blob Hash="36aeb7774dfc357eeeed14ed9875b0c8a904d4d5" Size="267776" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="1648136" />
     <Blob Hash="36af23887402a5ea4ebef91df8e61654906f58f2" Size="5266102" PackHash="b2f678b145b96d4c37fe0d9b0b12d7769cbdfc05" PackOffset="8" />
     <Blob Hash="36b27393184e04a339de815508033b2f09dc0400" Size="4194" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="858564" />
     <Blob Hash="36b3a41eed9cc7a289442ffca5fe4e76a0fbcbc2" Size="2505" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2094011" />
@@ -44851,7 +44746,6 @@
     <Blob Hash="36ce2cf152260d8914af5687f228b6b0093fbd60" Size="29465" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1399118" />
     <Blob Hash="36cf2923dec4329f05654569c75ae02746108bdf" Size="10230664" PackHash="93875d675a29b14bd9d559c753888a36b013d40c" PackOffset="8" />
     <Blob Hash="36cfe7c4d6d90940b79fe0a619e6af46696ba88b" Size="4662" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="983472" />
-    <Blob Hash="36d01e3ccd0926a7fee2c20cb376400f70386729" Size="8511524" PackHash="4eaa4ba02f65f68ea501f87e4aa4e1a8daea5060" PackOffset="8" />
     <Blob Hash="36d2272d275fa98129b17aeee364a32c97bf0ce5" Size="3392" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="839737" />
     <Blob Hash="36d300c12372b0931e679d62146f579aa2f7256b" Size="29295" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="217915" />
     <Blob Hash="36d30e33ecd09e24f16858184fc7a7672b64ddf5" Size="1844" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1206220" />
@@ -44872,7 +44766,6 @@
     <Blob Hash="36ef7f5bab35368c1b6859142fc64c6c49786b8d" Size="4032" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="2091880" />
     <Blob Hash="36f129ad0b54d39951b43e85f1b439196124357c" Size="900" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2082722" />
     <Blob Hash="36f25721784804e7a62cd7f48d1f67798dd535c0" Size="99986" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="105159" />
-    <Blob Hash="36f5279204e9af6b3db062bdf2fa5f6ff2bf6d54" Size="14448" PackHash="59715c3fdd3ae349382891542d9450c46656b138" PackOffset="2082460" />
     <Blob Hash="36f59c0749ed6eda37ad7eb7a9b09b414e811e78" Size="910" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="2096155" />
     <Blob Hash="36f64f83e39bd15f31da102f8c566b73919467ac" Size="4560" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1954292" />
     <Blob Hash="36fc74a3e4800f549d211d5f0a3e28bd080a0d16" Size="215" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1258756" />
@@ -44882,7 +44775,6 @@
     <Blob Hash="36fee7ee8b38d1ccedec683e4d1ff97bbdc0613a" Size="3439" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="974630" />
     <Blob Hash="36ff3424e8ea93334702ed1bec515e40178a2061" Size="40291" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2019105" />
     <Blob Hash="3701ef5f3b69244e2db4719fc915c18d4d47f8cd" Size="5190" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1433528" />
-    <Blob Hash="37025d4a5cd5df0faf23099fb7873909fcc64512" Size="19771616" PackHash="e34b6cb1704c0890ddb03e4d030f787c3d169d2a" PackOffset="8" />
     <Blob Hash="37033cc5cf37bb223d7355153016b6ccece93b28" Size="2780" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1627297" />
     <Blob Hash="37038d1eb49542a1dc41ea722d44844093418ae5" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="597039" />
     <Blob Hash="37044601608fa9bb5076dca85001fa4feec69cd1" Size="2890250" PackHash="84dede50a743fc971c608cbf3f796fd039f3b983" PackOffset="8" />
@@ -44907,22 +44799,22 @@
     <Blob Hash="3731977f07ee54807d539b5bb8cc05a60a6515d5" Size="14542" PackHash="09a4bae3cf3add2e8bada69dabfacec664d677bd" PackOffset="309229" />
     <Blob Hash="3732c44db184ad25f0333efb02fc7697317f8b71" Size="9311" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1946620" />
     <Blob Hash="37344038a3ac55c79f21b1fc52fbd9f5a3aa3634" Size="80167" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="8" />
-    <Blob Hash="3735ef8cd0268c7bcd41a77c6e46ea0e47dcf562" Size="202" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1599318" />
+    <Blob Hash="3735ef8cd0268c7bcd41a77c6e46ea0e47dcf562" Size="202" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1718550" />
     <Blob Hash="3738aebd8c5b8b4c46d46f2f37a4be41b213b65e" Size="13395" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1235728" />
     <Blob Hash="373938e32f175d0fc7af6823da9ab1f185301fc3" Size="3860" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="945983" />
     <Blob Hash="373f2e20a45dd1ae9819430ed06e250b89119e2a" Size="81964" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="1988130" />
-    <Blob Hash="37408222a58373c53a1eda9c7e6f88bf86830487" Size="1591750" PackHash="3c76cf203c58d1d5050d8f1e481549b49b699896" PackOffset="8" />
-    <Blob Hash="3745e680e921267638cd781a721f5d9839ac2e2f" Size="3484" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1151155" />
+    <Blob Hash="3745e680e921267638cd781a721f5d9839ac2e2f" Size="3484" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1587771" />
+    <Blob Hash="3749a4e1ee47245ae5f1b47492fc6079b85228da" Size="36212048" PackHash="80b8a7af0851156fe1d64e7b6bda7aa6657beb4c" PackOffset="8" />
     <Blob Hash="374bcf3dd2f138f29d84afeb9f9ee75f82803b69" Size="149" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="442939" />
     <Blob Hash="374d698dad04d04bca4d2b445d01517a9431c863" Size="193" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="72625" />
     <Blob Hash="374dbeb0acbf922fe0088a3b7656d133c97d196e" Size="117708" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="1337684" />
     <Blob Hash="374e49e37b8fbcb9cc420d8a51b88ec4f77c8dc5" Size="7266" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1720829" />
     <Blob Hash="37509f31acf2fc0292cbbc1927f4b1f648afef13" Size="493274" PackHash="6d263531086a2ac8abcd381816ca4bbebeb2bb89" PackOffset="1141698" />
-    <Blob Hash="3750d67a913482073d9a1eebab98a734305278b3" Size="818" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1455247" />
+    <Blob Hash="3750d67a913482073d9a1eebab98a734305278b3" Size="818" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1992329" />
     <Blob Hash="375522ccb98109f5acf610ecfcec3fcecd473fc9" Size="197967" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="708148" />
     <Blob Hash="37564b5b63976892a755ccd539274a680cf73383" Size="84061" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1467303" />
     <Blob Hash="3756f12de66e7fdc652c6ffb4ca7e0cb9a34cebb" Size="506" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="714049" />
-    <Blob Hash="375946c932267b97069a917048728b30458fa766" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548937" />
+    <Blob Hash="375946c932267b97069a917048728b30458fa766" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668168" />
     <Blob Hash="37599b26fb61195762d65d77b28d073460dcac25" Size="1150" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2084931" />
     <Blob Hash="375bc4ce0b35d26d98c6d83ce5301f33c6818ba1" Size="206848" PackHash="c9dcd3efa15d86693a0fbc9073cbb3b57a6b7143" PackOffset="319448" />
     <Blob Hash="375be685ea516343443eb11893ff731abee0be05" Size="738" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="2096385" />
@@ -44956,13 +44848,12 @@
     <Blob Hash="378947f022aa617ebaa81f06060112fbb8bde496" Size="104480" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="1458753" />
     <Blob Hash="37899461dc5ba40ee73b38a5cd50e9bd976d20cd" Size="13039" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1842158" />
     <Blob Hash="378cb6c0dca5d329238786a1b6fd65adf88ac873" Size="117" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="202583" />
-    <Blob Hash="378d88d65b79adf54dab344734cc5384e87d3651" Size="626" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1414357" />
+    <Blob Hash="378d88d65b79adf54dab344734cc5384e87d3651" Size="626" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1863259" />
     <Blob Hash="378dc41ad0470779c504a90e521e34a85fdbca4c" Size="3573" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1103213" />
-    <Blob Hash="378e3882d467a6d546805bde8a73df525a5ec6cb" Size="8119" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1615471" />
     <Blob Hash="3791f501279d5d2ee7fa2afa927dcab3a628353e" Size="12800" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1055096" />
     <Blob Hash="379450a6a4e5e2da3ceb9e928e15e6d8b38a01a5" Size="8932" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1838806" />
-    <Blob Hash="3796c8f9c31dc5d2f7070f905f74ef5b1872d9e0" Size="28202328" PackHash="12b7ec5b16fe9b6e1e00d60cfa36a1a4ca403b01" PackOffset="8" />
-    <Blob Hash="3799cee4d0dd8f8186faf0eda2f931276d3ada4e" Size="7875" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1811905" />
+    <Blob Hash="3798242be9140bd53865f82bbeefe7eca540b06f" Size="374928" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="1445836" />
+    <Blob Hash="3799cee4d0dd8f8186faf0eda2f931276d3ada4e" Size="7875" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1995677" />
     <Blob Hash="379c07259622db6de1b02c54c2245a2c78e315b5" Size="47742" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1578816" />
     <Blob Hash="379df125f1e51e709478cff0938e30777572bb8b" Size="7520" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1281750" />
     <Blob Hash="37a1fd48b774aa46cbfa60340bfa0f1978e469bf" Size="19559" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1453691" />
@@ -45003,17 +44894,17 @@
     <Blob Hash="37f07ffb3264d75deb7270901ac4c68d5756cf33" Size="746" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1749553" />
     <Blob Hash="37f1441998290c43a8a7084513d4511a6a1739e3" Size="7048" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="320502" />
     <Blob Hash="37f1eb29a7590cd7ed02f581e05e7c33f4b67c7b" Size="259" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="836633" />
+    <Blob Hash="37f24aab7db130729593ee62f7471206a812c5d0" Size="1057144" PackHash="9d7c17c0c890b7918122c3efe9aa02933b27d31c" PackOffset="8" />
     <Blob Hash="37f2ee232fc3ea90cea870cb88d5495210960f1d" Size="3340" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2086741" />
-    <Blob Hash="37f5a47eda7de65932cacf1d27550f4200cf1f30" Size="102" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1822543" />
+    <Blob Hash="37f5a47eda7de65932cacf1d27550f4200cf1f30" Size="102" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1941775" />
     <Blob Hash="37f894f94736343743d04a0d713c4016cf87bc9b" Size="18295" PackHash="67f9a57842391bca1072e56b907d2adde02d2d34" PackOffset="1319106" />
-    <Blob Hash="37fc11377ecf10234d728b0085b283f65a0db662" Size="52218" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="1892176" />
+    <Blob Hash="37fc11377ecf10234d728b0085b283f65a0db662" Size="52218" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="1978458" />
     <Blob Hash="37fe69c24d1a3e1c2a57f3705865f1867055408a" Size="242" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2065862" />
+    <Blob Hash="37ff54552ab36835e0139b35a9166e50c4a7259b" Size="4214172" PackHash="4f5d18bb13f39169265dd16fb6c26c5b6042dd24" PackOffset="8" />
     <Blob Hash="38017ab778a619d6a5f6daaa3707aff241ce345b" Size="263319" PackHash="1015366202732d5b428dc71ad9ec5fa99ca1b874" PackOffset="1545253" />
     <Blob Hash="38032c3952d249808c9731f27f5609c05c293091" Size="2501" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1124247" />
-    <Blob Hash="380398d75ffa424ce1ca0b0d1423c46003c2ed30" Size="35373" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1955669" />
     <Blob Hash="3803fbe76e337ce37ac91183474da812b5baee5a" Size="5706" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1115407" />
     <Blob Hash="38078ffc27d2e6ddbc92957d179c9776ba53d08b" Size="344" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1382035" />
-    <Blob Hash="380824ae20d35922be825051c38b7d028c84d5a6" Size="2434696" PackHash="2c59dad7063233fa7ab7b2a9e30f526771be357f" PackOffset="8" />
     <Blob Hash="3808fcb001864a4c9c7f1d9352b836103c4b5a3a" Size="6379" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1291755" />
     <Blob Hash="380a562ace287fa019cc2571a922ff15681f2bb0" Size="81730184" PackHash="9cb4d8d9e5202c3a371775ec44dd2b3f3d334849" PackOffset="8" />
     <Blob Hash="380ae19d11b35a3e3c1fbc18d6191fa64eb870b8" Size="49709" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1192662" />
@@ -45028,11 +44919,12 @@
     <Blob Hash="3820f20297420b4d7092ed723db4702f0c0c8d1f" Size="31876" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="529170" />
     <Blob Hash="3824d9cb94484c0ee143839aa4514b5695095e5a" Size="882" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="505118" />
     <Blob Hash="3825ae874740a06e74bc6d0f3f8a081341dd90eb" Size="685345" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="508156" />
-    <Blob Hash="3826a208696cb36abbe80e8fb2fc4b206597d9e8" Size="67008" PackHash="881ad0ca57f6a4fe275a7b7ca77f2daa52b2334b" PackOffset="2029200" />
+    <Blob Hash="3826a208696cb36abbe80e8fb2fc4b206597d9e8" Size="67008" PackHash="5f963ef76a4402af9c0b249886115df21f3833e4" PackOffset="1829952" />
     <Blob Hash="3827982c364752f738e056f0b7ee52f531d4210f" Size="18666400" PackHash="bea7c037544ad4adb9d69cf34338eee062c4f5c5" PackOffset="8" />
     <Blob Hash="382aac7ca9e0f2a46087eb3327536eabdd9149a7" Size="2815" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="374704" />
     <Blob Hash="38313115c3373a8126164b8a91d8ed8e7e65bca0" Size="8782" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="440925" />
     <Blob Hash="383179278cf373b860fb4971f624915c570be9fb" Size="2600" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1348408" />
+    <Blob Hash="38322c6bbfbc33a344fd1ebffb634a00866b3682" Size="567968" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="1415288" />
     <Blob Hash="38350108fef3ea9b4525b11351c9bea990846ab0" Size="334" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="828846" />
     <Blob Hash="3838ea3c51d941c1216de9828bb82bfb6fc1144c" Size="10591" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="973022" />
     <Blob Hash="383a40251f075450d0bf528752984fcc8311b8a7" Size="134150" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1509567" />
@@ -45051,6 +44943,7 @@
     <Blob Hash="385a18d0ef3d8c1954c9f7b5009dd01d0dd9043c" Size="84060" PackHash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" PackOffset="1948613" />
     <Blob Hash="385f3bc65a018206cfce807bb1b8ae5f9d9e5418" Size="5808" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="862946" />
     <Blob Hash="3861e0f58303d2a79bc08eb1f5d51904d233c781" Size="3787" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="750456" />
+    <Blob Hash="38647438ab1b42119f2667854d30d74095652798" Size="3024616" PackHash="eba773e041f40b7c693bdc8d9bde0b7825570014" PackOffset="8" />
     <Blob Hash="38664b3059e432c13db24fa04c27b9ea17ba094b" Size="19237" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="513362" />
     <Blob Hash="3866ebb80641d7d56fb9be10de53a66e45d47aea" Size="8008" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="151466" />
     <Blob Hash="3868a90be543657dc470f63f7d9ce0f0e7133a47" Size="54784" PackHash="8a7c6b0f9cc883870556fb456f20715ed40367c5" PackOffset="2034184" />
@@ -45079,19 +44972,18 @@
     <Blob Hash="389e8629c536dbd7c7193159095a496186433cf5" Size="9240" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="64939" />
     <Blob Hash="38a01d2bfec2dc458c749fc3ab30a9653d473c24" Size="1646" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2088495" />
     <Blob Hash="38a34c600d4d36f4fe66a5fece3a2f994e97f177" Size="2136" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1111903" />
-    <Blob Hash="38a49bb6dc26c3b5b6e8c58b27ea38ad4a0284a9" Size="105622" PackHash="4c81e720829fc23d1104fe9a396d472aba90a43c" PackOffset="1967108" />
+    <Blob Hash="38a49bb6dc26c3b5b6e8c58b27ea38ad4a0284a9" Size="105622" PackHash="e6347b3badb113c35af36403f292693d70d46881" PackOffset="1982174" />
     <Blob Hash="38a78d9a1794fb4049a18b968d0df1cd97b7e474" Size="1337" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="261437" />
     <Blob Hash="38aea773a747cc103feb6d011289e31456a7e9f0" Size="3049" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2093732" />
+    <Blob Hash="38b29e6a93d6e906ce2f3131209de9c4d158931c" Size="3213312" PackHash="1a6de09fc2156606eb8780daeaeec00d90d2bff8" PackOffset="8" />
     <Blob Hash="38b38a889e461647976c9bf568bbee09d4c89489" Size="4450" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1976079" />
     <Blob Hash="38b6c166e04d554fda6927f5095c8487e73ad75f" Size="82468" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="143179" />
     <Blob Hash="38b9ddd8b1082083053103a636a19449926b0255" Size="128619" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="654041" />
     <Blob Hash="38ba10f83732f35dc776fb559fbbbba8926dce7e" Size="5156" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1009525" />
-    <Blob Hash="38bdc3e84baf3196d0fe5ab94bdd8ac5b8e6f35d" Size="3994328" PackHash="774363affa148e7acada2be2f0553fedf8552894" PackOffset="8" />
     <Blob Hash="38c0aa2d7a543c139d95960a3c7f73e1b7923174" Size="608633" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="303014" />
     <Blob Hash="38c103a224f9b5a661b8295959ad885ea83b699a" Size="118344" PackHash="fc72e25fae938ebaa984b54bd0d8766882030b42" PackOffset="1788464" />
     <Blob Hash="38c12e1614587656be31a65fd724f2cd1e1bd836" Size="207" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="261370" />
     <Blob Hash="38c1b2ea3d112ee35bc6d62d900698869c1449ce" Size="1614" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="368537" />
-    <Blob Hash="38c54c90cc3c86e013d9b1bb45e0b6d031b943a0" Size="12143004" PackHash="d12eba7ec3d754671bab00097e86fcbb81776ae8" PackOffset="8" />
     <Blob Hash="38c9183c60ef701ef5b786c330c4cc838eeeb2cd" Size="2852" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1041020" />
     <Blob Hash="38ccd5827cdf95fe6ca6bbdc8e3bb555e1a0a298" Size="159180" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="655442" />
     <Blob Hash="38cf4225fdc5906ccfff655b26f48e4785115904" Size="90" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="826536" />
@@ -45100,35 +44992,35 @@
     <Blob Hash="38d9c87f32249bd498e264e145fec12cfdf3d955" Size="17760" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1398218" />
     <Blob Hash="38de71b79d5c5c8481b950bae061998f4981e125" Size="9256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1239406" />
     <Blob Hash="38e179baf44515ebdf28ade1b6e100410a0aeea1" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="574437" />
-    <Blob Hash="38e87eb9ab5b11eef9f1614d36e39312f02755ad" Size="133120" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="1916252" />
     <Blob Hash="38ee98a22fa90eb34c3a36f8c635d223542fd0dc" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="362457" />
     <Blob Hash="38f231917dd3a7e12aa885b60287f40fbb3cd938" Size="3084" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="972682" />
     <Blob Hash="38f304a8d9cc9e5fe2743f9188ae67a641ba8e9d" Size="6697" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1573514" />
     <Blob Hash="38f551b8cef2a71611715cf2e6c84084d04d2207" Size="186991" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="589653" />
     <Blob Hash="38f5d16a0a7fee13e7a322e610d85ce44d8170d7" Size="110023" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="1135409" />
     <Blob Hash="38f96ea734e82c38d7eaa071b30d3ff0f535351d" Size="210594" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1482194" />
-    <Blob Hash="38fc5e5bca3e0c945686fa7f9214d730474ecc01" Size="58" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551953" />
+    <Blob Hash="38fc5e5bca3e0c945686fa7f9214d730474ecc01" Size="58" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671185" />
     <Blob Hash="38fdedc5df9b76594359f277355dbf6021703334" Size="3640" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1729623" />
     <Blob Hash="38fe66e3eb4eb3c8a6174d0c84a203bec93e9462" Size="6273" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2075015" />
     <Blob Hash="390362e09aa867334d15209ec952a4f97b3089e7" Size="190481" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="1813796" />
     <Blob Hash="3904e23cefe56dbc2cc2743e26c3a8a9e51f0665" Size="137752" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="407178" />
     <Blob Hash="39086c1450cf48c0ebdc169c869c956392d89e7f" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="589832" />
-    <Blob Hash="390b7b14953a4a22b883eee2e27eacd77d585e31" Size="3920" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1781221" />
+    <Blob Hash="390b7b14953a4a22b883eee2e27eacd77d585e31" Size="3920" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1606357" />
     <Blob Hash="390e3bc1ec96ae1b2833276322d3e9026e782e16" Size="90790" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1399957" />
     <Blob Hash="391080db4773278be8c3228deb1a8ac0b2b2a3a5" Size="41433" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="780501" />
     <Blob Hash="391556457d4eb76bd5570012b35783dc22f0fff4" Size="42216" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1131736" />
     <Blob Hash="3916b87610f37e8bbbcecd74005b5a0f98e5179e" Size="5921" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="382593" />
-    <Blob Hash="391772be4e69473772f181b682c0e48b6b29417f" Size="719" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1274590" />
+    <Blob Hash="391772be4e69473772f181b682c0e48b6b29417f" Size="719" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1723492" />
     <Blob Hash="39180525e0b65b70f9f0d5fe23b6712e8d79f8aa" Size="40" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2096987" />
-    <Blob Hash="3918507985c37a7316ec3a2265f3244c0ed0d9ac" Size="328" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1582202" />
-    <Blob Hash="3919dfae90106b460d11e676966c7bb0bd443f08" Size="2089" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1795993" />
+    <Blob Hash="3918507985c37a7316ec3a2265f3244c0ed0d9ac" Size="328" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1701434" />
+    <Blob Hash="3919dfae90106b460d11e676966c7bb0bd443f08" Size="2089" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2094670" />
     <Blob Hash="391cc4c768edd968037d95a4f21610ef74aa7cd6" Size="15962" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1527820" />
     <Blob Hash="391d9ac7c6d1d6469679cfb022a247fb9442be6e" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1939732" />
-    <Blob Hash="3922456f586964abd199b4318dc316f3d0618806" Size="10352" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2070541" />
+    <Blob Hash="3922456f586964abd199b4318dc316f3d0618806" Size="10352" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1810768" />
     <Blob Hash="3922891e88cedad58e7ad71a55c586e08cab4265" Size="113327" PackHash="31ada4c269dbc1fe2d7767f6c437634f661132d2" PackOffset="1805735" />
     <Blob Hash="3926f2aefccded9ae9704abc34186df88d46c792" Size="96" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2096675" />
     <Blob Hash="39278a82ff63fa6064340f01b3b7e0cb631c1605" Size="118256" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="1157593" />
     <Blob Hash="392f96747e4c7e1bfccb39f957eff52a7644b73d" Size="4634094" PackHash="f2145ae2b7503ac91c6b45995a2d8a7f52c5cd25" PackOffset="8" />
+    <Blob Hash="39322c21d799aeaa08aae75d799325f38de65985" Size="116779506" PackHash="c62bd8ce7c6549a1fc8dacfc45bf8dd90b66075c" PackOffset="8" />
     <Blob Hash="3932577e66801ad31519b0bb56cce7b9e36221a9" Size="155" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="558121" />
     <Blob Hash="3933f2608186ac5a19b626911de7d10ea07ab14e" Size="125849" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="130504" />
     <Blob Hash="39346475ab74db4819339aede06643a6ac26e55e" Size="3527226" PackHash="e19597b2f561e4c5280d1bb581defbdde33fa9f2" PackOffset="8" />
@@ -45148,10 +45040,11 @@
     <Blob Hash="394f96c31624c8f3ca0d38b54ad5615068c74305" Size="7328" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="91151" />
     <Blob Hash="3952a53bf142dd85506f1a093dbe957f8e0450ab" Size="71847" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="8" />
     <Blob Hash="395340760434c6732d1b514f29f6f3b118a05221" Size="6445" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1144031" />
-    <Blob Hash="39585c7d626f35fdf303b47ea758bea0b4021daf" Size="328676" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="1156500" />
+    <Blob Hash="39585c7d626f35fdf303b47ea758bea0b4021daf" Size="328676" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="1213908" />
     <Blob Hash="395881e13614341260b2dc6a05e555c35bf2a129" Size="18789" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1598338" />
     <Blob Hash="395c185f0aac7ebc05924bf6ac74ba7f160fb9a3" Size="15336" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1803306" />
     <Blob Hash="395faf5445b07c848b329be377e8afd2f35156ad" Size="3495" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="672748" />
+    <Blob Hash="3962c64f4873c7744c1ff2d18adf3e150a906e9c" Size="1436728" PackHash="f56183ef9a51b04c0311b5a5de384e805b4e41fb" PackOffset="8" />
     <Blob Hash="3963080c22ebde9054498a8baa88aa9eab4628a8" Size="17056" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="29320" />
     <Blob Hash="39630d7b46a2a6042307b9a2f4091773b8d822b2" Size="53800" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1569251" />
     <Blob Hash="396674bf69d887c826e2f5e02b365bad54f316b7" Size="136253" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="1775935" />
@@ -45163,6 +45056,7 @@
     <Blob Hash="3970951913b4b8f687351e5eba4e8473a34d6ce5" Size="18684460" PackHash="9fc81e42c82988f137a390d97b73d52abc49e307" PackOffset="8" />
     <Blob Hash="397433570817b508c1e1bde6fe857a7289fd6379" Size="17702" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1414705" />
     <Blob Hash="39743fcda924d2d38d9b3916ec564b9edc83e725" Size="1594" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="721549" />
+    <Blob Hash="3974ea0db1a28fdaebe5fa9cf1be71795f52ddf8" Size="3257952" PackHash="42aa30df7c5bb0cd6b84c159c62d74eb46db6949" PackOffset="8" />
     <Blob Hash="3980d6b55c9ff2453acbbf91ce2256d0e2def0ad" Size="7386" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="840644" />
     <Blob Hash="3981013c1058da891d1f8be1a8591feb9e0860ad" Size="17790" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="604094" />
     <Blob Hash="39810afd6c7c4590f51b7c947b14cb59c68d8346" Size="179" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1260373" />
@@ -45172,7 +45066,7 @@
     <Blob Hash="3983222dc80d2fb48adf36ce5aae1afdd7b48e02" Size="3327" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="986007" />
     <Blob Hash="39833bc14bf020c7dd7aa8606708fca65490dd08" Size="3051" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="794010" />
     <Blob Hash="39863f862cf18835f2ff703f87ddde8f115ff1f1" Size="14568" PackHash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" PackOffset="2080668" />
-    <Blob Hash="3988628b94b9044df34b30dd0ea9d768c73c2c75" Size="2146" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1751369" />
+    <Blob Hash="3988628b94b9044df34b30dd0ea9d768c73c2c75" Size="2146" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1870601" />
     <Blob Hash="39886da5705aec57382018ffa493f2f3536da7a8" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096921" />
     <Blob Hash="398a0829135a91dfe4f352d61c251fe1f45484c5" Size="37251" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1088651" />
     <Blob Hash="398af327178b80c4669452b74e7afe38ea2d662a" Size="74822" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="71614" />
@@ -45192,13 +45086,12 @@
     <Blob Hash="39a667f12c63efc6f301d98004dd7ac1df54a55c" Size="2989" PackHash="7d2cd67e5409d984a518119f088c05600971a174" PackOffset="2086208" />
     <Blob Hash="39a70af193dc9be42740996850ee0b5a9643e67d" Size="85498" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2010939" />
     <Blob Hash="39ac6bc77e9df2875c62971e3d9c41335c9f1bf1" Size="145315" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1785236" />
-    <Blob Hash="39accca595d55bb0155176ccc95195a68b1a1fe9" Size="32292" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2050584" />
-    <Blob Hash="39aef5baa0ba866299fa54d7b3435e95fc87e96c" Size="2224" PackHash="bd015e7592fba2109a78a6a8f3e4b3c85d0c9a10" PackOffset="2094406" />
-    <Blob Hash="39af4935db5a0e3940af5298b62eec9dd0334c1e" Size="15578" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1084006" />
+    <Blob Hash="39accca595d55bb0155176ccc95195a68b1a1fe9" Size="32292" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="1976330" />
+    <Blob Hash="39af4935db5a0e3940af5298b62eec9dd0334c1e" Size="15578" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="85493" />
     <Blob Hash="39b436cd2df983c5348a5268cee0986e17db40f3" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2090000" />
     <Blob Hash="39b660657a64f2f43d126f541a7d439c654f32fa" Size="13545" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="342066" />
     <Blob Hash="39b877576aacd3236c49613dcdf8c1b1f0809316" Size="92" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2097045" />
-    <Blob Hash="39b9000f04022c3d1c005b89fd6d86a7aaf40ac8" Size="3859" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2046069" />
+    <Blob Hash="39b9000f04022c3d1c005b89fd6d86a7aaf40ac8" Size="3859" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1937200" />
     <Blob Hash="39ba381bb8f9526e9372fd7440cf771fab5db6ba" Size="213" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="187534" />
     <Blob Hash="39c3d3bbcd70a4dc693106821416c1c74faa1f67" Size="405448" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="1236590" />
     <Blob Hash="39c5806a0e62ab6e3962fb9c3fdf2e92502db1fc" Size="3591" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1627398" />
@@ -45208,7 +45101,6 @@
     <Blob Hash="39d0222ddcf232ae90aa5364820c523730e60485" Size="360166" PackHash="def068eae246e2fbd7e21a232e16ab306dc83eb5" PackOffset="1070" />
     <Blob Hash="39d401d0af071852ad5f82cc8f78ba94f5f91be8" Size="9112" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="146544" />
     <Blob Hash="39d4207963401c4d202ac6ac62008d1878f27e8c" Size="102" PackHash="b4d8e0b490d2a1157340644482cc429e03d9575a" PackOffset="2097002" />
-    <Blob Hash="39d66c41850d0b1d501e279b20e62872d86e1ce6" Size="14448" PackHash="2f18ec8e0e1dbc7574497b45571454da261d1b6e" PackOffset="2079968" />
     <Blob Hash="39dc974b8b732dc3f6612fd5335c0693d2efd34c" Size="5741" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1445344" />
     <Blob Hash="39dd5dc2779b1055f139713c08043094852314c2" Size="6751" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1847594" />
     <Blob Hash="39e06b4e0c7cf2f983335c50821178130aec5569" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="945160" />
@@ -45218,7 +45110,7 @@
     <Blob Hash="39f09722577ea4514252116a0156c443d0ead165" Size="100769" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1119939" />
     <Blob Hash="39f6c9a1c9f55deb55177e61601a05b8953af956" Size="3068192" PackHash="66a004bba44e8db1452276976d12dfe44062a224" PackOffset="8" />
     <Blob Hash="39fcf7b390587485120974c76400ecfd49322b3e" Size="171635" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="651206" />
-    <Blob Hash="3a004a3bd5237d4d7041e0c114c818193dd1ba7a" Size="19076" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2068599" />
+    <Blob Hash="3a004a3bd5237d4d7041e0c114c818193dd1ba7a" Size="19076" PackHash="097882ff4f782476be1a4962baf5872eeb7e54df" PackOffset="2075043" />
     <Blob Hash="3a02f88e24d4b742eca8a5bd971c192f63321c13" Size="1257" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1561312" />
     <Blob Hash="3a03943b6c016aceae350918e748b757c1a9d331" Size="13832" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1859672" />
     <Blob Hash="3a098136cc42018d3690e90ed4dd049f89714280" Size="6910" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="401744" />
@@ -45228,13 +45120,12 @@
     <Blob Hash="3a0d82adcd10785c93e6bc5b560c58e024d16980" Size="5944" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="678728" />
     <Blob Hash="3a0fe27666538479cf59fba3f25e8ce3b2e19b1b" Size="424" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="392349" />
     <Blob Hash="3a1398ee0f3b7e203bdd2eee267b1defdaa061d3" Size="824162" PackHash="199e5450e36e8e41f08f9a1139e9c747f2e9610c" PackOffset="1020115" />
-    <Blob Hash="3a153452780510f350d9a983517be9195523bd78" Size="480" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1604599" />
+    <Blob Hash="3a153452780510f350d9a983517be9195523bd78" Size="480" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1723831" />
     <Blob Hash="3a171dec0eb7c701d8f90a283c18191222960290" Size="53012020" PackHash="490b4aba5e1802be180a135b3cffd8bf2b599d6a" PackOffset="8" />
-    <Blob Hash="3a1a4461c133c90e58f3728cfc100b650ea79e29" Size="114944" PackHash="2573092c7861b9d182a4d6cab4457397e81d6bf6" PackOffset="1871036" />
+    <Blob Hash="3a2448d90ba491ea5cf55141e0bd1925c1a595c3" Size="1420656" PackHash="344190ba3bc0e09a4f0f7283782da8cb56b6a794" PackOffset="8" />
     <Blob Hash="3a27c565738a320b73fc8819a00598cbb0ca5167" Size="1136" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1986458" />
     <Blob Hash="3a2a8116bb1957afaa360bebad90ee695508fd31" Size="221139" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="648319" />
     <Blob Hash="3a2b266db8dac8bcf9aaa81554b3fd4c59cc6bae" Size="5778" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1779458" />
-    <Blob Hash="3a2bd25ee5973616e8f590cb439891771d5908bb" Size="1256" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1785939" />
     <Blob Hash="3a2bf3255ef5b09c07066fce680e51d46a69eee7" Size="182" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1452456" />
     <Blob Hash="3a2c709f0ef8a2f8393b867d61d61e1c0051a52c" Size="2772" PackHash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" PackOffset="2091714" />
     <Blob Hash="3a2cd08be229717f9c366f967c53016ea9e8422c" Size="920" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="677480" />
@@ -45257,24 +45148,24 @@
     <Blob Hash="3a479de5dcfa342c52c693cf643fc2f06d2ffe41" Size="464270" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="1455351" />
     <Blob Hash="3a49658d10d622881b237dd2dc4e9c63c99db51f" Size="48128" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="1441004" />
     <Blob Hash="3a49dc206a31770853e8307cc7d5b9cbe5739dcb" Size="89088" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1224292" />
-    <Blob Hash="3a4ad9ea708ce42e563ea7ab2dbc683de59c4d9c" Size="326" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549913" />
+    <Blob Hash="3a4ad9ea708ce42e563ea7ab2dbc683de59c4d9c" Size="326" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669145" />
     <Blob Hash="3a54d4b016f726d74d1ee9a336772a548297963b" Size="206791" PackHash="f26725553888bf1a0cb10b2f2ea94dc7801c0c27" PackOffset="203837" />
-    <Blob Hash="3a55f429d4be25d98e4b1e2c207ccf0dd079a55d" Size="4729" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2037495" />
+    <Blob Hash="3a55f429d4be25d98e4b1e2c207ccf0dd079a55d" Size="4729" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2088440" />
     <Blob Hash="3a5a9fb1102b2e6d6ec94be550f9cd82e493dc80" Size="532" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1737052" />
     <Blob Hash="3a5c7a4228b791f8a3811eaee3fa2f546584b952" Size="19245" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="630710" />
-    <Blob Hash="3a5d340d24c4c2481bd9b69e97477a9bdf637f23" Size="759" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1451335" />
+    <Blob Hash="3a5d340d24c4c2481bd9b69e97477a9bdf637f23" Size="759" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1988417" />
     <Blob Hash="3a5db718f37599073eb36e8c4b6c575ef562ec89" Size="247" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1389425" />
     <Blob Hash="3a5ea002ee6729b4121488a6c137c3612c890eae" Size="1983" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1695053" />
-    <Blob Hash="3a5ef72c41039af4c433aff3359e646ae0110010" Size="4064" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1234696" />
+    <Blob Hash="3a5ef72c41039af4c433aff3359e646ae0110010" Size="4064" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1683598" />
     <Blob Hash="3a61f34bf5bb29772ea30406fc5109639fd08be3" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2064243" />
     <Blob Hash="3a6375902ea075b37ab62711f7ab2cd6d155be92" Size="5720" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="137912" />
     <Blob Hash="3a63f5bf36f0b0a701dea5bdb94574b98cda7cc7" Size="30768" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="525635" />
     <Blob Hash="3a66dc948589d4fdd3599a00fb8d7fb5db5db9e1" Size="2203272" PackHash="272cb601d913c7ef4f97eb7188ccd36db16236e5" PackOffset="8" />
     <Blob Hash="3a67479e7324f19b04290b0ee64bb206d6db9d78" Size="34" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2086402" />
-    <Blob Hash="3a68729f288c3b18db3332a78023f1ccc34868c4" Size="325648" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="872568" />
+    <Blob Hash="3a68729f288c3b18db3332a78023f1ccc34868c4" Size="325648" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="1332154" />
     <Blob Hash="3a6a8b380eda51ed806e1d1c6763051e6fdb5cfb" Size="33897" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="93359" />
-    <Blob Hash="3a71b0a920ca119fa1fe886d065d4248b7b6459a" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554819" />
-    <Blob Hash="3a71cba1c56f4cf701e919cf8047dca124daba78" Size="1143" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1340283" />
+    <Blob Hash="3a71b0a920ca119fa1fe886d065d4248b7b6459a" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674051" />
+    <Blob Hash="3a71cba1c56f4cf701e919cf8047dca124daba78" Size="1143" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1459743" />
     <Blob Hash="3a722a37a1372be570b89f10b4bf2ed6dd405f91" Size="520674" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="8" />
     <Blob Hash="3a7562fd0aeb5bff1a2b04ab94badb6d5ce875cb" Size="1370" PackHash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" PackOffset="2090954" />
     <Blob Hash="3a77f539bfc1da8c3793f49c2bde5c9595577a56" Size="40960" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="271880" />
@@ -45333,7 +45224,6 @@
     <Blob Hash="3aed954e3927eb89819ea511d231386d4fb0522e" Size="2658" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1348814" />
     <Blob Hash="3aee4c226b7b50c6ff4ed77eb46fdbb98903ff67" Size="844" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="215979" />
     <Blob Hash="3aef26cc54253965b9422cb3d35ed60269284c6b" Size="663432" PackHash="0fcf8dd407022ec880ac48e402fd1d525ec2a7b4" PackOffset="1341088" />
-    <Blob Hash="3af0f182a8dbca5d94ee4523fa29782d3503fddc" Size="7362528" PackHash="7cf9e496eb7096fa3d16961527384bf78d1c6319" PackOffset="8" />
     <Blob Hash="3af14c1953fab2720e98c05a36f51090af0cd987" Size="25470" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1843248" />
     <Blob Hash="3afacf36dd4a5004732e26f7262f07cd6b2c0942" Size="708704" PackHash="5c3cb1bc324339ff637e39ac99e09c8a276fbf1d" PackOffset="8" />
     <Blob Hash="3afb87cceebe5e6eed56a32dfdd3746e6711167d" Size="8323" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1452470" />
@@ -45377,7 +45267,7 @@
     <Blob Hash="3b474e63cb4bd2ba8da27aa84bc3af306a75f0fb" Size="644096" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="739336" />
     <Blob Hash="3b48f6c08b00b01b3ff636be9fb7d7abeddea4ec" Size="106555" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1828807" />
     <Blob Hash="3b4b6f0fd5d7467e5d4bd135ee449176220e45e9" Size="134909" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="1873554" />
-    <Blob Hash="3b4ff2785f35ce61129450303a1176de7a01e82b" Size="335" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1378748" />
+    <Blob Hash="3b4ff2785f35ce61129450303a1176de7a01e82b" Size="335" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1827650" />
     <Blob Hash="3b52627c7f1baa2e080a35ae0ec901c2245c857b" Size="3192" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1353144" />
     <Blob Hash="3b564af239b310e0e5871cd14772c918020115e0" Size="2727" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="585404" />
     <Blob Hash="3b5723cc2741e3daf9ae29a9abda3e1303246efe" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2088120" />
@@ -45387,14 +45277,14 @@
     <Blob Hash="3b593cc17bf153a6209fc5aace7b88da9603bd44" Size="8505" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="174881" />
     <Blob Hash="3b5959ad02fd8a5943d5d1934ec0991e8c114c82" Size="20480" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="1959432" />
     <Blob Hash="3b59fe70d69e5a09c1fabc580db582945c957ef8" Size="99525" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="556403" />
-    <Blob Hash="3b5df614efc5fff3d9b65506a421b17648ec4b0e" Size="11598" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2039208" />
+    <Blob Hash="3b5df614efc5fff3d9b65506a421b17648ec4b0e" Size="11598" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2058349" />
     <Blob Hash="3b609ec2cc5554e7fa54f085661c43096fe875f5" Size="4021" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1017926" />
     <Blob Hash="3b61c5f8fb96e510dd6e4e5ccbc73e4e0aa67389" Size="1246" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="8" />
     <Blob Hash="3b62e14db0d281334b68b2657766d8c39604a2bf" Size="1204566" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="8" />
     <Blob Hash="3b63f1e81234fa5d83421fe9e930eae64993baad" Size="988" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="2096069" />
     <Blob Hash="3b64b85b1ade5f7c7606d8fe093c8e793d4829f0" Size="7930" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1562602" />
     <Blob Hash="3b67aa1ad6cb42243548b2124f850761b8abc78f" Size="42504" PackHash="59715c3fdd3ae349382891542d9450c46656b138" PackOffset="2039956" />
-    <Blob Hash="3b67eaf12c9ad91b3e7271fd58a1e041ca55e9a0" Size="2263" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1044061" />
+    <Blob Hash="3b67eaf12c9ad91b3e7271fd58a1e041ca55e9a0" Size="2263" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2092037" />
     <Blob Hash="3b6c88b98a0758dedee1b655d1bf4f47e68c5a4f" Size="7478" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="831202" />
     <Blob Hash="3b6e3ea9f5a6bbdeda20d68b84e4b51dc48deb1d" Size="900288" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="8" />
     <Blob Hash="3b78cbefa663952783ae623b04259e4b3456e80d" Size="85504" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1968025" />
@@ -45418,11 +45308,11 @@
     <Blob Hash="3b97cd78f991e8fd8ec75f0f96bc79ebd71573b1" Size="594" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="810030" />
     <Blob Hash="3b990b46520be5d9fc55eeda0d3f6261e8c1fa20" Size="1806" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1759889" />
     <Blob Hash="3b9a65a7c3839c8643d535823bc6c65f50929bf6" Size="213183" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="1855258" />
-    <Blob Hash="3b9a6b366e22edf79e324309694a0c9eb94a53c3" Size="28824" PackHash="5dda7bff0436415ddfb9339017dd46727610cfa9" PackOffset="2065544" />
+    <Blob Hash="3b9a6b366e22edf79e324309694a0c9eb94a53c3" Size="28824" PackHash="f11b05acf069a23b5a58dd054c9e055241e06bcd" PackOffset="2056732" />
     <Blob Hash="3b9b7637174041aa4db8901c639ecaf2281b8bda" Size="1810" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="70505" />
+    <Blob Hash="3b9ca9783f28abc1086001fdb45f582664a9c0c8" Size="664" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2083721" />
     <Blob Hash="3b9d461f35257acf8c058070f19e9625132b3bfd" Size="4735" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1414006" />
     <Blob Hash="3ba2c1a46c154c8fb8590f34e2efb83481436131" Size="31089904" PackHash="d80f8bab91e65f6374622c18411497cf86bf0d3e" PackOffset="8" />
-    <Blob Hash="3ba45307ea50680c01292c35a853d13c2c693f7e" Size="1763764" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="8" />
     <Blob Hash="3ba57c5f42390bf9e18f92aeb7784ac3c0d49729" Size="7152" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1619107" />
     <Blob Hash="3ba60ac67e92ee3feeef29778542cc8a820f59a7" Size="32" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2097108" />
     <Blob Hash="3ba67a733eeee43b030e592860330f17681b7dae" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2097132" />
@@ -45436,15 +45326,17 @@
     <Blob Hash="3bb8c36bbb3f1384df0dc008c0550bafc897c7d6" Size="331" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="421489" />
     <Blob Hash="3bbdc24055b3aaca438faede64d6a6158704936f" Size="459" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2068218" />
     <Blob Hash="3bc05b44c64705ff42c9d8a79788ce1ebf97b0bf" Size="11201" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="316830" />
+    <Blob Hash="3bc380f31f2c5951a0fc841fa221b534bda79c9a" Size="862610" PackHash="e9fd3e48a792ca511bb0de9cd173aa5bb336d8bb" PackOffset="1161678" />
     <Blob Hash="3bc6cfad2f54c4897a05387dce8e47c7f845301d" Size="31612" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="425537" />
     <Blob Hash="3bc8644941a4e360d0530891bd4670c4b7438f8b" Size="88" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2084548" />
-    <Blob Hash="3bca0a5ca5e8f8ced4e674e59a4929cc0c6a1ea8" Size="252" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1583849" />
+    <Blob Hash="3bca0a5ca5e8f8ced4e674e59a4929cc0c6a1ea8" Size="252" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1703081" />
     <Blob Hash="3bcd1a0e917adb24e3607a0b7f4f8dfa4c1c477a" Size="5375053" PackHash="154306df1d2a4877cbc22db8224277c856f1b6b2" PackOffset="8" />
     <Blob Hash="3bcfebfde2b0138fac1bfbf40e2e90fe2959ca07" Size="1916" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1475445" />
     <Blob Hash="3bd029eb37a9e5188cf6f594e904b9329ac98f8d" Size="3768" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="828246" />
     <Blob Hash="3bdc4a963b90ab7a4e95b9d7ef1125808c0d94da" Size="19114" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1996487" />
-    <Blob Hash="3be0a6cc65f49e8188c967aa67765cf55e9ab9fa" Size="835" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1456840" />
+    <Blob Hash="3be0a6cc65f49e8188c967aa67765cf55e9ab9fa" Size="835" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1993922" />
     <Blob Hash="3be3537b261e72f11f36d8a31f7cb8823a6a1d7d" Size="1852" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1875272" />
+    <Blob Hash="3be509ff4267bd67497dee93f3362801c254bc1b" Size="6756" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="2076656" />
     <Blob Hash="3bea99b5b773f85fae6ee035ceee7decbc41f726" Size="5739577" PackHash="553aa77e78f9ac7693e56c9b2ae642c4141aed66" PackOffset="8" />
     <Blob Hash="3bed67d1f21fd2120573d5e91df0a1508ec0ac45" Size="3191" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="154220" />
     <Blob Hash="3bf153a3c3631a65385815d0cc4a85b94584940b" Size="771" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="6697" />
@@ -45455,15 +45347,14 @@
     <Blob Hash="3bfaf93bd1d6f41d94624ca8ea03a67278a2bbed" Size="17033" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1051597" />
     <Blob Hash="3bfc654e2b3bcf902af41aeec46772c84fff3890" Size="192" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="18145" />
     <Blob Hash="3c02e0e9be8784dd35425cd8c4d79e20d6345d3d" Size="193098" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1272359" />
-    <Blob Hash="3c05b335d06809d00653c23e9192743bc9380b68" Size="8894" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1680864" />
+    <Blob Hash="3c05b335d06809d00653c23e9192743bc9380b68" Size="8894" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="2088073" />
     <Blob Hash="3c07dae3400fa54ebf6d45f44af485d7775d1f26" Size="28642" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="2038625" />
     <Blob Hash="3c0fcbb199196a146007fbb288a5404fe0fb2ebd" Size="143658" PackHash="70c36acf390a45efee0b39916d12f3307a23d48b" PackOffset="8" />
-    <Blob Hash="3c0fd0c0e4247a08dc1bfc433aa87276e7da3549" Size="13634" PackHash="ea39a3af16b4dc43d157490fb9de27c641489d45" PackOffset="1788031" />
     <Blob Hash="3c115d13b34e9e48eb7f5631e54e176f3d65c1ee" Size="26260" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="996554" />
     <Blob Hash="3c1bdc1a95ed01b472f7e53759d5a545eaafd4ce" Size="2975" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="175649" />
     <Blob Hash="3c1c41c789fa9e7e321f5538daa92f3a208b652a" Size="19472" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="598036" />
     <Blob Hash="3c1c67091eb124f9d7e1f1864fd71b0261a68a7b" Size="5213" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1688677" />
-    <Blob Hash="3c2138dcbdce5799f9e4d40a52dc122bde4101b8" Size="261" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1312865" />
+    <Blob Hash="3c2138dcbdce5799f9e4d40a52dc122bde4101b8" Size="261" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1761767" />
     <Blob Hash="3c261afa877ce9e7ae441997c2bf8a0692f86b2f" Size="1489" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1372146" />
     <Blob Hash="3c2bdf1b36b1c700d76390451ed793acd822b60b" Size="105610568" PackHash="629ea25ead605995f97a5b7048f58de5218aaaf2" PackOffset="8" />
     <Blob Hash="3c2c8eacd4a7dc5ec55b0137b039e4af413fcff2" Size="2457" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2013219" />
@@ -45501,7 +45392,7 @@
     <Blob Hash="3c719827331aefe1d1252c25f3d631837d12a60f" Size="56028" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="2028828" />
     <Blob Hash="3c728d39d7320b3a9b72ac1421988c85c1a9d387" Size="95688" PackHash="df7e1c0f4fc78d7814f044a10de1362862cc7bac" PackOffset="1740649" />
     <Blob Hash="3c72c7b7f6c82e72b25a700eebccd0a987e7ba7b" Size="16443" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2025826" />
-    <Blob Hash="3c79f76e5444563d5d45f2e3210e6de7ca72ab43" Size="16080" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2045066" />
+    <Blob Hash="3c79f76e5444563d5d45f2e3210e6de7ca72ab43" Size="16080" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2005710" />
     <Blob Hash="3c7a6a2add54c8da42b3ee408bbc32e6a451301c" Size="7996" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1622454" />
     <Blob Hash="3c7ed351af4b5451a88926e78715b16f76d26073" Size="172032" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1257985" />
     <Blob Hash="3c809bb5cd8c039d6fc55c310dd7bb8210768eda" Size="174" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="2096982" />
@@ -45515,7 +45406,7 @@
     <Blob Hash="3c89c3439109be3049704b0270ca40c080e3fbb6" Size="15360" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="486408" />
     <Blob Hash="3c8a01433bbce747724db7a117be007bb361f6a7" Size="7008" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="978216" />
     <Blob Hash="3c8c88814ac1a43c96a54cd1f5e9fb571539b86e" Size="23624" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="474898" />
-    <Blob Hash="3c8c8ac84a9908c77b1e9eeff570d52a4d3302b2" Size="12421" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2011066" />
+    <Blob Hash="3c8c8ac84a9908c77b1e9eeff570d52a4d3302b2" Size="12421" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="12331" />
     <Blob Hash="3c8dbdd6d4d92ec971244c148f007f2546de07f3" Size="71120" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="158418" />
     <Blob Hash="3c90a5838138cb451792d50d76408f19aace7fcf" Size="273" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="20262" />
     <Blob Hash="3c90c3277ae74884e21b8c7f347aebf46efd3b52" Size="15017" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1736159" />
@@ -45534,7 +45425,7 @@
     <Blob Hash="3ca8a6f3e1645c997ecf91c7d8c6cd66ef85913d" Size="897" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1265677" />
     <Blob Hash="3cab194dc930a30355280e87193ba49387ac910c" Size="4584" PackHash="7491079d020d11f40f14eb94536fe09006ff2c16" PackOffset="2038124" />
     <Blob Hash="3cab6f3d063ffe8efed6c3dce06389b772453018" Size="96" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="784944" />
-    <Blob Hash="3caf08ad1e8e193b2040fdcd4815ad9c44418e1e" Size="3418" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2088130" />
+    <Blob Hash="3caf08ad1e8e193b2040fdcd4815ad9c44418e1e" Size="3418" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1980463" />
     <Blob Hash="3cb0fa47f4f1860d6ebabdfc6dfefb96a63d30bf" Size="17920" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1309565" />
     <Blob Hash="3cbd57ec2c72317a27b735cbbb38e3db138ffa7b" Size="61539" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1300355" />
     <Blob Hash="3cbff897b18f32dac33ccb803a8809f0df1f9ce1" Size="66105" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1694305" />
@@ -45543,10 +45434,9 @@
     <Blob Hash="3cc3cea41e8c05ee91174ae86a4e0b9a99162c74" Size="3152" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1277816" />
     <Blob Hash="3cc43715834484e725558650dbff5f7c2a578ddf" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2097067" />
     <Blob Hash="3cc7d5f60194061dbbc781192e642f0b89ba0a3f" Size="9213" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="188484" />
-    <Blob Hash="3cc8c5a2079d3c334d13784be2f1f47e9a117278" Size="2396" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="2094352" />
+    <Blob Hash="3cc8c5a2079d3c334d13784be2f1f47e9a117278" Size="2396" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2013786" />
     <Blob Hash="3ccad358b631f913f4944c5b43a834f28a90d612" Size="31763" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="186152" />
     <Blob Hash="3ccbc45736729a2ca0a799bb530a67e7038b4764" Size="408" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1533233" />
-    <Blob Hash="3cce72764041e2893ec3b9d853e9edba2eeeb1f7" Size="141824" PackHash="95c9f70b2a087fabde73d50408cdf43f650b8559" PackOffset="1862011" />
     <Blob Hash="3cd026cc2d6fc078e0070ec653b3cc6b0d428fd7" Size="137" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2096771" />
     <Blob Hash="3cd3b2737fc781f38de26e255968cbb88b773cbf" Size="191" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="569936" />
     <Blob Hash="3cd63d075497751784b2fa84be59432f4905bf7c" Size="95806" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="1668461" />
@@ -45554,7 +45444,6 @@
     <Blob Hash="3cda6f0ae1d11438f0a2721c176c1169a5b8ea5d" Size="3675" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1195168" />
     <Blob Hash="3cdacd29e1f2362a80227699ee2f0f8507138806" Size="17408" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1921450" />
     <Blob Hash="3cdb80ddf2d46bc073d388a88970075ee2e3325a" Size="2012" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2091991" />
-    <Blob Hash="3cde24ec59ee2c64a8eb5a901acb12ed5a36edff" Size="20338" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1884646" />
     <Blob Hash="3ce05b566d30f0f4a3383d7cbeaa6149a5d7cf51" Size="854" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="453014" />
     <Blob Hash="3ce362e737172eea0a27a213d14566034ebdbc52" Size="5010" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="794491" />
     <Blob Hash="3ce60f31d83e9bb90f4ac1179bf700388363dc55" Size="14448" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2031096" />
@@ -45603,8 +45492,9 @@
     <Blob Hash="3d4c6ab580919c9fc2dfcaed6ce1dd8ba56678e7" Size="5101" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1872019" />
     <Blob Hash="3d4e73839a1a8cb9dec1e59d9d2813257d9480f0" Size="294" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1049540" />
     <Blob Hash="3d51e0859624bee2e46f934aff96129295dca933" Size="74124" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="210252" />
-    <Blob Hash="3d52125bb21c09c8d85c8c036d85cd473c846268" Size="4978" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1801731" />
+    <Blob Hash="3d52125bb21c09c8d85c8c036d85cd473c846268" Size="4978" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1920963" />
     <Blob Hash="3d5515b16a866b5a722faa0af54e98a5fd9038c4" Size="6328" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1705197" />
+    <Blob Hash="3d5589d4bfdf96aa536a10cfa1882d715d71007e" Size="66798" PackHash="3dc42e03b3cf9ab3705939d5eaf2bfcd770d2792" PackOffset="2015090" />
     <Blob Hash="3d559f0554f623020be411d5bfe99faf8141593f" Size="88" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1682004" />
     <Blob Hash="3d5613004b979c7325579d474c1e79a371731a6b" Size="254" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="386769" />
     <Blob Hash="3d5776c4959b45172d0bfd7034b1c140724c121d" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096921" />
@@ -45634,16 +45524,16 @@
     <Blob Hash="3d893f4f36264a581d80690ff85241ce00faa389" Size="7604" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1462272" />
     <Blob Hash="3d8a2d3d576296ac816f281831c51e85fbf35e52" Size="484920" PackHash="d852eca7663f1c36dab87cbd527dbfac895faf97" PackOffset="108520" />
     <Blob Hash="3d8aaf09a43cdfd90b4b03ace748e735412af7f2" Size="27042816" PackHash="8d8a695159bf666e16ab7b3558bb1d5e4e3b4698" PackOffset="8" />
-    <Blob Hash="3d8c573bbbc46c3fe5210d8168a313e8de30e700" Size="65874" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="1902386" />
     <Blob Hash="3d9148ef1d3e3000bea694391a79f8bd9432be08" Size="1009" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="294974" />
     <Blob Hash="3d924778a05cc9b1736fdddc536c8916ea04c12a" Size="9229" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1958660" />
     <Blob Hash="3d9314f123b87b3fd7e4304bfa4527db48236b4e" Size="2921" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="817061" />
+    <Blob Hash="3d94d232477a1e3bbf628278e97426485abb034f" Size="30037" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="2061765" />
     <Blob Hash="3d94d88dd78a04300e9afa8c8108331e3fc4b34d" Size="5292" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1508812" />
     <Blob Hash="3d98041255b89804247b1d8a710484ae4eeff64a" Size="2464" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="572226" />
     <Blob Hash="3d98e69824927257485c5ee77ac893cec61f7ebb" Size="3430" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1841321" />
-    <Blob Hash="3d9b091f92e0bc2ba8661bd3cf356a54838723bb" Size="1136" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1291010" />
+    <Blob Hash="3d9b091f92e0bc2ba8661bd3cf356a54838723bb" Size="1136" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1739912" />
     <Blob Hash="3d9e5dbc9a2226a5bf59840d85592fc47074b6ac" Size="12800" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1141026" />
-    <Blob Hash="3da21c7b3f48f1476dc59098b503924bfbab3c18" Size="1394" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2093731" />
+    <Blob Hash="3da21c7b3f48f1476dc59098b503924bfbab3c18" Size="1394" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2078321" />
     <Blob Hash="3da6b4b78e5052924082bf00d4cc7055ac1fd4b0" Size="4348528" PackHash="f7137cf36a0d0e953953caddb27981e830a2b021" PackOffset="8" />
     <Blob Hash="3da6ed2e08ea8b457f2930608998bb6b66869478" Size="4193" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="906483" />
     <Blob Hash="3db31d7629699c77e8552cf2113e59bf1edb00ee" Size="1740" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="2094978" />
@@ -45657,8 +45547,10 @@
     <Blob Hash="3dc00b3d06cd1d5450aa91e421b77bef26e85ae0" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1163560" />
     <Blob Hash="3dc22ac6db5b8ec2a9af472fcf28ab268a7e88e6" Size="46112778" PackHash="9d2ab52c598ae6bfabef2035bca26c417e86206d" PackOffset="8" />
     <Blob Hash="3dc6675f7b997916e8967f88c8906a85ad0150ac" Size="2675" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="328031" />
+    <Blob Hash="3dc950b436aaeec4a796cec927e64592ebcad47f" Size="150882" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1218596" />
     <Blob Hash="3dcb8a58f8a30a90a2117ed7b29c3e5125df87e4" Size="3176" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1551367" />
     <Blob Hash="3dd7a27933f19dfc4d976b59e6cbf56dc5553fa0" Size="13824" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="1704456" />
+    <Blob Hash="3dd7bb568f7d12c16581a95e3dab1fe4ce3c6c65" Size="736254" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="1183666" />
     <Blob Hash="3dd9089a730e3be9e347ecca632d7118a0f309e9" Size="94171" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1103204" />
     <Blob Hash="3dda8f7fba91bac1c73db3df235bccafe56cbac9" Size="3187" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2081432" />
     <Blob Hash="3de052f8a2fee1e2cd1171f829ae4fa900f71df1" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="695876" />
@@ -45671,7 +45563,7 @@
     <Blob Hash="3df15358f964666eea45e6364e91288a3980032a" Size="3497" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1084181" />
     <Blob Hash="3df736466f36ca53f02e5e92b3eb7ab4eaba3d99" Size="33" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="2097116" />
     <Blob Hash="3df999b3a8d249adabd8272a1ce2ecb81c7c4aeb" Size="2283" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="797609" />
-    <Blob Hash="3df9d9f0482d0fdc3563ef82420c0c98d0441170" Size="2553" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="967052" />
+    <Blob Hash="3df9d9f0482d0fdc3563ef82420c0c98d0441170" Size="2553" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2092872" />
     <Blob Hash="3dfa7d21a31c99078a139c5f41740b8ead4085c2" Size="8104" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1292048" />
     <Blob Hash="3dfae5799905f0d9889fbb97ea116e4fa0bde4ce" Size="16891" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="2078505" />
     <Blob Hash="3dfb9dafed66cdb16f9472879edb13defb9862ee" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1945850" />
@@ -45680,6 +45572,7 @@
     <Blob Hash="3e03a5317315360855875416dbade841a2d83ff0" Size="1437" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1534198" />
     <Blob Hash="3e04dd2c41effa9f166c3782413f14dcbfab583e" Size="629" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="683718" />
     <Blob Hash="3e050517b3d5824d75552414f67b55bc4a593764" Size="880" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1150476" />
+    <Blob Hash="3e077f8092a10f1d1a0704b34c49b7ad0e16f878" Size="181586" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="1874110" />
     <Blob Hash="3e0aa1f661de09a76c20f79f964e23b11288fa6c" Size="1128" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2093500" />
     <Blob Hash="3e0d31cb4f3dbd65509d0f11d84927113ef39746" Size="3061" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1148875" />
     <Blob Hash="3e1022f946d7ec5442cbe115b3106fd55aed0065" Size="2871" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="625086" />
@@ -45692,6 +45585,8 @@
     <Blob Hash="3e1d74df6afeb6cde8ecbdac8f81f2f9c64150de" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2024106" />
     <Blob Hash="3e2346a90a4b9214585f9c097267d2ec8fd7644b" Size="2180" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="481953" />
     <Blob Hash="3e2d3b508346ee13e31ae53e6364a7bdb2461c24" Size="31739" PackHash="b3df044bb928c0123e3067b6ca07bc8db2c7c93c" PackOffset="369420" />
+    <Blob Hash="3e2d93e65956de9eb80cc2d1f61e5b7958711330" Size="214016" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="1856032" />
+    <Blob Hash="3e2f51c5e236c5c16d347bd3f303fa6c0cf34709" Size="10821280" PackHash="eef602252e9f66b2735be236fcb1366335216742" PackOffset="8" />
     <Blob Hash="3e30e41ce42bf25f02e78ef467aa00dd9337f8a2" Size="29053" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="37758" />
     <Blob Hash="3e344f16ae898f25f9e98d3c4cfccb35310cc0ff" Size="4043" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="717110" />
     <Blob Hash="3e34865ea5863306c461cbe041b8d29dc1ba7ddf" Size="16896" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="1969260" />
@@ -45699,7 +45594,6 @@
     <Blob Hash="3e4414920b1794c2bf90d73b5fa4f1673027add5" Size="21346" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="342317" />
     <Blob Hash="3e44f5c6f124937673819e06372a702044322f04" Size="39981" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="489330" />
     <Blob Hash="3e465810a7b1acb30a86a106c58d3048bfbf2da9" Size="41912" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1614473" />
-    <Blob Hash="3e480f1175ba6f167b5087765fc40e0ebdb76171" Size="6669618" PackHash="b2f8531f0a55520f1353ac2aeedfb516a2c678bf" PackOffset="8" />
     <Blob Hash="3e4b1a261aeebafd67fedd7e61dcd324eb11166f" Size="4495" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1843582" />
     <Blob Hash="3e4c52ebe8704a5009adeb042e68bd063ddc5e64" Size="36128" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="8" />
     <Blob Hash="3e509179ab4bac10d04fbce50c47dadbd9bb0578" Size="725" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2096188" />
@@ -45733,12 +45627,12 @@
     <Blob Hash="3ea33fab3015c305537807b1fdfd12a0d277b043" Size="100" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1742016" />
     <Blob Hash="3ea34b5e6e3078a9501653ba069d5e5e879d7fe4" Size="8505" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="570438" />
     <Blob Hash="3ea7e9996d3e01b13fc9806e1a5f0fac07220e33" Size="2778" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="465739" />
-    <Blob Hash="3eb07a57288a0dab4e06fbca51a97a5df0b48c4e" Size="2326" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2093650" />
+    <Blob Hash="3eb07a57288a0dab4e06fbca51a97a5df0b48c4e" Size="2326" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1947242" />
     <Blob Hash="3eb3df286c5b887f39d3cd94721c58adcfbfdb62" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096660" />
     <Blob Hash="3eb48728dada5ab08e2a947a93dbb6a832d8bf10" Size="39786" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1963339" />
-    <Blob Hash="3eb543ad43054cc362a0189b9a6cbfc1e188bd2f" Size="41200" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1577057" />
+    <Blob Hash="3eb543ad43054cc362a0189b9a6cbfc1e188bd2f" Size="41200" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="2039927" />
     <Blob Hash="3eb6448f5f7d6f6ebf6468e393859be81a4a941d" Size="302" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="678928" />
-    <Blob Hash="3eb81d9400726e64d3c4f14682f3e436ba76c7f9" Size="513234" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="1575432" />
+    <Blob Hash="3eb81d9400726e64d3c4f14682f3e436ba76c7f9" Size="513234" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="1514842" />
     <Blob Hash="3ec1a1fee82677f362bd98e7dda6ab8870735967" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2097050" />
     <Blob Hash="3ec9beb2380248b263ffac1bf498cdfda7fa003d" Size="14154" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2071757" />
     <Blob Hash="3ece7e453c53ee5e222edd2259d4678965c2c103" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2084852" />
@@ -45758,13 +45652,13 @@
     <Blob Hash="3ef1355db964fc91d4e46e1283feb49f2697f445" Size="1332" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2056822" />
     <Blob Hash="3ef18a3a5c6be023f3cfb54c2d0876d477e23043" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="2033873" />
     <Blob Hash="3ef41539986c7ec3d56d4fec894acd78cf2d6ae5" Size="604590" PackHash="218b41b249f8b8cc60c48cdfe5f9f3139acec694" PackOffset="1372306" />
-    <Blob Hash="3ef579906d1101468c37e5857ce98d374cbc7e12" Size="23375386" PackHash="727db8bb6ead0674e0242dd95bd766ad1c0a4dfe" PackOffset="8" />
     <Blob Hash="3ef62bb9f33dee663cd59d6bdc159bf14ae20fcf" Size="23558" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="1938113" />
     <Blob Hash="3ef6d6cac9151581c88b1b021291707b6cf1f849" Size="7428" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="819733" />
     <Blob Hash="3ef822b482a5714b01310ad7f666e25276674d76" Size="946" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="1260931" />
-    <Blob Hash="3f01011b99351d849261ee641814ce48a5839069" Size="2913" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2088592" />
+    <Blob Hash="3f01011b99351d849261ee641814ce48a5839069" Size="2913" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2093643" />
     <Blob Hash="3f01961b33c18d993501cab5e74417abc15492f0" Size="83028" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1865644" />
     <Blob Hash="3f0279b9505b8a3769a46241650c3021cd47131f" Size="172689" PackHash="0851da62d0e5f3dd0e00512bd0e43cf65963ca41" PackOffset="1416348" />
+    <Blob Hash="3f0490ff43f14424e23d6be7837d68b0ab15f61c" Size="172332" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1369478" />
     <Blob Hash="3f0585a156591235e9db22fe30b6279ec1d48afc" Size="4726" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1307141" />
     <Blob Hash="3f08226dfe929bdf139d557dfadfd71eccd8b5f6" Size="145628" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="342091" />
     <Blob Hash="3f0b75d81e61725b9005c0678fc64ef8a2519f58" Size="3319" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1438389" />
@@ -45814,6 +45708,7 @@
     <Blob Hash="3f6b29a77fc092b3533bb4a8e8021c3ec677671b" Size="806" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="247043" />
     <Blob Hash="3f6e69d20b8c264d613d6ecc461776df0a2024b3" Size="31376072" PackHash="9277c40b8a3f1b06c947eae28baeafe879da11d5" PackOffset="8" />
     <Blob Hash="3f7121db163058a5af45c8ff8784c71492786c72" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096777" />
+    <Blob Hash="3f7450ce465a117076afc29e66be3664208f407c" Size="6293072" PackHash="e048ab728cc0f8f1e3fa027f821ae2793decf1e5" PackOffset="8" />
     <Blob Hash="3f7536260365a3bb737a8633db4c51eb1ee67a0c" Size="19904" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="266369" />
     <Blob Hash="3f7664a4fd420b93886fa4c51b6244e71e392a89" Size="18327" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1267452" />
     <Blob Hash="3f777b5e91b0f042b946a75b3cb0b6db7ffa334e" Size="1662" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1047953" />
@@ -45821,7 +45716,7 @@
     <Blob Hash="3f8090a1f04cc90f6fa4e066387708bf378b805f" Size="5280" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1740173" />
     <Blob Hash="3f8452ebfb2905376b8b981bdabebda924986d09" Size="15988312" PackHash="e5dba2160aca88a58c4b0b5d5adb4f9c4ee02e37" PackOffset="8" />
     <Blob Hash="3f84c3357801a236ef309492655573b1f8f18d59" Size="94720" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1382604" />
-    <Blob Hash="3f85ff0b69321a78cf5a8ca94ac1b40a14682574" Size="3754" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1083585" />
+    <Blob Hash="3f85ff0b69321a78cf5a8ca94ac1b40a14682574" Size="3754" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2024319" />
     <Blob Hash="3f8aae906cb7a129f789c296d0d91c119f167567" Size="708" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2089653" />
     <Blob Hash="3f8affa52d9f7607c410a6b70e3f141b9d3932e4" Size="3612" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2021502" />
     <Blob Hash="3f8d13f36f1d93c98fb19dd6413f5a19812d290e" Size="12924108" PackHash="abea72c46ecb587cf8de6e1a3c20682917aa4cda" PackOffset="8" />
@@ -45852,7 +45747,6 @@
     <Blob Hash="3fb1f8c59699bccbeb4e6ecf17e82b06c1d1d03e" Size="2440" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="708276" />
     <Blob Hash="3fb407a507647e135588879e18911abf33a466f7" Size="6172" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1553470" />
     <Blob Hash="3fb789ffce408026c00394efb926e7fcf14a7e5e" Size="27648" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1602875" />
-    <Blob Hash="3fb9b7ad569998ff4d83673c2a4dc255c82e0595" Size="127604956" PackHash="13a9ea79cc0c6739419051442aeebd83d180dfd8" PackOffset="8" />
     <Blob Hash="3fba7a129e45b505275956026dfe43eac4d31761" Size="1933637" PackHash="28926b6102371746bf5dd7c493c2353392ba76f7" PackOffset="8" />
     <Blob Hash="3fbb760c6138529b5f22607798690385f8c2f80d" Size="670" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="398997" />
     <Blob Hash="3fbe4be9ac9498176251d26ba43baed53aac2b43" Size="13312" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1067896" />
@@ -45864,9 +45758,9 @@
     <Blob Hash="3fd29a1c5c9492354a8ee0a33e59726671acef75" Size="13382" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1137538" />
     <Blob Hash="3fd42ad6eb2f262382a23a206d99923d8b3f861a" Size="30101" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="675804" />
     <Blob Hash="3fd453b6e91a91ad284c1431ae9829832587d81d" Size="806926" PackHash="355787b70dec38d21eb9784c7a2d2813170fb312" PackOffset="8" />
-    <Blob Hash="3fd5a661a93932c46c5ddf52d7049591c0feb837" Size="2141" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2061094" />
     <Blob Hash="3fd889b68d41ff6f822fb9fb3a8ff1b765bfd20f" Size="4238" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="388043" />
     <Blob Hash="3fda9dda8a26b8085f243b18fd7f587279998b31" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="179232" />
+    <Blob Hash="3fdd57cf0850575928ff3b5105b47e5f6a1d0286" Size="1781364" PackHash="1bfd9b85a7181c944374fc8a94632065574a0029" PackOffset="8" />
     <Blob Hash="3fe0f43423c654507bc9315dac93544d1edaa600" Size="1929216" PackHash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" PackOffset="8" />
     <Blob Hash="3fe25158acdbd51404663fe16048ef469195f804" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1031363" />
     <Blob Hash="3fe36a057c2793a6712c3e2ce2dcae61094c237b" Size="692" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="611696" />
@@ -45888,7 +45782,7 @@
     <Blob Hash="400bdb779327c7bb5abf771db28fbbceb63afa5c" Size="4591" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="334979" />
     <Blob Hash="400dbd4cb3c4b6c708a581b602575ce44f2f61af" Size="3695" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="398151" />
     <Blob Hash="400f5f8201bc8b9d057e9b3586ef6be0a527310b" Size="11552" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1251920" />
-    <Blob Hash="401396710a4c2cecbb3a7d425894443367328096" Size="1193288" PackHash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" PackOffset="8" />
+    <Blob Hash="401396710a4c2cecbb3a7d425894443367328096" Size="1193288" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="8" />
     <Blob Hash="4013c562d2726be355294d313d396e40fad5c5bb" Size="671" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="361236" />
     <Blob Hash="4013e2804a56801a36cab8dbbcbaa50436c685aa" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1368640" />
     <Blob Hash="401a058f8badb29265f31466e1c57096b0ca5ce4" Size="139264" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1951724" />
@@ -45902,7 +45796,7 @@
     <Blob Hash="402c9c36c20796377c4ebf43ef32e4a1f9d186a2" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1998283" />
     <Blob Hash="402de1b59cda638b7662c9014ecc595cbf5d4c96" Size="1254" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="505861" />
     <Blob Hash="4032d0fb59a23238f7628a62f76e851349a0c6df" Size="2784" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1020268" />
-    <Blob Hash="4032de6a1ffc0f1d31a31f481ae04688b70fdfd0" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555021" />
+    <Blob Hash="4032de6a1ffc0f1d31a31f481ae04688b70fdfd0" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674253" />
     <Blob Hash="4035ca6c895a614d844986d7a0c769291cd6c02f" Size="3266" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="781852" />
     <Blob Hash="403661e644306dccb058f935a5962ce2eafe91f2" Size="60816" PackHash="d5300790dac3cc619f89851b34f424d123202d88" PackOffset="247562" />
     <Blob Hash="403c78c6c31dd924ba78a33d2a6f7705c633bbed" Size="150345" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="969908" />
@@ -45921,9 +45815,9 @@
     <Blob Hash="4058be2a64c0c0aba64762b767ca29da923af46b" Size="2504704" PackHash="c581d5072ccc98ee8be147bb882c040ef3ff4ce3" PackOffset="8" />
     <Blob Hash="40602d415a282aa04506d1bf8b4e18d949514cd5" Size="3390" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2013519" />
     <Blob Hash="4066b30578d9dc7385f48d60403e9c845ba26df9" Size="25735" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1372406" />
-    <Blob Hash="4066fe05151492ef300bca0ee7c4eb2e2764087d" Size="675" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1593082" />
+    <Blob Hash="4066fe05151492ef300bca0ee7c4eb2e2764087d" Size="675" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1712314" />
     <Blob Hash="406703d0ebbba6dd1f31222a339fa957e4a77024" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2096021" />
-    <Blob Hash="406706587dccd1fcfeb641e9b00c25a811617605" Size="235" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2095976" />
+    <Blob Hash="406706587dccd1fcfeb641e9b00c25a811617605" Size="235" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2096266" />
     <Blob Hash="4069667e38d4ad0ad321a73270d46bd5716acf27" Size="317735" PackHash="8da6976ecaa99b785dd5b8786a2cacb519d2d294" PackOffset="1704001" />
     <Blob Hash="407249aedbc65d4e3d2d4b814f206a662702ad64" Size="2753" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1217286" />
     <Blob Hash="40729cc361944f1f49b8acebe7958f0a41b2d225" Size="91284" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="8" />
@@ -45944,7 +45838,6 @@
     <Blob Hash="408ccd4e916270299a50a0a12591ae8e0bef6d92" Size="40036" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1555663" />
     <Blob Hash="408ea6a584c89ff28342fb729aa605d6e84f1cc5" Size="108454" PackHash="40675b4095aba56b00503d0ef5c59b51b9e3e0db" PackOffset="100833" />
     <Blob Hash="408f156473bae0269feb9d38884973ab360cfd18" Size="800" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="509938" />
-    <Blob Hash="4090acb0b9915431386b3962e8a503f1df15b3da" Size="364" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1784164" />
     <Blob Hash="4091638c7ae12c56c48ff9fcdfdc5200a1c505ae" Size="2137368" PackHash="ada3dc17e0a699e9f0888f167ab43c95b9d087c9" PackOffset="8" />
     <Blob Hash="40920bd7924050dfa9f0ae5fdbf649aa8aaf5987" Size="107746" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="1242388" />
     <Blob Hash="4092f6a0cf000293e4a8b86c6b2cd935afc030e3" Size="3436" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2013160" />
@@ -45954,10 +45847,11 @@
     <Blob Hash="409e019cfacc4a1da6b6abab8c8d54a1d0ddc198" Size="1143808" PackHash="696aa11a029bfeebe1885750c0a1219698f45667" PackOffset="602231" />
     <Blob Hash="409e025699ae87696793e5d3f655d30782f37a5e" Size="590" PackHash="8da6976ecaa99b785dd5b8786a2cacb519d2d294" PackOffset="2094150" />
     <Blob Hash="409f4fcdc3e284165a5a0445f08fa0cd53ae5f37" Size="114139" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1534033" />
-    <Blob Hash="40a010bc2d76e2e95add6e616b176750cb43d491" Size="151" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1438376" />
+    <Blob Hash="40a010bc2d76e2e95add6e616b176750cb43d491" Size="151" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1887429" />
     <Blob Hash="40a0c88a403b191f1b6bb1e3d4e1c0d8bfa35cd0" Size="31307" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1644596" />
     <Blob Hash="40a2e284846ea2d337e5514cfc2c20eb75f248b7" Size="756994" PackHash="bd015e7592fba2109a78a6a8f3e4b3c85d0c9a10" PackOffset="1230446" />
     <Blob Hash="40a35b1f7dc25ac1da4c418a1e4881a82468b109" Size="7865" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="504017" />
+    <Blob Hash="40a4398cdbbfb7e43890f029a3f3cdd9721526b9" Size="21382" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2008498" />
     <Blob Hash="40a5141e5d21ba57d01db39b1e4b121418452cd6" Size="27136" PackHash="2c797c8cdbb2be35e76d93560da7fd6ebad0d926" PackOffset="2069288" />
     <Blob Hash="40acb2cd3516fce14a233c980d46bd7b1e92cd45" Size="38766" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1125902" />
     <Blob Hash="40afa89650736b37fee15cd10dc454b4757dc724" Size="3105" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2090627" />
@@ -45966,13 +45860,13 @@
     <Blob Hash="40b374fa75b3e9be37ea76290c6e4b0594c6748b" Size="1786" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1370360" />
     <Blob Hash="40b43cd796a144fb805d7a176b52beb74992c2a4" Size="14304" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="882185" />
     <Blob Hash="40b49593abb78c8b3e3059b7c95759c42cd6b49c" Size="1912" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1375096" />
+    <Blob Hash="40b73e86cd0c449d39ed6dce010f4ba59d51ac4b" Size="1408208" PackHash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" PackOffset="8" />
     <Blob Hash="40b981ff7fd5f2ca60094982bfff217a6bc9fc5e" Size="79360" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="805384" />
     <Blob Hash="40bd5125a91e71c550ab136f82d61b1a10a6730c" Size="125998" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="811334" />
     <Blob Hash="40bd90500612715879249d70867a4a5e47b128a8" Size="89241" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1972051" />
     <Blob Hash="40bf3e75a4b724401785c0e5f322360b5410f1d2" Size="35077" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="650304" />
     <Blob Hash="40c0892b172e5dc14a6cea6fe4edda7dea4f3a68" Size="338964" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="8" />
     <Blob Hash="40c0bfb6bd42bec3ca8c86308f69e376a6e2d68d" Size="477088" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="1591511" />
-    <Blob Hash="40c20df104f72aa88c324687d6c0ecef7574c3c1" Size="54784" PackHash="7ae32a8aa3e7d7599069e8c73c4bb5dcea7cb0a4" PackOffset="2027528" />
     <Blob Hash="40c2495926435fd0b87eaa1f808e37bbeaaecf12" Size="814" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2064688" />
     <Blob Hash="40c388fe2a55078c8e0524a4385b3f8846960e24" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="457656" />
     <Blob Hash="40c3bad3ab79a7c96c45401ae533272b5ca13d59" Size="5282" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1647421" />
@@ -45985,9 +45879,9 @@
     <Blob Hash="40d4ed458acbf176e40d1a743c32ad1fc978b355" Size="701" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2065504" />
     <Blob Hash="40d93e35487fdc30b312201fc17fec78e6c5d9af" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1997918" />
     <Blob Hash="40db404e0e458208cedbbf4d43c1af5cd700ec22" Size="647" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2042203" />
+    <Blob Hash="40db7ee7946362e9b88de46cae16621fdb025ae6" Size="343244" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="1530712" />
     <Blob Hash="40dd9d788d9cf3a2aeed9293ba891861febd0164" Size="65670" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1748751" />
     <Blob Hash="40de925ad1960eccb39accc36a38a0af2abc6a67" Size="6658" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1065365" />
-    <Blob Hash="40def62265fc309691b0c4bdc9f9d5c173d74997" Size="12364" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1702234" />
     <Blob Hash="40df01f7d88ed94726f1fee815dcd4747fb47a02" Size="3673" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1567128" />
     <Blob Hash="40dfcc672ff904e8d421f04ea78510b91aabca1a" Size="3824" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="373052" />
     <Blob Hash="40e3580f9caa1b71d897b9207d1ce443ca8828fa" Size="1734" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1477127" />
@@ -46001,17 +45895,16 @@
     <Blob Hash="40ee99ada17ca0fe1b79b83fe30535f351eeda36" Size="152" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="440156" />
     <Blob Hash="40f10e9daebc4d556d88afccd1de74655e1248e9" Size="93582" PackHash="df7e1c0f4fc78d7814f044a10de1362862cc7bac" PackOffset="1836337" />
     <Blob Hash="40f1949ee157e6c2ffd3441852b71b1647803716" Size="4848" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2001352" />
+    <Blob Hash="40f3c7d2b293f67a12050ba95e58e5607aa28880" Size="32080330" PackHash="ed5fbfb1179d01f59486f6fa8b20fce28760f466" PackOffset="8" />
     <Blob Hash="40f3e964044cf5e849fceb3373e56783fa2091b0" Size="460" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="263023" />
     <Blob Hash="4103fafd152a46e8b4ef35d4cc2e536c3732e981" Size="616" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2096174" />
     <Blob Hash="41056e87d0e3f481ded0fb2acdcbb22a72683deb" Size="32643" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1909072" />
     <Blob Hash="4105918d5f31e686e22c7f1c010737efe4b90502" Size="26228" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="651052" />
     <Blob Hash="4107a8c18d913ad2d5c6b1220d0f5ab1c4465023" Size="215" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="579480" />
-    <Blob Hash="410d9e77ea1ef4f48b04c8f1a5524cc70981e3d1" Size="3775" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2049928" />
+    <Blob Hash="410d9e77ea1ef4f48b04c8f1a5524cc70981e3d1" Size="3775" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1941059" />
     <Blob Hash="4111880bc8d4f1624e841c97f7b0d08a8af4d91d" Size="104465" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1810564" />
-    <Blob Hash="4112583bb921fd0ed83edc2a69d6a65412f31ecc" Size="2839110" PackHash="39f457f3abcd7a0cb328983d0003b03b536f8717" PackOffset="8" />
     <Blob Hash="4117d768ff73f9646f881f847f6e99209082c542" Size="37192" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1286282" />
     <Blob Hash="4119890fbffda26d386ee1df2deede471a7044ee" Size="9824" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1754077" />
-    <Blob Hash="411c2c2a5328bb7423c71e2198b679f11f36e4b7" Size="2273" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1403111" />
     <Blob Hash="411cd9b1794f87fbb879a82ae0f48f0e6ed9ec39" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="173064" />
     <Blob Hash="411d7ef3d0ab6270932efc13ac166e6fd0ea0b2b" Size="14360" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="716260" />
     <Blob Hash="411e36dc124ee04b9733a6b530e72d585dd42f5a" Size="249" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="2096773" />
@@ -46022,6 +45915,7 @@
     <Blob Hash="4129aefa171b0fc3f3adec141822c53934005bb3" Size="13224" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1577238" />
     <Blob Hash="412a1b4bdcd5038f986b3fef3abe047bf02987d1" Size="104" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="2097022" />
     <Blob Hash="412adc9f9620e2b8bce8486c7856ead145c00943" Size="12180" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1171552" />
+    <Blob Hash="412bd8386b73a231a3f150cf650bc2285928dc94" Size="168982" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1729596" />
     <Blob Hash="413492ed1ada24f838d78e45bcbb23422e1658cf" Size="18699" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1132840" />
     <Blob Hash="41378608fd30f2eee4b8283eb62de6a578e7219e" Size="12520" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="430782" />
     <Blob Hash="413895fb75568f3efc459d18558c00e427d0b5a5" Size="4113" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1398959" />
@@ -46045,6 +45939,7 @@
     <Blob Hash="4160c23cfa6cc6e9705a953a9b10030cfa82536f" Size="20085912" PackHash="78fcbb1e8afd813307d76f406251e69e55de71eb" PackOffset="8" />
     <Blob Hash="41620b56686b568f532c1b119467889221c211b5" Size="9229" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="256829" />
     <Blob Hash="4163ca0d6b7fd8775fb3f64d5e7c443f8f35b835" Size="3092" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="319336" />
+    <Blob Hash="4165edce4fa3c576287f9c8f22a0679b5eea61e3" Size="54174736" PackHash="af4595f96245b7ff97c27a13f080de3fa663b1f8" PackOffset="8" />
     <Blob Hash="4167b977213e310f7f7ccd996dea1dc78237ce8a" Size="133564" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="131791" />
     <Blob Hash="416994f9b87efdeae84c56a68d63346f4575a269" Size="34006" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="373463" />
     <Blob Hash="416b1f95ce584cc043c2159eafd11f9870adf6f4" Size="37513" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="142774" />
@@ -46060,7 +45955,7 @@
     <Blob Hash="417e0c79196b0242d51438953f6567226cee3f3a" Size="45080" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="167260" />
     <Blob Hash="417e12c4582ee2fcfcdf255a1174703b78c41a2c" Size="41562088" PackHash="1ff72fe5632161d10028c4b481835792855d6e20" PackOffset="8" />
     <Blob Hash="418016f1b93b79068cfbc2a52c2f6af66b139180" Size="362" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="550995" />
-    <Blob Hash="418184c1e90e0cb0f09bb0ae96eff3905babae1c" Size="15879" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2001238" />
+    <Blob Hash="418184c1e90e0cb0f09bb0ae96eff3905babae1c" Size="15879" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1759664" />
     <Blob Hash="41822ffabbadd0c106c3b90884a076394e67060c" Size="4440" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="117955" />
     <Blob Hash="418296b8dd75c111bb5c765ab43c7a2e93037d79" Size="1498" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="323277" />
     <Blob Hash="41837b489dd039457e00da70d6e15dd7fef58d4a" Size="5684" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="111594" />
@@ -46079,27 +45974,30 @@
     <Blob Hash="41919906cd7510c9ffcc980e53b5fd83b1ab90ea" Size="1467904" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="8" />
     <Blob Hash="4191bcb6b487ac4004ca4fbfa21081e1df19d542" Size="194011" PackHash="0851da62d0e5f3dd0e00512bd0e43cf65963ca41" PackOffset="1755072" />
     <Blob Hash="41953009b7be9a843e6ae67df3361d0353f3d8d6" Size="1547" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="935289" />
+    <Blob Hash="419694f76fd8c8805ab3fb9fb3b332d385ce2383" Size="1022272" PackHash="9d7c17c0c890b7918122c3efe9aa02933b27d31c" PackOffset="1057152" />
     <Blob Hash="419745899449775c656bacce9aeb66190594cddd" Size="961" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="287731" />
     <Blob Hash="41979e2c87d07e1365034806763c282241c94380" Size="5707" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2041091" />
     <Blob Hash="4197bc92ba626d7750abba8fe304b824a021d3f2" Size="168817" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="629939" />
     <Blob Hash="41985885554e3da492ef2f4652eeaed65551ce09" Size="84011" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1769922" />
+    <Blob Hash="41989ce3b745867c55b2d7368fc38940d238e7d4" Size="92797938" PackHash="6b420b09af0f6489e3124c93ccd721480ba05f93" PackOffset="8" />
     <Blob Hash="4198c242dda1712805763d60e546fc76da0b5e2b" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="163526" />
     <Blob Hash="419eaf39f4dfa164a09fb60aa932072ffc351f27" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="245667" />
     <Blob Hash="419fafc8b0704da596e84e2356945f771dad9916" Size="4021" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="1914192" />
-    <Blob Hash="41a13e3c8f4d39d9e06a4e2408dbefad3507d1ba" Size="35632" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="658586" />
+    <Blob Hash="41a13e3c8f4d39d9e06a4e2408dbefad3507d1ba" Size="35632" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="1970409" />
     <Blob Hash="41a2bdc7429720fa2e496352d4c0fa5c7b54f878" Size="165" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2096908" />
     <Blob Hash="41a6a1a76e3f8cb193e1d15304ea6d9e49d7a856" Size="41472" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1307656" />
     <Blob Hash="41a91d71b898981426373f1b71462587d896792e" Size="5153" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="842775" />
     <Blob Hash="41aa72b1ea9ee13678a6e959ca0a3ab761342a28" Size="20025" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="1456140" />
     <Blob Hash="41aad4bd3b72ccbb6a762feed3c24931642dd867" Size="1285" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1040116" />
     <Blob Hash="41ad2ece051227147b67964975442b6400f48ddc" Size="2921" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1745052" />
-    <Blob Hash="41af57c3f6be1574bdb6f25b91e5184ff9508fee" Size="405" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1562789" />
+    <Blob Hash="41af57c3f6be1574bdb6f25b91e5184ff9508fee" Size="405" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1682021" />
     <Blob Hash="41b187b3579b7d91f9b18edc823c14f027d5b400" Size="3502" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1916234" />
     <Blob Hash="41b27744ec2b708f9997fcf3503bf78f1ba7b282" Size="3713" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2089199" />
     <Blob Hash="41b2c2439dfa13a1e46ad255ffc84eafdf0c9a36" Size="180" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="559442" />
     <Blob Hash="41b71a4311040196817acdd599debf2a2cc65b22" Size="4186" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1989233" />
     <Blob Hash="41b8b352249cda829c7bbf1425a999008b57f06b" Size="473" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="362931" />
     <Blob Hash="41b8d9ebd6eee09e0a07daeff9919840465e49ae" Size="3843" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1242178" />
+    <Blob Hash="41baf020b5ff03bc9b036b4b3cc755d785f7964a" Size="41256" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="2043806" />
     <Blob Hash="41bfef11abb1011a4453187afb087649603bf819" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="631304" />
     <Blob Hash="41c17b78fd218323b3c6fddba1148bb7acd3b7cb" Size="31490" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="195032" />
     <Blob Hash="41c2f3d51a0bdb44d70a02699133ccad4a39f237" Size="12692" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="560188" />
@@ -46112,7 +46010,6 @@
     <Blob Hash="41d0f7f47d7d0c219cd49d6fcad03c116d083a3d" Size="7010388" PackHash="15290d2adfdd52e1d752e3b1a1275aa26fe56653" PackOffset="8" />
     <Blob Hash="41d82a37167cacc326afcf8b9fe85630c7fa4490" Size="976" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="282962" />
     <Blob Hash="41d894b4aa2d040e0b146aa2d47941103ed244e0" Size="7260" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1442024" />
-    <Blob Hash="41d8e71320aa04ec1c629a45deb3f5129321e61f" Size="736254" PackHash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" PackOffset="1193296" />
     <Blob Hash="41d9f8e497986772c72c6795073cc5bd65aac866" Size="3530" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1833388" />
     <Blob Hash="41d9ff64aad9a71bb50241932ffcd3fedcb15a49" Size="11669" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="62346" />
     <Blob Hash="41da482c883e116381605389c91e1f5d3934d30c" Size="75" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2096631" />
@@ -46140,6 +46037,7 @@
     <Blob Hash="4211d8306d2de3cea9c799249eca4abf234e53da" Size="8720" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1283271" />
     <Blob Hash="4211f5c514e99adc2814de4effc7eb2b6569a78a" Size="4946640" PackHash="2ac598ca34bd40c8d6b7bef7999eb1317d7c7169" PackOffset="8" />
     <Blob Hash="421573db3706e998396fcbab31c13b2ce9a58ea2" Size="3722" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="2092916" />
+    <Blob Hash="421573e8c74e7bb53d32cd9673cf99169f0d68cd" Size="29456824" PackHash="b245815768451c9a6502f8f522cccb37bc252ffa" PackOffset="8" />
     <Blob Hash="421603dbf93ceaff971025e6e09d71dd4cef3b67" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2079830" />
     <Blob Hash="42168ebc582f475b5063eeab509e3ffe68388c5a" Size="10438" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="586344" />
     <Blob Hash="4216c8f4d9465e794a1e575ee803fca52b77794f" Size="29236" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1731120" />
@@ -46147,8 +46045,7 @@
     <Blob Hash="4218353ab7bd63afc5cb1044f21ef1e8ef10e184" Size="100673" PackHash="2715b692fddbbf8de3790ccc99aaa94c4f4c7e09" PackOffset="1926748" />
     <Blob Hash="4218bdb6d75bcf4aa76275cd3ba12c53555aa719" Size="3376" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1843378" />
     <Blob Hash="421a867db3fd4779c5f759d0b657d8eb5fb2218b" Size="186" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1790799" />
-    <Blob Hash="4223ecda63c63ba3f0de16e1622d1a43d8d31ef9" Size="2410" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="2087782" />
-    <Blob Hash="42259b920db541b620305dcb04ddb0dec7357238" Size="124409" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1849678" />
+    <Blob Hash="42259b920db541b620305dcb04ddb0dec7357238" Size="124409" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="1963128" />
     <Blob Hash="422652d69ad60d836ea1d17fef7ec84c4a37a976" Size="2911" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="517379" />
     <Blob Hash="4226eade2b11074705ae6d718e9b76817822f31e" Size="47856" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="481048" />
     <Blob Hash="422737989213deb358eed7cf81eac6a9624b54e1" Size="2887" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="1897992" />
@@ -46175,7 +46072,7 @@
     <Blob Hash="424c6f72577cc9919433b10ea614245d8e634d0b" Size="325" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1209786" />
     <Blob Hash="424d47688f06b2496d359183ecd13bb231ddd8be" Size="10240" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="458760" />
     <Blob Hash="424e028c67767cd7e85b865f437ece6d4b57d6f9" Size="1150" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2002280" />
-    <Blob Hash="424f2c25b9df6761a02cd3ee39a5e686592c6754" Size="66" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="2097085" />
+    <Blob Hash="424f2c25b9df6761a02cd3ee39a5e686592c6754" Size="66" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="2097085" />
     <Blob Hash="425026a2a3c418ed1900fece0e02ad83c455c5b8" Size="5900" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="37156" />
     <Blob Hash="4250b17eed5b9323b157ce65730064e46a591321" Size="1871872" PackHash="93566441053b4785e395d918bf77da92f4aab7ba" PackOffset="8" />
     <Blob Hash="42521fd7d7f445516b030c03cff4f2bee55564f1" Size="3277" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="144425" />
@@ -46203,7 +46100,7 @@
     <Blob Hash="42913d2319585a61e4f8d7257e122b62ac43d04f" Size="2072" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1109831" />
     <Blob Hash="4297e3feff4b5bfa54526513bd55c5fb841d6c0e" Size="4081" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1208120" />
     <Blob Hash="429a70c90cc8b4504b4f263e2283b32cb0a0df88" Size="2355044" PackHash="c9c278871f7416bd78c37e9990e238b431898126" PackOffset="8" />
-    <Blob Hash="42a3610d26e49e3e57610dbf4ef5f0a7e7b2987b" Size="75710" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="1970560" />
+    <Blob Hash="42a3610d26e49e3e57610dbf4ef5f0a7e7b2987b" Size="75710" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2003992" />
     <Blob Hash="42a53e699304721f28aa1b315833b0e5e3958402" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1995177" />
     <Blob Hash="42a80fd9e32a0a4941e9c35ac78296aab4f0d164" Size="14848" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="441352" />
     <Blob Hash="42a993b80a17d3f3c7983f1282e1e1fece63fded" Size="104" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="2097022" />
@@ -46221,17 +46118,20 @@
     <Blob Hash="42bbe6cb664b430bfbd8e3db7aaab38f333df6f8" Size="65137" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1019271" />
     <Blob Hash="42bd1f08941751d88e63f19e0e12a8072e88c655" Size="152" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1352689" />
     <Blob Hash="42c024b81ecb95a21293d4ba99b647ea0661f1d7" Size="1172992" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="535048" />
+    <Blob Hash="42c03f8adc6d8cf3641ec220a28f72a1ebd5a5d2" Size="1297476" PackHash="fc21197f05ffa1e1cb73441cb5cb45012227bfee" PackOffset="8" />
     <Blob Hash="42c53e2e3c752ca8994d8d803339b2330b218e94" Size="150500" PackHash="28926b6102371746bf5dd7c493c2353392ba76f7" PackOffset="1933645" />
     <Blob Hash="42c60b4dac349716b422da721d9ffaf944b41c68" Size="11617680" PackHash="6081a3a4645afe95bd2b27e9d8be23a21e369465" PackOffset="8" />
     <Blob Hash="42cc8cc0219d5ecdb145acb32bf0ab8a350e4193" Size="118327" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1114196" />
     <Blob Hash="42cd7e4e00cb4e73347c7509d58f29a935f05a27" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="183994" />
     <Blob Hash="42cda2bf5cf193319dfe388df69163d53517c019" Size="1512" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="1750831" />
     <Blob Hash="42ce008e832639e7d191d6bc3b43830e74348471" Size="9132" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1429394" />
+    <Blob Hash="42cf2c62405db554e3295995c415903323285bd2" Size="3201130" PackHash="fedeb6b92cd68c1b456bd58169de4959cccbc676" PackOffset="8" />
     <Blob Hash="42d5427c0808cd68c6cc3652d040ec97966c50be" Size="1937145" PackHash="485fd4e8653da37ae3302212c1ff6c808f2e1e7a" PackOffset="8" />
     <Blob Hash="42dab5757db2fe6aef8e8c7be4f368275c03a275" Size="530" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2001796" />
     <Blob Hash="42ddaa8e75a3e0115746bd92563bf80354913ac4" Size="88" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2093024" />
     <Blob Hash="42e066e58c82826fe4eba4945b8ee5ecf8eaad19" Size="58498" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="1308239" />
     <Blob Hash="42e41af1e23b6ff3017780bec85e0d50ad5ef30a" Size="3377" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="522873" />
+    <Blob Hash="42e923aff99d9ff5bd793327c9c35b55f8000915" Size="163874" PackHash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" PackOffset="1871036" />
     <Blob Hash="42ec50a609265143690b060c515083cf11133067" Size="96" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="301916" />
     <Blob Hash="42ecf110190fb7fd86320f4e4d6fa3ceaf1c6395" Size="36" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="734127" />
     <Blob Hash="42edb45923f737ef5495225de6c529753bbca251" Size="19680" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1225688" />
@@ -46241,7 +46141,7 @@
     <Blob Hash="42f6ec76184ce59ca44c925c414f65e1a79d199e" Size="594540" PackHash="c798ec69224fa0c028f405298f4943f6ea92d3d3" PackOffset="1363976" />
     <Blob Hash="42f89df80fb820640868fed45eaff02c55d75066" Size="2261" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2092608" />
     <Blob Hash="42fc96b6891e20554f03480d4e773e9c9b962acf" Size="635000" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="651561" />
-    <Blob Hash="42fe73c4fcc9ae218af39e0b4230414252120ac1" Size="2226" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2091424" />
+    <Blob Hash="42fe73c4fcc9ae218af39e0b4230414252120ac1" Size="2226" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1945016" />
     <Blob Hash="43004f476d4016e93a78811f58c04acd641846ab" Size="427" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="261577" />
     <Blob Hash="43038a1333e30d0cbac64887a92a2e8705847412" Size="1028" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="213414" />
     <Blob Hash="430561a54b855ee466972edf615f0266d3678a4c" Size="9322" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1194682" />
@@ -46251,7 +46151,7 @@
     <Blob Hash="430a26c0ea9ef055130871e6e6c4a0e8c0350ab0" Size="6872" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="942214" />
     <Blob Hash="430b9d6ea2633378ffd53c307136f26a5fcf690e" Size="20922864" PackHash="0be2c627d24e446f2f7194edb8f790ec3d0c31ac" PackOffset="8" />
     <Blob Hash="430ba67069de3687f49e4313143100c4353f760b" Size="6645" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1934246" />
-    <Blob Hash="430ba8e1f7ec6e6c0549c1c930d409abb1ebddeb" Size="2778" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1942468" />
+    <Blob Hash="430ba8e1f7ec6e6c0549c1c930d409abb1ebddeb" Size="2778" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1999871" />
     <Blob Hash="430d2d25ecde11c556421b3d42a4775031f5a5bd" Size="3829" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1340891" />
     <Blob Hash="430d48cc63b2d723f9052ae615ad0d8b636c119e" Size="12375" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="235562" />
     <Blob Hash="430de6d74fe76711b8e417939d521d40caebd9e2" Size="3096" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="90125" />
@@ -46268,11 +46168,12 @@
     <Blob Hash="432fe20a7044f8413e6fe22c0dd33b9af52aa0ad" Size="47674" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="545557" />
     <Blob Hash="4332c40bfc6a9af3a1ae71d18baa02eb5c7b2077" Size="5340" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="516042" />
     <Blob Hash="433da5351da5b8e935a730f8c09972c193d324e8" Size="40502" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1325284" />
+    <Blob Hash="433f1e2ebc05e94a2debf19af639f5b05bfba7fc" Size="6117" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2087245" />
     <Blob Hash="433ffda801d37ccda9065c2c7be075e548a17b17" Size="6351" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="483327" />
     <Blob Hash="4348c69505f3aa6ebc9c0cc0028d90baaf95cc07" Size="4488" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2082282" />
     <Blob Hash="435b7a5f626b02cbe4c7e11d9b942753196179a5" Size="67199" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="1242950" />
     <Blob Hash="435ee4b6189682a959420e0f746de5224b167ee4" Size="3829" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="18466" />
-    <Blob Hash="435ff4627513d00658b195bad0c2f7eb08bb556d" Size="4731" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1955786" />
+    <Blob Hash="435ff4627513d00658b195bad0c2f7eb08bb556d" Size="4731" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2083840" />
     <Blob Hash="43600c37b131369622e563ab63e4db6794363009" Size="18594" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2036396" />
     <Blob Hash="4360c2aa576c8cc51ea594a8171e839b21289d6b" Size="1184588" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="478039" />
     <Blob Hash="4361f2c66fbbf9acd4af1e7b1ed30ae814644fdd" Size="7439" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="467560" />
@@ -46283,7 +46184,7 @@
     <Blob Hash="436dae85b8befc2d01bae7ebefb87b226c73fd3f" Size="682" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1913654" />
     <Blob Hash="4370356c6236002cd60de1f73c39f69bf5b4653a" Size="131872" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1845305" />
     <Blob Hash="4370932b5280aa68be3a722521a60109c8df11f1" Size="3663" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1807486" />
-    <Blob Hash="4370c815975b56b1bd0f8e7a0a16e8ea967a9677" Size="626" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1443508" />
+    <Blob Hash="4370c815975b56b1bd0f8e7a0a16e8ea967a9677" Size="626" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1892561" />
     <Blob Hash="437280baa20af194c3a5c7586f8b0c7fd0482e46" Size="860" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1773316" />
     <Blob Hash="4373a07f2674fe974189cc801987652aa97f0204" Size="192" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="165854" />
     <Blob Hash="4375cd39158c1e4a13f4020c918ec6772fbed2e0" Size="8286" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="714891" />
@@ -46296,6 +46197,7 @@
     <Blob Hash="438a7afeda7513fe7380b09b21c23c03d829abb6" Size="456368" PackHash="37744be8b7dd0b6ad613bd4110630d467b7b8bae" PackOffset="567620" />
     <Blob Hash="438fcf12c2c73f6bd36d0d5b5b3f1779b363ffb3" Size="2785" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2060830" />
     <Blob Hash="43903ba0a71cccf2063b8b83d89b3e796d2eac39" Size="131986" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="485760" />
+    <Blob Hash="43913081df88ee0d4a10fbedb400f587853b7dc2" Size="7639840" PackHash="151e2bd46e9871e76b07bdeac8913141f8a40bc0" PackOffset="8" />
     <Blob Hash="43951748ed23453afb88182c1f519f4282269e5e" Size="112" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1730892" />
     <Blob Hash="43979b90b2dd929723cf4fe1715990bcb9c9a56b" Size="1804" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1631101" />
     <Blob Hash="439aca7a286f80cb4f6810a24f146d1da5166601" Size="112" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1369468" />
@@ -46310,7 +46212,6 @@
     <Blob Hash="43ae15ef9d8602e5cd32f866a28f78d73969deca" Size="109" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="169260" />
     <Blob Hash="43af43455fe91d59b299b8cabfaa5bfac17ff3b5" Size="1294" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="2094973" />
     <Blob Hash="43b27ab014892e96f7a20975970db82e76c19777" Size="3770310" PackHash="4006fcea5a98108a450fe604eef4b1b969346fa0" PackOffset="8" />
-    <Blob Hash="43b30781188587b668b25586edd1e3b3886d9bc9" Size="81920" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="1978376" />
     <Blob Hash="43b3f0748d7a1acaa15fd84a779bd6b755ab577d" Size="4837" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1321176" />
     <Blob Hash="43b7b10827e4bbc9f66a6cb9e1409d79e7be3359" Size="10697" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="332165" />
     <Blob Hash="43b8ea87eecde939feba6b2a27dafba432ffc0df" Size="10752" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="448008" />
@@ -46326,9 +46227,9 @@
     <Blob Hash="43d261c972b34883db5901ee1d1d78c3014c3074" Size="266" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="424938" />
     <Blob Hash="43d776cdb2f20e61c74ba56ef6770a4654182a05" Size="926" PackHash="faa641df952d93274d1774a37ecd0e58a425c5a1" PackOffset="2094515" />
     <Blob Hash="43de45773be12d74a51986adae0a797a499c2aa5" Size="4654" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1492499" />
-    <Blob Hash="43e55b97334f6578da689d3d156a61a22bd276eb" Size="1236" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2061125" />
+    <Blob Hash="43e55b97334f6578da689d3d156a61a22bd276eb" Size="1236" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2080724" />
     <Blob Hash="43e67cd34db5b84232ba2a322aab185ffaa4a640" Size="165" PackHash="1a8fd2a2ad993894a34201f56091c085b0cff150" PackOffset="2096904" />
-    <Blob Hash="43e8d14c2f86f60d9c100b6c0eaf08a5b921324e" Size="539" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1596928" />
+    <Blob Hash="43e8d14c2f86f60d9c100b6c0eaf08a5b921324e" Size="539" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1716160" />
     <Blob Hash="43e9ace55fb05c29d514720ec0f954c29dd67f15" Size="5648" PackHash="5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b" PackOffset="2080598" />
     <Blob Hash="43eb80c8f02861c6bc41aff8c544a9ab71916a59" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2077687" />
     <Blob Hash="43ed0a5daa7c2b79647e5f91f74b22ddecc5a8fd" Size="21115" PackHash="8391db3b6cbd9a4b24f6114d956cbf68bff737da" PackOffset="2063244" />
@@ -46355,6 +46256,7 @@
     <Blob Hash="442b5b7fe64605ad461a789d305f2b9b0c6d8a8e" Size="25600" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="710664" />
     <Blob Hash="442c591721fe1d9bf773f417ccf4fd5348c09378" Size="715" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="2086219" />
     <Blob Hash="442c7ccfc338f64b7699cbcb5fb951c8a9cbb7f4" Size="2980" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1736571" />
+    <Blob Hash="4430c063df90112f2e81f98f2463b4e0511487ef" Size="205976" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1699132" />
     <Blob Hash="44384abb370d362696c6561de7a4dd54f4b53208" Size="54688" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1057598" />
     <Blob Hash="44393114a9ba95a9eef42b5c04747d30b3c6c85d" Size="10752" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="1988358" />
     <Blob Hash="4439af84e6cf62b9164788acca5942f09096b0e9" Size="4426" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="606296" />
@@ -46378,24 +46280,23 @@
     <Blob Hash="44615f03264012d97512f9ab386413dd72be1090" Size="180" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="623408" />
     <Blob Hash="4467de257a57f1fb52ca4a9e68f3cc1d8e73aa34" Size="77395" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="80175" />
     <Blob Hash="44699c9242bc229ebe29f6bb749052f31b1b86b7" Size="8540" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="2024824" />
-    <Blob Hash="446e72f0d55bb0be32bfa5f5b0861c2a4b2f2230" Size="2201664" PackHash="d7bb9b8d1395dbbf5de64a8a4184676af2a89ffc" PackOffset="8" />
-    <Blob Hash="446eeb370972828732343c9d5615f172baf10ebf" Size="128766" PackHash="142ddd26a143aeb02ee0ebc41be2e53c051e8680" PackOffset="1908636" />
+    <Blob Hash="446eeb370972828732343c9d5615f172baf10ebf" Size="128766" PackHash="e6347b3badb113c35af36403f292693d70d46881" PackOffset="1853408" />
     <Blob Hash="446f0b3456a65cda0b3df2cc617ab98d68a3ca5c" Size="37027" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1681464" />
     <Blob Hash="446f6e8a44628bbd0dbed09738dd02589ae868c1" Size="6472" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1793831" />
+    <Blob Hash="4478c5af9da5f6a781c3492f1b4a1bb0db0eae95" Size="3457144" PackHash="b004a90fd3dc2c2581450b144af90559c9189f0f" PackOffset="8" />
     <Blob Hash="447cd0de4653459c6fff8d3c38eb9c54b5735973" Size="3889" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="729193" />
     <Blob Hash="447cf0a5795f615dbeaa36ffc5f5c69d47247cde" Size="2928" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="183477" />
     <Blob Hash="4483cfec9d9392bb8c09969f25942190a95e3f70" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2081239" />
     <Blob Hash="4485b194406878ccb3ba11059fdd80e6bd16ed2a" Size="623" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="2096296" />
     <Blob Hash="4486c4b38c5ec6ed29aabf7bf1ff134170208559" Size="2680" PackHash="2944a0052b881a644f04844186daa4ae54aad523" PackOffset="2094262" />
-    <Blob Hash="4488f3cc0679315ef65d7fbd5496b539d263700a" Size="1549320" PackHash="7cc5a044adff7d50f070ee2f247ff1a3532f069e" PackOffset="8" />
     <Blob Hash="4489b0e96d2aaf5916eea9dc3942882d9960c410" Size="2736868" PackHash="3fc1167b368b69c3cb5ca7f020ced42d326a5e85" PackOffset="8" />
-    <Blob Hash="448d5abe3e6433ea90c714d760b96357dbb2b25e" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555118" />
+    <Blob Hash="448d5abe3e6433ea90c714d760b96357dbb2b25e" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674350" />
     <Blob Hash="448fb156c93b1600b5da5dec83381aff1d13f033" Size="2248" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1707215" />
     <Blob Hash="449068e3c63cd3723ba2d29c631e800c1f049615" Size="3483" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1971452" />
+    <Blob Hash="44908b060475453aaacc0d4f6ad62bdcf9020aea" Size="1591750" PackHash="ac256693955f9b2c8a6822403a073cbda3d7dbba" PackOffset="8" />
     <Blob Hash="4495e287bdf2b5ea4a83bf2f07777f9bcdb827ce" Size="2890" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="666751" />
     <Blob Hash="449804ae5150bd4df93f47aa6b89c03718477d25" Size="29436" PackHash="3e91b53d410a5bae4e0f8281b597ba51f36d8e43" PackOffset="8" />
     <Blob Hash="449848bee1398c31d97ce95bb5d6211a2dd0c454" Size="43265" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="2031086" />
-    <Blob Hash="449a522f2b3f69cd477e437c46b0af9a388ec0c0" Size="71680" PackHash="d83cc9c9ccafadd27d18ea51adbb23f71944297f" PackOffset="263176" />
     <Blob Hash="449f78174a49bc7fc3e9922931f16b8d5675c705" Size="2020" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="2093434" />
     <Blob Hash="44a7737548c046b8282ec26cc3687782f7fc8402" Size="213183" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="1311387" />
     <Blob Hash="44a8c1c92f3929bb4cbf8120f9dbf65598d7565a" Size="7150" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2049509" />
@@ -46416,6 +46317,7 @@
     <Blob Hash="44b96668d734904e19dc709b779f7edf81213375" Size="3207" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="62661" />
     <Blob Hash="44b9dffcfa5bb59b69473944f8b324ebd2422e38" Size="15872" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1327485" />
     <Blob Hash="44bb62fc406f99e6a2cfab3ae976b226028be99d" Size="11368" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="174944" />
+    <Blob Hash="44c1dd9897ed90d79f9fdf67e5e677236e33a01a" Size="49530612" PackHash="41ad7f87b8e2e03b4a00ad46ce31576259dce86c" PackOffset="8" />
     <Blob Hash="44c8cdf14f2096183db0d4212dd460e38bb05009" Size="2162688" PackHash="91a681c1ec721008f55e6d64c14ce22c12a1cbe2" PackOffset="8" />
     <Blob Hash="44ca90322b8e8d49eb6b5d4c59149855578d2626" Size="3901" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1797054" />
     <Blob Hash="44ceb3c3d327c282135abdae70e8d5d285645237" Size="6695" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2061448" />
@@ -46443,7 +46345,6 @@
     <Blob Hash="45006fbf67606db31442ee53f09bb7de1a21bc6d" Size="13267" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="2018895" />
     <Blob Hash="450120211a3f8df765870e0f10cf11a4bf343ed5" Size="885" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1667580" />
     <Blob Hash="450121c81026826009f9da0e356553dfba525487" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="260749" />
-    <Blob Hash="45022461e2b0446550def0cb237d347b83165a08" Size="2346218" PackHash="d857af45bbb841bbbee98bb99786c88d36b209eb" PackOffset="8" />
     <Blob Hash="4502e220917b9b1f40f3f92111c086309abf5751" Size="42512538" PackHash="2dd24b264cd426069f72804a20a902992fee1142" PackOffset="8" />
     <Blob Hash="450339b938b2aa49c6beb9087865fdca7553bbfe" Size="458582" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="996769" />
     <Blob Hash="4504eaa7c5a8044baf49598bf5d40f72314caadb" Size="4360" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1343841" />
@@ -46452,9 +46353,8 @@
     <Blob Hash="450e2d922735dec0663ee8462bc8fca81fcba1b4" Size="6621" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1060147" />
     <Blob Hash="45177cdb4b0a4675541af8784ef0f11a574b646d" Size="1498" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="1893590" />
     <Blob Hash="451b0cc4591d68ef3f2f1bdc7ed5d257eb0a5fb8" Size="193613" PackHash="0851da62d0e5f3dd0e00512bd0e43cf65963ca41" PackOffset="1222735" />
-    <Blob Hash="451bc9947eda1058f54e31629ec4fcfd820b9758" Size="125708" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1949708" />
+    <Blob Hash="451bc9947eda1058f54e31629ec4fcfd820b9758" Size="125708" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1906495" />
     <Blob Hash="451c5aa7ff298b108906dfa984f8ff07af39dd6b" Size="7532592" PackHash="8d634afc35fda9fd181780d5c49df1b8bbb83eb6" PackOffset="8" />
-    <Blob Hash="451e48b0aa2c2aaab2f7739f9833302344243a3e" Size="4316114" PackHash="87f3dc0515b0af506382b841c1f9026c5aa0934f" PackOffset="8" />
     <Blob Hash="451ff8c345ccac318483394e913b8c36986567ae" Size="1078" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="745826" />
     <Blob Hash="45214c36b6516f00057beb2e1e682a568ec52e96" Size="19219" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="19032" />
     <Blob Hash="452185f9c82ca095e014d8165e5199e3320a572d" Size="388" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="47438" />
@@ -46482,7 +46382,6 @@
     <Blob Hash="4553a7519413c832388ca58f6fd3189db5a94b92" Size="208" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2089024" />
     <Blob Hash="45559cb14ae2c7684f171de2bf060d80b5bb5fa1" Size="147866" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="917466" />
     <Blob Hash="4556b4c34df095e587ecbb3e145942b614a9cff5" Size="5041" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1237137" />
-    <Blob Hash="455714f47e21f05e0b5c7132569f3c7dc6d537fc" Size="269404" PackHash="fb276d1bd30c33019a2a41af75e8a82e43b80637" PackOffset="1685484" />
     <Blob Hash="45574cb5330333a583aba10e045901e4d1a92f12" Size="311296" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="832508" />
     <Blob Hash="45586aa84bb6ef227c808312ea9c9865cab0be7c" Size="7052388" PackHash="cb58cfae60b06c98704988c26e4a39c392e484c5" PackOffset="8" />
     <Blob Hash="455bdd497fdbd6e08d9e06f72703fd2ecc9d5116" Size="10273" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1150127" />
@@ -46490,10 +46389,10 @@
     <Blob Hash="455ec9095f8182a437f31572070eef6ad9e05098" Size="10077092" PackHash="239c725edabab9c75696f51a5861f142fe06a298" PackOffset="8" />
     <Blob Hash="4561f3fc2eca57850af10cca27f40f06a7f31cd8" Size="78" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069302" />
     <Blob Hash="45622d062a8a7dd3011c29c6fef19d0f37fd6495" Size="14460" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1094140" />
-    <Blob Hash="4563a8dce39ee8eeed3d3f053cddb9dd398f8123" Size="3512" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="2093568" />
     <Blob Hash="4566e4aae2e2af9b13366e6022eb6892013fe976" Size="18320" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2037259" />
     <Blob Hash="456aac167cdd502c6373411745cb9301a8b1ba23" Size="2247" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2085208" />
     <Blob Hash="456c0db88ece4d180eee5ae5aef5fbeb6e977d00" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="165091" />
+    <Blob Hash="45700f11169555164977a58b8138b4b602900bca" Size="102434688" PackHash="a0a8b0039a9be72a83a300d07719e7103f1ebde6" PackOffset="8" />
     <Blob Hash="4573575575e64534e1860b86971237271ac638a3" Size="5162" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="967678" />
     <Blob Hash="45735cb2c6ffe074d0c31e4c6474b07f35cb9923" Size="111" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2096987" />
     <Blob Hash="4573c2f92a614ce1220cbe5edd51e2478eec919e" Size="214" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2037977" />
@@ -46505,13 +46404,13 @@
     <Blob Hash="45855bc8d46332b39c4ab9e2ee1a26b1f896da6b" Size="1088" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1637177" />
     <Blob Hash="458a185ce664c276b875ee7e5ddef9a4add01b8e" Size="5292" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2082118" />
     <Blob Hash="458a3cfd5046ff291fa68d52ee28afb04c82a043" Size="372877" PackHash="68d38951ca4d3d30a245076c500b265ca391d43b" PackOffset="1196458" />
-    <Blob Hash="458da6e4e4854e4fed497b64be9620eda413bd73" Size="437" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1617320" />
+    <Blob Hash="458da6e4e4854e4fed497b64be9620eda413bd73" Size="437" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1736552" />
     <Blob Hash="4592f8aa38a1f7725fb07243c86d000c718c0a67" Size="767388" PackHash="5be1b66ec7d7898a04cfc801216ecdee5407fa36" PackOffset="452064" />
     <Blob Hash="459337c0c5849a359147de4b168607fd65633ef6" Size="947" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1403072" />
     <Blob Hash="4596ca1068151e60660bafdb3adc54ec71a2ee85" Size="424" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="19340" />
     <Blob Hash="45988670b018bb6d01eabf011507a46056945e5a" Size="7030" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1216870" />
     <Blob Hash="4599c23fcf58c0c485d500a3ac3f22e7def44539" Size="2352" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="842072" />
-    <Blob Hash="459ba264de164fc7574d489ef8f2f89eef1e45b7" Size="200" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1606110" />
+    <Blob Hash="459ba264de164fc7574d489ef8f2f89eef1e45b7" Size="200" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1725342" />
     <Blob Hash="459bd3b10cd870cb12f5a926b1a5299f43487bad" Size="470528" PackHash="5098f795311987869f91ed638f4c0a395312211a" PackOffset="8" />
     <Blob Hash="459d03e2b2c12a70d0be44b51a5c19722016d624" Size="23893" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="511350" />
     <Blob Hash="459db8c9e68a229a3decf17c80e8f988b674b256" Size="53674" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="437650" />
@@ -46522,7 +46421,6 @@
     <Blob Hash="45a721230eac3bbdd55bbc3369c4bd8ffea570f8" Size="3602" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="221957" />
     <Blob Hash="45ab1c1d0ac255031f1447ca5a240a4b3d0fd435" Size="7142" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="607195" />
     <Blob Hash="45ab1e99676f9548f30104f008f3f9511e667899" Size="2259968" PackHash="3e2b9f360e17b90289d6aa8e07f64f8bec445375" PackOffset="8" />
-    <Blob Hash="45ab7ae8050089783c7c0875b661d4fd31f649ea" Size="2226" PackHash="135bfc1f44c204b13050e403d578d595d413ba96" PackOffset="2093054" />
     <Blob Hash="45acac124e664dcaafa88c33b62a77adad6beda4" Size="166034" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1049619" />
     <Blob Hash="45b70ee15e074420e60c7a195f6749b3da03fa03" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096804" />
     <Blob Hash="45b976a30133c492cdd1cc8bda7b2287f414f621" Size="2949" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1503988" />
@@ -46537,7 +46435,6 @@
     <Blob Hash="45d1d05ac0d457737e966e84a45dcf731fbcd65f" Size="52277" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1319946" />
     <Blob Hash="45d3851de63ba79f1fc8050f819dbd3ca94488b0" Size="3694" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="931490" />
     <Blob Hash="45d6d333198038a6dd11bb1e48947d58d123a0a8" Size="13189" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="657814" />
-    <Blob Hash="45d72d086d55ce54c548f2bd506d2d1e10b66d96" Size="55296" PackHash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" PackOffset="2027528" />
     <Blob Hash="45d9f72ab79ffefdcbda7ce5e341d8da27d9577e" Size="30056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1306871" />
     <Blob Hash="45dd33a41aa3c3243554ef9d183783812ddbfa15" Size="2907" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1285347" />
     <Blob Hash="45dd70f4b3652bf16e49fad47afbaa5981a3df5f" Size="184425" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="1034336" />
@@ -46551,6 +46448,7 @@
     <Blob Hash="45efca44e64d22316e2f7394cf6e9f28e0ea94a5" Size="30259" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1132523" />
     <Blob Hash="45f3282ed4e9bda1c1f6825bdefdeea6cd346cde" Size="85352" PackHash="81f765f195af9a93a3e5b97e2718fb3ac0b30aa0" PackOffset="85347" />
     <Blob Hash="45f58ed45315a4e03a7ebe71105015e97e2e2e03" Size="373939" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1591093" />
+    <Blob Hash="45f8a9df27c8ab83a901a5385d23a1ce52f8a048" Size="54784" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="1861640" />
     <Blob Hash="45f9d7d68e7757ba5bf238aa409462cbb9694da9" Size="2856" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1673064" />
     <Blob Hash="45fab2d3fb92b37c15942f49c7b70aafed4c0a85" Size="152" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="256059" />
     <Blob Hash="45fafdb8105d2148f093339f046292d9e7c555bb" Size="21987" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1796616" />
@@ -46589,7 +46487,7 @@
     <Blob Hash="464f7137cd005c9c2720ac5dc76c5df61f8550b1" Size="79414" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="1978894" />
     <Blob Hash="465202efe0451535fe2f52544653231c955d71dc" Size="2169778" PackHash="762702939264c0a074eb4cc01444d5b3505e95ae" PackOffset="8" />
     <Blob Hash="465297f8bde3df3a9388ee815677eb9cf2b603fe" Size="258021" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="1445028" />
-    <Blob Hash="4654ed9289ce42cd576ce6016af60a8306365df8" Size="4903" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1010293" />
+    <Blob Hash="4654ed9289ce42cd576ce6016af60a8306365df8" Size="4903" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2057810" />
     <Blob Hash="4657d4148ce8cc940c659675ad0ea7f473d04a59" Size="2780" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="840927" />
     <Blob Hash="46598250423934096ed1f76de6c9648d90c34e82" Size="163840" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1430024" />
     <Blob Hash="4660bf1e8067c7328a7dfdb263dac0da4b7bd401" Size="522" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="201372" />
@@ -46597,13 +46495,13 @@
     <Blob Hash="46654e854ac243b62d7e25231d65db74a03c4da1" Size="8438" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="580494" />
     <Blob Hash="4665d400eb3084a49e99bf550a7c887a4b73f53d" Size="15965" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2036962" />
     <Blob Hash="46681575619850034ab2a82345384570933e0af1" Size="40075" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1435590" />
-    <Blob Hash="4668f751e1ac4e14787949f290b38f64491b1a7e" Size="826376" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="778024" />
+    <Blob Hash="4668f751e1ac4e14787949f290b38f64491b1a7e" Size="826376" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="8" />
     <Blob Hash="466c4ec1c7ee3ab4bc80d586be4a2f390b1a1f35" Size="7309" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2079362" />
     <Blob Hash="466d046d3ce0b18e25b1038b1fc9636521455ce4" Size="8125" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1451574" />
     <Blob Hash="466d32a16d6dfa9ddc41897f5935d770ac467afc" Size="38262" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="374590" />
     <Blob Hash="466f2e37d55bae3e05824a6c3439ac7a7adb22e0" Size="1001286" PackHash="72fee8305071d508698fa86e4a89c80f5ee236b3" PackOffset="1042938" />
     <Blob Hash="466f80be26352f8331900a6da5b0a18dc7b39c0e" Size="24920" PackHash="849586837a4432c69a6cb4b1559cb1dbb703da3a" PackOffset="705400" />
-    <Blob Hash="4678c84b634042b8efd1aa959a4f4e7330e993d5" Size="22054" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1905023" />
+    <Blob Hash="4678c84b634042b8efd1aa959a4f4e7330e993d5" Size="22054" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1969448" />
     <Blob Hash="467eb90e13f0f219dfd76d0639fb105265112f33" Size="2003" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2094869" />
     <Blob Hash="468040ff894b88e1643830597f4bced1a48ac44e" Size="4642" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="995069" />
     <Blob Hash="46807987a6b49d7df2edcb57bec0f5e0acde46f0" Size="61440" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="581588" />
@@ -46617,6 +46515,7 @@
     <Blob Hash="468d18a293e147b7f27a20804565e748fd23f58f" Size="203" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="2096903" />
     <Blob Hash="468f894026ac396dababa43b13a0e5365c310918" Size="1480" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1319368" />
     <Blob Hash="4697cfd05f28e45e1368a5480b8da22e647de0c9" Size="11068" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="151611" />
+    <Blob Hash="4699bccc09f199ca77b64e7d05ecf740c8b1d9fe" Size="2435800" PackHash="7635e79b983e6e33e64248654b8a572d4124d642" PackOffset="8" />
     <Blob Hash="4699f66bbb69fe8f3075e2d179129aa68ca1fd4c" Size="1884" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2032294" />
     <Blob Hash="469a8c1e4a12675c69b36d593396a1dced8d9938" Size="12278" PackHash="53f4b5b01e02d052c81a4d478905d84d17f624f7" PackOffset="2011352" />
     <Blob Hash="469fe4b7e7d80cd4dade252a96f103f29ae42dfa" Size="1740" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1776408" />
@@ -46630,12 +46529,12 @@
     <Blob Hash="46b80ec4fad15aa99c2d5716a9346716322096c3" Size="47674" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="640995" />
     <Blob Hash="46b8c45439fbe137d7caeb77a251e04042d6c2cf" Size="3470" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="387284" />
     <Blob Hash="46b9bca804bdcb19c1f0388a1ed7d135ad3e8486" Size="174326" PackHash="1a7fb4d3ec15d2096a4fe532191d9957b1a711d0" PackOffset="164506" />
+    <Blob Hash="46bafe894f8c9743761e8eb1a16a6c14d2f08fb4" Size="306440" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="857482" />
     <Blob Hash="46bd43b1af4904cc7e0b339998876b4431fe239f" Size="100352" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="1755871" />
     <Blob Hash="46be784bccbb4c2b813215e81ed4ad1b7b50de94" Size="11902" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="786800" />
     <Blob Hash="46beb4c32af83ce864b1032393dad7e6717b9f9a" Size="31679" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="809416" />
     <Blob Hash="46c33aa8f7e87975180dee6dbc0295ed8b12f1bd" Size="24363" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1440322" />
     <Blob Hash="46c3720cca9e4e59dacdad4b7dd56fc278567539" Size="14414" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="465829" />
-    <Blob Hash="46cb1a4fd04d6f2d130d5999cc779a0c370e1699" Size="3025776" PackHash="ebb88e86c6c2330c818aa447f851a26934bc440c" PackOffset="8" />
     <Blob Hash="46cb75adb5941945a1d7ea7e3282aca8e558954b" Size="2351978" PackHash="3609bb5040b3e7a8bc98a6dcef4eb6a36b098bfb" PackOffset="8" />
     <Blob Hash="46d2d8d9fe4fb570c2a09bc809b02c8960f9601f" Size="179" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="407868" />
     <Blob Hash="46d344c40a16ca7f15448a73fc0f78dc4c42f296" Size="6137" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="481601" />
@@ -46647,7 +46546,8 @@
     <Blob Hash="46e5df5fdbbe4ee2696c7c2c57375d823e954bed" Size="18310" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="614216" />
     <Blob Hash="46e8c73cd2caa3014235a7823b216412cde302a4" Size="7511" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1245202" />
     <Blob Hash="46e9aec5e42befe4b61e41c0617c230bfb2c47ca" Size="3424624" PackHash="af2cb195ac6ae2a868804129be48835147d0828d" PackOffset="8" />
-    <Blob Hash="46ee7c41b72997999cc65d97612f55037d2e4da8" Size="266" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1586108" />
+    <Blob Hash="46ed542d9a0eb6a059095bfd2197c19d53bcf942" Size="19137248" PackHash="7f50aec1044d8780fd0aed63bba9bd40b4b8e489" PackOffset="8" />
+    <Blob Hash="46ee7c41b72997999cc65d97612f55037d2e4da8" Size="266" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1705340" />
     <Blob Hash="46f47d640aab5a1f8000814bb6d7bd78a8e0c89d" Size="5830" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1547640" />
     <Blob Hash="46f5e30d41d725697109e4124327d6309fdb9b45" Size="199498" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="168573" />
     <Blob Hash="46f778bc784c58d74c400412a21d691603f68cdc" Size="30282" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="563729" />
@@ -46661,16 +46561,17 @@
     <Blob Hash="47082ef3d3ce9aed17ec93a842053cdf0ead9279" Size="1377" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="138661" />
     <Blob Hash="470b4709bd80fd12c6d9b479b3c04aac86ce6e38" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1838930" />
     <Blob Hash="470d8a8f60956c3ee43d5d79a58415a14530bc68" Size="1029" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="993085" />
+    <Blob Hash="470df5a50d5b1bf08750efe51c43cdf99c826ef2" Size="4194304" PackHash="b9c3c979001d45dee60f2de19e597814c23d8f37" PackOffset="8" />
     <Blob Hash="471884856d3612bfbd48094517374c922055bee3" Size="57026" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1530196" />
     <Blob Hash="4718e57b9405185dc4a8e71cd6bb33a72c952d03" Size="8922" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1003908" />
     <Blob Hash="47262e1755b796e851b4e9e5f8ba1332e3fad947" Size="133152" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="1243360" />
     <Blob Hash="47289e896e915e472c42f071fdacd53777dc3aa9" Size="5394" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="623680" />
-    <Blob Hash="4728d2a582eeb922a1ffd589ec182d761ca66aeb" Size="1042" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="988452" />
+    <Blob Hash="4728d2a582eeb922a1ffd589ec182d761ca66aeb" Size="1042" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2035334" />
     <Blob Hash="472b2720339eea3ed3e98dcc361833013824ba8f" Size="2837" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="388514" />
     <Blob Hash="472c1d10bfc1bfb1b87d62401707078dbaf7c0e2" Size="15068" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1333340" />
     <Blob Hash="472c27186773e335c85111405a88e244bccef52b" Size="4074" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="202112" />
     <Blob Hash="472c72d31b5c5601d99cbfdea81a4963eedb9ef9" Size="41208" PackHash="a9bab19888fc574fe564fd41bd6cb08159c85f84" PackOffset="2053584" />
-    <Blob Hash="472cc7ceba183f0cc1768421a1c93b2ab40e50d5" Size="1272" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1396133" />
+    <Blob Hash="472cc7ceba183f0cc1768421a1c93b2ab40e50d5" Size="1272" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1515593" />
     <Blob Hash="472e253383d63f4075059636e56f492b0aaccd29" Size="524" PackHash="8a7c6b0f9cc883870556fb456f20715ed40367c5" PackOffset="2096136" />
     <Blob Hash="473adb4d95ff7f28538aed6916a571b428b57d80" Size="1576" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="588131" />
     <Blob Hash="473bf5205405b949f8205cb5dec6b0b4bf521abf" Size="37161" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1591722" />
@@ -46679,17 +46580,16 @@
     <Blob Hash="473f844d22b8a80773d547dbb089adce792b6166" Size="1078" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="2054294" />
     <Blob Hash="4743c3458eb368291b01090f5e924ef23e96c6e2" Size="2004" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1915462" />
     <Blob Hash="47484aeb516540067968e680e9f46302fdf6eb56" Size="1880328" PackHash="aaff771bff40e67acec754ff6a73103840091d71" PackOffset="8" />
-    <Blob Hash="4750d342c87dd63ba84d73028a17f1884a3b4a6f" Size="6008730" PackHash="15a29bf7d19c99e91c937a1e3d3a1cf19f1edf8c" PackOffset="8" />
     <Blob Hash="4753b4694ba3b684890024018fb877db8e7ded88" Size="200" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1468172" />
     <Blob Hash="475458de38f1c3305857eea3e11c47781afb8125" Size="79266" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="768583" />
     <Blob Hash="4758cce9958307886fd311e690324fdc2ec50663" Size="2918" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="257782" />
     <Blob Hash="475bc527ecb5c55981f8a4c7e57bc30cfa25a15c" Size="129175" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="1370538" />
-    <Blob Hash="475d07a4912fd77ac68a1eebbf856bd398f72287" Size="2314734" PackHash="6c411a4061c6caaaa004d5d1d7ca7464bac6c483" PackOffset="8" />
-    <Blob Hash="475f72506b5543e2f68324862429b86b0e6b509a" Size="9232712" PackHash="dc3f7a67fd94676492f8331f0fd8f6ea01843a41" PackOffset="8" />
+    <Blob Hash="475e8eb14abe7bdf4cde048b8d28abe36af22b80" Size="2957778" PackHash="c77937d877773e6d409aebbfe1dc6d13c4b04764" PackOffset="8" />
     <Blob Hash="4761a400cbec9f0ea40244ba416cc308a4a6492f" Size="83202" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="840291" />
     <Blob Hash="47691978fe20edaa24fa2c97b95e1fd15400a21a" Size="2829" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="964173" />
     <Blob Hash="476990325a224271a7e5b0cc30360999ae7fb3b3" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1426620" />
     <Blob Hash="476c954b9bd860c68bdc3167c601f3ed319a16df" Size="39065" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="1292617" />
+    <Blob Hash="476e0d6e5762dc8b8bf4047c66ee27d6e6c4609b" Size="61744" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="1943236" />
     <Blob Hash="47729db9911351c5dfd064b4b0264a43bc76c6fb" Size="31911" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="184447" />
     <Blob Hash="477462f729d3f9795df21714a9955e14d7236352" Size="143" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1119588" />
     <Blob Hash="4775e1eae26f903bd16e4d52255719c0cbc303e0" Size="20480" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="2061546" />
@@ -46714,19 +46614,17 @@
     <Blob Hash="47a20878541caf07f226a0769ec5832383f2e78a" Size="7341" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1512118" />
     <Blob Hash="47a7ff7a868d767871701711e3336e563a369bfe" Size="54128" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="75600" />
     <Blob Hash="47a8c05ba9bd204832f96cb338985d0532398131" Size="2360" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="932211" />
-    <Blob Hash="47a91d57e1478c782c0728dcd9cfac110e8d2faf" Size="1398942" PackHash="e664029519e00ebd602cc513675aae532c8ec5ec" PackOffset="8" />
     <Blob Hash="47a9e019b49368fe000346118157a257a1fd0efe" Size="604" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1688856" />
     <Blob Hash="47af24886a0888428b44ffe12dde88f0a90c3379" Size="10837435" PackHash="cc3ea6214f8a83565d8abcb906e02f56df61dc95" PackOffset="8" />
     <Blob Hash="47b0342c98c005308cd362b8bd8852228d20766a" Size="5926" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1820039" />
     <Blob Hash="47b2f75499a91a5e22191c698f0ebcc14e037a68" Size="9564" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1117508" />
     <Blob Hash="47b52e574dab5498be5aa8e65cb39698748cb5c9" Size="1141" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="725356" />
     <Blob Hash="47b52fd7a6b9a74cd56b603691e306921302c3df" Size="131883" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="1806994" />
-    <Blob Hash="47b623a96775b27e0fcaee556cb03a89d283ff7a" Size="81770180" PackHash="8e61df6be2a40229e8e039a5b34466337d63760e" PackOffset="8" />
     <Blob Hash="47b707258f1b5ca59f10062eae48fdfd7d98b123" Size="27977" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="377268" />
     <Blob Hash="47b7916243f57e2d7f94223185c900d2804f899f" Size="3639" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="697540" />
     <Blob Hash="47b7eeb75132d8f6e99c2664a6365c1a450f8e87" Size="155173" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="986259" />
     <Blob Hash="47b9a3a82fe1333c06e0b00e211948852b8a3482" Size="3239" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="740017" />
-    <Blob Hash="47bab7e11905ad1567e89f9aefc19e24c82fa7eb" Size="1032" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1314215" />
+    <Blob Hash="47bab7e11905ad1567e89f9aefc19e24c82fa7eb" Size="1032" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1763117" />
     <Blob Hash="47beec0c9e36407d2dcd6be4c8636aa69a27b026" Size="1379" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="122792" />
     <Blob Hash="47c9852c3674bc7806f6d3cd7f52f08a5bef9982" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1576627" />
     <Blob Hash="47cc6353b3979d668eb13d5fe11781df1033dfcb" Size="1734" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1484395" />
@@ -46735,13 +46633,11 @@
     <Blob Hash="47d0f1bd5195ce10c5ec06bdb92e85dda21cdab3" Size="18624" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1230504" />
     <Blob Hash="47d15d63d522648981dc06f7a8836274b2e12a1d" Size="5100" PackHash="7d2cd67e5409d984a518119f088c05600971a174" PackOffset="2068036" />
     <Blob Hash="47d53da5539afd3302622476a306f38b4b1599db" Size="21506" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="44741" />
-    <Blob Hash="47d5dfc3d92cbd638ca8ea5bc1d4ec84a0c8bbf1" Size="413126" PackHash="d0567b0e74b19ee823347bf403863df43d2f5040" PackOffset="1563940" />
     <Blob Hash="47d612602ac01c13e868210ab172a5781846c76e" Size="285298" PackHash="524e1b7dc4c8fccc9f2d495c49cc3bc8152cb7bb" PackOffset="1486388" />
     <Blob Hash="47db9eac976fac2757b0ac96019eb0fb8e76778f" Size="5269" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1742247" />
     <Blob Hash="47dd555ce3935d6c0e51e2aa70044d8f0de99113" Size="28859" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1740776" />
-    <Blob Hash="47ddd1dfee38a38db607c25a497807fcd33ce14e" Size="2786256" PackHash="9cf98d6f311b6f40fda0597794364a8c52c9ec18" PackOffset="8" />
     <Blob Hash="47e2fa3dbe1725252b78fccff6c58da63300ff09" Size="229091" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="444613" />
-    <Blob Hash="47e39a87dd3e76b57aee6f48840351bd992c1b1e" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549622" />
+    <Blob Hash="47e39a87dd3e76b57aee6f48840351bd992c1b1e" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668900" />
     <Blob Hash="47e57e1272512050cc5d569fb7b5ca1cae7ebf7e" Size="4549" PackHash="d9cd996ea5042b0d08c555ef2559111b5494e3a1" PackOffset="2092257" />
     <Blob Hash="47ea51a105c594fb530e4d887ebb860f7f3655b4" Size="9886" PackHash="97c7cbc1022b352e100f1ebe5482f2517a13f901" PackOffset="2086018" />
     <Blob Hash="47eeaa6b79ccc34f068b8885c3dc9b80723b4cde" Size="2304" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1064730" />
@@ -46755,6 +46651,7 @@
     <Blob Hash="47f9d40c6bc26bafab5a351dba944f065e20ece6" Size="3704" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1197689" />
     <Blob Hash="47f9d89ea1694b94f4f8c5558311a915eca45379" Size="24768" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="1009568" />
     <Blob Hash="47f9f7f4b21a80990fed83a0641aff18daadee5d" Size="1347072" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="8" />
+    <Blob Hash="47fc435cb8f2c45543d10cef0ff348b1c075da7a" Size="4340520" PackHash="ff8b0e1d418949b27ba049d7ce60d6498fabc73b" PackOffset="8" />
     <Blob Hash="48022a245bfd2836f532d0779906d236216c33c6" Size="104573" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1700048" />
     <Blob Hash="4803c95aa8c262e835944568b8166bdb1fbe6cd7" Size="66268" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="1923443" />
     <Blob Hash="480436be323f0ccfb34bbd3353739bf130638104" Size="1108921" PackHash="5f2ee8bd5ea968dd239840333b2756a7b4071c68" PackOffset="8" />
@@ -46767,7 +46664,7 @@
     <Blob Hash="480e8805e823f49b7a8ac62ff731dc38043f06f4" Size="24711" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="552582" />
     <Blob Hash="480fac02fc608304435d0b4a4b858374145b80cf" Size="2858538" PackHash="4de19ef682be73fd5616348eafabda7e5b5c2614" PackOffset="8" />
     <Blob Hash="481215485f76d6252010a21493872ad8af540aaa" Size="623" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="118538" />
-    <Blob Hash="48144183673be85b1b7582bdf03360187fc570a1" Size="3264" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1213885" />
+    <Blob Hash="48144183673be85b1b7582bdf03360187fc570a1" Size="3264" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1658716" />
     <Blob Hash="481492854be56206034b8f09ea4fec3565802779" Size="1358543" PackHash="5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" PackOffset="626365" />
     <Blob Hash="481b667c45fad6edb312b255f4d685766c202a4e" Size="1979" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2079295" />
     <Blob Hash="481bd5df1978d568351e0f638e273eb272b1426f" Size="2105" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1836970" />
@@ -46775,8 +46672,8 @@
     <Blob Hash="4820fd3ccd13c0ce67117536ccc03b633d4c315d" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2093288" />
     <Blob Hash="4825d41800b4dfd066c3ee0b10d55f96ebebbfd4" Size="458" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="826852" />
     <Blob Hash="482a69d497207221f96d8ab047cd54f8263f1f47" Size="15640" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1701961" />
+    <Blob Hash="482ae2a9cf85718f5ff38a9f9ad1693b4bb8fb1d" Size="2534" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2092337" />
     <Blob Hash="482fa26c66d34b4b87c2c6d2db4c42e683a90efb" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721178" />
-    <Blob Hash="483a019007a64a65ec80517a890f3c3e30161f13" Size="1070060" PackHash="819a2452e63804986e4e4a95bd9fd323afa3155f" PackOffset="8" />
     <Blob Hash="483ccc098ec6b00d6dbce74a960a7fd23cfec713" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2089613" />
     <Blob Hash="484169fb6975e8135f19ad40e8259766383bf695" Size="1204" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="413761" />
     <Blob Hash="484a89d3dcc3c673c93363f7d3a6c73abb2cab1e" Size="98222" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="940959" />
@@ -46784,7 +46681,7 @@
     <Blob Hash="484d695b7ac305602f7113a1594dd8df7838d05d" Size="78" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2071446" />
     <Blob Hash="484f1b97130a6715510e7f7a7545aef4496a8f0e" Size="317954" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="765196" />
     <Blob Hash="4850c19ac6f313d011b639fb82c1959076e0fab6" Size="353" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2079545" />
-    <Blob Hash="4854bf04c826f5f5e521c78af328c07983f9eda5" Size="387328" PackHash="142ddd26a143aeb02ee0ebc41be2e53c051e8680" PackOffset="1079974" />
+    <Blob Hash="4854bf04c826f5f5e521c78af328c07983f9eda5" Size="387328" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="1274092" />
     <Blob Hash="485508d8fa7656968ebab9dbc7601d5fe754ce55" Size="261" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1712096" />
     <Blob Hash="4855604bd5f18c6c092a54b718b3a8a9cea43528" Size="17403" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="576246" />
     <Blob Hash="4857ffab5194de76419f4956e02487a335f183ad" Size="2900" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1794558" />
@@ -46794,14 +46691,14 @@
     <Blob Hash="48638ec665a3763b4bdefffb25edb139898221b5" Size="2880" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1079166" />
     <Blob Hash="4867b00639e0dc52cf851c307847b53493f50354" Size="19923" PackHash="9fa27c399514b5e1ef6857dd892b39d3cc273238" PackOffset="2072280" />
     <Blob Hash="4867fb678dd42c0fd68499afc076a7534f7135f3" Size="6011938" PackHash="035993ed924139904ec24f3ba17d1bd9563fc3fe" PackOffset="8" />
-    <Blob Hash="486dd7c066124c3cab4d5b442adf27800ba7f669" Size="2163" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1370125" />
+    <Blob Hash="486dd7c066124c3cab4d5b442adf27800ba7f669" Size="2163" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1819027" />
     <Blob Hash="486e0eef71b2b988fe76986f881b395e3f37b425" Size="20562" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="481040" />
     <Blob Hash="4872061d7f1170229d018ee5034fee492e738494" Size="6537" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1862540" />
     <Blob Hash="48748fa05b65fb58a9b69772887737f0065443f5" Size="83777" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="980090" />
     <Blob Hash="487b0a5fdd61f642039cfb89440b9684e53b99da" Size="6462264" PackHash="3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09" PackOffset="8" />
     <Blob Hash="487c1a9ec94b224124bbddcc6737ccb3d261f924" Size="151264" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1880302" />
-    <Blob Hash="487c39f2cb878ef8f6e91c8224a3de68f7c0f411" Size="463" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2096613" />
-    <Blob Hash="487c70543147c6c4a083980e352f88eabc20e164" Size="767" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1612651" />
+    <Blob Hash="487c39f2cb878ef8f6e91c8224a3de68f7c0f411" Size="463" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2096497" />
+    <Blob Hash="487c70543147c6c4a083980e352f88eabc20e164" Size="767" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1731883" />
     <Blob Hash="487c76bde384e9a372864b0a32ddcff8389b5e83" Size="1709" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="470798" />
     <Blob Hash="487c802dc4b0e186ed2ba2a4c3de187f3835d340" Size="942" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="292143" />
     <Blob Hash="4880477a58f7159f48dca5ec48d57b257ddd0041" Size="3575" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1611003" />
@@ -46814,7 +46711,6 @@
     <Blob Hash="489f4c9efc0f6995524102cb98718ed539b2581e" Size="5849" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2086689" />
     <Blob Hash="489f9874131f7fe4103c2c1262ab5604383e9d56" Size="2212032" PackHash="c3162f6bb67b1f6a14a69998b1b0e6d072b3dc94" PackOffset="8" />
     <Blob Hash="48a169ea0d369abaa608df61e1255454778ca230" Size="692" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="2095613" />
-    <Blob Hash="48a3f849056119c7cc0acfc38020b5aab1011334" Size="3224936" PackHash="27f8eb389ab0b921b8fe2d3ae34e9b4511524a56" PackOffset="8" />
     <Blob Hash="48a4e80e3f4e80ef6e62730e776499ea0a490337" Size="577" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1216946" />
     <Blob Hash="48ada895ec1531c3dc79a9fba66be279eedcdcc4" Size="3834" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="12366" />
     <Blob Hash="48ae04ad151968fcffb84a0de7cbfd9707fb4ea9" Size="2288615" PackHash="6dbc1369cf4eb542c999ef1a7dc17798e967968e" PackOffset="8" />
@@ -46839,7 +46735,7 @@
     <Blob Hash="48e23a5fd4b685aad4eac1861fe8800f04b87c38" Size="4788" PackHash="1a8fd2a2ad993894a34201f56091c085b0cff150" PackOffset="2091343" />
     <Blob Hash="48e41206ed4bf7b9a9916fc91285a6be8f13cdde" Size="1345" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2037458" />
     <Blob Hash="48e51f550a9198babd8d5c3065895b77cb5679a4" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1283903" />
-    <Blob Hash="48ef613cb9fe7929f5c66025fd8b4404a2f01e62" Size="55881" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="2038176" />
+    <Blob Hash="48ef613cb9fe7929f5c66025fd8b4404a2f01e62" Size="55881" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="2035500" />
     <Blob Hash="48f1dfcfb2b285ac4891716ce5b0e353ad0944b2" Size="88816" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="477814" />
     <Blob Hash="48f24384b8675ccaf2238c808ab9ce9a81307ed0" Size="35" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2097109" />
     <Blob Hash="48f33178bf9c5a9ad1b6eaa86f0a0a5ffa3b570b" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2094647" />
@@ -46861,7 +46757,6 @@
     <Blob Hash="491d06b7dd153b01ad3d4e03ee95b4f07bd3db28" Size="18724" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="676393" />
     <Blob Hash="4920c8f683be55a6469afcfae7207ca7265e8321" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1119758" />
     <Blob Hash="4924ee4377f669e996ddf9720b3758c351da7502" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1041804" />
-    <Blob Hash="492502c6b0f870310fd686e6191647e7383a7840" Size="71" PackHash="d1371ad168d1d7a1b9aea524e0fc55c6bf07cd53" PackOffset="8" />
     <Blob Hash="492573739275af67481776a66d10415568567c05" Size="45579" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="1398375" />
     <Blob Hash="492961da1a24b8c5ba2cc2a3d6b265b986f59b02" Size="31765" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1415063" />
     <Blob Hash="49304675125c794b6b24b512512b2707ef9a0db7" Size="116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1474412" />
@@ -46870,7 +46765,7 @@
     <Blob Hash="493637bb570a5c96bb62f998bd0391fb59afc5f0" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1712192" />
     <Blob Hash="493aa9968ee63d4422a2d23f26a4eca290e0f5d2" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096713" />
     <Blob Hash="493b026c832dfcc79cc65462005d3dccb6462e2d" Size="926" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="231923" />
-    <Blob Hash="49416a58016d995a652abd4d0a26a053fdceefa3" Size="4227" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2018694" />
+    <Blob Hash="49416a58016d995a652abd4d0a26a053fdceefa3" Size="4227" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2077250" />
     <Blob Hash="49453806c113af56c2edf47b7276e7db789f9cc8" Size="78256" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="324325" />
     <Blob Hash="49469c7274fb5f82fb57006bbcee60c612d0f15c" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2088964" />
     <Blob Hash="4946eebb4963969f1e431370669d241680a2d864" Size="6731" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="133555" />
@@ -46882,6 +46777,7 @@
     <Blob Hash="495b7e763be4666a1fa02006a21d99e40447d716" Size="16660" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1108600" />
     <Blob Hash="49624238ec5436b05c098d79e0af76536d6c5065" Size="6192" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2074943" />
     <Blob Hash="496457c3ae72db710a2377d25b5337e468ea2436" Size="2164" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="929302" />
+    <Blob Hash="4965afe8a6f85a1672d0d85baec12be53452c6af" Size="3000096" PackHash="937f539283be20b2f5600673223b0e506b9b0608" PackOffset="8" />
     <Blob Hash="4969dd2e2b4c100363ba12e92aa8474342fe2fc7" Size="420" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="228349" />
     <Blob Hash="4969fb85ec4296f06a8eeedf40ea9c907a5140ef" Size="10496" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="987072" />
     <Blob Hash="496f9a828d621c89784d3c8f3c38c5a562c95e67" Size="13369" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1870216" />
@@ -46892,20 +46788,20 @@
     <Blob Hash="497fd9d390b95fe0802cb7163b23bbeec4c4b83d" Size="8294" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1976576" />
     <Blob Hash="4980c0a3dbfa82d04f1d54fb58d68280647da1fc" Size="5465" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="372205" />
     <Blob Hash="498788c5298f161d659ef5cfbc409983637695a2" Size="32768" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1722888" />
-    <Blob Hash="49887b577847d123d2f88b71001caf53418efd37" Size="67" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556615" />
+    <Blob Hash="49887b577847d123d2f88b71001caf53418efd37" Size="67" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675847" />
     <Blob Hash="49887c1daa6ad03343857badbea987973afa7e44" Size="114038" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1739059" />
     <Blob Hash="499014081414d26e1478e55409c5d1c694f0d3da" Size="4955" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="248468" />
     <Blob Hash="49927db5d241796c8afd84fc57e8cc496adfa2c0" Size="400" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="7779" />
     <Blob Hash="4993579b733c7eb4d72b024761ac5e89428fc934" Size="9443" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="322710" />
     <Blob Hash="4995f6aaba8dcc7289a23b9e08fa5d1328ce043c" Size="2014220" PackHash="e0ed8dd6a39be2d27235abbcc4a2c0f90de54ed1" PackOffset="8" />
     <Blob Hash="499888760ca68e076df4356fab7f844f6597e334" Size="13345" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="800376" />
-    <Blob Hash="499e38fede97e17a37ab935550230b48b586720e" Size="251904" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="1380360" />
     <Blob Hash="49a83fdb8daacaf2debae17e60a03d04c29b4c60" Size="31552" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="675664" />
     <Blob Hash="49a91d93c39dc0a50e60a3ae6e0753f7e2df0152" Size="7589" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1248058" />
     <Blob Hash="49abef868502899d775baa4fdde960dd6d757f62" Size="286176" PackHash="b37cd4fa8dc271ee7cb82371299fa481e5c35ada" PackOffset="1450608" />
     <Blob Hash="49b04471f3308f0e0fcc58c19495e3db352e719a" Size="2869728" PackHash="8fb4d282b301ef3a79b2e2ee2006cfc4734a9686" PackOffset="8" />
     <Blob Hash="49b2b2a9e7eb91639457a58a44689dceeaf3b385" Size="1624" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="2088222" />
     <Blob Hash="49b5daa8804fabaedcea3ffa88973f44be990de0" Size="5136" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1750888" />
+    <Blob Hash="49c0654f571b7bb744067d1c06c9db6ca414250e" Size="112133266" PackHash="3d76442b82172044d94d987558d0976bb597c66e" PackOffset="8" />
     <Blob Hash="49c69111a76a01fad3af5a3029f4c95a0f2a3347" Size="3145784" PackHash="f899821bcaaa82830db1d847bfc1ad884a3fea0a" PackOffset="8" />
     <Blob Hash="49c75eae53df7057b42bfc301b4a3afe69bc337a" Size="3092" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="772367" />
     <Blob Hash="49c7c65164841fceab7783eb91357b20449b68b7" Size="427" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="127898" />
@@ -46929,10 +46825,11 @@
     <Blob Hash="49f48a324431129137aac2e9c4a3163b745f9b51" Size="8979" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1906083" />
     <Blob Hash="49f5c7ecd8b68c745e33e64418315d32eb61bc25" Size="8130" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="794947" />
     <Blob Hash="49f829b6ab7c9d5ae222bf9d7db9960c4fce81f6" Size="270414" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="1680378" />
-    <Blob Hash="49f9cd5517920e02fb675779ec6f9fd368b409f1" Size="3028370" PackHash="8a9a2a4fd2a29215a1743cbbae76d040aa09adfe" PackOffset="8" />
+    <Blob Hash="49f89c011f72988f0894184b529e46059252be93" Size="785100" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="1089010" />
     <Blob Hash="49fa68d4fce4588a81a982eb5073ad2a47b92998" Size="103727" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="826093" />
     <Blob Hash="49ff2c6c29ac439e660a5fb93d8e1ff2bcc1c0f8" Size="784" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2094836" />
     <Blob Hash="4a026b6f1dd01f14a3cf2dbea0aa6d7d06845a5e" Size="12764" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1492669" />
+    <Blob Hash="4a079aec90dceafa33ca9d66c8a7b4a82867f67b" Size="189440" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="1892360" />
     <Blob Hash="4a0c96fbcaa1368506af913d410164e23e185fdf" Size="741" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="605423" />
     <Blob Hash="4a0cf6c9557a5f4fe107ee1a306de75be01b267f" Size="1110" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="278052" />
     <Blob Hash="4a11ade0e800dd47910ab282c64f7013bdad156f" Size="815" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1343650" />
@@ -46966,7 +46863,7 @@
     <Blob Hash="4a51136c780cb44c3a2f5dd299c5840146457c4a" Size="1454" PackHash="64f8a861ea0499b2ce969a0970e024d43314522e" PackOffset="385789" />
     <Blob Hash="4a52921c51c6fc42c302c1817941b6c74fded1f2" Size="3144" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2070092" />
     <Blob Hash="4a53ce0c6b2c4531688f141d8dcbf19cf62580cf" Size="533" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="2095920" />
-    <Blob Hash="4a553f163a688ee267caac7999d824d305eb28a9" Size="1575936" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="8" />
+    <Blob Hash="4a553f163a688ee267caac7999d824d305eb28a9" Size="1575936" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="8" />
     <Blob Hash="4a55cc52c9ce5b2dfb9cb9989cfc6998395abac6" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1126690" />
     <Blob Hash="4a5a82a027706397fff621b22fd6fa796e91d7c5" Size="22926" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2006568" />
     <Blob Hash="4a5a982a1125c8440f70e4327d8bfed925e9ab57" Size="55527" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="753219" />
@@ -46978,11 +46875,10 @@
     <Blob Hash="4a62afb9598cd5e183b2670b43450fd10bdab4d2" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="861192" />
     <Blob Hash="4a637f929550da55cc372d6ec8ebc8b3133d4551" Size="6906" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1583802" />
     <Blob Hash="4a64f5fb7de27f6cae774b31f29cc8b04bf9dd32" Size="8704" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="632317" />
-    <Blob Hash="4a6823f56b497461073af2737e594c5748a24a2c" Size="4132" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2078844" />
+    <Blob Hash="4a6823f56b497461073af2737e594c5748a24a2c" Size="4132" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1978708" />
     <Blob Hash="4a6cd77cade0bef5b738ae1d8d837d5bcc3a3a2d" Size="116" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1680804" />
     <Blob Hash="4a71b6c154c211fa3f79535e0b576204ad4032f5" Size="757528" PackHash="96421d48a3164d2d4259c4c9500dfbf44d9b90fb" PackOffset="8" />
     <Blob Hash="4a7214e56896a8e78cc0b11eb477f0fab2841f8c" Size="105056" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1965301" />
-    <Blob Hash="4a80f7c0f13d5c3886b1ed7073b5949e589ee852" Size="2021776" PackHash="0c3b6ea6bcbe567cf7a0cf2d8d4492dad4d91257" PackOffset="8" />
     <Blob Hash="4a83b29708f4e4094559943fdeebe51f88017aea" Size="8792" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="2088301" />
     <Blob Hash="4a861acfd9c8191384c4b188941985352d8a6cb9" Size="3902" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1381379" />
     <Blob Hash="4a88334e3aa334c3f57a3c209a36b10a8d688064" Size="944288" PackHash="8eea1cf900a27487381f3e81893b5e8685569c89" PackOffset="1114407" />
@@ -46998,14 +46894,14 @@
     <Blob Hash="4a945440fefc4e49fa1a4efc1e6116ec87edeeb3" Size="36772" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1360452" />
     <Blob Hash="4a977de62a61ce3fab7959493b1e5ef2451fd4fd" Size="3749" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="125919" />
     <Blob Hash="4a981f0d2dd5bb534aa7f25a1fe6796e692e524c" Size="4489" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="692130" />
+    <Blob Hash="4a9c88bcd24355eb37d3578e49e96a6533513886" Size="4013010" PackHash="4bbcdeba815e6943d9686910555d4feddda22a1f" PackOffset="8" />
     <Blob Hash="4a9ce54816622a9b33376003af3e05f9ce7fbb3a" Size="63014" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="771774" />
-    <Blob Hash="4aa8d88e27feb0afd092389e83d47be2a5763e84" Size="1024" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1043037" />
+    <Blob Hash="4aa8d88e27feb0afd092389e83d47be2a5763e84" Size="1024" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2091013" />
     <Blob Hash="4aa90e61486b1e4a2ffbb9ca2c771fdc5b534c0c" Size="2280" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1987735" />
     <Blob Hash="4aa925c398ea1553544c6c14b67a12f2625dd6f1" Size="1045" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1384933" />
-    <Blob Hash="4aad22a4d04c0ef5f67a3486921021178e8b5e7b" Size="2536484" PackHash="45791f0b8a7c9e5e2cf6af886c58868846569894" PackOffset="8" />
     <Blob Hash="4aae10c531210250b2dece53a12ae95a24cd4bb5" Size="126427" PackHash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" PackOffset="1499873" />
-    <Blob Hash="4aaec69bf315cffe8fbf986364a37d8b237b22e4" Size="7918" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1659706" />
-    <Blob Hash="4ab272953cf2079c0945e6878c1584841ee36d8a" Size="2184" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1327334" />
+    <Blob Hash="4aaf63cac75c61496ab318849e4fa500a2eb3f11" Size="2384944" PackHash="8c57baf2fc50490200125aff8985067b3497ca4e" PackOffset="8" />
+    <Blob Hash="4ab272953cf2079c0945e6878c1584841ee36d8a" Size="2184" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1446794" />
     <Blob Hash="4ab2e0a3453b038599760feea96b31cafaa1c21c" Size="473085" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="514965" />
     <Blob Hash="4ab33a70e7d5b5b15421c6653d927cacd7779852" Size="17928" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1309698" />
     <Blob Hash="4ab563b477b3dff6bc8aa84f20982f2559e994ca" Size="2864" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1950304" />
@@ -47017,7 +46913,7 @@
     <Blob Hash="4abd1cfe331a666b7fa0e4e8edd6c89dbf6f890a" Size="113088" PackHash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" PackOffset="1894972" />
     <Blob Hash="4ac1c846a65486f78e42a0859a907cc511d30811" Size="324608" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="1035904" />
     <Blob Hash="4ac36b400ad381216218e6f2a8618cbd7e1c6150" Size="2723" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1815516" />
-    <Blob Hash="4ac3f8a9703e12a9cb1eb5274765e609c7c6cd37" Size="758" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1415825" />
+    <Blob Hash="4ac3f8a9703e12a9cb1eb5274765e609c7c6cd37" Size="758" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1864878" />
     <Blob Hash="4ac4201d9404ae029719bba452309241925a24f4" Size="1416" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="833296" />
     <Blob Hash="4ac4cc3b52cbbf4c6e2f70dc03a6d0ecbc10ee49" Size="2077" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1103574" />
     <Blob Hash="4ac6e1e92596fe9da77d83ca5c47211b3271e7e9" Size="40269" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="702112" />
@@ -47042,25 +46938,24 @@
     <Blob Hash="4aeb2f256b18f452bc2588c947c9ad8f2e21c1c9" Size="2060" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1146815" />
     <Blob Hash="4aeb87e9940da6cb84cb835a783767c590220939" Size="30056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="644665" />
     <Blob Hash="4aebd597e3bee8d4ee193b4e1bc5c976500def6a" Size="237218" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="1024707" />
-    <Blob Hash="4aec0b43c74b86bf3aee7fa7b43d2cbcbd8b3440" Size="57" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551633" />
+    <Blob Hash="4aec0b43c74b86bf3aee7fa7b43d2cbcbd8b3440" Size="57" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670865" />
     <Blob Hash="4af18649746a1be074dec060b4e4afcd1ec64307" Size="7517" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="672029" />
-    <Blob Hash="4af6b909b95272ab9366b63e3d117940daa46bff" Size="58" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555908" />
+    <Blob Hash="4af6b909b95272ab9366b63e3d117940daa46bff" Size="58" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675140" />
     <Blob Hash="4af70a192b5be02aee9b77de838248afbfcbea22" Size="17288" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1392226" />
     <Blob Hash="4af93c7b92431ae14dee4a12a09ebe9d8ff5bbda" Size="96688" PackHash="f4a124277291f919f4d113126657931fd3e10b91" PackOffset="262277" />
     <Blob Hash="4afc5584644d68a7d2ba37d98cbc57883c7f1712" Size="261" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="2096511" />
     <Blob Hash="4b070dea45321a61f489104d2b1898843fe9cf4c" Size="3656160" PackHash="6ea5616661fa6debdda968a3db88b96ce3ce6598" PackOffset="8" />
     <Blob Hash="4b08fa7fd4e7c4f16f285f098e959aa54f53e9c1" Size="10496" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1164888" />
-    <Blob Hash="4b09b34655d930382fdd761bf38d4eaad18e9868" Size="2224" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1358400" />
-    <Blob Hash="4b0acdc27182b9148c916fd34fc3a341b819ef7e" Size="32768" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="730669" />
+    <Blob Hash="4b09b34655d930382fdd761bf38d4eaad18e9868" Size="2224" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1807302" />
     <Blob Hash="4b0eb443f2d0e4b8db7d0435f9311e5f9a625123" Size="1116" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2043043" />
     <Blob Hash="4b0f3f5b0e3ee7f6918cf459ce54de20b2bca32d" Size="9835" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="285147" />
     <Blob Hash="4b0f4b28a6cc99c839a14e8861747ab9ac8a2aee" Size="2660" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="844424" />
     <Blob Hash="4b13c4f5fd91a9e0f8fd8426b64a67736f03b076" Size="52498" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="2011252" />
     <Blob Hash="4b13fc6d1018bbbe62512fecbb35fe9655e78225" Size="1747" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="168565" />
     <Blob Hash="4b1978c48facb1ffb2c347b6c1c144593085ff84" Size="4157" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="701459" />
-    <Blob Hash="4b19991131412307f3b92582552875228030d527" Size="1292" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="969605" />
+    <Blob Hash="4b19991131412307f3b92582552875228030d527" Size="1292" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2095425" />
     <Blob Hash="4b1bccede47a73247c5d04a9937c91c3874d4584" Size="3084" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1300192" />
-    <Blob Hash="4b1ebe23e03debc30efc0294104c68c86744f9c1" Size="3674" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2042224" />
+    <Blob Hash="4b1ebe23e03debc30efc0294104c68c86744f9c1" Size="3674" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2093169" />
     <Blob Hash="4b1fbd02656be0fed71402d27f5c9a574395f686" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="199345" />
     <Blob Hash="4b20864bb8b8e8ff7c0a14d09540d30b2bfeb598" Size="1400" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="2052894" />
     <Blob Hash="4b248e438d489f1f6a3c466e13c3a512775553c6" Size="1809" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="2079641" />
@@ -47079,7 +46974,7 @@
     <Blob Hash="4b3d09d822c04554921305bcb3a2e66553e1a23f" Size="3026" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1079715" />
     <Blob Hash="4b42558892851fa8fd8dbbaebfc6c07a2789e717" Size="122170" PackHash="de91426e5f3e3df5e3245d6aeb1634e9c47ced52" PackOffset="1926502" />
     <Blob Hash="4b426239101242b3845475ccb58b8bf49b226dff" Size="2548" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="489640" />
-    <Blob Hash="4b4270b7746d0332e4eb386ba5e95a186c942c98" Size="24046" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1719311" />
+    <Blob Hash="4b430c66f92733ac559a59636c968627931ff3b5" Size="3334650" PackHash="eafbf5dc12719274d69ca87602b948a267e4e45c" PackOffset="8" />
     <Blob Hash="4b450a1487db41d6ed6101ec1777ad25e9084d77" Size="33539" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="951997" />
     <Blob Hash="4b4616b1967e4f9fdd185240e50a861ea1b0ff2d" Size="5515" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="962678" />
     <Blob Hash="4b47bb0eede12bbaa822a7bf6c96cc00723ece42" Size="3211" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1839075" />
@@ -47088,19 +46983,20 @@
     <Blob Hash="4b4d15393f31feee515c5fc89da546c8528eb65b" Size="2936" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1602316" />
     <Blob Hash="4b51d1eb9c5349b5a96e3c955d7a6534df84b6d1" Size="3031" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="681108" />
     <Blob Hash="4b53f4d791739a04a7fad5c5cc97e495dbaf6dbf" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1786752" />
-    <Blob Hash="4b555a40da4870070e03d98c5d996ac2f324811f" Size="783" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1419112" />
-    <Blob Hash="4b5b78d0836acfa9c0f0a0fe248204009e43d79a" Size="252750" PackHash="b018fd41d11073c25edcc108d13464586eaa8752" PackOffset="1803488" />
+    <Blob Hash="4b555a40da4870070e03d98c5d996ac2f324811f" Size="783" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1538343" />
+    <Blob Hash="4b5b78d0836acfa9c0f0a0fe248204009e43d79a" Size="252750" PackHash="fc21197f05ffa1e1cb73441cb5cb45012227bfee" PackOffset="1297484" />
     <Blob Hash="4b5be810d899bec7384c1a18f1d65a2bce925a5c" Size="80677" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="340060" />
     <Blob Hash="4b5be955b375b1fe768c17baafe7c201d6df2091" Size="7798" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="351795" />
     <Blob Hash="4b5ca568b155c584367a133f40edaa953a9e91ad" Size="160174" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="677800" />
     <Blob Hash="4b5ccc9f524c4f451637b35c4c519e58fdab1f58" Size="168253" PackHash="d99d6c7686c723ad38a7b61ee29d4f94ca0179c7" PackOffset="8" />
     <Blob Hash="4b605de4e5313a9e129d334fafb7394d760eeee4" Size="488" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1635396" />
     <Blob Hash="4b695917efb3a22056bf8c9e0315dd8ed0e59a6c" Size="234035" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="378541" />
-    <Blob Hash="4b698a1d4978ef3f956a938e03b669c7083a8b04" Size="1075" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1150080" />
+    <Blob Hash="4b698a1d4978ef3f956a938e03b669c7083a8b04" Size="1075" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1586696" />
     <Blob Hash="4b6b56a3d4a53d01236f37ad7b5fa07d0edb8f62" Size="3751" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="757191" />
     <Blob Hash="4b6fac14a1d46691443e78383f1149e50563f2a1" Size="32696" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="758702" />
     <Blob Hash="4b713a8e29aaeeeb93949f74d342a87f3c265365" Size="3363" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1131734" />
     <Blob Hash="4b7141002d19b28b689a69dea23ace76b44145fa" Size="441368" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="8" />
+    <Blob Hash="4b79a4726dea651c6629020c52d7fdce8a85f00e" Size="2287816" PackHash="eee72b6426ebea0f9511fda1139314dae432436f" PackOffset="8" />
     <Blob Hash="4b7a4e6891cd8f24d417a02d1ddd0b7ff2c4f1d6" Size="7812" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="123980" />
     <Blob Hash="4b8062da2e773600f62aa50d34535a899874ddf8" Size="373509" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="696423" />
     <Blob Hash="4b816b68d207e6c2fedfff6b67cc3bdc7d922944" Size="3087" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1875834" />
@@ -47109,6 +47005,7 @@
     <Blob Hash="4b85c76103b1c865b31c69f43913f8148b748765" Size="3076" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="388416" />
     <Blob Hash="4b8a65a809f079ca5535211c0b73f523091fc194" Size="10839" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="627917" />
     <Blob Hash="4b8aea91c34d048d437992f3ecd7679f06623484" Size="76" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2097083" />
+    <Blob Hash="4b8b5e02b0274d401d51096f031cfa523fa4bae2" Size="3488370" PackHash="3a8be1234957d32048fa425c5c014905bca55030" PackOffset="8" />
     <Blob Hash="4b92868c2ef9e8d7317b74fc5dd5285253c9162f" Size="130746" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="856654" />
     <Blob Hash="4b93d6c78cff440133cc3b96d239e3b0ed705e82" Size="255546" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="453154" />
     <Blob Hash="4b9bec757e038b9beea3e59a837b7c38a4ab7f13" Size="28912" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1835635" />
@@ -47118,9 +47015,9 @@
     <Blob Hash="4ba4e5053f69cd19864d5e9f427eecfa735bfbbe" Size="3607" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="737902" />
     <Blob Hash="4bacbd8eb64e4fcc9c1c27bef94afa5d8b58b3db" Size="39936" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="1981194" />
     <Blob Hash="4baf62b0d6f13566a94d182c571cc7c06164f07f" Size="4086" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="473173" />
+    <Blob Hash="4bb21e2978f22b9b0b9aefde11dd991115e51aa2" Size="2450" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2087856" />
     <Blob Hash="4bb405140e55b24a2df6c1ef3d061e6a0026df2d" Size="2685" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="713862" />
     <Blob Hash="4bb6d8952983f38eeb86812a5027059293cd144c" Size="211" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2033950" />
-    <Blob Hash="4bb81ed995bd9cc5f32cac6948d8760cb574c379" Size="1379320" PackHash="056b3fcc9f2bb9a7b7024314a17d5c3c91b3bb80" PackOffset="8" />
     <Blob Hash="4bc0156d83f6ec6720745f9210ce25c1eea491b8" Size="148" PackHash="4abf0595e4706e434b909ea697e6e34737cc2bbe" PackOffset="2096791" />
     <Blob Hash="4bc24dbc77963537bd2e0eb6b169290126e6cb2c" Size="23552" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="2027330" />
     <Blob Hash="4bc35e3de05348947ab1092c80906575cf020a6b" Size="1181" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1660746" />
@@ -47152,6 +47049,7 @@
     <Blob Hash="4c04d191e1ad7e38dc410ffab0798a9bee7f6639" Size="61369" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="1684705" />
     <Blob Hash="4c0506b3845db202ac6350e9a0e4674027b632c0" Size="431" PackHash="4e6589080dee402938809771299985e1428734e4" PackOffset="2096547" />
     <Blob Hash="4c0579f11c425b940839e226b2e8e5fb62334414" Size="2832" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="724278" />
+    <Blob Hash="4c07c98fc255a5470442af06855cc8ac957dbd75" Size="14448" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1715148" />
     <Blob Hash="4c0902752001750da08e312d21f35f4451764297" Size="1068" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="540925" />
     <Blob Hash="4c091b07bf21e9b52974c2218c945a65710f09aa" Size="3205" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1181880" />
     <Blob Hash="4c09fb3550235a93e8f2476dc591d5a21ff696ec" Size="29872" PackHash="a223063132a00fd7e9af3c58ba28d6ba14fc65b8" PackOffset="2049508" />
@@ -47178,6 +47076,7 @@
     <Blob Hash="4c372325cb18bca0001be401d59c2792ad1b6ae8" Size="2268" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="662833" />
     <Blob Hash="4c3d8fe603a778fa02eca42cce47b43eb5c36d86" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1093828" />
     <Blob Hash="4c40f88c92ad013deb6a8f02f3a64507123eb71c" Size="421" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="127480" />
+    <Blob Hash="4c4402bf75d76dfd1e99164cd0743d1c0c82bcf2" Size="13106488" PackHash="aec592571f74b9d57bf52db420289db86d5c6343" PackOffset="8" />
     <Blob Hash="4c444e39b2c427ccb88bdff832713a3bd4489cc4" Size="8312" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2011276" />
     <Blob Hash="4c452c45b5c2092fcf2e4e1d7dba912edbad1522" Size="46496" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1614764" />
     <Blob Hash="4c4636873c47c214412152ee9cf4516b59463bfa" Size="5040" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1652337" />
@@ -47209,7 +47108,7 @@
     <Blob Hash="4c72f4e6e99f06ffe39b77873a32207cca7dfe47" Size="3497" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="832014" />
     <Blob Hash="4c73bdcf3bac78cd8fd50691f31c2c99441904d6" Size="52748" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="609658" />
     <Blob Hash="4c75255702e38d3a9540e466161ca66d8b84e654" Size="492592" PackHash="bebbdbb60be5af7d028ddfaa2a719af3d6269dbe" PackOffset="415692" />
-    <Blob Hash="4c7c9d8e3c42f3b6f07a4fda4f20aeeded6e7ec1" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556089" />
+    <Blob Hash="4c7c9d8e3c42f3b6f07a4fda4f20aeeded6e7ec1" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675321" />
     <Blob Hash="4c7ca7e481c507648be9ab3c1fa7340d143f9a10" Size="168" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1232764" />
     <Blob Hash="4c7d33e96ac29216aa64623dab28154b5b925ac3" Size="10092" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2037440" />
     <Blob Hash="4c820ee0cb5e3c209ed7890e00fafb404c78ea47" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="8" />
@@ -47234,7 +47133,7 @@
     <Blob Hash="4cb9ae653a083ca138ca55ec86958359d106a2fa" Size="37113" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="2058715" />
     <Blob Hash="4cbe3940ec8b09ed93f46adcfb3a3faf2f4a618e" Size="134800" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="676534" />
     <Blob Hash="4cbf3b68cadf9e9e8ae8b400c542b540cf75bd8e" Size="308" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2089045" />
-    <Blob Hash="4cc8203cc462e2e88fae5998df1bd496fde315d1" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549766" />
+    <Blob Hash="4cc8203cc462e2e88fae5998df1bd496fde315d1" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668998" />
     <Blob Hash="4cc982b79d6f79471fd1690634ebc69e85b2bb7b" Size="316080" PackHash="218b41b249f8b8cc60c48cdfe5f9f3139acec694" PackOffset="8" />
     <Blob Hash="4cce528e99f600ed9c25a2b69e32eb94a03b4ae8" Size="1320" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1639761" />
     <Blob Hash="4ccfe9c4ce93f1ef50a4a90b9fa4795a91a4efab" Size="2536" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="707649" />
@@ -47254,7 +47153,6 @@
     <Blob Hash="4cf7710ce21636da0c9caa60f2056cbd465dec7f" Size="221" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="2096636" />
     <Blob Hash="4cfd6a3ff0ed75b842ee86eeb07f5a14a5fbc7ea" Size="7156" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="503495" />
     <Blob Hash="4cfd728b44609d8fc34b88fc9d1398300ce63237" Size="18821" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="827500" />
-    <Blob Hash="4cfe719837b3706d5642e95be46bbb4c3259559e" Size="13423112" PackHash="0963a1a75df9a41f8b96abb8166732470b4c5b4b" PackOffset="8" />
     <Blob Hash="4d0326893dbf062ba177ff27f2b54711d842379c" Size="3334" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1239090" />
     <Blob Hash="4d035eea15134f147e4872bb2b68911d872fc547" Size="171858" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="290030" />
     <Blob Hash="4d0528a8d078de6d962958ac407e35250ee0425f" Size="2261" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1375725" />
@@ -47272,16 +47170,19 @@
     <Blob Hash="4d21c90be3d99542fd1fd4bcc4b0b92d2f5ab9d9" Size="23655" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1544741" />
     <Blob Hash="4d27ea29ca2f701b798bb79dcba332673510bd34" Size="6509713" PackHash="157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc" PackOffset="8" />
     <Blob Hash="4d2b2513c6cc0f1865bccf01e313ce229fc8581a" Size="74516" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="390354" />
+    <Blob Hash="4d2c12094ec75b95b3fbbdd48194693259328495" Size="14756470" PackHash="c7856fcd07117f32cae221347f7d3de7b5fda587" PackOffset="8" />
     <Blob Hash="4d2eba927a0425b3de9a8f9a2bae100d657571bc" Size="2211" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="2090828" />
     <Blob Hash="4d33d151d9bcc75da28949790da465878853c97b" Size="3850" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="351553" />
     <Blob Hash="4d373dde6d5f1a028bf9da8e2a4f84c4feb7a6ca" Size="172" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1093500" />
+    <Blob Hash="4d39179cb85b407e6ac7f9a1c40b3f27920048bb" Size="294280" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="1720550" />
     <Blob Hash="4d3d25c675fd48a8ddd35b2fb7d66908f0fada90" Size="904" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1660076" />
     <Blob Hash="4d3d8054231ec4e9bfc14a46ad4d60c575fbfeec" Size="78296" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1154655" />
     <Blob Hash="4d3ec1c0e83c05a90d25644da6573241f08dbeef" Size="5042688" PackHash="67017718bd106dede570306ae67a8ae7bf1c8c28" PackOffset="8" />
-    <Blob Hash="4d3ee314471cb27d5893ad2f7255cc74876cd747" Size="245760" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="1831336" />
+    <Blob Hash="4d3ee314471cb27d5893ad2f7255cc74876cd747" Size="245760" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="1789740" />
     <Blob Hash="4d410201de4ca2e9d40c1b5bc70aac19681a429d" Size="1993" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2081274" />
     <Blob Hash="4d421c7f909529b2feafb63a683371a01d441cfb" Size="25600" PackHash="aaf3a012f48b24c193628af42ef3302d96784c3f" PackOffset="1967184" />
     <Blob Hash="4d464d20c850936f9eaf431fa489876cce34f2ff" Size="3196" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1379512" />
+    <Blob Hash="4d4825e25b6055d014c40ad543c803e134075e77" Size="253858" PackHash="44621fa100827af0f1dd9c96f1f14135aa85da68" PackOffset="1829952" />
     <Blob Hash="4d493dedc5d7eb1690280dc5867cd917551ff6b2" Size="72783" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="939646" />
     <Blob Hash="4d54c722c8790ea43f72b3cc6ae3f4f7a1c86dac" Size="3381" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="910112" />
     <Blob Hash="4d56a0c6511600f1e0ce58e1d5664cd78275101c" Size="1575" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1995217" />
@@ -47290,7 +47191,7 @@
     <Blob Hash="4d5f39563800b14e7149b323e6c5118ad41bbd84" Size="3099" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="60599" />
     <Blob Hash="4d5fb9a8b2d35283b4c5c5abc7d99854901f644f" Size="633" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="680092" />
     <Blob Hash="4d60c023cfa7a08b959cfbd3f362844469debbf6" Size="10668" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1392500" />
-    <Blob Hash="4d612ab04cf07d6a92fc413ad4e5b93662eb28a3" Size="857" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1227261" />
+    <Blob Hash="4d612ab04cf07d6a92fc413ad4e5b93662eb28a3" Size="857" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2096096" />
     <Blob Hash="4d65eb1330c81323619c036a6ca1f4e7db954642" Size="12589669" PackHash="056da231130349525f352fa53db6086da790891a" PackOffset="8" />
     <Blob Hash="4d68c2cadb192c573bd6b648a6c1d3cc10c94923" Size="404" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1550168" />
     <Blob Hash="4d697124b1419a0299fffcbf4503bb98bc1a2400" Size="164" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2096990" />
@@ -47300,11 +47201,10 @@
     <Blob Hash="4d713416816079267467f0abf05e9491a58b7544" Size="163584" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1725515" />
     <Blob Hash="4d764d7ee8832df32863e083dc687bc0be963070" Size="110060" PackHash="354d41849e6ca4976e737a6e0332152c3d8dac27" PackOffset="248496" />
     <Blob Hash="4d76552b72b95f686c55bb9c7b7a9eda89b298bf" Size="28408" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="594011" />
-    <Blob Hash="4d8030f0809d2696876f371e150d9867d510cba0" Size="1437" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1413666" />
+    <Blob Hash="4d8030f0809d2696876f371e150d9867d510cba0" Size="1437" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1532897" />
     <Blob Hash="4d80f95596e85fe3c1ae5ac660e8abf5bb89bf9b" Size="95397" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="744894" />
     <Blob Hash="4d83f6281023dd5919e04980eec775f6eb2ef78c" Size="6823" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="2050006" />
     <Blob Hash="4d84f811fd929bc57cf4dcdd2d0287d5e4a5b926" Size="3829" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="182221" />
-    <Blob Hash="4d8ca9c2a909ed8b1b98a6159cd7a293c17c9ec4" Size="41048" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="2033472" />
     <Blob Hash="4d8e84578c3bfdd3732941b746f43f6f2d95fe6b" Size="11973" PackHash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" PackOffset="2080751" />
     <Blob Hash="4d8f53c1afbf3595b8d4155a5d5b0593b5997ce3" Size="12189" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="810510" />
     <Blob Hash="4d8ff138fcb9f263a8169ab74dee1276c7ad64da" Size="46820" PackHash="390a2f67478dbffc964bd3c94a21bfd967b67869" PackOffset="1771385" />
@@ -47314,12 +47214,12 @@
     <Blob Hash="4d9eaa0444f662e40f2dd5fbc31e49337a7fba29" Size="32121" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1472886" />
     <Blob Hash="4da0f0616563dfa8e4f5610a8dca2c8f2cf3fadd" Size="4997" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="923340" />
     <Blob Hash="4da21a1cbb710d6b4637d3fa31597c4a52ab79b9" Size="3528" PackHash="6127c305de0e48f8d5572ec15328dbfc52bd989e" PackOffset="1274179" />
-    <Blob Hash="4da4469b5c759f13f701fa2f458af0a7d4938a26" Size="760" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1447426" />
+    <Blob Hash="4da4469b5c759f13f701fa2f458af0a7d4938a26" Size="760" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1984508" />
     <Blob Hash="4daaa27a0382dfd5d25f55ef0eb0ef1c92b7e9f7" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1808840" />
     <Blob Hash="4dab141cf5ef6be3362e34f9ee51068fdfc62331" Size="3726" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1005461" />
     <Blob Hash="4dae190d0a1dc14cbad92ceb3dbfa657684d8a26" Size="2797" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1416771" />
     <Blob Hash="4db1dc4b2aa63be1c26244b642d4a50691411d62" Size="157" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="60019" />
-    <Blob Hash="4db3295e7450abcb182be2ef7985417ad22027f4" Size="161" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095680" />
+    <Blob Hash="4db3295e7450abcb182be2ef7985417ad22027f4" Size="161" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2096868" />
     <Blob Hash="4db9696a0ce2566dbc7a8302a4d0a988ca73e775" Size="35271" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="815968" />
     <Blob Hash="4dc47cf69e651e569a54e7260a83922e5569ff10" Size="3314" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="926463" />
     <Blob Hash="4dc6fd54ca9f22be4488ba2cf04eb769099fa89b" Size="8699" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="267184" />
@@ -47328,12 +47228,12 @@
     <Blob Hash="4dce227fd8d7d189692807aeb750c11521f08260" Size="240726" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="1127938" />
     <Blob Hash="4dcf2066fb5d04d679defd2cefb10bcf5ed29235" Size="1493504" PackHash="39751e99851beb7d0825e392704eb90eb4cb755d" PackOffset="8" />
     <Blob Hash="4dd095a6b92fdb8bbd7f16c865b95aa6f685ee43" Size="211164" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="211131" />
-    <Blob Hash="4dd5fceccb7ab358b0450527554d1fc0934ea66a" Size="1787632" PackHash="41cd8f5a4fbf268c28e171758dbb5942387688c3" PackOffset="8" />
     <Blob Hash="4ddbd434e529ad01b02f6b52f80428c45e1611fe" Size="611" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1833566" />
     <Blob Hash="4ddcffbdd685e24027c5b40891e6db58ece63807" Size="76818" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="232812" />
     <Blob Hash="4de31c05806d65710ab08cba4edf44c27bcf4777" Size="4485" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2081498" />
     <Blob Hash="4de5971a271bada7699376c16b70040bab3d5e7f" Size="141029" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="280498" />
     <Blob Hash="4deb6ce4d2f135d7d0ce84bc0301547a16de6904" Size="827" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="778957" />
+    <Blob Hash="4defb059213e2e750e419ca3613cf0033d7a2e8d" Size="3933448" PackHash="0087e7aafcc77ae850ec79cc48f8c7e76a6e28e9" PackOffset="8" />
     <Blob Hash="4df0084fe84d2a0643cfd92803d49fc0b618e3cb" Size="25452" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="649964" />
     <Blob Hash="4df2473d96871ae0ab8f9e51147c61ec1c427938" Size="2977" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1466745" />
     <Blob Hash="4df2932e68145ea2e5803f8fce42cdd64d7f41a2" Size="1580" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="957427" />
@@ -47342,11 +47242,10 @@
     <Blob Hash="4dfeec79fd8e4b3fa50de44e23002c8dc6bfc6c4" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="230047" />
     <Blob Hash="4dfef87dc898b99cd53092991ba84c32b73036be" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="535736" />
     <Blob Hash="4dff1ccbc96b511978935300e5a9954001107a45" Size="5699" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1073179" />
-    <Blob Hash="4dffca64c08a51d73bb13c11e2738da0c43e3559" Size="6648070" PackHash="79791e455691c246de4c6f1105306004b75cf2f5" PackOffset="8" />
     <Blob Hash="4e01232ea036b303a2c464a47d9f46fb8816f801" Size="16742" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="373612" />
     <Blob Hash="4e01fa9af61a28b1bfb9dd6aa8a8a1140d41ae88" Size="8888" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="935121" />
     <Blob Hash="4e099280bedbaace36bd1b25bfe871ac02e9cda1" Size="69860" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="436292" />
-    <Blob Hash="4e0a3728973a0feee860c59c241ff8023f5e9029" Size="9245" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1989907" />
+    <Blob Hash="4e0a3728973a0feee860c59c241ff8023f5e9029" Size="9245" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="8" />
     <Blob Hash="4e0ae4f1ebca0812c877893bfa8ff493ab6226cf" Size="855179" PackHash="79cbb1b9e1be7761c86eb45db23522dfc07e61b1" PackOffset="860341" />
     <Blob Hash="4e0b32a5e235e9bd1b971a70c736698cc0070241" Size="2996" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2029648" />
     <Blob Hash="4e0d5b3d110892fbe1cc905837f5463911369d2a" Size="12884" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="916211" />
@@ -47355,13 +47254,14 @@
     <Blob Hash="4e102b0a7858e06092b2f7a5591de89a09f756a8" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="976864" />
     <Blob Hash="4e10e3640dd25010a9f94927ec8e219c7d13bd8c" Size="3153" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1986659" />
     <Blob Hash="4e17e2c70d7a75a296dcf8b26dc9e8f407aadc8d" Size="459" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="473372" />
+    <Blob Hash="4e1d6723f3148efb23883052652f1149ae201886" Size="3433714" PackHash="ebb4aebe534377a11e1cb4a0ee4278286f82eff1" PackOffset="8" />
     <Blob Hash="4e1db03ec7f3a19a2f70968cf70669e4ab2db89f" Size="3157" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="497320" />
     <Blob Hash="4e1e138d49885bb5a4c56fc248414d268daef72f" Size="2287" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="451806" />
     <Blob Hash="4e1e718fbeb246c8c65873dd0a629108456074f3" Size="418" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1348240" />
     <Blob Hash="4e1ed4e06066eef0e1dbf744ac0d746fa750be32" Size="36876" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="2032208" />
     <Blob Hash="4e1f67c276a160a9a2e57691685a707a0802c2bd" Size="5572" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1866447" />
     <Blob Hash="4e20e1fc881ce3a1c3a4c446f0ea31300459fedd" Size="15016" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="774673" />
-    <Blob Hash="4e29c8e10cd62a15019464080cb330982d0efc83" Size="26197402" PackHash="a74b98cb304dde228367a8c86fd1540e356bbfe1" PackOffset="8" />
+    <Blob Hash="4e38b0d711e2f63aaa7f0bc8bfcab20a1f500474" Size="18756" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2009153" />
     <Blob Hash="4e3a2b71ecf867d31b7cbca931d3a6838ed7d61c" Size="43123" PackHash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" PackOffset="2021341" />
     <Blob Hash="4e3b6b84bf1b303849bc61594f56c504b5d66115" Size="53590" PackHash="f4fed3583021f5ff06710749a1c7c47f83deef12" PackOffset="2042861" />
     <Blob Hash="4e3d3cbd96d084836f1fe6f2aa497e3faa463b9b" Size="93330" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="132559" />
@@ -47369,18 +47269,18 @@
     <Blob Hash="4e40e64bfe4db0fc26d6eed48e9fe6a59f13556b" Size="15163" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="85067" />
     <Blob Hash="4e43f88d71a726571ff11632ad687c37d7a4ce4d" Size="1205" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="754139" />
     <Blob Hash="4e445971450c6019052d9d02e056cb01c24be05e" Size="1056" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="60605" />
-    <Blob Hash="4e48d94db91d2ce19776965b6b8c97fc24112076" Size="332" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2063372" />
+    <Blob Hash="4e48d94db91d2ce19776965b6b8c97fc24112076" Size="332" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2083380" />
     <Blob Hash="4e48df05fdc73f46ea337bb4adfc4611340e3810" Size="5722" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1444107" />
     <Blob Hash="4e5a7bda7d060b1b7f29a4a0ef75d852d9256b5d" Size="3434" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="845991" />
     <Blob Hash="4e5af2466098d0852a895de8618a4140aaa980f9" Size="4886" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2051570" />
-    <Blob Hash="4e5e04cca2c0076761aef0b09e9e906556a958e4" Size="747" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1463811" />
+    <Blob Hash="4e5e04cca2c0076761aef0b09e9e906556a958e4" Size="747" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2000893" />
     <Blob Hash="4e5e131970cab2dd33d91100341caea9d41c103d" Size="19000" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="354124" />
     <Blob Hash="4e63e5e15a977443175b85734a11cef8af14e4c6" Size="967" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="632855" />
     <Blob Hash="4e658d01ea67573abaff030c662d7088ae7b5201" Size="1273640" PackHash="3b0711ac8e0d8edb111efc26b713e0bf02b98604" PackOffset="8" />
     <Blob Hash="4e66ec93c75983047f2d2cd213a235eae8888275" Size="2907" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="936178" />
     <Blob Hash="4e6752a07a9315b55c45a3f273cf6cfc6087cd9c" Size="12657" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="113424" />
     <Blob Hash="4e69482653cd071465f841429cd6c0ef69a745bc" Size="218" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="2096829" />
-    <Blob Hash="4e6b66f703fc35cb1302342bccc3d14822ad7a36" Size="1961" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="2095195" />
+    <Blob Hash="4e6b66f703fc35cb1302342bccc3d14822ad7a36" Size="1961" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="2094785" />
     <Blob Hash="4e6ddc9a56843947e9015a2f55ccff226a7b257c" Size="1889" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1385978" />
     <Blob Hash="4e700a95fcb5573c4e35d0e251a445e295c4bd71" Size="22004" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="6591" />
     <Blob Hash="4e72171c66be147d49a1d68440cb3821eb0b7b5b" Size="18511" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="8" />
@@ -47406,7 +47306,7 @@
     <Blob Hash="4e9321eac0d7b044c2c37e91aee72f961b03b52f" Size="8801" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1953804" />
     <Blob Hash="4e940d6367ff3bd60802ae5446f74de28b4e3512" Size="486594" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="1368664" />
     <Blob Hash="4e9ab9667bc940500a755837c8f25f13cef12de4" Size="9432" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="575585" />
-    <Blob Hash="4e9eb7d18c57df3144ba8c264eb9dc43c18505f5" Size="58266" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1891094" />
+    <Blob Hash="4e9eb7d18c57df3144ba8c264eb9dc43c18505f5" Size="58266" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2019148" />
     <Blob Hash="4e9ed91b92fa35160e8e7ec644577caddb8fe449" Size="5764" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="718514" />
     <Blob Hash="4ea189c3af76a7df714c397bea1e32c1625d115c" Size="898" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="948191" />
     <Blob Hash="4ea3e050c23edafdf4da05840a594e396815d22c" Size="6420" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1213824" />
@@ -47415,13 +47315,13 @@
     <Blob Hash="4ea74430795112e4a7ea4e9c8a7f1246747d6a42" Size="13082" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1708028" />
     <Blob Hash="4ea8248666da302db330a4d1bc573c3ac7f6dc47" Size="296772" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1224488" />
     <Blob Hash="4ea8dc9ded80d09660218a850ba940b486012156" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2097049" />
-    <Blob Hash="4eaa0c1e95323379d04f93ad8ff6aba867c6dec6" Size="1294" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1991444" />
+    <Blob Hash="4ea9af47997c61d6d7a71aa13f3ba6b85961e7b6" Size="16543198" PackHash="b24b6ad12f4e3f5f7082c24df781655905746068" PackOffset="8" />
+    <Blob Hash="4eaa0c1e95323379d04f93ad8ff6aba867c6dec6" Size="1294" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2050000" />
     <Blob Hash="4eaa1876c7e0fa629255c3741ce656ef1fc2cefd" Size="44861" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="596026" />
     <Blob Hash="4eaa7134621dfdebfd1405f5cc58227fa7e80c3a" Size="8505" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="191343" />
     <Blob Hash="4ead738c921b20283c8261f667fcb149f7f42f1c" Size="504950" PackHash="92ae8532b869692f25bb7d7131f0c2017ff26348" PackOffset="1398136" />
     <Blob Hash="4eb426a1483db18ca327c177ff52ed3382d7bd1d" Size="43520" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="2000392" />
     <Blob Hash="4eb4414ee3d6c39dd1cfe0da36fcfd2c1917b15e" Size="329" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="421160" />
-    <Blob Hash="4eb44c4ed4045315f6aee91dc39197941de16fa9" Size="2164" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1347113" />
     <Blob Hash="4eba1cdf0ced2df510ec5d1b942e4964cdf99799" Size="11344" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1257326" />
     <Blob Hash="4eba54738f3b5c817a7cd30d94fb59f71a6db5ff" Size="68250" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1223978" />
     <Blob Hash="4ebb178302dd55639bc9b5e120ed455869b531ac" Size="3014" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="97806" />
@@ -47444,7 +47344,7 @@
     <Blob Hash="4ed6e0f11c32113efee616c02f2174f3c7c5bc23" Size="186553" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1364518" />
     <Blob Hash="4ede825981f7263b4d498cd5c0ae9b835e803118" Size="746" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1903853" />
     <Blob Hash="4edf299364d3d6335aa2ebce396acf484b2163b6" Size="3180931" PackHash="865b8def9b158aa97b8958e63ef450b7b24982fa" PackOffset="8" />
-    <Blob Hash="4ee3fc2caa4579958e88bfd74f3699795c032507" Size="1187" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1209434" />
+    <Blob Hash="4ee3fc2caa4579958e88bfd74f3699795c032507" Size="1187" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1654265" />
     <Blob Hash="4ee43374520904fa6d80c12c273d67eb7b5c984e" Size="219424" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="279606" />
     <Blob Hash="4ee635e1ecd7e3cbed63a7d98c6d0472fe1c0dc3" Size="3220" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="985460" />
     <Blob Hash="4ee7ac3ad055482c5ecba070b90593db18a3f38e" Size="1339" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1186293" />
@@ -47457,7 +47357,7 @@
     <Blob Hash="4ef1d03d9e1ea10bb4e89d9448ca607fe3e85aa9" Size="58368" PackHash="567807ac295099a07a6c59a7bff568f21dd14860" PackOffset="265288" />
     <Blob Hash="4ef1d3c0d32365e7a913e9e2a9bf3ed541f37d33" Size="352584" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="549704" />
     <Blob Hash="4ef24d1a554cb6fd362e6831cf38b686b6ec1485" Size="151" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1256995" />
-    <Blob Hash="4ef24d6d9df93fba793e4074d49a0b0384765a06" Size="40859" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2049032" />
+    <Blob Hash="4ef24d6d9df93fba793e4074d49a0b0384765a06" Size="40859" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2044773" />
     <Blob Hash="4ef4836251a53a5fe384ebea32d7678b87dd1187" Size="6771" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="849870" />
     <Blob Hash="4ef5267766bad83fa702c6aa0d107c6942160c95" Size="28556" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1819472" />
     <Blob Hash="4efba8dea46f224df6fe429ea5ec340f512483f1" Size="2088992" PackHash="940e60ffabee11f37a3c17706c805f8837d9cbf4" PackOffset="8" />
@@ -47465,7 +47365,7 @@
     <Blob Hash="4efdfd0e0e31bf5d4cdce534d3d348fa631c0d81" Size="2321" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="458682" />
     <Blob Hash="4efff396b2ee1506443c7acef79da4815995f698" Size="314" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="214665" />
     <Blob Hash="4f0012032c8c2276bce1049b87f28260becd9d48" Size="4383592" PackHash="ea14e039005c521a036dfba5c3dc4cef5c7b2b28" PackOffset="8" />
-    <Blob Hash="4f00de6eaed616b80ddf1170409a91b409aa2296" Size="145" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1428084" />
+    <Blob Hash="4f00de6eaed616b80ddf1170409a91b409aa2296" Size="145" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1877137" />
     <Blob Hash="4f01d18efebfb8e6801d8375925db261937473ed" Size="1629" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1377986" />
     <Blob Hash="4f0558d8f6f6fd59167ec2c1c9bf8bf6c3b59eaa" Size="13948" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1190620" />
     <Blob Hash="4f08cede17f307ee88647a6ada9870bf54430a2b" Size="590" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="835400" />
@@ -47487,14 +47387,14 @@
     <Blob Hash="4f37bb8905c32966f7e588188d6cbeb74d8e2f09" Size="2723" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1262614" />
     <Blob Hash="4f38d952557e2630a50c328e088fa62dd7639ce3" Size="3008" PackHash="2944a0052b881a644f04844186daa4ae54aad523" PackOffset="2091254" />
     <Blob Hash="4f39da6320223825b9b3f8c920bc1c241027c04d" Size="32798" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="876525" />
+    <Blob Hash="4f3e2902776ae2e0e84b135c0309bf09f6897928" Size="7442440" PackHash="88b0c91639f08f62e25f052d78be2ef069970b76" PackOffset="8" />
     <Blob Hash="4f3e41f69bc340aee4a79e78aa4735f6cf121b63" Size="6011" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1483126" />
     <Blob Hash="4f4065daf0a2f66ac04e3f41e4d5e7dd81707953" Size="29893" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="987246" />
     <Blob Hash="4f412f5530b92ce5b06614149b3c4e4956ca54fd" Size="197" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="349941" />
     <Blob Hash="4f43a755e110b427e686c49de18b20b81bbab4b7" Size="1067" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1325789" />
     <Blob Hash="4f457084447197fac2f47e7bee67efe1afd9a41a" Size="275456" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="547848" />
     <Blob Hash="4f47644219a14efc0f1e02006dbe12d0f0f10bfb" Size="7971" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1449829" />
-    <Blob Hash="4f48d2cf1711ba35ea7f877aa89880122121802f" Size="28500" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1496646" />
-    <Blob Hash="4f4979881627c72c8dc249bbf2c18408bbf7c39a" Size="1590272" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="8" />
+    <Blob Hash="4f48d2cf1711ba35ea7f877aa89880122121802f" Size="28500" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1951963" />
     <Blob Hash="4f4a4c3cbafb2d33c492d30afa2b027a3a0c721f" Size="947" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="385822" />
     <Blob Hash="4f4de112368fcc1086495406aa5e00527ff22340" Size="3136" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="769231" />
     <Blob Hash="4f4f667194cd34b7dafe6b993e3670f9b172f5f3" Size="143178" PackHash="2ff8709ada5b8bbfe994f55ce697983225440813" PackOffset="1591950" />
@@ -47507,13 +47407,13 @@
     <Blob Hash="4f5e0708ede0e952c6d3ce033c6608094391c995" Size="4191" PackHash="36af7f5290dd60c07f83b8a398eb9721c24a6154" PackOffset="2092460" />
     <Blob Hash="4f5eb9f4b19b95cbf8b66b251926eaa943eb1527" Size="98234" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="1778972" />
     <Blob Hash="4f6669edcb2b46015e05d030517a56c07bf7a141" Size="6466" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1058902" />
+    <Blob Hash="4f67308bc14dc24480c1752943713acc13d7ae64" Size="374928" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="1481104" />
     <Blob Hash="4f6ac2f20c5dfffc8df672daafb8d0d1fbc5d737" Size="2966456" PackHash="e990079e67563b7972840254a41af9b194abf5a2" PackOffset="8" />
     <Blob Hash="4f6b005222e592b104e9cb4a665c07537f2d1135" Size="1387" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="376937" />
     <Blob Hash="4f6b0908db414816baece59fac7f63ffd64e62e6" Size="305" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2078947" />
     <Blob Hash="4f7033a56d8d22285afad41b0fbf5cb657c7b3ee" Size="6577" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2016104" />
     <Blob Hash="4f71e6cced696c50c5efc3c5adc6cc1a6150d5cc" Size="2859" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="266642" />
     <Blob Hash="4f758692b665570d57ac4dbc11a458b5b2cd0358" Size="1121" PackHash="60fb5701eed18af817e516eab0fbf9f94fd39be0" PackOffset="2094789" />
-    <Blob Hash="4f76db515c1cdd02c3c2af8fadbfc5f058b5ff14" Size="2221568" PackHash="63a978cbd91a1b72f50014e3c1b2cc840edbe712" PackOffset="8" />
     <Blob Hash="4f78d28b8d6ba93dbd6c2d04eaa7b006a795c55e" Size="3005" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1599311" />
     <Blob Hash="4f7ae16684d7e5817eef678d7f837c0b9996ca74" Size="859" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="412168" />
     <Blob Hash="4f7ffc89ad65d304a6d2159fb872bb2618f2c200" Size="12926" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="225647" />
@@ -47523,8 +47423,6 @@
     <Blob Hash="4f88c9de888e0d71119c84ceda6c888c3e1c4ffb" Size="44232" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1715174" />
     <Blob Hash="4f890892be1f66ba6894462e91f393e4de619e3a" Size="133130" PackHash="2ff8709ada5b8bbfe994f55ce697983225440813" PackOffset="1735128" />
     <Blob Hash="4f8d04fc14f3942c8fc6209b242946e7b80fc424" Size="1482984" PackHash="5ecfae8f6a2cd2c1dc423d2cd3c15aaa23cf18c5" PackOffset="8" />
-    <Blob Hash="4f908fae395825913133106ba4683ff36471d086" Size="417832" PackHash="1bdfb2089d50fef664ddd40f88773779551a6963" PackOffset="1530712" />
-    <Blob Hash="4f919a53badf56a7821545c9a0e42c70705b38e9" Size="6213888" PackHash="de1a336e62b98e22da8d539e099acc94cd7dd633" PackOffset="8" />
     <Blob Hash="4f941c37718dc2332557c3a3301b248e98e81bd1" Size="5783" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1932824" />
     <Blob Hash="4f944f1fa0fed90f52198c3f7007f3ba64c9471f" Size="2457" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="561105" />
     <Blob Hash="4f95b9a605404ae83fac6f398b48d17fffd58683" Size="2376" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2093358" />
@@ -47540,9 +47438,11 @@
     <Blob Hash="4fb0119b098fb0ff7fead183d2ca66b48e93098a" Size="81920" PackHash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" PackOffset="1989892" />
     <Blob Hash="4fb2976fdb4c59b0225ffa8525a15c022defc864" Size="5355" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1490375" />
     <Blob Hash="4fb392de5e9960eb4097b6fc1d8e44efa90a3dd4" Size="15788" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2036576" />
-    <Blob Hash="4fb73b6d649410faa1d31cad684443210197e675" Size="15624" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1345320" />
+    <Blob Hash="4fb3f38f4e4aaa671ddbee0c95fad7fafb19a7ec" Size="5234376" PackHash="64a56c1b1ca1b4e9d7360808b67dd6c07bf7645d" PackOffset="8" />
+    <Blob Hash="4fb73b6d649410faa1d31cad684443210197e675" Size="15624" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1464780" />
     <Blob Hash="4fb7d9cd9cf6ba146fe175ae61d3b38234c4bf97" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="508448" />
-    <Blob Hash="4fbdf83171709a8f126d75473d3329d416ec30fb" Size="1470" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1053492" />
+    <Blob Hash="4fbd2d2e03386dd632f3a10cb5f0af129b372f0e" Size="7054" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="2085062" />
+    <Blob Hash="4fbdf83171709a8f126d75473d3329d416ec30fb" Size="1470" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1223526" />
     <Blob Hash="4fc3b7b7e9c59bc4ede1833c0aacfe922e0deb0d" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="473368" />
     <Blob Hash="4fc5589c1dd88bb8171758bc173a63b3a5687ae5" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1832120" />
     <Blob Hash="4fc57d43bdcb07359aa18e4f2c71c26206305c53" Size="264167" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1501038" />
@@ -47553,6 +47453,7 @@
     <Blob Hash="4fd657e5a7be40b05a1e745bacd9637c5b949754" Size="7493" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1266372" />
     <Blob Hash="4fd7c48d6f5eb6b25a72910f134b9deb8c22a65e" Size="580" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1167700" />
     <Blob Hash="4fd8feae3d2e5c8280f3260edb380e6d56933291" Size="8494056" PackHash="f667a04fedec44ff7ab21ad83f5bb42aad40a3d8" PackOffset="8" />
+    <Blob Hash="4fe19f506e2e4391ecc08786c5ee0125136dc11c" Size="736254" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="1193296" />
     <Blob Hash="4fe340c1aace703321cb48b1359fbfe063be8965" Size="1636" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="623105" />
     <Blob Hash="4fe35967c54e4963e23d12eaa90a705f0631c114" Size="465" PackHash="bc4cf9d4758f107d90920f50b55c8d1240dfe8bb" PackOffset="2096626" />
     <Blob Hash="4fe4151bdbc7cd83d93ce06394f6bd2ffef88f6c" Size="14074" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2082285" />
@@ -47582,11 +47483,12 @@
     <Blob Hash="501850b50f89382494f564ea86153374dee41c63" Size="194828" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="352616" />
     <Blob Hash="501d12fef1a44f9ae7d75dd353671eb48991ee72" Size="22500" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="616626" />
     <Blob Hash="501d43b0a7457787ed1f551761590d6d3a6e09cb" Size="3004" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2078149" />
+    <Blob Hash="501faadf0a05c91f29eb341c126018f38ab0e897" Size="118485998" PackHash="e9d8fd56da6503bd0fcab30bcdceadd992521392" PackOffset="8" />
     <Blob Hash="501ff887acb5d13118ad3614956654c5d6396272" Size="35893" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1883841" />
     <Blob Hash="5026d339d1211ca599138a778c85813c8e6ef251" Size="24231" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="39185" />
     <Blob Hash="5026e61ffafcb826d0fd32fb085fba0bd27705d2" Size="4020" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1259036" />
     <Blob Hash="5028afb650b1bb718ed2131e872fbcce57828fff" Size="4720" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1641081" />
-    <Blob Hash="502963094a99ec8fd4112de216ec36c156a99ecc" Size="782" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1436964" />
+    <Blob Hash="502963094a99ec8fd4112de216ec36c156a99ecc" Size="782" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1886017" />
     <Blob Hash="502b8ee9d4a1ea75a91272181ac87b9b6ece1f84" Size="110" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="203962" />
     <Blob Hash="502c08e5c3815ef62aa493aefdc8d3c33071ea17" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1996968" />
     <Blob Hash="5031b4564294935cafe69e096ef1e473242fcf0d" Size="184320" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="1798376" />
@@ -47610,7 +47512,7 @@
     <Blob Hash="50604fc3554606888a71a5ccd008fba3cf0abed0" Size="17853" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1267694" />
     <Blob Hash="5069a8497c5081c4a699741918e67040cca520ac" Size="25112" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="2053540" />
     <Blob Hash="506faeb2bc3cd525abad825d73e61cce1d2fad7f" Size="7003" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="2057064" />
-    <Blob Hash="5073786f521b9d265a97cc739dbd6a9e8ecb6da2" Size="238" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2066234" />
+    <Blob Hash="5073786f521b9d265a97cc739dbd6a9e8ecb6da2" Size="238" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2086002" />
     <Blob Hash="5073925fc172c0299d21510e842fb5539b9ec705" Size="1793" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1488808" />
     <Blob Hash="507865b0ba27093e521a8280ae220772dd4ca87a" Size="35875" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="573287" />
     <Blob Hash="507b0cb2b60830eb3acbda1c7dd8e9c808b65617" Size="212" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="608361" />
@@ -47625,7 +47527,7 @@
     <Blob Hash="508e3de5001ef2426833ad39d5f0b518aa3ee0b8" Size="406" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1555658" />
     <Blob Hash="508fbd39ab2cced12b6e93ea64dc2a0751bfe8f2" Size="52953" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1924260" />
     <Blob Hash="509184dabf76669ab42700a655874a98630f743a" Size="1914184" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="8" />
-    <Blob Hash="509469ffe2defdc95b563e74d33008862e607840" Size="2199" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1405384" />
+    <Blob Hash="509469ffe2defdc95b563e74d33008862e607840" Size="2199" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1854286" />
     <Blob Hash="5095a3c8270bff52f3a4f2a18908c096a8e4afa9" Size="615817" PackHash="e5cf89e55b3055d7ed976321006a6a222885d096" PackOffset="1353736" />
     <Blob Hash="509efa6fa7d47c29b9a594e422f5ed29e35ab0b2" Size="2845" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="708636" />
     <Blob Hash="509f45def024ef67575dce60064281f23a896579" Size="2243" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="2093678" />
@@ -47633,18 +47535,19 @@
     <Blob Hash="50a0a9ff867a8e9646056b5294e1adb6a8e59830" Size="8390" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1773064" />
     <Blob Hash="50a368c784e1a509ef552b000496fe439d5dac97" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="255632" />
     <Blob Hash="50a8f69faefcc87a652034976dcba692558ec7e9" Size="3861" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="512530" />
+    <Blob Hash="50ad355048c303f37c8ac417cd5e8aef95ee87fb" Size="78" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2097030" />
     <Blob Hash="50b1e57679b54f9209fd77d3e970cdfe15bc98e6" Size="8697322" PackHash="dede8e0a11b5f83fcc80f8de114b924834dda515" PackOffset="8" />
     <Blob Hash="50b434837a918a7c39540cbaf0aba404d6710a50" Size="32493" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2024043" />
     <Blob Hash="50b507212ca0771c6de3f495adb07477b074a8bb" Size="7936" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1834177" />
     <Blob Hash="50b63e19db5c6490a4e618e392a0522515ff3b94" Size="8581938" PackHash="36e828d49f9fc2f650b1033a3a37a0e1381008af" PackOffset="8" />
     <Blob Hash="50b6ea5b4160ddbcc7966d3f6837ecb85ecefd3b" Size="20711" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1419952" />
     <Blob Hash="50b814cdd0c9bed0e209779b2454375ff7d654e6" Size="115" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="451367" />
-    <Blob Hash="50b968963a8741ddd0a28af446a696dab0f3be0e" Size="2226456" PackHash="55663b7ebd3d4105cc759c6dc861f85aebe887a5" PackOffset="8" />
     <Blob Hash="50baefe7b2632d227fbe96a650acee22e74d1272" Size="5236" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="803747" />
     <Blob Hash="50bcf22494360620296078b4c3b515768b80ad5a" Size="1314" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="2085274" />
     <Blob Hash="50bcf2a6f47a96780c75526127551722ad9fd5f9" Size="3654" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="896046" />
     <Blob Hash="50bff01e7a5a2f637872a5c329ff61002d458109" Size="1289556" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="412356" />
     <Blob Hash="50c0b28294ba027fb8dcc4fd719fc82b89a4a14f" Size="362879" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="311085" />
+    <Blob Hash="50c105c52f10cbe1e9505873e33f32a3c007f8c8" Size="471056" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="886568" />
     <Blob Hash="50c2b1667628e6501281bc66d3f28a6e3131a8ba" Size="9747" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="225241" />
     <Blob Hash="50c4822d79b561dcd76877bc550eaff746c45bed" Size="2347" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1850623" />
     <Blob Hash="50cc398cb1e18c396514425f1a679033199e189e" Size="2480" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="940270" />
@@ -47652,7 +47555,6 @@
     <Blob Hash="50cfa6315550065669bd48912ec5ca34e837efd8" Size="3098" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="930147" />
     <Blob Hash="50d16a04238828fa1f02000771e5b1d21682c59e" Size="17611" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1037203" />
     <Blob Hash="50db8da091bbdc99d4b0739f29924e5772cdfb1b" Size="610760" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="284569" />
-    <Blob Hash="50e00a1a7e7adfdcbf68aa3cfbfae9d6e0412519" Size="235060" PackHash="d45c65e5f0c78b3f9b0946abb1d05a7c58a84e84" PackOffset="1805516" />
     <Blob Hash="50e3f98cc55259af064903df5437dfa9b909695d" Size="15800" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2069268" />
     <Blob Hash="50e6eee15bf85fbc860d7d6d173f05194d240dd8" Size="4409" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="104196" />
     <Blob Hash="50e9284dacff19cc3930e100e4fd8cac1137f3ff" Size="1377" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2080886" />
@@ -47660,34 +47562,35 @@
     <Blob Hash="50eabcd472fffa18ba21eb199a2f6b78e05fc453" Size="2531015" PackHash="9ddf004692c477b60fed575d57551fabdb00997c" PackOffset="8" />
     <Blob Hash="50eace4ee8253e06999543bafb2a7066bc2ee8f9" Size="116" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="693859" />
     <Blob Hash="50eb24b2b3d4cf0a8f0534994cc1ecc0313b2a80" Size="4876800" PackHash="1d452bbc5f5df5c0d8acd1367971123c3c3ef9e0" PackOffset="8" />
-    <Blob Hash="50f16d60b9a04538400c197af022ef7c77877c2b" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549330" />
+    <Blob Hash="50f16d60b9a04538400c197af022ef7c77877c2b" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668608" />
     <Blob Hash="50f340cd15d6a0f52d50ddfaa3748d24b6809191" Size="4191" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1204004" />
     <Blob Hash="50f4c66865d008a5342fcde33df8906f0fec5569" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081140" />
     <Blob Hash="50f6b2099a734ac9ef4239ece33738c11bf0bcce" Size="1973" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2069513" />
     <Blob Hash="50fd7701f3b1d99dd94e988bf55eef1a13af2528" Size="33528" PackHash="1846a8eaf700005d638680c1ccd94ded8ff6d5fc" PackOffset="74996" />
     <Blob Hash="50fdae972f77c300274f0956eb76a350e43acff0" Size="154960" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="250968" />
-    <Blob Hash="51031f0ede3063a317064aba7bdb135e4abbf6ff" Size="472" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2096166" />
+    <Blob Hash="51031f0ede3063a317064aba7bdb135e4abbf6ff" Size="472" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2095868" />
     <Blob Hash="5104d8b469a1dc95e6ba41f1ad4d906fd795a763" Size="770" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1289897" />
     <Blob Hash="5109ae9ea4c6ce1d4f5c3b6a9d0b7d6159777ca1" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="224930" />
     <Blob Hash="510bbb6a9162f2ef908e6561cc714848c2ea74ca" Size="1621" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1076332" />
-    <Blob Hash="510cc58d6069367bf06f7d4c1eb38adf01340bf6" Size="64" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1752657" />
+    <Blob Hash="510cc58d6069367bf06f7d4c1eb38adf01340bf6" Size="64" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2097086" />
     <Blob Hash="510fba963b16e51d19bbaf0336dc04b3b3456696" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="609259" />
     <Blob Hash="5110f05deac8f15244897b3f70e9ce413468771d" Size="50197" PackHash="390a2f67478dbffc964bd3c94a21bfd967b67869" PackOffset="1718119" />
     <Blob Hash="5115a4255e3c8df015e5c08ca6e7d2e9a3c108f2" Size="4616" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1019982" />
     <Blob Hash="5116eeaa4e289ff0527a374ec0a91cb1da212a07" Size="617" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="264687" />
     <Blob Hash="511877e463cbc69a32e0b5740fe16052eae6c7de" Size="20870653" PackHash="a407e60d87080f883ac7f36ac008bf2dac54f48b" PackOffset="8" />
     <Blob Hash="5119232672a5de485d781695fb7c13212b945a04" Size="656" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="434464" />
-    <Blob Hash="511f507864edaedae784e18c218093054c2329fc" Size="115" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095050" />
-    <Blob Hash="511ff0719301b1c575946087b6bcb591a54ff6c8" Size="318" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1586374" />
+    <Blob Hash="511ff0719301b1c575946087b6bcb591a54ff6c8" Size="318" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1705606" />
     <Blob Hash="51247763f53aeec472a815fc125575b3ba3ea70c" Size="2615620" PackHash="f04bb0803c834328c048cff05056081b1d0e8120" PackOffset="8" />
     <Blob Hash="5125bfa7517d91302f2dbc1de17a63e01e5dfa70" Size="508" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2025318" />
-    <Blob Hash="512f04d970f831070239dc73ee40d913358a403b" Size="6491" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1244169" />
+    <Blob Hash="512f04d970f831070239dc73ee40d913358a403b" Size="6491" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2027909" />
     <Blob Hash="5131975be5fd860142ff91f1ad24ca4193c4730c" Size="12616" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1218854" />
+    <Blob Hash="513311c55b521e69162c4e9e83fa4cc5c7129f6e" Size="3538" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2065362" />
     <Blob Hash="5133549bb43d5a8d68d3a24738ed3495e8f96b52" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="947224" />
     <Blob Hash="5133f3681fe4121f43a420fa2d78229fb8e5812f" Size="22396" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="427128" />
     <Blob Hash="5135b7a6b5086ebe91077c34623302be6c023e62" Size="5077" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1294440" />
     <Blob Hash="51362fafe15ce6d205e20454202afa067f4c1fbc" Size="2621" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1022602" />
     <Blob Hash="513acbe70ffd7c553c7e893b88542560044fa5b2" Size="71915" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="1633377" />
+    <Blob Hash="513b8afbb3c835bf138e0006ddf603dda59c4824" Size="7664504" PackHash="b70cea41656eba8adc28c7b767fb5b497ce09ac4" PackOffset="8" />
     <Blob Hash="513e9ada30b43ac036315c052aa74a3279f4c474" Size="100458" PackHash="749a111a54b3257ccd4600b6ece1fd86a57efe58" PackOffset="1990565" />
     <Blob Hash="514320a5efd9ec4f981112ac425d06089ccd7d3c" Size="2711" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="826273" />
     <Blob Hash="51473db417a52f7c9c576d256a64d1efac9aba9f" Size="8536" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="332912" />
@@ -47700,14 +47603,14 @@
     <Blob Hash="51663902456581eae1c9302e02c92246385b2059" Size="41804" PackHash="f6fdc33805bc89e2eaff8003a996f6bf8f880789" PackOffset="2051628" />
     <Blob Hash="516a844c296adf13bdf900a7218a7df9f3062929" Size="372806" PackHash="30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" PackOffset="1670632" />
     <Blob Hash="516b4f73789de6f000a2604d898017ed5b5a1e63" Size="407" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1763901" />
-    <Blob Hash="516ca7435f0c14d63f5fd2e20e422f8fbbae74cd" Size="2387" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1981734" />
+    <Blob Hash="516ca7435f0c14d63f5fd2e20e422f8fbbae74cd" Size="2387" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2090485" />
     <Blob Hash="516d3527cc1928654c7fa7600311bc776c501bd5" Size="445" PackHash="d95d0dfee072d179a0e04916b7b80ef37d1f6fca" PackOffset="2096405" />
     <Blob Hash="516d5e875f596dbb4d3b34bbaeac8fa743063dec" Size="174625" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1897609" />
     <Blob Hash="516dc463d61bbfe629291ba6e57fc459da5735f2" Size="3462" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="626061" />
     <Blob Hash="516faa232d943e05dbe1829cb06674f009f598e4" Size="3531" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="358983" />
     <Blob Hash="517109bbe14dc76d2e6d48be28cbe129cb10a25b" Size="136237" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="1274624" />
     <Blob Hash="517312939d103e34b1cf1ea2c65b36be58f384e9" Size="3829" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="26124" />
-    <Blob Hash="51737ce1c3c4327152e9b7b759e2fc2f8ac66324" Size="2030" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1022677" />
+    <Blob Hash="51737ce1c3c4327152e9b7b759e2fc2f8ac66324" Size="2030" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2070194" />
     <Blob Hash="5173b92b1af803906aae2c542d6db88ef7a2e03c" Size="2016" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2023848" />
     <Blob Hash="5176e9b321570d7df568ad76987517be1cbd076e" Size="133814" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="975007" />
     <Blob Hash="517a649b7f73d21bc0b26f0f8212cef80e903c8b" Size="4085" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2037537" />
@@ -47753,6 +47656,7 @@
     <Blob Hash="51dfcf4f5b462933f24a862f69de388e582157fe" Size="3039948" PackHash="9d0629861bfc4948fc177763e87dc1ea3ac042ba" PackOffset="8" />
     <Blob Hash="51e0cec1c4f95e6b724b9a13b3381258f6cb56d6" Size="11504" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="112899" />
     <Blob Hash="51e9d562679948e4a2cbe59c44dd83645744247b" Size="188" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="733608" />
+    <Blob Hash="51ea093e872d3ec749757f1b2e179bd769282ba8" Size="1026" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1738886" />
     <Blob Hash="51ea8b79b1a4d50148c5904cf9e92eebc6eb4f14" Size="159403" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="1245432" />
     <Blob Hash="51eb604418e130bd59576d47806056427684f6bb" Size="94902" PackHash="218b41b249f8b8cc60c48cdfe5f9f3139acec694" PackOffset="787794" />
     <Blob Hash="51ec474e4216d34e1b48548a8ae05b06866775d3" Size="958" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="658640" />
@@ -47763,7 +47667,7 @@
     <Blob Hash="51f4c2ddb41670beec5b9ba1c78514f98ece955b" Size="52913" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="8" />
     <Blob Hash="51f545226db84602622b3ef328a8858e0425f62b" Size="5164" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="427040" />
     <Blob Hash="51f65ee88432147ec8c908c84fa8f3cfe1889981" Size="27944" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1938448" />
-    <Blob Hash="51f8960ad55bb4fb71ae8fc47d40827161c4a60e" Size="2833" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2093661" />
+    <Blob Hash="51f8960ad55bb4fb71ae8fc47d40827161c4a60e" Size="2833" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2091882" />
     <Blob Hash="51f92df149f41f89920edb57fa29e4ae610fe79d" Size="4866" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="207039" />
     <Blob Hash="51f9db3df07d3a8e670a45754f483d5f4a6f15b8" Size="89" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="471257" />
     <Blob Hash="51fa073157f191fc4bc22756b86f2e107472a35d" Size="31896" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1959784" />
@@ -47790,14 +47694,15 @@
     <Blob Hash="52280797b6e78ed8b2302b811bdc079b28b8dbe2" Size="80862" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1457244" />
     <Blob Hash="522aff3704e6899dec92fcccaef890d719e76766" Size="14179" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="771099" />
     <Blob Hash="522b7c66a9faaa5add9ee359f0278782822fb532" Size="603" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="2087860" />
-    <Blob Hash="522bef824a655504053ba5657bfc6f77a701d232" Size="656" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2038416" />
+    <Blob Hash="522bef824a655504053ba5657bfc6f77a701d232" Size="656" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1929547" />
+    <Blob Hash="522df2cb178692f314cabcefc8c7896b495fd52f" Size="1169216" PackHash="c9ebfa71e9d50945c2cdf1f77a023aa27a621bef" PackOffset="8" />
     <Blob Hash="522e7bb9eef6ad7bceb2b2601461e3a86ef7d21a" Size="1459791" PackHash="1ef5c21107774059ed6c5010dd2d5f3373c81445" PackOffset="8" />
     <Blob Hash="523255fdb8b997441508eba48a6384e904892dbd" Size="10928" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="416200" />
     <Blob Hash="5232f6e266549563ae90ebcbab015144c9fed616" Size="169" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="612008" />
     <Blob Hash="52346b016237a368562b3020ef5bd2ff7656031d" Size="920" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1311202" />
     <Blob Hash="523844d662d7c16b5a98cffce86b63abe79f5646" Size="11095512" PackHash="4960559b4d4e6313d0a654721afe19730ccc5949" PackOffset="8" />
+    <Blob Hash="523998bab45497d7cfc982d312f0ba47e07a1303" Size="41544" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="2031292" />
     <Blob Hash="523cf69ef3fc9d3b9193bc66bae8581d45530e9c" Size="19" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="2097132" />
-    <Blob Hash="5240a8f921e3b2d9ad8cc174265a8eb6a26893a7" Size="1020" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1304856" />
     <Blob Hash="52416c738508f00202bcf546dad66904c4696c5c" Size="1236" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2095299" />
     <Blob Hash="524215a284123cd5d72315db748711ea2833985c" Size="2880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1964634" />
     <Blob Hash="52457fc7b7195759f217862251acebfb295957aa" Size="48551" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1427841" />
@@ -47827,50 +47732,47 @@
     <Blob Hash="5289b4ef63067c598143a13ac15b4152ab267fd0" Size="108200" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="32792" />
     <Blob Hash="528b9ffdeb78ae7072b8be8ec9d8624ad83f9539" Size="8192" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1431904" />
     <Blob Hash="52909f88601fae32252ef95185bc11145a07e133" Size="3987" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1905298" />
-    <Blob Hash="5290aa5b90fc715824a8c19494b0ee4bfbb01152" Size="1970552" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="8" />
     <Blob Hash="529285b63496cb34606b1a04faef7d7164f8c128" Size="57011" PackHash="fb8c31646887718de45e229d7015c658f3c1bf5e" PackOffset="357637" />
     <Blob Hash="52961c138f84aa64dc64c981e028616c93f651c1" Size="57304" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="1813910" />
     <Blob Hash="529c8a3d1612f1f4e39d90f6cabcf0a9b4563591" Size="823" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="2059474" />
     <Blob Hash="529d3e3a7be773cacf1a7ba66a5da329d60bfe19" Size="512" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1473249" />
-    <Blob Hash="529de2c6bddb777024b38233f2f1d3a5e5bf0404" Size="786" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1445078" />
+    <Blob Hash="529de2c6bddb777024b38233f2f1d3a5e5bf0404" Size="786" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1894131" />
     <Blob Hash="529e6e9ea01875122c8d7220ef9aa48438f51265" Size="9229" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1663884" />
     <Blob Hash="52a2330cc05ca0fecb31ddda3db2748eb680b124" Size="176" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="837688" />
     <Blob Hash="52a36c9ffdfd618b340cc61887299e41124205c5" Size="521137" PackHash="e2844d1cb41a532700afd48dffec9acdf53a5ba6" PackOffset="943809" />
     <Blob Hash="52a391af234130430bf4ad1d41c482b5bd487804" Size="2884" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="479648" />
     <Blob Hash="52a49321b761c6891950235efaed1906d4fb698b" Size="3297" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="563873" />
-    <Blob Hash="52a5ed43c6625a77dccfed4864762443b3d30173" Size="8875944" PackHash="184286ae9b99b07314278b5f2c8f48215236ead8" PackOffset="8" />
     <Blob Hash="52a674c8c634880b2aa705ecf6e65f3d50823b2b" Size="67757" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1303200" />
-    <Blob Hash="52a6798b9146ec1ad3bb156ee3a9ea669dc2e27d" Size="2031104" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="8" />
     <Blob Hash="52af5f18aefa82ca3130a1bb6c991bbc7f45aa55" Size="11617" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="710345" />
     <Blob Hash="52b01774f4adf13ab0799ecbd4569c04540f5c20" Size="4827" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="353945" />
     <Blob Hash="52b362bfdc379de81e0e4b3e26b729cc2e27c4da" Size="18944" PackHash="b84a2b886e8c8c9e12d7e4efb21cffa81d8cec9b" PackOffset="2062056" />
     <Blob Hash="52b36ca5588f23284044986f37eff3c9ca90d6e1" Size="38885" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="658169" />
     <Blob Hash="52b56b7cf2a247193e54f82adb9104f79a67beef" Size="10011" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1786605" />
     <Blob Hash="52bcfa0a036c62e9bc98c67c40c4d9273d8a4e6e" Size="4553" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="857189" />
-    <Blob Hash="52bf1329e86733f9fb111721a2da419764ee0fb9" Size="1032" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1287569" />
+    <Blob Hash="52bf1329e86733f9fb111721a2da419764ee0fb9" Size="1032" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1736471" />
+    <Blob Hash="52c2b69d04c1f03db65ae2c06ef8066d6c54b917" Size="2060818" PackHash="949d8f8bb63fe40cf90fcea6cbdbcce89de84a5c" PackOffset="8" />
     <Blob Hash="52cab47c82a4c8f3c74fc2f8d2ccd806812877a8" Size="84480" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1597960" />
     <Blob Hash="52cf51116bd216991d4557803eb4be89d857ca5d" Size="10882533" PackHash="1e0c495e2e2fc0f9ab567761cfeec0d8659f6572" PackOffset="8" />
     <Blob Hash="52d0194e5cb93f12278517c31e20d3525fca14ad" Size="138716" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="435903" />
-    <Blob Hash="52d0883c0367bf672afe40cbbd0f7ee35856e734" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550337" />
+    <Blob Hash="52d0883c0367bf672afe40cbbd0f7ee35856e734" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669569" />
     <Blob Hash="52d0bb8eea87682adf4ab77b45b5bc71d9545170" Size="18624" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="580128" />
     <Blob Hash="52d0ded07a0bbe311550385e6172ecc019b6b556" Size="65420" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1918272" />
     <Blob Hash="52d3dd7fa85217b3e42cb8757f1554d9a601f282" Size="333391" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="416186" />
-    <Blob Hash="52d46892b8f677b2cc03bf135794dbf393a43d13" Size="358" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2096718" />
+    <Blob Hash="52d46892b8f677b2cc03bf135794dbf393a43d13" Size="358" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2095554" />
     <Blob Hash="52d611cb5351fb873d2535246b3a3c1a37094023" Size="1871" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1022437" />
-    <Blob Hash="52d86cd0e73063d017b1c808ea05b3b135805045" Size="6967706" PackHash="353091921282fc762ecef3655f2225239d7ef277" PackOffset="8" />
     <Blob Hash="52d8aaa5d74862423cfd946e49794f795bc98b82" Size="600" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1441772" />
     <Blob Hash="52d8f4458897f7f053b4aac1a9546cf790c336e8" Size="38345897" PackHash="01fa198c8120c93d52d0eb1a447044eb9ec75f22" PackOffset="8" />
     <Blob Hash="52d93218d26722428f1adbaf12ccbc8d8a2e0f00" Size="9229" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="40737" />
     <Blob Hash="52daddb862689a98ceff53efc5494939801001de" Size="414" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="928337" />
     <Blob Hash="52db64587a347f34153a51788bde8c349d966575" Size="187" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2033400" />
     <Blob Hash="52dbd0ee9d59c26bb3c763de51e281f1ae55fe33" Size="3829" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2093021" />
-    <Blob Hash="52dd326467ea4de96fa4873bc60dba97c6e1aa2c" Size="5913748" PackHash="674754d498fbb36c93858145b6c8a7229c608891" PackOffset="8" />
     <Blob Hash="52e34616fff69ba41073ea7423cf0117b682f5b6" Size="1392" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1799821" />
     <Blob Hash="52e66a268497ae5c040e691760d06e9a7c16de08" Size="7850" PackHash="247159e28ded6d0a9508b9732f70dce33ce3364e" PackOffset="2087590" />
     <Blob Hash="52e77da5e6142155938220eef030f18667b0cb2b" Size="190785" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1190594" />
     <Blob Hash="52e9168e922218a41c8b3c8cdd1ac9e7de523529" Size="206576" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="8" />
     <Blob Hash="52e9df5e1e558dfa6b268808535d8cb4659938de" Size="99224" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="470818" />
     <Blob Hash="52eb8013b07b9166c170bb70a90c9e0160755991" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="372952" />
+    <Blob Hash="52ec2d446e53fc6f15cee538a3c0eec0bc3f1812" Size="265216" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="1596424" />
     <Blob Hash="52ed4181650a3ad4efc918a424b42d7794818c04" Size="3610" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="996409" />
     <Blob Hash="52ee3d2e6e74594b818401745a23c3c44c9273dc" Size="3512" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="927978" />
     <Blob Hash="52f1f84a1567c76462da879f85375407609f6708" Size="104" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="2095665" />
@@ -47890,29 +47792,27 @@
     <Blob Hash="531cdb111487ec509552ea1e9436b208d0a7b45b" Size="70424" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="1366737" />
     <Blob Hash="531ddac070e4402f391b5b99cf837af0a5bcbb2f" Size="858" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="843356" />
     <Blob Hash="531efbb82165640a21c79c2084d1679f33883188" Size="550096" PackHash="facdac3a6fac0054fca28cc5b11b8b443ad627a1" PackOffset="24352" />
-    <Blob Hash="53202da2390b253725abb7a9681ea957ef44db61" Size="2442" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1406004" />
+    <Blob Hash="53202da2390b253725abb7a9681ea957ef44db61" Size="2442" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1524953" />
     <Blob Hash="5323bf14f3d41a229106754e0947cc3c93f9f99c" Size="4006" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="123910" />
     <Blob Hash="5324858c57837f4b2da9be7baab35bf15abf020c" Size="102398" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1337432" />
     <Blob Hash="5325a50641132af39af9b4a78a607a6e3d8b583f" Size="2159" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1139628" />
     <Blob Hash="53275a5dc9eb0e3b1e0a83b3f7764070c73403e5" Size="925" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="498856" />
     <Blob Hash="5328961d8153198eba59245443d2ff617310be42" Size="74752" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="603656" />
     <Blob Hash="532b9c53e14f1c1ac85ad563ecfe0c970b9e2564" Size="9941578" PackHash="b367a8f09d813cf136358676d58a5ce3fa54f68c" PackOffset="8" />
-    <Blob Hash="5330a63cacb5fae39d693226d285eb47a47431fa" Size="1500844" PackHash="ae45ed39146a335cceac947bae7b5fc8b55fd5ab" PackOffset="8" />
     <Blob Hash="5330b3a5668022883b86faf9b4884bd571bae6fa" Size="1181" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="346024" />
     <Blob Hash="5332ca65401f88f053e1ca071027cb29b3af1dd5" Size="598012" PackHash="74f149795a7f4347983025a723f82d13141d13b6" PackOffset="901164" />
     <Blob Hash="5335110eb74fd44a3d91428dc02f1241c1fc7b9f" Size="9146" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="472374" />
     <Blob Hash="5339c8c9ac347c335c65b0bb395f6913f36d36d5" Size="2045" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="523787" />
     <Blob Hash="533a8b34b259e2cc9c92cc0f8e3f6bc747d276e4" Size="88117" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1091096" />
     <Blob Hash="533aa096146d3ac91f254746ceb8a24d69e78382" Size="2065014" PackHash="ed23ade7aa2af09963a993ee53ab33389aae2e80" PackOffset="8" />
-    <Blob Hash="53466ad58c9d273f12aeebfdb048e55362dc93d0" Size="5660" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="2089957" />
+    <Blob Hash="53466ad58c9d273f12aeebfdb048e55362dc93d0" Size="5660" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2089803" />
     <Blob Hash="534d9a13d2e0c51078ceec75ac14984f6a73e1a8" Size="785408" PackHash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" PackOffset="8" />
     <Blob Hash="534e2fbc66c0db41bdd27001f4a7e76c707caa07" Size="82152" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="909531" />
-    <Blob Hash="534e3e80ef8d1912946e7206409f19572bd0f732" Size="1215" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2027363" />
+    <Blob Hash="534e3e80ef8d1912946e7206409f19572bd0f732" Size="1215" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2083621" />
     <Blob Hash="534e5cf3b670c28bb97023766ed93c3869c3f787" Size="1234" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1347676" />
     <Blob Hash="535172342c9c0b0e3d0b1dbc2b2aab37ab912fc3" Size="2891360" PackHash="b68917d1d80fc16069a8bd91493381de460b92b8" PackOffset="8" />
     <Blob Hash="5354a1fb2dc2c92346fc49a16887a6d92c98b6c0" Size="6696" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1973318" />
     <Blob Hash="5356a5072dfd0ebe7780a952b0f8d808213ca976" Size="5996" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2072153" />
-    <Blob Hash="5358c4ec804cc442eaacfa0c6b80c794b7188fc6" Size="8489328" PackHash="5652dd313c71b019631bbe00249614050fe1eb92" PackOffset="8" />
     <Blob Hash="535b024ea088b9b192be4206cbdd56bc5b163762" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="625140" />
     <Blob Hash="535c2c54d3ac5ead46468ccf5891dc88d417668a" Size="17683" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="654531" />
     <Blob Hash="535e5a94bcbc672cb048e9867fddf3e0ab528284" Size="19237" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="408852" />
@@ -47938,7 +47838,6 @@
     <Blob Hash="53902bf735a011322f0e029d3c3bae14e74d637d" Size="121062" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="1013337" />
     <Blob Hash="5392f78db8f9b1fe01f84562562327ad56a2af64" Size="7884" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="286378" />
     <Blob Hash="5394c144da335334e80ef1077bedc2ff1bd4f27c" Size="1434" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="417190" />
-    <Blob Hash="539aa3d424061dc4fb25ef1142c0e10e63f22315" Size="740266" PackHash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" PackOffset="1127992" />
     <Blob Hash="53a20bf7744a15b9e2d9617d13262bf16e1da89c" Size="192" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="562024" />
     <Blob Hash="53a4b058126c3a11a2897362dc151319270a42f6" Size="18" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069284" />
     <Blob Hash="53a6aa1f9d327c0909154731b6361f2548e13074" Size="2791" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="567296" />
@@ -47947,7 +47846,6 @@
     <Blob Hash="53a9676d5521bf4c065285bfb1a093dd72ce5d6c" Size="174005" PackHash="354d41849e6ca4976e737a6e0332152c3d8dac27" PackOffset="640789" />
     <Blob Hash="53a9912dcb1c897acb889decf4edc359ad593666" Size="1728" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2086133" />
     <Blob Hash="53b1fe15e7a9800456f063e8dbd11f240f6095a3" Size="18624" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="1957224" />
-    <Blob Hash="53b3d4bcfdb19b416558c0e70664c00eeb2e6ef1" Size="67114" PackHash="5ee36ea5d52f8f7c51f3bd5d9e58d94ecaa67049" PackOffset="2006812" />
     <Blob Hash="53b5a714b6877e051f7f77f3081bf43371d2c676" Size="3261" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1373635" />
     <Blob Hash="53bb529b05b50bede68b985439915c1a2678d061" Size="106071" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="8" />
     <Blob Hash="53bdc25b38e57785ad81d993964cd0e36d212838" Size="3788" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="811017" />
@@ -47959,15 +47857,15 @@
     <Blob Hash="53d00e466bcc784cf286ec0bab7ffcfb674b1779" Size="4978" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="79126" />
     <Blob Hash="53d6a33ad56e85eee1efbf7d2e33b03fe675c99a" Size="694" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="507115" />
     <Blob Hash="53d9711aa40ae3ebcb7e22671cd78fed5a039cdf" Size="260" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="995935" />
-    <Blob Hash="53e119fabfbf460b90a91eb7e219c048bf9d8178" Size="41377720" PackHash="280b37df4d7dea7b9bb338c870a5787ddd478aea" PackOffset="8" />
     <Blob Hash="53e257d08301e33840d205131126682c1203419a" Size="197969" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="547444" />
     <Blob Hash="53e2b81b9e10d5b63b9098b96954c09946ac2848" Size="26450" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1183542" />
     <Blob Hash="53e362753dbc6508f3f3111940ba4bc7581de9a8" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1672488" />
-    <Blob Hash="53e4d6dbf4dffdd835ab1b231745c1e934eff9a6" Size="2238" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1330644" />
+    <Blob Hash="53e4d6dbf4dffdd835ab1b231745c1e934eff9a6" Size="2238" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1779546" />
     <Blob Hash="53e9466c56211d97ab69950f7d391fedbfc947ca" Size="6188" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1781454" />
     <Blob Hash="53eac194777825a972c8143a4c8dd45e2efdbf19" Size="8886" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="767631" />
-    <Blob Hash="53ee6fd0d7e7bf8091b501e87df3a0e651ca19a0" Size="1200" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="975364" />
+    <Blob Hash="53ee6fd0d7e7bf8091b501e87df3a0e651ca19a0" Size="1200" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2022246" />
     <Blob Hash="53f1b5c07fef4133340a98539ae21c0820b33060" Size="2934" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2072009" />
+    <Blob Hash="53f20de307eb22555eb2f66eecb97679c98cd374" Size="11249016" PackHash="635adb3f60582b0aa500d7037d73cbbea963c88b" PackOffset="8" />
     <Blob Hash="53f32aafe19f0ea0d442bf69090704c2a54a4c10" Size="173888" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="424393" />
     <Blob Hash="53f4b5eaa7eda493578a4a7b39e1030380675f82" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1077538" />
     <Blob Hash="53f6fde86f48a9990b6cf1b841a18dbf35a5d870" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1508248" />
@@ -47975,7 +47873,7 @@
     <Blob Hash="53fa0f15d42eec3c45832c4c525141e5de1b4827" Size="803" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="350750" />
     <Blob Hash="53fa9e0a7a9700f82eae34bdd18a40d081fc5e1b" Size="6402" PackHash="28926b6102371746bf5dd7c493c2353392ba76f7" PackOffset="2089980" />
     <Blob Hash="53fabc4e4e0ee5d1640c8e3530f9bb4737e89c29" Size="4846" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="443752" />
-    <Blob Hash="5401d41c0da48ec3d8597ed91c500ac3a30c00e7" Size="2158806" PackHash="ed9f3786213b99a7da9d7c24a5f021ea9c8a498c" PackOffset="8" />
+    <Blob Hash="5404a0f8194a2c30743284e766d52e0c95a09975" Size="185976916" PackHash="4496f5ca0792a8996dfe54d53265223e6017b75d" PackOffset="8" />
     <Blob Hash="5405c1d7e8f2a3be1d80e125b28272188904ec66" Size="21371" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="471571" />
     <Blob Hash="5408112c3b82c32a51fac111aec8df06393e3b65" Size="5577" PackHash="ac2c77918f717b39f4343aea48946b7781301f55" PackOffset="2076467" />
     <Blob Hash="540bc50cf1a378dc90adbd8dc188821130f17712" Size="128308" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="828532" />
@@ -47989,6 +47887,7 @@
     <Blob Hash="54244b842a65d14c739604e65a6986768272208e" Size="3508" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="808344" />
     <Blob Hash="54275f6efae5fbd0596b2cad761f5753a47a99bd" Size="147909" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="1757060" />
     <Blob Hash="542a14e430444655c5c448054eaa9a1dac42fa67" Size="6088" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1926831" />
+    <Blob Hash="542a94f337ca14fc83431e8816405645189e1da9" Size="335812" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="1587720" />
     <Blob Hash="542b30548abfbcfc374aabbce8ca3eaf03adce18" Size="206778" PackHash="5f434ba2d925cd558af2bc1af03b657a443bcdd1" PackOffset="1817608" />
     <Blob Hash="542dc86923a5f51b055f137b9452a163d09bef25" Size="946" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2079543" />
     <Blob Hash="542ed08adf9c545c7dadfc52708962e1af0ca3d3" Size="51674102" PackHash="db0072b27b24bda3fd51a10fdc7e99e0cd839029" PackOffset="8" />
@@ -48005,7 +47904,6 @@
     <Blob Hash="544d6aa49b7f18b1d2cfbf83a914b62597e5a741" Size="650888" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="796169" />
     <Blob Hash="544df9eadbd4ba348cad13fad6938b6366ca1ebc" Size="1150" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="132471" />
     <Blob Hash="544fbc58abded91cfe07106702ccc6c47f83a1df" Size="5301" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2079511" />
-    <Blob Hash="5450732aa346c20b4445399f3ddd8cfb7a95b8e1" Size="2510" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="2088004" />
     <Blob Hash="54522d431613e32a4187828c1352daaed0646fee" Size="38892" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="1902690" />
     <Blob Hash="54532f45c0fc5f0f745823984950491ca44eaa2b" Size="6680" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1644463" />
     <Blob Hash="54537a5b1a4c4c5a14c706c9c1d1a246589fc983" Size="32" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="2097079" />
@@ -48040,17 +47938,18 @@
     <Blob Hash="549252a03182e0fad21b1f81dc5d6d900f8f2c07" Size="5800" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="685623" />
     <Blob Hash="54989570f58987d4d28cbcc6ffa087a4f5c11811" Size="2865" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1005773" />
     <Blob Hash="5498c89bff71458468ad09115f4007550925e482" Size="390" PackHash="4abf0595e4706e434b909ea697e6e34737cc2bbe" PackOffset="2096171" />
-    <Blob Hash="549b1e91431c34ade95df159cf77f030c23073ae" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550685" />
+    <Blob Hash="549b1e91431c34ade95df159cf77f030c23073ae" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669917" />
     <Blob Hash="549bc800b2e2f604d710526ecc8f876d90b84cff" Size="21956" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="504607" />
     <Blob Hash="549d7089b73d9259fbf239475709b8492a74f2ef" Size="32318" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1787214" />
-    <Blob Hash="549efe348c5bd8053e5bf9f029503521826bb66e" Size="28860" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="2056140" />
-    <Blob Hash="549f50d2e7218cb7ea836383a711508e73ea1176" Size="108028" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="1957040" />
+    <Blob Hash="549efe348c5bd8053e5bf9f029503521826bb66e" Size="28860" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="1949598" />
+    <Blob Hash="549f50d2e7218cb7ea836383a711508e73ea1176" Size="108028" PackHash="0bb21cd291f2eac4434972c081154105a9672abc" PackOffset="1986376" />
     <Blob Hash="549fb37079e56d9c9a372a9df1d242f16e9ac90b" Size="36129" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="330802" />
     <Blob Hash="54a02fd7a70df38aebdfc0ffa5f0896e14090f55" Size="4202" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1461757" />
     <Blob Hash="54abd004442e5a7ed6e898eda8133bb8193b1683" Size="66" PackHash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" PackOffset="2097082" />
     <Blob Hash="54aec65faeb5fba0eb82d1d6c21141ec91ba2d9a" Size="3998" PackHash="b4d8e0b490d2a1157340644482cc429e03d9575a" PackOffset="2087114" />
     <Blob Hash="54aff8d6b2015737934f795f845e4656c73319ce" Size="964" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="281034" />
     <Blob Hash="54b65f31702ebeeb449aa6a86a23520dc4350b47" Size="193" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="369843" />
+    <Blob Hash="54b8b4dc7fcb8e6a9b46b3dcba627e8f652cf039" Size="7969" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1769847" />
     <Blob Hash="54ba46c0774d83e8e5b923ac551ea001ca597557" Size="5260" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="352889" />
     <Blob Hash="54baade0c0b4b5e7e7f2d41b5b1d17113565c2b2" Size="24565" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="2049392" />
     <Blob Hash="54bf8e54a60020dcd8713cd2d8cf59cd2c674ec4" Size="81880" PackHash="4711b9f66c6e317cec4108c623193df10fa81888" PackOffset="2007776" />
@@ -48082,7 +47981,6 @@
     <Blob Hash="55082c9134fdee2d02f93cc5bbf00a1eadee4a9c" Size="17703" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="180426" />
     <Blob Hash="550e28981e54b50fa385d4360ec3f74631a5bd49" Size="10496" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1154392" />
     <Blob Hash="550fbadaa83ac110b4fb3495105937d3b1d18ab8" Size="123797" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="331060" />
-    <Blob Hash="550fd1b362b56e7a9a9067002e4f562eb6041ffe" Size="56" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2096998" />
     <Blob Hash="55113ebfba6046339647efd2b98196ff3c17423f" Size="38317" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1199483" />
     <Blob Hash="5513a0304953b33042ce0ec79d8cc40aa8d67ef3" Size="219254" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="1557052" />
     <Blob Hash="5514b06631532c448fe3ff209af3c280eba431e2" Size="452" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2011307" />
@@ -48094,15 +47992,14 @@
     <Blob Hash="552143257a8154b4af30d03a2ef1e46f25eb3fc6" Size="299900" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="324616" />
     <Blob Hash="5524cbe7b86356423228b6fea8debe62b6fcd1bf" Size="242" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2094326" />
     <Blob Hash="552a4b0276e3c7dee851c14bef1183870dacc1cb" Size="6668232" PackHash="d4d95c31401f5aa793d3056677abc65930433d9c" PackOffset="8" />
-    <Blob Hash="552ae554caf3f4a685465f7c9a5b9336ed7ad1d8" Size="1575424" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="8" />
     <Blob Hash="552bc1484dd69aafcc6b3873290b0765dc3b00b0" Size="5868288" PackHash="5e5cbedc4e749d26043c7842e6b122abe1f15463" PackOffset="8" />
     <Blob Hash="552daa0e75535ef0d1dba85aa9f64f1b14c2b18b" Size="42144" PackHash="30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" PackOffset="2043438" />
-    <Blob Hash="5534bd59e4ca44ce98568d0f932646b1f214a257" Size="118" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1823697" />
+    <Blob Hash="5534bd59e4ca44ce98568d0f932646b1f214a257" Size="118" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1942929" />
     <Blob Hash="5539e8738b346707884bf62e6403c105c4e924a2" Size="1879" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="134475" />
     <Blob Hash="553c03c04fee5d11b2293a37782606babc6f8994" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="785140" />
     <Blob Hash="553f77a589e85117051c20d43d99c509b495d29a" Size="112014" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="547840" />
     <Blob Hash="554a8f973f04e891ef736b1b4548da44bff75297" Size="3597" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="250096" />
-    <Blob Hash="55544fbb89b68ca98ca40b3ad5e1cf162b9f042b" Size="1359" PackHash="8ea495aa16f5c28059de7b17b493fc094f400049" PackOffset="2095352" />
+    <Blob Hash="55544fbb89b68ca98ca40b3ad5e1cf162b9f042b" Size="1359" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2094509" />
     <Blob Hash="5554e899fa35dd04a33960751350d693bfe8b7d6" Size="125" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1257043" />
     <Blob Hash="5558713be98ede42a7035695c0faa528c9298add" Size="788" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="338984" />
     <Blob Hash="555f885a74a45875ca81fb1827e8d59ec395a4e9" Size="5447" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1785593" />
@@ -48119,14 +48016,15 @@
     <Blob Hash="55705f3fbcc814ce3c60643bce24aad7d3af9b16" Size="6729" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2025760" />
     <Blob Hash="5574870bf5c47bef080979884bece7b7e06c5cd7" Size="5149100" PackHash="b1c710b22ffdfe50bb678a997177bef18c7fe7bf" PackOffset="8" />
     <Blob Hash="5576e5882f19586712b405a6b8fff6423c105c30" Size="44387" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="1069932" />
+    <Blob Hash="5576f000ea566a499316c59bd935b831dc3236e7" Size="2973608" PackHash="f875b67db2f667f141649b4c163714295677d4fe" PackOffset="8" />
     <Blob Hash="557ad40ab5d4df2164f3fb7938b4582aa094f7fc" Size="629704" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="1342372" />
     <Blob Hash="557d2d55dea38d1cd1103e183f89c65f4016662b" Size="242" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1309484" />
     <Blob Hash="5580be519a6917c027a7e3d2af7dd161b9397804" Size="5976" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="325521" />
     <Blob Hash="55811ea384caae5ff2fb4c71383e73332faa0f57" Size="164" PackHash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" PackOffset="2096899" />
     <Blob Hash="5588450c4d4fd193635140f2fc7338eb1fe46a37" Size="3849" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="2090574" />
-    <Blob Hash="5589c87ec8db4618443939710bcf0c3ece2383c8" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556409" />
+    <Blob Hash="5589c87ec8db4618443939710bcf0c3ece2383c8" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675641" />
     <Blob Hash="558a37d7df9467d5d7e75d1122e9abc5c6f8c194" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1527160" />
-    <Blob Hash="558c6b281a1ef156d7a10a3864ea9134b0b300a8" Size="184" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1585572" />
+    <Blob Hash="558c6b281a1ef156d7a10a3864ea9134b0b300a8" Size="184" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1704804" />
     <Blob Hash="558d21c17395509ccd1b0ff402088ee3d41a3c0b" Size="15872" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="1873984" />
     <Blob Hash="558ecc90ffd5fb6b32f2fff08f87ceadbcc65ebb" Size="1880" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="2093346" />
     <Blob Hash="5591d3c9fe5ab0c94f34aa56326d8740cbcb37d4" Size="86183" PackHash="5359b58ffbb9ae76a120a6563e2ee1d6677eda38" PackOffset="1986915" />
@@ -48134,7 +48032,7 @@
     <Blob Hash="55943addf0ea433301bd5c7755b9c506573e264c" Size="5792" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="452890" />
     <Blob Hash="559666091d331e442524225863bab5a86b9d1d79" Size="2049" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1936274" />
     <Blob Hash="559821b99ea0dc36ef602c1fff35fcb271e33d6b" Size="5532358" PackHash="0a17d50561c9bf1d85e82416f97726243726fe8e" PackOffset="8" />
-    <Blob Hash="559e2c9395b19d6b97be46c329d485ef5246bf7e" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553829" />
+    <Blob Hash="559e2c9395b19d6b97be46c329d485ef5246bf7e" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673061" />
     <Blob Hash="559eea6a85280057ddeb6a771fcbc3d36d62facd" Size="706" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1563330" />
     <Blob Hash="55a0c2124fba9dd2003ce376c027a788319559b4" Size="112" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2097039" />
     <Blob Hash="55a0da136fef9f3d41d66b51a8121767c4a53d26" Size="293" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1028264" />
@@ -48149,12 +48047,13 @@
     <Blob Hash="55c6bb6eacc170fb282b487f7e4d01e76256ff2d" Size="24576" PackHash="858de213a099ae751d4748be354bdddec041c44b" PackOffset="2070344" />
     <Blob Hash="55c950fd872807068e6649bc95bfdfa45aa9d2c7" Size="2622" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="984624" />
     <Blob Hash="55d1f2312f4efd8b68b63ee1eb037718c6366678" Size="7634" PackHash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" PackOffset="2006249" />
-    <Blob Hash="55d4b8c35a529c15dd1d46d82debf6959b85cd11" Size="1558816" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="8" />
+    <Blob Hash="55d4b8c35a529c15dd1d46d82debf6959b85cd11" Size="1558816" PackHash="04c28788013394a789dc45f78000e685d793643d" PackOffset="8" />
     <Blob Hash="55d58f3d23117b0e8c1dafed2705d9aa70f55ccc" Size="599040" PackHash="4c90070f3985d7708ef21790aa75b3597f50e984" PackOffset="1373704" />
     <Blob Hash="55d941203c3e8f92e69db1b45a0594872bf87e4e" Size="4841" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2048956" />
     <Blob Hash="55d9dd6ed257b29057b3722a5c65c5e6796aa569" Size="183" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2080802" />
     <Blob Hash="55df6d8165ec18416d81230cf31fee74d482705c" Size="6034984" PackHash="0c04f1620b9005b214a9f357a490fe331c1593fe" PackOffset="8" />
     <Blob Hash="55dff53a44f0b45b25a60d49ef6e4798ade169ab" Size="26112" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1776648" />
+    <Blob Hash="55e1838230af7e424e6b35812d7f72a8b6cfd029" Size="3844612" PackHash="f5ebb3d11c507c072795ff79777afd592e940e0f" PackOffset="8" />
     <Blob Hash="55e2c5fed7bd62f48a40deb3c359492c0f7c454d" Size="151552" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1091592" />
     <Blob Hash="55e399abea2c33a5fd6ee049b8b4d0df95e975c2" Size="113347" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="1751324" />
     <Blob Hash="55e39deebf70b8492ade8ee9464636e03ffb4ab8" Size="13012" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1112216" />
@@ -48172,7 +48071,6 @@
     <Blob Hash="56048363bf4fd2ffe56cd6a9fa83c2ecab7e8872" Size="112476" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="1927670" />
     <Blob Hash="5606e7af467e3108aee7e8b1ebb956b4acd2cf08" Size="146560" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="1670698" />
     <Blob Hash="560a3d2ea33cfe34de1cabf3230c0aa5da2b12ee" Size="112" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1682180" />
-    <Blob Hash="560a3fb676fd6abdd4dd4a2498d257e88d64fe42" Size="101614568" PackHash="c4dfd3e403b883988470e429dfe1149dadfeafe8" PackOffset="8" />
     <Blob Hash="560b79ddfd05acd567f7458a9efd7f4d7d0ba95f" Size="1344" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="2086588" />
     <Blob Hash="5612ec93700d691dde8131e2c10a8fc9cb72d686" Size="3098176" PackHash="b93b4380f4531d7553dea94124d74bcda45deb83" PackOffset="8" />
     <Blob Hash="5613b0ec2d2ac1ffd603f4db61b0d558e8bd674f" Size="438" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="235237" />
@@ -48193,6 +48091,7 @@
     <Blob Hash="563e52908205186ceb1d12c802ee75169b021bb0" Size="11703" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="541544" />
     <Blob Hash="563eaf26076d8c014cd747f6af90b80cfdc3608d" Size="1860168" PackHash="c38a58ebaed4f4113a72a83d4c9eed961e2b9d98" PackOffset="8" />
     <Blob Hash="5641277814b9560ef1596dc9c712357722357084" Size="850" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="729299" />
+    <Blob Hash="5643e6cb7e0ba43b384705a070c1ca19800a52fa" Size="3038" PackHash="097882ff4f782476be1a4962baf5872eeb7e54df" PackOffset="2094119" />
     <Blob Hash="5645c205268349b55bf4c5129973790018241b19" Size="347" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="735968" />
     <Blob Hash="5647471f29ba6a6d59a7cd055efa4bcafce59222" Size="1876340" PackHash="b4d8e0b490d2a1157340644482cc429e03d9575a" PackOffset="8" />
     <Blob Hash="564bbf82faa1c48cb48a6fa58b3bc03e94e010c3" Size="4120" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2039627" />
@@ -48215,7 +48114,7 @@
     <Blob Hash="566792ea7802b359cbf8b48caf5789ac67f79f54" Size="40300" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="268729" />
     <Blob Hash="5668136f5f6e0051d90e1a3ee4b4c9dc33895571" Size="2807917" PackHash="734f643bae0e379a3dd8c932b72016a2bf7bf107" PackOffset="8" />
     <Blob Hash="566dd6ee9bbc1260ca56772dfedf926159ffaa7c" Size="4806" PackHash="32a83d508234ffa544d0570813e08e4f8b6379f7" PackOffset="2091281" />
-    <Blob Hash="566dff15d90aa574cfd48ac552e36491bd9b9079" Size="14198" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2054014" />
+    <Blob Hash="566dff15d90aa574cfd48ac552e36491bd9b9079" Size="14198" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2066266" />
     <Blob Hash="56704d42cdd79df094eef068b132d79f0c9ecc18" Size="24064" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1717768" />
     <Blob Hash="56720e1da25b94eab8718255402f6c7c4ad325d6" Size="794" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="195075" />
     <Blob Hash="56728da794caba0e7ad6cad4b413a7c370319808" Size="1387374" PackHash="a58a934fbc6d256586f3ff17490f10c3a7c2517f" PackOffset="8" />
@@ -48241,7 +48140,7 @@
     <Blob Hash="56a4f042408c2597f9a20bc84564e0dd3ac77182" Size="2011648" PackHash="a223063132a00fd7e9af3c58ba28d6ba14fc65b8" PackOffset="8" />
     <Blob Hash="56a5850759de6b0d75d79aa39be8277db9516792" Size="16114" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1931548" />
     <Blob Hash="56a8eb207781423855b79c52bd85558ef6754cf1" Size="7873" PackHash="937d324929a7f4271842efe0f422cffe7e1c760f" PackOffset="2087026" />
-    <Blob Hash="56a99a741cd0fecb39e3189404f58f94288b8968" Size="2813" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2031874" />
+    <Blob Hash="56a99a741cd0fecb39e3189404f58f94288b8968" Size="2813" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2093295" />
     <Blob Hash="56ac16703c2fa2dab3b6e39c7cb95ca3fef4ca10" Size="58281" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="57653" />
     <Blob Hash="56acdc6f071f19725742768f3eae834e75f736a9" Size="2967" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="807696" />
     <Blob Hash="56ad8c80fee77951f59b77302d805d1f7661488b" Size="2598756" PackHash="efe6508a39dd34c5112c5868c2644d280902ef44" PackOffset="8" />
@@ -48254,6 +48153,7 @@
     <Blob Hash="56bccc063515ecdefab5b203612c6131f87c0a4b" Size="3361" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="625412" />
     <Blob Hash="56be6ca12201f83423c6b4da8198961642c57726" Size="66766" PackHash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" PackOffset="1175401" />
     <Blob Hash="56c1f7c7a6401792328c956dc0e4845d74f24a38" Size="5005" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="807035" />
+    <Blob Hash="56c2d3cb8549375483dd17ae61040d889bdc8e97" Size="645074" PackHash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" PackOffset="1408216" />
     <Blob Hash="56c2fbd50dc2c0c3397d5a4319b11f06b4f9a87e" Size="1209" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="148817" />
     <Blob Hash="56c3522691599221fce752b6129790e28ae4e64b" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2093347" />
     <Blob Hash="56c443618a004413f005d8172fbb64d1b64dfa0a" Size="862" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="2095825" />
@@ -48262,12 +48162,12 @@
     <Blob Hash="56c54285304b721d5843ecb0ded1b1edfc2b6b26" Size="4479" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1797144" />
     <Blob Hash="56c61258444e1765e97dfbf86daf3d933ce6c241" Size="275" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="689358" />
     <Blob Hash="56c794385a4a1b91777408abcb2d87c586f6518e" Size="261" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="2042735" />
-    <Blob Hash="56c95ecfaf90a186b3154efa2742ab13582c46fc" Size="133" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095841" />
+    <Blob Hash="56c95ecfaf90a186b3154efa2742ab13582c46fc" Size="133" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="2096967" />
     <Blob Hash="56cd01533feb948bd235a67711562ca1dc19c4f6" Size="1394" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="1309993" />
     <Blob Hash="56cfd0e18d07f41c38e9598545a6d369127fc6f9" Size="1412" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1645801" />
     <Blob Hash="56d03e9f3144adfc73b272668144e59ca202f6e0" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="200716" />
     <Blob Hash="56d4f3cca1245d626bada74cf3f6bae8034bf58d" Size="7273" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1561001" />
-    <Blob Hash="56d60a60995663c07e7dfb0c2de4695591a76b9f" Size="64" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="2097003" />
+    <Blob Hash="56d60a60995663c07e7dfb0c2de4695591a76b9f" Size="64" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2097064" />
     <Blob Hash="56da2de4e983f549576e214a754f387504f0d72c" Size="6697" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="2085726" />
     <Blob Hash="56dee9f11acd92d8832867c161e1993b99f5d050" Size="1416" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1772266" />
     <Blob Hash="56e28650e028dc2348e1de181130576ea61c79c8" Size="22964" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1352648" />
@@ -48276,14 +48176,12 @@
     <Blob Hash="56ec9770fb03e3d56be49347e9724a161ae08da5" Size="3536" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="110823" />
     <Blob Hash="56ed2ae748837bb411f457ad4bb2668a7a493442" Size="645" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2096323" />
     <Blob Hash="56eef895d942f36d42f07a1f75916ca4a749b3ee" Size="2374952" PackHash="2a5a7e4c89fbf447ad618514ba08b0e5b5269d84" PackOffset="8" />
-    <Blob Hash="56f0f8d315186893625f6001263e8d1ea54953c3" Size="2310" PackHash="d9bda84de8db2b30024997e133bba904f53f98db" PackOffset="2094760" />
     <Blob Hash="56f1c949431817df40e342fea3e2289366716a42" Size="951209" PackHash="e9f295f6f5958c9a6bcba988219d1f196ac74d77" PackOffset="8" />
     <Blob Hash="56f239595a025d9f8ef3de77f78da9e506643529" Size="3026" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1016734" />
     <Blob Hash="56f364e51651ed469721a18c674b8488b2fa855d" Size="3422" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="941927" />
-    <Blob Hash="56f53a4cdabfc5119a8ec297dd56091de012acff" Size="2410" PackHash="07e31d5227b75af815bac4e9271886f59ee2ab58" PackOffset="2092646" />
     <Blob Hash="56f787e5a7b87d021af5f8b6c3cb9e939161cabd" Size="4627" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1738534" />
+    <Blob Hash="56fb56f5ad5a5b78c9e4f24997513828b6b4f7f5" Size="14371408" PackHash="16156b79a48aa58bdd2ba5ca2dd45467e043475e" PackOffset="8" />
     <Blob Hash="56fc4773941e7457ea04eda92c883642de45d100" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2026336" />
-    <Blob Hash="56fd53dd82e182dc069f3bd2fbd7fb2f59765101" Size="7885" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1809195" />
     <Blob Hash="56fe00f77c37edd82585fdcac6572080b1cee801" Size="57" PackHash="0aea457d3fb14174a1cd037c649288b253c1cbe7" PackOffset="2096947" />
     <Blob Hash="57006f306614963d8a5f576ee7819f9fc294e47c" Size="649" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1474841" />
     <Blob Hash="5703962ebcfc50e1597ae6cdbc97453651771821" Size="230" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="122574" />
@@ -48302,21 +48200,19 @@
     <Blob Hash="572256a2d6f4718ec901f5a4924cfef219b14cb9" Size="90" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1577572" />
     <Blob Hash="572263c31c5f120b3820d5277399d2ff2d73497e" Size="3193" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1715472" />
     <Blob Hash="57243fe9595118cde6dc084a9cd6dd7d09693b44" Size="938" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="921809" />
-    <Blob Hash="572484b4373d1e525acc00c2d0b3e27012f163bc" Size="5637846" PackHash="6caedfd1e9355603c0478f9e13726d3bc8574e8b" PackOffset="8" />
     <Blob Hash="57249af6c8bd6aa749b74dfddf4d6acd141a1175" Size="5794" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="976266" />
     <Blob Hash="5727fcdb3b445850e49c30243a458301c933734f" Size="1394" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1892592" />
     <Blob Hash="572886d950f9aa72ab6ccdeb1896f9facb471b47" Size="2940720" PackHash="bdf43b651252acdeecbf32879d3590cd957bdb54" PackOffset="8" />
     <Blob Hash="5728daf9950d84167b1c59bfc190616e37b91e79" Size="240" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="391288" />
     <Blob Hash="572a77593a9df9af4f115bb9c16ddfc58e65638f" Size="8632" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="28524" />
     <Blob Hash="572b91ee17b4e1d25cc00a9a370ee838416decb1" Size="15064" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="768400" />
-    <Blob Hash="57307a2e84a5cf49a6f7a227babd89376fc001f1" Size="1736216" PackHash="adc46c8d3d54833923b9b24a18adf1a3a5846071" PackOffset="8" />
-    <Blob Hash="57312ae30d91a6a9c2ca76f8e9862f33747bf79b" Size="2204" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1332882" />
-    <Blob Hash="57389d0a615763bfed546dc091ddc8977ec5748f" Size="180739" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="8" />
+    <Blob Hash="57312ae30d91a6a9c2ca76f8e9862f33747bf79b" Size="2204" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1781784" />
+    <Blob Hash="573d3c54ff69bd693e4997f48dceacb9941ff171" Size="41472" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="2053132" />
     <Blob Hash="573f5159a2d0fdad60fe2b67cbc05bbeb2e700c2" Size="38794" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1542499" />
-    <Blob Hash="574192f3f0dc4117b85564481882320a5ecfdfbe" Size="288" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2096864" />
+    <Blob Hash="574192f3f0dc4117b85564481882320a5ecfdfbe" Size="288" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2096836" />
     <Blob Hash="574418de89a0149554864f4ab037d53c94e83434" Size="2783" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2043696" />
     <Blob Hash="57445a72b636fbf296f95adf70f2fc11c6558c0d" Size="90663" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="542085" />
-    <Blob Hash="5745e1d3a868ff06d9bd8a6ca2a7a92889d89410" Size="4237" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="2092190" />
+    <Blob Hash="5745e1d3a868ff06d9bd8a6ca2a7a92889d89410" Size="4237" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="2092116" />
     <Blob Hash="574812cf19b95da58244685df5e6f1bad5d489b4" Size="5348" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="533295" />
     <Blob Hash="574abbdbd6c2206b716d28f265ca46fd64e0472c" Size="798" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="408708" />
     <Blob Hash="574cac23a3f3240da5b20b84b40f1f65189150e4" Size="2467" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1950937" />
@@ -48324,13 +48220,13 @@
     <Blob Hash="5751bd8e6972934f4d6e732ce7ba2da6aebecb6e" Size="40695" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="593084" />
     <Blob Hash="57521c944962c5f091b88efa7c1f60061e682123" Size="8321" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="2083414" />
     <Blob Hash="5754f7b8f9be0419d02516549738735fdc7ab386" Size="94413" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="1565873" />
-    <Blob Hash="57558573f5c2be54a0f33815bfdb200c7c5211bd" Size="823" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1470723" />
+    <Blob Hash="57558573f5c2be54a0f33815bfdb200c7c5211bd" Size="823" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2007805" />
     <Blob Hash="5755c127dac7b5d149d45912fe2d1d93467ffee1" Size="2789" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1051207" />
     <Blob Hash="575d9a790ff07b194064cb06a55565659c7f3a0e" Size="8686" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2084812" />
     <Blob Hash="575dbb7b5984eb88edb4a03bcc50c450ec57e62e" Size="220545" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="1536253" />
     <Blob Hash="57644bbf3a50a31df97f982aeeb7eed38dcb107a" Size="5295" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="290865" />
     <Blob Hash="5767229663412bc0aaa5087383b02ae41fffebd7" Size="132608" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1679328" />
-    <Blob Hash="5768fb31bfd255d18b9a6c656bcb82641de3c1e7" Size="259" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="2096654" />
+    <Blob Hash="5768fb31bfd255d18b9a6c656bcb82641de3c1e7" Size="259" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2095034" />
     <Blob Hash="576b0c0ebe2a9a747e4fae8440dd9306e250fadd" Size="976" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2095695" />
     <Blob Hash="577585f5f5d299c44dd3c993d3c0ac7a219e4949" Size="5274412" PackHash="266dd2a4f1c1a5b46c1dc9d24fd0f8135036d6a3" PackOffset="8" />
     <Blob Hash="5775cf85a9fcbf6b3b559cf54ac892e1cdf57f5a" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1163324" />
@@ -48343,8 +48239,8 @@
     <Blob Hash="578456cc73a87d432948529a112789c33fc4d02e" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1619832" />
     <Blob Hash="5785e97cec86b2384ce2bfd87ee623d06813b140" Size="23204" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1762767" />
     <Blob Hash="5789077d3b8bb1ee095d551b4f4bfb9fe762e93e" Size="54920" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1742116" />
-    <Blob Hash="578ac0ca2f1377819e4043785ff114a86b4d6fa5" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553984" />
-    <Blob Hash="578ade1582c118488d5efb4228319ecad83240d7" Size="242" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1593757" />
+    <Blob Hash="578ac0ca2f1377819e4043785ff114a86b4d6fa5" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673216" />
+    <Blob Hash="578ade1582c118488d5efb4228319ecad83240d7" Size="242" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1712989" />
     <Blob Hash="578fd116850c165f3c437e9234a07d4890b54a81" Size="9320" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="26433" />
     <Blob Hash="578ff031a9615f44d3e1fea14ea506497a55caa5" Size="88646" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="558036" />
     <Blob Hash="5796a9122693b2d6010bc5e617a6091f46330b0c" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="561704" />
@@ -48368,22 +48264,22 @@
     <Blob Hash="57c1193d0293bacd187fea51fd93318ae78d2a76" Size="170754" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="223668" />
     <Blob Hash="57c5ac800f0b6c3222b67cf865b8e9c8a76190e0" Size="10806" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="440902" />
     <Blob Hash="57c7897f58c17ecf8a6c4afe1dc4b59605bdcfe1" Size="3388" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="635930" />
-    <Blob Hash="57c8b491b3eedd0568d5af44b0f60a762d111a9c" Size="57" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548102" />
-    <Blob Hash="57caaddbfe8a7599e8729a1a61a686ad052986dd" Size="920" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1708706" />
+    <Blob Hash="57c8b491b3eedd0568d5af44b0f60a762d111a9c" Size="57" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667333" />
+    <Blob Hash="57caaddbfe8a7599e8729a1a61a686ad052986dd" Size="920" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1924101" />
     <Blob Hash="57cfb4a8f247090fa27031b9afb30cb5481e841c" Size="122409" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="107787" />
-    <Blob Hash="57d151385f5e2e99f536031b528989cde6023506" Size="89556902" PackHash="9b312dff5f7811d855b9253c2e2ea35c54ccc96d" PackOffset="8" />
-    <Blob Hash="57d26d4e7204922b6e90d6c3b455a9cba83d6445" Size="3433714" PackHash="bb3c62ff866651b3a25185a71226bc4a644e9542" PackOffset="8" />
     <Blob Hash="57d4241c1e61e8287e3e85635c22be3930176a40" Size="368" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2096781" />
     <Blob Hash="57d48843e7371c8c5077f082588e5e325a9fc390" Size="624640" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="1092184" />
     <Blob Hash="57d581f37b9babe88d13b55e64f3f63f52cc6959" Size="161" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="349403" />
+    <Blob Hash="57d7b27c046f983d8d7d5994e48ae3a3a81a2d94" Size="2371768" PackHash="d66d3a1216c5414a349240a83f9bf9dbd3597cf8" PackOffset="8" />
     <Blob Hash="57d8f78e242aea8cbe087e9cac875b53f0f45b21" Size="52656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="266288" />
     <Blob Hash="57db55139c846bac7c7d97f7e5540617368cad2f" Size="4718" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="126196" />
+    <Blob Hash="57db7eeb12c90f4410139a69752d8e96938f1ed1" Size="128746998" PackHash="969c4813f59d0819647845b2eab44bf91d015ca6" PackOffset="8" />
     <Blob Hash="57dca34b5c5140724bac166824220ddd790de836" Size="3592" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="11559" />
     <Blob Hash="57dd62e9868efc5affcf72980eff88b53aab7b1c" Size="2140" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1986980" />
     <Blob Hash="57de62a9faeab56842caba3801d002cea0109293" Size="2126" PackHash="cc49483dab5945dfdb5724566e0b13cebf5e72d8" PackOffset="2092142" />
     <Blob Hash="57df08fd6ded19a800c08af083776494883126f8" Size="374" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="466945" />
     <Blob Hash="57df9f526ccee8d256f9a36ed3e779a4568b836a" Size="3553464" PackHash="bee8e68740f8d36a56d9f09e880ff29b5adf0496" PackOffset="8" />
-    <Blob Hash="57e1b788769c4fc0ed782d42ebc5613d03f74911" Size="4362" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1771357" />
+    <Blob Hash="57e1b788769c4fc0ed782d42ebc5613d03f74911" Size="4362" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1890589" />
     <Blob Hash="57e1f70fa8999106fa3874a9ce1e75a7acbc81e9" Size="7440" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="183561" />
     <Blob Hash="57e2dee71a06e1caafd0f1b4fc6e851231cb78e0" Size="3050" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="924299" />
     <Blob Hash="57eafb308f4c2c59d81259d149ea05d68dc77d9f" Size="4998" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1562672" />
@@ -48409,7 +48305,7 @@
     <Blob Hash="581dba682b5e478e95c82f5517ae63e782555bcb" Size="14496" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1187632" />
     <Blob Hash="58203143c1bff17503b62d4ed13f791b158aa7d7" Size="180" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1549988" />
     <Blob Hash="582573a77903595cf150fe3b0606d4d2c15548bf" Size="76239" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="1840184" />
-    <Blob Hash="582606d5c42bdd904398190dc0bacf4999752b7b" Size="3645" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2071554" />
+    <Blob Hash="582606d5c42bdd904398190dc0bacf4999752b7b" Size="3645" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1971418" />
     <Blob Hash="5826d841fbfb9466423389ac6d538812c3d24cf1" Size="639" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1763101" />
     <Blob Hash="5828481e0bbfe810605c30a87cbedb9e3db40a7b" Size="18857" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1363508" />
     <Blob Hash="582c3ee5b6f62bccdccc2e476d33e2add732e0f7" Size="100" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="75073" />
@@ -48418,9 +48314,8 @@
     <Blob Hash="5834d1139501f7fe76241ff87eb6c83215e6b9d8" Size="100" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="2097059" />
     <Blob Hash="58364935ea91fd23e8d388cf820158021260c12a" Size="245238" PackHash="36a132c9f653eef8303192fea1f02b6c80bdaf81" PackOffset="860471" />
     <Blob Hash="583905a7a2b9e25d930ec9f1bda0711fb846058a" Size="102946" PackHash="67f9a57842391bca1072e56b907d2adde02d2d34" PackOffset="239763" />
-    <Blob Hash="583fa1131395d91a11bc4f252cc8989af8052c01" Size="3078" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1999152" />
+    <Blob Hash="583fa1131395d91a11bc4f252cc8989af8052c01" Size="3078" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="9253" />
     <Blob Hash="583fd76509f6ab5b80220cc7bb70ab58b2b7206e" Size="160" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1148668" />
-    <Blob Hash="5843def316e6fffef3dd2a75891d2fa36a8ef012" Size="2410" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="2093752" />
     <Blob Hash="5843e8d8b6900f9f126fc40bebcbd08496c79b3e" Size="2616" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="501248" />
     <Blob Hash="584c361af9fa7879ef394a001da1ef9bb22f338f" Size="264634" PackHash="53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" PackOffset="8" />
     <Blob Hash="584eca2500914e14a8245f715b085827739c8b25" Size="3139" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="8" />
@@ -48442,7 +48337,7 @@
     <Blob Hash="5880a08172e93dde85ab819da83efad88de05707" Size="2823" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="638195" />
     <Blob Hash="5880d9477af6431ccdc2fb64d0d197d86dbab8d3" Size="27287" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1878796" />
     <Blob Hash="5881e23e61223fd808338dcf276f7bea44c1175f" Size="48434" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1485979" />
-    <Blob Hash="58827d816eaef55e59b2ebe9e52a8e4e22bbfb04" Size="173" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605728" />
+    <Blob Hash="58827d816eaef55e59b2ebe9e52a8e4e22bbfb04" Size="173" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1724960" />
     <Blob Hash="5883255deca27e228e7eb2ff437f0042388ea9dd" Size="76265" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1312358" />
     <Blob Hash="58843d7c0ace0069525dcf74ab934b95d9023ec1" Size="3436742" PackHash="e6f2f742b0074d952295a051cb9d91880f3a305c" PackOffset="8" />
     <Blob Hash="5888e02c6374dc3853098168cfe7c1936d1bbaa7" Size="950" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="56776" />
@@ -48451,21 +48346,21 @@
     <Blob Hash="588b04e6066f8b88bf526d0d9844e340e917069c" Size="10600" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1764822" />
     <Blob Hash="588ca5863bb17682930d18ab42dd58b5cf65428f" Size="1622" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="1565167" />
     <Blob Hash="588dba74aac31b835ff489cf1dfc96598fb7b681" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="593279" />
-    <Blob Hash="5891e3049072207efbc6956900a794936488b176" Size="3226856" PackHash="d315fddcc857c33658fec9f6d24e4c4f2f9efe8f" PackOffset="8" />
     <Blob Hash="5893e5c3dcedf861553b876175013bf0a8343453" Size="270" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1397796" />
     <Blob Hash="5894f4ac7dfb33f27e6e80db8ef80bfc1f608b65" Size="30257" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1454456" />
     <Blob Hash="5896e0aefe2da30b5460634b6a3ace142cff69fe" Size="116" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1680688" />
     <Blob Hash="5897b47a1468c37e8aca437a4d3870530aa035d0" Size="1158" PackHash="1fd21352e206680f6a1db92a876a4303bfaaa4ee" PackOffset="1743161" />
     <Blob Hash="589a30657126e6743d214f42415ee4b6b4cdc37e" Size="116548" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="343810" />
     <Blob Hash="589a5d0661251c7c062598b3e1f5aa97c1828f0c" Size="2135" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1570532" />
-    <Blob Hash="589c8851e52cd4e55b90d9826b112b397edbd05f" Size="188" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1606310" />
-    <Blob Hash="58a0101149af04500d0edc9ce3638fb295f4cdf6" Size="1029" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1293434" />
+    <Blob Hash="589c8851e52cd4e55b90d9826b112b397edbd05f" Size="188" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1725542" />
+    <Blob Hash="58a0101149af04500d0edc9ce3638fb295f4cdf6" Size="1029" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1742336" />
     <Blob Hash="58a10906123e891de86c2584b42fa9201e5e9cd0" Size="12333988" PackHash="185908a865ebe7f6ee31701211aad217de343c7f" PackOffset="8" />
     <Blob Hash="58a1154aadbaa2549fe5a4f279b7c0487c73b321" Size="2469" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="777882" />
     <Blob Hash="58a11d070f883a359a0a605ad53d8660236c7896" Size="106656" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="1329387" />
     <Blob Hash="58a7e5409255f1bfb88f0dc4cd13d032374a35a2" Size="13394" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1176500" />
-    <Blob Hash="58a8cc40683ac0a6fb4d6f770cb153b3505ee5cf" Size="9216" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1631711" />
+    <Blob Hash="58a8cc40683ac0a6fb4d6f770cb153b3505ee5cf" Size="9216" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1647536" />
     <Blob Hash="58aad28e82f8e51d90c7825cf3feb97a891b26e0" Size="2939" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2073236" />
+    <Blob Hash="58af952cb0a166bf4f25a42ef3a6e76556e8f701" Size="16080" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2055696" />
     <Blob Hash="58b04270f33e330136a65fe3077124f8313ec238" Size="2428" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="565312" />
     <Blob Hash="58b101759ddcf7d84616c485eb6c41c18e7fad1f" Size="34577" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1869974" />
     <Blob Hash="58b107ebb8d6f61d45665603c78aa944185c6733" Size="4079" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="708958" />
@@ -48488,7 +48383,6 @@
     <Blob Hash="58c26dc4a55253498d706d4ae81664a751cc33cb" Size="6055942" PackHash="c05f216d3db2d912329014c5f0b98f49b079008a" PackOffset="8" />
     <Blob Hash="58c2e0f7186efcdadcc7888acb1121e4cccf17e8" Size="6040" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="2088085" />
     <Blob Hash="58c4da181456d831da4f17252b1f7b3114e0b758" Size="6251" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="827161" />
-    <Blob Hash="58c74522d4ffc69ca4f37851e062aebcdb134215" Size="1462064" PackHash="74d4912e14c0ef44bd3d29001dcafb2947155e88" PackOffset="8" />
     <Blob Hash="58c79781421b8c30a043cb3fe5567c615fabdce5" Size="7502" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1713327" />
     <Blob Hash="58ca1107acbf735433eeb649ac41023862c99b9f" Size="11488" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2053155" />
     <Blob Hash="58cae8883a0ada5634ce4f266a9f1ee6eb2f375f" Size="1000960" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="941064" />
@@ -48496,16 +48390,18 @@
     <Blob Hash="58ce4fe5843d53b352de28329ca8960b3dc18eb9" Size="136592" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1065332" />
     <Blob Hash="58d0c266ec09375bca07aa536fba2e13eaccf488" Size="7988" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2069712" />
     <Blob Hash="58d0c81471d5160fc98b32b1d8599331d2193582" Size="6811" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="726054" />
+    <Blob Hash="58d1050d7d8208c7c1f0bbf450776fdb71d3e465" Size="46784" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="2006348" />
     <Blob Hash="58d3d27ae633fcb34b9b9506082a297cf1a75ef9" Size="264094" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="1736500" />
     <Blob Hash="58d476d8d4dd8c5dbf15a3e6ee6cffe45ac54a87" Size="32071" PackHash="d8abbf7642437f66197d216a0eceef1ccce557c9" PackOffset="2060197" />
+    <Blob Hash="58d77f4b5a8b566e2fec947570421671dc5d7a6e" Size="4521464" PackHash="e8160c3dfbd1b6b796802d991d690c2f137f4340" PackOffset="8" />
     <Blob Hash="58d82865ab86a193f8f6ff1cbf7677525f6e217d" Size="92672" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="1924819" />
     <Blob Hash="58d8c97a102000d3e887cc7473a7e50dfb4f9c9f" Size="314" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="227435" />
     <Blob Hash="58d96782531fee6968f75bcfa2c4a831d27ce451" Size="2961" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1088338" />
     <Blob Hash="58dbfab4ed0632be5b128c336a09b281c462eb0d" Size="18998" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1707817" />
     <Blob Hash="58dcc555d077d5c27b8a92fc03b584da346df81d" Size="1027" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="2091584" />
-    <Blob Hash="58dfe35689c4f6cf279a0aac6d6be3f645185b7b" Size="791" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1138280" />
-    <Blob Hash="58e18ec35ff016955dd375349f1def9767c4b3a8" Size="870" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2030443" />
-    <Blob Hash="58e5fffc0c1e89b6bbeed348786ff4264ad0176b" Size="2914960" PackHash="9df79ca98fc0674345d759c1f448bc161f9580f0" PackOffset="8" />
+    <Blob Hash="58dfaa18621ba6fc4926649fca309bd1eae97fc7" Size="1781236" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="8" />
+    <Blob Hash="58dfe35689c4f6cf279a0aac6d6be3f645185b7b" Size="791" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2084296" />
+    <Blob Hash="58e18ec35ff016955dd375349f1def9767c4b3a8" Size="870" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1920654" />
     <Blob Hash="58e7c2ce35b04c7418748e779beaa81b757847e4" Size="1521" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2017518" />
     <Blob Hash="58e807f8145bc6d82fe11e6c42dbc5bf854dd3fd" Size="838" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="458887" />
     <Blob Hash="58e8d19e2d2ce3b76bd50f2649727f6e731c48df" Size="4784" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1713676" />
@@ -48543,11 +48439,10 @@
     <Blob Hash="592a8d15d967b9762d52883f2d4450e9a5bda100" Size="99294" PackHash="e23187f494893d459aee2428f603a4f93c6eebe0" PackOffset="544457" />
     <Blob Hash="592afa06dbc165031acc43a52ffcdab482b70da3" Size="8389" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="53641" />
     <Blob Hash="592d815e469ffcf893d3d4348c3172fe4afadf8f" Size="15016777" PackHash="0cc57de3ef019a2b8b6c70cfd54a12a625025ccc" PackOffset="8" />
-    <Blob Hash="5930a077a3bc7f0df50e3fb93ce3eda0500db069" Size="1175" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1162051" />
+    <Blob Hash="5930a077a3bc7f0df50e3fb93ce3eda0500db069" Size="1175" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1598667" />
     <Blob Hash="59313685aec48136b116f9555e52b2502514e92c" Size="157104" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="1230623" />
     <Blob Hash="5932bc03e9ccdc1aea9632afdd7d6987a0f6ce0b" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="684425" />
     <Blob Hash="5934f9dfe7aefd1975737e2f4354fe4fbbc25166" Size="803922" PackHash="d9bda84de8db2b30024997e133bba904f53f98db" PackOffset="8" />
-    <Blob Hash="5935cf6c81b8af557e9b1141a72326ac775328c6" Size="25397752" PackHash="d3252f0b3908d0904656e86696c0364f7c362edf" PackOffset="8" />
     <Blob Hash="5936f65ac81f9fe3d7efb3847957d66b8ac0fbeb" Size="203095" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="1070574" />
     <Blob Hash="59392f16cd56e3e6a685f78974d539fb3a972b98" Size="1084" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1061339" />
     <Blob Hash="593e932febcd21601153a5f28702309795de2e8c" Size="19902" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1245775" />
@@ -48574,7 +48469,6 @@
     <Blob Hash="59754eaad73d0e36f530af1fad174cf4be4fb592" Size="25864" PackHash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" PackOffset="2038830" />
     <Blob Hash="5975d39bf51f277dfb19d90231895f0d70108536" Size="5632" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1909788" />
     <Blob Hash="59789196af90eb5a291d942c6bb292e408c3a022" Size="138705" PackHash="c13461ed1911167f67309f624048d3b72b77286d" PackOffset="8" />
-    <Blob Hash="597bdbcf6b789fe51f618b8a28e7eebd985a9055" Size="238592" PackHash="d83cc9c9ccafadd27d18ea51adbb23f71944297f" PackOffset="24584" />
     <Blob Hash="597d914b59d942fa459a4b1e8e329df88b00b1cd" Size="18801" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1624547" />
     <Blob Hash="597e57e75b51c0188c7444063ba8d0e7745e3202" Size="8640" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2072024" />
     <Blob Hash="598036cb2a05a09387bfd7f8819f0fd5d826bbda" Size="4996" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="12717" />
@@ -48590,27 +48484,28 @@
     <Blob Hash="598b26cab32507ac090ef89d77149d4f95d995c5" Size="3272" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="918007" />
     <Blob Hash="598c0b49f20609e0ae309648f19cd8f30bd4ffae" Size="4625" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1785719" />
     <Blob Hash="598cc66d05ad6d7c7e939aa14bc458181e52c988" Size="88" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1442800" />
-    <Blob Hash="599327eea02978a495d54ef7a717330855e84530" Size="1520" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1037030" />
+    <Blob Hash="599327eea02978a495d54ef7a717330855e84530" Size="1520" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2085006" />
     <Blob Hash="5994bd6aa49b7c8fd07a25ec590fd9287dd1f296" Size="1064" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1887268" />
     <Blob Hash="59956bb9ccb05496f0f1c55cb613909f23836d08" Size="92361" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1591457" />
     <Blob Hash="5995c726a90672f00b643db60051b84f7b6c28ca" Size="17742" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1380476" />
+    <Blob Hash="599ccc44b67b2e502ef880da192940080d80c594" Size="344092" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="1575944" />
     <Blob Hash="59a26e9575d3ff49d813b13dd036f86ac5d309d0" Size="32543" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1170439" />
-    <Blob Hash="59a29c5b5d96d9a83cbca398417bba281b9d3aff" Size="92988" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="1872280" />
     <Blob Hash="59a3bb1c6a6a284b52d68ce98dec5c0621bae88d" Size="1424" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2094141" />
     <Blob Hash="59a40c1a415aad4cbdf990f29005d61cc02db251" Size="8004" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2036228" />
+    <Blob Hash="59a56c838660e52e9a5807bbf3ea694b0a281e3e" Size="37247382" PackHash="ab1b3130428afc398a4d2b5a4f24c901f8e6d9ee" PackOffset="8" />
     <Blob Hash="59a7e914876bb0f7cd0f47f1cf43b8c8c9098aa1" Size="2160145" PackHash="b80dc1e01912b1c90764855e37cc6c8d57b0a24d" PackOffset="8" />
     <Blob Hash="59abbe2f45dbe7d935a365090777f9f66301b6a5" Size="15402" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="376316" />
     <Blob Hash="59abfef48d862421e633afaf7ce67176e4dce324" Size="85508" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="1936655" />
     <Blob Hash="59b3d46105ef8c6a206bff3b9295fbbc01ab3c87" Size="1464" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1241547" />
     <Blob Hash="59b7080f28c88f02b641215e800c900ac8a3178b" Size="17580" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="620005" />
-    <Blob Hash="59b82705f2414fe6edafabde755b4b6f5d9351a5" Size="1021" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1324626" />
+    <Blob Hash="59b82705f2414fe6edafabde755b4b6f5d9351a5" Size="1021" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1773528" />
     <Blob Hash="59ba698effb1717f32406389edd77f1d31f1b4a9" Size="33471" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1861377" />
     <Blob Hash="59bbeae51b1bfe6dcf032261d03505a07b5d642f" Size="6751" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1694023" />
     <Blob Hash="59c09c19286c7fd2156534e051050152991cc172" Size="9704" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="53256" />
-    <Blob Hash="59c0f8217f96ff80005f8b6f686b89e49eab559a" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551746" />
+    <Blob Hash="59c0f8217f96ff80005f8b6f686b89e49eab559a" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670978" />
     <Blob Hash="59c16892d5c856a61930290e667252ccb6d111be" Size="12944" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="2077061" />
     <Blob Hash="59c3b7d607158591edf2ba59bd2da5eebb711c48" Size="42064" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="862694" />
-    <Blob Hash="59c576428d716668353a1413b7b99db09f6095ab" Size="155012" PackHash="7143ad7a585bda75349c77c92198a5b5ca391668" PackOffset="1886678" />
+    <Blob Hash="59c576428d716668353a1413b7b99db09f6095ab" Size="155012" PackHash="5f963ef76a4402af9c0b249886115df21f3833e4" PackOffset="1896960" />
     <Blob Hash="59cb3e1461b00addc6e06d7575ea79bca2d0fcd0" Size="130691" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="1742863" />
     <Blob Hash="59ce53b1aa91e4401056f2bfb131931547f51541" Size="7795" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1149438" />
     <Blob Hash="59d4040a3ea9d1512bc8b5cf708d4bcc1a52a0cc" Size="2112" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1893088" />
@@ -48623,16 +48518,14 @@
     <Blob Hash="59e2d8f5bffe65587047af71cf4874fb6f63c7b9" Size="16384" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="8" />
     <Blob Hash="59e324337bb7c7db32e71d75677b090ee2a7dfea" Size="213890" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="646356" />
     <Blob Hash="59e3cbb8d7fde6af9a613888d99fbee4ec556233" Size="52393" PackHash="56cc39ae2312d22dae41f9f071a254171eacb7a8" PackOffset="1991512" />
-    <Blob Hash="59e3db34d123ea15fd49585a65985f6a34288a3c" Size="1067490" PackHash="2573092c7861b9d182a4d6cab4457397e81d6bf6" PackOffset="8" />
+    <Blob Hash="59e3db34d123ea15fd49585a65985f6a34288a3c" Size="1067490" PackHash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" PackOffset="8" />
     <Blob Hash="59e43c1d8bec87cd3ca4b283c36739874d03fc43" Size="2158" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2061926" />
     <Blob Hash="59e4f3bf281f8a18292aa7addc61d8b77a759e9c" Size="5651" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1274265" />
     <Blob Hash="59e5e9143fe7e5790f96eb9677563e2cb62bcc50" Size="39" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="671601" />
     <Blob Hash="59e891306d68b7899b39c01731d811874b232bfe" Size="40993" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2007611" />
-    <Blob Hash="59eabf44c38d1cc1b9e699770f8ac2dd5ead9176" Size="1419528" PackHash="29a4bd653010a3a24379c61f4b55f4078f3c2dce" PackOffset="8" />
     <Blob Hash="59eba130e35938d79cf6f414aed1dc1de6c08d70" Size="11464" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1159156" />
     <Blob Hash="59ecd67575aa6f2c24679a6fe14fc10ca22fbd16" Size="3250" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1088694" />
     <Blob Hash="59ee4e173e2e60ef1c20b206c7939bed6ab53f6a" Size="226383" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="875036" />
-    <Blob Hash="59f1d4e106df289695f7eef8599fbda2300bb939" Size="25203" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1999418" />
     <Blob Hash="59f26ee2aa96b187cffe8444ec4e9b30637b8de8" Size="3470" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="634606" />
     <Blob Hash="59f3edda5159e5f1b7b9711582d7e04e6bf4f0aa" Size="4853952" PackHash="41450d9d5168d0332fc8cb938b4adc9e0ecde0e3" PackOffset="8" />
     <Blob Hash="59f615c9ca3197204f5aaa2555f81bb6f8f77ace" Size="86602" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1207952" />
@@ -48657,11 +48550,9 @@
     <Blob Hash="5a14204490ed6d716e341c1988b512122c1ec991" Size="88850" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="8" />
     <Blob Hash="5a194064e204406981a3fba0565f7da787e85993" Size="7310" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="2078206" />
     <Blob Hash="5a206b2e5c525c7800908d2c7b4c8f8b8690284e" Size="9229" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="56624" />
-    <Blob Hash="5a220e00fd0360ee0e141f455c7723465916c84a" Size="2324" PackHash="e77394dd7f7cc0b5cee80f69160731fc90212a12" PackOffset="2093604" />
     <Blob Hash="5a22824e8e682ec6c8d9292b7d267e74a92629c4" Size="310784" PackHash="5098f795311987869f91ed638f4c0a395312211a" PackOffset="470536" />
     <Blob Hash="5a2335f3d33f296798ecbac00c390ceb7007e28f" Size="98952" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="737096" />
     <Blob Hash="5a23c19882a32e7b5ef9ec8bed2fa77c5f0df2f7" Size="3284" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="287392" />
-    <Blob Hash="5a24b3387863d0c9b3c37fc2dbd448f78ae486fb" Size="2772992" PackHash="269d38d810260f2c59fc2335c447cdaa4d841785" PackOffset="8" />
     <Blob Hash="5a2738da512152951f663e4eb55cc3bf89bba341" Size="3279" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="865990" />
     <Blob Hash="5a2ab8d0637698b7848b07958b26048eebc45039" Size="470917" PackHash="1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" PackOffset="8" />
     <Blob Hash="5a323f850246e8f740719e9c2c3dbf73afaf43ff" Size="4441" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1809361" />
@@ -48685,15 +48576,16 @@
     <Blob Hash="5a57b666b51738b54c657ed47923656837246b41" Size="43769" PackHash="2408381821f1ad904404880379feec1a2eeb2ad4" PackOffset="194498" />
     <Blob Hash="5a5806ac6423513626e8f5f13618c413cff59bde" Size="22724" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1239378" />
     <Blob Hash="5a5aa7715f9aa73f694d7fb12c1743dd6ac838c9" Size="2486" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1983916" />
-    <Blob Hash="5a5d42a006a27c37116bfb3bbbb0a990ecab7bee" Size="23897" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2069198" />
+    <Blob Hash="5a5d42a006a27c37116bfb3bbbb0a990ecab7bee" Size="23897" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2060827" />
     <Blob Hash="5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8" Size="61" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2096936" />
     <Blob Hash="5a630471d3ce25933ba6bb9f885632ea7755c4c9" Size="1221" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="2095862" />
     <Blob Hash="5a65bbdf3b3eb74cc0b80903d1a8ee269c3053cc" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2032644" />
     <Blob Hash="5a65c530a130bfc42f7991e5cd0f9158fd601d6f" Size="2657" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="2087149" />
     <Blob Hash="5a66ebd52abe7a4394bcce2a607576b7ea5aba10" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="557224" />
     <Blob Hash="5a66f31369eac237e8950aad4b054005d4c9cb7e" Size="2969142" PackHash="4248e40936442e7002f26984b234a18508efca6e" PackOffset="8" />
-    <Blob Hash="5a67e2655c64931aa73aed07f49c2e7ba56f47b9" Size="8782" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2064176" />
+    <Blob Hash="5a67e2655c64931aa73aed07f49c2e7ba56f47b9" Size="8782" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2066824" />
     <Blob Hash="5a68cf9ad9ecc4747c99d6be1b655c41c4c6701e" Size="6789" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1960299" />
+    <Blob Hash="5a6e3020cdb33cb083c0b7798ba119680920849b" Size="164144" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="1842204" />
     <Blob Hash="5a717dddf62016437016003079c8071b4f114313" Size="13312" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="2082680" />
     <Blob Hash="5a72a47039a108f938468828048951067021ce29" Size="634" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="534654" />
     <Blob Hash="5a72c2ae5e1643f59685cf44857902eb5cc68b46" Size="63730" PackHash="c64ef0980920bd362bf26c9e31d253c145d848ab" PackOffset="1960738" />
@@ -48714,11 +48606,10 @@
     <Blob Hash="5a9a7ba543a8c6921a8f1de261ffc4d4350c4dfd" Size="462" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="192184" />
     <Blob Hash="5a9c09187ef58c2d5b42adbc8e8ca2917c272d8d" Size="117465" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="398763" />
     <Blob Hash="5a9d95144446321212c89b06d7aa7f93ae999308" Size="3154" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2008005" />
-    <Blob Hash="5aa0968bcc4c29772619e01f89ca1cdbd0e4ccc5" Size="7522456" PackHash="38a024672b3f4e9c26765ead7edde38b78e9ef66" PackOffset="8" />
     <Blob Hash="5aa31cac00f712930b479995e49b8786110a75bd" Size="7424" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="2022670" />
     <Blob Hash="5aa7319c313df6c4c87b6274f10e9e494e9d90e5" Size="1485" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="2095618" />
     <Blob Hash="5aa7a40712fc16251992d535855b0e3fec9a80ed" Size="22047" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="308603" />
-    <Blob Hash="5aa9703539e09be34121d5d95d0ba7a4b95d7254" Size="750" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1467547" />
+    <Blob Hash="5aa9703539e09be34121d5d95d0ba7a4b95d7254" Size="750" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2004629" />
     <Blob Hash="5aab372f6962742960b9d3b37af4b7d764760ddf" Size="7256" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1942173" />
     <Blob Hash="5aacb5af348ca78461a80bb26a3266620d848966" Size="76477" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="441671" />
     <Blob Hash="5aaf67ccaba80f5cd2c21dc330e19a2959c21c35" Size="7076" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="688395" />
@@ -48742,7 +48633,7 @@
     <Blob Hash="5ad808c29975e202f4c0e8faf8d710d32cb093d1" Size="2814" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2091443" />
     <Blob Hash="5ad96480e942ec6fa92af7513115b848cad3e38d" Size="10728" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1699542" />
     <Blob Hash="5ae0805644d58c011b8fd2bdfa4722e499da1634" Size="51776" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="51890" />
-    <Blob Hash="5aeeafc2dc725e7ee02e455c6effd0b9e85f0544" Size="375" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="2096712" />
+    <Blob Hash="5aeeafc2dc725e7ee02e455c6effd0b9e85f0544" Size="375" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="2096783" />
     <Blob Hash="5af17b294ca5e4e30cb1e1dd1433931b3e0b3a71" Size="12873830" PackHash="8d6762375c788c3ed64db6f381bdc77f1cdbaab6" PackOffset="8" />
     <Blob Hash="5b012866129b1a9f712b8a8ab689f117e129ae2a" Size="103034" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="131645" />
     <Blob Hash="5b01e185043f423ac62c0eacd1dd1a5aa2514f09" Size="30110" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="501672" />
@@ -48752,15 +48643,15 @@
     <Blob Hash="5b13b040b8a67a6dc5724c35822f989fbfa461bb" Size="192" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="275511" />
     <Blob Hash="5b13da0a346fa0b7282aa75d7298ba744c499497" Size="40340" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1284944" />
     <Blob Hash="5b19174e2cc21e7f4d843453812524cb77238b4a" Size="1608" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1303276" />
-    <Blob Hash="5b197772b6c23dc72c0b018437b89d3e1a201359" Size="331264" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="1707016" />
     <Blob Hash="5b1eefb783e6b44b071687905f01500b8ff3f40b" Size="16384" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1895432" />
     <Blob Hash="5b1f2f26af3729eda9a878ed9eaf8e8703c86786" Size="3467" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="508342" />
     <Blob Hash="5b21531b21bcb2c079053a5f883dec4f3ea5072b" Size="108773" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="1581062" />
     <Blob Hash="5b226f7868c1ff50535f75ae59abe6620fd21073" Size="17884416" PackHash="ab0accca4b2e0942f55d408ed30bb84183371d99" PackOffset="8" />
     <Blob Hash="5b275c7ffcdff6a7cd82345cae4786beb94b42fc" Size="2085008" PackHash="bd780b06eba19a17c46ce7aba89fa66e87bd0cab" PackOffset="8" />
     <Blob Hash="5b27a86fa03d30c922cbdb27887caf8959fa318a" Size="1963328" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="8" />
-    <Blob Hash="5b2b5eea01f0f079e42a3003a823ebbf3ad618c2" Size="60" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2097043" />
+    <Blob Hash="5b2b5eea01f0f079e42a3003a823ebbf3ad618c2" Size="60" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="2097087" />
     <Blob Hash="5b2be75c1cbfc492fb34608d490fd84af6188731" Size="250406" PackHash="4d28ce8c39a4aab2907e6be197ccfa5f003c6c79" PackOffset="1800960" />
+    <Blob Hash="5b2c84294d95bbe41189135ef215cb09689086d0" Size="18948464" PackHash="318accd95f2c22bea81dd6983550c1fdf856cc17" PackOffset="8" />
     <Blob Hash="5b2c9b80c2ffb9946ea64da232666e61cd4d61d8" Size="551170" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="1448812" />
     <Blob Hash="5b2e83ef42b4eef0a7e41d43bb1d4b835f59ac7a" Size="405951" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="714833" />
     <Blob Hash="5b316d4410a4722b4066e490f2d917e5e335ead7" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1110600" />
@@ -48768,16 +48659,15 @@
     <Blob Hash="5b3ad84915d839280a318a49cf67199d19b0a040" Size="6368" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="1983570" />
     <Blob Hash="5b3e12bd977224ffbbe4eb11654f2667e0bc4c1c" Size="156976" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="928016" />
     <Blob Hash="5b41646c1eeef245f1937f6f4cd3a5383498c38e" Size="128884" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="53337" />
-    <Blob Hash="5b43c254fedc15c3e432ad5c077cd75c35a60cb8" Size="6218944" PackHash="965dc1f402b05c8826516f837590556507151ec4" PackOffset="8" />
     <Blob Hash="5b4654f5060bf03b8a7394ab8ec716a56d7201c2" Size="1178" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="333797" />
     <Blob Hash="5b490a0e43c2c24929c26374c09a12977b7a8b15" Size="3491" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="856769" />
     <Blob Hash="5b4d006ca0a130227093006038c5b0f9583011d3" Size="666" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="295983" />
     <Blob Hash="5b516261cedd09dfcf7bbfd8edfc53c4e3c8920a" Size="6170" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1657313" />
+    <Blob Hash="5b52c608ad802e1f45d5e5ac85d9a04643a0b3d1" Size="8911726" PackHash="27b822e2427012ec19f5863c6ed756d1cea90bcf" PackOffset="8" />
     <Blob Hash="5b53b83f50407e0ea00a1fd7b2267140b433e534" Size="4971" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1938323" />
     <Blob Hash="5b53dd183665abdf20e5a18e5b94755ae5df4338" Size="39012" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1551071" />
     <Blob Hash="5b542d711145935d01542ae6c8744336b637349e" Size="786678" PackHash="6f05484879d2f89b7c43e2901cc5f670099f4d00" PackOffset="8" />
     <Blob Hash="5b55a6e063f4594322fd5522eccba6aceeb99ab6" Size="3018" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="209516" />
-    <Blob Hash="5b56c974ab607e11aee5328cae9248f9bf9e64b3" Size="195" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1783969" />
     <Blob Hash="5b593bb083769796e3385ef281c6dfb5f327b0fc" Size="24268" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="8" />
     <Blob Hash="5b596cac9676bc276265a3023bcdab2e81f43a6d" Size="9229" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1313234" />
     <Blob Hash="5b5a115cda727c9439667e3e95ca3333e49ba810" Size="8311" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1418829" />
@@ -48790,7 +48680,7 @@
     <Blob Hash="5b6cd51741cf6912660a40ba7cef1d7d1fb07856" Size="47248" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="1260624" />
     <Blob Hash="5b6e6464b71a3d271234fa3bea1d21288ef0fff8" Size="5460" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1243011" />
     <Blob Hash="5b6fe8bca7eb152bd8c6d9b68403bebfc13b9e1f" Size="22" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069656" />
-    <Blob Hash="5b7226e28cbfb7b721733e5167d1d174a39a82e5" Size="3225" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1258064" />
+    <Blob Hash="5b7226e28cbfb7b721733e5167d1d174a39a82e5" Size="3225" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2039682" />
     <Blob Hash="5b72b224f144dba1a6f463157f45fa1625317bbd" Size="931" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1873636" />
     <Blob Hash="5b733841f1cd9d42b64d8702fcb48f714591cd93" Size="321" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="400843" />
     <Blob Hash="5b7a6daf44ee3f0c3d2b0607a162ee713a6f409f" Size="29777" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="160475" />
@@ -48805,15 +48695,14 @@
     <Blob Hash="5b9b34391750115b341998a2593f1042fb3d55c6" Size="691" PackHash="7d2cd67e5409d984a518119f088c05600971a174" PackOffset="2092917" />
     <Blob Hash="5b9cd82de05d773b1c828dbfa7c3a6fea560ecb8" Size="7608" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="8" />
     <Blob Hash="5b9e2b40bb80238ff1ef59162a66d9124cd79aed" Size="2038" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="1996773" />
-    <Blob Hash="5ba48fdc2bfe8a6e9f6eef72bd15b8fab35602a6" Size="14670" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1929361" />
+    <Blob Hash="5ba48fdc2bfe8a6e9f6eef72bd15b8fab35602a6" Size="14670" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1673368" />
     <Blob Hash="5ba541adf6d010cb53d7844f958e26ae85f9f57d" Size="19681" PackHash="4df09dedb5c89d210947d966cbedfbc6267aa7e2" PackOffset="2067280" />
-    <Blob Hash="5ba7ee78fec3e1c5befc480000434b21a47a5637" Size="6734" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1915600" />
+    <Blob Hash="5ba7ee78fec3e1c5befc480000434b21a47a5637" Size="6734" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1856779" />
     <Blob Hash="5bab89ee0efa8757b0e2c21cc70d65f5fac5f5c1" Size="7047" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="84104" />
     <Blob Hash="5bb81fcdf855ef7795b563f176113e4aea4c5846" Size="73693" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1289912" />
     <Blob Hash="5bb8bd33139e5b6172344eb8bf9304dd7b0823e5" Size="4547" PackHash="bad135512b87a6103fa823a80abf2ea5dbfe1c0b" PackOffset="2091771" />
     <Blob Hash="5bb9307bbde2ef2b4433c6208fb3d892e54eddbe" Size="3828" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="869269" />
     <Blob Hash="5bbad927d770d80f9d79f309284d21f783333b13" Size="2206" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2007211" />
-    <Blob Hash="5bbb59ef74262e4473744876fd4ec458700d3f02" Size="343244" PackHash="a76a57c4a5ed17d5ab89cf2b2cf8c53b0605a8f1" PackOffset="1748652" />
     <Blob Hash="5bbbeb30949daa11fd6386adfd125200a5b2727c" Size="556" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="472115" />
     <Blob Hash="5bbd50730da7263cd40a37fba16b4404fe112641" Size="326675" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="764905" />
     <Blob Hash="5bbee727236b3e31b6a1323007ab2dec6634d2f0" Size="21592" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="274552" />
@@ -48829,27 +48718,27 @@
     <Blob Hash="5bcffe0f4f32f8f2b07992e960f3860f9ae59e16" Size="49912" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="961214" />
     <Blob Hash="5bd0ec44505cfec7174d8e3400bd1daf89adcf18" Size="66360" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="943165" />
     <Blob Hash="5bd18c1c9845c9fb3c6035e3e25888927bf94e0d" Size="37896" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1391222" />
-    <Blob Hash="5bd4ed6dce84b569d31db8434d0b668c063139df" Size="2624" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1398039" />
-    <Blob Hash="5bd54c53275296fdd133d67a354213a0eba4e6bf" Size="33465" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1862630" />
-    <Blob Hash="5bd7b3f3009e936e095eb17543c1f7ac616428ba" Size="638" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1429762" />
+    <Blob Hash="5bd4ed6dce84b569d31db8434d0b668c063139df" Size="2624" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1516865" />
+    <Blob Hash="5bd54c53275296fdd133d67a354213a0eba4e6bf" Size="33465" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1611784" />
+    <Blob Hash="5bd7b3f3009e936e095eb17543c1f7ac616428ba" Size="638" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1878815" />
     <Blob Hash="5be16c69e9937d0b24eb82804dc5b039bdf20e12" Size="324" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="415756" />
     <Blob Hash="5be3561f8b21aef0c57fb789754d271897ff59fa" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="664382" />
     <Blob Hash="5beb2a7a9b2791b4b73865d4d5f4610a58e23a50" Size="3132" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="198956" />
     <Blob Hash="5bec9dbba95ca5f2c306deeff15b1ea0ee7ca0fd" Size="247" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1700566" />
     <Blob Hash="5bee84051b62920d3b325771476d612dade18916" Size="8216" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1435771" />
     <Blob Hash="5bf08124ac96722ce891eeae807d7dd28c87aa49" Size="2529492" PackHash="b20273b4fe853ed2baea28418a14c02fd677bbab" PackOffset="8" />
-    <Blob Hash="5bf1c12d9aca7dfcb05e3c93506d04d7fd04b413" Size="1183658" PackHash="70182d4ffd95b3a1288b6fca57446bba12264d0c" PackOffset="8" />
+    <Blob Hash="5bf1c12d9aca7dfcb05e3c93506d04d7fd04b413" Size="1183658" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="8" />
     <Blob Hash="5bf290f1af92e34f6609d11ed98b871ea179b2e5" Size="290" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="61661" />
     <Blob Hash="5bf4c91eb1999b03f1523702bcac0a7710af622a" Size="1233" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="941819" />
     <Blob Hash="5bf56be1578411675df8721389f1cadbb0bc1749" Size="3700" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="347327" />
     <Blob Hash="5bf604a081f7c42f3fc80ed2ec0adc0460ad422b" Size="3464" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="938052" />
-    <Blob Hash="5bfc7484a592461b14a711c8e75ed06e98389022" Size="1084" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="2095432" />
+    <Blob Hash="5bfc7484a592461b14a711c8e75ed06e98389022" Size="1084" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2095552" />
     <Blob Hash="5c04753726cd2a0e1d3cfad5be5ce498067902ab" Size="649" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2096354" />
-    <Blob Hash="5c078da1b42048ec0caa223c462a21f3588800dc" Size="279745" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1357008" />
+    <Blob Hash="5c078da1b42048ec0caa223c462a21f3588800dc" Size="279745" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1528066" />
     <Blob Hash="5c0bf77b400e5e580f7ee80bbda432700c9d4113" Size="6474" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2027755" />
     <Blob Hash="5c0df18d60d7c8969c9212719aa4bc2f40e205fc" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1672588" />
     <Blob Hash="5c110196bbc0cfef065836f5eb789d1aae5f7b3d" Size="85290" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="1659602" />
-    <Blob Hash="5c11227801f3024b1473fe10fff266f58bb14036" Size="57" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548326" />
+    <Blob Hash="5c11227801f3024b1473fe10fff266f58bb14036" Size="57" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667557" />
     <Blob Hash="5c116800456ac1ad8e2cd66b4b2845f49b9fd7e2" Size="12457" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2047747" />
     <Blob Hash="5c12f3050ae1434771537ca92df2c99363d773b5" Size="1113" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2083563" />
     <Blob Hash="5c13c4391bdf216f530ae5080f32429b7dda3cf2" Size="683008" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="8" />
@@ -48867,16 +48756,14 @@
     <Blob Hash="5c2f58ac1fea64a0bd3034dcd7ea68d98678be9a" Size="12376" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1007112" />
     <Blob Hash="5c31258a5e814a456fed462d9f49e5c59b8a905b" Size="8095" PackHash="c798ec69224fa0c028f405298f4943f6ea92d3d3" PackOffset="2086899" />
     <Blob Hash="5c32e4ace2855f15eb3d71a07b0076406d5bd8ec" Size="2167" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1468108" />
-    <Blob Hash="5c338748b83164045cdd5d92233b1d302c35b1f6" Size="119001950" PackHash="f69c25162e2a1a9baefbc35ec2f95c283b93f42c" PackOffset="8" />
     <Blob Hash="5c34ac846302227e182277e21b540f2cedb816de" Size="14336" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1333112" />
     <Blob Hash="5c35cdb45d8c5a590d6e42178089c0a0669da12a" Size="6058" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="525961" />
     <Blob Hash="5c36bb6e9063f6bad4302c65aa80e8911c615814" Size="461713" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1254811" />
     <Blob Hash="5c381864a892d03a6bfe77d96dc7cb10d37f545e" Size="228125" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="1642144" />
     <Blob Hash="5c3a6324856dcbe7d1a11f3f5e440bb131551784" Size="20926" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="662665" />
-    <Blob Hash="5c3c830cbd1c0d310cc93cf16bc4cf9512ae8996" Size="1065984" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="8" />
     <Blob Hash="5c3eda4b325a5d5e224387fc4d65862a13b81bcf" Size="212" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="187747" />
     <Blob Hash="5c3f945cc49b957c47efa3c0ab919df11da0bb04" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1672332" />
-    <Blob Hash="5c42eea7e3b5b62501fad54807043a3836be9387" Size="344" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1618164" />
+    <Blob Hash="5c42eea7e3b5b62501fad54807043a3836be9387" Size="344" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1737396" />
     <Blob Hash="5c45ba549fb85ee5a1051a072931af1b0cdb9fee" Size="17439" PackHash="fa48ff18c8bfe5de58cfd0b9f5fc9ff52ec1b1da" PackOffset="21632" />
     <Blob Hash="5c4a470f2b3a78a48cc3c2db127a54ef4d4162f0" Size="3500" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="10578" />
     <Blob Hash="5c4e10f956fb547d2ff61cd9476f931d62533762" Size="2556" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="957822" />
@@ -48886,12 +48773,11 @@
     <Blob Hash="5c527abd43289f3173ad663935de643768274eb9" Size="2689465" PackHash="58cf115d701dba2092d2e4a3f0ed075cc6fe3069" PackOffset="8" />
     <Blob Hash="5c52bbd69edadacb9ee658d81047f91af16f536b" Size="2089" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1607158" />
     <Blob Hash="5c52ed669e7feb03c5adfe14e773dffb68dbdbbf" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1822919" />
-    <Blob Hash="5c5395d8b945ea720e4d1764e8f6490ba870e009" Size="236556" PackHash="a073071503c503582f72ed848f112b19ebc5846c" PackOffset="1791792" />
     <Blob Hash="5c54e29fb8d021bd5088e2b4bbf01c669061ff4f" Size="12743" PackHash="64f8a861ea0499b2ce969a0970e024d43314522e" PackOffset="280575" />
     <Blob Hash="5c562fcb1c6b92dc8fc6e3887d715c89ef37853e" Size="1911808" PackHash="becf420f3d19078ede00fc28d42cd811e7d8bb60" PackOffset="8" />
     <Blob Hash="5c5669d422aceb597226d743098ea2e2a66926dc" Size="2157" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="571507" />
     <Blob Hash="5c56a805c22639de4755a05756193d26f6f8d915" Size="1605" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="952805" />
-    <Blob Hash="5c599c34ab267cdd55390bbaf377f82978eb5098" Size="3013" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1059823" />
+    <Blob Hash="5c599c34ab267cdd55390bbaf377f82978eb5098" Size="3013" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1229857" />
     <Blob Hash="5c5e9cfa2efe78b7c02dc350006d10ab38f6695e" Size="3949" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1084389" />
     <Blob Hash="5c5fdfa95874933ac4676c1bf96088e13273e58f" Size="248354" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="702736" />
     <Blob Hash="5c62c276e71fb5af5e65b35df8758c505769ded2" Size="2420" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="580628" />
@@ -48931,6 +48817,7 @@
     <Blob Hash="5caa285ab5ef89230cf5ab333281c5c027d944fd" Size="876" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="441407" />
     <Blob Hash="5cab8a9289fbd2172b2a7fefbe365892cee83731" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2082185" />
     <Blob Hash="5cabc28d318fa5b8307429ea571fff91eb8e1252" Size="1111" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1095324" />
+    <Blob Hash="5cad53cf8d753ed881e8d241703e80c3b17c74c2" Size="239104" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="106504" />
     <Blob Hash="5cadabfd4b2c0ec36daa2c9951eb66e0f2f0fd8c" Size="14045970" PackHash="9b5499eac414bd739362093f60e3a8bf65899b7e" PackOffset="8" />
     <Blob Hash="5cae306f7244e45538e9d8af117fb178ea45ebb8" Size="18797496" PackHash="bdd928ffb7c0e0680b39fe714570128b7274994a" PackOffset="8" />
     <Blob Hash="5cb24b422e752f81ab936a1100e4e28dd072af7e" Size="515314" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="8" />
@@ -48941,6 +48828,7 @@
     <Blob Hash="5cbb1a3d14e3e8cab029fb49993a436222a9bb50" Size="109056" PackHash="256d7fb5a72ad9474639a3af999411bc858d0b00" PackOffset="1686536" />
     <Blob Hash="5cbd5bc7056f7ddfd22e42f77fabeee67a501576" Size="659" PackHash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" PackOffset="2096361" />
     <Blob Hash="5cc02e07d381ae5f3c97849d280ed0460cc5e054" Size="606" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="173299" />
+    <Blob Hash="5cc53421b303adc692aa327fb8bf86a8ae6d515c" Size="2277460" PackHash="1ed5f714ced00ef08aead11fe780ef685c8cf32f" PackOffset="8" />
     <Blob Hash="5cc830cdc3691fdb4f04b2d1fad2ecca151c8a18" Size="120" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201983" />
     <Blob Hash="5cce076fa8b62baa5e21a38553b5170ecc488a90" Size="17408" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="902152" />
     <Blob Hash="5ccf1dc01b2ea71fef5ba2bb1a5a0ac5a7f32466" Size="8756" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1363308" />
@@ -48948,7 +48836,7 @@
     <Blob Hash="5cd147850569b75323631646d41e20f24f2414bc" Size="113165" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="16198" />
     <Blob Hash="5cd266e564b3e0e568473883159c4923634da722" Size="2533" PackHash="2712036814539c2a4f91c20f323dcad0fecc9943" PackOffset="2093372" />
     <Blob Hash="5cd58c391c5472129b01649cb2ed64b0bc33d040" Size="309088" PackHash="3eeb2f03152b2114d56a8804fb8d634405321569" PackOffset="1711248" />
-    <Blob Hash="5cd681ad29896874dee0e55ccc1ae7414677a2b0" Size="3715" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1099584" />
+    <Blob Hash="5cd681ad29896874dee0e55ccc1ae7414677a2b0" Size="3715" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1869528" />
     <Blob Hash="5cd6a8306e29b786a6f025ca0b3d1714e2108045" Size="2991" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1466164" />
     <Blob Hash="5cd9519ef8192a96db41271333f8b37056e196fb" Size="55314" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="1934240" />
     <Blob Hash="5cdbf652088db998e14b72c8907c4e41c02a813e" Size="75076" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="182878" />
@@ -48957,7 +48845,7 @@
     <Blob Hash="5ce6546115d0f14f1793e877d5fe7800fbf1a857" Size="28854" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1868718" />
     <Blob Hash="5ce6a673df836f2d0035a26d004a17af3a5311d7" Size="2970" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1905224" />
     <Blob Hash="5ce6e21b86c989a553a13633d55e2c01738cbf83" Size="49664" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="634376" />
-    <Blob Hash="5ce865a66577c6e1a678141a8ca50f4fc1d33401" Size="3712" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2084281" />
+    <Blob Hash="5ce865a66577c6e1a678141a8ca50f4fc1d33401" Size="3712" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1984145" />
     <Blob Hash="5cec04b14a0fadc70c6cc4fee5d8711408cf41bf" Size="20622" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="593342" />
     <Blob Hash="5cedc6855d1a465655e7f615d6ed0b27552233ff" Size="1820672" PackHash="c007855aa7a0479a01364a56f831920abf69f840" PackOffset="8" />
     <Blob Hash="5cf157c9f4d90573466f33fbca7ac62e5b4326df" Size="4071" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="300211" />
@@ -48975,10 +48863,12 @@
     <Blob Hash="5d1c3fcc8ee5de1010866962c06ff854de794cba" Size="958" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2094986" />
     <Blob Hash="5d1d3731cc0593c5bf5f6ec898d95c9377e739a8" Size="6989" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="827045" />
     <Blob Hash="5d27a50fdeef102a5d7e0ccf9f32bc4bd6789b27" Size="1830" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="633044" />
+    <Blob Hash="5d28d29fd24f9030665042cf29f2d5c760b33036" Size="252386" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="1257692" />
     <Blob Hash="5d29a44d7b085fea96f93c32189aca918f7782da" Size="9827" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1009137" />
-    <Blob Hash="5d2e43f210c14bb29c49973320a8db2fdd1a223a" Size="59" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2097053" />
+    <Blob Hash="5d2e43f210c14bb29c49973320a8db2fdd1a223a" Size="59" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2097005" />
     <Blob Hash="5d32218035d74731b202c85d9f94eeb60044f60e" Size="11346000" PackHash="69435a1a9c544a85003dac3e715da698388e8cfe" PackOffset="8" />
     <Blob Hash="5d36d2cdcacde8fc27dcb43f3491843d5e7d1d21" Size="179555" PackHash="28f44db32f9f7f25ed9b2a7bf93ac4705bb90bf2" PackOffset="1405016" />
+    <Blob Hash="5d37c73e3b649900171c1ebd87732a34aa07597c" Size="2602352" PackHash="70bdd29efcb9a2792042174faff7cf83068ae70d" PackOffset="8" />
     <Blob Hash="5d3802d0a4de5f67da2c14d8d0e8f3bdb8ee6bb9" Size="411531" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="936094" />
     <Blob Hash="5d3803b3187e2378a2cd8358c2dc26886123561c" Size="3356" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="765002" />
     <Blob Hash="5d3c0425673b016477b553030535b3d15202961d" Size="262" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="994644" />
@@ -48986,13 +48876,12 @@
     <Blob Hash="5d4067339dd2ef48c115be21024f951a28eecc24" Size="1002" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="102667" />
     <Blob Hash="5d44436ff4832d16e71e7e7698797c03f46eb6e4" Size="4981416" PackHash="903bfa1cd7a46a1943b7312820a3b15ca1158e59" PackOffset="8" />
     <Blob Hash="5d45f9f88bddadecaec52cd78c06eeec0fb592e9" Size="97919" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1974102" />
-    <Blob Hash="5d47c60804e7c83b5329f9a771c541a94bf41572" Size="882" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1560074" />
+    <Blob Hash="5d47c60804e7c83b5329f9a771c541a94bf41572" Size="882" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1679306" />
     <Blob Hash="5d4838b44b4638ebb5dfda28d276c9f6eb8858cc" Size="384692" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="417952" />
-    <Blob Hash="5d4b185e781c25c2228a4095a17c23b8eaeef7b2" Size="552" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1408446" />
-    <Blob Hash="5d4b3cac591e30f07a46aca41bb2f7ad2814002e" Size="1380968" PackHash="5a02da594c01c4e862d4b8b16b8a58583d591a05" PackOffset="8" />
+    <Blob Hash="5d4b185e781c25c2228a4095a17c23b8eaeef7b2" Size="552" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1527395" />
     <Blob Hash="5d4de5915e194c224fbd5637dcdae063eb2bc796" Size="1880" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1888880" />
     <Blob Hash="5d517c9b46204639d07631599f836ab4d1bab050" Size="168" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="753971" />
-    <Blob Hash="5d518f96e405b5a4aaf7ba40224eae63477c9d1a" Size="96" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1582106" />
+    <Blob Hash="5d518f96e405b5a4aaf7ba40224eae63477c9d1a" Size="96" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1701338" />
     <Blob Hash="5d51a1291a305bf657d9e66bb6b69a8ea89a123a" Size="38249" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1609855" />
     <Blob Hash="5d52e00c4433aba0b6c34044c13c4bb16178455a" Size="215" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="2095932" />
     <Blob Hash="5d5777f4f5a122b18052987d1b28f1403862864b" Size="739328" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="8" />
@@ -49005,10 +48894,10 @@
     <Blob Hash="5d6dbf69f4704c9f4ddf4f64221a2357e2c11ee7" Size="19237" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1162993" />
     <Blob Hash="5d6dd4703165a5164f12cc5c29659e2cb1e518f9" Size="4841" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2069185" />
     <Blob Hash="5d6f06fb1fb8fd317b1792ac35dd01b6c4ff699d" Size="200522" PackHash="f6fdc33805bc89e2eaff8003a996f6bf8f880789" PackOffset="1397987" />
-    <Blob Hash="5d6f304232acc6e2237792fd9d72effddc3209b5" Size="784" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="2095350" />
+    <Blob Hash="5d6f304232acc6e2237792fd9d72effddc3209b5" Size="784" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2094142" />
     <Blob Hash="5d6f5d2fc3575d12c314199ca7bf5e25ea298dee" Size="26457" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="597406" />
     <Blob Hash="5d74917bc89d780e0ffd4fe7efd76a0cc0badbbe" Size="1136" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1148040" />
-    <Blob Hash="5d7a8696fa1ee9229c71c05cd67f3e73f4868e50" Size="5818776" PackHash="7d67e2a773161bbf02d0588ea9ea92a5cbca1cf4" PackOffset="8" />
+    <Blob Hash="5d763ad6d5023e0317b59022d4206b6f795053f0" Size="856146" PackHash="8c5c5245525609628442a9e4237db8a60ef59d6b" PackOffset="1178074" />
     <Blob Hash="5d7e933300f3d7a10c1a0f2b216320fae9c22f28" Size="68768" PackHash="59715c3fdd3ae349382891542d9450c46656b138" PackOffset="1902420" />
     <Blob Hash="5d826cde8fc0050709c7b9d95a06694c9fcfc895" Size="40" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2097062" />
     <Blob Hash="5d87637059172c10fb7e58315eebddb3ac7be788" Size="500" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="2095028" />
@@ -49035,12 +48924,11 @@
     <Blob Hash="5dbc290e3554afa080c8b6edd96a693c0586bf45" Size="52431" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="8" />
     <Blob Hash="5dbc46f246f7f9ade975db177b40c24ceb39ee2f" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="687287" />
     <Blob Hash="5dbcd6127e2b6d4c750c665c809f59b2a79d0a75" Size="88" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1854280" />
-    <Blob Hash="5dc014515f87bcc88cba87bc29d9e85edb894f34" Size="60" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1454363" />
+    <Blob Hash="5dc014515f87bcc88cba87bc29d9e85edb894f34" Size="60" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1991445" />
     <Blob Hash="5dc04629a03b12b82723d4fd03c3f55f707371f7" Size="16235" PackHash="bd3eb70a6e8e06013406a11237e86bd18b2fe38b" PackOffset="8" />
     <Blob Hash="5dc2879a534f35451f7e5c55b2e75974a3abe0c1" Size="3195" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="902037" />
     <Blob Hash="5dc34d2b8d5f701ed5d36c060319afdddc8c3307" Size="137082" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1216517" />
     <Blob Hash="5dc3873361ee5688bab73972a753afca1830a335" Size="150135" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="923493" />
-    <Blob Hash="5dc4ec299ce558d7e1a2c2dff90af20302fc11f8" Size="41048" PackHash="2573092c7861b9d182a4d6cab4457397e81d6bf6" PackOffset="2054660" />
     <Blob Hash="5dc936104cfc64beebb4085922d6d07aee2c614a" Size="184320" PackHash="56ad07543c03a217630a832be8abe7b278adfbc4" PackOffset="1874084" />
     <Blob Hash="5dc997a93febb651ff234bd820c1e8f48d81ba07" Size="878" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="836892" />
     <Blob Hash="5dcd570e0da989805445694566fd041572313627" Size="3133" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="489678" />
@@ -49058,7 +48946,7 @@
     <Blob Hash="5dec47e07e858db448c79c56331375806e37af2f" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096820" />
     <Blob Hash="5deff308fe03a300683e94a3bb3fcc3627d58ebc" Size="37183" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1677711" />
     <Blob Hash="5df1852dba53bd8fe43c509d73aa28ab61c19fa9" Size="2192" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1907389" />
-    <Blob Hash="5df242e8c3db4294db23c54233127d08d3814064" Size="1033298" PackHash="a1ae4592cfa3c36b6209520e0665ffa9280d2635" PackOffset="8" />
+    <Blob Hash="5df242e8c3db4294db23c54233127d08d3814064" Size="1033298" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="8" />
     <Blob Hash="5df451437b107548df7cb011bc62340fa729f6ae" Size="9229" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="8" />
     <Blob Hash="5df6194c2c318a64d235489c77792a5089eca8b1" Size="3443" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1143372" />
     <Blob Hash="5dfafaea668dcf4fb1c05e71cc66b12bf1e017c9" Size="5172" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2028424" />
@@ -49068,10 +48956,10 @@
     <Blob Hash="5e115e20b37e3784ae3129f91dc256a83e8d8b78" Size="3259022" PackHash="84978356cd369be4736c7b3fe392c0ea1f27c7d7" PackOffset="8" />
     <Blob Hash="5e12be9c3356f28be1c74f26c8c5835a548d583f" Size="32078" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="508560" />
     <Blob Hash="5e14b045b7a18f613f2e8aa2552e15e3a37b6318" Size="937370" PackHash="c5cef9da1cddeea076b94c4c29019fc3f2c32d7a" PackOffset="919606" />
-    <Blob Hash="5e17b8c3038f13665fcf910e13f49cf856592989" Size="1277" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1385084" />
+    <Blob Hash="5e17b8c3038f13665fcf910e13f49cf856592989" Size="1277" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1504544" />
     <Blob Hash="5e1a2b5aa9a8145f48505acffa5873b589124781" Size="2552" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="268742" />
     <Blob Hash="5e1b1e9c771827fadbfc38265bbfbf0ea678ee16" Size="570309" PackHash="ef60a0c38ea7162ceec2c523ef91f87a81f89cf2" PackOffset="8" />
-    <Blob Hash="5e1e448726e29c63db527eb7e71ef0c1cf8f952f" Size="2410" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="2094602" />
+    <Blob Hash="5e1e448726e29c63db527eb7e71ef0c1cf8f952f" Size="2410" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2023398" />
     <Blob Hash="5e22988d178c0f6a088ce9e136055ec611559f47" Size="12283" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1505007" />
     <Blob Hash="5e2585881f6cfaad45be474f85d677c4bb6031ee" Size="31544" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="846328" />
     <Blob Hash="5e2796c64253d0dd0dbe146ea60fd50b1ee0f80a" Size="285100" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="1373704" />
@@ -49085,6 +48973,7 @@
     <Blob Hash="5e37df5d966e243d8b6c14caf83dee9aa3d0731f" Size="50149" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1344098" />
     <Blob Hash="5e384b8462005544325310787af4f7eafa76160e" Size="12130" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1071434" />
     <Blob Hash="5e3967b5ddf3a6dbf07e90ed6b9b9c2f3f3f35fe" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2047504" />
+    <Blob Hash="5e3bcb6e392586d02804694c428763a00672c6ab" Size="2209" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2081512" />
     <Blob Hash="5e3cc1b9f6cec60ee34e62b784d95441c7f916c6" Size="490612" PackHash="ffe4b29f6febe2e6345b292bd341aefed751ae1d" PackOffset="8" />
     <Blob Hash="5e3ea4f62d9c9fa532cc452881699ee4a94c0016" Size="136530" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="1524937" />
     <Blob Hash="5e3f6164d2dce8e529e40107332f84089080d672" Size="3227" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1981350" />
@@ -49099,18 +48988,19 @@
     <Blob Hash="5e5841c38faecd308d1f0ddc1d37ef4523136ddc" Size="3727" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="2078161" />
     <Blob Hash="5e5c08e21c717ad78be5df1d6d34fc20d53623e9" Size="1162" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="345689" />
     <Blob Hash="5e5d68551c285f502a1c71a3fed90defa0602f9a" Size="182409" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="1269017" />
-    <Blob Hash="5e5dd38dd3f1766d52ddb4ab715c6c1525f8d098" Size="17657" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1694840" />
     <Blob Hash="5e60bb9c9672a43eb3b63b2c2976a857714a2bbd" Size="626826" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="1177434" />
     <Blob Hash="5e60d5eca2874349ac2019c264991a0c06d31a4f" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="775488" />
     <Blob Hash="5e63b2cee898005b1f538d000914ada6ba00b3d2" Size="4955" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="983557" />
     <Blob Hash="5e66c4c334e9fc2d515e43128ca8f7d248c78c4c" Size="389" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="274069" />
     <Blob Hash="5e68cfdc68c10eb35525075116060b5c1ff72e07" Size="96972" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1165938" />
+    <Blob Hash="5e6b15dede9a85b2aa2621f6fca53a3076427e8c" Size="1122" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1731873" />
     <Blob Hash="5e710d2e977e6f93640747229e17d24971c39f96" Size="912" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2085912" />
     <Blob Hash="5e744172c197c040a7b5cb30d5604a5c1f5070e0" Size="222794" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="1709403" />
     <Blob Hash="5e75bd32644859d48273791e64258b787ecf9aa4" Size="180048" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="1776306" />
     <Blob Hash="5e7a152370d28a2c40d6d480e95b9f5565c67d2c" Size="264" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="274351" />
     <Blob Hash="5e7c27ce128e9dbca98a76176071556d81d057aa" Size="12415" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="1962516" />
     <Blob Hash="5e7c5d36eb8bec8a9a0ad71fecbeafd4f4d9b2db" Size="3247" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="726955" />
+    <Blob Hash="5e7da5fc56bc977842ad07b06899f4360a4aa2f4" Size="2249804" PackHash="dbdc3b355134142777afab8f2a1dc1c2219b5a68" PackOffset="8" />
     <Blob Hash="5e87a0b0e3cb99a79ada3d27cc96fa1a172dcdb2" Size="3198" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="521770" />
     <Blob Hash="5e89c805825e30286d00aa460fec77bba5d0843c" Size="143535" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1084798" />
     <Blob Hash="5e8adb36c8eab860e86cf0284e4973b73cddc724" Size="1872" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="2093645" />
@@ -49119,8 +49009,9 @@
     <Blob Hash="5e8d6746993b18f3f1c3d851581706ce95301b48" Size="1178" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2036489" />
     <Blob Hash="5e8fe8c4e31f853be2363ef5638b1de8548abbde" Size="3194" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="1032412" />
     <Blob Hash="5e95fa49dd495adeea132f7ceed8e01e8f11224c" Size="1212" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="265880" />
+    <Blob Hash="5e9682d28838e91c83792346b9e4870717784689" Size="47441" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="2031139" />
     <Blob Hash="5e96c095b5e4d2fcc46e961a1df8bf041ac6bbd9" Size="15360" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="2074120" />
-    <Blob Hash="5ea170cf83447a85a9a41f3cb2440519eef503eb" Size="484" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1586692" />
+    <Blob Hash="5ea170cf83447a85a9a41f3cb2440519eef503eb" Size="484" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1705924" />
     <Blob Hash="5ea75f84efeeb654da82f73ba87e90cd778361ae" Size="40" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="2097115" />
     <Blob Hash="5eabad0bc0d30b109881d64117c20a8d473841d3" Size="15543" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="518123" />
     <Blob Hash="5eaece15dc72cbb025aa4507f3e4899a4d6f1f86" Size="1639501" PackHash="dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae" PackOffset="8" />
@@ -49134,7 +49025,8 @@
     <Blob Hash="5ec7d7363e1efec6f73d2a21a5011ef0b54e36c4" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="204462" />
     <Blob Hash="5ec91e1096286bf6f3061d973a366ced52a3ce1a" Size="9252" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="631173" />
     <Blob Hash="5ece87115d07e4c6f80f094cb5788696aae72a8d" Size="3038" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="230733" />
-    <Blob Hash="5ecf59da32fb6475fca468e1b5a4b76d44d4f988" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552541" />
+    <Blob Hash="5ecf59da32fb6475fca468e1b5a4b76d44d4f988" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671773" />
+    <Blob Hash="5ed40681dc0ccaedaada2c070cc748a783d5faee" Size="105895808" PackHash="c6d71ac963c30a7232a963b45ff7373f561b0532" PackOffset="8" />
     <Blob Hash="5ed525c930f9f8418aadc4669f78f0239261f5ec" Size="192780" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="8" />
     <Blob Hash="5ed90647ec1852461b10c445b2e6a79fcddfe57c" Size="542067" PackHash="ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" PackOffset="551711" />
     <Blob Hash="5ede599da776d03d8853c78f696298f91fdc8cfa" Size="362" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2095894" />
@@ -49146,10 +49038,10 @@
     <Blob Hash="5ee701cad6dd3f6639fba82b45e9acd555192d9a" Size="3709" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="642754" />
     <Blob Hash="5ef00b1307521945dc18bf66fc1c3a4caab77bbb" Size="4865" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="448435" />
     <Blob Hash="5ef090b4744b2d7df887ec0b66d4cb601cb6a6c0" Size="2802" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1972590" />
-    <Blob Hash="5ef3f720d6f66397cabf8e4826838b6c84fbc784" Size="874" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2094245" />
+    <Blob Hash="5ef3f720d6f66397cabf8e4826838b6c84fbc784" Size="874" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2095899" />
     <Blob Hash="5ef53f4860d73259bb35e843be088a83e8afc9f6" Size="21226" PackHash="5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" PackOffset="671774" />
     <Blob Hash="5ef5f1fc95e248e5c5f145d1a83162ca12588a72" Size="4331" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="456517" />
-    <Blob Hash="5ef804b01692703858fd66a06e212a3c67f9184a" Size="1645" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1569035" />
+    <Blob Hash="5ef804b01692703858fd66a06e212a3c67f9184a" Size="1645" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1688267" />
     <Blob Hash="5ef8eb633119807794df187fe3fb795233c3cebb" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2095616" />
     <Blob Hash="5ef9851c0a32e3659424bbc6edb7e3349bf78ae3" Size="1976656" PackHash="acdaf99b12d98a617d40b9fa06d235043e85ccd6" PackOffset="8" />
     <Blob Hash="5ef9a438a5ee3ca08ff8f740ccc056d84e7d932a" Size="174293" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="8" />
@@ -49166,7 +49058,6 @@
     <Blob Hash="5f0a19511a55ea34dbd178c10495d8575e900c45" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2092580" />
     <Blob Hash="5f0b3ca05e308e2cedd7ead6249a236abadf1ccc" Size="1610" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2062408" />
     <Blob Hash="5f0e9eadadfcd1a306c7760ec12b3a25c22c9ef8" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1526280" />
-    <Blob Hash="5f145a5a5b9d8a97026529b460603066032ebe1b" Size="13064" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1700929" />
     <Blob Hash="5f14adc4ef4ae74c19e7d9c47a8c37a816680868" Size="3057316" PackHash="a99223d50e3544895b1ed8d5171cf74a496ea264" PackOffset="8" />
     <Blob Hash="5f1b11036a8d882415fa19763104c36cfb863098" Size="3116" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="2079478" />
     <Blob Hash="5f1fc492b3662886facca61205d4ecc7eaeeb931" Size="31914" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="994484" />
@@ -49184,7 +49075,7 @@
     <Blob Hash="5f3d1fdc72506e3feddf4556a0e237daba30bd75" Size="3226" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="710185" />
     <Blob Hash="5f41d54c3bb81017efc7168ed91536d1f6265d8a" Size="766" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="406049" />
     <Blob Hash="5f42cd49dcd109cfdffe1d99a0d5c765f132d34a" Size="1111" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="344578" />
-    <Blob Hash="5f43545da219c4c8f5a7cf765bbb003b5f69c779" Size="326" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554493" />
+    <Blob Hash="5f43545da219c4c8f5a7cf765bbb003b5f69c779" Size="326" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673725" />
     <Blob Hash="5f43846118cbe2c2eb970a3ff52fba1c5951076d" Size="38841" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1854345" />
     <Blob Hash="5f4543e008cbe86c0f14e2bfc2f803cf38d34c40" Size="18624" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="386720" />
     <Blob Hash="5f4630451ab6c29d2246aa806cd1766a7aadfb6e" Size="683008" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1253402" />
@@ -49207,8 +49098,8 @@
     <Blob Hash="5f6df507c93767954c5bad0e5aa4880cb8d9d5ed" Size="5458" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2019634" />
     <Blob Hash="5f6e4e76357c2706c002d1b4603a17079bae3e88" Size="6355" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1207708" />
     <Blob Hash="5f763c97dc9e80ebcfe905803e597e32e05d7f81" Size="913136" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="8" />
-    <Blob Hash="5f7a9b82a3227f65b9cd94c5099f7e61f80adf35" Size="7154" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2084084" />
     <Blob Hash="5f7fe7e047440eee7eb0b392eb802d9bcf5c54df" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096692" />
+    <Blob Hash="5f849c83a42b25c406dc8b09645a3acbfea5b7c8" Size="247900" PackHash="f11b05acf069a23b5a58dd054c9e055241e06bcd" PackOffset="1621688" />
     <Blob Hash="5f853c10056ee26c05d8a55cc9145d373752dccf" Size="4057" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1343357" />
     <Blob Hash="5f886f561a19d25c659dd26f654ebfeb27db2aae" Size="79592" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1893986" />
     <Blob Hash="5f88a90b58a2d713e188daf11ba27b9bfd43c4c9" Size="9556" PackHash="64f8a861ea0499b2ce969a0970e024d43314522e" PackOffset="373885" />
@@ -49222,9 +49113,11 @@
     <Blob Hash="5f95aa9260fa5c8d16834936b43c851417185f67" Size="4938" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1692560" />
     <Blob Hash="5f97acb39dfc2a1331c71a6fb67a2ce95ae64b40" Size="40048" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="1993717" />
     <Blob Hash="5f9817d6cd58db8ebfb5c0d6e639225f9b9ae856" Size="15991" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="2014668" />
+    <Blob Hash="5f9c0a0381ae064c1c6e448bff6c66e71e59b923" Size="106017232" PackHash="25a9390b8bc7d645a2f90cb8efe606eea18ee35c" PackOffset="8" />
     <Blob Hash="5f9f636dfd5247d3ff8990cba464d6e475995d0d" Size="6810" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="787037" />
     <Blob Hash="5fa66aba7456b3c67ad00345dd48dbf88f1c1ef0" Size="23304" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2040435" />
     <Blob Hash="5faf5d412390225db19896f67b98f02aa38a7ed4" Size="68717" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="657187" />
+    <Blob Hash="5faf9dab5c6cde2d39be22f381ca538aacc45254" Size="59440" PackHash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" PackOffset="2034910" />
     <Blob Hash="5fafc1bc2e2cb288945f8339343c4e639b80e428" Size="3272" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2050808" />
     <Blob Hash="5fb0c5e2c5a5b5096944443dd164540eca1ff6dd" Size="2975" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="746118" />
     <Blob Hash="5fb370b498289590c977f6b489ff646f0fb27425" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1046993" />
@@ -49234,16 +49127,15 @@
     <Blob Hash="5fbe187acf08532a74d628086e05a7b10e24677d" Size="206145" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="1603656" />
     <Blob Hash="5fbfbedc1bcd2be5bb5793fa1f6729ae6e588243" Size="6714" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="1996507" />
     <Blob Hash="5fbfcc78ec81a27adc926becab8a63d4fd8543a9" Size="92672" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1483272" />
-    <Blob Hash="5fc05d7446fd55761b028efdc4c3a99b63fb02d3" Size="22248" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1860647" />
     <Blob Hash="5fc385a1f4c3c5951603bc174e545f24ac90a7b4" Size="123646" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="1798664" />
+    <Blob Hash="5fc54f598d49c54fcac88bff3a3f501421e8ad53" Size="3214848" PackHash="4864b7c9009a379a55cdf0758a215735f9ba922b" PackOffset="8" />
     <Blob Hash="5fcc64f78d2e2f996e9e702eb0ed8b1232eba570" Size="35045" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="2016060" />
     <Blob Hash="5fcdc7d4c6d51c5e4042ba686c8ac8eade4ddbc6" Size="2853" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="595857" />
     <Blob Hash="5fcfef0e2a8992f5134993d4f59e58ceb294f0e5" Size="56267" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1631700" />
-    <Blob Hash="5fd09b7b3fdc26ea992650dacc003fb2dcec8b41" Size="2163" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1410042" />
     <Blob Hash="5fd14355dd85ca89900698bfaba223400d068867" Size="64" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2097059" />
     <Blob Hash="5fd2af1c59236891540212a3644a908b16322803" Size="2628" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2062227" />
     <Blob Hash="5fd373035aec5471ead3140e766fa68bf1b4c9d7" Size="144" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2093776" />
-    <Blob Hash="5fd3b8d126482a4d4e4370cb1f7ee145905f9988" Size="781" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1450554" />
+    <Blob Hash="5fd3b8d126482a4d4e4370cb1f7ee145905f9988" Size="781" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1987636" />
     <Blob Hash="5fd56047bfd08e1c2de18f7d6fbb2f7597986a22" Size="16755647" PackHash="f65f0635d734f4d398aa18cab8771d0d5a33c9ae" PackOffset="8" />
     <Blob Hash="5fd745d27d0dbd9bf90a6b3ee9745d395ad9ae90" Size="650" PackHash="9925ec5c177c6bf6faada1514039ed1b19874a51" PackOffset="2096461" />
     <Blob Hash="5fdcd504747cb758bee8d5c69872a7b3f7c2d197" Size="1044115" PackHash="ad136520b1d52dd5f5d2f297d0b7cfef4e5837b9" PackOffset="641145" />
@@ -49255,13 +49147,12 @@
     <Blob Hash="5fe9fcff71d01b4b55dc9ba01dff417f309c49aa" Size="7284" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="98392" />
     <Blob Hash="5feba7394814665129de4ef45ef144b23e4111af" Size="7705" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="893496" />
     <Blob Hash="5fefbf831ee896db5b52a6095835687ec2f6bedd" Size="71391" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="449819" />
-    <Blob Hash="5ff0d63d20e0f89e1f977643b3f50644e89bda9f" Size="5576" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="2091368" />
+    <Blob Hash="5ff0d63d20e0f89e1f977643b3f50644e89bda9f" Size="5576" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="2087556" />
     <Blob Hash="5ff18796e07cfe88f318fc4fb580e3c827249ddc" Size="10760" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1063973" />
     <Blob Hash="5ff3c79c8a4df406ee9a63c18f48821512d48b64" Size="716" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="558592" />
     <Blob Hash="5ff3fc349daf73d9470acfd06e5535207ab0c012" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2097116" />
     <Blob Hash="5ff484a5959a3ce7d94f4a531aca232aa7c2288d" Size="1134592" PackHash="bc4cf9d4758f107d90920f50b55c8d1240dfe8bb" PackOffset="8" />
     <Blob Hash="5ff6ecd9c4f1b219ad5ed9b4db21b11a16b4cefb" Size="39641" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="735784" />
-    <Blob Hash="5ffc9178c533c99435db9dbe2358f7037b9d68d9" Size="4136" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2037213" />
     <Blob Hash="5fff49fc19f8f426ffd360fed3e1a59f0f70feb4" Size="87352" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1008688" />
     <Blob Hash="600168920fe31dd45f0897b4316db82efefe06b0" Size="1871" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2094664" />
     <Blob Hash="600352bb662a6f2b00834f77b7bf465daf46a9bf" Size="4287" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="933125" />
@@ -49271,8 +49162,7 @@
     <Blob Hash="600ba3176294540dbb3adcd38845dcbe4779119c" Size="19460" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="644313" />
     <Blob Hash="600bf1d2f2d42d45778c231f898f5e06b49a4a82" Size="952" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2094034" />
     <Blob Hash="60105ee0356f6f215712ac1292ebb0969e9fdc31" Size="1203200" PackHash="1625b44d3d9ca0356d470e794ffd8decb7d76ace" PackOffset="8" />
-    <Blob Hash="6011538cae019ddc431d8ee7bdb3d21c347332b2" Size="8557" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2072958" />
-    <Blob Hash="6012c15c65de6a50f77b50ecacd49d9e6248ad7d" Size="1605632" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="8" />
+    <Blob Hash="6011538cae019ddc431d8ee7bdb3d21c347332b2" Size="8557" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2079715" />
     <Blob Hash="60160934da407018105cec589d1bdc17070832e4" Size="3634" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="928217" />
     <Blob Hash="60164471e0d0c02a53ea987c4151ad61283857ab" Size="91106" PackHash="fd58015c14a96a87266989c815ee29b8fd613b0f" PackOffset="8" />
     <Blob Hash="6017afdef92d889fd346ec0c979e24b223248087" Size="20165" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1798985" />
@@ -49280,7 +49170,7 @@
     <Blob Hash="601d9fae9dd73505cece2a6f8358bcad91ac90ae" Size="865" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1774176" />
     <Blob Hash="601f7edca2dd8c9b2a09a82639168e0fb056c490" Size="1089" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="948219" />
     <Blob Hash="6020dc316a3b6d374d2e897bc63bfbf01fd92003" Size="9229" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="29078" />
-    <Blob Hash="6021a1e865a32de2659eb4622faac8c08d2108e0" Size="181355030" PackHash="0d02ac2c7c8439645362d6971e67af3a31c8178c" PackOffset="8" />
+    <Blob Hash="602126bcd06a67f4828f14e7a93f4c493bd768b2" Size="2326" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2089842" />
     <Blob Hash="602813901ef484de0eccd674f525c3e3e6046792" Size="15511" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="228116" />
     <Blob Hash="602c3eb0433e61d0e9c274e573042c0015bd1140" Size="12228" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1383259" />
     <Blob Hash="602ec56d1158413de8dfaeb0042f2f2dfe0d22f7" Size="17728" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1840740" />
@@ -49299,7 +49189,7 @@
     <Blob Hash="604d2565eebf824097070583b12a5365f53d2aea" Size="4179" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1697470" />
     <Blob Hash="604f1063a4f2de35359868fd97e032d65d9d6deb" Size="31614" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1260497" />
     <Blob Hash="604f33a68437c089af2ceec206815e19eaed644c" Size="52393" PackHash="d0567b0e74b19ee823347bf403863df43d2f5040" PackOffset="1977066" />
-    <Blob Hash="60518eb2906bf482da8217f22f70d6513936add2" Size="785100" PackHash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" PackOffset="1079026" />
+    <Blob Hash="605036b45be86aee661d31507f4e1382980fa7bd" Size="6952332" PackHash="e2f32ff964a397551243be87d453eadd39c65e2c" PackOffset="8" />
     <Blob Hash="60562eb1f61fe22a8c61436de195437787efcbb3" Size="207128" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="1447057" />
     <Blob Hash="60570cb68f1f0e3d9544a12318499b06a4997b2c" Size="28160" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1758533" />
     <Blob Hash="605a9a847fc39a903efbc6d636a050d48aafd9e3" Size="2883" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="609302" />
@@ -49309,7 +49199,7 @@
     <Blob Hash="60677a9a24a974af3e33cad179af3c5148fc63d3" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1808872" />
     <Blob Hash="60695ef504b7583106a3fc6f14bb11c55cdd3d70" Size="305" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="459823" />
     <Blob Hash="606b3afa13d257713e09909b1019d6c65566d39a" Size="6473" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1214063" />
-    <Blob Hash="606c6ef205e88d2be5cd1c10bf567dd88e937ade" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549716" />
+    <Blob Hash="606c6ef205e88d2be5cd1c10bf567dd88e937ade" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668948" />
     <Blob Hash="606cf9aaa6457e8f07ddebcdcf3d266db2452670" Size="125986" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="1067053" />
     <Blob Hash="606ea6a0f7dd3a3d23c8a1ed020fed99841de910" Size="675444" PackHash="bde504e141af1b3d4487c18b5869aca6f206534e" PackOffset="1127800" />
     <Blob Hash="60734607545357e5adcd2200a4a3a36639fbcd07" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="41437" />
@@ -49317,9 +49207,8 @@
     <Blob Hash="6074c51d3f8ca3ec7702dac91b9f838102224225" Size="5604" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1635884" />
     <Blob Hash="6076ebdb99206ece9d7f530b517e5649de5d9c7e" Size="3076" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1588512" />
     <Blob Hash="607a4f0ee5712486bea3f3b3acf07b46a5d2732d" Size="6144" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="415752" />
-    <Blob Hash="607b06610365e49a31bcefc0f87ad884b568f725" Size="12920" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2050789" />
     <Blob Hash="607c47ff6dc756396cb621534a9b658a46b48dc7" Size="1171" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="2071298" />
-    <Blob Hash="607d0317c43e196886dab9eb3df6d177dd3388a4" Size="1047" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2022921" />
+    <Blob Hash="607d0317c43e196886dab9eb3df6d177dd3388a4" Size="1047" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2081477" />
     <Blob Hash="6080c683c371932b4562ad7fe33122de80a78dba" Size="43744" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1460244" />
     <Blob Hash="6083cb82b4229060a50d4f66f20be7bdff0fbc5b" Size="1724" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="357628" />
     <Blob Hash="6085d5fb4ce7bee57edae6df582be452218f4fe2" Size="1200464" PackHash="6f05484879d2f89b7c43e2901cc5f670099f4d00" PackOffset="786686" />
@@ -49331,10 +49220,9 @@
     <Blob Hash="608dfa51910b223045e7407feef083865069374a" Size="3020" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1676582" />
     <Blob Hash="608fda0f197a2440eeb40bc4f2e7bfe12f8192a6" Size="8683" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="359491" />
     <Blob Hash="609347f1f678853e931b32cf93785c4fdef1f328" Size="790196" PackHash="554aafaaa2c457412c5bc79178a10f61589794d5" PackOffset="8" />
-    <Blob Hash="609ec3bd6a740b5ee73239ccd91f1ad2b6dbe1d4" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553120" />
+    <Blob Hash="609ec3bd6a740b5ee73239ccd91f1ad2b6dbe1d4" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672352" />
     <Blob Hash="60a07269397745b163bab16f2edcc4b62ddf3603" Size="36864" PackHash="c007855aa7a0479a01364a56f831920abf69f840" PackOffset="2030375" />
     <Blob Hash="60a0bb9f890700cfd216f8dc033d89047b8ecf71" Size="44600" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1828549" />
-    <Blob Hash="60a0f3800b53c89cd526340e9514528e2f2e81f2" Size="10765256" PackHash="e623a9fd2bdddd75871e146310698c5a844c758d" PackOffset="8" />
     <Blob Hash="60a6313e7ac7f27466313fe6cc79b563c2e5e936" Size="102" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2097054" />
     <Blob Hash="60a78cbbf5641783c830acc5a052f96caedbd160" Size="1068" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="297540" />
     <Blob Hash="60a9f3f3fdcb2b90e7842b191a0dfbe9beeb9395" Size="51396" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="760479" />
@@ -49353,7 +49241,6 @@
     <Blob Hash="60bd78adcf8b33dbcf579bea8f88fdb460ed6487" Size="38172" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="192948" />
     <Blob Hash="60c2d67a9ac0c8e7e86d0364d1fa884418940f4e" Size="39700" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1359259" />
     <Blob Hash="60cd6e041953b43c3254f89ee904edb35ddac5b4" Size="225" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="371359" />
-    <Blob Hash="60d4a2f49eca73291ff3b6d7935b6cf943118c94" Size="11683" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="321543" />
     <Blob Hash="60d4a46aa19ed61f4903ca2e0ad9e959eac06ec5" Size="20762" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1762427" />
     <Blob Hash="60d6dec1d2df87dadb4d2f3673ee9194063c43d0" Size="50939" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="2033326" />
     <Blob Hash="60dadf4b41b9ff8755febad843cf4220635ed1c1" Size="7507" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="932095" />
@@ -49364,7 +49251,7 @@
     <Blob Hash="60e3fd010c33c605464766d1d74d4aefbb10a403" Size="37794" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="1919621" />
     <Blob Hash="60e413204835767d227af66f2af71ebbc9d78706" Size="18827" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1164475" />
     <Blob Hash="60e4f367d193e35367d80bc8b71abd44b666b56a" Size="2335048" PackHash="4a54479869221d8888e0ba5b3ef2fe835f29c945" PackOffset="8" />
-    <Blob Hash="60e6595ea227722f76759af8554be22374d86094" Size="845" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1446581" />
+    <Blob Hash="60e6595ea227722f76759af8554be22374d86094" Size="845" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1983663" />
     <Blob Hash="60e7799528e2df70499dd67a18c10f41002c2e2a" Size="3773" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="189418" />
     <Blob Hash="60e813831fbaec36d1e56d050f13abf25d067123" Size="6709" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="736933" />
     <Blob Hash="60ebaf9c050afeb4830cc7f82806c983953d371e" Size="44181034" PackHash="8cb932c7ea437becda4c3a3d440d28ab1ed90f23" PackOffset="8" />
@@ -49378,7 +49265,7 @@
     <Blob Hash="611231b559027ecc873739c0578d5b036d7d1786" Size="14221" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="438618" />
     <Blob Hash="6112610240ac84e99c97f9e833533d63d8db5543" Size="122398" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="649036" />
     <Blob Hash="6112b4078b1e5ffd98bc04b853d703b747ede578" Size="1667" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1165084" />
-    <Blob Hash="61137f18a876cebf1a19a55cd110bf928a3a3122" Size="1287" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1099746" />
+    <Blob Hash="61137f18a876cebf1a19a55cd110bf928a3a3122" Size="1287" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2045762" />
     <Blob Hash="61182efe86ffcb477764eab850e6f6de555efcaf" Size="2930" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1285097" />
     <Blob Hash="61187893feea842654e61cdf60e565f2e58c57fd" Size="570" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="883254" />
     <Blob Hash="6119b0dacab8d32034e39b0519e9d134fd8b50b6" Size="13006952" PackHash="1ad9e2ca40ae2f3a2dc1bf23fd8749af62f784f1" PackOffset="8" />
@@ -49395,6 +49282,7 @@
     <Blob Hash="613f624102267b1397e845b3181a72273bd6f399" Size="547677" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="1120784" />
     <Blob Hash="613fa084a286e419df98be6a765623e2aced3674" Size="414078" PackHash="a9bab19888fc574fe564fd41bd6cb08159c85f84" PackOffset="1595594" />
     <Blob Hash="6142c913a189b38e95b97c0c0696be5cfa2a6e0f" Size="2391050" PackHash="401dde870b0593ea8eb48a00e180d088dd331d41" PackOffset="8" />
+    <Blob Hash="61436c437fa3258050062534a585ec7b004d08f9" Size="60888" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="2018312" />
     <Blob Hash="61463ee1445f4158c1520200f371b08df6e2ed61" Size="2858" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="754877" />
     <Blob Hash="6148e311baff8a298bc82be3947479cce28d45b4" Size="12612488" PackHash="f52e34a4a79133b94670f3d8a27f926f3eb6a3d9" PackOffset="8" />
     <Blob Hash="614aea4f3bf85e99baf6f3786f2c92169e3e99b9" Size="88" PackHash="21495600a60ec70990241fb254dcb18dce209ffb" PackOffset="965" />
@@ -49404,6 +49292,7 @@
     <Blob Hash="6154bdea49451277fa757ca69f18abb877f7b919" Size="307" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2096353" />
     <Blob Hash="6155f0e39d9d333f5b9e8133e2dc639d49b5252f" Size="981" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1637000" />
     <Blob Hash="6156acf859b37eef6adaaaddff8746aa52ef406b" Size="7649" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1208941" />
+    <Blob Hash="6159218f33bcd7857c4dcd4e885088c040c3cf19" Size="917504" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="8" />
     <Blob Hash="615d49339609d0f920bf8c068e2fc40133e85032" Size="1555" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="949670" />
     <Blob Hash="615da35f3e473513743c3125cf9580e46f51d3e3" Size="31321948" PackHash="d0bab4bcbf517b4ac7f4ae6e03f79cfd89fc8abe" PackOffset="8" />
     <Blob Hash="615e07ab78cf591a7c9261b047a6db4e994a2a3d" Size="1424" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1703796" />
@@ -49411,17 +49300,17 @@
     <Blob Hash="61662c82456004c964c9ec14adc0f2eeae9ba0f7" Size="59865" PackHash="ac406f0e3e6312263f380e544129e070bf628a1e" PackOffset="8" />
     <Blob Hash="6168ad2d6deaf6983086890c5e87f361fcd8372f" Size="492064" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1259257" />
     <Blob Hash="616cff0694326be8079966c75b1e40468d2824b6" Size="18570" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="486261" />
-    <Blob Hash="6171fb50869a8887ae72042866e23d18e1195856" Size="4216" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1239953" />
+    <Blob Hash="6171fb50869a8887ae72042866e23d18e1195856" Size="4216" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2004937" />
     <Blob Hash="6171fbb4e02311a7943bf61a932225bb623912b0" Size="124" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="2097025" />
     <Blob Hash="6173acf386eab2d224abab910ed4f1b347b97061" Size="136192" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1035272" />
     <Blob Hash="617508bc8b8b8b78610d2906b232e6086d2aacf9" Size="2112" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="840315" />
     <Blob Hash="61757050a5e979b8f3d34d1eb3eb4edcd1ba0279" Size="5342" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="119766" />
-    <Blob Hash="6176a8d7be78901b04a67b27d31f291edb23a708" Size="3610" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2080879" />
+    <Blob Hash="6176a8d7be78901b04a67b27d31f291edb23a708" Size="3610" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2084312" />
     <Blob Hash="6176dcd0838868c18751657b42d483ed11480c66" Size="3555" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="66811" />
     <Blob Hash="6179bafb6ed2eb029862356df6713078c7874f85" Size="188164" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="413038" />
     <Blob Hash="617a3a3a90679465b87b0818d9733745ae47f6d6" Size="3280" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2085195" />
     <Blob Hash="617a8b12fde066e66add167eda051b04b5041a33" Size="33145" PackHash="fb8c31646887718de45e229d7015c658f3c1bf5e" PackOffset="260102" />
-    <Blob Hash="617abb22b0dd8b282793df73f446f27e6dd93c6a" Size="68" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556682" />
+    <Blob Hash="617abb22b0dd8b282793df73f446f27e6dd93c6a" Size="68" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675914" />
     <Blob Hash="617c5fbdae2712ce13aa307bcb38654304921e27" Size="22798" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1668679" />
     <Blob Hash="6182573436c2d13544c8586eea0290b401edb205" Size="8297" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="127007" />
     <Blob Hash="6186729f17a4ceea4dd5422bf633764c8fb26776" Size="501" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="1238480" />
@@ -49433,16 +49322,14 @@
     <Blob Hash="61934b182d58a80bef508751e247dcfe875fa872" Size="652" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="2096096" />
     <Blob Hash="619397a180f814e828debb72917ceeb37f2b485c" Size="3333" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="543914" />
     <Blob Hash="619fbcac26a47d80059c5893c7d9751164449cc3" Size="116" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="275219" />
-    <Blob Hash="619fd8a7147b441d34936da985a1014bbde2985a" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552874" />
+    <Blob Hash="619fd8a7147b441d34936da985a1014bbde2985a" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672106" />
     <Blob Hash="619ff0a87bfd600deafd6e539a0f85a11507d7c0" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1449588" />
     <Blob Hash="61a538ff17519a95a93df68b5a7a03e902f63440" Size="35587" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1901985" />
-    <Blob Hash="61a5f98c224040c603620da8877ebacd4330cd6c" Size="4650576" PackHash="4a7f9cf7893ba2013f4638fab41f90fc1f63b4b0" PackOffset="8" />
     <Blob Hash="61a611c5dfb9abdce4cf8253d53b5cb9aa0739b3" Size="112670" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="93819" />
     <Blob Hash="61a8276caff27694d57aa763dcc05360efaaf9cb" Size="439744" PackHash="4abf0595e4706e434b909ea697e6e34737cc2bbe" PackOffset="1107852" />
     <Blob Hash="61aca035f67bd537a7d673e6be6e98c4979b47f2" Size="266" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1877866" />
     <Blob Hash="61ad25e5db199301d7b406db06977c04935b286c" Size="5964" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="514611" />
     <Blob Hash="61ad93be14dbfff4db59ef264ba95b5116a9773b" Size="3503" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="759743" />
-    <Blob Hash="61b22f575a11587fdd9b25785f647efb77570462" Size="227" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2096471" />
     <Blob Hash="61ba62f253bd4d8b34c2cfcdb96ab458d413e214" Size="7308" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="473205" />
     <Blob Hash="61bbcd7dd27f54d363a8a6ebd423672ac847c7a8" Size="707091" PackHash="36af7f5290dd60c07f83b8a398eb9721c24a6154" PackOffset="8" />
     <Blob Hash="61bcd97d4bb9e01d8edbda7f6106a8f341f76d61" Size="2222" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="65186" />
@@ -49450,6 +49337,7 @@
     <Blob Hash="61be0e18685268db44dd9ebaf7394fd9ecf9b70b" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="674881" />
     <Blob Hash="61be480a85881e27664de3c62a293369423f7843" Size="8760" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1824850" />
     <Blob Hash="61c4f4c0cafb57df4dafae3c7da1baf5eba3f6b2" Size="681" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="806790" />
+    <Blob Hash="61c7eab24fad6be3886053fc7cbfd68b1aeb7a64" Size="8739016" PackHash="33802b9f80c9d016c066e998dc08ece561b3012a" PackOffset="8" />
     <Blob Hash="61cb436552e43043c7fceff372293bee603ef60c" Size="2828" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="89728" />
     <Blob Hash="61cdea5b3d1cee1d333842eb6b892b5a58a944c6" Size="1238" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="624741" />
     <Blob Hash="61d39996797654bd2b49532e928a579f30d43d58" Size="19032" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="340459" />
@@ -49464,31 +49352,31 @@
     <Blob Hash="61e6b6bba291c1c2d4938e4b7bcbb96d6b32e75c" Size="1398" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="1723302" />
     <Blob Hash="61e7c2804463e1940dc0db25c9c6f6ca79ae9c05" Size="158" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="701301" />
     <Blob Hash="61eb0134e8a314b4097a46124889349d654102d4" Size="5587" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2073924" />
+    <Blob Hash="61ed40606ea5682a86f0a665d04ad5793d26a849" Size="4314042" PackHash="bfd884261652a1ac2cffcc3f8db8c0c9830fb3e9" PackOffset="8" />
     <Blob Hash="61ef219e0b06b96ac1c834d99bc01196457f98db" Size="188" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="450579" />
     <Blob Hash="61f5cf8bc625bb39ea1ef2354bc42cc07c7ffe06" Size="151026" PackHash="cad6744ce15f118a59a2092dcd6d52e7a0f0fbe0" PackOffset="1943298" />
     <Blob Hash="61fc7bc8b8dfa42d3990df552ffd9966ec7a1293" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1934517" />
-    <Blob Hash="62025b85f843ef495ce5d971df794276fde3e79d" Size="3019784" PackHash="e769fd3f38f8ac16d61425aefb493e6efc9f72ef" PackOffset="8" />
-    <Blob Hash="62068404b36981d3392b4ddf31cc586c354dfa08" Size="2574" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2018503" />
+    <Blob Hash="62068404b36981d3392b4ddf31cc586c354dfa08" Size="2574" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2086169" />
     <Blob Hash="62070b4b22c9e0b461796fbeccb4a7215698bc1d" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="755203" />
     <Blob Hash="6207187bf8a01ab0af2c25a65ce74f68da40d782" Size="6240" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="909289" />
     <Blob Hash="620c59e04e1b47662a979eca47647c1347c67257" Size="212981" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="1340744" />
     <Blob Hash="620cfad8a8ff79a19feffb08c7dbd57bd11fb5a0" Size="3979" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="846127" />
     <Blob Hash="6213079f2f6611a814e2a249ae9becd09eb41f65" Size="60477" PackHash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" PackOffset="2001193" />
-    <Blob Hash="62130a4ec03f537da916425a813dbb252af7fc4e" Size="276" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1583074" />
+    <Blob Hash="62130a4ec03f537da916425a813dbb252af7fc4e" Size="276" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1702306" />
     <Blob Hash="621505889cb97c9b4d42160cf8063afb867961df" Size="134002" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="8" />
     <Blob Hash="6217e9c2285168e4bece12fa2d5e40d0b5cbfc5f" Size="1350" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2092927" />
-    <Blob Hash="62193e389f1f34f8bcc51658b66121b4e28c3011" Size="947" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1076717" />
+    <Blob Hash="62193e389f1f34f8bcc51658b66121b4e28c3011" Size="947" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1246751" />
     <Blob Hash="6219a61d4e179cc78a25079b2ccb28dc25826a9b" Size="8638" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1835494" />
     <Blob Hash="6219e94226b702d73c0602d021b2c66abfa2be8b" Size="161931" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1084992" />
     <Blob Hash="621ac18f4c158a5dd603095bf2bb059ee0b35db8" Size="34280" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1690672" />
-    <Blob Hash="621cb18d4d9b88cd6f4225d9d93488a0540b289a" Size="214016" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="1814132" />
     <Blob Hash="622239854bee18c3cc24c9fb0be05213ca36f608" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1966664" />
     <Blob Hash="6222542a9e22ea779f5d6b6ad59baaaa8ea2bf7a" Size="4395" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="979718" />
-    <Blob Hash="62233999b0f00b953d8d779594663607d863dabb" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549865" />
+    <Blob Hash="62233999b0f00b953d8d779594663607d863dabb" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669097" />
+    <Blob Hash="62237976ef5cab03e5bd59552a63cf7ef996146d" Size="7701104" PackHash="bb5775cac4a000acf42a9ad9cda1c7d61cd64995" PackOffset="8" />
     <Blob Hash="6224a80525736fe411729ca322bd572ffb1004d9" Size="17308" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="1295575" />
     <Blob Hash="62264a6e058c41802141e2c1bf5857610859c48e" Size="2344920" PackHash="83da555d6e4fbfe69ca68b5ca6bc7cdc4a842210" PackOffset="8" />
     <Blob Hash="62287d744b1bc5591d08d82c2899c77c1477dd3a" Size="4582" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2055676" />
-    <Blob Hash="62290e8e6b59e9057827b0ada78878cd2e99c16b" Size="519" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2062853" />
+    <Blob Hash="62290e8e6b59e9057827b0ada78878cd2e99c16b" Size="519" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2082452" />
     <Blob Hash="6229150fad0dbbdc013fc8d50a759f99ab95ccff" Size="41300" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="597194" />
     <Blob Hash="622b1b8144d7fe729c2567766cbcf297f4844f88" Size="26840" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="115934" />
     <Blob Hash="622f118f529c4222e24f3b422a0ce9514c1af139" Size="1648" PackHash="c0476a6a0442712d3245a0babbf62c40e8e75b95" PackOffset="2093774" />
@@ -49499,11 +49387,12 @@
     <Blob Hash="623ce16cac2faf4015c8c1fa84b59d5358c1fdc8" Size="10112" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1296302" />
     <Blob Hash="623eec6a311e558d84a6cbb4eec36f47528e1104" Size="3578" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="412209" />
     <Blob Hash="624068df7ffb99eab20949f390c3f2f068c46839" Size="2660" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1178020" />
-    <Blob Hash="62414ee3a04140deb277f85d4a3394cd356de6b2" Size="2306" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="2092086" />
+    <Blob Hash="62414ee3a04140deb277f85d4a3394cd356de6b2" Size="2306" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2025808" />
     <Blob Hash="6242c54270b3fed8c1d74deb7ba67f4f5d38e0d2" Size="566" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1611520" />
     <Blob Hash="6243189e4f650a71b329e8a7fd711bfce23a5eb5" Size="290" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="374668" />
     <Blob Hash="62456ec31b2ba0dd6c8679ec80661e56781f0f77" Size="4610" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="657057" />
-    <Blob Hash="624a163be9b7bdacebc3ed8a94f26f406b28489d" Size="8088" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="2084102" />
+    <Blob Hash="624a163be9b7bdacebc3ed8a94f26f406b28489d" Size="8088" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="2088852" />
+    <Blob Hash="624daaedbd0d4e18398fddcd7286d93d84b8c564" Size="161368" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="1680836" />
     <Blob Hash="62552b2f202538adec5eeada08c2135f4d98351a" Size="148570" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="1907284" />
     <Blob Hash="62576958a741f0b0f852379fb385055ea6df4bfa" Size="4475" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="684211" />
     <Blob Hash="6257c2a4a794f6aa70832626e71b9072a7aac1b8" Size="48160" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1690374" />
@@ -49529,16 +49418,17 @@
     <Blob Hash="62864f1ccb578bf54a54496f05a9306f4b6999af" Size="38172" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="154776" />
     <Blob Hash="62875c05ca9a8bc90e86be8daeac59ebed373195" Size="339" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="2096266" />
     <Blob Hash="62883069d535414052bd17714c14caa0e47b9799" Size="1289" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="182347" />
+    <Blob Hash="6288d07bddea86c4c34f01e7de409b01158ce68c" Size="4011394" PackHash="158906cf7860f16c468a7866d44e991f39718eec" PackOffset="8" />
     <Blob Hash="628a044d8233eeeba739936657fe376c0a600a07" Size="144970" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="794792" />
     <Blob Hash="628c523671a2fcf204b0bc5f26421dc45438fd3b" Size="4504646" PackHash="36799aacce147eba397f6eacc7a0f6c9dac946d8" PackOffset="8" />
-    <Blob Hash="628d580228fcde001d308520802fbf581a12d6f5" Size="483632" PackHash="49ba5b57543f91a9bedf6b1c6e96550e308fb74f" PackOffset="1604608" />
     <Blob Hash="628e1387876e7af9deb074dde016ff75cb4c5fc9" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="302012" />
+    <Blob Hash="62910b920a0d36039573fe9b727b8052e23d34a6" Size="82584" PackHash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" PackOffset="1895250" />
     <Blob Hash="62922cd59c2ae52686743b5e3027e20428adab53" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1853543" />
     <Blob Hash="62931af98d75c6969ab28acdb94e042fa355d942" Size="4887" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1037791" />
     <Blob Hash="62957301419396e5c2b6b0ec8ae73d8e29338d45" Size="7595" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1415752" />
-    <Blob Hash="62981c4b7df24e898bbe673fd81dadc69345274d" Size="1676" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1030843" />
+    <Blob Hash="62981c4b7df24e898bbe673fd81dadc69345274d" Size="1676" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2078819" />
     <Blob Hash="62993e31d4a44e0040bb903ad7dcc5e65f348883" Size="114579" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1914409" />
-    <Blob Hash="629b2ccd838fba17e3e3c2fc14475bb53029fc06" Size="832" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1426632" />
+    <Blob Hash="629b2ccd838fba17e3e3c2fc14475bb53029fc06" Size="832" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1875685" />
     <Blob Hash="629b86a1a608497bf35d5011fc6605993169ab5d" Size="3513" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1691288" />
     <Blob Hash="629c41edcf8328313e8f441b4b8db3e3a0b051ec" Size="376" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="382525" />
     <Blob Hash="629c7f0f25a961f15b275543acf321d7dd3a7a1d" Size="1673" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1869506" />
@@ -49550,6 +49440,7 @@
     <Blob Hash="62adfba98a1487adb46bf4bef0840ff29ae89cff" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="274509" />
     <Blob Hash="62b2d1d7e63ec82ccfd94b99db49051bdc3e0212" Size="493056" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="1586696" />
     <Blob Hash="62b3d49f84743fe577ad2a3597da229e8d03e21e" Size="15968" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="843960" />
+    <Blob Hash="62b4083f73b81cbe1e0e93ab15725ef48d674280" Size="2310" PackHash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" PackOffset="2088832" />
     <Blob Hash="62b4eb77677793a76ad514613a37c74f56f2b653" Size="23593" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="1943029" />
     <Blob Hash="62b56367ba45a284a17888074a48381fa9989033" Size="2840" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="80591" />
     <Blob Hash="62b798c31d59a9608562ddcb6ea4841b1c4930ca" Size="9874278" PackHash="e3fa27e2dc586e0332fe5f04da9fc3f350ae06c9" PackOffset="8" />
@@ -49562,6 +49453,7 @@
     <Blob Hash="62c4b52834fd5d6e3939367cc4662155e30960d5" Size="752" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="2094144" />
     <Blob Hash="62c923993008b5f00528667d8747db0dfa33821a" Size="22572" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1650802" />
     <Blob Hash="62cd64b3afe298b4f53670bd0252612149bd0d2f" Size="2797" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="713531" />
+    <Blob Hash="62cfa5639465375e2e076354deaddcf10a8faa36" Size="28175568" PackHash="affcfc701f2807b86dbb0338eef8b51627d93b41" PackOffset="8" />
     <Blob Hash="62d1be457f028b9947c4007c14aa3cad9338d4ff" Size="39" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="2097038" />
     <Blob Hash="62d2453c737960350d50551b25cc22169a818230" Size="1684" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1830072" />
     <Blob Hash="62d693b76ff508b0f08e593764eb422b7d78d7c2" Size="132608" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="1901018" />
@@ -49569,13 +49461,15 @@
     <Blob Hash="62ddc7b3f14c8191e3114392f87b8ff43603b34a" Size="20445" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1739924" />
     <Blob Hash="62e39a1f8a2339092e7a3724d099d0f7cec2748f" Size="134351" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1176633" />
     <Blob Hash="62e3e40c89a377e9ffea31f4547544f755e596f8" Size="6802269" PackHash="ec6d576df884aeea2ed37256df7caa8cc8040d6e" PackOffset="8" />
-    <Blob Hash="62e638f7169c6d8dafd4f81a25d0131ee2bbb682" Size="927" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1087339" />
-    <Blob Hash="62eb76ad3fea58e0ff2de2a664effe34528dbe24" Size="3300" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1899232" />
-    <Blob Hash="62ec9e3e67c7db3ccbab7e61429cd73fcb9bd8ba" Size="265" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1286273" />
+    <Blob Hash="62e638f7169c6d8dafd4f81a25d0131ee2bbb682" Size="927" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2028073" />
+    <Blob Hash="62ea24b345059c858da1e37b3f01bbf3bcc37895" Size="41544" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="2004806" />
+    <Blob Hash="62eb76ad3fea58e0ff2de2a664effe34528dbe24" Size="3300" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="2092259" />
+    <Blob Hash="62ec9e3e67c7db3ccbab7e61429cd73fcb9bd8ba" Size="265" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1735175" />
     <Blob Hash="62ee62eb9266620b37ccc5aad6f3f5770b6584db" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="970760" />
     <Blob Hash="62f2e9afd1fd01c57c4619c118d3abcffd8f6fb9" Size="2700" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="591432" />
     <Blob Hash="62f53dc8cd7d87e7425038a328a13cbfa0218ed1" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1999758" />
     <Blob Hash="62f5a92844ab233aca69beadc350d772b8b44b85" Size="431833" PackHash="39751e99851beb7d0825e392704eb90eb4cb755d" PackOffset="1493512" />
+    <Blob Hash="62f9bf444b1f1166e35ee919bfeaeb06c37bdb74" Size="52567006" PackHash="232aee47faae6b64f91f178276ac9ffcc5c0b98d" PackOffset="8" />
     <Blob Hash="62fa8e9b611dac9a704f8cebb3e24acd1599622b" Size="876308" PackHash="48b9cfd22101481b2a96c5f7542dafa24cf5554d" PackOffset="8" />
     <Blob Hash="62fe80b62dde5cc8d9a0ad0f29c94c37741297ce" Size="2527232" PackHash="ce68eb270b121549818de184a640e5a3d4775d03" PackOffset="8" />
     <Blob Hash="62ff26fbab832f599d2142c062183ea20643353c" Size="3674" PackHash="99677cc167673ccab84e8b60864da0b9f1f7f4c3" PackOffset="2092564" />
@@ -49590,20 +49484,20 @@
     <Blob Hash="63083c1829f831d51bbf0f3fb16bd7a16fba8751" Size="6186" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="827977" />
     <Blob Hash="630f9d2098473477b2ee2b6776e92a77c79a1072" Size="22612" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1037128" />
     <Blob Hash="6311d1c3640031925b74940abda1e600d5beed2e" Size="2178552" PackHash="945bed8b226ea15e2688ef4a9c4c3f1ef15bc03d" PackOffset="8" />
-    <Blob Hash="631602b9bb95e62a32619a93732de224d335c795" Size="807" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1974087" />
-    <Blob Hash="6316d0d6a5a7e6428792df1d9910cc6c35f7c736" Size="242" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1600727" />
+    <Blob Hash="631602b9bb95e62a32619a93732de224d335c795" Size="807" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2096223" />
+    <Blob Hash="6316d0d6a5a7e6428792df1d9910cc6c35f7c736" Size="242" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1719959" />
     <Blob Hash="6317a9836f14220431bb41dcc3317517d2c4115e" Size="915" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1566177" />
     <Blob Hash="631a5e938d478fb6e7b239d63d42b5321f9913fb" Size="48123" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="106079" />
     <Blob Hash="631ade7126bab6c608903acde299c736c18af481" Size="189862" PackHash="21202e22c0d0bb13b84ef787938f1a2522405782" PackOffset="8" />
     <Blob Hash="631bafb71ba180e7d104d8f5fcca0f140628550a" Size="109693" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="584997" />
     <Blob Hash="631d58fb541add1704cf6b437628fef281783250" Size="39313" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1630377" />
-    <Blob Hash="631e9d792f0f2c006555d9a8c0ff369fea9b38fe" Size="2510" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2093660" />
     <Blob Hash="63233ed5ef71edfd175fe07297dbdbca6d038aaa" Size="4800" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1208284" />
     <Blob Hash="63263c89cc9685f1b3049e0c0d275b14ab75ee97" Size="17423" PackHash="2541352b0d8e22e6fe8137c01db1be4afe710d8f" PackOffset="8" />
     <Blob Hash="632a8a21e24e9385be1f877046cc1e35b8de0ac0" Size="227" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="123195" />
     <Blob Hash="632af083ce80bfdccc953ce2552460371149ecf3" Size="611" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1750299" />
     <Blob Hash="632b2a0224dece233568f6db731498216ce1c2e8" Size="20872" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="409993" />
     <Blob Hash="632d5df71309f1ff50fd663148147014e6157736" Size="9073" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1320460" />
+    <Blob Hash="632e6cff28ba44d6436ac3a0523b93d179452960" Size="5472360" PackHash="30a025557dc0f6d6cfc90e121a70c20341fc2d83" PackOffset="8" />
     <Blob Hash="632f17f1bf90ac20592239d7ca2e4ae91fd203eb" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1240866" />
     <Blob Hash="6330627c3273a95c3b2a7ec56a91a44a9544c04f" Size="156" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2096652" />
     <Blob Hash="6330ab880a78970174b2e842d574a564865210a8" Size="14448" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2057576" />
@@ -49621,13 +49515,13 @@
     <Blob Hash="635bec5e452bc4d7171c5dc0c9ffce8e8c7b42d0" Size="124" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1186940" />
     <Blob Hash="635c8b9f4975b1ba54377b60f539be6757c3b1b4" Size="7704" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1672488" />
     <Blob Hash="635d3c04f338d8aeff1852b03ff408162e2dd8e6" Size="226" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="826626" />
-    <Blob Hash="635ec6dadcc8eb110ef7eb4e60c4f31b72c70f42" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550883" />
+    <Blob Hash="635ec6dadcc8eb110ef7eb4e60c4f31b72c70f42" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670115" />
     <Blob Hash="636258cb9a2ace28d127ef4cc9c47705920afca8" Size="32198" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1340424" />
     <Blob Hash="636509ca4e89a54d59bc1bd23ba5ffca77745a02" Size="94" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2096763" />
     <Blob Hash="6366d996190c6918bf2b2678f315c46242bc70bb" Size="3226" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="415584" />
     <Blob Hash="636bca78dc9149aa1de0be2ad5da123b18fd16be" Size="3998" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1747957" />
     <Blob Hash="636c133f9cd2ff8b97d7440fd7ca960d44ca8a85" Size="417" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="363828" />
-    <Blob Hash="636d5d4f57b309d022ec7b1a17e271bacaa8c00a" Size="6209" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1736669" />
+    <Blob Hash="636d5d4f57b309d022ec7b1a17e271bacaa8c00a" Size="6209" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1855901" />
     <Blob Hash="6374b7540f206b9a9ab8c5cb3e2cbde7734fc2a3" Size="4590" PackHash="752108efcce0f1353b7bf7b6788e6d82a9890a4e" PackOffset="2090210" />
     <Blob Hash="637581cd0f43ce59c886bb3c59369fe7dbc6b898" Size="58824" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2009979" />
     <Blob Hash="6375a623340e9a3722c6860e4c1a8049aaded8a8" Size="358" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="897215" />
@@ -49635,7 +49529,7 @@
     <Blob Hash="6378c4baf324d5ad290233ba1a43eb1e4c0db26b" Size="473" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069699" />
     <Blob Hash="637932ce79466ff574b9add3cb89acde2e132dbb" Size="2277" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="2093050" />
     <Blob Hash="637f7be527460631095aa5a7b6e219eafb682097" Size="1915" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="483155" />
-    <Blob Hash="63822a08b9c35d7799c2b3a6f436afefa5aa28e6" Size="8509" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1803396" />
+    <Blob Hash="63822a08b9c35d7799c2b3a6f436afefa5aa28e6" Size="8509" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1987168" />
     <Blob Hash="63829cc388feced405190d4277c61e9e17425a7d" Size="18763056" PackHash="6029c2a5d414338800431bf314765b556944254c" PackOffset="8" />
     <Blob Hash="6382b5be23d2720ca9953a136ae6a03a0a4975f8" Size="6474" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="358565" />
     <Blob Hash="63896bb04943e21dff34d2f1c1385c99e5be1447" Size="192" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="512340" />
@@ -49646,22 +49540,23 @@
     <Blob Hash="6390a76935b9ce2533f50192ddb2288b1230f877" Size="1440" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="2057332" />
     <Blob Hash="6390e7dfef46fc2cc6db31f48f5c869fdb548e4d" Size="2009600" PackHash="8391db3b6cbd9a4b24f6114d956cbf68bff737da" PackOffset="8" />
     <Blob Hash="6394a1cb8930105e6a4e86f0957a95ee35f0526d" Size="6350" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="988134" />
+    <Blob Hash="639857cd7b9b8196a3cad6baa8412a09165f23b4" Size="789504" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="917512" />
     <Blob Hash="639bfc8126ed7d0376af88ba04c8f582a576a7b3" Size="58389" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2003430" />
     <Blob Hash="639dc9b3924827c5521917771577eb6213db5777" Size="440" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2088637" />
-    <Blob Hash="639eec45ed690582700b2fc4e03f970934c3d67b" Size="734792" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="8" />
-    <Blob Hash="63a26eb818418cb22750767d841be671a45bffd2" Size="11741210" PackHash="34cbbc060d97e8a94c249d309899488ccca27c75" PackOffset="8" />
     <Blob Hash="63a6571a7bf8f24ff8dd7f81cfb7ecdb5f1b7bc5" Size="621" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="805545" />
     <Blob Hash="63a6b592baadc57c5b528f40c334986e2fd660fc" Size="17408" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="154632" />
     <Blob Hash="63a9c14ce161256f8a150795571457720be01ee4" Size="6186" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1116444" />
     <Blob Hash="63aac15a68659006f8a14fec3f2a66b55a8ac398" Size="159" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="626445" />
     <Blob Hash="63ab030f228285b4f2738f02973e0e6427206edb" Size="9229" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1322463" />
     <Blob Hash="63af543e9cf929e3be0303bc3e044ef5046d6c9b" Size="8846507" PackHash="da7b12758710d9e2c5869e221e94cef9c9eedfc1" PackOffset="8" />
-    <Blob Hash="63af9e548a4f9e0df236131bf6ec70f4fb59bb74" Size="18240" PackHash="e5b3b0b0e0fcf3b7cd35801b8fc4b29528e1254c" PackOffset="2076320" />
+    <Blob Hash="63b0f99c12b36386ea6992089b1160132ea87636" Size="3712190" PackHash="c1601b980bf8ba0d87be5f2e8327ae5ae4a0521d" PackOffset="8" />
+    <Blob Hash="63b44b589a9ab65d12457a57560058a4151d228a" Size="1846256" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="8" />
     <Blob Hash="63b4e057c4b5d8c9c0329bcfc420fba5d24c8b62" Size="4268" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1788461" />
     <Blob Hash="63bc65f6af9314602e6a1f7ab85861c41b44bbc5" Size="1603" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="784482" />
     <Blob Hash="63be5b3fe17b293b44d852335d1f893b5ef8db6a" Size="5598" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="2083891" />
     <Blob Hash="63c3cf8f25b5ba0ef56510012a3ec5ccb3860689" Size="9428" PackHash="befdf31f38f4a4349047e8c06638e4b799ac0895" PackOffset="106345" />
     <Blob Hash="63c722a5425e8c57c6bbc842318d0bdaebe9f7c4" Size="24648" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1629580" />
+    <Blob Hash="63c870810630a46b142d047c8928d2c893906529" Size="5632" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="8" />
     <Blob Hash="63caa92dbca8678f144684994431765f2d48efed" Size="76299" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="1204065" />
     <Blob Hash="63d14a9c444c1aa5794d9e23d29059a939961955" Size="98767" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="847279" />
     <Blob Hash="63d1da68cd984532217beacc21b868b46ec5d910" Size="19136" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1287400" />
@@ -49682,11 +49577,12 @@
     <Blob Hash="63f31907431755ce8185fd18d6185a592c5863e1" Size="80146" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1071826" />
     <Blob Hash="63f34210282ce5c2736e8b6472af99736a628dc3" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="501280" />
     <Blob Hash="63f48ecbd7804199f94f5d79a804e88e7577894d" Size="47782" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="382584" />
-    <Blob Hash="63f4a0b9b2bc9d46c60b71c51a0cd93b8e7f3cb2" Size="2892" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1054962" />
+    <Blob Hash="63f4a0b9b2bc9d46c60b71c51a0cd93b8e7f3cb2" Size="2892" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1224996" />
     <Blob Hash="63f8339a4c9ba5e14009103f3c30c2371a5fc520" Size="52239" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="433871" />
+    <Blob Hash="63fb633ea22231a1b3235e51fd836b0849ff727c" Size="158890" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1541810" />
     <Blob Hash="63fcd0609043ab6f603c05d7c18a9bf704876261" Size="3296" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="399017" />
     <Blob Hash="63fd9d3fccee77d6ff4db2b6a83fff7a59f6a1de" Size="4800" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1068379" />
-    <Blob Hash="6400d7aa37812faf12b9f23fe1a22a00cdbbde0f" Size="160" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605312" />
+    <Blob Hash="6400d7aa37812faf12b9f23fe1a22a00cdbbde0f" Size="160" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1724544" />
     <Blob Hash="6400f19a2debdffbe08750f3613a1a0e68bc96b0" Size="129024" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="142856" />
     <Blob Hash="6401084964f5f757e903e91ac60deb49a9ca0879" Size="289" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="383676" />
     <Blob Hash="640702739733aaf6d62b7b3e3da57cf68c2e8d02" Size="97933" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1372088" />
@@ -49712,7 +49608,7 @@
     <Blob Hash="642ed571e4c6f60a953d42da4f756f2262e4e709" Size="192" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="624167" />
     <Blob Hash="643804694d3f9eb8bc619edb2e517471e5ae7328" Size="2023" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1009767" />
     <Blob Hash="643df16c168037e3d173af653743832f37e977b4" Size="8170" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="2056370" />
-    <Blob Hash="6444780b4d7be09da71f1e8a2821730f9249ecba" Size="16095" PackHash="70182d4ffd95b3a1288b6fca57446bba12264d0c" PackOffset="2080234" />
+    <Blob Hash="6444780b4d7be09da71f1e8a2821730f9249ecba" Size="16095" PackHash="f2222f469d6fd56f096ce2e7e5bc8835f6809f5b" PackOffset="2065944" />
     <Blob Hash="644620ee2b726b9f1c351581c9f43f74c7d2cf4e" Size="3082" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1247471" />
     <Blob Hash="64476e69926496469ab398fa7b204feca7e57be5" Size="972" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="518716" />
     <Blob Hash="6447dc6b6c7c9eb737190e1893342a1d1761d6eb" Size="18650" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="95834" />
@@ -49723,22 +49619,20 @@
     <Blob Hash="645425a4beedf51c6898a57f00698405ec25607f" Size="1873" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="943052" />
     <Blob Hash="6457576b359a9260252fdc55c353ceeec00067e6" Size="4866" PackHash="c52ad5d5dc97d3425d95ae17988831ac9410b438" PackOffset="2091236" />
     <Blob Hash="6458c03eaf838a6d6670827f2c854faa7ceaea03" Size="3411" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1041400" />
-    <Blob Hash="6458c824d6bf1a1dd88ef11684f8465ac034aa21" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551078" />
+    <Blob Hash="6458c824d6bf1a1dd88ef11684f8465ac034aa21" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670310" />
     <Blob Hash="64592fd3089cdad22af1f04c2641f9bed06ae2ed" Size="16289" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="871900" />
     <Blob Hash="6459c5fce61d83400e756ffc2baffb42321b9b4c" Size="4065" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2086807" />
     <Blob Hash="6459f80ddfa4964e0f6df05e0385d6a70745cb54" Size="14038" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="90890" />
     <Blob Hash="645a8071fbc4660000406f347691945c39a490ad" Size="1532" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1820672" />
-    <Blob Hash="645ce19c6f5fdb638bef00429a3d6da4e87a8c61" Size="12274" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="181153" />
     <Blob Hash="645d602c93374caca6527a4718671c8e3824e8c7" Size="88" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1704896" />
     <Blob Hash="645ee1a8ef6de04b1317b6ad123afb7f4fa82daa" Size="8236" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1837772" />
     <Blob Hash="6460142ab1be656bed9e42c2f83ee1d56a0d216c" Size="26884" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="2035040" />
     <Blob Hash="6460ea193c7be74e133d04d609374bb215a90469" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1052848" />
-    <Blob Hash="64659ecf8fbb7a2bf73aa1cbe619d3a1a5ffa65a" Size="1803480" PackHash="b018fd41d11073c25edcc108d13464586eaa8752" PackOffset="8" />
     <Blob Hash="6466d38c62e73a39202435a4f73bf5d6acbb73c0" Size="824" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1649790" />
     <Blob Hash="6468f26f64e8028f405ff7d7d50c2511af6ec3e6" Size="240" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="266057" />
-    <Blob Hash="646b39652adea558ee13e55bc7760027db6ddd89" Size="4332" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1792852" />
+    <Blob Hash="646b39652adea558ee13e55bc7760027db6ddd89" Size="4332" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1912084" />
     <Blob Hash="646cd3c73b39327a284b83b1a451f43698339459" Size="5874" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1098955" />
-    <Blob Hash="6471571bdfd6afa0f14d7b6640386f0cb21b93d2" Size="17420" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2044670" />
+    <Blob Hash="6471571bdfd6afa0f14d7b6640386f0cb21b93d2" Size="17420" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="2079168" />
     <Blob Hash="64756ff877b2eb91baed2889b3924dab6784df43" Size="181" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="579299" />
     <Blob Hash="6475b56e860d85fddc5d2eed4070a2f077f28a90" Size="199525" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="451695" />
     <Blob Hash="6476526f94a247c0ecf3b2813f2c5a4fb93e457e" Size="7611" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1568274" />
@@ -49753,7 +49647,7 @@
     <Blob Hash="64869aed179ed72721c0593c67f516ec9c9e06a4" Size="392" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="424546" />
     <Blob Hash="6486ba2bd3ce1443eb5f4af833e8172a6065f2dd" Size="4206" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="531595" />
     <Blob Hash="648893c802fe041e13e42c3278f65100fd5a4589" Size="102897" PackHash="ef60a0c38ea7162ceec2c523ef91f87a81f89cf2" PackOffset="899021" />
-    <Blob Hash="648a663530b0b64d3fd587a5c028c7164836fcf3" Size="1652" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="983103" />
+    <Blob Hash="648a663530b0b64d3fd587a5c028c7164836fcf3" Size="1652" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2029985" />
     <Blob Hash="64927dc99ff9547d69ccbf21c355c36ce926ea11" Size="4740424" PackHash="2e16189fb3af5c01a7d6771c6db72c7fef48214b" PackOffset="8" />
     <Blob Hash="6494634a914ff2b67b2a734f5a821eec29d58183" Size="3039" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1830702" />
     <Blob Hash="649b2a1ebcc743a85863d755613c092838ac4f16" Size="140" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="440308" />
@@ -49773,15 +49667,15 @@
     <Blob Hash="64b37d3156a94534f3ca926918360fb0ef44f243" Size="394992" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1351064" />
     <Blob Hash="64b3dc24ca091c5278d4662b829df591a61e68f3" Size="2455929" PackHash="0adcf8b7399354848f3b1659ae1bdfebe7c5fb54" PackOffset="8" />
     <Blob Hash="64b5cc067de758a88b5e9d400a8cff30dd476f9d" Size="259072" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="8" />
-    <Blob Hash="64b916219ec64de69911c7c085b6528d4b04774c" Size="16996560" PackHash="b1ba6d12a0508e4d69c90a2e586ab0c4a27ad273" PackOffset="8" />
     <Blob Hash="64be7c2aacc2dfec87e761fe67bef93af1fda571" Size="81757" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1790764" />
     <Blob Hash="64c2934d3fe4af767c1ce6f8b43cd8e8e7e3c1f3" Size="7942" PackHash="9e706e53abc7aef6bee92832b5e3f6b21e841536" PackOffset="8" />
+    <Blob Hash="64ce7ac69da694f83f30da3ada9151a0e0a49ecb" Size="1937344" PackHash="3dc42e03b3cf9ab3705939d5eaf2bfcd770d2792" PackOffset="8" />
     <Blob Hash="64d10e750c9556a9c953f5415722a990ebc0d2a4" Size="38912" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="1995784" />
     <Blob Hash="64d9668e2ee136a9f6d346c0948292bc17689286" Size="23132" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1345296" />
     <Blob Hash="64dda711b9ccbac367b8e57aaf531131f6fde84b" Size="788" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="804757" />
     <Blob Hash="64e341b45759f870f1570b4bb8a79f0db67a4619" Size="83646" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1994595" />
-    <Blob Hash="64e5c83f6c6eaa367cea599508e8cfc84d9d53d5" Size="1787768" PackHash="6fb91672d728f976248fa98ba0cd6cee6e7dee86" PackOffset="8" />
     <Blob Hash="64e8b4170f9598ca5bb14dc134652be43dcb515c" Size="2225664" PackHash="7945598a03da7845fd4315ad8beb6291de075139" PackOffset="8" />
+    <Blob Hash="64ea839fe0a11b12022e54bb5a418750479404fe" Size="77" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2097051" />
     <Blob Hash="64ec8ee091d439a314cc42aaab2344922388a50b" Size="2272" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1288169" />
     <Blob Hash="64ec91340c1d14b512a8d0560dd8f5ee3747c3e8" Size="970752" PackHash="0aea457d3fb14174a1cd037c649288b253c1cbe7" PackOffset="1093640" />
     <Blob Hash="64ed80f301d92ea133e8d0784a273fd63be4ed3e" Size="1783" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1221072" />
@@ -49794,13 +49688,13 @@
     <Blob Hash="64fbd812f0e657111d244f86af0a65ed9af0d81a" Size="3557" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1183795" />
     <Blob Hash="64fd649d2c598475e26579e2df651f6fcf0776c2" Size="6144" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="2087944" />
     <Blob Hash="64fe83240c8e6347c5a115aa3258cf6b6cfd1b03" Size="3383" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="341201" />
-    <Blob Hash="650272a99d513450df8c232181729f2f488d0015" Size="9908" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2079931" />
+    <Blob Hash="650272a99d513450df8c232181729f2f488d0015" Size="9908" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2084724" />
     <Blob Hash="6504b7626b335556aa1246c8939b95a9b747b672" Size="11824" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="589248" />
     <Blob Hash="6504d44c267557f6037090cb6894628c1c0c66da" Size="1339" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="945413" />
     <Blob Hash="65065046bc27438cb05088c19a4835e71f01313d" Size="2915" PackHash="a256d63248e60ea748a2577552e6a02d3e75e23a" PackOffset="17760" />
     <Blob Hash="650c6c5a627e6a79e204916b9eb5f4f33e0d9e74" Size="606" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="239675" />
     <Blob Hash="650e997ae5761f2b823ae719295162b28b733d19" Size="668" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1168280" />
-    <Blob Hash="650ec113f92b510564f6b9247490d3daf99b4c76" Size="10098" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1824794" />
+    <Blob Hash="650ec113f92b510564f6b9247490d3daf99b4c76" Size="10098" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2081150" />
     <Blob Hash="6510984b993ede06ae8bcf89cad5b951e6d3d30e" Size="2789" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1056847" />
     <Blob Hash="65109d64ae02139c02769d208d85be79bec86516" Size="7904" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="43541" />
     <Blob Hash="65143d375b8637f5ee62d5fe1b5fcea3e2432b2a" Size="6873" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="433510" />
@@ -49812,7 +49706,6 @@
     <Blob Hash="651df545f80f8c3b475a5b3524b7097796a46d1c" Size="7162552" PackHash="ac6b5f2e3524a96ce4d30066d07c9ac17d296e68" PackOffset="8" />
     <Blob Hash="65232b89acf28a27a7c62a050f388ec0b45ee506" Size="391" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1557264" />
     <Blob Hash="652370ef80eeecb588ce79b0a32443b1f6d225f6" Size="88" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2033696" />
-    <Blob Hash="6523cf46d2c9c5774dc5fe3249e28ee1ab906916" Size="18590" PackHash="8b5291f3f8f3ddb9d9fc8ad444abd28ce12847cb" PackOffset="2065492" />
     <Blob Hash="6525c8bc0902a8dde1abb1e18aab711251bb9412" Size="3882" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="984834" />
     <Blob Hash="6525e4115b206af3ccf1b0ee1e9f99bbf0e1b476" Size="45485" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1921522" />
     <Blob Hash="6526ebfad7cd968f69768c25af5c89b0b1eb57a0" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096756" />
@@ -49834,11 +49727,11 @@
     <Blob Hash="65475a47f60bdc957c17755d86b0d6157c746d2a" Size="4769" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2011672" />
     <Blob Hash="65476cc04742ac8e0567a07677e96e7d34d50416" Size="189632" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="976531" />
     <Blob Hash="65493a58fbb0c89c14b6a449bb8fab48d2bcb163" Size="1044" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="435844" />
-    <Blob Hash="6549ba6b831c54ec3c653c71c87c0c85fb2474f0" Size="50" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2097037" />
+    <Blob Hash="6549ba6b831c54ec3c653c71c87c0c85fb2474f0" Size="50" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2097107" />
     <Blob Hash="654ab21f011890b7ec0b5108f171fd682cbb6750" Size="74284" PackHash="a38b37f825644041da01364538208a9364d2f9d1" PackOffset="74132" />
     <Blob Hash="654ad34e9167474df294d8611bbcefd1e6375890" Size="8035" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1406255" />
     <Blob Hash="654be131026dc43ceb08a2a8728dc0fcdbc5ad27" Size="4146744" PackHash="718b44b64684f752c89244691d3ad66cabb01693" PackOffset="8" />
-    <Blob Hash="654ed004b61bce22996d1daf0b06b98490600ffb" Size="289" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1588068" />
+    <Blob Hash="654ed004b61bce22996d1daf0b06b98490600ffb" Size="289" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1707300" />
     <Blob Hash="654f49927c54e0bc26df7f7740aa237ae1c1c5b2" Size="2144" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1019844" />
     <Blob Hash="6551384894281e67a030056b3989f7f9b5d17fe4" Size="2824" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1629344" />
     <Blob Hash="655147b759128b9d0c311bbd0d4360e29347b050" Size="3994" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="2012106" />
@@ -49848,7 +49741,7 @@
     <Blob Hash="655db4f0b5f6f8d3f964161b49ae8ab4232589d4" Size="51" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070034" />
     <Blob Hash="655e032eec308b59a6ffb926ba703fcdda6d29b9" Size="2850202" PackHash="ec484032b520fec866cdce28e8eb0dc7931a4305" PackOffset="8" />
     <Blob Hash="655ebc409f879c3112bfa9833bb0e946bc969ab7" Size="22352" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1213376" />
-    <Blob Hash="655fce43ef66e0643b5b6e91774636373c5ba032" Size="1594698" PackHash="518b018d2f4ec622333a18fbe864ec2261d3e119" PackOffset="8" />
+    <Blob Hash="655fce43ef66e0643b5b6e91774636373c5ba032" Size="1594698" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="8" />
     <Blob Hash="656017add7e5558a92661c333ae9d8150280731e" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="258648" />
     <Blob Hash="65603cda5fc8dcad3bc9ae36e639111e59a1a847" Size="209" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="2096836" />
     <Blob Hash="6560ebded9501526a71f01355a8a61d30683fb5f" Size="209" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="840684" />
@@ -49857,18 +49750,20 @@
     <Blob Hash="6562a691b4b5b3e24cdf43ef3cb8da0ccd265da9" Size="214528" PackHash="65b22cf1b5681d751dd1073c0d445ef1a54d473e" PackOffset="1853396" />
     <Blob Hash="6562c428458912176a521678752dee6d69d15d37" Size="26130" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="173456" />
     <Blob Hash="6564ac29e5633ef64ee951e5ace2fc30966d1421" Size="235748" PackHash="d852eca7663f1c36dab87cbd527dbfac895faf97" PackOffset="1853332" />
-    <Blob Hash="656bebe7ad20fc4899c3af8ab012d47a24fdf8bd" Size="3554" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1139071" />
+    <Blob Hash="6566b2e2315b037d1e0d0c41d4a84c687a698659" Size="13505080" PackHash="ca761bd20034f501708660a7440a637a19e63349" PackOffset="8" />
+    <Blob Hash="656bebe7ad20fc4899c3af8ab012d47a24fdf8bd" Size="3554" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2085087" />
     <Blob Hash="656cdc103d68a2b89f0be9a9c671b72eb3978de0" Size="24875" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1852487" />
     <Blob Hash="656e2fd8f9d5b88d5400dc77785c8d2111455493" Size="2260859" PackHash="522258c25d250c4883f0f463c27529706246283d" PackOffset="8" />
     <Blob Hash="656e523d0c7d7fb07e36c277576a80bf71fbb002" Size="183296" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="531976" />
     <Blob Hash="6576fdc1337df51f743a57351dcebd80b8594658" Size="2042" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1722025" />
+    <Blob Hash="657a5271b616cba038a2b450238f6ab7b0ade443" Size="1825544" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="8" />
     <Blob Hash="657b3888500d0bf4713c52cd6b4c7b858d192bd5" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1606008" />
     <Blob Hash="657e3414b492fc08be7845083b66110fcccb1b33" Size="3813" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="2091788" />
     <Blob Hash="65800fbd73d9dae550e04e1d818a6b9d1aef86fe" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1062423" />
     <Blob Hash="658071010531b7a4c36c75588071aa176dcaead1" Size="46729" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="1457737" />
-    <Blob Hash="6580ec24e7d96ce63d03d92213a4adbd63bb4507" Size="9178" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1714598" />
+    <Blob Hash="6580ec24e7d96ce63d03d92213a4adbd63bb4507" Size="9178" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1730364" />
     <Blob Hash="658470a13461fb140cd18c482ca656f66403b9a7" Size="10304" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2085109" />
-    <Blob Hash="65868aba86426cdc48695472e43b5772eb5087c3" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553880" />
+    <Blob Hash="65868aba86426cdc48695472e43b5772eb5087c3" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673112" />
     <Blob Hash="65887805b428480068f21e87ced09bc8d5b61f8b" Size="6553" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1359209" />
     <Blob Hash="65891bca628548d5dfa2e42edb7d3273717706c5" Size="149392" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="411412" />
     <Blob Hash="6589543137fe95ffc1d49aa69c7e1d160f8202e0" Size="50114" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1550967" />
@@ -49891,18 +49786,17 @@
     <Blob Hash="65af4bcc2e27879fa79535184fc8ec0dfc862c77" Size="47553" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1642608" />
     <Blob Hash="65b6048bbd8723a58b005df8479801b4cc76b443" Size="102912" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="839854" />
     <Blob Hash="65b68f96117babc3f631903fd8290a9d9100d67f" Size="9857" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2045862" />
-    <Blob Hash="65b7839cc0d87bdfba59ebff21081d870ef67773" Size="3055328" PackHash="635bc97095ee9d7b6e73be1edaed0ed21c3b25db" PackOffset="8" />
     <Blob Hash="65bc07fc3a955300ed09b7485f90aec18cbad43f" Size="1200" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1093235" />
     <Blob Hash="65c20f4dd9a5d10bc5296421b30d840ab986a931" Size="23080" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="4323" />
     <Blob Hash="65c308f6caf4c6ee141f7c6b7c73afa10002a4e0" Size="704" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="368959" />
-    <Blob Hash="65c4f3ecde888aaa603a08430068aa0323c12f4c" Size="2587800" PackHash="e46e9b666d28b4e8fe6e2e994c5756689b4e746b" PackOffset="8" />
     <Blob Hash="65c5ee5d08964e37393e6a78aba0db16d51240e2" Size="1114" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2031909" />
     <Blob Hash="65c87835d28ba583a6adfbe85ad2e92e9ceac159" Size="9216" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="580547" />
     <Blob Hash="65cc1c0efd419b53b36f8e6f968dfcaffc856cac" Size="2704" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1022473" />
     <Blob Hash="65d01259ec2d987ca547bda48f3674da819a7ffe" Size="452" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1458505" />
     <Blob Hash="65d24eb1444b13c3bbf73930343a428aada478b2" Size="4454714" PackHash="0a5fd4afe7a8e3e343d8e730510653683e4a59f2" PackOffset="8" />
     <Blob Hash="65d3aa17fe20fa2ec7616ef60db81f2c802e8294" Size="9186" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="390941" />
-    <Blob Hash="65ea978bba6b8a1ac869169351cff0bf39db2f9f" Size="58" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552716" />
+    <Blob Hash="65e09a37069c4e436219f63461cf98282503c446" Size="114256" PackHash="9839cc83983264caf62cd87d042ba4cc1024cdcc" PackOffset="1868258" />
+    <Blob Hash="65ea978bba6b8a1ac869169351cff0bf39db2f9f" Size="58" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671948" />
     <Blob Hash="65faaaa68e2352caf042ebfac0df5eb568708c87" Size="160150" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1035171" />
     <Blob Hash="65fb41487b23cc17fe3cfb5a49a31ce8e3b72cc5" Size="1262" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2003575" />
     <Blob Hash="65fd38b93560200cebc2bd424a3f606c8d913967" Size="6663" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="6262" />
@@ -49911,14 +49805,15 @@
     <Blob Hash="66057bde2da612d3612d7a51227a160d6205d943" Size="86016" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="8" />
     <Blob Hash="66078485cac9309e674178b910e4cc4a9a398275" Size="26624" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1171464" />
     <Blob Hash="66094e767a3cc8889cb7cea1fc9cd3d59fbe3257" Size="5854" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="609066" />
-    <Blob Hash="66123f399a5e8b267b039f87e757806463c395a3" Size="755" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1452855" />
+    <Blob Hash="661097b5cb5e6e9c0e4fad4574971f41d0c57b24" Size="2049816" PackHash="a978ebda568515e85ff3a8f77239242d81d5a5e2" PackOffset="8" />
+    <Blob Hash="66123f399a5e8b267b039f87e757806463c395a3" Size="755" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1989937" />
     <Blob Hash="661465b84ea5c7f6ec63415807ec282ce0b31aba" Size="3660" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="1993375" />
     <Blob Hash="6618755ed12693f85e83232a4c792dc3e81f6527" Size="5953" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1973206" />
+    <Blob Hash="6619a4490235ad21406174bd97c34c4afa5a04e3" Size="431336" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="752128" />
     <Blob Hash="661a049c088732db9257e41d259e0921460b79db" Size="29304" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="967970" />
     <Blob Hash="661d119c86b60e2f664727ac1045dc986b284bce" Size="10693248" PackHash="78bfad613f4d6cee1f09370753a6477a8118b752" PackOffset="8" />
     <Blob Hash="661d3e7557e2c5c29a94ba1a78c92c0998f3a5d6" Size="9463" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="814774" />
     <Blob Hash="66245c1006ff12ed73f1eb06a16e6222f0ff2754" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096889" />
-    <Blob Hash="6624d11277aca67e1ede522cc1a4731aa609aded" Size="1394784" PackHash="b88c02646bff51270468e11717b11aca34a7c3df" PackOffset="8" />
     <Blob Hash="6625f46f36d493211a914dbf8e053359d83a7524" Size="5404" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1803957" />
     <Blob Hash="66274991ae139f20f5a8b0ea1da4a1f86223203d" Size="68256" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="547256" />
     <Blob Hash="6627de307feaa7d3dc03ae4d4d1684d4720fe0ef" Size="1457" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="702671" />
@@ -49927,10 +49822,9 @@
     <Blob Hash="663357b3fc4c6de4715880f75c72924b07bf54a3" Size="32758" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="554611" />
     <Blob Hash="663423abec4e393fa61e6cd80b2bb0d072263784" Size="3924" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2080174" />
     <Blob Hash="6635804cac01d86c4e9dbd003b7ce9c8cb7bd828" Size="16896" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="583176" />
-    <Blob Hash="663610385e00660aacc586f7affe10a12ec802de" Size="1024" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1302808" />
     <Blob Hash="6636e279300e5ca2cdca214002418989b693f73a" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="690152" />
     <Blob Hash="663c0c47a7fa2d73f4bc17b443a31859679b636a" Size="1592320" PackHash="7491079d020d11f40f14eb94536fe09006ff2c16" PackOffset="8" />
-    <Blob Hash="663cb9dcc474175b0ad14e2992057d5575b77545" Size="743" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1465307" />
+    <Blob Hash="663cb9dcc474175b0ad14e2992057d5575b77545" Size="743" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2002389" />
     <Blob Hash="66445794345878bdfcabcafe2dcee153562db55e" Size="39245" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1105616" />
     <Blob Hash="6644d07962a9ca5e7a7c28321ca2edceabb8a05b" Size="961" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="630933" />
     <Blob Hash="66486c5dd9f9417cb644578507d9ef76363d5b74" Size="232" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1370404" />
@@ -49945,14 +49839,12 @@
     <Blob Hash="665c0a94d2fc841371372c310869b98b18db75a5" Size="2821" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="742218" />
     <Blob Hash="665d791a52462c94886224c83d9aa30eafba5678" Size="258" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="192988" />
     <Blob Hash="6660cfde6af13b67a026109be9c291b6269ec008" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="732131" />
-    <Blob Hash="666394f34a217159874fab5c24b845ef05ee0b6a" Size="736254" PackHash="70182d4ffd95b3a1288b6fca57446bba12264d0c" PackOffset="1183666" />
     <Blob Hash="66658506e3723f6384da75dc2397c8392ca3d4a6" Size="2258" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="7468" />
     <Blob Hash="6667d7159e4bb2c0f35ecaee0f6866ccbe3a8f57" Size="18340" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1500456" />
     <Blob Hash="66697d42f1a0e96791366f05f6752016bc974c9a" Size="994" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="469848" />
     <Blob Hash="6671c4bb55789e5e1e35c49de3c6e366791cb0d9" Size="121" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="200356" />
     <Blob Hash="66736a734e2f854ef6d61011f769bcf54eeef608" Size="7292" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="428170" />
     <Blob Hash="6674ddc40eba28ba44e35fff340d2ccdeaee7cda" Size="918" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="2095605" />
-    <Blob Hash="66756c000691762c338a347919ff8b03c85b17b3" Size="89400" PackHash="b221596f9694d342526ce34110f4e329b8f905b2" PackOffset="1973114" />
     <Blob Hash="6678d58ef896d885cf78c1b3012fe00fb95f9384" Size="828222" PackHash="a256d63248e60ea748a2577552e6a02d3e75e23a" PackOffset="624502" />
     <Blob Hash="667aea5a203ca293f1f6b671c7c27792292eb35d" Size="524" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="2045163" />
     <Blob Hash="667e0a759bfcb7570be213b1611bbb18785beb4f" Size="3820" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1141480" />
@@ -49966,7 +49858,7 @@
     <Blob Hash="6687e518572105c16e97a43f9f93f93cfa45087e" Size="1978368" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="8" />
     <Blob Hash="6689740a54ee03a9ded278b8a92ca42619d4a256" Size="1357" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="665349" />
     <Blob Hash="668e329261dafbddece1043fb05763a3dae7646e" Size="3423" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1879884" />
-    <Blob Hash="668e98c66d8a11ef38ab442d9d6d4a21d8593645" Size="801" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1750014" />
+    <Blob Hash="668e98c66d8a11ef38ab442d9d6d4a21d8593645" Size="801" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1869246" />
     <Blob Hash="66908bd3803357c5b3fb50c739c077ad0c458e1a" Size="156" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1860722" />
     <Blob Hash="6690a62c884b087be32a1003bb8708bd6be71f8b" Size="1031" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="368490" />
     <Blob Hash="66913236306dcad3ca7235d12fca3ca465f9e206" Size="18506" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="210150" />
@@ -49997,13 +49889,13 @@
     <Blob Hash="66cb5ce65cce268eba166cab91a06201333e2efa" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1559657" />
     <Blob Hash="66cc2411255cfec5bab04788edf2c441c9d003d6" Size="905" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="97211" />
     <Blob Hash="66cd4974d32629b7b0db5590eb350fb7fd9533a3" Size="79483" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="125525" />
-    <Blob Hash="66d1bf88731b77a1d1ea450edb1c498f130e8ea7" Size="560" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1823815" />
+    <Blob Hash="66d1bf88731b77a1d1ea450edb1c498f130e8ea7" Size="560" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1943047" />
     <Blob Hash="66d2cf35b47bd26e650d1c54d333bc1bf7c74769" Size="164361042" PackHash="e07eaf9aa7769233b372a954ad60182277a96928" PackOffset="8" />
     <Blob Hash="66d34bbe4848a239cec8155083539e7d315bc9f6" Size="70722" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="54803" />
     <Blob Hash="66d41c6334d54031fcc4d384e5c0a862b90d16bd" Size="3809" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1177005" />
     <Blob Hash="66d4ac3524180cafa7e9967f96cb6bafc0cf0628" Size="14989" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="481594" />
     <Blob Hash="66d5ec8239c27b7e0cf5dbda08639a1503bdd1ec" Size="17058" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="2079752" />
-    <Blob Hash="66e045ba8989683a91542f0e09d3720be7272ae9" Size="1590272" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="8" />
+    <Blob Hash="66e045ba8989683a91542f0e09d3720be7272ae9" Size="1590272" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="90564" />
     <Blob Hash="66e06aac0b442bb92990beb49d659dfe3c536af1" Size="2761942" PackHash="433bb337cf42424c821c0c424f4f34511c6289bf" PackOffset="8" />
     <Blob Hash="66e07db8422b8a88b46274a371624dc828e705af" Size="1267" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1069573" />
     <Blob Hash="66e3ce910fb91e31db026d278f035dc49fe45200" Size="3537" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2079018" />
@@ -50011,16 +49903,16 @@
     <Blob Hash="66e73f1259c4424916f90f1f8e690d3d415d509d" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1133712" />
     <Blob Hash="66eb46a859c40d129f44a010d7e90d535cc1774a" Size="2496" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1430592" />
     <Blob Hash="66ecea23b4e8b6eb93ebdd82a334f51bbf0ef8d8" Size="3829" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="800890" />
+    <Blob Hash="66f238e107228787484e13de1fe1078beb782487" Size="10919" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2075250" />
     <Blob Hash="66f2b4564a49bf28dcd918a2db017a363a5af354" Size="1328" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="420345" />
     <Blob Hash="66f3603f5c68332ed5383639f3415a9af84db874" Size="17920" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1925249" />
-    <Blob Hash="66f9bae5765ba367d9feca465c682d22b73ba03c" Size="753" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1576321" />
+    <Blob Hash="66f9bae5765ba367d9feca465c682d22b73ba03c" Size="753" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1695553" />
     <Blob Hash="66fa55dbdad7932ed4b83ef3b5190f8f1f66a74a" Size="1333" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1877946" />
     <Blob Hash="66fc3ea3189a916f03f89dc040365409a2c9833b" Size="4667" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="509931" />
     <Blob Hash="66fe499a8f43d09f30925df4c594a1a2f656f01d" Size="3957" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1188705" />
     <Blob Hash="66fee4ec3c99300722a787f437c00ea2be3b95cc" Size="736" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="218606" />
     <Blob Hash="6701004577e0327f6166c6db4bcb38ce699e3bd7" Size="3758" PackHash="fa48ff18c8bfe5de58cfd0b9f5fc9ff52ec1b1da" PackOffset="9900" />
     <Blob Hash="6702e2169f7ad25cfdcf2d5ff3e00e847efc3168" Size="4584206" PackHash="eaea434c65e3ccf8cec643ea1ec391bdddbc6fac" PackOffset="8" />
-    <Blob Hash="6704b0fee79fa4795dc04e0111fac4fc46f611f0" Size="2306" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="2091446" />
     <Blob Hash="6706eb13de25d00872c92effdd6c76528096ec9b" Size="346916" PackHash="705810a107813f391dbcf74972f321782aedc6b8" PackOffset="8" />
     <Blob Hash="670a7d6db984a54fb2a9c6721ba9703af657a0bd" Size="6351" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="579126" />
     <Blob Hash="670b7c1eab45d3ff7ab41f34ed5333b4d1966d75" Size="1796153" PackHash="c90fc965239f89efbe2d5742fb7bd3c4b9584c36" PackOffset="8" />
@@ -50036,7 +49928,7 @@
     <Blob Hash="67254689f198caa56819915102faef3eb1996389" Size="1134" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="363873" />
     <Blob Hash="6725f14bdb65011bf3a5b17bbd8465ab640f9b64" Size="2744" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1138618" />
     <Blob Hash="6729fdd8e6e6e2e41ab05143485bebee5ba699c5" Size="82944" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="255496" />
-    <Blob Hash="672a188ab9bcbc9795e01bac771e73269998321e" Size="230976" PackHash="8983a85b417d4dfab9181da926c6653da0f6d483" PackOffset="1799600" />
+    <Blob Hash="672a188ab9bcbc9795e01bac771e73269998321e" Size="230976" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="1661420" />
     <Blob Hash="672a5afbd69921fd54219779c07f535fbc8d3cf7" Size="1297628" PackHash="b057ac2c230db468bbf6c00e375d15f9e6b3c3cd" PackOffset="8" />
     <Blob Hash="672ccd9fe94a6850d1f16f48295004a3a3465e2e" Size="9229" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="877475" />
     <Blob Hash="672e3b60befe266cf3f7d636e78f6d949fac2973" Size="4358" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2066627" />
@@ -50050,7 +49942,6 @@
     <Blob Hash="674175c52e150f56695209ce5747d47040898e33" Size="211325" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1269402" />
     <Blob Hash="67451382fd2551534a826b051b7e9f0b081383de" Size="123394" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="8" />
     <Blob Hash="67453c5551167cfe16585e045e68b4e36d97cadb" Size="188203" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="1613836" />
-    <Blob Hash="674746b0bea112cf707dd15bab4af56061c68de0" Size="1730794" PackHash="b908c38d5678751ae00d63d781c9351a63072c27" PackOffset="8" />
     <Blob Hash="674938927fc9aa3609640f281032164e2ba73db7" Size="8100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="356680" />
     <Blob Hash="674bc0823e9c50d42d9bd8248eeb101a737c7b6a" Size="6136" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1816783" />
     <Blob Hash="674cf95b7006d44070455e51f29b356f7f4d4c82" Size="216" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="896440" />
@@ -50071,7 +49962,7 @@
     <Blob Hash="67618f4865436245eb4b3260fc5e1ad852c80d03" Size="2955834" PackHash="024bcfcb9b188c17e4a0d1bb7c167a95db254fa9" PackOffset="8" />
     <Blob Hash="676227c54920b318fd303af8349f179e569688dd" Size="1734" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="2095405" />
     <Blob Hash="676862b43ca46e90d16598706cbcd36fe39199ec" Size="5826586" PackHash="ad2fb8e24d847ebdbf707a2ba885e26579870aca" PackOffset="8" />
-    <Blob Hash="6768aeb184d7b913e1f9149e33a69d6057a2d968" Size="788" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1433006" />
+    <Blob Hash="6768aeb184d7b913e1f9149e33a69d6057a2d968" Size="788" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1882059" />
     <Blob Hash="676d3231ba2034e71b5a1413412274844ca3b84d" Size="1268" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1982324" />
     <Blob Hash="676f6fe3260a4a1508d3ba2a41e12b49d6a6ed96" Size="7372" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1232380" />
     <Blob Hash="676f88f2df9b33906b2074bb7fa71e0ec9efe841" Size="33280" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1162633" />
@@ -50082,18 +49973,18 @@
     <Blob Hash="677df76b4137aa6d1108472b7d6d32acf766515f" Size="16647" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="2060441" />
     <Blob Hash="677eae00b7313ae28c3b26306038ac22f677fa00" Size="104131" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1511974" />
     <Blob Hash="67843d0833bd6f02f40fcdcf02bd8c7ba3a9da67" Size="2368166" PackHash="634409f01a1eb5ce1c6d172a12443b31c0ae9fb6" PackOffset="8" />
-    <Blob Hash="6785acfbe0ce5a0101388f8af41fd24e17262a75" Size="7054" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="2083904" />
     <Blob Hash="67860f317cbc7883101d779dc17cee1ab818aceb" Size="782" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="2087870" />
     <Blob Hash="678af55efbdbe5d94120693593752e25894b9eab" Size="55216" PackHash="e106ce3ce1a7bafe780e72f090f349e0d66c2db2" PackOffset="2018172" />
     <Blob Hash="67907afda4a0fc301e49f6befa402317840d413b" Size="166320" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1397887" />
     <Blob Hash="6792f1e361f08dd1a60ec8eed2b8904e47b65b57" Size="8137" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="681129" />
     <Blob Hash="6793eb3edbeb462ff7e97554475244427121d615" Size="133767" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="905908" />
     <Blob Hash="6797855b70738285f84ba8cc7ce75547b8eca10d" Size="885" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1355264" />
+    <Blob Hash="679cbb38e8dccdae85576e76ee82e0c0e9c13a48" Size="5965984" PackHash="bbdd556df8f2031c4132701766096b49a291227c" PackOffset="8" />
     <Blob Hash="679f9057f4b660e2afc25454a59c0773e7705581" Size="7983104" PackHash="67ec8a81edafddc622b0373cd416020f9e66960b" PackOffset="8" />
     <Blob Hash="67a0da2d987b376c586946e18cb6a10d3bd0442d" Size="4906" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="1523661" />
     <Blob Hash="67a2184202401f8616a05cb5db923ae830a2a1c7" Size="7424" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2085864" />
     <Blob Hash="67a3ed215f5a36bc1077ac7b16cc5d36f0d11f70" Size="127277" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="1674064" />
-    <Blob Hash="67a5543ae4ea2c99cfb2cf2fcca0efc2a3b949b5" Size="35" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2097122" />
+    <Blob Hash="67a5543ae4ea2c99cfb2cf2fcca0efc2a3b949b5" Size="35" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2097119" />
     <Blob Hash="67a64db5c3c5a3b64f0dc42e2d46f45d725bbb38" Size="1146" PackHash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" PackOffset="2077838" />
     <Blob Hash="67a67b0103e84b5c4af8dd772362da85590bff28" Size="1920" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="512691" />
     <Blob Hash="67ad78ba788d493b65a2a4156a74ce4ca5e9d107" Size="26918" PackHash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" PackOffset="2027062" />
@@ -50102,7 +49993,7 @@
     <Blob Hash="67af6bfa65815efc7d1f189edb2750f97f9ee67b" Size="630" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="535017" />
     <Blob Hash="67b2435f8d6ba1da78c40d76cd95386b02a804fd" Size="177589" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="114323" />
     <Blob Hash="67b36caf82d3346e5c40f2cec9f6c7511a1de1b1" Size="242929" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="1244195" />
-    <Blob Hash="67b5a3e6ab1ba26986a22751f9e017924160b06a" Size="495" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1664991" />
+    <Blob Hash="67b5a3e6ab1ba26986a22751f9e017924160b06a" Size="495" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1876710" />
     <Blob Hash="67b7897549f44efc2b20d2f331357fe9ef5401ce" Size="14040" PackHash="4879bfd25446fc703aedf81275bf1de7bedf0913" PackOffset="2080186" />
     <Blob Hash="67b8f2865800b46043c75aab2276b8e67ec341c8" Size="166102" PackHash="7c5339b6b1382c59c12893376db1f10162f6653a" PackOffset="1855701" />
     <Blob Hash="67bcc2246c12f1c1432654b508adce5345beab47" Size="1068" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="2055484" />
@@ -50113,7 +50004,7 @@
     <Blob Hash="67c468934c2e626021ae5faefb730eb697d9e9df" Size="2559" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2028349" />
     <Blob Hash="67c4d6519ec9e7d2e07e4b5d5f8d789267eb74af" Size="1272" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="114792" />
     <Blob Hash="67c5a5ad4b410ab3063c2c4c26eccdcdaf9107e6" Size="141284" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="262149" />
-    <Blob Hash="67caf780ee104fd9f9f92b435fbf292201094b59" Size="19472" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2031112" />
+    <Blob Hash="67caf780ee104fd9f9f92b435fbf292201094b59" Size="19472" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="1956858" />
     <Blob Hash="67cba6f7fe2dd19b2640a7217cd968177bf100aa" Size="851456" PackHash="167a3b509221baa789dd8c568b74ddcaf7c4a7c5" PackOffset="8" />
     <Blob Hash="67d15a45c61122ce680b829fe0fa3a1c501a8c8f" Size="203" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="155063" />
     <Blob Hash="67d168b1f0728ac3eb92f809ea3f409e94e7b8b2" Size="1750" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="2094442" />
@@ -50134,10 +50025,11 @@
     <Blob Hash="67f6881c0542fa2bf316396984045f670cb36350" Size="394" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="273675" />
     <Blob Hash="67f68a63ae7db7853f399ef4f3ebc4297d2da24d" Size="1697" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="810702" />
     <Blob Hash="67f7a2fc2cb44ccb9405d836021297079c33f3c6" Size="351003" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="673704" />
-    <Blob Hash="67fbeee039c4f9ee18c531a8a6a51d490208fd3e" Size="2945" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1276579" />
+    <Blob Hash="67fbeee039c4f9ee18c531a8a6a51d490208fd3e" Size="2945" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2058197" />
     <Blob Hash="67fdf42d325e1790d7841221a0912f925c19df55" Size="3152" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="995411" />
     <Blob Hash="67fea5ed9cb37ad6bbf3a678920f0cfb6c0997da" Size="221991" PackHash="36a132c9f653eef8303192fea1f02b6c80bdaf81" PackOffset="1567982" />
     <Blob Hash="680073d799916d1ae1b17a97a75e9defc04077c1" Size="3813" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="799655" />
+    <Blob Hash="6803740b8a87893d82e11a9bd9e1f4018a3bf26b" Size="81523712" PackHash="a1cfe895a3708a33f62b399d07d28e2cbc241b25" PackOffset="8" />
     <Blob Hash="68053c7e4787bd127efd75fdc8fcf199d035388e" Size="29696" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="1787400" />
     <Blob Hash="680b39fbacb483d60b135037edbf4b152a829729" Size="6064" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="390112" />
     <Blob Hash="680db0f1d86de0bc986c026904bf762a915bd4ce" Size="8360" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2055392" />
@@ -50147,14 +50039,14 @@
     <Blob Hash="681b64a72804d190ba762db4df93523417145a8b" Size="5564" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="401846" />
     <Blob Hash="681c0b212bceedf8244c912d98312f1f273e6409" Size="1033" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1378179" />
     <Blob Hash="681d7765f117cf9203bdd2f2f6dcb5c79fe559fe" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1857339" />
-    <Blob Hash="68207ff16a4ac312f54ff27eaf5618a6117a5d43" Size="7078" PackHash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" PackOffset="2089818" />
+    <Blob Hash="68207ff16a4ac312f54ff27eaf5618a6117a5d43" Size="7078" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2089394" />
     <Blob Hash="68245d2158d1fec93f208ff9f9bfe9af4b4b7b49" Size="47621" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="360821" />
     <Blob Hash="68268b4ec0d48a520ebf9a2f0d646fb795c6e7bf" Size="12906" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="1530728" />
-    <Blob Hash="68275e1ebc691185d8ea8b4100e771733d3ee25d" Size="3597474" PackHash="99280a1646dc7bce47bef8b4de9547b4cd7b99ea" PackOffset="8" />
     <Blob Hash="682953396605b3425ecc91c87db804c970d768fb" Size="357223" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="473450" />
     <Blob Hash="6829d122cb6626e0aec557e4b6e137ff603cc184" Size="9611" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="194074" />
     <Blob Hash="682a7b5ee77e0ae38e514381b222fb6b5429fa22" Size="39654" PackHash="2f9f7a639a6282348d60a9900c9db7e8afb26445" PackOffset="1953288" />
     <Blob Hash="682fd02ae82b295ff1f58952867a52338d14b1de" Size="2844" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1143936" />
+    <Blob Hash="683132b313e7b5fa1d380e9232b1237ae95eb83b" Size="3302" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1832299" />
     <Blob Hash="68370622eaa481f552cd7b53cd682054a9b20327" Size="231" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="356246" />
     <Blob Hash="6837cfe703a839b6d42eaae96930294004037b18" Size="531" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="266297" />
     <Blob Hash="6839923f9e2d816e57a8fcaadaac0c6e215341b4" Size="1324" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1758522" />
@@ -50166,6 +50058,7 @@
     <Blob Hash="684afc615731c0cb2ad315abbdb79e8f0174503e" Size="11096" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1673921" />
     <Blob Hash="684cebe96211a7b911f0d171d09248b415ef145d" Size="9965" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="297048" />
     <Blob Hash="684de3ed901bbc35a97a1dabaefccf11b2393f3c" Size="171" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2096929" />
+    <Blob Hash="684de9963f3f44352d8f325eb38095785d87dc24" Size="6959136" PackHash="98641763a08c59a08284d0787a7bdfa52594eb3e" PackOffset="8" />
     <Blob Hash="684ead965d9010c2a6e73dcacb2224fde585f9ff" Size="265" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1014462" />
     <Blob Hash="684f3b0e8cb4bcae2cff3751c4876094a6153e99" Size="115200" PackHash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" PackOffset="1978232" />
     <Blob Hash="6850d3ae3be73dca388e905b4c2f923c5b6453b3" Size="2915" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2036989" />
@@ -50178,12 +50071,10 @@
     <Blob Hash="685e8937ac18e3812750b2265def599ccc2a8aa7" Size="20617" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1608324" />
     <Blob Hash="686176a57122262d9dcf6d5a817c6b57c36a9b4b" Size="1918879" PackHash="6efc780c466db7177e8a59e693d673c4f6ddaff0" PackOffset="8" />
     <Blob Hash="686783262725d88260bca19191692e19575209a2" Size="71" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="669983" />
-    <Blob Hash="6867e1208d9ff1f0e35c44312d8607993244af25" Size="3299" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1243343" />
+    <Blob Hash="6867e1208d9ff1f0e35c44312d8607993244af25" Size="3299" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1692245" />
     <Blob Hash="6867e9780049face9984b7788b6f362b8d1ad718" Size="2359" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1114773" />
     <Blob Hash="6867eab030056862508c1066e34bbe48c68dcb16" Size="1472" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="930575" />
-    <Blob Hash="6868133848d66a326ceed64304df6d6dacff9cdd" Size="25340760" PackHash="d6948a07c83f4bc8a3c53202489f9015dc6b1a2e" PackOffset="8" />
     <Blob Hash="68699638eb3db4b7b7caa3aba325f2b2de22682d" Size="52298" PackHash="4d1bdf23243f22a22f47e3c5b8af421a43324250" PackOffset="2018084" />
-    <Blob Hash="686c4aa50fe812e8d0edecb1f560f5125ed7b091" Size="7296" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="664733" />
     <Blob Hash="686c837133faf63ec6f103352bc805a518e00c3f" Size="44138496" PackHash="3b0581b2cfa1f89cf3f50dca1d7ab675e213e6d0" PackOffset="8" />
     <Blob Hash="686f2ce0b7aee1d0d0eb3a80aae70fa68ecb3eb5" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096948" />
     <Blob Hash="686f4c7c32416bd999706c768cc641de085a57e9" Size="6384" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1119731" />
@@ -50221,9 +50112,10 @@
     <Blob Hash="68b407458c025d19ce9e69af44d142b652a664f9" Size="1752" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2094142" />
     <Blob Hash="68b98f0ef65f6ad953c822b2568bb079ba17d548" Size="35999" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="501237" />
     <Blob Hash="68b9e338f6befd433dc216b576b03c80efb6c2e9" Size="55296" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="379912" />
-    <Blob Hash="68ba91b36df592fe7d7a62f38b6b7cd0a188b859" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548537" />
+    <Blob Hash="68ba91b36df592fe7d7a62f38b6b7cd0a188b859" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667768" />
     <Blob Hash="68baf5ea65e7707ae83ccecbdb04f9a1a17d8245" Size="419" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2096676" />
     <Blob Hash="68bcc67928102a1004a15ff30d476ad7d5bcbb11" Size="40" PackHash="c40e5337fb15243fce02dcae546c81693c08866e" PackOffset="2096923" />
+    <Blob Hash="68c1de26d47f9194d3e15e1d1b4da551b41087ea" Size="1810016" PackHash="097882ff4f782476be1a4962baf5872eeb7e54df" PackOffset="8" />
     <Blob Hash="68c2cd7713dcb26aa5054a2cba92c28947bc3ae0" Size="1060828" PackHash="705d483fe64b1f9075c585950375f4e0bdf711ce" PackOffset="8" />
     <Blob Hash="68c49f29b70209ca336dd0abe0d69ffa1131ee91" Size="54807" PackHash="a03bb1d2a4614125f33bfe2bab39d84653cda033" PackOffset="2038792" />
     <Blob Hash="68c62aaabf2a6de27aeb2b181c80011096c7066b" Size="1031" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="973370" />
@@ -50250,11 +50142,12 @@
     <Blob Hash="68f1da27f5b3120ba69e48d39f8b72a0daf37693" Size="1352" PackHash="faa641df952d93274d1774a37ecd0e58a425c5a1" PackOffset="2095441" />
     <Blob Hash="68f4a0d496085b02269675e34e5820d15825f555" Size="15880" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1506208" />
     <Blob Hash="68f4ec2a1b1dc0deae089ea8411bb17b624ddab8" Size="9152" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="415969" />
+    <Blob Hash="68f5756c8b4a9a0fd26df0c760d36f5c13e67158" Size="1941140" PackHash="3726f8567de19acda762812bfd9dff62242da925" PackOffset="8" />
     <Blob Hash="68fa7aaa93b11061444d760fe2f83302772acfba" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081028" />
     <Blob Hash="68fd70626f105c75729ecd94a0773f68ded821ad" Size="73972" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="676358" />
     <Blob Hash="68fdc7c80f036edffd5ff00ca15602c09aabab7b" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2078942" />
     <Blob Hash="690025bd02b615e1bc9785579e41d1a4caf186ff" Size="3312" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="464637" />
-    <Blob Hash="690205b07b00d0d075228fa9b68dbf31c6862b67" Size="70" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555544" />
+    <Blob Hash="690205b07b00d0d075228fa9b68dbf31c6862b67" Size="70" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674776" />
     <Blob Hash="690233755e7d2c3789f1a2ef3278830d51f013c6" Size="14995" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="11671" />
     <Blob Hash="6905a9296ea8d3316c95535cc01f387c02293c67" Size="299" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="947599" />
     <Blob Hash="6907809af3601dbbac8a82a7f3ef83024a2e3dda" Size="2969142" PackHash="b3ff22b76cc9c56c24c09020504db91b489d3205" PackOffset="8" />
@@ -50271,7 +50164,6 @@
     <Blob Hash="692b6d475bc9f5df1445ab90fa13bd64c0b3fcee" Size="5717" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1575772" />
     <Blob Hash="692c2916ad7514dd0980c3b6eec6909455fc19e1" Size="3084270" PackHash="c5d96be22ab15049ead8e69fd879af977ef60021" PackOffset="8" />
     <Blob Hash="692c62c0cd15f36853dc15b2ac13ef46ff75e3bc" Size="5234" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="936092" />
-    <Blob Hash="6931c91cb003c83c364a1f9fa237525da1a1c21a" Size="7404808" PackHash="6a0a8e62fa61c3f3bd8e63ae460c4c5ce758a443" PackOffset="8" />
     <Blob Hash="69326ac8ec8d32ce7bfdabf2f37a5a897843e962" Size="8653" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1885135" />
     <Blob Hash="693650b4ed358f9b38532ae4ce1ae1a55e7d7aa7" Size="5094" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1565470" />
     <Blob Hash="6939cca0ef7770988797e18034b2c02bc979d1b9" Size="676" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2096462" />
@@ -50280,11 +50172,11 @@
     <Blob Hash="693fbc63173ef97c841e91796ec4f2d56ea52f3b" Size="61440" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1691477" />
     <Blob Hash="6940737107700f1ca207e82bf1a4a120a92e682f" Size="1420570" PackHash="858de213a099ae751d4748be354bdddec041c44b" PackOffset="8" />
     <Blob Hash="6941c5917e4ac097fd374708d0cfb8f41b7c835f" Size="1052" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2071368" />
-    <Blob Hash="6941d4015b62276be43cb7db59689e291ed559f6" Size="31378" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2024182" />
+    <Blob Hash="6941d4015b62276be43cb7db59689e291ed559f6" Size="31378" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2055268" />
     <Blob Hash="6944348a3d6a0a0b4105184acbed697b0b5b5b19" Size="2994" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="204253" />
     <Blob Hash="694564460dd06f399f083a8715720a27f2c7046e" Size="408" PackHash="6b0f64a3a5090f00c5d8405cb5c1684a396951ac" PackOffset="2030161" />
     <Blob Hash="6948ab0321a7de73c379c0f217698f4ab287b577" Size="2459984" PackHash="b9353d6df8687c2355bc28c57b1d53e08e1f42a6" PackOffset="8" />
-    <Blob Hash="694a67aff6f7f3620063f55c65bc06822f9ffd42" Size="2567" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="970897" />
+    <Blob Hash="694a67aff6f7f3620063f55c65bc06822f9ffd42" Size="2567" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2017779" />
     <Blob Hash="694c2d05c5018ce109a02630c84184068d92ae90" Size="1479" PackHash="c13461ed1911167f67309f624048d3b72b77286d" PackOffset="150875" />
     <Blob Hash="6951f00c95e02f743558f60dc092d5eb7f38cb22" Size="77609" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="135111" />
     <Blob Hash="6952f89c6ffbf3301b7b3bac9685684d85151e92" Size="5288" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1943294" />
@@ -50299,7 +50191,6 @@
     <Blob Hash="6968280ba18a91f7d46e7bd327e62569ea3f2fad" Size="3391" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="1454956" />
     <Blob Hash="696be75b241c1e695294bc4a9b9f20628de6c3db" Size="41538" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="576219" />
     <Blob Hash="696ee266ae0058afe0c62ba9920b7b77635cd1d3" Size="4208" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="701179" />
-    <Blob Hash="696fec063728d52f3e8a24a46cd8aa10e2d353cf" Size="3302" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1383397" />
     <Blob Hash="697311c5124b3998487074e76b07e43fe2a475b1" Size="5888" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2042800" />
     <Blob Hash="69731f2392910cac5725dd47eb098f046cf6ecb8" Size="619" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1349084" />
     <Blob Hash="69750e6c1ffad0239291191987aadceb6b9461e9" Size="279998" PackHash="b2c80b92ad374247169fcc8baed57834533ed5ca" PackOffset="553816" />
@@ -50311,7 +50202,7 @@
     <Blob Hash="697fb756616e0791b8c7fda6cc9645a0df448fa5" Size="5102" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="536442" />
     <Blob Hash="697fff67728fe308d1dca907f8f3c0ef6ec85161" Size="358400" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="864264" />
     <Blob Hash="698520bc8da1fe34911684a8aa14203195c1aae6" Size="13456" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1983666" />
-    <Blob Hash="69860ad2493026cb484c5f2af808e89c6063eb92" Size="4592" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1806709" />
+    <Blob Hash="69860ad2493026cb484c5f2af808e89c6063eb92" Size="4592" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1925941" />
     <Blob Hash="698a46df1d747d79229b0e525c0b63d13a70e914" Size="386" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="124294" />
     <Blob Hash="699684cdd9277713b5e84ed63a164cc54c5e66bf" Size="6614" PackHash="7c5339b6b1382c59c12893376db1f10162f6653a" PackOffset="2057767" />
     <Blob Hash="6998ae1c5bbb49f9c214abb40acb937719ec4707" Size="181059" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="563516" />
@@ -50319,7 +50210,7 @@
     <Blob Hash="6999a9898fc0190d3b1c9c6fb8b41f1a6485f55b" Size="66942" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="443487" />
     <Blob Hash="699d5a0aa6c61d12a8c6b9d9bd4ca9cbf889b366" Size="370" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1431746" />
     <Blob Hash="699dbf7213288e0330cb255806375a93273566ac" Size="141" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2096996" />
-    <Blob Hash="699e27b38f310b4015cd067b7117b9911d488355" Size="20461" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2019961" />
+    <Blob Hash="699e27b38f310b4015cd067b7117b9911d488355" Size="20461" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2033535" />
     <Blob Hash="699eb5c620cb33bcaa462721103d55522e37ce58" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2097004" />
     <Blob Hash="69a0d6641d43879e2ae1e8717f9f78aba5d12eea" Size="15610" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2063752" />
     <Blob Hash="69a36d88a02f21a037d491ded675bc2d4c8373d0" Size="2184" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="176544" />
@@ -50343,7 +50234,7 @@
     <Blob Hash="69cd3be1a5d207a6e0c99dfd5d34cd53c5c3e65c" Size="2909" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2027997" />
     <Blob Hash="69ce64dfe77cd4e7cebbb6ca7eb695a22c4c2a30" Size="30270" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1826708" />
     <Blob Hash="69cefd2617f0af1aa5559af48bca8c4a15b677fb" Size="1378644" PackHash="4aac38fbf89541859c14c7fbf320b1f9deb410f4" PackOffset="8" />
-    <Blob Hash="69d2b039fff40fb4adff7282c6720ce781a3f077" Size="3602" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1076375" />
+    <Blob Hash="69d2b039fff40fb4adff7282c6720ce781a3f077" Size="3602" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2017109" />
     <Blob Hash="69d2e4eb123e133dd2f59dee556ffadfc8d1410b" Size="237" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="835990" />
     <Blob Hash="69d54f77318ab18095e34ff9f7a4c1c94982f1e9" Size="7944" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1921036" />
     <Blob Hash="69d6eccc8181c912046dc11d82bae60e5474b35f" Size="729" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1493138" />
@@ -50358,11 +50249,12 @@
     <Blob Hash="69eee12add5857f3944bd2b5ee7e285656784d01" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="752648" />
     <Blob Hash="69f018205a3ea0e9a51ee35836d98ddc72243103" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="951115" />
     <Blob Hash="69f0a038e0277e14b0e427bfcd449084107726f8" Size="8566" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1759212" />
-    <Blob Hash="69f11674d7230a77675a649af7a48ac57a7efa94" Size="136" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1824375" />
+    <Blob Hash="69f11674d7230a77675a649af7a48ac57a7efa94" Size="136" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1943607" />
     <Blob Hash="69f2265d106389bb56bad0af6d28b479222664c1" Size="3608" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1585112" />
     <Blob Hash="69f29c9b2c70f50c81cb28a74da3750d7bbf6c0e" Size="55080" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1711001" />
     <Blob Hash="69f4897eaf6b7ca234846b65a0bf0eb78c4854cf" Size="4167" PackHash="e235435af47d241bf8a32655040bb6bcca173961" PackOffset="2090978" />
-    <Blob Hash="69fba3c892d63414c3259103c6a8254c7443a27e" Size="39" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="2097118" />
+    <Blob Hash="69fba3c892d63414c3259103c6a8254c7443a27e" Size="39" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="2097115" />
+    <Blob Hash="69fda8050b85c5ea7bee5fcbc4753a37eda869b7" Size="39943876" PackHash="c8d1212e469cf0c655332c2e4bc976b53c3fa27c" PackOffset="8" />
     <Blob Hash="6a002ccc728f4dc27d3424f4265bfe2dddfccdd9" Size="16208" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="1493875" />
     <Blob Hash="6a04a20a14d650728710504990f119eeae1148ef" Size="13686784" PackHash="595ac64a23cb8677dc3cf7e1c96fd4fde82bef05" PackOffset="8" />
     <Blob Hash="6a058d25792264304b989a0c0ce38d6e8cd77c88" Size="11" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="2097145" />
@@ -50383,26 +50275,26 @@
     <Blob Hash="6a1af4de1c3ba138bfdbf33d9e8dbea265b94748" Size="3022" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="92556" />
     <Blob Hash="6a1e98729e1e41e83215cf8c2daf3e4b163d2808" Size="196346" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="1387727" />
     <Blob Hash="6a1fac00a303e4d6065f5a817959d96664372249" Size="96" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1164428" />
-    <Blob Hash="6a2122bcb40af8b090e57fe01bc5052aa298694e" Size="1094" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1563528" />
+    <Blob Hash="6a2122bcb40af8b090e57fe01bc5052aa298694e" Size="1094" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1682760" />
     <Blob Hash="6a21e4054bd6186dbea7d325b1d0680737ea83bc" Size="5907" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="98289" />
-    <Blob Hash="6a240695be6a42af1db4a8309af3e6d1743efbd8" Size="2997" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2020379" />
+    <Blob Hash="6a240695be6a42af1db4a8309af3e6d1743efbd8" Size="2997" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2081800" />
     <Blob Hash="6a241cbd1c358dd0edfbc347e8ed22ce9f850791" Size="13093" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1268098" />
-    <Blob Hash="6a272c0e97ea0bf48e3cd8d0bdcfe0538d60d5e0" Size="58104" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="414226" />
     <Blob Hash="6a281565a7ab0e6b002981184cf3f7f075185016" Size="210" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="152133" />
+    <Blob Hash="6a2cf693897d99564744ddd1270fb86ff53cd3de" Size="2158806" PackHash="fabe7f1fe4532f262e19f4d02f3bbd2922640831" PackOffset="8" />
     <Blob Hash="6a3301a60cc6d0f25f655874161bb06291c833cb" Size="25056" PackHash="0b650b20c8c8aba9b4ffbfff4555352296b8026d" PackOffset="2071830" />
     <Blob Hash="6a330ef710b494287c52ad016aab923ee2ddf9ab" Size="4124" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="722831" />
     <Blob Hash="6a350b76eb3dc21de16c4e0b780eac4736446d7a" Size="232" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2094380" />
     <Blob Hash="6a3a1d226e4eb9f36b7aa9ee158b0bcf581482ed" Size="28237" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="812993" />
     <Blob Hash="6a3b6056d6646e67ddfee5c1090ed6fdad8c8610" Size="10240" PackHash="5098f795311987869f91ed638f4c0a395312211a" PackOffset="2081800" />
     <Blob Hash="6a3ba681df7b88e267527170af7189f9c25c1ec7" Size="17777" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1311545" />
-    <Blob Hash="6a3ca627deaae874014d07cb03c4c95eb528605e" Size="1736080" PackHash="b911df4ae64ab3f8f9aa7c7cbaa8b0d078cd39f3" PackOffset="8" />
-    <Blob Hash="6a408df36387bca62cb43401d2552eaceebc0401" Size="230" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1606671" />
+    <Blob Hash="6a408df36387bca62cb43401d2552eaceebc0401" Size="230" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1725903" />
     <Blob Hash="6a40f1c7e42a386fc66ac9f88792b75ad0067651" Size="1404" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="558784" />
     <Blob Hash="6a410725697b091a0eb1b63aa9f94a1050d792a9" Size="903" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2043010" />
     <Blob Hash="6a44ddcedb91d911a0510978b0754a7436921d93" Size="32121" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1976981" />
     <Blob Hash="6a45907e2029a700cf31825ef45151eb8a6eea7d" Size="196388" PackHash="a72777b59db815500e14e5d580278ca8aeb0af3c" PackOffset="359461" />
     <Blob Hash="6a45d3d72b602726218df6793958cdca724389b3" Size="2280" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="813721" />
     <Blob Hash="6a4a35b81d850d4a88bbabbe1fd1af82c88c1c00" Size="362" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2091737" />
+    <Blob Hash="6a4d7312a688598cd248ff606169182fea7cdde0" Size="2205" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1838172" />
     <Blob Hash="6a506ba7a8fb871f9da5e0f63db846814286f7d6" Size="817" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="712011" />
     <Blob Hash="6a5b027062363890a37382125e723a8d0c7fcb97" Size="67096" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1967007" />
     <Blob Hash="6a5df333d25dc9472db8f61fcca7789b0f2b4e0c" Size="3188" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1016794" />
@@ -50426,7 +50318,6 @@
     <Blob Hash="6a8f00b7ab14dabfcfabe188f5eb84dbb9adb790" Size="29368" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1212488" />
     <Blob Hash="6a902f2f2d6d2834ea11eb7062764dfa0a1301a1" Size="12543" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="960244" />
     <Blob Hash="6a90c7a53038ef5680fc44e0ccbb43a0e8e59be8" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097012" />
-    <Blob Hash="6a9147cca096169b28773dd079b530471c7f03e9" Size="45062" PackHash="d45c65e5f0c78b3f9b0946abb1d05a7c58a84e84" PackOffset="2040576" />
     <Blob Hash="6a973a855d6879a6b4bc8b26314ff9684ffbd4f4" Size="2095" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2017183" />
     <Blob Hash="6a98c665c7eded38384523bc1b0489c0e2939fd8" Size="215627" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="1683362" />
     <Blob Hash="6a9cee1575141c08b154605385e25aaa61040751" Size="1396400" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="8" />
@@ -50445,17 +50336,18 @@
     <Blob Hash="6abd9d85b465f989a27f7eaa9168e8596bded2cd" Size="4172" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="997228" />
     <Blob Hash="6abe67dc347b07dec7d1d4f52733d315cd0a79a5" Size="1220" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="261445" />
     <Blob Hash="6abe6bebda0700387d16d6b4ce975784e3fea679" Size="1375" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="736300" />
+    <Blob Hash="6abea1f481b9522d811347807d364eaff6f0b92b" Size="14692840" PackHash="bbff2e74e44baf391963a56aaeb1d3041a3fcd29" PackOffset="8" />
     <Blob Hash="6abf2e67c73ebee1db15bd87c5f9a78e39dd1b4a" Size="10169619" PackHash="b049ec652d384ada45c56ef33228c2cbf0f3e158" PackOffset="8" />
-    <Blob Hash="6ac894ba511b39b465dc93b76ddaf97f12c46eda" Size="47184" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="705256" />
+    <Blob Hash="6ac894ba511b39b465dc93b76ddaf97f12c46eda" Size="47184" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="762664" />
     <Blob Hash="6ac9fd742042a41976be25f2c2417bf1584ad680" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096852" />
     <Blob Hash="6acdf0db619b63e21ec89046b9320a85fbd3397a" Size="10211" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="346645" />
     <Blob Hash="6ad4c7f1294b36021276bd78d4b4bcdf117b0eaf" Size="7125" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="876277" />
     <Blob Hash="6ad6794af06720956274d0985b7a3775bcb1f652" Size="6712" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="2090029" />
     <Blob Hash="6ada4d7c4b90753248ceb8d38ef1f71093e71309" Size="414078" PackHash="5d27bdeb9d64abf65499f00a1952e59a73cde03e" PackOffset="1515104" />
     <Blob Hash="6adbb0596940fcf6cb2b96e4a401f3389793bfac" Size="2822" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1258271" />
-    <Blob Hash="6adcb7dddd09af36ba29e171237554646ecd33b7" Size="1537" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1035493" />
+    <Blob Hash="6adcb7dddd09af36ba29e171237554646ecd33b7" Size="1537" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2083469" />
     <Blob Hash="6adcb91e8b39e3aac88212aa3949e5924223e86f" Size="64125" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1484713" />
-    <Blob Hash="6ae0fefb80b6fa5b5b705bc5d007db935e2966ee" Size="111055" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="1968715" />
+    <Blob Hash="6ae0fefb80b6fa5b5b705bc5d007db935e2966ee" Size="111055" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1285921" />
     <Blob Hash="6ae41c34d80f26447ace3e09fa630bc9b2375e81" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1319827" />
     <Blob Hash="6ae42f88b6b32e51bd521c56a0c789506c16e022" Size="1716" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="2093689" />
     <Blob Hash="6aec1756cc579cdac9d7a4bcb59124257b6b3b03" Size="82643" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="821967" />
@@ -50468,7 +50360,6 @@
     <Blob Hash="6b064b40c48d41e665769190216cac72f186f29a" Size="4517" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="845068" />
     <Blob Hash="6b0a6646e283c401da1ea056abb9665b301c5b38" Size="240" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="609401" />
     <Blob Hash="6b0b9bec6bf09cd2deaaa416855262007073ded0" Size="12756" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1825378" />
-    <Blob Hash="6b0d6b37d79684f951ad0b74e40adb128e42d921" Size="357" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1785167" />
     <Blob Hash="6b0da75617a2269493dc1a685d7a0b07f2e48c75" Size="526336" PackHash="638489a089df7fb447a4d5149c4fec6d4faa0dbb" PackOffset="1562120" />
     <Blob Hash="6b133207b0d320523d0967ef5f14da95291575f6" Size="94208" PackHash="66fce169b160f3c4cb868bda8653b37692b5692b" PackOffset="1707528" />
     <Blob Hash="6b14e2f3f9997beb95745278621f5dcc7bdd9e43" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1886060" />
@@ -50489,7 +50380,6 @@
     <Blob Hash="6b3375b9c2f1b75d6e384f5143599d345f1934d5" Size="10176" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1312310" />
     <Blob Hash="6b365b294d94cfe8d18ab4a53a6b738a3f5f5558" Size="3072" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="839919" />
     <Blob Hash="6b36f00dc08b84b9d3b6eb65aec1213e930c21a7" Size="1723" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="396428" />
-    <Blob Hash="6b3b27080fdd1e438fbba3dfed1574e12f6e9702" Size="1604600" PackHash="49ba5b57543f91a9bedf6b1c6e96550e308fb74f" PackOffset="8" />
     <Blob Hash="6b43df7d5adc8a42dc8e9708cf36d736c1367e94" Size="5694" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="627802" />
     <Blob Hash="6b44402ef859be44b506104515d0c22c4a10b326" Size="9252" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="603417" />
     <Blob Hash="6b4953d12f6be8b5c86ced4edb6681d8111fbbff" Size="20717" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1917281" />
@@ -50508,17 +50398,17 @@
     <Blob Hash="6b720a3c07e6ddf7e7a4b85a17bf6f5341b2f72b" Size="3541" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1836931" />
     <Blob Hash="6b72a22aa01a451f22c0a2f919108c6b154f5e80" Size="2694222" PackHash="f6965e23ff5ff474a91e97ba3a1b9005a3e1e165" PackOffset="8" />
     <Blob Hash="6b74098f3a2343239c8718b8cd666ed9e43d00c2" Size="43782" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1173216" />
-    <Blob Hash="6b7433231a289c23044d3a9e8acf0ab50765883b" Size="2184640" PackHash="4eda992f6e15853fcc5f140b5cd197dd50910dac" PackOffset="8" />
     <Blob Hash="6b770b40b189043526a0a8123a57a291cbca0034" Size="5661" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1943901" />
     <Blob Hash="6b770f5f96e7a077e603b1ebf22d871dd276031a" Size="3187" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1147576" />
     <Blob Hash="6b7cb773ee2cced4489b86b13987089ff0955004" Size="28160" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1730373" />
     <Blob Hash="6b7d3fa098c8a3a70fb7e92bdbb0fd0a1c36bfb6" Size="321968" PackHash="cfaa6e2212f937f340e867175482030d495675ed" PackOffset="726519" />
     <Blob Hash="6b81303d96ff34a4842ff6b8b607cc98b5afaab7" Size="34" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="2097055" />
     <Blob Hash="6b83da355751b140fb7cb1b29d024230c39c0d1f" Size="4384" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2091488" />
+    <Blob Hash="6b8475d49a1415ad982740aca26ff4c6044fb727" Size="1441634" PackHash="0b08539c1aa236659f1a3bd219781383fe153175" PackOffset="8" />
+    <Blob Hash="6b8e6f0ada5d0b6e5b8dfb57810ede412c585920" Size="559612" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="1460136" />
     <Blob Hash="6b8ee68d2190cac382a26e7899103549913f3d5e" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1195528" />
     <Blob Hash="6b8fce859cf3a129f063bc3d0b647ef18c774d94" Size="33466" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="620138" />
     <Blob Hash="6b914fc4173b301774780040d15c708197aa7391" Size="3940" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="827835" />
-    <Blob Hash="6b91dbcfa43c9ebf07573c27e72c45b29654cca9" Size="12297918" PackHash="c4a4d8e4b57ad3f98cdee7532aced8006406bda2" PackOffset="8" />
     <Blob Hash="6b9228bdacbb073f0e6b38f59a4bc8e755685ace" Size="237" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2064880" />
     <Blob Hash="6b9378029ad8687d964f9753b9f4dfbbc45794e3" Size="4676" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1420264" />
     <Blob Hash="6b9c3012ccb7f0a28d3a35229b59645f5aa8a3cc" Size="105956" PackHash="937d324929a7f4271842efe0f422cffe7e1c760f" PackOffset="1958972" />
@@ -50572,6 +50462,7 @@
     <Blob Hash="6c158dbee67a7a538bc9b2b9d55bf369a19eb21d" Size="42421" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="925505" />
     <Blob Hash="6c15d8f81debeb237648841b87fc6b7f13366bd3" Size="2932" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2088088" />
     <Blob Hash="6c2153af8355a565f5a7519ad0c33f885fe75eba" Size="12842" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="421176" />
+    <Blob Hash="6c217b2f08399750189a9303208bc1c321b4af70" Size="309832" PackHash="a57929556fea304cb2fa2583c8e6fd31b8f632f2" PackOffset="1562226" />
     <Blob Hash="6c22e77a7dd03dd23fd3c8fe042680b80e10b24f" Size="309296" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="368071" />
     <Blob Hash="6c23065fd3b9bd8787a48a5906576eac59fa224c" Size="30056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2050539" />
     <Blob Hash="6c2502b6ddca23a406998c3146da29c7691cc3dc" Size="316" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1895524" />
@@ -50579,12 +50470,13 @@
     <Blob Hash="6c25471d9ad4e65db7af2b4b9f8f15a014e980eb" Size="2056926" PackHash="449cc04a3686c66e7ee57ed693a4c3b8b8d87c70" PackOffset="8" />
     <Blob Hash="6c26d57d5e9b7d6b2bd247a9ecd2829ab4606706" Size="651512" PackHash="867c8f6848fe0f1bf3ae16f592b929fc747e9679" PackOffset="1036172" />
     <Blob Hash="6c27bdcfb4508098b22256ce420b286aa3d40c3e" Size="12352072" PackHash="5d2a4009ade291686d29f74daa3498941a47d597" PackOffset="8" />
-    <Blob Hash="6c2e0d555aae7d7ab499cac0a48b1c661db80c02" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556464" />
+    <Blob Hash="6c28c05360a22d0c34958d1d047a18182bf93123" Size="2271484" PackHash="9a498d896ebd60ce77a0c26e6bb8b853b4bbfe65" PackOffset="8" />
+    <Blob Hash="6c2e0d555aae7d7ab499cac0a48b1c661db80c02" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675696" />
     <Blob Hash="6c2f5348739122594d78edac9f38b6555ad661ae" Size="4011" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1205962" />
     <Blob Hash="6c37d8902c95cf8c5a2270634ddc5cd6a4c92c16" Size="19" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1180478" />
     <Blob Hash="6c398c5e96563a82d2903e2f758796190531e38e" Size="1837236" PackHash="235fb9da70c74afa6b41598b1f178262b96dd2b4" PackOffset="8" />
     <Blob Hash="6c3eb2631ed534fcc36ec0b3c973c6b1a49bf755" Size="607232" PackHash="30e198f7f7cb931d8983952a5cbb799f45aa1367" PackOffset="1350664" />
-    <Blob Hash="6c40133a3c8f5cbfdf46753bdcac4c4220db8869" Size="215172" PackHash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" PackOffset="1415294" />
+    <Blob Hash="6c40133a3c8f5cbfdf46753bdcac4c4220db8869" Size="215172" PackHash="015c8801a8906be93a066c86046bcd911350f5c4" PackOffset="1856976" />
     <Blob Hash="6c432f86b4a440fcfd5524276807b2d171eb1d52" Size="200" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="840210" />
     <Blob Hash="6c45fc2b8687c5b92b5088eaacece264f5083605" Size="64932" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="1969382" />
     <Blob Hash="6c465352a93c4afc9950903054602b0ba6e89a90" Size="6502" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="384891" />
@@ -50597,7 +50489,7 @@
     <Blob Hash="6c5879c12548f826961f189dea82e6b3e04f59f7" Size="37384" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1397224" />
     <Blob Hash="6c5cf19e7b3106f2465850c8736438a431d1cf78" Size="440162" PackHash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" PackOffset="372596" />
     <Blob Hash="6c5ebac3e5470b575244cfda8699199a6f10ade7" Size="38760" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1769629" />
-    <Blob Hash="6c626e4a592b2b1d268a9c2e058529aadd35386f" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550239" />
+    <Blob Hash="6c626e4a592b2b1d268a9c2e058529aadd35386f" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669471" />
     <Blob Hash="6c664dae93225f1782c0299c9a08292dacb57382" Size="96568" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="96495" />
     <Blob Hash="6c671abdc4bc481ed6d162d378ac35f91d66ea57" Size="29562" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1360259" />
     <Blob Hash="6c673b7ea7d87041fcb0e9d8e1183d19d6f7711f" Size="204196" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="1756615" />
@@ -50613,6 +50505,7 @@
     <Blob Hash="6c7b04f588327c5023300e22d3d0dc9e0c5d7199" Size="16648" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="74276" />
     <Blob Hash="6c7f7654dc72141d2486d4d396cf20f825bdb9de" Size="5668" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1797638" />
     <Blob Hash="6c83e617c944a7ac403c23564cc60b761425a9fe" Size="65137" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1173201" />
+    <Blob Hash="6c867436d795f6cb129e14e9776acd55b5d57f52" Size="2411264" PackHash="cfe3cc7ff9c0610fda854e53c7d0e9ab91d6a4f1" PackOffset="8" />
     <Blob Hash="6c86c43cf56903bd4635850d0456dba4f0b3ebcd" Size="97171" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="433440" />
     <Blob Hash="6c8bb32ca72487a9cbeee8317e8e78683c1a3078" Size="4823" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1045080" />
     <Blob Hash="6c8ebac0858649063d16fb45eca75c99dcc49f5a" Size="171865" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="1412564" />
@@ -50624,20 +50517,19 @@
     <Blob Hash="6c96eca3561c1693a9153e3e7dbd2a018b770fc6" Size="3024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="888883" />
     <Blob Hash="6c9748e6323917ccfed6b8264becba5ed97553fe" Size="1883" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="276169" />
     <Blob Hash="6c9a21d287b8fb40d26be2a0c7d7f7564cb721d7" Size="178" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1982501" />
-    <Blob Hash="6c9a7e738c02476e9d9c87800d422d4ab9c50fd3" Size="5314" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1798082" />
-    <Blob Hash="6c9feeb956e31923a95736f247244ae9bddca6e8" Size="21215" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1834892" />
+    <Blob Hash="6c9a7e738c02476e9d9c87800d422d4ab9c50fd3" Size="5314" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2090503" />
+    <Blob Hash="6c9feeb956e31923a95736f247244ae9bddca6e8" Size="21215" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1905108" />
     <Blob Hash="6ca5b41311fb76cfa43d1ac7aab122cb2781b132" Size="2601" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1846764" />
     <Blob Hash="6ca61321f01867a0078b3bbcf7cb71d62488183a" Size="7478" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="363283" />
     <Blob Hash="6ca6f48c6576e74a4d3cf7c7e4cd3d8f79cba18a" Size="1734657" PackHash="80692ee126e647cd28189fde8ceed8c0dc1a4c6a" PackOffset="8" />
     <Blob Hash="6ca7292fd41bf86e723212412691a3a4bd719759" Size="7749" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1301735" />
     <Blob Hash="6cab997e19fac2e17c9af559dce36ad048248013" Size="1565" PackHash="64f8a861ea0499b2ce969a0970e024d43314522e" PackOffset="279010" />
-    <Blob Hash="6cac391dbafc207874f1dfb6513c21650a14f1b5" Size="1362" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1888507" />
+    <Blob Hash="6cac391dbafc207874f1dfb6513c21650a14f1b5" Size="1362" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2016561" />
     <Blob Hash="6cac629fd8201c3a9ab5424aaedb18bfc6be0c0c" Size="10250" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1662603" />
     <Blob Hash="6cb0b7a25d4a79310aa348baca14ba472230af02" Size="18134016" PackHash="aa4c9f30618629561139b6cef568eef634a73c51" PackOffset="8" />
     <Blob Hash="6cb231d37843165b7e7592b1030416d794a5cfcf" Size="27609176" PackHash="7ed22a7ef1a00c1e207e95b40e3c144e45ba66de" PackOffset="8" />
     <Blob Hash="6cb2b38e05e6e71c0757ee6ce84434cfe705fe59" Size="3462" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="2090922" />
     <Blob Hash="6cb469df9ac3142c6061a4fee98fcc28f033405f" Size="97288" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="278773" />
-    <Blob Hash="6cb7b8a5ba3fbf3bf2648c93d4daf01031292bf3" Size="13416000" PackHash="e24dd0c09219e50f0b1813e1ec8cd33af1dfa67d" PackOffset="8" />
     <Blob Hash="6cbc370e61ced30040c482699887fe81b5b43845" Size="3790" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="964180" />
     <Blob Hash="6cbe552d3735ac3ee73df3a848beb82aeccc8256" Size="2109563" PackHash="b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f" PackOffset="8" />
     <Blob Hash="6cc003e5fa2d1b8a581aa97762f1093f1427ca6a" Size="18452" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1439543" />
@@ -50647,7 +50539,7 @@
     <Blob Hash="6cc31fb0deaebd0d93ccefaa18e181a050e8fa2a" Size="3776" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="803468" />
     <Blob Hash="6cc842fb53d6886a99dd6eed3545910356902895" Size="18708" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="373124" />
     <Blob Hash="6cc9ed63d17f6d766569b553ab0d260d22afc7f0" Size="27136" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="1694728" />
-    <Blob Hash="6ccf46cb9a8d0b7ea28ffd61e4cc34f2f39f6808" Size="255656" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="1814484" />
+    <Blob Hash="6ccf46cb9a8d0b7ea28ffd61e4cc34f2f39f6808" Size="255656" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="616276" />
     <Blob Hash="6cd5faa836b3a00da26e23956a255891c655cd60" Size="5678" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1164245" />
     <Blob Hash="6cd7079e33f24bed98e17ea44ba783dfc330c2ad" Size="96974" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="1347080" />
     <Blob Hash="6cd8d7fa6f1fdfe7207ed989ad21ac589cf7c4ae" Size="8151834" PackHash="09b220dceaa8205e3a32a877c58c678dfdb8555f" PackOffset="8" />
@@ -50658,7 +50550,6 @@
     <Blob Hash="6ce2ea8439aa6870d686d119f8c09ab6b7fa3718" Size="1415" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1904238" />
     <Blob Hash="6ceddc46f970b6c450c9c3fe24b243983a3aaf96" Size="322" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="369521" />
     <Blob Hash="6cee37c3501b57dda1867aa2b234865906c9a435" Size="85456" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1010590" />
-    <Blob Hash="6cf4e339a029d9486b28bf4b80acb2716bafac2a" Size="336" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2035429" />
     <Blob Hash="6cf50ca9c5ab0c1b12eca50a32d6549f4b6d8b92" Size="6697" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="100190" />
     <Blob Hash="6cf5950e163f8ac2c4d89bb117380b1bd88e51c1" Size="1484" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1430908" />
     <Blob Hash="6cf5d9888de81e69a5954c9d757d99395d156b48" Size="3624" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2031359" />
@@ -50680,12 +50571,12 @@
     <Blob Hash="6d208ab87483fe4144647e06d5ee0b3da6e8eaff" Size="3832" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="2005543" />
     <Blob Hash="6d21c8d8f57dc5001ab377f785ebfb77b6419c31" Size="122932" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="1374607" />
     <Blob Hash="6d24435e4e61ad8472573fce330cb391af444d94" Size="1029" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="2094584" />
-    <Blob Hash="6d26549492b3ca4abcf09e05746319e6bea346c9" Size="875" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2024290" />
+    <Blob Hash="6d26549492b3ca4abcf09e05746319e6bea346c9" Size="875" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1913625" />
     <Blob Hash="6d29dac2eb6881b5cf22ca8619b5cd6ad9b28873" Size="9520" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="124280" />
     <Blob Hash="6d2b0116bfb3ad60a63a7c3a245ed3f2315fd130" Size="2109" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1116150" />
     <Blob Hash="6d2bc12071385ea04ce9af87df48acfe8b32f4aa" Size="103556" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="1965180" />
     <Blob Hash="6d2d83b6cef0d54739190fe26c2911d40d63d0ed" Size="52736" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="1455112" />
-    <Blob Hash="6d2daea940a894cebd6c041d2ac9de261809ea17" Size="17965" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1989029" />
+    <Blob Hash="6d2daea940a894cebd6c041d2ac9de261809ea17" Size="17965" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2009096" />
     <Blob Hash="6d2fbbb97800badf6509e1f13e5646035cbddcac" Size="54567" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="667946" />
     <Blob Hash="6d34ed2aa6b5e84529eb1200d7365e5caa967f7e" Size="27508" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="1087501" />
     <Blob Hash="6d39896408a6a80dc3bb8b03adafe17601a2960e" Size="19237" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="454740" />
@@ -50697,7 +50588,7 @@
     <Blob Hash="6d4952e601d47badd2008538fade6d0dbd649988" Size="102912" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="433007" />
     <Blob Hash="6d49d2f01fe1bc0feb89dbb6e6b6556f384cfca1" Size="127329" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="256353" />
     <Blob Hash="6d5196cd80ac232779c118a56ed4259161236b82" Size="40448" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="1418674" />
-    <Blob Hash="6d53ddf4bdca2b7b5ef952196c2341d3602b4062" Size="8071" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1694104" />
+    <Blob Hash="6d53ddf4bdca2b7b5ef952196c2341d3602b4062" Size="8071" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1709929" />
     <Blob Hash="6d55631d103e1ac82b9c3f78b7cd0d81d2352d97" Size="641" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2092272" />
     <Blob Hash="6d57e272aacf853339db6688f22ffff950b64096" Size="45056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="156576" />
     <Blob Hash="6d5a04a6611a63dc4529b4ef1e0f618f92abe516" Size="156081" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="945373" />
@@ -50705,7 +50596,9 @@
     <Blob Hash="6d5dc0bfbd905fd6abd26b90e1bd51209f9924e5" Size="9173" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="812365" />
     <Blob Hash="6d5fd531a50c7cd6bd65ec6083623f950ee4b4e3" Size="24368" PackHash="8575b29003613867e1d7350c5f55d36d96bd7283" PackOffset="2071467" />
     <Blob Hash="6d5fd82feec7a0d1324f459990e45431bc8f2ce5" Size="8288" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="484800" />
+    <Blob Hash="6d615f2a80f4889f438a8708041dc0baa4497ba9" Size="130026174" PackHash="5e4a2c13809e3f951013f75907412a07983641b8" PackOffset="8" />
     <Blob Hash="6d62cb82d85c26b16252d946791c7ed4e1e91c1d" Size="23050" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1639562" />
+    <Blob Hash="6d642ed16babdbb13abc5644809c5d2e25d68710" Size="14880" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2052292" />
     <Blob Hash="6d6533bba0369e24f22aec322af2d8da36d1e588" Size="75776" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="1910488" />
     <Blob Hash="6d6774f97e28b5b68e02e76c54005926123ec591" Size="2304512" PackHash="7054b730a39f0d762ba1602fbca946a38a8811cf" PackOffset="8" />
     <Blob Hash="6d69d8d29af200156a561b1a65a2118ffbbd069d" Size="27056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="960016" />
@@ -50717,10 +50610,11 @@
     <Blob Hash="6d7501fe8873240746936c43d39eed076be424d4" Size="6769" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1559814" />
     <Blob Hash="6d758799aee0f16d1fc24b94bc35abcca1b29df4" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2014505" />
     <Blob Hash="6d77697126c00afcfdbc97b88fd44016fb0fdb44" Size="5465" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1245830" />
-    <Blob Hash="6d77dab4cba2737f045d94fbe40f7ede5ea28dff" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552282" />
+    <Blob Hash="6d77dab4cba2737f045d94fbe40f7ede5ea28dff" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671514" />
     <Blob Hash="6d77dc662d7f80a5bece9399cc4057b990e0f92f" Size="2539008" PackHash="2c391f34048aae95fed7d9649088e50dc62d614a" PackOffset="8" />
     <Blob Hash="6d7898808e7a3ea50bb8ee72e16be450aef226d1" Size="12632" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="222456" />
     <Blob Hash="6d7be6f42b82705d8e936c8078162a6e438cff36" Size="14857" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="492942" />
+    <Blob Hash="6d819bff4f1c07ec7722ec7085009ee20c2a382d" Size="14699771" PackHash="e3c91c5b04722adb88d32b7ce84f96691b8134de" PackOffset="8" />
     <Blob Hash="6d841689a1b67e14dea92922baa419808c969ffd" Size="512" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1833880" />
     <Blob Hash="6d84b0e12ba1c2fca5e3b881ef74ac85010bc0c2" Size="28003" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2049887" />
     <Blob Hash="6d86ca9dfc546347b3cbb451d7fce1163f2898b9" Size="1445020" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="8" />
@@ -50734,7 +50628,6 @@
     <Blob Hash="6d966078e833d2b7e4fea8f575ccff13078647a9" Size="769444" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="80773" />
     <Blob Hash="6d9d0ddd4396553384ade89ce5f5167b91775da9" Size="2508" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1355644" />
     <Blob Hash="6da08ffe893176cde0525b86c0ee25c50928fa9a" Size="179402" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="1908602" />
-    <Blob Hash="6da2836d425fb56fa018d3f980a3a8723c5475e5" Size="2149" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1342333" />
     <Blob Hash="6da551f3206c1f3e2eadc66443fe661c920c5c9f" Size="5551" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1223900" />
     <Blob Hash="6da809adf0c544e22403b6b237d8e1bf5aa7dc04" Size="3247" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1697129" />
     <Blob Hash="6daefbdc91e8fdf652f1386dec5830ec2bb82051" Size="37742" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1644532" />
@@ -50743,6 +50636,7 @@
     <Blob Hash="6db548b8b9292d417704baeeacffc55b6eb78a79" Size="151165" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="677367" />
     <Blob Hash="6dbb6aa6a23723fa16698b3a68953716768b273d" Size="905" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2095022" />
     <Blob Hash="6dbc81634642b3197eb60e549ddfce54a4c4baec" Size="213" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="609641" />
+    <Blob Hash="6dc4e3cb0135d8f4b17fcf62aec7a6026b324854" Size="14198" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1857774" />
     <Blob Hash="6dc817b8fef528d1b56fed2b47858bb9e0764f74" Size="1734" PackHash="256d7fb5a72ad9474639a3af999411bc858d0b00" PackOffset="2095313" />
     <Blob Hash="6dcaef0ed5f71a1b8c350e9f0233ba753226214c" Size="6714" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="80065" />
     <Blob Hash="6dcc4d1108ae72db1d8bfa93653efd52841e210d" Size="1500796" PackHash="7fdc7b37beb97f35624c44fb0cb93c1f20f961dc" PackOffset="8" />
@@ -50761,18 +50655,17 @@
     <Blob Hash="6de7045af5deedf7f070d8ba0df1eff91994b7a9" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2042883" />
     <Blob Hash="6de8e45839e28d5c806f9336d6ab44b9f9276f45" Size="12032" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1664584" />
     <Blob Hash="6dec169713bb3aa0ea94d9b0f06de55f47ce733f" Size="356" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2095816" />
+    <Blob Hash="6dec1b730336735a9e92d24064bdf1a9909d0169" Size="2153" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1827985" />
     <Blob Hash="6dec41fe0868b1a94633215433947f905abfea59" Size="26236" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="788908" />
     <Blob Hash="6def0343e0357e0671002a5d2f0bfc2e00c8bcf9" Size="1114" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2030795" />
     <Blob Hash="6df351563bac0218ac824f297ccead6f5c2caaaf" Size="3581726" PackHash="56d72a0ee05d644fc991dfc250a1534fdacb5b3e" PackOffset="8" />
     <Blob Hash="6df4aeca8454402094a060ff9e7d11b41bbaa87a" Size="7341" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="122395" />
     <Blob Hash="6df6b8cab9a99a2ed6fa5d8731e3ddba65af7247" Size="2922" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="1940829" />
+    <Blob Hash="6dfd18363160ea4cdcb6466edbb449709130bbd6" Size="62832" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="2009306" />
     <Blob Hash="6e00f373c930d22cdab24ff9e8120d77599ae075" Size="4110566" PackHash="abcd992f6c90c47b9150148778b5e5dd0be366f5" PackOffset="8" />
     <Blob Hash="6e04d552313dd4004b5e53f823bc30979e25b949" Size="37357" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1211519" />
     <Blob Hash="6e079378c01f80dde015885e3dd192eb1710f938" Size="9114" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1653052" />
-    <Blob Hash="6e0929b6d335cb6757daad2365718bf84a79470e" Size="97744" PackHash="b221596f9694d342526ce34110f4e329b8f905b2" PackOffset="1875370" />
-    <Blob Hash="6e0a614da893915ebe57bbdc7e2c602a5886f3f7" Size="158890" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1528798" />
     <Blob Hash="6e0c35793a36f2881ec2c534e9ef11d24f2f46dc" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1803756" />
-    <Blob Hash="6e0cf4b30ab207bad65bf86a94926e297b12c97f" Size="2180" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1354060" />
     <Blob Hash="6e0d5c67136b7f0d5843bc7dcf3341645b09268c" Size="7057" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1980678" />
     <Blob Hash="6e0e13dc2a56f1589001d386574cb292e6b69396" Size="31532" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="609162" />
     <Blob Hash="6e120bfc28375c6a59e20a1521a1ae4a8ae045f7" Size="352768" PackHash="4aa7eaed894575c13c7560dfc2d58ff2e41961fc" PackOffset="1711624" />
@@ -50780,7 +50673,6 @@
     <Blob Hash="6e18219480a6957fe1ed7b0e4924514fd9db440c" Size="288" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="375243" />
     <Blob Hash="6e19d212416a1ce3ab2749649b93f500ecb63f6c" Size="4913" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1221247" />
     <Blob Hash="6e1a199643b40792f2b2854723d01790b37f1692" Size="2825" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="269386" />
-    <Blob Hash="6e1d611eb001b6410e2e2efcee43d9ad687ac8f2" Size="253858" PackHash="563883a5d19fc2d08ee339d742ba1d2eacc72981" PackOffset="1656562" />
     <Blob Hash="6e1d64989fb85c34846781fdc13637535a9ac426" Size="27518" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1907157" />
     <Blob Hash="6e21645cafb3f2705fa357783e520249ce49e136" Size="3178" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="95422" />
     <Blob Hash="6e21f3927466f93199ce220b1ecedc5fe388b219" Size="22882" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1734387" />
@@ -50791,7 +50683,6 @@
     <Blob Hash="6e34e104745647afeaf801af3e6fd3e484356e15" Size="15412556" PackHash="582e588cc51c2c979330e9c79e870b764f08103c" PackOffset="8" />
     <Blob Hash="6e3a9f985c7346d2df75715d88df896e0f47274d" Size="19909" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="52511" />
     <Blob Hash="6e3d6163c1e33a0bc5d70fb1c2730b25f01a216c" Size="74124" PackHash="a38b37f825644041da01364538208a9364d2f9d1" PackOffset="8" />
-    <Blob Hash="6e4182943028ef2542afeae0c48eabd19d4b2536" Size="177" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="475469" />
     <Blob Hash="6e422ed43fc128d753dee67556981e8bece26d6f" Size="59392" PackHash="acdaf99b12d98a617d40b9fa06d235043e85ccd6" PackOffset="1976664" />
     <Blob Hash="6e426b0ccff93fa6c6a8d521c6033d6686ac4f3e" Size="10333" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1047581" />
     <Blob Hash="6e4311b06cce21f669b8404724e2f3fdbb7d4a26" Size="1782" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="391750" />
@@ -50808,22 +50699,19 @@
     <Blob Hash="6e68fdaf5d17220993ca15ac4355d1d706bb1995" Size="17744" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="974797" />
     <Blob Hash="6e73157915f734057870ff04e4bda8f390ce4c85" Size="249" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2080759" />
     <Blob Hash="6e73c6531622310aa4f55209a1ce66ac7857e031" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096905" />
-    <Blob Hash="6e77aac2bd41076fddd6c91515a8fb3a56dd2e1f" Size="172332" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1356466" />
     <Blob Hash="6e7804ea231522cb9edf18222abefcce21756022" Size="169" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="209123" />
     <Blob Hash="6e79301d6b562fe838eaa5c72f01f44f25f3c92c" Size="263" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="224190" />
     <Blob Hash="6e7b26c76266ba80bde65be5634c96e8768f22bf" Size="380" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2096508" />
     <Blob Hash="6e7cd750888f1b8a40eee4643407fe5a36aad6f2" Size="16620" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1168948" />
     <Blob Hash="6e7f678de128f81ca34d0f4d085f3349cd5a553c" Size="3038" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2090749" />
     <Blob Hash="6e80062a8b60c19a0b76e79e53e0857423d022f5" Size="3072" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="800675" />
-    <Blob Hash="6e811b431ab23e53372312561b70889a4ccab0d6" Size="5363360" PackHash="cc76d789cd809c8fc4083b519c4a6a5d79dcf539" PackOffset="8" />
     <Blob Hash="6e87adb595ede1f5c45b3266205d0bbb274eafde" Size="14379" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="424239" />
     <Blob Hash="6e8812ef085e1c17410c88e64eec458d2e4769c5" Size="29956" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="272040" />
-    <Blob Hash="6e8c6fe7f7ea254ec315ae666d89011e87ab2da2" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548889" />
-    <Blob Hash="6e8d182a89092bc183b718f87f705f20e28125f6" Size="2341672" PackHash="d59df67bc7616239dcfcc27708b7561041107c8c" PackOffset="8" />
-    <Blob Hash="6e8dd2e58e17048b78fe727cfc861fb216c9423d" Size="20195" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2060128" />
+    <Blob Hash="6e8c6fe7f7ea254ec315ae666d89011e87ab2da2" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668120" />
+    <Blob Hash="6e8dd2e58e17048b78fe727cfc861fb216c9423d" Size="20195" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2055592" />
     <Blob Hash="6e8f8395a8c957d84f462688e288eb1b53a2b9fd" Size="2431" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1550259" />
     <Blob Hash="6e92a2a9734a9c6b02eccd99f114d667c909c5ba" Size="8020" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1512732" />
-    <Blob Hash="6e94c8167ba1b45ac71d3381b97ae85a0d047836" Size="247" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1579992" />
+    <Blob Hash="6e94c8167ba1b45ac71d3381b97ae85a0d047836" Size="247" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1699224" />
     <Blob Hash="6e96c57aa9d7285c4c5caacf3771a831f1d79a30" Size="1269" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="296709" />
     <Blob Hash="6e9739580fafd8c20141916acffed8d90a007caa" Size="6279" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="539223" />
     <Blob Hash="6e97aabfabd213e120822b60ef1cce6ef6f198ed" Size="2336852" PackHash="df6d4711f83f1c570af30ec97dd418f0664398b5" PackOffset="8" />
@@ -50843,10 +50731,11 @@
     <Blob Hash="6ecb82b53f55041a9f57c80910e6c02a565caa8b" Size="6017" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="214697" />
     <Blob Hash="6ece90e98a09d90c5b0fe8d1b44d7652db14dc46" Size="7375" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2035757" />
     <Blob Hash="6ecf460f7762155b3a7d2314e43884bd31f3aa5b" Size="126463" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1757619" />
-    <Blob Hash="6ed0a793dae9d5ea2228519a0e8879a6a1081e67" Size="2848" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2026192" />
+    <Blob Hash="6ed0a793dae9d5ea2228519a0e8879a6a1081e67" Size="2848" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2087613" />
     <Blob Hash="6ed31b576bcb0c7b1b1eb91ce4a9f0c4af38ec18" Size="10" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1070657" />
     <Blob Hash="6ed3d9ad99fc51a3d39254fcf67ba661207ca433" Size="12836" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="574580" />
     <Blob Hash="6ed4c24f646c56a40c6ab6e60cbc3395e983d477" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1819150" />
+    <Blob Hash="6ed5445fba26ed2a098f273dbb2252328a70d7af" Size="2003984" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="8" />
     <Blob Hash="6ed9d3e774b19b351ebb88dac4b307a6538af3fd" Size="1804864" PackHash="b7a60e51b3072b670c205b0a84b7d90584154d19" PackOffset="8" />
     <Blob Hash="6eda9b8df9157c4076bfe3f80fcd64fab7bc7193" Size="216" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="613064" />
     <Blob Hash="6edf107e02bf7db7193d1d724cfd2ea5beb3fa8c" Size="77656" PackHash="849586837a4432c69a6cb4b1559cb1dbb703da3a" PackOffset="730320" />
@@ -50880,7 +50769,7 @@
     <Blob Hash="6f16bbfdb56bcc630703877c815c509560ea87f9" Size="3816172" PackHash="5da79a6e814770d47d0bb37e2ed3fd9d7070293e" PackOffset="8" />
     <Blob Hash="6f1b2273501d6bfee1e6f8ee755a1677e5357594" Size="42200" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1089536" />
     <Blob Hash="6f1c2abd79c75a8b190f8e86c676c1fd0b110f6c" Size="17780640" PackHash="13a5c625417641ecefd3dd0f5cf77e351e979180" PackOffset="8" />
-    <Blob Hash="6f202c36ba713270ebf26298a45112be1552aeb5" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552229" />
+    <Blob Hash="6f202c36ba713270ebf26298a45112be1552aeb5" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671461" />
     <Blob Hash="6f2314944db2dbd14e4a47fb5c8b0e512fc4cfdb" Size="5824" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="2078390" />
     <Blob Hash="6f23a0f9a38183ac6e59796cb696e7b04abf6745" Size="2151" PackHash="4e6589080dee402938809771299985e1428734e4" PackOffset="2094396" />
     <Blob Hash="6f29472cc799c2044667463c4240042852b24155" Size="121362" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="257179" />
@@ -50892,19 +50781,18 @@
     <Blob Hash="6f2d9e83d3690af6cea88e055de8b4378e3ab101" Size="248" PackHash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" PackOffset="2096666" />
     <Blob Hash="6f31e56b187f3b2d5a6e976ac0f9e63fbc7b5fc7" Size="3353" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="924007" />
     <Blob Hash="6f3544e9f16a6eb7e4270ed1ab833289fc2e759f" Size="5412" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1662570" />
-    <Blob Hash="6f38892678a9207c491b55d959e7656216dc85a8" Size="50345826" PackHash="dcfac09bbee829c128aac9e83f9408bc20c966a2" PackOffset="8" />
     <Blob Hash="6f38e21887e760ec2a3412e63cb6eb5c22ce0424" Size="229770" PackHash="5c42920f6f44c053dcf7e87f29ccef27b326822c" PackOffset="1348620" />
     <Blob Hash="6f3ac985a3f711d40ca63b2e0941e7e9134adb6c" Size="2422" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="945377" />
     <Blob Hash="6f3b698305c26ee8d2d4424986e4649cfa4373e6" Size="2444840" PackHash="1d60db179ff371dea48a2563f1d53b631dd16259" PackOffset="8" />
     <Blob Hash="6f3ca17ddc780eec1637266d2f498e676e513451" Size="176" PackHash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" PackOffset="2096173" />
     <Blob Hash="6f40e5cea7a582f759e0674f57630b4b9ca318ad" Size="430714" PackHash="fcaba3584b9391b167f49dfe53afe253623ada36" PackOffset="8" />
-    <Blob Hash="6f41ff971c6f34d07ac693fb975798eeb859720d" Size="7463848" PackHash="a9333a1ff214d50ce068d0130f9e09d0cae548ae" PackOffset="8" />
     <Blob Hash="6f456924ce641efa65949b3317b4172882588b00" Size="40" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096210" />
     <Blob Hash="6f45e42d1623c377a46e772cb11ac552b3a2dc72" Size="6172" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1085611" />
     <Blob Hash="6f479bfd0087abcba7110595a5e4ecd58ce5ca51" Size="16140824" PackHash="0fad4f1e57bd600af1a96610e84ebe627b039285" PackOffset="8" />
     <Blob Hash="6f47d81e9ce06dbd3556980b1c10e7a3a2241aec" Size="4555" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="2077129" />
     <Blob Hash="6f484aacde2ce574568b282131420fb469d20bd6" Size="499" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="361211" />
     <Blob Hash="6f4b18397fd8cf2ed7f6315c89bdbf77d0249fdd" Size="451081" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="1025109" />
+    <Blob Hash="6f4b492d7cd87f5d14ea6598d6ff801a63d5d934" Size="11737882" PackHash="40bfed58c0b22f696e49b7031c7a4b7ac5289fa8" PackOffset="8" />
     <Blob Hash="6f4db6d99ea425b41fb3fec0dcb17e42d0410edd" Size="994" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="532247" />
     <Blob Hash="6f4f878ba548927f045a498dd29da3f98f408ae4" Size="242" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="612289" />
     <Blob Hash="6f537ab2de19e3a48a5002a634c342d93d94d8c0" Size="14863" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="676999" />
@@ -50918,6 +50806,7 @@
     <Blob Hash="6f65d5307f515efe29e61168879aa7300feab86a" Size="113051" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1881167" />
     <Blob Hash="6f66404e5ccff7f020269a316d792d5e7ad4c280" Size="1940" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1164014" />
     <Blob Hash="6f67c341126ca2c4a7e550220883544efee4b996" Size="600" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="829012" />
+    <Blob Hash="6f6fd38c714bada66551c759f6a658b214fcdb98" Size="479760" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="1463672" />
     <Blob Hash="6f70cf36540f2e500a1670b40691947ded7c7d0f" Size="112432" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="1520945" />
     <Blob Hash="6f72845fc0f58e7eaf0eeaa89c6a732f2ca420be" Size="3046" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1904111" />
     <Blob Hash="6f749275dbc2700ce64f6c06be940b8bf00d6714" Size="130894" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="1687054" />
@@ -50932,7 +50821,6 @@
     <Blob Hash="6f8a191acfbfab23c2dee345fd06fa9cebe11a85" Size="1899" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2089184" />
     <Blob Hash="6f8bbac9faac9dd93f77e9f2fedbaf615f7c2b2f" Size="163510" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="871661" />
     <Blob Hash="6f90aa7e1f7c29a9d38fe4a070db5738892a0574" Size="178" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1253614" />
-    <Blob Hash="6f91eb55c3c64337e8eab9ddd9d16dd75bc49553" Size="1772252" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="8" />
     <Blob Hash="6f933aa0a132ff1e653bf84648f6f66ebf4d3759" Size="1468783" PackHash="ac2c77918f717b39f4343aea48946b7781301f55" PackOffset="8" />
     <Blob Hash="6f945b3172de44cd766788c4afb22a44d9f36d5a" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="944009" />
     <Blob Hash="6f9536cfd32d13fed54881ac53385c9aae428bc3" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="397234" />
@@ -50960,11 +50848,10 @@
     <Blob Hash="6fbd9c38bf659a822f80d571e9a33fa298bf300c" Size="3837" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="764999" />
     <Blob Hash="6fc1f5a7f3bf0203b54c5d0a5f82dee90237028c" Size="6864" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1876418" />
     <Blob Hash="6fc24e690afe15fbdd7a3307f866465b27743010" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2093576" />
-    <Blob Hash="6fc467ca1ea521602d256a987ba93c764ac19ed0" Size="348" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1561952" />
+    <Blob Hash="6fc467ca1ea521602d256a987ba93c764ac19ed0" Size="348" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1681184" />
     <Blob Hash="6fc576c636fe38eca50fcd725cc3c371e4821c18" Size="4272" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2041783" />
     <Blob Hash="6fc6b62715b7dde22dcc17f23f4ad820055bde47" Size="97962" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="1092990" />
     <Blob Hash="6fc8cf4cb0ef21c34d82a5f758802c123241aa5d" Size="40" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096774" />
-    <Blob Hash="6fc8e6a2703af34b56a21423d6e6683676d8baf7" Size="2982504" PackHash="5b92a9a086b3544da41d9f6e9332c1922fc0f41d" PackOffset="8" />
     <Blob Hash="6fccdd5a42e2102a2470beb0b122d6a15e77be17" Size="842" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1795926" />
     <Blob Hash="6fcd6618778fd8567f3a90f193ca3d2707fdd30c" Size="2193688" PackHash="07b553c59e7504eeb8c0c22549d83234186bad46" PackOffset="8" />
     <Blob Hash="6fcf4838cf9df50bf8282074317368de232326eb" Size="7703" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2081508" />
@@ -50979,11 +50866,10 @@
     <Blob Hash="6fdcc8a240a7da2d71dd7f0bfb4b3fcc86ccfcac" Size="13024" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1816581" />
     <Blob Hash="6fe03b896703ea8fdbca3d5223d9b2467b3e0308" Size="7356" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2003920" />
     <Blob Hash="6fe19df8f385e5fbf5d092870361c8133bca042e" Size="3682" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="2090437" />
-    <Blob Hash="6fe756ea4124ec82af1c9ab287fbc791890fa180" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549088" />
+    <Blob Hash="6fe756ea4124ec82af1c9ab287fbc791890fa180" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668319" />
     <Blob Hash="6fe9437cdf8046fb21837ff2eff6bc0f57faa2ac" Size="191" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="517528" />
     <Blob Hash="6fef5132024f9af7b28af994b9bdc62bc2293230" Size="12487" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="961105" />
     <Blob Hash="6fef9ddbc2eafeeb7a0e3f461fe149ce2c5ca4f6" Size="133219" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="862359" />
-    <Blob Hash="6ff241a7239cf2d124fc999b7b1e981dd44d6778" Size="1445958" PackHash="cdd804ff3f54b3a5ec69d2291b4fbc954897ef54" PackOffset="8" />
     <Blob Hash="6ff303664681441bc49da266dddb753876b78f8b" Size="4988" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1018762" />
     <Blob Hash="6ffa5d0ee907378676b2f5054b8492ddcab4a913" Size="91114" PackHash="82788599ad2583d437e6cde9e247d16ba5059dac" PackOffset="1341537" />
     <Blob Hash="6ffa87cd4e4ae6e336aa22aabccdac9fb5bcb3a1" Size="26952" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1433088" />
@@ -51005,12 +50891,13 @@
     <Blob Hash="701f6a39911899c7465adb1a604ae0b417852e19" Size="3971" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1104829" />
     <Blob Hash="702738516f7ecb3b3584d6011989b88edbe3c792" Size="165" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="622859" />
     <Blob Hash="70276a8b65daf2bccb265c356c6f8a6d346d9b1c" Size="2355436" PackHash="9dce1d1023d61c06a289038cf673ffc94efe105b" PackOffset="8" />
-    <Blob Hash="7028f5e690bafaea3b9f637c37289232e8752f15" Size="59" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2097088" />
+    <Blob Hash="7028f5e690bafaea3b9f637c37289232e8752f15" Size="59" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2097016" />
+    <Blob Hash="702a65387ffcf5b71afcc8a50279166719573e84" Size="10751" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2071351" />
     <Blob Hash="702aaa14573d643c9da34a8712b79e847aa8a339" Size="372" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1492394" />
     <Blob Hash="702b92ded66007c946a1762a0f7e7f3019d6aa97" Size="99988" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1814421" />
-    <Blob Hash="702d54029e2782ba7fb4b64063b3cb8e44be2087" Size="3053" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2093311" />
+    <Blob Hash="702d54029e2782ba7fb4b64063b3cb8e44be2087" Size="3053" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2092280" />
     <Blob Hash="7031e11d635dbc69f14ebd1b682542548f732e48" Size="3829" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="200095" />
-    <Blob Hash="703300cca82480723ba160520c83bcb46941d2bf" Size="59" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2097063" />
+    <Blob Hash="703300cca82480723ba160520c83bcb46941d2bf" Size="59" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="2097054" />
     <Blob Hash="7037d2db2611b16c8a16bf24b011dfd3da8d9f54" Size="7625490" PackHash="84904046b2802fbd62fdbc4634041aa96b01ca67" PackOffset="8" />
     <Blob Hash="70395d1d319b0549fd23b65115d639a8b5f2e7b7" Size="5442" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="183565" />
     <Blob Hash="7039b2b62ab1f717998a7eeb8aa9e4206f25c08c" Size="107848" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="460358" />
@@ -51018,6 +50905,7 @@
     <Blob Hash="7044161a1862429d1e44992716896c15a4959d43" Size="2499664" PackHash="502e3c3b4dcae339b71743fc346f2398f2d7a218" PackOffset="8" />
     <Blob Hash="704773efdb33f4e8746398b2c41508d6e89539bf" Size="411176" PackHash="9ca9cd47210e0efb149390f4e0981ef3e34ba749" PackOffset="8" />
     <Blob Hash="70477985c3ecd9725ec8cce0b908fc5ff31c6851" Size="1005" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="2065319" />
+    <Blob Hash="704abac9cfab39398d9135e7a058e7a12669b247" Size="267776" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="1781244" />
     <Blob Hash="704b67e1a4d3172e4b63dfe080b0aba4c15d3c81" Size="8938848" PackHash="1448a8af36f3fbcd695fc791d6e9d3c94f11aa1b" PackOffset="8" />
     <Blob Hash="704f0565b53aa8a20f70b79a7958d4d07085e07a" Size="8755" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1552246" />
     <Blob Hash="704fe178896c65d51c0785b013145cbfb66a717c" Size="86353" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="1499713" />
@@ -51043,19 +50931,19 @@
     <Blob Hash="707b23196bf32b43112cfcfda8d4628aa62620f0" Size="305548" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="703243" />
     <Blob Hash="707d6e254eb27fe077259f39fe9ea9548a916782" Size="1606392" PackHash="e77394dd7f7cc0b5cee80f69160731fc90212a12" PackOffset="8" />
     <Blob Hash="70805954cbfae9b1460e48ea4465b97d460eb542" Size="158406" PackHash="410e46447d67d73c00b681403bff72bd1c8db3e1" PackOffset="1478887" />
-    <Blob Hash="70810134ad0df8cc76066ee57659275122a7200e" Size="1043" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2059135" />
+    <Blob Hash="70810134ad0df8cc76066ee57659275122a7200e" Size="1043" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2078734" />
     <Blob Hash="70880c097e8f953c33a362c73acd3c7da24c68c5" Size="132" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1560560" />
     <Blob Hash="70896f207bb73aff24c1c111389579a6adabc246" Size="9817" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="693563" />
     <Blob Hash="7089c236624f7bc998545ff693a119c3f0fef250" Size="18200312" PackHash="1b997728e2f3fb207434788d0d3e848ea231ebc4" PackOffset="8" />
     <Blob Hash="7091c35b0e4f61d7381ff0dd4ec21d0347496140" Size="801" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1306071" />
-    <Blob Hash="70966faecac3bb5870dc55f90f66e5df121e722b" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550634" />
+    <Blob Hash="70966faecac3bb5870dc55f90f66e5df121e722b" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669866" />
     <Blob Hash="7096d01aa7dcd932946a1b110f59b4602a15565c" Size="63256" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="529728" />
     <Blob Hash="709716ccde19811e5bc874b1fec1084f403e9b55" Size="377" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="423147" />
     <Blob Hash="70982320d0d010312eddae62efbe32cce7a60cce" Size="23235" PackHash="30de26612e9a18d9657fc1ba27f713029e680b7a" PackOffset="8" />
     <Blob Hash="709ab5f824a623ae700b9e8636197ee71a4d2e90" Size="2320055" PackHash="bf1986810688fbd4a4c7f6c4df1cb1850aa8238d" PackOffset="8" />
     <Blob Hash="709bbee2e761e301e8f92bb6d538c69c9745721a" Size="12192" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1256001" />
     <Blob Hash="709f4f99bbbecef29fb2f6ee7c7e5c9180a90510" Size="1110268" PackHash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" PackOffset="408602" />
-    <Blob Hash="70a027572b4f1823d24ba618f59ee8b1cf702907" Size="328" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2063972" />
+    <Blob Hash="70a027572b4f1823d24ba618f59ee8b1cf702907" Size="328" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2083980" />
     <Blob Hash="70a260d2ea45ff3f63ebcbc428043d75a77b0e81" Size="120" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1182760" />
     <Blob Hash="70a4731b39b0737236aa8ca43827a0deb88366c9" Size="73789944" PackHash="34a613425eb711bbb2a8a6416aafdbcedf3f56b4" PackOffset="8" />
     <Blob Hash="70a6f6d4685d433126fd9767a56f8cb48a9a0f6e" Size="1338117" PackHash="f8573348f998752c7a3165b3effd0bc1346c3de5" PackOffset="8" />
@@ -51073,7 +50961,7 @@
     <Blob Hash="70c2a8754e6c22a7d3aefd7373efe04c7ddc32b2" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2095949" />
     <Blob Hash="70c46bf0a46d90a01e051ff24c12f0fb70ff5270" Size="20341" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="745723" />
     <Blob Hash="70c4ad8dd33433dffef4597060b027e81a12fd1a" Size="8546" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="451680" />
-    <Blob Hash="70c4f5b350cca24421df842b4f6e97ac17c44f64" Size="24915" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1689758" />
+    <Blob Hash="70c4f5b350cca24421df842b4f6e97ac17c44f64" Size="24915" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2031112" />
     <Blob Hash="70c921bfdc2ba5f1d02099cd122ef103bbdb474f" Size="61624" PackHash="2f9f7a639a6282348d60a9900c9db7e8afb26445" PackOffset="2018470" />
     <Blob Hash="70cad1c35b2d47f0f873059ef613046c4eaacfa3" Size="322280" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1662495" />
     <Blob Hash="70cb09fb8a422ee613e89dd29e89be000c409c4a" Size="910946" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="8" />
@@ -51110,14 +50998,14 @@
     <Blob Hash="711d083ae9ee465d0ed6aace400ca405aa6c2b5c" Size="10475" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="719853" />
     <Blob Hash="711e1faf6aee3276ecc2d50b5dca2da81f9074e2" Size="6251" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1965104" />
     <Blob Hash="71202bf449017e6d79ded5f79946cb43a280a523" Size="88064" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="66568" />
-    <Blob Hash="7121d0346dcdf811086180f626309ca8e2abddd2" Size="3608" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1728813" />
+    <Blob Hash="7121d0346dcdf811086180f626309ca8e2abddd2" Size="3608" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1962553" />
     <Blob Hash="7123ff8eabd9fff24e9cefe654c858201945164a" Size="2708" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1815912" />
     <Blob Hash="71272b5be55c2f249d18f376470a6fe3f5376574" Size="4456" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1093631" />
     <Blob Hash="7128340059cb6ec7c51dc5d84da34091ad8bd578" Size="8409088" PackHash="573d98af653c4e9241a28a2815a1f2e6fe254c73" PackOffset="8" />
     <Blob Hash="7129ed1ba449d7218373e2f44ee606d49df5799e" Size="80698" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1084941" />
     <Blob Hash="7131c34e5c97679614e89ae9d7b5d6ac7238006c" Size="6504" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1716228" />
     <Blob Hash="7131dc656efe1f2277b19da72f0eeb46b4ec54a0" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1831010" />
-    <Blob Hash="71324f7c9bcb278f2646fbf16a5b87943caae789" Size="219" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1824511" />
+    <Blob Hash="71324f7c9bcb278f2646fbf16a5b87943caae789" Size="219" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1943743" />
     <Blob Hash="71356234beea3a1b2f7ac5932c676a2c09c7d6ec" Size="8068" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1333304" />
     <Blob Hash="71357fad652166d3701b6c26ef28e3745d40713e" Size="592" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="938456" />
     <Blob Hash="713db11186795cd938cc518a02a8e9a4ae1bee01" Size="1528" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="2042996" />
@@ -51134,7 +51022,6 @@
     <Blob Hash="7151d85061294af15d31622dc00c623732e5b1da" Size="3306" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2043854" />
     <Blob Hash="715593173380a4e2621b7013f6434e233e1f8f8c" Size="232" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2090984" />
     <Blob Hash="7155d27f8bde69a9b1902dc315e279b8c7098d95" Size="138" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1126115" />
-    <Blob Hash="7156585f0d83052dc93ac823e892b669b34af21b" Size="7078" PackHash="a90123bb85c3d4b8e9fc4d9b4e402d77e3f4092d" PackOffset="2088752" />
     <Blob Hash="715760fa7300a033e4a686aa68be1a5bfc0fc9e4" Size="3057" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="3025" />
     <Blob Hash="7157bf7413d9436645f45da0bb63e5369d47a252" Size="3253" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="62207" />
     <Blob Hash="7159f6648135e3f4c93b8c8dcd049942e4640a85" Size="141172" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="1815650" />
@@ -51145,9 +51032,10 @@
     <Blob Hash="7164ca301a0c3898038344e11f9713ec4b43fbe6" Size="7231" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1600957" />
     <Blob Hash="716739615606d97d9d693f6ea3d8e3d714107766" Size="9270" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="854770" />
     <Blob Hash="716bc06e4ec30b85538ebe4cceebbf203c8a5d40" Size="31744" PackHash="6a67f7a815e887377e17dc82a86617bcbfd74f12" PackOffset="2003464" />
-    <Blob Hash="716bc56d26cffa6aeb580a2f4efd94a2267e5242" Size="470" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1409624" />
+    <Blob Hash="716bc56d26cffa6aeb580a2f4efd94a2267e5242" Size="470" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1528573" />
+    <Blob Hash="716d61242e0eede7be74444af53e59855bb14481" Size="254110" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="1640960" />
     <Blob Hash="71719cc8c6267b1b686c17df32824a202bf9173e" Size="7452814" PackHash="1d82f1e693e8f317ca408dc5159b1a6afd317016" PackOffset="8" />
-    <Blob Hash="71729c83d84594e9d8799b86a27cda5c64a83b17" Size="762" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1005962" />
+    <Blob Hash="71729c83d84594e9d8799b86a27cda5c64a83b17" Size="762" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2053479" />
     <Blob Hash="71788ffb95e0fdeefd0337045eebabfe3133ccb6" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2096868" />
     <Blob Hash="717e94f47b4c8d908e2a762b2822b980a28c153c" Size="4847" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="987331" />
     <Blob Hash="7185cab67d8c6e5f6d28270ca84f3193650d0916" Size="568628" PackHash="e817ca9104379dfa75233081d3d42cccbf3cb21f" PackOffset="1299530" />
@@ -51176,17 +51064,19 @@
     <Blob Hash="71b40c1127af002f26bb33c710412c6f7b4c193a" Size="6148" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1030878" />
     <Blob Hash="71b46f9f1df0f93ee3310cc7f72449c850809362" Size="188" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="450202" />
     <Blob Hash="71b4cf12e82c861bb97d867ff8acc49947979ae8" Size="7136" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="127499" />
+    <Blob Hash="71b5f71b8aefe7d6f657247138b57a46a51cd0c0" Size="5181074" PackHash="c7866fc6fc8c1377d9910028d05292a6939962f6" PackOffset="8" />
     <Blob Hash="71b63ae3e1ec8c4b04795163d7b4df6cba59a2e6" Size="139366" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="1550391" />
     <Blob Hash="71b79b77e459e95d88755b07335d09535bc704aa" Size="2474651" PackHash="f602c209a799d0cc6814312718f806f70e09062b" PackOffset="8" />
     <Blob Hash="71bcae4678c632a89d9125f52767c57ae413bb40" Size="1557" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1654542" />
     <Blob Hash="71be1250e2699f5d75ec0e3c9f232b5ad04c5c06" Size="127985" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="545844" />
+    <Blob Hash="71beaac3dd754b654954acdd709b4a91296c6835" Size="11429888" PackHash="dc780aa5e7168a1ea37d5b7f5a761978352f100f" PackOffset="8" />
     <Blob Hash="71c880f9f395acd32af7f538033211f392f83645" Size="1195" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1053980" />
     <Blob Hash="71ce10987dc082b237ba9e406fab99036ae8427f" Size="65774" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1460793" />
     <Blob Hash="71ce3f0e75e440d5bba219bcbb92af9c1f5a7466" Size="192" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="625329" />
+    <Blob Hash="71d04521b5aa01bb5f316c9b18738cf37fdb4ac5" Size="8119" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1631296" />
     <Blob Hash="71d871d3c45c3456aadfb003657c50db7fe92c73" Size="5303" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1320556" />
     <Blob Hash="71d951b80b2be0c1676cfe64801e3c9811dcebb1" Size="281444" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="365053" />
     <Blob Hash="71da5ed491fd58bf2bfecdcced0240bae6ff8a99" Size="7225" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1033795" />
-    <Blob Hash="71dca98f367a89352b7df52d92acd804b4a3e7fd" Size="127320640" PackHash="14e4bfb068a9788705bd8c342a78e4265ce78064" PackOffset="8" />
     <Blob Hash="71de8fbeeefbd987e3a2434996a361396a750738" Size="73396" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="1961228" />
     <Blob Hash="71e91287a94c14bdb1d04a79ed24431ae54cab82" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="642426" />
     <Blob Hash="71ea4139e79579f0304bc44ecbb5314b0694de2b" Size="4130236" PackHash="d8b4fbfe5cd8bc4d622d9cac11ae5f16c4106a47" PackOffset="8" />
@@ -51194,10 +51084,9 @@
     <Blob Hash="71ee164514ae022a2431188c3160107d29a8220e" Size="3856" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="934196" />
     <Blob Hash="71ee1cb7cec0ddaf0a7fc214a471821c1eb81979" Size="125863" PackHash="2712036814539c2a4f91c20f323dcad0fecc9943" PackOffset="1739819" />
     <Blob Hash="71f02f184eb6452ad7a2879be42ec840937fea9a" Size="2214" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2046126" />
-    <Blob Hash="71f04d57ce4c0f80c03aa21edf720c9dfe009718" Size="2113" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1008180" />
+    <Blob Hash="71f04d57ce4c0f80c03aa21edf720c9dfe009718" Size="2113" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2055697" />
     <Blob Hash="71f0d1aa46976a1115d5ee2b0124a6bdc9725355" Size="568" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="681940" />
     <Blob Hash="71f1355ada80042f5b0c9241cd7ea908f254be6e" Size="2974" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="403966" />
-    <Blob Hash="71f2745342463f41b4374ec67c1c2873e370b6ba" Size="50779840" PackHash="656468d80025e7d7fcc380646c98870061ac5a19" PackOffset="8" />
     <Blob Hash="71f57d39b43b7c33fd1689dc9d42a7f07c69ebf6" Size="83930" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1526651" />
     <Blob Hash="71f78ef5c8b1bf3e7d8477c30becef8524a3dba3" Size="5297" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1971355" />
     <Blob Hash="71f955562b9ac49a23b0c3dc6e8ea146cbc9d29a" Size="2506" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="78237" />
@@ -51226,7 +51115,6 @@
     <Blob Hash="72371394f5d6f0fc6788fa8a6020f0cc30b8a8ce" Size="3013" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="722911" />
     <Blob Hash="723ac21c2232819e112943cad3b8aea806f43d4b" Size="3916" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1049615" />
     <Blob Hash="723acda6c361ec2990246c656c99f30ee605df4b" Size="9604" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="858120" />
-    <Blob Hash="723bd7a92f2f2cbb16cb8d6efb1960f2abff068a" Size="7025488" PackHash="aceff92a5bd44e4c995da09291f08bb0483f6906" PackOffset="8" />
     <Blob Hash="723c56481d214b0db8f9112e0db7823abbd65b56" Size="12328" PackHash="247159e28ded6d0a9508b9732f70dce33ce3364e" PackOffset="2075262" />
     <Blob Hash="723c6947926df3aa627b4b2ae626d0ad84cf6c0c" Size="1880" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1475247" />
     <Blob Hash="7247b2b037ed45e1d655de287ad46cee6109f55d" Size="22" PackHash="8391db3b6cbd9a4b24f6114d956cbf68bff737da" PackOffset="2097125" />
@@ -51236,7 +51124,6 @@
     <Blob Hash="724fc9af92331c3e486f2234c6c954fcbc891616" Size="70937" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="203443" />
     <Blob Hash="7251dcd974c69f15ec9a37fa1a9f314117e34849" Size="101703" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="8" />
     <Blob Hash="7252312f56ea5911d2d2d65315b14adae16b8fc1" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096937" />
-    <Blob Hash="72529efbf0f918713b34d77578d6180e62332543" Size="59392" PackHash="75c65d19aade831c17c4a014eb50fd28b2c2710c" PackOffset="2037256" />
     <Blob Hash="7252de2447b9af482a2c24f32bb5041be511160a" Size="25746" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="1839320" />
     <Blob Hash="72534c5fbacbcadb0b170d246f3c340c80a4c557" Size="39621" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1827578" />
     <Blob Hash="725593b0260a48a6dbb886db344744fcf3506a0e" Size="139070" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1353599" />
@@ -51249,19 +51136,17 @@
     <Blob Hash="7264b223d39ceb5a1e5396e2db2686a6d5812c49" Size="2480" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="904428" />
     <Blob Hash="7266acfd74ef8678b5f588070d04ef34f906a66b" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096836" />
     <Blob Hash="7267e6d951572980211c184e2114898c21d90d83" Size="48246" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="761189" />
-    <Blob Hash="7269a732c0de8453a94c0279da23983d4dc394f8" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555490" />
+    <Blob Hash="7269a732c0de8453a94c0279da23983d4dc394f8" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674722" />
     <Blob Hash="726b6ab921062ba547a6bcd3890610edb516d2a7" Size="3796" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1153738" />
-    <Blob Hash="726b99e1c1c9fa4218c3bcf800c1e6fba1d7dd8a" Size="16080" PackHash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" PackOffset="2066952" />
-    <Blob Hash="726cb08d5be05674c6ce1ba74307274aa6689905" Size="4381568" PackHash="dfb411db6a5465354dcf72286da26a9412166460" PackOffset="8" />
+    <Blob Hash="726b99e1c1c9fa4218c3bcf800c1e6fba1d7dd8a" Size="16080" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="1989630" />
     <Blob Hash="726d25ca88345ceabb58f8361177336c989b4b9a" Size="8081408" PackHash="dd9f6d9c63ed5364651b83ee27c4482751584e3b" PackOffset="8" />
-    <Blob Hash="72751e3abb13682cd763bde931ae0811f6a438ca" Size="3342584" PackHash="68a698caca523f5385f3d4e1b2848ee8b16ca628" PackOffset="8" />
     <Blob Hash="72752a0a038eca6c986ab1114645965c2719e523" Size="386" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2083434" />
     <Blob Hash="72774b0d2c959ad9ae59e5fa50dfc925cfe11647" Size="249634" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="849213" />
     <Blob Hash="727798d92fa5fb527ae4b353388d2b70771166a3" Size="2114" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="631455" />
     <Blob Hash="7277de9c5c063540459f3a8a19bbfe22e028f462" Size="4374" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1490300" />
     <Blob Hash="7279684c17959a31b64070676e20bbcc9a89f4a6" Size="210" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="402594" />
     <Blob Hash="72797dade030de020524ced49eca8a2bbf7ce9b2" Size="215" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="662016" />
-    <Blob Hash="727d503863d39ca807c7620b53503f2dbd396e16" Size="196" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1599520" />
+    <Blob Hash="727d503863d39ca807c7620b53503f2dbd396e16" Size="196" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1718752" />
     <Blob Hash="727f705caa3c4531e931db04c42d0bc648b4c247" Size="3126" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="876045" />
     <Blob Hash="72801af60835eaed52bc3015fad5e720559640df" Size="128619" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="1852118" />
     <Blob Hash="7285f85440b6eff8731943b73502f58ae40e95a2" Size="19136" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="523744" />
@@ -51272,9 +51157,8 @@
     <Blob Hash="7296297939bf015d69fedffe6f4fcfa9fb612674" Size="51778" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="385872" />
     <Blob Hash="729c5f3934affc8efe88f803046a718020b107f9" Size="3829" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1364008" />
     <Blob Hash="729c99d5af327f1b17021f41b7157c696bf4b2f4" Size="1034" PackHash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" PackOffset="2095978" />
-    <Blob Hash="729e94aa79999068bae1d0d9c9d0d0830102b184" Size="1102" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1306902" />
-    <Blob Hash="72a032940bc8f4589e4b1084d295f254390cd076" Size="684" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2034823" />
-    <Blob Hash="72a1a1a350b856817b5f8648ac7e391577973c25" Size="16821" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1830532" />
+    <Blob Hash="729e94aa79999068bae1d0d9c9d0d0830102b184" Size="1102" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1755804" />
+    <Blob Hash="72a032940bc8f4589e4b1084d295f254390cd076" Size="684" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1925954" />
     <Blob Hash="72a393e3dab9f66bc5fe7bb0f7d85baf7c2db667" Size="4163" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1743161" />
     <Blob Hash="72a4a279a2fadfeeff20ebb7d6823696f507db06" Size="11369" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1538891" />
     <Blob Hash="72ab1efc7bb48b319389941791c50427664153dc" Size="150433" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="336392" />
@@ -51282,9 +51166,8 @@
     <Blob Hash="72b2b0761318c25f13680d8cebfe3d45f51d9c22" Size="3397" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="933586" />
     <Blob Hash="72b34fe60f11ba03080ce466cc4a1c7d8c6ae8d0" Size="4123219" PackHash="3539f0b9b2f6134c70cc0c6c0f2c6f1f557d721f" PackOffset="8" />
     <Blob Hash="72b40800c4ab26c6668b6e33abd2a02be05d2cf9" Size="34835" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="305551" />
-    <Blob Hash="72bf9ccd2c51d4da750333e6bba7a3043b6c4e03" Size="1939" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1781612" />
     <Blob Hash="72bfc7fcfcb1f25041a04422a28edc0a027771b9" Size="673" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="76763" />
-    <Blob Hash="72c00f06b4a6ceea597834a48b2768d3873d1102" Size="1138" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2014816" />
+    <Blob Hash="72c00f06b4a6ceea597834a48b2768d3873d1102" Size="1138" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2073372" />
     <Blob Hash="72c1813a311bcce3360697a5ddf2c2cea2d548fd" Size="1499" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2015506" />
     <Blob Hash="72c5293218b0a3eb506f217d90fe002c1e338c48" Size="15330" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="795180" />
     <Blob Hash="72c9aa840f1af1c1b09091c78898790e36102d42" Size="211" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1254832" />
@@ -51295,6 +51178,7 @@
     <Blob Hash="72dc9943adb6ed9364ffff6f48386180b573ab60" Size="131246" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="265355" />
     <Blob Hash="72e3a57ee858c6bc9f38a7216c95a4c9e67c6f65" Size="37396" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1528781" />
     <Blob Hash="72e5a2d784241395f91680ad78fac5d3ab28478f" Size="2985904" PackHash="305e297b2b5cfbc7e8ed4a63a3675efefa5e98c6" PackOffset="8" />
+    <Blob Hash="72e61e23e3b70a7e0cc35c307db6d0e069707562" Size="14880" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2037412" />
     <Blob Hash="72ea3cf6af07fe383de64cbd943ac9c3248777ca" Size="7820" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2077826" />
     <Blob Hash="72eace1e07bf27810867bed887d1a31e305b0285" Size="3208" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1112419" />
     <Blob Hash="72ead653f53c3e186ecbc66dea20a1a1cc925f05" Size="3423" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1173889" />
@@ -51304,7 +51188,7 @@
     <Blob Hash="72f1b57bc795a2a9977f4225a0a3080f7cb087b7" Size="1875" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2041337" />
     <Blob Hash="72f21357f479506986c63b0e30749d2fb8c62378" Size="123491" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1353760" />
     <Blob Hash="72f2b7597b7e4f76636020a95ed03e060ec43775" Size="9987" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1241972" />
-    <Blob Hash="72f554bd877f42b6cca8f219db526c347d9aa528" Size="3406" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1762280" />
+    <Blob Hash="72f554bd877f42b6cca8f219db526c347d9aa528" Size="3406" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2083350" />
     <Blob Hash="72f5665f22476ab93ccde1d3655bbc1e20669efb" Size="11028" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1651608" />
     <Blob Hash="72f67e2ab7c1f5ee622f103258ce51febff81be2" Size="796161" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="8" />
     <Blob Hash="72f6b7e6598f3463f92823c7eef5d70da026ae05" Size="40448" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="930312" />
@@ -51319,7 +51203,6 @@
     <Blob Hash="7305f72737cadaf58c43537bd370167829af961b" Size="32391" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="561046" />
     <Blob Hash="7306d55e39fc1d0aa6eab052136aaad833d46099" Size="2988" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="629523" />
     <Blob Hash="730b08550e6f228b79d1f74216ea92ba5112b7da" Size="4257" PackHash="46ed07c02685d1d9f9df9ad537075f9102c39e46" PackOffset="2087280" />
-    <Blob Hash="730b871bc5d664bfd23340ebc5a9af9a9018dbb2" Size="8376" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1991042" />
     <Blob Hash="730e62b715256f4c11313c8c44d99fba78490db8" Size="153136" PackHash="17b957ba8ae675e848e0d5ea9a42372ed27725d2" PackOffset="985600" />
     <Blob Hash="7310d31672666edda0bd61c05c42c2eb1525f3f8" Size="2983" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2072298" />
     <Blob Hash="73114e02be56e2e18a1718cb3be39bfb54b4f8e6" Size="12396" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="104928" />
@@ -51327,10 +51210,9 @@
     <Blob Hash="731deb5cc20823a5feda8b1327a5a4afb5a36a10" Size="1152" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1974585" />
     <Blob Hash="7324e334bdb02ee2e813545cee881340e59fee1a" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1636612" />
     <Blob Hash="73258e1e0b6d226507bf32f696afc00e43333946" Size="181" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1994526" />
-    <Blob Hash="7328cb24d18044eb819e8e52df0054f171d4c52b" Size="5040904" PackHash="2b3d322997a3692cbe50c8a669f96750e4ebfbd3" PackOffset="8" />
-    <Blob Hash="732c504411c2ac5a3f461279d3361ffa8f6fb4e5" Size="56" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555799" />
+    <Blob Hash="732c504411c2ac5a3f461279d3361ffa8f6fb4e5" Size="56" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675031" />
     <Blob Hash="7333e0a99c644db350267c53085be4645a348bed" Size="5926" PackHash="7a2bf1344816a13e39f9fe74bb22c30a74396fc5" PackOffset="4226" />
-    <Blob Hash="73344b2b10fd475adf3d4e33d64be57f32d8c37b" Size="3569760" PackHash="a24385065652a8566cc17e90b8306aeceb4ea54b" PackOffset="8" />
+    <Blob Hash="733782f6cf737e3ac8a5771fcd539a3a006565d8" Size="8885176" PackHash="8a3b5abb3245b82efe40c3f88cd162fb7f0525a9" PackOffset="8" />
     <Blob Hash="7337e3ad7d168cdc54c76d17bf075788cadaabb0" Size="161" PackHash="0bc028d0b62f4b1147966e8709b9699fd37b6a4b" PackOffset="2096985" />
     <Blob Hash="733939edb7142d1756e2b4d4826480f468674075" Size="2176236" PackHash="d62437b41502119a596b4cd0c85abe36cb786a9a" PackOffset="8" />
     <Blob Hash="733f7b759c537a7d1fb659ff6d39e8d2ebcc708d" Size="3401" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1076490" />
@@ -51349,21 +51231,18 @@
     <Blob Hash="735759ad27d74ce62e43e94c7b9dd3fd011fae93" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="8" />
     <Blob Hash="73592887c9ae6d4ad8ef2015a337a8431498720d" Size="6416" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="981049" />
     <Blob Hash="735c40c78791e414518a4d03ffd3257ff26b12d9" Size="2396168" PackHash="3cf7bcabb6cf05a88bd45e6f08c6eb48818b3909" PackOffset="8" />
-    <Blob Hash="735e6e03c1a4decadf28d05575277755eab26739" Size="1805348" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="8" />
     <Blob Hash="73613b6c18026cfc4dd5c7b36b7bd72016e3ea4c" Size="803" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="2096294" />
     <Blob Hash="7368943c6ada6cdcd3874e507d6dc333d7712187" Size="25577984" PackHash="0687d31318e617c2bf325d5ea09ea96b5f703a15" PackOffset="8" />
     <Blob Hash="73691cd5b78b273af7414746282b69bdbc5c02fc" Size="239508" PackHash="4653f71982a36f99d16331bbaebded3036eff50f" PackOffset="882401" />
-    <Blob Hash="736ede162ce8487623d24eccf109cecfda9eb088" Size="1130" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1288601" />
+    <Blob Hash="736ede162ce8487623d24eccf109cecfda9eb088" Size="1130" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1737503" />
     <Blob Hash="7371f6379ee7372d75f4f9604dacf9c95b1b19da" Size="21178" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="743524" />
     <Blob Hash="73734f3ab84c8ffeeb2f4bc9e91827f9ac62873c" Size="159" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="738482" />
-    <Blob Hash="737766ae47cc5131e74d64272a25ab7c60cbbf7a" Size="187" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2035507" />
+    <Blob Hash="737766ae47cc5131e74d64272a25ab7c60cbbf7a" Size="187" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1926638" />
     <Blob Hash="737a6389359b633ababeb1c56698afb610ef5d15" Size="127545" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="602898" />
     <Blob Hash="737c121d9cdf59b2db29bbf15482858979c7daac" Size="6808" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1506937" />
     <Blob Hash="737fc6c2affd125175b60c5b59f3938cc6312878" Size="289195" PackHash="a2b1b97c80248fb89a7ce7322cc399a4fdf3173c" PackOffset="1682654" />
-    <Blob Hash="737ff55ecc52d699820893eb4e19757f9d575aa9" Size="2864448" PackHash="eb714351bd01e8b8fdcfbb13c2fa732a88539d64" PackOffset="8" />
-    <Blob Hash="738337870e8284d43e1255f9f49e0c145a2ea2cd" Size="20549" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="2051409" />
     <Blob Hash="7385ad857ca567495267668a394e668e65bf79f2" Size="3110209" PackHash="4db41bf84756d686fc71e275d2c94c5c2299de97" PackOffset="8" />
-    <Blob Hash="73881bd93fa94f4b03ab65bc430b7a850c806e51" Size="798" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2030205" />
+    <Blob Hash="73881bd93fa94f4b03ab65bc430b7a850c806e51" Size="798" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2088761" />
     <Blob Hash="7388ef20593b7ae967fe057e86bbf83e44c5586c" Size="12313" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1162923" />
     <Blob Hash="738bc0ada8f8175820d0604f2f030591f39799fd" Size="3906" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="2039159" />
     <Blob Hash="738d8e1dd9533f094b856cd01e471a60d753ac3e" Size="2328" PackHash="12582f0c651cdaf8a3d2ed39d6d5c41ff2045005" PackOffset="2092232" />
@@ -51374,24 +51253,23 @@
     <Blob Hash="7397aaefc20abac6daa126adc4b37e075d286ad9" Size="3390" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1079891" />
     <Blob Hash="739bc008e0a355a4ee341ec81771b6c3ad06442f" Size="1939" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1780208" />
     <Blob Hash="739bcd8abd5b26aadf7313dedcf7ca775a195bc9" Size="167232" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="1385064" />
-    <Blob Hash="739cadeb89cb5b9f7ea704a634b68874d8675bc5" Size="239" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1282732" />
+    <Blob Hash="739cadeb89cb5b9f7ea704a634b68874d8675bc5" Size="239" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1731634" />
     <Blob Hash="739d0a331b6ec2ce5caf0ef81690d6ba9f794893" Size="34056" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="1748757" />
     <Blob Hash="739d6d7c1842112880710755b31082cab9d36c0d" Size="326" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="2096787" />
     <Blob Hash="739d9e201d376d1d787acf8357ac3ae8554fb7ae" Size="695" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="793847" />
-    <Blob Hash="739dd13243a9ff043b3049eea93059fb5c8cd87f" Size="18496" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1965689" />
+    <Blob Hash="739dd13243a9ff043b3049eea93059fb5c8cd87f" Size="18496" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="1865185" />
     <Blob Hash="739f22fc7b6cb60868fdbba7a8bba6c2572dbdd1" Size="45020" PackHash="53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" PackOffset="1130142" />
     <Blob Hash="73a290ecc02be29b6e9dedd1dde7b0633cb5d5a8" Size="76" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="2097075" />
     <Blob Hash="73a2bb2d6e591a90ffb4ed118a3989fb17b54c7b" Size="170420" PackHash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" PackOffset="1640760" />
     <Blob Hash="73a5f913d9dde5442eb67e4e4ad8bb9bbff44e51" Size="5901" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="1989938" />
     <Blob Hash="73a6ae879d21b2d31a3f94a7d9a224e0c6b36c79" Size="9958360" PackHash="b19ddd72768f79350472cb5f302733b3bc837398" PackOffset="8" />
     <Blob Hash="73a6d55b894e89a7d4cb1cd3ccff82665c303d5c" Size="86971" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="225889" />
-    <Blob Hash="73aac327c230d1db5c976305b92ace4dc7e7c1a3" Size="6794" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="1983150" />
+    <Blob Hash="73aac327c230d1db5c976305b92ace4dc7e7c1a3" Size="6794" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2087719" />
     <Blob Hash="73b449bf2bd593ffc24b75dcbaf613607ea70825" Size="517" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="257449" />
     <Blob Hash="73b46d5f46c99c662f2db976b044bbf5bafc0fe9" Size="229" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2053736" />
     <Blob Hash="73b5e34fe25bddf0fc6fb87f9cd3e87508fa1e82" Size="2273156" PackHash="8b8cb9e5a766c3fc0f5d8121e814027fbe1c36cc" PackOffset="8" />
     <Blob Hash="73b6d43c6f2e560ba30098046ba0e0c5a85b9da9" Size="258231" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="613947" />
     <Blob Hash="73bb36d1db763160b466ae8fe4572d26a8dbb8b3" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1219362" />
-    <Blob Hash="73bb96b2641649766ae00ad56f782581a8a2df58" Size="82576" PackHash="70182d4ffd95b3a1288b6fca57446bba12264d0c" PackOffset="1919920" />
     <Blob Hash="73bd4ae814f84bfe86cce7439b22ead381ac2ce1" Size="12072" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1023160" />
     <Blob Hash="73bff1d9d556321e732bd3daf8b47981b1766ca0" Size="11164" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1282819" />
     <Blob Hash="73c01eb7ab4311286105ce06661abc58a601c55d" Size="3374602" PackHash="131d64c4948a0370d99897b2ad5a968b160e4300" PackOffset="8" />
@@ -51411,15 +51289,15 @@
     <Blob Hash="73daeeae72426bbfa9da1e2c8ebaf72fbbde2617" Size="36352" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="375304" />
     <Blob Hash="73dc4e67d271d490211cc4f4406b8abb14e054c9" Size="2540" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="1900150" />
     <Blob Hash="73dda1b79a51fed3e411742cb1087fc2e2952e5c" Size="21815" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="639126" />
-    <Blob Hash="73de1ec9b33dff4e496a145cb43e7e4fd5f1c549" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548432" />
+    <Blob Hash="73de1ec9b33dff4e496a145cb43e7e4fd5f1c549" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667663" />
     <Blob Hash="73e8b2706601c88079854daab9179304f9791e14" Size="84" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1010412" />
     <Blob Hash="73e99328060afc2edb9e3227802ccca6db4e13c7" Size="73566" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="2014894" />
     <Blob Hash="73eaf11d877ad7dedf1bfdbd74eaf856e3c20c78" Size="3502" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="254896" />
     <Blob Hash="73eb643936310dfbe5190d65fff6ff80f0a045c0" Size="39864" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="293821" />
     <Blob Hash="73ebb4d961690e2cebb3a2878f7f92230fb37abf" Size="130241" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="1004792" />
-    <Blob Hash="73ec4c28867867573cab01541be66f81033f6793" Size="665" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2096332" />
+    <Blob Hash="73ec4c28867867573cab01541be66f81033f6793" Size="665" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2093477" />
     <Blob Hash="73ed8592fe90ab9a8d08c6e499c8f5ceb4ca7605" Size="2014001" PackHash="5983c069abdec3469db5b5874ac27c17341e3f27" PackOffset="8" />
-    <Blob Hash="73f2e3395a6067d8774e8b5f45995d9f3e9b015c" Size="308196" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="1485176" />
+    <Blob Hash="73f2e3395a6067d8774e8b5f45995d9f3e9b015c" Size="308196" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="1542584" />
     <Blob Hash="73f42aa41e1b75dd8f693a282309513953f138e2" Size="1294" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="981949" />
     <Blob Hash="73f5466459c30a1ee9e2543ba65a82c2516108f8" Size="265229" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="38482" />
     <Blob Hash="73f752a3a45d421a25cb3e1daec46de63bbd8e7a" Size="1160" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="15151" />
@@ -51431,6 +51309,7 @@
     <Blob Hash="740b5f88992e558926b370d219de2091551bd98c" Size="156926" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="8" />
     <Blob Hash="7410107601b01b66f78208eabcf7d0518db80919" Size="17568" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="1390116" />
     <Blob Hash="741027a32e9f0abb3e396500e5c5dbbdc57ebd8b" Size="274" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1579972" />
+    <Blob Hash="741184016f1a1bbaa4666d9dbf07f1249c3f43b4" Size="752128" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="480264" />
     <Blob Hash="741776e9cdc8dab57b08f34f532a485fd521560d" Size="2898147" PackHash="61f733ce8b45e3dc992698e9ff989ba336cdd42b" PackOffset="8" />
     <Blob Hash="741aa2f2a9c5ed821ec11868ca74c176594e6fdc" Size="7184" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1500473" />
     <Blob Hash="741bb020da154c4976e28486aff8f7a309fefb4e" Size="122236" PackHash="3f13a842534c0c2f3779830462b5a6659ebbc859" PackOffset="1871016" />
@@ -51439,9 +51318,8 @@
     <Blob Hash="7421c200ae917083fdbb40680b53955940981b61" Size="5860" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1998060" />
     <Blob Hash="74245fde3d52d78b5fd7f38b2da4927c8a7ad863" Size="22842" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1262102" />
     <Blob Hash="742603cba1af98a1432cc02efb019b1a5760adf2" Size="16413" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1964695" />
-    <Blob Hash="7428c4bcd490d435fdde303db3abd94f9217c96d" Size="41472" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="2046932" />
     <Blob Hash="742a8cfb7e4389022b6441f9de3e83aa40d7ec3c" Size="70995" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="854510" />
-    <Blob Hash="742db51f40ae389893d986c0e91bef50d5ccab8f" Size="59" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552066" />
+    <Blob Hash="742db51f40ae389893d986c0e91bef50d5ccab8f" Size="59" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671298" />
     <Blob Hash="742f1a4a34051c766ba20528f49cbbaaa72827ee" Size="10748" PackHash="56ad07543c03a217630a832be8abe7b278adfbc4" PackOffset="2085497" />
     <Blob Hash="743044f7d6fec755a51c8268b7f4889cd57b5d4e" Size="872" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="298608" />
     <Blob Hash="743495e6ef984cc3d85faaa4823e7c24c0192c52" Size="183139" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="1828516" />
@@ -51456,17 +51334,18 @@
     <Blob Hash="744c8ae3123e2ec8a0a72b4403612f98b9506e80" Size="273" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1711171" />
     <Blob Hash="744cc3a0c31db483da67249b78c6473cf49d9f10" Size="18185" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="269292" />
     <Blob Hash="744d3ee9397084646c81e5c70d8458707aec31b9" Size="2912" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="911815" />
-    <Blob Hash="744fa3a27240f5e62153fb6807f62bfcd2e53e1b" Size="61634" PackHash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" PackOffset="2019690" />
+    <Blob Hash="744eeeb8f016c6df645536575f1594b88039cab2" Size="6008730" PackHash="d7f843e7b00e7b3213b0f6aca3eb288f7d602e45" PackOffset="8" />
     <Blob Hash="7453ccd639665932107822add70d216227d64063" Size="682" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1650090" />
     <Blob Hash="74580bc5fc5d2da48eecbff81ae2387642f95c4e" Size="62676" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2931" />
+    <Blob Hash="745816883db8b8378c764f8d915b44c289090e76" Size="2410" PackHash="e9fd3e48a792ca511bb0de9cd173aa5bb336d8bb" PackOffset="2092968" />
     <Blob Hash="7460c394a5c9752ac9ca6c038f6ffc8cb891cca6" Size="84" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2084464" />
     <Blob Hash="74618d9b5354dd575666dbb05fda172ef4e61f05" Size="179237" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="644773" />
     <Blob Hash="7461adbccaeb5e46c654d2051fcaeea9c52d1058" Size="2942" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1518628" />
     <Blob Hash="7467aca245d2d48d85e8d8e60db41bf0a6597d5f" Size="5595" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1194653" />
-    <Blob Hash="746a408c35f5f619c5276ac925c8bd584fa79851" Size="564296" PackHash="3407b695bf7b722711de14f998e247a6aca6b747" PackOffset="1274092" />
+    <Blob Hash="746a408c35f5f619c5276ac925c8bd584fa79851" Size="564296" PackHash="e6347b3badb113c35af36403f292693d70d46881" PackOffset="1289112" />
     <Blob Hash="746baf192a04b9981443b1a1e388e46e9763d3ad" Size="391" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="2095921" />
     <Blob Hash="746e96e7f58bf1fe1fda911080fa1a97a6362969" Size="296565" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="221101" />
-    <Blob Hash="7472b21ba81bcf88c21fdf2cfb1dc7b028a35561" Size="3267" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1951980" />
+    <Blob Hash="7472b21ba81bcf88c21fdf2cfb1dc7b028a35561" Size="3267" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2009383" />
     <Blob Hash="7474505a170fe166f2a361d903df403779ebf340" Size="234204" PackHash="57879f40e9c9382403204bb281cfc94a7148ea32" PackOffset="1714976" />
     <Blob Hash="7478e2275de558b3001b641ac4849a7bdd364e2f" Size="6880" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="46376" />
     <Blob Hash="7478ef129fe4da48f5ea883a867d2f16a5e3e2c4" Size="3164" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="167" />
@@ -51500,7 +51379,7 @@
     <Blob Hash="74be2702083f55e068d616b5c222ff158b216c9f" Size="2652" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1326436" />
     <Blob Hash="74c0ef644df12023d34c1072ff1bd3ca59465156" Size="1833472" PackHash="7d776a07e3eb045bc87ffc9ab7ffc5da18a5c68b" PackOffset="4104" />
     <Blob Hash="74c305d6cd9209a2938642bf125e62864cd67449" Size="3026619" PackHash="c18d93c3fb088e46dc560285a889e191b2350e3b" PackOffset="8" />
-    <Blob Hash="74c3687a0ca766b0aab4779dca17d4f7cdc35f5d" Size="415" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1421057" />
+    <Blob Hash="74c3687a0ca766b0aab4779dca17d4f7cdc35f5d" Size="415" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1540288" />
     <Blob Hash="74c56cb8dc4a7cc6a437d383cc7782374a486840" Size="1283" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1376896" />
     <Blob Hash="74c612f8ead5dc75e6d70bf57f88c4382bd8388b" Size="2871" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="448846" />
     <Blob Hash="74c91d7aa51694584cc30de6699cd2674b257da3" Size="92647" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1358250" />
@@ -51535,11 +51414,11 @@
     <Blob Hash="7505467f79277a3a7c71119a2ef7100f21e8d4c7" Size="2847840" PackHash="e8eac54315c98cac2e06b13e0aefb039d5ce78eb" PackOffset="8" />
     <Blob Hash="750ba63cfc47d70cf7b5f57e2c10e42073b6f74d" Size="243254" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="230196" />
     <Blob Hash="750d9b23373910d061b2f76fc052d56dca09d8e6" Size="11886" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="1885052" />
-    <Blob Hash="7511d60c5a1950089a37ee7c7c98a44684352f12" Size="3544158" PackHash="6317f5c50fc730217e0b7fd4c562342f3f9a1685" PackOffset="8" />
     <Blob Hash="7512a61836827dfd04303d0ce9384cc7ca63467c" Size="194" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="350332" />
     <Blob Hash="7516ba49ef93924edbae9f769cd6ebbc6dd59ee4" Size="2797320" PackHash="5a717ace8e2579b97e265a16eb97db380ab051aa" PackOffset="8" />
+    <Blob Hash="751e575065e8cf2c5daf1b15be5f12f2bb96a244" Size="47104" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2016120" />
     <Blob Hash="751edab49737d13c2b44b48d769c7e54245bf3b0" Size="3901" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="176288" />
-    <Blob Hash="751f52952064bb8638b33fde4a11b337cbf1e4fb" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552774" />
+    <Blob Hash="751f52952064bb8638b33fde4a11b337cbf1e4fb" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672006" />
     <Blob Hash="75200e2efff12ee441b0aa3856a27a8555ec4c69" Size="1586688" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="8" />
     <Blob Hash="7524d94f3fabc8ccfef35d789223f3cddc554129" Size="2558" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="72860" />
     <Blob Hash="75256484ec9bfb36facdfd55e80a1ef18ce51bca" Size="13137408" PackHash="deb368473769c4ea9248bf23453c03fe1292f373" PackOffset="8" />
@@ -51562,9 +51441,10 @@
     <Blob Hash="7536aff5744b28612368cc45521b02aff1e3fd9c" Size="13312" PackHash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" PackOffset="2079632" />
     <Blob Hash="75382235d4609640a483cc83b5ac6cab586fb66a" Size="9229" PackHash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" PackOffset="2082824" />
     <Blob Hash="75388eb60c39d76fca3f1ee5659e026bb395ff19" Size="7751" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1340655" />
-    <Blob Hash="75393cb35ae954b283b4d602998926c8b76e106c" Size="25276" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1529977" />
+    <Blob Hash="75393cb35ae954b283b4d602998926c8b76e106c" Size="25276" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1992847" />
+    <Blob Hash="753a4b804c3de170a7c3456fd53344a5e978482f" Size="192512" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="1699848" />
     <Blob Hash="753ae3d94d1b2a55fa8cfcc7e64d80055eeee8d3" Size="3856" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="551398" />
-    <Blob Hash="753bd582dbc8e4870261050489ed5238dbdd1d73" Size="1158" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1984121" />
+    <Blob Hash="753bd582dbc8e4870261050489ed5238dbdd1d73" Size="1158" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2016621" />
     <Blob Hash="753c1ca9b46f1cf9d06bcd695f6a803f5a2d9905" Size="4429" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2067083" />
     <Blob Hash="753c5217bf729600d8960259cb6426065e355600" Size="118217" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="1104898" />
     <Blob Hash="7541955c899af2c126a82c8197c20efd875798eb" Size="5586" PackHash="ac2c77918f717b39f4343aea48946b7781301f55" PackOffset="2087638" />
@@ -51579,7 +51459,7 @@
     <Blob Hash="7558f5bba2356df3cf2e6aebef776a790467a3b9" Size="124350" PackHash="f279ae70e30f66de7b592409e9ed96993301657f" PackOffset="1536136" />
     <Blob Hash="755c9fa172183059119b6b6277780180d9e7d3a8" Size="1849" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1290903" />
     <Blob Hash="755f8105a533aa2ba37c085a6c1222e7ccdd0081" Size="31" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="927063" />
-    <Blob Hash="75613ce7bb0881e67158b25bcd78c4649a1276ba" Size="8088" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1734548" />
+    <Blob Hash="75613ce7bb0881e67158b25bcd78c4649a1276ba" Size="8088" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1750314" />
     <Blob Hash="7561e914b899fad29ca7bdab6a17e1aa3b994313" Size="1905" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="507350" />
     <Blob Hash="75623867561c321f8d3c4d684eef5bcc7f8aec32" Size="5846" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="827255" />
     <Blob Hash="75630e79760f32ea4161ef87518fb4d1fdfd20b9" Size="1578" PackHash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" PackOffset="2092324" />
@@ -51594,6 +51474,7 @@
     <Blob Hash="757ebd573617a24aa9dfbf0b885c54875c6fe06b" Size="1804" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="920917" />
     <Blob Hash="757ec96c5cf841002537487a1323779e06acabb1" Size="258" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2096852" />
     <Blob Hash="758062df7cfe41f63b241f1645953f8a3473acb3" Size="73375" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1547809" />
+    <Blob Hash="7581c7de7ca8ffd128f9561a0188e4afc8d6c289" Size="4098376" PackHash="936e6fd878517039f678716fa2acbeabeb4c2a28" PackOffset="8" />
     <Blob Hash="7582b830132350c48ef35da7990191ab04db59ce" Size="9336" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="519281" />
     <Blob Hash="75853b0b65fc13cc7e1c5529f920b28bd2fb7ad6" Size="139053" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="298192" />
     <Blob Hash="7587de488517a134761686fef2d737dcd23f91f3" Size="143388" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="900975" />
@@ -51607,7 +51488,7 @@
     <Blob Hash="7598abe42c8a228aa98b7b4408b6a37989598542" Size="865442" PackHash="b2c80b92ad374247169fcc8baed57834533ed5ca" PackOffset="1111410" />
     <Blob Hash="7599fcace0d15d39efa6ea3f1870be9cc3c4dd60" Size="3374" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1705663" />
     <Blob Hash="759c784ff31c4350f17fe284bf1f76cc920d1a05" Size="7215" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="617574" />
-    <Blob Hash="759e5f8c869a6503cda230e531212032362afff9" Size="499" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1583350" />
+    <Blob Hash="759e5f8c869a6503cda230e531212032362afff9" Size="499" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1702582" />
     <Blob Hash="759e7fbb20bc7a69267e9c6c87bf6e27f7d42989" Size="5525" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="399622" />
     <Blob Hash="759f139ac1f00568cc63aeb24f34bab1ea57c9b5" Size="47" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070529" />
     <Blob Hash="75a2714ad8b0c6ba59cb64e9e8ea8e9dd245adad" Size="39424" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="716296" />
@@ -51635,7 +51516,6 @@
     <Blob Hash="75c9d324a3f8742b4c612fbe40d13553dd151fe7" Size="21482" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="957408" />
     <Blob Hash="75ce13fe1e5898d47b67f951c0c228851f1cc04d" Size="134671" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1884458" />
     <Blob Hash="75ce98d0cb4564ed59ea5cea828e3c7908b10280" Size="2260881" PackHash="b7c31df2f85ce2991c57ce3b891e33c658b16e93" PackOffset="8" />
-    <Blob Hash="75d478f91f6912c7089deb5e2520d8306eb778ed" Size="5282276" PackHash="e7dc94c809760add0550cc425bca6869cd46bcce" PackOffset="8" />
     <Blob Hash="75d87d3b8f06fc9e1101d9d297a7c8ec49377322" Size="36789" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1415250" />
     <Blob Hash="75e1eff57b35acf20f31817624bd9cb0e916234f" Size="8108" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1536178" />
     <Blob Hash="75e556d28155fb9b31320ad8a540391c3307c2e4" Size="36041" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1974397" />
@@ -51660,7 +51540,6 @@
     <Blob Hash="7608e4d9b43b5588d3d6e9863dabb485841c3a04" Size="158768" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="594473" />
     <Blob Hash="760a43a40a4f3af13b4bbfc36f1e0ac3f771755d" Size="265" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="371584" />
     <Blob Hash="760b0d011cd451a1adecd9330408360f2a21ad20" Size="3107" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="8564" />
-    <Blob Hash="76114e28d00e831a84552f42b5099e7041de864e" Size="13181844" PackHash="495e87c08928d9e45f9e97c56c4e4124cf72c252" PackOffset="8" />
     <Blob Hash="7614ec9b32f76047ebfec70763973ddef23373c9" Size="2341" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2014225" />
     <Blob Hash="7618c572e5e6a4cfdac27a8dc4b1eca1383c3815" Size="1303040" PackHash="8d19c6dac96e38d1f1252a260017729bb07a6157" PackOffset="8" />
     <Blob Hash="7619748fe34c64fb157a57f6d4ef3678f63a8f5e" Size="38205" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="464291" />
@@ -51672,7 +51551,7 @@
     <Blob Hash="762e2db089e5af6ecf8203ac28873e56652f575a" Size="3019" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="156313" />
     <Blob Hash="76300863ebe1fac7b7df04e4f48f7d2e2162984d" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2060508" />
     <Blob Hash="763117b1fd0bde2b0aaf2b8501c7ab3079c5c7e5" Size="6597" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="593590" />
-    <Blob Hash="76388daf57201f6d438a784393fd2174284028a2" Size="1101824" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="8" />
+    <Blob Hash="76388daf57201f6d438a784393fd2174284028a2" Size="1101824" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="8" />
     <Blob Hash="763970c0fa6ad9345577a08f679396b61c906e99" Size="1118" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="310264" />
     <Blob Hash="763a5e617c081db03508c054b6b99580ff1e73a0" Size="19968" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1496268" />
     <Blob Hash="763de194786fa4e71ddf50fb8aa1b4662bb2f6b1" Size="2314" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1256171" />
@@ -51686,7 +51565,6 @@
     <Blob Hash="7647fc5903432265797f9a62f8bb787e972687cc" Size="9033" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="803960" />
     <Blob Hash="764a0bc5d24827bab32f15a16991cf3445b3f4c0" Size="2773" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="593084" />
     <Blob Hash="764d4a25bd8f648865a9f59b1ee9e95bf569a031" Size="1773056" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="8" />
-    <Blob Hash="7651cffbca065a4d93e7de0fcc20aac2cb696863" Size="18544320" PackHash="5890f83802e49c6b0f02a37ac6f332ddafa9efb2" PackOffset="8" />
     <Blob Hash="76522a4d212db73876d6dff505acb36a8847c8a1" Size="22584" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1299192" />
     <Blob Hash="7652a5dbba1ea2a2d3f359d2d7447442d3a25807" Size="137934" PackHash="a58a934fbc6d256586f3ff17490f10c3a7c2517f" PackOffset="1387382" />
     <Blob Hash="7655ea92b203b72d3e187d0beb7ad6464771b6c4" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201311" />
@@ -51707,22 +51585,19 @@
     <Blob Hash="76715f8628cf55dfc73704a8c31f0b991583e3f0" Size="9260" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="649685" />
     <Blob Hash="76725752454bf36f3146fb1f0fc150d9098dda24" Size="2945" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="953193" />
     <Blob Hash="76733ed262dec9018fdb5957225bb4ca5e4db0da" Size="851" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="396739" />
-    <Blob Hash="76746d71c4062c099162d103c6fd24dfdf59ed2b" Size="8420414" PackHash="c6b354fd7e6d172b1507774ab87fe6b80238ace2" PackOffset="8" />
-    <Blob Hash="76754529eca97cab5068b348849b1f6c7818bcda" Size="16902100" PackHash="94805e9802392d99102da87a8887fe11f32cfc19" PackOffset="8" />
     <Blob Hash="767a1367c48238e1bbf83dd6efd755c707f03f75" Size="63542264" PackHash="8a4f2a9353805e1bee3b84666232d2456d85e880" PackOffset="8" />
     <Blob Hash="767bf125259fa96cfd02d9bb2dda44569ae882ac" Size="55535" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="697684" />
-    <Blob Hash="7692f9758b30c407579b8c6f7b974cc538c6fb9c" Size="1057" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1380068" />
+    <Blob Hash="7692f9758b30c407579b8c6f7b974cc538c6fb9c" Size="1057" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1499528" />
     <Blob Hash="7695be5eeeb96775ebac16bbd5d1939344d63732" Size="177539" PackHash="7f6c16e1c336e9396055bd74f798b7348e63c0e5" PackOffset="8" />
     <Blob Hash="769d49fb3167b06cd3864cfbbcf83bc16a413787" Size="20257" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="1974478" />
     <Blob Hash="769db7cdd24d3d90da22de2489ee7500e09eada7" Size="19326" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1890804" />
     <Blob Hash="769eb12849a83e9b5b97fbec4912bbdbd44b9ad6" Size="12024" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1473174" />
     <Blob Hash="769f9b7b0f74df7bb5590e304e8bae9da0facb6b" Size="157160" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="1597254" />
     <Blob Hash="76a58e4b9248872701c206c0988831fb2d6c71c6" Size="2330" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="138816" />
-    <Blob Hash="76aab40da418b1bb252dfd364a62d76ff84b8c80" Size="1825280" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="8" />
     <Blob Hash="76b178eb3923b9fd2b1d06ff3624034ca49a87b1" Size="394" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="181808" />
     <Blob Hash="76b3f11fc6daedc34db7df8a46100a6935bde2fe" Size="2095" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2048340" />
     <Blob Hash="76b631e7d259d74bcc399713d194a80a4884b72c" Size="29184" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="705905" />
-    <Blob Hash="76b92f9ec00ee266bea1df14b353ba71e1a74f9f" Size="188" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1602828" />
+    <Blob Hash="76b92f9ec00ee266bea1df14b353ba71e1a74f9f" Size="188" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1722060" />
     <Blob Hash="76bb606e429d80c326290d6abcfe12d2763e44a2" Size="18544" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2034229" />
     <Blob Hash="76bde158f7e6fc5c2bdc8a90e12545adad98836c" Size="114990" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="129485" />
     <Blob Hash="76c2366e23c3a5ff4d8d0fc8ac1d529cc52fc68d" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="688242" />
@@ -51745,21 +51620,20 @@
     <Blob Hash="76f0a2d3942104e95d05286002e521997189b209" Size="878" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2064273" />
     <Blob Hash="76f177f65398ad4c7247b940e71f8d061b480ef3" Size="2136" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1829133" />
     <Blob Hash="76f31e01d8f1198aa99664cb9a7171ad17043513" Size="3488" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="956716" />
-    <Blob Hash="76f36130bb99e47a1626f780b1d1ad2cfe3786c7" Size="776" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1449017" />
+    <Blob Hash="76f36130bb99e47a1626f780b1d1ad2cfe3786c7" Size="776" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1986099" />
     <Blob Hash="76f505a6ed1b1fdd93fa01836cb14bdc3f2928df" Size="33460" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1797036" />
     <Blob Hash="76f6b7e74a299dd061a50f18371090f65fd27e84" Size="8762" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1305141" />
     <Blob Hash="76f880c19710c3d1bb3c7463e6e30037adc3c9fa" Size="220886" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="1039328" />
     <Blob Hash="76f8e0f4cc43ce84caa5b796118888ba74319283" Size="154534" PackHash="354d41849e6ca4976e737a6e0332152c3d8dac27" PackOffset="814794" />
     <Blob Hash="76f91d8bf328cb1462b1a8df57287ee05c855e25" Size="48" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070431" />
-    <Blob Hash="76f942f72289ed072face80fb19946ea2bc15182" Size="713" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1387012" />
+    <Blob Hash="76f942f72289ed072face80fb19946ea2bc15182" Size="713" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1506472" />
     <Blob Hash="76fb940af425ff50db905f822ae6fe5be1e56bf8" Size="3521" PackHash="8eea1cf900a27487381f3e81893b5e8685569c89" PackOffset="2093098" />
-    <Blob Hash="76fd4c0b9ec7cc36f63c087e023de483d916b517" Size="161428" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="1874302" />
+    <Blob Hash="76fd4c0b9ec7cc36f63c087e023de483d916b517" Size="161428" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="1905166" />
     <Blob Hash="7700e9ad97df84e8fc32d000412168a08235887f" Size="3025" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1896234" />
     <Blob Hash="77014a0502da1342efa41b64c5613839b627354b" Size="7230" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1545016" />
     <Blob Hash="7704526b124802a8ef30405a36092e59df5d2122" Size="4345" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2053941" />
-    <Blob Hash="77077fb0f9db6ddb401e92edb7c355b98f56b6ce" Size="4592" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2038858" />
+    <Blob Hash="77077fb0f9db6ddb401e92edb7c355b98f56b6ce" Size="4592" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2090176" />
     <Blob Hash="77078795d2004e6f27568488e812350a5c5e7648" Size="22086096" PackHash="8af342795a1559f0cd211e98eb1bcacea96f8bc3" PackOffset="8" />
-    <Blob Hash="77078b4ea125d8002255e58e12f99c8bead084d1" Size="68078" PackHash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" PackOffset="2018920" />
     <Blob Hash="770cd9b74d6120bf6cc44892d554e6c6e58d35f9" Size="2952" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="101470" />
     <Blob Hash="77110e32964e52d946b3382c19aa4fe886223027" Size="4425" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2065129" />
     <Blob Hash="7713507c82f96d76fc0a6fedae030a1b6040487c" Size="36046088" PackHash="055e2c4f26219ba201c39594ac6c4ea696ecbac6" PackOffset="8" />
@@ -51783,6 +51657,7 @@
     <Blob Hash="7746ebbd33c698c366018c3fd82d506bf34a3883" Size="13824" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="245256" />
     <Blob Hash="774eeeb74472fcf5148b715d2f9d9723fe800912" Size="154256" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="625157" />
     <Blob Hash="7756049b4cd6459742686925e9516e64a9727306" Size="188" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="165471" />
+    <Blob Hash="77563fd7f4e692ba0e7a40dbd65e1f1cd2c16ba0" Size="246" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2082102" />
     <Blob Hash="775e0889ce8080f79c8095875f0e491791a799d4" Size="144360" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1885721" />
     <Blob Hash="775eebc9bd4c96e8268d2a41f081df8f584244fe" Size="185" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="151948" />
     <Blob Hash="77626b633a2a1e00ec86bfd95d198910e4143905" Size="3422" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1730730" />
@@ -51800,7 +51675,6 @@
     <Blob Hash="7777d45c10cff098342299b757f5a3b75430bf14" Size="22424" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="949306" />
     <Blob Hash="777c5d9acef066a80e6139d38b5ef8183189d57c" Size="5566608" PackHash="47ada8f01106c1e11360fd7e4b46382a30b34cb6" PackOffset="8" />
     <Blob Hash="777cec19e1b93b74969ce794f47d892f753ee56e" Size="495" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="520950" />
-    <Blob Hash="777f649e2c88d0dc0cc4340a6ac2f80d7c4761e5" Size="1795088" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="8" />
     <Blob Hash="777fa8aba92f98921a11dcff52e21a1b7521afa9" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="725394" />
     <Blob Hash="77816e06e98c90fc3f58cfe29e69e7c5bbccd039" Size="2068480" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="8" />
     <Blob Hash="778190090813d8d3a7d9707fe011fff3d0f55256" Size="81664" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1190695" />
@@ -51820,11 +51694,11 @@
     <Blob Hash="779a0621f96367250dae4584ca35f8601ad146aa" Size="2617" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1719551" />
     <Blob Hash="779a6b3711778125f8680a93847800effcdf1caf" Size="29486" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="383552" />
     <Blob Hash="779cc99c1217495a2207a0816e6229e39b00d3d4" Size="3164" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="821481" />
-    <Blob Hash="779ec06721ead10c703377f7e18b5f1160045749" Size="2144" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1003818" />
-    <Blob Hash="77a468b0e92b77920c34716cda0ec88ceaca5c46" Size="3651" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2062646" />
+    <Blob Hash="779ec06721ead10c703377f7e18b5f1160045749" Size="2144" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2051335" />
+    <Blob Hash="77a468b0e92b77920c34716cda0ec88ceaca5c46" Size="3651" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1953777" />
     <Blob Hash="77a65d4e16b56c6b782d2950405ada07d09c6862" Size="58" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="840152" />
     <Blob Hash="77a715db94505a3bc1af4c100671bac6f61e7afd" Size="704" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="256917" />
-    <Blob Hash="77a77982fa3c34e71ffbba37bb6935511b43e5c4" Size="16080" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2061146" />
+    <Blob Hash="77a77982fa3c34e71ffbba37bb6935511b43e5c4" Size="16080" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2021790" />
     <Blob Hash="77aa56005777805509d160fa747226646c734cdd" Size="13856" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2052767" />
     <Blob Hash="77ae330512ebfef430a02213644bd1cfce174298" Size="1111" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1808802" />
     <Blob Hash="77afcdeca7ad11a2f2a3a33e48751b95a133a9e7" Size="801688" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="988842" />
@@ -51856,8 +51730,8 @@
     <Blob Hash="77eba79b88ad95398c6b0bcb21d7235a02e579ab" Size="19237" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="428089" />
     <Blob Hash="77ec69727c92ed9bdd6e9fb7f4a7261689f41000" Size="136471" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="1940427" />
     <Blob Hash="77ecbf2331572770a86add90ba14d0fb1a611ebd" Size="1576" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2052334" />
-    <Blob Hash="77efb8198ebe72f4ab170c3ee55db7be80194feb" Size="1089" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1313126" />
     <Blob Hash="77f09502d094bfa8e3c8097b88a6d6d1aeee8029" Size="3861" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1337041" />
+    <Blob Hash="77f244f3f0b75538de58b9d651a5e2f4d002f8b7" Size="115488" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="1873956" />
     <Blob Hash="77f63a7799b1e73a408191f5a8d5b66277d5e947" Size="8770432" PackHash="7fe7fc67e9a9353f92faeeb4667a959414552981" PackOffset="8" />
     <Blob Hash="77fa314ddb7e4c0e41b6957163bf10145d9fdea2" Size="4613" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1166153" />
     <Blob Hash="77fed4489b0d87f48f9284f66e3634374f92f255" Size="13365" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="547928" />
@@ -51866,12 +51740,12 @@
     <Blob Hash="780137fb056b59940d160c9261efd8608f6b4fee" Size="39332" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="501120" />
     <Blob Hash="7804e1ab27fd6a6e8989af70c47f866ba89db9b1" Size="501" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1373013" />
     <Blob Hash="7809cd2fc4ae96b7202f9107c8218f272bac6fa1" Size="2083" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1485371" />
-    <Blob Hash="780fd13b67c7be7f3d9b3ebb679129e1a070c949" Size="120196" PackHash="c186e17712d48f5c0290a0dd22d99e6357fe7ecb" PackOffset="1933038" />
+    <Blob Hash="780fd13b67c7be7f3d9b3ebb679129e1a070c949" Size="120196" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="1897032" />
     <Blob Hash="7813b54bf2bd0c40a39ca9a29cc50c6d034880a3" Size="189" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="626604" />
     <Blob Hash="78144b3a2c75568307e4e86ae3b01ea7f541b011" Size="176" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="626793" />
     <Blob Hash="7815a3df2e06105f0acfc09e506b2aa61136fe5a" Size="31784" PackHash="1a89dfb24d951c919ad4f1942c52ba8f42fc896d" PackOffset="418964" />
     <Blob Hash="78185e61d4cfc45f2ed939230217e32aef9bf65e" Size="64004" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="1356895" />
-    <Blob Hash="781b12f50f906eac1eb9a302feb8c30691f67164" Size="2510" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="2089324" />
+    <Blob Hash="781b12f50f906eac1eb9a302feb8c30691f67164" Size="2510" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2082864" />
     <Blob Hash="781cecce2ed3dd112992ba200ac1e4a2195b5868" Size="224" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1591724" />
     <Blob Hash="781f81fb98645208350123fd1b4122680ba79010" Size="42892790" PackHash="19c40145156ca7992c5f7795f3d71402b8e688b9" PackOffset="8" />
     <Blob Hash="782124c2270f4c87c8bc3770a3684e9549f50bd6" Size="625708" PackHash="390a2f67478dbffc964bd3c94a21bfd967b67869" PackOffset="1092411" />
@@ -51891,7 +51765,7 @@
     <Blob Hash="7845125fc4a6d297268c1ffeaac8e99eeb8acefc" Size="263643" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1370957" />
     <Blob Hash="78483560ed7dd4fda3b34258187012cd229c664b" Size="4541" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2046267" />
     <Blob Hash="784ad1082ff1569961c2ac44f6d6f7605fbbe766" Size="184" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="627153" />
-    <Blob Hash="784e80ee7fb32f2b4924d56c0614a654786f9072" Size="5061" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1953460" />
+    <Blob Hash="784e80ee7fb32f2b4924d56c0614a654786f9072" Size="5061" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1894582" />
     <Blob Hash="784f544563d391befaab71b7cfbbf5927967bf84" Size="1217" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1984533" />
     <Blob Hash="78508f392fe074747384ec8e85477f05a6b2432b" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="580428" />
     <Blob Hash="7850c40c972f12437a99988c6c89df6c9f188c0d" Size="2897" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1947662" />
@@ -51914,19 +51788,17 @@
     <Blob Hash="7871cf7953b4902434d612231732293738f68ca0" Size="3121" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="284984" />
     <Blob Hash="787371cc9c3a59a0a3ac02c441242e6b1b0fbfc5" Size="2287" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2092244" />
     <Blob Hash="787826cf0b8549002ecfcfaae8cb1908389b14b3" Size="3274" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="304282" />
-    <Blob Hash="7878462011f28234b0cab31cc71b2a448744aa11" Size="270" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2064300" />
+    <Blob Hash="7878462011f28234b0cab31cc71b2a448744aa11" Size="270" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2084308" />
     <Blob Hash="787a04037a355ff845025b8865335eb938280bfb" Size="250" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1073063" />
     <Blob Hash="787f67154624457aaa37bb5f6b8945b36a0c35cf" Size="4818" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1710356" />
+    <Blob Hash="7882128cee711c0cd7734933548a2d378ed43916" Size="8865240" PackHash="00ac7fde855f55172b02e9a5de727a53f921439e" PackOffset="8" />
     <Blob Hash="788445aed3f5f367fa1ac4a0fb87034e11e4ce83" Size="16442380" PackHash="47c6577e9a9310adfea63c995c6d7e3eb6dc4e67" PackOffset="8" />
     <Blob Hash="7889ccb82ba381ede69f6928678fdc011f5db77f" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="571040" />
     <Blob Hash="788a326fdd5bafe85a932a266b3d257b407fd3c0" Size="3032" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1755481" />
     <Blob Hash="7890638528e9ec73c04c62e9c56760fef62e8654" Size="134400" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="571310" />
-    <Blob Hash="7890a4486c1360c6e40ace45fdae73db7d0b4ea3" Size="3843668" PackHash="353c4f86cb57681705516b85df045d36c33b8f86" PackOffset="8" />
     <Blob Hash="78924651cca8a47d0299618be35c237cb825cd9f" Size="64656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="201632" />
-    <Blob Hash="78924b7eeca566460c59dc9ffe7817dfe108de92" Size="61744" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="1997208" />
     <Blob Hash="78980325f8bd70d0fc50785a533217e5c7f78730" Size="6054" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1967152" />
     <Blob Hash="789bdbabb5963567a3c5d8d883c9cb2665acadc8" Size="392605" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="1658804" />
-    <Blob Hash="78a0622043dc7bfc8bf1a7c8aaa791a72ac4264d" Size="2033560" PackHash="2ba76e3905a2c522342a8fc899d371ee5aea9763" PackOffset="8" />
     <Blob Hash="78a4a3bfb91aaa1f1aa339228125af73bf7ed221" Size="113693" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="352379" />
     <Blob Hash="78af6e84b7dd56ceed551580d6634ff40d0b9aca" Size="2843" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="826301" />
     <Blob Hash="78b1982a532a5dca43694a0dc20bad0ebceeb8c2" Size="18768" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="682247" />
@@ -51937,6 +51809,7 @@
     <Blob Hash="78b927692598c0c33fa3ad30d81cd1e26d5b8a7d" Size="3106" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="469213" />
     <Blob Hash="78bb45d94a03bcc83db5e0f2458fef18a6df8402" Size="4345" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2011759" />
     <Blob Hash="78bb484ac7f35c79956d8ea669bf78f45750bd78" Size="3599" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2064582" />
+    <Blob Hash="78be617fb907713b1089d3738325b43f0dcabdc5" Size="5637838" PackHash="5f86aba1196468dbe22e3c344fe12a41a5164c12" PackOffset="8" />
     <Blob Hash="78bf65c2b3e0cfa966f71a9814d5734105b3edc6" Size="3460" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1962322" />
     <Blob Hash="78c31ce4a71fb4a6a6b2f9003fe2d8d4b0fc735e" Size="2245" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="761593" />
     <Blob Hash="78c496063e0008d426ad99730efd57341235f3d6" Size="3333" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="1320379" />
@@ -51949,14 +51822,12 @@
     <Blob Hash="78d604a9388cfae3c7f216f6f65c3c92c0914b5a" Size="4877" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1370848" />
     <Blob Hash="78d607e96f20cc987801f4465915d96603ed3dc3" Size="412348" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="8" />
     <Blob Hash="78d890d43e355e8dbd6c93c4789751a714aa8e40" Size="2076923" PackHash="292a8fbb5a1aff92533e52ded470f85af5ffd6c4" PackOffset="8" />
-    <Blob Hash="78da8dee47cf708d075e28bda1ebf2c6559acd7f" Size="5274926" PackHash="061591c07234d834b557294c0ba6178697706847" PackOffset="8" />
     <Blob Hash="78dd4d4b0658c75ee247000af3b2060e8db614dc" Size="7784" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="780351" />
     <Blob Hash="78e5059f25986ce6a20ade166959705be1a4dc9b" Size="2074" PackHash="59aad3440eda11860e175fbcdcea226318e3d677" PackOffset="2083059" />
     <Blob Hash="78e556d93df61fe87f2b03fd871175cf4f00a799" Size="13262" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="1873421" />
     <Blob Hash="78e5adc3987e62d8e2eb0d8a0372b1f5e841c322" Size="10267" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="2044984" />
     <Blob Hash="78e643d2ce54875943f5a60f2a408ad76dfed367" Size="588" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1532435" />
-    <Blob Hash="78e85b89457e910123ec8342199783f0b44cc5a4" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554867" />
-    <Blob Hash="78e8c36d009273a970eda15f2363c2fe6577b63a" Size="564" PackHash="8a0788b72102ac1127cbb79e7373db8b78384833" PackOffset="8" />
+    <Blob Hash="78e85b89457e910123ec8342199783f0b44cc5a4" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674099" />
     <Blob Hash="78f0410702e8ec6d31983a30c0de4a11afb1cd1d" Size="9614" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="1033641" />
     <Blob Hash="78f0574bf696542e8b92981ced1babb9c2673317" Size="906" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2081279" />
     <Blob Hash="78f3ac517ff8990c4dcd7fab8df328dd28b0c838" Size="967" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="629966" />
@@ -51966,6 +51837,7 @@
     <Blob Hash="78f981713b3deb36fbdb6228d42e955bfeabac92" Size="100" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="126096" />
     <Blob Hash="78f98f9d64c6497366a6ce0a6dce1262127df32c" Size="523975" PackHash="10917aeabcd8089492835f6fdf0cc16d5545cb80" PackOffset="331727" />
     <Blob Hash="78fbb8b30058461a801477a1f8dd9406e3334dcd" Size="2096" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2087410" />
+    <Blob Hash="78fdcc1bda01350ede0f65a85579e00546dd5097" Size="6492624" PackHash="931c15604130db39ccab732008fccb38835e9dbd" PackOffset="8" />
     <Blob Hash="790207aa86031e3f49843206a89fb6700eec1401" Size="7947" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="206186" />
     <Blob Hash="79111a2c48cdb7b6b2cfd952b9b507793ca15ca6" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2060708" />
     <Blob Hash="79156a3ace7fea9d751866b9e6ca65bc2b034339" Size="10227196" PackHash="bff29f56d02117982026f760ada459561651f176" PackOffset="8" />
@@ -51978,17 +51850,17 @@
     <Blob Hash="7922cf7b3212238a6160d2126a5f594c2fbdc767" Size="7429" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="799364" />
     <Blob Hash="7923c13389ee2614d3a3fcf653ff89a52edc4390" Size="19237" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="477571" />
     <Blob Hash="7923d759101517823b14f272df244abb34add1a5" Size="197059" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="913972" />
+    <Blob Hash="7926f3894429e6a3ffb945ceda75b70311bd0305" Size="2500" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2084126" />
     <Blob Hash="7928c2e18ff9243074df9dd2dbf76542ba0821fd" Size="603" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="367304" />
-    <Blob Hash="7928c4c7474c6a2a1de8a63ccd4df9490cd3a04f" Size="8994" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1768397" />
+    <Blob Hash="7928c4c7474c6a2a1de8a63ccd4df9490cd3a04f" Size="8994" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2083343" />
     <Blob Hash="792a1e4f1d1a6720ceccf336875edc997efb32e5" Size="664096" PackHash="629161f1442cc070f84ca259e983259288e25a85" PackOffset="8" />
     <Blob Hash="792d1baa1b3d755533833dc88b33277406ecb78b" Size="186930" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="1208118" />
     <Blob Hash="792d5c8eb3db3645100227713b90f0de54145d22" Size="2520" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1755033" />
     <Blob Hash="792e13509be8f037ef2ce34da773cc3c588410c4" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="519688" />
     <Blob Hash="792eb397393ec49189f5c5a4beace82a8bd99205" Size="7294" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="318120" />
     <Blob Hash="7930354a0cb7bee500d671cfb6df0483a5f03469" Size="4288" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1662635" />
-    <Blob Hash="7932dab4a4fac0e60d84c22fc98be5b8797780f2" Size="2734592" PackHash="f006965ade23fe6e50d931e25d64fc216760e675" PackOffset="8" />
     <Blob Hash="793346900206ef69c495187477553ce4c8e172e2" Size="3854" PackHash="8305a66fae9404fe58331fbef287d0215d05f2b3" PackOffset="2093081" />
-    <Blob Hash="7936f9a6690c04cec20cdd3b270bda83a613582b" Size="25048" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="2031092" />
+    <Blob Hash="7936f9a6690c04cec20cdd3b270bda83a613582b" Size="25048" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="1924550" />
     <Blob Hash="7937cc1f0d72f6695acda4b75bf9769ccfc09168" Size="2903" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="820571" />
     <Blob Hash="7939c33d7dbd7a569465959bfe811677e173ecf4" Size="20030" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1199190" />
     <Blob Hash="793f2cfadddf24fc521cf18f7c3c5e67b92c3f67" Size="99776" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1916256" />
@@ -52000,6 +51872,7 @@
     <Blob Hash="795456dc4bfa16c4555a6a9aae776b68bec97572" Size="61184" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1922167" />
     <Blob Hash="7958567cba76e17a58b904cb050bdb6163b16af0" Size="1601" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1848683" />
     <Blob Hash="7958e775e192b989005458dc7050d9b4e17bc17f" Size="657" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="839373" />
+    <Blob Hash="79597cd37c94069f42c288687646ee19f39a6a03" Size="11330359" PackHash="c12c9bc3cdab94c2819c2999b5dccb3a9bed89f1" PackOffset="8" />
     <Blob Hash="795acd335499056799047831e26099227bb85ae4" Size="233768" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="1010427" />
     <Blob Hash="795b327a067088abe7d325c90b27018aacfc373a" Size="342560" PackHash="4cd1d29d63217d8c35aeb9eabacc3157ad7cdcbd" PackOffset="1722208" />
     <Blob Hash="795b6c56f9c2e42ece304443ac6ee57ed481a36d" Size="21936" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="879039" />
@@ -52011,7 +51884,6 @@
     <Blob Hash="796f38495fe54d8047b9ef082a917657ee17ae69" Size="86666" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="259115" />
     <Blob Hash="797379da0b23f718fbcc063edb73ea4c939fa332" Size="90716" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1943649" />
     <Blob Hash="7973b5bad3d18156b33c6a4df1f164113f20bdbd" Size="1205" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1319614" />
-    <Blob Hash="7973feba8a1e20f21bfc93c8d8909a66842a799a" Size="5488782" PackHash="8ff5d7c5b9e7596e4c98acfda44948410292c113" PackOffset="8" />
     <Blob Hash="797542d9f6662f1b05860429d1d5c9372d2384ec" Size="213783" PackHash="c04612a30dff276399c9d8a654fb688e2fed1fe5" PackOffset="609997" />
     <Blob Hash="79755e0a63399cb4d2ba21e97596c39e2ad37491" Size="8330" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="129064" />
     <Blob Hash="7977d6faca2e620e126648fd4631e5a05b327f43" Size="315274" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="210361" />
@@ -52038,7 +51910,6 @@
     <Blob Hash="79b83e2b168bfe18a4c9e613ba8700ed93cfc176" Size="15849" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="2039635" />
     <Blob Hash="79b8d91ce2e1d3f761304f261e573467abc6a146" Size="90917" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="899867" />
     <Blob Hash="79bd499d23d05c08f4a43950671585ffaaa13ee1" Size="6090" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1422406" />
-    <Blob Hash="79be80fb83525def15c3132c90dddd85ba8a9d93" Size="247108" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="1586696" />
     <Blob Hash="79c05da23ce975f91f4aaa016bacc3e8c2085f80" Size="28416" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1086384" />
     <Blob Hash="79c0f63ac23e03fdb6f376ab979cbe74338cd67c" Size="51" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070823" />
     <Blob Hash="79c0fb96efd4457ea072c49cf9aa3745ff84b7ef" Size="124683" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="1436043" />
@@ -52051,19 +51922,21 @@
     <Blob Hash="79cf82fecef912dc76b59515125675f03343c396" Size="151" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="259818" />
     <Blob Hash="79d1880d7b976e9f72994fc23cc750c1bd17dba9" Size="41325" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="52034" />
     <Blob Hash="79d4dd194620af3cc05c25e35658898c4d3aede6" Size="5183550" PackHash="6171625c0f5e59113ee53f76e21ade838dce9cdf" PackOffset="8" />
+    <Blob Hash="79d9bdd67133309c7cae40bc3de8b416c84c3c23" Size="20087968" PackHash="8cd7fb60dd6c4c5b4314c61a01d388e9fbf943c0" PackOffset="8" />
     <Blob Hash="79da1b128d93e9d9d657ee91743f760843ecacee" Size="32215040" PackHash="378a1b1ed8ca7ebdb824a2bb2b46bf6acc7f70a0" PackOffset="8" />
     <Blob Hash="79da6a0164221369a0195a93eb79b82e27d71201" Size="524" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2078457" />
     <Blob Hash="79da978ea96e3a72f1b54f8e6c386edfa0754b6c" Size="22951" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="363663" />
     <Blob Hash="79dd158bca500fb6f7fe216fb37524bc5b72e6db" Size="17693" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="365039" />
     <Blob Hash="79de0096e038de522ec383440bf8b4aaaf2c3e4b" Size="39789" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1821588" />
     <Blob Hash="79e16c47c70264c425ce7d6234ba572b295dd2aa" Size="3188" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1546794" />
-    <Blob Hash="79e3134b821e42aeb9400be948f42d61fb096907" Size="9229" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1654977" />
+    <Blob Hash="79e3134b821e42aeb9400be948f42d61fb096907" Size="9229" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1867086" />
     <Blob Hash="79e4e63523213e67c6dc131b85e8a6b3864d573f" Size="36864" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="777736" />
-    <Blob Hash="79e87587ba76190cbaa2856b72b288f1d4acb1ab" Size="578" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1604021" />
+    <Blob Hash="79e87587ba76190cbaa2856b72b288f1d4acb1ab" Size="578" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1723253" />
     <Blob Hash="79e9aac48109c796d3648ca235722ae724ce3f60" Size="47646" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1590708" />
     <Blob Hash="79e9d280b5f8e91cf155d6359e65863856c50169" Size="18853" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1705493" />
-    <Blob Hash="79eae677cb8169bbc6abe58076bec1506d74e668" Size="1924" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1565736" />
+    <Blob Hash="79eae677cb8169bbc6abe58076bec1506d74e668" Size="1924" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1684968" />
     <Blob Hash="79ec5a1029872125ef6aff536e3d24352b6f45db" Size="963" PackHash="93566441053b4785e395d918bf77da92f4aab7ba" PackOffset="2096169" />
+    <Blob Hash="79fb5e5c4789a3c69d33d1c0517c93d7f64110ab" Size="5638070" PackHash="5205120716d13cb3ed6f8dc7467c164226035b53" PackOffset="8" />
     <Blob Hash="79fd154faf17404f2dba003820026c4c7128ba41" Size="4024" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="713086" />
     <Blob Hash="79fe4be91014aa34e32e5066ffe61f9ebb0a783a" Size="943" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="644321" />
     <Blob Hash="7a006f9b0941811293874bbba953917611238354" Size="1028" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2074055" />
@@ -52079,11 +51952,12 @@
     <Blob Hash="7a0c20da63eb65022de977facab1492a1d83993c" Size="35175" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="277929" />
     <Blob Hash="7a0de52ceb289141dcad7bf2d84e86ed101ef9f3" Size="5592" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1821661" />
     <Blob Hash="7a10f97a66e397b61bd92b492b3d9170e5eee55b" Size="4101" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1695667" />
+    <Blob Hash="7a11bddfcb427b5b9bfcccc3792bc0a74fbc0dbe" Size="11745782" PackHash="5236fe555ea38c080fb1c3d761a37c40a77a2eef" PackOffset="8" />
     <Blob Hash="7a12de444c65f142607b794f1fba4b8ae0422b79" Size="2147717" PackHash="6b04c4c7c10d622fd9b520deb1d65df208affea3" PackOffset="8" />
     <Blob Hash="7a171c42fa927323189647d7beeca7349623c615" Size="2975" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="848030" />
     <Blob Hash="7a1978ff5f402269068a53c8f6726ad1e26bb12f" Size="11672" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="985159" />
     <Blob Hash="7a1b1e05ecc1e57b0ca4e9c98a57bb4b79b85025" Size="12956" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="452873" />
-    <Blob Hash="7a1d9975208d588ab2e7c2358505201b998c3bfd" Size="253" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1603016" />
+    <Blob Hash="7a1d9975208d588ab2e7c2358505201b998c3bfd" Size="253" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1722248" />
     <Blob Hash="7a213a913d8fbbe6585979543501941c70c299c2" Size="5378761" PackHash="cf1a24f37cf747c367bb89fa88a6a5397f94878b" PackOffset="8" />
     <Blob Hash="7a25b3a4eeeafc6fec1e19919a7175e996bf6036" Size="554" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2063831" />
     <Blob Hash="7a2724d866384c92b159e529746df0d70a502974" Size="5481343" PackHash="1471837617ec5898ca2e49cf20ad5e0795687b7b" PackOffset="8" />
@@ -52098,7 +51972,6 @@
     <Blob Hash="7a373fd4d04970dc5bf142eb9b88ac3df289183b" Size="284" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="217457" />
     <Blob Hash="7a37dc4d5bf018456aea291cee06daf004c0221c" Size="1080" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1654482" />
     <Blob Hash="7a3f3be14f98748e1cce87aa8ebd92dfd09a17d9" Size="53494904" PackHash="d9f6664b38f46beba670dc729faadea7888f86ec" PackOffset="8" />
-    <Blob Hash="7a410ef7c67731badf0678f244404ba7eee912cc" Size="7054" PackHash="12582f0c651cdaf8a3d2ed39d6d5c41ff2045005" PackOffset="2085178" />
     <Blob Hash="7a42fd4997f759e4471a5b73c202e737ce629c98" Size="4223" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1831861" />
     <Blob Hash="7a449b221e9ce2fd7f4674aea58715d32ae1fbc7" Size="271" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="403067" />
     <Blob Hash="7a47430667aa4a9e5e67dcf02d597d24198a28d6" Size="18841" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="709165" />
@@ -52107,18 +51980,17 @@
     <Blob Hash="7a4c83bd57192eb86b9663862332a3319d8ad025" Size="186742" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="202569" />
     <Blob Hash="7a4f46f6642286d816fb6e87ad937d5cf9be8757" Size="104343" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1779863" />
     <Blob Hash="7a51281e3050ee9526b0766d1b77c32ce3d8d067" Size="71850" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="956250" />
-    <Blob Hash="7a521c9e2917b6e7014f134ef9d7a208aea11760" Size="6697704" PackHash="49c9437be4c8e47b9a8143349503387887702326" PackOffset="8" />
     <Blob Hash="7a54d6dd03d2ee541688b63f1c09e15803cef6a6" Size="6588" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2081288" />
     <Blob Hash="7a562b1e3179dc6848b9add9cc06465db1ee3d03" Size="15011102" PackHash="74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f" PackOffset="8" />
-    <Blob Hash="7a5a935a04f841e64f953a6c0b0ff91491b4007d" Size="284" PackHash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" PackOffset="2096868" />
+    <Blob Hash="7a5a935a04f841e64f953a6c0b0ff91491b4007d" Size="284" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="2096831" />
     <Blob Hash="7a5aef763b1d6ae90dcceebd55c2b98f3565163d" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1114872" />
     <Blob Hash="7a5d0c735c4a527fdd10e3e3d82beb3c62fadeeb" Size="303" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="171670" />
     <Blob Hash="7a5f4c178f5cb040e1c6707d1005eceb0f9738d9" Size="3976" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="155656" />
     <Blob Hash="7a6038c9a6d01815c64824522e844b04665c82da" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096825" />
     <Blob Hash="7a6134293cc6b6bd9dd3fae3fa242f72c14daefc" Size="136" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2013024" />
     <Blob Hash="7a62256a9c087aec7b01d35314677a465b1939dc" Size="8509318" PackHash="bb460b3e140c2f392d72e7c74692448005f35d82" PackOffset="8" />
-    <Blob Hash="7a64f2a21cab8afc4b837925315d461e01b28172" Size="44036" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="897156" />
-    <Blob Hash="7a659d75377a0b623758c669f60f58cd5b2f933d" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555219" />
+    <Blob Hash="7a64f2a21cab8afc4b837925315d461e01b28172" Size="44036" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="1965046" />
+    <Blob Hash="7a659d75377a0b623758c669f60f58cd5b2f933d" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674451" />
     <Blob Hash="7a67ae67f07e1f0a8f578b9b31bde32e37fb1233" Size="427" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="821538" />
     <Blob Hash="7a6ad189a9587f35e3eeb9223b143c89c546b9e2" Size="967" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="637651" />
     <Blob Hash="7a6d4b88f1fdac755e094f2d3ab6afa8cd7dff70" Size="2940" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1685395" />
@@ -52127,12 +51999,12 @@
     <Blob Hash="7a734bd0ba48b697a27746ac20b8a943831a1fbb" Size="5157" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="126081" />
     <Blob Hash="7a73bf3187a4ac6261f25b07f3691b4cec1f2a24" Size="2951" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1459699" />
     <Blob Hash="7a75fe56394a68d4b48b90ac0b5831949ce38132" Size="2689" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="661249" />
-    <Blob Hash="7a77d15168bf19f10f57ec549037ec146d6c87ad" Size="3300" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1190143" />
+    <Blob Hash="7a77d15168bf19f10f57ec549037ec146d6c87ad" Size="3300" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1634974" />
     <Blob Hash="7a79c725472867604b06b426f7444538942fd9c1" Size="16736" PackHash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" PackOffset="2079661" />
     <Blob Hash="7a7afaafae031b9163a5fd0616faf98e7a9aa03c" Size="13668" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="621008" />
     <Blob Hash="7a7cb90e54e6b467371c6c69a51d5630f25ecdf8" Size="3800" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="981994" />
     <Blob Hash="7a7dfcbe38ff0e1412b794a6913ffd62642a79b1" Size="9728" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1567948" />
-    <Blob Hash="7a7ffcc4aed83cc18a7f71276dca2ae4a84c367d" Size="2740" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2015954" />
+    <Blob Hash="7a7ffcc4aed83cc18a7f71276dca2ae4a84c367d" Size="2740" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2074510" />
     <Blob Hash="7a8026c5d2cd329a0a4eb78ce4c8276c8fc377f8" Size="17137446" PackHash="65cf476808fee5c3bc202efe4022d7cc1a4c5459" PackOffset="8" />
     <Blob Hash="7a80488f13d062f8ca91f99879260bfb574e2840" Size="50336362" PackHash="e9bc0e8f3c60852f3e98fb6b9411528577e59682" PackOffset="8" />
     <Blob Hash="7a8530e19c41b12a945b98fef7f943a4ac565c54" Size="116459" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="830673" />
@@ -52140,6 +52012,7 @@
     <Blob Hash="7a8970224dfa8b8bf758d7e441492932c29e7f33" Size="2050760" PackHash="9f56eb8b6412fc882c33d6b394e29a2da81bd470" PackOffset="8" />
     <Blob Hash="7a8eae9da6eac29275bc348b9b7e5b08003ca8ed" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719722" />
     <Blob Hash="7a8f5e64f22cf61d4e528082191744499166af63" Size="1834672" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="8" />
+    <Blob Hash="7a91df0b249ba5cf573518ba299ffe01d3c1f390" Size="7664504" PackHash="11e438a0e9cce9a7f418f5a51b11ed64bc1b9a1e" PackOffset="8" />
     <Blob Hash="7a943f90384ae0863dc46e75543522b9f4f1f417" Size="2352656" PackHash="608790bfd1d81112aaa4473c770e5d32a51dc48f" PackOffset="8" />
     <Blob Hash="7a9566fdff6803e2390464789d739173e0158ab0" Size="2808" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="720023" />
     <Blob Hash="7a9789031413aa7850c4b131c63d6d107b9a7a89" Size="5805" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="388120" />
@@ -52151,10 +52024,10 @@
     <Blob Hash="7aa405bc31808d114a19faf6bbcff16838c2ac99" Size="313" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="841433" />
     <Blob Hash="7aa6b020d00993482124f09c3e3e3591273d9e65" Size="134" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2086081" />
     <Blob Hash="7aa75642f9b1d5ee7a0017ea0470b10c78c20041" Size="21374" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="229077" />
+    <Blob Hash="7aa9390bea6bbb7d2f83ca52b60c1a35abb0b872" Size="8530824" PackHash="c207a565e0f167dac7a5067a05ab80c02ca39740" PackOffset="8" />
     <Blob Hash="7aaa367708e2c8a5d824c892d2874785998df77d" Size="3584" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1816455" />
     <Blob Hash="7aac705bc906ba58751985916b22af67693426d0" Size="651776" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="679432" />
     <Blob Hash="7aac90009429673adc9fb4c97a7b60ad73e291bf" Size="2816478" PackHash="8b8340f444f8bcbe6806d7f4b2a6d3894354baf5" PackOffset="8" />
-    <Blob Hash="7aaf7106bf30bcb6335f2c6a13ca26ecd3760e2c" Size="5122148" PackHash="e3cea6835e6f8dff74869b7ba4fa1e9477374d76" PackOffset="8" />
     <Blob Hash="7aafe77eff351175e504e56ab7b83552bdf4af0f" Size="132096" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1331208" />
     <Blob Hash="7ab0e9138f5fcf3652a912618ef8ce3292174656" Size="3442" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1623956" />
     <Blob Hash="7ab2b9d10a96f3fe5932cf818883831a9f1fa402" Size="1866" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2089636" />
@@ -52162,7 +52035,7 @@
     <Blob Hash="7ab49509bcd8815815ad07466bd1dcc09b58624e" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="167059" />
     <Blob Hash="7ab49f57abc8d9c7a64e4c8305556e2e3478bba0" Size="7731" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="295125" />
     <Blob Hash="7ab68c90ea27ad4272663b0a03d6e7549003b7e7" Size="5618" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1126116" />
-    <Blob Hash="7ab748ead3247f17de8ffbf3fafa5fc33557cd9b" Size="4035" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1126666" />
+    <Blob Hash="7ab748ead3247f17de8ffbf3fafa5fc33557cd9b" Size="4035" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2072682" />
     <Blob Hash="7abc87fa709e9eb0ce6f1b4f86aebaa55b6d1c81" Size="35744" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="2060296" />
     <Blob Hash="7abe4c2894788bc247ade1a468f926af36ca5818" Size="114243" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="451686" />
     <Blob Hash="7ac13e1859a645c2e356e8604d006274903d622d" Size="394" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1667846" />
@@ -52202,10 +52075,10 @@
     <Blob Hash="7b12ff59672d78a873d0317a86604f46dcfb1dd4" Size="20380" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="22426" />
     <Blob Hash="7b147f4c9d6d1f20719fdc1a47da2ca8f97f41bb" Size="2218" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="705431" />
     <Blob Hash="7b15756ff9f5095927f6443273948640c9e5994f" Size="43008" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="417800" />
-    <Blob Hash="7b168818defa8edb5d0914bfcbe8a2368b4c8f50" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553933" />
+    <Blob Hash="7b168818defa8edb5d0914bfcbe8a2368b4c8f50" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673165" />
     <Blob Hash="7b16ef30f80cd70636be768d3ed5529a871aadc8" Size="54897" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="533317" />
     <Blob Hash="7b1805ac32563d96d608bb887073c55e04456668" Size="315936" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="660595" />
-    <Blob Hash="7b1826f730131b6392c4757ed100b3cd4cd82d52" Size="10496" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1975649" />
+    <Blob Hash="7b1826f730131b6392c4757ed100b3cd4cd82d52" Size="10496" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2033052" />
     <Blob Hash="7b1b69e120d9809c13c100b2d17ae743692ba959" Size="488" PackHash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" PackOffset="2095220" />
     <Blob Hash="7b1c8ef1c5ce18bb4707fce70ec94a2ddb64125b" Size="3139" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="395878" />
     <Blob Hash="7b1dade7fa7f68a1a7c9162f93cbce9ef846baa1" Size="2816" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2088873" />
@@ -52222,9 +52095,9 @@
     <Blob Hash="7b40920c4b5aa979dc5866abee2e019ff9736337" Size="11813" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="1852133" />
     <Blob Hash="7b413bced9c843ac72da61c09f36166e24a16254" Size="3650" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="798696" />
     <Blob Hash="7b436c1cdb49d30762ade7506427ce292f9eb806" Size="112" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1680192" />
-    <Blob Hash="7b4643511fed1b92a54751787b7303967ef31ed0" Size="2326" PackHash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" PackOffset="2093432" />
     <Blob Hash="7b4766dd8ebe36706fb570e2c20b61dafd21245d" Size="190621" PackHash="629161f1442cc070f84ca259e983259288e25a85" PackOffset="1663973" />
     <Blob Hash="7b47b939b54d3960502576c615d62e45d66fe35a" Size="92089" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="1998702" />
+    <Blob Hash="7b497f461447999aca6116be760a8b36acd8fe14" Size="5306566" PackHash="0b7e293c6adde8c239f6870f376485b673232634" PackOffset="8" />
     <Blob Hash="7b4a1e3168c2d551771255d97dd18840f1176d77" Size="2163" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1446212" />
     <Blob Hash="7b4f9fe1c9a15c42562e3ab5160d07a12a489505" Size="9229" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="78591" />
     <Blob Hash="7b569db0c974dbcaaf51ad5e7fefac74b546564e" Size="2440" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1500139" />
@@ -52252,7 +52125,6 @@
     <Blob Hash="7b86619291183ab6f12433f7e597627ff5ca0473" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2097027" />
     <Blob Hash="7b873c81b058ae41be7594b7219177ddc3b1dd79" Size="1533975" PackHash="ad735ce413f80f79900a87098c112c355b2269b9" PackOffset="8" />
     <Blob Hash="7b8b5ea6a843b40d7f5565da05a854d797aa6b3e" Size="361" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="897573" />
-    <Blob Hash="7b8bafc31763db78f0d17bae1f08eabbb8b1d356" Size="5786096" PackHash="ab84b5aeba5cdc6a96e2c548952e17e9813859ff" PackOffset="8" />
     <Blob Hash="7b8f3001dcfcc7163b8067ea3a090f6bf6cda4be" Size="86017" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1795150" />
     <Blob Hash="7b91fa97a5172d569a3c1be9b6219388c7a1c0f8" Size="568" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2080024" />
     <Blob Hash="7b925dcbf9c040a18a60f6d58640235912a48827" Size="1460" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2079372" />
@@ -52261,6 +52133,7 @@
     <Blob Hash="7b935a905c121560eae8cb27f88272c670fcf7b1" Size="1024" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2083181" />
     <Blob Hash="7b9452f224a77263f3f072f5e1c6a9b422ba5ebe" Size="3648" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="633496" />
     <Blob Hash="7b94988d209305f62b4d34aa75b19803ca4e55c7" Size="5386" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2034168" />
+    <Blob Hash="7b94c847a3ab2eaf22230569fbacd2ce56122760" Size="5359520" PackHash="11721655da62ff0bbdbf8efb922f8e28c1949239" PackOffset="8" />
     <Blob Hash="7b9852173e7af4fee44b86b0cffbb77e7f185e00" Size="1774" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1890760" />
     <Blob Hash="7b9d2bc95666dd0bb02fa06cde9b4c5011e94300" Size="911" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1333419" />
     <Blob Hash="7b9dc8af9301ad63eb3804b9bd1f5dc03e8b0b82" Size="18713" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="696560" />
@@ -52269,9 +52142,9 @@
     <Blob Hash="7ba1adcfb007ac8651cf676c637ad9171869b02a" Size="9552" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1664369" />
     <Blob Hash="7ba1d04c0ff739321b2baee2578734f5a3f7e769" Size="6404" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="1916270" />
     <Blob Hash="7ba50de6d7bbbd9182cc1b1b07f1c28ec9fdae5b" Size="16102" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="312840" />
-    <Blob Hash="7ba6a160e4420581336fa014a2e10395470d18bb" Size="7997" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1559607" />
     <Blob Hash="7ba720f28018871ab2e8d1452987d9451f653ff2" Size="256" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="994388" />
-    <Blob Hash="7ba8a214adcfc2c5293fc37d6086e0e5f4e07e4e" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550531" />
+    <Blob Hash="7ba78a043d1791b7e3320936e355b8d179737d2b" Size="41848" PackHash="8c5c5245525609628442a9e4237db8a60ef59d6b" PackOffset="2034220" />
+    <Blob Hash="7ba8a214adcfc2c5293fc37d6086e0e5f4e07e4e" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669763" />
     <Blob Hash="7ba9bc47ef48f68219465ec1ab79b4a6a8d49776" Size="907" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="1995771" />
     <Blob Hash="7bab4b8dd6bb415a2fc86d9ab36be2a893c03153" Size="184" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1459138" />
     <Blob Hash="7babc10ea5e919ed29ced0ff6b7f2493387b4fde" Size="54943" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="1939625" />
@@ -52288,13 +52161,14 @@
     <Blob Hash="7bc755d51fc3c2752ddfa03a7bbaf2f91bcc2800" Size="8596615" PackHash="b792f771ba89b6e97aa0da38cab7975e31240901" PackOffset="8" />
     <Blob Hash="7bc79b69c05ad16a7466de4ce48ebf644c9d204e" Size="4998" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="789567" />
     <Blob Hash="7bcca5821d0437a77261a4c967aceb671a901798" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2083827" />
-    <Blob Hash="7bd0d919ed46adfbc8d5ff9654c83a4f2701c9ed" Size="786" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1435390" />
+    <Blob Hash="7bd0d919ed46adfbc8d5ff9654c83a4f2701c9ed" Size="786" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1884443" />
     <Blob Hash="7bd198c71c0d6ae17a3efce7434fb9925adc3a05" Size="35538" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="8" />
-    <Blob Hash="7bd1fd7a4d5252c841c25803241f03d23acf77c5" Size="19384" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1661480" />
+    <Blob Hash="7bd1fd7a4d5252c841c25803241f03d23acf77c5" Size="19384" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="2076093" />
     <Blob Hash="7bd3714b4150c8bfbcad9283156a600f27491c2e" Size="38609" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1243046" />
     <Blob Hash="7bd47176594f2269093bf5af36c827d9076d3e43" Size="3151" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="230533" />
     <Blob Hash="7bd6db927b942ee8854b5ed1f52d79c5cacf08e8" Size="4914" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1143147" />
     <Blob Hash="7bd8ea5ba380dccd1e5111e7eec0dae59e5198f3" Size="27388" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="1022814" />
+    <Blob Hash="7bdb0e42f2c2255975e76abe579bcdba83deab64" Size="110736" PackHash="a57929556fea304cb2fa2583c8e6fd31b8f632f2" PackOffset="1872058" />
     <Blob Hash="7bdc56856650134aff752b2d6ad6b6f254e5c994" Size="3164" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1908194" />
     <Blob Hash="7bdeec0e6c57b14213306a5308f9429b9e67da5e" Size="290640" PackHash="ad735ce413f80f79900a87098c112c355b2269b9" PackOffset="1685905" />
     <Blob Hash="7be00ca7a1c13c0aa2bcb36a94c4c255d345459d" Size="18603192" PackHash="a1c77e8312d61183fbf79d7d895226465d32574d" PackOffset="8" />
@@ -52304,6 +52178,7 @@
     <Blob Hash="7beb5c0f25f1a96171c39b839fe902a90c037ac6" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1092852" />
     <Blob Hash="7bebe9b266818647367b4487a3af36ad068d2c00" Size="49298" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="1452666" />
     <Blob Hash="7bec38cf211ab45b4f9bc9673ea42b76c58a1f3e" Size="221" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="451482" />
+    <Blob Hash="7bec8f1793b06b5f0e0d2e3e8b50c67bfcb35178" Size="1130" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1769011" />
     <Blob Hash="7beda3b768ed53106ad60e9363dcbe5936e5b514" Size="6064" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="228520" />
     <Blob Hash="7bee34f0f0225c0b34d2a57ba67450218dc47cd8" Size="324" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="330706" />
     <Blob Hash="7bef32567d5cef954f8deee893c138db216096f9" Size="952" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1386732" />
@@ -52312,10 +52187,11 @@
     <Blob Hash="7c010e84462ec9603caaff39faabbee63ef66e9f" Size="638" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="451622" />
     <Blob Hash="7c0249e35645e70ab53ea0aa20dc7cbc74b3c510" Size="1048" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="976473" />
     <Blob Hash="7c05bf1c4bb95370e588bb27e74ab7ebfa6196fe" Size="13338" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1899033" />
-    <Blob Hash="7c0962159457c1cff752726339981a782c9cbcb4" Size="1864" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1332758" />
+    <Blob Hash="7c0962159457c1cff752726339981a782c9cbcb4" Size="1864" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1452218" />
     <Blob Hash="7c0acf2c6b605be1a7616f01b9a0ba5cac4f93bd" Size="934" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="178423" />
-    <Blob Hash="7c1226bcd33bd251d6e52add45ebe1e6c8b710ef" Size="526336" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="1043464" />
-    <Blob Hash="7c136d473864f3742084c53e340bda3db9e8a3ba" Size="632486" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="794682" />
+    <Blob Hash="7c0c9e2d1dfe3baa46e993881eb2f58d46386888" Size="4759480" PackHash="4f266b72a931f2e7b18e925e49d41f1ec905542a" PackOffset="8" />
+    <Blob Hash="7c1226bcd33bd251d6e52add45ebe1e6c8b710ef" Size="526336" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1382408" />
+    <Blob Hash="7c136d473864f3742084c53e340bda3db9e8a3ba" Size="632486" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="1425722" />
     <Blob Hash="7c1a75187d7bb123328d68abe497e30111ec76a2" Size="230400" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="8" />
     <Blob Hash="7c1a806d999fc882ef95b07bf9b4bd0bf6ea89fa" Size="3455384" PackHash="808ebf98e9353070f89e8650e7665b4756e33f22" PackOffset="8" />
     <Blob Hash="7c1bce06cbe46e8551c64ff026ad5317c1e408ac" Size="94498" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="611554" />
@@ -52334,18 +52210,18 @@
     <Blob Hash="7c326ea19eb09753089f1d8eb4c20796f8080184" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1237512" />
     <Blob Hash="7c392a061d8914e21ece8dad2f907f308b3e7bba" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096532" />
     <Blob Hash="7c3a14ad177173d3410e7e6a64cf34c921dcdf45" Size="3152206" PackHash="e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288" PackOffset="8" />
-    <Blob Hash="7c3eba988f50d147c650e8584aea912cf6040740" Size="263" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1299106" />
+    <Blob Hash="7c3eba988f50d147c650e8584aea912cf6040740" Size="263" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1748008" />
     <Blob Hash="7c3f382eeb72ae11af1387026ce7dae3625bb21a" Size="78310" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="733042" />
     <Blob Hash="7c45f0daf96234dfb3c7e73c168f596ec44c9db6" Size="32336" PackHash="8575b29003613867e1d7350c5f55d36d96bd7283" PackOffset="2039131" />
-    <Blob Hash="7c4caa66749daede0ecd3872c7c79ce95dfaa25a" Size="1456" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1006724" />
+    <Blob Hash="7c4caa66749daede0ecd3872c7c79ce95dfaa25a" Size="1456" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2054241" />
     <Blob Hash="7c4f23c75bf9f3961a73a877b1240e9fdf7e1f71" Size="2022296" PackHash="39c247c30a22562f68b91771cd9530c96fafba02" PackOffset="8" />
     <Blob Hash="7c506e180ec6b7ded95b6c03b15f5235dc7201d0" Size="5374" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="440183" />
     <Blob Hash="7c516f3e3a2aaaa523d1d94a5d89808cf335c39f" Size="668" PackHash="0bc028d0b62f4b1147966e8709b9699fd37b6a4b" PackOffset="2095624" />
     <Blob Hash="7c5223e8c7d709cb89720b653459a982ec554a5c" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1087266" />
     <Blob Hash="7c530868b1aebbc9888d1672aab2ef7349abade9" Size="5191" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="390754" />
     <Blob Hash="7c536e978b83cfa8ba4f69d10f3b2dee71534e4d" Size="2665" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2030908" />
-    <Blob Hash="7c55b7519a74eb5184cfdc60bf98f5629076e730" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554039" />
-    <Blob Hash="7c5861cfd0a2af93f9e69f5ddbd12f2376ffc9c8" Size="132502" PackHash="b911df4ae64ab3f8f9aa7c7cbaa8b0d078cd39f3" PackOffset="1868666" />
+    <Blob Hash="7c55b7519a74eb5184cfdc60bf98f5629076e730" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673271" />
+    <Blob Hash="7c5861cfd0a2af93f9e69f5ddbd12f2376ffc9c8" Size="132502" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="8" />
     <Blob Hash="7c5ad75eec9ed8294b318594305aed8718173a12" Size="2990" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="841131" />
     <Blob Hash="7c5c5060bf2757d636b307afaaedc32cf793614d" Size="7654" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1631908" />
     <Blob Hash="7c601ff4bb4d4170d9011d7bc6d72d901ee626fe" Size="3644" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1740684" />
@@ -52355,11 +52231,10 @@
     <Blob Hash="7c6fe4b728b66b20de6ea8d0b564c5e895162539" Size="3087" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="266058" />
     <Blob Hash="7c735f647d667ed913132b97c473f3051685d474" Size="11281" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1724135" />
     <Blob Hash="7c73635e042ae159e7a9e63e774459e477520b3a" Size="34156" PackHash="167a3b509221baa789dd8c568b74ddcaf7c4a7c5" PackOffset="2049032" />
-    <Blob Hash="7c77450faad7779f0717a13c543e1143e229801e" Size="6786" PackHash="fc72e25fae938ebaa984b54bd0d8766882030b42" PackOffset="2089564" />
     <Blob Hash="7c777ce5f3935c994a5fd83c3eddadf35892aee1" Size="311077" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="8" />
     <Blob Hash="7c796ae287909c952fb100280dbbb94493a395f8" Size="12616" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1231470" />
     <Blob Hash="7c7a56110bdfebf7bbced630f664921934e7998e" Size="109846" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="1833718" />
-    <Blob Hash="7c7abcde73efb9ef3faaae2db646c5033f52aefa" Size="441" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095974" />
+    <Blob Hash="7c7abcde73efb9ef3faaae2db646c5033f52aefa" Size="441" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="2096551" />
     <Blob Hash="7c7e4df49a677214e19e706a76868dcd0eb79adf" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1513992" />
     <Blob Hash="7c8559b423dc7280a26f545e7fc42b6caa35dd93" Size="15786" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2004947" />
     <Blob Hash="7c86277b8266dcfeb28dd8f71b11cf50d5ddc8b9" Size="18600960" PackHash="2bab8c2303036f183da6246f16fdd56a325eb045" PackOffset="8" />
@@ -52391,17 +52266,17 @@
     <Blob Hash="7cad7ff8a01ad050d0d17beba8e73aea65c86396" Size="8848" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="88392" />
     <Blob Hash="7cb009c91088302806d8f070aa196c772a18da08" Size="660304" PackHash="09a4bae3cf3add2e8bada69dabfacec664d677bd" PackOffset="1411821" />
     <Blob Hash="7cb10b93804af801fd720f5ebe3b42f4a5f65a85" Size="3893" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2092597" />
+    <Blob Hash="7cb3baa614f5cce40ce3ae302bae356ba286694e" Size="19968" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="5640" />
     <Blob Hash="7cb90a04c6f8c6b20b8ad00b8da6e99d59434f28" Size="44993" PackHash="4b3aa3a1aacfb8361623ab6a68114785a099a999" PackOffset="2049024" />
     <Blob Hash="7cbad47793bcc7089a3463968d09b854d7441595" Size="660" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1819364" />
     <Blob Hash="7cbbb2d5954d7b5a912773ec03382c32a4593e24" Size="3329536" PackHash="451bbe73bceac3e1bd82c976fdb9e2fad9863637" PackOffset="8" />
     <Blob Hash="7cbff4021fe9d14da4c6a034ce77f4f18602bfe7" Size="9402" PackHash="3a67e1db726b175c76ac9b14ceffe3b434745c6c" PackOffset="45623" />
     <Blob Hash="7cc11e69402cd3734b86fe9fa11a3cfba1a86f47" Size="2337" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2083575" />
-    <Blob Hash="7cc29fcc6ed3faa157ff9e777ef73f7246adc38f" Size="11455034" PackHash="a191461983ef15b29368f657ee76e4e3c922a195" PackOffset="8" />
     <Blob Hash="7cc57014fe2214e2da6e0190c9668fa7982c9c1c" Size="272666" PackHash="1960f1f6df90a238f5ee4ef515c50839a26abec6" PackOffset="8" />
     <Blob Hash="7cc5b3b5f8bc3cb6de4a04a936a2c15954ba9ac7" Size="6628" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="1058658" />
     <Blob Hash="7ccb266eceb65730954b9303e94916ea243a0502" Size="1832" PackHash="e235435af47d241bf8a32655040bb6bcca173961" PackOffset="2095145" />
     <Blob Hash="7ccba14947552f2787536e28b286b39934ae025c" Size="2887562" PackHash="53f387c5a51338a969a115c859bc9b7125c74c22" PackOffset="8" />
-    <Blob Hash="7cccaf12e237a287995e80e61e64800ff742b93b" Size="16384" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="2066187" />
+    <Blob Hash="7cccaf12e237a287995e80e61e64800ff742b93b" Size="16384" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="2078990" />
     <Blob Hash="7ccec20a9a687afee67671e9b805cc3e273e8321" Size="12032" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2045544" />
     <Blob Hash="7cd01761217c206914d3ead210c098278d09ce36" Size="6560" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="126995" />
     <Blob Hash="7cd49f963fb0039d44a6a133a8fe95d336458e29" Size="661" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1401220" />
@@ -52409,11 +52284,11 @@
     <Blob Hash="7ce6ada938a6d82c12c5ea227b743e62b7b25fdb" Size="300627" PackHash="59aad3440eda11860e175fbcdcea226318e3d677" PackOffset="820550" />
     <Blob Hash="7ce9b255d1c499f234ded00c3c75d334928e25fe" Size="17748" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="460584" />
     <Blob Hash="7cee88aba336483221b7cf47b9c95cfc3ed98589" Size="37888" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="2050882" />
-    <Blob Hash="7ceebdb6f9112bd32a49177298a44b6cd4af02f5" Size="4024" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1205410" />
+    <Blob Hash="7ceebdb6f9112bd32a49177298a44b6cd4af02f5" Size="4024" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1650241" />
     <Blob Hash="7cef978ba635ef59fc8e260ee31ca01efc546d22" Size="67396" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="388920" />
     <Blob Hash="7cf7dbb78868093f49934af947b8916a51c86ee0" Size="1918" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1779499" />
     <Blob Hash="7cfbd6e262b6ee97d0f636e51f6437d4b496b655" Size="2500" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="539653" />
-    <Blob Hash="7cfc15c5918f87f4bad13db2b23e2238c9f3f239" Size="275" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1421472" />
+    <Blob Hash="7cfc15c5918f87f4bad13db2b23e2238c9f3f239" Size="275" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1540703" />
     <Blob Hash="7cfc562ebd144f7c4f135c999ee143f4f1ecafee" Size="186" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="610797" />
     <Blob Hash="7cff03d5db12a60bce118ff92792b7cbee868738" Size="282041" PackHash="b4a7011b1f4b663e34e08b5caa1fe927463eb914" PackOffset="8" />
     <Blob Hash="7cffd674785551ba95145dd60161c4f582a49a88" Size="52001" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="870569" />
@@ -52424,8 +52299,10 @@
     <Blob Hash="7d0c601375e4f95723bc851dcf2212f723759f96" Size="1654944" PackHash="7073ccf926d5c24b5b473620037d3908ffc598bb" PackOffset="8" />
     <Blob Hash="7d0f5dfc2a649d80649f38d840ba8eba5704f086" Size="21811" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="360618" />
     <Blob Hash="7d11b9cce698273d12191fbbae232bcf95e003c6" Size="64599" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1108617" />
+    <Blob Hash="7d174a922957d201f74e622edfc403ea06d523a8" Size="68680" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2012946" />
     <Blob Hash="7d17e3c7fdc51df6d85b1d269a9cabe2ea3fd0d1" Size="291840" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="8" />
     <Blob Hash="7d22f108e368bfe2882f10746cff0359d6612409" Size="3291" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="296920" />
+    <Blob Hash="7d29da4d554370accf38b1cc88e304e4e1f0dfd6" Size="41256" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="2026472" />
     <Blob Hash="7d2a01c643c3856f5fe44fa742cbe441de54986f" Size="1873" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1513862" />
     <Blob Hash="7d2d92d58c503bcb102fdf37303906e54361ef37" Size="6696" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1622050" />
     <Blob Hash="7d318e6b137090e667df4986dda3c748352235cd" Size="159975" PackHash="e106ce3ce1a7bafe780e72f090f349e0d66c2db2" PackOffset="1622357" />
@@ -52449,6 +52326,7 @@
     <Blob Hash="7d554914bcf612689acd3af77a9f9507fade38b8" Size="1114399" PackHash="8eea1cf900a27487381f3e81893b5e8685569c89" PackOffset="8" />
     <Blob Hash="7d5718d3fe0ed4abf0f2eb8a0418e64534d754eb" Size="3896" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2039111" />
     <Blob Hash="7d5e7a29bf40dc8220dc0547ad5ce167d0e4d5ef" Size="164388" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="666325" />
+    <Blob Hash="7d633c89317c724d17344da6af363b51bea8745c" Size="3597474" PackHash="48e55481229e5e4e21b17013419a4db9d4563a6f" PackOffset="8" />
     <Blob Hash="7d63cf3a85c8c94b1011b04b6e905ea83fc21c72" Size="799" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1626259" />
     <Blob Hash="7d67ac55c02e86aa029f8c4fddb7d1a5119f483c" Size="19865" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1438546" />
     <Blob Hash="7d6800e208ce66f2f50d6931903d9046f37d113d" Size="5936" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1005861" />
@@ -52457,7 +52335,7 @@
     <Blob Hash="7d7076171e848b501df48634164842dc7454a3f4" Size="41" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2097114" />
     <Blob Hash="7d7417f9883cfbfb39782263c6a3512c36c73f2d" Size="18464" PackHash="21202e22c0d0bb13b84ef787938f1a2522405782" PackOffset="417709" />
     <Blob Hash="7d75f3d82151b73cb0ddf551be528e4c3ce108c7" Size="3106" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1463225" />
-    <Blob Hash="7d762542efaf25b5c022ad824cd9418cfe0e3f96" Size="359" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1581618" />
+    <Blob Hash="7d762542efaf25b5c022ad824cd9418cfe0e3f96" Size="359" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1700850" />
     <Blob Hash="7d790d90699dc2c17c5040bc651cdcb663fec6ae" Size="38262" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="678798" />
     <Blob Hash="7d7b6fa7b9940294c7fc8666dcc07221a65de125" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="951665" />
     <Blob Hash="7d7d3a9101acf9e67e7c46b2679b71c0905bb558" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="620539" />
@@ -52500,7 +52378,6 @@
     <Blob Hash="7dcdd23630efd512103dc142ed7688ceaac87a08" Size="179" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="450956" />
     <Blob Hash="7dd15a8a572f6d874bce408e106e2997c4faba40" Size="28796" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="2006244" />
     <Blob Hash="7dd561de26b3dedc557ce4c3a469fcfb759b2032" Size="2585" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="2081994" />
-    <Blob Hash="7dd637abe697399c1a585eb9a67d395b163e774c" Size="5767" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1913865" />
     <Blob Hash="7dd63caf824e86c4b8f5af2d7b50cd8e95c5cafe" Size="20273" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1719651" />
     <Blob Hash="7dd6b794d09d77320efa8f9ba1f4c6c1a7e5529f" Size="96231" PackHash="b3df044bb928c0123e3067b6ca07bc8db2c7c93c" PackOffset="215667" />
     <Blob Hash="7dd6e4df69894ef066f9f6582ab98d5b2cc1ec44" Size="9054" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1896075" />
@@ -52510,7 +52387,7 @@
     <Blob Hash="7ddda0d7132e86df74d3a9eab98e1372b5a74756" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2088316" />
     <Blob Hash="7dde4efd6fd86de6a3d70a515bc3312d9e42f85f" Size="1888" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="2092206" />
     <Blob Hash="7de15e767d34812f784ce6e85438a592e2cba418" Size="187" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="465363" />
-    <Blob Hash="7de20982b0329323d79104491c4edbd6edeae8ab" Size="331" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2088251" />
+    <Blob Hash="7de20982b0329323d79104491c4edbd6edeae8ab" Size="331" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2095913" />
     <Blob Hash="7de2b2aacc91578ac9c4481dece854c1b92d850e" Size="5258" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1213043" />
     <Blob Hash="7de7d5d3e1dfc79c6c664fb7ceaad8cc8aa8590b" Size="14183" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="2080468" />
     <Blob Hash="7de9a510ced025f3d7c0b63b72b4e405bcca5d17" Size="12399" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1071596" />
@@ -52522,9 +52399,7 @@
     <Blob Hash="7df2d082c5328ff98846367adb65d22b045490ed" Size="1251" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="128954" />
     <Blob Hash="7df44b0c76d51258a07979ab6b24251743172f7e" Size="8380" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1541608" />
     <Blob Hash="7df4ece4aab3d6762b89b4af87ee92764841f6e1" Size="4398" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1010063" />
-    <Blob Hash="7df5c561e3c1e2e26cae02035de74e7736de77d9" Size="2423" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1853320" />
     <Blob Hash="7df6acab7171a3c6dfe278306f7e2ea4d39c6fd8" Size="6026" PackHash="7c5339b6b1382c59c12893376db1f10162f6653a" PackOffset="2064381" />
-    <Blob Hash="7df93f8009104c4e474664ec3dc29420f3421145" Size="183808" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="1903736" />
     <Blob Hash="7dfc2fb6cfebeb8b109e1be6c82c492f02b2ce65" Size="282351" PackHash="4653f71982a36f99d16331bbaebded3036eff50f" PackOffset="1466838" />
     <Blob Hash="7e061f87636e8258c2067e8cb9cab33525413d81" Size="18814" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1732603" />
     <Blob Hash="7e09c011fc7f2670d573cbf1894c8d35633899e2" Size="210537" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="1740489" />
@@ -52537,7 +52412,7 @@
     <Blob Hash="7e1963848550f75b9726ecce6e358768ba783441" Size="115588116" PackHash="cc4af7fa3fb1218934583d2ca1a8c7a306b2ca79" PackOffset="8" />
     <Blob Hash="7e263393d980ce2a685d9dabf1aca830b09c37da" Size="80159" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="343208" />
     <Blob Hash="7e2722576bffabc3258c5edb2d99fa2468d6a4b0" Size="1111" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1813246" />
-    <Blob Hash="7e27d411dda06798330782aedf5798f5e10148bf" Size="10630" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2077500" />
+    <Blob Hash="7e27d411dda06798330782aedf5798f5e10148bf" Size="10630" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1941333" />
     <Blob Hash="7e299de33348354371895a951d4de34f0d1c781a" Size="244" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1703380" />
     <Blob Hash="7e2dc8f6ad907641b0d4cf51692649747eb6ec1d" Size="2990768" PackHash="3c8fcaa3e34a3bb902ec9117b7e0b0b14248d0be" PackOffset="8" />
     <Blob Hash="7e3644b4fe8945b452e24165e1db885a035f4046" Size="2849" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="401063" />
@@ -52567,26 +52442,26 @@
     <Blob Hash="7e7e119566bb48d4203842814d9e8a7bdd02c445" Size="679424" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="8" />
     <Blob Hash="7e83fbec9ba18874bcea41a8ae40592fc3ac64bc" Size="5516" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1179513" />
     <Blob Hash="7e852318f15d5b755a4846c287dbea78f2bef1d2" Size="3660" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="2064554" />
-    <Blob Hash="7e8abc316d59bc66ccca74f279d94fd9f4eb2754" Size="257" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1593999" />
+    <Blob Hash="7e8abc316d59bc66ccca74f279d94fd9f4eb2754" Size="257" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1713231" />
     <Blob Hash="7e8ae4ecc1cefa44928a9642b202b8396c376d50" Size="2193139" PackHash="f2cde55060ce7187a8d6e5b99d3c18a1752aa86a" PackOffset="8" />
     <Blob Hash="7e8f2447c1e965643aa62c8af330f5a0eec6f026" Size="224" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1558833" />
-    <Blob Hash="7e920fdba0df0b700e2ecda10110191192d3ec91" Size="845" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1440999" />
+    <Blob Hash="7e920fdba0df0b700e2ecda10110191192d3ec91" Size="845" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1890052" />
     <Blob Hash="7e92462141d9620c54f7b0c70fe374cb46901a20" Size="1396" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1370968" />
     <Blob Hash="7e9444d274e496feca87312748f86a42f87b7fb8" Size="3523" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="712301" />
-    <Blob Hash="7e94d9274e57aaf6de040e358fcdc5dcfc64ed3a" Size="3589504" PackHash="b7cbdbf884a6f27a5620777f6510c16cad98639d" PackOffset="8" />
     <Blob Hash="7e97fbf286fc619759673bbaeef9ca253a14a637" Size="5045" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1921786" />
     <Blob Hash="7e9b5f107af12ab31a96a8e50725864ae32ad254" Size="104587" PackHash="f279ae70e30f66de7b592409e9ed96993301657f" PackOffset="213066" />
-    <Blob Hash="7e9c6d9732d16408429e36a0af022a4e507a73d3" Size="2229" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="990718" />
+    <Blob Hash="7e9c6d9732d16408429e36a0af022a4e507a73d3" Size="2229" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2038235" />
     <Blob Hash="7ea2a32f97d7767a1bfca669a30ad7a12ac4a641" Size="1228702" PackHash="694d6d6d33e802bd013aa60c6ceef225f1769a21" PackOffset="8" />
-    <Blob Hash="7ea3111ab93098e1960ebc0b3d302c5e31075042" Size="1187" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1047034" />
+    <Blob Hash="7ea3111ab93098e1960ebc0b3d302c5e31075042" Size="1187" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2095010" />
+    <Blob Hash="7ea95761f2719e137ad00e304ec5cd1642fcd615" Size="3433714" PackHash="8cb7d3cb02a4fb26737291b8b275e1d34a785268" PackOffset="8" />
     <Blob Hash="7eaaefaf74db7867b8f452a2e5a35dfe13cffc29" Size="590" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="2096394" />
     <Blob Hash="7eb0a8216d78a8dbcf6744326a2cdfdba0114ded" Size="10952" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="988680" />
     <Blob Hash="7eb0e61799843e510d3c46819b7abdb71d1ede81" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1441660" />
     <Blob Hash="7eb2528cf6378ff02e8a475d2dfd3031c838e959" Size="833" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="475394" />
     <Blob Hash="7eb49c991d72594882f75ef25b7481c4638d3c6f" Size="6271" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1148994" />
+    <Blob Hash="7eb91e8f764bac0a63d3fab53a4b02fb3e9d45d1" Size="83723918" PackHash="dd9cad41432e454d710f4dadeb01f384f845a999" PackOffset="8" />
     <Blob Hash="7eba555787c705557bcba216b3b1b372aab3e35b" Size="4773787" PackHash="b89f1d5d8c1cf1ac5f8e38b762d7e56b0ddac97c" PackOffset="8" />
     <Blob Hash="7ebbc2eba86e094e7b062203526b95e517fd03e3" Size="2714" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="2093001" />
-    <Blob Hash="7ebed6ca64371bf1fbf3edd74c2cb3cab3b6926b" Size="1636264" PackHash="7143ad7a585bda75349c77c92198a5b5ca391668" PackOffset="8" />
     <Blob Hash="7ec09ac365cdd1018517d8223334e89e0c35e1c7" Size="107754" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="544040" />
     <Blob Hash="7ec24bcfaf3269c85b4a09e8feb6b954ac45c6a8" Size="11264" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="1982166" />
     <Blob Hash="7ec44ff9b4cf3ed81a4d6527db0187f21e8a24ff" Size="5278" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1187352" />
@@ -52600,18 +52475,17 @@
     <Blob Hash="7ed7089c096e669bd865f240bf400774b46cfa33" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1082658" />
     <Blob Hash="7ed7e2112495de960088cfdb4bc080719216fbb2" Size="431616" PackHash="8da6976ecaa99b785dd5b8786a2cacb519d2d294" PackOffset="605596" />
     <Blob Hash="7ed86175489b1ae3ca5c0e8d42969f951c895d6b" Size="1307" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1081834" />
-    <Blob Hash="7ed9cbd854adfafc390568584f35621dd4b50256" Size="2160" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1356240" />
+    <Blob Hash="7ed9cbd854adfafc390568584f35621dd4b50256" Size="2160" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1805142" />
     <Blob Hash="7ed9d353989a38a8f5be9a54d13f9610cd3729df" Size="3337" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2058957" />
     <Blob Hash="7ede9fbab3e4249548d1ffbbbf408cc1794a29e9" Size="946" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="737764" />
     <Blob Hash="7eeb8caf64e132000caf4f74fb71eb8bffbd15e0" Size="8678" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1976415" />
     <Blob Hash="7eed0fa07cecb02d0210265f13e1835e0763b808" Size="1831936" PackHash="b45c942afc74d06f356039815b70f4d610006ba0" PackOffset="8" />
-    <Blob Hash="7eedced43af7283251a014eb6e2f9785a4526d72" Size="2205" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1389270" />
     <Blob Hash="7eee1ce1ae8bc77516cf5161880ecba421f9cd01" Size="131038" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="235508" />
     <Blob Hash="7eee3384f4c3e14e731ac19885c8922b1d59c87f" Size="34151208" PackHash="2c641d8ab651a8a2b8a19b28979b2852b461f2e1" PackOffset="8" />
     <Blob Hash="7ef0b9e500b453cbf0c383068cb68aaeb3bbece2" Size="62" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2097003" />
     <Blob Hash="7ef1d7e1686f7e1f61b36998e52904382d8ab1d2" Size="7602" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1909915" />
     <Blob Hash="7efa3614f078f357aa18a0298bf1794ef21c0fd0" Size="114835" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="1972504" />
-    <Blob Hash="7efc84670e5b56f9a546043a979234e8ade8a337" Size="806" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1424239" />
+    <Blob Hash="7efc84670e5b56f9a546043a979234e8ade8a337" Size="806" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1873292" />
     <Blob Hash="7f03d2ad912804c37f6f1ef3d28249d6dabe38d7" Size="36496" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="2032205" />
     <Blob Hash="7f050892876b42621431f9cf1ccd535c77172eb7" Size="6480" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1261601" />
     <Blob Hash="7f063af280d412fa40db3d4f0b71cb97ead42a34" Size="104822" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1954954" />
@@ -52645,6 +52519,7 @@
     <Blob Hash="7f316e830c54a876a0cdb8fd398516c711922af7" Size="26260" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="1050202" />
     <Blob Hash="7f39550481cb1114156514a7dd90c30fb19a1365" Size="18804" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1256323" />
     <Blob Hash="7f3aac6711cc65b0cf808a81b69230c3566d6690" Size="1798368" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="8" />
+    <Blob Hash="7f3c828924d45d4d5731c6b6c891d724e638b00f" Size="785100" PackHash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" PackOffset="1303732" />
     <Blob Hash="7f3c88cfb8ffc0374e943b720dabb1ca172f73f0" Size="1197" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2039897" />
     <Blob Hash="7f3f9d5875ef3c2d79667a1231d85d9eb619fbc9" Size="18112" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="542880" />
     <Blob Hash="7f4029d3b020b8c0e6a8fcdc8a534aa855c73932" Size="3476" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1097334" />
@@ -52664,7 +52539,7 @@
     <Blob Hash="7f6c23eb3a2a816dcfbe819fbcc95f1da4fbd120" Size="58383" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="1088731" />
     <Blob Hash="7f6d5bbf089a0be7218c49e45b6df172547a1387" Size="7518" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="2084796" />
     <Blob Hash="7f6ee032e25a4109873e82484eba6271a84ad2cd" Size="1666" PackHash="c64ef0980920bd362bf26c9e31d253c145d848ab" PackOffset="2089656" />
-    <Blob Hash="7f70777d5dfd77f72aae69909f1c26688e2da17c" Size="79" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1905316" />
+    <Blob Hash="7f70777d5dfd77f72aae69909f1c26688e2da17c" Size="79" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2096748" />
     <Blob Hash="7f7113b68aceead98c91699ddb5eca54f3e1b765" Size="3831" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1360625" />
     <Blob Hash="7f75d2afe42fa1dbea047edf238ced89b615b1e3" Size="3528" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="614920" />
     <Blob Hash="7f77225c13e5a20a6333f10c246c63837e65d4ec" Size="135952" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="608960" />
@@ -52673,7 +52548,7 @@
     <Blob Hash="7f77dc10771b83992b43c9a6a14e4f664113547a" Size="85504" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="524808" />
     <Blob Hash="7f7f9512662b9290eba9f5c637e28265ccd340f5" Size="3764" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="814805" />
     <Blob Hash="7f815f4a346e81992772e8771817212b74512209" Size="285184" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="1701912" />
-    <Blob Hash="7f817e7e3611565437e2895f82f7b9e2a38f5eae" Size="187" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2096015" />
+    <Blob Hash="7f817e7e3611565437e2895f82f7b9e2a38f5eae" Size="187" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2096340" />
     <Blob Hash="7f828d91e1140a4c34d7cbae5bb9ff0f089beba4" Size="60916" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="1689080" />
     <Blob Hash="7f873bad32d4dcd68c943b42c38b0b6f77f42a31" Size="822" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="717073" />
     <Blob Hash="7f8ae4c4bd5961d97802e45a44a9a25495e26cb1" Size="366330" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1682644" />
@@ -52687,7 +52562,7 @@
     <Blob Hash="7fa3401e097de3be92792b2cfb4f2fdc7b651c62" Size="11726" PackHash="8db91240f50319e0e8effc5d85d3074c2dbb23ca" PackOffset="2064012" />
     <Blob Hash="7fa4ace1f1e77b4ba31c079e27859bb9f540ff4b" Size="2181" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="789085" />
     <Blob Hash="7fa56e6146d0a76c529e280434a56d10a7dbcb2a" Size="471" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="705822" />
-    <Blob Hash="7fa5e1ef286b780138ae86d61af1dc9c4e7916cd" Size="881" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1067255" />
+    <Blob Hash="7fa5e1ef286b780138ae86d61af1dc9c4e7916cd" Size="881" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1237289" />
     <Blob Hash="7fa6e531ae9bf4eb86bc362b42b8f0f6556cba85" Size="77824" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="1508696" />
     <Blob Hash="7faa357b4e16676088f1946454a530822d444de3" Size="3748" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1291160" />
     <Blob Hash="7fad8f007fa299f94620ce37f7204fff39908ecd" Size="18240" PackHash="06f8551ab53e55ac8547d5a0944df478384dcbea" PackOffset="2078470" />
@@ -52713,12 +52588,12 @@
     <Blob Hash="7fe1bda2a61ff9d8cc41ecbb31c23e16d6c5d408" Size="631" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="843675" />
     <Blob Hash="7fe1d7a1e233983d35aa2dad0c52bf2be0eec46e" Size="2288" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1913174" />
     <Blob Hash="7fe2311d4d1c8779514200f4fd3c8c5a6f193b40" Size="7930" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="510827" />
-    <Blob Hash="7fe2c77b440a4b58b50e34d925a2ab4268966b21" Size="772" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1457675" />
+    <Blob Hash="7fe2c77b440a4b58b50e34d925a2ab4268966b21" Size="772" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1994757" />
     <Blob Hash="7fe5b7c7854dd24f7897b39d52649fef3e14fd94" Size="106444" PackHash="e380f683db24a7cfe78e8b2762eedb95af1e281b" PackOffset="8" />
     <Blob Hash="7fe6c95c1ead7e701e61cd682a21afb96eab7691" Size="8556" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="2076293" />
     <Blob Hash="7fe7d4f530dfc0e807fbaab20f4af0f27ef9e8c5" Size="23441" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1778459" />
     <Blob Hash="7fe8858ca08d1d6ef744092ac0209d820c455932" Size="412" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2043442" />
-    <Blob Hash="7fe893adaa4b96d75ac5db86d32f5eb78a8e0b1a" Size="1280384" PackHash="8b5291f3f8f3ddb9d9fc8ad444abd28ce12847cb" PackOffset="8" />
+    <Blob Hash="7fe893adaa4b96d75ac5db86d32f5eb78a8e0b1a" Size="1280384" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="8" />
     <Blob Hash="7fe9879b8a1e1e11170f2791176bdeae7c105a92" Size="12624" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1091136" />
     <Blob Hash="7feab95a7828f5777886990071bf6ac2bd687fbe" Size="766" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="121604" />
     <Blob Hash="7fef540f25f6d0dc951f58378d7a6cc8299c2a60" Size="254300" PackHash="adecd2c644904747c3cdc204c4e4d0c59ab35970" PackOffset="8" />
@@ -52732,7 +52607,7 @@
     <Blob Hash="800a95bab408e5ad7402e88cbcf5e0179bbc6996" Size="150" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="559776" />
     <Blob Hash="801096a8cf83eefda230e22a815d66899824b5d7" Size="7880" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1373514" />
     <Blob Hash="801c8b250b9ec604f0258fe0defa26148e3a3db1" Size="276625" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="12318" />
-    <Blob Hash="801dec8c41e2c99b1dd8b13dace09e01c69b485f" Size="798" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1468356" />
+    <Blob Hash="801dec8c41e2c99b1dd8b13dace09e01c69b485f" Size="798" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2005438" />
     <Blob Hash="801ef1624ccc1b90d6a224f2621894bc48fddad2" Size="16856" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1339342" />
     <Blob Hash="801fc62e39cff4f69600854ca4fa804c3a466fd2" Size="6900" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1856978" />
     <Blob Hash="8022b5affe1249af46ca1c4203f751007a059c7c" Size="8120" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="554170" />
@@ -52752,7 +52627,6 @@
     <Blob Hash="804d426636db584bb218f2b9a414634e4af49ac3" Size="5507" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1301634" />
     <Blob Hash="804e5845d194e63367a5bdc80a4613bda060ed93" Size="17893" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1211546" />
     <Blob Hash="805156212a168661c93ad778945f6b2a1e630602" Size="22667279" PackHash="ea70cabe902c7721d774a8d5c12dde16ed809f3c" PackOffset="8" />
-    <Blob Hash="80531c0da40f8032fc05886c0b76ffd00c463622" Size="6673" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2077411" />
     <Blob Hash="8054e4d3eee1929b69cf38a313e13a817c541bc1" Size="27231" PackHash="b631e3c32bd27c8c824ec6ec629c9aa8d48dbecb" PackOffset="1969846" />
     <Blob Hash="805818f9bffbd33227a64c109900a15862225333" Size="26456" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2047160" />
     <Blob Hash="805b00328ce9c320c75531c39c93dd9a89915091" Size="84330" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="1880850" />
@@ -52767,7 +52641,6 @@
     <Blob Hash="806fc92309665a336577a67696b395b6f7765b89" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2095936" />
     <Blob Hash="807100db5582b3bc8e1e7d1ab5ea24c9182eb5d6" Size="3877" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1452039" />
     <Blob Hash="8072ce1d5058b96ce23f2211a242518a63a32eba" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="847368" />
-    <Blob Hash="80767b32d8ec94fa66b312c89d632b3ddecee300" Size="189440" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="1824776" />
     <Blob Hash="807b46790cc1831bea7fa204da2639afb6b85d2b" Size="5192" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="75432" />
     <Blob Hash="807cc9ffa5fe60115bf9df8a086f5cb1199b0a19" Size="2610" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="16730" />
     <Blob Hash="8084a01f46ae574cbd5f05c17a2495e17e5d9fdf" Size="147852" PackHash="1a89dfb24d951c919ad4f1942c52ba8f42fc896d" PackOffset="450748" />
@@ -52788,11 +52661,12 @@
     <Blob Hash="80a1d6a243685e6aee080dc9e49ad0e8f7a9a704" Size="296" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="947303" />
     <Blob Hash="80a409b0d5cd6e2bdae42a139d1eeeaa44a9b826" Size="1188" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1372364" />
     <Blob Hash="80a6668633ab2e7794b60b4d0f46f28839b94a5b" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2096612" />
+    <Blob Hash="80a9a3cee9b672b3923de107a62b950908ea9ae6" Size="236" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2084385" />
     <Blob Hash="80aac9010b2a684caa6be7813b17adec2fbaccea" Size="7096" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1125744" />
     <Blob Hash="80abbd64a6664f3f4a1081aa7bb2a8a8a4ee3744" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="715384" />
     <Blob Hash="80adee42606f798ef7fb9818013848887942f689" Size="46592" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1490747" />
     <Blob Hash="80b3f967fd7f91381f28d9782d4ee1ff37a4f638" Size="12669" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="100230" />
-    <Blob Hash="80b430daac8751ca4a281fa6a5f131aa26636692" Size="7122" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2007694" />
+    <Blob Hash="80b430daac8751ca4a281fa6a5f131aa26636692" Size="7122" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2066250" />
     <Blob Hash="80ba249ceeb76a7949be3cfccc4e455178bb34ad" Size="3743" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="1977222" />
     <Blob Hash="80bd2c81a3458ae3268b7e33629b672252ffe76d" Size="3034" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="825978" />
     <Blob Hash="80be3683cfed8bddca02548c3b32910af11d30c9" Size="15471" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="311302" />
@@ -52817,7 +52691,7 @@
     <Blob Hash="80ded8f3712b7b0b900db350fb797500e85f3d84" Size="69034" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1822730" />
     <Blob Hash="80e086208422953cfb0596700d00b02d79db8a86" Size="114508616" PackHash="7a056544a3331cb6caf52198ad75c0aaa158c16b" PackOffset="8" />
     <Blob Hash="80e148964232f30276b9b13662d634bc737dcac4" Size="1109" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="183636" />
-    <Blob Hash="80e2edda265360b4ebfbcf106896824b39de50fc" Size="761" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1449793" />
+    <Blob Hash="80e2edda265360b4ebfbcf106896824b39de50fc" Size="761" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1986875" />
     <Blob Hash="80e5d936602ef7a7beae79e1bad63089fc4789f7" Size="5835" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="2087936" />
     <Blob Hash="80e6180c75a1f21031ac84936a89d14d683273a7" Size="29896" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="900112" />
     <Blob Hash="80e68795fdfe5a502749ebe64ec879453cc37c1a" Size="38621" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1749382" />
@@ -52833,8 +52707,9 @@
     <Blob Hash="80fe5ff87936dcc5a9ebcee3420549d529d587ad" Size="2928" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1543866" />
     <Blob Hash="81008da0080e82fd3c8e6d094a1241ce33ca7c6d" Size="44319" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="1810464" />
     <Blob Hash="8103dfa18b5f3f36af0b53fa350e0f2d300e6289" Size="8560" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1782239" />
-    <Blob Hash="8104948976b6eb3281f184b79677b3dcd8e78dad" Size="8057" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1651649" />
+    <Blob Hash="8104948976b6eb3281f184b79677b3dcd8e78dad" Size="8057" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1667474" />
     <Blob Hash="8112ce77d916e2f17652b471f92d1d96375d38d2" Size="788" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="872677" />
+    <Blob Hash="811462ace759213deb399240c8e2b9f62951c8c2" Size="6187980" PackHash="634534b3cc74ee57ce6f30dd0452e22494d27184" PackOffset="8" />
     <Blob Hash="811f8ef0fd5565fd76db356c0cd894eb1d78c078" Size="8516" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="275112" />
     <Blob Hash="812103d3b28cd698adfa429b8a579d26b67bd506" Size="161211" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1179213" />
     <Blob Hash="81245544345d15805619425af3a29185527ee2ce" Size="4209" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1444086" />
@@ -52848,14 +52723,14 @@
     <Blob Hash="8131f7d7a772cf3cc8aef3f4edcf009ea0071d8c" Size="4409" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="74683" />
     <Blob Hash="813482d295e0a8d34a750f2e3f5f641175216ba4" Size="266" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2084676" />
     <Blob Hash="81358acef366f4b45f351aadd681de4511e3b83a" Size="10912" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="579332" />
-    <Blob Hash="81363f314948085ab85ec29a9c11b9bc3343a02f" Size="53273954" PackHash="de04f8b4ed53ad897f4e0a5a8a4040487ea67d2e" PackOffset="8" />
     <Blob Hash="8138e8cf61f16d22ed15ffe01362175d40ceb97f" Size="1929" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="488659" />
+    <Blob Hash="813b46f21daea24166cc92ca0cd3bcaea8d04933" Size="119524732" PackHash="4df9a840a59e395d049b1b84a6c488eee9aab959" PackOffset="8" />
     <Blob Hash="813ba2de65aa1f77e75d9d56f387412d6536c516" Size="11577" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="295843" />
     <Blob Hash="813c2f8e5512187fd982417a7fb4286728e6f4a8" Size="3428" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="1986885" />
-    <Blob Hash="813efd5fe7a9ef5495a8e101d9b26c03a9731553" Size="8836" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2002230" />
+    <Blob Hash="813efd5fe7a9ef5495a8e101d9b26c03a9731553" Size="8836" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1742457" />
     <Blob Hash="81425db989d661ed9f78ed268586a047bfce2e6d" Size="636" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="434314" />
     <Blob Hash="81427c6b551317a8c829c7a14b019919cdfa718b" Size="2054" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="752958" />
-    <Blob Hash="8148b3e4ac4602b93773e6d32674295fa8050910" Size="3240" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1329518" />
+    <Blob Hash="8148b3e4ac4602b93773e6d32674295fa8050910" Size="3240" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1448978" />
     <Blob Hash="8149e10ba2548b801beafe880f58e113943cfc60" Size="26190" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="860967" />
     <Blob Hash="814a7a7f127406f10845b384e08a1b277c3ee294" Size="25903" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="2003268" />
     <Blob Hash="814b4608f22a3296ae7dccce02a06922d0559e56" Size="2383" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="871047" />
@@ -52863,8 +52738,7 @@
     <Blob Hash="815312366c7a9228834b26714b7760215a612a93" Size="7724" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1573200" />
     <Blob Hash="8153a138fb8f243afe4eb7adb63a179f96f9b68f" Size="1206" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2091721" />
     <Blob Hash="81556dea433687f613f14d110e9564b6bc8c3073" Size="1759232" PackHash="c0476a6a0442712d3245a0babbf62c40e8e75b95" PackOffset="8" />
-    <Blob Hash="81605dc11f00f9adfacadf8df617ee10c0827888" Size="842" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1414983" />
-    <Blob Hash="8162ddcecaa6ddedd67c853b1a93fe0ca64c169a" Size="4832" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2041349" />
+    <Blob Hash="81605dc11f00f9adfacadf8df617ee10c0827888" Size="842" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1864036" />
     <Blob Hash="81646c3caf94b8d21ab7bb1ab0fd47f1d4fb8ead" Size="503" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1149086" />
     <Blob Hash="8165c8be29d831f27e732e6b1635c1c9fd9a3291" Size="2635632" PackHash="365073537cb3bf9532de7735a67d7eaace2c783e" PackOffset="8" />
     <Blob Hash="81668d5ca93997cc58b3be4af87dde0efb48bdde" Size="172" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1800412" />
@@ -52872,10 +52746,10 @@
     <Blob Hash="816ac3abfef07636b41d1c257043b8e89d6b50fe" Size="89894" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="1877206" />
     <Blob Hash="816bb3a1c3166e3c9564779844dea43eeed44cc2" Size="37099" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="717644" />
     <Blob Hash="816e4e4fa54620d876b76897447c3db74f987ea4" Size="312" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="842359" />
+    <Blob Hash="816ebfe47bf8c431687f56e0a6e9d099bc143954" Size="15852672" PackHash="18290e67121300769aa667fa52f52a59e7535a86" PackOffset="8" />
     <Blob Hash="816f2c495487dcce077e8109b474f8efd6bb056e" Size="3298" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1481471" />
     <Blob Hash="816f658e4afd3a3498ba89f34a1664967f061d69" Size="111414" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="625682" />
     <Blob Hash="81700610b9bdee88006072d42de57e61020f878f" Size="1355" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2010368" />
-    <Blob Hash="8170e226249287b34e12f2561c32cad6ee6882e0" Size="188928" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="1860104" />
     <Blob Hash="8171417508d8903e749eb1fe6b0d86729aaf81b8" Size="2868" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1123017" />
     <Blob Hash="81718d066cf7a9bfd04d957fc2310e41c3ebe4e1" Size="2106171" PackHash="7f8b724b75c6f29c33f33a1f310cb495e079aaa1" PackOffset="8" />
     <Blob Hash="8173cda0cbcd464e773f76fbd59fb171664b8a12" Size="108885" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="8" />
@@ -52894,29 +52768,30 @@
     <Blob Hash="81877dc7b3ee88ee0b379a8e83e789522d39ef78" Size="4315" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="924865" />
     <Blob Hash="818abf45716942a8081c1a1edbaa215b54cfff47" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="614899" />
     <Blob Hash="818d237b90e0362c6fa9a17f4e2211d8910ee39e" Size="45636" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="1370398" />
-    <Blob Hash="81936cad2a0157539b13bbf45217f6805bc93e87" Size="7386" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="2082571" />
+    <Blob Hash="818da93d0c6c5df090c79958bc0fc61794593c5c" Size="22808272" PackHash="9d2e9a2810b6e6c86280da3e0f4958b1e1d20a52" PackOffset="8" />
+    <Blob Hash="81936cad2a0157539b13bbf45217f6805bc93e87" Size="7386" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2076014" />
     <Blob Hash="8195c7fb33855c2db8dd73967417df833013ece7" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1442600" />
-    <Blob Hash="81975919c58ffaecccdcd33a3610c40878f61424" Size="399" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1367563" />
+    <Blob Hash="81975919c58ffaecccdcd33a3610c40878f61424" Size="399" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1816465" />
     <Blob Hash="819829305e2befd6fbe8a9e6337d328323071015" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="966977" />
     <Blob Hash="819a0c7cb568d55a5a00f13a7b30289c637be5f3" Size="3876" PackHash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" PackOffset="2002373" />
-    <Blob Hash="819e561756677da88f410e2b04f94e8da91778e6" Size="1448" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2035765" />
+    <Blob Hash="819f027a0984717833efe14fa812f3c0cfbf0802" Size="5553420" PackHash="37544b0e3baf9d44df1b0202969502453a0f4f8e" PackOffset="8" />
     <Blob Hash="81a10c67d1fe7d403e695e64ef4981d9c7b1b7a0" Size="10361" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2083509" />
     <Blob Hash="81a2a5f248cff1b2c8977a8db5ca4c50fb6e1e35" Size="315904" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="8" />
     <Blob Hash="81a40667dd79502f82c72ee0f57dcf38e1595cb3" Size="216" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1179392" />
-    <Blob Hash="81a4ac5ddfd275ee7eb264c5da18774b62a39e65" Size="106" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="2097039" />
+    <Blob Hash="81a4ac5ddfd275ee7eb264c5da18774b62a39e65" Size="106" PackHash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" PackOffset="2097049" />
     <Blob Hash="81a531a72ae2efa9a0ff761f6cfe0fd82efdb299" Size="2196" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="308072" />
     <Blob Hash="81a67e28c8e131e880d369fb372568421c63a17f" Size="361" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="2096613" />
-    <Blob Hash="81a71da40053762d6beb956246e01a3344aa3e91" Size="227370" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="239624" />
+    <Blob Hash="81a71da40053762d6beb956246e01a3344aa3e91" Size="227370" PackHash="097882ff4f782476be1a4962baf5872eeb7e54df" PackOffset="1810024" />
     <Blob Hash="81a9dfa3bb879fa3666df48089573e34c1f727e2" Size="8736" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="1961835" />
     <Blob Hash="81ae63b87eaa9fa5637835d2122c50953ae19d34" Size="61440" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="460593" />
     <Blob Hash="81b3b319d195929a47738c865203437cd5a8627e" Size="12624" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="403672" />
     <Blob Hash="81b67d7958c88c03edc65449082d921bf043e2f0" Size="39873" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1239952" />
-    <Blob Hash="81b8b4296fcf681a9f7de155cd9455f50340291c" Size="520" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1587548" />
+    <Blob Hash="81b8b4296fcf681a9f7de155cd9455f50340291c" Size="520" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1706780" />
     <Blob Hash="81bb131916c34177b59d9869f200a368cba4268b" Size="12737" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1564450" />
     <Blob Hash="81be20a36887ea37871fa6646f261f3118fc28bc" Size="97889" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="1106176" />
     <Blob Hash="81c0a0da5cb19d1fa23f31c56304c10c1ddec252" Size="64" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2096931" />
     <Blob Hash="81c27f9b97f5f5190f7189230535ec09cd228158" Size="288" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1058323" />
-    <Blob Hash="81c645a5bb59f327489ed86c48cc18b7f780a0a4" Size="16848" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="2074520" />
+    <Blob Hash="81c645a5bb59f327489ed86c48cc18b7f780a0a4" Size="16848" PackHash="6633fc884b676640607254f19e9e7b0bf8defeee" PackOffset="2078310" />
     <Blob Hash="81c688636b61ea1d74d56019051e6ba24d9f98ad" Size="23552" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1544396" />
     <Blob Hash="81c99cc730bd3054b02fa20e75b32508f3f3b9c9" Size="934" PackHash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" PackOffset="2096147" />
     <Blob Hash="81ca4b5e1432b55953e5d2cf15be7279c9da82dc" Size="10985624" PackHash="0f1af4d8e108a3ad1f23a1764271bec22dece02f" PackOffset="8" />
@@ -52927,6 +52802,7 @@
     <Blob Hash="81d559144a1716e7780bc05e6f9e132f812a7216" Size="122810" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="1564244" />
     <Blob Hash="81d5cbbe3d8a2dd97fd56072e139f7576fbf12d7" Size="123983" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="1775513" />
     <Blob Hash="81d6c299413ed5f444d56684009ee6e057eb4043" Size="3500" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="2088382" />
+    <Blob Hash="81d6f1b1361600a9a1902a36623b451c0c55fab8" Size="2033896" PackHash="bd1aead3e9c6eea8826b6919aa5edd1cf21a3029" PackOffset="8" />
     <Blob Hash="81d7bbef05264031e75a9ad23e3478fb0e9d6bb3" Size="2264205" PackHash="4904cbcdd9126bfd0bf7a267faa9edfb25ce303f" PackOffset="8" />
     <Blob Hash="81d81f9f7438a6720066cb98d0c6b965a0339ba8" Size="1412" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1170360" />
     <Blob Hash="81dd1cda0b25a5e801532c89e9db435ab465cb9d" Size="25744" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="506913" />
@@ -52935,6 +52811,7 @@
     <Blob Hash="81ebae5e73a57c2ba488bc223eedfb5278be5119" Size="212947" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="8" />
     <Blob Hash="81ed63646ed63d1c8230eb130aefd906b11f662e" Size="3382" PackHash="a254346aaa6d6c11dff58237f854fd54055340e3" PackOffset="2093039" />
     <Blob Hash="81ed81e82f82ba3493a03044b9fd7244f41d9094" Size="5627" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="2064540" />
+    <Blob Hash="81f0c10044850cac38ea383fdd8aa08b823dc431" Size="1431168" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="8" />
     <Blob Hash="81f25b6adbda61fd13c1ce00ba40a92610b0695e" Size="13433326" PackHash="0633702fbf3f8757b6c9c6638a12f33223c3ecf9" PackOffset="8" />
     <Blob Hash="81f6a8fe5b7f98dfc5381fa4041c7a22ca557e20" Size="61028" PackHash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" PackOffset="1938510" />
     <Blob Hash="81f7eae5517dd8151ba23a89f561d8dcd895a0f9" Size="2022" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1977213" />
@@ -52944,7 +52821,6 @@
     <Blob Hash="81fd292f61a4982e587f390a847030e696cef8e6" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2076613" />
     <Blob Hash="81fe219b4f92370a6c85ebb9335f6c347fda07ac" Size="8015" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="2074996" />
     <Blob Hash="82024af21abf7b2c551546a8da256672db148b32" Size="8021143" PackHash="57c7d9328a5767900be7e42460b9ff73a2c754ca" PackOffset="8" />
-    <Blob Hash="8206d2853de3a6b08864b2356be0ad78806866dd" Size="19794" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2012169" />
     <Blob Hash="820905a0643bdac8bbee62ff0285309e59643c54" Size="3835" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2083950" />
     <Blob Hash="820c9ae46b14a9fe6560e9f1665b3cfa94ab76cb" Size="1666" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="2094045" />
     <Blob Hash="820f47a757a5c2c37f1e68c46a4229a2923441a3" Size="3399" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="862747" />
@@ -52979,14 +52855,14 @@
     <Blob Hash="82447e150a93cb6475fcb3d31f70757a2e74ef84" Size="1247189" PackHash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" PackOffset="8" />
     <Blob Hash="82454059ca4fbca62f626c92c6ecc1ddc2f46a39" Size="18737" PackHash="e235435af47d241bf8a32655040bb6bcca173961" PackOffset="2072241" />
     <Blob Hash="824bc83ab67402a5e75ad1158e28d44b7031cc47" Size="156" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2071076" />
-    <Blob Hash="824dd29a01d8212d5b69af0640a8f2b2efc2023f" Size="2566" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1342754" />
+    <Blob Hash="824dd29a01d8212d5b69af0640a8f2b2efc2023f" Size="2566" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1462214" />
     <Blob Hash="824e084f2ef7f81a336a5292e1fdf4045d7dbb24" Size="3163" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="157411" />
     <Blob Hash="825075db195f052691ada2a16ada78d2eeccdc43" Size="924" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="2095517" />
     <Blob Hash="8250f1a9cdeb0dc47b2b9bd673fef092bba01f97" Size="224" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1703768" />
     <Blob Hash="82533981210dde7eb90a53e0918e3b8e82a1d3ef" Size="8785" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2048800" />
     <Blob Hash="8253e45fed7249854c6347b63ea716c4977913b5" Size="86895" PackHash="5bebca5faa7b71ff2927f873eecb93cf54bdeeba" PackOffset="275333" />
     <Blob Hash="8254c3c40900e4ceabfc1151f91f187837880b2c" Size="1863" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="383916" />
-    <Blob Hash="82553b5726640e4778b8bb749aa01e2e61474a81" Size="6286080" PackHash="a8860204b9047bdd6e18c2c6fa31cb20020fe7c7" PackOffset="8" />
+    <Blob Hash="825964cc9eefd2549fbe845c5dbb4e584077417a" Size="115488" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="1919920" />
     <Blob Hash="825993827746755df6e86b11c9fdd011c1cb9b95" Size="17980" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1033617" />
     <Blob Hash="8259cdd0ed77a961a665b294fb608faf189db45c" Size="11776" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="2083412" />
     <Blob Hash="825e3da6122e517349b2fb75f390a1d6b5c41b8b" Size="9229" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1930590" />
@@ -53002,8 +52878,9 @@
     <Blob Hash="8269aecff3763cf2fae0b44d3651a9b047c8e77c" Size="52318" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="8" />
     <Blob Hash="8269e4eb2b940bdcd3c428f81fb8d3cc76c68f00" Size="152160" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="1853400" />
     <Blob Hash="826a4642fe7ac8ca5736201b143ad1f67dd1835c" Size="4367356" PackHash="de1df31388e1bebd1cbdff9980962bee569e843f" PackOffset="8" />
+    <Blob Hash="826aabb920d8e967cd14b40e1f11eb42c3ba3521" Size="1787632" PackHash="c470599cb896f630d64573433e4b591d8839e655" PackOffset="8" />
+    <Blob Hash="826aaca5d32d0dfbdc6dd12624bfd422e57bb8fd" Size="3638224" PackHash="7fddfe4937ca7b830185cf3536c26128ca25395b" PackOffset="8" />
     <Blob Hash="826cf23f4ff2521f012ee5712ea750d2a37b5c40" Size="156603" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1540508" />
-    <Blob Hash="826ec8eb872db93218874a90a879c7f5b6302d95" Size="18923520" PackHash="1d25ba75bfae01cb71eb0d972fc438c145b6fcfa" PackOffset="8" />
     <Blob Hash="826ed29de408088195fad02fb76ad2cf6f18de7c" Size="269" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="466676" />
     <Blob Hash="82727436e0a061e55a10a088cc79f20a82b97b8d" Size="9336" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="528617" />
     <Blob Hash="8273a5d7d4fdebb689e9af46aff2bfd5fa8a65ca" Size="162018" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="860656" />
@@ -53012,8 +52889,7 @@
     <Blob Hash="827ffcff6378c2afc123de26a8ec5f47c766eb54" Size="20460" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1721110" />
     <Blob Hash="828139d9abff30f5025f627eff21c52863f96ac4" Size="11609" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1170932" />
     <Blob Hash="828195a481f83b7fe1fbda57d75ac587192bedb8" Size="141" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="444438" />
-    <Blob Hash="82835e98e8327d2f5b5cc665808a3fef1bc59911" Size="2157" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1361015" />
-    <Blob Hash="82836551ee9e341334734bad73a65f7583f74246" Size="108" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="2096931" />
+    <Blob Hash="82836551ee9e341334734bad73a65f7583f74246" Size="108" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2097019" />
     <Blob Hash="8284c7f02bc9fcdb15033d69ed0eff1508f15da1" Size="11741462" PackHash="7bffbd41c1725901fd038ebc348dc4275b0e9f4d" PackOffset="8" />
     <Blob Hash="828560a1dcf77eceddbd019509ad5db75fdf17be" Size="689664" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="236642" />
     <Blob Hash="8285d6586ced8c885d095fa4998fa0ca6576521b" Size="3598" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="103637" />
@@ -53024,30 +52900,31 @@
     <Blob Hash="828deee61cf13e86fa0fa5aae31c70e5982e13a7" Size="20378" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1348602" />
     <Blob Hash="828f245911e4662a8407342c7c6a5bad54a69f1f" Size="3826" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="731143" />
     <Blob Hash="829079d82a467852a16935a3e2ad4403ee945961" Size="5001" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="897036" />
-    <Blob Hash="8290c7d8e0d1215456a79973061cb4e8bb7ba077" Size="19581200" PackHash="45d4b14b5b417cac223d4cea9c102fcc4d7771f8" PackOffset="8" />
     <Blob Hash="8290fb8fc06dc8456363d2966d382caa50204a48" Size="6412" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="1989158" />
     <Blob Hash="8293827acfce169b683315f85eac27b7e9b8578f" Size="173260" PackHash="c179a00f7b3f95d459e9dc03d8cf5f197851686e" PackOffset="1052271" />
     <Blob Hash="829506c48bf825ae696de4bfa430ed6010f662dc" Size="25683" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1055707" />
     <Blob Hash="829864fb19ae6b91f9fab901502b66beea494e03" Size="6804" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="188142" />
     <Blob Hash="8298e768833e57a1aeaa32cb9bcff1f20ad43b2d" Size="1741" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="959007" />
-    <Blob Hash="829df11c70a40034fb1df4aad946358b06fc0a11" Size="129" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1581977" />
+    <Blob Hash="829df11c70a40034fb1df4aad946358b06fc0a11" Size="129" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1701209" />
     <Blob Hash="829f09d55cb9f7ed33d649c88536e09dde0e8bc3" Size="5066" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1973399" />
     <Blob Hash="829f2cf68d5cfdca835a9c8bca9c8c967b89306c" Size="17330" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1037035" />
     <Blob Hash="82a07b9df33e18e4d65b72d3a13ea863fb1e644e" Size="1552" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2093112" />
-    <Blob Hash="82a0b154aefccd0033db2e343b6ea7cce513223c" Size="285" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1608606" />
+    <Blob Hash="82a0b154aefccd0033db2e343b6ea7cce513223c" Size="285" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1727838" />
     <Blob Hash="82a2755ecb66bf8f0f9f19a51750e1542fd80774" Size="3573" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1808604" />
+    <Blob Hash="82a6083ccfa3f5beb54e45edc5c6885eba4660ca" Size="18230" PackHash="04c28788013394a789dc45f78000e685d793643d" PackOffset="2074904" />
     <Blob Hash="82a7fc98371ab792de2fd599ea31d027fb67cdbf" Size="4986" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1672365" />
     <Blob Hash="82abead6acccdc369474dc51f2a1fa6c215f766c" Size="168341" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="1873163" />
-    <Blob Hash="82ae725bc0172a262411f67a77cb3482320318ef" Size="876" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2029567" />
+    <Blob Hash="82ae725bc0172a262411f67a77cb3482320318ef" Size="876" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1919778" />
     <Blob Hash="82aeee2a8009d9cb7c1dffa2bb586c80d815228d" Size="1176" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1373920" />
     <Blob Hash="82b0612460c207f45c8a7ef75dfbd84d9fc924c0" Size="169" PackHash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" PackOffset="2096901" />
     <Blob Hash="82b38f3520efea093213cfadc4b02e24f9a73dcc" Size="176295" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="708503" />
     <Blob Hash="82b40c615cbd95a18d039ed1e225da555c93bcd5" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721583" />
-    <Blob Hash="82ba3b2b22f3aa35adfb5538266efd6454a365c1" Size="1255" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1262551" />
+    <Blob Hash="82b4701fa68dd344c763165db500ab1e95614b0a" Size="2324" PackHash="04c28788013394a789dc45f78000e685d793643d" PackOffset="2093134" />
+    <Blob Hash="82ba3b2b22f3aa35adfb5538266efd6454a365c1" Size="1255" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1711453" />
     <Blob Hash="82bac335bb9cedae544e97490d6bf3c4ba4b542b" Size="3262" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="269145" />
     <Blob Hash="82bf65e628e0112588e307732019e763eea14ba7" Size="118527008" PackHash="17f02066f6cd44f3f2d054094c5f610e89f2bf8d" PackOffset="8" />
     <Blob Hash="82c067aaf6456cba525d2901899d730eedd7c528" Size="6737" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2058499" />
-    <Blob Hash="82c2dd2c2fba8d5ade17af601debb347beefa916" Size="1079018" PackHash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" PackOffset="8" />
+    <Blob Hash="82c2dd2c2fba8d5ade17af601debb347beefa916" Size="1079018" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="8" />
     <Blob Hash="82c317382e6168fa29393e877e08c9d8c35d1550" Size="5242" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="186405" />
     <Blob Hash="82c374e6f5f8910d8b9c3be6b400a37ac85f42d9" Size="9" PackHash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" PackOffset="2097148" />
     <Blob Hash="82c41f2e213843531fee041cb9c12a4581ad0c0b" Size="1204121" PackHash="5359b58ffbb9ae76a120a6563e2ee1d6677eda38" PackOffset="8" />
@@ -53058,7 +52935,7 @@
     <Blob Hash="82cc9c27b98d12a7d53e3648ef31651c55c813fe" Size="4492" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1897756" />
     <Blob Hash="82ccfe5666106627b1a2d460d12752eea2be7e06" Size="334" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2096635" />
     <Blob Hash="82cd0ceccb1d06c90a01682883acc67d4a9b26cb" Size="2071" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1840472" />
-    <Blob Hash="82d30b5423969a21e5b6dc3c6782171cae6fa877" Size="3645" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2075199" />
+    <Blob Hash="82d30b5423969a21e5b6dc3c6782171cae6fa877" Size="3645" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1975063" />
     <Blob Hash="82d4d2be11f964ab719466e4dbc6eb7d00390559" Size="36779" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1222376" />
     <Blob Hash="82d64a96409206fe2a84fdfa2b6c6a18696f269e" Size="2717" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1986516" />
     <Blob Hash="82d67367d8078277b40e6d8ba31abb67c040d014" Size="2988" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="495994" />
@@ -53070,10 +52947,9 @@
     <Blob Hash="82e926231de441f80812565a341ad39ee30202c0" Size="345" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="169176" />
     <Blob Hash="82eb198fc7264893f906da1bc1f4270756061145" Size="4833" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1406388" />
     <Blob Hash="82ebc4bf97e66e2181ce8ff424d154897afc8089" Size="8864" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="84579" />
-    <Blob Hash="82edb8311535bd57ac6832cdc523451da73e8914" Size="2836" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2093655" />
+    <Blob Hash="82edb8311535bd57ac6832cdc523451da73e8914" Size="2836" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="2094249" />
     <Blob Hash="82f08612a7733cdbad603ec28cf2a88bd789bd06" Size="5616" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="376876" />
     <Blob Hash="82f12d8de1a50a39c52ff2f263c73de931503fe5" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1295629" />
-    <Blob Hash="82f864af93f3db7e58458abcfd88dce6514ca275" Size="46415736" PackHash="74f28c4f535b95fbb5ab2977259754f1bbada39e" PackOffset="8" />
     <Blob Hash="82f8e239c4e44ae54077ccf2c33809928da72057" Size="2581" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="845514" />
     <Blob Hash="82fef8545525904598d9de21a7ea8b71521ace85" Size="904" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1726423" />
     <Blob Hash="8300b452f168ca3ad94ff179dcc02d419bef4c28" Size="5424" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2000200" />
@@ -53084,7 +52960,6 @@
     <Blob Hash="830e5046b6a1b4529cff2ee8b8d50abbb1e9c6e2" Size="1614" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1911560" />
     <Blob Hash="831034fb4133201146271b06799235c8c8c7a46e" Size="44" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2097114" />
     <Blob Hash="83114af7316098647fd3fa7abade961a622bf701" Size="2534" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="777794" />
-    <Blob Hash="8311634a175de8a2456f0acb30e73dec4e12cfdf" Size="247900" PackHash="881ad0ca57f6a4fe275a7b7ca77f2daa52b2334b" PackOffset="1781300" />
     <Blob Hash="831f0c864ed9df302a2cc190c0db08df93562482" Size="156304" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1786318" />
     <Blob Hash="83205d501ae68838d7b3e3383de05e2e62417bd4" Size="5402" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1668255" />
     <Blob Hash="8323bc1c21a90205003d2419b10e946be3944cd7" Size="70651904" PackHash="fab24c9fc717bc1ed8365b9f715e035c32c8ebdc" PackOffset="8" />
@@ -53093,34 +52968,36 @@
     <Blob Hash="8328ff885abdad547c5e80c71a263f1da5262a2f" Size="14657" PackHash="3cd48173c240efc756b78b7c8c2ec1292f6b4b4f" PackOffset="2068052" />
     <Blob Hash="832cbff2ede9c19747f08ff0b174883dd0398994" Size="6646" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1940891" />
     <Blob Hash="832d7929498d50493d41428fb169e287490c4254" Size="4935" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="957264" />
-    <Blob Hash="832e533739c4c4cec7bb4aba6aa53f7b9a8ac74c" Size="1140" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1401335" />
+    <Blob Hash="832e533739c4c4cec7bb4aba6aa53f7b9a8ac74c" Size="1140" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1520587" />
     <Blob Hash="832e53a43f15e2c1f61b72f016e77a3d6c5e70a8" Size="11876" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="443302" />
     <Blob Hash="832e596133cc4cf3e4a1c2327b60d233137147cb" Size="89376" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1096046" />
     <Blob Hash="833167154fa7d2105c3b39a505355d116071d3c5" Size="139433" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="1956354" />
     <Blob Hash="8334e95069c469a965159ab4d6af0c0e7022723c" Size="88" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1229360" />
     <Blob Hash="833845e68039223e743f19cd70f7fe7d7558e467" Size="905" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="2090410" />
     <Blob Hash="833a007bc8bd80e4c4bb21d2ab0f9bc84f23e3db" Size="5436" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="234399" />
-    <Blob Hash="833aafd3b91520b61c27a31771b3abc054166e1a" Size="761" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1452094" />
+    <Blob Hash="833aafd3b91520b61c27a31771b3abc054166e1a" Size="761" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1989176" />
     <Blob Hash="833da1351f3e4d3aff5ddae7f0e4a688ce44d866" Size="3500" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="777593" />
     <Blob Hash="833dbaa316ae375d8ecf0e5dca90289aee0ec0c5" Size="680" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2079400" />
     <Blob Hash="833dcaa0ef44c723846529a38885f8edae1965d9" Size="206915" PackHash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" PackOffset="1523894" />
     <Blob Hash="833e44cc61fbf7a3586ee82bdd5c5a6745bbf08a" Size="410" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="354936" />
     <Blob Hash="8346ca0189877a576a130c995be9e2ab40ed5693" Size="1247062" PackHash="46cacf33335ca2ec60df0c71cc36af0602ca8bfb" PackOffset="8" />
+    <Blob Hash="834928e2fa8c88135d3095c20d5b4d9b097fcdf6" Size="2440" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="2090868" />
     <Blob Hash="834c21946447ccd961de3f6a300a65cb1ee62850" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081947" />
     <Blob Hash="834f0e57df0bea92103567d33d7646abdc0df788" Size="228" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1700604" />
     <Blob Hash="834fcde39ae8c4d4fa6fbc6fccba1fe0c354cb73" Size="3144" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="318699" />
+    <Blob Hash="8351473ed1a9c0e3d2141099be8167a469e7df03" Size="53303826" PackHash="2dc703789d5979bafc8103dd999a6d07ccc0d673" PackOffset="8" />
     <Blob Hash="835195049097cb5b4eab48d3ea096bc3e4cbb8e1" Size="2289" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1990015" />
     <Blob Hash="8357d093f28b59fd3d644e1d8cee606218a96998" Size="83283" PackHash="5f239795752cebffb0bd14bc3d14db541d74b95f" PackOffset="1657556" />
     <Blob Hash="8358650b19d3bc22495adaa509e4f0d9f81fc9b9" Size="18879" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="54462" />
     <Blob Hash="8358d5904dfcd9479c2cd279e9d7a9b2f1932a0a" Size="3383" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="878538" />
     <Blob Hash="8360666b463ed423a7ba9449da5dbea61cf7764e" Size="2927" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="330946" />
     <Blob Hash="836079f9f6681c51dc75e3427387981c1babf446" Size="164208" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="924088" />
-    <Blob Hash="8365b4c2b961958497b56c05f972b4ebfe9967f7" Size="236" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1609475" />
+    <Blob Hash="8365b4c2b961958497b56c05f972b4ebfe9967f7" Size="236" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1728707" />
     <Blob Hash="836adb8f2de0345c59fd46b967980b48f4ee3c67" Size="1234" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1971171" />
     <Blob Hash="836d500234dc72c3e1597c9fcc20ffa6874e4a38" Size="2791" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="225325" />
     <Blob Hash="836f326ec4a329fdc39f7dea918c8492d3318c46" Size="3325" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1082917" />
     <Blob Hash="8370eb98f4796cb4d681f43bcf62941b44023ad6" Size="911" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2092308" />
-    <Blob Hash="8375d259c3a0c7fd2921edae5688d030cd955c90" Size="675" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1560956" />
+    <Blob Hash="8375d259c3a0c7fd2921edae5688d030cd955c90" Size="675" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1680188" />
     <Blob Hash="837bbff40491a8b3752697d98dc82939752727f8" Size="200305" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="585398" />
     <Blob Hash="837cd16010ee8f73d769c18f2680fd40e4ee6587" Size="4167" PackHash="c79b3d3d81375c25019c997c0e81af6b84d805c1" PackOffset="2091980" />
     <Blob Hash="837e8532ae3128a9a13f87305bbf1b35a586c5c5" Size="14059" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1740018" />
@@ -53134,20 +53011,21 @@
     <Blob Hash="839139eef50da8d0ea4c9256c4af1a8c4d272023" Size="228122" PackHash="7834946aa336571c3e5e0f4f005e54499e0d9e70" PackOffset="1159573" />
     <Blob Hash="83916d05d53bd18a17772434bdf7964ddeb4f92d" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="575377" />
     <Blob Hash="8391b610a019fb152ba16e343e0f5f67ff9ce3ff" Size="6431" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1316058" />
+    <Blob Hash="8393fd32b5b028b62a00d2356ac0def52a1c9230" Size="6786" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2068900" />
     <Blob Hash="839406b962c43f78923416b58093ad7ce671f930" Size="106472" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="655928" />
     <Blob Hash="8397366a525e502fd37407b6a7f8694404001595" Size="1757" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="693477" />
     <Blob Hash="8397655e28d750c227e4dca7b104aea558d99f0a" Size="1693" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="366844" />
-    <Blob Hash="8398980ee256a77aa1478ad06733802dfb496727" Size="1494" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2095630" />
+    <Blob Hash="8398980ee256a77aa1478ad06733802dfb496727" Size="1494" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2095176" />
     <Blob Hash="83998c4a7a7f1adaf7d98ed4d53ec4ab5881318f" Size="3628365" PackHash="f32aba07cfa1ebc07b2b435fe84868c2a9d2f6c4" PackOffset="8" />
     <Blob Hash="83a203b79f730d9385cee1c99e06f883bf4056f2" Size="2804112" PackHash="5557b0556184e1e1a9fe48685f17a5c90b2c5c14" PackOffset="8" />
-    <Blob Hash="83b28101c6dadbf32f3567046366657391a0be20" Size="359" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1395835" />
+    <Blob Hash="83aea9c9ae31c76316266181c91cd1ab0bc855f2" Size="2322" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1777224" />
+    <Blob Hash="83b28101c6dadbf32f3567046366657391a0be20" Size="359" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1844737" />
     <Blob Hash="83b9c3e84a42ba1221374aa617b84d641f74fa92" Size="55925" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="718464" />
     <Blob Hash="83bee7a816bbcbfda41a43e85e6acd8eac0e7249" Size="60" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="670054" />
     <Blob Hash="83c02f6948b6daf648d5dcc30ba1274eb46d370b" Size="166" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="733442" />
     <Blob Hash="83c5fb2e46afb48a6ebfafce8587cc80f72b27cc" Size="237" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2096877" />
     <Blob Hash="83c6eddfa1ae61d899538b3dc718295d5b12bffa" Size="340912" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="8" />
     <Blob Hash="83c701e95cd389d62da7e9e07cbb658fbe220bdc" Size="4285" PackHash="46ed07c02685d1d9f9df9ad537075f9102c39e46" PackOffset="2091537" />
-    <Blob Hash="83c9525657cecaaa157de4a74662d7ad11c2d79f" Size="164376" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="161664" />
     <Blob Hash="83cae7f7faa4d90c3ecf456172924bce94c5f566" Size="1727" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1666130" />
     <Blob Hash="83cc3a0493ff3ef0580344866110b34642dd8966" Size="4708" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1071613" />
     <Blob Hash="83d243ee26d81c4f56e6624c504eb84be9d35da7" Size="116736" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="593928" />
@@ -53177,18 +53055,16 @@
     <Blob Hash="840fa0075f0be15c4298eee9409d0c316ccf24e7" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1264136" />
     <Blob Hash="84111b874e840216c4e3dbd1c609af3dc815f189" Size="7641" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="239835" />
     <Blob Hash="84159560be744ea2edc7fc599d3ab611526f74f5" Size="2192" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="510738" />
-    <Blob Hash="84172df5c7865f1aa53345cff59acc6e34f2548a" Size="8998" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1742636" />
+    <Blob Hash="84172df5c7865f1aa53345cff59acc6e34f2548a" Size="8998" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1758402" />
     <Blob Hash="841777332e89497848a497c6339fc7c736872060" Size="781432" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="254472" />
     <Blob Hash="841810e21ce0b7a307ecc165eadf243f69912d5c" Size="9256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1211638" />
     <Blob Hash="8419e51272ba2c759fb79b2eff2a2026539c8253" Size="5005" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1211210" />
     <Blob Hash="841bfe83656cebca188ffbd995078cd0ddbb4b6a" Size="3829" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="2085959" />
     <Blob Hash="841cfbd147590f6d74ac258593d350f378445676" Size="4892" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="29316" />
     <Blob Hash="84213ce534b7064df00c4b2ca7d1dd27271536bc" Size="25866" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1955931" />
-    <Blob Hash="842196416568e85f35b0921dc9fbfe7f4f47ad27" Size="3671" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1072704" />
+    <Blob Hash="842196416568e85f35b0921dc9fbfe7f4f47ad27" Size="3671" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2013438" />
     <Blob Hash="8421cd8fc42be1c6601e0d465b1180de1c9f12f1" Size="56928" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="684619" />
     <Blob Hash="842424b4564f6637883b46e025d5d34cc4751eb7" Size="17288" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="824084" />
-    <Blob Hash="8425636a31606fd6d44fd9c1f7210bbb7de05808" Size="6269608" PackHash="ede73224773ccd81fc18ca093995e0688871bf2d" PackOffset="8" />
-    <Blob Hash="842bfe54e2b89ad73f843d2092c70f87c3047ce5" Size="1957032" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="8" />
     <Blob Hash="842de72b46e3c46e32730c76d5ae025ae46b8616" Size="17413" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="772624" />
     <Blob Hash="8431518c9464d97f04aeb83dfe94a62a46b251e7" Size="658" PackHash="1e6aa2734645d55d643f5efa5b1d568bd9cc24ae" PackOffset="2096470" />
     <Blob Hash="8434787df759d3dc2356236439eb86f81a9ee89c" Size="4444" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="2027332" />
@@ -53205,7 +53081,6 @@
     <Blob Hash="8447fe53aab61a48b16faec6c90c228da5877d11" Size="3484" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="370307" />
     <Blob Hash="844b85562c5b57faa24771bf55dde860b5100d55" Size="29344" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1392626" />
     <Blob Hash="844f7c3605956a31fbbd33da3ef0e9d1f032acf5" Size="21522432" PackHash="dd224b777ac0b2b82b6b84c94f03e799403e8aa5" PackOffset="8" />
-    <Blob Hash="844fb62a317e1a3d6fc828412ea5357d96e7a77f" Size="42416" PackHash="8fa3b7b9dfcdd86814c8d31b88442e487b319bd9" PackOffset="2052576" />
     <Blob Hash="8451a20226284ec5cb71b4f5ace691822d2bd16c" Size="153062" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1034274" />
     <Blob Hash="8454d22037f892e76614e1645d066689a0200e61" Size="6068" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="510750" />
     <Blob Hash="8454f07923c0502f687cdba58fd4cebf1d931c5f" Size="1568" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="954410" />
@@ -53238,6 +53113,7 @@
     <Blob Hash="84a51a68faf1fea18583ad6b7713691fdf2f5aa1" Size="133555" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="342473" />
     <Blob Hash="84a67abde964c2b26f5bfe84de76e402cb0ad3f1" Size="17486" PackHash="5f239795752cebffb0bd14bc3d14db541d74b95f" PackOffset="2051969" />
     <Blob Hash="84a88a558c56fe3b9c6ec62593804315cc874e7f" Size="51712" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="2021384" />
+    <Blob Hash="84ac22242f907726a1de2ce20c739ff3f9c70477" Size="3382168" PackHash="32d3e400864b174936d937243ad493bba1ae7784" PackOffset="8" />
     <Blob Hash="84af4e2e92ff9129d55fdb15679ad4026ecaff27" Size="139144" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="1049274" />
     <Blob Hash="84b0a9f2849f9a6ed1932d9edb67dd28304aaf54" Size="958" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="635732" />
     <Blob Hash="84b33585cc329d97c5b440c01f12152f75b7cb22" Size="242382" PackHash="83127d14d8403a98dd6220dc7c9068fb0d569cc5" PackOffset="1314267" />
@@ -53248,7 +53124,7 @@
     <Blob Hash="84c19d80c7f800292d6d9b6a6a8f1968c62c87d6" Size="49" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070725" />
     <Blob Hash="84c44c5a2ea0ad4d91aa9d39a8bbbb365d78cd85" Size="5167" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1984870" />
     <Blob Hash="84c46923508d6c30444a1ad433697a10de49b18c" Size="1855" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="2095048" />
-    <Blob Hash="84c734d93ca738d72edc1f5b5cda789c98d50fa7" Size="1303724" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="8" />
+    <Blob Hash="84c734d93ca738d72edc1f5b5cda789c98d50fa7" Size="1303724" PackHash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" PackOffset="8" />
     <Blob Hash="84c954f51277e797e8910ef346fe9ff6b95d9e19" Size="4688" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="218243" />
     <Blob Hash="84c9b15c24d85779f05d5f58606e8f09b2111741" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1203982" />
     <Blob Hash="84c9ca9a47e19a68a2789d152cbf49fc0a630e75" Size="3349" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="2092679" />
@@ -53263,18 +53139,17 @@
     <Blob Hash="84d6b379ad0bb3d7cdebc79583d4ef040540d283" Size="2821" PackHash="da4da2f40baa6c08a42a6d05a81529a0bf2b1a69" PackOffset="2094332" />
     <Blob Hash="84d6cc691f80901f148e88e21513a372ba9cc59f" Size="4337" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1889032" />
     <Blob Hash="84d8f974f2ff4d20fbaf3c1ccc8ac05bea516310" Size="15346" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="224679" />
-    <Blob Hash="84df46dc084ff58d0ce5276517b9fa207d1b468d" Size="7078" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2082876" />
+    <Blob Hash="84df46dc084ff58d0ce5276517b9fa207d1b468d" Size="7078" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1937938" />
     <Blob Hash="84dfdb5d07d71e6575165dc0c99129d9c638e6b0" Size="293396" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="545399" />
-    <Blob Hash="84e240776dedd113e443254d4d3a1a2e5e9b6983" Size="761" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1423418" />
+    <Blob Hash="84e0bf94156133de761c36cc6766dc4bc9e83f25" Size="1416160" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="8" />
+    <Blob Hash="84e240776dedd113e443254d4d3a1a2e5e9b6983" Size="761" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1872471" />
     <Blob Hash="84e5c4838fe1ec8b8f1c9abaee23cc1e2bdd28cf" Size="7521" PackHash="4c5e613dbc080d544e62bd42771a406a1f7743ad" PackOffset="2088575" />
     <Blob Hash="84e8cf3dcc00523fc710959fbb852aeb12effec8" Size="3426" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1182919" />
-    <Blob Hash="84ec29f94416f4e3a67f80920b51d7d80855b841" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549478" />
+    <Blob Hash="84ec29f94416f4e3a67f80920b51d7d80855b841" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668756" />
     <Blob Hash="84efd054d351232352cb2edb431d6ddf28e1f9c1" Size="3653" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1764439" />
-    <Blob Hash="84f3122f3de9436df4129d1d3485a4f1c0110c49" Size="2450" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2086360" />
     <Blob Hash="84f8b0073b1079fa20c548c6217009e524734f54" Size="7266" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="500477" />
     <Blob Hash="84fbad0b2c7f1cf849bec41680e68551ad6efd22" Size="1196" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2038701" />
     <Blob Hash="84fce8c88cba4aa38fb53bbe83e307704ce22290" Size="1540" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="949641" />
-    <Blob Hash="8500b6375881428551f328382bc7113c10631bb8" Size="10710432" PackHash="84fc72663545c473398b1afd3d49060edc0bf47b" PackOffset="8" />
     <Blob Hash="85036d2a7add4d99f0933ddfa0c63efa2394842e" Size="3744" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="2086990" />
     <Blob Hash="8504084a3b1173d08f8e177fe66e69733a475682" Size="45004" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1365932" />
     <Blob Hash="8505f0cf2c19f033ba416cd071d57f5695381ede" Size="88607" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="1338257" />
@@ -53347,7 +53222,7 @@
     <Blob Hash="85ae11f71a58616d6c3b060f39049aaf5b8ce4ec" Size="8740" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="45462" />
     <Blob Hash="85afe95042ff58dcffc2ae00336f7c3f19469004" Size="5296" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="328418" />
     <Blob Hash="85b0dbe24609dff93701d257654a4b2a3bc2f125" Size="677730" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="735767" />
-    <Blob Hash="85b1517167fb3c51644d721e2a18b48f9f5d0041" Size="46847" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2031196" />
+    <Blob Hash="85b1517167fb3c51644d721e2a18b48f9f5d0041" Size="46847" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1782553" />
     <Blob Hash="85b746b4d0ee70c8c98917dc07287fdc665e3dc7" Size="3647" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="611386" />
     <Blob Hash="85b9a71ce084b80a6bcd51904ffe03f8fe851146" Size="153598" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1540956" />
     <Blob Hash="85bab115a7eeff3bcdf135e4249beefa00bec2a5" Size="59" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2083516" />
@@ -53355,7 +53230,7 @@
     <Blob Hash="85c01de9d3f83f9d1cae7075e0e097925bd9771d" Size="1168" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2052773" />
     <Blob Hash="85c10f05823cd3263fc7b3ec38796bec261b3716" Size="2335" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1024308" />
     <Blob Hash="85c13ca0a908c69b8bbb6040fc502aff96b8f8c7" Size="186" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="627752" />
-    <Blob Hash="85caaba77b9ca1ff84f8d6dd857dc8e7e37ac011" Size="3650" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1642098" />
+    <Blob Hash="85caaba77b9ca1ff84f8d6dd857dc8e7e37ac011" Size="3650" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1854207" />
     <Blob Hash="85cd002bb6bdcee9ec6a616981706bd867e201e6" Size="265" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="841309" />
     <Blob Hash="85cf4c4a59f3b0442cdc346956b377bae5b9ca76" Size="27840" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="816416" />
     <Blob Hash="85d7c212721e37b2db339ff5dc9fbc8cc533416b" Size="109698" PackHash="c5ae184eaa6760174706ff03095aa041150e0bc7" PackOffset="1467898" />
@@ -53368,15 +53243,16 @@
     <Blob Hash="85e5044382c7087b1c9a693e5d49c48f27c645cc" Size="1341" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="579515" />
     <Blob Hash="85e632b94271cb0335b1562ac3dc94f549feacc7" Size="208619" PackHash="37744be8b7dd0b6ad613bd4110630d467b7b8bae" PackOffset="1023988" />
     <Blob Hash="85e7335b2e64650cd424b45e64f5c0eab3cc29de" Size="985424" PackHash="cad6744ce15f118a59a2092dcd6d52e7a0f0fbe0" PackOffset="8" />
+    <Blob Hash="85e7d4ff35591010255a59965237861d80c3bcb9" Size="157377168" PackHash="8cebad30706df03c8e11cff1a20e9cd32f8b71e8" PackOffset="8" />
     <Blob Hash="85e8999bb9ae838348811b6cf353eb3ed1b80bee" Size="1942" PackHash="b4d8e0b490d2a1157340644482cc429e03d9575a" PackOffset="2094909" />
     <Blob Hash="85e936840f6e6c7ba342c8cc615af0ed7fa74263" Size="1245" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="311382" />
     <Blob Hash="85ef7c4b8ae233e016d2bd8068a7317a9d1b7172" Size="69182" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1621000" />
     <Blob Hash="85f3a98c9fc80b7ceb3961e4f34b600a640a5109" Size="10422" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="847928" />
     <Blob Hash="85fa92a576a77960cb7271a9cc97dfa0471b6e95" Size="1804800" PackHash="79c05fe7b7c07f8ffbc805ba018206bdd2a66fb9" PackOffset="8" />
-    <Blob Hash="85fc541983d1ad2eb05b2d258af87fd9da23a461" Size="8566" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1795347" />
+    <Blob Hash="85fc541983d1ad2eb05b2d258af87fd9da23a461" Size="8566" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2051703" />
     <Blob Hash="85fd228db625af2f34d45d57090fde04442da42d" Size="22008" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="22816" />
     <Blob Hash="85ff93364cb50d7fbc17edeb4ceced181c94dfb3" Size="439" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="830109" />
-    <Blob Hash="8602fd682696b5a4586d0d5cd9f17f67660b894b" Size="8121" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1623590" />
+    <Blob Hash="8602fd682696b5a4586d0d5cd9f17f67660b894b" Size="8121" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1639415" />
     <Blob Hash="860421d1e220ee4d86992d7fb983afc4f09b7bff" Size="63256" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1947777" />
     <Blob Hash="8604cec9ec287a38c176ca99e5105966a9917931" Size="41136" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="2043098" />
     <Blob Hash="8608982b3a72129c5f7863850cb2617dcbfe6241" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1257168" />
@@ -53390,7 +53266,6 @@
     <Blob Hash="8611d5a29b0c608181c6f4fc21a2bd5541a2d9cc" Size="35273" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="844214" />
     <Blob Hash="8612c510eab8cfa080b6c9112e772d2321ccbb76" Size="329023" PackHash="55432c5eabf49c62d2a90391a4a41bc6c23f02f4" PackOffset="14495" />
     <Blob Hash="8614277b280decc4ed5f455a378d6596edb6389d" Size="2947184" PackHash="18b12e0c334dece04d3b148530ad5b51f2adc9c6" PackOffset="8" />
-    <Blob Hash="861690fe09779ce728e83395a57e35076d802873" Size="4457696" PackHash="fb6c97254ed46f9a902a1e16b54728b30df2e246" PackOffset="8" />
     <Blob Hash="861804be9420c4f6e0cbdd96649b6736ad3a188e" Size="889" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1829983" />
     <Blob Hash="861b1e65b7a2fce772245af59156146ceda9bc66" Size="1341" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2030183" />
     <Blob Hash="86216f3b4236565a65c3d1572aa2e4dc2bd101d9" Size="243712" PackHash="ef60a0c38ea7162ceec2c523ef91f87a81f89cf2" PackOffset="570317" />
@@ -53402,7 +53277,7 @@
     <Blob Hash="862ccff29d17dfe82174659d8c6117d19a8ef7db" Size="25224" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="924517" />
     <Blob Hash="862cfb4a7bade1c4af3ade855be09eebc2a23f3b" Size="1764" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="834869" />
     <Blob Hash="862ef25c14905116b6bd5fe3b048198be921e06b" Size="14336" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1039880" />
-    <Blob Hash="8631c9cd7ee75354acc3d83b40353be92342fb2f" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551175" />
+    <Blob Hash="8631c9cd7ee75354acc3d83b40353be92342fb2f" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670407" />
     <Blob Hash="86326d53c15dc6301c9a29434d3d2ebaf5e76758" Size="47258" PackHash="59aad3440eda11860e175fbcdcea226318e3d677" PackOffset="2029701" />
     <Blob Hash="8633798b9224d48271a77b1fc1b0d92c817453c6" Size="6651" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="299141" />
     <Blob Hash="8635d0734595a2d8764be389e50b91f4e308e3f2" Size="2903" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2085928" />
@@ -53424,15 +53299,17 @@
     <Blob Hash="86532e2425b0fe1869909b7fd7de3b76c4c43571" Size="106214" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="8" />
     <Blob Hash="8656e78bdf54f17eb3f6410c6bd756d1eebbfe86" Size="3244" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1555492" />
     <Blob Hash="865b1a2507d81797672e1808286a182c644c93f0" Size="9395" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="564772" />
+    <Blob Hash="865b618c6b28ea92999e9be685155a986bd4d194" Size="244736" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="1431176" />
     <Blob Hash="865c98aed7ae35b5543289ff2ff290ae6cd3a971" Size="13107" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1576968" />
     <Blob Hash="86606e6051f2ad65b84d60879181ca5c94be4166" Size="40081" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1163879" />
     <Blob Hash="8660805e60c410e9f882bb9c64c0b8704e523da7" Size="16633" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="226522" />
     <Blob Hash="866384e42fbeb22572b50ca2ee2a7baad76b9e6c" Size="4285" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="1350134" />
-    <Blob Hash="866856cdb08da85db47e3f8c5e3dbae0ebc6e29c" Size="306688" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="1215496" />
+    <Blob Hash="866856cdb08da85db47e3f8c5e3dbae0ebc6e29c" Size="306688" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="1707016" />
     <Blob Hash="866a7ca7a8d271a9994134c5ceae45f0325ee886" Size="34084" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1914937" />
     <Blob Hash="866bc4410910a1416139e437544f5063cbbc415b" Size="1103" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="285571" />
     <Blob Hash="866ed7a81b875fd77556c8cb9f469fc927184872" Size="16203" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1640984" />
     <Blob Hash="8671501cbc9bc371d3551cf3715b61c546e22bb0" Size="2078" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="2059598" />
+    <Blob Hash="86722eb6b722c3bba377509177704ab6537d8ebc" Size="9220712" PackHash="556a87552eca751b0dd2e77cbf3b577f11661e02" PackOffset="8" />
     <Blob Hash="86729eb96510fb5a0d30e08e51f3d0ffa59a41b6" Size="17576" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="289947" />
     <Blob Hash="8672a331be2d29de9e6a9c45cad1ecc8df4d7dd2" Size="691200" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="713224" />
     <Blob Hash="867399038d5e946fba10f7e077c16016ed380542" Size="496" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="1735735" />
@@ -53448,7 +53325,7 @@
     <Blob Hash="868f11a974228c8a563efd8951f8d2d788cdbb9f" Size="15360" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="898056" />
     <Blob Hash="869075b6a01df60c6e5449619343c4c4b1f66a5b" Size="1358" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2086880" />
     <Blob Hash="86948c3289f041981738db28e0fc331fe80f28c6" Size="3064784" PackHash="4835e22bd37fe57ec9c11ea29c97365130e2384d" PackOffset="8" />
-    <Blob Hash="8698916c0a825524c3306c20eca1c3f2a2c924da" Size="192" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1585380" />
+    <Blob Hash="8698916c0a825524c3306c20eca1c3f2a2c924da" Size="192" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1704612" />
     <Blob Hash="86998f39f674f42eb8074514921f17e0ab35baa2" Size="88" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2086524" />
     <Blob Hash="86a1003a0c78519f31b0ec23e9f5e0c65f3a0317" Size="116" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1681776" />
     <Blob Hash="86a1c2d5034d4c8b023782b9c1efd0d924af3f35" Size="9033" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1195913" />
@@ -53458,7 +53335,7 @@
     <Blob Hash="86a730681af265e05a74e03cb542913c570a3547" Size="207183" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="1868895" />
     <Blob Hash="86aa624b935722d4c60735326ddbc5a89b142125" Size="53192" PackHash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" PackOffset="1999538" />
     <Blob Hash="86ac3cb31e7ac0828b6b2f6e2c2136d823e5a5f7" Size="118" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="203290" />
-    <Blob Hash="86aceaf7e7ee65450bf9aa7487e2fa88cd7b7834" Size="90061" PackHash="8557924e60fcdd015907d69d205b21d58fccf17f" PackOffset="1969902" />
+    <Blob Hash="86aceaf7e7ee65450bf9aa7487e2fa88cd7b7834" Size="90061" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="1877945" />
     <Blob Hash="86aea1b64aa92de01c56900721215a2c485fcf54" Size="2664" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="772824" />
     <Blob Hash="86b07cbb17488874d3a62020ec451767d5a27d3b" Size="1756" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1289147" />
     <Blob Hash="86b0ea1feaff9d9746ffad01a52419c4fa6e0e49" Size="174" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="447953" />
@@ -53488,7 +53365,7 @@
     <Blob Hash="86f3575af27aa5d4162c27165a4d72698db7ed7e" Size="2351882" PackHash="9277c0efb67a5a452ef0edd52939dbdae3d6e5c9" PackOffset="8" />
     <Blob Hash="86f40f0358c30571758edae4069aa3c36635b60b" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2093315" />
     <Blob Hash="86f73358024acd46201fb0d3ec710372126b5144" Size="935" PackHash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" PackOffset="2093849" />
-    <Blob Hash="86fc431c85c2880bb8fa88a71fc6fdd7fabc2e81" Size="169" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1615851" />
+    <Blob Hash="86fc431c85c2880bb8fa88a71fc6fdd7fabc2e81" Size="169" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1735083" />
     <Blob Hash="86fe005ac4b32a7e42113a8de14790953d3b6ab5" Size="16812" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1793462" />
     <Blob Hash="86fe4aea394c4f84503675ef7999b175cca291df" Size="5203" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1230941" />
     <Blob Hash="87026a7790027a1df3d2480ec7a06ec4d868bccb" Size="59" PackHash="9fa27c399514b5e1ef6857dd892b39d3cc273238" PackOffset="2097087" />
@@ -53521,7 +53398,7 @@
     <Blob Hash="874b7ee9d6421201df33544e8f32d2ce8e59ca16" Size="8105" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="958335" />
     <Blob Hash="874f34c56eac015ba7fe8c8392b9655162fc5112" Size="13752" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1621526" />
     <Blob Hash="874fb165015389bff572cf378908c9f3112f48b6" Size="418700" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="564539" />
-    <Blob Hash="87523edc59eb18d4a7f23b53fd9da795cb8f880a" Size="5085" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1960992" />
+    <Blob Hash="87523edc59eb18d4a7f23b53fd9da795cb8f880a" Size="5085" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1701219" />
     <Blob Hash="875554378788f6c016ee78681bceb6afa2935201" Size="104367" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1261625" />
     <Blob Hash="875987a18e0168f79f05b85ce8e59f118ec26b32" Size="133632" PackHash="fff4095031f71891566086a3a9fd62eeb09b7c91" PackOffset="1963112" />
     <Blob Hash="875ab685347c5c99f5fa281079bd710fc390236b" Size="210368" PackHash="4d6f9c6d7a261e35898225b1fade32da175cb530" PackOffset="1800474" />
@@ -53533,16 +53410,17 @@
     <Blob Hash="87689e66601df90bc93701a48a82c55a2312e338" Size="398528" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="74392" />
     <Blob Hash="8769a2620102f8d5ff50207ddc6fd61ee4cf54eb" Size="3006" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="531648" />
     <Blob Hash="876a13a20f7238c6f2add4bd4677ce7aa93b9268" Size="45056" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="2034696" />
-    <Blob Hash="876d0c079c188d1266bb43d2c08570932cdc47c7" Size="4786" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1103299" />
+    <Blob Hash="876d0c079c188d1266bb43d2c08570932cdc47c7" Size="4786" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1873243" />
     <Blob Hash="876eb1d947d9fdf00da3f07ce1fa5499cb24f49d" Size="4488904" PackHash="6bb7326952dfe32d1763ffa1423888e323a2a2e8" PackOffset="8" />
     <Blob Hash="876f421bce19f26814c22059b38fbc18f51fc116" Size="161759" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="1869327" />
     <Blob Hash="8770587f5275750e5030bf8c9ec0491ce679b82a" Size="194" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="186346" />
     <Blob Hash="8775120247f6d02a672345a6e1fd7b464790367f" Size="436" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1356526" />
+    <Blob Hash="87790c604f96d875df776fcc310b634674ed6939" Size="1986576" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="8" />
     <Blob Hash="877aa0b62bc187a4bb14000b735fefd92de3871c" Size="1337304" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="8" />
     <Blob Hash="877c6fa932a15690ed7e5c4c8e2489c686ac062d" Size="128485" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1090749" />
     <Blob Hash="877ca2d64a7ec843c49029b504f86b5a805c62ee" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2080224" />
     <Blob Hash="877e802173ffc578c06589960f6a1e70ec3e2e20" Size="93789" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1498313" />
-    <Blob Hash="87803be2c46cba971b234b2bff0e6afebab971d5" Size="56" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555434" />
+    <Blob Hash="87803be2c46cba971b234b2bff0e6afebab971d5" Size="56" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674666" />
     <Blob Hash="8782605ca41987bcd967e6a8cd0394b660ce4bf5" Size="134142" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1628285" />
     <Blob Hash="878430e4ec1e1bf4e5c8c5419451536813ee48a7" Size="302" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="2096102" />
     <Blob Hash="878567c7b3ff0da61bb064f21ff00944803c0a21" Size="1542" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="629913" />
@@ -53551,13 +53429,14 @@
     <Blob Hash="878821b5f218a65990b7d5fd54b4f15b4d9921c3" Size="9477" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1485445" />
     <Blob Hash="8788ffea241567052ef5e4ed260725cd0a31d308" Size="194" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="350138" />
     <Blob Hash="878a8f4ef4e05e7489ad94e8a4020340c36b8ec4" Size="62" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="926622" />
-    <Blob Hash="878e361abfc2f517f9df266d8d88b122ddbc5928" Size="3822804" PackHash="84fdc06a11907cd49f3f883d344584db7a9cbc39" PackOffset="8" />
+    <Blob Hash="8790a702fbecf1c27ed4e4958ed943d7300de578" Size="7590284" PackHash="0f86bd8b76eaaae89a0276c6d4c6df9a7c7737b4" PackOffset="8" />
     <Blob Hash="879143875f3450098fa05a383a86303e944d6179" Size="5429" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1260967" />
     <Blob Hash="8793af7e5683b0f2d076c5c1b27bbfb7afded4bb" Size="334543" PackHash="731a4fa9f01609e430ff4a1fc33488903b67daec" PackOffset="1632118" />
     <Blob Hash="879581cc914a8d2250a2df868092996986db2c24" Size="3119" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1275343" />
     <Blob Hash="8796797fa79df32961b13d8aa25e5d0980234420" Size="168" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="448969" />
     <Blob Hash="8798a4bbda4f4b8c45a8d436a8e5b694985c035c" Size="7456" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="383485" />
     <Blob Hash="87a69f5587ed16885217ce80805c599c6c92c6d5" Size="4585" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="414698" />
+    <Blob Hash="87a6f334893c12abc8ba7e6312417e8b87ab0a39" Size="19634984" PackHash="d04ba7413629042f0d4386693135497ae49099ea" PackOffset="8" />
     <Blob Hash="87aa3da2d25652028b34b16e4cc803d4115f8ae4" Size="693232" PackHash="df7e1c0f4fc78d7814f044a10de1362862cc7bac" PackOffset="8" />
     <Blob Hash="87ad70f3854334f8e94ff3a8e6c500a2a3704ca3" Size="273" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1723282" />
     <Blob Hash="87af92eaf17de2a79baeaca070fdd2402864e75f" Size="1428" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="2069161" />
@@ -53571,11 +53450,12 @@
     <Blob Hash="87c610783701455d4ac0290c062956ce73875e28" Size="262" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="373745" />
     <Blob Hash="87c722bc0575f24ee787a25aef17ac0cc29c358e" Size="1708" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1073313" />
     <Blob Hash="87cb9a89920c020aba104d61007c36a225a6d8c9" Size="4747" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="2090452" />
-    <Blob Hash="87cba6af7287477ddf5e7156b7f8b3c4d821f94e" Size="6151" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1523823" />
+    <Blob Hash="87cba6af7287477ddf5e7156b7f8b3c4d821f94e" Size="6151" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1643054" />
     <Blob Hash="87d09937a27436390d334781c19feaf5ca67512c" Size="846528" PackHash="eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3" PackOffset="896302" />
     <Blob Hash="87d50cd3aa2d2d0ce57899c0c4ee80675b500ff9" Size="24064" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="2050056" />
+    <Blob Hash="87d7f61486547f70213e9a9371b5082fad65d1a7" Size="1967408" PackHash="98922b76de577c0692cc3f9ed52688544494e6a9" PackOffset="8" />
     <Blob Hash="87da1f5ec9d380604652e164e27b75c44cafe774" Size="943" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="9522" />
-    <Blob Hash="87dae3ef20da36da66c95ae6248ab9007aa99ce1" Size="3148" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1278468" />
+    <Blob Hash="87dae3ef20da36da66c95ae6248ab9007aa99ce1" Size="3148" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1727370" />
     <Blob Hash="87db24c9170fc08d0e8bc7ac33275a6d7073d528" Size="137" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2096283" />
     <Blob Hash="87ddc76c7e46a8a1ec459786f0fb89a4c266e38c" Size="21037" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="439055" />
     <Blob Hash="87e28252d5ab820bf8ac08814ab2bebf5787d11d" Size="943" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2090208" />
@@ -53589,9 +53469,9 @@
     <Blob Hash="87f259c2e7dcf2d8c06c33584d33ff5139f69048" Size="113558" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="576056" />
     <Blob Hash="87f3a7898c9fd82fd7d7fd83c7c2d394ae543d71" Size="213259" PackHash="63dc5e55436835d760048c57bd2d0a6b63042ba6" PackOffset="522508" />
     <Blob Hash="87f45481ac819b85614240f3c444834fa936cf5d" Size="5056" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1269768" />
-    <Blob Hash="87f4ff15bcd84c3b35f5da39b56e16ec3df9a1c0" Size="62976" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="333320" />
+    <Blob Hash="87f4ff15bcd84c3b35f5da39b56e16ec3df9a1c0" Size="62976" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="417288" />
     <Blob Hash="87f5a026b8f37a994add7f2e69a326b5c351339c" Size="177576" PackHash="28f44db32f9f7f25ed9b2a7bf93ac4705bb90bf2" PackOffset="1909909" />
-    <Blob Hash="87fba7651eff40e54dec6975844790d7c727d6ba" Size="3533" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="2093581" />
+    <Blob Hash="87fba7651eff40e54dec6975844790d7c727d6ba" Size="3533" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="2084065" />
     <Blob Hash="87fd62406d775fccfbea2bbb4c70eb4b00c5e157" Size="17471742" PackHash="418d45c49afe937049dd1f731516162b1f716dda" PackOffset="8" />
     <Blob Hash="87fda71ab5ff326cd2926c8487a360b2edce87c4" Size="1082" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1874730" />
     <Blob Hash="8801b40d19cb646de14726630e6173a7aebf03ee" Size="888" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="248981" />
@@ -53613,7 +53493,7 @@
     <Blob Hash="8826b98c2d06bc5c2f3b81f099b7049f54a9ab42" Size="192770" PackHash="d852eca7663f1c36dab87cbd527dbfac895faf97" PackOffset="820308" />
     <Blob Hash="88283addb5db5f3ef7f22853c9a3135bb6b2dc0b" Size="96653" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1249686" />
     <Blob Hash="882881b4a3f11b974db98e29a3f1dc24962ec929" Size="538" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2010438" />
-    <Blob Hash="8831243ed206a8c088323331bed1d69f39694179" Size="190" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1584101" />
+    <Blob Hash="8831243ed206a8c088323331bed1d69f39694179" Size="190" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1703333" />
     <Blob Hash="8831ee46d66da0e9e3ab18f831f6d7e8dc1c2ff6" Size="6777" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2076808" />
     <Blob Hash="88329bdb705260ad3a2e618ca2370f3ac13ed2b3" Size="157124" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="296956" />
     <Blob Hash="88360dd9e11e9b69851e92ef7f6fcf1de152f88b" Size="26943" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1860108" />
@@ -53636,14 +53516,12 @@
     <Blob Hash="8856fa13d3c8a358a0808499f26fce9199a299cd" Size="4102736" PackHash="963f251c2239c0567a89d3a5af6960e0a8adbbb5" PackOffset="8" />
     <Blob Hash="885f52045c636ca9ad3fd7264c106a3d1baeae57" Size="5325487" PackHash="1d4b95bb10acff5f59d2ee15d2b2a471e37dd22a" PackOffset="8" />
     <Blob Hash="886334877f2ef70133c9250a6ff456f6e73cf178" Size="511" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="806107" />
-    <Blob Hash="88665cab8c6efde1fa3b8146d647615530223925" Size="93008176" PackHash="3ee49f5bc29bd74924ed1753ec829db883461d35" PackOffset="8" />
     <Blob Hash="88685414514a013e774aa28c34cab0737062474b" Size="232" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="677973" />
-    <Blob Hash="8869f0cf97ae43c8842c5d77f9d6141335de4d2b" Size="1038" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1309259" />
+    <Blob Hash="8869f0cf97ae43c8842c5d77f9d6141335de4d2b" Size="1038" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1758161" />
     <Blob Hash="886b68aad14d071d6d5ccdc359409d657a575626" Size="1594" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1706333" />
     <Blob Hash="886cfaf9f87cd6f3fdfbd42a4768b88ee7a416bf" Size="2275" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1126748" />
     <Blob Hash="886d9925a0a4b104f8f884246634bd23febfcbc0" Size="12382" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1552113" />
     <Blob Hash="8871738094395780a6a181e8e23465976290099d" Size="27648" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="1904156" />
-    <Blob Hash="887d83e99b55bfe607e8cc4e21b47e6485c920e3" Size="1596928" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="8" />
     <Blob Hash="888366531caff7b7d1bccb43aa7eb804945043d0" Size="2944" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="999632" />
     <Blob Hash="8884a20b1c0d5350577763482d9b80d05baaf267" Size="55480" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="1790050" />
     <Blob Hash="888822f56860ce9f92a1c2010dda9b04d6922b32" Size="2192" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2021938" />
@@ -53657,17 +53535,17 @@
     <Blob Hash="88952397aab2c9907ec4c5e0f03d39aa895fa316" Size="4406" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="440450" />
     <Blob Hash="8895413faf2ba2cab4adacaa6fec03b763d3cb27" Size="1119" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="737146" />
     <Blob Hash="8897b6aba8ce58030107135ae6fdcb03e006227c" Size="54607" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1619469" />
+    <Blob Hash="8897f4af3617434aef31db5dba61e22be0572ef4" Size="5913748" PackHash="fe5e83d25df364c56c1fab8532d4cec018ecd8b2" PackOffset="8" />
     <Blob Hash="8897f63e283508cf059ac61c4cb5a4cfb3d4ed1d" Size="275" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="898473" />
     <Blob Hash="889ea1c242ab6f0554fd6d518a851bcb5185a6df" Size="193" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="215786" />
     <Blob Hash="88a0888f4d4ca2458cdd97121e2d8c82e555a2b3" Size="836" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="488949" />
     <Blob Hash="88a4ce0a4614de1c777b3e0518e2de235df607f2" Size="78543" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="357749" />
-    <Blob Hash="88a9e6acb2bfe099673fdc74d08a3b11adc5e6ed" Size="249" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1581369" />
-    <Blob Hash="88abd39228efee2001b0d98b95145bb853e03f19" Size="1139958" PackHash="31a98ec1cc62bab799d8df883748fa37772c0a64" PackOffset="8" />
+    <Blob Hash="88a9e6acb2bfe099673fdc74d08a3b11adc5e6ed" Size="249" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1700601" />
     <Blob Hash="88aca7124344e9a5a65b9a2c43fc18c35ecf2e40" Size="3592" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="358360" />
     <Blob Hash="88add448eef0413b0e75f1f497425d0abcea4f73" Size="6694" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1672279" />
     <Blob Hash="88aef9e718db8ff9fbc662badd9962afc2fa3fac" Size="109074" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="1427179" />
     <Blob Hash="88af2b1695e02a8ea90ccaebf0f3794ea41c1954" Size="34063" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="8" />
-    <Blob Hash="88b039d9794c1b4221efe6cefadd3ec09efd5356" Size="7010" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2024186" />
+    <Blob Hash="88b039d9794c1b4221efe6cefadd3ec09efd5356" Size="7010" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1775543" />
     <Blob Hash="88b208101b46848b4b643b2a3eddeead3160ca7d" Size="336" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2093806" />
     <Blob Hash="88b6596c785b719e47ca8e8123ba6179dfde0f4d" Size="5128704" PackHash="de7274fb71ac492c6246e8f31d8c6b23e1241338" PackOffset="8" />
     <Blob Hash="88b702050f1d5362f39604b54c8c3bffa427cd90" Size="10592" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1204040" />
@@ -53681,12 +53559,12 @@
     <Blob Hash="88d083dd4c55c4355c41c6a7d78310dab8464890" Size="261" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="2096772" />
     <Blob Hash="88d38689c72efc2b676722699cdd9a2ca48220ba" Size="659706" PackHash="7623413c9b3d2f9602c75005197ee9224f403f19" PackOffset="713426" />
     <Blob Hash="88d4a56c9e89efc9ea81980f2ffd4eeb5e52f4c5" Size="137521" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="1810263" />
-    <Blob Hash="88d7b932596e88efec88e1d8c4594edb58168a79" Size="265073" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="858370" />
+    <Blob Hash="88d9bf65697b4643dc41e46331577d1ae31f7e3f" Size="17884" PackHash="8c5c5245525609628442a9e4237db8a60ef59d6b" PackOffset="2076068" />
     <Blob Hash="88dd52e343b65b56667c547398acf22ecaa4b703" Size="52419" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1238296" />
     <Blob Hash="88e0dac016d1833f03855d98b2b3d5f1aad34724" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719618" />
     <Blob Hash="88e2431071bd936801275fccbb5d31ce85d0fb8f" Size="5273" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="482005" />
     <Blob Hash="88e3da33061896611fbf359d7d9e243f3ff0772a" Size="1291500" PackHash="15ae862d7e6c16dd10b324f1cbb6e1c3b6cb1f27" PackOffset="8" />
-    <Blob Hash="88e402b3d31f42551c7bbce7b14e88be7c1d5efa" Size="2420" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2085606" />
+    <Blob Hash="88e402b3d31f42551c7bbce7b14e88be7c1d5efa" Size="2420" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2092614" />
     <Blob Hash="88e4398b600355f1b42458475bc9cc7730515650" Size="10752" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1736200" />
     <Blob Hash="88e45e3a6ff17a436ed2015ecc0cc6179959b714" Size="1053188" PackHash="25344fa25c82ba6a18b52493684d5fc3900592c5" PackOffset="8" />
     <Blob Hash="88e746bfbbeadc30011a4e45fc67303c468b9bb6" Size="20901" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1160400" />
@@ -53701,16 +53579,16 @@
     <Blob Hash="88f8c3308ecf31570d20657c7b1f1128f42701cc" Size="62358" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="816681" />
     <Blob Hash="88f91c21161d031698c1f91229bbf7e98d5501ea" Size="76212" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="1075785" />
     <Blob Hash="88ff3a7612be016b7b555f1ad3ba57c0365c8f1a" Size="7700" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="2086494" />
-    <Blob Hash="89074b945ee8a3b8db5e496cf18f488b59c5e9f2" Size="48172" PackHash="9304643e78939135344c8ce298a2a1eee1096046" PackOffset="2037928" />
-    <Blob Hash="890eb2b09c68513c3f916052940ec9cb9ff9c84d" Size="2964832" PackHash="7492e057d16c5c219b44c555bd4e5e29e39fe612" PackOffset="8" />
+    <Blob Hash="89074b945ee8a3b8db5e496cf18f488b59c5e9f2" Size="48172" PackHash="98922b76de577c0692cc3f9ed52688544494e6a9" PackOffset="2048740" />
+    <Blob Hash="8915cd52965c17c6730a0f4cbe9d275da5d6bf72" Size="2336" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2094494" />
     <Blob Hash="8917f34587bbef61547c2c30a116edd8fa53241a" Size="105881" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="1177109" />
     <Blob Hash="8919f21fcbe0598a76f8b6dd435b9a8a4ef164ef" Size="2587" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1039693" />
     <Blob Hash="891f4f2975749a8649b172e467f5867edbf1ef2c" Size="39953" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="183043" />
     <Blob Hash="891fdf8470523f0ec657f958d98fcb3ae4c2b3f9" Size="17044" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1494648" />
     <Blob Hash="89201c33ac3dde07c46af3c544b342f9a87cefa5" Size="8104" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="102674" />
-    <Blob Hash="8922245c1dbd560b170bbb467ca85b8a25040a1e" Size="1311" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2095823" />
+    <Blob Hash="8922245c1dbd560b170bbb467ca85b8a25040a1e" Size="1311" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1995687" />
     <Blob Hash="892324c23fb01b3333ecbb0c49831b5ad0d73c4a" Size="10240" PackHash="09732d6bf762ba4d866616248b46adff0e12d76b" PackOffset="2085896" />
-    <Blob Hash="8924081eade1c685e43b10a600bc752d1ff8c1f3" Size="4042" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2066297" />
+    <Blob Hash="8924081eade1c685e43b10a600bc752d1ff8c1f3" Size="4042" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1966161" />
     <Blob Hash="89268bdb7ec4f2b8f9620cb1a3ac3abf2fc67d7c" Size="823988" PackHash="f673955a77882976d5085992a28ee72f5faffe27" PackOffset="1144920" />
     <Blob Hash="89274e5cfb30176ea4d0ddaf2ef68ed6efcbfd84" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="680608" />
     <Blob Hash="89279011689207b3ecc5a570204fa1369adf59e8" Size="214500" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="1386479" />
@@ -53718,17 +53596,17 @@
     <Blob Hash="8933fe82322800cc3c497a95b4fa9fe61108f19a" Size="4227" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="8" />
     <Blob Hash="89369cf720722dfcf68c0e23f55fd2a4f4efc556" Size="110452736" PackHash="1b7eb2bc38e40d7b9d86e04361a65e9a40b0c769" PackOffset="8" />
     <Blob Hash="893705a70417159ff3bfb1bf76cb0847dcd70545" Size="6057" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2027947" />
-    <Blob Hash="89388c1b2e31ef18ea13cb8a475974c672ccd56b" Size="5318" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1713993" />
     <Blob Hash="893aab01850ead5c81e36c4ff78b675c6fb703d8" Size="9336" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="509945" />
     <Blob Hash="893af55f5d8b368ffed051121aab8fefa135862a" Size="3598" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1476883" />
     <Blob Hash="893ec1c9a2398e101a2c60f0af9c36413539918c" Size="2520" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="1992560" />
     <Blob Hash="89422402c1bd1932e06deca5a0b2bd4e10ae7998" Size="740810" PackHash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" PackOffset="736678" />
     <Blob Hash="8942a216607dd2fdb26fb93fda8c8cc798be5f13" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2089541" />
+    <Blob Hash="8943d53b8938d6dfdd3ea75e47a3518acb943a63" Size="3295604" PackHash="b4eecd495ea66d9475363a631162eab8496cef65" PackOffset="8" />
     <Blob Hash="894a9c6fc4944416c1c212bb067b943009e6b6c0" Size="236467" PackHash="99677cc167673ccab84e8b60864da0b9f1f7f4c3" PackOffset="1638268" />
     <Blob Hash="894b1dc2144c9633315c5e9e7c530f97b53f06e0" Size="118" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="203172" />
     <Blob Hash="894bcebba912a351aa30aa66df1a279910595eb7" Size="2541" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="485070" />
     <Blob Hash="894d3d3bdb12138b4b718340b2e962682a4632a0" Size="2267" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1914608" />
-    <Blob Hash="894e8aa0b0b7ec7c548afcb9e2ad976052bd4cfb" Size="40110" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2049372" />
+    <Blob Hash="894e8aa0b0b7ec7c548afcb9e2ad976052bd4cfb" Size="40110" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2004663" />
     <Blob Hash="89517878e2d40f0e494209e311b286b62d8f8038" Size="84" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="416024" />
     <Blob Hash="8952746f878b1d3ff5083d4512cf6d852993cf74" Size="9284" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="585474" />
     <Blob Hash="8952f4face60f7cb6d2b2a6b0ed4528c6d95bac3" Size="3232" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="862758" />
@@ -53764,7 +53642,7 @@
     <Blob Hash="89903bc7dcd4e5b91cfd3fc4d9766630d164a84d" Size="3189" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="211029" />
     <Blob Hash="89a084e85fd71444bcea1f46957249990dfe874e" Size="641060" PackHash="d7a56916778ad1fa03472f47ec92e8a9eed66219" PackOffset="630560" />
     <Blob Hash="89a2fc1efde45e67ff608d8c75b37c626b2e6e95" Size="1174" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="626599" />
-    <Blob Hash="89ac322447d2d127b2543960778b241674a11889" Size="29562" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1619043" />
+    <Blob Hash="89ac322447d2d127b2543960778b241674a11889" Size="29562" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1738275" />
     <Blob Hash="89ac4c9f51aa910185bff7181eecbcdec09ee5ae" Size="40" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="2097028" />
     <Blob Hash="89b0306461769fee32c56abc9fd1af1703c85dda" Size="147948" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="305326" />
     <Blob Hash="89b51583a0b55db8a95a30aaf8da0c1213535df0" Size="1796" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1438526" />
@@ -53786,7 +53664,6 @@
     <Blob Hash="89ca543a53883d72c88a71b14aa14f500ed3ab7b" Size="165" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="432420" />
     <Blob Hash="89cc768262bdea550b6a0809ec141a4918e08e98" Size="40" PackHash="c40e5337fb15243fce02dcae546c81693c08866e" PackOffset="2096995" />
     <Blob Hash="89cd82e0c38e8c5393e0251e19a3dc2062ed1d5d" Size="152" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="2097002" />
-    <Blob Hash="89ce2ec7de75965d98a44602b444a19f258b9d72" Size="1432880" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="487736" />
     <Blob Hash="89cf4021f4413316e4bd058a12dfce1bda630575" Size="2697" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1131959" />
     <Blob Hash="89d66dab3b69b26b137a4c8cee2057341d2ae092" Size="2233" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1505414" />
     <Blob Hash="89d6e4ee61a016ced45658cc6fe48935d4c9eb5c" Size="78141" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1076136" />
@@ -53805,6 +53682,7 @@
     <Blob Hash="89fe9b389e43d7fa1ffbe66141d59a2c7cf54bde" Size="637" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1565549" />
     <Blob Hash="8a04b4e34b584066f68c3eba7637605308b07414" Size="102176" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="1771219" />
     <Blob Hash="8a04e8490ee8c0c37f0b188467c19d0a4e6779c4" Size="30919" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="412872" />
+    <Blob Hash="8a04f6ef9d3f265168da658f91ecef673c5b21dd" Size="2989504" PackHash="eb63d23e447208f487188cfe0600c74caa85819b" PackOffset="8" />
     <Blob Hash="8a04fcd9b4ca225c0d55f40450e3ba636c187289" Size="2090" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1396378" />
     <Blob Hash="8a06e40942df43c9bf932d81751634cc6b491535" Size="22443090" PackHash="28d030d9e1f4fd7763333e8860601ef03cf18caf" PackOffset="8" />
     <Blob Hash="8a07bda2c76757818ada686c86949a665b902de1" Size="18856" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1082046" />
@@ -53812,13 +53690,15 @@
     <Blob Hash="8a0f2f6fcf23e76164f1f20ea34868f973b5c22b" Size="1478" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1116119" />
     <Blob Hash="8a140c688b59b70167d430a543514a4897a9d9c4" Size="18244" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="299830" />
     <Blob Hash="8a146f9a1a62da86f4c1e8db7b24723c8aa00114" Size="4035" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1530276" />
-    <Blob Hash="8a17c4bd69daeb589ffa5b8419a1a4ade92ef034" Size="1649" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1024707" />
+    <Blob Hash="8a156222134ce0371f9247536260bf1bb88372e9" Size="36255984" PackHash="1c04450690dbabba6d904a033b07b408ea13f8c9" PackOffset="8" />
+    <Blob Hash="8a17c4bd69daeb589ffa5b8419a1a4ade92ef034" Size="1649" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2072224" />
+    <Blob Hash="8a187f1c57feff58efc91269ceafcf178b9370ac" Size="2420" PackHash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" PackOffset="2091142" />
     <Blob Hash="8a230030219732420da68049ffa3e161e6ac6bb7" Size="208" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1146780" />
     <Blob Hash="8a23b4a7acfa83684027cd4747640e84d01c7b86" Size="18552" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="930008" />
     <Blob Hash="8a25ac6bb1b971272f8f9e71f0f9d75a112d7ffe" Size="1326" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="593556" />
     <Blob Hash="8a26907c1b31d416fc3a960637daba20c16a8910" Size="15380" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1226207" />
     <Blob Hash="8a26afe0e026a179f19b5ee1d53f689f94451508" Size="158" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="608967" />
-    <Blob Hash="8a2cf67093319e79e729cd76c192794d0dcd7522" Size="752" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1421148" />
+    <Blob Hash="8a2cf67093319e79e729cd76c192794d0dcd7522" Size="752" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1870201" />
     <Blob Hash="8a2e1cf2f73c445d3eb940479e35fede4069a15d" Size="5348" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="378629" />
     <Blob Hash="8a33b33833c72d86eff5e42490956cc31db2ac35" Size="4970" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="437990" />
     <Blob Hash="8a352ef60bc25d9cee4fb843e6a5d2e4cc2c4fd4" Size="222176" PackHash="0dada39e4605732563b4eae7fb8cacf572821ffd" PackOffset="1671830" />
@@ -53830,7 +53710,6 @@
     <Blob Hash="8a44c44f15ae1f5b95e917a07ca91b30ee5a6a1c" Size="824" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="2094682" />
     <Blob Hash="8a44eacf87ffe1b4210aa39dba91daa16c4162d1" Size="3748" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1786240" />
     <Blob Hash="8a45aa2a122523e07cb426cbe3b753dbaf7934d5" Size="110080" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="1889856" />
-    <Blob Hash="8a4775e95d45540bac5a1d87a799b726c1806c96" Size="25339152" PackHash="ae5c035ab0fb527952b360d671cfec91bb861c1c" PackOffset="8" />
     <Blob Hash="8a4c241e83a13a039a3e489b4ebd002daf3b0150" Size="224" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1704007" />
     <Blob Hash="8a4f1bcf2d56c0676539ff8629b0565018371ac7" Size="10140" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="157292" />
     <Blob Hash="8a50fc45a48f85b85e00e011babc82ccf6d26982" Size="9713" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1410239" />
@@ -53838,7 +53717,7 @@
     <Blob Hash="8a58ea64f6547a29883a83b1afe1cfc648eb15a5" Size="4880887" PackHash="dc46b46ee38f63034fbdd4791e1d8edcedcd37f3" PackOffset="8" />
     <Blob Hash="8a5ad04e65ad50d526b707a0107ac5423aa1a3c1" Size="4444" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1783229" />
     <Blob Hash="8a5b585e270af14368dbcd6574a4103c9ca84601" Size="77849" PackHash="9402187f503c2f391c471ecb84988e49b0cac918" PackOffset="8" />
-    <Blob Hash="8a62513e947b744c04003704c026b21e7abb6db3" Size="2999" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2048865" />
+    <Blob Hash="8a62513e947b744c04003704c026b21e7abb6db3" Size="2999" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2088149" />
     <Blob Hash="8a68c12423fb293f06534d5f85a480aa9eb17304" Size="42415" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="40745" />
     <Blob Hash="8a69d514528de4178705c945c3f74b0a020491e2" Size="6321" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2030081" />
     <Blob Hash="8a6ed74750d57317530b449295890c14d711135e" Size="55" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="2097097" />
@@ -53860,7 +53739,7 @@
     <Blob Hash="8a9eccc6bf1f972e2c8d4ec23ef1ceef82e35d55" Size="208" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2096644" />
     <Blob Hash="8a9fea2a7384f2116e5b84a9b31f83be7850ce21" Size="3428" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="924365" />
     <Blob Hash="8aa2819a87c8cae4d1426f98262be947a58546f6" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1037028" />
-    <Blob Hash="8aa2f6205b5f35ac88c51effcabe0b08c6604478" Size="10176" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1856107" />
+    <Blob Hash="8aa2f6205b5f35ac88c51effcabe0b08c6604478" Size="10176" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1926323" />
     <Blob Hash="8aa395b5b4d02b6c12ef2483f65907b233e58fcf" Size="1130928" PackHash="456b9159915e021ff270ac54d2f7c6fe17595fda" PackOffset="8" />
     <Blob Hash="8aa452a9399085e7e67278c8f27c65c8f323d829" Size="14855" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="307523" />
     <Blob Hash="8aa4c7c3096cad3b329f5fab48f599c717db7b18" Size="261" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2034871" />
@@ -53881,6 +53760,7 @@
     <Blob Hash="8ad0ced1699d69c5922317c63d51711b8b6ee50c" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="675836" />
     <Blob Hash="8ad238214089aaad9d5b17e485b7a56b855327f0" Size="6917" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="34520" />
     <Blob Hash="8ad5d6e3f0a95e2e5d5a4883711916361fac81cd" Size="148640" PackHash="ce17010a1af2358e1ab4c9c88ca24a6e59f34064" PackOffset="8" />
+    <Blob Hash="8ad5e2dee552b589e28c9d7a6904e0d59d3327a0" Size="760080" PackHash="e9ada08052934232dab4347c891567c01aaef05a" PackOffset="842514" />
     <Blob Hash="8ad88753a1ddfbf620981615ccb962664484a1b6" Size="84" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="274791" />
     <Blob Hash="8ad8d3f289e452be49b73a1c0e9cc54730248695" Size="9093" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="204230" />
     <Blob Hash="8ae05bc7d022803cd926db14407392e2427cbb8b" Size="2826" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1140220" />
@@ -53896,12 +53776,13 @@
     <Blob Hash="8af4be94885fcad5351e384237061ed4669385dc" Size="130" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2096857" />
     <Blob Hash="8af51e3070bccf9e90c567d3c1c0a5d7166caa00" Size="1484800" PackHash="9f9e04739196310f111e4008dd46c421065ef360" PackOffset="8" />
     <Blob Hash="8af667388ccab9f04bc7a68638e64de85b76c860" Size="2527232" PackHash="c334c066303df1d69ce683de05cde3a2f76fdf76" PackOffset="8" />
+    <Blob Hash="8af9633db06fde687091d2fdf1fa3460a6d7c75a" Size="6492816" PackHash="ea2fde2cd3b3611cc64a919cf0e138457ec57b2b" PackOffset="8" />
     <Blob Hash="8afb54c08c00fbc3e97b6c4d5dda167dde92ce12" Size="12495" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="867724" />
     <Blob Hash="8afc14ceeb39a2aec5b764037789f66c1f93af2f" Size="1116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1351532" />
     <Blob Hash="8afd95651f8ec3e5cf5d38d02e2367db900e6aba" Size="140" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1430452" />
+    <Blob Hash="8afec87c3041f7751fa910e3bdada8dc07fc78e7" Size="14880" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2067172" />
     <Blob Hash="8afef86e61179abecba441e9c769a63292e4613b" Size="5076" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="302762" />
     <Blob Hash="8b0545cc74e70b6253454b9f53cfac36f763b837" Size="109696" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="1858400" />
-    <Blob Hash="8b0c21da9a0ed15178134d6295f4d8ab952a6ee8" Size="8145" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1726403" />
     <Blob Hash="8b0cc6f29288a7c83bc66730b9366c8bad39d848" Size="42" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2096437" />
     <Blob Hash="8b115ed5af055b17f62bd6b0fdbf9befebd41cfb" Size="139099" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1059549" />
     <Blob Hash="8b11eedbd9f89fc02bbe2bd1dd0333be8c18c17a" Size="12669" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="315729" />
@@ -53913,13 +53794,13 @@
     <Blob Hash="8b24074628fe0a974175f39a898d44f14654c65e" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1760369" />
     <Blob Hash="8b258de661b8d7e4661dd930b4b298b9ef5fc0f3" Size="5953" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="753405" />
     <Blob Hash="8b26770c1207e70756bb33e58f80583652e95f3c" Size="37502" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="904719" />
-    <Blob Hash="8b28d72cada917d1eed9323f26b8f7f09ddd735f" Size="32" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="2097127" />
+    <Blob Hash="8b28d72cada917d1eed9323f26b8f7f09ddd735f" Size="32" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2097124" />
     <Blob Hash="8b2fa25b71c66d020841ab99e162ecf2765779dc" Size="141653" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="1053918" />
     <Blob Hash="8b3040a4dbc3e6fb3088ec5b195f09fa1ce489d1" Size="48" PackHash="9925ec5c177c6bf6faada1514039ed1b19874a51" PackOffset="2097111" />
     <Blob Hash="8b35af1f35d88f4b15f26fa1984062985e1c2086" Size="133903" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1470021" />
     <Blob Hash="8b369a64e2e3852fa65f9301290a965d97470923" Size="3708420" PackHash="4d51a0356a2fbea8047a38a77315464a769f1cb7" PackOffset="8" />
     <Blob Hash="8b396d6ed1abbc1c925526e316d4f532d3700c33" Size="331792" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="1716824" />
-    <Blob Hash="8b3b737048bd0be93238d83443ac2bd42a049eef" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556302" />
+    <Blob Hash="8b3b737048bd0be93238d83443ac2bd42a049eef" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675534" />
     <Blob Hash="8b3c835bcdddb1a379351354999c2d587b71a10a" Size="185" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1421417" />
     <Blob Hash="8b3cb0070084fe79f3313d7e99f43b771211433f" Size="4752" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="425125" />
     <Blob Hash="8b3e02240a01b5aa42d30e86005e880916432227" Size="6890" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1862628" />
@@ -53929,7 +53810,7 @@
     <Blob Hash="8b4a1f504365f8643c77421e3e3ac4b5df93fcff" Size="196" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2078440" />
     <Blob Hash="8b4c2cef0d7d1122b9e4e635f8e81b636d09ab8c" Size="103078" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="8" />
     <Blob Hash="8b4cca52ccd7741426db07cf7354ce791bac2a79" Size="30056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="60688" />
-    <Blob Hash="8b4ec79c7e170ac031933e8aedc459d4e2559b64" Size="244736" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="1763772" />
+    <Blob Hash="8b4efa2d6f6dbed754e85c1745062b0da712de56" Size="1552572" PackHash="3451efb0a02c354698ae8fcac3fed9e18242ae5e" PackOffset="8" />
     <Blob Hash="8b510c318c524ff59ed50e4e0aca413fd40087d0" Size="2893" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1956145" />
     <Blob Hash="8b511c58767c6796de1a3bef5fd0376e7f011f98" Size="10104" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1355718" />
     <Blob Hash="8b5492574f6c1f304d68a22af8fac865d95b3f5b" Size="61171" PackHash="04e83b9b704ff752417e560945db286740e82003" PackOffset="2027598" />
@@ -53939,10 +53820,12 @@
     <Blob Hash="8b5fe104d4a8307845c372d2890e1b29b2527d13" Size="205664" PackHash="4d6f9c6d7a261e35898225b1fade32da175cb530" PackOffset="1594810" />
     <Blob Hash="8b600398ca350fba94c463f71863897b692f7b76" Size="6400" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="871096" />
     <Blob Hash="8b6916d9e2475a72a5a9318fb5a37d97682a8393" Size="36936" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="322378" />
+    <Blob Hash="8b6ab4d8e9246efe1f9a41b7afcf7baf4693f560" Size="2150" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1784359" />
     <Blob Hash="8b6bc21fb712d799c203067536aa4366357678fc" Size="3339" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="339570" />
     <Blob Hash="8b6cb877c6156fbfa2e8584100a45f2cbf1d8046" Size="20321280" PackHash="49ca88b5b319bc0e8776ecef484e881fe59f22dc" PackOffset="8" />
     <Blob Hash="8b71eae5de72ec06ecb220c598930b8bb3d5d623" Size="10743249" PackHash="6adba7f5a97691beb917dff88baf8b6c25eb86a5" PackOffset="8" />
     <Blob Hash="8b73ffab24f5cfb27261e6694f0cdf5d7291987d" Size="291840" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1409514" />
+    <Blob Hash="8b749e7c8115a74521fab19ca25f269e6a470cf4" Size="598888" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="1357624" />
     <Blob Hash="8b753ae7d6e547ac3d41c8c16ed5990861a298ea" Size="46052" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="2041472" />
     <Blob Hash="8b7745ed5c753845d78fab9563a3d7b84f826b79" Size="7696" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1846008" />
     <Blob Hash="8b78f16ab50cb44bf75f303d020b6cd6c88e3671" Size="112705" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="1507482" />
@@ -53973,18 +53856,18 @@
     <Blob Hash="8bbb4d44de5b5d6b4b0a8b745c64e92778ad948f" Size="91329" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1197477" />
     <Blob Hash="8bbbcf1ce54068908746594ec3f1002b04131d8e" Size="1499" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2024987" />
     <Blob Hash="8bbc2c6d7d2f133172f2b5055b2d74ed3ac99881" Size="916" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1994085" />
-    <Blob Hash="8bbcb2be70c4fba9c86d1e8b57c0fbee77e5310c" Size="2491" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1902532" />
     <Blob Hash="8bbe2f2421a0b8901812c1b1eca4c17ebb6edb22" Size="4736" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1228385" />
     <Blob Hash="8bc073b2f59295ae6067551a7195020da10e5fe7" Size="1991" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="45079" />
     <Blob Hash="8bc16a1df910289a10dbf3a0935fc577722dcd1f" Size="1055" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1004274" />
     <Blob Hash="8bc50a713f9d11ee181001c2398b19f21e75ed45" Size="3447534" PackHash="94ad730f2c2ead37ace96e59cc7fc88fee2d98c9" PackOffset="8" />
     <Blob Hash="8bc72c08f2ac160a7c98cef3bdeb91e8d0a880d0" Size="1987832" PackHash="6cb4429447d8514e0670a383c944aa5a62dce75e" PackOffset="8" />
     <Blob Hash="8bc7469ea10e8d627d26e5c7d634178076929ecc" Size="23145" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1458411" />
-    <Blob Hash="8bc849e5cd71936066bae9ccbe179297a5e40fd4" Size="105609672" PackHash="b3dfcef8a990f47e64f8414e93ef7ed19639b4ed" PackOffset="8" />
+    <Blob Hash="8bcae293d614aca368947b0f56a8f6f0e7f52306" Size="7155048" PackHash="0101ca5c21ab170d8e04207d6976df78e6af2956" PackOffset="8" />
     <Blob Hash="8bcf07af7efe3355e6c261500fb19eb3c2360821" Size="162521" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="8" />
     <Blob Hash="8bd0152cd45b9dac0cea472955071b2aaf8c0834" Size="215040" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="700947" />
+    <Blob Hash="8bd1a3871291273619debe6777758fec367edf30" Size="55296" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2030088" />
     <Blob Hash="8bd1fe2993f64a9a4cea1c8db9bcacfdd09e58c3" Size="667" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="220688" />
-    <Blob Hash="8bd3b38e5bf58485b35888dc3074ea3615a71ca4" Size="1512" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1048221" />
+    <Blob Hash="8bd3b38e5bf58485b35888dc3074ea3615a71ca4" Size="1512" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1219080" />
     <Blob Hash="8bd9af56f27468a74449ccb7538720884b23fe7e" Size="49" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070138" />
     <Blob Hash="8bdce9e2ae085e72a8a48d3094374fe2295413db" Size="124158" PackHash="1a7fb4d3ec15d2096a4fe532191d9957b1a711d0" PackOffset="1215723" />
     <Blob Hash="8bdd65b940b9c6d715dcd25a3096b0824e22e4d9" Size="7329" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1982679" />
@@ -53996,7 +53879,7 @@
     <Blob Hash="8be5a2bb09ef4a912f2840bff632f7838635196d" Size="6352" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1047755" />
     <Blob Hash="8be7ad3fb2238c5eece4a6508353ce0256c0b027" Size="1322" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="350619" />
     <Blob Hash="8bebb3226f00b868eabd1b2d2eebe7a67f9c1ce8" Size="12001" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="107765" />
-    <Blob Hash="8bebd4cd6f1606e35132d7534eed6c2f47670367" Size="755355" PackHash="141031efaf451d2e472cd328bb1fefd91ab2ecf5" PackOffset="1238092" />
+    <Blob Hash="8bebd4cd6f1606e35132d7534eed6c2f47670367" Size="755355" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="1206662" />
     <Blob Hash="8becdc95e020d5f8a90e0ec8b34cb03da9238e06" Size="368" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="408620" />
     <Blob Hash="8bee2620fb2c41d2d6ad5ff7215b6c8aa9cd5370" Size="1622" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="392951" />
     <Blob Hash="8bf293fa094037b1e7bfaf25c189bd1c760cc253" Size="2712" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1180830" />
@@ -54056,16 +53939,14 @@
     <Blob Hash="8c5c17defbae4d33f5c67555b68713cc1cfa41e9" Size="31339" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1921546" />
     <Blob Hash="8c60ec8f4a92ec7ab9d7611dcbe739359d6ddb68" Size="120" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="860144" />
     <Blob Hash="8c635d1e45cdc6b27e7340e8d4963e852a9f2b89" Size="8318" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1520752" />
-    <Blob Hash="8c6364be6c1873a41a184c80324945bfc60e6801" Size="78848" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="1919804" />
     <Blob Hash="8c673a2d2b034e9c29219ef0a1cd52c1f363ff28" Size="34021" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="135845" />
     <Blob Hash="8c6a195546aee7be278b1b236f6b4c69ce8bfe28" Size="171845" PackHash="a254346aaa6d6c11dff58237f854fd54055340e3" PackOffset="1921194" />
     <Blob Hash="8c6b9163239b7fa8549cedd48d39a47751c9eaea" Size="12288" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1762312" />
-    <Blob Hash="8c6eb2b6598f773638e24fee8a0dbb78ce5cd09e" Size="7384120" PackHash="11c4a5c13a5d4bab9ce1043b7bcae748a1bc3c77" PackOffset="8" />
-    <Blob Hash="8c6f5c6fc2ce0f60a10d4b3037e0dec54322035b" Size="2420" PackHash="922fcb527d5d2d92d1f5fe1e17450b8b306d3b7f" PackOffset="2092900" />
     <Blob Hash="8c72627532ae28ea6dd11577cd4cdcb8fd7f024f" Size="11347" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="32194" />
     <Blob Hash="8c7663a58989727edee0f0cb1fe164d2713e8317" Size="1228" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1758626" />
+    <Blob Hash="8c772c3e35197b62d65bacafcc09d1f4541fbbb8" Size="144091" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="1934899" />
     <Blob Hash="8c77b64bd92ec970384526383fd7dad856ac9f7e" Size="148222" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="1870386" />
-    <Blob Hash="8c7b2f2e51ffd504286cfa8444de89b218113e24" Size="1306" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2095761" />
+    <Blob Hash="8c7b2f2e51ffd504286cfa8444de89b218113e24" Size="1306" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="2094663" />
     <Blob Hash="8c7d8552f917fa73add2f791937368856effb7ef" Size="112851" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1022674" />
     <Blob Hash="8c8091c6b680b571ddd274038a55eeba6da69248" Size="26342" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="272364" />
     <Blob Hash="8c83bb70395fdd94f04e3548ec8e3cd8cf046927" Size="934" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="173523" />
@@ -54076,6 +53957,7 @@
     <Blob Hash="8c93391e4bc47a11e4bccd99971b829568037611" Size="2054" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1737005" />
     <Blob Hash="8c934f85aa222fc459745a24a4e028689e9c79fa" Size="104448" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1891336" />
     <Blob Hash="8c96972da78b6424958cf976dc7313497ebeaeb5" Size="20672" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="503072" />
+    <Blob Hash="8c981c73feed7dda4b5fb32ca0f48ebc05c7e4b4" Size="4078" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2089565" />
     <Blob Hash="8c9e4ba2460ac1c92ad760ece69da11962311da7" Size="10129" PackHash="21202e22c0d0bb13b84ef787938f1a2522405782" PackOffset="436173" />
     <Blob Hash="8ca1db9623284fe8f33a68a1925386ace12aca2f" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2097100" />
     <Blob Hash="8ca4d2a1414b90cb0112a8e26645748fa6dff3ac" Size="14848" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="2021421" />
@@ -54089,9 +53971,10 @@
     <Blob Hash="8cc08331602ec67d6c4f4739de9a4fc752d16262" Size="22854" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="778176" />
     <Blob Hash="8cc2593a1847556a2b28a035ac591a80ac5597df" Size="127953" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="892424" />
     <Blob Hash="8cc364929e6d8c20d7b92126c686162a3f648464" Size="236" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2092252" />
-    <Blob Hash="8cca5f536eb8505779a1452fc6146c403119dbb2" Size="225" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1308004" />
+    <Blob Hash="8cca5f536eb8505779a1452fc6146c403119dbb2" Size="225" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1756906" />
     <Blob Hash="8cca72356eedc26c8fddc0ce1ac7efbfc7618dc8" Size="7468" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="95347" />
     <Blob Hash="8ccdd2b371b65a0b1aa9754cd4043055aeac7fab" Size="3829" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1009187" />
+    <Blob Hash="8cd1e13869dcaf7ea0c0788f44a01c9627bac17f" Size="45056" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="2034112" />
     <Blob Hash="8cd2c6d48de0da66548ee52d1e4a484c0297e959" Size="451" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="844306" />
     <Blob Hash="8cd2df2afd7008c865696b2160fe8644597a1d11" Size="1797918" PackHash="93423a9a78f3eaad42d062f8d2ff25e901ff455d" PackOffset="8" />
     <Blob Hash="8cd654d187a3be9928a9db954ab4784079be1f05" Size="7608" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1203938" />
@@ -54101,6 +53984,7 @@
     <Blob Hash="8cea58e621df499fdc8e44ce793e5269fa7e0d12" Size="96655" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="424767" />
     <Blob Hash="8ceaa187c8aa5ec101743060a877d039850964ca" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1070207" />
     <Blob Hash="8ceaaf2cbc17a654cc2cfaa9679106f733aa54c2" Size="339580" PackHash="2c0b2a639d529b68027b4cb912aafd082af8bff0" PackOffset="1287344" />
+    <Blob Hash="8ceacc101b115a75d6fcc8f9588a372ab10acf5b" Size="172440080" PackHash="776977bec09549ffc2102a4fcd1d750488ea7c9f" PackOffset="8" />
     <Blob Hash="8ceb074c2c285d29649eec63d952ced11fbf78ab" Size="24917" PackHash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" PackOffset="1997144" />
     <Blob Hash="8cecb9077d8ec8a73ae56f293563c31d6e700929" Size="144586" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1695414" />
     <Blob Hash="8cee767e4e593036a33348b2766013b7cad750c8" Size="2876" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="570087" />
@@ -54122,13 +54006,14 @@
     <Blob Hash="8d20fc4fa0893aee80f7ed3fb2854ebf9e2af616" Size="1413" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="2094786" />
     <Blob Hash="8d2102b49a96c2123fcce7db2475c19e4b511680" Size="183734" PackHash="c0c041729c29323273ff25722a4fde1aa90a2b9a" PackOffset="158896" />
     <Blob Hash="8d228c4fb58c4e2ad3d477738579fe07e52fabe1" Size="19938" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="8" />
-    <Blob Hash="8d23b2be0ea962fa43f904704f4caf1ad764e7c9" Size="1900" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="973464" />
+    <Blob Hash="8d23b2be0ea962fa43f904704f4caf1ad764e7c9" Size="1900" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2020346" />
     <Blob Hash="8d2838fa580d61b335fbbfdc468de3594e546f43" Size="90624" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1780547" />
     <Blob Hash="8d2dad3575a408ec6b7b61cba0bc3d40c7e6471c" Size="46576" PackHash="24abc6b446750adef120dba7e19f9ae7e166eb0c" PackOffset="1366499" />
     <Blob Hash="8d2ef6a1c4a8da6370caccb1f8a5e9d7259aebc2" Size="23512" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1884492" />
     <Blob Hash="8d2fa53b4e274eafd8e5c601fe8085c66ba9f7ec" Size="1142784" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="8" />
     <Blob Hash="8d2fea22f1fc0483787e47f8f5e833ff46a1b40e" Size="27648" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1431560" />
     <Blob Hash="8d344ba3180e57fa6deaac235de98c4acf465750" Size="23552" PackHash="bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" PackOffset="2057782" />
+    <Blob Hash="8d39a5762ccb96a5b1306167732090837397dd8e" Size="6092814" PackHash="41ff50d5acf89ae94da1379246a678a88f12619a" PackOffset="8" />
     <Blob Hash="8d3dafab8a97a49dcfbb4f9593ce902cf76903ba" Size="3164" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1771550" />
     <Blob Hash="8d4121a73b9cf71cfdb99f1ca8baaa5b3c046335" Size="33774" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="810656" />
     <Blob Hash="8d42a66f09240c459574634fe6bbf251c9df3924" Size="13680" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2072404" />
@@ -54136,7 +54021,7 @@
     <Blob Hash="8d48dc55af7ba18a072b546e47ef244580cad93a" Size="2792" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="357705" />
     <Blob Hash="8d4d9bbba3fdadb8f684e2922758f2c175eea995" Size="1024" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="275643" />
     <Blob Hash="8d4ff24104cabe75ef6a9d0163ff3c13bf132536" Size="4347448" PackHash="7c6af4b8a70292c8a317014f6440886bc22432d3" PackOffset="8" />
-    <Blob Hash="8d5059e59706f69a3a1f1681f1a39872018dd665" Size="516198" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="1193992" />
+    <Blob Hash="8d5059e59706f69a3a1f1681f1a39872018dd665" Size="516198" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="1193992" />
     <Blob Hash="8d5117713bc24c9346887c31c8fb2fc3fb51ab53" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1838134" />
     <Blob Hash="8d54c99462cd481966e485bcf2a28bc95e4f3c48" Size="7867" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1636596" />
     <Blob Hash="8d572ddc0bfd389b354f380c424cf762648f141e" Size="9438" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1813802" />
@@ -54145,7 +54030,7 @@
     <Blob Hash="8d608f6548ef10001d39013f2264976226bfb158" Size="104649" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="1652411" />
     <Blob Hash="8d66941b682d878e0252b078d21248acc4979483" Size="300868" PackHash="bcfe437fdab5b703b8578a6d457f2908890a58ff" PackOffset="879187" />
     <Blob Hash="8d66ac8a5400eb485b0994af5814d15321887c63" Size="7378" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="377464" />
-    <Blob Hash="8d66e61d9d8b0b8194449a143c39bb0611769d24" Size="115522" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1751544" />
+    <Blob Hash="8d66e61d9d8b0b8194449a143c39bb0611769d24" Size="115522" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1708331" />
     <Blob Hash="8d6a428a97129f647604697b21e3bb5b9664902d" Size="4094" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="385828" />
     <Blob Hash="8d6d7ddf8ff82d91e150a519963ebec3b23d8402" Size="6076568" PackHash="cc80811d6040c0dee40bda7302ff9b5ec7c542b0" PackOffset="8" />
     <Blob Hash="8d718fcef23b4bf60b8a41c8d47e6607bacd8080" Size="5275" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1351502" />
@@ -54153,7 +54038,6 @@
     <Blob Hash="8d73f4a4091fca4013bfd2c4d58e6ef6d1644489" Size="322" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1982971" />
     <Blob Hash="8d74dbd14e22d21d2436d8c677894a5937b212d6" Size="724" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1357739" />
     <Blob Hash="8d76f2043a84a1ecc1f7dd524a5e4eeac5fda95c" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="496160" />
-    <Blob Hash="8d79593a5d1af493a8b931c2f8cfce72f4f03f28" Size="10832" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1756819" />
     <Blob Hash="8d79a2f1db451e7b8c559ffba4fe9a04e19c9f2d" Size="2337" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="950520" />
     <Blob Hash="8d8432329ca08a131318c4a13bb01b0639df3a94" Size="224646" PackHash="79cbb1b9e1be7761c86eb45db23522dfc07e61b1" PackOffset="473667" />
     <Blob Hash="8d86287401fb11960641e7b3be22e90191eaa4d4" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1812936" />
@@ -54161,6 +54045,7 @@
     <Blob Hash="8d8c589c10ae5a4c214a487c2587b8298a5dd6d1" Size="4248" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1158663" />
     <Blob Hash="8d8f7d04fbbeb58915d5e2bf9e77bfb6558f7b07" Size="29838" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1660304" />
     <Blob Hash="8d9481b251384cc009aa74a0704fe26a38266d30" Size="132" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1641488" />
+    <Blob Hash="8d95e63bcb7a5fcb5b2faf30888ced37b05a5fa9" Size="167" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2096884" />
     <Blob Hash="8d974bb4653c3c36aab100f14008b1dedd9a77e6" Size="24511" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="109469" />
     <Blob Hash="8d9a0f177dce3c17858deb71aac242b70fbdde10" Size="33184" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1950639" />
     <Blob Hash="8d9a89286d379d1e8d8911d2ed47f30c6cff5bc5" Size="8652" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1620880" />
@@ -54172,7 +54057,7 @@
     <Blob Hash="8da6103d618ef2f6b6baa536d1274bf96b5d66f1" Size="46646" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1138570" />
     <Blob Hash="8da843b36dd0eb5abcedaf7315a82ef85c6941ed" Size="5950" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="2086436" />
     <Blob Hash="8da8dd96da4ef24999e75e69ea95f00a82a649ce" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1848990" />
-    <Blob Hash="8daa4d5cd11d75eb3d75e66ca1bd69ec64b88b44" Size="3783" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2077096" />
+    <Blob Hash="8daa4d5cd11d75eb3d75e66ca1bd69ec64b88b44" Size="3783" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2080529" />
     <Blob Hash="8db0b5ffed20f3b0925c67fde437f2d57ad6c738" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1803788" />
     <Blob Hash="8db1f2397f4b99d67187a4ccd766660d549b1ad2" Size="1781540" PackHash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" PackOffset="8" />
     <Blob Hash="8db3bb5565baecbeeea96730b2f4c3b5cdc7f3d0" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1500024" />
@@ -54193,15 +54078,15 @@
     <Blob Hash="8dd7687bce18122a6caac6298ae3133cf99dd1f4" Size="20148" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1818642" />
     <Blob Hash="8dda2aa8d4da29b2ac845cc5c5860fa4c6a2614c" Size="160" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2096172" />
     <Blob Hash="8ddc40cfa9dc4a110f9bf73eb2eb2dc159ea6616" Size="205" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="846611" />
+    <Blob Hash="8de0a75e54e5ebe3d137020b831f3b69295a5d41" Size="760080" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="703592" />
     <Blob Hash="8de0ff100ad337600a3ae3c24a5e6c01234e6188" Size="2459" PackHash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" PackOffset="2093902" />
     <Blob Hash="8de12af1554a27eaba1b241730be1f200c59f8a8" Size="257" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="238983" />
     <Blob Hash="8de45b8a62837f3a099169dee812f8dbd3b1c848" Size="1032" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="833832" />
     <Blob Hash="8de4c0de437d6940c24e26f7b91c9c6d7949833a" Size="1517" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1586531" />
     <Blob Hash="8de6996874f6316595144d3ebd4836cf06a8f2aa" Size="5671" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="962199" />
-    <Blob Hash="8de9a6a8c366a287274d66c60cd2af749b102eff" Size="28202328" PackHash="904d70dd6349476feec4b29cf839df460c83ecd0" PackOffset="8" />
     <Blob Hash="8dea703da3d20d7c919c92b90cb2725e4e51866f" Size="878" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="2096120" />
     <Blob Hash="8ded24b60695d7194d23fe7a89e1e501ea10ec3c" Size="25919" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1887265" />
-    <Blob Hash="8def37c9825a868a1acd32cdf47d15c581670e29" Size="5055" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1958521" />
+    <Blob Hash="8def37c9825a868a1acd32cdf47d15c581670e29" Size="5055" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1899643" />
     <Blob Hash="8defd3c52e47e38831d72c954a94f8267dfb8da7" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201430" />
     <Blob Hash="8df0f16eaca22ec971c7538bef3742fcd79becc4" Size="19968" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="12296" />
     <Blob Hash="8df9113fbfe5bac3b7a278342a871f9eec3bd72b" Size="512" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="255087" />
@@ -54214,7 +54099,7 @@
     <Blob Hash="8e104802e974ac5c41edd259f805b5a19b9c85b7" Size="77824" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="2016264" />
     <Blob Hash="8e1282502ce176dbdfb86a017efb74ac32436969" Size="1412" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1222199" />
     <Blob Hash="8e152d6d4c4dfab668efdf88642e89e4911ce1e3" Size="8277" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1439796" />
-    <Blob Hash="8e16baec9e58ec1b9c6ef463760738dd4129049e" Size="56356" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="2035730" />
+    <Blob Hash="8e16baec9e58ec1b9c6ef463760738dd4129049e" Size="56356" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2008622" />
     <Blob Hash="8e16c20bf6eeb5e9d2fcb60f8cc79179f8c6af7d" Size="4002840" PackHash="a9bcbe18512362899c63b91b13e2c74c5f34de0b" PackOffset="8" />
     <Blob Hash="8e192abec77bfedde3defe86c7ca59d747731d84" Size="201" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="72249" />
     <Blob Hash="8e1997ef647d8979c8dd3f6a401c08f64bcc38b9" Size="8380" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="637924" />
@@ -54230,8 +54115,9 @@
     <Blob Hash="8e2c9511c3e843db60a4def5f99657d887f01ad9" Size="71897" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1473220" />
     <Blob Hash="8e2ddf6bf926f470fa5c1c45eabe1f201a923b0a" Size="5442180" PackHash="7c125d9cce93f13fc5a9c56e858377d13ac67a3c" PackOffset="8" />
     <Blob Hash="8e2f69e983b33367fbf5bd3965e91c61cf114edf" Size="1268" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="228769" />
-    <Blob Hash="8e2f93ccfaa8c9c362aad269fe7ab4625739b4e5" Size="1044" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1577074" />
+    <Blob Hash="8e2f93ccfaa8c9c362aad269fe7ab4625739b4e5" Size="1044" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1696306" />
     <Blob Hash="8e3320389299efcb253b48baffc10234e5685778" Size="2866" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1125885" />
+    <Blob Hash="8e33efa9bf2c171519437065ddbd344db77bea74" Size="4919352" PackHash="47e96f0c8e33902ddb07e675908513fe2df11d7e" PackOffset="8" />
     <Blob Hash="8e35df57dfc4043bba0f28e437661dd930e7738e" Size="130956" PackHash="0b650b20c8c8aba9b4ffbfff4555352296b8026d" PackOffset="1940874" />
     <Blob Hash="8e36d454cc3cfbe15d3f8e64a9c73bc38bdc6a15" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="667247" />
     <Blob Hash="8e379858a2f62d9a823c321e0d2af7a913f57db7" Size="5147" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="402313" />
@@ -54243,37 +54129,35 @@
     <Blob Hash="8e4264d0f48a41af6f3fc9a8821d6b21da43ed95" Size="4647502" PackHash="75124406de34db23633265523d08e569d7889164" PackOffset="8" />
     <Blob Hash="8e435842c96c6dc9ec9b51a207803f930992ade7" Size="25056" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="1903882" />
     <Blob Hash="8e48df91e284cdbef0e2d01b738e77dc321e0eb3" Size="27061" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1860889" />
+    <Blob Hash="8e4a6d9180e62d2e78ab2ff7b8dffb87f023cc5c" Size="89783640" PackHash="5c14edf67971dc51da89a77c509310090e6b1808" PackOffset="8" />
     <Blob Hash="8e4ab45298f4429dfc4e1078d10088bde8316ea2" Size="1683" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="177909" />
     <Blob Hash="8e50939e92ef4679bda282576c356fdb890d2ca8" Size="119844" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="1897078" />
     <Blob Hash="8e532b538081597155e41a12e1e02dcf4ff27c15" Size="12582956" PackHash="fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2" PackOffset="8" />
-    <Blob Hash="8e532b9e76a6ad0df6171893c9fa570e8ad9b8c0" Size="45070" PackHash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" PackOffset="1974620" />
     <Blob Hash="8e55ee860245be09741f8bb38f94d7399e077851" Size="3927" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1919856" />
     <Blob Hash="8e55f01822aa04d884efcf1dcd226d0d2321db3c" Size="16139" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2018608" />
     <Blob Hash="8e5625e6a1f667f572fae4614082cd1692e1f57d" Size="22016" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="2043912" />
     <Blob Hash="8e5a26b440f52108694f5eaf7e4b900395f3a47a" Size="15666" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="2072584" />
     <Blob Hash="8e5ace64926762addde521355e373e40e75b436b" Size="2924" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="109173" />
-    <Blob Hash="8e5e6478741130d78e2695746ea66058825427e4" Size="1158364" PackHash="3491acd3495d393fddd95e53ae58e13b61e6eced" PackOffset="8" />
     <Blob Hash="8e5f8142a8c2a033f49ab0c9642a784964ac0e8e" Size="785548" PackHash="554aafaaa2c457412c5bc79178a10f61589794d5" PackOffset="790204" />
     <Blob Hash="8e61a2834a4b7732ee347cd114fd28e2fb65cc68" Size="8680" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1274591" />
     <Blob Hash="8e643779402424fd5d03c483480023d04321ca8e" Size="2415720" PackHash="13ef648e569a4224d5cc0cea1c6b6091f9a85c92" PackOffset="8" />
     <Blob Hash="8e667ee1a97fa4a988e2d1b42cb2f809c86a69d4" Size="8465" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1941346" />
     <Blob Hash="8e6a9c82d3f8d757312d95d1d37ee3ff8ea5512b" Size="6523" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="844430" />
+    <Blob Hash="8e6ad604329f698d6da5259d48e8f69c08bdb9cd" Size="143332520" PackHash="b52991d77791813767c4c4a3a002b3aa59099697" PackOffset="8" />
     <Blob Hash="8e6cb419f4b2abb475e6e277ceecccaa3fff26b2" Size="112574" PackHash="183546a339ebc6cbda54cb8ba6beccec1dc9a02d" PackOffset="424435" />
     <Blob Hash="8e6d98f72bfd76711b1d9212a5fd0227983f5d4d" Size="9318" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1300380" />
     <Blob Hash="8e703314e61150005d4ff1c6ff99f8a3e2966955" Size="4428" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1225753" />
-    <Blob Hash="8e7334bcb1fbe079077fadb2cdf927e4bd0e924d" Size="27176062" PackHash="7d0d1ad3f6c6a7281fb29d8e3b733ced715956b7" PackOffset="8" />
     <Blob Hash="8e741ce2d749bfb525f7bf658c749e5238a0112e" Size="1364" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="2095226" />
     <Blob Hash="8e784b77fa0cccbace2622391857737f61a11ba6" Size="5228" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1965672" />
-    <Blob Hash="8e789f40fb5b411adbceca5bfd2c4f3106decb3b" Size="12706" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1775719" />
+    <Blob Hash="8e789f40fb5b411adbceca5bfd2c4f3106decb3b" Size="12706" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1894951" />
     <Blob Hash="8e79e5138eaaaa7b3ba738f414a4bf317d619628" Size="212891" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="598281" />
-    <Blob Hash="8e79f5b974b9737e8d8c66d63c6a57acd54fb974" Size="857" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1038550" />
+    <Blob Hash="8e79f5b974b9737e8d8c66d63c6a57acd54fb974" Size="857" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2086526" />
     <Blob Hash="8e7ecaf4edcf5b9cca9117e9be450008ca9fdb19" Size="2503" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2088569" />
     <Blob Hash="8e827d9fb665c79ecac3a91d45dcf27a9bf8634d" Size="593172" PackHash="83483b879ca4d4508d64bd7176b1101533718a2a" PackOffset="844061" />
     <Blob Hash="8e8430a822d7849073cde3421e76961b4b346a1f" Size="6274368" PackHash="7baeec0e2256938210b87e7f2a9e157a927aedae" PackOffset="8" />
     <Blob Hash="8e85941dec42a44e9a3b31649609cf8c1701bb4e" Size="1342" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2042889" />
     <Blob Hash="8e85fa982171064e5773bd402ad34ab1df2bf3ca" Size="18994" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="673250" />
     <Blob Hash="8e89a71c77d43155f59f74897c370c2dfc409f6c" Size="314" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="461437" />
-    <Blob Hash="8e8b25e00cf9ff0c5cba056f907104e0abc60318" Size="6591160" PackHash="6097aaf513de5339127e3ed93504b404ad1706fb" PackOffset="8" />
     <Blob Hash="8e8b68015ca59c99c772dc4bc0ebd231e9ee2db5" Size="155" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1897820" />
     <Blob Hash="8e8b93fa5eb80df1afe5422309dca42964562d7e" Size="544640" PackHash="a260cd8d85a752caa55d8857af979f5ae8a68d97" PackOffset="850216" />
     <Blob Hash="8e8d0bf71e252d736df250fed6ccc623a81c4be2" Size="903" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2075606" />
@@ -54284,21 +54168,21 @@
     <Blob Hash="8e94f94db2482bb106d66ca230dd53d38fd501df" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="729425" />
     <Blob Hash="8e9561060e9509faf235e5e033fc9c2918e438db" Size="190" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="102484" />
     <Blob Hash="8e9827eccd7400e5931440d21b26f056262c3d02" Size="1899" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1551832" />
-    <Blob Hash="8ea02781f7a37aa9b5d03e1c7a63755b85b5d85e" Size="209" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605901" />
+    <Blob Hash="8ea02781f7a37aa9b5d03e1c7a63755b85b5d85e" Size="209" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1725133" />
     <Blob Hash="8ea345275eae1b263ae6e5e1c50c199441c32739" Size="179712" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="646682" />
     <Blob Hash="8ea4354e9d1d07cf5717b33fdcb89035456b10d3" Size="39617" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="1843828" />
     <Blob Hash="8ea5537a5bb147683f2828a4e6cd4bda78662e3a" Size="371" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2096422" />
     <Blob Hash="8eaae1db55253f4b91fc1037ed7599e0e96e35c5" Size="3483" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2091234" />
     <Blob Hash="8eadb8b02086c8d6c84ffb0b971a3a72f92d01e9" Size="61150" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1757984" />
     <Blob Hash="8eb30314c2d473f055481c911f00ac977bb8c361" Size="86824" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="1120253" />
-    <Blob Hash="8eb4617fc91f9c2543d0d7aa46463aa9a5ab5ceb" Size="2306" PackHash="07e31d5227b75af815bac4e9271886f59ee2ab58" PackOffset="2090340" />
     <Blob Hash="8eb4e7a2885bc54eeca4c7b6aeb5b8032e0dd484" Size="86044" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1028152" />
     <Blob Hash="8eb966f3400f2c787f45f6bc26355470da248b8c" Size="7767" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="55760" />
-    <Blob Hash="8eb9800ec4735ffa5ff5130ccd9c2b4305d8635c" Size="68078" PackHash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" PackOffset="1950842" />
     <Blob Hash="8eba112b4593798d8ec37f48925c25784f8962f7" Size="2211" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="2043125" />
+    <Blob Hash="8ebb1f6a6e84cfa71fd2f92dccedca759799e955" Size="789748" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="1280392" />
     <Blob Hash="8ebe985f019aafb6053ca76549a39a6996ff089c" Size="1040" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="113752" />
     <Blob Hash="8ebea7dc144d9ec7d3b011cd495af7738d63fd2d" Size="36721" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1375508" />
     <Blob Hash="8ebfbc7371678ea934623e47620f7f9469711917" Size="15857" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="949741" />
+    <Blob Hash="8ec0a5ff34ed24805338d38ec4e4df640c0dd52a" Size="3664352" PackHash="c8bfb63f5764758d4c2383e79e981438320b614e" PackOffset="8" />
     <Blob Hash="8ecb66f5db1d307558cc54d54667cd62a3defecd" Size="184" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2089780" />
     <Blob Hash="8ecddc8be9ed54d1c002d8e94e830ab1cf09e1c2" Size="26116" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1291072" />
     <Blob Hash="8ed2731b424b1c41c9b0fc0f8b8c93c359b58e32" Size="105009" PackHash="239a3f6397716dd1b1c6bdd2d73cfd2a4b590698" PackOffset="8" />
@@ -54309,7 +54193,6 @@
     <Blob Hash="8edb3179b1a922b0aa5571389987349728d81495" Size="92440" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="548056" />
     <Blob Hash="8edde35edfdaf57a4597a4487247b60ca4cb41ee" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="957448" />
     <Blob Hash="8edf41ce2675760dffb767d4aa58cfacc6377fe2" Size="5545" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="391351" />
-    <Blob Hash="8ee1f850f992ca99039b0db91fb854f954198809" Size="2340" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2084020" />
     <Blob Hash="8ee3af76171921ee4292d4a7d7d6508fc731b337" Size="2849" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="604993" />
     <Blob Hash="8ee6ad00aac509c5775fe0c35774c1212041a7d5" Size="22854" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="473968" />
     <Blob Hash="8eeac3a61b223835d043d5bb7708dfca649aa086" Size="4532" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="490570" />
@@ -54321,11 +54204,10 @@
     <Blob Hash="8ef99a6517682a187bdc45df799d7c3998248acc" Size="15880" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="539668" />
     <Blob Hash="8ef9e75fd30041b72253dfdadfca6c1da55f5814" Size="7864" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2052907" />
     <Blob Hash="8efea0bd9303ea8ce34e21a02dfefc292b2a193b" Size="2169" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="418217" />
-    <Blob Hash="8efee342137e146e4426d3e8359ac5a1dadf07b9" Size="4427" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1788425" />
+    <Blob Hash="8efee342137e146e4426d3e8359ac5a1dadf07b9" Size="4427" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1907657" />
     <Blob Hash="8f037c8ea40dc29221ebf50316c11363c849939b" Size="12800" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="2031480" />
     <Blob Hash="8f055f5325666570cd5209d36fc651cab1494180" Size="1514" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="726250" />
     <Blob Hash="8f0651efc95f66c495f85e9894c24e68c1dfc3dc" Size="90923" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="649413" />
-    <Blob Hash="8f07a7246d1cb3a81047021dcede849f5d5a75ef" Size="5562066" PackHash="dc922c36f90c0e246e59661cac88c9fb3643639f" PackOffset="8" />
     <Blob Hash="8f0926c112d82fbf980bcd7136f7b9baef186e77" Size="10552" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="735089" />
     <Blob Hash="8f0c6ff724fd2c38789b3ba2e746e4222fc89622" Size="5604" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1855235" />
     <Blob Hash="8f0f047b1e3d4eab13fd64890aa2eb17323a23d5" Size="13411994" PackHash="109ac2799187c1e94076a2db14922c275e94adbb" PackOffset="8" />
@@ -54334,26 +54216,25 @@
     <Blob Hash="8f14f96393d2aa85aa1599dda93c623fcd9a5f07" Size="219" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="350526" />
     <Blob Hash="8f153aa4f5e5617036df46dab202a297f39a3878" Size="227607" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1385281" />
     <Blob Hash="8f169ec1e1ce2d0a1f97e67f04ecc7d52adab6f8" Size="37579" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="734717" />
-    <Blob Hash="8f1b1f10db845993f10ebee8be2c259c40481476" Size="2065" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1077664" />
+    <Blob Hash="8f1a327f47bd5014499d65e9361800c70244388c" Size="6571856" PackHash="9b4e73dcc106efa4d16d4ec883256a6b50c18d93" PackOffset="8" />
+    <Blob Hash="8f1b1f10db845993f10ebee8be2c259c40481476" Size="2065" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1247698" />
     <Blob Hash="8f1d7295c04ff393472dab0fa2d4ff4557a200dc" Size="1157" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="423283" />
     <Blob Hash="8f203d3a4bd20e31fe5e314d01665d9c768a6674" Size="45" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="2097114" />
     <Blob Hash="8f2099beec68ad3bbaf38352bcb57e05fcc6727c" Size="1746" PackHash="9c2b99ebfed2e931067e8842161b2811d04206eb" PackOffset="2095122" />
     <Blob Hash="8f20f55cd984bba40d90cea45777350fd6e8f43d" Size="117351" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="611405" />
-    <Blob Hash="8f21109217beada9d168988ccbf857f2d6bf2f53" Size="2324" PackHash="e77394dd7f7cc0b5cee80f69160731fc90212a12" PackOffset="2091280" />
     <Blob Hash="8f229e3e8c97ded5b754993aafcacd78dcf97ff7" Size="2305" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="397563" />
-    <Blob Hash="8f25e49793a020671c10c9ba9928a4f473442252" Size="4112236" PackHash="7665e894d2ef76b40d85459e1619b2b3316b6ae1" PackOffset="8" />
     <Blob Hash="8f25fc44ec10b5dd63b0597b6057ca4c14c9bca8" Size="123932" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="1696550" />
     <Blob Hash="8f26fb3d50b6942826fe88c76284c5b0048fad34" Size="3377" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="957419" />
     <Blob Hash="8f302581fa914ee1c429db2f5cfcf712080f4680" Size="370528" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="540424" />
-    <Blob Hash="8f323b1c817fbd021506415beaed070eb5ba8805" Size="56" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553278" />
+    <Blob Hash="8f323b1c817fbd021506415beaed070eb5ba8805" Size="56" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672510" />
     <Blob Hash="8f37f2c3b3c5b5fd2da41ddcc59ad1b6c29b9bf0" Size="1162" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="376061" />
     <Blob Hash="8f3c6c4331cc54946fd6e63055b2597157a9fe55" Size="4012" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="596067" />
     <Blob Hash="8f3e5808852297908e899b81054dd15078b147fc" Size="2828" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="142850" />
+    <Blob Hash="8f3f6112f2eb1394e1a5cee5c22e223ed847c318" Size="2310" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="2088730" />
     <Blob Hash="8f3f7551423823c0332477dc55eba073a146da55" Size="6651" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1414290" />
     <Blob Hash="8f40b9b7414e587a5406e429d124df101ea7d428" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="937960" />
     <Blob Hash="8f453158ac8d4c9c27e43d3f90517b3d11d7ecde" Size="3360" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2066188" />
     <Blob Hash="8f45ae053dcceb34b1d233f025678f0c0519627b" Size="349456" PackHash="8eb93ecba0b5fb9152871b939466168fb359c26c" PackOffset="1151496" />
-    <Blob Hash="8f45b42ac41d6cf26427c8183005dd3b25e19566" Size="313144" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="1558824" />
     <Blob Hash="8f4708342844964889788167b886555b3c44f57f" Size="177208" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1242822" />
     <Blob Hash="8f475c71a62e2e03f91c65e8edce83c8ea57b1e7" Size="1008" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="2093362" />
     <Blob Hash="8f49fde0860e0982e0400358614678964936b099" Size="6364" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1928067" />
@@ -54378,6 +54259,7 @@
     <Blob Hash="8f8c1090a7276d18292b40f4fc95b8564c631bab" Size="9460" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="189496" />
     <Blob Hash="8f8e7cee0ad1b38f7441ce3b775b3a22ba73acd4" Size="25944" PackHash="c38a58ebaed4f4113a72a83d4c9eed961e2b9d98" PackOffset="2042173" />
     <Blob Hash="8f90fa1d874e8bd7d67b3f89d624af05bfe6fb14" Size="38786" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1455800" />
+    <Blob Hash="8f9126fa55bc481fdba34665887bacfeee1b525d" Size="3363916" PackHash="283a931c4b1296c9db13f13c73fddcdca30cf82d" PackOffset="8" />
     <Blob Hash="8f95541e1898ff9ffc73597354cd72817c5a2459" Size="3528" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1942622" />
     <Blob Hash="8f97576f3fb3b5dbef71dc2c9314ab5e530974d6" Size="1114" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2029681" />
     <Blob Hash="8fa0d689b73c84c1034adcda6fb30196600258be" Size="61226" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="200262" />
@@ -54394,19 +54276,19 @@
     <Blob Hash="8fb325afc942aceecf6bbf5c8fddf670a465d08d" Size="81259" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="617746" />
     <Blob Hash="8fbaeb3a3ca1b2d5ff34b810398ccd6e32925d49" Size="102989" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="815333" />
     <Blob Hash="8fbc99df8455be7147f9bd16e02b00c2241efbc8" Size="5299" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1554515" />
-    <Blob Hash="8fbd73674658c78100f5a496ba992891fceb87b1" Size="6498" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2087163" />
+    <Blob Hash="8fbd73674658c78100f5a496ba992891fceb87b1" Size="6498" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2085384" />
     <Blob Hash="8fcbe814c1670cb1739ec713983907a034d20523" Size="312" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2096790" />
     <Blob Hash="8fcbf15194c7a0ab54a43506880caa67cc22bfea" Size="2869" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="151351" />
     <Blob Hash="8fcd3a47f52a1bdbd633e61bfa285a25041162de" Size="5722" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1856818" />
     <Blob Hash="8fcedd0227c7a8a7902fb2e15508692bb059807c" Size="334" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2094987" />
-    <Blob Hash="8fd2a18ede714a6b405e05daabdecd2309fb0a80" Size="726" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1611925" />
+    <Blob Hash="8fd2a18ede714a6b405e05daabdecd2309fb0a80" Size="726" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1731157" />
     <Blob Hash="8fd35685d93fbe4041b3fe42b3cfbab1c94f43dc" Size="20535" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1072936" />
     <Blob Hash="8fd4d832c738d4eb986cf55513f1e9aeaeea735d" Size="2630744" PackHash="ae8089d30509415ded81477eb41b29f55a431272" PackOffset="8" />
     <Blob Hash="8fdbd2828a48d4894b840775203e2dea02155903" Size="485" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="212101" />
-    <Blob Hash="8fdd6ff2eebe2ccae4a7961a86e46a0cff5785ee" Size="59" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555966" />
+    <Blob Hash="8fdd6ff2eebe2ccae4a7961a86e46a0cff5785ee" Size="59" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675198" />
     <Blob Hash="8fe1c9d503745c3620a510a7f9bc20e028127da3" Size="4704" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1196421" />
     <Blob Hash="8fe422e109350a5af8001d6f658c5f2b4fc04d25" Size="121672" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="1230918" />
-    <Blob Hash="8fe508374552250b94117d22ae9af1b662ad315a" Size="369845" PackHash="056b3fcc9f2bb9a7b7024314a17d5c3c91b3bb80" PackOffset="1379328" />
+    <Blob Hash="8fe508374552250b94117d22ae9af1b662ad315a" Size="369845" PackHash="63d57bc7338d3f2c7d705c91585c8a1688cc8906" PackOffset="1499840" />
     <Blob Hash="8fe762727aab2acf44dcb15b496463634c75cd0a" Size="128" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1167216" />
     <Blob Hash="8fead64e7655da28dc2e87c2af7cd02e97eb8e5a" Size="9216" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1293004" />
     <Blob Hash="8fec290e1720678fc6616c1c562707a1e1aca785" Size="151340" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="331497" />
@@ -54420,7 +54302,6 @@
     <Blob Hash="9000f14b5029981a11871bcd19a440358164d36a" Size="3022" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="178624" />
     <Blob Hash="900178fed69dbba1c985266a6447c5ef54ad10f0" Size="50794" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="136011" />
     <Blob Hash="9003fe1c73c29b851a2e70e67d4c19c5de1fd8e3" Size="2854568" PackHash="60e5a35dbfe5ca8bcf8178be51bf116b1e44ce0d" PackOffset="8" />
-    <Blob Hash="9006d062e2f3501d90c9e52f976f985e564a051b" Size="183808" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="1854368" />
     <Blob Hash="900915479787e3be687d7f201b17d87d141b418b" Size="1219" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="2093233" />
     <Blob Hash="900f1c01eb86e19e0cb698aa75060f357117b10f" Size="38003" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="696714" />
     <Blob Hash="900fbdd3321bb0417498f58f06cb9c3bfc078e30" Size="2299" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2031968" />
@@ -54429,10 +54310,9 @@
     <Blob Hash="9014b956f239f0da6426526278ef51f9f4a47a8e" Size="15336" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="2071226" />
     <Blob Hash="9014d307dda105d88d48b32b517dd53b6d6873ff" Size="534764" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1282718" />
     <Blob Hash="9015e2faed81a86ff428b31177ef821cb8d074fc" Size="2229" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1322489" />
-    <Blob Hash="90177d2c1dca0da2115d72b629eba0c4fb995d9f" Size="1927" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1369792" />
+    <Blob Hash="90177d2c1dca0da2115d72b629eba0c4fb995d9f" Size="1927" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1489252" />
     <Blob Hash="9018a5f9c23869da38ee87639a1eac7d90e4c0cb" Size="66370" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="2021271" />
     <Blob Hash="901b4a9d560c63bcf044d92cb57bc2d50c34d4be" Size="76714" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="1476165" />
-    <Blob Hash="901bc7fb67e608e98ac31653c318bd037c31551e" Size="34109800" PackHash="7c5cf90990040c7ceb1fc41101bd3e1a450f8093" PackOffset="8" />
     <Blob Hash="901d530437973e6d40f8ac3f4a79403c2ba1a05a" Size="3426" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1139721" />
     <Blob Hash="901df0d7473b951cec268fc97164d0d8a120ba76" Size="3137" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1679633" />
     <Blob Hash="901e5054591113570407a5fb49ae757c8b2b25cd" Size="34284980" PackHash="c14937c8186bdb1e8d2521a7a21f839808d7bed7" PackOffset="8" />
@@ -54450,7 +54330,7 @@
     <Blob Hash="9036f7d50e8f022452d1a5b154c17457d3a56f63" Size="3758" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="2079488" />
     <Blob Hash="9037019f6a8579683d90cc70173f001909d1f96b" Size="14848" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1011208" />
     <Blob Hash="903714237ebd395a27eaf00b3daaa89131267ee5" Size="158" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201549" />
-    <Blob Hash="903733789852c79261a50ea6c3af192f369b30d6" Size="8862" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1422043" />
+    <Blob Hash="903733789852c79261a50ea6c3af192f369b30d6" Size="8862" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1541274" />
     <Blob Hash="9038c3cf7b3ca6942ebc558c79004b88c582fdb8" Size="399" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="411061" />
     <Blob Hash="903a3e8c918bb315a05a1b27c712987bf20b4480" Size="11336" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1531230" />
     <Blob Hash="903a8f15b05bf9908e59d0aae2a30f682aabb5d0" Size="23208" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="802804" />
@@ -54458,7 +54338,7 @@
     <Blob Hash="903eb601bb0a3633ec6f8d986ce9bfa2e2b6a070" Size="2376499" PackHash="041ab356c5a29f8a2b23bbdc0574575cc47646bf" PackOffset="8" />
     <Blob Hash="903fdaf936494e70649ba8a0e74766ff56856dcb" Size="1367" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="699327" />
     <Blob Hash="90425942f8f9068ebd8bd881402807f8a5d370fd" Size="5154" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="696356" />
-    <Blob Hash="90441a4baa1f08fff89a88b22325e8e65bf4c1e0" Size="3320" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1186823" />
+    <Blob Hash="90441a4baa1f08fff89a88b22325e8e65bf4c1e0" Size="3320" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1631654" />
     <Blob Hash="9045e10bd2f9c7070a153bbe7c298750670afda4" Size="842" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2073800" />
     <Blob Hash="9047139dacf960e368da038d2024f042d777f01b" Size="6290" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1909394" />
     <Blob Hash="9048832deaca5ff8e620628b943be176d7ff976e" Size="3486" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="755333" />
@@ -54467,14 +54347,13 @@
     <Blob Hash="904d5325364be8492b0714deddde1ef63846f767" Size="783" PackHash="21495600a60ec70990241fb254dcb18dce209ffb" PackOffset="8" />
     <Blob Hash="904f76f03c882105939dc3e30900f8841c308cb0" Size="22880" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1784908" />
     <Blob Hash="904fe99b72566fd0a8950d1e1787691cbe0b61fb" Size="193128" PackHash="7491079d020d11f40f14eb94536fe09006ff2c16" PackOffset="1840412" />
-    <Blob Hash="90560e129742f62ca6d7f304c5c0baaff70832ea" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553676" />
+    <Blob Hash="90560e129742f62ca6d7f304c5c0baaff70832ea" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672908" />
     <Blob Hash="9059d3a367710468d059229685b3266df571acd3" Size="446" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1525660" />
     <Blob Hash="9059fc54e2417240f092b2337231c11ff8275d45" Size="2938880" PackHash="b8d9134504392b2f0a64a265151b39f693fec608" PackOffset="8" />
     <Blob Hash="90617800e76bf92dc199a3b7ae7af162de5ab1d4" Size="3226884" PackHash="f7982abe00f50f9cd5cc56279bb0068197cc72dd" PackOffset="8" />
     <Blob Hash="90639d83c6a68f5b2939842366a70f782fb1052b" Size="2123" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1287024" />
     <Blob Hash="9064db40007999d775cd00aeb6787f20d1479474" Size="21138" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="507495" />
     <Blob Hash="90676c37c1dcdca1016746aabbfd3dec0fff6a64" Size="5343" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1688413" />
-    <Blob Hash="9069400ce408ced58f915d05621bc54141880e70" Size="500142" PackHash="563883a5d19fc2d08ee339d742ba1d2eacc72981" PackOffset="1156420" />
     <Blob Hash="906cef41ee88d8d044d707beef603382e18621e9" Size="22812" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1354683" />
     <Blob Hash="907c5d5fbd5aefa899dfcbc6617e8f1ed6efe66f" Size="676" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2078162" />
     <Blob Hash="907cc7e15ad459c044e94cd82d9138431244603b" Size="79360" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="1108821" />
@@ -54510,8 +54389,7 @@
     <Blob Hash="90cd115bc3c898d80bd5c2f94cf12fa5fe3fc1bd" Size="10768" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="410408" />
     <Blob Hash="90cd91d420f4133087cc06f4cd0ba5d78faee6ea" Size="163602" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="1397696" />
     <Blob Hash="90ce6aee60dfc5cb6071a5ec8dc2988e4b9ee477" Size="7188" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1453636" />
-    <Blob Hash="90cf83a921fdde41469c9a62db01c05d29ff69a6" Size="749" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1460047" />
-    <Blob Hash="90cfe2bf4630c5e428200e619dd32665f5cb0595" Size="112976" PackHash="5ee36ea5d52f8f7c51f3bd5d9e58d94ecaa67049" PackOffset="1893836" />
+    <Blob Hash="90cf83a921fdde41469c9a62db01c05d29ff69a6" Size="749" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1997129" />
     <Blob Hash="90d18cbc771a35872186b0d7cdac9f23046476e4" Size="89440562" PackHash="bc94cc1ea765391507dcbac76365fba196297b19" PackOffset="8" />
     <Blob Hash="90d29e7fbc8bb8c16daf96a9d14040f7455e34f0" Size="929" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="252114" />
     <Blob Hash="90d303ddb933b3cc2c3b308d9b0516e3c9faa6fb" Size="13275" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2075286" />
@@ -54522,12 +54400,12 @@
     <Blob Hash="90e44ebabf9e628ff5bc7cf50c7d35ae84a2ecb0" Size="3683075" PackHash="9176bf2f511e61390d1c57cb318dbc1b345f613c" PackOffset="8" />
     <Blob Hash="90e67aa4e482bb948b6a34825eb11f3fbd2240eb" Size="10955451" PackHash="16a5c30dc686c64ff3e0ae9ad65dfdee2885234e" PackOffset="8" />
     <Blob Hash="90e9b3b7d88facfea58e13f0db917ddf76c26ca2" Size="840" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1794065" />
-    <Blob Hash="90ec8305b56424840f0411755d29a52e22749d86" Size="2168" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1396194" />
     <Blob Hash="90eca0612c822e414ab2cd0e4c1840619babdb93" Size="6817704" PackHash="f0a9ab50349a7e9359afb1d1da020870c8b9d28c" PackOffset="8" />
     <Blob Hash="90eeab80543d70b0706849a194ef90a419879de8" Size="112067" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="565733" />
     <Blob Hash="90f1aae00d973ce4851b9cf227c306395c4f7750" Size="12769" PackHash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" PackOffset="2077970" />
     <Blob Hash="90f3b5ccffa69c83fae915e2aec204777b7c808d" Size="39467" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="623366" />
     <Blob Hash="90f415f8d31570f630e8aa4ef98cd3ec439a1eb1" Size="1591" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1852198" />
+    <Blob Hash="90f693c50b5f41b451a01b06a51ebb3574a2c39a" Size="248146" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="1630384" />
     <Blob Hash="90f6fe18ee9712117ac35c3cdefbd5ba24b70ee1" Size="19532" PackHash="7834946aa336571c3e5e0f4f005e54499e0d9e70" PackOffset="2053217" />
     <Blob Hash="90f701c05e76679d78ca7907176d91c70370729c" Size="50536" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="214618" />
     <Blob Hash="90faa6d773b547f12b84fa56fa57e0d0151edc56" Size="1167" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1656099" />
@@ -54535,17 +54413,17 @@
     <Blob Hash="91072312e4e6434cc4e36509907dc229199159b2" Size="13112" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="253257" />
     <Blob Hash="910b3c34526ddd3f79fcc95e9489d023b48a2eee" Size="3758" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="2075730" />
     <Blob Hash="910d8e4a389095f3b7d860c8d40ef3a6962402da" Size="29511" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1102926" />
+    <Blob Hash="910ed25198c0c37b2416eb7feefc1d2cd761e259" Size="2400" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2090306" />
+    <Blob Hash="9114f67bbe4bdcf48eb63422c82dbc36641ee595" Size="14089152" PackHash="2392bf3345cd47fe57813eea25be2e0120b0d209" PackOffset="8" />
     <Blob Hash="9115a794791a00db1abae9972d7d76992488f017" Size="291684" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="434269" />
     <Blob Hash="9115d7268329472ac4b73ef80f60fd3bb5589958" Size="3233" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2088475" />
     <Blob Hash="91181ab428044a0fd8a2e75cf568b0a0ca6f0690" Size="208559" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="777462" />
     <Blob Hash="9119fa6f7d683e5da87717d3b6a52f0e5e77a7d2" Size="2544" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="577792" />
     <Blob Hash="911dbd4a363cc55ad0bcf143e2965a8342883b73" Size="7630" PackHash="fac312cf3966932ee6b9264f4f44dc533de0fbb0" PackOffset="8" />
-    <Blob Hash="9123f306dfa43e5e0fbf435b65c4a2fa75ed0dfc" Size="8896664" PackHash="0726a5098596ea99d4da5659b2d9fe70457ab304" PackOffset="8" />
     <Blob Hash="91258ab73ed9e143283eeb6da179b53a8dbba3c8" Size="4796" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="336405" />
     <Blob Hash="9126cea8018f9a13c2910afad75a1670621bf70a" Size="8614" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1856530" />
     <Blob Hash="91272bc6bc7b6857f3b1cb62dfe3c80f90312322" Size="2649" PackHash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" PackOffset="2013883" />
     <Blob Hash="912db9d9fcdbb8d9de42c6e5d7f6589154b57733" Size="2993" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="451717" />
-    <Blob Hash="912f524b8ece2d5666af7385cff96ec055b759f0" Size="2254068" PackHash="d14b12c95456b11b70e2d2621c69be65961ea3b6" PackOffset="8" />
     <Blob Hash="913028412704f93ffa0221c6a7cd2ffb153e47ac" Size="9520" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="2060742" />
     <Blob Hash="9134ba8a549fd6a8d9bdefcee31817e370f2649e" Size="67843" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1663022" />
     <Blob Hash="9134c74042ea84d5dfb184d5fbecab1fa653b157" Size="13824" PackHash="aaf3a012f48b24c193628af42ef3302d96784c3f" PackOffset="1941584" />
@@ -54578,7 +54456,7 @@
     <Blob Hash="9185e1b0a207ad2335043819c6d0948b69d22057" Size="9520" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="2070262" />
     <Blob Hash="9186dec8b8459922e6e2212615f4cd37461b2204" Size="6782810" PackHash="e6b6eae991adb9b39c9dd688676859a2a37b6d39" PackOffset="8" />
     <Blob Hash="918c908e4c32ea5ef2684d16a2700f89c4702e7d" Size="130145" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1100910" />
-    <Blob Hash="918ed8889f011bfbbc86ab66658cabebece3c25f" Size="7499" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2050806" />
+    <Blob Hash="918ed8889f011bfbbc86ab66658cabebece3c25f" Size="7499" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2069947" />
     <Blob Hash="919012354b99bbef4c85517e89a2c9cd340fce49" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1826570" />
     <Blob Hash="9193b40bc13a94fe18270de8db765f8c929a5dfd" Size="484" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="177939" />
     <Blob Hash="9194931410c2e7ac83cca3cad3f9d21d8fac0a7c" Size="7576" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="441112" />
@@ -54588,13 +54466,13 @@
     <Blob Hash="91a7da13b695412a83d18db37126e924cfa8716a" Size="4430" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1025223" />
     <Blob Hash="91b24b9d0545ca6a4ed98687b69faeea50c2b9c6" Size="637" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="680725" />
     <Blob Hash="91b4cccb3ec65a2e34c50c23ad16a7cd40edecaf" Size="54272" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="2026504" />
-    <Blob Hash="91b950c8fe233a41d315e93825dcd4a6396db640" Size="1133" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1073782" />
+    <Blob Hash="91b950c8fe233a41d315e93825dcd4a6396db640" Size="1133" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1243816" />
     <Blob Hash="91ba693bce79ebce2806b3d7c7176504a6fc24f6" Size="949" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="275262" />
     <Blob Hash="91bc4989345a4e26f06c0c781a21a27d4ee9bacd" Size="3466856" PackHash="85393f1f0730c3ae240238686b47d7643899d34d" PackOffset="8" />
     <Blob Hash="91c53528a10e209d1a2ca1dd22dbbaef2aa8b1bf" Size="879661" PackHash="c40e5337fb15243fce02dcae546c81693c08866e" PackOffset="1160420" />
     <Blob Hash="91c5434b803faeaab0f2309a1e6bcd843b9c206a" Size="11376" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1652964" />
     <Blob Hash="91c5ec7daa906e56d4bd756e927447b6aeffd350" Size="591" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2096421" />
-    <Blob Hash="91c81289266f4f701f511e85dfcbef461418935c" Size="3123" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2093356" />
+    <Blob Hash="91c81289266f4f701f511e85dfcbef461418935c" Size="3123" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="2093660" />
     <Blob Hash="91c9b1336adf13f20b043f2e0b3cd1f4851947e6" Size="24927" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1759091" />
     <Blob Hash="91cb71eeb86be9cf1931a3e7586a4863d13da89c" Size="3196" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="753894" />
     <Blob Hash="91ccbbb5aa7d88f88e4eef875194f294dbf6be1f" Size="37155188" PackHash="e667d98942346cf8cdb6a4cb7b9bbd4e3e10b2d9" PackOffset="8" />
@@ -54615,7 +54493,7 @@
     <Blob Hash="91ec82713cc31408d1150452f0449fc62777b201" Size="1127" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2014577" />
     <Blob Hash="91f3f30a949253e228de78846fde839f7f7dc7eb" Size="517" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="2092729" />
     <Blob Hash="91f7d914ad866e59724e04d656375da08c6b36b3" Size="692" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2084964" />
-    <Blob Hash="91f825faeaf9860ff9460374f56e82253a47764a" Size="694" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1419895" />
+    <Blob Hash="91f825faeaf9860ff9460374f56e82253a47764a" Size="694" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1539126" />
     <Blob Hash="91f95ff8dee1bd41a79bfc0c9776715235702527" Size="6997" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="836359" />
     <Blob Hash="91fa1bb6595b086035aaaf885d61bb66f0ca6af0" Size="2965" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2076175" />
     <Blob Hash="91fd7c9dd20406b14dfeae9a83c29a9f63dde920" Size="8396" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1897572" />
@@ -54629,7 +54507,8 @@
     <Blob Hash="920bae1c8046e07619c9d86291dcf37d3ac9041d" Size="21936" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="534227" />
     <Blob Hash="9212ab6e8f20145bcb123206140e29647f8cfb89" Size="6074" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="682321" />
     <Blob Hash="9214a7a6fde67f96df7d8d5117d2f87272387531" Size="1047" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2071381" />
-    <Blob Hash="9216711d304fe26b53ababcc5d3f85371f49efc0" Size="1648" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1039407" />
+    <Blob Hash="9216711d304fe26b53ababcc5d3f85371f49efc0" Size="1648" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2087383" />
+    <Blob Hash="9218d80b6c13aba03391e90ca3c630cb7155355a" Size="21993472" PackHash="8cc04fd8725061ba6ebdd7ad9a2b7231d16fc12d" PackOffset="8" />
     <Blob Hash="921d2cb017ddab8a68bb2368acd84e4c84d31330" Size="5632" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="2091016" />
     <Blob Hash="921eb1ad65dceddc6ba3631c0f74cfea4809d16e" Size="8651" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1337469" />
     <Blob Hash="9229c51dd9895a505cc66aeb11412a93b5646f8d" Size="33269" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1174192" />
@@ -54641,10 +54520,9 @@
     <Blob Hash="9237647e5a7b904586790159ae62e7f68c818123" Size="3987" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1691680" />
     <Blob Hash="9241fe87e44dbe71f277506ae7d5e56c22ebd6f4" Size="143" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1257446" />
     <Blob Hash="9245417332ddaa4772afa89d8c533c18f00ed41b" Size="174" PackHash="76b81db67f411f1be2b6675587a81eedcdbfaf5d" PackOffset="2096924" />
-    <Blob Hash="924dbc6b400c788c582dae9f5324600acc761b2a" Size="20073480" PackHash="e60e266db250bdf5f05d33234d8ae4dfcc91973c" PackOffset="8" />
     <Blob Hash="924dff50a8adc4d6ca3df01446f550bcd13282b7" Size="47647" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="821324" />
     <Blob Hash="92506a5866ac713367f71f8cf6ae2c51bb4d0bae" Size="66798" PackHash="bc58e4bcfc6ab53fc7bd2ea0e7d1c74c30d1f295" PackOffset="1887856" />
-    <Blob Hash="9255d342c3d5a853f95353cf2395771d30d8f531" Size="2864" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2088043" />
+    <Blob Hash="9255d342c3d5a853f95353cf2395771d30d8f531" Size="2864" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2081089" />
     <Blob Hash="9257c334b15a14ab6d93f7f491ffd392bd67195a" Size="3537" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="3557" />
     <Blob Hash="925c0ec6500115e905d65f9b02db480121841067" Size="67478" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="556163" />
     <Blob Hash="92602381bfcec6c03bf8c5b99b52ef6e6b470382" Size="26433" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1979845" />
@@ -54676,7 +54554,7 @@
     <Blob Hash="929a620a8bba8fa9dd0fce98491937dfbd4fd7bc" Size="135" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="2097004" />
     <Blob Hash="929ab21ed53aef97cbb654d1489b02b00b5a8588" Size="49" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070236" />
     <Blob Hash="929ae236cf19ea580a60d5d496e1a21c8c313ec8" Size="188" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2084668" />
-    <Blob Hash="929be41d3ebb6740ecead45b79b1a2db97b7923f" Size="653" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1391937" />
+    <Blob Hash="929be41d3ebb6740ecead45b79b1a2db97b7923f" Size="653" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1511397" />
     <Blob Hash="929e773abc374c84444562b7750498dc16f41b7a" Size="1046" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1335149" />
     <Blob Hash="92a0ccd4d526cd024ce8c32a2fdc558c77d60c66" Size="299562" PackHash="12468bf1be869d88d9a8104ffde7c4887839843d" PackOffset="625962" />
     <Blob Hash="92a1ab3dcb6c1eeb8b947a626e82a91f8adc22a8" Size="1144" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="371548" />
@@ -54689,7 +54567,7 @@
     <Blob Hash="92b8db02a5a755c4bd9afac0f9ec29a2ffb7db87" Size="23050" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1804562" />
     <Blob Hash="92b8f9dd152e60c01a2d9a90e799015effc28110" Size="239180" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="492882" />
     <Blob Hash="92bc3a8fe69827d3d5efc955e3fa3ecaf5261800" Size="845" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2087117" />
-    <Blob Hash="92bd803fafa4f11a08c9ec84a9ab6432bd20267b" Size="760" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1471546" />
+    <Blob Hash="92bd803fafa4f11a08c9ec84a9ab6432bd20267b" Size="760" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2008628" />
     <Blob Hash="92bec090c220b6f6dd8f6060c2d7ea169b0b65ff" Size="3482" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="623863" />
     <Blob Hash="92c1ceef76e4fd09ce9cc87ef0f66b88d3b1905d" Size="2087" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="976129" />
     <Blob Hash="92c2c43e2ba2b76cb506408237e45f80f7658c01" Size="315726" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="1633170" />
@@ -54706,7 +54584,7 @@
     <Blob Hash="92d60351f9c44b0125086e9297642b1f5a1c3feb" Size="9511" PackHash="4df09dedb5c89d210947d966cbedfbc6267aa7e2" PackOffset="2086961" />
     <Blob Hash="92d90c65d52c9a022ff903661487aa8d4ae46b21" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1647553" />
     <Blob Hash="92dd9c16ed83e712c728aeca4f69d991fd49d90f" Size="1861" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2021987" />
-    <Blob Hash="92ddbcf3363f22733fea6c8bc9729566c880ba58" Size="421" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1327901" />
+    <Blob Hash="92ddbcf3363f22733fea6c8bc9729566c880ba58" Size="421" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1776803" />
     <Blob Hash="92dedeff58aecfab7085dfdb81dce69f5a4ffb6c" Size="128" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2071318" />
     <Blob Hash="92df07d01555785fcf6e81e45aee66427e6570dd" Size="3852" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="535801" />
     <Blob Hash="92e44f68ec1babc9c5416b65c3132c8114aa4abb" Size="1640" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1938858" />
@@ -54715,7 +54593,7 @@
     <Blob Hash="92eebc58174269f9116b541b2931eba033b39fb8" Size="615762" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="1202677" />
     <Blob Hash="92eed42c4750581e7e8dd5c5a2ccef2927e6d3c1" Size="1579" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="593258" />
     <Blob Hash="92f5438c642618e2d5825c64b7f453136ff2579f" Size="73264" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1930241" />
-    <Blob Hash="92f6a82a4b339caebfe0772eaa1818e891c81ed4" Size="620" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1427464" />
+    <Blob Hash="92f6a82a4b339caebfe0772eaa1818e891c81ed4" Size="620" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1876517" />
     <Blob Hash="92f6bb53d2c8e3585653e4ec8e091702347511ea" Size="39481" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="362382" />
     <Blob Hash="92fa0cb809504f48e021e252601dc102f4b9f1c6" Size="847" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="452167" />
     <Blob Hash="930291149c2ae01e1736424493b9f4db5e3bc5e8" Size="76" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2095950" />
@@ -54726,8 +54604,8 @@
     <Blob Hash="93070577dece0630cb179724aef1e7a57410962b" Size="73945608" PackHash="000105cade38f7a5ae16f5012e5e932d6ccf29bc" PackOffset="8" />
     <Blob Hash="930c2109422e13e0f267e3a7d99413e99b413d3b" Size="29392" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="915636" />
     <Blob Hash="930f232df5f378dbe55ed56f230c36520a1d4f79" Size="94187" PackHash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" PackOffset="638131" />
+    <Blob Hash="93120c063af1f5399b4129137b03fabcafd079b9" Size="7924" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2077152" />
     <Blob Hash="9312e6f4a6d2b956e4a8c46b8a3c6b023a4c1650" Size="2473" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1130248" />
-    <Blob Hash="9313d00909fbbd3f89be90228fe838fc0bb9fb21" Size="2435724" PackHash="2724c503e212782d9cace3a9a1e45db5d9fbfe97" PackOffset="8" />
     <Blob Hash="93144bc83312232cfc32363ddd2aa1e013bfa1c1" Size="3029389" PackHash="0ee5f371d8dffa94c5df7c2c1337d8a7029c022c" PackOffset="8" />
     <Blob Hash="931a4e23cb29060846dc1f1699d7e0dbf79de8bf" Size="75278" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1800080" />
     <Blob Hash="931fb6529b4f6ec421e10a9974eaa95f5e3b5b9a" Size="4859" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1586598" />
@@ -54735,6 +54613,7 @@
     <Blob Hash="93263feea1a6516e4158e54faacaedeeff84d5bd" Size="14638" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="1853528" />
     <Blob Hash="93275422947621fd3910daa08fa397b2da0c87fe" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1403168" />
     <Blob Hash="932f97beb6ae7370a420f7250f43773b7a9b1275" Size="23552" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1574408" />
+    <Blob Hash="93301f8891f89bf7a842ab2f59567f3df87f4d1e" Size="645074" PackHash="6633fc884b676640607254f19e9e7b0bf8defeee" PackOffset="1408216" />
     <Blob Hash="9331974f40fb74af9fdf09fb8650b09c4848f52d" Size="27633" PackHash="532f738b3573e1e4caf1bd23cd03fea7e6f49947" PackOffset="105344" />
     <Blob Hash="933396c55770ecff250b54616bbb4d5366d28ba2" Size="2046419" PackHash="d92a1acd3616e39cf08b386bc602a4288c1522ff" PackOffset="8" />
     <Blob Hash="9333bfbc887f1d705080a256c5703daf4c1c1977" Size="102630" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="978834" />
@@ -54766,11 +54645,12 @@
     <Blob Hash="936c182ac85e13ec63d0e3b482db6c637c994a17" Size="152" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1403268" />
     <Blob Hash="936d13d52f289d2e664651466d22acd760e536e2" Size="5690" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="2050680" />
     <Blob Hash="936d5cebaf36478fab9350fefb1da5323e607966" Size="39038" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="121244" />
-    <Blob Hash="936dd25bff20a6ede6e4793df377ff50cba51fdb" Size="1127984" PackHash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" PackOffset="8" />
+    <Blob Hash="936dd25bff20a6ede6e4793df377ff50cba51fdb" Size="1127984" PackHash="9839cc83983264caf62cd87d042ba4cc1024cdcc" PackOffset="8" />
     <Blob Hash="936f140e61ff77b07e2cbf60029f064f1c2186f3" Size="20536" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1414728" />
     <Blob Hash="9372ac4d64d9f467cae11a4bec64b96fc4d20bf7" Size="17811" PackHash="efad2bae9ec0727a2d14a2090060a47d4adbe4e6" PackOffset="521791" />
     <Blob Hash="9374f107f2e069c7a34b35373b944907803c122e" Size="44207" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="2049138" />
     <Blob Hash="9379fda4cf73cdf6b846b1918d1b31d85408bdf8" Size="728064" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="1359919" />
+    <Blob Hash="937bb9aafe6d9d42b1ed270b6d674170bfe66d5f" Size="6008730" PackHash="b0075283b38cc73da711f156d08739d80e01d46e" PackOffset="8" />
     <Blob Hash="937be72a280dc53efb6154450a86ec1c80460db7" Size="364" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1426239" />
     <Blob Hash="93869eb340ec76808fbd699758c8bfb8584aef71" Size="366595" PackHash="7834946aa336571c3e5e0f4f005e54499e0d9e70" PackOffset="314039" />
     <Blob Hash="938ac7eabd45e50794db240f52f72927112b2b37" Size="220" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="608141" />
@@ -54799,7 +54679,7 @@
     <Blob Hash="93ce8627038780cfff8c06e746dd5fb2b041115c" Size="240" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2022426" />
     <Blob Hash="93cfd3a03daf4aa459f8fd5ec1b461b869c8040f" Size="15056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1057832" />
     <Blob Hash="93d360d5960d5b7206af91fe2d7cccc3f5f2a329" Size="1072" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="541146" />
-    <Blob Hash="93d978f3ec7096489a27598b701765bd275b31cd" Size="3206" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1217149" />
+    <Blob Hash="93d978f3ec7096489a27598b701765bd275b31cd" Size="3206" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1661980" />
     <Blob Hash="93db4d64f66479084c974cdb8c18b5a689365dbb" Size="4304" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1570527" />
     <Blob Hash="93dbc95082794e79d1968e6f843833d72cdf7454" Size="1313066" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="8" />
     <Blob Hash="93dda6649c6088f26ac41ec35e6f040e8e80cd10" Size="10000" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="293400" />
@@ -54808,7 +54688,6 @@
     <Blob Hash="93e267a337578a2cd530852ae246f04052785112" Size="3744" PackHash="d55fd9dc88154de89726d225895d9986f2863449" PackOffset="2080557" />
     <Blob Hash="93e389047ae489d817cabc3b78f9773674a34d2a" Size="3483" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1110927" />
     <Blob Hash="93e49fd3359f3a9bd4ef4fc59fd57d3fe3c5d945" Size="216618" PackHash="bebbdbb60be5af7d028ddfaa2a719af3d6269dbe" PackOffset="1598452" />
-    <Blob Hash="93e4e081a556845b348ad99736ee95d126eb1005" Size="16080" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="2075366" />
     <Blob Hash="93ea52e9ac58314ba07b3af9e41c8053d4c24d97" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="271197" />
     <Blob Hash="93ee23528e22a948da06364a803f96bd8a339a5c" Size="98772" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="528474" />
     <Blob Hash="93eed0828152ac1da518a26a169d96187c8b92e6" Size="301773" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="1022053" />
@@ -54819,6 +54698,7 @@
     <Blob Hash="93f444afccac84db087358358bd49311d06c25e5" Size="2854" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="941935" />
     <Blob Hash="93f4c40c8534e6c0a3b4b1d2c82ced489c130acb" Size="141645" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="1521569" />
     <Blob Hash="93f559effb7a17938510bbf5d3c2a1dba10df0ed" Size="41314" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="1540800" />
+    <Blob Hash="93f940c07f7c2f63a4db6a2c517d2ac77a5468bd" Size="28175568" PackHash="68ed2eaaa9b5f79a6854d4377ea3571cb849a44a" PackOffset="8" />
     <Blob Hash="93f99545a88af5a08656a4096f6dd121d4ca13bc" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1046156" />
     <Blob Hash="93ff38abb2f7656f130bd02e2269e60304c33eb9" Size="9013" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="442667" />
     <Blob Hash="940545613e6a2dd06583b6caaf44718f56b1d34f" Size="6414" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="809554" />
@@ -54830,8 +54710,7 @@
     <Blob Hash="94148381e3c65d2615528d7088484ce7c1e1274c" Size="52736" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="1997320" />
     <Blob Hash="94182db19a493881f09930e204f09f872a8793d9" Size="231" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1353018" />
     <Blob Hash="941885e568911c86d5cede0b99c3808fe26b09bd" Size="2039512" PackHash="eb56d534d8ab6be49ba1a028e87ed68ba46e193f" PackOffset="8" />
-    <Blob Hash="94191481c0b3865a865ceeb00fe3a0255c8f6418" Size="257" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1600969" />
-    <Blob Hash="941bdc04d31331ac17aac4505118601cab13124c" Size="5863728" PackHash="599811c77e70af9449d1fd941e41f4fbcfd62982" PackOffset="8" />
+    <Blob Hash="94191481c0b3865a865ceeb00fe3a0255c8f6418" Size="257" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1720201" />
     <Blob Hash="942039076ea6aec60cab885d6549db7cd3c0caca" Size="8651" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2056536" />
     <Blob Hash="94293b7823a4769f01ebf6936c7d17742a869ae6" Size="1040779" PackHash="eb99415493e5381c13e50fa8f0489605564eb924" PackOffset="8" />
     <Blob Hash="942a3602a51504a20a2318a600041d7e373bf143" Size="17818" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1268809" />
@@ -54845,7 +54724,7 @@
     <Blob Hash="9440c512c45ec48fddfc45c1c8c548d52c69a63e" Size="260" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="828483" />
     <Blob Hash="9444b00d7f243071a512ff108c5b9aae402b6980" Size="5388" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="193236" />
     <Blob Hash="944642d880f7ee1fe87ed11ee5e9576367c60983" Size="1200" PackHash="f5a7447dfbc138217d1807bf84b59d6313ef4a0f" PackOffset="2095857" />
-    <Blob Hash="944e9cf891671edb18c25d8c54b825fa92f9b741" Size="8761" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1736460" />
+    <Blob Hash="944ca96c2c84f1fedaa5cf712b1b5a32dfbe857c" Size="7005952" PackHash="0414d9fee673d76a5bad897183d2322db10ad912" PackOffset="8" />
     <Blob Hash="9451e80a013070ab2becd3e09152561ff60afb1f" Size="107174" PackHash="410e46447d67d73c00b681403bff72bd1c8db3e1" PackOffset="1891040" />
     <Blob Hash="94551c5aed3e8c2c2550a6e801c9aa30b672c7d6" Size="2857" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="768843" />
     <Blob Hash="9455734600018b436d8042078309a6ad5941b274" Size="190236" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="1620027" />
@@ -54856,33 +54735,35 @@
     <Blob Hash="94613ec922ec34058e42be0aaf0fb014b24adf63" Size="392" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2096691" />
     <Blob Hash="946589f12c434a4f7a5238947677f109c3f3c029" Size="14672" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="391718" />
     <Blob Hash="9465dff1addef2c36cb50347e98c83eb4cfc2389" Size="738914" PackHash="dde49372548c3a3e8ad2d3301a2a954d4167a13f" PackOffset="8" />
-    <Blob Hash="94685410d856e22f70d4f57a0c2c4c45c81a8be7" Size="393" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1353667" />
+    <Blob Hash="94685410d856e22f70d4f57a0c2c4c45c81a8be7" Size="393" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1802569" />
     <Blob Hash="9468798ec9e0985cdc4a46fac0609be320b33172" Size="366" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="485820" />
+    <Blob Hash="94689c9b95f9d5aaf68bac127bc2d41c9c709c1f" Size="38971" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="1992168" />
     <Blob Hash="9469d620734a9f5299ec5dd0d91b25388124639a" Size="133453" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1334837" />
-    <Blob Hash="9469ec7122f53ff07be7ea20a4b7e2d124a57d74" Size="1088" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1322295" />
+    <Blob Hash="9469ec7122f53ff07be7ea20a4b7e2d124a57d74" Size="1088" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1771197" />
     <Blob Hash="946d8d247b73f23145bf059c7e3c1dcf9094e007" Size="476714" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="38251" />
     <Blob Hash="9472a389875fb36e79c16b410779d24455b3b6a2" Size="52188" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1901466" />
     <Blob Hash="947530b3983b223d173a1e4a9f7738a1ee3c9c0d" Size="3665" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1032307" />
     <Blob Hash="9477a58636b03ba077d89e5546197d388560c51b" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="631482" />
+    <Blob Hash="947aaca4e3db7ef6587368e74ca6373f713d0982" Size="77738" PackHash="3dc42e03b3cf9ab3705939d5eaf2bfcd770d2792" PackOffset="1937352" />
     <Blob Hash="947b0102a39f258c01b5b8a65c84432ade651ae0" Size="5312" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="732590" />
     <Blob Hash="947b015252db949c9afacca433cad3fef60ca6fd" Size="131695" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="1048199" />
-    <Blob Hash="947b62cce05eac7119455393a84b6614db358604" Size="4404" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2051864" />
+    <Blob Hash="947b62cce05eac7119455393a84b6614db358604" Size="4404" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2091148" />
     <Blob Hash="947d888eb5bb85d329f3dbba1baf1c3bc2babf6d" Size="18918" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="653795" />
     <Blob Hash="9481079ea22165ca38cce87c8c7c398178e95a86" Size="7870" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="688690" />
     <Blob Hash="9482fd0815e0b8b1812799f93604a24728faa9bd" Size="431" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1790892" />
     <Blob Hash="94839e8e5645be28841f7594b742f387696b17fa" Size="2870" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="272407" />
     <Blob Hash="948565177ceda048e6d6a8a229b37e640de37015" Size="192079" PackHash="adecd2c644904747c3cdc204c4e4d0c59ab35970" PackOffset="445022" />
-    <Blob Hash="9485d89ed29007fb7cf5fc7532060e83dab50486" Size="2497" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1158973" />
+    <Blob Hash="9485d89ed29007fb7cf5fc7532060e83dab50486" Size="2497" PackHash="0bb21cd291f2eac4434972c081154105a9672abc" PackOffset="2094404" />
     <Blob Hash="948747ed8e1ca3b4307e79adba30e886d9b08780" Size="262456" PackHash="27f4fe27631b740859066f5cdfdbf7ba0dff165d" PackOffset="8" />
     <Blob Hash="948a8a083cac65f8bad481d0828936fe3aaf8c60" Size="185157" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="156934" />
-    <Blob Hash="948dcc9b8bc0735598dc99b45ebf6e02ce207d83" Size="23652" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2068212" />
+    <Blob Hash="948dcc9b8bc0735598dc99b45ebf6e02ce207d83" Size="23652" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="1933206" />
     <Blob Hash="9491b9fa5272bab0f219023af5f1c83eced163c2" Size="6208" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1159443" />
     <Blob Hash="949a0de8efed0b12d36371751ac62fbe8aa6b7f4" Size="1880" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1480314" />
     <Blob Hash="949c50e06555d32ac397c4ec25ccba26db0ff8a5" Size="1324" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="436011" />
     <Blob Hash="949d08b69175dc5e85edd4b3e224b47dd71d694d" Size="21139456" PackHash="e86626e94d15c0d773d8a1a0ed336087b1304afc" PackOffset="8" />
     <Blob Hash="94a009bb6465a4d8e629171e79fc2c1cef996adf" Size="81920" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="1404424" />
     <Blob Hash="94a0eda66a7efad9b8b033e1ce6e8c2b4fedb2b9" Size="140615" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="1395317" />
-    <Blob Hash="94a32f321f06ad0eceeed0e72e76566e2285edef" Size="339" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2065655" />
+    <Blob Hash="94a32f321f06ad0eceeed0e72e76566e2285edef" Size="339" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2085663" />
     <Blob Hash="94a84d1951ddb69a57c5eda75e504f54701065c0" Size="188534" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="1898989" />
     <Blob Hash="94aa517e8ee4863d778216eb2ad5acdb7b82c2a2" Size="1313" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="246771" />
     <Blob Hash="94aa9f95c9ca583fb1373c38e25da20be704beb9" Size="615181" PackHash="242303d3de81eced62c855f4d06c4f7abe1e4356" PackOffset="775903" />
@@ -54890,6 +54771,7 @@
     <Blob Hash="94bceed23bc3324f96581195b77fa492609c7873" Size="12809" PackHash="4df09dedb5c89d210947d966cbedfbc6267aa7e2" PackOffset="2054471" />
     <Blob Hash="94bd666782ae81b1ca29bcfa61bf9db6bd61cca6" Size="12070" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1564954" />
     <Blob Hash="94bfa509542f5260b2c6bf63590967437c033f97" Size="9254" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1743299" />
+    <Blob Hash="94c298da5b3942a193ed47ebd496651e209e88cf" Size="12147568" PackHash="0277f600d93a301af9caf271d70e761511be43bf" PackOffset="8" />
     <Blob Hash="94c2a85329e3328ea1fcee677a300fed0a581a46" Size="1910" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="337074" />
     <Blob Hash="94c40c1398126cc2cf29daea244f7cc3a4b06fe3" Size="976" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="213220" />
     <Blob Hash="94c480ea311fc19ff51e31ab6b135420e89b4a61" Size="8074" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="145888" />
@@ -54908,7 +54790,7 @@
     <Blob Hash="94e4e8fa4647bb2919c58e83f71a4eb971c49337" Size="16141" PackHash="bde504e141af1b3d4487c18b5869aca6f206534e" PackOffset="2080169" />
     <Blob Hash="94e59708b9212044028663c9235fc1f4c69fa017" Size="10916" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1149536" />
     <Blob Hash="94eb23efd33bf1d949dd8204d0b369a144936ac7" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="158621" />
-    <Blob Hash="94ed138c0127060b9a65e6a34a9ba0ffc4722e12" Size="1398" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1383686" />
+    <Blob Hash="94ed138c0127060b9a65e6a34a9ba0ffc4722e12" Size="1398" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1503146" />
     <Blob Hash="94ee2d4df958fc969400ea2bed79810c6ce70003" Size="898" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="98116" />
     <Blob Hash="94ee96fae259d90c2fdf169dd95bd82b3171ffae" Size="198" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="155266" />
     <Blob Hash="94f031d045941efa048fca087f0019723b9e0ab4" Size="40" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="2097102" />
@@ -54917,7 +54799,6 @@
     <Blob Hash="94f6c31c6a60f597baced58877f54a324af5df7a" Size="1024" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="2095831" />
     <Blob Hash="94f83805d07ec05756793d2df6be0de578832453" Size="116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1468056" />
     <Blob Hash="94f9f899e920b5b730c4d17a35239616bf21813a" Size="1069" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="60593" />
-    <Blob Hash="94fa428d416e816d45689a0b4538a6d9d2467fce" Size="8057" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1643592" />
     <Blob Hash="94fbd0fee0593df027f3aea69446a0a1a7d601cf" Size="5970" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1337680" />
     <Blob Hash="94ff11a735d5ee416ec9bd15b7980dcabdc5e0fe" Size="4187" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2065529" />
     <Blob Hash="95031c4566201fd1506e6c38b0a1db09bbae396a" Size="6017844" PackHash="c1fb3ccd82459deb3a46b3c12f1ec6708a2b8037" PackOffset="8" />
@@ -54931,9 +54812,10 @@
     <Blob Hash="95108bd6693b3b1a192e750e29d5b57bf36a651b" Size="38884" PackHash="39751e99851beb7d0825e392704eb90eb4cb755d" PackOffset="2027967" />
     <Blob Hash="9512e788000cb831d152006622c81300c28dbcbe" Size="971" PackHash="10917aeabcd8089492835f6fdf0cc16d5545cb80" PackOffset="2096041" />
     <Blob Hash="951423549caca872f0c15e4b995fc4738c5682ea" Size="84" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2084636" />
-    <Blob Hash="9514350a6adcc9b5985c176caf61632419029636" Size="141200" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="1699906" />
+    <Blob Hash="9514350a6adcc9b5985c176caf61632419029636" Size="141200" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1930151" />
     <Blob Hash="95155e93e83ef83dec1d193b508950ddaa5cddff" Size="1173" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1834198" />
-    <Blob Hash="951679893002e53989dac3bf3b46bf04d6ddc816" Size="1574" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1597744" />
+    <Blob Hash="951679893002e53989dac3bf3b46bf04d6ddc816" Size="1574" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1716976" />
+    <Blob Hash="9516d6a2472788624b1a37604da6874f3252fdbc" Size="3538" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2061824" />
     <Blob Hash="9517f033d1dabe6b3fee000a243aeab962a9939f" Size="5277230" PackHash="19902950d7e54600a249ef6a602e33c20f772095" PackOffset="8" />
     <Blob Hash="9519bb867376db0913a77fa4198e58b0d1981749" Size="49664" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1574408" />
     <Blob Hash="952016a834480f414469a5a83ac504a6a4918994" Size="10173216" PackHash="33b9ce244ddc34bfb3d9d97fe15f97c9e13e130e" PackOffset="8" />
@@ -54955,7 +54837,6 @@
     <Blob Hash="954e28902c0df13f58c6ce26cc048461d299ce70" Size="128" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1521768" />
     <Blob Hash="954ec46cb9a0a65b8f2068cccaceae26c145e782" Size="731" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="19531" />
     <Blob Hash="955ab0585163c29273415f52ff9f3100f20df8de" Size="2129" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1476833" />
-    <Blob Hash="955af2dda42e1e248f59efef4bbbc931f496564f" Size="114944" PackHash="a1ae4592cfa3c36b6209520e0665ffa9280d2635" PackOffset="1838272" />
     <Blob Hash="955d689830e74950d442d5710a67301be82c6ba0" Size="7826" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1737584" />
     <Blob Hash="955e4e8e46ae03779430c1ff9e5ea8ae8e585440" Size="86016" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1811936" />
     <Blob Hash="955f433523da9c0259a41ec4b9a6266e21d4c5db" Size="155558" PackHash="b6e51c5ce4619cf24deb50699e19457246a65fde" PackOffset="1690182" />
@@ -54975,6 +54856,7 @@
     <Blob Hash="958f413dea173bb5231e32239a51704f8e60eb32" Size="2374" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="806610" />
     <Blob Hash="9592e0bc27fb535cae7e62ff000216dc53ea0f66" Size="7497" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1628786" />
     <Blob Hash="95935802e1432b68af953649cdae9fb142d046d6" Size="2713680" PackHash="682e3bde7db5df0d1a525d3a4489f1be5d04a5d2" PackOffset="8" />
+    <Blob Hash="9594c8291b302f525ad9f492bd9119ab0be9218b" Size="8722312" PackHash="0e7df8b0ccb5f633348a532eb430c875f3b4a6d6" PackOffset="8" />
     <Blob Hash="95976422ce66f237a768670bb983ec1bcea784a9" Size="38496" PackHash="79cbb1b9e1be7761c86eb45db23522dfc07e61b1" PackOffset="2057531" />
     <Blob Hash="9598784038525431df45a4354dff40019034ceba" Size="820" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="633303" />
     <Blob Hash="9598be555ed43aaf112979316f4994bb4b8c1c86" Size="3439" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="941326" />
@@ -54983,6 +54865,7 @@
     <Blob Hash="95a49e6f5dfc4855892f0644fbaee4e1149c7e8b" Size="2109" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="303817" />
     <Blob Hash="95a7c33aa148042e38cdadabe0fe4270446b5b7a" Size="2807" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1658845" />
     <Blob Hash="95a7ddad501e6e887ad578726514d4d457846cc1" Size="236" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="436154" />
+    <Blob Hash="95ac9954859d3b726aeb86ad688c9632f51a3002" Size="19041176" PackHash="0fcb9dd8080ea7151759b51f07bc9af583742e92" PackOffset="8" />
     <Blob Hash="95ad598e5c0553b3ce4fe3971031181863f95475" Size="22409" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="960063" />
     <Blob Hash="95ad96a2bd00680d4630b6f49e4b31a1791cc844" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="699681" />
     <Blob Hash="95adcacf6267179054532a993bed4af4e157f882" Size="1096" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1924416" />
@@ -55020,7 +54903,8 @@
     <Blob Hash="95ecbc94df12d9a2c2ecfe790840331d18cfb400" Size="3228" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="760942" />
     <Blob Hash="95eda2449a277e0f9cf121d52ee2a5fe4cf83a70" Size="27716" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="490990" />
     <Blob Hash="95edcef060e1885fdd33f228004109acea8eb312" Size="53310" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1567423" />
-    <Blob Hash="95f99920634e96dacc1c3da6c4638ec76dfde6fa" Size="4547" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1797184" />
+    <Blob Hash="95f6802d58a78a41ad1604960b54c54b0a69bfc3" Size="2157" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1809917" />
+    <Blob Hash="95f99920634e96dacc1c3da6c4638ec76dfde6fa" Size="4547" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1916416" />
     <Blob Hash="95faf5007daf8ba712a5d17f865f0e7938da662b" Size="21184" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1306536" />
     <Blob Hash="96026b472234a45496e2b2f61e08526670a01aa1" Size="349" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="174902" />
     <Blob Hash="960b23609e30d7f5f27b9d3406fce57a6912e8af" Size="2172713" PackHash="61a4313e93aab82bab5da58a1b601aad41ecbd60" PackOffset="8" />
@@ -55035,30 +54919,30 @@
     <Blob Hash="962476cf6260f8334eeaaad6b22c0473d39d3e42" Size="60748" PackHash="d5300790dac3cc619f89851b34f424d123202d88" PackOffset="126316" />
     <Blob Hash="962650a60b35199e60e70c0c586cb21b113e3c8e" Size="1011680" PackHash="239a3f6397716dd1b1c6bdd2d73cfd2a4b590698" PackOffset="105017" />
     <Blob Hash="96275f8a08679e6fa873c1fd30e25ff874124f3a" Size="189667" PackHash="39094453c710536eef32c9e4bc7ae6d6a32fcca6" PackOffset="348482" />
-    <Blob Hash="962a51e2409174bcc4fe7e3e7e4b29b2ed85a78c" Size="2410" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="2094392" />
+    <Blob Hash="962a51e2409174bcc4fe7e3e7e4b29b2ed85a78c" Size="2410" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2028114" />
     <Blob Hash="962ca310a6142f45b9e18f0ce33dc97ebd64859c" Size="180" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1895952" />
     <Blob Hash="962ce984488690b90de34e13c7786eda2e6abaf1" Size="10040" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="202088" />
     <Blob Hash="96306448cef828df6471ef1c6131f80ca4814e7e" Size="6234" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="148699" />
     <Blob Hash="963643324064ed3fbc465410f1e6dc4a91ec4200" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1998427" />
     <Blob Hash="963b095e88ad1c680f13345de026294bceb793fa" Size="17630" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1317252" />
-    <Blob Hash="963f175c215851157359bdceea3e0da39b5019d4" Size="4152" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2044911" />
+    <Blob Hash="963f175c215851157359bdceea3e0da39b5019d4" Size="4152" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1908744" />
     <Blob Hash="9644e05e0fea82067da60274c07e5a3c98241890" Size="11310" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1835689" />
     <Blob Hash="964738dd7d4477fe5e9668cbc96ab5e7e4a324cc" Size="5957" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="2089560" />
     <Blob Hash="9647a40b5b7e1a02facbd8dff35ae5f6bc5e895a" Size="264664" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="1073020" />
     <Blob Hash="964a3ed86a5246ba33cd073e3996516592b8ac40" Size="456690" PackHash="47a24faf38e342e9b79c9d6aaf80968b8bfbb732" PackOffset="114941" />
     <Blob Hash="964bdf8286496cadafed96eb48a5789647224775" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1072608" />
     <Blob Hash="964c5e1bce6e69be155f888020a823e3b378e6cd" Size="3187" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="163771" />
-    <Blob Hash="964ce1f12c49d281463044fc00be562718c13c79" Size="5214" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1986230" />
+    <Blob Hash="964ce1f12c49d281463044fc00be562718c13c79" Size="5214" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2044786" />
     <Blob Hash="964d93f3297d192225871c955a1e8d140ab93a25" Size="32" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2096925" />
     <Blob Hash="964f0fab905cd7b8f29da0e07cae54b7dc697087" Size="2095" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="305926" />
     <Blob Hash="964fd73bb76c586c0f44b1c89e36430e9ab7e4fe" Size="564348" PackHash="4abf0595e4706e434b909ea697e6e34737cc2bbe" PackOffset="543504" />
     <Blob Hash="96535d5322f5a1e7da57129236ec1867ad646d00" Size="55381" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="808746" />
-    <Blob Hash="96542b710d967186b0b8883b801849959c67b73b" Size="413126" PackHash="56cc39ae2312d22dae41f9f071a254171eacb7a8" PackOffset="1489620" />
     <Blob Hash="96567a43f1f369c6741c9e76e3c435f99f84dc75" Size="83670" PackHash="8c09749d3afbe4cf42116bc13197f82a95638859" PackOffset="8" />
-    <Blob Hash="9658985309375cc9747690011bd9eaf7cb8c0c90" Size="174" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1601571" />
+    <Blob Hash="9658985309375cc9747690011bd9eaf7cb8c0c90" Size="174" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1720803" />
     <Blob Hash="9659f312a5a2e01ab16b313009d69c0ff5637946" Size="22" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2096999" />
     <Blob Hash="965dfbfd7c9dd0815ba9cccd26d773b52652f161" Size="2819" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="407174" />
     <Blob Hash="965f4555dfd855df4977b141a03ba0f8d25038c6" Size="758722" PackHash="00a2060a3d609812c1b991f97d3c39bd6b848134" PackOffset="8" />
+    <Blob Hash="9664f5f95e0702a857a7bc73a9caaf0f0d6f4a2e" Size="1029" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1741307" />
     <Blob Hash="966de5804c1393dd566e6731d6360d4c095c2e00" Size="4921" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1546446" />
     <Blob Hash="9673f7af52d462d1b5b6f7a38e54199dfb2fb359" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1745150" />
     <Blob Hash="9676835dd67b268cc9b200bd5cc01f24bf531b16" Size="62821" PackHash="649510e32193d4eb9d3af2ca954f0a74f5f6cb86" PackOffset="1410540" />
@@ -55071,7 +54955,7 @@
     <Blob Hash="96853540ccfb068421cd957839acf3c7ccd39273" Size="460992" PackHash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" PackOffset="1517240" />
     <Blob Hash="96857382c90d1660e28bb575573f2bd55c09a334" Size="2713501" PackHash="fbd50b40d8703e6c070b87beb5944fd1e85d8734" PackOffset="8" />
     <Blob Hash="968617f516a35278b6b9d64b99fa1852ff0ab3a9" Size="126735" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="1820482" />
-    <Blob Hash="968729c118cf8a08effa90c205481990909b6b40" Size="704" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1594256" />
+    <Blob Hash="968729c118cf8a08effa90c205481990909b6b40" Size="704" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1713488" />
     <Blob Hash="9687c478fc6803f4ffca125d921df821181b8e75" Size="8330" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1869518" />
     <Blob Hash="9689d525ad300abbd62d5e67c47657880ca0ded4" Size="3829" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="511882" />
     <Blob Hash="96919172eabf35d276a5f0fbeb828a4db2024fa8" Size="29062" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1271353" />
@@ -55085,14 +54969,13 @@
     <Blob Hash="96b4c790f74d65093183aad994a16612fb6d1cd4" Size="419" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="449783" />
     <Blob Hash="96b59e468f754cecef5015fe2f04067fee97e7a9" Size="5774" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="486406" />
     <Blob Hash="96b81212db02854c6b3165feb8d19db38c885e71" Size="4637" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="574822" />
-    <Blob Hash="96bafa357615c5972a173d3a90d12efabc394abd" Size="60" PackHash="6710131a0c8f30edf9ebb05674940bf4e30c0756" PackOffset="2097067" />
+    <Blob Hash="96bafa357615c5972a173d3a90d12efabc394abd" Size="60" PackHash="b1a351d5f985ab81914a5689b7a81228833ee48a" PackOffset="2097086" />
     <Blob Hash="96be6371409309d38ce0e75f248c7f8686bd83e0" Size="13756" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1057914" />
     <Blob Hash="96c54de0147a626240f2abcaed6667448b49537a" Size="2956" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="59900" />
     <Blob Hash="96c6d0370bf2fc3e41c3874a71d691468013a675" Size="9073" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1824493" />
-    <Blob Hash="96c8da0fc00ad304dd6e53bd4db8adb5f00a33cb" Size="2420" PackHash="922fcb527d5d2d92d1f5fe1e17450b8b306d3b7f" PackOffset="2090480" />
     <Blob Hash="96caeb7826a3cb73cecc5968ded29d9033356f89" Size="96" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="2097040" />
     <Blob Hash="96ce475a765cc6a4633ef2bb9affacbc81a19518" Size="14978" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="544029" />
-    <Blob Hash="96cfb488e6af8d04704b63ad61b0e2c2660956c7" Size="3450" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1992738" />
+    <Blob Hash="96cfb488e6af8d04704b63ad61b0e2c2660956c7" Size="3450" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2051294" />
     <Blob Hash="96d0a64bc03c095bd1858be948d567cc7730128c" Size="8665" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2050732" />
     <Blob Hash="96d161f9ac86ef32376d45349e411c9a76607bf5" Size="38157" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="993206" />
     <Blob Hash="96d3390fbafb8eaaeba2f162fdfd8479a6c783d1" Size="128674" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1784389" />
@@ -55102,7 +54985,7 @@
     <Blob Hash="96d5c63eb5f43c89540e714e5ca1fed6ff6573d9" Size="117759" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="281004" />
     <Blob Hash="96d9e7e2ce410e0404e03a66d618dd1d735b3642" Size="6222472" PackHash="8d274c2369d90ec82c834f17356669522991c64c" PackOffset="8" />
     <Blob Hash="96db8d40d8ea04cc7bddbfcceccedac901a37b45" Size="159" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1452297" />
-    <Blob Hash="96dbceb82dc1f9c9a61a3f06a862883033ee9cd0" Size="1232" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1410094" />
+    <Blob Hash="96dbceb82dc1f9c9a61a3f06a862883033ee9cd0" Size="1232" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1529043" />
     <Blob Hash="96dc23da88042676d17a20e3d4f23926790b3e1c" Size="209" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="393068" />
     <Blob Hash="96dd40ae28741dc070484bddca3f795fb3b5ee30" Size="5551" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="708149" />
     <Blob Hash="96de2e5c2d8ff62593f312c553d4dc5a1d64f5cc" Size="7680" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="61198" />
@@ -55131,6 +55014,7 @@
     <Blob Hash="9715869b9f08ab740ed3cbb9d8672c8f19033883" Size="313384" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="802644" />
     <Blob Hash="97159750d2a1d50cb1f8e64c2abe00786387ff5c" Size="824" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2068677" />
     <Blob Hash="9716f0d1d7a4cc5aac177fcbb2b805fe5dab3e8c" Size="13977" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="760696" />
+    <Blob Hash="9717043b2248d34142f30f3ef5b527aca7f0b991" Size="3337128" PackHash="2f1fff504ba4cf954b13543f99feb57dc6d9003c" PackOffset="8" />
     <Blob Hash="97184e133f1ef1995675d41f3fd2cc931caaa080" Size="55682" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="974084" />
     <Blob Hash="9719d39d465dd04dde0d4d0e4cf77fe5945bdd3e" Size="222324" PackHash="d9cd996ea5042b0d08c555ef2559111b5494e3a1" PackOffset="1820098" />
     <Blob Hash="971a596025495dbd72d50d37365c31fe1ebe2b41" Size="34701" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="166736" />
@@ -55142,12 +55026,12 @@
     <Blob Hash="972d8f2d5137de869592831a4968976a935e89f0" Size="25209" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2044229" />
     <Blob Hash="973194b976cb77c1d0bc3244b4bc9cd7970c5e2a" Size="37" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2086365" />
     <Blob Hash="973195ba693838059462b9aac74e5c40cf50ec41" Size="8164" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2077700" />
-    <Blob Hash="97325ac07461146fe1d31005dbdcbe8ffb5059a1" Size="10895" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2080323" />
+    <Blob Hash="97325ac07461146fe1d31005dbdcbe8ffb5059a1" Size="10895" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2075787" />
     <Blob Hash="973414cc93bfc34612651b505bab4fddf028afb4" Size="3382" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="806793" />
     <Blob Hash="9736029d2c00c6c43c15aeceed2cdc10da9aa00c" Size="7708" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2058154" />
     <Blob Hash="97371bfa4f006d69bdb46e14ec8709a07e7bb481" Size="21056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1015720" />
     <Blob Hash="973743332b32cc0f91df9b8bf7c7adf602e1e795" Size="4115" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2090872" />
-    <Blob Hash="973b3ba05ff78847701c2bc9657a89a36eb7a88b" Size="802" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1441844" />
+    <Blob Hash="973b3ba05ff78847701c2bc9657a89a36eb7a88b" Size="802" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1890897" />
     <Blob Hash="973f1786f7a1e823ca89185192485dce91ac81d4" Size="7654" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="228770" />
     <Blob Hash="9741df65390b3e7e70e15a5cd77c58387929c2d2" Size="3128" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1555372" />
     <Blob Hash="9742e01eaa069461079e75a3fa5729f7cca2b270" Size="17941" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="154437" />
@@ -55160,13 +55044,12 @@
     <Blob Hash="97558a51a6dd6c56fc7a42a4204141a5639021fd" Size="83890" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="312860" />
     <Blob Hash="9758777f10c981d371a2d232c40b483d45a6a655" Size="247" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1146868" />
     <Blob Hash="975994a865c9ca0df0b88aac08054aba9856f967" Size="524" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1311465" />
-    <Blob Hash="975c036e8ba74a05770269a56c5df179e9862475" Size="1056256" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="8" />
     <Blob Hash="975c8ef3a1c09cf5e2f08bb71b8b30caaa35c541" Size="13016" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="985536" />
     <Blob Hash="975d0305e7ea5d73e8fdb00e1d4910ac4015f2d9" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="813105" />
     <Blob Hash="975ed7ac83f5f8aa68ff226f3debe4e94bf96eaf" Size="5377" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="1990720" />
     <Blob Hash="9763b22c9f1988ac9bc313f63cc45086ae8e06bb" Size="29472" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1056912" />
     <Blob Hash="9766be8304b48f09d7d97e07934ae3a48ad2c0aa" Size="1544" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="76693" />
-    <Blob Hash="9766d9a26ef4cd4f29dc7577445e25362553fba1" Size="4584" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1126839" />
+    <Blob Hash="9766d9a26ef4cd4f29dc7577445e25362553fba1" Size="4584" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1894320" />
     <Blob Hash="976aa0a5f625be43d88b07346290eb588ad24a40" Size="2355" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1948582" />
     <Blob Hash="976b5b5b8078bd05e78fa413cf74dde5d040809c" Size="74022" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1669708" />
     <Blob Hash="9771a9be8e52efcb1cc16d63582a73e2c13f47fd" Size="32" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1689460" />
@@ -55189,7 +55072,7 @@
     <Blob Hash="97927734cd6cc32083cf753f016cc5cc63307351" Size="121775" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="538643" />
     <Blob Hash="97938ebf015ad508af9ede5aa3dc10094ce2d387" Size="5327483" PackHash="c57259f627108af7691176d6a5ab0a8bdb504fe8" PackOffset="8" />
     <Blob Hash="9796002ea0b78b52ffc4438bb7b4fa1508920ab2" Size="11582" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="439783" />
-    <Blob Hash="97960e121f69031b1269eeb4aa64f2072a9a6405" Size="2944" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1983286" />
+    <Blob Hash="97960e121f69031b1269eeb4aa64f2072a9a6405" Size="2944" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2041842" />
     <Blob Hash="979627fef736de553c5aa0169720b04f85150111" Size="2811" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="784469" />
     <Blob Hash="9796e500d99c41c2a6e1b4269a8dd4fdec277345" Size="24386" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="701616" />
     <Blob Hash="9799c6e63b1166853178b2d495dee4aa5e8f217b" Size="3127" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="1008820" />
@@ -55197,6 +55080,7 @@
     <Blob Hash="979b4653f7a892cb27a587729fa16fc9e8f92a2d" Size="41984" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1067034" />
     <Blob Hash="979d74ef3b61f45c60eea1436ec5baddfd60ca66" Size="7974" PackHash="fa48ff18c8bfe5de58cfd0b9f5fc9ff52ec1b1da" PackOffset="13658" />
     <Blob Hash="979dddf323c7885721dcacb2427e7471d68c2af7" Size="428704" PackHash="cfaa6e2212f937f340e867175482030d495675ed" PackOffset="1048487" />
+    <Blob Hash="979f745e9ed9d96fc3f033a491cce660000875b6" Size="5966024" PackHash="d8fcb3b473b76bac6739d947ade4f5461bfdff28" PackOffset="8" />
     <Blob Hash="97a0ccc9424dd3260cf352634c614e548a29c76a" Size="10920" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1942884" />
     <Blob Hash="97aa79e6384421616a59b0c4d9152a83c76ce931" Size="14005" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1607690" />
     <Blob Hash="97ad9455c08c650b4cba8864aff49219d80f1aa2" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="716820" />
@@ -55215,7 +55099,7 @@
     <Blob Hash="97d62a3bf9707d1057a97ba5da16a59689d187c1" Size="582513" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="1269605" />
     <Blob Hash="97d6d1d1d27ce7eabd81b7798a1e745454124e87" Size="23760" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1858456" />
     <Blob Hash="97d8d144653928f2514ad102fdbd1170f3b81b05" Size="844" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="123027" />
-    <Blob Hash="97d907bdf795d3123eb19c35ce05753b02de1a87" Size="49803" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="747670" />
+    <Blob Hash="97d907bdf795d3123eb19c35ce05753b02de1a87" Size="49803" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="1815560" />
     <Blob Hash="97dbaa714647d0912b2eaf671fe70bee87c25c99" Size="4836" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1246021" />
     <Blob Hash="97dc746869010a43a2008fbff66d8bcae21364a0" Size="1595506" PackHash="06f561a38764b8e9c4087a97ed512c995363927c" PackOffset="8" />
     <Blob Hash="97dcf3f0574272a3089350f04524aa8e25e86023" Size="2916" PackHash="9925ec5c177c6bf6faada1514039ed1b19874a51" PackOffset="2092901" />
@@ -55248,39 +55132,36 @@
     <Blob Hash="9809d93938185ef952d7056c4bd50c8e11ac7e78" Size="3122" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1281975" />
     <Blob Hash="980c770964e71760767ea39b855fb9ad1db60aa7" Size="96297" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1269205" />
     <Blob Hash="980ee38ae0de1a4f1070ab1594f648610434f8a5" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1921506" />
-    <Blob Hash="980f7d8aaf6a84b6701b0592787be5fac056f9d8" Size="382" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1610900" />
+    <Blob Hash="980f7d8aaf6a84b6701b0592787be5fac056f9d8" Size="382" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1730132" />
     <Blob Hash="980fabfb563bec4351eefb512e2f0741e8ebc120" Size="95120" PackHash="f38889741341129aaa57f66f2c36e093673c46ea" PackOffset="1775297" />
     <Blob Hash="980fc2e53aa61354021c115e5a02774e0d9414a1" Size="9190" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="407633" />
     <Blob Hash="980ff45d2d414a3fea398ee3acb84307998a1686" Size="2696" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="457888" />
     <Blob Hash="9816215d535625567b814bfd6a1ec562b3acd6df" Size="9851" PackHash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" PackOffset="1632822" />
     <Blob Hash="9819367d00c931b82dd649d47357d8749036c30d" Size="7956" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="425311" />
-    <Blob Hash="981a73ab619741d7a5ba44123916ea73f1d4eee6" Size="856146" PackHash="495a03cfec4638fdaa630d336ffc1650693e7422" PackOffset="1178074" />
     <Blob Hash="981d9d60e6af0944df2ad1eca2d8fbc26cfaaec0" Size="192" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="432228" />
     <Blob Hash="981f7ddad47a3efe7642965433f63798a4dfec74" Size="27252" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1912480" />
     <Blob Hash="9822a993489d3bb276779fa2fe0900cdc3f0526c" Size="266" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="371849" />
     <Blob Hash="9823afc9b5340b092f6444240239fa27d184b0b1" Size="176576" PackHash="76b81db67f411f1be2b6675587a81eedcdbfaf5d" PackOffset="1883492" />
     <Blob Hash="982652ea2b0dcfbb55970e019a4edfbfcfaf9c24" Size="95451" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="396750" />
     <Blob Hash="98271f310fa237ddd7d50436813266e57a31becf" Size="2469" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="470296" />
-    <Blob Hash="9827ceea53a0a32bbbd89992380130363d48f71d" Size="29244232" PackHash="08c816f43c0cb7bcf6836a7f1c940b5b2423e7c1" PackOffset="8" />
     <Blob Hash="9829e67e3e9a9938c9be0efcfea83be2c89f5945" Size="268" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2096840" />
     <Blob Hash="982e747ceb2f1744451ea9e2ade49cf1b943dcc9" Size="320" PackHash="c7abd8711d268ebef7f39b9803a39439bb5ce0a5" PackOffset="511" />
     <Blob Hash="982ee6a5722e5158ada9e7063d79a4a3cdbc693c" Size="94151" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="1954430" />
-    <Blob Hash="982f107a13f0e0f3a543c48036cc629065fe109b" Size="2289775" PackHash="8942901664b007a5a3bbb800b8c8bfbea75e58b9" PackOffset="8" />
     <Blob Hash="982f5b7b4f9fe1079db69267650d394d46c14c88" Size="156" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="431136" />
     <Blob Hash="983697683971257781916016fdeec5f6334c32c7" Size="8478" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="596329" />
     <Blob Hash="98374b33f4eb4bd30712c7edf82e287166ba47ed" Size="12024" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1676616" />
     <Blob Hash="983e6a817f3d7fb45ffaa3adf054e552aba30211" Size="83338" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="403926" />
-    <Blob Hash="983ea3648db72d52031fa091334e6ee01deaeb67" Size="18917" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1749480" />
+    <Blob Hash="983ea3648db72d52031fa091334e6ee01deaeb67" Size="18917" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2014830" />
     <Blob Hash="983f25dfd4f088cff36370299a0d18c50735904d" Size="5778482" PackHash="092a98fe048603057c7b16dbd12904011b94944d" PackOffset="8" />
     <Blob Hash="9840eb7233704a989ba3829d4c4bbb35b8b43292" Size="139657" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="928690" />
-    <Blob Hash="984738645c3c5cfad1ee96d0e5b0e3d4a495475d" Size="124454" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="1941733" />
+    <Blob Hash="984738645c3c5cfad1ee96d0e5b0e3d4a495475d" Size="124454" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="1635045" />
     <Blob Hash="9849a35fef1d6f727a7cdb8af8dd101c1060862c" Size="59009" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1117384" />
     <Blob Hash="9849dc7b3fb65bb1d98923b686735775f6e73986" Size="140246" PackHash="f279ae70e30f66de7b592409e9ed96993301657f" PackOffset="1268883" />
     <Blob Hash="984a56c1a74a0f84bcbea224e49910d9ea60ad48" Size="1964" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2092349" />
     <Blob Hash="984d404f51610bac93f984ab1d8b3776a97210cc" Size="4004" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="2063451" />
+    <Blob Hash="984eb310e10eb319041c2bbb1f80c6339ea8048a" Size="39465126" PackHash="5c993863d36b0e2f71b958b3a7d6bdeea50768e4" PackOffset="8" />
     <Blob Hash="9852a5ed5a3e9ce9cc399e90f4a87bc76e104701" Size="418" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="262004" />
     <Blob Hash="9852b6d6703f2a37b30114312c315c38c9d276c0" Size="906" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2074848" />
-    <Blob Hash="9856f700ab8ca6cb5c18a0df6c6214b125733ab4" Size="11200512" PackHash="0fa808b34bb2d9578d8db45574b5e9bc3482928f" PackOffset="8" />
     <Blob Hash="985af62ab498022a0f2a653f823111ee9c2df2a7" Size="88" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1682092" />
     <Blob Hash="985df00233a7b5abede1521109c2a7f38c239da8" Size="2673" PackHash="b7a60e51b3072b670c205b0a84b7d90584154d19" PackOffset="2091234" />
     <Blob Hash="986ab26c122b9aaf0cd78d7a9bd1f49693207be4" Size="464" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1563006" />
@@ -55298,7 +55179,7 @@
     <Blob Hash="988311b71498591425c63669dc3f802f270b2c44" Size="153" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="557968" />
     <Blob Hash="988371ce1f8d24f2d8f16908295ef57f860855a6" Size="1244" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2094664" />
     <Blob Hash="9886259aa201979c1e3b14cf7ff8c46abb4eaa70" Size="907" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2095870" />
-    <Blob Hash="988ac5eda8565f3cb58a69c526f2a6c46d786ad5" Size="348682" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="1604400" />
+    <Blob Hash="988ac5eda8565f3cb58a69c526f2a6c46d786ad5" Size="348682" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="1612052" />
     <Blob Hash="988e4736e4cd6e2094c11890bf45cac1e20d1105" Size="103122" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="869560" />
     <Blob Hash="9891568a270cfd3afb87df11932e5de2b8cb7f98" Size="30524" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1219379" />
     <Blob Hash="9893b81846498e67dc25c33934f5e536371fc930" Size="2920" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="645666" />
@@ -55306,6 +55187,7 @@
     <Blob Hash="98955d226bff7fb5581c52cff5e71a6474bd5eaa" Size="2954" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="95578" />
     <Blob Hash="989828a28932002475b49270de60b1d2003bc19e" Size="148791" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="8" />
     <Blob Hash="989adbdbcbb542198a3249d99af2b1ab816d2520" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1848485" />
+    <Blob Hash="989c5c1c8b69f1a2547ed10f3ab0e65425b25315" Size="213504" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="1820764" />
     <Blob Hash="989e9a6411ab51c020da01796687356ee124d10a" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1170210" />
     <Blob Hash="98a03e73f282e5d7355faecda28667a053f17231" Size="1729" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="378324" />
     <Blob Hash="98a0a057a8e76180b145e8ee605e59c4b55df532" Size="5591" PackHash="ac2c77918f717b39f4343aea48946b7781301f55" PackOffset="2070876" />
@@ -55334,8 +55216,8 @@
     <Blob Hash="98cd47afc1e5e21fb6b82c4b922329894cb2698f" Size="2843" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2093870" />
     <Blob Hash="98d0b93b07f354f9b1b83ada80ca7a3d3d293242" Size="10104" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1131376" />
     <Blob Hash="98d329a427902a197749505fd16a45d0f3a5d911" Size="11454" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1891343" />
-    <Blob Hash="98d3c21b0a7590e0a03af2c3a5e64b137f495e3c" Size="109632" PackHash="518b018d2f4ec622333a18fbe864ec2261d3e119" PackOffset="1979282" />
     <Blob Hash="98daa71c32b7d27dd9463b36de9cebab3f2e5e2e" Size="237638" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="342862" />
+    <Blob Hash="98dac36f7cafa45e50313156048ba53ef54895c7" Size="114256" PackHash="c8ddebf16ba503b310defa7482c547daaf42bea8" PackOffset="1929550" />
     <Blob Hash="98dd7cec8dba8954ea589a5bc6970135d37893a2" Size="125" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="2097022" />
     <Blob Hash="98dde3ccf1bf3225a771fb1d6c16dc7005b6290d" Size="364516" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="454857" />
     <Blob Hash="98e340226fec640613ff20e47216dd794a619739" Size="5076" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1759363" />
@@ -55348,7 +55230,7 @@
     <Blob Hash="98f3f7fedaf8a6e77effece7d83af5811dc60462" Size="1538" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="486186" />
     <Blob Hash="98f490eb0bdfc4f7977b653385481244aad11d21" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="193191" />
     <Blob Hash="98fb695be2067706b323bf53b6abbb2beab212c0" Size="83412" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="1877816" />
-    <Blob Hash="98fba9023a88001e731b38ecf5a41c9d4b26e712" Size="1296" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="2095853" />
+    <Blob Hash="98fba9023a88001e731b38ecf5a41c9d4b26e712" Size="1296" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2087155" />
     <Blob Hash="98fbab3e3313ed0933e35743e5987f874b8aeb90" Size="12024" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1025716" />
     <Blob Hash="98ffb3124ead77bbc08d609d936b64b50229ef97" Size="1320" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1902918" />
     <Blob Hash="9903616ac08ded8cba6f8b5dcfad0e1a8c81cebb" Size="37115" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1164668" />
@@ -55358,11 +55240,10 @@
     <Blob Hash="9906713e3c045bfb3b8a02fb2921fcb5f1b95023" Size="5250" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1053970" />
     <Blob Hash="9909031309d6933b6167926858361ad5d9f45423" Size="3715746" PackHash="77e0f90962f8cb6d602407097737ded66709394e" PackOffset="8" />
     <Blob Hash="990a683cf1ddf67850beaba6866fc07b39dfafe5" Size="34134" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="271417" />
-    <Blob Hash="990a93c45a64293fb3af68d4718b9fd0eb99dd3d" Size="559540" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="1447178" />
     <Blob Hash="990d9141922dca7f36b4cb2acddcda5ae5ec05b5" Size="8303" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1104487" />
     <Blob Hash="990e7f98a7bad86a40b1f0bcfeb039023afd0839" Size="19096" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1999830" />
     <Blob Hash="99102aedbd5a2b819c94499863f20adf6aef3241" Size="49639" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="290702" />
-    <Blob Hash="99167c6023bd9eedc0f1c609364e93f708c990be" Size="147" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1444134" />
+    <Blob Hash="99167c6023bd9eedc0f1c609364e93f708c990be" Size="147" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1893187" />
     <Blob Hash="991cf716f680cfc82e08b28e54e9322e3873e8f5" Size="808" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1727327" />
     <Blob Hash="9922155a6497238d773b9e5582fedb782d2e2459" Size="889" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="2096229" />
     <Blob Hash="99255d64f2a913fc9dbf5d4278aeff1a2a8bbe28" Size="48576" PackHash="6800c550338fea7b195e2b332127959f20c7d3fe" PackOffset="1988508" />
@@ -55380,21 +55261,22 @@
     <Blob Hash="994a3d3a7f581276cb9f23a66ee51414ea89a606" Size="4763272" PackHash="92ccd2c4badedc5f7d093311bd808464a1503efe" PackOffset="8" />
     <Blob Hash="994b9a6f2a37e2140874837ed53475e127aa3a5a" Size="792394" PackHash="705d483fe64b1f9075c585950375f4e0bdf711ce" PackOffset="1060836" />
     <Blob Hash="994d9dea2aef10320a2d4f1181ef23149ea224cc" Size="29272" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1030277" />
-    <Blob Hash="994fc6e894f41f32160956496a61f8514bb7b62d" Size="523040" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="8" />
+    <Blob Hash="994fc6e894f41f32160956496a61f8514bb7b62d" Size="523040" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="239624" />
     <Blob Hash="9951e62c61568d9c4de0c87d876464f2d271d40e" Size="2645" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="919528" />
     <Blob Hash="9956497e223aaaac42b633cc93dae1a66c41f4e7" Size="167" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="2096603" />
     <Blob Hash="99572be777b22f283a17a148f95ae0854146e0c0" Size="2161644" PackHash="5c5a80214469f8f4a5f2be87138d17f14263d464" PackOffset="8" />
-    <Blob Hash="99576bd15c90a7cc512b0d795fa9a35da826f7ba" Size="1453" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="2095617" />
+    <Blob Hash="99576bd15c90a7cc512b0d795fa9a35da826f7ba" Size="1453" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2095704" />
     <Blob Hash="995b643f5478707d054ce70d8b5dca9a11cbb031" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2097115" />
     <Blob Hash="995c6c62bb11b2fabb6f42e72caf8701450d38a9" Size="141707" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1884082" />
     <Blob Hash="995cc42ee572ddfc92b6ac19876ec9373baf3d5c" Size="145626" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="123402" />
     <Blob Hash="995f5e7137e2448c28bbe8a4074f1414dea4fb71" Size="1139416" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="8" />
     <Blob Hash="99601e7b8b52da369e13eef04b842d444f7cfa98" Size="3820" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2087900" />
-    <Blob Hash="996037a57e183361d675e7e9fe54e8fc718017d5" Size="614" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1466050" />
+    <Blob Hash="996037a57e183361d675e7e9fe54e8fc718017d5" Size="614" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2003132" />
     <Blob Hash="99612fdbab62d456b2ba14383a7b929c0b719aab" Size="4112" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="2073714" />
     <Blob Hash="9963b5938fca531dc29aa8bd4a7dc8347a718a3b" Size="258336" PackHash="b057ac2c230db468bbf6c00e375d15f9e6b3c3cd" PackOffset="1820164" />
     <Blob Hash="9966f2a2981d5081419da5b79917308c9a030686" Size="556" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="558071" />
-    <Blob Hash="996cc43e70535ebc01747a79cfcf9194a3112760" Size="2234" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="998897" />
+    <Blob Hash="99693f30327f6e1ada099b300fdf927cf9a2b236" Size="3394864" PackHash="73c2e3823253fb7d495dc337fccae328d9f73ac5" PackOffset="8" />
+    <Blob Hash="996cc43e70535ebc01747a79cfcf9194a3112760" Size="2234" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2046414" />
     <Blob Hash="996eee0d2eb98ec973061c405dbf29d06788a3fc" Size="843" PackHash="2c2c9afa8ee1f419854c4570a760788b2aeac7d4" PackOffset="2095305" />
     <Blob Hash="9970156185768e2e41b31136875f20c7b08d7604" Size="14951902" PackHash="71f99ea65a194123130d3f8b5629bcee3d302375" PackOffset="8" />
     <Blob Hash="997073892fd36efe3f2763c613008c8bd41e45de" Size="21767" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="1152317" />
@@ -55411,14 +55293,12 @@
     <Blob Hash="998aed3053e8dceb866c2870bc14c8f2fe169559" Size="162349" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="8" />
     <Blob Hash="998c30105bad2ecfdd65e59623c009d183b1704a" Size="27465" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1411474" />
     <Blob Hash="999144a215e075c01d375d52441140128e329cb3" Size="2589360" PackHash="647561c70ae7414867a83da1dd02a36bb4e3315a" PackOffset="8" />
-    <Blob Hash="999311eca15e288ea4968d8126a5def9f27de52b" Size="67354" PackHash="3f51332114ca5aedc3ab7920c6238f9dc6912e29" PackOffset="1974150" />
+    <Blob Hash="999311eca15e288ea4968d8126a5def9f27de52b" Size="67354" PackHash="344190ba3bc0e09a4f0f7283782da8cb56b6a794" PackOffset="1977256" />
     <Blob Hash="9994b60bd21cf4ce2490df0d00757be4dd9e1040" Size="6185" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1893186" />
     <Blob Hash="9996bc54bdb35c16f80df38f84c204a84052d201" Size="120947" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="1425268" />
     <Blob Hash="99987bdefbafddf33fa941ee6ea4fdcdab1231cf" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="588948" />
     <Blob Hash="999db2543e227fcfa6ece50ec9b4a96f54476b95" Size="12739" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="475920" />
     <Blob Hash="999efd5544f189e4756631d244c4ae754cd12913" Size="188" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="2096893" />
-    <Blob Hash="99a01526135568818616717b9b3f9ca2101143a4" Size="90044" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="1965268" />
-    <Blob Hash="99a0153ed6a961567c3647b803d5515062d56cc3" Size="2853016" PackHash="46e237afb633a99d67f1e8df4860de76953d5258" PackOffset="8" />
     <Blob Hash="99a272813608184497e0163253d8c7c6d219b35f" Size="19237" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1938343" />
     <Blob Hash="99aa30ed3fc1172303ba55b78ffb55713faffc01" Size="2535424" PackHash="125a4791d21c021f4a0b7ebc54aa1edc0391941a" PackOffset="8" />
     <Blob Hash="99ab5f3000f5785b18a3ee4b213672364f78d839" Size="3510" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1215393" />
@@ -55431,8 +55311,7 @@
     <Blob Hash="99b7aa08dbe693544b513137be4b8b455a678c3a" Size="37952" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="400038" />
     <Blob Hash="99b852864d52953f43727192cbe230d1ec96649b" Size="3379" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="203924" />
     <Blob Hash="99bb2f6d1087b7bcb3392940fa350bb9c6fea4b1" Size="20589" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2011723" />
-    <Blob Hash="99bf7378751660243c0934d09e085bf66caac960" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555269" />
-    <Blob Hash="99c00580c3b61c2b243824a0c10768eaf63bf698" Size="2153" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1379083" />
+    <Blob Hash="99bf7378751660243c0934d09e085bf66caac960" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674501" />
     <Blob Hash="99c1ca771fe6f3e3731fcd5d6d45a9841113317f" Size="2963" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="194664" />
     <Blob Hash="99c3b03fc03c569048a3bc22b7d6bb4cd103cd6c" Size="208673" PackHash="74b7d496e8365a94395c5c3ca866325b9bdae109" PackOffset="8" />
     <Blob Hash="99c3b65f6736ed22e9564dfad9c2ba89196b50cf" Size="31826" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1734179" />
@@ -55441,12 +55320,12 @@
     <Blob Hash="99ca7c381881b5584ae70c3063cec3912317f372" Size="11794" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1768753" />
     <Blob Hash="99ce7868a0d0a5dfcbbdf8c818836b3b57d3f539" Size="18715" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1216590" />
     <Blob Hash="99d0eed3698a0d38588c529f832efb6cfc271091" Size="13031" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1893349" />
+    <Blob Hash="99d0f55d302950c633eaf5dfa70c07fa177eeff7" Size="26332896" PackHash="9af1441d9963624d7ba21a1bffcdb2beb4826660" PackOffset="8" />
     <Blob Hash="99d2004202af9e6132bb49be8086987ec9d1f138" Size="42653" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="143002" />
     <Blob Hash="99d4370be62d64a5183d19fcd1545aed365ab537" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1038114" />
     <Blob Hash="99d762fcc0abea052cfff9bf6324ec2ab82b3dbd" Size="3764" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="829915" />
     <Blob Hash="99d76a77f3d81aca7c164efdb322e798ae142cac" Size="22668" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="1852981" />
-    <Blob Hash="99d7ef928878553a616f2e45ed14fb3613aa97aa" Size="1656256" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="8" />
-    <Blob Hash="99d93e1e3636f86c85b0c7c4da2077b4f1ee010c" Size="25020" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="2061538" />
+    <Blob Hash="99d93e1e3636f86c85b0c7c4da2077b4f1ee010c" Size="25020" PackHash="6633fc884b676640607254f19e9e7b0bf8defeee" PackOffset="2053290" />
     <Blob Hash="99d98a9cd24e905ca8b42c5e601ab46806dc8b25" Size="388" PackHash="36af7f5290dd60c07f83b8a398eb9721c24a6154" PackOffset="2096651" />
     <Blob Hash="99dbd8079a81094230c942ee200d3b29c3a76c88" Size="3929" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1470583" />
     <Blob Hash="99dce8e349076b83a08ba6306bc3cb1fb990b50c" Size="6150762" PackHash="066e2a37aad34ff93be53c800e3c9bfb5c96f47f" PackOffset="8" />
@@ -55466,7 +55345,6 @@
     <Blob Hash="9a050c28c006071917dc4b267114d2aa6eb88179" Size="5884" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="216800" />
     <Blob Hash="9a0669131be5e3d4e98bb330c7fd770e31974e22" Size="1470" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="72420" />
     <Blob Hash="9a079d835f3c7a887f0717456d68d2127a748205" Size="3359" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="929437" />
-    <Blob Hash="9a0b4cd85d7397b3f391c174b3e3ef9ac773a518" Size="10955124" PackHash="47b6174ef3e14ae820eb71ddb6d34127cafe2467" PackOffset="8" />
     <Blob Hash="9a0ec56e1e38c7a3e81903588b8294358a20facc" Size="352" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="181217" />
     <Blob Hash="9a1cf8b228beaf7a68fb1636f3314ad4ea527bf6" Size="28132" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1654228" />
     <Blob Hash="9a1d2100cff40124abf7bc86c4d24e1cb4d8a4c8" Size="966" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2022681" />
@@ -55478,11 +55356,10 @@
     <Blob Hash="9a2dea217319becb85bc60f5e93ff0cbc7a3fb9e" Size="4972" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2025871" />
     <Blob Hash="9a2f1470b88187433823a27b8ce81b6beee73c2f" Size="329" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="718770" />
     <Blob Hash="9a2ff9c2b217cb1a8541b6b44ab92080e4ea0935" Size="778" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1421239" />
-    <Blob Hash="9a31e63bafbbb223b319da219537488c1c0d7479" Size="156058" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="541370" />
+    <Blob Hash="9a31e63bafbbb223b319da219537488c1c0d7479" Size="156058" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="1785045" />
     <Blob Hash="9a32e667cabeb75d7740beff72c5bb12e00acf66" Size="2335096" PackHash="4b8c0c6b48b2eb66f88a0295eca07439ea73d93f" PackOffset="8" />
     <Blob Hash="9a345e8c7ac7da98ed9c259beb3592b87746c32c" Size="9205" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2078796" />
-    <Blob Hash="9a348351b19716daddc6f368db2c5f275333dfb3" Size="4106" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1696823" />
-    <Blob Hash="9a3bfda9feb32976d68eeb27b38c988e5ef47c95" Size="2146" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1407583" />
+    <Blob Hash="9a3bfda9feb32976d68eeb27b38c988e5ef47c95" Size="2146" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1856485" />
     <Blob Hash="9a3ce0c43da574b3f391ec1cf165c212b8ea7557" Size="5423" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1623174" />
     <Blob Hash="9a3e0dcd1ab9eb755d2e731c08270bb01991a7da" Size="284960" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="780918" />
     <Blob Hash="9a4141af64f0efbe4df76260e0e093ea7c412df5" Size="148928" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="236481" />
@@ -55502,13 +55379,13 @@
     <Blob Hash="9a7895841bea5740e2de939d1e84af34552da1e3" Size="32" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="2097070" />
     <Blob Hash="9a7a4df6e7882b67750dbf98891069deba461e6c" Size="2007936" PackHash="9c09590cab2fdbeef86676bfefe62e8f6071b932" PackOffset="8" />
     <Blob Hash="9a7c2635a2d855ec9908e5d95aadae69420d42e5" Size="109112" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1638354" />
-    <Blob Hash="9a7cb44ab7513b40faf24d6301bfc86a031f168d" Size="1636" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2031003" />
+    <Blob Hash="9a7cb44ab7513b40faf24d6301bfc86a031f168d" Size="1636" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2089559" />
     <Blob Hash="9a7e3435c49f6687a8dd41e69113db448d3a5fad" Size="766" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1997073" />
     <Blob Hash="9a81649694432cb01eb2bb7ef1bdf98b851434e0" Size="2977" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1953168" />
     <Blob Hash="9a82d04a479f462b537cbc075e867c44928d4949" Size="100131" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="1896938" />
     <Blob Hash="9a85b15f5ca957ae044fd3f7dc52157b3380932f" Size="110246" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1641142" />
     <Blob Hash="9a87eb0e06157a69b5f6393e589d8a5bb689b0f6" Size="2128380" PackHash="4becfacea1263d33f8e364faa3de337b4d4c93b2" PackOffset="8" />
-    <Blob Hash="9a8928b236f7db486ad9fc036c2d1edaafa085a0" Size="52544" PackHash="e266aa9b854d9b51e6070e16170a57751ced9a15" PackOffset="2039674" />
+    <Blob Hash="9a8928b236f7db486ad9fc036c2d1edaafa085a0" Size="52544" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="2035058" />
     <Blob Hash="9a8b2f78e31f543b8daf462244dd3e18c6907444" Size="4799" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1906871" />
     <Blob Hash="9a8f26be17573caacc726899042d7b114a4f085a" Size="26000" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="625740" />
     <Blob Hash="9a9197737a4bb13521f15eabb4970b035fe2c282" Size="5585" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="446919" />
@@ -55521,8 +55398,10 @@
     <Blob Hash="9aa2c3ba4cf6be55e34dc914ab2bfd2c0f04cdd0" Size="495" PackHash="b7e163c9319b012e49d8d306722425906432ca2d" PackOffset="8" />
     <Blob Hash="9aa8b6e8083d4980fa4480566f3d072c277a5269" Size="3354" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="424816" />
     <Blob Hash="9aa9a832e9bfca9376b7cadf89506df7ad56f890" Size="7210" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="748827" />
+    <Blob Hash="9aaca826d17d0284ed067129a6a928bb7a9814f4" Size="45062" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="2043790" />
     <Blob Hash="9aad402c7e4ad5aecc454c000cc197317939caf5" Size="6096" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="602444" />
     <Blob Hash="9ab2e7d8ea1e33ad2cebc8e668e710906499e4cf" Size="40" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2097101" />
+    <Blob Hash="9ab4b27082a9bbc7ca669c61c214f742cc8ca328" Size="8896830" PackHash="e21013d9dce595dffaa869e111eadeff50641519" PackOffset="8" />
     <Blob Hash="9ab9425970bef52114fc409ca465f43e7024ab89" Size="137133" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="1152184" />
     <Blob Hash="9aba97d5093e4cbf24b302dec0318ed4ff4c68b0" Size="12592" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="744992" />
     <Blob Hash="9abaf94f9b5857c368d8c143386369383ac86698" Size="680" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2096370" />
@@ -55531,7 +55410,6 @@
     <Blob Hash="9abeb2f4d1aafec60f4324e6d4ebea9d8b953fd5" Size="512" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="628124" />
     <Blob Hash="9ac0c92028f6c71aab9088f458f83c8752190ca3" Size="211" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="661805" />
     <Blob Hash="9ac3f60e1b6e8c8da9825eaff751bad678f96029" Size="17025" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="1543634" />
-    <Blob Hash="9acb9bf7e87cfd43cced968f966a3226a1d0553a" Size="415" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1785524" />
     <Blob Hash="9ad044222ab6a808c5aeda9f25afae87f123f469" Size="6250403" PackHash="348d5b8c2c53eec5f65c20c252c11d409b738ce0" PackOffset="8" />
     <Blob Hash="9ad10e945e5d561a436e7c3fd5d40205f04c01cf" Size="35964" PackHash="2a05a1b170ef5ec5b3ba5bb18c584e3e49a5de4e" PackOffset="43713" />
     <Blob Hash="9ad1edac5fbaa23db5c2c9d8e4c63cf3519a6a6e" Size="369" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="436307" />
@@ -55546,15 +55424,14 @@
     <Blob Hash="9af02b8b43ddd2f148f1b1fb99e9578ed2b90ada" Size="34200" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="528904" />
     <Blob Hash="9af2545bb24a53a925d1330a276044b7c3e38e4c" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2035227" />
     <Blob Hash="9af2a384788c7cda721350840df8865e81723202" Size="136704" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="1802760" />
-    <Blob Hash="9af3258ff929211885cd8a0f933d305a70b67510" Size="881" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2033009" />
+    <Blob Hash="9af3258ff929211885cd8a0f933d305a70b67510" Size="881" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1923220" />
     <Blob Hash="9af7b928c272a907e7a4bad79b207c351d9e689f" Size="92319" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1165639" />
-    <Blob Hash="9afb100b1e38dba21353356282c698e44762a24a" Size="126174" PackHash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" PackOffset="1289120" />
+    <Blob Hash="9afb100b1e38dba21353356282c698e44762a24a" Size="126174" PackHash="015c8801a8906be93a066c86046bcd911350f5c4" PackOffset="1730802" />
     <Blob Hash="9afd13b84dff3a79051164bfdf27e93b190ecf02" Size="3638" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="940462" />
     <Blob Hash="9b07813aa4f3e621a4a91fb5819c9e76a6ce9e05" Size="9240" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1740966" />
     <Blob Hash="9b07cfcb5bf1e9488923378b8626b3902f8e7366" Size="126097" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="963439" />
     <Blob Hash="9b0ac73e0200c8120937d3174fa7868a15304553" Size="15629" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1464685" />
     <Blob Hash="9b0b4f741a20d2bc5ca0be2306bfff5884dda5e6" Size="115200" PackHash="fc72e25fae938ebaa984b54bd0d8766882030b42" PackOffset="1906808" />
-    <Blob Hash="9b0c7cf7e692f0b441fe32733025dee893257ce8" Size="2500" PackHash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" PackOffset="2092728" />
     <Blob Hash="9b0c9d614084e0cd6752d562b158cd45f082a726" Size="6027" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="2057101" />
     <Blob Hash="9b128b6adf8976be64b025638a8899c4ec9ee6bb" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="717772" />
     <Blob Hash="9b12ee89d466ec2fd8c64302fa7f61d532b1b8c6" Size="2709" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="770620" />
@@ -55567,8 +55444,8 @@
     <Blob Hash="9b19331a00f83f12fdc2feba2eb401f9732f8d44" Size="543" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="377223" />
     <Blob Hash="9b19575bef931564aecdf92f385e2e241fe11035" Size="124112" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1330344" />
     <Blob Hash="9b19f26f7e98fdae3817117416b77636a2412a97" Size="244456" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="399040" />
+    <Blob Hash="9b1a29e5021cb50b2b0e3a8e75c0252e41a08460" Size="50376218" PackHash="61091587cbe269cda72308a2ccc0222b21552ce4" PackOffset="8" />
     <Blob Hash="9b1a579c67fb25cd93d5b8fbffee539bd07f111d" Size="35440" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="376769" />
-    <Blob Hash="9b1ae50efafbb4a62231d4bb8b471c88c84262bd" Size="2396" PackHash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" PackOffset="2090332" />
     <Blob Hash="9b1b861b3bc5eaa3cd7271778ffe9bafcd4488a4" Size="2883" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="2091701" />
     <Blob Hash="9b22e495afacb4610576684fe6ee861fd533162e" Size="7332" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1409299" />
     <Blob Hash="9b2995f330631abdf17e383346448d1ce677956d" Size="284" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="436923" />
@@ -55581,12 +55458,14 @@
     <Blob Hash="9b43cdaa4d44686c39c5333507403a64e04a892e" Size="1067" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2034747" />
     <Blob Hash="9b4714cbd14739a4040157c9485eda7ec6a7bdba" Size="18672" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="2033364" />
     <Blob Hash="9b47aafe0c41db343c3ef50ac17bfaa6a1b4d978" Size="9984" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1815481" />
+    <Blob Hash="9b51b91672e0a804c628a74e85b6d9ce99da73a4" Size="4054520" PackHash="e248dcca4770c3aed1eaf3aed5d975315ee60e8e" PackOffset="8" />
     <Blob Hash="9b55eb1f4f4ce272b2a332b912c14856c9a23d1d" Size="45984" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1139520" />
     <Blob Hash="9b56dcb5286f12e966eab4eaa55908be6b61531d" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2080996" />
     <Blob Hash="9b5b6e265e32603006404227ae77e56897cd5122" Size="412" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="415344" />
     <Blob Hash="9b5b9ae64346f85dc0b3ad9c3a725f3090237a0d" Size="3307" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="838002" />
     <Blob Hash="9b5ce3de6eba466967cf388d23e95ded1d906f3b" Size="1006" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1747173" />
     <Blob Hash="9b5d4dc056a64233433943a178a6d2ee0a7d8b0c" Size="158" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="435147" />
+    <Blob Hash="9b60bb00f0f1c2f999096e43e2fdca28cb731568" Size="92588" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="1923532" />
     <Blob Hash="9b662cd4a73d9d56c6c518d2bb4cabcb2df37e3a" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2076581" />
     <Blob Hash="9b6a80e486eb45ca4ac7e90420d4108972eb3540" Size="7070" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="570932" />
     <Blob Hash="9b6bdfb9d648fa422f54ec07b8c8ea70389c09eb" Size="65536" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="395057" />
@@ -55594,14 +55473,14 @@
     <Blob Hash="9b6e7928eba24dd435a893309ca8e3bd4ab9f89e" Size="42184" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="247476" />
     <Blob Hash="9b72373035c561ed85d4b73ee6304ef549db8b56" Size="4607" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="713037" />
     <Blob Hash="9b73e944c6ac7498b6007e6f9fe6a9d03edc6e7b" Size="179936" PackHash="69524cb8a63c006267120fffbd8a5e2729e9d5af" PackOffset="1510248" />
-    <Blob Hash="9b749f805bf3e54ba2cff589943e08e9c3e03a4b" Size="3912" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1146168" />
+    <Blob Hash="9b749f805bf3e54ba2cff589943e08e9c3e03a4b" Size="3912" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2092184" />
     <Blob Hash="9b74f85bf5a183afd566a709a11c66b8be3b1c46" Size="559888" PackHash="12582f0c651cdaf8a3d2ed39d6d5c41ff2045005" PackOffset="1463656" />
     <Blob Hash="9b7827325d6fdc5b7faf38fb60ee8bf6bd25d120" Size="98275328" PackHash="7ce0f7436d0a1e809af94a0b16fb0395cc52746e" PackOffset="8" />
     <Blob Hash="9b7c79f603269790770e705cb9ef062e62e82250" Size="26252" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1937975" />
     <Blob Hash="9b7e9532294218f58c42011d83743867d742216b" Size="5449" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1767778" />
     <Blob Hash="9b869230e2a8338f1301319edae402beccb40730" Size="1985" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1265337" />
     <Blob Hash="9b874746ec8a6d43f506c8a41a62bd42e3310ef6" Size="4938488" PackHash="759eb0a64477d1269a2089f229e3f0a2276fb531" PackOffset="8" />
-    <Blob Hash="9b88b34a4daeb97e8ab700036ace3908d1679a9b" Size="88064" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1648605" />
+    <Blob Hash="9b88b34a4daeb97e8ab700036ace3908d1679a9b" Size="88064" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1767837" />
     <Blob Hash="9b8b9f8c64d0c31fc1355ac398340bfd88e1d91d" Size="879845" PackHash="1916cbea932d8ec4cbe73743294b2456b6f82f4d" PackOffset="8" />
     <Blob Hash="9b8e10399d0fc4b5a0bfa8fd883aad9ff45d3e31" Size="6569" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2063739" />
     <Blob Hash="9b95818f207f0e2ab1bef3eefbd36b757f229375" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1774469" />
@@ -55612,7 +55491,8 @@
     <Blob Hash="9ba0fc9fec832c4b45b5aaaf3652a0e771dc08d2" Size="10088" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="411468" />
     <Blob Hash="9ba2cd7cee2ce9388ac715fcf472d3793060af53" Size="2616" PackHash="03d2b700b5ea970da10b691861e3cbc3ffb3ee29" PackOffset="1021046" />
     <Blob Hash="9ba31e1cce39092b693ed46bbd5e3b95dd88329c" Size="135" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="444162" />
-    <Blob Hash="9bac06defaab7be8a3c4305fee308d22911e7a61" Size="8900" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1740580" />
+    <Blob Hash="9bab7d196727c05f53ceebeafd7a0722c555afe9" Size="3351170" PackHash="4b13954685776ac56d10464f6fd44fc0b9d25337" PackOffset="8" />
+    <Blob Hash="9bac06defaab7be8a3c4305fee308d22911e7a61" Size="8900" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2074443" />
     <Blob Hash="9bac0db1211c3b9c500d24c49a4abf01f09b3343" Size="107583" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="1013325" />
     <Blob Hash="9bafeca36180c56917690c2c29ba67b576806871" Size="209098" PackHash="a72777b59db815500e14e5d580278ca8aeb0af3c" PackOffset="776579" />
     <Blob Hash="9bb1cdb0fb48216d34073eb32edb3886c1c00db5" Size="6302" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2059396" />
@@ -55660,7 +55540,7 @@
     <Blob Hash="9c07009bc71de8534f13e5dc1b694c756a67fc35" Size="15608" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1056947" />
     <Blob Hash="9c0aae09a68808bfdb6cfef7fa3d13a3157b76f0" Size="84" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2092852" />
     <Blob Hash="9c0bfc0a95f6d0d25b31eb63dc95193fa2ebe4d7" Size="11396" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1853794" />
-    <Blob Hash="9c0e633a06fb8e17d0c0f773bb5889f696add441" Size="45128" PackHash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" PackOffset="1972655" />
+    <Blob Hash="9c0e633a06fb8e17d0c0f773bb5889f696add441" Size="45128" PackHash="a978ebda568515e85ff3a8f77239242d81d5a5e2" PackOffset="2049824" />
     <Blob Hash="9c10bb1db60c8ef17d64d22e3b2ae53de7f94676" Size="7520085" PackHash="2e235a0ae084c4ae39bee14764dd40e95a67ca0e" PackOffset="8" />
     <Blob Hash="9c1855d6b06aa8c88a218c236edb05041b43831f" Size="12953" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="1616910" />
     <Blob Hash="9c19f647f1ec1388548933df47cf05b7c3b55686" Size="120" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="2097036" />
@@ -55677,16 +55557,13 @@
     <Blob Hash="9c2fa69d830b92663d1a22abbe34767a5c80dc6c" Size="144276" PackHash="ed384e6a16f79979d70b9926060a68eeb610de53" PackOffset="168746" />
     <Blob Hash="9c2faae925abdb992aad25abf89f5d40c8022179" Size="15715" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="2060432" />
     <Blob Hash="9c3117d2a64c459235a088fce209f6a62c03210d" Size="135182" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1236906" />
-    <Blob Hash="9c323b211658ec5bdd47166c92bb4e9c3baa4936" Size="60534" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="1871968" />
-    <Blob Hash="9c382d6ae8cac4c0292e025b8b3f626ced467120" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552594" />
-    <Blob Hash="9c39f073caa06a497a1066d4868e5b731f8571b9" Size="1259" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1197539" />
+    <Blob Hash="9c382d6ae8cac4c0292e025b8b3f626ced467120" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671826" />
+    <Blob Hash="9c39f073caa06a497a1066d4868e5b731f8571b9" Size="1259" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1642370" />
     <Blob Hash="9c3b43421bffec9d0b45fad5d2b613d148745b17" Size="3045" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="900222" />
-    <Blob Hash="9c3c8799e3b016527ae4547c4e319a9839ab73f3" Size="1781292" PackHash="881ad0ca57f6a4fe275a7b7ca77f2daa52b2334b" PackOffset="8" />
     <Blob Hash="9c3c8f560e6b47300219c427e9f1f40d58e45d4e" Size="2401" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="989702" />
     <Blob Hash="9c3eb7db69bfb534dcd573a40504ced39e7bd374" Size="171276" PackHash="e2844d1cb41a532700afd48dffec9acdf53a5ba6" PackOffset="1831446" />
     <Blob Hash="9c416fb61a1d9b140b4967f9e311d44117b23265" Size="85982" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="1987342" />
-    <Blob Hash="9c4225907d1cb1fce89cfd2e1c695f1effc9c77b" Size="1256" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="997641" />
-    <Blob Hash="9c4225f042a372ad650857a8f4d6914daec0801d" Size="3258170" PackHash="ab01507c6d6ac016aff767f57c2a6196c38a512c" PackOffset="8" />
+    <Blob Hash="9c4225907d1cb1fce89cfd2e1c695f1effc9c77b" Size="1256" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2045158" />
     <Blob Hash="9c457a8c3f08af336ac73bbaad9da89eaefc37de" Size="15323" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="222996" />
     <Blob Hash="9c473c96fca153c0666c35e9e4f1d3d6eb7848df" Size="32965" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="99337" />
     <Blob Hash="9c488d8ce36854a05ea15fcdedc07778ac9a301c" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2096082" />
@@ -55696,17 +55573,18 @@
     <Blob Hash="9c5353f18b919137aec4052945f3c75e7ee366d5" Size="664" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="404590" />
     <Blob Hash="9c58464cb61bd2b1845861a30b8aa5809a10cfaf" Size="2235" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="843892" />
     <Blob Hash="9c5c61426644e52637026a21f8dc29bb51e8c7f4" Size="5430" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="447443" />
+    <Blob Hash="9c5ccfa6289ec2619d9f1d0e2185c0520ad5daca" Size="2009088" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="8" />
     <Blob Hash="9c5d04402ad6b36ba6a327c5024124959db1e557" Size="6679" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1986710" />
-    <Blob Hash="9c610bb8a9ba735c7847b5cd99d0feb5fb9058b6" Size="2400" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2094505" />
+    <Blob Hash="9c601438e901fa3e4cb9b0d1ded2524da37ad1d7" Size="41848" PackHash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" PackOffset="2054032" />
+    <Blob Hash="9c610bb8a9ba735c7847b5cd99d0feb5fb9058b6" Size="2400" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2080464" />
     <Blob Hash="9c6176c922e67cc0027ee9849703d9474b6170eb" Size="4108" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1325948" />
     <Blob Hash="9c6199928fc7905dad4f0fd8b563ce38c5ab0e87" Size="27670" PackHash="753eb938736a4b412147164d4077e991f9c89950" PackOffset="292512" />
     <Blob Hash="9c62abc9fcda9c4f5f0cc0aad10214b2d55a082c" Size="2814" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="850125" />
     <Blob Hash="9c65daf729561d1ff21c60ff90161f208f1452ab" Size="316" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="2096744" />
     <Blob Hash="9c6794cc2bd54c9f19d1c4f18adb65e1c376ffb6" Size="38493" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="1611344" />
     <Blob Hash="9c6990968a65d87cc2c266f9a4dd6f0cfd256e21" Size="265" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="516612" />
-    <Blob Hash="9c6a3b39a4bbb7061f7fa2ad96fb9bacf543302a" Size="64" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555614" />
+    <Blob Hash="9c6a3b39a4bbb7061f7fa2ad96fb9bacf543302a" Size="64" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674846" />
     <Blob Hash="9c6a8c626a87d4de066be83e39055bc02a37e55c" Size="49220" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1386680" />
-    <Blob Hash="9c6b4371215bfbb7b74e739a7260e441db8a3ed3" Size="2454528" PackHash="ef4f65d0d82f5517c164ac9475e181cf58572a11" PackOffset="8" />
     <Blob Hash="9c70afa40128c830ab0b8db229108f154f9533c9" Size="2953" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="224728" />
     <Blob Hash="9c724c2b6886637448f039404e3896fd4b706631" Size="10752" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="2081696" />
     <Blob Hash="9c72b9c17fa904ad75c74051ff249e64c6c23574" Size="13824" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="2048108" />
@@ -55716,11 +55594,11 @@
     <Blob Hash="9c79fa27eb7cf503fc110ba276c17c3f6a5c1244" Size="1809" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1559839" />
     <Blob Hash="9c7b0d92d6ead397b17220807ecb719ba7f8ebdd" Size="4677" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="665030" />
     <Blob Hash="9c7d0e8ba7eb67a2a0ae53eea006ec7ec18d931c" Size="3167" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1788794" />
-    <Blob Hash="9c7d92de3df9a0637275e1f113e460cc63464b2c" Size="569" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2096494" />
+    <Blob Hash="9c7d92de3df9a0637275e1f113e460cc63464b2c" Size="569" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2096550" />
     <Blob Hash="9c7f770d812477ef2326d85a0d9d819672c435dd" Size="3001" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1673581" />
     <Blob Hash="9c8056ffe2b00b5825f196216e6534247e55e60f" Size="25440" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="19301" />
     <Blob Hash="9c827e9bf9fab6c1b9c067caf971c4f41c7ab75a" Size="27494" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="314572" />
-    <Blob Hash="9c85d1a8f678e1d70ba38ddf67ed3bfe97879812" Size="3270" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1178226" />
+    <Blob Hash="9c85d1a8f678e1d70ba38ddf67ed3bfe97879812" Size="3270" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1623057" />
     <Blob Hash="9c8628f31801aba50a7ba51154691b1f05a6555c" Size="7340" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1558280" />
     <Blob Hash="9c8de4d889c1d0574569de1cfa7d63bac9438b23" Size="16564" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1336132" />
     <Blob Hash="9c8e34816b5f4469265fbe4665e024078a08a65c" Size="76" PackHash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" PackOffset="2097070" />
@@ -55729,13 +55607,13 @@
     <Blob Hash="9c91499d9448f949162d184b77de821371b49657" Size="3064" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="1982457" />
     <Blob Hash="9c92569955b3fb1498e72dfcea8cbf11c9981cd8" Size="694" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="200678" />
     <Blob Hash="9c987a4de8b99cfc2728b07b5e71e64e14b0e066" Size="25995" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1961503" />
-    <Blob Hash="9c98b95aa4b61bd9c1aca9873c567e5c9b3eaecd" Size="21653104" PackHash="56023557dcb42bb0b522ee5bc891baf4e44cabe2" PackOffset="8" />
     <Blob Hash="9c9ca1306113144e901b29e4614b2f267550cef0" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721210" />
     <Blob Hash="9c9d70741106e7ea725bd3bf875c7709666751d3" Size="1242" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="504619" />
     <Blob Hash="9ca04f3e0651746f963e43218229f3d1db6a089b" Size="2944" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="211161" />
     <Blob Hash="9ca17d1beb30cba1b2cb76877e54fbcbbc7d1c7e" Size="655" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="408053" />
     <Blob Hash="9ca3f5a457ff0af99151a9d93c497163cc5cff9c" Size="3368" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1969222" />
     <Blob Hash="9caa7d6a38f4f740e703db1db4295ad1c4a75045" Size="3117" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="811408" />
+    <Blob Hash="9cb6c64dfdd34e993b16e251fff3311e4550cb76" Size="250406" PackHash="119472dd321e51d7d83032997ab9d118a312a2f4" PackOffset="1714632" />
     <Blob Hash="9cb7dce0d633e1982acbd0243477d5d0a4d8bd18" Size="6492" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="947776" />
     <Blob Hash="9cba65ba6d86ebf9149649b77865ea27af4d6f35" Size="13043" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1996433" />
     <Blob Hash="9cba89480f0be75c1dd7f9fdd13f4bdb320794d0" Size="94334" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1964165" />
@@ -55745,7 +55623,8 @@
     <Blob Hash="9cc6c5680c71c6f79aab6bf3eb40e010dab7ac80" Size="41303" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1278787" />
     <Blob Hash="9cca20c9b15ac2c8e2a1d0ea13a95ffa34b9c332" Size="2985" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="90769" />
     <Blob Hash="9cd104f6668ed122f07ed37ddfcb4c91f8f7ff2f" Size="270" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="695822" />
-    <Blob Hash="9cd195e07fd57fd60976ea094566eea4ccb42814" Size="1247" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1578118" />
+    <Blob Hash="9cd195e07fd57fd60976ea094566eea4ccb42814" Size="1247" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1697350" />
+    <Blob Hash="9cd36ab693ebc7ec86b6494e261e1dec81a3af9b" Size="173818" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1295362" />
     <Blob Hash="9cd4e791dfe13248c883407f24d7287c8798365f" Size="15074" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1763819" />
     <Blob Hash="9cd5c36a08493d87f8db20c1c43d287112b4bcfc" Size="88301" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="205715" />
     <Blob Hash="9cd71bdd347ade68f501fd6ab47dcbfa650b5569" Size="847990" PackHash="694d6d6d33e802bd013aa60c6ceef225f1769a21" PackOffset="1228710" />
@@ -55758,17 +55637,18 @@
     <Blob Hash="9cdd359fc5a3d5528b9631ede05859be9afb43fd" Size="8028" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="234584" />
     <Blob Hash="9cde53cb4adfff0ed58207bce5f8a0a7ce895db8" Size="1051" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="2094874" />
     <Blob Hash="9cefc8cd8ba3006e88f89d1c4e1b84bf7006e737" Size="847" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="8" />
-    <Blob Hash="9cf2a8df657fdd7d97234fc367d7f7d8aff31341" Size="775" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1456065" />
+    <Blob Hash="9cf2a8df657fdd7d97234fc367d7f7d8aff31341" Size="775" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1993147" />
     <Blob Hash="9cf326a7cf48d957cdd411a1faee7b20180684f2" Size="4167" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="579459" />
     <Blob Hash="9cf44d27c684dc74c91bd4350dbf4011425b54f6" Size="6628" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2015840" />
+    <Blob Hash="9cf7530f3981921a946151eecd23f95cc239628c" Size="4198400" PackHash="cf20b05bae3af1a917ab45733b720d524dd86fa1" PackOffset="8" />
     <Blob Hash="9cfd661f459c98f17d3c88191d9df87b960c2ae6" Size="165864" PackHash="60f481b9e0149933c045fafa2e119c902e698d0e" PackOffset="1797551" />
     <Blob Hash="9d005b5fa0b32383878a38d954b2130ab8a4591a" Size="43276" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="260583" />
     <Blob Hash="9d00c3ddbcbb75b1ce410736ada5214bf710c2f6" Size="5538" PackHash="93566441053b4785e395d918bf77da92f4aab7ba" PackOffset="2090631" />
     <Blob Hash="9d022c72b4a3d40f48126190ec50a3a7f3f9d5ab" Size="32" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="2096996" />
+    <Blob Hash="9d02571bb1be6131e70fe06aa3e5613223906218" Size="1953920" PackHash="7a071f4107f137818f1d33c662dcacf423864f6d" PackOffset="8" />
     <Blob Hash="9d03582f1350229ad337e5fabba7d44bea0e703b" Size="112" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1696388" />
     <Blob Hash="9d036df365b9042fcb67a1467bb763f70768851f" Size="15148" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1667032" />
     <Blob Hash="9d048f9fa5acd8f01b2f1b0492d590af8e55ed5e" Size="13130" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1083995" />
-    <Blob Hash="9d04c36fbed560d6dc34a1b4a37026df166a7871" Size="14198" PackHash="554aafaaa2c457412c5bc79178a10f61589794d5" PackOffset="2082948" />
     <Blob Hash="9d058fcd7dfc6b4ef1ec16d766f34807cd7328ec" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="959321" />
     <Blob Hash="9d065840e0d13581ef7139d86e896b3ba8705bf4" Size="27483" PackHash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" PackOffset="2015900" />
     <Blob Hash="9d068386f0ff3a3c9ea72c4acd523990898964b6" Size="2195545" PackHash="c653b9ebfd67dfad854b519e55534735d82f73f2" PackOffset="8" />
@@ -55776,8 +55656,8 @@
     <Blob Hash="9d0a45e89e60d1780028164ee1e92593316c1528" Size="3641" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1651594" />
     <Blob Hash="9d0f74311e2b63768f1ddd01ad93b264a75eed39" Size="222901" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="212955" />
     <Blob Hash="9d0fd08d6bb6d2c29a95972070efae5cc99f46ae" Size="1966" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="489785" />
-    <Blob Hash="9d12024bba453ce61601ad7ce661b3d9573cd2f8" Size="19435" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2062467" />
-    <Blob Hash="9d1436018349f982ffb73bd450e4b55d766270a9" Size="407" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1617757" />
+    <Blob Hash="9d12024bba453ce61601ad7ce661b3d9573cd2f8" Size="19435" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2047235" />
+    <Blob Hash="9d1436018349f982ffb73bd450e4b55d766270a9" Size="407" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1736989" />
     <Blob Hash="9d1bded24b43ba15edbf6f446609374df48ad57e" Size="2839" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="994176" />
     <Blob Hash="9d1d33c04740b6723c65fcf973a684e7c87a24a6" Size="715" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2094531" />
     <Blob Hash="9d245b2053ef050dd6375378c09cbbe14169a1e8" Size="2877" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="356309" />
@@ -55787,12 +55667,11 @@
     <Blob Hash="9d2c9284d01854bb7dadab3f729cd7416bc2a2a5" Size="6703" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="520575" />
     <Blob Hash="9d2d1cac63ea3cf7ea581d2f49a0bdf06252ba84" Size="3185" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="369997" />
     <Blob Hash="9d2fe3cba1418440aa544ae5fe3c193285c8a5ae" Size="1141" PackHash="64f8a861ea0499b2ce969a0970e024d43314522e" PackOffset="384648" />
-    <Blob Hash="9d309d794ff943440f56909eb638a54f4dc1deca" Size="163" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2031973" />
+    <Blob Hash="9d309d794ff943440f56909eb638a54f4dc1deca" Size="163" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1922184" />
     <Blob Hash="9d333151ebab7d1dbcd82fb0663a186e56b669b5" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="562184" />
     <Blob Hash="9d335798f93676e6494bb2d399cc0326a485d7b4" Size="125365" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="8" />
     <Blob Hash="9d34007fbd98362f5089dce37e7c831ec092595e" Size="1800952" PackHash="4d28ce8c39a4aab2907e6be197ccfa5f003c6c79" PackOffset="8" />
     <Blob Hash="9d3431aae5dccc285df1bbc5f4b113ae91953b5e" Size="37519" PackHash="1e6aa2734645d55d643f5efa5b1d568bd9cc24ae" PackOffset="2051920" />
-    <Blob Hash="9d356e019c4019f14fc5b1cdc54df1d8241a38c4" Size="32768" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1747562" />
     <Blob Hash="9d36626c147221c5fd0507ae59f7d3f43df748ea" Size="878" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2086680" />
     <Blob Hash="9d3ad1f54c5ed5a3410c670884a405df8f0679b9" Size="5639210" PackHash="e180764b7421ae2ed9637a1db4881223d0b598a7" PackOffset="8" />
     <Blob Hash="9d3dfc0438b38135ec1f79f9add52d4a913ea759" Size="114664" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="141985" />
@@ -55807,6 +55686,7 @@
     <Blob Hash="9d6497c118292c7beff665b2342f515aef605a7c" Size="7952480" PackHash="c77ec3cb3ed4127dc3d3356b7a2c93b1b908ad4a" PackOffset="8" />
     <Blob Hash="9d64df5579d03be6f0aaeaf14dc61ff2b9dba114" Size="3028" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="3047" />
     <Blob Hash="9d662e621cdb41d15aeb3380c13daed93f55a4c2" Size="3493" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="2080398" />
+    <Blob Hash="9d664cabeace8f83bf719e96959375b83b4364b4" Size="1379840" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="8" />
     <Blob Hash="9d6ab37b534ece2cb3b32d35f1d1e88cea4f7bcc" Size="27764" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="18104" />
     <Blob Hash="9d6ede01a8cba0aa10ab2d7c82db4fa8017020d9" Size="3432" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="93221" />
     <Blob Hash="9d721a93565de22c31bf3893e78ff4a11a1f80db" Size="143872" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1593172" />
@@ -55824,7 +55704,6 @@
     <Blob Hash="9d9c631ff7a0d0e60072072f73187081282c2211" Size="20224" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1984245" />
     <Blob Hash="9d9c91ac3793ceaa95c79241e52b48a4de90c73b" Size="4498" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="2092559" />
     <Blob Hash="9d9e1a706c2f00552804d1a290e7bcc2cc7a2989" Size="18700" PackHash="69b5e501216207827aa5988773e7a327a054a52e" PackOffset="18732" />
-    <Blob Hash="9da393a8710618eaabbc2ec25cc7ce21588c2441" Size="785100" PackHash="8b5291f3f8f3ddb9d9fc8ad444abd28ce12847cb" PackOffset="1280392" />
     <Blob Hash="9da44c91d15ac5188084a6d4c1040cffbee69312" Size="1247286" PackHash="c6da47930b010c6bb3249d411d7760fd5e32320f" PackOffset="8" />
     <Blob Hash="9da5f0ff640012ec25ca3502cb852e470f625de8" Size="5002" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2036335" />
     <Blob Hash="9da8fe485f18d76cf7d8d4ffb1cfcd7eebb9a23e" Size="71168" PackHash="3f13a842534c0c2f3779830462b5a6659ebbc859" PackOffset="2008910" />
@@ -55833,6 +55712,7 @@
     <Blob Hash="9dbcf4a61566adbe1d45ff9437d701ea21bf2ee1" Size="1244" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="394640" />
     <Blob Hash="9dbdd313a0c6df5269e10ff9bab27a667b875b0b" Size="414" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="2096687" />
     <Blob Hash="9dc2fdd8561368f1e04c675e531a96c70082925f" Size="1666" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="2092776" />
+    <Blob Hash="9dc4be525487852e2a49a2975de775d341212cf8" Size="1289104" PackHash="e6347b3badb113c35af36403f292693d70d46881" PackOffset="8" />
     <Blob Hash="9dc4dd8a57edef289db13eb4a645ba6dbc308f0e" Size="69120" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1483755" />
     <Blob Hash="9dc552a268c4711b850e77fb949529abffc660eb" Size="5354" PackHash="e1c5c0494082c1115f45139c60ce28fd6668f298" PackOffset="2075092" />
     <Blob Hash="9dc6a0c7a7d97bedc782902fb8e90ec636d96e9f" Size="14332" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="160857" />
@@ -55843,14 +55723,13 @@
     <Blob Hash="9dd0ba6171080f074858ef88ada2e91c1f465619" Size="185" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="243657" />
     <Blob Hash="9dd32146d4763cecc5ea813b08a0bd57741cb838" Size="214" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1509002" />
     <Blob Hash="9dd42dbbca30a4d8f9cba067fc141970ddd2f023" Size="42827" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="135952" />
-    <Blob Hash="9dd8614ac0f12465b97bb0ab918ee9ad96dcb470" Size="2420" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2083186" />
+    <Blob Hash="9dd8614ac0f12465b97bb0ab918ee9ad96dcb470" Size="2420" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2090194" />
     <Blob Hash="9ddc3e0797308dcb97b556a630e598731bab951a" Size="472" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="868045" />
     <Blob Hash="9ddf10cd33c02a60ee2fef35b76adb7fcfb440df" Size="1424" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1274824" />
     <Blob Hash="9de0a272fab513b3e3f2e1f7daf34cc898b999d5" Size="1895" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2094997" />
     <Blob Hash="9de3f2da5be49e1904609f495ef10150e1b86df8" Size="704316" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="311786" />
     <Blob Hash="9dea681a24cf0d18c2267cb9fc71f8bc2cb3e749" Size="4315690" PackHash="cd1bdf1839a7fa5a0a3eb9b701f3494f3e032fde" PackOffset="8" />
     <Blob Hash="9dea6c7a0ceaa85bd71fd586a0b4f55560385084" Size="8272" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="283628" />
-    <Blob Hash="9df16153907bcc8f916a74fffcf0de819f317df7" Size="674984" PackHash="31a98ec1cc62bab799d8df883748fa37772c0a64" PackOffset="1139966" />
     <Blob Hash="9df1a6cffcb005a3f2b8e4bf7f58ec49efa0a493" Size="48403" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="802900" />
     <Blob Hash="9df48d1a442a4dfb9c9ed33ff5d87e3d4661c5d0" Size="2950" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="475989" />
     <Blob Hash="9df4d88f1962a672efbdde524550f7a5d02d446d" Size="1305" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1070464" />
@@ -55860,7 +55739,6 @@
     <Blob Hash="9dfecae08c98109eaa358f5920aed647888f722b" Size="132551" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="8" />
     <Blob Hash="9e00e6e3376182b0d0b70eb837230d8e58f0a60f" Size="866744" PackHash="9503bb780d2ebf30ddfc23d035be231a27329ca7" PackOffset="1012134" />
     <Blob Hash="9e04b7673ae2b879263912225e86ab26b4857c1d" Size="206" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="175613" />
-    <Blob Hash="9e08191d19f5e53af7ac67bc442ae97e15c9ae97" Size="73868113" PackHash="53eff9db202b450ff0c2a518e8e754dbef9d86fe" PackOffset="8" />
     <Blob Hash="9e0d312db54bc8271c16fa2693f1b80769f18097" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="834568" />
     <Blob Hash="9e0d57fc519de2650acd26f0b77e75291a388cf2" Size="16119" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1127627" />
     <Blob Hash="9e0f2ec682fd1e9b36a6ad5607b9ef231f1c53f2" Size="18856" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1100902" />
@@ -55870,6 +55748,7 @@
     <Blob Hash="9e12a79b3e84a2ea2d3a9a95049d64c944a59b71" Size="6049" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2080576" />
     <Blob Hash="9e14bde0e385e578dd85cbcd9fcb7e6735c93285" Size="3479" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="722421" />
     <Blob Hash="9e1703c45fed62d59a761cfe89af76abaa48d3d9" Size="38985" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1836561" />
+    <Blob Hash="9e17061a909e7fa6dcf8b426a6a9576ed450d78d" Size="3084648" PackHash="67b1668ea50dcb893bb381ba1c0703ec1ead8348" PackOffset="8" />
     <Blob Hash="9e186f97394f4cdfe3a79c0a39afb5df832c2523" Size="3054" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="800086" />
     <Blob Hash="9e1a228a2b3247fe9539d17f4eacbda35b967445" Size="512" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1765554" />
     <Blob Hash="9e1a41a3bd8fca2b7727402d150cdf4a18f2b0e9" Size="117" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201866" />
@@ -55912,13 +55791,12 @@
     <Blob Hash="9e53d4761b8ec9cf0b119c516e68022371dad616" Size="21880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1489654" />
     <Blob Hash="9e544ccd31046d91871b42e8d4997dad01780e63" Size="3111" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1837069" />
     <Blob Hash="9e54be0bee9cc462873007f093a8bc34a89f2610" Size="59313" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="433569" />
-    <Blob Hash="9e563e95440bab73dcabb11db14e43b72c380064" Size="1273" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2026090" />
+    <Blob Hash="9e563e95440bab73dcabb11db14e43b72c380064" Size="1273" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2082348" />
     <Blob Hash="9e5a182675652f0f66bfc64d0482d973e9ce1937" Size="12588" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1034358" />
-    <Blob Hash="9e5a8928469517c9b37eedd66b05ebfb577de712" Size="3235176" PackHash="d0e9a239d75251b347b6718b26ea359de3711292" PackOffset="8" />
     <Blob Hash="9e5c3b2c7036f45b7f524ea764d68bebb11c1d1c" Size="27601" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1468290" />
     <Blob Hash="9e5c4b6940df8f2d935b51b4c648f5fea859aad1" Size="132520" PackHash="9e397995b47d5acc37d38c9fa4935abec922ba48" PackOffset="1487544" />
     <Blob Hash="9e5f48dadfe2d8b45949168cd159485ffa22e812" Size="378" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2019102" />
-    <Blob Hash="9e6246dec94a03aac158c2628f258a8745adf3d2" Size="3829" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="2088809" />
+    <Blob Hash="9e6246dec94a03aac158c2628f258a8745adf3d2" Size="3829" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2091896" />
     <Blob Hash="9e66bb2a9bbe09b7ac643db1fe9b299d8a59da88" Size="1836330" PackHash="ad7f42e7a3d82c0a041e8c82a0eeefb8641e7d3d" PackOffset="8" />
     <Blob Hash="9e679efa1f4296366eb3d3d8efd3aa03ec47b8d8" Size="30056" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="900863" />
     <Blob Hash="9e681c213a14ba525d9896697516961d4840f460" Size="15845" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="774544" />
@@ -55931,13 +55809,11 @@
     <Blob Hash="9e6f03471cae2dee3eb3edd015c44c0bc3d05efb" Size="139040" PackHash="d63c4c238a195e3f8e062b2a9cf0757f0ed55587" PackOffset="1554694" />
     <Blob Hash="9e6f69c1655478645421d5d8588a38bd152457b4" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096708" />
     <Blob Hash="9e7410171643a0f5c3b3b1242eaf70b5806fd440" Size="675" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2087962" />
-    <Blob Hash="9e74967e28af9c28438df886d47d0e6cd5deb132" Size="5363360" PackHash="0b9e1f4372d5a1649a6df12553a9c3918340df25" PackOffset="8" />
     <Blob Hash="9e7561d90a3326724021a9d7e95f72c05fb42960" Size="456" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="251288" />
     <Blob Hash="9e794398deea255da02019e1e492f0ce5c26915f" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="897832" />
     <Blob Hash="9e79c7aa48daf1f83df2583c6a8c37159091ce3b" Size="27869" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="2016021" />
     <Blob Hash="9e79e88a572fece8f0f05290f24f5876aa6a04b9" Size="540416" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="8" />
     <Blob Hash="9e7a2a9049279f0e90cd2d3818c04ecc56ba5ec6" Size="4485" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="144214" />
-    <Blob Hash="9e7c48faca745427a3e7eeb8753c8ae821580ca4" Size="45056" PackHash="da4da2f40baa6c08a42a6d05a81529a0bf2b1a69" PackOffset="2040840" />
     <Blob Hash="9e7e86a7fa4ccf35b23413e65a1acb4cbd13caf0" Size="193692" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1559134" />
     <Blob Hash="9e8379dafc7bb6e3c77113e71bab0bdba1199a5f" Size="513" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="700694" />
     <Blob Hash="9e8640ce0da55d03bbe0953db9082cf31e4e5bde" Size="8775" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="684788" />
@@ -55952,15 +55828,14 @@
     <Blob Hash="9ea025a0d65c86b4b2bd165614e60bdec7ecc009" Size="6849" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1823078" />
     <Blob Hash="9ea48798a5558465101979a05824273e88e092c9" Size="93488" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1418486" />
     <Blob Hash="9ea53f0d49215ce7953eeea2b573fe522c90839f" Size="1083" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="143708" />
-    <Blob Hash="9ea6658686af1472961a0a6c0f9def6ea6bee801" Size="268" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2063704" />
+    <Blob Hash="9ea6658686af1472961a0a6c0f9def6ea6bee801" Size="268" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2083712" />
     <Blob Hash="9ea9ea77f58ed39605fb3f1f81b12e60a2639b83" Size="137354" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="346601" />
     <Blob Hash="9eb0fc65c2c88d3ad9fa5b08186788b7a646b152" Size="2607" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1943169" />
     <Blob Hash="9eb37a36c2aafa270c7674d86faf99e950106673" Size="23" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1904090" />
     <Blob Hash="9eb4f9d1aaceb455483d15ce81fd6dcb1fbdb062" Size="164936" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1232951" />
     <Blob Hash="9eb71a30aab6501252443b0390748844f98310f6" Size="268288" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="1410568" />
-    <Blob Hash="9ebb882d35546d79f8b1dc3b3e8c5fdff5fbf48e" Size="2168" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1376580" />
+    <Blob Hash="9ebb882d35546d79f8b1dc3b3e8c5fdff5fbf48e" Size="2168" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1825482" />
     <Blob Hash="9ebcad448f9a416a46ce7428cb45969778be5f6e" Size="160" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2096969" />
-    <Blob Hash="9ebdbc9eaea202ec79b140d37f274451d7630a73" Size="36045488" PackHash="aa42e5dfd941cd2d3ad8c15409c52b7e008b7d25" PackOffset="8" />
     <Blob Hash="9ec562e08afd72c9fbed0280e4e72bb3a03cc85a" Size="1031" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2067166" />
     <Blob Hash="9ec64043c3d5cd9f12ef6393f3749f1abd7e5185" Size="37199" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="349617" />
     <Blob Hash="9ec7e0ae8b924c1ce7da0cb3bf9e462b4780110d" Size="944" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="195869" />
@@ -55994,8 +55869,8 @@
     <Blob Hash="9f1919d3c5196b0ed21c5f503c175164c3aa2d51" Size="342" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="192646" />
     <Blob Hash="9f1de68cac307e6e7f9f538b617dfcbcdea74c35" Size="232823" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="1473593" />
     <Blob Hash="9f23395e3b2087ca6014c716724dff5987870a7d" Size="3287" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="21081" />
-    <Blob Hash="9f236fca694f3138ebb6b3c9cd4c0e291c0e61d0" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549381" />
-    <Blob Hash="9f251452f1b65b89aa8e9f7e44cb548c5e34f09b" Size="2433" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1481290" />
+    <Blob Hash="9f236fca694f3138ebb6b3c9cd4c0e291c0e61d0" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668659" />
+    <Blob Hash="9f251452f1b65b89aa8e9f7e44cb548c5e34f09b" Size="2433" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2018372" />
     <Blob Hash="9f252ee48490705ff2651ea8f9ad710f51cff4a3" Size="13679988" PackHash="5f237201ab7d415881d2eb7268bd13bb4ad800dc" PackOffset="8" />
     <Blob Hash="9f25bd81361bf9eca5871f60b1e4ce45c08e0dcb" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2077647" />
     <Blob Hash="9f283f91da37c96d084906b5ad41c070114e0a54" Size="33108" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="438463" />
@@ -56006,14 +55881,13 @@
     <Blob Hash="9f34215be4893f4b5f729e4a33ee904d4a2213d3" Size="5290" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="496048" />
     <Blob Hash="9f354dbe31ddee95490573343b21ba6150497fc4" Size="397373" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="889182" />
     <Blob Hash="9f35787f8675fe867dd3d5f5e3306f2726c344dc" Size="9312" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1252313" />
-    <Blob Hash="9f36d5a0b263bc766d65c7dc9567665389f9359e" Size="1137686" PackHash="bb022a63fffc9c5c6ff480c0a6e1727d0b035c7b" PackOffset="8" />
-    <Blob Hash="9f3725b224d92408dcd8b56107581bd5fa145cf7" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553334" />
+    <Blob Hash="9f3725b224d92408dcd8b56107581bd5fa145cf7" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672566" />
     <Blob Hash="9f3ef96b604bec7ed2559a6d8590a8092d858e53" Size="1089024" PackHash="2c17020eceec9a9c3967dccac3a3d99f88af33c1" PackOffset="8" />
     <Blob Hash="9f3f6ba23f0f1f51656ca4773a685feac375326f" Size="8901" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1613553" />
     <Blob Hash="9f402d253d80f1811a572dc070a387fa475e2aab" Size="23884" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1811326" />
     <Blob Hash="9f403683f97bc2a25a62076e61ef1c6c5285ac3f" Size="2157" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="537066" />
     <Blob Hash="9f4233aa2286590298e356c5f0bcf6cac11f743a" Size="2872" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1160452" />
-    <Blob Hash="9f4546edf113cf43c7f53f9afd0888e1985ab5f7" Size="179" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1823324" />
+    <Blob Hash="9f4546edf113cf43c7f53f9afd0888e1985ab5f7" Size="179" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1942556" />
     <Blob Hash="9f475eed16d66eaeca8d25af42acf81b4e8089ee" Size="4623" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1701526" />
     <Blob Hash="9f4844b0955dc06c97fb0c27506e78ec5142d785" Size="65" PackHash="bc4cf9d4758f107d90920f50b55c8d1240dfe8bb" PackOffset="2097091" />
     <Blob Hash="9f4c8773d7fb931da821aa0c2c45717ebe0dab3d" Size="1137" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2092375" />
@@ -56037,8 +55911,8 @@
     <Blob Hash="9f7508314c1f2b14534f9424de64711c7242a45e" Size="7272" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="190664" />
     <Blob Hash="9f7a0f9c539c8aadc8cc5b716b49034fe6d2c138" Size="1056" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1617787" />
     <Blob Hash="9f7c02ab5455af474ca0358a84e81c537459532f" Size="2089" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1399131" />
+    <Blob Hash="9f7d5dbf6db7db8064e99f1a91348ad8d1dbffa0" Size="3351170" PackHash="14966fe52911f6f2751a38165c9284f3e4b33aed" PackOffset="8" />
     <Blob Hash="9f7f497ecd5620273c0ddad0ebf61a05cb78cecd" Size="17" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069232" />
-    <Blob Hash="9f8171a920ddc1f873c4f47870e6c6e3b5667893" Size="168982" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1687688" />
     <Blob Hash="9f85718a64a91cbc163a14d371a1a647aeadc81d" Size="3426" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="369769" />
     <Blob Hash="9f86ca65f00fd30ba2eedf691e2f951dc9e554bc" Size="192" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2095908" />
     <Blob Hash="9f8792e3b72443843ad9288165efa0135f3fc48d" Size="771" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="689467" />
@@ -56058,7 +55932,6 @@
     <Blob Hash="9fac4ef85411fd0decf6e748a080f15e785b2cb4" Size="2957856" PackHash="231c093fba465c8199545f0570447ea9c192b050" PackOffset="8" />
     <Blob Hash="9faf3aaf90777101310f36fcc6505e73d4939a22" Size="3494" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="2078915" />
     <Blob Hash="9fb5b5528f27c4fc771d3dc0d3437dc1229cd102" Size="1127792" PackHash="bde504e141af1b3d4487c18b5869aca6f206534e" PackOffset="8" />
-    <Blob Hash="9fb6f269d6da18d0c1e355fb433256f9807e0593" Size="306864" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="1595522" />
     <Blob Hash="9fb7ff712aa9bff2e28173ce5e9d78dfc90b8bc6" Size="1930" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1852595" />
     <Blob Hash="9fb82d0fef24dd94c7d978ce63fba0dbe7ca9951" Size="27899" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="693855" />
     <Blob Hash="9fb854eb8c07e268eafa7aa8c47abf34cd91bd2a" Size="49233" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="1743528" />
@@ -56076,7 +55949,7 @@
     <Blob Hash="9fd0fe998a003c6b4cccd00a977153347de07f55" Size="212" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="164122" />
     <Blob Hash="9fd728aeaa2748bf4f67738763f66fda18eb7890" Size="5739" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1682117" />
     <Blob Hash="9fdb87f18ca030c5831de271d4fff2fa01c7ae55" Size="112" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1681032" />
-    <Blob Hash="9fdc81fa3f9b6fe85a57d85e750e4950eb9abdc4" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550481" />
+    <Blob Hash="9fdc81fa3f9b6fe85a57d85e750e4950eb9abdc4" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669713" />
     <Blob Hash="9fdcfa9ac78a2b6806550570f16e5f684f6d2786" Size="23629" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1822347" />
     <Blob Hash="9fe37733af48cd21a5f574b99a489aeeecb7ee8b" Size="845740" PackHash="1a1dadc1687e0dab0d079e989e0062e64f53170e" PackOffset="8" />
     <Blob Hash="9fe3c8d60a876ada16ee6e838bf38d6b9c0083f5" Size="145065" PackHash="d3acc379a342b085eeedf4f71d1cb1d4b38e42b8" PackOffset="241940" />
@@ -56085,7 +55958,6 @@
     <Blob Hash="9fe87ab838642205952f8605aa88b9e52c13e916" Size="1144" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1068069" />
     <Blob Hash="9fe8ad7a9ac407917a42080fc64dc61eb082e75e" Size="424736" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="883825" />
     <Blob Hash="9fea10c843b4ea9d1e442391d53d637c9a0d4832" Size="64216" PackHash="c79b3d3d81375c25019c997c0e81af6b84d805c1" PackOffset="1767944" />
-    <Blob Hash="9fec75801453e33cde16b505470134c9d8829a85" Size="2957904" PackHash="29e943af66b499f5c05ae32a0ce92d77c993bbca" PackOffset="8" />
     <Blob Hash="9fee89175a9f6c333cfb93c72d2759d5fb55475e" Size="3130" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="615617" />
     <Blob Hash="9feea241c20736db83efaafac528933c8e1d1e6a" Size="1623" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="580856" />
     <Blob Hash="9ff035acd979a39b9300bcacda6dbc66d5bd2723" Size="17683" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2060955" />
@@ -56109,15 +55981,16 @@
     <Blob Hash="a006d1842b606260629ecdc2240b5198dcb24cad" Size="38169" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1201783" />
     <Blob Hash="a0084c76cfe12d5e1e6aeb59f66895484e6a0d49" Size="166318444" PackHash="80417a80f0996195be6e52dbdb7497378e2d0b17" PackOffset="8" />
     <Blob Hash="a00ab621ceb1b56a66daacc201275723df6f8e13" Size="735" PackHash="4c5e613dbc080d544e62bd42771a406a1f7743ad" PackOffset="2096096" />
+    <Blob Hash="a00d4d45542d74c905c3afdf771c7211e3421ad5" Size="1575424" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="8" />
     <Blob Hash="a013136c12897e29fdee947527e6eb0b6cef6221" Size="804" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1329226" />
     <Blob Hash="a01441505d1e2becebef1805c2a768fd08cb4cba" Size="580487" PackHash="25189fab0756c67edd9fac163b509fa457f37f9a" PackOffset="1084970" />
-    <Blob Hash="a019b3a53536ddcbb4be8e8f027e338d12f57001" Size="1189" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1173767" />
+    <Blob Hash="a015fa32127b420e839e9c719a7a80890ec27344" Size="84054110" PackHash="5c9ec8d5a13c7dde54587a61da5385a74bfb87bf" PackOffset="8" />
+    <Blob Hash="a019b3a53536ddcbb4be8e8f027e338d12f57001" Size="1189" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1618598" />
     <Blob Hash="a01f2971ed2b27b57b05f54f63baa26884d18557" Size="3180" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2016596" />
     <Blob Hash="a01fc9f6d65dbeca0b2aa1fa171e0459b92301ef" Size="120630" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="274000" />
-    <Blob Hash="a020195c8a4ccd69ce544939bba76247c3521dc0" Size="2154" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1398362" />
+    <Blob Hash="a020195c8a4ccd69ce544939bba76247c3521dc0" Size="2154" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1847264" />
     <Blob Hash="a0214f1c2b742a6b4f095b351e0dab25b1e99026" Size="6240" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2011614" />
     <Blob Hash="a022642c39470ca712b0b7a701778f34050bde5f" Size="97568" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1767357" />
-    <Blob Hash="a022bf82af59e5e645be54fd08b699501fc0dd7f" Size="19562296" PackHash="324a9bead47ccf142ba90a6ab9c1a997bf4f4058" PackOffset="8" />
     <Blob Hash="a022d0e5c62987ea7d01a60947e3a5d41a267cc4" Size="209" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2096492" />
     <Blob Hash="a02508ab784d1bd233da317040368e4c56b79c53" Size="864" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="250971" />
     <Blob Hash="a0268ffacbfead28cfb29baf12591e5d197e1ac3" Size="11858728" PackHash="18943d114a03b9994e64f86843cbfbea2c18fc60" PackOffset="8" />
@@ -56125,10 +55998,10 @@
     <Blob Hash="a029680a487bef71c5b45f908dc3fdeb187fb169" Size="15360" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1887240" />
     <Blob Hash="a02b9fb407fdbb46c7bd69658cd54cb74f1b8760" Size="5097" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="865644" />
     <Blob Hash="a02ff3b0f07ae368f01b67b73e010a93011adb11" Size="151344" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="1192510" />
-    <Blob Hash="a030644095ee3706423b133cb033f1b4211bc374" Size="73728" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="333226" />
+    <Blob Hash="a0341e2306c4c985fd1d7ea92f28250a93694af3" Size="26878" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2016328" />
     <Blob Hash="a03469a9a48e406be657fd1c743dbe87c5abe462" Size="8729" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1205736" />
+    <Blob Hash="a0346df149b8fcab567b63c4dbf9d0a421646a61" Size="2180" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1802962" />
     <Blob Hash="a034b34f43bcfd6b244abc565c78c4c62b679fb1" Size="9152" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="852088" />
-    <Blob Hash="a036c8ea4e190eeed03e7cfbebaa57fcdb7bd5af" Size="3824068" PackHash="63a39c158b3cf7533bb95a41e4e3fa62529aa7b5" PackOffset="8" />
     <Blob Hash="a0396b2c359d37a8f6e487cb8b6713ad547cbf91" Size="51030" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1382610" />
     <Blob Hash="a039aa8b05eeddb1dc9ea13c55f80c875300e69e" Size="96747" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="1463581" />
     <Blob Hash="a03a3d4ea7c22f3111aebd8f69c49105be63c458" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="670976" />
@@ -56144,6 +56017,7 @@
     <Blob Hash="a0483b7947de6daec4a69864328662b3d70aab86" Size="954" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1079886" />
     <Blob Hash="a04af1038b0a4d22b1b14dfe5f7ce4b46c51029e" Size="18727" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="2076147" />
     <Blob Hash="a04d472b84c0a6f9f68e612575e175444ba2a7f0" Size="19534" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="772796" />
+    <Blob Hash="a05496af73506db35a419feb8330d9469105f9fe" Size="20120294" PackHash="0fda22e71f5ea5f020685af2cde9b9692bd31401" PackOffset="8" />
     <Blob Hash="a054ffa53c36983e24d797f25db51b19c07b59a6" Size="2865" PackHash="6127c305de0e48f8d5572ec15328dbfc52bd989e" PackOffset="1302313" />
     <Blob Hash="a0571934dd83b01c2cf279542818b6ef0a245032" Size="124208" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="653604" />
     <Blob Hash="a0592902337c00fc2e70b1dfb3a42453a86535bb" Size="286" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1096875" />
@@ -56184,15 +56058,15 @@
     <Blob Hash="a0ba74e02b9c5ea733d4310e1550c400098325a0" Size="28662" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1039265" />
     <Blob Hash="a0bb2091cc73a17941bb9754ebfeffd7dc62a3d2" Size="552" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1872080" />
     <Blob Hash="a0bb8bb70ed3948fcf4bf0dc965b64363052844a" Size="9621" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1881317" />
-    <Blob Hash="a0be156855d45c7c39a0c9792f67af586986b1c3" Size="3990" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1978191" />
+    <Blob Hash="a0be156855d45c7c39a0c9792f67af586986b1c3" Size="3990" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2036747" />
     <Blob Hash="a0c1c51c50115aa0cdbd71de3f985696a1b44df2" Size="385816" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="662566" />
-    <Blob Hash="a0c39973ba2da16a561726f838bf9b97de6d3e31" Size="651" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1386361" />
+    <Blob Hash="a0c39973ba2da16a561726f838bf9b97de6d3e31" Size="651" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1505821" />
     <Blob Hash="a0c570763a65ea011aee287514a16617f24f8175" Size="3009" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1141362" />
     <Blob Hash="a0c9a347bd83bd66e00e07c326d92c420c5514a5" Size="13820" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1044236" />
     <Blob Hash="a0c9b210cec660ad22de31424d6334674c8e0930" Size="131201" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="1908478" />
     <Blob Hash="a0cbe70dace983a01b216392f7bd00e1d62724b1" Size="5190" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="564627" />
     <Blob Hash="a0ce9e6ebc49533576928ffa0aee2f5372c6f998" Size="246" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1524239" />
-    <Blob Hash="a0d11698bca3a47177de3a234e611e9239620714" Size="753" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1453610" />
+    <Blob Hash="a0d11698bca3a47177de3a234e611e9239620714" Size="753" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1990692" />
     <Blob Hash="a0d25cfa601ade10ea9f801055f02e5d362de6dc" Size="6239" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1322394" />
     <Blob Hash="a0d427009582ebb471f3a3093d57768704ea0779" Size="5338" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="628773" />
     <Blob Hash="a0d480d14e0cc05b00aa6c1f13fc2b1004fbe4ec" Size="2231" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="803214" />
@@ -56200,7 +56074,6 @@
     <Blob Hash="a0d7d3358ecd4208be5d964e03190ff42806a86d" Size="157273" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1613643" />
     <Blob Hash="a0dabfbeeb66e26fb342844ea41772d7a1d19c24" Size="94393" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="820057" />
     <Blob Hash="a0db134b9fe63776aff261753072d717c0fc33db" Size="247" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="372115" />
-    <Blob Hash="a0dd87f5522aa33fbae43371cde9ab890ad289c4" Size="70" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2093313" />
     <Blob Hash="a0e1d7feb7f54be67730d299fd216f0bb66cce17" Size="382" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="354180" />
     <Blob Hash="a0e73a46740c52ccbde38a3912c5b0fd72679ec8" Size="253006" PackHash="183546a339ebc6cbda54cb8ba6beccec1dc9a02d" PackOffset="537009" />
     <Blob Hash="a0e7859bf54457b17aaf51539b78e4414113b04b" Size="149" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="842427" />
@@ -56230,17 +56103,18 @@
     <Blob Hash="a119581f409a14eb491d1a0830d7c14d6dab2f95" Size="76578" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="243055" />
     <Blob Hash="a11bd5992f9dcadb09473d703af86bf6dcfd0ddb" Size="838" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="245340" />
     <Blob Hash="a11bd59a104fcdbde46ec4a54a09957434d66a3c" Size="27694" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="153348" />
-    <Blob Hash="a11e2d3849f4c3264bf0975463fbb0bb0f4889dd" Size="757" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1366801" />
+    <Blob Hash="a11e2d3849f4c3264bf0975463fbb0bb0f4889dd" Size="757" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1486261" />
     <Blob Hash="a11fecfaa368725cfca3b3548b5fbb93eb68f3fd" Size="39734" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1745859" />
     <Blob Hash="a1232913e2c58b185c1755aedb6476259390a1fe" Size="5484" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1536124" />
     <Blob Hash="a1245c21c7e918fa2919fd10bbe5604fc81faf49" Size="72726" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1891969" />
-    <Blob Hash="a124d392c847379a3e137fddffb76ddc4905a15e" Size="333880" PackHash="09358de240dc340ba067bd03e6077676ab6a6908" PackOffset="1713728" />
     <Blob Hash="a1264d938bf44241ad4be57dbe682dc2ed5624c3" Size="49087" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1450897" />
     <Blob Hash="a12a2c1bdce294ed64d127926676875419238572" Size="19237" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="374590" />
     <Blob Hash="a12ca4c863d64c38b3fd663de0c8d39f7ca6d3e6" Size="4791" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2074752" />
     <Blob Hash="a12da47c09774282799e65f24180f7106fdfb109" Size="7656" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1434276" />
     <Blob Hash="a130b535e404381d80c337f344180d8836cc1a05" Size="9512" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="181992" />
     <Blob Hash="a13242dba78a37e34aa857be6f9170441d738372" Size="371" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="985800" />
+    <Blob Hash="a13400386413a324fd00aa6b7dc8cbda04fe364c" Size="5087000" PackHash="0fdbcebf63bbf9d68f75edb459e8a195622e5a5f" PackOffset="8" />
+    <Blob Hash="a1351b80ad4f9bf7d4e201af46c261387e1059f4" Size="2083120" PackHash="49fd21b1159ff57491bad0d8f36fb0fde225ded1" PackOffset="8" />
     <Blob Hash="a135c36fa8dfe683450e0dfb64ddeffc2d856148" Size="12561976" PackHash="bf0357dc833167bf117904470b2d1b24e81d7ffc" PackOffset="8" />
     <Blob Hash="a136e19c854da3d6fd66c301a395f6b2b3f00213" Size="40" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2096125" />
     <Blob Hash="a13803c7d7817f4ad030708f26d724aa2ca62250" Size="3357" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1697498" />
@@ -56258,23 +56132,26 @@
     <Blob Hash="a14579d6bc24dcc5e3748aef1f57320de532d974" Size="15292" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1037740" />
     <Blob Hash="a14747198b2c5e55727c423db9631f756d3bf281" Size="548864" PackHash="167a3b509221baa789dd8c568b74ddcaf7c4a7c5" PackOffset="1478664" />
     <Blob Hash="a1479ff9cead0189b4a4d961059891487b7c7b99" Size="32724" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="1587303" />
-    <Blob Hash="a14848496d85714118cb90918665a1a169b8eea1" Size="907" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="2096134" />
+    <Blob Hash="a14848496d85714118cb90918665a1a169b8eea1" Size="907" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2094926" />
     <Blob Hash="a148a86b1e91134d0c3971b3ceb27c66df50a87e" Size="140841" PackHash="d3aba44b0d58e731852a65be2988b2ffb4b45533" PackOffset="128446" />
     <Blob Hash="a14aa2302c1dd821ac234055c542e62007ad55d6" Size="107717" PackHash="1be30bac2f567e402ae48b89e8355a4b4e609b8a" PackOffset="74165" />
     <Blob Hash="a14cd1fa14d6756bc7ff38f792cf9ab6b208c7ca" Size="962" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="534196" />
     <Blob Hash="a14d71a141efce2ac2eae26b596bb01a9c893cac" Size="7046" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="340573" />
-    <Blob Hash="a151e157ecc22fed63819413a710ab2fdbc2bf39" Size="748" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1460796" />
+    <Blob Hash="a14f0c77600b567085904d8eba33fd4b2965d453" Size="81522336" PackHash="99d2e3bed528d55c0bd5658511935add630acb79" PackOffset="8" />
+    <Blob Hash="a151e157ecc22fed63819413a710ab2fdbc2bf39" Size="748" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1997878" />
     <Blob Hash="a1587fc76c88d36dc9abf016de9a6b4814593094" Size="17201" PackHash="6a02e987394162520a81ec3c003bb18e283f30da" PackOffset="8" />
     <Blob Hash="a1594e0bf41010e43ab08a761d6f0b6b301f2b74" Size="183" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="143539" />
     <Blob Hash="a159a830ca134d8bf52ee0d1b79a5cb9b4d3ceb2" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1212392" />
     <Blob Hash="a15c568f2428f24ab308859491058b8bd30684c7" Size="8288" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="148840" />
     <Blob Hash="a15ddc506ac0c2817febecabd8d240fcc4e731b2" Size="3293452" PackHash="58d7b375139fc1172880981e8f1c8bbddf4f88db" PackOffset="8" />
     <Blob Hash="a15efaf00d2484aa4e065aaf660fd9827a8bb092" Size="121" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="200477" />
+    <Blob Hash="a1602b6b17d9cd2afccc2111757da16d1eecb1a2" Size="2989504" PackHash="0ce04792e19e5da32ebfe669704ae48f1f016d74" PackOffset="8" />
     <Blob Hash="a16290542116d20e02f7e271cbb9118eae4bc310" Size="95033" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1377761" />
     <Blob Hash="a162ba3266e942e6e9509bbdab203c00c38a54e3" Size="89376" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="1810383" />
     <Blob Hash="a1649bd0908bcfa97d4025f7b4f2323b9eeb096c" Size="905" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2093512" />
     <Blob Hash="a1675fb7f1864f5ce83309f4554c98cb4093f024" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="584636" />
     <Blob Hash="a168b9c7dd1df472d3ccd845ec25c97a21a7651e" Size="1228" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="2095912" />
+    <Blob Hash="a16bb92d0bf7a95f4d90afae30ac6e83607364c6" Size="101655026" PackHash="3f2f7270a6a3db15f69f2841222f86507f8a851f" PackOffset="8" />
     <Blob Hash="a16c45fc94596b31782bf1618f3bd6582a1fd202" Size="2996" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="531032" />
     <Blob Hash="a16c558c847ba1f8140d97c581eddcda27e17692" Size="8028" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1440822" />
     <Blob Hash="a16e5fb69bd1dac27fb75c6e9fb7b6217e340fa7" Size="17996" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="2075414" />
@@ -56289,24 +56166,23 @@
     <Blob Hash="a19b5967803f1406954f676563f7781493ac4e42" Size="8736" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1130892" />
     <Blob Hash="a19eda0ed752c33246bc739961dafdaa54b43ba8" Size="13774848" PackHash="18997bcb6b486057e68786ef1be03c3a0c2e8957" PackOffset="8" />
     <Blob Hash="a1a27a8b95817b336017a5deea39b5b29ed23bdb" Size="480" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="997824" />
-    <Blob Hash="a1a5fe199f07fb5649fb79ae6dfd47eb1099d456" Size="31579" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1896263" />
+    <Blob Hash="a1a5fe199f07fb5649fb79ae6dfd47eb1099d456" Size="31579" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="1976919" />
     <Blob Hash="a1a9d9b63295284a087e524b7d3a1b1987377a92" Size="152" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1369940" />
     <Blob Hash="a1b2ada49d0a3ec0ab3c64d94ad8d9943e391bdf" Size="41445800" PackHash="4f2952b8bc20b95299d1dcccec1a5e07fc35cd99" PackOffset="8" />
     <Blob Hash="a1b2e688031ec606c8dc328735f0fd4c5cd48228" Size="39828" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="523628" />
-    <Blob Hash="a1b8dd19d6a8059fa26fe7458365afef915230ab" Size="2770" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1324564" />
+    <Blob Hash="a1b8dd19d6a8059fa26fe7458365afef915230ab" Size="2770" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1444024" />
     <Blob Hash="a1ba9cf2379d2862faab51590b77beb37d955939" Size="22501" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1875424" />
     <Blob Hash="a1bee71deeaf9d4f3ec5e9f0b8db893d35e1c0e8" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2083859" />
     <Blob Hash="a1bfacd94cebb593fa9441be90d83dcf879d6c86" Size="26734" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1994258" />
     <Blob Hash="a1bfae02d9289036f1dbdd2cdd8a5a3a3cd0ff28" Size="147" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="443220" />
     <Blob Hash="a1bfca41be9a4c0477ada52eebb365b724ac9a23" Size="116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1441316" />
-    <Blob Hash="a1c2e8dc329591b89dafb0e1e76cdab29e367953" Size="60" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555374" />
+    <Blob Hash="a1c2e8dc329591b89dafb0e1e76cdab29e367953" Size="60" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674606" />
     <Blob Hash="a1c6543b4664b2ca484029f6e36e35c155041f86" Size="1828" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="389922" />
     <Blob Hash="a1c6dfc95586e9b987671a93ca8b07644756be1c" Size="1708" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1556064" />
     <Blob Hash="a1c9b8e4e6ea03fd6715fd72bc9d88747b119fb1" Size="563244" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="8" />
     <Blob Hash="a1cab6c43836e05382d9d611d51feea4b2244554" Size="1478920" PackHash="3890ff79bdeaaedd21c338bf90b727a0405d0e85" PackOffset="107820" />
     <Blob Hash="a1cc34313c98b73ffefba4cca3d22f221c639635" Size="215" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1942322" />
     <Blob Hash="a1d0505cca74f5fd9325c5d604ae6ffeab23f045" Size="4922" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1531495" />
-    <Blob Hash="a1d1405a0a6136ed9dd875ce819dd2a2da778f99" Size="1677576" PackHash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" PackOffset="8" />
     <Blob Hash="a1d58977269a94a602b7ab9de21d3ae023bdf845" Size="216988" PackHash="aaf3a012f48b24c193628af42ef3302d96784c3f" PackOffset="1584308" />
     <Blob Hash="a1d6ba52fe228c3269010d200c2db8ea784cff02" Size="12911" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="713143" />
     <Blob Hash="a1d8303cab0c6db326982a131c92668c8f238808" Size="509" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="331030" />
@@ -56328,7 +56204,7 @@
     <Blob Hash="a1f8b414555d13403d40519d02c3e26fc892a399" Size="275364" PackHash="ed384e6a16f79979d70b9926060a68eeb610de53" PackOffset="778454" />
     <Blob Hash="a1f8c8f28b981bdb03c0b509bc9052b57865bb22" Size="191241" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="95278" />
     <Blob Hash="a1f906c606747e23c23994f561164f2c87db11a8" Size="3066" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="661667" />
-    <Blob Hash="a1fc94b244b33470c4e1291729cef0e21df06a38" Size="85" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1446496" />
+    <Blob Hash="a1fc94b244b33470c4e1291729cef0e21df06a38" Size="85" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1983578" />
     <Blob Hash="a1ff05ee8fac659c1756618b8f42165ee6576bbd" Size="2816" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2083241" />
     <Blob Hash="a1ffeeba93cee84a835cdecf07db2c6a76aadc08" Size="13181" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="901019" />
     <Blob Hash="a200cd0bf5dccad6df5971acc6133a8980b53a7f" Size="448664" PackHash="f673955a77882976d5085992a28ee72f5faffe27" PackOffset="696256" />
@@ -56355,7 +56231,6 @@
     <Blob Hash="a231598494efc59dfd7f1fda14f4ba98e7defce6" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097092" />
     <Blob Hash="a231b24f013035c4eae274191fd8f15cbcebf152" Size="4047" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1513836" />
     <Blob Hash="a2327266c00025ad2d1885dfbcfc4cd5f779da26" Size="57909" PackHash="4aac38fbf89541859c14c7fbf320b1f9deb410f4" PackOffset="1970797" />
-    <Blob Hash="a2365f073e3a63dedaf6adb77ad0d9ae0c68ca2f" Size="8738328" PackHash="ca0729cd56652179cf171cfb460c688068331ddf" PackOffset="8" />
     <Blob Hash="a23dcddaf4a882580a7a416a38e86175fec28cb3" Size="4730" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2053558" />
     <Blob Hash="a24596e20fe10b93cf9f33fdc54b59a468be9836" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1554808" />
     <Blob Hash="a247a9bb79f4983d1d2b030faaf6bd5577f25495" Size="1025536" PackHash="5098f795311987869f91ed638f4c0a395312211a" PackOffset="977928" />
@@ -56363,15 +56238,14 @@
     <Blob Hash="a24c294ea4b20a3c8c2095f001e79b23b84f949b" Size="4762" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1808380" />
     <Blob Hash="a24ddee269294353f347d703c436defefd810134" Size="98248" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="198760" />
     <Blob Hash="a2538c01f9afda1658e989fd1ad545a15d285109" Size="183379" PackHash="937d324929a7f4271842efe0f422cffe7e1c760f" PackOffset="1775593" />
-    <Blob Hash="a2570cc9dc6a0b79dd3a04b6621f79437d37bf3f" Size="3638148" PackHash="3c3d1ec0c865562aeadc7c66de479c39f50cf57e" PackOffset="8" />
     <Blob Hash="a2595c460387444a0e09ab78dd9a3efc9f2f4339" Size="7552" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1497817" />
     <Blob Hash="a25b790907448b22d76784b6d1b7ce40e4e5c1c9" Size="34377" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="597480" />
     <Blob Hash="a25ce8bbf56b83a56e39da0714c048f06b5780fb" Size="20578" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1741570" />
     <Blob Hash="a25e6dedeb1e69de6d03015012cf18a354d682cd" Size="26464" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1058056" />
     <Blob Hash="a260446dd38576b768d0fd3a3f93d2f421a8e535" Size="933" PackHash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" PackOffset="2095214" />
     <Blob Hash="a262cd04c081a49d2e4a3847eaa183e5bde316a6" Size="213" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="224453" />
+    <Blob Hash="a2666c03d4b659ca3f4a08d1deb3c1948eaba728" Size="64706" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="1878530" />
     <Blob Hash="a266c94e01b7bd51882cdc5132a83da82c0f5266" Size="15360" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1421320" />
-    <Blob Hash="a26806f5d9a18815e7005f435cf01a8e3501cb6e" Size="183" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="475286" />
     <Blob Hash="a2698d1c483c2a5a2b0cb40f2bc56bfc8d357135" Size="16727" PackHash="e738e4d1dd54a93f4fba800a115c25fed788b22c" PackOffset="2077322" />
     <Blob Hash="a26ca91a74f144f793a85a7ab8ace27e1498b4e0" Size="10752" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="2075770" />
     <Blob Hash="a26d7440ba652508d5914f5d6edea86f6a641933" Size="2512" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="2080614" />
@@ -56395,12 +56269,13 @@
     <Blob Hash="a29615ba5ecfc082fe8e2efa1e9a94504f4e13a8" Size="185192" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1092017" />
     <Blob Hash="a299f0f59ddf26ff27d39db7f11f716cbdcddcf0" Size="4016" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1233121" />
     <Blob Hash="a29b98a86b174c566dd42650b29e7cb7664ce230" Size="17013" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="276387" />
-    <Blob Hash="a29e0f7ecd5567b8514e9e1cca80e809603515bb" Size="42921" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="797473" />
+    <Blob Hash="a29e0f7ecd5567b8514e9e1cca80e809603515bb" Size="42921" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="1865363" />
     <Blob Hash="a29e33560849ab80c53b53cf95c622837a93f48d" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1539080" />
     <Blob Hash="a29e7e6943e0152771b03c9b6cf96dd75f0e14e1" Size="1844" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1821366" />
     <Blob Hash="a2a0a31e2eaedac98995a779d12956b2bb6f3a07" Size="739" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1315404" />
     <Blob Hash="a2a4e051a602ead09e1e22c1abeb60f4fdf963c3" Size="203710" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="440328" />
     <Blob Hash="a2a7691f7669d2cd24044d018f3340b66a36a0ec" Size="9111" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1900241" />
+    <Blob Hash="a2a85f5a3a359f32b034a1405c25fa68fd8e7294" Size="250608" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="1510078" />
     <Blob Hash="a2a927742422bd26f993ca96f9ea40114564e6ee" Size="783" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2078013" />
     <Blob Hash="a2ad629d4550e23eabf2cce21fe1336925336afe" Size="10496" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="803744" />
     <Blob Hash="a2af3c0cc0fbbe8e240893f0f6735c71b587af8f" Size="239755" PackHash="67f9a57842391bca1072e56b907d2adde02d2d34" PackOffset="8" />
@@ -56410,12 +56285,12 @@
     <Blob Hash="a2bd21090859669c4b6a875e077825381b7e2702" Size="2149" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1112205" />
     <Blob Hash="a2c0a26000262d82e61a681ac89a03f7831d1c8c" Size="3253" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1050208" />
     <Blob Hash="a2c16287efa800215b28598962f3bdd60d707614" Size="343184" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="900296" />
-    <Blob Hash="a2c254ce637d34025f212926ee4d085d05145727" Size="468" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1420589" />
-    <Blob Hash="a2c49f7adaa0bd4db5817e2b94b16acd920d3503" Size="151" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1827069" />
+    <Blob Hash="a2c254ce637d34025f212926ee4d085d05145727" Size="468" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1539820" />
+    <Blob Hash="a2c49f7adaa0bd4db5817e2b94b16acd920d3503" Size="151" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1863885" />
     <Blob Hash="a2c5451e9ac43192cbf6556f54efcb16535c0934" Size="18605" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="957661" />
-    <Blob Hash="a2c79f0f77ee5baef8fcb924ddef77f9353c6338" Size="46" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549670" />
+    <Blob Hash="a2c79f0f77ee5baef8fcb924ddef77f9353c6338" Size="46" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="2097113" />
     <Blob Hash="a2c963b78b38a4df2ed7dc0e86bfb24b3f130f12" Size="3487" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1940834" />
-    <Blob Hash="a2cba3f50a76a6cbda36c2437b6b8e0a511490e2" Size="784" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1438527" />
+    <Blob Hash="a2cba3f50a76a6cbda36c2437b6b8e0a511490e2" Size="784" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1887580" />
     <Blob Hash="a2cc025b2f09d74ee07e18d090cc7ec9e14eb7ce" Size="16804" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1600392" />
     <Blob Hash="a2ce13aa29acefea0509e1c5ead921507f03e2ab" Size="729" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="2096322" />
     <Blob Hash="a2d1d06c53ea47ef53cf0b4e54c4ee48738493b9" Size="7980" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1687984" />
@@ -56429,18 +56304,17 @@
     <Blob Hash="a2e37c419ad5a36e7470fdc7d8fbe2287b195ffe" Size="5117" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="813529" />
     <Blob Hash="a2e7b0ae6d8b78969098f6ab89e4b3b91e9ffbf3" Size="1093" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1319367" />
     <Blob Hash="a2e8d3d6191b336d43e48a65c3ae6485b07d93c6" Size="29706" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="1966795" />
-    <Blob Hash="a2ead2c79d6487cec7affe7769f6ca3137912230" Size="1524398" PackHash="1b66de40bfbc05d191c7100ff8f6be501907256e" PackOffset="8" />
     <Blob Hash="a2ebeb732575a76dbcaca5c6e21bccca7e6a8868" Size="2816" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1739809" />
-    <Blob Hash="a2ef8ba837ab1bef7f522fe7ed614ffeaafe95cf" Size="12628" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1767651" />
     <Blob Hash="a2f36fea318094e17f0f8453c4b8311aa556fb25" Size="782256" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="335068" />
     <Blob Hash="a2f48a525115ab585dc3a97cb607a69fd258826c" Size="4310" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="621699" />
     <Blob Hash="a2f8e0fb45df1d95edbf3918881c0449c42fb13c" Size="15070" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1469722" />
     <Blob Hash="a2fdba0ca961935c365ed1ac1dcb6b7df810f46b" Size="15872" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1264844" />
     <Blob Hash="a2febb31380e12ff01e6f641fe8b4f815941462f" Size="5035" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="851777" />
+    <Blob Hash="a303038b2bc9119465e13010f6e176c70cf7c003" Size="5282272" PackHash="1749a2114faf4b6de33260e138a6e0b1f3cd87a5" PackOffset="8" />
     <Blob Hash="a30392692998891173e834161abca46dfb1ea2c9" Size="64812" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="536258" />
     <Blob Hash="a305183c3db559457b45e0fd99d63042ff1a577b" Size="8088" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1149576" />
-    <Blob Hash="a306381b69887270e2066a1cd4d6a4f6620ede8b" Size="31327104" PackHash="990530b5a6e30a7bcbcf2bb17b48ed0ad24d1a95" PackOffset="8" />
     <Blob Hash="a306584a6605de14396bf378bf122fac8c47c623" Size="306256" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="1773512" />
+    <Blob Hash="a306f877546aa2d9782a86d919bb5d48946353af" Size="2420" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="2091040" />
     <Blob Hash="a30e289829d7fffb2ae1ca45d2dec2ebd56c4744" Size="89441946" PackHash="d9777f2630d8895f260fb35fefdb08047dfaa809" PackOffset="8" />
     <Blob Hash="a30e8f9afee1569674bc2b65fb9698bc808e9d18" Size="8987688" PackHash="1387091feca4c92c781ea85c8cbfd943d265bc8c" PackOffset="8" />
     <Blob Hash="a311215bbf24a882f916a520cd71bc42fc77b61a" Size="14040" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="360461" />
@@ -56450,16 +56324,15 @@
     <Blob Hash="a32009820a9d746cdf40c4886aacd8a681e0859f" Size="2818" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1895152" />
     <Blob Hash="a3240d34b637142e567da737526ede87320704e9" Size="174641" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="61318" />
     <Blob Hash="a325f16ce56a7f64de37f88fc45fc260700d73c1" Size="114494" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1300351" />
-    <Blob Hash="a328ca32109f94d5b4b735b7e4631540d7e3a183" Size="1436672" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="523048" />
     <Blob Hash="a329864471395c7db40b59399caac5f2a3b55019" Size="2322" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="2093462" />
-    <Blob Hash="a32b42d9d1bd480e361261b6256d142e0dd3b0e3" Size="411" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1610099" />
+    <Blob Hash="a32b42d9d1bd480e361261b6256d142e0dd3b0e3" Size="411" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1729331" />
     <Blob Hash="a32de0003be88747581f7cde7dad64a445a87594" Size="15979" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1695259" />
     <Blob Hash="a32de47e1b23d4202eac421889066305889a74e2" Size="39062" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1875546" />
     <Blob Hash="a336e049aea116d5e8ceb771d1166d1ab77d5369" Size="4369968" PackHash="726ae92725160be1ce691c733ac2272294bed300" PackOffset="8" />
-    <Blob Hash="a339961da252a0ea833f568c42862e4dcd045263" Size="181" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1702427" />
+    <Blob Hash="a339961da252a0ea833f568c42862e4dcd045263" Size="181" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1911608" />
     <Blob Hash="a33ae6a57753e54c8aff5f5961ff8db6671c1932" Size="9641" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1291437" />
     <Blob Hash="a33f1aa6f9a0ec9ac05c05778741d4be4343ba1c" Size="106" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="2096984" />
-    <Blob Hash="a33f54873e663e8917110756e1afe60c8d5ea1d5" Size="8346" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1492153" />
+    <Blob Hash="a33f54873e663e8917110756e1afe60c8d5ea1d5" Size="8346" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2029235" />
     <Blob Hash="a34103cdff36db21b421e9cf9ef75c48fb581866" Size="5415" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="873123" />
     <Blob Hash="a342c145253486b187b219a4b5cb034f3f24ebd4" Size="3564" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2003125" />
     <Blob Hash="a349a595712c788ec91608a2a610b87859d14119" Size="11368" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="639600" />
@@ -56467,7 +56340,6 @@
     <Blob Hash="a34cdf7c6ca721d2e62340ba0332446797379b36" Size="4461" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1360124" />
     <Blob Hash="a34e3c31d0604973889d8e32ae751721818f2d58" Size="2029" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="543418" />
     <Blob Hash="a3530de9708634843596096d380b3bdcd77d94f4" Size="67152" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1462083" />
-    <Blob Hash="a35cc7cc1037ef5ec6ee2a855dcf49e906ca57e9" Size="1540" PackHash="dfcbedb69a15a7b6b3055602450d30695e02f4af" PackOffset="8" />
     <Blob Hash="a360ec01e3479b205ac8d7f789a9837395bb3625" Size="12015" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="2012408" />
     <Blob Hash="a362af056206c0ef1a238a72d972f8d642b05bba" Size="100634060" PackHash="7952de7bedfe83054183a5fa9a1bb279be85e12f" PackOffset="8" />
     <Blob Hash="a366d6e4fe18e12069975823597fdcb0484b7cd4" Size="43854" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="420437" />
@@ -56478,7 +56350,6 @@
     <Blob Hash="a374e159d809d6211cbf93491dcb635b7099fe55" Size="179040" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1213399" />
     <Blob Hash="a37c6426bd8329e46b05603f6b1dd0ad2de70530" Size="2357" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1897024" />
     <Blob Hash="a37df07288ea86181fc5d70a64f3dd3072c37b2a" Size="55912" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1300460" />
-    <Blob Hash="a3821eda2123a0930699fe2dcc2e87d31d5ba2b5" Size="1475456" PackHash="d5a3b4767cc133423189e7f59fa2dd8e7923ea59" PackOffset="8" />
     <Blob Hash="a3832ca1b37bd2b4af1d57bbabb8493ecf9fc742" Size="152" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="2096986" />
     <Blob Hash="a3869096eeca7b9bdf2e5921066f29cfb8f07b09" Size="8934154" PackHash="c3f3071445f556a0452dd7bb54953b4dfaddd46c" PackOffset="8" />
     <Blob Hash="a386dab35c1a24b1e060fee64f5c66fd9fdcd125" Size="148" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="364880" />
@@ -56486,7 +56357,6 @@
     <Blob Hash="a38dd52b027df7559ede0b4ff8ef954a81fc0419" Size="7654" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1121076" />
     <Blob Hash="a38e4d8ca9858b8ab12a29b2dbbcabd15fca855f" Size="19415" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1169552" />
     <Blob Hash="a38ed72bae33e3eaad1c588bf99af5ccc8a001a0" Size="649" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="779784" />
-    <Blob Hash="a39078d8544e34e9b1c9c887f2b1f668116278cb" Size="46976" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2018120" />
     <Blob Hash="a391b15ebfb1495253219d03348a63e95a370727" Size="1351" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="946752" />
     <Blob Hash="a39402080d606129f14c8567317a96b6282afa6f" Size="75" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="2097039" />
     <Blob Hash="a395317ed38e04e10eba05ef6ebadf2fa3798faa" Size="6697" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2048626" />
@@ -56517,14 +56387,16 @@
     <Blob Hash="a3cd528b9c212fea97495a557a91d638b1608418" Size="18624" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1152424" />
     <Blob Hash="a3d1905410dbafd9f5e6960afb72998524764370" Size="913" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1166751" />
     <Blob Hash="a3d25e0ce359280e9cda21c793aaedb9152c3870" Size="6242" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1081228" />
-    <Blob Hash="a3d2f098cf0fb3025cc165f776808f52021bdfeb" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554968" />
+    <Blob Hash="a3d2f098cf0fb3025cc165f776808f52021bdfeb" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674200" />
     <Blob Hash="a3d4f1acb5994b3bf2cbd025babb3e57a392011a" Size="86152" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="1702322" />
+    <Blob Hash="a3d6dccce90440d3fec4e204bb76c6c7fded9508" Size="116237" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1169684" />
     <Blob Hash="a3de27fbdd8a618fff2ff03e1606f3e322cf1640" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096564" />
     <Blob Hash="a3e06101543adfb6c69789927c78f39b5b6830ab" Size="7360" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1217672" />
     <Blob Hash="a3e20f2e823071555200a9e88b1f485e0ca2e6e9" Size="3635" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2068803" />
     <Blob Hash="a3e9c271fc207d00f29c49ecc2c6f1343ae95d86" Size="6142802" PackHash="0e1955c8d1171f50f75f6d497f7e313e97d5648d" PackOffset="8" />
     <Blob Hash="a3f4020ffa99507750502f10e918ac6b96e228f9" Size="2164558" PackHash="2b87948471eb4f8dd1ad2805607b01d3bb6a9587" PackOffset="8" />
     <Blob Hash="a3f68a4c6e69433bd53e52b73041575f3b3ac3f2" Size="2018" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1012444" />
+    <Blob Hash="a3fbd3c6a52e40941fec9a3f8d271509a233c796" Size="2346170" PackHash="2b154296edfe9baf32d4501b4b8eda5d03fdf56b" PackOffset="8" />
     <Blob Hash="a3fd9d19dcc7bc4b7847a0bbc36c1f1d37779920" Size="4808" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1700855" />
     <Blob Hash="a40121d91dcbe90c3b5c868a2eece9d5059ffc0f" Size="6151380" PackHash="0811a667bf49e255c1aeba8a98977a731603e235" PackOffset="8" />
     <Blob Hash="a4026c8b13ef38f2171d70974023757ca81a7897" Size="701" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="2095745" />
@@ -56543,7 +56415,6 @@
     <Blob Hash="a43176bebc5b4d7144a7e1109e0aaefd95c21ec6" Size="190" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="346455" />
     <Blob Hash="a43468e120e585e2dcc20205ba1d1e2ccb6c0bc2" Size="431" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1155150" />
     <Blob Hash="a4386eb1a7d5a8b12d81a8187397ff0ddee5221c" Size="1344" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719834" />
-    <Blob Hash="a439042fbd54a97edf9bb2e5862ef780240cff85" Size="3333460" PackHash="36ce1ce180dfc4872d2c6442884d26ec693f04ed" PackOffset="8" />
     <Blob Hash="a43f721a8afddca4091da966fdde2eff0448c74d" Size="35843" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="788241" />
     <Blob Hash="a44044ee9c14496bcf84a70990574fe11fbc9ee3" Size="2260951" PackHash="bebe4d5532037f76b997501c57b9b5e4f8ce623c" PackOffset="8" />
     <Blob Hash="a44147a864cb208928a38e00c450f8bf210c1bbf" Size="149121" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="685011" />
@@ -56553,17 +56424,17 @@
     <Blob Hash="a449b267c78e978b9323fd04a205e6ba2bed2c58" Size="524" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="2095141" />
     <Blob Hash="a44ea4073fcc55922a5889704ae7afaef5847801" Size="26940" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="549279" />
     <Blob Hash="a44ea6bff7dd37d974407e60867fa229484984b1" Size="420" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2094863" />
-    <Blob Hash="a458727a54b076e4e11da2e5dbbf104f017d7da3" Size="1079966" PackHash="142ddd26a143aeb02ee0ebc41be2e53c051e8680" PackOffset="8" />
     <Blob Hash="a45d9b44b1fb6b816256aa8a56fe18835c35df10" Size="3032" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="648586" />
-    <Blob Hash="a4606d65e040b1b40f2cab2b46c67d306be673cc" Size="372" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1587176" />
+    <Blob Hash="a4606d65e040b1b40f2cab2b46c67d306be673cc" Size="372" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1706408" />
     <Blob Hash="a4624996aeb87a411e94c269f17d7161dc8697f5" Size="373967" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="789630" />
     <Blob Hash="a4645009fb5a905a0f8ff6a03d1a0ee4bbf1a30d" Size="124004" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="1437655" />
     <Blob Hash="a468c2de5b98fabfa37c5867b0ae371f005cfb3d" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="367116" />
     <Blob Hash="a46ba55c86c3ac3bf650aeea634d17cff5e1d345" Size="15903515" PackHash="8196440d528a0b18b7e8c3db78761c5ed70ab5c7" PackOffset="8" />
+    <Blob Hash="a47030015aca033c175bab53262726864afdc3dd" Size="1089" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1762028" />
     <Blob Hash="a470dc24390d903180ffe8eb856d06bd3ebd0a88" Size="3228596" PackHash="48629c762a939d30a112f72bafdefac4ca31acbd" PackOffset="8" />
     <Blob Hash="a47224ee263356bcca07ac31d8861d587dd9dfdc" Size="185" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1353249" />
     <Blob Hash="a474f1aaf127c1fab2bee22aebb37e4c31794922" Size="4979" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2089847" />
-    <Blob Hash="a477878d52afe936f301677e51f2af267d5c712d" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551844" />
+    <Blob Hash="a477878d52afe936f301677e51f2af267d5c712d" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671076" />
     <Blob Hash="a477d27c50df8d67ee8a8a6b64b8c7976e898d6b" Size="10735" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1958713" />
     <Blob Hash="a47829f852e7a456e3ecd048c889a3539ea724e2" Size="19499" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1407105" />
     <Blob Hash="a4790dc8757cba36c7967a57469efe1d7ea8dcc7" Size="151984" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1206020" />
@@ -56574,7 +56445,7 @@
     <Blob Hash="a486a85ace891f1c553ec216affe743eb4219efd" Size="37146" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2032918" />
     <Blob Hash="a487dbf64e5f2f147f714297a73790e96afefad1" Size="9229" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1930551" />
     <Blob Hash="a487e2adfd52282467aa6067818a83c09a068117" Size="180" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1281908" />
-    <Blob Hash="a48b3e94a0d9e83db825a38858f9deb3f83049e0" Size="282" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2096875" />
+    <Blob Hash="a48b3e94a0d9e83db825a38858f9deb3f83049e0" Size="282" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1530275" />
     <Blob Hash="a48e63e7f2dedfd51b7b0ebecbc0d8a90a775be2" Size="18198" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="2064520" />
     <Blob Hash="a4904d8860695ca30a5fbaf388c37da9b98a7694" Size="23785" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1104794" />
     <Blob Hash="a491f0e66428897324e31a282c1f6b0fb10b73c6" Size="4761" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1193312" />
@@ -56583,27 +56454,25 @@
     <Blob Hash="a496b989f545576e03e4e06182c10cddd701a5ef" Size="53680" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1375714" />
     <Blob Hash="a49810dd136d884b41c72e9d219f7583a2b448dd" Size="15791" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1223299" />
     <Blob Hash="a49a9a32c3e9c32bf4f9518a7e632fa4c3eace84" Size="5892" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="360446" />
-    <Blob Hash="a49bea50ad0bc0b74e3035c98bb782160abcfc59" Size="3089408" PackHash="9276bbba451cd046e0fe5e6b18ab4de8dad22196" PackOffset="8" />
     <Blob Hash="a49c8e7154aa172e4837ae0cde08e1a15208f748" Size="1199" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1981125" />
-    <Blob Hash="a49e332985af16364f7474c9ab4238b192768091" Size="1680" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2095184" />
+    <Blob Hash="a49e332985af16364f7474c9ab4238b192768091" Size="1680" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="2095374" />
     <Blob Hash="a49e9f631c3dfa10306bf5c28935da3630b8795f" Size="18236" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1896320" />
     <Blob Hash="a4a1ccff4ef6940cc19d04586b30388ab0fc919d" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2079487" />
     <Blob Hash="a4ab9a4185962bcaf67924476ce8764778b54981" Size="389396" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="980066" />
     <Blob Hash="a4b0192b703b838c0bb66c76d0a19a21007138e9" Size="7222" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1588593" />
+    <Blob Hash="a4b0ce93282209cedf9c8334024f6bf70d8a17d5" Size="6187980" PackHash="4d8cbf954dfbfc4686d0867c19852cc7a2a0ecda" PackOffset="8" />
+    <Blob Hash="a4b47fa870d270266f5666df51bf5f8aef676ebc" Size="22714128" PackHash="d0cb05f132343eae7988363c6918520a91218a24" PackOffset="8" />
     <Blob Hash="a4b5132cff13bb2f5694d50f695fc1675ccafea9" Size="285" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="186914" />
-    <Blob Hash="a4b5c06c4a07647fcb8da5675ec533628c0a4294" Size="1382400" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="8" />
     <Blob Hash="a4badb754f73e876c0108df8a24a89264d0e9699" Size="8620" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="763403" />
     <Blob Hash="a4bf8c9d7f63a33a61031a51fa57fdc482618aad" Size="9295" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1981638" />
     <Blob Hash="a4c8613d508996ac3cfe7d66332b315d8f74fcd0" Size="3291" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="916879" />
-    <Blob Hash="a4c9f7af55a6869397eec65dc1588d873164643b" Size="1116634" PackHash="ae4c08cdf8410cbffad337caa4a43e8c3d108836" PackOffset="8" />
     <Blob Hash="a4d277108ca95565a18fe8dd9c84dc2fb52fcf0f" Size="1475947" PackHash="12eb0444499ce41f101b1b5f9dd6b87894949511" PackOffset="8" />
-    <Blob Hash="a4d316c404ff54ca545ea71a27af7dbc29817088" Size="571091" PackHash="31dd9591243d030e4aa920c6b1711cd82672e2af" PackOffset="1297484" />
+    <Blob Hash="a4d316c404ff54ca545ea71a27af7dbc29817088" Size="571091" PackHash="2e859b9ceef48f55e7e7f6c05869680f93148f93" PackOffset="1056518" />
     <Blob Hash="a4d3791e200210ef4304b1d645b82b8d42746a21" Size="16096" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="2071547" />
     <Blob Hash="a4dca021d677b129a6c34db8f52bf1714a9e8aa6" Size="8768" PackHash="2944a0052b881a644f04844186daa4ae54aad523" PackOffset="2038022" />
-    <Blob Hash="a4ddd4a8418992997829c2c153680420dda0ef90" Size="333880" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="1569856" />
     <Blob Hash="a4ddee9bb0e9fec59eb727a69ec4e99a8f8f1499" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="589048" />
     <Blob Hash="a4de701b81a64f0f7dfd67e6f13fd66feb3f0bc4" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1214754" />
-    <Blob Hash="a4e22b0d2b5a591bf1ea966638ae6006192ba61c" Size="3673" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1974125" />
+    <Blob Hash="a4e22b0d2b5a591bf1ea966638ae6006192ba61c" Size="3673" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2082876" />
     <Blob Hash="a4e27f698f09dbf8d80da850f5bc49e298a02ff1" Size="92472" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="221271" />
     <Blob Hash="a4e4cae0aec9c915ab402eb15d191df2d97256ca" Size="1680" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="2090539" />
     <Blob Hash="a4ec5f0cb2ee0edeaadac42d6f9b741e09557ffa" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2072766" />
@@ -56613,7 +56482,6 @@
     <Blob Hash="a4fb2f9c124ee39efab19cd6309670d6d16eca86" Size="137" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="431340" />
     <Blob Hash="a4fc9725ec2f581f952dd4e4ceb121439a8c8379" Size="6574668" PackHash="bd969e12b2d210ce0b8817860e18034a3a30c510" PackOffset="8" />
     <Blob Hash="a4ff87401a7f360594132f36e6186e3cc32128a5" Size="3744" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="837387" />
-    <Blob Hash="a502f94af3d1e7885cd7bd2f4cceb9d7df0579e6" Size="4035784" PackHash="921fd0bd36e67ba125f632866c27386dfbb73e7f" PackOffset="8" />
     <Blob Hash="a503281c12736b6c2269131ad3beefce3d388266" Size="2048" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1939012" />
     <Blob Hash="a504f692778622c0ac18f5f2d10aaf34b7359764" Size="198656" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="606728" />
     <Blob Hash="a506cea2ee4b5579701d331ead42221b9d007815" Size="37267" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1712277" />
@@ -56625,18 +56493,17 @@
     <Blob Hash="a5104245b0e9616550d75522c3bbaffdac1b8b68" Size="4154" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="780328" />
     <Blob Hash="a515006de7638421b43a69d73d0a9bab5f6b6b3c" Size="2404" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="2086597" />
     <Blob Hash="a516c201c401d278e96117292737a5c953b74aa4" Size="2870" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1272262" />
-    <Blob Hash="a51dacb29beb2f1d2b3549af017457efbc63d79c" Size="1130" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1320109" />
     <Blob Hash="a526680ecce3d4284b478a43071e2a2eb2c3c768" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096992" />
     <Blob Hash="a52715d26fd27033bb8a842fb664993290304328" Size="186" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="931744" />
     <Blob Hash="a528f10f3cd0df257dd91beb0e4f8583a8a482a5" Size="108514" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="976427" />
     <Blob Hash="a52bcd8c2091f8e4cbd1f33c98f0a16c837af0f1" Size="1623" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="616637" />
-    <Blob Hash="a52d578cde3f3a738b5a86728f9156ec9a8e5331" Size="742" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1466805" />
+    <Blob Hash="a52d578cde3f3a738b5a86728f9156ec9a8e5331" Size="742" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2003887" />
     <Blob Hash="a52d8e0933c8dd16b1ead0abc36808e5011a5748" Size="34423" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="296379" />
     <Blob Hash="a52e98750591766d269abc92c31af5f6bc2b4013" Size="16296" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1682360" />
     <Blob Hash="a53807aa6e6d4d4f10ae9190599b54c883d521d4" Size="6245" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="242223" />
+    <Blob Hash="a53da6afc994f48f3ff399d17d8fa8904d1af9fe" Size="5488782" PackHash="174cf9700765a2df5854b7af0279ade549dae22d" PackOffset="8" />
     <Blob Hash="a5480eb8ffaaaddf6dbaef8d54f382a64de7d7ff" Size="15400448" PackHash="129909952ed6001fa57124f3e9420f90038fa84a" PackOffset="8" />
     <Blob Hash="a54ac1b0ad581370c20f3640416745628f31f7c7" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="658952" />
-    <Blob Hash="a54fd412731b9e7eb710b18d12f87c12617968c6" Size="2346170" PackHash="7c398d1b0f8b9f7bc645e23621e20406b54ef239" PackOffset="8" />
     <Blob Hash="a5531e16eb61f1292547fb4fb469ddf37bf26c0f" Size="1675190" PackHash="6d87e18f2c4e02c27ee937277e8bd1b8e2a9ebf8" PackOffset="8" />
     <Blob Hash="a55466506b709623eb4ca26b5eb9b7e994033321" Size="2275" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="2094416" />
     <Blob Hash="a555c6e75c429f483beafc0fbb2da7734d3c3b5d" Size="6955" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1128579" />
@@ -56661,15 +56528,15 @@
     <Blob Hash="a5804ce74ac5e08ab261903902aee1ab8e9ea396" Size="7882" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="491424" />
     <Blob Hash="a58122587e72cbe112598ad8dab820ff981b2247" Size="3810" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1689787" />
     <Blob Hash="a5815470f7244957657fa03f6775c7dad574895b" Size="245556" PackHash="17b957ba8ae675e848e0d5ea9a42372ed27725d2" PackOffset="1138736" />
-    <Blob Hash="a583550af36fb6217386b8769f79bbaaa0b90ede" Size="1461" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2043450" />
+    <Blob Hash="a583550af36fb6217386b8769f79bbaaa0b90ede" Size="1461" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2094775" />
     <Blob Hash="a586a6a229e55a8af257c8ed0cc7b8eae2276b26" Size="7433" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1655226" />
     <Blob Hash="a5875455a9a76d417487d7e1941a65e0f3698522" Size="3284" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="328328" />
     <Blob Hash="a5888488e493d175fb9d365f846bd888bce4936b" Size="6615" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="2088896" />
     <Blob Hash="a594fbd34168d7956ec9d03163e1ebbba0842197" Size="1472" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2086686" />
-    <Blob Hash="a59696cad9ebb157e96a40eacc6f204632cb26bf" Size="928" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1002890" />
+    <Blob Hash="a59696cad9ebb157e96a40eacc6f204632cb26bf" Size="928" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2050407" />
     <Blob Hash="a5970ee5c741ed43dc9cfacedf968a1bf6643c46" Size="21043" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1897968" />
     <Blob Hash="a597e30afe8a410f6cdeeb1dbe2f90c30692789d" Size="556186" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="8" />
-    <Blob Hash="a59abe1443d7af7c3d0d0cda3cd6451f04ca6a53" Size="1169" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="995077" />
+    <Blob Hash="a59abe1443d7af7c3d0d0cda3cd6451f04ca6a53" Size="1169" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2042594" />
     <Blob Hash="a59b7bb0614fcda19b975f016b8b507d311b244a" Size="5326" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1285984" />
     <Blob Hash="a59bc0a4b3081c45e667de14f8753188978d9a0e" Size="910" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2091398" />
     <Blob Hash="a5a24dee281c1c78adeadcd18e03c942408ea661" Size="20160" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1808389" />
@@ -56685,10 +56552,12 @@
     <Blob Hash="a5b5d02296c3649d9cc38619c846eb4c91c20114" Size="2175" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1978950" />
     <Blob Hash="a5b69f72212acf4ad492354439530f9ced4c72f0" Size="1348" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1633620" />
     <Blob Hash="a5b82c16bc0ca11f2db9ab02b97aca92db982f8b" Size="36374" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="1686928" />
+    <Blob Hash="a5b82f44bb1dedb8016f0b75b1beb6562db03820" Size="1070156" PackHash="b6dfbd00039d6429b88b17309b9194259ee93a62" PackOffset="8" />
+    <Blob Hash="a5c256edb818f69e707e1e14a542b1e1cf6432a9" Size="5359512" PackHash="9ddb6e6c8bf8161b80d610cd92424e4d8d8923da" PackOffset="8" />
     <Blob Hash="a5c5bc31295e7eceb4526767400c871415acda15" Size="470" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1709767" />
     <Blob Hash="a5c93588e73bc8dd77546641e8f738ee4abe0f84" Size="3108" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="163017" />
     <Blob Hash="a5cacd2fdb683cced917e846c6780ff68f12e598" Size="10085" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="215156" />
-    <Blob Hash="a5cd6c892df9cfe00a169b6b207b67b8e6be23f8" Size="412" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="2096637" />
+    <Blob Hash="a5cd6c892df9cfe00a169b6b207b67b8e6be23f8" Size="412" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="2096746" />
     <Blob Hash="a5ce6decc087a36cec7085c9e18effde8d9eb320" Size="20055" PackHash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" PackOffset="2070033" />
     <Blob Hash="a5cf0dfeecb1135b47830a76bdf46185a5261bb0" Size="4860" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="786043" />
     <Blob Hash="a5d432d48a9b53b742dd531e83f1c1c82fe77616" Size="3211" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1344465" />
@@ -56702,13 +56571,13 @@
     <Blob Hash="a5dfa4473ba5a72c3b3a10221da6816081d4b833" Size="2067224" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="8" />
     <Blob Hash="a5e019a88a1133f4f8090177241a5afd9d05e31d" Size="174569" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1671972" />
     <Blob Hash="a5e1658515d1bc6feda62c97e0686308db8a8c41" Size="3542" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="534948" />
-    <Blob Hash="a5e3edaca8b7baa25103da7a2a9d70cc12bb1bca" Size="21254" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2040422" />
+    <Blob Hash="a5e3edaca8b7baa25103da7a2a9d70cc12bb1bca" Size="21254" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2053996" />
     <Blob Hash="a5e4e27c471ad90dbc241a7c7ff322764fd3cb05" Size="37370" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1071664" />
     <Blob Hash="a5e50e9f465227872cc3c60afda52eb3e33cbc45" Size="23920" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="287411" />
     <Blob Hash="a5e56cf99d80334a7161dbe55bad78dc137a8266" Size="8695" PackHash="4cd1d29d63217d8c35aeb9eabacc3157ad7cdcbd" PackOffset="2085088" />
     <Blob Hash="a5e6fd35653b9cc7bb8febb12b05c40397dc240e" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="587639" />
     <Blob Hash="a5ec5370036db3a624e11405538259e7d93e65da" Size="263" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="405254" />
-    <Blob Hash="a5efcce276c15d58bfbfdcaa5519b9ef9645a403" Size="794674" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="8" />
+    <Blob Hash="a5efcce276c15d58bfbfdcaa5519b9ef9645a403" Size="794674" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="631048" />
     <Blob Hash="a5f19bb53e367b3436699e61ff20180a3b38b35a" Size="274" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="472671" />
     <Blob Hash="a5f49c54565af38fc44fc47a169adad7cbd05a0e" Size="7672" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="819373" />
     <Blob Hash="a5f4a331d8b76272f8ff8efca50d0bc5751517ec" Size="2765" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1804933" />
@@ -56719,7 +56588,7 @@
     <Blob Hash="a60075476b5321bd1000a309bc894dd6d8c24abe" Size="70112" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="799448" />
     <Blob Hash="a605e07423e78cf8103b30153238d036cde77c62" Size="149392" PackHash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" PackOffset="883760" />
     <Blob Hash="a607ea6b0d6408efeda63130604e12283b3acaf0" Size="2623" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="2093522" />
-    <Blob Hash="a608b65546bbc1fb323277695afbabe2773b02dc" Size="877" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2040119" />
+    <Blob Hash="a608b65546bbc1fb323277695afbabe2773b02dc" Size="877" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1931250" />
     <Blob Hash="a60993660da7ee9eec9640e5b362a4969aaff2ee" Size="80562" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="172378" />
     <Blob Hash="a60b0a5aabe4295fd99068203f53668b948bc1be" Size="16564" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="592980" />
     <Blob Hash="a60b2a0dc7d28370c8c9e9fd974b12c462f4a499" Size="213" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1159830" />
@@ -56750,17 +56619,16 @@
     <Blob Hash="a63b3f6d6f04995bf01fc05f653c3deaf4758b71" Size="2874" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1998478" />
     <Blob Hash="a63bc0ca0da40fa2355497e0097d7f964fefb34b" Size="8314" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1970288" />
     <Blob Hash="a63e900a9257e9d73b4bb4bacba8133c3d1dc41b" Size="154" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="636365" />
-    <Blob Hash="a643675903ee16c66a58bd6bdec2355ba8fef556" Size="508" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1589266" />
-    <Blob Hash="a649692b7e8b4f5bd13bd21651c465ba8ccc2220" Size="25088" PackHash="59d6ba0bbf5662592fa95dc9ce7c7f4749ea1765" PackOffset="2070668" />
+    <Blob Hash="a643675903ee16c66a58bd6bdec2355ba8fef556" Size="508" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1708498" />
     <Blob Hash="a64b8b397a5dd23f6ee5ba1ea53d8c463dde3e00" Size="1589806" PackHash="85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c" PackOffset="8" />
     <Blob Hash="a64f21191375216b208fc6d159b5a7dc9ce8e7e7" Size="337" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="202992" />
     <Blob Hash="a650cd85300c7b769d4bee123e7a82e9ffe2759b" Size="3829" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1340942" />
     <Blob Hash="a652a7b697573284034fd1b1c8dea4a237c1eff3" Size="1554686" PackHash="d63c4c238a195e3f8e062b2a9cf0757f0ed55587" PackOffset="8" />
     <Blob Hash="a658c6abe017b1188298e924625de0327c7eefc8" Size="2632" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="768976" />
-    <Blob Hash="a658ec23530260b07a04291d5119c17353e9e9bd" Size="2534" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="2093319" />
+    <Blob Hash="a658ec23530260b07a04291d5119c17353e9e9bd" Size="2534" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2084621" />
     <Blob Hash="a65de9105ba185fbcbe728c31f62aeb3f738829b" Size="37433" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1434608" />
     <Blob Hash="a65f7c9c11c8f7d049518b619a60376d99f1ed4c" Size="2956" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2093564" />
-    <Blob Hash="a661860f93d2053774ab00d512cd5634bb1f0c80" Size="454" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2093663" />
+    <Blob Hash="a661860f93d2053774ab00d512cd5634bb1f0c80" Size="454" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2096644" />
     <Blob Hash="a665560272d855781d39a51269a4b47c1e40ed57" Size="777" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="427489" />
     <Blob Hash="a66a6f5a2e7e986cb3245dea30396cec1696ac1a" Size="4493034" PackHash="f157bb3359c7b53b5bd8e551e9fa75d25c905592" PackOffset="8" />
     <Blob Hash="a66da0b91a0a8de3d29b0c9aeba3d5e141b15903" Size="3083" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1702653" />
@@ -56777,26 +56645,24 @@
     <Blob Hash="a6804ddc78b84eac232c76c9f55402d716bf987f" Size="7632" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="111139" />
     <Blob Hash="a68075277b779a4d0aa9af20a20ea10a05d16fef" Size="3993" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2064552" />
     <Blob Hash="a6811ded039b873022811800eb296921a4144000" Size="911" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2039387" />
-    <Blob Hash="a68b87d40df7bbc2e1795d2bae6f712da104f75b" Size="2060494" PackHash="ec8c4cca33997379588b3720df90aecdfe4279bf" PackOffset="8" />
     <Blob Hash="a68f52c1941f7d287a90a7287f01142d1deb5e2a" Size="3410" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1000665" />
     <Blob Hash="a68f796dbdc8eb90158c5db9539f3d38c05b5353" Size="3036" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="31633" />
     <Blob Hash="a68f84a8bb0ad6c9e0054af85dfbc210d60e3ee4" Size="6220467" PackHash="4e9f7803c8f762bae7a811dc659819392118f283" PackOffset="8" />
     <Blob Hash="a6900022922040d156673b0ba56b11fff6acb920" Size="620622" PackHash="6a62a64a9601d1028e98c3f9d8d1ce2dbb93b1e9" PackOffset="893948" />
-    <Blob Hash="a690b08521e0291f64f63bfc175aa0d1513e9acd" Size="586" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1589774" />
+    <Blob Hash="a690b08521e0291f64f63bfc175aa0d1513e9acd" Size="586" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1709006" />
     <Blob Hash="a691e2c8b081ed2110e775c28914265d4b6cd965" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1995105" />
     <Blob Hash="a69501b2a55d3273dde111f096c4cfe8a1a0130c" Size="3315" PackHash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" PackOffset="2076783" />
-    <Blob Hash="a697e1e86b98c7cbda9c8bf23688b2fcca9083c8" Size="115761820" PackHash="0a16f39fc41ba29b49b8b925e900b1aacbcd5c5e" PackOffset="8" />
     <Blob Hash="a69d07fb77072d1966df48361ba494bd484a7f4e" Size="199" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="381320" />
     <Blob Hash="a69e04e0577dd1835708d0e88e99715613297f1a" Size="5608" PackHash="cc49483dab5945dfdb5724566e0b13cebf5e72d8" PackOffset="2080931" />
     <Blob Hash="a6a072f8dc2bccac30c43338d28ef42ffddff556" Size="556054" PackHash="bd015e7592fba2109a78a6a8f3e4b3c85d0c9a10" PackOffset="8" />
     <Blob Hash="a6a2cb0b4bf0910b44df2d9bec9cf1da2cca20c9" Size="1313" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="2095147" />
-    <Blob Hash="a6a40a5dac2ddb8b78d970e674ac5e07819610a4" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556516" />
+    <Blob Hash="a6a40a5dac2ddb8b78d970e674ac5e07819610a4" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675748" />
     <Blob Hash="a6a5be1babd36c1795e78e3c2196f2c1e1b64b60" Size="6729" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2012302" />
     <Blob Hash="a6a637da69b452c3d3b47c168875e813c62f1ba8" Size="410" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1722168" />
     <Blob Hash="a6a6c083a7917e7675ef98ea0e872f9580d69057" Size="179" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2086413" />
     <Blob Hash="a6a71d6d015de1386a765e9537ccac36323eeca3" Size="4623" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1757639" />
     <Blob Hash="a6a80066aadc65b18ba40784baefeb4f2e6bc7bd" Size="1224" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1585307" />
-    <Blob Hash="a6a821820f96712fe10d5b3ffb4b8c64bc4e0f93" Size="1971" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1684070" />
+    <Blob Hash="a6a821820f96712fe10d5b3ffb4b8c64bc4e0f93" Size="1971" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1699895" />
     <Blob Hash="a6aa86cc5a1492b85dce04d235f7a41099da842b" Size="120666" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="830679" />
     <Blob Hash="a6acb6e30a3ab5580baff3715b4020e33ba95e21" Size="11093" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="91364" />
     <Blob Hash="a6ae6d0c332c37bce8bc02ee2a796ebfe1917712" Size="225" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="383214" />
@@ -56809,7 +56675,7 @@
     <Blob Hash="a6c0d812d131cc5a667c67db29e3c68cde06dfe1" Size="37406" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="842835" />
     <Blob Hash="a6c223bbb5b282aa1c511cb9bff20501677dafa0" Size="59392" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="8" />
     <Blob Hash="a6c2d3551ef1e4b7f17077ebff67942b29ee9b78" Size="7362" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1308078" />
-    <Blob Hash="a6c3164c3630cb348cc20af7a9cd61716b792173" Size="2463" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1120274" />
+    <Blob Hash="a6c3164c3630cb348cc20af7a9cd61716b792173" Size="2463" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="2094387" />
     <Blob Hash="a6c3b03374d204335db1b0c4ad31b3fe184c627a" Size="253631" PackHash="f3f1ca47a314d4a4c7a35b4a0028f2dd893cddff" PackOffset="48344" />
     <Blob Hash="a6c538a7f31317c1386e041311af392a742bc83e" Size="9229" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="229142" />
     <Blob Hash="a6c811ae37c37b3aca97ed1ccb824640af5de408" Size="5392" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2018475" />
@@ -56818,7 +56684,6 @@
     <Blob Hash="a6ce85572ffe90296316cb5e37cc49c0008d4d7e" Size="182255" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="884798" />
     <Blob Hash="a6d036536b260191a9870cc1118fa7b8cc31d876" Size="958" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="660556" />
     <Blob Hash="a6d118370a329f485ad648f8fe0fa339eaead4d8" Size="17698" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="753634" />
-    <Blob Hash="a6d1e093ab83d4a349dbeda3c655ccef59313fa5" Size="179290" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="1498838" />
     <Blob Hash="a6d2adef5f4367dc7d8c77ae953e35429be10d46" Size="214" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="384515" />
     <Blob Hash="a6d4aaddb43498e9d81ba6da09f404760e2fd7e9" Size="70656" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="605148" />
     <Blob Hash="a6da1a457a4cf25b1c707e59bc813e1d659749f2" Size="626" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="487990" />
@@ -56827,32 +56692,30 @@
     <Blob Hash="a6ea9a8c1aa73e07211aa7fe89524d0939ed782b" Size="8048" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="56220" />
     <Blob Hash="a6ead02ade272c0f0839b50c1ff2ee2e2278d802" Size="96" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="474656" />
     <Blob Hash="a6eb3460a9a157e51a8fbeebc7cfa08d610653d8" Size="232109" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="203614" />
-    <Blob Hash="a6f02f4b490b36067207fe50530b13e24d06a3be" Size="762512" PackHash="8557924e60fcdd015907d69d205b21d58fccf17f" PackOffset="652776" />
+    <Blob Hash="a6f02f4b490b36067207fe50530b13e24d06a3be" Size="762512" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="652776" />
     <Blob Hash="a6f0452e45384ca6901694dc25ab20e87fe40b15" Size="216295" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="1763784" />
     <Blob Hash="a6f14373dbd0b65b4ba2fa9dd03e972fb91b731f" Size="34800" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="979984" />
     <Blob Hash="a6f65c0d354b50ea393054969bf58ccf984e79c8" Size="1356" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1097840" />
     <Blob Hash="a6f75b70684355689917c6a7264a83d0ec1f0bfa" Size="117142" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="1239753" />
     <Blob Hash="a6f776c7b40544338d54a2a81a5e1b72aae94246" Size="16286" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1983351" />
     <Blob Hash="a6fa8c0b86ba2708843557de1de321ecdf6cc1a0" Size="1042" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="2095734" />
-    <Blob Hash="a6fa99a919dff1ffb8e4d035081fa7e0bfdd01b2" Size="42416" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="2050164" />
     <Blob Hash="a6ff345dd48cacdd3f760bf71889aa331f1c741e" Size="113575" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="242984" />
     <Blob Hash="a7067459aa2bc8ca270697c2fea6a92dc11d7253" Size="8682" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1214465" />
     <Blob Hash="a708865839c3857bbd22721b34f67327f3b2046c" Size="18076" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1837404" />
-    <Blob Hash="a7088bc59790ee8f8fc2f35eef91b4410bde9ef9" Size="376" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2096698" />
     <Blob Hash="a710b69b3c424ffc64dd9f34277f73789387d786" Size="576769" PackHash="410e46447d67d73c00b681403bff72bd1c8db3e1" PackOffset="902118" />
     <Blob Hash="a712d7b4b423b14bcff9bfaed36f14c9d58987a8" Size="358" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="896489" />
     <Blob Hash="a71455b3a677f2b8d0a4f7d054b96e409d7b7069" Size="3829" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="235030" />
-    <Blob Hash="a714b634ec57c71bef2e5f8ecfb558d6838ddb06" Size="17367" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2069796" />
+    <Blob Hash="a714b634ec57c71bef2e5f8ecfb558d6838ddb06" Size="17367" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2050420" />
     <Blob Hash="a714ec9da647b354c4fc8d0ac0680d0ab2d9416f" Size="135" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="445741" />
-    <Blob Hash="a7182ebed750be8e440a60bc33b4afb13d0c8159" Size="417" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1417516" />
+    <Blob Hash="a7182ebed750be8e440a60bc33b4afb13d0c8159" Size="417" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1536747" />
     <Blob Hash="a71986a57c8c5183da3bce1131b663a57e975b57" Size="38942" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1241310" />
     <Blob Hash="a71b2564d041cf30410fc2d069da74588e6b7f20" Size="148669" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="530410" />
     <Blob Hash="a71d51aa466599b32ca3e77104d96cf403f7e2dc" Size="1632" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2089160" />
     <Blob Hash="a71d7a38df09ddd23130e84ff2a2415b467c18d2" Size="22297" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="320020" />
+    <Blob Hash="a71df503fab3ad2b8d26b29ffbee96361a83ef16" Size="1382400" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="8" />
     <Blob Hash="a72058ad0e2d1aca4968520b38d7bd1797f79e29" Size="7446677" PackHash="f859fcf20b1d5912f1dd1fba6f9bd4393a014968" PackOffset="8" />
     <Blob Hash="a720b99dd2da11f1eb77bee55609dd26917574b8" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1450340" />
-    <Blob Hash="a7221bf9284e3182f8da224a11c2cf70687eb217" Size="1056976" PackHash="aa29e83247e30bb95e845eec97d2557aa776271d" PackOffset="8" />
-    <Blob Hash="a722d43e600b34b2165806fa37026bec5517b7eb" Size="576" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="2096355" />
+    <Blob Hash="a722d43e600b34b2165806fa37026bec5517b7eb" Size="576" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="2096260" />
     <Blob Hash="a7243c698a7263bbea0d7ff02a58217badd3a482" Size="15060" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="1878913" />
     <Blob Hash="a724b19d657e490ba3f037c07edae38f8136c19f" Size="1084" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="718812" />
     <Blob Hash="a72736687f725b2f8a0a137fb8d816d9b928f8f4" Size="500" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1277468" />
@@ -56866,7 +56729,7 @@
     <Blob Hash="a73886da89ffd2482069db5b3d180765095e7cd5" Size="30401" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="373317" />
     <Blob Hash="a7396f1741f02c6c208fd1286362e4e0720198b8" Size="204" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="163730" />
     <Blob Hash="a73acca0b8a2be526bcb4c635ebb18a00fb5e8ed" Size="324862" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="535319" />
-    <Blob Hash="a73b60a86b317ed8b2ddf7431aa6a0a0e8f23f85" Size="3439" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="2090142" />
+    <Blob Hash="a73b60a86b317ed8b2ddf7431aa6a0a0e8f23f85" Size="3439" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2086364" />
     <Blob Hash="a73b736926549bab0c56d30a39e6c1afaa6629d3" Size="4550" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="719153" />
     <Blob Hash="a73d39459564b39364bd35d755cc70c5bd6dbd43" Size="37400" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="1983617" />
     <Blob Hash="a74363e5bf108dcb92ffcf577889ed6cae7d645b" Size="8481" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="406586" />
@@ -56879,6 +56742,7 @@
     <Blob Hash="a75ed2c5830deb09ebd4909bf182699c897c75ba" Size="11685" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1267322" />
     <Blob Hash="a75f2f913c51c8a39ddbddd93ee781082b911616" Size="5363" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="646463" />
     <Blob Hash="a7626921baa7931ae71c58d8e4bedeb2c2c8d5ca" Size="223869" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1656874" />
+    <Blob Hash="a763747f9cb3ad10436ddff2cb50dbcec1a0ed6e" Size="17030292" PackHash="3ff76123e9b961c8e17b2354f4735366a14f44f1" PackOffset="8" />
     <Blob Hash="a76aa77a901868e429646c5e30a5f2005e78adf7" Size="114715" PackHash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" PackOffset="1300999" />
     <Blob Hash="a76bfe7a2b34c6abf5d18b88b1c4b6e481f71234" Size="63256" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="719496" />
     <Blob Hash="a76c0755734449523517900784662187221326f9" Size="1322" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="274321" />
@@ -56926,16 +56790,14 @@
     <Blob Hash="a7e9ad51bf460b70e8ba23158ab7528a0ca056a7" Size="1442" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="2056552" />
     <Blob Hash="a7ea2c1c2d3192c45982d3ddb10c4e190dd3f191" Size="117314754" PackHash="55ff2a6439bf4bd97174230f87f74f78ab23c7a5" PackOffset="8" />
     <Blob Hash="a7ec270750419f1e3d6bb0042e1f297ce9913a81" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="677280" />
-    <Blob Hash="a7ec5d4398df35a92ff2f2b3ed9d120e21756c46" Size="332084" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="1110024" />
     <Blob Hash="a7ed7a02fc1ff4684344aac51e9912bdd2265fae" Size="34268" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="349952" />
-    <Blob Hash="a7edc21f02378d6a4b07d16714f0e960acd3af8d" Size="3226" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1402475" />
+    <Blob Hash="a7edc21f02378d6a4b07d16714f0e960acd3af8d" Size="3226" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1521727" />
     <Blob Hash="a7f19386885589eee54d4398b3ea698f29022935" Size="12123" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2020795" />
     <Blob Hash="a7fabc07f2848d86d2b681d03437d259bb2442a7" Size="124" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="436820" />
     <Blob Hash="a7fadcbb88d7527764ad3604743a4194313b990a" Size="14751" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="2072457" />
     <Blob Hash="a7fef5954c2a0ed37c5771df10318aa5b77185a0" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719285" />
     <Blob Hash="a800033dd64d82892c6b6917ff46654acfe9dce0" Size="977342" PackHash="9c01e67350c088b0cf593101aa386de6dbe328f8" PackOffset="8" />
     <Blob Hash="a80246b4756f89fa569845a847629bdebb80704d" Size="169943026" PackHash="ecdd03d9dd277bf097d078acf90d3840358010bb" PackOffset="8" />
-    <Blob Hash="a8024ecdde5b7f04151a01714ac5adfad5d6f760" Size="1152646" PackHash="be98b3acebab5cf31e42ab05d461f930e38afdfe" PackOffset="8" />
     <Blob Hash="a807bdd122b049b10b2a81606b19b70803889d1e" Size="2518" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2026301" />
     <Blob Hash="a809d636a4926a13faebc5d6f5c970221b104e1d" Size="6365" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2070443" />
     <Blob Hash="a80cf4ea46301f0b8b4f0bc306270d7103753871" Size="42552" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2054189" />
@@ -56948,7 +56810,7 @@
     <Blob Hash="a81b701b294777b2a1a5d010c8d70986a242cb50" Size="7348" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1225032" />
     <Blob Hash="a81cfbff37f10637a539341b75dff009582b6bf8" Size="12393" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1317199" />
     <Blob Hash="a82131f42bda828be228349640dac1f14f695bce" Size="50717" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="129604" />
-    <Blob Hash="a822cc4f9540852836925704543edb7bc13ff323" Size="128" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1609971" />
+    <Blob Hash="a822cc4f9540852836925704543edb7bc13ff323" Size="128" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1729203" />
     <Blob Hash="a82300cdd34dd4a0a242470fd07ab7c12f9ace9c" Size="18906" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1582546" />
     <Blob Hash="a82306dc750db09282513025f67aed8d2d88c56a" Size="6680" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="1743536" />
     <Blob Hash="a823c455468973d7589ce421cb78b94731d25340" Size="153" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1763740" />
@@ -56964,12 +56826,10 @@
     <Blob Hash="a83f0ab877a40536e3d10ee7b510dc3e9802e834" Size="3140" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2057700" />
     <Blob Hash="a83f77682642a3937de8de6be07f13d7dd21051e" Size="112032" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1978939" />
     <Blob Hash="a842b0162aa6ce689e8df689c834ded33b8340b9" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="698729" />
-    <Blob Hash="a844404f9b5b65df4a83dbd701cb9bbfb2681dbf" Size="1032" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1323594" />
     <Blob Hash="a845aa23cc98835e1c742c628574ccfaabd392cf" Size="188" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1860878" />
     <Blob Hash="a84c0b3e7b148977ef1c46d9f2c1fa6e7ac78838" Size="2498" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2043766" />
     <Blob Hash="a8509feb77a479a9aa472a853353c0ce3806c893" Size="21110" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="477746" />
     <Blob Hash="a856f40964600786d183e3e8f33660e441716927" Size="235956" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="8" />
-    <Blob Hash="a85f8a730d302fec6e1403a9e048f2a4502c3f9c" Size="2465" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1850855" />
     <Blob Hash="a861342872c8c692f19b8dc0018df617a22890d1" Size="1549086" PackHash="34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7" PackOffset="8" />
     <Blob Hash="a864f5c401c1e9c6ac6f5f9e26d201493a6a37e0" Size="208" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2032524" />
     <Blob Hash="a8657e065fa24dbd1cff1362d9ddc3fa6c6e5534" Size="37888" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="1587037" />
@@ -56991,6 +56851,7 @@
     <Blob Hash="a88dce529d9cc5eb78454f76d7d0daa10f50ff32" Size="803" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1605320" />
     <Blob Hash="a88f39454f826baaac24c6f78d137ff346daced3" Size="6744" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="159916" />
     <Blob Hash="a8902647deb6803de0e8b2a016f48adcc72a1482" Size="212" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1346999" />
+    <Blob Hash="a89183568f97cf98b94dcc70ce8986fc24197b64" Size="14841904" PackHash="4fb4297b78bef6669a266dea2c2d8726121b038a" PackOffset="8" />
     <Blob Hash="a893fd0e57af9c458ca7c0123db42f0aff6d5241" Size="67589" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1853933" />
     <Blob Hash="a8984c211c6775d280c978bee007148d190514bd" Size="37713" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="38255" />
     <Blob Hash="a89a8690a92a22c9861beae6038bc7ebc7aef236" Size="46574" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="1462211" />
@@ -56998,16 +56859,16 @@
     <Blob Hash="a8a41f67bd58dff69f4d2879b1cd04b03616e5b0" Size="3384" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1122732" />
     <Blob Hash="a8a48210fe3053ee7cd42ad329bb8f1afa0a5ecf" Size="295" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="392773" />
     <Blob Hash="a8aa264b15510649dd8ff9df27554e3bfe136b9e" Size="190512" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1784668" />
+    <Blob Hash="a8abcaaa21bca620c2d925bac3081d9aee5c1a67" Size="18590" PackHash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" PackOffset="2072218" />
     <Blob Hash="a8abd2142a07e033926538ae16a621848be12244" Size="8939" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1129848" />
     <Blob Hash="a8ac3f96b29ed0f4e9b6874ffe210248d7013ccc" Size="9741" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="648620" />
     <Blob Hash="a8b3661e4902eb7aee12d6d855d93bec88882eae" Size="1711616" PackHash="4aa7eaed894575c13c7560dfc2d58ff2e41961fc" PackOffset="8" />
-    <Blob Hash="a8b8a38be109b30332c6995a36758e6ed5257f60" Size="1142" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1285131" />
+    <Blob Hash="a8b8a38be109b30332c6995a36758e6ed5257f60" Size="1142" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1734033" />
     <Blob Hash="a8b9799c52698aa75743ef772c402ba381a5d7de" Size="261" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721250" />
     <Blob Hash="a8ba44907d4441ca8a3ef90045b60c9d8917c67b" Size="2495" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1558902" />
     <Blob Hash="a8bf289ae53a680977b533668789987d81f3f95f" Size="277243" PackHash="410e46447d67d73c00b681403bff72bd1c8db3e1" PackOffset="396582" />
     <Blob Hash="a8bfe02e4e71b28ef8e284e808f6ede7c231f8ff" Size="6563" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1583111" />
-    <Blob Hash="a8c70986ac7aabe4bdfc65db7b55bad16da3dbe8" Size="662524" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="1427168" />
-    <Blob Hash="a8c972afce06823246d1e7177b23074ad398a01c" Size="4138" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2091685" />
+    <Blob Hash="a8c972afce06823246d1e7177b23074ad398a01c" Size="4138" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1991549" />
     <Blob Hash="a8c9e9dad67e09fec1edc2af1c6fee7a1dfd0acd" Size="6633" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="710102" />
     <Blob Hash="a8ce354450b5084f2dd09069121c727237d07845" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2095917" />
     <Blob Hash="a8cfc3b5209709265ff143a258d13d375f9cd571" Size="243625" PackHash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" PackOffset="232078" />
@@ -57030,7 +56891,7 @@
     <Blob Hash="a90d10e01d0e5d6fcbb43dcd1b61f230e7318e07" Size="804" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1508451" />
     <Blob Hash="a90dad077dba9affce9f031c078177318ec67f6b" Size="3136" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="859611" />
     <Blob Hash="a910985762e5955ae1e82ab7900d846ec4daa5ff" Size="5399515" PackHash="ab5d351cc1959e213540cc41dbe93cea75dda4d9" PackOffset="8" />
-    <Blob Hash="a912d7b0a534a11ad930e0770f95e5126558a83f" Size="1101" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2095763" />
+    <Blob Hash="a912d7b0a534a11ad930e0770f95e5126558a83f" Size="1101" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="2095969" />
     <Blob Hash="a9175a59b685c1ccb365e314c4960d08926add7a" Size="970" PackHash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" PackOffset="2095696" />
     <Blob Hash="a918aed11296a2ab124cc6a23950e353b2234e52" Size="99777" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1455933" />
     <Blob Hash="a919b33197965846f21074b24e30250d67277bce" Size="12560" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1766081" />
@@ -57048,21 +56909,21 @@
     <Blob Hash="a92ee665a0a5409c315039af550a7a5c88061838" Size="3412616" PackHash="2911cc9eb23ffd806513a06aacb85ded4ed792eb" PackOffset="8" />
     <Blob Hash="a93249d1fec23387224cbc3633a2fd2cf6720af8" Size="196031" PackHash="4960f4776990e86b0535432b92e96005c3deca48" PackOffset="203610" />
     <Blob Hash="a935d2587dca193415edd2a5b296254d3f15d8d7" Size="3489" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="634623" />
-    <Blob Hash="a936a6fb96bf93c701fe324989828932ae9ef41c" Size="410" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2066845" />
+    <Blob Hash="a936a6fb96bf93c701fe324989828932ae9ef41c" Size="410" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2086613" />
+    <Blob Hash="a93824cbf8fb83971fa92bd6597aeb3a14b03508" Size="26331160" PackHash="e61a34a47089f2f0a99ed833906e967c28d99261" PackOffset="8" />
     <Blob Hash="a93a588b0add198c067c4bb070dc1e5170e6e208" Size="1381" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1067865" />
     <Blob Hash="a93bbc463b24f4e1a448dd87e9d8b00762ade3f5" Size="222448" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1746056" />
     <Blob Hash="a93c98412d609dc6bf704b1ce5b88e63d552e6fa" Size="56047" PackHash="ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" PackOffset="1655038" />
-    <Blob Hash="a93f825c00d5b32245e8ed527e1b6f0d0b9a04ef" Size="22459" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1672381" />
     <Blob Hash="a941d8ebd21032c02ff333d06f7c65573be5e7a8" Size="21012" PackHash="3cd48173c240efc756b78b7c8c2ec1292f6b4b4f" PackOffset="2006868" />
     <Blob Hash="a9449241671eb16bf5e12b44c6b28ef113a5b201" Size="138978" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="8" />
     <Blob Hash="a944a50de5947aea5b6bb25e1d9c3a248f006d6f" Size="85309" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="1709841" />
     <Blob Hash="a944e1ead63c6050a140c41deb28bc83cd0abf5f" Size="3039" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="8" />
-    <Blob Hash="a9465b12121e2164c16df3aa4ffbe36666b531e8" Size="142" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2095125" />
+    <Blob Hash="a9465b12121e2164c16df3aa4ffbe36666b531e8" Size="142" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2096670" />
     <Blob Hash="a94667b46a1df41c6b808e920ece731834c91032" Size="187541" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="503467" />
     <Blob Hash="a948472148bc8923f1423517602bc646d6f38daf" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2077744" />
     <Blob Hash="a94c94747b313075c05c9165a2f126775fac9435" Size="155978" PackHash="f6fdc33805bc89e2eaff8003a996f6bf8f880789" PackOffset="1598509" />
     <Blob Hash="a956a4b79fc35e618b2ce9ca769969c12b5b626b" Size="1888" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="2026166" />
-    <Blob Hash="a958b66cc877dd4cbe1f1f5278e7e843c5200d86" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552822" />
+    <Blob Hash="a958b66cc877dd4cbe1f1f5278e7e843c5200d86" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672054" />
     <Blob Hash="a95955c3b69d70b69d93b2b06fb9433070f5091c" Size="5169494" PackHash="0de6e5edafa663a726fa56e7f2d2dc44f4c18fc8" PackOffset="8" />
     <Blob Hash="a959fd2ec0a234ad96a755bc55bc881c198958c8" Size="1680" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="631364" />
     <Blob Hash="a95cc77394e72e302bb8827a119e32d20fa036a1" Size="18816" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1185122" />
@@ -57070,9 +56931,7 @@
     <Blob Hash="a96176e53e5bc90d826caf4ffcceaa7941c48c00" Size="3561" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1153053" />
     <Blob Hash="a96195f1fb0c96709ec41c13c335987191c3ed3c" Size="78255" PackHash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" PackOffset="1415714" />
     <Blob Hash="a961d5d675557182ffa4613274f6e14c22ae0a2f" Size="2428" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1145300" />
-    <Blob Hash="a962e330bb69a362734632bde23e6b1e21932fb5" Size="1552564" PackHash="191ebf588dc8033c8f429efb4aa9f656e12e6c89" PackOffset="8" />
     <Blob Hash="a96769ab44a1693f93a6a1e9d1f82a9bcb63d02c" Size="123555" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1187862" />
-    <Blob Hash="a968699984439d3eb893a0fe4773874b9caa993b" Size="18673" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1936996" />
     <Blob Hash="a96ba6522de39082bf4000fcca175509802925df" Size="8285" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="2087208" />
     <Blob Hash="a96fc4b31d6e1e9ffa5c2d4e2417e5e0c7bab028" Size="19967" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="461476" />
     <Blob Hash="a971bedcf429667ad59b80ffda1a1fb442120272" Size="176" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="170645" />
@@ -57083,7 +56942,7 @@
     <Blob Hash="a97e4472d3c536ce438e2e12326483ab6341756f" Size="7526272" PackHash="3ad1668c83eb1618039be03d92757ce9783327e5" PackOffset="8" />
     <Blob Hash="a97f74b00237c90aa319d4d1a1bf5ba199d105f0" Size="5881" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="833412" />
     <Blob Hash="a9808c17d48c0cf0fca5120a33d0813ea8515326" Size="93564" PackHash="24abc6b446750adef120dba7e19f9ae7e166eb0c" PackOffset="1466734" />
-    <Blob Hash="a9832c0e93ef7c61dcefba6e7af666a76986682e" Size="1056" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1321239" />
+    <Blob Hash="a9832c0e93ef7c61dcefba6e7af666a76986682e" Size="1056" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1770141" />
     <Blob Hash="a984a42df8715db68fe3ca659af90140c1105b97" Size="2837" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1857002" />
     <Blob Hash="a98a0bac6c8ca1ed5793c5eb540b4a1da2dcec67" Size="79" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1257168" />
     <Blob Hash="a98ddc45f7078bc255d4cb305331fea8361d21c0" Size="5213" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1471440" />
@@ -57091,7 +56950,6 @@
     <Blob Hash="a98ef1305e9c85e0d9cf7d4f3587e07204bb897c" Size="215" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="255651" />
     <Blob Hash="a990801d3d2868b86fde738437d9c0948255c4e8" Size="158444" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="1228391" />
     <Blob Hash="a991703deda7721e68adfaded64291bbdda85a12" Size="253440" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="8" />
-    <Blob Hash="a995923c0c70ab1b37958068b6c469a1eeb388d4" Size="7006648" PackHash="e7fd92c5ec6fefff0395979e86f79cd18c85f0aa" PackOffset="8" />
     <Blob Hash="a995c22ecb17be6aa76738876892f0f25a6208d7" Size="3660" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1039675" />
     <Blob Hash="a99caac05f275774089bfbf21f7ce3840a92c8f3" Size="2752" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="99915" />
     <Blob Hash="a99d64e212f4115d7cf348b504ca36e4d77eb175" Size="154501" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="1369993" />
@@ -57099,8 +56957,8 @@
     <Blob Hash="a9a096e0b55e219b894cba355ae14e39d16e44b8" Size="25655" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1540252" />
     <Blob Hash="a9a4e39f82a935935317853e72cb58c50a597603" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096745" />
     <Blob Hash="a9a5c1df56e23c2e9300a0156955caef3b839991" Size="21374" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="2047021" />
-    <Blob Hash="a9aa0da545ba242eaeb1a7156084fab67964ffe6" Size="42624" PackHash="7143ad7a585bda75349c77c92198a5b5ca391668" PackOffset="2041690" />
-    <Blob Hash="a9ac899f39dfb7ff3de04f04afb0fffe8d7cfde7" Size="7106" PackHash="1bdfb2089d50fef664ddd40f88773779551a6963" PackOffset="2085992" />
+    <Blob Hash="a9aa0da545ba242eaeb1a7156084fab67964ffe6" Size="42624" PackHash="5f963ef76a4402af9c0b249886115df21f3833e4" PackOffset="2051972" />
+    <Blob Hash="a9ac899f39dfb7ff3de04f04afb0fffe8d7cfde7" Size="7106" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="2086774" />
     <Blob Hash="a9b08ea91badf9cfcb375027428b25fdcf3d5d54" Size="116" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1731004" />
     <Blob Hash="a9b0f2f55160fc00164f7914e8e0898e46205991" Size="6610" PackHash="fdb89225347db5b8dc007f6d3291579a71004a1e" PackOffset="2083419" />
     <Blob Hash="a9b8516c98310026039ecac1aaaae5f75cb8e271" Size="18992" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1238689" />
@@ -57119,7 +56977,7 @@
     <Blob Hash="a9d7df5227d1f7d25a530e8cc3dd9184edc2cfb1" Size="158881" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="184929" />
     <Blob Hash="a9d9daa00b945cd05f9e39d1823153b50f0090b6" Size="10677" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1282883" />
     <Blob Hash="a9db1984f80b222534111533ac293ea5b9524deb" Size="1616" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1331724" />
-    <Blob Hash="a9db9332f22648fa9723a5b1c7f8ba2eb7cc1a66" Size="11443" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1901242" />
+    <Blob Hash="a9db9332f22648fa9723a5b1c7f8ba2eb7cc1a66" Size="11443" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1645249" />
     <Blob Hash="a9db97449915c8b30813b46ea4d489317213e65a" Size="3637" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1308663" />
     <Blob Hash="a9dfbdac8c45235c1575797db1369a875dec7365" Size="832" PackHash="6a3c422a237075366d803f78e1e9f44d6424c3f4" PackOffset="2096282" />
     <Blob Hash="a9e12c9b719e30b2db5da65525747ac4b6ac96bb" Size="5349" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1516145" />
@@ -57139,7 +56997,7 @@
     <Blob Hash="a9f7ae016f95e82bffad783fe24f0a6ecba64f98" Size="25744" PackHash="0d6e37eb425a92679b17718a96f6bf9d8103f02d" PackOffset="8" />
     <Blob Hash="a9fd685be28c86ae7f918a87d7fd273d8c55b2a3" Size="282" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1798721" />
     <Blob Hash="aa02fc5d764fef36bce95c9ce56f73f70a602b58" Size="8704" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1084520" />
-    <Blob Hash="aa0304797e185b40db65a13019c7fd7418a827e8" Size="893" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2035694" />
+    <Blob Hash="aa0304797e185b40db65a13019c7fd7418a827e8" Size="893" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1926825" />
     <Blob Hash="aa033b213c8f871e9351dc27147462ced2daafba" Size="162760" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1494114" />
     <Blob Hash="aa0f9173fe2798338a5f9160b764d4d192acf769" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="250456" />
     <Blob Hash="aa1299e7c977c62f03aa899cc53492ef478e7987" Size="5937738" PackHash="4b540235277ca5ddd420f69da5e6498b0c7ed58e" PackOffset="8" />
@@ -57166,8 +57024,8 @@
     <Blob Hash="aa3fcab7c99dc3fbfa60d104d02fd076ffc70c54" Size="18731" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="217593" />
     <Blob Hash="aa44304b5cf49dfad0fc867acbfa4b254a46faeb" Size="51586" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1174621" />
     <Blob Hash="aa45853912617dd43fec87cc16a94231c933414b" Size="1065" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1801080" />
-    <Blob Hash="aa48d19b137156775614f72ace86a3c76d2a0cff" Size="321" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1561631" />
-    <Blob Hash="aa4967226d555a0698b43ab12163f27300ebc5a2" Size="2983" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2093095" />
+    <Blob Hash="aa48d19b137156775614f72ace86a3c76d2a0cff" Size="321" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1680863" />
+    <Blob Hash="aa4967226d555a0698b43ab12163f27300ebc5a2" Size="2983" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="2091802" />
     <Blob Hash="aa49eac6baa8f3f57e3bdd586034b1ab9efb282f" Size="64814" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="8" />
     <Blob Hash="aa4dfffed206dea0aa8dced7c7ed4c9227b24c7e" Size="21655712" PackHash="dba2f996d90381a6fa89e552e4a74828748e0ac3" PackOffset="8" />
     <Blob Hash="aa4f234e4b04c41e43bec13b6348b8b417c8fa13" Size="6223728" PackHash="f88bf96d7aa590cde44894fdd85488f888f6b507" PackOffset="8" />
@@ -57180,10 +57038,10 @@
     <Blob Hash="aa5f27d36bc617a6a4107e3ca0cb0c10a71a1d9e" Size="188" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="628907" />
     <Blob Hash="aa5f5bcf109fcd4c5ffd735e04ad25f41fb96a3f" Size="10139" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="2083625" />
     <Blob Hash="aa5fcf2af210b7003c6d209a6b0049bd0d2c389d" Size="4478976" PackHash="7b53792899b5b235a3127fd21104f068e591bd66" PackOffset="8" />
-    <Blob Hash="aa6116c8bfe808740b309229a2eeefddd3d61855" Size="550" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1698661" />
+    <Blob Hash="aa6116c8bfe808740b309229a2eeefddd3d61855" Size="550" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1910380" />
     <Blob Hash="aa64fd9c047d45e85afa672cc8a76a17d0d8e680" Size="173975" PackHash="4bfd56a5182ecec502ca54e505acc9f8192a81b8" PackOffset="1260559" />
-    <Blob Hash="aa66e660e109b52bb8244cd64c8b78edc2f88d2a" Size="5176682" PackHash="725460baae4426aa1567a08e85c06e11c2fce2b0" PackOffset="8" />
     <Blob Hash="aa6730523c2de3d681d5dca5adda7d182500ccad" Size="1654824" PackHash="ba615143760f04315d598b31b84884f4e0aa8f18" PackOffset="8" />
+    <Blob Hash="aa688132166c54ae9d338e734c999436f2cafe04" Size="496992" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="835162" />
     <Blob Hash="aa6d08c9eea5ae8489d77ff9d2fb74f5f580f4ee" Size="11264" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="1999110" />
     <Blob Hash="aa6dcda1818be7cac36679ae61a953ceea9a8c0e" Size="18856" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="897409" />
     <Blob Hash="aa6f50d653762336bd1f02d33a39e006755f79ce" Size="9949166" PackHash="8e218acfafa8890d8c6f513d531eb063ff3dea17" PackOffset="8" />
@@ -57197,7 +57055,7 @@
     <Blob Hash="aa7b016a8965a064fbbcfb2272d43784eb4baa5f" Size="1575" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1297132" />
     <Blob Hash="aa7ba1560a04fb51c76e2ead2a44c0f690cbf81e" Size="4486" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="518310" />
     <Blob Hash="aa7c8b616804f79f06865cc4a5853700b0abdc98" Size="13232" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="614288" />
-    <Blob Hash="aa7fc2be86fede0901b105f98f860a870d26a42e" Size="2164" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1349277" />
+    <Blob Hash="aa7fc2be86fede0901b105f98f860a870d26a42e" Size="2164" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1798179" />
     <Blob Hash="aa80475385c93dead0738bd9c569f862bc1e5ef2" Size="8825" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1579768" />
     <Blob Hash="aa833117944717069251d2b1abf6f9b0899a220e" Size="9715856" PackHash="2c42aecf4d302508d97a42889f9c616197b1bd9d" PackOffset="8" />
     <Blob Hash="aa839d008e261cfd842851e7882e2634b9b8ad98" Size="114156" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="1791659" />
@@ -57213,9 +57071,8 @@
     <Blob Hash="aab805e149c4d8e79005ed190e60fcf11cd2639a" Size="1714176" PackHash="bff70448477367ce462c3ee06f051b1f047549ad" PackOffset="8" />
     <Blob Hash="aabb9b3447e9495f1b043e672e27fcd1415d2136" Size="29674856" PackHash="caf474bcaffc45ef5a8a69b2cc199afd3425ff5e" PackOffset="8" />
     <Blob Hash="aabe3b49b3219d95c92119e8108f6d4f497a9929" Size="590" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1925639" />
-    <Blob Hash="aabe7a99ae5c779b1e8f1aa4407595f0109888f7" Size="82642" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1867066" />
+    <Blob Hash="aabe7a99ae5c779b1e8f1aa4407595f0109888f7" Size="82642" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1823853" />
     <Blob Hash="aac014825b054e49d973764d8acccf63e2ac0999" Size="4399" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="1130197" />
-    <Blob Hash="aac19721a1193bb92f2c3cba00147b82d82f56e1" Size="239" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="2093080" />
     <Blob Hash="aac92e06e5cca7d5a3372bca162831b403c66f93" Size="19042" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="368174" />
     <Blob Hash="aaca9652911058b6842033e00020eda0eede1e50" Size="10476" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="731527" />
     <Blob Hash="aacb951b10bbfccebccb226139b7119069900953" Size="7972" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2071400" />
@@ -57224,19 +57081,19 @@
     <Blob Hash="aad1ebdea01f8025bc47a46cf25349d90019fa9c" Size="4391" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="637585" />
     <Blob Hash="aad38106042cf2af9eeb154a278a86a5fc1528e3" Size="946" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="628059" />
     <Blob Hash="aad4df9845642d2aebc51f49cc99415799bf3417" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="492760" />
-    <Blob Hash="aadc363229f55735c5036cc4fdb504814351449e" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549038" />
+    <Blob Hash="aadc363229f55735c5036cc4fdb504814351449e" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668269" />
     <Blob Hash="aadde2f37e31d1203f7969d55afd9405e5bd0e9a" Size="3423744" PackHash="3f4a2fb1f72bc451dae3ce195be2eea9f10578c9" PackOffset="8" />
     <Blob Hash="aae0385bd330f1983d524852ecd9ba5fd4abdbdd" Size="13364" PackHash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" PackOffset="2056669" />
-    <Blob Hash="aae12d3ec7a55bb52defdc59da3cc86de72b6b6a" Size="811" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2092722" />
+    <Blob Hash="aae12d3ec7a55bb52defdc59da3cc86de72b6b6a" Size="811" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2095833" />
     <Blob Hash="aae1c6bdc7e2b898b8683e4642455313925d64b9" Size="298" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="436625" />
     <Blob Hash="aae7d2aa76e5938b1924e889638f0e50242f6482" Size="28581" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1456864" />
     <Blob Hash="aae8c3d311fce763c273ec4cd20c8324151a9263" Size="4296" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="562290" />
     <Blob Hash="aaed4a097cd6d8c5ec4438da9201cc5980851ffd" Size="104171" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="49891" />
     <Blob Hash="aaee0d8e540d898c7f4ca5d4262b1d49cdf5d5f2" Size="15179" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1752917" />
-    <Blob Hash="aaf7572dd6259910d9406ef8c5180c74cc98fb3a" Size="1034" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1296932" />
+    <Blob Hash="aaf7572dd6259910d9406ef8c5180c74cc98fb3a" Size="1034" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1745834" />
     <Blob Hash="aafb265ea8da893be4fe87f520194a0ace9b2fbc" Size="60" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="840624" />
     <Blob Hash="aafb7ba3742541a1ea1510952209bfc02ac3745f" Size="16896" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="203784" />
-    <Blob Hash="aafc0e598af216ad5285e696029c4ce4d0442a57" Size="4831" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1525146" />
+    <Blob Hash="aafc0e598af216ad5285e696029c4ce4d0442a57" Size="4831" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="1988016" />
     <Blob Hash="aaff5b98de96fd6bec5cfffdb2ae1387065b4e68" Size="143872" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="336392" />
     <Blob Hash="ab000bf22dc0382bb3e6f064175416f14219fd7a" Size="153" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2047988" />
     <Blob Hash="ab019822e42da4dfd9a9d5e80f1fe640e0a515b8" Size="7529" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="986171" />
@@ -57244,10 +57101,11 @@
     <Blob Hash="ab031ca558c3ff1f31850b877f05100fdd3ff6f6" Size="108842" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="437582" />
     <Blob Hash="ab0381c9e493a04c00e3b1412c9c0b3da85b774e" Size="124175" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="124102" />
     <Blob Hash="ab04590765c684fbfa9c2ba3132ebbc15a7c3e70" Size="380" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2019480" />
-    <Blob Hash="ab06a21808ed3cb711ec390ef58d39b70bb45af9" Size="29760" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="2040036" />
+    <Blob Hash="ab06a21808ed3cb711ec390ef58d39b70bb45af9" Size="29760" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="1884916" />
     <Blob Hash="ab085d7eb3c18f08eedfa0130b07ad2d81bc6d05" Size="265229" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1396633" />
     <Blob Hash="ab0884a45c710c87c3692dc6e60474eb974242c1" Size="44" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1303559" />
-    <Blob Hash="ab0a9c443d8cbc1c8bce356b09ad582858604da4" Size="90556" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="1793372" />
+    <Blob Hash="ab0a9c443d8cbc1c8bce356b09ad582858604da4" Size="90556" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="1850780" />
+    <Blob Hash="ab0f9a2af25bfb6a53168b8a76bde6b0b14577aa" Size="23345586" PackHash="d16861b8cf2f13f37e2251f9b5e9e4f2bbf6950c" PackOffset="8" />
     <Blob Hash="ab1019328e0d8013d3302409488cbe9471432a28" Size="2245" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2035814" />
     <Blob Hash="ab17afe72b3a3efbcd4a49aa0c07e46f22790b46" Size="321" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="2096316" />
     <Blob Hash="ab1a2261915e85c01261364e86053ae68b0fc50b" Size="2786" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="876250" />
@@ -57263,35 +57121,34 @@
     <Blob Hash="ab3e692ecc106092f17570e2b64258c1b55dc8fa" Size="2958" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2084619" />
     <Blob Hash="ab3f76f49ee46c78c1f6a6e91ef75357f39a3648" Size="679" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1920795" />
     <Blob Hash="ab3fa1aa3fb466b45ffd88a0a92c1ca0d7482d63" Size="9280" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1595761" />
+    <Blob Hash="ab3fb1d473264fef433e2aa885061d7d8770a61a" Size="6936710" PackHash="46fc3576dde127d1c83697fbb2109601941e6261" PackOffset="8" />
     <Blob Hash="ab4110e37b3665d738a8f2b3e64cba9e99127301" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1045708" />
+    <Blob Hash="ab41c245dbba22c64521a5c5919f2d89c24a60e3" Size="19313892" PackHash="4c7d5ca2ebc91113ed7fe1563a5ce74d83be83e6" PackOffset="8" />
     <Blob Hash="ab43518329713f2d25d202f16850e016257af59b" Size="503299" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="527395" />
     <Blob Hash="ab4360a7afdec1187e9d8376d33ad6f595b632f3" Size="248894" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1247441" />
     <Blob Hash="ab44499f0e29a86090079f4a8f6cb8b62e886659" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096793" />
     <Blob Hash="ab4a052e3d9d6308bf77bd93c27464955fceb76e" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="296244" />
     <Blob Hash="ab4af0c1ca7cbd8fbdaf79c7e82eca959ca155f7" Size="232376" PackHash="29eae01c452b3ae340b64ad4266ea1152b4e6729" PackOffset="1857582" />
     <Blob Hash="ab4ef0c8707398d1d3d17f8141cb4626986b3671" Size="4572" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1209973" />
-    <Blob Hash="ab51933bb27d0a5e581def41b181e444c4f222c6" Size="115572544" PackHash="537cf21f43ca4d05b9c1298d9e3bba62e7557398" PackOffset="8" />
     <Blob Hash="ab54acb70f2d401b855a6d6e58f0a562fb74f1f4" Size="5351" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="2081491" />
     <Blob Hash="ab55eb97cd260cb4423795b32163d21c7c83c5d5" Size="11630" PackHash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" PackOffset="2060472" />
     <Blob Hash="ab560b4e291d26656487134b57ccbec2ccd0696e" Size="190" PackHash="d95d0dfee072d179a0e04916b7b80ef37d1f6fca" PackOffset="2096962" />
     <Blob Hash="ab5a128f3eb1ed99a638098cdc96174c1dfffbea" Size="211123" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="8" />
-    <Blob Hash="ab5c5a791b5e813294f7fa42425b64900c5e9470" Size="2474" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1309751" />
+    <Blob Hash="ab5c5a791b5e813294f7fa42425b64900c5e9470" Size="2474" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2094632" />
     <Blob Hash="ab5d0d083922891a668c9377b4007338ae1f2e8a" Size="206" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1559633" />
     <Blob Hash="ab5f52a7e52b53a058b1c06b62bb87b1374dd0a6" Size="3768" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2004458" />
     <Blob Hash="ab5fb792aa4bbbc725636749879b8029dd5f79db" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097124" />
     <Blob Hash="ab632424685af11eba1422f5cfbe912394f14e1a" Size="119855" PackHash="d324c1434b20b5ef66a2937ab08337f78c5646a0" PackOffset="1834575" />
-    <Blob Hash="ab67969c9dca97b087f9430218af13786e451675" Size="2336" PackHash="2f18ec8e0e1dbc7574497b45571454da261d1b6e" PackOffset="2094416" />
     <Blob Hash="ab6d61423c822b31df7e82c0ac598ce54daa7266" Size="7358" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1565103" />
     <Blob Hash="ab70758f2f5f368ff59d47761567ecca7d538291" Size="601505" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="1251421" />
     <Blob Hash="ab7107bd0c7fd921f78a9ff6360e5f1167dc8929" Size="448" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2095328" />
     <Blob Hash="ab7409759802b09469282064b85cc02ba326be06" Size="6895" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1377569" />
+    <Blob Hash="ab7609512aa15c8f8b658bd8214285868bd83fa3" Size="31121" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1043464" />
     <Blob Hash="ab77120152f3ff5fc9272f264c78e19e1117f0a7" Size="7610" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1301933" />
-    <Blob Hash="ab79244bfdd76067cb7363d798bd3c5d718d0e6a" Size="2386744" PackHash="cb0257e1bdad41ff99960b895851f2f21f41f733" PackOffset="8" />
     <Blob Hash="ab7d202a0d7e7dd3fa963537a4a65c8ff008707f" Size="3683955" PackHash="44dd223c5d4013ea9c780503f88c0e5c7d1ee10a" PackOffset="8" />
     <Blob Hash="ab805c6e5aeb4f85bc0468c3c89d84e1a82382cd" Size="1134592" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="8" />
-    <Blob Hash="ab8212b58d3e94614bdd6f32b696bc3d80401f17" Size="173818" PackHash="8fa3b7b9dfcdd86814c8d31b88442e487b319bd9" PackOffset="1878758" />
     <Blob Hash="ab826b2d59ebac1368ede02afff89f5b087ba1ba" Size="88" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2088876" />
-    <Blob Hash="ab837ce1d4506777313eea1e2d72dee385f97cd9" Size="3356" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1239987" />
+    <Blob Hash="ab837ce1d4506777313eea1e2d72dee385f97cd9" Size="3356" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1688889" />
     <Blob Hash="ab85f88fa24f86a7434970b3c692186012a19216" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1256696" />
     <Blob Hash="ab887af6b84c1341741573529e143967aa4d6f93" Size="13129" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1934431" />
     <Blob Hash="ab8e1e1d4b1ac40dc2c6d3d3f438863a0fc5eaf3" Size="23640" PackHash="6fac65addd6f42dee4d150b9417619f012cb2815" PackOffset="2055352" />
@@ -57306,10 +57163,10 @@
     <Blob Hash="aba54d6e2c8bd6ca2c95a52a93613dba80990f28" Size="1384" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="276667" />
     <Blob Hash="aba72f8ecbb05925209bad60f8ee7f0b2ac4d2a7" Size="3009" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1468521" />
     <Blob Hash="aba93c59300170ead9f033b1bec1a27f03c9adb5" Size="24052" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="179616" />
-    <Blob Hash="abab1a21b9c70e916f2439b48a87ee7c6986f0fd" Size="2808" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2034687" />
+    <Blob Hash="abab1a21b9c70e916f2439b48a87ee7c6986f0fd" Size="2808" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2085632" />
     <Blob Hash="abab952791b98ea77d24fd72a3325281199dfc63" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="681560" />
     <Blob Hash="abac3aff65c9dd265adce4399a9ef559738786d4" Size="172325" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="387070" />
-    <Blob Hash="abadb31c90b68c423d1f2c95b47a184f242858c6" Size="390" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1610510" />
+    <Blob Hash="abadb31c90b68c423d1f2c95b47a184f242858c6" Size="390" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1729742" />
     <Blob Hash="abadbeb270ac51b837b7bb565da05f9612b71668" Size="3577" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="879251" />
     <Blob Hash="abafd8578464ee4b027ed25bfa1ec7f079c53b44" Size="54198" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1450313" />
     <Blob Hash="abb7a8060c4c0cb0b93191d85a54f9236c6a3765" Size="4994" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="99930" />
@@ -57322,13 +57179,14 @@
     <Blob Hash="abca5c44239b64e98d525d7390eb2d2d044249ec" Size="3422" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1773350" />
     <Blob Hash="abcb7d34014ea23a64b8fe077ff629de6f10e9f1" Size="37888" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1755656" />
     <Blob Hash="abce0428e86b3858e79937a9fbdb78d3ab7456ee" Size="99413" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="978681" />
-    <Blob Hash="abcfe03c1af4404ca71282b2c225981daca45e5f" Size="979" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1382707" />
+    <Blob Hash="abcfe03c1af4404ca71282b2c225981daca45e5f" Size="979" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1502167" />
     <Blob Hash="abd5a152300f0a87a5560be00745e5631b1904cb" Size="3564" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="2073397" />
     <Blob Hash="abd627563167d4a6607595af72bfccd8e9dda154" Size="7500" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1709801" />
     <Blob Hash="abd95f83eeadd477f03f3dacdd52ad44b51330aa" Size="360" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2002511" />
     <Blob Hash="abdd387534cd74bc6ee11f0e751adebd75cc869a" Size="38140" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="109415" />
     <Blob Hash="abe34b77295bdfc5a9d3d94650068ba47f9749e6" Size="121197" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="545943" />
     <Blob Hash="abe37f2a4d1ef0a7a756bbd010cbbafa70988577" Size="916" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="384906" />
+    <Blob Hash="abe4a64e9865c97200eef327809a7fafd4dbfa43" Size="1895242" PackHash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" PackOffset="8" />
     <Blob Hash="abe6855d0b3dc9d6bb9de3d490e1a201cc9bf7b1" Size="3401" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1450502" />
     <Blob Hash="abe7dae40bdcd19ec7b12c76ff5c813b1752c745" Size="105124" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="1905815" />
     <Blob Hash="abed40208ba284e67dbf952aac41d1ff58a4ffec" Size="39424" PackHash="908ab3d68a65d4d823608b2ddd04dd8a6d70cebc" PackOffset="1694728" />
@@ -57336,7 +57194,7 @@
     <Blob Hash="abf3bcf7b318e3f982143fe366ca6aae6aeac952" Size="697" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1314707" />
     <Blob Hash="abf6178e484e6adef195382f4542da63b5365dfa" Size="29151" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1097125" />
     <Blob Hash="abf7a546a213b4db7fbf7414c99aca9cd2628c6d" Size="3606" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="642688" />
-    <Blob Hash="abf9cc71c79ee067c020dc7364c5b4070b29f139" Size="1447" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2091548" />
+    <Blob Hash="abf9cc71c79ee067c020dc7364c5b4070b29f139" Size="1447" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2094768" />
     <Blob Hash="abfad8ff9c2ac5b0ccc7891c3bd593c7c28918f1" Size="1308" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1431151" />
     <Blob Hash="abfc746a9b2274b431613e4e9f9d7cdbe9fa92e1" Size="35327" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1574528" />
     <Blob Hash="ac027717b3dde71cd65c28102d8f761f8c070c66" Size="191" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1912956" />
@@ -57348,7 +57206,7 @@
     <Blob Hash="ac159fac7b49f15fc97e9199daac098b62742d70" Size="15720" PackHash="75531423ce0cc73fa66fcf79458c718cf4800c00" PackOffset="8" />
     <Blob Hash="ac16479daa85fbeaded365b956a6d04a3f6532cd" Size="7804" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="856597" />
     <Blob Hash="ac1719127d4b50ad27670fa901a5929dae391a15" Size="2950" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1465608" />
-    <Blob Hash="ac1cda7110c7d63e22b69c74983dbbf929c46c40" Size="502" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2094117" />
+    <Blob Hash="ac1cda7110c7d63e22b69c74983dbbf929c46c40" Size="502" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2092630" />
     <Blob Hash="ac1f6aa4e8f7396823d88d3806cfdbd3b99b2b96" Size="1391" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="271057" />
     <Blob Hash="ac2096abfd6b78b8cee4cd85c20b55ed5a871812" Size="943" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="582936" />
     <Blob Hash="ac21628efdf4df74db90327a00397496d5479f4d" Size="3539" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2067303" />
@@ -57358,6 +57216,7 @@
     <Blob Hash="ac2b1084d93f443f29c3331d9e8ae42c406e5d2a" Size="2843" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="760252" />
     <Blob Hash="ac2d7ff2fd72100ba4367c2475a25c42f44c6328" Size="183" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1260552" />
     <Blob Hash="ac2dc3e967a1c20288dcf900015f6196d50bd82e" Size="342" PackHash="3eeaef9b20127af038eac7ad0b2944759c734d1d" PackOffset="3343" />
+    <Blob Hash="ac2f55022d3654c607fa4e961f0f8fff5cc11660" Size="1542028" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="8" />
     <Blob Hash="ac3004ed53a100265dfad410771b27130e79794c" Size="2384" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1798340" />
     <Blob Hash="ac303cf1e79006b192f410d1ccad96172988db38" Size="482693" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1216998" />
     <Blob Hash="ac31894a3aa509523a086baacd8669f416c1e0c9" Size="2377" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="566695" />
@@ -57371,12 +57230,11 @@
     <Blob Hash="ac49ecde23bea1b09461560cdb7404af2876dc02" Size="9815" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1378286" />
     <Blob Hash="ac4ba502e3dddf1fb8a785a2ca95197b97d75d2b" Size="9742" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="2078343" />
     <Blob Hash="ac4bf2fc414593d386bc38534d8d43cc99662208" Size="88" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1705744" />
-    <Blob Hash="ac5054b3a87fe9b348c4f5b780c642338b83803e" Size="3846" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1470372" />
+    <Blob Hash="ac5054b3a87fe9b348c4f5b780c642338b83803e" Size="3846" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1589603" />
     <Blob Hash="ac50e3652d0fea744a4c2015ac08abc9ebfbcfc8" Size="13517" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1959362" />
     <Blob Hash="ac5131f8b5bd435c6932ab5ba43a4057c46de381" Size="304745" PackHash="80692ee126e647cd28189fde8ceed8c0dc1a4c6a" PackOffset="1734665" />
     <Blob Hash="ac51df41b365ca510d41c34b3bfd9e461214a30a" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="707294" />
     <Blob Hash="ac532e56b3dae4fb015fbbac3387abd7f4bcdd4e" Size="12032" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1427694" />
-    <Blob Hash="ac541480b5f1b17190aea36cb4bb4bfade57e266" Size="117352412" PackHash="fc4e306bfe23934853dd6fbc65c01de0ff164d08" PackOffset="8" />
     <Blob Hash="ac55e334e4457666d1daf6984c8250e539979dd5" Size="1096" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="2095992" />
     <Blob Hash="ac59c2ea2304029b64126ae634bf29542c3815cd" Size="15360" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2068308" />
     <Blob Hash="ac59e0d256b9eb2e421abcd4758e803cda5ea8f7" Size="132" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="737192" />
@@ -57387,15 +57245,14 @@
     <Blob Hash="ac68dd6e7cd83674c701c55db4280ffd69fb0305" Size="26070" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="2034314" />
     <Blob Hash="ac696a9b1c3d9794bac15993264c5ec300379016" Size="16137404" PackHash="8cbcbc5fa504c8c6f73def97aaefcf9a25edd60f" PackOffset="8" />
     <Blob Hash="ac6a5fb2759401561fdd210ef69c06feb9b4ae68" Size="19826" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1767346" />
-    <Blob Hash="ac6bf32b94ce34b7bc1fd8c6fc8bb8bfd399500d" Size="3258170" PackHash="e92993477ff0ca06e5bd518fdb05a1a1d932d56f" PackOffset="8" />
     <Blob Hash="ac6c19ab7daaffe86622f2d78e4cbeff1a674e85" Size="105312" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="8" />
     <Blob Hash="ac6c7ec281d97bc0e26fe70a48c6d16d6cfbfd5b" Size="6706" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="2072393" />
-    <Blob Hash="ac6d9b5546c321a6fc8b87626275f2dd8eee3cba" Size="32768" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="288775" />
+    <Blob Hash="ac6c83a88f7d98714359b8e5dcabcb1e0d1da317" Size="8092" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2049606" />
     <Blob Hash="ac6ec3c1ef7d981fc17a54d4307161337647a409" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1250312" />
-    <Blob Hash="ac73ebb1eee96beeca5a35ddb4403b73ed7c8a8d" Size="2745026" PackHash="59af53c6d65fb6bea9cef333587b4b2995416d45" PackOffset="8" />
     <Blob Hash="ac774115daebd9c10eaca48c44cdeb8c76899915" Size="122966" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="1251641" />
     <Blob Hash="ac77836df161f3625592e1515aee7af79daf3f9e" Size="38216" PackHash="79cbb1b9e1be7761c86eb45db23522dfc07e61b1" PackOffset="1902784" />
-    <Blob Hash="ac7c7652d0462b5e558154145e5b043d7ab7098d" Size="11352" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1990932" />
+    <Blob Hash="ac78271db5a86af8de56fffdb803869bb4f8998e" Size="1816736" PackHash="5fb19dc6bcf03275ec3ef08f0d8798a3d9a0e47e" PackOffset="8" />
+    <Blob Hash="ac7c7652d0462b5e558154145e5b043d7ab7098d" Size="11352" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2048335" />
     <Blob Hash="ac7e7f90d1220b6d9507df3810559ea849015160" Size="5971" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2080857" />
     <Blob Hash="ac81d9f4143971972c6fcc17f87cc4d647f208a3" Size="908" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="266280" />
     <Blob Hash="ac83799695e43422b1d8b71c60bc8d3ed1d5a39e" Size="11022008" PackHash="5dc3b448930ca1c36e5c46a0c467d1f79642dbf5" PackOffset="8" />
@@ -57422,7 +57279,6 @@
     <Blob Hash="acbbd1a9dd6064b0a8b33be8ecf894f556beb8ef" Size="7139" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1096435" />
     <Blob Hash="acbc7a48c78691b43203a427c698d99bd08deaf4" Size="5042" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="498782" />
     <Blob Hash="acbd4fdfa1ee70854460751d89459cedb185610b" Size="3089" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="547247" />
-    <Blob Hash="acc1a0052226b8ee4632ea963a68fec098df7e2f" Size="1430" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1310297" />
     <Blob Hash="acc464877fdf678975f8b910883d15ef8ed4db92" Size="3449" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="504893" />
     <Blob Hash="acc796be75f41a12fb1f8ccbd2b2839af9876ffe" Size="8920" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1459985" />
     <Blob Hash="acc8385b6c74e670fa19367e06522b5481dd4179" Size="51629" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="8" />
@@ -57430,13 +57286,13 @@
     <Blob Hash="acc9b352fe7cf5bdb0e00316cd287512571430c7" Size="1483" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="724767" />
     <Blob Hash="acca2f48a7d8e9b4b71f0f7ea8da8fe259ee3bb3" Size="14975" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="150207" />
     <Blob Hash="acd2ecb0538702c65b03dd2e767aa6de0509ad29" Size="140966" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="1639063" />
-    <Blob Hash="acd4a1d2b1fe1eb7e246f66371210e709031d062" Size="47184" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="801120" />
+    <Blob Hash="acd4a1d2b1fe1eb7e246f66371210e709031d062" Size="47184" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="858528" />
     <Blob Hash="acd5c0c887bdf65b097e0bb6472ddf693ce1c87e" Size="60855" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="830972" />
+    <Blob Hash="acdb37bc6faf0d82fb13b0ad96de36564689222f" Size="8048" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1603163" />
     <Blob Hash="acdbf9befc420b563b9ae66ef7eeb28461ebbcd5" Size="1767" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="922173" />
     <Blob Hash="ace052fdda2d6ffff2dbe03625aec210c18bdceb" Size="4594" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="506274" />
     <Blob Hash="ace7ca1070475ae99c9ae7647a9640af2ccffce5" Size="676" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="452939" />
     <Blob Hash="ace8e4f06a4936c2b09a8a91e3007dbb9fd5775d" Size="3212" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="14078" />
-    <Blob Hash="acec8914deea187423a04e735eab5d4801814636" Size="2287476" PackHash="b2ef64f142bc72cfc5a91cf70cd82c980973881e" PackOffset="8" />
     <Blob Hash="aceebb2b50403182c230719962ca62b42f05da28" Size="3909" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1047298" />
     <Blob Hash="acf07b3e4b6d57eec94641a510c5350086189110" Size="41366" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1448288" />
     <Blob Hash="acf2509fcd3fd4a69783451dfea2a545ce14aca7" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096868" />
@@ -57446,7 +57302,7 @@
     <Blob Hash="acf47517d70c06ebfd8bdc3626a99bcc8c2ca9cb" Size="126" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2037851" />
     <Blob Hash="acf8c368ce9d67b6ae29bc9b3c6669b2639dc4c4" Size="3325" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="200928" />
     <Blob Hash="ad0061eae2b0b5a46967d80a0a619a674fdd85c8" Size="290" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1346011" />
-    <Blob Hash="ad00da7c9c967282549118a81ab824390abbc6d9" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551795" />
+    <Blob Hash="ad00da7c9c967282549118a81ab824390abbc6d9" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671027" />
     <Blob Hash="ad04abe2a5310883ffd68884e480ef44b5621afc" Size="88" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1797768" />
     <Blob Hash="ad04e12059e33001c1e5a551447295d206120af3" Size="3773" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="807244" />
     <Blob Hash="ad05f5b9233fd2e3167d37a40fb44b4e1b864a32" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="627107" />
@@ -57475,10 +57331,10 @@
     <Blob Hash="ad3b04bc7c9299d58e24fbff17caaadf37804f92" Size="27136" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1938440" />
     <Blob Hash="ad3b631fb03819772164402e202afa781687f597" Size="208" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1259422" />
     <Blob Hash="ad441f10ecf84b4d5ca459d035f6eb7cec77f78a" Size="63877" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="186805" />
-    <Blob Hash="ad448c87622a449dc021d2d1d5a59a3100159fa5" Size="59" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1468297" />
+    <Blob Hash="ad448c87622a449dc021d2d1d5a59a3100159fa5" Size="59" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2005379" />
     <Blob Hash="ad49c9274f39680fd077683b30ef801b42b9c952" Size="9093772" PackHash="93d2a6ecfd0eaaefe197b2ac55c361240f933a82" PackOffset="8" />
     <Blob Hash="ad4dc0ac24eaa7f0efb4f44c0cd16ce3e7730e75" Size="1112" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1071098" />
-    <Blob Hash="ad5568c255d2e7b6e94c8d569645833f55ae53b9" Size="3212" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1786224" />
+    <Blob Hash="ad5568c255d2e7b6e94c8d569645833f55ae53b9" Size="3212" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1611360" />
     <Blob Hash="ad59100f1255cfb0212eb0702c97ae6bd8907ece" Size="5149" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1640969" />
     <Blob Hash="ad5cfa369d2971f0f64011452dad31a505176bc7" Size="2173" PackHash="364abffed04ee2f1dfeefc30da246c24c6adacae" PackOffset="2094600" />
     <Blob Hash="ad5fcc99f66bb203a03882447d09438ba4c7512c" Size="14733" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="80614" />
@@ -57490,7 +57346,6 @@
     <Blob Hash="ad6d70c235e249bd9156e74e78cc3356ae053e18" Size="14336" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="2062552" />
     <Blob Hash="ad6ee7494bd870eb02c19f64a2e1b59e23fb6c16" Size="130130" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="1919335" />
     <Blob Hash="ad6f1788310a3a5a761873fef1a32416b7dbca89" Size="8558" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1639178" />
-    <Blob Hash="ad6fe76105d415d4da47838147103ad2249e908e" Size="2066944" PackHash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" PackOffset="8" />
     <Blob Hash="ad714729d5d445f3ce5278bedb16433d64190d0d" Size="25526" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="775425" />
     <Blob Hash="ad76b11723917291654d629013dcc76afb63a04a" Size="9302355" PackHash="dbc4d9d5a04029e2d1999a94b8db494222187078" PackOffset="8" />
     <Blob Hash="ad77631891d721d5b00cad611a672be75ad1107e" Size="4467" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1972477" />
@@ -57499,14 +57354,14 @@
     <Blob Hash="ad7ce14590253d2149727f41d2666cb08b72a7f8" Size="10344" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="817188" />
     <Blob Hash="ad7f0ae0b713fb95c53c61a00980f591327c97df" Size="7655" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="2084677" />
     <Blob Hash="ad7f985cba38e6c577162f46f064b64eabd266db" Size="246" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="435440" />
-    <Blob Hash="ad80d101fc7ffcec04b2ccb5335984d7d3852368" Size="394" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2096058" />
+    <Blob Hash="ad80d101fc7ffcec04b2ccb5335984d7d3852368" Size="394" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2096759" />
     <Blob Hash="ad819cbee23098d3001c4c98cf2cf87102846c0b" Size="48560192" PackHash="e82df3dd8df9657a25f1927bf0e2cc882e8ed896" PackOffset="8" />
     <Blob Hash="ad81cdd7a1b7b63ecc58258506a5285aff61d445" Size="101208" PackHash="649510e32193d4eb9d3af2ca954f0a74f5f6cb86" PackOffset="1208124" />
     <Blob Hash="ad8795df30dfcd57d9f7cb765f8073210b041de1" Size="1487" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1909285" />
     <Blob Hash="ad87d70c1c6107747365ace23888597ec088ee9b" Size="205" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1510160" />
     <Blob Hash="ad8f1f19ddb2be1f46ab7df6117e1a4143a6847b" Size="762" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="988562" />
     <Blob Hash="ad92370ee989475b44d7e6550250c70bea5e067b" Size="62832" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="1716140" />
-    <Blob Hash="ad9339cf7ebebfea865af717987670277340ad6d" Size="56" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551690" />
+    <Blob Hash="ad9339cf7ebebfea865af717987670277340ad6d" Size="56" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670922" />
     <Blob Hash="ad95786f911849b1cbe3f81950ecaf4cacf8fb76" Size="170539" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="1877524" />
     <Blob Hash="ad95d04738f6b15a93ded1de6b5fa9f47c8e38cb" Size="233" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1604310" />
     <Blob Hash="ad9651c9fc1b90bd5ccf69ee00ff27042a0a66df" Size="4475" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2088561" />
@@ -57524,8 +57379,7 @@
     <Blob Hash="adaf7ec8c2035bc06e168d3f1bd7f39277e9273f" Size="419" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1114354" />
     <Blob Hash="adb146400adaf279a3281f121920aa7706911abd" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2080595" />
     <Blob Hash="adb306b65b8fb19d79c6a6289058c8d9bae74736" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="548360" />
-    <Blob Hash="adb3962281d715fbf0f050568adc2dfa59df3988" Size="2152" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1412205" />
-    <Blob Hash="adb5c2b20f0c1b507dee0ced241ca7d21e4391a7" Size="244398" PackHash="e266aa9b854d9b51e6070e16170a57751ced9a15" PackOffset="1795276" />
+    <Blob Hash="adb3962281d715fbf0f050568adc2dfa59df3988" Size="2152" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1861107" />
     <Blob Hash="adb6e0cacf7ec70a47d12e6c323d4e0fd968449d" Size="641" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="117897" />
     <Blob Hash="adb70748afab74df6b21975df1f88590bf987b8e" Size="2195539" PackHash="0b19af7719665b5651dfb183e0f462030575539c" PackOffset="8" />
     <Blob Hash="adb7fb4bfc5535d455355ba215d654f7b1cb637d" Size="5209706" PackHash="e63440472234df22c00a68b8ead881c55dd1687f" PackOffset="8" />
@@ -57550,6 +57404,7 @@
     <Blob Hash="aded0b699298c31eeda048e484af0881c3d7f4b6" Size="7087" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1354096" />
     <Blob Hash="adf11adbaceeaad99c4221c16ce1152da35062fd" Size="1119" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="2093025" />
     <Blob Hash="adf7a9ee1e77015a07b91272e009d98fc9a85e6b" Size="35160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1002576" />
+    <Blob Hash="adf98ecaebc9a08e4360a4f502933a9ca384f704" Size="1845438" PackHash="6d8f0a4a0b4ca8ac905f2965b2094624e22d6a8e" PackOffset="8" />
     <Blob Hash="adfaddd614d0ea74ae48a08a53c92d5264e82f70" Size="6696" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2069379" />
     <Blob Hash="adfde83145c3c0ee8969d60853c3ab73db6ceb78" Size="2851" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1682544" />
     <Blob Hash="adfe449eb957e616271952627ba6f82d9c10b551" Size="368" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="47070" />
@@ -57573,9 +57428,8 @@
     <Blob Hash="ae34cd8cb77d621d7e167de1ed785319510ab8ac" Size="60498" PackHash="d5300790dac3cc619f89851b34f424d123202d88" PackOffset="187064" />
     <Blob Hash="ae366cb9c01e4306257536b0b47694fffcf56195" Size="52430" PackHash="4aac38fbf89541859c14c7fbf320b1f9deb410f4" PackOffset="2028706" />
     <Blob Hash="ae38d6e9989bc2a6247b63fc198aaa891832d261" Size="28160" PackHash="4e7e810806daa53af602a84d64ae8277b20e8884" PackOffset="1732616" />
-    <Blob Hash="ae3d11846380326aa8435073e1efbf95d919ef8a" Size="14636" PackHash="495a03cfec4638fdaa630d336ffc1650693e7422" PackOffset="2075476" />
+    <Blob Hash="ae3d11846380326aa8435073e1efbf95d919ef8a" Size="14636" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="2072138" />
     <Blob Hash="ae43e0a12cc5bc3a6d0f50aa22d5aa51a9842a1f" Size="624" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="806166" />
-    <Blob Hash="ae4727664f74eea70ca0ca6903a65327f8e71b10" Size="1419528" PackHash="3f51332114ca5aedc3ab7920c6238f9dc6912e29" PackOffset="8" />
     <Blob Hash="ae491d42df4a98e4100b0fdd5bf20ad18e320428" Size="3752" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="675414" />
     <Blob Hash="ae496199fbf555140f5dd58267b3856d075015ff" Size="3480" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="774113" />
     <Blob Hash="ae525d2f774b3249200bbaf92e81a8076a18cc4f" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="677380" />
@@ -57591,6 +57445,7 @@
     <Blob Hash="ae72e0606a2c182700830a80671e6d43793648eb" Size="4769" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1848077" />
     <Blob Hash="ae737cb58c6fc1aba70697e559add3c497cb4652" Size="701605" PackHash="cd0d52d3a393b848c4524f8d20e9c3d772779d50" PackOffset="1113712" />
     <Blob Hash="ae7b6f4f8fcd165dcbf2031d32739a9997b04fe5" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2073915" />
+    <Blob Hash="ae7c98d648b740d1adcd38359516e89f1dd42b46" Size="842506" PackHash="e9ada08052934232dab4347c891567c01aaef05a" PackOffset="8" />
     <Blob Hash="ae82378ff6bbdaa08fead0bd6c897399da5dd70c" Size="772" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1969704" />
     <Blob Hash="ae837c556ff23b9e166288a11e409d21bddda4ed" Size="20672" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1479784" />
     <Blob Hash="ae85f6e8cc34829d54ae7cf8f24c1f76c942bf63" Size="7708" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="26824" />
@@ -57602,7 +57457,7 @@
     <Blob Hash="ae941a7051d9e34ceab22dbdb90aad7ce5a3c79f" Size="2338600" PackHash="5a5976412f046d7221f3f17480cc2c863e6f4b3f" PackOffset="8" />
     <Blob Hash="ae984be67fa0b327980e3d73878c78d07ed2aa42" Size="769389" PackHash="c179a00f7b3f95d459e9dc03d8cf5f197851686e" PackOffset="8" />
     <Blob Hash="ae9c3702f95c8a34fabfad1a726e7a7e22f801c9" Size="2748" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="679079" />
-    <Blob Hash="ae9e2658a355d0c19b967d7065749e04920be5b4" Size="872" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1430559" />
+    <Blob Hash="ae9e2658a355d0c19b967d7065749e04920be5b4" Size="872" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1879612" />
     <Blob Hash="ae9ecbfd4c86bbc753267a33d8d606ca0430cf3c" Size="93729" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1813142" />
     <Blob Hash="ae9ecf336d9a025570a14f724c8cfa3153ce4bac" Size="88829" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1318624" />
     <Blob Hash="ae9f81855477c147734ce47c0c3fef6ce5a5693b" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1994013" />
@@ -57614,14 +57469,13 @@
     <Blob Hash="aea76a2e2b42e950210c1dfb7b1a1b45519cbbe4" Size="2325536" PackHash="81a790397c019de8beb710f522e1041d389a6272" PackOffset="8" />
     <Blob Hash="aea8b7cd158a0f5063fd5781ac3078b094446476" Size="113327" PackHash="31ada4c269dbc1fe2d7767f6c437634f661132d2" PackOffset="1692408" />
     <Blob Hash="aeab5a5c083f57177eeb5086be8031def0bdebe1" Size="30097" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="836901" />
-    <Blob Hash="aead247ac891504ecde887d5602cb1b24ec8e477" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554191" />
+    <Blob Hash="aead247ac891504ecde887d5602cb1b24ec8e477" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673423" />
     <Blob Hash="aeb49186974021bda14886ba5c670657535c11c6" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="682515" />
     <Blob Hash="aeb57ec90f7f028c156d63711ad475baf9ca4dab" Size="2921" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2090751" />
     <Blob Hash="aeb914131fe6143c7a7a434ff32135ef2089ecf1" Size="2951" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="3685" />
     <Blob Hash="aeb94eee61361dbed2603d418ee113d7d5c7137a" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="710150" />
     <Blob Hash="aeba12761d809e78cd07dd3e6bb1e5a257c20eb0" Size="2640" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2071190" />
     <Blob Hash="aec1aaa173b2e129a9d7389d94db4715b711bf8b" Size="12189" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2084524" />
-    <Blob Hash="aec577ea31fa8798bc2b978ecb23785f98bc574a" Size="39662258" PackHash="a420aaea571713d4ad3f0d3f6430dfbe47084a5f" PackOffset="8" />
     <Blob Hash="aec5b0256b7c578360e46a8b36c9fdd89cb04eea" Size="2152448" PackHash="00fd831909119ae5923dafe067800c0539909582" PackOffset="8" />
     <Blob Hash="aec8270f39bc5460d9afaf6c2209a9443d69327e" Size="83189" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1503409" />
     <Blob Hash="aec83969c4d030ca6b8baed4d5b1f56728cd9fe1" Size="21504" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="1869832" />
@@ -57635,7 +57489,7 @@
     <Blob Hash="aed91756e9d9c02afe8d9c802c1c46046f92ff25" Size="20136" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2061992" />
     <Blob Hash="aeda12825c3af3880a9709559ee8c940fb9b8086" Size="18810" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="814779" />
     <Blob Hash="aedc336722db5768d32e4df0dd28c307a7e25bc1" Size="3090" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="891559" />
-    <Blob Hash="aedf945be455f01cfc4adb4f15c31f2fcc1e3156" Size="749" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1462293" />
+    <Blob Hash="aedf945be455f01cfc4adb4f15c31f2fcc1e3156" Size="749" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1999375" />
     <Blob Hash="aee12964dee5ba6881a37e2690d8b4de731f0fd3" Size="180" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2096535" />
     <Blob Hash="aee1706e3d44299523956898193cc096da1de3e6" Size="146" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1572880" />
     <Blob Hash="aee3c56b2d2d590b376fba74582a59689d14b5fc" Size="5725" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="900509" />
@@ -57644,7 +57498,6 @@
     <Blob Hash="aee9f8f4f033dda02cce737087b536d03ed90d45" Size="6696" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="1016102" />
     <Blob Hash="aeeac9c71f4de88dfb41bdb600aaa38fe71d2079" Size="534763" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="682183" />
     <Blob Hash="aeee9a62a92020d80ead87a315c4c8dc55448d9d" Size="180" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="2096922" />
-    <Blob Hash="aef385f6450ed203f2a61a5025be0ce51fea6db9" Size="372024" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="1442108" />
     <Blob Hash="aefa81dd95dfb8232874f4f20151d75d31101e4e" Size="955" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2040327" />
     <Blob Hash="aefad2ebfb9aef1c6b1d693cde9632a8e1c9b0dd" Size="256" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1509682" />
     <Blob Hash="aefd631efc1892063244fa622de1a091c461e370" Size="2009" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1051545" />
@@ -57652,11 +57505,10 @@
     <Blob Hash="af0409950b5203b2dfaddfc68d821e0f2ebef7d3" Size="14451" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="765183" />
     <Blob Hash="af059e351b5814b861b441237f60177857369837" Size="302880" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="921608" />
     <Blob Hash="af09f4cd766d2029d121bca99108303ae92259ec" Size="304" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="89424" />
-    <Blob Hash="af0f535cc069a370370173c716332f158ad98035" Size="47" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2097112" />
+    <Blob Hash="af0f535cc069a370370173c716332f158ad98035" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668418" />
     <Blob Hash="af0f944167f5e7c3d4c9de5a73df232fff0ee258" Size="1705" PackHash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" PackOffset="2093842" />
     <Blob Hash="af10600dc4d8f89fe28e2ce25cfc8e1e6c85cfb3" Size="621" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="314332" />
     <Blob Hash="af129e085e10f5f54e1167eb42499ab1ef32a532" Size="18650" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="38596" />
-    <Blob Hash="af16759c765a48eeeeb525248cbcd3b6937ae12a" Size="1795268" PackHash="e266aa9b854d9b51e6070e16170a57751ced9a15" PackOffset="8" />
     <Blob Hash="af16a0814129d3816e1a937ec33f2a184f76f204" Size="3765" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="2077658" />
     <Blob Hash="af1752e9719d4abbd49b4558b1f8be1bc4374a65" Size="1363" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2074027" />
     <Blob Hash="af176c6b95c7bd946f11628aede8449e3b297ce1" Size="2943" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1502579" />
@@ -57680,6 +57532,7 @@
     <Blob Hash="af3aa0adc9524cce9381325c104d476fb55f5128" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="966984" />
     <Blob Hash="af3c27be3819e4d68b6a230cc6ef63b9fdaaf28b" Size="21240" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="2026161" />
     <Blob Hash="af3cc66f9aa451231240019ed6c429a8be744018" Size="23295800" PackHash="ebc78d12d3ba5ee4b59613ba0c8a0498cbf542e0" PackOffset="8" />
+    <Blob Hash="af400ab5f168d0e293fc7b4452a6b80bd9fb0be9" Size="16266776" PackHash="0bd924dfc633b391b158fec5bd6fc686e4bdd669" PackOffset="8" />
     <Blob Hash="af42e3027cd21e28ceb9db45c8ca002e967adf5f" Size="80896" PackHash="7d776a07e3eb045bc87ffc9ab7ffc5da18a5c68b" PackOffset="2012168" />
     <Blob Hash="af431ac0c07ca102b9c646c9b57da050c61201bc" Size="2617" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1160357" />
     <Blob Hash="af4485f289228f00a6b1b6972b8513455acdad98" Size="30056" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="422295" />
@@ -57700,7 +57553,6 @@
     <Blob Hash="af745e0f8e8cc83142b7eafdee9f95956ff631e0" Size="382" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="211719" />
     <Blob Hash="af7860d3b6d492859a68c1d8f10cef009ec86eb3" Size="162739" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="356342" />
     <Blob Hash="af7a9620b07265acda2dccfe4fded8a98ebf7937" Size="461814" PackHash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" PackOffset="8" />
-    <Blob Hash="af7e7e755e6a50fde533abf50b97f0537bf9e7a0" Size="3200538" PackHash="46c6df425e13d415d2621732c6e418679acfc1bd" PackOffset="8" />
     <Blob Hash="af800b5f4f7eae78c447587793b07f457e31e39a" Size="61" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2086592" />
     <Blob Hash="af827e16947a882a5192c048f84942e6a592cac3" Size="1956" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2093579" />
     <Blob Hash="af8342e3a2491dec1cc6e4eb1106a826da4195f6" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2093676" />
@@ -57716,7 +57568,7 @@
     <Blob Hash="af9467bb87c4c28921df62a87b81223052f9ff4a" Size="176" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="15617" />
     <Blob Hash="af953604f4fb7c1e56de1db6676681531055b94e" Size="7667" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="306974" />
     <Blob Hash="af95525f6ee7cda646216e526edf4579a1500b66" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1209634" />
-    <Blob Hash="af961d73be50de82df4c67d2a202f98eb924df0e" Size="59" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1702175" />
+    <Blob Hash="af961d73be50de82df4c67d2a202f98eb924df0e" Size="59" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2096689" />
     <Blob Hash="af991ec0f4ca571ce1cb937809651b358fdc23fe" Size="9814" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="866998" />
     <Blob Hash="af9ab9acb8fd1751353ba382257471397c2436e5" Size="160" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1370636" />
     <Blob Hash="af9c8a9c7af3612a3d29ffe01bf6ddd4851b186e" Size="20992" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="948560" />
@@ -57730,10 +57582,10 @@
     <Blob Hash="afb113caf75b51fb94465d7449fd0db4a3fa03d3" Size="45419" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="1459930" />
     <Blob Hash="afb28a762a447f0798aa66b2e860669c82696ef5" Size="20081488" PackHash="1bb6c5a3ba546032b2e8e2d73c04a82edd5d116a" PackOffset="8" />
     <Blob Hash="afb35a4030edf27f0fc4d1e0aeea02807d2b0d28" Size="37677" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="320885" />
-    <Blob Hash="afb85c06315d70e08143599c383559d6b5003335" Size="1105" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1982181" />
+    <Blob Hash="afb85c06315d70e08143599c383559d6b5003335" Size="1105" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2040737" />
     <Blob Hash="afc2a8d5d3549de600d5b93654987e908cca95ca" Size="18577" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1154609" />
     <Blob Hash="afc5852358135ba2482815022c7959d107d043c2" Size="5314" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1140371" />
-    <Blob Hash="afc6f568868e1b4c7278bd52f43c20eda5e46ef1" Size="5282" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1250660" />
+    <Blob Hash="afc6f568868e1b4c7278bd52f43c20eda5e46ef1" Size="5282" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2034400" />
     <Blob Hash="afc742c64b0913fcdbcebc860f7ab961560d34ef" Size="169436" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="8" />
     <Blob Hash="afca553b930207d4fd2154dc86841a861c40fdc1" Size="28560" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="705380" />
     <Blob Hash="afcae1c75adcd95731df1f64e77b9d9f2c799b57" Size="3627" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="2061692" />
@@ -57746,6 +57598,7 @@
     <Blob Hash="afd848ed9bc3bff46cb69b22980a6169d0077f5e" Size="1077" PackHash="a256d63248e60ea748a2577552e6a02d3e75e23a" PackOffset="16683" />
     <Blob Hash="afd86ad159a836a1172a7f0f938d760d87a9d5d3" Size="1267" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="16311" />
     <Blob Hash="afd8a0c5bf9216f7cc441707992349d7d43cf561" Size="6165" PackHash="5f434ba2d925cd558af2bc1af03b657a443bcdd1" PackOffset="2081305" />
+    <Blob Hash="afdcc642597c718e81599b2bc038d260a2af2398" Size="1430" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1759199" />
     <Blob Hash="afe163fc4c0b841e98456827b6050dfb3bf217b8" Size="6392" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1198843" />
     <Blob Hash="afe2db9cecf37658c4656d55912ea3831cba62f8" Size="431" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1440391" />
     <Blob Hash="afe476ebb36070297289b4695a0e4c7bbb01ed9e" Size="1171" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="2072469" />
@@ -57769,7 +57622,7 @@
     <Blob Hash="b0035df12b1bb296dec3c972af144b8c7c7d88ae" Size="5986082" PackHash="35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e" PackOffset="8" />
     <Blob Hash="b003c30a67e1600106609ddf248258d5cb63b1f3" Size="46188" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="974892" />
     <Blob Hash="b01027c683f82b368314e79872eed3855c39364f" Size="15872" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="2058248" />
-    <Blob Hash="b012227a5681a4e99a1cbcd5a141ae9c63e73da0" Size="14880" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2028328" />
+    <Blob Hash="b012227a5681a4e99a1cbcd5a141ae9c63e73da0" Size="14880" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2061336" />
     <Blob Hash="b01a38bff345207754b9a58cde6e93b62ca5b27e" Size="7647" PackHash="8ac4339e593d1b06dbf74d5477482e5243d77298" PackOffset="988907" />
     <Blob Hash="b01bfa692dfae5447b91ae925d3ce6cb7faebbce" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2093459" />
     <Blob Hash="b01f41179cb5908aadda7d525d05193159556bef" Size="1794048" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="8" />
@@ -57808,7 +57661,7 @@
     <Blob Hash="b06df3ba43d2505872481191ec3f90487b30efef" Size="7572" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1550708" />
     <Blob Hash="b0712c66ff300c9c1a95f603bb107f6c948fb4e8" Size="204" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1378404" />
     <Blob Hash="b07174601e1ce03a5d1e74e759c4d3296a8c7cb7" Size="45481" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="608540" />
-    <Blob Hash="b074ac134dfe51961eb2e1194225f79d4b9843b8" Size="2232" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1344482" />
+    <Blob Hash="b074ac134dfe51961eb2e1194225f79d4b9843b8" Size="2232" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1793384" />
     <Blob Hash="b079e7b4e4c7c5f406abdf4c3518c8e1bad51074" Size="54552" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="593231" />
     <Blob Hash="b080bb65787c611829837d58bfb6e7d60f2b8016" Size="151" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="559926" />
     <Blob Hash="b082c504fd8c142e5b17386eb13a3392dd3dddce" Size="24090" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1067927" />
@@ -57826,8 +57679,7 @@
     <Blob Hash="b0b24c868e21ee9526e9ac68fed39f2c86923ac0" Size="224699" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="8" />
     <Blob Hash="b0b2eac33ff7dd925071d31d7a98d8c5892a4ec8" Size="1318196" PackHash="2d444ab79237d1419d4843c8b6f056ccbcd23500" PackOffset="8" />
     <Blob Hash="b0b34f16dd31d52dff0aa69d5d8a12080b02c2ee" Size="10136" PackHash="76b81db67f411f1be2b6675587a81eedcdbfaf5d" PackOffset="2070196" />
-    <Blob Hash="b0b37eeb471e326121dea843b2faf5b27c65fe56" Size="28197256" PackHash="dc2b29c0e13526608c488ffe71c8b1250da551d7" PackOffset="8" />
-    <Blob Hash="b0bb703a4dbd7500d2c1bd45318717b27435a6de" Size="5059" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1939768" />
+    <Blob Hash="b0bb703a4dbd7500d2c1bd45318717b27435a6de" Size="5059" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1880947" />
     <Blob Hash="b0be11b0353314891288adce2524631f00544e80" Size="77" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2079327" />
     <Blob Hash="b0c7cc72242c37a15408d4179ebbd8ab0295defc" Size="52146" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1334534" />
     <Blob Hash="b0c998421656f6d536cbba67ad0377eddcd8bd3e" Size="10106" PackHash="f26725553888bf1a0cb10b2f2ea94dc7801c0c27" PackOffset="2082182" />
@@ -57835,8 +57687,8 @@
     <Blob Hash="b0cd16f06ec5121680eae3fd3840f7c4f7b5f091" Size="14848" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="501768" />
     <Blob Hash="b0d0b1bf2386b0169e97a900876337d76f969909" Size="14645392" PackHash="d165f29f588eae8d8a55d377f73b67973713c670" PackOffset="8" />
     <Blob Hash="b0d61b7952d79b77ab253a32be145187c6e225e7" Size="21916" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1672873" />
+    <Blob Hash="b0d6fa139c1e144072c0e95508804848d3a76b3d" Size="11085216" PackHash="99cf73da1d408afb92d167d2bd6c6d9ef7d307c5" PackOffset="8" />
     <Blob Hash="b0d8166f8a0b2301e459fc627a278535d273ed65" Size="30056" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1708755" />
-    <Blob Hash="b0d9f758fa40a2c5609cb68f563714e3a26fe9f9" Size="3464336" PackHash="a239ff390f62a5f1b66560ec82efa7095210f0f8" PackOffset="8" />
     <Blob Hash="b0db36755de653fa91f30b1b5ac7a480a1a2b0d4" Size="3273848" PackHash="2339c1d3bfb2db1621ef01225df981c1bcc32f49" PackOffset="8" />
     <Blob Hash="b0dbdfe778db84af650ebeb57769e7cc48d0fa61" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1017880" />
     <Blob Hash="b0df7ad51ddf5dd50cc9c3e9f78419f64541fbb4" Size="1425" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="541993" />
@@ -57844,10 +57696,12 @@
     <Blob Hash="b0e8f456747a50e87273eb4c90ade1e5bcf221f7" Size="102060" PackHash="4d7d1e4d2f147c32d57c60683c7aa26c4f9d10cf" PackOffset="621282" />
     <Blob Hash="b0ed3ffaaa1229814200353599e50006de2981cd" Size="2827" PackHash="69386eee8073c391ca5a7e1db9f40ef741bba654" PackOffset="2093547" />
     <Blob Hash="b0f019757fa05523bdd590c375917a721d94589d" Size="37268" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="8" />
+    <Blob Hash="b0f52ceacd8d36ba5313eedb2dd3552a0d2b66ad" Size="3028954" PackHash="743634d390e65d5d9ac514f2434ce65481b53527" PackOffset="8" />
     <Blob Hash="b0f89bd76602d43fef103877a7b7f96b0f22dd35" Size="18707" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1940595" />
     <Blob Hash="b0f8c14cd3964318421b7b3c13ea55a42cabdb50" Size="30846" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1628208" />
     <Blob Hash="b0fbb288bbb59c8bf3f24fb979839af15f00642b" Size="5286" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1879718" />
     <Blob Hash="b0ff6dab862c048384162d0e93bf73a7000c99d9" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="332812" />
+    <Blob Hash="b1039893bc50743766a07bdf52ffcea944e59454" Size="16080" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2071776" />
     <Blob Hash="b106a73fc8d7e31eb6c34c7154ab54a14aa3c633" Size="146086" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1786903" />
     <Blob Hash="b106f376a22078f6a29676eb21e2c80f9192d8cb" Size="2608" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2091689" />
     <Blob Hash="b107019c4a5038f70aa62f418690a8079da6b14c" Size="2188" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="1992481" />
@@ -57855,14 +57709,14 @@
     <Blob Hash="b10cdf71c962f17ef88f1a1162f9aa61a9dc0d97" Size="148400" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="1236664" />
     <Blob Hash="b10e55824e577f8464369346101f6f070b637e12" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2083140" />
     <Blob Hash="b110dfa59acf1ff1cd5f43f66af39bfa4ad92fd4" Size="32099" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="284278" />
-    <Blob Hash="b113a6f30d25ec941467406beb900ca97c7d0a7a" Size="3409" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2080478" />
     <Blob Hash="b114991a4f2b657af9928f1bdf38f07c2c88eb50" Size="497964" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1108253" />
     <Blob Hash="b1157ae9415ec372735e3d626e864af7549476ae" Size="27195" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="923240" />
-    <Blob Hash="b115df00ad4e2804f8000548db6d4bdcb6d30ae4" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554915" />
+    <Blob Hash="b115df00ad4e2804f8000548db6d4bdcb6d30ae4" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674147" />
     <Blob Hash="b11cc5d04f425106c88683a9d23a98e886d410fc" Size="815" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="443844" />
-    <Blob Hash="b11fdcc2eef8fd007fe5e551d88b03aa43be9473" Size="3453740" PackHash="bab102d2c2cf98c530605b83593fb10a63108cd1" PackOffset="8" />
+    <Blob Hash="b11dee6eb47f5e0e4f70984779c5f26321539197" Size="34405208" PackHash="7a8301ea5bb7e538a66f2a54c051ff0c4f9e4159" PackOffset="8" />
     <Blob Hash="b1233226ee184c7552efbc5d6c9744b705941bd2" Size="3588" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="875663" />
     <Blob Hash="b1248fbfc4f0684db4aae495f4feca06bc4c3988" Size="943" PackHash="c52ad5d5dc97d3425d95ae17988831ac9410b438" PackOffset="2096102" />
+    <Blob Hash="b12595762f222499882d52621c9a0bb1875aa027" Size="7352072" PackHash="2496b29b9363d9153c37a61c72e013ab300d706d" PackOffset="8" />
     <Blob Hash="b12803eaf013dc69b2f7b17b6aee6784c5259808" Size="17780736" PackHash="c50c66910f327b5721c58648dba80266a1541afd" PackOffset="8" />
     <Blob Hash="b128107cc90695156c66c6adc0f0316156d7c637" Size="151" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="260495" />
     <Blob Hash="b1284d289862b1df0f5066bc771384b92d13012b" Size="91" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="722167" />
@@ -57888,23 +57742,25 @@
     <Blob Hash="b1621cfb03600c436cde9c077c87b07ab915b3b1" Size="16008" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="526112" />
     <Blob Hash="b1633d94c38942821b9f06793439197ae510433e" Size="1799" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="966143" />
     <Blob Hash="b1653863382865a5e34fa8b778639b16dcfb93c3" Size="373" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2055405" />
-    <Blob Hash="b165482f16fbd488fa9856da121c1802558c87df" Size="9144" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1575601" />
+    <Blob Hash="b16547fe68e38a99b7594694bc8b832a8cdbd88d" Size="2481152" PackHash="232bb579fe97b59599879943c075c92751428ce2" PackOffset="8" />
+    <Blob Hash="b165482f16fbd488fa9856da121c1802558c87df" Size="9144" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1591426" />
     <Blob Hash="b16a221613968f977a234d75fdf3fcbefbfdd9a0" Size="153" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1253312" />
     <Blob Hash="b16fbabe137864fea2cb959c86741f3a4cd8a6d4" Size="1558" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="954311" />
     <Blob Hash="b170eb985f9cddd8624e8d6f8ad986ea9937284c" Size="4814" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="804740" />
     <Blob Hash="b1715950212eafa11ec44b72b0009c8a39ca1e4f" Size="35851" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="8" />
     <Blob Hash="b1735a58842c907a4926f50326c774538482efd2" Size="13922" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1801410" />
-    <Blob Hash="b174b3c66a485c3e6c232b4d84902b8e31d1c063" Size="2552" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1388394" />
+    <Blob Hash="b174b3c66a485c3e6c232b4d84902b8e31d1c063" Size="2552" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1507854" />
     <Blob Hash="b17805afa21aca74f74a44fc0808f8c3b05612fa" Size="309" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="2096327" />
     <Blob Hash="b1798cc8b2366393067bc035236ff59e0b845fe0" Size="183105" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="1235667" />
     <Blob Hash="b17b2bdc7fb226140fc5e236c3240016d35861d9" Size="17725" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="957072" />
-    <Blob Hash="b17d670867a4315edacb86d0a65bff89d0114d9f" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554089" />
+    <Blob Hash="b17d670867a4315edacb86d0a65bff89d0114d9f" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673321" />
     <Blob Hash="b17e8f5303a89ac08a427df961e39300b2715e8c" Size="4464766" PackHash="a0cd413413374d25874c2a0efb81ee012ea581f4" PackOffset="8" />
     <Blob Hash="b17f9989f7796b4e3e829fe76f3e98e32e7693a7" Size="82544" PackHash="67f9a57842391bca1072e56b907d2adde02d2d34" PackOffset="1545077" />
     <Blob Hash="b1800c61888bd4fb3a7554d4350664b131fa70d8" Size="2800" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="987116" />
     <Blob Hash="b18138536105aea1d01804ddbe69d7323a688c87" Size="12302" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="208644" />
     <Blob Hash="b181b4ad11c4f1cb114ef908bf0ade390b1e5904" Size="2129237" PackHash="218fe0aa245de48963c2d75d06b06f6d51b1e66f" PackOffset="8" />
     <Blob Hash="b18260ec64aea5e006b1951f4b19f795b95b0b76" Size="796222" PackHash="c8fe39e90583da82b2773c6df823f7c535ff9097" PackOffset="1130430" />
+    <Blob Hash="b1847de88f8005cd9c409a86798a225aea60aaac" Size="41248" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="2035408" />
     <Blob Hash="b187cc64706d165406487a05de6fc10a457addab" Size="3373" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1900717" />
     <Blob Hash="b18cba1ee8f42039e6ff3957150bf1d589d3d4b6" Size="3301" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1259171" />
     <Blob Hash="b1914ac239d8665dd35dc44921b95195534b0843" Size="15360" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1361272" />
@@ -57914,7 +57770,7 @@
     <Blob Hash="b19fd69b94f66b751b05fb8683b1b014e789b8ed" Size="361" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1342311" />
     <Blob Hash="b1a86fad9125fcffb89eb1563504f9dd91bfd2d6" Size="483" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="2094303" />
     <Blob Hash="b1ac1dfc8ec4e6b69171644a75063ea7dee6210e" Size="47166" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1468920" />
-    <Blob Hash="b1acb318f984bd9512d53d970866616e86184d3a" Size="965120" PackHash="819a2452e63804986e4e4a95bd9fd323afa3155f" PackOffset="1070068" />
+    <Blob Hash="b1acb318f984bd9512d53d970866616e86184d3a" Size="965120" PackHash="b6dfbd00039d6429b88b17309b9194259ee93a62" PackOffset="1070164" />
     <Blob Hash="b1acc75a6bdcfadb40ab103ef98702e5c1ad4a5f" Size="151922" PackHash="ad735ce413f80f79900a87098c112c355b2269b9" PackOffset="1533983" />
     <Blob Hash="b1b079886d6f4acde8545308d781e00326eeb386" Size="214" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="608573" />
     <Blob Hash="b1b2cea8f415872d2181df2176e3dea972859eae" Size="2534" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2078268" />
@@ -57930,8 +57786,7 @@
     <Blob Hash="b1dd4536b644c31b3f176413296e927ddfaff195" Size="4033" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="2092854" />
     <Blob Hash="b1e5bd741fb02ca231ad17d8a540446e5fa83eaa" Size="59607" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1928534" />
     <Blob Hash="b1f064f7f70dbba3bd33570cd0650f506e0d2f67" Size="5558" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="491221" />
-    <Blob Hash="b1f0d3ec0c5b8a6938cfd9649ff16e12ed5515a1" Size="159" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2039072" />
-    <Blob Hash="b1f579878a4606c1146603abd5e2370d85c2ace4" Size="1193984" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="8" />
+    <Blob Hash="b1f0d3ec0c5b8a6938cfd9649ff16e12ed5515a1" Size="159" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1930203" />
     <Blob Hash="b1f6507e488ac48bc50d43bdcc781984836a4e5b" Size="846201" PackHash="5e1b4c44bc21ac2f42911b3c8147b81ccb7095c4" PackOffset="843123" />
     <Blob Hash="b1f66fbaef61d37304ad14333ffbbc62687026e5" Size="911" PackHash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" PackOffset="2096145" />
     <Blob Hash="b1f7ba3e1b5efc33419b5c261337626dade4172e" Size="18683" PackHash="2cbb49fcc28bb12ee7a774e055570d03737bca55" PackOffset="1361404" />
@@ -57940,6 +57795,8 @@
     <Blob Hash="b202659edcef324d4069cbea3debfcc5fa91aec6" Size="287618" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1775568" />
     <Blob Hash="b206e9ece6c47735d882a1d1afbc92a7d4e4baab" Size="670" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="832239" />
     <Blob Hash="b20866c15c0dc6430fd571b727d99e007db5a061" Size="8" PackHash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" PackOffset="2097151" />
+    <Blob Hash="b20ddd0ed971268859358f5476413b86ce79f24d" Size="168299494" PackHash="3f56b5ba5c62e46333cf64eb80ebdec4e3dabdff" PackOffset="8" />
+    <Blob Hash="b20fe0dedb742b23223720fcc3d5e66ef4e5cae0" Size="7147824" PackHash="f0620b3773b2e8d8f56c9c555c7b116d345019c8" PackOffset="8" />
     <Blob Hash="b2106b1edd83dbc8bb7ba594a702ca7b236592d6" Size="164" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2091216" />
     <Blob Hash="b2119e3b1de5f7e58bb58a08da5e4ad83124b706" Size="203168" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="1824729" />
     <Blob Hash="b2146c60b0d8a2cd304e9020eb5cbe0fbf065e2e" Size="100456" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="720961" />
@@ -57948,12 +57805,11 @@
     <Blob Hash="b219c6d19d8d94ec3647643fd1f397fd988f1fbd" Size="9992" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1748634" />
     <Blob Hash="b21e9540eb5d4caf486f45ef62240a6d2ac1abe0" Size="51364" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="8" />
     <Blob Hash="b220046dac504a30f17f07b603482ae4a35971c9" Size="3672" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="750055" />
-    <Blob Hash="b225691bac1734cc83c9c598c6df22781318ba59" Size="4693" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1656264" />
     <Blob Hash="b22a003cc851a6ff24eb987d748a78445e733174" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096761" />
     <Blob Hash="b22d5392c282a7e7c9fe0e97ec65bb912c657e60" Size="1731" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="728620" />
     <Blob Hash="b2339a7c8296981a918d1259cd489eabe33cc5be" Size="510" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1563892" />
     <Blob Hash="b237331d4b11b88fbaa796aa9d8dd5ccf9c1748b" Size="18907" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="77650" />
-    <Blob Hash="b23a709655002b7bbb1d24f6b02f57b0ef760954" Size="3538" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2093494" />
+    <Blob Hash="b23a709655002b7bbb1d24f6b02f57b0ef760954" Size="3538" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2079070" />
     <Blob Hash="b23d714c8c98eb666a3ed585c718b1f2333cba3e" Size="4142468" PackHash="d260bdc26b2dda2e1f9165e39ff50e235785f81a" PackOffset="8" />
     <Blob Hash="b23e20179442edfef0a4c305f365755ca2f98cde" Size="250" PackHash="3a11c7694b477b016202ae8f9fc65b2ee5775463" PackOffset="2096870" />
     <Blob Hash="b23f9b747d859856fcad94652ebd07284fbd33c4" Size="81920" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="839688" />
@@ -57985,7 +57841,8 @@
     <Blob Hash="b27fec0ca0687efd8aa17cb3681f89267b66bdd5" Size="3172" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="705668" />
     <Blob Hash="b2819dbb918fc2fdde06691e5ca94dcefd13eeb7" Size="2226" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2094647" />
     <Blob Hash="b2822602ce3c082199a7b6ea522cb193eab6e6c2" Size="2869" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="499306" />
-    <Blob Hash="b2915e1a84c74e04bd2cfb6badead743507f999a" Size="43072" PackHash="3f51332114ca5aedc3ab7920c6238f9dc6912e29" PackOffset="2041504" />
+    <Blob Hash="b28a10fceba869982bebb946ab1fde4a7380cd58" Size="1789732" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="8" />
+    <Blob Hash="b2915e1a84c74e04bd2cfb6badead743507f999a" Size="43072" PackHash="f56183ef9a51b04c0311b5a5de384e805b4e41fb" PackOffset="2041124" />
     <Blob Hash="b29368afa76eb6d7b308b934c8a9e451ba211c9f" Size="553" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="836227" />
     <Blob Hash="b29373aad03679715b19662567be2fd091169594" Size="782" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2086648" />
     <Blob Hash="b29ceba496d35bfc2aaa160e151df25cec170160" Size="119891" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="195838" />
@@ -57996,17 +57853,15 @@
     <Blob Hash="b2a7859d15833b4e6f8780c77bc0ca13602c3284" Size="29772" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="359420" />
     <Blob Hash="b2a7a8de5527757b4e286e52e35e28eafda22cae" Size="9112" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1258986" />
     <Blob Hash="b2a82d8f29ea6d8df5f7a48f8157d4295ef06952" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1019170" />
-    <Blob Hash="b2a950d808501df6799f3ade41b9af575ce99225" Size="3523786" PackHash="9eb2ca1df115d2f3a1ff5374be1d6fedabe783e4" PackOffset="8" />
     <Blob Hash="b2abae8307ba2a9fe3d0de399dc6a2ce3962908a" Size="1339" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="2079787" />
     <Blob Hash="b2abd107f815a5cc738fa3292c4387a9a2253bb4" Size="52212" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="1601224" />
     <Blob Hash="b2ae596df6fb4b0c4fc6a786926256af82a2c208" Size="9229" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="2083011" />
-    <Blob Hash="b2af475325c0f26282fbd8ac5c152c232d89377a" Size="3285" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1228118" />
+    <Blob Hash="b2af475325c0f26282fbd8ac5c152c232d89377a" Size="3285" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1672092" />
     <Blob Hash="b2afb56faa05439183cab441902e77ed31515bd0" Size="147147" PackHash="82788599ad2583d437e6cde9e247d16ba5059dac" PackOffset="1035562" />
     <Blob Hash="b2afbbdba85f717034c634a1275b2b2d734703ed" Size="23723" PackHash="7834946aa336571c3e5e0f4f005e54499e0d9e70" PackOffset="2072749" />
     <Blob Hash="b2b153eb1d803de29f1de2abb4fc535b07e3e66f" Size="2769" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1977937" />
     <Blob Hash="b2b2b1f87797aef1134f48f22c2fbfd58f119f62" Size="12491" PackHash="6127c305de0e48f8d5572ec15328dbfc52bd989e" PackOffset="1286966" />
     <Blob Hash="b2b2c3cfb99979f7ac2799887e1310b04c564beb" Size="1085" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="537309" />
-    <Blob Hash="b2becee77da8c16e1005a91bdfd13b0a91ffff77" Size="17884" PackHash="6fac65addd6f42dee4d150b9417619f012cb2815" PackOffset="2078992" />
     <Blob Hash="b2bfaa4da95a308515d5fc7672bcfa87d8b3c397" Size="3605767" PackHash="2b6e4a60698706be530df733a44861365b1fadae" PackOffset="8" />
     <Blob Hash="b2c3daf82dedb9a0e820b12acb3827d091880e98" Size="12040" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="854416" />
     <Blob Hash="b2c48425cc7349c3e8237aa46cf78d104882738d" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1939932" />
@@ -58018,14 +57873,15 @@
     <Blob Hash="b2d40da9954b7e73900742b792040f02c8a99b55" Size="2552" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="1883169" />
     <Blob Hash="b2d585d69ca6e81ac2c557d52302915c7e5059fe" Size="67584" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="8" />
     <Blob Hash="b2d5fb0c8592f7611f40b08a248d24df0b9abc72" Size="4806" PackHash="1fd21352e206680f6a1db92a876a4303bfaaa4ee" PackOffset="1116548" />
-    <Blob Hash="b2dcda26f405dc9925318844a2fb071b4b1d56e0" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548841" />
+    <Blob Hash="b2dcda26f405dc9925318844a2fb071b4b1d56e0" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668072" />
     <Blob Hash="b2e0bee1d37c507c4feed987708c154ad91f1005" Size="122" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="472945" />
-    <Blob Hash="b2e36a17d3c6c2c2ae1df3e1ceedbed1359ef616" Size="3347" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2056268" />
+    <Blob Hash="b2e36a17d3c6c2c2ae1df3e1ceedbed1359ef616" Size="3347" PackHash="0a5f18beec683918579defc535c5cd097d71f4e6" PackOffset="2092916" />
     <Blob Hash="b2e4dc83f88dad3e42c5452b19f61fdbbf4098a5" Size="9071" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="538857" />
     <Blob Hash="b2e7fa4f2d52cc9f6b47cb9eb5808b0cdccf5e91" Size="73765" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1288806" />
     <Blob Hash="b2e8df0bb9f644f962ced1a682b6ee0a9878f973" Size="228" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="2096411" />
     <Blob Hash="b2e9f90b6d23c9eccb966825d49852bfae616eff" Size="28784" PackHash="567807ac295099a07a6c59a7bff568f21dd14860" PackOffset="426092" />
-    <Blob Hash="b2ead32b7924738e25f8387a44c0df0911b350be" Size="2340" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2087265" />
+    <Blob Hash="b2ead32b7924738e25f8387a44c0df0911b350be" Size="2340" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2094022" />
+    <Blob Hash="b2eccb65bba8796b06bdf50ccb89d26b4af478f2" Size="67114" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="1959358" />
     <Blob Hash="b2ef05fc01343bceb71f72c3e27d64d9337da9c2" Size="6604" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="2010769" />
     <Blob Hash="b2ef195cc491d29740f6e75ce1f0be3b21bd956b" Size="444" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="171973" />
     <Blob Hash="b2ef8ff705500cd9ede926660ce20f71da7d7bd8" Size="18278" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1565172" />
@@ -58044,7 +57900,8 @@
     <Blob Hash="b3121c18fbb54fff94bc82fe5540c6a4e26070ce" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2089232" />
     <Blob Hash="b314c7ebb7d599944981908b7f3ed33a30e78f3a" Size="11558" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="1962920" />
     <Blob Hash="b31517190bf87adffa67252317d942200c503afb" Size="7420" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1617127" />
-    <Blob Hash="b31706f99462456841e41b6bef9185c403c78e3a" Size="14880" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2013448" />
+    <Blob Hash="b31706f99462456841e41b6bef9185c403c78e3a" Size="14880" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2081474" />
+    <Blob Hash="b31dbff358bdf706650805769ae7782236a48c9a" Size="267776" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="1431168" />
     <Blob Hash="b31ef4f7cb7d2e387660e7fb634adee679066900" Size="162132" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="722513" />
     <Blob Hash="b3212a94d187c614717ed7607cb9ac4d4cd9bdf7" Size="92" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1607096" />
     <Blob Hash="b323cf6e0c4aa3b168ef0f1b0a144a1dad6e6df6" Size="121443" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="568308" />
@@ -58056,17 +57913,16 @@
     <Blob Hash="b331082bb0f93d22adca5e4f99d16bc9cede9b11" Size="3497" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="525832" />
     <Blob Hash="b33213a3f8bf6a8696b9764db4c50169f9bdba79" Size="3260" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2088535" />
     <Blob Hash="b3338373db144c1669e8dfc3a9b6adc77480adba" Size="100900" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="311840" />
-    <Blob Hash="b33df60375dc6280ff8af42b9a2be93c4be4b775" Size="1957248" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="8" />
     <Blob Hash="b341bd1c6142913b65812d459d03a9138a4517d5" Size="15939082" PackHash="601e26ae42e6de454f93110911d21c837ae2d66b" PackOffset="8" />
     <Blob Hash="b34404bd0762a8c769ce954fb6690b2e39e841f0" Size="163" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2038538" />
     <Blob Hash="b3456f69bd250489f5dc3fa668439f55f47c2225" Size="325602" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="1602068" />
     <Blob Hash="b345ad87b9096d2a99c8c8293f26d8219c7ad98f" Size="7367" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1787642" />
     <Blob Hash="b345e71ab8478923ea4231faa1daf8da4ce29756" Size="6385" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="792398" />
+    <Blob Hash="b346a43834157f52721608700f19e7ee9437ba80" Size="341984" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="1692128" />
     <Blob Hash="b34ab0d9d45fe5054ce14522768ad7c857f91cc6" Size="269740" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="1505773" />
     <Blob Hash="b34bc9375ee849b403a77bff1a915dcd2b4490a5" Size="2428" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1165170" />
     <Blob Hash="b353e7f4ed9645b589a629855603a8f26b2ed650" Size="6680" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1714720" />
     <Blob Hash="b35af602c5e58e131ca790b7143727f582ae9866" Size="75975" PackHash="84971b97551b9fd0778515853aa2a15a261a1afe" PackOffset="245723" />
-    <Blob Hash="b35bbc38fc73ac3d8ebf504230982bde85e17496" Size="181586" PackHash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" PackOffset="1864126" />
     <Blob Hash="b35d7ebd556764ee7600ffef36ce4fdb7bba3b81" Size="3799" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1761060" />
     <Blob Hash="b36475afc11f1f1f9a7925c70efc583bfd8b1240" Size="1552" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1980951" />
     <Blob Hash="b366ab848bb85ac6789026c7c980d46e567dc01e" Size="6505" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1184089" />
@@ -58097,8 +57953,7 @@
     <Blob Hash="b3ac28ea8ec7361032bca58e893e644cbb7e6a3c" Size="7038454" PackHash="0f4d411f14c4a394347e4274d30c54a8e7f3bf61" PackOffset="8" />
     <Blob Hash="b3ad63462013d8de74a61983f70d05cbcc8cad6f" Size="300188" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="1681978" />
     <Blob Hash="b3aee222c3d4bf4e76f4a1749f0f3ddfa6ed3359" Size="15872" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="2037768" />
-    <Blob Hash="b3b5f30a82613bd9bfe49dcdc835f27ea2d8ec66" Size="833" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1459214" />
-    <Blob Hash="b3b7a4b8de73a92679f9c650d255d84437edb46a" Size="18847" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1993322" />
+    <Blob Hash="b3b5f30a82613bd9bfe49dcdc835f27ea2d8ec66" Size="833" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1996296" />
     <Blob Hash="b3bc9a6a22106ffd0d0a0f63bb756a22de412186" Size="1274" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="720161" />
     <Blob Hash="b3bd85c22e45933a3298108cf8bdde4acd2eada8" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096793" />
     <Blob Hash="b3bf59d91e7f64ce2e85499ded81ada6472326de" Size="4409" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="84863" />
@@ -58107,7 +57962,6 @@
     <Blob Hash="b3c7aa1ef6bb7a1ce60207f6ada6627e0ddbeb22" Size="5602" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="105992" />
     <Blob Hash="b3c84a33576b8820649f01d0028d39eaa68cb38e" Size="19498" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2059603" />
     <Blob Hash="b3ca352244ad1d39e983b6e7c565bcbb267bd301" Size="2861" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="212534" />
-    <Blob Hash="b3ccb1e50b20f11430f9807bb6878d77499635d4" Size="14723320" PackHash="9a1e9b3f39d3b80f7b316ce89931981b6ce3d73b" PackOffset="8" />
     <Blob Hash="b3ce5aff706d599b87eca1f09850300b84f92777" Size="380416" PackHash="2d444ab79237d1419d4843c8b6f056ccbcd23500" PackOffset="1318204" />
     <Blob Hash="b3cfc4f5503b2f4151260f1ae80666af0f2f4115" Size="284715" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="8" />
     <Blob Hash="b3d29e44ea6eb9439fdddf24317aacc11726c686" Size="120960" PackHash="49d7eaf76b4f243057c59f3fda3310c655144a0e" PackOffset="1943754" />
@@ -58140,7 +57994,7 @@
     <Blob Hash="b41ceff108220096bce95d5548e916b638025677" Size="8755" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1358283" />
     <Blob Hash="b41db4a909fbbeebc514dda8cf3bb6f151895fbd" Size="5740" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="1933270" />
     <Blob Hash="b41df81feb10031941a86decd45995c7d73137bc" Size="157230" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="162357" />
-    <Blob Hash="b4213b2b33d3aa9be14f912153f522f947347001" Size="10062" PackHash="6e6d63ba70e5061606ec53f22b462ff7b817200e" PackOffset="2059136" />
+    <Blob Hash="b4213b2b33d3aa9be14f912153f522f947347001" Size="10062" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="2082015" />
     <Blob Hash="b421af71b63527aadf8b1ed92a8049134e434227" Size="1480" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2077977" />
     <Blob Hash="b4255f39e3286d5e5f0fb3e75a372f51e2369530" Size="184" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2093672" />
     <Blob Hash="b4294db21b79c0685aeb5f7dfac5fab7b86da5aa" Size="1804864" PackHash="bc58e4bcfc6ab53fc7bd2ea0e7d1c74c30d1f295" PackOffset="8" />
@@ -58158,9 +58012,8 @@
     <Blob Hash="b440426f8d09c50d8b9d3e4d685bf78f8f84565a" Size="1558357" PackHash="419ab9d476edfc8b4ddcdf17f796fc9a5da15457" PackOffset="8" />
     <Blob Hash="b4422f025133182faea19f578346b964687a5aee" Size="100" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="255959" />
     <Blob Hash="b4427e4b432dcf8d522f674c241c8edf3e221adf" Size="2157" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1258485" />
-    <Blob Hash="b4434c889734385eb849fdaae0ccefa2b94e09b1" Size="493" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1615358" />
+    <Blob Hash="b4434c889734385eb849fdaae0ccefa2b94e09b1" Size="493" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1734590" />
     <Blob Hash="b4467802d45315631e1621c001c64b2915cb7941" Size="3407540" PackHash="817377b664b869ba2eaff42edcaf4ca04a7f02c9" PackOffset="8" />
-    <Blob Hash="b4488cd27dc637e3f70589f3e18b97d3da184d86" Size="181218" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="180747" />
     <Blob Hash="b44b2145921af5596c324ebd9a6f3a1585b8427a" Size="38772" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1553195" />
     <Blob Hash="b44bb16cee9b692d60f869a81268d16b99b54a18" Size="28311" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1027436" />
     <Blob Hash="b44d22c30dbf268742ea34b143170f3033ef9e2c" Size="1142" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="2092091" />
@@ -58168,7 +58021,6 @@
     <Blob Hash="b44e78d7563d87ff87e70f98bc20f505a445dbac" Size="6714" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="33067" />
     <Blob Hash="b4555d8c43810955426451162dbeaac0f94bea0a" Size="8269" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="2085068" />
     <Blob Hash="b456b3c24053b1a1051dcc82b670852830a4567d" Size="27407" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1505433" />
-    <Blob Hash="b4588fbcb519c81314d0bc03fb86504a7c58097a" Size="1274084" PackHash="3407b695bf7b722711de14f998e247a6aca6b747" PackOffset="8" />
     <Blob Hash="b45fbc52eacacd73272222bc36fb9e63e191c9f6" Size="66171" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1434867" />
     <Blob Hash="b461d7408ea4574e628c8151d9fb89e1abe52036" Size="7161" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1151539" />
     <Blob Hash="b464f73df4ec3690ecd0db022099043b24c00ed6" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="372856" />
@@ -58185,14 +58037,15 @@
     <Blob Hash="b46e06126148bc9466e1992bff8fc0e2405c0ff3" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="494112" />
     <Blob Hash="b4709a2caf3e939c24835d77b768cd88f1984ecf" Size="251" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="54202" />
     <Blob Hash="b4726a855f4b90b799e25f6b72eb9fefd2a7a179" Size="793953" PackHash="28f44db32f9f7f25ed9b2a7bf93ac4705bb90bf2" PackOffset="8" />
+    <Blob Hash="b472b6f566acf48cc3bd46fd3b69d74326a5e1a8" Size="804966" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="1033306" />
     <Blob Hash="b474994b106d8a2aecb18aab685903b308a08646" Size="43456" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1705295" />
     <Blob Hash="b474d88d4be428d9946c2a7f5aa52fd45ac2c550" Size="449668" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="1078094" />
-    <Blob Hash="b474dc5d6f63c689c8b08ec59ce7be5e1836d43a" Size="652768" PackHash="8557924e60fcdd015907d69d205b21d58fccf17f" PackOffset="8" />
-    <Blob Hash="b4750cf28db758200ffefe1e8ef6533ac9f1997f" Size="2708720" PackHash="5beaa0957df2f62aa2d6990cbabb5beb59179f5c" PackOffset="8" />
+    <Blob Hash="b474dc5d6f63c689c8b08ec59ce7be5e1836d43a" Size="652768" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="8" />
     <Blob Hash="b480310530ff64d8f909e3165785f88165311227" Size="67417" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="1519886" />
     <Blob Hash="b480c86b274d98f9bcce0eaa4079bd7453a08ee5" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="784348" />
     <Blob Hash="b481ff280f8ef23030b87c47440af340af29dde6" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1166004" />
     <Blob Hash="b48257455718965dd45ed55caf19bbafb30c10b7" Size="854" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1570561" />
+    <Blob Hash="b486a50f604a0cba8d55ff6cd8d82ef669132e4f" Size="3227428" PackHash="b99a243147eee11b581998c08671e0cf115dc545" PackOffset="8" />
     <Blob Hash="b488f1db7f3ddf1a79cd123ac7e36d6d8f82543a" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2097099" />
     <Blob Hash="b4899c9b75087c22a3f831bc94da05e3f109dbeb" Size="1852" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2044769" />
     <Blob Hash="b48f9bc34182f944e9a127d864b35490a81b4e88" Size="4608" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1112866" />
@@ -58210,12 +58063,12 @@
     <Blob Hash="b4a611df35895417ab97af8b301f94e3af386a59" Size="2404" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="635397" />
     <Blob Hash="b4a68b3fa5dcc4c0caeca084d78837dcb458898b" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="502304" />
     <Blob Hash="b4a9198b28f9238d54bee0b587566394c633ef2f" Size="19495" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="841372" />
-    <Blob Hash="b4ac1fbe0930bc1dc14c22eb14c59cf4f22125bf" Size="74821" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="1710190" />
+    <Blob Hash="b4ac1fbe0930bc1dc14c22eb14c59cf4f22125bf" Size="74821" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="1759499" />
     <Blob Hash="b4afca3e3d14a8481a10e178fdbd4b25275906bb" Size="5740" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1365762" />
     <Blob Hash="b4b137b7cca5d47855bf225cb34bc54ca750742b" Size="36144" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="2044324" />
     <Blob Hash="b4b17403bf5218ba669b20dc53b0d82d5ae47833" Size="168" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="2096647" />
     <Blob Hash="b4b3ab694be6e5c65b02e661a0f39aa2f5ed53ca" Size="38869" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="408442" />
-    <Blob Hash="b4b3dd0d88a2df64e1c2fe7b4a55b0872e54a542" Size="2960" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2089839" />
+    <Blob Hash="b4b3dd0d88a2df64e1c2fe7b4a55b0872e54a542" Size="2960" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="2092077" />
     <Blob Hash="b4c1eaabca5a7f360c54e78db4a024cf7104e112" Size="61721" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="781907" />
     <Blob Hash="b4c259107b8d342a086d17d2b266a8372f972cf0" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2073843" />
     <Blob Hash="b4c2efd6e628364b85d1e744c7221707846ea446" Size="165" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2088702" />
@@ -58229,7 +58082,9 @@
     <Blob Hash="b4cc6fca2d80121893ea72d941518d2438c6dc01" Size="176" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1441140" />
     <Blob Hash="b4cc855002f9493f05b56d18740f741b38a8c317" Size="6390" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="1042903" />
     <Blob Hash="b4d0b79cca2eb87235b07a516416a6c8ff466dce" Size="45687" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1629171" />
+    <Blob Hash="b4d55ccf61cd830e761ad936a3ca6f368f42f272" Size="209990" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1845602" />
     <Blob Hash="b4d74f02a9361623e2faa8e69e3304792c834999" Size="4855" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="573286" />
+    <Blob Hash="b4d98cd1e01baf3fd8b85f28a4aff2ad2ae0a363" Size="7379600" PackHash="45f8ab7734e533ab4218ecc93ba2a986afb3cbfd" PackOffset="8" />
     <Blob Hash="b4d9c7b4291860614d81ebbabbb673c4fd390a92" Size="3337866" PackHash="76315c0a2f4f5390d31530304bf81fdcbffe769f" PackOffset="8" />
     <Blob Hash="b4de00326dce42f73b8863b22f0c7fcd34e53e2c" Size="470" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="53738" />
     <Blob Hash="b4df0850dabce3f8c658bc32cb4c30643b4490be" Size="3168" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1909581" />
@@ -58239,9 +58094,9 @@
     <Blob Hash="b4e438f1c20e86b28501024d723aa718322a9a87" Size="9664" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1180956" />
     <Blob Hash="b4e6559b05f75797e80295c5ada0cdbaf31ffe49" Size="546144" PackHash="9a165e8a8d511509e33a256146bee8ff3af0aab6" PackOffset="1329169" />
     <Blob Hash="b4e938bfdc796426b9d34a0eba085f15316bd43e" Size="3586" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1320819" />
-    <Blob Hash="b4eaeba9c1702ecb780c8605dd87d80a3a027f0b" Size="3780" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1944031" />
+    <Blob Hash="b4eaeba9c1702ecb780c8605dd87d80a3a027f0b" Size="3780" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="2092745" />
     <Blob Hash="b4f0e274e8963d7e24476f5e69ce0a17e2964027" Size="3201" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1682770" />
-    <Blob Hash="b4f2eaba4439df5a7ed9614516a5e8e9c7782e77" Size="994" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1637952" />
+    <Blob Hash="b4f2eaba4439df5a7ed9614516a5e8e9c7782e77" Size="994" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1850061" />
     <Blob Hash="b4f3dd2a850f9701ff39b317ddf8bc5df3395f48" Size="546786" PackHash="488efa1da7ed78314cdd0c95ad874f812853fcd7" PackOffset="8" />
     <Blob Hash="b4f948efdf8b2ce6969b3636f54b86d06b4f97a2" Size="4944" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="936983" />
     <Blob Hash="b4f98666158fc32b9175ec57ffe382e032f283dc" Size="172" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="233072" />
@@ -58266,7 +58121,7 @@
     <Blob Hash="b51e5598712598bc387dd79ae80bd879f139140d" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1829900" />
     <Blob Hash="b51f63f9901f238178fcaed07cebd40c22a8bed8" Size="8985865" PackHash="56a6a392867c5bd01895d6480fc35d8ea92c74b0" PackOffset="8" />
     <Blob Hash="b520ff3b2afbe4fd818ea7c144f96fcf91df68b6" Size="1126" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1515735" />
-    <Blob Hash="b522888079b0a6f7620f8afc570af61153f49184" Size="7539" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="959513" />
+    <Blob Hash="b522888079b0a6f7620f8afc570af61153f49184" Size="7539" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2009082" />
     <Blob Hash="b525674e771b2dd185f52ec9b54868a02793f3ac" Size="3719" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="766901" />
     <Blob Hash="b52632a665f5d2ccf40e085ad4a3a7251dfcb2ab" Size="19456" PackHash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" PackOffset="2034624" />
     <Blob Hash="b5263b0a6dcd5f2f18eac6f30cb58e429dcd467c" Size="3495" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="1005325" />
@@ -58274,6 +58129,7 @@
     <Blob Hash="b52d8aeb3fcc34fdb19d4d4f6192b8fe4d4c394d" Size="114176" PackHash="256d7fb5a72ad9474639a3af999411bc858d0b00" PackOffset="899080" />
     <Blob Hash="b534bff6626289b5ad8473617cda8be0c9469e28" Size="224140" PackHash="4879bfd25446fc703aedf81275bf1de7bedf0913" PackOffset="1856046" />
     <Blob Hash="b537901be2d03bd0c0e92ba31c162f15d416e0b2" Size="294790" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1053928" />
+    <Blob Hash="b539d3a3243d81ecc9ae1194d114816208528d6c" Size="161424" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="1435656" />
     <Blob Hash="b53a2a31b85d09954f4813dea9831ae7cfecc1c0" Size="5632" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1264418" />
     <Blob Hash="b53ac8e7c9576d9892d4099f626d4b2ede2890e4" Size="28000" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="60295" />
     <Blob Hash="b53dbfdb7c8deaa9a05381f5ac2e596830039838" Size="23232" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1846696" />
@@ -58297,7 +58153,7 @@
     <Blob Hash="b55ca388008dccc6b4b7b7efb510947e41ab0af1" Size="7680" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="313832" />
     <Blob Hash="b5622b2c2eea10fd012636b87d277511b386eb38" Size="112" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1682292" />
     <Blob Hash="b56260279f685571266cbce55108adf7112ebea6" Size="115698" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1552283" />
-    <Blob Hash="b5628b139216cb948a6414e9fc583acc2cc94141" Size="136" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2096713" />
+    <Blob Hash="b5628b139216cb948a6414e9fc583acc2cc94141" Size="136" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2096960" />
     <Blob Hash="b5630c9e6c430052abec587730c1cae99bd0459b" Size="2556416" PackHash="e683d202f4b999532ce7a597e8ebe33001128b62" PackOffset="8" />
     <Blob Hash="b564184620423a74a7e24429ef7b75189044ec48" Size="24002" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="535591" />
     <Blob Hash="b567a455fb77790c34f37c6f62b7637f0e182233" Size="4471" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1174942" />
@@ -58306,18 +58162,19 @@
     <Blob Hash="b56ce4b4c260fe1c77419103dd90c5365b12992c" Size="84" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2097068" />
     <Blob Hash="b56d064ad47604d7aa71418e9a31edce7ff038ea" Size="512" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2051195" />
     <Blob Hash="b56e4c81ea32936d33f8924bcba8ddd89fbb50e6" Size="2222965" PackHash="ad539172ac13afdd56aae0ec52c1b3340bac2bc5" PackOffset="8" />
+    <Blob Hash="b56f3fab51c8658847d7323d798e825e6b13d53a" Size="1032" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1772496" />
     <Blob Hash="b570a214018df655713bc64a5ac13d4c48d759f5" Size="5273" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1103134" />
     <Blob Hash="b571a6f4f4528936916a52f166ef52b6894fc224" Size="2588736" PackHash="c9817bc4c0577b077fa09f441b0025a9ee1cc0ae" PackOffset="8" />
     <Blob Hash="b5720c91e358f3357ed719adc82b738b1ab0b0ad" Size="1112" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="277465" />
     <Blob Hash="b5782cb43f1d0d41ec4bf8d9c664a2dd3827a7e4" Size="1832512" PackHash="d285efb773a78a762164f3dc41f8fddd71327288" PackOffset="8" />
-    <Blob Hash="b57b16e601da09e4f6fafd348e0ef38ef8e08ed0" Size="3736" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="2085073" />
+    <Blob Hash="b57b16e601da09e4f6fafd348e0ef38ef8e08ed0" Size="3736" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="2091024" />
     <Blob Hash="b57c385fe87cabf0e6f6110c11e3a6843714135a" Size="827536" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="692350" />
     <Blob Hash="b57fde77c5700aff4b18863d39337e4183c965f8" Size="7739" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1398516" />
     <Blob Hash="b58307585718deadc8f28dc0b5f4d7cbeb546378" Size="26858" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1249903" />
     <Blob Hash="b58533d31cbf806ca88c6dcbc84f37d234f24800" Size="4637" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1720008" />
     <Blob Hash="b58c32f13ceac8ad708135697571fd7e4af7fed4" Size="40008" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1867381" />
     <Blob Hash="b58ce27dea7fb50d8e7287ce2bce3e1e75e70feb" Size="298" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="234466" />
-    <Blob Hash="b58db51a7a3010c06b2a690d73a0ff5b4d55dbe1" Size="154" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1822953" />
+    <Blob Hash="b58db51a7a3010c06b2a690d73a0ff5b4d55dbe1" Size="154" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1942185" />
     <Blob Hash="b58fcdbd201a768d92ab2ecd01eb732cb6007bd7" Size="6290" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="625192" />
     <Blob Hash="b5908bf7b72a85295c6339b594c130ec1520f217" Size="972" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1538216" />
     <Blob Hash="b59244ea294a02f71cce4fbf20162e42d2d33728" Size="1765" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1854333" />
@@ -58326,7 +58183,7 @@
     <Blob Hash="b593aa9c35c1d122ce8e8e3f838d3269445f4bba" Size="15360" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="2039395" />
     <Blob Hash="b598b5f2bd6d86b7de61eccdd54f6253c60c383f" Size="3321" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1980996" />
     <Blob Hash="b59c94c8f487f5d5327af2df93f07c2ff0cc0af3" Size="77999" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="274380" />
-    <Blob Hash="b59d5246ff460c2e5724b01cbbcf9b00a62c85e7" Size="3301" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1931969" />
+    <Blob Hash="b59d5246ff460c2e5724b01cbbcf9b00a62c85e7" Size="3301" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1991502" />
     <Blob Hash="b59db4e2811ad850734a4a8e7bbdb6fba94662a0" Size="3296" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1313903" />
     <Blob Hash="b5a4bbf2c548006f23e01f458dc0bd077a35de62" Size="1037" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="633569" />
     <Blob Hash="b5a636e4602fb2656197f3324bf0cb827294c098" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1059106" />
@@ -58350,7 +58207,7 @@
     <Blob Hash="b5d024316811bc10860e059f23b1d2393af6dbcc" Size="1609711" PackHash="69e31ec5626bd851fdc3acf7ef853a7dc9482c4e" PackOffset="8" />
     <Blob Hash="b5d0d3489e32c87933ffb29a1528d9013b4b52e2" Size="1859435" PackHash="890f859d20731989f0ce0e2ccc89da28cf0f8dbe" PackOffset="8" />
     <Blob Hash="b5d1003994588ef235f1ea580760e3fe81226300" Size="5349" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="361587" />
-    <Blob Hash="b5d3e7d63eaef9e6e4818ed23c756b36b6e97aa6" Size="191" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2096202" />
+    <Blob Hash="b5d3e7d63eaef9e6e4818ed23c756b36b6e97aa6" Size="191" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2096527" />
     <Blob Hash="b5d60665dfd661c7b32a67bf06209c791f25b7c9" Size="306" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="685512" />
     <Blob Hash="b5d82f3c9eb813d4f8fd8151d8cf80c9b185bad6" Size="25164" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1778793" />
     <Blob Hash="b5da4f5e92b0e941752b91d9501fa4bb712aca91" Size="13312" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1502766" />
@@ -58361,9 +58218,10 @@
     <Blob Hash="b5eabdb7e3c71f596b15e32dbd8ca4c9d2e63ddb" Size="4404" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1762262" />
     <Blob Hash="b5ef0ac4c901806bc5267ca6a13813cc91212b5c" Size="84480" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1964912" />
     <Blob Hash="b5f50a9c588b51f7907a3d15f49e7b333217616e" Size="31213" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1352300" />
+    <Blob Hash="b5f56597652c4b3b49a87ee53f2df342648473f6" Size="214016" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="1380360" />
     <Blob Hash="b5f736955fe055e991aea03d37aa378dab8c9d1e" Size="12051" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1157501" />
     <Blob Hash="b5f903269b1d088fc122311b909f94058049946e" Size="9229" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1294776" />
-    <Blob Hash="b5f90c50b1e0e2114684a82e2e7ba228ec866502" Size="5130" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1571191" />
+    <Blob Hash="b5f90c50b1e0e2114684a82e2e7ba228ec866502" Size="5130" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1690423" />
     <Blob Hash="b5fa0d5514efcb2659cb13fa01fe6d25f89d8767" Size="27950" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1292606" />
     <Blob Hash="b5fdbc82ca9c4c5fcf093db63c1abfc76d2057ef" Size="5580" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1682404" />
     <Blob Hash="b600708431ecce74a844f1a3196981257bee6ea2" Size="257" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="494725" />
@@ -58376,7 +58234,6 @@
     <Blob Hash="b60bdc865a10a5df35d640369c2c541383ee7873" Size="37779" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1321480" />
     <Blob Hash="b60e47ece2d443d400572016c4220c59c97bad1c" Size="12388" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="689266" />
     <Blob Hash="b612eca6230395293a5e8c12f77c73d915e8095a" Size="19118" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1160274" />
-    <Blob Hash="b61aacfbff8ed17a56e587879721b728a516ff6a" Size="41256" PackHash="495a03cfec4638fdaa630d336ffc1650693e7422" PackOffset="2034220" />
     <Blob Hash="b61af99fed026d0bc49288ffc58b904d28a04d9c" Size="367" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="841574" />
     <Blob Hash="b622e341116c0494495702fbbe53cf849094cd71" Size="20844" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="1420808" />
     <Blob Hash="b6254788ef2d6d1ac9187eaed44bc779cafb66d3" Size="3355" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="934370" />
@@ -58387,17 +58244,15 @@
     <Blob Hash="b62a1a80ae4ebd97fedfe535b5eb391d4e4655ad" Size="5628" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1803719" />
     <Blob Hash="b62d76a1c1fb375199f073d6b54aad1cc2aa7564" Size="6844" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1877664" />
     <Blob Hash="b62d87965ad0c18f0b70d02ae30a324c12a3da3f" Size="2662" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="2053240" />
-    <Blob Hash="b62db68cb4af44aa51e6f03751880d07b8deb16a" Size="1043" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1316642" />
     <Blob Hash="b630043b9715cb01ab5d1fb7b2501e57661a75b5" Size="3744" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="2083246" />
     <Blob Hash="b63046ce25300e69d1e755f271899b32560d1f5f" Size="5475" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1035836" />
     <Blob Hash="b634943c0c8e190e6a56086571a3d51f1e62dbc7" Size="61445" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1854637" />
     <Blob Hash="b6357abafa93762c89f7fe0bde279b26f16aa169" Size="67067" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="1749996" />
-    <Blob Hash="b63879e61f95fb0d409a43905e3cefddb8f20492" Size="3329536" PackHash="47cbe03ba6b5f9cd7e932ab3bc7b1f25ac8be52b" PackOffset="8" />
     <Blob Hash="b6398e3b7425bad88efe484cca28440e52ef8909" Size="151264" PackHash="19ede39792670acddd34ed95e64693476ff138d6" PackOffset="1921129" />
     <Blob Hash="b63a77b7f28241d07c1c80133e54babf668f657e" Size="4987" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1537658" />
     <Blob Hash="b63b0ad9f10a44b0ddd12a3bdbcdeb2992d6d385" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2049732" />
     <Blob Hash="b63b59b842a78b6867e12c60a8d810166eede401" Size="84541" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="830085" />
-    <Blob Hash="b63bf3e7c1a096ad40deaed8efb79dd3cc0af868" Size="159" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1430400" />
+    <Blob Hash="b63bf3e7c1a096ad40deaed8efb79dd3cc0af868" Size="159" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1879453" />
     <Blob Hash="b63f0fabbf07416dfc190d1108ea10fcef557be2" Size="4001" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1597755" />
     <Blob Hash="b6425bad2fa948159bd162cc42befb3fb29784b6" Size="4539004" PackHash="22b9f529544c094492d93bdfb65f5b140cacc50f" PackOffset="8" />
     <Blob Hash="b643fd4a67b838bfcb41d063165231f135b67146" Size="9229" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="537972" />
@@ -58405,24 +58260,22 @@
     <Blob Hash="b64929f8e00c44c5d97d167e9e471ed52d37f5c3" Size="54764" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="782660" />
     <Blob Hash="b64a5ac2f58e21c7c7f87ce4f58a4614d030cc70" Size="12453" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2057924" />
     <Blob Hash="b64f8ec9123ac03ee3e04385103b292aba4aecfe" Size="3069" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="159359" />
-    <Blob Hash="b64fc59d11c4b3cb176c7ed5a0c8947d31e9c404" Size="2310" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="2090514" />
     <Blob Hash="b64fe782db28bbc27d9208375fa9d8c638a70f14" Size="7607" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="864000" />
     <Blob Hash="b651be9bf122349a601c06e92dacc709eb99ac55" Size="6054" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="2074801" />
     <Blob Hash="b65535217d9ca062ec1e86c28903be889d497d2b" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2082289" />
     <Blob Hash="b6554eb93d07e456953059717735d97a56c9b27f" Size="83563" PackHash="54b1f91ec773e40dd9e245020576fe5b2999d4d0" PackOffset="1991297" />
     <Blob Hash="b65be65ebb4c9e7d12e26b52d7818e12eb6500b2" Size="186157" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="1642359" />
     <Blob Hash="b65c5fcc8e3c49d7c81356a6a06baf3cf575be89" Size="736670" PackHash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" PackOffset="8" />
-    <Blob Hash="b65f2d12471c4ae3d1fb18a66d4674ef59aee64a" Size="3974" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1692849" />
     <Blob Hash="b6633777905ded56df039551caa3602db8a2477a" Size="21844" PackHash="93566441053b4785e395d918bf77da92f4aab7ba" PackOffset="2068787" />
-    <Blob Hash="b66344e889bcc8f7559518b9be71fe77ea5ae717" Size="48486" PackHash="a61134b7a1700b0b5382c542f42c22afc23a614a" PackOffset="2039204" />
-    <Blob Hash="b66876dbaab051cd490e8b9bb3748f9099bbdb97" Size="789504" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="917512" />
+    <Blob Hash="b66344e889bcc8f7559518b9be71fe77ea5ae717" Size="48486" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="2017228" />
     <Blob Hash="b66ccfe45ee3817cc71a22213b5e8fbd902c5213" Size="12200" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1770446" />
     <Blob Hash="b6718105de5f0f697faa0caccd9a6889d466d212" Size="125787" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="1331191" />
-    <Blob Hash="b672929ec6f3cf35f3e2982d9dce03b15e4798da" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552180" />
+    <Blob Hash="b672929ec6f3cf35f3e2982d9dce03b15e4798da" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671412" />
     <Blob Hash="b673a49de2387ca4021739f8c0c2e4b907ef6285" Size="3257799" PackHash="a1eddf1b451f35a03f56cff604ba04b827cd3dbc" PackOffset="8" />
     <Blob Hash="b677fc4b324285cc235d5ed4dcb6cda4384f83be" Size="9988" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="2081684" />
     <Blob Hash="b6797ee1aa0cef524e8483b4f35af8439a5b4deb" Size="215795" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="1688087" />
     <Blob Hash="b67c4ec310d0ba06ab1a13865697c70fb10c3195" Size="2951" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="562070" />
+    <Blob Hash="b67c65f2211828643a33007325b999e865b03f2b" Size="3512" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="2087894" />
     <Blob Hash="b67e0860cea1659458e0428cd62c8642ca36a30b" Size="551512" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="8" />
     <Blob Hash="b67ebefe6a678e6067861ffb3ad7af67fb80297a" Size="686997" PackHash="79b24ce35907d7475fd12256466bfdaaa63531a7" PackOffset="8" />
     <Blob Hash="b68122501fb9ded96db34ac7a4a62697ee7b6e36" Size="2472" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1267589" />
@@ -58430,7 +58283,7 @@
     <Blob Hash="b681db0bbb3137835c55043e150b6f70202535b6" Size="1071" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="2007536" />
     <Blob Hash="b682d144a2cbcb59ca6a7786a3564daace9d915f" Size="2989848" PackHash="13a5a3c398cf7f01e4a22eb674a58b69a69da24c" PackOffset="8" />
     <Blob Hash="b683c44cb530143d7c467ce4a86031f2bbe2fc41" Size="1941" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2083267" />
-    <Blob Hash="b687958fa413872c1fa9e88218cb4b0c84c7cddf" Size="277" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2095535" />
+    <Blob Hash="b687958fa413872c1fa9e88218cb4b0c84c7cddf" Size="277" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2096362" />
     <Blob Hash="b68927deab4845856f87464f417b66c55d042656" Size="89442" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="1938808" />
     <Blob Hash="b68a179a73861b93cf24009991915b877f7b5033" Size="10496" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="814240" />
     <Blob Hash="b68a9f9c3c44d0b5395310a6ad257b7adf940f11" Size="14834" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="1793544" />
@@ -58438,9 +58291,10 @@
     <Blob Hash="b68bf99a021b9f01fe69341df06f5d1453156a97" Size="286" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1038111" />
     <Blob Hash="b68e8be40231468defc303abef72911e0d32c400" Size="151" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1260043" />
     <Blob Hash="b68efa1c529c0e3fdbb87fc5ebe7dd2f53da338d" Size="63256" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1758009" />
-    <Blob Hash="b68f089cf2137a2ca73004bd849eb6eee4b8d7e7" Size="249" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1302559" />
+    <Blob Hash="b68f089cf2137a2ca73004bd849eb6eee4b8d7e7" Size="249" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1751461" />
     <Blob Hash="b69165ef75ba30f3a215eb072c1853dc7836b953" Size="124" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="2096973" />
     <Blob Hash="b691ede1b100c854f1af99ee1c319231c83139f7" Size="176" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1895348" />
+    <Blob Hash="b6925ebb7f9f06d7e88c81f4d743e8b8463da691" Size="479760" PackHash="e9ada08052934232dab4347c891567c01aaef05a" PackOffset="1602594" />
     <Blob Hash="b6954ef9d25656c0a453e1999024f8e6b9221be2" Size="650" PackHash="a03bb1d2a4614125f33bfe2bab39d84653cda033" PackOffset="2096436" />
     <Blob Hash="b69c7026e21ffb2bab423c9cdb702b5eb94cc309" Size="177570" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="1724773" />
     <Blob Hash="b69d74b5ce12cc976fc133dde2be8dc511908c6f" Size="901" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2096007" />
@@ -58449,16 +58303,17 @@
     <Blob Hash="b6a6d596c59fb37d6041cc8a8aca4944861424f9" Size="3558" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="375265" />
     <Blob Hash="b6a7743b41a865d228a2e16326faa5055a5ed8bf" Size="240" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1305599" />
     <Blob Hash="b6a96a96341b888a07e4f31e07e6e186b6ff1490" Size="158057" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1026032" />
+    <Blob Hash="b6b0c4a8308042bfd755317d8c0b6c49c26d73e7" Size="2420" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="2093460" />
     <Blob Hash="b6b24be0f2fc884bac8af531be5e283a8608f5ac" Size="350" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2090394" />
     <Blob Hash="b6b2823a08c0c5a2e56845ebcdb48ad8acf125bd" Size="1352345" PackHash="33f3679a1b6d3e7da34456a34dca2562859d1801" PackOffset="8" />
     <Blob Hash="b6b4d601fcd3851366b630d0af6b26f90ba6904b" Size="3584440" PackHash="9bcd0ae456548b96e754bd794d964a06009f7e2e" PackOffset="8" />
     <Blob Hash="b6bc425375675ccc9887a2522ea3e13b8ee48578" Size="2854" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="391492" />
-    <Blob Hash="b6bf3e6e140e34af95f38bd7e59b9517cc88506d" Size="18321" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="941192" />
+    <Blob Hash="b6bf3e6e140e34af95f38bd7e59b9517cc88506d" Size="18321" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2059493" />
     <Blob Hash="b6c273d3be5fb9f5a221b0333870cce41cedfde4" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1044937" />
     <Blob Hash="b6c41bc41261633c892f1b4e37775c4060f0875f" Size="4623" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1479562" />
     <Blob Hash="b6c6460de14b0cc980556758bca3d4ce438f0ae7" Size="4315" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="8" />
     <Blob Hash="b6cadf7fe4242709473a11f3e186e5094a630501" Size="8088" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2071556" />
-    <Blob Hash="b6cb13ea4f0cc32051a194dd1a464f9014ff80f5" Size="2254" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1325647" />
+    <Blob Hash="b6cb13ea4f0cc32051a194dd1a464f9014ff80f5" Size="2254" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1774549" />
     <Blob Hash="b6d21445374cbdef0c0e801d1a75d7bed2bc02fe" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="699912" />
     <Blob Hash="b6d2fc0ae86a77265dd9899eced4ef95ca6a92f9" Size="475" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="263994" />
     <Blob Hash="b6d31a3bc3351c8e1fe04c7a8e9c5441cbf25f95" Size="87135" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1232523" />
@@ -58471,50 +58326,49 @@
     <Blob Hash="b6e7b6090f8c4624c48ab9a2d296130411e6e193" Size="4791" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="946012" />
     <Blob Hash="b6e822880a479172e592eb16b3b1a6fa80605dd6" Size="128142" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1629477" />
     <Blob Hash="b6ed3f794d9523db879ea073ec4d4106d0481df5" Size="2392" PackHash="c40e5337fb15243fce02dcae546c81693c08866e" PackOffset="2094499" />
-    <Blob Hash="b6ef68d3e8459e17c23a99c2478504273556f042" Size="2536232" PackHash="3ba8c0e279ad54b7c950dd1036a8d9b916d916e7" PackOffset="8" />
     <Blob Hash="b6ef6fa66b6c5af1a7d4a77038370dcdd8979eda" Size="206" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="2096881" />
-    <Blob Hash="b6effb85f85bf2ada564123517319e3b1d7d0d8b" Size="182" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605546" />
+    <Blob Hash="b6effb85f85bf2ada564123517319e3b1d7d0d8b" Size="182" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1724778" />
     <Blob Hash="b6f0a3e1c8dbbb22aede517e2481ecfeab9fa7e4" Size="46080" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="663048" />
     <Blob Hash="b6f36b3b5899220697a344a1a75a4fae940e5ae6" Size="96282" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1726815" />
     <Blob Hash="b6f3ddf4a2e4400fee8145949d810c0eda4431a5" Size="2128" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1575264" />
-    <Blob Hash="b6f48ccf2ddf487571998419d8bf0f6999031218" Size="17468" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2062090" />
+    <Blob Hash="b6f48ccf2ddf487571998419d8bf0f6999031218" Size="17468" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="2079200" />
     <Blob Hash="b6f602656064ecc501a69e2bf3b65811c2a6dfc2" Size="28561" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="910619" />
     <Blob Hash="b6f70939e1ed06c4ab4f62023aeeee0f19eba34f" Size="43365" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1537339" />
     <Blob Hash="b6fc5498025d33f4112652f6ef90e61584bd2400" Size="7324" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2043132" />
+    <Blob Hash="b6ff12c8ea2926ef4727317d94e9292722bfac86" Size="8423302" PackHash="778dfae979a136f3a1f9e1d5e74ea4d35c959dcc" PackOffset="8" />
     <Blob Hash="b6ff5b73c65934bbb3150ead379fa80ceedfff71" Size="21172" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1072555" />
-    <Blob Hash="b7001dfa036e8a1397a921dfc42db92bf0f33ddf" Size="8336" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1799074" />
+    <Blob Hash="b7001dfa036e8a1397a921dfc42db92bf0f33ddf" Size="8336" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1814840" />
     <Blob Hash="b7013068e14bfa7443e40227e1f793bfd866b52b" Size="659656" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="8" />
-    <Blob Hash="b70539ce7844e2dc495a27efe7ad1a99d69f1cb1" Size="31059136" PackHash="e90af9a418271aee9c0a7a6c36b2617987b3fec7" PackOffset="8" />
     <Blob Hash="b707c39fc080529c4a9ffc1df4eac58421133aaf" Size="490811" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="8" />
     <Blob Hash="b70898db597b89ee2286ee4c497fb738e343435a" Size="7746" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1366036" />
-    <Blob Hash="b709c725cf732b923b80311848f7a71d6c379adc" Size="58" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551422" />
+    <Blob Hash="b709c725cf732b923b80311848f7a71d6c379adc" Size="58" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670654" />
     <Blob Hash="b70aef4940e8775e2a9d8b73b63d29379e5b2306" Size="1512" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="609544" />
     <Blob Hash="b70d271d22db13894c8e6f05ea20ed4349d4609a" Size="196" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="2096697" />
     <Blob Hash="b70dbf0639c97d3b1b71e22ce2ece0a5a5dd825c" Size="10988" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="739260" />
     <Blob Hash="b71191b4aeb4545ecedd17e22ac03ab0ab51cfac" Size="2165" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1118315" />
     <Blob Hash="b71400cf2bf12ec96167736db478dbbd50ca29de" Size="33748" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="864253" />
+    <Blob Hash="b715146cf6efdf88bd2355d65dee34b979ec7fb9" Size="16935972" PackHash="5ab78d674f9ce7d2cb93374e183f786c96cd9a8c" PackOffset="8" />
     <Blob Hash="b71799c2e18723271f0bca6edacc1507bffd3c2e" Size="87835" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="8" />
     <Blob Hash="b717ca2f15a875191f8cd8e78bf5fdce8f73d12a" Size="899" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1185766" />
     <Blob Hash="b71805e5d20299fa75123e2694e414febb753630" Size="3184" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2066908" />
     <Blob Hash="b719a08962b3f45570627a3de2fd70cbff93a8ff" Size="171" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="370207" />
     <Blob Hash="b71da17daac0dfe818822be2742b051618a4a5d2" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2094823" />
     <Blob Hash="b7253a30f4b96e23bdefa335a83a1d25c1c286d7" Size="3216" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1980738" />
-    <Blob Hash="b72ca8b9dc1a7a07f528b53b647d28cdcff98a9d" Size="1224" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="989494" />
+    <Blob Hash="b72ca8b9dc1a7a07f528b53b647d28cdcff98a9d" Size="1224" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2036376" />
     <Blob Hash="b72d1fc091338e5bc51eb3ccef148a4a1ffbc920" Size="5197" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1256719" />
     <Blob Hash="b72e649971b8a985702933adcbdf54f513ad1db8" Size="156838" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="1884634" />
-    <Blob Hash="b72e9bbad197ddaa89899528b25da29ae516fd1f" Size="459" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1985914" />
+    <Blob Hash="b72e9bbad197ddaa89899528b25da29ae516fd1f" Size="459" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2075690" />
     <Blob Hash="b72f5c65e50c6d3dbaad0ea03ebe40614e78888d" Size="719312" PackHash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" PackOffset="723104" />
     <Blob Hash="b73067e9c92c20f29b556b653c1a3021b607dcfd" Size="102251" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1616105" />
     <Blob Hash="b733102b74078a2f567acd83d49c9ac54e9c771b" Size="3021" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="631562" />
     <Blob Hash="b735541713124e851fe2e12d0326c994dfaf49b9" Size="1866304" PackHash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" PackOffset="8" />
     <Blob Hash="b736b8208ec8bce26fb1e3d7442130bff636bad2" Size="10911" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="1958731" />
     <Blob Hash="b737aec4712870f768805d3c718063dfad0bb58a" Size="33564" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2042048" />
-    <Blob Hash="b738621688408fc89f6424cf22ad48f37f9acafc" Size="879" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2026036" />
+    <Blob Hash="b738621688408fc89f6424cf22ad48f37f9acafc" Size="879" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1916247" />
     <Blob Hash="b73c61ca3967ec9286c80a4aac82b79a3bdb72b3" Size="87915" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1290715" />
     <Blob Hash="b73cb795921755c825e168c531eb452d914bf453" Size="497990" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="678784" />
     <Blob Hash="b73fd488be7912fd0c008d470101ef4e92e6df75" Size="313" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="841120" />
     <Blob Hash="b747b9838cccf6b5d6fbaeb05d4f8a6203500325" Size="7425" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="114355" />
-    <Blob Hash="b748adb28471c2b572d6f4a2734946390f6745c6" Size="160942" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="697428" />
     <Blob Hash="b748fc909b71e61cb5503f042208c833cb377615" Size="2583" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1640222" />
     <Blob Hash="b7495d17e30c80046e8c28a89d60e27a98dc9127" Size="2838" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="743280" />
     <Blob Hash="b75416f1b0db0fa8f170bc36c6810f89d76c6559" Size="676" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2077374" />
@@ -58522,11 +58376,12 @@
     <Blob Hash="b756c59b2ec56b811a7afac349236c23a08f7654" Size="3794" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1954946" />
     <Blob Hash="b76277317f1de47cc5c21558aaf217a86a0f99e2" Size="14336" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1275768" />
     <Blob Hash="b76695ced481e945ac82f4f1be18371c7b911d50" Size="2339736" PackHash="ea2a6ad22b6526be45e82c9e518aadf947fea715" PackOffset="8" />
+    <Blob Hash="b76cc018b5d1fdfd62bc6bc4dada09f5a4f8ca0d" Size="1795248" PackHash="158cdadc204fb774e3ce74edc80832a66cd38867" PackOffset="8" />
     <Blob Hash="b76d5fdd478d22410ac3b0a935eabafa99667582" Size="4351" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2049385" />
     <Blob Hash="b7703d7ce743d9ee262a6f3ff7c7a07d19231513" Size="3236" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="203844" />
     <Blob Hash="b7726d05e8a007056b0905be8917011d7e86b9b3" Size="9714" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2069295" />
     <Blob Hash="b772a28b049197464ec3c9d1bb930754359cdaa4" Size="3031" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="2089730" />
-    <Blob Hash="b77502adbef272c8df931102cc55f885fd57fb47" Size="3829" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2089482" />
+    <Blob Hash="b77502adbef272c8df931102cc55f885fd57fb47" Size="3829" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2088451" />
     <Blob Hash="b77b08901ac7a1cb26beb73de0d965605b97db27" Size="104377" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1046249" />
     <Blob Hash="b77eb2e1ad06257a317c13949368d16f8851aa49" Size="37249" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1754169" />
     <Blob Hash="b784599c82bb90d5267fd70aaa42acc0c614b5d2" Size="75264" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="538632" />
@@ -58542,7 +58397,6 @@
     <Blob Hash="b7a72d300ddef4a14183707e2a8bb0365b4e5e51" Size="4028" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1415640" />
     <Blob Hash="b7aa5c342c5639866fc74af986068613124ec79a" Size="146" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1959318" />
     <Blob Hash="b7aac71acfc6969160e7d89dedaf38a87cd6ccfc" Size="30793" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="732116" />
-    <Blob Hash="b7af08e0f06ccf3b0cd50260533fb7bad9238fa7" Size="163874" PackHash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" PackOffset="1825928" />
     <Blob Hash="b7af37d06a4984935b0c62e19cea12eccd4363c4" Size="2568" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="3987" />
     <Blob Hash="b7b0d625467aba222162847b134e58bdc30bb1d0" Size="62117" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="800951" />
     <Blob Hash="b7b2036e1e7113118019689224c1158752b78a31" Size="15978" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="2072792" />
@@ -58560,12 +58414,12 @@
     <Blob Hash="b7ca15b58ada8ca3eb74b7971073022d57d8ee70" Size="190" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="154154" />
     <Blob Hash="b7ce60be827887e405e64dabc486ff7470f1bad9" Size="5465" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="944765" />
     <Blob Hash="b7ce80e18adaedb4be3ab6598476b305aa328445" Size="1757" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="2094945" />
-    <Blob Hash="b7cf115fefe6f991047d7b9c2b4efa40b2699eaa" Size="7078" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="2084234" />
     <Blob Hash="b7d394797fcac6b2e925561dccba84dcf261082d" Size="466" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1704163" />
     <Blob Hash="b7d4c373f43e45ac1113f17266a3456c332fb886" Size="7552" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="433560" />
     <Blob Hash="b7d5fce7f0b5aba999e3210538c80224c27979ed" Size="2512" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1207536" />
     <Blob Hash="b7d8e1442aec4db421d5c5d8427bbd5846a2cbd4" Size="69376" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="530487" />
     <Blob Hash="b7d93249e9b139c2ea9ea3f0679110770e6d8450" Size="11438" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="93443" />
+    <Blob Hash="b7da1ff9e9125c3c284e443da2c4e8e8fafd9950" Size="1436672" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="8" />
     <Blob Hash="b7e1cc3b4bb1bb721926ea67966ec6e47e1875b0" Size="48238" PackHash="c6da47930b010c6bb3249d411d7760fd5e32320f" PackOffset="1783393" />
     <Blob Hash="b7e3d60f62d8655a68e2faf26c0c04394c214f20" Size="74072" PackHash="849586837a4432c69a6cb4b1559cb1dbb703da3a" PackOffset="22368" />
     <Blob Hash="b7e69f1ea4e6d2b25adff7a670bf6bf8002a70df" Size="754688" PackHash="247159e28ded6d0a9508b9732f70dce33ce3364e" PackOffset="8" />
@@ -58583,7 +58437,6 @@
     <Blob Hash="b7fdb981f4ce3b19d1b3f0b4ec5cbaf88ac88cdc" Size="18857" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1111573" />
     <Blob Hash="b80152f62c36a7bcfebbcd69da6065ea50e2bdb6" Size="3503" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2092098" />
     <Blob Hash="b80339d1c900c2a0600ea8d68f6d9f3675c7f37b" Size="37468" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="815379" />
-    <Blob Hash="b80775a63dc8c3df4223a04c4c5672ee9bc39191" Size="35999712" PackHash="5894243b8f589044c07ef8eff18d3e08978f9d9e" PackOffset="8" />
     <Blob Hash="b80872f3054ea870dcb71864e015c6b96bdd1a2b" Size="12893" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="1933778" />
     <Blob Hash="b809f88d1662ff4b5ba5c6834869397068f663ec" Size="3673" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="497564" />
     <Blob Hash="b80da0b4ca41b74260058545c8512788c7c69df5" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="932360" />
@@ -58592,22 +58445,22 @@
     <Blob Hash="b815c2ef541493b6f8c6facf1407101b88741a1e" Size="3407360" PackHash="9177b99b413eb9303ec15308b20f23a62b5d02a3" PackOffset="8" />
     <Blob Hash="b81615c7cf370a908196be784a3f1d45ec7d2bc3" Size="52084" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="2039679" />
     <Blob Hash="b816879c63ba48806bd67722fd23e9209b861604" Size="2679" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="702652" />
-    <Blob Hash="b818d9e007df7571d45876643a421d1450a73196" Size="46976" PackHash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" PackOffset="2036744" />
+    <Blob Hash="b81a0a367a84436fdc3eb14c3949d0bbbefdb925" Size="2224" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="2094774" />
     <Blob Hash="b81bc2799e2c25d564e25355216b577c323c1253" Size="201327" PackHash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" PackOffset="231571" />
     <Blob Hash="b81e94e4c54fa997221e6aad31d5b2513e6888f0" Size="129" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="431477" />
     <Blob Hash="b81f1639d62dfc7be7ae4d51dd3fae7f29a1a297" Size="19136" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="797280" />
     <Blob Hash="b82122eb956880b5df9f1f5e09d017380c0fce1e" Size="4138106" PackHash="ac927cb14ef558150730274e8cec6f5a6a64c420" PackOffset="8" />
-    <Blob Hash="b8269bb7c888d2f1aa9fd90045e24ea680f28e1a" Size="2447" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1751634" />
+    <Blob Hash="b8269bb7c888d2f1aa9fd90045e24ea680f28e1a" Size="2447" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1767400" />
     <Blob Hash="b829fc9104e3f1b6a7d4f425eea051318b1b2bd1" Size="3470" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1826528" />
-    <Blob Hash="b82a419d97f7d3d2b616bc8f794d398a739a7f1d" Size="8349" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1371719" />
+    <Blob Hash="b82a419d97f7d3d2b616bc8f794d398a739a7f1d" Size="8349" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1491179" />
     <Blob Hash="b82c0aa7e5fd294ccfb3b010f5c8e54903b759ac" Size="44936" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1724693" />
     <Blob Hash="b82f52d1e04ca7848263c7efca2cd13d6926f83e" Size="110" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1357629" />
     <Blob Hash="b834a6b4356e761d92e33efefa17714f2abfa80b" Size="3163" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="660180" />
     <Blob Hash="b834c4008f3203e7b46b990bd171276f78bb3534" Size="88513" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="439961" />
     <Blob Hash="b837839236e184bf238ea39554fac205b628ff28" Size="2974" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1777905" />
     <Blob Hash="b8396120d64e56e950b4b27fd748eed76f564a74" Size="692" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="562216" />
-    <Blob Hash="b83bfa298dd6a65180faf7d8e979e72cc19a0f03" Size="4787" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1986145" />
-    <Blob Hash="b83bfd002f4fec8ca0b77469f4c20e558177e4dd" Size="50647" PackHash="29a4bd653010a3a24379c61f4b55f4078f3c2dce" PackOffset="2032688" />
+    <Blob Hash="b83bfa298dd6a65180faf7d8e979e72cc19a0f03" Size="4787" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2043548" />
+    <Blob Hash="b83bfd002f4fec8ca0b77469f4c20e558177e4dd" Size="50647" PackHash="344190ba3bc0e09a4f0f7283782da8cb56b6a794" PackOffset="2044610" />
     <Blob Hash="b840321af0629a33f572c949f842c7955a59714a" Size="2926" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="87843" />
     <Blob Hash="b844ac33dcc36563102b8d40c836cd4309c03a77" Size="1518" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="473876" />
     <Blob Hash="b8453f43fa43631c16fcbcfaab2f4046ce131c39" Size="163904" PackHash="354d41849e6ca4976e737a6e0332152c3d8dac27" PackOffset="1163164" />
@@ -58618,7 +58471,6 @@
     <Blob Hash="b859c14ed959fab54cc137dbe4fed15aa33745cf" Size="15016" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="2010805" />
     <Blob Hash="b859df00a4ea841a1fadceca70350bbe79894b67" Size="63757" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="628593" />
     <Blob Hash="b85bad490604ef6392d557b814284fff5bc7da7f" Size="11489500" PackHash="4e1914c68137f79a3be25e9b5c4364261ff04970" PackOffset="8" />
-    <Blob Hash="b85cef95ad592d860cc67bf7f2f0c66147f51adf" Size="7152832" PackHash="fc1ef76500e0d4533fd8f994f32a7ced60f0c387" PackOffset="8" />
     <Blob Hash="b85cf4acd90024cc5879a183ca7a173f7e711dcb" Size="776" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="398695" />
     <Blob Hash="b85fba2d634bb27acf9f9a459b8714c07412c5f9" Size="210" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1379711" />
     <Blob Hash="b86291a1a9b58d1ab606710cf085d15ec0850275" Size="6228" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="2084104" />
@@ -58634,9 +58486,10 @@
     <Blob Hash="b885670a7b4545cb8c1a34324eabe93e63a9ba54" Size="9719" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="650387" />
     <Blob Hash="b885db928a09d72021d0dfea79cc72058d191a0c" Size="167269" PackHash="4d1bdf23243f22a22f47e3c5b8af421a43324250" PackOffset="1608594" />
     <Blob Hash="b88695eedb6056c0e6cc8d63ba3888c1f9768d53" Size="2111" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1114039" />
-    <Blob Hash="b888e5987a3d7ef3b8c9f07acaba7e4c334ed729" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556202" />
+    <Blob Hash="b8880121423dd97fe74874d55fa9cdebc0bfa630" Size="3055912" PackHash="3c0a839fa4310164a5cd5b79bf180ef08e786e4a" PackOffset="8" />
+    <Blob Hash="b888e5987a3d7ef3b8c9f07acaba7e4c334ed729" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675434" />
     <Blob Hash="b889762b8e0b556f90d7423e8db0ee8358003623" Size="337" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1305262" />
-    <Blob Hash="b88a9010ad0b268876b7d91f3499199e0611cdf1" Size="56" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554437" />
+    <Blob Hash="b88a9010ad0b268876b7d91f3499199e0611cdf1" Size="56" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673669" />
     <Blob Hash="b88c087b5663056360b1994143825b4c672c2638" Size="3571" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="321843" />
     <Blob Hash="b88dafb3fdc5ddab2b056dfcf911c27283353bd1" Size="111840" PackHash="0104416c142ca7b3174660267c22f049db573bdb" PackOffset="836048" />
     <Blob Hash="b892f7eeb4eba358794d232fe11a40d38a9bbbdb" Size="84" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1001668" />
@@ -58648,17 +58501,18 @@
     <Blob Hash="b89d5313cf0c2befc481d696c7112f5a281e5326" Size="22237" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="781705" />
     <Blob Hash="b8a2d0547d63cb3dd0a7d4eafb36b4b346aeb090" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="745974" />
     <Blob Hash="b8a3eac30b155ed7bf9f1bc141371a5dffa4a401" Size="588" PackHash="9be64297c3fbe00d13d3826f74470e7b3519519d" PackOffset="1941686" />
-    <Blob Hash="b8a4bfaaa78b3b264f77160c14b222f248d4e12d" Size="1265" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="2095863" />
+    <Blob Hash="b8a4bfaaa78b3b264f77160c14b222f248d4e12d" Size="1265" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2094798" />
     <Blob Hash="b8a4ce5ed793da414c3b08c670cc849cb1bf596e" Size="20821" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="328362" />
     <Blob Hash="b8a5512156e0f9ea09f4a41808d0b8ec39457a46" Size="87252" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="1975180" />
     <Blob Hash="b8aa266f6674af6589a109415988f096a771b9d7" Size="10182" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="565345" />
+    <Blob Hash="b8ae10d1a192e4f67f14c44bc51c1cf471ad263a" Size="2687864" PackHash="93920f4632a2fee67e4b965aa59a45612530c726" PackOffset="8" />
     <Blob Hash="b8b0c5bf278ed0c1fb413a186def5a5770eb9d5e" Size="107609" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1058329" />
     <Blob Hash="b8b21f7384926d29c116362844b94e7f2571d0c6" Size="7780" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="848817" />
-    <Blob Hash="b8b36a39ac4352962efebd718d11b506537fde62" Size="138" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2096849" />
+    <Blob Hash="b8b36a39ac4352962efebd718d11b506537fde62" Size="138" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2096215" />
     <Blob Hash="b8b5dc052f090466424a6f1f3b5b7b5b9670e0b9" Size="7408581" PackHash="6093beca3b21ddf0d2d599e6a841ea070ac01fae" PackOffset="8" />
     <Blob Hash="b8bc898d84b734ee9492745cb6cc84a352e8da71" Size="88012" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1028216" />
     <Blob Hash="b8c23c8bf03a8ae98e039b5c768fe1e75cd5ce64" Size="30056" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1798923" />
-    <Blob Hash="b8c35ba60c06e18c8eb4ff82ca61dd3efe1ea892" Size="14448" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2057656" />
+    <Blob Hash="b8c35ba60c06e18c8eb4ff82ca61dd3efe1ea892" Size="14448" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="1960734" />
     <Blob Hash="b8c3ebbc923ed248c4a576778f70274e0232c23c" Size="656" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="110778" />
     <Blob Hash="b8c491a50f139a6d2308d75bdcbdbbfcbb3d1012" Size="792" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1610555" />
     <Blob Hash="b8cd86880e8b0828524a5d8522f4f4ca53c52a99" Size="3540" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1158134" />
@@ -58697,12 +58551,12 @@
     <Blob Hash="b91add43ce2510880c506119018f04997fa168ee" Size="5788" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1992520" />
     <Blob Hash="b91c9e4ad3e6592230ca36867e5c23b445b51e42" Size="15302" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="484133" />
     <Blob Hash="b91e18423e520034b121701ce6a608943c8fc4ac" Size="27339" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1689492" />
-    <Blob Hash="b91fb8789c5ee64c8bc3f6d648c9edb8a74f84ce" Size="345" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="2096773" />
+    <Blob Hash="b91fb8789c5ee64c8bc3f6d648c9edb8a74f84ce" Size="345" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2096660" />
     <Blob Hash="b91fbff76f9d888a025cb9aceed99664e2dc863f" Size="724" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="120031" />
     <Blob Hash="b9204ed19282062740d8bb1b005bf17448d9057b" Size="224533" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1469155" />
     <Blob Hash="b9291de4c7e7a8cfe989e39410d620cd88f15d65" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097028" />
     <Blob Hash="b92a7eb1043af074f6dc456b66d410a75ca42233" Size="17859" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="494671" />
-    <Blob Hash="b92e14a1d4d1bf26070dd8a607f9f4150f50cbef" Size="236" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1608370" />
+    <Blob Hash="b92e14a1d4d1bf26070dd8a607f9f4150f50cbef" Size="236" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1727602" />
     <Blob Hash="b930c060efcb28571b6248b531070a2155837077" Size="1401" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="249590" />
     <Blob Hash="b932057e7747f721016f243fe8a330185f6a31cf" Size="283" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="381921" />
     <Blob Hash="b934716196b15d20d1fdcfe3d6ec415ea5b9a934" Size="24357" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="871522" />
@@ -58712,14 +58566,14 @@
     <Blob Hash="b93d9343578fe57f631014d71ce16c0694e1d881" Size="141336" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="216565" />
     <Blob Hash="b93e2ff82b837723450bacf8ce5fc4bbb1281192" Size="1035" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="501873" />
     <Blob Hash="b9440f9a7479febbb60514b6ca04383fe62aa8b3" Size="22017" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="71007" />
-    <Blob Hash="b94481a6c93a904e731e5000364788b8b2a768d0" Size="9288" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1500499" />
+    <Blob Hash="b94481a6c93a904e731e5000364788b8b2a768d0" Size="9288" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2037581" />
     <Blob Hash="b9492cfcd98fcf9d1a0ee0776c448b827c200c12" Size="41136" PackHash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" PackOffset="2049196" />
     <Blob Hash="b94e72ce525b59d0d1b6e1fd4c2438cc1aa0de1f" Size="3336" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="383220" />
     <Blob Hash="b951c116dff3bce4461d7ba2703cb6010e62b5d7" Size="2881" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="192389" />
-    <Blob Hash="b954495b07b98862f3e9a36622c6a7a2e34fca4d" Size="74" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605472" />
-    <Blob Hash="b95a02732905d9fff1db5b3749319bb3fee3c775" Size="52576" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="2006718" />
+    <Blob Hash="b954495b07b98862f3e9a36622c6a7a2e34fca4d" Size="74" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1724704" />
+    <Blob Hash="b95a9814cdcf208b0858d2b5d7d997bca44f1b66" Size="183808" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="1382920" />
     <Blob Hash="b95ba39c635e10ce7922083eb220af4fe7c66c35" Size="628" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2077819" />
-    <Blob Hash="b95bb089ef6121e8ddf8066f4598ac2802ee25b9" Size="4807" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1966077" />
+    <Blob Hash="b95bb089ef6121e8ddf8066f4598ac2802ee25b9" Size="4807" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1706304" />
     <Blob Hash="b961d089fc633a149ffa7b360f00935ea0d867ac" Size="2931" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="944789" />
     <Blob Hash="b9626dc4bf7037be9ebfa43a0f59bc0b33c634e1" Size="5515" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="814218" />
     <Blob Hash="b9654c07b700ecb925eb1828052d92bc3cb45638" Size="4776" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="828796" />
@@ -58728,7 +58582,7 @@
     <Blob Hash="b969c3e51aad17d62e1db4772c17c2e5427467d6" Size="4437140" PackHash="36c01a2caeadf8b489be5ccfcd0d07dcc10c2ac3" PackOffset="8" />
     <Blob Hash="b96a36fce4fa55d7d694f652a1404fe89655748f" Size="1011" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="171908" />
     <Blob Hash="b96a985e1e57365f7b27e95d7cd72882245a46f5" Size="8414" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="14012" />
-    <Blob Hash="b96aa37fba05c7bae7803539563bb3fb0a54c8a0" Size="336" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1592746" />
+    <Blob Hash="b96aa37fba05c7bae7803539563bb3fb0a54c8a0" Size="336" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1711978" />
     <Blob Hash="b96dbb1738f293d2842fdcedf2def13004f77a8d" Size="957" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1088672" />
     <Blob Hash="b972482539188261ffea19b8f517f1f5a7ce9a20" Size="97280" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="1941512" />
     <Blob Hash="b97309d8841fc7dd2368675461b1b014a9689e9c" Size="37888" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1269768" />
@@ -58745,11 +58599,9 @@
     <Blob Hash="b992286b38a1318e13c1e1dff22a0d7496d86192" Size="12610560" PackHash="067dd7de8012b59484d417fb1b13712f0975347e" PackOffset="8" />
     <Blob Hash="b9980e307b35c86f010eab76c0bd80c7dc050176" Size="11478" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1981955" />
     <Blob Hash="b999842372da2add555445f52f4aa4e578c7a723" Size="144499" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1354530" />
-    <Blob Hash="b99a302de7dc7c60ec6e9ed392dc80a70f7b78ec" Size="2373616" PackHash="7256e4b0c42f8d9cdbe882a3ce4f16860331031e" PackOffset="8" />
     <Blob Hash="b99b7027f024249f8e3f78c98f75a2aba5aa762e" Size="5577" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2069438" />
     <Blob Hash="b99be4a4a92a64e78c58552685c01a879b8a89dd" Size="17969" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="2070728" />
-    <Blob Hash="b99c0a8ee9509d05fa6e8586ba98bdcb54aee5b3" Size="340308" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="1575944" />
-    <Blob Hash="b99e4181b355727e2a318e5417c82f085b869892" Size="7905" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1955247" />
+    <Blob Hash="b99e4181b355727e2a318e5417c82f085b869892" Size="7905" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2012650" />
     <Blob Hash="b9a0b476c7bf6d32481f95cbe95033d374894b49" Size="3829" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1348549" />
     <Blob Hash="b9a0c11591fd660710f2adc40bf554494a9e80de" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="997848" />
     <Blob Hash="b9a41a52678ee1ce7fd73bf1dbaedb744adc53df" Size="29649244" PackHash="437291e95a44d6e597dc0d5d1ac38de24462979c" PackOffset="8" />
@@ -58778,11 +58630,12 @@
     <Blob Hash="b9ee7afe26dc61aa9ea37eb99a3c10dd176e8063" Size="176" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="561893" />
     <Blob Hash="b9efc9384cde7e35af930ff5a299800da6a8da82" Size="5617310" PackHash="2de8f1186afad5e4c4f23315078e4d2bf6df4264" PackOffset="8" />
     <Blob Hash="b9f4f299adb3fbca4ebe5152e1bb5f7b74b51149" Size="555" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1426603" />
+    <Blob Hash="b9f8d75803766ce3ef8f36e5ece9aa5158b39cd3" Size="68680" PackHash="e9fd3e48a792ca511bb0de9cd173aa5bb336d8bb" PackOffset="2024288" />
     <Blob Hash="b9fcaa476ff88a85618540dbc5431b3463c95d75" Size="131320" PackHash="6306348231c6301ec52a4012be99f82c4cde78ab" PackOffset="8" />
     <Blob Hash="b9fcf769a964627e9f9856c70b1da4c158dab2df" Size="59904" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="460808" />
     <Blob Hash="ba0394e55151e665052e02e58810d062a19fcbfd" Size="7235" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1849583" />
     <Blob Hash="ba03d7d0e539f41578728587178569811b8445b8" Size="74710" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1856838" />
-    <Blob Hash="ba058c4581e73b1642a451a1d8f83728133c42f8" Size="60" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551893" />
+    <Blob Hash="ba058c4581e73b1642a451a1d8f83728133c42f8" Size="60" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671125" />
     <Blob Hash="ba0592024ea3a2b28a061fd670a62eb87fb7bdb1" Size="27450" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1026520" />
     <Blob Hash="ba062c39bec33f6969b051fc3e1e40dddb03e0d4" Size="2865" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="87260" />
     <Blob Hash="ba07584e4f100f251094d9e9aa5248917b60f4e4" Size="2041" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2013465" />
@@ -58791,14 +58644,12 @@
     <Blob Hash="ba0889cc295a86f24fe8492a8afa0b378f168a2b" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="662472" />
     <Blob Hash="ba0a8d30e8159e2ac4b342c06094f14a30317116" Size="906" PackHash="66fce169b160f3c4cb868bda8653b37692b5692b" PackOffset="2096136" />
     <Blob Hash="ba0b5a2ebaa855f6015d0df6006a6d9692952bcb" Size="823856" PackHash="3579a812b187dc0ebafb13d5914b27deab2c4367" PackOffset="812914" />
-    <Blob Hash="ba0c1a0e488e46c33a85a6a8ae254a84f674b892" Size="18562" PackHash="4b4d5334e32af422abfeb99450b906bbe550aff3" PackOffset="2065342" />
     <Blob Hash="ba11ad1fab55e06ff83438b0493bcdfc67a28fbc" Size="2519" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2028819" />
     <Blob Hash="ba127fdc4ca17d1531f70ba7db38838ebfe57a46" Size="3467" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1689093" />
     <Blob Hash="ba12dd05b4bf0c13878ac1e3e8b1d98b843e8244" Size="3569" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="540345" />
     <Blob Hash="ba149f0e9eac6da89575b068ca7c5570c55515f5" Size="3933" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1650089" />
-    <Blob Hash="ba20d65a6b7b4a07ab5a01321677588b4a3970a8" Size="18942576" PackHash="a0f9cbe1ace7f120e633f22a4f98d8a1128f01c7" PackOffset="8" />
     <Blob Hash="ba2296879a1cae324e2f2852c15806b111063b7a" Size="2290" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1606501" />
-    <Blob Hash="ba27516c96b001007bb098fc1a2d33f8bc869874" Size="1245" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1185578" />
+    <Blob Hash="ba27516c96b001007bb098fc1a2d33f8bc869874" Size="1245" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1630409" />
     <Blob Hash="ba289d6ba6eb0a654fb243e4cb61c5dfc3f11d7e" Size="54737" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="2005560" />
     <Blob Hash="ba29664213fcf1347189c239b124f17e2243696c" Size="1200864" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="709264" />
     <Blob Hash="ba31edaab1ed12c8cff238b65dec840f657af0f7" Size="151" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="375707" />
@@ -58813,7 +58664,7 @@
     <Blob Hash="ba40b92224d2842b5b5764cbe9bb62531d217358" Size="12779" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="2037823" />
     <Blob Hash="ba428e379185ac941d0323d329c2b21c07bb5eca" Size="105550" PackHash="d5300790dac3cc619f89851b34f424d123202d88" PackOffset="446039" />
     <Blob Hash="ba447b1630859f74837b79c1a884759368c73341" Size="3132928" PackHash="95f7b61131b0b7361bd6b788845382016a65618d" PackOffset="8" />
-    <Blob Hash="ba45c4f5858819117ad81a4afa32b5f3a4d16658" Size="8822" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="504643" />
+    <Blob Hash="ba45c4f5858819117ad81a4afa32b5f3a4d16658" Size="8822" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1943962" />
     <Blob Hash="ba475c6e1881115d77086252cf46d9cb53386db5" Size="2431" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="808271" />
     <Blob Hash="ba48dc4bee64245861014e4930838a3efd53a41b" Size="2592" PackHash="463c47839b132e9e92cba91e93c1123c4ce11b57" PackOffset="2085630" />
     <Blob Hash="ba4b9dfaf4ab7cb8e94a3742ecc97e7f0cab8de6" Size="3072" PackHash="7d776a07e3eb045bc87ffc9ab7ffc5da18a5c68b" PackOffset="1032" />
@@ -58841,14 +58692,15 @@
     <Blob Hash="ba71375619b1d6f6ca3d04da495ab62523bb10c0" Size="2072" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2094963" />
     <Blob Hash="ba73dd47bf62c996d3ac1c32481acfc764c51fa6" Size="1144" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2084631" />
     <Blob Hash="ba74eadf012db9d614499bad2ae098f60cc1d098" Size="12893" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2077185" />
+    <Blob Hash="ba760fd8c9dc922519ad5243ae13c1d1ac3b76fc" Size="17979480" PackHash="b56f95f59c720b34a60902805b9768e1fa74defd" PackOffset="8" />
     <Blob Hash="ba78927932b72c4249d8256cc5920f9ed36f7a98" Size="308" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1747377" />
     <Blob Hash="ba79ff6408b8fe4531d25a95b968a657f7fbfc1e" Size="8686" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1426872" />
-    <Blob Hash="ba7d6be0feacc87ab51de7f33b946438bfa874c8" Size="584" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1608891" />
+    <Blob Hash="ba7d6be0feacc87ab51de7f33b946438bfa874c8" Size="584" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1728123" />
     <Blob Hash="ba80d72c0c21247bc9829d93b826c5e9dd5cd02b" Size="3783" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="818569" />
-    <Blob Hash="ba80d958adc27e4ebf942665787a3bf0983b37ad" Size="73799328" PackHash="8d35f05044eeb50591ddf60def9eaf3cde165e96" PackOffset="8" />
     <Blob Hash="ba832e73f992da42bb631d84cc3b405a8ba8f314" Size="235" PackHash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" PackOffset="2096666" />
     <Blob Hash="ba8509ff4b875f838b471b47fd70fff970449e97" Size="5228" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1724395" />
     <Blob Hash="ba86020462bc599613b57f78d61cb0d62655a20e" Size="271" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="517066" />
+    <Blob Hash="ba88b28d5bc37e253a578bc4a033d01668093e57" Size="84806160" PackHash="7c966c243091182dc9fab20d21edfca49c7fb75d" PackOffset="8" />
     <Blob Hash="ba8ab5a0280b953aa97435ff8946cbcbb2755a27" Size="2" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096122" />
     <Blob Hash="ba8eae77119aecd7949ed0ec48d47d0f0bcabb14" Size="17715" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="185958" />
     <Blob Hash="ba92550bf69d3ec84b0db0523ce65d1b79179c2b" Size="10500" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1573503" />
@@ -58859,7 +58711,7 @@
     <Blob Hash="ba9870d9b212ee5d09e46b240bc626a0536df4a4" Size="2080" PackHash="59aad3440eda11860e175fbcdcea226318e3d677" PackOffset="2079643" />
     <Blob Hash="ba9d5adab33b79146bb14dd056c6e2b15950bb14" Size="78632" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="1933866" />
     <Blob Hash="baa035b80f4b1a7a49fc8b75ba65b2df745174df" Size="176" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="203668" />
-    <Blob Hash="baa0b1d9b58634722679c0963d463ba7e6dda5d6" Size="161" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1580975" />
+    <Blob Hash="baa0b1d9b58634722679c0963d463ba7e6dda5d6" Size="161" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1700207" />
     <Blob Hash="baa350987e3f3b936db33abc6ddfae0762d4c449" Size="1967" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="380623" />
     <Blob Hash="baa55df4ce4a5e2cd318fdabadc1862a7ccb7a89" Size="172" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2078096" />
     <Blob Hash="baa6dfa03b16496e0a63d3f00c365c527c2e45cb" Size="3670056" PackHash="2409f4a4bab3d42779a592cc49c3a89ddea326cf" PackOffset="8" />
@@ -58908,32 +58760,28 @@
     <Blob Hash="bb04aa8ac2e16952d04a213a9322d401e2f265b7" Size="28444" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1114800" />
     <Blob Hash="bb0645fca528a712cf54ed463fed2f749149504e" Size="1606870" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="380015" />
     <Blob Hash="bb06b23249e57d92253e308845ed6e422f06e5a7" Size="1116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1633996" />
-    <Blob Hash="bb0bb6b67eb4cd1ad26dc1d9761325d33edf67db" Size="862610" PackHash="5dda7bff0436415ddfb9339017dd46727610cfa9" PackOffset="1161678" />
     <Blob Hash="bb0c53752e85c3d28973ebc913287b8987d3dfe8" Size="976" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1660039" />
     <Blob Hash="bb10c2b82f6039f136c71f14aa0b9f1b771f18da" Size="38173" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="331423" />
     <Blob Hash="bb15826025122aeb0149c0f5e5588cf715282b1f" Size="2967" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1099399" />
-    <Blob Hash="bb15c29f01189f8d7a9bffa5195ca347c42d7133" Size="20114214" PackHash="c2fa1ac7e1ce5b8495d27d6c07b8ca6667262cf4" PackOffset="8" />
     <Blob Hash="bb1a1db1d1d1c1c76ec725cd7ca14566173b65c3" Size="18752" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1345726" />
     <Blob Hash="bb1aac945db7484b0ff5989b7bb060e809292290" Size="41905" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="893878" />
     <Blob Hash="bb1fa208f9b2a7eb1b8057f9db813af5aae4beca" Size="2076" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1662659" />
     <Blob Hash="bb20f5d4b614d7e9e82317f7138b8252b0f1c293" Size="101621" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="514692" />
-    <Blob Hash="bb233c9c51d26bfeec5c89aec9ab46e171677a6e" Size="4650384" PackHash="95ccc2c49555c21fcfa1e2fd09b1e19728100099" PackOffset="8" />
     <Blob Hash="bb25357162760adb698d9d574575c99ed52ed724" Size="2421" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="788135" />
-    <Blob Hash="bb26f4778404f822166b6c8c39d53755d2f2a0df" Size="2587176" PackHash="93c96f70db8c2b979575ca3b5406dfea96044033" PackOffset="8" />
     <Blob Hash="bb27d1873dabee64fabda6f25a0137e2c99b3891" Size="38394" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="1705292" />
     <Blob Hash="bb27d52bd993ff27b178f7419c8fe3af2ba38be5" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2012868" />
     <Blob Hash="bb29ce50df2bdba2d10726427c6b7609bf460e04" Size="74856" PackHash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" PackOffset="1519302" />
-    <Blob Hash="bb2c897fb73e61346172cf3dc5b9557b7cdb8803" Size="300" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1590360" />
+    <Blob Hash="bb2c897fb73e61346172cf3dc5b9557b7cdb8803" Size="300" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1709592" />
     <Blob Hash="bb2d72ec0b8572d431fa30809567f903ce3f14b3" Size="49817" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="992040" />
     <Blob Hash="bb2db5e0b8d7a46e560d34a806f26239ba6ba359" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="522760" />
-    <Blob Hash="bb2f92aec22bbc81d78e8bf6c4df1e4ade1d5e87" Size="3556" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1271034" />
-    <Blob Hash="bb314741568e7e027b4393b6afdf261db8c4030e" Size="147" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1459067" />
+    <Blob Hash="bb2f92aec22bbc81d78e8bf6c4df1e4ade1d5e87" Size="3556" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1719936" />
+    <Blob Hash="bb314741568e7e027b4393b6afdf261db8c4030e" Size="147" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1996149" />
     <Blob Hash="bb318b6809df636b57045395ae5dc0328daa7615" Size="18765" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="2018220" />
-    <Blob Hash="bb341895ad89a7a5c2abb268ae24628744a41c31" Size="1219" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="2093037" />
+    <Blob Hash="bb341895ad89a7a5c2abb268ae24628744a41c31" Size="1219" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2095333" />
     <Blob Hash="bb354ea10228267dc1fe8d739d7f1d9d7840fdfa" Size="31660" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="132302" />
     <Blob Hash="bb36385e155bb4f3a10b4bfd73c4f09c28201c34" Size="2835" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="195270" />
     <Blob Hash="bb36c43afaab3ef589f938545c3ae31217df0b6e" Size="8602" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1430367" />
-    <Blob Hash="bb3721a8ca7adf9a888e4c60e7378ab0cf7e3200" Size="2339" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1975852" />
+    <Blob Hash="bb3721a8ca7adf9a888e4c60e7378ab0cf7e3200" Size="2339" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2034408" />
     <Blob Hash="bb374199f3767e2ee3b4d04e43cb043e4d3522ea" Size="11424774" PackHash="32d809d2943a46adfb06d390602d4be87fa510ba" PackOffset="8" />
     <Blob Hash="bb391a4efa9919ad51323e231ba5e6616fbe6e9c" Size="284368" PackHash="149605f77f4487d4f238f2439c46df83708b08f8" PackOffset="1524432" />
     <Blob Hash="bb3d4abef2f1671b33679b0004e4e018cffb441e" Size="1799" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="964344" />
@@ -58945,7 +58793,7 @@
     <Blob Hash="bb4db37b89493c95504488e76380263562575677" Size="1246" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1950178" />
     <Blob Hash="bb4dbdebc934bb31ec256db69c080825c4fa4c5a" Size="6144" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1158946" />
     <Blob Hash="bb4eb736fb31d1cd49455a0debdc9a3d9f01d889" Size="906" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="439058" />
-    <Blob Hash="bb4fa2f0789a0947264553da6d80e31fb0fdd9c7" Size="1596416" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="8" />
+    <Blob Hash="bb4fa2f0789a0947264553da6d80e31fb0fdd9c7" Size="1596416" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="8" />
     <Blob Hash="bb4fe380ce4387889085bf2ef8d13ce82af1ed41" Size="688" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="2091050" />
     <Blob Hash="bb507dd266d935656df6b717cb509994157718a6" Size="638" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1307602" />
     <Blob Hash="bb55572811020fc75d1d53f225ab36e236205162" Size="1613" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="707838" />
@@ -58955,10 +58803,9 @@
     <Blob Hash="bb5bec010c36427aeebdda2fb72083e22a3f5073" Size="159" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="199958" />
     <Blob Hash="bb5c6764d8c0db5188a92c85c98b458c0565632b" Size="222" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1352467" />
     <Blob Hash="bb5d5b1ac56293b661a0c4619632fb52c1dff0ed" Size="42542" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="967926" />
-    <Blob Hash="bb5e1f29b4e9ac38a51ec5e3c8765c26b017f1b9" Size="555" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1588357" />
+    <Blob Hash="bb5e1f29b4e9ac38a51ec5e3c8765c26b017f1b9" Size="555" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1707589" />
     <Blob Hash="bb5edf2b18ad8f663073011980d4eea893ee7fe4" Size="10840" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="31505" />
     <Blob Hash="bb6064d2856a44ce1df268b66c82caa7a9286979" Size="63256" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="466472" />
-    <Blob Hash="bb6089e9c42b215a3322281d01115bdf15a5b77c" Size="1043456" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="8" />
     <Blob Hash="bb6376a9ec1636c7ac9b3b1c7d16006551594e02" Size="5039" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1785613" />
     <Blob Hash="bb6c958833e98eb7404c888b40e219832bb3ed08" Size="19938" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="114484" />
     <Blob Hash="bb6cb261b519533c0a90bb2b274950abbb88d4ab" Size="262471" PackHash="749a111a54b3257ccd4600b6ece1fd86a57efe58" PackOffset="1728094" />
@@ -58969,16 +58816,17 @@
     <Blob Hash="bb724a0eefc50ed4109c46c6834b1e8517e155db" Size="11468" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="2083147" />
     <Blob Hash="bb72ef57660979cd5463c0f93df2193fa2b7b91d" Size="402687" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="8" />
     <Blob Hash="bb73657a0a02a638adee5a65482ae0b00f150cf9" Size="6314" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1564432" />
-    <Blob Hash="bb75723e538ed82c7fb2c5b247c5c0cb72433a89" Size="418" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1783551" />
     <Blob Hash="bb790f7229a2fd232a9eb569fefb294d79d373b7" Size="6073548" PackHash="27c6c3ca83cd9d40f012e1e6e78b9a149c80055e" PackOffset="8" />
     <Blob Hash="bb7b0971f3851b76c897b5f78fdc2fa76daacd72" Size="14848" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1207816" />
     <Blob Hash="bb7b2a01146a33e0af1b6597c2d537816bf0bfd6" Size="182121" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1041857" />
     <Blob Hash="bb7b8f6dbec2639dda36794f2ddf30887777833e" Size="12777316" PackHash="c808c90be4462136e0fa59d237d117dc74ed6dec" PackOffset="8" />
     <Blob Hash="bb7c5f949bbb56992ca7451d53772e53bef19d66" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="764174" />
     <Blob Hash="bb7dddfe830c9dc8438f382db9836b3d05143fd3" Size="1376768" PackHash="5f1d25016d8210455055dce0271f1e192e315752" PackOffset="8" />
+    <Blob Hash="bb7e172ec4662385476d65207af1c1c85d5fc7c6" Size="3333544" PackHash="62ceb2931fb95c80d373efc34705bd999dc053f9" PackOffset="8" />
     <Blob Hash="bb7eb568ab51925a7d26c845c41df45af139c851" Size="10728" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1396134" />
-    <Blob Hash="bb7fb2b5908c572329bea76226b809ccc57208e4" Size="1460128" PackHash="76ceae49acaae4eaab40e99ad6e585de490ee865" PackOffset="8" />
+    <Blob Hash="bb7fb2b5908c572329bea76226b809ccc57208e4" Size="1460128" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="8" />
     <Blob Hash="bb80310683082ac71a8f70fa8a2d5fc7598c533f" Size="172" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2086352" />
+    <Blob Hash="bb84cb0f64828a70547c85205c1fbfdc84e77ddb" Size="68078" PackHash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" PackOffset="1977834" />
     <Blob Hash="bb8c79aa7f53fa94443ea84f337fd4fd885dbe87" Size="138149" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="72212" />
     <Blob Hash="bb8d5cda16c391b59cffe991fc6b3e20b46a35f4" Size="20537" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1157534" />
     <Blob Hash="bb911a241283ec640c83bcd731d434f0e67bd394" Size="82637" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1009175" />
@@ -58997,10 +58845,10 @@
     <Blob Hash="bbbe58a013ee954e384fd7062d584d9d733c4450" Size="149504" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="1291272" />
     <Blob Hash="bbc1ad3f78caa634a2f0bc38059975ef8e4a2ce9" Size="200" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="570127" />
     <Blob Hash="bbc3e96d21987dc98c06c695f3b25dd9b410ac60" Size="2841" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="999711" />
-    <Blob Hash="bbc4cb6db28b04faa035228ec85c9276340b3558" Size="2373600" PackHash="d9ed7f4816d963a62cd266b30e5288d3a8318294" PackOffset="8" />
     <Blob Hash="bbc87da0008681f2f192fef75cfb2a9e85905250" Size="2880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1947204" />
     <Blob Hash="bbca6672ea1ed6f5bb8d2aa2095677cfb0886b94" Size="1825870" PackHash="4b3aa3a1aacfb8361623ab6a68114785a099a999" PackOffset="8" />
     <Blob Hash="bbcb112c2e53437d7c1fd8911aa5c5df80c55ff3" Size="26912" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="259486" />
+    <Blob Hash="bbd8c3bdcc1e130ca614c66f287d8df17bf46ee8" Size="1884908" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="8" />
     <Blob Hash="bbdb8086d02bd5ece758a7f29b63441971baad81" Size="4172120" PackHash="1ac9769648e02ba9d1e04582579634c011ece123" PackOffset="8" />
     <Blob Hash="bbdea729b8d565392adc7742e48307fd9942e7b7" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201073" />
     <Blob Hash="bbe344e8979996f74f4c7b0fc10fd6dff8e4f0e0" Size="39915" PackHash="5f116087ea09d4cd18e565462f0cb21da53cad86" PackOffset="180287" />
@@ -59014,11 +58862,10 @@
     <Blob Hash="bbf67e6b64b1a862855bf471d0b234b74f2c570d" Size="96163" PackHash="d269a082d4513e409c6795d0adfe600ae57dee69" PackOffset="1752912" />
     <Blob Hash="bbf995f0ba355de837455e07bc4b062df6916ba1" Size="3428" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1694801" />
     <Blob Hash="bbf9d145eb3b284a788e9ed8bea2e0654ae5e975" Size="591" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="822639" />
-    <Blob Hash="bbfa11a1cd25bd506e4f81679be7c52525ae17d0" Size="334" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1584528" />
+    <Blob Hash="bbfa11a1cd25bd506e4f81679be7c52525ae17d0" Size="334" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1703760" />
     <Blob Hash="bc065781429e2126111f5171ef4085d615bf2790" Size="539" PackHash="9ffc8d27693d7754655a1ab370123910a4d585f5" PackOffset="2093764" />
     <Blob Hash="bc074064e8f55e7caf01aff307a6961225f9ed05" Size="2901" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1559683" />
     <Blob Hash="bc07665948509d9c1476c6b8ad033505d288d7b5" Size="700" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1325127" />
-    <Blob Hash="bc0939a180f60ca8f92ce074e1b45c87d49fbe94" Size="420" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1784528" />
     <Blob Hash="bc0c1cb0256a632ce6dcc3fcb3cbff5e5c2cf5a3" Size="149138" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1499029" />
     <Blob Hash="bc171f01525d004e3d0de52a2c3616aa612b61d6" Size="141025" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="8" />
     <Blob Hash="bc1883efc8489d2a5b63caef9a4c22e6820a571c" Size="614644" PackHash="68d4a07013644163437adb2f70cdb7f803f893c3" PackOffset="1423344" />
@@ -59032,7 +58879,7 @@
     <Blob Hash="bc32468bf373323223bc666f228dba5bbd1cf852" Size="1178" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="427376" />
     <Blob Hash="bc332b2bf328ec33be655b1561baaddbd0df5fad" Size="5832" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="182028" />
     <Blob Hash="bc34e225ab5f97679b8fd1d6a74360264cfdddf7" Size="9496" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1463678" />
-    <Blob Hash="bc371c4228a5285b48d21d163eca15478483c34c" Size="646" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1416870" />
+    <Blob Hash="bc371c4228a5285b48d21d163eca15478483c34c" Size="646" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1536101" />
     <Blob Hash="bc3c81856b93e5b11228ab4c86af18d8468ae2a3" Size="3940729" PackHash="519e03a04b64bc3d14eefb416e21ae15c6f0121e" PackOffset="8" />
     <Blob Hash="bc3d54157c4ec38d0c37e30a4f59481c34ef43c3" Size="84975" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="1637180" />
     <Blob Hash="bc3dc30e462c453a7867cb6a6afe404abfeb1dc1" Size="7418530" PackHash="82752934d29486bef3008fe2e7e9953dacd3a238" PackOffset="8" />
@@ -59044,7 +58891,9 @@
     <Blob Hash="bc487bafb031138cfe4442fe4692db3427ef92af" Size="2746" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1744328" />
     <Blob Hash="bc490c50193cfab1c8a2adbafa8f66fc4b27d87f" Size="6779050" PackHash="7d11c98e1cdffe70e6382f42497d5914dff6066a" PackOffset="8" />
     <Blob Hash="bc4f1ff3f1024a65f60af51bd59b6912b9c26738" Size="3420289" PackHash="c78d32aaf4ea80b2746ac7ad1692b021b1b548b7" PackOffset="8" />
-    <Blob Hash="bc6212de48f41301d37a44730e11a6c271361bb6" Size="1831328" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="8" />
+    <Blob Hash="bc5b53463684a42ac6040b19ecf71bb1c3966661" Size="1182224" PackHash="d649906f1e80b4dc54d57af853de4a8743b5436d" PackOffset="8" />
+    <Blob Hash="bc5ca3bce0409e0bfe002d0b1d8e54c481cf86fa" Size="251904" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="1778184" />
+    <Blob Hash="bc63ab245348f82bd3f9eade5f7ede8a5f2ba642" Size="85540" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="2005484" />
     <Blob Hash="bc667b90695b98a725c45344051226cf9e9ccc52" Size="1328" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2084512" />
     <Blob Hash="bc679d4e0a7f6acdde42d0c269f30994ba8be441" Size="2084" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1601756" />
     <Blob Hash="bc686812c634702f677c5864be9507673beeaa31" Size="38632" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1965237" />
@@ -59054,8 +58903,7 @@
     <Blob Hash="bc70d9e51cccf7e6a1b4436fee8d6df2e9c2cdea" Size="21520" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2074175" />
     <Blob Hash="bc731fab1906717a60c92b4decc17653cb48fb47" Size="3183" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="105561" />
     <Blob Hash="bc76a944f12a20a39ea933f441f6628be622cf46" Size="1872190" PackHash="cdce3d902b74252df143aa9c039f4e69c31ef532" PackOffset="8" />
-    <Blob Hash="bc775c1da4fbb414842fcacece6facef530d065e" Size="46" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553388" />
-    <Blob Hash="bc78e993831e15af2f3e96d6156c2defd54c6a30" Size="42089066" PackHash="853e1cc9b98852f37f98ca0797670feba41317f8" PackOffset="8" />
+    <Blob Hash="bc775c1da4fbb414842fcacece6facef530d065e" Size="46" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672620" />
     <Blob Hash="bc7ca1b86dcbca467832d43d3c239e4cc24eb02e" Size="35298" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2046210" />
     <Blob Hash="bc7edb10fc6cf489e59323af61232afc40ed09a4" Size="2168" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="812080" />
     <Blob Hash="bc7fa0744ca51c34b5ae3daa2b53f3178da20887" Size="2506" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1282369" />
@@ -59064,14 +58912,16 @@
     <Blob Hash="bc81933625532bd242933c9e7b25f2c67a098ab4" Size="200480" PackHash="870ca928827716f87bfe40deac8a182b8f5933a5" PackOffset="892510" />
     <Blob Hash="bc83e9dab35b43955f24a309cf9e9c6cfa4632a9" Size="281" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2093898" />
     <Blob Hash="bc84142c195ab7fa9890d7637a1c3a41ea1c88ab" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1335800" />
+    <Blob Hash="bc87f29dde5e24625550a1f76fc28d39f578c3da" Size="3725320" PackHash="e06228b3b50d64c2062950b9ab50032270ce9551" PackOffset="8" />
     <Blob Hash="bc8a803828c2b1313468964a958869f5c08dce99" Size="4903167" PackHash="d00340b56c80a33987bae91b824e43fa883353b9" PackOffset="8" />
     <Blob Hash="bc8ef1a2821831eef3498cd8393078590ef7d1c3" Size="263007" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1311417" />
     <Blob Hash="bc913fe6ca82b7efebe8adf89b876b124757ea0a" Size="190" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="263483" />
     <Blob Hash="bc9c28fc3937e623d9920d6f21655a90604af6ad" Size="8847" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1150478" />
+    <Blob Hash="bc9f28cfe74ce1c9cf761d6d1dd9b0115c7c657e" Size="88029" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1894917" />
+    <Blob Hash="bca2f6c663b216cc435415ed938e94173dade33c" Size="27186154" PackHash="70abd588bf9ec0e5b89e315d1d15997b159dd476" PackOffset="8" />
     <Blob Hash="bca5e5d29ac643f490611ea0731a28432255e90b" Size="219" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2087967" />
     <Blob Hash="bca64696bd373563c4a45d46bcb9a45dc6dedfc2" Size="5311" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="2051753" />
     <Blob Hash="bca7a4d2a69c6869af07fbf5f47930a4b4e54555" Size="19720680" PackHash="7c574dc93bcb7e3763ddc0740cdbd5ce395c035f" PackOffset="8" />
-    <Blob Hash="bca8e9796159c9695143ef1d25b248e47b145ed1" Size="778016" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="8" />
     <Blob Hash="bca94c2f845e5583dd0ea221a6d6f9a854d60638" Size="1180" PackHash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" PackOffset="2094107" />
     <Blob Hash="bca9abad19d8789695b5ff101804a42e69ee2904" Size="6370" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1617533" />
     <Blob Hash="bcb276891ebbeab484a2a9a5f6e0aee91a81f646" Size="1192" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1813268" />
@@ -59081,10 +58931,9 @@
     <Blob Hash="bcb73d8af2628463a1b955581999c77f09f805b8" Size="2341" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1477361" />
     <Blob Hash="bcb9bc686777564f293115860aa1ef8e81ef1238" Size="2261620" PackHash="b8e9ff6bec00725cf169b237001ce72af9342600" PackOffset="8" />
     <Blob Hash="bcbce55ea24fbe941081721f4d7a1362e279cf48" Size="3457" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1927065" />
-    <Blob Hash="bcbd2409a46a3d48857408d393565a56facb1bc0" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549431" />
+    <Blob Hash="bcbd2409a46a3d48857408d393565a56facb1bc0" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668709" />
     <Blob Hash="bcbd81757263a2c23546ab25a715e8bdc6ee8464" Size="9388" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="401020" />
     <Blob Hash="bcc0a6b7186212a85ef59a00a504ae36a9cee570" Size="845" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="903900" />
-    <Blob Hash="bcc824ddd2fd5971a985cddd79f533e091fa73c6" Size="8430" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1483723" />
     <Blob Hash="bccf71035cf889b1fac69c30ce116b750fcc148b" Size="8284" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="1939010" />
     <Blob Hash="bcd79367bc59d992f58e6e2bd9590286d227d37b" Size="4768" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2032732" />
     <Blob Hash="bcd890b8382de59d95fb64534d8eb9ec57feb55a" Size="5810" PackHash="f56edcc07a586e9b6792c219e9e8eca444362bfa" PackOffset="2088614" />
@@ -59093,8 +58942,8 @@
     <Blob Hash="bce3398e2a442c3032839ef39ef6e641eaebe8a3" Size="4258" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="75353" />
     <Blob Hash="bce737cf87dcd267262533063a28cf83ac8d5b97" Size="21392" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1801268" />
     <Blob Hash="bce922e9728aba6a0d40e367eea396a2983d443f" Size="39994" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1395596" />
-    <Blob Hash="bcea39949265fd482f0b9112374e9f402325d429" Size="379848" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="8" />
-    <Blob Hash="bcf02d7b514c59d93807bb928bdb8ba75c095045" Size="788" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1431431" />
+    <Blob Hash="bcea39949265fd482f0b9112374e9f402325d429" Size="379848" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="455314" />
+    <Blob Hash="bcf02d7b514c59d93807bb928bdb8ba75c095045" Size="788" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1880484" />
     <Blob Hash="bcf23c964294621861dbf9b438deec752c425372" Size="4749" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="147702" />
     <Blob Hash="bcf376926898ec47853f7a92d8534ace7bd6a2e1" Size="70" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2097060" />
     <Blob Hash="bcf8a1e4bd9dc61398c0cc554a1975140de10c55" Size="120054" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1504200" />
@@ -59121,14 +58970,13 @@
     <Blob Hash="bd20aade8f165f7df0a59ab4a3bc1c3373bc3368" Size="686" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="262665" />
     <Blob Hash="bd23fc43187222338ca8ef112fbc5c35891c9c6d" Size="28025" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="804214" />
     <Blob Hash="bd25ff8e005ce4bf731e2158b83bb1266cfa10b1" Size="15896" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1637852" />
-    <Blob Hash="bd2687e9714e1cafd4355a0cd2ec7e4dcc60e3ef" Size="1225" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1889869" />
+    <Blob Hash="bd2687e9714e1cafd4355a0cd2ec7e4dcc60e3ef" Size="1225" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2017923" />
     <Blob Hash="bd294af21680d5c0f3de15419810955aa7284c3c" Size="5035" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2084812" />
     <Blob Hash="bd2d005ae3327d50254bf5da51d2f9b024f73bb4" Size="12152164" PackHash="91a79d5d6a9cab18ed7c5fba0ca3d19f0fa32a47" PackOffset="8" />
     <Blob Hash="bd3599ab6ff715f23cf0ba45fab5e262828b8735" Size="112" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2096940" />
     <Blob Hash="bd36f754ee885a0a03c6c802b5bf6c5b730a7cda" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="9237" />
     <Blob Hash="bd37e85bf38192614d2b8fb5048d7e9f38eb34ac" Size="454656" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="385032" />
     <Blob Hash="bd3c46df953ab712c847d12d03bc3f6bac4fa0b3" Size="120" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1417993" />
-    <Blob Hash="bd4018426fc9ffbec3a971436a97d5b7a6a33082" Size="5638070" PackHash="933aef650910b08d086444b8864dd9657d72d2a8" PackOffset="8" />
     <Blob Hash="bd40bd875a3b7dd16978580685ab4dd7ebbbc2ad" Size="32" PackHash="752108efcce0f1353b7bf7b6788e6d82a9890a4e" PackOffset="2097078" />
     <Blob Hash="bd449b3320b3e0c2b77505f386498f99ff0f08f6" Size="2914" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="643451" />
     <Blob Hash="bd45286149db2a9a9b9e3dfc97fe5f9a140b87d1" Size="48600" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1637549" />
@@ -59173,7 +59021,7 @@
     <Blob Hash="bd8916e65affb758af3981078dae04a573efa1c6" Size="15872" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1995309" />
     <Blob Hash="bd8aa10dca221e724496842cfb9bcd2276a9144f" Size="2077" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="2094088" />
     <Blob Hash="bd8afb158087fb0216afcf3260760ad91bb2c143" Size="3075" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1143046" />
-    <Blob Hash="bd8b48ed5688444bf8078a9ee59d552f3eb964df" Size="409" PackHash="8ea495aa16f5c28059de7b17b493fc094f400049" PackOffset="2096711" />
+    <Blob Hash="bd8b48ed5688444bf8078a9ee59d552f3eb964df" Size="409" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2082971" />
     <Blob Hash="bd8c5bbdd6b15ffa064dbed5b513037585dc2db7" Size="9421" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="571073" />
     <Blob Hash="bd8dede5a2e58c4aed1395a0c0d212afd18baecf" Size="2635" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="353948" />
     <Blob Hash="bd92a4e6b373b7557ecd4e9bac94ab8a6fb92f9e" Size="7001334" PackHash="acc54372389300e3e5a7d7d246f0eef794c220c4" PackOffset="8" />
@@ -59181,7 +59029,7 @@
     <Blob Hash="bd976ee434c601dc8ff0832f917fb2318a153986" Size="3886828" PackHash="ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8" PackOffset="8" />
     <Blob Hash="bd9a194b7c573b8614b2ca7c1f383172a199e816" Size="677" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="130205" />
     <Blob Hash="bd9a6a5022dfe3fd73a4cd8202fe3bed7a7b3069" Size="2984" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1869204" />
-    <Blob Hash="bd9cd8c244d2e6348215c5ce2712e9eddb381a2b" Size="369" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1388901" />
+    <Blob Hash="bd9cd8c244d2e6348215c5ce2712e9eddb381a2b" Size="369" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1837803" />
     <Blob Hash="bd9d728264b832041ae7775ecf288119c3225082" Size="3486834" PackHash="028636f94b4558655cd5ccea9f3e6abfa6e85a15" PackOffset="8" />
     <Blob Hash="bda083519849e79ed5e41db6704685dfb2bd392e" Size="7368" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1486760" />
     <Blob Hash="bda115a6380168cf6988b267689b32972691d721" Size="32209" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2008226" />
@@ -59194,9 +59042,10 @@
     <Blob Hash="bdaea38e7a2f80e806e7761103a49c0783ca299d" Size="368" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="896847" />
     <Blob Hash="bdb1b1c11829c668b9a45f3ec7869f0de8dba760" Size="9427" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="23358" />
     <Blob Hash="bdb25531b30e6fc454100f37177ec9d4a0fb4e39" Size="111" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="570327" />
+    <Blob Hash="bdb3007639d5eb9e58956aa3a0176c57aaf5038f" Size="3644760" PackHash="119107d2d43beb08f95acbdcc321f936262f2c03" PackOffset="8" />
     <Blob Hash="bdbba85ebd014e9e73a1ba9e12e680cce491b80c" Size="10728" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1439726" />
     <Blob Hash="bdbcfe942f652e1405d9a4061a9c7599ac9777ee" Size="61500" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="1978231" />
-    <Blob Hash="bdbde21b5fa16929c9f17d152f0b1953688fdfff" Size="1066006" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="8" />
+    <Blob Hash="bdbde21b5fa16929c9f17d152f0b1953688fdfff" Size="1066006" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="871932" />
     <Blob Hash="bdc21907146890d22477ed3ad0750992ad10176b" Size="3673" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="373791" />
     <Blob Hash="bdc224cc1961722b2dcf31b24e871680e9497bd4" Size="3256" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="278051" />
     <Blob Hash="bdc3d2002ee269af2a78b3fa01ef10a26efd6198" Size="61227" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1408786" />
@@ -59216,7 +59065,6 @@
     <Blob Hash="bddbca3873d78cc6f8bcd68c89eff8b52532ff37" Size="8800" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1170620" />
     <Blob Hash="bddc151737d535bd9fb1ef8bf71a17468af2ca3d" Size="2827" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="909857" />
     <Blob Hash="bddc5d72e22e63bb43fbbc9c49448ce9d098fbe0" Size="3791" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2001156" />
-    <Blob Hash="bde0d9a872aa31c82b2b42659117157538d14f29" Size="45070" PackHash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" PackOffset="1929550" />
     <Blob Hash="bde0f9f43bd64a6f70f43f2817880abd5af347c5" Size="30208" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="851976" />
     <Blob Hash="bde67588bf4deceb6cd4dcd58a1c2809ac096aa7" Size="56830" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1132437" />
     <Blob Hash="bde694dce2453b076f74e1d463f232fce98d4a8f" Size="12800" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="1868784" />
@@ -59230,10 +59078,9 @@
     <Blob Hash="be00b59d7aeb6aab871d87a1c6243233833c4539" Size="180" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1609296" />
     <Blob Hash="be02d106e3bc8c993bdc042d4247acbcc09c24af" Size="2416" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1883956" />
     <Blob Hash="be0567d579ac6a53870d30b59c389bcbda8b90b5" Size="690" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="217788" />
-    <Blob Hash="be08293c6254e29dd43edf0fd20cf63e377179f2" Size="19299624" PackHash="60e984520fdc92453b085881f0b20a67b4d3ec0c" PackOffset="8" />
     <Blob Hash="be09c4beed5b93ce65832d3c08db6a75991fcc47" Size="316" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="829494" />
     <Blob Hash="be09d91b1118a29eb7ad90300893237f6e2e7895" Size="333" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2096256" />
-    <Blob Hash="be0b7e72dd96a1f5a836474cbb18592985068899" Size="352" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1585756" />
+    <Blob Hash="be0b7e72dd96a1f5a836474cbb18592985068899" Size="352" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1704988" />
     <Blob Hash="be0c8b0c7b5775e4b989d561c7a33059a4146df7" Size="1952" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="2094125" />
     <Blob Hash="be0fc5f62d49456448bfd9d906e854e2d9710608" Size="12288" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1583188" />
     <Blob Hash="be15684b17e951926848d45c8d7a0e91fa471508" Size="16536" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1978465" />
@@ -59246,7 +59093,7 @@
     <Blob Hash="be1e032fb07644d6d9754a76c56fc3e0272de0d4" Size="92400" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="10784" />
     <Blob Hash="be2066cf63d39e6f4e0a8b56599dc5bb3341c6b2" Size="1294" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="2095806" />
     <Blob Hash="be21ba5b5f2fc38c60d60af2cbe367244d810364" Size="8228864" PackHash="8b7636ea04e983ec6e97f8a003cb7a69534ae8d1" PackOffset="8" />
-    <Blob Hash="be26eebef47dade1b4114f933fbf60e5e374657a" Size="5147" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1896095" />
+    <Blob Hash="be26eebef47dade1b4114f933fbf60e5e374657a" Size="5147" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="2087598" />
     <Blob Hash="be2e25a478b7da134b3a296336247996fad63d2f" Size="18863" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1229439" />
     <Blob Hash="be3004c74e4a684e636ab4ae459cc8688f66fbf3" Size="260" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1853704" />
     <Blob Hash="be325f6b7dad35e4ee47b8d6db099ed14c908b76" Size="11776" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="220680" />
@@ -59267,7 +59114,6 @@
     <Blob Hash="be51994120748c637e52a2d544eade0bf3d1ff41" Size="3839" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="188550" />
     <Blob Hash="be53bf00afa580dfc29e971814df7539d3e64640" Size="4047" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="381355" />
     <Blob Hash="be56d3ecaa18d2838ed9780861519325b2ebf530" Size="85504" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1500316" />
-    <Blob Hash="be58fbfe554f0ada7cadeb9f9450d7c2f5816ec8" Size="17364" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1919632" />
     <Blob Hash="be5c53e015863887a48514c643e09060cb465fee" Size="5425" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="57491" />
     <Blob Hash="be6113c3063823c6beb0ddcec69578f526c85e07" Size="1258" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="435456" />
     <Blob Hash="be63ab0cd6e9429a920ce00621a62d3b551b6293" Size="104" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="414264" />
@@ -59282,7 +59128,6 @@
     <Blob Hash="be7a63df769f860c4be9d45d450199cbcd248f97" Size="651512" PackHash="08af72aefbeb7863aa09c79bcfbabae24cf8f811" PackOffset="410172" />
     <Blob Hash="be7c24e6ab223696f8fe2b9303861589eb5a1ffd" Size="13697" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="184296" />
     <Blob Hash="be7f515ccb5bcb173780b9f0c5ce9563e0a8af27" Size="766" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="829354" />
-    <Blob Hash="be7f90e350619c628621ef32b23c9af100f59d16" Size="1751" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1882895" />
     <Blob Hash="be81947deb6675eedd22700339b1eb8e8c67b7be" Size="2051" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1002229" />
     <Blob Hash="be8270e4d70ed54f9d0cf1e759792e276da87b16" Size="326680" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="1720128" />
     <Blob Hash="be88f31e329537014395c175a5f69c4835801945" Size="5367" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1261916" />
@@ -59319,12 +59164,11 @@
     <Blob Hash="bee2bdfa4566c1e671daea67779239b4a0408abf" Size="90" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1577482" />
     <Blob Hash="bee32932caf47dca4718993d2d41eb3b2ef74568" Size="408" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="256693" />
     <Blob Hash="bee35119590f1285d0b30f67041973b41debd5f2" Size="156670" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1031192" />
-    <Blob Hash="bee4765f9ab4ce0e7823129aeac902b11f227234" Size="219" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1784948" />
     <Blob Hash="bee631a6b30d3dfd27fd1747ded70f7fe5283a4e" Size="6030" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1089038" />
     <Blob Hash="bee709cd680e961cd0bdda761f8d47f84047fd92" Size="76" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1368736" />
     <Blob Hash="beed144629ffc7d63d65d0e4f4440abc350173c7" Size="1315840" PackHash="0438814196df435595bbb951822bf81d0364af0c" PackOffset="8" />
     <Blob Hash="bef5fc1a610e7ef49923ae8ece919de6c5235cad" Size="62" PackHash="0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533" PackOffset="2097097" />
-    <Blob Hash="bef8905c8614e66b406509b2845dc460c1164f28" Size="3679" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1088266" />
+    <Blob Hash="bef8905c8614e66b406509b2845dc460c1164f28" Size="3679" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2029000" />
     <Blob Hash="bef8dc8847d78bde88c91d323d8036f16e7d03d5" Size="2305" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1926229" />
     <Blob Hash="befea78125ed824983971962923494816383e442" Size="335534" PackHash="29eae01c452b3ae340b64ad4266ea1152b4e6729" PackOffset="1522048" />
     <Blob Hash="bf018a6c9143c15b420e19429a4b95724d57deb4" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2014537" />
@@ -59341,7 +59185,7 @@
     <Blob Hash="bf24f4f1473757ea019f8276a209c00bbb5a9795" Size="2072" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1439952" />
     <Blob Hash="bf2a693a813b5600debb38cfdd5f059f1bb4e16e" Size="38748" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1863237" />
     <Blob Hash="bf2b790bc1b2950b19dd99ef8a7c94c01fdb860d" Size="18790" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1409540" />
-    <Blob Hash="bf2bcf4d5b3a3dec19413ce2c94da959cfe04095" Size="49" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2097107" />
+    <Blob Hash="bf2bcf4d5b3a3dec19413ce2c94da959cfe04095" Size="49" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2097108" />
     <Blob Hash="bf2d8d4f410e27e69db4b1e615a64659eed1f658" Size="3943" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="2092568" />
     <Blob Hash="bf39678e7edae1266526eb0c8e77291b854a3421" Size="7865" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1450180" />
     <Blob Hash="bf3a3e26dade68e853c932455eb3ab195bbe6ee9" Size="6464" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="123710" />
@@ -59353,6 +59197,7 @@
     <Blob Hash="bf4fd6c95021ab359f817a07e9547cfaf5afe4dc" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1829911" />
     <Blob Hash="bf53e4b74e1809cfd4a62aa8d1be1ef4795044f1" Size="2895" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="169866" />
     <Blob Hash="bf5a6a308821dcf69610a36e00699262c0c52364" Size="54960" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1716524" />
+    <Blob Hash="bf5d8e1d04a487def48b75fcaf3fe050a34231cb" Size="3031768" PackHash="25e1608c09640eb45560f051dcfd4bccae07e2aa" PackOffset="8" />
     <Blob Hash="bf5dd122b3f1e9cb1921eec641a4226b33e03706" Size="4025" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="960892" />
     <Blob Hash="bf5ef75711da77ee22083400879ee776f48b611a" Size="9948" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2041622" />
     <Blob Hash="bf5f742c74c2c35c94da2aa510751b6d4b556b65" Size="5149" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1245668" />
@@ -59361,10 +59206,9 @@
     <Blob Hash="bf661b0f22d1c50171a7a69b8d87a16794938eff" Size="5568" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="733331" />
     <Blob Hash="bf6641f1f6bfaa31fca54994f247a2b4b6e07c41" Size="2855" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1700376" />
     <Blob Hash="bf697b905cb9e0c79b747caa38c98216557a0550" Size="27563" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1404359" />
-    <Blob Hash="bf6d1525dc7e9126cc65ed2f3083c198f06fdbfb" Size="1069" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1411326" />
+    <Blob Hash="bf6d1525dc7e9126cc65ed2f3083c198f06fdbfb" Size="1069" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1530557" />
     <Blob Hash="bf6f4e3f2106fe3ddf19f380dde62e4af2685043" Size="11828" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2038059" />
     <Blob Hash="bf6fbcef2f4ab48aef4201818b3e172b803ecb53" Size="3272" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="652696" />
-    <Blob Hash="bf72d96dddd709ed8f039e824c627cabcf19dbca" Size="267776" PackHash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" PackOffset="1772260" />
     <Blob Hash="bf778ceeb06ce8820bd8201502e15264d9454270" Size="10408" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1382218" />
     <Blob Hash="bf77c28f39cb4377c196dd72e1ecf70527a2b6ea" Size="196" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2041862" />
     <Blob Hash="bf7b0a8eb0a7dc044cafc92038ddcb0947cc5b2e" Size="16549" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1820382" />
@@ -59381,15 +59225,15 @@
     <Blob Hash="bf8e99e0978311e25bc6b6cb93952f4fd370e10d" Size="417" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="2096147" />
     <Blob Hash="bf91dc00a6ae329ae3e684bec56c4812edeb993a" Size="94675" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="1674076" />
     <Blob Hash="bf93f7702bbd0dcb26ca4fa5075c913a58b06e0b" Size="10112" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1323659" />
-    <Blob Hash="bf950f18a478d7ca9d8b9667da1ca6635c51c093" Size="168878972" PackHash="d5fe40a7f257b3d1575ed4d175c6491e2e1490eb" PackOffset="8" />
     <Blob Hash="bf9623042e1d6d3a48cb401faa3a3a7390ab7860" Size="1517" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="723839" />
+    <Blob Hash="bf9bc5eab19e9bedafc822128915aaa8809b3e0d" Size="41544" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="2046350" />
     <Blob Hash="bf9ea1b762027c7db1e4192089892d5967a514cd" Size="150409" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="715235" />
     <Blob Hash="bf9ef78f07d61d1d955d001c76fa1bc083b205a0" Size="21346" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="711082" />
     <Blob Hash="bfa174e2d5c861e4dc0a537079b68e3675c15e2e" Size="7656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="2030443" />
     <Blob Hash="bfa72c43bce0f37f795e974457fbe4a664687b38" Size="11248" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1367038" />
     <Blob Hash="bfaa4699b8b73759ed67f6947040d428a0e712da" Size="124272" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="8" />
     <Blob Hash="bfba663726f0f0329b36111948df111fae9c1bc6" Size="15488" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1834412" />
-    <Blob Hash="bfc0a71c94933274664ebe169e2fe045907a3cc8" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552437" />
+    <Blob Hash="bfc0a71c94933274664ebe169e2fe045907a3cc8" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671669" />
     <Blob Hash="bfc1120bc86c8b68240cc51bb2e5a014ccad42da" Size="116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="559424" />
     <Blob Hash="bfc7b58ba13278618d3ef2d4a58557679f77c289" Size="35867" PackHash="28fce2323a23874f6c9af37b52a2cea685dff5f6" PackOffset="1897952" />
     <Blob Hash="bfc8a058dafae87b286efef0114345fac3ccee92" Size="14410208" PackHash="9b3fac8294c3fe78fdd01651ca7946b72a762686" PackOffset="8" />
@@ -59398,17 +59242,17 @@
     <Blob Hash="bfcf3b830dfa91bb5326d2e211cc8c26948883db" Size="323" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="449460" />
     <Blob Hash="bfd5a49987fe0691bea555ec4e8399cb45497086" Size="19808" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="2061239" />
     <Blob Hash="bfd74f10a21a26db434b244ff077d637b30d26c5" Size="7183" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="333276" />
-    <Blob Hash="bfd7d88ecd9d520bc00fb58c7426c4be4913b9ec" Size="649" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1073133" />
+    <Blob Hash="bfd7d88ecd9d520bc00fb58c7426c4be4913b9ec" Size="649" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1243167" />
     <Blob Hash="bfdcdff527459f880cd1005afb9cb61fd7730f17" Size="128897844" PackHash="c1c3a77a266c4dd3fbe2df657d01e71d99e416a2" PackOffset="8" />
     <Blob Hash="bfe0058dfacc5e648a1d5241bd2df7d159732a25" Size="1472" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="591508" />
     <Blob Hash="bfe7b9a868bf8f93eaf5845a6df571ca37260d9a" Size="144183" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="717402" />
-    <Blob Hash="bfe91542b947cb047efce70412c3fd36a4ef89f4" Size="635" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1985279" />
+    <Blob Hash="bfe91542b947cb047efce70412c3fd36a4ef89f4" Size="635" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2037600" />
     <Blob Hash="bff595e138385a39241b6829d6291f56a7079f18" Size="55808" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="1648648" />
     <Blob Hash="bff7214d6e161b6ddc759e768d5b773fc2a77c02" Size="35236" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1879336" />
     <Blob Hash="bff785bc803064c785be3d61ca5e8e11f7165461" Size="56766" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="973511" />
     <Blob Hash="bff7fd6b3716eef6b4edd301f444d3dcdb492e25" Size="183" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="560375" />
     <Blob Hash="bfff8708bf85b53652f61ef068d85b68880ce5c2" Size="4880971" PackHash="98a169bde2f9da079add30618d99062704a074dc" PackOffset="8" />
-    <Blob Hash="c002a540a80753dc1b5027c8711b76624b1b3064" Size="2627" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1723776" />
+    <Blob Hash="c002a540a80753dc1b5027c8711b76624b1b3064" Size="2627" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1739542" />
     <Blob Hash="c003433ebc3e1ef33a5c07fdd3e32b478b220954" Size="1266" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1071670" />
     <Blob Hash="c0037bb74862dacd67d93258bf54997971ced312" Size="114206" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="309630" />
     <Blob Hash="c00420879a02dcbea8dbe83a90909f63f103f6b3" Size="903" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2041199" />
@@ -59444,6 +59288,7 @@
     <Blob Hash="c0472389033840e5eb22d4314dbba2dbecf127da" Size="166207" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="1030482" />
     <Blob Hash="c0488a5097dabf871b9c7804baebc05159674767" Size="9393" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="1014281" />
     <Blob Hash="c04beb6992f55172f35b33dff8e508f60c9088ab" Size="3867" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="224519" />
+    <Blob Hash="c04c9559015b73a62dda6e465b30a08e4c056da1" Size="39467942" PackHash="24d76770c620099b2974c88c59e7ace2950de050" PackOffset="8" />
     <Blob Hash="c04cff8679d45d4acfebaaed0ecf9b5561f4bfa6" Size="1086" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2001612" />
     <Blob Hash="c04ea9c762f295ef98ac9367c66220b36420b3b8" Size="16822" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="78456" />
     <Blob Hash="c04f9d94ce9dba2b3645405224c960c1d5f2160a" Size="196" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2096575" />
@@ -59452,7 +59297,6 @@
     <Blob Hash="c054b78732e7e4cf0e9535db0d8d800abb3605cf" Size="59612" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="521" />
     <Blob Hash="c0571fd1fc35debc3053f3037b76220fc4db3414" Size="644" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="255866" />
     <Blob Hash="c05aafcf1a603d94555fb55d04e155b741f19e96" Size="162" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="188374" />
-    <Blob Hash="c05b9e5fa1a3831302c185824499f75de6764f27" Size="53490264" PackHash="b933188fa71fdfd4922d94af020e50795da7d466" PackOffset="8" />
     <Blob Hash="c05bff53bf499fda5da448baa60b0565239f6dd6" Size="2898" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="757354" />
     <Blob Hash="c060a7559e7fb60541d8286cbff0cba5f5c13b19" Size="12736624" PackHash="fb96b551213ab47f90dffc83f3198e6a4805425c" PackOffset="8" />
     <Blob Hash="c061c6955749e24c32c80d2cf517617e929bece6" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1497539" />
@@ -59463,7 +59307,7 @@
     <Blob Hash="c06eb5b6b6f836f970cd2f876566f44d28b6981a" Size="22781" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="297239" />
     <Blob Hash="c071c75a9d02a867d36b1df5ae5e866280badb7d" Size="12027399" PackHash="59b4773101fc107e94362f00c7d18b0ef0a7abdb" PackOffset="8" />
     <Blob Hash="c0721db86ea748b8006d6d13fe18e6a99c5bda2c" Size="5331" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="1952208" />
-    <Blob Hash="c073b9d674e69dad31060ddfe7eea489d875330f" Size="431" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2096491" />
+    <Blob Hash="c073b9d674e69dad31060ddfe7eea489d875330f" Size="431" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="2096668" />
     <Blob Hash="c074c529020a89f9dd91b13c7f2d978f1d1ad55f" Size="9744" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1545600" />
     <Blob Hash="c074de447cb83e5d6d376a8f4a6b2392c0c09633" Size="147456" PackHash="efad2bae9ec0727a2d14a2090060a47d4adbe4e6" PackOffset="302581" />
     <Blob Hash="c07a609cf56063d1c7867383d18bed882ef7e080" Size="17892" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1193440" />
@@ -59489,8 +59333,10 @@
     <Blob Hash="c0b05c10a3158a96a8d4099c5ee9bc4dd8ac407c" Size="39301" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1828432" />
     <Blob Hash="c0b09cf266e9d5606ef1270abe9bd814f3fa4a1d" Size="553370" PackHash="b4411a92ba0b237e9dee0988897930e64daca1a7" PackOffset="8" />
     <Blob Hash="c0b220b17d9d7e4405321c1ae78ef9974fe13beb" Size="1100" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1288797" />
+    <Blob Hash="c0b2c2726042d4e4b4eb33b07af9b9b88cfd4549" Size="2664400" PackHash="ecb9951fbc830280dfb9d025d6011d0f99f7b854" PackOffset="8" />
     <Blob Hash="c0b39ac1fe4476e016c5a450b4479905bcac11c5" Size="2871" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="851005" />
     <Blob Hash="c0b8d706afa895e4096bc348199cb4e02f6882be" Size="281376" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="1415613" />
+    <Blob Hash="c0bc163f6a5e2b1a733de3f0483e192eefa42a64" Size="264192" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="1698944" />
     <Blob Hash="c0bcebbd7198e55822be80f862308c67449f92bf" Size="196623" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1479702" />
     <Blob Hash="c0bd779166cea109fe80d907e441781a3543f860" Size="79360" PackHash="f12fcad677aebdda530c1768cf6a4c571cea68bc" PackOffset="1951136" />
     <Blob Hash="c0bf63903bf06552090c3d15232cf78f649c981d" Size="3877" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="163182" />
@@ -59500,7 +59346,7 @@
     <Blob Hash="c0c6c31575f4dab738369bf1d9c364dbff95b4bf" Size="350" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2083600" />
     <Blob Hash="c0c7c0212e2b962791745a9d73596912f17037b1" Size="176219" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="369724" />
     <Blob Hash="c0cc17b8e6289f49afe77148796b16b62c1ec125" Size="23716" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="318280" />
-    <Blob Hash="c0d2ae75226d1ca7d89ce37994a1ab956f26b496" Size="43024636" PackHash="3fb1a4489204b60796e7c6c11ee1676c6b3c2bf7" PackOffset="8" />
+    <Blob Hash="c0d30a4f4a89b90348288e725e9774035a4d12c5" Size="68078" PackHash="3726f8567de19acda762812bfd9dff62242da925" PackOffset="1941148" />
     <Blob Hash="c0d5521bac1da8815135416262edcb9ea8ec3983" Size="8600" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="914200" />
     <Blob Hash="c0d894a2aa3850dac6c4f4bd6d0318833763163d" Size="13824" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1174904" />
     <Blob Hash="c0da7675f5b2ac9433e5f8f3fb1e2c06263fe1b8" Size="330644" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1742924" />
@@ -59533,7 +59379,6 @@
     <Blob Hash="c130becc9197ff094d5997d30843d1f3935a8139" Size="143744" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="338561" />
     <Blob Hash="c1329509600e837c9e090e155522e078e460ec99" Size="25017" PackHash="199e5450e36e8e41f08f9a1139e9c747f2e9610c" PackOffset="2066059" />
     <Blob Hash="c1346aca8e29d1fa43d53aa8d92eb933b9f594e1" Size="4392" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1022010" />
-    <Blob Hash="c1356f0f964a1737ff696326f95502c204929c5c" Size="4608" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2046181" />
     <Blob Hash="c13571909dfe1844e2dbd627b2d7d6d922eeb006" Size="1881" PackHash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" PackOffset="1994599" />
     <Blob Hash="c135f6b64dd7a75f496061e9b9708db7e19f204f" Size="864168" PackHash="2a550ae0182933eb8c4020ab4d4c9f3c4f6580ed" PackOffset="837154" />
     <Blob Hash="c136482a2d65db891f2dc88f78e7fee5d7196f81" Size="7221" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="436266" />
@@ -59550,6 +59395,7 @@
     <Blob Hash="c1543a29778aa0ae9038389f59ee385dab9adabe" Size="22171731" PackHash="5fbc991181f1b120c4405c3fc6672ba51c677ca0" PackOffset="8" />
     <Blob Hash="c158651607cd78eed41e976e4bc6735fb6410901" Size="5379" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2022568" />
     <Blob Hash="c1681d2ab5421fa0217f5c66c26240bb85e9493f" Size="162" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="59857" />
+    <Blob Hash="c1694c64fbbad7a8cba0061eeb32171ecbdcf9c0" Size="28672" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2063224" />
     <Blob Hash="c16cbbbf8ba99515595c1ffdfec82d327903ea6c" Size="6290872" PackHash="c7f488bfc1ed77deae8eaacb69b84a38a5d6f984" PackOffset="8" />
     <Blob Hash="c16f6ec5226b3f44912538e667e3bab4a768efc1" Size="120054" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1647216" />
     <Blob Hash="c173c6f8a643d9241ca5ca4994b8556d594ff9bc" Size="2931" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="2037797" />
@@ -59557,18 +59403,17 @@
     <Blob Hash="c174d3e1e20dd2b4d0845425490cc5b66fbbef77" Size="2766" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="605512" />
     <Blob Hash="c174d8c505f09ed4554b71e3f11f1123bb3250f5" Size="55028" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="8" />
     <Blob Hash="c176a41b7e65a1f4c7ab8bfdc78afba45bf6c468" Size="3453" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="959225" />
-    <Blob Hash="c176c7dde7bc6b918c55aa6fa00a06667022e3ff" Size="3759" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1298742" />
+    <Blob Hash="c176c7dde7bc6b918c55aa6fa00a06667022e3ff" Size="3759" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2080360" />
     <Blob Hash="c1782ccf423dbcf5264ebd46c690a9d5baa80d03" Size="28748" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1902055" />
-    <Blob Hash="c17a342345465ecd6933ebb8d1c61da53faf13d6" Size="64706" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="1932502" />
     <Blob Hash="c17af472a1fd7c0feb49b5c451d22de78c872dac" Size="1642466" PackHash="e6d6170217e3ab596bcc10a49c297cbbac27c3e4" PackOffset="8" />
     <Blob Hash="c17ed19ffa61fa5dcfc150f66ed802aec648c82b" Size="103801" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="304232" />
     <Blob Hash="c17f8ef39afc7982718a60121a179a4f439727bf" Size="133213" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="1938919" />
     <Blob Hash="c1834cd463d8b1a658e55aeced0bc020635ef4e7" Size="420" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2075497" />
     <Blob Hash="c184162a6f2add5800f146dfcf00cd76ab9dedf8" Size="3932" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2049230" />
-    <Blob Hash="c184d1264589e346b43cc3447a623753cf886eec" Size="831" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="2094364" />
+    <Blob Hash="c184d1264589e346b43cc3447a623753cf886eec" Size="831" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2096308" />
     <Blob Hash="c189abd047f8aa719ea19f0be7ff5bb3a2713fa5" Size="1969890" PackHash="0938f9e1ba8268f71da4612cd39cf4f06f6974fc" PackOffset="8" />
     <Blob Hash="c189b8041b32ad3cb83b12acbc812a8634b033ce" Size="180250" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="1335499" />
-    <Blob Hash="c1914a15093ec074de8d50aaf920e2a7fc5c5380" Size="1375" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1567660" />
+    <Blob Hash="c1914a15093ec074de8d50aaf920e2a7fc5c5380" Size="1375" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1686892" />
     <Blob Hash="c196d43f13c6bf8f0596e3c9b9f54a555099ed48" Size="19136" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="445664" />
     <Blob Hash="c19c4df0284ed1348818db9141e146dd60470aad" Size="657" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="399471" />
     <Blob Hash="c19e0082c5def9e277f39e16cda2defa84b90cc5" Size="1363968" PackHash="c798ec69224fa0c028f405298f4943f6ea92d3d3" PackOffset="8" />
@@ -59580,11 +59425,10 @@
     <Blob Hash="c1a453f9544302360d20cbce040a6a13e8816927" Size="190714" PackHash="adecd2c644904747c3cdc204c4e4d0c59ab35970" PackOffset="254308" />
     <Blob Hash="c1a5d3956598acd3eaa7294871fe0c3d18780f73" Size="86930" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="616313" />
     <Blob Hash="c1a6341691e070f3fa430830e79a123ba65c19b3" Size="2326528" PackHash="811a890ba0d6651ad379bdb2fabbf5299f52b73b" PackOffset="8" />
-    <Blob Hash="c1a920c7929500e9fa29e47c60cee3deb5cf8817" Size="292992" PackHash="8ea495aa16f5c28059de7b17b493fc094f400049" PackOffset="1802360" />
+    <Blob Hash="c1a920c7929500e9fa29e47c60cee3deb5cf8817" Size="292992" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="1596936" />
     <Blob Hash="c1a9b6b68c2ef11e1a7d9cca38f9d6d126dbeeab" Size="1722200" PackHash="4cd1d29d63217d8c35aeb9eabacc3157ad7cdcbd" PackOffset="8" />
     <Blob Hash="c1aa1134c7e9ac056b680f7461e9856a48dd9def" Size="3527" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="598710" />
     <Blob Hash="c1aa428c002b31850f61aa6eddd5d31867a14ad8" Size="218" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="559224" />
-    <Blob Hash="c1ae6a779805b7625c11a60b4fbd93b654c58b96" Size="613152" PackHash="29a4bd653010a3a24379c61f4b55f4078f3c2dce" PackOffset="1419536" />
     <Blob Hash="c1ae8bfeb76acaeb29f7872ca5e4c5f5e25c1b27" Size="3621" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="685475" />
     <Blob Hash="c1b03ec81a7bcd5b240f63de57661899ddad9aec" Size="34898" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1575673" />
     <Blob Hash="c1b1ce7597e1c379e498ce9187b36353ab743f05" Size="4396" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1430234" />
@@ -59605,6 +59449,7 @@
     <Blob Hash="c1eeb3bccc8e48f9c0574d38d115d897d8d1720e" Size="672" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="2096311" />
     <Blob Hash="c1ef34ffca247fefc2fb18dfcfd7f558d9df3c29" Size="296492" PackHash="fb0187e8327789c02149729f407e8b9296df854f" PackOffset="1244452" />
     <Blob Hash="c1f2de6821abe3d07ecd1c6015d1eb3904dc9af3" Size="18261" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1511621" />
+    <Blob Hash="c1f69f6fdadbc60533bde7418019d9267676fb08" Size="17753600" PackHash="be810298e58c15dc11579daa339ebfd77c249a4d" PackOffset="8" />
     <Blob Hash="c1f6e5c62dda200c6ce83110dc1a21ad85fdfae2" Size="208" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1259835" />
     <Blob Hash="c1f718c3206a789688b3b2ef2977881a4bea6bd2" Size="106582" PackHash="d63c4c238a195e3f8e062b2a9cf0757f0ed55587" PackOffset="1693734" />
     <Blob Hash="c1f737e46d6f73674a197ad19b3efdf26bf1d35c" Size="762864" PackHash="94cfed4a88c4801ef537b65413db4cc3326b0a89" PackOffset="8" />
@@ -59632,8 +59477,9 @@
     <Blob Hash="c223961fd3c4187f48f5b6c6d87df3ad1ef0c028" Size="250508" PackHash="0438814196df435595bbb951822bf81d0364af0c" PackOffset="1822371" />
     <Blob Hash="c22796e3909d9cfbe5924b5e4516a1fd679dddd6" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2097099" />
     <Blob Hash="c22c6453e7651743748fa226af0955b9cd8cb65d" Size="938808" PackHash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" PackOffset="461822" />
+    <Blob Hash="c22e2c2fe3c67c6ea45d0f39d7b5a100a44febc6" Size="3523786" PackHash="1afad53edb8e037d8c68bb4feba16cd9ee387b81" PackOffset="8" />
     <Blob Hash="c2312e7ba15faf44c7731c1ef06dc106faa781bc" Size="127" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1900755" />
-    <Blob Hash="c231f1c16b302965aab9ee261f726b9ff8b71d6d" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552972" />
+    <Blob Hash="c231f1c16b302965aab9ee261f726b9ff8b71d6d" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672204" />
     <Blob Hash="c232eff57cedbe1ffc03bcf43116c48f71ca61fd" Size="839562" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="836722" />
     <Blob Hash="c2395bf876b1e40ff9dfcb28b9b06188d5b06318" Size="78294" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1516689" />
     <Blob Hash="c23af7aa019ce2f87cd0b0ebd03c0e92d9b83810" Size="24064" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="1979912" />
@@ -59646,7 +59492,7 @@
     <Blob Hash="c24a32c24b5bdd35b60457ea32e5853881941d94" Size="98676" PackHash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" PackOffset="1839834" />
     <Blob Hash="c24c05e4e651be52b49698ac239451cfea6b1450" Size="118011" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="380051" />
     <Blob Hash="c24eb9aba8a7abcaeb908cacc98bc40a094da8d4" Size="36719" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="687948" />
-    <Blob Hash="c2510e3660ed8ec2eda9b5dc62c530856fd357fd" Size="3392" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1746622" />
+    <Blob Hash="c2510e3660ed8ec2eda9b5dc62c530856fd357fd" Size="3392" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1865854" />
     <Blob Hash="c252fe83413f963917c325eb718c67066f1dab16" Size="10743587" PackHash="512aa5cac8b20b03176c0011e7b186a7b2c7eed7" PackOffset="8" />
     <Blob Hash="c254225548e96a0a5d44e6f88b154737b78e9554" Size="5117" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="38404" />
     <Blob Hash="c2543902e986f1164054cba9c5c8abfa03a51295" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1806144" />
@@ -59666,7 +59512,6 @@
     <Blob Hash="c2611a3a9be172fbe1e4396b4a521c05052074cf" Size="21280" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1944040" />
     <Blob Hash="c26540b6e3c6a3f66fac1f7a0ca6c41243a329f3" Size="2695127" PackHash="077897ffc56b1da4ffb07119599fd5c0ff79fba6" PackOffset="8" />
     <Blob Hash="c26802708d22358087b6ada1620d8e0fac2145fd" Size="45056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1267254" />
-    <Blob Hash="c2691ccb0dca6f302de7e8d23420b3dba859f05b" Size="45056" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1686349" />
     <Blob Hash="c26b6d919e20c2e4a0ec00f1fdfd2cf5b85bc794" Size="441352" PackHash="83483b879ca4d4508d64bd7176b1101533718a2a" PackOffset="8" />
     <Blob Hash="c26cc624cd1526a304711430c8689b66db6fbf00" Size="885" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="75153" />
     <Blob Hash="c2704e0cd1e162cab097d1d42bea94d37fd1934e" Size="202420" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="1722399" />
@@ -59684,16 +59529,16 @@
     <Blob Hash="c28243d5456b059fcfe57dcb43cab34eece10d25" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2082059" />
     <Blob Hash="c288599e67eebc696603002407e79349a19c7b15" Size="180" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2084488" />
     <Blob Hash="c28865b27a6684e91019ca1173fe20822b6dc891" Size="216984" PackHash="d0832bdb2b5fb1f4997601e49c13919497d63319" PackOffset="1050704" />
-    <Blob Hash="c289a8b33ef7b7c2f63c5d8131e31b2350c69050" Size="1305" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2082976" />
+    <Blob Hash="c289a8b33ef7b7c2f63c5d8131e31b2350c69050" Size="1305" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1982840" />
     <Blob Hash="c28b0e9de9dbeeaebe389525932def93acbfd405" Size="15923" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="900288" />
     <Blob Hash="c28e6c491b0544a75932a1450dc9f7900f631e7c" Size="2819" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2093687" />
-    <Blob Hash="c28e7edc7d8900e21a0d4f525b29b33765f42dff" Size="212992" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1780330" />
     <Blob Hash="c2935bc12b26a5b96a33f8155bd3b1fa9b878afb" Size="3297" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1669079" />
     <Blob Hash="c2975c9a81359882b56e71f1dc62cd4aa65c78a5" Size="738114" PackHash="dde49372548c3a3e8ad2d3301a2a954d4167a13f" PackOffset="738922" />
     <Blob Hash="c29bc74e8f3aca5088879ccc8df0b3603e2b77bc" Size="7621" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2065236" />
     <Blob Hash="c29c9e1366a7cf46eff34cc21d08e78823afc006" Size="5178" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="762453" />
     <Blob Hash="c29f5de2d614957783b90663b4353a3a2f061399" Size="2934" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="477775" />
     <Blob Hash="c2a31b5d761d29a975f7a9ab33e6a0fd36a4d00f" Size="110972" PackHash="419ab9d476edfc8b4ddcdf17f796fc9a5da15457" PackOffset="1558365" />
+    <Blob Hash="c2a3b50bac088af2d2510642462d2729c1458537" Size="20540" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2029880" />
     <Blob Hash="c2a4defbd08bd6fb5f70adbf02db209d5a27e6c5" Size="14773" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="2048377" />
     <Blob Hash="c2a91b832b24ca58d9f951257594c422e514c028" Size="7784" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1740920" />
     <Blob Hash="c2ac24e957ef9f424e337f871da6b6599523c478" Size="7660" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1854368" />
@@ -59709,6 +59554,7 @@
     <Blob Hash="c2c2375458603425a5b61da5b7b7dafeb214d058" Size="55" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2070974" />
     <Blob Hash="c2c28a11e239501db6552cf4895d785e37d831cc" Size="472485" PackHash="91639ede60c084c481daea6546adf05ba88aeb17" PackOffset="456916" />
     <Blob Hash="c2c5267adf2784843922eb03373405e5e565f35d" Size="9229" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1285547" />
+    <Blob Hash="c2c611be7f9b920bdf525eac9a94394e67eaf203" Size="1020" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1753758" />
     <Blob Hash="c2cd254e1eb3cb5785a908f88dbf3e1f23b2176b" Size="5632" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="321512" />
     <Blob Hash="c2ce427564c1b5702f0dd2ca5a52ec29ffc0ff88" Size="313" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="830120" />
     <Blob Hash="c2d0424be90d9ac1fd88213264fd882fe1361005" Size="11869" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1043014" />
@@ -59739,7 +59585,7 @@
     <Blob Hash="c309542faf3dbb2de1a61ad80e881d2bea740553" Size="364" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="667301" />
     <Blob Hash="c3095c3de7179747450f976d2233eeebbd316711" Size="23628" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1974032" />
     <Blob Hash="c30b28a34d11fde4c54ebc926a0675c9221dccde" Size="5670" PackHash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" PackOffset="2083925" />
-    <Blob Hash="c30ca497de2cfd223a149f4339e81a9ae5c84e6f" Size="2232" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1365331" />
+    <Blob Hash="c30ca497de2cfd223a149f4339e81a9ae5c84e6f" Size="2232" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1814233" />
     <Blob Hash="c30d5ce9167e2fc2e5efb78982e9eb3e751e2cc0" Size="7236" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1378264" />
     <Blob Hash="c30e0ade07465214637fb4e031532da76dff3738" Size="11860" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="250584" />
     <Blob Hash="c311afdef45075c82eb8e241f682190e45ce9ab9" Size="2680" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="2094252" />
@@ -59759,11 +59605,11 @@
     <Blob Hash="c331c443224589ed5a097231ed58fd5b4630592f" Size="31448" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="393925" />
     <Blob Hash="c3324e09fe0c2721e62e5d9a053376636a9160e9" Size="3828100" PackHash="7872146e19d48518dfa8f01ae6bbe220cca261c0" PackOffset="8" />
     <Blob Hash="c33631456eae9ca8035c309e9f0335b78b517108" Size="468" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="97338" />
-    <Blob Hash="c339625b12ce0e676165cbc9953ca17fd291d309" Size="26016" PackHash="563883a5d19fc2d08ee339d742ba1d2eacc72981" PackOffset="1910420" />
+    <Blob Hash="c339625b12ce0e676165cbc9953ca17fd291d309" Size="26016" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="2065714" />
     <Blob Hash="c339a42ea425302ca558d929ae79a7d2979aa1a5" Size="233" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="677740" />
     <Blob Hash="c339a5159cbb33d67ada559293c1c406982882ad" Size="29349" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="444975" />
     <Blob Hash="c33bb1ba20d4ce89ae3fefdebee8a217083f4d29" Size="4967" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1204544" />
-    <Blob Hash="c33d4dccc66f366433dcb6cd84fbddae7f36e210" Size="345" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1601226" />
+    <Blob Hash="c33d4dccc66f366433dcb6cd84fbddae7f36e210" Size="345" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1720458" />
     <Blob Hash="c33e9643fd5ad66641327b72c51f8439078b5d1f" Size="8105" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1818603" />
     <Blob Hash="c33fe7804056deb385440060d535ee4753e79bca" Size="2760" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1428148" />
     <Blob Hash="c34208fc0bfdd69d14b4ae63103fde71c9f8a66c" Size="102622" PackHash="39751e99851beb7d0825e392704eb90eb4cb755d" PackOffset="1925345" />
@@ -59783,7 +59629,6 @@
     <Blob Hash="c35c9c0d4871f6ccc1bd35008bf7cd034b6fb35e" Size="947" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2074642" />
     <Blob Hash="c35e1f76d967fa02d3c8d09ac6312bac9848f9ec" Size="42050" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="116898" />
     <Blob Hash="c35fd52a7c03eb1e3a37fd41f1dc609a2d3facac" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096624" />
-    <Blob Hash="c360e5e1a11c8ece56c582f29dd72bdea31c72a7" Size="12555976" PackHash="ef079093519a4d4c59c146e07b2554bdf8328685" PackOffset="8" />
     <Blob Hash="c3644e58bbb0a812223cdf2ebdd879f0ca63329b" Size="39424" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1972323" />
     <Blob Hash="c364829324eaa47e70f0ab381231a32e23074260" Size="1224" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="502177" />
     <Blob Hash="c3667ced43d5ea282436cb135263ba6725a61a7b" Size="1224" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2095857" />
@@ -59793,7 +59638,8 @@
     <Blob Hash="c370956a320486a38514e11722d252207cea7d98" Size="255755" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="1584429" />
     <Blob Hash="c372338ad5b933e6e3fd4672dc9c34190f18cc90" Size="3612" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="1996097" />
     <Blob Hash="c37be934353b0afb1102912fc51785d3685a3405" Size="5117" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1316363" />
-    <Blob Hash="c37db7e129f3c05931909665970cc0e732bb7c7b" Size="5501" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1924141" />
+    <Blob Hash="c37db7e129f3c05931909665970cc0e732bb7c7b" Size="5501" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1865320" />
+    <Blob Hash="c37e2291ec269faa847d14e9ce17fbf9f0b19c61" Size="7054" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="2083412" />
     <Blob Hash="c380d681f4019a66191132ca36112d3c3853d470" Size="36588" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="2017608" />
     <Blob Hash="c384576c9b717e6d24a14b1bdf53ad4f79001d63" Size="22635" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="826182" />
     <Blob Hash="c384974fad5beb7c293709efb79959a932ecdd79" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1991368" />
@@ -59806,8 +59652,6 @@
     <Blob Hash="c39ab4311f998ccc2ef59a4b59ac78d76d647c19" Size="7397" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="538490" />
     <Blob Hash="c39cd2b4e75d7e1e7a12a413fa81a36b90db0873" Size="3497" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="24381" />
     <Blob Hash="c39dcdc68aef5938efbe2621aaafb50085dccd24" Size="7656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1248908" />
-    <Blob Hash="c39e2750aec2b8e02a33a4dfec26d9bb127e8d3a" Size="47211590" PackHash="b05b0abdec3dbe4b854057f18c13efa39ca4956d" PackOffset="8" />
-    <Blob Hash="c3a2f0ba06181993d8ae15d9d3b3333d02c05bb8" Size="6690480" PackHash="9abca783ec209954eaede329b0f84fb098a6662d" PackOffset="8" />
     <Blob Hash="c3a43d759bbc3b2960c8736880fe2327aca55237" Size="21072" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="2068488" />
     <Blob Hash="c3a45d1fa97325ae4cb7debe2353d706d7f13fdb" Size="379773" PackHash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" PackOffset="910952" />
     <Blob Hash="c3a6eac21a235a631e64f93972b96c57e3c16c44" Size="2348" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1999720" />
@@ -59815,14 +59659,15 @@
     <Blob Hash="c3a976c05cdc79d9a5a66d21476d0d5025f6dd7a" Size="8914102" PackHash="829b10d9abfbf44d4b4fc305646818f9d84a3d96" PackOffset="8" />
     <Blob Hash="c3b101dae37b2a607c189ecfbb126846abefbaed" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="572880" />
     <Blob Hash="c3b2d79d0b2179f9cc40b8151a7ae63e804e6925" Size="5062" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="988667" />
+    <Blob Hash="c3b857a6bb665283aede6b1fe7812cdec349c4e8" Size="7327456" PackHash="14c5f512f83cc2e491965d0c8e8f0dbdc213b0f7" PackOffset="8" />
     <Blob Hash="c3b87f4a1d0b7a81c08b54aa19dfcd34db210ae2" Size="47" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="464590" />
     <Blob Hash="c3b9cd707b72212e9f33ce5d6968fbe07f34a2b9" Size="626" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="2091349" />
     <Blob Hash="c3bdf0d9df316de8919daa4329275c5aa81d61b4" Size="1111" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2040816" />
-    <Blob Hash="c3bee56beebd4e43bbb67728154956483666f37f" Size="253" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1289731" />
+    <Blob Hash="c3bee56beebd4e43bbb67728154956483666f37f" Size="253" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1738633" />
     <Blob Hash="c3beff947360f982ea529ce8f4bff58daf07ca2e" Size="3259814" PackHash="7a6a00a467444bca511b032d80ad66d275670598" PackOffset="8" />
     <Blob Hash="c3c8e384042886058155c6972a7b1796276094f6" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2082091" />
     <Blob Hash="c3caa701f7f273255a062c157a2bda19a3fefff0" Size="122761" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="892902" />
-    <Blob Hash="c3cc18786ea312ef21ab0ea66c406d120b359127" Size="286103" PackHash="056b3fcc9f2bb9a7b7024314a17d5c3c91b3bb80" PackOffset="1749173" />
+    <Blob Hash="c3cc18786ea312ef21ab0ea66c406d120b359127" Size="286103" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="1080142" />
     <Blob Hash="c3ce9f7437a68a29a43f2df8204405cf10b34d2b" Size="74804" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="2011758" />
     <Blob Hash="c3d391993c1befae52516850e61d86b7212421a4" Size="214917" PackHash="f279ae70e30f66de7b592409e9ed96993301657f" PackOffset="572311" />
     <Blob Hash="c3d611804906604a1fb6a52a5c7943cdbefcb48e" Size="210" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="407935" />
@@ -59832,15 +59677,14 @@
     <Blob Hash="c3dc2e78459537bd7d37869e45cfd99946d05336" Size="212" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="607461" />
     <Blob Hash="c3dc62954651769920dd72f6708902bc65cf9766" Size="278" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="155812" />
     <Blob Hash="c3dcdf1bba367155bd248551f8ec7efd4397105f" Size="16" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2097068" />
-    <Blob Hash="c3e10adc5513ca1c2a59a7f5b3f72083a98ae92e" Size="1156792" PackHash="2b07bf25fb2698584c163bbdbe0e9fc6c6870f49" PackOffset="8" />
+    <Blob Hash="c3e10adc5513ca1c2a59a7f5b3f72083a98ae92e" Size="1156792" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="8" />
     <Blob Hash="c3e35dcb93fa2bba12bd90dca99663467f126dab" Size="46841" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1947754" />
     <Blob Hash="c3e3a7ccf2279edee1890fe844f599810bea77c6" Size="78236" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="1855630" />
     <Blob Hash="c3e667d949a5b8df257549af331226a574277351" Size="12632138" PackHash="51c835e24d6b8dceca84854b7981d7eb83ab2f9c" PackOffset="8" />
     <Blob Hash="c3e6dcc2a65586bc35a665d3f371ff73f182f1f7" Size="36" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2097120" />
     <Blob Hash="c3eb579f7f93ce9f20df32021b817b4b7646d8f7" Size="670138" PackHash="f8573348f998752c7a3165b3effd0bc1346c3de5" PackOffset="1338125" />
-    <Blob Hash="c3f45d3c13adb7f5d9042f18e4bae2cdf1fd985d" Size="40604" PackHash="3bac9449b8db3e7d2dd557fc6ae8010646abc8e3" PackOffset="8" />
     <Blob Hash="c3f7d8576c0ac74d6b70f4363ee2c174fadc70b0" Size="204" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="625521" />
-    <Blob Hash="c3f901bb8167737abf3d223aaead8fd2ce5af8c4" Size="261244" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="1198216" />
+    <Blob Hash="c3f901bb8167737abf3d223aaead8fd2ce5af8c4" Size="261244" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="8" />
     <Blob Hash="c3fe3fc6fe92d28aad30a97832e96a54ceebec14" Size="1800" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1926902" />
     <Blob Hash="c4018d9f5dc1f58f937fc117c1576a7648195166" Size="943" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="734932" />
     <Blob Hash="c404be26e87be9fb85da8dcad3955430dfd68c94" Size="261632" PackHash="79c05fe7b7c07f8ffbc805ba018206bdd2a66fb9" PackOffset="1804808" />
@@ -59851,7 +59695,6 @@
     <Blob Hash="c412010527655641717ca6fd5af92deb4db3968e" Size="2609552" PackHash="ab3b16f58330084ebc39cf31605889c1aaef5547" PackOffset="8" />
     <Blob Hash="c412bbf908fbb50d83d6d31dc2170d156f7eeb5f" Size="178" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="15793" />
     <Blob Hash="c413038ca781d3c04a10e87a150a69c093d26d4a" Size="11152" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="787544" />
-    <Blob Hash="c41453810aefc7dfcbcdd89422198e76ef6d903c" Size="2622386" PackHash="841e3473c016ca0fb18b622895f124e49bd095cc" PackOffset="8" />
     <Blob Hash="c41769379c9a271171ebfffa426abd248225aa5f" Size="185017" PackHash="8305a66fae9404fe58331fbef287d0215d05f2b3" PackOffset="1838440" />
     <Blob Hash="c417c7c1ae94ac422928c2e7e12d850df4976a58" Size="226733" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="1870269" />
     <Blob Hash="c41ba7bb0dc0df49d621adc7e5a90c4908ad5962" Size="299" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2011351" />
@@ -59867,7 +59710,7 @@
     <Blob Hash="c4344eab48e501eb0413d1fb40527073b55fca1b" Size="61440" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="1025616" />
     <Blob Hash="c43cb641127e076cf7b9fa30b6aa14c9c4d5ec39" Size="50761" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="305953" />
     <Blob Hash="c43d1dbaefce1aae358f101d10a27de06168b4c3" Size="723096" PackHash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" PackOffset="8" />
-    <Blob Hash="c43d53c2e5d9c2482ffdb9be32e127b59c6ff55f" Size="261" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2096452" />
+    <Blob Hash="c43d53c2e5d9c2482ffdb9be32e127b59c6ff55f" Size="261" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2096236" />
     <Blob Hash="c43f73477e72798fdfb71958f5704148bb907419" Size="19753568" PackHash="4f8d6ffd3e09677039c4bf96ce59fc30f1317606" PackOffset="8" />
     <Blob Hash="c443df83414b345dcc65faa4352bd6f969f66d02" Size="134526" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="1219234" />
     <Blob Hash="c447bdab96cdfb72b3a52f6084811ca4da295a5e" Size="3112" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="463505" />
@@ -59892,8 +59735,9 @@
     <Blob Hash="c4652dafdc08d348baa9d3886e8e1488a7d7fa17" Size="9229" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="440460" />
     <Blob Hash="c46a0e4239700f05d783f4bd4ac7356330104ac0" Size="172" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="359614" />
     <Blob Hash="c4715864f9eeb832f11abf014e4de45c551f0f76" Size="1022" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2072426" />
-    <Blob Hash="c471b474878d5838c201f4e8690e572ae42205f6" Size="14362" PackHash="2b07bf25fb2698584c163bbdbe0e9fc6c6870f49" PackOffset="2080060" />
+    <Blob Hash="c471b474878d5838c201f4e8690e572ae42205f6" Size="14362" PackHash="3dc42e03b3cf9ab3705939d5eaf2bfcd770d2792" PackOffset="2081888" />
     <Blob Hash="c475a7a79f9811ceecca3662dc18aa55df8f0fd9" Size="3066" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1002707" />
+    <Blob Hash="c479ec708c53b3f9be5a633c7e4600c713785e1f" Size="2451104" PackHash="056c3a75cfb3ba44516a332db18c3e24d207bf87" PackOffset="8" />
     <Blob Hash="c47a6df5627ea2c0b595d99e83c12e08a2686c45" Size="4902831" PackHash="7996e8351b085aa99ee962c9a0abbbe9b077e23c" PackOffset="8" />
     <Blob Hash="c47cf12f7e2874208acc0fd4978f566d314438a2" Size="2912152" PackHash="30ba7bb330361d176b1fe57e61dee2be600e9b64" PackOffset="8" />
     <Blob Hash="c47d346a436083f708a4b0872dff936add38cdff" Size="1249" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="2094527" />
@@ -59919,31 +59763,30 @@
     <Blob Hash="c4a149a3ef3e6f9eb15e266ecbd56ebe73143e05" Size="6010" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="899898" />
     <Blob Hash="c4a6d8f19314453389ba244e206d544994e6e357" Size="28340" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="332121" />
     <Blob Hash="c4a8796326c201ba5c12acf458a6bfe32e1d9861" Size="7280" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="748421" />
-    <Blob Hash="c4a9519ed2af8f35f9f7899623e3984a8fdf8981" Size="2410" PackHash="9043aae8efdbef093afeea0f5468a885a3436ecd" PackOffset="2092192" />
+    <Blob Hash="c4a9519ed2af8f35f9f7899623e3984a8fdf8981" Size="2410" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2020988" />
     <Blob Hash="c4abc83f87f1424da2614c8e19338187dbd18c96" Size="113754" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="701579" />
     <Blob Hash="c4acae1b74b766396dec064123a4637a9dc4b0c9" Size="9082" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1303128" />
     <Blob Hash="c4aebbbdff475aa91ee5fd8f084906bd9e296bbd" Size="3234" PackHash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" PackOffset="2093399" />
     <Blob Hash="c4aee334ded6e918d3037eb80199a7fcc32924fb" Size="140522" PackHash="d0727784ae79dcba28f2e253924b24479c842f8e" PackOffset="1921419" />
     <Blob Hash="c4af21c30cdd591a19d1c2a3ebb01aed35c9b7b0" Size="2612246" PackHash="192c36d310b45029e1af5607bed97fb7c30b58c7" PackOffset="8" />
     <Blob Hash="c4b07cd515dd2f03fac8a6727c4aa814c1ffb02f" Size="349984" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="1645526" />
-    <Blob Hash="c4bce0be9ff33b594987d81a279244c22523a699" Size="4367772" PackHash="1f3e182d71989b39327a7ab2e8187e5725ef0e40" PackOffset="8" />
     <Blob Hash="c4bf9f819e4a9219706d40935ffeaf3c194e1e86" Size="86015" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="1573409" />
     <Blob Hash="c4c33c4042c29bcdd194c94f8b34b953e7124ef1" Size="2113" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="821545" />
-    <Blob Hash="c4c5336be1473ef98eea802a8120d60f67ac7258" Size="192512" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="1632264" />
     <Blob Hash="c4c56f52909a2a37544c5716fc33838bc4140e96" Size="96" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1685017" />
     <Blob Hash="c4c6179f042f9f02fac0b1be8e475a5605bf2074" Size="38573" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1818099" />
     <Blob Hash="c4c937841bc00741a2bb3b8f21fd1a015ba2afc9" Size="6464" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1631709" />
     <Blob Hash="c4cc96c6c1f4b50e786402aac48418ab077492c5" Size="302352" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="580829" />
-    <Blob Hash="c4cd56675d7658f5aa17d2cd83d143d7ed770156" Size="2440" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2089954" />
+    <Blob Hash="c4cd56675d7658f5aa17d2cd83d143d7ed770156" Size="2440" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2008906" />
+    <Blob Hash="c4ce04638d0d5c4066dedeaff25644c02def733e" Size="37185754" PackHash="f46da1339625d443d0aa9d8c3cb340912ba53449" PackOffset="8" />
     <Blob Hash="c4d13490587628d892bc8e9ec6565e350205f33c" Size="18605" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="203673" />
     <Blob Hash="c4d40d8ecebe2483df65e7bee201cef4d69d9438" Size="2597" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1961127" />
-    <Blob Hash="c4d5bbfc8fed8e32278aee3cef229f1cf968171f" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553723" />
+    <Blob Hash="c4d5bbfc8fed8e32278aee3cef229f1cf968171f" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672955" />
     <Blob Hash="c4d5de6cde846ce6926547feb54736a609866e09" Size="39248" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1690161" />
     <Blob Hash="c4d64cc23df55bb365bb028db10cfa00419b6f46" Size="389" PackHash="2d444ab79237d1419d4843c8b6f056ccbcd23500" PackOffset="2096280" />
     <Blob Hash="c4d68c6e2fd713ba8869ee4d54e165bdfde3eefb" Size="1236" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1297432" />
     <Blob Hash="c4dc3e2b1780717396e578cd12a16d60dfa2a61c" Size="374" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="354562" />
-    <Blob Hash="c4debcc4a3f6c336c28d3a0cd0010b42f71b3f7f" Size="67" PackHash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" PackOffset="2097070" />
-    <Blob Hash="c4e19db4af35b6f24bc980eff9e06f1d230083c4" Size="5073" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1112210" />
+    <Blob Hash="c4debcc4a3f6c336c28d3a0cd0010b42f71b3f7f" Size="67" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="2097086" />
+    <Blob Hash="c4e19db4af35b6f24bc980eff9e06f1d230083c4" Size="5073" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1882154" />
     <Blob Hash="c4e21f411d7b62cefd645e66e15f9d006a44bc65" Size="183" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="402411" />
     <Blob Hash="c4e48b0886ef460f532fb49f00047ec92c432ec0" Size="2512" PackHash="bab459156b689714b3a40d0f6ff5a27bd88703f4" PackOffset="1022148" />
     <Blob Hash="c4e4a44b887a1ad6fb8998c406a1fb27a9900a6a" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="693017" />
@@ -59955,15 +59798,17 @@
     <Blob Hash="c4fb5f0ad173b978a3466883135f9f8007d30b3f" Size="19237" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1909352" />
     <Blob Hash="c50281993dae0c9ec3f09556b2b44e97185a12a1" Size="1594" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2027205" />
     <Blob Hash="c5040948285ea25f7c312c4be848aab1e8e7622f" Size="12960" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="847184" />
+    <Blob Hash="c50919bbf859e67455c30ebf308d3c0c1b6601b3" Size="2356224" PackHash="852eee3d819705b696e772cca82f36c9c0135e4e" PackOffset="8" />
     <Blob Hash="c51693e466eda31b83f6ca3e45caf2d78e298542" Size="5080374" PackHash="17a6d0d6dffba4988261e1a7bc800871ebc6d638" PackOffset="8" />
     <Blob Hash="c5173e8ad4ccd7b548113affad2b3f8232ae9435" Size="7002" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2063178" />
     <Blob Hash="c517c779d63ae7fbabac49cf4c0883a42becd3ce" Size="17802" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1197376" />
-    <Blob Hash="c51909fc597558ce220542b6d6c6d82be70a3ded" Size="1281" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2095176" />
+    <Blob Hash="c51909fc597558ce220542b6d6c6d82be70a3ded" Size="1281" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2095564" />
     <Blob Hash="c51ce55cfe799eb00a98f45e6b5c2c6228838b14" Size="211980" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="1753332" />
     <Blob Hash="c51ebdfa632099fbdf15d21a79d3844e37f7f2f5" Size="137080" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="873619" />
     <Blob Hash="c51ece11b727ae51709ae8456aed04614a00c3bc" Size="116" PackHash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" PackOffset="2097012" />
     <Blob Hash="c521bd05383eaa986d4a5f85683677c81888d48d" Size="3474" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1685854" />
     <Blob Hash="c523903e36c87e8fd91cae887da7d65f2e2a30ee" Size="3693" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1388350" />
+    <Blob Hash="c5275d79c2444cd1031ff47b5baee36975940a2a" Size="47208698" PackHash="54298e616347f8e789d984ffbd853b28f6076599" PackOffset="8" />
     <Blob Hash="c52a38bd217934dee2eadb6a572b592b66117911" Size="6900968" PackHash="74bef15ba87e29994102cd44b59845c6cf474fd0" PackOffset="8" />
     <Blob Hash="c52b707e5584b6900121fbcf14c7fbd4060a78a9" Size="6656" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1234210" />
     <Blob Hash="c52cbe3984d82ee99d58a0f7fd92be7fb4841638" Size="2087420" PackHash="9c45f6155855d24fbb8f12e7a40895df1e55b205" PackOffset="8" />
@@ -59994,7 +59839,7 @@
     <Blob Hash="c569122341edfc80ca00ce32e6ad24e06625b865" Size="385024" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="8" />
     <Blob Hash="c569a50dfa03f08ea69d3c419c2008ed18d4f803" Size="5604" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2072428" />
     <Blob Hash="c56c27e22a27ce2a177287155b56e80869366544" Size="1029" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="2095734" />
-    <Blob Hash="c5715c9f953d173e080cc010462b2d4d2dc607a7" Size="18507" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2050092" />
+    <Blob Hash="c5715c9f953d173e080cc010462b2d4d2dc607a7" Size="18507" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="2078580" />
     <Blob Hash="c574ea624904d08cf3ac8869ee824217400470e9" Size="93913" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="8" />
     <Blob Hash="c575a639609620af7c56430991d0e4c2b50bdec5" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1045194" />
     <Blob Hash="c5767c3b8dc0a0a964799d4e77b6ab3e6fdb8a4c" Size="321" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="263673" />
@@ -60010,17 +59855,18 @@
     <Blob Hash="c589869b3ae622040c972887c773ce6ee6cf3ab6" Size="8061" PackHash="610bdae733c8bc4a8d11f02244beb2646a20919f" PackOffset="8" />
     <Blob Hash="c58ea0d3700437d05f76e2d046cdf05c42b2af02" Size="169785" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="758905" />
     <Blob Hash="c592021acd94f91f4a9f6932cc850bd9651b7311" Size="703" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1337277" />
-    <Blob Hash="c5955b1734874daa54d476873fd20e8510f88779" Size="33647" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1824730" />
+    <Blob Hash="c5955b1734874daa54d476873fd20e8510f88779" Size="33647" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1952784" />
     <Blob Hash="c595813ef5ea75a162f8493ed8d583aa0365eb50" Size="161540" PackHash="5fff97af3c5483b239a3c15166af4227b5332764" PackOffset="304636" />
     <Blob Hash="c595d5159c742b815af89ec8604376e01291f9f1" Size="7954" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="220250" />
     <Blob Hash="c59636c88bc75c3ecae013db19cd6008d24e6667" Size="218060" PackHash="3ce154ee1488f62d7804205c87d8e37504733e7a" PackOffset="691008" />
     <Blob Hash="c596d3facb19f2a87f9dac1389fd8352ef8757c5" Size="4746" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1155611" />
+    <Blob Hash="c59ae9f6d3a7468e49be4b041484a214dd5d18c8" Size="3743704" PackHash="047c57724cc851e897093926dacceaa80fa2848c" PackOffset="8" />
     <Blob Hash="c59b019804e7021e39a4e716d996277a93bc3e4d" Size="48140" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="177059" />
     <Blob Hash="c59e06e038237920f81fa2df8eb0d31a127bd8ae" Size="2210" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1911816" />
     <Blob Hash="c59e2fdcb0fec3eb981ac4fde1fa41f051505039" Size="18643" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2040146" />
-    <Blob Hash="c5a4197a566db1084280148c0e8dd734216fd7b1" Size="632" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1445864" />
-    <Blob Hash="c5a4ae5afc09cb6c35b4914b6cafdc7a417d3406" Size="1595514" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="8" />
-    <Blob Hash="c5aa3166d10e69a1fddc3174461b29e4176a416e" Size="1157376" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="734800" />
+    <Blob Hash="c5a4197a566db1084280148c0e8dd734216fd7b1" Size="632" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1982946" />
+    <Blob Hash="c5a4ae5afc09cb6c35b4914b6cafdc7a417d3406" Size="1595514" PackHash="65292930f06c2bb49ec85a293869511324a919d3" PackOffset="8" />
+    <Blob Hash="c5aa3166d10e69a1fddc3174461b29e4176a416e" Size="1157376" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="734868" />
     <Blob Hash="c5ab961ced1ea3fbdd3f14e845ff4fad986ce6d8" Size="3813" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="8553" />
     <Blob Hash="c5ad31a3d8659c8725ff74071242433a7c46f3b9" Size="2848928" PackHash="c7bd45a00b082707059813da743d494381982a2c" PackOffset="8" />
     <Blob Hash="c5aff046308d5ec673a1ef8a083f42b4fa40bbbf" Size="142464" PackHash="c179a00f7b3f95d459e9dc03d8cf5f197851686e" PackOffset="1367973" />
@@ -60029,23 +59875,24 @@
     <Blob Hash="c5b6502792d02ac1e4eafdf907e29717a19b99a0" Size="4904" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="344584" />
     <Blob Hash="c5b7a9cc625188dfea5e5cae4bb7aa79d7622661" Size="205" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="2096870" />
     <Blob Hash="c5b9d7d6029905d70db188517138fb713e13cd6d" Size="11907" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="2070775" />
-    <Blob Hash="c5ba6f54e6cbe347c60b32f14d46fcc9036f8af7" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548791" />
+    <Blob Hash="c5ba6f54e6cbe347c60b32f14d46fcc9036f8af7" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668022" />
     <Blob Hash="c5bab8b8c7e91d653dd3fa52128a2d29c15bad20" Size="159044" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="425953" />
+    <Blob Hash="c5baef29641d7a8036b3a048ac59bef01d3f1934" Size="16762992" PackHash="5aeca87a199b85a3400f189447722aa662457661" PackOffset="8" />
     <Blob Hash="c5bcc8307baa4ed47fd7339e56cebf5102977d15" Size="78407" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1480727" />
     <Blob Hash="c5bd0451fb39e2a036ffd8e45aacbf6bbbf502b8" Size="2256801" PackHash="b8fba9e46df63833b7031d3cd186e6ac32af7f58" PackOffset="8" />
     <Blob Hash="c5c6af3a995b48cb7b71bc300f9bab5ce1e92a35" Size="12382" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1774501" />
-    <Blob Hash="c5c78c88bdb6ded811ff022fd6d2f6e9c58e8fa1" Size="4320" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1018357" />
+    <Blob Hash="c5c78c88bdb6ded811ff022fd6d2f6e9c58e8fa1" Size="4320" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2065874" />
     <Blob Hash="c5cb0401551f41e6f0f77583e3538f73247db2ab" Size="1637" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1722578" />
-    <Blob Hash="c5cb1d84138b2f51b0f5cf655d6e0124a3208f57" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554338" />
+    <Blob Hash="c5cb1d84138b2f51b0f5cf655d6e0124a3208f57" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673570" />
     <Blob Hash="c5cc70b7cec9f1a9b8b09e2132306dffc2b4a005" Size="15256" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="227799" />
     <Blob Hash="c5cfd6663eba8049db4fb357cad0f99fd6906c9a" Size="403160" PackHash="f5a7447dfbc138217d1807bf84b59d6313ef4a0f" PackOffset="8" />
-    <Blob Hash="c5d0f1b4a7c6692345b4f0d7cc8bf9f9b4409cfb" Size="2204" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1339758" />
+    <Blob Hash="c5d0f1b4a7c6692345b4f0d7cc8bf9f9b4409cfb" Size="2204" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1788660" />
     <Blob Hash="c5d20acd5a52eb70afe55d6a3c57675e428917fd" Size="137731" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="748555" />
     <Blob Hash="c5d6fde2c14200ddb6561d39d4d68acdedcafe14" Size="4590" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="803428" />
     <Blob Hash="c5d99a37e21b06232a5b09a39482d7fbf82f8c9b" Size="5345" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="278924" />
     <Blob Hash="c5daf891ef9ee7ca3b562c42ab3ed717a794fe24" Size="3176" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="452504" />
     <Blob Hash="c5dbddbaf08185ca6f3651654a28455cfa17afed" Size="2895" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="463457" />
-    <Blob Hash="c5dedecd9e1362311d504854b4a791df97c29ad0" Size="3376" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="2088370" />
+    <Blob Hash="c5dedecd9e1362311d504854b4a791df97c29ad0" Size="3376" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2030524" />
     <Blob Hash="c5df208e88220c7a479845555623f1a7984261da" Size="2808" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="998304" />
     <Blob Hash="c5e0900de0b1808ea9b21057bbd889668f92fec2" Size="82061" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1927778" />
     <Blob Hash="c5e0afa48519da3a823c75c60b916673bf479220" Size="41793" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="946520" />
@@ -60066,7 +59913,6 @@
     <Blob Hash="c5fe4f31dcfabebd90f4e4864ef02c687548ec89" Size="1143969" PackHash="2712036814539c2a4f91c20f323dcad0fecc9943" PackOffset="8" />
     <Blob Hash="c5ff637af5c42e8a0d30ed9d84fb25a77012c373" Size="1224" PackHash="042761ed22b382ce9fc7fcc575878ed767cbd5f2" PackOffset="2095110" />
     <Blob Hash="c600fe789a3d374664b662e1c86aed7de1e7670f" Size="15208" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="923248" />
-    <Blob Hash="c60b7ee4ab4ff04eef655c69d3d587fda73b83fe" Size="77738" PackHash="70182d4ffd95b3a1288b6fca57446bba12264d0c" PackOffset="2002496" />
     <Blob Hash="c60cffc34a9f9efa909259003c1e49a04f1caa4d" Size="6136" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2077105" />
     <Blob Hash="c613054d528bb6a2743aec5ca984c66569cf48f0" Size="20562" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="297650" />
     <Blob Hash="c617357de0d3d0fcbc77fd0be4867aed2b10a3a8" Size="304416" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="396531" />
@@ -60074,7 +59920,7 @@
     <Blob Hash="c61cc6bbfbe48525509521e96a1af07abcab5f2b" Size="38880" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="636707" />
     <Blob Hash="c61ed7ac0f0557a40480bcf9d3b71915da9bb943" Size="799408" PackHash="1625b44d3d9ca0356d470e794ffd8decb7d76ace" PackOffset="1203208" />
     <Blob Hash="c62411e63c71fedc01191a847a615d4cf75ff7fd" Size="1920" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="784898" />
-    <Blob Hash="c6255345f378c99fcdd1f6394e4b44489847cc09" Size="1033" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1300400" />
+    <Blob Hash="c6255345f378c99fcdd1f6394e4b44489847cc09" Size="1033" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1749302" />
     <Blob Hash="c62bd3be38ceea4525f417bf5ca5b5a12638e830" Size="105065" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1594983" />
     <Blob Hash="c62e3bd1dd7c17408bd5a2b742148440f05278cc" Size="15198" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="604807" />
     <Blob Hash="c63064032a8c15cef1cc111aa47f3872a1c6a793" Size="3459" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="950230" />
@@ -60085,6 +59931,7 @@
     <Blob Hash="c639486a8dba89aa419b09df812956bf3f467dbf" Size="6289" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1332572" />
     <Blob Hash="c63957430c48f085925c432f5da156d1ca1da7a9" Size="15064" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2016032" />
     <Blob Hash="c63a8ce94f7b0a2dad44da452d98dee58f03e000" Size="1576" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="171888" />
+    <Blob Hash="c63aeb18c695bfae16baf15c41806cdb684beb08" Size="886560" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="8" />
     <Blob Hash="c63fd84873001fdfe1efa748ee446fb11bde8ea7" Size="832322" PackHash="4f8b964b00d985632b9a5db95d5f9dd5455995b4" PackOffset="8" />
     <Blob Hash="c6400daab867eb032a79ad20dffa4d9249994498" Size="102741887" PackHash="692b4db8db9cfd65bfced1026a78b41eb9142968" PackOffset="8" />
     <Blob Hash="c64580f6ef70e481206e0c9c0f89f27e46c5bab3" Size="21194" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1006242" />
@@ -60104,9 +59951,8 @@
     <Blob Hash="c6607712f771f03c6d9e440137dbcfd8a373572b" Size="132" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="453762" />
     <Blob Hash="c66173feb21761aea649301d77fbb77acf3a6fb1" Size="611" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1660135" />
     <Blob Hash="c664658585563c55c79101bc579bd0be195e489d" Size="1096192" PackHash="517b535db215769b84dd1d1729a0e45adfe96af7" PackOffset="823304" />
-    <Blob Hash="c6674e4af3bee9e246037324edad5c49853e6701" Size="164330318" PackHash="ab5ce48cef2165e95219a668ba5d244f4cfb3505" PackOffset="8" />
     <Blob Hash="c670b2c1ac9cd5f142d6c3c11b486d3c4422a6d5" Size="6154" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="856792" />
-    <Blob Hash="c6757b8b5611b0d47ee38433a20fed484e3b6bde" Size="4014" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1315654" />
+    <Blob Hash="c6757b8b5611b0d47ee38433a20fed484e3b6bde" Size="4014" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1436680" />
     <Blob Hash="c67834ee2b0724f5ae101614b83e89a10bcccd41" Size="4508" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="379429" />
     <Blob Hash="c6794058bbba90ef8970e1cbc5547db5325f8d78" Size="364532" PackHash="61edd2f04c73c5c3eca0bfae13c92213516504e3" PackOffset="1570757" />
     <Blob Hash="c67a0836b7f676418de8640b6a564e137a24de96" Size="4355" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1887950" />
@@ -60120,7 +59966,7 @@
     <Blob Hash="c687e226b9f8d1fcbf92df86aafa67e695e33a45" Size="329" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="610037" />
     <Blob Hash="c689d3e84a090982291374f4f048b5de082896fe" Size="53596" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="1989139" />
     <Blob Hash="c68ea93a43c9951f305533486a9c2bd11b2f56db" Size="2966" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1230" />
-    <Blob Hash="c69105594779227180c62e2f0eca4b5b6e64eb61" Size="54926" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1185027" />
+    <Blob Hash="c69105594779227180c62e2f0eca4b5b6e64eb61" Size="54926" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1950011" />
     <Blob Hash="c6935d04d5d9f8752d8ef7254c43a10f7888fada" Size="57212" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1718356" />
     <Blob Hash="c69468cd3540b97b6d922e718a795e724bb01778" Size="3261" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="918626" />
     <Blob Hash="c699ef1dab0a34635ea2c9f435c3f5227997333f" Size="33669" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="18706" />
@@ -60132,13 +59978,12 @@
     <Blob Hash="c6a8451fb7bb69f36bb635faa8cd71741fd546a0" Size="4734" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="723703" />
     <Blob Hash="c6a99b4b819896fd66c4360dbb85ef2363274493" Size="583900" PackHash="858de213a099ae751d4748be354bdddec041c44b" PackOffset="1420578" />
     <Blob Hash="c6abcfbecee21a9a2340ab52d53cb55f9b689e12" Size="21763" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="2017624" />
-    <Blob Hash="c6ad7ed046118020b661d9a7f365098d596d6881" Size="2560" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1753944" />
+    <Blob Hash="c6ad7ed046118020b661d9a7f365098d596d6881" Size="2560" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1873176" />
     <Blob Hash="c6aeefa8ddbfd3180282ca6f2e81942fcb774d97" Size="73817" PackHash="23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" PackOffset="2014741" />
     <Blob Hash="c6b2ad032e4dd42c09bd3221bcf318d7ce19d9be" Size="958" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="276211" />
     <Blob Hash="c6b6497bc5c1c94db6cd0f35a8afa3af491f11d2" Size="24254200" PackHash="45e7d5480ef877b62bd1a32c7e53fbca1b0c8e27" PackOffset="8" />
     <Blob Hash="c6b7c47f6cfcef405c937477adf64274c0298098" Size="18099" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1724825" />
-    <Blob Hash="c6b7f5219c4056caa9d2b91149fbf25879df0e1f" Size="3452592" PackHash="1b2fe0f0177c2fcf7eb7c557d0da35c8629ddd6f" PackOffset="8" />
-    <Blob Hash="c6b8c14446489934e363bf2d94e7bad3f632760d" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553073" />
+    <Blob Hash="c6b8c14446489934e363bf2d94e7bad3f632760d" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672305" />
     <Blob Hash="c6b99d8cca1a659f191c61c2c8ad662d3f68daad" Size="1997136" PackHash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" PackOffset="8" />
     <Blob Hash="c6c06b01c1295ff9f75547b70364bd4e5171b1df" Size="17402" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1347333" />
     <Blob Hash="c6c479f9aa8fbb6d6bbec6acc374e971d142e818" Size="10500" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="1533797" />
@@ -60153,7 +59998,7 @@
     <Blob Hash="c6d1e5eac6a72cce738e465c8aa32cc76fd1ddc7" Size="8100" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1261873" />
     <Blob Hash="c6d30d9edb19f5b8d464c5faff00d5132148b307" Size="18260" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="117278" />
     <Blob Hash="c6d4b5b00b5a69be5e9893ad025f0b9d467b1fc0" Size="92253" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1056561" />
-    <Blob Hash="c6d5f1ea3b6eb1644babf872df13af02c2173cd0" Size="173" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1606498" />
+    <Blob Hash="c6d5f1ea3b6eb1644babf872df13af02c2173cd0" Size="173" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1725730" />
     <Blob Hash="c6d8cc124c3987d6a4e101e64dc249cd66dfe714" Size="8519" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1523968" />
     <Blob Hash="c6d9e2979c18595d1a09e22787bd3b1669bf1a3d" Size="196" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1345100" />
     <Blob Hash="c6da71c67ec675477314092fa166e8df6ce6354c" Size="49766180" PackHash="ae4776c41078a7a23381069c264943dbb1e0669c" PackOffset="8" />
@@ -60166,7 +60011,7 @@
     <Blob Hash="c6e9a36f226ff6ce68481bfc8ca1437d257e114e" Size="213212" PackHash="a72777b59db815500e14e5d580278ca8aeb0af3c" PackOffset="985677" />
     <Blob Hash="c6eee1c1e46c61a7d968aca81404a250c9a9c3b1" Size="739" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="128325" />
     <Blob Hash="c6f0526e4a13256f984932819aa742dd2dfd11aa" Size="75801" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="1686422" />
-    <Blob Hash="c6f37199e41cfebe07740a2d71428bb74ed7f17b" Size="22642" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="2061676" />
+    <Blob Hash="c6f37199e41cfebe07740a2d71428bb74ed7f17b" Size="22642" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1725728" />
     <Blob Hash="c6f44f3b8cec30b3124e83ea73a354d0fd39bc44" Size="7594" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1901165" />
     <Blob Hash="c6f73e9ece16ac757c87aae6034279d47e930365" Size="438" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2095415" />
     <Blob Hash="c6f7b25292475c3e58c0f7d119c1209f9bd8e0f9" Size="11350" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1113141" />
@@ -60177,7 +60022,6 @@
     <Blob Hash="c70393185d27ae8b49a117e6dcc18bc5f8f3a1c3" Size="1254803" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="8" />
     <Blob Hash="c70a7a2f9219afb66834e50381cd5a228de5e287" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096857" />
     <Blob Hash="c70dd12d7c7cd5887ae003404c7220d171bc4629" Size="959" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2084205" />
-    <Blob Hash="c70f955af760e625983bb4cc96b6115a125ca00b" Size="161696" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="326040" />
     <Blob Hash="c71237654c5eace920ccf40b4b72366a0e870ea9" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2077334" />
     <Blob Hash="c712ee31bf8a5b1f6a1de425c63ba3df937dcaff" Size="16003" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="684139" />
     <Blob Hash="c713bdc0669507d01643903365c56feb456e2e2a" Size="7891" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="346057" />
@@ -60221,7 +60065,7 @@
     <Blob Hash="c7619a05a834efb901c57dcfec2c9e625f42428f" Size="1138" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1216148" />
     <Blob Hash="c761aa7cefed34120fecf822addde47ed6e1aec2" Size="2247" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="668629" />
     <Blob Hash="c762a93878c624d08a93f4cd8a649b40a84bdac9" Size="3468" PackHash="f5afbf7abcf77972aee12be2b84779a385983b9d" PackOffset="3233" />
-    <Blob Hash="c7633385cab5ab60e1346115325b017ca8610dc8" Size="689" PackHash="485a88ed24518826757099116b52597069515a74" PackOffset="2096364" />
+    <Blob Hash="c7633385cab5ab60e1346115325b017ca8610dc8" Size="689" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="2096466" />
     <Blob Hash="c7657d47b7deb9713080c2e3e74e4aba564ba278" Size="73375" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="479207" />
     <Blob Hash="c7658e32b576d805993ef6d89e60f1ad747331c7" Size="31244" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="249062" />
     <Blob Hash="c76ee58f2dc789b5c54f4e149535708c221c0d3d" Size="1249187" PackHash="788022e3bc41bf23e517d88df0ca24f715b1cad4" PackOffset="8" />
@@ -60229,7 +60073,6 @@
     <Blob Hash="c7741f7a5a908b11d851614e47b0fa53f721767b" Size="5586" PackHash="087c1a3a89d641b852ee6a556850960671ea9282" PackOffset="1844057" />
     <Blob Hash="c7746f7d3e61a7f4931117315d624b17eac20e87" Size="1615" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="608522" />
     <Blob Hash="c7764d3756fb93d1548cd306dea4ca238b72fb6d" Size="38852" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1747466" />
-    <Blob Hash="c776a677b5fc929d114e686e82150037b4f60116" Size="554614" PackHash="8557924e60fcdd015907d69d205b21d58fccf17f" PackOffset="1415288" />
     <Blob Hash="c77b023acbc13c3119713f8a133785a25f7b8b33" Size="188" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="2096961" />
     <Blob Hash="c77e24feeb1db2252ceb89db8bdd0bfc0a2a697e" Size="10687" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="789689" />
     <Blob Hash="c781d10b346b3051d93efc7b28b06a7df344cb6a" Size="459776" PackHash="54b1f91ec773e40dd9e245020576fe5b2999d4d0" PackOffset="1289224" />
@@ -60241,7 +60084,6 @@
     <Blob Hash="c78ca59a426f95c6f2cfc0a13bc60a800837e2b5" Size="29220" PackHash="567807ac295099a07a6c59a7bff568f21dd14860" PackOffset="396872" />
     <Blob Hash="c78d32ffb1ce22f3cfcf2d460e5684598a7e59d9" Size="8126" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="631205" />
     <Blob Hash="c78dce72f71483570d93e67c5c4c0fc35f680922" Size="5239" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="877496" />
-    <Blob Hash="c78e3c39b26d871f12f38bb3eb62b86e2a18f090" Size="2039808" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="8" />
     <Blob Hash="c797eba98c1cc4c67a9ecfbc11ce2fbeb6608a3c" Size="5094" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="518693" />
     <Blob Hash="c7991be2ea09b90ae302f6e336a4e620f79eee40" Size="1280" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1211763" />
     <Blob Hash="c79a107281d1d81c9ea326bb8e9f78541f95e833" Size="19770824" PackHash="4ad2adde2c5542ad4b14daf22e6556d15bb41b89" PackOffset="8" />
@@ -60289,11 +60131,9 @@
     <Blob Hash="c8095ab371b685fccccbea9baf39396912af85ad" Size="138984" PackHash="0851da62d0e5f3dd0e00512bd0e43cf65963ca41" PackOffset="1083751" />
     <Blob Hash="c809fff74efbe9773ab464a92638b4b51fc6c4f6" Size="99182" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="1259000" />
     <Blob Hash="c80a7be7c078a6ab4ba0dfe8bfe1ada3aefb5183" Size="5570" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2088740" />
-    <Blob Hash="c80b72b8b7b2130593d261836ccb7abfe4bb462a" Size="2397776" PackHash="3c9129c75fcba3e3e402e5591e2e6040d9e83629" PackOffset="8" />
     <Blob Hash="c80d9a1e8041783c28f23c7e3d01ae5d84f95e0d" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="618659" />
     <Blob Hash="c80eaec64c10308d1e505419d5a4070e138120d3" Size="4554" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1530937" />
-    <Blob Hash="c812413dba8bd29b4e9d6b44366efc2a8f286aaf" Size="108368" PackHash="1bdfb2089d50fef664ddd40f88773779551a6963" PackOffset="1948544" />
-    <Blob Hash="c81ae6a98692aa8b2f06535a14d50ca071c92768" Size="710" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1046324" />
+    <Blob Hash="c81ae6a98692aa8b2f06535a14d50ca071c92768" Size="710" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2094300" />
     <Blob Hash="c822ec6b2aedc1d6ef468790be995f38066d02d5" Size="80853" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1279665" />
     <Blob Hash="c823a073d0c7a0b64a0a49fb729ce850fade13d9" Size="1640264" PackHash="7f00c380f25858c6ca3b906b06dc3b7812b02016" PackOffset="8" />
     <Blob Hash="c82673eadc4752089a13692fbd6c600c89e23632" Size="4127" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="918862" />
@@ -60301,10 +60141,8 @@
     <Blob Hash="c82cd733989dee915dfc7a07bd6a8e2337f5c7ef" Size="1204" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1654022" />
     <Blob Hash="c82f0785b19317df83271e8e40408df31a0f24b6" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1356198" />
     <Blob Hash="c83116cda80d1e66350906bcb6788df69e6a9f9d" Size="33781" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="110238" />
-    <Blob Hash="c8339291db65e241f1f424ec1f76d70a57eb7a87" Size="3376" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="2090192" />
     <Blob Hash="c8383bdec29f3a622cd4858f2e243c28b997cf2e" Size="3230212" PackHash="8d8759a5eb78c9e0c8bc16ba6be4b64bde2e11fe" PackOffset="8" />
     <Blob Hash="c83ac4b7bafec11e68f35adee01f16aa6fefa7b6" Size="620" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2021071" />
-    <Blob Hash="c83f2d111654d5dc57feab25de949b1bcd660366" Size="37185754" PackHash="f6b73f59f94d091ce2177ebccade24985c48236d" PackOffset="8" />
     <Blob Hash="c8417f772bf007b48457185338b64f548d08f38a" Size="1232" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="701439" />
     <Blob Hash="c841d18ec1a2929ab0412dc40cdc6710e3b56282" Size="9142" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="567896" />
     <Blob Hash="c84362e9b3d10d4d14563d7129bce2bac2c784da" Size="3338" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="307838" />
@@ -60318,6 +60156,7 @@
     <Blob Hash="c84cb7a54fe29d989bb2ff6de9dc2aa4b625a7a7" Size="943801" PackHash="e2844d1cb41a532700afd48dffec9acdf53a5ba6" PackOffset="8" />
     <Blob Hash="c84dcdda8159ea59f66f8bdd9aba76f3d677f835" Size="43130" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="819564" />
     <Blob Hash="c84dff936288ca8cfe474e625bccc58d767ef034" Size="2829" PackHash="467682e3e9d2dda05e47939fe633ed2361a97d07" PackOffset="2092839" />
+    <Blob Hash="c85247fba8818c11d0f03db53b7623197f1201ba" Size="68680" PackHash="3e8ca6fa45738d107b047936e9138aaecd079a4f" PackOffset="2019748" />
     <Blob Hash="c853d960cb802685fb186a0895a44605b9387228" Size="44" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2097076" />
     <Blob Hash="c854706b80d5406cdaab30c185187187ea4baed9" Size="11017" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="2081542" />
     <Blob Hash="c85601d00f78c5f101f135938fe8abd221e94a59" Size="6956" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1816122" />
@@ -60347,6 +60186,7 @@
     <Blob Hash="c88117f16a0ae4ccb4f3d3c8e733d213de654b04" Size="21184" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="1034336" />
     <Blob Hash="c884580c0975268c9337b2cacf66392f5d4b90c2" Size="3528" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="510496" />
     <Blob Hash="c8871d26f1b41160e7195c97399bd35b5532bf0b" Size="3369" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="950129" />
+    <Blob Hash="c88839fe7e69f3818d3f4a144f4ca6cc093373fd" Size="6655158" PackHash="e97bda8b11b604c3b5815d1fd4007f8b09e538d4" PackOffset="8" />
     <Blob Hash="c88b5fe3bcacffd05ecb9f0df614f1179ae7a263" Size="14967" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="1863946" />
     <Blob Hash="c88b6b4f35893e236fce0c7d2337fe7c46874fae" Size="1401902" PackHash="b9a20019362a0c15707ceddcad29b94fdd8df1b5" PackOffset="8" />
     <Blob Hash="c88ced1f5289e26ca6d79092d036bd4eb7b47a6d" Size="3296" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="724667" />
@@ -60354,7 +60194,6 @@
     <Blob Hash="c88e4889d02022a65615d024d8aacd0557f3e4f0" Size="120" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1017760" />
     <Blob Hash="c88eaa6abb02310014860ad7cf656a3f912edeb5" Size="4297" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="491751" />
     <Blob Hash="c88fbd9dd94fbb7f6ebf9bbe12732b8e2e2d8614" Size="1765" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="631135" />
-    <Blob Hash="c8911c926cf1c0b8c0243dd32372c29ffa5ea860" Size="7783" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1745221" />
     <Blob Hash="c891fe960913a22babdc2c8e9f0a700b7c1ebd6f" Size="40" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096702" />
     <Blob Hash="c893b82224c8ef282db2e16a5bbcc3a21c49b6fe" Size="8662" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="533922" />
     <Blob Hash="c89bf4ed0a98e470f595c8df3dd063339d954741" Size="133632" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="755720" />
@@ -60362,7 +60201,7 @@
     <Blob Hash="c8a1835fbb207ef09388196ae2d3512cc4d589ab" Size="54880" PackHash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" PackOffset="1699068" />
     <Blob Hash="c8a293cdc28eb91363b5d4fa38542c1147c3f790" Size="32" PackHash="956439f4f593dd99bb674551a18e3dfd57836690" PackOffset="2097069" />
     <Blob Hash="c8ab19d20a9b512d428b3ff4c3baaadbe54c18c1" Size="7654" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1248784" />
-    <Blob Hash="c8ab1d36c6e3c1f2977137c1a253dab40f45086c" Size="5854" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2056538" />
+    <Blob Hash="c8ab1d36c6e3c1f2977137c1a253dab40f45086c" Size="5854" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1796765" />
     <Blob Hash="c8adf82b453022dd39d36147e177f8f0bf1becb0" Size="3667" PackHash="c953e731e44adedfa139c220d54fb0428109565a" PackOffset="2090131" />
     <Blob Hash="c8ae54865994c07286abead132dd23a6a0986c14" Size="503" PackHash="c7abd8711d268ebef7f39b9803a39439bb5ce0a5" PackOffset="8" />
     <Blob Hash="c8aec135790adeeeb963974aa4a109254aeacdc8" Size="4457" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="700040" />
@@ -60370,18 +60209,16 @@
     <Blob Hash="c8b2dabf54f311c94e1b39ac5a7c9ac32dd91edd" Size="2850" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2000314" />
     <Blob Hash="c8b33f3464140fee333299bb61eaf3d7e94dea92" Size="3788" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="696198" />
     <Blob Hash="c8b3d084d3e831eff6ecef71b2029545f214c3d4" Size="1113" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2048619" />
-    <Blob Hash="c8b9af67f21dbb1e506a3623d0605de8e18a7c0b" Size="3651" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1263806" />
+    <Blob Hash="c8b9af67f21dbb1e506a3623d0605de8e18a7c0b" Size="3651" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1712708" />
     <Blob Hash="c8ba63f22096ec377b2e780cc42e25af5127d75a" Size="75775" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="1735359" />
     <Blob Hash="c8baf8bc429d98debbace540d2e8cc772f9b604a" Size="1849" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="2028334" />
     <Blob Hash="c8bced5f17a34e6958bcb713ca5b8821dd55c5df" Size="906" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="136354" />
     <Blob Hash="c8bd972303f4d02c96bf7951a1f1a54a8b3e6343" Size="20471" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="359229" />
     <Blob Hash="c8be5b0c93e15508575dabf6610d16b0d43edecb" Size="12288" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1580920" />
-    <Blob Hash="c8be7bd1aec1d77dc4994175217a32e91cae80cb" Size="248146" PackHash="04e83b9b704ff752417e560945db286740e82003" PackOffset="1779452" />
     <Blob Hash="c8be8b6ce69c4b35a4cf7723fb6dd7fee4e872e0" Size="279598" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="8" />
     <Blob Hash="c8bf0ce22b77f8700b3c8ba618518fd8a5ab1f0d" Size="35964" PackHash="7c5339b6b1382c59c12893376db1f10162f6653a" PackOffset="2021803" />
     <Blob Hash="c8c0bcb72b19f554cf1f3a9a55e04a8f79c31be8" Size="8394" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1401146" />
-    <Blob Hash="c8c58ae04d38bf58622b156c64243ec865ee0aa1" Size="3039010" PackHash="c7ade6d20b67775d4c808eb41a71a00dc97a2963" PackOffset="8" />
-    <Blob Hash="c8c65a782a002b6e13b004b401d1a5cdd1cda7c9" Size="6734" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1945246" />
+    <Blob Hash="c8c65a782a002b6e13b004b401d1a5cdd1cda7c9" Size="6734" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2002649" />
     <Blob Hash="c8c66a627017114085d3fdcd36b683275f47ab0e" Size="1422" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="2087932" />
     <Blob Hash="c8cc01bad73b9a4955a737c8fcabfc503c622aab" Size="20356" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="359314" />
     <Blob Hash="c8ce4205eb15da92dc103d127941c70904046c29" Size="776" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2085164" />
@@ -60405,26 +60242,26 @@
     <Blob Hash="c906013cbd95ff37df7d2b0bf38ec11f4a3051a9" Size="29712" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="31324" />
     <Blob Hash="c906eeb71cde1eae554925039bdb19db5b06e01b" Size="3669" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="799501" />
     <Blob Hash="c9078bb8cb12d764ecb510caca5eff6ee3574a49" Size="20794480" PackHash="ad476822223f902f64a71ab30e6d92cfd1180d29" PackOffset="8" />
+    <Blob Hash="c9095ae67fa7f236cd029f9bfb176d4aa0335ac0" Size="20083840" PackHash="ca240b74a1bbcceb9a16c3c6255b7d10cd7d5fe6" PackOffset="8" />
     <Blob Hash="c9098bf08c13c5ea94cd33aa332466c77eaa2ca4" Size="483" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2096379" />
     <Blob Hash="c909d26df745d1656b368c1ead664bc2f40023ae" Size="46634" PackHash="8db91240f50319e0e8effc5d85d3074c2dbb23ca" PackOffset="2001875" />
     <Blob Hash="c90ae42e298e666c042c53f9cf74f1d90c25d19c" Size="15908" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="969552" />
     <Blob Hash="c90ef2a8291de589bc12d0a5b8af2f0b00feb7cd" Size="295" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1037201" />
     <Blob Hash="c916a8d0ced620451df89c4dc32f94f71dc3fd01" Size="235552" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="744575" />
-    <Blob Hash="c918df57dd7cd774815f7fd39c5c1a925b073e66" Size="412" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2096715" />
+    <Blob Hash="c918df57dd7cd774815f7fd39c5c1a925b073e66" Size="412" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2093065" />
     <Blob Hash="c91a18d8c1444ab7ae574a1826e2cfbaf8e5f95b" Size="430692" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="415414" />
-    <Blob Hash="c91b14bd430e7d6460238c84cf19cea5e47a8d32" Size="116224" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="587872" />
     <Blob Hash="c91d88d905cc4dc10034ca1e5b60ed937077cfb6" Size="2880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1961754" />
     <Blob Hash="c91e2b841572a8f0d80c26f24129d78f39b81dfa" Size="604634" PackHash="33f3679a1b6d3e7da34456a34dca2562859d1801" PackOffset="1352353" />
     <Blob Hash="c91f16d40a84c7efa0fffdb3c6655873a0536b96" Size="3184" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1315440" />
     <Blob Hash="c91f1d5c19fdf8e67d6e5b856223c6d6fc310eef" Size="13272" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="778638" />
     <Blob Hash="c92089f90845bd99851a02970124c2b16ac23a43" Size="145774" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="1441200" />
-    <Blob Hash="c920d0db70eb7b8680dec895fb5dfc6ca964c6bc" Size="1056166" PackHash="141031efaf451d2e472cd328bb1fefd91ab2ecf5" PackOffset="8" />
     <Blob Hash="c9228fa9085807fa2014de306719b5c40314082c" Size="6923" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="917594" />
     <Blob Hash="c925dba7ebd8d94e0b3626b27cf49a30d2aa9872" Size="26624" PackHash="66fce169b160f3c4cb868bda8653b37692b5692b" PackOffset="2069512" />
     <Blob Hash="c926af9c864c69667455cf02a66e79e9758d9c1a" Size="29456" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="817823" />
     <Blob Hash="c9278f8a6bca2133ec5b8e01d0dd51245616c0e8" Size="37408" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1674755" />
     <Blob Hash="c92d24831f3052686f49d2f543bc2ff349260ed0" Size="288" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="345736" />
     <Blob Hash="c92f18a0f2c4c86456b02c5d308c42fd0ff7d149" Size="4436" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="135729" />
+    <Blob Hash="c92f97e652a4568dc41745209d5407866d10617b" Size="160510" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1065992" />
     <Blob Hash="c9348fead0624a0ee013715c76c539e432092eb8" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2096154" />
     <Blob Hash="c9373a54f3e6f980a5fd12edb7ee61d52fdd82f9" Size="22058" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="135059" />
     <Blob Hash="c93bccfa16625a471bca83bb6f71760d11cfa051" Size="3445" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="2075385" />
@@ -60435,7 +60272,7 @@
     <Blob Hash="c9489c368b31967d43cea7a377adf6d9da9a74ba" Size="5016" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1535005" />
     <Blob Hash="c9493a690281e4796fee65a6bbcc4323e96f4dfd" Size="120832" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="1794056" />
     <Blob Hash="c949ad4abb09a8c6fd296f7c64bf2d122e830c69" Size="274" PackHash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" PackOffset="2096640" />
-    <Blob Hash="c94e79daed3f9b812706f3b28dcf52f7fffc3fdd" Size="391" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1360624" />
+    <Blob Hash="c94e79daed3f9b812706f3b28dcf52f7fffc3fdd" Size="391" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1809526" />
     <Blob Hash="c950706ae19f4fa2cb9491d386625a6677834f5a" Size="3591" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="908224" />
     <Blob Hash="c950788221bc5936212574add3556b632a629618" Size="916" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1807924" />
     <Blob Hash="c9513c318d47d72425e97e425a34492ec37de106" Size="4076182" PackHash="3305fb385880089683ddb7a84778273d8ff85d09" PackOffset="8" />
@@ -60455,6 +60292,7 @@
     <Blob Hash="c96d0131ceb77c729cec652b41395993a63c5762" Size="1907" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="2091991" />
     <Blob Hash="c96ee37a0d5a3169d214e4b42d1287a007ed2995" Size="690" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1914982" />
     <Blob Hash="c971b9aa84c6340716656c6b7f6898bb6bf1b8f1" Size="204" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="122370" />
+    <Blob Hash="c9721f30a778ce2879ea41786d16b94242bfcfa8" Size="149057" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1671749" />
     <Blob Hash="c9724d5a358c368a4f7a20fe35a35760765ce869" Size="19237" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="8" />
     <Blob Hash="c974e7505004064e7d5674e573da94d26b6f8e37" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2096955" />
     <Blob Hash="c97df8a699253ac1e6d83ef5d465f7df3b029b0e" Size="99496" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="129363" />
@@ -60467,42 +60305,41 @@
     <Blob Hash="c989c8460656756665eb61ba2bbee1acd063ac08" Size="134996" PackHash="4fbda194b6083d60ec1a9e281eb6caad5716cf1e" PackOffset="33672" />
     <Blob Hash="c98b1395197155b590fd40e794561c3640e9e89e" Size="18752" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="440383" />
     <Blob Hash="c98bd54e8163cf7f8793e9b07628e46128b011dc" Size="228" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2092024" />
+    <Blob Hash="c98c45afda9f064917ea5efa2bc4be3eb7a513f8" Size="2315074" PackHash="e268f21188c6112409f35cfe3f83619524b21cc5" PackOffset="8" />
     <Blob Hash="c98ce95e0107a0fb1dec0729c47b02a14db36398" Size="336" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1250101" />
-    <Blob Hash="c991b7186959be7ebda4bf1c2865dd2153f69789" Size="5342" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1977892" />
+    <Blob Hash="c991b7186959be7ebda4bf1c2865dd2153f69789" Size="5342" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1718119" />
     <Blob Hash="c9941f010e987c8ffab7b51cadc052ef30db6b0f" Size="2906" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1288254" />
-    <Blob Hash="c996d1d583adc6b3993baf53524080ad6a23bef3" Size="2037920" PackHash="9304643e78939135344c8ce298a2a1eee1096046" PackOffset="8" />
     <Blob Hash="c9973267a7708ab948b75ddc7df7c05cc4fd18b6" Size="220860" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="654176" />
-    <Blob Hash="c997d68c685a34e52a28e36e4814637f9afb30a2" Size="3488286" PackHash="b821042b565ad5990202a8f1af1becdc2cde36e3" PackOffset="8" />
-    <Blob Hash="c99a358c823788b2a72c4c5418acdeaac1aa2af2" Size="14448" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2043208" />
+    <Blob Hash="c99a358c823788b2a72c4c5418acdeaac1aa2af2" Size="14448" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="2076216" />
     <Blob Hash="c99a48095f8ce1d8a2c7690de942ea3f45a09639" Size="202813" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1858295" />
     <Blob Hash="c99a96adb7e89a3de110f71a3dd76a4417327bf2" Size="192" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1223147" />
     <Blob Hash="c99d440efb0e4081aa79dfc104267185a6cacc8e" Size="2370" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="994114" />
     <Blob Hash="c9a1a0b2c2da66b27f3ee1361ee48d2a5bf5f17d" Size="544" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2095196" />
     <Blob Hash="c9a55b661b973145df050f14527a06923fb86e0a" Size="7680" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1957357" />
     <Blob Hash="c9a6917fca888d5118a160d8e7a11d94075ecade" Size="245786" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="955753" />
-    <Blob Hash="c9a797aa36bb999c73958a69a516a75960dccac9" Size="19237" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="2077475" />
-    <Blob Hash="c9a806994cd57150766df7bf881757ac75b66cac" Size="233" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1581136" />
+    <Blob Hash="c9a797aa36bb999c73958a69a516a75960dccac9" Size="19237" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="2059904" />
+    <Blob Hash="c9a806994cd57150766df7bf881757ac75b66cac" Size="233" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1700368" />
     <Blob Hash="c9a897636c5d88f4da58bf250c2b83b4855c147d" Size="3994" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1236144" />
     <Blob Hash="c9aa46bd12b94f42954bf888c38a12f768a43a27" Size="3207" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="816001" />
     <Blob Hash="c9ac298b5f1ae053b60a58184753137a635ea4e4" Size="16117" PackHash="bde504e141af1b3d4487c18b5869aca6f206534e" PackOffset="2064052" />
     <Blob Hash="c9b3090b37ce45020e55fb4419f7d0d71d767e64" Size="55275" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1161242" />
     <Blob Hash="c9b7c842be0fb27646ef008f197484abf251fa73" Size="588968" PackHash="ae5a80d9f6baf190f4ab62d63ddec6bd58b356d0" PackOffset="1477914" />
-    <Blob Hash="c9b8f31f3b10c5f30cfde345d07f38922bff1d07" Size="1138" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1311727" />
+    <Blob Hash="c9b8f31f3b10c5f30cfde345d07f38922bff1d07" Size="1138" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1760629" />
     <Blob Hash="c9b93a8a40acabb8644b68868f2ecf84fc16271d" Size="8724" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="374571" />
     <Blob Hash="c9b9d18ba712a280503c2cdd259608a94245a849" Size="68768" PackHash="59715c3fdd3ae349382891542d9450c46656b138" PackOffset="1833652" />
     <Blob Hash="c9bfdfe67b341e197e49e4c3c34691e5ac79f90b" Size="24212" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="658814" />
     <Blob Hash="c9c34c312ef1c40d0613b735e892d8f19a75bef3" Size="12800" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2083668" />
-    <Blob Hash="c9cfb293c2dc51c94e405df6b4eba90e7f6f2a4a" Size="3407088" PackHash="b8c55e4d78281a8c477d7697e4642751b722a9bb" PackOffset="8" />
     <Blob Hash="c9d2136dbc2732563018182ef5c83ba2fff784c0" Size="14848" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1455992" />
     <Blob Hash="c9d3f698efdfeaa610d2bc023b7489c12bbf7b10" Size="46957" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="518776" />
     <Blob Hash="c9d55694ac51eb7385577ce7b688ed3b9212c85c" Size="95801" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="1253292" />
     <Blob Hash="c9d7544de50a6912f9d44170c43ef8013ae5e6d6" Size="2944" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="663343" />
-    <Blob Hash="c9e0ef1c6ad1ad6714dbb79b0547bfc4d9dd3d19" Size="6006" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1996188" />
+    <Blob Hash="c9e0ef1c6ad1ad6714dbb79b0547bfc4d9dd3d19" Size="6006" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2054744" />
     <Blob Hash="c9e17bf4782fc36f84c8a37e879be9de1dd9e48f" Size="6514" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="967870" />
-    <Blob Hash="c9e2c83c3888aaf28e6d1883827621cffa7c561a" Size="51024" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1811606" />
+    <Blob Hash="c9e2c83c3888aaf28e6d1883827621cffa7c561a" Size="51024" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="2026772" />
     <Blob Hash="c9e52dcd5dea69885b427ac17b9c2652ffbe64fd" Size="273992" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="8" />
     <Blob Hash="c9eb93a37af70f4134aa9cf05d914a30fb3201dd" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1822130" />
     <Blob Hash="c9ee0377eb5d3cc8c45818bc740e495b3979717f" Size="238" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2081260" />
+    <Blob Hash="c9efc27d56b9ada9eb7f971cef2495ac0ce02283" Size="1815552" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="8" />
     <Blob Hash="c9eff20718121e1048e6907da55a003105954863" Size="1203" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="603106" />
     <Blob Hash="c9f359ffec40e7cbac32b6981ebaa72a2de57a1f" Size="4329" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="556797" />
     <Blob Hash="c9f4c93ee129bf1292bfdc5a24c2a10f344223c2" Size="3585" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="578141" />
@@ -60511,10 +60348,8 @@
     <Blob Hash="c9f967f04ba338cd63b477aab23b99fd413cdd4f" Size="6334" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="637144" />
     <Blob Hash="c9fe42a58714c938e15bcd92a93064d25b4c31a0" Size="9369" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="641018" />
     <Blob Hash="c9fe4f49e55a98152827b3df61eff7f805d19fb3" Size="492502" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="487564" />
-    <Blob Hash="ca01408cf8c7a53bfc83997f2d806932f8029e73" Size="18944" PackHash="d83cc9c9ccafadd27d18ea51adbb23f71944297f" PackOffset="5640" />
     <Blob Hash="ca03619bddc84777f1bc052e53b746b06caf0766" Size="96" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1706192" />
     <Blob Hash="ca0bd787a51ad9edc02edd679eeeeb3a2932e189" Size="1038" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1011406" />
-    <Blob Hash="ca0c243ae0ab331c7e1aeb4d8ed7a4a73dd9ab97" Size="2825" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="472330" />
     <Blob Hash="ca0c71a1570bce8dfe5b4badb09bbda360b36075" Size="6178" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1642782" />
     <Blob Hash="ca0d7e9b0e57e4f235d7035f5568d43413b0b15d" Size="2368" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="859503" />
     <Blob Hash="ca0d913e29619b2a33ee3fd6aaafe7c50213ca79" Size="1203" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1689556" />
@@ -60529,13 +60364,12 @@
     <Blob Hash="ca2df0b1b5b68f0661549c7b64cf686260476d0f" Size="17879" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="150364" />
     <Blob Hash="ca36984126c261e78d41233a7fc3a595f59ccdac" Size="11933" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="1998872" />
     <Blob Hash="ca3fc602df3cb06b14575c2f1f3e42f891f9191e" Size="1811232" PackHash="622f7c0df2c48bbd56dace7a4588aa734877ebb1" PackOffset="8" />
-    <Blob Hash="ca40fdbb3702597970ddfb0eb5cf604757eb421c" Size="2500" PackHash="0fd5eed8a60e37b2e26485203138f76bc959a273" PackOffset="2092822" />
     <Blob Hash="ca47fa7eab953acdea0ea1acc8a1df85a0d8ca64" Size="970" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="889743" />
     <Blob Hash="ca48db50be4c4d5aeab19693e1215704dade9d66" Size="164" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1588048" />
     <Blob Hash="ca492522c893d16408e7a0ea79f590a3ee634dcf" Size="242297" PackHash="54b1f91ec773e40dd9e245020576fe5b2999d4d0" PackOffset="1749000" />
     <Blob Hash="ca4a917cc113ce9b28470974cc70bea54de1d680" Size="746780" PackHash="6c4b50ee8e8b48c93bd9869e8ef8c28a4bbc91da" PackOffset="814872" />
     <Blob Hash="ca4b0ca7183db6fe1c770094337990597d64de10" Size="103290" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1231720" />
-    <Blob Hash="ca4cc79e1705e6ce517cb46b4c44e56d22f90668" Size="236" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1822307" />
+    <Blob Hash="ca4cc79e1705e6ce517cb46b4c44e56d22f90668" Size="236" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1941539" />
     <Blob Hash="ca51cff0dcc395d463a493479f474fda1733074f" Size="46211" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1699097" />
     <Blob Hash="ca560947c7ee3a30f57b1a03e959864b382fee05" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096980" />
     <Blob Hash="ca5a25ec61b716117660fd30c52466d19b73ce96" Size="172" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="420386" />
@@ -60546,10 +60380,9 @@
     <Blob Hash="ca66f987f5facb383a5c269ad6f9c2a8db9e60cd" Size="1340" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2095122" />
     <Blob Hash="ca6e9324a007590e4e2a4dc2a7a66e8d6fabaa3a" Size="22891" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1449803" />
     <Blob Hash="ca7030cdb29c1bd4715d2045c6eef04194df8ec8" Size="217190" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="235964" />
-    <Blob Hash="ca704ef2a6e48dd96edd2781e0bcdb8815bbb811" Size="3466" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2031963" />
     <Blob Hash="ca71d55fb818c1532c6a5c0659c2ae6d0d3d5010" Size="476" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1522088" />
     <Blob Hash="ca76b5c9cc32aa1b2ff4793eb5878377d216700d" Size="19937" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1955079" />
-    <Blob Hash="ca79083a5de678b7ddb988b3e424a1beeb1c3bb7" Size="9229" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1645748" />
+    <Blob Hash="ca79083a5de678b7ddb988b3e424a1beeb1c3bb7" Size="9229" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1857857" />
     <Blob Hash="ca7909a0c5bf7c7d20839006ff942b5299a9fc07" Size="26199102" PackHash="3e18588c5b8916d8e7dfcd0871160a333eaf500e" PackOffset="8" />
     <Blob Hash="ca7cce626a03d9a7e450732a403ef82100e0d654" Size="6296" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="373182" />
     <Blob Hash="ca7ceca786e8a73aca749360f5e79e327b36427b" Size="22308" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="647142" />
@@ -60572,6 +60405,7 @@
     <Blob Hash="caaa7d6d0e6e6b7d08396756696dc39b3d958570" Size="128051" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="291912" />
     <Blob Hash="caad325bbb1e9000c32ad7d6e564df72d553904e" Size="13209" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="2057994" />
     <Blob Hash="caadb355695c1cfbdd5c46985340b36717c8153e" Size="7273" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="214105" />
+    <Blob Hash="cab43ba563005e7dbbc30db067e3af85b35182d1" Size="76441728" PackHash="a4663c3c6dac346d21f59e6532df11d32975cd5a" PackOffset="8" />
     <Blob Hash="cab4fb1295d816bcefdccd5b304508e716def9e1" Size="112" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2083028" />
     <Blob Hash="cab609e5b5d7dd6a9e4b5f90f2229db37ca3342e" Size="688" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="271217" />
     <Blob Hash="cab7d3457bf664653cf977e34ec7b77dde5d99b4" Size="38188" PackHash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" PackOffset="481" />
@@ -60585,7 +60419,6 @@
     <Blob Hash="cac6bd38a13b2dfccc82d61172d8da383cc2264c" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="692062" />
     <Blob Hash="cacb48fb36a86a2cf668dc1fefeed23580e876e2" Size="3363" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1312210" />
     <Blob Hash="cacc242ef98b4a3b3ba2132a5da62fab4735be99" Size="28619" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="174144" />
-    <Blob Hash="caccd408c463a4333e5131ee4a10e00b7d5b5a48" Size="9050" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2024621" />
     <Blob Hash="caccd84e3f2499806331afd910a407a7da3a6d68" Size="1446" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="629589" />
     <Blob Hash="caccfbde522a05f090a5e88320792838fbcee18b" Size="8075" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1114275" />
     <Blob Hash="cad02d8ea138de5e8a533b45343c08bf65055cb3" Size="7077352" PackHash="b6031fd8e7c7749f931cc4703f065767edfa8a3b" PackOffset="8" />
@@ -60604,10 +60437,10 @@
     <Blob Hash="cb075ce6bd63c45abf00eaf34301d8a7ad9f32f2" Size="7104" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="138044" />
     <Blob Hash="cb084387a7ab489d54dd6e993aae7072655bd498" Size="1002" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="736144" />
     <Blob Hash="cb08d269217d9a54c0218e7d49733088958ec031" Size="2988" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1068571" />
-    <Blob Hash="cb09208ced1597407b309a62e64c6af87e3d8b34" Size="3066" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1334622" />
+    <Blob Hash="cb09208ced1597407b309a62e64c6af87e3d8b34" Size="3066" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1454082" />
     <Blob Hash="cb0dbc2915513f4103f21425226095f1e9023c04" Size="39948" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="1107086" />
     <Blob Hash="cb0f4724d715ea5a5b071698875f75c1e92a7ca5" Size="9528" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="133800" />
-    <Blob Hash="cb10fe757811a2de3ea9c237d1818d7527dce414" Size="797" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1444281" />
+    <Blob Hash="cb10fe757811a2de3ea9c237d1818d7527dce414" Size="797" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1893334" />
     <Blob Hash="cb124731f3c0010fef79dda3bf2cb9c289503f88" Size="26413" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2009861" />
     <Blob Hash="cb12761ada1ce15894122eaba2e993f7a58f7250" Size="1825" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="2090055" />
     <Blob Hash="cb1373f7aa50b0e52c2d24115878e65e9f378d5b" Size="13532" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1227180" />
@@ -60621,7 +60454,7 @@
     <Blob Hash="cb1fa8b512420ab4b7505e6d2a449fc7ac828c22" Size="5380" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1296254" />
     <Blob Hash="cb236da840a49b4bcd261114dca38dada567b091" Size="8605" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1389672" />
     <Blob Hash="cb25a3ecd92424bdc72edbb0bddaf01dc089d1c8" Size="20040" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1777540" />
-    <Blob Hash="cb2f660da0ef720a52f552655a00260fcab0e342" Size="5302880" PackHash="e9281fb867c7a62245c9113c59f9e304f1336d2a" PackOffset="8" />
+    <Blob Hash="cb297904437fda95915430ea4eeccc0425a0978d" Size="5569046" PackHash="9118f05235d6b4bc63a5c2b72e61116160f2071d" PackOffset="8" />
     <Blob Hash="cb31742eb23d892c15d2337068c1a347dc9e1085" Size="6032" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2081396" />
     <Blob Hash="cb3588fa5aa817c1db90be6b6417f36e9493fa36" Size="1086" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2069143" />
     <Blob Hash="cb3d30be58a01219f3bbae44b29df83eee3b3624" Size="4142" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2092534" />
@@ -60649,10 +60482,11 @@
     <Blob Hash="cb63a807009626075ede506ab32c19e805266970" Size="12388" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="780110" />
     <Blob Hash="cb63aba29eec2c41305ca80cfaf3c7be00bad354" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1247904" />
     <Blob Hash="cb675d267511b26c581a3028661943b41ae02fa0" Size="264176" PackHash="86a3ef300ab5182d7d6f3c7e1dec1ab017621176" PackOffset="1822396" />
-    <Blob Hash="cb68cf271de3633a70fdeb220123141237143376" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556255" />
+    <Blob Hash="cb68cf271de3633a70fdeb220123141237143376" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675487" />
     <Blob Hash="cb694e7cb2e5d950532eb0cf8a77521c047793a0" Size="16" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2096953" />
     <Blob Hash="cb6980631b42fdd63bbb158a14debb19326baa09" Size="104378" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="785293" />
     <Blob Hash="cb6b281895d873b84dc31541a6363394a4aac740" Size="8394" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="239500" />
+    <Blob Hash="cb6f080aedddc5c0eeabad1ef1513577aab68254" Size="15538656" PackHash="31d61998dd0d8f9bb7a44d6dd787e40ed8c33f70" PackOffset="8" />
     <Blob Hash="cb73cba1ee22beec8b206c81fef3da52afe359e6" Size="6713" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="613340" />
     <Blob Hash="cb7a7353bfe46b189df33c754c88de89ac229863" Size="6035708" PackHash="9fb4a9e94f7c935385fd64a3d3c2f58144e7118a" PackOffset="8" />
     <Blob Hash="cb81f535fe1fca86ea74c0bd6e1cc7bdbc54050d" Size="1131480" PackHash="d2d500e0cdeedaa2e1dac0af1e2bf48ef99b358d" PackOffset="8" />
@@ -60671,21 +60505,19 @@
     <Blob Hash="cb9d9980bf518e494a2f908cd4162f320bdf3bd9" Size="561756" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="463353" />
     <Blob Hash="cba13ca3e6072d45683bd93e6310dbbbeaa2de8d" Size="6162076" PackHash="f6d16f0f530dd5ba58d86463f7c06f6f573a6809" PackOffset="8" />
     <Blob Hash="cba2a5c9192c38f6ec30a24dace12884354f90cc" Size="910" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2082274" />
-    <Blob Hash="cba49d99d3373be53222950e545837afe6073bbf" Size="2934" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1050558" />
+    <Blob Hash="cba49d99d3373be53222950e545837afe6073bbf" Size="2934" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1220592" />
     <Blob Hash="cba518ce7e50391cb5df7030000ed6cc3dcab837" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1187364" />
     <Blob Hash="cba845011facd2cdfb223b6b1209b245d7ae83d5" Size="5517" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2012842" />
     <Blob Hash="cba86f95518021fcdbfa5990196125231a2ad98e" Size="9208" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1359826" />
     <Blob Hash="cba8d03a5db4893799f4103c09b262f3e8a3c5ab" Size="189" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1524050" />
-    <Blob Hash="cbaa1a327be10d223a04a826388fce25b1afde80" Size="183443076" PackHash="92406919abcf1439061aa14e9cb916e3c147ef91" PackOffset="8" />
-    <Blob Hash="cbab46a69fc32370b528f2023ee045a6af0c7378" Size="1110" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1558964" />
+    <Blob Hash="cbab46a69fc32370b528f2023ee045a6af0c7378" Size="1110" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1678196" />
     <Blob Hash="cbabd5f35230f05a79e7ec63ea1ca47b6a458048" Size="4474" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1195499" />
     <Blob Hash="cbac70370d4b85c4f09586006db0e2dc8b9a0302" Size="175763" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="182038" />
     <Blob Hash="cbae14fc18d2a75dadf3c4bb05eb0df18e124856" Size="327937" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="1748748" />
     <Blob Hash="cbaea15bb365759b8bced82b8c9cbef6216cf895" Size="2962" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1406145" />
     <Blob Hash="cbb0772e69ff494e0ada5121d65c11962a7523d7" Size="9681" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="996583" />
     <Blob Hash="cbb148bdee026b96b2187b1daaff716126c42e44" Size="46619" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1623089" />
-    <Blob Hash="cbb1e8bebc60800e15112aceb5b4ef1e8883a7ba" Size="6673" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1983234" />
-    <Blob Hash="cbb2bdf32e18f6f1fb67443543e90e5f7627c819" Size="204919" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="443400" />
+    <Blob Hash="cbb1e8bebc60800e15112aceb5b4ef1e8883a7ba" Size="6673" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1723461" />
     <Blob Hash="cbb4e9cd600773792c6e9f3e6b27e99c1846b44f" Size="265" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1026643" />
     <Blob Hash="cbb512c88833f20d23ddf76cfad0770684eaa5ba" Size="9617" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1856601" />
     <Blob Hash="cbb5be633c6a3e25cbf8caab91ce174e1603975a" Size="2682" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1370031" />
@@ -60720,6 +60552,7 @@
     <Blob Hash="cc02e6eaed3eff504215109ad49db5637b8cbff8" Size="13741824" PackHash="99d06ac991e188d92911f00def31f2c6e8823b77" PackOffset="8" />
     <Blob Hash="cc070e9af102c47baa5841da250b13b6d99242b3" Size="2344" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1210048" />
     <Blob Hash="cc07ac9f6a5f0b58c96b46b785349a87e24d45af" Size="117760" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1600008" />
+    <Blob Hash="cc0fa8abd39da6de552e825da057f4a1f38361a0" Size="18928" PackHash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" PackOffset="2053290" />
     <Blob Hash="cc0fdc5710d73caac34492d4227a3439dd4c66ef" Size="9472" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1085493" />
     <Blob Hash="cc155d89bb23d09c3ebd5090ca87ec7e537d5363" Size="7654" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="1624254" />
     <Blob Hash="cc1b903b4a5c53cca55de382dbca00965f70f31e" Size="169098" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="1819032" />
@@ -60729,6 +60562,7 @@
     <Blob Hash="cc2be0213e9f0d3b307a8311d7a1013582e8a338" Size="10507" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1231546" />
     <Blob Hash="cc2ce48a767bede65e26181e365fe17f1ab8fedf" Size="485" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1021988" />
     <Blob Hash="cc2e2429f27a530e70cca88d6911af4f614d3f45" Size="81970" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="988050" />
+    <Blob Hash="cc2ee39d5425a0824e83471e92bf6a65cb3c717d" Size="1172592" PackHash="bdd56998f1b3cc7b1f49f5c1af0b926d99af604c" PackOffset="8" />
     <Blob Hash="cc2f4dcaa83f77d596e7137600ed31c1a1c143df" Size="14987" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="973592" />
     <Blob Hash="cc3686b9496b1309dacce207d4acb75d55051931" Size="4448460" PackHash="9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e" PackOffset="8" />
     <Blob Hash="cc36de9f393e7eabdeb3bcbb19e596ababeb5f21" Size="139113" PackHash="4df09dedb5c89d210947d966cbedfbc6267aa7e2" PackOffset="1890255" />
@@ -60742,7 +60576,6 @@
     <Blob Hash="cc4fba6fb544f1c9acc20ec82c1cc0f1a535ea00" Size="64" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2096995" />
     <Blob Hash="cc57ee0ba0469f16762abfa809bbdf2be6bd7225" Size="1071" PackHash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" PackOffset="2088470" />
     <Blob Hash="cc5815df4e39fbcf1e8a3641a43aa24ccd07a8fa" Size="816888" PackHash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" PackOffset="812758" />
-    <Blob Hash="cc5966ff9c17bcead7bf9d1e9ba6322d7e75ad9d" Size="32056802" PackHash="7dbf44f82b8d049f252bb530240619ee1242c9f6" PackOffset="8" />
     <Blob Hash="cc59c01c7faaa0de58b1a89023c9456a6e7cf6f9" Size="280" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1704388" />
     <Blob Hash="cc5c0bb90d847ccbb45688a8da460ad575d64617" Size="219" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1669217" />
     <Blob Hash="cc5f1a861e1cd11e9b3581368595f42a7ea75a94" Size="4782" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1567460" />
@@ -60765,11 +60598,12 @@
     <Blob Hash="cc7ed213614cf3af07b4c528b615a482caea6323" Size="280" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1704108" />
     <Blob Hash="cc80391daaba7ce994c73d7f43ab731ddc9d3912" Size="126117" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="444684" />
     <Blob Hash="cc81b607e5c302ea80dc233c62500d6ac299cb05" Size="2799" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1086124" />
-    <Blob Hash="cc827823f2bdf691994241c5fd0ed72ce054a0bd" Size="1376" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1980358" />
+    <Blob Hash="cc827823f2bdf691994241c5fd0ed72ce054a0bd" Size="1376" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="2089109" />
     <Blob Hash="cc84da0de3f480a28910e2f2d8e0902cf2239e55" Size="14276" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1947560" />
     <Blob Hash="cc86d830475e6af03f45a5200255aa036d043c73" Size="2229" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2050434" />
     <Blob Hash="cc88326c7a6ffd552beb59282a2cb94dc088ea93" Size="1928" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1764859" />
-    <Blob Hash="cc89177313448461cd1c57e666a664137c352ebf" Size="634" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1397405" />
+    <Blob Hash="cc891430b356124a88c4e0373b3c076e3588289b" Size="183808" PackHash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" PackOffset="1594376" />
+    <Blob Hash="cc89177313448461cd1c57e666a664137c352ebf" Size="634" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="2096525" />
     <Blob Hash="cc8bef76c16fb418cab47feaccbd4e3cec8326f6" Size="183" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="1910128" />
     <Blob Hash="cc8e078d4632e8a9712c7fffc6c17f8faa6cbc4b" Size="3456" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1914756" />
     <Blob Hash="cc8e08e39756afc2bcd8adc302bc294c209698a9" Size="314031" PackHash="7834946aa336571c3e5e0f4f005e54499e0d9e70" PackOffset="8" />
@@ -60785,17 +60619,17 @@
     <Blob Hash="ccafd92382f799f0500f2d672d0d8c696e7cc959" Size="575" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="377938" />
     <Blob Hash="ccb7cd9333e2cc7ad6a8e73c5b658fe2a7270895" Size="24630" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1711011" />
     <Blob Hash="ccb9e581f7d12f66d01708089a8b2a02b3c6808e" Size="522" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1728135" />
+    <Blob Hash="ccba55c078bf007f1c20acad521c6565bb13dc52" Size="26207518" PackHash="b0233c0c208ca9ac0527355b49d5361d4423f4a6" PackOffset="8" />
     <Blob Hash="ccbaf911c08b8fc74e6509a084c693a9aa16ecad" Size="393" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="613032" />
-    <Blob Hash="ccbf8b67205dba85cfe2a5dc765815a681f74982" Size="3538" PackHash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" PackOffset="2092752" />
+    <Blob Hash="ccc0fa61f44a67ccfc924d5ee70804c0ca0f4793" Size="1065984" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="8" />
+    <Blob Hash="ccc9f8684de301f0b7cd71847f7e95a921238ab6" Size="151816" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="1838272" />
     <Blob Hash="cccc660fc5d68f5cd4ce9fd5eef943fe8907b7f6" Size="2401947" PackHash="ef653e3944f49e109ef11bee70a08e3bb2992366" PackOffset="8" />
-    <Blob Hash="cccd7f6990e035793948beb42bfa58fe45423a01" Size="250406" PackHash="7143ad7a585bda75349c77c92198a5b5ca391668" PackOffset="1636272" />
     <Blob Hash="ccd0b853b181b03108945573e8c1b327a02c708d" Size="18535" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="419928" />
     <Blob Hash="ccd234d34d488634569a4064a65d643e070e80ed" Size="2202" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="13556" />
     <Blob Hash="ccd2b66b422ac84a0d3b4ef8fbe345724f67ac65" Size="335" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="413027" />
     <Blob Hash="ccd55272042b6478fe66ef7f5288d544e69cfa2f" Size="5205560" PackHash="18c21b7c21c5f737a60451fe5580136f9eb00cec" PackOffset="8" />
     <Blob Hash="ccdb41f13c0dda1269b5d362cbc8465041ee7b2e" Size="2934" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1621022" />
     <Blob Hash="cce2dcfab59bfb1957e7da38d3610812d30e8a3f" Size="8293" PackHash="6028c6247770e169982f50ed839356448f3d93f5" PackOffset="2083656" />
-    <Blob Hash="cce3db40d56210f508b68b2c54f4dc6cbfeedb4f" Size="11300" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2069178" />
     <Blob Hash="cce53a81fbf687766802174c46f52159a3160d79" Size="4878" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="990952" />
     <Blob Hash="cce5467c9e9b887a094d210a52c7d028fc7e5c2e" Size="40" PackHash="752108efcce0f1353b7bf7b6788e6d82a9890a4e" PackOffset="2097110" />
     <Blob Hash="cce66238eca6f5b7cfc08703700bece89849d0e9" Size="95446" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="1951026" />
@@ -60814,9 +60648,10 @@
     <Blob Hash="cd106002073d81e557432101087ec2127ac52415" Size="40" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="2097107" />
     <Blob Hash="cd114676089ef7cfcd37c9d9387290e968d2503e" Size="58754" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="2032529" />
     <Blob Hash="cd12e6b6c588ab7838d3259c94e3dfdfa42df235" Size="134531" PackHash="4fc48df722e8f48f5aac41907b1a2277502d9493" PackOffset="1404019" />
-    <Blob Hash="cd132bd99f16185919dc03057ba13a8456249229" Size="426" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2096662" />
+    <Blob Hash="cd132bd99f16185919dc03057ba13a8456249229" Size="426" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1519489" />
+    <Blob Hash="cd16508dbd9d75d10d0ca440c4854829b99b59d3" Size="752120" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="8" />
     <Blob Hash="cd170278bc3d7c5d28dd7e0befe12a722660dab1" Size="16079" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1750670" />
-    <Blob Hash="cd1af9b6b0c2fc0fb9655c9f09cf116a57368171" Size="8984" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1472306" />
+    <Blob Hash="cd1af9b6b0c2fc0fb9655c9f09cf116a57368171" Size="8984" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2009388" />
     <Blob Hash="cd1fab771a2dc245376b8d2fcf933ff87071ab0b" Size="4636" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1351008" />
     <Blob Hash="cd20a30c9d0085c39ea31dd719bf0920f1caf21f" Size="1414" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1572089" />
     <Blob Hash="cd24aa9b066406e76621a7c9d4292112756e1878" Size="9336" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="537953" />
@@ -60828,15 +60663,16 @@
     <Blob Hash="cd2d88a81f79b3275d4433dab32fd102c8c88ba2" Size="416" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2096259" />
     <Blob Hash="cd2dc0bb62795177d580d87c3ea3515af286b185" Size="746" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="458212" />
     <Blob Hash="cd36331c2bd8ed1c6afb20131005a1e638c6687b" Size="543" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="458344" />
+    <Blob Hash="cd3c1901ec9b6420e1c291a2d0061020c114b77d" Size="1730794" PackHash="015c8801a8906be93a066c86046bcd911350f5c4" PackOffset="8" />
     <Blob Hash="cd3e0476d453fedd34ecf9cfe7606ad1aa19b07a" Size="3549" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="1873975" />
     <Blob Hash="cd40f1a5e068b7e81a8584276f3d8c0594b680a6" Size="34940" PackHash="32ccfca2d36198e2e02d586f020244bb1cfec0eb" PackOffset="1340034" />
     <Blob Hash="cd41c75da09abe1acf7af3240f2ead590ef721eb" Size="13312" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1121144" />
     <Blob Hash="cd448e2ebb99dc1d9fc8ad76ea7f862b12fdaa08" Size="278" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2096873" />
     <Blob Hash="cd489c2276c68e8defed4f638d1b60ce751b6dd8" Size="19564224" PackHash="d93cf54721898ee1258ef472b60612813ba389e4" PackOffset="8" />
     <Blob Hash="cd48a42a7be50f320f1d9f7030e1edcaad1495d0" Size="127862" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="1956840" />
-    <Blob Hash="cd4d654cb074efff2cd919585742bef469dfecdd" Size="1162" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="993915" />
+    <Blob Hash="cd4d654cb074efff2cd919585742bef469dfecdd" Size="1162" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2041432" />
     <Blob Hash="cd534e9194c93e8c2a98fc2d98d8f7e2d4bf3988" Size="4763" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1692366" />
-    <Blob Hash="cd595d98fa1f594f9e547eb496bfd82b60406d7e" Size="60" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2096922" />
+    <Blob Hash="cd595d98fa1f594f9e547eb496bfd82b60406d7e" Size="60" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2096988" />
     <Blob Hash="cd5d7726b0524e55c03dd86edcb364fa1cc86a72" Size="1555824" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="8" />
     <Blob Hash="cd5e0168ac2e528a862d4dee55c3ecd25ea9106e" Size="188" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2087784" />
     <Blob Hash="cd609a6a6cc5585a2b07a86f5d88b3f729bc0983" Size="550" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2095872" />
@@ -60860,12 +60696,13 @@
     <Blob Hash="cd8d15f9f3459b43e136cc624b282a91305fb12e" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="685380" />
     <Blob Hash="cd90fedfea2454fd81e3468e4194a152c97feeb7" Size="128995" PackHash="66f3a69afc09dae5b1c60855f816c149a2ea7bfb" PackOffset="8" />
     <Blob Hash="cd92550779a65fbddcc4f4f227840f6218c422da" Size="1716" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1422017" />
-    <Blob Hash="cd92e7b15b4f08ce628a7b312707644f04023889" Size="2310" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="2094344" />
+    <Blob Hash="cd92e7b15b4f08ce628a7b312707644f04023889" Size="2310" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2087884" />
     <Blob Hash="cd976505c9c376a3a6dee53214217b87679e1a9a" Size="11755" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="207684" />
     <Blob Hash="cd9982bf23637884b9470211e671627fec04d55e" Size="315" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="370818" />
     <Blob Hash="cd9c48bf32419bacdbcbf2065fc0228181abe80e" Size="2871" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1002552" />
     <Blob Hash="cd9dcbb5e6add6ea91c8f142957ec229fc7f6da3" Size="6796" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="75370" />
     <Blob Hash="cda03a08ed8666ea1aba16ac7b06f6364612ce91" Size="2054232" PackHash="5728e541145906392d924eb26612004fe4731844" PackOffset="8" />
+    <Blob Hash="cda2a4906f21410376df43ce7dfc37c5463367ad" Size="1408208" PackHash="6633fc884b676640607254f19e9e7b0bf8defeee" PackOffset="8" />
     <Blob Hash="cda85719c0c91172fd4d05ecb8df3af6d130182f" Size="3640" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="146567" />
     <Blob Hash="cda99c66f27d5518bbdc9f09fbbf7b260a5eb27c" Size="8824" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="1970571" />
     <Blob Hash="cdac518dbb323d0f2d77a481484192c2b0215fc7" Size="3226080" PackHash="745f4d65935e194a0c424b2a2cd9fa949d4bf86e" PackOffset="8" />
@@ -60881,7 +60718,6 @@
     <Blob Hash="cdbaf52d31b326a10caf26fa04c5014b9e3dcf62" Size="1409" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="2088652" />
     <Blob Hash="cdbc49ecbbe59f61eccd7e65e6f1a1b4cf5d3083" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="214196" />
     <Blob Hash="cdbdd8fd9a6be85142d65d4cd48dbfc395a5c18a" Size="14715" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="2062557" />
-    <Blob Hash="cdc05b707256501236a6e6bb1c9d49d9a4360659" Size="4367960" PackHash="e65ada96c2aabd3c38b870ec82277f9e6c782f41" PackOffset="8" />
     <Blob Hash="cdc91ccaba02eae480720b7f4b7d9ad643fa5a28" Size="900" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="563688" />
     <Blob Hash="cdca15d4f32f9fcd3bf3a5c134dadbfdf0b26685" Size="58887" PackHash="e002d0958c673752ae43a0801b444a2ce1624b4a" PackOffset="1472794" />
     <Blob Hash="cdca7dfeb6d8373690436f55a935903f84c632f3" Size="881" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="231084" />
@@ -60902,15 +60738,17 @@
     <Blob Hash="cdf959f6f4af8aba2d789ba5118f434b2e9a7dc1" Size="1159" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="544936" />
     <Blob Hash="cdfa97947e7d9079406b96d50909dc429353ccac" Size="12651936" PackHash="77573dbce3e4334e792aa39b92048cda5adc940d" PackOffset="8" />
     <Blob Hash="cdfb1d6c868ced4a5dbf1059a921a73b6252c4ca" Size="36" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2071691" />
+    <Blob Hash="cdfe53e6263693625f79a628efdd222443bc4123" Size="19890656" PackHash="a8c3928577346141f3da53f2d124308d96c6482a" PackOffset="8" />
     <Blob Hash="ce0097ab7be6669580c0aa37a029b389ab43ebab" Size="354" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="172919" />
     <Blob Hash="ce0529e47bd3e23e2a903acf291db92fd2568013" Size="8993" PackHash="c0e2a53b405d3fe3419dc793f360f9da49862400" PackOffset="1812595" />
-    <Blob Hash="ce05d1119a7103620f3b8d53dcb5d437d335ee76" Size="1379840" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="8" />
     <Blob Hash="ce0661448a7833c1640b2b3dc27f000147e4e5a7" Size="508" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="237222" />
     <Blob Hash="ce0882daa73cd7e4e7af75a6e2fff638fc52fb9d" Size="810" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="2096331" />
     <Blob Hash="ce09101a3ce09478b6b80830a47b222a933fa42c" Size="31169" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="338171" />
     <Blob Hash="ce0b5446ba202503890378b38b7f955006b2fc1b" Size="149" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1255043" />
     <Blob Hash="ce0b5eb81cfa691241353a1f2673de52e3ee7670" Size="104" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="305220" />
     <Blob Hash="ce0c485bf969882deaa2a58d0acce1c9c156ff0d" Size="9474" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1894404" />
+    <Blob Hash="ce0fc70f7f7ffabb7a994f2ad4e2013fea634402" Size="8057" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1659417" />
+    <Blob Hash="ce139af307c7820eb7156d66cac32f1a8531ee96" Size="14198" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1843576" />
     <Blob Hash="ce14b2a7d98c9c535ce4c943bade39124485f7e7" Size="2449" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1888345" />
     <Blob Hash="ce153c5e70b878b944c552749af1dcc75e6df807" Size="260" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="827966" />
     <Blob Hash="ce169d4a5bfc6442859bd3d7b338c88a39d97835" Size="3348" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1250817" />
@@ -60924,7 +60762,7 @@
     <Blob Hash="ce2785277d60aa366e6faf3c3318d5767a3d949e" Size="3922432" PackHash="986638ff5d9f1b26a126de162e0a5d62762430dd" PackOffset="8" />
     <Blob Hash="ce27958f887d37cb374f27b54d52875e4e7f8735" Size="3097" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="602051" />
     <Blob Hash="ce2804e9c826934b7ddb0ed7fa82187c3f332209" Size="1160" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="215540" />
-    <Blob Hash="ce2ac90f5230f7880043ed1fbc983fdf282b69fd" Size="48890" PackHash="8983a85b417d4dfab9181da926c6653da0f6d483" PackOffset="2030576" />
+    <Blob Hash="ce2ac90f5230f7880043ed1fbc983fdf282b69fd" Size="48890" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="1974044" />
     <Blob Hash="ce2ad3f74fc16464b1fbade3baf1c01fc8b0ca48" Size="1009" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="838795" />
     <Blob Hash="ce2b8b3b4998717367d22609724e1aa08856910c" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096096" />
     <Blob Hash="ce2fdbcc7ef04f5207f31562cb0d4dc42779550e" Size="276" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="488617" />
@@ -60942,7 +60780,7 @@
     <Blob Hash="ce52de2feeccdb77e64a80a339fb7c328073d1aa" Size="27862" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="631069" />
     <Blob Hash="ce5828482dffdc649bab68f7ee4d8af1f5c354d2" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1292835" />
     <Blob Hash="ce585c2243704a47df23131fd3ebc4c1f40aeeb1" Size="1547" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1989812" />
-    <Blob Hash="ce5c4d31df1e0c0e747972ad16be223a2d917d76" Size="37639" PackHash="7f727a489bd1a53eefca9831cb061375a03a3c99" PackOffset="2059010" />
+    <Blob Hash="ce5c4d31df1e0c0e747972ad16be223a2d917d76" Size="37639" PackHash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" PackOffset="1968006" />
     <Blob Hash="ce5d53a8d038eff665f66ee46de6822796146a32" Size="5684" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1896508" />
     <Blob Hash="ce5e7ad67252f52d7e70719725ff5be393dd6ef0" Size="155" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="558430" />
     <Blob Hash="ce61278dbe1b2ea142aa22f5864b21382113799a" Size="2809" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1468558" />
@@ -60954,13 +60792,13 @@
     <Blob Hash="ce70c2a056f6cc986d8a770de1e3e0ab928a981c" Size="1046" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2093498" />
     <Blob Hash="ce7279255cd458417e93f33c52ad740c11023f59" Size="63574764" PackHash="daf4ca3d7853368ecc24cc35d924e1d7e00ea96e" PackOffset="8" />
     <Blob Hash="ce7493f316286e4e337cea107783d57519e96de7" Size="19656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1968163" />
-    <Blob Hash="ce75e44ccc1485c34106c3478a8c95151a5cec45" Size="1295354" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="8" />
+    <Blob Hash="ce75e44ccc1485c34106c3478a8c95151a5cec45" Size="1295354" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="8" />
     <Blob Hash="ce7907cb96955ef04a704fe4efb6ac9c6ac7429a" Size="504" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="613784" />
     <Blob Hash="ce7a4cd34162be6a928081e02622566d18541c27" Size="41683" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="2036337" />
     <Blob Hash="ce7d56f10f01a1efbd694d0ebb71103af7e3663b" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1182660" />
     <Blob Hash="ce7dfd453cc255fa7031ecc02aee963e5eebb694" Size="15443" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="15161" />
     <Blob Hash="ce80cf88122d50a6206bab860da7f6d52c4bee7c" Size="32" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2094826" />
-    <Blob Hash="ce8d5a16876b26e4b639f4a4ae46a49d7e0fc797" Size="3429" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1312225" />
+    <Blob Hash="ce8d5a16876b26e4b639f4a4ae46a49d7e0fc797" Size="3429" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2091369" />
     <Blob Hash="ce8e8a812f2570fdee814c7172ab78d3b5b47fe4" Size="2884" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="553012" />
     <Blob Hash="ce926402a6a226bb3ab90204d7fab6b5a33a6026" Size="239" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="181569" />
     <Blob Hash="ce92f3c3b8db618624c87642543e568cd15f2f98" Size="41193" PackHash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" PackOffset="1461802" />
@@ -60968,7 +60806,7 @@
     <Blob Hash="ce986c25f6e3ea90623b133038eef72aa2977516" Size="180" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="608787" />
     <Blob Hash="ce99d46f384425b55a04f4fc8e323d027a42b0fb" Size="3905" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2047347" />
     <Blob Hash="ce9abca39dffb907f9f32d09f132f08703dd84d7" Size="22220" PackHash="b45c942afc74d06f356039815b70f4d610006ba0" PackOffset="2063144" />
-    <Blob Hash="ce9e09615c8edf378c41c60b888b295864480cd6" Size="4102" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1063656" />
+    <Blob Hash="ce9e09615c8edf378c41c60b888b295864480cd6" Size="4102" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2004390" />
     <Blob Hash="cea44f913d9ebaabb429078874265b1628004553" Size="235" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="360976" />
     <Blob Hash="cea57a666496cd4d5492282c76597537e5c1cbed" Size="2147" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="1461078" />
     <Blob Hash="cea62dee8e0a21a15cdf96665cafd2154b99f82b" Size="5640" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1526359" />
@@ -60982,7 +60820,6 @@
     <Blob Hash="ceb4edef1c907772e5d556ed51da06edb9ab47e0" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1762695" />
     <Blob Hash="cebbf1eed3d99d930b94f1b6ad59e4b58d1f1213" Size="121316" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="1757412" />
     <Blob Hash="cebc4489a210c4fdceaf8d065ac5d351dad1f327" Size="8228" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1704016" />
-    <Blob Hash="cebdd88a6670457e33b10a753ad177e037fc45c6" Size="54732152" PackHash="b81777b40449464b8ce637bf23134ad77b623f97" PackOffset="8" />
     <Blob Hash="cec06b3c48a6c6bf9684dd38c3b8f35ca25320be" Size="5366" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="974384" />
     <Blob Hash="cec0cb594d97a39d9badd7df8a4b7d14d59417c1" Size="22144" PackHash="cf5e1ce959a11e3674cc1a7c352dc878022c2eff" PackOffset="2068514" />
     <Blob Hash="cec0deed92d9c5c6b064d07961591c5e98c5bde8" Size="8216" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="98960" />
@@ -60993,25 +60830,24 @@
     <Blob Hash="cecafbbdd1bd8ad19111d6d07122a88ae12208ef" Size="1814" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="385779" />
     <Blob Hash="cecb9e647f14227eb6fe4f4dd39a2a11f0c63dff" Size="678" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1734276" />
     <Blob Hash="cecc71786477a349ff6bfacdead66ed7ba33337a" Size="6144" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="327473" />
-    <Blob Hash="ceccec107d142214809783dd551a4e1fef917413" Size="1116" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1281616" />
+    <Blob Hash="ceccec107d142214809783dd551a4e1fef917413" Size="1116" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1730518" />
     <Blob Hash="cecfcb6692eada8414b025d47dfc93a1ffd1176c" Size="697" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="1921172" />
-    <Blob Hash="ced0d282c09519571dc9441f4c96b5afcb494c0d" Size="131" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="475155" />
     <Blob Hash="ced1d0ed35266c5fdec9ba8b52b25a5dc6d51562" Size="104" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1875168" />
     <Blob Hash="ced4bbadc8edbd1c9496005ab2154e04690e5be6" Size="112488" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="441376" />
     <Blob Hash="ced5b132d160320068d7a61a3cedfdfa879a60b7" Size="124673" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1574424" />
     <Blob Hash="ced6c2929292cedeec42847c3df7eba62e8d77f0" Size="17785" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="222278" />
     <Blob Hash="ced7e3e44cc17d13a09c223a092849b186e9fb69" Size="50466" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="385737" />
     <Blob Hash="ced908fe2d4a4a1eaa962dcaa0f52acb01a1e82a" Size="54129" PackHash="9f9e04739196310f111e4008dd46c421065ef360" PackOffset="2036160" />
-    <Blob Hash="cedb2446fc1b6b2189e6954a1f922b33679d850d" Size="5033" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1951605" />
+    <Blob Hash="cedb2446fc1b6b2189e6954a1f922b33679d850d" Size="5033" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1691832" />
     <Blob Hash="cedc0774ed021c93fafc747bcf9e804bc172c422" Size="128" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1929080" />
     <Blob Hash="cedd374a11a03c624c9a3d0857cefac64050f14f" Size="431600" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="555140" />
     <Blob Hash="cede75671ff307240a2ebf66c362a922e1bf2b1f" Size="1026029" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="8" />
     <Blob Hash="cedfd4935f354111286408eb7bb9f3363f57b18d" Size="4421" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="70262" />
-    <Blob Hash="cee0a665ec3237f9fe404f8b74ce6b4b29b56530" Size="3671" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1069033" />
+    <Blob Hash="cee0a665ec3237f9fe404f8b74ce6b4b29b56530" Size="3671" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2009767" />
     <Blob Hash="cee463779cfd70313c01e400467b7e27e8d275ae" Size="98196" PackHash="7e504e731d99b59de57d71becdb34fce6d198dec" PackOffset="190298" />
-    <Blob Hash="cee8cf925a993db581b74ad4f8599e94980cf9b6" Size="62" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1440103" />
+    <Blob Hash="cee8cf925a993db581b74ad4f8599e94980cf9b6" Size="62" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1889156" />
     <Blob Hash="cee964bdb66dc7f555b326d198f4468e4dda701d" Size="98884" PackHash="672de73d2196af2ddb680c4afff3105cba9854f6" PackOffset="8" />
-    <Blob Hash="ceeb57e33087b9da78caab373ba2293da813c7f1" Size="778" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1418856" />
+    <Blob Hash="ceeb57e33087b9da78caab373ba2293da813c7f1" Size="778" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1867909" />
     <Blob Hash="ceebdf47d8fd12f24a2cb8b3c8bed6f107a96faa" Size="423" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="410638" />
     <Blob Hash="ceec955cf5fca5677f773cd8c42bb7eae1a96b5f" Size="693" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="372692" />
     <Blob Hash="ceec9d5ff59f1ea2f2090c2c825db34787a3cdfc" Size="20921828" PackHash="c466fcb69539e456d83d9ccafbd731206f67d155" PackOffset="8" />
@@ -61024,7 +60860,7 @@
     <Blob Hash="cf063d6270380694ef9d08c7554a58750f25befd" Size="52186" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="1977878" />
     <Blob Hash="cf07773fa1e637220f2aff0891607abaa15ba986" Size="3602" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="330195" />
     <Blob Hash="cf07bd42ebed8828290ea3533ba50b507c0580bd" Size="5650422" PackHash="6770917472c0e5251e7f2d3e17fb76ac1ec2e0ba" PackOffset="8" />
-    <Blob Hash="cf087028bb1780985b02b6282f900ea8a56bde8b" Size="1140" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1297966" />
+    <Blob Hash="cf087028bb1780985b02b6282f900ea8a56bde8b" Size="1140" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1746868" />
     <Blob Hash="cf09858096a6124d079204c6fa6b9cef88f658b0" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="431036" />
     <Blob Hash="cf09ed12d908ab0cdee3a8caaaeb05e519e6b4b3" Size="2946" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="114359" />
     <Blob Hash="cf0ddb77af39a477a3e177140a6c43222cac5e29" Size="40" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2097110" />
@@ -61036,7 +60872,7 @@
     <Blob Hash="cf14b485997bcb2c8117fefa9d3a8b5c8cdf4176" Size="239865" PackHash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" PackOffset="947132" />
     <Blob Hash="cf172803baace5e973fd347d864e99183f09eb1c" Size="10104" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1306414" />
     <Blob Hash="cf192fa403473cf720ef34d2ee81de1c0514c2ea" Size="50694" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="865288" />
-    <Blob Hash="cf1d5492ffe7e66900d19d3d15cf961b0808fca1" Size="608" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2093383" />
+    <Blob Hash="cf1d5492ffe7e66900d19d3d15cf961b0808fca1" Size="608" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2088994" />
     <Blob Hash="cf1f1385d48a77468483224e38d28baf63b77237" Size="19886522" PackHash="1ead4f6f04dbd7d3989d46670724a9971e4111bd" PackOffset="8" />
     <Blob Hash="cf1fdddbb06701a1292b72b68c8c1aca574e4944" Size="81105" PackHash="d0727784ae79dcba28f2e253924b24479c842f8e" PackOffset="1840314" />
     <Blob Hash="cf2228259f06071e17081dc725416df278dc5b4c" Size="4676" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1486687" />
@@ -61044,7 +60880,7 @@
     <Blob Hash="cf2f59dbb312f6a3b472e1f20b89e289fbe3d251" Size="3381" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1696863" />
     <Blob Hash="cf33c9b0a78af2bae46c9e1050fdfabf8367c680" Size="604" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="412681" />
     <Blob Hash="cf37407193abf19f41a86df6229fd67fd691ba08" Size="11032" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="2008607" />
-    <Blob Hash="cf3a694d4bac5e5d98fabaf3cbc64bdf66be836d" Size="233" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1605079" />
+    <Blob Hash="cf3a694d4bac5e5d98fabaf3cbc64bdf66be836d" Size="233" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1724311" />
     <Blob Hash="cf405b9f64ed17baf9b64bd08e0112c6bdf781d5" Size="6379" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1151755" />
     <Blob Hash="cf448a072192e74da6b191dde914104052ea7d73" Size="1749" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="627773" />
     <Blob Hash="cf46c8a7a73949f8d86d37c0c21f530574d66b5a" Size="3397" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="275527" />
@@ -61053,7 +60889,7 @@
     <Blob Hash="cf4ce916ffa1e8ea3212b2d1b0c707213fd26c89" Size="17670" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="1742219" />
     <Blob Hash="cf509f589079b70f88c090ec9b656ff856b796ba" Size="13092" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="977256" />
     <Blob Hash="cf50c8866ed0312c6b17d1d6b429a451f5cb1b8d" Size="53480" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="1801992" />
-    <Blob Hash="cf5142ebf02f16f1e75fdcd679f20ab29040ca69" Size="3694" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1223567" />
+    <Blob Hash="cf5142ebf02f16f1e75fdcd679f20ab29040ca69" Size="3694" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1668398" />
     <Blob Hash="cf530c1cb0346c382f8cfa56ac04682ad20ed1b4" Size="488" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1699280" />
     <Blob Hash="cf5472451fc98e8a7512bbaee0bab52c982aa4a7" Size="7072" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="622517" />
     <Blob Hash="cf54853e1bfdcd42e914edc39ff843d230b421f5" Size="4644" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="570178" />
@@ -61063,7 +60899,7 @@
     <Blob Hash="cf5a270d746e135d2ed5175d88d841494d757eba" Size="11758" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="2019278" />
     <Blob Hash="cf5ab2ebede786f29224ffbc24c3f9762820f676" Size="438" PackHash="2712036814539c2a4f91c20f323dcad0fecc9943" PackOffset="2095905" />
     <Blob Hash="cf5bcac9586c476fdda73cf79261bed211118ff1" Size="164" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2069548" />
-    <Blob Hash="cf5d8ec8f411cf8f4d96b40a48013443c64ffa8b" Size="5135" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1978822" />
+    <Blob Hash="cf5d8ec8f411cf8f4d96b40a48013443c64ffa8b" Size="5135" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1919944" />
     <Blob Hash="cf5e26e6b2f44fa65be90241d3c2861ee70d32b2" Size="498" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2096652" />
     <Blob Hash="cf5e99ee8bc86e7511c55e0ac4857ee30c4e945a" Size="2712" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="567740" />
     <Blob Hash="cf5ec125ee3d209f790df76bfa7cf16377cf1a5b" Size="6912" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="2080734" />
@@ -61079,6 +60915,7 @@
     <Blob Hash="cf88e5492b7a53ff111fd66dd988d81869445e7e" Size="127100" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="8" />
     <Blob Hash="cf8e3ec6c3e680e12cfbac0163faaa98a873c46a" Size="3875576" PackHash="3d3b74d1b322174c98ef522ad8fecc65752cf6e8" PackOffset="8" />
     <Blob Hash="cf911dba1b73970f56f139670e6a5702b715889a" Size="2405942" PackHash="8aacb522ada8d031d2c9566b3a8fd560e6022d40" PackOffset="8" />
+    <Blob Hash="cf94952f3ef44d8ecf331e8ef6710d4635ce0253" Size="1714624" PackHash="119472dd321e51d7d83032997ab9d118a312a2f4" PackOffset="8" />
     <Blob Hash="cf9786b908802bf7a3574e1d86c26c3206ddb524" Size="3484" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="960204" />
     <Blob Hash="cf97e3f2a7bc58c5c218b671ef7c9a078c40f444" Size="9658" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="471807" />
     <Blob Hash="cf9ac0325913da14f2c943a6e94d99ddf6298b8c" Size="9223224" PackHash="4829f380f81f0daabb46fed7b91b6dae6a1d38ed" PackOffset="8" />
@@ -61086,7 +60923,7 @@
     <Blob Hash="cfa52e8482435c4a5530da795b593c8b68226079" Size="195" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="1249554" />
     <Blob Hash="cfa852ea23806341333378c673277dbfb5fc3f27" Size="3812" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="706826" />
     <Blob Hash="cfa8b5faa3c85b8772fb80c36683758da5436882" Size="5069" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="518148" />
-    <Blob Hash="cfabd72eec5a049c295298afa0fac57faeefa3dc" Size="18562" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="2075790" />
+    <Blob Hash="cfabd72eec5a049c295298afa0fac57faeefa3dc" Size="18562" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="1969778" />
     <Blob Hash="cfae25aa8913d083722900a1aba9293da7aa534b" Size="3464" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="753727" />
     <Blob Hash="cfae4d4817868637258a427e520c470396f7fc2f" Size="6702" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="315313" />
     <Blob Hash="cfb31926b95a40eb9d7e0e1bcaf49abe7a8b1d89" Size="1136546" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="8" />
@@ -61099,10 +60936,10 @@
     <Blob Hash="cfd66e806477c2788fa071777a4e36739bae9e90" Size="132352" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1162556" />
     <Blob Hash="cfd6775fdbc72f3d4ff8e3e986446d019b9b6ed2" Size="2939" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="2094068" />
     <Blob Hash="cfd8a103caeed30f475b1ec18684d9cfd2f35dbb" Size="2937" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="737017" />
-    <Blob Hash="cfdcd567dafc29dd0f55ed3e3b6793f9e38d4a3d" Size="25088" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="2067992" />
+    <Blob Hash="cfdcd567dafc29dd0f55ed3e3b6793f9e38d4a3d" Size="25088" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="2034844" />
     <Blob Hash="cfddaf82d884863ba223efb7b67586cd95f3bf88" Size="439" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="172417" />
     <Blob Hash="cfe2675330248cef9a25aeae3cdb8bec989bf2d2" Size="2161" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="340867" />
-    <Blob Hash="cfe2dfa491c1e5620b5b95fb9cb449014f4321d0" Size="296" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1421747" />
+    <Blob Hash="cfe2dfa491c1e5620b5b95fb9cb449014f4321d0" Size="296" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1540978" />
     <Blob Hash="cfe584bf5e38311107b747511b998f92fdf68c2a" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2096114" />
     <Blob Hash="cfe63e8b078551e1cd3ec9231bf687969ae74ef6" Size="150" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="432585" />
     <Blob Hash="cfea1f40b255de225ecb9bf272f338669d9695ef" Size="3244" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="129668" />
@@ -61132,23 +60969,26 @@
     <Blob Hash="d02c210df45a550c6728a7dcfa6adadb1e205cbd" Size="39982" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1861484" />
     <Blob Hash="d02d8588c074bfeebfd228706ffde467c0a283aa" Size="7892" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="206988" />
     <Blob Hash="d02dd0cc7ec1436464fe82c6714a5c7472e936a1" Size="3430408" PackHash="8a251169614945698a2c1990c0898641d380b289" PackOffset="8" />
-    <Blob Hash="d0360ab9980c8e6caa82cb71de862aa05fe95f98" Size="2161" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1381236" />
-    <Blob Hash="d03655bb20a5165851281bafcf0d9c366dadadc2" Size="4114" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1095632" />
+    <Blob Hash="d0360ab9980c8e6caa82cb71de862aa05fe95f98" Size="2161" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1830138" />
+    <Blob Hash="d03655bb20a5165851281bafcf0d9c366dadadc2" Size="4114" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2041648" />
     <Blob Hash="d03f191ef4fa769d93e0bf3d3dd3a0c0db4f7693" Size="5008" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2087236" />
     <Blob Hash="d04004835121330b951480b4ae964581219b1a27" Size="452503" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1263363" />
+    <Blob Hash="d0402e2b702fb4d132e73e7604e68307452570af" Size="4707792" PackHash="ba80ede563915f7527cf65b8d776d42735c56388" PackOffset="8" />
     <Blob Hash="d040e41c561ab5b06d3943bd961dcfc3189664e1" Size="21596" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1516620" />
     <Blob Hash="d046f4ea16728ae8010678492665e4a7eb39ecd0" Size="7658" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="433267" />
     <Blob Hash="d0476a78fcdf8513fe8bddbcc7818cc642037efd" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="296981" />
     <Blob Hash="d04a5f5636e8ceb7bea4163d228e6c83cf396ad8" Size="159" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="8" />
     <Blob Hash="d04b8c47374482080b6565b23c2f69841141f3fe" Size="6795" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1846999" />
-    <Blob Hash="d04cfedbf8b8a820bd75931948f2af1b22443ad2" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550433" />
+    <Blob Hash="d04cfedbf8b8a820bd75931948f2af1b22443ad2" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669665" />
     <Blob Hash="d05103a52033477b2ed82f4127222fd0309e22a7" Size="43520" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1875388" />
     <Blob Hash="d053822fb09acc5610808dc850aa5f3608f6f7de" Size="3607" PackHash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" PackOffset="2093064" />
     <Blob Hash="d054308feb0fdf6bd0194d775c4c21d9fe0a142d" Size="200" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1281708" />
+    <Blob Hash="d0598808e4f767497314434f6c4233b19c17fa1b" Size="3493952" PackHash="537253ca8f1a2093ecbd3636af9ec3530c918a3a" PackOffset="8" />
     <Blob Hash="d05bea665bcdbf0957172c0154dd6158de76ef5d" Size="993" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1638988" />
     <Blob Hash="d05f7f55fcaea6f0ba6ebfa8b3d2c6b3a527a975" Size="4685" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="2088463" />
     <Blob Hash="d061d4f52abfe84574f119587bcf37add8203e7a" Size="493" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1036622" />
     <Blob Hash="d061f698fc8aafeb65a43411f3f2308a3a4b074c" Size="154312" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="1316195" />
+    <Blob Hash="d063b53190a970d9ae1145f87f5bd05bb65bde55" Size="657276" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="200206" />
     <Blob Hash="d0660c82c5992ab6e3d5dca23aae482e03f96680" Size="3755004" PackHash="7dd781dacac6a258f977fc767cf332b5a2e0671e" PackOffset="8" />
     <Blob Hash="d06a94a7400e8db7ad62221202c14cffdbd208f7" Size="17717" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1286627" />
     <Blob Hash="d06ea507f83d3360cb3094a6994d113fcf816803" Size="38308" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="425549" />
@@ -61169,19 +61009,19 @@
     <Blob Hash="d0922a7ffaec3246286da147d28c2340139b5a56" Size="955" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="691107" />
     <Blob Hash="d093e21a6e4d01d5153fc786d389b1c4947c6cd2" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="708246" />
     <Blob Hash="d09509ddc1cfe79a6a905f21116d1a5e209110b9" Size="428" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1045821" />
-    <Blob Hash="d096daf3dba610019c4e552288333ac77f6a811d" Size="22182" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1866283" />
+    <Blob Hash="d096daf3dba610019c4e552288333ac77f6a811d" Size="22182" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1936499" />
     <Blob Hash="d097d15576282ebe3cd1b03782e1818e3e40496e" Size="545976" PackHash="bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" PackOffset="1488716" />
     <Blob Hash="d0984cc55b078c2ff2b4a1d9f0140551cab19234" Size="2785832" PackHash="964445a2587d066a234fb244447282f558f277d1" PackOffset="8" />
     <Blob Hash="d09b1a3d0e9f4361c596ca9b8b1eab823af2b556" Size="26504" PackHash="2944a0052b881a644f04844186daa4ae54aad523" PackOffset="2003546" />
     <Blob Hash="d09ce2054dd7244b6fd154ade364ed84465ce2b4" Size="1288" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="614676" />
     <Blob Hash="d09e529a61c977c17d5388b45bf663a9e66f5889" Size="96524" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="1944122" />
     <Blob Hash="d0a141b31355b50724c34a9133238d19235225e0" Size="170" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="349233" />
-    <Blob Hash="d0a1b3e4f52ff20c2806976f94f708c5abec1b00" Size="1213" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2095119" />
+    <Blob Hash="d0a1b3e4f52ff20c2806976f94f708c5abec1b00" Size="1213" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="2091852" />
     <Blob Hash="d0a6e532dcc86dd2590aa6d181cba96239067f43" Size="70938" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="938774" />
     <Blob Hash="d0ae8a746a946632a37c9bdee579b54e0607e167" Size="4414" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="190118" />
     <Blob Hash="d0afe52085f9a4cd2e571c1f4af71d4af6a7799b" Size="8113" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="585477" />
     <Blob Hash="d0b05f71e36fc46fcd57351a6225b44977a94247" Size="9504" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="343028" />
-    <Blob Hash="d0b1e456ae4206bf6e733571b8faa955c3091fc6" Size="2595" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1337688" />
+    <Blob Hash="d0b1e456ae4206bf6e733571b8faa955c3091fc6" Size="2595" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1457148" />
     <Blob Hash="d0b33f3a07bc40138cc89164a97dee79da83927e" Size="222170" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="235385" />
     <Blob Hash="d0b52adc1449a03f498fa4b13d0265af5473617e" Size="85445" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="627246" />
     <Blob Hash="d0b5a1d8308b1302e3073fcf6278a7b25018fcef" Size="6327" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="465480" />
@@ -61190,7 +61030,7 @@
     <Blob Hash="d0bc28b3048d0ad807ae3efd372ac4948c4c1a6a" Size="11776" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1675920" />
     <Blob Hash="d0bd068a5a1be58d4e8ac49904a1f44e181e08a9" Size="4851" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="61036" />
     <Blob Hash="d0bef37620e33188172f6b2eefe36a4e4a0cc92b" Size="7638" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1604543" />
-    <Blob Hash="d0c2e5bd7ae87f58397526ab3b4c2c232f7ad5ef" Size="873" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2032136" />
+    <Blob Hash="d0c2e5bd7ae87f58397526ab3b4c2c232f7ad5ef" Size="873" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1922347" />
     <Blob Hash="d0c425fa806d68835c735a0bc6b14e75eee86afc" Size="16920" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1150096" />
     <Blob Hash="d0d132792dc63f1075f00924df280197cbc76147" Size="6092" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1110352" />
     <Blob Hash="d0d43d8c5f88c782161b3f479cca10e88b54f0fc" Size="3354" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="636611" />
@@ -61210,6 +61050,7 @@
     <Blob Hash="d0e7c280af6ae6673b72e4270747ff4ff73a61c6" Size="1576" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2087933" />
     <Blob Hash="d0ec6fc32b2d946ef7f0437742ff2d3a92df78e6" Size="2187284" PackHash="ccb91106d9460812decbe2edc67bd490bbc8d5ee" PackOffset="8" />
     <Blob Hash="d0ee645d5c0f86d9e5edd2de355c8e91a4767d6d" Size="11009602" PackHash="ef990657b59fd9ef22aa9f59168a21322dc9bda4" PackOffset="8" />
+    <Blob Hash="d0f27c2e907bee02f253629229a678141296985c" Size="1056256" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="8" />
     <Blob Hash="d0f639c7520309212e054935708b1c7d0220b185" Size="185" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="441718" />
     <Blob Hash="d0ffdc2036eab20b0a4227569ec9fb3055017bba" Size="16407" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1237588" />
     <Blob Hash="d100d4f78fd2575f1a02e45aae500896ac8bb2a5" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1207439" />
@@ -61231,6 +61072,7 @@
     <Blob Hash="d11b22ee699f9c22614abee0f5221893ee3b9f40" Size="13273" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2074614" />
     <Blob Hash="d125a9f08bd5fc9422b0d662702e695affd6754b" Size="528732" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="537161" />
     <Blob Hash="d126bbbd1f3eaad08da67e5a78fe35682981b919" Size="585" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1502011" />
+    <Blob Hash="d127e393402fe8562185a6e1c9e55d00d81928ff" Size="3832732" PackHash="b325e199a92fe4c47780ca169aca151dca6a1a0b" PackOffset="8" />
     <Blob Hash="d128b444c63966dff8c117ab6a84080deee71104" Size="642" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1244560" />
     <Blob Hash="d129da7ce0375a8706df80ad28b447cfbb0317d3" Size="433" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="348055" />
     <Blob Hash="d12d5381d50d578aa8687671dc542c462a7f490d" Size="49008" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1835450" />
@@ -61251,7 +61093,7 @@
     <Blob Hash="d143a546cb951ec30b60daa894147aadba83c268" Size="185096" PackHash="1960f1f6df90a238f5ee4ef515c50839a26abec6" PackOffset="272674" />
     <Blob Hash="d1450a46d5309e7703f3724e19a528ed31a6adaa" Size="62371" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="205145" />
     <Blob Hash="d148f31bf4b5462f1a05a54f1edfcdc2543fa117" Size="354557" PackHash="8da6976ecaa99b785dd5b8786a2cacb519d2d294" PackOffset="8" />
-    <Blob Hash="d14aea84998986c3bf80efeb19958715cd301709" Size="4036" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1246642" />
+    <Blob Hash="d14aea84998986c3bf80efeb19958715cd301709" Size="4036" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1695544" />
     <Blob Hash="d14b180a4cc3c85e9f5285652d5080b7c8c860e7" Size="237" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2079767" />
     <Blob Hash="d1505105a40d1f26ec49e0ba6360aeafb25270ed" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1998395" />
     <Blob Hash="d15206721377784e50b5a6d032fbd5d068875659" Size="5707" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1566583" />
@@ -61259,19 +61101,18 @@
     <Blob Hash="d1566d10727b8d6bd05d45f0b821eecd0290e539" Size="5404" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1642017" />
     <Blob Hash="d158401ef63af2dde9fa80c1eccc523de159403c" Size="4635986" PackHash="58265ec4ff350ee6f45eaf37341b669e24702b38" PackOffset="8" />
     <Blob Hash="d158872e864cb5c71462e0b299d657ef07b1be69" Size="187412" PackHash="6a62a64a9601d1028e98c3f9d8d1ce2dbb93b1e9" PackOffset="1514570" />
-    <Blob Hash="d159638a19b0ac6d821fd50185d7b632a3a07614" Size="3976" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1723688" />
+    <Blob Hash="d159638a19b0ac6d821fd50185d7b632a3a07614" Size="3976" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1957428" />
     <Blob Hash="d15c6f2133cf855e7cf8e6197a5fa8483b8ee899" Size="208960" PackHash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" PackOffset="1314934" />
-    <Blob Hash="d15e397703d2a50c41ec7793ab1086dcb45340b8" Size="1630" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1967433" />
+    <Blob Hash="d15e397703d2a50c41ec7793ab1086dcb45340b8" Size="1630" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2095487" />
     <Blob Hash="d15e9a7ac3b2fbd53629b67e17fbb48aa8fdf83e" Size="3756160" PackHash="1c8d955be9265f85641ccaa5c0c9abacc66115f7" PackOffset="8" />
     <Blob Hash="d162898d5823d160c545793a4f983e541300342d" Size="45739" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="560858" />
     <Blob Hash="d1657db5e2989eba80bab98a1e1217cfffbb19db" Size="1115" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2027451" />
-    <Blob Hash="d167f8df2b6b1db34ed72ee373c8894d815ea218" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551272" />
+    <Blob Hash="d167f8df2b6b1db34ed72ee373c8894d815ea218" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670504" />
     <Blob Hash="d1680283ef65a9af3f0664722bd27b45800aa582" Size="98760" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="446065" />
     <Blob Hash="d1692fe089cd4b8f5bf45602747a731de1a045eb" Size="3256" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1565753" />
     <Blob Hash="d16caff15a592e6919b4157a8fee91d247cf2238" Size="475096" PackHash="1ad091a77f5ab3bd235d0cafc019040d50becb2a" PackOffset="1388808" />
     <Blob Hash="d1712473f8cad1de27d55cae2858dc750009760b" Size="150141" PackHash="9a3106f71b0fbae7c935c63362a16d9a0419c9c3" PackOffset="1035691" />
     <Blob Hash="d171701da360d940f1c785c64ffe5bd38c866868" Size="503" PackHash="cf066f5930e6f84f6279465b75ef5792ba8294a2" PackOffset="2095620" />
-    <Blob Hash="d172867450f4fab4583f9b60d57e9514a0a3dd1a" Size="18928" PackHash="32a83d508234ffa544d0570813e08e4f8b6379f7" PackOffset="2063152" />
     <Blob Hash="d172e9bc676e7ad2baa4eeb2eef0d11cf30bde4d" Size="4309" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="73341" />
     <Blob Hash="d1742058b7012d5bcece218f3c9772ba0a73ea75" Size="64" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2097021" />
     <Blob Hash="d1745f2196e908e794c67cf3a7b65d06c60ee6c0" Size="5194" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="823989" />
@@ -61283,7 +61124,7 @@
     <Blob Hash="d1862abf0f5698ff10402aa594b4de224225dcee" Size="2838" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="147131" />
     <Blob Hash="d1863f7ff67c23368d675448dc66a78c6ff58b70" Size="5469" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="178779" />
     <Blob Hash="d1899789be958d7a83b985076629e8db7a06ab30" Size="1963104" PackHash="fff4095031f71891566086a3a9fd62eeb09b7c91" PackOffset="8" />
-    <Blob Hash="d18c5b0fa2a5551476e96f289e150df500afe766" Size="194" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1580781" />
+    <Blob Hash="d18c5b0fa2a5551476e96f289e150df500afe766" Size="194" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1700013" />
     <Blob Hash="d18c9d96dd9298a128e27e2804cd4a0c799195e4" Size="1346" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1079172" />
     <Blob Hash="d18e36adbecb7ab213209479aefe6b8b77e4bf0c" Size="4792" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="534178" />
     <Blob Hash="d18f979ecf76492a9f016d422bd940b99c5b9fc4" Size="9212" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="344324" />
@@ -61318,6 +61159,7 @@
     <Blob Hash="d1c382e756a5c14a127c30e9c8ae33c8161c2db8" Size="132509" PackHash="d36d4d70e5e964d96fb89790499d530e6e8982a5" PackOffset="1888762" />
     <Blob Hash="d1c494142e3f265b977f0c1cd2d0423d5d1b8b51" Size="6725" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="1918616" />
     <Blob Hash="d1c6c27e16adccfd14111a12bb4bf86c0fead818" Size="9543712" PackHash="046536af8720fc740eaf2286f148a94953994db5" PackOffset="8" />
+    <Blob Hash="d1c6c39ed1d4e5a3caf10375f1042bb3d59a8d43" Size="112192" PackHash="65292930f06c2bb49ec85a293869511324a919d3" PackOffset="1911226" />
     <Blob Hash="d1c914ac685eb7702d30f161ac8f9ab1fc0f10e0" Size="5681" PackHash="75428e4014e475de4f4790911faa961b5367725b" PackOffset="1789370" />
     <Blob Hash="d1d32c34580793b0184ac1becb5bc9b49c36e0d6" Size="11053" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="524360" />
     <Blob Hash="d1d667730bfd799634ed20a7727ca22dcea23197" Size="2824" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="498173" />
@@ -61333,7 +61175,7 @@
     <Blob Hash="d1ea3b75414825d69258db188519de37d5ff84f5" Size="30720" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="1623384" />
     <Blob Hash="d1ebec4f06d9a607dc9375566469d10803e42be8" Size="83914" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1242424" />
     <Blob Hash="d1eef26c90bd0a17a21fd3306460d19cc2590a45" Size="4440" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="721754" />
-    <Blob Hash="d1f0a846cc325fbfaceacded5eac560ab4e98838" Size="4928" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1807323" />
+    <Blob Hash="d1f0a846cc325fbfaceacded5eac560ab4e98838" Size="4928" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1678670" />
     <Blob Hash="d1f6360ab9b67949a3f88ac8e530f195e1dec3a8" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="8" />
     <Blob Hash="d1f6fcb4d704c9c33a7f39f9e2596573ed252a37" Size="249" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1420941" />
     <Blob Hash="d1fa8b1d92f603da615128af56827dbbd67c92fe" Size="4805" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="883612" />
@@ -61346,7 +61188,6 @@
     <Blob Hash="d2067610d89477411deec02c1f19649b8f9a34bc" Size="5294" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1424940" />
     <Blob Hash="d209bde9ecaccbd030acc89de268a0f1f7400be8" Size="66910" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="1851494" />
     <Blob Hash="d20aeb2cbd14060299e3abf170a92366e25d6fa4" Size="323584" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="1143804" />
-    <Blob Hash="d20bcaf8a1423a6c2bb507061f3ecdf6a756f75f" Size="5632" PackHash="d83cc9c9ccafadd27d18ea51adbb23f71944297f" PackOffset="8" />
     <Blob Hash="d20de2103a2d2553e14c1c03410df5d4dd369b81" Size="3596" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="91471" />
     <Blob Hash="d2110514c346bf8b85bd64487f9b5303b39949fe" Size="8695" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="1974875" />
     <Blob Hash="d211679a8b4fd6a70482c830cd9afcb923739382" Size="377" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="365999" />
@@ -61368,7 +61209,7 @@
     <Blob Hash="d230fe0cb09e31291a48b76fb49cb8c455c4c15c" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="121864" />
     <Blob Hash="d23187ccbd3c94680e947bdf4fed8e1715b6cad9" Size="15460" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1993580" />
     <Blob Hash="d232867efee58e201ec94fafd631844fb97af805" Size="10104" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1345614" />
-    <Blob Hash="d235849a0f891aea5d4dd50239c4f801d8d6dd0f" Size="1450" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1930519" />
+    <Blob Hash="d235849a0f891aea5d4dd50239c4f801d8d6dd0f" Size="1450" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="2095559" />
     <Blob Hash="d23657b921a29843d8ac92018cc9a5f2df18fb55" Size="9146504" PackHash="03b9c698d802538e6256a290cf394d641bced5df" PackOffset="8" />
     <Blob Hash="d237b5f75364be1e39678add1f0789624301a1ca" Size="4880" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1790054" />
     <Blob Hash="d238846bc36bf5414f38bb61468005bf9e2c29b3" Size="7231" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="352226" />
@@ -61392,7 +61233,7 @@
     <Blob Hash="d25455556a4a266b7fa60e293f14e974c9eb88ae" Size="36864" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="8" />
     <Blob Hash="d2597bda7a17efb8d8912ef275bb6acd8fd82ff6" Size="6658" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1951510" />
     <Blob Hash="d25c61ca9a1f10f6813d9c3a8663c3f771cb60fd" Size="27056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="905904" />
-    <Blob Hash="d262a25777bbd3a85204dbe28ce0633aa155b149" Size="772" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1428229" />
+    <Blob Hash="d262a25777bbd3a85204dbe28ce0633aa155b149" Size="772" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1877282" />
     <Blob Hash="d2645e95cacf4f64a3b63289dd6c9d206f80b41b" Size="3417" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1611347" />
     <Blob Hash="d26817bca7b22a4b9c3428c87936a373ae867435" Size="1066" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2071338" />
     <Blob Hash="d26858f2db488045497392ff1077283fd1187213" Size="2183" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="450707" />
@@ -61400,7 +61241,6 @@
     <Blob Hash="d26d82b50209fe399bd9ea274a2e7414c80bc7f9" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2097122" />
     <Blob Hash="d26ee8e94ffc097176388cc561f67aa1fc2e5c47" Size="3826084" PackHash="c95cdaed781fb020898a671e373b60aa382404ff" PackOffset="8" />
     <Blob Hash="d270b7f3636cf641ecd2c3a1c416a02f9f4357b9" Size="25686" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2053677" />
-    <Blob Hash="d272233d5a579dc78c159cb0ee42fc017c805ce1" Size="313144" PackHash="b221596f9694d342526ce34110f4e329b8f905b2" PackOffset="1562226" />
     <Blob Hash="d27463e99dcf5cd658e4b58eeb01a368064bd57b" Size="7358" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1519459" />
     <Blob Hash="d2786056e1330e199494fc7f7f64c776ad796cbf" Size="1057" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2095117" />
     <Blob Hash="d27952fcc422a027dbf9ff778c842c457b8ceede" Size="265216" PackHash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" PackOffset="1194504" />
@@ -61410,6 +61250,7 @@
     <Blob Hash="d28ac3650cc996abf3413dee88d5d62ffb3fed07" Size="84" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1335960" />
     <Blob Hash="d291cfe049fa10ff2aa2af040b966411b78d4eaf" Size="1904" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1296032" />
     <Blob Hash="d29322018761be0812b2c8e3ea283f1d1a27b37c" Size="163" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1357250" />
+    <Blob Hash="d299173fffd6baefae04a629358b4fa6e114effa" Size="3307340" PackHash="8add538e7df2f50982724667c0f0d8accd785dea" PackOffset="8" />
     <Blob Hash="d29a9843f2838618aacc3107869c2fc64dd041cf" Size="652019" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="474999" />
     <Blob Hash="d29b18c3f2b79843ac595c8535f897d9dffd6eb6" Size="2668" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="802252" />
     <Blob Hash="d29c64f793c63b524eda8ddf842544b5d3ada5f7" Size="30617" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="29734" />
@@ -61432,6 +61273,7 @@
     <Blob Hash="d2b609dc7ec1516b6b76c3161777c6aa8a3d1ab3" Size="2478080" PackHash="490bbb2611f9319ebcfa5efc5f7504e89cdbfd3c" PackOffset="8" />
     <Blob Hash="d2b731b6e5dd111692f2b2047a624595882e7475" Size="4311" PackHash="a76a57c4a5ed17d5ab89cf2b2cf8c53b0605a8f1" PackOffset="2091896" />
     <Blob Hash="d2bbeda3c42149dfb14c18fabf5886a6fd3b4049" Size="167501" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="366546" />
+    <Blob Hash="d2bc381f6192b4bdf3c3e4e0ba3750c17e562bdd" Size="2374788" PackHash="1190c5f967f5124b15da3b53d752af7d4bc0106b" PackOffset="8" />
     <Blob Hash="d2bd93ead13175721c33d91e3ac837a59c289aa1" Size="38277" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1125602" />
     <Blob Hash="d2bf8786b7eaec7c3ffae5b663c26cc93a5cdaef" Size="92352" PackHash="48f3081d1a9290c5aa4944724e4068aae5ac2301" PackOffset="92403" />
     <Blob Hash="d2c43350afc894ab55b187cd521eb69e1c8d3fb8" Size="244637" PackHash="0b19f9b4f8c7fa35c740e15741728028920bc0be" PackOffset="661846" />
@@ -61439,7 +61281,7 @@
     <Blob Hash="d2c62c7f6da1ef399fcbe2ba91c9562c87e6152f" Size="1851" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1016578" />
     <Blob Hash="d2c72a11707214b96b9fdc37b5840716b88d2d79" Size="14361" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="687023" />
     <Blob Hash="d2c9018d6beeac79451328020c94ec2aa60981bd" Size="226" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="839177" />
-    <Blob Hash="d2c98e78b5e953f2d32307fcc0c3f53a5f777b0e" Size="2636" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="979300" />
+    <Blob Hash="d2c98e78b5e953f2d32307fcc0c3f53a5f777b0e" Size="2636" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2026182" />
     <Blob Hash="d2cb44111904feceb9341a126a9d3b650c82fe18" Size="68458" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="912239" />
     <Blob Hash="d2cb496a00c032fab19e0008d66b5a45dceab64d" Size="37426" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="133980" />
     <Blob Hash="d2cf4aaf5eb8c3b0adba7d45fed9101585d4bc1d" Size="3666" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="143135" />
@@ -61455,16 +61297,16 @@
     <Blob Hash="d2e582e17949a192ca8c874ba648104f5dd7b9dc" Size="2868" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="717040" />
     <Blob Hash="d2e6160b671c3c8fdfa76dcc27578fa64a7ad4e1" Size="64" PackHash="ea1ceeeca18772113719947ece176d0109d53dcf" PackOffset="2097030" />
     <Blob Hash="d2e697f13f6dbb497c44fb7ae5cfef1691995795" Size="360054" PackHash="785a36aff000132218d273b16e36412342def12d" PackOffset="8" />
-    <Blob Hash="d2ea73163be272d8f9ac9c0dbb3daf2c23053a05" Size="384576" PackHash="518b018d2f4ec622333a18fbe864ec2261d3e119" PackOffset="1594706" />
     <Blob Hash="d2eb85732df759fa27e08af0007b35655fede4ba" Size="9757" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="415002" />
     <Blob Hash="d2eee82c86ebd11cb406b4f4a1a90b8829466f65" Size="196" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2038342" />
     <Blob Hash="d2f0f5fe39146891f1e0b4f8f4d2f41e0850faf7" Size="92675" PackHash="fdb42faf93278243c4602e932eed4c1728f8ea7c" PackOffset="2002488" />
+    <Blob Hash="d2f2f050fb9acf3b439cd1c159368d0e70bd5a91" Size="2273" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1852013" />
     <Blob Hash="d2f42733a14c371ab025a42c38cad3d3d523a80b" Size="2048" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="2078981" />
     <Blob Hash="d2f6b694335bac5da1e1d46fc64b7de1e461cb68" Size="1642" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="2034662" />
     <Blob Hash="d2f6fe018889be649779e92826354fff1b3a71f7" Size="56304" PackHash="d55fd9dc88154de89726d225895d9986f2863449" PackOffset="2024253" />
     <Blob Hash="d2f86f5fa173bdb02f2dd178c0ab77899dc365b9" Size="179145" PackHash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" PackOffset="1755225" />
     <Blob Hash="d2fa440ab065be3a82a90cec537c33494815982a" Size="24705" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="24276" />
-    <Blob Hash="d2fea99140dbb93ddcc6718782f1274aa73aab63" Size="134911" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1345546" />
+    <Blob Hash="d2fea99140dbb93ddcc6718782f1274aa73aab63" Size="134911" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="1941103" />
     <Blob Hash="d30038949dabec90135a2c024fb28da46c46525c" Size="17845" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="854259" />
     <Blob Hash="d300b0d8458b97903b401bbdc58acdd0f6f0a100" Size="7417" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1384464" />
     <Blob Hash="d30118d0824690bf4bc2462023d39fed3cc95a8a" Size="204849" PackHash="d0832bdb2b5fb1f4997601e49c13919497d63319" PackOffset="8" />
@@ -61494,18 +61336,18 @@
     <Blob Hash="d32b7ba2b5502bb15e73485f12e46c21937e45b0" Size="3357" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1175252" />
     <Blob Hash="d32caa51956d824af62766a1598a7dabaa66f080" Size="47616" PackHash="59d6ba0bbf5662592fa95dc9ce7c7f4749ea1765" PackOffset="2023052" />
     <Blob Hash="d32e39c5c30ea048f1f65e5c4f8a177ae50d1092" Size="315" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1637721" />
-    <Blob Hash="d32e9f47b9bfe8146f45bd45b825e42212650f1a" Size="39" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="2097114" />
+    <Blob Hash="d32e9f47b9bfe8146f45bd45b825e42212650f1a" Size="39" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2097120" />
     <Blob Hash="d3341bea2bdf5da904169d2ebb9821f2fde6817c" Size="10682" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="1937196" />
     <Blob Hash="d3349e93c62ebab5efd0745a8b21e80a9831e9b0" Size="7200348" PackHash="eb4f66337283c3f2dd8fd28ce5b05d61d206d82b" PackOffset="8" />
-    <Blob Hash="d339b413b465cefbef558b1bd5bdaf7efa928991" Size="953" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2095709" />
+    <Blob Hash="d339b413b465cefbef558b1bd5bdaf7efa928991" Size="953" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2096063" />
     <Blob Hash="d33b600d207f87b082af09bc4ba93ea55c0c2dcd" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="607379" />
+    <Blob Hash="d33cc836c7e33d491f3305d152475eaccba5aa44" Size="3337128" PackHash="4dfb261d176ad6229d3fd4c96c56f8ae394debf1" PackOffset="8" />
     <Blob Hash="d33e586fef32f45cfe4cc87b5c6ba466780cda30" Size="1861509" PackHash="c93d2af3cdc8fc5fee0d36f335f87ef43988724a" PackOffset="8" />
     <Blob Hash="d3466998007590729016a84ee8fbaf85e38fea43" Size="18104" PackHash="2408381821f1ad904404880379feec1a2eeb2ad4" PackOffset="491146" />
     <Blob Hash="d34a4725d59267321420be6453e524419529508b" Size="72368" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="8" />
-    <Blob Hash="d34ba2d99fd56d4779cf6fa5877580202587e9b8" Size="4367772" PackHash="49fea89556ebd60737451061c1e68f2c44e13c29" PackOffset="8" />
-    <Blob Hash="d352ab08e0a198e559305ed2380566e9937c66f8" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549818" />
+    <Blob Hash="d352ab08e0a198e559305ed2380566e9937c66f8" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669050" />
     <Blob Hash="d356ddf809ff2d29511855f5089af5ffe5aee962" Size="908" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="56428" />
-    <Blob Hash="d35bc1ad65cdae5c77eea6620b138ac5fcf16834" Size="3330" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1319668" />
+    <Blob Hash="d35bc1ad65cdae5c77eea6620b138ac5fcf16834" Size="3330" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1440694" />
     <Blob Hash="d35dfae6e3e123de8aace04e92dbebf453e3e67e" Size="6382" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="181042" />
     <Blob Hash="d3609f635209e3219dda9f3c4c773ad18967ea0c" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1829943" />
     <Blob Hash="d361648d03dee9606e2f6a04f18abba83189fe13" Size="30132" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="329288" />
@@ -61513,16 +61355,16 @@
     <Blob Hash="d363ebce4fbdbe77b6349b0e6c5101475ed993d8" Size="3356" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="132912" />
     <Blob Hash="d366489e240b7ac29af5c186e220d48ec5b68bd7" Size="6390" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2000085" />
     <Blob Hash="d36c0e41cfba51fbf5dd666f466131498af9e010" Size="12210" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1070020" />
-    <Blob Hash="d36d93306efaf89ba308564897eae04cf3047617" Size="2510" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="2091834" />
+    <Blob Hash="d36d93306efaf89ba308564897eae04cf3047617" Size="2510" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2085374" />
     <Blob Hash="d370c8d48e877a3631b7cb159c8c8ce6335699ea" Size="3833" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1258142" />
     <Blob Hash="d372be9fd2400e36fb766ee683ea53fb28103ba7" Size="2896" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="67408" />
     <Blob Hash="d372fbb59609cc362a63eb538d318960abf01cd6" Size="18430" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="889821" />
     <Blob Hash="d37d17efd9cb2be7f30c2af867cfb7cc1546a3af" Size="3646" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2048688" />
     <Blob Hash="d38053f5fe17b642f52b9acba14d6df94f6e14f0" Size="1439" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2046621" />
-    <Blob Hash="d3806d3f776104324cb91bfac4405833e88fff27" Size="20483" PackHash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" PackOffset="2063313" />
+    <Blob Hash="d3806d3f776104324cb91bfac4405833e88fff27" Size="20483" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="2040950" />
     <Blob Hash="d380eae8b61b6340dc6bae011467253195626654" Size="104" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2097012" />
     <Blob Hash="d381331d4bad0ea7426a133100a326cb6d217be7" Size="33041" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="2016100" />
-    <Blob Hash="d381797073fcba7672af306a95a2c2a3dbcd24dd" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551126" />
+    <Blob Hash="d381797073fcba7672af306a95a2c2a3dbcd24dd" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670358" />
     <Blob Hash="d3829c3bf9fd1444768a0747e321af5a49e74c7a" Size="470234" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="723001" />
     <Blob Hash="d3859aa05ce57f768faa433f7f005886c5f06fb6" Size="44950" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="122310" />
     <Blob Hash="d385f91b929684341f8f36f24a34cd1eaa34c197" Size="8126" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2018330" />
@@ -61537,18 +61379,17 @@
     <Blob Hash="d3957edfe6923923c6b10c97ae0493cbc8d013de" Size="2348162" PackHash="9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c" PackOffset="8" />
     <Blob Hash="d39fc33909de1d81fef92160ba15c5dd3eb183aa" Size="10552" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2061205" />
     <Blob Hash="d3a0e0bdeda4a0f128c5b9bc54988bcc3f1afbf6" Size="1181" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="152545" />
-    <Blob Hash="d3a1ee5e1ca8a8cb4b5ffc888766210149d7e94e" Size="8048" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1587338" />
     <Blob Hash="d3a1f6c6c297939ead2527494a4c281a93a19b6a" Size="692" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="17578" />
-    <Blob Hash="d3a575d76fe6b988bdcfea9f7e61d5b2e0697087" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548646" />
-    <Blob Hash="d3a7d7eb2331a7c4fd27758fc00a9b16df515934" Size="7025488" PackHash="a32dc0bcc2da1610cf2c5220e98027555b465976" PackOffset="8" />
+    <Blob Hash="d3a575d76fe6b988bdcfea9f7e61d5b2e0697087" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667877" />
     <Blob Hash="d3abe1579f834dd218eec3d9e65ba04a83857633" Size="11139" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="2085570" />
-    <Blob Hash="d3ae3febb43772c2bb51cadd04f0d8452dd926bc" Size="5257120" PackHash="046dbc1880244bf220371847dc69b9f8a67aba57" PackOffset="8" />
     <Blob Hash="d3b0589c781c8ef0ce005f4b898b22602dbad526" Size="55" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="738802" />
+    <Blob Hash="d3b244f72b151b60c7275e5078572a1e37ef1bde" Size="2222080" PackHash="99dff78556cc09d817cd21895cc0a4de2253605f" PackOffset="8" />
     <Blob Hash="d3b2c42ac958374169b57ed75d1a113fb625a316" Size="381" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="169521" />
     <Blob Hash="d3b37b40c1ba6e68266c16cb651a80af666641c9" Size="340" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="448127" />
     <Blob Hash="d3bc5552f42ff0f548f5c037d256c6b671d8da57" Size="171805" PackHash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" PackOffset="539660" />
     <Blob Hash="d3bd0f8ba22212c0d4eb123af01336c93f6be59a" Size="86021" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="1568516" />
     <Blob Hash="d3bd1c9447bd6565c019560dd29c4c5f8e680d64" Size="2906" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1092029" />
+    <Blob Hash="d3c00cdd66ef136eaf9982e947884d1a21eae7b2" Size="20092384" PackHash="fb02c7120d9213a6c3a385234eaf0c79a3139a08" PackOffset="8" />
     <Blob Hash="d3c07098ab6760d136625ea7e6a6caa633ae9b7c" Size="4689" PackHash="de85751668591870e7965db775b02872c59e1667" PackOffset="2091080" />
     <Blob Hash="d3c0f4f3f75d1d95cc498aa791a835e6f2245612" Size="1981" PackHash="95c9f70b2a087fabde73d50408cdf43f650b8559" PackOffset="2003835" />
     <Blob Hash="d3c1ca437e903ddd71382b5df11e55dfa3aad69f" Size="967" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="2088081" />
@@ -61576,10 +61417,13 @@
     <Blob Hash="d3f635e1fd2a7e49654435b1943a298b7befa907" Size="20062" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1925788" />
     <Blob Hash="d3ff4dffd4f0911eabeeff6e982b26ac91e41c64" Size="26127" PackHash="8d19c6dac96e38d1f1252a260017729bb07a6157" PackOffset="2051376" />
     <Blob Hash="d401a9dbe7cdd092fae750efe2c228ce7bcb4778" Size="88" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1782032" />
+    <Blob Hash="d401d6e444669870f039139f1e32029b87ce8e7a" Size="8959827" PackHash="4aef200ea9e2c58c5e00f0773864d652168275b7" PackOffset="8" />
+    <Blob Hash="d402025a1202f5e0a2e840db360d51b73edb4ddb" Size="740266" PackHash="9839cc83983264caf62cd87d042ba4cc1024cdcc" PackOffset="1127992" />
     <Blob Hash="d402a530f3348ae298ae9d624ff4dedf4db118f0" Size="6560" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="829183" />
     <Blob Hash="d4041b0e6c82558853ae79596e209bad176ab803" Size="114068" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1929768" />
     <Blob Hash="d4059bd5014feeca787b554534a5e20f79170516" Size="388" PackHash="477dcb4699a191be8ee172b99b25fbc6182ee66e" PackOffset="2096743" />
     <Blob Hash="d407a97cceac80397ac9119a09a6761ab2da78a2" Size="260" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="351197" />
+    <Blob Hash="d4085b5450990274b80e212f2eeedbdda5d81cc8" Size="7572600" PackHash="c6877d0458929133b9d40c016c110b03fdb73091" PackOffset="8" />
     <Blob Hash="d408c7aefc7ebec763a1ef56941b60c8306f238e" Size="12365" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="284874" />
     <Blob Hash="d408dbdb59449454bc9c774d7b86716eae85500e" Size="151707" PackHash="3cd48173c240efc756b78b7c8c2ec1292f6b4b4f" PackOffset="1855161" />
     <Blob Hash="d40aaef0988338c701dbe590556ece50712ab834" Size="161670" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1897970" />
@@ -61590,18 +61434,19 @@
     <Blob Hash="d411e888874fa2082c6a2b0a3e64dc82244fc092" Size="764773" PackHash="a2bf3c4b5b945d91123edb5efd7b8c8163f8766b" PackOffset="8" />
     <Blob Hash="d416c517bcd6995908dba43eccf673f76f5799a1" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="503328" />
     <Blob Hash="d41bc7f43b8b823def88fcaae7306cdddaa53175" Size="284925" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="11784" />
+    <Blob Hash="d41cd589c496ed39a9b92d443a3a2ee6b78f0c06" Size="5152124" PackHash="a440068ac4f6738a82b66c8b8794f0171b01d36c" PackOffset="8" />
     <Blob Hash="d41e5cea37252389662b92ce8f597d648d025e8d" Size="123971" PackHash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" PackOffset="392366" />
     <Blob Hash="d41eba92b8bd5791205ac558c39afc7ad77ed5e7" Size="1344" PackHash="195c11b04e6c4ebb8aeb4f7eaed712a18b8739a9" PackOffset="1760410" />
     <Blob Hash="d41f0af52693b8b1a93156260151cdc7287421e8" Size="621" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2077356" />
     <Blob Hash="d42596e31b2af9e64a2c56c2550943e870530b91" Size="54157" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="251796" />
-    <Blob Hash="d42617c158d82d4467e81ece50dfaeed847a6077" Size="1817" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1026356" />
+    <Blob Hash="d42617c158d82d4467e81ece50dfaeed847a6077" Size="1817" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2073873" />
     <Blob Hash="d4298359fa80ebc4f4b3755331fddbd61d48d13f" Size="35691" PackHash="2408381821f1ad904404880379feec1a2eeb2ad4" PackOffset="238267" />
     <Blob Hash="d429ccec969845d18a317a0fcc060881c8e3e475" Size="103538" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="310492" />
     <Blob Hash="d4308a94ae22b2a1ec5ff1c0522a6720cb342339" Size="53873" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="125373" />
     <Blob Hash="d4314740a20c83abe08430b121d5977eda1fd3c1" Size="358" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="233219" />
     <Blob Hash="d43956b2a01d3a039f1cb3a454f538aa2803b71f" Size="134735" PackHash="f2f7fe5c668ca34fbdf216f2cf6b517129163e95" PackOffset="1141432" />
     <Blob Hash="d439a44fd76c4114ddabba070b6df1f7b0cd0f9b" Size="13284" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="755692" />
-    <Blob Hash="d43c35ef93206ec23d64868f75a32204a943e320" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1549136" />
+    <Blob Hash="d43c35ef93206ec23d64868f75a32204a943e320" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668367" />
     <Blob Hash="d43eaf71fd631be9e1cf1232a4f965f4a127e8dd" Size="19512" PackHash="7e74577c3774e9eb2328f96f667ae7df976b62e7" PackOffset="1962268" />
     <Blob Hash="d43f120cf95da2407e28712ab2cf935e4eb7fcbf" Size="39804" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="1867199" />
     <Blob Hash="d444c5ef65872adc1159817d6df57ed140c9d64a" Size="372" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1500791" />
@@ -61620,7 +61465,7 @@
     <Blob Hash="d4597aba7d6fea19dfe83379646871058530bd51" Size="2718" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="502175" />
     <Blob Hash="d45a0e0d1c00e54de32ac683d5de6ccdb69a37d3" Size="35" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2071727" />
     <Blob Hash="d45abdd7384e2f9342b34911317700ad3f420686" Size="1369" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1703237" />
-    <Blob Hash="d45b9f51e0f311f4ea8c599e368b096825a9c28a" Size="1418" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2002194" />
+    <Blob Hash="d45b9f51e0f311f4ea8c599e368b096825a9c28a" Size="1418" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2060750" />
     <Blob Hash="d460a0b86f37f93db258520a47b0831eba8a619d" Size="2536" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1658558" />
     <Blob Hash="d46aa63f8a5e0acc37637df3702c954f0bdd5b7b" Size="10096" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2050412" />
     <Blob Hash="d46d7c567954f6acc9ab03f1f1d3a7927476f08f" Size="12048" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="210408" />
@@ -61635,13 +61480,13 @@
     <Blob Hash="d489d945ad701ccc0b0d1fd5a651420d28872e89" Size="1964848" PackHash="85b191ae1844ad6da93fa57876c8850de342b4ca" PackOffset="8" />
     <Blob Hash="d4944e2ce3c0d08024ce482d0a474b77d66cf765" Size="17463" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="531293" />
     <Blob Hash="d49575f93f193b343ebbd66a8e093ed43a7d2fa3" Size="655872" PackHash="96421d48a3164d2d4259c4c9500dfbf44d9b90fb" PackOffset="757536" />
-    <Blob Hash="d49789746ff59ce0e8048dbeb26c48f501ac5c18" Size="8063" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1686041" />
     <Blob Hash="d497bc98649b4b0b5e8272c05e72cce33870a30f" Size="2991" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="766659" />
     <Blob Hash="d498faaee1404ba83dd7897dba1aa791f1bd182f" Size="55296" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="2031878" />
     <Blob Hash="d49c50b06d0dbc34b352752746bfaf73c9b03e1f" Size="3263" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1199973" />
     <Blob Hash="d4a097a33a85bc30d0e9051ae9410ade57e3e3dd" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1289736" />
     <Blob Hash="d4a489f70f7be7dc38e2c65c97986231d14694c3" Size="31856" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="192823" />
     <Blob Hash="d4a6abe8ee5e845707419b9731d82935b2068544" Size="16519" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1478129" />
+    <Blob Hash="d4a77f7ec68db9c3c6cad56f0b7feb59b21702d5" Size="4505528" PackHash="26ff1a422ac72ea29ae0f3c6339ed62fd4eb908b" PackOffset="8" />
     <Blob Hash="d4ab69b2192958d16826c7425c99064b15068342" Size="5561" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1021947" />
     <Blob Hash="d4acff3c174fe16d4c992ab3614fd7f8bac61370" Size="6593" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="2029164" />
     <Blob Hash="d4b8b3186078f5db69e5441d4acffc9157ea1242" Size="352" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="2096765" />
@@ -61656,11 +61501,12 @@
     <Blob Hash="d4d564808ef31109752bb573568edd3b2061fa45" Size="1991408" PackHash="32a83d508234ffa544d0570813e08e4f8b6379f7" PackOffset="8" />
     <Blob Hash="d4d6bb155e60e125d74ce22546fe06391beae6b7" Size="47767" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="1191312" />
     <Blob Hash="d4dcb77485014d7aefd270923e2a0e7b3c89e688" Size="169279" PackHash="c42b81378cff6ce0c7ef08835d2b480eefb9aac2" PackOffset="889671" />
+    <Blob Hash="d4dcf216baf67366af13a499051226596efbce3d" Size="1605632" PackHash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" PackOffset="8" />
     <Blob Hash="d4ddba249b5a64b0559922fbc51399cac665df61" Size="1503" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2072672" />
-    <Blob Hash="d4dde2c3aadc1feeef57671ff811ffbd0e0e714f" Size="2238" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1820069" />
+    <Blob Hash="d4dde2c3aadc1feeef57671ff811ffbd0e0e714f" Size="2238" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1939301" />
     <Blob Hash="d4e2e2b602b9549e202ba2c25301c026f36f4959" Size="2983" PackHash="7d2cd67e5409d984a518119f088c05600971a174" PackOffset="2083225" />
-    <Blob Hash="d4e489765367712d36aa024779b00e9c6732f3fc" Size="52576" PackHash="7966ce69e1ca589fd320f02bbfda4db14a641042" PackOffset="2039816" />
     <Blob Hash="d4e51c2948797f35a71a4eb9d7c8107291e79d3e" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1996824" />
+    <Blob Hash="d4e5a08dfcbf1a0a4de3c27a00eb54e1ce91ab1f" Size="19777496" PackHash="d2f16873b087b19044bce92a153c7f123d472299" PackOffset="8" />
     <Blob Hash="d4e61184701fdc691975ca824f3cfe646cb14342" Size="825" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2095554" />
     <Blob Hash="d4ed34c27a02d89316f0a7008b805e4e92d9120e" Size="3242" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="932047" />
     <Blob Hash="d4efe5986ef58dc1840e90a4f2f9fc4a261ff846" Size="618551" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="326822" />
@@ -61672,7 +61518,7 @@
     <Blob Hash="d4fc61ff6d69f47d1cd3188dca488f0f1db2f60a" Size="600128" PackHash="de85751668591870e7965db775b02872c59e1667" PackOffset="1490952" />
     <Blob Hash="d502674aa26fab1ba69d583138b3341b72c24ee3" Size="2027520" PackHash="9fa27c399514b5e1ef6857dd892b39d3cc273238" PackOffset="8" />
     <Blob Hash="d503a9e998c9a5df4dfd7a5f975fe554373a2747" Size="2961" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1128751" />
-    <Blob Hash="d50849a7c4809a9d8eb17e843f0717ed06ae944f" Size="2310" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2088026" />
+    <Blob Hash="d50849a7c4809a9d8eb17e843f0717ed06ae944f" Size="2310" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2064978" />
     <Blob Hash="d50b1b391a3f35c4a4be2f92e49a6e74e5f4b6d9" Size="378" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="185814" />
     <Blob Hash="d50c81de44bd5ffdfea10e2ddca3df5284666ba4" Size="265" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="401868" />
     <Blob Hash="d50cadb3d98a7e76473c9843398dff39ff3fd22e" Size="15360" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="1789504" />
@@ -61689,6 +61535,7 @@
     <Blob Hash="d517829181396d037906801532b99a2e8174c43c" Size="1363" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="140778" />
     <Blob Hash="d51a46b5e896e58f1b42e9a704b70ecb0a544aa9" Size="491840" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1513745" />
     <Blob Hash="d51b0a199263f6cbb244c09f34e050c3816dc8d9" Size="17944" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1537548" />
+    <Blob Hash="d51bc05c958fea168ded3856ad7f5e74cdaa04fa" Size="80896" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="25608" />
     <Blob Hash="d51d8ea1ad85879cbd25770d4140f3fbd66e8ff1" Size="1486" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="1035606" />
     <Blob Hash="d52036717269275a694a7af1e0fad53f0e9b9df2" Size="2574150" PackHash="b2ede978d5e50f13f35cd79308546dc1c0083dcd" PackOffset="8" />
     <Blob Hash="d523bef254423b0a45f562a24b24023fce69382e" Size="6611650" PackHash="67ebcec99338fbc806e98fe5ddcc80abd7cfe885" PackOffset="8" />
@@ -61699,6 +61546,7 @@
     <Blob Hash="d52a71723a0f2098b1849de6340769bb9abe5891" Size="5582190" PackHash="5b0e3711db1e266f2fc10248f58296303d92a6bc" PackOffset="8" />
     <Blob Hash="d52b59ce6a72cbe1b2a484b6ada5df436d780220" Size="30056" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1738811" />
     <Blob Hash="d52b7e1a0c3140d5879ed4c288da06236ae605ea" Size="1435" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1958449" />
+    <Blob Hash="d52e5821ad0230e7d117b48ab6267a1123a17c82" Size="16080" PackHash="255250a7d8c659eaadaf0d8409e90debbbd43d00" PackOffset="2070140" />
     <Blob Hash="d52ec3f1a1b10be8a1aa89c452eba5f475dca80f" Size="4455070" PackHash="b47f7a188473ff6eaeb84907b003641fbb04c57d" PackOffset="8" />
     <Blob Hash="d52fe8f6da312688c0c8471c58c10f9525594dbf" Size="163556" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="54819" />
     <Blob Hash="d5308edc4478c705fffbe822377ae57062722d26" Size="19183" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="420733" />
@@ -61721,7 +61569,6 @@
     <Blob Hash="d55e01fa364ee2bedd10ef7cc5d79b47978e1faa" Size="45218" PackHash="a90123bb85c3d4b8e9fc4d9b4e402d77e3f4092d" PackOffset="2043534" />
     <Blob Hash="d5628721b3ef5a299fe81768ca367dc938395092" Size="3936" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="2038616" />
     <Blob Hash="d563a31a884ddf97a6f677d90ab311ecfb09941c" Size="95084" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1499984" />
-    <Blob Hash="d563a86a2c60aa1a53570b219752dbb6089810fe" Size="3490520" PackHash="e0db7290caec90e5ac30fa2bd76ab2d9f700cc1a" PackOffset="8" />
     <Blob Hash="d56b302cc607b5346bb62e11340fe7fd176f588b" Size="43294" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1527267" />
     <Blob Hash="d56cf57c08465c15ba5aa2be06f186ac113c8afe" Size="1670" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="719896" />
     <Blob Hash="d56e987cacafdb4a330c910770958c922663f38e" Size="1344" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="209404" />
@@ -61732,9 +61579,8 @@
     <Blob Hash="d575258605282b2e2673f248d7e566b157ce4840" Size="583" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="826418" />
     <Blob Hash="d575a4a4fc469874afd4a4e5dabe76e32dd75d8c" Size="13635" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="2077369" />
     <Blob Hash="d575ee8cc64e6f92402049f166c892d303253332" Size="7021" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1135473" />
-    <Blob Hash="d577708b33b5a32c90259f795aae7fabb01091c2" Size="3258" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1166483" />
-    <Blob Hash="d57898553225b76f1d282c6b8205b45bf72e0009" Size="3672744" PackHash="4481ca6b0bc4ba290f3efd0114988cf4502bd5bc" PackOffset="8" />
-    <Blob Hash="d580cd42742dd79df11ec9691d7e62959d40fb35" Size="1587712" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="8" />
+    <Blob Hash="d577708b33b5a32c90259f795aae7fabb01091c2" Size="3258" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1603099" />
+    <Blob Hash="d580cd42742dd79df11ec9691d7e62959d40fb35" Size="1587712" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="8" />
     <Blob Hash="d58373106098b9be72731408e2784528b6421715" Size="10834" PackHash="95c9f70b2a087fabde73d50408cdf43f650b8559" PackOffset="1818103" />
     <Blob Hash="d583c3aa489ed954df3be71e71deae3a9895857e" Size="3" PackHash="89ebbaf2d544372d7908ec03d4025799893eaa80" PackOffset="12" />
     <Blob Hash="d58434ac8bf5f8c1d547f0eec608ad2ff31670ab" Size="17877" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1760337" />
@@ -61749,7 +61595,7 @@
     <Blob Hash="d599adfe3361b9379492992708fd42a33b5ae1aa" Size="4664" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1521570" />
     <Blob Hash="d59e936040948a267565de5625407342433dcf64" Size="3392" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="700456" />
     <Blob Hash="d5a336c93fffdb9efbc48c80242c20bd69ffd567" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1187064" />
-    <Blob Hash="d5a58f1efdaa2a5d0c1eee1d2c8e5ff94515e387" Size="198" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1613418" />
+    <Blob Hash="d5a58f1efdaa2a5d0c1eee1d2c8e5ff94515e387" Size="198" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1732650" />
     <Blob Hash="d5a5a1dbeb04c6f4909b0603b9952ca7c6100055" Size="5442" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1435558" />
     <Blob Hash="d5ac061405ee6f7877709c26bb3aa2154243d51e" Size="2918" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="288392" />
     <Blob Hash="d5acdd444d0b11d8885de6af84827f48a48d0323" Size="5402" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1776772" />
@@ -61781,36 +61627,32 @@
     <Blob Hash="d5f78a4f788218c0c7646f5e1dbe679cff1b0647" Size="86852" PackHash="4d7d1e4d2f147c32d57c60683c7aa26c4f9d10cf" PackOffset="954546" />
     <Blob Hash="d5f863b7456df6d724ce881b3cb39a76293ee3f5" Size="1540" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="271314" />
     <Blob Hash="d5f9a92c094feaf8065910c27957164bbdfd31c0" Size="3750" PackHash="c13461ed1911167f67309f624048d3b72b77286d" PackOffset="152354" />
-    <Blob Hash="d5fa087198894320f807fb5911d386478bad1fd9" Size="2420" PackHash="922fcb527d5d2d92d1f5fe1e17450b8b306d3b7f" PackOffset="2088060" />
     <Blob Hash="d5fcb1b461fa543ef6952ffcdbf341bb9ff1eaf6" Size="303" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1406597" />
-    <Blob Hash="d5fceb6532643d0d84ffe09c40c481ecdf59e15a" Size="42" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2097095" />
+    <Blob Hash="d5fceb6532643d0d84ffe09c40c481ecdf59e15a" Size="42" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2097117" />
     <Blob Hash="d5ff82ec486409e6fb314ad5ace608577c9632cf" Size="190" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="425121" />
     <Blob Hash="d5ff99f8359d71da27163a5372cfb22465bbea47" Size="2474" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="2091975" />
     <Blob Hash="d5ffb29cfcfa4738a939cde87a6d9abb1ef8aef9" Size="12464" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1005296" />
     <Blob Hash="d600178db0ff825e0b83069c22e21c850784ce4f" Size="2187230" PackHash="0dcd2138b0d77e84dd01b019736eefc97445f806" PackOffset="8" />
     <Blob Hash="d602504392fffe4f0fa164bb1b29472a75a63109" Size="89600" PackHash="ce17010a1af2358e1ab4c9c88ca24a6e59f34064" PackOffset="239956" />
-    <Blob Hash="d603767c3ce0fddf43ccf0c2e49a7688cd8c2c5e" Size="54364" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="1957256" />
+    <Blob Hash="d603767c3ce0fddf43ccf0c2e49a7688cd8c2c5e" Size="54364" PackHash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" PackOffset="1986584" />
     <Blob Hash="d6099c52df462cc96328487ac277b0505e11b6a8" Size="313664" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="891076" />
-    <Blob Hash="d60ac7cf4ba9cc6b1204d198d49a3958b4c65c40" Size="345" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1613616" />
+    <Blob Hash="d60ac7cf4ba9cc6b1204d198d49a3958b4c65c40" Size="345" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1732848" />
     <Blob Hash="d61178f5c4875a7e4039fc3680204fbf26e1c815" Size="2808" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="787280" />
     <Blob Hash="d611d8c4ea7967a8a4c649c85edc47791a96247f" Size="12591" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="706333" />
     <Blob Hash="d61348518c6b6d9582cb94418be6dd5bccb66872" Size="5856" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="482761" />
     <Blob Hash="d6171b05d0a42713375100c6d3817263adb4850b" Size="30" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2097123" />
-    <Blob Hash="d61930bf0d017f48bbd73df85ae6352c79607e32" Size="62832" PackHash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" PackOffset="1968260" />
     <Blob Hash="d619aaa21df58c0555db2936a4848f8d8340a19d" Size="421888" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="1087056" />
     <Blob Hash="d619f2876aae72f69ce36672f41b3a725081ea41" Size="199212" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="822841" />
     <Blob Hash="d62041a8c47d6576fdea51b64524c66c4b0ae50c" Size="686" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="253451" />
-    <Blob Hash="d6251629ae7a311de65eaa75adcd28cc85dcc44a" Size="8704608" PackHash="326e06b4c0b0b15a75d2f60be0320be507d410d4" PackOffset="8" />
     <Blob Hash="d625503c7e9ff73b429d2e0ca0905e3a2feff574" Size="24025" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="1961671" />
     <Blob Hash="d627be45fe71ccb3ca53153393c075ff5136c2f3" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1044423" />
     <Blob Hash="d629e7fedc0b350222d7987345fe61613fa3929a" Size="1768" PackHash="6fa388a803c9d6edf145e69165f91aa752cd7321" PackOffset="927793" />
     <Blob Hash="d62ad6123a9b5fa5075b2903bf489468bcec5fe1" Size="923" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2075589" />
     <Blob Hash="d62d56230cbad459895a0034e183b4962ed7eb59" Size="81698" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1192493" />
     <Blob Hash="d62d670d74391a3a5dae2c1905505f085835d746" Size="8680" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1763586" />
-    <Blob Hash="d62e668ba15f43ccbe5dc3f0b5264c16aa7ef023" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554143" />
+    <Blob Hash="d62e668ba15f43ccbe5dc3f0b5264c16aa7ef023" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673375" />
     <Blob Hash="d62f3bd44d59a53f353afc488df864536ac4283f" Size="13324288" PackHash="3dd258f1a16ab13184fa7e614c7c50c013311808" PackOffset="8" />
     <Blob Hash="d6300ebe3c8522213302853187703783e4111182" Size="96" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1379615" />
-    <Blob Hash="d63209187217dc28aae0e787a436c5864e00708d" Size="49500212" PackHash="e527fa14adad9541a4d7a681393c6b27069956a7" PackOffset="8" />
     <Blob Hash="d63233f80b116d554e6a47934d6b25d368edf88d" Size="11946" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1578189" />
     <Blob Hash="d633f65aaf90aa640c216cf7e21a3f20a0f61a0b" Size="17092" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1356336" />
     <Blob Hash="d6347610c8f909c39e8b092940a141152d1cf081" Size="16" PackHash="6c302ed628211be23e74d0b53c8d6c55a671f387" PackOffset="2096777" />
@@ -61819,7 +61661,7 @@
     <Blob Hash="d63d8cd745932e64d5bd4166ac3d4c3f11a58149" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096964" />
     <Blob Hash="d63e3b91473bc8459da4b13720564ddf99c44583" Size="1694" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1774714" />
     <Blob Hash="d649360b8db0c20593e4cdfa74e928b5ca49dea3" Size="2347" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="626914" />
-    <Blob Hash="d64d9f7e1f2c8ea04b42581502d22f3363317313" Size="2866" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1952920" />
+    <Blob Hash="d64d9f7e1f2c8ea04b42581502d22f3363317313" Size="2866" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2080974" />
     <Blob Hash="d64f08127a084df1ade40b26ec333faa3d2ee87b" Size="299" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="2095298" />
     <Blob Hash="d64f2e804008c9419688d64f0f8f33d01dec30ce" Size="1259" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="348060" />
     <Blob Hash="d65186c8ae1d0175e989aafdfaba3d38e76ab8b0" Size="169" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="264469" />
@@ -61831,8 +61673,6 @@
     <Blob Hash="d65eef652c645364b86a2d5e165a514e804d4465" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="160264" />
     <Blob Hash="d6616c07041870bf0120a7df2a0fc981cb7a3306" Size="8288" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="999777" />
     <Blob Hash="d665c7c1b2439543c06b5129500c8dd57a9d93c0" Size="4324" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1538074" />
-    <Blob Hash="d6664578a7cb8068599653199c9ae45c196fb049" Size="3597474" PackHash="f344ae0f983670d5fd6f0c5b86a3bc271be446b3" PackOffset="8" />
-    <Blob Hash="d66766b4b61863a5dd895e4db03c35566e42a727" Size="3502" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1847353" />
     <Blob Hash="d66966b645f4b7808965b63dd5fd5ba3e61fda0f" Size="3313" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="685818" />
     <Blob Hash="d669c846cebd1f2736d82d3aa13b1cd45574276d" Size="14608" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="662424" />
     <Blob Hash="d66f24ab6dc6fbf8f8a53d922c65966ef52be775" Size="6390" PackHash="81cbbc966385c281ee92a7a75568ab5e34091ce6" PackOffset="2084767" />
@@ -61849,7 +61689,6 @@
     <Blob Hash="d68cb65f3ee8b00eb7ee674a406444797882cf01" Size="152858" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="193743" />
     <Blob Hash="d68e0f0c3553db3ee6dbfbf251e3ffdbabc75809" Size="279" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="180596" />
     <Blob Hash="d68e4d915b13ea115e41b75a99421e5fd154eb31" Size="520" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="563104" />
-    <Blob Hash="d692f2399987159e0a2eaddbe114e59948fbb445" Size="41048" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="1992424" />
     <Blob Hash="d69455595eda5bd7795019f42cddbb069aa9f170" Size="158655" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="1070280" />
     <Blob Hash="d699aee6c2d261d9e85029f101fdd38bf9dd59a2" Size="1685" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="439722" />
     <Blob Hash="d69aa139febadc6a788bc60c098c7c93cc8abc30" Size="15360" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1880711" />
@@ -61862,7 +61701,7 @@
     <Blob Hash="d6ab5f67930c708d6a32c3277325bc08df82ef4c" Size="129" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="442810" />
     <Blob Hash="d6acc02b8eaa349d9839c1591349113be8e36c37" Size="53498" PackHash="b631e3c32bd27c8c824ec6ec629c9aa8d48dbecb" PackOffset="1997077" />
     <Blob Hash="d6b39385f6428d3b72e281dd02cb3778cc80d195" Size="1437" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="414544" />
-    <Blob Hash="d6b67434cde58cb9cc660fdc253cd3ad7c0d6454" Size="5118" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1968629" />
+    <Blob Hash="d6b67434cde58cb9cc660fdc253cd3ad7c0d6454" Size="5118" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1909751" />
     <Blob Hash="d6b75dd631713317e519e42f95414d4a0b470eec" Size="7029288" PackHash="fba27461e77ae09847aa45c91d571b84766aefe4" PackOffset="8" />
     <Blob Hash="d6bac2ae2360b4bb85617df31318c6a52468e838" Size="25616" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="327550" />
     <Blob Hash="d6baf54f17f6594659373207c3952d55d15445e6" Size="58" PackHash="bf53b8893ad6da3a5972310cd4ae83e37c57310d" PackOffset="2097058" />
@@ -61877,6 +61716,7 @@
     <Blob Hash="d6d159eeea76a5035e0e9f118ebe794ddfdfb42e" Size="3461" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="768358" />
     <Blob Hash="d6d34ccf1ada50f2701c27edab1a1c79aa461fd2" Size="7632" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="696707" />
     <Blob Hash="d6d3f6a59e8e4dd68c6c2638cc5f0b6617e3e087" Size="2869" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2091287" />
+    <Blob Hash="d6d58640493cbb6330582f346714225fc503435f" Size="14448" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1700700" />
     <Blob Hash="d6d71e90b520fe0d9a224de6d0eb25b9b275b9b1" Size="682" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="2096188" />
     <Blob Hash="d6da3660ae061529255d01617628f23c4d8f5045" Size="6917" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="600187" />
     <Blob Hash="d6dc85cd46758210d67817113436e99d178cc2ce" Size="1390" PackHash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" PackOffset="2095539" />
@@ -61886,7 +61726,7 @@
     <Blob Hash="d6deef963587845a2184e99c077345f0c477855e" Size="131783" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="8" />
     <Blob Hash="d6e5494bf21e630d0fe24d43acaa0c46b4023827" Size="3462" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="1825965" />
     <Blob Hash="d6e8f3f26674e2517fc07317bc7c463e1316bd58" Size="172879" PackHash="035480676338ae2a9bfe3da98161b4c824b6ddd8" PackOffset="1158312" />
-    <Blob Hash="d6ea9293aa7de7cf358a2a81b8c6619acf626ca1" Size="59" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556143" />
+    <Blob Hash="d6ea9293aa7de7cf358a2a81b8c6619acf626ca1" Size="59" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675375" />
     <Blob Hash="d6eb61cf87ff484fa07202b8737516537641c5b3" Size="1534" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2073212" />
     <Blob Hash="d6edd1881c2dbe46c5f526c630d59ac443c02dde" Size="159564" PackHash="792a616c0f78fa0b294f67b56549092efbbbeff6" PackOffset="1725070" />
     <Blob Hash="d6eec53896aea13cbdee3e4b4b589238f48b8c7d" Size="17948" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="826012" />
@@ -61914,9 +61754,9 @@
     <Blob Hash="d73f47837e47fb01c8998ef6a9b351f27c43e34a" Size="18097" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="820025" />
     <Blob Hash="d7438032af83b0bd1c0f9f38390b517c7d210bf9" Size="120832" PackHash="b9a20019362a0c15707ceddcad29b94fdd8df1b5" PackOffset="1671130" />
     <Blob Hash="d7462cb883d55e47fb1393e66cb1dc5ca97620f7" Size="4997" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2031338" />
-    <Blob Hash="d74723a1850791e57d30b10514c3270d071073cb" Size="2350" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2088666" />
-    <Blob Hash="d74756b7f442abbccb38107795c040d8b66d2baf" Size="4414392" PackHash="f414d001a7119b3ddf04f024da6f30fa97fc0ea1" PackOffset="8" />
+    <Blob Hash="d74723a1850791e57d30b10514c3270d071073cb" Size="2350" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2092826" />
     <Blob Hash="d7553784c18585bc44e06d09fe4e6728734e5b32" Size="27994" PackHash="40bbf84ca6f41261515705ea95ae2597aec12054" PackOffset="8" />
+    <Blob Hash="d755f0b969740a152f76ae1ea4fcefe4acefa2a2" Size="7733688" PackHash="3c6d5dab25fb13a45790e741a4eae07ec3e52176" PackOffset="8" />
     <Blob Hash="d757720109b57df6e90ee05fc62d1f92a9993027" Size="174" PackHash="21495600a60ec70990241fb254dcb18dce209ffb" PackOffset="791" />
     <Blob Hash="d757c5f05a18e129e0db8bcddc945e4c94a384db" Size="2521" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1672376" />
     <Blob Hash="d7582587416f732d2abdcc6595804a6246a6ae7f" Size="114176" PackHash="753eb938736a4b412147164d4077e991f9c89950" PackOffset="8" />
@@ -61929,29 +61769,30 @@
     <Blob Hash="d76ba3241d9b137aad050ecc76383dcf39adeec6" Size="337416" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="316455" />
     <Blob Hash="d775522a3906f9b789c36c1992ea3139ece1bbc3" Size="5683262" PackHash="54ce1d601df08958e89d2d95d9b9fadb62dc7848" PackOffset="8" />
     <Blob Hash="d7798d2f3faa0a182155a64649a9c93e8fc99601" Size="129192" PackHash="3d2da6b4c1789684dbf930127a75b3e2efbbd464" PackOffset="1204574" />
-    <Blob Hash="d77b07028aba877fec0153f879429e584453c9e8" Size="862" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1442646" />
+    <Blob Hash="d77b07028aba877fec0153f879429e584453c9e8" Size="862" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1891699" />
     <Blob Hash="d77d3f8d2f8c2d9f8eda62c4ae10e13b0d13f738" Size="5600" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="2091004" />
     <Blob Hash="d78038e1fc345ac3d993e1d03307539334f1601b" Size="22528" PackHash="01caadf325e923f9dbc46785f18c5b154cd78ece" PackOffset="2057064" />
     <Blob Hash="d7824cd6ac14d35f21cf257537e97395f018203c" Size="16779" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="297793" />
     <Blob Hash="d786507e703247d1f45ccfbb3533e47e22e1ae6d" Size="14292" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="144076" />
     <Blob Hash="d787945217085f8215e943226e6d98994ac4aa6c" Size="1180708" PackHash="35ebdfdf49c250eec03bfe601c7b1b0dc2c2b69c" PackOffset="8" />
-    <Blob Hash="d789cce49473793a4e1f8a26df8da6a472fe047e" Size="4012" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1158039" />
+    <Blob Hash="d789cce49473793a4e1f8a26df8da6a472fe047e" Size="4012" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1594655" />
     <Blob Hash="d78ac3387c6504543d8911590ea7d8d73a8103e5" Size="1569" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2016460" />
     <Blob Hash="d78f30ef5da543cb703bf052197bf3870a7451bd" Size="62976" PackHash="fe34956f65e0611aa1584ca611b7843e22e3e29f" PackOffset="1711525" />
     <Blob Hash="d79039ea5df929cb68886b3c1a86eafa9e891bbf" Size="5955648" PackHash="011b36ca50044919bfde8b1396fec71438335764" PackOffset="8" />
     <Blob Hash="d790d8af37dc84568e1406b95aac5a51b38ddcd7" Size="61531" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="324571" />
-    <Blob Hash="d7921514327fc1a306e097120a587efdf2a9da83" Size="18923" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1743357" />
+    <Blob Hash="d7921514327fc1a306e097120a587efdf2a9da83" Size="18923" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1941685" />
     <Blob Hash="d7948ab03aa3053768e1ee439447d70acac01943" Size="384314" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="1298898" />
     <Blob Hash="d796c97cc4635f65bb34527dc07073b1f3308d08" Size="442344" PackHash="b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" PackOffset="428420" />
     <Blob Hash="d79c56fa180bc769fc8830f2dcdf4845daa760e0" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1142792" />
     <Blob Hash="d79d9221154afc2c5b602aadfdb6e5238423b1c9" Size="9216" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="234928" />
     <Blob Hash="d7a0c709a39089a2d76e667190870a97586d15d9" Size="75094" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1042290" />
     <Blob Hash="d7a55f1cd147a2493869b36ef759608e7ac4e334" Size="11666" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="306224" />
-    <Blob Hash="d7a6a6937465e9d940396df0d75c38b1cdad2245" Size="1031639" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="640742" />
     <Blob Hash="d7a8d75296fc755e069edbbc8fa6724f91bfadd6" Size="3508432" PackHash="f2facb060651244fb9d2551d6b1e003a55a2b0ec" PackOffset="8" />
     <Blob Hash="d7aa4560cdb69a19e0ae34a3c849048618f338bd" Size="3907" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="559822" />
     <Blob Hash="d7ad4c807167c27b1c35a89b81f36ab0c8161679" Size="3542" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1362390" />
     <Blob Hash="d7ae5b6d722d51fb0eef0742c663dc747b6ef8b0" Size="152" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="124680" />
+    <Blob Hash="d7b411c800c76f5d0c7d0649a12cc20b1746a233" Size="19759952" PackHash="7a40dd99744a7fce004bb774f9ce3db2ffd4c1e9" PackOffset="8" />
+    <Blob Hash="d7b5cdaaf94c1f442773fbb93b6baacdb3e646ef" Size="2226" PackHash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" PackOffset="2094350" />
     <Blob Hash="d7b8f04fcfc4df6161d6e62b6e92d9d2baf67c82" Size="82709" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1725826" />
     <Blob Hash="d7b976e77eef663a29e445b9c119cf53ca02f828" Size="155" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1523338" />
     <Blob Hash="d7bc275e57d7e5982103b36aca50467ad27f476c" Size="5450" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="233771" />
@@ -61969,7 +61810,8 @@
     <Blob Hash="d7d4324fefacaf9f92a945f3e14869c56c8c0129" Size="21762" PackHash="77e0b57b01b65dac3277a08c2b0b1b18d4ff0c34" PackOffset="2053569" />
     <Blob Hash="d7dba75c5f0c1d36eccc43f4031dc9371e7fb122" Size="3530" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="643478" />
     <Blob Hash="d7ecccb7396ecc22b5b42a57f8e5232c694f1b27" Size="1011" PackHash="9a3106f71b0fbae7c935c63362a16d9a0419c9c3" PackOffset="2095140" />
-    <Blob Hash="d7edc3639c5f5e9e199b09dda859c9dba0312c58" Size="18926" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="1927842" />
+    <Blob Hash="d7edc3639c5f5e9e199b09dda859c9dba0312c58" Size="18926" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2067787" />
+    <Blob Hash="d7ef895cda649a1225df610e15a9b11d0a1bfa69" Size="45744424" PackHash="e9d9fd9ac6c16314cc4d1c17acead2d5ae27c75d" PackOffset="8" />
     <Blob Hash="d7f24ec33463617d98df2e66f2588a6ca67b119b" Size="574" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="319283" />
     <Blob Hash="d7f263fa95d9ff19a289900a7f40068348f1bc64" Size="2500" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="703512" />
     <Blob Hash="d7f35f4936b662747e3c7353887e0613da3ce49e" Size="1999" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="1128198" />
@@ -61980,7 +61822,7 @@
     <Blob Hash="d8063ca7779674eb1d9fe3e4b4774db20b93038b" Size="426" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1053554" />
     <Blob Hash="d8093ee449736aa8c8a91526c9f7bd6bb6571374" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1825338" />
     <Blob Hash="d80b7a4b7a41e8bd165c37b4eff2cbcd04e6342d" Size="73216" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="2005127" />
-    <Blob Hash="d80bdf0375fa74963a844221443f46b9a6a698b4" Size="348" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1580239" />
+    <Blob Hash="d80bdf0375fa74963a844221443f46b9a6a698b4" Size="348" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1699471" />
     <Blob Hash="d80c67b856373b9b859674b0dd1faa2406e76837" Size="5151" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1464434" />
     <Blob Hash="d80cc3954b3623f284dbc441579c97b157807f35" Size="1716" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1451703" />
     <Blob Hash="d80d3dcc34ebcbc0b58724833bf45b98fb3e7956" Size="4188" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="395884" />
@@ -61992,7 +61834,7 @@
     <Blob Hash="d8297cf216002a5f2b9559157dfe6d2970c3b809" Size="10115192" PackHash="f229289982177e74b3eb92ccbcb0825c38219d40" PackOffset="8" />
     <Blob Hash="d82c24b1ce2eec11c35321b539c7fd1892190d30" Size="10496" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="782752" />
     <Blob Hash="d82c58e55950affa4d9a215265b23535b4bca5b4" Size="190210" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="356559" />
-    <Blob Hash="d82c71ea9d3249721cc3c8482bf8e6406935fc2a" Size="336" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1599716" />
+    <Blob Hash="d82c71ea9d3249721cc3c8482bf8e6406935fc2a" Size="336" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1718948" />
     <Blob Hash="d82cf07be67657f635769e2eece21a953bb4e898" Size="5152746" PackHash="a10a63fafb76bc8871e5586801789c0de7657b8a" PackOffset="8" />
     <Blob Hash="d82d0ca3c90e4c20b8a902a80d5bdff389c9b006" Size="2541" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="320736" />
     <Blob Hash="d82e54782dfef4f26f8b941e26b1055f611a5146" Size="129" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="442681" />
@@ -62003,7 +61845,6 @@
     <Blob Hash="d83a3f12a59c655add91fb7688ef7a8285be95b6" Size="172" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2087612" />
     <Blob Hash="d83d23fbf8933f5537a319fbee539e15a99af239" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="764936" />
     <Blob Hash="d83dede623a4c6366d4713c33239fc24e71e548c" Size="10240" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1177447" />
-    <Blob Hash="d846708647aaffcb19699d0259fd856f5112ab6c" Size="3360516" PackHash="0c0157dba5da40850e17d1c05d984bf3128d0338" PackOffset="8" />
     <Blob Hash="d848de7d1dd0f2e2b905a13f15a3f8ac8b32f622" Size="7786" PackHash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" PackOffset="2084822" />
     <Blob Hash="d849c8c98e1219c8678d788525580a5daa95610f" Size="1051" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="891907" />
     <Blob Hash="d8521209dbfe05615269183e0bf6b6ca8c3f48b9" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="919560" />
@@ -62011,19 +61852,19 @@
     <Blob Hash="d8565b41c37911b42f4796bf4c9ca67d9a46ffa0" Size="545221" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="997126" />
     <Blob Hash="d856c5b3285d3e28b1982a957334190ce6298917" Size="19938" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="57246" />
     <Blob Hash="d8572877a6b3554fe7f4575101107c0679a5eb9d" Size="75264" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1661448" />
-    <Blob Hash="d857e4b4fcfb48e4f55f54482ad629f553f75f52" Size="825" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1049733" />
+    <Blob Hash="d857e4b4fcfb48e4f55f54482ad629f553f75f52" Size="825" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2096197" />
+    <Blob Hash="d85973fb8b4983590a989111583bde71594b7033" Size="335812" PackHash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" PackOffset="1110024" />
     <Blob Hash="d85c182edb49a5f71eb7d7933d7cbb2c09e8b3d8" Size="19237" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="494125" />
     <Blob Hash="d85cdefdf516430fd0c7a9b317926e57c2e0e438" Size="113424" PackHash="0fd5eed8a60e37b2e26485203138f76bc959a273" PackOffset="1979398" />
     <Blob Hash="d85d7583839561ac88c9da8fed25da7833219c70" Size="5978" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1441708" />
     <Blob Hash="d85f532bc0e67ba9ece52c5666ff65dcdf11c824" Size="5536" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="157128" />
-    <Blob Hash="d867684562524e6e119d29965ecd8d5fad6bf89c" Size="384" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1590660" />
+    <Blob Hash="d867684562524e6e119d29965ecd8d5fad6bf89c" Size="384" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1709892" />
     <Blob Hash="d867813a06ef0d29d121e15adf57b65767b84a8d" Size="270263" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="1255478" />
     <Blob Hash="d8693c802e7ecc1b5f28946f3611cfcfd6d4332a" Size="148" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2076636" />
     <Blob Hash="d86a6ddbf9d3f1e17d766ae9d8b29fb4d07b43eb" Size="1622" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1869434" />
     <Blob Hash="d86b67b0891095275a61fcebecf738f41d37f326" Size="341456" PackHash="48b9cfd22101481b2a96c5f7542dafa24cf5554d" PackOffset="1063710" />
     <Blob Hash="d86ba4132b096d0f1494180b29a9c1584c540255" Size="35012" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="2029540" />
     <Blob Hash="d86c1568e9556415bbdd21e4f652a6078d489f36" Size="24887" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="93024" />
-    <Blob Hash="d8705072668d5576198ec6ae931025238298df10" Size="2440" PackHash="24f711f28e15d36dff933b636995f7644caca6dc" PackOffset="2091312" />
     <Blob Hash="d870c3e7189f3455675c099b63cf02e1d94ac0d1" Size="2022148" PackHash="551654d82bdacbe12dfe0a27ff7948b6ad1894b5" PackOffset="8" />
     <Blob Hash="d8744bfd3587db3687c4492525212feda2cb3fff" Size="8175" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1685021" />
     <Blob Hash="d876cd225b8e55ab8a07d845b90ae1aa54b3f25a" Size="871" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="191313" />
@@ -62042,7 +61883,6 @@
     <Blob Hash="d894276834a437a60eb2ed9f87e79235d92e9fa6" Size="88948" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="355493" />
     <Blob Hash="d89c324e5139c8b8130e26064f94c41690c3bdad" Size="328" PackHash="60fb5701eed18af817e516eab0fbf9f94fd39be0" PackOffset="2096764" />
     <Blob Hash="d8a041a81cf1ac2701492b724c04645affa5d758" Size="6178" PackHash="68d38951ca4d3d30a245076c500b265ca391d43b" PackOffset="2086791" />
-    <Blob Hash="d8a659e7d5943b2d940c45ce6c64f038a6196075" Size="3433714" PackHash="bce57b497eb51165d9646666f1846c24e86b194c" PackOffset="8" />
     <Blob Hash="d8a65c33c1df14930651e1b34b9349b6b179205a" Size="41" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="2097075" />
     <Blob Hash="d8a6fc003416ea19297e32bc6e2d35f8b7d7c392" Size="557" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="460128" />
     <Blob Hash="d8ae0e9813e446af0df7e88488f4686db350c5ce" Size="5525" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="2003869" />
@@ -62050,11 +61890,11 @@
     <Blob Hash="d8b2c82aa0bdf66e44055a3703635e6784395e95" Size="22854" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="594828" />
     <Blob Hash="d8b6cd2af66d0b85f997a193db6015fc7ece5336" Size="75669" PackHash="2fda5ea89a82d953d04583ab86b387b1b3f3dd6f" PackOffset="1950072" />
     <Blob Hash="d8b71807eef86456dc697f0da844145b42a2f65d" Size="44074" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1361183" />
+    <Blob Hash="d8b76739c696bee1e2b3d2dccf3bdcbf13985dc6" Size="341984" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="1577960" />
     <Blob Hash="d8b9841750ea7284ea2ecda14b927dff9cb8e8fd" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2090361" />
-    <Blob Hash="d8ba99d5fffb9af2b89278fcded0e33927494897" Size="213504" PackHash="75c65d19aade831c17c4a014eb50fd28b2c2710c" PackOffset="1823752" />
     <Blob Hash="d8bc518b4373feb05d134d14e6b9103955d8adff" Size="113884" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="290042" />
     <Blob Hash="d8bd7122b25ea07a6c7ab3bd42375bf17066020a" Size="6482" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1628597" />
-    <Blob Hash="d8bf8da847d440f3ca5ea57079f31a056c1fef2c" Size="64" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548207" />
+    <Blob Hash="d8bf8da847d440f3ca5ea57079f31a056c1fef2c" Size="64" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667438" />
     <Blob Hash="d8c1e5c2fce8bc0b85b39cae538b1033c4286dad" Size="4493" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1766005" />
     <Blob Hash="d8c5763ae5c5f66e6c92b80083894cb3ce44384b" Size="5376" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="187860" />
     <Blob Hash="d8d09826254e1fd34cd5e0e335d9db1ce35f878b" Size="29505" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1069535" />
@@ -62069,37 +61909,38 @@
     <Blob Hash="d8dcb8f2535f83c451b144c538516819b8d7e867" Size="136748" PackHash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" PackOffset="863873" />
     <Blob Hash="d8df9ab606c63ca6597aca101ba3eaef6c13c864" Size="17253418" PackHash="b9fc977c5ee7b9a3af4af8fa56b43920a882cc46" PackOffset="8" />
     <Blob Hash="d8e0930a4bb09ad178e7c2ad7406abf488a87fa0" Size="265734" PackHash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" PackOffset="729074" />
-    <Blob Hash="d8e1b8492478baee0d72a40881d5a4b4756d83a1" Size="17956" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1777391" />
+    <Blob Hash="d8e1b8492478baee0d72a40881d5a4b4756d83a1" Size="17956" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2033747" />
     <Blob Hash="d8e2980678488ac22d589510d9f2f0a9cb2cfef9" Size="35" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="734057" />
     <Blob Hash="d8e803ecca37ed91eca5cd1069705d9d55e8e6f6" Size="22788" PackHash="89ebbaf2d544372d7908ec03d4025799893eaa80" PackOffset="15" />
     <Blob Hash="d8ebe16f024d9814d0b85dde84b1b68f6bb74ea9" Size="58218352" PackHash="823426b9349b70b265f8587bea8e92f6f5f01d38" PackOffset="8" />
     <Blob Hash="d8ee1d3a8b36893c662012138f18adbfcbe28629" Size="324374" PackHash="4abf0595e4706e434b909ea697e6e34737cc2bbe" PackOffset="1547596" />
     <Blob Hash="d8f062a9269230311ee3b11ebf40f69c4f158548" Size="2846" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="51831" />
     <Blob Hash="d8f0927d51905ee599e89b3dee42032499f165a7" Size="116620" PackHash="5859a27cd8455a700a819950415b42097c9bb411" PackOffset="949669" />
+    <Blob Hash="d8f6b836f7c94f0cb221765b0d6a817655606229" Size="7295744" PackHash="ec70623f42eeaf612b720485175f227c59378e12" PackOffset="8" />
     <Blob Hash="d8f76523adf7d2def1b53e9e1198efae60ba2062" Size="17172256" PackHash="8e48f02465d510f5d39d6e837300ac70872b2799" PackOffset="8" />
     <Blob Hash="d8f938a26185a37e2818d8279689f4793ae426b9" Size="309150" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="865836" />
-    <Blob Hash="d8f9772454f230f328a8cce540b558d4066c584c" Size="672" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1400663" />
-    <Blob Hash="d908e7a9dc216987330d1647871b92bdc13a54fc" Size="31001120" PackHash="1e45ceb9dbd1394fccdd45af21f00c74c3eeadfb" PackOffset="8" />
+    <Blob Hash="d8f9772454f230f328a8cce540b558d4066c584c" Size="672" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1519915" />
+    <Blob Hash="d8fcee1d5bc426562debcaebd8ae73d6faf71196" Size="18240" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="2067728" />
     <Blob Hash="d90a28e834c647d2fb5e9f9f2f75488ff018ded5" Size="3823" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1984317" />
     <Blob Hash="d90a6721ed661994f4c55c63e92e76ad1b57a7a8" Size="24853" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1628941" />
     <Blob Hash="d9178ade5998661c5b5428068369b441f1f04c42" Size="4401" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="240511" />
     <Blob Hash="d91bbfbfe58607442d7847ff86022e462d666c7e" Size="296" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="837770" />
     <Blob Hash="d91f353ba5397c1c812155cde3dc370e20dbed17" Size="69424" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="1914708" />
     <Blob Hash="d91fd4fdb65a283f310448298cbe0f13b17c3533" Size="3136" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="880505" />
-    <Blob Hash="d920a076055991f245c4e6a107fa63675c3951dc" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550787" />
+    <Blob Hash="d920a076055991f245c4e6a107fa63675c3951dc" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670019" />
     <Blob Hash="d92102cc7d0f1e75fe333d5a8ecf7bffaeda897b" Size="6983" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1223306" />
     <Blob Hash="d9213341c1692b7229a5e30f0cfed39859952341" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1745899" />
     <Blob Hash="d921cadc1139f8ec6a30dd53651b4f1528058a77" Size="896" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="668947" />
     <Blob Hash="d92a3269f7bf5ec00f082c64cef6e20c43017180" Size="199" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="137394" />
     <Blob Hash="d930f1a32553d18b1d64d081c6896da20a54ed6d" Size="2349" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="2093269" />
-    <Blob Hash="d9310fd8d4dd7c863f3393da11116bbc3ba33b14" Size="674984" PackHash="3491acd3495d393fddd95e53ae58e13b61e6eced" PackOffset="1158372" />
     <Blob Hash="d93152a0bfbee9fdaeb68b9d5333ce02653c8164" Size="134" PackHash="9fa27c399514b5e1ef6857dd892b39d3cc273238" PackOffset="2096953" />
     <Blob Hash="d934429cd2c8da7ac37adae561ed4d0bf66f8b61" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2089164" />
     <Blob Hash="d934d481fa605a24cc4f75bf11725f7fecc885b7" Size="234416" PackHash="57879f40e9c9382403204bb281cfc94a7148ea32" PackOffset="1480560" />
-    <Blob Hash="d93695246e668abfae69417690ebb19bbee4f4aa" Size="187" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2025849" />
+    <Blob Hash="d93695246e668abfae69417690ebb19bbee4f4aa" Size="187" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1916060" />
     <Blob Hash="d936f5084521b69f1a85d5ed1c6b86b8889b17ab" Size="275" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2074376" />
     <Blob Hash="d938f17798ae31d771cda4377e8b7f2ecc1415fa" Size="1019" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="656795" />
     <Blob Hash="d939b680d2312dc8ed385b4755c5c225521120b1" Size="2916" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="730594" />
+    <Blob Hash="d93dd084c21cd7ab071f83faa63db41e4a7ea1c6" Size="7308976" PackHash="82c52f0c633f52373859026b355e3b0f6574f232" PackOffset="8" />
     <Blob Hash="d93f2348a79eef850011c925d197a93fff7400f5" Size="157552" PackHash="d1cc40fc311b1fe882b059047a6c7f53925c9827" PackOffset="680466" />
     <Blob Hash="d945f5f9d4f884268520241b3596f6511e096c02" Size="27478" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1143244" />
     <Blob Hash="d947c078ace2d649594891276848a5b891f90301" Size="578" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="681362" />
@@ -62110,7 +61951,7 @@
     <Blob Hash="d94db81b11e4b2814718f40acddddd71c04bfb06" Size="511" PackHash="416a2ef9e1d85c9801e1c11b5b75e6647f40b196" PackOffset="2096596" />
     <Blob Hash="d9533d342084d0db25f4f48f8e544ddce61484c4" Size="2908" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1799638" />
     <Blob Hash="d9559eb2895833a80efa0c964f0261f5087aca17" Size="9084" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1790554" />
-    <Blob Hash="d95611ec50c991a2fc69c7d6c2da6d936b0a6582" Size="36277" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1618257" />
+    <Blob Hash="d95611ec50c991a2fc69c7d6c2da6d936b0a6582" Size="36277" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="2039816" />
     <Blob Hash="d956b6e1dacef404203a4dbc65178f73999a0295" Size="2959" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="434137" />
     <Blob Hash="d95bf5306c164c10e757bf29aa163b169f7e88b3" Size="1052037" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="1029168" />
     <Blob Hash="d95c485e5cf3be4382b89c1e94fe5aaa6cfd42de" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2083362" />
@@ -62122,28 +61963,28 @@
     <Blob Hash="d9658b34fa23468933360354bd55d281bf9d0298" Size="110080" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1927688" />
     <Blob Hash="d969139789780fc758d82fb22bca07e7dbeae99e" Size="48" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="926970" />
     <Blob Hash="d96b3daeaef1d70376e479d54146d0e907486cd8" Size="97171" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="1835997" />
+    <Blob Hash="d9730ac2f1f35e3033e0484de5c72abfade6df51" Size="2324" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="2090466" />
     <Blob Hash="d97647e862013a50868492870965b141b5b08fe3" Size="3044" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1893190" />
-    <Blob Hash="d97bc333713e84597b6785503811da8ea1d43e8f" Size="2870" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1392590" />
+    <Blob Hash="d97bc333713e84597b6785503811da8ea1d43e8f" Size="2870" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1512050" />
     <Blob Hash="d97e27f92c5e0707cb644b706c8457ae92cbe6aa" Size="3636" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="2003612" />
     <Blob Hash="d97f1270473d96187d07314991d11d2808bbcf1b" Size="12273" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="247894" />
     <Blob Hash="d97fff2d477b39df0b237d2049e3750f4e3058e7" Size="3251" PackHash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" PackOffset="2086666" />
     <Blob Hash="d982d9b3bf0a77169629966f48828c62317ff947" Size="102860" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="912753" />
     <Blob Hash="d9842270ef641d9f397bc7de9bd99676b39a01e2" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2079108" />
     <Blob Hash="d988a414efc67cd4ed3b86ce5c43b4bbca3796f7" Size="1059" PackHash="a256d63248e60ea748a2577552e6a02d3e75e23a" PackOffset="23588" />
+    <Blob Hash="d989a781d83a764d9c098616eade182729535a2f" Size="2340" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="2092072" />
     <Blob Hash="d98befb7e2e7e128b4a32b055b2ffdea875f84be" Size="2546139" PackHash="fd84aede972e04d6ea88683a48c6ccd908f4df5a" PackOffset="8" />
     <Blob Hash="d990fc629609e14cd3407aa931ac4b3786f8562f" Size="7879" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1942688" />
     <Blob Hash="d991b784150205c8c078e8261effbca7a6dacf1e" Size="214366" PackHash="d0832bdb2b5fb1f4997601e49c13919497d63319" PackOffset="836338" />
     <Blob Hash="d9920e5f7f1935a94d50152e52e335a6b3a4a52b" Size="55970" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1796155" />
     <Blob Hash="d994f1a8f4a99d8101d1a2977ab0074a94d1b31d" Size="1478" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2088158" />
     <Blob Hash="d99634f357acf4b557c4d99e9f28548afe42d8d8" Size="245248" PackHash="da4da2f40baa6c08a42a6d05a81529a0bf2b1a69" PackOffset="1606152" />
-    <Blob Hash="d99695a6ae40f5825a3be9076633b7a46a735653" Size="86738" PackHash="141031efaf451d2e472cd328bb1fefd91ab2ecf5" PackOffset="1993447" />
+    <Blob Hash="d99695a6ae40f5825a3be9076633b7a46a735653" Size="86738" PackHash="2e859b9ceef48f55e7e7f6c05869680f93148f93" PackOffset="1760187" />
     <Blob Hash="d9977a20f2390884e46ae9b2c0966c115e53d0f5" Size="2907504" PackHash="8a1aaedf4102b9632dd10ee62fd2ea5bbffd060b" PackOffset="8" />
     <Blob Hash="d99a3209481f876fb761ab296b4d0a0373a72b25" Size="3437" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="1910404" />
     <Blob Hash="d99ddd6abbadea3d3bfb0cd48a11cad6e4cd0106" Size="104" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="811976" />
     <Blob Hash="d99f79ff70673b057c83ec849f592a96b9cb4f08" Size="4768" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1733962" />
-    <Blob Hash="d9a0c76a7cdf2b0a0795fac0ffcc78b68706b156" Size="628" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2095843" />
     <Blob Hash="d9a11b2595ebfe5bd451eb1159641a1e5eec3d3a" Size="7299" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="2088770" />
-    <Blob Hash="d9a1a6a7616a5ed37a66110cb53ae8096736d5f3" Size="1591714" PackHash="4e505deebc9662aff77016e24f1a43e3be8fdfff" PackOffset="8" />
     <Blob Hash="d9a296de2454cc962672cb9a9425e8b9542df9dd" Size="3011" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="927136" />
     <Blob Hash="d9a2a52a42bff723fb0366c7788a928d4f886082" Size="6812" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="855" />
     <Blob Hash="d9a7e4308181624ad6dbb9736491136734b4a906" Size="999869" PackHash="629161f1442cc070f84ca259e983259288e25a85" PackOffset="664104" />
@@ -62160,14 +62001,15 @@
     <Blob Hash="d9cbeed156ce05ef767ae2e0ecb191b8d560bd8f" Size="2429783" PackHash="58c296582abb3dba4bc073aa6708c81bc8798ff7" PackOffset="8" />
     <Blob Hash="d9cc6e32eabd70796826cb3a1f775c6b67fd1d36" Size="64151" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="234080" />
     <Blob Hash="d9d345eb0772ce3f5168f5f4bc6fcd0a15e0f824" Size="961" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="290614" />
-    <Blob Hash="d9d374ce6a5ee40ece5c8eca71f0c5d8101d9195" Size="2163" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1367962" />
     <Blob Hash="d9d37ae03d3366eddf24e35d211a2d5421813700" Size="19824" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="749068" />
     <Blob Hash="d9db45133a1678cf25d7a3671eb6a30d5d547b4a" Size="174425" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="534078" />
     <Blob Hash="d9dc603749c22716360858268f33d8d34ceabd54" Size="1191424" PackHash="0c845e0f8dc0189835418f168dfb653326459528" PackOffset="8" />
+    <Blob Hash="d9df538ae68edaa3d7105000698dec418d504eef" Size="5143536" PackHash="39960855e0e97fe3a059887eb52597e5d12160f6" PackOffset="8" />
     <Blob Hash="d9e128abcfc1ceca22e6e4f9daf60bbf6fa4b2d7" Size="232761" PackHash="d852eca7663f1c36dab87cbd527dbfac895faf97" PackOffset="1223756" />
     <Blob Hash="d9e19160f4c8b275a35fe8b26ea4f02547de11ce" Size="392" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2096659" />
     <Blob Hash="d9e66f85c0ca7338e72abe3bd12e344b89c570d4" Size="6963" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1713045" />
     <Blob Hash="d9e770db5df36bd1aec85b832e73211b26dc852f" Size="3795" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="2056221" />
+    <Blob Hash="d9e8fbfa081de563db8019567ecc754f91c83e60" Size="3382168" PackHash="b15635d7b90d51495450261f63cd529defe1780e" PackOffset="8" />
     <Blob Hash="d9ebe3b35b1da164b3c34c8b881fc382650444a7" Size="2260867" PackHash="2eb3f8f72bbae78a5266bf490a982bc3f22281eb" PackOffset="8" />
     <Blob Hash="d9edd20d98cbd7b2003641cda0b902d6af4641b4" Size="3485" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1481617" />
     <Blob Hash="d9f08f1d30ace7d6024cf3c2317c731925bece8e" Size="16186" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="158947" />
@@ -62186,26 +62028,24 @@
     <Blob Hash="da0e742769702fe092689752514ab68ba536a6c0" Size="18147" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="773439" />
     <Blob Hash="da1069e45f29bf2fba99e54f72dec9b6a6bcb938" Size="8683" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1925548" />
     <Blob Hash="da11c36548a0d284dde32490cd8a5cd0d93e6c49" Size="599" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="1353622" />
-    <Blob Hash="da144c96d3a383d3136a5de7737334f77f0e35ac" Size="57" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1944827" />
+    <Blob Hash="da144c96d3a383d3136a5de7737334f77f0e35ac" Size="57" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2096827" />
     <Blob Hash="da1559c04b093fe0c887ddcf039a42099b7d86c8" Size="24600" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="612816" />
     <Blob Hash="da1837a3f97f4d403b0173c2b9b5277db0702418" Size="79" PackHash="10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b" PackOffset="2097051" />
     <Blob Hash="da192626e848fd025c72fb0333821a18d1669ca6" Size="84759" PackHash="d852eca7663f1c36dab87cbd527dbfac895faf97" PackOffset="700092" />
-    <Blob Hash="da1a90b77429e833840884d42bab85be164ef05d" Size="789748" PackHash="8fa3b7b9dfcdd86814c8d31b88442e487b319bd9" PackOffset="1089010" />
     <Blob Hash="da1ab492c48af8441d7e5f52ed7a2d381ec98a86" Size="219" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1647940" />
     <Blob Hash="da1e5782c15152e3dacc0524b8fef6adeda9affd" Size="4141" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="873097" />
     <Blob Hash="da1f30e03683aeb4cfe21c352ea1814b91a605e3" Size="37888" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1730865" />
     <Blob Hash="da210300dc3d94fc3d8ba0a4531341bca5c5936c" Size="11124" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1194612" />
-    <Blob Hash="da22b467b0f2e325ea629db63f3bdae31e28c01b" Size="16202" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2078043" />
+    <Blob Hash="da22b467b0f2e325ea629db63f3bdae31e28c01b" Size="16202" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1829400" />
     <Blob Hash="da29bfffacf4d24062f81edb3e1f651ae1df5e2f" Size="7480" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1565620" />
-    <Blob Hash="da2b89d87511e84ffd5e5e253bbaf8b3082a7380" Size="18001" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1831677" />
+    <Blob Hash="da2b89d87511e84ffd5e5e253bbaf8b3082a7380" Size="18001" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2015449" />
     <Blob Hash="da2ca2ba623062ba0c97869bde9e4716511b6f7c" Size="22288" PackHash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" PackOffset="671109" />
     <Blob Hash="da2e2dc7b75b616dda983ff84ac65c62dbf7bb81" Size="34109" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1329449" />
     <Blob Hash="da2ed9a3d4504fd17b69fe63aaa1e60ea0b8dfd1" Size="120" PackHash="6cac0ce67fc25ab9057de053ed68e469376a951a" PackOffset="2097003" />
     <Blob Hash="da2efcbac2110c1db08003b4bc239044b59cbec9" Size="490" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="271905" />
-    <Blob Hash="da38fb8585bd6017a82f6cff643c8c216951336b" Size="16080" PackHash="07e31d5227b75af815bac4e9271886f59ee2ab58" PackOffset="2071850" />
     <Blob Hash="da39a3ee5e6b4b0d3255bfef95601890afd80709" Size="0" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2097037" />
-    <Blob Hash="da3d67c1fd3ed8e1e643d8ca502fa3db22192b44" Size="3293" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1231403" />
-    <Blob Hash="da4032f9e0a9753489a58f81bf02930ed6952e04" Size="24808" PackHash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" PackOffset="2059294" />
+    <Blob Hash="da3d67c1fd3ed8e1e643d8ca502fa3db22192b44" Size="3293" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1675377" />
+    <Blob Hash="da4032f9e0a9753489a58f81bf02930ed6952e04" Size="24808" PackHash="3726f8567de19acda762812bfd9dff62242da925" PackOffset="2070860" />
     <Blob Hash="da418c7c68a79f0a4e0238b44737f08b5d1b9113" Size="5326" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="848132" />
     <Blob Hash="da4a89e8841a4c6b57adb527bb744f9b66986c39" Size="5117" PackHash="1108bd75becd710a98c124322f511dab995ed481" PackOffset="1449839" />
     <Blob Hash="da4c1dc9b095b7efb6af4e31831784eb27e9f0a9" Size="346416" PackHash="cfaa6e2212f937f340e867175482030d495675ed" PackOffset="11383" />
@@ -62223,6 +62063,7 @@
     <Blob Hash="da6911cefdc3552dd33fd4873f38b742ecf0f2f7" Size="2991" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="148664" />
     <Blob Hash="da6c0f47a1ad5655342770c2b08aa846d4888529" Size="397929" PackHash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" PackOffset="451910" />
     <Blob Hash="da6f22c7ade0d36cfe7a80d5a3b39b51f51cf86f" Size="3272" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1207938" />
+    <Blob Hash="da70bafb31d437ea5f5e90376f052073c2fc296a" Size="114192" PackHash="9839cc83983264caf62cd87d042ba4cc1024cdcc" PackOffset="1982514" />
     <Blob Hash="da70d911b08bff12743af148dac9d65bff762585" Size="931" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="2079174" />
     <Blob Hash="da71043ffb19da42f6745412ea297d03d9ade695" Size="11636" PackHash="95c9f70b2a087fabde73d50408cdf43f650b8559" PackOffset="1828937" />
     <Blob Hash="da7625ae10be29c4df1e9beb18067506cd041706" Size="4355" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="480452" />
@@ -62230,10 +62071,10 @@
     <Blob Hash="da7a01499ea946c85b5a2b1d0da501991e361ae3" Size="3173" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="496454" />
     <Blob Hash="da7ade552ecb7ff2d5eacc5de4818ca62ab8946e" Size="2836" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="752041" />
     <Blob Hash="da7d5dec8f4735b3be3caa23272f619162699032" Size="819" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1334330" />
+    <Blob Hash="da7ddc9f478b789b47b4965a6f3d9a4b427f9c75" Size="3145128" PackHash="bf6f61a3bf3e0df9d887eba3b9ae713121565ce2" PackOffset="8" />
     <Blob Hash="da827d6fa8c8b14e81c11476d2a2e12aa01c3a9c" Size="86341" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="412740" />
-    <Blob Hash="da8973e149f8f46164c3ce96fec86ebee5fd31ff" Size="17916" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1161470" />
+    <Blob Hash="da8973e149f8f46164c3ce96fec86ebee5fd31ff" Size="17916" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1926454" />
     <Blob Hash="da8c704a8e37ec996d7e55acd5752522bfb394a3" Size="143983" PackHash="696aa11a029bfeebe1885750c0a1219698f45667" PackOffset="458248" />
-    <Blob Hash="da8c8ea204116370686ed75cea85b7346ccfd1da" Size="3482648" PackHash="0ff93d57c8deeb69f9a9ba42346eeea5d09c7867" PackOffset="8" />
     <Blob Hash="da8d658dcc6fe1725664e585c3e7b9f88e49530d" Size="600" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1797956" />
     <Blob Hash="da8d73f3d769629618f3ab08736a7497479b64b4" Size="113455" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="8" />
     <Blob Hash="da94a82b772f9b8d54d4ed9eaa78b170c175d965" Size="87599" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="655823" />
@@ -62258,7 +62099,7 @@
     <Blob Hash="dabc92bc21c9376df17d770e66d69ea88857b180" Size="116293" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="547809" />
     <Blob Hash="dac787fcc6c1b060a52d9de445517087a631d575" Size="1483" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2030275" />
     <Blob Hash="dac7cccac9e3bdf1cc9af87cb9552deb461fd348" Size="3829" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1001632" />
-    <Blob Hash="dac89bb94dd32177e7af700fd62387cec69f0c44" Size="76564" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="2017800" />
+    <Blob Hash="dac89bb94dd32177e7af700fd62387cec69f0c44" Size="76564" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="1928099" />
     <Blob Hash="dac8a00f567fee776727ca0d37d9cfd0d6f7980d" Size="34816" PackHash="303ddf28767e0ef83c669c43d74ec40d813f6251" PackOffset="1485004" />
     <Blob Hash="dacc3cad3e7ceb987cf93ff7c296b1d3ae972d74" Size="6278" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1818420" />
     <Blob Hash="dacd0e433c5fadbc36fbd615348f50798dde8233" Size="7327" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="203002" />
@@ -62280,10 +62121,10 @@
     <Blob Hash="daf2aa61d75f8b43d153e256d40f8c98167669e4" Size="17200" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1273872" />
     <Blob Hash="daf39dddbc599ee3af52dddd2730f4d4311fdb15" Size="509240" PackHash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" PackOffset="1342254" />
     <Blob Hash="daf7e9c1800922ae2580ef3384e37be84a7e3a67" Size="1220" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="790088" />
-    <Blob Hash="daf92d9c589fdaf5e679b9d230b7b5c1f6b91495" Size="675" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1600052" />
+    <Blob Hash="daf92d9c589fdaf5e679b9d230b7b5c1f6b91495" Size="675" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1719284" />
     <Blob Hash="daf9b0ee678d45c02de2b7050c2a8270ca7bd0d6" Size="7142" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1241587" />
     <Blob Hash="dafaca14aa42dbb7a6e5d2f39d5e8bb9d28fe469" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1133812" />
-    <Blob Hash="dafb288a1dacc159ae7fc2d767d50fd21c9ed1ce" Size="2737" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1509787" />
+    <Blob Hash="dafb288a1dacc159ae7fc2d767d50fd21c9ed1ce" Size="2737" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2046869" />
     <Blob Hash="db018ef3a37b56139e92f5b36739efe2128064d8" Size="75310" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1355548" />
     <Blob Hash="db0b01d62178cb54bd97e8b76e0be4ceb8c6f9c1" Size="85" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1257372" />
     <Blob Hash="db0e24a308a530ea1128d7dd170d90a8a4a00505" Size="28" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2068197" />
@@ -62291,7 +62132,7 @@
     <Blob Hash="db13a4a25883d1b8addac523ac043871eb02acd1" Size="2608" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2094297" />
     <Blob Hash="db15c2209178576dd50ed5f4a8a71fed0333f668" Size="527387" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="8" />
     <Blob Hash="db184e751c26a4103f8ddc2917b5214b0456cf19" Size="436" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="830433" />
-    <Blob Hash="db1b6b8e68bfac80c92c0ab2989ca9e48327e3e7" Size="2420" PackHash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" PackOffset="2090336" />
+    <Blob Hash="db1b6b8e68bfac80c92c0ab2989ca9e48327e3e7" Size="2420" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2067288" />
     <Blob Hash="db1c3bf2ddcb4892e65f1f63168575801f62e900" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2080184" />
     <Blob Hash="db21e7d12e269001247b8d7ad5e3028e48289946" Size="265229" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1367837" />
     <Blob Hash="db2493d51c273a7accf9f2eb88f4044b589aa043" Size="282" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="168448" />
@@ -62307,7 +62148,6 @@
     <Blob Hash="db456e0481680c9e2d9410a7555e76fe59c9d63d" Size="2960" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1059740" />
     <Blob Hash="db4b640cdd3757100e6c82916120d010cb126df0" Size="3785" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="2092386" />
     <Blob Hash="db4e4546b01fc04c0038f471996337b955478ad9" Size="4882" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="236177" />
-    <Blob Hash="db4f618534fe17b98fad971a648f22a12b4b2d34" Size="12730856" PackHash="1b216fb287fb1caf2398e7a132f2773a850af853" PackOffset="8" />
     <Blob Hash="db516bf9a5cfce8c0f56219b2a5bac23c93c75d0" Size="12843" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1037723" />
     <Blob Hash="db51fbd31c473b2f46fdb0222ec65d510ee9647b" Size="5016" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1870152" />
     <Blob Hash="db594f1c8fc00d536f6d135bd7f8a9a99a6b8eea" Size="51761" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="1952315" />
@@ -62323,15 +62163,15 @@
     <Blob Hash="db6e23d55d296232562f24a7e7cfc0d62f485519" Size="154141" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="1620187" />
     <Blob Hash="db6ef423e34d45470c9fa406e5460869504961d8" Size="3187" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="511809" />
     <Blob Hash="db708fc2c45d07de1791512f59fdb4fd89a447e5" Size="87798" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="699005" />
-    <Blob Hash="db7110c8deb17392e445d1b70a0c13efbb5f26cd" Size="1742" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="2095258" />
+    <Blob Hash="db7110c8deb17392e445d1b70a0c13efbb5f26cd" Size="1742" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2095216" />
     <Blob Hash="db7412262960a10f4d6188ce98cc5d6e07e4bf98" Size="114675" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="833101" />
     <Blob Hash="db7a6dc13aa71879836df67e46862c141e9a854f" Size="11561" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1991114" />
     <Blob Hash="db7ae687098031991b30d780d009ab8a0ee7ffba" Size="231554" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="231799" />
     <Blob Hash="db7b09f53493643f79ab624faae34b4a51c55bda" Size="464" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1970707" />
     <Blob Hash="db7c1612cbf75be4c080e6e781eb2f5f1ead8085" Size="144" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="2096928" />
-    <Blob Hash="db7d69138207783eccc921a998ec8741b6a563ff" Size="28672" PackHash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" PackOffset="2061544" />
     <Blob Hash="db849a6c8158b985262af4ba28687deadfe6c634" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2083820" />
     <Blob Hash="db899f52c673f3942d5aa0b7c30b48a163119b59" Size="1490" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="926727" />
+    <Blob Hash="db8b303e8c3695db7574200c287346755abae2cd" Size="67114" PackHash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" PackOffset="1892244" />
     <Blob Hash="db8c2edef35a75dbcfcaecc73a53499f297181de" Size="3152" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1607282" />
     <Blob Hash="db8e6759875404c6375c29523b5f4642fc44da14" Size="220730" PackHash="a72777b59db815500e14e5d580278ca8aeb0af3c" PackOffset="555849" />
     <Blob Hash="db8fc3b58c14dac5f41bd66e7099cbc66a74eaf9" Size="38658" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1291922" />
@@ -62367,7 +62207,6 @@
     <Blob Hash="dbe45539283bf86193200298a799fc0ba2755e01" Size="205312" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="658952" />
     <Blob Hash="dbea5f403810a423ba40043c9365749b696b55ff" Size="245009" PackHash="4653f71982a36f99d16331bbaebded3036eff50f" PackOffset="637392" />
     <Blob Hash="dbeaf1ce446b5c736a9d431febb46c77313e45bd" Size="4446" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="514598" />
-    <Blob Hash="dbec6ee2810cb3d69f80e1f53e35c6d96c08335d" Size="492712" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="379856" />
     <Blob Hash="dbed0d8491bdbf8412de896c319533fa8916954b" Size="13064" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="1219761" />
     <Blob Hash="dbedc38599f1af3bea6e686544d9ec862c7e30f4" Size="15979" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1711238" />
     <Blob Hash="dbedfc31162fe60c6ce58d0766d4d921ea2f901f" Size="2017" PackHash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" PackOffset="2057457" />
@@ -62377,7 +62216,6 @@
     <Blob Hash="dc00d1a9cf167a4fc3b87ccd15047b69e98e261d" Size="2827" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1239322" />
     <Blob Hash="dc022676975edaf14582768d236afd99dfa69612" Size="12296" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="211137" />
     <Blob Hash="dc02d2e44c37a0d2e6c04c3be7ce8ec4ffe9ef0b" Size="9229" PackHash="7ae32a8aa3e7d7599069e8c73c4bb5dcea7cb0a4" PackOffset="2082312" />
-    <Blob Hash="dc0505762b04f0dbb9e07d31b4dae1fdd686af86" Size="128867874" PackHash="10eb201f2607493da5f19783ef9f6b33f188b445" PackOffset="8" />
     <Blob Hash="dc072b171e8b7ad5762c765c54bdf4e3b2198225" Size="418290" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="697127" />
     <Blob Hash="dc0b7053ca885d9df5df3cd5445adbf93cac3435" Size="9168" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="340784" />
     <Blob Hash="dc0b72304316498c61a403393ee8ed2b1ee53969" Size="124955" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1252614" />
@@ -62407,11 +62245,10 @@
     <Blob Hash="dc3fd4b3b91118be0daba05095952faf36a4e23c" Size="18243" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="1532840" />
     <Blob Hash="dc411e8ac12c3d588ab2f3a3c95a75d8689ad402" Size="1209" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1090611" />
     <Blob Hash="dc4430f76071e5abc489e509366cab56504d2d65" Size="3332288" PackHash="4bffc9974adee394ddec87f1b2c5330f48a64cdb" PackOffset="8" />
-    <Blob Hash="dc458620028e34bcb38c21ebe01725ff46b831f5" Size="142197144" PackHash="fcc5fd64f6086d2453df61b8b5a0f69479bcd341" PackOffset="8" />
     <Blob Hash="dc4d1e755fafd613795b9b7aa1b45021e3605579" Size="102773" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="553050" />
-    <Blob Hash="dc5086e5a7056a5a60ed0b83845c92537bc910f6" Size="286" PackHash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" PackOffset="2096864" />
+    <Blob Hash="dc5086e5a7056a5a60ed0b83845c92537bc910f6" Size="286" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="2096843" />
     <Blob Hash="dc517443ac1f424af993bf8f28258991d6eff608" Size="406" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1532827" />
-    <Blob Hash="dc52c15e72184e48ca30eee40a2708cbf0c6c203" Size="3212" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1220355" />
+    <Blob Hash="dc52c15e72184e48ca30eee40a2708cbf0c6c203" Size="3212" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1665186" />
     <Blob Hash="dc53392d5ac36c61ccdec3fc64b2853977ceb07f" Size="1534" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="722258" />
     <Blob Hash="dc5835c9c0ae2b3ef37381f3d5b45b5eef3e165f" Size="3823" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="618464" />
     <Blob Hash="dc5f61145a06243686a2f39c17c5e761105cd2be" Size="1047409" PackHash="df7e1c0f4fc78d7814f044a10de1362862cc7bac" PackOffset="693240" />
@@ -62427,7 +62264,7 @@
     <Blob Hash="dc7e349aa5d22cc8ee283df33eef121bfa256aad" Size="186368" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1575944" />
     <Blob Hash="dc7e46a22a930194fbee95ac7e6b37067575c79c" Size="4612" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1560415" />
     <Blob Hash="dc7e7cc3cffaf54bad13efdc24d3b1a59cfebccb" Size="265256" PackHash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" PackOffset="1737148" />
-    <Blob Hash="dc8140cb0be3c2d2ded4e1dc97d49ee28b5b9f5c" Size="2816" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2023376" />
+    <Blob Hash="dc8140cb0be3c2d2ded4e1dc97d49ee28b5b9f5c" Size="2816" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2084797" />
     <Blob Hash="dc83e0ba1580278389b70ad23047d8d108cbd9ea" Size="623" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="683095" />
     <Blob Hash="dc848c91a7b3b13f0c9295cc60a28fe47d2befd7" Size="505" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="390783" />
     <Blob Hash="dc864f05365abed4ac96908ef357dae47a241e61" Size="5796" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1469876" />
@@ -62437,20 +62274,22 @@
     <Blob Hash="dc8fb4e86549748ac4d359e6904415010f7ca410" Size="6394" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2057508" />
     <Blob Hash="dc91b64d956f34a536c1d3ca903e15c87d0d4786" Size="1483264" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="8" />
     <Blob Hash="dc986b6ced133dbb57e44391907c65786ddb1aea" Size="5996" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1630594" />
-    <Blob Hash="dc9a92a6c78c86896b0af4ac532f1aeed0c67412" Size="9304" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1603414" />
+    <Blob Hash="dc9a92a6c78c86896b0af4ac532f1aeed0c67412" Size="9304" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1619239" />
     <Blob Hash="dc9bc7b23438c70745563836cecf88911e4703ce" Size="3538" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="815688" />
     <Blob Hash="dc9bd1f7a60878d115eeeb7d11d6aff79dfe024c" Size="12382" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="247937" />
+    <Blob Hash="dc9ce22fbcc592a22b1570238990bfc7c77b771d" Size="2556416" PackHash="1e8ffd2bcbea9cb9c6be76aa809b6271bda43370" PackOffset="8" />
     <Blob Hash="dc9f8e948c9603d9ae5aefb0d5e0cc53ad7dc256" Size="39488" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="971395" />
     <Blob Hash="dca0812c0d10f1609fac0c2cd3f9206b76cbeb29" Size="373603" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="8" />
     <Blob Hash="dca31ee9472e8cf50e97d6bb68b4b34bbe907c84" Size="3192" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1073298" />
     <Blob Hash="dca436e5e2dffcb1153be0e52edb20e18f0d660a" Size="37198334" PackHash="430d46ad31b390fdc03602141718861e6a32e79c" PackOffset="8" />
+    <Blob Hash="dcaa69242976456d722d49656734cae8e99acd0d" Size="8643" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1797628" />
+    <Blob Hash="dcab754c1508d2aeecbca15b69f8b762bab60d11" Size="18929400" PackHash="d2555e6cdd17fb0fae45125777c8623c83b7bd51" PackOffset="8" />
     <Blob Hash="dcabb3c093b898974d6a8268411b93439fcf5e56" Size="13664" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="168417" />
     <Blob Hash="dcabd42c67c5eb4ef45064104bf0e39ba4329d86" Size="37237" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="979497" />
     <Blob Hash="dcad3ab73e666bba5eb1d0ed7b5852192a818353" Size="23457" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="2029783" />
     <Blob Hash="dcae9d2f364baada9686cc96b6dc1e99c6fb29c9" Size="2801148" PackHash="8df9075247ce7198d4904e532b1cc4a41276762b" PackOffset="8" />
     <Blob Hash="dcb10d1ca32c7c66a2959aee2314c60507ab2a39" Size="2252" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="2094584" />
-    <Blob Hash="dcb12a5e8e51d844b247a6635d5b1cffae2743d5" Size="9229" PackHash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" PackOffset="2087544" />
-    <Blob Hash="dcb1c4fdf204779da8f0925469c30a28738d1c45" Size="45731352" PackHash="39ecb453ceb0073a7896aee8f035545bb0f067b7" PackOffset="8" />
+    <Blob Hash="dcb12a5e8e51d844b247a6635d5b1cffae2743d5" Size="9229" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="2085020" />
     <Blob Hash="dcb54a6d8b65273412d05975feb73d5b105df5dd" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="437144" />
     <Blob Hash="dcb63fcd0ee8332daf5cf713e4b7e7f10c161a3c" Size="2988544" PackHash="fc92061b914604745aa1fa704123734aa78113f7" PackOffset="8" />
     <Blob Hash="dcb99435961076839b5845aba2d1d86069897f20" Size="6328" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1967889" />
@@ -62470,24 +62309,23 @@
     <Blob Hash="dce3ae9561025dc217b53529ef1f48ff5a308044" Size="963" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1793102" />
     <Blob Hash="dce3e4d5c6f443c6641929c3429427ce75a6e540" Size="55512" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="1555832" />
     <Blob Hash="dce63f41652abdf4a0e8047f0ec66986fa766bcf" Size="44032" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1591500" />
-    <Blob Hash="dce6cdc5417a0f534058b9940088d3f0edb241fc" Size="259" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1292146" />
+    <Blob Hash="dce6cdc5417a0f534058b9940088d3f0edb241fc" Size="259" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1741048" />
     <Blob Hash="dceccc65eecf072da41421a1245bfcaeac90ebad" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1573100" />
     <Blob Hash="dcf24049d510e4962336b015776925be6a6c4554" Size="180700" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1770618" />
     <Blob Hash="dcf2981277704b35382b0c4de989c243ed349ef0" Size="152906" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1231253" />
-    <Blob Hash="dcf3c2d1f657a92218063e0e9d2f337f97c5f0ee" Size="2991" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1117283" />
+    <Blob Hash="dcf3c2d1f657a92218063e0e9d2f337f97c5f0ee" Size="2991" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1887227" />
     <Blob Hash="dcf46951aee239490f21829862faf93691773db0" Size="4522" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="923779" />
-    <Blob Hash="dcf6dd6b6adae0986b5893580203ceab8af0d3af" Size="27977" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2032736" />
+    <Blob Hash="dcf6dd6b6adae0986b5893580203ceab8af0d3af" Size="27977" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2055373" />
     <Blob Hash="dcfa78f245fac10cf9f42a42fe3db8bb34e17b1d" Size="110581" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="76698" />
     <Blob Hash="dcfba16d1ad325a3f3cb964d3bedb3bbc2ff2702" Size="24415" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="682944" />
-    <Blob Hash="dcfdcd85bf14c57ce685e240be73e2fec5a2196d" Size="8" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="2097151" />
+    <Blob Hash="dcfdcd85bf14c57ce685e240be73e2fec5a2196d" Size="8" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2097136" />
     <Blob Hash="dcfe2f46eb1fb514d8ac2bdb66abe63bf4bad929" Size="266240" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="1406472" />
-    <Blob Hash="dd0558d1ab9de5a4456d44ec8cbf65050b2f41f8" Size="2450" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2088810" />
     <Blob Hash="dd10f897dd211d463d062f5bf478398b85e573c6" Size="9071" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="441605" />
     <Blob Hash="dd1150247f03964e3014ea5fdc40630d5128fa0f" Size="4481" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1479217" />
-    <Blob Hash="dd11f01b881082e983858f7cdf506f12786aa200" Size="308196" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="848304" />
+    <Blob Hash="dd11f01b881082e983858f7cdf506f12786aa200" Size="308196" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="905712" />
     <Blob Hash="dd1a41ea30012f737ceec1f6c5155fdeef4e1950" Size="112" PackHash="d95d0dfee072d179a0e04916b7b80ef37d1f6fca" PackOffset="2096850" />
     <Blob Hash="dd1bc3d2836ee607640d41bc3b409da10de1a32a" Size="9190" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="903177" />
-    <Blob Hash="dd1bf057fbc5b902f206be232ee2898dad354952" Size="48680" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="752440" />
+    <Blob Hash="dd1bf057fbc5b902f206be232ee2898dad354952" Size="48680" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="809848" />
     <Blob Hash="dd238c5ba7a3677f5f6b43f8bab33f187d7d464e" Size="10025" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="983372" />
     <Blob Hash="dd245f2af47eafa84cbcd077bfcc36ce49ffc0b6" Size="685" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1257457" />
     <Blob Hash="dd2a06ef62cfc68fd40343a0c1cea6632896c1ef" Size="5014" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="365132" />
@@ -62502,24 +62340,24 @@
     <Blob Hash="dd369961c6196a1c72205bd5f845e8b0cb4ab800" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2085656" />
     <Blob Hash="dd36d9bba889e8a7235819cdc3a03803c524e24f" Size="335" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="187199" />
     <Blob Hash="dd3c3a9c05d58953fd42c67def45998a1ceaca12" Size="3140" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="297016" />
-    <Blob Hash="dd3df5f573825b171381e9582b27cb4f5b62d65a" Size="6187980" PackHash="346fbb2d4c75abfb08e365be08c38566f022852e" PackOffset="8" />
     <Blob Hash="dd3ee27f8a1963e9a8e0cbbc82792246474b65bc" Size="3309" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="922815" />
-    <Blob Hash="dd40b9548a331ed56cb7f684d1c4255d21c6633b" Size="564" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2096479" />
-    <Blob Hash="dd4111b86920985d6a8c589cfefa95f646faf7b2" Size="3697" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1059959" />
+    <Blob Hash="dd40b9548a331ed56cb7f684d1c4255d21c6633b" Size="564" PackHash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" PackOffset="2096556" />
+    <Blob Hash="dd4111b86920985d6a8c589cfefa95f646faf7b2" Size="3697" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2000693" />
     <Blob Hash="dd41fabe13d13797386ab23a05053dfda569d60a" Size="6044" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="490588" />
     <Blob Hash="dd44fd9311bc964d4e972d6416767c016123b9b6" Size="12259328" PackHash="0401e5e54462f53392c35a3c16bfcec383ee000e" PackOffset="8" />
     <Blob Hash="dd45903edadfe1987879abdc7e69f8d4909ee398" Size="1256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="2092323" />
     <Blob Hash="dd46f785565af433c9263ea8c0c7e606db315341" Size="9730" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1819894" />
-    <Blob Hash="dd4bf4f0b44b644c6b69097188d8780c69118097" Size="925" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1057854" />
+    <Blob Hash="dd4bf4f0b44b644c6b69097188d8780c69118097" Size="925" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1227888" />
     <Blob Hash="dd532526e7c8de48e40419e6af1183658a973379" Size="224014" PackHash="74f904f20ed3e1cd02cc9d0e07a2778948328274" PackOffset="490819" />
     <Blob Hash="dd53dc01f7a5437c22376ad941644e55767a92b9" Size="15490214" PackHash="b613d7e37c38ecd3e9d68f662c1d1301e4fec91d" PackOffset="8" />
-    <Blob Hash="dd54477192d45b3946a09fb3d3a17e33d96d21f4" Size="3697" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="984755" />
+    <Blob Hash="dd54477192d45b3946a09fb3d3a17e33d96d21f4" Size="3697" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2031637" />
     <Blob Hash="dd5656a2c008a262a93aa17c3aee82cab5272c02" Size="339939" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="1649837" />
     <Blob Hash="dd566769923c55a7a96be36937b4a8a530c8ed66" Size="6694" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="140286" />
     <Blob Hash="dd5831226ba1ed697cb1b74b3a4136ca17aba19a" Size="18624" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="464800" />
     <Blob Hash="dd585d363472a5db1f42b14a381e9377ed16bcd9" Size="37331" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="966440" />
     <Blob Hash="dd59ea68638a3c6a72a86043b2c1ab0fa1488841" Size="1151488" PackHash="8eb93ecba0b5fb9152871b939466168fb359c26c" PackOffset="8" />
     <Blob Hash="dd5b1b18919e4a691bc19572fac4d111c4151932" Size="125965" PackHash="66f3a69afc09dae5b1c60855f816c149a2ea7bfb" PackOffset="334106" />
+    <Blob Hash="dd5b21b48b33907c93448fe30f3155ba3b520dec" Size="5253256" PackHash="0475e2dd05348c03a3067ee40053df4b78a1239c" PackOffset="8" />
     <Blob Hash="dd5bf6f69bad83f1df3004f288c335d7ccd54d07" Size="1079" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="16200" />
     <Blob Hash="dd5d2f0b7cf500e024b798229a6b6e16150897fb" Size="6063" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1974675" />
     <Blob Hash="dd5f7f4c266677f46c62c20f389286ea3994b981" Size="1963478" PackHash="d056afbf456aff85bf24ade1bfff28a42688c87c" PackOffset="8" />
@@ -62527,23 +62365,23 @@
     <Blob Hash="dd63731df3c4332d585afd89138e9980f8b5efa2" Size="13707" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1513560" />
     <Blob Hash="dd646efe2387b07a28e4ddec69eb080a764bb483" Size="2837" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="2849" />
     <Blob Hash="dd64d1cf4a1a53fe66737f9efadfb4defbd60640" Size="907" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="836781" />
-    <Blob Hash="dd6622cd06fe40cc2f4a2f12cb76d8d0ae1d4b8d" Size="6929598" PackHash="91f7bcb7eeb0908dc500be858b8838ff214c3a29" PackOffset="8" />
     <Blob Hash="dd67951ee3b61c94d27d7d9f5a26367914cf45b8" Size="260" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2074907" />
     <Blob Hash="dd6a19c967687accb867fd57ff9cb5a0c5605d58" Size="17912" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="509587" />
     <Blob Hash="dd6a84caeb3884964f883191d0a20daed2c6f759" Size="18416" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1154699" />
     <Blob Hash="dd6f3e7f8f36ba74157dcf6e39dd699fa8174c98" Size="74138" PackHash="599154c7fdedb4715635b642cc8b52c0414437e9" PackOffset="136114" />
+    <Blob Hash="dd6f685e06d15d9b2ca6b7d12474eaf64fc1d9fa" Size="113420" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1056264" />
     <Blob Hash="dd708e3a3a1177a6541b3a75db147bf44ed59fb4" Size="217283" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="813199" />
     <Blob Hash="dd72a966d3b33dea35ad57b91e1b56e51d528196" Size="7924" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="267188" />
     <Blob Hash="dd73bb58d16aa3a25134cdb337b1e4d77acc1cb8" Size="98153" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1786693" />
     <Blob Hash="dd75249c5355483c578ab85277c13c145a9448d3" Size="222" PackHash="1058c282f2647f5fa855e001839e6ed3902961e4" PackOffset="1743306" />
     <Blob Hash="dd76da13b7bf80f2327d28c91613ed150c8cfdf2" Size="209695" PackHash="c007855aa7a0479a01364a56f831920abf69f840" PackOffset="1820680" />
     <Blob Hash="dd7a454907761b13cc6e03fee4ab86237e6912c9" Size="5418" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="825784" />
+    <Blob Hash="dd7a5bb4ec48e868672d21a4b4ae0c1a13235a14" Size="803538" PackHash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" PackOffset="1067498" />
     <Blob Hash="dd7a7d4556a5b707431bb433ef7ba9e78888e257" Size="35398" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1220603" />
     <Blob Hash="dd7c009923b13c717eb736e253322ee3858278da" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2072838" />
     <Blob Hash="dd83e37b5bdc2a10e9e910beda617be655a94e93" Size="19237" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1216808" />
     <Blob Hash="dd84154a9bf69f03acb02c3e8001b4032efae216" Size="953" PackHash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" PackOffset="2095717" />
     <Blob Hash="dd881b1626f5d3ec3bcf0e3b8747ed6ab59ecab8" Size="1138" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="442283" />
-    <Blob Hash="dd89ce70abd5100b538c2f122fb717459992f939" Size="2161664" PackHash="2e954414951c8b80a52034b0c4c8376adf6954f5" PackOffset="8" />
     <Blob Hash="dd929b694ae5ad4e7efbfa6d4a521dece2a7b54b" Size="186" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1979235" />
     <Blob Hash="dd995201054a2e4e326a722b50a5e965b43c231f" Size="40737" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="8" />
     <Blob Hash="dd9e63774efee2bdf9ecc2e790589361fc0856ca" Size="5725" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1722830" />
@@ -62575,7 +62413,6 @@
     <Blob Hash="dde01cc3c633b18227ea6e46a6530e7ccc66ddfa" Size="288" PackHash="8391db3b6cbd9a4b24f6114d956cbf68bff737da" PackOffset="2096837" />
     <Blob Hash="dde0a1fc2ec3b7a6cd88fa00a2f00c1e24fb1138" Size="2684" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1016840" />
     <Blob Hash="dde151356b6d4cc54982521f95a4f8ca19e2d192" Size="2076" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1733152" />
-    <Blob Hash="dde1ed0ab5e8faffb8dc432aa123d8fc14a30a16" Size="12151960" PackHash="8455fe762b5fb5a08cc6459a9767387991dc1bbd" PackOffset="8" />
     <Blob Hash="dde60bd811f08afa98710ad03abb39876a7ef7e1" Size="2199" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="764702" />
     <Blob Hash="dde65cc9cd7d246d7430cac34af82f13878e7fc8" Size="22288" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1183732" />
     <Blob Hash="dde8ef768fd7b7c8a4c848318a5733be17346a01" Size="92058" PackHash="e4ab729cf42a5a19024d5eff31b9aa275352541a" PackOffset="1304148" />
@@ -62596,7 +62433,7 @@
     <Blob Hash="de076e434646accc7c3c998c5d87ae9d3118da48" Size="3070" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="546214" />
     <Blob Hash="de0a8e78bb4b87c211f9501989c503d5b91c6e7b" Size="836714" PackHash="5725149f4c8e211494463fc9280b6c10907ea321" PackOffset="8" />
     <Blob Hash="de0adb49458fa801e070be3a29d92386f636eaa1" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1163272" />
-    <Blob Hash="de0d04472d708d87b67c0e0450913485b20ac1a9" Size="7491" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1714673" />
+    <Blob Hash="de0d04472d708d87b67c0e0450913485b20ac1a9" Size="7491" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="2084768" />
     <Blob Hash="de0dea2897a9b337854cf4f56a6524e8a5306634" Size="6729" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2045947" />
     <Blob Hash="de106d94bcdabad2892bb1d37f5c480f4cbeda6a" Size="15250" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="921937" />
     <Blob Hash="de164db4ebcbeec350ffb056f708127053f64354" Size="127" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="2096919" />
@@ -62613,15 +62450,16 @@
     <Blob Hash="de326c37d3ce9c4c073c1d8151334b103d81305a" Size="107376" PackHash="3890ff79bdeaaedd21c338bf90b727a0405d0e85" PackOffset="1696652" />
     <Blob Hash="de32af4591e1c5bf2060a04e91b1e99d2253308d" Size="6507228" PackHash="572f305032cadfbb0f622ec2b17d47042e54e95d" PackOffset="8" />
     <Blob Hash="de34baace8f0437b82ca0fefe269dc3ab86afa57" Size="2414" PackHash="3928e8bdc06ebb38fdf953c82380b52115686421" PackOffset="2089048" />
-    <Blob Hash="de37d09e654da289f8225fb6e1c17515092b6a17" Size="489" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1562300" />
+    <Blob Hash="de37d09e654da289f8225fb6e1c17515092b6a17" Size="489" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1681532" />
     <Blob Hash="de3b3f359b540d91f146869df823f58b3c636409" Size="3566023" PackHash="6d4c2cc7672771dc38217853411eab1bad0e01cf" PackOffset="8" />
     <Blob Hash="de3bce6202d9432ae4120d2679ea02b1c388ebb6" Size="3236584" PackHash="92baba95536283006f6b22f6cda8e9c6ead43270" PackOffset="8" />
     <Blob Hash="de3bfb8fc51411ef79ea598e0a354276ea6606dd" Size="3861460" PackHash="dd6aa88361efd8c13bc630db41c40d185f94dafa" PackOffset="8" />
     <Blob Hash="de3ed34d55007075b2a82c61a1f9deacdd66c9cf" Size="7460" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1200248" />
     <Blob Hash="de40ff310047b859251ff3a6eb604165a51950fe" Size="2880" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1076286" />
     <Blob Hash="de412293e96cc310e19b16a96068c282d244d88a" Size="217" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1451621" />
-    <Blob Hash="de4339c57b383421c8711039a81b1c31eefeacf4" Size="339" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2096638" />
+    <Blob Hash="de4339c57b383421c8711039a81b1c31eefeacf4" Size="339" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2096773" />
     <Blob Hash="de441ff5403a44fac76684f63ca3fd98f4efc897" Size="1030" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="282671" />
+    <Blob Hash="de44a04626ee507d016b9c9e25d4755647157ded" Size="244736" PackHash="ba9d36a231c4e83c35dd33c57a828d58b2788892" PackOffset="1416168" />
     <Blob Hash="de4860a0dd06c4a2a1cbc46dcd2585c9faf64b72" Size="72894" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="8" />
     <Blob Hash="de49827d6035434d96771b561ff9ff186a1978aa" Size="301265" PackHash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" PackOffset="898056" />
     <Blob Hash="de4a6cf0a5a032162eab3733b2a910f179187b81" Size="67072" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="1795171" />
@@ -62629,12 +62467,9 @@
     <Blob Hash="de4b5e40b1c2e5a5051706669810610bbe47fac2" Size="87804" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="8" />
     <Blob Hash="de4bfc51163537c4f9c925f65a4561542e8c470f" Size="6158" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1959868" />
     <Blob Hash="de4d64752dbdc1509f8d316c500035d528f58c1e" Size="2837816" PackHash="8382a615cefb0d4c952179ee16c30e7652f236e5" PackOffset="8" />
-    <Blob Hash="de4f5f32997ab8c78e7e8b8bee2d838ca8905a67" Size="14880" PackHash="135bfc1f44c204b13050e403d578d595d413ba96" PackOffset="2074636" />
     <Blob Hash="de5014c9c033e297516c48729e3e0c6a7c2ca253" Size="116087" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="1804621" />
     <Blob Hash="de54c121658e174473ade9fd71f91b6358f684f7" Size="9200" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="585017" />
     <Blob Hash="de5757e617f60ff8a1b3bc57285c77cc4ff9254f" Size="1287336" PackHash="2c0b2a639d529b68027b4cb912aafd082af8bff0" PackOffset="8" />
-    <Blob Hash="de584bed3a134d2cba6797049a5873cc9172d3b3" Size="3224936" PackHash="eea30d4821ce263eaf8a5e10d3467e136c07313c" PackOffset="8" />
-    <Blob Hash="de5b05a44f9d574df45b8225beb43a93f31ccbbe" Size="3512" PackHash="3f34dd9dde6ca52ef20d61baea7e97f4dfdf3532" PackOffset="2091692" />
     <Blob Hash="de5b444bfe42af328c8d4d16fea6a8532ebfe36e" Size="3510" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="771819" />
     <Blob Hash="de5dc744d5f86b25d16390b7bf400c5ac999dec4" Size="133934" PackHash="bbc0888a03c10525e017e652d4d691dbcb065557" PackOffset="514107" />
     <Blob Hash="de5f0de32e12317fc26d3318498b87f2bab8145a" Size="176" PackHash="4cd4bfc27173885f1aee3affc692eed9b041d197" PackOffset="2096983" />
@@ -62643,9 +62478,9 @@
     <Blob Hash="de6496406ed33f3b5fde0bd731a42d09fd80ea0e" Size="62464" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="1225736" />
     <Blob Hash="de6c29831e93f0806a4c7c2a0571a44424665a87" Size="1715" PackHash="553b312e99ddb27933e0ef1b5e7c9dbe246b0acb" PackOffset="2091083" />
     <Blob Hash="de7059713ea7913a0c79f5386833ce2bcad2cfd7" Size="1040" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1109034" />
-    <Blob Hash="de71704edb15919ac727f5f841a65842ab9b0a96" Size="3679" PackHash="690374c8227af4538f536300c6e1f2c253d583ae" PackOffset="2091505" />
+    <Blob Hash="de71704edb15919ac727f5f841a65842ab9b0a96" Size="3679" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="2092025" />
     <Blob Hash="de72b138581d43ac277be498edf19b56bd003830" Size="3589567" PackHash="1126eb9ca3c38b485aae5a6c3fc539688ce14e78" PackOffset="8" />
-    <Blob Hash="de74ce52141c51b9878e235f02ddc496b996727a" Size="483" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2096526" />
+    <Blob Hash="de74ce52141c51b9878e235f02ddc496b996727a" Size="483" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2096472" />
     <Blob Hash="de7805089639c54893f2107fa67342da72a79bbc" Size="182" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="228204" />
     <Blob Hash="de7ecc613f4cab7e6fa6f5ccc8d427bf7956ecd7" Size="8016" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="715273" />
     <Blob Hash="de7fbcd71ff74c4671ff5c3ae793a1f5ccd60cbe" Size="15153" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="8" />
@@ -62672,15 +62507,17 @@
     <Blob Hash="deb05ec5963ac38554bcadbe76f91e03cc30710f" Size="37507" PackHash="2408381821f1ad904404880379feec1a2eeb2ad4" PackOffset="156991" />
     <Blob Hash="deb1399be0b04a8bd8e0ecf678b4e150687c2da2" Size="1550762" PackHash="28a3c7cc6ff196bdb4791e3c4e225e1b0c652deb" PackOffset="8" />
     <Blob Hash="deb297469c4e59ca804ebc801be88392ac2ad480" Size="164" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1767616" />
-    <Blob Hash="dec00b875817a4fbbb02f44e0096ea8e832c7d77" Size="620" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1421900" />
+    <Blob Hash="dec00b875817a4fbbb02f44e0096ea8e832c7d77" Size="620" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1870953" />
     <Blob Hash="dec480490fb6315acf940b1b593f03cd58cd82a9" Size="22491" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="2038748" />
     <Blob Hash="dec64ea3536159b8b516efd3a0cef8081db4b9dc" Size="8336" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1150325" />
     <Blob Hash="dec6f67b9ddce16cc6c191ca436aa53fa96f3dc5" Size="2658" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="2094119" />
     <Blob Hash="dec87b2703c89c7a102ba162afe4005eaf3dd4c8" Size="156" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1093344" />
     <Blob Hash="decac7ac89c6c995337ab9291495bfdd54347687" Size="2014" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1993909" />
     <Blob Hash="decbfedb61f18463c3a92bb384a16d36e887c8db" Size="30407" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="2019491" />
+    <Blob Hash="decc4c2de42e9347ac9d4c1ee1ffe5243ca482c2" Size="96768" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="1963136" />
     <Blob Hash="decef81a32227db7dd161b44d616c87f72329569" Size="18030" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="18695" />
     <Blob Hash="ded511fafcd1238c71f31a778af79527e9e3c99b" Size="3427" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2091795" />
+    <Blob Hash="ded88299886b85bb55806f9faa1e5df81ba28efb" Size="703584" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="8" />
     <Blob Hash="ded92dc0be9432588a279d02582e6c4005a2a305" Size="3550" PackHash="6eab5436383e1870bf1150f0f986c89eb6855e3f" PackOffset="3147" />
     <Blob Hash="dee4b80b111fcaddf278e7fa7a1954cbdc5ae7b7" Size="9229" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="2012273" />
     <Blob Hash="dee4bfd76be3fbb6a90ae5ff5f16ca3078c1458e" Size="9785344" PackHash="fb2d271550cf2328f2473f2dd9d0eb5ebc7b3ea1" PackOffset="8" />
@@ -62693,7 +62530,6 @@
     <Blob Hash="def992d95b4abeee48ed524412cdf946c91ecf32" Size="10752" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="386568" />
     <Blob Hash="defd473fc97e12902bf176176450a14018fbf3af" Size="1639" PackHash="69386eee8073c391ca5a7e1db9f40ef741bba654" PackOffset="2091908" />
     <Blob Hash="defe249b39c7ed156a7e8c0f8dbb41996477104c" Size="235" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2078447" />
-    <Blob Hash="deff26efed8588bc7bb07fb0110d1b52c5d143d5" Size="1026" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1289984" />
     <Blob Hash="defff78f47d574b803115c8258e9704c1ceb894f" Size="1138" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="293839" />
     <Blob Hash="df000474c6fbfb23b4acb59321d819e312f4d73d" Size="2256" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1297936" />
     <Blob Hash="df01cd626881332486155d1b246d2ef566f2c594" Size="3578" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="896320" />
@@ -62708,6 +62544,7 @@
     <Blob Hash="df1c00875a998de84d5ec2b3497534497d4f7805" Size="31498854" PackHash="8ff8b63bbd2431c319beaa30fca90983dc868585" PackOffset="8" />
     <Blob Hash="df1f00376789a36f68b31578a897f6c158925114" Size="456" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="247849" />
     <Blob Hash="df1f11cdfa457499f2049849eeeafe95e6753307" Size="6697" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="86779" />
+    <Blob Hash="df2268f9a043d8b91eaac2c7bf4c14fa5b107779" Size="1736220" PackHash="48417a383086ddd15fbf2c4f33ed8e96f024699d" PackOffset="8" />
     <Blob Hash="df22714a16eb2158cc023cab456ba64d5c99c6e1" Size="10859" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1992753" />
     <Blob Hash="df26e384cb6af1e84b77b700c0a359063390e3a5" Size="7462" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="952058" />
     <Blob Hash="df27a09da0cb81a7ca580ecf79825b138550313c" Size="74762" PackHash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" PackOffset="614693" />
@@ -62717,8 +62554,8 @@
     <Blob Hash="df2b7835efd050bf651a1cc7a6325c7dc3a1a3b0" Size="184857" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="416823" />
     <Blob Hash="df2c29dafb159a479592fabfbef74f5e45e44f18" Size="20552" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="993729" />
     <Blob Hash="df2c9ca4680a6f0641c2c98f044097c018856d7d" Size="3096456" PackHash="e70429fd818fe983008a06e931d39724ea7a382c" PackOffset="8" />
-    <Blob Hash="df2ca170a8002d519f2426575e48cafb63868aff" Size="659" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1952261" />
-    <Blob Hash="df2cdb588803ecae649e3e59b6ac7105d2dd5f54" Size="392" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2095812" />
+    <Blob Hash="df2ca170a8002d519f2426575e48cafb63868aff" Size="659" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2080315" />
+    <Blob Hash="df2cdb588803ecae649e3e59b6ac7105d2dd5f54" Size="392" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2096639" />
     <Blob Hash="df2cf2cd929568861ffd1f04a2a4cc5c78dec028" Size="3185" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2085350" />
     <Blob Hash="df30782826832b0f276946c7b2d574413122b65c" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1919205" />
     <Blob Hash="df328d3cf782dd1ce557932f4305d2208c88261c" Size="3455" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="186050" />
@@ -62728,7 +62565,7 @@
     <Blob Hash="df3f182905409d75281d87719f923bfbb70d96a7" Size="6679434" PackHash="df54fb21975e218c1da9d209d52b225e78430abf" PackOffset="8" />
     <Blob Hash="df42ebfdfcb9cf2234622ea31ba9ef724047522f" Size="77087" PackHash="e59c46a44a978e34376830275f5068632f7338d9" PackOffset="146436" />
     <Blob Hash="df55a2d450928ce57991acc0142c60e4fa205a4c" Size="1240" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="550760" />
-    <Blob Hash="df55ceac2a48476705e61810170c0f520bf5fd29" Size="2159" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1363172" />
+    <Blob Hash="df55ceac2a48476705e61810170c0f520bf5fd29" Size="2159" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1812074" />
     <Blob Hash="df579c488b023c44facf375342046abb8de5a4e6" Size="27233" PackHash="e800e6619caf261111854d3399298b6e807183b3" PackOffset="706052" />
     <Blob Hash="df59209b6eae8fd5d71d957db1a0d6ea8413b6c1" Size="2833" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="808886" />
     <Blob Hash="df5bd4560c50f940addd35d83101b8ca4b601c26" Size="3687" PackHash="e5cf89e55b3055d7ed976321006a6a222885d096" PackOffset="2090469" />
@@ -62736,10 +62573,9 @@
     <Blob Hash="df63adcbad60c1703b813aa11ce87625d152a7bb" Size="51866" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="47015" />
     <Blob Hash="df63e32be7f72f4b55b2336b9865831fd761874a" Size="151040" PackHash="753eb938736a4b412147164d4077e991f9c89950" PackOffset="141472" />
     <Blob Hash="df653274907d6f9e59c01b816ecbbd759152b444" Size="23011" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1953404" />
-    <Blob Hash="df69a38864fabe64d749061d16fb7815a294fac0" Size="243" PackHash="df09a1189b1d8964858cfb161710f823446cb601" PackOffset="2096842" />
-    <Blob Hash="df6a4ea61b1b95c4b976114371e5d3e127a5a64e" Size="7588640" PackHash="940efd71d46bd3adcd95775096ff81074df16efd" PackOffset="8" />
-    <Blob Hash="df6c0e4ca6591e17bf46d34435b347641a10314a" Size="441334" PackHash="142ddd26a143aeb02ee0ebc41be2e53c051e8680" PackOffset="1467302" />
-    <Blob Hash="df739ab13c24c3fbb6149b9d6a23c091c601b907" Size="6916" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1960517" />
+    <Blob Hash="df69a38864fabe64d749061d16fb7815a294fac0" Size="243" PackHash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" PackOffset="2096588" />
+    <Blob Hash="df6c0e4ca6591e17bf46d34435b347641a10314a" Size="441334" PackHash="fc21197f05ffa1e1cb73441cb5cb45012227bfee" PackOffset="1550234" />
+    <Blob Hash="df739ab13c24c3fbb6149b9d6a23c091c601b907" Size="6916" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="2088571" />
     <Blob Hash="df7537a0db7f26904e228ea745b2d8cc81534d63" Size="2014" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1440263" />
     <Blob Hash="df757c253e616167ead9edecc69319734a3dea66" Size="15438" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="848562" />
     <Blob Hash="df758cd2172f9c6eb2a632a4bfa82d56167cdca0" Size="929" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="718924" />
@@ -62778,26 +62614,28 @@
     <Blob Hash="dfc897947d12f305b5bf6a82ab1859164c25b522" Size="68458" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1219260" />
     <Blob Hash="dfca2a4fc48fa8fe993863ff893900269d20e164" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="713673" />
     <Blob Hash="dfcc286a99293adfb8fc61210563ca7d99f9d30c" Size="455231" PackHash="f12fcad677aebdda530c1768cf6a4c571cea68bc" PackOffset="1495905" />
-    <Blob Hash="dfd008ea63485bf796bb9010103657cc95d21cfb" Size="48456" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="2038792" />
     <Blob Hash="dfd0fdaeec0c36d2ad6d6db7180694983812d504" Size="648" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="255471" />
     <Blob Hash="dfd3784a0e482d7663378b4815b735c83a9d4b3a" Size="6847" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2011628" />
     <Blob Hash="dfd58d669daacfa46227deeeecf0ee59b3798a52" Size="1423" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="440870" />
     <Blob Hash="dfd7a20cfb33beb857d1f0d8e5be7d3d2b7f6558" Size="140647" PackHash="76b340de00ac7fae027331eddd14fdc322755ed2" PackOffset="1932989" />
     <Blob Hash="dfd8dc04a3b77ec7bed06498cccdf31bee3a54c2" Size="251" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1101755" />
-    <Blob Hash="dfdb89f538f83de9a0e9d2283527471d469e0d84" Size="1233" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2057763" />
+    <Blob Hash="dfda83899e410e1d4bde1a9b5039cc1a367cf2bc" Size="1056510" PackHash="2e859b9ceef48f55e7e7f6c05869680f93148f93" PackOffset="8" />
+    <Blob Hash="dfdb89f538f83de9a0e9d2283527471d469e0d84" Size="1233" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1948894" />
     <Blob Hash="dfdc13f9c9a570ba19ba4e9a8cd810c4eb654d76" Size="102031" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="431264" />
     <Blob Hash="dfdd6f265395386545d028628b916dc834c3047a" Size="278" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="242469" />
     <Blob Hash="dfe014604386c603e71319eaf2e7ecdf7d6f3b51" Size="2048" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="63138" />
     <Blob Hash="dfe1ae7cda90ba3922898181edd305a94e4887dd" Size="5380" PackHash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" PackOffset="394204" />
     <Blob Hash="dfe3c168d0fa596145dd53ab967ff8e603e991f1" Size="153" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1257293" />
+    <Blob Hash="dfe87cf222c8e2517a66d55c4262ffc0bd8e858d" Size="3213312" PackHash="b5de396dc504d7c166931fd1cf05c57768115a6f" PackOffset="8" />
     <Blob Hash="dfe8b8fec1f55e5781718093169b83b7a175e065" Size="666135" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="1204740" />
     <Blob Hash="dfea231fb9444f31791bd6b63e58b34257c82187" Size="124928" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="745641" />
     <Blob Hash="dfea951de7b69c0708e3ad562634cf87e560c314" Size="7705" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2082045" />
-    <Blob Hash="dfeaa353a435eae37ea8d5fbe4ee242e452dd0a2" Size="313" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1409729" />
+    <Blob Hash="dfeaa353a435eae37ea8d5fbe4ee242e452dd0a2" Size="313" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1858631" />
     <Blob Hash="dfed2b210e65d61bf08847477a28a09b7765e900" Size="20672" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="756960" />
     <Blob Hash="dff03fffea36c39133fa2ca4039dce9b3965f8d2" Size="74601" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1669073" />
     <Blob Hash="dff13fc85756e7aa582dd01658a62464a71ac855" Size="2965" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="350444" />
     <Blob Hash="dff198ddb62eca28cfe5fd1ae882456c8dc2480b" Size="12355" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="2080621" />
+    <Blob Hash="dff2d0e003ce0e6e5a500b7b4fad25d8f9add13b" Size="185661" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1226502" />
     <Blob Hash="dff4862540bf8ae6f7dfd8bfb294ef8af133be7e" Size="1538" PackHash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" PackOffset="2084216" />
     <Blob Hash="dff5ff0f0c62567c25a13e4444cb6e096accf0fe" Size="156" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2087768" />
     <Blob Hash="dff69d0a7563bdf0d469e98016153809b2c73661" Size="286304" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="697068" />
@@ -62809,11 +62647,10 @@
     <Blob Hash="e00dbaa916ea6eac625d69c9164c10e1a8c8bf0d" Size="39071" PackHash="6359e2376de35d2b27246726788d28d678796a20" PackOffset="2034696" />
     <Blob Hash="e0106c0f49bba63f1d9c93b0e996e3299cbde2bc" Size="937" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="570587" />
     <Blob Hash="e011f821289671149c812537d8254020c0ef5bb9" Size="50912" PackHash="1a7fb4d3ec15d2096a4fe532191d9957b1a711d0" PackOffset="1054424" />
-    <Blob Hash="e01a9a8cda8411b7de8a87c8d5e885f3bbb97f35" Size="113907" PackHash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" PackOffset="63816" />
     <Blob Hash="e01e67899b295641758a468c00bf157dd704786a" Size="408712" PackHash="c25f9ef5425d8dac6a535fbbc8aa9db8ca6d934a" PackOffset="851936" />
     <Blob Hash="e01ea37542fb5e9626116014c36da99e5f1e9e91" Size="16886" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="1868166" />
     <Blob Hash="e01f437feda9aef8ca1667d38dbe089bb030b780" Size="5473" PackHash="297b426e972c70d5bada57711d9b219ec7267e7c" PackOffset="1883559" />
-    <Blob Hash="e01f66d751c16f2d6ef1a567b78150142cca8af2" Size="3036" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1520787" />
+    <Blob Hash="e01f66d751c16f2d6ef1a567b78150142cca8af2" Size="3036" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1640018" />
     <Blob Hash="e0218fc5de4337fa7c32d84ffb67dbcc757aeeee" Size="730" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1306872" />
     <Blob Hash="e025c680baad1ae53b37f99aa0c82319dbdee662" Size="3259" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1552404" />
     <Blob Hash="e02b69f7b4031c8fdace86f82b8df0c9edf3ab5e" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1477884" />
@@ -62839,17 +62676,16 @@
     <Blob Hash="e05ee6baf76ca1c6aea5e6bd986da855002edf77" Size="41408" PackHash="68d4a07013644163437adb2f70cdb7f803f893c3" PackOffset="2037988" />
     <Blob Hash="e063bfc72fa9b0d76e61867ac737729b99e76300" Size="6228506" PackHash="fd19dc0838ba2d2968565625df88626cec46d728" PackOffset="8" />
     <Blob Hash="e06507058b1bf42646fe0ef32c155788ca814cd9" Size="83353" PackHash="f9c7a3708df23796ae26686d70fe67dbcba50a30" PackOffset="1870875" />
-    <Blob Hash="e065dfd0e1356c2ec3636ef957b5f43083f83d57" Size="60" PackHash="c53db3993759aba69cf81a648f8cf53495543de8" PackOffset="2096982" />
+    <Blob Hash="e065dfd0e1356c2ec3636ef957b5f43083f83d57" Size="60" PackHash="a0bfb43e71f6e730d51f2b1042079157f84291e1" PackOffset="2097048" />
     <Blob Hash="e066b944b35097db15c16c951bb5bc28f070da8b" Size="3319" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="1031191" />
     <Blob Hash="e069d5bb4d3d5abd1fd8b374cc6d2780e71cb7d4" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2033596" />
     <Blob Hash="e06de90d71f383339d29936ed6ac0bfb585d4a3f" Size="7778" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="824237" />
     <Blob Hash="e06f328c4e871439e62f22e022e2c11589872df5" Size="4140" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="597135" />
-    <Blob Hash="e070e70e927d021ff94b7d7049187da0f22d0a49" Size="3679" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1117534" />
+    <Blob Hash="e070e70e927d021ff94b7d7049187da0f22d0a49" Size="3679" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2063550" />
     <Blob Hash="e071cfca34d71ee9470074d97f07eee767ad0859" Size="29136" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="717178" />
     <Blob Hash="e072af40d209a5f64e417df0c771b7f9cc3c1143" Size="19426" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1858376" />
     <Blob Hash="e072f7a755b3f7dc2e552a5e08d9d57b7146c8ac" Size="90605" PackHash="419ab9d476edfc8b4ddcdf17f796fc9a5da15457" PackOffset="1669337" />
-    <Blob Hash="e075ab339c0997c657406182ecb6d021949aae59" Size="824" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1454423" />
-    <Blob Hash="e07a3ef5a4b0ebf8149b349182e93dd90ce3e451" Size="858376" PackHash="27da6cecac43e4f149a2c2d19c1760203a42333e" PackOffset="560620" />
+    <Blob Hash="e075ab339c0997c657406182ecb6d021949aae59" Size="824" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1991505" />
     <Blob Hash="e07cfc203c102b020e04d457c28216468119b05b" Size="40" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2097059" />
     <Blob Hash="e07e037bfd8cecc46a12991d2c61a482c22c48c5" Size="13506" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1914026" />
     <Blob Hash="e07ea54493818130f3f087e7c73507b38f6822db" Size="3779" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2006200" />
@@ -62858,6 +62694,7 @@
     <Blob Hash="e084beaf36233a8aa9e7c97d5f6933f941c03ba5" Size="3242" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1162911" />
     <Blob Hash="e08a96f5b369fa53bc1f3f839ec14ff9d334f727" Size="8372" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1175887" />
     <Blob Hash="e08b1aab44c3b4d65fec47fe7b7a546463616240" Size="7602" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="45868" />
+    <Blob Hash="e08b5999286386441867a258577dba20b3d7ec9f" Size="8063" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1701866" />
     <Blob Hash="e08ba36662c3451c9ce62fc83c1343380de3ecba" Size="22323" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1983727" />
     <Blob Hash="e0916d1911a99dee386bc6235d5750b20e94017d" Size="6122" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="839532" />
     <Blob Hash="e09549bef17d683ae85a5c2c20cecc94869b9313" Size="18660" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1389574" />
@@ -62873,10 +62710,8 @@
     <Blob Hash="e0affb06ac2e44eefaff36a8d2f0217a3e3d2b3c" Size="144951" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="566892" />
     <Blob Hash="e0b2d81c80b94799aeef126f990f48cdb5505bbc" Size="4" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1823097" />
     <Blob Hash="e0b30219e07ca72f60b51c574f06fefe4ecd4b5d" Size="25536" PackHash="c6da47930b010c6bb3249d411d7760fd5e32320f" PackOffset="1939410" />
-    <Blob Hash="e0b431abba60f954083af32d8da2d26db988ce3f" Size="3159" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1275309" />
+    <Blob Hash="e0b431abba60f954083af32d8da2d26db988ce3f" Size="3159" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1724211" />
     <Blob Hash="e0b83bfb134ecfcedbcdbabe6ab807af275f4ff5" Size="3282" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1923783" />
-    <Blob Hash="e0c5debac16b697b0e543452901e16da0117dfed" Size="3892672" PackHash="bfceb1317c338ad86cac5304221e45af3ca51cbf" PackOffset="8" />
-    <Blob Hash="e0ca246215a309af5ff2c2a1aa77cf0538ba0ad3" Size="4146420" PackHash="d4fecca07efecbd3e6b30a479891d495b3bbc1e6" PackOffset="8" />
     <Blob Hash="e0cdfa962021c3780ea0bff4f528a9198015c955" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="670112" />
     <Blob Hash="e0ce397331e87a6561be9735cd336b383bc4046e" Size="149" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1257921" />
     <Blob Hash="e0d139f764de80da4fb4b7d4142e4b96180d0302" Size="1646" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="2084767" />
@@ -62890,18 +62725,17 @@
     <Blob Hash="e0e05cdfa83ba1a456697bedd2a9cc2710498dc3" Size="731" PackHash="b6c2c0cae09bd2ac94ba7df5cd19b08a981345d1" PackOffset="8" />
     <Blob Hash="e0e192533f9da747315c2f60fb76ca1e855e3466" Size="1146" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1718139" />
     <Blob Hash="e0e193a5bddf7d1fd54469d0877da0f6ba94db1d" Size="6140" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1384477" />
-    <Blob Hash="e0e74d161a342802c9ffd53f6ceeaf177055e217" Size="7521568" PackHash="77a45c780d4b8b728c809b3746997230d1e80d28" PackOffset="8" />
     <Blob Hash="e0ee12e3914ab8d6a1fd81f4df7f9084a667ce03" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1721615" />
     <Blob Hash="e0f3c0953eb7387df719d4474d7d4651ab536580" Size="1119" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2094003" />
-    <Blob Hash="e0f4558175874db01c16385b9355d70273a69a71" Size="39467" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1430905" />
+    <Blob Hash="e0f4558175874db01c16385b9355d70273a69a71" Size="39467" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1550136" />
     <Blob Hash="e0f51ed5af4aa98ac7a39136afb39de38a33f7a8" Size="1734" PackHash="c64ef0980920bd362bf26c9e31d253c145d848ab" PackOffset="2093072" />
     <Blob Hash="e0f67e87799eff58e15e6c5f88037ad9810fe4a3" Size="266425" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="1558304" />
     <Blob Hash="e0fd6b78e68ad49887496715222b279aae54c7f2" Size="277596" PackHash="b2c80b92ad374247169fcc8baed57834533ed5ca" PackOffset="833814" />
     <Blob Hash="e0fdad154fa35ff03be47943f8f1ec018c6a90c5" Size="78848" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="1999936" />
-    <Blob Hash="e0feba20d4f8ec4e837f5c0871b02bff5db52c9b" Size="356" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1618508" />
+    <Blob Hash="e0feba20d4f8ec4e837f5c0871b02bff5db52c9b" Size="356" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1737740" />
     <Blob Hash="e0ff73fbdd275698128946889b620dadd89d7e28" Size="88576" PackHash="a23f47097bd70efe7672e9b9e00941d85cd8c17f" PackOffset="8" />
     <Blob Hash="e100ba2d607a1ee482ea2672606ff20838a859ff" Size="170174" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1793182" />
-    <Blob Hash="e10256a4c91cd8ca0444be26df49fc82e381d562" Size="7008" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1970884" />
+    <Blob Hash="e10256a4c91cd8ca0444be26df49fc82e381d562" Size="7008" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1711111" />
     <Blob Hash="e102e510bb4c750d591bc164fb836f01115c7de1" Size="3191" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1275563" />
     <Blob Hash="e105cf437d82363f2e2098447f91f9419f07a300" Size="5243" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="881921" />
     <Blob Hash="e106e1df116dbcdf36c56cee86dd8dea7439fe96" Size="438510" PackHash="83127d14d8403a98dd6220dc7c9068fb0d569cc5" PackOffset="1556649" />
@@ -62917,7 +62751,9 @@
     <Blob Hash="e129995463d94f7c5fb435b77bb530ffda177cf3" Size="19237" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1344771" />
     <Blob Hash="e12a2a81c7b32a6f7d24ad1079db787cce6710f4" Size="192" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="445876" />
     <Blob Hash="e12ce67db17721255baddb8422dd1d3cde23ac8f" Size="12011" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2079404" />
+    <Blob Hash="e1324add3ac7293133b3ccbf649dcfb1abbfe51b" Size="244398" PackHash="158cdadc204fb774e3ce74edc80832a66cd38867" PackOffset="1795256" />
     <Blob Hash="e133e18e2fa33205afaf3c07636590cae9819816" Size="5263" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="2052257" />
+    <Blob Hash="e13603c07c9bd8fe4895a823cb7a5f607f557011" Size="4109562" PackHash="5102ac2f16f693a1ac40389047fd094a7eef8a36" PackOffset="8" />
     <Blob Hash="e1377e65ef662218fc39a928a67fa6a3f31523e8" Size="21762" PackHash="77e0b57b01b65dac3277a08c2b0b1b18d4ff0c34" PackOffset="2075331" />
     <Blob Hash="e13b13d4f79dc26ddaef4922c9deb03236f523da" Size="9035314" PackHash="d9d5a3912d5a2e91e647286be849997a5fa641fd" PackOffset="8" />
     <Blob Hash="e13b4c89b1122287f47b3a36ce259d22a78074ff" Size="3533" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="833572" />
@@ -62927,14 +62763,14 @@
     <Blob Hash="e140a48579221031af51a8449988df4980c722ad" Size="3926" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2078638" />
     <Blob Hash="e1425e3b62191ad9710c95cebcf8aaf79b1ef5eb" Size="3095" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1272468" />
     <Blob Hash="e144a36fa97ec6c2a23b5a5a23ec20dcc02956c0" Size="4038" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="2009375" />
-    <Blob Hash="e14e37af4f599245e850d9f40aca76e2ccd993b8" Size="3650" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2058996" />
+    <Blob Hash="e14e37af4f599245e850d9f40aca76e2ccd993b8" Size="3650" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1950127" />
     <Blob Hash="e14f31f5c7deb7c465ef0ca6852c072455714c32" Size="3872" PackHash="0d2648faa891de281e340f96be71c4ceefa35596" PackOffset="1990037" />
     <Blob Hash="e15116c02af3135dcd794bb0ffe9e205dc66f249" Size="1417710" PackHash="a0af37d89ca7e647faeac72857d82badddeb3a2c" PackOffset="8" />
-    <Blob Hash="e15177822bf808d3e13e1eec72cdcb661181fadb" Size="113320" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="1879104" />
     <Blob Hash="e1518edafd702ff597ceebd3e934af3632868c87" Size="3718" PackHash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" PackOffset="2070589" />
     <Blob Hash="e15e471d2704f4da1d97068af764288ec226b92d" Size="2433920" PackHash="83a04b1ec626d2f8ff46c728c4da8795c5325c64" PackOffset="8" />
     <Blob Hash="e162dca57ea7f82d2844b7ca24e2771c1ef0e00c" Size="432" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="2096590" />
     <Blob Hash="e162ed382f5f6397cef84c5e81863499670277ed" Size="612" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="341996" />
+    <Blob Hash="e165b2cda4785ce8279db91d3923f5367e8335bd" Size="5126540" PackHash="b211e800b3cbf88f936d2c5110a7a649c3b39b41" PackOffset="8" />
     <Blob Hash="e165e63978be5330a942e138341ef2ecc2a6dcc7" Size="2857" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="432599" />
     <Blob Hash="e168bd409995cb22152fc6f718360e8899365983" Size="8330" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="2036985" />
     <Blob Hash="e1691dd63421bbb7cb15393d5b11cf4e29b50cca" Size="4412" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2013314" />
@@ -62951,9 +62787,10 @@
     <Blob Hash="e180876b136d40ea5d99ea030b3bdb48adb9330d" Size="17614" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="834163" />
     <Blob Hash="e181b4db1560bbadb394dd0e58cceb3390c2b84e" Size="8753" PackHash="6359e2376de35d2b27246726788d28d678796a20" PackOffset="2087591" />
     <Blob Hash="e1834dedb91486a3018cc9814d44eaf06ce5ea2d" Size="1229" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="2095421" />
+    <Blob Hash="e183e8ed227969e1b257c433bcb4e191318271b2" Size="90752440" PackHash="9aabada55fdadaa4d111164c0456f6a229ba3eac" PackOffset="8" />
     <Blob Hash="e18472638df4592394372e3c7fa01903722cddfb" Size="2818" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="705331" />
     <Blob Hash="e18af5e059a84fd1eb7d45b8dd83d9d7a79d4fbb" Size="62555" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="944658" />
-    <Blob Hash="e18b0f57217a98386c33a11144861caf6d00292d" Size="749" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1464558" />
+    <Blob Hash="e18b0f57217a98386c33a11144861caf6d00292d" Size="749" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2001640" />
     <Blob Hash="e18e3baf12ebc40f26a045a6216b319908267780" Size="2324" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2081696" />
     <Blob Hash="e18fdd5dd40e20036b995f1e7a5961468b95fad2" Size="2096" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="52326" />
     <Blob Hash="e1907938a875a4327ed38b1f014f836f24e94fd0" Size="2900" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="353409" />
@@ -62969,7 +62806,6 @@
     <Blob Hash="e1b16fa24f93a9a779c3915e4ea9077ef6ec0b41" Size="1781248" PackHash="09732d6bf762ba4d866616248b46adff0e12d76b" PackOffset="8" />
     <Blob Hash="e1b332852bd7118200af218807aab1579b3ff784" Size="4960" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="2090744" />
     <Blob Hash="e1b53a241a3b4465772c3887802e071fca0ab9dd" Size="162343" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1259324" />
-    <Blob Hash="e1b7717f6307157b1204696ab71619750ce96c01" Size="222103" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="1123443" />
     <Blob Hash="e1b85b9bc6080af5023058ed4a10b33d8292b214" Size="3632" PackHash="6b0f64a3a5090f00c5d8405cb5c1684a396951ac" PackOffset="2025833" />
     <Blob Hash="e1bd239f1d897429dc7abf475dd58a9823c30069" Size="770" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="252681" />
     <Blob Hash="e1c0e3eb2ac8cdd179e40ea64889773e6a3e32c0" Size="1369" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="472507" />
@@ -62985,7 +62821,9 @@
     <Blob Hash="e1cdd49610976e1878bdafe6667235be0c8ff07e" Size="536" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1671121" />
     <Blob Hash="e1d26d0b914ce840de8c4237a6747f4315de029e" Size="1134" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="1037092" />
     <Blob Hash="e1d7aa01c9ac413c83ae4d935e73da8654faa310" Size="149" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2066528" />
+    <Blob Hash="e1dd37eb4ead8c7fc0a7668dea46eb51aab6c667" Size="1055797" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="977738" />
     <Blob Hash="e1de713507c61002c06502064dcd4a916d8b9b9f" Size="3547" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="332010" />
+    <Blob Hash="e1e04389563a7ef0b45bac48f3b9da4f58835c18" Size="358368" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="1219592" />
     <Blob Hash="e1e1e936af42fa73d1a1fe96996c5f33e5183532" Size="359424" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="1446060" />
     <Blob Hash="e1e2424e8ab4dca8aefd4d1792299f4807ceb3c8" Size="2874" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="177552" />
     <Blob Hash="e1e5ff4e7dd1c902afbe195d3e9fd2a7d4a539f2" Size="18624" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1211880" />
@@ -62995,7 +62833,7 @@
     <Blob Hash="e1f6f3756d83a44ae55fc8127e0181840bcecc75" Size="2761" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1835647" />
     <Blob Hash="e1f76d34c7b08ad5e88adf6b36e65ea5a1bd91ec" Size="139" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="565170" />
     <Blob Hash="e1f98bf2bb2aec201f3002ed6c1605f19b44bd96" Size="7768" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1748704" />
-    <Blob Hash="e1fe2151cc61e56af092511b44ad2580352e4279" Size="19762" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="2036776" />
+    <Blob Hash="e1fe2151cc61e56af092511b44ad2580352e4279" Size="19762" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="24752" />
     <Blob Hash="e20014ea69b79f28f4d35747def0a7b9e8582101" Size="8608" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="154288" />
     <Blob Hash="e2007f170d38b6b7a848dae7068eec4bba952fbc" Size="2703" PackHash="70953fdbe7467c2488f52f9e26a580fd3ac143e2" PackOffset="2071" />
     <Blob Hash="e20419b254ed5f38c001da8509b15fc10a841cea" Size="30995764" PackHash="9a7eebd7a27ec107b85164be79ece5b7fe82a06d" PackOffset="8" />
@@ -63013,6 +62851,7 @@
     <Blob Hash="e221653cd659c095098180344654770ff059331b" Size="312" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1036632" />
     <Blob Hash="e223ca1d2db047830a5eb4105433bf592a443973" Size="8150" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="701015" />
     <Blob Hash="e2242da40562ba0f25d541cf67034fca54046956" Size="5048" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="452840" />
+    <Blob Hash="e227257f14fc1da9826149ad23cd0366ef3b25e1" Size="2362408" PackHash="50bc89a199e1f4e967673913362aca20bedf1839" PackOffset="8" />
     <Blob Hash="e2274916571b8b58664f18ecd6258800ba0550af" Size="264" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="956138" />
     <Blob Hash="e227ba36ba50a2bfb822c7e549bd6b6e1fcc94b1" Size="703" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2081212" />
     <Blob Hash="e22a01d751cca8f0b61eb0643d05871a76ff2b6d" Size="3829" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="13507" />
@@ -63023,9 +62862,8 @@
     <Blob Hash="e2359cd3aff88357de020fb81a350807f16b1bb2" Size="3455" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="491877" />
     <Blob Hash="e2381c2b982ebe99200f9eb97db6df32f271ae59" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="514248" />
     <Blob Hash="e23a80d52c5cf20c3fdc0ddaf31c80fc71fdefae" Size="10128" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="171864" />
-    <Blob Hash="e23a872a3374efcf6c47b4c956c49d8e664906ab" Size="59" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="2097049" />
+    <Blob Hash="e23a872a3374efcf6c47b4c956c49d8e664906ab" Size="59" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="2097070" />
     <Blob Hash="e242587c6c9164b9707dbf75560ecacf939be035" Size="134331" PackHash="9a3106f71b0fbae7c935c63362a16d9a0419c9c3" PackOffset="901360" />
-    <Blob Hash="e243a5ef6d613bff76a06e9f0c8a9f88f6459f07" Size="101888" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="1915912" />
     <Blob Hash="e24515ea74b5f6b4a3c2794f153bf0db6df7fb96" Size="90277" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="1881774" />
     <Blob Hash="e24591f73c8c20ea596842b759f5560954fded22" Size="1409" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="445516" />
     <Blob Hash="e24f0eb93f77494167fb7ce70f1cd1bac5ea4d90" Size="9786" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="159474" />
@@ -63075,10 +62913,12 @@
     <Blob Hash="e2beaa54cdf4bb3c31afc76713b205970437676e" Size="89593" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1699691" />
     <Blob Hash="e2c006876955eeab9e481dec5ad05a8fca985718" Size="1138218" PackHash="def068eae246e2fbd7e21a232e16ab306dc83eb5" PackOffset="361236" />
     <Blob Hash="e2c1387edb93e3d29cedf16b8c2ddd7da565e6f0" Size="2168" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="65830" />
+    <Blob Hash="e2c1f2ee2e367fc42ab12cc072ae1c5155461964" Size="81920" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="1920036" />
     <Blob Hash="e2c233db3d4a9a8b9412cc2e69ee020a46ea886f" Size="30056" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1768867" />
     <Blob Hash="e2c5edee62208080b718a7400fabac701c24b38f" Size="83518" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1413622" />
     <Blob Hash="e2cad3198e2d626c1f709c6c6825c0a135bcf088" Size="1344" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="284414" />
     <Blob Hash="e2cceb2db4b78a72d1c7ac78ce2902971b5b1135" Size="113343" PackHash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" PackOffset="498062" />
+    <Blob Hash="e2d05afae0cd28a5a9c519168560cebcb3bf4123" Size="85540" PackHash="1c8c4f665f2963c27b7f1420af0878243670510c" PackOffset="1919944" />
     <Blob Hash="e2d07710bcb494d9265dcbfc5af1581db7c7e90a" Size="149" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="125947" />
     <Blob Hash="e2d0ba5e0af85acc207a74869d11592af7caccb8" Size="20038" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1081296" />
     <Blob Hash="e2d0d75b342f29f2800c267ee929a19954d9e828" Size="650144" PackHash="5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" PackOffset="8" />
@@ -63090,6 +62930,7 @@
     <Blob Hash="e2d99449addf4d3633d8b13540894d9a18f1bc21" Size="3829" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="540841" />
     <Blob Hash="e2daec0a7cee0cbae207dc91ed6cf5bbb7b2b64e" Size="40644" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="935783" />
     <Blob Hash="e2db0440e4bc728b0e4e5e3402e18bf4ab03c68d" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="535560" />
+    <Blob Hash="e2dc47861a05369b1b2dcf4a1cdf9388311407a6" Size="3006" PackHash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" PackOffset="2091381" />
     <Blob Hash="e2e2f112cbf79c420f724fe709f29b7804737a16" Size="1995" PackHash="95c9f70b2a087fabde73d50408cdf43f650b8559" PackOffset="2094659" />
     <Blob Hash="e2e476fb2c5c92b78b62e942459ff05638785051" Size="37158" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1451772" />
     <Blob Hash="e2ea61d8fe391b567b94defb4a29bf8cc036f039" Size="17915" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="395228" />
@@ -63103,23 +62944,22 @@
     <Blob Hash="e2fa9ade66052b6c706dec73bae2b44969232ad6" Size="1020" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="377766" />
     <Blob Hash="e2fc57a60b0d8f142db07d42c0cad4490d572262" Size="37203" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1066928" />
     <Blob Hash="e2fd32b6554a47f5e7cad6a233e1ef7cf98a1ae5" Size="37144" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="509483" />
-    <Blob Hash="e300f74822107a808e8480bff515594965150750" Size="2410" PackHash="07e31d5227b75af815bac4e9271886f59ee2ab58" PackOffset="2087930" />
     <Blob Hash="e302cd0933df0a6dce2f9da6696c8114d50c5d4b" Size="130642" PackHash="086a185d97a278fdbe9fa922ecdfc94e4f08ea2c" PackOffset="918632" />
     <Blob Hash="e3068c57ae2229cf0cb0ddba769520ece3502c46" Size="147" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1257146" />
     <Blob Hash="e307d9064a47f64347b67bfc521f7354fdf29bf5" Size="39575" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1791418" />
     <Blob Hash="e311afefa68d6823466cadaf40aaddf5b3c794c6" Size="156" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="441383" />
     <Blob Hash="e32815ba125a12c474130556647b2a9e1fc69782" Size="1754032" PackHash="7966ce69e1ca589fd320f02bbfda4db14a641042" PackOffset="8" />
     <Blob Hash="e32a962ee1eeec946b6e292ff228cd670450a5bf" Size="6431" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1512197" />
-    <Blob Hash="e332c444c8cd9e172c248a84271fb9e4f8610b38" Size="14198" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2039816" />
+    <Blob Hash="e332c444c8cd9e172c248a84271fb9e4f8610b38" Size="14198" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2052068" />
     <Blob Hash="e335ab2ca5c754c5b6da52b4063ab0d58eca2389" Size="35278" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="369449" />
     <Blob Hash="e3373ef8af329c0b7f5c037274aa5644b3a0e6c1" Size="4883" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1450437" />
-    <Blob Hash="e3382bf776f737b2b2ede3df5251b3375af29dc3" Size="16080" PackHash="68d4a07013644163437adb2f70cdb7f803f893c3" PackOffset="2079396" />
     <Blob Hash="e33ba2b22ddba4dda83a42360f445c55ffe76973" Size="3674528" PackHash="e6ac190de70c58158e73c9482f54cb74913b3fdb" PackOffset="8" />
     <Blob Hash="e33c8fbb4ca05eef352c9b4424745d0605909cc0" Size="801" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="137593" />
     <Blob Hash="e33d5f71b1b9238e9b6f729e892a4f0bb9ea119d" Size="145" PackHash="7491079d020d11f40f14eb94536fe09006ff2c16" PackOffset="2096993" />
     <Blob Hash="e33f17851dd2578e8dae4a385d9001bd3952cf2e" Size="7219" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2005952" />
     <Blob Hash="e33f1a8d282e6d89fbc77bb524c429b2a3b13a37" Size="10828274" PackHash="6e2a060d7037382a02da6ce27d023fb2bf955591" PackOffset="8" />
     <Blob Hash="e344299d231f2995fa01c35df9cd310f24ab7914" Size="152590" PackHash="c52ad5d5dc97d3425d95ae17988831ac9410b438" PackOffset="1912300" />
+    <Blob Hash="e345ef1c4f362e85147c1eab870284fac5deb384" Size="1787760" PackHash="43d51a207d99f34828926d06f1ec531cee9ed8fd" PackOffset="8" />
     <Blob Hash="e347fccb3071aeda620407118af36177a668f9f6" Size="318" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="159041" />
     <Blob Hash="e348eba68e03a865c91fe42710d01d2d07fe9e81" Size="37196822" PackHash="f1c7941afcfde1406432854cf30f3db1705aa7bc" PackOffset="8" />
     <Blob Hash="e34e3da81bcbf67f8b46cf8b5154b7beee51358b" Size="2878" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="244790" />
@@ -63145,23 +62985,22 @@
     <Blob Hash="e37d76e65714fb447e917804097317c50439ffbb" Size="3551" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="596498" />
     <Blob Hash="e37efc49fb28f5401d42b08cc0540b1bee9920ad" Size="643193" PackHash="65f4815b493d9c6d7adde544dd819ca5d5b68b4d" PackOffset="1206032" />
     <Blob Hash="e381cf872bcefa9f7249415af1dbbb6049bb9c68" Size="200981" PackHash="80f2cc730f53360badd247b19d28c4fb72891609" PackOffset="8" />
+    <Blob Hash="e382955c23ab03ede7e6681c39e3ef836cfb38d4" Size="5183672" PackHash="1c1df5eadc9bce7211cda985101ff6f9802a231c" PackOffset="8" />
     <Blob Hash="e38660e70765af5c17e767e16cf328ef4e16c514" Size="38400" PackHash="63fb6b15f90b5647d4e46169447beceac52a5dff" PackOffset="1444726" />
     <Blob Hash="e3892b9f390f01603a696632838d362c8609cab1" Size="9770" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="2078612" />
     <Blob Hash="e38a7cce66b5c31419db10043fe5b2b088fd5172" Size="531" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1815332" />
     <Blob Hash="e38b4e6bf14a671ed3186f9dafecc275da9585ec" Size="63926" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1191292" />
     <Blob Hash="e38f8a3802a4ae3321b6be971cc6098697728109" Size="1916" PackHash="1467cb6b7644671f3127567be26cf07d20b6da7e" PackOffset="2089126" />
     <Blob Hash="e3903012b43661bbfc9c4cd355eaa9f4e448bed3" Size="2056" PackHash="84bf691606771eee36059b19cfd6ba40df0b3148" PackOffset="2070616" />
-    <Blob Hash="e391fee08e8b07d8d84dd4913279aa5674069e76" Size="2362408" PackHash="87f8a812ddd59797c9a03fceeec9d14f3d23473b" PackOffset="8" />
     <Blob Hash="e395cb63fc68b6086f0bcc67d96643954487ec80" Size="20976" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1663483" />
     <Blob Hash="e3974dc0cd2a3344e5f6102b8842c05a2d0df0e7" Size="90187" PackHash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" PackOffset="828797" />
     <Blob Hash="e397a0229c498c5dd28fa417e6592f5fbb703ad2" Size="23752" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="278164" />
     <Blob Hash="e3992d665077177bad5a4771f1baf52c2ad1829c" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1039859" />
     <Blob Hash="e39d553cdeeedde2025cb7dea8f95dd322f00c4a" Size="32878" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="254533" />
-    <Blob Hash="e3a342edef8257f6cb4317ce1da1b035033c2d51" Size="1802" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1074915" />
+    <Blob Hash="e3a342edef8257f6cb4317ce1da1b035033c2d51" Size="1802" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1244949" />
     <Blob Hash="e3a7aaabd7d0148671a127a146668002675ec5bd" Size="287" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="2096594" />
-    <Blob Hash="e3a7ad1ce9c04a61a06c72531067b83cd042ef80" Size="1031" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1286538" />
     <Blob Hash="e3af33fb10d9e322dbf11b18b436de144b5dd74e" Size="104696" PackHash="4653f71982a36f99d16331bbaebded3036eff50f" PackOffset="1362142" />
-    <Blob Hash="e3b1792d402e5ba6b818682a75abff993d1d7ca6" Size="876" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1702608" />
+    <Blob Hash="e3b1792d402e5ba6b818682a75abff993d1d7ca6" Size="876" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1914500" />
     <Blob Hash="e3b2c2d8b907ef8d2fc46c87885a215fb007b272" Size="131261" PackHash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" PackOffset="1342332" />
     <Blob Hash="e3b473ce7718209fe9010fe934e498b84d801c36" Size="52424" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1893285" />
     <Blob Hash="e3b6c70425738a8eaadd68dfecc18f242fb230a5" Size="296259" PackHash="9d07997ea77b56b451a2d19b81138f5fab5e3820" PackOffset="943494" />
@@ -63172,28 +63011,26 @@
     <Blob Hash="e3bbbb8ca98c0d358b061c72c4ca7aff97e540b8" Size="2874" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="733510" />
     <Blob Hash="e3be6a71784a6ccddba2c15e702d9af37b350a35" Size="11385" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="1739390" />
     <Blob Hash="e3c56372b84439039fb0ace9eec9678f5eed1ec4" Size="478547" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="1163597" />
-    <Blob Hash="e3c57168801d5cb2e6b751f533a90f0bb5eec1fa" Size="1680402" PackHash="ea39a3af16b4dc43d157490fb9de27c641489d45" PackOffset="107629" />
     <Blob Hash="e3cdccd68a5ed28e89ea564cea5f3a4aa27fd529" Size="190846" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="1899496" />
-    <Blob Hash="e3ce3c50793d8b6f46d0e752b0b3763f9d0e6093" Size="1441634" PackHash="d8aceaf8d33e7b024e34c97dd3f251bc51e47913" PackOffset="8" />
     <Blob Hash="e3cef4d461f90bba3f0957bfa2f9ace5e80874e8" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1187164" />
     <Blob Hash="e3d6926ce096735e9e3f46369cafbfafa234cf0b" Size="5745" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="944967" />
     <Blob Hash="e3e02fa260101a477e8e9dbfaf6e8f3f4bb82c08" Size="9963" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="962506" />
     <Blob Hash="e3e1b72a779433f5e12ae125e3a487c825ba703b" Size="1590" PackHash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" PackOffset="2094417" />
     <Blob Hash="e3e775db782b5ea1856182a876345f22dae11492" Size="5394" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1895771" />
+    <Blob Hash="e3e8b83098ca0eb695ef7851bc5054fc28041f46" Size="2346234" PackHash="8259d40fa22680a13d44598fff38316a3abc0795" PackOffset="8" />
     <Blob Hash="e3ebad0335b113039b374d53621a03c80251d6b4" Size="432" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="421188" />
     <Blob Hash="e3ebc9b54aca9896af41d9833cee925c3086e9ad" Size="366" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="147509" />
     <Blob Hash="e3f93f1e4ba9b3ee48608f4a395c90385ad67653" Size="11184" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1493424" />
     <Blob Hash="e3faca0d678edc44310f8fac6b641a6a84bd5141" Size="2494464" PackHash="a1d0dfa33a2c47de9982fbfd2527b1e5f08d7263" PackOffset="8" />
-    <Blob Hash="e3fd7e4fbdb4c1fcfbb70118a266c6d25db6cfed" Size="53" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555855" />
+    <Blob Hash="e3fd7e4fbdb4c1fcfbb70118a266c6d25db6cfed" Size="53" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675087" />
     <Blob Hash="e4044b805436f9eca9411f2e24d3257eadc8f10d" Size="6843278" PackHash="220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd" PackOffset="8" />
     <Blob Hash="e4075f2c80b010f4e9036d67a417c39f77fa4d65" Size="1100902" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="8" />
     <Blob Hash="e408f2c18ef1e95251f9545ec5cc48f835419c12" Size="5942" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1955277" />
-    <Blob Hash="e409cc5fc1eab9e5718b0fc07874befbae7e9a28" Size="4249192" PackHash="a4ed84149ed3c7210f1c05ceaf8f38ba5a2f6a38" PackOffset="8" />
     <Blob Hash="e40c492397782723b1842cb90e06c17afff29879" Size="49" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="293751" />
     <Blob Hash="e40db72c8cfc90056ea5f345d1d1153ce8b8e5e6" Size="16969" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1871179" />
     <Blob Hash="e418e0999df2f19c82a82bce89aa0f445d7c88b7" Size="1761252" PackHash="b36b3ec21a66708a9e845ffeb4282ddf3a94f37d" PackOffset="8" />
     <Blob Hash="e4191a102634ed9885dcebf5247b0f661c9af9fa" Size="1088" PackHash="4e7e810806daa53af602a84d64ae8277b20e8884" PackOffset="2095758" />
-    <Blob Hash="e41946126195ee2940248776561d5eae62d00175" Size="1083" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1785141" />
+    <Blob Hash="e41946126195ee2940248776561d5eae62d00175" Size="1083" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1610277" />
     <Blob Hash="e41e7f3c5edf13f80282ae708b293b6a40682bcc" Size="9512" PackHash="76b81db67f411f1be2b6675587a81eedcdbfaf5d" PackOffset="2080332" />
     <Blob Hash="e41e858ded3cffdeff36467b153527f5c0a26f56" Size="144" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1977300" />
     <Blob Hash="e42cb2856f7ce01394e925c0bfd9590d63683df1" Size="5925" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1184011" />
@@ -63201,9 +63038,9 @@
     <Blob Hash="e435f21e7bcfd510eceac7fdfdb1dde8818c32e5" Size="82976" PackHash="511aea04a7efe620c37f248dbf89350d08cbb236" PackOffset="1927324" />
     <Blob Hash="e438b625d66ff31196fd0963acc83d745d8f9b23" Size="1461" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2091072" />
     <Blob Hash="e4393dcf44750e6b205158cadeb5dbb002c8cdea" Size="1299522" PackHash="e817ca9104379dfa75233081d3d42cccbf3cb21f" PackOffset="8" />
+    <Blob Hash="e43b08d43eec3c5b365eb634728d23661b9ef7fb" Size="2510" PackHash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" PackOffset="2092706" />
     <Blob Hash="e4410cd5391e64077b9c20c07797e51a9a950ebb" Size="107152" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="1864671" />
-    <Blob Hash="e4437e6abbecd37396083f3133143df501d3a1dc" Size="68792" PackHash="c53765e51afc0721161e2d92aaef0a7b705d8aac" PackOffset="1920616" />
-    <Blob Hash="e44498ee8cc97e7663e6b9f02af4b128e4da4bcd" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550580" />
+    <Blob Hash="e44498ee8cc97e7663e6b9f02af4b128e4da4bcd" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1669812" />
     <Blob Hash="e44565503660cacef34045d75925cc3394dd3b57" Size="8009" PackHash="926540c5a0b84439444ce2305aa3737763bb95a3" PackOffset="1916082" />
     <Blob Hash="e4466318cf750cfe3c1b0c53cfca07c459242336" Size="1107371" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="686643" />
     <Blob Hash="e446f006c5b38227641acbc363f9acfb36047af2" Size="31028" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="613700" />
@@ -63219,10 +63056,10 @@
     <Blob Hash="e46eb9faf75cf60ce17bca6cb5467a235d50c006" Size="174008" PackHash="247159e28ded6d0a9508b9732f70dce33ce3364e" PackOffset="1876040" />
     <Blob Hash="e476adba071cd2c83475d2fae76bb64c1863238f" Size="36428" PackHash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" PackOffset="1837547" />
     <Blob Hash="e47cca8004da8b0285a07b2ac29d984a65412fa0" Size="3480" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="1669688" />
-    <Blob Hash="e47ccb65662be7c8c53af3f2e6481451f5e6f6ba" Size="5095136" PackHash="5cabfd5087179f1efbb2a730ca7894409b1e2885" PackOffset="8" />
     <Blob Hash="e4826a3f1a488100459838c6dcb1361e215bff1a" Size="150248" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1447264" />
     <Blob Hash="e48318ecd874f1717c3ef485b7b051316df3e3c8" Size="230" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="400613" />
     <Blob Hash="e48b46fe1745a2b555804f501f4cbbe4d0d5d859" Size="30464" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="866945" />
+    <Blob Hash="e4917df6fbab3c32121a5468837aa6840077b2ec" Size="25088" PackHash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" PackOffset="2059932" />
     <Blob Hash="e4949e6698f946b655af6c4b63f9c750fb58f81d" Size="92560" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="918030" />
     <Blob Hash="e496cc866b1c09c8060b6f02ab8f577474dd835d" Size="171" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="520495" />
     <Blob Hash="e4986faf61f0bf2043ef3702a83e5c3f8435cb6f" Size="26571000" PackHash="6f37d8528659cccd45c7cc88170be2ee096fb70c" PackOffset="8" />
@@ -63232,16 +63069,14 @@
     <Blob Hash="e4a4f61df151a22e5c4e581ef1378f66aff61b99" Size="158241" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="158214" />
     <Blob Hash="e4a5627995e44768da3f042d3246252f7ad6785c" Size="189440" PackHash="da4da2f40baa6c08a42a6d05a81529a0bf2b1a69" PackOffset="1851400" />
     <Blob Hash="e4a6ee9dfeafb92c26fb6af753def2be742aafd2" Size="1159" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="380908" />
-    <Blob Hash="e4abc6d3a03356074ef453ff06c6e0f71b54f1cd" Size="503808" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="8" />
     <Blob Hash="e4ae13209e9207295251c4b9e326f41cb0b583ea" Size="3158" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="883641" />
     <Blob Hash="e4b1e42a8a5798b8d7b3615f4f3a7bedef01c6f4" Size="22026" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="48981" />
     <Blob Hash="e4b25dfc1058b1b7b18476ba98e64959dc37ac4d" Size="23050" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1781512" />
     <Blob Hash="e4b2aa762294b3649da63fa05a9d865e9112d79a" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1436680" />
-    <Blob Hash="e4ba5c95b9530466cf8322b772118510a9a43819" Size="259" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1316383" />
+    <Blob Hash="e4ba5c95b9530466cf8322b772118510a9a43819" Size="259" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1765285" />
     <Blob Hash="e4be025195f494a7189cb6bd4c6b0ac555b2ff93" Size="67865" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="1910013" />
     <Blob Hash="e4bf5cac73786134e1a5f03547c11c52aebed877" Size="20800" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1695428" />
-    <Blob Hash="e4c36cf25a4e91b269ba24a92c7756e33a9f31da" Size="14099" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1660957" />
-    <Blob Hash="e4c3e4662fe003e180b532ae0001693358e1d833" Size="153" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1606901" />
+    <Blob Hash="e4c3e4662fe003e180b532ae0001693358e1d833" Size="153" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1726133" />
     <Blob Hash="e4c74ce33f633b13f5210fd9a74cd17fd1971a9f" Size="18912" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="119132" />
     <Blob Hash="e4c8c3693505b03d1a350c6f60a48cb5c49e3e19" Size="140" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1855708" />
     <Blob Hash="e4c983653dbc2b4d01815a6acb285d5ff546b11d" Size="105241" PackHash="4e1cded72cde93df322ce7c1628797fd0fd7a4b2" PackOffset="1901459" />
@@ -63257,12 +63092,12 @@
     <Blob Hash="e4d683caee15f1af1f19e1684cb62fe610c342d9" Size="4012" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="423028" />
     <Blob Hash="e4da54f6f968f2f9ca95d961f50d04db206d25a4" Size="238" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="185044" />
     <Blob Hash="e4dc8e3b501ab5f531ccfe60c75f032ffbdd5491" Size="60997" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="263574" />
-    <Blob Hash="e4dd8cc6d9230b474d19372050f694700b373251" Size="139570" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1066014" />
+    <Blob Hash="e4dd8cc6d9230b474d19372050f694700b373251" Size="139570" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1079026" />
     <Blob Hash="e4df94adc40aac2c24483486c9594d13304ba751" Size="266" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2055609" />
     <Blob Hash="e4e1011f24d86d83bd46c8a4dccc4c855b2cb9ae" Size="3520200" PackHash="d7814fcf3d47188e1dfca0e7f6e46deb141b8e2c" PackOffset="8" />
     <Blob Hash="e4e501defc2533f77fde598647f5f18c6c3d6d06" Size="18027" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1273983" />
     <Blob Hash="e4eb78b4574ff2bfaac27e705eaf1780a5c593ac" Size="3905120" PackHash="6103a85786e4e1659a505159037c8f2ed5e98d43" PackOffset="8" />
-    <Blob Hash="e4ebfb3b35f3a0326bec1e5c81b7ced284d3d11c" Size="695" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1418417" />
+    <Blob Hash="e4ebfb3b35f3a0326bec1e5c81b7ced284d3d11c" Size="695" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1537648" />
     <Blob Hash="e4ec1aaec0b22529e52f2c249cd375b5b17e8e06" Size="31586" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="474491" />
     <Blob Hash="e4ec63e270812e5489b7620016ba9c92184d386d" Size="138" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="444734" />
     <Blob Hash="e4ece7d89ba32b91e76e5a6dd27c86a047fd046c" Size="18928" PackHash="be5cabcfa8f324441e444fefb236044b2b2cb4b3" PackOffset="2062968" />
@@ -63270,7 +63105,7 @@
     <Blob Hash="e4f461ee38352d7a882ef4c39857d6442b570300" Size="3829" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="547201" />
     <Blob Hash="e4f510f28d821e6fd88518979d528217a9f2e4c4" Size="14452" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="827620" />
     <Blob Hash="e4f8548165b42ec831a9c5f908df15ae2a64237c" Size="831" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="199586" />
-    <Blob Hash="e4fb1f0e6c8df4be669a18bffed7647e395c497d" Size="958" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1974894" />
+    <Blob Hash="e4fb1f0e6c8df4be669a18bffed7647e395c497d" Size="958" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2033450" />
     <Blob Hash="e4fb4dfe451e174160990da611c4dddf5992a9ab" Size="2652" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="498562" />
     <Blob Hash="e4fc959dc782d868d82d7e08f8ab1622388d1df7" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="603656" />
     <Blob Hash="e4ff10fc723ae1047ab64da5e2d6e1ca01bdf006" Size="807068" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="1154767" />
@@ -63279,10 +63114,9 @@
     <Blob Hash="e5052b535ea7fc33229ee9d392dffe57f100af98" Size="152" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="613727" />
     <Blob Hash="e505f5c118a51a0d0b858793a59930a523df08d0" Size="11776" PackHash="aaf3a012f48b24c193628af42ef3302d96784c3f" PackOffset="1955408" />
     <Blob Hash="e5061f8b5e0c50b0b8c24a39f4df4ff1779a03a0" Size="2812" PackHash="e3b0326826449ae757d09e8d825d91e18970a3a1" PackOffset="2094278" />
-    <Blob Hash="e50aed4eadd1d90f3fd8619aad0b3996d4f059db" Size="3815" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1753004" />
     <Blob Hash="e50d0821c4e8c359547f489057d0a606fb8d2697" Size="3569" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="482837" />
     <Blob Hash="e50db92d6b7c0d2b36cd3d20153e12e4344bf014" Size="1012" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="552000" />
-    <Blob Hash="e5105b10ffdeb3b1e634fa8c247483f2a6fcce35" Size="5061" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1929642" />
+    <Blob Hash="e5105b10ffdeb3b1e634fa8c247483f2a6fcce35" Size="5061" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1870821" />
     <Blob Hash="e5106abe12d991afe514f41e3b9e239202a4adfe" Size="85912" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="580234" />
     <Blob Hash="e511d94ccbf66e79a0ba077bea626fb90c54d54c" Size="217628" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="584515" />
     <Blob Hash="e51875fbcadb9ba642d5ce1a4e3d74588746ef54" Size="1770" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1926008" />
@@ -63290,8 +63124,9 @@
     <Blob Hash="e51d07d5fc6e6e8e0f6c481bcaa41e082f059d47" Size="4343844" PackHash="d889e4d65d962a36e5839fedc6a70a00ac10fafd" PackOffset="8" />
     <Blob Hash="e51ed9df88bfc08a6485dfdf23c8321577ecdb79" Size="26112" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="577544" />
     <Blob Hash="e52090d015fdd8ab425c289d609ecacc346b6f6d" Size="5064" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="512930" />
+    <Blob Hash="e526607071904e4bccff87cf41364d1b4b4b0dc9" Size="65874" PackHash="74047235dbdcbf775ea1513c65d277308c03e7bf" PackOffset="1943432" />
     <Blob Hash="e52c4fc2172c1a11c9f1200e3d51e45bc6dda5f4" Size="4192" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1152765" />
-    <Blob Hash="e52d670347adb254ec47cf276dffd05902a4601c" Size="170" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2094619" />
+    <Blob Hash="e52d670347adb254ec47cf276dffd05902a4601c" Size="170" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2096930" />
     <Blob Hash="e52e5be381b4c1a75ffffb8681067f5d5c5a7af1" Size="95340" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="1262910" />
     <Blob Hash="e52fb5b9224f788c0e0ee955359fd7f8ef2e3282" Size="107" PackHash="5c9d5eff510128bea96694edef5a298eb77b3a1d" PackOffset="2097038" />
     <Blob Hash="e532eb0cd38fe0bd7c3fd9b12dfd879d69a39633" Size="21" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069678" />
@@ -63300,7 +63135,6 @@
     <Blob Hash="e53a68c2eddd1f8f67329295d523acf98cf566a4" Size="139069" PackHash="30e198f7f7cb931d8983952a5cbb799f45aa1367" PackOffset="1957896" />
     <Blob Hash="e53cda109ab4d43a4f9ee551e23bee3d4e99a212" Size="961" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="568656" />
     <Blob Hash="e53cf684b6d0a7f0329e8cf873f9b69e3f95ab34" Size="14280" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="695471" />
-    <Blob Hash="e543368b5991b1591e5d1762e51252cae347512c" Size="65866" PackHash="858de213a099ae751d4748be354bdddec041c44b" PackOffset="2004478" />
     <Blob Hash="e5444cfecae33effe3d6cf372bb0b208e2cb4eea" Size="3235" PackHash="55432c5eabf49c62d2a90391a4a41bc6c23f02f4" PackOffset="8" />
     <Blob Hash="e545264414a07752d9753a8aceae54b9c47c7473" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="610199" />
     <Blob Hash="e546202a703434a69712a7d142849aa56d91a521" Size="205286" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="8" />
@@ -63310,7 +63144,6 @@
     <Blob Hash="e5502f8bea3c7e4dee75a2e33e3c96f11847e94e" Size="11056" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1214632" />
     <Blob Hash="e550b681f87af9ece8a0511d9f3e6fe20b766e4c" Size="22550" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="115979" />
     <Blob Hash="e5512814785e12bc85acfef7db4feb81ccc6fa0c" Size="5161" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1011633" />
-    <Blob Hash="e551548875e91804e05d239cf4d8cddac0078147" Size="80896650" PackHash="40a492c7b1e237bf5bcd5681e1dec9f7fde7aa2e" PackOffset="8" />
     <Blob Hash="e5563f82b0e68b742b6fdd3d9141dc18167a4548" Size="1891" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="193427" />
     <Blob Hash="e5584597e94aa26ba93b85b4aeff83906b6bf107" Size="130002" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="560661" />
     <Blob Hash="e558e0ce37826b1fe91a6df3e9021a09a6c5f085" Size="51867" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1959891" />
@@ -63325,6 +63158,7 @@
     <Blob Hash="e56d2a7f96f2d2b3d823348e3f6531cf0aa849a0" Size="1568" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1276248" />
     <Blob Hash="e56e05ba6f3268eb1269ebc3af2527241da154ae" Size="60933" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="1341954" />
     <Blob Hash="e56fc47947083604eee91c09c1d4bd08dc29622a" Size="1372" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1185568" />
+    <Blob Hash="e570daa4bede3198b068ac791518d079ff1b3dbe" Size="82404611" PackHash="00ce119da898800727dd85f6ad557df8afed3af4" PackOffset="8" />
     <Blob Hash="e5746ae972ba6f2780619f9fdd9c047f69d19683" Size="4407" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1082987" />
     <Blob Hash="e57540eb0cba74f12d12fbfe5f0736289adfeed9" Size="7414" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="447326" />
     <Blob Hash="e575a52f23a47f34519f8cbed5f719a439e38e7b" Size="5370" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1971611" />
@@ -63339,7 +63173,7 @@
     <Blob Hash="e585b4246e9d3f6688021cd571b0087173b0d89e" Size="27790" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1186665" />
     <Blob Hash="e5860d42fd9026611b763310d9901d1e626d1632" Size="757" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="442293" />
     <Blob Hash="e586b35efb21aa5830098d8eee5ac12f32ff305b" Size="38544" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1686149" />
-    <Blob Hash="e58a08f9af3b0a78b09a07222d7571f1bd2dcce4" Size="6180" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2088582" />
+    <Blob Hash="e58a08f9af3b0a78b09a07222d7571f1bd2dcce4" Size="6180" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2086646" />
     <Blob Hash="e58aac1f92b8a776bbb20e66f07bf51e9a777d0b" Size="5593" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="910256" />
     <Blob Hash="e58efeaba9b13b8a3899607c578b0d01c76e3eb9" Size="100215" PackHash="28f44db32f9f7f25ed9b2a7bf93ac4705bb90bf2" PackOffset="1775097" />
     <Blob Hash="e59119b63e89725f471c53038f9a0d960cd422ce" Size="16783" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1468572" />
@@ -63365,7 +63199,7 @@
     <Blob Hash="e5bac2c4b502f19b390f6ce80293f29532a784f6" Size="708736" PackHash="04e83b9b704ff752417e560945db286740e82003" PackOffset="1070716" />
     <Blob Hash="e5bb7f6d2897cd90e4e6795cc615496904bd4bcc" Size="4523" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1967088" />
     <Blob Hash="e5bef1367a97a1900749ce6b1e01cf32f582bdd9" Size="158" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="204072" />
-    <Blob Hash="e5c1a3ff4b4c9b91a209c73248a70bc7d05410b6" Size="54" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1826930" />
+    <Blob Hash="e5c1a3ff4b4c9b91a209c73248a70bc7d05410b6" Size="54" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2097064" />
     <Blob Hash="e5c2679887a8eee345e2565ed55fca82ab958753" Size="3225" PackHash="f5afbf7abcf77972aee12be2b84779a385983b9d" PackOffset="8" />
     <Blob Hash="e5c326788d955e531c1c6c77ff74c63429aad5f7" Size="63256" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2011033" />
     <Blob Hash="e5c612896013ad399842a3e761533ac48dd92b70" Size="3774" PackHash="7a90ab9e937888c1b30ee67bd4fd3ffbf35f75cb" PackOffset="8" />
@@ -63416,7 +63250,7 @@
     <Blob Hash="e60c755c8c6732c70cc55b446a066d3a57206b8c" Size="2816" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="2074289" />
     <Blob Hash="e60fe1596bb71b46b8b4442a84590fcd7794f9d2" Size="155" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="612724" />
     <Blob Hash="e61761b31af0e02fdea8373ac4ff77cbfd351cb9" Size="39539" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="240682" />
-    <Blob Hash="e617be39cb5538ae0e1b8ed076c2ccaaebf59fb0" Size="1471" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1363799" />
+    <Blob Hash="e617be39cb5538ae0e1b8ed076c2ccaaebf59fb0" Size="1471" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1483259" />
     <Blob Hash="e6196cef47436dc8d7b7b4f267fe4d351a0bd70e" Size="742" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1081653" />
     <Blob Hash="e61a960786d0b0e2e88f702c0b6234eaa612bf68" Size="1505" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="233893" />
     <Blob Hash="e61b4adf3ab33dcc455bfec5d6931fbf78179a9d" Size="6868" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1157664" />
@@ -63461,10 +63295,10 @@
     <Blob Hash="e6731a99d277b1cba87386670345a2bf0d082ef7" Size="193836" PackHash="354d41849e6ca4976e737a6e0332152c3d8dac27" PackOffset="969328" />
     <Blob Hash="e67546db6001776ab6fc6732e449c00cd04c4e5f" Size="120747" PackHash="ad4207783212636370be585632e4c55891407859" PackOffset="1901242" />
     <Blob Hash="e67943f148b517f2b86f993fbd628c8f8dded0ce" Size="23029" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="401210" />
-    <Blob Hash="e67b7ec193518c5bcd44074feded33380186b712" Size="630" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1437746" />
-    <Blob Hash="e67bfcf794bd5fd99e71dc308afd77ef98d04180" Size="11732" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1533676" />
+    <Blob Hash="e67b7ec193518c5bcd44074feded33380186b712" Size="630" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1886799" />
+    <Blob Hash="e67bfcf794bd5fd99e71dc308afd77ef98d04180" Size="11732" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1652907" />
     <Blob Hash="e67cc306345384176001fa1a8ed14e3e15df3efe" Size="8488" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="416296" />
-    <Blob Hash="e67f2802c041c0f4f706c2ca8a21b0dc506cf897" Size="753" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1422665" />
+    <Blob Hash="e67f2802c041c0f4f706c2ca8a21b0dc506cf897" Size="753" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1871718" />
     <Blob Hash="e67f6aa11bb9484cb1ff18b37209fc11b63f501a" Size="2127" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2094156" />
     <Blob Hash="e68077fc6d7d3615c5120fa8e50e1072b4f5705f" Size="3823064" PackHash="25d56e7add8fca2f0187f16e0f59bf8691cb89ec" PackOffset="8" />
     <Blob Hash="e681af7efaa7e301b6a29e506e950c1d6b1a6109" Size="21320" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="392944" />
@@ -63489,12 +63323,12 @@
     <Blob Hash="e6af053cccc38988057d40ecf193bacba42cf821" Size="513" PackHash="acdaf99b12d98a617d40b9fa06d235043e85ccd6" PackOffset="2095947" />
     <Blob Hash="e6afca9204083d0f172c171f90ffa7f03bc58302" Size="3901" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2008941" />
     <Blob Hash="e6b85178ff7e5cc01524a5be48c45207a169877f" Size="90604" PackHash="f24d05b616e3f50a24367e32f8c42d68d40797a3" PackOffset="278177" />
-    <Blob Hash="e6bdcd40ab7a9c997a710fa4049a2ad01879eb96" Size="11838262" PackHash="51b4e2fade508597fd53eba3386c188ad5488717" PackOffset="8" />
+    <Blob Hash="e6bcc432357d26d68034004666b59615950ff700" Size="1588454" PackHash="55920545fa77af2c7b5301b525965ac54c9d5871" PackOffset="8" />
     <Blob Hash="e6be40b9078d8084a76ec53865232134dac9a58f" Size="4196" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1293560" />
     <Blob Hash="e6c38dd6c5e01db659bfdfa8acff803ccb4bafcd" Size="2542" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1988572" />
     <Blob Hash="e6c3c10ea99cf893daa2ce72b1c29b96668d69f2" Size="3687" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1384663" />
     <Blob Hash="e6c4c80b0a2ff5605299af5a010b49e084b47d1e" Size="1083" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1789090" />
-    <Blob Hash="e6c764e7a1144ace8508e14fbc92139f8e55a100" Size="511" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1570680" />
+    <Blob Hash="e6c764e7a1144ace8508e14fbc92139f8e55a100" Size="511" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1689912" />
     <Blob Hash="e6c966f573f2da85a989f5d20b2233faddaa797b" Size="9550365" PackHash="726596db859d5796f2be55f6cecbc2deb49a7649" PackOffset="8" />
     <Blob Hash="e6c970d6efa4b9a186c8c97437159db05e91ec06" Size="3492040" PackHash="e969a96396fd224b9c2af1da8e4570fd07b0600b" PackOffset="8" />
     <Blob Hash="e6c97b9df8bf2b43d978b3ff0fdfa854dbaad718" Size="241" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1938771" />
@@ -63519,7 +63353,6 @@
     <Blob Hash="e6ea3438db7d98ad558f2d19d341e542c4d52992" Size="1798" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1471832" />
     <Blob Hash="e6ef5dc2fc1b2355b13a160bd6239c732037887e" Size="1432" PackHash="6f0766b3de04680ee3b3831e531828e22fc17bc7" PackOffset="542635" />
     <Blob Hash="e6f338a08f72da11b97f70518d1565e6ef9ad798" Size="251" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1039608" />
-    <Blob Hash="e6f852f94348866814b6d322ed68da52cb23ed4a" Size="7373198" PackHash="56f29a329c5e1a894191e3ffe9e4f2b381846e20" PackOffset="8" />
     <Blob Hash="e6fa61923049d58e71f49c80bafa3b1ee098aee4" Size="86016" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1869147" />
     <Blob Hash="e6fe94e93920839564b0a1cdedba48d87b05bc4c" Size="69197" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="878294" />
     <Blob Hash="e6ff9aaaad94c910613d43dd3947cf9fe74c5569" Size="24795" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="2040914" />
@@ -63544,9 +63377,9 @@
     <Blob Hash="e72107f38895d489c009c16967a17cdf3192f282" Size="21621" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1897925" />
     <Blob Hash="e72232e9fa9856c46329932e9a7bdfd642d94858" Size="758" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2076567" />
     <Blob Hash="e72a8bb953d8c85c91495e8c7997846378e44376" Size="8288" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1867546" />
-    <Blob Hash="e72c3eb944fbeab80da3d6efde309d32079a3b7a" Size="1059" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2093991" />
     <Blob Hash="e731a355cbf929da4a38d106d3a004e131f5db7d" Size="9534" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="672713" />
     <Blob Hash="e734f48554e0298a8469787a52e4b00a7afd7760" Size="107520" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1485652" />
+    <Blob Hash="e7364bec4fb97c154afab724196c2e1fa495860d" Size="143717" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="1791182" />
     <Blob Hash="e737d1002feb4484eb9c0968ff4aed39b579cc97" Size="5372" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="169764" />
     <Blob Hash="e73ac2c0ff2cb582e60c667cc9038af7445ecc94" Size="2866" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1151789" />
     <Blob Hash="e73de9291a8471b3b3cf801ca8ea1e8ca089c27f" Size="5760" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2022755" />
@@ -63567,7 +63400,7 @@
     <Blob Hash="e7625eca73a2f29ff1f3a5508bd90cede455648e" Size="5797" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1078384" />
     <Blob Hash="e7638d4b1fce3b0279c7575aff893b4303a233bf" Size="372" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="2004797" />
     <Blob Hash="e7641e2a2cc5f640578a264280710b9b40907273" Size="301" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1564036" />
-    <Blob Hash="e76f24c80fb8323f0f529b936c53ca8e0f2e6389" Size="101" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1601745" />
+    <Blob Hash="e76f24c80fb8323f0f529b936c53ca8e0f2e6389" Size="101" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1720977" />
     <Blob Hash="e76fde2f4afa72030fdc436a39796ff10f21e2db" Size="3051338" PackHash="1b857a80e8a2911a796905551b990cf63aa07cd6" PackOffset="8" />
     <Blob Hash="e773ae394f66edef8b2987be89eb7aace3672e46" Size="413296" PackHash="eaceaa2d359d151c5394522df962ce393938a21b" PackOffset="8" />
     <Blob Hash="e7762c728ee3bced6648efdfd12e9451147d5182" Size="10215" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1089620" />
@@ -63577,7 +63410,6 @@
     <Blob Hash="e77f8cac7d496a85af158182f6e4a483b98b6a97" Size="13224" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1630102" />
     <Blob Hash="e781f45cfa4b85766b1cff529d07225669bbd3ed" Size="46063" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1802737" />
     <Blob Hash="e782a63fe9b0914042ea49b5724147cfa5ebea89" Size="143434" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="1017511" />
-    <Blob Hash="e782dff9a80709e48dcec7f0182452bcbb9b65ee" Size="52536622" PackHash="0c97070e87e372925a4d21766eff739d64e3aa43" PackOffset="8" />
     <Blob Hash="e794e1bfa100db0cf0fbd46606cad94ec25df04b" Size="2370" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="805871" />
     <Blob Hash="e797143926c12e9e6b9596331cd7ce23e87bef6b" Size="6696" PackHash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" PackOffset="1980014" />
     <Blob Hash="e79751494af6224a1731fb56da8066d43e5fb013" Size="8062" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1130430" />
@@ -63591,10 +63423,8 @@
     <Blob Hash="e7a3672ead6884bebf07d33ff5f5d1154cced9d7" Size="937" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="945046" />
     <Blob Hash="e7a5bcc6e015768d48067b2e0de5146d82696cbe" Size="368" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1508348" />
     <Blob Hash="e7a66797389ef040558a1a7db72d1f12fc184d06" Size="244" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="271294" />
-    <Blob Hash="e7a824366b740a23b92e8aefff67c45576be96f6" Size="1967100" PackHash="4c81e720829fc23d1104fe9a396d472aba90a43c" PackOffset="8" />
     <Blob Hash="e7a88abdc688ffa353991aaa698ef541e0dac3c0" Size="736" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1149589" />
     <Blob Hash="e7a94417cd5637e218ae2eb7148a0e8ea88d6831" Size="79" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1069478" />
-    <Blob Hash="e7a946d34193c40095e4ac17158c75da3b5aa7d8" Size="4904" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1855743" />
     <Blob Hash="e7ac74d52e2ae8a2df222f575f601cbb21ea5328" Size="33792" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="2054755" />
     <Blob Hash="e7acec27cbe96d8ace82e13e180f5e2ae8faee86" Size="16329" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="262444" />
     <Blob Hash="e7ae09a2c725adceb81d11848a17a2ae24d0343f" Size="29184" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="684040" />
@@ -63611,10 +63441,9 @@
     <Blob Hash="e7c0c01f8b1c60e48c5b03d6c768c32788d9312f" Size="1750" PackHash="c64ef0980920bd362bf26c9e31d253c145d848ab" PackOffset="2091322" />
     <Blob Hash="e7c8d66b81151b45eb496c6bc5fe235579dab561" Size="19518492" PackHash="67e1b9d89e2a08345ca540b57b03499da3b52513" PackOffset="8" />
     <Blob Hash="e7cafe341ed3a2efa90cbda4e2e24d8b68817bdd" Size="37607" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="122661" />
-    <Blob Hash="e7cbc08db1ced310d1270f40e4d595f84032697a" Size="5068" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1937400" />
+    <Blob Hash="e7cbc08db1ced310d1270f40e4d595f84032697a" Size="5068" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="1994803" />
     <Blob Hash="e7ce72deee92df14d0d232f520ec4c198b83d787" Size="3472" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="664622" />
     <Blob Hash="e7d17935b42a41b6e4957f9f76316203214785bf" Size="8028" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1697465" />
-    <Blob Hash="e7d2246e4a95130880c8f3b8de8dd0b3ebb061b0" Size="27423" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="2033671" />
     <Blob Hash="e7da5a96f61cbc21e5289330d884ac3222780217" Size="190" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2029516" />
     <Blob Hash="e7db9bc32934d4abfeb387dfb7b6ba6e1bebaf20" Size="4639" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="28595" />
     <Blob Hash="e7dc4c3f048b68d1e15e260326b029c1826ef846" Size="961" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="292536" />
@@ -63624,12 +63453,11 @@
     <Blob Hash="e7e1337529f0ed2f30211f61e5278bbb38e9d488" Size="362309" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="1642038" />
     <Blob Hash="e7e25011727a59f26c91450462d45e18cddbb316" Size="3508" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="938311" />
     <Blob Hash="e7e5c420cf6cc5076ea94050dbeb060f5886ad16" Size="41982" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="288105" />
+    <Blob Hash="e7e6cfff7c89ba0351f161d3fce527c645ca3225" Size="7885" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1824961" />
     <Blob Hash="e7e88fe83c093e0be506a09567923b0c6df09b57" Size="885" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="271538" />
     <Blob Hash="e7ea70a3252436bb2f951295e30ec9c6554c3138" Size="117393762" PackHash="3a27694f8ce344cd16747d59c4e0bc3244e903e5" PackOffset="8" />
     <Blob Hash="e7ef298dea5dbbf6e6bf9d3604dac81a2a52719c" Size="3528" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="637909" />
     <Blob Hash="e7f19dba0a30e3564c7bc66727d48b59a8425291" Size="88055" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="1948896" />
-    <Blob Hash="e7f20d840370cb20a4c23d566a2970eccc833673" Size="7587292" PackHash="5e0060f36de516098088db4d19cf3044aa46854b" PackOffset="8" />
-    <Blob Hash="e7f217f2f1d071626326a52b3b4ceeae1cab28f6" Size="47104" PackHash="09358de240dc340ba067bd03e6077676ab6a6908" PackOffset="2047608" />
     <Blob Hash="e7f2ecd09bf86f84ce1e4e6ead9e78482b148898" Size="2116" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2089661" />
     <Blob Hash="e7f64fe3d015e1aebe27e867eea11f82c983bac3" Size="4029542" PackHash="f6c9862bafeae8b2f923aaa3ff2c507277f53369" PackOffset="8" />
     <Blob Hash="e7fb009be9604182a9ca8612b0eb27682b959420" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2096220" />
@@ -63654,6 +63482,7 @@
     <Blob Hash="e81b4e87f2ef4e91154e2966a50e28efc1afe73d" Size="100" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="517936" />
     <Blob Hash="e81cd5a6d4329fe38339b704d8a6b146958849c5" Size="9453" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1534413" />
     <Blob Hash="e81ede0e6727ece1391e140fbab681d8d31d9fbd" Size="1798" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="960748" />
+    <Blob Hash="e82220f31636dcc239c03b600d361884fb4f8237" Size="5915432" PackHash="cb7e3b76227696f2ef0d9d77c866ae568e1d5751" PackOffset="8" />
     <Blob Hash="e8261f7bb63a5e2263910439dc74ebdbcace3de7" Size="475" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="408145" />
     <Blob Hash="e82eba5cb1fbdcf1f82b2d26a292f98f1086dbb6" Size="4625" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1125223" />
     <Blob Hash="e832596ea801de3e6e8df09e47fe33f945baafa7" Size="144" PackHash="2944a0052b881a644f04844186daa4ae54aad523" PackOffset="2096942" />
@@ -63667,36 +63496,32 @@
     <Blob Hash="e8485bb7f8e0406aa0535579c4ea9651ba3320c4" Size="12824" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="128336" />
     <Blob Hash="e84ba13e9924dec54513f3564b997d77b6c834bd" Size="1112" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2093335" />
     <Blob Hash="e84f73ada030870e1bf4e3769272305d1dbdd3ca" Size="1676" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1836084" />
-    <Blob Hash="e850dbc881c19c42bf0b48490f1ffea5ca2ba244" Size="402" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2095165" />
+    <Blob Hash="e850dbc881c19c42bf0b48490f1ffea5ca2ba244" Size="402" PackHash="ff2f8505b3190e6af25135e44fd2fa57f8533112" PackOffset="2096353" />
     <Blob Hash="e854c390fdd0422877e305a0ef9fc9a24f33386f" Size="1059" PackHash="b2e987e08f2df675b35cc36c7e86abfa988747fe" PackOffset="1193" />
     <Blob Hash="e8570f83d7d367b413c11bfd3aba84dcd6d3f7d0" Size="2658060" PackHash="49e651970cd6076115e1ef02f045a9061d6ff7c2" PackOffset="8" />
     <Blob Hash="e85abd94d0243617a17940b707a8eacedf5d7e11" Size="390" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1303581" />
-    <Blob Hash="e85b2c2a68f95a6224b8ada5b430acaa120f9d6f" Size="6008730" PackHash="e3eb6d5385b624938cfde015b9cb6a2404021c9b" PackOffset="8" />
     <Blob Hash="e86cdc691286a94010273dfb9744219eb7a6a740" Size="248624" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="8" />
     <Blob Hash="e86d7d8881c8c534ccdbbf30d20ac03bbbb24689" Size="6051" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2039554" />
     <Blob Hash="e86e0d007a63f6faf7f1713c771cdd9e18cc7f26" Size="138210" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1773410" />
     <Blob Hash="e86ef14c1b90a616fe9002fa76af1d457a46ccae" Size="105974" PackHash="c5ae184eaa6760174706ff03095aa041150e0bc7" PackOffset="90055" />
-    <Blob Hash="e86f3b66a34010e919629062b2b5df1ee1bf548b" Size="2440" PackHash="843ec9521a79db33580bddc6abb809743c01abce" PackOffset="2092394" />
+    <Blob Hash="e86f3b66a34010e919629062b2b5df1ee1bf548b" Size="2440" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2011346" />
     <Blob Hash="e86f404e97a5901d6c7fbb788d11b0bcfd5237c1" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="693972" />
     <Blob Hash="e8731e8309ec9e42d3a989f18761f3a1ebaf0afc" Size="4927" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="1013835" />
-    <Blob Hash="e874c99470e7138277177741804432c162d90e0d" Size="1169056" PackHash="bf548fb9219b92aeba90f5902ef9448dbae1eaa5" PackOffset="8" />
     <Blob Hash="e87752f41d60a2c1e5cbabb6fd080f3637079a1b" Size="1584" PackHash="c4423e14dd25ec4192871f50e86197fc73d5b31b" PackOffset="2095194" />
     <Blob Hash="e8781e7905ec600905c31b0a6a4de0e5e28b9abf" Size="88064" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1395280" />
-    <Blob Hash="e878d97761de9994c784b3705d218dc227ec7b35" Size="57" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="2097087" />
+    <Blob Hash="e878d97761de9994c784b3705d218dc227ec7b35" Size="57" PackHash="7aa3a496eb4790b1edb510b703023a1b458b5837" PackOffset="2097099" />
     <Blob Hash="e87a16477e61205d136f9f364006fd08e6516c1b" Size="4230" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="307556" />
     <Blob Hash="e87bbec3e29bdd9696001e7206bb02b909a40539" Size="32" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096670" />
     <Blob Hash="e87d3b288c356638843ea1b3ed16fa34f8970ee9" Size="148530" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="8" />
-    <Blob Hash="e87e2c4ce808aa1ba306e95e52973a292f8e38b7" Size="2143" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1372288" />
     <Blob Hash="e8812378e3cc0c9dcf6c4b86fe59dcd067dc155d" Size="10477" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="363416" />
     <Blob Hash="e882770914ada2f3c220a57509601359c1ef34ff" Size="421" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="444554" />
     <Blob Hash="e8833721f6173bc7966514deb8d53737b2c8e69c" Size="13808" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1590462" />
     <Blob Hash="e8864ac5da012a1d46ec07e01668aacc078efaba" Size="3035" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="659390" />
     <Blob Hash="e888e840649bb8e38b990230a0da1641e986eda4" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1140814" />
-    <Blob Hash="e889371b4196581e6d5dd83ae704829d8d5e7da6" Size="1562218" PackHash="b221596f9694d342526ce34110f4e329b8f905b2" PackOffset="8" />
+    <Blob Hash="e889371b4196581e6d5dd83ae704829d8d5e7da6" Size="1562218" PackHash="a57929556fea304cb2fa2583c8e6fd31b8f632f2" PackOffset="8" />
     <Blob Hash="e88e4212770c745f2df62bf086211a71c901d918" Size="6004" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="992916" />
     <Blob Hash="e88f5c3057118ed7ba4087b2d52c7285a27c8ffa" Size="289416" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="340523" />
     <Blob Hash="e8909bc2908ff7594448e1b7af172988e154e867" Size="6490" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1972958" />
-    <Blob Hash="e89436ae6d884cbe4bd7e2c3723fe917944c77f9" Size="1156412" PackHash="563883a5d19fc2d08ee339d742ba1d2eacc72981" PackOffset="8" />
     <Blob Hash="e89457622aaf98cb95b2b1dfdb4ce713d4c0619e" Size="11512" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="822320" />
     <Blob Hash="e894f5615654d1110c9964b8f6a54c048442d8eb" Size="193" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="624758" />
     <Blob Hash="e8989da36607f9d958aaa80f714405f142715546" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097044" />
@@ -63711,18 +63536,18 @@
     <Blob Hash="e8a6a87c5d2c2918e3435e98ca7cf1803f9ebef0" Size="45" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="927018" />
     <Blob Hash="e8a7925ea3b4ff2feadf93f59b83275b33314793" Size="8021" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="2088547" />
     <Blob Hash="e8a79299a0201df44b2a9b2bb31a8b7cee2e3817" Size="51674" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="1017532" />
-    <Blob Hash="e8ab5a6b396ad90309d40bef8f96a96b9a5c0038" Size="89555518" PackHash="999479b20c016d56bf02638f5cfbdfa52557286a" PackOffset="8" />
     <Blob Hash="e8abdf3f580ef6108604b0d27f8b25a421efe9a6" Size="3392" PackHash="8b074d0642c577e9eda274945aa48bb666ef0322" PackOffset="2090860" />
-    <Blob Hash="e8abe4a45e071a49e4ecee539042411a08fc4e7f" Size="395" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1664596" />
+    <Blob Hash="e8abe4a45e071a49e4ecee539042411a08fc4e7f" Size="395" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1876315" />
     <Blob Hash="e8ae57f648c29edf7e175615be8ed0be0352bfaf" Size="6118" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1134656" />
     <Blob Hash="e8aec266e6d848ab043e60957457e54fc8f7fdd3" Size="34304" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1930608" />
     <Blob Hash="e8afc09754dbfd60fbcef5d289ca853978f94df7" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="545329" />
     <Blob Hash="e8b0c728ee62821a3eb37d72814b34d69a9f9f6b" Size="23748" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="1157792" />
     <Blob Hash="e8b53b4404eb3c17264a80039649ba8aade2c398" Size="27056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="851792" />
     <Blob Hash="e8b5d3ab0cbf17dcf6c767ac617526bfd1560339" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2094791" />
-    <Blob Hash="e8b7d42666d4ad78667b6a07b83a3c602e420def" Size="752" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1603269" />
+    <Blob Hash="e8b6480c5d722aab48d5675b5fb7b612294a2c3b" Size="3376" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="2091398" />
+    <Blob Hash="e8b7d42666d4ad78667b6a07b83a3c602e420def" Size="752" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1722501" />
     <Blob Hash="e8bda52a2b97fae81e83c0836c9143ac8849440a" Size="1847" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="2092221" />
-    <Blob Hash="e8bf4e6c25fc8e49d96f19512261fefb5c94eda3" Size="3538" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2089956" />
+    <Blob Hash="e8bf4e6c25fc8e49d96f19512261fefb5c94eda3" Size="3538" PackHash="963812328a2077bb3e260410f1eec20c7ee5cb1a" PackOffset="2075532" />
     <Blob Hash="e8bff72553e552a91ebb388e09b56d583d2a309d" Size="1779" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="468517" />
     <Blob Hash="e8c0168a4361bf13c79968b590b94655650a4e5f" Size="256" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1602529" />
     <Blob Hash="e8c11c3b51b074b5dc187f6871340185657625ff" Size="75041" PackHash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" PackOffset="1913841" />
@@ -63762,6 +63587,7 @@
     <Blob Hash="e9203a997a49c33db1411a597f8a6eac0a905e1b" Size="954984" PackHash="8814291f8bed0c9bde408fdec8049a5cfa44ca2e" PackOffset="8" />
     <Blob Hash="e921068ef2c89bf0e19409634b610e7e1e5d517e" Size="94028" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="404816" />
     <Blob Hash="e922fc0df4fca3abd0d14f481654ba69d2139b7b" Size="1308" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1380124" />
+    <Blob Hash="e92357106f6a0747a2e788bbd74bf8f8b6832c06" Size="516080" PackHash="04c28788013394a789dc45f78000e685d793643d" PackOffset="1558824" />
     <Blob Hash="e923de8d8646d8dcc24987c5eb75fddc433f7ed4" Size="673" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="737315" />
     <Blob Hash="e9245f478efddb6d1e9c64db2d972443ebdae9b1" Size="9248" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="668193" />
     <Blob Hash="e925e4bf7c63cb75368e8796d1760f2c1ca54382" Size="7943" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1081677" />
@@ -63794,17 +63620,19 @@
     <Blob Hash="e9648ba6081f83372c146f9cf5999da6174e3426" Size="10441" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="49667" />
     <Blob Hash="e966d0967e56d5ad73e68241dd05f98945b63b67" Size="47076" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="565912" />
     <Blob Hash="e967f75ed489de0524fe1f7245f827941878814c" Size="67" PackHash="a03bb1d2a4614125f33bfe2bab39d84653cda033" PackOffset="2097086" />
+    <Blob Hash="e9681be0c7d24e7664efb60984b65b9e23a3bb59" Size="195106" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1469180" />
     <Blob Hash="e96aea67b1f21d218616fe6a18a8e7024d22ff46" Size="16384" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1965576" />
     <Blob Hash="e96d41fe5e42f28380bc4d1e960a45fae0f25271" Size="12789" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1983445" />
     <Blob Hash="e96f63d41955563d02cebed91f6eed28ed71946d" Size="11629" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1251392" />
     <Blob Hash="e9715c5ce5feec25c9f38c9a319d2400f3b2753e" Size="330" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2046353" />
     <Blob Hash="e972ee9f78b6182b5db37caa3b210382d735b032" Size="1567837" PackHash="32ac28dfec38ddc98e271b6d68a1106b22c0907e" PackOffset="8" />
     <Blob Hash="e97760729f28c8caafd373f5c9d3bc1d1e17e004" Size="674" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="362008" />
+    <Blob Hash="e97b15445ed437e54b06471f50ccbc0c3b74b994" Size="37187266" PackHash="ca3160fa5c2af7e6b47fd6f3a4aa6ffaf30c8222" PackOffset="8" />
     <Blob Hash="e97c4e2831103790b1015da8119d00156fe41384" Size="1000960" PackHash="2c17020eceec9a9c3967dccac3a3d99f88af33c1" PackOffset="1089032" />
     <Blob Hash="e97eb6e0679447995ed6471c3dcb0be1893bb05d" Size="14848" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="1740410" />
     <Blob Hash="e9803d955814fe9513beae1936feeb628fba2ac2" Size="23436" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1784018" />
     <Blob Hash="e980502779385929b42d22b4316ec039195db8b5" Size="237" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2065354" />
-    <Blob Hash="e9883488504217e662d75f78ac79a310b6dd205a" Size="48" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554389" />
+    <Blob Hash="e9883488504217e662d75f78ac79a310b6dd205a" Size="48" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673621" />
     <Blob Hash="e98d218e69bc59411e820dc0e620a4cd9021ae57" Size="2900" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="428554" />
     <Blob Hash="e98dbe1c08208eb99ecd02eafec8345e7deacc56" Size="182" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="94405" />
     <Blob Hash="e98de945aeae1dc6399665fa6e95e8fac74b77ef" Size="2453" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1545660" />
@@ -63812,6 +63640,7 @@
     <Blob Hash="e98f894086ecdff751b6d5c9eaefda60a20ee164" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2097108" />
     <Blob Hash="e99095ea9bc8f60f94877e5127bb59d052e43bd8" Size="48225" PackHash="b613192e2af26f11e2d1d127f31a412f0df4431d" PackOffset="315888" />
     <Blob Hash="e99215b5be5a82c99bf0799665326ab097adc8b2" Size="3899" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="856758" />
+    <Blob Hash="e99543d000d12c18076a0f984bb6365188bec3f6" Size="45070" PackHash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" PackOffset="2045912" />
     <Blob Hash="e9992ef6c5898d1b4d0d686a187e2ccb1968b6e6" Size="216" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="212128" />
     <Blob Hash="e99969927eb9f117d64c5b4d928d881f93a89150" Size="2503" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="669491" />
     <Blob Hash="e99c82f638b965d925a107ff10223d283a7d2e69" Size="2661104" PackHash="b6393249279f5a87ed4766511dad902b069f29f6" PackOffset="8" />
@@ -63820,20 +63649,18 @@
     <Blob Hash="e99eb789226a9157ff18c0d3231ec408b938c814" Size="1486380" PackHash="524e1b7dc4c8fccc9f2d495c49cc3bc8152cb7bb" PackOffset="8" />
     <Blob Hash="e99f8cc5d330085545b05b69213e9d011d436990" Size="1851" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1014727" />
     <Blob Hash="e99fa094e040f049bc7e07ed4faf9f3409b564e2" Size="1571" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="2094454" />
-    <Blob Hash="e9a1d1ec273e9c9d739af991affe7f61aa894e1a" Size="136926" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="503816" />
     <Blob Hash="e9a63b215a37b78d137369e895105447e39bac28" Size="5638" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1673113" />
     <Blob Hash="e9a7ccb7aabc5daa852bdde394abe4b04173e7df" Size="68" PackHash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" PackOffset="2096486" />
     <Blob Hash="e9a9a087a31b80ea301d14791b60f7d2118f1c97" Size="282059" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="657915" />
     <Blob Hash="e9adac99890c627192bfb0e51c3aca0713eb7997" Size="7426" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1603129" />
     <Blob Hash="e9af4b17fc082b5d717bfa013d46da4bdffb2cd3" Size="19136" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1268264" />
     <Blob Hash="e9b0b2365fc417d67023a3e972e84f14bf99a0a3" Size="348532" PackHash="fd621bb2eef661c744d767a89b7b835495af2a90" PackOffset="1669894" />
-    <Blob Hash="e9b2ef700b4c6a463932b40e45b2e04560f209a7" Size="265" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1616216" />
+    <Blob Hash="e9b2ef700b4c6a463932b40e45b2e04560f209a7" Size="265" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1735448" />
     <Blob Hash="e9b3357535d43ab07cbbe86d0d460957b67454f6" Size="2324" PackHash="0d57e8104575102e83043b6a71861eb6fbaba0d2" PackOffset="2079372" />
     <Blob Hash="e9b62626b0d52a885de9bda658151141418d2aa7" Size="39053" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="75294" />
     <Blob Hash="e9b731001e5441227d4fe227e14a7991ab1fcc88" Size="10020" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1838970" />
     <Blob Hash="e9b8a234a1370636ad38a85ac625c03ab8b33cdf" Size="53" PackHash="0aea457d3fb14174a1cd037c649288b253c1cbe7" PackOffset="2097004" />
-    <Blob Hash="e9b8f099d50f944a15f1457ff25cbd4a0138accd" Size="3478" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1904984" />
-    <Blob Hash="e9ba69abf369f0a387adde21ad567e8c7d0fabbf" Size="5075" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1973747" />
+    <Blob Hash="e9ba69abf369f0a387adde21ad567e8c7d0fabbf" Size="5075" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1914869" />
     <Blob Hash="e9bba002fce0e6f67f6f4305e2045a1f6e889f8d" Size="6714" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="73351" />
     <Blob Hash="e9be6572e6921029b3762391f544094da08746d4" Size="7794699" PackHash="65c815431a222281ca4027a3409714aca969c404" PackOffset="8" />
     <Blob Hash="e9be9c25bc93a4b569b002d57b1a756ad4e2d93d" Size="164" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2077580" />
@@ -63841,14 +63668,15 @@
     <Blob Hash="e9cf2ec532c41ec74e05365f1391edacce0d5c8f" Size="2689459" PackHash="d79b515a8ffc174a508593ce109108ecb9e44813" PackOffset="8" />
     <Blob Hash="e9cf3e46d56646ab4bf0e0196a2523a5c4c56347" Size="12395" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="294262" />
     <Blob Hash="e9d0bd9922429d9bee01d8e2e656f730e9d130d3" Size="976" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="278127" />
+    <Blob Hash="e9d490212cfba87986da167108aebea03f07b9bd" Size="421888" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="1519797" />
     <Blob Hash="e9d516f0eaf30a4aa35b5b17989ef3b6697f6807" Size="44615" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="850217" />
     <Blob Hash="e9d7a7983de829dee0d8f2f4173765f2facf4111" Size="2914776" PackHash="e48ae4e3e78f894e2791d58495262571a904bd0a" PackOffset="8" />
     <Blob Hash="e9d9672820ae3a71c08995d06c1abb5c588a6add" Size="5421" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="226380" />
     <Blob Hash="e9daf2674a0303895ba2d5f76b04e4047af51d9b" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096724" />
     <Blob Hash="e9dd53289ef79ac43af81cd3c5e96c848ef719ad" Size="13464" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="2080976" />
+    <Blob Hash="e9df1cb4ed317395439c3ab273d322ee47095d91" Size="2411264" PackHash="3dd1d85de19fd9a40a09de719de747b6410f613a" PackOffset="8" />
     <Blob Hash="e9e06157b0ba21e0cf8089e2302575d8032ff5e5" Size="9412" PackHash="8e708853b5c9e66abfff8f018133758967aa6886" PackOffset="2087523" />
     <Blob Hash="e9e14cb35993dc98ac7da467cf2b1849f15da5ce" Size="70656" PackHash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" PackOffset="1967960" />
-    <Blob Hash="e9e1a7720727387841c51c1abb6916cbc5c5b1c0" Size="7551741" PackHash="3417dd91f7fc23128ede1b476d7cdb0a3a4f0848" PackOffset="8" />
     <Blob Hash="e9e95a06577c7706e2297dfcfc76f7e761fec40e" Size="3528" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="605774" />
     <Blob Hash="e9e9e9ed2cd37f4bbb95f6e496f5d743a36228f5" Size="176826" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="1402435" />
     <Blob Hash="e9eab401a3662fa56dcacd8d787c2aef7a4d0541" Size="414" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1347414" />
@@ -63882,6 +63710,7 @@
     <Blob Hash="ea28daaf64b1bc40d4b4e9580c34f98c0bc13a09" Size="9839" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="696008" />
     <Blob Hash="ea2c4a7cc355e9084155e93bebc57acd7953566e" Size="44944" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="175688" />
     <Blob Hash="ea2e27aacb5b512699744edd85928914dd8ede9a" Size="146432" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1736712" />
+    <Blob Hash="ea2f61c31378fbecb7b4891e48311129761f4211" Size="128192696" PackHash="77c1dc1ea41b032b5000734aac4d310601d12325" PackOffset="8" />
     <Blob Hash="ea2f8fcdce9be0fc5cedfabbf2f1e5b7643ebcdf" Size="1036" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="1965032" />
     <Blob Hash="ea3049c6dc034153d0f12af1274a9b1ece8f72f4" Size="159" PackHash="061feaf0a3f0d9f379cc7d1dc90e7865fda457d1" PackOffset="2096740" />
     <Blob Hash="ea3085e4629acae33ccfa3ba75d5be1630dc9275" Size="9784" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1132862" />
@@ -63899,6 +63728,7 @@
     <Blob Hash="ea49fe3490d11559fa5b5a89c29ff5ac5cb89661" Size="3055" PackHash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" PackOffset="1143746" />
     <Blob Hash="ea4c0c0e510bd459e2567f1b76661e9c51276a1d" Size="625" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="384591" />
     <Blob Hash="ea4f804809bfeadd968ac68c1398363a9b906264" Size="253440" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="275883" />
+    <Blob Hash="ea4feb0db3b7b75df699ad8f48298c5e1adf5319" Size="5793066" PackHash="47524620a17d3057fcb6832905d6b2d3329bb784" PackOffset="8" />
     <Blob Hash="ea503ac2371562537b26b44efbfa9b06a2d80961" Size="5309" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="216462" />
     <Blob Hash="ea52219a37a140fd98aea66ea54685dd8158d9b1" Size="1670" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1889611" />
     <Blob Hash="ea54e5c1775147ff9e3b3505dcfaa793926edc15" Size="1102" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="190211" />
@@ -63910,14 +63740,12 @@
     <Blob Hash="ea6a1fe784ded691c81f84d8b66ff9a844a370aa" Size="6084" PackHash="ce17010a1af2358e1ab4c9c88ca24a6e59f34064" PackOffset="329556" />
     <Blob Hash="ea6eb668f7d7ac13d5bdb89b9e54cc2d4dbf5822" Size="72147" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="1346339" />
     <Blob Hash="ea6efc34df376b5a66dae466b210e76bca952191" Size="19814" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1817915" />
-    <Blob Hash="ea74b83e4f0f7b66d6816ac8c294bdc3dee96e4b" Size="114944" PackHash="7966ce69e1ca589fd320f02bbfda4db14a641042" PackOffset="1872296" />
     <Blob Hash="ea757f9eb6d99360fc0b3ada77a813e896de18c3" Size="19115" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="169369" />
     <Blob Hash="ea7660fc18188c92b80f55970b556ba001e04995" Size="62881" PackHash="fb8c31646887718de45e229d7015c658f3c1bf5e" PackOffset="414648" />
-    <Blob Hash="ea7849bd261ac88ca7834e2fb0e06364152b55f2" Size="194" PackHash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" PackOffset="2096896" />
+    <Blob Hash="ea7849bd261ac88ca7834e2fb0e06364152b55f2" Size="194" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2096072" />
     <Blob Hash="ea7ab557c9fd7dfa2f8acfbb95478bf330d59426" Size="13551616" PackHash="dd963a1999f74da341bb3f179f40ec8eca179938" PackOffset="8" />
     <Blob Hash="ea7ec2e57641a207d7a86effa8f724e9f8b3342a" Size="2775" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="714265" />
     <Blob Hash="ea9484c1382cb3acb0bd570ee4fb015494df63e9" Size="3568" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1237589" />
-    <Blob Hash="ea97cefcd875633ce85d4094d9ccb95bfa60eb65" Size="6492832" PackHash="fadcebeb3100763a9d601eec1133678af498eb7e" PackOffset="8" />
     <Blob Hash="ea97cf2ee16ef2df3766a40c6ce33c8be5f683b2" Size="19648" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1576488" />
     <Blob Hash="ea99928aad98fcc9fa457cf96d212cfdb44f3f04" Size="5423" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="438423" />
     <Blob Hash="ea9cbba64834179f8119d26547f84bf9c30fdf5c" Size="115122" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="1568561" />
@@ -63926,11 +63754,11 @@
     <Blob Hash="ea9ec6563106e4538f16653ba3d2b297abd40bc4" Size="12248" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="378782" />
     <Blob Hash="eaa6e99ae733be0e8a7a0fd9de0deeb543ad2817" Size="15176" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1266574" />
     <Blob Hash="eaa889e19ae07fe49e1a73bcce37964e590fd413" Size="6488" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="788304" />
-    <Blob Hash="eaaa1754eaebc0aed2338d23a5547ea46348eb00" Size="18416" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1722164" />
-    <Blob Hash="eaaca9c5fc4e799318b49d9db64cb78539bf17dc" Size="194" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1580587" />
-    <Blob Hash="eaad958e3711422167db2999f9adcce01356b51e" Size="2989" PackHash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" PackOffset="2092874" />
+    <Blob Hash="eaaa1754eaebc0aed2338d23a5547ea46348eb00" Size="18416" PackHash="0f729cc99443c28e5f407f29da4e6b59106b7080" PackOffset="2056027" />
+    <Blob Hash="eaaca9c5fc4e799318b49d9db64cb78539bf17dc" Size="194" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1699819" />
+    <Blob Hash="eaad958e3711422167db2999f9adcce01356b51e" Size="2989" PackHash="3c74ac0b2c323616f552c9eee3734df041b57a9c" PackOffset="2093561" />
     <Blob Hash="eaafce17c3f93d0c59dbef15598e80e9e0114417" Size="10240" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="422408" />
-    <Blob Hash="eaafefbe8e988bd90b74468c1b8182227fb5f618" Size="19096" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2006994" />
+    <Blob Hash="eaafefbe8e988bd90b74468c1b8182227fb5f618" Size="19096" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2027061" />
     <Blob Hash="eab0e466c7de94d88322f9e80e42bfc2fb3e9055" Size="279" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1710892" />
     <Blob Hash="eab72f23071f46617da62111da694bc915cb6fa0" Size="58880" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="1996034" />
     <Blob Hash="eab843fc7a41ad4ffdde9ec57ab86e1feb500e64" Size="34922352" PackHash="264c1afeb60dc891d0ef4913875d4a17b588c687" PackOffset="8" />
@@ -63944,6 +63772,7 @@
     <Blob Hash="eacf9530f9f7076788e4622cf9a8036ee692f8d1" Size="3237" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="614337" />
     <Blob Hash="ead076eed9e10a65326c94fb21082a673129a8f3" Size="16764" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="426647" />
     <Blob Hash="ead317cb64c0cedf90c99c16a384413313f5e6d7" Size="13627" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="673801" />
+    <Blob Hash="ead70a122d6b48ff92926b2f08daebc2e8b5ee6b" Size="1193984" PackHash="dca54ca4dcfd5081af2200590a93a898416b3f6b" PackOffset="8" />
     <Blob Hash="ead91cacd44e9a2229085ce32256ad8ab9dd6947" Size="5170664" PackHash="a87e23e2dc93a3337bb44ad7597bdc3cc6088ea6" PackOffset="8" />
     <Blob Hash="eade79ab6edd98c7fe8b10b480c5c530ca014f5c" Size="399" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1523651" />
     <Blob Hash="eadedea36fc93fe3cecc99b8254cbc390a9146dc" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="437252" />
@@ -63985,7 +63814,6 @@
     <Blob Hash="eb1c508cc5052453752027c93de8e60c2ad309ae" Size="5302" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1759938" />
     <Blob Hash="eb1fcc0d4a1f3e169b25fcae2592b0aef67e3dee" Size="18239" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="1534165" />
     <Blob Hash="eb21d0786b500d7d884c8ad24147641a116b0d54" Size="5758" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="84389" />
-    <Blob Hash="eb2355b264c37b15574ac179947648115050b507" Size="101426298" PackHash="2a59e03d39a88b21943c37a43aa6afb3a0395146" PackOffset="8" />
     <Blob Hash="eb24887683db1d21d2ec7e76e6226705413c9e8e" Size="246" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1304344" />
     <Blob Hash="eb295a54f8fa73bbf5c010e834c679198e52a421" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2092476" />
     <Blob Hash="eb2c1639f2cc98628adbd88cf1af3c9d57ade196" Size="4376" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="701292" />
@@ -63999,6 +63827,7 @@
     <Blob Hash="eb43c253a48755442a67a2408d7e3295549f831c" Size="186" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="75184" />
     <Blob Hash="eb43d0341eaaa6af2a0bb473b0324a70493711ce" Size="3580" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="788590" />
     <Blob Hash="eb443ac7bc7fa89035068679bb5d2d9414c04a9c" Size="38438" PackHash="7c963542515f21d8db5b961bee100b6412d597d1" PackOffset="331011" />
+    <Blob Hash="eb46400735aa9e4e6858672e8a6aad262f0e2821" Size="7997" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1575432" />
     <Blob Hash="eb46c4170367ce1700a967886dd1b102d41fa237" Size="20214" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="495689" />
     <Blob Hash="eb475a0e4d6b36b4f13e48cef3d85e888020f3a7" Size="20988248" PackHash="b89784875ff840c2a3855f565a947345a4e3b72d" PackOffset="8" />
     <Blob Hash="eb48d66565ec07aa5c67096b64903ae232942e5f" Size="764994" PackHash="8874686121c6b2bd9b841dc9322ab6c5e3c82b33" PackOffset="746346" />
@@ -64026,7 +63855,7 @@
     <Blob Hash="eb766109a3246914f9852a0367452043260a1da7" Size="39450" PackHash="32ccfca2d36198e2e02d586f020244bb1cfec0eb" PackOffset="1300584" />
     <Blob Hash="eb7901e2a9dff6796bd03f703389d7fb281e727b" Size="197" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2096782" />
     <Blob Hash="eb799ed2c06eae9aa8142fe31e4c79b5d9da896b" Size="27280" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1387970" />
-    <Blob Hash="eb79e0d8abd608126ed8c6a4a0e2bed1d7758f42" Size="87789" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1723817" />
+    <Blob Hash="eb79e0d8abd608126ed8c6a4a0e2bed1d7758f42" Size="87789" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1938983" />
     <Blob Hash="eb7acd0c57e229a85779feb847ea6a1be507ce8a" Size="1992" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1246444" />
     <Blob Hash="eb7c9b19459961822194d50e80a9b0bda1fb185b" Size="204288" PackHash="f1372e2ede9021ff61444ea132b18024ee271b60" PackOffset="1498034" />
     <Blob Hash="eb8075da403ccdb9d28fd1f5337492a603171c70" Size="2997" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="476549" />
@@ -64034,9 +63863,10 @@
     <Blob Hash="eb859700607c86aaf11ea2c35e206d8040dc86ce" Size="386446" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="639034" />
     <Blob Hash="eb878922e1ef2609b37f375582a395c890c5a446" Size="12352" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="832855" />
     <Blob Hash="eb87fcfdb655d810716850e54f0f1432c842045b" Size="12901" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1986602" />
-    <Blob Hash="eb8a0a52a0dd2a8a8f8821dd9eeadd3a1decdec2" Size="2336" PackHash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" PackOffset="2094190" />
+    <Blob Hash="eb8a0a52a0dd2a8a8f8821dd9eeadd3a1decdec2" Size="2336" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2006570" />
     <Blob Hash="eb8b1e81e7ad71e8c8a7dd9cdec99c029b7451fe" Size="3542" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="736475" />
-    <Blob Hash="eb8bbc2a3d0ea551c246513b75402fd08a991e1b" Size="3794" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1947811" />
+    <Blob Hash="eb8bbc2a3d0ea551c246513b75402fd08a991e1b" Size="3794" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1688038" />
+    <Blob Hash="eb8d21158bed51463354028d4bc530e950d83fe9" Size="1030" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1757131" />
     <Blob Hash="eb8e95a03849d19680de1b8d57915ab70017a29e" Size="12288" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="1280716" />
     <Blob Hash="eb8fa78a3564de6b3d8c01d37cd02449cb239d3a" Size="328" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1267366" />
     <Blob Hash="eb9003a069488e4c7ef5a7a69e2e2325b2349db7" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1463304" />
@@ -64045,17 +63875,17 @@
     <Blob Hash="eba1f09d862d1950e4b587ea2104b33fd808b678" Size="12574" PackHash="1f10b8e0a3d6f6fdfe5b451508626eda10e3e771" PackOffset="2057027" />
     <Blob Hash="eba3459b0d978edfddabcc80b6798496cfd02551" Size="365" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="2096764" />
     <Blob Hash="eba3f09e2c9953b7729a8061d4ff6e9b21de982d" Size="1653864" PackHash="9c2b99ebfed2e931067e8842161b2811d04206eb" PackOffset="8" />
-    <Blob Hash="eba635b50319fc8d02301cef80d1336fe97bd57a" Size="51862" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="2038280" />
+    <Blob Hash="eba635b50319fc8d02301cef80d1336fe97bd57a" Size="51862" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="2032203" />
     <Blob Hash="eba6df67845d6d88ffac19f0fb8f42b24d5a5c41" Size="3278" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="2081917" />
     <Blob Hash="eba8d8d9f3c2ce053a57102432ca6fc70c7309eb" Size="256" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1601249" />
-    <Blob Hash="ebaa1c6b76ff5e9ab6403dde45fdfb52a27c6dba" Size="662" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1448186" />
+    <Blob Hash="ebaa1c6b76ff5e9ab6403dde45fdfb52a27c6dba" Size="662" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1985268" />
     <Blob Hash="ebac11a34f10767130a9fdb17d6b785b8aa209ea" Size="4495" PackHash="ab39e914df290cf79de86a8439b1adc79fd76140" PackOffset="1278388" />
     <Blob Hash="ebae3cc19b0a3120e326b524e157d967e5cc3947" Size="2186240" PackHash="f9f22198459ba7ea6f209f845afcf51decff88da" PackOffset="8" />
     <Blob Hash="ebb04771ae21dec8682e4153e97404d9933a9c13" Size="1764622" PackHash="cf5e1ce959a11e3674cc1a7c352dc878022c2eff" PackOffset="8" />
     <Blob Hash="ebb30ab690e3cce8853625485642c0d8016e4ac6" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1879311" />
     <Blob Hash="ebb60dcbb3de6fbabd1c9730078d1b2f66649812" Size="615195" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="956840" />
     <Blob Hash="ebb75571ffeff93a939e38e073398502e9e7803b" Size="12976" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="754766" />
-    <Blob Hash="ebb83e9598ad163ece8aa2212b6fc31a75af0002" Size="11294" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="1989944" />
+    <Blob Hash="ebb83e9598ad163ece8aa2212b6fc31a75af0002" Size="11294" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="1748370" />
     <Blob Hash="ebb91fbd5e441f53e407c06ad86af521fc2be425" Size="1285367" PackHash="4e6589080dee402938809771299985e1428734e4" PackOffset="8" />
     <Blob Hash="ebbb3b897d8c16ddb305200fde227a5e6afa77dd" Size="71168" PackHash="66fce169b160f3c4cb868bda8653b37692b5692b" PackOffset="1974280" />
     <Blob Hash="ebbbd806d2bfa8aaa9b9c18c4ad7884de9bb4c82" Size="61360" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1441406" />
@@ -64115,7 +63945,7 @@
     <Blob Hash="ec323362f3fd43f86fd94d21219abf75426824f5" Size="12714496" PackHash="b234dbde25cd614f47cbde05892b6d7b5354574c" PackOffset="8" />
     <Blob Hash="ec34ec84e092e38f3620d8d3e6dc2d4dd9bedbc5" Size="63600" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1810274" />
     <Blob Hash="ec3c31be2f88eea3b9499697d677bba574b960af" Size="6575256" PackHash="b7cae0c7ca4225dfee904c81a05c0e637d4ad111" PackOffset="8" />
-    <Blob Hash="ec3fbbc710d3b1f699767ab98b8b749c4cef94d6" Size="200" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2096376" />
+    <Blob Hash="ec3fbbc710d3b1f699767ab98b8b749c4cef94d6" Size="200" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2096666" />
     <Blob Hash="ec45a56c991c9fa07d515289f763fcacf5fe319f" Size="247" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2021691" />
     <Blob Hash="ec46a1c24fb9da847424a779596605f69db4e28e" Size="1576" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="170312" />
     <Blob Hash="ec46c86bc9dc253492a9c1c030ffb01748a128f5" Size="2808" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="488616" />
@@ -64128,7 +63958,7 @@
     <Blob Hash="ec4d1d2ca57fe18d66a89b192ad9abdba3837187" Size="370356" PackHash="12468bf1be869d88d9a8104ffde7c4887839843d" PackOffset="1405306" />
     <Blob Hash="ec4d97185a7b0a8bb747924ad85d07a28249f979" Size="2292" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="1992264" />
     <Blob Hash="ec4dc13cded191f759c348ac85a6cb40bd27fd39" Size="431" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1032353" />
-    <Blob Hash="ec4e70e1a5de11d2d19a7dc60feff07ded914ab0" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1552386" />
+    <Blob Hash="ec4e70e1a5de11d2d19a7dc60feff07ded914ab0" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1671618" />
     <Blob Hash="ec4f0d322a41fbefc0e4be595382935ae4bd5cd1" Size="15667" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2080592" />
     <Blob Hash="ec523c449be35f235ad77666fd1af9b9dedd057b" Size="8128" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="614946" />
     <Blob Hash="ec53c04138cff0d0aedc49570f6b55bcde3cf67c" Size="7256" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="834548" />
@@ -64139,9 +63969,9 @@
     <Blob Hash="ec5b2de5362e2b9d99b8ecc8d8a994dfb18d2cfa" Size="22460" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1895892" />
     <Blob Hash="ec5bc4702f039764eec2cccc473b4805c041de06" Size="9256" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1230150" />
     <Blob Hash="ec5c2fa70ae136094cb8de8a445b7c34336e51f3" Size="1522" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2052934" />
-    <Blob Hash="ec63618bade6f3034de4bd7e539c07f79a54a480" Size="196" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1616020" />
+    <Blob Hash="ec63618bade6f3034de4bd7e539c07f79a54a480" Size="196" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1735252" />
     <Blob Hash="ec636f24e8fa7c3cf2fb21483778019584b7c615" Size="15130" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="2053162" />
-    <Blob Hash="ec638c64cc46455bf0f9913b47270aeb22042c52" Size="9435" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1284565" />
+    <Blob Hash="ec638c64cc46455bf0f9913b47270aeb22042c52" Size="9435" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2066183" />
     <Blob Hash="ec63d65debd768bf63e03650e9e7986c48e841a1" Size="24359256" PackHash="ecd7511686af3b407b71ccaa85a3530be45efe6a" PackOffset="8" />
     <Blob Hash="ec64c50c04836180725049212ba3b44d1d89d591" Size="6727" PackHash="6a467413108651fd3be147f1f2cfbe29d032267c" PackOffset="2065624" />
     <Blob Hash="ec6baee7787da1c859d321b4e4ab0dce438f298b" Size="62739" PackHash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" PackOffset="310578" />
@@ -64155,19 +63985,20 @@
     <Blob Hash="ec74ed594caebce3e5be56c0ba796f51ec1a598b" Size="1273" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="978579" />
     <Blob Hash="ec76437931982b6f863bd378ce293357cb31dab1" Size="3106" PackHash="551654d82bdacbe12dfe0a27ff7948b6ad1894b5" PackOffset="2093618" />
     <Blob Hash="ec76b27bf027179140c9f42093b88ed2d42466e7" Size="3689" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1982805" />
-    <Blob Hash="ec785d9a950a751f6a10bb8c7a6bb5b1c09754d1" Size="60" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556349" />
+    <Blob Hash="ec785d9a950a751f6a10bb8c7a6bb5b1c09754d1" Size="60" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675581" />
     <Blob Hash="ec78a07a56451109d6cd7c3a833d05d718e14cf8" Size="17736" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1064296" />
     <Blob Hash="ec8bc0e3a33e7d07f12c7acb325cbefd064d0a59" Size="588" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="2096077" />
     <Blob Hash="ec8f64c1b39a4151daafa952b2b8840888beabb3" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719317" />
     <Blob Hash="ec8ff5b8358c86c56551df5c382d46db75519023" Size="946" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2067251" />
     <Blob Hash="ec91c7cd1b834d09c313cb2437899fd152c4db57" Size="215274" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="450999" />
     <Blob Hash="ec920351f69e11513f064a181736623ee03312d3" Size="20536" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="503737" />
+    <Blob Hash="ec92630c8a3f2dd999f92ee104f1eb91df3929a5" Size="2687864" PackHash="b4b5863b7490341c7140ad6ffa8a2f6d5aa48ee1" PackOffset="8" />
     <Blob Hash="ec9668d4a9efe2127cd2035f7cd6bbd06462eb2d" Size="261" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2083566" />
     <Blob Hash="ec96fd339ae7b65e5ec16317583985746f08dc0f" Size="2228450" PackHash="e6d510ce525aa04b4d06b1561f14a16338c01f02" PackOffset="8" />
     <Blob Hash="ec9721b820d553a5658dc2d9b02c58676dda710b" Size="3829" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="755914" />
     <Blob Hash="ec98ed8dfde93965399ecf8848ad14fda24bcd5f" Size="933" PackHash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" PackOffset="2094784" />
     <Blob Hash="ec9b9e75fc72b8f07213421e9cb27aa807bd8ffa" Size="45566" PackHash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" PackOffset="2033136" />
-    <Blob Hash="ec9c636ea3bd81ddafda0777a3059c4cdd03911d" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553434" />
+    <Blob Hash="ec9c636ea3bd81ddafda0777a3059c4cdd03911d" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672666" />
     <Blob Hash="ec9d84bd4b8bd3320bfd39f5e5b527769a023b65" Size="3670" PackHash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" PackOffset="1818175" />
     <Blob Hash="ec9fb917b67fe4e865c9143f53c81dbea7aa044a" Size="10739" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1364975" />
     <Blob Hash="eca0e5e7bcd0d1c144bef6197144b4877c3af558" Size="69" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="669843" />
@@ -64180,7 +64011,6 @@
     <Blob Hash="ecb52d167dc115491629d9388d11edef502b8eeb" Size="175516" PackHash="f279ae70e30f66de7b592409e9ed96993301657f" PackOffset="1660486" />
     <Blob Hash="ecb6e1f8e4b0e84c4b886c2f14a1500caf309757" Size="210856" PackHash="3811b277d1080f2314e9ffd524da841aefd84ce0" PackOffset="8" />
     <Blob Hash="ecb73765e0dc1042b40baf1c7be57104299a9751" Size="195378" PackHash="6e4f2760b5d09171b1caf834191e8eff91e09092" PackOffset="1114019" />
-    <Blob Hash="ecb80f6fe71d2e50f546f43d1456b339d604b570" Size="117278696" PackHash="60d509ac639ed7f7350924ed21329b36fb76668c" PackOffset="8" />
     <Blob Hash="ecba07c7624bc6dbc1cd12ae356d36c8a7bb4ae7" Size="26" PackHash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" PackOffset="883228" />
     <Blob Hash="ecbb1b1396057e2cc1da170046200a12d3dc2aee" Size="220422" PackHash="1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" PackOffset="896682" />
     <Blob Hash="ecbbac4b2d530376a646f561460d491ac5f6386e" Size="1333" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1407453" />
@@ -64199,7 +64029,6 @@
     <Blob Hash="ecea0491e32406102eddeb8089a5d78851e601fb" Size="43421" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1365166" />
     <Blob Hash="ecf5a17324f7ad28ebb529a619451ad73b19e5c2" Size="3002" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="959439" />
     <Blob Hash="ecf68524738657046a7fbc19923410e4b2744972" Size="5933" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1961219" />
-    <Blob Hash="ecf725f213cb6115f9cfe83ac48e4001f7e1a96a" Size="14880" PackHash="be5cabcfa8f324441e444fefb236044b2b2cb4b3" PackOffset="2081896" />
     <Blob Hash="ecfc24c7649425e1503e60289d694469147c60cd" Size="18" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="2096897" />
     <Blob Hash="ecfc5b4b47abf59448ff0ea75bc7bb206cd702ac" Size="224084" PackHash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" PackOffset="798446" />
     <Blob Hash="ed01a4bdbc8e30809b61b010a8604fb56e2ea906" Size="39900" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="540452" />
@@ -64216,6 +64045,7 @@
     <Blob Hash="ed37cf36d765a82275178daedc58a067718ff424" Size="4119" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="773329" />
     <Blob Hash="ed3b333aff645603a3142fc8bef5f43b8b085c81" Size="41329616" PackHash="3b0e437400f39d073ddb40bf08670d8ac4fa1fd7" PackOffset="8" />
     <Blob Hash="ed3bab343ab9d8d156d2d08831ea6adbd866891c" Size="374" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2018359" />
+    <Blob Hash="ed3d055a45aaeb4012a7ac5c9565a1595b6bae67" Size="22713224" PackHash="a6fcdc4bbd4817f185954bcccfe608272158f786" PackOffset="8" />
     <Blob Hash="ed3f57febd1affe148ff554b53d096e08564207f" Size="8312" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1761144" />
     <Blob Hash="ed406bfdc1edb9024fccd3c3ab39b6884cbc0b0e" Size="3068" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="141146" />
     <Blob Hash="ed430b2ada81fe35e3002e1e6b3a69156823f94b" Size="9252" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="612669" />
@@ -64225,7 +64055,6 @@
     <Blob Hash="ed4f8b89c503a2b1da09efd40255a796e4b1bef1" Size="10099" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="484154" />
     <Blob Hash="ed52ab998bf2df3172faa3b40600ae98299e7a74" Size="21504" PackHash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" PackOffset="1768096" />
     <Blob Hash="ed569abceaa38942d15b4203e90b1f30bf3c70fd" Size="28672" PackHash="f984c4f393a376587f48a24076e62578e975f8ea" PackOffset="18440" />
-    <Blob Hash="ed573df73b8c0efe1032c4c1922e25517706f7d8" Size="2587800" PackHash="abd2443f2e5d306fcb283739df799dba571d31f4" PackOffset="8" />
     <Blob Hash="ed5744c93dc5b6fe60c2562b69a4aa307c1619c4" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2079862" />
     <Blob Hash="ed577e5cfa45ba798a220cd9fa8c43b64dc34556" Size="626357" PackHash="5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" PackOffset="8" />
     <Blob Hash="ed58eda76e1c8d3ed0777c1dd2fc55c64bd7b113" Size="16864" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="443332" />
@@ -64233,7 +64062,7 @@
     <Blob Hash="ed5af7d72d6b9c13c08bd6186dcfd31204c58e83" Size="4251478" PackHash="0e26168a7254c7ba26bf4c06b28033e8387c689c" PackOffset="8" />
     <Blob Hash="ed5d2190532870201ce96f854b8fb8904f3ca010" Size="741464" PackHash="29eae01c452b3ae340b64ad4266ea1152b4e6729" PackOffset="486176" />
     <Blob Hash="ed5db9ab239da0c33d2f76ba4ae61295b3af6168" Size="3052" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="695693" />
-    <Blob Hash="ed60d3e227237d1635714d66dc71368382073dca" Size="788" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1436176" />
+    <Blob Hash="ed60d3e227237d1635714d66dc71368382073dca" Size="788" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1885229" />
     <Blob Hash="ed6478b625721531b7e7b254a2b7cdff0ae1dceb" Size="2693" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="2079301" />
     <Blob Hash="ed69a16dde7cca68b0f8a176bfb0e658d9c40e17" Size="39544" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1537083" />
     <Blob Hash="ed719bb67a64db49901ba38a945a6ba998646b8d" Size="8557" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1773682" />
@@ -64249,7 +64078,7 @@
     <Blob Hash="ed8a5f4180fa7aed3060d6b736041037e09164ac" Size="3054400" PackHash="30dbbc475b29e1e9833d657265e0473096a358bc" PackOffset="8" />
     <Blob Hash="ed8dc001db9cf3152c1d00e495e8826709f05882" Size="2657" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1753965" />
     <Blob Hash="ed8e22ba4d3c77da817d940d0e96f182efbbdbc2" Size="8052" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="474158" />
-    <Blob Hash="ed8e89eafd812e8aa8220fb338a441c53ed31a64" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1554238" />
+    <Blob Hash="ed8e89eafd812e8aa8220fb338a441c53ed31a64" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1673470" />
     <Blob Hash="ed91507a4da1d4551368ef430cfa2fef5ee88d7a" Size="22854" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="717060" />
     <Blob Hash="ed91c1816ddeee6f0bb704d9fcf62ca163b6eb19" Size="40" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2090393" />
     <Blob Hash="ed920e490a93b0534fc7b626ebe6bf059cb278b3" Size="1227" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="2095821" />
@@ -64269,8 +64098,6 @@
     <Blob Hash="edd4b0f3b6d1c0022fdf52905c35db67f18a0b65" Size="39867" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="153677" />
     <Blob Hash="edd90a5906a3df4e9c5dff1f15775da711d21127" Size="34498" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1231055" />
     <Blob Hash="ede093f66f91a481644e2e8343948056827fc59e" Size="31232" PackHash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" PackOffset="2064464" />
-    <Blob Hash="ede10d6e75c35ccccc495f2e41cd25ec849fde32" Size="32358948" PackHash="1b423e2336ebf5909090b72b0f04f7fe5a6d1c19" PackOffset="8" />
-    <Blob Hash="ede1b9f466ce4e4c2657e1ecfb5f83331b058982" Size="10979584" PackHash="0c0bfb4f66cb743931138fc4cc85a9a22bf051ac" PackOffset="8" />
     <Blob Hash="ede2a0860bedd6bf6fc2684b814d62ec05501d70" Size="2570" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1575492" />
     <Blob Hash="ede39f9697e28ecde48f8a2519f43467b57194d8" Size="43092" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="60351" />
     <Blob Hash="ede3d1fb00313097fda2c347b914ed2a14d24b45" Size="2296832" PackHash="9ad3062b35efb39cfe52f02269e5e28c03df86f5" PackOffset="8" />
@@ -64281,18 +64108,19 @@
     <Blob Hash="edeb38debd8cd6af948d22d34acf4ec12b923a86" Size="13512" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="289878" />
     <Blob Hash="edefdd439c33b629c208e18c87675071d83979ad" Size="2980" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1902244" />
     <Blob Hash="edf2e286effce6d25ba7b59b76d22b8426d77195" Size="8892" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="233577" />
-    <Blob Hash="edf6aeb5bdf93805a34d08623152e38a3327ce55" Size="7305792" PackHash="e08efd1c4a88646ff33a9093de748a4e7158bdb6" PackOffset="8" />
-    <Blob Hash="edfb2cfe9d624374d563f965544ec46cb5177207" Size="4444" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2091571" />
+    <Blob Hash="edfa618162dd967ea5dfc852d2ee6e5e0142189b" Size="31210080" PackHash="31125f4f6c31f35e79d943f737db108bc0275d57" PackOffset="8" />
+    <Blob Hash="edfb2cfe9d624374d563f965544ec46cb5177207" Size="4444" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2088186" />
     <Blob Hash="edffd5e4dc1e05792b0824149fdef52fc71cc7bb" Size="2783" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2001675" />
     <Blob Hash="edfff0aea1ca65e831de07ab3f5ec488c6ce46b2" Size="3057964" PackHash="f329cbe56598fa2558785f9cf7c12fd86805baaf" PackOffset="8" />
     <Blob Hash="ee000a2a69dc1c24e7646c5dcd15f5dc87bba8da" Size="3116" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="929095" />
-    <Blob Hash="ee00e2e4d31e8be08f46edc5ccc201e26c8861ca" Size="991" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1390946" />
+    <Blob Hash="ee00e2e4d31e8be08f46edc5ccc201e26c8861ca" Size="991" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1510406" />
     <Blob Hash="ee01b424627b3f681d58c9d46013f4c2306099b6" Size="219859" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="70171" />
     <Blob Hash="ee08d7eee1969ca5335ef796c3b558ce8a638b21" Size="6032" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="219936" />
     <Blob Hash="ee09370e8558875878fb2161c22b8ade4897071a" Size="24875" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1827612" />
     <Blob Hash="ee0cca7d77744ae9430926111bf0bf4bc0447abc" Size="8024" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1829748" />
     <Blob Hash="ee15cd29bf17399c27770cd04755151c9694f52f" Size="139758" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1118513" />
     <Blob Hash="ee1d62b98d9d0826b6e876017d1145476e9d3ae2" Size="15649" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="1656190" />
+    <Blob Hash="ee1da6231e5e58130f26f71aa3288c5fac388fd4" Size="2162670" PackHash="05e50d0189a190d24465cdfb15fd5a7fc39b96df" PackOffset="8" />
     <Blob Hash="ee1e95b7df939a19f2c7fc2fd0342c821ea6f79f" Size="1313598" PackHash="05be3410a78afea71327d64933707b9f7550d2f6" PackOffset="8" />
     <Blob Hash="ee21124bb9c7e17f896c613d0aaaa4d722f9ffcd" Size="201144" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="712828" />
     <Blob Hash="ee223fae06e3f79c54c68c098900876302d8e895" Size="116" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1467940" />
@@ -64300,12 +64128,12 @@
     <Blob Hash="ee26bb4d7fb3bb6fd0e07e129e44d0d16531fde8" Size="3171" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="583304" />
     <Blob Hash="ee29fdf67cb3ae150df6bbbe603c1c3f5da28641" Size="1208" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1029414" />
     <Blob Hash="ee2a2ab89dfffe2880801e8667af2ad627e641ec" Size="6651" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1677846" />
+    <Blob Hash="ee2b4d7c6a9032fe032539265f32f33cfe5574eb" Size="2420" PackHash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" PackOffset="2093562" />
     <Blob Hash="ee2b8ba0ec2f31bfebf0ff1d4176ead58e53f6f7" Size="3570" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="267627" />
     <Blob Hash="ee2c00d021381ea638b6ce3f395dea5f8491ed9b" Size="961" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1069246" />
     <Blob Hash="ee2cb8ec3eb0ce3977aee22c895af06280fd4563" Size="7839" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="24355" />
     <Blob Hash="ee2f2a663c083ccbdb8d0a0a5945e5d6eec8d908" Size="2095616" PackHash="0bc028d0b62f4b1147966e8709b9699fd37b6a4b" PackOffset="8" />
     <Blob Hash="ee2f5726ac140fb42d17aba033d678afaf8c39c1" Size="4173928" PackHash="434d698cf6b167859c6903ad11759566d8f57b0e" PackOffset="8" />
-    <Blob Hash="ee30398056d6a6a0b78423be269060c9801c131b" Size="6492596" PackHash="5805da4af817abcb06fda82a336e03d0ebb5dec0" PackOffset="8" />
     <Blob Hash="ee3189c69fb7f538ffd0cee4745b803fa785b1e3" Size="38282" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1142693" />
     <Blob Hash="ee32167b450de7b0f1a15199795aef9524be623b" Size="176" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="614229" />
     <Blob Hash="ee337579a6b429442782b4bb5636645f80d30610" Size="90002" PackHash="31ada4c269dbc1fe2d7767f6c437634f661132d2" PackOffset="8" />
@@ -64316,7 +64144,6 @@
     <Blob Hash="ee3ea984472e4f7a854a4b4a1be60f399637afb2" Size="1885" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1880452" />
     <Blob Hash="ee3eaac97d87619b690b992115984a88bc3a86dd" Size="6777496" PackHash="fc0fbd54faf52ab886318b7e9f93f8b621517629" PackOffset="8" />
     <Blob Hash="ee4215be7383986e44ba825beb06b61d20bf4378" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="585759" />
-    <Blob Hash="ee445e65b9ec00068beda04d0fd9e5efc7ec217d" Size="4444432" PackHash="756ef330af9fb8caf90b90b77368a2a5377a01bb" PackOffset="8" />
     <Blob Hash="ee472c411079e788dbf32fac9c5b7ee121960dc2" Size="191" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="165280" />
     <Blob Hash="ee47bf35902adb839dd6591759f665e375e62d4d" Size="10003" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="125949" />
     <Blob Hash="ee4dc3388bcda2476de3a796882ddd573b8fb447" Size="219510" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="365005" />
@@ -64325,7 +64152,9 @@
     <Blob Hash="ee566b5c8c137599bb151b019ab66b68b544ed79" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096612" />
     <Blob Hash="ee57fcec6312903f12005ac7ea7a47e621e7a084" Size="2798" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="372467" />
     <Blob Hash="ee5986ba1c2b2f1322cde9aadfba9f786680f899" Size="415" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="515021" />
+    <Blob Hash="ee5a7254648d88bcd35cb149703e06568b0656ae" Size="2602352" PackHash="050aa4cdbe153acbe0ca4dfe27dbe6ba23266531" PackOffset="8" />
     <Blob Hash="ee5a80b239f60f74d76c0baa00dcf90b920b9264" Size="6402" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1790652" />
+    <Blob Hash="ee5f710283a921c1fe255afc9d618edda9d1b7ea" Size="18562" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="2072836" />
     <Blob Hash="ee63733bbfac51ed6c2ed2dab2a250faf25f36af" Size="1056" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="379567" />
     <Blob Hash="ee6603a1bee5958d6fea9e8a9c3967a27bc4ae5d" Size="13312" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="1081208" />
     <Blob Hash="ee679456ef18e50ea94d694d41d2489f393cc005" Size="692" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="363512" />
@@ -64338,7 +64167,7 @@
     <Blob Hash="ee76ab87597642f3f7a98bef20471c56aa6fd5a0" Size="2654" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1029653" />
     <Blob Hash="ee793812391aec30b2913be3bbdf313727ebaab1" Size="59009" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="694690" />
     <Blob Hash="ee7f401dcaf0fa5729dbed87f85ec0f3f037d0cf" Size="6192" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1013254" />
-    <Blob Hash="ee829e81a079a5012935e7806586242412025f8f" Size="1386" PackHash="c208f4313a552d190bc63ae046d794484098aca1" PackOffset="2017117" />
+    <Blob Hash="ee829e81a079a5012935e7806586242412025f8f" Size="1386" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2094513" />
     <Blob Hash="ee842829df9dc1ddba6cd1450b409d87e77a892c" Size="3706" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1776885" />
     <Blob Hash="ee89e7c0816f0ac0318f4a44df7a35dc2a7caaa8" Size="2225" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1443987" />
     <Blob Hash="ee8e790aac2cacae498959d5b88388315c423105" Size="266" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="2096793" />
@@ -64350,7 +64179,7 @@
     <Blob Hash="ee9c6da762599ba09a0f9e5ae2408372721b5ec3" Size="3368" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1440512" />
     <Blob Hash="ee9d99a2cb62d5de3076cc2d7dde509dd21a5250" Size="34110840" PackHash="986e66c9c79a9e9ae3dc0c2bfd0314b00ddbcf21" PackOffset="8" />
     <Blob Hash="eea008c051cbc57ad0977900254b42e6034da963" Size="1266" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="2093707" />
-    <Blob Hash="eea41212ce1611df8fe6484c07f6099efe0804fa" Size="3693" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1104783" />
+    <Blob Hash="eea41212ce1611df8fe6484c07f6099efe0804fa" Size="3693" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2050799" />
     <Blob Hash="eea4ff67e2b002a37e2fe2ad425719e21d0d3cde" Size="99" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1606997" />
     <Blob Hash="eea67be26dc33d929ba01ab2d28b866618991b10" Size="94976" PackHash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" PackOffset="8" />
     <Blob Hash="eea6c094e9abc7253b87ab5b0ab5fe1c259084e6" Size="415" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1563470" />
@@ -64367,7 +64196,7 @@
     <Blob Hash="eebdd696f7f1aaea15ac4e10f5a6e5aa5a6aca8c" Size="483" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1191774" />
     <Blob Hash="eec22e5ee3a379842cdaf361ee20ddc3ee6ea090" Size="374828" PackHash="922fcb527d5d2d92d1f5fe1e17450b8b306d3b7f" PackOffset="1660556" />
     <Blob Hash="eec2e1b328861468017ccd9e34ca804b9c5cbcf1" Size="26476" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="191084" />
-    <Blob Hash="eec922335dbac40161b1fbf2df14750e3f1160fd" Size="8576" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1944884" />
+    <Blob Hash="eec922335dbac40161b1fbf2df14750e3f1160fd" Size="8576" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1886006" />
     <Blob Hash="eecd094c121255fa13f52f1a5e2c9f18a0ee63d8" Size="5022" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1717027" />
     <Blob Hash="eecedaf94621bfcce2d675a73decf2b3796dd200" Size="85736" PackHash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" PackOffset="1442416" />
     <Blob Hash="eed57448d5377a73d8db885198655f9b83885c9a" Size="232070" PackHash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" PackOffset="8" />
@@ -64375,6 +64204,7 @@
     <Blob Hash="eed68bf69610c33b9124ddf74cd2ea5551dacb78" Size="1254" PackHash="b2f88f44baa14211312509c95df7f2a600873cef" PackOffset="2001464" />
     <Blob Hash="eedff98de3d9760bf58a5512c7a1c7c6ea26a352" Size="46444776" PackHash="97ab8c30b69cd9862f3dadf1fd91a3a499ea7cbf" PackOffset="8" />
     <Blob Hash="eee0b7d134c5450e3bffdd09ca0d8117cb6071ef" Size="48128" PackHash="c0476a6a0442712d3245a0babbf62c40e8e75b95" PackOffset="2043912" />
+    <Blob Hash="eee3869b9202853631e3b8e3a00826936a14af22" Size="7733688" PackHash="c687abcf93d635cd19f9aa38e6eb8022fbb2b53d" PackOffset="8" />
     <Blob Hash="eee423b5cc3e6111e5c9cb1e403573aed6fd328a" Size="127859" PackHash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" PackOffset="357901" />
     <Blob Hash="eee947531e69744de3c691cde2ad066d4017e4a3" Size="25392" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="879036" />
     <Blob Hash="eee9df8df639b600e1fa32b8a27a5328f1fa91b9" Size="4585" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="691423" />
@@ -64400,6 +64230,7 @@
     <Blob Hash="ef0d5e182865fe23d2f56d2e814a10c42b53ffdb" Size="103723" PackHash="d269a082d4513e409c6795d0adfe600ae57dee69" PackOffset="1849075" />
     <Blob Hash="ef109d793c99af6b167f9107f135653217de111b" Size="9579" PackHash="88192934143593f3b9bdf82185f4ac7a7373da7b" PackOffset="2085416" />
     <Blob Hash="ef13219a57cc351f949596fa78a46f4e2abc6c52" Size="17541" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1176864" />
+    <Blob Hash="ef189f971797ba80f908af28eecf7430bdb97a8c" Size="1441598" PackHash="99495f9bf042a4c1a1ac90b8b99efa036a1421a3" PackOffset="8" />
     <Blob Hash="ef18fcc0aacfde5d8168a016b00ccb5912839b95" Size="73716" PackHash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" PackOffset="1135033" />
     <Blob Hash="ef19236b26e0fdb9b7b22168d124dcd4adaa68fa" Size="653824" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="8" />
     <Blob Hash="ef194fd5769bdbb5e178154d069ab2dcd5d56981" Size="3829" PackHash="bc4cf9d4758f107d90920f50b55c8d1240dfe8bb" PackOffset="2092797" />
@@ -64421,13 +64252,13 @@
     <Blob Hash="ef3d6b1b59e3dd05514df67f22ec568ef015c50d" Size="2504766" PackHash="6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34" PackOffset="8" />
     <Blob Hash="ef3dcf1e319f6bb051efeba0df9c6757ebb1b66b" Size="588420" PackHash="fcaba3584b9391b167f49dfe53afe253623ada36" PackOffset="430722" />
     <Blob Hash="ef41a1b2050064d66c0c585dfe6731a2f702d977" Size="38360" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="528377" />
+    <Blob Hash="ef4718b7f84661123c3e16fbe591e29a8163e232" Size="10877944" PackHash="e11e1e72d903e2d6116b749b64e7f86e1c3f9426" PackOffset="8" />
     <Blob Hash="ef494d73a1b5743ac6c8e6d1276c4a3cf1b4a3d3" Size="210" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1353685" />
     <Blob Hash="ef4a1bbad6e273d65bf0dedc272d7084ea44b151" Size="5103" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1884508" />
     <Blob Hash="ef4b0d65854d7143ba58950468f0163bc0bbbcab" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1830904" />
-    <Blob Hash="ef4ec6b182542d7002dcaa785429b248969acdcf" Size="484" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1417933" />
+    <Blob Hash="ef4ec6b182542d7002dcaa785429b248969acdcf" Size="484" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1537164" />
     <Blob Hash="ef4f461dc31f02c60f43d51bffc9442b5322bfed" Size="3395" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="729539" />
     <Blob Hash="ef4ff9f36bfdfc36f5d3346eed7431d521385a32" Size="3617" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="641437" />
-    <Blob Hash="ef53701c374ddb77d6be177c46927271d1d696a3" Size="13702" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2063709" />
     <Blob Hash="ef572a92a33afa137f0befddd86a01e8f9cd4156" Size="36920" PackHash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" PackOffset="1118699" />
     <Blob Hash="ef5b4f9d330e2bcad591d2619003051b60070e18" Size="32" PackHash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" PackOffset="2097063" />
     <Blob Hash="ef5cb9edf9a45a60a6895f37453498ddd2d4d686" Size="38273" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="311344" />
@@ -64443,6 +64274,7 @@
     <Blob Hash="ef71758dfacd668591d5f8769d0ff3edc020a701" Size="224648" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="1662579" />
     <Blob Hash="ef7a0c54d05369b7604302592dcf5413986faf33" Size="82301" PackHash="7a9e76a55a9b6b32eebf66809b45c777cf444358" PackOffset="880805" />
     <Blob Hash="ef7d931756d1f539965ec0699f82af8fee311791" Size="114155" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="1258251" />
+    <Blob Hash="ef8541beae3ee70e8f3cf3b07384d6d96725fe86" Size="41848" PackHash="96d4f9f79e76056a26990c9485decf95f6f106eb" PackOffset="1989444" />
     <Blob Hash="ef86fe710cfea877bbe0dbb6946a1f88d0661031" Size="2748" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1781641" />
     <Blob Hash="ef8e81a1b6204c353d80e93b6049c50a77d5f45e" Size="21616" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="8" />
     <Blob Hash="ef8ed94dea5c314508f6974f23a7d2cde3d9c678" Size="141830" PackHash="419ab9d476edfc8b4ddcdf17f796fc9a5da15457" PackOffset="1898814" />
@@ -64458,11 +64290,10 @@
     <Blob Hash="ef9f157c67c765a90ea022dc93d19d43f98ced6a" Size="6936" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1807012" />
     <Blob Hash="efb0269bf699f4c6527861498f886bc179619eb3" Size="5248" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="473067" />
     <Blob Hash="efb1a388c70926a92bc81fae6afc649ea47cbcce" Size="117" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="451135" />
-    <Blob Hash="efb6cc964946b53ca58d20319efe437dc1a21d2d" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555068" />
+    <Blob Hash="efb6cc964946b53ca58d20319efe437dc1a21d2d" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674300" />
     <Blob Hash="efbde58b3b90ed1b546ad680a38f3cb6ac1bc82c" Size="611328" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="865800" />
-    <Blob Hash="efbf16435da5ddbf54129617dee82196cba86272" Size="2006184" PackHash="c09475c98de55014475979ce14a54515e210de6c" PackOffset="8" />
     <Blob Hash="efbf182ee0096c67a5bd86bb5816e051b1294c36" Size="1734" PackHash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" PackOffset="2092311" />
-    <Blob Hash="efc155c06e3a68dcd1032da6c620601a74bcb7ba" Size="55" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551531" />
+    <Blob Hash="efc155c06e3a68dcd1032da6c620601a74bcb7ba" Size="55" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670763" />
     <Blob Hash="efc29893ba8bc99676c4124f376922fd5e4f6698" Size="125952" PackHash="260381a0277c560f8c2006d8bfd4f7069cd5640d" PackOffset="728072" />
     <Blob Hash="efc7306567fd9d52000894b8f5790540f5dfd3a0" Size="11123" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="285925" />
     <Blob Hash="efc7b8c08a153ad091b46ff7a4ebb1878ae7b486" Size="18980" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="896656" />
@@ -64488,10 +64319,10 @@
     <Blob Hash="efe986a95ded3b964d9826bf21c7477c7af5117e" Size="198469" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1728555" />
     <Blob Hash="efe9f2eed05dc9745c0b29dbe32e7ec81276ba52" Size="293008" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="869458" />
     <Blob Hash="efeaeb9ae729d28f51a05164b226ba7b30480f20" Size="38625" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="272719" />
-    <Blob Hash="eff14e23ffd5341acc5e64e7e9e52ef22d35dc22" Size="7522456" PackHash="9c62fbe579a459ea9e037c5a9adeb6a46cdba899" PackOffset="8" />
     <Blob Hash="eff26bd8ff3f0a4393dfdbf3e914b579f0b4c1f3" Size="280074" PackHash="f4fed3583021f5ff06710749a1c7c47f83deef12" PackOffset="1398136" />
     <Blob Hash="eff50240f1f87c7a6bfdbe59b03b05c053baffaf" Size="16" PackHash="35ae7eab1d3f546036975961c0d140c650072f63" PackOffset="2096900" />
     <Blob Hash="eff57212699373112faf1fe4ea1cd139883aa982" Size="82847" PackHash="554cca5e00efdbf249492370d2e9e84c87856221" PackOffset="1997362" />
+    <Blob Hash="eff9ac142cc9260fdd4384a56d4e89a22d7bb8c5" Size="123199" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="1396976" />
     <Blob Hash="effd24adf433c6c040eda5b261c47bff9bc0cee3" Size="3696" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2024857" />
     <Blob Hash="effe86f9a5c55fab00415dd0a103b00aa6b237c6" Size="6814" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1433160" />
     <Blob Hash="efffef415ec3dc6feaeb2aabf7bc6721e4aa2778" Size="3059" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1785735" />
@@ -64503,11 +64334,10 @@
     <Blob Hash="f00ad9a26dca9238a2846a32302de55e8dc7edf6" Size="794" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="443050" />
     <Blob Hash="f00b07cf19750156aed18e847c60b9e3cec72fd3" Size="906" PackHash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" PackOffset="2086867" />
     <Blob Hash="f00b1ad54b7516fd5b6b1be7b4afe8de0947d967" Size="75726" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1112979" />
-    <Blob Hash="f00dad0361d50e26e79a8a69e049f255a9d8efa7" Size="1044" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1058779" />
+    <Blob Hash="f00dad0361d50e26e79a8a69e049f255a9d8efa7" Size="1044" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1228813" />
     <Blob Hash="f00eb827dc29eb2063b3a0edbc39856637c55f33" Size="169" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="2056653" />
     <Blob Hash="f0194bd58f851fff67fb08796799bdd7809c81c8" Size="3628" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1156334" />
     <Blob Hash="f01f29ca06b319a75b11bd34c4e60b48ef181829" Size="3500" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="458259" />
-    <Blob Hash="f01fb60c85f7d3fbd7d91bcbda656b3502de64e9" Size="3294704" PackHash="f8f64acfd00a70e31cc1cd9c6cc5ffba4fee1186" PackOffset="8" />
     <Blob Hash="f0266f2c4c7ffca2162e7ebd6c4b8fe71f8ce638" Size="1243136" PackHash="aef25b7773a478d1496c6b257d310aa33c72e9d1" PackOffset="8" />
     <Blob Hash="f029ca690e84d161ed55f72d17e481b484b5fbb0" Size="152" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1235396" />
     <Blob Hash="f02c202c2fcf5048aaeca4ee12a0a8f621ff0ce4" Size="899" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1173799" />
@@ -64522,6 +64352,7 @@
     <Blob Hash="f04665677d0748fb225874b921593b0737b0adc8" Size="24288" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="59065" />
     <Blob Hash="f04a44c8344862d60f0dd81bb83a7d540444792f" Size="7246" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1267022" />
     <Blob Hash="f04c5d26c113f2c83b438dd4e446bbf2bd3cf41a" Size="3218" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1911358" />
+    <Blob Hash="f04e9c361859be30d226925e0af25d75c262b9e6" Size="410100" PackHash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" PackOffset="1594706" />
     <Blob Hash="f04ed3555622f703018721e9f25122726166395a" Size="6658" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1215653" />
     <Blob Hash="f053355945ba3cea3e39d1008671bbb575f3ce4d" Size="3829" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="2092240" />
     <Blob Hash="f05566563fc2853013560807e224dc9a8d984928" Size="11796" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="698549" />
@@ -64529,7 +64360,6 @@
     <Blob Hash="f058e221c05f87d1c55a8ce3b6aba0c39f21033b" Size="671" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2076685" />
     <Blob Hash="f0597f909f9c41a78baca07392f5ba2a79adca21" Size="3453" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1713574" />
     <Blob Hash="f059f83bedea9987cd66216f9bfa8bf49949cfc9" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1509439" />
-    <Blob Hash="f0619eb1192794a47d078f639ed7e3c324abc32e" Size="17793" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="1675056" />
     <Blob Hash="f0634b8ed8a30c4c0987b1ef4928dad20953c2ac" Size="37483" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="1628883" />
     <Blob Hash="f0637d22f5109796e5e672454b05479c5398755b" Size="18673" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1068689" />
     <Blob Hash="f06618ce18874c73171f0576d2f1dd2e934bc570" Size="1551" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="2091718" />
@@ -64553,29 +64383,33 @@
     <Blob Hash="f089f5bd2e3ad082e79025bc1bce2fabd0ea0630" Size="560" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="612388" />
     <Blob Hash="f08b944264c50fdab6f5490a9fca4140e9080ade" Size="2037" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="2047820" />
     <Blob Hash="f08dc8247fa637f2d74b703653ed0816936ea7c3" Size="37276" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="942221" />
-    <Blob Hash="f08eb9d8292a864e75998a21e6c59d001a41b4fc" Size="199" PackHash="1b0222e48d569ebe014d196fae73d70a9f9a3667" PackOffset="2096204" />
+    <Blob Hash="f08eb9d8292a864e75998a21e6c59d001a41b4fc" Size="199" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2096354" />
     <Blob Hash="f09178872c2f2b922ed1c24ac1341392b5b5fe52" Size="4277" PackHash="f0d6a898c18d4750e572c04c2dc290f0628f238c" PackOffset="1390617" />
     <Blob Hash="f0934d07d61044be28d94420c662fdc52a41398e" Size="7166" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="194946" />
     <Blob Hash="f0964752a7b12852fae4b54f25893631f85c1c7e" Size="112" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2078996" />
     <Blob Hash="f0967123b581f29dbf7dd0464821db5557525d63" Size="952" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="712054" />
     <Blob Hash="f0969c69fcc6e91d04525d3c5814e2d0dc49eb76" Size="176588" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="357801" />
-    <Blob Hash="f099e8c70cea7fdb9fb7482dd7770d98c5605919" Size="1968" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1594960" />
+    <Blob Hash="f099e8c70cea7fdb9fb7482dd7770d98c5605919" Size="1968" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1714192" />
     <Blob Hash="f09a2529df554512c3541429f765205d70ec5440" Size="7598" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="307945" />
     <Blob Hash="f09b37e2c8c62bc7375a127cb5914590fb6c33da" Size="3470" PackHash="c007855aa7a0479a01364a56f831920abf69f840" PackOffset="2093570" />
     <Blob Hash="f09b60bf9bb57c7543dbabef22a59452ae353921" Size="283" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1346716" />
     <Blob Hash="f09cb594003c2e8436b2338674e03ddbc8f4ab22" Size="16000" PackHash="077b2d38582f0b10f5b7abbe23141dae500a4a90" PackOffset="1020121" />
     <Blob Hash="f09ead5fd55c053d773aaa40e45eed456e7c602c" Size="1984" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="2087428" />
+    <Blob Hash="f0ab5fd064273af0bef56b3f45d193605d5e1d7f" Size="1274084" PackHash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" PackOffset="8" />
+    <Blob Hash="f0abb17b3d436a095e8349854a5f19f93f87df70" Size="1825280" PackHash="a2eab9b3a6779984145a5dff6567735320c5974a" PackOffset="8" />
     <Blob Hash="f0acdd4c24421c65b19a845a9e0062ecc7780edd" Size="20025" PackHash="caf2082cc528e23264423e8b953440952c012cef" PackOffset="64129" />
     <Blob Hash="f0aee404e4c80adce098522d00285d9c9a6d6fca" Size="4702" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="2079504" />
     <Blob Hash="f0af606e2549bd67a52c0e7d36f6a1019e9b0b51" Size="11336" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1508558" />
     <Blob Hash="f0b4382063cc8f7f2d247f4f484ee0bb201f3792" Size="87869" PackHash="66f3a69afc09dae5b1c60855f816c149a2ea7bfb" PackOffset="487714" />
     <Blob Hash="f0b62cd1551ecd3d7f1640fc79d59533cbcbf139" Size="40" PackHash="399347fca235ba3c647073d48f4e19e386766334" PackOffset="2097065" />
     <Blob Hash="f0b888b47494f0e292f7059372aca057e0f9bb42" Size="181926" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1721400" />
+    <Blob Hash="f0be1c3f739019c16085111e15a33a640c112681" Size="160298" PackHash="6e72c8b922d692af5779f780f1cd64b381dc46b9" PackOffset="1412163" />
     <Blob Hash="f0bf3fab4205f9d8d840f8180844c6d07ff90753" Size="940" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="285830" />
     <Blob Hash="f0c2d040c8d9a0edae15b2f814345cacf1a298e7" Size="9229" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1975016" />
     <Blob Hash="f0c3db6667b1c4e7199c7fb6772f2c7a278163cc" Size="101087" PackHash="07a88f4f32dff82062e33545b17b0011c4f3242b" PackOffset="1991317" />
     <Blob Hash="f0c45cea8483fe37bd3690aeb4875b9e6e962a4b" Size="48033" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1847738" />
     <Blob Hash="f0c53f0dd5a15284c8c7409a4ae368da2b7135c6" Size="307" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2096733" />
+    <Blob Hash="f0c5cfd759faeb043d5293b4d1db854dc11e2cbe" Size="3039598" PackHash="d70fad8bfe9cfa4e9f8463a364598a3d770c7c44" PackOffset="8" />
     <Blob Hash="f0c60191263bb1f28611a11f626e75c17d8e7e52" Size="20537" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="525307" />
     <Blob Hash="f0c8504e269e46b422324df90d57c30d686bc3d1" Size="4947" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="74179" />
     <Blob Hash="f0c93272392a494f83d27f2569b63f9ede4711e7" Size="141310" PackHash="d2df9cbf1caedf50c5177a1d4e6ac9923d327dd1" PackOffset="534080" />
@@ -64599,8 +64433,7 @@
     <Blob Hash="f0ec3e9b5970df9224d69b789dba08f8ef24989c" Size="49636" PackHash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" PackOffset="822522" />
     <Blob Hash="f0f2f508d53aa54ab012ed9847e3ce2e140fba27" Size="7204" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="2088658" />
     <Blob Hash="f0f42b00f6ef0051e41a95aa7d68886aa89f886f" Size="3182" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1708565" />
-    <Blob Hash="f0f8755bd3c23c18b37f38047c587025dc26df48" Size="96768" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="1998652" />
-    <Blob Hash="f0f89301b31efe555434a0023e04139a057dc69c" Size="20881" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1803913" />
+    <Blob Hash="f0f89301b31efe555434a0023e04139a057dc69c" Size="20881" PackHash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" PackOffset="2060269" />
     <Blob Hash="f0f9b4a072a8ac78f43067e920ba14bfe6e3ca18" Size="87916" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="738177" />
     <Blob Hash="f0fa06fe92a16d11ea138014e7e85a59c5d664a6" Size="3943" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="2038803" />
     <Blob Hash="f0fa18162e5c6f85af2e861a22983c500ba9b3c0" Size="2582564" PackHash="d2df47d9927aa08e27cbb40f7baeb6ae8d594274" PackOffset="8" />
@@ -64613,6 +64446,7 @@
     <Blob Hash="f107c8735fab44b5b24c063afc3523e80fabd25d" Size="2816" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="2093325" />
     <Blob Hash="f109874f227e81637daacf712ed70bdda4a211a2" Size="79909" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="893909" />
     <Blob Hash="f10c8da8676daf095c7432176cc50bf34d4519ce" Size="2408" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="953153" />
+    <Blob Hash="f1134721d7e6aad9657865e2674d974f0dd4b1ca" Size="193494" PackHash="01279c6bec046212c79c51a25eacb0d33db422a3" PackOffset="1898578" />
     <Blob Hash="f113558aee5ebe88a390ec76030f7e2da9347623" Size="2047" PackHash="f380b2adccc3afba7a9a9a501560525a8359a651" PackOffset="2094978" />
     <Blob Hash="f11b4fd103dc22e31fa5297f00a9d4400b0c8c6e" Size="32357712" PackHash="8b1582bc8c1f8c742ed6cde6d0357ac5bedc2dfb" PackOffset="8" />
     <Blob Hash="f11b7207f0384e22eabdd99537c0059d443d0787" Size="1068" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="2070332" />
@@ -64621,14 +64455,14 @@
     <Blob Hash="f1267b9e2eb0ffb44040a2a6fead3f06103a1af2" Size="12288" PackHash="affb2ac1292b281f85114871becaf2e7a7adfa7e" PackOffset="1651208" />
     <Blob Hash="f12950d62efa23df40262994e0e8bbea9f6bce7d" Size="9018" PackHash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" PackOffset="399584" />
     <Blob Hash="f12b5ece7760235eea461df6dcb3f4b13c24de06" Size="1276" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1635236" />
-    <Blob Hash="f12c77f38c45265b0c2b38fa9843ba261dcbf04f" Size="57" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555317" />
+    <Blob Hash="f12c77f38c45265b0c2b38fa9843ba261dcbf04f" Size="57" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674549" />
     <Blob Hash="f12f373bd02c838913f8782b785b223d7f4b77c4" Size="663040" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="8" />
     <Blob Hash="f1305d45dc9763d98f9b9dad6262651c55837afc" Size="3423" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="2087426" />
     <Blob Hash="f1351197fdc584a0384d5f11a8b734ccc015e70f" Size="10556" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="237385" />
-    <Blob Hash="f13dc2715f00b6dd81aa6f43ab73a18254901b43" Size="772" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1425860" />
+    <Blob Hash="f13dc2715f00b6dd81aa6f43ab73a18254901b43" Size="772" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1874913" />
     <Blob Hash="f13e0fe8297a3ee95d6fe0efec0c448c595cb2af" Size="3227584" PackHash="22298b8a2b2f1174cabc212d837787161a7c7255" PackOffset="8" />
     <Blob Hash="f146ae21a173e744de46babd5029c9e387580645" Size="151" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1235091" />
-    <Blob Hash="f1473c330d21943db4fb7650a2883c65da0a2603" Size="15801680" PackHash="41f547fa428980b8483eba7fdada34ab8645a45b" PackOffset="8" />
+    <Blob Hash="f1497765d935880471bfdc5d259983dd4338ab2e" Size="6676702" PackHash="6437c6893adaa434f34fea6860337c1648453547" PackOffset="8" />
     <Blob Hash="f149f1bc4fd22491f99696e990cd8c77df898b68" Size="150" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1958836" />
     <Blob Hash="f14ac4b2a6d10c04e1d103ec32c60e874791c619" Size="105494" PackHash="48b9cfd22101481b2a96c5f7542dafa24cf5554d" PackOffset="876316" />
     <Blob Hash="f1501a21e65fbc9b490fe631b718d0a923c1ac35" Size="15872" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="818696" />
@@ -64647,7 +64481,6 @@
     <Blob Hash="f16ba21d30319105a4db37279e104347a0531a59" Size="25548" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="265154" />
     <Blob Hash="f16c5b655f7003280a5e3ad2e9bae7919b667dc5" Size="3756" PackHash="523928e5a279955fedd9434a2f276322819d6a20" PackOffset="17483" />
     <Blob Hash="f16d44ab56176860bd6ddfa67cedfc88586b900e" Size="14848" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1883144" />
-    <Blob Hash="f16ef95facb41435ec7dc084543e8af889daf90a" Size="265216" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="1382920" />
     <Blob Hash="f17151c4461d92ee7fafc60225acdeef9f988697" Size="16576" PackHash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" PackOffset="1974931" />
     <Blob Hash="f172e10561a78700a0a223394c25c583a1cc184f" Size="801700" PackHash="061feaf0a3f0d9f379cc7d1dc90e7865fda457d1" PackOffset="1121692" />
     <Blob Hash="f173bad79d6dee9e11f4009f2157e00dc90c20f9" Size="241546" PackHash="9e397995b47d5acc37d38c9fa4935abec922ba48" PackOffset="1620064" />
@@ -64656,7 +64489,7 @@
     <Blob Hash="f18664596f0cda257fb8ca99d96598d08b35a399" Size="3479" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1167046" />
     <Blob Hash="f187ba584b578d58f03929630cb8aa059c86524f" Size="12288" PackHash="85ead6085f10e657e1a91326f3704d60b31164b3" PackOffset="2078728" />
     <Blob Hash="f187f6a04f4e5b05ecd2761d11e3bdeb33d52b68" Size="9512" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="162352" />
-    <Blob Hash="f18a98b750709b49f69e76bf44949506780355aa" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553581" />
+    <Blob Hash="f18a98b750709b49f69e76bf44949506780355aa" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672813" />
     <Blob Hash="f18e5549096288f7aae48527f892d13b24396a04" Size="282440" PackHash="f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" PackOffset="1804007" />
     <Blob Hash="f18f6f74590f6c8991bfc6fd7b990839274c6579" Size="3381" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1474874" />
     <Blob Hash="f1907208f8b0b47552da9d955fe19d9b1e561b3a" Size="7596" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1902192" />
@@ -64668,10 +64501,10 @@
     <Blob Hash="f19f57fdb1e29cc08d93e30372d538ba4d21c7ab" Size="2880" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1958874" />
     <Blob Hash="f1a01c52a4deba7d274a0541917e2f655a79637f" Size="96036" PackHash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" PackOffset="823593" />
     <Blob Hash="f1a0796da7410a5c8551b4f9ac9ebd4455fc3161" Size="58624" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="320134" />
-    <Blob Hash="f1a5c39463354a35c702797ce99779663aa67466" Size="1328" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1341426" />
+    <Blob Hash="f1a5c39463354a35c702797ce99779663aa67466" Size="1328" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1460886" />
     <Blob Hash="f1a6372e36c5d258716c3277e0e69bb984dc7bbe" Size="246569" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="566630" />
     <Blob Hash="f1a658bf33c63a097a133f43a00e87588e206a95" Size="5630" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="645054" />
-    <Blob Hash="f1ad7735e51a90ba29e9846e69b6a75ad2abd031" Size="48" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="2097108" />
+    <Blob Hash="f1ad7735e51a90ba29e9846e69b6a75ad2abd031" Size="48" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2097106" />
     <Blob Hash="f1adcf1cc009577d5414086a516186e82d5f8f98" Size="205874" PackHash="a0be02153b37ac75f3e5024684c8a2831499a4a8" PackOffset="1762223" />
     <Blob Hash="f1b582cca735ea85d09ed3adf59d9f23ea04fbab" Size="2262" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="1235326" />
     <Blob Hash="f1b6598bd8ec0dc6045d4983a77a52896b59ba9b" Size="961" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="631894" />
@@ -64689,13 +64522,13 @@
     <Blob Hash="f1d84c5049427487a67ffb9c2f42e8af2c6c8ed0" Size="47856" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="625605" />
     <Blob Hash="f1d890e893f27be8bebe55832b4ed61326db7fe6" Size="1578" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="833822" />
     <Blob Hash="f1de8e8161b42389236bfe4a460b162f3a8ca4f3" Size="56256" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1581293" />
-    <Blob Hash="f1e7a01f71e88e8dd19e11fa91f36a7d618896a8" Size="3702" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1529974" />
+    <Blob Hash="f1e7a01f71e88e8dd19e11fa91f36a7d618896a8" Size="3702" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1649205" />
     <Blob Hash="f1f16e0b1388c5e924f1c70b2ed341b67e0a41b7" Size="120" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="202223" />
     <Blob Hash="f1f19071ecc6ad21cab9ebe08d49a9383dc34aee" Size="11826" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="574690" />
     <Blob Hash="f1f646a3a1c01c83fa148743f7613c4137714476" Size="25068" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="777736" />
     <Blob Hash="f1f6dc8af1da2279cc79e8bd93ecda3c6c2e4715" Size="1116" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1553540" />
     <Blob Hash="f1fb7391001be6204eb92c5bf9170beec448b726" Size="804" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1507647" />
-    <Blob Hash="f1fba523aa02a4562053513b92060a69bd18535b" Size="3305" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1198798" />
+    <Blob Hash="f1fba523aa02a4562053513b92060a69bd18535b" Size="3305" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1643629" />
     <Blob Hash="f1fde69493373eaa5f13fd534a8b21f49be890d8" Size="608" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2089264" />
     <Blob Hash="f1ff94cb70c26bea7fb15a5b2e7e410b4c7068b8" Size="9226" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="1230181" />
     <Blob Hash="f204fc956b455848a9b2aeed15fa82af3703c3e0" Size="341644" PackHash="4bf85057431c993918864e95b62688eacfc3a303" PackOffset="333428" />
@@ -64704,13 +64537,13 @@
     <Blob Hash="f208b19e96ae6c6146f1a7fad7158b003cdea4c3" Size="2461" PackHash="532f738b3573e1e4caf1bd23cd03fea7e6f49947" PackOffset="171686" />
     <Blob Hash="f20a9662786fa1d8a4c1679c2a4207f3a610b485" Size="101662" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="151840" />
     <Blob Hash="f20c74d62610f41681ae6f21dd07bd779ec83be6" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="590459" />
-    <Blob Hash="f20e4334412114ef823a4e1e1353f19fce2df1d4" Size="39364" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1791168" />
     <Blob Hash="f2120f7cde25358c0fc9e44ce753a91fcd8c1521" Size="14080" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1550260" />
     <Blob Hash="f215fabc32c018b7441c924a0063bcd080745ede" Size="128" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2096429" />
     <Blob Hash="f2168a2dfeef284fdb5fdc3d016a7579c6266ea4" Size="40" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2072798" />
-    <Blob Hash="f218a254c659cb8ccf5a31994c8cd0a99ee5c63a" Size="1047" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2035172" />
-    <Blob Hash="f21f5e22d046b039c74ef0bd2993801125952bb3" Size="34198" PackHash="b018fd41d11073c25edcc108d13464586eaa8752" PackOffset="2056238" />
+    <Blob Hash="f218a254c659cb8ccf5a31994c8cd0a99ee5c63a" Size="1047" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2093728" />
+    <Blob Hash="f21f5e22d046b039c74ef0bd2993801125952bb3" Size="34198" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1490694" />
     <Blob Hash="f222082baf3be63a90562a7db69eaeee03c8e4c6" Size="271360" PackHash="af32114b8b970d1d65271ed99052f0de3d4651eb" PackOffset="703647" />
+    <Blob Hash="f2233a5b1b372d37f255a22b4d15e2f89a4c50ed" Size="1116966" PackHash="739203aa1fa068793a67bd62b7fe6585b6da1701" PackOffset="8" />
     <Blob Hash="f22413e65ebc248c66aef8293ef46c94820a8da8" Size="9880" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1031864" />
     <Blob Hash="f224e3c6431d27d63b0312787f2e288e768c74ce" Size="11207" PackHash="245dddf7390cc9eeef8269173960264c37eb7690" PackOffset="1892904" />
     <Blob Hash="f227419cae4d189627b300b94708fcfaf1a1a8e3" Size="14224" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="421620" />
@@ -64731,29 +64564,29 @@
     <Blob Hash="f249bb6d8edfb0e6293c139b2e88738914c367ec" Size="22300" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="452356" />
     <Blob Hash="f24b4cac7996beab75bd3816030622f2901a1599" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="134664" />
     <Blob Hash="f24d78675343b4c659502bbf7a5bb31aa8b6f7c1" Size="11551" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1312122" />
+    <Blob Hash="f24fa9496bc9400ecb134e9a90f63ea714a4543b" Size="2098176" PackHash="ba432114d0ae3c99ec262b14f3c4df487cb7c0ad" PackOffset="8" />
     <Blob Hash="f251db93c6fdfbd92f005438fc3cffcd7d0876e6" Size="10240" PackHash="eaf3853c73cd6268ec2553abdca49a062180a1b4" PackOffset="376328" />
     <Blob Hash="f25411fbed0e0b1653fa92b4caf24d0751f96a1e" Size="262570" PackHash="f12fcad677aebdda530c1768cf6a4c571cea68bc" PackOffset="1233335" />
     <Blob Hash="f2558d5cf67d8e25d1758d4d8183d238ca9cb42c" Size="3572" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1522769" />
     <Blob Hash="f259c87e8a882bc1a45b6efac59faf43f5d0fac2" Size="10032" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1519786" />
     <Blob Hash="f25cb78505cec2057b80208bc5ff026b0913213f" Size="5801" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1215446" />
     <Blob Hash="f25d0aa6170068d7a309ce22bd47db597cac5140" Size="17408" PackHash="bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" PackOffset="2034692" />
-    <Blob Hash="f2657c0b16d92f5c644ec794aebbd1441c667103" Size="50176" PackHash="fb276d1bd30c33019a2a41af75e8a82e43b80637" PackOffset="2023680" />
+    <Blob Hash="f2657c0b16d92f5c644ec794aebbd1441c667103" Size="50176" PackHash="bd1aead3e9c6eea8826b6919aa5edd1cf21a3029" PackOffset="2033904" />
     <Blob Hash="f265ceb16c6352bbb4f880d5fd63dcd9b8519ca6" Size="14108" PackHash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" PackOffset="1851561" />
     <Blob Hash="f26858e3d2fb928f39ca87cbb8446af099570cad" Size="1111" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1812135" />
     <Blob Hash="f26c40f17765bb89f0a6ac1cf6652392a835914d" Size="77826" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1675254" />
     <Blob Hash="f26daded860d8783cd1fafbeea5ae8dd53a7b737" Size="22836" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="675152" />
     <Blob Hash="f271843513240ad7a276cd708476a05a2e7154fa" Size="2392561" PackHash="0b6a64af9d078674ffc38858d72d025e3b770ff5" PackOffset="8" />
     <Blob Hash="f2781f0defbeda239beb41648b06e025c941c794" Size="4538" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1811374" />
-    <Blob Hash="f2799d954e12a16d4d2937d2d5ce4fe2f0a50c57" Size="9216" PackHash="c483f02f330e734086b012df57c4ed8ab1dd6ed5" PackOffset="60525" />
+    <Blob Hash="f2799d954e12a16d4d2937d2d5ce4fe2f0a50c57" Size="9216" PackHash="930a472597e8f14d24d2fcc508580292b0a82bf4" PackOffset="2046157" />
     <Blob Hash="f279a7d9d48944698e5e5c124e87e8a5affa0d71" Size="7947" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="460595" />
     <Blob Hash="f27ff41a81d8eb685a2bb9c5a93e5f82d2114cab" Size="12288" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="589763" />
     <Blob Hash="f2809b5ec0f8de9d3b5ce0441639519f5b564aa1" Size="253819" PackHash="83483b879ca4d4508d64bd7176b1101533718a2a" PackOffset="1437233" />
-    <Blob Hash="f2823efc465b5e7c195c19db1aa4122be6371e37" Size="1829" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="2091238" />
     <Blob Hash="f28549cbf68a5fef577d847f3ec88abf9f84217d" Size="3665" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="561107" />
-    <Blob Hash="f28ce4f2d437009f179754913f3cb42746ada083" Size="141" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1466664" />
+    <Blob Hash="f28ce4f2d437009f179754913f3cb42746ada083" Size="141" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2003746" />
     <Blob Hash="f28d2c89ce0b12dabdd3ed528c5f1d8820375df3" Size="216" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="2096359" />
     <Blob Hash="f2907608e132a4f780a70f76cdd7e52ca5c197fb" Size="1216512" PackHash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" PackOffset="8" />
-    <Blob Hash="f291af78e86bb894a7a8bceb7b4761e437f1c563" Size="2665" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1640927" />
+    <Blob Hash="f291af78e86bb894a7a8bceb7b4761e437f1c563" Size="2665" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1656752" />
     <Blob Hash="f29294c87095a81e62ee6a6c60eb57f19e72ff1e" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="209579" />
     <Blob Hash="f294c7c5db5086fa136353ae14fbf8611120c9a6" Size="52510198" PackHash="105806b72818c3e740aafb34be4e1527294311be" PackOffset="8" />
     <Blob Hash="f2956931c3c98c42661ba07e17b3c555e60dda81" Size="3343188" PackHash="b9ccd579a8f9c4ca2c18ff40905999f6d34ed0f1" PackOffset="8" />
@@ -64764,14 +64597,13 @@
     <Blob Hash="f29ce5051144ee55acf1c3734b0512ee1e0c9206" Size="7756" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1499375" />
     <Blob Hash="f29dc5d52507317a111068b88c6be1215cd18236" Size="32" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2081135" />
     <Blob Hash="f2a18d3dc1faf33690175b31ef49705c41ff124f" Size="609624" PackHash="f6fdc33805bc89e2eaff8003a996f6bf8f880789" PackOffset="8" />
-    <Blob Hash="f2a2b3bff6877a7b7e03af3e9bf929d04878944c" Size="1289112" PackHash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" PackOffset="8" />
     <Blob Hash="f2a6b456272f913a9e97c495cee73ac774c90fa1" Size="1212" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1100724" />
     <Blob Hash="f2a959176cfbc237e2d8b47d41fd7ebc30d6d988" Size="2749192" PackHash="b004c18725327fca5ab7d1181c7f84f691796f04" PackOffset="8" />
     <Blob Hash="f2a9e72528ae0db3d7f5ee8e92c530ad4daf898c" Size="3677" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="8" />
     <Blob Hash="f2aa116f1654c27640f245b167a1cdec1bad2668" Size="115" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="520666" />
-    <Blob Hash="f2af9083d2817f106dbfc20bc3df78a3e0554491" Size="1807" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1922334" />
+    <Blob Hash="f2af9083d2817f106dbfc20bc3df78a3e0554491" Size="1807" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1863513" />
     <Blob Hash="f2afa3e81adcd2e48c750aa81bd04e98797f10c1" Size="1789010" PackHash="e05787ca1e32ef7163dbfa93f15f98095b61a195" PackOffset="8" />
-    <Blob Hash="f2b06d2c581bec2e4c6f7152d39110e1e7d1dbf0" Size="14198" PackHash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" PackOffset="2077226" />
+    <Blob Hash="f2b06d2c581bec2e4c6f7152d39110e1e7d1dbf0" Size="14198" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="2037870" />
     <Blob Hash="f2b3ccaa037e67cdf469ffa5baf8874791c9c725" Size="4746" PackHash="aa0b7f0047fac88b282633eb9c4825d915a9597c" PackOffset="385670" />
     <Blob Hash="f2b5749095bd5c909ccbea25f820f32c33fa87da" Size="54873" PackHash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" PackOffset="588214" />
     <Blob Hash="f2b6559e52cc522dd8c820bf917d930d5a1d7421" Size="7876" PackHash="fc72803a9439e161de25108be11e5429ed900f77" PackOffset="710638" />
@@ -64786,11 +64618,12 @@
     <Blob Hash="f2cdf56095eed0aa9c02fd681cb9d9feb01c21e6" Size="46230" PackHash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" PackOffset="1039527" />
     <Blob Hash="f2d29ee03e17f29d3122a7366f0867672afd1cf5" Size="2690" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1062675" />
     <Blob Hash="f2d5968f091c3ee1c4e2200fcfd5952c296ead3a" Size="770" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="337503" />
+    <Blob Hash="f2d74b5adaf5b793e681b7dc99e78c72fbf51bae" Size="1724036" PackHash="b2a1cc72c3ee09745e5fc4eb2449182ded552918" PackOffset="8" />
     <Blob Hash="f2d8eeff3a24f458f2a47f80839351723e05f5c8" Size="96408" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1563687" />
     <Blob Hash="f2dafa55a2b299af87e1577cf98907bc9c0e94f4" Size="11264" PackHash="bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" PackOffset="1477452" />
     <Blob Hash="f2dfbcfa341893e1d53d165d07d333d90ae4a0df" Size="110866" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="99493" />
     <Blob Hash="f2dff2b21f845720c19a9e2710ab7b8063711c25" Size="394275" PackHash="a243a00aa61675be8ae46cdba7db99c8e8195984" PackOffset="1505349" />
-    <Blob Hash="f2e022d9dc09b174c11504b45fb2dc2c02712539" Size="5041" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1279524" />
+    <Blob Hash="f2e022d9dc09b174c11504b45fb2dc2c02712539" Size="5041" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="2061142" />
     <Blob Hash="f2e154ec2c8b3a282f899622057083c0856f8375" Size="8351534" PackHash="163784cb855cf579aa85c8d84241ac308c31d9c6" PackOffset="8" />
     <Blob Hash="f2e243be2674a8fb0309e8b76de9771a1373e0d3" Size="6714" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2041912" />
     <Blob Hash="f2e88c7fd6ca736ef4fbef1cab776bde0aadecea" Size="11187" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="8" />
@@ -64803,7 +64636,7 @@
     <Blob Hash="f2f3f05074a0f40087bc5f86ac0783bc5f359c5d" Size="9728" PackHash="ca83db39ca850bdf08a4e3bda07b207534365c24" PackOffset="2084360" />
     <Blob Hash="f2f3f7a1491915275b15c9601e1bc07385ec8609" Size="1168" PackHash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" PackOffset="2090005" />
     <Blob Hash="f2f512f00874f9c58770e0388aca43e366e8f5f4" Size="6712" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="77585" />
-    <Blob Hash="f2f87adc6644bf5fdd42b9cf9fa5ddd338dd5e6d" Size="50" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550932" />
+    <Blob Hash="f2f87adc6644bf5fdd42b9cf9fa5ddd338dd5e6d" Size="50" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670164" />
     <Blob Hash="f2fa782e299b085c5c8ea97ad49c775687856be9" Size="312" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="1636780" />
     <Blob Hash="f2fa9b35917020deb738c9e73202fcebcd10bad7" Size="116" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1696080" />
     <Blob Hash="f2fe7fde7916cada874fdc0b78b9039585b61128" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="524273" />
@@ -64814,19 +64647,19 @@
     <Blob Hash="f30e7ccbcd9c539126e8d6ca0886e4b2bd54e05d" Size="1114" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2037479" />
     <Blob Hash="f30ed9464d4da230b9258d9af140904815b050ed" Size="240" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="2096855" />
     <Blob Hash="f310a62c6f7cf764de55637b839d5b6e31989879" Size="828" PackHash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" PackOffset="2096069" />
-    <Blob Hash="f32323442fd6f9245d2a1dbb3e02e3870891c1ea" Size="879" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2026915" />
+    <Blob Hash="f32323442fd6f9245d2a1dbb3e02e3870891c1ea" Size="879" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1917126" />
     <Blob Hash="f324ec8c410786d92bdc82f5cd657fcbeb44a9be" Size="173" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="416080" />
     <Blob Hash="f328b2046cae5775fe628af327eb43e5ca4e4bc8" Size="29969" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="324424" />
     <Blob Hash="f328cfdbdbff013202fb4e729503e9d1b49c444e" Size="23624" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="451274" />
     <Blob Hash="f32aedb710803bbd57f0743bbadb3c0ea35aef8e" Size="24476" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1797291" />
     <Blob Hash="f32c978931ca10daa6cd032943dd99f4fee17ca1" Size="135020" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="231702" />
-    <Blob Hash="f32f133dbef964f65a8565cee76b51f290cba90c" Size="888" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2039231" />
+    <Blob Hash="f32f133dbef964f65a8565cee76b51f290cba90c" Size="888" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1930362" />
     <Blob Hash="f332a03ea51a48d506fa0dd046ac79787addf50d" Size="37829" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="861556" />
     <Blob Hash="f338cafe5b89e0b00ee692d366982b8426ec38e3" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1691633" />
     <Blob Hash="f33a2125527f8df9606e15a31c1f8079c6c8a2a7" Size="2178171" PackHash="55f786e308cc9157e1cb168a9211aa740d4f9ce5" PackOffset="8" />
     <Blob Hash="f33b38507a6148dca9114a4307a82fddcf307fbb" Size="5864" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="656357" />
     <Blob Hash="f33daff0a947f1e7a812bbc9a8dc8e4764a122d3" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="2085669" />
-    <Blob Hash="f33e586fbf662f8d0dde3c390e0bb41025f8e545" Size="1074" PackHash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" PackOffset="2094276" />
+    <Blob Hash="f33e586fbf662f8d0dde3c390e0bb41025f8e545" Size="1074" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="2095477" />
     <Blob Hash="f3405af63e878471767c1230dbbf4fa403f3b6c9" Size="13053" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1298492" />
     <Blob Hash="f3418fd87b69353021961db7632e192436ca0b8c" Size="949" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="283938" />
     <Blob Hash="f3424e7d7f5f4df7bbb2764097d0daa3d1f31a12" Size="6096" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="55102" />
@@ -64840,7 +64673,7 @@
     <Blob Hash="f34f320bc76945cf346515ba4ff6f364ec694eb1" Size="6206" PackHash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" PackOffset="153710" />
     <Blob Hash="f34faa7afacf5b7424dd3c16e34160a3fac443d1" Size="715" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="130882" />
     <Blob Hash="f34fff3599d92eeb53508f958c83f2846316a454" Size="8032" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="214880" />
-    <Blob Hash="f35210345cea9e669b03af429bec97f0f1eac0de" Size="6946" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1654534" />
+    <Blob Hash="f35210345cea9e669b03af429bec97f0f1eac0de" Size="6946" PackHash="d4dbe6f4463336c464b273797921b3f1180dbe5d" PackOffset="2081127" />
     <Blob Hash="f3541f6ee201fa33c66042f5c11a26434d37d42c" Size="204" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1647736" />
     <Blob Hash="f354850cbe250bb9b26a60a8777a8b7b28e30f12" Size="10795" PackHash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" PackOffset="2064532" />
     <Blob Hash="f357c58aee51a175490803578579c652ee0884b0" Size="126" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="442555" />
@@ -64862,8 +64695,9 @@
     <Blob Hash="f38680e6caebb4c0844ab30344291c82824c0497" Size="5592" PackHash="180e4a2502605ec72c9d431cd1b08950ebfb233e" PackOffset="2089643" />
     <Blob Hash="f388c86781879d4320e8d268086f0eddfef82049" Size="8854788" PackHash="e7808a43acaf99637e43857c76760d74f77d6ae5" PackOffset="8" />
     <Blob Hash="f38988ca6fbf5c2ec9b3485d8b5793e486340118" Size="7880" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="666947" />
-    <Blob Hash="f38d1a33b233ba62ce8e8aa463717402b8fa608b" Size="2914960" PackHash="089dee88d27c9889dbb4c390ab2744bf3a4e1d4e" PackOffset="8" />
+    <Blob Hash="f38a96d82edcc76b8366d563d0cb75788471f6c7" Size="2957778" PackHash="7e9ca5724c4e7967532c52b5aa0042aaf9cca00c" PackOffset="8" />
     <Blob Hash="f38e913594c8e418db3cc91ec21cc1216fc3cb24" Size="91593" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="1216693" />
+    <Blob Hash="f3915fb27e346100ecbc7ede22d9f8dd51b9cc5d" Size="4365700" PackHash="b480d40615130538f232b1b92250d0e214213b5f" PackOffset="8" />
     <Blob Hash="f3917891efe7f328ce6f268293c5536da0569da9" Size="11876" PackHash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" PackOffset="1563233" />
     <Blob Hash="f3947b5c735b654deb2fbd6fe9b15e2827b41357" Size="80015" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="1817063" />
     <Blob Hash="f396d1a2f76d50e61c50733a69b0c5495719afc5" Size="1634" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1983592" />
@@ -64877,6 +64711,7 @@
     <Blob Hash="f3ab0e71215bdb509a1a323dcfaf3de511cbf82f" Size="3496" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="880116" />
     <Blob Hash="f3afb9d77f1917d6e43eeebaf0edf367b1a25c7b" Size="30132" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="656918" />
     <Blob Hash="f3afda4526f4dcf73cf7dcde4e08b3585c30cb28" Size="37802" PackHash="076cc4191605504829403925c5d6aa439a8340cf" PackOffset="1996501" />
+    <Blob Hash="f3b042620af3fecb7020df0f5c62b8325870fb37" Size="5045296" PackHash="eadf9441efcfce173eeeed153a63ca2d745e9b01" PackOffset="8" />
     <Blob Hash="f3b1b22ace79f77aa36eee7d0f9f426eb246ea08" Size="146577" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="845463" />
     <Blob Hash="f3b3907f34dada32e3cc1231c7ab161bc9468214" Size="402" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="395411" />
     <Blob Hash="f3b45442876c83a8cc28558915715242f60caa2e" Size="1619" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1882337" />
@@ -64908,14 +64743,14 @@
     <Blob Hash="f3f257d952bbe493a6a187d95395464fce9926fe" Size="95925" PackHash="acf6558b1e3950d55a31da4e8614e4a357aa653c" PackOffset="601202" />
     <Blob Hash="f3f262430ea3a24b379a2afe8ff0fabbe5439495" Size="975" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1720907" />
     <Blob Hash="f3f6238f9ccbbd715a19f4356fe66c1c76f99ba4" Size="8069" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1373966" />
+    <Blob Hash="f3f7394f11a5f883be0754a725ab3995aabf8472" Size="1043456" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="8" />
+    <Blob Hash="f3fd60f57fe782850703b642dd4f789fe516a857" Size="2228992" PackHash="9d972222b718ead8f91b0e4520fc2c1ef3320eef" PackOffset="8" />
     <Blob Hash="f40151a8171f6d8485ec71bb436430ea1b794c72" Size="1176" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="497172" />
-    <Blob Hash="f40608155e6f6e2291655585c4c2525423507bb1" Size="2159484" PackHash="a89c22869ad91789e9f88102ad9a1930453df33a" PackOffset="8" />
     <Blob Hash="f4097a8db8b72b0ac5f564486c37c5c857fd1c7d" Size="32" PackHash="073846dad6c77e04773801a5ef6b946a6f69ae4b" PackOffset="2083494" />
     <Blob Hash="f40b6a572de9090c9e5dee67ccacbc73e8bbad92" Size="3348" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1467884" />
     <Blob Hash="f40d6bea9a94944113e2dc538e36f42b737fc0c0" Size="18336" PackHash="c0b679df17adfa19e480d5435683ad7f9007d58c" PackOffset="1867733" />
     <Blob Hash="f41c551cbdd29c6e0287abcdffea7fa3c67a6e9c" Size="17836" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="516391" />
     <Blob Hash="f41d8f8ca548f058b73809c6ff2fb28aa1ff3fba" Size="19333" PackHash="d37e50bc34f63043e4dc473473732e43cd07ee57" PackOffset="102815" />
-    <Blob Hash="f41df452562ef2b088b3a9312636ba1232a3191e" Size="266240" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="22535" />
     <Blob Hash="f42029b19f8ec54e71ca28bd3c0fafa2c33d23cf" Size="180" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2089964" />
     <Blob Hash="f42b0d1392047fd9d82e59f6e27a2b5e3dd62d84" Size="20084" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1004300" />
     <Blob Hash="f42c17e8bf84dac5d8c941381d60542fafd6d1fc" Size="4737" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="2090342" />
@@ -64923,10 +64758,10 @@
     <Blob Hash="f42f10edc499da3262c860dade0fb5bd3ac6a98c" Size="8320" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="305512" />
     <Blob Hash="f43011d7e0e1800259aa1fba83cf84497fea122e" Size="7684" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1554918" />
     <Blob Hash="f430f324c3dcd9ecf9fe27e42ec21daf0bc76b9b" Size="3264" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="2062265" />
-    <Blob Hash="f4320410bb50e2ffc1424ffa82921f6719dc5051" Size="64" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1708642" />
+    <Blob Hash="f4320410bb50e2ffc1424ffa82921f6719dc5051" Size="64" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2097022" />
     <Blob Hash="f4342ec2c7d3818c1d7f842c0e66f4c99980fd9a" Size="11776" PackHash="a5a4b35f662228caee7476ddab2567611de6c35c" PackOffset="1909768" />
     <Blob Hash="f434e4e454ea454a19c14487f8b3893625933cc1" Size="97210" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1314312" />
-    <Blob Hash="f4369b2856a94b7141a4932f962cdcb46b8194a4" Size="47" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1553481" />
+    <Blob Hash="f4369b2856a94b7141a4932f962cdcb46b8194a4" Size="47" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1672713" />
     <Blob Hash="f43ed3af90c7f809be3fcb17a6009a605ee82bd9" Size="444" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="756969" />
     <Blob Hash="f442502a8e1ba5ec5791bac9377bfb299caaaa6d" Size="1709" PackHash="b9a79d20e5630d87a738f2282f9c2f039be355f0" PackOffset="2076851" />
     <Blob Hash="f44433aa1f5d3fbef7da1c227e29598cd35b87d8" Size="4093" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="461682" />
@@ -64935,7 +64770,7 @@
     <Blob Hash="f44bb49b1fd97b516a8671223141766bc646ed9e" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1278068" />
     <Blob Hash="f44bd56f0fe869a4d7da3ae91e1a176265c3387a" Size="139" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1152626" />
     <Blob Hash="f44c1eb3963d61700d05a9e228c6db26c32b51d4" Size="1206" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="672044" />
-    <Blob Hash="f44c258d622f7ed73949c8532f62f31893708c39" Size="29480" PackHash="6d233e51f0cc649dd555a3e262121fd57c26def8" PackOffset="2058952" />
+    <Blob Hash="f44c258d622f7ed73949c8532f62f31893708c39" Size="29480" PackHash="01beb72f5d3d57b94a19be5dfc193010325fd53c" PackOffset="1895070" />
     <Blob Hash="f44c74d4d5f645e811977dff398ceb1cefc789c8" Size="5187" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="822699" />
     <Blob Hash="f44fd05951987d6b5a370d70dc5c0ed4e17cbc3b" Size="489" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="361907" />
     <Blob Hash="f4522daa91ace6d9b7c4ffdbeafa8aa4913427c4" Size="196501" PackHash="6b67c4b93edd66dc6876acdfaf991559f2387756" PackOffset="212762" />
@@ -64959,8 +64794,8 @@
     <Blob Hash="f477c65d505e530cb71227f0363b82a34691a72a" Size="2145370" PackHash="6dc25f2712e77af6bf5605a31cf39f4fe9031a93" PackOffset="8" />
     <Blob Hash="f477c87848d99b288d2f052f0f2b52a2071f3222" Size="72056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="107176" />
     <Blob Hash="f48119ae295079bade0716a7a0100574c6399c1a" Size="1814016" PackHash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" PackOffset="8" />
-    <Blob Hash="f484bf68a414685cb0fcd20f6e25e6a2ebc9f225" Size="1219072" PackHash="8ea495aa16f5c28059de7b17b493fc094f400049" PackOffset="8" />
-    <Blob Hash="f48d0fb05365ffda7b1a300cd02e707800c3e461" Size="14448" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="2072104" />
+    <Blob Hash="f48d0fb05365ffda7b1a300cd02e707800c3e461" Size="14448" PackHash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" PackOffset="1975182" />
+    <Blob Hash="f48d8dcce333074a1196b65b88b8ce28a387b61a" Size="166181194" PackHash="5b8c91a94b43ac6166d0002c88250638666c759e" PackOffset="8" />
     <Blob Hash="f48ec892e02fd8fcfa8433249633aff7f4b07ee1" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1719794" />
     <Blob Hash="f48ef8c2a9517d90d0a1be1b3abbd1403bbf3740" Size="192691" PackHash="82788599ad2583d437e6cde9e247d16ba5059dac" PackOffset="1804965" />
     <Blob Hash="f491dcde953ac92b106426f5a0358dfbc86323ff" Size="547" PackHash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" PackOffset="2095912" />
@@ -64987,7 +64822,7 @@
     <Blob Hash="f4aea4e471b8d38241e650ca438f82d17e5689e8" Size="4861" PackHash="aca495e4ccbf3620acba4cb167d20a643cc5c6db" PackOffset="2089142" />
     <Blob Hash="f4b2ae29ebb0edb03af916e443cac457f0093e20" Size="18539" PackHash="d0727784ae79dcba28f2e253924b24479c842f8e" PackOffset="2061941" />
     <Blob Hash="f4b555feb2c95b45f1bcc82d5443cf47af326d34" Size="38172" PackHash="6b6ea1539e3e10b995b117a201cd14188d7361cf" PackOffset="1281655" />
-    <Blob Hash="f4b94543a5ac67b52402097f8abd6ac5ae29b24c" Size="11001" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1474218" />
+    <Blob Hash="f4b94543a5ac67b52402097f8abd6ac5ae29b24c" Size="11001" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1593449" />
     <Blob Hash="f4b9483a77feb38242e3e95c549438a857cf5095" Size="2440" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="677928" />
     <Blob Hash="f4ba034f670697d74111e7dbd908289c88f1b802" Size="13240" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="1873504" />
     <Blob Hash="f4bbfa993d56c7375fc7b4300b21183f63a72c5a" Size="13306" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1099835" />
@@ -64999,8 +64834,10 @@
     <Blob Hash="f4c25d64c78e24d7aea364866ed59469fb62d3ef" Size="1034" PackHash="c25bec168e93ab9183b4187a3172187d41e8b094" PackOffset="2080662" />
     <Blob Hash="f4c38abed95400dee476177b6f4de4e502789c08" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1745931" />
     <Blob Hash="f4c5c91cf9e87ea2f0636a395d4bfdc88030cda3" Size="3007" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="2066315" />
+    <Blob Hash="f4c74db94c434f87b9e6e7a7d9c02d936981f76b" Size="14198" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="1871972" />
     <Blob Hash="f4c78123625c6bca6d85853c5c5ecc002ef3ebe4" Size="166035" PackHash="f4fed3583021f5ff06710749a1c7c47f83deef12" PackOffset="8" />
     <Blob Hash="f4c95f1abd24c715a3dd4b3e4c9cff5decda7250" Size="412130" PackHash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" PackOffset="1145907" />
+    <Blob Hash="f4cb8956ff4a1ccf38852971a1d5317cf4c6e8b9" Size="14448" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2082052" />
     <Blob Hash="f4cbbd6e89fa7689052cdd8211ed5d135cf6405a" Size="9410" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="307420" />
     <Blob Hash="f4ce6dc4ef172cf2a57af0b8fb2057f984542733" Size="2334922" PackHash="4b7dab008711973caea1c81df57d6b29ed9c896f" PackOffset="8" />
     <Blob Hash="f4d0dd4b8a5b03c6c69c6eeeb5203f439b42c352" Size="10760" PackHash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" PackOffset="1108828" />
@@ -65012,7 +64849,7 @@
     <Blob Hash="f4d90ebea1d9ad0988c84089425f10ac5a23482c" Size="9422" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1651115" />
     <Blob Hash="f4dec3d8e40f8886a0c8f1c06202911d30b8dce4" Size="87346" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="162245" />
     <Blob Hash="f4dfeca4851e2cc190b3ac2d64c06692cbcaeddf" Size="5957" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1026402" />
-    <Blob Hash="f4e30e065aa0b5d51f9ae847e47ce1c27b455533" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1550834" />
+    <Blob Hash="f4e30e065aa0b5d51f9ae847e47ce1c27b455533" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670066" />
     <Blob Hash="f4e33c2bf1dcd52fab934aecf0524f3795e1d051" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="660232" />
     <Blob Hash="f4e7f01e04c5e470c827d6068a60ed2aa43f0158" Size="32" PackHash="90c8015517183b03f2335aeb64b6dcfbcefb245a" PackOffset="2096886" />
     <Blob Hash="f4e86423bd0edffd07b69b6d8834e28890a433bf" Size="200" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="628707" />
@@ -65020,7 +64857,6 @@
     <Blob Hash="f4e94bf10c639d6d3c4caebab057cfa10321620b" Size="7320" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="15320" />
     <Blob Hash="f4eaffc0afe6a1ea19490cc1c8d775369253b6f0" Size="818" PackHash="afc7d2d97d5bc347d05a6d7ab7da026de3ba76cf" PackOffset="2084952" />
     <Blob Hash="f4ebe7806e327903a24d6b17ac8dde3074c67c61" Size="117590" PackHash="eb99415493e5381c13e50fa8f0489605564eb924" PackOffset="1040787" />
-    <Blob Hash="f4edcd97dbc115e48adc31fe20aab22dcd98ab7f" Size="3381716" PackHash="17e079cf6fae4bc6d6163dd5edd4046fc95f5e90" PackOffset="8" />
     <Blob Hash="f4f56abf95033d940f420a86d1e025d21af91cd7" Size="3190" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1048552" />
     <Blob Hash="f4fb54b0d1cbe4001dbe9bd04c5dbf92d6b85726" Size="1021" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1794905" />
     <Blob Hash="f4fb646e9df7f0bb9e9090e8c13421bef99fb23d" Size="26587" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="26990" />
@@ -65028,7 +64864,6 @@
     <Blob Hash="f4ff389ec468f53203a5c9e5ff283757c108e320" Size="3651104" PackHash="fd8acfaccbe92e438f97ccef8d52763653f87e06" PackOffset="8" />
     <Blob Hash="f502bc21028ca61d841dca86a9d2a4f4a8ea3e09" Size="3131" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="677977" />
     <Blob Hash="f5068ee3e964d3399e23c1c8c3f064c9d21f1d59" Size="120" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1177800" />
-    <Blob Hash="f5093cadc43e3e86f4ff524a3047533276504c46" Size="2009088" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="8" />
     <Blob Hash="f50970038eb41ad17bf5aa5623e3e0edcfec5280" Size="8556" PackHash="6eaecfaf3b8a26376389eeff13e1ffeb96e5431b" PackOffset="8" />
     <Blob Hash="f50de9b3b29e152c83e889d52c9a2f232f48afe6" Size="30261" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1364542" />
     <Blob Hash="f510167da18ae75143edaa9543f80f2b54b8fc6f" Size="2302" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="716510" />
@@ -65039,14 +64874,15 @@
     <Blob Hash="f519c84f656b3e130a9f44c0d0262d1b69bd1020" Size="142" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="446925" />
     <Blob Hash="f51b69f13856671dc7c2f977873b5fd115d78bf5" Size="4274" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="766049" />
     <Blob Hash="f5215f5da87ca8d28ada3467e77fbd4615ef544b" Size="7122" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="701457" />
+    <Blob Hash="f5232953c5c99e7bc7dcd44c597e72f0d51ae305" Size="6342896" PackHash="330e64b5f7567976462e74568de8be1934ddc891" PackOffset="8" />
     <Blob Hash="f528794e7d532f82344f67e4fea9c9d6da38a66b" Size="3524" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="1185085" />
     <Blob Hash="f528e4ca19a4b796cf6cedd5fa53d49056d0c8c6" Size="222346" PackHash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" PackOffset="1696989" />
     <Blob Hash="f529304670625530ed999d47cae0489177aef5d3" Size="695" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1309861" />
     <Blob Hash="f529b21cf1727c35ec815d4d7577f89f9589466c" Size="1004" PackHash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" PackOffset="1563885" />
     <Blob Hash="f534f0336815a243db17890bc3801e47a671d116" Size="16082" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="708685" />
     <Blob Hash="f53735bd6ecff9b522c998b988a4fc30d5d51f99" Size="203886" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="8" />
-    <Blob Hash="f541b76e31b1e131101f404333885cb3126b2816" Size="1147782" PackHash="457f08cf6e7267642fb2b30cb96d308d833bab83" PackOffset="8" />
     <Blob Hash="f544b5eae64164ae456fd401c853cbd6db983fe0" Size="88565" PackHash="c9141a8706b7eb2ff946f0351d5d52064ac8ba83" PackOffset="973818" />
+    <Blob Hash="f5503204de0dfb9713aa60cebfefa0359e308154" Size="6360168" PackHash="e4426e9e05d6ae5c12368727cd2d8a44d78f78e8" PackOffset="8" />
     <Blob Hash="f551132462551a84d79ec6c90f4943dbc947c7aa" Size="1288" PackHash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" PackOffset="142420" />
     <Blob Hash="f55145b473ddcae38a0f7297d58b80b12b2a5271" Size="307" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1036325" />
     <Blob Hash="f551a326e4c945bd41885cebe17b75431a9d1fe4" Size="67" PackHash="57019fc7372c7e79abe15599794c8e92d18430f9" PackOffset="2096991" />
@@ -65055,29 +64891,29 @@
     <Blob Hash="f558feb4ccf410455a613d7cfc72938d0d9869a9" Size="462848" PackHash="e8c3e90942a5b288720c462500e119088f07598b" PackOffset="779413" />
     <Blob Hash="f55aa4c88f35b8b3181b4423089d3bbde135f460" Size="23594" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="1258539" />
     <Blob Hash="f55df6f1df46173488fe98a42b52b74fbb6c933d" Size="176" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2086176" />
-    <Blob Hash="f55edba1e6dcccefcfda23fce28ac6180c139111" Size="4026" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1169741" />
+    <Blob Hash="f55edba1e6dcccefcfda23fce28ac6180c139111" Size="4026" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1614572" />
     <Blob Hash="f56138fd5b595c5ade5e5982bfc54d88d5688af7" Size="5289" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2091502" />
     <Blob Hash="f5622fbb32105bd6c76bb90419803208e0e97a53" Size="2550" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="2088077" />
     <Blob Hash="f563461e571b64de004e3bdc916a80b26c9a3a8a" Size="21066" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="750640" />
     <Blob Hash="f5648d6cf34fa26ebe023931895786b80a990f6b" Size="173834" PackHash="efad2bae9ec0727a2d14a2090060a47d4adbe4e6" PackOffset="128747" />
-    <Blob Hash="f5661093f5519088eb6e71ea15471ae522178766" Size="2974" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1032519" />
+    <Blob Hash="f5661093f5519088eb6e71ea15471ae522178766" Size="2974" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2080495" />
     <Blob Hash="f571739234b27eebe4ce57b17155094fd484ef95" Size="15843" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="2020733" />
     <Blob Hash="f5797d1cbfcb6c773919fd721d38a0ca8acb3834" Size="1716" PackHash="8bab80222f715ab94f8d05c0ebee0f2cd3503620" PackOffset="2079752" />
     <Blob Hash="f57ad61da553685421740cc416329b1816e2fc1d" Size="22760" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1762148" />
     <Blob Hash="f57d8f0c303c6dc5f1ed4cc135c2b9411714594f" Size="2208" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="1931246" />
     <Blob Hash="f5839b43f1dba4532eab24087c24337fb29cda73" Size="133558" PackHash="ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" PackOffset="1521480" />
     <Blob Hash="f5847f3eddfd17da22e6ed94f4d58b6564257002" Size="520" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1681144" />
+    <Blob Hash="f584d8f0c66114e83d0dd29a11c2e8b79eeabb75" Size="188928" PackHash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" PackOffset="1675912" />
     <Blob Hash="f58690f7e299afa35c4418f0831a3521ec059b27" Size="2069" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2024361" />
     <Blob Hash="f586a63ab365fd86f029d4f3e37656e379e3a0d7" Size="936" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1627376" />
     <Blob Hash="f5871997c51c140a02f8a9de8a0934bebc479529" Size="102915" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="709751" />
-    <Blob Hash="f58772c14918861a9c36bd54b271db0463040147" Size="6756" PackHash="511aea04a7efe620c37f248dbf89350d08cbb236" PackOffset="2088434" />
     <Blob Hash="f58871002d9a9016e31fcb9187d7c13d6b66fb1b" Size="38047" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1135105" />
     <Blob Hash="f595aeb61b9b143beedf32bbe7746c58428edbe7" Size="3508" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="2092521" />
     <Blob Hash="f599aa72191a2c8f1046191f3430be6e80e0c143" Size="149408" PackHash="395bcff4c0379541dee0b4bb0deb1828a686acac" PackOffset="149416" />
     <Blob Hash="f59f18916e8054f15e049dd7d7868d14149c1e69" Size="4020" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1561371" />
     <Blob Hash="f5a0f55130eee5dad18f8a93025418a5d209e04e" Size="4598" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="660432" />
     <Blob Hash="f5a52e4592d348594d5d5fcd598a7ca88bd428bc" Size="224" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2088364" />
-    <Blob Hash="f5a5d28acef464625cb6dd7ec68da5005ce2b5cf" Size="680" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2095486" />
+    <Blob Hash="f5a5d28acef464625cb6dd7ec68da5005ce2b5cf" Size="680" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2093829" />
     <Blob Hash="f5a722d35546e7c7b2487b8a74195ee06673f6ae" Size="4016" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="103124" />
     <Blob Hash="f5a7b55125dd184f4ec762191d419d739f8eec24" Size="5607" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1753605" />
     <Blob Hash="f5aa3e63d42a2cf0a6efc56849b339f2f3cafdcc" Size="9404" PackHash="a9c62ffacb1508452705b057c5f796573d47c78d" PackOffset="1988471" />
@@ -65095,7 +64931,7 @@
     <Blob Hash="f5c478d68d9a2d2666d1960f872ca7415eac1c2c" Size="35570" PackHash="12700562edf1958605de39804423cefb61998935" PackOffset="2009224" />
     <Blob Hash="f5c5769088621e4831ee1598ec9e0b388bea701a" Size="89343" PackHash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" PackOffset="712691" />
     <Blob Hash="f5c8307828f7bceb20845d70bc819a3122536786" Size="130017" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1792150" />
-    <Blob Hash="f5cafe2c59d4bd80719cbed13b7c9d5a1ccb31d5" Size="4082" PackHash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" PackOffset="2003612" />
+    <Blob Hash="f5cafe2c59d4bd80719cbed13b7c9d5a1ccb31d5" Size="4082" PackHash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" PackOffset="2062168" />
     <Blob Hash="f5ce54898deeae21dd0e64e492d436d491a0d40e" Size="4683" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="934219" />
     <Blob Hash="f5cf765809849e21feed1af02f7bd05e325092af" Size="140758" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="8" />
     <Blob Hash="f5d1894e4e6d1c844f37d047eb6c5f3ea8e4a285" Size="1750" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1487795" />
@@ -65112,7 +64948,7 @@
     <Blob Hash="f5ec9f1bc937fd7cc3d1f219753d3b741b1f2b20" Size="3380" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="348356" />
     <Blob Hash="f5efeb7cfddb83458801e6aa662949a81e038199" Size="79550" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="89193" />
     <Blob Hash="f5f2989657b4aa66112685930f524235fe59b3f4" Size="229" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="425204" />
-    <Blob Hash="f5f5d562e922e13774a97ba9524ae28afe1137e3" Size="1075558" PackHash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" PackOffset="8" />
+    <Blob Hash="f5f5d562e922e13774a97ba9524ae28afe1137e3" Size="1075558" PackHash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" PackOffset="8" />
     <Blob Hash="f5f8b372d691ab484c00e408d84729657a2de932" Size="29846" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1835210" />
     <Blob Hash="f5fb1c14ad3d5c4e2a77b5903f8a71c7ce07335e" Size="116" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1696500" />
     <Blob Hash="f5fbdfc471ddac74c4026a5b1c86af95990a267f" Size="382" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="578002" />
@@ -65121,11 +64957,12 @@
     <Blob Hash="f60250e240a92bc6e66e17fa2f62bb919ecc8d15" Size="100" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="877972" />
     <Blob Hash="f602999d0b5b124ee398d39d9b5fb3c6af207cd5" Size="160" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2095776" />
     <Blob Hash="f602fef16d339088a3306d5fbc35a7ba96600bf1" Size="4647" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="2085408" />
-    <Blob Hash="f603227f3f14b39a9fa6ba156699a38d903ee7fe" Size="130" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2093533" />
+    <Blob Hash="f603227f3f14b39a9fa6ba156699a38d903ee7fe" Size="130" PackHash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" PackOffset="2096992" />
     <Blob Hash="f607d21e4c6478a06cb62626dd9dfeef7a12d154" Size="1480" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="429383" />
     <Blob Hash="f60a6dcfadf78206aa1f5f438ef179f022bedf36" Size="3126" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="656264" />
+    <Blob Hash="f60b19a9c532c72255e24b6aca0dc4aa2eb3c8ee" Size="2410" PackHash="8c5c5245525609628442a9e4237db8a60ef59d6b" PackOffset="2093952" />
+    <Blob Hash="f60fcd1978a0798d26d82223b75b07f5fa178e55" Size="1031" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1748271" />
     <Blob Hash="f618086f2cca116c3c796f9f464e236b44343499" Size="31430" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1787172" />
-    <Blob Hash="f618da1ec51023559f8ff07f4c881923853b236b" Size="107621" PackHash="ea39a3af16b4dc43d157490fb9de27c641489d45" PackOffset="8" />
     <Blob Hash="f61960151b03db2623f7d8be3220d8137675a503" Size="2377" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1909183" />
     <Blob Hash="f61b16fb2ab95295771c22c31b99a60a183cdd08" Size="793600" PackHash="0c845e0f8dc0189835418f168dfb653326459528" PackOffset="1191432" />
     <Blob Hash="f61b941eb450400d51c0cc54e2edbeaed82a1747" Size="225" PackHash="9b51b399a29e0def63d28a68058488c252a00093" PackOffset="2096676" />
@@ -65133,6 +64970,7 @@
     <Blob Hash="f61f14d389484ecad8c9cf8cf2321882bb4947c5" Size="13312" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1408008" />
     <Blob Hash="f620d19630f994b306621da690842938df7a2eb5" Size="4608" PackHash="a1820034a04f046e5f0c74444f653ee4869647c6" PackOffset="2089480" />
     <Blob Hash="f620f34345d0b8efe9c8ef94bf579c53e002e0f6" Size="35173" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="623641" />
+    <Blob Hash="f62df376c71ae7bd0ef88b8591da74550c5d5af3" Size="1054" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1744780" />
     <Blob Hash="f62f0d98f8b1d7530413574a0fbc0f58e5f0a1f5" Size="221133" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="8" />
     <Blob Hash="f6360a03365b63b90d46d9b0d8bb84502f8c42f7" Size="6697" PackHash="ebe839f7685330c322237d33a6419b873e606b97" PackOffset="2076075" />
     <Blob Hash="f636373fef2a29c1a0d87981bc50838f19b049e6" Size="9088" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="677441" />
@@ -65143,7 +64981,7 @@
     <Blob Hash="f64247ac1d5f9cff80ee8c8f74af434580333bbd" Size="3072" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="811719" />
     <Blob Hash="f64375746b2cc07a92c97b320c185dedc25e4003" Size="36133" PackHash="696aa11a029bfeebe1885750c0a1219698f45667" PackOffset="2044023" />
     <Blob Hash="f6493d6ab3777614bdd4e60aa5efc2cc4113a77b" Size="2803" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="73890" />
-    <Blob Hash="f64cf50b5cb9590ce042301882a622ddb7e4dd0c" Size="4158" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="2028578" />
+    <Blob Hash="f64cf50b5cb9590ce042301882a622ddb7e4dd0c" Size="4158" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="2084836" />
     <Blob Hash="f64f942e5bd00736002de100fb76103167ae0b53" Size="861789" PackHash="750c578aaeae3cfd3e71b997fa330412029385af" PackOffset="8" />
     <Blob Hash="f65156fc975ac16f4ec9eaff9fd655a2be5513da" Size="92" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="305420" />
     <Blob Hash="f6542c0b7882e6de622684dda25d6eadf16ef6f3" Size="164" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1767780" />
@@ -65166,22 +65004,20 @@
     <Blob Hash="f683e24d4a8168ab8f27582c756b3892a4bd370e" Size="12691" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="509600" />
     <Blob Hash="f685c6933e4014c414bb3aae56bfd9134477f2a7" Size="301570" PackHash="46cacf33335ca2ec60df0c71cc36af0602ca8bfb" PackOffset="1247070" />
     <Blob Hash="f687f5678afbc201b487d8f780b598ba812c97cd" Size="3578" PackHash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" PackOffset="216358" />
-    <Blob Hash="f68ac56ce5a7cd14eaa9f8c459ad1ad0d49632b8" Size="8093" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1520616" />
-    <Blob Hash="f68bc84a0982f1d774487995b8ce1d8127a36c80" Size="191576" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="396296" />
+    <Blob Hash="f68ac56ce5a7cd14eaa9f8c459ad1ad0d49632b8" Size="8093" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2057698" />
+    <Blob Hash="f68bc84a0982f1d774487995b8ce1d8127a36c80" Size="191576" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="1771016" />
     <Blob Hash="f698d1dbca8a533af19b11a5ab64577db75a3085" Size="7892" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="250656" />
-    <Blob Hash="f69a58e383c49c3ba90ecc0a15cad2d419710028" Size="2162354" PackHash="0a8122b365f1bbccfbe9f252e37c57af95994f01" PackOffset="8" />
     <Blob Hash="f69d30e215c67a72fdb2ff147951aa46191a4e4f" Size="16" PackHash="58bb811a92e5fad1f466600ef7090371417a97d4" PackOffset="2096643" />
-    <Blob Hash="f69d68eb2cef36909500cfb01180714a2efa6a10" Size="3465" PackHash="7c2047a9f8a2b1b27d81d480322719be3beee151" PackOffset="2089891" />
+    <Blob Hash="f69d68eb2cef36909500cfb01180714a2efa6a10" Size="3465" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2083780" />
     <Blob Hash="f69dffc8d8f40a6c9decd6a9650b4d03dfee8496" Size="4668" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="2058510" />
     <Blob Hash="f6a4c75f54b6136404dde019bd879b82ffdcc392" Size="571" PackHash="62a612311b83947e270bcd148b35479897bd9321" PackOffset="2094945" />
     <Blob Hash="f6a60c44194ab058468aa6ad8f54071eb643831b" Size="1187" PackHash="89d6a274ea3b011104233d725db1edddcc73976e" PackOffset="2090288" />
-    <Blob Hash="f6ad8764533331da787fcce4ac33914994de958e" Size="81324" PackHash="b88c02646bff51270468e11717b11aca34a7c3df" PackOffset="1943388" />
+    <Blob Hash="f6ad8764533331da787fcce4ac33914994de958e" Size="81324" PackHash="98922b76de577c0692cc3f9ed52688544494e6a9" PackOffset="1967416" />
     <Blob Hash="f6b0186ca07f5439ca6cfdae1d67b1f8e6e9937c" Size="44961" PackHash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" PackOffset="238910" />
     <Blob Hash="f6b1eb0b3aeea4e41329f57e4b90ea1c2290796a" Size="18780160" PackHash="b042b9c37ed1ae3a6d638ccce8f9a4c58c0eec12" PackOffset="8" />
     <Blob Hash="f6b294e3e395fe4cb2530603c73888a4e36d315a" Size="352" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="837650" />
     <Blob Hash="f6b56223e8d7ed3131d97239e0e5a1895f4340c5" Size="106400" PackHash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" PackOffset="1204828" />
     <Blob Hash="f6b77bace202ad2f86d1578944d3bf2d23eac315" Size="32256" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="2055688" />
-    <Blob Hash="f6ba632481d0f4b13d8ae638305c53e1c54dba36" Size="3999984" PackHash="abddcd43df64c1705d665f6ae146d8506d6d014a" PackOffset="8" />
     <Blob Hash="f6bc4786ebf1534b1c91bbbba429936ead2d85ce" Size="20536" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1171957" />
     <Blob Hash="f6bcb04c355db4a5a3bb60d01f464a164f7dd08f" Size="5363" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="732568" />
     <Blob Hash="f6be24f83acaa8f5167346275fe9865f3c65597a" Size="2542256" PackHash="007491dae0c56c74ca78a46639d8e41243bde83f" PackOffset="8" />
@@ -65191,30 +65027,29 @@
     <Blob Hash="f6c7345666d946c459a2475fa9368985ed783abd" Size="5192" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1435320" />
     <Blob Hash="f6c75e22cc52b5e8fadcce88d4285a024a6b935c" Size="8014" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="148346" />
     <Blob Hash="f6c79ced365e18711e3767990e472d4f388e6c63" Size="3826084" PackHash="3b5feab7a5f46b3129c78ca6512692588d73eb8a" PackOffset="8" />
-    <Blob Hash="f6ca401750b1ca6d0bd9f3b0f9fa256d29f6cae4" Size="17325" PackHash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" PackOffset="2079558" />
+    <Blob Hash="f6ca401750b1ca6d0bd9f3b0f9fa256d29f6cae4" Size="17325" PackHash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" PackOffset="2079141" />
     <Blob Hash="f6cc51f68613499787e5aefd48ccafab002155cf" Size="431244" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="217983" />
     <Blob Hash="f6d6d8ea19596405246740092bd5f48406b02a30" Size="9201" PackHash="32a83d508234ffa544d0570813e08e4f8b6379f7" PackOffset="2082080" />
     <Blob Hash="f6d79feda640feac585e532f716e60e318ca5ba7" Size="5239236" PackHash="c7945d9532844fa35363f33da23f208a629dbe28" PackOffset="8" />
     <Blob Hash="f6d8942488440dcd5e34d513764277bec6a83333" Size="355328" PackHash="805c8b99da35c0a5a3743027e53205e387dd2d35" PackOffset="1507848" />
+    <Blob Hash="f6d8e858e69737a26c8e06ea1495112468d2798d" Size="1002" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2096108" />
+    <Blob Hash="f6da0c537b66378881e821ecb1d6f23b3c2d75a7" Size="3151424" PackHash="4e809f7c14c90f21f08abe4352eb6d75bec9eb6d" PackOffset="8" />
     <Blob Hash="f6da29c4c81cffad21b966ce1c5e4fe9f1d2c9b8" Size="2967" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="778548" />
     <Blob Hash="f6dbbf56437656fddf1cbf0974012a55c2a8840c" Size="4302312" PackHash="1bc75b138126eb6bffa66cec63df9c4872d65754" PackOffset="8" />
     <Blob Hash="f6dd31fabc8251f833edc06097e3dac38d91084d" Size="343200" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="8" />
-    <Blob Hash="f6dd644600842269ec63a2fd45f65f8e36318487" Size="543" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1814266" />
+    <Blob Hash="f6dd644600842269ec63a2fd45f65f8e36318487" Size="543" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1933498" />
     <Blob Hash="f6ddf022bec856ca4975d0f131fa8a7be3378f6a" Size="2447145" PackHash="e5f886b63f8e94259869c980cb3640bca69cd1ba" PackOffset="8" />
     <Blob Hash="f6e07177b0ea7a39b0bbc075103eb6ab65e0f399" Size="6712" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1263056" />
-    <Blob Hash="f6e1647811eb9e4bb97595a6013d2833f75a834f" Size="1008" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="1746554" />
     <Blob Hash="f6e37d2e04fab4b0edc5c5d93cec828c41d71766" Size="28468" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="1170722" />
     <Blob Hash="f6e41b1abad60a5c69f346cab5ee3d3bcba18ced" Size="12298114" PackHash="8faa0e68af7917cbb5ccd56bc9ddcf4bf32ff69b" PackOffset="8" />
     <Blob Hash="f6e53c64a3501a81c07fe4913016e62f12f3f385" Size="38247" PackHash="3b0e0c4bd52690f4741e854022821b13dce84e59" PackOffset="8" />
     <Blob Hash="f6e5543dc3e399cac7d7b8d274ee08c2773ac1fb" Size="23040" PackHash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" PackOffset="2021130" />
-    <Blob Hash="f6e6433a4d2eb24211d8e1440b38bd2b6394f816" Size="14448" PackHash="2f18ec8e0e1dbc7574497b45571454da261d1b6e" PackOffset="2065520" />
     <Blob Hash="f6e86e762f3e6809b80562b650580ee1b4b50692" Size="119" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="201192" />
     <Blob Hash="f6e8dc29db908f618d0d5e2be7d11d6a9c79ea27" Size="24258" PackHash="6127c305de0e48f8d5572ec15328dbfc52bd989e" PackOffset="1335619" />
     <Blob Hash="f6eb052275ed6a541dc575cbc99df53f91a6f6b7" Size="25331360" PackHash="1a365e1f07de990dfc7f2957f5ea81e236f7559a" PackOffset="8" />
     <Blob Hash="f6ed52ef769df2c015c181bcff3dc0e24497c768" Size="7226" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1589674" />
     <Blob Hash="f6ed7870ef80f92ff0338f14646849b658c12ee2" Size="6144" PackHash="980f3e90adc8557d71bfbef57bc146374612493f" PackOffset="2087944" />
-    <Blob Hash="f6eef7ba8e3288985761a8cdf3438fbabe649d55" Size="308" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1822645" />
-    <Blob Hash="f6ef54e8fe7ca95f6c69d2b8771158fb9167ab61" Size="244120" PackHash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" PackOffset="1569800" />
+    <Blob Hash="f6eef7ba8e3288985761a8cdf3438fbabe649d55" Size="308" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1941877" />
     <Blob Hash="f6f160abccc35b70066df8fff8a93224be739c68" Size="78418" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="1804260" />
     <Blob Hash="f6f3037b751e06cdbc625ffba05c8eae22b02334" Size="7656" PackHash="c9f7bd390be6e2f50469fcf024ace928b624a38d" PackOffset="1407072" />
     <Blob Hash="f6f52cb83f34e846db7c044e0aead22efa2d1754" Size="290" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="437207" />
@@ -65228,7 +65063,7 @@
     <Blob Hash="f7108b3dd44cdac588285b8ee53dc259ccb9771f" Size="20525" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="2073175" />
     <Blob Hash="f710f0a44dcbc7f52d0aa9e87e5b85d56e39adff" Size="8607" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="626016" />
     <Blob Hash="f710f3800aff7ede24e45a396074a45d72a460e0" Size="116762" PackHash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" PackOffset="1465021" />
-    <Blob Hash="f715d8c0c2227937e3364b0e458c805e7e2a1ba2" Size="1585" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1015196" />
+    <Blob Hash="f715d8c0c2227937e3364b0e458c805e7e2a1ba2" Size="1585" PackHash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" PackOffset="2062713" />
     <Blob Hash="f71d823ac66bfc20cdf81333eaffb224b816de7b" Size="7160" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1785359" />
     <Blob Hash="f7205e6263254ee48587b664a33220b6990c5829" Size="131257" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="1817258" />
     <Blob Hash="f72199e353e180541672f9785e3ce860295c9850" Size="15944664" PackHash="897ac4c4e39fdc38ae3b8bc59a7c8331407908a2" PackOffset="8" />
@@ -65267,15 +65102,14 @@
     <Blob Hash="f7787e1cfd37d8e53b2eb7b6b1fe377c3b864f21" Size="10075" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1676325" />
     <Blob Hash="f77b96ae0349b102f44e6b8c62d1174dead3c3a0" Size="661" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="1984680" />
     <Blob Hash="f77c7ff7522592e71094e690a2a9afc30f8a77c4" Size="181034" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="954375" />
-    <Blob Hash="f77e50e28ac1ff90d5a1b46f9c9bb989b72e55bb" Size="7337912" PackHash="9afde1c562c28e9af974789939bd641f801fef38" PackOffset="8" />
     <Blob Hash="f77f8d1f42008770a6ff1f5097c863ecf482bebe" Size="257" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1044680" />
     <Blob Hash="f784fee9b062aed8cfe9c13943da4dfa1cb3dd5f" Size="704" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="2079054" />
     <Blob Hash="f787c61681a47925b8d33faa5b3e8c49ab61423d" Size="9264" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="630336" />
     <Blob Hash="f788ea4ccb716095bfea4f6cca9f2c15d5636168" Size="658" PackHash="57879f40e9c9382403204bb281cfc94a7148ea32" PackOffset="2096477" />
     <Blob Hash="f78d208a7c9d9080ece93458a53b106b9a845cc5" Size="1120" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="771608" />
     <Blob Hash="f78f2fae33324f6320d93832d62e598a046899b0" Size="3523" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="315606" />
-    <Blob Hash="f79171db8f6f25b267ba7b2d38a3f4cd0c8480da" Size="3577" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1267457" />
-    <Blob Hash="f7918d6e680837525625a3e0db409166a2d5481e" Size="150" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1602487" />
+    <Blob Hash="f79171db8f6f25b267ba7b2d38a3f4cd0c8480da" Size="3577" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1716359" />
+    <Blob Hash="f7918d6e680837525625a3e0db409166a2d5481e" Size="150" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1721719" />
     <Blob Hash="f792d39f04c92c3aea341c97430bdeb9610fd01b" Size="10104" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1375926" />
     <Blob Hash="f7963e57969bf28a994dc7eda4ccb9ee35ba6275" Size="49" PackHash="efe81a03fc4e327388573f361faff5b233243834" PackOffset="2097091" />
     <Blob Hash="f79908a2c41ce949678c9b0861827d237d962923" Size="3606" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="248567" />
@@ -65286,11 +65120,9 @@
     <Blob Hash="f7a1b6a00418197f5c00419e4de30d10adfa65a2" Size="18724" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1158700" />
     <Blob Hash="f7a2b47802aa9a1cb27cf7db4dfe27121056490f" Size="14130" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="1330669" />
     <Blob Hash="f7a51bce558133b94bb384f5d500b25ab5ff9d24" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1763759" />
-    <Blob Hash="f7a6834b856819119f7802e9315766325093774d" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548986" />
+    <Blob Hash="f7a6834b856819119f7802e9315766325093774d" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1668217" />
     <Blob Hash="f7ab1cd7b6adafa2d0e20a37a60d33e57dcb9f47" Size="7162" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="590244" />
-    <Blob Hash="f7ae65b0b74b4b892079f335bdea92ebd2dcdcbf" Size="1803480" PackHash="a61134b7a1700b0b5382c542f42c22afc23a614a" PackOffset="8" />
     <Blob Hash="f7aea0ec1321b83733838789b81e4dd90ab062dc" Size="2171" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1827938" />
-    <Blob Hash="f7aee623d7d7510fc38991f80f54b08b884ec2d4" Size="8643" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1781862" />
     <Blob Hash="f7b4e8fbf596d08edd9cbf1922e3611d051f1bcd" Size="1963" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="347205" />
     <Blob Hash="f7b711b14ebf4c65af2661a9c66cddb70eb5665b" Size="103573" PackHash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" PackOffset="249591" />
     <Blob Hash="f7bc0c9cb7afa907cf3e5205b160e2671d2d9d5f" Size="259233" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="816903" />
@@ -65305,9 +65137,10 @@
     <Blob Hash="f7cea00d3f5cfb75fef9ab31f0996145603de394" Size="718" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2094898" />
     <Blob Hash="f7d29029595ec6c3f2f1dd6122c42985dbbc1019" Size="11664" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1796940" />
     <Blob Hash="f7d2f60e5e7e0a1059510c48ab6dc94335ba93c4" Size="785548" PackHash="e3756b62507729b3cf51da27d96bd45a378c0531" PackOffset="767422" />
-    <Blob Hash="f7d45443f075b1485f4e41ca6df92df2da5117f9" Size="4299" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="2092580" />
+    <Blob Hash="f7d38dd68f8ed4897893ddd948b804c50ea891d9" Size="3036792" PackHash="685b982958b91b7ed666912242e29409757e4a76" PackOffset="8" />
+    <Blob Hash="f7d45443f075b1485f4e41ca6df92df2da5117f9" Size="4299" PackHash="d536615385fc73d5d76eb52b64f32f86de50abf3" PackOffset="2092790" />
     <Blob Hash="f7d71cb2d1706197b7211a3d113ee024826277a2" Size="92" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="815188" />
-    <Blob Hash="f7d77bed30d2a097465a18c3182490e5550dccc4" Size="104824" PackHash="c84b44b945a2dcafa8c20388f4678102922c96fb" PackOffset="1953082" />
+    <Blob Hash="f7d77bed30d2a097465a18c3182490e5550dccc4" Size="104824" PackHash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" PackOffset="1956512" />
     <Blob Hash="f7d94388da201749c6af8b4c9d1aa66a69932443" Size="45273" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="1766053" />
     <Blob Hash="f7de009d41f3938b908516b5dd64592873ed7a1e" Size="2818" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="2093283" />
     <Blob Hash="f7e107f6be024822a45561fefdbec3c5f98831e6" Size="4179" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="977815" />
@@ -65317,10 +65150,10 @@
     <Blob Hash="f7efc154d1edf022d013ff7f267ecf16aebc3572" Size="104" PackHash="5983c069abdec3469db5b5874ac27c17341e3f27" PackOffset="2097031" />
     <Blob Hash="f7f23668a871e984cd3b64a7f7d3b9564c1a0a6f" Size="617568" PackHash="a254346aaa6d6c11dff58237f854fd54055340e3" PackOffset="403580" />
     <Blob Hash="f7f2b2dc571d41be89f0c563400fa6b5657368b0" Size="22" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="1070690" />
-    <Blob Hash="f7fa6e37f2c102f719c6e1fbe948e6361efacdbc" Size="763" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1469960" />
+    <Blob Hash="f7fa6e37f2c102f719c6e1fbe948e6361efacdbc" Size="763" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2007042" />
     <Blob Hash="f7fd44c1da717d0acc5f7a4caf490a0959565128" Size="8302838" PackHash="53514458563ef2e91951682daf78605be7ec7265" PackOffset="8" />
     <Blob Hash="f7fd94c5efd1f11e8f0b26f7e23bfb40646d00ca" Size="50644" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1834392" />
-    <Blob Hash="f8010f290a4e35c3f5db7ef111a28681730d69d1" Size="9" PackHash="75d94b2db0814fd1ee724bb6ea943343504ab08e" PackOffset="2097149" />
+    <Blob Hash="f8010f290a4e35c3f5db7ef111a28681730d69d1" Size="9" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2097127" />
     <Blob Hash="f801765fca55517d5263a59a9ca19715590dc8f6" Size="82772" PackHash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" PackOffset="1693754" />
     <Blob Hash="f805babc993e5d249bb3dcfb12f771872fb5d00d" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="180189" />
     <Blob Hash="f808183d52fdc4998c4eed5cfc6be28e5bfda048" Size="327506" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="1260214" />
@@ -65328,15 +65161,15 @@
     <Blob Hash="f8112565817277081833c0d537cc7306aa7bce7c" Size="112" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="1706080" />
     <Blob Hash="f8135a19ab3dd88c4e0157c64878495607852267" Size="4513" PackHash="43de67a97c49441e26fb689fad4850f919826430" PackOffset="546885" />
     <Blob Hash="f8165cfcc6a692f6bd2abb2335e0765f22cbe076" Size="22580" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1395776" />
-    <Blob Hash="f818a2e00f55d3a2c60a71a83c1d69106ccafcbd" Size="11733306" PackHash="91e7646f7ec4f2b5c2cbb7b7a31f9a9164d2ff97" PackOffset="8" />
     <Blob Hash="f8220e49c24fd3065dd35aeb29b65524fb3f5c88" Size="1468" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="998563" />
     <Blob Hash="f82493ec2f72d2a0e50a128e8c81b3a7d274d8d7" Size="18723" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="441872" />
     <Blob Hash="f828380697e81da2eaa86db7f9745eed85c49e48" Size="1636864" PackHash="409e09bd60df0765b85577118bd3da12988d97d9" PackOffset="86024" />
     <Blob Hash="f82a8726085085f3f899e2960e4f5d775afaed80" Size="2295" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1066887" />
-    <Blob Hash="f830328d722188485d4933308e70b450162ce525" Size="917504" PackHash="2854aedc376dafec24036edbed9ab3936af9de1a" PackOffset="8" />
-    <Blob Hash="f8377bb371b94784cbcc2214de978c56fd4d59d1" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548383" />
+    <Blob Hash="f832c907f5a3a79040a37c31b3211046f566ea0e" Size="18582848" PackHash="d30350abd59a79249d9dd69e8b8a8f9bfe865b86" PackOffset="8" />
+    <Blob Hash="f8348cd95cce95f071df01cf14fde77d099a94b7" Size="2326" PackHash="24a97e6871f2aa25a14bbebaac9737ba82af5402" PackOffset="2092168" />
+    <Blob Hash="f8377bb371b94784cbcc2214de978c56fd4d59d1" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667614" />
     <Blob Hash="f838230ea95dd41b807cd6fe7dc5f6024e0347c7" Size="31593" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="2049141" />
-    <Blob Hash="f838981aaeae17acefece826f802b672734a5fec" Size="3257" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1163226" />
+    <Blob Hash="f838981aaeae17acefece826f802b672734a5fec" Size="3257" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1599842" />
     <Blob Hash="f83ba252f540afed27adebb2b2a91dbd4a6d8531" Size="13001" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1822688" />
     <Blob Hash="f83bd45f468f154c30344657361d8943f8528643" Size="1346" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="80743" />
     <Blob Hash="f83d2c55aab7351f978bb6cd72ec29096426ce41" Size="4899" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="1054814" />
@@ -65385,13 +65218,12 @@
     <Blob Hash="f8c3d2421eaa93adf1e6c6c1502b0524efea9c2c" Size="11904" PackHash="0bea8e482197a9378d1256b0989c1af440e374f1" PackOffset="2072234" />
     <Blob Hash="f8c6da65536c9f3c2fbec0471a2c49cea721a4a0" Size="81483892" PackHash="316a32005cd66f1ddd2eb6c26830abf3172031de" PackOffset="8" />
     <Blob Hash="f8c7b703fbe31d95a52a51e3bba72259df113d2c" Size="29760" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="519788" />
-    <Blob Hash="f8cc955013faab8738861592f545319c814b6c52" Size="427" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2094762" />
+    <Blob Hash="f8cc955013faab8738861592f545319c814b6c52" Size="427" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2096244" />
     <Blob Hash="f8ccfef365a9c3491e1e966b6d9398b89132f83c" Size="7575" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="138263" />
     <Blob Hash="f8cdc4f1ae85f82c65e6ed312c6787c9c72de13e" Size="4029918" PackHash="8c6dbcbf73a2e52bdb5b7bbcc25220b9eb877871" PackOffset="8" />
     <Blob Hash="f8ceae415898c4f58e3c47dcfa0640835333d645" Size="2986" PackHash="945828f7f83b9b05d0957aa047f242d4112a9b98" PackOffset="289502" />
     <Blob Hash="f8cefaaf379e73e870917deea525601bd67bbdd9" Size="97538" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="228859" />
     <Blob Hash="f8cf00995de2472db51d83618f953ba06d8082e8" Size="83669" PackHash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" PackOffset="889842" />
-    <Blob Hash="f8d1b9fb5a5b24e8a7eb85032567f8be57c0d155" Size="5863680" PackHash="b0e4a0c468d151d66b427259f74d6e5b0ce68c81" PackOffset="8" />
     <Blob Hash="f8d8d7619bb7a37bd71eea8b2b42e9aac5ac97cf" Size="72090" PackHash="2e0afef87f6b885f43e2e523e9d575be251db077" PackOffset="71855" />
     <Blob Hash="f8db83697b139439df11ccf4c6940d3901ec8bf7" Size="4143" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1745410" />
     <Blob Hash="f8dc8d10c9528a1d6bab285d2b9e4159bb6be504" Size="3101" PackHash="f2e71a6b9591b5cc7b359bb30ddc78c580f95ad5" PackOffset="566836" />
@@ -65407,18 +65239,18 @@
     <Blob Hash="f8eb9882a03774d28f560b5fdad5598eaec6e296" Size="247446" PackHash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" PackOffset="708700" />
     <Blob Hash="f8edc5cd9e91f5ea1e987df33f71eec8953e312a" Size="154" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="560558" />
     <Blob Hash="f8eeab50008e1b2575e3087af427b37806db00b7" Size="3282" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="117305" />
-    <Blob Hash="f8eec2951b91339b3bf5b21fe7950e4002516961" Size="3177472" PackHash="65cfcc579154be9b61e9603dd360ddfdda570b6b" PackOffset="8" />
     <Blob Hash="f8ef991eb9f365d930516038ffba6bb0226f8dad" Size="18355" PackHash="b9800b6322b6876a322757cfbdb90ecb49858945" PackOffset="2028280" />
     <Blob Hash="f8f178591acfea75d6b4600b131fe4ff99c00107" Size="161595" PackHash="c322a9bf029413e79b8dc14f307972ccdbf0008f" PackOffset="714643" />
-    <Blob Hash="f8f2d7c3390598d60de0a707a1819b12794d535c" Size="254488" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="1815560" />
     <Blob Hash="f8f33455d74625938db84afc2199dce23513c9d4" Size="18962" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1702427" />
     <Blob Hash="f8f369d64e66a265af7483c7b556e7786203a7e3" Size="127872" PackHash="149605f77f4487d4f238f2439c46df83708b08f8" PackOffset="1968144" />
     <Blob Hash="f8f73aa038e49d9fcf3bd05a30dc2e8cbbe54a7c" Size="18624" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1193256" />
+    <Blob Hash="f8fa9c8a6bde9d91cfaf53cfc279000f78509220" Size="803538" PackHash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" PackOffset="1075566" />
     <Blob Hash="f9019fa053d8ea84505d30b311ad4e9f99b89926" Size="15445" PackHash="b3a131e81241fcdda87a935f92e30480eb562794" PackOffset="2078652" />
     <Blob Hash="f9039cfecda00a36b2f9c612727ca12f11bb82ab" Size="8652" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="463722" />
     <Blob Hash="f904062a0199392e697b58c5bf23f6ebaa0ddf1e" Size="827728" PackHash="58fbf77a55a8063016df0e403ca64af4d59383ca" PackOffset="8" />
     <Blob Hash="f9047ae4896860ca44faee2a47971190e780ab20" Size="341" PackHash="4b36367fd03125a5a975a5955dc1b8670235b24d" PackOffset="2095780" />
     <Blob Hash="f9109f8e204ea6626e2ebd449bdce71d535b893e" Size="136704" PackHash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" PackOffset="1463304" />
+    <Blob Hash="f910cd5afb9a2bda66716b8b28ad1fefcd1943dc" Size="4327760" PackHash="b200e0fa1669506d4ab45ff3f8830cab7de54f84" PackOffset="8" />
     <Blob Hash="f910d3d42e03ea5d8309a387311eb97c65898326" Size="10744" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="599584" />
     <Blob Hash="f9120285a6c72d36070935bc30df32afe9e1c51b" Size="153" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="610983" />
     <Blob Hash="f91247a2b6d180c46b1596cea8a5532a254c15ac" Size="874" PackHash="bc229af9ba3087733304662ecb6211f12696bff4" PackOffset="1606123" />
@@ -65426,18 +65258,19 @@
     <Blob Hash="f91ce133a4e8c9b91b5483e23e9893bfb32bdf3f" Size="6432" PackHash="435ce92b19f8c5bd8559b56b4d0d86c13523ac22" PackOffset="1744892" />
     <Blob Hash="f91f9b6053909cfde7e952ac86b837241d89c23d" Size="142" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="463918" />
     <Blob Hash="f9213cf13a54a6a24444160dacf033fc4fd8e9f8" Size="233" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="379988" />
-    <Blob Hash="f9281bf27064621edcf327275dc0b17a17245d51" Size="2753" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1612718" />
-    <Blob Hash="f9281ea0c56186cd57299d52442b752eec3c834a" Size="2122" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1255942" />
-    <Blob Hash="f92c3423eb9c6ee72275473ed31f40ceda165bf8" Size="631040" PackHash="90c54fbec497685a279ceb0cfc4a594f828a890b" PackOffset="1382408" />
+    <Blob Hash="f9281bf27064621edcf327275dc0b17a17245d51" Size="2753" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1628543" />
+    <Blob Hash="f9281ea0c56186cd57299d52442b752eec3c834a" Size="2122" PackHash="48ab20ce2eddbab298a957cf09a95b94f138c977" PackOffset="2095037" />
+    <Blob Hash="f92c3423eb9c6ee72275473ed31f40ceda165bf8" Size="631040" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="8" />
     <Blob Hash="f92e73810b353de09ca5e2ea5f4223a71896fd79" Size="1213" PackHash="3d37a9e35a4737ff33d099eef9f505b54d592f97" PackOffset="1577024" />
     <Blob Hash="f92fa54119d5e2f11176579478b6a7c08239b5e6" Size="2964" PackHash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" PackOffset="929777" />
     <Blob Hash="f931017ee622982936cf82aa39c70489ca2268f3" Size="11230" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1726279" />
     <Blob Hash="f9310f4633c0e3d7b0625e373167bc02064691a8" Size="64943" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="839804" />
     <Blob Hash="f9354bad0d39053651ba2baa9f27a5a32e15affe" Size="899" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2085537" />
     <Blob Hash="f93a97a9e31ff5f6b3cbcc689bbe86a7507bdcaf" Size="87525" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="785276" />
+    <Blob Hash="f93c2e860858e098ca421096c6a9203816d5e229" Size="1986368" PackHash="0bb21cd291f2eac4434972c081154105a9672abc" PackOffset="8" />
     <Blob Hash="f93cfc8e9a10314b5927fc9e646c2d35155ddffe" Size="1030" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="266384" />
     <Blob Hash="f93d9d62c173314e2f9642c719547596f2c03a8d" Size="5487" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1004280" />
-    <Blob Hash="f9400a0ba0fa3737eea4154a6608c6eaf2439448" Size="5065" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1934703" />
+    <Blob Hash="f9400a0ba0fa3737eea4154a6608c6eaf2439448" Size="5065" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1875882" />
     <Blob Hash="f940ea1dd09f517a8c7c2561005e0d7f810aa3cd" Size="1538" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="948103" />
     <Blob Hash="f9424a1ac43845d6318f55ecda07377028d6125b" Size="2446" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="1973104" />
     <Blob Hash="f94466b69d35a2a2a0feecc9fce414199d09f59b" Size="1534" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1787556" />
@@ -65449,15 +65282,17 @@
     <Blob Hash="f95bc73e86291ee1ab6419191e7b8dd51779d1b1" Size="12809" PackHash="09a4bae3cf3add2e8bada69dabfacec664d677bd" PackOffset="1056545" />
     <Blob Hash="f95cf005d469073a9885e4597a9989f62f113a63" Size="291652" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="1599926" />
     <Blob Hash="f9662c015b6b8778cb22a54fa72c5e070d0a12e6" Size="212" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2083920" />
-    <Blob Hash="f967f8b63fa835af1a91a145cb21f86350c39c3e" Size="1382912" PackHash="e33ec085fa7b33a5b77545f42909d6affee363eb" PackOffset="8" />
+    <Blob Hash="f9670f3db559802845e4bc0b4d209f656de376d9" Size="7842096" PackHash="001920ff71aa144ace5bb17b8c25c777d87b8aa3" PackOffset="8" />
+    <Blob Hash="f967f8b63fa835af1a91a145cb21f86350c39c3e" Size="1382912" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="8" />
     <Blob Hash="f96ccdd5453ecb4603032011395d2a6778c46698" Size="14955794" PackHash="0ef20b1bc63480df5baf5d164bd7d5bfcc91b587" PackOffset="8" />
     <Blob Hash="f973c443e6e43dba0906e03e4453066d76024b50" Size="148201" PackHash="9c3128e162a92be8d85e08b581572456fd45d9dd" PackOffset="8" />
     <Blob Hash="f97a79147b42680c7bcb229d98fe7a591f45f16b" Size="206045" PackHash="55789e2db367d87652ed781eee58053886f6a9fb" PackOffset="441334" />
     <Blob Hash="f97a9bd8ebcbaa01ecda4befc324e192da7df211" Size="961" PackHash="771646fce4e975003b9f92d0dcae049304608b15" PackOffset="286770" />
     <Blob Hash="f97d066b1b1a67223acb9b19f80a8493d87ca779" Size="4415" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1792729" />
-    <Blob Hash="f97d7a5c7c0e1bccee1d1487d1bc5d7ac4136411" Size="16867" PackHash="d029db0289a0276858f7acd0de1e0d629fbb21b7" PackOffset="2079770" />
+    <Blob Hash="f97d7a5c7c0e1bccee1d1487d1bc5d7ac4136411" Size="16867" PackHash="c2a0af06e41c370c03a9e9e2313911da0ab831af" PackOffset="2077796" />
     <Blob Hash="f982a12f86e16a4be94b77a830aba10cafa78b75" Size="5318" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="575466" />
     <Blob Hash="f982f91b2d466702f1806fe0389c35ab634abdbe" Size="2964676" PackHash="4b0ef0f01be88ef9c770be73baa2df71c20b118d" PackOffset="8" />
+    <Blob Hash="f9835740d5e891b9cd7fd993d08530c0457dbfc1" Size="8430" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="2020805" />
     <Blob Hash="f983a3638465175b5c7ad1734354ee704eb94dc5" Size="538" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="437335" />
     <Blob Hash="f986a536aaf3b22ae9d29cb8775930f8e14948ec" Size="663" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="253975" />
     <Blob Hash="f987848f9e10a8c3d0f18665377084d878a2adea" Size="1292912" PackHash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" PackOffset="8" />
@@ -65465,10 +65300,10 @@
     <Blob Hash="f9938dbfa775853443b6cc643131978b9cf053e2" Size="8406" PackHash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" PackOffset="1819532" />
     <Blob Hash="f99e1baf7e33f8398d411a75016210ba68a8f39f" Size="251656" PackHash="9c2b99ebfed2e931067e8842161b2811d04206eb" PackOffset="1653872" />
     <Blob Hash="f9a1e9295c55ee56728ea743575d31d44e971579" Size="992" PackHash="e1c15e4bd99ba88718cb8c80fa13bc01920a443d" PackOffset="2065151" />
-    <Blob Hash="f9a75cca8c6b18955ac2d2e47b7a6da87858bebf" Size="20073456" PackHash="63265c1a9710c7a2b6d0b61dbcf143c7d8975f91" PackOffset="8" />
+    <Blob Hash="f9aa2f1101f883e7278e8091725b89968ad54b7f" Size="61634" PackHash="3726f8567de19acda762812bfd9dff62242da925" PackOffset="2009226" />
     <Blob Hash="f9af8e68de25f8620fdb6f339ad5b3adad9dd056" Size="152" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1672180" />
     <Blob Hash="f9afe1fa30e839b46879527e204f3fbd2534cbe1" Size="7160" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="887491" />
-    <Blob Hash="f9b1407208d631bffb56c2a968e5b94d4202b06d" Size="35568" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1485219" />
+    <Blob Hash="f9b1407208d631bffb56c2a968e5b94d4202b06d" Size="35568" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1604450" />
     <Blob Hash="f9b1cf75a58d7bced39829177f4a76de75a46f86" Size="145" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1710237" />
     <Blob Hash="f9baf460dc257823f64f1df102eb87d828d52c23" Size="18724" PackHash="69b5e501216207827aa5988773e7a327a054a52e" PackOffset="8" />
     <Blob Hash="f9bf99b08ba6c3aa57ebda7cd77d1446787c08b6" Size="103967" PackHash="e16e25464b1b13a786ee5496439f81f90ca630a2" PackOffset="1662397" />
@@ -65486,6 +65321,7 @@
     <Blob Hash="f9ddda53c36f99941a9ea6ec51fabbe243a1cca4" Size="58261" PackHash="862be8437ee211995a09c6054bf43a5d08256f40" PackOffset="1044943" />
     <Blob Hash="f9e1ff9966ecbc97072fd1fc569705ed6f0b77f5" Size="5445" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1768092" />
     <Blob Hash="f9e27c843ddbb157d0945fa4e13d7169f054d488" Size="352" PackHash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" PackOffset="807471" />
+    <Blob Hash="f9e66e2c8fb13749823b87ee1531e7e31adc6ea2" Size="1769076" PackHash="1f47b0b502e338c2139e2597424509bbe13a519c" PackOffset="8" />
     <Blob Hash="f9e829e3225e803566801ea925e7ca6a433ac0ff" Size="5544" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="291900" />
     <Blob Hash="f9e8fed5b8639fa055de32bbfaff869cce9c5eaa" Size="3113" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="828759" />
     <Blob Hash="f9eafd5579ff66eea84e84e7df97771394c6802d" Size="55422" PackHash="03e73d5ad686a19a077957aad4037310d6feb8c1" PackOffset="734421" />
@@ -65493,14 +65329,13 @@
     <Blob Hash="f9f1ccf8ad06468c0a3ba7fc5b960866a76570f8" Size="646037" PackHash="242303d3de81eced62c855f4d06c4f7abe1e4356" PackOffset="1391084" />
     <Blob Hash="f9f2e078f4fa933e310b546a82dbfba484ebe528" Size="46442" PackHash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" PackOffset="1997882" />
     <Blob Hash="f9f34281a24d787cba9a30ff2989448ea0e4601b" Size="1613" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="606909" />
-    <Blob Hash="f9fb4a6e136a639fa3906050c48b720b84bfdb6a" Size="697" PackHash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" PackOffset="2094789" />
+    <Blob Hash="f9fb4a6e136a639fa3906050c48b720b84bfdb6a" Size="697" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2093132" />
     <Blob Hash="f9fc04b69019d7cb8f73bd955278cab7ac3dfe45" Size="43643" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="932122" />
     <Blob Hash="fa04f38f2ca6d33cb8ba82c5de53fff5250e161b" Size="4302320" PackHash="4eb1a1661f094f44b51998919e3c3b0243aef815" PackOffset="8" />
     <Blob Hash="fa05411010852b8599e9659a25efa7bdcf08df67" Size="5335" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="656542" />
     <Blob Hash="fa0a82982c85e322d251b88c3a1ff56380b244bb" Size="1595586" PackHash="a9bab19888fc574fe564fd41bd6cb08159c85f84" PackOffset="8" />
     <Blob Hash="fa0db6ea38855bf6fca48294f46511e702ffa98a" Size="3090" PackHash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" PackOffset="1758513" />
     <Blob Hash="fa0f760261951159e7fadf5d31773b5987f391d0" Size="2816" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1767843" />
-    <Blob Hash="fa12a61eccb5a1612e287f8a6fc5401c530279ec" Size="165790952" PackHash="d267551dd6d79a46e20a6cc8a85f933b13e71162" PackOffset="8" />
     <Blob Hash="fa235492ea0298d985421b541b0bcaaa00d0a6f9" Size="7468536" PackHash="1ada5f49cacb7144eda18decad4a5f34ab8c5ec6" PackOffset="8" />
     <Blob Hash="fa247828a1481e51c19c864943c74b4083978a38" Size="151600" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="8" />
     <Blob Hash="fa26232852c6e62e9d2cf6f359fd9fa44b737f3c" Size="4583" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="1984468" />
@@ -65514,18 +65349,19 @@
     <Blob Hash="fa367cd10e148dbc4d766859b97bfb32df7b0b02" Size="103062" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1902805" />
     <Blob Hash="fa3a890581f623bf95d0ec5cd3d4acb0fdfdeb8d" Size="952" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2095944" />
     <Blob Hash="fa3b0791ec66ad612928e3cb713222cea711b903" Size="257" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="828226" />
-    <Blob Hash="fa402287312caf3d647ae67f1f4206920634a34f" Size="2834" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2029040" />
+    <Blob Hash="fa402287312caf3d647ae67f1f4206920634a34f" Size="2834" PackHash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" PackOffset="2090461" />
     <Blob Hash="fa40834f7943108c474fbd17fb3313d2750cab28" Size="35668" PackHash="a035faadd417a5c388de035381d82bd90da60da0" PackOffset="1983823" />
     <Blob Hash="fa4185559755e724a238700a83e1f3ff7c649fd1" Size="3346" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1105224" />
     <Blob Hash="fa41c84c7817b26f2b9dd668fc1fb1c46d2015e2" Size="21056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="834161" />
     <Blob Hash="fa43405596bf65c6254a1f280d668e2d5465674c" Size="42493" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="1055583" />
-    <Blob Hash="fa435f46c6233a1c953a6cca366281bb3fa2e21f" Size="1178066" PackHash="495a03cfec4638fdaa630d336ffc1650693e7422" PackOffset="8" />
+    <Blob Hash="fa435f46c6233a1c953a6cca366281bb3fa2e21f" Size="1178066" PackHash="8c5c5245525609628442a9e4237db8a60ef59d6b" PackOffset="8" />
     <Blob Hash="fa442aba99aa95279db29bd376101fba48c09a89" Size="562" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="167432" />
     <Blob Hash="fa48f635e36354307e914566a76fd5eb7fcd7629" Size="9496" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="1185422" />
-    <Blob Hash="fa4c6987bbde22af3a48e7cbebc97b9a16d9078e" Size="3961" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1130701" />
+    <Blob Hash="fa4af1f8406caeb241a21e2fe2d2f72071d9f29c" Size="3489214" PackHash="f8e8fa651146e1678fb346d6e55c48ff899477dc" PackOffset="8" />
+    <Blob Hash="fa4c6987bbde22af3a48e7cbebc97b9a16d9078e" Size="3961" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2076717" />
     <Blob Hash="fa4caaf89324cb7b966db803af2316b18711cb9b" Size="136163" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="1637247" />
     <Blob Hash="fa4e928998a505160449371215ef1da9fd72509b" Size="4406" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1471367" />
-    <Blob Hash="fa519b9e79f38cf9380c389352e5680efaed7c9c" Size="1767" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1415103" />
+    <Blob Hash="fa519b9e79f38cf9380c389352e5680efaed7c9c" Size="1767" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1534334" />
     <Blob Hash="fa535e1bd5cbe500d6efae0a6f5112fb9ea40b7b" Size="1071" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="536238" />
     <Blob Hash="fa545a6b56e768705cc3010869ad87383c42f2d8" Size="14790016" PackHash="118b5a9859852d131b48a4e2388cd33f1a7ee9a8" PackOffset="8" />
     <Blob Hash="fa55b92b254c648ceae2871603fb0227f2692062" Size="105175" PackHash="f905d2a33859b3a7933b110436313c91e02c842b" PackOffset="153141" />
@@ -65534,9 +65370,8 @@
     <Blob Hash="fa5ee7b8c934aaa0a4da103eba70edbfa677b4f1" Size="151976" PackHash="d9bda84de8db2b30024997e133bba904f53f98db" PackOffset="1609288" />
     <Blob Hash="fa62fb609d15c8ad3b5a12618bcc50f0d95cdea3" Size="19136" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1678312" />
     <Blob Hash="fa640dff8e66d72d7ce367f639b02e24ece3e176" Size="5298" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1251295" />
-    <Blob Hash="fa6725e2629dc3c0afdc3e26fbe10731667c3576" Size="804966" PackHash="a1ae4592cfa3c36b6209520e0665ffa9280d2635" PackOffset="1033306" />
     <Blob Hash="fa6a9c8dd331e2571fbe958767ffdff8da878915" Size="12830" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="888189" />
-    <Blob Hash="fa7094d187a4deee9ae7b4931633e79ded8a9c7b" Size="14" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="2097145" />
+    <Blob Hash="fa7094d187a4deee9ae7b4931633e79ded8a9c7b" Size="14" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2097128" />
     <Blob Hash="fa7258551f7c6bc8d633cc08085cd68d1a3fa712" Size="8480" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1419668" />
     <Blob Hash="fa728eeba8751f4ce032ed32aecfde124d1b68e2" Size="1777" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1064660" />
     <Blob Hash="fa732757f9aaa47e8de4ecfcabc07b5df4f0f1cf" Size="242976" PackHash="b675c9d8c03e3efe29f7004b8589eeaf2670881e" PackOffset="1065878" />
@@ -65548,14 +65383,13 @@
     <Blob Hash="fa7e1fc92ef578aa5bc323c570333a2ce783a748" Size="318" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="177131" />
     <Blob Hash="fa82089bed80cc94ac05f8b394a5c7e2f5df58dc" Size="20088" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="1622266" />
     <Blob Hash="fa8378240c7c26d8fa03839b3966ead80aa65a2c" Size="54784" PackHash="13f4c8e0af0fea2274e128d899af8acde4e64330" PackOffset="1963336" />
-    <Blob Hash="fa84cc5dcb80fe368d75c63665fa2eaefd53848e" Size="17621" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="2075416" />
+    <Blob Hash="fa84cc5dcb80fe368d75c63665fa2eaefd53848e" Size="17621" PackHash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" PackOffset="2043206" />
     <Blob Hash="fa8976bcc5bdfb19f8fef188459741ba9df46493" Size="47293" PackHash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" PackOffset="975765" />
-    <Blob Hash="fa8a158a520390991ec9ad9122a02d85cc0a6c4c" Size="1275" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1067758" />
+    <Blob Hash="fa8a158a520390991ec9ad9122a02d85cc0a6c4c" Size="1275" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="2008492" />
     <Blob Hash="fa8a75449e00fe89d67a3d086b3c6b88bb6310aa" Size="1972" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2078052" />
     <Blob Hash="fa8ac51011baa51b6c438b76d58bee59a686bc18" Size="151" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="60176" />
     <Blob Hash="fa8b2ca747e8493f8e84b479c98bd0e0fa45420b" Size="3727522" PackHash="691e34fe463bd30b5e7931673d0586c4d84c0cd5" PackOffset="8" />
-    <Blob Hash="fa8e7464c05905faf2f7de77b6db9cd23c283495" Size="41256" PackHash="5dda7bff0436415ddfb9339017dd46727610cfa9" PackOffset="2024288" />
-    <Blob Hash="fa9027fbac2ba3eef3ffb3d03cf8fc1440361fe2" Size="4521" PackHash="3645227274c275fd21ba311135f49c3e811dc924" PackOffset="1971128" />
+    <Blob Hash="fa9027fbac2ba3eef3ffb3d03cf8fc1440361fe2" Size="4521" PackHash="24bd9f746b224f9916e298ca86e1cfc653afc082" PackOffset="2028531" />
     <Blob Hash="fa9332e33594c372306feaf7446f714c4d677f3c" Size="3626" PackHash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" PackOffset="1094582" />
     <Blob Hash="fa9706b9acb7cffc6cb5f2d0b0a5f320220ddf6f" Size="52824" PackHash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" PackOffset="565309" />
     <Blob Hash="fa971eaa0160217ba88b6fbffdb34a32278a1c1e" Size="270376" PackHash="89cf6e0f862a93ef9e543780d100517db3f3327b" PackOffset="8" />
@@ -65573,11 +65407,12 @@
     <Blob Hash="faa2f38410e5a54c60f30faf69618492bff8eb7c" Size="3574" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="373195" />
     <Blob Hash="fab39d60d758cb586db5a504f218442cd1395725" Size="1894" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1663819" />
     <Blob Hash="fab5db428ac306fd0f0809c12959ec99919a9290" Size="107628" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="199242" />
-    <Blob Hash="fab69307941e0c56845f45c1e7d5c7d6c19b94c8" Size="233" PackHash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" PackOffset="2096905" />
+    <Blob Hash="fab69307941e0c56845f45c1e7d5c7d6c19b94c8" Size="233" PackHash="979a960838a88c4dc1f3e51df498057eb322e2de" PackOffset="2096926" />
     <Blob Hash="fabb672957d21ca2b4e0eaca5fce6093baacf77a" Size="1110" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="1833230" />
     <Blob Hash="fabe756565e1019eeac85c8ab4cb71111880e635" Size="8436" PackHash="da4da2f40baa6c08a42a6d05a81529a0bf2b1a69" PackOffset="2085896" />
     <Blob Hash="fabf3ae13290e7f9694a9f2ebf079b6c4600e134" Size="11191" PackHash="8fe5a00f6e1a6194abc06553d577654d2882e969" PackOffset="808241" />
-    <Blob Hash="fabf84bc7f1b55e8bc4e7f0d138937e8ea7cf8e2" Size="9204" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1770005" />
+    <Blob Hash="fabf84bc7f1b55e8bc4e7f0d138937e8ea7cf8e2" Size="9204" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1785771" />
+    <Blob Hash="fac0631db0c25a4a39eae68005778d84b5477801" Size="3404" PackHash="9330ee0e3cad224de41a12b79afaae0571240c94" PackOffset="2093410" />
     <Blob Hash="fac10827cb4f013d75ba9f5732b15a4fd77aa6aa" Size="13680" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1369579" />
     <Blob Hash="fac14f3528e87d7b3e05d425311689fd72f15de5" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1427783" />
     <Blob Hash="fac28ae89606d42434b203c31ed1b0cc24f46183" Size="42008" PackHash="374b33734d17be020f3eec73cf16a100e905a8c5" PackOffset="529323" />
@@ -65585,8 +65420,6 @@
     <Blob Hash="fac7d2cb04acc849da6010ec76fd8a23e5f44dbc" Size="2140" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="503864" />
     <Blob Hash="fac98b6733bfc7e85bb8a0eadc9096a50bfa967a" Size="99767" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="987400" />
     <Blob Hash="faccd9e015f30f57d69701f5b38534bcf2b6ae34" Size="1052" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="296488" />
-    <Blob Hash="fad0bb0cbde3fdf3a3bca6f135acf00ad6e38bc4" Size="558584" PackHash="74d4912e14c0ef44bd3d29001dcafb2947155e88" PackOffset="1462072" />
-    <Blob Hash="fad22ffa100939286af5c50ea4f68829795e0632" Size="3543726" PackHash="4ae0033cc9142a113eaf427c9a53ea7d3dcf9fc0" PackOffset="8" />
     <Blob Hash="fad6f5f99fa6f90f9293e787c4b945d1ed654256" Size="118256" PackHash="7966ce69e1ca589fd320f02bbfda4db14a641042" PackOffset="1754040" />
     <Blob Hash="fadec32cb2eb1a9daf3c9c316a9b51dd41d18308" Size="1976" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="1212688" />
     <Blob Hash="fae21f0efb4f8f4e04e8fd8c8b6da1e0e7a0d0e3" Size="51913516" PackHash="13cb8929a9a1ba47afd60aa9e3b42da445350844" PackOffset="8" />
@@ -65607,14 +65440,13 @@
     <Blob Hash="fb0983d6ef44719a22b6d2b89ca972f3fc8c2253" Size="32" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1999726" />
     <Blob Hash="fb0d37921942d98e4894d64a1f0d403dd48cad52" Size="4097" PackHash="63aeef61540766058c9217278f4c99890729a052" PackOffset="670876" />
     <Blob Hash="fb10ce050935df45baff7f5867f02c88ed3f5070" Size="1305" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1008065" />
-    <Blob Hash="fb12670f394591367a1e002fa4080ccb45d7322a" Size="3202412" PackHash="27908b1d831cb5afb0a90d5c1bab42ad600a7304" PackOffset="8" />
     <Blob Hash="fb16eeafa77640907460b0e7eb8b5a64b39186cb" Size="179200" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="915040" />
     <Blob Hash="fb189ecb91472af7e7d449172af227efae618608" Size="4981272" PackHash="94d0cf09190bd7893254ad3f856cf603039f8684" PackOffset="8" />
-    <Blob Hash="fb19e130f16cd57155dcf1eaa26f5657a9ce8174" Size="3270" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1174956" />
+    <Blob Hash="fb19e130f16cd57155dcf1eaa26f5657a9ce8174" Size="3270" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1619787" />
     <Blob Hash="fb1c6cdf034b6bf882bf43d5e4e4213af5b57164" Size="96985" PackHash="c594efd9ea8b4dee5949283c972b5f0992c20f4e" PackOffset="1587720" />
-    <Blob Hash="fb1d9241f67827ce6dd7ac55f1e3c4e4f50caa03" Size="15" PackHash="42130259d8da4f4024ae28abebdfdbb2413afd0d" PackOffset="2097144" />
+    <Blob Hash="fb1d9241f67827ce6dd7ac55f1e3c4e4f50caa03" Size="15" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2097144" />
     <Blob Hash="fb1f13efc8184242c3f5173d8543a8182313b825" Size="2824" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="385592" />
-    <Blob Hash="fb203d9289e18a1ee5aa833d3d146e9eb2fd36a9" Size="1161670" PackHash="5dda7bff0436415ddfb9339017dd46727610cfa9" PackOffset="8" />
+    <Blob Hash="fb203d9289e18a1ee5aa833d3d146e9eb2fd36a9" Size="1161670" PackHash="e9fd3e48a792ca511bb0de9cd173aa5bb336d8bb" PackOffset="8" />
     <Blob Hash="fb2126c28634bc841b39aed2077b1c0f13b4a259" Size="2835720" PackHash="46c2b2be0300321edb353ef240e70a3aa3433c4e" PackOffset="8" />
     <Blob Hash="fb24ea0207830db3450e43b58f076c414b4b1e4f" Size="10885" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1664004" />
     <Blob Hash="fb28a22a1d968a7bd0bc635e5c62f1fcf77b96fe" Size="13592" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="2034004" />
@@ -65636,12 +65468,11 @@
     <Blob Hash="fb4fa8a0e2f1370d86506e7cfb00dc9f432cf362" Size="205248" PackHash="82788599ad2583d437e6cde9e247d16ba5059dac" PackOffset="1432651" />
     <Blob Hash="fb5633a0c84ad279da8bfecef6d897a874608ec7" Size="6482" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1292010" />
     <Blob Hash="fb58845388ed8d6f6b847f473cb9d7b8e3f84e96" Size="3198" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1840180" />
-    <Blob Hash="fb58ef7327142c49def258bf851160973963b358" Size="52" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1556563" />
+    <Blob Hash="fb58ef7327142c49def258bf851160973963b358" Size="52" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1675795" />
     <Blob Hash="fb5e8917f352e4129959fefd110ebe0232a140f5" Size="24064" PackHash="66fce169b160f3c4cb868bda8653b37692b5692b" PackOffset="2045448" />
-    <Blob Hash="fb615e2bfc7a6151ce20b149453b37bc234d47d4" Size="1785" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1807410" />
+    <Blob Hash="fb615e2bfc7a6151ce20b149453b37bc234d47d4" Size="1785" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1823176" />
     <Blob Hash="fb6384e7ea4af11af6d5ce443b598bff249fac99" Size="1540" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="837731" />
     <Blob Hash="fb64ceb4d8050209d7361a750ab3825497e69534" Size="3337" PackHash="d7cd467675e181dbeba3cf24443590ebb76f9515" PackOffset="395945" />
-    <Blob Hash="fb651936934580a849ce8ffd00beaaafdc5ddcd8" Size="1815552" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="8" />
     <Blob Hash="fb6596b1521877be04e1bf0e43044c167931e876" Size="3829" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1344720" />
     <Blob Hash="fb665bc70b99dd105927414803e61a1ab543261c" Size="3425" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1485102" />
     <Blob Hash="fb669d790c8130e805294eaf72f8f7be34eec0eb" Size="2172" PackHash="e1a39c5c6e2b2bb8bc36ddd905c1405b51add58f" PackOffset="1728664" />
@@ -65651,9 +65482,8 @@
     <Blob Hash="fb70005e1be3a20b386bd5451bde997c8c8de82b" Size="110679" PackHash="a4488098366f51a4463204c0d8075e6163811ba7" PackOffset="1657266" />
     <Blob Hash="fb74d9b7c92ad0efa53d6d3061abac784d6c1632" Size="9967" PackHash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" PackOffset="1023674" />
     <Blob Hash="fb78ee1ab0c5a4f1cb7ba8a0a63e49c328496885" Size="4647" PackHash="2146b414950f5f9360425a7ecfc07c7abd874957" PackOffset="2087887" />
-    <Blob Hash="fb7bacb232a14f64cf00a4857bb028d94adfd4fb" Size="1773950" PackHash="499026d392b6500cb2722cf816d820a85f269fb1" PackOffset="8" />
     <Blob Hash="fb832bfe42d2f97b94486dbf27eb903a711ec591" Size="83914" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="891248" />
-    <Blob Hash="fb84476c1e8652cf605bccafdd79e4ac4cd94c01" Size="327" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1584862" />
+    <Blob Hash="fb84476c1e8652cf605bccafdd79e4ac4cd94c01" Size="327" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1704094" />
     <Blob Hash="fb85589acc528c103967e81179e3ea1417f8671d" Size="10264" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1481297" />
     <Blob Hash="fb882b0e312a33637f957f33484c966818b6c373" Size="5867" PackHash="87925181e3a8b737757401a6114a8acf82625a49" PackOffset="1112646" />
     <Blob Hash="fb88acbc656d3fc9b314d931b6028303649d4345" Size="5194" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1818708" />
@@ -65673,23 +65503,23 @@
     <Blob Hash="fbaf6d780facab806daf093097ade1e81649e1c3" Size="3362" PackHash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" PackOffset="1478255" />
     <Blob Hash="fbb0a519676ae958263ece2c988ee0acda3d7a58" Size="1688" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1998213" />
     <Blob Hash="fbb43f18101c470a227f43563d31912997ea6fcf" Size="6309" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="836466" />
-    <Blob Hash="fbb5e66f52a78e0e44bbd66c6b4817cc34fb5910" Size="51" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551480" />
+    <Blob Hash="fbb5e66f52a78e0e44bbd66c6b4817cc34fb5910" Size="51" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670712" />
     <Blob Hash="fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e" Size="2616" PackHash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" PackOffset="1665713" />
     <Blob Hash="fbb6d4ea57356ac983f6dba48c504ce0a41ee085" Size="6046" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="1823902" />
+    <Blob Hash="fbb7c19a589419e497017c5749f91cf14cd93ee6" Size="55449840" PackHash="a2049ba9e33dd3e6a4c6e940d205860746b2fadd" PackOffset="8" />
     <Blob Hash="fbbdb2e6afee65872ca97898ee867b40a543ee65" Size="145527" PackHash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" PackOffset="1661467" />
     <Blob Hash="fbbe5d3b3b5436ce6ec375fdf034cea0c087c98a" Size="176" PackHash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" PackOffset="2096479" />
     <Blob Hash="fbbe70e3da0a40d98d81763a555d3be9f631d6b5" Size="4886653" PackHash="1bd7fa4728ffc004e043b1b1b02a79c674dfa7eb" PackOffset="8" />
     <Blob Hash="fbc0727d7288e6cdf601a94efd2ab70eea999b1a" Size="7454" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="518757" />
     <Blob Hash="fbc300742ae1689dc5aa4e07aec7921f5632d3df" Size="108" PackHash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" PackOffset="265006" />
     <Blob Hash="fbc31fd9afe1a2687f3f9d05167ad9007cd81e5e" Size="43003" PackHash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" PackOffset="8" />
-    <Blob Hash="fbc346bf6122679904bdecb3ca6c525c0c691f21" Size="467" PackHash="5d13b303500e0dbd644d735f7b228b6d43753cb3" PackOffset="2096654" />
+    <Blob Hash="fbc346bf6122679904bdecb3ca6c525c0c691f21" Size="467" PackHash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" PackOffset="2096552" />
     <Blob Hash="fbc82bd6c371f62e5181c6d57e88890de78d03f0" Size="1213" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="1827955" />
     <Blob Hash="fbc9d7a39d442db7bc34c259f1ad2819206deca4" Size="2713828" PackHash="31887672fee48e686e82cc437dc120aa0e13ec03" PackOffset="8" />
     <Blob Hash="fbca77d738c103127549e5a9ec7cb4b570e42a8b" Size="76253" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1951318" />
     <Blob Hash="fbcbc5dc90017c193862c65671f2d1c604b12ef1" Size="17630" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1241254" />
     <Blob Hash="fbcdd9d8240931d6300ca2ad2f1078f6d74bdb8e" Size="9216" PackHash="71f91c9ee187d974e3f5da3d91a352d568c260a8" PackOffset="2086408" />
     <Blob Hash="fbd06ec76bc9cc331fa1fc900889cf8e20775007" Size="128773" PackHash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" PackOffset="884564" />
-    <Blob Hash="fbd2f22cd623bd4f7add2f58990b2c91d6d287d3" Size="6864258" PackHash="bab038c52a5d9a6e323c3c3c7303dd07aabb59a1" PackOffset="8" />
     <Blob Hash="fbd315c209c7dbabf171594e35b8dd9d535c5199" Size="192" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2092680" />
     <Blob Hash="fbd4abaf41a54ad2afefdb771b267dd45f3e717f" Size="217975" PackHash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" PackOffset="8" />
     <Blob Hash="fbd832169166599539b4937da2f9b49e197d4419" Size="74959" PackHash="99677cc167673ccab84e8b60864da0b9f1f7f4c3" PackOffset="1874735" />
@@ -65706,22 +65536,22 @@
     <Blob Hash="fbefb10ad0c2b5ed315ddfbf4b48b2d2cf1cdb3b" Size="9039" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1536621" />
     <Blob Hash="fbf43deb73d1cbfb0dff8a8f1265c79f9f577d8b" Size="7358" PackHash="e59e437ea2d70a8f56859860672903e5002e4925" PackOffset="1534175" />
     <Blob Hash="fbf861a1970966b4c0359b789e0d19bae6bfe282" Size="20660" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1426604" />
-    <Blob Hash="fbf8d54bb0017243bb734b110b1e9096093d5946" Size="2976" PackHash="f48d797536413c42e01d8269396fa6b310ad821e" PackOffset="2092638" />
+    <Blob Hash="fbf8d54bb0017243bb734b110b1e9096093d5946" Size="2976" PackHash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" PackOffset="2080804" />
     <Blob Hash="fbfca45099687e6484e6719f11d261e45d722d13" Size="24576" PackHash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" PackOffset="889352" />
-    <Blob Hash="fbfd7fa9203114500ac0c219cbbbe6f1b4e385a6" Size="3213312" PackHash="2f03560fb7c46cf0b1f96852aadb185c474a3596" PackOffset="8" />
-    <Blob Hash="fc0063554b4a9f713cf539466216fd91cd2148ea" Size="458" PackHash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" PackOffset="2096393" />
+    <Blob Hash="fc0063554b4a9f713cf539466216fd91cd2148ea" Size="458" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2077446" />
     <Blob Hash="fc060cb78bb026bd0e7b0c76e903f9ac760d51e1" Size="54457" PackHash="033de564e3140917933e681539fb93930731883e" PackOffset="486457" />
     <Blob Hash="fc082919e4133f4b01a4f3774e7d4a3c068ca4d2" Size="557" PackHash="4c5e613dbc080d544e62bd42771a406a1f7743ad" PackOffset="2088018" />
     <Blob Hash="fc0b2578f4e1b0484925f6188f008f5b9d45a22f" Size="2252189" PackHash="74ac425c345a35e927df92ca0b8eec12dde436d1" PackOffset="8" />
     <Blob Hash="fc0d0d3b180b7a131064b43525928c80707607f8" Size="551" PackHash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" PackOffset="2086393" />
     <Blob Hash="fc0d64e8c9440f78441f3a6b46a704237bad6fa2" Size="1260" PackHash="4cc51a9fce08e20acaf921a875d0b7e488d6e84d" PackOffset="2041857" />
-    <Blob Hash="fc0ee673891c2a9ad36d1a685a7340546f9fb317" Size="240" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2065994" />
+    <Blob Hash="fc0ee673891c2a9ad36d1a685a7340546f9fb317" Size="240" PackHash="c6140f33db7510962d0a89f071642f5d7e2ca05d" PackOffset="2096904" />
     <Blob Hash="fc143dd4d3f1f76c6b06a7a917cc63616a1f8c18" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1786003" />
-    <Blob Hash="fc150d7c4ecf5e79170121f0d03a9fa8d876b847" Size="757" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1416583" />
+    <Blob Hash="fc150d7c4ecf5e79170121f0d03a9fa8d876b847" Size="757" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1865636" />
     <Blob Hash="fc195ab512d50e1d07064f529eebd68b3af676c4" Size="2898" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="997693" />
     <Blob Hash="fc19d7ca69b51f11535e5952adddc59fff204ca2" Size="3416" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1009208" />
-    <Blob Hash="fc1c22f5137b7113b629b76bc31e6890185e2112" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1548592" />
+    <Blob Hash="fc1c22f5137b7113b629b76bc31e6890185e2112" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1667823" />
     <Blob Hash="fc1d46b99348b2b4aaf74d0f9c8dc709985a6f45" Size="3246" PackHash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" PackOffset="237991" />
+    <Blob Hash="fc1f23365c54e52e654b2771ffaa97bc17f186bc" Size="2159484" PackHash="ec120a52b06d911a8417a0cb9f2dcc3175c911d6" PackOffset="8" />
     <Blob Hash="fc2091016ffc808fd108b35eac8411ef6a8c56df" Size="25753" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="675662" />
     <Blob Hash="fc20bb9bb5bcab7cc48cb204d9bcc9b1ef56a2cc" Size="3559" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="98600" />
     <Blob Hash="fc21ebc158ee503dffe9df38c7f634cd270a9dd9" Size="14958" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="1852692" />
@@ -65729,6 +65559,7 @@
     <Blob Hash="fc2659b033ae5ee7b378fdb1b3180752668d2d54" Size="7168" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1965037" />
     <Blob Hash="fc26ae095d18224aa3a8098fa02f3c8b0228430f" Size="11334" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="949111" />
     <Blob Hash="fc26d239477e3e1aa84dfe4b5cb4ebd755a149cf" Size="216" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1960944" />
+    <Blob Hash="fc27944a83a02650016de87b45b23f8daf05fec0" Size="1080134" PackHash="317d4fc6455015ce5638858711304dd805badd38" PackOffset="8" />
     <Blob Hash="fc284d2c890a22ecc634e24c9e7c874cb1ea4ba4" Size="115951" PackHash="c7abd8711d268ebef7f39b9803a39439bb5ce0a5" PackOffset="769265" />
     <Blob Hash="fc286a002c91bfd943c42b1f42ce78f657999831" Size="13447" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="606770" />
     <Blob Hash="fc292881383c015f25f2c547250fd918955088eb" Size="4822" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2012636" />
@@ -65740,21 +65571,20 @@
     <Blob Hash="fc3a4a2f568fb786e615817572cfb5b7f2ff4c69" Size="46174" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="136869" />
     <Blob Hash="fc3ce8ce95271e8fb123cd3b67fe0fb3ae2f6bef" Size="10425" PackHash="0438814196df435595bbb951822bf81d0364af0c" PackOffset="2072879" />
     <Blob Hash="fc42957b501379f7e79c714e0f5f05c2bafc45d1" Size="153" PackHash="56304ecbe66a10d054956a5d7d80624fec86a588" PackOffset="521124" />
-    <Blob Hash="fc4d6720929f39aa1f40e656437f97741e7d3026" Size="17948" PackHash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" PackOffset="2002431" />
+    <Blob Hash="fc4d6720929f39aa1f40e656437f97741e7d3026" Size="17948" PackHash="e7a98b7aeccba35dc9be7b902823bb43ef833195" PackOffset="1901927" />
     <Blob Hash="fc4f047490007ddb68f00fb27d9a0e5d829a6879" Size="1927" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="2093965" />
     <Blob Hash="fc544e677a383869f742c15ed1b32bf6ff9f0502" Size="76" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="829180" />
-    <Blob Hash="fc56671d85546ff1c29352801978f16979cd5f31" Size="935" PackHash="86291bf2d748652dfe149112b1b6923680836b57" PackOffset="2095420" />
+    <Blob Hash="fc56671d85546ff1c29352801978f16979cd5f31" Size="935" PackHash="7b4857581cb90439a19669b4b579f63643a80e27" PackOffset="2095725" />
     <Blob Hash="fc5acda5284d0b38258d30c6bda9582a5093e599" Size="9056" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="737081" />
     <Blob Hash="fc5b117e5ea87cb060d2b22156cf81e793383d66" Size="451582" PackHash="f38889741341129aaa57f66f2c36e093673c46ea" PackOffset="8" />
     <Blob Hash="fc5c818f00baa9885e2edc22123ab3d7fb4b1a4a" Size="10740" PackHash="491060f983f26dff7560f1ff4dc6690afc44115f" PackOffset="42345" />
     <Blob Hash="fc5c9fe46f9835ed916aa15eec92654b4faefcee" Size="140" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2096080" />
-    <Blob Hash="fc5f98a2d07d438d729e3beae0fdc2c4fe2f03ac" Size="5078168" PackHash="25683d273170fbd89946c9625bee3ece700ad863" PackOffset="8" />
     <Blob Hash="fc66d746c754cae7ed2779cefdb0720f2b902bbb" Size="9229" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="247600" />
     <Blob Hash="fc6d38452175748cd05a23f3d93e86da9684c9dd" Size="241760" PackHash="f38889741341129aaa57f66f2c36e093673c46ea" PackOffset="451590" />
     <Blob Hash="fc6e3cd393991e4ed2bef442702615c632189268" Size="3846" PackHash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" PackOffset="134970" />
     <Blob Hash="fc6e589a111132a3174bfdfae397f68122f34172" Size="24856" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="788249" />
     <Blob Hash="fc6e96a672d73f76a1572919b484f4ee2412a21a" Size="13429128" PackHash="4462bf7f8ee1bfeefbb90bf01a0b4da3d5cb0251" PackOffset="8" />
-    <Blob Hash="fc6f4832c3e775f6a969a46a17cc193a894c4f5d" Size="49" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1551029" />
+    <Blob Hash="fc6f4832c3e775f6a969a46a17cc193a894c4f5d" Size="49" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1670261" />
     <Blob Hash="fc6ffb159d592ce88d852563d087a9f06114ce5c" Size="1615" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="605294" />
     <Blob Hash="fc719ad1f36aec7aa978aa3df52f04be7f46aecb" Size="102489" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1359029" />
     <Blob Hash="fc765b899233ce3c581a7114af732fad53b88bcf" Size="40" PackHash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" PackOffset="2095648" />
@@ -65773,7 +65603,7 @@
     <Blob Hash="fc9525193f2b57bed7e69f7819ce3605ec215639" Size="79795" PackHash="588da7d9d36957b582f13620b0c6af8de55ff4d3" PackOffset="334637" />
     <Blob Hash="fc99ad97e8cf5fcf0b69cdf81836fa2ecc603f06" Size="4235" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1751955" />
     <Blob Hash="fc9b1bb7c44e064b78c2865bd02e11aeca47e33c" Size="2295" PackHash="1d023baa2108e345f4e435e269145d0618dc3072" PackOffset="1846388" />
-    <Blob Hash="fc9e3d9b5a34951a7ad3e461120fa6316c3b754a" Size="29080" PackHash="1bdfb2089d50fef664ddd40f88773779551a6963" PackOffset="2056912" />
+    <Blob Hash="fc9e3d9b5a34951a7ad3e461120fa6316c3b754a" Size="29080" PackHash="119472dd321e51d7d83032997ab9d118a312a2f4" PackOffset="2062790" />
     <Blob Hash="fc9e50e3e674bec415723673043d59f3350ac14c" Size="5277" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1290977" />
     <Blob Hash="fc9f11827b51d4b7f65ac2763b05a56a91744eb2" Size="2192240" PackHash="1f6d6fad7e06075adf86ceca40a1fa9f9b360912" PackOffset="8" />
     <Blob Hash="fca29cde7e575f73ee4bcd4c8fd519dcd8fdb302" Size="5152" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="2029466" />
@@ -65786,6 +65616,7 @@
     <Blob Hash="fcae825b54400b9d736ef22a613e359e3f0fa6c2" Size="1116" PackHash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" PackOffset="2044159" />
     <Blob Hash="fcb581ddcb2d25701daf69cab75e8399531dce1b" Size="15556" PackHash="fbcf9cae5640d47e9b7d2ad925c55d54fea4bb7a" PackOffset="1973583" />
     <Blob Hash="fcb940f91b8a7ae599433460c27953890fa38f27" Size="6714" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1709347" />
+    <Blob Hash="fcbbb622cc4abcc6c6bd2f442944ff4f1baeae15" Size="386130" PackHash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" PackOffset="591608" />
     <Blob Hash="fcc093b99845395659246edbf62fa8ffabbc83a6" Size="200" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="285830" />
     <Blob Hash="fcc3cfc57ae9af61e0f47bf651e7b1ae6b52019a" Size="1631" PackHash="f97beec46284f3742c33b97b86dddf133c97c75b" PackOffset="611766" />
     <Blob Hash="fcc4578a2950740ed2e955cbec38822a03adce03" Size="10687" PackHash="adbe68f072ea06333f3b1ac101eb181f7551c788" PackOffset="2080439" />
@@ -65809,9 +65640,7 @@
     <Blob Hash="fcea547ca3db696b1adbf89db233b995b785b32f" Size="4162928" PackHash="a5e524aceb4cca0b29b1dc1225018d43f3716054" PackOffset="8" />
     <Blob Hash="fcead36a5c68f44d31c1b64ceeb957860c7f4a0a" Size="25780" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1523680" />
     <Blob Hash="fcecd02dfcb56c51652b5af541a80ff68aa4f6c5" Size="1842" PackHash="70bc3cba2df02db94668c029275adba4d7f590cb" PackOffset="629522" />
-    <Blob Hash="fcedfb9b6b88551dfc1274413fbe82aec8494828" Size="3213312" PackHash="f8c33af6876de44d86e7b773e9fecde2b351865d" PackOffset="8" />
     <Blob Hash="fcf9dc22034b31c6aff296437dadd600c2861647" Size="1163" PackHash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" PackOffset="2092944" />
-    <Blob Hash="fcff1c6395688cce7fbcd2f2eef5c1fd6b587662" Size="1763282" PackHash="772be2a1b26f994f4af5928b9a48434ff28b41b2" PackOffset="8" />
     <Blob Hash="fd0faa13c63384ec0e862f3863836055cefeccf8" Size="1580" PackHash="7da3df3d39213af94d7865578579998716e675cc" PackOffset="2079306" />
     <Blob Hash="fd1079c21d442796d05661be357bca4302656d93" Size="18101" PackHash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" PackOffset="1735715" />
     <Blob Hash="fd163e90adbde3e89ef7b2d3a00715293c617caf" Size="3004336" PackHash="00c4eb5dc59035a15405197341b6b925473708db" PackOffset="8" />
@@ -65821,6 +65650,7 @@
     <Blob Hash="fd1f016aac5852082cf3b72e15480ef9784db2ac" Size="5162" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1887926" />
     <Blob Hash="fd200a32380190f06ded0d45cd824693682078be" Size="3309" PackHash="399ead53201faa00c7d391ccafdd004f5594bcb2" PackOffset="916173" />
     <Blob Hash="fd23f71cf1b9217d3de356b8580c115c176a2631" Size="32121" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="1176393" />
+    <Blob Hash="fd259d2d86730f62ddfa73c33887b6c655d4898f" Size="1630376" PackHash="50c4602681829c7f56a1a8fcf4f2658c64318db6" PackOffset="8" />
     <Blob Hash="fd2600db2f15bf86e60ee78249b006af9d4d4971" Size="40" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="1992784" />
     <Blob Hash="fd2622baa8fb9b935e99db8f33bf2592b79f001f" Size="109261" PackHash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" PackOffset="933029" />
     <Blob Hash="fd292737193d853036077137dd521f6cd6398b6a" Size="3024" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1670557" />
@@ -65829,9 +65659,9 @@
     <Blob Hash="fd30e0f6807caf9e7f4a444b2662517db86ea7be" Size="16102" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="362222" />
     <Blob Hash="fd31628643804ee985c0342c55dca3754a11e9da" Size="100" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="278064" />
     <Blob Hash="fd32248669819b87c3e62bfda1f1bcf96e1ae347" Size="3012" PackHash="6816cd41da7919b0e792bc020abf254ed8c29e47" PackOffset="1749634" />
-    <Blob Hash="fd36c9ae10127f2b58f6a0cd9294d6dc6c30a139" Size="2326016" PackHash="06023667fb0eb2af1970cef407b39781522a5f90" PackOffset="8" />
+    <Blob Hash="fd35f437a4118aaaaad0ff0d94d43ebeafc475f6" Size="7376306" PackHash="adf43840d20570afaada341577873917aec9afe2" PackOffset="8" />
     <Blob Hash="fd3c1d221679a523e0682c579e5f164b87c53839" Size="22854" PackHash="87b68506c5cd74f1611024f39f537980f02f4767" PackOffset="655944" />
-    <Blob Hash="fd41c2e8ecbe2a0a5758fd3f87e0ecc27af38603" Size="1666" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2086585" />
+    <Blob Hash="fd41c2e8ecbe2a0a5758fd3f87e0ecc27af38603" Size="1666" PackHash="52265ff6ba7685575e09d42dbc4d7305b379d7be" PackOffset="2038516" />
     <Blob Hash="fd42e6d68bc3184a1eba48813d58ef482abda5ef" Size="48277" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1259104" />
     <Blob Hash="fd4362a2e39a8928a5a6cd33a0c2dc4b5774120b" Size="13901" PackHash="3079df4a3d586d43d272a660d269190b32b35686" PackOffset="2006689" />
     <Blob Hash="fd4417bec6395b376ce4b97786f3ff2823a72296" Size="724" PackHash="9868d96698662a7774060d57552a9f4cebc77a08" PackOffset="2096355" />
@@ -65842,7 +65672,7 @@
     <Blob Hash="fd4bc500eda7317fc8193f759fd7797e1c348708" Size="18633" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="916085" />
     <Blob Hash="fd4c4f2091001f1b620a0ee710506bc670d8623f" Size="14224" PackHash="51f22e4ce0c06e217e7d259dc489c05486d38302" PackOffset="2082812" />
     <Blob Hash="fd4e9d2842140ea9ddb2b34ee5df3d2bb887a838" Size="573" PackHash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" PackOffset="2096527" />
-    <Blob Hash="fd4f41ff2521bd58a5440da47e64e0e79f1426c5" Size="30130" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1858377" />
+    <Blob Hash="fd4f41ff2521bd58a5440da47e64e0e79f1426c5" Size="30130" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1986431" />
     <Blob Hash="fd4f7e66cc5c6d00a202dd6378a7de90e460145e" Size="15570" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="162189" />
     <Blob Hash="fd540d48808756989beec6b1c04e8b5d2c894d5e" Size="21191" PackHash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" PackOffset="771706" />
     <Blob Hash="fd5a65709469435b3e3d6b9bcd37969d5acff661" Size="42" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2097102" />
@@ -65853,7 +65683,7 @@
     <Blob Hash="fd6876053cfdd0cab20da36bad436be44a8e6d33" Size="38" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="738641" />
     <Blob Hash="fd6abe45ac5e2dcbef4b2199900d469d19dc0f4a" Size="4501" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="1311867" />
     <Blob Hash="fd6b6ac771c76544ef37b6a12b31be1543b47022" Size="961" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="2091151" />
-    <Blob Hash="fd6bba7253db6e2af7b13ffa13ec00c9fa6347e4" Size="1182" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1070504" />
+    <Blob Hash="fd6bba7253db6e2af7b13ffa13ec00c9fa6347e4" Size="1182" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1240538" />
     <Blob Hash="fd6c32edd00f4be4abbdcdb704116b99d5a816ad" Size="6644" PackHash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" PackOffset="641976" />
     <Blob Hash="fd71cb622a11230b507319f6b4f907080e7e7c2f" Size="301" PackHash="9bfa76eaf50a585e99981b54ef5628fd89b397e7" PackOffset="1567092" />
     <Blob Hash="fd746ce6f2a2de0eaa94597a2b7cc3cc417bffd3" Size="15570" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="420737" />
@@ -65871,18 +65701,18 @@
     <Blob Hash="fd8e9aeeee50656fd3c694ca051895ddc8e5590b" Size="219" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1440172" />
     <Blob Hash="fd9452122210e8eec2a02cb20599e5e0956f863e" Size="24064" PackHash="c79b3d3d81375c25019c997c0e81af6b84d805c1" PackOffset="2044364" />
     <Blob Hash="fd94b10c4aca02988884f3a4d268f0d580ac246d" Size="18827" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="145838" />
-    <Blob Hash="fd95e629e772068c0730ccf825716ce535b01312" Size="4714" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1731746" />
     <Blob Hash="fd95f18ebda4d7b92c67e8aeac83509d460a544c" Size="56733" PackHash="134775e5e1bae89ea4a028752fa10d1dcc7bc218" PackOffset="193575" />
     <Blob Hash="fd96e936f562b6b885875d142f376a79181688e9" Size="295936" PackHash="545f4948d42018b79596144fdb1e070d694a5185" PackOffset="1709191" />
     <Blob Hash="fd9745aea77b4f6b1ca17a7222e4cf2861110985" Size="6362" PackHash="fe79883294e7b730b4ea0e6e72c662ced28e999b" PackOffset="1275127" />
     <Blob Hash="fd98c4be3cedb759eacb53bd619d78fd964990df" Size="16780" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2065502" />
+    <Blob Hash="fd9948cad6e217b14785efceeae4422ab21e7238" Size="3704428" PackHash="d43b4f4a6dc6791cbf3e796c97665229c4636806" PackOffset="8" />
     <Blob Hash="fd9cd587868c46611d309f11240d3af03e7da763" Size="100" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="2096256" />
     <Blob Hash="fda07461c6dc44825938e1131b6749f3be729649" Size="4605" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="1755534" />
     <Blob Hash="fda74a47623f1447084be158d2c71e1f8a334155" Size="3351" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1043947" />
     <Blob Hash="fdab88ead190d7b6b636f0d8a148b49b8197046c" Size="322" PackHash="89b3b27aa79deba9893f3f5ed835fbd447475c10" PackOffset="2096281" />
     <Blob Hash="fdae76cea63fb0f1f1957e103cf9174dc42d8aef" Size="1120" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2035369" />
     <Blob Hash="fdaf428eb151b317090db61a9f8eb51f1969de6f" Size="2708" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1768296" />
-    <Blob Hash="fdb05081c0b16650d4162088e064e7085564c8a8" Size="1024" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1303832" />
+    <Blob Hash="fdb05081c0b16650d4162088e064e7085564c8a8" Size="1024" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1752734" />
     <Blob Hash="fdb4ae698b677e1bfc9e8604f09a54eb0c8d8981" Size="72139" PackHash="5c3a72f0ec5b71a14069287554d34746eaca8837" PackOffset="392045" />
     <Blob Hash="fdb4d8ceef0beb0f62d616f0c849c46a9a6f0284" Size="27756" PackHash="24abc6b446750adef120dba7e19f9ae7e166eb0c" PackOffset="1438978" />
     <Blob Hash="fdb969e5f5d54736b72a3671a3bf657d92db66c8" Size="40" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1998355" />
@@ -65891,15 +65721,17 @@
     <Blob Hash="fdc4035b8ec6778eda0e9c3f3af45db603b3e6d2" Size="3168" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1913147" />
     <Blob Hash="fdc672e503dfcf8bf2176f06207a9713a00b4f9d" Size="339968" PackHash="e02ceffa7dbf58acfed245113d911e454ca80807" PackOffset="1392136" />
     <Blob Hash="fdc77ec83b8825c855c7df3bc1d71070b85e37ab" Size="3583" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="1313287" />
+    <Blob Hash="fdc91da002aaea2022e73d5353d1962b7c38aafb" Size="112192" PackHash="a57929556fea304cb2fa2583c8e6fd31b8f632f2" PackOffset="1982794" />
     <Blob Hash="fdca2214360f5442cdf030f6d0c867a788f24be1" Size="1363" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="1843307" />
     <Blob Hash="fdcc3f1a6592d4732c15b1a2e246e33a5764972c" Size="5593" PackHash="ac2c77918f717b39f4343aea48946b7781301f55" PackOffset="2059679" />
+    <Blob Hash="fdcc9823313376b7a9d7b5142f572e0143a64b63" Size="60534" PackHash="f7e03dc89add61310c14a0a55a7130d947f30b53" PackOffset="1983256" />
     <Blob Hash="fdcceb8ff89c27474c01917b1e10d9bde7470e54" Size="12288" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="778760" />
     <Blob Hash="fdce6131dc8268f70fc81888858ae0d8cddcf68f" Size="1928" PackHash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" PackOffset="2085162" />
     <Blob Hash="fdcf07e32a5d4dbe499b1aa2cbb7705b71616450" Size="20015" PackHash="cf899a002e0240530c3d53a020a283cdf5e56ab5" PackOffset="134422" />
     <Blob Hash="fdcfa2901cb0c7d4f4344b93d3ebe4fd5382ad69" Size="940" PackHash="afc5cb40d4e6c77d1775d83fce7636691d3fa748" PackOffset="589519" />
     <Blob Hash="fdd7b9a960a0dcf79f458a9c81c4a9390f7d087e" Size="5601" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1020431" />
     <Blob Hash="fdda56f869b49d85a32665a641c7694dd63d3050" Size="1904953" PackHash="c953e731e44adedfa139c220d54fb0428109565a" PackOffset="8" />
-    <Blob Hash="fddcf2d2e920b283f517e55fe304236dc338d90e" Size="5994" PackHash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" PackOffset="2088128" />
+    <Blob Hash="fddcf2d2e920b283f517e55fe304236dc338d90e" Size="5994" PackHash="65292930f06c2bb49ec85a293869511324a919d3" PackOffset="2089284" />
     <Blob Hash="fdded7042d78d10e359a2c37d20adb9038485db2" Size="3036" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1971639" />
     <Blob Hash="fde015b8b6a14694c678eb65fbe9ff7df5c22b86" Size="6442" PackHash="54be461a1c72b36e4f01f2db78849473477d73dd" PackOffset="1716388" />
     <Blob Hash="fde12de557acd77762fce7b0f0de83521c94879f" Size="4880" PackHash="1063c35fffcd9275f3f6c5c8ab3c10a4094588bb" PackOffset="806618" />
@@ -65911,8 +65743,8 @@
     <Blob Hash="fdf708cb02de6c139594791632676beae7cdaff8" Size="15542" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="934386" />
     <Blob Hash="fdfaf7c27ba3e350fc171faad7491599204cd704" Size="481268" PackHash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" PackOffset="1035972" />
     <Blob Hash="fdfaf99164620c68892a22bcf2838159118ba0a6" Size="53709" PackHash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" PackOffset="83160" />
-    <Blob Hash="fdfc9495db2f9955d4855d3e4c840cba995aae2b" Size="338" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1591445" />
-    <Blob Hash="fe046032e538d7d146f754b4f2039a6df1be4ecf" Size="3744" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1742878" />
+    <Blob Hash="fdfc9495db2f9955d4855d3e4c840cba995aae2b" Size="338" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1710677" />
+    <Blob Hash="fe046032e538d7d146f754b4f2039a6df1be4ecf" Size="3744" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1862110" />
     <Blob Hash="fe06a7632e4d1267788119901300376450e10293" Size="91023" PackHash="a74a94093248745adfbb51000b3fc9d9c25a42bb" PackOffset="653871" />
     <Blob Hash="fe0bebfc36543eea86f8ec2b9a5595967654ede6" Size="4440" PackHash="de57be23bc036d0a4aea433ae00c926305d11030" PackOffset="2090677" />
     <Blob Hash="fe0deea60af917a35d5ae1336e3b2f1fd274bff6" Size="2092" PackHash="15c1c1820f17cbc99a977498d87549e3b4060f7c" PackOffset="1383144" />
@@ -65933,20 +65765,19 @@
     <Blob Hash="fe28f709254cd4d87d4d208915b8f054259ae003" Size="3221" PackHash="fc71358f88c1a01c32f496b064386dba3145a36a" PackOffset="890561" />
     <Blob Hash="fe2b24aea43df1fded1a5a571e46f155488321be" Size="31058984" PackHash="26b0e298ac487a7d26e72c7faae95db0238e1816" PackOffset="8" />
     <Blob Hash="fe2b3db1338fa491c612ca533329e14c79d6033c" Size="1040" PackHash="b8b36b31df40a1fc9087e4b313999fcda60845cc" PackOffset="1253792" />
-    <Blob Hash="fe2e6a2a2c0f7d2ca68d55d9ad74740bf541dabe" Size="830" PackHash="6195e62bb05e93846fe2e6461b6295654142e6c4" PackOffset="2058305" />
+    <Blob Hash="fe2b8a23138b483e5af5f246db2eaa206f090aa0" Size="8145" PackHash="073d86b7159054c816df8bbab61a1b51962757cb" PackOffset="1742169" />
+    <Blob Hash="fe2e6a2a2c0f7d2ca68d55d9ad74740bf541dabe" Size="830" PackHash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" PackOffset="2077904" />
     <Blob Hash="fe2eefd3ba5e7bad2ebd7483cf10e0fe0866ecde" Size="5579" PackHash="69da894b93e0ddcfa56987b43f14efb003619b1a" PackOffset="1540021" />
     <Blob Hash="fe30dfadcc28e2b95ded2aff552c0fd8fd191b69" Size="2305" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2023867" />
     <Blob Hash="fe324c2987ee6115a4a84747360eb94ed84c7344" Size="896" PackHash="50f9fc796963c692e13289ee270e9728c3446e24" PackOffset="2096109" />
     <Blob Hash="fe3423689efedada19c7dec3d5dd077a057bf379" Size="20672" PackHash="f66bb643b3a7584d1fa71215c78d2335fc620f93" PackOffset="1385128" />
     <Blob Hash="fe34b12ff22ed93b6199127f9dad898dbe2ba8ff" Size="7656" PackHash="bad3d27e656261f89d7bfe9409032b1623077a17" PackOffset="1025961" />
     <Blob Hash="fe369cdd44bdda0fafee4e9309104f7fa28cdc5f" Size="142" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="447493" />
-    <Blob Hash="fe37a18ff8f360f74de0115c69f6e45830f4ece0" Size="193494" PackHash="454cbe313eebe83a59be30e57f4a9552c9da8603" PackOffset="1856670" />
     <Blob Hash="fe37e013c44d7700cbde42d55872e3c1b5c63582" Size="90343" PackHash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" PackOffset="740336" />
     <Blob Hash="fe38025d19774312bb23efe77dbd6fe4cf85f41d" Size="185" PackHash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" PackOffset="1602667" />
     <Blob Hash="fe383fdc565a20c9d328168f13811027bf13cc5a" Size="5341" PackHash="4c190d0062fc8a30656f39c990a07693092946b0" PackOffset="278507" />
     <Blob Hash="fe3e7cd6c1b3755530765cea57e416cfeae5ef0f" Size="9323" PackHash="8df74fcff0bd950f2d0bc398d609499f34abc35b" PackOffset="1288440" />
     <Blob Hash="fe402e7987433ff44bacb4878b7451fac626052a" Size="9472" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="708268" />
-    <Blob Hash="fe4050febfc92f53d20a5347ee34825caf9d9ca8" Size="856146" PackHash="2b07bf25fb2698584c163bbdbe0e9fc6c6870f49" PackOffset="1156800" />
     <Blob Hash="fe41b1625575291dda99a0b127d778512a24fd8e" Size="283" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="377061" />
     <Blob Hash="fe456b4b2c04a9b8a8f1bd0448bb28bca13ac35a" Size="625954" PackHash="12468bf1be869d88d9a8104ffde7c4887839843d" PackOffset="8" />
     <Blob Hash="fe475fb83b47e2a893df1071b45143aa0b10c831" Size="25574" PackHash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" PackOffset="350742" />
@@ -65956,7 +65787,7 @@
     <Blob Hash="fe532df1de6dd6f9971227b48f8856e07ae0883d" Size="10130560" PackHash="757018a2e8ed4076778739a0b2ca10402904d6a2" PackOffset="8" />
     <Blob Hash="fe53d434f1c88441af4bae14469620e2d0c78c96" Size="12783" PackHash="8962c9283d246aa6183316165b2eabb0cb7e0781" PackOffset="1880566" />
     <Blob Hash="fe55ffef83601f654504f0a2256e11e1913635db" Size="19136" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="405344" />
-    <Blob Hash="fe59f4057a73001d83f0e7cf8227097790b77f09" Size="1215" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2070339" />
+    <Blob Hash="fe59f4057a73001d83f0e7cf8227097790b77f09" Size="1215" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1970203" />
     <Blob Hash="fe5bf978b2e10c803798b7df399083fa3c84b191" Size="32" PackHash="cf7f1d93299ad568585777d5e722214e0bcb349c" PackOffset="2093387" />
     <Blob Hash="fe5c4ec575a6a6a293bc1db04007206f4b501cf6" Size="336" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="237730" />
     <Blob Hash="fe5ddedf0bca22a6020196c31b814f34769d3ed6" Size="52931" PackHash="be8c418c6c2cd699e4f4a30c2250228b9f623727" PackOffset="1400001" />
@@ -65964,10 +65795,11 @@
     <Blob Hash="fe63afd6b4bb11c24bd189d5edc49855d507a6a5" Size="72045" PackHash="3c19aa96b3264db68508f8090474e9850f2ee400" PackOffset="1896226" />
     <Blob Hash="fe6475c66fe3e4cdbc2148883f6aeaa844d61a4d" Size="1024" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="506400" />
     <Blob Hash="fe650049f34273e84bff5996c0fb97478d4e222a" Size="50656" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1160225" />
-    <Blob Hash="fe65a1dc58cf806af7e984c5d5d8b6660988dbf9" Size="3512" PackHash="764872ce07d573dff3cb649414b592eb16340b4b" PackOffset="2091746" />
+    <Blob Hash="fe65a1dc58cf806af7e984c5d5d8b6660988dbf9" Size="3512" PackHash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" PackOffset="2033900" />
     <Blob Hash="fe69f756ec1bec893bfec72f3abd66dd496cfd34" Size="282" PackHash="00b88b00b86f34c3983e4cd0d065a120ef06306d" PackOffset="1308815" />
     <Blob Hash="fe6bdfdb998f71319d38e544c22ef0c873137ccf" Size="7513" PackHash="0e0fc56444fa93555de76ff8aaa98b0bd94a186d" PackOffset="1796212" />
     <Blob Hash="fe6c44199e5739414570d96e05dadddbe7cd51e8" Size="5120" PackHash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" PackOffset="1096994" />
+    <Blob Hash="fe6f1f2584cdb9895978e214728e345ba7e8fcda" Size="6550320" PackHash="c9ab1dd42b6ae3bd324c849585c2e47f618d8c67" PackOffset="8" />
     <Blob Hash="fe724005b6f872c85f50540e1060a4fd05efaf7a" Size="8117" PackHash="4ea073964fab7a54a02f8f439aeb21bf330390ab" PackOffset="1127356" />
     <Blob Hash="fe78d9dcb93ab75279f23b872405ca68a76b52b2" Size="7319" PackHash="8fd163c1f9dc9bf11ad958c41b095830489b938c" PackOffset="791398" />
     <Blob Hash="fe79cc8cba59e1df0dc8e2619eafbfa7b1498e23" Size="4271" PackHash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" PackOffset="1698382" />
@@ -65977,9 +65809,11 @@
     <Blob Hash="fe7fd43729568e7802af11ff1ebe397457524e5e" Size="3875212" PackHash="ad94c367c46cdd4e26dc39948bb7aba404ef9344" PackOffset="8" />
     <Blob Hash="fe7ff2c35f9bba207e6af5065a554a23cd3c39f7" Size="46222" PackHash="a74a1a5121db55028d0a9d281ca2e5d501761af4" PackOffset="1932728" />
     <Blob Hash="fe82ecb9bfb1a8e3e7825ce4db46457a5e072e99" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1276936" />
+    <Blob Hash="fe8300156d4378f11d3e641c46162c2512b9e8bb" Size="2306" PackHash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" PackOffset="2086626" />
     <Blob Hash="fe830f61165a0f2d3bf54f3b096bbc27e37962c3" Size="20606" PackHash="617e09b35c9c3961bf34b1ebfa772525f480e267" PackOffset="1919011" />
     <Blob Hash="fe852d47e843eba6654240b6a99b182d6b06eadc" Size="33840" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="893552" />
     <Blob Hash="fe864852e69ca1c0826263ecd2dabb9a1ffdd599" Size="18432" PackHash="f984c4f393a376587f48a24076e62578e975f8ea" PackOffset="8" />
+    <Blob Hash="fe89deded3fe4f5d622830e0051b80f5cee7c41e" Size="97752" PackHash="119472dd321e51d7d83032997ab9d118a312a2f4" PackOffset="1965038" />
     <Blob Hash="fe8dec55a6b6cee1b59ddcd88676833f28492b97" Size="5812" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1468600" />
     <Blob Hash="fe8edf3812cd3d633214b0f7350159a18b05f549" Size="45716280" PackHash="fa831f9211c00727c75faa1ba30d872024a924b2" PackOffset="8" />
     <Blob Hash="fe928bdaf0e68ca9cb5df5aa1c2605a342c80df5" Size="1298" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="2033573" />
@@ -65989,12 +65823,12 @@
     <Blob Hash="fe9f300dd562486bd82a406b3e76c104c18d47b0" Size="1817088" PackHash="c12630229aec6a6d5650a913934dd964f725eeeb" PackOffset="8" />
     <Blob Hash="fe9f897083368e3ec2db695ff590ee71a60c8358" Size="2168815" PackHash="30abec4df27f82943cf2f46504770edf5000b727" PackOffset="8" />
     <Blob Hash="fea348e4251a63c474ecaa1b9ec3139556e3b8ba" Size="62079" PackHash="2f13e90048446b62f7b075e0a79209d62ee1b054" PackOffset="2018499" />
-    <Blob Hash="fea59097c5daf2c921656ca1aac6561ab052c118" Size="18014" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1065992" />
+    <Blob Hash="fea59097c5daf2c921656ca1aac6561ab052c118" Size="18014" PackHash="d8df6d9c90e63349425f248149e071e3a21e17d0" PackOffset="67479" />
     <Blob Hash="fea5d4d103e88ad371bbed943fdbe38a981aa6e0" Size="202673" PackHash="c63b8b65198dbac3e3764c69e57b85f011332ea1" PackOffset="1261794" />
     <Blob Hash="fea703826966e59009fde62b38d613bff23b75af" Size="223472" PackHash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" PackOffset="221141" />
     <Blob Hash="fea955aabf9b50ca52401c0bd610c7024458f23e" Size="84" PackHash="16e421c9204b08586edd8de93b93b19fb10644ea" PackOffset="1282088" />
     <Blob Hash="fea98872c221af87b4234a30e104efa53cf89df7" Size="2959" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="214829" />
-    <Blob Hash="fea99fabf0a99bd86cb1ae373724a4ea93a70edb" Size="376" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1607375" />
+    <Blob Hash="fea99fabf0a99bd86cb1ae373724a4ea93a70edb" Size="376" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1726607" />
     <Blob Hash="feaad412fbf8a74ad3d4c3a8993e6a85c7630365" Size="167094" PackHash="957337ec86f032a91c82dfc2f859843e3a1c1e88" PackOffset="1810843" />
     <Blob Hash="feae22863e2f2d0cdabd01d80845539bedacdb92" Size="910" PackHash="40a36bc9a21ed94016841bdb84eed7520b3255cc" PackOffset="1997008" />
     <Blob Hash="feae95cb2c81b1422154c9852c665f337d92e00b" Size="44808" PackHash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" PackOffset="1539139" />
@@ -66005,7 +65839,7 @@
     <Blob Hash="feb6fe23d5f78b5c97e40bd9e2f6950e80ec88b0" Size="2816" PackHash="a6f40feab57b4006ef16688f704971fd13b1944c" PackOffset="8" />
     <Blob Hash="feb715cac89425259a6b396d24a1013aead861af" Size="3042" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="1944321" />
     <Blob Hash="feb8153ac588076d840fadd57e36872748744ed8" Size="1551" PackHash="345f37ad429b27f1360cf26aa535ef037724f7c4" PackOffset="938467" />
-    <Blob Hash="fec040037d2f29abe28de62bc460b5dd1d76f24c" Size="3307" PackHash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" PackOffset="1202103" />
+    <Blob Hash="fec040037d2f29abe28de62bc460b5dd1d76f24c" Size="3307" PackHash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" PackOffset="1646934" />
     <Blob Hash="fec18a2dbde7966263480db6559af68fc7e62d35" Size="2991" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="1094343" />
     <Blob Hash="fec1c419b5b42856c14c9671a90922f868af21b3" Size="57344" PackHash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" PackOffset="1334882" />
     <Blob Hash="fec862cb6907e3b93e2504fbc80ff79cc7f5e2cb" Size="551" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="482210" />
@@ -66025,7 +65859,6 @@
     <Blob Hash="feec31a6f3e60cc6eb6e9e927604e568d787b89c" Size="13824" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="1026056" />
     <Blob Hash="feee16fcdb915ad3b21fba9284bd9882b0e9a46a" Size="18432" PackHash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" PackOffset="2061932" />
     <Blob Hash="fef0c83b353b3e44722538cb1fcccafb9f381712" Size="44002" PackHash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" PackOffset="624733" />
-    <Blob Hash="fef499921598e7d69953ce8a36f2d56f2b581480" Size="47295006" PackHash="61aaff34ab94f914826b879f6815085933a1d20f" PackOffset="8" />
     <Blob Hash="fefc4fda15e3421998ea5b328bf02191d389c6e8" Size="3551" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1379059" />
     <Blob Hash="fefcfb8dabdebe37cbd1c0b2bb366adf1a554621" Size="11636" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="669493" />
     <Blob Hash="feff30a9be24936aa9472e01b8c4e32aec069c8d" Size="3171" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="86253" />
@@ -66041,7 +65874,7 @@
     <Blob Hash="ff21a28c74214e84fcf7a55341f7ee75ce16bc44" Size="44404" PackHash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" PackOffset="2047813" />
     <Blob Hash="ff229e59594701600b09378a85b1c7189bcbba3c" Size="19237" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="2066722" />
     <Blob Hash="ff22b1fced5584cb92ac8f72ad5a320541422af0" Size="10234" PackHash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" PackOffset="1679258" />
-    <Blob Hash="ff25d8587f121d41cf5c44f1031836f133757b17" Size="54" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1555678" />
+    <Blob Hash="ff25d8587f121d41cf5c44f1031836f133757b17" Size="54" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1674910" />
     <Blob Hash="ff2c6de61006767d9648988376d606d3e1ce1af0" Size="176" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="375531" />
     <Blob Hash="ff2cbcd06b738a2fc087a33903549733b31fb9a2" Size="83968" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="338440" />
     <Blob Hash="ff2e5cbf2cc3408aaeaaa153528dd492eb4bf212" Size="1766" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="424994" />
@@ -66051,7 +65884,6 @@
     <Blob Hash="ff396dcd2d29f844bd49be20a8295ad27e15c3d2" Size="89102" PackHash="e23187f494893d459aee2428f603a4f93c6eebe0" PackOffset="444234" />
     <Blob Hash="ff39947c1b701eccf278b95dd8765227d4777da6" Size="226" PackHash="435b84318b43c1178e4eb52628fb46a39961b284" PackOffset="2079101" />
     <Blob Hash="ff39c59af472dc47e53962360512d04de3cf6a65" Size="13870" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="812666" />
-    <Blob Hash="ff39ef4f2a7d17b625a5c49999b82c2cce08aefe" Size="253952" PackHash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" PackOffset="476717" />
     <Blob Hash="ff471f09824ac649241ea8c59bbb81369d5758e3" Size="5975607" PackHash="35d1669b4673b8f2aa85d66b894462066f5b3c70" PackOffset="8" />
     <Blob Hash="ff4959f3e4720e359119d3084f108173627f73cd" Size="192" PackHash="9d232548aa4e0302e308e8904fce4c2c9a811af2" PackOffset="391815" />
     <Blob Hash="ff4b744ca969663c5a0927250b32b9ab66c0ee85" Size="11104" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="907096" />
@@ -66059,13 +65891,11 @@
     <Blob Hash="ff511afb05e351dfb6f6a6b907e94d43f33ebe01" Size="21374" PackHash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" PackOffset="339244" />
     <Blob Hash="ff53f0778030232f0b4f04fe2de0f925cfcfe16f" Size="1448804" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="8" />
     <Blob Hash="ff5ccc8a267821f27ecd0be65e7afa845ea5d84c" Size="1309" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1129194" />
-    <Blob Hash="ff5e36d4ffc10c346429b45477b36a9b37739310" Size="19249" PackHash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" PackOffset="1712497" />
     <Blob Hash="ff5f1323c3c2da05328f1639e4d1b06ee3ae01b2" Size="89866904" PackHash="7012cd75b97103dec4c65b6c2594351953c7c00d" PackOffset="8" />
     <Blob Hash="ff5fef7dcef4d4387cd8a7726de2bda9ed887e4f" Size="178850" PackHash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" PackOffset="1207077" />
     <Blob Hash="ff61880bbdfab61a8f753647794ba0b4c63cb0ed" Size="15007" PackHash="e1c2b4950796c10c7e09fb434d900df8557c3a74" PackOffset="292938" />
     <Blob Hash="ff63b4f1055871546aff06b04b778aec0814c2c0" Size="803" PackHash="6d97fd426d9e043b5a45949700d7412abcda8242" PackOffset="2095734" />
     <Blob Hash="ff63eb590b1ccc544636c7376278dcf099d570d2" Size="33212" PackHash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" PackOffset="1568012" />
-    <Blob Hash="ff643993967f60dac2071c0efeeee9361d165a74" Size="3711524" PackHash="79192fa698565fc7947e5036c3d6a67b1e44a847" PackOffset="8" />
     <Blob Hash="ff6490ce42ba0adf52b74ee01eef0c96c692d77f" Size="7298" PackHash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" PackOffset="1216001" />
     <Blob Hash="ff690aea1cea253b9dd9f6075a9e20ba5ac32fd2" Size="3783" PackHash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" PackOffset="349168" />
     <Blob Hash="ff695c261746b337d75dfcff83e2e08b62f7ddd8" Size="19237" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="370378" />
@@ -66078,7 +65908,7 @@
     <Blob Hash="ff706b8489dd39745ec1452f465de5977bc5f4d5" Size="163622" PackHash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" PackOffset="1068347" />
     <Blob Hash="ff70c49dadaa78f4806aaaf96c314cebda04707f" Size="3285" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1066506" />
     <Blob Hash="ff70f44eeea1e44369f7863aac53be98a3561c35" Size="44153" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1251959" />
-    <Blob Hash="ff76b86c48b5165cbf9e6c41e079bd66ee03cfcc" Size="773" PackHash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" PackOffset="1071686" />
+    <Blob Hash="ff76b86c48b5165cbf9e6c41e079bd66ee03cfcc" Size="773" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1241720" />
     <Blob Hash="ff76d467bb840e674d06d77f90f2515b3829fb38" Size="3228" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="417635" />
     <Blob Hash="ff774fd069d92cad59686a5de7fff0fb4625d0f0" Size="45056" PackHash="65b22cf1b5681d751dd1073c0d445ef1a54d473e" PackOffset="1766868" />
     <Blob Hash="ff7b273faf96e152d7f9ccb22d3602235a1fe327" Size="86721" PackHash="ef60a0c38ea7162ceec2c523ef91f87a81f89cf2" PackOffset="1546578" />
@@ -66088,7 +65918,7 @@
     <Blob Hash="ff822b9494c7c773e056164596e5fddddd5b0148" Size="13069" PackHash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" PackOffset="676253" />
     <Blob Hash="ff875d92477cf94af14886bbe6d6865f56d0bc1b" Size="133337" PackHash="f7ff067e31d48918ce41494b39f2f30c48890e55" PackOffset="811172" />
     <Blob Hash="ff881ebe4624c05bf30eb2ef48928b8101f1079c" Size="5394" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="753208" />
-    <Blob Hash="ff8ba3f208aa2e824b67dddf09fa72a77e785b0c" Size="669" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1387725" />
+    <Blob Hash="ff8ba3f208aa2e824b67dddf09fa72a77e785b0c" Size="669" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1507185" />
     <Blob Hash="ff8cdd9916bbc7454d4cb94866e035f707b57540" Size="3016" PackHash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" PackOffset="2089064" />
     <Blob Hash="ff8f6724a8d30e9e39ce550e43b433037f10184d" Size="2188" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="581632" />
     <Blob Hash="ff9177e2ba3587d583c9197316bf4ad5795ae0f2" Size="142011" PackHash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" PackOffset="861585" />
@@ -66110,15 +65940,16 @@
     <Blob Hash="ffb499ee56a15807ac5bdf855ce51832ec13be40" Size="5169494" PackHash="4a46183385827f2cc4d3c5b5d722a5badcbde260" PackOffset="8" />
     <Blob Hash="ffb4d2ad7ee6ba23f021ceadf8139083300b04e1" Size="80483" PackHash="cae11d27e66fd86a674a8d19733509870059758b" PackOffset="2001491" />
     <Blob Hash="ffbc46e09ae6a895d52a359722804703da2e0ca5" Size="904" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2084633" />
+    <Blob Hash="ffbca271a3eeb960c49c3fc647c16075a4242fc0" Size="2371776" PackHash="162feb7e02e7b156526c704188ceed5f7f5d4682" PackOffset="8" />
     <Blob Hash="ffbdfa8400c0737bac04f178f18504d6bf37c3de" Size="22528" PackHash="5098f795311987869f91ed638f4c0a395312211a" PackOffset="2003464" />
+    <Blob Hash="ffc1e727aa13a3d2abf2e98835325c90597bfd9c" Size="1596928" PackHash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" PackOffset="8" />
     <Blob Hash="ffc5343721cd4a45d2bbf68b13a2801868f285e1" Size="12621" PackHash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" PackOffset="740784" />
     <Blob Hash="ffc71b3baab5440abe8bb36a509b5b309e932327" Size="120416" PackHash="1356646e356a511f7a00dbedbbd67d1d541c3006" PackOffset="696463" />
-    <Blob Hash="ffc9f6f2e4ca68a01f8dce758294435349c8a843" Size="5147740" PackHash="50491ddfeeaabd37f18bc59cf86a40163ec0a1de" PackOffset="8" />
-    <Blob Hash="ffcc9b9581d6d3d65ecf51ef4e2c1fe54c5f493a" Size="933" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="2033890" />
+    <Blob Hash="ffcc9b9581d6d3d65ecf51ef4e2c1fe54c5f493a" Size="933" PackHash="8744b312a13828848520eb87651ca7970cf19979" PackOffset="1925021" />
     <Blob Hash="ffd1257de0d3afcea1a789af58884618e63c0389" Size="5588" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="2049776" />
     <Blob Hash="ffd1ba040bd80a4d5b7982281d9f32c196127713" Size="157" PackHash="b0e7677a897dcc7da7de82ccb301777868eddf84" PackOffset="607304" />
     <Blob Hash="ffd3d231fab489460ed6689798359d5d155b1b83" Size="48177910" PackHash="aa2abb18043bb1e50b4c123f51edbc83471db8a2" PackOffset="8" />
-    <Blob Hash="ffdcbb80c0fa13e24ec6753435f57ca0c0aec74c" Size="828" PackHash="61414cf7f1e5c788cc1612ab498ef841efa0481a" PackOffset="1558136" />
+    <Blob Hash="ffdcbb80c0fa13e24ec6753435f57ca0c0aec74c" Size="828" PackHash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" PackOffset="1677368" />
     <Blob Hash="ffdec75d3114c3a200d7a5f56f36272f1bdd6741" Size="12800" PackHash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" PackOffset="2018680" />
     <Blob Hash="ffe13c93069c2d9161a845b25b204b5b072d19c0" Size="20389" PackHash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" PackOffset="189761" />
     <Blob Hash="ffe22d1604b94bddb8e8cf2aea1a3e72e066bfe1" Size="347" PackHash="54156a738d32486cc079f07ec18f87deff6b0375" PackOffset="2020585" />
@@ -66138,31 +65969,43 @@
     <Blob Hash="fff8f12416ae1738306ac7373892301b7b78947c" Size="601600" PackHash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" PackOffset="689672" />
     <Blob Hash="fff93ba23f3ebf4feb7bf54be3ab35dc16cdd99d" Size="3226336" PackHash="ca59ada04d02de4dff1f157d2930f6649bb39074" PackOffset="8" />
     <Blob Hash="fffaf7ba4bf3ddd1fd5e6393e2cbbc24f11a8d2c" Size="38777" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="114515" />
-    <Blob Hash="fffc53339a85b2b32ee7ea207e41153d66865e37" Size="16676" PackHash="fbe884f15eb9aa09eff804df47bc754a1feb410a" PackOffset="1912685" />
+    <Blob Hash="fffc53339a85b2b32ee7ea207e41153d66865e37" Size="16676" PackHash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" PackOffset="1656692" />
     <Blob Hash="fffe02d637c60ae1595a5d785e20cd6f8145f6a9" Size="3770894" PackHash="efc5dddae1add3ef9edef1868a9b1367d32973bf" PackOffset="8" />
   </Blobs>
   <Packs>
     <Pack Hash="000105cade38f7a5ae16f5012e5e932d6ccf29bc" Size="73945616" CompressedSize="21848610" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="001920ff71aa144ace5bb17b8c25c777d87b8aa3" Size="7842104" CompressedSize="1919095" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0055e020f7505cf021eb66b73e3a8fa3cc308b05" Size="2095711" CompressedSize="883278" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="00652cb95427d2302c01bc550ee217751db29298" Size="81482524" CompressedSize="14357528" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="007491dae0c56c74ca78a46639d8e41243bde83f" Size="2542264" CompressedSize="746228" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="00773c9f7b3b76ab8f1500afbec7d973792f3c2f" Size="2095880" CompressedSize="566795" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="00835f04b5eb625818e10d989fcf27cade8e0460" Size="118313850" CompressedSize="32061518" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="0087e7aafcc77ae850ec79cc48f8c7e76a6e28e9" Size="3933456" CompressedSize="1087487" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="00a2060a3d609812c1b991f97d3c39bd6b848134" Size="2095481" CompressedSize="1265857" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
+    <Pack Hash="00ac7fde855f55172b02e9a5de727a53f921439e" Size="8865248" CompressedSize="2334793" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="00b88b00b86f34c3983e4cd0d065a120ef06306d" Size="2097047" CompressedSize="643066" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="00c4eb5dc59035a15405197341b6b925473708db" Size="3004344" CompressedSize="3004020" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="00ce119da898800727dd85f6ad557df8afed3af4" Size="82404619" CompressedSize="19108129" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="00fd831909119ae5923dafe067800c0539909582" Size="2152456" CompressedSize="871333" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="0101ca5c21ab170d8e04207d6976df78e6af2956" Size="7155056" CompressedSize="1750317" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0104416c142ca7b3174660267c22f049db573bdb" Size="2083288" CompressedSize="2012857" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
     <Pack Hash="0117db222eb177981f7852f0cb6f5408cb73a486" Size="18091048" CompressedSize="4622371" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="011b36ca50044919bfde8b1396fec71438335764" Size="5955656" CompressedSize="1241967" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
+    <Pack Hash="01279c6bec046212c79c51a25eacb0d33db422a3" Size="2096862" CompressedSize="564087" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="015c8801a8906be93a066c86046bcd911350f5c4" Size="2072148" CompressedSize="722357" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0170f44d3f771f3e8f69c70f7229839fcc3fc168" Size="81230756" CompressedSize="17678852" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="01beb72f5d3d57b94a19be5dfc193010325fd53c" Size="2092899" CompressedSize="636676" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="01caadf325e923f9dbc46785f18c5b154cd78ece" Size="2096233" CompressedSize="781929" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="01cc750a5cb1276b77908ed7c292d53de8f34e3b" Size="3565677" CompressedSize="760056" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="01d26cddb178f064c3cd74a09430970bf6cc12b7" Size="2097124" CompressedSize="563059" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="01d8f488804be4085b5dbef561644ca15b63ce04" Size="2519798" CompressedSize="1264943" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="01eb6992d45a8b3a5b9b0ba56fdc53669ca6f84e" Size="2096771" CompressedSize="721325" RemotePath="UnrealEngine-4077113-5d36c35a165248dc96de1150d89b9de9" />
     <Pack Hash="01fa198c8120c93d52d0eb1a447044eb9ec75f22" Size="38345905" CompressedSize="8928249" RemotePath="UnrealEngine-3479958-543a927e673c42ee89fb13d09ca158a4" />
+    <Pack Hash="02327b55d449f7ee8ed81121bce17f9da3e30c85" Size="7379608" CompressedSize="2292405" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="024bcfcb9b188c17e4a0d1bb7c167a95db254fa9" Size="2955842" CompressedSize="862499" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" Size="2097111" CompressedSize="608356" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="02659e39c1dbc41b98e65cba6eb918e4c5ccf35d" Size="4046620" CompressedSize="745429" RemotePath="UnrealEngine-3794511-fdda41a8b03d4909b2eb7e47d3317d2b" />
+    <Pack Hash="0277f600d93a301af9caf271d70e761511be43bf" Size="12147576" CompressedSize="3189644" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="028636f94b4558655cd5ccea9f3e6abfa6e85a15" Size="3486842" CompressedSize="219609" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
     <Pack Hash="02a0f12c2e24355ee396573eb72a2ae8cf84e86a" Size="5481506" CompressedSize="5481255" RemotePath="3080521-4555593138d749878eace1a85d45da69" />
     <Pack Hash="02f911003167be7b08c3fbf9bdababa124958f48" Size="1787078" CompressedSize="916574" RemotePath="2489400-f6cf8f7e3aa44b46b137c223b0724bd6" />
@@ -66175,6 +66018,8 @@
     <Pack Hash="03e914bf92c5d192b640e04d9bc4acc3abb71c0b" Size="10322210" CompressedSize="2702612" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="03eac14bed108c28a0a4450fa4f534d145c12179" Size="6603349" CompressedSize="6603722" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="0401e5e54462f53392c35a3c16bfcec383ee000e" Size="12259336" CompressedSize="3308134" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0414d9fee673d76a5bad897183d2322db10ad912" Size="7005960" CompressedSize="1759959" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="0417652ce3e7fade505b77ccc205311ba7e7fb6d" Size="7666692" CompressedSize="1761598" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0419d8143ae34750eb7de7c51c4d3cd231bbce51" Size="13386500" CompressedSize="13388210" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="041a029543f78a913f3c0f089f593b5784964550" Size="2165244" CompressedSize="522887" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="041ab356c5a29f8a2b23bbdc0574575cc47646bf" Size="2376507" CompressedSize="416464" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
@@ -66182,23 +66027,26 @@
     <Pack Hash="042de486169ab637609e1b035138f64893e04ad5" Size="2189376" CompressedSize="217887" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="0438814196df435595bbb951822bf81d0364af0c" Size="2096884" CompressedSize="1207000" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="046536af8720fc740eaf2286f148a94953994db5" Size="9543720" CompressedSize="6545336" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
-    <Pack Hash="046dbc1880244bf220371847dc69b9f8a67aba57" Size="5257128" CompressedSize="1626592" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="0475e2dd05348c03a3067ee40053df4b78a1239c" Size="5253264" CompressedSize="1626220" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="047c57724cc851e897093926dacceaa80fa2848c" Size="3743712" CompressedSize="1751653" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="049a106f4a4ee87739f6460ae5dc478821b525f7" Size="3494489" CompressedSize="3478828" RemotePath="2798519-d40574911ab346b3880844999982edd0" />
     <Pack Hash="04a52fd33c4835777d93c99e413173c6fa2b3457" Size="3854170" CompressedSize="990671" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="04b2955ed75c42f04f68c6205971efb796d5b3be" Size="2094457" CompressedSize="2091604" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
+    <Pack Hash="04c07a4dc2626dc904c7048f270cd1eac53d8e60" Size="2097151" CompressedSize="794483" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="04c28788013394a789dc45f78000e685d793643d" Size="2095458" CompressedSize="690014" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="04e7cca8dbfb9ff523d493618c64dab85ab51504" Size="3484144" CompressedSize="1024821" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="04e83b9b704ff752417e560945db286740e82003" Size="2088769" CompressedSize="578763" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="04f4bb0da3a219a4b515945125c8cfb2d855b333" Size="18941704" CompressedSize="3570222" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="050aa4cdbe153acbe0ca4dfe27dbe6ba23266531" Size="2602360" CompressedSize="826008" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="055e2c4f26219ba201c39594ac6c4ea696ecbac6" Size="36046096" CompressedSize="7336481" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="056b3fcc9f2bb9a7b7024314a17d5c3c91b3bb80" Size="2035276" CompressedSize="831808" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="056c3a75cfb3ba44516a332db18c3e24d207bf87" Size="2451112" CompressedSize="739117" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="056da231130349525f352fa53db6086da790891a" Size="12589677" CompressedSize="809747" RemotePath="2942850-0dac2574939b4856a4b0f4db931751b9" />
     <Pack Hash="0579846434d53b52d2ba093fc5dfd7d0205f73be" Size="4769713" CompressedSize="335028" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="057af2b6ed88a5d8623d01e03afbdf27f07dd1d7" Size="2097150" CompressedSize="678074" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="057c20e3e400d51fc055624d6d7253d6722cdfeb" Size="45064" CompressedSize="45097" RemotePath="UnrealEngine-3587773-e2d14314633d417bba3930f79466a473" />
     <Pack Hash="05b1939a36007ecb7b333e3f08ef5f5879be7e05" Size="938" CompressedSize="529" RemotePath="UnrealEngine-3687517-7d366f2c606e406bbd9eadee82050586" />
     <Pack Hash="05be3410a78afea71327d64933707b9f7550d2f6" Size="2070129" CompressedSize="2067455" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="06023667fb0eb2af1970cef407b39781522a5f90" Size="2326024" CompressedSize="774683" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="061591c07234d834b557294c0ba6178697706847" Size="5274934" CompressedSize="1131756" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="05e50d0189a190d24465cdfb15fd5a7fc39b96df" Size="2162678" CompressedSize="569254" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="061feaf0a3f0d9f379cc7d1dc90e7865fda457d1" Size="2097151" CompressedSize="510622" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
     <Pack Hash="0633702fbf3f8757b6c9c6638a12f33223c3ecf9" Size="13433334" CompressedSize="1208571" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="0640edac4b2d3d5a7d92a6a57d24b14fef282603" Size="2453721" CompressedSize="726303" RemotePath="UnrealEngine-3426407-9f10b6535d5049d6b9f5e098e8371901" />
@@ -66210,13 +66058,12 @@
     <Pack Hash="06ef282f05eca72ca7439d3ca55c259aefccfb8e" Size="14064392" CompressedSize="4316025" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="06f561a38764b8e9c4087a97ed512c995363927c" Size="2096936" CompressedSize="2089728" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="06f8551ab53e55ac8547d5a0944df478384dcbea" Size="2096710" CompressedSize="694173" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="0726a5098596ea99d4da5659b2d9fe70457ab304" Size="8896672" CompressedSize="2342010" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="073846dad6c77e04773801a5ef6b946a6f69ae4b" Size="2096979" CompressedSize="818738" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="073d86b7159054c816df8bbab61a1b51962757cb" Size="2097153" CompressedSize="592499" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="074706dcbd762e027b6d2fb5c47dfc6e3b172c7f" Size="22549760" CompressedSize="8695896" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="076cc4191605504829403925c5d6aa439a8340cf" Size="2097155" CompressedSize="580016" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="077897ffc56b1da4ffb07119599fd5c0ff79fba6" Size="2695135" CompressedSize="718132" RemotePath="UnrealEngine-3797951-7d73b1374dd1459f8e1a1a249f115a2b" />
     <Pack Hash="077b2d38582f0b10f5b7abbe23141dae500a4a90" Size="1967360" CompressedSize="405286" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
-    <Pack Hash="077c31636a009529dac73f8be7cf7a0efe8e4f9d" Size="2097157" CompressedSize="851162" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="07a88f4f32dff82062e33545b17b0011c4f3242b" Size="2097049" CompressedSize="1979263" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="07b553c59e7504eeb8c0c22549d83234186bad46" Size="2193696" CompressedSize="1282059" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="07bac5d4a23c9a7bc1695e030017c8694d72a735" Size="9661138" CompressedSize="3644345" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -66230,31 +66077,28 @@
     <Pack Hash="087316a31bf438c3adbbbf6de04b1ba1c2609e5e" Size="3022384" CompressedSize="1192791" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="0876bced82b841d9ac51a902abbee0a72c97489a" Size="3083" CompressedSize="1568" RemotePath="UnrealEngine-3520166-23337ab1a24d47b483c8f8235d90647e" />
     <Pack Hash="087c1a3a89d641b852ee6a556850960671ea9282" Size="2017626" CompressedSize="444785" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
-    <Pack Hash="088a8d2b68dd145c199dd346a9dd8b17d9ed0547" Size="4198408" CompressedSize="793040" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="088d895921c26c8a8535a3f29b1d5faa996795a7" Size="8936618" CompressedSize="6091294" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
-    <Pack Hash="089dee88d27c9889dbb4c390ab2744bf3a4e1d4e" Size="2914968" CompressedSize="855685" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="08af72aefbeb7863aa09c79bcfbabae24cf8f811" Size="2096348" CompressedSize="1073540" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="08b494ecaf9cdcdd1231a9fb9f8ac58f25caa61d" Size="116688688" CompressedSize="30023623" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="08bc4974c09b130a6d717e3371f3db1465e4e6aa" Size="36000328" CompressedSize="7325117" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="08c816f43c0cb7bcf6836a7f1c940b5b2423e7c1" Size="29244240" CompressedSize="6496469" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="08c883562a37ec19f6d36e957d61acab6efb392e" Size="6767024" CompressedSize="1518990" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="09007b1cd8b9f90a5ab85549323903759f18b852" Size="2721253" CompressedSize="1007025" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="092a98fe048603057c7b16dbd12904011b94944d" Size="5778490" CompressedSize="1168769" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="09358de240dc340ba067bd03e6077676ab6a6908" Size="2097157" CompressedSize="799370" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0938f9e1ba8268f71da4612cd39cf4f06f6974fc" Size="1969898" CompressedSize="700035" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3" Size="8992443" CompressedSize="8993210" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="0963a1a75df9a41f8b96abb8166732470b4c5b4b" Size="13423120" CompressedSize="3192465" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0972fc458f54bd9ff65feb8af24046771dcc3d5b" Size="641021" CompressedSize="145735" RemotePath="UnrealEngine-3611940-4f67b2d22e7f431881325c05dc94a492" />
     <Pack Hash="09732d6bf762ba4d866616248b46adff0e12d76b" Size="2097090" CompressedSize="681338" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="097882ff4f782476be1a4962baf5872eeb7e54df" Size="2097157" CompressedSize="637178" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="098cc946780539c40bbfa63f414c91ab8e9b6ca6" Size="101451096" CompressedSize="18148924" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="09a4bae3cf3add2e8bada69dabfacec664d677bd" Size="2081221" CompressedSize="589239" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
     <Pack Hash="09b220dceaa8205e3a32a877c58c678dfdb8555f" Size="8151842" CompressedSize="7548022" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="0a16f39fc41ba29b49b8b925e900b1aacbcd5c5e" Size="115761828" CompressedSize="31006968" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0a17d50561c9bf1d85e82416f97726243726fe8e" Size="5532366" CompressedSize="5532105" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
+    <Pack Hash="0a5f18beec683918579defc535c5cd097d71f4e6" Size="2097125" CompressedSize="651401" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0a5fd4afe7a8e3e343d8e730510653683e4a59f2" Size="4454722" CompressedSize="936763" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="0a8122b365f1bbccfbe9f252e37c57af95994f01" Size="2162362" CompressedSize="569215" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0a85e36f224c350b058936fdb88cb656864411c4" Size="9375560" CompressedSize="2712042" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="0adcf8b7399354848f3b1659ae1bdfebe7c5fb54" Size="2455937" CompressedSize="876816" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="0aea457d3fb14174a1cd037c649288b253c1cbe7" Size="2097159" CompressedSize="474699" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0b08539c1aa236659f1a3bd219781383fe153175" Size="1441642" CompressedSize="403587" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0b19af7719665b5651dfb183e0f462030575539c" Size="2195547" CompressedSize="1908267" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="0b19f9b4f8c7fa35c740e15741728028920bc0be" Size="914927" CompressedSize="418944" RemotePath="UnrealEngine-3495291-a4eb507daac54cf4a9be017548b7b4af" />
     <Pack Hash="0b2ccb2ac5f9b504814db38f33b67b6b4db7ff78" Size="5123516" CompressedSize="1113245" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66264,26 +66108,23 @@
     <Pack Hash="0b65847315b6c2c97cf1cb6e6d159e22233c8251" Size="11617925" CompressedSize="11619077" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533" Size="2097159" CompressedSize="821007" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="0b6a64af9d078674ffc38858d72d025e3b770ff5" Size="2392569" CompressedSize="711697" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
+    <Pack Hash="0b7e293c6adde8c239f6870f376485b673232634" Size="5306574" CompressedSize="1137986" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0b8fca4360ea7f51c65cdf9414bad3930635b1a3" Size="2096300" CompressedSize="731996" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
-    <Pack Hash="0b9e1f4372d5a1649a6df12553a9c3918340df25" Size="5363368" CompressedSize="1632924" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="0bb21cd291f2eac4434972c081154105a9672abc" Size="2097129" CompressedSize="834355" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0bbfc90e364f03102506acd5ad039a28e02cadf7" Size="6215004" CompressedSize="1711178" RemotePath="2618399-180c811b4d074c95af323aa82cdccb34" />
     <Pack Hash="0bc028d0b62f4b1147966e8709b9699fd37b6a4b" Size="2097146" CompressedSize="938933" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="0bcb656ce46ff06b8105c11bb045e7de26b52102" Size="5503420" CompressedSize="1686428" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0bd924dfc633b391b158fec5bd6fc686e4bdd669" Size="16266784" CompressedSize="4107215" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0be2c627d24e446f2f7194edb8f790ec3d0c31ac" Size="20922872" CompressedSize="6277911" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0bea8e482197a9378d1256b0989c1af440e374f1" Size="2097141" CompressedSize="1389340" RemotePath="2776829-8bd2692b18e0411993b00fc6fa33d651" />
-    <Pack Hash="0c0157dba5da40850e17d1c05d984bf3128d0338" Size="3360524" CompressedSize="1006054" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0c04f1620b9005b214a9f357a490fe331c1593fe" Size="6034992" CompressedSize="5435977" RemotePath="3325693-95609c8c9d384407be95de025dc827bb" />
-    <Pack Hash="0c0bfb4f66cb743931138fc4cc85a9a22bf051ac" Size="10979592" CompressedSize="3149591" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0c19f1fafa107134bcf5657ed269f0740fc4d0a9" Size="2010252" CompressedSize="645288" RemotePath="3215544-fbbce13ceb6f4aaea59e20af2d659d08" />
-    <Pack Hash="0c3b6ea6bcbe567cf7a0cf2d8d4492dad4d91257" Size="2046495" CompressedSize="612727" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="0c3bdb7f1e9ccc7d8dc773065ff1e472e91af12e" Size="2097150" CompressedSize="839713" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0c6976e514586ffb89833a5350ff91c4ff47c343" Size="2012532" CompressedSize="615138" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0c845e0f8dc0189835418f168dfb653326459528" Size="2037700" CompressedSize="577569" RemotePath="3146243-698f50214c564ed9b16b58c696b664cf" />
-    <Pack Hash="0c97070e87e372925a4d21766eff739d64e3aa43" Size="52536630" CompressedSize="9930398" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0cc57de3ef019a2b8b6c70cfd54a12a625025ccc" Size="15016785" CompressedSize="14171113" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="0ce04792e19e5da32ebfe669704ae48f1f016d74" Size="2989512" CompressedSize="876148" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0cec09dea442a96d2db56d5f25830c204faf9c73" Size="2260944" CompressedSize="1076052" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="0d02ac2c7c8439645362d6971e67af3a31c8178c" Size="181355038" CompressedSize="36744098" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0d2648faa891de281e340f96be71c4ceefa35596" Size="1995923" CompressedSize="518066" RemotePath="UnrealEngine-3777242-2bd2dd48ffff490f920a1af9d6c763dd" />
-    <Pack Hash="0d43c6797854f8d46f9bdbaa0bbb9cfe2594f506" Size="2537920" CompressedSize="815220" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0d57e8104575102e83043b6a71861eb6fbaba0d2" Size="2096654" CompressedSize="707280" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0d6e37eb425a92679b17718a96f6bf9d8103f02d" Size="25752" CompressedSize="5032" RemotePath="UnrealEngine-3937573-050c0c2f2cc343cb979dbfe0e20c2afc" />
     <Pack Hash="0d8b77c0420905b48b0ad3cb816ac09e521841c4" Size="1648410" CompressedSize="257348" RemotePath="2624515-65e4f107761c44f799aea052f127dc15" />
@@ -66295,27 +66136,35 @@
     <Pack Hash="0e193e18b29451ceca3dc84f41b78de7a72e8dd7" Size="4815390" CompressedSize="1304913" RemotePath="3112924-9ff83533ed61434ea8d7f988b71e0c24" />
     <Pack Hash="0e1955c8d1171f50f75f6d497f7e313e97d5648d" Size="6142810" CompressedSize="858416" RemotePath="UnrealEngine-4067073-f4223345c30c43e9b9a5d5fb88e6738b" />
     <Pack Hash="0e1a08f56c646fa8ce394a0e41b8cab5a658268d" Size="22945402" CompressedSize="3818141" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
+    <Pack Hash="0e22c92b159046c2db1e7ed7e4bf8c765bc4e58d" Size="2096605" CompressedSize="602067" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0e26168a7254c7ba26bf4c06b28033e8387c689c" Size="4251486" CompressedSize="482308" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="0e28d0cacb35ac8074187e3d2bef8935b8c7b8c6" Size="2624472" CompressedSize="1028400" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="0e66c5001a966265835942e0e67fa367c93769e4" Size="19057688" CompressedSize="5472622" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="0e7bce814c660d02683cc352e5e81bef18ff6d41" Size="47228742" CompressedSize="13800379" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0e7df8b0ccb5f633348a532eb430c875f3b4a6d6" Size="8722320" CompressedSize="2311486" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0e8455eb5c0c5101ea5cf720ab36b38758aaccc6" Size="2541248" CompressedSize="815433" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0e900c83f7df28c01867b455e411c43b3c3ac1a6" Size="3814640" CompressedSize="3814483" RemotePath="2665321-6ed08d19a92744829f2d1be31eaa6b94" />
     <Pack Hash="0e9b8d474b2e684fcdd78f5e9ee44fec388f756f" Size="6182823" CompressedSize="768719" RemotePath="3159496-dcbf61fa16324edda4e8cfbae6bea77d" />
     <Pack Hash="0eb8b8e51ee2b44ad13c6634b4f0527eea558da2" Size="10309" CompressedSize="3351" RemotePath="UnrealEngine-3806706-a4145fef1942458ead0ffa67555380de" />
+    <Pack Hash="0ed14b33f38a079eab41685991300558ffebc7b3" Size="1558390" CompressedSize="431521" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="0ed315ae5ece5f85a8eefa1895110d8eb69a8a46" Size="1902836" CompressedSize="504737" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0ee5f371d8dffa94c5df7c2c1337d8a7029c022c" Size="3029397" CompressedSize="3028965" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="0ef20b1bc63480df5baf5d164bd7d5bfcc91b587" Size="14955802" CompressedSize="14102320" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="0f095d36e2ed6cf68127c454b550d3a2a1df0024" Size="83068448" CompressedSize="40627696" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="0f1af4d8e108a3ad1f23a1764271bec22dece02f" Size="10985632" CompressedSize="3146944" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0f3b0d53cb04138f581c9ffec349c88f5b7bdcb7" Size="105104011" CompressedSize="28825441" RemotePath="2832392-951285e50c9b4177a8a221f4f4f6b0f0" />
     <Pack Hash="0f4d411f14c4a394347e4274d30c54a8e7f3bf61" Size="7038462" CompressedSize="1534826" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
+    <Pack Hash="0f729cc99443c28e5f407f29da4e6b59106b7080" Size="2097119" CompressedSize="767364" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="0f86bd8b76eaaae89a0276c6d4c6df9a7c7737b4" Size="7590292" CompressedSize="1740650" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0f8b9cb4cd7d0eafd55873e7ed188429680153ca" Size="3204060" CompressedSize="778831" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="0fa808b34bb2d9578d8db45574b5e9bc3482928f" Size="11200520" CompressedSize="4259286" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
+    <Pack Hash="0f943b6d08d84030764eb5569053c6be48373bbf" Size="81770188" CompressedSize="14390179" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0fad4f1e57bd600af1a96610e84ebe627b039285" Size="16140832" CompressedSize="3760432" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="0fcb9dd8080ea7151759b51f07bc9af583742e92" Size="19041184" CompressedSize="4814324" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="0fcf8dd407022ec880ac48e402fd1d525ec2a7b4" Size="2004520" CompressedSize="527976" RemotePath="2902827-fcb0d018c7244c24a109c548187a724e" />
     <Pack Hash="0fd5eed8a60e37b2e26485203138f76bc959a273" Size="2095322" CompressedSize="653408" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="0fd80966ce9dbbb5c2f218287f28e6e910c512d1" Size="2390024" CompressedSize="970940" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="0ff93d57c8deeb69f9a9ba42346eeea5d09c7867" Size="3482656" CompressedSize="1024948" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="0fda22e71f5ea5f020685af2cde9b9692bd31401" Size="20120302" CompressedSize="3759300" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="0fdbcebf63bbf9d68f75edb459e8a195622e5a5f" Size="5087008" CompressedSize="1255458" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1015366202732d5b428dc71ad9ec5fa99ca1b874" Size="2082617" CompressedSize="2072372" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="101a54dc6c97ee4664931b0fe1132667f3b1332a" Size="18546552" CompressedSize="4737837" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="105806b72818c3e740aafb34be4e1527294311be" Size="52510206" CompressedSize="9924763" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66326,19 +66175,21 @@
     <Pack Hash="109ac2799187c1e94076a2db14922c275e94adbb" Size="13412002" CompressedSize="3155349" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="10a531ed54eb41468e4dd03b010b5e1d2de8f09b" Size="5319536" CompressedSize="1540040" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b" Size="2097130" CompressedSize="566916" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="10eb201f2607493da5f19783ef9f6b33f188b445" Size="128867882" CompressedSize="33497542" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1108bd75becd710a98c124322f511dab995ed481" Size="1458884" CompressedSize="749046" RemotePath="UnrealEngine-3422839-55d3c4dbceba4c52876d3130bded3a92" />
     <Pack Hash="1126eb9ca3c38b485aae5a6c3fc539688ce14e78" Size="3589575" CompressedSize="389968" RemotePath="2911277-6c766e15709c47e68dd4ff5b2a0f2864" />
     <Pack Hash="112c722ca4aff1e860e5d701a02684bc88fbdfb5" Size="1947617" CompressedSize="1810506" RemotePath="UnrealEngine-3914517-e132430a98c54b90b661db57e91a96b1" />
+    <Pack Hash="11721655da62ff0bbdbf8efb922f8e28c1949239" Size="5359528" CompressedSize="1632703" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="117d0919569a4de37ef5251976c8f1686edf7499" Size="4452152" CompressedSize="1299442" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="117d71ba1eccfcf3df50efa7024373d7034bf78f" Size="3477653" CompressedSize="741009" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="118b5a9859852d131b48a4e2388cd33f1a7ee9a8" Size="14790024" CompressedSize="3084078" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="1190c5f967f5124b15da3b53d752af7d4bc0106b" Size="2374796" CompressedSize="733434" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="119107d2d43beb08f95acbdcc321f936262f2c03" Size="3644768" CompressedSize="1008629" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="119472dd321e51d7d83032997ab9d118a312a2f4" Size="2091870" CompressedSize="599615" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="11acf4d6ecc4d111a114333d17f3abb7c0f2b779" Size="47119" CompressedSize="5886" RemotePath="UnrealEngine-3723489-713e4eed3ee14dffa870c5fb7245cee2" />
-    <Pack Hash="11c4a5c13a5d4bab9ce1043b7bcae748a1bc3c77" Size="7384128" CompressedSize="1869348" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="11da4319435023718ba10ccda30bf238592765fa" Size="11045310" CompressedSize="973911" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="11e438a0e9cce9a7f418f5a51b11ed64bc1b9a1e" Size="7664512" CompressedSize="2544015" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="11ed04e6cfcf75ab7765dfe5296f180ef0230380" Size="8109424" CompressedSize="649627" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="11fc972b2f88e9035190e6aa5d4197f9524c63cd" Size="5703176" CompressedSize="1419050" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="122452a137c024d8c707aa25425fc869781dd9e3" Size="3737288" CompressedSize="1745491" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="123847724c45b9058add327580b24c223de573e0" Size="18469384" CompressedSize="6652553" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="123cfc7b4f950bd4f688a3a67f65ce112acdbebd" Size="1542542" CompressedSize="415121" RemotePath="UnrealEngine-4023459-362f13522ed647339f2c5af89a36207a" />
     <Pack Hash="12468bf1be869d88d9a8104ffde7c4887839843d" Size="2089656" CompressedSize="491679" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
@@ -66348,8 +66199,6 @@
     <Pack Hash="1269a386c6628ec75edb0f515bfc0ea5dfe680a0" Size="2571260" CompressedSize="1000770" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="12700562edf1958605de39804423cefb61998935" Size="2097155" CompressedSize="629204" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
     <Pack Hash="129909952ed6001fa57124f3e9420f90038fa84a" Size="15400456" CompressedSize="5342384" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
-    <Pack Hash="12afa5394ee0d066e8ae695698e2b6da3a5d0812" Size="2097090" CompressedSize="858524" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="12b7ec5b16fe9b6e1e00d60cfa36a1a4ca403b01" Size="28202336" CompressedSize="5585811" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" Size="2097132" CompressedSize="930965" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="12eb0444499ce41f101b1b5f9dd6b87894949511" Size="2089964" CompressedSize="2065040" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="131d64c4948a0370d99897b2ad5a968b160e4300" Size="3374610" CompressedSize="992256" RemotePath="2624516-13715a1c40f44f86ab7fb65e4a808831" />
@@ -66361,45 +66210,49 @@
     <Pack Hash="1399ed01a40f3dc85371192d03a242261fd5bcfb" Size="6191268" CompressedSize="1266025" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="13a5a3c398cf7f01e4a22eb674a58b69a69da24c" Size="2989856" CompressedSize="897408" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="13a5c625417641ecefd3dd0f5cf77e351e979180" Size="17780648" CompressedSize="8258284" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
-    <Pack Hash="13a9ea79cc0c6739419051442aeebd83d180dfd8" Size="127604964" CompressedSize="32824721" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="13c7b27a977c4bf9c4e07a19ffb106c1128995bd" Size="4233958" CompressedSize="1546640" RemotePath="2902827-fcb0d018c7244c24a109c548187a724e" />
     <Pack Hash="13cb8929a9a1ba47afd60aa9e3b42da445350844" Size="51913524" CompressedSize="8979705" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
-    <Pack Hash="13eb117b008bb50733d2545ce9464548e577dd93" Size="89783648" CompressedSize="15381662" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="13ef648e569a4224d5cc0cea1c6b6091f9a85c92" Size="2415728" CompressedSize="750431" RemotePath="UnrealEngine-3683447-fb0434a1a10a4ae9832936ce73c13d3b" />
     <Pack Hash="13f4c8e0af0fea2274e128d899af8acde4e64330" Size="2097153" CompressedSize="758177" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="141031efaf451d2e472cd328bb1fefd91ab2ecf5" Size="2080185" CompressedSize="1264496" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="142ddd26a143aeb02ee0ebc41be2e53c051e8680" Size="2037402" CompressedSize="693604" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1448a8af36f3fbcd695fc791d6e9d3c94f11aa1b" Size="8938856" CompressedSize="6058900" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="1460683660e47f20fe8069fa1232b20b670d96fb" Size="5958371" CompressedSize="771204" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="1467cb6b7644671f3127567be26cf07d20b6da7e" Size="2096192" CompressedSize="956410" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="146b3768fb0d7880b8c751140d38a1177906de0f" Size="2315048" CompressedSize="784529" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="1471837617ec5898ca2e49cf20ad5e0795687b7b" Size="5481351" CompressedSize="5481072" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
     <Pack Hash="149605f77f4487d4f238f2439c46df83708b08f8" Size="2096848" CompressedSize="739108" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="14966fe52911f6f2751a38165c9284f3e4b33aed" Size="3351178" CompressedSize="821479" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="149f4809e544a467503b66fcd4c9a8e80a53c021" Size="8761498" CompressedSize="5742695" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
-    <Pack Hash="14e4bfb068a9788705bd8c342a78e4265ce78064" Size="127320648" CompressedSize="26587283" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="14c5f512f83cc2e491965d0c8e8f0dbdc213b0f7" Size="7327464" CompressedSize="2023349" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="14ed1523b362401fc18a0cc6be0aacba8a3fbf35" Size="183234300" CompressedSize="37097663" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="151e2bd46e9871e76b07bdeac8913141f8a40bc0" Size="7639848" CompressedSize="2178096" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="15290d2adfdd52e1d752e3b1a1275aa26fe56653" Size="7010396" CompressedSize="1692047" RemotePath="2945995-7123fe3174c344f6b24da7209d566cb8" />
     <Pack Hash="1529cfb02e6c5b9fdb4160a900eba6831a4557c2" Size="11125950" CompressedSize="2338844" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="154306df1d2a4877cbc22db8224277c856f1b6b2" Size="5375061" CompressedSize="5375087" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc" Size="6509721" CompressedSize="6510112" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="15a29bf7d19c99e91c937a1e3d3a1cf19f1edf8c" Size="6008738" CompressedSize="1245356" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="158906cf7860f16c468a7866d44e991f39718eec" Size="4011402" CompressedSize="841596" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="158cdadc204fb774e3ce74edc80832a66cd38867" Size="2094084" CompressedSize="880291" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="15ae862d7e6c16dd10b324f1cbb6e1c3b6cb1f27" Size="2097015" CompressedSize="883457" RemotePath="UnrealEngine-3681648-6c3892ee5aa748d8aeb1751ac1dad4cc" />
     <Pack Hash="15c1c1820f17cbc99a977498d87549e3b4060f7c" Size="2094544" CompressedSize="701054" RemotePath="2819197-47157e6048414ed39e3b1cb2cfa9c5d7" />
     <Pack Hash="15e6fe90e6ae6df3926328f7bf7ba63205fe3fc1" Size="24864034" CompressedSize="4154732" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="1602570734548d1f2963647a6b9812b6d2a5ad53" Size="2893332" CompressedSize="1151921" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="160759b8121bcdb3ea6b08dd679073f818bd498f" Size="3874080" CompressedSize="1068875" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="160abd677bd68938dcf9cf3d37178b95843fc921" Size="3048084" CompressedSize="1114618" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="16156b79a48aa58bdd2ba5ca2dd45467e043475e" Size="14371416" CompressedSize="3642524" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1625b44d3d9ca0356d470e794ffd8decb7d76ace" Size="2073784" CompressedSize="738943" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
+    <Pack Hash="162feb7e02e7b156526c704188ceed5f7f5d4682" Size="2371784" CompressedSize="610602" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="163784cb855cf579aa85c8d84241ac308c31d9c6" Size="8351542" CompressedSize="8352348" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
     <Pack Hash="167a3b509221baa789dd8c568b74ddcaf7c4a7c5" Size="2083188" CompressedSize="703399" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="167be8add9203646ba104513994ada94b2e00fd6" Size="12806050" CompressedSize="788548" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="169c16f72285688d1689d6a43d1dd08c35f2952a" Size="2740232" CompressedSize="881716" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="16a5c30dc686c64ff3e0ae9ad65dfdee2885234e" Size="10955459" CompressedSize="891684" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="16bc6e217fb6d6e8e2cb1268a003ceaf39705809" Size="4507216" CompressedSize="291308" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="16e421c9204b08586edd8de93b93b19fb10644ea" Size="2097148" CompressedSize="829873" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="16eb41dbe8fdf24619f46ad4cd69f15891b89a36" Size="2097147" CompressedSize="1912183" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="16ff1b3c00e3fef8b809b49a5b63be510b23dc97" Size="9359951" CompressedSize="9361080" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="170dc5a09e18eb4e9ac0ba3ff12f540fd6ef0432" Size="5302022" CompressedSize="1136897" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="17314015bb13dacf83a5b80eab858c9bfea2ebb8" Size="2617352" CompressedSize="596210" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="17402eb37bf5e08415f3ce80c4d0fa4c0b33fa08" Size="6003" CompressedSize="1395" RemotePath="UnrealEngine-3796561-faad1b236f2041e8a0ddbcd5a8b4533d" />
+    <Pack Hash="1749a2114faf4b6de33260e138a6e0b1f3cd87a5" Size="5282280" CompressedSize="1676112" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="174cf9700765a2df5854b7af0279ade549dae22d" Size="5488790" CompressedSize="1685812" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="17535b203a83b5f4d46d9a777399a1ecb5c548c9" Size="218505" CompressedSize="183140" RemotePath="3217733-f37f0ed5ab8240b8b7fc16a39606f17c" />
     <Pack Hash="17616766fba8b632f91292005c9e29c5260fc341" Size="11733566" CompressedSize="3112682" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="176fbbd08f6b92151d2c02790b400052284704b6" Size="100698316" CompressedSize="26113848" RemotePath="2665321-6ed08d19a92744829f2d1be31eaa6b94" />
@@ -66407,13 +66260,12 @@
     <Pack Hash="17776652e1ca155fb61327f3fb532b6b999f8c20" Size="2428093" CompressedSize="723318" RemotePath="UnrealEngine-3932718-813bfefd337148ff9c90cea7382b8608" />
     <Pack Hash="17a6d0d6dffba4988261e1a7bc800871ebc6d638" Size="5080382" CompressedSize="1347822" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="17b957ba8ae675e848e0d5ea9a42372ed27725d2" Size="1384292" CompressedSize="268123" RemotePath="2945995-7123fe3174c344f6b24da7209d566cb8" />
-    <Pack Hash="17e079cf6fae4bc6d6163dd5edd4046fc95f5e90" Size="3381724" CompressedSize="1007624" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="17f02066f6cd44f3f2d054094c5f610e89f2bf8d" Size="118527016" CompressedSize="38783625" RemotePath="UnrealEngine-3540331-05f0ec182690424492b80ac48a827a03" />
     <Pack Hash="17f24542b619ed66aa29fe28eb716b4dd4c33d84" Size="3836021" CompressedSize="3835598" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="180e4a2502605ec72c9d431cd1b08950ebfb233e" Size="2095235" CompressedSize="409719" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
+    <Pack Hash="18290e67121300769aa667fa52f52a59e7535a86" Size="15852680" CompressedSize="4459231" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" Size="2095650" CompressedSize="1335259" RemotePath="3041367-5ed8062ed7b244fbbe088cb9a31b34cd" />
     <Pack Hash="183546a339ebc6cbda54cb8ba6beccec1dc9a02d" Size="790015" CompressedSize="352930" RemotePath="2791734-981e85b2790e41f790ad9bf5a8e8b9b6" />
-    <Pack Hash="184286ae9b99b07314278b5f2c8f48215236ead8" Size="8875952" CompressedSize="2335096" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="1846a8eaf700005d638680c1ccd94ded8ff6d5fc" Size="116753" CompressedSize="18742" RemotePath="UnrealEngine-3585944-eb08711fe37541db978bdc6cf77823dc" />
     <Pack Hash="185535353a9576cb4f9e4a7fa3c1fe649d00f26b" Size="4032110" CompressedSize="1270730" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="185908a865ebe7f6ee31701211aad217de343c7f" Size="12333996" CompressedSize="12335723" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -66425,7 +66277,6 @@
     <Pack Hash="19110c8eccff2fbcfd4ec9888f7ea92e0cde28c5" Size="111227585" CompressedSize="110231540" RemotePath="UnrealEngine-3439415-0a8c749a4feb45b7ba6f199533eaf46a" />
     <Pack Hash="1916cbea932d8ec4cbe73743294b2456b6f82f4d" Size="2092842" CompressedSize="2056347" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="1919f737357402ffd6035ef99089bf4492ef39ce" Size="6558922" CompressedSize="6559054" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="191ebf588dc8033c8f429efb4aa9f656e12e6c89" Size="1552572" CompressedSize="439595" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="191f3a11282e382aaeb943fe0f6673a441f9aabd" Size="40357814" CompressedSize="4555005" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="192c36d310b45029e1af5607bed97fb7c30b58c7" Size="2612254" CompressedSize="777535" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="19325b361aac58944ef8268ca0c24c10b89b6298" Size="2050254" CompressedSize="653700" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
@@ -66443,6 +66294,7 @@
     <Pack Hash="1a42a9452176f527cfbaa6dd896ca0728d81bb37" Size="2097151" CompressedSize="504959" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="1a59312b7071dfe1ec3cc2477256fd82fd2b01fc" Size="2097158" CompressedSize="713915" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="1a5ecbad3eddb57b522f4873840b8a716d98b2b9" Size="2085659" CompressedSize="1690933" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="1a6de09fc2156606eb8780daeaeec00d90d2bff8" Size="3213320" CompressedSize="695159" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1a7aab9f337597788fc47e502302afd98a7c41bc" Size="4030322" CompressedSize="923709" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="1a7fb4d3ec15d2096a4fe532191d9957b1a711d0" Size="1452225" CompressedSize="991123" RemotePath="3106361-84b8312ded7341e695e4bfc877dd0642" />
     <Pack Hash="1a89dfb24d951c919ad4f1942c52ba8f42fc896d" Size="692408" CompressedSize="601100" RemotePath="3111280-5899ef57c09b468499c93bca6f2b0c64" />
@@ -66451,13 +66303,9 @@
     <Pack Hash="1ad091a77f5ab3bd235d0cafc019040d50becb2a" Size="1863904" CompressedSize="582886" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="1ad9e2ca40ae2f3a2dc1bf23fd8749af62f784f1" Size="13006960" CompressedSize="5308257" RemotePath="2798519-d40574911ab346b3880844999982edd0" />
     <Pack Hash="1ada5f49cacb7144eda18decad4a5f34ab8c5ec6" Size="7468544" CompressedSize="2136440" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="1b0222e48d569ebe014d196fae73d70a9f9a3667" Size="2097031" CompressedSize="737889" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="1afad53edb8e037d8c68bb4feba16cd9ee387b81" Size="3523794" CompressedSize="1127541" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1b1fd0192002d3bbc0aaa61795aacc2082f46506" Size="2094384" CompressedSize="1747155" RemotePath="UnrealEngine-4067939-b2e9d61495224f128837f3640e15e0ca" />
-    <Pack Hash="1b216fb287fb1caf2398e7a132f2773a850af853" Size="12730864" CompressedSize="3047231" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="1b2fe0f0177c2fcf7eb7c557d0da35c8629ddd6f" Size="3452600" CompressedSize="1159933" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="1b3c64937d1134f829e9a7c539296a5d8a53f58a" Size="3385680" CompressedSize="1207237" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="1b423e2336ebf5909090b72b0f04f7fe5a6d1c19" Size="32358956" CompressedSize="8718967" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="1b66de40bfbc05d191c7100ff8f6be501907256e" Size="1524406" CompressedSize="431423" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1b6af1ffdbeaea297a67e5d6e1117ece64a5e3d4" Size="2097115" CompressedSize="823125" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="1b7eb2bc38e40d7b9d86e04361a65e9a40b0c769" Size="110452744" CompressedSize="24957460" RemotePath="UnrealEngine-3439415-0a8c749a4feb45b7ba6f199533eaf46a" />
     <Pack Hash="1b857a80e8a2911a796905551b990cf63aa07cd6" Size="3051346" CompressedSize="806191" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
@@ -66467,59 +66315,64 @@
     <Pack Hash="1bbc3311955d3d138277baa75f554a0ba230eeea" Size="2279300" CompressedSize="804622" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="1bc75b138126eb6bffa66cec63df9c4872d65754" Size="4302320" CompressedSize="1355324" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="1bd7fa4728ffc004e043b1b1b02a79c674dfa7eb" Size="4886661" CompressedSize="326391" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="1bdfb2089d50fef664ddd40f88773779551a6963" Size="2093098" CompressedSize="770871" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1be30bac2f567e402ae48b89e8355a4b4e609b8a" Size="373239" CompressedSize="326396" RemotePath="2621166-706a1811c2684ac5bae65fafa17839c2" />
+    <Pack Hash="1bfd9b85a7181c944374fc8a94632065574a0029" Size="2097076" CompressedSize="1071907" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="1c04450690dbabba6d904a033b07b408ea13f8c9" Size="36255992" CompressedSize="7393601" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="1c1df5eadc9bce7211cda985101ff6f9802a231c" Size="5183680" CompressedSize="1524898" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" Size="1732673" CompressedSize="1108363" RemotePath="2621163-719903f8599f48949652ccefc2a2d5be" />
-    <Pack Hash="1c802468b7c24981b8a13e9368ce487aede6c6e9" Size="14659526" CompressedSize="3050742" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1c870a21bd12a7d4d3dd7e888e05e67cc7beebf6" Size="4298090" CompressedSize="915933" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="1c8c4f665f2963c27b7f1420af0878243670510c" Size="2097158" CompressedSize="810456" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1c8d955be9265f85641ccaa5c0c9abacc66115f7" Size="3756168" CompressedSize="1431275" RemotePath="2902827-fcb0d018c7244c24a109c548187a724e" />
     <Pack Hash="1cb0a16db6f4f3cff25cd2585257353b73810e04" Size="1497552" CompressedSize="494800" RemotePath="3257324-ed054502655846b892a6336fa2dbe066" />
     <Pack Hash="1cc75d73a39855aa9b8271539f8e7dfe05505fe9" Size="2049445" CompressedSize="473402" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
+    <Pack Hash="1cfa6fa1195ec3b7caec1ca31e22baa5bd2d6d19" Size="2096500" CompressedSize="661561" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1d023baa2108e345f4e435e269145d0618dc3072" Size="2070529" CompressedSize="323263" RemotePath="UnrealEngine-4023459-362f13522ed647339f2c5af89a36207a" />
     <Pack Hash="1d09bb4f8ba502cef13de6d570839e6790bf3542" Size="2097124" CompressedSize="682846" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="1d25ba75bfae01cb71eb0d972fc438c145b6fcfa" Size="18923528" CompressedSize="3566439" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1d452bbc5f5df5c0d8acd1367971123c3c3ef9e0" Size="4876808" CompressedSize="342419" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="1d4b95bb10acff5f59d2ee15d2b2a471e37dd22a" Size="5325495" CompressedSize="1086886" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="1d60db179ff371dea48a2563f1d53b631dd16259" Size="2444848" CompressedSize="1103087" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="1d65dd4bc54fb708e89f184268c81d7711313128" Size="2094098" CompressedSize="2017384" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="1d82f1e693e8f317ca408dc5159b1a6afd317016" Size="7452822" CompressedSize="7453218" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="1da636150264e48db0a3e3fda25f57a295507d13" Size="33520290" CompressedSize="5067561" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
+    <Pack Hash="1dc7e628016bed533e465b759ad5f17b3261d991" Size="5280214" CompressedSize="1133322" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1de56cfe8e5653b9fc45db6c7bbda287dd73ac20" Size="5192996" CompressedSize="927559" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1de6aefe4b6fb071dd4dcecd485d35d47e402c40" Size="4629000" CompressedSize="949214" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="1e055e63bd6170b9decba90a7280bda4a686e85b" Size="50264600" CompressedSize="16838803" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
     <Pack Hash="1e0c495e2e2fc0f9ab567761cfeec0d8659f6572" Size="10882541" CompressedSize="10883877" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="1e33a7fd6b3c77f6b26bfdb298ed19b483b7ea20" Size="2165148" CompressedSize="522796" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="1e45ceb9dbd1394fccdd45af21f00c74c3eeadfb" Size="31001128" CompressedSize="8467190" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1e5f1acb2ff11204704e7edb01d3ed37a7b1aecb" Size="37641224" CompressedSize="15604404" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="1e6aa2734645d55d643f5efa5b1d568bd9cc24ae" Size="2097153" CompressedSize="1204521" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
+    <Pack Hash="1e8ffd2bcbea9cb9c6be76aa809b6271bda43370" Size="2556424" CompressedSize="642600" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1ead4f6f04dbd7d3989d46670724a9971e4111bd" Size="19886530" CompressedSize="5793921" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="1ed5f714ced00ef08aead11fe780ef685c8cf32f" Size="2277468" CompressedSize="481433" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1ef5c21107774059ed6c5010dd2d5f3373c81445" Size="2086143" CompressedSize="2070554" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="1efe26f64dc5b23b33a564484cdf8608c170db53" Size="1961061" CompressedSize="402819" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="1f10b8e0a3d6f6fdfe5b451508626eda10e3e771" Size="2097065" CompressedSize="2052122" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="1f16dc4d3fdc90a7f8a2b3062836d162875955ff" Size="8951772" CompressedSize="1794099" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="1f3e182d71989b39327a7ab2e8187e5725ef0e40" Size="4367780" CompressedSize="775896" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="1f44158f21e0e2b85fdf4b056ccdc94e3935927e" Size="4844208" CompressedSize="1837704" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
+    <Pack Hash="1f47b0b502e338c2139e2597424509bbe13a519c" Size="1769084" CompressedSize="475952" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1f543e3869d5497bfd6339e201b81758e1f6d0c2" Size="6708618" CompressedSize="1613531" RemotePath="3008183-b9dbe24f35d9484c9b34c22c4a83d18f" />
     <Pack Hash="1f6d6fad7e06075adf86ceca40a1fa9f9b360912" Size="2192248" CompressedSize="292326" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="1f8a7b587e8133a13a9ea9a805fa8a61c1ab039f" Size="11838562" CompressedSize="3161180" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" Size="2097159" CompressedSize="585067" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="1f9a8d0bb7201d7683ebf836f6d5fb1253ad9e72" Size="6092822" CompressedSize="1256336" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="1fadb727136cf87456b2f0af96eb6cda019afcae" Size="4592654" CompressedSize="793929" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="1fd21352e206680f6a1db92a876a4303bfaaa4ee" Size="1966900" CompressedSize="844504" RemotePath="UnrealEngine-3856332-f3222cbcb254424d96a09c993a594416" />
     <Pack Hash="1fd7c05041c04a7d51a7854be311d5d20549d840" Size="4633096" CompressedSize="1430415" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="1fedda872795db8d7bb5a40c6f0bd43ba939edbd" Size="47041624" CompressedSize="12480494" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="1ff72fe5632161d10028c4b481835792855d6e20" Size="41562096" CompressedSize="41182194" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
+    <Pack Hash="1ffca679392547067aab2bffb13252e6c744507d" Size="2447696" CompressedSize="1200631" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="201898ebb9a6071e0636fe3fcd2ab788f6f8aceb" Size="46921544" CompressedSize="10442330" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="203891350bde1b621fb1086afbb5b0fb0267c541" Size="2944716" CompressedSize="183327" RemotePath="2656980-c015aab7e6de49c3934683485cd56429" />
     <Pack Hash="203e868d9d1fb23173d44bd19b325254e6ee550e" Size="2796136" CompressedSize="903930" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="2061aaa6e57d72cbc697076a3bfff9ede7a0a405" Size="8530406" CompressedSize="2566071" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="20624c8eb99a0f2e5485813c0aa9911805fdf794" Size="2252848" CompressedSize="867028" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
-    <Pack Hash="2069fdf7a97aa147ab6dff133b801ae8d0e9338f" Size="2097009" CompressedSize="732782" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="20d3264a71c17f6aaa1467ef523b11328006faff" Size="2952290" CompressedSize="748327" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
     <Pack Hash="20dce2c769f6c7eb30c5e603eb87a0c3e833bece" Size="1567030" CompressedSize="1362201" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="21202e22c0d0bb13b84ef787938f1a2522405782" Size="459750" CompressedSize="236700" RemotePath="3242852-a85716d292ef4b94b8e470d70a8fd0f2" />
     <Pack Hash="2146b414950f5f9360425a7ecfc07c7abd874957" Size="2097095" CompressedSize="1159501" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="21495600a60ec70990241fb254dcb18dce209ffb" Size="1053" CompressedSize="536" RemotePath="UnrealEngine-3393611-ec0e45fe700449ab8282bb4d6fbf0de1" />
+    <Pack Hash="2154ddbc4dbc6bccaa5ed5760ac71f76c45ea6d9" Size="2097156" CompressedSize="734003" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="215f16be383b3e37f6ab866a94263c078729c9ef" Size="2097128" CompressedSize="395422" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="21700ddc7d4239d542aa1f75c38315a9fdd9f2a4" Size="1588462" CompressedSize="445361" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="218b41b249f8b8cc60c48cdfe5f9f3139acec694" Size="2091224" CompressedSize="677172" RemotePath="2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d" />
     <Pack Hash="218fe0aa245de48963c2d75d06b06f6d51b1e66f" Size="2129245" CompressedSize="285600" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="21907541d849646ca7b37552024a6bcbab11cce0" Size="10627667" CompressedSize="10629092" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -66530,19 +66383,22 @@
     <Pack Hash="22409cbe3f9f1a0288982dd1e17a275b027f0b3d" Size="6872444" CompressedSize="1674313" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2244ff7f13f8fe3fb5f164e80f42ae8364e9ad1e" Size="30253888" CompressedSize="7154886" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="22477dc9b87158f34192ea3821c7baeb7fb81127" Size="4776968" CompressedSize="1027138" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="22595898f1eb48e14fa3d51be2ab34af5deb56e2" Size="2162184" CompressedSize="722844" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2299110528ab83abf184bdd40f7f9a41b3e753e2" Size="16092680" CompressedSize="6846127" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="22b9f529544c094492d93bdfb65f5b140cacc50f" Size="4539012" CompressedSize="790048" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="22ce26c9bcf0b2be29127cc4b23f6091f6ac51c7" Size="2096583" CompressedSize="915245" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="2306149584daf6374eb96cf7ab64bf7c27303e99" Size="31376480" CompressedSize="5602014" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="231c093fba465c8199545f0570447ea9c192b050" Size="2957864" CompressedSize="863054" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
-    <Pack Hash="2328782f33107e77f35f405881655369a9634520" Size="73954624" CompressedSize="21869464" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="232aee47faae6b64f91f178276ac9ffcc5c0b98d" Size="52567014" CompressedSize="9940807" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="232b49d50dbc53eb15158f9570e94aa843779afe" Size="2097007" CompressedSize="956332" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
+    <Pack Hash="232bb579fe97b59599879943c075c92751428ce2" Size="2481160" CompressedSize="830646" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="232eab324de501a6a4db9e0af2922875e7b6303f" Size="13527048" CompressedSize="2306785" RemotePath="2597177-394deee1ae174b2db1462326aa83252a" />
     <Pack Hash="2339c1d3bfb2db1621ef01225df981c1bcc32f49" Size="3273856" CompressedSize="1016318" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" Size="2097138" CompressedSize="2092081" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="235fb9da70c74afa6b41598b1f178262b96dd2b4" Size="2094058" CompressedSize="689242" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
     <Pack Hash="236633a6e0745c5413ea190b0e07deb9e9b9d409" Size="10882800" CompressedSize="10884107" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="236853b6c6758929b568b6c55706094e24b4cb25" Size="6802805" CompressedSize="1300009" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
+    <Pack Hash="2392bf3345cd47fe57813eea25be2e0120b0d209" Size="14089160" CompressedSize="4381685" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="239a3f6397716dd1b1c6bdd2d73cfd2a4b590698" Size="1278129" CompressedSize="631640" RemotePath="3226613-8e7bb9075e674b5698a7b9c8f527283d" />
     <Pack Hash="239c725edabab9c75696f51a5861f142fe06a298" Size="10077100" CompressedSize="1367190" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="23a7e29079618910324edd8bafcf0993a963223d" Size="53248098" CompressedSize="10040817" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66555,7 +66411,11 @@
     <Pack Hash="242303d3de81eced62c855f4d06c4f7abe1e4356" Size="2037121" CompressedSize="561262" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="245dddf7390cc9eeef8269173960264c37eb7690" Size="2097156" CompressedSize="867301" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="247159e28ded6d0a9508b9732f70dce33ce3364e" Size="2095440" CompressedSize="499443" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
+    <Pack Hash="2496b29b9363d9153c37a61c72e013ab300d706d" Size="7352080" CompressedSize="2033062" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="24a97e6871f2aa25a14bbebaac9737ba82af5402" Size="2096830" CompressedSize="532435" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="24abc6b446750adef120dba7e19f9ae7e166eb0c" Size="2061485" CompressedSize="1352084" RemotePath="3339869-a9262d7b757c4b748fc0d9ff3ca9a897" />
+    <Pack Hash="24bd9f746b224f9916e298ca86e1cfc653afc082" Size="2097112" CompressedSize="800080" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="24d76770c620099b2974c88c59e7ace2950de050" Size="39467950" CompressedSize="7487417" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="24f702c5909ddc62942a8fbb17420a157492a5ca" Size="36489578" CompressedSize="4071568" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="24f711f28e15d36dff933b636995f7644caca6dc" Size="2096192" CompressedSize="857038" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="250480eb00f98b6d9a7b3c48810c19ea3d8b5c3f" Size="2296176" CompressedSize="909060" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
@@ -66565,39 +66425,36 @@
     <Pack Hash="25344fa25c82ba6a18b52493684d5fc3900592c5" Size="2096070" CompressedSize="599400" RemotePath="3140364-25fb5146829445ab89ef552f8f2cddc4" />
     <Pack Hash="2541352b0d8e22e6fe8137c01db1be4afe710d8f" Size="39651" CompressedSize="7155" RemotePath="UnrealEngine-3593463-d1c07fecb905438992f448a1f826f768" />
     <Pack Hash="254bdc731ce0a3bef83fa6dd6c76771cadefeab5" Size="2097087" CompressedSize="684531" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="25683d273170fbd89946c9625bee3ece700ad863" Size="5078176" CompressedSize="1483149" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="255250a7d8c659eaadaf0d8409e90debbbd43d00" Size="2095880" CompressedSize="548632" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="256d7fb5a72ad9474639a3af999411bc858d0b00" Size="2097047" CompressedSize="589009" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="2573092c7861b9d182a4d6cab4457397e81d6bf6" Size="2095708" CompressedSize="560636" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="25a9390b8bc7d645a2f90cb8efe606eea18ee35c" Size="106017240" CompressedSize="21676324" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="25b4296ed4f09c194f269a923c829eddeba78029" Size="1805944" CompressedSize="467176" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="25d56e7add8fca2f0187f16e0f59bf8691cb89ec" Size="3823072" CompressedSize="1414442" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="25e1608c09640eb45560f051dcfd4bccae07e2aa" Size="3031776" CompressedSize="791249" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="25fb1f0514b985b230ff8c6eb90676160ef77048" Size="2735624" CompressedSize="887583" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="260381a0277c560f8c2006d8bfd4f7069cd5640d" Size="2082026" CompressedSize="634433" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
-    <Pack Hash="26123e7c676e1bc5f072819c34749f7ab491c7c6" Size="19308020" CompressedSize="3650695" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2616e3cfebab7a82dd81c3bfee37a62f3317e357" Size="4672494" CompressedSize="1016909" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="264c1afeb60dc891d0ef4913875d4a17b588c687" Size="34922360" CompressedSize="12515749" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="266dd2a4f1c1a5b46c1dc9d24fd0f8135036d6a3" Size="5274420" CompressedSize="5256919" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
     <Pack Hash="26725e39fb6da3a5e4bcbb68c34f6b8579c435e9" Size="48781056" CompressedSize="8440515" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
-    <Pack Hash="269d38d810260f2c59fc2335c447cdaa4d841785" Size="2773000" CompressedSize="905050" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="26b0e298ac487a7d26e72c7faae95db0238e1816" Size="31058992" CompressedSize="6783268" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="26ff1a422ac72ea29ae0f3c6339ed62fd4eb908b" Size="4505536" CompressedSize="1321956" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2712036814539c2a4f91c20f323dcad0fecc9943" Size="2097133" CompressedSize="1067199" RemotePath="2713206-b90f4643c99e477281a7d2cba2b94a2a" />
     <Pack Hash="2715b692fddbbf8de3790ccc99aaa94c4f4c7e09" Size="2092861" CompressedSize="1411848" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="2724c503e212782d9cace3a9a1e45db5d9fbfe97" Size="2435732" CompressedSize="941128" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="272b79f16dd3fbccafbf7f80736c6b2b5f837d42" Size="3056944" CompressedSize="867334" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="272cb601d913c7ef4f97eb7188ccd36db16236e5" Size="2203280" CompressedSize="636697" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="27908b1d831cb5afb0a90d5c1bab42ad600a7304" Size="3202420" CompressedSize="778520" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="27b4205eb8d351c7d991d1ed52c241d9fb776a0a" Size="2097159" CompressedSize="1970885" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
-    <Pack Hash="27b4f4e7de9fda2b204ae93882859d3dffe5ca0a" Size="2847384" CompressedSize="756345" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="27b822e2427012ec19f5863c6ed756d1cea90bcf" Size="8911734" CompressedSize="1504973" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="27c6c3ca83cd9d40f012e1e6e78b9a149c80055e" Size="6073556" CompressedSize="1380624" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="27da095fb3f8f58aea4e97026d8e30d4632ebee1" Size="2346103" CompressedSize="405528" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
-    <Pack Hash="27da6cecac43e4f149a2c2d19c1760203a42333e" Size="2096802" CompressedSize="698862" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="27f4fe27631b740859066f5cdfdbf7ba0dff165d" Size="389240" CompressedSize="160815" RemotePath="UnrealEngine-3684949-2cc585f6061b437682ef9c16ba7eb23b" />
-    <Pack Hash="27f8eb389ab0b921b8fe2d3ae34e9b4511524a56" Size="3224944" CompressedSize="882146" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="280b37df4d7dea7b9bb338c870a5787ddd478aea" Size="41377728" CompressedSize="8712059" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2817042b1b647a0e2acd19a25b1bf25b653989ab" Size="309678" CompressedSize="96646" RemotePath="UnrealEngine-3615489-83ff52d5a3fd4ecfbc0ee836de31a4ec" />
-    <Pack Hash="2854aedc376dafec24036edbed9ab3936af9de1a" Size="2097153" CompressedSize="882676" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="283a931c4b1296c9db13f13c73fddcdca30cf82d" Size="3363924" CompressedSize="1008318" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="28926b6102371746bf5dd7c493c2353392ba76f7" Size="2096832" CompressedSize="2088219" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="289a1b921105ce48ba09d95a245cd2daa77b05bb" Size="2097147" CompressedSize="1770138" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="28a3c7cc6ff196bdb4791e3c4e225e1b0c652deb" Size="1550770" CompressedSize="1465622" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="28a417dc98d4b75631b9b2dda598d9fdecd9ff16" Size="2159444" CompressedSize="522375" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="28b4c60ca1457e18c59ad75b677738358200e7b1" Size="12302498" CompressedSize="3254324" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="28d030d9e1f4fd7763333e8860601ef03cf18caf" Size="22443098" CompressedSize="3531154" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="28e009860e5ef96dbed1693ab9e6971a273cd077" Size="4566150" CompressedSize="914120" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
     <Pack Hash="28f28af32374399fd5038c49bbc925c725658cd2" Size="2579239" CompressedSize="457879" RemotePath="UnrealEngine-3794511-fdda41a8b03d4909b2eb7e47d3317d2b" />
@@ -66607,30 +66464,26 @@
     <Pack Hash="292a8fbb5a1aff92533e52ded470f85af5ffd6c4" Size="2076931" CompressedSize="2076357" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="2944a0052b881a644f04844186daa4ae54aad523" Size="2097086" CompressedSize="1570536" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="297b426e972c70d5bada57711d9b219ec7267e7c" Size="1900882" CompressedSize="922005" RemotePath="UnrealEngine-3484255-7b2f5022c1304ae580d9a39eae778657" />
-    <Pack Hash="29a4bd653010a3a24379c61f4b55f4078f3c2dce" Size="2083335" CompressedSize="637622" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="29e943af66b499f5c05ae32a0ce92d77c993bbca" Size="2957912" CompressedSize="943381" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="29eae01c452b3ae340b64ad4266ea1152b4e6729" Size="2097143" CompressedSize="434655" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="2a05a1b170ef5ec5b3ba5bb18c584e3e49a5de4e" Size="79677" CompressedSize="14232" RemotePath="UnrealEngine-3590441-6ed06e1d7bb34469902a44d1a4edb211" />
     <Pack Hash="2a0e6634f5f2df2448dd861f9343efe3d6dca71e" Size="20113486" CompressedSize="3756396" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2a24d8dbf5e6fb22f92e636ec3c56667f17ce5c0" Size="715226" CompressedSize="189683" RemotePath="UnrealEngine-3785501-9281bc3111974c208e5556ed1267ec7f" />
     <Pack Hash="2a353b5e095adea8419dc70852ddbb8c4e084197" Size="6213377" CompressedSize="467003" RemotePath="2911281-036ed816519f43de8e59e0d41d444be2" />
     <Pack Hash="2a550ae0182933eb8c4020ab4d4c9f3c4f6580ed" Size="2012810" CompressedSize="588823" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="2a59e03d39a88b21943c37a43aa6afb3a0395146" Size="101426306" CompressedSize="18407655" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="2a5a7e4c89fbf447ad618514ba08b0e5b5269d84" Size="2374960" CompressedSize="733612" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2a72f82cc0cf6e545fb863da9bca33db855bf6c3" Size="2095892" CompressedSize="1390008" RemotePath="UnrealEngine-4060164-d69a73f952174c318802b4322d29764f" />
     <Pack Hash="2aaf00cb3aa2696c36cfa0ad0592b1f38cbaaae0" Size="8598024" CompressedSize="3938849" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2ac598ca34bd40c8d6b7bef7999eb1317d7c7169" Size="4946648" CompressedSize="1099154" RemotePath="3354599-f810c7bfb4fd40dd9fa7aeb63055e1fd" />
+    <Pack Hash="2adbbc4c83b200bbcdb0f2ba511f2e91ec6269c9" Size="2097150" CompressedSize="674518" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2b060aa2fb7a7ea1aa7839e4d8d2f1c7bbdbc533" Size="2012424" CompressedSize="567673" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
-    <Pack Hash="2b07bf25fb2698584c163bbdbe0e9fc6c6870f49" Size="2094422" CompressedSize="498989" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2b0d2174b3f10bbc7753f07e79d051cbb97c1cab" Size="2089710" CompressedSize="1295489" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
-    <Pack Hash="2b3d322997a3692cbe50c8a669f96750e4ebfbd3" Size="5040912" CompressedSize="1102208" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2b154296edfe9baf32d4501b4b8eda5d03fdf56b" Size="2346178" CompressedSize="545796" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2b6e4a60698706be530df733a44861365b1fadae" Size="3605775" CompressedSize="780619" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="2b87948471eb4f8dd1ad2805607b01d3bb6a9587" Size="2164566" CompressedSize="522930" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2b997fb6bb46633ddf3dcc659bd0d91d75319d79" Size="5079824" CompressedSize="1347692" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="2ba76e3905a2c522342a8fc899d371ee5aea9763" Size="2033568" CompressedSize="534040" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2bab8c2303036f183da6246f16fdd56a325eb045" Size="18600968" CompressedSize="7724189" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="2baf02cd7cefb3dd8f549886b24457f54a7a072f" Size="2097074" CompressedSize="302242" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="2bd2016a2714a9a099a23ab61372e2e80213020b" Size="6502496" CompressedSize="1740723" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
+    <Pack Hash="2be65450504267f27231a353bd6c14c54f2dc46c" Size="28170376" CompressedSize="5584156" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2be8f3a02885fbb8b4787d438095ac4d1c35b6a6" Size="2092216" CompressedSize="1109371" RemotePath="UnrealEngine-3850215-67984db0ff2b43cdbb4d220eff78b1b8" />
     <Pack Hash="2c0b2a639d529b68027b4cb912aafd082af8bff0" Size="2092164" CompressedSize="1427791" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2c1210d318f1def793c3c9c4c827f8e9d756557f" Size="4375" CompressedSize="1563" RemotePath="UnrealEngine-3398870-edbda4326e2045908b9c586c815e88b4" />
@@ -66638,7 +66491,7 @@
     <Pack Hash="2c2c9afa8ee1f419854c4570a760788b2aeac7d4" Size="2097068" CompressedSize="582997" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="2c391f34048aae95fed7d9649088e50dc62d614a" Size="2539016" CompressedSize="764960" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="2c42aecf4d302508d97a42889f9c616197b1bd9d" Size="9715864" CompressedSize="2960468" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="2c59dad7063233fa7ab7b2a9e30f526771be357f" Size="2434704" CompressedSize="1195429" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2c56131f5d144a87ddd7a647132b3a97320d5fc0" Size="39611650" CompressedSize="7512153" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2c641d8ab651a8a2b8a19b28979b2852b461f2e1" Size="34151216" CompressedSize="7056856" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2c797c8cdbb2be35e76d93560da7fd6ebad0d926" Size="2097158" CompressedSize="609084" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2c90585ff2643777d8626f0a1f911ed4b24b49f9" Size="16444080" CompressedSize="4186608" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66647,15 +66500,18 @@
     <Pack Hash="2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5" Size="8513294" CompressedSize="8514060" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="2cd227711e286f7384ce59e88078b54bdc79de3d" Size="18309680" CompressedSize="6646153" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2d01227956a397825e4bb9d2b79d4b50bfd6cb0b" Size="3591264" CompressedSize="1004858" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2d0cd957c5df15c5aa81f9a307736e1cf58a5165" Size="76592088" CompressedSize="22712470" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2d109ba790c1b5f8d9e7603f7b3bc4fb0f3bb83e" Size="11691146" CompressedSize="1276128" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="2d2cefe4e04de94cb666e3cde806b71b8274911d" Size="3145792" CompressedSize="56505" RemotePath="2942850-0dac2574939b4856a4b0f4db931751b9" />
     <Pack Hash="2d444ab79237d1419d4843c8b6f056ccbcd23500" Size="2097115" CompressedSize="551046" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="2d4a9d0be42536283282dd5f3245c31fdf2e3f89" Size="2824200" CompressedSize="1081600" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="2d5009432c5d0bfeb8846ba46bff3bfb134fdab1" Size="10743326" CompressedSize="878677" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="2d6832fe999cc8dec3ae42d76ae926b624bc7079" Size="26399312" CompressedSize="5844945" RemotePath="UnrealEngine-3495525-e8fb227758534aac81ae15bf69d1a8cb" />
+    <Pack Hash="2d76ccbbb86174fce5c802133467dd9d27c7ed5b" Size="2575976" CompressedSize="821870" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2d8231e99c3e545ce4c1a3a99eb693111612bb56" Size="165854386" CompressedSize="33526943" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2db377e9ec55cf470c51dad38d98f14407d8e0ec" Size="2097144" CompressedSize="498358" RemotePath="UnrealEngine-3777242-2bd2dd48ffff490f920a1af9d6c763dd" />
     <Pack Hash="2db39df39894762a41756a913eb3f28b665f713d" Size="2279148" CompressedSize="481625" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2dc703789d5979bafc8103dd999a6d07ccc0d673" Size="53303834" CompressedSize="10057659" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2dd24b264cd426069f72804a20a902992fee1142" Size="42512546" CompressedSize="7026847" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="2dd73b12649d14ebed46c20a29c3ed76d08b37c1" Size="2096795" CompressedSize="787233" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="2ddef19cddf498fa8578c1affe0273ea06e4b18a" Size="2093407" CompressedSize="957073" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
@@ -66668,25 +66524,26 @@
     <Pack Hash="2e2bb20a6f4d8755b18d7d0a9334ff6a2423431d" Size="2097098" CompressedSize="762927" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="2e5c63bcccfed8efe826b868119dca0a2383755f" Size="2949780" CompressedSize="1015529" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2e6b877018994d97122a9b698eba651b59cbe02d" Size="2545956" CompressedSize="754540" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="2e954414951c8b80a52034b0c4c8376adf6954f5" Size="2161672" CompressedSize="722639" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2e859b9ceef48f55e7e7f6c05869680f93148f93" Size="1846925" CompressedSize="1072242" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2e9ed131938bdffae0be625506f4c278451713ea" Size="2467152" CompressedSize="861986" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
     <Pack Hash="2ead84d47ec7a9474d3627560e9cc0c8f6e70503" Size="2097064" CompressedSize="1774806" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="2eb3f8f72bbae78a5266bf490a982bc3f22281eb" Size="2260875" CompressedSize="174644" RemotePath="2911283-d7e8bd6e18cb42d6ac0928c3957ef6fe" />
+    <Pack Hash="2ec64fa996948f61f7bbe4b02d0e3380a991ff87" Size="2097153" CompressedSize="1052402" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2eddeeafbb16203bad1207fe3c70aaf2e165ebea" Size="5673196" CompressedSize="553150" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="2ee9a542241d7a5b78010abd8fc659dc5833df55" Size="6681946" CompressedSize="1805051" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
     <Pack Hash="2efd964b62d457693b93d311acd7d54dc4e7f177" Size="2088430" CompressedSize="1983982" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="2f03560fb7c46cf0b1f96852aadb185c474a3596" Size="3213320" CompressedSize="695160" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2f13e90048446b62f7b075e0a79209d62ee1b054" Size="2097117" CompressedSize="1765614" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" Size="2097144" CompressedSize="711503" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="2f1833456d5750b5896fe6661c307634ccc78209" Size="10029192" CompressedSize="9956471" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="2f18ec8e0e1dbc7574497b45571454da261d1b6e" Size="2096752" CompressedSize="890404" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="2f1fff504ba4cf954b13543f99feb57dc6d9003c" Size="3337136" CompressedSize="912251" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2f32bcd0b5e4e7f84c21aa2a0c52ea13d5dbd08f" Size="2095511" CompressedSize="895576" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="2f69a2f77d7b79ca141d02b03961e9f4e2c669c3" Size="2097159" CompressedSize="681282" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="2f778d711060aef5876bdfc867b9e1788334e0e9" Size="2439928" CompressedSize="950781" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="2f9f7a639a6282348d60a9900c9db7e8afb26445" Size="2095404" CompressedSize="805153" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2fac8ab121f9d6623b687c4e3ecdfe0213bf3a72" Size="4915448" CompressedSize="971193" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" Size="2097151" CompressedSize="674832" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="2fc2b1fec3f7689474e4d91a5c5f2d71bcd61cc1" Size="2097151" CompressedSize="157656" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
+    <Pack Hash="2fd9587cba98baccb93b3648f21de02063c018d0" Size="13246705" CompressedSize="13187271" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="2fda5ea89a82d953d04583ab86b387b1b3f3dd6f" Size="2092354" CompressedSize="2067561" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="2ff8709ada5b8bbfe994f55ce697983225440813" Size="2096912" CompressedSize="365617" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="3012eb0c18cf3faab0fd1a8290905b902456192c" Size="2174423" CompressedSize="2174110" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -66695,37 +66552,44 @@
     <Pack Hash="304a4e893860e679a14c116c598f7ae01fc61dda" Size="23355266" CompressedSize="3990080" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="305e297b2b5cfbc7e8ed4a63a3675efefa5e98c6" Size="2985912" CompressedSize="877083" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3079df4a3d586d43d272a660d269190b32b35686" Size="2097137" CompressedSize="1449956" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
+    <Pack Hash="308bdfa65dd009b7a410aaed5a31cb264ad772e2" Size="2097112" CompressedSize="2046357" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="30a025557dc0f6d6cfc90e121a70c20341fc2d83" Size="5472368" CompressedSize="1298236" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="30abec4df27f82943cf2f46504770edf5000b727" Size="2168823" CompressedSize="260156" RemotePath="UnrealEngine-4071957-6642e934a7024324b15f91414df34b28" />
+    <Pack Hash="30ba0bdd1c68f813fff4959b4f11948a0d750426" Size="3130888" CompressedSize="1022717" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="30ba7bb330361d176b1fe57e61dee2be600e9b64" Size="2912160" CompressedSize="1007269" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" Size="2097142" CompressedSize="744436" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="30c121a8a201c1fb51737b1b088de3a5bd3c3fca" Size="81523720" CompressedSize="14367071" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="30c853f7b6cb7d3667f78239b253f855b63711ef" Size="5412252" CompressedSize="1538924" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="30dbbc475b29e1e9833d657265e0473096a358bc" Size="3054408" CompressedSize="1152966" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="30de26612e9a18d9657fc1ba27f713029e680b7a" Size="23243" CompressedSize="4871" RemotePath="UnrealEngine-3679654-275207b95eaf43828579cf530bc1797f" />
     <Pack Hash="30e198f7f7cb931d8983952a5cbb799f45aa1367" Size="2096965" CompressedSize="890685" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="31125f4f6c31f35e79d943f737db108bc0275d57" Size="31210088" CompressedSize="6817080" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="311d9931051f3cac3bcd4fb51fca6cb2abfdfa41" Size="4446216" CompressedSize="1914114" RemotePath="3140364-25fb5146829445ab89ef552f8f2cddc4" />
     <Pack Hash="314f02be6c0bc2a4692edcd54a5858d1376aaad4" Size="47225846" CompressedSize="13799355" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="316a32005cd66f1ddd2eb6c26830abf3172031de" Size="81483900" CompressedSize="14357416" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="316fda15181df108a228f8fb6fdeb67a289ba7ab" Size="32055410" CompressedSize="8621995" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="317d4fc6455015ce5638858711304dd805badd38" Size="2091730" CompressedSize="520770" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="31800ca68b9fd9373dc61b2ca078a295b7b4fd13" Size="4592654" CompressedSize="793922" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="31887672fee48e686e82cc437dc120aa0e13ec03" Size="2713836" CompressedSize="250326" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
-    <Pack Hash="31a98ec1cc62bab799d8df883748fa37772c0a64" Size="1814950" CompressedSize="368761" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="318accd95f2c22bea81dd6983550c1fdf856cc17" Size="18948472" CompressedSize="3571864" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="31ada4c269dbc1fe2d7767f6c437634f661132d2" Size="2083616" CompressedSize="900458" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
     <Pack Hash="31b00e20c26ba53e1e4071f88ae88e478dddc667" Size="2238964" CompressedSize="2238488" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="31c3cfc83aaaeecb25f86f0fe14191d04caa818b" Size="2058336" CompressedSize="1065139" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
-    <Pack Hash="31dd9591243d030e4aa920c6b1711cd82672e2af" Size="2095557" CompressedSize="1088083" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="31d61998dd0d8f9bb7a44d6dd787e40ed8c33f70" Size="15538664" CompressedSize="3773849" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="31f2a3dbe1d7e4b0fbea4253b4474b7fc23f83ca" Size="2097150" CompressedSize="738875" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="3201d09a0aea69d7932ad60d67b413ca7bf6ed0f" Size="10743212" CompressedSize="877722" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
-    <Pack Hash="324a9bead47ccf142ba90a6ab9c1a997bf4f4058" Size="19562304" CompressedSize="5205805" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="326e06b4c0b0b15a75d2f60be0320be507d410d4" Size="8704616" CompressedSize="2314136" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="323475a7e69cea4ae0b59902fa2cd0f5337048ce" Size="2095982" CompressedSize="546803" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="32a83d508234ffa544d0570813e08e4f8b6379f7" Size="2096087" CompressedSize="561614" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="32ac28dfec38ddc98e271b6d68a1106b22c0907e" Size="1567845" CompressedSize="1556575" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
     <Pack Hash="32ccfca2d36198e2e02d586f020244bb1cfec0eb" Size="1494918" CompressedSize="543605" RemotePath="UnrealEngine-3555263-51058a4a20ab4d2697a0f09669ebcf6d" />
+    <Pack Hash="32d3e400864b174936d937243ad493bba1ae7784" Size="3382176" CompressedSize="900611" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="32d809d2943a46adfb06d390602d4be87fa510ba" Size="11424782" CompressedSize="11426352" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="32ed8343bb7a2b6123cf1d4acf97b89466fb3065" Size="12931080" CompressedSize="5235429" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="3305fb385880089683ddb7a84778273d8ff85d09" Size="4076190" CompressedSize="969733" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="330e64b5f7567976462e74568de8be1934ddc891" Size="6342904" CompressedSize="1937039" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="331e26cba4c9b6e3bb550112280fed355443a5ab" Size="13741208" CompressedSize="8222431" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="332e4dbcbffeb057e013476dabfd6264e16bbd85" Size="9752584" CompressedSize="3057743" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="3362bc37abc9c08ccd2012a805c06e65cd75c5ab" Size="5165640" CompressedSize="1519998" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="33802b9f80c9d016c066e998dc08ece561b3012a" Size="8739024" CompressedSize="2318329" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="33902cc01c7eda10161025651275a129da5ead6e" Size="3486296" CompressedSize="1340208" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="339379348737007ea12b3b20b4004ea75c5f0981" Size="23449588" CompressedSize="8601122" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="33a7ec69dab230199f6ef3d15f4261547ca635c3" Size="2085168" CompressedSize="574488" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
@@ -66733,30 +66597,26 @@
     <Pack Hash="33d0a2949662b327b35a881192e85107ecafc8ac" Size="2097152" CompressedSize="655885" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="33dedc67fca3f3f149c6812a43eb85e07ee94b1e" Size="3731282" CompressedSize="3584839" RemotePath="3339869-a9262d7b757c4b748fc0d9ff3ca9a897" />
     <Pack Hash="33f3679a1b6d3e7da34456a34dca2562859d1801" Size="2094246" CompressedSize="1914857" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
-    <Pack Hash="3407b695bf7b722711de14f998e247a6aca6b747" Size="2085108" CompressedSize="636656" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="34098891547aaddf13fa9df4def964e1226cc2e9" Size="3747528" CompressedSize="1593593" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="3417dd91f7fc23128ede1b476d7cdb0a3a4f0848" Size="7551749" CompressedSize="7541378" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="34187c705bcc4df04f7db170525a1f16a739c4c7" Size="3521070" CompressedSize="1051671" RemotePath="3033489-dbd1834ea8b44a70a83b0107d19e93e7" />
     <Pack Hash="3419ddab274b4a63ef2e9ec2d2b652a3125a8856" Size="2097078" CompressedSize="931530" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
+    <Pack Hash="344190ba3bc0e09a4f0f7283782da8cb56b6a794" Size="2095257" CompressedSize="633484" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="344c3681a64dc0abd05c0f23e5a57955991483da" Size="2089932" CompressedSize="747230" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
+    <Pack Hash="3451efb0a02c354698ae8fcac3fed9e18242ae5e" Size="1552580" CompressedSize="439554" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="345f37ad429b27f1360cf26aa535ef037724f7c4" Size="2097159" CompressedSize="231819" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
-    <Pack Hash="346fbb2d4c75abfb08e365be08c38566f022852e" Size="6187988" CompressedSize="1265395" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="348d5b8c2c53eec5f65c20c252c11d409b738ce0" Size="6250411" CompressedSize="819740" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
-    <Pack Hash="3491acd3495d393fddd95e53ae58e13b61e6eced" Size="2023118" CompressedSize="499164" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="34962945d6bce443f8a772cab533febf7ecdeecf" Size="3891400" CompressedSize="1196266" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="34a613425eb711bbb2a8a6416aafdbcedf3f56b4" Size="73789952" CompressedSize="21777167" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7" Size="1549094" CompressedSize="1548349" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="34b38730a025a0c75cff4caa03512a0054d0695c" Size="15145704" CompressedSize="2779156" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="34c2e72395383d19f87298d48af55c06131626f4" Size="5749184" CompressedSize="1164294" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="34cbbc060d97e8a94c249d309899488ccca27c75" Size="11741218" CompressedSize="3115423" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="34da962d8bda23fc14978d82c2c5fb761acc5815" Size="1851878" CompressedSize="279259" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="353091921282fc762ecef3655f2225239d7ef277" Size="6967714" CompressedSize="1586322" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3539f0b9b2f6134c70cc0c6c0f2c6f1f557d721f" Size="4123227" CompressedSize="375740" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
-    <Pack Hash="353c4f86cb57681705516b85df045d36c33b8f86" Size="3843676" CompressedSize="1063481" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="354d41849e6ca4976e737a6e0332152c3d8dac27" Size="2084548" CompressedSize="1785785" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
     <Pack Hash="355787b70dec38d21eb9784c7a2d2813170fb312" Size="2093207" CompressedSize="316990" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="3579a812b187dc0ebafb13d5914b27deab2c4367" Size="2097153" CompressedSize="510214" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="357fc4cd09e4eea77faa70a271346bfd5d0b8417" Size="2184801" CompressedSize="1965790" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="359d5dab64e1d49ca1cd86912bf044cb1cfdf21c" Size="2097159" CompressedSize="574447" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="35ae7eab1d3f546036975961c0d140c650072f63" Size="2097156" CompressedSize="1989746" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" Size="2096523" CompressedSize="1799932" RemotePath="2602350-38e0d307a57a47baa00ee5f892c9ced6" />
     <Pack Hash="35b961a1d2a7a6f0cb6ff1013bfb53aeda8da2d4" Size="8462264" CompressedSize="1085344" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
@@ -66767,35 +66627,37 @@
     <Pack Hash="3609bb5040b3e7a8bc98a6dcef4eb6a36b098bfb" Size="2351986" CompressedSize="546202" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="363bd76bc4fa81ad344802f2fb8610153a5ca75f" Size="2706981" CompressedSize="2706735" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="363c62068c7257d61805bbb2cb98ce6f83c2da7f" Size="3213832" CompressedSize="695147" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="3645227274c275fd21ba311135f49c3e811dc924" Size="2097076" CompressedSize="1904668" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="364abffed04ee2f1dfeefc30da246c24c6adacae" Size="2097152" CompressedSize="922204" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="365073537cb3bf9532de7735a67d7eaace2c783e" Size="2635640" CompressedSize="1032357" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="365f1de3d82c954c2d632438b23b30f6678096f6" Size="3199218" CompressedSize="963794" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="36799aacce147eba397f6eacc7a0f6c9dac946d8" Size="4504654" CompressedSize="1312090" RemotePath="3215544-fbbce13ceb6f4aaea59e20af2d659d08" />
     <Pack Hash="36a132c9f653eef8303192fea1f02b6c80bdaf81" Size="2097040" CompressedSize="955156" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
     <Pack Hash="36af7f5290dd60c07f83b8a398eb9721c24a6154" Size="2097039" CompressedSize="751248" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="36c01a2caeadf8b489be5ccfcd0d07dcc10c2ac3" Size="4437148" CompressedSize="974536" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="36cb8cf859dff3d1ccf444aab0c04617cd94a88b" Size="2096904" CompressedSize="860034" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="36ce1ce180dfc4872d2c6442884d26ec693f04ed" Size="3333468" CompressedSize="965310" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="36dc5f21c7755cd7fcc2f06d9f9b27d1325e43e2" Size="2097148" CompressedSize="755564" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="36e828d49f9fc2f650b1033a3a37a0e1381008af" Size="8581946" CompressedSize="1447829" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
+    <Pack Hash="37047f2f3e8d3ae458439ab26c15efa8d3c8270a" Size="2096465" CompressedSize="655268" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3718c5a89419ed51f4572be92a7c54970cd22db4" Size="14726110" CompressedSize="3051313" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="3726283edc9360f29cdd257bfce664aa29395ae7" Size="3329544" CompressedSize="744393" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="3726f8567de19acda762812bfd9dff62242da925" Size="2095668" CompressedSize="594252" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3746b675e07b2cb7163302ecf4fc441766541844" Size="8478288" CompressedSize="2480517" RemotePath="2802567-fe0894c782dd4fb598ce30ede80ce843" />
     <Pack Hash="374b33734d17be020f3eec73cf16a100e905a8c5" Size="2096972" CompressedSize="813171" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="37544b0e3baf9d44df1b0202969502453a0f4f8e" Size="5553428" CompressedSize="1078841" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="37744be8b7dd0b6ad613bd4110630d467b7b8bae" Size="2096827" CompressedSize="551242" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="37805b90d16534cd06736c71ec54c7f94ab250ec" Size="4465376" CompressedSize="1305062" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="378a1b1ed8ca7ebdb824a2bb2b46bf6acc7f70a0" Size="32215048" CompressedSize="7957129" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="37912f10f967a1fec63e179801b76b125267a3a4" Size="4579922" CompressedSize="942430" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="37a1479f69b3ac69534eb7fd0ad60095d5ab97f4" Size="2097100" CompressedSize="1780817" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
-    <Pack Hash="37cf5e0249572446e4c01ad736b46e37352b6c81" Size="3198666" CompressedSize="963480" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="37d805efe0d2358727b0deeb9f5c56b3b68a8478" Size="5660482" CompressedSize="2086362" RemotePath="2653003-1ef3fe73f21947aab5432cee1fa4b0c7" />
     <Pack Hash="3802c6d1457b9db8f9329424c57d84943c6e96c5" Size="4639752" CompressedSize="1430444" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="3811b277d1080f2314e9ffd524da841aefd84ce0" Size="2092386" CompressedSize="1878828" RemotePath="2547993-1fb84b9e293242c988e586c599eeeb56" />
     <Pack Hash="383814cc08c7b5ec1de899d90a5024cd96d0960c" Size="2097154" CompressedSize="994217" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
     <Pack Hash="3839005f28a51e45207a0c509d7be85acb38984d" Size="6151868" CompressedSize="1489861" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="3890ff79bdeaaedd21c338bf90b727a0405d0e85" Size="2032044" CompressedSize="427812" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
-    <Pack Hash="38a024672b3f4e9c26765ead7edde38b78e9ef66" Size="7522464" CompressedSize="2508210" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="38a0beffc727ec94eb0790ffce76d68c13b431f9" Size="4545032" CompressedSize="1075235" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="38f29ad4b85cec522971102945dcbde91903f20a" Size="5924897" CompressedSize="2019311" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="38f352a8d8f0030a00e4f31e987916b7b0756798" Size="2434495" CompressedSize="2424723" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="39094453c710536eef32c9e4bc7ae6d6a32fcca6" Size="2096853" CompressedSize="765621" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="390a2f67478dbffc964bd3c94a21bfd967b67869" Size="2077383" CompressedSize="1327526" RemotePath="UnrealEngine-3797951-7d73b1374dd1459f8e1a1a249f115a2b" />
     <Pack Hash="3916bee22b29bf0f3646551966da018814907e1f" Size="2096928" CompressedSize="917052" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66803,17 +66665,17 @@
     <Pack Hash="395bcff4c0379541dee0b4bb0deb1828a686acac" Size="2096892" CompressedSize="947102" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="39751e99851beb7d0825e392704eb90eb4cb755d" Size="2096647" CompressedSize="1055381" RemotePath="UnrealEngine-3754814-fd28acffc0d24061965026fa97031b1c" />
     <Pack Hash="399347fca235ba3c647073d48f4e19e386766334" Size="2097137" CompressedSize="800857" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="39960855e0e97fe3a059887eb52597e5d12160f6" Size="5143544" CompressedSize="1224940" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="399ead53201faa00c7d391ccafdd004f5594bcb2" Size="2097092" CompressedSize="1632041" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="39c247c30a22562f68b91771cd9530c96fafba02" Size="2022304" CompressedSize="582617" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="39ec0ade8a3b7628e2feecb48cc99a2efae57084" Size="2096395" CompressedSize="1554392" RemotePath="2667681-4e80caad66464c49b3ffad7abf015c90" />
-    <Pack Hash="39ecb453ceb0073a7896aee8f035545bb0f067b7" Size="45731360" CompressedSize="8368617" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="39f457f3abcd7a0cb328983d0003b03b536f8717" Size="2839118" CompressedSize="550058" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="3a11c7694b477b016202ae8f9fc65b2ee5775463" Size="2097120" CompressedSize="770248" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="3a19f265a12a4d13608ed31823eea904eeb1bc95" Size="2589368" CompressedSize="696813" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3a27694f8ce344cd16747d59c4e0bc3244e903e5" Size="117393770" CompressedSize="30484802" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3a66357481435d50045a91d2936bf5c75e8f8a49" Size="5111760" CompressedSize="1492650" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3a67e1db726b175c76ac9b14ceffe3b434745c6c" Size="249577" CompressedSize="166014" RemotePath="3118981-9fdd5f24b3054508956afd15b84ab94f" />
     <Pack Hash="3a85d80192ad4d3aaadd59743f455efbe1a27edb" Size="4075110" CompressedSize="969118" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="3a8be1234957d32048fa425c5c014905bca55030" Size="3488378" CompressedSize="991135" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3a8dcf6835dae5f6ae314802d9a4c79bb9987687" Size="9941000" CompressedSize="3078776" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3ab17699ce95c427b0c0f3466b4226e2e30b92d0" Size="3171912" CompressedSize="1129039" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="3ad1668c83eb1618039be03d92757ce9783327e5" Size="7526280" CompressedSize="2149967" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -66821,28 +66683,23 @@
     <Pack Hash="3b0711ac8e0d8edb111efc26b713e0bf02b98604" Size="2045935" CompressedSize="711332" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
     <Pack Hash="3b0e0c4bd52690f4741e854022821b13dce84e59" Size="2073640" CompressedSize="1955592" RemotePath="3121752-deea2c76617f4d9a81789452fc9e8bc9" />
     <Pack Hash="3b0e437400f39d073ddb40bf08670d8ac4fa1fd7" Size="41329624" CompressedSize="15656559" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="3b3e130fc165f5ca00134d4189b6805108f907cd" Size="156215128" CompressedSize="32850728" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3b5feab7a5f46b3129c78ca6512692588d73eb8a" Size="3826092" CompressedSize="1115832" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="3b638bf2293f0e9f19ed41b1fdb3549b21108b03" Size="2159444" CompressedSize="522354" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3b886fcb1eae674ad4e09dfd22b6d12287364c04" Size="2097120" CompressedSize="636109" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="3b8d4ffa1666bbdbcc426ba6232275bc853755ea" Size="9234431" CompressedSize="9235395" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="3ba8c0e279ad54b7c950dd1036a8d9b916d916e7" Size="2536240" CompressedSize="943212" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="3bac9449b8db3e7d2dd557fc6ae8010646abc8e3" Size="40612" CompressedSize="4484" RemotePath="UnrealEngine-4074774-c5aa3d4540fb4d738257454f2d199af2" />
     <Pack Hash="3bcabc36808c7ecfcd1606762d32d34cbf62c295" Size="5679400" CompressedSize="1755459" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="3be2c1e26b0d89533c136de8b63a826d48289265" Size="5209748" CompressedSize="1087287" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="3be3c71b671efed9cc331b746020b50b629db39b" Size="2087808" CompressedSize="598235" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3c04f2c7b48bbc9d09a45901b0c37ef486805cb6" Size="1942106" CompressedSize="699482" RemotePath="UnrealEngine-3393094-cbd087eed2304ea0a0934ae9be1f916f" />
+    <Pack Hash="3c0a839fa4310164a5cd5b79bf180ef08e786e4a" Size="3055920" CompressedSize="923183" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3c19aa96b3264db68508f8090474e9850f2ee400" Size="2070180" CompressedSize="1427178" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
-    <Pack Hash="3c2afd689121617fb70e3d3965d1cba5fdf0275f" Size="2096805" CompressedSize="835956" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3c2f444199889a6d1853cd4d6a73e9886bdeeff3" Size="4288388" CompressedSize="2441902" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
     <Pack Hash="3c3c6c75d14b822e03194c5153af4c6fe1d1e777" Size="7526280" CompressedSize="2149979" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="3c3d1ec0c865562aeadc7c66de479c39f50cf57e" Size="3638156" CompressedSize="1026441" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3c477e2e63d3533e62d654e63f012e59da5a3edc" Size="5061554" CompressedSize="1535964" RemotePath="2634747-19d80a6a5c9a448e8b5bfb5b00ad73ae" />
     <Pack Hash="3c6183080d96335ed1e395100df77013e84788d4" Size="2251460" CompressedSize="479555" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="3c76cf203c58d1d5050d8f1e481549b49b699896" Size="1591758" CompressedSize="436782" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="3c6d5dab25fb13a45790e741a4eae07ec3e52176" Size="7733696" CompressedSize="2195403" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="3c74ac0b2c323616f552c9eee3734df041b57a9c" Size="2097154" CompressedSize="818411" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3c85f08bc745b28663285b3fa24f61e4e8f54e85" Size="2097153" CompressedSize="693629" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="3c8fcaa3e34a3bb902ec9117b7e0b0b14248d0be" Size="2990776" CompressedSize="1257191" RemotePath="2798519-d40574911ab346b3880844999982edd0" />
-    <Pack Hash="3c9129c75fcba3e3e402e5591e2e6040d9e83629" Size="2397784" CompressedSize="731096" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3cd48173c240efc756b78b7c8c2ec1292f6b4b4f" Size="2093052" CompressedSize="588926" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="3ce154ee1488f62d7804205c87d8e37504733e7a" Size="2097083" CompressedSize="1904838" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="3cf7bcabb6cf05a88bd45e6f08c6eb48818b3909" Size="2396176" CompressedSize="466614" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
@@ -66853,6 +66710,9 @@
     <Pack Hash="3d3ffa0f6b5db075797d9657c491f1cec7434474" Size="2097124" CompressedSize="901298" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="3d4c63863e18123fa56b5acc0357729f26cdacbb" Size="156212888" CompressedSize="32842807" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3d52549221cfa5a20f3614c5098bbc17d293099b" Size="97228" CompressedSize="88141" RemotePath="UnrealEngine-3932367-04659d4449e34c07a2d3d45f5568117a" />
+    <Pack Hash="3d76442b82172044d94d987558d0976bb597c66e" Size="112133274" CompressedSize="19315128" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="3dc42e03b3cf9ab3705939d5eaf2bfcd770d2792" Size="2096250" CompressedSize="584482" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="3dd1d85de19fd9a40a09de719de747b6410f613a" Size="2411272" CompressedSize="724616" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3dd258f1a16ab13184fa7e614c7c50c013311808" Size="13324296" CompressedSize="3603340" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3df6ad5cd5cc4935cf73911fda8fcff26829744b" Size="2097137" CompressedSize="629057" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="3e018df684bec4f30b73d18577e9192b0b99b277" Size="20892728" CompressedSize="6654818" RemotePath="2832392-951285e50c9b4177a8a221f4f4f6b0f0" />
@@ -66863,26 +66723,29 @@
     <Pack Hash="3e4d9426a8cc126a397a753bad999dc646a5a8e9" Size="4367364" CompressedSize="775974" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3e4e7c8ee5cc1a36ab2ceb1c5a4d37d013145048" Size="2828874" CompressedSize="214087" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="3e73ac805fe5626260903556d9b75b8d3d28c7e5" Size="3477259" CompressedSize="741218" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="3e8ca6fa45738d107b047936e9138aaecd079a4f" Size="2095704" CompressedSize="743471" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3e91b53d410a5bae4e0f8281b597ba51f36d8e43" Size="32615" CompressedSize="18503" RemotePath="UnrealEngine-3941962-800d99e9ccff4e52b24e34757ab8331f" />
     <Pack Hash="3ea2f3c3f6a81112ce083a44587607462b9728dd" Size="2516566" CompressedSize="583929" RemotePath="3354599-f810c7bfb4fd40dd9fa7aeb63055e1fd" />
     <Pack Hash="3ed83206543cc14df8d5e0cfe3250f2956c82c9c" Size="73794384" CompressedSize="21778001" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3edeaad6b42fdaf605ce122a906ed25425af2090" Size="37029747" CompressedSize="36045104" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
-    <Pack Hash="3ee49f5bc29bd74924ed1753ec829db883461d35" Size="93008184" CompressedSize="23014745" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="3eeaef9b20127af038eac7ad0b2944759c734d1d" Size="9375" CompressedSize="9070" RemotePath="UnrealEngine-4044405-2a09fb6429a040cdb300bce4c2008ef1" />
     <Pack Hash="3eeb2f03152b2114d56a8804fb8d634405321569" Size="2097150" CompressedSize="809591" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="3ef00cd31cb8d26e07f386dab3831bd4a26d048c" Size="2097159" CompressedSize="750136" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3f13a842534c0c2f3779830462b5a6659ebbc859" Size="2094860" CompressedSize="673249" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
+    <Pack Hash="3f2f7270a6a3db15f69f2841222f86507f8a851f" Size="101655034" CompressedSize="17666132" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3f34dd9dde6ca52ef20d61baea7e97f4dfdf3532" Size="2095204" CompressedSize="649838" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="3f41dd83ff921442645b0538948e9fc1c01eebda" Size="9932068" CompressedSize="9729086" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
     <Pack Hash="3f4a2fb1f72bc451dae3ce195be2eea9f10578c9" Size="3423752" CompressedSize="1448503" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="3f4cbf00af0438c956f74f514929e02e3e8d43bc" Size="6357512" CompressedSize="6357730" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
-    <Pack Hash="3f51332114ca5aedc3ab7920c6238f9dc6912e29" Size="2084576" CompressedSize="665821" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="3f56b5ba5c62e46333cf64eb80ebdec4e3dabdff" Size="168299502" CompressedSize="33953854" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3f6589a4d96334ab9e80c7809eca8064d188ec6e" Size="2095447" CompressedSize="1694602" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09" Size="6462272" CompressedSize="2645148" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="3f8a11dc1cc78565bafe247c10d7898ffb7d128d" Size="3967708" CompressedSize="1514695" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="3fb1a4489204b60796e7c6c11ee1676c6b3c2bf7" Size="43024644" CompressedSize="8070452" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="3f8e71027960e46b38c51764d31f0151ca1cf8d3" Size="22925366" CompressedSize="3911945" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="3fb2637ca2dc779acf6f803aa446f77d0ad0fb4b" Size="2032162" CompressedSize="184865" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="3fc1167b368b69c3cb5ca7f020ced42d326a5e85" Size="2736876" CompressedSize="942372" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="3fcd1944bd883cb028e69b2a51f324e0560351d5" Size="5138790" CompressedSize="1036117" RemotePath="UnrealEngine-3683447-fb0434a1a10a4ae9832936ce73c13d3b" />
+    <Pack Hash="3ff76123e9b961c8e17b2354f4735366a14f44f1" Size="17030300" CompressedSize="3366143" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="40005a1aabe3d025923ee68528a8dc3918f23e54" Size="2097149" CompressedSize="452020" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="4006fcea5a98108a450fe604eef4b1b969346fa0" Size="3770318" CompressedSize="834106" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="401dde870b0593ea8eb48a00e180d088dd331d41" Size="2391058" CompressedSize="2390737" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -66892,10 +66755,9 @@
     <Pack Hash="40675b4095aba56b00503d0ef5c59b51b9e3e0db" Size="1131484" CompressedSize="791074" RemotePath="UnrealEngine-3777764-cdec1fbc736d40b4838192497ce465ce" />
     <Pack Hash="409e09bd60df0765b85577118bd3da12988d97d9" Size="1865144" CompressedSize="295512" RemotePath="2613445-f4cf430b68ba4dbf80d97361d7c5dd6e" />
     <Pack Hash="40a36bc9a21ed94016841bdb84eed7520b3255cc" Size="2095486" CompressedSize="1057309" RemotePath="UnrealEngine-3754814-fd28acffc0d24061965026fa97031b1c" />
-    <Pack Hash="40a492c7b1e237bf5bcd5681e1dec9f7fde7aa2e" Size="80896658" CompressedSize="18460872" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="40bbf84ca6f41261515705ea95ae2597aec12054" Size="67981" CompressedSize="17324" RemotePath="UnrealEngine-4075967-b9e0606d450248a6bfbd4c2f1bd3277a" />
+    <Pack Hash="40bfed58c0b22f696e49b7031c7a4b7ac5289fa8" Size="11737890" CompressedSize="3115201" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="410e46447d67d73c00b681403bff72bd1c8db3e1" Size="1998214" CompressedSize="1991358" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="41285a1c1509b6f4d8d5c829457c338dde5a4210" Size="46442360" CompressedSize="10345828" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4138035f335e8ef4c9bd7d4700011e8ce6bc06dc" Size="3079806" CompressedSize="3079607" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="41450d9d5168d0332fc8cb938b4adc9e0ecde0e3" Size="4853960" CompressedSize="1835955" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3" Size="4773172" CompressedSize="384829" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -66903,14 +66765,15 @@
     <Pack Hash="417a9e3baa0bf6bcb0a8ac25849a80afd8d149dd" Size="2122760" CompressedSize="857250" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="418d45c49afe937049dd1f731516162b1f716dda" Size="17471750" CompressedSize="3375857" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
     <Pack Hash="419ab9d476edfc8b4ddcdf17f796fc9a5da15457" Size="2097097" CompressedSize="1050699" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
-    <Pack Hash="41cd8f5a4fbf268c28e171758dbb5942387688c3" Size="1787640" CompressedSize="517697" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="41ad7f87b8e2e03b4a00ad46ce31576259dce86c" Size="49530620" CompressedSize="9601708" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="41cec42040afe09db22331460bc2862e6d6bb710" Size="7950344" CompressedSize="2012418" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="41f547fa428980b8483eba7fdada34ab8645a45b" Size="15801688" CompressedSize="4037990" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="42130259d8da4f4024ae28abebdfdbb2413afd0d" Size="2097159" CompressedSize="712898" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="41ff50d5acf89ae94da1379246a678a88f12619a" Size="6092822" CompressedSize="1256333" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4237cb45566a40e55aff375ac03065ba4733a846" Size="19301144" CompressedSize="4909661" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4245e1d2e7ad643f66f744a3ed38052789489640" Size="2324096" CompressedSize="575412" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="4248e40936442e7002f26984b234a18508efca6e" Size="2969150" CompressedSize="606666" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="42988cf68b3eebfaaaa4411480d670f1347021fb" Size="1524402" CompressedSize="431525" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="42a9dae4daeccd0845bc40ff4cf6eab5bac4290c" Size="65162176" CompressedSize="14389097" RemotePath="UnrealEngine-3842286-20459fe8af554fdd80637bf21fdf1bd7" />
+    <Pack Hash="42aa30df7c5bb0cd6b84c159c62d74eb46db6949" Size="3257960" CompressedSize="906943" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="430d46ad31b390fdc03602141718861e6a32e79c" Size="37198342" CompressedSize="9967365" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4326cd9401dbd578bea459e7f66fb95fb9aefd16" Size="17218768" CompressedSize="7096888" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="432a9089a5a3e1ddf320e3d4303664cd5c6d4d5e" Size="4172824" CompressedSize="1168659" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
@@ -66925,12 +66788,13 @@
     <Pack Hash="437291e95a44d6e597dc0d5d1ac38de24462979c" Size="29649252" CompressedSize="10070287" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="43af1512f9c03f740a4b1e5e5d430bc184358f2c" Size="1927708" CompressedSize="425091" RemotePath="2482391-24fb529bc09847ca8c3576d69ba36285" />
     <Pack Hash="43ce938e9264c991f07b4ab978d5801d8b385c7f" Size="8445380" CompressedSize="7968113" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="43d51a207d99f34828926d06f1ec531cee9ed8fd" Size="1787768" CompressedSize="517873" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="43de67a97c49441e26fb689fad4850f919826430" Size="2097150" CompressedSize="807343" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="43fe114ae0a695a250e71107ca7639c9f6cdb8ca" Size="2081324" CompressedSize="535503" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="44335da603936c3c4bde73d397211c5608124a14" Size="4416328" CompressedSize="1035596" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="44550fffb2c3c4bd3e389a62349314f917149551" Size="2087442" CompressedSize="2062244" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="44621fa100827af0f1dd9c96f1f14135aa85da68" Size="2083810" CompressedSize="597478" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4462bf7f8ee1bfeefbb90bf01a0b4da3d5cb0251" Size="13429136" CompressedSize="3192581" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="4481ca6b0bc4ba290f3efd0114988cf4502bd5bc" Size="3672752" CompressedSize="1034780" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="4496f5ca0792a8996dfe54d53265223e6017b75d" Size="185976924" CompressedSize="37458540" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="449cc04a3686c66e7ee57ed693a4c3b8b8d87c70" Size="2056934" CompressedSize="518249" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="44a7a3545294cce6ffdb1ccec3cafef699066c12" Size="31832" CompressedSize="6300" RemotePath="3354599-f810c7bfb4fd40dd9fa7aeb63055e1fd" />
     <Pack Hash="44dd223c5d4013ea9c780503f88c0e5c7d1ee10a" Size="3683963" CompressedSize="469254" RemotePath="3159485-f4288134fa60413ab75a834773650f58" />
@@ -66938,50 +66802,50 @@
     <Pack Hash="451249045a83162ab51a602006391035d937b4fe" Size="2084762" CompressedSize="2073583" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="451bbe73bceac3e1bd82c976fdb9e2fad9863637" Size="3329544" CompressedSize="744514" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4534c9bccf8d9ff7253376f116c945e275fb54e5" Size="6344962" CompressedSize="1232954" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
-    <Pack Hash="454cbe313eebe83a59be30e57f4a9552c9da8603" Size="2096879" CompressedSize="567160" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="456b9159915e021ff270ac54d2f7c6fe17595fda" Size="2085298" CompressedSize="716232" RemotePath="3174242-d2fb25e44c2043ef8bd6c42c947bda06" />
-    <Pack Hash="45791f0b8a7c9e5e2cf6af886c58868846569894" Size="2536492" CompressedSize="943305" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="457f08cf6e7267642fb2b30cb96d308d833bab83" Size="1147790" CompressedSize="319856" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="45884d321e7c8e27e3e4330a461dcb128acd1fe1" Size="120826224" CompressedSize="14114663" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
     <Pack Hash="459747b8723fac3f5dedb4453231266db6ae4337" Size="2203288" CompressedSize="766527" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="45d4b14b5b417cac223d4cea9c102fcc4d7771f8" Size="19581208" CompressedSize="5211846" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="45e7d5480ef877b62bd1a32c7e53fbca1b0c8e27" Size="24254208" CompressedSize="11982344" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
+    <Pack Hash="45f8ab7734e533ab4218ecc93ba2a986afb3cbfd" Size="7379608" CompressedSize="2292361" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="463c47839b132e9e92cba91e93c1123c4ce11b57" Size="2097154" CompressedSize="1998860" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="4653f71982a36f99d16331bbaebded3036eff50f" Size="2097146" CompressedSize="2059502" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="467682e3e9d2dda05e47939fe633ed2361a97d07" Size="2097152" CompressedSize="466960" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="46bd206e62625ccbdb9d81ec65d5a5247f8d0374" Size="5685600" CompressedSize="1755822" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="46c2b2be0300321edb353ef240e70a3aa3433c4e" Size="2835728" CompressedSize="215251" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="46c6df425e13d415d2621732c6e418679acfc1bd" Size="3200546" CompressedSize="955344" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="46cacf33335ca2ec60df0c71cc36af0602ca8bfb" Size="2086872" CompressedSize="407492" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
-    <Pack Hash="46e237afb633a99d67f1e8df4860de76953d5258" Size="2853024" CompressedSize="758132" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="46ea4628725208c5776540632a62e414c1f086a9" Size="2456436" CompressedSize="695699" RemotePath="UnrealEngine-3683447-fb0434a1a10a4ae9832936ce73c13d3b" />
     <Pack Hash="46ed07c02685d1d9f9df9ad537075f9102c39e46" Size="2095822" CompressedSize="729974" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="46f8f87ac3a2550d882ce8cf8aa39c46e3d0a14c" Size="2096028" CompressedSize="1555676" RemotePath="UnrealEngine-3748735-cee0f8f4f92d4d3b9dfc4d450228678f" />
+    <Pack Hash="46fc3576dde127d1c83697fbb2109601941e6261" Size="6936718" CompressedSize="1272774" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4711b9f66c6e317cec4108c623193df10fa81888" Size="2093029" CompressedSize="645559" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="47524620a17d3057fcb6832905d6b2d3329bb784" Size="5793074" CompressedSize="1158861" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="477dcb4699a191be8ee172b99b25fbc6182ee66e" Size="2097131" CompressedSize="635137" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="47a24faf38e342e9b79c9d6aaf80968b8bfbb732" Size="684671" CompressedSize="375298" RemotePath="UnrealEngine-3730939-03e8074b3b634be0b1b9d2053ce50873" />
     <Pack Hash="47ada8f01106c1e11360fd7e4b46382a30b34cb6" Size="5566616" CompressedSize="1078211" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="47b33c5198dce12cff469cd6cd1221719866a3dd" Size="4406040" CompressedSize="1896108" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="47b6174ef3e14ae820eb71ddb6d34127cafe2467" Size="10955132" CompressedSize="891053" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="47c3dd6d524f1923aa08644c2e4083ced4d481a0" Size="2868210" CompressedSize="2868044" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="47c6577e9a9310adfea63c995c6d7e3eb6dc4e67" Size="16442388" CompressedSize="4010226" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="47cbe03ba6b5f9cd7e932ab3bc7b1f25ac8be52b" Size="3329544" CompressedSize="744390" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="47e96f0c8e33902ddb07e675908513fe2df11d7e" Size="4919360" CompressedSize="1178513" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="47f84e6135b3befd4159cdb0627ba6d78bd96423" Size="19345416" CompressedSize="3026999" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="47f95a951cdf631d7403b512f1881ad64a1a45de" Size="35544200" CompressedSize="6341059" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="47fda8b2feecd58b67a4ff7bbb3aa90e7df63f11" Size="6915840" CompressedSize="1486465" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="480712d04fe4475658a3fde6e2f9b8a8d9e326c6" Size="14040856" CompressedSize="4312251" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4829f380f81f0daabb46fed7b91b6dae6a1d38ed" Size="9223232" CompressedSize="1572709" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4835e22bd37fe57ec9c11ea29c97365130e2384d" Size="3064792" CompressedSize="2013420" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="48390c18d6b0e88ba483c3bc75685da62d63bdf0" Size="2096947" CompressedSize="687376" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
-    <Pack Hash="485a88ed24518826757099116b52597069515a74" Size="2097159" CompressedSize="762223" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="48417a383086ddd15fbf2c4f33ed8e96f024699d" Size="2079700" CompressedSize="657036" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="48469e5d42bbfeab317ebbd7c2788f4d78b45066" Size="2910126" CompressedSize="927185" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="485fd4e8653da37ae3302212c1ff6c808f2e1e7a" Size="1937153" CompressedSize="1936538" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="48629c762a939d30a112f72bafdefac4ca31acbd" Size="3228604" CompressedSize="955890" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="4864b7c9009a379a55cdf0758a215735f9ba922b" Size="3214856" CompressedSize="1063469" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4879bfd25446fc703aedf81275bf1de7bedf0913" Size="2094226" CompressedSize="692543" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="488efa1da7ed78314cdd0c95ad874f812853fcd7" Size="1932640" CompressedSize="1930102" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="489b3b2a09fb1b789b47044e181c497da420affc" Size="49490644" CompressedSize="9584581" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="48a56d0e033cf33c61aa9ce009cf0e4c859bd81f" Size="2097125" CompressedSize="796416" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
+    <Pack Hash="48ab102a2ee4ad6a0c69db1f545b88e4d8121f9d" Size="26390672" CompressedSize="7159677" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="48ab20ce2eddbab298a957cf09a95b94f138c977" Size="2097159" CompressedSize="911191" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="48b9cfd22101481b2a96c5f7542dafa24cf5554d" Size="2042359" CompressedSize="636984" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="48becdab8fce5451f3de26a98ad8c4b41c51c09e" Size="2096894" CompressedSize="294003" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
+    <Pack Hash="48e55481229e5e4e21b17013419a4db9d4563a6f" Size="3597482" CompressedSize="1140663" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="48f3081d1a9290c5aa4944724e4068aae5ac2301" Size="287166" CompressedSize="246839" RemotePath="UnrealEngine-3793429-edec844de601499994e981b14fe15423" />
     <Pack Hash="4904cbcdd9126bfd0bf7a267faa9edfb25ce303f" Size="2264213" CompressedSize="166693" RemotePath="UnrealEngine-3799064-143161a91b3e46968a2c26109ed60d45" />
     <Pack Hash="4905bf362dac5be04631d1ce552b8184a6f9eb7f" Size="2097137" CompressedSize="1666062" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -66990,21 +66854,16 @@
     <Pack Hash="491060f983f26dff7560f1ff4dc6690afc44115f" Size="2096302" CompressedSize="440960" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
     <Pack Hash="491f2577e368eee70e40d86f3892eec974918e4f" Size="6959074" CompressedSize="1584532" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="493aaa81b0823e6133709597b3cc35d17f0a5d2c" Size="5261842" CompressedSize="1392762" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="495a03cfec4638fdaa630d336ffc1650693e7422" Size="2095735" CompressedSize="518456" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="495e87c08928d9e45f9e97c56c4e4124cf72c252" Size="13181852" CompressedSize="2578980" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4960559b4d4e6313d0a654721afe19730ccc5949" Size="11095520" CompressedSize="10441939" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="4960f4776990e86b0535432b92e96005c3deca48" Size="399641" CompressedSize="244093" RemotePath="3115750-a04cc448d1d44c3b9a717b85cba2ab63" />
     <Pack Hash="496b0bf214a47703db4b9b53062e5aa79e8bec2f" Size="2090283" CompressedSize="664643" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="497f892a3c44ae57535de242e152f1a57b329f4b" Size="2851238" CompressedSize="838037" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="499026d392b6500cb2722cf816d820a85f269fb1" Size="1773958" CompressedSize="517972" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="49967c390f8d75671783bb72d2d81921a3d25027" Size="5039340" CompressedSize="1654969" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="49ba5b57543f91a9bedf6b1c6e96550e308fb74f" Size="2088240" CompressedSize="639031" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="49c9437be4c8e47b9a8143349503387887702326" Size="6697712" CompressedSize="1702191" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="49c9e8a4996f9ae83dc5109effecef669e0cc072" Size="2087985" CompressedSize="1376851" RemotePath="3118555-208a6115cb9a470e8391577371ceddd0" />
     <Pack Hash="49ca88b5b319bc0e8776ecef484e881fe59f22dc" Size="20321288" CompressedSize="6676427" RemotePath="3357449-09c4f579676d488ba551dba9f0fc3bc4" />
     <Pack Hash="49d7eaf76b4f243057c59f3fda3310c655144a0e" Size="2097149" CompressedSize="2023096" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="49e651970cd6076115e1ef02f045a9061d6ff7c2" Size="2658068" CompressedSize="1356588" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="49fea89556ebd60737451061c1e68f2c44e13c29" Size="4367780" CompressedSize="775922" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="49fd21b1159ff57491bad0d8f36fb0fde225ded1" Size="2083128" CompressedSize="612363" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4a2c3f44a84a2cd7b8dceb45c3082d11299543af" Size="4337726" CompressedSize="859602" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="4a31e170cde6280706b244e4ad21389e4bbb316d" Size="8138760" CompressedSize="2060894" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4a46183385827f2cc4d3c5b5d722a5badcbde260" Size="5169502" CompressedSize="921436" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67012,14 +66871,14 @@
     <Pack Hash="4a54479869221d8888e0ba5b3ef2fe835f29c945" Size="2335056" CompressedSize="1478193" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="4a590eeb1698c35eb6a53d49ad8addccbe3ae93e" Size="2097143" CompressedSize="770041" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="4a6de8866429da8f1baf5ddaf3973c381e507f9f" Size="7865855" CompressedSize="7866405" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="4a7f9cf7893ba2013f4638fab41f90fc1f63b4b0" Size="4650584" CompressedSize="1085044" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4aa7eaed894575c13c7560dfc2d58ff2e41961fc" Size="2096872" CompressedSize="890777" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="4aa8393f140b2d6a1d8cbef974555395b2f8bbbd" Size="3600602" CompressedSize="1141211" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4aac38fbf89541859c14c7fbf320b1f9deb410f4" Size="2081136" CompressedSize="2057239" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="4abf0595e4706e434b909ea697e6e34737cc2bbe" Size="2096939" CompressedSize="624049" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="4ad2adde2c5542ad4b14daf22e6556d15bb41b89" Size="19770832" CompressedSize="3680092" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="4ae0033cc9142a113eaf427c9a53ea7d3dcf9fc0" Size="3543734" CompressedSize="1038312" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="4aef200ea9e2c58c5e00f0773864d652168275b7" Size="8959835" CompressedSize="8945585" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4b0ef0f01be88ef9c770be73baa2df71c20b118d" Size="2964684" CompressedSize="609133" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="4b13954685776ac56d10464f6fd44fc0b9d25337" Size="3351178" CompressedSize="821472" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4b1c9581a2f87c9e6414bf6fc0798f7614f941c5" Size="15521410" CompressedSize="3092381" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4b316bef0e3604c7f3f9e8b578622da8fa75f36d" Size="2097156" CompressedSize="629082" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="4b36367fd03125a5a975a5955dc1b8670235b24d" Size="2097155" CompressedSize="806699" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67030,14 +66889,17 @@
     <Pack Hash="4b8c0c6b48b2eb66f88a0295eca07439ea73d93f" Size="2335104" CompressedSize="952062" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="4b912deb20804c4fcc58481a8d5517ad20b6af5b" Size="7789576" CompressedSize="2035589" RemotePath="2959226-1c0c786bb6a24aa1b5bd879cce117081" />
     <Pack Hash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" Size="2097148" CompressedSize="2060539" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="4bbcdeba815e6943d9686910555d4feddda22a1f" Size="4013018" CompressedSize="841745" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="4bc0f5eb9809b27339883ecc821f2f4a911d34ff" Size="2097098" CompressedSize="1362666" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4becfacea1263d33f8e364faa3de337b4d4c93b2" Size="2128388" CompressedSize="2127372" RemotePath="UnrealEngine-3607190-5eae11a3849440f7a2fc770dad4a585f" />
     <Pack Hash="4bf85057431c993918864e95b62688eacfc3a303" Size="2097156" CompressedSize="676801" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4bfd56a5182ecec502ca54e505acc9f8192a81b8" Size="1434534" CompressedSize="601154" RemotePath="UnrealEngine-3541849-ff050e905bb84bedbaf55f973c20f3ca" />
     <Pack Hash="4bffc9974adee394ddec87f1b2c5330f48a64cdb" Size="3332296" CompressedSize="395635" RemotePath="UnrealEngine-4042226-27513654d92c4e608067edfd8704ad74" />
     <Pack Hash="4c190d0062fc8a30656f39c990a07693092946b0" Size="2097097" CompressedSize="693535" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
+    <Pack Hash="4c477aa101c5e39647a651f2dfa1c338d316f4ea" Size="2097139" CompressedSize="728148" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4c5e613dbc080d544e62bd42771a406a1f7743ad" Size="2097092" CompressedSize="2074637" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="4c6d83d8ae1f5c651086ace466fe1cf5a42097de" Size="8477990" CompressedSize="585722" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
-    <Pack Hash="4c81e720829fc23d1104fe9a396d472aba90a43c" Size="2072730" CompressedSize="586288" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="4c7d5ca2ebc91113ed7fe1563a5ce74d83be83e6" Size="19313900" CompressedSize="3652602" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4c90070f3985d7708ef21790aa75b3597f50e984" Size="2096843" CompressedSize="791393" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="4ca23ed6d57d0da7cf7609eb7e178e90541dc880" Size="2097085" CompressedSize="626689" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="4cb28bb25edd1fc79a7011084aa1fe40056c6ebe" Size="6949872" CompressedSize="1272534" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67045,6 +66907,7 @@
     <Pack Hash="4cd1d29d63217d8c35aeb9eabacc3157ad7cdcbd" Size="2097159" CompressedSize="596557" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="4cd4bfc27173885f1aee3affc692eed9b041d197" Size="2097159" CompressedSize="893385" RemotePath="3151125-2ad56d47a97a48549bcd92c9e0cadff4" />
     <Pack Hash="4d1bdf23243f22a22f47e3c5b8af421a43324250" Size="2094041" CompressedSize="1263632" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
+    <Pack Hash="4d1f6f258386c25e96c9943f52c6b5f9133e84e0" Size="31350644" CompressedSize="8572382" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4d25959020e58656f8bb0f93dd26ee583fbc90a1" Size="3213832" CompressedSize="695512" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4d28ce8c39a4aab2907e6be197ccfa5f003c6c79" Size="2096588" CompressedSize="610963" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4d51a0356a2fbea8047a38a77315464a769f1cb7" Size="3708428" CompressedSize="845666" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67053,69 +66916,76 @@
     <Pack Hash="4d65a777c9a440e869ef25b04b71a9d9a6ff7190" Size="303132" CompressedSize="300906" RemotePath="2593226-b511ed7dda124055acab1a4474628222" />
     <Pack Hash="4d6f9c6d7a261e35898225b1fade32da175cb530" Size="2097156" CompressedSize="387786" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="4d7d1e4d2f147c32d57c60683c7aa26c4f9d10cf" Size="1041398" CompressedSize="487464" RemotePath="UnrealEngine-3540349-d5e65b8e5d1e487e993cc73357992bee" />
+    <Pack Hash="4d8cbf954dfbfc4686d0867c19852cc7a2a0ecda" Size="6187988" CompressedSize="1265493" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4db41bf84756d686fc71e275d2c94c5c2299de97" Size="3110217" CompressedSize="3110104" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="4dd6f5ad72ee50340f47bab3dbcdf03118f807d2" Size="37247390" CompressedSize="9985633" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4de19ef682be73fd5616348eafabda7e5b5c2614" Size="2858546" CompressedSize="2857956" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="4df09dedb5c89d210947d966cbedfbc6267aa7e2" Size="2097144" CompressedSize="343680" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
+    <Pack Hash="4df9a840a59e395d049b1b84a6c488eee9aab959" Size="119524740" CompressedSize="9794932" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="4dfb261d176ad6229d3fd4c96c56f8ae394debf1" Size="3337136" CompressedSize="912355" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4dfbdac45584c06dde41acb2ade62fd05e9890e5" Size="2911347" CompressedSize="2804952" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="4e1914c68137f79a3be25e9b5c4364261ff04970" Size="11489508" CompressedSize="1400934" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="4e1cded72cde93df322ce7c1628797fd0fd7a4b2" Size="2014366" CompressedSize="1077178" RemotePath="UnrealEngine-3754814-fd28acffc0d24061965026fa97031b1c" />
     <Pack Hash="4e3112118b22097e31bae62e5c187b36ff0d17fd" Size="2419661" CompressedSize="722446" RemotePath="UnrealEngine-3932718-813bfefd337148ff9c90cea7382b8608" />
     <Pack Hash="4e3319c6def38fc3572ee0ebb3794b12c2ff5081" Size="3354632" CompressedSize="324524" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="4e505deebc9662aff77016e24f1a43e3be8fdfff" Size="1591722" CompressedSize="436636" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" Size="306657" CompressedSize="107127" RemotePath="UnrealEngine-3495525-e8fb227758534aac81ae15bf69d1a8cb" />
     <Pack Hash="4e58782a7b89966ae7a9d1807e017cc4a29aea4a" Size="1750216" CompressedSize="1354526" RemotePath="UnrealEngine-3489016-21f5910377804e049598646affcd18d3" />
     <Pack Hash="4e6589080dee402938809771299985e1428734e4" Size="2097154" CompressedSize="324186" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="4e7e810806daa53af602a84d64ae8277b20e8884" Size="2097138" CompressedSize="656994" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="4e809f7c14c90f21f08abe4352eb6d75bec9eb6d" Size="3151432" CompressedSize="791552" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4e9f7803c8f762bae7a811dc659819392118f283" Size="6220475" CompressedSize="864022" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="4ea073964fab7a54a02f8f439aeb21bf330390ab" Size="2097149" CompressedSize="1233993" RemotePath="3226598-a942cefcafa14264ac608ce1535f9731" />
-    <Pack Hash="4eaa4ba02f65f68ea501f87e4aa4e1a8daea5060" Size="8511532" CompressedSize="1898069" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4eaf9c67004bee0f9f60124e6f267195f2d2ec3f" Size="2902784" CompressedSize="868986" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="4eb1a1661f094f44b51998919e3c3b0243aef815" Size="4302328" CompressedSize="1051118" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
     <Pack Hash="4ec59688fa7f5a8fd3aafa210496bba529351c44" Size="3275776" CompressedSize="1951328" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="4ed4d5c4e81d7208f0729a61ba39168e1ec45166" Size="4652592" CompressedSize="1084998" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4ed5e3055f699b0a64395520bfe1ce8550c99c0c" Size="2773512" CompressedSize="904719" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="4eda992f6e15853fcc5f140b5cd197dd50910dac" Size="2184648" CompressedSize="631181" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4edb2322b4294f7f000e3c7cc983d49312006292" Size="7385120" CompressedSize="1869328" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4ee9bb68ad28abb71ff45a0002f2f484626edad7" Size="2094896" CompressedSize="1264685" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="4f266b72a931f2e7b18e925e49d41f1ec905542a" Size="4759488" CompressedSize="1181723" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4f2952b8bc20b95299d1dcccec1a5e07fc35cd99" Size="41445808" CompressedSize="14673265" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
+    <Pack Hash="4f5d18bb13f39169265dd16fb6c26c5b6042dd24" Size="4214180" CompressedSize="1258832" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4f65d69acee548a54f8329d2457356d425bee4a7" Size="2079563" CompressedSize="2073785" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="4f8b964b00d985632b9a5db95d5f9dd5455995b4" Size="832330" CompressedSize="185190" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
     <Pack Hash="4f8d6ffd3e09677039c4bf96ce59fc30f1317606" Size="19753576" CompressedSize="3677139" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="4f9629d19fa7928aaae10e4bb7c79195fb4f2436" Size="2097158" CompressedSize="957086" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="4f9df2f518e7b1ce3daa72d515d0a874d1aaaab3" Size="7316440" CompressedSize="2283594" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4fb2c8f58c15b33818735ef8f75ba170a1b1f65d" Size="1773156" CompressedSize="1771923" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="4fb4297b78bef6669a266dea2c2d8726121b038a" Size="14841912" CompressedSize="3628058" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="4fbda194b6083d60ec1a9e281eb6caad5716cf1e" Size="297040" CompressedSize="108136" RemotePath="2489751-c4626d8ec02a40d3817d364f1bc426a5" />
     <Pack Hash="4fc48df722e8f48f5aac41907b1a2277502d9493" Size="2097126" CompressedSize="1378407" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
-    <Pack Hash="4fcf39094c278491c0faab57d6ab591d2955fd31" Size="90380648" CompressedSize="19851315" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="5000419f0499a3ba2f837311ed0dd939c4356b58" Size="1064242" CompressedSize="295235" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="502e3c3b4dcae339b71743fc346f2398f2d7a218" Size="2499672" CompressedSize="2499254" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="50491ddfeeaabd37f18bc59cf86a40163ec0a1de" Size="5147748" CompressedSize="1119305" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="504c0a6da5f49d4bcd18f11ee59db45e32d6c143" Size="2092791" CompressedSize="1536000" RemotePath="2656980-c015aab7e6de49c3934683485cd56429" />
     <Pack Hash="507dcd4b02d58aea354e94d7ed6a5975f999e7d1" Size="25388504" CompressedSize="6906921" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5098f795311987869f91ed638f4c0a395312211a" Size="2097097" CompressedSize="719817" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="50ba817a0a21b3a1e1232072441f8de1b49a0ea2" Size="3877868" CompressedSize="973824" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
+    <Pack Hash="50bc89a199e1f4e967673913362aca20bedf1839" Size="2362416" CompressedSize="548093" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="50c4602681829c7f56a1a8fcf4f2658c64318db6" Size="2093132" CompressedSize="587477" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="50e3849d51dc9c10fb77ca4004bfb54dff984fdf" Size="10955167" CompressedSize="890580" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="50f9fc796963c692e13289ee270e9728c3446e24" Size="2097144" CompressedSize="323445" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
+    <Pack Hash="5102ac2f16f693a1ac40389047fd094a7eef8a36" Size="4109570" CompressedSize="859543" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5115c4cc6422f9745cc4827daf1fc5a894f865f2" Size="5042488" CompressedSize="1102200" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="511aea04a7efe620c37f248dbf89350d08cbb236" Size="2095190" CompressedSize="584471" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="51232013aa29e3ba5ab5421d7ce28c2242d310e3" Size="20934664" CompressedSize="5692185" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="512aa5cac8b20b03176c0011e7b186a7b2c7eed7" Size="10743595" CompressedSize="878924" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
+    <Pack Hash="513e09cd9ad596a1f1f9aced15971670187b34db" Size="3385072" CompressedSize="1009515" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" Size="726864" CompressedSize="266215" RemotePath="2610954-bd0fcbe6f0c748508fe9438073c40b27" />
     <Pack Hash="517b535db215769b84dd1d1729a0e45adfe96af7" Size="2096920" CompressedSize="853926" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="518b018d2f4ec622333a18fbe864ec2261d3e119" Size="2088914" CompressedSize="675819" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="519e03a04b64bc3d14eefb416e21ae15c6f0121e" Size="3940737" CompressedSize="3940809" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="51a9f8ef4dc19611c11c31a0233f935ba1e565c0" Size="19853320" CompressedSize="5489190" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="51b4e2fade508597fd53eba3386c188ad5488717" Size="11838270" CompressedSize="3161575" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="51c835e24d6b8dceca84854b7981d7eb83ab2f9c" Size="12632146" CompressedSize="703906" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="51cfbdbb11eaf99c571f63173c6cc79cfeea7ee1" Size="336020" CompressedSize="187608" RemotePath="3092364-6c2c29e4870c4372bd253a5a5147f2d2" />
     <Pack Hash="51f22e4ce0c06e217e7d259dc489c05486d38302" Size="2097036" CompressedSize="531693" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1" Size="7329309" CompressedSize="7330045" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="5205120716d13cb3ed6f8dc7467c164226035b53" Size="5638078" CompressedSize="1703962" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="522258c25d250c4883f0f463c27529706246283d" Size="2260867" CompressedSize="174632" RemotePath="2911283-d7e8bd6e18cb42d6ac0928c3957ef6fe" />
+    <Pack Hash="52265ff6ba7685575e09d42dbc4d7305b379d7be" Size="2097080" CompressedSize="662815" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5236fe555ea38c080fb1c3d761a37c40a77a2eef" Size="11745790" CompressedSize="3117338" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="523928e5a279955fedd9434a2f276322819d6a20" Size="24353" CompressedSize="6053" RemotePath="UnrealEngine-3476133-ab5360beedfe4ad69370a36e071ce9c8" />
     <Pack Hash="524264141e22f3aef89d976f9a580146f01d1253" Size="2547968" CompressedSize="1510647" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="524e1b7dc4c8fccc9f2d495c49cc3bc8152cb7bb" Size="1771686" CompressedSize="412803" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="525da4df29fa810fe46aef9432572bbb5743b36f" Size="4922598" CompressedSize="4922478" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" Size="2097151" CompressedSize="579845" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
+    <Pack Hash="5296a9019552cfa52cf9a1c3004f4ca87ebf88ef" Size="1416708" CompressedSize="400209" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="52cfbfee9d197ee94c137192abb81edafdccc3d1" Size="9165728" CompressedSize="2608847" RemotePath="2761339-249364708b3f4901b6ac2bb1f2bd8b36" />
     <Pack Hash="52d2dd13bec4d80c7a050c845cda849eaab5ce25" Size="4111252" CompressedSize="1143923" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
     <Pack Hash="52dcb8e824841448b75821e4a33b694072617ecb" Size="2096038" CompressedSize="830797" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
@@ -67125,19 +66995,20 @@
     <Pack Hash="5343eeee39df97dfb680775e96cc36cbdae59d12" Size="47312398" CompressedSize="13828707" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="53514458563ef2e91951682daf78605be7ec7265" Size="8302846" CompressedSize="1754368" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="5359b58ffbb9ae76a120a6563e2ee1d6677eda38" Size="2096349" CompressedSize="1998543" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
+    <Pack Hash="537253ca8f1a2093ecbd3636af9ec3530c918a3a" Size="3493960" CompressedSize="1026830" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="53781ddba381c31e265d4deb0cf5a812bf106d3f" Size="6908536" CompressedSize="1742395" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="537cf21f43ca4d05b9c1298d9e3bba62e7557398" Size="115572552" CompressedSize="29716415" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="53eff9db202b450ff0c2a518e8e754dbef9d86fe" Size="73868121" CompressedSize="17224508" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="53f387c5a51338a969a115c859bc9b7125c74c22" Size="2887570" CompressedSize="954092" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="53f4b5b01e02d052c81a4d478905d84d17f624f7" Size="2073237" CompressedSize="1026079" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="54156a738d32486cc079f07ec18f87deff6b0375" Size="2097149" CompressedSize="735243" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="541c8db7f1bd4ab5e960998229622772659b1614" Size="257043" CompressedSize="51973" RemotePath="UnrealEngine-4072424-232b04cf12534e79a2b8561afa3d1868" />
+    <Pack Hash="54298e616347f8e789d984ffbd853b28f6076599" Size="47208706" CompressedSize="13802096" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5435cf07dad1155ea3ddbd5178f3dd6013a507d8" Size="2094447" CompressedSize="2050395" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
     <Pack Hash="543ebe1dfdaff4a1590fbd156175d836ae2beb0f" Size="5085433" CompressedSize="5082257" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="545f4948d42018b79596144fdb1e070d694a5185" Size="2096665" CompressedSize="1192787" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="54769dc019237bee8435c59514bad99a27554586" Size="738566" CompressedSize="393238" RemotePath="3226823-f1abd312711b49659c40d0569ce19221" />
     <Pack Hash="54b1f91ec773e40dd9e245020576fe5b2999d4d0" Size="2096490" CompressedSize="973190" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="54be461a1c72b36e4f01f2db78849473477d73dd" Size="2097114" CompressedSize="898315" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="54c763f3d19357f4fab6a3044a7d67cc94b4ac56" Size="3910336" CompressedSize="1079900" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="54ce1d601df08958e89d2d95d9b9fadb62dc7848" Size="5683270" CompressedSize="1057389" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
     <Pack Hash="551654d82bdacbe12dfe0a27ff7948b6ad1894b5" Size="2097080" CompressedSize="2067802" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="552ca17bc0155791fa5b15b6c43091472f7aac62" Size="22237988" CompressedSize="6728433" RemotePath="2798519-d40574911ab346b3880844999982edd0" />
@@ -67149,14 +67020,13 @@
     <Pack Hash="554cca5e00efdbf249492370d2e9e84c87856221" Size="2080209" CompressedSize="363685" RemotePath="3256081-70ed9c22ac6d440e81381a222903a48c" />
     <Pack Hash="5554cf4b65e9da693e0f69d1149558eb8daa9361" Size="2704058" CompressedSize="195178" RemotePath="3159500-92b8901655c0489f87155746082c3f46" />
     <Pack Hash="5557b0556184e1e1a9fe48685f17a5c90b2c5c14" Size="2804120" CompressedSize="1111027" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="55663b7ebd3d4105cc759c6dc861f85aebe887a5" Size="2226464" CompressedSize="645404" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="556a87552eca751b0dd2e77cbf3b577f11661e02" Size="9220720" CompressedSize="1572506" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="55789e2db367d87652ed781eee58053886f6a9fb" Size="1825465" CompressedSize="1297695" RemotePath="3158645-6ab715d4469d42c8b7d46a2aa1e2a53e" />
+    <Pack Hash="55920545fa77af2c7b5301b525965ac54c9d5871" Size="1588462" CompressedSize="445334" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="55f786e308cc9157e1cb168a9211aa740d4f9ce5" Size="2178179" CompressedSize="616000" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="55ff2a6439bf4bd97174230f87f74f78ab23c7a5" Size="117314762" CompressedSize="31738147" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="56023557dcb42bb0b522ee5bc891baf4e44cabe2" Size="21653112" CompressedSize="5731455" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="56304ecbe66a10d054956a5d7d80624fec86a588" Size="522330" CompressedSize="126871" RemotePath="UnrealEngine-3528311-b7bac00897a54aa8bf466ab3906cb532" />
-    <Pack Hash="563883a5d19fc2d08ee339d742ba1d2eacc72981" Size="1936436" CompressedSize="445636" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="5652dd313c71b019631bbe00249614050fe1eb92" Size="8489336" CompressedSize="2291328" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="566b5dbf1b638c04f5cca131cc6df5d36bf64c18" Size="31024648" CompressedSize="8474966" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="567807ac295099a07a6c59a7bff568f21dd14860" Size="455738" CompressedSize="139062" RemotePath="2534734-323cf099317f457e9467fda2d086db9a" />
     <Pack Hash="569b0bfd3e20b7aebc439126a086967c034cf2ae" Size="2859144" CompressedSize="1039891" RemotePath="3384106-9d915e3f2052406ba1ec60b54300ba8e" />
     <Pack Hash="56a6a392867c5bd01895d6480fc35d8ea92c74b0" Size="8985873" CompressedSize="6136481" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
@@ -67165,7 +67035,6 @@
     <Pack Hash="56ad07543c03a217630a832be8abe7b278adfbc4" Size="2097159" CompressedSize="620120" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="56cc39ae2312d22dae41f9f071a254171eacb7a8" Size="2096298" CompressedSize="610326" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="56d72a0ee05d644fc991dfc250a1534fdacb5b3e" Size="3581734" CompressedSize="3581727" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="56f29a329c5e1a894191e3ffe9e4f2b381846e20" Size="7373206" CompressedSize="1778641" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="57019fc7372c7e79abe15599794c8e92d18430f9" Size="2097143" CompressedSize="862722" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="570d8588964623061b63445e58b837354c6f701f" Size="6170468" CompressedSize="812279" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="5725149f4c8e211494463fc9280b6c10907ea321" Size="1984132" CompressedSize="268522" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
@@ -67178,7 +67047,6 @@
     <Pack Hash="57bb042bf5cd47fab3953500670b2299b185abd1" Size="4994446" CompressedSize="1665075" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
     <Pack Hash="57c7d9328a5767900be7e42460b9ff73a2c754ca" Size="8021151" CompressedSize="1047053" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="58031ce6c4634d8b348854a1ad4bc1c74d022c7b" Size="5987080" CompressedSize="1436759" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="5805da4af817abcb06fda82a336e03d0ebb5dec0" Size="6492604" CompressedSize="1883900" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="58265ec4ff350ee6f45eaf37341b669e24702b38" Size="4635994" CompressedSize="1037502" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="58275374932d088e25d7e2f6af07f3b37cbfca06" Size="4040616" CompressedSize="1334476" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="582e588cc51c2c979330e9c79e870b764f08103c" Size="15412564" CompressedSize="5582593" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
@@ -67188,8 +67056,6 @@
     <Pack Hash="5867d6c1e2e8618241732cb1014b0c39fc695b9b" Size="2096981" CompressedSize="668842" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="586c7f8b66ce6f4ec83a30e637744ef7a3a7f223" Size="29245264" CompressedSize="6494517" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="588da7d9d36957b582f13620b0c6af8de55ff4d3" Size="414432" CompressedSize="338189" RemotePath="3289727-ff829df74d124f46a896f38f810eeb43" />
-    <Pack Hash="5890f83802e49c6b0f02a37ac6f332ddafa9efb2" Size="18544328" CompressedSize="4739254" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="5894243b8f589044c07ef8eff18d3e08978f9d9e" Size="35999720" CompressedSize="7327411" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="58a52e7d3cd66ccf1ed274cd35210cb359d56d6b" Size="7371064" CompressedSize="1944608" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="58b4bdbc8f5686d4ece9cb4a18f6367d8222f073" Size="2966848" CompressedSize="664591" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="58bb811a92e5fad1f466600ef7090371417a97d4" Size="2097147" CompressedSize="1978617" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
@@ -67199,7 +67065,6 @@
     <Pack Hash="58d7b375139fc1172880981e8f1c8bbddf4f88db" Size="3293460" CompressedSize="1189875" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="58f7288e0fe3a5997003f6a117a30579d15f5973" Size="15252304" CompressedSize="15223877" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="58fbf77a55a8063016df0e403ca64af4d59383ca" Size="2089077" CompressedSize="890255" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
-    <Pack Hash="590b9790e4812e31301187e21c780f3da9b31257" Size="10719989" CompressedSize="10683914" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="5925a9b0f257cc9517f224bec3dee7ecf883aa08" Size="7649627" CompressedSize="7650280" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="59331b16c59b616e30c4a3c7524419dbf031fa9a" Size="2085216" CompressedSize="548857" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="595ac64a23cb8677dc3cf7e1c96fd4fde82bef05" Size="13686792" CompressedSize="5493104" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
@@ -67207,45 +67072,43 @@
     <Pack Hash="59717f7d7697f047103bbfbca63b68088e7172bd" Size="5086544" CompressedSize="2369377" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="5983c069abdec3469db5b5874ac27c17341e3f27" Size="2097135" CompressedSize="2085305" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="599154c7fdedb4715635b642cc8b52c0414437e9" Size="1736409" CompressedSize="1276310" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
-    <Pack Hash="599811c77e70af9449d1fd941e41f4fbcfd62982" Size="5863736" CompressedSize="1705969" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="59aad3440eda11860e175fbcdcea226318e3d677" Size="2085133" CompressedSize="392375" RemotePath="UnrealEngine-4067073-f4223345c30c43e9b9a5d5fb88e6738b" />
-    <Pack Hash="59af53c6d65fb6bea9cef333587b4b2995416d45" Size="2745034" CompressedSize="608231" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="59b4773101fc107e94362f00c7d18b0ef0a7abdb" Size="12027407" CompressedSize="11778847" RemotePath="3325693-95609c8c9d384407be95de025dc827bb" />
     <Pack Hash="59c4bec5e2957d30ef37c5198c4b90381f3ba20f" Size="2097090" CompressedSize="1787301" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="59d6ba0bbf5662592fa95dc9ce7c7f4749ea1765" Size="2097154" CompressedSize="690234" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="59f96b60d02c9e09d0a430c7dec8271602dcb74e" Size="7521576" CompressedSize="2149166" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="5a02da594c01c4e862d4b8b16b8a58583d591a05" Size="1380976" CompressedSize="378306" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="5a1bc067ccfda97a838928aaba8375efdb14ec0c" Size="2097087" CompressedSize="724212" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5a1e946d17ec673500aef70da6082479f64bd965" Size="6902288" CompressedSize="1739936" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5a3f84791f27db71d2370134d5be0ebb43345e80" Size="4266504" CompressedSize="1463388" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" Size="2067243" CompressedSize="2043257" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
     <Pack Hash="5a5976412f046d7221f3f17480cc2c863e6f4b3f" Size="2338608" CompressedSize="292184" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="5a717ace8e2579b97e265a16eb97db380ab051aa" Size="2797328" CompressedSize="963047" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="5a9512c3b6ef93903e2ea21a3dc69c53d24815c0" Size="5274896" CompressedSize="4895918" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
+    <Pack Hash="5aa9a89419ae366aaf86966d0fb121ed28534d1c" Size="6741010" CompressedSize="1659937" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5aaa677c4f655c0279c1cf130bc41a28d0fb9013" Size="2096058" CompressedSize="510784" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5ab78d674f9ce7d2cb93374e183f786c96cd9a8c" Size="16935980" CompressedSize="3329889" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5aeca87a199b85a3400f189447722aa662457661" Size="16763000" CompressedSize="4241265" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5b0c314a325c53eec5d98afdb50067ad99c6e99a" Size="2097155" CompressedSize="883700" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="5b0de04a06234fa3771e81d4a2dc6574e7d552c7" Size="2097137" CompressedSize="693677" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5b0e3711db1e266f2fc10248f58296303d92a6bc" Size="5582198" CompressedSize="1080350" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5b30a0a72208af032ee111797e5877841cea732f" Size="20081472" CompressedSize="3025617" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5b5ef6798006d154310ffc88d48f362714b898b0" Size="19133424" CompressedSize="3799862" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="5b7d4d1db1d73350a88c142692db20e3c3b124b8" Size="8934599" CompressedSize="6058120" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="5b81c9f201693bb927130d9d31a3768f7143dfde" Size="2602099" CompressedSize="2499732" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
-    <Pack Hash="5b92a9a086b3544da41d9f6e9332c1922fc0f41d" Size="2982512" CompressedSize="876905" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="5b8c91a94b43ac6166d0002c88250638666c759e" Size="166181202" CompressedSize="33704450" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5ba546a3eb86ab14893e73fab36ff96a0bd356bd" Size="2097020" CompressedSize="515241" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="5bc61bdce4af721a5670af062d4b3077cd486c44" Size="8002056" CompressedSize="2873580" RemotePath="2761339-249364708b3f4901b6ac2bb1f2bd8b36" />
     <Pack Hash="5bd608518768394380a22719c24f8af504ed4681" Size="1551036" CompressedSize="454209" RemotePath="3008183-b9dbe24f35d9484c9b34c22c4a83d18f" />
     <Pack Hash="5be1b66ec7d7898a04cfc801216ecdee5407fa36" Size="1917940" CompressedSize="847671" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
-    <Pack Hash="5beaa0957df2f62aa2d6990cbabb5beb59179f5c" Size="2708728" CompressedSize="860703" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5bebca5faa7b71ff2927f873eecb93cf54bdeeba" Size="362228" CompressedSize="343383" RemotePath="3352991-5446f868f9d3466fadfb74d5f834c560" />
-    <Pack Hash="5bf74f4545dc1109e54ee0d536c263e88925c3ad" Size="81522344" CompressedSize="14365660" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5c01c6b5fed7cf25e36fa4c1a858552e163f10ec" Size="5131234" CompressedSize="1008793" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="5c14edf67971dc51da89a77c509310090e6b1808" Size="89783648" CompressedSize="15381606" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5c3a72f0ec5b71a14069287554d34746eaca8837" Size="811352" CompressedSize="627651" RemotePath="UnrealEngine-4031146-c2572f7d14ce49e3b93cf829beec5a80" />
     <Pack Hash="5c3cb1bc324339ff637e39ac99e09c8a276fbf1d" Size="1646514" CompressedSize="461726" RemotePath="2647804-bc48e958b8224dc19d6eb2f094c9d70e" />
     <Pack Hash="5c42920f6f44c053dcf7e87f29ccef27b326822c" Size="2097150" CompressedSize="745224" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="5c517712601cff542ae326efa6bdc3a7734755c9" Size="2127960" CompressedSize="596413" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="5c5a80214469f8f4a5f2be87138d17f14263d464" Size="2161652" CompressedSize="2093756" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="5c993863d36b0e2f71b958b3a7d6bdeea50768e4" Size="39465134" CompressedSize="7485005" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5c9d5eff510128bea96694edef5a298eb77b3a1d" Size="2097145" CompressedSize="1370952" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
-    <Pack Hash="5cabfd5087179f1efbb2a730ca7894409b1e2885" Size="5095144" CompressedSize="1490649" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="5d13b303500e0dbd644d735f7b228b6d43753cb3" Size="2097121" CompressedSize="1522991" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
+    <Pack Hash="5c9ec8d5a13c7dde54587a61da5385a74bfb87bf" Size="84054118" CompressedSize="18634059" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5cd94f7a9a6bec529174cd8aa109dcb0516e2517" Size="13190998" CompressedSize="2582264" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5d27bdeb9d64abf65499f00a1952e59a73cde03e" Size="2090318" CompressedSize="584010" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5d2a4009ade291686d29f74daa3498941a47d597" Size="12352080" CompressedSize="3432701" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
     <Pack Hash="5d2c60408188df38f073184ccbd0fc8cc080ab62" Size="39517604" CompressedSize="7489930" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67254,18 +67117,19 @@
     <Pack Hash="5da79a6e814770d47d0bb37e2ed3fd9d7070293e" Size="3816180" CompressedSize="1460655" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" Size="1954436" CompressedSize="1232820" RemotePath="2489162-8b935a4b34ed4b3586d7fe3f6ce28b34" />
     <Pack Hash="5dc3b448930ca1c36e5c46a0c467d1f79642dbf5" Size="11022016" CompressedSize="899006" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="5dda7bff0436415ddfb9339017dd46727610cfa9" Size="2094368" CompressedSize="543372" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5de0da60b1dfe010d0ca5c25d6fdc6adf9d0798f" Size="6011946" CompressedSize="1246348" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5dea9b6fce25b6e705cabdf75c5c60c4a0eedf0c" Size="2560186" CompressedSize="506061" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
-    <Pack Hash="5e0060f36de516098088db4d19cf3044aa46854b" Size="7587300" CompressedSize="1738586" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5e1b4c44bc21ac2f42911b3c8147b81ccb7095c4" Size="2097123" CompressedSize="1183332" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
+    <Pack Hash="5e4a2c13809e3f951013f75907412a07983641b8" Size="130026182" CompressedSize="33851045" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5e5cbedc4e749d26043c7842e6b122abe1f15463" Size="5868296" CompressedSize="1706179" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" Size="2097159" CompressedSize="935082" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="5e7ebc1fc7e8128408b8593c7037d13ddbfd7a83" Size="19172628" CompressedSize="18193253" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="5eab23ba7e74b6c984340caf2bd05e407a8750e5" Size="2097129" CompressedSize="786757" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5eb2c2769ab7021e1110d152830752ec3c1f8919" Size="2762942" CompressedSize="731811" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="5ec5bdfce6e7a3643cf13b54c1f591ecfe36dc70" Size="5806388" CompressedSize="1158124" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5ec97420e6c5a51cd9473dcfc79ffb77cbc91233" Size="2101768" CompressedSize="844525" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="5ecfae8f6a2cd2c1dc423d2cd3c15aaa23cf18c5" Size="1482992" CompressedSize="362853" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
+    <Pack Hash="5ed1d139e88c5aa7d5fa8315cb54a252f3037457" Size="2097159" CompressedSize="736957" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5ee36ea5d52f8f7c51f3bd5d9e58d94ecaa67049" Size="2094067" CompressedSize="737503" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5ef0411c26e39f50f53e58bc98a97cb5780c3ea2" Size="6691280" CompressedSize="1699916" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf" Size="3333224" CompressedSize="961203" RemotePath="2624516-13715a1c40f44f86ab7fb65e4a808831" />
@@ -67277,37 +67141,37 @@
     <Pack Hash="5f2ee8bd5ea968dd239840333b2756a7b4071c68" Size="2096944" CompressedSize="2033830" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
     <Pack Hash="5f434ba2d925cd558af2bc1af03b657a443bcdd1" Size="2096030" CompressedSize="396850" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="5f7234baa16f3e63d04ff6b333c8963b4ee2593f" Size="27037772" CompressedSize="6690329" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="5f86aba1196468dbe22e3c344fe12a41a5164c12" Size="5637846" CompressedSize="1703880" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5f8bcbcfb47d0f3b16582e3dd12b260d153d8554" Size="80751066" CompressedSize="18427204" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="5f8cd4fb16960435c6f2dbd8dc9cf118739a4678" Size="8502668" CompressedSize="588861" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="5f9154e4057c01ac8876dc6010beb883ae04c417" Size="3895472" CompressedSize="1076752" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="5f963ef76a4402af9c0b249886115df21f3833e4" Size="2094596" CompressedSize="637483" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="5fb19dc6bcf03275ec3ef08f0d8798a3d9a0e47e" Size="1816744" CompressedSize="487799" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="5fbc991181f1b120c4405c3fc6672ba51c677ca0" Size="22171739" CompressedSize="22066870" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
     <Pack Hash="5fff97af3c5483b239a3c15166af4227b5332764" Size="466176" CompressedSize="334132" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="601e26ae42e6de454f93110911d21c837ae2d66b" Size="15939090" CompressedSize="3657419" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6028c6247770e169982f50ed839356448f3d93f5" Size="2097100" CompressedSize="2050192" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="6029c2a5d414338800431bf314765b556944254c" Size="18763064" CompressedSize="6790071" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="60375bb34b4502f31e5f9a025a8ba199dcfc0d2d" Size="4136171" CompressedSize="1845201" RemotePath="UnrealEngine-4060164-d69a73f952174c318802b4322d29764f" />
+    <Pack Hash="604d1689ccceb8c2d48b1fdd4194dccf02b90e29" Size="2097129" CompressedSize="829748" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="604e9fc9dd1c1b397add8f900213a87a9964ee51" Size="5412050" CompressedSize="760490" RemotePath="2590354-88fba4596efa431eaf994358f50a5f48" />
     <Pack Hash="605403811e871d59fc6e9bedba26641c0fc599a3" Size="112310792" CompressedSize="45782341" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="6081a3a4645afe95bd2b27e9d8be23a21e369465" Size="11617688" CompressedSize="1266793" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="608790bfd1d81112aaa4473c770e5d32a51dc48f" Size="2352664" CompressedSize="1009799" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="608cc586d18c1d6191c06a72aa214941a0e9310f" Size="4365708" CompressedSize="775691" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6093beca3b21ddf0d2d599e6a841ea070ac01fae" Size="7408589" CompressedSize="7409078" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="6097aaf513de5339127e3ed93504b404ad1706fb" Size="6591168" CompressedSize="1599246" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="60c5bb5120f6c73b23af87c97dd5179f0ade011f" Size="7869410" CompressedSize="7870172" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="60d509ac639ed7f7350924ed21329b36fb76668c" Size="117278704" CompressedSize="31747881" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="60e5a35dbfe5ca8bcf8178be51bf116b1e44ce0d" Size="2854576" CompressedSize="758101" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="60e984520fdc92453b085881f0b20a67b4d3ec0c" Size="19299632" CompressedSize="4910375" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="60f481b9e0149933c045fafa2e119c902e698d0e" Size="2097078" CompressedSize="1823994" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="60fb5701eed18af817e516eab0fbf9f94fd39be0" Size="2097148" CompressedSize="614843" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6103a85786e4e1659a505159037c8f2ed5e98d43" Size="3905128" CompressedSize="2608264" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="61091587cbe269cda72308a2ccc0222b21552ce4" Size="50376226" CompressedSize="9734388" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="610bdae733c8bc4a8d11f02244beb2646a20919f" Size="844064" CompressedSize="207182" RemotePath="UnrealEngine-3925882-076ddc721ca448958fb6f89e1d978a18" />
     <Pack Hash="6127c305de0e48f8d5572ec15328dbfc52bd989e" Size="1359877" CompressedSize="558902" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
-    <Pack Hash="61414cf7f1e5c788cc1612ab498ef841efa0481a" Size="2097134" CompressedSize="592997" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6171625c0f5e59113ee53f76e21ade838dce9cdf" Size="5183558" CompressedSize="1201108" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="617e09b35c9c3961bf34b1ebfa772525f480e267" Size="2096759" CompressedSize="604824" RemotePath="2984534-bc60b1c26a96427fb82e415a06c2daa8" />
     <Pack Hash="618449250b93c28bb8f15751ff6bb653143e5ff0" Size="2088337" CompressedSize="1907163" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="6195e62bb05e93846fe2e6461b6295654142e6c4" Size="2097124" CompressedSize="693163" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="61a4313e93aab82bab5da58a1b601aad41ecbd60" Size="2172721" CompressedSize="2172226" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="61aaff34ab94f914826b879f6815085933a1d20f" Size="47295014" CompressedSize="13841370" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="61df4e1d73a1cc3e000a590e59749716dc510c45" Size="50780840" CompressedSize="10715680" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="61ed532d678c4925c896820e997793ebcf0d9376" Size="2608068" CompressedSize="775581" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="61edd2f04c73c5c3eca0bfae13c92213516504e3" Size="2089060" CompressedSize="2015617" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -67320,28 +67184,28 @@
     <Pack Hash="629161f1442cc070f84ca259e983259288e25a85" Size="2096150" CompressedSize="1508510" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="629ea25ead605995f97a5b7048f58de5218aaaf2" Size="105610576" CompressedSize="21580655" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="62a612311b83947e270bcd148b35479897bd9321" Size="2096969" CompressedSize="572442" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="62ca2cf6894fb17d3d59392b084f090ac1c7d46f" Size="2097122" CompressedSize="731993" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="62ceb2931fb95c80d373efc34705bd999dc053f9" Size="3333552" CompressedSize="965294" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="62d297add5bd88f5ea16b2ba6b97664dd888eef8" Size="2808671" CompressedSize="2808281" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" Size="2097147" CompressedSize="855123" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="62e9b2a08039ffa1e414a910c21261962e0b9ea0" Size="34150168" CompressedSize="7065119" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="62f3ca421319a9aad6865589c1502c68dcbcfaaf" Size="10771248" CompressedSize="3064516" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6306059a486405bcfd30ec490a884d58c522d077" Size="7415280" CompressedSize="2486585" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6306348231c6301ec52a4012be99f82c4cde78ab" Size="131328" CompressedSize="120594" RemotePath="UnrealEngine-3535489-48c8bfe6d73045ae9f2937202efd2943" />
-    <Pack Hash="6317f5c50fc730217e0b7fd4c562342f3f9a1685" Size="3544166" CompressedSize="1038525" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="63265c1a9710c7a2b6d0b61dbcf143c7d8975f91" Size="20073464" CompressedSize="3024687" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="633163764fb4250a68b5a8704f5ad7fe30a16b78" Size="2666132" CompressedSize="611163" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
     <Pack Hash="6338483dfb4e8a35e30c08acfb09391fd9807e60" Size="16289120" CompressedSize="11852559" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
-    <Pack Hash="633cc93192c20b93236f72ee9aff7d4935f3b714" Size="1441606" CompressedSize="403509" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="634409f01a1eb5ce1c6d172a12443b31c0ae9fb6" Size="2368174" CompressedSize="548626" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="634534b3cc74ee57ce6f30dd0452e22494d27184" Size="6187988" CompressedSize="1265387" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6359e2376de35d2b27246726788d28d678796a20" Size="2097107" CompressedSize="754598" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="635bc97095ee9d7b6e73be1edaed0ed21c3b25db" Size="3055336" CompressedSize="922925" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="635adb3f60582b0aa500d7037d73cbbea963c88b" Size="11249024" CompressedSize="2336995" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="638489a089df7fb447a4d5149c4fec6d4faa0dbb" Size="2097057" CompressedSize="559432" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="63a39c158b3cf7533bb95a41e4e3fa62529aa7b5" Size="3824076" CompressedSize="829056" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="63a978cbd91a1b72f50014e3c1b2cc840edbe712" Size="2221576" CompressedSize="740551" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="63aeef61540766058c9217278f4c99890729a052" Size="1693374" CompressedSize="461220" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
+    <Pack Hash="63d57bc7338d3f2c7d705c91585c8a1688cc8906" Size="2092253" CompressedSize="922995" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="63dc5e55436835d760048c57bd2d0a6b63042ba6" Size="2097044" CompressedSize="2056412" RemotePath="3327560-18841d997da8447bad8de6026cbafffd" />
+    <Pack Hash="63e4984c81c2177180c5a82af5261f058e893413" Size="2774536" CompressedSize="905232" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="63fb6b15f90b5647d4e46169447beceac52a5dff" Size="2097121" CompressedSize="901314" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="6409cfd2fe49520d6c192153cb16a6f09c08f324" Size="3477685" CompressedSize="741110" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="64197d1b7aa86bbfd53c6ee0e386129423315ff5" Size="19423010" CompressedSize="3691843" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="6437c6893adaa434f34fea6860337c1648453547" Size="6676710" CompressedSize="1190907" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6437f1e81c06e0ef5e0eb7516a25c998e6bfe746" Size="21482654" CompressedSize="3683091" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6447c6b5e28bb9d949c379a7dc59978f8c76032c" Size="2829320" CompressedSize="1052697" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="644932a34925f9791215de364aebff03885b8f9a" Size="2849291" CompressedSize="2833029" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
@@ -67349,49 +67213,47 @@
     <Pack Hash="647561c70ae7414867a83da1dd02a36bb4e3315a" Size="2589368" CompressedSize="696810" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="648d6ca23ea8f9f28760b6e4bc9db0c8f0baf4e4" Size="2446428" CompressedSize="895633" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="649510e32193d4eb9d3af2ca954f0a74f5f6cb86" Size="1609989" CompressedSize="737680" RemotePath="2969385-f9fa040b1a694dd4bee77be40f7ebdd8" />
+    <Pack Hash="64a56c1b1ca1b4e9d7360808b67dd6c07bf7645d" Size="5234384" CompressedSize="1249339" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="64e4fb51512303ea18c2fb89843c5dac14e8728d" Size="1068040" CompressedSize="195045" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="64f8a861ea0499b2ce969a0970e024d43314522e" Size="393272" CompressedSize="178050" RemotePath="UnrealEngine-3475008-232a0956b5a843a7abdea45711737ba6" />
+    <Pack Hash="65292930f06c2bb49ec85a293869511324a919d3" Size="2095278" CompressedSize="583249" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="653900ff4c870cd141b5ffce026bfe4d27190541" Size="26204100" CompressedSize="22217903" RemotePath="UnrealEngine-3439415-0a8c749a4feb45b7ba6f199533eaf46a" />
-    <Pack Hash="656468d80025e7d7fcc380646c98870061ac5a19" Size="50779848" CompressedSize="10723886" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="656ca471722451fc9390c39814e70a9ccd8a3f62" Size="23468353" CompressedSize="6639847" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="65a50594fc34886378488fb6c5a5aa75460d3ccf" Size="2862534" CompressedSize="489932" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="65a5b74421726221157dc4b9d92976ed5aa1e0eb" Size="2097100" CompressedSize="737095" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="65b22cf1b5681d751dd1073c0d445ef1a54d473e" Size="2097158" CompressedSize="678212" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="65b78b6ca4fcbc234e459578f687f0a5f21ff467" Size="19479750" CompressedSize="5634456" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="65c815431a222281ca4027a3409714aca969c404" Size="7794707" CompressedSize="7795319" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="65cf476808fee5c3bc202efe4022d7cc1a4c5459" Size="17137454" CompressedSize="3907472" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="65cfcc579154be9b61e9603dd360ddfdda570b6b" Size="3177480" CompressedSize="1049409" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="65d91288d34933b9aa7f5bdfb0f57ec5200f899f" Size="2100744" CompressedSize="850749" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="65f4815b493d9c6d7adde544dd819ca5d5b68b4d" Size="2084258" CompressedSize="371277" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
+    <Pack Hash="6633fc884b676640607254f19e9e7b0bf8defeee" Size="2095158" CompressedSize="681308" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="663639bdfcba5bfc54bfba85a38f0bb1ac934e8d" Size="2097135" CompressedSize="636305" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="663723ac5cff1d4ea06e07da58676eda31ded8b7" Size="4231818" CompressedSize="1546434" RemotePath="2902827-fcb0d018c7244c24a109c548187a724e" />
     <Pack Hash="66a004bba44e8db1452276976d12dfe44062a224" Size="3068200" CompressedSize="925605" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="66a42eb4601f471938c9dff7247777d481f1cb76" Size="2537920" CompressedSize="815222" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="66c1efc3e5668dd98cbc8618540eeeb123aa79ab" Size="2096427" CompressedSize="797974" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="66f3a69afc09dae5b1c60855f816c149a2ea7bfb" Size="682103" CompressedSize="605654" RemotePath="3149232-b87d01ed233648bba91a947b941e36eb" />
     <Pack Hash="66fce169b160f3c4cb868bda8653b37692b5692b" Size="2097042" CompressedSize="944718" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="67017718bd106dede570306ae67a8ae7bf1c8c28" Size="5042696" CompressedSize="1270992" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="6710131a0c8f30edf9ebb05674940bf4e30c0756" Size="2097159" CompressedSize="584573" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="672de73d2196af2ddb680c4afff3105cba9854f6" Size="98892" CompressedSize="28925" RemotePath="UnrealEngine-3754814-fd28acffc0d24061965026fa97031b1c" />
     <Pack Hash="673cd162413f6198a7b19aa631bd9739afdc2d97" Size="2053618" CompressedSize="578704" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="674754d498fbb36c93858145b6c8a7229c608891" Size="5913756" CompressedSize="1237125" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="676f25261064cf478cd211dd584b7a391376f599" Size="9680637" CompressedSize="9681887" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="6770917472c0e5251e7f2d3e17fb76ac1ec2e0ba" Size="5650430" CompressedSize="204688" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="6781ce701d5538a8ba8b714ba154ee03c225f25b" Size="2666056" CompressedSize="994577" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="679ed873f2c8535009814661bf642f9e6a798f89" Size="6098105" CompressedSize="724051" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
-    <Pack Hash="67d41024ece83b57565733013f229ef772f8ad66" Size="3334658" CompressedSize="1061997" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="67b1668ea50dcb893bb381ba1c0703ec1ead8348" Size="3084656" CompressedSize="785011" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="67e1b9d89e2a08345ca540b57b03499da3b52513" Size="19518500" CompressedSize="17128759" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="67ebcec99338fbc806e98fe5ddcc80abd7cfe885" Size="6611658" CompressedSize="6611785" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="67ec8a81edafddc622b0373cd416020f9e66960b" Size="7983112" CompressedSize="2197974" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="67f9a57842391bca1072e56b907d2adde02d2d34" Size="2082780" CompressedSize="2060866" RemotePath="2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1" />
     <Pack Hash="6800c550338fea7b195e2b332127959f20c7d3fe" Size="2097138" CompressedSize="1469146" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="6816cd41da7919b0e792bc020abf254ed8c29e47" Size="2097105" CompressedSize="653779" RemotePath="UnrealEngine-3809549-897613a0c2dd4564b4c2458bc0fa3a3c" />
+    <Pack Hash="6824b3d1876fe7dc3f2d179a8ff690fda731080f" Size="4146440" CompressedSize="1940829" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="682e3bde7db5df0d1a525d3a4489f1be5d04a5d2" Size="2713688" CompressedSize="860715" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="6841b20c3e3c4c56009eca3de39a55098c449b77" Size="2718406" CompressedSize="527029" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="68a698caca523f5385f3d4e1b2848ee8b16ca628" Size="3342592" CompressedSize="912631" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="685b982958b91b7ed666912242e29409757e4a76" Size="3036800" CompressedSize="892680" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="68bb57d9a9f966d861e6960f132e743afe7a4f98" Size="2159774" CompressedSize="926596" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="68d38951ca4d3d30a245076c500b265ca391d43b" Size="2092969" CompressedSize="534297" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
     <Pack Hash="68d4a07013644163437adb2f70cdb7f803f893c3" Size="2095476" CompressedSize="653032" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="690374c8227af4538f536300c6e1f2c253d583ae" Size="2097152" CompressedSize="617893" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="68ed2eaaa9b5f79a6854d4377ea3571cb849a44a" Size="28175576" CompressedSize="5584097" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="691e34fe463bd30b5e7931673d0586c4d84c0cd5" Size="3727530" CompressedSize="728021" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="6922528bc959f70fad46820ff5e4b4ef1a310537" Size="3303619" CompressedSize="679516" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="692b4db8db9cfd65bfced1026a78b41eb9142968" Size="102741895" CompressedSize="102472544" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
@@ -67407,7 +67269,6 @@
     <Pack Hash="69e31ec5626bd851fdc3acf7ef853a7dc9482c4e" Size="1898304" CompressedSize="378817" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="69ed1d06e9bdf7add04ce72940b1dba50a5bf6d6" Size="455176" CompressedSize="117949" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="6a02e987394162520a81ec3c003bb18e283f30da" Size="17209" CompressedSize="4013" RemotePath="UnrealEngine-3588162-e7323a41db7d431eb26e240f34eeb975" />
-    <Pack Hash="6a0a8e62fa61c3f3bd8e63ae460c4c5ce758a443" Size="7404816" CompressedSize="2485769" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6a15e6e47a10c1dc80c27a80b5ac376ca60794c5" Size="2097155" CompressedSize="1274785" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
     <Pack Hash="6a3c422a237075366d803f78e1e9f44d6424c3f4" Size="2097158" CompressedSize="766051" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6a467413108651fd3be147f1f2cfbe29d032267c" Size="2097140" CompressedSize="452491" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
@@ -67422,8 +67283,10 @@
     <Pack Hash="6b0f64a3a5090f00c5d8405cb5c1684a396951ac" Size="2030569" CompressedSize="490317" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="6b32aabc7c776e0219f4866564d2ae85113d3fbc" Size="3373171" CompressedSize="905869" RemotePath="UnrealEngine-4074642-73b7b611b6a34841a3d783c023fdf0a2" />
     <Pack Hash="6b334f85f6bd0cb1eab1995201de3c395bdf1b19" Size="2080453" CompressedSize="1762477" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
+    <Pack Hash="6b420b09af0f6489e3124c93ccd721480ba05f93" Size="92797946" CompressedSize="20375737" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6b6421f4b745e2a6a717323f7566a4f55b8d69cf" Size="111074396" CompressedSize="19093247" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6b67c4b93edd66dc6876acdfaf991559f2387756" Size="2096158" CompressedSize="2087017" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
+    <Pack Hash="6b6c351ea29639e9ea1c91307904c84dc6750774" Size="21473854" CompressedSize="3681787" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6b6ea1539e3e10b995b117a201cd14188d7361cf" Size="2068744" CompressedSize="492144" RemotePath="2528357-44d3814edbb84d09a5279fe4fd30ba86" />
     <Pack Hash="6b95ce562e820f2071515ba753afedbe3df9c1bb" Size="21995528" CompressedSize="8100370" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" Size="2097079" CompressedSize="1603390" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -67432,10 +67295,9 @@
     <Pack Hash="6bb7326952dfe32d1763ffa1423888e323a2a2e8" Size="4488912" CompressedSize="1893079" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="6bd81d8b081f37c422a7598f56e18bbd70e86c7c" Size="8765217" CompressedSize="5916452" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="6c302ed628211be23e74d0b53c8d6c55a671f387" Size="2097001" CompressedSize="2017494" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
-    <Pack Hash="6c411a4061c6caaaa004d5d1d7ca7464bac6c483" Size="2314742" CompressedSize="585916" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6c4b50ee8e8b48c93bd9869e8ef8c28a4bbc91da" Size="1561652" CompressedSize="436650" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="6c66ef067c9dd33aa04b00c0951462cdd6de3e1e" Size="2095240" CompressedSize="1099167" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6cac0ce67fc25ab9057de053ed68e469376a951a" Size="2097123" CompressedSize="956911" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="6caedfd1e9355603c0478f9e13726d3bc8574e8b" Size="5637854" CompressedSize="1703512" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6cb4429447d8514e0670a383c944aa5a62dce75e" Size="1987840" CompressedSize="393893" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="6cb787330f36b79cd18f65c199404ce14d3f92ad" Size="3155264" CompressedSize="726923" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="6ccab9653ec9b1c3fcd6198c7b88f0b7ac9ffa3a" Size="4880909" CompressedSize="326311" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
@@ -67443,12 +67305,13 @@
     <Pack Hash="6d17b68e3ef2ba04421c03ad37c21c1871a7291b" Size="1503544" CompressedSize="1502839" RemotePath="2468685-6ced80b1c43d4f92b6c325ead32ec577" />
     <Pack Hash="6d1d44d16c88f0c87ab5dd99f57127c38074f98a" Size="2097146" CompressedSize="623010" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="6d1fed6201b07b57d09cdc015fe95f62b6f75d34" Size="2277896" CompressedSize="921644" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="6d233e51f0cc649dd555a3e262121fd57c26def8" Size="2088432" CompressedSize="592906" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6d263531086a2ac8abcd381816ca4bbebeb2bb89" Size="2097145" CompressedSize="486025" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="6d45809bcf59e3870273b5b9b093d9fc44a86289" Size="5503484" CompressedSize="1441521" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="6d4c2cc7672771dc38217853411eab1bad0e01cf" Size="3566031" CompressedSize="968205" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="6d7357dd4987e9a687f666583450e9650b6bec3b" Size="8754276" CompressedSize="8754780" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
+    <Pack Hash="6d7d5bf0c64832dd651e2479b8637f734e663814" Size="13461184" CompressedSize="4218880" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6d87e18f2c4e02c27ee937277e8bd1b8e2a9ebf8" Size="2010262" CompressedSize="596695" RemotePath="3354404-de27b30092be47dba428e9ed356f455f" />
+    <Pack Hash="6d8f0a4a0b4ca8ac905f2965b2094624e22d6a8e" Size="1845446" CompressedSize="505088" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6d97fd426d9e043b5a45949700d7412abcda8242" Size="2097081" CompressedSize="715273" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="6dbc1369cf4eb542c999ef1a7dc17798e967968e" Size="2288623" CompressedSize="2288141" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="6dc25f2712e77af6bf5605a31cf39f4fe9031a93" Size="2145378" CompressedSize="265024" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
@@ -67457,7 +67320,7 @@
     <Pack Hash="6e2a060d7037382a02da6ce27d023fb2bf955591" Size="10828282" CompressedSize="958632" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="6e37b4e46014714bfd7fd6d5d95807eafddcd441" Size="3636494" CompressedSize="947076" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="6e4f2760b5d09171b1caf834191e8eff91e09092" Size="2097154" CompressedSize="1472858" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="6e6d63ba70e5061606ec53f22b462ff7b817200e" Size="2097157" CompressedSize="824044" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="6e72c8b922d692af5779f780f1cd64b381dc46b9" Size="2097159" CompressedSize="1164104" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6e8111445beb2cb6a7089c4e03d13e59e40d308e" Size="2097159" CompressedSize="612651" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce" Size="2378648" CompressedSize="378842" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="6ea5616661fa6debdda968a3db88b96ce3ce6598" Size="3656168" CompressedSize="710367" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
@@ -67466,6 +67329,7 @@
     <Pack Hash="6ebb0744189c62fd3a3563256604e53015e9ebad" Size="39661464" CompressedSize="7516409" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6ebcf68520fb80c14bda307947650ecbe5ed0335" Size="3061518" CompressedSize="158046" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="6ee082b9948ee012bb75b75dc2f28f04a5ce87c6" Size="2097040" CompressedSize="1142658" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="6eeb2f910a42fe6604e39273b03dff1a56e965ba" Size="2097154" CompressedSize="783041" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34" Size="2504774" CompressedSize="2504513" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="6efc780c466db7177e8a59e693d673c4f6ddaff0" Size="2097086" CompressedSize="845714" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="6f05484879d2f89b7c43e2901cc5f670099f4d00" Size="1987150" CompressedSize="519802" RemotePath="2647804-bc48e958b8224dc19d6eb2f094c9d70e" />
@@ -67478,39 +67342,32 @@
     <Pack Hash="6fa388a803c9d6edf145e69165f91aa752cd7321" Size="1009712" CompressedSize="550725" RemotePath="3129012-bf28ea8994bb4040ae9adb152d6eb9ff" />
     <Pack Hash="6fab02fc8a8223366a46413779eed620ee187e78" Size="6038742" CompressedSize="778715" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="6fac65addd6f42dee4d150b9417619f012cb2815" Size="2096876" CompressedSize="608548" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="6fb91672d728f976248fa98ba0cd6cee6e7dee86" Size="1787776" CompressedSize="517824" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="6fc0ae5595ef491dd192b176b513b98c85ca1fad" Size="2185939" CompressedSize="315126" RemotePath="UnrealEngine-4067073-f4223345c30c43e9b9a5d5fb88e6738b" />
-    <Pack Hash="6fc1f1113c9085e3dd1b20b7a979e18c8889e5b4" Size="2096944" CompressedSize="562394" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="6fd734fb68a3fdfd0afc95072bce43c4acb74723" Size="2085000" CompressedSize="606376" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7012cd75b97103dec4c65b6c2594351953c7c00d" Size="89866912" CompressedSize="22402234" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
-    <Pack Hash="70182d4ffd95b3a1288b6fca57446bba12264d0c" Size="2096329" CompressedSize="542143" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7054b730a39f0d762ba1602fbca946a38a8811cf" Size="2304520" CompressedSize="436367" RemotePath="2565979-eaaf2006b54843b69b5280979c12ed6d" />
     <Pack Hash="705810a107813f391dbcf74972f321782aedc6b8" Size="1606583" CompressedSize="164423" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="705d483fe64b1f9075c585950375f4e0bdf711ce" Size="2094768" CompressedSize="453734" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="7073ccf926d5c24b5b473620037d3908ffc598bb" Size="1654952" CompressedSize="353917" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
-    <Pack Hash="708797ade74a9a50071b9512c44a63bf48722fb6" Size="5820872" CompressedSize="1704737" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="70953fdbe7467c2488f52f9e26a580fd3ac143e2" Size="4774" CompressedSize="1548" RemotePath="UnrealEngine-3875880-ee927641f733430fb8061be76524e2ad" />
+    <Pack Hash="70abd588bf9ec0e5b89e315d1d15997b159dd476" Size="27186162" CompressedSize="7214989" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="70ad5b88c3be326bb5df9ea19a5b633b2b80a0f8" Size="2097139" CompressedSize="929326" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="70bc3cba2df02db94668c029275adba4d7f590cb" Size="2097159" CompressedSize="527356" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
+    <Pack Hash="70bdd29efcb9a2792042174faff7cf83068ae70d" Size="2602360" CompressedSize="826012" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="70c36acf390a45efee0b39916d12f3307a23d48b" Size="143666" CompressedSize="116550" RemotePath="UnrealEngine-3509851-ecde81d8c8ed45209c7382780ed7b9c4" />
     <Pack Hash="7125960b58bc15ac745123ad6dffa48e0a18ae29" Size="19318406" CompressedSize="3716380" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="71292bc99fd1e9ceca2d36f337751eb8d2687a60" Size="2732956" CompressedSize="229884" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="7143ad7a585bda75349c77c92198a5b5ca391668" Size="2084314" CompressedSize="600993" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="718b44b64684f752c89244691d3ad66cabb01693" Size="4146752" CompressedSize="1937761" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="71a4dcdc501aeff27fea7ddce018655ca9a2ca00" Size="2857356" CompressedSize="1135415" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="71aee65f10ec6185d87ff6d436fd934b3f8d905c" Size="48025888" CompressedSize="8390690" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="71f91c9ee187d974e3f5da3d91a352d568c260a8" Size="2097156" CompressedSize="818662" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="71f99ea65a194123130d3f8b5629bcee3d302375" Size="14951910" CompressedSize="2771788" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
-    <Pack Hash="7224e5741b24d8ead9946e07c28a42fd8bd64db5" Size="2097076" CompressedSize="639266" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="722a31dd29e2e3e443eb41ab4cd88376bfbf5404" Size="27461128" CompressedSize="11276124" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="7234d3aeb7840986efb5412f43318f9f8e24c962" Size="3254922" CompressedSize="964164" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="723aaebd553b85d7b2d1db78502524a2b23b31a8" Size="6798128" CompressedSize="1058477" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
-    <Pack Hash="725460baae4426aa1567a08e85c06e11c2fce2b0" Size="5176690" CompressedSize="1120673" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="7256e4b0c42f8d9cdbe882a3ce4f16860331031e" Size="2373624" CompressedSize="610758" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="726596db859d5796f2be55f6cecbc2deb49a7649" Size="9550373" CompressedSize="6551198" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="72677dd988b57ba238af0852e4fdf46f4cce09f8" Size="2550152" CompressedSize="475744" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
     <Pack Hash="726ae92725160be1ce691c733ac2272294bed300" Size="4369976" CompressedSize="1057112" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="727db8bb6ead0674e0242dd95bd766ad1c0a4dfe" Size="23375394" CompressedSize="3992820" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="72d376c84c843790f796bff00a81a2818e70b3d6" Size="76437368" CompressedSize="22645480" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="72e922640673b6171e86c8c7fcdfa148004c1301" Size="2205652" CompressedSize="354835" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="72fee8305071d508698fa86e4a89c80f5ee236b3" Size="2044224" CompressedSize="428659" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
     <Pack Hash="7305d73041a77bded642dbf6567625ac3c0208fe" Size="2352796" CompressedSize="700355" RemotePath="2466157-4ecb0085873048178dd6d2b8872eea79" />
@@ -67521,24 +67378,25 @@
     <Pack Hash="734f643bae0e379a3dd8c932b72016a2bf7bf107" Size="2807925" CompressedSize="287771" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="7357d7c71e9e4a69a389fc681f1f77640e144d6b" Size="5251960" CompressedSize="250082" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="7365e35fd0579ff3bba980e4994697cb852c3dd3" Size="6783352" CompressedSize="1610424" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="739203aa1fa068793a67bd62b7fe6585b6da1701" Size="1116974" CompressedSize="308743" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="73bae428e969b828d72a1c4b71208bd855b67233" Size="986949" CompressedSize="363762" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
+    <Pack Hash="73c2e3823253fb7d495dc337fccae328d9f73ac5" Size="3394872" CompressedSize="903725" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="73fd8cb116df3b06c350fbc539c34905c8779635" Size="84866" CompressedSize="81760" RemotePath="UnrealEngine-3801423-9a76c00d7e0b4df3b710250726775f3c" />
+    <Pack Hash="74047235dbdcbf775ea1513c65d277308c03e7bf" Size="2093880" CompressedSize="566632" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7409849c2249d5c49bba2e4c620fb22ab5afc23e" Size="7532600" CompressedSize="2508788" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="743194775f917f2ee758966c7b2e865b19c63c50" Size="292636" CompressedSize="288937" RemotePath="3057487-c27873df4dae4d89bb77ddf0a8eea853" />
     <Pack Hash="7432257105ea7d44265b150ee3a0d7e36d46c4f1" Size="2095228" CompressedSize="1075202" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="743634d390e65d5d9ac514f2434ce65481b53527" Size="3028962" CompressedSize="911353" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7453af77f83e0611e833ed25f47f93213b93b8f6" Size="8624224" CompressedSize="4066412" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="745f4d65935e194a0c424b2a2cd9fa949d4bf86e" Size="3226088" CompressedSize="1014000" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="7491079d020d11f40f14eb94536fe09006ff2c16" Size="2097138" CompressedSize="816504" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="7492e057d16c5c219b44c555bd4e5e29e39fe612" Size="2964840" CompressedSize="784730" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="749a111a54b3257ccd4600b6ece1fd86a57efe58" Size="2091023" CompressedSize="2087137" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="74a0d5b9efb352121b2c377d743a4af6df9b49eb" Size="2094280" CompressedSize="2038989" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="74ac425c345a35e927df92ca0b8eec12dde436d1" Size="2252197" CompressedSize="531404" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="74b7d496e8365a94395c5c3ca866325b9bdae109" Size="208681" CompressedSize="78603" RemotePath="3012824-419b6661f6e1448b9838c6522876565f" />
     <Pack Hash="74bef15ba87e29994102cd44b59845c6cf474fd0" Size="6900976" CompressedSize="3048345" RemotePath="UnrealEngine-3780967-0b6e7a27e583450a83af784a391e1249" />
     <Pack Hash="74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f" Size="15011110" CompressedSize="4145908" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="74d4912e14c0ef44bd3d29001dcafb2947155e88" Size="2081203" CompressedSize="653174" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="74f149795a7f4347983025a723f82d13141d13b6" Size="2097142" CompressedSize="373040" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
-    <Pack Hash="74f28c4f535b95fbb5ab2977259754f1bbada39e" Size="46415744" CompressedSize="12365653" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="74f904f20ed3e1cd02cc9d0e07a2778948328274" Size="2080664" CompressedSize="1899955" RemotePath="2547993-1fb84b9e293242c988e586c599eeeb56" />
     <Pack Hash="74fc4e491bddbae9f76d9198edf1efb42e23dbb0" Size="465071" CompressedSize="176896" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
     <Pack Hash="750c578aaeae3cfd3e71b997fa330412029385af" Size="1564625" CompressedSize="499506" RemotePath="3119392-3bd6729b5ec44a739df783ab05541426" />
@@ -67547,37 +67405,29 @@
     <Pack Hash="752108efcce0f1353b7bf7b6788e6d82a9890a4e" Size="2097150" CompressedSize="799272" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="753eb938736a4b412147164d4077e991f9c89950" Size="320182" CompressedSize="146738" RemotePath="2618214-623983ec05b34939b08acd26ecfb4f92" />
     <Pack Hash="75428e4014e475de4f4790911faa961b5367725b" Size="1804288" CompressedSize="1307592" RemotePath="UnrealEngine-3928312-5b6723612bf0433f8ab61ab80e6f8414" />
-    <Pack Hash="75491222529ccc0d4e28b2e2dbc238f8be5d220f" Size="7152840" CompressedSize="2227559" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="75531423ce0cc73fa66fcf79458c718cf4800c00" Size="15728" CompressedSize="1695" RemotePath="UnrealEngine-3932287-cd207d677fc84180862e5bc225ba7aa3" />
-    <Pack Hash="756ef330af9fb8caf90b90b77368a2a5377a01bb" Size="4444440" CompressedSize="1298667" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="757018a2e8ed4076778739a0b2ca10402904d6a2" Size="10130568" CompressedSize="4391256" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="759eb0a64477d1269a2089f229e3f0a2276fb531" Size="4938496" CompressedSize="1096084" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="75ae69fcafee8616cc703f605cdc02e5d6a9972e" Size="2341680" CompressedSize="710250" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="75c28c22834f4cdff4572257a43313d57b889034" Size="17260862" CompressedSize="3965364" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="75c65d19aade831c17c4a014eb50fd28b2c2710c" Size="2097158" CompressedSize="714675" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="75d94b2db0814fd1ee724bb6ea943343504ab08e" Size="2097158" CompressedSize="724552" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="75e0842c76b2e55a861da42ea1d7c4636ab53833" Size="3939860" CompressedSize="1832351" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="7623413c9b3d2f9602c75005197ee9224f403f19" Size="1982926" CompressedSize="604473" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
     <Pack Hash="762702939264c0a074eb4cc01444d5b3505e95ae" Size="2169786" CompressedSize="248880" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
     <Pack Hash="76315c0a2f4f5390d31530304bf81fdcbffe769f" Size="3337874" CompressedSize="1062426" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7635e79b983e6e33e64248654b8a572d4124d642" Size="2435808" CompressedSize="941063" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="76417e11f618fd5b0414dae11219bb6d46b1d2dc" Size="2847971" CompressedSize="514246" RemotePath="UnrealEngine-3432852-0c2034138d8d407992169bf55a2d5775" />
-    <Pack Hash="764872ce07d573dff3cb649414b592eb16340b4b" Size="2097000" CompressedSize="834159" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" Size="2096261" CompressedSize="774533" RemotePath="3050870-83600feed2e74babadb21f419f1469bc" />
-    <Pack Hash="7665e894d2ef76b40d85459e1619b2b3316b6ae1" Size="4112244" CompressedSize="859865" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="76b340de00ac7fae027331eddd14fdc322755ed2" Size="2097114" CompressedSize="2094294" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
     <Pack Hash="76b81db67f411f1be2b6675587a81eedcdbfaf5d" Size="2097098" CompressedSize="664163" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="76ceae49acaae4eaab40e99ad6e585de490ee865" Size="2093188" CompressedSize="651250" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="771646fce4e975003b9f92d0dcae049304608b15" Size="2097152" CompressedSize="674977" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="772be2a1b26f994f4af5928b9a48434ff28b41b2" Size="2091208" CompressedSize="593726" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="774363affa148e7acada2be2f0553fedf8552894" Size="3994336" CompressedSize="1317725" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7756f8e0698993a2efb94e15819a1d1a22edd9aa" Size="2803148" CompressedSize="969091" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="77573dbce3e4334e792aa39b92048cda5adc940d" Size="12651944" CompressedSize="703342" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="7763bc2a723835983323800aed495fdef3171de7" Size="2110472" CompressedSize="692282" RemotePath="UnrealEngine-4071957-6642e934a7024324b15f91414df34b28" />
     <Pack Hash="7768e26095f6f16e7f329165693df1ce2b1b50b1" Size="6571424" CompressedSize="2494637" RemotePath="3140364-25fb5146829445ab89ef552f8f2cddc4" />
-    <Pack Hash="77a45c780d4b8b728c809b3746997230d1e80d28" Size="7521576" CompressedSize="2149127" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="776977bec09549ffc2102a4fcd1d750488ea7c9f" Size="172440088" CompressedSize="35423588" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="778dfae979a136f3a1f9e1d5e74ea4d35c959dcc" Size="8423310" CompressedSize="1874519" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="77ab57479dfe164e72b8298375e3b9b577e6640d" Size="8389824" CompressedSize="8390491" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="77abecf2c7c3bb7ca785f4a21f7462e5b9a87225" Size="2097156" CompressedSize="776923" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="77c9a1411d2bf7e175d99ce92f9e8b7156be8e1a" Size="3741932" CompressedSize="1116584" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="77c1dc1ea41b032b5000734aac4d310601d12325" Size="128192704" CompressedSize="26800267" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="77e0b57b01b65dac3277a08c2b0b1b18d4ff0c34" Size="2097093" CompressedSize="900990" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="77e0f90962f8cb6d602407097737ded66709394e" Size="3715754" CompressedSize="1134380" RemotePath="3033489-dbd1834ea8b44a70a83b0107d19e93e7" />
     <Pack Hash="77e2fc5854cef887b7bf0eede25f110bf2386e3d" Size="2943080" CompressedSize="1112906" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
@@ -67592,27 +67442,31 @@
     <Pack Hash="78bfad613f4d6cee1f09370753a6477a8118b752" Size="10693256" CompressedSize="3274410" RemotePath="UnrealEngine-3479958-543a927e673c42ee89fb13d09ca158a4" />
     <Pack Hash="78fa00bf80eba8927d597c52108a916d87a17f27" Size="6917212" CompressedSize="2463139" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="78fcbb1e8afd813307d76f406251e69e55de71eb" Size="20085920" CompressedSize="3019509" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="79192fa698565fc7947e5036c3d6a67b1e44a847" Size="3711532" CompressedSize="846763" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="792a616c0f78fa0b294f67b56549092efbbbeff6" Size="2097158" CompressedSize="2084690" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="7945598a03da7845fd4315ad8beb6291de075139" Size="2225672" CompressedSize="910737" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="7952de7bedfe83054183a5fa9a1bb279be85e12f" Size="100634068" CompressedSize="17465934" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7966ce69e1ca589fd320f02bbfda4db14a641042" Size="2097041" CompressedSize="669127" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="796f0c398bb010288b3688e6743420cfb681a4b8" Size="1698087" CompressedSize="1008781" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
-    <Pack Hash="79791e455691c246de4c6f1105306004b75cf2f5" Size="6648078" CompressedSize="1183399" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7996e8351b085aa99ee962c9a0abbbe9b077e23c" Size="4902839" CompressedSize="4902668" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="79b24ce35907d7475fd12256466bfdaaa63531a7" Size="1080587" CompressedSize="671241" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="79c05fe7b7c07f8ffbc805ba018206bdd2a66fb9" Size="2066440" CompressedSize="644480" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="79cbb1b9e1be7761c86eb45db23522dfc07e61b1" Size="2096027" CompressedSize="1217964" RemotePath="3121752-deea2c76617f4d9a81789452fc9e8bc9" />
     <Pack Hash="7a056544a3331cb6caf52198ad75c0aaa158c16b" Size="114508624" CompressedSize="37825380" RemotePath="3272229-df8670d09ed842e3ab4b37283b783ca1" />
+    <Pack Hash="7a071f4107f137818f1d33c662dcacf423864f6d" Size="1953928" CompressedSize="518557" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7a2bf1344816a13e39f9fe74bb22c30a74396fc5" Size="14548" CompressedSize="2330" RemotePath="UnrealEngine-3632432-abdc804a138b4e809beb3d008671b844" />
     <Pack Hash="7a360f6fbb00f4fe90c2ad3fa442237875df9d65" Size="5282792" CompressedSize="1675505" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7a40dd99744a7fce004bb774f9ce3db2ffd4c1e9" Size="19759960" CompressedSize="3679837" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7a6a00a467444bca511b032d80ad66d275670598" Size="3259822" CompressedSize="785701" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7a8301ea5bb7e538a66f2a54c051ff0c4f9e4159" Size="34405216" CompressedSize="7099246" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7a8446207acdf4eaf9676898ddacf9bdbf595de9" Size="2097115" CompressedSize="2069239" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="7a880fe272f6c68bcf8cdf6f792937f435b05da0" Size="2096958" CompressedSize="527322" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7a90ab9e937888c1b30ee67bd4fd3ffbf35f75cb" Size="77945" CompressedSize="67913" RemotePath="UnrealEngine-3845730-736f9aba00a945ab990d1db40c061de4" />
     <Pack Hash="7a9e76a55a9b6b32eebf66809b45c777cf444358" Size="2096959" CompressedSize="1506565" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
+    <Pack Hash="7aa3a496eb4790b1edb510b703023a1b458b5837" Size="2097156" CompressedSize="872605" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7abcfd36a7f02b075eee065ffd47d76fdf48bf61" Size="2097130" CompressedSize="717021" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="7ae32a8aa3e7d7599069e8c73c4bb5dcea7cb0a4" Size="2097154" CompressedSize="599582" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7aed73ed91dd056b30229d06288884fbb8a0d58e" Size="8294408" CompressedSize="2075643" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7b4857581cb90439a19669b4b579f63643a80e27" Size="2097142" CompressedSize="737439" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7b53792899b5b235a3127fd21104f068e591bd66" Size="4478984" CompressedSize="1881256" RemotePath="3140364-25fb5146829445ab89ef552f8f2cddc4" />
     <Pack Hash="7b83af4328df75db5202d9e02c057d139ca1a9dc" Size="4956388" CompressedSize="4956478" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="7ba48c7d3eefbd43680e84dd45a298eba1ba5a4c" Size="222776" CompressedSize="74650" RemotePath="2761339-249364708b3f4901b6ac2bb1f2bd8b36" />
@@ -67622,28 +67476,20 @@
     <Pack Hash="7bfd7de8d2ac0eb94169cbf6909247b8391c987e" Size="1542999" CompressedSize="1459119" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="7bffbd41c1725901fd038ebc348dc4275b0e9f4d" Size="11741470" CompressedSize="3115606" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7c125d9cce93f13fc5a9c56e858377d13ac67a3c" Size="5442188" CompressedSize="2069503" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="7c2047a9f8a2b1b27d81d480322719be3beee151" Size="2097157" CompressedSize="889531" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="7c398d1b0f8b9f7bc645e23621e20406b54ef239" Size="2346178" CompressedSize="545832" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7c46a1907c01c68d7fa9533155e9de94e7b17723" Size="2510968" CompressedSize="810536" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7c5339b6b1382c59c12893376db1f10162f6653a" Size="2070407" CompressedSize="519665" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="7c574dc93bcb7e3763ddc0740cdbd5ce395c035f" Size="19720688" CompressedSize="5755586" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="7c5cf90990040c7ceb1fc41101bd3e1a450f8093" Size="34109808" CompressedSize="7049708" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7c6af4b8a70292c8a317014f6440886bc22432d3" Size="4347456" CompressedSize="1012431" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="7c963542515f21d8db5b961bee100b6412d597d1" Size="632526" CompressedSize="163060" RemotePath="2377358-53c9e09a80d741708f589736e8974c22" />
-    <Pack Hash="7cc5a044adff7d50f070ee2f247ff1a3532f069e" Size="1549328" CompressedSize="409728" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7c966c243091182dc9fab20d21edfca49c7fb75d" Size="84806168" CompressedSize="19493371" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7ce0f7436d0a1e809af94a0b16fb0395cc52746e" Size="98275336" CompressedSize="43136822" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="7cf9e496eb7096fa3d16961527384bf78d1c6319" Size="7362536" CompressedSize="2033667" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="7d0d1ad3f6c6a7281fb29d8e3b733ced715956b7" Size="27176070" CompressedSize="7209247" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7d11c98e1cdffe70e6382f42497d5914dff6066a" Size="6779058" CompressedSize="1611762" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="7d1f61f60321e34520d7f474dab182ec9c5f1e2d" Size="2680502" CompressedSize="522066" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="7d2cd67e5409d984a518119f088c05600971a174" Size="2097146" CompressedSize="542119" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="7d4898488ea0b589fd1090d978c9ee7928a09626" Size="8987655" CompressedSize="6133862" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
-    <Pack Hash="7d67e2a773161bbf02d0588ea9ea92a5cbca1cf4" Size="5818784" CompressedSize="1682202" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7d776a07e3eb045bc87ffc9ab7ffc5da18a5c68b" Size="2096986" CompressedSize="772847" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="7da3df3d39213af94d7865578579998716e675cc" Size="2096508" CompressedSize="386364" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="7db350110118d3076728f890e80db47042b1c9c4" Size="8829498" CompressedSize="8830316" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="7dbf44f82b8d049f252bb530240619ee1242c9f6" Size="32056810" CompressedSize="8624811" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="7dca2bd6e88debf4a4edee16fa07758d5c861bc0" Size="6901608" CompressedSize="1740558" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7dd781dacac6a258f977fc767cf332b5a2e0671e" Size="3755012" CompressedSize="1116665" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7df05f3829c0bba55913db5a808b6817d0480c8e" Size="24293720" CompressedSize="9717665" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="7e377685c9f3fcefdc0c2b36b53a32d82c9f637a" Size="2094615" CompressedSize="552512" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
@@ -67651,51 +67497,53 @@
     <Pack Hash="7e504e731d99b59de57d71becdb34fce6d198dec" Size="2088926" CompressedSize="1031696" RemotePath="2984534-bc60b1c26a96427fb82e415a06c2daa8" />
     <Pack Hash="7e74577c3774e9eb2328f96f667ae7df976b62e7" Size="2097059" CompressedSize="845815" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="7e99f899ef3c066b6719ed1a5a97a5474ef6a0af" Size="1743730" CompressedSize="302267" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
+    <Pack Hash="7e9ca5724c4e7967532c52b5aa0042aaf9cca00c" Size="2957786" CompressedSize="930346" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7e9d8dbb901637a706412f7ef8e4bf6d65c55be2" Size="13439720" CompressedSize="4159736" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7eab47f1da799465d08b68e26c7ae336a7b07a47" Size="9840146" CompressedSize="2776661" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="7ed22a7ef1a00c1e207e95b40e3c144e45ba66de" Size="27609184" CompressedSize="8533028" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="7f00c380f25858c6ca3b906b06dc3b7812b02016" Size="2096162" CompressedSize="647959" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7f03328aec71fe51ff22081d7f379247fd0e18ef" Size="3304015" CompressedSize="3106785" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="7f0de1dd4655d584759839b3cf199b35475747dc" Size="41385232" CompressedSize="8710918" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="7f50aec1044d8780fd0aed63bba9bd40b4b8e489" Size="19137256" CompressedSize="4840179" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7f6c16e1c336e9396055bd74f798b7348e63c0e5" Size="268583" CompressedSize="189420" RemotePath="UnrealEngine-3920609-d96356466ae74ecc9f1d62f3a36bae52" />
-    <Pack Hash="7f727a489bd1a53eefca9831cb061375a03a3c99" Size="2096649" CompressedSize="1106461" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7f78d412a8c9cec41469a616242f4c72d0a31de8" Size="72175920" CompressedSize="12337235" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7f82ac0e8f95510f15d04a2d2560235948f13e61" Size="72175920" CompressedSize="12338171" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="7f8b724b75c6f29c33f33a1f310cb495e079aaa1" Size="2106179" CompressedSize="2105793" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="7f90803950ab1a6103fc4e9770016325c39094a7" Size="43037780" CompressedSize="8074763" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7fabc2d6c64f187fabb70ba2d24fd36158d4dc24" Size="2080791" CompressedSize="713372" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="7fd362e5cac74c008cbe2257e2f9e17c46584950" Size="3186792" CompressedSize="1148304" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="7fdc7b37beb97f35624c44fb0cb93c1f20f961dc" Size="1500804" CompressedSize="288629" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
+    <Pack Hash="7fddfe4937ca7b830185cf3536c26128ca25395b" Size="3638232" CompressedSize="1026363" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="7fe7fc67e9a9353f92faeeb4667a959414552981" Size="8770440" CompressedSize="2326963" RemotePath="3189774-fa29f2e73310489bb5062f25d408c9ee" />
     <Pack Hash="7ff0258fa2f21b93355bcb7c1c50e5256c2c880b" Size="19307340" CompressedSize="3649735" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="801295549915c66473e6cd436dc1623ad50a6868" Size="2097119" CompressedSize="1902352" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="80417a80f0996195be6e52dbdb7497378e2d0b17" Size="166318452" CompressedSize="21708390" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
     <Pack Hash="805c8b99da35c0a5a3743027e53205e387dd2d35" Size="2097150" CompressedSize="837284" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
-    <Pack Hash="806767890f38dc746e2ab64feb16967521b8a467" Size="73803784" CompressedSize="21802373" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="80692ee126e647cd28189fde8ceed8c0dc1a4c6a" Size="2096672" CompressedSize="577555" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="8082a10ac392824216ac0861071d22f2bf02ecba" Size="5688860" CompressedSize="1391141" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="808d770316e34f69386b0117ea34b7d2d65f744e" Size="1338719" CompressedSize="413431" RemotePath="UnrealEngine-4083268-34b5a5188b90414fa567e7db3b85e865" />
     <Pack Hash="808ebf98e9353070f89e8650e7665b4756e33f22" Size="3455392" CompressedSize="1024086" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="80b8a7af0851156fe1d64e7b6bda7aa6657beb4c" Size="36212056" CompressedSize="7378497" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="80f2cc730f53360badd247b19d28c4fb72891609" Size="201334" CompressedSize="113909" RemotePath="UnrealEngine-3582334-5f449a97e12347d48d767db291169eb3" />
-    <Pack Hash="8104cdbe10e35400d4bb0aa7905a07c2996eb727" Size="7319520" CompressedSize="2280379" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="8108e1fe719b49a68115d9d1a3ed00d1787bf925" Size="170110380" CompressedSize="35012659" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="811a890ba0d6651ad379bdb2fabbf5299f52b73b" Size="2326536" CompressedSize="774659" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="811edfe694b7d1e14c43c90c20f6e697d97b0f9a" Size="8572684" CompressedSize="1250152" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" Size="2080816" CompressedSize="1196788" RemotePath="2466157-4ecb0085873048178dd6d2b8872eea79" />
     <Pack Hash="815ceaba7a67e678c4a7187990c7367805ed6d7c" Size="8753847" CompressedSize="8754618" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="817377b664b869ba2eaff42edcaf4ca04a7f02c9" Size="3407548" CompressedSize="611092" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="8196440d528a0b18b7e8c3db78761c5ed70ab5c7" Size="15903523" CompressedSize="5739249" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="819a2452e63804986e4e4a95bd9fd323afa3155f" Size="2035188" CompressedSize="476133" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="81a790397c019de8beb710f522e1041d389a6272" Size="2325544" CompressedSize="896266" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="81cbbc966385c281ee92a7a75568ab5e34091ce6" Size="2096990" CompressedSize="299788" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="81f765f195af9a93a3e5b97e2718fb3ac0b30aa0" Size="170699" CompressedSize="165670" RemotePath="UnrealEngine-3608646-64d61c979044468eb40ffb81c7e9b41d" />
     <Pack Hash="82328e8ffd69ddf6efd151eb0649e8426d803a76" Size="2020276" CompressedSize="807028" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="823426b9349b70b265f8587bea8e92f6f5f01d38" Size="58218360" CompressedSize="26400509" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="823786b849304f4f046e804e4c7a9578b0e7dc4d" Size="2063306" CompressedSize="2043028" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="8259d40fa22680a13d44598fff38316a3abc0795" Size="2346242" CompressedSize="545676" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="82752934d29486bef3008fe2e7e9953dacd3a238" Size="7418538" CompressedSize="3394744" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="82788599ad2583d437e6cde9e247d16ba5059dac" Size="2080010" CompressedSize="1589432" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
     <Pack Hash="829b10d9abfbf44d4b4fc305646818f9d84a3d96" Size="8914110" CompressedSize="1505123" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="829dad73a6a32ed2d50f150c3a3c4482883a0a36" Size="2096502" CompressedSize="1999031" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
     <Pack Hash="82bb8dda5b38966cfc8fbc9537b44e234e456825" Size="8187912" CompressedSize="2205340" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="82c52f0c633f52373859026b355e3b0f6574f232" Size="7308984" CompressedSize="2271822" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="82e5aa963ea68a807353f97c6dca1b8d32bfbc80" Size="2070948" CompressedSize="320708" RemotePath="UnrealEngine-4067073-f4223345c30c43e9b9a5d5fb88e6738b" />
     <Pack Hash="8305a66fae9404fe58331fbef287d0215d05f2b3" Size="2097131" CompressedSize="448091" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="83127d14d8403a98dd6220dc7c9068fb0d569cc5" Size="2097079" CompressedSize="327369" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
@@ -67708,10 +67556,7 @@
     <Pack Hash="83c26e75614987b0816315db03de7aca670aae61" Size="6769028" CompressedSize="1673468" RemotePath="2590354-88fba4596efa431eaf994358f50a5f48" />
     <Pack Hash="83d99abd11bcb8782d32661775471266e6254ae4" Size="6013418" CompressedSize="1577976" RemotePath="2634747-19d80a6a5c9a448e8b5bfb5b00ad73ae" />
     <Pack Hash="83da555d6e4fbfe69ca68b5ca6bc7cdc4a842210" Size="2344928" CompressedSize="710323" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="841e3473c016ca0fb18b622895f124e49bd095cc" Size="2622394" CompressedSize="577678" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="842961a5e890a43b78c3bd4210ed8291afaf186b" Size="25329760" CompressedSize="6877018" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="843ec9521a79db33580bddc6abb809743c01abce" Size="2097140" CompressedSize="739744" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="8455fe762b5fb5a08cc6459a9767387991dc1bbd" Size="12151968" CompressedSize="3190286" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="845ed53afc1290397fec3abf061fc285e9999f6a" Size="3874440" CompressedSize="1006721" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="84904046b2802fbd62fdbc4634041aa96b01ca67" Size="7625498" CompressedSize="1470207" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
     <Pack Hash="849586837a4432c69a6cb4b1559cb1dbb703da3a" Size="1513329" CompressedSize="685005" RemotePath="UnrealEngine-3421020-b69f07f95ef24e0eb3578aeb64fc65d9" />
@@ -67719,57 +67564,51 @@
     <Pack Hash="84978356cd369be4736c7b3fe392c0ea1f27c7d7" Size="3259030" CompressedSize="1054223" RemotePath="2839850-632f4ca3f7a5496781b581496d5328d0" />
     <Pack Hash="84ae2a65dfe9e8ed00ab1b66bb866c4dbbf9e53a" Size="206666" CompressedSize="93387" RemotePath="2947018-5736e991fa0f4e4690098a000a325286" />
     <Pack Hash="84bf691606771eee36059b19cfd6ba40df0b3148" Size="2096671" CompressedSize="759328" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
+    <Pack Hash="84d08623387371fd62655826fdf28874cc21aa57" Size="4028912" CompressedSize="1117172" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="84d35fb21b689609de4f8d3ff3a14402c7a7f63a" Size="1995570" CompressedSize="932456" RemotePath="UnrealEngine-3934044-1b3e7ca0146740ffb6a610e070b5d5fd" />
     <Pack Hash="84dede50a743fc971c608cbf3f796fd039f3b983" Size="2890258" CompressedSize="948911" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="84fc72663545c473398b1afd3d49060edc0bf47b" Size="10710440" CompressedSize="3043047" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="84fdc06a11907cd49f3f883d344584db7a9cbc39" Size="3822812" CompressedSize="828731" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="852eee3d819705b696e772cca82f36c9c0135e4e" Size="2356232" CompressedSize="784816" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="85393f1f0730c3ae240238686b47d7643899d34d" Size="3466864" CompressedSize="1467201" RemotePath="2581810-569aa4e20f7249d0bfc2a94ef91ec1a8" />
-    <Pack Hash="853e1cc9b98852f37f98ca0797670feba41317f8" Size="42089074" CompressedSize="42005369" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
-    <Pack Hash="8557924e60fcdd015907d69d205b21d58fccf17f" Size="2092769" CompressedSize="907570" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8558ca6aa4a0c7d94c3e2f04dd962e09af8d31af" Size="2096598" CompressedSize="1174705" RemotePath="2984534-bc60b1c26a96427fb82e415a06c2daa8" />
     <Pack Hash="8560c518a2780f37bd6b4d789c64b4e8ef07845a" Size="16968236" CompressedSize="3321712" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8575b29003613867e1d7350c5f55d36d96bd7283" Size="2095835" CompressedSize="2062272" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="858de213a099ae751d4748be354bdddec041c44b" Size="2094920" CompressedSize="786176" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="85b191ae1844ad6da93fa57876c8850de342b4ca" Size="2097146" CompressedSize="839187" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="85b7dd559cafc3f88cf3c0c8607177f7b0f1e274" Size="2097128" CompressedSize="637102" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="85ead6085f10e657e1a91326f3704d60b31164b3" Size="2097106" CompressedSize="692479" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c" Size="1589814" CompressedSize="548717" RemotePath="2605823-fed77bb1e455453286ca4bfc444c86ac" />
     <Pack Hash="8607c0c0546ec5358e54c6b426408950bd903068" Size="932360" CompressedSize="386724" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
-    <Pack Hash="86291bf2d748652dfe149112b1b6923680836b57" Size="2097159" CompressedSize="719868" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="862be8437ee211995a09c6054bf43a5d08256f40" Size="1913063" CompressedSize="1680430" RemotePath="UnrealEngine-3937305-0a379f530f2647e093793e432bef8d4b" />
-    <Pack Hash="8643ce201c9432be306a13893bfa474c42681210" Size="6907864" CompressedSize="1742801" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="865b8def9b158aa97b8958e63ef450b7b24982fa" Size="3180939" CompressedSize="1548473" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="867356c5b5f0807c0afb8d5314ac09fc3e1b9a72" Size="1688375" CompressedSize="1546213" RemotePath="UnrealEngine-3913300-a9408c0ac89a471bb01aa3321053f5bf" />
     <Pack Hash="867c8f6848fe0f1bf3ae16f592b929fc747e9679" Size="2093176" CompressedSize="1067409" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="86a3ef300ab5182d7d6f3c7e1dec1ab017621176" Size="2096983" CompressedSize="2086485" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="870ca928827716f87bfe40deac8a182b8f5933a5" Size="1221880" CompressedSize="208686" RemotePath="UnrealEngine-4060164-d69a73f952174c318802b4322d29764f" />
     <Pack Hash="873541147c73b4ed8435b6293edd84dd6170f421" Size="4132241" CompressedSize="399092" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
+    <Pack Hash="8744b312a13828848520eb87651ca7970cf19979" Size="2097118" CompressedSize="930119" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="87925181e3a8b737757401a6114a8acf82625a49" Size="2097158" CompressedSize="1563097" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="879da85ee7839263b362a6d69f41f3d4477d2263" Size="2097039" CompressedSize="426131" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="87a8983790af30b7e2ab245a5ec4ad86d34911ac" Size="2903080" CompressedSize="370327" RemotePath="UnrealEngine-3809764-549cdd57da794195a8e53a84e7dfea20" />
     <Pack Hash="87b68506c5cd74f1611024f39f537980f02f4767" Size="1238981" CompressedSize="577832" RemotePath="2830099-6da92568664f44e39feb93037bc9e544" />
-    <Pack Hash="87f3dc0515b0af506382b841c1f9026c5aa0934f" Size="4316122" CompressedSize="770051" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="87f8a812ddd59797c9a03fceeec9d14f3d23473b" Size="2362416" CompressedSize="548086" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="88118c43d42564541832368d282cc915c76fc36b" Size="371208" CompressedSize="159643" RemotePath="2973140-15a5ff67f3864917a418527f3d02c30f" />
     <Pack Hash="8814291f8bed0c9bde408fdec8049a5cfa44ca2e" Size="954992" CompressedSize="244849" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="88192934143593f3b9bdf82185f4ac7a7373da7b" Size="2097147" CompressedSize="743394" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="881ad0ca57f6a4fe275a7b7ca77f2daa52b2334b" Size="2096208" CompressedSize="1019507" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="882f6bab05cffc222c77514ad3b3cabcea52bd7e" Size="2097127" CompressedSize="494606" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8841fb311dd68b47eb7608fe703ded3dcbdf54ca" Size="2541248" CompressedSize="815419" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="88683098dee169776e831faf0ff2f693fdc02981" Size="72176198" CompressedSize="12337997" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8871b656048443a7c5f7aff094410fd4ac07c9c8" Size="4551218" CompressedSize="4533511" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="8874686121c6b2bd9b841dc9322ab6c5e3c82b33" Size="1511340" CompressedSize="454620" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
+    <Pack Hash="889d66b9b8a0ba8c11ca8f848537e018bbf6311b" Size="2894016" CompressedSize="923799" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="88b0c91639f08f62e25f052d78be2ef069970b76" Size="7442448" CompressedSize="2316160" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="88ea146643258d378d159b9f928c783774ea9c53" Size="11812322" CompressedSize="11813661" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="890b4a8d8b1c0723db8c9e2d765117327e4b2275" Size="87370508" CompressedSize="14543057" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="890f859d20731989f0ce0e2ccc89da28cf0f8dbe" Size="2084775" CompressedSize="2078664" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="8942901664b007a5a3bbb800b8c8bfbea75e58b9" Size="2289783" CompressedSize="2287055" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="89550f66a2a48a9f1b9089703e9b33eb14a23ae5" Size="2097145" CompressedSize="1916666" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="8955912eaecf38aa2409f4a2f2173ab552ada237" Size="2230849" CompressedSize="710348" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="8962c9283d246aa6183316165b2eabb0cb7e0781" Size="1944355" CompressedSize="1467398" RemotePath="3136620-0d53f82841df4550a36de5fa93031528" />
-    <Pack Hash="8964b1842eb2e86f576ccad00a692f179d7ccf8d" Size="21000088" CompressedSize="6307492" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="89655ca2156f42621ad3d2f705ebf90bd9f7a265" Size="2097145" CompressedSize="710188" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="897370b8aae1f0bd072aaa9f84aa5edcf4810baf" Size="2078607" CompressedSize="343210" RemotePath="UnrealEngine-4060164-d69a73f952174c318802b4322d29764f" />
+    <Pack Hash="897a7552e0022da017cb90d0b681212266fc0cfc" Size="51293120" CompressedSize="10817140" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="897ac4c4e39fdc38ae3b8bc59a7c8331407908a2" Size="15944672" CompressedSize="4081654" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="8983a85b417d4dfab9181da926c6653da0f6d483" Size="2079466" CompressedSize="686335" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="89848bfdce81089461dbf49b67ef0aee84ab9730" Size="2097052" CompressedSize="536098" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="89b3b27aa79deba9893f3f5ed835fbd447475c10" Size="2097077" CompressedSize="813028" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="89c48eec40baf0da2f2a384ba090fcbb9706a146" Size="2592776" CompressedSize="590366" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67777,26 +67616,27 @@
     <Pack Hash="89d6a274ea3b011104233d725db1edddcc73976e" Size="2096789" CompressedSize="2030321" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="89dccf24c53c64871240b8ebf39a707876d0cd34" Size="5918260" CompressedSize="1237435" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="89dd56ae56b8da7114324a8325a736e288d0b80d" Size="3849888" CompressedSize="1381442" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="89e2f7c9e25a661438cb0f661fe47b9e0c4f816a" Size="2097149" CompressedSize="845653" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="89ebbaf2d544372d7908ec03d4025799893eaa80" Size="81744" CompressedSize="14490" RemotePath="UnrealEngine-3591177-98be59bbf83d43f0998f09a5433d4a6e" />
-    <Pack Hash="8a0788b72102ac1127cbb79e7373db8b78384833" Size="572" CompressedSize="330" RemotePath="UnrealEngine-3569949-8eeccd4a9cb84296b9645bbd4a03e453" />
     <Pack Hash="8a1aaedf4102b9632dd10ee62fd2ea5bbffd060b" Size="2907512" CompressedSize="2802398" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
     <Pack Hash="8a251169614945698a2c1990c0898641d380b289" Size="3430416" CompressedSize="995903" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
     <Pack Hash="8a3441624d6b452dd4471b77ba36ab429dd8b8da" Size="5438264" CompressedSize="1544576" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="8a3b5abb3245b82efe40c3f88cd162fb7f0525a9" Size="8885184" CompressedSize="2341032" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8a414cd1f4cfc06614e24335bc66347975972607" Size="12077408" CompressedSize="3355742" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
     <Pack Hash="8a4f2a9353805e1bee3b84666232d2456d85e880" Size="63542272" CompressedSize="8855100" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="8a5bdd02354d58511ca35f5103de468e91133570" Size="6151276" CompressedSize="1490668" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="8a7c6b0f9cc883870556fb456f20715ed40367c5" Size="2097122" CompressedSize="663744" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="8a9a2a4fd2a29215a1743cbbae76d040aa09adfe" Size="3028378" CompressedSize="911190" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8aacb522ada8d031d2c9566b3a8fd560e6022d40" Size="2405950" CompressedSize="715636" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="8ac4339e593d1b06dbf74d5477482e5243d77298" Size="2095923" CompressedSize="618958" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="8ad5dea631af368fec9f5f42b6f235997a8131e9" Size="10691514" CompressedSize="10692939" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="8adae05a9b0849cbbd4aa9583897eac102d41c4f" Size="8514412" CompressedSize="1899392" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="8add538e7df2f50982724667c0f0d8accd785dea" Size="3307348" CompressedSize="1193614" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8ae41d0c7d8fe2a00251726554c48ce1dec9ca04" Size="5415298" CompressedSize="1199865" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="8af342795a1559f0cd211e98eb1bcacea96f8bc3" Size="22086104" CompressedSize="8488043" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="8b063e2dafc673c57870b6a2fca11f3fddb6e106" Size="2096171" CompressedSize="1797268" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="8b06bbebdc6cdb17cfee83d2685dde28435fa503" Size="2095927" CompressedSize="472628" RemotePath="3313429-ba9f2ff4f2064d1587a04d4cdead04cd" />
     <Pack Hash="8b074d0642c577e9eda274945aa48bb666ef0322" Size="2097140" CompressedSize="1827275" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="8b1582bc8c1f8c742ed6cde6d0357ac5bedc2dfb" Size="32357720" CompressedSize="8713846" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="8b5291f3f8f3ddb9d9fc8ad444abd28ce12847cb" Size="2093354" CompressedSize="544177" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8b75c0186f469959c83c3e4cfd0af6896caff305" Size="12143212" CompressedSize="3187225" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8b7636ea04e983ec6e97f8a003cb7a69534ae8d1" Size="8228872" CompressedSize="2029812" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8b80dad1cf01480c08d581bf0ffeb98e27882d78" Size="2097151" CompressedSize="1032100" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
@@ -67806,25 +67646,30 @@
     <Pack Hash="8bb1a38b5f0c398986f78dadd826f50173e3be9d" Size="2097135" CompressedSize="1678708" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="8bb47b340d840ef189c0d94c092bd84a27645658" Size="17635633" CompressedSize="16898604" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="8c09749d3afbe4cf42116bc13197f82a95638859" Size="1152088" CompressedSize="211079" RemotePath="2647025-75413ce48204482f9dfa787807c9474d" />
+    <Pack Hash="8c57baf2fc50490200125aff8985067b3497ca4e" Size="2384952" CompressedSize="614282" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="8c5c5245525609628442a9e4237db8a60ef59d6b" Size="2096362" CompressedSize="515407" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8c6dbcbf73a2e52bdb5b7bbcc25220b9eb877871" Size="4029926" CompressedSize="884218" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="8c75012a73d339b2536a3552bd94bbb35244cf76" Size="101024616" CompressedSize="17886502" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="8c874e97900603b74a66b078baab5dc9f944aec6" Size="1338125" CompressedSize="270499" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="8ca8fc4f81c127e4c748fcb899af430506bd0b01" Size="4448804" CompressedSize="4448309" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
+    <Pack Hash="8cb7d3cb02a4fb26737291b8b275e1d34a785268" Size="3433722" CompressedSize="1080754" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8cb932c7ea437becda4c3a3d440d28ab1ed90f23" Size="44181042" CompressedSize="9108255" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="8cbcbc5fa504c8c6f73def97aaefcf9a25edd60f" Size="16137412" CompressedSize="5405646" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="8cc04fd8725061ba6ebdd7ad9a2b7231d16fc12d" Size="21993480" CompressedSize="5802449" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8cc6c4610b9b93d7ae65c41f512334bab8529cd0" Size="2097116" CompressedSize="465969" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
+    <Pack Hash="8cd7fb60dd6c4c5b4314c61a01d388e9fbf943c0" Size="20087976" CompressedSize="3039393" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" Size="286021" CompressedSize="270775" RemotePath="2604000-fac6782aa4fd45888363b062a8353761" />
     <Pack Hash="8ce8042d769eb15ad55800bad024caf7733ce06a" Size="2420408" CompressedSize="885456" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
+    <Pack Hash="8cebad30706df03c8e11cff1a20e9cd32f8b71e8" Size="157377176" CompressedSize="33131922" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8d19c6dac96e38d1f1252a260017729bb07a6157" Size="2096995" CompressedSize="914633" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="8d274c2369d90ec82c834f17356669522991c64c" Size="6222480" CompressedSize="570688" RemotePath="3159493-6534da539a994f8fbf2b5aef1cfd7d10" />
-    <Pack Hash="8d35f05044eeb50591ddf60def9eaf3cde165e96" Size="73799336" CompressedSize="21800366" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8d4f3880f15542adce8e680711e855fb1935cc68" Size="2134869" CompressedSize="245082" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
+    <Pack Hash="8d550033e655bda81fb9052060b94905a553d83b" Size="19909224" CompressedSize="5278832" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8d603349ca906c793c9dd2003931ee5deaf3ce8d" Size="5909386" CompressedSize="1492491" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="8d634afc35fda9fd181780d5c49df1b8bbb83eb6" Size="7532600" CompressedSize="2508802" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8d6762375c788c3ed64db6f381bdc77f1cdbaab6" Size="12873838" CompressedSize="12010714" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="8d8759a5eb78c9e0c8bc16ba6be4b64bde2e11fe" Size="3230220" CompressedSize="1277942" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="8d8a695159bf666e16ab7b3558bb1d5e4e3b4698" Size="27042824" CompressedSize="11171707" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
-    <Pack Hash="8d9ba5e7bb4e9d3e863b91d9bb8ba39bd348f28e" Size="4157712" CompressedSize="985308" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8da6976ecaa99b785dd5b8786a2cacb519d2d294" Size="2096945" CompressedSize="926980" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="8db91240f50319e0e8effc5d85d3074c2dbb23ca" Size="2096874" CompressedSize="1447477" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="8dc6a3e8e7ec5d61772d5ad24157bc9445f6b302" Size="9777160" CompressedSize="3069404" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -67836,41 +67681,36 @@
     <Pack Hash="8e0c7ed6837a6d19a50a2c8e5f9b300f0a00fce3" Size="4871336" CompressedSize="1846494" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="8e218acfafa8890d8c6f513d531eb063ff3dea17" Size="9949174" CompressedSize="1153148" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="8e38410dadbfd1f90bd9ecfa2b94928d319843a4" Size="6096478" CompressedSize="1256764" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="8e3f307bb80f932a91768170722593196cf9c0d3" Size="1147946" CompressedSize="319968" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8e48f02465d510f5d39d6e837300ac70872b2799" Size="17172264" CompressedSize="6061699" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="8e5b63073311e58e4c912fa6d14425f9af1b5dde" Size="5499768" CompressedSize="213683" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="8e61df6be2a40229e8e039a5b34466337d63760e" Size="81770188" CompressedSize="14390207" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8e708853b5c9e66abfff8f018133758967aa6886" Size="2097147" CompressedSize="673464" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="8ea495aa16f5c28059de7b17b493fc094f400049" Size="2097120" CompressedSize="719955" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8eac56bd8c8cee088d0978068da9b9aefd77c5a3" Size="2095509" CompressedSize="1997293" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="8eb93ecba0b5fb9152871b939466168fb359c26c" Size="2089752" CompressedSize="1129687" RemotePath="2984534-bc60b1c26a96427fb82e415a06c2daa8" />
     <Pack Hash="8eb9b2bca1fd3169f88939176fcba84d79e2efb3" Size="2097085" CompressedSize="1036249" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="8ecd0c7b9d25d5d294cbf8498cfadcab1abb2181" Size="2097140" CompressedSize="326453" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="8eea1cf900a27487381f3e81893b5e8685569c89" Size="2097139" CompressedSize="359842" RemotePath="UnrealEngine-3809549-897613a0c2dd4564b4c2458bc0fa3a3c" />
     <Pack Hash="8efa860c88d42b0359b495753e91af299ba09233" Size="2665824" CompressedSize="996394" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="8f2dcd4464bb68ae4798466fc0a56174228ded74" Size="7147198" CompressedSize="1656243" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="8f84cc4281cb2fdc2421984a2d52e6a2f30042e0" Size="4658080" CompressedSize="1352371" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="8fa3b7b9dfcdd86814c8d31b88442e487b319bd9" Size="2094992" CompressedSize="530074" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8faa0e68af7917cbb5ccd56bc9ddcf4bf32ff69b" Size="12298122" CompressedSize="3252358" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8fb4d282b301ef3a79b2e2ee2006cfc4734a9686" Size="2869736" CompressedSize="972796" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="8fc62f06c0142e1810e6653462dcb1637c4d1d6a" Size="3063854" CompressedSize="1054965" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8fd163c1f9dc9bf11ad958c41b095830489b938c" Size="2097145" CompressedSize="355301" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="8fe5a00f6e1a6194abc06553d577654d2882e969" Size="2096687" CompressedSize="1405556" RemotePath="3372954-89332b310e4341ad9a635d39b26dd16e" />
     <Pack Hash="8ff23362f6d2fe2b1e7f422a3f52c13797ef128e" Size="2510328" CompressedSize="462881" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="8ff5d7c5b9e7596e4c98acfda44948410292c113" Size="5488790" CompressedSize="1685872" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="8ff8b63bbd2431c319beaa30fca90983dc868585" Size="31498862" CompressedSize="6194122" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
     <Pack Hash="902b404bee8e88be9640973f44f78545ebb8d25d" Size="6093832" CompressedSize="1580856" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="903bfa1cd7a46a1943b7312820a3b15ca1158e59" Size="4981424" CompressedSize="607942" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="9043aae8efdbef093afeea0f5468a885a3436ecd" Size="2097012" CompressedSize="678159" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="904d70dd6349476feec4b29cf839df460c83ecd0" Size="28202336" CompressedSize="5585829" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="908ab3d68a65d4d823608b2ddd04dd8a6d70cebc" Size="2094862" CompressedSize="814762" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="90bb16662a7f1d7523f971292bcd21edce001a3e" Size="2094478" CompressedSize="1189673" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
-    <Pack Hash="90c3323cc2ee458edb44c5bdbe79ae3529230605" Size="3844540" CompressedSize="1063764" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="90c54fbec497685a279ceb0cfc4a594f828a890b" Size="2097032" CompressedSize="674531" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="90c8015517183b03f2335aeb64b6dcfbcefb245a" Size="2097150" CompressedSize="847715" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
     <Pack Hash="90c871a1ecf0b529f0bd79fe5aa85a4db6d531cc" Size="2097159" CompressedSize="721332" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="90d37a18f890b1af4e6de21af15f47994ce341fc" Size="241965144" CompressedSize="34537121" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="91044e494a0d863d86d3b2f6eacce6eefb4238c8" Size="13392904" CompressedSize="5399367" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="911361f8e8713d6e626bc528a2410bc530f71a6e" Size="46158724" CompressedSize="8690541" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="9115f9c7dc7945be7635da41acb70c29c0c79f9f" Size="26649565" CompressedSize="5431641" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
+    <Pack Hash="9118f05235d6b4bc63a5c2b72e61116160f2071d" Size="5569054" CompressedSize="1081032" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="91475080ede727f0185da20abde65457b43d5476" Size="5104976" CompressedSize="2372319" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="91639ede60c084c481daea6546adf05ba88aeb17" Size="1859329" CompressedSize="1854648" RemotePath="2618867-a941974a307a4d11a35487de88a65fbe" />
     <Pack Hash="9176bf2f511e61390d1c57cb318dbc1b345f613c" Size="3683083" CompressedSize="397979" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
@@ -67880,49 +67720,43 @@
     <Pack Hash="91a79d5d6a9cab18ed7c5fba0ca3d19f0fa32a47" Size="12152172" CompressedSize="3191242" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="91d14d2f1be4f53c39e93b9720c20f8654beb6b4" Size="4116968" CompressedSize="879490" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
     <Pack Hash="91e64d31f9d0edc09775743081d176585fd97b1d" Size="2690656" CompressedSize="222204" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="91e7646f7ec4f2b5c2cbb7b7a31f9a9164d2ff97" Size="11733314" CompressedSize="3112891" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="91eb83cc96f2caad739ca4ae32dab0afca9fde99" Size="15543566" CompressedSize="3084764" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="91f7bcb7eeb0908dc500be858b8838ff214c3a29" Size="6929606" CompressedSize="1271431" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="91feaec0b4abdd84ea61cf17b027b51142a10847" Size="7029296" CompressedSize="2206947" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="921fd0bd36e67ba125f632866c27386dfbb73e7f" Size="4035792" CompressedSize="1333981" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="922fcb527d5d2d92d1f5fe1e17450b8b306d3b7f" Size="2097066" CompressedSize="555501" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="92406919abcf1439061aa14e9cb916e3c147ef91" Size="183443084" CompressedSize="37018654" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" Size="2096729" CompressedSize="1317861" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="926540c5a0b84439444ce2305aa3737763bb95a3" Size="2097102" CompressedSize="1332327" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="9276bbba451cd046e0fe5e6b18ab4de8dad22196" Size="3089416" CompressedSize="1007522" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9277c0efb67a5a452ef0edd52939dbdae3d6e5c9" Size="2351890" CompressedSize="546086" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9277c40b8a3f1b06c947eae28baeafe879da11d5" Size="31376080" CompressedSize="7413267" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="92a5cb4f0e0166cb3a3ccf2a70afc5b327bb3d47" Size="3871424" CompressedSize="1069254" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="92ae8532b869692f25bb7d7131f0c2017ff26348" Size="1903086" CompressedSize="445387" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="92baba95536283006f6b22f6cda8e9c6ead43270" Size="3236592" CompressedSize="886841" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="92ccd2c4badedc5f7d093311bd808464a1503efe" Size="4763280" CompressedSize="619638" RemotePath="2945995-7123fe3174c344f6b24da7209d566cb8" />
-    <Pack Hash="9304643e78939135344c8ce298a2a1eee1096046" Size="2086100" CompressedSize="646004" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="930a472597e8f14d24d2fcc508580292b0a82bf4" Size="2097108" CompressedSize="867447" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="931c15604130db39ccab732008fccb38835e9dbd" Size="6492632" CompressedSize="1883938" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9320016c7c1419a5621e462af7b3e27a1f60d6a3" Size="5068974" CompressedSize="1347759" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="9336e2776e5a12bccb3132d9ca25fbaa7206fde0" Size="1181972" CompressedSize="318098" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="933aef650910b08d086444b8864dd9657d72d2a8" Size="5638078" CompressedSize="1704108" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9330ee0e3cad224de41a12b79afaae0571240c94" Size="2096814" CompressedSize="557607" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="933fffd8aa26bca6b889760ec442e900ba92317c" Size="1152822" CompressedSize="327216" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="93423a9a78f3eaad42d062f8d2ff25e901ff455d" Size="2074617" CompressedSize="2073182" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="93566441053b4785e395d918bf77da92f4aab7ba" Size="2097132" CompressedSize="686164" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9357dc14f77cfc65f7c2985720f73892aadcc4a0" Size="3436750" CompressedSize="1080998" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="936e6fd878517039f678716fa2acbeabeb4c2a28" Size="4098384" CompressedSize="1348705" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="937a8d559bb1eaa790bd343ce8439885289660ad" Size="8099242" CompressedSize="2821753" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="937d324929a7f4271842efe0f422cffe7e1c760f" Size="2096673" CompressedSize="1219593" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="9382db5490104bdd40ff525b307f4dc798d56585" Size="6560248" CompressedSize="1611736" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="937f539283be20b2f5600673223b0e506b9b0608" Size="3000104" CompressedSize="961794" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="93875d675a29b14bd9d559c753888a36b013d40c" Size="10230672" CompressedSize="3000632" RemotePath="2832392-951285e50c9b4177a8a221f4f4f6b0f0" />
-    <Pack Hash="93876550c301d3bf8bcb6200afb12ab8113c11ad" Size="15492208" CompressedSize="4470629" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
+    <Pack Hash="93920f4632a2fee67e4b965aa59a45612530c726" Size="2687872" CompressedSize="714124" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="93950d37a41436e27f5d526872c53f14f1f73fd3" Size="22781416" CompressedSize="8690967" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="93bfb1e36f60ded746d23d31f05b97a5f15bf43f" Size="7462188" CompressedSize="1782172" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="93c62ec20ac254e2e7f8234c14a624dcf2cce17d" Size="284835" CompressedSize="112673" RemotePath="UnrealEngine-3426407-9f10b6535d5049d6b9f5e098e8371901" />
-    <Pack Hash="93c96f70db8c2b979575ca3b5406dfea96044033" Size="2587184" CompressedSize="697101" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="93d2a6ecfd0eaaefe197b2ac55c361240f933a82" Size="9093780" CompressedSize="6038261" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
     <Pack Hash="93d5d44b151da63343cd4f052e5efab5039f13f8" Size="2936258" CompressedSize="2936034" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="93eb89ced2dfd1d945c6818a5fbba0c408b44fdd" Size="2429042" CompressedSize="499989" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="9402187f503c2f391c471ecb84988e49b0cac918" Size="1808379" CompressedSize="590325" RemotePath="2603097-3140b87e2cb94286beb08198353da9a9" />
     <Pack Hash="940e60ffabee11f37a3c17706c805f8837d9cbf4" Size="2089000" CompressedSize="620963" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
-    <Pack Hash="940efd71d46bd3adcd95775096ff81074df16efd" Size="7588648" CompressedSize="1907614" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="941fcfee8a4d9b5b95af5e64593a01405ed864b8" Size="964420" CompressedSize="389361" RemotePath="2605823-fed77bb1e455453286ca4bfc444c86ac" />
     <Pack Hash="945828f7f83b9b05d0957aa047f242d4112a9b98" Size="2097128" CompressedSize="685238" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="945bed8b226ea15e2688ef4a9c4c3f1ef15bc03d" Size="2178560" CompressedSize="269262" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
-    <Pack Hash="94805e9802392d99102da87a8887fe11f32cfc19" Size="16902108" CompressedSize="3320864" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="94960763e2bb99d33d955e246e8d8774d41f9d21" Size="20049928" CompressedSize="5552702" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="949d8f8bb63fe40cf90fcea6cbdbcce89de84a5c" Size="2060826" CompressedSize="542705" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="94ab4be561c4e5ce07253ce94aa3794090a44428" Size="5711754" CompressedSize="1174613" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="94ad730f2c2ead37ace96e59cc7fc88fee2d98c9" Size="3447542" CompressedSize="552662" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
     <Pack Hash="94cfed4a88c4801ef537b65413db4cc3326b0a89" Size="2033221" CompressedSize="1978684" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
@@ -67933,73 +67767,75 @@
     <Pack Hash="957337ec86f032a91c82dfc2f859843e3a1c1e88" Size="2097095" CompressedSize="1332444" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="95768c151125366004653356cb8212d68084a4da" Size="2009610" CompressedSize="563740" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="958196810099e0266dd1ed9d26025ec4b53c611e" Size="10955189" CompressedSize="891477" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="95bb220a61c4e49bc0fa52a15415d3635ea0c385" Size="2097153" CompressedSize="729299" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="95bea86982f67c6027683d0d174d01011e1c47ba" Size="3631431" CompressedSize="786785" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="95c9f70b2a087fabde73d50408cdf43f650b8559" Size="2096654" CompressedSize="195460" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
-    <Pack Hash="95ccc2c49555c21fcfa1e2fd09b1e19728100099" Size="4650392" CompressedSize="1351600" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="95f7b61131b0b7361bd6b788845382016a65618d" Size="3132936" CompressedSize="828262" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
-    <Pack Hash="9623422488cd2bad59e5a474b9f1adb5780e75b8" Size="3265776" CompressedSize="907164" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="963812328a2077bb3e260410f1eec20c7ee5cb1a" Size="2096955" CompressedSize="831825" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="963f251c2239c0567a89d3a5af6960e0a8adbbb5" Size="4102744" CompressedSize="1002413" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="96421d48a3164d2d4259c4c9500dfbf44d9b90fb" Size="1418480" CompressedSize="454128" RemotePath="2483157-ef88c8fb9abd408b8fe496d060749077" />
     <Pack Hash="964445a2587d066a234fb244447282f558f277d1" Size="2785840" CompressedSize="1036363" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
     <Pack Hash="965bc626d77c8b73efde674dc3f33b9779ac5bfd" Size="4991988" CompressedSize="835925" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
-    <Pack Hash="965dc1f402b05c8826516f837590556507151ec4" Size="6218952" CompressedSize="1898523" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="96647cad6ccf49261e27bdb65e5af72dc6d6d04b" Size="7013216" CompressedSize="1762305" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="96690cb3e5e6b8231baa794987a1ae1d0ab24d84" Size="921" CompressedSize="296" RemotePath="UnrealEngine-3906648-9a3e059e0b574a2881c6302bc3d2ed0b" />
     <Pack Hash="966e9526128705bd78c6bf131dc22fa29f0cd007" Size="2087793" CompressedSize="450460" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="9688199a0f65bf7f500e7abc3aa9160ee8df76b0" Size="2096136" CompressedSize="801145" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="969c4813f59d0819647845b2eab44bf91d015ca6" Size="128747006" CompressedSize="33134614" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="96a43903d19ef7f79f54416acf8b2509f0743205" Size="8073544" CompressedSize="609459" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="96cc8933c7766e1af99078cefffa58567be40c90" Size="7010392" CompressedSize="2210357" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="96d4f9f79e76056a26990c9485decf95f6f106eb" Size="2096998" CompressedSize="745712" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="971adf0c1d87a0c66649f6b19f4bc57c49fd5dfd" Size="42747170" CompressedSize="9347660" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="9763a98e2b4078b74e3ceb32e901ff46488d0147" Size="12817656" CompressedSize="4208682" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
+    <Pack Hash="979a960838a88c4dc1f3e51df498057eb322e2de" Size="2097159" CompressedSize="616840" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="97ab8c30b69cd9862f3dadf1fd91a3a499ea7cbf" Size="46444784" CompressedSize="10343553" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="97bf3c322ba6683a01fbcd8d8f6e07b7000af8de" Size="2097147" CompressedSize="677571" RemotePath="3384106-9d915e3f2052406ba1ec60b54300ba8e" />
     <Pack Hash="97c7cbc1022b352e100f1ebe5482f2517a13f901" Size="2095904" CompressedSize="571819" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="980f3e90adc8557d71bfbef57bc146374612493f" Size="2097158" CompressedSize="660042" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="981f185a5aa985ac3a9d01bf29e713cffd096293" Size="2738388" CompressedSize="1046736" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="982fd1d5159145ff832dfd15c5b51340e8c2ffb9" Size="2097128" CompressedSize="828712" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="985bf5af6a33156133b920df787e305a6a148da5" Size="6456632" CompressedSize="1846800" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9839cc83983264caf62cd87d042ba4cc1024cdcc" Size="2096706" CompressedSize="553497" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="985da690c8ab1bb3e4b17117fb6a9fe2c070440c" Size="2096815" CompressedSize="1546312" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
+    <Pack Hash="98641763a08c59a08284d0787a7bdfa52594eb3e" Size="6959144" CompressedSize="1592827" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="986638ff5d9f1b26a126de162e0a5d62762430dd" Size="3922440" CompressedSize="1637643" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="9868d96698662a7774060d57552a9f4cebc77a08" Size="2097151" CompressedSize="783359" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="986e66c9c79a9e9ae3dc0c2bfd0314b00ddbcf21" Size="34110848" CompressedSize="7046018" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="98922b76de577c0692cc3f9ed52688544494e6a9" Size="2096912" CompressedSize="588057" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="989b42d479cb9753eb7ea7be46dcff03752fe990" Size="17307814" CompressedSize="3335869" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
     <Pack Hash="98a169bde2f9da079add30618d99062704a074dc" Size="4880979" CompressedSize="326362" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="98b0db8133dd4f4ed2d326c606b75acb1d5094f8" Size="2097155" CompressedSize="791265" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="98dda0b8383e4de5b95d870f5143b8e9ffe49daa" Size="18456672" CompressedSize="3972387" RemotePath="UnrealEngine-4083268-34b5a5188b90414fa567e7db3b85e865" />
-    <Pack Hash="990530b5a6e30a7bcbcf2bb17b48ed0ad24d1a95" Size="31327112" CompressedSize="8567373" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="9914ebb44e7e5640a37d1eea68fd99aec8f8aec7" Size="2092101" CompressedSize="643509" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="991dd7e85549ea1d68d7c6e18a206ffed99537d3" Size="1068051" CompressedSize="448965" RemotePath="UnrealEngine-3789332-0851965a5edf4a66be31f569d168e640" />
     <Pack Hash="9925ec5c177c6bf6faada1514039ed1b19874a51" Size="2097159" CompressedSize="558714" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="99280a1646dc7bce47bef8b4de9547b4cd7b99ea" Size="3597482" CompressedSize="1140677" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="99495f9bf042a4c1a1ac90b8b99efa036a1421a3" Size="1441606" CompressedSize="403528" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="99677cc167673ccab84e8b60864da0b9f1f7f4c3" Size="2096238" CompressedSize="752577" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
-    <Pack Hash="997a50d30ef033feeb0d363c8c8509158ebd1392" Size="47208706" CompressedSize="13802153" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="998cd53353a221c5c869ee96a71daa08ec937eda" Size="2785936" CompressedSize="1047285" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
-    <Pack Hash="999479b20c016d56bf02638f5cfbdfa52557286a" Size="89555526" CompressedSize="15355622" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="99985696491968b007dbff31cfeb9439637ad92d" Size="5395060" CompressedSize="1056780" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="99ac023a72466f050012816ed19a4de8771192a5" Size="54737584" CompressedSize="14504698" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="99bab5e198c6c8e2aba0505e8c2d79722d6ed3bc" Size="2097157" CompressedSize="601408" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="99c790dafa2692b38861a8dd101dcfa2f591436e" Size="2613338" CompressedSize="2527202" RemotePath="UnrealEngine-4047603-ac4b8300947e433ca729d7bb49c0beb5" />
+    <Pack Hash="99cf73da1d408afb92d167d2bd6c6d9ef7d307c5" Size="11085224" CompressedSize="3174172" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="99d06ac991e188d92911f00def31f2c6e8823b77" Size="13741832" CompressedSize="3006034" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="99ebbab482f97864318c1bb7ef98fb030e998a8f" Size="6187988" CompressedSize="1265498" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="99d2e3bed528d55c0bd5658511935add630acb79" Size="81522344" CompressedSize="14365641" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="99dff78556cc09d817cd21895cc0a4de2253605f" Size="2222088" CompressedSize="740619" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9a165e8a8d511509e33a256146bee8ff3af0aab6" Size="2007775" CompressedSize="1092705" RemotePath="2761339-249364708b3f4901b6ac2bb1f2bd8b36" />
-    <Pack Hash="9a1e9b3f39d3b80f7b316ce89931981b6ce3d73b" Size="14723328" CompressedSize="3084171" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9a3106f71b0fbae7c935c63362a16d9a0419c9c3" Size="2096151" CompressedSize="1946723" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
+    <Pack Hash="9a498d896ebd60ce77a0c26e6bb8b853b4bbfe65" Size="2271492" CompressedSize="479631" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9a536df253e04fb7ab90d202cbee72b2e52d72d6" Size="8693096" CompressedSize="2306783" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="9a5383e360c2de98b90d8617a8cc6ee2db6e7d1c" Size="11239980" CompressedSize="2332962" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9a69990dc41954ef2bc2d55dc18813cd9278f22e" Size="4978125" CompressedSize="910680" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="9a6f36fd2204a5938bfaa23310ac94f3eac70d91" Size="2477064" CompressedSize="859280" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="9a7eebd7a27ec107b85164be79ece5b7fe82a06d" Size="30995772" CompressedSize="8463459" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="9abca783ec209954eaede329b0f84fb098a6662d" Size="6690488" CompressedSize="1700121" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9aabada55fdadaa4d111164c0456f6a229ba3eac" Size="90752448" CompressedSize="19933875" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9abf05827a71d1c0a15a65473fe44db0a9c8676b" Size="2401177" CompressedSize="962411" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="9ad3062b35efb39cfe52f02269e5e28c03df86f5" Size="2296840" CompressedSize="586652" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="9aec8735040beb57da24cffa27ef5d254408275f" Size="2396655" CompressedSize="956325" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="9afde1c562c28e9af974789939bd641f801fef38" Size="7337920" CompressedSize="2024401" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="9b312dff5f7811d855b9253c2e2ea35c54ccc96d" Size="89556910" CompressedSize="15354504" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9af1441d9963624d7ba21a1bffcdb2beb4826660" Size="26332904" CompressedSize="7133130" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9b367562030fc7238553c6aebec57181c96d88fa" Size="3467182" CompressedSize="3466766" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="9b3fac8294c3fe78fdd01651ca7946b72a762686" Size="14410216" CompressedSize="1173838" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="9b4e73dcc106efa4d16d4ec883256a6b50c18d93" Size="6571864" CompressedSize="1594592" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9b51b399a29e0def63d28a68058488c252a00093" Size="2096901" CompressedSize="2063956" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
     <Pack Hash="9b5499eac414bd739362093f60e3a8bf65899b7e" Size="14045978" CompressedSize="4206496" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
     <Pack Hash="9b6700eda262edd80bb583c26a02aaa04f6c4952" Size="2606856" CompressedSize="904272" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="9b6f3a80dd242ad667ee7c33f54385d4fa791086" Size="11258610" CompressedSize="11260019" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
-    <Pack Hash="9b79af1504a518aa077fb7b1a0d622be3efeedfc" Size="2374848" CompressedSize="733250" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9b7d3c7ac5415ce0d5b5b0922da8bdb12f53627d" Size="2097158" CompressedSize="830061" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9b85c2fa156837a820c7e7ae27d2ade465850441" Size="2093754" CompressedSize="2091265" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="9b898e83d956bca143184428441336e8d87e6941" Size="13191062" CompressedSize="4054434" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="9b8fbaeb9433a52f4f65397b66bc6da378e067b7" Size="8054672" CompressedSize="2801911" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -68015,32 +67851,31 @@
     <Pack Hash="9c45f6155855d24fbb8f12e7a40895df1e55b205" Size="2087428" CompressedSize="2086784" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c" Size="2348170" CompressedSize="2347913" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="9c4d6acf8b749a1e1a5a4c6328259b39ccaf8cdb" Size="12536830" CompressedSize="3488992" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="9c62fbe579a459ea9e037c5a9adeb6a46cdba899" Size="7522464" CompressedSize="2508211" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9c9ef7f28f8532b5b435f1e799cfcc5de9760d14" Size="2097076" CompressedSize="1608258" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="9ca9cd47210e0efb149390f4e0981ef3e34ba749" Size="411184" CompressedSize="102699" RemotePath="2932649-507fe75b94724abcbd2a733ee1fd56f2" />
     <Pack Hash="9cb4d8d9e5202c3a371775ec44dd2b3f3d334849" Size="81730192" CompressedSize="14384785" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="9cf98d6f311b6f40fda0597794364a8c52c9ec18" Size="2786264" CompressedSize="752235" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9d0629861bfc4948fc177763e87dc1ea3ac042ba" Size="3039956" CompressedSize="690093" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="9d07997ea77b56b451a2d19b81138f5fab5e3820" Size="1864293" CompressedSize="1025964" RemotePath="UnrealEngine-4042226-27513654d92c4e608067edfd8704ad74" />
     <Pack Hash="9d232548aa4e0302e308e8904fce4c2c9a811af2" Size="1038226" CompressedSize="294472" RemotePath="UnrealEngine-3623763-7fee2e8ab9844927af5fd929f417a116" />
     <Pack Hash="9d2ab52c598ae6bfabef2035bca26c417e86206d" Size="46112786" CompressedSize="9928465" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="9d2e9a2810b6e6c86280da3e0f4958b1e1d20a52" Size="22808280" CompressedSize="6923641" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9d331991b896400899fda85e7ca38b1637de15ca" Size="9300860" CompressedSize="6319280" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="9d3bdfb7e33bb14b8715d0b5487298b4482c0287" Size="1997069" CompressedSize="1036333" RemotePath="UnrealEngine-4077392-e5b06b1f5d4147959b5a34fec2e18c8d" />
     <Pack Hash="9d429f5b238c4bada24ed8b37d7880b675a7a29c" Size="2097156" CompressedSize="613854" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="9d7c17c0c890b7918122c3efe9aa02933b27d31c" Size="2079424" CompressedSize="587957" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="9d972222b718ead8f91b0e4520fc2c1ef3320eef" Size="2229000" CompressedSize="644712" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9dbfef75d408cdb654ade3c7cdcc61f90475bba4" Size="8425024" CompressedSize="519598" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="9dce1d1023d61c06a289038cf673ffc94efe105b" Size="2355444" CompressedSize="842104" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="9ddb6e6c8bf8161b80d610cd92424e4d8d8923da" Size="5359520" CompressedSize="1632713" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="9ddf004692c477b60fed575d57551fabdb00997c" Size="2531023" CompressedSize="2530731" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="9df79ca98fc0674345d759c1f448bc161f9580f0" Size="2914968" CompressedSize="855679" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1" Size="2097064" CompressedSize="2064827" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="9e397995b47d5acc37d38c9fa4935abec922ba48" Size="2051812" CompressedSize="424972" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="9e706e53abc7aef6bee92832b5e3f6b21e841536" Size="7950" CompressedSize="2944" RemotePath="UnrealEngine-4039259-75ff270a1a6040a799edabb17ee78cfc" />
     <Pack Hash="9e8aa216c58904edc940ba96e7db3d4b3a85db3e" Size="3066930" CompressedSize="717480" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
     <Pack Hash="9e8fa2bc3295a6d45174a78d60aad38cf9ce5091" Size="2097023" CompressedSize="1949947" RemotePath="2667681-4e80caad66464c49b3ffad7abf015c90" />
-    <Pack Hash="9eb2ca1df115d2f3a1ff5374be1d6fedabe783e4" Size="3523794" CompressedSize="1127542" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9ecde5d682a1fb9ca9bd5c995228d226cdb13860" Size="2097103" CompressedSize="294372" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="9ef4e50b75a08a58aca7aa5c5f90d642c9eeb305" Size="1897950" CompressedSize="475395" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="9f22ce36dcf73e31c6b3401408ba3085ac2a7a10" Size="18063416" CompressedSize="3794862" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
-    <Pack Hash="9f27c3a28773bd51d459d3f7d4d54aa7c142e475" Size="4100720" CompressedSize="1002328" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e" Size="4448468" CompressedSize="4448186" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="9f53e4f1699e9eae5cf10479cd054c92a805af34" Size="4892136" CompressedSize="339616" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="9f56eb8b6412fc882c33d6b394e29a2da81bd470" Size="2096698" CompressedSize="927518" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68053,34 +67888,34 @@
     <Pack Hash="9fc81e42c82988f137a390d97b73d52abc49e307" Size="18684468" CompressedSize="5354020" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="9ffc8d27693d7754655a1ab370123910a4d585f5" Size="2097071" CompressedSize="600992" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="a035faadd417a5c388de035381d82bd90da60da0" Size="2092082" CompressedSize="420026" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
+    <Pack Hash="a037026fe85950ebccc0ba9fd0f2c5b003aaf28e" Size="89555526" CompressedSize="15355600" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a037040fb7bcc432add0b7d65dc1d3b078b6f143" Size="2850101" CompressedSize="2849739" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="a038911e9714e898d92b083b656358f7a15b7aad" Size="3715582" CompressedSize="842779" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a03bb1d2a4614125f33bfe2bab39d84653cda033" Size="2097153" CompressedSize="762470" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a05f4a78f552dd58ff03eef4fd64a04c73d9cfa1" Size="19070816" CompressedSize="3504782" RemotePath="UnrealEngine-4083268-34b5a5188b90414fa567e7db3b85e865" />
     <Pack Hash="a073071503c503582f72ed848f112b19ebc5846c" Size="2095146" CompressedSize="602646" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="a0a8b0039a9be72a83a300d07719e7103f1ebde6" Size="102434696" CompressedSize="18345242" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a0af37d89ca7e647faeac72857d82badddeb3a2c" Size="2036104" CompressedSize="486427" RemotePath="3111290-f4cc8c1059ed417b9b079381f268c573" />
     <Pack Hash="a0be02153b37ac75f3e5024684c8a2831499a4a8" Size="2096854" CompressedSize="1672722" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
+    <Pack Hash="a0bfb43e71f6e730d51f2b1042079157f84291e1" Size="2097157" CompressedSize="652392" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a0cd413413374d25874c2a0efb81ee012ea581f4" Size="4464774" CompressedSize="981833" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="a0d52caef6aa663265ced0357c21684c08bf1acd" Size="10207944" CompressedSize="4443724" RemotePath="3033489-dbd1834ea8b44a70a83b0107d19e93e7" />
-    <Pack Hash="a0f9cbe1ace7f120e633f22a4f98d8a1128f01c7" Size="18942584" CompressedSize="3569733" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a1056077d574e9ce203221947d190336d2e27c39" Size="1416708" CompressedSize="400334" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a10a63fafb76bc8871e5586801789c0de7657b8a" Size="5152754" CompressedSize="1198069" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="a10aeba2dc6e4e25fc6b8fab46bd066ea6e0d62f" Size="47211598" CompressedSize="13802602" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="a10e44b65416386cbd7552fb1e5eac6368582e74" Size="2212168" CompressedSize="638089" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a16266ef82571a4035c8cd2b69ad5ea965d4d798" Size="2090590" CompressedSize="793105" RemotePath="2984534-bc60b1c26a96427fb82e415a06c2daa8" />
     <Pack Hash="a17bc4d37d2b33d12922e15b67bbd12e3ffd16e1" Size="3259822" CompressedSize="785705" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a1820034a04f046e5f0c74444f653ee4869647c6" Size="2097139" CompressedSize="638869" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="a18cebf9d16dc2e5a99da03353e404d64bce3ae6" Size="5267552" CompressedSize="1210943" RemotePath="2590354-88fba4596efa431eaf994358f50a5f48" />
-    <Pack Hash="a191461983ef15b29368f657ee76e4e3c922a195" Size="11455042" CompressedSize="11380051" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="a1aca51bf21ab264eebc189dd4345d94c24279db" Size="14209032" CompressedSize="3772144" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a1ae4592cfa3c36b6209520e0665ffa9280d2635" Size="2096233" CompressedSize="566759" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a1bb3741f298bc340c6c0b168686121361e1180f" Size="4054134" CompressedSize="1116677" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="a1c77e8312d61183fbf79d7d895226465d32574d" Size="18603200" CompressedSize="6660507" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="a1cfe895a3708a33f62b399d07d28e2cbc241b25" Size="81523720" CompressedSize="14367076" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a1d0dfa33a2c47de9982fbfd2527b1e5f08d7263" Size="2494472" CompressedSize="580128" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a1e8a28aab5ff7e6491e3c1967d758d9e0895e6c" Size="6737610" CompressedSize="1658810" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a1eddf1b451f35a03f56cff604ba04b827cd3dbc" Size="3257807" CompressedSize="940770" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
+    <Pack Hash="a2049ba9e33dd3e6a4c6e940d205860746b2fadd" Size="55449848" CompressedSize="14645782" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a223063132a00fd7e9af3c58ba28d6ba14fc65b8" Size="2096392" CompressedSize="870886" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="a239ff390f62a5f1b66560ec82efa7095210f0f8" Size="3464344" CompressedSize="1027290" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a23f47097bd70efe7672e9b9e00941d85cd8c17f" Size="88584" CompressedSize="49392" RemotePath="UnrealEngine-3663216-1f8c5fbf34254a1bafd2d42daf021e21" />
-    <Pack Hash="a24385065652a8566cc17e90b8306aeceb4ea54b" Size="3569768" CompressedSize="997281" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a243a00aa61675be8ae46cdba7db99c8e8195984" Size="2097060" CompressedSize="2088336" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
     <Pack Hash="a251c4e7d42ea3a35fed5104d4baf8ac71cfe407" Size="2893776" CompressedSize="854001" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="a254346aaa6d6c11dff58237f854fd54055340e3" Size="2097125" CompressedSize="1870266" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
@@ -68095,59 +67930,57 @@
     <Pack Hash="a2d4c282439a7d50a9b7005e9c3feb136cc093e8" Size="2095210" CompressedSize="831033" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="a2e68b226fd34cb1968e88858acc12de2cc5a720" Size="2097155" CompressedSize="736861" RemotePath="3357449-09c4f579676d488ba551dba9f0fc3bc4" />
     <Pack Hash="a2e8e6e84e82e7b919a0360e3472dae9514d2105" Size="6367899" CompressedSize="481275" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
-    <Pack Hash="a32dc0bcc2da1610cf2c5220e98027555b465976" Size="7025496" CompressedSize="2206500" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="a2eab9b3a6779984145a5dff6567735320c5974a" Size="2097157" CompressedSize="683054" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a333e2129a0a7518d47d81753d193ceecc5b881a" Size="12014835" CompressedSize="12016279" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="a3704b9946f00bdbe59ac78bc7c714d8c6862e02" Size="3790980" CompressedSize="2718978" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="a38b37f825644041da01364538208a9364d2f9d1" Size="148416" CompressedSize="148464" RemotePath="UnrealEngine-3441199-dc1bc490a8de4e54865944b6fbb8e6a4" />
     <Pack Hash="a38f7b4228aa23a3dab120750d20976dab9cf1be" Size="12146416" CompressedSize="12042461" RemotePath="UnrealEngine-3869265-2d837938e47243679c6568ecd7be8076" />
     <Pack Hash="a3ae30cb15b327aac887cc50f58512d1ae04104f" Size="9981960" CompressedSize="3085251" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a3ae4699bb897564bcafa6da223e4b7dddd25b1d" Size="3909860" CompressedSize="2608114" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a3bbf64d91389a7d48e5298b0dfc21add57c0c2c" Size="2556424" CompressedSize="642599" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a407e60d87080f883ac7f36ac008bf2dac54f48b" Size="20870661" CompressedSize="16661576" RemotePath="3325693-95609c8c9d384407be95de025dc827bb" />
     <Pack Hash="a41cc049fb6018644b7d6560f888ebf5364d9340" Size="2478088" CompressedSize="656312" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a41d00077f02fab1c6a05e4607094b4eea3b6ad0" Size="2097144" CompressedSize="678585" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="a420aaea571713d4ad3f0d3f6430dfbe47084a5f" Size="39662266" CompressedSize="7525949" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="a42ee45abd3576feb324fa2474ad1f73bbc7807c" Size="2096441" CompressedSize="878111" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
+    <Pack Hash="a440068ac4f6738a82b66c8b8794f0171b01d36c" Size="5152132" CompressedSize="1120748" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a4488098366f51a4463204c0d8075e6163811ba7" Size="2026114" CompressedSize="1788259" RemotePath="3226598-a942cefcafa14264ac608ce1535f9731" />
     <Pack Hash="a44a3e502dc0dc0a9b3975eb453276e4eff3eadb" Size="2823696" CompressedSize="2823019" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
+    <Pack Hash="a4663c3c6dac346d21f59e6532df11d32975cd5a" Size="76441736" CompressedSize="22644737" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a478abbab4f5791151b5c302ec896149ad676a4a" Size="7138745" CompressedSize="6545031" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
     <Pack Hash="a4927aead81c9e3742d5d5f350533cbfcaf6c8dc" Size="944190" CompressedSize="203038" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="a4dc168f1b78e4c3df55f9280d464a0012265e53" Size="3326472" CompressedSize="314187" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="a4ed84149ed3c7210f1c05ceaf8f38ba5a2f6a38" Size="4249200" CompressedSize="1281595" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a4f27c4aa7ff8a7698c42d7df2b7f626857d1bcf" Size="105498696" CompressedSize="21555544" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a546f5b5ac5ed8bf6182b7d63936e2caf8ab0638" Size="1668240" CompressedSize="800552" RemotePath="UnrealEngine-3650450-88f820d6f4124acf8c5e25dc236d4361" />
     <Pack Hash="a56640159419f56707d445001ec9fdd8b4ffb9dc" Size="2278080" CompressedSize="879993" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
+    <Pack Hash="a57929556fea304cb2fa2583c8e6fd31b8f632f2" Size="2094986" CompressedSize="603980" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a58a934fbc6d256586f3ff17490f10c3a7c2517f" Size="2031400" CompressedSize="419981" RemotePath="UnrealEngine-3887715-022cba23db144e18ba6a15cd5db12ebd" />
     <Pack Hash="a5a4b35f662228caee7476ddab2567611de6c35c" Size="2097151" CompressedSize="651184" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="a5c580803929e2623193c432ade4ac172a6bbcd4" Size="13013576" CompressedSize="4992679" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
     <Pack Hash="a5e524aceb4cca0b29b1dc1225018d43f3716054" Size="4162936" CompressedSize="1313222" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="a61134b7a1700b0b5382c542f42c22afc23a614a" Size="2087690" CompressedSize="619813" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a6287affa4b828301aafa84f7bd9ce71935997b1" Size="5504258" CompressedSize="5504319" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="a6324ded6be8ab992a4751a089ae9a5eb4e0b87e" Size="2344928" CompressedSize="710321" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a6a9f95d8e75e3ee5e265cb845057d245e37e817" Size="5868256" CompressedSize="1706176" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a6b69652aa1976427a1df8a5c66ca946e9e62723" Size="5825472" CompressedSize="1705015" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a6ced9306bdb06a614bd2acd7d5a7d6112065d5f" Size="8600410" CompressedSize="1899219" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a6f40feab57b4006ef16688f704971fd13b1944c" Size="730328" CompressedSize="382984" RemotePath="2802557-caaaf5acc00348d9b587bb0a0ceb1fce" />
+    <Pack Hash="a6fcdc4bbd4817f185954bcccfe608272158f786" Size="22713232" CompressedSize="6892668" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a717434c111c75d501e35d8a5f4de2b75e299566" Size="2279500" CompressedSize="656034" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="a72777b59db815500e14e5d580278ca8aeb0af3c" Size="1423650" CompressedSize="1409379" RemotePath="UnrealEngine-3409253-c50bdd5005054a71aa11bf8f99d61c62" />
+    <Pack Hash="a72a95c652908e945ebfb8c8e50ed7228e3ebef2" Size="2256816" CompressedSize="651409" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a744790bed001ed939d533b58c7d7132d8599ee6" Size="3268720" CompressedSize="735416" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="a74a1a5121db55028d0a9d281ca2e5d501761af4" Size="2097139" CompressedSize="191194" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="a74a94093248745adfbb51000b3fc9d9c25a42bb" Size="2084650" CompressedSize="1491192" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
-    <Pack Hash="a74b98cb304dde228367a8c86fd1540e356bbfe1" Size="26197410" CompressedSize="7066447" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a76a57c4a5ed17d5ab89cf2b2cf8c53b0605a8f1" Size="2096207" CompressedSize="743526" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a8237e03059f97f024d64be44d3eca8d61f15ac2" Size="7180308" CompressedSize="2456325" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
     <Pack Hash="a87e23e2dc93a3337bb44ad7597bdc3cc6088ea6" Size="5170672" CompressedSize="573978" RemotePath="2650321-7569a00fb85b4326baa4df9824a02395" />
-    <Pack Hash="a8860204b9047bdd6e18c2c6fa31cb20020fe7c7" Size="6286088" CompressedSize="1919562" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a89c22869ad91789e9f88102ad9a1930453df33a" Size="2159492" CompressedSize="522342" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="a8c3928577346141f3da53f2d124308d96c6482a" Size="19890664" CompressedSize="5274622" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a8c3c5c06509128462e2d8dd583e4e0eb47be634" Size="3895474" CompressedSize="1047863" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
     <Pack Hash="a8fe30936c1d6f8bfe634fd682e3fb2a6a79213d" Size="2097159" CompressedSize="1807184" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="a90123bb85c3d4b8e9fc4d9b4e402d77e3f4092d" Size="2095830" CompressedSize="559339" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a932e5be1e422bafdc2ecf4d621038afd8b29904" Size="1284480" CompressedSize="248610" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
-    <Pack Hash="a9333a1ff214d50ce068d0130f9e09d0cae548ae" Size="7463856" CompressedSize="2135637" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="a953fbf4433c785f7cbef4d2a003b00e890b5573" Size="3489138" CompressedSize="991685" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a9706efc606503f524bbd389b725efc95dc03669" Size="2436024" CompressedSize="940586" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a974fa37a3d3b53e906f57bb552a0c2f948aef52" Size="2401056" CompressedSize="731339" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="a978ebda568515e85ff3a8f77239242d81d5a5e2" Size="2094952" CompressedSize="608356" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a98819bf37317dabf20f86b0fd6800a911717698" Size="2327530" CompressedSize="2327158" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="a98c63b9a68c05587e2576d8eab01c15b388b3cd" Size="6581320" CompressedSize="1598848" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="a99223d50e3544895b1ed8d5171cf74a496ea264" Size="3057324" CompressedSize="912990" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="a99daa4bfd46db4b416f47b4fc1972b221ea57e7" Size="3078317" CompressedSize="3077973" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="a9bab19888fc574fe564fd41bd6cb08159c85f84" Size="2094792" CompressedSize="616419" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68155,37 +67988,31 @@
     <Pack Hash="a9c62ffacb1508452705b057c5f796573d47c78d" Size="2097075" CompressedSize="1697727" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="a9d92550e0f612d2c8deff4e9b946fac3454e8bc" Size="5937140" CompressedSize="1492499" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="aa0b7f0047fac88b282633eb9c4825d915a9597c" Size="390416" CompressedSize="107796" RemotePath="3243417-9cbba2803b614862916dd231c976108b" />
-    <Pack Hash="aa29e83247e30bb95e845eec97d2557aa776271d" Size="2078936" CompressedSize="587856" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="aa2abb18043bb1e50b4c123f51edbc83471db8a2" Size="48177918" CompressedSize="9525961" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="aa2cc05ec23d8f42e2e74e600e88b16339f9a0a2" Size="2096683" CompressedSize="667466" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
-    <Pack Hash="aa42e5dfd941cd2d3ad8c15409c52b7e008b7d25" Size="36045496" CompressedSize="7340584" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="aa4c9f30618629561139b6cef568eef634a73c51" Size="18134024" CompressedSize="7047523" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="aa61253912824c72a18e933d11a196861b23ab1a" Size="3422294" CompressedSize="1069966" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
     <Pack Hash="aa77d10dffb0ca8e30717f47444dbf9b98bcd8eb" Size="2095601" CompressedSize="1344015" RemotePath="3027184-2eb2fdbb30c1445db4275b3de28ddeca" />
     <Pack Hash="aa8f157173927a2c9b5aa5fa28fac06678796cc3" Size="8372522" CompressedSize="5968869" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
-    <Pack Hash="aa96a9dee18d1a197012bbe25ad7e482199ea49a" Size="3342592" CompressedSize="912485" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="aaf3a012f48b24c193628af42ef3302d96784c3f" Size="2097117" CompressedSize="614601" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="aaff771bff40e67acec754ff6a73103840091d71" Size="2097133" CompressedSize="1081159" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
-    <Pack Hash="ab01507c6d6ac016aff767f57c2a6196c38a512c" Size="3258178" CompressedSize="785586" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ab0accca4b2e0942f55d408ed30bb84183371d99" Size="17884424" CompressedSize="4560824" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
+    <Pack Hash="ab1b3130428afc398a4d2b5a4f24c901f8e6d9ee" Size="37247390" CompressedSize="9985577" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ab39e914df290cf79de86a8439b1adc79fd76140" Size="2097117" CompressedSize="791448" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="ab3b16f58330084ebc39cf31605889c1aaef5547" Size="2609560" CompressedSize="730842" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="ab438ce2ba39e4ad8e0623516c35e6128f46afe1" Size="2097156" CompressedSize="29866" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
-    <Pack Hash="ab5ce48cef2165e95219a668ba5d244f4cfb3505" Size="164330326" CompressedSize="33338194" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ab5d351cc1959e213540cc41dbe93cea75dda4d9" Size="5399523" CompressedSize="5399694" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="ab75e23ed7c490b1ced0b7464d11ebbd6d1e4a59" Size="4198920" CompressedSize="792911" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ab831c0231fab9f11da231c719dadbb4609378ee" Size="2744366" CompressedSize="849495" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="ab84b5aeba5cdc6a96e2c548952e17e9813859ff" Size="5786104" CompressedSize="1156266" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ab9ab23f53c65699955f61bab401e7f62ff9f839" Size="19467650" CompressedSize="3702210" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="abbb396e1626debba2236cc4e7b46d6722473890" Size="20193640" CompressedSize="7312365" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="abcd992f6c90c47b9150148778b5e5dd0be366f5" Size="4110574" CompressedSize="1107896" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="abd2443f2e5d306fcb283739df799dba571d31f4" Size="2587808" CompressedSize="696580" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="abd31f5aa1a5bc7ad21bd97551365c4785a30537" Size="2203306" CompressedSize="2202956" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="abddcd43df64c1705d665f6ae146d8506d6d014a" Size="3999992" CompressedSize="1112769" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="abea72c46ecb587cf8de6e1a3c20682917aa4cda" Size="12924116" CompressedSize="4374321" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="abfa9cc7d4356194691d8461930378387bfa3a69" Size="7095752" CompressedSize="1891909" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="ac004a2d142b57f3c1e6d47edac2592b7c1911c2" Size="2097157" CompressedSize="689261" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ac06acc8049806819d9eaa7c9b4c5f4b1aea3d9e" Size="2422036" CompressedSize="906877" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
+    <Pack Hash="ac256693955f9b2c8a6822403a073cbda3d7dbba" Size="1591758" CompressedSize="436780" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ac2c77918f717b39f4343aea48946b7781301f55" Size="2093224" CompressedSize="405604" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="ac406f0e3e6312263f380e544129e070bf628a1e" Size="59873" CompressedSize="57932" RemotePath="UnrealEngine-4067721-74c1337b9b29477b93194ec4bc6ceaf0" />
     <Pack Hash="ac5f0c231e5743628dcb6789559b43e75b5b9d1d" Size="2533744" CompressedSize="991175" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
@@ -68196,7 +68023,6 @@
     <Pack Hash="acc54372389300e3e5a7d7d246f0eef794c220c4" Size="7001342" CompressedSize="1437337" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="acdaf99b12d98a617d40b9fa06d235043e85ccd6" Size="2097159" CompressedSize="750686" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="acdcb7c49f882033b9492ba51d0d00d7732b935b" Size="2550107" CompressedSize="453154" RemotePath="UnrealEngine-3794511-fdda41a8b03d4909b2eb7e47d3317d2b" />
-    <Pack Hash="aceff92a5bd44e4c995da09291f08bb0483f6906" Size="7025496" CompressedSize="2206501" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="acf6558b1e3950d55a31da4e8614e4a357aa653c" Size="2088919" CompressedSize="1933372" RemotePath="2547993-1fb84b9e293242c988e586c599eeeb56" />
     <Pack Hash="ad0cf4510503541ea353d88c573bc6a79f2142da" Size="2659192" CompressedSize="1359613" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ad10886a5a5613b192e1731f826bd8ce4af67485" Size="3163064" CompressedSize="1221375" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
@@ -68206,6 +68032,7 @@
     <Pack Hash="ad476822223f902f64a71ab30e6d92cfd1180d29" Size="20794488" CompressedSize="16586041" RemotePath="3325693-95609c8c9d384407be95de025dc827bb" />
     <Pack Hash="ad539172ac13afdd56aae0ec52c1b3340bac2bc5" Size="2222973" CompressedSize="295781" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
     <Pack Hash="ad6366a116eca422017f99e0e62f10b15e011817" Size="13148801" CompressedSize="13150381" RemotePath="2744667-4a8f1efa41ba417b8db3df6320a687e1" />
+    <Pack Hash="ad6562942603c5bfa6b08cdbb9204573b9d35b89" Size="3712198" CompressedSize="842371" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ad729ed411be91362bdc08a2965ff1cac5eea5aa" Size="24295" CompressedSize="21572" RemotePath="UnrealEngine-3480771-82b903bdfe55493586f36dd28b5ee483" />
     <Pack Hash="ad735ce413f80f79900a87098c112c355b2269b9" Size="2083500" CompressedSize="2062636" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="ad7f42e7a3d82c0a041e8c82a0eeefb8641e7d3d" Size="1836338" CompressedSize="327111" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
@@ -68213,25 +68040,24 @@
     <Pack Hash="ada3dc17e0a699e9f0888f167ab43c95b9d087c9" Size="2137376" CompressedSize="604292" RemotePath="2610954-bd0fcbe6f0c748508fe9438073c40b27" />
     <Pack Hash="adb1f445a4a127969356b6635da51f637f54a0ac" Size="3003105" CompressedSize="3002846" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="adbe68f072ea06333f3b1ac101eb181f7551c788" Size="2097082" CompressedSize="1441452" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
-    <Pack Hash="adc46c8d3d54833923b9b24a18adf1a3a5846071" Size="2057514" CompressedSize="750264" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="adc8a3dba2d0b6619589de22c8796f38f02e5a89" Size="183465908" CompressedSize="37015484" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="adeafd5e6dbc705b2fb1ebe317951c10a35ce832" Size="2064694" CompressedSize="1590736" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
     <Pack Hash="adecd2c644904747c3cdc204c4e4d0c59ab35970" Size="2097133" CompressedSize="670733" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="adf1d35ecbc67d9f81276c6a4a57aca7f65ec47c" Size="2097157" CompressedSize="615982" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="adf43840d20570afaada341577873917aec9afe2" Size="7376314" CompressedSize="1780752" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="adf456643946e9d859c01bfaf7f5ab2df8e7db6e" Size="43025028" CompressedSize="8068804" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ae0bd1c412651d950e690d1a68e3e17362c29714" Size="7080774" CompressedSize="1514704" RemotePath="3008183-b9dbe24f35d9484c9b34c22c4a83d18f" />
     <Pack Hash="ae18463c3a6364a6f17848f53e8ae0d8f889d6fa" Size="1094664" CompressedSize="786207" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
-    <Pack Hash="ae45ed39146a335cceac947bae7b5fc8b55fd5ab" Size="1500852" CompressedSize="396037" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ae4776c41078a7a23381069c264943dbb1e0669c" Size="49766188" CompressedSize="17934516" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="ae4c08cdf8410cbffad337caa4a43e8c3d108836" Size="1116642" CompressedSize="308607" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ae5a80d9f6baf190f4ab62d63ddec6bd58b356d0" Size="2066882" CompressedSize="561209" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
-    <Pack Hash="ae5c035ab0fb527952b360d671cfec91bb861c1c" Size="25339160" CompressedSize="6885856" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ae8089d30509415ded81477eb41b29f55a431272" Size="2630752" CompressedSize="2630147" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="ae874d3eb1af9a5081c94361a989f0b77e0ecf1b" Size="4931080" CompressedSize="1174742" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="aec592571f74b9d57bf52db420289db86d5c6343" Size="13106496" CompressedSize="4346228" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="aecbc01c44a31c0809a43e68b99e44ed1a66bd00" Size="2813580" CompressedSize="2813031" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="aef25b7773a478d1496c6b257d310aa33c72e9d1" Size="1243144" CompressedSize="838826" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="af2cb195ac6ae2a868804129be48835147d0828d" Size="3424632" CompressedSize="1041412" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="af32114b8b970d1d65271ed99052f0de3d4651eb" Size="2097093" CompressedSize="818713" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="af4595f96245b7ff97c27a13f080de3fa663b1f8" Size="54174744" CompressedSize="14299965" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="af6641f5adef0fdeb5d23bc902a3113e64ad4dce" Size="5652452" CompressedSize="1704814" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="af9c2da8828196c205c21cbcd09f30611cb1e791" Size="4550390" CompressedSize="1026445" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d" Size="2312716" CompressedSize="1975946" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -68241,40 +68067,44 @@
     <Pack Hash="afcc169d2950b8be7c7677bcb6cd73bc3ee5c7d0" Size="2570164" CompressedSize="870018" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="afd3591b1c847bb2dca52c7bab74b7f00043a210" Size="752136" CompressedSize="265963" RemotePath="2621658-dcc28ef36e554dd28b121fd140f310e9" />
     <Pack Hash="affb2ac1292b281f85114871becaf2e7a7adfa7e" Size="2097136" CompressedSize="721662" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="affcfc701f2807b86dbb0338eef8b51627d93b41" Size="28175576" CompressedSize="5584101" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="affeb01103bad44d9d8e6c5c1c3d8ffc3682a1dd" Size="12416368" CompressedSize="3504345" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
+    <Pack Hash="b004a90fd3dc2c2581450b144af90559c9189f0f" Size="3457152" CompressedSize="1025205" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b004c18725327fca5ab7d1181c7f84f691796f04" Size="2749200" CompressedSize="810492" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="b018fd41d11073c25edcc108d13464586eaa8752" Size="2090436" CompressedSize="681974" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b0075283b38cc73da711f156d08739d80e01d46e" Size="6008738" CompressedSize="1245354" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="b0233c0c208ca9ac0527355b49d5361d4423f4a6" Size="26207526" CompressedSize="7068794" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b042b9c37ed1ae3a6d638ccce8f9a4c58c0eec12" Size="18780168" CompressedSize="2944042" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b049ec652d384ada45c56ef33228c2cbf0f3e158" Size="10169627" CompressedSize="1717661" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="b057ac2c230db468bbf6c00e375d15f9e6b3c3cd" Size="2096953" CompressedSize="798539" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
-    <Pack Hash="b05b0abdec3dbe4b854057f18c13efa39ca4956d" Size="47211598" CompressedSize="13802582" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b0c3a0e33de1a756de6c0c9a175ca9ff36c28fe4" Size="2097123" CompressedSize="979933" RemotePath="3189774-fa29f2e73310489bb5062f25d408c9ee" />
     <Pack Hash="b0ddc60100e1e18faab8ce443ddb5bae4e5c9851" Size="1859592" CompressedSize="644762" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
-    <Pack Hash="b0e4a0c468d151d66b427259f74d6e5b0ce68c81" Size="5863688" CompressedSize="1705984" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b0e7677a897dcc7da7de82ccb301777868eddf84" Size="2097154" CompressedSize="366405" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="b0f0802f90e19b137dfc3482c478ce06deda9019" Size="2097092" CompressedSize="578998" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="b15635d7b90d51495450261f63cd529defe1780e" Size="3382176" CompressedSize="900610" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" Size="2091283" CompressedSize="2040602" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
     <Pack Hash="b19ddd72768f79350472cb5f302733b3bc837398" Size="9958368" CompressedSize="1558730" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
-    <Pack Hash="b1ba6d12a0508e4d69c90a2e586ab0c4a27ad273" Size="16996568" CompressedSize="3355196" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b1a351d5f985ab81914a5689b7a81228833ee48a" Size="2097146" CompressedSize="544188" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" Size="2086562" CompressedSize="869841" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="b1c710b22ffdfe50bb678a997177bef18c7fe7bf" Size="5149108" CompressedSize="1119655" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b1d133a3afc1212b81b8718280b56630b7b9756b" Size="919" CompressedSize="298" RemotePath="UnrealEngine-3532779-a08582ed572943f193cf195866137998" />
+    <Pack Hash="b200e0fa1669506d4ab45ff3f8830cab7de54f84" Size="4327768" CompressedSize="1393777" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b20273b4fe853ed2baea28418a14c02fd677bbab" Size="2529500" CompressedSize="915258" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="b221596f9694d342526ce34110f4e329b8f905b2" Size="2091927" CompressedSize="586666" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="b22663ee7be5d60f249e1b5cae4abd34c620b0bb" Size="2097130" CompressedSize="1882753" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
+    <Pack Hash="b211e800b3cbf88f936d2c5110a7a649c3b39b41" Size="5126548" CompressedSize="1114671" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b234dbde25cd614f47cbde05892b6d7b5354574c" Size="12714504" CompressedSize="3923616" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="b235ca2c64ce85abaedf1d92f1344f86daeb8e27" Size="2097147" CompressedSize="685436" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b245815768451c9a6502f8f522cccb37bc252ffa" Size="29456832" CompressedSize="6528040" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="b24b6ad12f4e3f5f7082c24df781655905746068" Size="16543206" CompressedSize="3876680" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b254311ac9780bf776737b1574cf0a1b1bc70548" Size="2097113" CompressedSize="419318" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="b26e2fafd8035c1786e75ba6ce54b819b22b1218" Size="16847596" CompressedSize="6016679" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b29ec87c59009b4a3196221cede863542ba64dbe" Size="6507452" CompressedSize="1885069" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b2a1cc72c3ee09745e5fc4eb2449182ded552918" Size="1724044" CompressedSize="476165" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b2c80b92ad374247169fcc8baed57834533ed5ca" Size="1976852" CompressedSize="446549" RemotePath="UnrealEngine-3672627-49b71f78d4ea494882e6e37f74685ca2" />
     <Pack Hash="b2d628df1f33fc6e1751fdde33a27a04b91a9cb1" Size="45091" CompressedSize="3309" RemotePath="UnrealEngine-4066979-760df67bc9ef4b45bd4d126d565fce31" />
     <Pack Hash="b2e987e08f2df675b35cc36c7e86abfa988747fe" Size="2252" CompressedSize="1137" RemotePath="UnrealEngine-3520622-5d014496beea4c839c400f4bacd09f0e" />
     <Pack Hash="b2ede978d5e50f13f35cd79308546dc1c0083dcd" Size="2574158" CompressedSize="494996" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="b2ef64f142bc72cfc5a91cf70cd82c980973881e" Size="2287484" CompressedSize="575017" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b2f678b145b96d4c37fe0d9b0b12d7769cbdfc05" Size="5266110" CompressedSize="5247938" RemotePath="3033489-dbd1834ea8b44a70a83b0107d19e93e7" />
-    <Pack Hash="b2f8531f0a55520f1353ac2aeedfb516a2c678bf" Size="6669626" CompressedSize="1190528" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b2f88f44baa14211312509c95df7f2a600873cef" Size="2097124" CompressedSize="423809" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
+    <Pack Hash="b325e199a92fe4c47780ca169aca151dca6a1a0b" Size="3832740" CompressedSize="1159976" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b327e6b5d7cc7a5f0b685902febd402f4ee30fb4" Size="2096718" CompressedSize="823016" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
     <Pack Hash="b340a8c085c99dce3cee40ccad46aea0729de7de" Size="12632404" CompressedSize="703297" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="b3643e64562cf8928fe74794820c500f305fac17" Size="3846950" CompressedSize="1070791" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
@@ -68287,23 +68117,28 @@
     <Pack Hash="b3b95b2e8e55684fab72a3063757156f7634397b" Size="4004586" CompressedSize="884467" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b3ba54dd3b4a9c7c235223aca9ad7d6007559484" Size="9329328" CompressedSize="9330474" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="b3df044bb928c0123e3067b6ca07bc8db2c7c93c" Size="425842" CompressedSize="326762" RemotePath="2610298-3f4939c916b54d799ac5de807895697f" />
-    <Pack Hash="b3dfcef8a990f47e64f8414e93ef7ed19639b4ed" Size="105609680" CompressedSize="21595242" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b3f83179503a0760e7c0065e44c6309f8a81cc37" Size="17217648" CompressedSize="4181073" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="b3ff22b76cc9c56c24c09020504db91b489d3205" Size="2969150" CompressedSize="606645" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b432e5a7e570f9f15b64fbddbeafb874490b4ee9" Size="5460554" CompressedSize="1126523" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="b44043e0bb6c955f54718be4062b0dfa1222cd4e" Size="20562388" CompressedSize="8881645" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="b4411a92ba0b237e9dee0988897930e64daca1a7" Size="1871255" CompressedSize="1869168" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="b458e8cd68fc066335eb87f1402dd08b87024f15" Size="32382476" CompressedSize="8734362" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b45935576e9b149ac01ad6ea7a115cd48f8b1131" Size="20239368" CompressedSize="7080241" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b45c942afc74d06f356039815b70f4d610006ba0" Size="2097156" CompressedSize="935966" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="b47f7a188473ff6eaeb84907b003641fbb04c57d" Size="4455078" CompressedSize="936877" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="b480d40615130538f232b1b92250d0e214213b5f" Size="4365708" CompressedSize="775694" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f" Size="2109571" CompressedSize="2100219" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="b484f6de1c2b128eea0fcc6ba51f84c858a1346e" Size="4043266" CompressedSize="887707" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="b4a7011b1f4b663e34e08b5caa1fe927463eb914" Size="2056420" CompressedSize="2052897" RemotePath="2615623-07d97909df1d48be99bb54a411313382" />
     <Pack Hash="b4a776853600eb2669faace5cd18754eef79284b" Size="2091568" CompressedSize="552538" RemotePath="2902827-fcb0d018c7244c24a109c548187a724e" />
+    <Pack Hash="b4b5863b7490341c7140ad6ffa8a2f6d5aa48ee1" Size="2687872" CompressedSize="714121" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b4d22366c02cea6b30ea26961825358361ba47f2" Size="1572646" CompressedSize="332135" RemotePath="UnrealEngine-3777242-2bd2dd48ffff490f920a1af9d6c763dd" />
     <Pack Hash="b4d8e0b490d2a1157340644482cc429e03d9575a" Size="2097144" CompressedSize="623061" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="b50b2c32f95d78ac0f63d6c0063c800b3c883e13" Size="2097073" CompressedSize="750112" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b4eecd495ea66d9475363a631162eab8496cef65" Size="3295612" CompressedSize="813717" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="b52991d77791813767c4c4a3a002b3aa59099697" Size="143332528" CompressedSize="31958249" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="b56f95f59c720b34a60902805b9768e1fa74defd" Size="17979488" CompressedSize="4216186" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b59506b87ef3d619a3747897e1f0921349ec252e" Size="4159640" CompressedSize="985242" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b5de396dc504d7c166931fd1cf05c57768115a6f" Size="3213320" CompressedSize="695490" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b6031fd8e7c7749f931cc4703f065767edfa8a3b" Size="7077360" CompressedSize="4156390" RemotePath="3046645-5118f05e81a74ec4b9df0322d127b3f5" />
     <Pack Hash="b61066d1c76dc724e1a861982aebe0b3221a2248" Size="2918368" CompressedSize="855919" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b613192e2af26f11e2d1d127f31a412f0df4431d" Size="685381" CompressedSize="122216" RemotePath="UnrealEngine-4075457-4a85e1361ed646679a9efa07166ec1c3" />
@@ -68318,78 +68153,75 @@
     <Pack Hash="b68917d1d80fc16069a8bd91493381de460b92b8" Size="2891368" CompressedSize="1094123" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b6c1eef00b1b16b312789c6cf59b493eb7eda526" Size="2228356" CompressedSize="2147158" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="b6c2c0cae09bd2ac94ba7df5cd19b08a981345d1" Size="1853" CompressedSize="469" RemotePath="UnrealEngine-3530601-f78dca76421e4163af67f99ad0c1e61d" />
+    <Pack Hash="b6dfbd00039d6429b88b17309b9194259ee93a62" Size="2080814" CompressedSize="482869" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b6e51c5ce4619cf24deb50699e19457246a65fde" Size="2090988" CompressedSize="644008" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
+    <Pack Hash="b70cea41656eba8adc28c7b767fb5b497ce09ac4" Size="7664512" CompressedSize="2544027" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b756ee46c576668a89e2282d95289e8f29497760" Size="16997384" CompressedSize="7080432" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b76d486fada8c753603e4d514d4980ee46190b33" Size="5786" CompressedSize="5439" RemotePath="UnrealEngine-3779057-bae674c18d1948e693e0fc805f84f926" />
-    <Pack Hash="b774b5630816a4f5af3ba3a6cd0c586f5ac2beb8" Size="2094122" CompressedSize="539076" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b792f771ba89b6e97aa0da38cab7975e31240901" Size="8596623" CompressedSize="8597403" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
     <Pack Hash="b7a60e51b3072b670c205b0a84b7d90584154d19" Size="2096492" CompressedSize="618765" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b7c31df2f85ce2991c57ce3b891e33c658b16e93" Size="2260889" CompressedSize="174647" RemotePath="2911283-d7e8bd6e18cb42d6ac0928c3957ef6fe" />
     <Pack Hash="b7cae0c7ca4225dfee904c81a05c0e637d4ad111" Size="6575264" CompressedSize="1483262" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
-    <Pack Hash="b7cbdbf884a6f27a5620777f6510c16cad98639d" Size="3589512" CompressedSize="1005481" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="b7d7bb1d70476b368faee15ef6739ee49c3c05f1" Size="6213828" CompressedSize="1849351" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b7e163c9319b012e49d8d306722425906432ca2d" Size="503" CompressedSize="326" RemotePath="UnrealEngine-3669390-cc3b0e2291d646ccb0b2f413f0103f66" />
     <Pack Hash="b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" Size="1700813" CompressedSize="1108784" RemotePath="2386906-35f20c2d3732491bab9f172643aaf695" />
-    <Pack Hash="b7f4aec3a21f77ea1b2c4e7fa1f3f4c8f92bb359" Size="2097152" CompressedSize="573659" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b80dc1e01912b1c90764855e37cc6c8d57b0a24d" Size="2160153" CompressedSize="288913" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
-    <Pack Hash="b81777b40449464b8ce637bf23134ad77b623f97" Size="54732160" CompressedSize="14507244" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="b821042b565ad5990202a8f1af1becdc2cde36e3" Size="3488294" CompressedSize="991607" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" Size="2097120" CompressedSize="842043" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="b8434b5284e1aa695502fe9c399e329c5c88a11d" Size="16285024" CompressedSize="11852506" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
     <Pack Hash="b84a2b886e8c8c9e12d7e4efb21cffa81d8cec9b" Size="2097156" CompressedSize="668428" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="b8692885cc79308225c50faa58244e7006dadf91" Size="5504687" CompressedSize="5504482" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
-    <Pack Hash="b88c02646bff51270468e11717b11aca34a7c3df" Size="2084399" CompressedSize="1008446" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b89784875ff840c2a3855f565a947345a4e3b72d" Size="20988256" CompressedSize="6294938" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b89f1d5d8c1cf1ac5f8e38b762d7e56b0ddac97c" Size="4773795" CompressedSize="318896" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="b8b36b31df40a1fc9087e4b313999fcda60845cc" Size="2097155" CompressedSize="410035" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
-    <Pack Hash="b8c55e4d78281a8c477d7697e4642751b722a9bb" Size="3407096" CompressedSize="3386905" RemotePath="UnrealEngine-3532032-100fc0f5d04740b4947197632c0501da" />
     <Pack Hash="b8d9134504392b2f0a64a265151b39f693fec608" Size="2938888" CompressedSize="1344286" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="b8e9ff6bec00725cf169b237001ce72af9342600" Size="2261628" CompressedSize="2261160" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="b8fba9e46df63833b7031d3cd186e6ac32af7f58" Size="2256809" CompressedSize="663286" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
     <Pack Hash="b90100372464773f201eb4fcb81c127b3bfc0c17" Size="3388648" CompressedSize="1177250" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="b908c38d5678751ae00d63d781c9351a63072c27" Size="2056254" CompressedSize="777329" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b90ad593c96ff092271616709e634c59efdd47f5" Size="46431664" CompressedSize="12364420" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="b911df4ae64ab3f8f9aa7c7cbaa8b0d078cd39f3" Size="2091978" CompressedSize="820064" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="b933188fa71fdfd4922d94af020e50795da7d466" Size="53490272" CompressedSize="14167338" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b9353d6df8687c2355bc28c57b1d53e08e1f42a6" Size="2459992" CompressedSize="776562" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="b93b4380f4531d7553dea94124d74bcda45deb83" Size="3098184" CompressedSize="1039195" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b9800b6322b6876a322757cfbdb90ecb49858945" Size="2097144" CompressedSize="382721" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
+    <Pack Hash="b99a243147eee11b581998c08671e0cf115dc545" Size="3227436" CompressedSize="963134" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b9a20019362a0c15707ceddcad29b94fdd8df1b5" Size="1791962" CompressedSize="531812" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="b9a79d20e5630d87a738f2282f9c2f039be355f0" Size="2094257" CompressedSize="587687" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
     <Pack Hash="b9b1094419182349a97c054d6806b49d8d9ab63b" Size="12872457" CompressedSize="12008352" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="b9c3c979001d45dee60f2de19e597814c23d8f37" Size="4194312" CompressedSize="791025" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="b9ccd579a8f9c4ca2c18ff40905999f6d34ed0f1" Size="3343196" CompressedSize="1380175" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="b9e928b83a898cf61035b94f9be8024d1740dd85" Size="2730812" CompressedSize="1033408" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="b9e9313f4f311c2cec418b7e8b351d21d065ec37" Size="32726912" CompressedSize="6445177" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="b9fc977c5ee7b9a3af4af8fa56b43920a882cc46" Size="17253426" CompressedSize="3961794" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ba3453fc941ddadc98a5ce22af3f077500d8c0cd" Size="214756" CompressedSize="212176" RemotePath="3228775-b9f7509fc6e6481abfeeadbeaf25fdae" />
+    <Pack Hash="ba432114d0ae3c99ec262b14f3c4df487cb7c0ad" Size="2098184" CompressedSize="862176" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ba48bd2e86d6d79c1243ecf86648a9ebc54001d3" Size="3027344" CompressedSize="788353" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ba5311794921b8ce3160629e5aad0d4cc11f1eee" Size="2097100" CompressedSize="1747908" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ba59a62dae63fc2d143e0cf4c7c65185055b6cfc" Size="2097155" CompressedSize="641097" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="ba615143760f04315d598b31b84884f4e0aa8f18" Size="1775136" CompressedSize="385191" RemotePath="UnrealEngine-3398256-6a263598cae942b88c98edd579871564" />
-    <Pack Hash="ba65258f8e421c9e9d4f1b4a8e307fb2910959c6" Size="8688464" CompressedSize="2306676" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ba675bda1a58d36c6b2090fa5431ce0e064a1fc3" Size="2570692" CompressedSize="998325" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="ba6a5b201e1374856d563e960e0a5f7a935cf37d" Size="6484380" CompressedSize="1626992" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="ba6b538151396eefc2cd31bf3ebcf866c3ab326f" Size="3090952" CompressedSize="1007562" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ba6e6f4eaf7c50e1dcff51145723e736d4474d28" Size="2073254" CompressedSize="643477" RemotePath="2937134-8587487d7e4b4b94afa92f680c591755" />
+    <Pack Hash="ba80ede563915f7527cf65b8d776d42735c56388" Size="4707800" CompressedSize="1371761" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ba8c399797027ecfc1edf799cf655d5fde3ad04a" Size="23132168" CompressedSize="8444723" RemotePath="3079611-690e46bc9b854414bb1824ed6179a8e5" />
-    <Pack Hash="bab038c52a5d9a6e323c3c3c7303dd07aabb59a1" Size="6864266" CompressedSize="1634437" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="bab102d2c2cf98c530605b83593fb10a63108cd1" Size="3453748" CompressedSize="1023863" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ba9d36a231c4e83c35dd33c57a828d58b2788892" Size="2097147" CompressedSize="680469" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bab459156b689714b3a40d0f6ff5a27bd88703f4" Size="1025453" CompressedSize="487562" RemotePath="UnrealEngine-3410684-ce75e8e43ae140de8ff87bf5bef1de33" />
     <Pack Hash="bacd26fbf67150ff12ea1c2f584613102c99dcb0" Size="2016532" CompressedSize="496987" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="bad135512b87a6103fa823a80abf2ea5dbfe1c0b" Size="2097149" CompressedSize="769552" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="bad1ec2eed8d080bd98b24eddc65470de7c46d6a" Size="13813256" CompressedSize="5573406" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="bad3d27e656261f89d7bfe9409032b1623077a17" Size="2097146" CompressedSize="863817" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="bb022a63fffc9c5c6ff480c0a6e1727d0b035c7b" Size="1895312" CompressedSize="384608" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="bb35ddf106671fdd2b9529453b6dcd34e6b483e2" Size="34376580" CompressedSize="7906887" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="bb36a907d80ac2bf281d360d001354d827e83869" Size="4275365" CompressedSize="1424625" RemotePath="3206922-45f76cae3b524711bf2331be6e05fd7a" />
-    <Pack Hash="bb3c62ff866651b3a25185a71226bc4a644e9542" Size="3433722" CompressedSize="1080713" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bb460b3e140c2f392d72e7c74692448005f35d82" Size="8509326" CompressedSize="1874892" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bb519d4c386a359d8b49908c5ffcb650ba2fa4ad" Size="2097151" CompressedSize="845379" RemotePath="UnrealEngine-3754814-fd28acffc0d24061965026fa97031b1c" />
+    <Pack Hash="bb5775cac4a000acf42a9ad9cda1c7d61cd64995" Size="7701112" CompressedSize="1925485" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bb9101086a59cabf47cf9df6e58c857fd8137711" Size="47120735" CompressedSize="46671629" RemotePath="UnrealEngine-4048194-6f0a9f8941f84382a8820bc4077c981a" />
     <Pack Hash="bbb043eb4994d7769be47aa945485b5f18005765" Size="18927624" CompressedSize="2953419" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bbc0888a03c10525e017e652d4d691dbcb065557" Size="2096417" CompressedSize="326365" RemotePath="UnrealEngine-4060164-d69a73f952174c318802b4322d29764f" />
     <Pack Hash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" Size="2097141" CompressedSize="297594" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="bbd3ed12cac3a5812ed814525f0d0018011bcd2f" Size="20383752" CompressedSize="7274594" RemotePath="3276432-8521aaa82e3f43f1a57b5b71afb89af4" />
     <Pack Hash="bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" Size="2097126" CompressedSize="929524" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="bbdd556df8f2031c4132701766096b49a291227c" Size="5965992" CompressedSize="1733092" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bbe2234ecbf535708616a597ca8f014736775f1c" Size="6191268" CompressedSize="1266020" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="bbff2e74e44baf391963a56aaeb1d3041a3fcd29" Size="14692848" CompressedSize="3061056" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bc12a7357195258cdd82b81ca3ab826422d5f2a8" Size="2097158" CompressedSize="779069" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bc229af9ba3087733304662ecb6211f12696bff4" Size="1723586" CompressedSize="693026" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
     <Pack Hash="bc3d9314fb630f5068670f6d9ded9c0eb529e3b4" Size="5727773" CompressedSize="577989" RemotePath="3129012-bf28ea8994bb4040ae9adb152d6eb9ff" />
@@ -68403,38 +68235,39 @@
     <Pack Hash="bcb92df46de5890dc5538dd7f0256a6504653c01" Size="3454680" CompressedSize="1095270" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="bcd0cabdfbee7db486a249459af2c96bbe597c9b" Size="1860682" CompressedSize="1859787" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="bcd17d899d2877e36d57794ed6c7073320f3c807" Size="2521694" CompressedSize="672213" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="bce57b497eb51165d9646666f1846c24e86b194c" Size="3433722" CompressedSize="1080756" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bcfe437fdab5b703b8578a6d457f2908890a58ff" Size="2096892" CompressedSize="892533" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
     <Pack Hash="bd0074eda451f9864389d34ed5720ad1086a8482" Size="85928264" CompressedSize="22820906" RemotePath="2832392-951285e50c9b4177a8a221f4f4f6b0f0" />
     <Pack Hash="bd015e7592fba2109a78a6a8f3e4b3c85d0c9a10" Size="2096630" CompressedSize="512858" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="bd1aead3e9c6eea8826b6919aa5edd1cf21a3029" Size="2084080" CompressedSize="560881" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bd209e7200c98c99d00f9829e33b239d3ea12929" Size="94030694" CompressedSize="17743959" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="bd3eb70a6e8e06013406a11237e86bd18b2fe38b" Size="16243" CompressedSize="4175" RemotePath="UnrealEngine-3590156-de6bc7d13617494db609c5ab21d679bf" />
     <Pack Hash="bd780b06eba19a17c46ce7aba89fa66e87bd0cab" Size="2095524" CompressedSize="550247" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bd8855dcb70378eaeb4b21b70ab69e0686dc2796" Size="6088412" CompressedSize="722050" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="bd969e12b2d210ce0b8817860e18034a3a30c510" Size="6574676" CompressedSize="2411840" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="bdb8d964f1a7ee1bae6689d1f6623ac47e1e986d" Size="35211568" CompressedSize="6283450" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
+    <Pack Hash="bdc0bb06f9a8a5486167f2bf4ae2f59c743f3538" Size="2097158" CompressedSize="590590" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="bdd56998f1b3cc7b1f49f5c1af0b926d99af604c" Size="1172600" CompressedSize="315632" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bdd928ffb7c0e0680b39fe714570128b7274994a" Size="18797504" CompressedSize="4779141" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bde504e141af1b3d4487c18b5869aca6f206534e" Size="2096310" CompressedSize="723601" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="bdf43b651252acdeecbf32879d3590cd957bdb54" Size="2940728" CompressedSize="965688" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="bdf7cd9f03c873d2499106d7e7d6925bcc5e4ff6" Size="4194312" CompressedSize="791023" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bdfd53ca98a2e7463ff472d28dfa624f2e39f0c1" Size="108841" CompressedSize="99730" RemotePath="UnrealEngine-3982222-a5f46f90154447d5829a3a12efdb82a9" />
     <Pack Hash="be193c469f7320fd06ae9d46bd49bdaac7ea7716" Size="64915888" CompressedSize="18740126" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="be4271ae98e83036ec8697bbb7a162a3f3890449" Size="308818" CompressedSize="114616" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="be5cabcfa8f324441e444fefb236044b2b2cb4b3" Size="2096776" CompressedSize="575253" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="be6c1ac56f7b742b9f733b29f46549c5b46f7644" Size="2685473" CompressedSize="2685275" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="be810298e58c15dc11579daa339ebfd77c249a4d" Size="17753608" CompressedSize="4133379" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="be8c418c6c2cd699e4f4a30c2250228b9f623727" Size="2096224" CompressedSize="1452182" RemotePath="3226598-a942cefcafa14264ac608ce1535f9731" />
     <Pack Hash="be97452662f497bf6f901943afbc2d5240394f93" Size="3465920" CompressedSize="1027330" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="be98b3acebab5cf31e42ab05d461f930e38afdfe" Size="1152654" CompressedSize="327093" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bea2292084151c031f25bad15c8a704cdf80688a" Size="2623796" CompressedSize="1029031" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="bea7c037544ad4adb9d69cf34338eee062c4f5c5" Size="18666408" CompressedSize="7054944" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="beb291b3d9800b1c4c17797e20923cb2d5fb9439" Size="2216283" CompressedSize="517496" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="bebbdbb60be5af7d028ddfaa2a719af3d6269dbe" Size="2092794" CompressedSize="897951" RemotePath="UnrealEngine-3761165-bdc9e4367c764cc8b5ecfeb15a2024cb" />
     <Pack Hash="bebe4d5532037f76b997501c57b9b5e4f8ce623c" Size="2260959" CompressedSize="174702" RemotePath="2911283-d7e8bd6e18cb42d6ac0928c3957ef6fe" />
-    <Pack Hash="bec0bdfe8da3d82a592e1ded03add3807f5f2b9c" Size="2083796" CompressedSize="589289" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bec60e9c2a0cfd3f4eca439a6fb8fedb0dff68f1" Size="37258858" CompressedSize="9984100" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="becf420f3d19078ede00fc28d42cd811e7d8bb60" Size="2095222" CompressedSize="895957" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="bed9a2d287f47c90838c031d14d8aacb27ad32af" Size="2265306" CompressedSize="289156" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="bee8e68740f8d36a56d9f09e880ff29b5adf0496" Size="3553472" CompressedSize="1005472" RemotePath="2624516-13715a1c40f44f86ab7fb65e4a808831" />
+    <Pack Hash="bef0e427d56bcb6236d0cfd0a729efc098dc897c" Size="2097155" CompressedSize="688394" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bef12788a5c8477db1ec46ac8cc53423055ec326" Size="1994708" CompressedSize="560169" RemotePath="3384106-9d915e3f2052406ba1ec60b54300ba8e" />
     <Pack Hash="befdf31f38f4a4349047e8c06638e4b799ac0895" Size="115773" CompressedSize="101142" RemotePath="UnrealEngine-3980604-ba71f6c505d14c17a82f2cfce55ef1ba" />
     <Pack Hash="bf0357dc833167bf117904470b2d1b24e81d7ffc" Size="12561984" CompressedSize="3101577" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68442,12 +68275,12 @@
     <Pack Hash="bf30590744b68cebf21b6124ffdccdf6964f7163" Size="2106224" CompressedSize="927555" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="bf4d999d7799b72e67bb9bc137ac4328aeca8495" Size="4253456" CompressedSize="2548613" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="bf53b8893ad6da3a5972310cd4ae83e37c57310d" Size="2097154" CompressedSize="572241" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="bf548fb9219b92aeba90f5902ef9448dbae1eaa5" Size="1169064" CompressedSize="325645" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bf6c451b3631faaccb3106ed570b74e363fc2f83" Size="1709576" CompressedSize="539271" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="bf6c780855375e62cf6253238402aa8dce7957ed" Size="3890828" CompressedSize="999567" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="bf6f61a3bf3e0df9d887eba3b9ae713121565ce2" Size="3145136" CompressedSize="789451" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bfc6b7ffab66eef8cbe04204a59e23a875fb466a" Size="2097155" CompressedSize="1536941" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="bfceb1317c338ad86cac5304221e45af3ca51cbf" Size="3892680" CompressedSize="1076975" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bfd3879771f47fdbad1eb42dad244fb2a3be2375" Size="1885424" CompressedSize="599003" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
+    <Pack Hash="bfd884261652a1ac2cffcc3f8db8c0c9830fb3e9" Size="4314050" CompressedSize="769819" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="bfd8c27966ec81d065d5c567912f752eab42036c" Size="6698496" CompressedSize="1702178" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bff21fec5bd4acb5f3a64fdf34f109dc547bca26" Size="11726856" CompressedSize="3222392" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="bff26fc3466de88f1c0dd0e563e0e6797e4ac4c5" Size="10454824" CompressedSize="4271874" RemotePath="3289494-55b66c5d4fd642fb9d0c3b3f10ec5e78" />
@@ -68457,34 +68290,34 @@
     <Pack Hash="c015de06acfc0a9e2a45438ca198b6a732b84080" Size="3521052" CompressedSize="992994" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c04612a30dff276399c9d8a654fb688e2fed1fe5" Size="2095833" CompressedSize="1343500" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="c0476a6a0442712d3245a0babbf62c40e8e75b95" Size="2097138" CompressedSize="717623" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
+    <Pack Hash="c057168268be0c71b44ba5858cab2058329c5191" Size="8726832" CompressedSize="2355044" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c05f216d3db2d912329014c5f0b98f49b079008a" Size="6055950" CompressedSize="664232" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="c0890e191c0abbf571bc8e71dd0996ecee557a66" Size="2078292" CompressedSize="2072453" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="c09475c98de55014475979ce14a54515e210de6c" Size="2087840" CompressedSize="606488" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c0b679df17adfa19e480d5435683ad7f9007d58c" Size="2097116" CompressedSize="1812966" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
     <Pack Hash="c0c041729c29323273ff25722a4fde1aa90a2b9a" Size="342630" CompressedSize="108931" RemotePath="2388509-1346da53605048a5b86087c481124153" />
     <Pack Hash="c0e2a53b405d3fe3419dc793f360f9da49862400" Size="2097147" CompressedSize="241575" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="c0fc5b463c511bb535e4cec3ffb9c1834389f1d4" Size="2097157" CompressedSize="664792" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c12630229aec6a6d5650a913934dd964f725eeeb" Size="1846015" CompressedSize="739888" RemotePath="2973140-15a5ff67f3864917a418527f3d02c30f" />
+    <Pack Hash="c12c9bc3cdab94c2819c2999b5dccb3a9bed89f1" Size="11330367" CompressedSize="11291926" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c13461ed1911167f67309f624048d3b72b77286d" Size="156104" CompressedSize="151761" RemotePath="UnrealEngine-3520567-91ae67e95960433aa9f07cb5e8ae6929" />
     <Pack Hash="c1396296594dc14fad97ffcfbd2009d0c819a6ca" Size="2746432" CompressedSize="2714961" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="c14937c8186bdb1e8d2521a7a21f839808d7bed7" Size="34284988" CompressedSize="7860838" RemotePath="3272229-df8670d09ed842e3ab4b37283b783ca1" />
     <Pack Hash="c15069f3560b4d21e27b48967e34e07470dfeac4" Size="3383200" CompressedSize="1007922" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c153bd5b93624e74e6e9faf7be24f8f35d273047" Size="8481760" CompressedSize="2990492" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
+    <Pack Hash="c1601b980bf8ba0d87be5f2e8327ae5ae4a0521d" Size="3712198" CompressedSize="842418" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c16a477d90863f3ce68974bb034621d5d561ea01" Size="2478088" CompressedSize="655394" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c179a00f7b3f95d459e9dc03d8cf5f197851686e" Size="2067561" CompressedSize="313528" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="c186e17712d48f5c0290a0dd22d99e6357fe7ecb" Size="2078063" CompressedSize="626422" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="c18d5310b71d1b6c6948f1b7cdc1b49ce01e4c54" Size="2097148" CompressedSize="1998824" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="c18d93c3fb088e46dc560285a889e191b2350e3b" Size="3026627" CompressedSize="3026440" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="c1a3ca62259c678c4a8fd46d1ce65d9291ce9703" Size="2097150" CompressedSize="789696" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="c1c3a77a266c4dd3fbe2df657d01e71d99e416a2" Size="128897852" CompressedSize="33501529" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c1dc57f8a6bbda1bb959150ae1df8236330640cb" Size="3021368" CompressedSize="786541" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c1fb3ccd82459deb3a46b3c12f1ec6708a2b8037" Size="6017852" CompressedSize="716674" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
-    <Pack Hash="c208f4313a552d190bc63ae046d794484098aca1" Size="2097137" CompressedSize="937081" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="c207a565e0f167dac7a5067a05ab80c02ca39740" Size="8530832" CompressedSize="2298732" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c24ecc3e106834209ce15e0baffda28de9baa74a" Size="5513248" CompressedSize="1294564" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="c25bec168e93ab9183b4187a3172187d41e8b094" Size="2097132" CompressedSize="697563" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="c25f9ef5425d8dac6a535fbbc8aa9db8ca6d934a" Size="2026596" CompressedSize="683382" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="c2a0af06e41c370c03a9e9e2313911da0ab831af" Size="2097129" CompressedSize="1144485" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c2e8f2bf69a66ee756deb2b98fe8e6b015a71f3b" Size="2097159" CompressedSize="806082" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="c2fa1ac7e1ce5b8495d27d6c07b8ca6667262cf4" Size="20114222" CompressedSize="3757147" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c308ce8597b5ea1048ffd35dedaed8deff9b8e01" Size="1752343" CompressedSize="1309727" RemotePath="UnrealEngine-3844689-0af18221fbe84d7199d6363a1a5e56a7" />
     <Pack Hash="c3162f6bb67b1f6a14a69998b1b0e6d072b3dc94" Size="2212040" CompressedSize="620512" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="c322a9bf029413e79b8dc14f307972ccdbf0008f" Size="2096825" CompressedSize="1927615" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
@@ -68500,17 +68333,12 @@
     <Pack Hash="c4423e14dd25ec4192871f50e86197fc73d5b31b" Size="2097138" CompressedSize="1685779" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
     <Pack Hash="c45c15e59b9a58af4cb72f257d5a2b1b4d70adf7" Size="5094800" CompressedSize="1486828" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c466fcb69539e456d83d9ccafbd731206f67d155" Size="20921836" CompressedSize="6278166" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="c46c92fb8f5f94cb75aa6dceb9f85ff6303f002b" Size="1827220" CompressedSize="791607" RemotePath="UnrealEngine-3890140-2a6698cb9c1346af8f1f92bc80a89104" />
+    <Pack Hash="c470599cb896f630d64573433e4b591d8839e655" Size="1787640" CompressedSize="517641" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c47ea7c75042c2fa5ab0d108261288d771dece4e" Size="8602332" CompressedSize="1255821" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="c483f02f330e734086b012df57c4ed8ab1dd6ed5" Size="69741" CompressedSize="18831" RemotePath="UnrealEngine-4061751-4cd7614918b240d980550d9d02813a2d" />
-    <Pack Hash="c4a4d8e4b57ad3f98cdee7532aced8006406bda2" Size="12297926" CompressedSize="3252547" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c4a802d1bafe7bad4551df9ec2d49d9234d6eb05" Size="101130" CompressedSize="98956" RemotePath="UnrealEngine-3513493-05889090b91c4ac2a803f4628986b459" />
     <Pack Hash="c4ceb0caf8c161a1da6f383c8b0f24b8ce43d5b9" Size="140579560" CompressedSize="35768293" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="c4dfd3e403b883988470e429dfe1149dadfeafe8" Size="101614576" CompressedSize="18187253" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="c50c66910f327b5721c58648dba80266a1541afd" Size="17780744" CompressedSize="4894261" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c52ad5d5dc97d3425d95ae17988831ac9410b438" Size="2097045" CompressedSize="828326" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
-    <Pack Hash="c53765e51afc0721161e2d92aaef0a7b705d8aac" Size="2082757" CompressedSize="580517" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="c53db3993759aba69cf81a648f8cf53495543de8" Size="2097156" CompressedSize="695341" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c54921d21c20e7c27fee9dadcf212291b32f32de" Size="7553399" CompressedSize="7553761" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="c54be4b2a6a6e6bb4933cc651eb8386447d7922d" Size="26165184" CompressedSize="10326887" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="c565d2dc22f7302041550ec8a8b028b779a3307d" Size="48456860" CompressedSize="9982153" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
@@ -68523,17 +68351,27 @@
     <Pack Hash="c5cef9da1cddeea076b94c4c29019fc3f2c32d7a" Size="1856976" CompressedSize="398359" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="c5d1736b78a8df5140f78123622b8db3883d02a0" Size="7676476" CompressedSize="1740657" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c5d96be22ab15049ead8e69fd879af977ef60021" Size="3084278" CompressedSize="923903" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="c6140f33db7510962d0a89f071642f5d7e2ca05d" Size="2097144" CompressedSize="1846363" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="c62bd8ce7c6549a1fc8dacfc45bf8dd90b66075c" Size="116779514" CompressedSize="31291995" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c63b8b65198dbac3e3764c69e57b85f011332ea1" Size="2097136" CompressedSize="2084977" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="c64839804e94445b7c1ac409d5d0f8f1ea36e54c" Size="2982694" CompressedSize="2982545" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="c64d62e230a53a7f10bf1b3f41715ece130d60ec" Size="11842842" CompressedSize="3164102" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c64d7c8c95ce1d8fad4ad21f965c96c93a817baa" Size="4054714" CompressedSize="1116855" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="c64ef0980920bd362bf26c9e31d253c145d848ab" Size="2096454" CompressedSize="578586" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="c653b9ebfd67dfad854b519e55534735d82f73f2" Size="2195553" CompressedSize="1908282" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="c6b354fd7e6d172b1507774ab87fe6b80238ace2" Size="8420422" CompressedSize="1873844" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="c6877d0458929133b9d40c016c110b03fdb73091" Size="7572608" CompressedSize="2531713" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="c687abcf93d635cd19f9aa38e6eb8022fbb2b53d" Size="7733696" CompressedSize="2195398" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c6b454ccc40819140feff30c3e1ceca3465d5328" Size="5178114" CompressedSize="1120287" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c6d51f9b5485b7ab69d633e597af7f7eb7825902" Size="8580076" CompressedSize="5687687" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="c6d71ac963c30a7232a963b45ff7373f561b0532" Size="105895816" CompressedSize="21644912" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c6da47930b010c6bb3249d411d7760fd5e32320f" Size="2090995" CompressedSize="922364" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
+    <Pack Hash="c72235b763392aba5b1a7915129d2fb9f13a5f63" Size="7308984" CompressedSize="2271843" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c72dedfc2a1bf098513f8a59865f4e457fc2e81b" Size="2096290" CompressedSize="700907" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="c73b4fdf47ae6cc3e0341886ccdfe52d5c812830" Size="2094918" CompressedSize="674729" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="c77937d877773e6d409aebbfe1dc6d13c4b04764" Size="2957786" CompressedSize="930381" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c77ec3cb3ed4127dc3d3356b7a2c93b1b908ad4a" Size="7952488" CompressedSize="699787" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
+    <Pack Hash="c7856fcd07117f32cae221347f7d3de7b5fda587" Size="14756478" CompressedSize="3092666" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="c7866fc6fc8c1377d9910028d05292a6939962f6" Size="5181082" CompressedSize="1121834" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c786a1246dcb4fed227bd47919dfee41f25f17dc" Size="7162560" CompressedSize="2229361" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c78d32aaf4ea80b2746ac7ad1692b021b1b548b7" Size="3420297" CompressedSize="3420162" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="c7945d9532844fa35363f33da23f208a629dbe28" Size="5239244" CompressedSize="1826220" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -68541,16 +68379,17 @@
     <Pack Hash="c79b3d3d81375c25019c997c0e81af6b84d805c1" Size="2096147" CompressedSize="881516" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b" Size="8445386" CompressedSize="7968095" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="c7abd8711d268ebef7f39b9803a39439bb5ce0a5" Size="885216" CompressedSize="225178" RemotePath="UnrealEngine-3967553-e374fbc076a346f0ab724d830c88eb79" />
-    <Pack Hash="c7ade6d20b67775d4c808eb41a71a00dc97a2963" Size="3039018" CompressedSize="924207" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c7b3b942627725f846138fef1f4ed9c65315f8b5" Size="2554460" CompressedSize="862051" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="c7bd45a00b082707059813da743d494381982a2c" Size="2848936" CompressedSize="756321" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c7e9bd4d2466d6f7242bfd26ac4b2880328710b4" Size="3678947" CompressedSize="392094" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
     <Pack Hash="c7f488bfc1ed77deae8eaacb69b84a38a5d6f984" Size="6290880" CompressedSize="1920575" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c808c90be4462136e0fa59d237d117dc74ed6dec" Size="12777324" CompressedSize="780070" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="c840da0835818272e18eacdd15f50e802453c69c" Size="2096900" CompressedSize="1870306" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="c84b44b945a2dcafa8c20388f4678102922c96fb" Size="2096748" CompressedSize="694363" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="c8b6c81a1f82320e02a43232edf87be07a77f89d" Size="5068400" CompressedSize="1347396" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="c8bfb63f5764758d4c2383e79e981438320b614e" Size="3664360" CompressedSize="1016805" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="c8d1212e469cf0c655332c2e4bc976b53c3fa27c" Size="39943884" CompressedSize="4813245" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c8d32adbc51365b195aa2ec0ff4068f1db4a5b63" Size="4470984" CompressedSize="1900633" RemotePath="3146243-698f50214c564ed9b16b58c696b664cf" />
+    <Pack Hash="c8ddebf16ba503b310defa7482c547daaf42bea8" Size="2096353" CompressedSize="550867" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c8fcf9a784756d66ad119b3e642423161380add6" Size="11681336" CompressedSize="3985366" RemotePath="2572690-84e70917b1c64a80b248151191ccd58a" />
     <Pack Hash="c8fe39e90583da82b2773c6df823f7c535ff9097" Size="1928611" CompressedSize="435399" RemotePath="UnrealEngine-3796939-3815c2bfdf5141d49abf3a6331a7c5db" />
     <Pack Hash="c90fc965239f89efbe2d5742fb7bd3c4b9584c36" Size="1796161" CompressedSize="389110" RemotePath="UnrealEngine-4074642-73b7b611b6a34841a3d783c023fdf0a2" />
@@ -68562,19 +68401,24 @@
     <Pack Hash="c95cdaed781fb020898a671e373b60aa382404ff" Size="3826092" CompressedSize="1115836" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="c96e9cd94a86b222bed132142b65c1d90314445d" Size="1707120" CompressedSize="737032" RemotePath="2441582-104388acf6d34237af496ee648a9c7db" />
     <Pack Hash="c9817bc4c0577b077fa09f441b0025a9ee1cc0ae" Size="2588744" CompressedSize="697294" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="c9ab1dd42b6ae3bd324c849585c2e47f618d8c67" Size="6550328" CompressedSize="1611303" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c9c278871f7416bd78c37e9990e238b431898126" Size="2355052" CompressedSize="841923" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="c9dcd3efa15d86693a0fbc9073cbb3b57a6b7143" Size="1643311" CompressedSize="527871" RemotePath="3226895-5cf350c03e4540c68f1dd2114168e091" />
     <Pack Hash="c9e1c5c93a25b5410ba6e40b82950367bc3ebcd8" Size="35859680" CompressedSize="8902556" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="c9ebfa71e9d50945c2cdf1f77a023aa27a621bef" Size="1169224" CompressedSize="325716" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="c9f420f3d45623d37cebd5bb2da25cd59811513a" Size="12632198" CompressedSize="703405" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="c9f7bd390be6e2f50469fcf024ace928b624a38d" Size="2097073" CompressedSize="964468" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="ca00ff8eddbe09834b1e991bd33a795aa6046ec7" Size="3571496" CompressedSize="996352" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="ca0729cd56652179cf171cfb460c688068331ddf" Size="8738336" CompressedSize="2355157" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="ca0dcd5e2aed860e36dbcc1ff500832ce9c6c40f" Size="1962324" CompressedSize="1948715" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="ca0f6cdd1d929536dda14d51372da60159ed113f" Size="2997792" CompressedSize="897732" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="ca240b74a1bbcceb9a16c3c6255b7d10cd7d5fe6" Size="20083848" CompressedSize="3039345" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="ca3160fa5c2af7e6b47fd6f3a4aa6ffaf30c8222" Size="37187274" CompressedSize="9970862" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ca3e2e27abc70c49ac40021d755dcd08ca44218c" Size="11290006" CompressedSize="2334479" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ca59ada04d02de4dff1f157d2930f6649bb39074" Size="3226344" CompressedSize="882477" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ca65be420a71302989d3bcd444d95633e61eb1a8" Size="8939443" CompressedSize="6091918" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
+    <Pack Hash="ca761bd20034f501708660a7440a637a19e63349" Size="13505088" CompressedSize="4240432" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ca83db39ca850bdf08a4e3bda07b207534365c24" Size="2097120" CompressedSize="663436" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="cabbd87ad1bdc1209d85baeedf512423afd7cabe" Size="2087602" CompressedSize="612652" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cabf740c3ee0778595f1aad06cd3ba636eb62ccc" Size="8455224" CompressedSize="521421" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
     <Pack Hash="cad6744ce15f118a59a2092dcd6d52e7a0f0fbe0" Size="2096824" CompressedSize="569079" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cad925023171965eebc25f0a64c2654381766452" Size="105499552" CompressedSize="21546473" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68582,55 +68426,52 @@
     <Pack Hash="cae11d27e66fd86a674a8d19733509870059758b" Size="2096167" CompressedSize="1088040" RemotePath="3352858-7504d3292bca41ef84c459da51952b67" />
     <Pack Hash="caf2082cc528e23264423e8b953440952c012cef" Size="1232825" CompressedSize="350963" RemotePath="3152072-36eb1023308f4ea8a04774dba61acea6" />
     <Pack Hash="caf474bcaffc45ef5a8a69b2cc199afd3425ff5e" Size="29674864" CompressedSize="7093945" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
-    <Pack Hash="cb0257e1bdad41ff99960b895851f2f21f41f733" Size="2386752" CompressedSize="614504" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="cb1f6d843f5b219df1f99c7d955e6969e8b650e4" Size="2097138" CompressedSize="842109" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cb58cfae60b06c98704988c26e4a39c392e484c5" Size="7052396" CompressedSize="1436156" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cb73a430e097bac42d93ec902203b7888ed0b681" Size="2097159" CompressedSize="690745" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="cb7e3b76227696f2ef0d9d77c866ae568e1d5751" Size="5915440" CompressedSize="1727617" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cb8ab8baa0ef020db26fe3ae520e984cfbd2bace" Size="15896536" CompressedSize="817466" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="cbae4316061da922f96fb5148d60437b253181c1" Size="3565146" CompressedSize="964836" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="cbafcbe19329c889151577a995439d8c09b69f61" Size="2097082" CompressedSize="888498" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="cbb12a0cb253814aab713d03f253bb74ebd38917" Size="34363776" CompressedSize="7080076" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cbb692e5707cd71eeaf0fc798d6f64f146038c5b" Size="1791052" CompressedSize="542959" RemotePath="3356522-7f380b5b6c124d819b19b0225cc22151" />
+    <Pack Hash="cc0e3ca596819781928571b7f304f2a4e1d1c983" Size="5393392" CompressedSize="1573194" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cc1bdca380bf0483b3493f5106075a5fed75b66c" Size="2287252" CompressedSize="536258" RemotePath="UnrealEngine-3958292-44ac5bb0724a42b080e2f347df890e00" />
-    <Pack Hash="cc36213f286f005b6235b2278c33fa5b3826c930" Size="13455888" CompressedSize="4171819" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cc3ea6214f8a83565d8abcb906e02f56df61dc95" Size="10837443" CompressedSize="966277" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="cc49483dab5945dfdb5724566e0b13cebf5e72d8" Size="2094268" CompressedSize="410651" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="cc4af7fa3fb1218934583d2ca1a8c7a306b2ca79" Size="115588124" CompressedSize="29713396" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cc4c8615bf428b2cadabf2e1ffcbf503f3bcc33a" Size="2097135" CompressedSize="504043" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="cc6a5a3068543d46e2fb50b7563fe9ecad52177c" Size="2097083" CompressedSize="1446840" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
-    <Pack Hash="cc76d789cd809c8fc4083b519c4a6a5d79dcf539" Size="5363368" CompressedSize="1632936" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="cc80811d6040c0dee40bda7302ff9b5ec7c542b0" Size="6076576" CompressedSize="864140" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="cc987ea4064d6bff5b2e85ed13fcb7d9ca651f2f" Size="1749357" CompressedSize="900060" RemotePath="UnrealEngine-3413434-6b60e7e407a34327a0fc5117f4bb0ead" />
     <Pack Hash="ccb91106d9460812decbe2edc67bd490bbc8d5ee" Size="2187292" CompressedSize="570379" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="ccf0979b015935bfa7e5bba6bd70dc0719bf6b0b" Size="2077515" CompressedSize="810999" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cd069cea843f8f46f072a4d9496461ca39d9256a" Size="5408680" CompressedSize="3138938" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cd070925d940afa9f58478a815a876e9aabcdc93" Size="12631912" CompressedSize="703803" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="cd0d52d3a393b848c4524f8d20e9c3d772779d50" Size="2073206" CompressedSize="2030310" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="cd1a0571bfc4c076ef91f4df9b90c024432650b2" Size="2097159" CompressedSize="803384" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cd1bdf1839a7fa5a0a3eb9b701f3494f3e032fde" Size="4315698" CompressedSize="770042" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cd56fa471be13a098222adfdd5bf0d6c3f7da146" Size="19394568" CompressedSize="3038651" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cd6604e574f4177bec712c0b10e0f5c25e1c8191" Size="4003346" CompressedSize="883995" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cdce3d902b74252df143aa9c039f4e69c31ef532" Size="1872198" CompressedSize="588425" RemotePath="3341914-5cc844918a8c4b15a7ed13b4c156445e" />
-    <Pack Hash="cdd804ff3f54b3a5ec69d2291b4fbc954897ef54" Size="1445966" CompressedSize="385926" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ce17010a1af2358e1ab4c9c88ca24a6e59f34064" Size="347480" CompressedSize="37172" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
     <Pack Hash="ce38f4efe2f1b287a352d45e256cc59f8057cb6a" Size="2097056" CompressedSize="686133" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="ce68eb270b121549818de184a640e5a3d4775d03" Size="2527240" CompressedSize="651917" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ce8d8713b86de24eef6f957be897be7b7f381353" Size="3426872" CompressedSize="451115" RemotePath="UnrealEngine-4042226-27513654d92c4e608067edfd8704ad74" />
-    <Pack Hash="ce9ebf82ac610c3659f1dec14fee839d0c709d2a" Size="2097124" CompressedSize="571835" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="cef842a41674f683267c1fdef46348d56abcdf0d" Size="2327048" CompressedSize="943541" RemotePath="UnrealEngine-3848514-2925e91abb09445e97bc8414743789c8" />
     <Pack Hash="cefd87d67f6688e869ab62068aa16c5f02113c8c" Size="2117917" CompressedSize="2110751" RemotePath="2597174-0975f975d1f0463f931b68ea4b0ef6d0" />
     <Pack Hash="cf066f5930e6f84f6279465b75ef5792ba8294a2" Size="2096123" CompressedSize="569656" RemotePath="UnrealEngine-3534806-ae8a66d312e94d6f845561b316da0921" />
     <Pack Hash="cf1a24f37cf747c367bb89fa88a6a5397f94878b" Size="5378769" CompressedSize="5367335" RemotePath="UnrealEngine-3479958-543a927e673c42ee89fb13d09ca158a4" />
+    <Pack Hash="cf20b05bae3af1a917ab45733b720d524dd86fa1" Size="4198408" CompressedSize="793041" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="cf4a635ba3a4c070a83394e45c5bae8ef8651afe" Size="2079302" CompressedSize="1984306" RemotePath="2621163-719903f8599f48949652ccefc2a2d5be" />
     <Pack Hash="cf5e1ce959a11e3674cc1a7c352dc878022c2eff" Size="2090658" CompressedSize="1971338" RemotePath="2547993-1fb84b9e293242c988e586c599eeeb56" />
-    <Pack Hash="cf6e623b8a05483e9bfa215a60d62d445b8623cd" Size="2097145" CompressedSize="966779" RemotePath="UnrealEngine-3932718-813bfefd337148ff9c90cea7382b8608" />
     <Pack Hash="cf7f1d93299ad568585777d5e722214e0bcb349c" Size="2097154" CompressedSize="1962388" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="cf899a002e0240530c3d53a020a283cdf5e56ab5" Size="252940" CompressedSize="25138" RemotePath="2697107-82b66c6ca1224ee496ddc7eb5cc1cbcb" />
     <Pack Hash="cf9fc3a314d8463902b6f242df8deb582ea73f6d" Size="2220116" CompressedSize="287391" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
     <Pack Hash="cfaa6e2212f937f340e867175482030d495675ed" Size="1477191" CompressedSize="398653" RemotePath="2448689-7792f1b8be254cc19b4c3379509684cc" />
+    <Pack Hash="cfe3cc7ff9c0610fda854e53c7d0e9ab91d6a4f1" Size="2411272" CompressedSize="724596" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d00340b56c80a33987bae91b824e43fa883353b9" Size="4903175" CompressedSize="4902784" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
-    <Pack Hash="d01cc64773fcc48c7057dadccd600f6e3b4e1c80" Size="2086998" CompressedSize="517121" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d0291e3428f076681d4a30df8f1e2bc87d1bb6a5" Size="7329232" CompressedSize="2280964" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d029db0289a0276858f7acd0de1e0d629fbb21b7" Size="2097156" CompressedSize="848118" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d02cd01745ba4739de2e992742999c6c11f72f0a" Size="5130822" CompressedSize="1008571" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
+    <Pack Hash="d04ba7413629042f0d4386693135497ae49099ea" Size="19634992" CompressedSize="4965328" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d0567b0e74b19ee823347bf403863df43d2f5040" Size="2091682" CompressedSize="589815" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d056afbf456aff85bf24ade1bfff28a42688c87c" Size="1963486" CompressedSize="699290" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
     <Pack Hash="d06593f62f514fb6f9c4341304eacd26370e5872" Size="5431728" CompressedSize="1225382" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
@@ -68640,34 +68481,29 @@
     <Pack Hash="d0a262143cc00cf6affe748b7f4b05119594baf0" Size="5454680" CompressedSize="2874889" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="d0aac86d70bcb34a11741b8e04d81c118ca8f0e2" Size="2097140" CompressedSize="788755" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="d0bab4bcbf517b4ac7f4ae6e03f79cfd89fc8abe" Size="31321956" CompressedSize="8566245" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d0e9a239d75251b347b6718b26ea359de3711292" Size="3235184" CompressedSize="886514" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d1013afa1c5e53875c4b7b7de8385e976711af23" Size="6581712" CompressedSize="1594702" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
+    <Pack Hash="d0cb05f132343eae7988363c6918520a91218a24" Size="22714136" CompressedSize="6893747" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d111d246a5dff2d0eed94cb2592bfe277ad9e0ea" Size="6498522" CompressedSize="1613053" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="d12eba7ec3d754671bab00097e86fcbb81776ae8" Size="12143012" CompressedSize="3186925" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d1371ad168d1d7a1b9aea524e0fc55c6bf07cd53" Size="79" CompressedSize="97" RemotePath="UnrealEngine-3579688-617f7d9a829f44ae933abfda7491e301" />
     <Pack Hash="d145e49903f677ef550249e06a51094d20464580" Size="3715582" CompressedSize="842836" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d14b12c95456b11b70e2d2621c69be65961ea3b6" Size="2254076" CompressedSize="480245" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="d1520bfaab38f3061d25e8115b7c19d4d3b50927" Size="19754072" CompressedSize="3677459" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d165f29f588eae8d8a55d377f73b67973713c670" Size="14645400" CompressedSize="3154100" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="d16861b8cf2f13f37e2251f9b5e9e4f2bbf6950c" Size="23345594" CompressedSize="3989574" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d1cc40fc311b1fe882b059047a6c7f53925c9827" Size="2097156" CompressedSize="2065624" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="d220d2c7ca7d95d5e42c1a422a061fe5b2578a22" Size="19130384" CompressedSize="3379101" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
-    <Pack Hash="d24d9db79effe09252916efa3aa7697ca3bb78a4" Size="1172340" CompressedSize="315374" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="d2555e6cdd17fb0fae45125777c8623c83b7bd51" Size="18929408" CompressedSize="3569395" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d25faf54b177d399192ede835440a8eb4948ab59" Size="2097131" CompressedSize="1161698" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="d260bdc26b2dda2e1f9165e39ff50e235785f81a" Size="4142476" CompressedSize="1586421" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="d267551dd6d79a46e20a6cc8a85f933b13e71162" Size="165790960" CompressedSize="33521832" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d269a082d4513e409c6795d0adfe600ae57dee69" Size="2096798" CompressedSize="583761" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="d27c0f6b2f82d4e0112056dc4963a251ad84b3c5" Size="231564" CompressedSize="68022" RemotePath="2482054-e6ea3bde29504ce5b51935e2939eefee" />
     <Pack Hash="d285efb773a78a762164f3dc41f8fddd71327288" Size="1832520" CompressedSize="417958" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="d292729e71bdf7b0dfe9367148d16b19fa7a5da7" Size="3764930" CompressedSize="842589" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="d2b27f78e444d9a3a5905bf3be2dd414dd52baf7" Size="7517474" CompressedSize="1770273" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="d2d500e0cdeedaa2e1dac0af1e2bf48ef99b358d" Size="1724986" CompressedSize="536900" RemotePath="3174242-d2fb25e44c2043ef8bd6c42c947bda06" />
     <Pack Hash="d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0" Size="5085162" CompressedSize="1246474" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="d2df47d9927aa08e27cbb40f7baeb6ae8d594274" Size="2582572" CompressedSize="2496764" RemotePath="2802540-1c38965ba19349a094ca69c2c2a48781" />
     <Pack Hash="d2df9cbf1caedf50c5177a1d4e6ac9923d327dd1" Size="849930" CompressedSize="504979" RemotePath="UnrealEngine-3627373-78a12d7d05f84023a72d660279a2238a" />
-    <Pack Hash="d315fddcc857c33658fec9f6d24e4c4f2f9efe8f" Size="3226864" CompressedSize="963517" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="d2f16873b087b19044bce92a153c7f123d472299" Size="19777504" CompressedSize="3682962" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="d30350abd59a79249d9dd69e8b8a8f9bfe865b86" Size="18582856" CompressedSize="4698745" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d31dad19c41dfe5fe805eda5d23486ca115b4dca" Size="2097013" CompressedSize="1598144" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
+    <Pack Hash="d3234cd69048539f786386a6eea28d392be33e8c" Size="89556910" CompressedSize="15354457" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d324c1434b20b5ef66a2937ab08337f78c5646a0" Size="2096803" CompressedSize="1249054" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="d3252f0b3908d0904656e86696c0364f7c362edf" Size="25397760" CompressedSize="6913914" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d32c7be5b4d30387ec996764f5226c0e3e1a3a88" Size="1945144" CompressedSize="259581" RemotePath="UnrealEngine-3809764-549cdd57da794195a8e53a84e7dfea20" />
     <Pack Hash="d33ab2e27b4f74e067f78b40302aa12a7b77795a" Size="61703752" CompressedSize="13220762" RemotePath="UnrealEngine-3842286-20459fe8af554fdd80637bf21fdf1bd7" />
     <Pack Hash="d36d4d70e5e964d96fb89790499d530e6e8982a5" Size="2097068" CompressedSize="1716303" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
@@ -68676,6 +68512,7 @@
     <Pack Hash="d3acc379a342b085eeedf4f71d1cb1d4b38e42b8" Size="387005" CompressedSize="340890" RemotePath="3149549-5c7a0b830f9945488072f88e9859fe50" />
     <Pack Hash="d3ec56982b8697e4b29447ab96f462e714e390cd" Size="17063062" CompressedSize="3354921" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d40ca344b858af6e3119d8bb5a7c3e16f8d5d46f" Size="2097156" CompressedSize="1674070" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
+    <Pack Hash="d43b4f4a6dc6791cbf3e796c97665229c4636806" Size="3704436" CompressedSize="845158" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d4557be7a4a05871235a3f4d27079353f72c3b81" Size="5583994" CompressedSize="216986" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="d45c65e5f0c78b3f9b0946abb1d05a7c58a84e84" Size="2085638" CompressedSize="610938" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d45eb845a7ab1d281f30abe3fbd7084a4bac9186" Size="2502664" CompressedSize="583274" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68685,40 +68522,40 @@
     <Pack Hash="d4b6d2c68fd6a20a92a8c78822e96163eecb5c62" Size="181432120" CompressedSize="36736335" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d4cc462dce69b9d7d709bd40ccf618aea536c079" Size="3242600" CompressedSize="1207279" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="d4d95c31401f5aa793d3056677abc65930433d9c" Size="6668240" CompressedSize="1184505" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d4fecca07efecbd3e6b30a479891d495b3bbc1e6" Size="4146428" CompressedSize="1940523" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="d4dbe6f4463336c464b273797921b3f1180dbe5d" Size="2097100" CompressedSize="614699" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d5300790dac3cc619f89851b34f424d123202d88" Size="551589" CompressedSize="494005" RemotePath="UnrealEngine-3503486-1d5f9328de214edda653a39de04f2a9b" />
+    <Pack Hash="d536615385fc73d5d76eb52b64f32f86de50abf3" Size="2097089" CompressedSize="563308" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d55fd9dc88154de89726d225895d9986f2863449" Size="2095407" CompressedSize="1844325" RemotePath="2943240-c2a9d38c57e7438db3f8ee61341bdcec" />
     <Pack Hash="d575eedfe9e359ca88b4e1d9bb737ee7f1afcde4" Size="2058133" CompressedSize="317226" RemotePath="UnrealEngine-4036528-67b9221400fb4d92b50444e2287d0622" />
-    <Pack Hash="d59df67bc7616239dcfcc27708b7561041107c8c" Size="2341680" CompressedSize="710239" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d5a3b4767cc133423189e7f59fa2dd8e7923ea59" Size="1475464" CompressedSize="399578" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d5fe40a7f257b3d1575ed4d175c6491e2e1490eb" Size="168878980" CompressedSize="34853067" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d62437b41502119a596b4cd0c85abe36cb786a9a" Size="2176244" CompressedSize="268409" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
     <Pack Hash="d62c3940080daa547893b1a3dd1cde3588c416b9" Size="7052500" CompressedSize="1436176" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d63c4c238a195e3f8e062b2a9cf0757f0ed55587" Size="2097153" CompressedSize="704658" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="d649906f1e80b4dc54d57af853de4a8743b5436d" Size="1182232" CompressedSize="318327" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d64bb917d5f5253a0ab5717fae3ecb89e464d900" Size="2820248" CompressedSize="191835" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="d65a42fdc8154793ead3cde82b7ec619bd249478" Size="6707260" CompressedSize="6707746" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="d66d3a1216c5414a349240a83f9bf9dbd3597cf8" Size="2371776" CompressedSize="610541" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d67cb445f37637410f670b1d8682dcf22ced07ae" Size="2097083" CompressedSize="631304" RemotePath="2935407-1758f8d0007c45c999a637b82386eae0" />
-    <Pack Hash="d6948a07c83f4bc8a3c53202489f9015dc6b1a2e" Size="25340768" CompressedSize="6887120" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="d6ec83ebc3d7b6c684bf0bea54bcde77ee326981" Size="2097158" CompressedSize="697547" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="d70fad8bfe9cfa4e9f8463a364598a3d770c7c44" Size="3039606" CompressedSize="924387" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d75e12ec5bf3ff823831ed7a196e9340a65d9000" Size="2963096" CompressedSize="943437" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d7814fcf3d47188e1dfca0e7f6e46deb141b8e2c" Size="3520208" CompressedSize="992418" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d78f29de7a0511e0b7894c9507aa9bbe51d412c5" Size="2704558" CompressedSize="521077" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="d79b515a8ffc174a508593ce109108ecb9e44813" Size="2689467" CompressedSize="2191918" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="d7a56916778ad1fa03472f47ec92e8a9eed66219" Size="1271620" CompressedSize="389233" RemotePath="2482391-24fb529bc09847ca8c3576d69ba36285" />
-    <Pack Hash="d7bb9b8d1395dbbf5de64a8a4184676af2a89ffc" Size="2201672" CompressedSize="636499" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d7cb38d309087e9ffaf8012608b6c8797eda3a21" Size="2538504" CompressedSize="1071723" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="d7cd467675e181dbeba3cf24443590ebb76f9515" Size="2097159" CompressedSize="1845373" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="d7f843e7b00e7b3213b0f6aca3eb288f7d602e45" Size="6008738" CompressedSize="1245398" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d8087772cc7b825c8b28a4fcfdeb31cc602301cf" Size="92399" CompressedSize="87590" RemotePath="UnrealEngine-3694667-27ad942fa47a46aab58e75e1d720260c" />
     <Pack Hash="d80f8bab91e65f6374622c18411497cf86bf0d3e" Size="31089912" CompressedSize="7271074" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="d83cc9c9ccafadd27d18ea51adbb23f71944297f" Size="334856" CompressedSize="116178" RemotePath="UnrealEngine-3953114-dd1c42678956428eb71634052c86b64a" />
     <Pack Hash="d852eca7663f1c36dab87cbd527dbfac895faf97" Size="2097157" CompressedSize="2081114" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="d857af45bbb841bbbee98bb99786c88d36b209eb" Size="2346226" CompressedSize="545806" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d87ee730c195a3604ad75d012a1837de9c3149d1" Size="24088178" CompressedSize="3140439" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="d889e4d65d962a36e5839fedc6a70a00ac10fafd" Size="4343852" CompressedSize="2387949" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="d89e655babcda8595979a4f13033d2150562a171" Size="11125950" CompressedSize="2338917" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d8abbf7642437f66197d216a0eceef1ccce557c9" Size="2092268" CompressedSize="2090952" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="d8aceaf8d33e7b024e34c97dd3f251bc51e47913" Size="1441642" CompressedSize="403585" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d8b4fbfe5cd8bc4d622d9cac11ae5f16c4106a47" Size="4130244" CompressedSize="1214380" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d8d162f287361c0fbc167e08eef300150beded6b" Size="2527240" CompressedSize="653737" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="d8df6d9c90e63349425f248149e071e3a21e17d0" Size="1962017" CompressedSize="1065640" RemotePath="UnrealEngine-4093601-62f84327f89f4e3d90c9c35f6d8ff5a6" />
+    <Pack Hash="d8fcb3b473b76bac6739d947ade4f5461bfdff28" Size="5966032" CompressedSize="1733095" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" Size="2097121" CompressedSize="1676479" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="d92a1acd3616e39cf08b386bc602a4288c1522ff" Size="2097073" CompressedSize="606194" RemotePath="UnrealEngine-3932718-813bfefd337148ff9c90cea7382b8608" />
     <Pack Hash="d9362c64454014f9f935f7af5378d385f598b6b9" Size="27900088" CompressedSize="13366000" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
@@ -68732,7 +68569,6 @@
     <Pack Hash="d9cd996ea5042b0d08c555ef2559111b5494e3a1" Size="2096806" CompressedSize="677864" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d9d5a3912d5a2e91e647286be849997a5fa641fd" Size="9035322" CompressedSize="1817618" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="d9d6d079ba2a3e8abbf1fb8868d9b14dd8b6618c" Size="90380944" CompressedSize="19838294" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="d9ed7f4816d963a62cd266b30e5288d3a8318294" Size="2373608" CompressedSize="610703" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="d9f6664b38f46beba670dc729faadea7888f86ec" Size="53494912" CompressedSize="14164989" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="da1f01cf125294d282a763396110068c87d4bb3e" Size="2216542" CompressedSize="318568" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
     <Pack Hash="da38e7d0989204cc3f8176d6b1c1b24a1d4cb216" Size="2385841" CompressedSize="710733" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
@@ -68750,39 +68586,39 @@
     <Pack Hash="db8c218338dd38163268cce294602a16cbf66e72" Size="3463176" CompressedSize="1201619" RemotePath="2691808-d60cb1b77b864593815a724233dd6176" />
     <Pack Hash="dba2f996d90381a6fa89e552e4a74828748e0ac3" Size="21655720" CompressedSize="5730359" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="dbc4d9d5a04029e2d1999a94b8db494222187078" Size="9302363" CompressedSize="6320766" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="dbdc3b355134142777afab8f2a1dc1c2219b5a68" Size="2249812" CompressedSize="479264" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dbe6e1f1ff5ab16e82ce6dffc0347f2101ba9a17" Size="3177992" CompressedSize="1049683" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="dbe75239cd713a39f272a0de6cac2dfb95039ebb" Size="8326309" CompressedSize="8327080" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="dc0f39e9c75bc2cf2dacbef56f842b46eb7c883d" Size="2097142" CompressedSize="740222" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="dc2b29c0e13526608c488ffe71c8b1250da551d7" Size="28197264" CompressedSize="5586132" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
-    <Pack Hash="dc3f7a67fd94676492f8331f0fd8f6ea01843a41" Size="9232720" CompressedSize="1574252" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="dc46b46ee38f63034fbdd4791e1d8edcedcd37f3" Size="4880895" CompressedSize="326299" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
+    <Pack Hash="dc780aa5e7168a1ea37d5b7f5a761978352f100f" Size="11429896" CompressedSize="4383512" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dc8af4beee95a25b1c0cab56a5b11a66babc6a87" Size="2184840" CompressedSize="530023" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="dc922c36f90c0e246e59661cac88c9fb3643639f" Size="5562074" CompressedSize="1079713" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="dc925d8b901b5ef9e6e4c9d0e398a4f359d6e62e" Size="2097100" CompressedSize="560365" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="dca54ca4dcfd5081af2200590a93a898416b3f6b" Size="2097159" CompressedSize="782117" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dca5fb637196c11122b5a75ab07676384a71f115" Size="13650836" CompressedSize="3551265" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="dcab12707403b0977c0a5f48f3c692fbae0dc5cd" Size="8814772" CompressedSize="5954920" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="dcb3503036400494b05d6a300549c66555bfb883" Size="1773950" CompressedSize="517844" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dce8fc6efc70a743bb9ac3885221cc67656adbd2" Size="3362060" CompressedSize="1005716" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="dcfac09bbee829c128aac9e83f9408bc20c966a2" Size="50345834" CompressedSize="9724885" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="dcf05455c4ef932f6c2b56c69a3b86c93eed1ffd" Size="2735624" CompressedSize="888024" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dd224b777ac0b2b82b6b84c94f03e799403e8aa5" Size="21522440" CompressedSize="7927550" RemotePath="3075435-26d5613237084edf862f6b1aaa8bd033" />
     <Pack Hash="dd225d27ea95dcc0d23890cf944610bad2e5a9a0" Size="21356976" CompressedSize="7180044" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
     <Pack Hash="dd67559046c4cec3957fcc155765827a5c36dfb2" Size="2091990" CompressedSize="1769486" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="dd6aa88361efd8c13bc630db41c40d185f94dafa" Size="3861468" CompressedSize="1053723" RemotePath="2624516-13715a1c40f44f86ab7fb65e4a808831" />
     <Pack Hash="dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae" Size="1639509" CompressedSize="1638652" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="dd836b1155ee23e3dbafb95e11612ee4ff9ddada" Size="18968584" CompressedSize="2941602" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="dd8fe67bd041ba3a16589de0f1b932cb9c59e5e5" Size="2447320" CompressedSize="435720" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="dd963a1999f74da341bb3f179f40ec8eca179938" Size="13551624" CompressedSize="4946303" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="dd9cad41432e454d710f4dadeb01f384f845a999" Size="83723926" CompressedSize="19415362" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="dd9f6d9c63ed5364651b83ee27c4482751584e3b" Size="8081416" CompressedSize="2219025" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ddad05592e192eebafd8842ac556d92572eef1aa" Size="2079296" CompressedSize="346213" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
     <Pack Hash="dde49372548c3a3e8ad2d3301a2a954d4167a13f" Size="1477036" CompressedSize="518772" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
     <Pack Hash="ddffea76154050032a408a3890c07633f1ba3b0b" Size="1700294" CompressedSize="232236" RemotePath="2604938-a9e6e886491749ef99155ebfe50a18fa" />
-    <Pack Hash="de04f8b4ed53ad897f4e0a5a8a4040487ea67d2e" Size="53273962" CompressedSize="10046619" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="de1a336e62b98e22da8d539e099acc94cd7dd633" Size="6213896" CompressedSize="1849443" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="de1df31388e1bebd1cbdff9980962bee569e843f" Size="4367364" CompressedSize="775980" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="de57be23bc036d0a4aea433ae00c926305d11030" Size="2097102" CompressedSize="320180" RemotePath="UnrealEngine-4036528-67b9221400fb4d92b50444e2287d0622" />
     <Pack Hash="de7274fb71ac492c6246e8f31d8c6b23e1241338" Size="5128712" CompressedSize="2142927" RemotePath="3140364-25fb5146829445ab89ef552f8f2cddc4" />
     <Pack Hash="de74434214aa307a9b0fd7f9d71b839fc98c45e1" Size="4982730" CompressedSize="608161" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
     <Pack Hash="de7be9bd446cca2c3d817d2f1d7042e9a6f27378" Size="8399819" CompressedSize="8400498" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="de85751668591870e7965db775b02872c59e1667" Size="2095769" CompressedSize="886376" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="de87c539cbb90fb0d0369dc29328c5ba440622d9" Size="3486084" CompressedSize="1025021" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="de91426e5f3e3df5e3245d6aeb1634e9c47ced52" Size="2096332" CompressedSize="1391578" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="de95456c72c660a7fc9f70aa125bbefaa24b5897" Size="47805864" CompressedSize="12564370" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="de97d5ea9d0119675bc1b66f36c68cb50fe4aee5" Size="6379762" CompressedSize="1649065" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -68791,27 +68627,25 @@
     <Pack Hash="dede8e0a11b5f83fcc80f8de114b924834dda515" Size="8697330" CompressedSize="5850385" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
     <Pack Hash="def068eae246e2fbd7e21a232e16ab306dc83eb5" Size="1938670" CompressedSize="422112" RemotePath="2624515-65e4f107761c44f799aea052f127dc15" />
     <Pack Hash="df0144f50704728f42fccc36e1dfe60d6e88afb0" Size="218459" CompressedSize="129978" RemotePath="UnrealEngine-4079772-744eddd35f724491bdfaf58a9e823c0c" />
-    <Pack Hash="df09a1189b1d8964858cfb161710f823446cb601" Size="2097159" CompressedSize="797104" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="df54fb21975e218c1da9d209d52b225e78430abf" Size="6679442" CompressedSize="6679818" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="df6d4711f83f1c570af30ec97dd418f0664398b5" Size="2336860" CompressedSize="667808" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="df7e1c0f4fc78d7814f044a10de1362862cc7bac" Size="2095639" CompressedSize="688320" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
-    <Pack Hash="dfb411db6a5465354dcf72286da26a9412166460" Size="4381576" CompressedSize="1031610" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" Size="2097087" CompressedSize="506089" RemotePath="3379345-1a4949fdb1ce4fd18339fec7c4e85c06" />
-    <Pack Hash="dfcbedb69a15a7b6b3055602450d30695e02f4af" Size="1548" CompressedSize="796" RemotePath="UnrealEngine-3569295-d1523b47cd7341abae844ff9ae1ae04b" />
     <Pack Hash="e002d0958c673752ae43a0801b444a2ce1624b4a" Size="2097143" CompressedSize="1986417" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
     <Pack Hash="e02ceffa7dbf58acfed245113d911e454ca80807" Size="1900879" CompressedSize="625005" RemotePath="2710400-b2df5b04907d41fa801a32ba3ff2274e" />
     <Pack Hash="e03e6065e7fab54342be5f863e85f3d431479f79" Size="3365386" CompressedSize="966926" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e048ab728cc0f8f1e3fa027f821ae2793decf1e5" Size="6293080" CompressedSize="1914121" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e05787ca1e32ef7163dbfa93f15f98095b61a195" Size="2058238" CompressedSize="689645" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
+    <Pack Hash="e06228b3b50d64c2062950b9ab50032270ce9551" Size="3725328" CompressedSize="1040844" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e07eaf9aa7769233b372a954ad60182277a96928" Size="164361050" CompressedSize="32950619" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
-    <Pack Hash="e08efd1c4a88646ff33a9093de748a4e7158bdb6" Size="7305800" CompressedSize="2042877" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="e0a14030fd6ca4b291475b202b8ad9ca709fddf5" Size="19952946" CompressedSize="2901207" RemotePath="3189774-fa29f2e73310489bb5062f25d408c9ee" />
     <Pack Hash="e0c088fb69a5a89d50640f2b02e1e1483d9fd556" Size="168951060" CompressedSize="34858494" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e0d88047bf9d4fddb3315a3da8a8a97adfcf2c31" Size="2399230" CompressedSize="714815" RemotePath="UnrealEngine-3638830-530a3d934a004cebb6e0fa8d2bb4c0e5" />
-    <Pack Hash="e0db7290caec90e5ac30fa2bd76ab2d9f700cc1a" Size="3490528" CompressedSize="1025660" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e0ed8dd6a39be2d27235abbcc4a2c0f90de54ed1" Size="2097120" CompressedSize="686275" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="e106ce3ce1a7bafe780e72f090f349e0d66c2db2" Size="2096850" CompressedSize="1425910" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
     <Pack Hash="e10e19c255056c096d6105cfbff767f6749ffeea" Size="9272666" CompressedSize="2125043" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
     <Pack Hash="e1146fbe19589cba2bfd875e65360b1038f71d69" Size="17622536" CompressedSize="7283596" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="e11e1e72d903e2d6116b749b64e7f86e1c3f9426" Size="10877952" CompressedSize="3093673" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e1372831de0bd6364b0389049b55a7dc4fa2d1f9" Size="6008142" CompressedSize="714676" RemotePath="UnrealEngine-4053683-14e4553279d14dac8e714c4a42b88ab9" />
     <Pack Hash="e15b3364eac09406e2ed766daaaaf49e16b174cd" Size="930042" CompressedSize="228630" RemotePath="UnrealEngine-4023459-362f13522ed647339f2c5af89a36207a" />
     <Pack Hash="e16e25464b1b13a786ee5496439f81f90ca630a2" Size="2065714" CompressedSize="1909707" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
@@ -68825,36 +68659,35 @@
     <Pack Hash="e1c2b4950796c10c7e09fb434d900df8557c3a74" Size="1995080" CompressedSize="1868352" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="e1c5c0494082c1115f45139c60ce28fd6668f298" Size="2097129" CompressedSize="1007125" RemotePath="UnrealEngine-3557906-6112df30fc58479e9bc4840bff0660db" />
     <Pack Hash="e1e8ea5166504dae3d34cb904dc97ada375d9706" Size="5642813" CompressedSize="1918519" RemotePath="UnrealEngine-4064889-24695836a463451ca251c2460dd48c63" />
+    <Pack Hash="e21013d9dce595dffaa869e111eadeff50641519" Size="8896838" CompressedSize="1501915" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e216e3b470b7423e66e26c971e89a7a6206c2840" Size="3824676" CompressedSize="3824500" RemotePath="2665321-6ed08d19a92744829f2d1be31eaa6b94" />
     <Pack Hash="e23187f494893d459aee2428f603a4f93c6eebe0" Size="1620583" CompressedSize="1419164" RemotePath="2713665-997fe91569cc4be38e22925611b0703e" />
     <Pack Hash="e235435af47d241bf8a32655040bb6bcca173961" Size="2097158" CompressedSize="634421" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e24dd0c09219e50f0b1813e1ec8cd33af1dfa67d" Size="13416008" CompressedSize="4154311" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e266aa9b854d9b51e6070e16170a57751ced9a15" Size="2092218" CompressedSize="882787" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e248dcca4770c3aed1eaf3aed5d975315ee60e8e" Size="4054528" CompressedSize="1331583" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="e268f21188c6112409f35cfe3f83619524b21cc5" Size="2315082" CompressedSize="586257" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e2844d1cb41a532700afd48dffec9acdf53a5ba6" Size="2096125" CompressedSize="1638103" RemotePath="3327560-18841d997da8447bad8de6026cbafffd" />
     <Pack Hash="e2d7166acd41c0c247e9b29409121222eeaf4c7e" Size="2050397" CompressedSize="422718" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="e2e2347e195fcb6908121d1d8252b675c0225733" Size="3054960" CompressedSize="3054843" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="e2ea6a4f09c295a8a32f6c0e4c2327fef6cbe426" Size="19583128" CompressedSize="5212102" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e2ebdec9f3dcad861d56e841a3c1bc894b0aedd6" Size="4258512" CompressedSize="1282086" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e2f32ff964a397551243be87d453eadd39c65e2c" Size="6952340" CompressedSize="1590247" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e2fa2ac520eb51bd27214ee5bf3c3511f0803850" Size="2038418" CompressedSize="1625268" RemotePath="UnrealEngine-3545186-3e1e53de154c41009b26c236d720f37a" />
-    <Pack Hash="e33ec085fa7b33a5b77545f42909d6affee363eb" Size="2097156" CompressedSize="764259" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e34b6cb1704c0890ddb03e4d030f787c3d169d2a" Size="19771624" CompressedSize="3680352" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e319937ef387e4166aa2bb796e363d0bdc326655" Size="170586902" CompressedSize="35188750" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e3756b62507729b3cf51da27d96bd45a378c0531" Size="2096279" CompressedSize="442845" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e380f683db24a7cfe78e8b2762eedb95af1e281b" Size="106452" CompressedSize="98943" RemotePath="UnrealEngine-3437498-56fbf497639649cca9f98b12b727c3c2" />
     <Pack Hash="e39b1ffe375995e81f45f2d90aaf437e84c11ca7" Size="2097116" CompressedSize="1458424" RemotePath="3041367-5ed8062ed7b244fbbe088cb9a31b34cd" />
     <Pack Hash="e3b0326826449ae757d09e8d825d91e18970a3a1" Size="2097090" CompressedSize="2077227" RemotePath="2818924-4e4622fab64442db81d756e3b865b7aa" />
-    <Pack Hash="e3cea6835e6f8dff74869b7ba4fa1e9477374d76" Size="5122156" CompressedSize="1112977" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e3eb6d5385b624938cfde015b9cb6a2404021c9b" Size="6008738" CompressedSize="1245417" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e3c91c5b04722adb88d32b7ce84f96691b8134de" Size="14699779" CompressedSize="3077315" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e3fa27e2dc586e0332fe5f04da9fc3f350ae06c9" Size="9874286" CompressedSize="1648393" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="e4322e907e512d6ac89ae493b4b67f99bd8e6303" Size="656144" CompressedSize="184254" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
+    <Pack Hash="e4426e9e05d6ae5c12368727cd2d8a44d78f78e8" Size="6360176" CompressedSize="1941124" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e458507f455e3bac9232d632426fc4b75f29841d" Size="2097129" CompressedSize="1629294" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="e46e9b666d28b4e8fe6e2e994c5756689b4e746b" Size="2587808" CompressedSize="696578" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e48ae4e3e78f894e2791d58495262571a904bd0a" Size="2914784" CompressedSize="945499" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
     <Pack Hash="e4ab729cf42a5a19024d5eff31b9aa275352541a" Size="2097155" CompressedSize="1272495" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" Size="2097145" CompressedSize="2081494" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="e50119c064462a0e056574db4e21f359f7f0c159" Size="2959078" CompressedSize="2958910" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="e51313f7a5f7c6f8dec9463b50749c43aabe800a" Size="10716648" CompressedSize="3040561" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e5274f88def6458d7c1f419988a9d89c4a61c0ee" Size="1528444" CompressedSize="151470" RemotePath="2802567-fe0894c782dd4fb598ce30ede80ce843" />
-    <Pack Hash="e527fa14adad9541a4d7a681393c6b27069956a7" Size="49500220" CompressedSize="9587909" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e57211ba641f74710d71ed9c3b43ddf1fd019379" Size="1952968" CompressedSize="815405" RemotePath="2970080-1f45e19839df4f42b81244212020aab4" />
     <Pack Hash="e58e08e4d2ee0f7ed27b3d825487aa1fbc3500b8" Size="2096655" CompressedSize="621027" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="e59c46a44a978e34376830275f5068632f7338d9" Size="1056946" CompressedSize="824535" RemotePath="UnrealEngine-3555266-2c5a2eaa38ac4369a056795a8f05deae" />
@@ -68864,12 +68697,9 @@
     <Pack Hash="e5dba2160aca88a58c4b0b5d5adb4f9c4ee02e37" Size="15988320" CompressedSize="5808170" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8" Size="7763992" CompressedSize="1916979" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
     <Pack Hash="e5f886b63f8e94259869c980cb3640bca69cd1ba" Size="2447153" CompressedSize="725488" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
-    <Pack Hash="e60e266db250bdf5f05d33234d8ae4dfcc91973c" Size="20073488" CompressedSize="3024813" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e623a9fd2bdddd75871e146310698c5a844c758d" Size="10765264" CompressedSize="3066437" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e61a34a47089f2f0a99ed833906e967c28d99261" Size="26331168" CompressedSize="7132275" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e63440472234df22c00a68b8ead881c55dd1687f" Size="5209714" CompressedSize="1538499" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
-    <Pack Hash="e63aa9fc03c950b352b86eea3c733e41e8dbd609" Size="18796272" CompressedSize="4779375" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e65ada96c2aabd3c38b870ec82277f9e6c782f41" Size="4367968" CompressedSize="1057061" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e664029519e00ebd602cc513675aae532c8ec5ec" Size="1398950" CompressedSize="373860" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e6347b3badb113c35af36403f292693d70d46881" Size="2087796" CompressedSize="668114" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e667d98942346cf8cdb6a4cb7b9bbd4e3e10b2d9" Size="37155196" CompressedSize="36169980" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="e66d21ec4939ebcbd3babcae7230420591365d83" Size="15836362" CompressedSize="47317" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="e67885669cecd4dad902e4da38ff6f037f019397" Size="1888251" CompressedSize="509318" RemotePath="UnrealEngine-4074642-73b7b611b6a34841a3d783c023fdf0a2" />
@@ -68878,54 +68708,55 @@
     <Pack Hash="e68fd345f57007c501cf74e2d02946684e887bcb" Size="2096888" CompressedSize="807102" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="e6ac190de70c58158e73c9482f54cb74913b3fdb" Size="3674536" CompressedSize="1033913" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e6b6eae991adb9b39c9dd688676859a2a37b6d39" Size="6782818" CompressedSize="1610208" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="e6bf28011e3d92593638eaeeb6da426a5691e32c" Size="18089024" CompressedSize="4623400" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e6d510ce525aa04b4d06b1561f14a16338c01f02" Size="2228458" CompressedSize="2147637" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
     <Pack Hash="e6d6170217e3ab596bcc10a49c297cbbac27c3e4" Size="2089789" CompressedSize="986727" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="e6f2f742b0074d952295a051cb9d91880f3a305c" Size="3436750" CompressedSize="1080996" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" Size="2097149" CompressedSize="801979" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="e70429fd818fe983008a06e931d39724ea7a382c" Size="3096464" CompressedSize="858661" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="e722152c7dfc5d497fac2d45af5d6b46c2fc569b" Size="2097095" CompressedSize="626307" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e738e4d1dd54a93f4fba800a115c25fed788b22c" Size="2094049" CompressedSize="695328" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e744da6629082119a23b588fd8f7e3b28a8cce71" Size="8023175" CompressedSize="1048874" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="e76365940d8a76c2ebe7935e866bbe26c5a3ebe7" Size="1558390" CompressedSize="431486" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e769fd3f38f8ac16d61425aefb493e6efc9f72ef" Size="3019792" CompressedSize="786491" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e77394dd7f7cc0b5cee80f69160731fc90212a12" Size="2095928" CompressedSize="639977" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e7808a43acaf99637e43857c76760d74f77d6ae5" Size="8854796" CompressedSize="8855714" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="e7a4ddc64af2a43bf5c7d439244636d60a7dae07" Size="817610" CompressedSize="87494" RemotePath="2500002-69b23dcf7a2d4165b2b432780845acb0" />
+    <Pack Hash="e7a98b7aeccba35dc9be7b902823bb43ef833195" Size="2097157" CompressedSize="639289" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e7c0d839f4862a30228ee915487ecd9f9b7c6554" Size="2097046" CompressedSize="693940" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="e7d5b50c89809b2dceedfed828db6eab09618c82" Size="80327896" CompressedSize="15009428" RemotePath="UnrealEngine-3567077-8a334f3f74574a8583d4869b352a08e4" />
-    <Pack Hash="e7dc94c809760add0550cc425bca6869cd46bcce" Size="5282284" CompressedSize="1676203" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e7fd92c5ec6fefff0395979e86f79cd18c85f0aa" Size="7006656" CompressedSize="2209719" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9" Size="7847137" CompressedSize="7847709" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="e800e6619caf261111854d3399298b6e807183b3" Size="2097128" CompressedSize="1567505" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
+    <Pack Hash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" Size="2097031" CompressedSize="749209" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="e8160c3dfbd1b6b796802d991d690c2f137f4340" Size="4521472" CompressedSize="1326651" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e817ca9104379dfa75233081d3d42cccbf3cb21f" Size="1868158" CompressedSize="577416" RemotePath="2691248-443aeed77dc04b54a6a17d6cabdf67c3" />
     <Pack Hash="e82df3dd8df9657a25f1927bf0e2cc882e8ed896" Size="48560200" CompressedSize="8505648" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="e85ad2ef6896adbbc28a46b023af6b64deb29b88" Size="1696475" CompressedSize="1696048" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="e86626e94d15c0d773d8a1a0ed336087b1304afc" Size="21139464" CompressedSize="5738781" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e8c3e90942a5b288720c462500e119088f07598b" Size="1283974" CompressedSize="854253" RemotePath="2646891-b5b29624e5354ef694dffc02dae26b0a" />
     <Pack Hash="e8eac54315c98cac2e06b13e0aefb039d5ce78eb" Size="2847848" CompressedSize="1041149" RemotePath="UnrealEngine-3479958-543a927e673c42ee89fb13d09ca158a4" />
-    <Pack Hash="e90af9a418271aee9c0a7a6c36b2617987b3fec7" Size="31059144" CompressedSize="6786164" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e911b3aa49e5da096e90b8a4524b6e47de6ee95f" Size="10178344" CompressedSize="6522996" RemotePath="UnrealEngine-4001436-8fad94c4381c4b32ac4e4de1a1a36329" />
-    <Pack Hash="e9281fb867c7a62245c9113c59f9e304f1336d2a" Size="5302888" CompressedSize="1538194" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e92993477ff0ca06e5bd518fdb05a1a1d932d56f" Size="3258178" CompressedSize="785592" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e92d4170b08f1bd72b86cdbfeefce851a8db9871" Size="78997" CompressedSize="68014" RemotePath="UnrealEngine-4003753-659e068540f84fa38eebbfb1504099bc" />
+    <Pack Hash="e95b89cbccaf22cae24e9791eb51bfb059a9deeb" Size="2097154" CompressedSize="1243819" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e95c41f528c90604e041b493ac16032dc040e0b8" Size="127338504" CompressedSize="26589190" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e969a96396fd224b9c2af1da8e4570fd07b0600b" Size="3492048" CompressedSize="1025815" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="e98244029da7ed44473df1959f403919bfbd7a58" Size="7663712" CompressedSize="1761112" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="e97bda8b11b604c3b5815d1fd4007f8b09e538d4" Size="6655166" CompressedSize="1186752" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e990079e67563b7972840254a41af9b194abf5a2" Size="2966464" CompressedSize="784798" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e997f5bba3b4d4b283427ec3ca644a876f6dee7d" Size="7803818" CompressedSize="1662143" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="e9ada08052934232dab4347c891567c01aaef05a" Size="2082354" CompressedSize="531968" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e9bc0e8f3c60852f3e98fb6b9411528577e59682" Size="50336370" CompressedSize="9722148" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e9bf61cdc861c37fb3285e4e3f6c244b6b1d87d8" Size="2097146" CompressedSize="449206" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="e9c7b3390ef65a90310c9cd4a97594bff007303c" Size="3003400" CompressedSize="1259175" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="e9d45c91cf2c9a1914a88b3a9675ec4d898441ba" Size="47654" CompressedSize="6823" RemotePath="UnrealEngine-3588513-88d39444364a46d1a1a12d8fb09ae0c9" />
     <Pack Hash="e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" Size="2097142" CompressedSize="2073816" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="e9d8fd56da6503bd0fcab30bcdceadd992521392" Size="118486006" CompressedSize="30820051" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="e9d9fd9ac6c16314cc4d1c17acead2d5ae27c75d" Size="45744432" CompressedSize="8373082" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="e9f295f6f5958c9a6bcba988219d1f196ac74d77" Size="2096842" CompressedSize="1941833" RemotePath="UnrealEngine-3490340-d4ab30fbcdde412b9ffb07cd3ef04ff0" />
     <Pack Hash="e9f2970e25d30e5663d97f87975406775b2efc8c" Size="164427374" CompressedSize="33346510" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="e9fb881dce2317273acc2a7ce7768bcc67e959c8" Size="2096858" CompressedSize="1644180" RemotePath="UnrealEngine-3851221-68821c20e2b7473aa45bff1e7b12b591" />
+    <Pack Hash="e9fd3e48a792ca511bb0de9cd173aa5bb336d8bb" Size="2095378" CompressedSize="518308" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ea11508ef61cc1bb97bc48294aaa21c81dfc25b0" Size="3899880" CompressedSize="1074981" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="ea14e039005c521a036dfba5c3dc4cef5c7b2b28" Size="4383600" CompressedSize="1031787" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ea1ceeeca18772113719947ece176d0109d53dcf" Size="2097158" CompressedSize="8308" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
     <Pack Hash="ea2a6ad22b6526be45e82c9e518aadf947fea715" Size="2339744" CompressedSize="587079" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="ea39a3af16b4dc43d157490fb9de27c641489d45" Size="2026987" CompressedSize="1868747" RemotePath="UnrealEngine-3532032-100fc0f5d04740b4947197632c0501da" />
+    <Pack Hash="ea2fde2cd3b3611cc64a919cf0e138457ec57b2b" Size="6492824" CompressedSize="1884699" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ea3e6225da691f3ceb0d7336a652911cb5b926dc" Size="2097040" CompressedSize="756942" RemotePath="UnrealEngine-3635058-678ee366dfaf49b0be88d474b362ce9b" />
     <Pack Hash="ea4a12f1af41606d5fb49e879c3b643a25cf5ce6" Size="142273" CompressedSize="11132" RemotePath="UnrealEngine-4067073-f4223345c30c43e9b9a5d5fb88e6738b" />
     <Pack Hash="ea65c8c9786ef6c86049d6585079a9ba033d50fb" Size="2097149" CompressedSize="563509" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
@@ -68933,82 +68764,87 @@
     <Pack Hash="ea73750f0e68e45f3d65380b98bc15ec80292967" Size="115762286" CompressedSize="30997470" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ea83e8125c0978669c9398911e0f6c2fd3f945d8" Size="1229448" CompressedSize="992286" RemotePath="3021299-5f3d0cb887554354b217d56511d6c61e" />
     <Pack Hash="eaceaa2d359d151c5394522df962ce393938a21b" Size="2037020" CompressedSize="404881" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
+    <Pack Hash="eadf9441efcfce173eeeed153a63ca2d745e9b01" Size="5045304" CompressedSize="1103616" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="eae9d7f0c647ab3277c5345bdbb0b69c19d0c6bf" Size="1931909" CompressedSize="1114469" RemotePath="3354404-de27b30092be47dba428e9ed356f455f" />
     <Pack Hash="eaea434c65e3ccf8cec643ea1ec391bdddbc6fac" Size="4584214" CompressedSize="4584309" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="eaf3853c73cd6268ec2553abdca49a062180a1b4" Size="2097150" CompressedSize="836669" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
+    <Pack Hash="eafbf5dc12719274d69ca87602b948a267e4e45c" Size="3334658" CompressedSize="1061990" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3" Size="2097078" CompressedSize="804358" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="eb4f66337283c3f2dd8fd28ce5b05d61d206d82b" Size="7200356" CompressedSize="1066784" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="eb56d534d8ab6be49ba1a028e87ed68ba46e193f" Size="2095840" CompressedSize="630951" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="eb714351bd01e8b8fdcfbb13c2fa732a88539d64" Size="2864456" CompressedSize="902552" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="eb63d23e447208f487188cfe0600c74caa85819b" Size="2989512" CompressedSize="876142" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="eb99415493e5381c13e50fa8f0489605564eb924" Size="1158377" CompressedSize="1150805" RemotePath="2795179-027ca56ffc7b446b8c199c609790fbcf" />
     <Pack Hash="eb9b6a5f3aab97f6e877a661e76132615f3c6ba3" Size="6072056" CompressedSize="665896" RemotePath="UnrealEngine-4082269-085fedbeef464b7fa83264a7b2e10cf5" />
+    <Pack Hash="eba773e041f40b7c693bdc8d9bde0b7825570014" Size="3024624" CompressedSize="787905" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="ebb4aebe534377a11e1cb4a0ee4278286f82eff1" Size="3433722" CompressedSize="1080715" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8" Size="3886836" CompressedSize="1447720" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="ebb88e86c6c2330c818aa447f851a26934bc440c" Size="3025784" CompressedSize="788396" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ebc78d12d3ba5ee4b59613ba0c8a0498cbf542e0" Size="23295808" CompressedSize="7554490" RemotePath="3357449-09c4f579676d488ba551dba9f0fc3bc4" />
+    <Pack Hash="ebc874b5f53a7e12571b9d6035148b38e50d6b7f" Size="10955132" CompressedSize="891051" RemotePath="UnrealEngine-4088613-c67c9cc087754550ae2b8def07958b5f" />
     <Pack Hash="ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" Size="2097148" CompressedSize="1627450" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="ebe839f7685330c322237d33a6419b873e606b97" Size="2097058" CompressedSize="578414" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="ebead08f120e8cf59cb4c17e5da7671645777bcc" Size="4676024" CompressedSize="846654" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="ebfe6319197bc7ca765e565cafa3d81366b6b04b" Size="35284552" CompressedSize="6271288" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
+    <Pack Hash="ec120a52b06d911a8417a0cb9f2dcc3175c911d6" Size="2159492" CompressedSize="522345" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ec120b0303abfd30cf405350811331acb5e02ad9" Size="2097126" CompressedSize="553789" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
+    <Pack Hash="ec19ed1788dbdf0c4775a44dab72247e214f78e9" Size="2086144" CompressedSize="763106" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ec32d0c01a2496add71c3487b9ac02bdc86de126" Size="31337240" CompressedSize="5615471" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="ec353bc64ec4f072a73050a16fd156d0b8880319" Size="834018" CompressedSize="154133" RemotePath="UnrealEngine-3621569-f7bad60444ba4c9ea69fa1100764d3bd" />
     <Pack Hash="ec484032b520fec866cdce28e8eb0dc7931a4305" Size="2850210" CompressedSize="837521" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="ec5de1727c79fc933c910e364d19af5e7ebcbf99" Size="2097007" CompressedSize="791995" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="ec6d576df884aeea2ed37256df7caa8cc8040d6e" Size="6802277" CompressedSize="6802756" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="ec6e65856db8825b3cd85dbdef16e90700a4a7de" Size="2095295" CompressedSize="615834" RemotePath="2656980-c015aab7e6de49c3934683485cd56429" />
-    <Pack Hash="ec8c4cca33997379588b3720df90aecdfe4279bf" Size="2060502" CompressedSize="542387" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ec70623f42eeaf612b720485175f227c59378e12" Size="7295752" CompressedSize="2042074" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ec979837cb32e0cf98610636f8fd5d45378c6d8c" Size="2097133" CompressedSize="750970" RemotePath="2898161-40796c92a49b4c9faae72b755a5f6cee" />
+    <Pack Hash="ecb9951fbc830280dfb9d025d6011d0f99f7b854" Size="2664408" CompressedSize="709944" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ecd7511686af3b407b71ccaa85a3530be45efe6a" Size="24359264" CompressedSize="23974479" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="ecdb05aa975c4a93d54a43cf5df1bc6de8d31d09" Size="15714480" CompressedSize="8580084" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="ecdd03d9dd277bf097d078acf90d3840358010bb" Size="169943034" CompressedSize="34972532" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" Size="2097119" CompressedSize="863433" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="ed231b00e4cfda36fffe2344aa7faddd06695b48" Size="4265040" CompressedSize="1378439" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ed1f2952a6be399c0ed89aec8c4997a7ad369984" Size="47295014" CompressedSize="13841351" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ed23ade7aa2af09963a993ee53ab33389aae2e80" Size="2065022" CompressedSize="2064388" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="ed384e6a16f79979d70b9926060a68eeb610de53" Size="1096665" CompressedSize="332796" RemotePath="2610584-8220d2cd9ec743a5b8ec0d50768a5d76" />
     <Pack Hash="ed43d8b48327be7821d55053906e4deefbf189cb" Size="4601892" CompressedSize="829229" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="ed9f3786213b99a7da9d7c24a5f021ea9c8a498c" Size="2158814" CompressedSize="522485" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ed5fbfb1179d01f59486f6fa8b20fce28760f466" Size="32080338" CompressedSize="8637079" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="eda6e1c1edcf27f8270efff9c2cdc40a86fe34fd" Size="2096588" CompressedSize="671190" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="edcad0b0c2862c776fa60784960b9a3a8b3ce6ef" Size="3882863" CompressedSize="3882896" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
-    <Pack Hash="ede73224773ccd81fc18ca093995e0688871bf2d" Size="6269616" CompressedSize="1915560" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ededb5a86297fe84eb15fa6ca8998f05a9a750eb" Size="2097156" CompressedSize="320497" RemotePath="3362661-c42b75bbdfa5405597d5cca909cf2e91" />
-    <Pack Hash="ee129033a4120c9e504d6cfb1f3c8dfbc6b8c6a8" Size="16439112" CompressedSize="4186588" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ee8662030dbca92bd70af3ba1550ece5c275d13e" Size="402561" CompressedSize="191621" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
-    <Pack Hash="eea30d4821ce263eaf8a5e10d3467e136c07313c" Size="3224944" CompressedSize="882152" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="eeaa24c1e61cc4b0806496b256349c44f84c02bc" Size="2095009" CompressedSize="2049084" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
-    <Pack Hash="ef079093519a4d4c59c146e07b2554bdf8328685" Size="12555984" CompressedSize="3101311" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="eee72b6426ebea0f9511fda1139314dae432436f" Size="2287824" CompressedSize="575289" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="eef602252e9f66b2735be236fcb1366335216742" Size="10821288" CompressedSize="3068231" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ef25cb64c814cde9550f14595e298a9ca7cf329b" Size="4406048" CompressedSize="1343732" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="ef3d362ea0edd293eb99aeae543ee8b77ce4183b" Size="1853662" CompressedSize="546339" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="ef4aa5b16741e98c6a84812d60fae851c3e6b4ef" Size="2095918" CompressedSize="580187" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="ef4f65d0d82f5517c164ac9475e181cf58572a11" Size="2454536" CompressedSize="820774" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ef60a0c38ea7162ceec2c523ef91f87a81f89cf2" Size="1635183" CompressedSize="381469" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="ef653e3944f49e109ef11bee70a08e3bb2992366" Size="2401955" CompressedSize="713748" RemotePath="UnrealEngine-3608256-d9539c83975244ee8f4a762811472973" />
     <Pack Hash="ef6e0ab725edacea0f29fa7450d2b00321e31740" Size="4880887" CompressedSize="326290" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="ef6ece337b7dd2a9513b5aba1eb891f4bbc202d8" Size="2084326" CompressedSize="676972" RemotePath="3174242-d2fb25e44c2043ef8bd6c42c947bda06" />
     <Pack Hash="ef7edae3e8549b96e2d540fe90caf093673345c1" Size="8899222" CompressedSize="1502170" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="ef990657b59fd9ef22aa9f59168a21322dc9bda4" Size="11009610" CompressedSize="2328879" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="efa3ad383e6fff1ee04226f5902ca9da4f433f37" Size="2400063" CompressedSize="2396253" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="efad2bae9ec0727a2d14a2090060a47d4adbe4e6" Size="539602" CompressedSize="445298" RemotePath="2656980-c015aab7e6de49c3934683485cd56429" />
+    <Pack Hash="efb18c0b48ac0e26ab7348b2a7929dc882a93c97" Size="1591722" CompressedSize="436782" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="efc5dddae1add3ef9edef1868a9b1367d32973bf" Size="3770902" CompressedSize="1780074" RemotePath="2695145-79614f6ed8ce48fcb95c66fd5701302e" />
     <Pack Hash="efe6508a39dd34c5112c5868c2644d280902ef44" Size="2598764" CompressedSize="1011375" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
     <Pack Hash="efe81a03fc4e327388573f361faff5b233243834" Size="2097140" CompressedSize="743852" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
-    <Pack Hash="efedfece58a5b9d68bc3e19a99048d8c382c9552" Size="2693298" CompressedSize="845880" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="eff7dae5ebb303e1c5f823e0de1accf1075e8402" Size="5085150" CompressedSize="1549362" RemotePath="2634747-19d80a6a5c9a448e8b5bfb5b00ad73ae" />
-    <Pack Hash="f006965ade23fe6e50d931e25d64fc216760e675" Size="2734600" CompressedSize="887938" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f048ee5712bdc546a5ae30754de51176363dab5c" Size="29636" CompressedSize="8868" RemotePath="UnrealEngine-3885585-4b28143938474d4da8a5a23c056845f3" />
     <Pack Hash="f04bb0803c834328c048cff05056081b1d0e8120" Size="2615628" CompressedSize="523319" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
+    <Pack Hash="f0620b3773b2e8d8f56c9c555c7b116d345019c8" Size="7147832" CompressedSize="1747837" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f09c64013ae5d05d4a9530dcd4a52bcd393e09af" Size="31655416" CompressedSize="5676810" RemotePath="UnrealEngine-4072858-47bedf23f165452dbfb68f68d2d4f787" />
     <Pack Hash="f0a9ab50349a7e9359afb1d1da020870c8b9d28c" Size="6817712" CompressedSize="1056189" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="f0d6a898c18d4750e572c04c2dc290f0628f238c" Size="1878407" CompressedSize="761105" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="f11b05acf069a23b5a58dd054c9e055241e06bcd" Size="2085556" CompressedSize="601257" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f12fcad677aebdda530c1768cf6a4c571cea68bc" Size="2097098" CompressedSize="555683" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="f1372e2ede9021ff61444ea132b18024ee271b60" Size="2097045" CompressedSize="826031" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="f1463549aa4f2556fe3f6cda7fdf02409c63f1d9" Size="11816592" CompressedSize="3176544" RemotePath="UnrealEngine-3531461-47d4c55ec64b4fe085baf34f62518659" />
     <Pack Hash="f157bb3359c7b53b5bd8e551e9fa75d25c905592" Size="4493042" CompressedSize="1310599" RemotePath="UnrealEngine-3807911-a82be2ac96a24fc38ce63d273de2f5d5" />
-    <Pack Hash="f15af63e779e54c9b01e8c2f11cdcdfd52c4a052" Size="2097137" CompressedSize="1113641" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f17d0223bd6f22c5c26373857f8c83bd29f40edb" Size="7884808" CompressedSize="1983501" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f18da05b89b485f1870ff2b88125f3c1511f8805" Size="5759667" CompressedSize="5759897" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f1932e6479830de4c4fb0d4cd432ed4df954e8cc" Size="30023424" CompressedSize="13759646" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f1c7941afcfde1406432854cf30f3db1705aa7bc" Size="37196830" CompressedSize="9966905" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" Size="2086447" CompressedSize="2010460" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f2145ae2b7503ac91c6b45995a2d8a7f52c5cd25" Size="4634102" CompressedSize="847113" RemotePath="3354599-f810c7bfb4fd40dd9fa7aeb63055e1fd" />
+    <Pack Hash="f2222f469d6fd56f096ce2e7e5bc8835f6809f5b" Size="2082039" CompressedSize="613145" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f229289982177e74b3eb92ccbcb0825c38219d40" Size="10115200" CompressedSize="1376891" RemotePath="UnrealEngine-3665845-2db6f4cd59fc4db5985e58a4d96277a6" />
     <Pack Hash="f232f993f553b765d97eecc857839131bf8547dd" Size="13479600" CompressedSize="4176360" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f24d05b616e3f50a24367e32f8c42d68d40797a3" Size="2062432" CompressedSize="1686714" RemotePath="2605550-2722e8035d7444a18952cbd04a5c58c7" />
@@ -69025,21 +68861,21 @@
     <Pack Hash="f2facb060651244fb9d2551d6b1e003a55a2b0ec" Size="3508440" CompressedSize="1245332" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="f329cbe56598fa2558785f9cf7c12fd86805baaf" Size="3057972" CompressedSize="1891795" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="f32aba07cfa1ebc07b2b435fe84868c2a9d2f6c4" Size="3628373" CompressedSize="432578" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
-    <Pack Hash="f3354cb72d0922bba45c8d1de1a1569b8096c050" Size="4120940" CompressedSize="1214269" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="f344ae0f983670d5fd6f0c5b86a3bc271be446b3" Size="3597482" CompressedSize="1140662" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f380b2adccc3afba7a9a9a501560525a8359a651" Size="2097149" CompressedSize="846818" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
+    <Pack Hash="f385fbe56b0c15fe9003d3ab7d1878d59d64ed29" Size="12156540" CompressedSize="3193658" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f38889741341129aaa57f66f2c36e093673c46ea" Size="2096814" CompressedSize="612472" RemotePath="2581810-569aa4e20f7249d0bfc2a94ef91ec1a8" />
     <Pack Hash="f3a6d83afa63e247473f1981af1c0fb339be0953" Size="3904766" CompressedSize="1234432" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f3b9566381de4360f85a76c3e005bcd0d596de9d" Size="33948964" CompressedSize="9074048" RemotePath="2832392-951285e50c9b4177a8a221f4f4f6b0f0" />
     <Pack Hash="f3c7bd71870e965c9434bf1796a53cb7127fd938" Size="15363274" CompressedSize="3793010" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="f3f1ca47a314d4a4c7a35b4a0028f2dd893cddff" Size="313726" CompressedSize="124961" RemotePath="3098788-eacc985c3b3a499697fce5b6dcdea112" />
-    <Pack Hash="f414d001a7119b3ddf04f024da6f30fa97fc0ea1" Size="4414400" CompressedSize="1035414" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="f428da968a0ea943708076c893f2def3c4b65015" Size="41720256" CompressedSize="8780688" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
+    <Pack Hash="f46da1339625d443d0aa9d8c3cb340912ba53449" Size="37185762" CompressedSize="9969081" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f4828e964cdc0529d187a56662c76c73b396d207" Size="3600602" CompressedSize="1141217" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f4843fab17d50ea04ad406eee8cf143fb53b2f48" Size="2812434" CompressedSize="191407" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
-    <Pack Hash="f48d797536413c42e01d8269396fa6b310ad821e" Size="2097159" CompressedSize="590426" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f4a07302191409f4190139357c544fc6f1e3dbaf" Size="3232776" CompressedSize="1652899" RemotePath="UnrealEngine-3780967-0b6e7a27e583450a83af784a391e1249" />
     <Pack Hash="f4a124277291f919f4d113126657931fd3e10b91" Size="381882" CompressedSize="212046" RemotePath="3329230-55b949f9af444d9e861fd0490b9496e3" />
     <Pack Hash="f4aaa2b3bcf4cd4d3ebaab8338cb5a2a9c5dafe9" Size="2496608" CompressedSize="1079961" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
+    <Pack Hash="f4e47ebe5ee91fe66b10d35e7ce8d5a2793238a3" Size="3843848" CompressedSize="1063426" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f4e5c321293ab07639b720b5f3c43e81d2476f5d" Size="3197448" CompressedSize="1068171" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" Size="2097128" CompressedSize="1532570" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="f4f52945149f9b540099572fcd29c911f8f8fc18" Size="9649867" CompressedSize="9650766" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
@@ -69047,9 +68883,11 @@
     <Pack Hash="f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d" Size="9201538" CompressedSize="9202564" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f52e34a4a79133b94670f3d8a27f926f3eb6a3d9" Size="12612496" CompressedSize="1747063" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="f53d0808c3863bf0c41d22a46cff3d899d3e7a58" Size="5302774" CompressedSize="1136946" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="f56183ef9a51b04c0311b5a5de384e805b4e41fb" Size="2084196" CompressedSize="1042319" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f56edcc07a586e9b6792c219e9e8eca444362bfa" Size="2097088" CompressedSize="610101" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="f5a7447dfbc138217d1807bf84b59d6313ef4a0f" Size="2097129" CompressedSize="847534" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="f5afbf7abcf77972aee12be2b84779a385983b9d" Size="6701" CompressedSize="4011" RemotePath="UnrealEngine-3544050-a35a60a731c541f18de8bd576ac4c527" />
+    <Pack Hash="f5ebb3d11c507c072795ff79777afd592e940e0f" Size="3844620" CompressedSize="1063791" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f602c209a799d0cc6814312718f806f70e09062b" Size="2474659" CompressedSize="2474428" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f638d14c7c8c0da8f82423ad3c00eb05b991f406" Size="4999155" CompressedSize="347018" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="f65f0635d734f4d398aa18cab8771d0d5a33c9ae" Size="16755655" CompressedSize="16036088" RemotePath="3175266-4c71f613bcb648a0b2824db2384635dc" />
@@ -69057,32 +68895,30 @@
     <Pack Hash="f66bb643b3a7584d1fa71215c78d2335fc620f93" Size="2097149" CompressedSize="668903" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="f673955a77882976d5085992a28ee72f5faffe27" Size="2096966" CompressedSize="790026" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
     <Pack Hash="f6965e23ff5ff474a91e97ba3a1b9005a3e1e165" Size="2694230" CompressedSize="845552" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="f69c25162e2a1a9baefbc35ec2f95c283b93f42c" Size="119001958" CompressedSize="9709120" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="f6a791790f22890c66070a22e93f5e542116bd9b" Size="4570714" CompressedSize="939731" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="f6b73f59f94d091ce2177ebccade24985c48236d" Size="37185762" CompressedSize="9969104" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f6c9862bafeae8b2f923aaa3ff2c507277f53369" Size="4029550" CompressedSize="923542" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
     <Pack Hash="f6d16f0f530dd5ba58d86463f7c06f6f573a6809" Size="6162084" CompressedSize="1526142" RemotePath="UnrealEngine-3806814-f624a67e47784f4686bc261b5bcef57e" />
     <Pack Hash="f6fdc33805bc89e2eaff8003a996f6bf8f880789" Size="2093432" CompressedSize="2085183" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f706e644b9769bdf33f6ea7ae11a33f7fe548fb2" Size="2097098" CompressedSize="595222" RemotePath="UnrealEngine-4034515-6e277ad8b80c41eebf3eee96fcb8b44d" />
     <Pack Hash="f711e5f726ba24358d3196ee61939221d5ecd516" Size="13231754" CompressedSize="2581292" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f7137cf36a0d0e953953caddb27981e830a2b021" Size="4348536" CompressedSize="1013285" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
-    <Pack Hash="f75a3f588b00ae86908c0582b3080a7df7caf0d1" Size="2096987" CompressedSize="1511307" RemotePath="3367711-dc3c12a6d6784615ac3c93e5d77a4464" />
     <Pack Hash="f7982abe00f50f9cd5cc56279bb0068197cc72dd" Size="3226892" CompressedSize="965108" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f7a44be87cd8b2cc22a5c6580998902cd597ffac" Size="2096671" CompressedSize="2066048" RemotePath="2615502-35e684f430004977ab5aaed43a0fab81" />
     <Pack Hash="f7d4e3a2a8bc249ccb2b03cd019f1768f5b1e095" Size="8816347" CompressedSize="5955210" RemotePath="3321770-f9a487bdd60e467b9a438b5715e2646c" />
+    <Pack Hash="f7e03dc89add61310c14a0a55a7130d947f30b53" Size="2096940" CompressedSize="1116586" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f7ff067e31d48918ce41494b39f2f30c48890e55" Size="2097140" CompressedSize="2089606" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="f80e26b871ca67e839319b2d73853f4a74782844" Size="2849074" CompressedSize="828761" RemotePath="3120378-69e89fab0f2240ef8ad5fdbbbc9c04d8" />
     <Pack Hash="f8573348f998752c7a3165b3effd0bc1346c3de5" Size="2008263" CompressedSize="415911" RemotePath="UnrealEngine-4052378-92da179280a0437a8780c12806c617b6" />
     <Pack Hash="f859fcf20b1d5912f1dd1fba6f9bd4393a014968" Size="7446685" CompressedSize="7447280" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
+    <Pack Hash="f875b67db2f667f141649b4c163714295677d4fe" Size="2973616" CompressedSize="786017" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f88bf96d7aa590cde44894fdd85488f888f6b507" Size="6223736" CompressedSize="1899181" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f899821bcaaa82830db1d847bfc1ad884a3fea0a" Size="3145792" CompressedSize="44122" RemotePath="2942850-0dac2574939b4856a4b0f4db931751b9" />
     <Pack Hash="f8a7fca733ca940a07647121bde451787b5afb66" Size="72364650" CompressedSize="72357472" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="f8b398733750c0a3b11e210a5f59c24d24764897" Size="2796052" CompressedSize="896427" RemotePath="2798519-d40574911ab346b3880844999982edd0" />
-    <Pack Hash="f8c33af6876de44d86e7b773e9fecde2b351865d" Size="3213320" CompressedSize="695491" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="f8e8fa651146e1678fb346d6e55c48ff899477dc" Size="3489222" CompressedSize="991453" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f8e968386ad435ce2799d792052fbcc9aa6a2b2a" Size="2097074" CompressedSize="738758" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
-    <Pack Hash="f8f64acfd00a70e31cc1cd9c6cc5ffba4fee1186" Size="3294712" CompressedSize="1189246" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="f8f9d4c3603ef1044cb95c9184fb72df933f6eec" Size="2096576" CompressedSize="537974" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="f905d2a33859b3a7933b110436313c91e02c842b" Size="2095283" CompressedSize="1808973" RemotePath="2713314-834d0f75220a4952a46932b6b9a967ed" />
-    <Pack Hash="f923dfb477de6f5f798a2dda3616085a117b4944" Size="20077904" CompressedSize="3018155" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="f94dd1fce6b009ef99d6996603454a3e52cfe254" Size="1918786" CompressedSize="552857" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
     <Pack Hash="f97beec46284f3742c33b97b86dddf133c97c75b" Size="2097151" CompressedSize="380616" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="f984c4f393a376587f48a24076e62578e975f8ea" Size="251051" CompressedSize="105844" RemotePath="2959226-1c0c786bb6a24aa1b5bd879cce117081" />
@@ -69090,6 +68926,7 @@
     <Pack Hash="f9c7a3708df23796ae26686d70fe67dbcba50a30" Size="2095040" CompressedSize="1205520" RemotePath="3094220-59e13834c31f46ecbaebfd3e87eef600" />
     <Pack Hash="f9f22198459ba7ea6f209f845afcf51decff88da" Size="2186248" CompressedSize="631396" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fa09585b9d6d07f49e9f66b7bc0c064ae5b342ca" Size="2096988" CompressedSize="554133" RemotePath="UnrealEngine-3537460-fc4e9ec63e054c8198c29206bb6442a0" />
+    <Pack Hash="fa17111dbcba7819276fabab00c33aa4ee83c642" Size="3467744" CompressedSize="1027773" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af" Size="8838914" CompressedSize="8839813" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="fa46706927a9be426d4a9e202d324198df62b341" Size="17753466" CompressedSize="4452569" RemotePath="3147801-f415651f647b4861a899c285d0f69963" />
     <Pack Hash="fa48ff18c8bfe5de58cfd0b9f5fc9ff52ec1b1da" Size="87846" CompressedSize="37759" RemotePath="UnrealEngine-4071957-6642e934a7024324b15f91414df34b28" />
@@ -69098,14 +68935,14 @@
     <Pack Hash="faa641df952d93274d1774a37ecd0e58a425c5a1" Size="2096793" CompressedSize="464084" RemotePath="3386123-114c137db15c440eb0400947c008540e" />
     <Pack Hash="fab24c9fc717bc1ed8365b9f715e035c32c8ebdc" Size="70651912" CompressedSize="33583148" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
     <Pack Hash="faba81626c5f860448c791adbafc7b966d456a2f" Size="6003869" CompressedSize="2056008" RemotePath="UnrealEngine-3592632-05a1a0e828ed43e086e4ae40bd8fab5b" />
+    <Pack Hash="fabe7f1fe4532f262e19f4d02f3bbd2922640831" Size="2158814" CompressedSize="522499" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fac312cf3966932ee6b9264f4f44dc533de0fbb0" Size="7638" CompressedSize="6181" RemotePath="UnrealEngine-3912072-aac58f95c02d4a00bb46c4351745990e" />
     <Pack Hash="facdac3a6fac0054fca28cc5b11b8b443ad627a1" Size="574448" CompressedSize="201299" RemotePath="UnrealEngine-3445871-f0b497d816cf48788dd858235135b44d" />
-    <Pack Hash="fadcebeb3100763a9d601eec1133678af498eb7e" Size="6492840" CompressedSize="1884304" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fb0187e8327789c02149729f407e8b9296df854f" Size="2089947" CompressedSize="1061250" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="fb02c7120d9213a6c3a385234eaf0c79a3139a08" Size="20092392" CompressedSize="3025685" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fb0e0575ce45ee50c90ec2c031fe129b20d04171" Size="4171180" CompressedSize="2300385" RemotePath="UnrealEngine-3739980-345e1ed14be84fd08e096eff9c6ff770" />
-    <Pack Hash="fb276d1bd30c33019a2a41af75e8a82e43b80637" Size="2073856" CompressedSize="611455" RemotePath="UnrealEngine-3956398-1363dc58c41347f5a387c742bfab7055" />
     <Pack Hash="fb2d271550cf2328f2473f2dd9d0eb5ebc7b3ea1" Size="9785352" CompressedSize="3068431" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
-    <Pack Hash="fb6c97254ed46f9a902a1e16b54728b30df2e246" Size="4457704" CompressedSize="1304201" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="fb6df148b3c44e09ed57d040766a96f51c03d315" Size="3597482" CompressedSize="1140654" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fb8c31646887718de45e229d7015c658f3c1bf5e" Size="1203408" CompressedSize="509141" RemotePath="2959583-977d76e5aa234158961b9899f6aa7e95" />
     <Pack Hash="fb8ebe167f34171ec9daac6dbc1e041ab037c683" Size="2095096" CompressedSize="621002" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fb96b551213ab47f90dffc83f3198e6a4805425c" Size="12736632" CompressedSize="3047827" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
@@ -69115,14 +68952,12 @@
     <Pack Hash="fbd50b40d8703e6c070b87beb5944fd1e85d8734" Size="2713509" CompressedSize="722329" RemotePath="UnrealEngine-3797951-7d73b1374dd1459f8e1a1a249f115a2b" />
     <Pack Hash="fbdb9ae63da581e831ee32fe26c7298c794ab92b" Size="3116136" CompressedSize="1180615" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
     <Pack Hash="fbe78351a1f05d96d0d5a16012f4716d094cf79a" Size="17637488" CompressedSize="6876062" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
-    <Pack Hash="fbe884f15eb9aa09eff804df47bc754a1feb410a" Size="2097147" CompressedSize="926385" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fc02f20f3a48a87fa9c319f920d914f773f3c27d" Size="2094673" CompressedSize="952130" RemotePath="3174242-d2fb25e44c2043ef8bd6c42c947bda06" />
     <Pack Hash="fc05cba079196fbfcdba916bfb5bdabf1fb28c3a" Size="32374792" CompressedSize="30759609" RemotePath="UnrealEngine-4048194-6f0a9f8941f84382a8820bc4077c981a" />
     <Pack Hash="fc0d9530726591acf53014e111bb603f42dee4d3" Size="5522215" CompressedSize="471607" RemotePath="2913181-e1363296fd6f49f09c16b1eea88caa95" />
     <Pack Hash="fc0fbd54faf52ab886318b7e9f93f8b621517629" Size="6777504" CompressedSize="1761931" RemotePath="3383473-1d8f0edee509476c957d8d56aa3ccfa6" />
-    <Pack Hash="fc1ef76500e0d4533fd8f994f32a7ced60f0c387" Size="7152840" CompressedSize="2227483" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="fc21197f05ffa1e1cb73441cb5cb45012227bfee" Size="2084498" CompressedSize="639821" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fc4098e00456e3c821dd7e28955fab11c1e120f3" Size="9975856" CompressedSize="3555523" RemotePath="3138769-dd6b0d2c308046469786087a206bd33e" />
-    <Pack Hash="fc4e306bfe23934853dd6fbc65c01de0ff164d08" Size="117352420" CompressedSize="30484797" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fc4ed087ef86201a3ebec1afa64f248e73cc08e5" Size="3477491" CompressedSize="741293" RemotePath="UnrealEngine-4077113-4c2215f50e8d41379fd62e54e330c6c1" />
     <Pack Hash="fc71358f88c1a01c32f496b064386dba3145a36a" Size="2097156" CompressedSize="1931035" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="fc72803a9439e161de25108be11e5429ed900f77" Size="2097155" CompressedSize="902154" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -69131,9 +68966,7 @@
     <Pack Hash="fc97754c9af277910c57351443a42a210b2eb8a2" Size="4046300" CompressedSize="1467848" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="fc9d37a2c0ab6854c6b039c509d86b9459982472" Size="2097094" CompressedSize="765510" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
     <Pack Hash="fcaba3584b9391b167f49dfe53afe253623ada36" Size="1019142" CompressedSize="231107" RemotePath="2608258-d12288bf79ea446a9353c7f9d223b24e" />
-    <Pack Hash="fcc5fd64f6086d2453df61b8b5a0f69479bcd341" Size="142197152" CompressedSize="31674970" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fce65b5fc39013f6faf29af457e8c115f1c59385" Size="221350" CompressedSize="208332" RemotePath="UnrealEngine-3943597-8f882631f5064c71a105a985318a3be5" />
-    <Pack Hash="fd05c2b0d7b0ac8c6ca25fb163bb4af2f3dd689d" Size="2507456" CompressedSize="810213" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fd19dc0838ba2d2968565625df88626cec46d728" Size="6228514" CompressedSize="1850702" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
     <Pack Hash="fd441937ce92861563e4bd9e3619d5d9cdf73a55" Size="3046920" CompressedSize="1073473" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="fd44fdad76da5efbaf3bced1a5d2bf12eb028b35" Size="4008266" CompressedSize="1022970" RemotePath="2369826-2acd3c361c9d4a858bd63938a2ab980e" />
@@ -69151,16 +68984,18 @@
     <Pack Hash="fe2fd0043d9dceb3bd974fd46a7f657222f0068f" Size="2052428" CompressedSize="1817097" RemotePath="2616691-982be94b99b442419e99de37630ca843" />
     <Pack Hash="fe34956f65e0611aa1584ca611b7843e22e3e29f" Size="2097143" CompressedSize="863956" RemotePath="2626587-57826ea3374e445babf90481809b6325" />
     <Pack Hash="fe3864d8f78137012c76c1d77ec00fd35bbd8d33" Size="2101768" CompressedSize="905346" RemotePath="UnrealEngine-3851379-9574459699d54a468d422fafe2380ede" />
-    <Pack Hash="fe5b8d0a57a1c463ccee18bf51db4f50e147ef22" Size="5546452" CompressedSize="1076694" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="fe5e83d25df364c56c1fab8532d4cec018ecd8b2" Size="5913756" CompressedSize="1237123" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fe6078495c852c69d53e6d83466c7cb7ba20a43b" Size="2097088" CompressedSize="627629" RemotePath="3383588-bebc82cf05d84ffd8f30f12c3fbaf5fa" />
     <Pack Hash="fe79883294e7b730b4ea0e6e72c662ced28e999b" Size="2097101" CompressedSize="431945" RemotePath="2500002-69b23dcf7a2d4165b2b432780845acb0" />
     <Pack Hash="fe9a5ed8a47afc956a08900be2c30c0821faec0d" Size="2097129" CompressedSize="471860" RemotePath="2636758-e606e606851e4693b1729dd35dcef7ae" />
     <Pack Hash="febd332f49f9423f039b17714b62dba75575a451" Size="3942729" CompressedSize="639651" RemotePath="UnrealEngine-3805644-7d1fcbc34eab4d8092e3295146c2f4e6" />
     <Pack Hash="fecddbf47598e42c13644ce42253e7ca8178eb29" Size="13034661" CompressedSize="13036307" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="fedc0f0de48ecba38365fdabad35ec1857db98d6" Size="2849288" CompressedSize="1218205" RemotePath="UnrealEngine-3600450-c3e3142cd8824d5ea86ce9e428159b08" />
+    <Pack Hash="fedeb6b92cd68c1b456bd58169de4959cccbc676" Size="3201138" CompressedSize="955294" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="fefd1116f76a9f3c382793fff64e04fd99ea07da" Size="7226314" CompressedSize="1523835" RemotePath="3008183-b9dbe24f35d9484c9b34c22c4a83d18f" />
+    <Pack Hash="ff2f8505b3190e6af25135e44fd2fa57f8533112" Size="2097133" CompressedSize="603218" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" Size="2096874" CompressedSize="859882" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
-    <Pack Hash="ff962dd75779d160015d7a57a53e98e44f47d7af" Size="37187274" CompressedSize="9970906" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
+    <Pack Hash="ff8b0e1d418949b27ba049d7ce60d6498fabc73b" Size="4340528" CompressedSize="1321223" RemotePath="UnrealEngine-4091081-936ae275f88a4652a731ced22a6dece0" />
     <Pack Hash="ffe1832c9002fb490bd976e6906fe43792e2e487" Size="2304471" CompressedSize="2304056" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
     <Pack Hash="ffe4b29f6febe2e6345b292bd341aefed751ae1d" Size="507652" CompressedSize="182056" RemotePath="2565979-eaaf2006b54843b69b5280979c12ed6d" />
     <Pack Hash="fff4095031f71891566086a3a9fd62eeb09b7c91" Size="2097159" CompressedSize="767403" RemotePath="UnrealEngine-3903710-c0a431f3a7fa47508c57a1b68a0c1c20" />
diff --git a/Engine/Build/PhysXBuild.xml b/Engine/Build/PhysXBuild.xml
index 29c383a0d851..c5b417832f50 100644
--- a/Engine/Build/PhysXBuild.xml
+++ b/Engine/Build/PhysXBuild.xml
@@ -7,6 +7,7 @@
 	<Option Name="SkipBuild" DefaultValue="false" Description="Skip build"/>
 	<Option Name="SkipCreateChangelist" DefaultValue="false" Description="Whether or not to make a changelist"/>
 	<Option Name="SkipSubmit" DefaultValue="false" Description="Whether or not to submit changelist"/>
+	<Option Name="Robomerge" DefaultValue="Merge" Description="Robomerge action for this build, defaults to Merge"/>
 	<Option Name="TargetLibs" DefaultValue="PhysX+APEX" Description="Target libs"/>
 	<Option Name="TargetConfigs" DefaultValue="profile+release+checked" Description="Target Configs"/>
 	<Option Name="TargetWindowsCompilers" DefaultValue="VisualStudio2015" Description="Target Compilers"/>
@@ -35,6 +36,7 @@
 	<Property Name="OtherArgs" Value="$(OtherArgs) -SkipBuild" If="$(SkipBuild)"/>
 	<Property Name="OtherArgs" Value="$(OtherArgs) -SkipCreateChangelist" If="$(SkipCreateChangelist)"/>
 	<Property Name="OtherArgs" Value="$(OtherArgs) -SkipSubmit" If="$(SkipSubmit)"/>
+	<Property Name="OtherArgs" Value="$(OtherArgs) -Robomerge=$(Robomerge)" If="'$(Robomerge)' != ''"/>
 	
 	<Agent Name="PhysX Win32" Type="EngineWin64;PhysX_CompileWin64;Win64">
 		<Node Name="Compile PhysX Win32">
diff --git a/Engine/Config/Android/AndroidEngine.ini b/Engine/Config/Android/AndroidEngine.ini
index d2ba6f693052..e46ef8cd8aa8 100644
--- a/Engine/Config/Android/AndroidEngine.ini
+++ b/Engine/Config/Android/AndroidEngine.ini
@@ -15,13 +15,15 @@ AudioDeviceModuleName=AndroidAudio
 ; Defining below allows switching to audio mixer using -audiomixer commandline
 AudioMixerModuleName=AudioMixerAndroid
 ; Defines a platform-specific volume headroom (in dB) for audio to provide better platform consistency with respect to volume levels.
-PlatformHeadroomDB=0
+PlatformHeadroomDB=-6
 
 [PlatformMemoryBuckets]
 LargestMemoryBucket_MinGB=8
 LargerMemoryBucket_MinGB=6
 DefaultMemoryBucket_MinGB=4
 SmallerMemoryBucket_MinGB=3
+ ; for now, we require 3gb
+SmallestMemoryBucket_MinGB=3
 
 
 [DeviceProfileManager]
@@ -32,6 +34,8 @@ DefaultProviderName=AndroidAdvertising
 
 [OnlineSubsystem]
 DefaultPlatformService=GooglePlay
+
+[OnlineSubsystemMcp]
 bUseMCPIdentityForPlayerName=true
 
 [SlateRenderer]
@@ -66,5 +70,6 @@ DefaultPlatformService=AndroidLocalNotification
 
 [ConsoleVariables]
 Slate.CacheRenderData=0
+r.VSync=1
 
 ;GalaxyS6Edge=577
diff --git a/Engine/Config/Android/BaseAndroidEngine.ini b/Engine/Config/Android/BaseAndroidEngine.ini
new file mode 100644
index 000000000000..08bb726e6471
--- /dev/null
+++ b/Engine/Config/Android/BaseAndroidEngine.ini
@@ -0,0 +1,2 @@
+[OnlineSubsystem]
+NativePlatformService=GooglePlay
\ No newline at end of file
diff --git a/Engine/Config/BaseDeviceProfiles.ini b/Engine/Config/BaseDeviceProfiles.ini
index 53010bfd86e6..ed342ae32a85 100644
--- a/Engine/Config/BaseDeviceProfiles.ini
+++ b/Engine/Config/BaseDeviceProfiles.ini
@@ -58,7 +58,11 @@
 +DeviceProfileNameAndTypes=Android_Adreno330_Ver53,Android
 +DeviceProfileNameAndTypes=Android_Adreno4xx_Nexus6,Android
 +DeviceProfileNameAndTypes=Android_Adreno4xx,Android
++DeviceProfileNameAndTypes=Android_Adreno5xx,Android
++DeviceProfileNameAndTypes=Android_Adreno6xx,Android
 +DeviceProfileNameAndTypes=Android_PowerVR54x,Android
++DeviceProfileNameAndTypes=Android_PowerVRLow,Android
++DeviceProfileNameAndTypes=Android_PowerVRMid,Android
 +DeviceProfileNameAndTypes=Android_TegraK1,Android
 +DeviceProfileNameAndTypes=Android_Tegra4,Android
 +DeviceProfileNameAndTypes=Android_IntelHD,Android
@@ -274,6 +278,7 @@ BaseProfileName=iPhone7Plus
 [iPhoneX DeviceProfile]
 DeviceType=IOS
 BaseProfileName=iPhone8
++CVars=r.CustomUnsafeZones="(L:free[0,-15][812,15]);(P:fixed[83,0][206,30])"
 
 [iPadPro DeviceProfile]
 DeviceType=IOS
@@ -322,6 +327,8 @@ BaseProfileName=IPadPro97
 
 [/Script/AndroidDeviceProfileSelector.AndroidDeviceProfileMatchingRules]
 MatchProfile=(Profile="Android_PowerVR54x",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="PowerVR SGX 54[0-9]")))
++MatchProfile=(Profile="Android_PowerVRMid",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="PowerVR"),(SourceType=SRC_GlVersion,CompareType=CMP_Regex,MatchString="^OpenGL ES 3\\.")))
++MatchProfile=(Profile="Android_PowerVRLow",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="PowerVR")))
 +MatchProfile=(Profile="Android_Adreno2xx",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="Adreno \\(TM\\) 2[0-9][0-9]")))
 +MatchProfile=(Profile="Android_Adreno320",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Equal,MatchString="Adreno (TM) 320")))
 +MatchProfile=(Profile="Android_Adreno330_Ver53",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Equal,MatchString="Adreno (TM) 330"),(SourceType=SRC_GlVersion,CompareType=CMP_Regex,MatchString="ES 3\\.0 V@([0-9]+)"),(SourceType=SRC_PreviousRegexMatch,CompareType=CMP_GreaterEqual,MatchString="53")))
@@ -330,6 +337,7 @@ MatchProfile=(Profile="Android_PowerVR54x",Match=((SourceType=SRC_GpuFamily,Comp
 +MatchProfile=(Profile="Android_Adreno4xx",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="Adreno \\(TM\\) 4[0-9][0-9]")))
 +MatchProfile=(Profile="Android_Adreno51x",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="Adreno \\(TM\\) 51[0-9]")))
 +MatchProfile=(Profile="Android_Adreno5xx",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="Adreno \\(TM\\) 5[0-9][0-9]")))
++MatchProfile=(Profile="Android_Adreno6xx",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Regex,MatchString="Adreno \\(TM\\) 6[0-9][0-9]")))
 +MatchProfile=(Profile="Android_TegraK1",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Equal,MatchString="NVIDIA Tegra"),(SourceType=SRC_GlVersion,CompareType=CMP_Regex,MatchString="^OpenGL ES 3\\.")))
 +MatchProfile=(Profile="Android_Tegra4",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Equal,MatchString="NVIDIA Tegra"),(SourceType=SRC_GlVersion,CompareType=CMP_Regex,MatchString="^OpenGL ES 2\\.")))
 +MatchProfile=(Profile="Android_IntelHD_ES3",Match=((SourceType=SRC_GpuFamily,CompareType=CMP_Equal,MatchString="Intel(R) HD Graphics"),(SourceType=SRC_GlVersion,CompareType=CMP_Regex,MatchString="^OpenGL ES 3\\.")))
@@ -423,6 +431,12 @@ BaseProfileName=Android_High
 [Android_Adreno5xx DeviceProfile]
 DeviceType=Android
 BaseProfileName=Android_High
++CVars=r.DisjointTimerQueries=1
+
+[Android_Adreno6xx DeviceProfile]
+DeviceType=Android
+BaseProfileName=Android_High
++CVars=r.DisjointTimerQueries=1
 
 [Android_Adreno4xx DeviceProfile]
 DeviceType=Android
@@ -436,6 +450,19 @@ BaseProfileName=Android_Adreno4xx
 DeviceType=Android
 BaseProfileName=Android_Mid
 +CVars=r.Mobile.ForceDepthResolve=1
++CVars=r.Android.DisableASTCSupport=1
+
+[Android_PowerVRMid DeviceProfile]
+DeviceType=Android
+BaseProfileName=Android_Mid
++CVars=r.Mobile.ForceDepthResolve=1
++CVars=r.Android.DisableASTCSupport=1
+
+[Android_PowerVRLow DeviceProfile]
+DeviceType=Android
+BaseProfileName=Android_Low
++CVars=r.Mobile.ForceDepthResolve=1
++CVars=r.Android.DisableASTCSupport=1
 
 [Android_IntelHD DeviceProfile]
 DeviceType=Android
diff --git a/Engine/Config/BaseEditor.ini b/Engine/Config/BaseEditor.ini
index 41a13fbc8a2a..8187608624f0 100644
--- a/Engine/Config/BaseEditor.ini
+++ b/Engine/Config/BaseEditor.ini
@@ -40,6 +40,7 @@ MaxNumberOfLogLines=2000
 +RenderableThumbnailTypes=(ClassNeedingThumbnailName="/Script/Engine.SlateBrushAsset",RendererClassName="/Script/UnrealEd.SlateBrushThumbnailRenderer")
 +RenderableThumbnailTypes=(ClassNeedingThumbnailName="/Script/Engine.SubsurfaceProfile",RendererClassName="/Script/UnrealEd.SubsurfaceProfileRenderer")
 +RenderableThumbnailTypes=(ClassNeedingThumbnailName="/Script/Engine.PhysicsAsset",RendererClassName="/Script/UnrealEd.PhysicsAssetThumbnailRenderer")
++RenderableThumbnailTypes=(ClassNeedingThumbnailName="/Script/Engine.CurveLinearColor",RendererClassName="/Script/UnrealEd.CurveLinearColorThumbnailRenderer")
 
 [/Script/UnrealEd.DefaultSizedThumbnailRenderer]
 DefaultSizeX=512
diff --git a/Engine/Config/BaseEditorPerProjectUserSettings.ini b/Engine/Config/BaseEditorPerProjectUserSettings.ini
index a2a68570a85b..5634572f5ed9 100644
--- a/Engine/Config/BaseEditorPerProjectUserSettings.ini
+++ b/Engine/Config/BaseEditorPerProjectUserSettings.ini
@@ -71,19 +71,21 @@ MapSkeletalMotionToRoot=False
 
 [/Script/EditorStyle.EditorStyleSettings]
 ; Applies a color vision deficiency filter to the entire editor
-ColorVisionDeficiencyType=CVD_NormalVision
+ColorVisionDeficiencyPreviewType=NormalVision
+ColorVisionDeficiencySeverity=3
+
 
 SelectionColor=(R=0.728f,G=0.364f,B=0.003f,A=1.000000)
 PressedSelectionColor=(R=0.701f,G=0.225f,B=0.003f,A=1.000000)
 InactiveSelectionColor=(R=0.25f,G=0.25f,B=0.25f,A=1.000000)
 SelectorColor=(R=0.701f,G=0.225f,B=0.003f,A=1.000000)
 
-LogBackgroundColor=(R=0.047059,G=0.047059,B=0.047059,A=1.000000)
-LogSelectionBackgroundColor=(R=0.132868,G=0.132868,B=0.132868,A=1.000000)
+LogBackgroundColor=(R=0.015996,G=0.015996,B=0.015996,A=1.000000)
+LogSelectionBackgroundColor=(R=0.008023,G=0.008023,B=0.008023,A=1.000000)
 LogNormalColor=(R=0.72,G=0.72,B=0.72,A=1.000000)
 LogCommandColor=(R=0.033105,G=0.723055,B=0.033105,A=1.000000)
-LogWarningColor=(R=0.496933,G=0.496933,B=0.057805,A=1.000000)
-LogErrorColor=(R=0.723055,G=0.000000,B=0.000000,A=1.000000)
+LogWarningColor=(R=0.921875,G=0.691406,B=0.000000,A=1.000000)
+LogErrorColor=(R=1.000000,G=0.052083,B=0.060957,A=1.000000)
 LogFontSize=9
 
 ; If true, all toolbars will use small icons without labels
@@ -216,50 +218,64 @@ LastExecutedLaunchModeType=LaunchMode_OnDevice
 LastExecutedLaunchPlatform=
 
 ; common screen resolutions for laptops
-+LaptopScreenResolutions=(Description="Apple MacBook Air 11",Width=1366,Height=768,AspectRatio="16:9")
-+LaptopScreenResolutions=(Description="Apple MacBook Air 13\"",Width=1440,Height=900,AspectRatio="16:10")
-+LaptopScreenResolutions=(Description="Apple MacBook Pro 13\"",Width=1280,Height=800,AspectRatio="16:10")
-+LaptopScreenResolutions=(Description="Apple MacBook Pro 13\" (Retina)",Width=2560,Height=1600,AspectRatio="16:10")
-+LaptopScreenResolutions=(Description="Apple MacBook Pro 15\"",Width=1440,Height=900,AspectRatio="16:10")
-+LaptopScreenResolutions=(Description="Apple MacBook Pro 15\" (Retina)",Width=2880,Height=1800,AspectRatio="16:10")
-+LaptopScreenResolutions=(Description="Generic 14-15.6\" Notebook",Width=1366,Height=768,AspectRatio="16:9")
++LaptopScreenResolutions=(Description="Apple MacBook Air 11",Width=1366,Height=768,AspectRatio="16:9",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Apple MacBook Air 13\"",Width=1440,Height=900,AspectRatio="16:10",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Apple MacBook Pro 13\"",Width=1280,Height=800,AspectRatio="16:10",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Apple MacBook Pro 13\" (Retina)",Width=2560,Height=1600,AspectRatio="16:10",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Apple MacBook Pro 15\"",Width=1440,Height=900,AspectRatio="16:10",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Apple MacBook Pro 15\" (Retina)",Width=2880,Height=1800,AspectRatio="16:10",bCanSwapAspectRatio=false)
++LaptopScreenResolutions=(Description="Generic 14-15.6\" Notebook",Width=1366,Height=768,AspectRatio="16:9",bCanSwapAspectRatio=false)
 
 ; common screen resolutions for desktop monitors
-+MonitorScreenResolutions=(Description="19\" monitor",Width=1440,Height=900,AspectRatio="16:10")
-+MonitorScreenResolutions=(Description="20\" monitor",Width=1600,Height=900,AspectRatio="16:9")
-+MonitorScreenResolutions=(Description="22\" monitor",Width=1680,Height=1050,AspectRatio="16:10")
-+MonitorScreenResolutions=(Description="21.5-24\" monitor",Width=1920,Height=1080,AspectRatio="16:9")
-+MonitorScreenResolutions=(Description="27\" monitor",Width=2560,Height=1440,AspectRatio="16:9")
++MonitorScreenResolutions=(Description="19\" monitor",Width=1440,Height=900,AspectRatio="16:10",bCanSwapAspectRatio=false)
++MonitorScreenResolutions=(Description="20\" monitor",Width=1600,Height=900,AspectRatio="16:9",bCanSwapAspectRatio=false)
++MonitorScreenResolutions=(Description="22\" monitor",Width=1680,Height=1050,AspectRatio="16:10",bCanSwapAspectRatio=false)
++MonitorScreenResolutions=(Description="21.5-24\" monitor",Width=1920,Height=1080,AspectRatio="16:9",bCanSwapAspectRatio=false)
++MonitorScreenResolutions=(Description="27\" monitor",Width=2560,Height=1440,AspectRatio="16:9",bCanSwapAspectRatio=false)
 
 ; common screen resolutions for mobile phones
-+PhoneScreenResolutions=(Description="Apple iPhone 4, 4S, iTouch 4 (Portrait)",Width=640,Height=960,AspectRatio="2:3")
-+PhoneScreenResolutions=(Description="Apple iPhone 4, 4S, iTouch 4 (Landscape)",Width=960,Height=640,AspectRatio="3:2")
-+PhoneScreenResolutions=(Description="Apple iPhone 5, 5S, iTouch 5 (Portrait)",Width=640,Height=1136,AspectRatio="~9:16")
-+PhoneScreenResolutions=(Description="Apple iPhone 5, 5S, iTouch 5 (Landscape)",Width=1136,Height=640,AspectRatio="~16:9")
-+PhoneScreenResolutions=(Description="Apple iPhone 6 (Portrait)",Width=750,Height=1334,AspectRatio="16:9")
-+PhoneScreenResolutions=(Description="Apple iPhone 6 (Landscape)",Width=1334,Height=750,AspectRatio="16:9")
-+PhoneScreenResolutions=(Description="Apple iPhone 6+ (Portrait)",Width=1080,Height=1920,AspectRatio="16:9")
-+PhoneScreenResolutions=(Description="Apple iPhone 6+ (Landscape)",Width=1920,Height=1080,AspectRatio="16:9")
-+PhoneScreenResolutions=(Description="HTC One (Portrait)",Width=1080,Height=1920,AspectRatio="9:16")
-+PhoneScreenResolutions=(Description="HTC One (Landscape)",Width=1920,Height=1080,AspectRatio="16:9")
-+PhoneScreenResolutions=(Description="Samsung Galaxy S4 (Portrait)",Width=1080,Height=1920,AspectRatio="9:16")
-+PhoneScreenResolutions=(Description="Samsung Galaxy S4 (Landscape)",Width=1920,Height=1080,AspectRatio="16:9")
++PhoneScreenResolutions=(Description="Apple iPhone 5S",Width=320,Height=568,AspectRatio="~16:9",bCanSwapAspectRatio=true,ProfileName="iPhone5S")
++PhoneScreenResolutions=(Description="Apple iPhone 6",Width=375,Height=667,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone6")
++PhoneScreenResolutions=(Description="Apple iPhone 6+",Width=414,Height=736,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone6Plus")
++PhoneScreenResolutions=(Description="Apple iPhone 6S",Width=375,Height=667,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone6S")
++PhoneScreenResolutions=(Description="Apple iPhone 6S+",Width=414,Height=736,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone6SPlus")
++PhoneScreenResolutions=(Description="Apple iPhone 7",Width=375,Height=667,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone7")
++PhoneScreenResolutions=(Description="Apple iPhone 7+",Width=414,Height=736,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone7Plus")
++PhoneScreenResolutions=(Description="Apple iPhone 8",Width=375,Height=667,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone8")
++PhoneScreenResolutions=(Description="Apple iPhone 8+",Width=414,Height=736,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="iPhone8Plus")
++PhoneScreenResolutions=(Description="Apple iPhone X",Width=375,Height=812,AspectRatio="19.5:9",bCanSwapAspectRatio=true,ProfileName="iPhoneX")
++PhoneScreenResolutions=(Description="HTC One",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_High")
++PhoneScreenResolutions=(Description="Samsung Galaxy S4",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Low")
++PhoneScreenResolutions=(Description="Samsung Galaxy S6",Width=1440,Height=2560,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mali_T7xx")
++PhoneScreenResolutions=(Description="Samsung Galaxy S7",Width=1440,Height=2560,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_High")
++PhoneScreenResolutions=(Description="Samsung Galaxy S8 (Mali)",Width=1080,Height=2220,AspectRatio="18.5:9",bCanSwapAspectRatio=true,ProfileName="Android_Mali_G71")
++PhoneScreenResolutions=(Description="Samsung Galaxy S8 (Adreno)",Width=1080,Height=2220,AspectRatio="18.5:9",bCanSwapAspectRatio=true,ProfileName="Android_Adreno5xx")
++PhoneScreenResolutions=(Description="Samsung Galaxy S9 (Mali)",Width=1440,Height=2960,AspectRatio="18.5:9",bCanSwapAspectRatio=true,ProfileName="Android_High")
++PhoneScreenResolutions=(Description="Samsung Galaxy S9 (Adreno)",Width=1440,Height=2960,AspectRatio="18.5:9",bCanSwapAspectRatio=true,ProfileName="Android_High")
++PhoneScreenResolutions=(Description="Google Pixel",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mid")
++PhoneScreenResolutions=(Description="Google Pixel XL",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mid")
++PhoneScreenResolutions=(Description="Google Pixel 2",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mid")
++PhoneScreenResolutions=(Description="Google Pixel 2 XL",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mid")
++PhoneScreenResolutions=(Description="Razer Phone",Width=1080,Height=1920,AspectRatio="16:9",bCanSwapAspectRatio=true,ProfileName="Android_Mid")
 
 ; common screen resolutions for tablet devices
-+TabletScreenResolutions=(Description="Apple iPad 2, iPad Mini (Portrait)",Width=768,Height=1024,AspectRatio="~3:4")
-+TabletScreenResolutions=(Description="Apple iPad 2, iPad Mini (Landscape)",Width=1024,Height=768,AspectRatio="~4:3")
-+TabletScreenResolutions=(Description="Apple iPad 3, 4, Air (Portrait)",Width=1536,Height=2048,AspectRatio="3:4")
-+TabletScreenResolutions=(Description="Apple iPad 3, 4, Air (Landscape)",Width=2048,Height=1536,AspectRatio="4:3")
-+TabletScreenResolutions=(Description="Microsoft Surface RT (Portrait)",Width=768,Height=1366,AspectRatio="9:16")
-+TabletScreenResolutions=(Description="Microsoft Surface RT (Landscape)",Width=1366,Height=768,AspectRatio="16:9")
-+TabletScreenResolutions=(Description="Microsoft Surface Pro (Portrait)",Width=1080,Height=1920,AspectRatio="9:16")
-+TabletScreenResolutions=(Description="Microsoft Surface Pro (Landscape)",Width=1920,Height=1080,AspectRatio="16:9")
++TabletScreenResolutions=(Description="iPad Pro 12.9-inch (2nd gen.)",Width=1024,Height=1366,AspectRatio="~3:4",bCanSwapAspectRatio=true,ProfileName="iPadPro2_129")
++TabletScreenResolutions=(Description="iPad Pro 10.5-inch",Width=834,Height=1112,AspectRatio="3:4",bCanSwapAspectRatio=true,ProfileName="iPadPro105")
++TabletScreenResolutions=(Description="iPad Pro 12.9-inch",Width=1024,Height=1366,AspectRatio="3:4",bCanSwapAspectRatio=true,ProfileName="iPadPro129")
++TabletScreenResolutions=(Description="iPad Pro 9.7-inch",Width=768,Height=1024,AspectRatio="3:4",bCanSwapAspectRatio=true,ProfileName="iPadPro97")
++TabletScreenResolutions=(Description="iPad Air 2",Width=768,Height=1024,AspectRatio="3:4",bCanSwapAspectRatio=true,ProfileName="iPadAir2")
++TabletScreenResolutions=(Description="iPad Mini 4",Width=768,Height=1024,AspectRatio="3:4",bCanSwapAspectRatio=true,ProfileName="iPadMini4")
++TabletScreenResolutions=(Description="LG G Pad X 8.0",Width=768,Height=1366,AspectRatio="9:16",bCanSwapAspectRatio=true)
++TabletScreenResolutions=(Description="Asus Zenpad 3s 10",Width=768,Height=1366,AspectRatio="9:16",bCanSwapAspectRatio=true)
++TabletScreenResolutions=(Description="Huawei MediaPad M3",Width=768,Height=1366,AspectRatio="9:16",bCanSwapAspectRatio=true)
++TabletScreenResolutions=(Description="Microsoft Surface RT",Width=768,Height=1366,AspectRatio="9:16",bCanSwapAspectRatio=true)
++TabletScreenResolutions=(Description="Microsoft Surface Pro",Width=1080,Height=1920,AspectRatio="9:16",bCanSwapAspectRatio=true)
 
 ; common screen resolutions for television sets
-+TelevisionScreenResolutions=(Description="720p (HDTV, Blu-ray)",Width=1280,Height=720,AspectRatio="16:9")
-+TelevisionScreenResolutions=(Description="1080i, 1080p (HDTV, Blu-ray)",Width=1920,Height=1080,AspectRatio="16:9")
-+TelevisionScreenResolutions=(Description="4K Ultra HD",Width=3840,Height=2160,AspectRatio="16:9")
-+TelevisionScreenResolutions=(Description="4K Digital Cinema",Width=4096,Height=2160,AspectRatio="1.90:1")
++TelevisionScreenResolutions=(Description="720p (HDTV, Blu-ray)",Width=1280,Height=720,AspectRatio="16:9",bCanSwapAspectRatio=false)
++TelevisionScreenResolutions=(Description="1080i, 1080p (HDTV, Blu-ray)",Width=1920,Height=1080,AspectRatio="16:9",bCanSwapAspectRatio=false)
++TelevisionScreenResolutions=(Description="4K Ultra HD",Width=3840,Height=2160,AspectRatio="16:9",bCanSwapAspectRatio=false)
++TelevisionScreenResolutions=(Description="4K Digital Cinema",Width=4096,Height=2160,AspectRatio="1.90:1",bCanSwapAspectRatio=false)
 
 
 [/Script/UnrealEd.LevelEditorViewportSettings]
diff --git a/Engine/Config/BaseEditorSettings.ini b/Engine/Config/BaseEditorSettings.ini
index 23168f8fd5fc..c38363cb8beb 100644
--- a/Engine/Config/BaseEditorSettings.ini
+++ b/Engine/Config/BaseEditorSettings.ini
@@ -34,6 +34,12 @@ DisplayCppFolders=True
 DisplayPluginFolder=True
 ; The number of objects to keep in the Content Browser Recently Opened filter 
 NumObjectsInRecentList = 20
+; Whether to consider an asset's class name when searching by text
+IncludeClassNames=True
+; Whether to include all parts of an asset's path when searching by text
+IncludeAssetPaths=False
+; Whether to include collection names when searching by text
+IncludeCollectionNames=True
 
 [/Script/IntroTutorials.EditorTutorialSettings]
 +Categories=(Identifier="Basics",Title=NSLOCTEXT("TutorialCategories","BasicsTitle","Basics"),Description=NSLOCTEXT("TutorialCategories","BasicsDescription","Getting started with Unreal Engine 4."),Icon="PlayWorld.RepeatLastPlay",Texture=None,SortOrder=100)
diff --git a/Engine/Config/BaseEngine.ini b/Engine/Config/BaseEngine.ini
index a6c95f40bb4b..efe456d1030f 100644
--- a/Engine/Config/BaseEngine.ini
+++ b/Engine/Config/BaseEngine.ini
@@ -43,6 +43,8 @@ LargestMemoryBucket_MinGB=32
 LargerMemoryBucket_MinGB=12
 DefaultMemoryBucket_MinGB=8
 SmallerMemoryBucket_MinGB=6
+; if SmallestMemoryBucket_MinGB is set, then the engine will throw up an error and exit(0) if the device has less
+SmallestMemoryBucket_MinGB=0
 
 [/Script/Engine.Engine]
 ConsoleClassName=/Script/Engine.Console
@@ -171,6 +173,7 @@ LightingOnlyBrightness=(R=0.3,G=0.3,B=0.3,A=1.0)
 +HLODColorationColors=(R=0.5,G=0.5,B=0.5,A=1.0) ; grey
 MaxPixelShaderAdditiveComplexityCount=2000
 MaxES2PixelShaderAdditiveComplexityCount=600
+MaxES3PixelShaderAdditiveComplexityCount=800
 bSubtitlesEnabled=True
 bSubtitlesForcedOff=false
 DefaultSoundName=/Engine/EngineSounds/WhiteNoise.WhiteNoise
@@ -556,6 +559,9 @@ bUseStreamingPause=false
 +FunctionRedirects=(OldName="NavigationSystemV1.SimpleMoveToActor",NewName="AIBlueprintHelperLibrary.SimpleMoveToActor")
 +FunctionRedirects=(OldName="NavigationSystemV1.SimpleMoveToLocation",NewName="AIBlueprintHelperLibrary.SimpleMoveToLocation")
 
++PropertyRedirects=(OldName="UserWidget.bCanEverTick", NewName="bHasScriptImplementedTick")
++PropertyRedirects=(OldName="UserWidget.bCanEverPaint", NewName="bHasScriptImplementedPaint")
+
 +PropertyRedirects=(OldName="MovieScene.FrameResolution",NewName="TickResolution")
 +PropertyRedirects=(OldName="MovieScene.PlayRate",NewName="DisplayRate")
 +ClassRedirects=(OldName="/Script/MovieSceneCapture.AutomatedLevelSequenceCapture", NewName="/Script/MovieSceneTools.AutomatedLevelSequenceCapture")
@@ -564,7 +570,6 @@ bUseStreamingPause=false
 +ClassRedirects=(OldName="/Script/AssetScriptingUtilities.SkeletalMeshUtilitiesLibrary", NewName="/Script/EditorScriptingUtilities.EditorSkeletalMeshLibrary")
 +FunctionRedirects=(OldName="StaticMeshUtilitiesLibrary.GetLODScreenSizes",NewName="EditorStaticMeshLibrary.GetLodScreenSizes")
 
-
 [CoreUObject.Metadata]
 ; Note: UnrealHeaderTool should be rerun after making changes to MetadataRedirects to catch any keys specified in class headers
 +MetadataRedirects=(OldKey="K2Protected", NewKey="BlueprintProtected")
@@ -941,6 +946,13 @@ WorkerTimeToLive=20
 ; For build machines, wait this many seconds before exiting an unused worker (float value)
 BuildWorkerTimeToLive=1200
 
+; These values are for build machines only currently to reduce the number of SCWs spawned to reduce memory pressure
+bUseVirtualCores = False
+CookerMemoryUsedInGB = 49
+MemoryToLeaveForTheOSInGB = 3
+MemoryUsedPerSCWProcessInGB = 0.4
+
+
 [DevOptions.Debug]
 ShowSelectedLightmap=False
 
@@ -1127,6 +1139,8 @@ MaxLocalTalkers=1
 MaxRemoteTalkers=16
 bUseBuildIdOverride=false
 BuildIdOverride=0
+
+[OnlineSubsystemMcp.OnlinePartyMcp]
 PartyPendingCreateResponseTimeout=0.0
 PartyPendingJoinResponseTimeout=5.0
 PartyPendingLeaveResponseTimeout=5.0
@@ -1170,11 +1184,12 @@ RedirectPort=9001
 
 [OnlineSubsystemFacebook]
 bEnabled=false
+APIVer="v2.12"
 
 [OnlineSubsystemFacebook.OnlineIdentityFacebook]
-LoginUrl="https://www.facebook.com/v2.8/dialog/oauth"
+LoginUrl="https://www.facebook.com/`ver/dialog/oauth"
 LoginRedirectUrl="https://www.facebook.com/connect/login_success.html"
-MeURL="https://graph.facebook.com/v2.8/me?access_token=`token"
+MeURL="https://graph.facebook.com/`ver/me?access_token=`token"
 +LoginDomains=".facebook.com"
 bUsePopup=false
 ProfileFields=locale
@@ -1182,10 +1197,10 @@ ProfileFields=locale
 +ProfileFields=gender
 
 [OnlineSubsystemFacebook.OnlineSharingFacebook]
-PermissionsURL="https://graph.facebook.com/v2.8/me/permissions?access_token=`token"
+PermissionsURL="https://graph.facebook.com/`ver/me/permissions?access_token=`token"
 
 [OnlineSubsystemFacebook.OnlineFriendsFacebook]
-FriendsUrl="https://graph.facebook.com/v2.8/me/friends?fields=`fields&access_token=`token"
+FriendsUrl="https://graph.facebook.com/`ver/me/friends?fields=`fields&access_token=`token"
 FriendsFields=locale
 +FriendsFields=link
 +FriendsFields=gender
@@ -1659,6 +1674,7 @@ bTreatRemoteAsSeparateController=False
 bAllowRemoteRotation=True
 bUseRemoteAsVirtualJoystick=True
 bUseAbsoluteDpadValues=False
+bAllowControllers=True
 bGeneratedSYMFile=False
 bDisableHTTPS=false
 bUseRSync=True
@@ -1706,6 +1722,7 @@ VersionDisplayName=1.0
 MinSDKVersion=9
 TargetSDKVersion=9
 bEnableGradle=true
+bEnableLint=false
 bShowLaunchImage=true
 bValidateTextureFormats=true
 bMultiTargetFormat_ETC1=true
@@ -1725,6 +1742,8 @@ bEnableNewKeyboard=False
 bAndroidVoiceEnabled=false
 bBuildWithHiddenSymbolVisibility=false
 bSaveSymbols=false
+bAllowControllers=True
+bAllowIMU=True
 
 [/Script/AndroidPlatformEditor.AndroidSDKSettings]
 SDKAPILevel=latest
@@ -1918,10 +1937,10 @@ OnScreenDebugMessagesBind=(Key=Tab,bShift=False,bCtrl=True,bAlt=False,bCmd=False
 GameHUDBind=(Key=Tilde,bShift=False,bCtrl=True,bAlt=False,bCmd=False)
 
 [/Script/Engine.SkeletalMeshLODSettings]
-+LODGroups=(ScreenSize=1.0,ReductionSettings=(NumOfTrianglesPercentage=.5))
-+LODGroups=(ScreenSize=.3,ReductionSettings=(NumOfTrianglesPercentage=.25))
-+LODGroups=(ScreenSize=.15,ReductionSettings=(NumOfTrianglesPercentage=.125))
-+LODGroups=(ScreenSize=.1,ReductionSettings=(NumOfTrianglesPercentage=.06))
++LODGroups=(ScreenSize=(Default=1.0,PerPlatform=()),ReductionSettings=(NumOfTrianglesPercentage=.5))
++LODGroups=(ScreenSize=(Default=.3,PerPlatform=()),ReductionSettings=(NumOfTrianglesPercentage=.25))
++LODGroups=(ScreenSize=(Default=.15,PerPlatform=()),ReductionSettings=(NumOfTrianglesPercentage=.125))
++LODGroups=(ScreenSize=(Default=.1,PerPlatform=()),ReductionSettings=(NumOfTrianglesPercentage=.06))
 
 [/Script/CinematicCamera.CineCameraComponent]
 +FilmbackPresets=(Name="16:9 Film",FilmbackSettings=(SensorWidth=24.892,SensorHeight=14.002))
diff --git a/Engine/Config/BaseGame.ini b/Engine/Config/BaseGame.ini
index 10b2c204a655..3e3c2e249dc0 100644
--- a/Engine/Config/BaseGame.ini
+++ b/Engine/Config/BaseGame.ini
@@ -70,6 +70,27 @@ bSharedMaterialNativeLibraries=False
 bShareMaterialShaderCode=False
 bSkipMovies=False
 
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.icu
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.brk
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.res
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.nrm
++EarlyDownloaderPakFileFiles=...\Content\Internationalization\...\*.cfu
++EarlyDownloaderPakFileFiles=...\Content\Localization\...\*.*
++EarlyDownloaderPakFileFiles=...\Content\Localization\*.*
++EarlyDownloaderPakFileFiles=...\Content\Certificates\...\*.*
++EarlyDownloaderPakFileFiles=...\Content\Certificates\*.*
+; have special cased game localization so that it's not required for early pak file
++EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\...\*.*
++EarlyDownloaderPakFileFiles=-...\Content\Localization\Game\*.*
++EarlyDownloaderPakFileFiles=...\Config\...\*.ini
++EarlyDownloaderPakFileFiles=...\Config\*.ini
++EarlyDownloaderPakFileFiles=...\Engine\GlobalShaderCache*.bin
++EarlyDownloaderPakFileFiles=...\Content\ShaderArchive-Global-*.ushaderbytecode
++EarlyDownloaderPakFileFiles=...\Content\Slate\*.*
++EarlyDownloaderPakFileFiles=...\Content\Slate\...\*.*
++EarlyDownloaderPakFileFiles=...\*.upluginmanifest
++EarlyDownloaderPakFileFiles=...\*.uproject
++EarlyDownloaderPakFileFiles=...\global_sf*.metalmap
 
 [/Script/Engine.HUD]
 DebugDisplay=AI
diff --git a/Engine/Config/BaseScalability.ini b/Engine/Config/BaseScalability.ini
index b39d18039626..10a0553cf91a 100644
--- a/Engine/Config/BaseScalability.ini
+++ b/Engine/Config/BaseScalability.ini
@@ -116,6 +116,7 @@ r.Shadow.CSM.TransitionScale=0.8
 r.Shadow.PreShadowResolutionFactor=0.5
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
+r.AOQuality=1
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=16
 r.VolumetricFog.GridSizeZ=64
@@ -135,6 +136,7 @@ r.Shadow.CSM.TransitionScale=1.0
 r.Shadow.PreShadowResolutionFactor=1.0
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
+r.AOQuality=2
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=8
 r.VolumetricFog.GridSizeZ=128
@@ -154,6 +156,7 @@ r.Shadow.CSM.TransitionScale=1.0
 r.Shadow.PreShadowResolutionFactor=1.0
 r.DistanceFieldShadowing=1
 r.DistanceFieldAO=1
+r.AOQuality=2
 r.VolumetricFog=1
 r.VolumetricFog.GridPixelSize=4
 r.VolumetricFog.GridSizeZ=128
@@ -323,7 +326,8 @@ r.DOF.Kernel.MaxBackgroundRadius=0.025
 ; Must be used with r.streaming.usepertexturebias set to 1. Otherwise, all textures will have a constant 16 mip bias
 r.Streaming.MipBias=16
 r.Streaming.AmortizeCPUToGPUCopy=1
-r.Streaming.MaxNumTexturesToStreamPerFrame=2
+r.Streaming.MaxNumTexturesToStreamPerFrame=1
+r.Streaming.Boost=0.3
 r.MaxAnisotropy=0
 r.Streaming.LimitPoolSizeToVRAM=1
 r.Streaming.PoolSize=1000
@@ -333,6 +337,7 @@ r.Streaming.MaxEffectiveScreenSize=0
 r.Streaming.MipBias=1
 r.Streaming.AmortizeCPUToGPUCopy=0
 r.Streaming.MaxNumTexturesToStreamPerFrame=0
+r.Streaming.Boost=1
 r.MaxAnisotropy=2
 r.Streaming.LimitPoolSizeToVRAM=1
 r.Streaming.PoolSize=2000
@@ -342,6 +347,7 @@ r.Streaming.MaxEffectiveScreenSize=0
 r.Streaming.MipBias=0
 r.Streaming.AmortizeCPUToGPUCopy=0
 r.Streaming.MaxNumTexturesToStreamPerFrame=0
+r.Streaming.Boost=1
 r.MaxAnisotropy=4
 r.Streaming.LimitPoolSizeToVRAM=1
 r.Streaming.PoolSize=3000
@@ -351,6 +357,7 @@ r.Streaming.MaxEffectiveScreenSize=0
 r.Streaming.MipBias=0
 r.Streaming.AmortizeCPUToGPUCopy=0
 r.Streaming.MaxNumTexturesToStreamPerFrame=0
+r.Streaming.Boost=1
 r.MaxAnisotropy=8
 r.Streaming.LimitPoolSizeToVRAM=0
 r.Streaming.PoolSize=3000
@@ -360,6 +367,7 @@ r.Streaming.MaxEffectiveScreenSize=0
 r.Streaming.MipBias=0
 r.Streaming.AmortizeCPUToGPUCopy=0
 r.Streaming.MaxNumTexturesToStreamPerFrame=0
+r.Streaming.Boost=1
 r.MaxAnisotropy=8
 r.Streaming.LimitPoolSizeToVRAM=0
 r.Streaming.PoolSize=3000
diff --git a/Engine/Config/ConsoleVariables.ini b/Engine/Config/ConsoleVariables.ini
index 45a844240696..73129b952a93 100644
--- a/Engine/Config/ConsoleVariables.ini
+++ b/Engine/Config/ConsoleVariables.ini
@@ -1,7 +1,7 @@
 ; ConsoleVariables.ini
 ;
 ; Why we have this file:
-;  A developer can change it locally to save time not having to type repetitive console variable settings. 
+;  A developer can change it locally to save time not having to type repetitive console variable settings.
 ;  This file should be in the source control database (for the comments and to know where to find it) but kept empty expect from comments.
 ;
 ; Details:
diff --git a/Engine/Config/IOS/BaseIOSEngine.ini b/Engine/Config/IOS/BaseIOSEngine.ini
new file mode 100644
index 000000000000..7a8cc02b236f
--- /dev/null
+++ b/Engine/Config/IOS/BaseIOSEngine.ini
@@ -0,0 +1,2 @@
+[OnlineSubsystem]
+NativePlatformService=IOS
\ No newline at end of file
diff --git a/Engine/Config/IOS/IOSEngine.ini b/Engine/Config/IOS/IOSEngine.ini
index d557e15c652b..bf0a3d04a40d 100644
--- a/Engine/Config/IOS/IOSEngine.ini
+++ b/Engine/Config/IOS/IOSEngine.ini
@@ -17,11 +17,12 @@ AudioDeviceModuleName=IOSAudio
 AudioMixerModuleName=AudioMixerAudioUnit
 
 ; Defines a platform-specific volume headroom (in dB) for audio to provide better platform consistency with respect to volume levels.
-PlatformHeadroomDB=0
+PlatformHeadroomDB=-6
 
 [PlatformMemoryBuckets]
 DefaultMemoryBucket_MinGB=4
 SmallerMemoryBucket_MinGB=3
+SmallestMemoryBucket_MinGB=2
 
 [OnlineSubsystem]
 DefaultPlatformService=MCP
@@ -49,7 +50,7 @@ DefaultPlatformService=IOSLocalNotification
 [ConsoleVariables]
 Slate.CacheRenderData=0
 r.AllowOcclusionQueries=0
-r.Streaming.FramesForFullUpdate=30
+Fort.Scalability.InGameTextureStreamingFramesForFullUpdate=30
 
 [TextureStreaming]
 ; PoolSizeVRAMPercentage is how much percentage of GPU Dedicated VRAM should be used as a TexturePool cache for streaming textures (0 - unlimited streaming)
diff --git a/Engine/Extras/LLDBDataFormatters/UE4DataFormatters.py b/Engine/Extras/LLDBDataFormatters/UE4DataFormatters.py
index 5fea53be3b15..389c90310c2c 100644
--- a/Engine/Extras/LLDBDataFormatters/UE4DataFormatters.py
+++ b/Engine/Extras/LLDBDataFormatters/UE4DataFormatters.py
@@ -487,10 +487,10 @@ class UE4SetSynthProvider:
             HasObject = 0
             if self.SecondaryDataDataVal > 0:
                 Expr = '(bool)((((int*)'+str(self.SecondaryDataDataVal)+')['+str(index)+'/32] >> '+str(index)+') & 1)'
-                HasObject = self.AllocationFlagsSecondaryDataData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
+                HasObject = 1 ##self.AllocationFlagsSecondaryDataData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
             else:
                 Expr = '(bool)((((int*)'+str(self.AllocationFlagsInlineDataAddr)+')['+str(index)+'/32] >> '+str(index)+') & 1)'
-                HasObject = self.AllocationFlagsInlineData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
+                HasObject = 1 ##self.AllocationFlagsInlineData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
 
             if HasObject == 1:
                 return self.AllocatorInstanceData.CreateChildAtOffset('['+str(index)+']',offset,self.ElementType)
@@ -577,12 +577,12 @@ class UE4MapSynthProvider:
         try:
             offset = index * self.ElementTypeSize
             HasObject = 0
-            if self.SecondaryDataDataVal > 0:
+            if self.SecondaryDataDataVal != 0:
                 Expr = '(bool)((((unsigned int*)'+str(self.SecondaryDataDataVal)+')['+str(index)+'/32] >> '+str(index)+') & 1)'
-                HasObject = self.AllocationFlagsSecondaryDataData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
+                HasObject = 1 ##self.AllocationFlagsSecondaryDataData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
             else:
                 Expr = '(bool)((((unsigned int*)'+str(self.AllocationFlagsInlineDataAddr)+')['+str(index)+'/32] >> '+str(index)+') & 1)'
-                HasObject = self.AllocationFlagsInlineData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
+                HasObject = 1 ##self.AllocationFlagsInlineData.CreateValueFromExpression('['+str(index)+']', Expr).GetValueAsUnsigned(0)
             
             if HasObject == 1:
                 return self.AllocatorInstanceData.CreateChildAtOffset('['+str(index)+']',offset,self.ElementType)
diff --git a/Engine/Extras/Xcode/xcodecheckout.sh b/Engine/Extras/Xcode/xcodecheckout.sh
new file mode 100755
index 000000000000..7622eb4069e1
--- /dev/null
+++ b/Engine/Extras/Xcode/xcodecheckout.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+
+# This script can be specified in Xcode's behaviors to checkout files that are locked for editing.
+# It assumes the P4 commandline tools are installed, and the active p4config points to a workspace
+# that maps to the path of the file
+
+ /usr/local/bin/p4 edit ${XcodeAlertAffectedPaths}
+
diff --git a/Engine/Plugins/2D/Paper2D/Source/Paper2D/Classes/PaperTerrainMaterial.h b/Engine/Plugins/2D/Paper2D/Source/Paper2D/Classes/PaperTerrainMaterial.h
index 2aa1254bd0df..13f406ab65a9 100644
--- a/Engine/Plugins/2D/Paper2D/Source/Paper2D/Classes/PaperTerrainMaterial.h
+++ b/Engine/Plugins/2D/Paper2D/Source/Paper2D/Classes/PaperTerrainMaterial.h
@@ -60,6 +60,7 @@ struct FPaperTerrainMaterialRule
 		, MaximumAngle(360.0f)
 		, bEnableCollision(true)
 		, CollisionOffset(0.0f)
+		, DrawOrder(0)
 	{
 	}
 };
diff --git a/Engine/Plugins/2D/Paper2D/Source/Paper2DEditor/Private/PaperSpriteThumbnailRenderer.cpp b/Engine/Plugins/2D/Paper2D/Source/Paper2DEditor/Private/PaperSpriteThumbnailRenderer.cpp
index 54456e95dc7a..e3cd005c15df 100644
--- a/Engine/Plugins/2D/Paper2D/Source/Paper2DEditor/Private/PaperSpriteThumbnailRenderer.cpp
+++ b/Engine/Plugins/2D/Paper2D/Source/Paper2DEditor/Private/PaperSpriteThumbnailRenderer.cpp
@@ -27,7 +27,7 @@ void UPaperSpriteThumbnailRenderer::DrawGrid(int32 X, int32 Y, uint32 Width, uin
 	static UTexture2D* GridTexture = nullptr;
 	if (GridTexture == nullptr)
 	{
-		GridTexture = LoadObject<UTexture2D>(nullptr, TEXT("/Engine/EngineMaterials/DefaultWhiteGrid.DefaultWhiteGrid"), nullptr, LOAD_None, nullptr);
+		GridTexture = LoadObject<UTexture2D>(nullptr, TEXT("/Engine/EngineMaterials/DefaultDiffuse_TC_Masks.DefaultDiffuse_TC_Masks"), nullptr, LOAD_None, nullptr);
 	}
 
 	const bool bAlphaBlend = false;
diff --git a/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/AnimNode_LiveLinkPose.cpp b/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/AnimNode_LiveLinkPose.cpp
index ffd49ee3a3b2..b355ee00ad85 100644
--- a/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/AnimNode_LiveLinkPose.cpp
+++ b/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/AnimNode_LiveLinkPose.cpp
@@ -11,6 +11,7 @@
 
 FAnimNode_LiveLinkPose::FAnimNode_LiveLinkPose() 
 	: RetargetAsset(ULiveLinkRemapAsset::StaticClass())
+	, CurrentRetargetAsset(nullptr)
 	, LiveLinkClient(nullptr)
 {
 }
diff --git a/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/LiveLinkRetargetAssetReference.cpp b/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/LiveLinkRetargetAssetReference.cpp
index 874fb5bbc0a4..2b6dc7995ba6 100644
--- a/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/LiveLinkRetargetAssetReference.cpp
+++ b/Engine/Plugins/Animation/LiveLink/Source/LiveLink/Private/LiveLinkRetargetAssetReference.cpp
@@ -3,7 +3,8 @@
 #include "LiveLinkRetargetAssetReference.h"
 #include "LiveLinkRemapAsset.h"
 
-FLiveLinkRetargetAssetReference::FLiveLinkRetargetAssetReference() //: CurrentRetargetAsset(ULiveLinkRemapAsset::StaticClass())
+FLiveLinkRetargetAssetReference::FLiveLinkRetargetAssetReference()
+	: CurrentRetargetAsset(nullptr)
 {
 
 }
diff --git a/Engine/Plugins/Developer/GitSourceControl/Source/GitSourceControl/Private/GitSourceControlProvider.h b/Engine/Plugins/Developer/GitSourceControl/Source/GitSourceControl/Private/GitSourceControlProvider.h
index 6324985f523f..f50feb898db5 100644
--- a/Engine/Plugins/Developer/GitSourceControl/Source/GitSourceControl/Private/GitSourceControlProvider.h
+++ b/Engine/Plugins/Developer/GitSourceControl/Source/GitSourceControl/Private/GitSourceControlProvider.h
@@ -54,6 +54,7 @@ public:
 	virtual bool IsEnabled() const override;
 	virtual bool IsAvailable() const override;
 	virtual const FName& GetName(void) const override;
+	virtual bool QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest) override { return false;  }
 	virtual void RegisterStateBranches(const TArray<FString>& BranchNames, const FString& ContentRoot) override {}
 	virtual int32 GetStateBranchIndex(const FString& InBranchName) const override { return INDEX_NONE; }
 	virtual ECommandResult::Type GetState( const TArray<FString>& InFiles, TArray< TSharedRef<ISourceControlState, ESPMode::ThreadSafe> >& OutState, EStateCacheUsage::Type InStateCacheUsage ) override;
diff --git a/Engine/Plugins/Developer/OneSkyLocalizationService/Source/OneSkyLocalizationService/Private/OneSkyLocalizationServiceOperations.cpp b/Engine/Plugins/Developer/OneSkyLocalizationService/Source/OneSkyLocalizationService/Private/OneSkyLocalizationServiceOperations.cpp
index fa9525a70e5d..3aed975b5c5a 100644
--- a/Engine/Plugins/Developer/OneSkyLocalizationService/Source/OneSkyLocalizationService/Private/OneSkyLocalizationServiceOperations.cpp
+++ b/Engine/Plugins/Developer/OneSkyLocalizationService/Source/OneSkyLocalizationService/Private/OneSkyLocalizationServiceOperations.cpp
@@ -83,7 +83,7 @@ static bool DeserializeResponseToStruct(void* OutStruct, UStruct& TypeInfo, FHtt
 			// Write string to FMemoryWriter to force unicode
 			TArray<uint8> InBytes;
 			FMemoryWriter Writer(InBytes);
-			Writer.ArForceUnicode = true;
+			Writer.SetForceUnicode(true);
 			Writer << ResponseStr;
 
 			FMemoryReader Reader(InBytes);
@@ -281,7 +281,7 @@ bool FOneSkyCreateProjectGroupWorker::Execute(class FOneSkyLocalizationServiceCo
 	// Write string to FMemoryWriter to force unicode
 	//TArray<uint8> InBytes;
 	//FMemoryWriter Writer(InBytes);
-	//Writer.ArForceUnicode = true;
+	//Writer.SetForceUnicode(true);
 	//Writer << Parameters;
 	//FMemoryReader Reader(InBytes);
 	//// FMemoryWriter writes size of string at beginning, need to ignore this or parsing errors occur
diff --git a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceConnection.cpp b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceConnection.cpp
index 4f476eba196e..798c698c5ef8 100644
--- a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceConnection.cpp
+++ b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceConnection.cpp
@@ -532,7 +532,7 @@ bool FPerforceConnection::GetWorkspaceList(const FPerforceConnectionInfo& InConn
 					}
 					else
 					{
-						UE_LOG(LogSourceControl, Error, TEXT(" %s client specs rejected due to root directory mismatch (%s)"), *ClientName, *ClientRootPath);
+						UE_LOG(LogSourceControl, Display, TEXT(" %s client specs rejected due to root directory mismatch (%s)"), *ClientName, *ClientRootPath);
 					}
 
 					//Other useful fields: Description, Owner, Host
@@ -540,7 +540,7 @@ bool FPerforceConnection::GetWorkspaceList(const FPerforceConnectionInfo& InConn
 				}
 				else
 				{
-					UE_LOG(LogSourceControl, Error, TEXT(" %s client specs rejected due to host name mismatch (%s)"), *ClientName, *HostName);
+					UE_LOG(LogSourceControl, Display, TEXT(" %s client specs rejected due to host name mismatch (%s)"), *ClientName, *HostName);
 				}
 			}
 		}
diff --git a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlOperations.cpp b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlOperations.cpp
index 082c6e751a57..7edc5c4d16f8 100644
--- a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlOperations.cpp
+++ b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlOperations.cpp
@@ -1148,6 +1148,13 @@ bool FPerforceUpdateStatusWorker::Execute(FPerforceSourceControlCommand& InComma
 						FString BranchFile;
 						if (File.Split(ContentRoot, nullptr, &BranchFile))
 						{
+							// Ignore collection files when querying status branches
+							FString Ext = FPaths::GetExtension(BranchFile, true);
+							if (Ext.Compare(TEXT(".collection"), ESearchCase::IgnoreCase) == 0)
+							{
+								continue;
+							}
+							
 							TArray<FStringFormatArg> Args = { Branch, ContentRoot, BranchFile };
 							Parameters.Add(FString::Format(TEXT("{0}/{1}{2}"), Args));
 						}
diff --git a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.cpp b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.cpp
index 8dd60e3571c9..f0ddf90c7f6f 100644
--- a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.cpp
+++ b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.cpp
@@ -558,6 +558,60 @@ ECommandResult::Type FPerforceSourceControlProvider::IssueCommand(FPerforceSourc
 	}
 }
 
+bool FPerforceSourceControlProvider::QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest)
+{
+
+	if (ConfigSrc.Len() == 0 || ConfigDest.Len() == 0)
+	{
+		return false;
+	}
+
+	// Request branch configuration from depot
+	FPerforceSourceControlModule& PerforceSourceControl = FModuleManager::LoadModuleChecked<FPerforceSourceControlModule>("PerforceSourceControl");
+	FScopedPerforceConnection ScopedConnection(EConcurrency::Synchronous, PerforceSourceControl.AccessSettings().GetConnectionInfo());
+	if (ScopedConnection.IsValid())
+	{
+		FPerforceConnection& Connection = ScopedConnection.GetConnection();
+		FP4RecordSet Records;
+		TArray<FString> Parameters;
+		TArray<FText> ErrorMessages;
+		Parameters.Add(TEXT("-o"));
+		Parameters.Add(*ConfigDest);
+		Parameters.Add(*ConfigSrc);
+
+		FText GeneralErrorMessage = LOCTEXT("StatusBranchConfigGeneralFailure", "Unable to retrieve status branch configuration from depot");
+
+		bool bConnectionDropped = false;
+		if (Connection.RunCommand(TEXT("print"), Parameters, Records, ErrorMessages, FOnIsCancelled(), bConnectionDropped))
+		{
+			if (Records.Num() < 1 || Records[0][TEXT("depotFile")] != ConfigSrc)
+			{
+				FMessageLog("SourceControl").Error(GeneralErrorMessage);
+				return false;
+			}
+		}
+		else
+		{
+			FMessageLog("SourceControl").Error(GeneralErrorMessage);
+
+			// output specific errors if any
+			for (int32 ErrorIndex = 0; ErrorIndex < ErrorMessages.Num(); ++ErrorIndex)
+			{
+				FMessageLog("SourceControl").Error(ErrorMessages[ErrorIndex]);
+			}
+
+			return false;
+		}
+	}
+	else
+	{
+		FMessageLog("SourceControl").Error(LOCTEXT("StatusBranchConfigNoConnection", "Unable to retrieve status branch configuration from depot, no connection"));
+		return false;
+	}
+
+	return true;
+}
+
 void FPerforceSourceControlProvider::RegisterStateBranches(const TArray<FString>& BranchNames, const FString& ContentRootIn)
 {
 	StatusBranchNames = BranchNames;
diff --git a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.h b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.h
index b70e134da246..0e01873b22a7 100644
--- a/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.h
+++ b/Engine/Plugins/Developer/PerforceSourceControl/Source/PerforceSourceControl/Private/PerforceSourceControlProvider.h
@@ -30,6 +30,7 @@ public:
 	virtual bool IsEnabled() const override;
 	virtual bool IsAvailable() const override;
 	virtual const FName& GetName(void) const override;
+	virtual bool QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest) override;
 	virtual void RegisterStateBranches(const TArray<FString>& BranchNames, const FString& ContentRootIn) override;
 	virtual int32 GetStateBranchIndex(const FString& BranchName) const override;
 	virtual ECommandResult::Type GetState( const TArray<FString>& InFiles, TArray< TSharedRef<ISourceControlState, ESPMode::ThreadSafe> >& OutState, EStateCacheUsage::Type InStateCacheUsage ) override;
diff --git a/Engine/Plugins/Developer/SubversionSourceControl/Source/SubversionSourceControl/Private/SubversionSourceControlProvider.h b/Engine/Plugins/Developer/SubversionSourceControl/Source/SubversionSourceControl/Private/SubversionSourceControlProvider.h
index 8e587ec9b128..844f2fd7dff6 100644
--- a/Engine/Plugins/Developer/SubversionSourceControl/Source/SubversionSourceControl/Private/SubversionSourceControlProvider.h
+++ b/Engine/Plugins/Developer/SubversionSourceControl/Source/SubversionSourceControl/Private/SubversionSourceControlProvider.h
@@ -29,6 +29,7 @@ public:
 	virtual bool IsEnabled() const override;
 	virtual bool IsAvailable() const override;
 	virtual const FName& GetName(void) const override;
+	virtual bool QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest) override { return false; }
 	virtual void RegisterStateBranches(const TArray<FString>& BranchNames, const FString& ContentRoot) override {}
 	virtual int32 GetStateBranchIndex(const FString& BranchName) const override { return INDEX_NONE; }
 	virtual ECommandResult::Type GetState( const TArray<FString>& InFiles, TArray< TSharedRef<ISourceControlState, ESPMode::ThreadSafe> >& OutState, EStateCacheUsage::Type InStateCacheUsage ) override;
diff --git a/Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp b/Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp
index 67e4aa51af7f..37853bea3155 100644
--- a/Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp
+++ b/Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp
@@ -127,7 +127,7 @@ int32 GetVisualStudioVersionForSolution(const FString& InSolutionFile)
 			}
 
 			int32 Version = 0;
-			Lex::FromString(Version, *VersionString);
+			LexFromString(Version, *VersionString);
 			return Version;
 		}
 	}
diff --git a/Engine/Plugins/Editor/AssetManagerEditor/Source/AssetManagerEditor/Private/AssetManagerEditorModule.cpp b/Engine/Plugins/Editor/AssetManagerEditor/Source/AssetManagerEditor/Private/AssetManagerEditorModule.cpp
index c9dc333e1756..708c47bdefae 100644
--- a/Engine/Plugins/Editor/AssetManagerEditor/Source/AssetManagerEditor/Private/AssetManagerEditorModule.cpp
+++ b/Engine/Plugins/Editor/AssetManagerEditor/Source/AssetManagerEditor/Private/AssetManagerEditorModule.cpp
@@ -954,7 +954,7 @@ bool FAssetManagerEditorModule::GetStringValueForCustomColumn(const FAssetData&
 		int64 IntegerValue = 0;
 		if (GetIntegerValueForCustomColumn(AssetData, ColumnName, IntegerValue))
 		{
-			OutValue = Lex::ToString(IntegerValue);
+			OutValue = LexToString(IntegerValue);
 			return true;
 		}
 	}
@@ -1007,7 +1007,7 @@ bool FAssetManagerEditorModule::GetStringValueForCustomColumn(const FAssetData&
 			{
 				OutValue += TEXT("+");
 			}
-			OutValue += Lex::ToString(Chunk);
+			OutValue += LexToString(Chunk);
 		}
 		return true;
 	}
diff --git a/Engine/Plugins/Editor/DataValidation/Source/DataValidation/Private/DataValidationModule.cpp b/Engine/Plugins/Editor/DataValidation/Source/DataValidation/Private/DataValidationModule.cpp
index bf521bc07743..4a04114fdcba 100644
--- a/Engine/Plugins/Editor/DataValidation/Source/DataValidation/Private/DataValidationModule.cpp
+++ b/Engine/Plugins/Editor/DataValidation/Source/DataValidation/Private/DataValidationModule.cpp
@@ -90,10 +90,13 @@ void FDataValidationModule::ShutdownModule()
 {
 	if (!IsRunningCommandlet() && !IsRunningGame())
 	{
-		FContentBrowserModule& ContentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>(TEXT("ContentBrowser"));
-		TArray<FContentBrowserMenuExtender_SelectedAssets>& CBMenuExtenderDelegates = ContentBrowserModule.GetAllAssetViewContextMenuExtenders();
-		CBMenuExtenderDelegates.RemoveAll([this](const FContentBrowserMenuExtender_SelectedAssets& Delegate) { return Delegate.GetHandle() == ContentBrowserAssetExtenderDelegateHandle; });
-		CBMenuExtenderDelegates.RemoveAll([this](const FContentBrowserMenuExtender_SelectedAssets& Delegate) { return Delegate.GetHandle() == ContentBrowserPathExtenderDelegateHandle; });
+		FContentBrowserModule* ContentBrowserModule = (FContentBrowserModule*)(FModuleManager::Get().GetModule(TEXT("ContentBrowser")));
+		if (ContentBrowserModule)
+		{
+			TArray<FContentBrowserMenuExtender_SelectedAssets>& CBMenuExtenderDelegates = ContentBrowserModule->GetAllAssetViewContextMenuExtenders();
+			CBMenuExtenderDelegates.RemoveAll([this](const FContentBrowserMenuExtender_SelectedAssets& Delegate) { return Delegate.GetHandle() == ContentBrowserAssetExtenderDelegateHandle; });
+			CBMenuExtenderDelegates.RemoveAll([this](const FContentBrowserMenuExtender_SelectedAssets& Delegate) { return Delegate.GetHandle() == ContentBrowserPathExtenderDelegateHandle; });
+		}
 
 		// remove menu extension
 		FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked<FLevelEditorModule>("LevelEditor");
diff --git a/Engine/Plugins/Editor/GLTFImporter/Source/GLTFImporter/Private/GLTFImportFactory.cpp b/Engine/Plugins/Editor/GLTFImporter/Source/GLTFImporter/Private/GLTFImportFactory.cpp
index 77fb423f5d34..232c02e1df6e 100644
--- a/Engine/Plugins/Editor/GLTFImporter/Source/GLTFImporter/Private/GLTFImportFactory.cpp
+++ b/Engine/Plugins/Editor/GLTFImporter/Source/GLTFImporter/Private/GLTFImportFactory.cpp
@@ -11,9 +11,9 @@
 #include "Engine/StaticMesh.h"
 #include "RawMesh.h"
 #include "Serialization/ArrayReader.h"
+#include "Editor/UnrealEd/Public/Editor.h"
 #include "Serialization/JsonReader.h"
 #include "Serialization/JsonSerializer.h"
-#include "Editor/UnrealEd/Public/Editor.h"
 
 #define LOCTEXT_NAMESPACE "GLTFFactory"
 
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsEditorModule.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsEditorModule.cpp
index 446a2e1b223d..2321d9296dae 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsEditorModule.cpp
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsEditorModule.cpp
@@ -51,7 +51,7 @@ public:
 			PropertyModule.RegisterCustomPropertyTypeLayout("GameplayTag", FOnGetPropertyTypeCustomizationInstance::CreateStatic(&FGameplayTagCustomizationPublic::MakeInstance));
 			PropertyModule.RegisterCustomPropertyTypeLayout("GameplayTagQuery", FOnGetPropertyTypeCustomizationInstance::CreateStatic(&FGameplayTagQueryCustomization::MakeInstance));
 
-			PropertyModule.RegisterCustomClassLayout(UGameplayTagsList::StaticClass()->GetFName(), FOnGetDetailCustomizationInstance::CreateStatic(&FGameplayTagsSettingsCustomization::MakeInstance));
+			PropertyModule.RegisterCustomClassLayout(UGameplayTagsSettings::StaticClass()->GetFName(), FOnGetDetailCustomizationInstance::CreateStatic(&FGameplayTagsSettingsCustomization::MakeInstance));
 
 			PropertyModule.RegisterCustomPropertyTypeLayout("GameplayTagReferenceHelper", FOnGetPropertyTypeCustomizationInstance::CreateStatic(&FGameplayTagReferenceHelperDetails::MakeInstance));
 			PropertyModule.RegisterCustomPropertyTypeLayout("GameplayTagCreationWidgetHelper", FOnGetPropertyTypeCustomizationInstance::CreateStatic(&FGameplayTagCreationWidgetHelperDetails::MakeInstance));
@@ -74,12 +74,6 @@ public:
 				LOCTEXT("GameplayTagSettingsNameDesc", "GameplayTag Settings"),
 				GetMutableDefault<UGameplayTagsSettings>()
 			);
-
-			SettingsModule->RegisterSettings("Project", "Project", "GameplayTags Developer",
-				LOCTEXT("GameplayTagDeveloperSettingsName", "GameplayTags Developer"),
-				LOCTEXT("GameplayTagDeveloperSettingsNameDesc", "GameplayTag Developer Settings"),
-				GetMutableDefault<UGameplayTagsDeveloperSettings>()
-			);
 		}
 
 		GameplayTagPackageName = FGameplayTag::StaticStruct()->GetOutermost()->GetFName();
@@ -236,6 +230,7 @@ public:
 		TArray<const FGameplayTagSource*> Sources;
 
 		Manager.FindTagSourcesWithType(EGameplayTagSourceType::TagList, Sources);
+		Manager.FindTagSourcesWithType(EGameplayTagSourceType::RestrictedTagList, Sources);
 
 		for (const FGameplayTagSource* Source : Sources)
 		{
@@ -313,7 +308,7 @@ public:
 		return false;
 	}
 
-	virtual bool AddNewGameplayTagToINI(const FString& NewTag, const FString& Comment, FName TagSourceName) override
+	virtual bool AddNewGameplayTagToINI(const FString& NewTag, const FString& Comment, FName TagSourceName, bool bIsRestrictedTag, bool bAllowNonRestrictedChildren) override
 	{
 		UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
 
@@ -341,6 +336,67 @@ public:
 			return false;
 		}
 
+		if (bIsRestrictedTag)
+		{
+			// restricted tags can't be children of non-restricted tags
+			FString AncestorTag = NewTag;
+			bool bWasSplit = NewTag.Split(TEXT("."), &AncestorTag, nullptr, ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+			while (bWasSplit)
+			{
+				if (Manager.IsDictionaryTag(FName(*AncestorTag)))
+				{
+					FString TagComment;
+					FName Source;
+					bool bIsExplicit;
+					bool bIsRestricted;
+					bool bAllowsNonRestrictedChildren;
+
+					Manager.GetTagEditorData(*AncestorTag, TagComment, Source, bIsExplicit, bIsRestricted, bAllowsNonRestrictedChildren);
+					if (bIsRestricted)
+					{
+						break;
+					}
+					ShowNotification(FText::Format(LOCTEXT("AddRestrictedTagFailure", "Failed to add restricted gameplay tag {0}, {1} is not a restricted tag"), FText::FromString(NewTag), FText::FromString(AncestorTag)), 10.0f);
+
+					return false;
+				}
+
+				bWasSplit = AncestorTag.Split(TEXT("."), &AncestorTag, nullptr, ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+			}
+		}
+		else
+		{
+			// non-restricted tags can only be children of restricted tags if the restricted tag allows it
+			FString AncestorTag = NewTag;
+			bool bWasSplit = NewTag.Split(TEXT("."), &AncestorTag, nullptr, ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+			while (bWasSplit)
+			{
+				if (Manager.IsDictionaryTag(FName(*AncestorTag)))
+				{
+					FString TagComment;
+					FName Source;
+					bool bIsExplicit;
+					bool bIsRestricted;
+					bool bAllowsNonRestrictedChildren;
+
+					Manager.GetTagEditorData(*AncestorTag, TagComment, Source, bIsExplicit, bIsRestricted, bAllowsNonRestrictedChildren);
+					if (bIsRestricted)
+					{
+						if (bAllowsNonRestrictedChildren)
+						{
+							break;
+						}
+
+						ShowNotification(FText::Format(LOCTEXT("AddTagFailure", "Failed to add gameplay tag {0}, {1} is a restricted tag and does not allow non-restricted children"), FText::FromString(NewTag), FText::FromString(AncestorTag)), 10.0f);
+
+						return false;
+					}
+				}
+
+				bWasSplit = AncestorTag.Split(TEXT("."), &AncestorTag, nullptr, ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+			}
+		}
+
 		if ((TagSourceName == NAME_None || TagSourceName == FGameplayTagSource::GetDefaultName()) && DevSettings && !DevSettings->DeveloperConfigName.IsEmpty())
 		{
 			// Try to use developer config file
@@ -361,23 +417,41 @@ public:
 			TagSource = Manager.FindOrAddTagSource(TagSourceName, EGameplayTagSourceType::TagList);
 		}
 
-		if (TagSource && TagSource->SourceTagList)
+		bool bSuccess = false;
+		if (TagSource)
 		{
-			UGameplayTagsList* TagList = TagSource->SourceTagList;
+			UObject* TagListObj = nullptr;
+			FString ConfigFileName;
 
-			TagList->GameplayTagList.AddUnique(FGameplayTagTableRow(FName(*NewTag), Comment));
+			if (bIsRestrictedTag && TagSource->SourceRestrictedTagList)
+			{
+				URestrictedGameplayTagsList* RestrictedTagList = TagSource->SourceRestrictedTagList;
+				TagListObj = RestrictedTagList;
+				RestrictedTagList->RestrictedGameplayTagList.AddUnique(FRestrictedGameplayTagTableRow(FName(*NewTag), Comment, bAllowNonRestrictedChildren));
+				RestrictedTagList->SortTags();
+				ConfigFileName = RestrictedTagList->ConfigFileName;
+				bSuccess = true;
+			}
+			else if (TagSource->SourceTagList)
+			{
+				UGameplayTagsList* TagList = TagSource->SourceTagList;
+				TagListObj = TagList;
+				TagList->GameplayTagList.AddUnique(FGameplayTagTableRow(FName(*NewTag), Comment));
+				TagList->SortTags();
+				ConfigFileName = TagList->ConfigFileName;
+				bSuccess = true;
+			}
 
-			TagList->SortTags();
-
-			GameplayTagsUpdateSourceControl(TagList->ConfigFileName);
+			GameplayTagsUpdateSourceControl(ConfigFileName);
 
 			// Check source control before and after writing, to make sure it gets created or checked out
 
-			TagList->UpdateDefaultConfigFile(TagList->ConfigFileName);
-			GameplayTagsUpdateSourceControl(TagList->ConfigFileName);
-			GConfig->LoadFile(TagList->ConfigFileName);
+			TagListObj->UpdateDefaultConfigFile(ConfigFileName);
+			GameplayTagsUpdateSourceControl(ConfigFileName);
+			GConfig->LoadFile(ConfigFileName);
 		}
-		else
+		
+		if (!bSuccess)
 		{
 			ShowNotification(FText::Format(LOCTEXT("AddTagFailure", "Failed to add gameplay tag {0} to dictionary {1}!"), FText::FromString(NewTag), FText::FromName(TagSourceName)), 10.0f);
 
@@ -403,13 +477,16 @@ public:
 
 		FString Comment;
 		FName TagSourceName;
+		bool bTagIsExplicit;
+		bool bTagIsRestricted;
+		bool bTagAllowsNonRestrictedChildren;
 
 		if (DeleteTagRedirector(TagToDelete))
 		{
 			return true;
 		}
-
-		if (!Manager.GetTagEditorData(TagName, Comment, TagSourceName))
+		
+		if (!Manager.GetTagEditorData(TagName, Comment, TagSourceName, bTagIsExplicit, bTagIsRestricted, bTagAllowsNonRestrictedChildren))
 		{
 			ShowNotification(FText::Format(LOCTEXT("RemoveTagFailureNoTag", "Cannot delete tag {0}, does not exist!"), FText::FromString(TagToDelete)), 10.0f);
 
@@ -521,17 +598,20 @@ public:
 
 		FString OldComment, NewComment;
 		FName OldTagSourceName, NewTagSourceName;
+		bool bTagIsExplicit;
+		bool bTagIsRestricted;
+		bool bTagAllowsNonRestrictedChildren;
 
 		// Delete existing redirector
 		DeleteTagRedirector(TagToRenameTo);
 		DeleteTagRedirector(TagToRename);
 
-		if (Manager.GetTagEditorData(OldTagName, OldComment, OldTagSourceName))
+		if (Manager.GetTagEditorData(OldTagName, OldComment, OldTagSourceName, bTagIsExplicit, bTagIsRestricted, bTagAllowsNonRestrictedChildren))
 		{
 			// Add new tag if needed
-			if (!Manager.GetTagEditorData(NewTagName, NewComment, NewTagSourceName))
+			if (!Manager.GetTagEditorData(NewTagName, NewComment, NewTagSourceName, bTagIsExplicit, bTagIsRestricted, bTagAllowsNonRestrictedChildren))
 			{
-				if (!AddNewGameplayTagToINI(TagToRenameTo, OldComment, OldTagSourceName))
+				if (!AddNewGameplayTagToINI(TagToRenameTo, OldComment, OldTagSourceName, bTagIsRestricted, bTagAllowsNonRestrictedChildren))
 				{
 					// Failed to add new tag, so fail
 					return false;
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.cpp
index 4ee40c216903..79ce4b719ea1 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.cpp
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.cpp
@@ -33,9 +33,9 @@ void FGameplayTagsSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder&
 	IDetailCategoryBuilder& GameplayTagsCategory = DetailLayout.EditCategory("GameplayTags");
 	{
 		TArray<TSharedRef<IPropertyHandle>> GameplayTagsProperties;
-		GameplayTagsCategory.GetDefaultProperties(GameplayTagsProperties, true, false);
+		GameplayTagsCategory.GetDefaultProperties(GameplayTagsProperties, true, true);
 
-		TSharedPtr<IPropertyHandle> TagListProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UGameplayTagsList, GameplayTagList));
+		TSharedPtr<IPropertyHandle> TagListProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UGameplayTagsList, GameplayTagList), UGameplayTagsList::StaticClass());
 		TagListProperty->MarkHiddenByCustomization();
 
 		for (TSharedPtr<IPropertyHandle> Property : GameplayTagsProperties)
@@ -62,10 +62,49 @@ void FGameplayTagsSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder&
 					.GameplayTagUIMode(EGameplayTagUIMode::ManagementMode)
 					.MaxHeight(MaxPropertyHeight)
 					.OnTagChanged(this, &FGameplayTagsSettingsCustomization::OnTagChanged)
+					.RestrictedTags(false)
 				];
 			}
 		}
 	}
+
+	IDetailCategoryBuilder& AdvancedGameplayTagsCategory = DetailLayout.EditCategory("Advanced Gameplay Tags");
+	{
+		TArray<TSharedRef<IPropertyHandle>> GameplayTagsProperties;
+		AdvancedGameplayTagsCategory.GetDefaultProperties(GameplayTagsProperties, true, true);
+
+		TSharedPtr<IPropertyHandle> RestrictedTagListProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UGameplayTagsSettings, RestrictedTagList));
+		RestrictedTagListProperty->MarkHiddenByCustomization();
+
+		for (TSharedPtr<IPropertyHandle> Property : GameplayTagsProperties)
+		{
+			if (Property->GetProperty() == RestrictedTagListProperty->GetProperty())
+			{
+				// Create a custom widget for the restricted tag list
+
+				AdvancedGameplayTagsCategory.AddCustomRow(RestrictedTagListProperty->GetPropertyDisplayName(), true)
+				.NameContent()
+				[
+					RestrictedTagListProperty->CreatePropertyNameWidget()
+				]
+				.ValueContent()
+				.MaxDesiredWidth(MaxPropertyWidth)
+				[
+					SAssignNew(RestrictedTagWidget, SGameplayTagWidget, TArray<SGameplayTagWidget::FEditableGameplayTagContainerDatum>())
+					.Filter(TEXT(""))
+					.MultiSelect(false)
+					.GameplayTagUIMode(EGameplayTagUIMode::ManagementMode)
+					.MaxHeight(MaxPropertyHeight)
+					.OnTagChanged(this, &FGameplayTagsSettingsCustomization::OnTagChanged)
+					.RestrictedTags(true)
+				];
+			}
+			else
+			{
+				AdvancedGameplayTagsCategory.AddProperty(Property);
+			}
+		}
+	}
 }
 
 void FGameplayTagsSettingsCustomization::OnTagChanged()
@@ -74,6 +113,11 @@ void FGameplayTagsSettingsCustomization::OnTagChanged()
 	{
 		TagWidget->RefreshTags();
 	}
+
+	if (RestrictedTagWidget.IsValid())
+	{
+		RestrictedTagWidget->RefreshTags();
+	}
 }
 
 void FGameplayTagsSettingsCustomization::OnTagTreeChanged()
@@ -82,6 +126,11 @@ void FGameplayTagsSettingsCustomization::OnTagTreeChanged()
 	{
 		TagWidget->RefreshOnNextTick();
 	}
+
+	if (RestrictedTagWidget.IsValid())
+	{
+		RestrictedTagWidget->RefreshOnNextTick();
+	}
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.h b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.h
index 6a86e2a95619..cda259df7306 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.h
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/GameplayTagsSettingsCustomization.h
@@ -33,4 +33,6 @@ private:
 	void OnTagTreeChanged();
 
 	TSharedPtr<SGameplayTagWidget> TagWidget;
+
+	TSharedPtr<SGameplayTagWidget> RestrictedTagWidget;
 };
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.cpp
new file mode 100644
index 000000000000..9242bcac1500
--- /dev/null
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.cpp
@@ -0,0 +1,108 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "SAddNewGameplayTagSourceWidget.h"
+#include "DetailLayoutBuilder.h"
+#include "GameplayTagsSettings.h"
+#include "GameplayTagsEditorModule.h"
+#include "GameplayTagsModule.h"
+#include "Widgets/Input/SButton.h"
+
+#define LOCTEXT_NAMESPACE "AddNewGameplayTagSourceWidget"
+
+void SAddNewGameplayTagSourceWidget::Construct(const FArguments& InArgs)
+{
+	FText HintText = LOCTEXT("NewSourceNameHint", "SourceName.ini");
+	DefaultNewName = InArgs._NewSourceName;
+	if (DefaultNewName.IsEmpty() == false)
+	{
+		HintText = FText::FromString(DefaultNewName);
+	}
+
+	bShouldGetKeyboardFocus = false;
+
+	OnGameplayTagSourceAdded = InArgs._OnGameplayTagSourceAdded;
+
+	ChildSlot
+	[
+		SNew(SVerticalBox)
+
+		// Tag Name
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 4.0f)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("NewSourceName", "Name:"))
+			]
+
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 2.0f)
+			.FillWidth(1.0f)
+			.HAlign(HAlign_Right)
+			[
+				SAssignNew(SourceNameTextBox, SEditableTextBox)
+				.MinDesiredWidth(240.0f)
+				.HintText(HintText)
+			]
+		]
+
+		// Add Source Button
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		.HAlign(HAlign_Center)
+		.Padding(8.0f)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.Text(LOCTEXT("AddNew", "Add New Source"))
+				.OnClicked(this, &SAddNewGameplayTagSourceWidget::OnAddNewSourceButtonPressed)
+			]
+		]
+	];
+
+	Reset();
+}
+
+void SAddNewGameplayTagSourceWidget::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	if (bShouldGetKeyboardFocus)
+	{
+		bShouldGetKeyboardFocus = false;
+		FSlateApplication::Get().SetKeyboardFocus(SourceNameTextBox.ToSharedRef(), EFocusCause::SetDirectly);
+	}
+}
+
+void SAddNewGameplayTagSourceWidget::Reset()
+{
+	SetSourceName();
+}
+
+void SAddNewGameplayTagSourceWidget::SetSourceName(const FText& InName)
+{
+	SourceNameTextBox->SetText(InName.IsEmpty() ? FText::FromString(DefaultNewName) : InName);
+}
+
+FReply SAddNewGameplayTagSourceWidget::OnAddNewSourceButtonPressed()
+{
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+		
+	if (!SourceNameTextBox->GetText().EqualTo(FText::FromString(DefaultNewName)))
+	{
+		Manager.FindOrAddTagSource(*SourceNameTextBox->GetText().ToString(), EGameplayTagSourceType::TagList);
+	}
+
+	IGameplayTagsModule::OnTagSettingsChanged.Broadcast();
+
+	return FReply::Handled();
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.h b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.h
new file mode 100644
index 000000000000..1291f7a748c7
--- /dev/null
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagSourceWidget.h
@@ -0,0 +1,55 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameplayTagsManager.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Input/SComboBox.h"
+
+/** Widget allowing the user to create new gameplay tags */
+class SAddNewGameplayTagSourceWidget : public SCompoundWidget
+{
+public:
+
+	DECLARE_DELEGATE_OneParam( FOnGameplayTagSourceAdded, const FString& /*SourceName*/);
+
+	SLATE_BEGIN_ARGS(SAddNewGameplayTagSourceWidget)
+		: _NewSourceName(TEXT(""))
+		{}
+		SLATE_EVENT(FOnGameplayTagSourceAdded, OnGameplayTagSourceAdded )	// Callback for when a new source is added	
+		SLATE_ARGUMENT( FString, NewSourceName ) // String that will initially populate the New Source Name field
+	SLATE_END_ARGS();
+
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+	void Construct( const FArguments& InArgs);
+
+	/** Resets all input fields */
+	void Reset();
+
+private:
+
+	/** Sets the name of the source. Uses the default if the name is not specified */
+	void SetSourceName(const FText& InName = FText());
+
+	/** Callback for when the Add New Tag button is pressed */
+	FReply OnAddNewSourceButtonPressed();
+
+private:
+
+	/** The name of the next gameplay tag source to create */
+	TSharedPtr<SEditableTextBox> SourceNameTextBox;
+
+	/** Callback for when a new gameplay tag has been added to the INI files */
+	FOnGameplayTagSourceAdded OnGameplayTagSourceAdded;
+
+	/** Tracks if this widget should get keyboard focus */
+	bool bShouldGetKeyboardFocus;
+
+	FString DefaultNewName;
+};
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagWidget.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagWidget.cpp
index 7abb8fb79fc4..09e082fba98a 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagWidget.cpp
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewGameplayTagWidget.cpp
@@ -4,7 +4,7 @@
 #include "DetailLayoutBuilder.h"
 #include "GameplayTagsSettings.h"
 #include "GameplayTagsEditorModule.h"
-#include "SGameplayTagWidget.h"
+#include "GameplayTagsModule.h"
 #include "Widgets/Input/SButton.h"
 
 #define LOCTEXT_NAMESPACE "AddNewGameplayTagWidget"
@@ -26,6 +26,8 @@ void SAddNewGameplayTagWidget::Construct(const FArguments& InArgs)
 	OnGameplayTagAdded = InArgs._OnGameplayTagAdded;
 	PopulateTagSources();
 
+	IGameplayTagsModule::OnTagSettingsChanged.AddRaw(this, &SAddNewGameplayTagWidget::PopulateTagSources);
+
 	ChildSlot
 	[
 		SNew(SVerticalBox)
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.cpp
new file mode 100644
index 000000000000..5a3d7a1e3e22
--- /dev/null
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.cpp
@@ -0,0 +1,361 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "SAddNewRestrictedGameplayTagWidget.h"
+#include "DetailLayoutBuilder.h"
+#include "GameplayTagsSettings.h"
+#include "GameplayTagsEditorModule.h"
+#include "GameplayTagsModule.h"
+#include "SGameplayTagWidget.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Framework/Notifications/NotificationManager.h"
+
+#define LOCTEXT_NAMESPACE "AddNewRestrictedGameplayTagWidget"
+
+void SAddNewRestrictedGameplayTagWidget::Construct(const FArguments& InArgs)
+{
+	FText HintText = LOCTEXT("NewTagNameHint", "X.Y.Z");
+	DefaultNewName = InArgs._NewRestrictedTagName;
+	if (DefaultNewName.IsEmpty() == false)
+	{
+		HintText = FText::FromString(DefaultNewName);
+	}
+
+
+	bAddingNewRestrictedTag = false;
+	bShouldGetKeyboardFocus = false;
+
+	OnRestrictedGameplayTagAdded = InArgs._OnRestrictedGameplayTagAdded;
+	PopulateTagSources();
+
+	IGameplayTagsModule::OnTagSettingsChanged.AddRaw(this, &SAddNewRestrictedGameplayTagWidget::PopulateTagSources);
+
+	ChildSlot
+	[
+		SNew(SVerticalBox)
+
+		// Restricted Tag Name
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 4.0f)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("NewTagName", "Name:"))
+			]
+
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 2.0f)
+			.FillWidth(1.0f)
+			.HAlign(HAlign_Right)
+			[
+				SAssignNew(TagNameTextBox, SEditableTextBox)
+				.MinDesiredWidth(240.0f)
+				.HintText(HintText)
+				.OnTextCommitted(this, &SAddNewRestrictedGameplayTagWidget::OnCommitNewTagName)
+			]
+		]
+
+		// Tag Comment
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 4.0f)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("TagComment", "Comment:"))
+			]
+
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 2.0f)
+			.FillWidth(1.0f)
+			.HAlign(HAlign_Right)
+			[
+				SAssignNew(TagCommentTextBox, SEditableTextBox)
+				.MinDesiredWidth(240.0f)
+				.HintText(LOCTEXT("TagCommentHint", "Comment"))
+				.OnTextCommitted(this, &SAddNewRestrictedGameplayTagWidget::OnCommitNewTagName)
+			]
+		]
+
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 4.0f)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("AllowNonRestrictedChildren", "Allow non-restricted children:"))
+			]
+
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 2.0f)
+			.FillWidth(1.0f)
+			.HAlign(HAlign_Right)
+			[
+				SAssignNew(AllowNonRestrictedChildrenCheckBox, SCheckBox)
+			]
+			]
+
+		// Tag Location
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 6.0f)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("CreateTagSource", "Source:"))
+			]
+
+			+ SHorizontalBox::Slot()
+			.Padding(2.0f, 2.0f)
+			.FillWidth(1.0f)
+			.HAlign(HAlign_Right)
+			[
+				SAssignNew(TagSourcesComboBox, SComboBox<TSharedPtr<FName> >)
+				.OptionsSource(&RestrictedTagSources)
+				.OnGenerateWidget(this, &SAddNewRestrictedGameplayTagWidget::OnGenerateTagSourcesComboBox)
+				.ContentPadding(2.0f)
+				.Content()
+				[
+					SNew(STextBlock)
+					.Text(this, &SAddNewRestrictedGameplayTagWidget::CreateTagSourcesComboBoxContent)
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+				]
+			]
+		]
+
+		// Add Tag Button
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.VAlign(VAlign_Top)
+		.HAlign(HAlign_Center)
+		.Padding(8.0f)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.Text(LOCTEXT("AddNew", "Add New Tag"))
+				.OnClicked(this, &SAddNewRestrictedGameplayTagWidget::OnAddNewTagButtonPressed)
+			]
+		]
+	];
+
+	Reset();
+}
+
+void SAddNewRestrictedGameplayTagWidget::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	if (bShouldGetKeyboardFocus)
+	{
+		bShouldGetKeyboardFocus = false;
+		FSlateApplication::Get().SetKeyboardFocus(TagNameTextBox.ToSharedRef(), EFocusCause::SetDirectly);
+	}
+}
+
+void SAddNewRestrictedGameplayTagWidget::PopulateTagSources()
+{
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+	RestrictedTagSources.Empty();
+
+	FName DefaultSource = FGameplayTagSource::GetDefaultName();
+
+	// Always ensure that the default source is first
+	RestrictedTagSources.Add( MakeShareable( new FName( DefaultSource ) ) );
+
+	TArray<const FGameplayTagSource*> Sources;
+	Manager.GetRestrictedTagSources(Sources);
+
+	for (const FGameplayTagSource* Source : Sources)
+	{
+		if (Source != nullptr && Source->SourceName != DefaultSource)
+		{
+			RestrictedTagSources.Add(MakeShareable(new FName(Source->SourceName)));
+		}
+	}
+}
+
+void SAddNewRestrictedGameplayTagWidget::Reset()
+{
+	SetTagName();
+	SelectTagSource();
+	SetAllowNonRestrictedChildren();
+	TagCommentTextBox->SetText(FText());
+}
+
+void SAddNewRestrictedGameplayTagWidget::SetTagName(const FText& InName)
+{
+	TagNameTextBox->SetText(InName.IsEmpty() ? FText::FromString(DefaultNewName) : InName);
+}
+
+void SAddNewRestrictedGameplayTagWidget::SelectTagSource(const FName& InSource)
+{
+	// Attempt to find the location in our sources, otherwise just use the first one
+	int32 SourceIndex = 0;
+
+	if (!InSource.IsNone())
+	{
+		for (int32 Index = 0; Index < RestrictedTagSources.Num(); ++Index)
+		{
+			TSharedPtr<FName> Source = RestrictedTagSources[Index];
+
+			if (Source.IsValid() && *Source.Get() == InSource)
+			{
+				SourceIndex = Index;
+				break;
+			}
+		}
+	}
+
+	TagSourcesComboBox->SetSelectedItem(RestrictedTagSources[SourceIndex]);
+}
+
+void SAddNewRestrictedGameplayTagWidget::SetAllowNonRestrictedChildren(bool bInAllowNonRestrictedChildren)
+{
+	AllowNonRestrictedChildrenCheckBox->SetIsChecked(bInAllowNonRestrictedChildren ? ECheckBoxState::Checked : ECheckBoxState::Unchecked);
+}
+
+void SAddNewRestrictedGameplayTagWidget::OnCommitNewTagName(const FText& InText, ETextCommit::Type InCommitType)
+{
+	if (InCommitType == ETextCommit::OnEnter)
+	{
+		ValidateNewRestrictedTag();
+	}
+}
+
+FReply SAddNewRestrictedGameplayTagWidget::OnAddNewTagButtonPressed()
+{
+	ValidateNewRestrictedTag();
+	return FReply::Handled();
+}
+
+void SAddNewRestrictedGameplayTagWidget::AddSubtagFromParent(const FString& ParentTagName, const FName& ParentTagSource, bool bAllowNonRestrictedChildren)
+{
+	FText SubtagBaseName = !ParentTagName.IsEmpty() ? FText::Format(FText::FromString(TEXT("{0}.")), FText::FromString(ParentTagName)) : FText();
+
+	SetTagName(SubtagBaseName);
+	SelectTagSource(ParentTagSource);
+	SetAllowNonRestrictedChildren(bAllowNonRestrictedChildren);
+
+	bShouldGetKeyboardFocus = true;
+}
+
+void SAddNewRestrictedGameplayTagWidget::ValidateNewRestrictedTag()
+{
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+
+	FString TagName = TagNameTextBox->GetText().ToString();
+	FString TagComment = TagCommentTextBox->GetText().ToString();
+	bool bAllowNonRestrictedChildren = AllowNonRestrictedChildrenCheckBox->IsChecked();
+	FName TagSource = *TagSourcesComboBox->GetSelectedItem().Get();
+
+	TArray<FString> TagSourceOwners;
+	Manager.GetOwnersForTagSource(TagSource.ToString(), TagSourceOwners);
+
+	bool bHasOwner = false;
+	for (const FString& Owner : TagSourceOwners)
+	{
+		if (!Owner.IsEmpty())
+		{
+			bHasOwner = true;
+			break;
+		}
+	}
+
+	if (bHasOwner)
+	{
+		FString StringToDisplay = TEXT("Do you have permission from ");
+		StringToDisplay.Append(TagSourceOwners[0]);
+		for (int Idx = 1; Idx < TagSourceOwners.Num(); ++Idx)
+		{
+			StringToDisplay.Append(TEXT(" or "));
+			StringToDisplay.Append(TagSourceOwners[Idx]);
+		}
+		StringToDisplay.Append(TEXT(" to modify "));
+		StringToDisplay.Append(TagSource.ToString());
+		StringToDisplay.Append(TEXT("?"));
+
+		FNotificationInfo Info(FText::FromString(StringToDisplay));
+		Info.ExpireDuration = 10.f;
+		Info.ButtonDetails.Add(FNotificationButtonInfo(LOCTEXT("RestrictedTagPopupButtonAccept", "Yes"), FText(), FSimpleDelegate::CreateSP(this, &SAddNewRestrictedGameplayTagWidget::CreateNewRestrictedGameplayTag), SNotificationItem::CS_None));
+		Info.ButtonDetails.Add(FNotificationButtonInfo(LOCTEXT("RestrictedTagPopupButtonReject", "No"), FText(), FSimpleDelegate::CreateSP(this, &SAddNewRestrictedGameplayTagWidget::CancelNewTag), SNotificationItem::CS_None));
+
+		AddRestrictedGameplayTagDialog = FSlateNotificationManager::Get().AddNotification(Info);
+	}
+	else
+	{
+		CreateNewRestrictedGameplayTag();
+	}
+}
+
+void SAddNewRestrictedGameplayTagWidget::CreateNewRestrictedGameplayTag()
+{
+	if (AddRestrictedGameplayTagDialog.IsValid())
+	{
+		AddRestrictedGameplayTagDialog->SetVisibility(EVisibility::Collapsed);
+	}
+
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+
+	// Only support adding tags via ini file
+	if (Manager.ShouldImportTagsFromINI() == false)
+	{
+		return;
+	}
+
+	FString TagName = TagNameTextBox->GetText().ToString();
+	FString TagComment = TagCommentTextBox->GetText().ToString();
+	bool bAllowNonRestrictedChildren = AllowNonRestrictedChildrenCheckBox->IsChecked();
+	FName TagSource = *TagSourcesComboBox->GetSelectedItem().Get();
+
+	if (TagName.IsEmpty())
+	{
+		return;
+	}
+
+	// set bIsAddingNewTag, this guards against the window closing when it loses focus due to source control checking out a file
+	TGuardValue<bool>	Guard(bAddingNewRestrictedTag, true);
+
+	IGameplayTagsEditorModule::Get().AddNewGameplayTagToINI(TagName, TagComment, TagSource, true, bAllowNonRestrictedChildren);
+
+	OnRestrictedGameplayTagAdded.ExecuteIfBound(TagName, TagComment, TagSource);
+
+	Reset();
+}
+
+void SAddNewRestrictedGameplayTagWidget::CancelNewTag()
+{
+	AddRestrictedGameplayTagDialog->SetVisibility(EVisibility::Collapsed);
+}
+
+TSharedRef<SWidget> SAddNewRestrictedGameplayTagWidget::OnGenerateTagSourcesComboBox(TSharedPtr<FName> InItem)
+{
+	return SNew(STextBlock)
+		.Text(FText::FromName(*InItem.Get()));
+}
+
+FText SAddNewRestrictedGameplayTagWidget::CreateTagSourcesComboBoxContent() const
+{
+	const bool bHasSelectedItem = TagSourcesComboBox.IsValid() && TagSourcesComboBox->GetSelectedItem().IsValid();
+
+	return bHasSelectedItem ? FText::FromName(*TagSourcesComboBox->GetSelectedItem().Get()) : LOCTEXT("NewTagLocationNotSelected", "Not selected");
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.h b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.h
new file mode 100644
index 000000000000..f14a20b037cf
--- /dev/null
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SAddNewRestrictedGameplayTagWidget.h
@@ -0,0 +1,105 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameplayTagsManager.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Input/SComboBox.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "Widgets/Notifications/SNotificationList.h"
+
+/** Widget allowing the user to create new restricted gameplay tags */
+class SAddNewRestrictedGameplayTagWidget : public SCompoundWidget
+{
+public:
+
+	DECLARE_DELEGATE_ThreeParams(FOnRestrictedGameplayTagAdded, const FString& /*TagName*/, const FString& /*TagComment*/, const FName& /*TagSource*/);
+
+	SLATE_BEGIN_ARGS(SAddNewRestrictedGameplayTagWidget)
+		: _NewRestrictedTagName(TEXT(""))
+		{}
+		SLATE_EVENT( FOnRestrictedGameplayTagAdded, OnRestrictedGameplayTagAdded )	// Callback for when a new tag is added	
+		SLATE_ARGUMENT( FString, NewRestrictedTagName ) // String that will initially populate the New Tag Name field
+	SLATE_END_ARGS();
+
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+	void Construct( const FArguments& InArgs);
+
+	/** Returns true if we're currently attempting to add a new restricted gameplay tag to an INI file */
+	bool IsAddingNewRestrictedTag() const
+	{
+		return bAddingNewRestrictedTag;
+	}
+
+	/** Begins the process of adding a subtag to a parent tag */
+	void AddSubtagFromParent(const FString& ParentTagName, const FName& ParentTagSource, bool bAllowNonRestrictedChildren);
+
+	/** Resets all input fields */
+	void Reset();
+
+private:
+
+	/** Sets the name of the tag. Uses the default if the name is not specified */
+	void SetTagName(const FText& InName = FText());
+
+	/** Selects tag file location. Uses the default if the location is not specified */
+	void SelectTagSource(const FName& InSource = FName());
+
+	void SetAllowNonRestrictedChildren(bool bInAllowNonRestrictedChildren = false);
+
+	/** Creates a list of all INIs that gameplay tags can be added to */
+	void PopulateTagSources();
+
+	/** Callback for when Enter is pressed when modifying a tag's name or comment */
+	void OnCommitNewTagName(const FText& InText, ETextCommit::Type InCommitType);
+
+	/** Callback for when the Add New Tag button is pressed */
+	FReply OnAddNewTagButtonPressed();
+
+	void ValidateNewRestrictedTag();
+
+	/** Creates a new restricted gameplay tag and adds it to the INI files based on the widget's stored parameters */
+	void CreateNewRestrictedGameplayTag();
+
+	void CancelNewTag();
+
+	/** Populates the widget's combo box with all potential places where a gameplay tag can be stored */
+	TSharedRef<SWidget> OnGenerateTagSourcesComboBox(TSharedPtr<FName> InItem);
+
+	/** Creates the text displayed by the combo box when an option is selected */
+	FText CreateTagSourcesComboBoxContent() const;
+
+private:
+
+	/** All potential INI files where a gameplay tag can be stored */
+	TArray<TSharedPtr<FName> > RestrictedTagSources;
+
+	/** The name of the next gameplay tag to create */
+	TSharedPtr<SEditableTextBox> TagNameTextBox;
+
+	/** The comment to asign to the next gameplay tag to create*/
+	TSharedPtr<SEditableTextBox> TagCommentTextBox;
+
+	TSharedPtr<SCheckBox> AllowNonRestrictedChildrenCheckBox;
+
+	/** The INI file where the next restricted gameplay tag will be created */
+	TSharedPtr<SComboBox<TSharedPtr<FName> > > TagSourcesComboBox;
+
+	/** Callback for when a new restricted gameplay tag has been added to the INI files */
+	FOnRestrictedGameplayTagAdded OnRestrictedGameplayTagAdded;
+
+	bool bAddingNewRestrictedTag;
+
+	/** Tracks if this widget should get keyboard focus */
+	bool bShouldGetKeyboardFocus;
+
+	FString DefaultNewName;
+
+	TSharedPtr<SNotificationItem> AddRestrictedGameplayTagDialog;
+};
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.cpp b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.cpp
index e3ab0e855c80..50993a36ab61 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.cpp
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.cpp
@@ -25,6 +25,8 @@
 #include "Layout/WidgetPath.h"
 #include "Framework/Application/SlateApplication.h"
 #include "SAddNewGameplayTagWidget.h"
+#include "SAddNewGameplayTagSourceWidget.h"
+#include "SAddNewRestrictedGameplayTagWidget.h"
 #include "SRenameGameplayTagDialog.h"
 #include "AssetData.h"
 #include "AssetManagerEditorModule.h"
@@ -53,10 +55,25 @@ void SGameplayTagWidget::Construct(const FArguments& InArgs, const TArray<FEdita
 	bDelayRefresh = false;
 	MaxHeight = InArgs._MaxHeight;
 
+	bRestrictedTags = InArgs._RestrictedTags;
+
+	UGameplayTagsManager::OnEditorRefreshGameplayTagTree.AddSP(this, &SGameplayTagWidget::RefreshOnNextTick);
 	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
 
 	Manager.GetFilteredGameplayRootTags(RootFilterString, TagItems);
 
+	if (bRestrictedTags)
+	{
+		// We only want to show the restricted gameplay tags
+		for (int32 Idx = TagItems.Num() - 1; Idx >= 0; --Idx)
+		{
+			if (!TagItems[Idx]->IsRestrictedGameplayTag())
+			{
+				TagItems.RemoveAtSwap(Idx);
+			}
+		}
+	}
+
 	// Tag the assets as transactional so they can support undo/redo
 	TArray<UObject*> ObjectsToMarkTransactional;
 	if (PropertyHandle.IsValid())
@@ -82,6 +99,8 @@ void SGameplayTagWidget::Construct(const FArguments& InArgs, const TArray<FEdita
 		}
 	}
 
+	const FText NewTagText = bRestrictedTags ? LOCTEXT("AddNewRestrictedTag", "Add New Restricted Gameplay Tag") : LOCTEXT("AddNewTag", "Add New Gameplay Tag");
+
 	ChildSlot
 	[
 		SNew(SBorder)
@@ -111,12 +130,25 @@ void SGameplayTagWidget::Construct(const FArguments& InArgs, const TArray<FEdita
 					.Visibility( this, &SGameplayTagWidget::DetermineExpandableUIVisibility )
 					[
 						SNew( STextBlock )
-						.Text( LOCTEXT("AddNewTag", "Add New Gameplay Tag"))
+						.Text( NewTagText )
 					]
 				]
 			]
 
-			// Expandable UI content
+
+			// Expandable UI for adding restricted tags
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Top)
+			.Padding(16.0f, 0.0f)
+			[
+				SAssignNew(AddNewRestrictedTagWidget, SAddNewRestrictedGameplayTagWidget)
+				.Visibility(this, &SGameplayTagWidget::DetermineAddNewRestrictedTagWidgetVisibility)
+				.OnRestrictedGameplayTagAdded(this, &SGameplayTagWidget::OnGameplayTagAdded)
+				.NewRestrictedTagName(InArgs._NewTagName)
+			]
+
+			// Expandable UI for adding non-restricted tags
 			+SVerticalBox::Slot()
 			.AutoHeight()
 			.VAlign(VAlign_Top)
@@ -128,6 +160,42 @@ void SGameplayTagWidget::Construct(const FArguments& InArgs, const TArray<FEdita
 				.NewTagName(InArgs._NewTagName)
 			]
 
+			// Expandable UI controls
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Top)
+			[
+				SNew(SHorizontalBox)
+
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew(SCheckBox)
+					.IsChecked(this, &SGameplayTagWidget::GetAddSourceSectionExpansionState)
+					.OnCheckStateChanged(this, &SGameplayTagWidget::OnAddSourceSectionExpansionStateChanged)
+					.CheckedImage(FEditorStyle::GetBrush("TreeArrow_Expanded"))
+					.CheckedHoveredImage(FEditorStyle::GetBrush("TreeArrow_Expanded_Hovered"))
+					.CheckedPressedImage(FEditorStyle::GetBrush("TreeArrow_Expanded"))
+					.UncheckedImage(FEditorStyle::GetBrush("TreeArrow_Collapsed"))
+					.UncheckedHoveredImage(FEditorStyle::GetBrush("TreeArrow_Collapsed_Hovered"))
+					.UncheckedPressedImage(FEditorStyle::GetBrush("TreeArrow_Collapsed"))
+					.Visibility(this, &SGameplayTagWidget::DetermineAddNewSourceExpandableUIVisibility)
+					[
+						SNew(STextBlock)
+						.Text(LOCTEXT("AddNewSource", "Add New Tag Source"))
+					]
+				]
+			]
+
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Top)
+			.Padding(16.0f, 0.0f)
+			[
+				SAssignNew(AddNewTagSourceWidget, SAddNewGameplayTagSourceWidget)
+				.Visibility(this, &SGameplayTagWidget::DetermineAddNewSourceWidgetVisibility)
+			]
+
 			+SVerticalBox::Slot()
 			.AutoHeight()
 			.VAlign(VAlign_Top)
@@ -285,6 +353,11 @@ bool SGameplayTagWidget::FilterChildrenCheck( TSharedPtr<FGameplayTagNode> InIte
 		return false;
 	}
 
+	if (bRestrictedTags && !InItem->IsRestrictedGameplayTag())
+	{
+		return false;
+	}
+
 	auto FilterChildrenCheck_r = ([=]()
 	{
 		TArray< TSharedPtr<FGameplayTagNode> > Children = InItem->GetChildTagNodes();
@@ -323,27 +396,50 @@ TSharedRef<ITableRow> SGameplayTagWidget::OnGenerateRow(TSharedPtr<FGameplayTagN
 		UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
 
 		FName TagName = InItem.Get()->GetCompleteTagName();
-		FString TagComment;
-		FName TagSource;
-
-		Manager.GetTagEditorData(TagName, TagComment, TagSource);
+		TSharedPtr<FGameplayTagNode> Node = Manager.FindTagNode(TagName);
 
 		FString TooltipString = TagName.ToString();
 
-		// Add Tag source in management mode
-		if (GameplayTagUIMode == EGameplayTagUIMode::ManagementMode)
+		if (Node.IsValid())
 		{
-			if (TagSource == NAME_None)
+			// Add Tag source if we're in management mode
+			if (GameplayTagUIMode == EGameplayTagUIMode::ManagementMode)
 			{
-				TagSource = FName(TEXT("Implicit"));
+				FName TagSource;
+
+				if (Node->bIsExplicitTag)
+				{
+					TagSource = Node->SourceName;
+				}
+				else
+				{
+					TagSource = FName(TEXT("Implicit"));
+				}
+
+				TooltipString.Append(FString::Printf(TEXT(" (%s)"), *TagSource.ToString()));
 			}
 
-			TooltipString.Append(FString::Printf(TEXT(" (%s)"), *TagSource.ToString()));
-		}
+			// tag comments
+			if (!Node->DevComment.IsEmpty())
+			{
+				TooltipString.Append(FString::Printf(TEXT("\n\n%s"), *Node->DevComment));
+			}
 
-		if (!TagComment.IsEmpty())
-		{
-			TooltipString.Append(FString::Printf(TEXT("\n\n%s"), *TagComment));
+			// info related to conflicts
+			if (Node->bDescendantHasConflict)
+			{
+				TooltipString.Append(TEXT("\n\nA tag that descends from this tag has a source conflict."));
+			}
+
+			if (Node->bAncestorHasConflict)
+			{
+				TooltipString.Append(TEXT("\n\nThis tag is descended from a tag that has a conflict. No operations can be performed on this tag until the conflict is resolved."));
+			}
+
+			if (Node->bNodeHasConflict)
+			{
+				TooltipString.Append(TEXT("\n\nThis tag comes from multiple sources. Tags may only have one source."));
+			}
 		}
 
 		TooltipText = FText::FromString(TooltipString);
@@ -379,9 +475,22 @@ TSharedRef<ITableRow> SGameplayTagWidget::OnGenerateRow(TSharedPtr<FGameplayTagN
 				SNew( STextBlock )
 				.ToolTip( FSlateApplication::Get().MakeToolTip(TooltipText) )
 				.Text(FText::FromName( InItem->GetSimpleTagName()) )
+				.ColorAndOpacity(this, &SGameplayTagWidget::GetTagTextColour, InItem)
 				.Visibility( GameplayTagUIMode != EGameplayTagUIMode::SelectionMode ? EVisibility::Visible : EVisibility::Collapsed )
 			]
 
+			// Allows non-restricted children checkbox
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.HAlign(HAlign_Right)
+			[
+				SNew(SCheckBox)
+				.ToolTipText(LOCTEXT("AllowsChildren", "Does this restricted tag allow non-restricted children"))
+				.OnCheckStateChanged(this, &SGameplayTagWidget::OnAllowChildrenTagCheckStatusChanged, InItem)
+				.IsChecked(this, &SGameplayTagWidget::IsAllowChildrenTagChecked, InItem)
+				.Visibility(this, &SGameplayTagWidget::DetermineAllowChildrenVisible, InItem)
+			]
+
 			// Add Subtag
 			+SHorizontalBox::Slot()
 			.AutoWidth()
@@ -389,7 +498,7 @@ TSharedRef<ITableRow> SGameplayTagWidget::OnGenerateRow(TSharedPtr<FGameplayTagN
 			[
 				SNew( SButton )
 				.ToolTipText( LOCTEXT("AddSubtag", "Add Subtag") )
-				.Visibility(this, &SGameplayTagWidget::DetermineExpandableUIVisibility)
+				.Visibility(this, &SGameplayTagWidget::DetermineAddNewSubTagWidgetVisibility, InItem)
 				.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
 				.OnClicked( this, &SGameplayTagWidget::OnAddSubtagClicked, InItem )
 				.DesiredSizeScale(FVector2D(0.75f, 0.75f))
@@ -601,6 +710,44 @@ ECheckBoxState SGameplayTagWidget::IsTagChecked(TSharedPtr<FGameplayTagNode> Nod
 	}
 }
 
+void SGameplayTagWidget::OnAllowChildrenTagCheckStatusChanged(ECheckBoxState NewCheckState, TSharedPtr<FGameplayTagNode> NodeChanged)
+{
+	if (NewCheckState == ECheckBoxState::Checked)
+	{
+		NodeChanged->bAllowNonRestrictedChildren = true;
+	}
+	else if (NewCheckState == ECheckBoxState::Unchecked)
+	{
+		NodeChanged->bAllowNonRestrictedChildren = false;
+	}
+}
+
+ECheckBoxState SGameplayTagWidget::IsAllowChildrenTagChecked(TSharedPtr<FGameplayTagNode> Node) const
+{
+	if (Node->GetAllowNonRestrictedChildren())
+	{
+		return ECheckBoxState::Checked;
+	}
+
+	return ECheckBoxState::Unchecked;
+}
+
+EVisibility SGameplayTagWidget::DetermineAllowChildrenVisible(TSharedPtr<FGameplayTagNode> Node) const
+{
+	// We do not allow you to modify nodes that have a conflict or inherit from a node with a conflict
+	if (Node->bNodeHasConflict || Node->bAncestorHasConflict)
+	{
+		return EVisibility::Hidden;
+	}
+
+	if (bRestrictedTags)
+	{
+		return EVisibility::Visible;
+	}
+
+	return EVisibility::Collapsed;
+}
+
 FReply SGameplayTagWidget::OnClearAllClicked()
 {
 	FScopedTransaction Transaction( LOCTEXT("GameplayTagWidget_RemoveAllTags", "Remove All Gameplay Tags") );
@@ -619,6 +766,31 @@ FReply SGameplayTagWidget::OnClearAllClicked()
 	return FReply::Handled();
 }
 
+FSlateColor SGameplayTagWidget::GetTagTextColour(TSharedPtr<FGameplayTagNode> Node) const
+{
+	static const FLinearColor DefaultTextColour = FLinearColor::White;
+	static const FLinearColor DescendantConflictTextColour = FLinearColor(1.f, 0.65f, 0.f); // orange
+	static const FLinearColor NodeConflictTextColour = FLinearColor::Red;
+	static const FLinearColor AncestorConflictTextColour = FLinearColor(1.f, 1.f, 1.f, 0.5f);
+
+	if (Node->bNodeHasConflict)
+	{
+		return NodeConflictTextColour;
+	}
+
+	if (Node->bDescendantHasConflict)
+	{
+		return DescendantConflictTextColour;
+	}
+
+	if (Node->bAncestorHasConflict)
+	{
+		return AncestorConflictTextColour;
+	}
+
+	return DefaultTextColour;
+}
+
 FReply SGameplayTagWidget::OnExpandAllClicked()
 {
 	SetTagTreeItemExpansion(true);
@@ -640,8 +812,11 @@ FReply SGameplayTagWidget::OnAddSubtagClicked(TSharedPtr<FGameplayTagNode> InTag
 		FString TagName = InTagNode->GetCompleteTagString();
 		FString TagComment;
 		FName TagSource;
+		bool bTagIsExplicit;
+		bool bTagIsRestricted;
+		bool bTagAllowsNonRestrictedChildren;
 
-		Manager.GetTagEditorData(InTagNode->GetCompleteTagName(), TagComment, TagSource);
+		Manager.GetTagEditorData(InTagNode->GetCompleteTagName(), TagComment, TagSource, bTagIsExplicit, bTagIsRestricted, bTagAllowsNonRestrictedChildren);
 
 		if (AddNewTagWidget.IsValid())
 		{
@@ -662,6 +837,12 @@ TSharedRef<SWidget> SGameplayTagWidget::MakeTagActionsMenu(TSharedPtr<FGameplayT
 		bShowManagement = false;
 	}
 
+	// You can't modify restricted tags in the normal tag menus
+	if (!bRestrictedTags && InTagNode->IsRestrictedGameplayTag())
+	{
+		bShowManagement = false;
+	}
+
 	FMenuBuilder MenuBuilder(true, NULL);
 
 	// Rename
@@ -959,11 +1140,21 @@ EVisibility SGameplayTagWidget::DetermineExpandableUIVisibility() const
 	return EVisibility::Visible;
 }
 
+EVisibility SGameplayTagWidget::DetermineAddNewSourceExpandableUIVisibility() const
+{
+	if (bRestrictedTags)
+	{
+		return EVisibility::Collapsed;
+	}
+
+	return DetermineExpandableUIVisibility();
+}
+
 EVisibility SGameplayTagWidget::DetermineAddNewTagWidgetVisibility() const
 {
 	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
 
-	if ( !Manager.ShouldImportTagsFromINI() || !bAddTagSectionExpanded )
+	if ( !Manager.ShouldImportTagsFromINI() || !bAddTagSectionExpanded || bRestrictedTags )
 	{
 		// If we can't support adding tags from INI files, we should never see this widget
 		return EVisibility::Collapsed;
@@ -972,6 +1163,55 @@ EVisibility SGameplayTagWidget::DetermineAddNewTagWidgetVisibility() const
 	return EVisibility::Visible;
 }
 
+EVisibility SGameplayTagWidget::DetermineAddNewRestrictedTagWidgetVisibility() const
+{
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+
+	if (!Manager.ShouldImportTagsFromINI() || !bAddTagSectionExpanded || !bRestrictedTags)
+	{
+		// If we can't support adding tags from INI files, we should never see this widget
+		return EVisibility::Collapsed;
+	}
+
+	return EVisibility::Visible;
+}
+
+EVisibility SGameplayTagWidget::DetermineAddNewSourceWidgetVisibility() const
+{
+	UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+
+	if (!Manager.ShouldImportTagsFromINI() || !bAddSourceSectionExpanded || bRestrictedTags)
+	{
+		// If we can't support adding tags from INI files, we should never see this widget
+		return EVisibility::Collapsed;
+	}
+
+	return EVisibility::Visible;
+}
+
+EVisibility SGameplayTagWidget::DetermineAddNewSubTagWidgetVisibility(TSharedPtr<FGameplayTagNode> Node) const
+{
+	EVisibility LocalVisibility = DetermineExpandableUIVisibility();
+	if (LocalVisibility != EVisibility::Visible)
+	{
+		return LocalVisibility;
+	}
+
+	// We do not allow you to add child tags under a conflict
+	if (Node->bNodeHasConflict || Node->bAncestorHasConflict)
+	{
+		return EVisibility::Hidden;
+	}
+
+	// show if we're dealing with restricted tags exclusively or restricted tags that allow non-restricted children
+	if (Node->GetAllowNonRestrictedChildren() || bRestrictedTags)
+	{
+		return EVisibility::Visible;
+	}
+
+	return EVisibility::Hidden;
+}
+
 EVisibility SGameplayTagWidget::DetermineClearSelectionVisibility() const
 {
 	return CanSelectTags() ? EVisibility::Visible : EVisibility::Collapsed;
@@ -997,6 +1237,16 @@ void SGameplayTagWidget::OnAddTagSectionExpansionStateChanged(ECheckBoxState New
 	bAddTagSectionExpanded = NewState == ECheckBoxState::Checked;
 }
 
+ECheckBoxState SGameplayTagWidget::GetAddSourceSectionExpansionState() const
+{
+	return bAddSourceSectionExpanded ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+}
+
+void SGameplayTagWidget::OnAddSourceSectionExpansionStateChanged(ECheckBoxState NewState)
+{
+	bAddSourceSectionExpanded = NewState == ECheckBoxState::Checked;
+}
+
 void SGameplayTagWidget::RefreshOnNextTick()
 {
 	bDelayRefresh = true;
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.h b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.h
index ffa0e5e799f7..57210a2fd906 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.h
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Private/SGameplayTagWidget.h
@@ -17,6 +17,7 @@
 
 class IPropertyHandle;
 class SAddNewGameplayTagWidget;
+class SAddNewGameplayTagSourceWidget;
 
 /** Determines the behavior of the gameplay tag UI depending on where it's used */
 enum class EGameplayTagUIMode : uint8
@@ -43,6 +44,7 @@ public:
 		, _PropertyHandle( NULL )
 		, _GameplayTagUIMode( EGameplayTagUIMode::SelectionMode )
 		, _MaxHeight(260.0f)
+		, _RestrictedTags( false )
 	{}
 		SLATE_ARGUMENT( FString, Filter ) // Comma delimited string of tag root names to filter by
 		SLATE_ARGUMENT( FString, NewTagName ) // String that will initially populate the New Tag Name field
@@ -54,6 +56,7 @@ public:
 		SLATE_EVENT( FOnTagChanged, OnTagChanged ) // Called when a tag status changes
 		SLATE_ARGUMENT( EGameplayTagUIMode, GameplayTagUIMode )	// Determines behavior of the menu based on where it's used
 		SLATE_ARGUMENT( float, MaxHeight )	// caps the height of the gameplay tag tree
+		SLATE_ARGUMENT( bool, RestrictedTags ) // if we are dealing with restricted tags or regular gameplay tags
 	SLATE_END_ARGS()
 
 	/** Simple struct holding a tag container and its owner for generic re-use of the widget */
@@ -118,9 +121,15 @@ private:
 	/** Tracks if the Add Tag UI is expanded */
 	bool bAddTagSectionExpanded;
 
+	/** Tracks if the Add Source UI is expanded */
+	bool bAddSourceSectionExpanded;
+
 	/** If true, refreshes tags on the next frame */
 	bool bDelayRefresh;
 
+	/** If true, this widget is displaying restricted tags; if false this widget displays regular gameplay tags. */
+	bool bRestrictedTags;
+
 	/** The maximum height of the gameplay tag tree. If 0, the height is unbound. */
 	float MaxHeight;
 
@@ -139,6 +148,12 @@ private:
 	/** The widget that controls how new gameplay tags are added to the config files */
 	TSharedPtr<class SAddNewGameplayTagWidget> AddNewTagWidget;
 
+	/** The widget that controls how new restricted gameplay tags are added to the config files */
+	TSharedPtr<class SAddNewRestrictedGameplayTagWidget> AddNewRestrictedTagWidget;
+
+	/** The widget that controls how new gameplay tag source files are added */
+	TSharedPtr<class SAddNewGameplayTagSourceWidget> AddNewTagSourceWidget;
+
 	/** Allows for the user to find a specific gameplay tag in the tree */
 	TSharedPtr<SSearchBox> SearchTagBox;
 
@@ -188,6 +203,26 @@ private:
 	 */
 	ECheckBoxState IsTagChecked(TSharedPtr<FGameplayTagNode> Node) const;
 
+	/**
+	 * Called via delegate when the status of the allow non-restricted children check box in a row changes
+	 *
+	 * @param NewCheckState	New check box state
+	 * @param NodeChanged	Node that was checked/unchecked
+	 */
+	void OnAllowChildrenTagCheckStatusChanged(ECheckBoxState NewCheckState, TSharedPtr<FGameplayTagNode> NodeChanged);
+
+	/**
+	 * Called via delegate to determine the non-restricted children checkbox state of the specified node
+	 *
+	 * @param Node	Node to find the non-restricted children checkbox state of
+	 *
+	 * @return Non-restricted children heckbox state of the specified node
+	 */
+	ECheckBoxState IsAllowChildrenTagChecked(TSharedPtr<FGameplayTagNode> Node) const;
+
+	/** Helper function to determine the visibility of the checkbox for allowing non-restricted children of restricted gameplay tags */
+	EVisibility DetermineAllowChildrenVisible(TSharedPtr<FGameplayTagNode> Node) const;
+
 	/**
 	 * Helper function called when the specified node is checked
 	 * 
@@ -210,6 +245,15 @@ private:
 	 */
 	void UncheckChildren(TSharedPtr<FGameplayTagNode> NodeUnchecked, FGameplayTagContainer& EditableContainer);
 
+	/**
+	 * Called via delegate to determine the text colour of the specified node
+	 *
+	 * @param Node	Node to find the colour of
+	 *
+	 * @return Text colour of the specified node
+	 */
+	FSlateColor GetTagTextColour(TSharedPtr<FGameplayTagNode> Node) const;
+
 	/** Called when the user clicks the "Clear All" button; Clears all tags */
 	FReply OnClearAllClicked();
 
@@ -246,9 +290,21 @@ private:
 	/** Helper function to determine the visibility of the expandable UI controls */
 	EVisibility DetermineExpandableUIVisibility() const;
 
+	/** Helper function to determine the visibility of the add new source expandable UI controls */
+	EVisibility DetermineAddNewSourceExpandableUIVisibility() const;
+
 	/** Helper function to determine the visibility of the Add New Tag widget */
 	EVisibility DetermineAddNewTagWidgetVisibility() const;
 
+	/** Helper function to determine the visibility of the Add New Tag widget */
+	EVisibility DetermineAddNewRestrictedTagWidgetVisibility() const;
+
+	/** Helper function to determine the visibility of the Add New Tag Source widget */
+	EVisibility DetermineAddNewSourceWidgetVisibility() const;
+
+	/** Helper function to determine the visibility of the Add New Subtag widget */
+	EVisibility DetermineAddNewSubTagWidgetVisibility(TSharedPtr<FGameplayTagNode> Node) const;
+
 	/** Helper function to determine the visibility of the Clear Selection button */
 	EVisibility DetermineClearSelectionVisibility() const;
 
@@ -288,6 +344,12 @@ private:
 	/** Callback for when the state of the expandable UI section changes */
 	void OnAddTagSectionExpansionStateChanged(ECheckBoxState NewState);
 
+	/** Determines if the expandable UI that contains the Add New Tag Source widget should be expanded or collapsed */
+	ECheckBoxState GetAddSourceSectionExpansionState() const;
+
+	/** Callback for when the state of the expandable tag source UI section changes */
+	void OnAddSourceSectionExpansionStateChanged(ECheckBoxState NewState);
+
 	void SetContainer(FGameplayTagContainer* OriginalContainer, FGameplayTagContainer* EditedContainer, UObject* OwnerObj);
 
 	/** Opens a dialog window to rename the selected tag */
diff --git a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Public/GameplayTagsEditorModule.h b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Public/GameplayTagsEditorModule.h
index 17ff165a7cfc..ed5ef5394e58 100644
--- a/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Public/GameplayTagsEditorModule.h
+++ b/Engine/Plugins/Editor/GameplayTagsEditor/Source/GameplayTagsEditor/Public/GameplayTagsEditorModule.h
@@ -38,7 +38,7 @@ public:
 	}
 
 	/** Tries to add a new gameplay tag to the ini lists */
-	GAMEPLAYTAGSEDITOR_API virtual bool AddNewGameplayTagToINI(const FString& NewTag, const FString& Comment = TEXT(""), FName TagSourceName = NAME_None) = 0;
+	GAMEPLAYTAGSEDITOR_API virtual bool AddNewGameplayTagToINI(const FString& NewTag, const FString& Comment = TEXT(""), FName TagSourceName = NAME_None, bool bIsRestrictedTag = false, bool bAllowNonRestrictedChildren = true) = 0;
 
 	/** Tries to delete a tag from the library. This will pop up special UI or error messages as needed. It will also delete redirectors if that is specified. */
 	GAMEPLAYTAGSEDITOR_API virtual bool DeleteTagFromINI(const FString& TagToDelete) = 0;
@@ -52,6 +52,11 @@ public:
 
 /** This is public so that child structs of FGameplayTag can use the details customization */
 struct GAMEPLAYTAGSEDITOR_API FGameplayTagCustomizationPublic
+{
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
+};
+
+struct GAMEPLAYTAGSEDITOR_API FRestrictedGameplayTagCustomizationPublic
 {
 	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
 };
\ No newline at end of file
diff --git a/Engine/Plugins/Editor/USDImporter/Source/USDImporter/Private/PropertyHelpers.cpp b/Engine/Plugins/Editor/USDImporter/Source/USDImporter/Private/PropertyHelpers.cpp
index 050060a02c6a..131510523ae1 100644
--- a/Engine/Plugins/Editor/USDImporter/Source/USDImporter/Private/PropertyHelpers.cpp
+++ b/Engine/Plugins/Editor/USDImporter/Source/USDImporter/Private/PropertyHelpers.cpp
@@ -27,7 +27,7 @@ namespace PropertyHelpers
 					{
 						TCHAR NumberBuffer[11];
 						FMemory::Memcpy(NumberBuffer, &PropertyName[OpenIndex + 1], sizeof(TCHAR) * NumberLength);
-						LexicalConversion::FromString(PropertyAndIndex.ArrayIndex, NumberBuffer);
+						LexFromString(PropertyAndIndex.ArrayIndex, NumberBuffer);
 					}
 				}
 
diff --git a/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/PlatformCrypto.Build.cs b/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/PlatformCrypto.Build.cs
index 41cdb677f371..83cfe4f9643f 100644
--- a/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/PlatformCrypto.Build.cs
+++ b/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/PlatformCrypto.Build.cs
@@ -68,4 +68,4 @@ namespace UnrealBuildTool.Rules
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/Public/IPlatformCrypto.h b/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/Public/IPlatformCrypto.h
index 753757894ad4..f038fdc06971 100644
--- a/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/Public/IPlatformCrypto.h
+++ b/Engine/Plugins/Experimental/PlatformCrypto/Source/PlatformCrypto/Public/IPlatformCrypto.h
@@ -23,7 +23,15 @@ public:
 	 */
 	static inline IPlatformCrypto& Get()
 	{
-		return FModuleManager::LoadModuleChecked< IPlatformCrypto >( "PlatformCrypto" );
+		// Check whether the module is already loaded first. This allows Get() to be called on non-game threads.
+		// LoadModuleChecked is not non-game-thread-safe.
+		IPlatformCrypto* ModulePtr = FModuleManager::GetModulePtr<IPlatformCrypto>("PlatformCrypto");
+		if (ModulePtr)
+		{
+			return *ModulePtr;
+		}
+
+		return FModuleManager::LoadModuleChecked<IPlatformCrypto>("PlatformCrypto");
 	}
 
 	/**
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin b/Engine/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin
index 03cc5c027d98..3ce3d1f4c427 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin
@@ -10,7 +10,7 @@
   "DocsURL" : "",
   "MarketplaceURL" : "",
   "SupportURL" : "",
-  "EnabledByDefault" : false,
+  "EnabledByDefault" : true,
   "CanContainContent" : false,
   "IsBetaVersion" : true,
   "Installed" : false,
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.cpp
index a0318e1b59ba..b4651a011513 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.cpp
@@ -168,8 +168,9 @@ ProxyLOD::FSrcDataGrid::Ptr ProxyLOD::CreateCorrespondence( const FRawMeshArrayA
 
 	const auto& Indices = ReducedMesh.Indices;
 	const auto& Points = ReducedMesh.Points;
-	const auto& Normal = ReducedMesh.Normal;
+	const auto& Normal = (ReducedMesh.TransferNormal.Num() == 0) ? ReducedMesh.Normal : ReducedMesh.TransferNormal;
 
+	checkSlow(Normal.Num() == Points.Num());
 
 	// Iterate over the the UVGrid.
 
@@ -183,8 +184,13 @@ ProxyLOD::FSrcDataGrid::Ptr ProxyLOD::CreateCorrespondence( const FRawMeshArrayA
 			{
 				const auto& TexelData = UVGrid(i, j);
 				ProxyLOD::FSrcMeshData& TargetTexel = TargetGrid(i, j);
+			
+				// initialize with values that will be over-written if we
+				// can create a correspondence with the source mesh for this texel.
+
 				TargetTexel.MaterialId = -1;
 
+				// This texel is associated with a triangle on the target geometry.
 				if (TexelData.TriangleId > -1)
 				{
 					const uint32 TriangleId = TexelData.TriangleId;
@@ -403,7 +409,10 @@ ProxyLOD::FSrcDataGrid::Ptr ProxyLOD::CreateCorrespondence( const openvdb::Int32
 
 	const auto& Indices = ReducedMesh.Indices;
 	const auto& Points = ReducedMesh.Points;
-	const auto& Normal = ReducedMesh.Normal;
+	const auto& Normal = (ReducedMesh.TransferNormal.Num() == 0) ? ReducedMesh.Normal : ReducedMesh.TransferNormal;
+
+	checkSlow(Normal.Num() == Points.Num());
+
 
 
 	// Iterate over the the UVGrid.
@@ -598,7 +607,7 @@ namespace
 {
 
 	template <EFlattenMaterialProperties PropertyType>
-	void TransferMaterial(const ProxyLOD::FSrcDataGrid& CorrespondenceGrid, const ProxyLOD::FRasterGrid& UVGrid, const TArray<FFlattenMaterial>& InputMaterials, TArray<FLinearColor>& SamplesBuffer)
+	void TransferMaterial(const ProxyLOD::FSrcDataGrid& CorrespondenceGrid, const ProxyLOD::FRasterGrid& UVGrid, const TArray<FFlattenMaterial>& InputMaterials, TArray<FLinearColor>& SamplesBuffer, const FLinearColor DefaultColor = FLinearColor(0., 0., 0., 0.))
 	{
 		checkSlow(CorrespondenceGrid.Size() == UVGrid.Size());
 
@@ -609,10 +618,11 @@ namespace
 		// Init buffer to zero color
 
 		ProxyLOD::Parallel_For(ProxyLOD::FIntRange(0, BufferSize),
-			[&SamplesBuffer](const ProxyLOD::FIntRange& Range)
+			[&SamplesBuffer, DefaultColor](const ProxyLOD::FIntRange& Range)
 		{
+			const float MinFloat = std::numeric_limits<float>::lowest();
 			FLinearColor* Data = SamplesBuffer.GetData();
-			for (int32 i = Range.begin(), I = Range.end(); i < I; ++i) Data[i] = FLinearColor(0.f, 0.f, 0.f, 0.f);
+			for (int32 i = Range.begin(), I = Range.end(); i < I; ++i) Data[i] = DefaultColor;
 		});
 
 
@@ -622,7 +632,7 @@ namespace
 			[&](const ProxyLOD::FIntRange& Range)
 		{
 
-			const FColor EmptySrcColor(0, 0, 255);
+			const FColor EmptySrcColor = FColor::Black; 
 
 			auto GetColorFromBuffer = [](const FIntPoint& Size, const TArray<FColor>& Buffer, const FIntPoint& ij)->FLinearColor
 			{
@@ -845,7 +855,7 @@ namespace
 	*  NB: It is assumed that the SuperSample Grid is a multiple of the OutBuffer Grid.  I.e. an integer number of super sample
 	*      texels correspond to each result texel
 	*/
-	void SparseDownSampleColor(const ProxyLOD::TGridWrapper<FLinearColor>& SuperSampleGrid, ProxyLOD::FLinearColorGrid& OutGrid)
+	void SparseDownSampleColor(const ProxyLOD::TGridWrapper<FLinearColor>& SuperSampleGrid, ProxyLOD::FLinearColorGrid& OutGrid, const FLinearColor DefaultColor = FLinearColor(0., 0., 0., 0.))
 	{
 		FIntPoint SuperSampleSize = SuperSampleGrid.Size();
 		FIntPoint ResultSize      = OutGrid.Size();
@@ -923,6 +933,10 @@ namespace
 							ResultColor *= LumaCorrection;
 						}
 					}
+					else
+					{
+						ResultColor = DefaultColor;
+					}
 
 					// write it into the buffer
 					ResultBuffer[i + j * ResultSize.X] = ResultColor;
@@ -1508,7 +1522,7 @@ namespace
 	void TMapFlattenMaterial(const FRawMesh& DstRawMesh, const FRawMeshArrayAdapter& SrcMeshAdapter,
 		const ProxyLOD::FSrcDataGrid&  SuperSampledCorrespondenceGrid,
 		const ProxyLOD::FRasterGrid& SuperSampledDstUVGrid, const ProxyLOD::FRasterGrid& DstUVGrid,
-		const TArray<FFlattenMaterial>& InputMaterials, FFlattenMaterial& OutMaterial)
+		const TArray<FFlattenMaterial>& InputMaterials, FFlattenMaterial& OutMaterial, const FColor DefaultColor = FColor::Black)
 	{
 		const FIntPoint OutSize = OutMaterial.GetPropertySize(PropertyType);
 
@@ -1549,8 +1563,12 @@ namespace
 			}
 			else if (PropertyType == EFlattenMaterialProperties::Diffuse)
 			{
+				// The base color to use when ray-based transfer can't find any source geometry.  This happens most when
+				// using gap filling to close doors and windows.
+				const FLinearColor UnresolvedColor(DefaultColor);
+				
 				TArray<FLinearColor> SuperSampledMaterial;
-				TransferMaterial<PropertyType>(SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, InputMaterials, SuperSampledMaterial);
+				TransferMaterial<PropertyType>(SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, InputMaterials, SuperSampledMaterial, UnresolvedColor);
 
 				// Preserve the average luma when down sampling color.
 				ProxyLOD::TGridWrapper<FLinearColor> SuperSampleGrid(SuperSampledMaterial, SuperSampledDstUVGrid.Size());
@@ -1670,12 +1688,13 @@ void MapFlattenMaterial(const EFlattenMaterialProperties PropertyType,
 	const ProxyLOD::FRasterGrid& SuperSampledDstUVGrid,
 	const ProxyLOD::FRasterGrid& DstUVGrid, 
 	const TArray<FFlattenMaterial>& InputMaterials, 
+	const FColor UnresolvedSrcColor,
 	FFlattenMaterial& OutMaterial)
 {
 	switch (PropertyType)
 	{
 	case EFlattenMaterialProperties::Diffuse:
-		TMapFlattenMaterial<EFlattenMaterialProperties::Diffuse>(DstRawMesh, SrcMeshAdapter, SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, DstUVGrid, InputMaterials, OutMaterial);
+		TMapFlattenMaterial<EFlattenMaterialProperties::Diffuse>(DstRawMesh, SrcMeshAdapter, SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, DstUVGrid, InputMaterials, OutMaterial, UnresolvedSrcColor);
 		break;
 	case EFlattenMaterialProperties::Specular:
 		TMapFlattenMaterial<EFlattenMaterialProperties::Specular>(DstRawMesh, SrcMeshAdapter, SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, DstUVGrid, InputMaterials, OutMaterial);
@@ -1708,7 +1727,8 @@ void ProxyLOD::MapFlattenMaterials(const FRawMesh& DstRawMesh, const FRawMeshArr
 	const ProxyLOD::FSrcDataGrid& SuperSampledCorrespondenceGrid,
 	const ProxyLOD::FRasterGrid& SuperSampledDstUVGrid,
 	const ProxyLOD::FRasterGrid& DstUVGrid,
-	const TArray<FFlattenMaterial>& InputMaterials, 
+	const TArray<FFlattenMaterial>& InputMaterials,
+	const FColor UnresolvedSrcColor,
 	FFlattenMaterial& OutMaterial)
 {
 
@@ -1719,12 +1739,12 @@ void ProxyLOD::MapFlattenMaterials(const FRawMesh& DstRawMesh, const FRawMeshArr
 
 		// NB: The MaterialProperty is captured by value
 
-		auto MapTask = [MaterialProperty, &DstRawMesh, &SrcMeshAdapter, &SuperSampledCorrespondenceGrid, &SuperSampledDstUVGrid, &DstUVGrid, &InputMaterials, &OutMaterial]
+		auto MapTask = [MaterialProperty, &DstRawMesh, &SrcMeshAdapter, &SuperSampledCorrespondenceGrid, &SuperSampledDstUVGrid, &DstUVGrid, &InputMaterials, UnresolvedSrcColor, &OutMaterial]
 		()
 		{
 			// This is also threaded internally. 
 
-			MapFlattenMaterial(MaterialProperty, DstRawMesh, SrcMeshAdapter, SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, DstUVGrid, InputMaterials, OutMaterial);
+			MapFlattenMaterial(MaterialProperty, DstRawMesh, SrcMeshAdapter, SuperSampledCorrespondenceGrid, SuperSampledDstUVGrid, DstUVGrid, InputMaterials, UnresolvedSrcColor, OutMaterial);
 		};
 
 		// enqueue the task with the task manager.
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.h b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.h
index 64cef3c7c626..5db99547c7a9 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.h
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMaterialTransferUtilities.h
@@ -93,6 +93,8 @@ namespace ProxyLOD
 	*                                         ( of the Simplified Geometry) to positions on the Simplified Geometry.
 	* @param InMaterials                      Array of flattened materials corresponding to the various meshes in the
 	*                                         Src geometry.
+	* @param UnresolvedSrcColor               Base color to be used when the src geometry can't be identified (e.g. regions where
+	*                                         gap filling has closed doors and windows)
 	* @param OutMaterials                     Flattened materials for the Simplified Geometry.
 	*
 	* Map Diffuse, Specular, Metallic, Roughness, Normal, Emissive, Opacity to the correct materials.
@@ -104,6 +106,7 @@ namespace ProxyLOD
 							  const ProxyLOD::FRasterGrid&  SuperSampledDstUVGrid,
 							  const ProxyLOD::FRasterGrid&  DstUVGrid,
 							  const TArray<FFlattenMaterial>& InMaterials, 
+							  const FColor UnresolvedSrcColor,
 		                      FFlattenMaterial& OutMaterial);
 
 
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshConvertUtils.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshConvertUtils.cpp
index ac6a3e82126f..d56a9ad3fbc4 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshConvertUtils.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshConvertUtils.cpp
@@ -25,7 +25,7 @@ void ProxyLOD::MixedPolyMeshToRawMesh(const FMixedPolyMesh& SimpleMesh, FRawMesh
 		ProxyLOD::Parallel_For(ProxyLOD::FUIntRange(0, DstNumVerts),
 			[&SimpleMesh, &DstRawMesh](const ProxyLOD::FUIntRange& Range)
 		{
-			// @todo DJH tbb::ProxyLOD::Parallel_For
+	
 			for (uint32 i = Range.begin(), I = Range.end(); i < I; ++i)
 			{
 				const openvdb::Vec3s& Vertex = SimpleMesh.Points[i];
@@ -101,7 +101,7 @@ void ProxyLOD::MixedPolyMeshToRawMesh(const FMixedPolyMesh& SimpleMesh, FRawMesh
 
 
 	// Generate Tangent-Space
-	// djh: adding default values for now
+	// NB: adding default values for now
 	ProxyLOD::Parallel_For(ProxyLOD::FUIntRange(0, DstNumIndexes), [&DstRawMesh](const ProxyLOD::FUIntRange& Range)
 	{
 		for (uint32 i = Range.begin(), I = Range.end(); i < I; ++i)
@@ -171,9 +171,10 @@ void ProxyLOD::AOSMeshToRawMesh(const FAOSMesh& AOSMesh, FRawMesh& OutRawMesh)
 		ProxyLOD::Parallel_For(ProxyLOD::FUIntRange(0, DstNumIndexes),
 			[&AOSMesh, &WedgeIndices](const ProxyLOD::FUIntRange& Range)
 		{
+			const auto& AOSIndexes = AOSMesh.Indexes;
 			for (uint32 i = Range.begin(), I = Range.end(); i < I; ++i)
 			{
-				WedgeIndices[i] = AOSMesh.Indexes[i];
+				WedgeIndices[i] = AOSIndexes[i];
 			}
 		});
 
@@ -187,7 +188,7 @@ void ProxyLOD::AOSMeshToRawMesh(const FAOSMesh& AOSMesh, FRawMesh& OutRawMesh)
 		ResizeArray(OutRawMesh.WedgeTangentY, DstNumIndexes);
 
 		// Generate Tangent-Space
-		// djh: adding default values for now
+		// NB: adding default values for now
 		ProxyLOD::Parallel_For(ProxyLOD::FUIntRange(0, DstNumIndexes), [&OutRawMesh](const ProxyLOD::FUIntRange& Range)
 		{
 			for (uint32 i = Range.begin(), I = Range.end(); i < I; ++i)
@@ -357,7 +358,7 @@ void ProxyLOD::VertexDataMeshToRawMesh(const FVertexDataMesh& SrcVertexDataMesh,
 		}
 	}
 
-	// DJH Testing.
+	
 	// Is the handedness the same for all verts on a given face?
 	{
 		const uint32 DstNumTris = DstNumIndexes / 3;
@@ -429,7 +430,7 @@ void ProxyLOD::VertexDataMeshToRawMesh(const FVertexDataMesh& SrcVertexDataMesh,
 			}
 		}
 #if 0
-		// DJH
+		
 		// Testing with the handedness
 
 		for (uint32 i = 0; i < DstNumIndexes; ++i)
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshParameterization.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshParameterization.cpp
index cbacc2081b6a..945b0d0c8abf 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshParameterization.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshParameterization.cpp
@@ -10,8 +10,6 @@
 #include "ProxyLODMeshUtilities.h"
 
 
-
-
 bool ProxyLOD::GenerateUVs(FVertexDataMesh& InOutMesh, const FTextureAtlasDesc& TextureAtlasDesc, const bool VertexColorParts)
 {
 
@@ -48,7 +46,8 @@ bool ProxyLOD::GenerateUVs(FVertexDataMesh& InOutMesh, const FTextureAtlasDesc&
 
 	// Let the polys in the partitions stretch some..  1.f will let it stretch freely
 
-	const float MaxStretch = 0.125f;
+	const float MaxStretch = 0.125f; // Question.  Does this override the pIMT?
+
 
 	// Size of the texture atlas
 
@@ -72,7 +71,16 @@ bool ProxyLOD::GenerateUVs(FVertexDataMesh& InOutMesh, const FTextureAtlasDesc&
 	// the normals, but that resulted in some large planar regions being really compressed in the
 	// UV chart.
 
-	float * pIMTArray = NULL;
+	float * pIMTArray = new float[NumFaces * 3];
+	for (int32 f = 0; f < NumFaces; ++f)
+	{
+		int32 offset = 3 * f;
+		{
+			pIMTArray[offset    ] = 1.f;
+			pIMTArray[offset + 1] = 0.f;
+			pIMTArray[offset + 2] = 1.f;
+		}
+	}
 
 	HRESULT hr = DirectX::UVAtlasCreate(Pos, NumVerts,
 		indices, DXGI_FORMAT_R32_UINT, NumFaces,
@@ -85,6 +93,9 @@ bool ProxyLOD::GenerateUVs(FVertexDataMesh& InOutMesh, const FTextureAtlasDesc&
 
 	if (FAILED(hr)) return false;
 
+	if (pIMTArray) delete[] pIMTArray;
+	
+
 	// testing
 	check(ib.size() / sizeof(uint32) == NumFaces * 3);
 	check(facePartitioning.size() == NumFaces);
@@ -147,6 +158,21 @@ bool ProxyLOD::GenerateUVs(FVertexDataMesh& InOutMesh, const FTextureAtlasDesc&
 
 	});
 
+	// Update the transfer normals
+	TaskGroup.Run([&]()
+	{
+		const size_t NumNewVerts = vb.size();
+		TArray<FVector> NewTransferNormalsArray;
+		ResizeArray(NewTransferNormalsArray, NumNewVerts);
+
+		// re-order the verts 
+		DirectX::UVAtlasApplyRemap(InOutMesh.TransferNormal.GetData(), sizeof(FVector), NumVerts, NumNewVerts, vertexRemapArray.data(), NewTransferNormalsArray.GetData());
+
+		// swap the data into the raw mesh 
+		Swap(NewTransferNormalsArray, InOutMesh.TransferNormal);
+
+	});
+
 	// Update the tangents
 	TaskGroup.Run([&]()
 	{
@@ -253,53 +279,28 @@ void ProxyLOD::GenerateAdjacency(const FRawMesh& RawMesh, std::vector<uint32>& A
 
 bool ProxyLOD::GenerateAdjacenyAndCleanMesh(FVertexDataMesh& InOutMesh, std::vector<uint32>& Adjacency)
 {
-	GenerateAdjacency(InOutMesh, Adjacency);
+	
 
 
 	std::vector<uint32_t> dupVerts;
 
-	HRESULT hr = DirectX::Clean(InOutMesh.Indices.GetData(), InOutMesh.Indices.Num() / 3, InOutMesh.Points.Num(), Adjacency.data(), NULL, dupVerts, true /*break bowties*/);
+	
 
 	uint32 CleanCount = 0;
-	while (dupVerts.size() != 0 && CleanCount < 4)
+	while (CleanCount == 0 || (dupVerts.size() != 0 && CleanCount < 5))
 	{
 		CleanCount++;
 
-		// add the duplicated verts
-		uint32 NumDup = dupVerts.size();
-		uint32 Offset = InOutMesh.Points.AddUninitialized(NumDup);
+		// Rebuild the adjacency.  
+		Adjacency.clear();
+		GenerateAdjacency(InOutMesh, Adjacency);
 
-		for (uint32 d = 0; d < NumDup; ++d)
-		{
-			InOutMesh.Points[Offset + d] = InOutMesh.Points[dupVerts[d]];
-		}
+		dupVerts.clear();
+		HRESULT hr = DirectX::Clean(InOutMesh.Indices.GetData(), InOutMesh.Indices.Num() / 3, InOutMesh.Points.Num(), Adjacency.data(), NULL, dupVerts, true /*break bowties*/);
 
-		// optionally copy the tangent plane.
-		if (InOutMesh.Normal.Num() == Offset)
-		{
-			InOutMesh.Normal.AddUninitialized(NumDup);
-			for (uint32 d = 0; d < NumDup; ++d)
-			{
-				InOutMesh.Normal[Offset + d] = InOutMesh.Normal[dupVerts[d]];
-			}
-		}
-		if (InOutMesh.Tangent.Num() == Offset)
-		{
-			InOutMesh.Tangent.AddUninitialized(NumDup);
-			for (uint32 d = 0; d < NumDup; ++d)
-			{
-				InOutMesh.Tangent[Offset + d] = InOutMesh.Tangent[dupVerts[d]];
-			}
-		}
-		if (InOutMesh.BiTangent.Num() == Offset)
-		{
-			InOutMesh.BiTangent.AddUninitialized(NumDup);
-			for (uint32 d = 0; d < NumDup; ++d)
-			{
-				InOutMesh.BiTangent[Offset + d] = InOutMesh.BiTangent[dupVerts[d]];
-			}
-		}
+		SplitVertices(InOutMesh, dupVerts);
 
+		uint32 Offset = InOutMesh.Points.Num();
 
 		// spatially separate bowties
 		for (int32 f = 0; f < InOutMesh.Indices.Num() / 3; ++f)
@@ -326,16 +327,8 @@ bool ProxyLOD::GenerateAdjacenyAndCleanMesh(FVertexDataMesh& InOutMesh, std::vec
 				}
 			}
 		}
-
-
-		// Rebuild the adjacency.  
-		Adjacency.clear();
-		GenerateAdjacency(InOutMesh, Adjacency);
-
-		dupVerts.clear();
-		hr = DirectX::Clean(InOutMesh.Indices.GetData(), InOutMesh.Indices.Num() / 3, InOutMesh.Points.Num(), Adjacency.data(), NULL, dupVerts, true /*break bowties*/);
-
 	}
 
 	return (dupVerts.size() == 0);
+
 }
\ No newline at end of file
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.cpp
index 42a06def96cb..82ae49714344 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.cpp
@@ -1,11 +1,14 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "ProxyLODMeshSDFConversions.h"
+#include "ProxyLODMeshConvertUtils.h"
 
 #include "CoreMinimal.h"
 
 #include <openvdb/tools/MeshToVolume.h> // for MeshToVolume
 
+#include <openvdb/tools/Composite.h> // for csgUnion
+
 //#include <exception>
 
 
@@ -51,3 +54,207 @@ bool ProxyLOD::MeshArrayToSDFVolume(const FRawMeshArrayAdapter& MeshAdapter, ope
 	return success;
 
 }
+
+
+bool ProxyLOD::MeshArrayToSDFVolume(const FRawMeshAdapter& MeshAdapter, openvdb::FloatGrid::Ptr& SDFGrid, openvdb::Int32Grid* PolyIndexGrid)
+{
+
+	bool success = true;
+	try
+	{
+		const float HalfBandWidth = 2.f;
+		int Flags = 0;
+		SDFGrid = openvdb::tools::meshToVolume<openvdb::FloatGrid>(MeshAdapter, MeshAdapter.GetTransform(), HalfBandWidth /*exterior*/, HalfBandWidth/*interior*/, Flags, PolyIndexGrid);
+
+		// reduce memory footprint, increase the spareness.
+
+		openvdb::tools::pruneLevelSet(SDFGrid->tree(), HalfBandWidth, -HalfBandWidth);
+	}
+	catch (std::bad_alloc&)
+	{
+		success = false;
+		if (SDFGrid)
+		{
+			SDFGrid->tree().clear(); // free any memory held in the smart pointers in the grid
+		}
+		if (PolyIndexGrid)
+		{
+			PolyIndexGrid->clear();
+		}
+	}
+	return success;
+}
+
+
+/**
+* Generate a new SDF (with narrow band thickness of 2) that represents moving the zero crossing
+* the specified distance in either the positive or negative normal direction.
+*
+* NB: This will fail if the offset is greater than 2 voxels.
+
+*
+* @param  InSDFVolume            SDF grid with assumed narrow band of 2
+* @param  WSOffset               World Space Distance to offset the zero.  This should be in the range -2dx : 2dx. 
+*                                where dx is the input grid voxel size
+* @param  ResultVoxelSize        The voxel size used in the resulting grid.
+*
+* @return A new SDF that represents a dilation or erosion (expansion or contraction) of the original SDF
+*/
+static openvdb::FloatGrid::Ptr OffsetSDF(const openvdb::FloatGrid::Ptr InSDFVolume, const double WSOffset, const double ResultVolexSize)
+{
+	// Extract the iso-surface with offset DilationInVoxels.
+
+	// The voxel size in world space units : taking the first element is okay, since the voxels are square.
+
+	const double VoxelSize = InSDFVolume->transform().voxelSize()[0];
+	
+	// check that the offset is contained in the narrow band of 2 voxels on each side.
+	checkSlow(2. * VoxelSize > WSOffset && 2. * VoxelSize > -WSOffset);
+
+	const double IsoValue = WSOffset;
+
+	FMixedPolyMesh  MixedPolyMesh;
+	openvdb::tools::volumeToMesh(*InSDFVolume, MixedPolyMesh.Points, MixedPolyMesh.Triangles, MixedPolyMesh.Quads, IsoValue, 0.001);
+
+	// convert the mesh to FRawMesh
+	FRawMesh RawMesh;
+	ProxyLOD::MixedPolyMeshToRawMesh(MixedPolyMesh, RawMesh);
+
+	// Create a new empty grid with the same transform and metadata
+	openvdb::FloatGrid::Ptr OutSDFVolume = openvdb::FloatGrid::create(*InSDFVolume);
+	OutSDFVolume->setTransform(openvdb::math::Transform::createLinearTransform(ResultVolexSize));
+
+	// Wrap so we can re-voxelize with bandwidth 2
+	FRawMeshAdapter  MeshAdapter(RawMesh, OutSDFVolume->transform());
+
+	// Re-voxelize
+	ProxyLOD::MeshArrayToSDFVolume(MeshAdapter, OutSDFVolume);
+
+	return OutSDFVolume;
+}
+
+
+void ProxyLOD::CloseGaps(openvdb::FloatGrid::Ptr InOutSDFVolume, const double GapRadius, const int32 MaxDilations)
+{
+	// Implimentaiton notes:
+	// This functions by first inflating (dilate) the geometry SDF (moving the surface outward along the normal) an amount 
+	// GapRadius.  Doing this may bring surfaces into contact, thus closing gaps.
+	// Next the geometry SDF with merged gaps is deflated (erode) to a size that should be slightly smaller than the original geometry.
+	// Lastly a union between the deflated, gap-merged geometry and a copy of the original SDF is formed.
+	// NB: this relies on the fact that grid-based discretization of the SDF at each step of dilation and erosion also smooths
+	// the SDF (dilation isn't exactly reversed by erosion).
+
+
+	// Early out for invalid input.
+
+	if (!InOutSDFVolume)
+	{
+		return;
+	}
+
+	// The voxel size for this grid
+
+	const double InputVoxelSize = InOutSDFVolume->transform().voxelSize()[0];
+
+	// If the gap radius is too small, this won't have an effect.
+
+	if (GapRadius < InputVoxelSize)
+	{
+		return;
+	}
+
+	const double MaxOffsetInVoxels = 1.5;
+	
+	// Step configuration using InputVoxelSize
+
+	const double DefaultStepSize  = MaxOffsetInVoxels * InputVoxelSize;
+	const int32  DefaultStepNum   = FMath::FloorToInt(float( GapRadius / (MaxOffsetInVoxels * InputVoxelSize)));
+	const double DefaultRemainder = GapRadius - DefaultStepNum * DefaultStepSize;
+
+	// Alternate step configuration, deduce working voxel size from MaxIterations
+
+	const double AltStepSize  = (GapRadius - InputVoxelSize) / MaxDilations;
+	const int32  AltStepNum   = MaxDilations;
+	const double AltRemainder = InputVoxelSize;
+
+	const bool bUseDefaultValues = !(MaxDilations < DefaultStepNum);
+
+	// Choose the correct values to use.  Either dilate and erode with the default voxelsize, or using a bigger voxel size.
+
+	double WorkingStepSize;
+	double WorkingRemainder;
+	double WorkingVoxelSize;
+	int32 StepNum;
+	if (bUseDefaultValues)
+	{
+		WorkingStepSize  = DefaultStepSize;
+		WorkingRemainder = DefaultRemainder;
+		WorkingVoxelSize = InputVoxelSize;
+		StepNum          = DefaultStepNum;
+	}
+	else
+	{
+		WorkingStepSize  = AltStepSize;
+		WorkingRemainder = AltRemainder;
+		WorkingVoxelSize = AltStepSize / MaxOffsetInVoxels;
+		StepNum          = AltStepNum;
+	}
+
+	openvdb::FloatGrid::Ptr TmpGrid = InOutSDFVolume;
+
+	const bool bRequireRemainder = (!bUseDefaultValues || WorkingRemainder > 0.1 * InputVoxelSize);
+
+	// -- Dilate
+
+	if (bRequireRemainder)
+	{    
+		// Note: from inputVoxelSize to WorkingVoxelSize
+		TmpGrid = OffsetSDF(TmpGrid, WorkingRemainder, WorkingVoxelSize); 
+	}
+
+	for (int32 step = 0; step < StepNum; ++step)
+	{
+		TmpGrid = OffsetSDF(TmpGrid, WorkingStepSize, WorkingVoxelSize);
+	}
+
+	// -- Erode
+
+	for (int32 step = 0; step < StepNum; ++step)
+	{
+		TmpGrid = OffsetSDF(TmpGrid, -WorkingStepSize, WorkingVoxelSize);
+	}
+
+	if (bRequireRemainder)
+	{
+		// Note: from WorkingVoxelSize to InputVoxelSize
+		TmpGrid = OffsetSDF(TmpGrid, -WorkingRemainder, InputVoxelSize);
+	}
+
+	// Additional Erode to shrink a little more so this hole-filled surface is slightly offset from the higher-quality
+	// original surface
+
+	TmpGrid = OffsetSDF(TmpGrid, -.5 * InputVoxelSize, InputVoxelSize);
+	
+	// Union with the higher quality source (this will add the hole plugs..) 
+	
+	openvdb::tools::csgUnion(*InOutSDFVolume, *TmpGrid);
+
+	// reduce memory footprint, increase sparseness
+
+	const float HalfBandWidth = 2.f;
+	openvdb::tools::pruneLevelSet(InOutSDFVolume->tree(), HalfBandWidth, -HalfBandWidth);
+
+}
+
+void ProxyLOD::RemoveClipped(openvdb::FloatGrid::Ptr InOutSDFVolume, openvdb::FloatGrid::Ptr ClippingVolume)
+{
+
+	// do a difference that deletes the clippling volume from the geometry.
+
+	openvdb::tools::csgDifference(*InOutSDFVolume, *ClippingVolume, true);
+
+	// reduce memory footprint, increase sparseness
+
+	const float HalfBandWidth = 2.f;
+	openvdb::tools::pruneLevelSet(InOutSDFVolume->tree(), HalfBandWidth, -HalfBandWidth);
+}
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.h b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.h
index 55a0623d520b..ec702ec187f8 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.h
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshSDFConversions.h
@@ -32,6 +32,10 @@ namespace ProxyLOD
 	                           openvdb::FloatGrid::Ptr& OutSDFGrid,
 		                       openvdb::Int32Grid* OutPolyIndexGrid = nullptr);
 
+	bool MeshArrayToSDFVolume( const FRawMeshAdapter& InMeshAdapter,
+		                       openvdb::FloatGrid::Ptr& OutSDFGrid,
+		                       openvdb::Int32Grid* OutPolyIndexGrid = nullptr);
+
 	/**
 	* Extract the isosurface (=IsoValue) of the given SDF volume, in the form of triangle mesh.
 	*
@@ -66,6 +70,38 @@ namespace ProxyLOD
 		                              const double IsoValue, 
 		                              const double Adaptivity, 
 		                              TAOSMesh<AOSVertexType>& OutMesh);
+
+	/**
+	* Updates the InOutSDFVollume to potentially close small holes and gaps in the iso-surface.
+	*
+	* This is particularly useful when processing distant buildings (where the doors
+	* and windows may only be a few voxels in size).  In this case, closing the openings
+	* may result in a water-tight mesh and thus remove interior geometry.
+	* 
+	* NB: In addition to closing holes, this may merge nearby separate objects.
+	*
+	* @param InOutSDFVolume      Signed distance field that will be altered
+	* @param GapRadius           1/2 the length scale of the gap or hole size.
+	* @param MaxDilations        The max allowed number of dilation/erosion pairs,
+	*
+	* NB: If the GapRadius is large compared with the voxelsize of the input volume, 
+	* the dilations and erosions will be done with a larger voxelsize (as determined
+	* by MaxDilations).
+	*                            
+	*/
+	void CloseGaps(openvdb::FloatGrid::Ptr InOutSDFVolume, const double GapRadius, const int32 MaxDilations);
+
+	/**
+	* Update the InOutSDFVolume by doing a CSG difference with the Clipping volume.
+	*
+	* NB: In addition to altering the InOutSDFVolume, this may destroy the clipping volume
+	*
+	* @param InOutSDFVolume     Signed distance field representing the interesting geometry.
+	* @param ClippingVolume     Signed distance field representing the region to be subtracted from the interesting geometry.
+	*
+	*/
+	void RemoveClipped(openvdb::FloatGrid::Ptr InOutSDFVolume, openvdb::FloatGrid::Ptr ClippingVolume);
+
 }
 
 
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.cpp
index cf76bbc952f1..0db40183defd 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.cpp
@@ -37,6 +37,33 @@ void FRawMeshAdapter::getIndexSpacePoint(size_t FaceNumber, size_t CornerNumber,
 
 // --- FRawMeshArrayAdapter ----
 
+
+FRawMeshArrayAdapter::FRawMeshArrayAdapter(const TArray<const FMeshMergeData*>& InMergeDataPtrArray)
+{
+	// Make a default transform.
+	Transform = openvdb::math::Transform::createLinearTransform(1.);
+
+	PointCount = 0;
+	PolyCount = 0;
+
+	PolyOffsetArray.push_back(PolyCount);
+	for (int32 MeshIdx = 0, MeshCount = InMergeDataPtrArray.Num(); MeshIdx < MeshCount; ++MeshIdx)
+	{
+		const FMeshMergeData* MergeData = InMergeDataPtrArray[MeshIdx];
+		const FRawMesh* RawMesh = MergeData->RawMesh;
+		PointCount += size_t(RawMesh->VertexPositions.Num());
+		PolyCount += size_t(RawMesh->WedgeIndices.Num() / 3);
+
+		PolyOffsetArray.push_back(PolyCount);
+		RawMeshArray.push_back(RawMesh);
+
+		MergeDataArray.push_back(MergeData);
+	}
+
+	// Compute the bbox
+	ComputeAABB(this->BBox);
+}
+
 FRawMeshArrayAdapter::FRawMeshArrayAdapter(const TArray<FMeshMergeData>& InMergeDataArray)
 {
 	// Make a default transform.
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.h b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.h
index 40905456a2bf..dbea3dab5f5f 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.h
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshTypes.h
@@ -48,7 +48,7 @@
 */
 
 /**
-* Utility to resize an array.
+* Utility to resize an array with uninitialized data.
 * NB: this destroys any content.
 */
 template <typename ValueType>
@@ -58,7 +58,27 @@ void ResizeArray(TArray<ValueType>& Array, int32 Size)
 	Array.AddUninitialized(Size);
 }
 
+/**
+* Utility to resize an array with constructor initialized data.
+* NB: this destroys any content.
+*/
+template <typename ValueType>
+void ResizeInializedArray(TArray<ValueType>& Array, int32 Size)
+{
+	if (Size == 0)
+	{
+		TArray<ValueType> EmptyVector;
+		Swap(EmptyVector, Array);
+	}
+	else
+	{
 
+		TArray<ValueType> Tmp;
+		Tmp.InsertDefaulted(0, Size);
+
+		Swap(Array, Tmp);
+	}
+}
 /**
 * Mesh type that holds minimal required data for openvdb iso-surface extraction 
 * interface.
@@ -86,6 +106,10 @@ struct FVertexDataMesh
 	TArray<FVector>   Normal;
 	TArray<FVector>   Tangent;
 	TArray<FVector>   BiTangent;
+
+	// Optional. Used for ray shooting when transfering materials.
+	TArray<FVector>   TransferNormal;
+
 	// stores information about the tangentspace
 	// 1 = right handed.  -1 left handed
 	TArray<int32>     TangentHanded;
@@ -186,6 +210,13 @@ public:
 	// Return position pos in local grid index space for polygon n and vertex v
 	void getIndexSpacePoint(size_t FaceNumber, size_t CornerNumber, openvdb::Vec3d& pos) const;
 	
+	/**
+	* The transform used to map between the physical space of the mesh and the voxel space.
+	*/
+	const openvdb::math::Transform& GetTransform() const
+	{
+		return *Transform;
+	}
 
 private:
 
@@ -214,6 +245,8 @@ public:
 
 	FRawMeshArrayAdapter(const TArray<FMeshMergeData>& InMergeDataArray, const openvdb::math::Transform::Ptr InTransform);
 
+	FRawMeshArrayAdapter(const TArray<const FMeshMergeData*>& InMergeDataPtrArray);
+	
 	FRawMeshArrayAdapter(const TArray<FMeshMergeData>& InMergeDataArray);
 
 	// copy constructor 
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.cpp
index 281e05d17482..f685b86c7ab2 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.cpp
@@ -13,6 +13,7 @@
 #include <DirectXMeshCode/DirectXMesh/DirectXMesh.h>
 
 #include <vector>
+#include <map>
 #include <unordered_map>
 
 #define LOCTEXT_NAMESPACE "ProxyLODMeshUtilities"
@@ -41,7 +42,7 @@ void ProxyLOD::ComputeTangentSpace( FRawMesh& RawMesh, const bool bRecomputeNorm
 // Calls into the direxXMesh library to compute the per-vertex normal, by default this will weight by area.
 // Note this is different than computing on the raw mesh, which can result in per-index tangent space.
 
-void ProxyLOD::ComputeVertexNormals( FVertexDataMesh& InOutMesh, const bool bAngleWeighted)
+void ProxyLOD::ComputeVertexNormals(FVertexDataMesh& InOutMesh, const ENormalComputationMethod Method)
 {
 	// Note:
 	// This code relies on the fact that a FVector can be cast as a XMFLOAT3, and a FVector2D can be cast as a XMFLOAT2
@@ -60,15 +61,26 @@ void ProxyLOD::ComputeVertexNormals( FVertexDataMesh& InOutMesh, const bool bAng
 
 	// Default is weight by angle.
 	DWORD NormalFlags = 0;
-	if (bAngleWeighted)
+	switch (Method)
 	{
-		NormalFlags |= DirectX::CNORM_FLAGS::CNORM_DEFAULT;
-	}
-	else
-	{
-		NormalFlags |= DirectX::CNORM_FLAGS::CNORM_WEIGHT_BY_AREA;
+		case ENormalComputationMethod::AngleWeighted:
+			NormalFlags |= DirectX::CNORM_FLAGS::CNORM_DEFAULT;
+			break;
+		case ENormalComputationMethod::AreaWeighted:
+			NormalFlags |= DirectX::CNORM_FLAGS::CNORM_WEIGHT_BY_AREA;
+			break;
+	
+		case ENormalComputationMethod::EqualWeighted:
+			NormalFlags |= DirectX::CNORM_FLAGS::CNORM_WEIGHT_EQUAL;
+			break;
+		
+
+		default:
+			NormalFlags |= DirectX::CNORM_FLAGS::CNORM_DEFAULT;
+			break;
 	}
 
+
 #if (PROXYLOD_CLOCKWISE_TRIANGLES == 1)
 	NormalFlags |= DirectX::CNORM_FLAGS::CNORM_WIND_CW;
 #endif
@@ -146,131 +158,896 @@ void ProxyLOD::ComputeTangentSpace( FVertexDataMesh& InOutMesh, const bool bReco
 	if (TangentX) delete[] TangentX;
 }
 
-// The vertex and edge adjacency information for a watertight triangle mesh.
-class FAdjacencyData
+class FVertexIdToFaceIdAdjacency
+{
+public:
+	typedef TArray<int32, TInlineAllocator<16>> FaceList; 
+
+	FVertexIdToFaceIdAdjacency(const uint32* Indices, const int32 NumIndices, const int32 InNumVerts)
+	{
+		typedef uint32 VertIdxType;
+		check(NumIndices % 3 == 0);
+
+		checkSlow(InNumVerts > -1);
+		checkSlow(NumIndices > -1);
+
+		if (NumIndices == 0 && InNumVerts == 0) return;
+
+		// The number of triangles
+
+		const int32 NumTris = NumIndices / 3;
+
+		// Allocate the result array.  Note the default constructor has to be called on each ellement
+
+		{
+			ResizeInializedArray(VertexToFaces, InNumVerts);
+		}
+
+		// Construct a list of faces that are adjacent to each vertex
+
+
+		for (int32 f = 0; f < NumTris; ++f)
+		{
+			// Register this face with the correct verts
+
+			const int32 TriOffset = 3 * f;  
+			checkSlow(TriOffset + 2 < NumIndices); 
+			const VertIdxType VertId[3] = { Indices[TriOffset + 0], Indices[TriOffset + 1], Indices[TriOffset + 2] };
+
+			for (int v = 0; v < 3; ++v) {
+				checkSlow(VertId[v] < (uint32)InNumVerts);
+				// NB: For debug, make this AddUnique
+				VertexToFaces[VertId[v]].Add(f);
+			}
+		}
+	}
+
+	/**
+	* Find the faces that are adjacent to the edge Vert0-Vert1.
+	*
+	* @param Vert0 - one vertex of the edge
+	* @param Vert1 - other vertex of the edge
+	*
+	* @param AdjFaces - The Ids of faces that are adjacent to this edge.
+
+	* @return - Returns true if the edge is locally manifold (no more than 2 adj faces).  Otherwise false.
+	*/
+	bool FindAdjacentFaces(const uint32 Vert0, const uint32 Vert1, FaceList& AdjFaces) const 
+	{
+
+		// initialize 
+
+
+		// lists of faces for each vert
+
+		const FaceList& FacesAdjacentToV0 = this->VertexToFaces[Vert0];
+		const FaceList& FacesAdjacentToV1 = this->VertexToFaces[Vert1];
+
+
+		bool bManifold = true;
+
+		for (auto V0FaceId : FacesAdjacentToV0)
+		{
+			{
+				int32 Result = FacesAdjacentToV1.Find(V0FaceId);
+				if (Result != INDEX_NONE)
+				{
+					AdjFaces.Add(V0FaceId);
+				}
+			}
+		}
+
+		if (AdjFaces.Num() == 0 || AdjFaces.Num() > 2)
+		{
+			bManifold = false;
+		}
+
+		return bManifold;
+	};
+
+	// Identify the adjacent triangles to a given vertex.
+	// List of faces adjacent to each vertex
+	// ConcurrentFaceList& = VertexToFaces[VertexId] 
+
+	TArray<FaceList>  VertexToFaces;
+
+private:
+	FVertexIdToFaceIdAdjacency();
+};
+
+class FAdjacencyData : public FVertexIdToFaceIdAdjacency
 {
 
 public:
-	typedef std::vector<uint32> FaceList;
+	typedef TArray<int32, TInlineAllocator<16>> FaceList;
+	typedef TArray<int32> EdgeList;
 
-	FAdjacencyData(const uint32* Indices, const uint32 NumIndices, const uint32 NumVerts) :
-		NumEdgeAjacentFaces(NumIndices)
+	class SimpleEdge
+	{
+	public:
+		SimpleEdge() { Verts[0] = 0; Verts[1] = 0; };
+
+
+		SimpleEdge(const uint32 VertA, const uint32 VertB)
+		{
+			if (VertA > VertB)
+			{
+				Verts[0] = VertB;
+				Verts[1] = VertA;
+			}
+			else
+			{
+				Verts[0] = VertA;
+				Verts[1] = VertB;
+			}
+		}
+
+		SimpleEdge(const SimpleEdge& other)
+		{
+			Verts[0] = other.Verts[0];
+			Verts[1] = other.Verts[1];
+		}
+		SimpleEdge& operator=(const SimpleEdge& other)
+		{
+			Verts[0] = other.Verts[0];
+			Verts[1] = other.Verts[1];
+			return *this;
+		}
+
+		bool operator==(const SimpleEdge& other) const
+		{
+			return (Verts[0] == other.Verts[0] && Verts[1] == other.Verts[1]);
+		}
+
+		bool operator<(const SimpleEdge& other) const
+		{
+			return (other.Verts[0] > Verts[0] || (other.Verts[0] == Verts[0] && other.Verts[1] > Verts[1]));
+		}
+
+		uint32 Verts[2];
+	};
+
+	struct SimpleEdgeComparator
+	{
+		bool operator()(const SimpleEdge& lhs, const SimpleEdge& rhs) const
+		{
+			return lhs.operator<(rhs);
+		}
+	};
+
+	class FaceAssociation
+	{
+	public:
+		FaceAssociation() :
+			FaceId(-1),
+			NextId(-1),
+			LastId(-1)
+		{}
+
+		FaceAssociation(const int32 Id) :
+			FaceId(Id),
+			NextId(Id),
+			LastId(Id)
+		{}
+
+		FaceAssociation(const FaceAssociation& other) :
+			FaceId(other.FaceId),
+			NextId(other.NextId),
+			LastId(other.LastId)
+		{}
+
+		// For a correctly links group of faces  LastId <= FaceId <=NextId; 
+		int32 FaceId;
+		int32 NextId;
+		int32 LastId;
+	};
+
+	FAdjacencyData(const uint32* Indices, const int32 NumIndices, const int32 InNumVerts) :
+		FVertexIdToFaceIdAdjacency(Indices, NumIndices, InNumVerts)
 	{
 
+
+		int32 NumVerts = InNumVerts;
+
 		// The number of triangles
-		const uint32 NumTris = NumIndices / 3;
+
+		const int32 NumTris = NumIndices / 3;
 		check(NumIndices % 3 == 0);
 
 
-		//Allocate
-		VertexAdjacentFaceArray = new FaceList[NumVerts];
-		EdgeAdjacentFaceArray = new uint32[NumTris * 3];
+		std::map< SimpleEdge, FaceList, SimpleEdgeComparator >  EdgeToFaceMap;
 
-		for (uint32 f = 0; f < NumTris; ++f)
+
+		// Make a map of edges to faces.
+
+		for (int32 faceIdx = 0; faceIdx < NumTris; ++faceIdx)
 		{
-			// Register this face with the correct verts
-			const uint32 TriOffset = 3 * f;
-			const uint32 VertId[3] = { Indices[TriOffset + 0], Indices[TriOffset + 1], Indices[TriOffset + 2] };
+			int32 offset = 3 * faceIdx;
 
-			for (int v = 0; v < 3; ++v) {
-				check(VertId[v] < NumVerts);
-				VertexAdjacentFaceArray[VertId[v]].push_back(f);
-			}
-		}
+			// Add this face to the 3 edges
+			for (int32 v = 0; v < 3; ++v)
+			{
+				int32 nv = (v + 1) % 3; // next vertex
+				checkSlow(nv < NumVerts);  
 
-
-
-		// Find the other face adjacent to this edge of CurFace.
-		auto FindAdjacentFace = [this](const uint32 Vert0, const uint32 Vert1, const uint32 CurFace)->int32
-		{
-			const FaceList& V0Adjacent = this->VertexAdjacentFaceArray[Vert0];
-			const FaceList& V1Adjacent = this->VertexAdjacentFaceArray[Vert1];
-
-
-			int32 FoundFace = -1;
-			for (std::vector<uint32>::const_iterator V0Iter = V0Adjacent.cbegin(); V0Iter != V0Adjacent.cend(); ++V0Iter) {
-				const uint32 FaceId = *V0Iter;
-				if (FaceId == CurFace) {
-					continue;
+				SimpleEdge  Edge(Indices[offset + v], Indices[offset + nv]);
+				auto Search = EdgeToFaceMap.find(Edge);
+				if (Search != EdgeToFaceMap.end())
+				{
+					auto& Faces = Search->second;
+					Faces.Add(faceIdx);
 				}
 				else
 				{
-					auto result = std::find(std::begin(V1Adjacent), std::end(V1Adjacent), FaceId);
-					if (result != std::end(V1Adjacent))
-					{
-						FoundFace = FaceId;
-						break;
-					}
+					EdgeToFaceMap[Edge].Add(faceIdx);
 				}
 			}
+		}
 
-			//checkSlow(FoundFace != -1)
-
-			return FoundFace;
-		};
-
-
+		// Make an array of edges and a corresponding array of faces.
+		const int32 NumEdges = (int32)(EdgeToFaceMap.size());
+		{
+			ResizeArray(EdgeArray, NumEdges);
+		}
+		{
+			ResizeInializedArray(EdgeToFaces, NumEdges);
+		}
 
 		{
-			int32 AdjacentFace;
-			// Loop over faces
-			for (uint32 f = 0; f < NumTris; ++f)
+			int32 offset = 0;
+			for (auto iter = EdgeToFaceMap.begin(); iter != EdgeToFaceMap.end(); ++iter)
 			{
-				// Get the vertexIds for this face
+				EdgeArray[offset] = iter->first;
 
-				// The verts for this face
-				const uint32 FaceOffset = 3 * f;
-				const uint32 VertId[3] = { Indices[FaceOffset + 0], Indices[FaceOffset + 1], Indices[FaceOffset + 2] };
+				Swap(EdgeToFaces[offset], iter->second);
 
-				// The first edge: Tri[0] -> Tri[1]
-				const uint32 EdgeId0 = f * 3;
-				AdjacentFace = FindAdjacentFace(VertId[0], VertId[1], f);
-				EdgeAdjacentFaceArray[EdgeId0] = (uint32)AdjacentFace;
+				offset++;
+
+			}
+		}
+
+		// Allocate an array: Index by VertexId, Holds Adj Edges
+		{
+			ResizeInializedArray(VertexToEdges, NumVerts);
+		}
+
+		// make map of vertex to edge
+		for (int32 edgeIdx = 0; edgeIdx < NumEdges; ++edgeIdx)
+		{
+			const auto& Edge = EdgeArray[edgeIdx];
+			checkSlow(Edge.Verts[0] < Edge.Verts[1]); 
+			for (int32 v = 0; v < 2; ++v)
+			{
+				uint32 VertIdx = Edge.Verts[v];
+				VertexToEdges[VertIdx].Add(edgeIdx);
+			}
+		}
+
+	}
+
+	/**
+	* Find the faces that are adjacent to the edge Vert0-Vert1.
+	*
+	* @param Edge - The edge in question
+	*
+	* @param AdjFaces - The Ids of faces that are adjacent to this edge.
+	*                   If only one face is adjacent (e.g. a boundary) then -1 will
+	*                   be returned for the other.  If no faces are found then -1, will be returned for each
+	*
+	* @return - Returns true if the edge is locally manifold (no more than 2 adj faces).  Otherwise false.
+	*/
+	bool FindAdjacentFaces(const SimpleEdge& Edge, FaceList& AdjFaces) const
+	{
+		return FVertexIdToFaceIdAdjacency::FindAdjacentFaces(Edge.Verts[0], Edge.Verts[1], AdjFaces);
+	}
 
 
-				// The second edge: VertId1 -> VertId2 
-				const uint32 EdgeId1 = EdgeId0 + 1;
-				AdjacentFace = FindAdjacentFace(VertId[1], VertId[2], f);
-				EdgeAdjacentFaceArray[EdgeId1] = (uint32)AdjacentFace;
+	// Linearization of the EdgeToFaceMap
+	TArray<SimpleEdge> EdgeArray;
+	TArray<FaceList>   EdgeToFaces;   // index by edge: holds array of adj faces
+	TArray<EdgeList>   VertexToEdges; // index by vertex: holds array of edges
 
 
-				// The third edge: VertId2 -> VertId0
-				const uint32 EdgeId2 = EdgeId0 + 2;
-				AdjacentFace = FindAdjacentFace(VertId[2], VertId[0], f);
-				EdgeAdjacentFaceArray[EdgeId2] = (uint32)AdjacentFace;
+private:
+	// don't copy
+	FAdjacencyData(const FAdjacencyData& other);
+};
 
+//This assumes the the number of Faces = NumIndices / 3
+void ProxyLOD::SplitHardAngles(const float HardAngleRadians, const TArray<FVector>& FaceNormals, const int32 NumVerts, TArray<uint32>& Indices, std::vector<uint32_t>& AdditionalVertices)
+{
+
+	const uint32 NumIndices = Indices.Num();
+	// Number of faces of the mesh.  This assumes triangles only!
+
+	const uint32 NumFaces = NumIndices / 3;
+
+	checkSlow(NumFaces == FaceNormals.Num());
+
+	// Basic Adjacency Data
+
+	FAdjacencyData Adjacency(Indices.GetData(), NumIndices, NumVerts);
+
+	// Edge Count
+
+	const int32 NumEdges = Adjacency.EdgeArray.Num();
+
+	// Empty the duplicate vertex array.  Note using std::vector<uint32_t> to allow us to share some code with the UV system which also adds / splits verts.
+
+	std::vector<uint32_t>().swap(AdditionalVertices);
+
+	// Compute the angle, in radians, for each edge.  If an edge is adjacent to 
+	// more than two faces, we set this angle to zero.
+
+	TArray<float> EdgeAngleArray;
+	ResizeArray(EdgeAngleArray, NumEdges);
+	{
+
+		// Compute the difference between faces normals at each edge.  
+		// Make this zero if only one face is adjacent to edge.
+		// Make this zero if more than 2 faces are adjacent to edge.
+
+		for (int32 edgeIdx = 0; edgeIdx < NumEdges; ++edgeIdx)
+		{
+			// The adjacent faces to this edge
+			const auto& Faces = Adjacency.EdgeToFaces[edgeIdx];
+
+			if (Faces.Num() == 2)
+			{
+				const FVector& N0 = FaceNormals[Faces[0]];
+				const FVector& N1 = FaceNormals[Faces[1]];
+
+				const float CosOfAngle = FMath::Clamp(FVector::DotProduct(N0, N1), -1.f, 1.f);
+				const float AngleInRadians = FMath::Acos(CosOfAngle); // Note this is in Radians in the range [0:Pi]
+
+				EdgeAngleArray[edgeIdx] = AngleInRadians;
+			}
+			else
+			{
+				EdgeAngleArray[edgeIdx] = 0.f;
 			}
 
 		}
 	}
 
-	// Clean up
-	~FAdjacencyData()
+	// Construct a list of unique verts that need to be split.
+	// NB: multiple "Hard" edges could connect to a single vert.
+
+	TArray<int32> SplitVertexList;
 	{
-		if (EdgeAdjacentFaceArray)   delete[] EdgeAdjacentFaceArray;
-		if (VertexAdjacentFaceArray) delete[] VertexAdjacentFaceArray;
+
+		// Create a mask of valid edges (those that are adjacent to two faces)
+		// NB: could parallelize
+		TArray<int16> TwoFaceEdgeMask;
+		ResizeInializedArray(TwoFaceEdgeMask, NumEdges);
+
+		for (int32 edgeIdx = 0; edgeIdx < NumEdges; ++edgeIdx)
+		{
+			TwoFaceEdgeMask[edgeIdx] = 1;
+			const auto& Faces = Adjacency.EdgeToFaces[edgeIdx];
+			checkSlow(Faces.Num() > 0); 
+			if (Faces.Num() != 2)
+			{
+				TwoFaceEdgeMask[edgeIdx] = 0;
+			}
+		}
+
+
+		// Loop over the edges, finding the ones that exceed the hard angle limit
+		// and marking the associated vertexs.
+		// VertexSplitMask[i] = 1  if the vert should be split.
+
+
+		TArray<int16> VertToSplitMask;
+		ResizeInializedArray(VertToSplitMask, NumVerts);
+
+		for (int32 vertIdx = 0; vertIdx < NumVerts; ++vertIdx) VertToSplitMask[vertIdx] = 0;
+
+		for (int32 edgeIdx = 0; edgeIdx < NumEdges; ++edgeIdx)
+		{
+			// ignore edges that don't have exactly two faces
+
+			if (TwoFaceEdgeMask[edgeIdx] == 0)
+			{
+				continue;
+			}
+
+			// ignore edges that are under the threshold
+
+			if (EdgeAngleArray[edgeIdx] < HardAngleRadians)
+			{
+				continue;
+			}
+
+			// The edge in question
+
+			const FAdjacencyData::SimpleEdge& Edge = Adjacency.EdgeArray[edgeIdx];
+
+			// Mark the verts of this hard edge  
+			// NB: a vert may be shared by multiple hard edges,
+			// but that is fine.
+
+			VertToSplitMask[Edge.Verts[0]] = 1;
+			VertToSplitMask[Edge.Verts[1]] = 1;
+
+		}
+
+		// Insure that all the edges that are adjacent to a split vert candidate
+		// have two faces.  
+		// @todo: relax this requirement.
+
+		// Mask out any vertex that has an "invalid" edge.
+		// @todo Parallelize
+		for (int32 vertIdx = 0; vertIdx < NumVerts; ++vertIdx)
+		{
+			if (VertToSplitMask[vertIdx] == 1)
+			{
+				bool bValid = true;
+
+				// Get all adjacent edges and test that they are all valid.
+
+				const auto& AdjEdges = Adjacency.VertexToEdges[vertIdx];
+
+				for (auto edgeIdx : AdjEdges)
+				{
+					if (TwoFaceEdgeMask[edgeIdx] == 0)
+					{
+						bValid = false;
+					}
+				}
+
+				if (bValid == false)
+				{
+					VertToSplitMask[vertIdx] = 0;
+				}
+			}
+		}
+
+		// Count the number of verts to split
+
+		int32 NumSplitVerts = 0;
+		for (int32 vertIdx = 0; vertIdx < NumVerts; ++vertIdx)
+		{
+			NumSplitVerts += VertToSplitMask[vertIdx];
+		}
+
+		// Populate the list of verts to split.
+		{
+			ResizeInializedArray(SplitVertexList, NumSplitVerts);
+		}
+
+		int32 offset = 0;
+		for (int32 vertIdx = 0; vertIdx < NumVerts; ++vertIdx)
+		{
+			if (VertToSplitMask[vertIdx] == 1)
+			{
+				checkSlow(offset < NumSplitVerts); 
+				SplitVertexList[offset] = vertIdx;
+				offset++;
+			}
+		}
+
+	}
+
+	// return if there is actually no work to be done.
+	// NB: the AdditionalVertices have already been emptied.
+
+	if (SplitVertexList.Num() == 0)
+	{
+		return;
 	}
 
 
-	// Identify the adjacent triangles to a given edge.
-	// FaceId = EdgeAdjacentFaceArray[EdgeId];
-	// Where 
-	//    EdgeId = TriId, TridId + 1, TriId + 2;
 
-	uint32  NumEdgeAjacentFaces;
-	uint32* EdgeAdjacentFaceArray;
+	// Now that the verts have been identified, they could
+	// processed independently. 
 
-	// Identify the adjacent triangles to a given vertex.
-	// List of faces adjacent to each verted
-	// ConcurrentFaceList& = VertexAdjacentFaceArray[VertexId] 
+	// For each split vertex, build a list of different face groups.
+	// A FaceGroup is an array of faceIds that should share a single
+	// vertex (after splitting).
+	typedef FAdjacencyData::FaceList    FaceGroupType;
+	typedef TArray<FaceGroupType>       ListOfFaceGroupType;
 
-	FaceList*  VertexAdjacentFaceArray;
+	TArray<ListOfFaceGroupType> PerVertArrayOfFaceGroups;
+	ResizeInializedArray(PerVertArrayOfFaceGroups, SplitVertexList.Num());
 
-private:
-	// don't copy
-	FAdjacencyData(const FAdjacencyData& other) {};
-};
 
+	// NB: this could be done in parallel.
+	Parallel_For(FIntRange(0, SplitVertexList.Num()), [&](const FIntRange& Range)->void
+	{
+		//	for (int32 i = 0, IMax = SplitVertexList.Num(); i < IMax; ++i)
+		for (int32 i = Range.begin(); i < Range.end(); ++i)
+		{
+			// The index of the split vert in the vertex array - of the split verts, this is the "i-th" one.
+
+			const int32 splitVertIdx = SplitVertexList[i];
+
+			checkSlow(splitVertIdx < NumVerts && splitVertIdx > -1); 
+
+			// 
+			// -- Need to establish connectivity between the faces that are adjacent to the split vert.
+	        //
+
+		    // All the edges that are adjacent to this vert.
+
+			const auto& VertexAdjacentEdges = Adjacency.VertexToEdges[splitVertIdx];
+
+			// All the faces that are adjacent to this vertex.
+
+			const auto& AdjFaces = Adjacency.VertexToFaces[splitVertIdx];
+			const int32 NumAdjFaces = AdjFaces.Num();
+
+			// Start grouping the faces with their neighbor by constructing something
+			// like a link-list.
+
+			// Generate the link-list elements : each one "owns" a faceId
+			TArray<FAdjacencyData::FaceAssociation> FaceToFaceAssociation;
+			for (const auto& faceIdx : AdjFaces)
+			{
+				FaceToFaceAssociation.Add(FAdjacencyData::FaceAssociation(faceIdx));
+			}
+
+			// A map to index into the link-list by faceId
+			std::map<int32, FAdjacencyData::FaceAssociation*> AssociationMap;
+			for (int32 a = 0, AMax = (int32)FaceToFaceAssociation.Num(); a < AMax; ++a)
+			{
+				FAdjacencyData::FaceAssociation& Association = FaceToFaceAssociation[a];
+				AssociationMap[Association.FaceId] = &(Association);
+			}
+
+			// loop over the edges, making associations between adjacent faces if the edge isn't "Sharp"
+			// Keep track of the sharpest, non-hard edge.  This runner-up may be used to help split the faces
+			// should there be only one hard edge.
+
+			float SharpestAbsAngle = -1.f;
+			int32 SharpestEdgeIdx = -1;
+			for (const auto& edgeIdx : VertexAdjacentEdges)
+			{
+				const float AbsCurrentAngle = EdgeAngleArray[edgeIdx];
+
+				if (AbsCurrentAngle < HardAngleRadians) // Not a "Hard" edge.  The faces should be connected in this case.
+				{
+					// Keep track of the sharpest non-hard edge.  Will have to use this to form the splitting groups
+					// if there aren't any "hard edges" leaving this vert.
+
+					if (AbsCurrentAngle > SharpestAbsAngle)
+					{
+						SharpestAbsAngle = AbsCurrentAngle;
+						SharpestEdgeIdx = edgeIdx;
+					}
+
+					// The faces adj to this edge
+
+					const auto& Faces = Adjacency.EdgeToFaces[edgeIdx];
+					// This is redundant check.  We have already required that all edges have two faces.
+					checkSlow(Faces.Num() < 3); // need this to be manifold!
+
+												// By convention, for our link-list LastId <= FaceId <=NextId
+					if (Faces.Num() == 2)
+					{
+						int32 FaceA, FaceB;
+						if (Faces[0] < Faces[1])
+						{
+							FaceA = Faces[0];
+							FaceB = Faces[1];
+						}
+						else
+						{
+							FaceA = Faces[1];
+							FaceB = Faces[0];
+						}
+
+						checkSlow(FaceA != FaceB); 
+
+						auto& AssociationA = AssociationMap[FaceA];
+						AssociationA->NextId = FaceB;
+
+						auto& AssociationB = AssociationMap[FaceB];
+						AssociationB->LastId = FaceA;
+					}
+
+				}
+			}
+
+			// How many groups do our associations define?
+			// Lets count the number of times LastId == FaceId;
+			int32 GroupCount = 0;
+			int32 LastCount = 0;
+			int32 NextCount = 0;
+			for (const auto& Association : FaceToFaceAssociation)
+			{
+				if (Association.LastId == Association.FaceId)
+				{
+					LastCount++;
+					GroupCount++;
+				}
+				if (Association.NextId == Association.FaceId)
+				{
+					NextCount++;
+				}
+			}
+			
+			checkSlow(LastCount > 0 && NextCount > 0);
+
+			// If we have only one group, then use the next sharpest edge to break it into two
+			// if possible.
+
+			if (GroupCount == 1 && SharpestEdgeIdx != -1)
+			{
+				// Get the faces for the next sharpest edge
+				const auto& Faces = Adjacency.EdgeToFaces[SharpestEdgeIdx];
+
+				checkSlow(Faces.Num() < 3); // need this to be manifold!
+
+				if (Faces.Num() == 2)
+				{
+					int32 FaceA, FaceB;
+					if (Faces[0] < Faces[1])
+					{
+						FaceA = Faces[0];
+						FaceB = Faces[1];
+					}
+					else
+					{
+						FaceA = Faces[1];
+						FaceB = Faces[0];
+					}
+
+					checkSlow(FaceA != FaceB); 
+
+					auto& AssociationA = AssociationMap[FaceA];
+					//checkSlow(AssociationA->NextId == FaceB || AssociationA->NextId == FaceA || AssociationA->LastId == FaceA);
+					AssociationA->NextId = FaceA;
+
+					auto& AssociationB = AssociationMap[FaceB];
+					//checkSlow(AssociationB->LastId == FaceA || AssociationB->NextId == FaceB || AssociationB->LastId == FaceB);
+					AssociationB->LastId = FaceB;
+
+					GroupCount++;
+				}
+			}
+
+			// Should I fix the triangles now?  Okay, lets do that, but it might be better to store this information and do that 
+			// in a following parallel pass.
+
+			// loop over the groups in the association.
+			//  The i-th split vert now has the face group
+
+			ListOfFaceGroupType& FaceGroups = PerVertArrayOfFaceGroups[i];
+			if (GroupCount > 1)
+			{
+				for (auto& Association : FaceToFaceAssociation)
+				{
+					if (Association.FaceId != -1)
+					{
+						// Add this group.
+						FaceGroups.Add(FaceGroupType());
+
+						FaceGroupType& FacesInGroup = FaceGroups.Last();
+						FacesInGroup.Add(Association.FaceId);
+
+						// Go Forward, if there is a next
+						if (Association.NextId != Association.FaceId)
+						{
+							int32 NextId = Association.NextId;
+							int32 CurId = Association.FaceId;
+							while (NextId != CurId && CurId != -1)
+							{
+								auto& CurAssociation = AssociationMap[NextId];
+								CurId = CurAssociation->FaceId;
+								NextId = CurAssociation->NextId;
+								if (CurId != -1) FacesInGroup.Add(CurId);
+
+								// Mark as used
+								CurAssociation->FaceId = -1;
+							}
+						}
+
+						// Go backward, if there is a Last
+						if (Association.LastId != Association.FaceId)
+						{
+							int32 LastId = Association.LastId;
+							int32 CurId = Association.FaceId;
+							while (LastId != CurId && CurId != -1)
+							{
+								auto& CurAssociation = AssociationMap[LastId];
+								CurId = CurAssociation->FaceId;
+								LastId = CurAssociation->LastId;
+								if (CurId != -1) FacesInGroup.Add(CurId);
+
+								// Mark as used
+								CurAssociation->FaceId = -1;
+							}
+						}
+
+						// Mark this one as used:
+						Association.FaceId = -1;
+					}
+				}
+			}
+			else  // There was only one group.  Put all the faces in it.
+			{
+				FaceGroups.Add(FaceGroupType());
+				FaceGroupType& FacesInGroup = FaceGroups.Last();
+				for (auto& Association : FaceToFaceAssociation)
+				{
+					FacesInGroup.Add(Association.FaceId);
+				}
+			}
+
+		}
+	});
+	// Loop over the verts to split and use the face groups to re-write the trianlges
+	// As the same time capture the AdditionalVertices.
+	// NB: this would have to be re-worked a little if you wanted to parallelize this.
+
+	for (int32 i = 0, IMax = SplitVertexList.Num(); i < IMax; ++i)
+	{
+		// Get the index of the i-th split vert
+		const int32 splitVertIdx = SplitVertexList[i];
+
+		// Get the face groups of the i-th split vert
+		const ListOfFaceGroupType& FaceGroups = PerVertArrayOfFaceGroups[i];
+
+		// New VertexIdx
+
+
+		for (int32 faceGroupIDx = 0, FGmax = (int32)FaceGroups.Num(); faceGroupIDx < FGmax; ++faceGroupIDx)
+		{
+			// Allow the first group to use the pre-exsiting vertex
+			if (faceGroupIDx == 0) continue;
+
+			const auto& FacesInGroup = FaceGroups[faceGroupIDx];
+
+			// Where the new vert will live.
+			uint32 NewVertOffset = (uint32)AdditionalVertices.size() + (uint32)NumVerts;
+
+			for (const auto FaceId : FacesInGroup)
+			{
+
+				// for each face
+				// loop over the vertIDs for this face,
+				// and re-wire the one that should point to
+				// the new vertex.
+				int32 offset = 3 * FaceId;
+				for (int32 v = 0; v < 3; ++v)
+				{
+					checkSlow(v + offset < (int32)NumIndices);
+
+					if (Indices[v + offset] == splitVertIdx)
+					{
+						Indices[v + offset] = NewVertOffset;
+					}
+				}
+
+			}
+			// Keep track of the verts we need to copy.
+			AdditionalVertices.push_back(splitVertIdx);
+		}
+
+
+	} // end loop over split verts.
+
+}
+
+void ProxyLOD::SplitHardAngles(const float HardAngleDegrees, FVertexDataMesh& InOutMesh)
+{
+	const float HardAngleRadians = FMath::Abs(FMath::DegreesToRadians(HardAngleDegrees));
+
+	// Number of Indices and Faces
+
+	const int32 NumIndices = InOutMesh.Indices.Num();
+	const int32 NumTriangles = NumIndices / 3;
+
+	if (NumTriangles < 2) return;
+
+	// Allocate space for the face normals
+
+	TArray<FVector>  FaceNormals;
+	ResizeArray(FaceNormals, NumTriangles);
+
+	// Compute face normals in parallel
+
+	ProxyLOD::Parallel_For(ProxyLOD::FIntRange(0, NumTriangles), [&InOutMesh, &FaceNormals](const ProxyLOD::FIntRange& Range)
+	{
+		const uint32* Indices = InOutMesh.Indices.GetData();
+
+		FVector Pos[3];
+		for (uint32 f = Range.begin(), F = Range.end(); f < F; ++f)
+		{
+			const uint32 offset = 3 * f;
+			const uint32 ids[3] = { Indices[offset] , Indices[offset + 1] , Indices[offset + 2] };
+			Pos[0] = InOutMesh.Points[ids[0]];
+			Pos[1] = InOutMesh.Points[ids[1]];
+			Pos[2] = InOutMesh.Points[ids[2]];
+
+			FaceNormals[f] = ComputeNormal(Pos);
+
+		}
+	});
+
+	const int32 NumVerts = InOutMesh.Points.Num();
+	std::vector<uint32_t> dupVerts;
+	ProxyLOD::SplitHardAngles(HardAngleRadians, FaceNormals, NumVerts, InOutMesh.Indices, dupVerts);
+
+
+	// add the duplicated verts, copying all the associated data.
+
+	SplitVertices(InOutMesh, dupVerts);
+
+}
+
+namespace
+{
+	// Use the duplication vector extend the InOutVector with the correct values.
+	template <typename T>
+	void RemapMeshData(TArray<T>& InOutVector, int32 OldSize, const std::vector<uint32_t>& dupList)
+	{
+		uint32 NumDup = dupList.size();
+		if (InOutVector.Num() == OldSize && NumDup != 0)
+		{
+
+			TArray<T> Tmp;
+			ResizeArray(Tmp, OldSize + NumDup);
+
+			for (int32 i = 0; i < OldSize; ++i)
+			{
+				Tmp[i] = InOutVector[i];
+			}
+
+			for (uint32 d = 0; d < NumDup; ++d)
+			{
+				Tmp[OldSize + d] = InOutVector[dupList[d]];
+			}
+
+			Swap(Tmp, InOutVector);
+		}
+	}
+}
+
+
+
+void ProxyLOD::SplitVertices(FVertexDataMesh& InOutMesh, const std::vector<uint32_t>& dupVerts)
+{
+	const uint32 NumDup = dupVerts.size();
+
+	// Early out.
+	if (NumDup == 0) return;
+
+	const uint32 OldVertNum = InOutMesh.Points.Num();
+
+	RemapMeshData(InOutMesh.Points, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.Normal, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.Tangent, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.BiTangent, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.TransferNormal, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.TangentHanded, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.UVs, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.FaceColors, OldVertNum, dupVerts);
+
+	RemapMeshData(InOutMesh.FacePartition, OldVertNum, dupVerts);
+
+}
+
+
+void ProxyLOD::CacheNormals(FVertexDataMesh& InMesh)
+{
+	const int32 NumNormals = InMesh.Normal.Num();
+	TArray<FVector>& CachedNormals = InMesh.TransferNormal;
+	ResizeArray(CachedNormals, NumNormals);
+
+	for (int32 i = 0; i < NumNormals; ++i)
+	{
+		CachedNormals[i] = InMesh.Normal[i];
+	}
+}
 
 // Testing function using for debugging.  Verifies that if A is adjacent to B, then B is adjacent to A.
 // Returns the number of failure cases ( should be zero!)
@@ -319,12 +1096,8 @@ void ProxyLOD::ComputeFaceAveragedVertexNormals(FAOSMesh& InOutMesh)
 {
 
 	// Generate adjacency data
-	FAdjacencyData  AdjacencyData(InOutMesh.Indexes, InOutMesh.GetNumIndexes(), InOutMesh.GetNumVertexes());
-
-	// Test that if faceA is adjacent to faceB  then faceB is adjacent to faceA\
-				// the desired result is zero
-//int TempFailedAdjCount = VerifyAdjacency(TempAdjacencyData.EdgeAdjacentFaceArray, TempAdjacencyData.NumEdgeAjacentFaces);
-
+	FVertexIdToFaceIdAdjacency AdjacencyData(InOutMesh.Indexes, InOutMesh.GetNumIndexes(), InOutMesh.GetNumVertexes());
+	
 	uint32 NumFaces = InOutMesh.GetNumIndexes() / 3;
 
 	// Generate face normals.
@@ -358,15 +1131,16 @@ void ProxyLOD::ComputeFaceAveragedVertexNormals(FAOSMesh& InOutMesh)
 			AOSVertex.Normal = FVector(0.f, 0.f, 0.f);
 
 			// loop over all the faces that share this vertex, accumulating the normal
-			const auto& AdjFaces = AdjacencyData.VertexAdjacentFaceArray[v];
-			checkSlow(AdjFaces.size() != 0);
+			const auto& AdjFaces = AdjacencyData.VertexToFaces[v];
+			checkSlow(AdjFaces.Num() != 0);
 
-			if (AdjFaces.size() != 0)
+			if (AdjFaces.Num() != 0)
 			{
 				FVector Pos[3];
-				for (auto FaceCIter = AdjFaces.cbegin(); FaceCIter != AdjFaces.cend(); ++FaceCIter)
+				for (auto FaceId: AdjFaces)
 				{
-					AOSVertex.Normal += FaceNormals[*FaceCIter];
+					checkSlow(FaceId > -1);
+					AOSVertex.Normal += FaceNormals[FaceId];
 				}
 				AOSVertex.Normal.Normalize();
 			}
@@ -926,7 +1700,7 @@ static void ComputeRawMeshNormals(FRawMesh& InOutMesh)
 static void ComputeAngleAveragedNormal(FVertexDataMesh& VertexDataMesh)
 {
 
-	//djh testing
+	
 	const int32 NormalType = 1;
 	if (NormalType == 0) return;
 
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.h b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.h
index 16d8405a3d81..431f22005c42 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.h
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODMeshUtilities.h
@@ -11,16 +11,23 @@
 
 namespace ProxyLOD
 {
+	enum class ENormalComputationMethod : uint8
+	{
+		AreaWeighted,
+		AngleWeighted,
+		EqualWeighted
+	};
+
 	/**
 	* Calls into the direxXMesh library to compute the per-vertex normal, by default this will weight by area.
 	*
 	* NB: this is different than computing on the raw mesh, which can result in per-index tangent space.
 	* 
 	* @param InOutMesh        Vertex-based mesh which will be updated by this function with with a per-vertex normal
-	* @param bAngleWeighted   Determine if the normal is angle-weighted or area-weighted(default).
+	* @param Method           Determine if the normal is angle-weighted or area-weighted or equal weighted.
 	*/
 	void ComputeVertexNormals( FVertexDataMesh& InOutMesh, 
-		                       const bool bAngleWeighted = false );
+		                       const ENormalComputationMethod Method = ENormalComputationMethod::AngleWeighted);
 	/**
 	* Uses UE4 code in the Mesh Utilities module to compute the tangent space
 	* The computation is a Mikk-T(angent) space version of tangent space.  
@@ -79,6 +86,50 @@ namespace ProxyLOD
 	*/
 	int VerifyAdjacency(const uint32* EdgeAdjacentFaceArray, const uint32 NumEdgeAdjacentFaces);
 
+	/**
+	* Splits vertices along hard edges (as defined by the difference in face normals).
+	*
+	* NB: When a vertex is split, all the data is copied to the duplicate vertices - including any tangent space data.
+	* In general you will want to compute vertex normals and tangent space after doing this.
+	*
+	* @param HardAngleDegrees    The hard angle threshold, in degrees, used to determine if the vertices on an edge should be split.
+	* @param InOutMesh           The mesh that may be altered by the
+	*/
+	void SplitHardAngles(const float HardDegrees, FVertexDataMesh& InOutMesh);
+
+	/**
+	* Alters the connectivity to split vertices along hard edges (as defined by the difference in face normals).
+	*
+	* @param HardAngleRadians    The hard angle threshold, in radians, used to determine if the vertices on an edge should be split.
+	* @param FaceNormals         Pointer to array of face normals.  This is assumed to be of length NumIndices / 3.
+	*
+	* @param NumVerts            Total number of verts.  Usually this will be one more than the max of the Indices[] array.
+	*
+	* @param Indices             The index buffer.  Contents but not length maybe changed on return!
+	*
+	* @param AdditionalVertices  On return An array that maps old vertices to new ones
+	*                            (i.e. need to add Vertex[NumVerts + i] as a copy of VertexId = AdditionVertices[i] )
+	*/
+	void SplitHardAngles(const float HardAngleRadians, const TArray<FVector>& FaceNormals, const int32 NumVerts, TArray<uint32>& Indices, std::vector<uint32_t>& AdditionalVertices);
+
+	/**
+	* Splits vertices in the InOutMesh according to the mapping provided by the dupVerts array
+	* This assumes that the index buffer has already been updated to reflect the new vertices.
+	*
+	* @param InOutMesh           The mesh to be altered.
+	* @param dupVerts            A mapping of new vertices to old.
+	*
+	* If N = Number of vertices on input, the resulting mesh will have N + dupVerts.size()  verts.
+	* The vertices are duplicated with the following rule.
+	*
+	*   Vertex[N + d] = Vertex[dupVert[d]]
+	*/
+	void SplitVertices(FVertexDataMesh& InOutMesh, const std::vector<uint32_t>& dupVerts);
+
+	/**
+	* Copy the data in the member Normal Array to the memeber TransferNormal Array
+	*/
+	void CacheNormals(FVertexDataMesh& InMesh);
 
 	/**
 	* Very thin walls can develop mesh interpenetration (opposing wall surfaces meet) during simplification.  This
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODParallelSimplifier.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODParallelSimplifier.cpp
index f2078033fd05..29faecfa4460 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODParallelSimplifier.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODParallelSimplifier.cpp
@@ -147,7 +147,7 @@ void ProxyLOD::ParallelSimplifyMesh(const FClosestPolyField& SrcReference, const
 
 
 
-		float RetainFraction = FMath::Max(0.5f, MinFractionToRatain);
+		float RetainFraction = 0.2f; // FMath::Max(0.5f, MinFractionToRatain);
 		PartitionAndSimplifyMesh(SrcBBox, SrcTriNumByPartition, RetainFraction, MaxFeatureCost, NumPartitions, InOutMesh);
 
 		//	ProjectVerticesOntoSrc(SrcReference, InOutMesh);
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODPlugin.cpp b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODPlugin.cpp
index bd60ac143e38..6459ca2fbaf4 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODPlugin.cpp
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODPlugin.cpp
@@ -7,12 +7,14 @@
 #include "IProxyLODPlugin.h"
 #include "RawMesh.h"
 #include "MeshMergeData.h"
+#include "Engine/MeshMerging.h"
 #include "MaterialUtilities.h" // for FFlattenMaterial 
 #include "Engine/StaticMesh.h"
 #include "Misc/ScopedSlowTask.h"
 #include "Stats/StatsMisc.h"
 //#include "ScopedTimers.h"
 #include <openvdb/openvdb.h>
+#include <openvdb/tools/Interpolation.h> // for grid sampler
 
 #define PROXYLOD_CLOCKWISE_TRIANGLES  1
 
@@ -65,7 +67,8 @@ static TAutoConsoleVariable<int32> CVarProxyLODChartColorVerts(
 static TAutoConsoleVariable<int32> CVarProxyLODTransfer(
 	TEXT("r.ProxyLODTransfer"),
 	1,
-	TEXT("0: shoot both ways, 1: preference for forward (default)"),
+	TEXT("0: shoot both ways\n")
+	TEXT("1: preference for forward (default)"),
 	ECVF_Default);
 
 
@@ -107,6 +110,16 @@ static TAutoConsoleVariable<int32> CVarProxyLODMaterialInParallel(
 	TEXT("1: enable - default"),
 	ECVF_Default);
 
+// Limit the number of dilation steps used in gap filling.
+static TAutoConsoleVariable<int32> CVarProxyLODMaxDilationSteps(
+	TEXT("r.ProxyLODMaxDilationSteps"),
+	7,
+	TEXT("Limit the numer of dilation steps used in gap filling for performance reasons\n")
+	TEXT("This may affect gap filling quality as bigger dilations steps will be used with a smaller max \n")
+	TEXT("0: will disable gap filling\n")
+	TEXT("7: default\n"),
+	ECVF_Default);
+
 #endif
 
 /**
@@ -173,6 +186,12 @@ private:
 
 	int32 RayHitOrder = 1;
 
+	// Used in gap-closing.  This max is to bound a potentially expensive
+	// computation.  If the gap size requires more dilation steps at the current voxel
+	// size, then the dilation (and erosion) will be done with larger voxels. 
+
+	int32 MaxDilationSteps = 7;
+
 	// Flag to set if the verts should be colored by char in the UV atlas.
 	// Useful for debuging.
 
@@ -317,6 +336,7 @@ void FVoxelizeMeshMerging::CaptureCVars()
 	// Allow CVars to be used.
 	{
 		int32 RayOrder                 = CVarProxyLODTransfer.GetValueOnGameThread();
+		int32 DilationSteps            = CVarProxyLODMaxDilationSteps.GetValueOnGameThread();
 		bool bAddChartColorVerts       = (CVarProxyLODChartColorVerts.GetValueOnGameThread() == 1);
 		bool bUseTrueTangentSpace      = (CVarProxyLODUseTangentSpace.GetValueOnGameThread() == 1);
 		bool bVoxelizeAndRemeshOnly    = (CVarProxyLODRemeshOnly.GetValueOnGameThread() == 1);
@@ -340,13 +360,14 @@ void FVoxelizeMeshMerging::RestoreDefaultParameters()
 {
 	IsoSurfaceValue   = 0.5;
 	RayHitOrder       = 1;
+	MaxDilationSteps  = 7; 
 	bChartColorVerts  = false;
 	bUseTangentSpace  = true;
 	bRemeshOnly       = false;
 }
 
 FVoxelizeMeshMerging::OpenVDBTransform::Ptr 
-FVoxelizeMeshMerging::ComputeResolution(const FMeshProxySettings& InProxySettings, float OjbectSize)
+FVoxelizeMeshMerging::ComputeResolution(const FMeshProxySettings& InProxySettings, float ObjectSize)
 {
 	// Compute the required voxel size in world units.
 	// if the requested voxel size is non-physical, use a default of 3
@@ -354,10 +375,10 @@ FVoxelizeMeshMerging::ComputeResolution(const FMeshProxySettings& InProxySetting
 	int32 PixelCount = FMath::Max(InProxySettings.ScreenSize, (int32)50);
 	PixelCount = FMath::Min(PixelCount, (int32)900);
 	
-	if (OjbectSize > 0.f ) 
+	if (ObjectSize > 0.f ) 
 	{
 		// pixels per length scale
-		const double LengthPerPixel = double(OjbectSize) / double(PixelCount);
+		const double LengthPerPixel = double(ObjectSize) / double(PixelCount);
 		VoxelSize = ( LengthPerPixel * 1.95 / 3.); // magic scale.
 	}
 	
@@ -368,7 +389,7 @@ FVoxelizeMeshMerging::ComputeResolution(const FMeshProxySettings& InProxySetting
 		VoxelSize = InProxySettings.VoxelSize;
 	}
 
-	UE_LOG(LogProxyLODMeshReduction, Log, TEXT("Spatial Sampling Distance Scale used %f"), VoxelSize);
+	UE_LOG(LogProxyLODMeshReduction, Log, TEXT("Spatial Sampling Distance Scale used %f, and the major axis for the object bbox was %f"), VoxelSize, ObjectSize);
 	
 	return  OpenVDBTransform::createLinearTransform(VoxelSize);
 }
@@ -500,6 +521,31 @@ static FIntPoint GetTexelGridSize(const  FMaterialProxySettings& MaterialSetting
 	return FIntPoint(MaxLength, MaxLength);
 }
 
+static ProxyLOD::ENormalComputationMethod GetNormalComputationMethod(const FMeshProxySettings& InProxySettings)
+{
+	ProxyLOD::ENormalComputationMethod Result = ProxyLOD::ENormalComputationMethod::AreaWeighted;
+	const TEnumAsByte<EProxyNormalComputationMethod::Type>& Method = InProxySettings.NormalCalculationMethod;
+
+	switch (InProxySettings.NormalCalculationMethod)
+	{
+		case EProxyNormalComputationMethod::AngleWeighted:
+			Result = ProxyLOD::ENormalComputationMethod::AngleWeighted;
+			break;
+
+		case EProxyNormalComputationMethod::AreaWeighted:
+			Result = ProxyLOD::ENormalComputationMethod::AreaWeighted;
+			break;
+
+		case EProxyNormalComputationMethod::EqualWeighted:
+			Result = ProxyLOD::ENormalComputationMethod::EqualWeighted;
+			break;
+	
+		default:
+			checkSlow(0);
+	}
+	return Result;
+}
+
 void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMeshProxySettings& InProxySettings, const FFlattenMaterialArray& InputMaterials, const FGuid InJobGUID)
 {
 
@@ -507,7 +553,26 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 	CaptureCVars();
 
+	// Split the input meshes into two groups.  The main geometry and clipping geometry.
+	// NB: only use pointers to avoid potentially copying a TArray of UV data.
 
+	TArray<const FMeshMergeData*> InGeometry;
+	TArray<const FMeshMergeData*> InClippingGeometry;
+
+	for (int32 i = 0; i < InData.Num(); ++i)
+	{
+		const FMeshMergeData&  MeshMergeData = InData[i];
+		if (MeshMergeData.bIsClippingMesh)
+		{
+			InClippingGeometry.Add(&MeshMergeData);
+		}
+		else
+		{
+			InGeometry.Add(&MeshMergeData);
+		}
+	}
+
+	
 	// Container for the raw mesh that will hold the simplified geometry
 	// and the FlattenMaterial that will hold the materials for the output mesh.
 	// NB: These will be the product of this function and 
@@ -515,7 +580,10 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 	FRawMesh OutRawMesh;
 
-	FFlattenMaterial OutMaterial = FMaterialUtilities::CreateFlattenMaterialWithSettings(InProxySettings.MaterialSettings);
+	FFlattenMaterial OutMaterial         = FMaterialUtilities::CreateFlattenMaterialWithSettings(InProxySettings.MaterialSettings);
+	const FColor UnresolvedGeometryColor = InProxySettings.UnresolvedGeometryColor;
+
+
 
 	bool bProxyGenerationSuccess = true;
 	// Compute the simplified mesh and related materials.
@@ -523,7 +591,8 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 	
 		// Create an adapter to make the data appear as a single mesh as required by the voxelization code.
 
-		FRawMeshArrayAdapter SrcGeometryAdapter(InData);
+		FRawMeshArrayAdapter SrcGeometryAdapter(InGeometry);
+		FRawMeshArrayAdapter ClippingGeometryAdapter(InClippingGeometry); 
 
 		{
 			const auto& BBox = SrcGeometryAdapter.GetBBox();
@@ -532,6 +601,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 			OpenVDBTransform::Ptr XForm = ComputeResolution(InProxySettings, BBoxMajorAxisLength(BBox) );
 			SrcGeometryAdapter.SetTransform(XForm);
+			ClippingGeometryAdapter.SetTransform(XForm);
 		}
 
 		const double VoxelSize = SrcGeometryAdapter.GetTransform().voxelSize()[0];
@@ -565,7 +635,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 		ProxyLOD::FTextureAtlasDesc TextureAtlasDesc(UVSize, MaterialSettings.GutterSpace);
 	    
 		// --- Create New (High Poly) Geometry --
-		// 1) Voxelize the source geometry
+		// 1) Voxelize the source geometry & maybe gap fill.
 		// 2) Extract high-poly surfaces
 		// 3) Capture closest poly-field grid that allows quick identification of the poly closest to a voxel center.
 		// 4) Transfer normals to the new geometry. 
@@ -582,11 +652,44 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 				openvdb::Int32Grid::Ptr SrcPolyIndexGrid = openvdb::Int32Grid::create();
 
 				// 1) Voxelize - this can potentially run out of memory when very large objecs (or very small voxel sizes) are used.
+				
+				const bool bSuccess = ProxyLOD::MeshArrayToSDFVolume(SrcGeometryAdapter, SDFVolume, SrcPolyIndexGrid.get());
+				const bool bHasClipping = (InClippingGeometry.Num() != 0);
 
-				bool bSuccess = ProxyLOD::MeshArrayToSDFVolume(SrcGeometryAdapter, SDFVolume, SrcPolyIndexGrid.get());
+				if (bSuccess && bHasClipping)
+				{
+					// Voxelize the clipping geometry.
+
+					openvdb::FloatGrid::Ptr SDFClipping;
+					ProxyLOD::MeshArrayToSDFVolume(ClippingGeometryAdapter, SDFClipping);
+
+					// CSG difference that removes the clipping region from the SDFvolume, leaving a watertight SDF
+
+					ProxyLOD::RemoveClipped(SDFVolume, SDFClipping);
+				}
 
 				if (bSuccess)
 				{
+					// Optionally manipulate the SDF to close potential gaps (e.g. windows and doors if the object is sufficiently far)
+					
+					double HoleRadius = 0.5 * InProxySettings.MergeDistance;
+					openvdb::math::Coord VolumeBBoxSize = SDFVolume->evalActiveVoxelDim();
+					
+					// Clamp the hole radius.
+					double BBoxMinorAxis = VolumeBBoxSize[VolumeBBoxSize.minIndex()] * VoxelSize;
+					if (HoleRadius > .5 * BBoxMinorAxis )
+					{
+						HoleRadius = .5 * BBoxMinorAxis;
+						UE_LOG(LogProxyLODMeshReduction, Display, TEXT("Merge distance %f too large, clamped to %f."), InProxySettings.MergeDistance, float(2. * HoleRadius));
+					}
+
+					if (HoleRadius > 0.25 * VoxelSize && MaxDilationSteps > 0)
+					{
+						// performance tuning number.  if more dilations are required for this hole radius, a coarser grid is used.
+						
+						ProxyLOD::CloseGaps(SDFVolume, HoleRadius, MaxDilationSteps);
+					}
+
 					// 2) Extract the iso-surface into a mesh format directly consumable by the simplifier
 
 					ProxyLOD::ExtractIsosurfaceWithNormals(SDFVolume, WSIsoValue, RemeshAdaptivity, AOSMeshedVolume);
@@ -630,12 +733,15 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 		const bool bColorVertsByChart      = this->bChartColorVerts;
 		const bool bDoCollapsedWallFix     = this->bCorrectCollapsedWalls;
 		const bool bSingleThreadedSimplify = !(this->bMutliThreadSimplify);
-			
+
+		const float HardAngle       = InProxySettings.HardAngleThreshold;
+		const bool bSplitHardAngles = (HardAngle > 0.f && HardAngle < 179.f) && InProxySettings.bUseHardAngleThreshold;
+		
 		if (!this->bRemeshOnly)
 		{
 			ProxyLOD::FTaskGroup PrepGeometryAndBakeMaterialsTaskGroup;
 			
-			// --- Convert High Poly Iso Surface To Simplifed Geometry and Prepare for Materials ---
+			// --- Convert High Poly Iso Surface To Simplified Geometry and Prepare for Materials ---
 			// 1) Simplify Geometry
 			// 2) Compute Normals for Simplified Geometry
 			// 3) Generate UVs for Simplified Geometry
@@ -643,7 +749,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 			PrepGeometryAndBakeMaterialsTaskGroup.Run([&AOSMeshedVolume,
 				&SrcGeometryPolyField, &VertexDataMesh,
 				&TextureAtlasDesc, &bUVGenerationSucess, &InProxySettings,
-				VoxelSize, bColorVertsByChart, bSingleThreadedSimplify, bDoCollapsedWallFix]()
+				VoxelSize, bColorVertsByChart, bSingleThreadedSimplify, bDoCollapsedWallFix, bSplitHardAngles, HardAngle]()
 			{
 
 				// 1) Simplified mesh and convert it to the correct format for UV generation
@@ -656,7 +762,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 				
 					// By default, we don't want the simplifier to toss much more than 98% of the triangles.
 				
-					float PercentToRetain = 0.02f; 
+					float PercentToRetain = 0.002f; 
 
 					// Replaces the AOS mesh with a simplified version
 
@@ -672,6 +778,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 					ProxyLOD::ConvertMesh(SimplifierMesh, VertexDataMesh);
 
+				
 					// --- Attempt to fix-up the geometry if needed ---
 
 					if (bDoCollapsedWallFix)
@@ -688,7 +795,21 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 				// 2) Add angle weighted vertex normals
 
-				ProxyLOD::ComputeVertexNormals(VertexDataMesh, true /*angle weighted*/);
+				ProxyLOD::ComputeVertexNormals(VertexDataMesh, ProxyLOD::ENormalComputationMethod::AngleWeighted);
+				// These normals will be used in making the correspondence with the original geometry
+				ProxyLOD::CacheNormals(VertexDataMesh);   
+
+				if (bSplitHardAngles)
+				{
+					// Split the verts on the hard angles
+
+					ProxyLOD::SplitHardAngles(HardAngle, VertexDataMesh);
+				}
+
+				// Compute the vertex normals using the possibly updated connectivity. 
+				const ProxyLOD::ENormalComputationMethod NormalMethod = GetNormalComputationMethod(InProxySettings);
+				ProxyLOD::ComputeVertexNormals(VertexDataMesh, NormalMethod);
+
 
 				// 3) Generate UVs for Simplified Geometry
 				// UV Atlas create, this can fail.
@@ -773,7 +894,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 				[&VertexDataMesh, &OutRawMesh]()->void
 				{
 					const bool bDoMikkT = false;
-					const bool bRecomputeNormals = false;
+					const bool bRecomputeNormals = false; // if true, the UV seams are often more apparent since verts may have been split to make uvs. 
 					if (bDoMikkT)
 					{
 						ProxyLOD::ConvertMesh(VertexDataMesh, OutRawMesh);
@@ -799,12 +920,27 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 			// --- Populate the output materials ---
 			// --- By mapping the texels to the source geometry.
 			{
+				// Inherit the material settings from the first baked down source material.
+
+				if (BakedMaterials->Num())
+				{
+					const auto& FirstMaterial = (*BakedMaterials)[0];
+					OutMaterial.BlendMode              = FirstMaterial.BlendMode;
+					OutMaterial.bTwoSided              = FirstMaterial.bTwoSided;
+					OutMaterial.bDitheredLODTransition = FirstMaterial.bDitheredLODTransition;
+					OutMaterial.EmissiveScale          = FirstMaterial.EmissiveScale;
+				}
+
 				// --- Map a correspondence between texels in the texture atlas and locations on the source geometry --
 
 				// The termination distance when we fire rays.  These rays should only be traveling  short 
 				// distance between polygons in the simplified geometry and polygons in the source geometry.
+				const bool bOverrideRayDist = InProxySettings.bOverrideTransferDistance;
+				double RequestedMaxRay = (bOverrideRayDist) ? InProxySettings.MaxRayCastDist : 6. * VoxelSize;
 				const double BBoxMajorAxisLength = SrcGeometryAdapter.GetBBox().extents()[SrcGeometryAdapter.GetBBox().maxExtent()];
-				const double MaxRayLength = FMath::Min(5. * VoxelSize, BBoxMajorAxisLength);
+				const double MaxRayLength = FMath::Max(VoxelSize, FMath::Min(RequestedMaxRay, BBoxMajorAxisLength));
+
+				UE_LOG(LogProxyLODMeshReduction, Log, TEXT("Material Distance %f used to discover textures."), float(MaxRayLength));
 
 				// Fire rays from the simplified mesh to the original collection of meshes 
 				// to determine a correspondence between the SrcMesh and the Simplified mesh.
@@ -825,7 +961,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 				// --- to generate flattened materials for the simplified geometry                       ---
 				// Compute the baked-down maps
 
-				ProxyLOD::MapFlattenMaterials(OutRawMesh, SrcGeometryAdapter, *SuperSampledCorrespondenceGrid, *DstSuperSampledUVGrid, *DstUVGrid, *BakedMaterials, OutMaterial);
+				ProxyLOD::MapFlattenMaterials(OutRawMesh, SrcGeometryAdapter, *SuperSampledCorrespondenceGrid, *DstSuperSampledUVGrid, *DstUVGrid, *BakedMaterials, UnresolvedGeometryColor, OutMaterial);
 
 
 
@@ -861,7 +997,7 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 	}
 
 	// testing 
-	bProxyGenerationSuccess = bProxyGenerationSuccess && (!this->bRemeshOnly);
+	bProxyGenerationSuccess = bProxyGenerationSuccess || (this->bRemeshOnly);
 
 	if (bProxyGenerationSuccess)
 	{
@@ -877,15 +1013,6 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 
 		checkSlow(OutRawMesh.IsValid());
 
-		// Done with the material baking, free the delegate
-
-		if (BakeMaterialsDelegate.IsBound())
-		{
-			BakeMaterialsDelegate.Unbind();
-		}
-
-
-
 		// NB: FProxyGenerationProcessor::ProxyGenerationComplete
 
 		CompleteDelegate.ExecuteIfBound(OutRawMesh, OutMaterial, InJobGUID);
@@ -894,6 +1021,15 @@ void FVoxelizeMeshMerging::ProxyLOD(const FMeshMergeDataArray& InData, const FMe
 	{
 		FailedDelegate.ExecuteIfBound(InJobGUID, TEXT("ProxyLOD UV Generation failed"));
 	}
+
+
+	// Done with the material baking, free the delegate
+
+	if (BakeMaterialsDelegate.IsBound())
+	{
+		BakeMaterialsDelegate.Unbind();
+	}
+
 }
 
 #undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODQuadric.h b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODQuadric.h
index fb19106a1f03..57de0b8dd5e3 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODQuadric.h
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ProxyLOD/Private/ProxyLODQuadric.h
@@ -183,7 +183,7 @@ namespace ProxyLOD
 		// Compute the wedge product, giving the normal direction scaled by 
 		// twice the triangle area.
 
-		double nX, nY, nZ; 
+		double nX, nY, nZ;
 		{
 			double tmpA[3] = { p2[0] - p0[0], p2[1] - p0[1], p2[2] - p0[2] };
 			double tmpB[3] = { p1[0] - p0[0], p1[1] - p0[1], p1[2] - p0[2] };
@@ -493,7 +493,7 @@ namespace ProxyLOD
 		const double nX = n[0];
 		const double nY = n[1];
 		const double nZ = n[2];
-
+		
 		nxx = nX * nX;
 		nyy = nY * nY;
 		nzz = nZ * nZ;
@@ -533,14 +533,15 @@ namespace ProxyLOD
 			float a1 = AttributeWeights[i] * attr1[i];
 			float a2 = AttributeWeights[i] * attr2[i];
 
-			double grad[4];
-			//if( !CalcGradient( grad, p0, p1, p2, n, a0, a1, a2 ) )
-			if (!bInvertable)
+			a0 = FMath::IsFinite(a0) ? a0 : 0.0f;
+			a1 = FMath::IsFinite(a1) ? a1 : 0.0f;
+			a2 = FMath::IsFinite(a2) ? a2 : 0.0f;
+
+			double grad[4] = { 0., 0., 0., (a0 + a1 + a2) / 3.0 }; // default values for non-invert case
+			if (bInvertable)
 			{
-				grad[0] = 0.0;
-				grad[1] = 0.0;
-				grad[2] = 0.0;
-				grad[3] = (a0 + a1 + a2) / 3.0;
+				CalcGradient(GradMatrix, a0, a1, a2, grad);
+
 			}
 			else
 			{
@@ -549,13 +550,13 @@ namespace ProxyLOD
 				a2 = FMath::IsFinite(a2) ? a2 : 0.0f;
 
 				CalcGradient(GradMatrix, a0, a1, a2, grad);
-
-				checkSlow(!FMath::IsNaN(grad[0]));
-				checkSlow(!FMath::IsNaN(grad[1]));
-				checkSlow(!FMath::IsNaN(grad[2]));
-				checkSlow(!FMath::IsNaN(grad[3]));
 			}
 
+			checkSlow(!FMath::IsNaN(grad[0]));
+			checkSlow(!FMath::IsNaN(grad[1]));
+			checkSlow(!FMath::IsNaN(grad[2]));
+			checkSlow(!FMath::IsNaN(grad[3]));
+
 			//double t0 = grad[0] * p0.x + grad[1] * p0.y + grad[2] * p0.z + grad[3];
 			//double t1 = grad[0] * p1.x + grad[1] * p1.y + grad[2] * p1.z + grad[3];
 			//double t2 = grad[0] * p2.x + grad[1] * p2.y + grad[2] * p2.z + grad[3];
diff --git a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/openvdb/OpenVDB/OpenVDB/OpenVDB.vcxproj b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/openvdb/OpenVDB/OpenVDB/OpenVDB.vcxproj
index 02053cfb309f..34432446b553 100644
--- a/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/openvdb/OpenVDB/OpenVDB/OpenVDB.vcxproj
+++ b/Engine/Plugins/Experimental/ProxyLODPlugin/Source/ThirdParty/openvdb/OpenVDB/OpenVDB/OpenVDB.vcxproj
@@ -149,6 +149,7 @@
       </AdditionalUsingDirectories>
       <AdditionalOptions>/bigobj</AdditionalOptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyWrapperTypeRegistry.cpp b/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyWrapperTypeRegistry.cpp
index 0e5543e822c8..d02e5fff31a5 100644
--- a/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyWrapperTypeRegistry.cpp
+++ b/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PyWrapperTypeRegistry.cpp
@@ -2562,7 +2562,7 @@ void FPyWrapperTypeRegistry::GenerateStubCodeForWrappedType(PyTypeObject* PyType
 					bFirstEnumMember = false;
 				}
 
-				ExportConstantValue(UTF8_TO_TCHAR(EnumMember.EntryName.GetData()), UTF8_TO_TCHAR(EnumMember.EntryDoc.GetData()), *Lex::ToString(EnumMember.EntryValue));
+				ExportConstantValue(UTF8_TO_TCHAR(EnumMember.EntryName.GetData()), UTF8_TO_TCHAR(EnumMember.EntryDoc.GetData()), *LexToString(EnumMember.EntryValue));
 			}
 		}
 	}
diff --git a/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PythonScriptPlugin.h b/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PythonScriptPlugin.h
index d10bb9b35fac..160c07ceecb0 100644
--- a/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PythonScriptPlugin.h
+++ b/Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPlugin/Private/PythonScriptPlugin.h
@@ -8,6 +8,7 @@
 #include "PyPtr.h"
 #include "Misc/CoreMisc.h"
 #include "HAL/IConsoleManager.h"
+#include "Framework/Commands/InputChord.h"
 
 class FPythonScriptPlugin;
 
@@ -31,7 +32,10 @@ public:
 	virtual bool Exec(const TCHAR* Input) override;
 	virtual bool AllowHotKeyClose() const override;
 	virtual bool AllowMultiLine() const override;
-
+	virtual FInputChord GetHotKey() const override
+	{
+		return FInputChord();
+	}
 private:
 	FPythonScriptPlugin* PythonScriptPlugin;
 };
diff --git a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.cpp b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.cpp
index e9f40680fc8c..cfa394d8b47f 100644
--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.cpp
+++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.cpp
@@ -198,21 +198,21 @@ void FProxyMessageHandler::OnEndGesture()
 	}
 }
 
-bool FProxyMessageHandler::OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId)
+bool FProxyMessageHandler::OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId)
 {
 	if (TargetHandler.IsValid())
 	{
-		return TargetHandler->OnTouchStarted(Window, Location, TouchIndex, ControllerId);
+		return TargetHandler->OnTouchStarted(Window, Location, Force, TouchIndex, ControllerId);
 	}
 
 	return false;
 }
 
-bool FProxyMessageHandler::OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId)
+bool FProxyMessageHandler::OnTouchMoved(const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId)
 {
 	if (TargetHandler.IsValid())
 	{
-		return TargetHandler->OnTouchMoved(Location, TouchIndex, ControllerId);
+		return TargetHandler->OnTouchMoved(Location, Force, TouchIndex, ControllerId);
 	}
 
 	return false;
diff --git a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.h b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.h
index 144feb002095..522d09ce6afe 100644
--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.h
+++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/ProxyMessageHandler.h
@@ -56,9 +56,9 @@ public:
 
 	virtual void OnEndGesture() override;
 
-	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
+	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override;
 
-	virtual bool OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
+	virtual bool OnTouchMoved(const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override;
 
 	virtual bool OnTouchEnded(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
 
diff --git a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.cpp b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.cpp
index bce6874d7fe7..d4d428c0d139 100644
--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.cpp
+++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.cpp
@@ -185,11 +185,11 @@ void FRecordingMessageHandler::PlayOnKeyUp(FArchive& Ar)
 	OnKeyUp(Msg.Param1, Msg.Param2, Msg.Param3);
 }
 
-bool FRecordingMessageHandler::OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId)
+bool FRecordingMessageHandler::OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId)
 {
 	if (IsRecording())
 	{
-		ThreeParamMsg<FVector2D, int32, int32> Msg(ConvertToNormalizedScreenLocation(Location), TouchIndex, ControllerId);
+		FourParamMsg<FVector2D, float, int32, int32> Msg(ConvertToNormalizedScreenLocation(Location), Force, TouchIndex, ControllerId);
 		RecordMessage(TEXT("OnTouchStarted"), Msg.AsData());
 	}
 
@@ -198,12 +198,12 @@ bool FRecordingMessageHandler::OnTouchStarted(const TSharedPtr< FGenericWindow >
 		return true;
 	}
 
-	return FProxyMessageHandler::OnTouchStarted(Window, Location, TouchIndex, ControllerId);
+	return FProxyMessageHandler::OnTouchStarted(Window, Location, Force, TouchIndex, ControllerId);
 }
 
 void FRecordingMessageHandler::PlayOnTouchStarted(FArchive& Ar)
 {
-	ThreeParamMsg<FVector2D, int32, int32 > Msg(Ar);
+	FourParamMsg<FVector2D, float, int32, int32 > Msg(Ar);
 	FVector2D ScreenLocation = ConvertFromNormalizedScreenLocation(Msg.Param1);
 
 	TSharedPtr<FGenericWindow> Window;
@@ -213,14 +213,14 @@ void FRecordingMessageHandler::PlayOnTouchStarted(FArchive& Ar)
 		Window = PlaybackWindow.Pin()->GetNativeWindow();
 	}
 
-	OnTouchStarted(Window, ScreenLocation, Msg.Param2, Msg.Param3);
+	OnTouchStarted(Window, ScreenLocation, Msg.Param2, Msg.Param3, Msg.Param4);
 }
 
-bool FRecordingMessageHandler::OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId)
+bool FRecordingMessageHandler::OnTouchMoved(const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId)
 {
 	if (IsRecording())
 	{
-		ThreeParamMsg<FVector2D, int32, int32> Msg(ConvertToNormalizedScreenLocation(Location), TouchIndex, ControllerId);
+		FourParamMsg<FVector2D, float, int32, int32> Msg(ConvertToNormalizedScreenLocation(Location), Force, TouchIndex, ControllerId);
 		OutputWriter->RecordMessage(TEXT("OnTouchMoved"), Msg.AsData());
 	}
 
@@ -229,14 +229,14 @@ bool FRecordingMessageHandler::OnTouchMoved(const FVector2D& Location, int32 Tou
 		return true;
 	}
 
-	return FProxyMessageHandler::OnTouchMoved(Location, TouchIndex, ControllerId);
+	return FProxyMessageHandler::OnTouchMoved(Location, Force, TouchIndex, ControllerId);
 }
 
 void FRecordingMessageHandler::PlayOnTouchMoved(FArchive& Ar)
 {
-	ThreeParamMsg<FVector2D, int32, int32 > Msg(Ar);
+	FourParamMsg<FVector2D, float, int32, int32 > Msg(Ar);
 	FVector2D ScreenLocation = ConvertFromNormalizedScreenLocation(Msg.Param1);
-	OnTouchMoved(ScreenLocation, Msg.Param2, Msg.Param3);
+	OnTouchMoved(ScreenLocation, Msg.Param2, Msg.Param3, Msg.Param4);
 }
 
 bool FRecordingMessageHandler::OnTouchEnded(const FVector2D& Location, int32 TouchIndex, int32 ControllerId)
diff --git a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.h b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.h
index 905d50572b8a..f14616c1a9a1 100644
--- a/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.h
+++ b/Engine/Plugins/Experimental/RemoteSession/Source/RemoteSession/Private/MessageHandler/RecordingMessageHandler.h
@@ -44,8 +44,8 @@ public:
 	virtual bool OnTouchGesture(EGestureEvent GestureType, const FVector2D& Delta, float WheelDelta, bool bIsDirectionInvertedFromDevice) override;
 	virtual void OnEndGesture() override;
 
-	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
-	virtual bool OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
+	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override;
+	virtual bool OnTouchMoved(const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override;
 	virtual bool OnTouchEnded(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override;
 	virtual bool OnMotionDetected(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration, int32 ControllerId) override;
 
diff --git a/Engine/Plugins/Experimental/StereoPanorama/Source/StereoPanorama/Private/StereoStaticMeshComponent.cpp b/Engine/Plugins/Experimental/StereoPanorama/Source/StereoPanorama/Private/StereoStaticMeshComponent.cpp
index a0b86ed2f8e1..1779fb6c3c08 100644
--- a/Engine/Plugins/Experimental/StereoPanorama/Source/StereoPanorama/Private/StereoStaticMeshComponent.cpp
+++ b/Engine/Plugins/Experimental/StereoPanorama/Source/StereoPanorama/Private/StereoStaticMeshComponent.cpp
@@ -60,10 +60,12 @@ public:
 
 FPrimitiveSceneProxy* UStereoStaticMeshComponent::CreateSceneProxy()
 {
+	const auto FeatureLevel = GetScene()->GetFeatureLevel();
+
     if ((GetStaticMesh() == nullptr) ||
 		(GetStaticMesh()->RenderData == nullptr) ||
 		(GetStaticMesh()->RenderData->LODResources.Num() == 0) ||
-		(GetStaticMesh()->RenderData->LODResources[0].VertexBuffers.PositionVertexBuffer.GetNumVertices() == 0))
+		(GetStaticMesh()->RenderData->LODResources[GetStaticMesh()->MinLOD.GetValueForFeatureLevel(FeatureLevel)].VertexBuffers.PositionVertexBuffer.GetNumVertices() == 0))
     {
         return nullptr;
     }
diff --git a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPawnBase.cpp b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPawnBase.cpp
index a6c997e6a879..2cdfaceb2102 100644
--- a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPawnBase.cpp
+++ b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPawnBase.cpp
@@ -37,7 +37,7 @@ AVirtualCameraPawnBase::AVirtualCameraPawnBase(const FObjectInitializer& ObjectI
 	// By default, allow focus visualization
 	bAllowFocusVisualization = true;
 
-	FScreenshotRequest::OnScreenshotRequestProcessed().BindUObject(CineCamera, &UVirtualCameraCineCameraComponent::AllowCameraViewUpdates);
+	FScreenshotRequest::OnScreenshotRequestProcessed().AddUObject(CineCamera, &UVirtualCameraCineCameraComponent::AllowCameraViewUpdates);
 }
 
 void AVirtualCameraPawnBase::BeginPlay()
diff --git a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPlayerControllerBase.cpp b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPlayerControllerBase.cpp
index 60ae1c21dc7b..f544228019fb 100644
--- a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPlayerControllerBase.cpp
+++ b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Private/VirtualCameraPlayerControllerBase.cpp
@@ -354,12 +354,12 @@ UVirtualCameraMovementComponent* AVirtualCameraPlayerControllerBase::GetVirtualC
 	return nullptr;
 }
 
-bool AVirtualCameraPlayerControllerBase::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D & TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
+bool AVirtualCameraPlayerControllerBase::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D & TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
 {
 	// Don't allow for input touch events if not within matte
 	if (!IsLocationWithinMatte(FVector(TouchLocation, 0.0f)))
 	{
-		return Super::InputTouch(Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex);;
+		return Super::InputTouch(Handle, Type, TouchLocation, Force, DeviceTimestamp, TouchpadIndex);;
 	}
 
 	// Allow touch and drag of the auto focus reticle when in auto focus targeting mode
@@ -368,7 +368,7 @@ bool AVirtualCameraPlayerControllerBase::InputTouch(uint32 Handle, ETouchType::T
 		UpdateScreenFocus(ETouchIndex::Touch1, FVector(TouchLocation, 0.f));
 	}
 
-	return Super::InputTouch(Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex);
+	return Super::InputTouch(Handle, Type, TouchLocation, Force, DeviceTimestamp, TouchpadIndex);
 }
 
 void AVirtualCameraPlayerControllerBase::OnTouchInput(const ETouchIndex::Type TouchIndex, const FVector Location)
diff --git a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Public/VirtualCameraPlayerControllerBase.h b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Public/VirtualCameraPlayerControllerBase.h
index 3d98ddd16c30..efd6dbd090db 100644
--- a/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Public/VirtualCameraPlayerControllerBase.h
+++ b/Engine/Plugins/Experimental/VirtualCamera/Source/VirtualCamera/Public/VirtualCameraPlayerControllerBase.h
@@ -227,7 +227,7 @@ protected:
 	/**
 	 * Override of InputTouch, used to handle touch and hold events.
 	 */
-	virtual bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex);
+	virtual bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) override;
 
 	/**
 	 * Determine how to handle touch input based on current context.
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraCompiler.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraCompiler.cpp
index 2ef6c4b2df9d..dd1a01194022 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraCompiler.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraCompiler.cpp
@@ -743,13 +743,13 @@ FNiagaraCompileResults FHlslNiagaraCompiler::CompileScript(const FNiagaraCompile
 				case EVectorVMBaseTypes::Float:
 				{
 					float Val = *(float*)(CompilationOutput.InternalConstantData.GetData() + Offset);
-					CompileResults.Data->InternalParameters.SetOrAdd(FNiagaraVariable(FNiagaraTypeDefinition::GetFloatDef(), *LexicalConversion::ToString(Val)))->SetValue(Val);
+					CompileResults.Data->InternalParameters.SetOrAdd(FNiagaraVariable(FNiagaraTypeDefinition::GetFloatDef(), *LexToString(Val)))->SetValue(Val);
 				}
 				break;
 				case EVectorVMBaseTypes::Int:
 				{
 					int32 Val = *(int32*)(CompilationOutput.InternalConstantData.GetData() + Offset);
-					CompileResults.Data->InternalParameters.SetOrAdd(FNiagaraVariable(FNiagaraTypeDefinition::GetIntDef(), *LexicalConversion::ToString(Val)))->SetValue(Val);
+					CompileResults.Data->InternalParameters.SetOrAdd(FNiagaraVariable(FNiagaraTypeDefinition::GetIntDef(), *LexToString(Val)))->SetValue(Val);
 				}
 				break;
 				case EVectorVMBaseTypes::Bool:
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraHlslTranslator.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraHlslTranslator.cpp
index b0b2bb1ac1ab..6bd8afe622b9 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraHlslTranslator.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraHlslTranslator.cpp
@@ -2086,7 +2086,7 @@ FString FHlslNiagaraTranslator::GetUniqueSymbolName(FName BaseName)
 
 	if(*NameCount > 0)
 	{
-		RetString += LexicalConversion::ToString(*NameCount);
+		RetString += LexToString(*NameCount);
 	}
 	++(*NameCount);
 	return RetString;
@@ -2112,7 +2112,7 @@ void FHlslNiagaraTranslator::ExitFunction()
 
 FString FHlslNiagaraTranslator::GeneratedConstantString(float Constant)
 {
-	return LexicalConversion::ToString(Constant);
+	return LexToString(Constant);
 }
 
 static int32 GbNiagaraScriptStatTracking = 1;
@@ -2187,10 +2187,10 @@ TArray<FGuid> FHlslNiagaraTranslator::GetCallstackGuids()
 FString FHlslNiagaraTranslator::GeneratedConstantString(FVector4 Constant)
 {
 	TArray<FStringFormatArg> Args;
-	Args.Add(LexicalConversion::ToString(Constant.X));
-	Args.Add(LexicalConversion::ToString(Constant.Y));
-	Args.Add(LexicalConversion::ToString(Constant.Z));
-	Args.Add(LexicalConversion::ToString(Constant.W));
+	Args.Add(LexToString(Constant.X));
+	Args.Add(LexToString(Constant.Y));
+	Args.Add(LexToString(Constant.Z));
+	Args.Add(LexToString(Constant.W));
 	return FString::Format(TEXT("float4({0}, {1}, {2}, {3})"), Args);
 }
 
@@ -4287,7 +4287,7 @@ void FHlslNiagaraTranslator::RegisterFunctionCall(ENiagaraScriptUsage ScriptUsag
 				if (Info.UserPtrIdx != INDEX_NONE)
 				{
 					//This interface requires per instance data via a user ptr so place the index to it at the end of the inputs.
-					Inputs.Add(AddSourceChunk(LexicalConversion::ToString(Info.UserPtrIdx), FNiagaraTypeDefinition::GetIntDef()));
+					Inputs.Add(AddSourceChunk(LexToString(Info.UserPtrIdx), FNiagaraTypeDefinition::GetIntDef()));
 					OutSignature.Inputs.Add(FNiagaraVariable(FNiagaraTypeDefinition::GetIntDef(), TEXT("InstanceData")));
 				}
 			}
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraNodeWithDynamicPins.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraNodeWithDynamicPins.cpp
index f727c9277aab..646ed7993f0e 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraNodeWithDynamicPins.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/NiagaraNodeWithDynamicPins.cpp
@@ -64,13 +64,13 @@ UEdGraphPin* UNiagaraNodeWithDynamicPins::RequestNewTypedPin(EEdGraphPinDirectio
 	{
 		TArray<UEdGraphPin*> InPins;
 		GetInputPins(InPins);
-		DefaultName = TEXT("Input ") + LexicalConversion::ToString(InPins.Num());
+		DefaultName = TEXT("Input ") + LexToString(InPins.Num());
 	}
 	else
 	{
 		TArray<UEdGraphPin*> OutPins;
 		GetOutputPins(OutPins);
-		DefaultName = TEXT("Output ") + LexicalConversion::ToString(OutPins.Num());
+		DefaultName = TEXT("Output ") + LexToString(OutPins.Num());
 	}
 	return RequestNewTypedPin(Direction, Type, *DefaultName);
 }
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraBoolTypeEditorUtilities.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraBoolTypeEditorUtilities.cpp
index 5e364ef3ea90..a16f6262a97f 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraBoolTypeEditorUtilities.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraBoolTypeEditorUtilities.cpp
@@ -72,13 +72,13 @@ bool FNiagaraEditorBoolTypeUtilities::CanHandlePinDefaults() const
 FString FNiagaraEditorBoolTypeUtilities::GetPinDefaultStringFromValue(const FNiagaraVariable& AllocatedVariable) const
 {
 	checkf(AllocatedVariable.IsDataAllocated(), TEXT("Can not generate a default value string for an unallocated variable."));
-	return Lex::ToString(AllocatedVariable.GetValue<FNiagaraBool>().GetValue());
+	return LexToString(AllocatedVariable.GetValue<FNiagaraBool>().GetValue());
 }
 
 bool FNiagaraEditorBoolTypeUtilities::SetValueFromPinDefaultString(const FString& StringValue, FNiagaraVariable& Variable) const
 {
 	bool bBoolValue;
-	if (Lex::TryParseString(bBoolValue, *StringValue))
+	if (LexTryParseString(bBoolValue, *StringValue))
 	{
 		FNiagaraBool BoolValue;
 		BoolValue.SetValue(bBoolValue);
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraFloatTypeEditorUtilities.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraFloatTypeEditorUtilities.cpp
index d4b82e60ff3d..c69f4d7ac624 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraFloatTypeEditorUtilities.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraFloatTypeEditorUtilities.cpp
@@ -96,13 +96,13 @@ bool FNiagaraEditorFloatTypeUtilities::CanHandlePinDefaults() const
 FString FNiagaraEditorFloatTypeUtilities::GetPinDefaultStringFromValue(const FNiagaraVariable& AllocatedVariable) const
 {
 	checkf(AllocatedVariable.IsDataAllocated(), TEXT("Can not generate a default value string for an unallocated variable."));
-	return Lex::ToString(AllocatedVariable.GetValue<FNiagaraFloat>().Value);
+	return LexToString(AllocatedVariable.GetValue<FNiagaraFloat>().Value);
 }
 
 bool FNiagaraEditorFloatTypeUtilities::SetValueFromPinDefaultString(const FString& StringValue, FNiagaraVariable& Variable) const
 {
 	FNiagaraFloat FloatValue;
-	if (Lex::TryParseString(FloatValue.Value, *StringValue))
+	if (LexTryParseString(FloatValue.Value, *StringValue))
 	{
 		Variable.SetValue<FNiagaraFloat>(FloatValue);
 		return true;
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraIntegerTypeEditorUtilities.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraIntegerTypeEditorUtilities.cpp
index 0b070f746eda..ae02ccb3491b 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraIntegerTypeEditorUtilities.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/TypeEditorUtilities/NiagaraIntegerTypeEditorUtilities.cpp
@@ -97,13 +97,13 @@ bool FNiagaraEditorIntegerTypeUtilities::CanHandlePinDefaults() const
 FString FNiagaraEditorIntegerTypeUtilities::GetPinDefaultStringFromValue(const FNiagaraVariable& AllocatedVariable) const
 {
 	checkf(AllocatedVariable.IsDataAllocated(), TEXT("Can not generate a default value string for an unallocated variable."));
-	return Lex::ToString(AllocatedVariable.GetValue<FNiagaraFloat>().Value);
+	return LexToString(AllocatedVariable.GetValue<FNiagaraFloat>().Value);
 }
 
 bool FNiagaraEditorIntegerTypeUtilities::SetValueFromPinDefaultString(const FString& StringValue, FNiagaraVariable& Variable) const
 {
 	FNiagaraInt32 IntegerValue;
-	if(Lex::TryParseString(IntegerValue.Value, *StringValue))
+	if(LexTryParseString(IntegerValue.Value, *StringValue))
 	{
 		Variable.SetValue<FNiagaraInt32>(IntegerValue);
 		return true;
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/Stack/NiagaraStackFunctionInput.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/Stack/NiagaraStackFunctionInput.cpp
index aa6c3fc027bb..717a85d31c04 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/Stack/NiagaraStackFunctionInput.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditor/Private/ViewModels/Stack/NiagaraStackFunctionInput.cpp
@@ -438,9 +438,9 @@ FString UNiagaraStackFunctionInput::ResolveDisplayNameArgument(const FString& In
 		
 		FString Suffix = InArg.Right(3);
 		int32 ParamIdx;
-		LexicalConversion::FromString(ParamIdx, *Suffix.Left(1));
+		LexFromString(ParamIdx, *Suffix.Left(1));
 		int32 ParamSlotIdx;
-		LexicalConversion::FromString(ParamSlotIdx, *Suffix.Right(1));
+		LexFromString(ParamSlotIdx, *Suffix.Right(1));
 		
 		if (ParamIdx < 0 || ParamIdx > 3 || ParamSlotIdx < 0 || ParamSlotIdx > 3)
 		{
diff --git a/Engine/Plugins/FX/Niagara/Source/NiagaraEditorWidgets/Private/Stack/SNiagaraStackTableRow.cpp b/Engine/Plugins/FX/Niagara/Source/NiagaraEditorWidgets/Private/Stack/SNiagaraStackTableRow.cpp
index 2d7aabaf0085..3eab94af1a68 100644
--- a/Engine/Plugins/FX/Niagara/Source/NiagaraEditorWidgets/Private/Stack/SNiagaraStackTableRow.cpp
+++ b/Engine/Plugins/FX/Niagara/Source/NiagaraEditorWidgets/Private/Stack/SNiagaraStackTableRow.cpp
@@ -436,7 +436,7 @@ EVisibility SNiagaraStackTableRow::GetSearchResultBorderVisibility() const
 
 void SNiagaraStackTableRow::NavigateTo(UNiagaraStackEntry* Item)
 {
-	OwnerTree->RequestScrollIntoView(Item, 0, true);
+	OwnerTree->RequestNavigateToItem(Item, 0);
 }
 
 void SNiagaraStackTableRow::OpenSourceAsset()
diff --git a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Java/src/com/epicgames/ue4/CameraPlayer14.java b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Java/src/com/epicgames/ue4/CameraPlayer14.java
index 4a7ff3220009..eea04aa99704 100644
--- a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Java/src/com/epicgames/ue4/CameraPlayer14.java
+++ b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Java/src/com/epicgames/ue4/CameraPlayer14.java
@@ -51,7 +51,7 @@ public class CameraPlayer14
 	private int CameraFPSMax = 0;
 	private int CameraOrientation = 0;
 	private int CameraRotationOffset = 0;
-	
+
 	private int iFrontId = 0;
 	private int iBackId = 0;
 
@@ -553,6 +553,13 @@ public class CameraPlayer14
 		return true;
 	}
 
+	public String getDataSourceURL()
+	{
+		String URL = "vidcap://" + ((CameraId == iFrontId) ? "front" : "rear") + "?width=" + CameraWidth + "?height=" + CameraHeight + "?fps=" + CameraFPS;
+		GameActivity.Log.debug("getDataSource: " + URL);
+		return URL;
+	}
+
 	public void setVideoEnabled(boolean enabled)
 	{
 		if (null == mCamera)
diff --git a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/AndroidJavaCameraPlayer.cpp b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/AndroidJavaCameraPlayer.cpp
index 7f56f4487b29..8cf5e913e7ae 100644
--- a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/AndroidJavaCameraPlayer.cpp
+++ b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/AndroidJavaCameraPlayer.cpp
@@ -32,6 +32,7 @@ FJavaAndroidCameraPlayer::FJavaAndroidCameraPlayer(bool swizzlePixels, bool vulk
 	, IsPlayingMethod(GetClassMethod("isPlaying", "()Z"))
 	, IsPreparedMethod(GetClassMethod("isPrepared", "()Z"))
 	, SetDataSourceURLMethod(GetClassMethod("setDataSourceURL", "(Ljava/lang/String;)Z"))
+	, GetDataSourceURLMethod(GetClassMethod("getDataSourceURL", "()Ljava/lang/String;"))
 	, PrepareMethod(GetClassMethod("prepare", "()V"))
 	, PrepareAsyncMethod(GetClassMethod("prepareAsync", "()V"))
 	, SeekToMethod(GetClassMethod("seekTo", "(I)V"))
@@ -202,6 +203,11 @@ bool FJavaAndroidCameraPlayer::SetDataSource(const FString & Url)
 	return Result;
 }
 
+FString FJavaAndroidCameraPlayer::GetDataSource()
+{
+	return CallMethod<FString>(GetDataSourceURLMethod);
+}
+
 bool FJavaAndroidCameraPlayer::Prepare()
 {
 	// This can return an exception in some cases (URL without internet, for example)
diff --git a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.cpp b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.cpp
index 07f9b5f61649..356d1c00da7f 100644
--- a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.cpp
+++ b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.cpp
@@ -32,6 +32,7 @@
 
 FAndroidCameraPlayer::FAndroidCameraPlayer(IMediaEventSink& InEventSink)
 	: CurrentState(EMediaState::Closed)
+	, CurrentTime(FTimespan::Zero())
 	, bLooping(false)
 	, EventSink(InEventSink)
 #if WITH_ENGINE
@@ -117,6 +118,7 @@ void FAndroidCameraPlayer::Close()
 	}
 
 	CurrentState = EMediaState::Closed;
+	CurrentTime = FTimespan::Zero();
 
 	bLooping = false;
 
@@ -246,7 +248,7 @@ bool FAndroidCameraPlayer::Open(const FString& Url, const IMediaOptions* /*Optio
 	}
 
 	// prepare media
-	MediaUrl = Url;
+	MediaUrl = JavaCameraPlayer->GetDataSource();
 
 #if ANDROIDCAMERAPLAYER_USE_PREPAREASYNC
 	if (!JavaCameraPlayer->PrepareAsync())
@@ -351,7 +353,7 @@ struct FRHICommandUpdateExternalCameraSample final : public FRHICommand<FRHIComm
 };
 
 static void DoUpdateTextureCameraSampleExecute(TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> JavaCameraPlayerPtr, TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr,
-	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample)
+	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample, FTimespan SampleTime)
 {
 	auto PinnedJavaCameraPlayer = JavaCameraPlayerPtr.Pin();
 	auto PinnedSamples = SamplesPtr.Pin();
@@ -361,11 +363,8 @@ static void DoUpdateTextureCameraSampleExecute(TWeakPtr<FJavaAndroidCameraPlayer
 		return;
 	}
 
-	const int32 CurrentFramePosition = PinnedJavaCameraPlayer->GetCurrentPosition();
-	const FTimespan Time = FTimespan::FromMilliseconds(CurrentFramePosition);
-
 	// write frame into texture
-	FRHITexture2D* Texture = VideoSample->InitializeTexture(Time);
+	FRHITexture2D* Texture = VideoSample->InitializeTexture(SampleTime);
 
 	if (Texture != nullptr)
 	{
@@ -388,23 +387,25 @@ struct FRHICommandUpdateTextureCameraSample final : public FRHICommand<FRHIComma
 	TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> JavaCameraPlayerPtr;
 	TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr;
 	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample;
+	FTimespan SampleTime;
 
 	FORCEINLINE_DEBUGGABLE FRHICommandUpdateTextureCameraSample(TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> InJavaCameraPlayerPtr, TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> InSamplesPtr,
-		TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> InVideoSample)
+		TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> InVideoSample, FTimespan InSampleTime)
 		: JavaCameraPlayerPtr(InJavaCameraPlayerPtr)
 		, SamplesPtr(InSamplesPtr)
 		, VideoSample(InVideoSample)
+		, SampleTime(InSampleTime)
 	{
 	}
 	void Execute(FRHICommandListBase& CmdList)
 	{
 		QUICK_SCOPE_CYCLE_COUNTER(STAT_FRHICommandUpdateTextureCameraSample_Execute);
-		DoUpdateTextureCameraSampleExecute(JavaCameraPlayerPtr, SamplesPtr, VideoSample);
+		DoUpdateTextureCameraSampleExecute(JavaCameraPlayerPtr, SamplesPtr, VideoSample, SampleTime);
 	}
 };
 
 static void DoUpdateBufferCameraSampleExecute(TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> JavaCameraPlayerPtr, TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr,
-	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample, int32 SampleCount)
+	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample, int32 SampleCount, FTimespan SampleTime)
 {
 	auto PinnedJavaCameraPlayer = JavaCameraPlayerPtr.Pin();
 	auto PinnedSamples = SamplesPtr.Pin();
@@ -435,7 +436,7 @@ static void DoUpdateBufferCameraSampleExecute(TWeakPtr<FJavaAndroidCameraPlayer,
 	if (PinnedJavaCameraPlayer->IsActive())
 	{
 		// must make a copy (buffer is owned by Java, not us!)
-		VideoSample->InitializeBuffer(Buffer, FTimespan::FromMilliseconds(CurrentFramePosition), true);
+		VideoSample->InitializeBuffer(Buffer, SampleTime, true);
 
 		FVector4 ScaleRotation = PinnedJavaCameraPlayer->GetScaleRotation();
 		FVector4 Offset = PinnedJavaCameraPlayer->GetOffset();
@@ -451,19 +452,21 @@ struct FRHICommandUpdateBufferCameraSample final : public FRHICommand<FRHIComman
 	TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr;
 	TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample;
 	int32 SampleCount;
+	FTimespan SampleTime;
 
 	FORCEINLINE_DEBUGGABLE FRHICommandUpdateBufferCameraSample(TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> InJavaCameraPlayerPtr, TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> InSamplesPtr,
-		TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> InVideoSample, int32 InSampleCount)
+		TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> InVideoSample, int32 InSampleCount, FTimespan InSampleTime)
 		: JavaCameraPlayerPtr(InJavaCameraPlayerPtr)
 		, SamplesPtr(InSamplesPtr)
 		, VideoSample(InVideoSample)
 		, SampleCount(InSampleCount)
+		, SampleTime(InSampleTime)
 	{
 	}
 	void Execute(FRHICommandListBase& CmdList)
 	{
 		QUICK_SCOPE_CYCLE_COUNTER(STAT_FRHICommandUpdateBufferCameraSample_Execute);
-		DoUpdateBufferCameraSampleExecute(JavaCameraPlayerPtr, SamplesPtr, VideoSample, SampleCount);
+		DoUpdateBufferCameraSampleExecute(JavaCameraPlayerPtr, SamplesPtr, VideoSample, SampleCount, SampleTime);
 	}
 };
 
@@ -513,8 +516,9 @@ void FAndroidCameraPlayer::TickFetch(FTimespan DeltaTime, FTimespan Timecode)
 			TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr;
 			TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample;
 			int32 SampleCount;
+			FTimespan SampleTime;
 		}
-		WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample, (int32)(VideoTrack.Dimensions.X * VideoTrack.Dimensions.Y * sizeof(int32)) };
+		WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample, (int32)(VideoTrack.Dimensions.X * VideoTrack.Dimensions.Y * sizeof(int32)), CurrentTime };
 
 		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(AndroidCameraPlayerWriteVideoSample,
 			FWriteVideoSampleParams, Params, WriteVideoSampleParams,
@@ -548,7 +552,7 @@ void FAndroidCameraPlayer::TickFetch(FTimespan DeltaTime, FTimespan Timecode)
 				if (PinnedJavaCameraPlayer->IsActive())
 				{
 					// must make a copy (buffer is owned by Java, not us!)
-					Params.VideoSample->InitializeBuffer(Buffer, FTimespan::FromMilliseconds(CurrentFramePosition), true);
+					Params.VideoSample->InitializeBuffer(Buffer, Params.SampleTime, true);
 
 					FVector4 ScaleRotation = PinnedJavaCameraPlayer->GetScaleRotation();
 					FVector4 Offset = PinnedJavaCameraPlayer->GetOffset();
@@ -574,7 +578,7 @@ void FAndroidCameraPlayer::TickFetch(FTimespan DeltaTime, FTimespan Timecode)
 				if (IsRunningRHIInSeparateThread())
 				{
 					new (RHICmdList.AllocCommand<FRHICommandUpdateExternalCameraSample>()) FRHICommandUpdateExternalCameraSample(Params.JavaCameraPlayerPtr, Params.PlayerGuid);
-					// WAIT
+					RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
 				}
 				else
 				{
@@ -633,19 +637,21 @@ void FAndroidCameraPlayer::TickFetch(FTimespan DeltaTime, FTimespan Timecode)
 			TWeakPtr<FJavaAndroidCameraPlayer, ESPMode::ThreadSafe> JavaCameraPlayerPtr;
 			TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr;
 			TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample;
+			FTimespan SampleTime;
 		}
-		WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample };
+		WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample, CurrentTime };
 
 		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(AndroidCameraPlayerWriteVideoSample,
 			FWriteVideoSampleParams, Params, WriteVideoSampleParams,
 			{
 				if (IsRunningRHIInSeparateThread())
 				{
-					new (RHICmdList.AllocCommand<FRHICommandUpdateTextureCameraSample>()) FRHICommandUpdateTextureCameraSample(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample);
+					new (RHICmdList.AllocCommand<FRHICommandUpdateTextureCameraSample>()) FRHICommandUpdateTextureCameraSample(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleTime);
+					RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
 				}
 				else
 				{
-					DoUpdateTextureCameraSampleExecute(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample);
+					DoUpdateTextureCameraSampleExecute(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleTime);
 				}
 			});
 	}
@@ -670,19 +676,21 @@ void FAndroidCameraPlayer::TickFetch(FTimespan DeltaTime, FTimespan Timecode)
 		TWeakPtr<FMediaSamples, ESPMode::ThreadSafe> SamplesPtr;
 		TSharedRef<FAndroidCameraTextureSample, ESPMode::ThreadSafe> VideoSample;
 		int32 SampleCount;
+		FTimespan SampleTime;
 	}
-	WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample, (int32)(VideoTrack.Dimensions.X * VideoTrack.Dimensions.Y * sizeof(int32)) };
+	WriteVideoSampleParams = { JavaCameraPlayer, Samples, VideoSample, (int32)(VideoTrack.Dimensions.X * VideoTrack.Dimensions.Y * sizeof(int32)), CurrentTime };
 
 	ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(AndroidCameraPlayerWriteVideoSample,
 		FWriteVideoSampleParams, Params, WriteVideoSampleParams,
 		{
 			if (IsRunningRHIInSeparateThread())
 			{
-				new (RHICmdList.AllocCommand<FRHICommandUpdateBufferCameraSample>()) FRHICommandUpdateBufferCameraSample(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleCount);
+				new (RHICmdList.AllocCommand<FRHICommandUpdateBufferCameraSample>()) FRHICommandUpdateBufferCameraSample(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleCount, Params.SampleTime);
+				RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
 			}
 			else
 			{
-				DoUpdateBufferCameraSampleExecute(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleCount);
+				DoUpdateBufferCameraSampleExecute(Params.JavaCameraPlayerPtr, Params.SamplesPtr, Params.VideoSample, Params.SampleCount, Params.SampleTime);
 			}
 		});
 #endif //WITH_ENGINE
@@ -730,6 +738,9 @@ void FAndroidCameraPlayer::TickInput(FTimespan DeltaTime, FTimespan Timecode)
 		return;
 	}
 
+	// advance time if not paused
+	CurrentTime += DeltaTime * GetRate();
+
 	// register delegate if not registered
 	if (!ResumeHandle.IsValid())
 	{
@@ -864,6 +875,22 @@ bool FAndroidCameraPlayer::InitializePlayer()
 		SelectedVideoTrack = INDEX_NONE;
 	}
 
+	// set to best matching format for the selected track
+	int32 NumFormats = VideoTracks[SelectedVideoTrack].Formats.Num();
+	int32 NewWidth = JavaCameraPlayer->GetVideoWidth();
+	int32 NewHeight = JavaCameraPlayer->GetVideoHeight();
+	int32 NewFPS = JavaCameraPlayer->GetFrameRate();
+	for (int32 FormatIndex = 0; FormatIndex < NumFormats; FormatIndex++)
+	{
+		const FJavaAndroidCameraPlayer::FVideoFormat& Format = VideoTracks[SelectedVideoTrack].Formats[FormatIndex];
+
+		if (Format.Dimensions.X == NewWidth && Format.Dimensions.Y == NewHeight && Format.FrameRate == NewFPS)
+		{
+			VideoTracks[SelectedVideoTrack].Format = FormatIndex;
+			break;
+		}
+	}
+
 	CurrentState = EMediaState::Stopped;
 
 	// notify listeners
@@ -1181,7 +1208,7 @@ bool FAndroidCameraPlayer::SelectTrack(EMediaTrackType TrackType, int32 TrackInd
 
 				// selecting track picks new resolution and framerate
 				// restart with new framerate if open
-				if (CurrentState == EMediaState::Playing || CurrentState == EMediaState::Paused)
+				if (CurrentState == EMediaState::Playing || CurrentState == EMediaState::Paused || CurrentState == EMediaState::Stopped)
 				{
 					float OldRate = GetRate();
 
@@ -1193,7 +1220,11 @@ bool FAndroidCameraPlayer::SelectTrack(EMediaTrackType TrackType, int32 TrackInd
 					bOpenWithoutEvents = true;
 					Open(NewUrl, nullptr);
 					bOpenWithoutEvents = false;
-					SetRate(OldRate);
+
+					if (CurrentState != EMediaState::Stopped)
+					{
+						SetRate(OldRate);
+					}
 				}
 
 				UE_LOG(LogAndroidCamera, VeryVerbose, TEXT("Player %p: Enabling video"), this, TrackIndex);
@@ -1231,7 +1262,7 @@ bool FAndroidCameraPlayer::SetTrackFormat(EMediaTrackType TrackType, int32 Track
 			VideoTracks[TrackIndex].Format = FormatIndex;
 
 			// restart with new resolution and framerate if open
-			if (CurrentState == EMediaState::Playing || CurrentState == EMediaState::Paused)
+			if (CurrentState == EMediaState::Playing || CurrentState == EMediaState::Paused || CurrentState == EMediaState::Stopped)
 			{
 				float OldRate = GetRate();
 
@@ -1242,7 +1273,11 @@ bool FAndroidCameraPlayer::SetTrackFormat(EMediaTrackType TrackType, int32 Track
 				bOpenWithoutEvents = true;
 				Open(NewUrl, nullptr);
 				bOpenWithoutEvents = false;
-				SetRate(OldRate);
+
+				if (CurrentState != EMediaState::Stopped)
+				{
+					SetRate(OldRate);
+				}
 			}
 		}
 		else
@@ -1341,7 +1376,7 @@ FTimespan FAndroidCameraPlayer::GetDuration() const
 		return FTimespan::Zero();
 	}
 
-	return FTimespan::FromMilliseconds(JavaCameraPlayer->GetDuration());
+	return FTimespan::MaxValue();
 }
 
 
@@ -1381,7 +1416,7 @@ FTimespan FAndroidCameraPlayer::GetTime() const
 		return FTimespan::Zero();
 	}
 
-	return FTimespan::FromMilliseconds(JavaCameraPlayer->GetCurrentPosition());
+	return CurrentTime;
 }
 
 
diff --git a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.h b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.h
index 24bfaae7942c..a81b5d1c9dd6 100644
--- a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.h
+++ b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Private/Player/AndroidCameraPlayer.h
@@ -129,6 +129,9 @@ private:
 	/** Current player state. */
 	EMediaState CurrentState;
 
+	/** The current time of the playback. */
+	FTimespan CurrentTime;
+
 	/** Current state of looping. */
 	bool bLooping;
 
diff --git a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Public/AndroidJavaCameraPlayer.h b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Public/AndroidJavaCameraPlayer.h
index 2f2ea266637b..44a36dc569ff 100644
--- a/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Public/AndroidJavaCameraPlayer.h
+++ b/Engine/Plugins/Media/AndroidCamera/Source/AndroidCamera/Public/AndroidJavaCameraPlayer.h
@@ -71,6 +71,7 @@ public:
 	bool IsPrepared();
 	bool DidComplete();
 	bool SetDataSource(const FString & Url);
+	FString GetDataSource();
 	bool Prepare();
 	bool PrepareAsync();
 	void SeekTo(int32 Milliseconds);
@@ -111,6 +112,7 @@ private:
 	FJavaClassMethod IsPreparedMethod;
 	FJavaClassMethod DidCompleteMethod;
 	FJavaClassMethod SetDataSourceURLMethod;
+	FJavaClassMethod GetDataSourceURLMethod;
 	FJavaClassMethod PrepareMethod;
 	FJavaClassMethod PrepareAsyncMethod;
 	FJavaClassMethod SeekToMethod;
diff --git a/Engine/Plugins/Media/AndroidMedia/Source/AndroidMedia/Private/Player/AndroidMediaPlayer.cpp b/Engine/Plugins/Media/AndroidMedia/Source/AndroidMedia/Private/Player/AndroidMediaPlayer.cpp
index dc97bd3bb98d..65cb45f54a64 100644
--- a/Engine/Plugins/Media/AndroidMedia/Source/AndroidMedia/Private/Player/AndroidMediaPlayer.cpp
+++ b/Engine/Plugins/Media/AndroidMedia/Source/AndroidMedia/Private/Player/AndroidMediaPlayer.cpp
@@ -611,7 +611,8 @@ void FAndroidMediaPlayer::TickFetch(FTimespan DeltaTime, FTimespan /*Timecode*/)
 				if (IsRunningRHIInSeparateThread())
 				{
 					new (RHICmdList.AllocCommand<FRHICommandUpdateExternalMediaSample>()) FRHICommandUpdateExternalMediaSample(Params.JavaMediaPlayerPtr, Params.PlayerGuid);
-					// WAIT
+					// wait for DoUpdateExternalMediaSampleExecute to complete.
+					RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread); 
 				}
 				else
 				{
diff --git a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicLevelViewport.cpp b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicLevelViewport.cpp
index 846ed26c1a33..50017a9717ef 100644
--- a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicLevelViewport.cpp
+++ b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicLevelViewport.cpp
@@ -738,7 +738,7 @@ void SCinematicLevelViewport::Tick(const FGeometry& AllottedGeometry, const doub
 		else
 		{
 			// Just use the FoV
-			UIData.Filmback = FText::FromString(Lex::ToString(FNumericUnit<float>(CameraComponent->FieldOfView, EUnit::Degrees)));
+			UIData.Filmback = FText::FromString(LexToString(FNumericUnit<float>(CameraComponent->FieldOfView, EUnit::Degrees)));
 		}
 	}
 	else
diff --git a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.cpp b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.cpp
index cd414d942f53..4437756195e1 100644
--- a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.cpp
+++ b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.cpp
@@ -86,7 +86,7 @@ void SCinematicTransportRange::SetTime(const FGeometry& MyGeometry, const FPoint
 	}
 }
 
-void SCinematicTransportRange::OnMouseCaptureLost()
+void SCinematicTransportRange::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	bDraggingTime = false;
 }
diff --git a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.h b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.h
index 34a2fecd536e..abc9a96b598c 100644
--- a/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.h
+++ b/Engine/Plugins/MovieScene/LevelSequenceEditor/Source/LevelSequenceEditor/Private/CinematicViewport/SCinematicTransportRange.h
@@ -31,7 +31,7 @@ public:
 	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
 	virtual FReply OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent);
 	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 
 private:
 
diff --git a/Engine/Plugins/NetcodeUnitTest/NetcodeUnitTest/Source/NetcodeUnitTest/Private/UnitTestCommandlet.cpp b/Engine/Plugins/NetcodeUnitTest/NetcodeUnitTest/Source/NetcodeUnitTest/Private/UnitTestCommandlet.cpp
index 8492322fa61c..da205aa72615 100644
--- a/Engine/Plugins/NetcodeUnitTest/NetcodeUnitTest/Source/NetcodeUnitTest/Private/UnitTestCommandlet.cpp
+++ b/Engine/Plugins/NetcodeUnitTest/NetcodeUnitTest/Source/NetcodeUnitTest/Private/UnitTestCommandlet.cpp
@@ -58,6 +58,7 @@ UUnitTestCommandlet::UUnitTestCommandlet(const FObjectInitializer& ObjectInitial
 
 	LogToConsole = true;
 	ShowErrorCount = true;
+	ShowProgress = true;
 }
 
 int32 UUnitTestCommandlet::Main(const FString& Params)
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.cpp
index fd89d7593cb4..04f9f1a45ef7 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.cpp
@@ -5,7 +5,7 @@
 #include "Async/TaskGraphInterfaces.h"
 
 FOnlineGetAchievementsCallback::FOnlineGetAchievementsCallback(FOnlineSubsystemGameCircle *const InSubsystem, 
-															   const FUniqueNetIdString& InUserID, 
+															   const FUniqueNetIdGameCircle& InUserID,
 															   const FOnQueryAchievementsCompleteDelegate& InDelegate)
 	: GameCircleSubsystem(InSubsystem)
 	, UserID(InUserID)
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.h b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.h
index c42caa5034d4..0c2c5cd8bcad 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAGSAchievementsClientCallbacks.h
@@ -6,6 +6,7 @@
 #include "AGS/AchievementsClientInterface.h"
 #include "Interfaces/OnlineAchievementsInterface.h"
 #include "OnlineSubsystemTypes.h"
+#include "OnlineIdentityInterfaceGameCircle.h"
 
 class FOnlineSubsystemGameCircle;
 
@@ -14,7 +15,7 @@ class FOnlineGetAchievementsCallback : public AmazonGames::IGetAchievementsCb
 public:
 
 	FOnlineGetAchievementsCallback(FOnlineSubsystemGameCircle *const InSubsystem, 
-									const FUniqueNetIdString& InUserId,
+									const FUniqueNetIdGameCircle& InUserId,
 									const FOnQueryAchievementsCompleteDelegate& InDelegate);
 
 	virtual void onGetAchievementsCb(AmazonGames::ErrorCode errorCode, 
@@ -26,7 +27,7 @@ private:
 	FOnlineGetAchievementsCallback();
 
 	FOnlineSubsystemGameCircle *const GameCircleSubsystem;
-	FUniqueNetIdString UserID;
+	FUniqueNetIdGameCircle UserID;
 	FOnQueryAchievementsCompleteDelegate Delegate;
 };
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAchievementsInterfaceGameCircle.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAchievementsInterfaceGameCircle.cpp
index b2a28caf91a0..40b2f79067c3 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAchievementsInterfaceGameCircle.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineAchievementsInterfaceGameCircle.cpp
@@ -22,7 +22,7 @@ void FOnlineAchievementsGameCircle::QueryAchievements(const FUniqueNetId& Player
 		return;
 	}
 
-	AmazonGames::AchievementsClientInterface::getAchievements(new FOnlineGetAchievementsCallback(AndroidSubsystem, FUniqueNetIdString(PlayerId), Delegate));
+	AmazonGames::AchievementsClientInterface::getAchievements(new FOnlineGetAchievementsCallback(AndroidSubsystem, FUniqueNetIdGameCircle(PlayerId), Delegate));
 }
 
 void FOnlineAchievementsGameCircle::QueryAchievementDescriptions(const FUniqueNetId& PlayerId, const FOnQueryAchievementsCompleteDelegate& Delegate)
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.cpp
index f9a7430834d8..a76ad4fb91ae 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.cpp
@@ -89,15 +89,15 @@ void FOnlineExternalUIGameCircle::GameActivityOnResume()
 
 			if (ShowLoginDelegate.IsBound())
 			{
-				TSharedPtr<const FUniqueNetIdString> PlayerId = Subsystem->GetIdentityGameCircle()->GetCurrentUserId();
+				TSharedPtr<const FUniqueNetIdGameCircle> PlayerId = Subsystem->GetIdentityGameCircle()->GetCurrentUserId();
 				if (!PlayerId.IsValid())
 				{
 					FPlatformMisc::LowLevelOutputDebugString(TEXT("PlayerId from Identity Interface is Invalid"));
-					PlayerId = MakeShareable(new FUniqueNetIdString());
+					PlayerId = MakeShareable(new FUniqueNetIdGameCircle());
 					Subsystem->GetIdentityGameCircle()->SetCurrentUserId(PlayerId);
 				}
 				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Executing ShowLoginUI Delegate if safe. PlayerId - %s  Index=%d"), *PlayerId->ToString(), ShowLoginControllerIndex);
-				ShowLoginDelegate.ExecuteIfBound(PlayerId, ShowLoginControllerIndex);
+				ShowLoginDelegate.ExecuteIfBound(PlayerId, ShowLoginControllerIndex, FOnlineError(true));
 
 				ShowLoginDelegate.Unbind();
 			}
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.h b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.h
index b3e492c007b2..adefa9a9f1ef 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineExternalUIInterfaceGameCircle.h
@@ -23,6 +23,7 @@ public:
 	FOnlineExternalUIGameCircle(FOnlineSubsystemGameCircle* InSubsystem);
 
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionMame) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.cpp
index cc84d1d316c1..3a7229936cb6 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.cpp
@@ -72,7 +72,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGameCircle::CreateUniquePlayerId(u
 		if (StrLen > 0)
 		{
 			FString StrId((TCHAR*)Bytes);
-			return MakeShareable(new FUniqueNetIdString(StrId));
+			return MakeShareable(new FUniqueNetIdGameCircle(StrId));
 		}
 	}
 	return NULL;
@@ -81,7 +81,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGameCircle::CreateUniquePlayerId(u
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityGameCircle::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdGameCircle(Str));
 }
 
 
@@ -153,7 +153,7 @@ void FOnlineIdentityGameCircle::OnGetLocalPlayerPlayerCallback(AmazonGames::Erro
 			LocalPlayerInfo.AvatarURL = InPlayerInfo->avatarUrl;
 
 			FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Received player info for local player with playerId \"%s\""), *LocalPlayerInfo.PlayerId);
-			UniqueNetId = MakeShareable(new FUniqueNetIdString(LocalPlayerInfo.PlayerId));
+			UniqueNetId = MakeShareable(new FUniqueNetIdGameCircle(LocalPlayerInfo.PlayerId));
 
 			AmazonGames::PlayerClientInterface::setSignedInStateChangedListener(&SignedInStateChangeListener);
 			bIsLoggedIn = AmazonGames::PlayerClientInterface::isSignedIn();
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.h b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.h
index 3b638dba3425..7f3e4713cdd0 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineIdentityInterfaceGameCircle.h
@@ -8,6 +8,9 @@
 
 #include "OnlineAGSPlayerClientCallbacks.h"
 
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdGameCircle, GAMECIRCLE_SUBSYSTEM);
+
 class FOnlineIdentityGameCircle :
 	public IOnlineIdentity
 {
@@ -42,9 +45,9 @@ PACKAGE_SCOPE:
 	FOnlineIdentityGameCircle(FOnlineSubsystemGameCircle* InSubsystem);
 
 	/** Allow individual interfaces to access the currently signed-in user's id */
-	TSharedPtr<const FUniqueNetIdString> GetCurrentUserId() const { return UniqueNetId; }
+	TSharedPtr<const FUniqueNetIdGameCircle> GetCurrentUserId() const { return UniqueNetId; }
 
-	void SetCurrentUserId(TSharedPtr<const FUniqueNetIdString> InUniqueNetId) { UniqueNetId = InUniqueNetId; }
+	void SetCurrentUserId(TSharedPtr<const FUniqueNetIdGameCircle> InUniqueNetId) { UniqueNetId = InUniqueNetId; }
 
 	void SetSignedInState(bool bNewState) { bIsLoggedIn = bNewState; }
 
@@ -65,7 +68,7 @@ private:
 	} LocalPlayerInfo;
 
 	/** UID for this identity */
-	TSharedPtr<const FUniqueNetIdString> UniqueNetId;
+	TSharedPtr<const FUniqueNetIdGameCircle> UniqueNetId;
 
 	FOnlineSignedInStateChangedListener	SignedInStateChangeListener;
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineLeaderboardInterfaceGameCircle.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineLeaderboardInterfaceGameCircle.cpp
index 4c43c9776f22..564c9c7c5663 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineLeaderboardInterfaceGameCircle.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineLeaderboardInterfaceGameCircle.cpp
@@ -264,7 +264,7 @@ void FOnlineLeaderboardsGameCircle::OnReadFriendsListComplete(int32 LocalPlayer,
 void FOnlineLeaderboardsGameCircle::GetScoreForNextPlayer(const char *const LeaderboardID)
 {
 	check(PlayersToQuery.Num() > 0);
-	const FUniqueNetIdString NetIdString(PlayersToQuery[0]->ToString());
+	const FUniqueNetIdGameCircle NetIdString(PlayersToQuery[0]->ToString());
 
 	UE_LOG_ONLINE(Display, TEXT("Getting Score for Player Id - %s . %s"), *PlayersToQuery[0]->ToString(), *NetIdString.UniqueNetIdStr);
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineStoreInterfaceGameCircle.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineStoreInterfaceGameCircle.cpp
index 7516d64bb33b..cb1c3e0ceae8 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineStoreInterfaceGameCircle.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGameCircle/Source/OnlineSubsystemGameCircle/Private/OnlineStoreInterfaceGameCircle.cpp
@@ -110,7 +110,7 @@ JNI_METHOD void Java_com_epicgames_ue4_AmazonStoreHelper_nativeQueryComplete(JNI
 			jenv->ReleaseStringUTFChars(NextPrice, charsPrice);
 			jenv->DeleteLocalRef(NextPrice);
 
-			Lex::FromString(NewProductInfo.RawPrice, *NewProductInfo.DisplayPrice);
+			LexFromString(NewProductInfo.RawPrice, *NewProductInfo.DisplayPrice);
 
 			ProvidedProductInformation.Add(NewProductInfo);
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAchievementsInterfaceGooglePlay.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAchievementsInterfaceGooglePlay.cpp
index c210b80928ca..dba16c955dc5 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAchievementsInterfaceGooglePlay.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAchievementsInterfaceGooglePlay.cpp
@@ -7,6 +7,7 @@
 #include "OnlineAsyncTaskGooglePlayQueryAchievements.h"
 #include "OnlineSubsystemGooglePlay.h"
 #include "UObject/Class.h"
+#include "OnlineIdentityInterfaceGooglePlay.h"
 
 using namespace gpg;
 
@@ -25,7 +26,7 @@ void FOnlineAchievementsGooglePlay::QueryAchievements(const FUniqueNetId& Player
 		return;
 	}
 
-	auto QueryTask = new FOnlineAsyncTaskGooglePlayQueryAchievements(AndroidSubsystem, FUniqueNetIdString(PlayerId), Delegate);
+	auto QueryTask = new FOnlineAsyncTaskGooglePlayQueryAchievements(AndroidSubsystem, FUniqueNetIdGooglePlay(PlayerId), Delegate);
 	AndroidSubsystem->QueueAsyncTask(QueryTask);
 }
 
@@ -148,7 +149,7 @@ void FOnlineAchievementsGooglePlay::WriteAchievements( const FUniqueNetId& Playe
 	// Kick off a query if we don't have valid data.
 	if (GoogleAchievements.status != ResponseStatus::VALID)
 	{
-		auto QueryTask = new FOnlineAsyncTaskGooglePlayQueryAchievements(AndroidSubsystem, FUniqueNetIdString(PlayerId),
+		auto QueryTask = new FOnlineAsyncTaskGooglePlayQueryAchievements(AndroidSubsystem, FUniqueNetIdGooglePlay(PlayerId),
 			FOnQueryAchievementsCompleteDelegate::CreateRaw(
 				this,
 				&FOnlineAchievementsGooglePlay::FinishAchievementWrite,
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.cpp
index cf6823b6d697..c53eb2fa2b9f 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.cpp
@@ -10,7 +10,7 @@ THIRD_PARTY_INCLUDES_END
 
 FOnlineAsyncTaskGooglePlayQueryAchievements::FOnlineAsyncTaskGooglePlayQueryAchievements(
 	FOnlineSubsystemGooglePlay* InSubsystem,
-	const FUniqueNetIdString& InUserId,
+	const FUniqueNetIdGooglePlay& InUserId,
 	const FOnQueryAchievementsCompleteDelegate& InDelegate)
 	: FOnlineAsyncTaskBasic(InSubsystem)
 	, UserId(InUserId)
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.h b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.h
index 8053ead7000e..b7e0a37fd141 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayQueryAchievements.h
@@ -6,6 +6,7 @@
 #include "OnlineAsyncTaskManager.h"
 #include "OnlineSubsystemGooglePlayPackage.h"
 #include "Interfaces/OnlineAchievementsInterface.h"
+#include "OnlineIdentityInterfaceGooglePlay.h"
 
 THIRD_PARTY_INCLUDES_START
 #include "gpg/achievement_manager.h"
@@ -18,7 +19,7 @@ class FOnlineAsyncTaskGooglePlayQueryAchievements : public FOnlineAsyncTaskBasic
 public:
 	FOnlineAsyncTaskGooglePlayQueryAchievements(
 		FOnlineSubsystemGooglePlay* InSubsystem,
-		const FUniqueNetIdString& InUserId,
+		const FUniqueNetIdGooglePlay& InUserId,
 		const FOnQueryAchievementsCompleteDelegate& InDelegate);
 
 	// FOnlineAsyncItem
@@ -30,7 +31,7 @@ public:
 	virtual void Tick() override;
 
 private:
-	FUniqueNetIdString UserId;
+	FUniqueNetIdGooglePlay UserId;
 	FOnQueryAchievementsCompleteDelegate Delegate;
 	gpg::AchievementManager::FetchAllResponse Response;
 };
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayReadLeaderboard.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayReadLeaderboard.cpp
index 43ad665b7315..6e9c591213eb 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayReadLeaderboard.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayReadLeaderboard.cpp
@@ -52,7 +52,7 @@ void FOnlineAsyncTaskGooglePlayReadLeaderboard::Tick()
 	}
 
 	// We can only get the current user's leaderboard score from Google Play, so just add one row with it.
-	//TSharedRef<const FUniqueNetId> UserId = MakeShareable(new FUniqueNetIdString(FString(TEXT("0"))));
+	//TSharedRef<const FUniqueNetId> UserId = MakeShareable(new FUniqueNetIdGooglePlay(FString(TEXT("0"))));
 	auto UserId = Subsystem->GetIdentityGooglePlay()->GetCurrentUserId();
 	if (!UserId.IsValid())
 	{
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayShowLoginUI.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayShowLoginUI.cpp
index f8bb7dbabc36..95ea22798b0d 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayShowLoginUI.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineAsyncTaskGooglePlayShowLoginUI.cpp
@@ -56,11 +56,11 @@ void FOnlineAsyncTaskGooglePlayShowLoginUI::Finalize()
 void FOnlineAsyncTaskGooglePlayShowLoginUI::TriggerDelegates()
 {
 	UE_LOG(LogOnline, Log, TEXT("FOnlineAsyncTaskGooglePlayShowLoginUI: TriggerDelegates Success: %d."), WasSuccessful());
-	TSharedPtr<const FUniqueNetIdString> UserId = Subsystem->GetIdentityGooglePlay()->GetCurrentUserId();
+	TSharedPtr<const FUniqueNetIdGooglePlay> UserId = Subsystem->GetIdentityGooglePlay()->GetCurrentUserId();
 
 	if (bWasSuccessful && !UserId.IsValid())
 	{
-		UserId = MakeShareable(new FUniqueNetIdString());
+		UserId = MakeShareable(new FUniqueNetIdGooglePlay());
 		Subsystem->GetIdentityGooglePlay()->SetCurrentUserId(UserId);
 	}
 	else if (!bWasSuccessful)
@@ -68,7 +68,8 @@ void FOnlineAsyncTaskGooglePlayShowLoginUI::TriggerDelegates()
 		Subsystem->GetIdentityGooglePlay()->SetCurrentUserId(nullptr);
 	}
 
-	Delegate.ExecuteIfBound(UserId, PlayerId);
+	FOnlineError Error(bWasSuccessful);
+	Delegate.ExecuteIfBound(UserId, PlayerId, Error);
 }
 
 void FOnlineAsyncTaskGooglePlayShowLoginUI::ProcessGoogleClientConnectResult(bool bInSuccessful, FString AccessToken)
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineExternalUIInterfaceGooglePlay.h b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineExternalUIInterfaceGooglePlay.h
index a2a6a3c1a69a..614ffabc1d74 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineExternalUIInterfaceGooglePlay.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineExternalUIInterfaceGooglePlay.h
@@ -23,6 +23,7 @@ public:
 	FOnlineExternalUIGooglePlay(FOnlineSubsystemGooglePlay* InSubsystem);
 
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.cpp
index 903e0f81779d..67613901b515 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.cpp
@@ -8,7 +8,7 @@ FOnlineIdentityGooglePlay::FPendingConnection FOnlineIdentityGooglePlay::Pending
 FOnlineIdentityGooglePlay::FOnlineIdentityGooglePlay(FOnlineSubsystemGooglePlay* InSubsystem)
 	: bPrevLoggedIn(false)
 	, bLoggedIn(false)
-	, PlayerAlias("NONE")
+	, PlayerAlias("")
 	, AuthToken("NONE")
 	, MainSubsystem(InSubsystem)
 	, bRegisteringUser(false)
@@ -46,7 +46,7 @@ bool FOnlineIdentityGooglePlay::Login(int32 LocalUserNum, const FOnlineAccountCr
 		int32 Len = FCString::Snprintf(Line, MAX_TEXT_LINE_LEN, TEXT("%d"), LocalUserNum);
 
 		const FString PlayerId(Line);
-		UniqueNetId = MakeShareable(new FUniqueNetIdString(PlayerId));
+		UniqueNetId = MakeShareable(new FUniqueNetIdGooglePlay(PlayerId));
 		TriggerOnLoginCompleteDelegates(LocalUserNum, true, *UniqueNetId, TEXT(""));
 	}
 	else if (!PendingConnectRequest.IsConnectionPending)
@@ -57,7 +57,7 @@ bool FOnlineIdentityGooglePlay::Login(int32 LocalUserNum, const FOnlineAccountCr
 	}
 	else
 	{
-		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdString(TEXT("")), FString("Already trying to login"));
+		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdGooglePlay(TEXT("")), FString("Already trying to login"));
 	}
 	
 	return bStartedLogin;
@@ -106,7 +106,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGooglePlay::GetUniquePlayerId(int3
 		return UniqueNetId;
 	}
 
-	TSharedPtr<const FUniqueNetId> NewID = MakeShareable(new FUniqueNetIdString(""));
+	TSharedPtr<const FUniqueNetId> NewID = MakeShareable(new FUniqueNetIdGooglePlay(""));
 	return NewID;
 }
 
@@ -119,7 +119,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGooglePlay::CreateUniquePlayerId(u
 		if (StrLen > 0)
 		{
 			FString StrId((TCHAR*)Bytes);
-			return MakeShareable(new FUniqueNetIdString(StrId));
+			return MakeShareable(new FUniqueNetIdGooglePlay(StrId));
 		}
 	}
 	return NULL;
@@ -128,7 +128,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGooglePlay::CreateUniquePlayerId(u
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityGooglePlay::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdGooglePlay(Str));
 }
 
 
@@ -170,7 +170,7 @@ void FOnlineIdentityGooglePlay::OnLoginCompleted(const int playerID, const gpg::
 	TCHAR Line[MAX_TEXT_LINE_LEN + 1] = { 0 };
 	int32 Len = FCString::Snprintf(Line, MAX_TEXT_LINE_LEN, TEXT("%d"), playerID);
 
-	UniqueNetId = MakeShareable(new FUniqueNetIdString(Line));
+	UniqueNetId = MakeShareable(new FUniqueNetIdGooglePlay(Line));
 	bLoggedIn = errorCode == gpg::AuthStatus::VALID;
 	TriggerOnLoginCompleteDelegates(playerID, bLoggedIn, *UniqueNetId, TEXT(""));
 
@@ -204,7 +204,7 @@ FString FOnlineIdentityGooglePlay::GetAuthType() const
 void FOnlineIdentityGooglePlay::SetPlayerDataFromFetchSelfResponse(const gpg::Player& PlayerData)
 {
 	FString PlayerId(PlayerData.Id().c_str());
-	UniqueNetId = MakeShareable(new FUniqueNetIdString(PlayerId));
+	UniqueNetId = MakeShareable(new FUniqueNetIdGooglePlay(PlayerId));
 	PlayerAlias = PlayerData.Name().c_str();
 }
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.h b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.h
index 83ab629cd51b..a4d1e30fb010 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineIdentityInterfaceGooglePlay.h
@@ -11,6 +11,9 @@ THIRD_PARTY_INCLUDES_START
 #include "gpg/player.h"
 THIRD_PARTY_INCLUDES_END
 
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdGooglePlay, GOOGLEPLAY_SUBSYSTEM);
+
 class FOnlineIdentityGooglePlay :
 	public IOnlineIdentity
 {
@@ -27,7 +30,7 @@ private:
 	bool bRegisteringUser;
 
 	/** UID for this identity */
-	TSharedPtr< const FUniqueNetIdString > UniqueNetId;
+	TSharedPtr< const FUniqueNetIdGooglePlay > UniqueNetId;
 
 	struct FPendingConnection
 	{
@@ -46,9 +49,9 @@ PACKAGE_SCOPE:
 	FOnlineIdentityGooglePlay(FOnlineSubsystemGooglePlay* InSubsystem);
 
 	/** Allow individual interfaces to access the currently signed-in user's id */
-	TSharedPtr<const FUniqueNetIdString> GetCurrentUserId() const { return UniqueNetId; }
+	TSharedPtr<const FUniqueNetIdGooglePlay> GetCurrentUserId() const { return UniqueNetId; }
 
-	void SetCurrentUserId(TSharedPtr<const FUniqueNetIdString> InUniqueNetId) { UniqueNetId = InUniqueNetId; }
+	void SetCurrentUserId(TSharedPtr<const FUniqueNetIdGooglePlay> InUniqueNetId) { UniqueNetId = InUniqueNetId; }
 
 	/** Called from ExternalUIInterface to set UniqueId and PlayerAlias after authentication */
 	void SetPlayerDataFromFetchSelfResponse(const gpg::Player& PlayerData);
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineSubsystemGooglePlay.cpp b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineSubsystemGooglePlay.cpp
index d3ab37e90348..5dd0867cc86a 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineSubsystemGooglePlay.cpp
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Private/OnlineSubsystemGooglePlay.cpp
@@ -289,7 +289,9 @@ void FOnlineSubsystemGooglePlay::StartShowLoginUITask(int PlayerId, const FOnLog
 	if (AreAnyAsyncLoginTasksRunning())
 	{
 		UE_LOG(LogOnline, Log, TEXT("FOnlineSubsystemGooglePlay::StartShowLoginUITask: An asynchronous login task is already running."));
-		Delegate.ExecuteIfBound(nullptr, PlayerId);
+		FOnlineError Error(false);
+		Error.SetFromErrorCode(TEXT("FOnlineSubsystemGooglePlay::StartShowLoginUITask: An asynchronous login task is already running."));
+		Delegate.ExecuteIfBound(nullptr, PlayerId, Error);
 		return;
 	}
 
diff --git a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Public/OnlinePurchaseGooglePlay.h b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Public/OnlinePurchaseGooglePlay.h
index 36e1a4822d69..41d1bf05fece 100644
--- a/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Public/OnlinePurchaseGooglePlay.h
+++ b/Engine/Plugins/Online/Android/OnlineSubsystemGooglePlay/Source/Public/OnlinePurchaseGooglePlay.h
@@ -4,6 +4,7 @@
 
 #include "Interfaces/OnlinePurchaseInterface.h"
 #include "Serialization/JsonSerializerMacros.h"
+#include "OnlineIdentityInterfaceGooglePlay.h"
 
 enum class EGooglePlayBillingResponseCode : uint8;
 
@@ -108,7 +109,7 @@ public:
 	/** Checkout info for the pending order */
 	const FPurchaseCheckoutRequest CheckoutRequest;
 	/** User for the pending order */
-	const FUniqueNetIdString UserId;
+	const FUniqueNetIdGooglePlay UserId;
 	/** Delegate to call on completion */
 	const FOnPurchaseCheckoutComplete CheckoutCompleteDelegate;
 	/** Tracks the current state of the order */
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.cpp
index f925e249d219..fc3f87baaa6a 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.cpp
@@ -19,13 +19,13 @@ bool FOnlineExternalUIIOS::ShowLoginUI(const int ControllerIndex, bool bShowOnli
 	if (IdentityInterface->GetLocalGameCenterUser() == nullptr)
 	{
 		UE_LOG(LogOnline, Log, TEXT("Game Center localPlayer is null."));
-		Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+		Delegate.ExecuteIfBound(nullptr, ControllerIndex, FOnlineError(false));
 		return true;
 	}
 	
 	if (IdentityInterface->GetLocalGameCenterUser().isAuthenticated)
 	{
-		Delegate.ExecuteIfBound(IdentityInterface->GetLocalPlayerUniqueId(), ControllerIndex);
+		Delegate.ExecuteIfBound(IdentityInterface->GetLocalPlayerUniqueId(), ControllerIndex, FOnlineError(true));
 		return true;
 	}
 	
@@ -98,15 +98,18 @@ bool FOnlineExternalUIIOS::ShowSendMessageUI(int32 LocalUserNum, const FShowSend
 
 void FOnlineExternalUIIOS::OnLoginComplete(int ControllerIndex, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorString)
 {
+	FOnlineError Error(bWasSuccessful);
+	Error.SetFromErrorCode(ErrorString);
+
     FOnlineIdentityIOS* IdentityInterface = static_cast<FOnlineIdentityIOS*>(Subsystem->GetIdentityInterface().Get());
-    TSharedPtr<FUniqueNetIdString> UniqueNetId;
+    TSharedPtr<FUniqueNetIdIOS> UniqueNetId;
     if (bWasSuccessful)
     {
         const FString PlayerId(IdentityInterface->GetLocalGameCenterUser().playerID);
-        UniqueNetId = MakeShareable(new FUniqueNetIdString(PlayerId));
+        UniqueNetId = MakeShareable(new FUniqueNetIdIOS(PlayerId));
     }
-    CopiedDelegate.ExecuteIfBound(UniqueNetId, ControllerIndex);
+    CopiedDelegate.ExecuteIfBound(UniqueNetId, ControllerIndex, Error);
 
 	check(IdentityInterface != nullptr);
 	IdentityInterface->ClearOnLoginCompleteDelegate_Handle(ControllerIndex, CompleteDelegate);
-}
\ No newline at end of file
+}
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.h
index bc1239aa5f53..52e5f12ad397 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineExternalUIInterfaceIOS.h
@@ -17,6 +17,7 @@ public:
 
 	//~ Begin IOnlineExternalUI Interface
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName = NAME_GameSession) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineFriendsInterfaceIOS.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineFriendsInterfaceIOS.h
index 85cf90e4026c..3dfc77cc1caa 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineFriendsInterfaceIOS.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineFriendsInterfaceIOS.h
@@ -34,7 +34,7 @@ public:
 	 * Init/default constructor
 	 */
 	FOnlineFriendIOS(const FString& InUserId=TEXT("")) 
-		: UserId(new FUniqueNetIdString(InUserId))
+		: UserId(new FUniqueNetIdIOS(InUserId))
 	{
 	}
 
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.cpp
index a448e307cbbc..dc51cdf1dc52 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.cpp
@@ -15,12 +15,12 @@ FOnlineIdentityIOS::FOnlineIdentityIOS(FOnlineSubsystemIOS* InSubsystem)
 {
 }
 
-TSharedPtr<FUniqueNetIdString> FOnlineIdentityIOS::GetLocalPlayerUniqueId() const
+TSharedPtr<FUniqueNetIdIOS> FOnlineIdentityIOS::GetLocalPlayerUniqueId() const
 {
 	return UniqueNetId;
 }
 
-void FOnlineIdentityIOS::SetLocalPlayerUniqueId(const TSharedPtr<FUniqueNetIdString>& UniqueId)
+void FOnlineIdentityIOS::SetLocalPlayerUniqueId(const TSharedPtr<FUniqueNetIdIOS>& UniqueId)
 {
 	UniqueNetId = UniqueId;
 }
@@ -55,7 +55,7 @@ bool FOnlineIdentityIOS::Login(int32 LocalUserNum, const FOnlineAccountCredentia
 		bStartedLogin = true;
         
 		const FString PlayerId(GetLocalGameCenterUser().playerID);
-		UniqueNetId = MakeShareable( new FUniqueNetIdString( PlayerId ) );
+		UniqueNetId = MakeShareable( new FUniqueNetIdIOS( PlayerId ) );
 		TriggerOnLoginCompleteDelegates(LocalUserNum, true, *UniqueNetId, TEXT(""));
         
         UE_LOG(LogOnline, Log, TEXT("The user %s has logged into Game Center"), *PlayerId);
@@ -79,7 +79,7 @@ bool FOnlineIdentityIOS::Login(int32 LocalUserNum, const FOnlineAccountCredentia
 					{
 						/* Perform additional tasks for the authenticated player here */
 						const FString PlayerId(GetLocalGameCenterUser().playerID);
-						UniqueNetId = MakeShareable(new FUniqueNetIdString(PlayerId));
+						UniqueNetId = MakeShareable(new FUniqueNetIdIOS(PlayerId));
 
 						bWasSuccessful = true;
 						UE_LOG(LogOnline, Log, TEXT("The user %s has logged into Game Center"), *PlayerId);
@@ -99,7 +99,7 @@ bool FOnlineIdentityIOS::Login(int32 LocalUserNum, const FOnlineAccountCredentia
 					// Report back to the game thread whether this succeeded.
 					[FIOSAsyncTask CreateTaskWithBlock : ^ bool(void)
 					{
-						TSharedPtr<FUniqueNetIdString> UniqueIdForUser = UniqueNetId.IsValid() ? UniqueNetId : MakeShareable(new FUniqueNetIdString());
+						TSharedPtr<FUniqueNetIdIOS> UniqueIdForUser = UniqueNetId.IsValid() ? UniqueNetId : MakeShareable(new FUniqueNetIdIOS());
 						TriggerOnLoginCompleteDelegates(LocalUserNum, bWasSuccessful, *UniqueIdForUser, *ErrorMessage);
 
 						return true;
@@ -117,7 +117,7 @@ bool FOnlineIdentityIOS::Login(int32 LocalUserNum, const FOnlineAccountCredentia
 	else
 	{
 		// User is not currently logged into game center
-		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdString(), TEXT("IOS version is not compatible with the game center implementation"));
+		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdIOS(), TEXT("IOS version is not compatible with the game center implementation"));
 	}
 	
 	return bStartedLogin;
@@ -171,7 +171,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityIOS::CreateUniquePlayerId(uint8* B
 		if (StrLen > 0)
 		{
 			FString StrId((TCHAR*)Bytes);
-			return MakeShareable(new FUniqueNetIdString(StrId));
+			return MakeShareable(new FUniqueNetIdIOS(StrId));
 		}
 	}
     
@@ -180,7 +180,7 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityIOS::CreateUniquePlayerId(uint8* B
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityIOS::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdIOS(Str));
 }
 
 FString FOnlineIdentityIOS::GetPlayerNickname(int32 LocalUserNum) const
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.h
index a021b2c08356..51498e7aa252 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineIdentityInterfaceIOS.h
@@ -14,7 +14,7 @@ class FOnlineIdentityIOS :
 {
 private:
 	/** UID for this identity */
-	TSharedPtr< FUniqueNetIdString > UniqueNetId;
+	TSharedPtr< FUniqueNetIdIOS > UniqueNetId;
 	FOnlineSubsystemIOS* Subsystem;
 
 	FOnlineIdentityIOS();
@@ -26,9 +26,9 @@ PACKAGE_SCOPE:
 	 */
 	FOnlineIdentityIOS(FOnlineSubsystemIOS* InSubsystem);
 
-	TSharedPtr<FUniqueNetIdString> GetLocalPlayerUniqueId() const;
+	TSharedPtr<FUniqueNetIdIOS> GetLocalPlayerUniqueId() const;
 
-	void SetLocalPlayerUniqueId(const TSharedPtr<FUniqueNetIdString>& UniqueId);
+	void SetLocalPlayerUniqueId(const TSharedPtr<FUniqueNetIdIOS>& UniqueId);
 
 public:
 
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineLeaderboardsInterfaceIOS.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineLeaderboardsInterfaceIOS.cpp
index 42f9c2aeaafd..1f61df0cfcca 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineLeaderboardsInterfaceIOS.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineLeaderboardsInterfaceIOS.cpp
@@ -105,7 +105,7 @@ bool FOnlineLeaderboardsIOS::ReadLeaderboardCompletionDelegate(NSArray* players,
                         UE_LOG(LogOnline, Display, TEXT("Value: %d"), score.value);
                         UE_LOG(LogOnline, Display, TEXT("----------------------------------------------------------------"));
                             
-                        TSharedRef<const FUniqueNetId> UserId = MakeShareable(new FUniqueNetIdString(PlayerIDString));
+                        TSharedRef<const FUniqueNetId> UserId = MakeShareable(new FUniqueNetIdIOS(PlayerIDString));
                             
                         FOnlineStatsRow* UserRow = ReadObject.Get().FindPlayerRecord(UserId.Get());
                         if (UserRow == NULL)
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlinePurchaseIOS.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlinePurchaseIOS.cpp
index 2878c2ea1676..5e907a8fa144 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlinePurchaseIOS.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlinePurchaseIOS.cpp
@@ -62,8 +62,8 @@ void FOnlinePurchaseIOS::InitStoreKit(FStoreKitHelperV2* InStoreKit)
 
 bool FOnlinePurchaseIOS::IsAllowedToPurchase(const FUniqueNetId& UserId)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FOnlinePurchaseIOS::IsAllowedToPurchase"));
 	bool bCanMakePurchases = [SKPaymentQueue canMakePayments];
+	UE_LOG(LogOnline, Verbose, TEXT("FOnlinePurchaseIOS::IsAllowedToPurchase %s"), *LexToString(bCanMakePurchases));
 	return bCanMakePurchases;
 }
 
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.cpp
index 24d38ce17390..1475f5ab4804 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.cpp
@@ -327,6 +327,13 @@ FNamedOnlineSession* FOnlineSessionIOS::AddNamedSession(FName SessionName, const
 }
 
 
+TSharedPtr<const FUniqueNetId> FOnlineSessionIOS::CreateSessionIdFromString(const FString& SessionIdStr)
+{
+	ensureMsgf(false, TEXT("NYI"));
+	TSharedPtr<const FUniqueNetId> SessionId;
+	return SessionId;
+}
+
 FNamedOnlineSession* FOnlineSessionIOS::GetNamedSession(FName SessionName)
 {
 	FScopeLock ScopeLock(&SessionLock);
@@ -727,7 +734,7 @@ bool FOnlineSessionIOS::RegisterPlayer(FName SessionName, const FUniqueNetId& Pl
 	UE_LOG(LogOnline, Display, TEXT("FOnlineSessionIOS::RegisterPlayer - not implemented"));	
 	
 	TArray< TSharedRef<const FUniqueNetId> > Players;
-	Players.Add(MakeShareable(new FUniqueNetIdString(PlayerId)));
+	Players.Add(MakeShareable(new FUniqueNetIdIOS(PlayerId)));
 	
 	bSuccessfullyRegisteredPlayer = RegisterPlayers(SessionName, Players, bWasInvited);
 
@@ -757,7 +764,7 @@ bool FOnlineSessionIOS::UnregisterPlayer(FName SessionName, const FUniqueNetId&
 	UE_LOG(LogOnline, Display, TEXT("FOnlineSessionIOS::UnregisterPlayer - not implemented"));
 	
 	TArray< TSharedRef<const FUniqueNetId> > Players;
-	Players.Add(MakeShareable(new FUniqueNetIdString(PlayerId)));
+	Players.Add(MakeShareable(new FUniqueNetIdIOS(PlayerId)));
 	bSuccessfullyUnregisteredPlayer = UnregisterPlayers(SessionName, Players);
 	
 	return bSuccessfullyUnregisteredPlayer;
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.h
index e2cfb5ed4912..cf304ae8cc9d 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSessionInterfaceIOS.h
@@ -115,6 +115,8 @@ public:
 
 	virtual ~FOnlineSessionIOS();
 
+	virtual TSharedPtr<const FUniqueNetId> CreateSessionIdFromString(const FString& SessionIdStr) override;
+
 	FNamedOnlineSession* GetNamedSession(FName SessionName) override;
 
 	virtual void RemoveNamedSession(FName SessionName) override;
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.cpp b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.cpp
index 93d43de1c789..a1826c32c076 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.cpp
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.cpp
@@ -94,9 +94,16 @@ FString GetOriginalTransactionId(const SKPaymentTransaction* Transaction)
 /// FStoreKitTransactionData implementation
 FStoreKitTransactionData::FStoreKitTransactionData(const SKPaymentTransaction* Transaction)
 	: ReceiptData(convertReceiptToString(Transaction))
-	, ErrorStr([Transaction.error localizedDescription])
+	, ErrorRaw([Transaction.error localizedDescription])
+	, ErrorCode([Transaction.error code])
+	, ErrorDomain([Transaction.error domain])
 	, TransactionIdentifier(Transaction.transactionIdentifier)
 {
+	if (!ErrorRaw.IsEmpty())
+	{
+		ErrorStr = FString::Printf(TEXT("%s [%s:%d]"), *ErrorRaw, *ErrorDomain, ErrorCode);
+	}
+	
 	SKPayment* Payment = Transaction.payment;
 	if (Payment)
 	{
@@ -620,18 +627,25 @@ FStoreKitTransactionData::FStoreKitTransactionData(const SKPaymentTransaction* T
 	UE_LOG(LogOnline, Verbose, TEXT("FStoreKitHelperV2::finalizeTransaction - %s"), *receiptId);
 	for (SKPaymentTransaction* pendingTransaction in self.PendingTransactions)
 	{
-		const FString transId = pendingTransaction.transactionIdentifier;
-		const FString originalTransId = GetOriginalTransactionId(pendingTransaction);
-		UE_LOG(LogOnline, Verbose, TEXT("FStoreKitHelperV2::checking - id: %s origId: %s"), *transId,  *originalTransId);
-		
-		if ((!originalTransId.IsEmpty()) && (originalTransId == receiptId))
+		if (pendingTransaction)
 		{
-			UE_LOG(LogOnline, Log, TEXT("FStoreKitHelperV2::finalizeTransaction - %s"), *receiptId);
+			const FString transId = pendingTransaction.transactionIdentifier;
+			const FString originalTransId = GetOriginalTransactionId(pendingTransaction);
+			UE_LOG(LogOnline, Verbose, TEXT("FStoreKitHelperV2::checking - id: %s origId: %s"), *transId,  *originalTransId);
 
-			[self.PendingTransactions removeObject:pendingTransaction];
-			// Remove the transaction from the payment queue.
-			[[SKPaymentQueue defaultQueue] finishTransaction:pendingTransaction];
-			break;
+			if ((!originalTransId.IsEmpty()) && (originalTransId == receiptId))
+			{
+				UE_LOG(LogOnline, Log, TEXT("FStoreKitHelperV2::finalizeTransaction - %s"), *receiptId);
+
+				// Remove the transaction from the payment queue.
+				[[SKPaymentQueue defaultQueue] finishTransaction:pendingTransaction];
+				[self.PendingTransactions removeObject:pendingTransaction];
+				break;
+			}
+		}
+		else
+		{
+			UE_LOG(LogOnline, Verbose, TEXT("null transaction"));
 		}
 	}
 }
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.h
index 2f6f0732a46e..d329e0699e87 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineStoreKitHelper.h
@@ -22,12 +22,14 @@ struct FStoreKitTransactionData
 	/** @return a string that prints useful debug information about this transaction */
 	FString ToDebugString() const
 	{
-		return FString::Printf(TEXT("OfferId: %s TransactionId: %s%s ReceiptData: %s%s"),
+		return FString::Printf(TEXT("OfferId: %s TransactionId: %s%s ReceiptData: %s Error:%s [%s:%d]"),
 						*OfferId,
 						*TransactionIdentifier,
 						OriginalTransactionIdentifier.IsEmpty() ? TEXT("") : *FString::Printf(TEXT(" OriginalTransactionId: %s"), *OriginalTransactionIdentifier),
 						*ReceiptData,
-						ErrorStr.IsEmpty() ? TEXT("") : *FString::Printf(TEXT(" Error: %s"), *ErrorStr));
+						*ErrorRaw,
+						*ErrorDomain,
+						ErrorCode);
 	}
 	
 	/** @return offer id for this transaction */
@@ -58,6 +60,12 @@ private:
 	FString ReceiptData;
 	/** Error on the transaction, if applicable */
 	FString ErrorStr;
+	/** Error raw, if applicable */
+	FString ErrorRaw;
+	/** Error code, if applicable */
+	int32 ErrorCode;
+	/** Error domain, if applicable */
+	FString ErrorDomain;
 	/** Unique transaction id */
 	FString TransactionIdentifier;
 	/** Original transaction id if restored purchase */
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSubsystemIOSTypes.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSubsystemIOSTypes.h
index 1e34064f3bd3..948d2e7864c9 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSubsystemIOSTypes.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Private/OnlineSubsystemIOSTypes.h
@@ -5,6 +5,10 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineSubsystemIOSPackage.h"
 
+
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdIOS, IOS_SUBSYSTEM);
+
 /**
  * GameCenter specific implementation of the unique net id
  */
@@ -42,6 +46,11 @@ public:
 	{
 	}
 
+	virtual FName GetType() const override
+	{
+		return IOS_SUBSYSTEM;
+	}
+
 	/**
 	 * Get the raw byte representation of this net id
 	 * This data is platform dependent and shouldn't be manipulated directly
diff --git a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Public/OnlinePurchaseIOS.h b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Public/OnlinePurchaseIOS.h
index 5d4d140a344c..8e254d5303f5 100644
--- a/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Public/OnlinePurchaseIOS.h
+++ b/Engine/Plugins/Online/IOS/OnlineSubsystemIOS/Source/Public/OnlinePurchaseIOS.h
@@ -53,7 +53,7 @@ public:
 	/** Mirror array of purchase state for the various offers to purchase */
 	TArray<EPurchaseTransactionState> OfferPurchaseStates;
 	/** User for the pending order */
-	const FUniqueNetIdString UserId;
+	const FUniqueNetIdIOS UserId;
 	/** Delegate to call on completion */
 	const FOnPurchaseCheckoutComplete CheckoutCompleteDelegate;
 	/** Tracks the current state of the order */
diff --git a/Engine/Plugins/Online/OnlineFramework/OnlineFramework.uplugin b/Engine/Plugins/Online/OnlineFramework/OnlineFramework.uplugin
index 836d1168ef37..929dfdd823f1 100644
--- a/Engine/Plugins/Online/OnlineFramework/OnlineFramework.uplugin
+++ b/Engine/Plugins/Online/OnlineFramework/OnlineFramework.uplugin
@@ -31,6 +31,10 @@
 			"Name": "Rejoin",
 			"Type": "Runtime"
 		},
+		{
+			"Name": "PlayTimeLimit",
+			"Type": "Runtime"
+		},
 		{
 			"Name": "LoginFlow",
 			"Type":  "ClientOnly"
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Hotfix.Build.cs b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Hotfix.Build.cs
index be4e863f2af8..68db04d06acb 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Hotfix.Build.cs
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Hotfix.Build.cs
@@ -13,6 +13,7 @@ public class Hotfix : ModuleRules
 				"Core",
 				"CoreUObject",
 				"Engine",
+                "HTTP",
 				"OnlineSubsystem",
 				"OnlineSubsystemUtils",
 			}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/OnlineHotfixManager.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/OnlineHotfixManager.cpp
index 9af734ad1144..7b629113c4cb 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/OnlineHotfixManager.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/OnlineHotfixManager.cpp
@@ -1,23 +1,34 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "OnlineHotfixManager.h"
+#include "OnlineSubsystemUtils.h"
 #include "GenericPlatform/GenericPlatformFile.h"
-#include "Misc/CommandLine.h"
-#include "Misc/FileHelper.h"
 #include "Internationalization/Culture.h"
-#include "Misc/CoreDelegates.h"
-#include "Misc/App.h"
 #include "UObject/UObjectIterator.h"
 #include "UObject/Package.h"
-#include "Misc/PackageName.h"
-#include "OnlineSubsystemUtils.h"
+#include "Http.h"
+
 #include "Logging/LogSuppressionInterface.h"
+
+#include "Misc/NetworkVersion.h"
+
+#include "Misc/PackageName.h"
+#include "Misc/CommandLine.h"
+#include "Misc/FileHelper.h"
+#include "Misc/CoreDelegates.h"
+#include "Misc/App.h"
+
 #include "Engine/CurveTable.h"
 #include "Engine/DataTable.h"
 #include "Curves/CurveFloat.h"
 
 DEFINE_LOG_CATEGORY(LogHotfixManager);
 
+/** This character must be between important pieces of file information (platform, initype, version) */
+#define HOTFIX_SEPARATOR TEXT("_")
+/** The prefix for any hotfix file that expects to indicate version information */
+#define HOTFIX_VERSION_TAG TEXT("Ver-")
+
 FName NAME_HotfixManager(TEXT("HotfixManager"));
 
 class FPakFileVisitor : public IPlatformFile::FDirectoryVisitor
@@ -35,6 +46,82 @@ public:
 	TArray<FString> Files;
 };
 
+namespace
+{
+	/** @return the expected network version for hotfix files determined at compile time */
+	FString GetNetworkVersion()
+	{
+		static FString NetVerStr;
+		if (NetVerStr.IsEmpty())
+		{
+			uint32 NetVer = FNetworkVersion::GetNetworkCompatibleChangelist();
+			NetVerStr = FString::Printf(TEXT("%s%d"), HOTFIX_VERSION_TAG, NetVer);
+		}
+		return NetVerStr;
+	}
+
+	/**
+	 * Given a hotfix file name, return the file name with version stripped out and exposed separately
+	 *
+	 * @param InFilename name of file to search for version information
+	 * @param OutFilename name with version information removed
+	 * @param OutVersion version of the hotfix file it present in the name
+	 */
+	void GetFilenameAndVersion(const FString& InFilename, FString& OutFilename, FString& OutVersion)
+	{
+		TArray<FString> FileParts;
+		int32 NumTokens = InFilename.ParseIntoArray(FileParts, HOTFIX_SEPARATOR);
+		if (NumTokens > 0)
+		{
+			for (int i = 0; i < FileParts.Num(); i++)
+			{
+				if (FileParts[i].StartsWith(HOTFIX_VERSION_TAG))
+				{
+					OutVersion = FileParts[i];
+				}
+				else
+				{
+					OutFilename += FileParts[i];
+					if (i < FileParts.Num() - 1)
+					{
+						OutFilename += HOTFIX_SEPARATOR;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Is this hotfix file compatible with the current build
+	 * If the file has version information it is compared with compatibility
+	 * If the file has NO version information it is assumed compatible
+	 *
+	 * @param InFilename name of the file to check 
+	 * @param OutFilename name of file with version information stripped
+	 * 
+	 * @return true if file is compatible, false otherwise
+	 */
+	bool IsCompatibleHotfixFile(const FString& InFilename, FString& OutFilename)
+	{
+		bool bHasVersion = false;
+		bool bCompatibleHotfix = false;
+		const FString NetworkVersion = GetNetworkVersion();
+		FString OutVersion;
+		GetFilenameAndVersion(InFilename, OutFilename, OutVersion);
+
+		if (!OutVersion.IsEmpty())
+		{
+			bHasVersion = true;
+			if (OutVersion == NetworkVersion)
+			{
+				bCompatibleHotfix = true;
+			}
+		}
+
+		return bCompatibleHotfix || !bHasVersion;
+	}
+}
+
 UOnlineHotfixManager::UOnlineHotfixManager() :
 	Super(),
 	TotalFiles(0),
@@ -83,10 +170,14 @@ void UOnlineHotfixManager::PostInitProperties()
 {
 #if !UE_BUILD_SHIPPING
 	FParse::Value(FCommandLine::Get(), TEXT("HOTFIXPREFIX="), DebugPrefix);
+	if (!DebugPrefix.IsEmpty())
+	{
+		DebugPrefix += HOTFIX_SEPARATOR;
+	}
 #endif
 	// So we only try to apply files for this platform
 	PlatformPrefix = DebugPrefix + ANSI_TO_TCHAR(FPlatformProperties::PlatformName());
-	PlatformPrefix += TEXT("_");
+	PlatformPrefix += HOTFIX_SEPARATOR;
 	// Server prefix
 	ServerPrefix = DebugPrefix + TEXT("DedicatedServer");
 	// Build the default prefix too
@@ -176,32 +267,41 @@ struct FHotfixFileSortPredicate
 		{
 		}
 
-		int32 GetPriorityForCompare(const FString& HotfixName) const
+		int32 GetPriorityForCompare(const FString& InHotfixName) const
 		{
 			// Non-ini files are applied last
-			int32 Priority = 5;
+			int32 Priority = 50;
 			
-			if (HotfixName.EndsWith(TEXT("INI")))
+			if (InHotfixName.EndsWith(TEXT("INI")))
 			{
+				FString HotfixName, NetworkVersion;
+				GetFilenameAndVersion(InHotfixName, HotfixName, NetworkVersion);
+
 				// Defaults are applied first
 				if (HotfixName.StartsWith(DefaultPrefix))
 				{
-					Priority = 1;
+					Priority = 10;
 				}
 				// Server trumps default
 				else if (HotfixName.StartsWith(ServerPrefix))
 				{
-					Priority = 2;
+					Priority = 20;
 				}
 				// Platform trumps server
 				else if (HotfixName.StartsWith(PlatformPrefix))
 				{
-					Priority = 3;
+					Priority = 30;
 				}
 				// Other INIs whitelisted in game override of WantsHotfixProcessing will trump all other INIs
 				else
 				{
-					Priority = 4;
+					Priority = 40;
+				}
+
+				if (!NetworkVersion.IsEmpty())
+				{
+					// Versioned hotfixes apply last within their type
+					Priority += 5;
 				}
 			}
 
@@ -256,18 +356,12 @@ void UOnlineHotfixManager::OnEnumerateFilesComplete(bool bWasSuccessful, const F
 		BuildHotfixFileListDeltas();
 		// Sort after filtering so that the comparison below doesn't fail to different order from the server
 		ChangedHotfixFileList.Sort<FHotfixFileSortPredicate>(FHotfixFileSortPredicate(PlatformPrefix, ServerPrefix, DefaultPrefix));
-		// Perform any undo operations needed
-		if (ChangedHotfixFileList.Num() > 0 || RemovedHotfixFileList.Num() > 0)
-		{
-			RestoreBackupIniFiles();
-			UnmountHotfixFiles();
-		}
 		// Read any changed files
 		if (ChangedHotfixFileList.Num() > 0)
 		{
 			// Update our totals for our progress delegates
 			TotalFiles = ChangedHotfixFileList.Num();
-			for (auto& FileHeader : ChangedHotfixFileList)
+			for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 			{
 				TotalBytes += FileHeader.FileSize;
 			}
@@ -275,6 +369,14 @@ void UOnlineHotfixManager::OnEnumerateFilesComplete(bool bWasSuccessful, const F
 		}
 		else
 		{
+			if (RemovedHotfixFileList.Num() > 0)
+			{
+				// No changes, just reverts
+				// Perform any undo operations needed
+				RestoreBackupIniFiles();
+				UnmountHotfixFiles();
+			}
+
 			UE_LOG(LogHotfixManager, Display, TEXT("Returned hotfix data is the same as last application, skipping the apply phase"));
 			TriggerHotfixComplete(EHotfixResult::SuccessNoChange);
 		}
@@ -460,12 +562,12 @@ void UOnlineHotfixManager::ReadHotfixFiles()
 		check(OnlineTitleFile.IsValid());
 		// Kick off a read for each file
 		// Do this in two passes so already cached files don't trigger completion
-		for (auto& FileHeader : ChangedHotfixFileList)
+		for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 		{
-			UE_LOG(LogOnline, VeryVerbose, TEXT("HF: %s %s %d "), *FileHeader.DLName, *FileHeader.FileName, FileHeader.FileSize);
+			UE_LOG(LogHotfixManager, VeryVerbose, TEXT("HF: %s %s %d "), *FileHeader.DLName, *FileHeader.FileName, FileHeader.FileSize);
 			PendingHotfixFiles.Add(FileHeader.DLName, FPendingFileDLProgress());
 		}
-		for (auto& FileHeader : ChangedHotfixFileList)
+		for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 		{
 			OnlineTitleFile->ReadFile(FileHeader.DLName);
 		}
@@ -513,7 +615,12 @@ void UOnlineHotfixManager::UpdateProgress(uint32 FileCount, uint64 UpdateSize)
 
 void UOnlineHotfixManager::ApplyHotfix()
 {
-	for (auto& FileHeader : ChangedHotfixFileList)
+	// Perform any undo operations needed
+	// This occurs same frame as the application of new hotfixes
+	RestoreBackupIniFiles();
+	UnmountHotfixFiles();
+
+	for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 	{
 		if (!ApplyHotfixProcessing(FileHeader))
 		{
@@ -560,25 +667,34 @@ bool UOnlineHotfixManager::WantsHotfixProcessing(const FCloudFileHeader& FileHea
 	const FString Extension = FPaths::GetExtension(FileHeader.FileName);
 	if (Extension == TEXT("INI"))
 	{
-		bool bIsServerHotfix = FileHeader.FileName.StartsWith(ServerPrefix);
-		bool bWantsServerHotfix = IsRunningDedicatedServer() && bIsServerHotfix;
-		bool bWantsDefaultHotfix = FileHeader.FileName.StartsWith(DefaultPrefix);
-		bool bWantsPlatformHotfix = FileHeader.FileName.StartsWith(PlatformPrefix);
+		FString CloudFilename;
+		if (IsCompatibleHotfixFile(FileHeader.FileName, CloudFilename))
+		{
+			bool bIsServerHotfix = CloudFilename.StartsWith(ServerPrefix);
+			bool bWantsServerHotfix = IsRunningDedicatedServer() && bIsServerHotfix;
+			bool bWantsDefaultHotfix = CloudFilename.StartsWith(DefaultPrefix);
+			bool bWantsPlatformHotfix = CloudFilename.StartsWith(PlatformPrefix);
 
-		if (bWantsPlatformHotfix)
-		{
-			UE_LOG(LogHotfixManager, Verbose, TEXT("Using platform hotfix %s"), * FileHeader.FileName);
-		}
-		else if (bWantsServerHotfix)
-		{
-			UE_LOG(LogHotfixManager, Verbose, TEXT("Using server hotfix %s"), * FileHeader.FileName);
-		}
-		else if (bWantsDefaultHotfix)
-		{
-			UE_LOG(LogHotfixManager, Verbose, TEXT("Using default hotfix %s"), * FileHeader.FileName);
-		}
+			if (bWantsPlatformHotfix)
+			{
+				UE_LOG(LogHotfixManager, Verbose, TEXT("Using platform hotfix %s"), *FileHeader.FileName);
+			}
+			else if (bWantsServerHotfix)
+			{
+				UE_LOG(LogHotfixManager, Verbose, TEXT("Using server hotfix %s"), *FileHeader.FileName);
+			}
+			else if (bWantsDefaultHotfix)
+			{
+				UE_LOG(LogHotfixManager, Verbose, TEXT("Using default hotfix %s"), *FileHeader.FileName);
+			}
 
-		return bWantsPlatformHotfix || bWantsServerHotfix || bWantsDefaultHotfix;
+			return bWantsPlatformHotfix || bWantsServerHotfix || bWantsDefaultHotfix;
+		}
+		else
+		{
+			UE_LOG(LogHotfixManager, Verbose, TEXT("File not compatible %s, skipping."), *FileHeader.FileName);
+			return false;
+		}
 	}
 	else if (Extension == TEXT("PAK"))
 	{
@@ -596,12 +712,17 @@ bool UOnlineHotfixManager::ApplyHotfixProcessing(const FCloudFileHeader& FileHea
 		TArray<uint8> FileData;
 		if (OnlineTitleFile->GetFileContents(FileHeader.DLName, FileData))
 		{
+			UE_LOG(LogHotfixManager, Verbose, TEXT("Applying hotfix %s"), *FileHeader.FileName);
 			// Convert to a FString
 			FileData.Add(0);
 			FString HotfixStr;
 			FFileHelper::BufferToString(HotfixStr, FileData.GetData(), FileData.Num());
 			bSuccess = HotfixIniFile(FileHeader.FileName, HotfixStr);
 		}
+		else
+		{
+			UE_LOG(LogHotfixManager, Warning, TEXT("Failed to get contents of %s"), *FileHeader.FileName);
+		}
 	}
 	else if (Extension == TEXT("LOCRES"))
 	{
@@ -619,7 +740,10 @@ bool UOnlineHotfixManager::ApplyHotfixProcessing(const FCloudFileHeader& FileHea
 
 FString UOnlineHotfixManager::GetStrippedConfigFileName(const FString& IniName)
 {
-	FString StrippedIniName(IniName);
+	FString StrippedIniName;
+	FString NetworkVersion;
+	GetFilenameAndVersion(IniName, StrippedIniName, NetworkVersion);
+
 	if (StrippedIniName.StartsWith(PlatformPrefix))
 	{
 		StrippedIniName = IniName.Right(StrippedIniName.Len() - PlatformPrefix.Len());
@@ -673,6 +797,8 @@ FConfigFile* UOnlineHotfixManager::GetConfigFile(const FString& IniName)
 
 bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString& IniData)
 {
+	const bool bIsEngineIni = FileName.Contains(TEXT("Engine.ini"));
+
 	FConfigFile* ConfigFile = GetConfigFile(FileName);
 	// Store the original file so we can undo this later
 	FConfigFileBackup& BackupFile = BackupIniFile(FileName, ConfigFile);
@@ -683,6 +809,9 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 	int32 StartIndex = 0;
 	int32 EndIndex = 0;
 	bool bUpdateLogSuppression = false;
+	bool bUpdateConsoleVariables = false;
+	bool bUpdateHttpConfigs = false;
+	TSet<FString> OnlineSubSections;
 	// Find the set of object classes that were affected
 	while (StartIndex >= 0 && StartIndex < IniData.Len() && EndIndex >= StartIndex)
 	{
@@ -694,6 +823,36 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 			EndIndex = IniData.Find(TEXT("]"), ESearchCase::IgnoreCase, ESearchDir::FromStart, StartIndex);
 			if (EndIndex > StartIndex)
 			{
+				// Ignore square brackets in the middle of string
+				// - per object section starts with new line
+				// - there's no " character between opening bracket and line start
+				const bool bStartsWithNewLine = (StartIndex == 0) || (IniData[StartIndex - 1] == TEXT('\n'));
+				if (!bStartsWithNewLine)
+				{
+					bool bStartsInsideString = false;
+					for (int32 CharIdx = StartIndex - 1; CharIdx >= 0; CharIdx--)
+					{
+						const bool bHasStringMarker = (IniData[CharIdx] == TEXT('"'));
+						if (bHasStringMarker)
+						{
+							bStartsInsideString = true;
+							break;
+						}
+
+						const bool bHasNewLineMarker = (IniData[CharIdx] == TEXT('\n'));
+						if (bHasNewLineMarker)
+						{
+							break;
+						}
+					}
+
+					if (bStartsInsideString)
+					{
+						StartIndex = EndIndex;
+						continue;
+					}
+				}
+
 				int32 PerObjectNameIndex = IniData.Find(TEXT(" "), ESearchCase::IgnoreCase, ESearchDir::FromStart, StartIndex);
 
 				const TCHAR* AssetHotfixIniHACK = TEXT("[AssetHotfix]");
@@ -703,6 +862,31 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 					break;
 				}
 
+				if (bIsEngineIni)
+				{
+					const TCHAR* LogConfigSection = TEXT("[Core.Log]");
+					const TCHAR* ConsoleVariableSection = TEXT("[ConsoleVariables]");
+					const TCHAR* HttpSection = TEXT("[HTTP]");
+					const TCHAR* OnlineSubSectionKey = TEXT("[OnlineSubsystem"); // note "]" omitted on purpose since we want a partial match
+					if (!bUpdateLogSuppression && FCString::Strnicmp(*IniData + StartIndex, LogConfigSection, FCString::Strlen(LogConfigSection)) == 0)
+					{
+						bUpdateLogSuppression = true;
+					}
+					else if (!bUpdateConsoleVariables && FCString::Strnicmp(*IniData + StartIndex, ConsoleVariableSection, FCString::Strlen(ConsoleVariableSection)) == 0)
+					{
+						bUpdateConsoleVariables = true;
+					}
+					else if (!bUpdateHttpConfigs &&	FCString::Strnicmp(*IniData + StartIndex, HttpSection, FCString::Strlen(HttpSection)) == 0)
+					{
+						bUpdateHttpConfigs = true;
+					}
+					else if (FCString::Strnicmp(*IniData + StartIndex, OnlineSubSectionKey, FCString::Strlen(OnlineSubSectionKey)) == 0)
+					{
+						const FString SectionStr = IniData.Mid(StartIndex, EndIndex - StartIndex + 1);
+						OnlineSubSections.Add(SectionStr);
+					}
+				}
+
 				// Per object config entries will have a space in the name, but classes won't
 				if (PerObjectNameIndex == -1 || PerObjectNameIndex > EndIndex)
 				{
@@ -721,14 +905,6 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 							BackupFile.ClassesReloaded.AddUnique(Class->GetPathName());
 						}
 					}
-					else if (FileName.Contains(TEXT("Engine.ini")))
-					{
-						const TCHAR* LogConfigSection = TEXT("[Core.Log]");
-						if (FCString::Strnicmp(*IniData + StartIndex, LogConfigSection, FCString::Strlen(LogConfigSection)) == 0)
-						{
-							bUpdateLogSuppression = true;
-						}
-					}
 				}
 				// Handle the per object config case by finding the object for reload
 				else
@@ -764,29 +940,26 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 
 	int32 NumObjectsReloaded = 0;
 	const double StartTime = FPlatformTime::Seconds();
-	if (Classes.Num())
+	// Now that we have a list of classes to update, we can iterate objects and reload
+	for (UClass* Class : Classes)
 	{
-		// Now that we have a list of classes to update, we can iterate objects and reload
-		for (FObjectIterator It; It; ++It)
+		if (Class->HasAnyClassFlags(CLASS_Config))
 		{
-			UClass* Class = It->GetClass();
-			if (Class->HasAnyClassFlags(CLASS_Config))
+			TArray<UObject*> Objects;
+			GetObjectsOfClass(Class, Objects, true, RF_NoFlags);
+			for (UObject* Object : Objects)
 			{
-				// Check to see if this class is in our list (yes, potentially n^2, but not in practice)
-				for (int32 ClassIndex = 0; ClassIndex < Classes.Num(); ClassIndex++)
+				if (!Object->IsPendingKill())
 				{
-					if (It->IsA(Classes[ClassIndex]))
-					{
-						// Force a reload of the config vars
-						UE_LOG(LogHotfixManager, Verbose, TEXT("Reloading %s"), *It->GetPathName());
-						It->ReloadConfig();
-						NumObjectsReloaded++;
-						break;
-					}
+					// Force a reload of the config vars
+					UE_LOG(LogHotfixManager, Verbose, TEXT("Reloading %s"), *Object->GetPathName());
+					Object->ReloadConfig();
+					NumObjectsReloaded++;
 				}
 			}
 		}
 	}
+
 	// Reload any PerObjectConfig objects that were affected
 	for (auto ReloadObject : PerObjectConfigObjects)
 	{
@@ -801,6 +974,25 @@ bool UOnlineHotfixManager::HotfixIniFile(const FString& FileName, const FString&
 		FLogSuppressionInterface::Get().ProcessConfigAndCommandLine();
 	}
 
+	// Reload console variables if configs changed
+	if (bUpdateConsoleVariables)
+	{
+		FConfigCacheIni::LoadConsoleVariablesFromINI();
+	}
+
+	// Reload configs relevant to the HTTP module
+	if (bUpdateHttpConfigs)
+	{
+		FHttpModule::Get().UpdateConfigs();
+	}
+
+	// Reload configs relevant to OSS config sections that were updated
+	IOnlineSubsystem* OnlineSub = IOnlineSubsystem::Get(OSSName.Len() ? FName(*OSSName, FNAME_Find) : NAME_None);
+	if (OnlineSub != nullptr)
+	{
+		OnlineSub->ReloadConfigs(OnlineSubSections);
+	}
+
 	UE_LOG(LogHotfixManager, Log, TEXT("Updating config from %s took %f seconds and reloaded %d objects"),
 		*FileName, FPlatformTime::Seconds() - StartTime, NumObjectsReloaded);
 	return true;
@@ -831,7 +1023,7 @@ bool UOnlineHotfixManager::HotfixPakFile(const FCloudFileHeader& FileHeader)
 		const double StartTime = FPlatformTime::Seconds();
 		TArray<FString> IniList;
 		// Iterate through the pak file's contents for INI and asset reloading
-		for (auto& InternalPakFileName : Visitor.Files)
+		for (const FString& InternalPakFileName : Visitor.Files)
 		{
 			if (InternalPakFileName.EndsWith(TEXT(".ini")))
 			{
@@ -845,7 +1037,7 @@ bool UOnlineHotfixManager::HotfixPakFile(const FCloudFileHeader& FileHeader)
 		// Sort the INIs so they are processed consistently
 		IniList.Sort<FHotfixFileSortPredicate>(FHotfixFileSortPredicate(PlatformPrefix, ServerPrefix, DefaultPrefix));
 		// Now process the INIs in sorted order
-		for (auto& IniName : IniList)
+		for (const FString& IniName : IniList)
 		{
 			HotfixPakIniFile(IniName);
 			NumInisReloaded++;
@@ -856,7 +1048,7 @@ bool UOnlineHotfixManager::HotfixPakFile(const FCloudFileHeader& FileHeader)
 		if (bLogMountedPakContents)
 		{
 			UE_LOG(LogHotfixManager, Log, TEXT("Files in pak file (%s):"), *FileHeader.FileName);
-			for (auto& FileName : Visitor.Files)
+			for (const FString& FileName : Visitor.Files)
 			{
 				UE_LOG(LogHotfixManager, Log, TEXT("\t\t%s"), *FileName);
 			}
@@ -892,15 +1084,28 @@ bool UOnlineHotfixManager::HotfixPakIniFile(const FString& FileName)
 	int32 NumObjectsReloaded = 0;
 	// Now that we have a list of classes to update, we can iterate objects and
 	// reload if they match the INI file that was changed
-	for (FObjectIterator It; It; ++It)
+	TArray<UObject*> Classes;
+	GetObjectsOfClass(UClass::StaticClass(), Classes, true, RF_NoFlags);
+	TArray<UClass*> ClassesToReload;
+	for (UObject* ClassObject : Classes)
 	{
-		UClass* Class = It->GetClass();
-		if (Class->HasAnyClassFlags(CLASS_Config) &&
-			Class->ClassConfigName == ConfigFile->Name)
+		if (UClass* const Class = Cast<UClass>(ClassObject))
 		{
-			// Force a reload of the config vars
-			It->ReloadConfig();
-			NumObjectsReloaded++;
+			if (Class->HasAnyClassFlags(CLASS_Config) &&
+				Class->ClassConfigName == ConfigFile->Name)
+			{
+				TArray<UObject*> Objects;
+				GetObjectsOfClass(Class, Objects, true, RF_NoFlags);
+				for (UObject* Object : Objects)
+				{
+					if (!Object->IsPendingKill())
+					{
+						// Force a reload of the config vars
+						Object->ReloadConfig();
+						NumObjectsReloaded++;
+					}
+				}
+			}
 		}
 	}
 	UE_LOG(LogHotfixManager, Log, TEXT("Updating config from %s took %f seconds reloading %d objects"),
@@ -910,7 +1115,7 @@ bool UOnlineHotfixManager::HotfixPakIniFile(const FString& FileName)
 
 const FString UOnlineHotfixManager::GetFriendlyNameFromDLName(const FString& DLName) const
 {
-	for (auto& Header : HotfixFileList)
+	for (const FCloudFileHeader& Header : HotfixFileList)
 	{
 		if (Header.DLName == DLName)
 		{
@@ -927,7 +1132,7 @@ void UOnlineHotfixManager::UnmountHotfixFiles()
 		return;
 	}
 	// Unmount any changed hotfix files since we need to download them again
-	for (auto& FileHeader : ChangedHotfixFileList)
+	for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 	{
 		for (int32 Index = 0; Index < MountedPakFiles.Num(); Index++)
 		{
@@ -942,7 +1147,7 @@ void UOnlineHotfixManager::UnmountHotfixFiles()
 		}
 	}
 	// Unmount any removed hotfix files
-	for (auto& FileHeader : RemovedHotfixFileList)
+	for (const FCloudFileHeader& FileHeader : RemovedHotfixFileList)
 	{
 		for (int32 Index = 0; Index < MountedPakFiles.Num(); Index++)
 		{
@@ -1010,7 +1215,7 @@ void UOnlineHotfixManager::RestoreBackupIniFiles()
 	TArray<FString> ClassesToRestore;
 
 	// Restore any changed INI files and build a list of which ones changed for UObject reloading below
-	for (auto& FileHeader : ChangedHotfixFileList)
+	for (const FCloudFileHeader& FileHeader : ChangedHotfixFileList)
 	{
 		if (FileHeader.FileName.EndsWith(TEXT(".INI")))
 		{
@@ -1031,7 +1236,7 @@ void UOnlineHotfixManager::RestoreBackupIniFiles()
 	}
 
 	// Also restore any files that were previously part of the hotfix and now are not
-	for (auto& FileHeader : RemovedHotfixFileList)
+	for (const FCloudFileHeader& FileHeader : RemovedHotfixFileList)
 	{
 		if (FileHeader.FileName.EndsWith(TEXT(".INI")))
 		{
@@ -1066,20 +1271,19 @@ void UOnlineHotfixManager::RestoreBackupIniFiles()
 			}
 		}
 
-		for (FObjectIterator It; It; ++It)
+		for (UClass* Class : RestoredClasses)
 		{
-			UClass* Class = It->GetClass();
 			if (Class->HasAnyClassFlags(CLASS_Config))
 			{
-				// Check to see if this class is in our list (yes, potentially n^2, but not in practice)
-				for (int32 ClassIndex = 0; ClassIndex < RestoredClasses.Num(); ClassIndex++)
+				TArray<UObject*> Objects;
+				GetObjectsOfClass(Class, Objects, true, RF_NoFlags);
+				for (UObject* Object : Objects)
 				{
-					if (It->IsA(RestoredClasses[ClassIndex]))
+					if (!Object->IsPendingKill())
 					{
-						UE_LOG(LogHotfixManager, Verbose, TEXT("Restoring %s"), *It->GetPathName());
-						It->ReloadConfig();
+						UE_LOG(LogHotfixManager, Verbose, TEXT("Restoring %s"), *Object->GetPathName());
+						Object->ReloadConfig();
 						NumObjectsReloaded++;
-						break;
 					}
 				}
 			}
@@ -1089,7 +1293,6 @@ void UOnlineHotfixManager::RestoreBackupIniFiles()
 		ClassesToRestore.Num(), FPlatformTime::Seconds() - StartTime, NumObjectsReloaded);
 }
 
-
 void UOnlineHotfixManager::PatchAssetsFromIniFiles()
 {
 	UE_LOG( LogHotfixManager, Display, TEXT( "Checking for assets to be patched using data from 'AssetHotfix' section in the Game .ini file" ) );
@@ -1461,6 +1664,8 @@ struct FHotfixManagerExec :
 			TestList.Add(Header);
 			Header.FileName = TEXT("DefaultGame.ini");
 			TestList.Add(Header);
+			Header.FileName = TEXT("Ver-1234_DefaultEngine.ini");
+			TestList.Add(Header);
 			Header.FileName = TEXT("PS4_DefaultEngine.ini");
 			TestList.Add(Header);
 			Header.FileName = TEXT("DefaultEngine.ini");
@@ -1469,6 +1674,10 @@ struct FHotfixManagerExec :
 			TestList.Add(Header);
 			Header.FileName = TEXT("PS4_DefaultGame.ini");
 			TestList.Add(Header);
+			Header.FileName = TEXT("Ver-1234_PS4_DefaultGame.ini");
+			TestList.Add(Header);
+			Header.FileName = TEXT("PS4_Ver-1234_DefaultGame.ini");
+			TestList.Add(Header);
 			Header.FileName = TEXT("AnotherRandom.ini");
 			TestList.Add(Header);
 			Header.FileName = TEXT("DedicatedServerEngine.ini");
@@ -1476,7 +1685,7 @@ struct FHotfixManagerExec :
 			TestList.Sort<FHotfixFileSortPredicate>(FHotfixFileSortPredicate(TEXT("PS4_"), TEXT("DedicatedServer"), TEXT("Default")));
 
 			UE_LOG(LogHotfixManager, Log, TEXT("Hotfixing sort is:"));
-			for (auto& FileHeader : TestList)
+			for (const FCloudFileHeader& FileHeader : TestList)
 			{
 				UE_LOG(LogHotfixManager, Log, TEXT("\t%s"), *FileHeader.FileName);
 			}
@@ -1493,7 +1702,7 @@ struct FHotfixManagerExec :
 			TestList2.Sort<FHotfixFileSortPredicate>(FHotfixFileSortPredicate(TEXT("PS4_"), TEXT("DedicatedServer"), TEXT("Default")));
 
 			UE_LOG(LogHotfixManager, Log, TEXT("Hotfixing PAK INI file sort is:"));
-			for (auto& IniName : TestList2)
+			for (const FString& IniName : TestList2)
 			{
 				UE_LOG(LogHotfixManager, Log, TEXT("\t%s"), *IniName);
 			}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/UpdateManager.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/UpdateManager.cpp
index d8ae7b62cb11..8fef8bd16e04 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/UpdateManager.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Private/UpdateManager.cpp
@@ -9,6 +9,7 @@
 #include "TimerManager.h"
 #include "Engine/LocalPlayer.h"
 #include "OnlineSubsystem.h"
+#include "Misc/CoreDelegates.h"
 
 #include "OnlineHotfixManager.h"
 
@@ -52,6 +53,7 @@ UUpdateManager::UUpdateManager()
 	, UpdateCheckCompleteDelay(0.5f)
 	, HotfixAvailabilityCheckCompleteDelay(0.1f)
 	, UpdateCheckAvailabilityCompleteDelay(0.1f)
+	, AppSuspendedUpdateCheckTimeSeconds(600)
 	, bPlatformEnvironmentDetected(false)
 	, bInitialUpdateFinished(false)
 	, bCheckHotfixAvailabilityOnly(false)
@@ -74,9 +76,16 @@ UUpdateManager::UUpdateManager()
 	{
 		UpdateStateEnum = FindObject<UEnum>(ANY_PACKAGE, TEXT("EUpdateState"));
 		UpdateCompletionEnum = FindObject<UEnum>(ANY_PACKAGE, TEXT("EUpdateCompletionStatus"));
+
+		RegisterDelegates();
 	}
 }
 
+UUpdateManager::~UUpdateManager()
+{
+	UnregisterDelegates();
+}
+
 void UUpdateManager::SetPending()
 { 
 	if (ChecksEnabled())
@@ -229,15 +238,18 @@ void UUpdateManager::StartPatchCheck()
 
 	SetUpdateState(EUpdateState::CheckingForPatch);
 
-	if (PLATFORM_ANDROID || PLATFORM_IOS)
+	if (PLATFORM_ANDROID)
 	{
-		UE_LOG(LogHotfixManager, Warning, TEXT("Mobile skipping hotfixes for now"));
+		UE_LOG(LogHotfixManager, Warning, TEXT("Android skipping patch check for now"));
 		PatchCheckComplete(EPatchCheckResult::NoPatchRequired);
 		return;
-	}
+	}	
+
+	EPatchCheckResult PatchResult = EPatchCheckResult::PatchCheckFailure;
 
 	IOnlineSubsystem* PlatformOnlineSub = IOnlineSubsystem::GetByPlatform();
-	if (PlatformOnlineSub)
+	bool platformIOS = PLATFORM_IOS; // trick static analysis into not complaining
+	if (PlatformOnlineSub && !platformIOS)
 	{
 		IOnlineIdentityPtr PlatformOnlineIdentity = PlatformOnlineSub->GetIdentityInterface();
 		if (PlatformOnlineIdentity.IsValid())
@@ -258,6 +270,7 @@ void UUpdateManager::StartPatchCheck()
 			else
 			{
 				UE_LOG(LogHotfixManager, Warning, TEXT("No valid platform user id when starting patch check!"));
+				PatchResult = EPatchCheckResult::NoLoggedInUser;
 			}
 		}
 	}
@@ -294,6 +307,7 @@ void UUpdateManager::StartPatchCheck()
 					else
 					{
 						UE_LOG(LogHotfixManager, Warning, TEXT("No valid user id when starting patch check!"));
+						PatchResult = EPatchCheckResult::NoLoggedInUser;
 					}
 				}
 				else
@@ -307,7 +321,7 @@ void UUpdateManager::StartPatchCheck()
 	if (!bStarted)
 	{
 		// Any failure to call GetUserPrivilege will result in completing the flow via this path
-		PatchCheckComplete(EPatchCheckResult::PatchCheckFailure);
+		PatchCheckComplete(PatchResult);
 	}
 }
 
@@ -361,7 +375,7 @@ void UUpdateManager::OnCheckForPatchComplete(const FUniqueNetId& UniqueId, EUser
 			}
 			else if (PrivilegeResult & (uint32)IOnlineIdentity::EPrivilegeResults::GenericFailure)
 			{
-#if (PLATFORM_XBOXONE || PLATFORM_PS4)
+#if (PLATFORM_XBOXONE || PLATFORM_PS4 || PLATFORM_SWITCH)
 				// Skip console backend failures
 				Result = EPatchCheckResult::NoPatchRequired;
 #else
@@ -700,6 +714,33 @@ bool UUpdateManager::IsBlockingForInitialLoadEnabled() const
 	return FLoadingScreenConfig::ShouldBlockOnInitialLoad();
 }
 
+void UUpdateManager::RegisterDelegates()
+{
+	FCoreDelegates::ApplicationWillDeactivateDelegate.AddUObject(this, &ThisClass::OnApplicationWillDeactivate);
+	FCoreDelegates::ApplicationHasReactivatedDelegate.AddUObject(this, &ThisClass::OnApplicationHasReactivated);
+}
+
+void UUpdateManager::UnregisterDelegates()
+{
+	FCoreDelegates::ApplicationWillDeactivateDelegate.RemoveAll(this);
+	FCoreDelegates::ApplicationHasReactivatedDelegate.RemoveAll(this);
+}
+
+void UUpdateManager::OnApplicationWillDeactivate()
+{
+	DeactivatedTime = FDateTime::UtcNow();
+}
+
+void UUpdateManager::OnApplicationHasReactivated()
+{
+	FDateTime Now = FDateTime::UtcNow();
+
+	if ((Now - DeactivatedTime).GetTotalSeconds() > AppSuspendedUpdateCheckTimeSeconds)
+	{
+		StartCheck();
+	}
+}
+
 FTimerHandle UUpdateManager::DelayResponse(DelayCb&& Delegate, float Delay)
 {
 	FTimerHandle TimerHandle;
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Public/UpdateManager.h b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Public/UpdateManager.h
index d777365778a2..2b1cfb150b35 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Public/UpdateManager.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Hotfix/Public/UpdateManager.h
@@ -144,6 +144,7 @@ private:
 public:
 
 	UUpdateManager();
+	virtual ~UUpdateManager();
 
 	/**
 	 * Reset so you can call StartCheck again
@@ -313,6 +314,23 @@ protected:
 	/** Change the state of the update manager */
 	virtual void SetUpdateState(EUpdateState NewState);
 
+	/** If application is suspended longer than this, trigger an update check when resuming */
+	UPROPERTY(Config)
+	int32 AppSuspendedUpdateCheckTimeSeconds;
+
+	/** Time when application was deactivated */
+	FDateTime DeactivatedTime;
+
+	/** Register deactivate/reactivate delegates */
+	void RegisterDelegates();
+	/** Unregister deactivate/reactivate delegates */
+	void UnregisterDelegates();
+
+	/** Called when application is about to be deactivated */
+	virtual void OnApplicationWillDeactivate();
+	/** Called when application has been reactivated */
+	virtual void OnApplicationHasReactivated();
+
 protected:
 
 	/** true if we've already detected the backend environment */
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Private/LobbyBeaconHost.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Private/LobbyBeaconHost.cpp
index 1e937de040c1..5c53b9543684 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Private/LobbyBeaconHost.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Private/LobbyBeaconHost.cpp
@@ -94,11 +94,8 @@ ALobbyBeaconPlayerState* ALobbyBeaconHost::HandlePlayerLogin(ALobbyBeaconClient*
 			NewPlayerName = TEXT("UnknownUser");
 		}
 
-		FString InGameAccountId = UGameplayStatics::ParseOption(Options, TEXT("GameAccountId"));
 		FString InAuthTicket = UGameplayStatics::ParseOption(Options, TEXT("AuthTicket"));
-		UE_LOG(LogLobbyBeacon, Log, TEXT("Lobby beacon received GameAccountId and AuthTicket from client for player: UniqueId:[%s] GameAccountId=[%s]"),
-			InUniqueId.IsValid() ? *InUniqueId->ToString() : TEXT("-invalid-"),
-			*InGameAccountId);
+		UE_LOG(LogLobbyBeacon, Log, TEXT("Lobby beacon received AuthTicket from client for player: UniqueId:[%s]"), *InUniqueId.ToDebugString());
 
 		if (GetNetMode() != NM_Standalone)
 		{
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Public/LobbyBeaconHost.h b/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Public/LobbyBeaconHost.h
index 4ba025cd2fe1..39e2c33d8e4e 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Public/LobbyBeaconHost.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Lobby/Public/LobbyBeaconHost.h
@@ -155,7 +155,7 @@ protected:
 	 *
 	 * @return new player state object for the logged in player, null if there was any failure
 	 */
-	ALobbyBeaconPlayerState* HandlePlayerLogin(ALobbyBeaconClient* ClientActor, const FUniqueNetIdRepl& InUniqueId, const FString& Options);
+	virtual ALobbyBeaconPlayerState* HandlePlayerLogin(ALobbyBeaconClient* ClientActor, const FUniqueNetIdRepl& InUniqueId, const FString& Options);
 
 	friend ALobbyBeaconClient;
 };
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/LoginFlowManager.cpp b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/LoginFlowManager.cpp
index 08c9200207fb..f85d89457975 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/LoginFlowManager.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/LoginFlowManager.cpp
@@ -15,12 +15,6 @@
 
 DEFINE_LOG_CATEGORY(LogLoginFlow);
 
-#define LOGIN_TOKEN_FOUND FString()
-#define LOGIN_ERROR_UNKNOWN TEXT("com.epicgames.login.unknown")
-#define LOGIN_CANCELLED TEXT("com.epicgames.login.cancelled")
-#define LOGIN_PAGELOADFAILED TEXT("com.epicgames.login.pageloadfailed")
-#define LOGIN_CEFLOADFAILED TEXT("com.epicgames.login.cefloadfailed")
-
 struct FLoginFlowProperties
 {
 	/** Instance of the login flow */
@@ -39,8 +33,25 @@ struct FLoginFlowProperties
 	bool bIsDisplayed;
 };
 
+struct FAccountCreationFlowProperties
+{
+	/** Instance of the login flow */
+	FString InstanceId;
+	/** Delegate fired on every RedirectURL detected by the web interface */
+	FOnLoginRedirectURL OnRedirectURL;
+	/** Wrapper slate widget around the actual creation flow web page */
+	TSharedPtr<SBox> PopupHolder;
+	/** Delegate fired externally when the creation flow is dismissed */
+	FLoginFlowManager::FOnPopupDismissed OnPopupDismissed;
+	/** Delegate fired when the creation flow is complete for any reason */
+	FOnLoginFlowComplete OnComplete;
+	/** Structure containing results of creation flow attempt */
+	FLoginFlowResult Result;
+	/** Is the creation flow actively being shown */
+	bool bIsDisplayed;
+};
+
 FLoginFlowManager::FLoginFlowManager()
-	: bLoginFlowInProgress(false)
 {
 }
 
@@ -58,6 +69,12 @@ void FLoginFlowManager::Reset()
 		PendingLogin = nullptr;
 	}
 
+	if (PendingAccountCreation.IsValid())
+	{
+		PendingAccountCreation->OnPopupDismissed.ExecuteIfBound();
+		PendingAccountCreation = nullptr;
+	}
+
 	for (auto& OnlineParamPair : OnlineSubsystemsMap)
 	{
 		FOnlineParams& OnlineParams = OnlineParamPair.Value;
@@ -69,6 +86,7 @@ void FLoginFlowManager::Reset()
 			if (OnlineExternalUI.IsValid())
 			{
 				OnlineExternalUI->ClearOnLoginFlowUIRequiredDelegate_Handle(OnlineParams.LoginFlowUIRequiredDelegateHandle);
+				OnlineExternalUI->ClearOnCreateAccountFlowUIRequiredDelegate_Handle(OnlineParams.AccountCreationFlowUIRequiredDelegateHandle);
 			}
 			if (OnlineIdentity.IsValid())
 			{
@@ -79,7 +97,7 @@ void FLoginFlowManager::Reset()
 	OnlineSubsystemsMap.Empty();
 }
 
-bool FLoginFlowManager::AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, bool bPersistCookies)
+bool FLoginFlowManager::AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, const FOnDisplayPopup& InCreationFlowPopupDelegate, bool bPersistCookies)
 {
 	bool bSuccess = false;
 
@@ -96,10 +114,14 @@ bool FLoginFlowManager::AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPop
 			{
 				IWebBrowserSingleton* WebBrowserSingleton = IWebBrowserModule::Get().GetSingleton();
 				FString ContextName = FString::Printf(TEXT("LoginFlowContext_%s"), *OnlineIdentifier.ToString());
+#if !UE_BUILD_SHIPPING
+				WebBrowserSingleton->SetDevToolsShortcutEnabled(true);
+#endif
 
 				FOnlineParams& NewParams = OnlineSubsystemsMap.Add(OnlineIdentifier);
 				NewParams.OnlineIdentifier = OnlineIdentifier;
-				NewParams.OnDisplayPopup = InPopupDelegate;
+				NewParams.OnLoginFlowPopup = InPopupDelegate;
+				NewParams.OnAccountCreationFlowPopup = InCreationFlowPopupDelegate;
 				NewParams.BrowserContextSettings = MakeShared<FBrowserContextSettings>(ContextName);
 				NewParams.BrowserContextSettings->bPersistSessionCookies = bPersistCookies;
 				if (NewParams.BrowserContextSettings->bPersistSessionCookies)
@@ -116,8 +138,9 @@ bool FLoginFlowManager::AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPop
 				}
 
 				NewParams.LoginFlowLogoutDelegateHandle = OnlineIdentity->AddOnLoginFlowLogoutDelegate_Handle(FOnLoginFlowLogoutDelegate::CreateSP(this, &FLoginFlowManager::OnLoginFlowLogout, OnlineIdentifier));
-
+				
 				NewParams.LoginFlowUIRequiredDelegateHandle = OnlineExternalUI->AddOnLoginFlowUIRequiredDelegate_Handle(FOnLoginFlowUIRequiredDelegate::CreateSP(this, &FLoginFlowManager::OnLoginFlowStarted, OnlineIdentifier));
+				NewParams.AccountCreationFlowUIRequiredDelegateHandle = OnlineExternalUI->AddOnCreateAccountFlowUIRequiredDelegate_Handle(FOnCreateAccountFlowUIRequiredDelegate::CreateSP(this, &FLoginFlowManager::OnAccountCreationFlowStarted, OnlineIdentifier));
 				bSuccess = true;
 			}
 		}
@@ -147,14 +170,14 @@ void FLoginFlowManager::OnLoginFlowStarted(const FString& RequestedURL, const FO
 	if (Params)
 	{
 		// check for login in flight (one at a time)
-		if (PendingLogin.IsValid())
+		if (IsFlowInProgress())
 		{
 			UE_LOG(LogLoginFlow, Error, TEXT("Simultaneous login flows not supported"));
 			return;
 		}
 
 		// make sure we have a display callback currently bound
-		if (!Params->OnDisplayPopup.IsBound())
+		if (!Params->OnLoginFlowPopup.IsBound())
 		{
 			UE_LOG(LogLoginFlow, Error, TEXT("Login did not have display code bound to OnLoginFlowStarted."));
 			return;
@@ -173,7 +196,7 @@ void FLoginFlowManager::OnLoginFlowStarted(const FString& RequestedURL, const FO
 		SAssignNew(PendingLogin->PopupHolder, SBox);
 
 		// give the widget to the App to display and get back a callback we should use to dismiss it
-		PendingLogin->OnPopupDismissed = Params->OnDisplayPopup.Execute(PendingLogin->PopupHolder.ToSharedRef());
+		PendingLogin->OnPopupDismissed = Params->OnLoginFlowPopup.Execute(PendingLogin->PopupHolder.ToSharedRef());
 
 		// generate a login flow chromium widget
 		ILoginFlowModule::FCreateSettings CreateSettings;
@@ -262,7 +285,7 @@ bool FLoginFlowManager::OnLoginFlow_RedirectURL(const FString& RedirectURL, FStr
 
 void FLoginFlowManager::CancelLoginFlow()
 {
-	if (!PendingLogin.IsValid())
+	if (!PendingLogin.IsValid() || PendingLogin->Result.IsComplete())
 	{
 		return;
 	}
@@ -280,31 +303,192 @@ void FLoginFlowManager::FinishLogin()
 		UE_LOG(LogLoginFlow, Warning, TEXT("Login Flow failed with error: %s"), PendingLogin->Result.Error.ToLogString());
 	}
 
+	// fire the login complete callback
+	PendingLogin->OnComplete.ExecuteIfBound(PendingLogin->Result);
+	
 	// dismiss the popup
 	PendingLogin->OnPopupDismissed.ExecuteIfBound();
 
-	// fire the login complete callback
-	PendingLogin->OnComplete.Execute(PendingLogin->Result);
-
 	// clear this object so we can handle another login
 	PendingLogin.Reset();
 }
 
+
+void FLoginFlowManager::OnAccountCreationFlow_Error(ELoginFlowErrorResult ErrorType, const FString& ErrorInfo, FString InstanceId)
+{
+	if (!PendingAccountCreation.IsValid() || PendingAccountCreation->InstanceId != InstanceId)
+	{
+		// assume we got canceled
+		return;
+	}
+
+	FString ErrorString = ErrorInfo;
+	if (ErrorString.IsEmpty())
+	{
+		// try to get more info from the type
+		switch (ErrorType)
+		{
+			case ELoginFlowErrorResult::LoadFail:
+				ErrorString = PendingAccountCreation->bIsDisplayed ? LOGIN_PAGELOADFAILED : LOGIN_CEFLOADFAILED;
+				break;
+			default:
+				ErrorString = LOGIN_ERROR_UNKNOWN;
+				break;
+		}
+	}
+
+	PendingAccountCreation->Result.Error.SetFromErrorCode(ErrorString);
+	FinishAccountCreation();
+}
+
+void FLoginFlowManager::OnAccountCreationFlow_Close(const FString& CloseInfo, FString InstanceId)
+{
+	if (!PendingAccountCreation.IsValid() || PendingAccountCreation->InstanceId != InstanceId)
+	{
+		// assume we got canceled
+		return;
+	}
+
+	PendingAccountCreation->Result.Error.SetFromErrorCode(CloseInfo);
+	FinishAccountCreation();
+}
+
+bool FLoginFlowManager::OnAccountCreationFlow_RedirectURL(const FString& RedirectURL, FString InstanceId)
+{
+	if (!PendingAccountCreation.IsValid() || PendingAccountCreation->InstanceId != InstanceId)
+	{
+		return false;
+	}
+
+	FLoginFlowResult Result = PendingAccountCreation->OnRedirectURL.Execute(RedirectURL);
+	if (Result.IsComplete())
+	{
+		PendingAccountCreation->Result = Result;
+		FinishAccountCreation();
+		return true;
+	}
+
+	return false;
+}
+
+void FLoginFlowManager::OnAccountCreationFlowStarted(const FString& RequestedURL, const FOnLoginRedirectURL& OnRedirectURL, const FOnLoginFlowComplete& OnAccountCreationFlowComplete, bool& bOutShouldContinueAccountCreation, FName InOnlineIdentifier)
+{
+	bOutShouldContinueAccountCreation = false;
+
+	FOnlineParams* Params = OnlineSubsystemsMap.Find(InOnlineIdentifier);
+	if (Params)
+	{
+		// check for login in flight (one at a time)
+		if (IsFlowInProgress())
+		{
+			UE_LOG(LogLoginFlow, Error, TEXT("Simultaneous login flows not supported"));
+			return;
+		}
+
+		// make sure we have a display callback currently bound
+		if (!Params->OnAccountCreationFlowPopup.IsBound())
+		{
+			UE_LOG(LogLoginFlow, Error, TEXT("Account creation did not have display code bound to OnLoginFlowStarted."));
+			return;
+		}
+
+		bOutShouldContinueAccountCreation = true;
+
+		// save the pending order for reference later
+		PendingAccountCreation = MakeUnique<FAccountCreationFlowProperties>();
+		PendingAccountCreation->InstanceId = FGuid::NewGuid().ToString();
+		PendingAccountCreation->OnRedirectURL = OnRedirectURL;
+		PendingAccountCreation->OnComplete = OnAccountCreationFlowComplete;
+		PendingAccountCreation->bIsDisplayed = false;
+
+		// create a placeholder widget to display while this process is going on
+		SAssignNew(PendingAccountCreation->PopupHolder, SBox);
+
+		// give the widget to the App to display and get back a callback we should use to dismiss it
+		PendingAccountCreation->OnPopupDismissed = Params->OnAccountCreationFlowPopup.Execute(PendingAccountCreation->PopupHolder.ToSharedRef());
+
+		// generate a login flow chromium widget
+		ILoginFlowModule::FCreateSettings CreateSettings;
+		CreateSettings.Url = RequestedURL;
+		CreateSettings.BrowserContextSettings = Params->BrowserContextSettings;
+
+		// Setup will allow login flow module events to trigger passed in delegates
+		CreateSettings.CloseCallback = FOnLoginFlowRequestClose::CreateSP(this, &FLoginFlowManager::OnAccountCreationFlow_Close, PendingAccountCreation->InstanceId);
+		CreateSettings.ErrorCallback = FOnLoginFlowError::CreateSP(this, &FLoginFlowManager::OnAccountCreationFlow_Error, PendingAccountCreation->InstanceId);
+		CreateSettings.RedirectCallback = FOnLoginFlowRedirectURL::CreateSP(this, &FLoginFlowManager::OnAccountCreationFlow_RedirectURL, PendingAccountCreation->InstanceId);
+		TSharedRef<SWidget> AccountCreationFlowWidget = ILoginFlowModule::Get().CreateLoginFlowWidget(CreateSettings);
+
+		// make sure none of the delegates were called during creation (would invalidate this ptr)
+		if (PendingAccountCreation.IsValid())
+		{
+			// put this widget into the holder
+			PendingAccountCreation->PopupHolder->SetContent(AccountCreationFlowWidget);
+			PendingAccountCreation->bIsDisplayed = true;
+
+			// focus the login flow widget
+			FSlateApplication::Get().SetKeyboardFocus(AccountCreationFlowWidget, EFocusCause::SetDirectly);
+		}
+	}
+	else
+	{
+		UE_LOG(LogLoginFlow, Error, TEXT("Online platform requesting account creation flow not registered [%s]"), *InOnlineIdentifier.ToString());
+	}
+}
+
+void FLoginFlowManager::CancelAccountCreationFlow()
+{
+	if (!PendingAccountCreation.IsValid() || PendingAccountCreation->Result.IsComplete())
+	{
+		return;
+	}
+
+	PendingAccountCreation->Result.Error.SetFromErrorCode(LOGIN_CANCELLED);
+	FinishAccountCreation();
+}
+
+void FLoginFlowManager::FinishAccountCreation()
+{
+	check(PendingAccountCreation.IsValid());
+
+	if (!PendingAccountCreation->Result.Error.bSucceeded)
+	{
+		UE_LOG(LogLoginFlow, Warning, TEXT("Account Creation Flow failed with error: %s"), PendingAccountCreation->Result.Error.ToLogString());
+	}
+
+	// fire the login complete callback
+	PendingAccountCreation->OnComplete.ExecuteIfBound(PendingAccountCreation->Result);
+
+	// dismiss the popup
+	PendingAccountCreation->OnPopupDismissed.ExecuteIfBound();
+
+	// clear this object so we can handle another login
+	PendingAccountCreation.Reset();
+}
+
 void FLoginFlowManager::OnLoginFlowLogout(const TArray<FString>& LoginDomains, FName InOnlineIdentifier)
 {
 	FOnlineParams* Params = OnlineSubsystemsMap.Find(InOnlineIdentifier);
 	if (Params)
 	{
-		IWebBrowserSingleton* WebBrowserSingleton = IWebBrowserModule::Get().GetSingleton();
-		TOptional<FString> ContextId;
-		if (Params->BrowserContextSettings.IsValid())
+		if (LoginDomains.Num() > 0)
 		{
-			ContextId = Params->BrowserContextSettings->Id;
-		}
-		TSharedPtr<IWebBrowserCookieManager> CookieManager = WebBrowserSingleton->GetCookieManager(ContextId);
-		for (const FString& LoginDomain : LoginDomains)
-		{
-			CookieManager->DeleteCookies(LoginDomain);
+			IWebBrowserSingleton* WebBrowserSingleton = IWebBrowserModule::Get().GetSingleton();
+			if (WebBrowserSingleton)
+			{
+				TOptional<FString> ContextId;
+				if (Params->BrowserContextSettings.IsValid())
+				{
+					ContextId = Params->BrowserContextSettings->Id;
+				}
+				TSharedPtr<IWebBrowserCookieManager> CookieManager = WebBrowserSingleton->GetCookieManager(ContextId);
+				if (CookieManager.IsValid())
+				{
+					for (const FString& LoginDomain : LoginDomains)
+					{
+						CookieManager->DeleteCookies(LoginDomain);
+					}
+				}
+			}
 		}
 	}
 	else
@@ -312,3 +496,5 @@ void FLoginFlowManager::OnLoginFlowLogout(const TArray<FString>& LoginDomains, F
 		UE_LOG(LogLoginFlow, Error, TEXT("No login flow registered for online subsystem %s"), *InOnlineIdentifier.ToString());
 	}
 }
+
+
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/SLoginFlow.cpp b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/SLoginFlow.cpp
index ee9b859e9cfd..d4afeeb12560 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/SLoginFlow.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Private/SLoginFlow.cpp
@@ -431,16 +431,8 @@ private:
 
 	bool HandleBrowserBeforeBrowse(const FString& Url, const FWebNavigationRequest& Request)
 	{
-		if (Request.bIsMainFrame && Request.bIsRedirect)
-		{
-			UE_LOG(LogLoginFlow, Log, TEXT("HandleBrowserBeforeBrowse URL: %s"), *Url);
-			return ViewModel->HandleBeforeBrowse(Url);
-		}
-		else
-		{
-			UE_LOG(LogLoginFlow, VeryVerbose, TEXT("HandleBrowserBeforeBrowse skipped URL: %s MainFrame: %d Redirect: %d"), *Url, Request.bIsMainFrame, Request.bIsRedirect);
-		}
-		return false;
+		UE_LOG(LogLoginFlow, Log, TEXT("HandleBrowserBeforeBrowse Main:%d Redirect:%d URL: %s"), Request.bIsMainFrame, Request.bIsRedirect, *Url);
+		return ViewModel->HandleBeforeBrowse(Url);
 	}
 
 	EWebBrowserDialogEventResponse HandleShowDialog(const TWeakPtr<IWebBrowserDialog> & DialogPtr)
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/ILoginFlowManager.h b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/ILoginFlowManager.h
index 06d623e8db9e..b147e7ea4d73 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/ILoginFlowManager.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/ILoginFlowManager.h
@@ -36,10 +36,11 @@ public:
 	 * 
 	 * @param OnlineIdentifier online subsystem identifier requiring a login flow UI
 	 * @param InPopupDelegate external delegate to receive widgets from the login flow
+	 * @param InCreationFlowPopupDelegate external delegate to receive widgets from the account creation flow
 	 * @param bPersistCookies let the global web context manage cookies, or keep them in memory only
 	 * @return whether or not the login flow was successfully added
 	 */
-	virtual bool AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, bool bPersistCookies = true) = 0;
+	virtual bool AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, const FOnDisplayPopup& InCreationFlowPopupDelegate, bool bPersistCookies = true) = 0;
 
 	/**
 	 * Has a given login flow been setup
@@ -50,6 +51,8 @@ public:
 
 	/** Cancel an active login flow */
 	virtual void CancelLoginFlow() = 0;
+	/** Cancel an active account creation flow */
+	virtual void CancelAccountCreationFlow() = 0;
 
 	/** Cleanup and remove all registered login flows, detaching from online subsystems */
 	virtual void Reset() = 0;
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/LoginFlowManager.h b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/LoginFlowManager.h
index f0b378b19311..626872abdd0e 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/LoginFlowManager.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/LoginFlow/Public/LoginFlowManager.h
@@ -9,6 +9,7 @@ class FUniqueNetId;
 class FOnlineSubsystemMcp;
 class SWidget;
 struct FLoginFlowProperties;
+struct FAccountCreationFlowProperties;
 
 /**
  * Create and configure one of these to enable web login flow in your application
@@ -23,14 +24,19 @@ public:
 	~FLoginFlowManager();
 
 	//~ Begin ILoginFlowManager interface
-	virtual bool AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, bool bPersistCookies) override;
+	virtual bool AddLoginFlow(FName OnlineIdentifier, const FOnDisplayPopup& InPopupDelegate, const FOnDisplayPopup& InCreationFlowPopupDelegate, bool bPersistCookies) override;
 	virtual bool HasLoginFlow(FName OnlineIdentifier) override;
 	virtual void CancelLoginFlow() override;
+	virtual void CancelAccountCreationFlow() override;
 	virtual void Reset() override;
 	//~ End ILoginFlowManager interface
 
 private:
 
+	/**
+	 * Login flow
+	 */
+
 	/** Delegate fired by the web engine on any error */
 	void OnLoginFlow_Error(ELoginFlowErrorResult ErrorType, const FString& ErrorInfo, FString InstanceId);
 	/** Delegate fired when the browser window is closed */
@@ -47,16 +53,40 @@ private:
 
 private:
 
+	/**
+	 * Account creation
+	 */
+
+	/** Delegate fired by the web engine on any error */
+	void OnAccountCreationFlow_Error(ELoginFlowErrorResult ErrorType, const FString& ErrorInfo, FString InstanceId);
+	/** Delegate fired when the browser window is closed */
+	void OnAccountCreationFlow_Close(const FString& CloseInfo, FString InstanceId);
+	/** Delegate fired when the browser window indicates a URL redirect */
+	bool OnAccountCreationFlow_RedirectURL(const FString& RedirectURL, FString InstanceId);
+	/** Delegate fired when an account creation flow is requested by an external provider */
+	void OnAccountCreationFlowStarted(const FString& RequestedURL, const FOnLoginRedirectURL& OnRedirectURL, const FOnLoginFlowComplete& OnAccountCreationFlowComplete, bool& bOutShouldContinueAccountCreation, FName InOnlineIdentifier);
+	/** Finish account creation flow, notifying listeners */
+	void FinishAccountCreation();
+
+
+private:
+
+	bool IsFlowInProgress() const { return PendingLogin.IsValid() || PendingAccountCreation.IsValid(); }
+
 	struct FOnlineParams
 	{
 		/** Online identifier <subsystem>:<instancename> that describes the OnlineSubsystem */
 		FName OnlineIdentifier;
-		/** Single-cast delegate instance (bind to this to handle display) */
-		FOnDisplayPopup OnDisplayPopup;
+		/** Single-cast delegate instance (bind to this to handle login flow display) */
+		FOnDisplayPopup OnLoginFlowPopup;
 		/** Handle to bound login flow ui required delegate */
 		FDelegateHandle LoginFlowUIRequiredDelegateHandle;
 		/** Handle to bound login flow logout delegate */
 		FDelegateHandle LoginFlowLogoutDelegateHandle;
+		/** Single-cast delegate instance (bind to this to handle account creation flow display) */
+		FOnDisplayPopup OnAccountCreationFlowPopup;
+		/** Handle to bound account creation flow ui required delegate */
+		FDelegateHandle AccountCreationFlowUIRequiredDelegateHandle;
 		/** Optional browser context settings if bPersistCookies is false */
 		TSharedPtr<FBrowserContextSettings> BrowserContextSettings;
 	};
@@ -64,9 +94,9 @@ private:
 	/** Mapping of online subsystem identifiers to the parameters they have setup for login flow */
 	TMap<FName, FOnlineParams> OnlineSubsystemsMap;
 
-	/** Is there a login attempt in progress */
-	bool bLoginFlowInProgress;
 	/** Properties related to the current login attempt */
 	TUniquePtr<FLoginFlowProperties> PendingLogin;
+	/** Properties related to the current account creation attempt */
+	TUniquePtr<FAccountCreationFlowProperties> PendingAccountCreation;
 };
 
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/Party.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/Party.cpp
index 65f79b9410ff..103a6eafdcc4 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/Party.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/Party.cpp
@@ -239,6 +239,7 @@ void UParty::RegisterPartyDelegates()
 			PartyMemberDataReceivedDelegateHandle = PartyInt->AddOnPartyMemberDataReceivedDelegate_Handle(FOnPartyMemberDataReceivedDelegate::CreateUObject(this, &ThisClass::PartyMemberDataReceivedInternal));
 			PartyJoinRequestReceivedDelegateHandle = PartyInt->AddOnPartyJoinRequestReceivedDelegate_Handle(FOnPartyJoinRequestReceivedDelegate::CreateUObject(this, &ThisClass::PartyJoinRequestReceivedInternal));
 			PartyQueryJoinabilityReceivedDelegateHandle = PartyInt->AddOnQueryPartyJoinabilityReceivedDelegate_Handle(FOnPartyJoinRequestReceivedDelegate::CreateUObject(this, &ThisClass::PartyQueryJoinabilityReceivedInternal));
+			PartyFillPartyJoinRequestDataDelegateHandle = PartyInt->AddOnFillPartyJoinRequestDataDelegate_Handle(FOnFillPartyJoinRequestDataDelegate::CreateUObject(this, &ThisClass::PartyFillJoinRequestData));
 			PartyMemberPromotedDelegateHandle = PartyInt->AddOnPartyMemberPromotedDelegate_Handle(FOnPartyMemberPromotedDelegate::CreateUObject(this, &ThisClass::PartyMemberPromotedInternal));
 			PartyMemberExitedDelegateHandle = PartyInt->AddOnPartyMemberExitedDelegate_Handle(FOnPartyMemberExitedDelegate::CreateUObject(this, &ThisClass::PartyMemberExitedInternal));
 			PartyPromotionLockoutChangedDelegateHandle = PartyInt->AddOnPartyPromotionLockoutChangedDelegate_Handle(FOnPartyPromotionLockoutChangedDelegate::CreateUObject(this, &ThisClass::PartyPromotionLockoutStateChangedInternal));
@@ -262,6 +263,7 @@ void UParty::UnregisterPartyDelegates()
 			PartyInt->ClearOnPartyMemberDataReceivedDelegate_Handle(PartyMemberDataReceivedDelegateHandle);
 			PartyInt->ClearOnPartyJoinRequestReceivedDelegate_Handle(PartyJoinRequestReceivedDelegateHandle);
 			PartyInt->ClearOnQueryPartyJoinabilityReceivedDelegate_Handle(PartyQueryJoinabilityReceivedDelegateHandle);
+			PartyInt->ClearOnFillPartyJoinRequestDataDelegate_Handle(PartyFillPartyJoinRequestDataDelegateHandle);
 			PartyInt->ClearOnPartyMemberPromotedDelegate_Handle(PartyMemberPromotedDelegateHandle);
 			PartyInt->ClearOnPartyMemberExitedDelegate_Handle(PartyMemberExitedDelegateHandle);
 			PartyInt->ClearOnPartyPromotionLockoutChangedDelegate_Handle(PartyPromotionLockoutChangedDelegateHandle);
@@ -396,12 +398,12 @@ void UParty::PartyMemberDataReceivedInternal(const FUniqueNetId& InLocalUserId,
 	}
 }
 
-void UParty::PartyJoinRequestReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId)
+void UParty::PartyJoinRequestReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData)
 {
 	UPartyGameState* PartyState = GetParty(InPartyId);
 	if (PartyState)
 	{
-		PartyState->HandlePartyJoinRequestReceived(InLocalUserId, SenderId);
+		PartyState->HandlePartyJoinRequestReceived(InLocalUserId, SenderId, Platform, JoinData);
 	}
 	else
 	{
@@ -409,12 +411,12 @@ void UParty::PartyJoinRequestReceivedInternal(const FUniqueNetId& InLocalUserId,
 	}
 }
 
-void UParty::PartyQueryJoinabilityReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId)
+void UParty::PartyQueryJoinabilityReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData)
 {
 	UPartyGameState* PartyState = GetParty(InPartyId);
 	if (PartyState)
 	{
-		PartyState->HandlePartyQueryJoinabilityRequestReceived(InLocalUserId, SenderId);
+		PartyState->HandlePartyQueryJoinabilityRequestReceived(InLocalUserId, SenderId, Platform, JoinData);
 	}
 	else
 	{
@@ -422,6 +424,10 @@ void UParty::PartyQueryJoinabilityReceivedInternal(const FUniqueNetId& InLocalUs
 	}
 }
 
+void UParty::PartyFillJoinRequestData(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, FOnlinePartyData& PartyData)
+{
+}
+
 void UParty::PartyMemberPromotedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& InNewLeaderId)
 {
 	if (InLocalUserId == InNewLeaderId)
@@ -683,6 +689,7 @@ void UParty::OnLeavePersistentPartyForRejoinComplete(const FUniqueNetId& LocalUs
 		{
 			FOnJoinPartyComplete CompletionDelegate;
 			CompletionDelegate.BindUObject(this, &ThisClass::OnRejoinPartyComplete);
+			// CODEREVIEW - don.eubanks - Not sure how to pipe the data here, this seems like a weird case 
 			PartyInt->RejoinParty(LocalUserId, *RejoinableParty->PartyId, IOnlinePartySystem::GetPrimaryPartyTypeId(), RejoinableParty->Members, CompletionDelegate);
 			JoinResult = EJoinPartyCompletionResult::Succeeded;
 		}
@@ -1103,27 +1110,20 @@ void UParty::GetPersistentPartyConfiguration(FPartyConfiguration& PartyConfig)
 
 	bool bIsPrivate = (PartyType == EPartyType::Private);
 
-	PartySystemPermissions::EPresencePermissions PresencePermissions;
-	if (bLeaderFriendsOnly)
+	PartySystemPermissions::EPermissionType PresencePermissions;
+	if (bIsPrivate)
 	{
-		if (bIsPrivate)
-		{
-			PresencePermissions = PartySystemPermissions::FriendsInviteOnly;
-		}
-		else
-		{
-			PresencePermissions = PartySystemPermissions::FriendsOnly;
-		}
+		PresencePermissions = PartySystemPermissions::EPermissionType::Noone;
 	}
 	else
 	{
-		if (bIsPrivate)
+		if (bLeaderFriendsOnly)
 		{
-			PresencePermissions = PartySystemPermissions::PublicInviteOnly;
+			PresencePermissions = PartySystemPermissions::EPermissionType::Leader;
 		}
 		else
 		{
-			PresencePermissions = PartySystemPermissions::Public;
+			PresencePermissions = PartySystemPermissions::EPermissionType::Anyone;
 		}
 	}
 
@@ -1131,7 +1131,7 @@ void UParty::GetPersistentPartyConfiguration(FPartyConfiguration& PartyConfig)
 	PartyConfig.bIsAcceptingMembers = bIsPrivate ? false : true;
 	PartyConfig.bShouldRemoveOnDisconnection = true;
 	PartyConfig.PresencePermissions = PresencePermissions;
-	PartyConfig.InvitePermissions = bAllowInvites ? (bLeaderInvitesOnly ? PartySystemPermissions::EInvitePermissions::Leader : PartySystemPermissions::EInvitePermissions::Anyone) : PartySystemPermissions::EInvitePermissions::Noone;
+	PartyConfig.InvitePermissions = bAllowInvites ? (bLeaderInvitesOnly ? PartySystemPermissions::EPermissionType::Leader : PartySystemPermissions::EPermissionType::Anyone) : PartySystemPermissions::EPermissionType::Noone;
 
 	PartyConfig.MaxMembers = DefaultMaxPartySize;
 }
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyGameState.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyGameState.cpp
index 0f9a95ea799c..f39341f67c73 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyGameState.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyGameState.cpp
@@ -35,10 +35,6 @@ UPartyGameState::UPartyGameState(const FObjectInitializer& ObjectInitializer) :
 {
 	PartyMemberStateClass = UPartyMemberState::StaticClass();
 	ReservationBeaconClientClass = APartyBeaconClient::StaticClass();
-
-	if (!HasAnyFlags(RF_ClassDefaultObject))
-	{
-	}
 }
 
 void UPartyGameState::BeginDestroy()
@@ -305,9 +301,8 @@ bool UPartyGameState::ResetForFrontend()
 
 						while (ExistingPendingApprovals.Dequeue(PendingApproval))
 						{
-							HandlePartyJoinRequestReceived(*PendingApproval.RecipientId, *PendingApproval.SenderId);
+							HandlePartyJoinRequestReceived(*PendingApproval.RecipientId, *PendingApproval.SenderId, PendingApproval.Platform, *PendingApproval.JoinData);
 						}
-
 					}
 				}
 				else
@@ -619,9 +614,9 @@ void UPartyGameState::HandleLockoutPromotionStateChange(bool bNewLockoutState)
 	bPromotionLockoutState = bNewLockoutState;
 }
 
-EApprovalAction UPartyGameState::ProcessJoinRequest(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, EJoinPartyDenialReason& DenialReason) const
+EApprovalAction UPartyGameState::ProcessJoinRequest(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData, EJoinPartyDenialReason& DenialReason) const
 {
-	if (IsInJoinableGameState())
+	if (IsGameSessionJoinable())
 	{
 		return EApprovalAction::Approve;
 	}
@@ -632,7 +627,7 @@ EApprovalAction UPartyGameState::ProcessJoinRequest(const FUniqueNetId& Recipien
 	}
 }
 
-void UPartyGameState::HandlePartyJoinRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId)
+void UPartyGameState::HandlePartyJoinRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData)
 {
 #if 0 // auto approve requests for debugging error case
 	UWorld* World = GetWorld();
@@ -654,7 +649,7 @@ void UPartyGameState::HandlePartyJoinRequestReceived(const FUniqueNetId& Recipie
 		if (NumPartyMembers < MaxPartyMembers)
 		{
 			// Give the game a chance to accept or deny this player
-			ApprovalAction = ProcessJoinRequest(RecipientId, SenderId, DenialReason);
+			ApprovalAction = ProcessJoinRequest(RecipientId, SenderId, Platform, JoinData, DenialReason);
 		}
 		else
 		{
@@ -676,6 +671,8 @@ void UPartyGameState::HandlePartyJoinRequestReceived(const FUniqueNetId& Recipie
 		FPendingMemberApproval PendingApproval;
 		PendingApproval.RecipientId.SetUniqueNetId(RecipientId.AsShared());
 		PendingApproval.SenderId.SetUniqueNetId(SenderId.AsShared());
+		PendingApproval.Platform = Platform;
+		PendingApproval.JoinData = JoinData.AsShared();
 		PendingApprovals.Enqueue(PendingApproval);
 
 		if (ReservationBeaconClient == nullptr &&
@@ -704,7 +701,7 @@ void UPartyGameState::HandlePartyJoinRequestReceived(const FUniqueNetId& Recipie
 	}
 }
 
-void UPartyGameState::HandlePartyQueryJoinabilityRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId)
+void UPartyGameState::HandlePartyQueryJoinabilityRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData)
 {
 	EApprovalAction ApprovalAction = EApprovalAction::Deny;
 	EJoinPartyDenialReason DenialReason = EJoinPartyDenialReason::Busy;
@@ -716,7 +713,7 @@ void UPartyGameState::HandlePartyQueryJoinabilityRequestReceived(const FUniqueNe
 		if (NumPartyMembers < MaxPartyMembers)
 		{
 			// Give the game a chance to accept or deny this player
-			ApprovalAction = ProcessJoinRequest(RecipientId, SenderId, DenialReason);
+			ApprovalAction = ProcessJoinRequest(RecipientId, SenderId, Platform, JoinData, DenialReason);
 		}
 		else
 		{
@@ -781,38 +778,31 @@ void UPartyGameState::SetPartyType(EPartyType InPartyType, bool bLeaderFriendsOn
 		{
 			bool bIsPrivate = (InPartyType == EPartyType::Private);
 
-			PartySystemPermissions::EPresencePermissions PresencePermissions;
-			if (bLeaderFriendsOnly)
+			PartySystemPermissions::EPermissionType PresencePermissions;
+			if (bIsPrivate)
 			{
-				if (bIsPrivate)
-				{
-					PresencePermissions = PartySystemPermissions::FriendsInviteOnly;
-				}
-				else
-				{
-					PresencePermissions = PartySystemPermissions::FriendsOnly;
-				}
+				PresencePermissions = PartySystemPermissions::EPermissionType::Noone;
 			}
 			else
 			{
-				if (bIsPrivate)
+				if (bLeaderFriendsOnly)
 				{
-					PresencePermissions = PartySystemPermissions::PublicInviteOnly;
+					PresencePermissions = PartySystemPermissions::EPermissionType::Leader;
 				}
 				else
 				{
-					PresencePermissions = PartySystemPermissions::Public;
+					PresencePermissions = PartySystemPermissions::EPermissionType::Anyone;
 				}
 			}
 
 			CurrentConfig.PresencePermissions = PresencePermissions;
 			if (PartyStateRef->bInvitesDisabled)
 			{
-				CurrentConfig.InvitePermissions = PartySystemPermissions::EInvitePermissions::Noone;
+				CurrentConfig.InvitePermissions = PartySystemPermissions::EPermissionType::Noone;
 			}
 			else
 			{
-				CurrentConfig.InvitePermissions = bLeaderInvitesOnly ? PartySystemPermissions::EInvitePermissions::Leader : PartySystemPermissions::EInvitePermissions::Anyone;
+				CurrentConfig.InvitePermissions = bLeaderInvitesOnly ? PartySystemPermissions::EPermissionType::Leader : PartySystemPermissions::EPermissionType::Anyone;
 			}
 
 			UpdatePartyConfig(bIsPrivate);
@@ -862,11 +852,11 @@ void UPartyGameState::SetInvitesDisabled(bool bInvitesDisabled)
 		{
 			if (bInvitesDisabled)
 			{
-				CurrentConfig.InvitePermissions = PartySystemPermissions::EInvitePermissions::Noone;
+				CurrentConfig.InvitePermissions = PartySystemPermissions::EPermissionType::Noone;
 			}
 			else
 			{
-				CurrentConfig.InvitePermissions = PartyStateRef->bLeaderInvitesOnly ? PartySystemPermissions::EInvitePermissions::Leader : PartySystemPermissions::EInvitePermissions::Anyone;
+				CurrentConfig.InvitePermissions = PartyStateRef->bLeaderInvitesOnly ? PartySystemPermissions::EPermissionType::Leader : PartySystemPermissions::EPermissionType::Anyone;
 			}
 
 			UpdatePartyConfig();
@@ -954,7 +944,7 @@ void UPartyGameState::UpdateAcceptingMembers()
 		bool bCurrentlyAcceptingMembers = false;
 
 		// Look at game joinability (in game with permission or no game at all)
-		if (IsInJoinableGameState())
+		if (IsGameSessionJoinable())
 		{
 			// Make sure the party isn't full
 			int32 NumPartyMembers = GetPartySize();
@@ -1043,7 +1033,7 @@ bool UPartyGameState::IsAcceptingMembers(EJoinPartyDenialReason* const DenialRea
 	}
 }
 
-bool UPartyGameState::IsInJoinableGameState() const
+bool UPartyGameState::IsGameSessionJoinable() const
 {
 	bool bInGame = false;
 	bool bGameJoinable = false;
@@ -1185,6 +1175,12 @@ FChatRoomId UPartyGameState::GetChatRoomID() const
 	return OssParty->RoomId;
 }
 
+bool UPartyGameState::IsNetDriverFromReservationBeacon(const UNetDriver* const InNetDriver) const
+{
+	const FName NetDriverName = InNetDriver->NetDriverName;
+	return (ReservationBeaconClient && NetDriverName == ReservationBeaconClient->GetNetDriverName()) || (NetDriverName == LastReservationBeaconClientNetDriverName);
+}
+
 void UPartyGameState::OnPartyMemberPromoted(const FUniqueNetId& LocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& InMemberId, const EPromoteMemberCompletionResult Result)
 {
 	FString PartyIdDebugString = InPartyId.ToDebugString();
@@ -1280,7 +1276,7 @@ void UPartyGameState::KickMember(const FUniqueNetIdRepl& PartyMemberToKick)
 UPartyMemberState* UPartyGameState::InitPartyMemberStateFromLocalPlayer(const ULocalPlayer* LocalPlayer)
 {
 	UPartyMemberState* LocalPartyMemberState = nullptr;
-	TSharedPtr<const FUniqueNetId> UniqueNetId = LocalPlayer->GetPreferredUniqueNetId();
+	FUniqueNetIdRepl UniqueNetId = LocalPlayer->GetPreferredUniqueNetId();
 	if (UniqueNetId.IsValid())
 	{
 		UPartyMemberState** LocalPartyMemberStatePtr = PartyMembersState.Find(UniqueNetId);
@@ -1423,6 +1419,20 @@ void UPartyGameState::GetSessionInfo(FName SessionName, FString& URL, FString& S
 	}
 }
 
+bool GetCrossplayPreferenceFromJoinData(const FOnlinePartyData& JoinData, ECrossplayPreference& OutPreference)
+{
+	FVariantData CrossplayPreferenceVariant;
+	if (JoinData.GetAttribute(TEXT("CrossplayPreference"), CrossplayPreferenceVariant))
+	{
+		int32 CrossplayPreferenceInt;
+		CrossplayPreferenceVariant.GetValue(CrossplayPreferenceInt);
+		OutPreference = (ECrossplayPreference)CrossplayPreferenceInt;
+		return true;
+	}
+
+	return false;
+}
+
 void UPartyGameState::ConnectToReservationBeacon()
 {
 	if (IsLocalPartyLeader())
@@ -1435,6 +1445,8 @@ void UPartyGameState::ConnectToReservationBeacon()
 			UWorld* World = GetWorld();
 			check(World);
 
+			// Clear out our cached net driver name, we're going to create a new one here
+			LastReservationBeaconClientNetDriverName = NAME_None;
 			// Reconnect to the reservation beacon to maintain our place in the game (just until actual joined, holds place for all party members)
 			ReservationBeaconClient = World->SpawnActor<APartyBeaconClient>(ReservationBeaconClientClass);
 			if (ReservationBeaconClient)
@@ -1445,8 +1457,13 @@ void UPartyGameState::ConnectToReservationBeacon()
 				ReservationBeaconClient->OnReservationRequestComplete().BindUObject(this, &ThisClass::OnReservationBeaconUpdateResponseReceived);
 				ReservationBeaconClient->OnReservationCountUpdate().BindUObject(this, &ThisClass::OnReservationCountUpdate);
 
+				ECrossplayPreference CrossplayPreference = ECrossplayPreference::NoSelection;
+				const bool bFoundResult = GetCrossplayPreferenceFromJoinData(*NextApproval.JoinData, CrossplayPreference);
+
 				FPlayerReservation NewPlayerRes;
 				NewPlayerRes.UniqueId = NextApproval.SenderId;
+				NewPlayerRes.Platform = NextApproval.Platform;
+				NewPlayerRes.bAllowCrossplay = (CrossplayPreference == ECrossplayPreference::OptedIn);
 
 				TArray<FPlayerReservation> PlayersToAdd;
 				PlayersToAdd.Add(NewPlayerRes);
@@ -1518,6 +1535,41 @@ void UPartyGameState::OnReservationBeaconUpdateConnectionFailure()
 	CleanupReservationBeacon();
 }
 
+void UPartyGameState::PumpApprovalQueue()
+{
+	// Check if there are any more while we are connected
+	FPendingMemberApproval NextApproval;
+	if (PendingApprovals.Peek(NextApproval))
+	{
+		if (ensure(ReservationBeaconClient))
+		{
+			FUniqueNetIdRepl PartyLeader(GetPartyLeader());
+
+			ECrossplayPreference CrossplayPreference = ECrossplayPreference::NoSelection;
+			const bool bFoundResult = GetCrossplayPreferenceFromJoinData(*NextApproval.JoinData, CrossplayPreference);
+
+			FPlayerReservation NewPlayerRes;
+			NewPlayerRes.UniqueId = NextApproval.SenderId;
+			NewPlayerRes.Platform = NextApproval.Platform;
+			NewPlayerRes.bAllowCrossplay = (CrossplayPreference == ECrossplayPreference::OptedIn);
+
+			TArray<FPlayerReservation> PlayersToAdd;
+			PlayersToAdd.Add(NewPlayerRes);
+
+			ReservationBeaconClient->RequestReservationUpdate(PartyLeader, PlayersToAdd);
+		}
+		else
+		{
+			UE_LOG(LogParty, Warning, TEXT("UPartyGameState::OnReservationBeaconUpdateResponseReceived: ReservationBeaconClient is null while trying to process more requests"));
+			RejectAllPendingJoinRequests();
+		}
+	}
+	else
+	{
+		CleanupReservationBeacon();
+	}
+}
+
 void UPartyGameState::OnReservationBeaconUpdateResponseReceived(EPartyReservationResult::Type ReservationResponse)
 {
 	UE_LOG(LogParty, Verbose, TEXT("OnReservationBeaconUpdateResponseReceived %s"), EPartyReservationResult::ToString(ReservationResponse));
@@ -1544,32 +1596,7 @@ void UPartyGameState::OnReservationBeaconUpdateResponseReceived(EPartyReservatio
 			}
 		}
 
-		// Check if there are any more while we are connected
-		FPendingMemberApproval NextApproval;
-		if (PendingApprovals.Peek(NextApproval))
-		{
-			if (ensure(ReservationBeaconClient))
-			{
-				FUniqueNetIdRepl PartyLeader(GetPartyLeader());
-
-				FPlayerReservation NewPlayerRes;
-				NewPlayerRes.UniqueId = NextApproval.SenderId;
-
-				TArray<FPlayerReservation> PlayersToAdd;
-				PlayersToAdd.Add(NewPlayerRes);
-
-				ReservationBeaconClient->RequestReservationUpdate(PartyLeader, PlayersToAdd);
-			}
-			else
-			{
-				UE_LOG(LogParty, Warning, TEXT("UPartyGameState::OnReservationBeaconUpdateResponseReceived: ReservationBeaconClient is null while trying to process more requests"));
-				RejectAllPendingJoinRequests();
-			}
-		}
-		else
-		{
-			CleanupReservationBeacon();
-		}
+		PumpApprovalQueue();
 	}
 	else
 	{
@@ -1589,6 +1616,7 @@ void UPartyGameState::CleanupReservationBeacon()
 	{
 		UE_LOG(LogParty, Verbose, TEXT("Party reservation beacon cleanup while in state %s, pending approvals: %s"), ToString(ReservationBeaconClient->GetConnectionState()), !PendingApprovals.IsEmpty() ? TEXT("true") : TEXT("false"));
 
+		LastReservationBeaconClientNetDriverName = ReservationBeaconClient->GetNetDriverName();
 		ReservationBeaconClient->OnHostConnectionFailure().Unbind();
 		ReservationBeaconClient->OnReservationRequestComplete().Unbind();
 		ReservationBeaconClient->OnReservationCountUpdate().Unbind();
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyMemberState.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyMemberState.cpp
index 3177b86b5604..6ec45f0bf769 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyMemberState.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Party/Private/PartyMemberState.cpp
@@ -78,4 +78,9 @@ void UPartyMemberState::Reset()
 	{
 		MemberStateRef->Reset();
 	}
+
+	if (MemberStateRefScratch)
+	{
+		MemberStateRefScratch->Reset();
+	}
 }
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/Party.h b/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/Party.h
index 6afcc14e8c0f..7d535598793e 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/Party.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/Party.h
@@ -49,9 +49,9 @@ struct FPartyDetails : public TSharedFromThis<FPartyDetails>
 		return PartyJoinInfo->GetPartyTypeId();
 	}
 
-	const TSharedRef<const FUniqueNetId>& GetLeaderId() const
+	const TSharedRef<const FUniqueNetId>& GetSourceUserId() const
 	{
-		return PartyJoinInfo->GetLeaderId();
+		return PartyJoinInfo->GetSourceUserId();
 	}
 
 	const FString& GetAppId() const
@@ -62,9 +62,9 @@ struct FPartyDetails : public TSharedFromThis<FPartyDetails>
 	virtual FString ToString() const
 	{
 		return FString::Printf(
-			TEXT("PartyId: %s LeaderId: %s App: %s"), 
+			TEXT("PartyId: %s SourceUserId: %s App: %s"), 
 			*GetPartyId()->ToDebugString(), 
-			*GetLeaderId()->ToDebugString(),
+			*GetSourceUserId()->ToDebugString(),
 			*GetAppId());
 	}
 
@@ -448,6 +448,8 @@ protected:
 	/** Array of leave persistent party delegates gathered while already leaving a persistent party */
 	TArray<UPartyDelegates::FOnLeaveUPartyComplete> LeavePartyCompleteDelegates;
 
+	virtual void PartyStateChanged(const FUniqueNetId& LocalUserId, const FOnlinePartyId& InPartyId, EPartyState State);
+
 private:
 
 	/** Is leaving the persistent party already in flight */
@@ -543,16 +545,15 @@ private:
 	void PartyMemberJoinedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& InMemberId);
 	void PartyDataReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const TSharedRef<FOnlinePartyData>& InPartyData);
 	void PartyMemberDataReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& InMemberId, const TSharedRef<FOnlinePartyData>& InPartyMemberData);
-	void PartyJoinRequestReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId);
-	void PartyQueryJoinabilityReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId);
+	void PartyJoinRequestReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData);
+	void PartyQueryJoinabilityReceivedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData);
+	virtual void PartyFillJoinRequestData(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, FOnlinePartyData& PartyData);
 	void PartyMemberPromotedInternal(const FUniqueNetId& InLocalUserId, const FOnlinePartyId& InPartyId, const FUniqueNetId& InNewLeaderId);
 	void PartyPromotionLockoutStateChangedInternal(const FUniqueNetId& LocalUserId, const FOnlinePartyId& InPartyId, const bool bLockoutState);
 
 	void PartyExitedInternal(const FUniqueNetId& LocalUserId, const FOnlinePartyId& InPartyId);
 	void OnPersistentPartyExitedInternalCompleted(const FUniqueNetId& LocalUserId, const ECreatePartyCompletionResult Result);
 
-	void PartyStateChanged(const FUniqueNetId& LocalUserId, const FOnlinePartyId& InPartyId, EPartyState State);
-
 	void LeavePersistentPartyForRejoin();
 	void OnLeavePersistentPartyForRejoinComplete(const FUniqueNetId& LocalUserId, const ELeavePartyCompletionResult LeaveResult);
 	void OnRejoinPartyComplete(const FUniqueNetId& LocalUserId, const FOnlinePartyId& PartyId, const EJoinPartyCompletionResult Result, int32 DeniedResultCode);
@@ -584,6 +585,7 @@ private:
 	FDelegateHandle PartyMemberDataReceivedDelegateHandle;
 	FDelegateHandle PartyJoinRequestReceivedDelegateHandle;
 	FDelegateHandle PartyQueryJoinabilityReceivedDelegateHandle;
+	FDelegateHandle PartyFillPartyJoinRequestDataDelegateHandle;
 	FDelegateHandle PartyMemberPromotedDelegateHandle;
 	FDelegateHandle PartyMemberExitedDelegateHandle;
 	FDelegateHandle PartyExitedDelegateHandle;
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/PartyGameState.h b/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/PartyGameState.h
index 2307b1f3f2f0..7fdbf5265411 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/PartyGameState.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Party/Public/PartyGameState.h
@@ -21,6 +21,7 @@ class APartyBeaconClient;
 class ULocalPlayer;
 class UParty;
 class UPartyMemberState;
+class UNetDriver;
 
 typedef FUniqueNetIdRepl FOnlinePartyIdRepl;
 class FOnlineSessionSearchResult;
@@ -63,7 +64,11 @@ enum class EJoinPartyDenialReason : uint8
 	/** Player is still in tutorials and no able to do invites */
 	NeedsTutorial,
 	/** Player is in a game mode that restricts joining */
-	GameModeRestricted
+	GameModeRestricted,
+	/** Player has crossplay restriction that would be violated */
+	JoinerCrossplayRestricted,
+	/** Party member has crossplay restriction that would be violated */
+	MemberCrossplayRestricted
 };
 
 enum class EApprovalAction : uint8
@@ -78,6 +83,17 @@ enum class EApprovalAction : uint8
 	Deny
 };
 
+UENUM()
+enum class ECrossplayPreference: uint8
+{
+	/** User has not made a selection */
+	NoSelection = 0,
+	/** User has opted in to crossplay */
+	OptedIn,
+	/** User has opted out of crossplay */
+	OptedOut
+};
+
 /**
  * Current state of the party
  */
@@ -373,7 +389,14 @@ public:
 	FOnInvitesDisabledChanged& OnInvitesDisabledChanged() { return InvitesDisabledChanged; }
 	/** @return delegate fired when the party configuration has changed */
 	FOnPartyConfigurationChanged& OnPartyConfigurationChanged() { return PartyConfigurationChanged; }
-	
+
+	/**
+	 * Is the specified net driver for our reservation beacon?
+	 * @param InNetDriver the net driver to test
+	 * @return true if the net driver is our reservation beacon's net driver
+	 */
+	bool IsNetDriverFromReservationBeacon(const UNetDriver* const InNetDriver) const;
+
 protected:
 
 	template<typename T>
@@ -409,7 +432,7 @@ protected:
 	const UScriptStruct* PartyStateRefDef;
 
 	/**
-	 * Pointer to child USTRUCT that holds the current state of party member (set via InitPartyMemberState)
+	 * Pointer to child USTRUCT that holds the current state of the party (set via InitPartyState)
 	 *
 	 * Cached data for the party, only modifiable by the party leader
 	 * Reference to the data structure defined in a child class
@@ -455,6 +478,12 @@ protected:
 	/** Reservation beacon client instance while getting approval for new party members*/
 	UPROPERTY(Transient)
 	APartyBeaconClient* ReservationBeaconClient;
+	/**
+	 * Last known reservation beacon client net driver name
+	 * Intended to be used to detect network errors related to our current or last reservation beacon client's net driver.
+	 * Some network error handlers may be called after we cleanup our beacon connection.
+	 */
+	FName LastReservationBeaconClientNetDriverName;
 
 	/**
 	 * Holds information about party members needing approval with the game server
@@ -463,6 +492,8 @@ protected:
 	{
 		FUniqueNetIdRepl RecipientId;
 		FUniqueNetIdRepl SenderId;
+		FString Platform;
+		TSharedPtr<const FOnlinePartyData> JoinData;
 	};
 
 	/** All currently pending approvals for new members */
@@ -486,7 +517,7 @@ protected:
 	/**
 	 * Common initialization for a newly instantiated party
 	 */
-	void Init(const FUniqueNetId& LocalUserId, TSharedPtr<const FOnlineParty>& InParty);
+	virtual void Init(const FUniqueNetId& LocalUserId, TSharedPtr<const FOnlineParty>& InParty);
 
 	/** Register for game related delegates that affect the party */
 	virtual void RegisterFrontendDelegates();
@@ -527,7 +558,7 @@ protected:
 	void SendLocalPlayerPartyData();
 
 	/** @return Is this player in a joinable game or no game at all (meant for local use only, remote perspective is elsewhere) */
-	virtual bool IsInJoinableGameState() const;
+	virtual bool IsGameSessionJoinable() const;
 
 	/**
 	 * Compare old party data to new party data, triggering appropriate delegates
@@ -622,27 +653,30 @@ protected:
 	 *
 	 * @param RecipientId whom this request is for (party leader)
 	 * @param SendingId whom this request is from
+	 * @param JoinData data the sender sent to help us make a decision about the sender's status
 	 */
-	void HandlePartyJoinRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId);
+	void HandlePartyJoinRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData);
 
 	/**
 	 * Called on the party leader to do a quick determination of whether the party is joinable
 	 *
 	 * @param RecipientId whom this request is for (party leader)
 	 * @param SendingId whom this request is from
+	 * @param JoinData data the sender sent to help us make a decision about the sender's status
 	 */
-	void HandlePartyQueryJoinabilityRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId);
+	void HandlePartyQueryJoinabilityRequestReceived(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData);
 
 	/**
 	 * Game specific decision making about party approvals
 	 *
 	 * @param RecipientId whom this request is for (party leader)
 	 * @param SendingId whom this request is from
+	 * @param JoinData data the sender sent to help us make a decision about the sender's status
 	 * @param [out] Reason for rejection, if applicable
 	 *
 	 * @return approval action for this join party request
 	 */
-	virtual EApprovalAction ProcessJoinRequest(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, EJoinPartyDenialReason& DenialReason) const;
+	virtual EApprovalAction ProcessJoinRequest(const FUniqueNetId& RecipientId, const FUniqueNetId& SenderId, const FString& Platform, const FOnlinePartyData& JoinData, EJoinPartyDenialReason& DenialReason) const;
 
 	/**
 	 * Unilaterally reject all pending join requests 
@@ -654,6 +688,11 @@ protected:
 	 * Only relevant while in an active game, not required while pre lobby / game
 	 */
 	void ConnectToReservationBeacon();
+
+	/**
+	 * Process any additional pending invitations
+	 */
+	void PumpApprovalQueue();
 	
 	/** Delegate fired when there is a failure to connect to the server reservation beacon */
 	void OnReservationBeaconUpdateConnectionFailure();
@@ -663,7 +702,7 @@ protected:
 	 *
 	 * @param ReservationResponse response from the server regarding a new party member's approval
 	 */
-	void OnReservationBeaconUpdateResponseReceived(EPartyReservationResult::Type ReservationResponse);
+	virtual void OnReservationBeaconUpdateResponseReceived(EPartyReservationResult::Type ReservationResponse);
 
 	/**
 	 * Delegate fired when there are reservation updates on the server (not used by party)
@@ -711,6 +750,8 @@ private:
 	friend UPartyMemberState;
 };
 
+PARTY_API bool GetCrossplayPreferenceFromJoinData(const FOnlinePartyData& JoinData, ECrossplayPreference& OutPreference);
+
 inline const TCHAR* ToString(EPartyType Type)
 {
 	switch (Type)
@@ -799,3 +840,14 @@ inline const TCHAR* ToString(EApprovalAction Type)
 	}
 	}
 }
+
+inline const TCHAR* LexToString(ECrossplayPreference Preference)
+{
+	switch (Preference)
+	{
+	case ECrossplayPreference::NoSelection: return TEXT("NoSelection");
+	case ECrossplayPreference::OptedIn: return TEXT("OptedIn");
+	case ECrossplayPreference::OptedOut: return TEXT("OptedOut");
+	}
+	return TEXT("Unknown");
+}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/PlayTimeLimit.Build.cs b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/PlayTimeLimit.Build.cs
new file mode 100644
index 000000000000..9aff7514d6f2
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/PlayTimeLimit.Build.cs
@@ -0,0 +1,26 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class PlayTimeLimit : ModuleRules
+{
+	public PlayTimeLimit(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+			}
+		);
+
+		PrivateDependencyModuleNames.AddRange(
+		new string[]
+			{
+				"OnlineSubsystem",
+			}
+		);
+	}
+}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitImpl.cpp b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitImpl.cpp
new file mode 100644
index 000000000000..0eef385d995f
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitImpl.cpp
@@ -0,0 +1,322 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "PlayTimeLimitImpl.h"
+
+#include "Containers/Ticker.h"
+#include "HAL/PlatformTime.h"
+#include "Features/IModularFeatures.h"
+
+#include "PlayTimeLimitModule.h"
+#include "PlayTimeLimitUser.h"
+#include "PlayTimeLimitUserMock.h"
+
+#include "UObject/CoreOnline.h"
+
+// FPlayTimeLimitImpl
+FPlayTimeLimitImpl::FPlayTimeLimitImpl()
+{
+}
+
+FPlayTimeLimitImpl::~FPlayTimeLimitImpl()
+{
+	Users.Empty();
+}
+
+FPlayTimeLimitImpl& FPlayTimeLimitImpl::Get()
+{
+	static FPlayTimeLimitImpl Singleton;	
+	return Singleton;
+}
+
+void FPlayTimeLimitImpl::Initialize()
+{
+	IModularFeatures::Get().RegisterModularFeature(GetModularFeatureName(), this);
+
+	// @todo make this data driven
+	ConfigRates.Emplace(0, 60, 1.0f); // Notify every hour, 100% rewards at 0 hours
+	ConfigRates.Emplace(3 * 60, 30, 0.5f); // Notify every 30 minutes, 50% rewards at 3 hours
+	ConfigRates.Emplace(5 * 60, 15, 0.0f); // Notify every 15 minutes, 0% rewards at 5 hours
+	// For simplicity of usage, sort by start time.
+	// @todo Uncomment when we make this data driven, with hard coded values we can ensure the order
+	ConfigRates.Sort([](const FOnlinePlayLimitConfigEntry& A, const FOnlinePlayLimitConfigEntry& B) { return A.TimeStartMinutes < B.TimeStartMinutes; });
+
+	if (ensure(!TickHandle.IsValid()))
+	{
+		// Register delegate for ticker callback
+		FTickerDelegate TickDelegate = FTickerDelegate::CreateRaw(this, &FPlayTimeLimitImpl::Tick);
+		TickHandle = FTicker::GetCoreTicker().AddTicker(TickDelegate, 0.0f);
+	}
+}
+
+void FPlayTimeLimitImpl::Shutdown()
+{
+	IModularFeatures::Get().UnregisterModularFeature(GetModularFeatureName(), this);
+
+	if (TickHandle.IsValid())
+	{
+		FTicker::GetCoreTicker().RemoveTicker(TickHandle);
+		TickHandle.Reset();
+	}
+}
+
+bool FPlayTimeLimitImpl::Tick(float DeltaTime)
+{
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FPlayTimeLimitImpl_Tick);
+	const bool bRetick = true;
+	if (Users.Num() == 0)
+	{
+		return bRetick;
+	}
+
+	// Perform logic periodically
+	static constexpr double TickFrequencySeconds = 1.0;
+	const double Now = FPlatformTime::Seconds();
+	if ((LastTickLogicTime == 0) || ((Now - LastTickLogicTime) > TickFrequencySeconds))
+	{
+		for (const TUniquePtr<FPlayTimeLimitUser>& User : Users)
+		{
+			User->Tick();
+			if (User->HasTimeLimit())
+			{
+				const float LastKnownRewardRate = User->GetLastKnownRewardRate();
+				const float RewardRate = User->GetRewardRate();
+				const TOptional<double> NextNotificationTime = User->GetNextNotificationTime();
+
+				const bool bRewardRateChanged = !FMath::IsNearlyEqual(LastKnownRewardRate, RewardRate);
+				const bool bShouldNotifyFromPeriodicReminder = NextNotificationTime.IsSet() && NextNotificationTime.GetValue() < Now;
+				const bool bShouldNotify = bRewardRateChanged || bShouldNotifyFromPeriodicReminder;
+
+				if (bRewardRateChanged)
+				{
+					User->SetLastKnownRewardRate(RewardRate);
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+					// Do we want this to log in shipping builds?
+					UE_LOG(LogPlayTimeLimit, Log, TEXT("FPlayTimeLimitImpl: User [%s] RewardRate changed from %0.2f to %0.2f"), *User->GetUserId()->ToDebugString(), LastKnownRewardRate, RewardRate);
+#endif // !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+				}
+
+				if (bShouldNotify)
+				{
+					const int32 PlayTimeMinutes = User->GetPlayTimeMinutes();
+					GetWarnUserPlayTimeDelegate().Broadcast(*User->GetUserId(), PlayTimeMinutes, RewardRate);
+					UpdateNextNotificationTime(*User, PlayTimeMinutes);
+				}
+			}
+		}
+		LastTickLogicTime = Now;
+	}
+	return bRetick;
+}
+
+void FPlayTimeLimitImpl::RegisterUser(FPlayTimeLimitUser* const NewUser)
+{
+	check(NewUser != nullptr);
+	if (!Users.ContainsByPredicate([NewUser](const TUniquePtr<FPlayTimeLimitUser>& User) { return *User->GetUserId() == *NewUser->GetUserId(); }))
+	{
+		const TUniquePtr<FPlayTimeLimitUser>& User = Users[Users.Emplace(NewUser)];
+		const int32 PlayTimeMinutes = User->GetPlayTimeMinutes();
+		UpdateNextNotificationTime(*User, PlayTimeMinutes);
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Log, TEXT("FPlayTimeLimitImpl: User [%s] already registered"), *NewUser->GetUserId()->ToDebugString());
+	}
+}
+
+void FPlayTimeLimitImpl::UnregisterUser(const FUniqueNetId& UserId)
+{
+	const int32 Index = Users.IndexOfByPredicate([&UserId](const TUniquePtr<FPlayTimeLimitUser>& User) { return *User->GetUserId() == UserId; });
+	if (Index != INDEX_NONE)
+	{
+		Users.RemoveAtSwap(Index);
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Log, TEXT("FPlayTimeLimitImpl: User [%s] not registered"), *UserId.ToDebugString());
+	}
+}
+
+void FPlayTimeLimitImpl::MockUser(const FUniqueNetId& UserId, const bool bHasTimeLimit, const double CurrentPlayTimeMinutes)
+{
+#if ALLOW_PLAY_LIMIT_MOCK
+	const int32 ExistingIndex = Users.IndexOfByPredicate([&UserId](const TUniquePtr<FPlayTimeLimitUser>& User) { return *User->GetUserId() == UserId; });
+	if (ExistingIndex != INDEX_NONE)
+	{
+		Users.RemoveAtSwap(ExistingIndex);
+		const TUniquePtr<FPlayTimeLimitUser>& User = Users[Users.Emplace(new FPlayTimeLimitUserMock(UserId.AsShared(), bHasTimeLimit, CurrentPlayTimeMinutes))];
+		// Hacky solution to try to line up the next notification time based on the new play time minutes
+		// Pretend the user logged in at 0 minutes, so that notifications happen at exactly 60 minutes, 120 minutes, etc
+		// The behavior of the real system is 60 minutes (etc) from login time, because WeGame does not tell us the exact number of minutes the player has played
+		const FOnlinePlayLimitConfigEntry* ConfigRate = nullptr;
+		if (User->HasTimeLimit())
+		{
+			ConfigRate = GetConfigEntry(static_cast<int32>(CurrentPlayTimeMinutes));
+		}
+		if (ConfigRate)
+		{
+			User->SetLastKnownRewardRate(ConfigRate->RewardRate);
+		}
+		double SecondsToNextNotification = 0;
+		if (ConfigRate && ConfigRate->NotificationRateMinutes != 0)
+		{
+			const double NumMinutesInBracketAlready = CurrentPlayTimeMinutes - ConfigRate->TimeStartMinutes;
+			const int32 NumNotificationsInBracketAlready = static_cast<int32>(NumMinutesInBracketAlready) / ConfigRate->NotificationRateMinutes;
+			const double NowSeconds = FPlatformTime::Seconds();
+			const double BracketStartTime = NowSeconds - (NumMinutesInBracketAlready * 60);
+			const double NextNotificationTime = BracketStartTime + ((NumNotificationsInBracketAlready + 1) * ConfigRate->NotificationRateMinutes * 60);
+			User->SetNextNotificationTime(NextNotificationTime);
+
+			SecondsToNextNotification = (NextNotificationTime - NowSeconds);
+		}
+		else
+		{
+			User->SetNextNotificationTime(TOptional<double>());
+		}
+		UE_LOG(LogPlayTimeLimit, Log, TEXT("MockUser: UserId=%s, bHasTimeLimit=%s, CurrentPlayTimeMinutes=%d, SecondsToNextNotification=%d"), *UserId.ToDebugString(), bHasTimeLimit ? TEXT("true") : TEXT("false"), static_cast<int32>(CurrentPlayTimeMinutes), static_cast<int32>(SecondsToNextNotification));
+	}
+#endif
+}
+
+void FPlayTimeLimitImpl::NotifyNow()
+{
+	// Well... on next Tick
+	LastTickLogicTime = 0.0;
+	double Now = FPlatformTime::Seconds();
+	for (const TUniquePtr<FPlayTimeLimitUser>& User : Users)
+	{
+		User->SetNextNotificationTime(Now);
+	}
+}
+
+void FPlayTimeLimitImpl::DumpState()
+{
+	UE_LOG(LogPlayTimeLimit, Display, TEXT("FPlayTimeLimitImpl::DumpState: Begin"));
+	if (Users.Num() != 0)
+	{
+		const double Now = FPlatformTime::Seconds();
+		for (const TUniquePtr<FPlayTimeLimitUser>& User : Users)
+		{
+			FString NextNotificationTimeString;
+			const TOptional<double> NextNotificationTime = User->GetNextNotificationTime();
+			if (NextNotificationTime.IsSet())
+			{
+				double SecondsToNextNotification = NextNotificationTime.GetValue() - Now;
+				NextNotificationTimeString = FPlatformTime::PrettyTime(SecondsToNextNotification);
+			}
+			else
+			{
+				NextNotificationTimeString = TEXT("n/a");
+			}
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("  User [%s]"), *User->GetUserId()->ToDebugString());
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("    HasTimeLimit: [%s]"), User->HasTimeLimit() ? TEXT("true") : TEXT("false"));
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("    NextNotificationTime: [%s]"), *NextNotificationTimeString);
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("    LastKnownRewardRate: %0.2f"), User->GetLastKnownRewardRate());
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("    RewardRate: %0.2f"), User->GetRewardRate());
+			UE_LOG(LogPlayTimeLimit, Display, TEXT("    PlayTimeMinutes: %d"), User->GetPlayTimeMinutes());
+		}
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Display, TEXT("No users"));
+	}
+	UE_LOG(LogPlayTimeLimit, Display, TEXT("FPlayTimeLimitImpl::DumpState: End"));
+}
+
+bool FPlayTimeLimitImpl::HasTimeLimit(const FUniqueNetId& UserId)
+{
+	bool bHasTimeLimit = false;
+	const TUniquePtr<FPlayTimeLimitUser>* const User = Users.FindByPredicate([&UserId](const TUniquePtr<FPlayTimeLimitUser>& ExistingUser) { return *ExistingUser->GetUserId() == UserId; });
+	if (User != nullptr)
+	{
+		bHasTimeLimit = (*User)->HasTimeLimit();
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Warning, TEXT("HasTimeLimit: UserId [%s] is not registered"), *UserId.ToDebugString());
+	}
+	return bHasTimeLimit;
+}
+
+int32 FPlayTimeLimitImpl::GetPlayTimeMinutes(const FUniqueNetId& UserId)
+{
+	int32 PlayTimeMinutes = 0;
+	const TUniquePtr<FPlayTimeLimitUser>* const User = Users.FindByPredicate([&UserId](const TUniquePtr<FPlayTimeLimitUser>& ExistingUser) { return *ExistingUser->GetUserId() == UserId; });
+	if (User != nullptr)
+	{
+		PlayTimeMinutes = (*User)->GetPlayTimeMinutes();
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Warning, TEXT("GetPlayTimeMinutes: UserId [%s] is not registered"), *UserId.ToDebugString());
+	}
+	return PlayTimeMinutes;
+}
+
+float FPlayTimeLimitImpl::GetRewardRate(const FUniqueNetId& UserId)
+{
+	float RewardRate = 1.0f;
+	const TUniquePtr<FPlayTimeLimitUser>* const User = Users.FindByPredicate([&UserId](const TUniquePtr<FPlayTimeLimitUser>& ExistingUser) { return *ExistingUser->GetUserId() == UserId; });
+	if (User != nullptr)
+	{
+		RewardRate = (*User)->GetLastKnownRewardRate();
+	}
+	else
+	{
+		UE_LOG(LogPlayTimeLimit, Warning, TEXT("GetRewardRate: UserId [%s] is not registered"), *UserId.ToDebugString());
+	}
+	if (RewardRate > 1.0f || RewardRate < 0.0f)
+	{
+		// Warn once if we find something suspicious
+		static bool bWarned = false;
+		if (!bWarned)
+		{
+			const int32 PlayTimeMinutes = GetPlayTimeMinutes(UserId);
+			UE_LOG(LogPlayTimeLimit, Warning, TEXT("GetRewardRate: Received RewardRate=%0.2f (Expected range: [0.0, 1.0]). PlayTimeMinutes=%d. Clamping to the expected range."), RewardRate, PlayTimeMinutes);
+			bWarned = true;
+		}
+		RewardRate = FMath::Clamp(RewardRate, 0.0f, 1.0f);
+	}
+	return RewardRate;
+}
+
+FWarnUserPlayTime& FPlayTimeLimitImpl::GetWarnUserPlayTimeDelegate()
+{
+	return WarnUserPlayTimeDelegate;
+}
+
+const FOnlinePlayLimitConfigEntry* FPlayTimeLimitImpl::GetConfigEntry(const int32 PlayTimeMinutes) const
+{
+	const FOnlinePlayLimitConfigEntry* Result = nullptr;
+	// Find the first entry that has a time start greater than the number of minutes played
+	// Note that the list is already sorted by TimeStartMinutes
+	for (const FOnlinePlayLimitConfigEntry& ConfigRate : ConfigRates)
+	{
+		if (PlayTimeMinutes >= ConfigRate.TimeStartMinutes)
+		{
+			// If we played this long, we are least this limited.  No break, next limit might also apply to us
+			Result = &ConfigRate;
+		}
+		else
+		{
+			break;
+		}
+	}
+	return Result;
+}
+
+void FPlayTimeLimitImpl::UpdateNextNotificationTime(FPlayTimeLimitUser& User, const int32 PlayTimeMinutes) const
+{
+	const FOnlinePlayLimitConfigEntry* ConfigRate = nullptr;
+	if (User.HasTimeLimit())
+	{
+		ConfigRate = GetConfigEntry(PlayTimeMinutes);
+	}
+	if (ConfigRate && ConfigRate->NotificationRateMinutes != 0)
+	{
+		User.SetNextNotificationTime(FPlatformTime::Seconds() + (ConfigRate->NotificationRateMinutes * 60));
+	}
+	else
+	{
+		User.SetNextNotificationTime(TOptional<double>());
+	}
+}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitModule.cpp b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitModule.cpp
new file mode 100644
index 000000000000..56830df9c126
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitModule.cpp
@@ -0,0 +1,95 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "PlayTimeLimitModule.h"
+
+#include "PlayTimeLimitImpl.h"
+
+#include "OnlineSubsystem.h"
+#include "Interfaces/OnlineIdentityInterface.h"
+#include "Misc/ConfigCacheIni.h"
+
+IMPLEMENT_MODULE(FPlayTimeLimitModule, PlayTimeLimit);
+
+DEFINE_LOG_CATEGORY(LogPlayTimeLimit);
+
+void FPlayTimeLimitModule::StartupModule()
+{
+	GConfig->GetBool(TEXT("PlayTimeLimit"), TEXT("bEnabled"), bPlayTimeLimitEnabled, GEngineIni);
+	if (bPlayTimeLimitEnabled)
+	{
+		FPlayTimeLimitImpl::Get().Initialize();
+	}
+}
+
+void FPlayTimeLimitModule::ShutdownModule()
+{
+	if (bPlayTimeLimitEnabled)
+	{
+		FPlayTimeLimitImpl::Get().Shutdown();
+	}
+}
+
+bool FPlayTimeLimitModule::Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar)
+{
+	bool bWasHandled = false;
+
+	// Ignore any execs that don't start with PlayTimeLimit
+	if (FParse::Command(&Cmd, TEXT("PlayTimeLimit")))
+	{
+		if (bPlayTimeLimitEnabled)
+		{
+			bWasHandled = true; // Set to false in the catch-all else block
+			FPlayTimeLimitImpl& PlayTimeLimit = FPlayTimeLimitImpl::Get();
+			if (FParse::Command(&Cmd, TEXT("DUMP")))
+			{
+				PlayTimeLimit.DumpState();
+			}
+			else if (FParse::Command(&Cmd, TEXT("NOTIFYNOW")))
+			{
+				PlayTimeLimit.NotifyNow();
+			}
+			else if (FParse::Command(&Cmd, TEXT("SETUSERLIMITS")))
+			{
+				// Usage: SETUSERLIMITS <usernum> <has limit = [true, false]> <current play time limits>
+				const int32 LocalUserNum = FCString::Atoi(*FParse::Token(Cmd, false));
+				const bool bHasLimit = FCString::ToBool(*FParse::Token(Cmd, false));
+				const double CurrentPlayTimeMinutes = FCString::Atof(*FParse::Token(Cmd, false));
+
+				IOnlineSubsystem* const OnlineSubsystem = IOnlineSubsystem::Get();
+				if (OnlineSubsystem)
+				{
+					const IOnlineIdentityPtr IdentityInt = OnlineSubsystem->GetIdentityInterface();
+					if (IdentityInt.IsValid())
+					{
+						const TSharedPtr<const FUniqueNetId> UserId = IdentityInt->GetUniquePlayerId(LocalUserNum);
+						if (UserId.IsValid())
+						{
+							PlayTimeLimit.MockUser(*UserId, bHasLimit, CurrentPlayTimeMinutes);
+						}
+						else
+						{
+							UE_LOG(LogPlayTimeLimit, Warning, TEXT("SETUSERLIMITS: Could not get player id from user num=%d, ensure you are logged in first"), LocalUserNum);
+						}
+					}
+					else
+					{
+						UE_LOG(LogPlayTimeLimit, Warning, TEXT("SETUSERLIMITS: Missing Identity interface"));
+					}
+				}
+				else
+				{
+					UE_LOG(LogPlayTimeLimit, Warning, TEXT("SETUSERLIMITS: Missing OnlineSubsystem"));
+				}
+			}
+			else
+			{
+				bWasHandled = false;
+			}
+		}
+		else
+		{
+			UE_LOG(LogPlayTimeLimit, Warning, TEXT("PlayTimeLimit is not enabled by config file"));
+		}
+	}
+	return bWasHandled;
+}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitUserMock.cpp b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitUserMock.cpp
new file mode 100644
index 000000000000..40cdf4db50df
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Private/PlayTimeLimitUserMock.cpp
@@ -0,0 +1,48 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "PlayTimeLimitUserMock.h"
+#include "PlayTimeLimitImpl.h"
+
+#if ALLOW_PLAY_LIMIT_MOCK
+
+FPlayTimeLimitUserMock::FPlayTimeLimitUserMock(const TSharedRef<const FUniqueNetId>& InUserId, const bool bInHasTimeLimit, const double InPlayTimeMinutes)
+	: FPlayTimeLimitUser(InUserId)
+	, bHasTimeLimit(bInHasTimeLimit)
+	, PlayTimeMinutesStart(InPlayTimeMinutes)
+	, TimeOverrideSet(FPlatformTime::Seconds())
+{
+}
+
+bool FPlayTimeLimitUserMock::HasTimeLimit() const
+{
+	return bHasTimeLimit;
+}
+
+int32 FPlayTimeLimitUserMock::GetPlayTimeMinutes() const
+{
+	int32 PlayTimeMinutes = 0;
+	// Only track number of minutes played for users that have a limit
+	if (bHasTimeLimit)
+	{
+		const double Now(FPlatformTime::Seconds());
+		PlayTimeMinutes = static_cast<int32>(PlayTimeMinutesStart + ((Now - TimeOverrideSet) / 60.0));
+	}
+	return PlayTimeMinutes;
+}
+
+float FPlayTimeLimitUserMock::GetRewardRate() const
+{
+	float RewardRate = 1.0f;
+	if (bHasTimeLimit)
+	{
+		const int32 PlayTimeMinutes = GetPlayTimeMinutes();
+		const FOnlinePlayLimitConfigEntry* const ConfigEntry = FPlayTimeLimitImpl::Get().GetConfigEntry(PlayTimeMinutes);
+		if (ConfigEntry != nullptr)
+		{
+			RewardRate = ConfigEntry->RewardRate;
+		}
+	}
+	return RewardRate;
+}
+
+#endif // ALLOW_PLAY_LIMIT_MOCK
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitImpl.h b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitImpl.h
new file mode 100644
index 000000000000..1282d9a706b0
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitImpl.h
@@ -0,0 +1,133 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Interfaces/OnlinePlayTimeLimit.h"
+#include "PlayTimeLimitUser.h"
+
+/**
+ * Configuration
+ */
+struct FOnlinePlayLimitConfigEntry
+{
+	/** Constructor */
+	FOnlinePlayLimitConfigEntry(int32 InTimeStartMinutes, int32 InNotificationRateMinutes, float InRewardRate)
+		: TimeStartMinutes(InTimeStartMinutes)
+		, NotificationRateMinutes(InNotificationRateMinutes)
+		, RewardRate(InRewardRate)
+	{}
+
+	/** Number of minutes the user must play before this is effective */
+	int32 TimeStartMinutes;
+	/** Number of minutes between notifications to the user about their play time */
+	int32 NotificationRateMinutes;
+	/** Reward rate at this limit */
+	float RewardRate;
+};
+
+/**
+ * Implementation of IOnlinePlayTimeLimit
+ */
+class PLAYTIMELIMIT_API FPlayTimeLimitImpl
+	: public IOnlinePlayTimeLimit
+{
+public:
+	// FPlayTimeLimitImpl
+
+	/** Default constructor */
+	FPlayTimeLimitImpl();
+	/** Destructor */
+	virtual ~FPlayTimeLimitImpl();
+
+	/**
+	 * Get the singleton
+	 * @return Singleton instance
+	 */
+	static FPlayTimeLimitImpl& Get();
+	
+	/**
+	 * Initialize
+	 */
+	void Initialize();
+
+	/**
+	 * Shutdown
+	 */
+	void Shutdown();
+
+	/**
+	 * Tick - update users and execute warn time delegates
+	 */
+	bool Tick(float Delta);
+
+	/**
+	 * Register a user to monitor their play time
+	 * @see UnregisterUser
+	 * @param NewUser the user to register
+	 */
+	void RegisterUser(FPlayTimeLimitUser* const NewUser);
+
+	/**
+	 * Unregister a user
+	 * @see RegisterUser
+	 * @param UserId the user id
+	 */
+	void UnregisterUser(const FUniqueNetId& UserId);
+
+	/**
+	 * Override a user's play time
+	 * For testing the system without needing to potentially wait hours - waiting to accumulate time and waiting for the time to reset
+	 */
+	void MockUser(const FUniqueNetId& UserId, const bool bHasTimeLimit, const double CurrentPlayTimeMinutes);
+
+	/**
+	 * Cheat function to trigger the notification to players of their play time immediately
+	 */
+	void NotifyNow();
+	
+	// Begin IOnlinePlayTimeLimit
+	virtual bool HasTimeLimit(const FUniqueNetId& UserId) override;
+	virtual int32 GetPlayTimeMinutes(const FUniqueNetId& UserId) override;
+	virtual float GetRewardRate(const FUniqueNetId& UserId) override;
+	virtual FWarnUserPlayTime& GetWarnUserPlayTimeDelegate() override;
+	// End IOnlinePlayTimeLimit
+
+	/**
+	 * Get the config entry that corresponds to the number of minutes played
+	 * @param PlayTimeMinutes the number of minutes played to get the entry for
+	 * @return the entry corresponding to the number of minutes played
+	 */
+	const FOnlinePlayLimitConfigEntry* GetConfigEntry(const int32 PlayTimeMinutes) const;
+
+	/**
+	 * Dump state to log
+	 */
+	void DumpState();
+
+protected:
+	/**
+	 * Update the next notification time for a user based on their current play time
+	 * @param User the user to update
+	 */
+	void UpdateNextNotificationTime(FPlayTimeLimitUser& User, const int32 PlayTimeMinutes) const;
+
+	/** Delegate used to display a warning to the user about their play time */
+	FWarnUserPlayTime WarnUserPlayTimeDelegate;
+
+	/** List of users we are monitoring */
+	TArray<TUniquePtr<FPlayTimeLimitUser>> Users;
+
+	/** Last time we performed tick logic */
+	double LastTickLogicTime = 0.0;
+
+	/** Configuration to control notification rate at different levels of play time */
+	TArray<FOnlinePlayLimitConfigEntry> ConfigRates;
+
+	/** Delegate for callbacks to Tick */
+	FDelegateHandle TickHandle;
+
+private:
+	// Not copyable
+	FPlayTimeLimitImpl(const FPlayTimeLimitImpl& Other) = delete;
+	FPlayTimeLimitImpl& operator=(FPlayTimeLimitImpl& Other) = delete;
+};
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitModule.h b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitModule.h
new file mode 100644
index 000000000000..2ee8fe10cfc5
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitModule.h
@@ -0,0 +1,64 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Stats/Stats.h"
+#include "Misc/CoreMisc.h"
+#include "Modules/ModuleInterface.h"
+#include "Modules/ModuleManager.h"
+
+PLAYTIMELIMIT_API DECLARE_LOG_CATEGORY_EXTERN(LogPlayTimeLimit, Log, All);
+
+/**
+ * Module for reducing rewards based on play time
+ */
+class FPlayTimeLimitModule : 
+	public IModuleInterface, public FSelfRegisteringExec
+{
+
+public:
+	// FSelfRegisteringExec
+	virtual bool Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar) override;
+
+	/**
+	 * Singleton-like access to this module's interface.  This is just for convenience!
+	 * Beware of calling this during the shutdown phase, though.  Your module might have been unloaded already.
+	 *
+	 * @return Returns singleton instance, loading the module on demand if needed
+	 */
+	static inline FPlayTimeLimitModule& Get()
+	{
+		return FModuleManager::LoadModuleChecked<FPlayTimeLimitModule>("PlayTimeLimit");
+	}
+
+	/**
+	 * Checks to see if this module is loaded and ready.  It is only valid to call Get() if IsAvailable() returns true.
+	 *
+	 * @return True if the module is loaded and ready to use
+	 */
+	static inline bool IsAvailable()
+	{
+		return FModuleManager::Get().IsModuleLoaded("PlayTimeLimit");
+	}
+
+private:
+
+	// IModuleInterface
+
+	/**
+	 * Called when party module is loaded
+	 * Initialize platform specific parts of voice handling
+	 */
+	virtual void StartupModule() override;
+	
+	/**
+	 * Called when party module is unloaded
+	 * Shutdown platform specific parts of voice handling
+	 */
+	virtual void ShutdownModule() override;
+
+	/** Is this feature enabled? */
+	bool bPlayTimeLimitEnabled = false;
+};
+
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUser.h b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUser.h
new file mode 100644
index 000000000000..12be3a79c7bf
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUser.h
@@ -0,0 +1,91 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/CoreOnline.h"
+
+/**
+ * Information about a user we are observing the play time and instituting limits for
+ */
+class PLAYTIMELIMIT_API FPlayTimeLimitUser
+{
+public:
+	/** Constructor */
+	explicit FPlayTimeLimitUser(const TSharedRef<const FUniqueNetId>& InUserId)
+		: UserId(InUserId)
+		, NextNotificationTime(0)
+		, LastKnownRewardRate(0.0f)
+	{}
+
+	virtual void Init()
+	{
+		LastKnownRewardRate = GetRewardRate();
+	}
+
+	/** Destructor */
+	virtual ~FPlayTimeLimitUser() = default;
+
+	/**
+	 * Get the user's unique id
+	 * @return the user's unique id
+	 */
+	TSharedRef<const FUniqueNetId> GetUserId() const { return UserId; }
+
+	/**
+	 * Tick
+	 */
+	virtual void Tick() {}
+	
+	/**
+	 * Check if the user has a play time limit
+	 * @return if this user has a play time limit
+	 */
+	virtual bool HasTimeLimit() const = 0;
+
+	/**
+	 * Get the number of minutes this user has played
+	 * @return number of minutes this user has played
+	 */
+	virtual int32 GetPlayTimeMinutes() const = 0;
+
+	/**
+	 * Get the current reward rate
+	 * @return the current reward rate
+	 */
+	virtual float GetRewardRate() const = 0;
+
+	/**
+	 * Get the next time we are scheduled to send the user a notification
+	 * This is for the periodic notification; if the reward rate changes we will immediately display a notification
+	 * @return the time (compared to FPlatformTime::Seconds()) for the next notification, or empty if this user should not receive periodic notifications
+	 */
+	TOptional<double> GetNextNotificationTime() const { return NextNotificationTime; }
+
+	/**
+	 * Set the next time to send the user a notification
+	 * @see GetNextNotificationTime
+	 * @param InNextNotificationTime the next notification time, or empty if this user should not receive periodic notifications
+	 */
+	void SetNextNotificationTime(const TOptional<double>& InNextNotificationTime) { NextNotificationTime = InNextNotificationTime; }
+
+	/**
+	 * Get the last known reward rate
+	 * @return the last known reward rate
+	 */
+	float GetLastKnownRewardRate() const { return LastKnownRewardRate; }
+
+	/**
+	 * Set the last known reward rate
+	 * @param InLastKnownRewardRate the last known reward rate
+	 */
+	void SetLastKnownRewardRate(float InLastKnownRewardRate) { LastKnownRewardRate = InLastKnownRewardRate; }
+
+protected:
+	/** The user id */
+	TSharedRef<const FUniqueNetId> UserId;
+	/** Time for the next notification (or empty for no notification) */
+	TOptional<double> NextNotificationTime;
+	/** Last known reward rate so we can alert on changes */
+	float LastKnownRewardRate;
+};
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUserMock.h b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUserMock.h
new file mode 100644
index 000000000000..d1144b3d999d
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineFramework/Source/PlayTimeLimit/Public/PlayTimeLimitUserMock.h
@@ -0,0 +1,35 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "PlayTimeLimitUser.h"
+
+#if !defined ALLOW_PLAY_LIMIT_MOCK
+#define ALLOW_PLAY_LIMIT_MOCK (!(UE_BUILD_SHIPPING))
+#endif
+
+#if ALLOW_PLAY_LIMIT_MOCK
+/**
+ * Mock implementation of FPlayTimeLimitUser
+ */
+class FPlayTimeLimitUserMock
+	: public FPlayTimeLimitUser
+{
+public:
+	FPlayTimeLimitUserMock(const TSharedRef<const FUniqueNetId>& InUserId, const bool bInHasTimeLimit, const double InPlayTimeMinutes);
+
+	//~ Begin FPlayTimeLimitUser Interface
+	virtual bool HasTimeLimit() const override;
+	virtual int32 GetPlayTimeMinutes() const override;
+	virtual float GetRewardRate() const override;
+	//~ End FPlayTimeLimitUser Interface
+	
+protected:
+	/** Do the time limits apply to the user? */
+	const bool bHasTimeLimit;
+	/** Override time played. Effective time played is PlayTimeMinutesStart + (Now - TimeOverrideSet) */
+	const double PlayTimeMinutesStart;
+	/** The time this override was set. Effective time played is PlayTimeMinutesStart + (Now - TimeOverrideSet) */
+	const double TimeOverrideSet;
+};
+#endif // ALLOW_PLAY_LIMIT_MOCK
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosInterface.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosInterface.cpp
index fea21f3942c0..91c886f71698 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosInterface.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosInterface.cpp
@@ -93,3 +93,9 @@ void FQosInterface::DumpRegionStats()
 	check(RegionManager);
 	return RegionManager->DumpRegionStats();
 }
+
+void FQosInterface::RegisterQoSSettingsChangedDelegate(const FSimpleDelegate& OnQoSSettingsChanged)
+{
+	check(RegionManager);
+	RegionManager->RegisterQoSSettingsChangedDelegate(OnQoSSettingsChanged);
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosRegionManager.cpp b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosRegionManager.cpp
index 482e6dc27bd6..4abb3ae90991 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosRegionManager.cpp
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Private/QosRegionManager.cpp
@@ -95,6 +95,8 @@ void UQosRegionManager::PostReloadConfig(UProperty* PropertyThatWasLoaded)
 			}
 		}
 
+		OnQoSSettingsChangedDelegate.ExecuteIfBound();
+
 		// Validate the current region selection
 		TrySetDefaultRegion();
 	}
@@ -450,3 +452,9 @@ void UQosRegionManager::DumpRegionStats()
 		UE_LOG(LogQos, Display, TEXT("\tEnabled: %d Visible: %d Beta: %d Result: %s"), Region.Region.bEnabled, Region.Region.bVisible, Region.Region.bBeta, ToString(Region.Result));
 	}
 }
+
+void UQosRegionManager::RegisterQoSSettingsChangedDelegate(const FSimpleDelegate& OnQoSSettingsChanged)
+{
+	// add to the completion delegate
+	OnQoSSettingsChangedDelegate = OnQoSSettingsChanged;
+}
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosInterface.h b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosInterface.h
index fb11aa792134..cb6454f6afba 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosInterface.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosInterface.h
@@ -87,6 +87,11 @@ public:
 	 */
 	void DumpRegionStats();
 
+	/**
+	* Register a delegate to be called when QoS settings have changed.
+	*/
+	void RegisterQoSSettingsChangedDelegate(const FSimpleDelegate& OnQoSSettingsChanged);
+
 protected:
 
 	friend class FQosModule;
diff --git a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosRegionManager.h b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosRegionManager.h
index 9c021e64beed..dfc4f66013c5 100644
--- a/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosRegionManager.h
+++ b/Engine/Plugins/Online/OnlineFramework/Source/Qos/Public/QosRegionManager.h
@@ -254,6 +254,8 @@ public:
 	 */
 	void DumpRegionStats();
 
+	void RegisterQoSSettingsChangedDelegate(const FSimpleDelegate& OnQoSSettingsChanged);
+
 public:
 
 	/** Begin UObject interface */
@@ -314,5 +316,6 @@ private:
 	FString SelectedRegionId;
 
 	TArray<FSimpleDelegate> OnQosEvalCompleteDelegate;
+	FSimpleDelegate OnQoSSettingsChangedDelegate;
 };
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/LANBeacon.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/LANBeacon.cpp
index 1650794aa10e..99d481d2726a 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/LANBeacon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/LANBeacon.cpp
@@ -65,13 +65,13 @@ bool FLanBeacon::Init(int32 Port)
 		}
 		else
 		{
-			UE_LOG(LogOnline, Error, TEXT("Failed to bind listen socket to addr (%s) for LAN beacon"),
+			UE_LOG_ONLINE(Error, TEXT("Failed to bind listen socket to addr (%s) for LAN beacon"),
 				*ListenAddr->ToString(true));
 		}
 	}
 	else
 	{
-		UE_LOG(LogOnline, Error, TEXT("Failed to create listen socket for LAN beacon"));
+		UE_LOG_ONLINE(Error, TEXT("Failed to create listen socket for LAN beacon"));
 	}
 	return bSuccess && ListenSocket;
 }
@@ -96,7 +96,7 @@ int32 FLanBeacon::ReceivePacket(uint8* PacketData, int32 BufferSize)
 		ListenSocket->RecvFrom(PacketData, BufferSize, BytesRead, *SockAddr);
 		if (BytesRead > 0)
 		{
-			UE_LOG(LogOnline, Verbose, TEXT("Received %d bytes from %s"), BytesRead, *SockAddr->ToString(true));
+			UE_LOG_ONLINE(Verbose, TEXT("Received %d bytes from %s"), BytesRead, *SockAddr->ToString(true));
 		}
 	}
 
@@ -112,7 +112,7 @@ int32 FLanBeacon::ReceivePacket(uint8* PacketData, int32 BufferSize)
 bool FLanBeacon::BroadcastPacket(uint8* Packet, int32 Length)
 {
 	int32 BytesSent = 0;
-	UE_LOG(LogOnline, Verbose, TEXT("Sending %d bytes to %s"), Length, *BroadcastAddr->ToString(true));
+	UE_LOG_ONLINE(Verbose, TEXT("Sending %d bytes to %s"), Length, *BroadcastAddr->ToString(true));
 	return ListenSocket->SendTo(Packet, Length, BytesSent, *BroadcastAddr) && (BytesSent == Length);
 }
 
@@ -135,11 +135,11 @@ bool FLANSession::Host(FOnValidQueryPacketDelegate& QueryDelegate)
 		// We successfully created everything so mark the socket as needing polling
 		LanBeaconState = ELanBeaconState::Hosting;
 		bSuccess = true;
-		UE_LOG(LogOnline, Verbose, TEXT("Listening for LAN beacon requests on %d"),	LanAnnouncePort);
+		UE_LOG_ONLINE(Verbose, TEXT("Listening for LAN beacon requests on %d"),	LanAnnouncePort);
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to init to LAN beacon %s"),	ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
+		UE_LOG_ONLINE(Warning, TEXT("Failed to init to LAN beacon %s"),	ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
 	}
 	
 	return bSuccess;
@@ -163,7 +163,7 @@ bool FLANSession::Search(FNboSerializeToBuffer& Packet, FOnValidResponsePacketDe
 	LanBeacon = new FLanBeacon();
 	if (LanBeacon->Init(LanAnnouncePort) == false)
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to create socket for lan announce port %s"), ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
+		UE_LOG_ONLINE(Warning, TEXT("Failed to create socket for lan announce port %s"), ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
 		bSuccess = false;
 	}
 
@@ -173,7 +173,7 @@ bool FLANSession::Search(FNboSerializeToBuffer& Packet, FOnValidResponsePacketDe
 		// Now kick off our broadcast which hosts will respond to
 		if (LanBeacon->BroadcastPacket(Packet, Packet.GetByteCount()))
 		{
-			UE_LOG(LogOnline, Verbose, TEXT("Sent query packet..."));
+			UE_LOG_ONLINE(Verbose, TEXT("Sent query packet..."));
 			// We need to poll for the return packets
 			LanBeaconState = ELanBeaconState::Searching;
 			// Set the timestamp for timing out a search
@@ -184,7 +184,7 @@ bool FLANSession::Search(FNboSerializeToBuffer& Packet, FOnValidResponsePacketDe
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Failed to send discovery broadcast %s"), ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
+			UE_LOG_ONLINE(Warning, TEXT("Failed to send discovery broadcast %s"), ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetSocketError());
 			bSuccess = false;
 		}
 	}
@@ -306,7 +306,7 @@ bool FLANSession::BroadcastPacket(uint8* Packet, int32 Length)
 		bSuccess = LanBeacon->BroadcastPacket(Packet, Length);
 		if (!bSuccess)
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Failed to send broadcast packet %d"), (int32)ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetLastErrorCode());
+			UE_LOG_ONLINE(Warning, TEXT("Failed to send broadcast packet %d"), (int32)ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->GetLastErrorCode());
 		}
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/NamedInterfaces.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/NamedInterfaces.cpp
index 4abfbd1aabc2..ab1a16a2c095 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/NamedInterfaces.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/NamedInterfaces.cpp
@@ -33,14 +33,14 @@ void UNamedInterfaces::Initialize()
 			// Set the object and interface names
 			Interface.InterfaceName = Def.InterfaceName;
 			Interface.InterfaceObject = NewObject<UObject>(GetTransientPackage(), Class);
-			UE_LOG(LogOnline, Display,
+			UE_LOG_ONLINE(Display,
 				TEXT("Created named interface (%s) of type (%s)"),
 				*Def.InterfaceName.ToString(),
 				*Def.InterfaceClassName);
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning,
+			UE_LOG_ONLINE(Warning,
 				TEXT("Failed to load class (%s) for named interface (%s)"),
 				*Def.InterfaceClassName,
 				*Def.InterfaceName.ToString());
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineAsyncTaskManager.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineAsyncTaskManager.cpp
index 58e5d79ae1cf..7bf495f0b420 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineAsyncTaskManager.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineAsyncTaskManager.cpp
@@ -175,7 +175,7 @@ void FOnlineAsyncTaskManager::GameTick()
 #if !UE_BUILD_SHIPPING
 			if (TimeToWait > 0.0f)
 			{
-				UE_LOG(LogOnline, Verbose, TEXT("Async task '%s' finalizing after %f seconds"),
+				UE_LOG_ONLINE(Verbose, TEXT("Async task '%s' finalizing after %f seconds"),
 					*Item->ToString(),
 					Item->GetElapsedTime());
 			}
@@ -258,13 +258,13 @@ void FOnlineAsyncTaskManager::Tick()
 			{
 				if (Task->WasSuccessful())
 				{
-					UE_LOG(LogOnline, Verbose, TEXT("Async task '%s' succeeded in %f seconds (Parallel)"),
+					UE_LOG_ONLINE(Verbose, TEXT("Async task '%s' succeeded in %f seconds (Parallel)"),
 						*Task->ToString(),
 						Task->GetElapsedTime());
 				}
 				else
 				{
-					UE_LOG(LogOnline, Warning, TEXT("Async task '%s' failed in %f seconds (Parallel)"),
+					UE_LOG_ONLINE(Warning, TEXT("Async task '%s' failed in %f seconds (Parallel)"),
 						*Task->ToString(),
 						Task->GetElapsedTime());
 				}
@@ -292,13 +292,13 @@ void FOnlineAsyncTaskManager::Tick()
 			{
 				if (Task->WasSuccessful())
 				{
-					UE_LOG(LogOnline, Verbose, TEXT("Async task '%s' succeeded in %f seconds"),
+					UE_LOG_ONLINE(Verbose, TEXT("Async task '%s' succeeded in %f seconds"),
 						*Task->ToString(),
 						Task->GetElapsedTime());
 				}
 				else
 				{
-					UE_LOG(LogOnline, Warning, TEXT("Async task '%s' failed in %f seconds"),
+					UE_LOG_ONLINE(Warning, TEXT("Async task '%s' failed in %f seconds"),
 						*Task->ToString(),
 						Task->GetElapsedTime());
 				}
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineKeyValuePair.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineKeyValuePair.cpp
index 97bd254d0121..ec0056a7b085 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineKeyValuePair.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineKeyValuePair.cpp
@@ -466,7 +466,11 @@ void FVariantData::GetValue(TSharedPtr<FJsonObject>& OutData) const
 	{
 		FString SerializedData;
 		auto Reader = TJsonReaderFactory<TCHAR>::Create(Value.AsTCHAR);
-		FJsonSerializer::Deserialize(Reader, OutData);
+		if (!FJsonSerializer::Deserialize(Reader, OutData))
+		{
+			OutData = MakeShared<FJsonObject>();
+			UE_LOG_ONLINE(Warning, TEXT("Invalid serialized json in FVariantData: %s"), Value.AsTCHAR);
+		}
 	}
 	else
 	{
@@ -1060,7 +1064,7 @@ bool FVariantDataConverter::VariantMapToUStruct(const FOnlineKeyValuePairs<FStri
 		void* Value = Property->ContainerPtrToValuePtr<uint8>(OutStruct);
 		if (!VariantDataToUProperty(VariantData, Property, Value, CheckFlags, SkipFlags))
 		{
-			UE_LOG(LogOnline, Error, TEXT("VariantMapToUStruct - Unable to parse %s.%s from Variant"), *StructDefinition->GetName(), *PropertyName);
+			UE_LOG_ONLINE(Error, TEXT("VariantMapToUStruct - Unable to parse %s.%s from Variant"), *StructDefinition->GetName(), *PropertyName);
 			return false;
 		}
 	}
@@ -1072,13 +1076,13 @@ bool FVariantDataConverter::VariantDataToUProperty(const FVariantData* Variant,
 {
 	if (!Variant)
 	{
-		UE_LOG(LogOnline, Error, TEXT("VariantDataToUProperty - Invalid value"));
+		UE_LOG_ONLINE(Error, TEXT("VariantDataToUProperty - Invalid value"));
 		return false;
 	}
 
 	if (Property->ArrayDim != 1)
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Ignoring excess properties when deserializing %s"), *Property->GetName());
+		UE_LOG_ONLINE(Warning, TEXT("Ignoring excess properties when deserializing %s"), *Property->GetName());
 	}
 
 	return ConvertScalarVariantToUProperty(Variant, Property, OutValue, CheckFlags, SkipFlags);
@@ -1146,7 +1150,7 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 			EnumProperty->GetUnderlyingProperty()->SetIntPropertyValue(OutValue, Value);
 		}
 
-		UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable to import enum %s from %s value for property %s"), *Enum->CppType, Variant->GetTypeString(), *Property->GetNameCPP());
+		UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable to import enum %s from %s value for property %s"), *Enum->CppType, Variant->GetTypeString(), *Property->GetNameCPP());
 		return false;
 	}
 	else if (UNumericProperty* NumericProperty = Cast<UNumericProperty>(Property))
@@ -1162,7 +1166,7 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 			int32 IntValue = Enum->GetValueByName(FName(*StrValue));
 			if (IntValue == INDEX_NONE)
 			{
-				UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
+				UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
 				return false;
 			}
 			NumericProperty->SetIntPropertyValue(OutValue, (int64)IntValue);
@@ -1238,7 +1242,7 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 		}
 		else
 		{
-			UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable to set numeric property type %s for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
+			UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable to set numeric property type %s for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
 			return false;
 		}
 	}
@@ -1263,13 +1267,13 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 		TSharedRef<TJsonReader<>> JsonReader = TJsonReaderFactory<>::Create(StrValue);
 		if (!FJsonSerializer::Deserialize(JsonReader, JsonObject) || !JsonObject.IsValid())
 		{
-			UE_LOG(LogOnline, Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse json=[%s]"), *StrValue);
+			UE_LOG_ONLINE(Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse json=[%s]"), *StrValue);
 			return false;
 		}
 		
 		if (!FJsonObjectConverter::JsonValueToUProperty(JsonObject->GetField<EJson::Array>(Property->GetNameCPP()), Property, OutValue, 0, 0))
 		{
-			UE_LOG(LogOnline, Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse %s from JSON"), *Property->GetNameCPP());
+			UE_LOG_ONLINE(Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse %s from JSON"), *Property->GetNameCPP());
 			return false;
 		}
 	}
@@ -1284,7 +1288,7 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 		}
 		else
 		{
-			UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Attempted to import FText from variant that was not a string for property %s"), *Property->GetNameCPP());
+			UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Attempted to import FText from variant that was not a string for property %s"), *Property->GetNameCPP());
 			return false;
 		}
 	}
@@ -1314,7 +1318,7 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 			}
 			else if (!FDateTime::ParseIso8601(*DateString, DateTimeOut))
 			{
-				UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable to import FDateTime from Iso8601 String for property %s"), *Property->GetNameCPP());
+				UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable to import FDateTime from Iso8601 String for property %s"), *Property->GetNameCPP());
 				return false;
 			}
 		}
@@ -1323,18 +1327,33 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 			FString StrValue;
 			Variant->GetValue(StrValue);
 
-			TSharedPtr<FJsonObject> JsonObject;
-			TSharedRef<TJsonReader<>> JsonReader = TJsonReaderFactory<>::Create(StrValue);
-			if (!FJsonSerializer::Deserialize(JsonReader, JsonObject) || !JsonObject.IsValid())
+			UScriptStruct::ICppStructOps* TheCppStructOps = StructProperty->Struct->GetCppStructOps();
+			if (StructProperty->Struct != FJsonObjectWrapper::StaticStruct() && TheCppStructOps && TheCppStructOps->HasImportTextItem())
 			{
-				UE_LOG(LogOnline, Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse json=[%s]"), *StrValue);
-				return false;
+				// Has its own way of converting a string back to the right data type (FUniqueNetIdRepl for instance)
+				const TCHAR* ImportTextPtr = *StrValue;
+				if (!TheCppStructOps->ImportTextItem(ImportTextPtr, OutValue, PPF_None, nullptr, (FOutputDevice*)GWarn))
+				{
+					// Fall back to trying the tagged property approach if custom ImportTextItem couldn't get it done
+					Property->ImportText(ImportTextPtr, OutValue, PPF_None, nullptr);
+				}
 			}
-
-			if (!FJsonObjectConverter::JsonValueToUProperty(JsonObject->GetField<EJson::Object>(Property->GetNameCPP()), Property, OutValue, 0, 0))
+			else
 			{
-				UE_LOG(LogOnline, Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse %s from JSON"), *Property->GetNameCPP());
-				return false;
+				// More complicated UStructs convert to/from Json Objects
+				TSharedPtr<FJsonObject> JsonObject;
+				TSharedRef<TJsonReader<>> JsonReader = TJsonReaderFactory<>::Create(StrValue);
+				if (!FJsonSerializer::Deserialize(JsonReader, JsonObject) || !JsonObject.IsValid())
+				{
+					UE_LOG_ONLINE(Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse json=[%s]"), *StrValue);
+					return false;
+				}
+
+				if (!FJsonObjectConverter::JsonValueToUProperty(JsonObject->GetField<EJson::Object>(Property->GetNameCPP()), Property, OutValue, 0, 0))
+				{
+					UE_LOG_ONLINE(Warning, TEXT("ConvertScalarVariantToUProperty - Unable to parse %s from JSON"), *Property->GetNameCPP());
+					return false;
+				}
 			}
 		}
 	}
@@ -1347,13 +1366,13 @@ bool FVariantDataConverter::ConvertScalarVariantToUProperty(const FVariantData*
 			Variant->GetValue(StrValue);
 			if (Property->ImportText(*StrValue, OutValue, 0, nullptr) == nullptr)
 			{
-				UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
+				UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
 				return false;
 			}
 		}
 		else
 		{
-			UE_LOG(LogOnline, Error, TEXT("ConvertScalarVariantToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
+			UE_LOG_ONLINE(Error, TEXT("ConvertScalarVariantToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
 		}
 	}
 
@@ -1388,7 +1407,7 @@ bool FVariantDataConverter::UStructToVariantMap(const UStruct* StructDefinition,
 		{
 			VariantData.Empty();
 			UClass* PropClass = Property->GetClass();
-			UE_LOG(LogOnline, Error, TEXT("UStructToVariantMap - Unhandled property type '%s': %s"), *PropClass->GetName(), *Property->GetPathName());
+			UE_LOG_ONLINE(Error, TEXT("UStructToVariantMap - Unhandled property type '%s': %s"), *PropClass->GetName(), *Property->GetPathName());
 			return false;
 		}
 	}
@@ -1405,7 +1424,7 @@ bool FVariantDataConverter::UPropertyToVariantData(UProperty* Property, const vo
 	else 
 	{ 
 		UClass* PropClass = Property->GetClass();
-		UE_LOG(LogOnline, Error, TEXT("UPropertyToVariantData - ArrayDim > 1 for '%s': %s"), *PropClass->GetName(), *Property->GetPathName());
+		UE_LOG_ONLINE(Error, TEXT("UPropertyToVariantData - ArrayDim > 1 for '%s': %s"), *PropClass->GetName(), *Property->GetPathName());
 	}
 
 	return false;
@@ -1490,7 +1509,19 @@ bool FVariantDataConverter::ConvertScalarUPropertyToVariant(UProperty* Property,
 		}
 		else
 		{
-			ConvertScalarUPropertyToJsonObject_Helper(Property, Value, OutVariantData);
+			UScriptStruct::ICppStructOps* TheCppStructOps = StructProperty->Struct->GetCppStructOps();
+			if (StructProperty->Struct != FJsonObjectWrapper::StaticStruct() && TheCppStructOps && TheCppStructOps->HasExportTextItem())
+			{
+				// If the struct has its own way of making a string, store it as such (FUniqueNetIdRepl for instance)
+				FString OutValueStr;
+				TheCppStructOps->ExportTextItem(OutValueStr, Value, nullptr, nullptr, PPF_None, nullptr);
+				OutVariantData.SetValue(OutValueStr);
+			}
+			else
+			{
+				// More complicated UStructs convert to/from Json Objects
+				ConvertScalarUPropertyToJsonObject_Helper(Property, Value, OutVariantData);
+			}
 		}
 	}
 	
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotification.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotification.cpp
index acee1303f6d0..313662273f89 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotification.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotification.cpp
@@ -31,7 +31,7 @@ void FOnlineNotification::SetTypeFromPayload()
 	{
 		if (!Payload->TryGetStringField(TEXT("Type"), TypeStr))
 		{
-			UE_LOG(LogOnline, Error, TEXT("No type in notification JSON object"));
+			UE_LOG_ONLINE(Error, TEXT("No type in notification JSON object"));
 			TypeStr = TEXT("<no type>");
 		}
 	}
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotificationHandler.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotificationHandler.cpp
index 84cd0bf93a9e..7bfb4bb6e33d 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotificationHandler.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineNotificationHandler.cpp
@@ -10,7 +10,7 @@ FDelegateHandle FOnlineNotificationHandler::AddSystemNotificationBinding_Handle(
 {
 	if (!NewBinding.NotificationDelegate.IsBound())
 	{
-		UE_LOG(LogOnline, Error, TEXT("Adding empty notification binding for type %s"), *NotificationType);
+		UE_LOG_ONLINE(Error, TEXT("Adding empty notification binding for type %s"), *NotificationType);
 		return FDelegateHandle();
 	}
 
@@ -48,7 +48,7 @@ FDelegateHandle FOnlineNotificationHandler::AddPlayerNotificationBinding_Handle(
 {
 	if (!NewBinding.NotificationDelegate.IsBound())
 	{
-		UE_LOG(LogOnline, Error, TEXT("Adding empty notification binding for type %s"), *NotificationType);
+		UE_LOG_ONLINE(Error, TEXT("Adding empty notification binding for type %s"), *NotificationType);
 		return FDelegateHandle();
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlinePartyInterface.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlinePartyInterface.cpp
index 48f31ba72f37..ab63bacb55c9 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlinePartyInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlinePartyInterface.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Interfaces/OnlinePartyInterface.h"
+#include "OnlineSubsystem.h"
 #include "Policies/CondensedJsonPrintPolicy.h"
 #include "Serialization/JsonTypes.h"
 #include "Dom/JsonValue.h"
@@ -92,7 +93,7 @@ void FOnlinePartyData::FromJson(const FString& JsonString)
 			int32 NewRevisionCount = JsonObject->GetIntegerField(TEXT("Rev"));
 			if ((RevisionCount != 0) && (NewRevisionCount != RevisionCount) && (NewRevisionCount != (RevisionCount + 1)))
 			{
-				UE_LOG_ONLINEPARTY(Warning, TEXT("Unexpected revision received.  Current %d, new %d"), RevisionCount, NewRevisionCount);
+				UE_LOG_ONLINE_PARTY(Warning, TEXT("Unexpected revision received.  Current %d, new %d"), RevisionCount, NewRevisionCount);
 			}
 			RevisionCount = NewRevisionCount;
 		}
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSessionSettings.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSessionSettings.cpp
index 77f2892c1401..db934a9a896a 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSessionSettings.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSessionSettings.cpp
@@ -2,28 +2,29 @@
 
 #include "OnlineSessionSettings.h"
 #include "OnlineSubsystem.h"
+#include "Interfaces/OnlineSessionInterface.h"
 #include "Logging/LogScopedVerbosityOverride.h"
 
 void DumpNamedSession(const FNamedOnlineSession* NamedSession)
 {
 	if (NamedSession != NULL)
 	{
-		LOG_SCOPE_VERBOSITY_OVERRIDE(LogOnline, ELogVerbosity::VeryVerbose);
-		UE_LOG(LogOnline, Verbose, TEXT("dumping NamedSession: "));
-		UE_LOG(LogOnline, Verbose, TEXT("	SessionName: %s"), *NamedSession->SessionName.ToString());	
-		UE_LOG(LogOnline, Verbose, TEXT("	HostingPlayerNum: %d"), NamedSession->HostingPlayerNum);
-		UE_LOG(LogOnline, Verbose, TEXT("	SessionState: %s"), EOnlineSessionState::ToString(NamedSession->SessionState));
-		UE_LOG(LogOnline, Verbose, TEXT("	RegisteredPlayers: "));
+		LOG_SCOPE_VERBOSITY_OVERRIDE(LogOnlineSession, ELogVerbosity::VeryVerbose);
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("dumping NamedSession: "));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	SessionName: %s"), *NamedSession->SessionName.ToString());	
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	HostingPlayerNum: %d"), NamedSession->HostingPlayerNum);
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	SessionState: %s"), EOnlineSessionState::ToString(NamedSession->SessionState));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	RegisteredPlayers: "));
 		if (NamedSession->RegisteredPlayers.Num())
 		{
 			for (int32 UserIdx=0; UserIdx < NamedSession->RegisteredPlayers.Num(); UserIdx++)
 			{
-				UE_LOG(LogOnline, Verbose, TEXT("	    %d: %s"), UserIdx, *NamedSession->RegisteredPlayers[UserIdx]->ToDebugString());
+				UE_LOG_ONLINE_SESSION(Verbose, TEXT("	    %d: %s"), UserIdx, *NamedSession->RegisteredPlayers[UserIdx]->ToDebugString());
 			}
 		}
 		else
 		{
-			UE_LOG(LogOnline, Verbose, TEXT("	    0 registered players"));
+			UE_LOG_ONLINE_SESSION(Verbose, TEXT("	    0 registered players"));
 		}
 
 		DumpSession(NamedSession);
@@ -34,12 +35,12 @@ void DumpSession(const FOnlineSession* Session)
 {
 	if (Session != NULL)
 	{
-		UE_LOG(LogOnline, Verbose, TEXT("dumping Session: "));
-		UE_LOG(LogOnline, Verbose, TEXT("	OwningPlayerName: %s"), *Session->OwningUserName);	
-		UE_LOG(LogOnline, Verbose, TEXT("	OwningPlayerId: %s"), Session->OwningUserId.IsValid() ? *Session->OwningUserId->ToDebugString() : TEXT("") );
-		UE_LOG(LogOnline, Verbose, TEXT("	NumOpenPrivateConnections: %d"), Session->NumOpenPrivateConnections);	
-		UE_LOG(LogOnline, Verbose, TEXT("	NumOpenPublicConnections: %d"), Session->NumOpenPublicConnections);	
-		UE_LOG(LogOnline, Verbose, TEXT("	SessionInfo: %s"), Session->SessionInfo.IsValid() ? *Session->SessionInfo->ToDebugString() : TEXT("NULL"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("dumping Session: "));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	OwningPlayerName: %s"), *Session->OwningUserName);	
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	OwningPlayerId: %s"), Session->OwningUserId.IsValid() ? *Session->OwningUserId->ToDebugString() : TEXT("") );
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	NumOpenPrivateConnections: %d"), Session->NumOpenPrivateConnections);	
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	NumOpenPublicConnections: %d"), Session->NumOpenPublicConnections);	
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("	SessionInfo: %s"), Session->SessionInfo.IsValid() ? *Session->SessionInfo->ToDebugString() : TEXT("NULL"));
 		DumpSessionSettings(&Session->SessionSettings);
 	}
 }
@@ -48,25 +49,25 @@ void DumpSessionSettings(const FOnlineSessionSettings* SessionSettings)
 {
 	if (SessionSettings != NULL)
 	{
-		UE_LOG(LogOnline, Verbose, TEXT("dumping SessionSettings: "));
-		UE_LOG(LogOnline, Verbose, TEXT("\tNumPublicConnections: %d"), SessionSettings->NumPublicConnections);
-		UE_LOG(LogOnline, Verbose, TEXT("\tNumPrivateConnections: %d"), SessionSettings->NumPrivateConnections);
-		UE_LOG(LogOnline, Verbose, TEXT("\tbIsLanMatch: %s"), SessionSettings->bIsLANMatch ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbIsDedicated: %s"), SessionSettings->bIsDedicated ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbUsesStats: %s"), SessionSettings->bUsesStats ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbShouldAdvertise: %s"), SessionSettings->bShouldAdvertise ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbAllowJoinInProgress: %s"), SessionSettings->bAllowJoinInProgress ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbAllowInvites: %s"), SessionSettings->bAllowInvites ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbUsesPresence: %s"), SessionSettings->bUsesPresence ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbAllowJoinViaPresence: %s"), SessionSettings->bAllowJoinViaPresence ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tbAllowJoinViaPresenceFriendsOnly: %s"), SessionSettings->bAllowJoinViaPresenceFriendsOnly ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogOnline, Verbose, TEXT("\tBuildUniqueId: 0x%08x"), SessionSettings->BuildUniqueId);
-		UE_LOG(LogOnline, Verbose, TEXT("\tSettings:"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("dumping SessionSettings: "));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tNumPublicConnections: %d"), SessionSettings->NumPublicConnections);
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tNumPrivateConnections: %d"), SessionSettings->NumPrivateConnections);
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbIsLanMatch: %s"), SessionSettings->bIsLANMatch ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbIsDedicated: %s"), SessionSettings->bIsDedicated ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbUsesStats: %s"), SessionSettings->bUsesStats ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbShouldAdvertise: %s"), SessionSettings->bShouldAdvertise ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbAllowJoinInProgress: %s"), SessionSettings->bAllowJoinInProgress ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbAllowInvites: %s"), SessionSettings->bAllowInvites ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbUsesPresence: %s"), SessionSettings->bUsesPresence ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbAllowJoinViaPresence: %s"), SessionSettings->bAllowJoinViaPresence ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tbAllowJoinViaPresenceFriendsOnly: %s"), SessionSettings->bAllowJoinViaPresenceFriendsOnly ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tBuildUniqueId: 0x%08x"), SessionSettings->BuildUniqueId);
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tSettings:"));
 		for (FSessionSettings::TConstIterator It(SessionSettings->Settings); It; ++It)
 		{
 			FName Key = It.Key();
 			const FOnlineSessionSetting& Setting = It.Value();
-			UE_LOG(LogOnline, Verbose, TEXT("\t\t%s=%s"), *Key.ToString(), *Setting.ToString());
+			UE_LOG_ONLINE_SESSION(Verbose, TEXT("\t\t%s=%s"), *Key.ToString(), *Setting.ToString());
 		}
 	}
 }
@@ -173,7 +174,7 @@ EOnlineDataAdvertisementType::Type FOnlineSessionSettings::GetAdvertisementType(
 		return Setting->AdvertisementType;
 	}
 
-	UE_LOG(LogOnline, Warning, TEXT("Unable to find key for advertisement type request: %s"), *Key.ToString());
+	UE_LOG_ONLINE_SESSION(Warning, TEXT("Unable to find key for advertisement type request: %s"), *Key.ToString());
 	return EOnlineDataAdvertisementType::DontAdvertise;
 }
 
@@ -185,7 +186,7 @@ int32 FOnlineSessionSettings::GetID(FName Key) const
 		return Setting->ID;
 	}
 
-	UE_LOG(LogOnline, Warning, TEXT("Unable to find key for ID request: %s"), *Key.ToString());
+	UE_LOG_ONLINE_SESSION(Warning, TEXT("Unable to find key for ID request: %s"), *Key.ToString());
 	return INVALID_SESSION_SETTING_ID;
 }
 
@@ -280,7 +281,7 @@ EOnlineComparisonOp::Type FOnlineSearchSettings::GetComparisonOp(FName Key) cons
 		return SearchParam->ComparisonOp;
 	}
 
-	UE_LOG(LogOnline, Warning, TEXT("Unable to find key for comparison op request: %s"), *Key.ToString());
+	UE_LOG_ONLINE_SESSION(Warning, TEXT("Unable to find key for comparison op request: %s"), *Key.ToString());
 	return EOnlineComparisonOp::Equals;
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystem.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystem.cpp
index c67f1e7b31d9..61ea8aa8647e 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystem.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystem.cpp
@@ -10,10 +10,38 @@
 #include "Logging/LogMacros.h"
 #include "Misc/EngineVersion.h"
 
+#include "Interfaces/OnlinePartyInterface.h"
+#include "Interfaces/OnlineIdentityInterface.h"
+#include "Interfaces/OnlineUserInterface.h"
+#include "Interfaces/OnlineEventsInterface.h"
+#include "Interfaces/OnlineStoreInterface.h"
+#include "Interfaces/OnlineStoreInterfaceV2.h"
+#include "Interfaces/OnlinePurchaseInterface.h"
+#include "Interfaces/OnlineSharingInterface.h"
+#include "Interfaces/OnlineLeaderboardInterface.h"
+
 DEFINE_LOG_CATEGORY(LogOnline);
 DEFINE_LOG_CATEGORY(LogOnlineGame);
 DEFINE_LOG_CATEGORY(LogOnlineChat);
 DEFINE_LOG_CATEGORY(LogVoiceEngine);
+DEFINE_LOG_CATEGORY(LogOnlineVoice);
+DEFINE_LOG_CATEGORY(LogOnlineSession);
+DEFINE_LOG_CATEGORY(LogOnlineUser);
+DEFINE_LOG_CATEGORY(LogOnlineFriend);
+DEFINE_LOG_CATEGORY(LogOnlineIdentity);
+DEFINE_LOG_CATEGORY(LogOnlinePresence);
+DEFINE_LOG_CATEGORY(LogOnlineExternalUI);
+DEFINE_LOG_CATEGORY(LogOnlineAchievements);
+DEFINE_LOG_CATEGORY(LogOnlineLeaderboard);
+DEFINE_LOG_CATEGORY(LogOnlineCloud);
+DEFINE_LOG_CATEGORY(LogOnlineTitleFile);
+DEFINE_LOG_CATEGORY(LogOnlineEntitlement);
+DEFINE_LOG_CATEGORY(LogOnlineEvents);
+DEFINE_LOG_CATEGORY(LogOnlineSharing);
+DEFINE_LOG_CATEGORY(LogOnlineStore);
+DEFINE_LOG_CATEGORY(LogOnlineStoreV2);
+DEFINE_LOG_CATEGORY(LogOnlinePurchase);
+
 
 #if STATS
 ONLINESUBSYSTEM_API DEFINE_STAT(STAT_Online_Async);
@@ -41,9 +69,6 @@ TSharedPtr<const FUniqueNetId> GetFirstSignedInUser(IOnlineIdentityPtr IdentityI
 	return UserId;
 }
 
-
-
-
 int32 GetBuildUniqueId()
 {
 	static bool bStaticCheck = false;
@@ -92,6 +117,73 @@ int32 GetBuildUniqueId()
 	return BuildId;
 }
 
+TAutoConsoleVariable<FString> CVarPlatformOverride(
+	TEXT("oss.PlatformOverride"),
+	TEXT(""),
+	TEXT("Overrides the detected platform of this client for various debugging\n")
+	TEXT("Valid values WIN MAC PSN XBL IOS AND LIN SWT OTHER"),
+	ECVF_Cheat);
+
+FString IOnlineSubsystem::GetLocalPlatformName()
+{
+	FString OnlinePlatform;
+
+	OnlinePlatform = CVarPlatformOverride.GetValueOnAnyThread();
+	if (!OnlinePlatform.IsEmpty())
+	{
+		return OnlinePlatform.ToUpper();
+	}
+#if !UE_BUILD_SHIPPING
+	FParse::Value(FCommandLine::Get(), TEXT("PLATFORMTEST="), OnlinePlatform);
+	if (!OnlinePlatform.IsEmpty())
+	{
+		return OnlinePlatform.ToUpper();
+	}
+#endif
+	GConfig->GetString(TEXT("OnlineSubsystem"), TEXT("LocalPlatformName"), OnlinePlatform, GEngineIni);
+	if (!OnlinePlatform.IsEmpty())
+	{
+		return OnlinePlatform.ToUpper();
+	}
+	if (PLATFORM_PS4)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_PS4;
+	}
+	else if (PLATFORM_XBOXONE)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_XBOX;
+	}
+	else if (PLATFORM_WINDOWS)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_WINDOWS;
+	}
+	else if (PLATFORM_MAC)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_MAC;
+	}
+	else if (PLATFORM_LINUX)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_LINUX;
+	}
+	else if (PLATFORM_IOS)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_IOS;
+	}
+	else if (PLATFORM_ANDROID)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_ANDROID;
+	}
+	else if (PLATFORM_SWITCH)
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_SWITCH;
+	}
+	else
+	{
+		OnlinePlatform = OSS_PLATFORM_NAME_OTHER;
+	}
+	return OnlinePlatform;
+}
+
 bool IsPlayerInSessionImpl(IOnlineSession* SessionInt, FName SessionName, const FUniqueNetId& UniqueId)
 {
 	bool bFound = false;
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystemModule.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystemModule.cpp
index c40e8a5703fa..ac7da3ed9c85 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystemModule.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Private/OnlineSubsystemModule.cpp
@@ -74,7 +74,13 @@ void FOnlineSubsystemModule::StartupModule()
 	}
 
 	LoadDefaultSubsystem();
+	
 	// Also load the console/platform specific OSS which might not necessarily be the default OSS instance
+
+	FString InterfaceString;
+	GConfig->GetString(TEXT("OnlineSubsystem"), TEXT("NativePlatformService"), InterfaceString, GEngineIni);
+	NativePlatformService = FName(*InterfaceString);
+
 	IOnlineSubsystem::GetByPlatform();
 }
 
@@ -121,7 +127,7 @@ void FOnlineSubsystemModule::LoadDefaultSubsystem()
 
 	if (!bHasLoadedModule)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Failed to load any Online Subsystem Modules"));
+		UE_LOG_ONLINE(Log, TEXT("Failed to load any Online Subsystem Modules"));
 	}
 }
 
@@ -154,7 +160,7 @@ void FOnlineSubsystemModule::ShutdownOnlineSubsystem()
 	// Unload all the supporting factories
 	for (TMap<FName, IOnlineFactory*>::TIterator It(OnlineFactories); It; ++It)
 	{
-		UE_LOG(LogOnline, Verbose, TEXT("Unloading online subsystem: %s"), *It.Key().ToString());
+		UE_LOG_ONLINE(Verbose, TEXT("Unloading online subsystem: %s"), *It.Key().ToString());
 
 		// Unloading the module will do proper cleanup
 		FName ModuleName = GetOnlineModuleName(It.Key().ToString());
@@ -198,7 +204,7 @@ FName FOnlineSubsystemModule::ParseOnlineSubsystemName(const FName& FullName, FN
 	SubsystemName = DefaultPlatformService;
 	InstanceName = FOnlineSubsystemImpl::DefaultInstanceName;
 
-	if (FullName != NAME_None)
+	if (!FullName.IsNone())
 	{
 		FString FullNameStr = FullName.ToString();
 
@@ -225,7 +231,7 @@ FName FOnlineSubsystemModule::ParseOnlineSubsystemName(const FName& FullName, FN
 	return FName(*FString::Printf(TEXT("%s:%s"), *SubsystemName.ToString(), *InstanceName.ToString()));
 #else	
 	
-	SubsystemName = FullName == NAME_None ? DefaultPlatformService : FullName;
+	SubsystemName = FullName.IsNone() ? DefaultPlatformService : FullName;
 	InstanceName = FOnlineSubsystemImpl::DefaultInstanceName;
 
 #if !UE_BUILD_SHIPPING
@@ -243,7 +249,7 @@ IOnlineSubsystem* FOnlineSubsystemModule::GetOnlineSubsystem(const FName InSubsy
 	FName KeyName = ParseOnlineSubsystemName(InSubsystemName, SubsystemName, InstanceName);
 
 	IOnlineSubsystemPtr* OnlineSubsystem = nullptr;
-	if (SubsystemName != NAME_None)
+	if (!SubsystemName.IsNone())
 	{
 		OnlineSubsystem = OnlineSubsystems.Find(KeyName);
 		if (OnlineSubsystem == nullptr)
@@ -276,7 +282,7 @@ IOnlineSubsystem* FOnlineSubsystemModule::GetOnlineSubsystem(const FName InSubsy
 						bool* bNotedPreviously = OnlineSubsystemFailureNotes.Find(KeyName);
 						if (!bNotedPreviously || !(*bNotedPreviously))
 						{
-							UE_LOG(LogOnline, Log, TEXT("Unable to create OnlineSubsystem module %s"), *SubsystemName.ToString());
+							UE_LOG_ONLINE(Log, TEXT("Unable to create OnlineSubsystem module %s"), *SubsystemName.ToString());
 							OnlineSubsystemFailureNotes.Add(KeyName, true);
 						}
 					}
@@ -288,12 +294,24 @@ IOnlineSubsystem* FOnlineSubsystemModule::GetOnlineSubsystem(const FName InSubsy
 	return (OnlineSubsystem == nullptr) ? nullptr : (*OnlineSubsystem).Get();
 }
 
+IOnlineSubsystem* FOnlineSubsystemModule::GetNativeSubsystem(bool bAutoLoad)
+{
+	if (!NativePlatformService.IsNone())
+	{
+		if (bAutoLoad || IOnlineSubsystem::IsLoaded(NativePlatformService))
+		{
+			return IOnlineSubsystem::Get(NativePlatformService);
+		}
+	}
+	return nullptr;
+}
+
 void FOnlineSubsystemModule::DestroyOnlineSubsystem(const FName InSubsystemName)
 {
 	FName SubsystemName, InstanceName;
 	FName KeyName = ParseOnlineSubsystemName(InSubsystemName, SubsystemName, InstanceName);
 
-	if (SubsystemName != NAME_None)
+	if (!SubsystemName.IsNone())
 	{
 		IOnlineSubsystemPtr OnlineSubsystem;
 		OnlineSubsystems.RemoveAndCopyValue(KeyName, OnlineSubsystem);
@@ -304,7 +322,7 @@ void FOnlineSubsystemModule::DestroyOnlineSubsystem(const FName InSubsystemName)
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("OnlineSubsystem instance %s not found, unable to destroy."), *KeyName.ToString());
+			UE_LOG_ONLINE(Warning, TEXT("OnlineSubsystem instance %s not found, unable to destroy."), *KeyName.ToString());
 		}
 	}
 }
@@ -315,7 +333,7 @@ bool FOnlineSubsystemModule::DoesInstanceExist(const FName InSubsystemName) cons
 
 	FName SubsystemName, InstanceName;
 	FName KeyName = ParseOnlineSubsystemName(InSubsystemName, SubsystemName, InstanceName);
-	if (SubsystemName != NAME_None)
+	if (!SubsystemName.IsNone())
 	{
 		const IOnlineSubsystemPtr* OnlineSubsystem = OnlineSubsystems.Find(KeyName);
 		return OnlineSubsystem && OnlineSubsystem->IsValid() ? true : false;
@@ -331,7 +349,7 @@ bool FOnlineSubsystemModule::IsOnlineSubsystemLoaded(const FName InSubsystemName
 	FName SubsystemName, InstanceName;
 	ParseOnlineSubsystemName(InSubsystemName, SubsystemName, InstanceName);
 
-	if (SubsystemName != NAME_None)
+	if (!SubsystemName.IsNone())
 	{
 		if (FModuleManager::Get().IsModuleLoaded(GetOnlineModuleName(SubsystemName.ToString())))
 		{
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/IVoiceChatRoom.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/IVoiceChatRoom.h
index 762bdbc17c22..3b01a1e19617 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/IVoiceChatRoom.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/IVoiceChatRoom.h
@@ -61,28 +61,25 @@ enum class EVoiceChatRoomState : uint8
 	Leaving
 };
 
-namespace Lex
+inline const TCHAR* LexToString(EVoiceChatRoomState InState)
 {
-	inline const TCHAR* ToString(EVoiceChatRoomState InState)
+	switch (InState)
 	{
-		switch (InState)
-		{
-			case EVoiceChatRoomState::Invalid:
-				return TEXT("Invalid");
-				break;
-			case EVoiceChatRoomState::Entering:
-				return TEXT("Entering");
-				break;
-			case EVoiceChatRoomState::Entered:
-				return TEXT("Entered");
-				break;
-			case EVoiceChatRoomState::Leaving:
-				return TEXT("Leaving");
-				break;
-		}
-
-		return TEXT("");
+		case EVoiceChatRoomState::Invalid:
+			return TEXT("Invalid");
+			break;
+		case EVoiceChatRoomState::Entering:
+			return TEXT("Entering");
+			break;
+		case EVoiceChatRoomState::Entered:
+			return TEXT("Entered");
+			break;
+		case EVoiceChatRoomState::Leaving:
+			return TEXT("Leaving");
+			break;
 	}
+
+	return TEXT("");
 }
 
 /**
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineAchievementsInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineAchievementsInterface.h
index a0f61583a9ca..05652f30eea3 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineAchievementsInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineAchievementsInterface.h
@@ -1,13 +1,22 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-
 #pragma once
 
-
 #include "CoreMinimal.h"
 #include "OnlineDelegateMacros.h"
 #include "OnlineStats.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineAchievements, Display, All);
+
+#define UE_LOG_ONLINE_ACHIEVEMENTS(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineAchievements, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_ACHIEVEMENTS(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineAchievements, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate fired when achievements have been written to the server
  */
@@ -100,27 +109,30 @@ public:
 	 */
 	virtual void WriteAchievements(const FUniqueNetId& PlayerId, FOnlineAchievementsWriteRef& WriteObject, const FOnAchievementsWrittenDelegate& Delegate = FOnAchievementsWrittenDelegate()) = 0;
 
-	
 	/**
-	 * Read achievements from the server
+	 * Read achievement ids and progress from the server
+	 * You must use QueryAchievementDescriptions to get more information about the achievements
+	 * @see FOnlineAchievement
+	 * @see QueryAchievementDescriptions
 	 *
-	 * @param PlayerId - The uid of the player we are reading achievements for
+	 * @param PlayerId the id of the player we are reading achievements for
+	 * @param Delegate the delegate to trigger when the query is complete
 	 *
 	 * @return Whether we have kicked off a read attempt
 	 */
 	virtual void QueryAchievements(const FUniqueNetId& PlayerId, const FOnQueryAchievementsCompleteDelegate& Delegate = FOnQueryAchievementsCompleteDelegate()) = 0;
-
 	
 	/**
-	 * Read achievement descriptions from the server
+	 * Read achievement descriptions from the server for displaying achievements in game
+	 * @see FOnlineAchievementDesc
 	 *
-	 * @param PlayerId - The uid of the player we are reading achievements for
+	 * @param PlayerId the id of the player we are reading achievements for
+	 * @param Delegate the delegate to trigger when the query is complete
 	 *
 	 * @return Whether we have kicked off a read attempt
 	 */
 	virtual void QueryAchievementDescriptions( const FUniqueNetId& PlayerId, const FOnQueryAchievementsCompleteDelegate& Delegate = FOnQueryAchievementsCompleteDelegate() ) = 0;
 
-	
 	/**
 	 * Get an achievement object which was previously synced from the server
 	 *
@@ -132,7 +144,6 @@ public:
 	 */
 	virtual EOnlineCachedResult::Type GetCachedAchievement( const FUniqueNetId& PlayerId, const FString& AchievementId, FOnlineAchievement& OutAchievement) = 0;
 	
-
 	/**
 	 * Get all the achievement objects for the specified player
 	 *
@@ -143,7 +154,6 @@ public:
 	 */
 	virtual EOnlineCachedResult::Type GetCachedAchievements(const FUniqueNetId& PlayerId, TArray<FOnlineAchievement>& OutAchievements) = 0;
 	
-
 	/**
 	 * Get all the achievement description object for the specified achievement id
 	 *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineChatInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineChatInterface.h
index b42f3bc0daa9..850a1d072d4d 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineChatInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineChatInterface.h
@@ -6,6 +6,18 @@
 #include "UObject/CoreOnline.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineChat, Display, All);
+
+#define UE_LOG_ONLINECHAT(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineChat, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINECHAT(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineChat, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Id of a chat room
  */
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEntitlementsInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEntitlementsInterface.h
index d14c30328859..d2a37ea7d764 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEntitlementsInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEntitlementsInterface.h
@@ -6,6 +6,18 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineEntitlement, Display, All);
+
+#define UE_LOG_ONLINE_ENTITLEMENT(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineEntitlement, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_ENTITLEMENT(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineEntitlement, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /** 
  * unique identifier for entitlements
  */
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEventsInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEventsInterface.h
index da2a7df749ed..56ae1152fa2c 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEventsInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineEventsInterface.h
@@ -5,6 +5,17 @@
 #include "CoreMinimal.h"
 #include "OnlineKeyValuePair.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineEvents, Display, All);
+#define UE_LOG_ONLINE_EVENTS(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineEvents, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_EVENTS(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineEvents, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 class FUniqueNetId;
 
 typedef FOnlineKeyValuePairs< FName, FVariantData > FOnlineEventParms;
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineExternalUIInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineExternalUIInterface.h
index 0ce258acce9c..258e56c90830 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineExternalUIInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineExternalUIInterface.h
@@ -8,6 +8,31 @@
 #include "Interfaces/OnlineMessageInterface.h"
 #include "OnlineError.h"
 
+class FOnlineAccountCredentials;
+
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineExternalUI, Display, All);
+
+#define UE_LOG_ONLINE_EXTERNALUI(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineExternalUI, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_EXTERNALUI(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineExternalUI, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+/**
+ * FLoginFlowResult codes
+ */
+#define LOGIN_TOKEN_FOUND FString()
+#define LOGIN_ERROR_UNKNOWN					TEXT("com.epicgames.login.unknown")
+#define LOGIN_ERROR_AUTH_FAILURE			TEXT("com.epicgames.login.auth_failure")
+#define LOGIN_ERROR_NO_EXTERNAL_ACCOUNT		TEXT("com.epicgames.login.no_account_found_for_external_auth")
+#define LOGIN_CANCELLED						TEXT("com.epicgames.login.canceled")
+#define LOGIN_PAGELOADFAILED				TEXT("com.epicgames.login.pageloadfailed")
+#define LOGIN_CEFLOADFAILED					TEXT("com.epicgames.login.cefloadfailed")
+
 /**
  * Delegate called when the external UI is opened or closed
  *
@@ -75,13 +100,37 @@ DECLARE_DELEGATE_RetVal_OneParam(FLoginFlowResult, FOnLoginRedirectURL, const FS
 DECLARE_MULTICAST_DELEGATE_FourParams(FOnLoginFlowUIRequired, const FString& /*RequestedURL*/, const FOnLoginRedirectURL& /*OnLoginRedirect*/, const FOnLoginFlowComplete& /*OnLoginFlowComplete*/, bool& /*bOutShouldContinueLogin*/);
 typedef FOnLoginFlowUIRequired::FDelegate FOnLoginFlowUIRequiredDelegate;
 
+//DECLARE_DELEGATE_OneParam(FOnCreateAccountFlowComplete, const FLoginFlowResult& /*Result*/);
+//DECLARE_DELEGATE_RetVal_OneParam(FLoginFlowResult, FOnLoginRedirectURL, const FString& /*URL*/);
+
+/**
+ * Delegate executed by the requesting system when a supporting account creation flow browser window is asked to handle the request
+ *
+ * @param RequestedURL destination to fulfill the creation request
+ * @param OnLoginRedirect delegate to fire when URL redirects are detected
+ * @param OnLoginFlowComplete delegate to fire when the creation flow code has reached flow conclusion
+ * @param bOutShouldContinueLogin true if the creation flow code can proceed with the information given, false the caller should handle creation failure
+ */
+DECLARE_MULTICAST_DELEGATE_FourParams(FOnCreateAccountFlowUIRequired, const FString& /*RequestedURL*/, const FOnLoginRedirectURL& /*OnLoginRedirect*/, const FOnLoginFlowComplete& /*OnLoginFlowComplete*/, bool& /*bOutShouldContinueLogin*/);
+typedef FOnCreateAccountFlowUIRequired::FDelegate FOnCreateAccountFlowUIRequiredDelegate;
+
 /**
  * Delegate executed when the external login UI has been closed.
  *
  * @param UniqueId The unique id of the user who signed in. Null if no user signed in.
  * @param ControllerIndex The controller index of the controller that activated the login UI.
+ * @param Error any errors related to closing the UI
  */
-DECLARE_DELEGATE_TwoParams(FOnLoginUIClosedDelegate, TSharedPtr<const FUniqueNetId> /*UniqueId*/, const int /*ControllerIndex*/);
+DECLARE_DELEGATE_ThreeParams(FOnLoginUIClosedDelegate, TSharedPtr<const FUniqueNetId> /*UniqueId*/, const int /*ControllerIndex*/, const FOnlineError& /*Error*/);
+
+/**
+ * Delegate executed when the external account creation UI has been closed.
+ *
+ * @param ControllerIndex The controller index of the controller that activated the account creation UI.
+ * @param AccountCredentials Account credentials created for use by login if successful, invalid otherwiseS
+ * @param Error any errors related to closing the UI
+ */
+DECLARE_DELEGATE_ThreeParams(FOnAccountCreationUIClosedDelegate, const int /*ControllerIndex*/, const FOnlineAccountCredentials& /*AccountCredentials*/, const FOnlineError& /*Error*/);
 
 /**
  * Delegate executed when the web url UI has been closed
@@ -215,6 +264,14 @@ enum class EPlatformMessageType
 	UGCRestricted
 };
 
+/**
+* Shop Purchasable types
+*/
+#define SHOP_PURCHASABLE_APPLICATION		TEXT("Application")
+#define SHOP_PURCHASABLE_ADDON				TEXT("AddOnContent")
+#define SHOP_PURCHASABLE_CONSUMABLE			TEXT("ConsumableContent")
+#define SHOP_PURCHASABLE_SUBSCRIPTION		TEXT("SubscriptionContent")
+
 /** 
  * Interface definition for the online services external UIs
  * Any online service that provides extra UI overlays will implement the relevant functions
@@ -241,6 +298,17 @@ public:
 	 */
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) = 0;
 
+	/**
+	 * Displays the UI that prompts the user to create an account
+	 *
+	 * @param ControllerIndex The controller that prompted showing the account creation UI. If the platform supports it,
+	 * it will pair the signed-in user with this controller.
+	 * @param Delegate The delegate to execute when the user closes the account creation UI.
+	 *
+	 * @return true if it was able to show the UI, false if it failed
+	 */
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) = 0;
+
 	/**
 	 * Displays the UI that shows a user's list of friends
 	 *
@@ -363,6 +431,10 @@ public:
 	 * Delegate called when the online subsystem requires an external UI to handle login flow
 	 */
 	DEFINE_ONLINE_DELEGATE_FOUR_PARAM(OnLoginFlowUIRequired, const FString& /*RequestedURL*/, const FOnLoginRedirectURL& /*OnRedirectURL*/, const FOnLoginFlowComplete& /*OnLoginFlowComplete*/, bool& /*bOutShouldContinueLogin*/);
+	/**
+	 * Delegate called when the online subsystem requires an external UI to handle account creation
+	 */
+	DEFINE_ONLINE_DELEGATE_FOUR_PARAM(OnCreateAccountFlowUIRequired, const FString& /*RequestedURL*/, const FOnLoginRedirectURL& /*OnRedirectURL*/, const FOnLoginFlowComplete& /*OnLoginFlowComplete*/, bool& /*bOutShouldContinueLogin*/);
 };
 
 typedef TSharedPtr<IOnlineExternalUI, ESPMode::ThreadSafe> IOnlineExternalUIPtr;
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineFriendsInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineFriendsInterface.h
index ad3078dfac70..4e115f8e7aed 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineFriendsInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineFriendsInterface.h
@@ -6,6 +6,20 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+struct FOnlineError;
+
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineFriend, Display, All);
+
+#define UE_LOG_ONLINE_FRIEND(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineFriend, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_FRIEND(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineFriend, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /** List of known friends list types */
 namespace EFriendsLists
 {
@@ -155,6 +169,14 @@ typedef FOnBlockListChange::FDelegate FOnBlockListChangeDelegate;
 DECLARE_MULTICAST_DELEGATE_FourParams(FOnQueryRecentPlayersComplete, const FUniqueNetId& /*UserId*/, const FString& /*Namespace*/, bool /*bWasSuccessful*/, const FString& /*Error*/);
 typedef FOnQueryRecentPlayersComplete::FDelegate FOnQueryRecentPlayersCompleteDelegate;
 
+/**
+ * Delegate used when adding a group of recent players has completed
+ *
+ * @param UserId the id of the user that made the request
+ * @param Error error information on failure
+ */
+DECLARE_DELEGATE_TwoParams(FOnAddRecentPlayersComplete, const FUniqueNetId& /*UserId*/, const FOnlineError& /*Error*/);
+
 /**
  * Delegate used when the query for blocked players has completed
  *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineIdentityInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineIdentityInterface.h
index 1e36cc59e1a7..a7470671f19b 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineIdentityInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineIdentityInterface.h
@@ -9,6 +9,18 @@
 
 struct FOnlineError;
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineIdentity, Display, All);
+
+#define UE_LOG_ONLINE_IDENTITY(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineIdentity, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_IDENTITY(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineIdentity, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Account credentials needed to sign in to an online service
  */
@@ -51,7 +63,7 @@ public:
 
 	FString ToDebugString() const
 	{
-		return FString::Printf(TEXT("{Id: %s, Token: %s, Type: %s}"), *Id, *Token, *Type);
+		return FString::Printf(TEXT("{Id: %s, Token: %s, Type: %s}"), *Id, OSS_REDACT(*Token), *Type);
 	}
 };
 
@@ -66,7 +78,9 @@ namespace EUserPrivileges
 		/** Whether the user can use voice and text chat */
 		CanCommunicateOnline,
 		/** Whether the user can use content generated by other users */
-		CanUseUserGeneratedContent
+		CanUseUserGeneratedContent,
+		/** Whether the user can ever participate in cross-play due to age restrictions */
+		CanUserCrossPlay
 	};
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineLeaderboardInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineLeaderboardInterface.h
index 9c3eb05f0edb..f1651414baf6 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineLeaderboardInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineLeaderboardInterface.h
@@ -7,6 +7,18 @@
 #include "OnlineDelegateMacros.h"
 #include "OnlineStats.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineLeaderboard, Display, All);
+
+#define UE_LOG_ONLINE_LEADERBOARD(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineLeaderboard, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_LEADERBOARD(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineLeaderboard, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate called when the last leaderboard read is complete
  *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePartyInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePartyInterface.h
index cb58edbf59d1..032d15f171e3 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePartyInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePartyInterface.h
@@ -9,6 +9,17 @@
 #include "OnlineDelegateMacros.h"
 #include "Interfaces/OnlineChatInterface.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineParty, Display, All);
+#define UE_LOG_ONLINE_PARTY(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineParty, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_PARTY(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineParty, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 #define F_PREFIX(TypeToPrefix) F##TypeToPrefix
 #define PARTY_DECLARE_DELEGATETYPE(Type) typedef F##Type::FDelegate F##Type##Delegate
 
@@ -24,15 +35,6 @@ enum class ERequestPartyInvitationCompletionResult;
 enum class ESendPartyInvitationCompletionResult;
 enum class EUpdateConfigCompletionResult;
 
-ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineParty, Display, All);
-
-#define ONLINEPARTY_LOG_PREFIX TEXT("OSS::Party: ")
-#define UE_LOG_ONLINEPARTY(Verbosity, Format, ...) \
-{ \
-	UE_LOG(LogOnlineParty, Verbosity, TEXT("%s%s"), ONLINEPARTY_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
-}
-
-
 /**
  * Party member user info returned by IOnlineParty interface
  */
@@ -86,6 +88,7 @@ public:
 		if (FoundValuePtr != nullptr)
 		{
 			OutAttrValue = *FoundValuePtr;
+			return true;
 		}
 
 		return bResult;
@@ -238,16 +241,6 @@ public:
 	 */
 	virtual const FOnlinePartyTypeId GetPartyTypeId() const = 0;
 
-	/**
-	 * @return user id of the leader of the party associated with this join info
-	 */
-	virtual const TSharedRef<const FUniqueNetId>& GetLeaderId() const = 0;
-
-	/**
-	 * @return user id of the leader of the party associated with this join info
-	 */
-	virtual const FString& GetLeaderDisplayName() const = 0;
-
 	/**
 	 * @return user id of where this join info came from
 	 */
@@ -258,6 +251,11 @@ public:
 	 */
 	virtual const FString& GetSourceDisplayName() const = 0;
 
+	/** 
+	 * @return source platform string
+	 */
+	virtual const FString& GetSourcePlatform() const = 0;
+
 	/**
 	 * @return true if the join info has some form of key(does not guarantee the validity of that key)
 	 */
@@ -315,68 +313,18 @@ public:
 namespace PartySystemPermissions
 {
 	/**
-	 * EPresencePermissions details who can publish what to presence.
-	 * DoNotPublish is a valid setting for primary parties.
+	 * Who has permissions to perform party actions
 	 */
-	enum class EPermissionType: uint8
-	{
-		None = 0x0,
-		Leader = 0x1,
-		Friend = 0x2,
-		Anyone = 0x4
-	};
-
-	/**
-	 * FPublishPermissionValidator uses meta programming to cause errors for invalid combinations of permission flags
-	 */
-	template<bool bIsValidPermissionCombo>
-		struct FPublishPermissionValidator;
-
-	template<> struct FPublishPermissionValidator<true> {};
-
-	template<EPermissionType PublishIdPermission, EPermissionType PublishKeyPermission>
-	struct FPublishPermissionBuilder : public FPublishPermissionValidator<(PublishKeyPermission <= PublishIdPermission)>
-	{
-		static const uint8 Value = static_cast<uint8>(PublishIdPermission) << 4 | static_cast<uint8>(PublishKeyPermission);
-	};
-
-	/**
-	 * Pre-defined presence permission objects
-	 */
-	enum class EPresencePermissions: uint8
-	{
-		DoNotPublish                    = FPublishPermissionBuilder<EPermissionType::None,   EPermissionType::None>::Value,
-		LeaderPublishIdNonePublishKey   = FPublishPermissionBuilder<EPermissionType::Leader, EPermissionType::None>::Value,
-		LeaderPublishIdLeaderPublishKey = FPublishPermissionBuilder<EPermissionType::Leader, EPermissionType::Leader>::Value,
-		FriendPublishIdNonePublishKey   = FPublishPermissionBuilder<EPermissionType::Friend, EPermissionType::None>::Value,
-		FriendPublishIdLeaderPublishKey = FPublishPermissionBuilder<EPermissionType::Friend, EPermissionType::Leader>::Value,
-		FriendPublishIdFriendPublishKey = FPublishPermissionBuilder<EPermissionType::Friend, EPermissionType::Friend>::Value,
-		AnyonePublishIdNonePublishKey   = FPublishPermissionBuilder<EPermissionType::Anyone, EPermissionType::None>::Value,
-		AnyonePublishIdLeaderPublishKey = FPublishPermissionBuilder<EPermissionType::Anyone, EPermissionType::Leader>::Value,
-		AnyonePublishIdFriendPublishKey = FPublishPermissionBuilder<EPermissionType::Anyone, EPermissionType::Friend>::Value,
-		AnyonePublishIdAnyonePublishKey = FPublishPermissionBuilder<EPermissionType::Anyone, EPermissionType::Anyone>::Value,
-	};
-
-	/**
-	 * Presence permission aliases
-	 */
-	static const EPresencePermissions FriendsInviteOnly = EPresencePermissions::LeaderPublishIdNonePublishKey;
-	static const EPresencePermissions FriendsOfFriendsInviteOnly = EPresencePermissions::FriendPublishIdNonePublishKey;
-	static const EPresencePermissions PublicInviteOnly = EPresencePermissions::AnyonePublishIdNonePublishKey;
-	static const EPresencePermissions FriendsOnly = EPresencePermissions::LeaderPublishIdLeaderPublishKey;
-	static const EPresencePermissions FriendsOfFriendsOnly = EPresencePermissions::FriendPublishIdFriendPublishKey;
-	static const EPresencePermissions Public = EPresencePermissions::AnyonePublishIdAnyonePublishKey;
-
-	enum class EInvitePermissions
+	enum class EPermissionType : uint8
 	{
+		/** Noone has access to do that action */
+		Noone,
 		/** Available to the leader only */
 		Leader,
-		/** Available to friends of the leader only */
+		/** Available to the leader and friends of the leader only */
 		Friends,
 		/** Available to anyone */
-		Anyone,
-		/** Noone can send invites */
-		Noone, 
+		Anyone
 	};
 }
 
@@ -393,8 +341,8 @@ struct ONLINESUBSYSTEM_API FPartyConfiguration : public TSharedFromThis<FPartyCo
 {
 	FPartyConfiguration()
 		: JoinRequestAction(EJoinRequestAction::Manual)
-		, PresencePermissions(PartySystemPermissions::EPresencePermissions::AnyonePublishIdAnyonePublishKey)
-		, InvitePermissions(PartySystemPermissions::EInvitePermissions::Leader)
+		, PresencePermissions(PartySystemPermissions::EPermissionType::Anyone)
+		, InvitePermissions(PartySystemPermissions::EPermissionType::Leader)
 		, bChatEnabled(true)
 		, bShouldRemoveOnDisconnection(false)
 		, bIsAcceptingMembers(false)
@@ -420,9 +368,9 @@ struct ONLINESUBSYSTEM_API FPartyConfiguration : public TSharedFromThis<FPartyCo
 	/** should publish info to presence */
 	EJoinRequestAction JoinRequestAction;
 	/** Permission for how the party can be  */
-	PartySystemPermissions::EPresencePermissions PresencePermissions;
+	PartySystemPermissions::EPermissionType PresencePermissions;
 	/** Permission who can send invites */
-	PartySystemPermissions::EInvitePermissions InvitePermissions;
+	PartySystemPermissions::EPermissionType InvitePermissions;
 	/** should have a muc room */
 	bool bChatEnabled;
 	/** should remove on disconnection */
@@ -762,8 +710,10 @@ PARTY_DECLARE_DELEGATETYPE(OnPartyInviteResponseReceived);
  * @param LocalUserId - id associated with this notification
  * @param PartyId - id associated with the party
  * @param SenderId - id of member that sent the request
+ * @param Platform - platform of member that sent the request
+ * @param PartyData - data provided by the sender for the leader to use to determine joinability
  */
-DECLARE_MULTICAST_DELEGATE_ThreeParams(F_PREFIX(OnPartyJoinRequestReceived), const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/);
+DECLARE_MULTICAST_DELEGATE_FiveParams(F_PREFIX(OnPartyJoinRequestReceived), const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/, const FString& /*Platform*/, const FOnlinePartyData& /*PartyData*/);
 PARTY_DECLARE_DELEGATETYPE(OnPartyJoinRequestReceived);
 
 /**
@@ -771,10 +721,21 @@ PARTY_DECLARE_DELEGATETYPE(OnPartyJoinRequestReceived);
  * @param LocalUserId - id associated with this notification
  * @param PartyId - id associated with the party
  * @param SenderId - id of member that sent the request
+ * @param Platform - platform of member that sent the request
+ * @param PartyData - data provided by the sender for the leader to use to determine joinability
  */
-DECLARE_MULTICAST_DELEGATE_ThreeParams(F_PREFIX(OnQueryPartyJoinabilityReceived), const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/);
+DECLARE_MULTICAST_DELEGATE_FiveParams(F_PREFIX(OnQueryPartyJoinabilityReceived), const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/, const FString& /*Platform*/, const FOnlinePartyData& /*PartyData*/);
 PARTY_DECLARE_DELEGATETYPE(OnQueryPartyJoinabilityReceived);
 
+/**
+ * Request for the game to fill in data to be sent with the join request for the leader to make an informed decision based on the joiner's state
+ * @param LocalUserId - id associated with this notification
+ * @param PartyId - id associated with the party
+ * @param PartyData - data for the game to populate
+ */
+DECLARE_MULTICAST_DELEGATE_ThreeParams(F_PREFIX(OnFillPartyJoinRequestData), const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, FOnlinePartyData& /*PartyData*/);
+PARTY_DECLARE_DELEGATETYPE(OnFillPartyJoinRequestData);
+
 /**
  * Interface definition for the online party services 
  * Allows for forming a party and communicating with party members
@@ -1215,7 +1176,7 @@ public:
 	 * OnPartyInviteResponseReceived
 	 * OnPartyJoinRequestReceived
 	 * OnPartyQueryJoinabilityReceived
-	 *
+	 * OnFillPartyJoinRequestData
 	 */
 
 	/**
@@ -1336,8 +1297,10 @@ public:
 	 * @param LocalUserId - id associated with this notification
 	 * @param PartyId - id associated with the party
 	 * @param SenderId - id of member that sent the request
+	 * @param Platform - platform of member that sent the request
+	 * @param PartyData - data provided by the sender for the leader to use to determine joinability
 	 */
-	DEFINE_ONLINE_DELEGATE_THREE_PARAM(OnPartyJoinRequestReceived, const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/);
+	DEFINE_ONLINE_DELEGATE_FIVE_PARAM(OnPartyJoinRequestReceived, const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/, const FString& /*Platform*/, const FOnlinePartyData& /*PartyData*/);
 
 	/**
 	 * Notification when a player wants to know if the party is in a joinable state
@@ -1345,8 +1308,19 @@ public:
 	 * @param LocalUserId - id associated with this notification
 	 * @param PartyId - id associated with the party
 	 * @param SenderId - id of member that sent the request
+	 * @param Platform - platform of member that sent the request
+	 * @param PartyData - data provided by the sender for the leader to use to determine joinability
 	 */
-	DEFINE_ONLINE_DELEGATE_THREE_PARAM(OnQueryPartyJoinabilityReceived, const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/);
+	DEFINE_ONLINE_DELEGATE_FIVE_PARAM(OnQueryPartyJoinabilityReceived, const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, const FUniqueNetId& /*SenderId*/, const FString& /*Platform*/, const FOnlinePartyData& /*PartyData*/);
+
+	/**
+	 * Notification when a player wants to know if the party is in a joinable state
+	 * Subscriber is expected to call RespondToQueryJoinability
+	 * @param LocalUserId - id associated with this notification
+	 * @param PartyId - id associated with the party
+	 * @param PartyData - data provided by the sender for the leader to use to determine joinability
+	 */
+	DEFINE_ONLINE_DELEGATE_THREE_PARAM(OnFillPartyJoinRequestData, const FUniqueNetId& /*LocalUserId*/, const FOnlinePartyId& /*PartyId*/, FOnlinePartyData& /*PartyData*/);
 
 	/**
 	 * Dump out party state for all known parties
@@ -1388,12 +1362,16 @@ enum class EJoinPartyCompletionResult
 	RequesteeNotMember,
 	/** The player you send the join request to is not the leader of the specified party */
 	RequesteeNotLeader,
+	/** The player you send the join request to is unavailable */
+	RequesteeUnavailable,
 	/** A response was not received from the party leader in a timely manner, the join attempt is considered failed */
 	NoResponse,
 	/** You were logged out while attempting to join the party */
 	LoggedOut,
 	/** You were unable to rejoin the party */
 	UnableToRejoin,
+	/** Your platform is not compatible with the party */
+	IncompatiblePlatform,
 
 	/** We are currently waiting for a response for a previous join request for the specified party.  No message sent to party leader. */
 	AlreadyJoiningParty,
@@ -1734,6 +1712,10 @@ inline const TCHAR* ToString(const EJoinPartyCompletionResult Value)
 	{
 		return TEXT("UnableToRejoin");
 	}
+	case EJoinPartyCompletionResult::IncompatiblePlatform:
+	{
+		return TEXT("IncompatiblePlatform");
+	}
 	case EJoinPartyCompletionResult::AlreadyJoiningParty:
 	{
 		return TEXT("AlreadyJoiningParty");
@@ -1754,6 +1736,10 @@ inline const TCHAR* ToString(const EJoinPartyCompletionResult Value)
 	{
 		return TEXT("MessagingFailure");
 	}
+	case EJoinPartyCompletionResult::RequesteeUnavailable:
+	{
+		return TEXT("RequesteeUnavailable");
+	}
 	case EJoinPartyCompletionResult::GameSpecificReason:
 	{
 		return TEXT("GameSpecificReason");
@@ -1974,67 +1960,23 @@ inline const TCHAR* ToString(const EPromoteMemberCompletionResult Value)
 	return TEXT("Unknown");
 }
 
-inline const TCHAR* ToString(const PartySystemPermissions::EPresencePermissions Value)
+inline const TCHAR* ToString(const PartySystemPermissions::EPermissionType Value)
 {
 	switch (Value)
 	{
-	case PartySystemPermissions::EPresencePermissions::DoNotPublish:
+	case PartySystemPermissions::EPermissionType::Noone:
 	{
-		return TEXT("DoNotPublish");
+		return TEXT("Noone");
 	}
-	case PartySystemPermissions::EPresencePermissions::LeaderPublishIdNonePublishKey:
-	{
-		return TEXT("LeaderPublishIdNonePublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::LeaderPublishIdLeaderPublishKey:
-	{
-		return TEXT("LeaderPublishIdLeaderPublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::FriendPublishIdNonePublishKey:
-	{
-		return TEXT("FriendPublishIdNonePublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::FriendPublishIdLeaderPublishKey:
-	{
-		return TEXT("FriendPublishIdLeaderPublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::FriendPublishIdFriendPublishKey:
-	{
-		return TEXT("FriendPublishIdFriendPublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::AnyonePublishIdNonePublishKey:
-	{
-		return TEXT("AnyonePublishIdNonePublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::AnyonePublishIdLeaderPublishKey:
-	{
-		return TEXT("AnyonePublishIdLeaderPublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::AnyonePublishIdFriendPublishKey:
-	{
-		return TEXT("AnyonePublishIdFriendPublishKey");
-	}
-	case PartySystemPermissions::EPresencePermissions::AnyonePublishIdAnyonePublishKey:
-	{
-		return TEXT("AnyonePublishIdAnyonePublishKey");
-	}
-	}
-	return TEXT("Unknown");
-}
-
-inline const TCHAR* ToString(const PartySystemPermissions::EInvitePermissions Value)
-{
-	switch (Value)
-	{
-	case PartySystemPermissions::EInvitePermissions::Leader:
+	case PartySystemPermissions::EPermissionType::Leader:
 	{
 		return TEXT("Leader");
 	}
-	case PartySystemPermissions::EInvitePermissions::Friends:
+	case PartySystemPermissions::EPermissionType::Friends:
 	{
 		return TEXT("Friends");
 	}
-	case PartySystemPermissions::EInvitePermissions::Anyone:
+	case PartySystemPermissions::EPermissionType::Anyone:
 	{
 		return TEXT("Anyone");
 	}
@@ -2105,12 +2047,10 @@ inline FString ToDebugString(const FPartyConfiguration& PartyConfiguration)
 
 inline FString ToDebugString(const IOnlinePartyJoinInfo& JoinInfo)
 {
-	return FString::Printf(TEXT("SourceUserId(%s) SourceDisplayName(%s) PartyId(%s) LeaderUserId(%s) LeaderDisplayName(%s) HasKey(%d) HasPassword(%d) IsAcceptingMembers(%d) NotAcceptingReason(%d)"),
+	return FString::Printf(TEXT("SourceUserId(%s) SourceDisplayName(%s) PartyId(%s) HasKey(%d) HasPassword(%d) IsAcceptingMembers(%d) NotAcceptingReason(%d)"),
 			*(JoinInfo.GetSourceUserId()->ToDebugString()),
 			*(JoinInfo.GetSourceDisplayName()),
 			*(JoinInfo.GetPartyId()->ToDebugString()),
-			JoinInfo.GetLeaderId()->IsValid() ? *(JoinInfo.GetLeaderId()->ToString()) : TEXT("not set"),
-			!JoinInfo.GetLeaderDisplayName().IsEmpty() ? *(JoinInfo.GetLeaderDisplayName()) : TEXT("not set"),
 			JoinInfo.HasKey() ? 1 : 0,
 			JoinInfo.HasPassword() ? 1 : 0,
 			JoinInfo.IsAcceptingMembers() ? 1 : 0,
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePresenceInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePresenceInterface.h
index d2516803c453..5477090569cc 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePresenceInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePresenceInterface.h
@@ -8,6 +8,18 @@
 #include "OnlineDelegateMacros.h"
 #include "OnlineKeyValuePair.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlinePresence, Display, All);
+
+#define UE_LOG_ONLINE_PRESENCE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlinePresence, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_PRESENCE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlinePresence, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /** Type of presence keys */
 typedef FString FPresenceKey;
 
@@ -23,7 +35,7 @@ const FString CustomPresenceDataKey = TEXT("CustomData");
 /** Name of the client that sent the presence update */
 const FString DefaultAppIdKey = TEXT("AppId");
 
-/** Name of the platform the the presence update */
+/** Platform of the client that sent the presence update */
 const FString DefaultPlatformKey = TEXT("Platform");
 
 /** Override Id of the client to set the presence state to */
@@ -113,6 +125,11 @@ public:
 	{
 
 	}
+
+	FString ToDebugString()
+	{
+		return FString::Printf(TEXT("FOnlineUserPresenceStatus {State: %d, Status: %s}"), static_cast<int32>(State), *StatusStr);
+	}
 };
 
 /**
@@ -145,6 +162,38 @@ public:
 		bHasVoiceSupport = 0;
 		Status = FOnlineUserPresenceStatus();
 	}
+
+	const FString GetPlatform() const
+	{
+		FString ParsedOnlinePlatform = TEXT("");
+		const FVariantData* VariantOnlinePlatform = Status.Properties.Find(DefaultPlatformKey);
+		if (VariantOnlinePlatform != nullptr && VariantOnlinePlatform->GetType() == EOnlineKeyValuePairDataType::String)
+		{
+			VariantOnlinePlatform->GetValue(ParsedOnlinePlatform);
+		}
+		return ParsedOnlinePlatform;
+	}
+
+	const FString GetAppId() const
+	{
+		FString Result = TEXT("");
+		const FVariantData* AppId = Status.Properties.Find(DefaultAppIdKey);
+		const FVariantData* OverrideAppId = Status.Properties.Find(OverrideAppIdKey);
+		if (OverrideAppId != nullptr && OverrideAppId->GetType() == EOnlineKeyValuePairDataType::String)
+		{
+			OverrideAppId->GetValue(Result);
+		}
+		else if (AppId != nullptr && AppId->GetType() == EOnlineKeyValuePairDataType::String)
+		{
+			AppId->GetValue(Result);
+		}
+		return Result;
+	}
+
+	FString ToDebugString()
+	{
+		return FString::Printf(TEXT("FOnlineUserPresence {%s, Online? %d Playing? %d ThisGame? %d Joinable? %d VoiceSupport? %d Status: %s"), SessionId.IsValid() ? *SessionId->ToDebugString() : TEXT("NULL"), bIsOnline, bIsPlaying, bIsPlayingThisGame, bIsJoinable, bHasVoiceSupport, *Status.ToDebugString());
+	}
 };
 
 /**
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePurchaseInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePurchaseInterface.h
index 36249bdfdd48..a8bb637d5c12 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePurchaseInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlinePurchaseInterface.h
@@ -5,9 +5,22 @@
 #include "CoreMinimal.h"
 #include "Interfaces/OnlineEntitlementsInterface.h"
 #include "Interfaces/OnlineStoreInterfaceV2.h"
+#include "OnlineJsonSerializer.h"
 
 struct FOnlineError;
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlinePurchase, Display, All);
+
+#define UE_LOG_ONLINE_PURCHASE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlinePurchase, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_PURCHASE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlinePurchase, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Info needed for checkout
  */
@@ -77,6 +90,7 @@ enum class EPurchaseTransactionState : uint8
  * Receipt result from checkout
  */
 class FPurchaseReceipt
+	: public FOnlineJsonSerializable
 {
 public:
 	FPurchaseReceipt()
@@ -85,6 +99,7 @@ public:
 	}
 
 	struct FLineItemInfo
+		: public FOnlineJsonSerializable
 	{
 		/** The platform identifier of this purchase type */
 		FString ItemName;
@@ -96,18 +111,31 @@ public:
 		FString ValidationInfo;
 
 		inline bool IsRedeemable() const { return !ValidationInfo.IsEmpty(); }
+
+		BEGIN_ONLINE_JSON_SERIALIZER
+			ONLINE_JSON_SERIALIZE("itemName", ItemName);
+			ONLINE_JSON_SERIALIZE("uniqueItemId", UniqueId);
+			ONLINE_JSON_SERIALIZE("validationInfo", ValidationInfo);
+		END_ONLINE_JSON_SERIALIZER
 	};
 
 	/**
 	 * Single purchased offer offer
 	 */
 	struct FReceiptOfferEntry
+		: public FOnlineJsonSerializable
 	{
+		FReceiptOfferEntry()
+			: Quantity(0)
+		{
+		}
+
 		FReceiptOfferEntry(const FOfferNamespace& InNamespace, const FUniqueOfferId& InOfferId, int32 InQuantity)
 			: Namespace(InNamespace)
 			, OfferId(InOfferId)
 			, Quantity(InQuantity)
-		{ }
+		{
+		}
 
 		FOfferNamespace Namespace;
 		FUniqueOfferId OfferId;
@@ -115,6 +143,13 @@ public:
 
 		/** Information about the individual items purchased */
 		TArray<FLineItemInfo> LineItems;
+
+		BEGIN_ONLINE_JSON_SERIALIZER
+			ONLINE_JSON_SERIALIZE("items", Namespace);
+			ONLINE_JSON_SERIALIZE("offerId", OfferId);
+			ONLINE_JSON_SERIALIZE("quantity", Quantity);
+			ONLINE_JSON_SERIALIZE_ARRAY_SERIALIZABLE("items", LineItems, FLineItemInfo);
+		END_ONLINE_JSON_SERIALIZER
 	};
 
 	/**
@@ -125,15 +160,20 @@ public:
 	 * @param InQuantity number purchased
 	 */
 	void AddReceiptOffer(const FOfferNamespace& InNamespace, const FUniqueOfferId& InOfferId, int32 InQuantity)
-	{ 
-		ReceiptOffers.Add(FReceiptOfferEntry(InNamespace, InOfferId, InQuantity)); 
+	{
+		ReceiptOffers.Add(FReceiptOfferEntry(InNamespace, InOfferId, InQuantity));
 	}
 
 	void AddReceiptOffer(const FReceiptOfferEntry& ReceiptOffer)
-	{ 
-		ReceiptOffers.Add(ReceiptOffer); 
+	{
+		ReceiptOffers.Add(ReceiptOffer);
 	}
 
+	BEGIN_ONLINE_JSON_SERIALIZER
+		ONLINE_JSON_SERIALIZE("transactionId", TransactionId);
+		ONLINE_JSON_SERIALIZE_ARRAY_SERIALIZABLE("receiptList", ReceiptOffers, FReceiptOfferEntry);
+	END_ONLINE_JSON_SERIALIZER
+
 public:
 	/** Unique Id for this transaction/order */
 	FString TransactionId;
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSessionInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSessionInterface.h
index ba1b6f540b7c..66fb051c0122 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSessionInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSessionInterface.h
@@ -12,6 +12,18 @@ class FOnlineSessionSearch;
 class FOnlineSessionSearchResult;
 class FOnlineSessionSettings;
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineSession, Display, All);
+
+#define UE_LOG_ONLINE_SESSION(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineSession, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINESESSION(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineSession, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate fired when a session create request has completed
  *
@@ -111,29 +123,26 @@ namespace EOnJoinSessionCompleteResult
 	};
 }
 
-namespace Lex
+/** Convert a EOnJoinSessionCompleteResult into a string */
+inline const TCHAR* LexToString(const EOnJoinSessionCompleteResult::Type Value)
 {
-	/** Convert a EOnJoinSessionCompleteResult into a string */
-	inline const TCHAR* ToString(const EOnJoinSessionCompleteResult::Type Value)
+	switch (Value)
 	{
-		switch (Value)
-		{
-		case EOnJoinSessionCompleteResult::Success:
-			return TEXT("Success");
-		case EOnJoinSessionCompleteResult::SessionIsFull:
-			return TEXT("SessionIsFull");
-		case EOnJoinSessionCompleteResult::SessionDoesNotExist:
-			return TEXT("SessionDoesNotExist");
-		case EOnJoinSessionCompleteResult::CouldNotRetrieveAddress:
-			return TEXT("CouldNotretrieveAddress");
-		case EOnJoinSessionCompleteResult::AlreadyInSession:
-			return TEXT("AlreadyInSession");
-		case EOnJoinSessionCompleteResult::UnknownError:
-			; // Intentional fall-through
-		}
-		
-		return TEXT("UnknownError");
+	case EOnJoinSessionCompleteResult::Success:
+		return TEXT("Success");
+	case EOnJoinSessionCompleteResult::SessionIsFull:
+		return TEXT("SessionIsFull");
+	case EOnJoinSessionCompleteResult::SessionDoesNotExist:
+		return TEXT("SessionDoesNotExist");
+	case EOnJoinSessionCompleteResult::CouldNotRetrieveAddress:
+		return TEXT("CouldNotretrieveAddress");
+	case EOnJoinSessionCompleteResult::AlreadyInSession:
+		return TEXT("AlreadyInSession");
+	case EOnJoinSessionCompleteResult::UnknownError:
+		; // Intentional fall-through
 	}
+		
+	return TEXT("UnknownError");
 }
 
 /**
@@ -284,6 +293,13 @@ protected:
 public:
 	virtual ~IOnlineSession() {};
 
+	/**
+	 * Create a session id from a string
+	 * @param SessionIdStr the string representation of the session id
+	 * @return a session id, or nullptr if SessionIdStr is invalid
+	 */
+	virtual TSharedPtr<const FUniqueNetId> CreateSessionIdFromString(const FString& SessionIdStr) = 0;
+
 	/**
 	 * Searches the named session array for the specified session
 	 *
@@ -503,6 +519,7 @@ public:
 	 * Find a single advertised session by session id
 	 *
 	 * @param SearchingUserId user initiating the request
+	 * @param Platform platform the session is on
 	 * @param SessionId session id to search for
 	 * @param FriendId optional id of user to verify in session
 	 * @param CompletionDelegate delegate to call on completion
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSharingInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSharingInterface.h
index 0bcc5825b6de..3675b6d624cd 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSharingInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineSharingInterface.h
@@ -7,6 +7,18 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineSharing, Display, All);
+
+#define UE_LOG_ONLINE_SHARING(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineSharing, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_SHARING(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineSharing, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Called to notify of a post being shared on the server
  *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterface.h
index 4af530accfa0..5440b4ff25cd 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterface.h
@@ -8,6 +8,18 @@
 #include "OnlineDelegateMacros.h"
 #include "OnlineStoreInterface.generated.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineStore, Display, All);
+
+#define UE_LOG_ONLINE_STORE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineStore, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_STORE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineStore, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Possible result states of an in-app purchase transaction
  */
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterfaceV2.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterfaceV2.h
index 679939dd4e6a..d2a9fe5131cf 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterfaceV2.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineStoreInterfaceV2.h
@@ -4,6 +4,18 @@
 
 #include "CoreMinimal.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineStoreV2, Display, All);
+
+#define UE_LOG_ONLINE_STOREV2(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineStoreV2, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_STOREV2(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineStoreV2, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 class FUniqueNetId;
 
 typedef FString FUniqueOfferId;
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineTitleFileInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineTitleFileInterface.h
index 36287bdbb0b6..e169ba870ef0 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineTitleFileInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineTitleFileInterface.h
@@ -6,6 +6,18 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineTitleFile, Display, All);
+
+#define UE_LOG_ONLINE_TITLEFILE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineTitleFile, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_TITLEFILE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineTitleFile, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate fired when the list of files has been returned from the network store
  *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserCloudInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserCloudInterface.h
index 36202e29d87d..5e8aa263126f 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserCloudInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserCloudInterface.h
@@ -6,6 +6,18 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineCloud, Display, All);
+
+#define UE_LOG_ONLINE_CLOUD(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineCloud, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_CLOUD(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineCloud, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate fired when the list of files has been returned from the network store
  *
@@ -101,7 +113,7 @@ public:
 	 * @param FileName the name of the file to read
 	 * @param FileContents the out buffer to copy the data into
 	 *
- 	 * @return true if the data was copied, false otherwise
+	 * @return true if the data was copied, false otherwise
 	 */
 	virtual bool GetFileContents(const FUniqueNetId& UserId, const FString& FileName, TArray<uint8>& FileContents) = 0;
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserInterface.h
index 4c89d501830f..f6d3df3f6046 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/OnlineUserInterface.h
@@ -7,6 +7,17 @@
 #include "OnlineSubsystemTypes.h"
 #include "OnlineDelegateMacros.h"
 
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineUser, Display, All);
+#define UE_LOG_ONLINE_USER(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineUser, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_USER(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineUser, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
 /**
  * Delegate used when the user query request has completed
  *
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/VoiceInterface.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/VoiceInterface.h
index 6675632951bc..aa9901cf80fc 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/VoiceInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/Interfaces/VoiceInterface.h
@@ -10,6 +10,27 @@
 class FVoicePacket;
 
 ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogVoiceEngine, Display, All);
+#define UE_LOG_ONLINE_VOICEENGINE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogVoiceEngine, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_VOICEENGINE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogVoiceEngine, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineVoice, Display, All);
+
+#define UE_LOG_ONLINE_VOICE(Verbosity, Format, ...) \
+{ \
+	UE_LOG(LogOnlineVoice, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
+
+#define UE_CLOG_ONLINE_VOICE(Conditional, Verbosity, Format, ...) \
+{ \
+	UE_CLOG(Conditional, LogOnlineVoice, Verbosity, TEXT("%s%s"), ONLINE_LOG_PREFIX, *FString::Printf(Format, ##__VA_ARGS__)); \
+}
 
 /** Enable to pipe local voice data back to this client as remote data */
 #define VOICE_LOOPBACK !UE_BUILD_SHIPPING
@@ -52,7 +73,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 StartLocalVoiceProcessing(uint32 LocalUserNum) = 0;
+	virtual uint32 StartLocalVoiceProcessing(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Stops local voice processing for the specified user index
@@ -61,7 +82,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 StopLocalVoiceProcessing(uint32 LocalUserNum) = 0;
+	virtual uint32 StopLocalVoiceProcessing(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Starts remote voice processing for the specified user
@@ -70,7 +91,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 StartRemoteVoiceProcessing(const FUniqueNetId& UniqueId) = 0;
+	virtual uint32 StartRemoteVoiceProcessing(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Stops remote voice processing for the specified user
@@ -79,7 +100,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 StopRemoteVoiceProcessing(const FUniqueNetId& UniqueId) = 0;
+	virtual uint32 StopRemoteVoiceProcessing(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Registers the user index as a local talker (interested in voice data)
@@ -88,7 +109,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 RegisterLocalTalker(uint32 LocalUserNum) = 0;
+	virtual uint32 RegisterLocalTalker(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Unregisters the user index as a local talker (not interested in voice data)
@@ -97,7 +118,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 UnregisterLocalTalker(uint32 LocalUserNum) = 0;
+	virtual uint32 UnregisterLocalTalker(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Registers the unique player id as a remote talker (submitted voice data only)
@@ -106,7 +127,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 RegisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
+	virtual uint32 RegisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Unregisters the unique player id as a remote talker
@@ -115,7 +136,7 @@ public:
 	 *
 	 * @return 0 upon success, an error code otherwise
 	 */
-    virtual uint32 UnregisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
+	virtual uint32 UnregisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Checks whether a local user index has a headset present or not
@@ -124,7 +145,7 @@ public:
 	 *
 	 * @return true if there is a headset, false otherwise
 	 */
-    virtual bool IsHeadsetPresent(uint32 LocalUserNum) = 0;
+	virtual bool IsHeadsetPresent(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Determines whether a local user index is currently talking or not
@@ -133,7 +154,7 @@ public:
 	 *
 	 * @return true if the user is talking, false otherwise
 	 */
-    virtual bool IsLocalPlayerTalking(uint32 LocalUserNum) = 0;
+	virtual bool IsLocalPlayerTalking(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Determines whether a remote talker is currently talking or not
@@ -205,9 +226,9 @@ public:
 	 */
 	virtual void Tick(float DeltaTime) = 0;
 
-    /**
-     * Get information about the voice state for display
-     */
+	/**
+	 * Get information about the voice state for display
+	 */
 	virtual FString GetVoiceDebugState() const = 0;
 };
 
@@ -261,7 +282,7 @@ public:
 	 *
 	 * @return true if the call succeeded, false otherwise
 	 */
-    virtual bool RegisterLocalTalker(uint32 LocalUserNum) = 0;
+	virtual bool RegisterLocalTalker(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Registers all signed in local talkers
@@ -275,7 +296,7 @@ public:
 	 *
 	 * @return true if the call succeeded, false otherwise
 	 */
-    virtual bool UnregisterLocalTalker(uint32 LocalUserNum) = 0;
+	virtual bool UnregisterLocalTalker(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Unregisters all signed in local talkers
@@ -289,7 +310,7 @@ public:
 	 *
 	 * @return true if the call succeeded, false otherwise
 	 */
-    virtual bool RegisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
+	virtual bool RegisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Unregisters the unique player id as a remote talker
@@ -298,7 +319,7 @@ public:
 	 *
 	 * @return true if the call succeeded, false otherwise
 	 */
-    virtual bool UnregisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
+	virtual bool UnregisterRemoteTalker(const FUniqueNetId& UniqueId) = 0;
 
 	/**
 	 * Iterates the current remote talker list unregistering them with the 
@@ -313,7 +334,7 @@ public:
 	 *
 	 * @return true if there is a headset, false otherwise
 	 */
-    virtual bool IsHeadsetPresent(uint32 LocalUserNum) = 0;
+	virtual bool IsHeadsetPresent(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Determines whether a local user index is currently talking or not
@@ -322,7 +343,7 @@ public:
 	 *
 	 * @return true if the user is talking, false otherwise
 	 */
-    virtual bool IsLocalPlayerTalking(uint32 LocalUserNum) = 0;
+	virtual bool IsLocalPlayerTalking(uint32 LocalUserNum) = 0;
 
 	/**
 	 * Determines whether a remote talker is currently talking or not
@@ -371,7 +392,7 @@ public:
 	 * @param LocalUserNum the user that is allowing the remote talker to talk
 	 * @param PlayerId the remote talker that is being restored to talking
 	 * @param bIsSystemWide whether to try to unmute them globally or not
- 	 *
+	 *
 	 * @return TRUE if the function succeeds, FALSE otherwise
 	 */
 	virtual bool UnmuteRemoteTalker(uint8 LocalUserNum, const FUniqueNetId& PlayerId, bool bIsSystemWide) = 0;
@@ -407,9 +428,9 @@ public:
 	 */
 	virtual void Tick(float DeltaTime) = 0;
 
-    /**
-     * Get information about the voice state for display
-     */
+	/**
+	 * Get information about the voice state for display
+	 */
 	virtual FString GetVoiceDebugState() const = 0;
 };
 
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSessionSettings.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSessionSettings.h
index e601e94fd7b1..62f93347c46f 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSessionSettings.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSessionSettings.h
@@ -322,10 +322,10 @@ public:
 	{
 	}
 
-	FOnlineSessionSettings(const FOnlineSessionSettings& Other) = default;
-	FOnlineSessionSettings(FOnlineSessionSettings&& Other) = default;
-	FOnlineSessionSettings& operator=(const FOnlineSessionSettings& Other) = default;
-	FOnlineSessionSettings& operator=(FOnlineSessionSettings&& Other) = default;
+	FOnlineSessionSettings(FOnlineSessionSettings&&) = default;
+	FOnlineSessionSettings(const FOnlineSessionSettings&) = default;
+	FOnlineSessionSettings& operator=(FOnlineSessionSettings&&) = default;
+	FOnlineSessionSettings& operator=(const FOnlineSessionSettings&) = default;
 
 	/**
 	 *	Sets a key value pair combination that defines a session setting with an ID
@@ -434,14 +434,12 @@ public:
 	{
 	}
 
-	virtual ~FOnlineSession()
-	{
-	}
+	FOnlineSession(FOnlineSession&&) = default;
+	FOnlineSession(const FOnlineSession&) = default;
+	FOnlineSession& operator=(FOnlineSession&&) = default;
+	FOnlineSession& operator=(const FOnlineSession&) = default;
 
-	FOnlineSession(const FOnlineSession& Other) = default;
-	FOnlineSession(FOnlineSession&& Other) = default;
-	FOnlineSession& operator=(const FOnlineSession& Other) = default;
-	FOnlineSession& operator=(FOnlineSession&& Other) = default;
+	virtual ~FOnlineSession() = default;
 
 	/** @return the session id for a given session */
 	FString GetSessionIdStr() const
@@ -669,10 +667,10 @@ public:
 	{
 	}
 
-	FOnlineSessionSearch(const FOnlineSessionSearch& Other) = default;
-	FOnlineSessionSearch(FOnlineSessionSearch&& Other) = default;
-	FOnlineSessionSearch& operator=(const FOnlineSessionSearch& Other) = default;
-	FOnlineSessionSearch& operator=(FOnlineSessionSearch&& Other) = default;
+	FOnlineSessionSearch(FOnlineSessionSearch&&) = default;
+	FOnlineSessionSearch(const FOnlineSessionSearch&) = default;
+	FOnlineSessionSearch& operator=(FOnlineSessionSearch&&) = default;
+	FOnlineSessionSearch& operator=(const FOnlineSessionSearch&) = default;
 
 	/**
 	 *	Give the game a chance to sort the returned results
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystem.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystem.h
index 7aea1d934cc3..b0ad8d963fc1 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystem.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystem.h
@@ -41,7 +41,6 @@ class IOnlineVoice;
 
 ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnline, Display, All);
 ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineGame, Display, All);
-ONLINESUBSYSTEM_API DECLARE_LOG_CATEGORY_EXTERN(LogOnlineChat, Display, All);
 
 /** Online subsystem stats */
 DECLARE_STATS_GROUP(TEXT("Online"), STATGROUP_Online, STATCAT_Advanced);
@@ -54,12 +53,6 @@ DECLARE_CYCLE_STAT_EXTERN(TEXT("SessionInt"), STAT_Session_Interface, STATGROUP_
 /** Total time to process both local/remote voice */
 DECLARE_CYCLE_STAT_EXTERN(TEXT("VoiceInt"), STAT_Voice_Interface, STATGROUP_Online, ONLINESUBSYSTEM_API);
 
-#if UE_BUILD_SHIPPING
-#define OSS_REDACT(x) TEXT("<Redacted>")
-#else
-#define OSS_REDACT(x) (x)
-#endif
-
 #define ONLINE_LOG_PREFIX TEXT("OSS: ")
 #define UE_LOG_ONLINE(Verbosity, Format, ...) \
 { \
@@ -157,7 +150,7 @@ public:
 	}
 
 	/** 
-	 * Get the online subsystem based on current platform
+	 * Get the online subsystem native to the current hardware
 	 *
 	 * @param bAutoLoad - load the module if not already loaded
 	 *
@@ -165,33 +158,11 @@ public:
 	 */
 	static IOnlineSubsystem* GetByPlatform(bool bAutoLoad=true)
 	{
-		if (PLATFORM_PS4)
+		static const FName OnlineSubsystemModuleName = TEXT("OnlineSubsystem");
+		if (bAutoLoad || FModuleManager::Get().IsModuleLoaded(OnlineSubsystemModuleName))
 		{
-			if (bAutoLoad || IOnlineSubsystem::IsLoaded(PS4_SUBSYSTEM))
-			{
-				return IOnlineSubsystem::Get(PS4_SUBSYSTEM);
-			}
-		}
-		else if (PLATFORM_XBOXONE)
-		{
-			if (bAutoLoad || IOnlineSubsystem::IsLoaded(LIVE_SUBSYSTEM))
-			{
-				return IOnlineSubsystem::Get(LIVE_SUBSYSTEM);
-			}
-		}
-		else if (PLATFORM_ANDROID)
-		{
-			if (bAutoLoad || IOnlineSubsystem::IsLoaded(GOOGLEPLAY_SUBSYSTEM))
-			{
-				return IOnlineSubsystem::Get(GOOGLEPLAY_SUBSYSTEM);
-			}
-		}
-		else if (PLATFORM_IOS)
-		{
-			if (bAutoLoad || IOnlineSubsystem::IsLoaded(IOS_SUBSYSTEM))
-			{
-				return IOnlineSubsystem::Get(IOS_SUBSYSTEM);
-			}
+			FOnlineSubsystemModule& OSSModule = FModuleManager::GetModuleChecked<FOnlineSubsystemModule>(OnlineSubsystemModuleName);
+			return OSSModule.GetNativeSubsystem(bAutoLoad);
 		}
 		return nullptr;
 	}
@@ -274,6 +245,13 @@ public:
 	 */
 	virtual FName GetInstanceName() const = 0;
 
+	/**
+	 * Get the local online platform based on compile time determination of hardware.
+	 * @see OnlineSubsystemNames.h OSS_PLATFORM_NAME_*
+	 * @return string representation of online platform name
+	 */
+	static FString GetLocalPlatformName();
+
 	/** @return true if the subsystem is enabled, false otherwise */
 	virtual bool IsEnabled() const = 0;
 
@@ -549,6 +527,11 @@ public:
 	 */
 	virtual EOnlineEnvironment::Type GetOnlineEnvironment() const = 0;
 
+	/**
+	 * @return the current environment being used for the online platform as defined by the platform (not necessarily EOnlineEnvironment::ToString)
+	 */
+	virtual FString GetOnlineEnvironmentName() const = 0;
+
 	/**
 	 * Delegate fired when the online environment changes
 	 *
@@ -569,6 +552,13 @@ public:
 	 * @return The name of the online service this platform uses
 	 */
 	virtual FText GetOnlineServiceName() const = 0;
+
+	/**
+	 * Reload the configuration if it is relevant for this OSS instance
+	 *
+	 * @param ConfigSections list of ini sections that need to be reloaded
+	 */
+	virtual void ReloadConfigs(const TSet<FString>& ConfigSections) = 0;
 };
 
 /** Public references to the online subsystem pointer should use this */
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemImpl.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemImpl.h
index 3b3ae500362f..0b2726c3e48f 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemImpl.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemImpl.h
@@ -91,11 +91,13 @@ public:
 	virtual bool IsLocalPlayer(const FUniqueNetId& UniqueId) const override;
 	virtual void SetUsingMultiplayerFeatures(const FUniqueNetId& UniqueId, bool bUsingMP) override {};
 	virtual EOnlineEnvironment::Type GetOnlineEnvironment() const override { return EOnlineEnvironment::Unknown; }
+	virtual FString GetOnlineEnvironmentName() const override { return EOnlineEnvironment::ToString(GetOnlineEnvironment()); }
 	virtual IMessageSanitizerPtr GetMessageSanitizer(int32 LocalUserNum, FString& OutAuthTypeToExclude) const override;
 	virtual bool Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar) override;
 	virtual FName GetSubsystemName() const override { return SubsystemName; }
 	virtual FName GetInstanceName() const override { return InstanceName; }
 	virtual bool IsEnabled() const override;
+	virtual void ReloadConfigs(const TSet<FString>& /*ConfigSections*/) override {};
 
 	/**
 	 * Tick function
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemModule.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemModule.h
index 7f6813e7aa70..730968e0aab8 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemModule.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemModule.h
@@ -25,6 +25,14 @@ private:
 	 */
 	FName DefaultPlatformService;
 
+	/**
+	 * Name of the online service associated with the native platform
+	 * Specified in Base<Platform>Engine.ini
+	 *	[OnlineSubsystem]
+	 *	NativePlatformService
+	 */
+	FName NativePlatformService;
+
 	/** Existing instances of any online subsystems created <PlatformName:InstanceName> */
 	TMap<FName, class IOnlineFactory*> OnlineFactories;
 
@@ -90,6 +98,15 @@ public:
 	 */
 	virtual IOnlineSubsystem* GetOnlineSubsystem(const FName InSubsystemName = NAME_None);
 
+	/** 
+	 * Get the online subsystem native to the current hardware
+	 *
+	 * @param bAutoLoad - load the module if not already loaded
+	 *
+	 * @return pointer to the appropriate online subsystem
+	 */
+	virtual IOnlineSubsystem* GetNativeSubsystem(bool bAutoLoad);
+
 	/**
 	 * Destroys an online subsystem created internally via access with GetOnlineSubsystem
 	 * Typically destruction of the subsystem is handled at application exit, but
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemNames.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemNames.h
index 70696140b675..190532c93899 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemNames.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemNames.h
@@ -4,6 +4,20 @@
 
 #include "CoreMinimal.h"
 
+
+#define OSS_PLATFORM_NAME_PS4		TEXT("PSN")
+#define OSS_PLATFORM_NAME_XBOX		TEXT("XBL")
+#define OSS_PLATFORM_NAME_WINDOWS	TEXT("WIN")
+#define OSS_PLATFORM_NAME_MAC		TEXT("MAC")
+#define OSS_PLATFORM_NAME_LINUX		TEXT("LNX")
+#define OSS_PLATFORM_NAME_IOS		TEXT("IOS")
+#define OSS_PLATFORM_NAME_ANDROID	TEXT("AND")
+#define OSS_PLATFORM_NAME_SWITCH	TEXT("SWT")
+#define OSS_PLATFORM_NAME_OTHER		TEXT("OTHER")
+#define OSS_PLATFORM_NAME_EREBUS	TEXT("TST2")
+
+
+
 #ifndef NULL_SUBSYSTEM
 #define NULL_SUBSYSTEM FName(TEXT("NULL"))
 #endif
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemTypes.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemTypes.h
index 430b62dd74a4..1fc30fa358ce 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Public/OnlineSubsystemTypes.h
@@ -5,6 +5,13 @@
 #include "CoreMinimal.h"
 #include "UObject/CoreOnline.h"
 #include "OnlineSubsystemPackage.h"
+#include "OnlineSubsystemNames.h"  // can be removed once we have no more temporary FUniqueNetId subtypes
+
+#if UE_BUILD_SHIPPING
+#define OSS_REDACT(x) TEXT("<Redacted>")
+#else
+#define OSS_REDACT(x) (x)
+#endif
 
 /** Maximum players supported on a given platform */
 #if PLATFORM_XBOXONE
@@ -98,7 +105,9 @@ namespace ELoginStatus
 		/** Player is using a local profile but is not logged in */
 		UsingLocalProfile,
 		/** Player has been validated by the platform specific authentication service */
-		LoggedIn
+		LoggedIn,
+		/** In addition to being logged in, player is connected to additional services. Only used on platforms where this is different from LoggedIn */
+		Connected
 	};
 
 	/** @return the stringified version of the enum passed in */
@@ -118,6 +127,10 @@ namespace ELoginStatus
 			{
 				return TEXT("LoggedIn");
 			}
+			case Connected:
+			{
+				return TEXT("Connected");
+			}
 		}
 		return TEXT("");
 	}
@@ -201,11 +214,15 @@ namespace EOnlineServerConnectionStatus
 			}
 			case NotAuthorized:
 			{
-				return TEXT("Not Authorized");
+				return TEXT("NotAuthorized");
 			}
 			case InvalidSession:
 			{
-				return TEXT("Invalid Session");
+				return TEXT("InvalidSession");
+			}
+			default:
+			{
+				return TEXT("Unknown");
 			}
 		}
 		return TEXT("");
@@ -802,6 +819,9 @@ public:
 	}
 };
 
+// placeholder "type" until we can make FUniqueNetIdString sufficiently abstract
+static FName NAME_Unset = TEXT("UNSET");
+
 /**
  * Unique net id wrapper for a string
  */
@@ -811,6 +831,8 @@ public:
 	/** Holds the net id for a player */
 	FString UniqueNetIdStr;
 
+	FName Type = NAME_Unset;
+
 	// Define these to increase visibility to public (from parent's protected)
 	FUniqueNetIdString() = default;
 
@@ -828,6 +850,7 @@ public:
 	 */
 	explicit FUniqueNetIdString(const FString& InUniqueNetId)
 		: UniqueNetIdStr(InUniqueNetId)
+		, Type(NAME_Unset)
 	{
 	}
 
@@ -838,6 +861,7 @@ public:
 	 */
 	explicit FUniqueNetIdString(FString&& InUniqueNetId)
 		: UniqueNetIdStr(MoveTemp(InUniqueNetId))
+		, Type(NAME_Unset)
 	{
 	}
 
@@ -848,11 +872,26 @@ public:
 	 */
 	explicit FUniqueNetIdString(const FUniqueNetId& Src)
 		: UniqueNetIdStr(Src.ToString())
+		, Type(Src.GetType())
+	{
+	}
+
+	/** 
+	* don.eubanks - Including a constructor that allows for type passing to make transitioning easier, if we determine we want to abstract-ify this class, this constructor will be removed
+	*/
+	FUniqueNetIdString(const FString& InUniqueNetId, const FName InType)
+		: UniqueNetIdStr(InUniqueNetId)
+		, Type(InType)
 	{
 	}
 
 	// IOnlinePlatformData
 
+	virtual FName GetType() const override
+	{
+		return Type;
+	}
+
 	virtual const uint8* GetBytes() const override
 	{
 		return (const uint8*)UniqueNetIdStr.GetCharArray().GetData();
@@ -885,6 +924,35 @@ public:
 	}
 };
 
+
+#define TEMP_UNIQUENETIDSTRING_SUBCLASS(SUBCLASSNAME, TYPE) \
+class SUBCLASSNAME : public FUniqueNetIdString \
+{ \
+public: \
+	SUBCLASSNAME() \
+		: FUniqueNetIdString()	 \
+	{ \
+		Type = TYPE; \
+	} \
+	explicit SUBCLASSNAME(const FString& InUniqueNetId) \
+		: FUniqueNetIdString(InUniqueNetId, TYPE) \
+	{ \
+	} \
+	explicit SUBCLASSNAME(FString&& InUniqueNetId) \
+		: FUniqueNetIdString(MoveTemp(InUniqueNetId), TYPE) \
+	{ \
+	} \
+	explicit SUBCLASSNAME(const FUniqueNetId& Src) \
+		: FUniqueNetIdString(Src) \
+	{ \
+		check(GetType() == TYPE); \
+	} \
+	friend uint32 GetTypeHash(const SUBCLASSNAME& A) \
+	{ \
+		return ::GetTypeHash(A.UniqueNetIdStr); \
+	} \
+};
+
 /** 
  * Abstraction of a profile service shared file handle
  * The class is meant to be opaque (see IOnlinePlatformData)
@@ -1125,6 +1193,7 @@ public:
  */
 #define AUTH_ATTR_REFRESH_TOKEN TEXT("refresh_token")
 #define AUTH_ATTR_ID_TOKEN TEXT("id_token")
+#define AUTH_ATTR_AUTHORIZATION_CODE TEXT("authorization_code")
 
 /**
  * User account information returned via IOnlineIdentity interface
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineAchievements.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineAchievements.spec.cpp
new file mode 100644
index 000000000000..c5b9abb69495
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineAchievements.spec.cpp
@@ -0,0 +1,895 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "OnlineSubsystem.h"
+#include "Online.h"
+#include "Interfaces/OnlinePresenceInterface.h"
+#include "Misc/AutomationTest.h"
+#include "Utils/OnlineErrors.data.h"
+#include "Utils/OnlineTestCommon.h"
+
+BEGIN_DEFINE_SPEC(FOnlineAchievementsSpec, "OnlineAchievementsInterface", EAutomationTestFlags::EngineFilter | EAutomationTestFlags::ApplicationContextMask)
+
+IOnlineIdentityPtr OnlineIdentity;
+IOnlineAchievementsPtr OnlineAchievements;
+
+FOnlineAccountCredentials AccountCredentials;
+
+FOnlineTestCommon CommonUtils;
+
+// Delegate Handles
+FDelegateHandle OnLoginCompleteDelegateHandle;
+FDelegateHandle OnLogoutCompleteDelegateHandle;
+
+END_DEFINE_SPEC(FOnlineAchievementsSpec)
+
+void FOnlineAchievementsSpec::Define()
+{
+	TArray<FName> Subsystems = FOnlineTestCommon::GetEnabledTestSubsystems();
+
+	for (int32 Index = 0; Index < Subsystems.Num(); Index++)
+	{
+		FName SubsystemType = Subsystems[Index];
+
+		Describe(SubsystemType.ToString(), [this, SubsystemType]()
+		{
+			BeforeEach([this, SubsystemType]()
+			{
+				CommonUtils = FOnlineTestCommon();
+				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+
+				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
+				OnlineAchievements = Online::GetAchievementsInterface(SubsystemType);
+
+				// If OnlineAchievements is not valid, the following test, including all other nested BeforeEaches, will not run
+				if (!OnlineIdentity.IsValid())
+				{
+					UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineAchievements.IsValid())
+				{
+					UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: Failed to load OnlineAchievements Interface for %s"), *SubsystemType.ToString());
+				}
+
+			});
+
+			// TODO: Still need to validate some tests for functionality
+			Describe("Online Achievements", [this, SubsystemType]()
+			{
+				Describe("WriteAchievements", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.ResetTestAccountAchievements(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+
+					LatentIt("When calling WriteAchievements with a valid PlayerId and WriteObject, this subsystem writes achievements to the server", EAsyncExecution::ThreadPool, [this](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										FString TestAchievement = PlayerAchievements[0].Id;
+
+										FOnlineAchievement SomeAchievement;
+										OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+										TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+										TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+										FOnlineAchievementsWritePtr AchievementWriteObject = MakeShareable(new FOnlineAchievementsWrite());
+										FOnlineAchievementsWriteRef AchievementWriter = AchievementWriteObject.ToSharedRef();
+										AchievementWriteObject->SetFloatStat(FName(*TestAchievement), 1.0f);
+
+										OnlineAchievements->WriteAchievements(*TestAccountId, AchievementWriter, FOnAchievementsWrittenDelegate::CreateLambda([this, &SomeAchievement, AchievementWriteObject, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& WriteAchievementsPlayerId, bool bWriteAchievementsWasSuccessful)
+										{
+											TestEqual("Verify that bWriteAchievementsWasSuccessful returns as: True", bWriteAchievementsWasSuccessful, true);
+											TestEqual("Verify that AchievementWriteObject->WriteState returns as: EOnlineAsyncTaskState::Type::Done", AchievementWriteObject->WriteState == EOnlineAsyncTaskState::Type::Done, true);
+
+											OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, &SomeAchievement, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& SecondQueryAchievementsPlayerId, const bool bSecondQueryAchievementsWasSuccessful)
+											{
+												OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+												TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+												TestEqual("Verify that SomeAchievement.Progress is: 100", SomeAchievement.Progress == 100, true);
+
+												TestDone.Execute();
+											}));
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: Invalid WriteObject? Or Empty WriteObject? WriteAchievements doesn't care about an empty WriteObject
+					LatentIt("When calling WriteAchievements with a valid PlayerId but an invalid WriteObject, this subsystem does not write achievements to the server", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										FString TestAchievement = PlayerAchievements[0].Id;
+
+										FOnlineAchievement SomeAchievement;
+										OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+										TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+										TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+										FOnlineAchievementsWritePtr AchievementWriteObject = MakeShareable(new FOnlineAchievementsWrite());
+										FOnlineAchievementsWriteRef AchievementWriter = AchievementWriteObject.ToSharedRef();
+
+										OnlineAchievements->WriteAchievements(*TestAccountId, AchievementWriter, FOnAchievementsWrittenDelegate::CreateLambda([this, &SomeAchievement, AchievementWriteObject, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& WriteAchievements, bool bWriteAchievementsWasSuccessful)
+										{
+											TestEqual("Verify that bWriteAchievementsWasSuccessful returns as: False", bWriteAchievementsWasSuccessful, false);
+											TestEqual("Verify that AchievementWriteObject->WriteState returns as: EOnlineAsyncTaskState::Type::Failed", AchievementWriteObject->WriteState == EOnlineAsyncTaskState::Type::Failed, true);
+
+											OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, &SomeAchievement, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& SecondQueryAchievementsPlayerId, const bool bSecondQueryAchievementsWasSuccessful)
+											{
+												OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+												TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+												TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+												TestDone.Execute();
+											}));
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling WriteAchievements with a valid WriteObject but an invalid PlayerId, this subsystem does not write achievements to the server", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_NONLOCALPLAYER, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										FString TestAchievement = PlayerAchievements[0].Id;
+
+										FOnlineAchievement SomeAchievement;
+										OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+										TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+										TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+										FOnlineAchievementsWritePtr AchievementWriteObject = MakeShareable(new FOnlineAchievementsWrite());
+										FOnlineAchievementsWriteRef AchievementWriter = AchievementWriteObject.ToSharedRef();
+
+										TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+										OnlineAchievements->WriteAchievements(*BadAccountId, AchievementWriter, FOnAchievementsWrittenDelegate::CreateLambda([this, &SomeAchievement, AchievementWriteObject, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& WriteAchievements, bool bWriteAchievementsWasSuccessful)
+										{
+											TestEqual("Verify that bWriteAchievementsWasSuccessful returns as: False", bWriteAchievementsWasSuccessful, false);
+											TestEqual("Verify that AchievementWriteObject->WriteState returns as: EOnlineAsyncTaskState::Type::Failed", AchievementWriteObject->WriteState == EOnlineAsyncTaskState::Type::Failed, true);
+
+											OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, &SomeAchievement, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& SecondQueryAchievementsPlayerId, const bool bSecondQueryAchievementsWasSuccessful)
+											{
+												OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+												TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+												TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+												TestDone.Execute();
+											}));
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				Describe("QueryAchievements", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.AddAchievementToTestAccount(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+
+					LatentIt("When calling QueryAchievements with a valid PlayerId, this subsystem caches that player's achievement information", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", QueryAchievementsPlayerId == *TestAccountId, true);
+									TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: True", bQueryAchievementsWasSuccessful, true);
+
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TestEqual("Verify that PlayerAchievements[0].Progress is: 100", PlayerAchievements[0].Progress == 100, true);
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: Cached achievement progress returns on Steam with bad UserId in query? Might be residual since can't really logout. No way to clear cache?
+					LatentIt("When calling QueryAchievements with an invalid PlayerId, this subsystem does not cache that player's achievement information", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+							if (BadAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*BadAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, BadAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", QueryAchievementsPlayerId == *BadAccountId, true);
+									TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: False", bQueryAchievementsWasSuccessful, false);
+
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TestEqual("Verify that PlayerAchievements[0].Progress is: 0", PlayerAchievements[0].Progress == 0, true);
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on BadAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+						CommonUtils.ResetTestAccountAchievements(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+				});
+
+				Describe("QueryAchievementDescriptions", [this, SubsystemType]()
+				{
+					LatentIt("When calling QueryAchievementDescriptions with a valid PlayerId, this subsystem caches those achievement descriptions", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										OnlineAchievements->QueryAchievementDescriptions(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, PlayerAchievements, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementDescriptionsPlayerId, const bool bQueryAchievementDescriptionsWasSuccessful)
+										{
+											TestEqual("Verify that QueryAchievementDescriptionsPlayerId is the same as TestAccountId", QueryAchievementDescriptionsPlayerId == *TestAccountId, true);
+											TestEqual("Verify that bQueryAchievementDescriptionsWasSuccessful returns as: True", bQueryAchievementDescriptionsWasSuccessful, true);
+
+											FOnlineAchievementDesc AchievementDescription;
+
+											OnlineAchievements->GetCachedAchievementDescription(PlayerAchievements[0].Id, AchievementDescription);
+
+											UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("OSS Automation: Found Achievement Description: %s"), *AchievementDescription.ToDebugString());
+											TestEqual("Verify that AchievementDescription.Title is populated", AchievementDescription.Title.IsEmpty(), false);
+											TestEqual("Verify that AchievementDescription.LockedDesc is populated", AchievementDescription.LockedDesc.IsEmpty(), false);
+											TestEqual("Verify that AchievementDescription.UnlockedDesc is populated", AchievementDescription.UnlockedDesc.IsEmpty(), false);
+
+											TestDone.Execute();
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: Achievement descriptions cached anyway with bad UserId
+					LatentIt("When calling QueryAchievementDescriptions with an invalid PlayerId, this subsystem does not cache those achievement descriptions", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+										OnlineAchievements->QueryAchievementDescriptions(*BadAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, PlayerAchievements, BadAccountId, TestDone](const FUniqueNetId& QueryAchievementDescriptionsPlayerId, const bool bQueryAchievementDescriptionsWasSuccessful)
+										{
+											TestEqual("Verify that QueryAchievementDescriptionsPlayerId is the same as TestAccountId", QueryAchievementDescriptionsPlayerId == *BadAccountId, true);
+											TestEqual("Verify that bQueryAchievementDescriptionsWasSuccessful returns as: True", bQueryAchievementDescriptionsWasSuccessful, true);
+
+											FOnlineAchievementDesc AchievementDescription;
+
+											OnlineAchievements->GetCachedAchievementDescription(PlayerAchievements[0].Id, AchievementDescription);
+
+											UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("OSS Automation: Found Achievement Description: %s"), *AchievementDescription.ToDebugString());
+											TestEqual("Verify that AchievementDescription.Title is not populated", AchievementDescription.Title.IsEmpty(), true);
+											TestEqual("Verify that AchievementDescription.LockedDesc is not populated", AchievementDescription.LockedDesc.IsEmpty(), true);
+											TestEqual("Verify that AchievementDescription.UnlockedDesc is not populated", AchievementDescription.UnlockedDesc.IsEmpty(), true);
+
+											TestDone.Execute();
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				Describe("GetCachedAchievement", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.AddAchievementToTestAccount(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+
+					LatentIt("When calling GetCachedAchievement with a valid PlayerId and AchievementId, this subsystem returns the cached Achievement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										FString TestAchievement = PlayerAchievements[0].Id;
+
+										FOnlineAchievement SomeAchievement;
+										OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+										TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id == TestAchievement, true);
+										TestEqual("Verify that SomeAchievement.Progress is: 100", SomeAchievement.Progress == 100, true);
+
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetCachedAchievement with a valid PlayerId but an invalid AchievementId, this subsystem does not return any Achievement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACHIEVEMENT, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									FString FakeAchievement = TEXT("fake_achievement");
+
+									FOnlineAchievement SomeAchievement;
+									OnlineAchievements->GetCachedAchievement(*TestAccountId, FakeAchievement, SomeAchievement);
+
+									TestEqual("Verify that SomeAchievement.Id is empty", SomeAchievement.Id.IsEmpty(), true);
+									TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+									TestDone.Execute();
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetCachedAchievement with a valid AchievementId but an invalid PlayerId, this subsystem does not return the cached Achievement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_MISSINGUSER, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+										FString TestAchievement = PlayerAchievements[0].Id;
+
+										FOnlineAchievement SomeAchievement;
+										OnlineAchievements->GetCachedAchievement(*BadAccountId, TestAchievement, SomeAchievement);
+
+										TestEqual("Verify that SomeAchievement.Id is: TestAchievement", SomeAchievement.Id.IsEmpty(), true);
+										TestEqual("Verify that SomeAchievement.Progress is: 0", SomeAchievement.Progress == 0, true);
+
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+						CommonUtils.ResetTestAccountAchievements(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+				});
+
+				Describe("GetCachedAchievements", [this, SubsystemType]()
+				{
+					LatentIt("When calling GetCachedAchievements with a valid PlayerId, this subsystem returns all cached Achievements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									TestEqual("Verify that PlayerAchievements is populated", PlayerAchievements.Num() > 0, true);
+
+									TestDone.Execute();
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetCachedAchievements with an invalid PlayerId, this subsystem does not return any Achievements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_MISSINGUSER, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(*BadAccountId, PlayerAchievements);
+
+									TestEqual("Verify that PlayerAchievements is not populated", PlayerAchievements.Num() == 0, true);
+
+									TestDone.Execute();
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				Describe("GetCachedAchievementDescription", [this, SubsystemType]()
+				{
+					LatentIt("When calling GetCachedAchievementDescription with a valid AchievementId, this subsystem returns the cached Achievement's description", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										OnlineAchievements->QueryAchievementDescriptions(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, PlayerAchievements, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementDescriptionsPlayerId, const bool bQueryAchievementDescriptionsWasSuccessful)
+										{
+											FOnlineAchievementDesc AchievementDescription;
+
+											OnlineAchievements->GetCachedAchievementDescription(PlayerAchievements[0].Id, AchievementDescription);
+
+											UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("OSS Automation: Found Achievement Description: %s"), *AchievementDescription.ToDebugString());
+											TestEqual("Verify that AchievementDescription.Title is populated", AchievementDescription.Title.IsEmpty(), false);
+											TestEqual("Verify that AchievementDescription.LockedDesc is populated", AchievementDescription.LockedDesc.IsEmpty(), false);
+											TestEqual("Verify that AchievementDescription.UnlockedDesc is populated", AchievementDescription.UnlockedDesc.IsEmpty(), false);
+
+											TestDone.Execute();
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetCachedAchievementDescription with an invalid AchievementId, this subsystem does not return any cached Achievement's description", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACHIEVEMENT, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										OnlineAchievements->QueryAchievementDescriptions(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, PlayerAchievements, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementDescriptionsPlayerId, const bool bQueryAchievementDescriptionsWasSuccessful)
+										{
+											FString FakeAchievementId = TEXT("fake_achievement");
+
+											FOnlineAchievementDesc AchievementDescription;
+
+											OnlineAchievements->GetCachedAchievementDescription(FakeAchievementId, AchievementDescription);
+
+											UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("OSS Automation: Found Achievement Description: %s"), *AchievementDescription.ToDebugString());
+											TestEqual("Verify that AchievementDescription.Title is not populated", AchievementDescription.Title.IsEmpty(), true);
+											TestEqual("Verify that AchievementDescription.LockedDesc is not populated", AchievementDescription.LockedDesc.IsEmpty(), true);
+											TestEqual("Verify that AchievementDescription.UnlockedDesc is not populated", AchievementDescription.UnlockedDesc.IsEmpty(), true);
+
+											TestDone.Execute();
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				Describe("ResetAchievements", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.AddAchievementToTestAccount(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+
+					LatentIt("When calling ResetAchievements with a valid PlayerId, this subsystem resets that player's achievements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", QueryAchievementsPlayerId == *TestAccountId, true);
+									TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: True", bQueryAchievementsWasSuccessful, true);
+
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TestEqual("Verify that PlayerAchievements[0].Progress is: 100", PlayerAchievements[0].Progress == 100, true);
+
+#if !UE_BUILD_SHIPPING
+										OnlineAchievements->ResetAchievements(*TestAccountId);
+#endif // !UE_BUILD_SHIPPING
+
+										OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, &PlayerAchievements, TestAccountId, TestDone](const FUniqueNetId& SecondQueryAchievementsPlayerId, const bool bSecondQueryAchievementsWasSuccessful)
+										{
+											TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", SecondQueryAchievementsPlayerId == *TestAccountId, true);
+											TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: True", bSecondQueryAchievementsWasSuccessful, true);
+
+											OnlineAchievements->GetCachedAchievements(SecondQueryAchievementsPlayerId, PlayerAchievements);
+
+											if (PlayerAchievements.Num() > 0)
+											{
+												TestEqual("Verify that PlayerAchievements[0].Progress is: 0", PlayerAchievements[0].Progress == 0, true);
+
+												TestDone.Execute();
+											}
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ResetAchievements with an invalid PlayerId, this subsystem does not reset any player's achievements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						AddExpectedError(ONLINE_EXPECTEDERROR_MISSINGUSER, EAutomationExpectedErrorFlags::Contains, 0);
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+								{
+									TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", QueryAchievementsPlayerId == *TestAccountId, true);
+									TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: True", bQueryAchievementsWasSuccessful, true);
+
+									TArray<FOnlineAchievement> PlayerAchievements;
+									OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+									if (PlayerAchievements.Num() > 0)
+									{
+										TestEqual("Verify that PlayerAchievements[0].Progress is: 100", PlayerAchievements[0].Progress == 100, true);
+
+										TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+#if !UE_BUILD_SHIPPING
+										OnlineAchievements->ResetAchievements(*BadAccountId);
+#endif // !UE_BUILD_SHIPPING
+
+										OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, &PlayerAchievements, TestAccountId, TestDone](const FUniqueNetId& SecondQueryAchievementsPlayerId, const bool bSecondQueryAchievementsWasSuccessful)
+										{
+											TestEqual("Verify that QueryAchievementsPlayerId is the same as TestAccountId", SecondQueryAchievementsPlayerId == *TestAccountId, true);
+											TestEqual("Verify that bQueryAchievementsWasSuccessful returns as: True", bSecondQueryAchievementsWasSuccessful, true);
+
+											OnlineAchievements->GetCachedAchievements(SecondQueryAchievementsPlayerId, PlayerAchievements);
+
+											if (PlayerAchievements.Num() > 0)
+											{
+												TestEqual("Verify that PlayerAchievements[0].Progress is: 100", PlayerAchievements[0].Progress == 100, true);
+
+												TestDone.Execute();
+											}
+										}));
+									}
+									else
+									{
+										UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+										TestDone.Execute();
+									}
+								}));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ACHIEVEMENTS(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+						CommonUtils.ResetTestAccountAchievements(OnlineIdentity, OnlineAchievements, TestDone);
+					});
+				});
+			});
+
+			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			{
+				// Clean up Identity
+				if (OnlineIdentity.IsValid())
+				{
+					if (OnlineIdentity->GetLoginStatus(0) == ELoginStatus::LoggedIn)
+					{
+						OnlineIdentity->Logout(0);
+					}
+
+					OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+					OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+					OnlineIdentity = nullptr;
+				}
+
+				// Clean up Achievements
+				if (OnlineAchievements.IsValid())
+				{
+					OnlineAchievements = nullptr;
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineChat.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineChat.spec.cpp
new file mode 100644
index 000000000000..8de6cb75ccaa
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineChat.spec.cpp
@@ -0,0 +1,126 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "OnlineSubsystem.h"
+#include "Online.h"
+#include "Interfaces/OnlinePresenceInterface.h"
+#include "Misc/AutomationTest.h"
+#include "Utils/OnlineErrors.data.h"
+#include "Utils/OnlineTestCommon.h"
+
+BEGIN_DEFINE_SPEC(FOnlineChatSpec, "OnlineChatInterface", EAutomationTestFlags::EngineFilter | EAutomationTestFlags::ApplicationContextMask)
+
+IOnlineSubsystem* OnlineSubsystem;
+
+IOnlineIdentityPtr OnlineIdentity;
+IOnlineFriendsPtr OnlineFriends;
+IOnlineChatPtr OnlineChat;
+
+FOnlineAccountCredentials AccountCredentials;
+FOnlineAccountCredentials FriendAccountCredentials;
+
+FOnlineTestCommon CommonUtils;
+
+// Delegate Handles
+FDelegateHandle OnLogoutCompleteDelegateHandle;
+FDelegateHandle	OnLoginCompleteDelegateHandle;
+
+END_DEFINE_SPEC(FOnlineChatSpec)
+
+void FOnlineChatSpec::Define()
+{
+	TArray<FName> Subsystems = FOnlineTestCommon::GetEnabledTestSubsystems();
+
+	for (int32 Index = 0; Index < Subsystems.Num(); Index++)
+	{
+		FName SubsystemType = Subsystems[Index];
+
+		Describe(SubsystemType.ToString(), [this, SubsystemType]()
+		{
+			BeforeEach([this, SubsystemType]()
+			{
+				CommonUtils = FOnlineTestCommon();
+				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+				FriendAccountCredentials = FOnlineTestCommon::GetSubsystemFriendAccountCredentials(SubsystemType);
+
+				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
+				OnlineFriends = Online::GetFriendsInterface(SubsystemType);
+				OnlineChat = Online::GetChatInterface(SubsystemType);
+
+				// If OnlineIdentity, OnlineFriends, or OnlineChat is not valid, the following test, including all other nested BeforeEaches, will not run
+				if (!OnlineIdentity.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineFriends.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineFriends Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineChat.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineChat Interface for %s"), *SubsystemType.ToString());
+				}
+
+			});
+
+			// TODO: No Tests have been validated yet for functionality
+			Describe("Online Chat", [this, SubsystemType]()
+			{
+				xDescribe("SendPrivateChat", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						//CommonUtils.AddFriendToTestAccount(OnlineIdentity, OnlineFriends, SubsystemType, TestDone);
+						TestDone.Execute();
+					});
+
+					LatentIt("Private Chat", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+						{
+							FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+							TSharedPtr<const FUniqueNetId> ReceivingAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("7c2bdf22c0264d7193a88002c0ea95bf"));
+
+							OnlineChat->SendPrivateChat(*TestAccountId, *ReceivingAccountId, TEXT("Test"));
+
+							TestDone.Execute();
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+			});
+
+			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			{
+				// Clean up Identity
+				if (OnlineIdentity.IsValid())
+				{
+					if (OnlineIdentity->GetLoginStatus(0) == ELoginStatus::LoggedIn)
+					{
+						OnlineIdentity->Logout(0);
+					}
+
+					OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+					OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+					OnlineIdentity = nullptr;
+				}
+
+				// Clean up Friends
+				if (OnlineFriends.IsValid())
+				{
+					OnlineFriends = nullptr;
+				}
+
+				// Clean up Chat
+				if (OnlineChat.IsValid())
+				{
+					OnlineChat = nullptr;
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineEntitlements.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineEntitlements.spec.cpp
new file mode 100644
index 000000000000..68d0509ff59c
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineEntitlements.spec.cpp
@@ -0,0 +1,702 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "OnlineSubsystem.h"
+#include "Online.h"
+#include "Interfaces/OnlineEntitlementsInterface.h"
+#include "Misc/AutomationTest.h"
+#include "Utils/OnlineErrors.data.h"
+#include "Utils/OnlineTestCommon.h"
+
+BEGIN_DEFINE_SPEC(FOnlineEntitlementsSpec, "OnlineEntitlementsInterface", EAutomationTestFlags::EngineFilter | EAutomationTestFlags::ApplicationContextMask)
+
+IOnlineSubsystem* OnlineSubsystem;
+
+IOnlineIdentityPtr OnlineIdentity;
+IOnlineEntitlementsPtr OnlineEntitlements;
+
+FOnlineAccountCredentials AccountCredentials;
+
+FOnlineTestCommon CommonUtils;
+
+// Delegate Handles
+FDelegateHandle OnLogoutCompleteDelegateHandle;
+FDelegateHandle	OnLoginCompleteDelegateHandle;
+FDelegateHandle OnQueryEntitlementsCompleteDelegateHandle;
+
+END_DEFINE_SPEC(FOnlineEntitlementsSpec)
+
+void FOnlineEntitlementsSpec::Define()
+{
+	TArray<FName> Subsystems = FOnlineTestCommon::GetEnabledTestSubsystems();
+
+	for (int32 Index = 0; Index < Subsystems.Num(); Index++)
+	{
+		FName SubsystemType = Subsystems[Index];
+
+		Describe(SubsystemType.ToString(), [this, SubsystemType]()
+		{
+			BeforeEach([this, SubsystemType]()
+			{
+				CommonUtils = FOnlineTestCommon();
+				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+
+				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
+				OnlineEntitlements = Online::GetEntitlementsInterface(SubsystemType);
+
+				// If OnlineIdentity or OnlineEntitlements is not valid, the following test, including all other nested BeforeEaches, will not run
+				if (!OnlineIdentity.IsValid())
+				{
+					UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineEntitlements.IsValid())
+				{
+					UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Failed to load OnlineEntitlements Interface for %s"), *SubsystemType.ToString());
+				}
+			});
+
+			// TODO: No tests have been validated for functionality yet
+			Describe("Online Entitlements", [this, SubsystemType]()
+			{
+				Describe("GetEntitlement", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling GetEntitlement with a valid UserId and EntitlementId that is cached locally, this subsystem returns that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									TArray<TSharedRef<FOnlineEntitlement>> PlayerEntitlements;
+									OnlineEntitlements->GetAllEntitlements(*TestAccountId, TEXT(""), PlayerEntitlements);
+
+									if (PlayerEntitlements.Num() > 0)
+									{
+										FUniqueEntitlementId EntitlementId = PlayerEntitlements[0].Get().Id;
+										TSharedPtr<FOnlineEntitlement> Entitlement;
+
+										Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+										TestEqual("Verify that the returned Entitlement->Id is the same as EntitlementId", Entitlement->Id == EntitlementId, true);
+
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: PlayerEntitlements array is empty after a call to GetAllEntitlements. No Entitlements found for this user."));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT(""));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: Need a way to get a non-subsystem specific valid entitlement without caching it, or a way to delete the cache
+					LatentIt("When calling GetEntitlement with a valid UserId and EntitlementId that is not cached locally, this subsystem does not return that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								FUniqueEntitlementId EntitlementId = TEXT("0");
+								TSharedPtr<FOnlineEntitlement> Entitlement;
+
+								Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+								TestEqual("Verify that the returned Entitlement is not valid", Entitlement.IsValid(), false);
+
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+								TestDone.Execute();
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetEntitlement with a valid EntitlementId that is cached locally but an invalid UserId, this subsystem does not return that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									TArray<TSharedRef<FOnlineEntitlement>> PlayerEntitlements;
+									OnlineEntitlements->GetAllEntitlements(*TestAccountId, TEXT(""), PlayerEntitlements);
+
+									if (PlayerEntitlements.Num() > 0)
+									{
+										FUniqueEntitlementId EntitlementId = PlayerEntitlements[0].Get().Id;
+										TSharedPtr<FOnlineEntitlement> Entitlement;
+
+										TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+										if (BadAccountId.IsValid())
+										{
+											Entitlement = OnlineEntitlements->GetEntitlement(*BadAccountId, EntitlementId);
+
+											TestEqual("Verify that the returned Entitlement is not valid", Entitlement.IsValid(), false);
+
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on BadAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+											TestDone.Execute();
+										}
+									}
+									else
+									{
+										UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: PlayerEntitlements array is empty after a call to GetAllEntitlements. No Entitlements found for this user."));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetEntitlement with a valid UserId but an invalid EntitlementId, this subsystem does not return any entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FUniqueEntitlementId EntitlementId = TEXT("-1");
+									TSharedPtr<FOnlineEntitlement> Entitlement;
+
+									Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+									TestEqual("Verify that the returned Entitlement is not valid", Entitlement.IsValid(), false);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("GetItemEntitlement", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					// TODO: How to get a non-subsystem specific ItemId?
+					LatentIt("When calling GetItemEntitlement with a valid UserId and ItemId that is cached locally, this subsystem returns that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+							{
+								TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+								FString ItemId = TEXT("0");
+								TSharedPtr<FOnlineEntitlement> Entitlement;
+
+								Entitlement = OnlineEntitlements->GetItemEntitlement(*TestAccountId, ItemId);
+
+								TestEqual("Verify that the returned Entitlement->Id is the same as ItemId", Entitlement->Id == ItemId, true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: How to get a non-subsystem specific ItemId?
+					LatentIt("When calling GetItemEntitlement with a valid UserId and ItemId that is not cached locally, this subsystem does not return that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								FString ItemId = TEXT("0");
+								TSharedPtr<FOnlineEntitlement> Entitlement;
+
+								Entitlement = OnlineEntitlements->GetItemEntitlement(*TestAccountId, ItemId);
+
+								TestEqual("Verify that the returned Entitlement is not valid", Entitlement.IsValid(), true);
+
+								TestDone.Execute();
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: How to get a non-subsystem specific ItemId?
+					LatentIt("When calling GetItemEntitlement with a valid ItemId that is cached locally but an invalid UserId, this subsystem does not return that entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FString ItemId = TEXT("0");
+									TSharedPtr<FOnlineEntitlement> Entitlement;
+
+									TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+									if (BadAccountId.IsValid())
+									{
+										Entitlement = OnlineEntitlements->GetItemEntitlement(*BadAccountId, ItemId);
+
+										TestEqual("Verify that the returned Entitlement is not valid", Entitlement.IsValid(), true);
+
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on BadAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: How to get a non-subsystem specific ItemId?
+					LatentIt("When calling GetItemEntitlement with a valid UserId but an invalid ItemId, this subsystem does not return any entitlement", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FString ItemId = TEXT("a");
+									TSharedPtr<FOnlineEntitlement> Entitlement;
+
+									Entitlement = OnlineEntitlements->GetItemEntitlement(*TestAccountId, ItemId);
+
+									TestEqual("Verify that the returned Entitlement->Id.IsEmpty() is: True", Entitlement->Id.IsEmpty(), true);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("GetAllEntitlements", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling GetAllEntitlements with a valid UserId, Namespace, and cached entitlements, this subsystem returns those entitlements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FString Namespace = TEXT("TestNamespace");
+									TArray<TSharedRef<FOnlineEntitlement>> Entitlements;
+
+									OnlineEntitlements->GetAllEntitlements(*TestAccountId, Namespace, Entitlements);
+
+									TestEqual("Verify that the returned Entitlements array is populated", Entitlements.Num() > 0, true);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetAllEntitlements with a valid UserId and Namespace but no cached entitlements, this subsystem does not return any entitlements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								FString Namespace = TEXT("TestNamespace");
+								TArray<TSharedRef<FOnlineEntitlement>> Entitlements;
+
+								OnlineEntitlements->GetAllEntitlements(*TestAccountId, Namespace, Entitlements);
+
+								TestEqual("Verify that the returned Entitlements array is not populated", Entitlements.Num() == 0, true);
+
+								TestDone.Execute();
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetAllEntitlements with a valid Namespace and cached entitlements but an invalid UserId, this subsystem does not return those entitlements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FString Namespace = TEXT("TestNamespace");
+									TArray<TSharedRef<FOnlineEntitlement>> Entitlements;
+
+									TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+									if (BadAccountId.IsValid())
+									{
+										OnlineEntitlements->GetAllEntitlements(*BadAccountId, Namespace, Entitlements);
+
+										TestEqual("Verify that the returned Entitlements array is not populated", Entitlements.Num() == 0, true);
+
+										TestDone.Execute();
+									}
+									else
+									{
+										UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on BadAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetAllEntitlements with a valid UserId and cached entitlements but an invalid Namespace, this subsystem does not return those entitlements", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+
+									FString Namespace = TEXT("InvalidNamespace");
+									TArray<TSharedRef<FOnlineEntitlement>> Entitlements;
+
+									OnlineEntitlements->GetAllEntitlements(*TestAccountId, Namespace, Entitlements);
+
+									TestEqual("Verify that the returned Entitlements array is not populated", Entitlements.Num() == 0, true);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("QueryEntitlements", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling QueryEntitlements with a valid UserId and Namespace, this subsystem caches that user's entitlements locally", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: True", bQueryEntitlementsWasSuccessful, true);
+									TestEqual("Verify that QueryEntitlementsUserId is equal to TestAccountId", QueryEntitlementsUserId == *TestAccountId, true);
+									TestEqual("Verify that QueryEntitlementsNamespace is: TestNamespace", QueryEntitlementsNamespace == TEXT("TestNamespace"), true);
+									TestEqual("Verify that QueryEntitlementsError is empty", QueryEntitlementsError.IsEmpty(), true);
+
+									FUniqueEntitlementId EntitlementId = TEXT("0");
+									TSharedPtr<FOnlineEntitlement> Entitlement;
+
+									Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+									TestEqual("Verify that the returned Entitlement.IsValid() is: True", Entitlement.IsValid(), true);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("TestNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling QueryEntitlements with a valid Namespace but an invalid UserId, this subsystem does not cache any user's entitlements locally", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								TSharedPtr<const FUniqueNetId> BadAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+								if (BadAccountId.IsValid())
+								{
+									OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, BadAccountId, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+									{
+										TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: False", bQueryEntitlementsWasSuccessful, false);
+										TestEqual("Verify that QueryEntitlementsUserId is equal to BadAccountId", QueryEntitlementsUserId == *BadAccountId, true);
+										TestEqual("Verify that QueryEntitlementsNamespace is: TestNamespace", QueryEntitlementsNamespace == TEXT("TestNamespace"), true);
+										TestEqual("Verify that QueryEntitlementsError is empty", QueryEntitlementsError.IsEmpty(), true);
+
+										FUniqueEntitlementId EntitlementId = TEXT("0");
+										TSharedPtr<FOnlineEntitlement> Entitlement;
+
+										Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+										TestEqual("Verify that the returned Entitlement.IsValid() is: False", Entitlement.IsValid(), false);
+
+										TestDone.Execute();
+									}));
+
+									OnlineEntitlements->QueryEntitlements(*BadAccountId, TEXT("TestNamespace"));
+								}
+								else
+								{
+									UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on BadAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+									TestDone.Execute();
+								}
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling QueryEntitlements with a valid UserId but an invalid Namespace, this subsystem does not cache that user's entitlements locally", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+							if (TestAccountId.IsValid())
+							{
+								OnQueryEntitlementsCompleteDelegateHandle = OnlineEntitlements->AddOnQueryEntitlementsCompleteDelegate_Handle(FOnQueryEntitlementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](bool bQueryEntitlementsWasSuccessful, const FUniqueNetId& QueryEntitlementsUserId, const FString& QueryEntitlementsNamespace, const FString& QueryEntitlementsError)
+								{
+									TestEqual("Verify that bQueryEntitlementsWasSuccessful returns as: False", bQueryEntitlementsWasSuccessful, false);
+									TestEqual("Verify that QueryEntitlementsUserId is equal to BadAccountId", QueryEntitlementsUserId == *TestAccountId, true);
+									TestEqual("Verify that QueryEntitlementsNamespace is: InvalidNamespace", QueryEntitlementsNamespace == TEXT("InvalidNamespace"), true);
+									TestEqual("Verify that QueryEntitlementsError is empty", QueryEntitlementsError.IsEmpty(), true);
+
+									FUniqueEntitlementId EntitlementId = TEXT("0");
+									TSharedPtr<FOnlineEntitlement> Entitlement;
+
+									Entitlement = OnlineEntitlements->GetEntitlement(*TestAccountId, EntitlementId);
+
+									TestEqual("Verify that the returned Entitlement.IsValid is: False", Entitlement.IsValid(), false);
+
+									TestDone.Execute();
+								}));
+
+								OnlineEntitlements->QueryEntitlements(*TestAccountId, TEXT("InvalidNamespace"));
+							}
+							else
+							{
+								UE_LOG_ONLINE_ENTITLEMENT(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+								TestDone.Execute();
+							}
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+			});
+
+			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			{
+				// Clean up Identity
+				if (OnlineIdentity.IsValid())
+				{
+					OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+					OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+					OnlineIdentity = nullptr;
+				}
+
+				// Clean up Entitlements
+				if (OnlineEntitlements.IsValid())
+				{
+					OnlineEntitlements->ClearOnQueryEntitlementsCompleteDelegate_Handle(OnQueryEntitlementsCompleteDelegateHandle);
+					OnlineEntitlements = nullptr;
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineFriends.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineFriends.spec.cpp
index b6fdf9ef2b9a..21a0443621ad 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineFriends.spec.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineFriends.spec.cpp
@@ -54,11 +54,11 @@ void FOnlineFriendsSpec::Define()
 				// If OnlineFriends or OnlineIdentity is not valid, the following test, including all other nested BeforeEaches, will not run
 				if (!OnlineFriends.IsValid())
 				{
-					UE_LOG(LogOnline, Error, TEXT("Failed to get online friends interface for %s"), *SubsystemType.ToString());
+					UE_LOG_ONLINE_FRIEND(Error, TEXT("Failed to get online friends interface for %s"), *SubsystemType.ToString());
 				}
 				if (!OnlineIdentity.IsValid())
 				{
-					UE_LOG(LogOnline, Error, TEXT("Failed to get online identity interface for %s"), *SubsystemType.ToString());
+					UE_LOG_ONLINE_FRIEND(Error, TEXT("Failed to get online identity interface for %s"), *SubsystemType.ToString());
 				}
 			});
 			
@@ -107,7 +107,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is populated", FriendsList.Num() > 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -126,7 +126,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is populated", FriendsList.Num() > 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -145,7 +145,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is populated", FriendsList.Num() > 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -192,7 +192,7 @@ void FOnlineFriendsSpec::Define()
 
 								TestEqual("Verify that FriendsList is not populated", FriendsList.Num() == 0, true);
 
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 								TestDone.Execute();
 							}));
 						}));
@@ -260,7 +260,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is not populated", FriendsList.Num() == 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -280,7 +280,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is not populated", FriendsList.Num() == 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -300,7 +300,7 @@ void FOnlineFriendsSpec::Define()
 
 							TestEqual("Verify that FriendsList is not populated", FriendsList.Num() == 0, true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -335,7 +335,7 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling DeleteFriendsList with a valid local user but an invalid list name, this subsystem does not attempt a delete friends list request", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 					});
 
 					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
@@ -518,7 +518,7 @@ void FOnlineFriendsSpec::Define()
 							TestEqual("Verify that SendInviteListName is: InvalidListName", SendInviteListName == TEXT("InvalidListName"), true);
 							TestEqual("Verify that SendInviteErrorStr returns the expected error code: ONLINE_EXPECTEDERROR_INVALID_LOCALUSER", SendInviteErrorStr.Contains(ONLINE_EXPECTEDERROR_INVALID_LOCALUSER), true);
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 							TestDone.Execute();
 						}));
 					});
@@ -759,7 +759,7 @@ void FOnlineFriendsSpec::Define()
 									TestEqual("Verify that RejectInviteListName is: Default", RejectInviteListName == EFriendsLists::ToString(EFriendsLists::Default), true);
 									TestEqual("Verify that RejectInviteErrorStr returns the expected error code: ONLINE_EXPECTEDERROR_INVALID_LOCALUSER", RejectInviteErrorStr.Contains(ONLINE_EXPECTEDERROR_INVALID_LOCALUSER), true);
 
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Bug: OGS-1023 - Macro that builds TriggerDELEGATE does not accept a negative LocalUserNum to trigger the delegate"));
+									UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Bug: OGS-1023 - Macro that builds TriggerDELEGATE does not accept a negative LocalUserNum to trigger the delegate"));
 									TestDone.Execute();
 								}));
 
@@ -824,7 +824,7 @@ void FOnlineFriendsSpec::Define()
 									TestEqual("Verify that RejectInviteListName is: InvalidListName", RejectInviteListName == TEXT("InvalidListName"), true);
 									TestEqual("Verify that RejectInviteErrorStr returns the expected error code: ", RejectInviteErrorStr.Contains(TEXT("something")), true);
 
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+									UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 									TestDone.Execute();
 								}));
 
@@ -920,7 +920,7 @@ void FOnlineFriendsSpec::Define()
 
 										TestEqual("Verify that FriendsList is populated", FriendsList.Num() > 0, true);
 
-										UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Bug: OGS-1023 - Macro that builds TriggerDELEGATE does not accept a negative LocalUserNum to trigger the delegate"));
+										UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Bug: OGS-1023 - Macro that builds TriggerDELEGATE does not accept a negative LocalUserNum to trigger the delegate"));
 										TestDone.Execute();
 									}));
 								}));
@@ -973,7 +973,7 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling DeleteFriend with a valid local user and friend ID but an invalid list name, this subsystem does not delete that friend ID", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 					});
 
 					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
@@ -1064,7 +1064,7 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling GetFriendsList with a valid local user but an invalid list name after polling for friends list data, this subsystem will not return that data", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 					});
 
 					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
@@ -1111,9 +1111,9 @@ void FOnlineFriendsSpec::Define()
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendEntry failed after a call to OnlineFriends->GetFriend()"));
+									UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendEntry failed after a call to OnlineFriends->GetFriend()"));
 								}
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need more checks against FriendEntry"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need more checks against FriendEntry"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1183,7 +1183,7 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling GetFriend with a valid local user and friend ID but an invalid list name after polling for friend data, this subsystem will not return that online friend", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 					});
 
 					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
@@ -1281,7 +1281,7 @@ void FOnlineFriendsSpec::Define()
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: FriendsList was empty after calling GetFriendsList(). Expected 1 friend entry"));
+									UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: FriendsList was empty after calling GetFriendsList(). Expected 1 friend entry"));
 									TestDone.Execute();
 								}
 							}));
@@ -1334,7 +1334,7 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling IsFriend with a valid local user and friend ID who is on the user's friends list but an invalid list name after polling for friend data, this subsystem will return false", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to verify that different friends lists produce different results"));
 					});
 
 					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
@@ -1362,22 +1362,22 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling QueryRecentPlayers with a namespace and a valid FUniqueNetId who recently played with others, this subsystem will return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling QueryRecentPlayers with a namespace but a valid FUniqueNetId who has not played with others, this subsystem will return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling QueryRecentPlayers a valid FUniqueNetId who recently played with others but an invalid namespace, this subsystem will return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling QueryRecentPlayers with a namespace but an invalid FUniqueNetId, this subsystem will return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					AfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType]()
@@ -1392,27 +1392,27 @@ void FOnlineFriendsSpec::Define()
 
 					It("When calling GetRecentPlayers with a namespace and a valid FUniqueNetId who recently played with others after polling for recent players data, this subsystem will return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling GetRecentPlayers with a namespace and a valid FUniqueNetId who recently played with others without polling for recent players data, this subsystem will not return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling GetRecentPlayers with a namespace and a valid FUniqueNetId who has not played with others after polling for recent players data, this subsystem will return not that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling GetRecentPlayers with a valid FUniqueNetId who recently played with others but an invalid namespace after polling for recent players data, this subsystem will not return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					It("When calling GetRecentPlayers with a namespace but an invalid FUniqueNetId after polling for recent players data, this subsystem will not return that user's recent players", [this, SubsystemType]()
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
+						UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to set-up an account to have recent players to query"));
 					});
 
 					AfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType]()
@@ -1470,7 +1470,7 @@ void FOnlineFriendsSpec::Define()
 									}
 									else
 									{
-										UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+										UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 										TestDone.Execute();
 									}
 								}));
@@ -1479,7 +1479,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendsAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendsAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1515,7 +1515,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1543,7 +1543,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1616,7 +1616,7 @@ void FOnlineFriendsSpec::Define()
 									}
 									else
 									{
-										UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+										UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 										TestDone.Execute();
 									}
 								}));
@@ -1625,7 +1625,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1661,7 +1661,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1689,7 +1689,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1748,7 +1748,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1787,7 +1787,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1845,7 +1845,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1879,7 +1879,7 @@ void FOnlineFriendsSpec::Define()
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+									UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 									TestDone.Execute();
 								}
 							}));
@@ -1890,7 +1890,7 @@ void FOnlineFriendsSpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1929,7 +1929,7 @@ void FOnlineFriendsSpec::Define()
 						{
 							OnlineFriends->DumpBlockedPlayers();
 
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out what to check against to test"));
+							UE_LOG_ONLINE_FRIEND(Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out what to check against to test"));
 						}));
 
 						OnlineIdentity->Login(0, AccountCredentials);
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineIdentity.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineIdentity.spec.cpp
index 36f24960e86f..b7509ff21aa8 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineIdentity.spec.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineIdentity.spec.cpp
@@ -43,11 +43,11 @@ void FOnlineIdentitySpec::Define()
 				CommonUtils = FOnlineTestCommon();
 				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
 				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
-				
+
 				// If OnlineIdentity is not valid, the following test, including all other nested BeforeEaches, will not run
 				if (!OnlineIdentity.IsValid())
 				{
-					UE_LOG(LogOnline, Error, TEXT("Failed to get online identity interface for %s"), *SubsystemType.ToString());
+					UE_LOG_ONLINE_IDENTITY(Error, TEXT("Failed to get online identity interface for %s"), *SubsystemType.ToString());
 				}
 			});
 
@@ -66,8 +66,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
-
-					LatentIt("When calling Login with an invalid local user (-1), the user will receive an invalid local user error and not be logged in", FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling Login with an invalid local user (-1), the user will receive an invalid local user error and not be logged in", FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_LOCALUSER, EAutomationExpectedErrorFlags::Contains, 0);
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
@@ -145,7 +145,8 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling Login an empty password for this subsystem, the user will receive an invalid credentials error and not be logged in", [this, SubsystemType](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling Login an empty password for this subsystem, the user will receive an invalid credentials error and not be logged in", [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 						AccountCredentials.Token = "";
@@ -181,7 +182,7 @@ void FOnlineIdentitySpec::Define()
 				
 				Describe("Logout", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -192,7 +193,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When Logout is called with a valid local user, login status returns as ELoginStatus::NotLoggedIn", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentIt("When Logout is called with a valid local user, login status returns as ELoginStatus::NotLoggedIn",  [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
 						{
@@ -206,8 +207,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->Logout(0);
 					});
-
-					LatentIt("When Logout is called with an invalid local user (-1), they receive a no logged in user error and no logout is performed", EAsyncExecution::ThreadPool, FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When Logout is called with an invalid local user (-1), they receive a no logged in user error and no logout is performed",  FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_LOCALUSER_NOTLOGGEDIN, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -226,7 +227,7 @@ void FOnlineIdentitySpec::Define()
 
 				Describe("AutoLogin", [this, SubsystemType]()
 				{
-					LatentIt("When calling AutoLogin with valid credentials present on the command line, the user is logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with valid credentials present on the command line, the user is logged in to this subsystem", [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -242,8 +243,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->AutoLogin(0);
 					});
-					
-					LatentIt("When calling AutoLogin with an invalid local user (-1), the user receives an invalid local user error and is not logged in", EAsyncExecution::ThreadPool, FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling AutoLogin with an invalid local user (-1), the user receives an invalid local user error and is not logged in", FTimespan::FromSeconds(10), [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_LOCALUSER, EAutomationExpectedErrorFlags::Contains, 0);
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
@@ -261,7 +262,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(-1);
 					});
 					
-					LatentIt("When calling AutoLogin with a nonexistent username on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with a nonexistent username on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -282,7 +283,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(0);
 					});
 
-					LatentIt("When calling AutoLogin with an invalid password on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with an invalid password on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -303,7 +304,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(0);
 					});
 
-					LatentIt("When calling AutoLogin with an invalid auth type on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with an invalid auth type on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem", [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_AUTHTYPE, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -324,7 +325,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(0);
 					});
 
-					LatentIt("When calling AutoLogin with a blank username on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with a blank username on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -345,7 +346,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(0);
 					});
 
-					LatentIt("When calling AutoLogin with a blank password on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling AutoLogin with a blank password on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -365,8 +366,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->AutoLogin(0);
 					});
-
-					LatentIt("When calling AutoLogin with a blank auth type on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling AutoLogin with a blank auth type on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_AUTHTYPE, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -386,8 +387,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->AutoLogin(0);
 					});
-
-					LatentIt("When calling AutoLogin with no AUTH_LOGIN on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling AutoLogin with no AUTH_LOGIN on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -404,8 +405,8 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->AutoLogin(0);
 					});
-
-					LatentIt("When calling AutoLogin with no AUTH_PASSWORD on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling AutoLogin with no AUTH_PASSWORD on the command line, the user will receive an invalid credentials error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_ACCOUNTCREDENTIALS, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -423,8 +424,8 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->AutoLogin(0);
 
 					});
-
-					LatentIt("When calling AutoLogin with no AUTH_TYPE on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					/**DISABLED**/
+					xLatentIt("When calling AutoLogin with no AUTH_TYPE on the command line, the user will receive an invalid auth type error and not be logged in to this subsystem",  [this](const FDoneDelegate& TestDone)
 					{
 						AddExpectedError(ONLINE_EXPECTEDERROR_INVALID_AUTHTYPE, EAutomationExpectedErrorFlags::Contains, 0);
 
@@ -446,7 +447,7 @@ void FOnlineIdentitySpec::Define()
 
 				Describe("GetUserAccount", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -457,7 +458,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetUserAccount with a valid FUniqueNetId, this subsystem returns valid user information", EAsyncExecution::ThreadPool, [this, SubsystemType]()
+					It("When calling GetUserAccount with a valid FUniqueNetId, this subsystem returns valid user information",  [this, SubsystemType]()
 					{
 						TSharedPtr<const FUniqueNetId> UserId = OnlineIdentity->GetUniquePlayerId(0);
 
@@ -475,17 +476,17 @@ void FOnlineIdentitySpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserAccount failed after a call to OnlineIdentity->GetUserAccount()"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserAccount failed after a call to OnlineIdentity->GetUserAccount()"));
 							}
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 						}
 						
 					});
 
-					It("When calling GetUserAccount with an invalid FUniqueNetId, this subsystem returns a null object", EAsyncExecution::ThreadPool, [this, SubsystemType]()
+					It("When calling GetUserAccount with an invalid FUniqueNetId, this subsystem returns a null object",  [this, SubsystemType]()
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -497,15 +498,25 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 						}
 						
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
 				});
 
 				Describe("GetAllUserAccounts", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -516,16 +527,26 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetAllUserAccounts on a valid interface, it returns the expected number accounts that were registered with it", EAsyncExecution::ThreadPool, [this, SubsystemType]()
+					It("When calling GetAllUserAccounts on a valid interface, it returns the expected number accounts that were registered with it",  [this, SubsystemType]()
 					{
 						TArray<TSharedPtr<FUserOnlineAccount> > AllUserAccounts = OnlineIdentity->GetAllUserAccounts();
 						TestEqual("Login with one account for this subsystem and verify that UserAccounts array count is equal to (1)", AllUserAccounts.Num() == 1, true);
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
 				});
 
 				Describe("GetUniquePlayerId", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -536,7 +557,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetUniquePlayerId with a valid local user, this subsystem returns the user's FUniqueNetId", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetUniquePlayerId with a valid local user, this subsystem returns the user's FUniqueNetId",  [this]()
 					{
 						TSharedPtr<const FUniqueNetId> UserId = OnlineIdentity->GetUniquePlayerId(0);
 						
@@ -546,20 +567,30 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 						}
 					});
 
-					It("When calling GetUniquePlayerId with an invalid local user (-1), this subsystem returns a null UserId", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetUniquePlayerId with an invalid local user (-1), this subsystem returns a null UserId",  [this]()
 					{
 						TSharedPtr<const FUniqueNetId> UserId = OnlineIdentity->GetUniquePlayerId(-1);
 						TestEqual("Verify that UserId is invalid/null after calling GetUniquePlayerId", UserId.IsValid(), false);
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
 				});
 
 				Describe("GetSponsorUniquePlayerId", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -569,34 +600,44 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
-
-					It("When calling GetSponsorUniquePlayer with a valid local user with a valid assigned sponsor Id, this subsystem returns the user's sponsor's unique id", EAsyncExecution::ThreadPool, [this, SubsystemType]()
+					/**DISABLED**/
+					xIt("When calling GetSponsorUniquePlayer with a valid local user with a valid assigned sponsor Id, this subsystem returns the user's sponsor's unique id",  [this, SubsystemType]()
 					{
 						//@Todo: Stub test, needs a better way to be testable
 						TSharedPtr<const FUniqueNetId> SponsorId = OnlineIdentity->GetSponsorUniquePlayerId(0);
 
 						if (SponsorId.IsValid())
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires user with set-up sponsor id."));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires user with set-up sponsor id."));
 							TestEqual("Verify that SponsorId is populated", SponsorId->ToString().Len() > 0, true);
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on SponsorId failed after a call to OnlineIdentity->GetSponsorUniquePlayerId(0)"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on SponsorId failed after a call to OnlineIdentity->GetSponsorUniquePlayerId(0)"));
 						}
 						
 					});
 
-					It("When calling GetSponsorUniquePlayerId with an invalid local user (-1), this subsystem returns no information", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetSponsorUniquePlayerId with an invalid local user (-1), this subsystem returns no information",  [this]()
 					{
 						TSharedPtr<const FUniqueNetId> SponsorId = OnlineIdentity->GetSponsorUniquePlayerId(-1);
 						TestEqual("Verify that SponsorId is invalid", SponsorId.IsValid(), false);
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
 				});
 
 				Describe("CreateUniquePlayerId", [this, SubsystemType]()
 				{
-					It("When calling CreateUniquePlayerId with a valid series of binary data and size, this subsystem creates a unique player id", EAsyncExecution::ThreadPool, [this]()
+					It("When calling CreateUniquePlayerId with a valid series of binary data and size, this subsystem creates a unique player id",  [this]()
 					{
 						FString PlayerGUIDString;
 						FGuid PlayerGUID;
@@ -611,11 +652,11 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UniquePlayerId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UniquePlayerId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 						}
 					});
 
-					It("When calling CreateUniquePlayerId with a valid series of binary data but no size, this subsystem does not create a unique player id", EAsyncExecution::ThreadPool, [this]()
+					It("When calling CreateUniquePlayerId with a valid series of binary data but no size, this subsystem does not create a unique player id",  [this]()
 					{
 						FString PlayerGUIDString;
 						FGuid PlayerGUID;
@@ -627,7 +668,7 @@ void FOnlineIdentitySpec::Define()
 						TestEqual("Verify that UniquePlayerId is not valid", UniquePlayerId.IsValid(), false);
 					});
 
-					It("When calling CreateUniquePlayerId with a valid size but no valid series of binary data, this subsystem does not create a unique player id", EAsyncExecution::ThreadPool, [this]()
+					It("When calling CreateUniquePlayerId with a valid size but no valid series of binary data, this subsystem does not create a unique player id",  [this]()
 					{
 						FString PlayerGUIDString;
 						FGuid PlayerGUID;
@@ -639,7 +680,7 @@ void FOnlineIdentitySpec::Define()
 						TestEqual("Verify that UniquePlayerId is not valid", UniquePlayerId.IsValid(), false);
 					});
 
-					It("When calling CreateUniquePlayerId with no size or data, this subsystem does not create a unique player id", EAsyncExecution::ThreadPool, [this]()
+					It("When calling CreateUniquePlayerId with no size or data, this subsystem does not create a unique player id",  [this]()
 					{
 						FString PlayerGUIDString;
 						FGuid PlayerGUID;
@@ -651,7 +692,7 @@ void FOnlineIdentitySpec::Define()
 						TestEqual("Verify that UniquePlayerId is not valid", UniquePlayerId.IsValid(), false);
 					});
 
-					It("When calling CreateUniquePlayerId with a string, this subsystem creates a unique player id", EAsyncExecution::ThreadPool, [this]()
+					It("When calling CreateUniquePlayerId with a string, this subsystem creates a unique player id",  [this]()
 					{
 						FString PlayerGUIDString;
 						FGuid PlayerGUID;
@@ -666,14 +707,14 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UniquePlayerId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UniquePlayerId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 						}
 					});
 				});
 				
 				Describe("GetLoginStatus", [this, SubsystemType]()
 				{
-					LatentIt("When calling GetLoginStatus with a valid local user, this subsystem correctly returns the user's login status", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetLoginStatus with a valid local user, this subsystem correctly returns the user's login status",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -688,7 +729,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling GetLoginStatus with a valid FUniqueNetId, this subsystem returns that user's login status", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetLoginStatus with a valid FUniqueNetId, this subsystem returns that user's login status",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -703,13 +744,13 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetLoginStatus with an invalid local user, this subsystem returns login status as ELoginStatus::NotLoggedIn", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetLoginStatus with an invalid local user, this subsystem returns login status as ELoginStatus::NotLoggedIn",  [this]()
 					{
 						ELoginStatus::Type UserLoginStatus = OnlineIdentity->GetLoginStatus(-1);
 						TestEqual("Verify that the returned UserLoginStatus is ELoginStatus::NotLoggedIn", UserLoginStatus, ELoginStatus::NotLoggedIn);
 					});
 
-					It("When calling GetLoginStatus with an invalid FUniqueNetId, this subsystem returns login status as ELoginStatus::NotLoggedIn", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetLoginStatus with an invalid FUniqueNetId, this subsystem returns login status as ELoginStatus::NotLoggedIn",  [this]()
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -722,17 +763,17 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 						}
 					});
 
-					It("When calling GetLoginStatus with a valid local user that is not logged in, this subsystem returns login status as ELoginStatus::NotLoggedIn", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetLoginStatus with a valid local user that is not logged in, this subsystem returns login status as ELoginStatus::NotLoggedIn",  [this]()
 					{
 						ELoginStatus::Type UserLoginStatus = OnlineIdentity->GetLoginStatus(0);
 						TestEqual("Verify that the returned UserLoginStatus is ELoginStatus::NotLoggedIn", UserLoginStatus, ELoginStatus::NotLoggedIn);
 					});
 
-					LatentIt("When calling GetLoginStatus with a valid FUniqueNetId that is not logged in, this subsystem returns login status as ELoginStatus::NotLoggedIn", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetLoginStatus with a valid FUniqueNetId that is not logged in, this subsystem returns login status as ELoginStatus::NotLoggedIn",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -751,7 +792,7 @@ void FOnlineIdentitySpec::Define()
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+									UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 								}
 
 								TestDone.Execute();
@@ -767,7 +808,7 @@ void FOnlineIdentitySpec::Define()
 				
 				Describe("GetPlayerNickname", [this, SubsystemType]()
 				{
-					LatentIt("When calling GetPlayerNickname with a valid local user, this subsystem returns the user's nickname", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetPlayerNickname with a valid local user, this subsystem returns the user's nickname",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -784,7 +825,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling GetPlayerNickname with a valid FUniqueNetId, this subsystem returns that user's nickname", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetPlayerNickname with a valid FUniqueNetId, this subsystem returns that user's nickname",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -800,22 +841,22 @@ void FOnlineIdentitySpec::Define()
 
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
-
-					It("When calling GetPlayerNickname with a valid local user that is not logged in, this subsystem returns an error as the PlayerNickname", EAsyncExecution::ThreadPool, [this]()
+					/**DISABLED**/
+					xIt("When calling GetPlayerNickname with a valid local user that is not logged in, this subsystem returns an error as the PlayerNickname",  [this]()
 					{
 						FString PlayerNickname = "";
 						PlayerNickname = OnlineIdentity->GetPlayerNickname(0);
 
 						TestEqual("Verify that PlayerNickname is the expected error code: ONLINE_EXPECTEDERROR_INVALID_USERID", PlayerNickname, ONLINE_EXPECTEDERROR_INVALID_USERID);
 					});
-
-					It("When calling GetPlayerNickname with a invalid local user (-1), this subsystem returns an error as the PlayerNickname", EAsyncExecution::ThreadPool, [this]()
+					/**DISABLED**/
+					xIt("When calling GetPlayerNickname with a invalid local user (-1), this subsystem returns an error as the PlayerNickname",  [this]()
 					{
 						FString PlayerNickname = OnlineIdentity->GetPlayerNickname(-1);
 						TestEqual("Verify that PlayerNickname is the expected error code: ONLINE_EXPECTEDERROR_INVALID_USERID", PlayerNickname, ONLINE_EXPECTEDERROR_INVALID_USERID);
 					});
-
-					It("When calling GetPlayerNickname with an invalid FUniqueNetId, this subsystem returns an error as the PlayerNickname", EAsyncExecution::ThreadPool, [this]()
+					/**DISABLED**/
+					xIt("When calling GetPlayerNickname with an invalid FUniqueNetId, this subsystem returns an error as the PlayerNickname",  [this]()
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -828,14 +869,24 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 						}
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
 				});
 
 				Describe("GetAuthToken", [this, SubsystemType]()
 				{
-					LatentIt("When calling GetAuthToken with a valid local user, this subsystem returns the current auth token assigned to this user", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetAuthToken with a valid local user, this subsystem returns the current auth token assigned to this user",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -850,14 +901,14 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetAuthToken with an invalid local user (-1), this subsystem returns an empty auth token", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetAuthToken with an invalid local user (-1), this subsystem returns an empty auth token",  [this]()
 					{
 						FString PlayerAuthToken = OnlineIdentity->GetAuthToken(-1);
 						TestEqual("Verify that PlayerAuthToken is not populated", PlayerAuthToken.Len() == 0, true);
 					});
 
 
-					It("When calling GetAuthToken with a local user that is not logged in, this subsystem returns an empty string", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetAuthToken with a local user that is not logged in, this subsystem returns an empty string",  [this]()
 					{
 						FString PlayerAuthToken = OnlineIdentity->GetAuthToken(0);
 						TestEqual("Verify that PlayerAuthToken is not populated", PlayerAuthToken.Len() == 0, true);
@@ -867,7 +918,7 @@ void FOnlineIdentitySpec::Define()
 
 				Describe("RevokeAuthToken", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentBeforeEach( [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -878,8 +929,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					// TODO: Need a good way to check Auth token validity
-					LatentIt("When calling RevokeAuthToken with a valid FUniqueNetId, this subsystem revokes that user's auth token", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentIt("When calling RevokeAuthToken with a valid FUniqueNetId, this subsystem revokes that user's auth token",  [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						TSharedPtr<const FUniqueNetId> UserIdToCheck = OnlineIdentity->GetUniquePlayerId(0);
 
@@ -888,20 +938,18 @@ void FOnlineIdentitySpec::Define()
 							OnlineIdentity->RevokeAuthToken(*UserIdToCheck, FOnRevokeAuthTokenCompleteDelegate::CreateLambda([this, TestDone, SubsystemType](const FUniqueNetId& RevokeAuthTokenUserId, const FOnlineError& RevokeAuthTokenError)
 							{
 								TestEqual("Verify that RevokeAuthTokenError.bSucceeded returns as: True", RevokeAuthTokenError.bSucceeded, true);
-
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to determine Auth Token validity"));
 								TestDone.Execute();
 							}));
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 							TestDone.Execute();
 						}
 						
 					});
 
-					LatentIt("When calling RevokeAuthToken with an invalid FUniqueNetId, this subsystem returns an error", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentIt("When calling RevokeAuthToken with an invalid FUniqueNetId, this subsystem returns an error",  [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserIdToCheck = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -911,23 +959,31 @@ void FOnlineIdentitySpec::Define()
 							OnlineIdentity->RevokeAuthToken(*InvalidUserIdToCheck, FOnRevokeAuthTokenCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](const FUniqueNetId& RevokeAuthTokenUserId, const FOnlineError& RevokeAuthTokenError)
 							{
 								TestEqual("Verify that RevokeAuthTokenError.bSucceeded returns as: False", RevokeAuthTokenError.bSucceeded, false);
-								TestEqual("Verify that RevokeAuthTokenError.ErrorCode is: ONLINE_EXPECTEDERROR_ACCOUNT_DOESNOTEXIST", RevokeAuthTokenError.ErrorCode.Contains(ONLINE_EXPECTEDERROR_ACCOUNT_DOESNOTEXIST), false);
-								TestEqual("Verify that RevokeAuthTokenError.ErrorMessage is populated", RevokeAuthTokenError.ErrorMessage.IsEmpty(), false);
 								TestDone.Execute();
 							}));
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserIdToCheck failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 							TestDone.Execute();
 						}
 					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
+
 				});
 
-				// TODO: Requires a valid backend configuration
-				Describe("GetUserPrivilege", [this, SubsystemType]()
+				xDescribe("GetUserPrivilege", [this, SubsystemType]()
 				{
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId, EUserPrivileges::Type and Delegate, this subsystem Delegate call back returns NoFailures as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId, EUserPrivileges::Type and Delegate, this subsystem Delegate call back returns NoFailures as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -938,7 +994,7 @@ void FOnlineIdentitySpec::Define()
 								TestTrue("Verify that this Delegate was called", true);
 								TestEqual("Verify that the GetUserPrivilegePrivilegeResult is: NoFailures", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::NoFailures, true);
 
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
 								TestDone.Execute();
 							}));						
 						}));
@@ -947,7 +1003,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: Figure out how to induce a patch required state
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a patch before they can play, this subsystem Delegate call back returns a RequiredPatchAvailable as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a patch before they can play, this subsystem Delegate call back returns a RequiredPatchAvailable as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -958,8 +1014,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: RequiredPatchAvailable", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::RequiredPatchAvailable, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a patch required state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a patch required state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -968,7 +1024,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: WIP Figure out how to induce a RequiredSystemUpdate
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a system update before they can play, this subsystem Delegate call back returns a RequiredSystemUpdate as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a system update before they can play, this subsystem Delegate call back returns a RequiredSystemUpdate as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -979,8 +1035,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: RequiredSystemUpdate", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::RequiredSystemUpdate, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a required system update state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a required system update state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -989,7 +1045,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: WIP Figure out how to induce a AgeRestrictionFailure
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is age restricted from play, this subsystem Delegate call back returns a AgeRestrictionFailure as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is age restricted from play, this subsystem Delegate call back returns a AgeRestrictionFailure as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1000,8 +1056,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: AgeRestrictionFailure", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::AgeRestrictionFailure, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an age restricted state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an age restricted state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1010,7 +1066,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: WIP Figure out how to induce a AccountTypeFailure
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a special account type before they can play, this subsystem Delegate call back returns a AccountTypeFailure as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who requires a special account type before they can play, this subsystem Delegate call back returns a AccountTypeFailure as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1021,8 +1077,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: AccountTypeFailure", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::AccountTypeFailure, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an account type failure state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an account type failure state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1030,7 +1086,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling GetUserPrivilege with invalid FUniqueNetId, this subsystem Delegate call back returns a UserNotFound as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with invalid FUniqueNetId, this subsystem Delegate call back returns a UserNotFound as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1050,7 +1106,7 @@ void FOnlineIdentitySpec::Define()
 							}
 							else
 							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 								TestDone.Execute();
 							}
 						}));
@@ -1058,7 +1114,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is not logged in, this subsystem Delegate call back returns a UserNotLoggedIn as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is not logged in, this subsystem Delegate call back returns a UserNotLoggedIn as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1082,7 +1138,7 @@ void FOnlineIdentitySpec::Define()
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+									UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
 									TestDone.Execute();
 								}
 							}));
@@ -1095,7 +1151,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: Figure out how to induce a ChatRestriction
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from chat, this subsystem Delegate call back returns a ChatRestriction as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from chat, this subsystem Delegate call back returns a ChatRestriction as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1106,8 +1162,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: ChatRestriction", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::ChatRestriction, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a Chat Restricted state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a Chat Restricted state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1116,7 +1172,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: Figure out how to induce a UGCRestriction
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from User Generated Content, this subsystem Delegate call back returns a UGCRestriction as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from User Generated Content, this subsystem Delegate call back returns a UGCRestriction as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1127,8 +1183,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: UGCRestriction", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::UGCRestriction, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a user generated content restricted state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce a user generated content restricted state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1137,7 +1193,7 @@ void FOnlineIdentitySpec::Define()
 					});
 
 					// TODO: Figure out how to induce a OnlinePlayRestricted
-					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from online play, this subsystem Delegate call back returns a OnlinePlayRestricted as the PrivilegeResult", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetUserPrivilege with a valid FUniqueNetId who is restricted from online play, this subsystem Delegate call back returns a OnlinePlayRestricted as the PrivilegeResult",  [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1148,8 +1204,8 @@ void FOnlineIdentitySpec::Define()
 								TestEqual("Verify that GetUserPrivilegePrivilege is: CanPlayOnline", GetUserPrivilegePrivilege == EUserPrivileges::CanPlayOnline, true);
 								TestEqual("Verify that GetUserPrivilegePrivilegeResult is: OnlinePlayRestricted", GetUserPrivilegePrivilegeResult == (uint32)IOnlineIdentity::EPrivilegeResults::OnlinePlayRestricted, true);
 								
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an online play restricted state"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Requires a valid backend configuration"));
+								UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: Test implementation not yet complete. Needs a way to induce an online play restricted state"));
 								TestDone.Execute();
 							}));
 						}));
@@ -1160,7 +1216,7 @@ void FOnlineIdentitySpec::Define()
 
 				Describe("GetPlatformUserIdFromUniqueNetId", [this, SubsystemType]()
 				{
-					LatentIt("When calling GetPlatformUserIdFromUniqueNetId with a valid FUniqueNetId, the subsystem returns the user's platform id", EAsyncExecution::ThreadPool, [this](const FDoneDelegate& TestDone)
+					LatentIt("When calling GetPlatformUserIdFromUniqueNetId with a valid FUniqueNetId, the subsystem returns the user's platform id", [this](const FDoneDelegate& TestDone)
 					{
 						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
@@ -1176,7 +1232,7 @@ void FOnlineIdentitySpec::Define()
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					It("When calling GetPlatformUserIdFromUniqueNetId with an invalid FUniqueNetId, the subsystem returns no information", EAsyncExecution::ThreadPool, [this]()
+					It("When calling GetPlatformUserIdFromUniqueNetId with an invalid FUniqueNetId, the subsystem returns no information", [this]()
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -1190,24 +1246,24 @@ void FOnlineIdentitySpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_IDENTITY(Error, TEXT("OSS Automation: IsValid() check on UserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 						}
 					});
 				});
 
 				Describe("GetAuthType", [this, SubsystemType]()
 				{
-					It("When calling GetAuthType, it returns that auth type that properly describes this subsystem interface", EAsyncExecution::ThreadPool, [this, SubsystemType]()
+					It("When calling GetAuthType, verify that it returns a non-null FString of 0 or greater size", [this, SubsystemType]()
 					{
 						FString AuthType = OnlineIdentity->GetAuthType();
-						TestEqual("Verify that GetAuthType returns a descriptive auth type for this subsystem", *AuthType, SubsystemType.ToString().ToLower());
+						TestEqual("Verify that it returns a non - null FString of 0 or greater size", true, AuthType.Len() >= 0);
 					});
 				});
 			});
 		});		
 	}
 
-	AfterEach(EAsyncExecution::ThreadPool, [this]()
+	AfterEach( [this]()
 	{
 		if (OnlineIdentity.IsValid())
 		{
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineLeaderboard.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineLeaderboard.spec.cpp
new file mode 100644
index 000000000000..b15d9be6f291
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineLeaderboard.spec.cpp
@@ -0,0 +1,587 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "OnlineSubsystem.h"
+#include "Online.h"
+#include "Interfaces/OnlineLeaderboardInterface.h"
+#include "Misc/AutomationTest.h"
+#include "Utils/OnlineErrors.data.h"
+#include "Utils/OnlineTestCommon.h"
+
+BEGIN_DEFINE_SPEC(FOnlineLeaderboardSpec, "OnlineLeaderboardInterface", EAutomationTestFlags::EngineFilter | EAutomationTestFlags::ApplicationContextMask)
+
+IOnlineSubsystem* OnlineSubsystem;
+
+IOnlineIdentityPtr OnlineIdentity;
+IOnlineLeaderboardsPtr OnlineLeaderboards;
+
+FOnlineAccountCredentials AccountCredentials;
+FOnlineAccountCredentials FriendAccountCredentials;
+
+FOnlineTestCommon CommonUtils;
+
+// Delegate Handles
+FDelegateHandle OnLogoutCompleteDelegateHandle;
+FDelegateHandle	OnLoginCompleteDelegateHandle;
+FDelegateHandle OnReadLeaderboardsCompleteDelegateHandle;
+FDelegateHandle OnLeaderboardFlushCompleteDelegateHandle;
+
+END_DEFINE_SPEC(FOnlineLeaderboardSpec)
+
+void FOnlineLeaderboardSpec::Define()
+{
+	TArray<FName> Subsystems = FOnlineTestCommon::GetEnabledTestSubsystems();
+
+	for (int32 Index = 0; Index < Subsystems.Num(); Index++)
+	{
+		FName SubsystemType = Subsystems[Index];
+
+		Describe(SubsystemType.ToString(), [this, SubsystemType]()
+		{
+			BeforeEach([this, SubsystemType]()
+			{
+				CommonUtils = FOnlineTestCommon();
+				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+				FriendAccountCredentials = FOnlineTestCommon::GetSubsystemFriendAccountCredentials(SubsystemType);
+
+				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
+				OnlineLeaderboards = Online::GetLeaderboardsInterface(SubsystemType);
+
+				// If OnlineIdentity or OnlineLeaderboards is not valid, the following test, including all other nested BeforeEaches, will not run
+				if (!OnlineIdentity.IsValid())
+				{
+					UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineLeaderboards.IsValid())
+				{
+					UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Failed to load OnlineLeaderboards Interface for %s"), *SubsystemType.ToString());
+				}
+
+			});
+
+			// TODO: No Tests have been validated yet for functionality
+			Describe("Online Leaderboard", [this, SubsystemType]()
+			{
+				xDescribe("ReadLeaderboards", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling ReadLeaderboards with a valid Players array and ReadObject, this subsystem returns data about those players from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						TArray<TSharedRef<const FUniqueNetId>> Players;
+						Players.Add(TestAccountId.ToSharedRef());
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+						{
+							TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+
+							TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+
+							TestDone.Execute();
+						}));
+
+						bool bCallStarted = OnlineLeaderboards->ReadLeaderboards(Players, ReadObjectRef);
+
+						TestEqual("Verify that call started", bCallStarted, true);
+					});
+
+					LatentIt("When calling ReadLeaderboards with a valid ReadObject but an invalid Players array, this subsystem does not return data about those players from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+						TArray<TSharedRef<const FUniqueNetId>> Players;
+						Players.Add(TestAccountId.ToSharedRef());
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+						{
+							TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+
+							TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+
+							TestDone.Execute();
+						}));
+
+						OnlineLeaderboards->ReadLeaderboards(Players, ReadObjectRef);
+					});
+
+					LatentIt("When calling ReadLeaderboards with a valid Players array but an invalid ReadObject, this subsystem does not return data about those players from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						TArray<TSharedRef<const FUniqueNetId>> Players;
+						Players.Add(TestAccountId.ToSharedRef());
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+						{
+							TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+
+							TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+
+							TestDone.Execute();
+						}));
+						
+						OnlineLeaderboards->ReadLeaderboards(Players, ReadObjectRef);
+					});
+				});
+
+				xDescribe("ReadLeaderboardsForFriends", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling ReadLeaderboardsForFriends with a valid LocalUserNum and ReadObject, this subsystem returns data about the user's friends from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+							FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+							OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+							{
+								TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+
+								TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineLeaderboards->ReadLeaderboardsForFriends(0, ReadObjectRef);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ReadLeaderboardsForFriends with a valid ReadObject but an invalid LocalUserNum, this subsystem does not return data about any user's friends from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+							FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+							OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+							{
+								TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+								TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineLeaderboards->ReadLeaderboardsForFriends(-1, ReadObjectRef);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ReadLeaderboardsForFriends with a valid LocalUserNum but an invalid ReadObject, this subsystem does not return data about any user's friends from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							FOnlineLeaderboardReadRef ReadObjectRef;
+
+							OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+							{
+								TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+								TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineLeaderboards->ReadLeaderboardsForFriends(0, ReadObjectRef);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				// TODO: Test with multiple accounts that are on the leaderboards?
+				xDescribe("ReadLeaderboardsAroundRank", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundRank with a valid Rank, Range, and ReadObject, this subsystem returns data about players in that rank and range from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundRank(1, 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundRank with a valid Range and ReadObject but an invalid Rank, this subsystem does not return data about players in that rank and range from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundRank(-1, 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundRank with a valid Rank and ReadObject but an invalid Range, this subsystem does not return data about players in that rank and range from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundRank(1, -1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundRank with a valid Rank and Range but an invalid ReadObject, this subsystem does not return data about players in that rank and range from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundRank(1, 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+				});
+
+				xDescribe("ReadLeaderboardsAroundUser", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundUser with a valid Player, Range, and ReadObject, this subsystem returns data around that user from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundUser(TestAccountId.ToSharedRef(), 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundUser with a valid Range and ReadObject but an invalid Player, this subsystem does not return data around any user from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundUser(TestAccountId.ToSharedRef(), 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundUser with a valid Player and ReadObject but an invalid Range, this subsystem does not return data around that user from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->ReadLeaderboardsAroundUser(TestAccountId.ToSharedRef(), -1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+
+					LatentIt("When calling ReadLeaderboardsAroundUser with a valid Player and Range but an invalid ReadObject, this subsystem does not return data around that user from the leaderboards", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardReadRef ReadObjectRef;
+
+						OnlineLeaderboards->ReadLeaderboardsAroundUser(TestAccountId.ToSharedRef(), 1, ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+					});
+				});
+
+				xDescribe("FreeStats", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling FreeStats with a valid ReadObject, this subsystem cleans up allocated stats data", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->FreeStats(*ReadObjectRef);
+
+						TestEqual("Verify that ReadObject is not populated", ReadObjectRef->Rows.Num() == 0, true);
+
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling FreeStats with an invalid ReadObject, this subsystem does not clean up allocated stats data", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+						FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+						OnlineLeaderboards->FreeStats(*ReadObjectRef);
+					});
+				});
+
+				xDescribe("WriteLeaderboards", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling WriteLeaderboards with a valid SessionName, Player, and WriteObject, this subsystem writes stats to to the subsystem's cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardWrite LeaderboardWriteObject;
+						LeaderboardWriteObject.LeaderboardNames.Add(FName(TEXT("TestLeaderboard")));
+						LeaderboardWriteObject.RatedStat = "TestStat";
+						LeaderboardWriteObject.DisplayFormat = ELeaderboardFormat::Number;
+						LeaderboardWriteObject.SortMethod = ELeaderboardSort::Descending;
+						LeaderboardWriteObject.UpdateMethod = ELeaderboardUpdateMethod::KeepBest;
+
+						LeaderboardWriteObject.SetIntStat("TestStat", 50);
+
+						bool bCallStarted = OnlineLeaderboards->WriteLeaderboards(TEXT("TestSessionName"), *TestAccountId, LeaderboardWriteObject);
+						
+						TestEqual("Verify that bCallStarted returns as: True", bCallStarted, true);
+
+						// How to see what's in cache? Maybe write to leaderboard then read from leaderboard?
+					});
+
+					LatentIt("When calling WriteLeaderboards with a valid Player and WriteObject but an invalid SessionName, this subsystem does not write stats to to the subsystem's cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardWrite LeaderboardWriteObject;
+						LeaderboardWriteObject.LeaderboardNames.Add(FName(TEXT("TestLeaderboard")));
+						LeaderboardWriteObject.RatedStat = "TestStat";
+						LeaderboardWriteObject.DisplayFormat = ELeaderboardFormat::Number;
+						LeaderboardWriteObject.SortMethod = ELeaderboardSort::Descending;
+						LeaderboardWriteObject.UpdateMethod = ELeaderboardUpdateMethod::KeepBest;
+
+						LeaderboardWriteObject.SetIntStat("TestStat", 50);
+
+						OnlineLeaderboards->WriteLeaderboards(TEXT(""), *TestAccountId, LeaderboardWriteObject);
+
+						// How to see what's in cache?
+					});
+
+					LatentIt("When calling WriteLeaderboards with a valid SessionName and WriteObject but an invalid Player, this subsystem does not write stats to to the subsystem's cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+						FOnlineLeaderboardWrite LeaderboardWriteObject;
+						LeaderboardWriteObject.LeaderboardNames.Add(FName(TEXT("TestLeaderboard")));
+						LeaderboardWriteObject.RatedStat = "TestStat";
+						LeaderboardWriteObject.DisplayFormat = ELeaderboardFormat::Number;
+						LeaderboardWriteObject.SortMethod = ELeaderboardSort::Descending;
+						LeaderboardWriteObject.UpdateMethod = ELeaderboardUpdateMethod::KeepBest;
+
+						LeaderboardWriteObject.SetIntStat("TestStat", 50);
+
+						OnlineLeaderboards->WriteLeaderboards(TEXT("TestSessionName"), *TestAccountId, LeaderboardWriteObject);
+
+						// How to see what's in cache?
+					});
+
+					LatentIt("When calling WriteLeaderboards with a valid SessionName and Player but an invalid WriteObject, this subsystem does not write stats to to the subsystem's cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardWrite LeaderboardWriteObject;
+
+						OnlineLeaderboards->WriteLeaderboards(TEXT("TestSessionName"), *TestAccountId, LeaderboardWriteObject);
+
+						// How to see what's in cache?
+					});
+				});
+
+				// How to clean up Leaderboard after writing to it?
+				xDescribe("FlushLeaderboards", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling FlushLeaderboards with a valid SessionName and stats in the cache, this subsystem commits those stats changes to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						FString TestAccountIdString = CommonUtils.GetSubsystemTestAccountUniqueId(SubsystemType);
+						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+						FOnlineLeaderboardWrite LeaderboardWriteObject;
+						LeaderboardWriteObject.LeaderboardNames.Add(FName(TEXT("TestLeaderboard")));
+						LeaderboardWriteObject.RatedStat = "TestStat";
+						LeaderboardWriteObject.DisplayFormat = ELeaderboardFormat::Number;
+						LeaderboardWriteObject.SortMethod = ELeaderboardSort::Descending;
+						LeaderboardWriteObject.UpdateMethod = ELeaderboardUpdateMethod::KeepBest;
+
+						LeaderboardWriteObject.SetIntStat("TestStat", 50);
+
+						OnlineLeaderboards->WriteLeaderboards(TEXT("TestSessionName"), *TestAccountId, LeaderboardWriteObject);
+
+						OnlineLeaderboards->AddOnLeaderboardFlushCompleteDelegate_Handle(FOnLeaderboardFlushCompleteDelegate::CreateLambda([this, SubsystemType, TestAccountId, TestDone](const FName LeaderboardFlushSessionName, bool bLeaderboardFlushWasSuccessful)
+						{
+							TestEqual("Verify that LeaderboardFlushSessionName is: TestSessionName", LeaderboardFlushSessionName == TEXT("TestSessionName"), true);
+							TestEqual("Verify that bCallStarted returns as: True", bLeaderboardFlushWasSuccessful, true);
+
+							TArray<TSharedRef<const FUniqueNetId>> Players;
+							Players.Add(TestAccountId.ToSharedRef());
+
+							FOnlineLeaderboardReadPtr ReadObject = MakeShareable(new FOnlineLeaderboardRead());
+							FOnlineLeaderboardReadRef ReadObjectRef = ReadObject.ToSharedRef();
+
+							OnReadLeaderboardsCompleteDelegateHandle = OnlineLeaderboards->AddOnLeaderboardReadCompleteDelegate_Handle(FOnLeaderboardReadCompleteDelegate::CreateLambda([this, ReadObjectRef, TestDone](bool bReadLeaderboardsWasSuccessful)
+							{
+								TestEqual("Verify that bReadLeaderboardsWasSuccessful returns as: True", bReadLeaderboardsWasSuccessful, true);
+								TestEqual("Verify that ReadObject is populated", ReadObjectRef->Rows.Num() > 0, true);
+								TestDone.Execute();
+							}));
+
+							OnlineLeaderboards->ReadLeaderboards(Players, ReadObjectRef);
+						}));
+
+						OnlineLeaderboards->FlushLeaderboards(TEXT("TestSessionName"));
+					});
+
+					LatentIt("When calling FlushLeaderboards with an invalid SessionName and stats in the cache, this subsystem does not commit those stats changes to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+					});
+
+					LatentIt("When calling FlushLeaderboards with a valid SessionName but no stats in the cache, this subsystem does not commit any stats changes to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+					});
+				});
+
+				// FOnlinePlayerScore is not implemented
+				xDescribe("WriteOnlinePlayerRatings", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling WriteOnlinePlayerRatings with a valid SessionName, LeaderboardId, and PlayerScores array, this subsystem writes that score data to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+
+						TArray<FOnlinePlayerScore> PlayerScores;
+
+						OnlineLeaderboards->WriteOnlinePlayerRatings(TEXT("TestSessionName"), 1, PlayerScores);
+					});
+
+					LatentIt("When calling WriteOnlinePlayerRatings with a valid LeaderboardId and PlayerScores array but an invalid SessionName, this subsystem does not write that score data to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+					});
+
+					LatentIt("When calling WriteOnlinePlayerRatings with a valid SessionName and PlayerScores array but an invalid LeaderboardId, this subsystem does not write that score data to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+					});
+
+					LatentIt("When calling WriteOnlinePlayerRatings with a valid SessionName and LeaderboardId but an invalid PlayerScores array, this subsystem does not write that score data to the leaderboard", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						UE_LOG_ONLINE_LEADERBOARD(Error, TEXT("OSS Automation: Test not yet implemented"));
+					});
+				});
+			});
+
+			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			{
+				// Clean up Identity
+				if (OnlineIdentity.IsValid())
+				{
+					if (OnlineIdentity->GetLoginStatus(0) == ELoginStatus::LoggedIn)
+					{
+						OnlineIdentity->Logout(0);
+					}
+
+					OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+					OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+					OnlineIdentity = nullptr;
+				}
+
+				// Clean up OnlineLeaderboards
+				if (OnlineLeaderboards.IsValid())
+				{
+					OnlineLeaderboards->ClearOnLeaderboardReadCompleteDelegate_Handle(OnReadLeaderboardsCompleteDelegateHandle);
+					OnlineLeaderboards->ClearOnLeaderboardFlushCompleteDelegate_Handle(OnLeaderboardFlushCompleteDelegateHandle);
+					OnlineLeaderboards = nullptr;
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineMessage.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineMessage.spec.cpp
new file mode 100644
index 000000000000..6ecc836aae00
--- /dev/null
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlineMessage.spec.cpp
@@ -0,0 +1,1189 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "OnlineSubsystem.h"
+#include "Online.h"
+#include "Interfaces/OnlinePresenceInterface.h"
+#include "Misc/AutomationTest.h"
+#include "Utils/OnlineErrors.data.h"
+#include "Utils/OnlineTestCommon.h"
+
+BEGIN_DEFINE_SPEC(FOnlineMessageSpec, "OnlineMessageInterface", EAutomationTestFlags::EngineFilter | EAutomationTestFlags::ApplicationContextMask)
+
+IOnlineSubsystem* OnlineSubsystem;
+
+IOnlineIdentityPtr OnlineIdentity;
+IOnlineFriendsPtr OnlineFriends;
+IOnlineMessagePtr OnlineMessage;
+
+FOnlineAccountCredentials AccountCredentials;
+FOnlineAccountCredentials FriendAccountCredentials;
+
+FOnlineTestCommon CommonUtils;
+
+const IOnlinePresence::FOnPresenceTaskCompleteDelegate PresenceCompleteDelegate;
+
+// Delegate Handles
+FDelegateHandle OnLogoutCompleteDelegateHandle;
+FDelegateHandle	OnLoginCompleteDelegateHandle;
+FDelegateHandle OnEnumerateMessagesCompleteDelegateHandle;
+FDelegateHandle OnSendMessageCompleteDelegateHandle;
+FDelegateHandle OnDeleteMessageCompleteDelegateHandle;
+
+END_DEFINE_SPEC(FOnlineMessageSpec)
+
+void FOnlineMessageSpec::Define()
+{
+	TArray<FName> Subsystems = FOnlineTestCommon::GetEnabledTestSubsystems();
+
+	for (int32 Index = 0; Index < Subsystems.Num(); Index++)
+	{
+		FName SubsystemType = Subsystems[Index];
+
+		Describe(SubsystemType.ToString(), [this, SubsystemType]()
+		{
+			BeforeEach([this, SubsystemType]()
+			{
+				CommonUtils = FOnlineTestCommon();
+				AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+				FriendAccountCredentials = FOnlineTestCommon::GetSubsystemFriendAccountCredentials(SubsystemType);
+
+				OnlineSubsystem = IOnlineSubsystem::Get(SubsystemType);
+
+				OnlineIdentity = Online::GetIdentityInterface(SubsystemType);
+				OnlineFriends = Online::GetFriendsInterface(SubsystemType);
+				OnlineMessage = OnlineSubsystem->GetMessageInterface();
+
+				// If OnlineIdentity, OnlineFriends, or OnlineMessage is not valid, the following test, including all other nested BeforeEaches, will not run
+				if (!OnlineIdentity.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineFriends.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineFriends Interface for %s"), *SubsystemType.ToString());
+				}
+
+				if (!OnlineMessage.IsValid())
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: Failed to load OnlineMessage Interface for %s"), *SubsystemType.ToString());
+				}
+
+			});
+
+			// TODO: No Tests have been validated yet for functionality
+			Describe("Online Message", [this, SubsystemType]()
+			{
+				Describe("EnumerateMessages", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling EnumerateMessages with a valid local user, this subsystem populates the cached message headers array", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that EnumerateMessagesLocalUserNum is: 0", EnumerateMessagesLocalUserNum, 0);
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+								TestEqual("Verify that EnumerateMessagesErrorStr is empty", EnumerateMessagesErrorStr.IsEmpty(), true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								TestEqual("Verify that MessageHeaders is populated", MessageHeaders.Num() > 0, true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					xLatentIt("When calling EnumerateMessages with an invalid local user (-1), this subsystem does not populate the cached message headers array", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that EnumerateMessagesLocalUserNum is: 0", EnumerateMessagesLocalUserNum, 0);
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: False", bEnumerateMessageWasSuccessful, false);
+								TestEqual("Verify that EnumerateMessagesErrorStr is empty", EnumerateMessagesErrorStr.IsEmpty(), true);
+
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(-1);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("GetMessageHeaders", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling GetMessageHeaders with a valid local user, this subsystem returns the cached message headers array", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								TestEqual("Verify that MessageHeaders is populated", MessageHeaders.Num() > 0, true);
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetMessageHeaders with an invalid local user (-1), this subsystem does not return the cached message headers array", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(-1, MessageHeaders);
+
+								TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("ClearMessageHeaders", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling ClearMessageHeaders with a valid local user, this subsystem will clear the given cached message", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								OnlineMessage->ClearMessageHeaders(0);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ClearMessageHeaders with an invalid local user (-1), this subsystem will not clear the given cached message", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								OnlineMessage->ClearMessageHeaders(-1);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								TestEqual("Verify that MessageHeaders is populated", MessageHeaders.Num() > 0, true);
+								TestDone.Execute();
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("ReadMessage", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling ReadMessage with a valid local user and MessageId, this subsystem will cache that message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that ReadMessageLocalUserNum is: 0", ReadMessageLocalUserNum, 0);
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+										TestEqual("Verify that ReadMessageMessageId is still equal to MsgId", ReadMessageMessageId == *MsgId, true);
+										TestEqual("Verify that EnumerateMessagesErrorStr is empty", ReadMessageErrorStr.IsEmpty(), true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										TestEqual("Verify that ReceivedMessage pointer is valid", ReceivedMessage.IsValid(), true);
+										TestDone.Execute();
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: See what a MessageId actually is and then how to fake it
+					LatentIt("When calling ReadMessage with a valid local user and an invalid MessageId, this subsystem will not cache any message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						TestDone.Execute();
+					});
+
+					LatentIt("When calling ReadMessage with a valid MessageId but an invalid local user (-1), this subsystem will not cache that message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that ReadMessageLocalUserNum is: 0", ReadMessageLocalUserNum, 0);
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: False", bReadMessageWasSuccessful, false);
+										TestEqual("Verify that ReadMessageMessageId is still equal to MsgId", ReadMessageMessageId == *MsgId, true);
+										TestEqual("Verify that EnumerateMessagesErrorStr is empty", ReadMessageErrorStr.IsEmpty(), true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(-1, ReadMessageMessageId);
+
+										TestEqual("Verify that ReceivedMessage pointer is invalid", ReceivedMessage.IsValid(), false);
+										TestDone.Execute();
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("GetMessage", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling GetMessage with a valid local user and MessageId, this subsystem will return that message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											FString MessageString = ReceivedMessage->Payload.ToJsonStr();
+											TestEqual("Verify that MessageString is populated", MessageString.Len() > 0, true);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					// TODO: See what a MessageId actually is and then how to fake it
+					LatentIt("When calling GetMessage with a valid local user and MessageId, this subsystem will return that message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+					});
+
+					LatentIt("When calling GetMessage with a valid MessageId but an invalid local user (-1), this subsystem will not return that message's contents", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(-1, ReadMessageMessageId);
+
+										TestEqual("Verify that ReceivedMessage pointer is invalid", ReceivedMessage.IsValid(), false);
+										TestDone.Execute();
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("ClearMessage", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling ClearMessage with a valid local user and MessageId, this subsystem clears that message from the cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											OnlineMessage->ClearMessage(0, ReadMessageMessageId);
+											ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+											TestEqual("Verify that ReceivedMessage pointer is invalid", ReceivedMessage.IsValid(), false);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ClearMessage with a valid local user but an invalid MessageId, this subsystem does not clear any message from the cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											//Mess up messageID here
+											OnlineMessage->ClearMessage(0, ReadMessageMessageId);
+											ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+											TestEqual("Verify that ReceivedMessage pointer is invalid", ReceivedMessage.IsValid(), false);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ClearMessage with a valid MessageId but an invalid local user (-1), this subsystem does not clear that message from the cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											OnlineMessage->ClearMessage(-1, ReadMessageMessageId);
+											ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+											TestEqual("Verify that ReceivedMessage pointer is valid", ReceivedMessage.IsValid(), true);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+				});
+
+				xDescribe("ClearMessages", [this, SubsystemType]()
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+					});
+
+					LatentIt("When calling ClearMessages with a valid local user, this subsystem clears all messages from the cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											OnlineMessage->ClearMessages(0);
+											ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+											TestEqual("Verify that ReceivedMessage pointer is invalid", ReceivedMessage.IsValid(), false);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling ClearMessages with an invalid local user (-1), this subsystem does not clear any messages from the cache", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+							{
+								TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+								TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+								OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+								if (MessageHeaders.Num() > 0)
+								{
+									TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+									OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+									{
+										TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+										TSharedPtr<FOnlineMessage> ReceivedMessage;
+										ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+										if (ReceivedMessage.IsValid())
+										{
+											OnlineMessage->ClearMessages(-1);
+											ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+											TestEqual("Verify that ReceivedMessage pointer is valid", ReceivedMessage.IsValid(), true);
+											TestDone.Execute();
+										}
+										else
+										{
+											UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on ReceivedMessage failed after a call to OnlineMessage->GetMessage()"));
+											TestDone.Execute();
+										}
+									}));
+
+									OnlineMessage->ReadMessage(0, *MsgId);
+								}
+								else
+								{
+									UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+									TestDone.Execute();
+								}
+							}));
+
+							OnlineMessage->EnumerateMessages(0);
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					xDescribe("SendMessage", [this, SubsystemType]()
+					{
+						LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+						{
+						});
+
+						LatentIt("When calling SendMessage with a valid local user, array of RecipientIds, MessageType, and Payload, this subsystem delivers that payload to the RecipientIds", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumFriendAccount, bool bLoginWasSuccessfulFriendAccount, const FUniqueNetId& LoginUserIdFriendAccount, const FString& LoginErrorFriendAccount)
+							{
+								FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
+								TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+								TArray<TSharedRef<const FUniqueNetId>> Recipients;
+								Recipients.Add(TestAccountId.ToSharedRef());
+
+								FOnlineMessagePayload TestPayload;
+								TArray<uint8> TestData;
+								TestData.Add(0xde);
+
+								TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+								OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+								{
+									TestEqual("Verify that SendMessageLocalUserNum is: 0", SendMessageLocalUserNum == 0, true);
+									TestEqual("Verify that bSendMessageWasSuccessful returns as: True", bSendMessageWasSuccessful, true);
+									TestEqual("Verify that SendMessagePayload is populated", SendMessagePayload.Len() > 0, true);
+
+									// Log into other account to verify that they received the message
+									OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+									OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+									{
+										OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+										OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+										{
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+												TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												if (MessageHeaders.Num() > 0)
+												{
+													TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+													OnlineMessage->AddOnReadMessageCompleteDelegate_Handle(0, FOnReadMessageCompleteDelegate::CreateLambda([this, MsgId, TestDone](int32 ReadMessageLocalUserNum, bool bReadMessageWasSuccessful, const FUniqueMessageId& ReadMessageMessageId, const FString& ReadMessageErrorStr)
+													{
+														TestEqual("Verify that bReadMessageWasSuccessful returns as: True", bReadMessageWasSuccessful, true);
+
+														TSharedPtr<FOnlineMessage> ReceivedMessage;
+														ReceivedMessage = OnlineMessage->GetMessage(0, ReadMessageMessageId);
+
+														TestEqual("Verify that ReceivedMessage pointer is valid", ReceivedMessage.IsValid(), true);
+													}));
+
+													OnlineMessage->ReadMessage(0, *MsgId);
+												}
+												else
+												{
+													UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+													TestDone.Execute();
+												}
+											}));
+										}));
+
+										OnlineIdentity->Login(0, AccountCredentials);
+									}));
+
+									OnlineIdentity->Logout(0);
+								}));
+
+								OnlineMessage->SendMessage(0, Recipients, TEXT("TEST"), TestPayload);
+							}));
+
+							OnlineIdentity->Login(0, FriendAccountCredentials);
+						});
+
+						LatentIt("When calling SendMessage with a valid local user, array of RecipientIds, and MessageType but an invalid Payload, this subsystem does not deliver any payload to the RecipientIds", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumFriendAccount, bool bLoginWasSuccessfulFriendAccount, const FUniqueNetId& LoginUserIdFriendAccount, const FString& LoginErrorFriendAccount)
+							{
+								FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
+								TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+								TArray<TSharedRef<const FUniqueNetId>> Recipients;
+								Recipients.Add(TestAccountId.ToSharedRef());
+
+								// TODO: Create invalid payload
+								FOnlineMessagePayload TestPayload;
+								TArray<uint8> TestData;
+								TestData.Add(0xde);
+
+								TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+								OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+								{
+									TestEqual("Verify that SendMessageLocalUserNum is: 0", SendMessageLocalUserNum == 0, true);
+									TestEqual("Verify that bSendMessageWasSuccessful returns as: True", bSendMessageWasSuccessful, true);
+									TestEqual("Verify that SendMessagePayload is populated", SendMessagePayload.Len() > 0, true);
+
+									// Log into other account to verify that they did not receive the message
+									OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+									OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+									{
+										OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+										OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+										{
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+												TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+											}));
+										}));
+
+										OnlineIdentity->Login(0, AccountCredentials);
+									}));
+
+									OnlineIdentity->Logout(0);
+								}));
+
+								OnlineMessage->SendMessage(0, Recipients, TEXT("TEST"), TestPayload);
+							}));
+
+							OnlineIdentity->Login(0, FriendAccountCredentials);
+						});
+
+						LatentIt("When calling SendMessage with a valid local user, array of RecipientIds, and Payload but an invalid MessageType, this subsystem does not deliver that payload to the RecipientIds", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumFriendAccount, bool bLoginWasSuccessfulFriendAccount, const FUniqueNetId& LoginUserIdFriendAccount, const FString& LoginErrorFriendAccount)
+							{
+								FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
+								TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+								TArray<TSharedRef<const FUniqueNetId>> Recipients;
+								Recipients.Add(TestAccountId.ToSharedRef());
+
+								FOnlineMessagePayload TestPayload;
+								TArray<uint8> TestData;
+								TestData.Add(0xde);
+
+								TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+								OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+								{
+									TestEqual("Verify that SendMessageLocalUserNum is: 0", SendMessageLocalUserNum == 0, true);
+									TestEqual("Verify that bSendMessageWasSuccessful returns as: True", bSendMessageWasSuccessful, true);
+									TestEqual("Verify that SendMessagePayload is populated", SendMessagePayload.Len() > 0, true);
+
+									// Log into other account to verify that they did not receive the message
+									OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+									OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+									{
+										OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+										OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+										{
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+												TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+											}));
+										}));
+
+										OnlineIdentity->Login(0, AccountCredentials);
+									}));
+
+									OnlineIdentity->Logout(0);
+								}));
+
+								//TODO: Create invalid message type
+								OnlineMessage->SendMessage(0, Recipients, TEXT("TEST"), TestPayload);
+							}));
+
+							OnlineIdentity->Login(0, FriendAccountCredentials);
+						});
+
+						LatentIt("When calling SendMessage with a valid local user, MessageType, and Payload but an invalid array of RecipientIds, this subsystem does not deliver that payload to the RecipientIds", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumFriendAccount, bool bLoginWasSuccessfulFriendAccount, const FUniqueNetId& LoginUserIdFriendAccount, const FString& LoginErrorFriendAccount)
+							{
+								TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TEXT("0123456789"));
+
+								TArray<TSharedRef<const FUniqueNetId>> Recipients;
+								Recipients.Add(TestAccountId.ToSharedRef());
+
+								FOnlineMessagePayload TestPayload;
+								TArray<uint8> TestData;
+								TestData.Add(0xde);
+
+								TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+								OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+								{
+									TestEqual("Verify that SendMessageLocalUserNum is: 0", SendMessageLocalUserNum == 0, true);
+									TestEqual("Verify that bSendMessageWasSuccessful returns as: True", bSendMessageWasSuccessful, true);
+									TestEqual("Verify that SendMessagePayload is populated", SendMessagePayload.Len() > 0, true);
+
+									// Log into other account to verify that they did not receive the message
+									OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+									OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+									{
+										OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+										OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+										{
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+												TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+											}));
+										}));
+
+										OnlineIdentity->Login(0, AccountCredentials);
+									}));
+
+									OnlineIdentity->Logout(0);
+								}));
+
+								OnlineMessage->SendMessage(0, Recipients, TEXT("TEST"), TestPayload);
+							}));
+
+							OnlineIdentity->Login(0, FriendAccountCredentials);
+						});
+
+						LatentIt("When calling SendMessage with a valid array of RecipientIds, MessageType, and Payload but an invalid local user (-1), this subsystem does not deliver that payload to the RecipientIds", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumFriendAccount, bool bLoginWasSuccessfulFriendAccount, const FUniqueNetId& LoginUserIdFriendAccount, const FString& LoginErrorFriendAccount)
+							{
+								FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
+								TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+								TArray<TSharedRef<const FUniqueNetId>> Recipients;
+								Recipients.Add(TestAccountId.ToSharedRef());
+
+								FOnlineMessagePayload TestPayload;
+								TArray<uint8> TestData;
+								TestData.Add(0xde);
+
+								TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+								OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+								{
+									TestEqual("Verify that SendMessageLocalUserNum is: 0", SendMessageLocalUserNum == 0, true);
+									TestEqual("Verify that bSendMessageWasSuccessful returns as: True", bSendMessageWasSuccessful, true);
+									TestEqual("Verify that SendMessagePayload is populated", SendMessagePayload.Len() > 0, true);
+
+									// Log into other account to verify that they did not receive the message
+									OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+									OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+									{
+										OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+										OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+										{
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+												TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+											}));
+										}));
+
+										OnlineIdentity->Login(0, AccountCredentials);
+									}));
+
+									OnlineIdentity->Logout(0);
+								}));
+
+								OnlineMessage->SendMessage(-1, Recipients, TEXT("TEST"), TestPayload);
+							}));
+
+							OnlineIdentity->Login(0, FriendAccountCredentials);
+						});
+					});
+
+					xDescribe("DeleteMessage", [this, SubsystemType]()
+					{
+						LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+						{
+							CommonUtils.SendMessageToTestAccount(OnlineIdentity, OnlineFriends, OnlineMessage, SubsystemType, TestDone);
+						});
+
+						LatentIt("When calling DeleteMessage with a valid local user and MessageId, this subsystem deletes that message", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+							{
+								OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+								{
+									TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+									TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+									OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+									if (MessageHeaders.Num() > 0)
+									{
+										TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+										OnlineMessage->ClearMessageHeaders(0);
+
+										OnlineMessage->AddOnDeleteMessageCompleteDelegate_Handle(0, FOnDeleteMessageCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 DeleteMessageLocalUserNum, bool bDeleteMessageWasSuccessful, const FUniqueMessageId& DeleteMessageMessageId, const FString& DeleteMessageErrorStr)
+										{
+											OnlineMessage->ClearOnEnumerateMessagesCompleteDelegate_Handle(0, OnEnumerateMessagesCompleteDelegateHandle);
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 SecondEnumerateMessagesLocalUserNum, bool bSecondEnumerateMessageWasSuccessful, const FString& SecondEnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bSecondEnumerateMessageWasSuccessful, true);
+
+												MessageHeaders.Empty();
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is not populated", MessageHeaders.Num() == 0, true);
+											}));
+
+											OnlineMessage->EnumerateMessages(0);
+										}));
+
+										OnlineMessage->DeleteMessage(0, *MsgId);
+									}
+									else
+									{
+										UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineMessage->EnumerateMessages(0);
+							}));
+
+							OnlineIdentity->Login(0, AccountCredentials);
+						});
+
+						LatentIt("When calling DeleteMessage with a valid local user but an invalid MessageId, this subsystem does not delete any message", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+							{
+								OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+								{
+									TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+									TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+									OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+									if (MessageHeaders.Num() > 0)
+									{
+										//TODO: Figure out how to mess with message ID
+										TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+										OnlineMessage->ClearMessageHeaders(0);
+
+										OnlineMessage->AddOnDeleteMessageCompleteDelegate_Handle(0, FOnDeleteMessageCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 DeleteMessageLocalUserNum, bool bDeleteMessageWasSuccessful, const FUniqueMessageId& DeleteMessageMessageId, const FString& DeleteMessageErrorStr)
+										{
+											OnlineMessage->ClearOnEnumerateMessagesCompleteDelegate_Handle(0, OnEnumerateMessagesCompleteDelegateHandle);
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 SecondEnumerateMessagesLocalUserNum, bool bSecondEnumerateMessageWasSuccessful, const FString& SecondEnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bSecondEnumerateMessageWasSuccessful, true);
+
+												MessageHeaders.Empty();
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is populated", MessageHeaders.Num() > 0, true);
+											}));
+
+											OnlineMessage->EnumerateMessages(0);
+										}));
+
+										OnlineMessage->DeleteMessage(0, *MsgId);
+									}
+									else
+									{
+										UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineMessage->EnumerateMessages(0);
+							}));
+
+							OnlineIdentity->Login(0, AccountCredentials);
+						});
+
+						LatentIt("When calling DeleteMessage with a valid MessageId but an invalid local user (-1), this subsystem does not delete that message", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
+						{
+							OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalPlayerNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+							{
+								OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, TestDone](int32 EnumerateMessagesLocalUserNum, bool bEnumerateMessageWasSuccessful, const FString& EnumerateMessagesErrorStr)
+								{
+									TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bEnumerateMessageWasSuccessful, true);
+
+									TArray<TSharedRef<FOnlineMessageHeader>> MessageHeaders;
+									OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+									if (MessageHeaders.Num() > 0)
+									{
+										TSharedRef<const FUniqueMessageId> MsgId = MessageHeaders[0]->MessageId;
+
+										OnlineMessage->ClearMessageHeaders(0);
+
+										OnlineMessage->AddOnDeleteMessageCompleteDelegate_Handle(0, FOnDeleteMessageCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 DeleteMessageLocalUserNum, bool bDeleteMessageWasSuccessful, const FUniqueMessageId& DeleteMessageMessageId, const FString& DeleteMessageErrorStr)
+										{
+											OnlineMessage->ClearOnEnumerateMessagesCompleteDelegate_Handle(0, OnEnumerateMessagesCompleteDelegateHandle);
+											OnEnumerateMessagesCompleteDelegateHandle = OnlineMessage->AddOnEnumerateMessagesCompleteDelegate_Handle(0, FOnEnumerateMessagesCompleteDelegate::CreateLambda([this, &MessageHeaders, TestDone](int32 SecondEnumerateMessagesLocalUserNum, bool bSecondEnumerateMessageWasSuccessful, const FString& SecondEnumerateMessagesErrorStr)
+											{
+												TestEqual("Verify that bEnumerateMessageWasSuccessful returns as: True", bSecondEnumerateMessageWasSuccessful, true);
+
+												MessageHeaders.Empty();
+												OnlineMessage->GetMessageHeaders(0, MessageHeaders);
+
+												TestEqual("Verify that MessageHeaders is populated", MessageHeaders.Num() > 0, true);
+											}));
+
+											OnlineMessage->EnumerateMessages(0);
+										}));
+
+										OnlineMessage->DeleteMessage(-1, *MsgId);
+									}
+									else
+									{
+										UE_LOG_ONLINE(Error, TEXT("OSS Automation: MessageHeaders still unpopulated after a call to OnlineMessage->GetMessageHeaders()"));
+										TestDone.Execute();
+									}
+								}));
+
+								OnlineMessage->EnumerateMessages(0);
+							}));
+
+							OnlineIdentity->Login(0, AccountCredentials);
+						});
+					});
+				});
+			});
+
+			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			{
+				// Clean up Identity
+				if (OnlineIdentity.IsValid())
+				{
+					if (OnlineIdentity->GetLoginStatus(0) == ELoginStatus::LoggedIn)
+					{
+						OnlineIdentity->Logout(0);
+					}
+
+					OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
+					OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+					OnlineIdentity = nullptr;
+				}
+
+				// Clean up Friends
+				if (OnlineFriends.IsValid())
+				{
+					OnlineFriends = nullptr;
+				}
+
+				// Clean up Message
+				if (OnlineMessage.IsValid())
+				{
+					OnlineMessage->ClearOnEnumerateMessagesCompleteDelegate_Handle(0, OnEnumerateMessagesCompleteDelegateHandle);
+					OnlineMessage->ClearOnSendMessageCompleteDelegate_Handle(0, OnSendMessageCompleteDelegateHandle);
+					OnlineMessage->ClearOnDeleteMessageCompleteDelegate_Handle(0, OnDeleteMessageCompleteDelegateHandle);
+					OnlineMessage = nullptr;
+				}
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlinePresence.spec.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlinePresence.spec.cpp
index 7934ff550552..6c0d298429c5 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlinePresence.spec.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/OnlinePresence.spec.cpp
@@ -49,17 +49,11 @@ void FOnlinePresenceSpec::Define()
 				// If OnlineIdentity, OnlineFriends, or OnlinePresence is not valid, the following test, including all other nested BeforeEaches, will not run
 				if (!OnlineIdentity.IsValid())
 				{
-					UE_LOG(LogOnline, Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
+					UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: Failed to load OnlineIdentity Interface for %s"), *SubsystemType.ToString());
 				}
-
-				if (!OnlineFriends.IsValid())
-				{
-					UE_LOG(LogOnline, Error, TEXT("OSS Automation: Failed to load OnlineFriends Interface for %s"), *SubsystemType.ToString());
-				}
-
 				if (!OnlinePresence.IsValid())
 				{
-					UE_LOG(LogOnline, Error, TEXT("OSS Automation: Failed to load OnlinePresence Interface for %s"), *SubsystemType.ToString());
+					UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: Failed to load OnlinePresence Interface for %s"), *SubsystemType.ToString());
 				}
 
 			});
@@ -68,294 +62,167 @@ void FOnlinePresenceSpec::Define()
 			{
 				Describe("SetPresence", [this, SubsystemType]()
 				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& BeforeEachDone)
 					{
-						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, BeforeEachDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
-							TestEqual("Verify that bLoginWasSuccessful returns as: True", bLoginWasSuccessful, true);
-							TestDone.Execute();
+							BeforeEachDone.Execute();
 						}));
 
-						OnlineIdentity->Login(0, AccountCredentials);
+						OnlineIdentity->Login(0, AccountCredentials);	
 					});
 
-					It("When calling SetPresence with a valid FUniqueNetId and a status that is different from the user's current status, this subsystem correctly changes the user's presence", EAsyncExecution::ThreadPool, [this, SubsystemType]()
-					{
-						FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
-						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+					LatentIt("When calling SetPresence with a valid FUniqueNetId and a status that is different from the user's current status, this subsystem correctly changes the user's cached presence", [this, SubsystemType](const FDoneDelegate& TestDone)
+					{											
+						TSharedPtr<const FUniqueNetId> CurrentUser = OnlineIdentity->GetUniquePlayerId(0);
 
-						if (TestAccountId.IsValid())
+						if (CurrentUser->IsValid())
 						{
-							TSharedPtr<FOnlineUserPresence> CachedPresence;
-							OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
+							FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
+							FVariantData Val1;
 
-							if (CachedPresence.IsValid())
+							Val1.SetValue(TEXT("PresenceTestString"));
+							NewPresenceStatus.StatusStr = TEXT("Testing");
+							NewPresenceStatus.Properties.Add(DefaultPlatformKey, Val1);
+
+							OnlinePresence->SetPresence(*CurrentUser, NewPresenceStatus, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, TestDone, NewPresenceStatus](const FUniqueNetId& PresLoginUserId, const bool bWasSuccessful)
 							{
-								TestEqual("Verify that Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
+								TestEqual("Verify that bWasSuccessful returns as: True", bWasSuccessful, true);
 
-								FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
-								NewPresenceStatus.State = EOnlinePresenceState::DoNotDisturb;
+								TSharedPtr<FOnlineUserPresence> PostCachedPresence;
+								OnlinePresence->GetCachedPresence(PresLoginUserId, PostCachedPresence);
 
-								OnlinePresence->SetPresence(*TestAccountId, NewPresenceStatus);
-								OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-								if (CachedPresence.IsValid())
+								if (PostCachedPresence.IsValid())
 								{
-									TestEqual("Verify that login Status.State is: DoNotDisturb", CachedPresence->Status.State, EOnlinePresenceState::DoNotDisturb);
-								}
-								else
-								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a second call to OnlinePresence->GetCachedPresence()"));
-								}
-							}
-							else
-							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
-							}
-						}
-						else
-						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
-						}
-					});
+									TestEqual("Verify that login Status.StatusStr is set to : Testing", PostCachedPresence->Status.StatusStr, TEXT("Testing"));
+									TestTrue("The number of keys in the tested presence are the same or more than the cached", NewPresenceStatus.Properties.Num() <= PostCachedPresence->Status.Properties.Num());
 
-					It("When calling SetPresence with a valid FUniqueNetId and a status that is the same as the user's current status, this subsystem does not change the user's presence", EAsyncExecution::ThreadPool, [this, SubsystemType]()
-					{
-						FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
-						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
-
-						if (TestAccountId.IsValid())
-						{
-							TSharedPtr<FOnlineUserPresence> CachedPresence;
-							OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-							
-							if (CachedPresence.IsValid())
-							{
-								TestEqual("Verify that Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
-
-								FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
-								NewPresenceStatus.State = EOnlinePresenceState::Online;
-
-								OnlinePresence->SetPresence(*TestAccountId, NewPresenceStatus);
-								OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-								if(CachedPresence.IsValid())
-								{
-									TestEqual("Verify that login Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
-								}
-								else
-								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a second call to OnlinePresence->GetCachedPresence()"));
-								}
-							}
-							else
-							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
-							}
-						}
-						else
-						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
-						}
-					});
-
-					It("When calling SetPresence with a valid FUniqueNetId but an invalid status, this subsystem does not change the user's presence", EAsyncExecution::ThreadPool, [this, SubsystemType]()
-					{
-						FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
-						TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
-
-						if (TestAccountId.IsValid())
-						{
-							TSharedPtr<FOnlineUserPresence> CachedPresence;
-							OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-							if (CachedPresence.IsValid())
-							{
-								TestEqual("Verify that Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
-
-								FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
-								NewPresenceStatus.State = (EOnlinePresenceState::Type)-1;
-
-								OnlinePresence->SetPresence(*TestAccountId, NewPresenceStatus);
-								OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-								if (CachedPresence.IsValid())
-								{
-									TestEqual("Verify that login Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
-								}
-								else
-								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a second call to OnlinePresence->GetCachedPresence()"));
-								}
-							}
-							else
-							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
-							}
-						}
-						else
-						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
-						}
-					});
-
-					// TODO: What should happen with an invalid UserId?
-					It("When calling SetPresence with a valid status that is different from the user's current status but an invalid FUniqueNetId, this subsystem does not attempt to change any status", EAsyncExecution::ThreadPool, [this, SubsystemType]()
-					{
-						FString InvalidUserIdString = TEXT(" ");
-						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
-
-						FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
-						NewPresenceStatus.State = EOnlinePresenceState::DoNotDisturb;
-
-						TSharedPtr<FOnlineUserPresence> CachedPresence;
-						OnlinePresence->SetPresence(*InvalidUserId, NewPresenceStatus);
-						OnlinePresence->GetCachedPresence(*InvalidUserId, CachedPresence);
-
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to determine expected results with invalid UserId"));
-					});
-
-					LatentIt("When calling SetPresence with a status that is different from the user's current status but a valid FUniqueNetId who is logged out, this subsystem does not attempt to change any status", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate TestDone)
-					{
-						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
-						{
-							FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
-							TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
-
-							if (TestAccountId.IsValid())
-							{
-								TSharedPtr<FOnlineUserPresence> CachedPresence;
-								OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-								if (CachedPresence.IsValid())
-								{
-									TestEqual("Verify that Status.State is: Offline", CachedPresence->Status.State, EOnlinePresenceState::Offline);
-
-									FOnlineUserPresenceStatus NewPresenceStatus = FOnlineUserPresenceStatus();
-									NewPresenceStatus.State = EOnlinePresenceState::Online;
-
-									OnlinePresence->SetPresence(*TestAccountId, NewPresenceStatus);
-									OnlinePresence->GetCachedPresence(*TestAccountId, CachedPresence);
-
-									if (CachedPresence.IsValid())
+									FString TestValue;
+									for (FPresenceProperties::TConstIterator Itr(NewPresenceStatus.Properties); Itr; ++Itr)
 									{
-										TestEqual("Verify that login Status.State is: Offline", CachedPresence->Status.State, EOnlinePresenceState::Offline);
-										TestDone.Execute();
-									}
-									else
-									{
-										UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a second call to OnlinePresence->GetCachedPresence()"));
-										TestDone.Execute();
+										const FString& Key = Itr.Key();
+										const FString& Value = Itr.Value().ToString();
+
+										if (PostCachedPresence->Status.Properties.Find(Key) == nullptr)
+										{
+											UE_LOG_ONLINE_PRESENCE(Error, TEXT("Presence test fails, missing key %s"), *Key);
+											TestDone.Execute();
+										}
+
+										PostCachedPresence->Status.Properties.Find(Key)->GetValue(TestValue);
+										if (Value != TestValue)
+										{
+											UE_LOG_ONLINE_PRESENCE(Error, TEXT("Presence test fails, key %s has different values. Cached=%s Has=%s"), *Key, *Value, *TestValue);
+											TestDone.Execute();
+										}
 									}
 								}
 								else
 								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
-									TestDone.Execute();
+									UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: IsValid() check on PostCachedPresence failed after a call to OnlinePresence->GetCachedPresence()"))
 								}
-							}
-							else
-							{
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+					
 								TestDone.Execute();
-							}
+							}));
+						}
+						else
+						{
+							UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: IsValid() check on CurrentUser failed on OnlinePresence->GetUniquePlayerId()"));
+						}
+					});
+
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
 						}));
 
 						OnlineIdentity->Logout(0);
 					});
 				});
 
-				// TODO: Is it possible to set presence without updating the cache?
 				Describe("QueryPresence", [this, SubsystemType]()
 				{
-					LatentIt("When calling QueryPresence with a valid FUniqueNetId, this subsystem will update the cached presence status of that user", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& BeforeEachDone)
 					{
-						FString FriendAccountIdString = FOnlineTestCommon::GetSubsystemFriendAccountUniqueId(SubsystemType);
-						TSharedPtr<const FUniqueNetId> FriendAccountId = OnlineIdentity->CreateUniquePlayerId(FriendAccountIdString);
-
-						if (FriendAccountId.IsValid())
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, BeforeEachDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
 						{
-							OnlinePresence->QueryPresence(*FriendAccountId, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, FriendAccountIdString, TestDone](const FUniqueNetId& QueryPresenceUniqueId, bool bQueryPresenceWasSuccessful)
-							{
-								TestEqual("Verify that bQueryPresenceSuccess returns as: True", bQueryPresenceWasSuccessful, true);
-								TestEqual("Verify that QueryPresenceUniqueId is the Id that was originally used", QueryPresenceUniqueId.ToString() == FriendAccountIdString, true);
-								UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to have friend change presence without test account updating cache."));
-								TestDone.Execute();
-							}));
-						}
-						else
-						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
-							TestDone.Execute();
-						}
-					});
-
-					LatentIt("When calling QueryPresence with an invalid FUniqueNetId, this subsystem will not query status", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
-					{
-						FString InvalidUserIdString = TEXT(" ");
-						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
-
-						if (InvalidUserId.IsValid())
-						{
-							OnlinePresence->QueryPresence(*InvalidUserId, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, InvalidUserId, TestDone](const FUniqueNetId& QueryPresenceUniqueId, bool bQueryPresenceWasSuccessful)
-							{
-								TestEqual("Verify that bQueryPresenceSuccess returns as: False", bQueryPresenceWasSuccessful, false);
-								TestEqual("Verify that QueryPresenceUniqueId is the Id that was originally used", QueryPresenceUniqueId.ToString() == InvalidUserId->ToString(), true);
-								TestDone.Execute();
-							}));
-						}
-						else
-						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
-							TestDone.Execute();
-						}
-					});
-				});
-
-				// TODO: Is it possible to set presence without updating the cache?
-				Describe("GetCachedPresence", [this, SubsystemType]() 
-				{
-					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
-					{
-						CommonUtils.AddFriendToTestAccount(OnlineIdentity, OnlineFriends, SubsystemType, TestDone);
-					});
-
-					LatentIt("When calling GetCachedPresence with a valid FUniqueNetId after polling for the user's presence data, this subsystem will return that user's presence", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
-					{
-						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
-						{
-							FString FriendIdString = CommonUtils.GetSubsystemFriendAccountUniqueId(SubsystemType);
-							TSharedPtr<const FUniqueNetId> FriendId = OnlineIdentity->CreateUniquePlayerId(FriendIdString);
-
-							OnlinePresence->QueryPresence(*FriendId, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, FriendId, TestDone](const FUniqueNetId& QueryPresenceUniqueId, bool bQueryPresenceWasSuccessful)
-							{
-								TSharedPtr<FOnlineUserPresence> CachedPresence;
-								OnlinePresence->GetCachedPresence(*FriendId, CachedPresence);
-
-								if (CachedPresence.IsValid())
-								{
-									TestEqual("Verify that Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
-
-									TestDone.Execute();
-								}
-								else
-								{
-									UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
-									TestDone.Execute();
-								}
-							}));
+							BeforeEachDone.Execute();
 						}));
 
 						OnlineIdentity->Login(0, AccountCredentials);
 					});
 
-					LatentIt("When calling GetCachedPresence with a valid FUniqueNetId without polling for the user's presence data, this subsystem will not return that user's presence", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentIt("When calling QueryPresence with a valid FUniqueNetId, this subsystem will get the cached presence status of that user", [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete. Need to figure out how to get cached presence without auto calling the query due to logging in."));
-						TestDone.Execute();
+						TSharedPtr<const FUniqueNetId> CurrentUser = OnlineIdentity->GetUniquePlayerId(0);
+
+						if (CurrentUser.IsValid())
+						{
+							OnlinePresence->QueryPresence(*CurrentUser, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, CurrentUser, TestDone](const FUniqueNetId& QueryPresenceUniqueId, bool bQueryPresenceWasSuccessful)
+							{
+								TestEqual("Verify that bQueryPresenceSuccess returns as: True", bQueryPresenceWasSuccessful, true);
+								TestEqual("Verify that QueryPresenceUniqueId is the Id that was originally used", QueryPresenceUniqueId.ToString() == *CurrentUser->ToString(), true);
+								TestDone.Execute();
+							}));
+						}
+						else
+						{
+							UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: IsValid() check on CurrentUser failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+							TestDone.Execute();
+						}
 					});
 
-					LatentIt("When calling GetCachedPresence with an invalid FUniqueNetId, this subsystem will not return a presence status", EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
+					});
+				});
+				
+				Describe("GetCachedPresence", [this, SubsystemType]() 
+				{
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& BeforeEachDone)
+					{
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, BeforeEachDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							BeforeEachDone.Execute();
+						}));
+
+						OnlineIdentity->Login(0, AccountCredentials);
+					});
+
+					LatentIt("When calling GetCachedPresence with a valid FUniqueNetId after polling for the local user's presence data, this subsystem will return that user's presence", [this, SubsystemType](const FDoneDelegate& TestDone)
+					{
+						TSharedPtr<const FUniqueNetId> CurrentUser = OnlineIdentity->GetUniquePlayerId(0);
+
+						OnlinePresence->QueryPresence(*CurrentUser, IOnlinePresence::FOnPresenceTaskCompleteDelegate::CreateLambda([this, CurrentUser, TestDone](const FUniqueNetId& QueryPresenceUniqueId, bool bQueryPresenceWasSuccessful)
+						{
+							TestEqual("Verify that bQueryPresenceSuccess returns as: True", bQueryPresenceWasSuccessful, true);
+
+							TSharedPtr<FOnlineUserPresence> CachedPresence;
+							OnlinePresence->GetCachedPresence(*CurrentUser, CachedPresence);
+
+							if (CachedPresence.IsValid())
+							{
+								TestEqual("Verify that Status.State is: Online", CachedPresence->Status.State, EOnlinePresenceState::Online);
+								TestDone.Execute();
+							}
+							else
+							{
+								UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: IsValid() check on CachedPresence failed after a call to OnlinePresence->GetCachedPresence()"));
+								TestDone.Execute();
+							}
+						}));
+
+					});
+
+					LatentIt("When calling GetCachedPresence with an invalid FUniqueNetId, this subsystem will not return a presence status", [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
 						FString InvalidUserIdString = TEXT(" ");
 						TSharedPtr<const FUniqueNetId> InvalidUserId = OnlineIdentity->CreateUniquePlayerId(InvalidUserIdString);
@@ -371,55 +238,57 @@ void FOnlinePresenceSpec::Define()
 						}
 						else
 						{
-							UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+							UE_LOG_ONLINE_PRESENCE(Error, TEXT("OSS Automation: IsValid() check on InvalidUserId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 							TestDone.Execute();
 						}
 					});
 
-					LatentAfterEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& TestDone)
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
 					{
-						OnlineIdentity->ClearOnLoginCompleteDelegate_Handle(0, OnLoginCompleteDelegateHandle);
-						OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
-						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, SubsystemType, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
 						{
-							CommonUtils.RemoveFriendFromTestAccount(OnlineIdentity, OnlineFriends, SubsystemType, TestDone);
-							OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+							AfterEachDone.Execute();
 						}));
 
 						OnlineIdentity->Logout(0);
 					});
 				});
 
-				//TODO: Need to get the local userId and the online Id of the person whos presence you want to look up, and App Id
 				Describe("GetCachedPresenceForApp", [this, SubsystemType]()
 				{
-					It("When calling GetCachedPresenceForApp with a valid local user, a valid FUniqueNetId, and a valid AppId, this subsystem returns that user's presence for that app", EAsyncExecution::ThreadPool, [this]()
+					LatentBeforeEach(EAsyncExecution::ThreadPool, [this, SubsystemType](const FDoneDelegate& BeforeEachDone)
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete."));
-						//OnlinePresence->GetCachedPresenceForApp();
-					});
+						OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, BeforeEachDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+						{
+							BeforeEachDone.Execute();
+						}));
 
-					It("When calling GetCachedPresenceForApp with a valid local user and a valid FUniqueNetId but an invalid AppId, this subsystem does not return that user's presence", EAsyncExecution::ThreadPool, [this]()
-					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete."));
-						//OnlinePresence->GetCachedPresenceForApp();
+						OnlineIdentity->Login(0, AccountCredentials);
 					});
-
-					It("When calling GetCachedPresenceForApp with a valid local user and a valid AppId but an invalid FUniqueNetId, this subsystem does not return that user's presence for that app", EAsyncExecution::ThreadPool, [this]()
+					LatentIt("When calling GetCachedPresenceForApp with an valid FUniqueNetId, this subsystem will return a presence status of EOnlineCachedResult::Type::NotFound", [this, SubsystemType](const FDoneDelegate& TestDone)
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete."));
-						//OnlinePresence->GetCachedPresenceForApp();
+						TSharedPtr<const FUniqueNetId> CurrentUser = OnlineIdentity->GetUniquePlayerId(0);
+						const FString& TestAppId = TEXT("TestAppId");
+						TSharedPtr<FOnlineUserPresence> OutPresence;
+
+						EOnlineCachedResult::Type Result = OnlinePresence->GetCachedPresenceForApp(*CurrentUser, *CurrentUser, TestAppId, OutPresence);
+						TestEqual("Verify GetCachedPresenceForApp returns EOnlineCachedResult::NotFound", Result, EOnlineCachedResult::NotFound);
+						TestEqual("Verify that OutPresence is null", OutPresence.IsValid(), false);
+						TestDone.Execute();
 					});
-
-					It("When calling GetCachedPresenceForApp with a valid FUniqueNetId and a valid AppId but an invalid local user (-1), this subsystem does not return a presence for that app", EAsyncExecution::ThreadPool, [this]()
+					LatentAfterEach([this](const FDoneDelegate& AfterEachDone)
 					{
-						UE_LOG(LogOnline, Error, TEXT("OSS Automation: Test implementation not yet complete."));
-						//OnlinePresence->GetCachedPresenceForApp();
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, AfterEachDone](int32 LogoutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							AfterEachDone.Execute();
+						}));
+
+						OnlineIdentity->Logout(0);
 					});
 				});
 			});
 
-			AfterEach(EAsyncExecution::ThreadPool, [this]()
+			AfterEach([this]()
 			{
 				// Clean up Identity
 				if (OnlineIdentity.IsValid())
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineErrors.data.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineErrors.data.h
index eb1eaf822d4c..115eac5b9f92 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineErrors.data.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineErrors.data.h
@@ -45,4 +45,12 @@
 
 #ifndef ONLINE_EXPECTEDERROR_INVALID_USERID
 #define ONLINE_EXPECTEDERROR_INVALID_USERID TEXT("errors.com.epicgames.users.invalid_userid")
+#endif
+
+#ifndef ONLINE_EXPECTEDERROR_NONLOCALPLAYER
+#define ONLINE_EXPECTEDERROR_NONLOCALPLAYER TEXT("errors.com.epicgames.users.non_local_player")
+#endif
+
+#ifndef ONLINE_EXPECTEDERROR_INVALID_ACHIEVEMENT
+#define ONLINE_EXPECTEDERROR_INVALID_ACHIEVEMENT TEXT("errors.com.epicgames.achievements.invalid_achievement")
 #endif
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.cpp b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.cpp
index bd9ae96b38ca..316ee2b0b73f 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.cpp
@@ -26,6 +26,17 @@ void FOnlineTestCommon::Cleanup()
 		OnlineFriends = nullptr;
 	}
 
+	if (OnlineMessage.IsValid())
+	{
+		OnlineMessage->ClearOnSendMessageCompleteDelegate_Handle(0, OnSendMessageCompleteDelegateHandle);
+		OnlineMessage = nullptr;
+	}
+
+	if (OnlineAchievements.IsValid())
+	{
+		OnlineAchievements = nullptr;
+	}
+
 	SubsystemType = TEXT("");
 
 	AccountCredentials = FOnlineAccountCredentials(TEXT(""), TEXT(""), TEXT(""));
@@ -358,7 +369,7 @@ void FOnlineTestCommon::BlockFriendOnTestAccount(IOnlineIdentityPtr OI, IOnlineF
 									}
 									else
 									{
-										UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+										UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 										TestDone.Execute();
 									}
 								}));
@@ -446,10 +457,131 @@ void FOnlineTestCommon::UnblockFriendOnTestAccount(IOnlineIdentityPtr OI, IOnlin
 		}
 		else
 		{
-			UE_LOG(LogOnline, Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+			UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on FriendAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
 			TestDone.Execute();
 		}
 	}));
 
+	OnlineIdentity->Login(0, AccountCredentials);
+}
+
+void FOnlineTestCommon::SendMessageToTestAccount(IOnlineIdentityPtr OI, IOnlineFriendsPtr OF, IOnlineMessagePtr OM, FName ST, const FDoneDelegate& TestDone)
+{
+	OnlineIdentity = OI;
+	OnlineMessage = OM;
+	SubsystemType = ST;
+
+	AccountCredentials = FOnlineTestCommon::GetSubsystemTestAccountCredentials(SubsystemType);
+	FOnlineAccountCredentials FriendAccountCredentials = FOnlineTestCommon::GetSubsystemFriendAccountCredentials(SubsystemType);
+
+	OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalPlayerNumTestAccount, bool bLoginWasSuccessfulTestAccount, const FUniqueNetId& LoginUserIdTestAccount, const FString& LoginErrorTestAccount)
+	{
+		FString TestAccountIdString = FOnlineTestCommon::GetSubsystemTestAccountUniqueId(SubsystemType);
+		TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->CreateUniquePlayerId(TestAccountIdString);
+
+		TArray<TSharedRef<const FUniqueNetId>> Recipients;
+		Recipients.Add(TestAccountId.ToSharedRef());
+
+		FOnlineMessagePayload TestPayload;
+		TArray<uint8> TestData;
+		TestData.Add(0xde);
+
+		TestPayload.SetAttribute(TEXT("STRINGValue"), FVariantData(TestData));
+
+		OnSendMessageCompleteDelegateHandle = OnlineMessage->AddOnSendMessageCompleteDelegate_Handle(0, FOnSendMessageCompleteDelegate::CreateLambda([this, TestDone](int32 SendMessageLocalUserNum, bool bSendMessageWasSuccessful, const FString& SendMessagePayload)
+		{
+			OnlineIdentity->ClearOnLogoutCompleteDelegate_Handle(0, OnLogoutCompleteDelegateHandle);
+			OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+			{
+				TestDone.Execute();
+				Cleanup();
+			}));
+
+			OnlineIdentity->Logout(0);
+		}));
+
+		OnlineMessage->SendMessage(0, Recipients, TEXT("TEST"), TestPayload);
+	}));
+
+	OnlineIdentity->Login(0, FriendAccountCredentials);
+}
+
+void FOnlineTestCommon::AddAchievementToTestAccount(IOnlineIdentityPtr OI, IOnlineAchievementsPtr OA, const FDoneDelegate& TestDone)
+{
+	OnlineIdentity = OI;
+	OnlineAchievements = OA;
+
+	OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+	{
+		TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+		if (TestAccountId.IsValid())
+		{
+			OnlineAchievements->QueryAchievements(*TestAccountId, FOnQueryAchievementsCompleteDelegate::CreateLambda([this, TestAccountId, TestDone](const FUniqueNetId& QueryAchievementsPlayerId, const bool bQueryAchievementsWasSuccessful)
+			{
+				TArray<FOnlineAchievement> PlayerAchievements;
+				OnlineAchievements->GetCachedAchievements(QueryAchievementsPlayerId, PlayerAchievements);
+
+				if (PlayerAchievements.Num() > 0)
+				{
+					FString TestAchievement = PlayerAchievements[0].Id;
+
+					FOnlineAchievement SomeAchievement;
+					OnlineAchievements->GetCachedAchievement(*TestAccountId, TestAchievement, SomeAchievement);
+
+					FOnlineAchievementsWritePtr AchievementWriteObject = MakeShareable(new FOnlineAchievementsWrite());
+					FOnlineAchievementsWriteRef AchievementWriter = AchievementWriteObject.ToSharedRef();
+					AchievementWriteObject->SetFloatStat(FName(*TestAchievement), 1.0f);
+
+					OnlineAchievements->WriteAchievements(*TestAccountId, AchievementWriter, FOnAchievementsWrittenDelegate::CreateLambda([this, AchievementWriteObject, TestAccountId, TestAchievement, TestDone](const FUniqueNetId& WriteAchievements, bool bWriteAchievementsWasSuccessful)
+					{
+						OnLogoutCompleteDelegateHandle = OnlineIdentity->AddOnLogoutCompleteDelegate_Handle(0, FOnLogoutCompleteDelegate::CreateLambda([this, TestDone](int32 LoggedOutLocalUserNum, bool bLogoutWasSuccessful)
+						{
+							TestDone.Execute();
+							Cleanup();
+						}));
+
+						OnlineIdentity->Logout(0);
+					}));
+				}
+				else
+				{
+					UE_LOG_ONLINE(Error, TEXT("OSS Automation: PlayerAchievements array is empty after a call to GetCachedAchievements. No Achievements found for this subsystem."));
+				}
+			}));
+		}
+		else
+		{
+			UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->GetUniquePlayerId()"));
+		}
+	}));
+
+	OnlineIdentity->Login(0, AccountCredentials);
+}
+
+void FOnlineTestCommon::ResetTestAccountAchievements(IOnlineIdentityPtr OI, IOnlineAchievementsPtr OA, const FDoneDelegate& TestDone)
+{
+	OnlineIdentity = OI;
+	OnlineAchievements = OA;
+
+	OnLoginCompleteDelegateHandle = OnlineIdentity->AddOnLoginCompleteDelegate_Handle(0, FOnLoginCompleteDelegate::CreateLambda([this, TestDone](int32 LoginLocalUserNum, bool bLoginWasSuccessful, const FUniqueNetId& LoginUserId, const FString& LoginError)
+	{
+		TSharedPtr<const FUniqueNetId> TestAccountId = OnlineIdentity->GetUniquePlayerId(0);
+
+		if (TestAccountId.IsValid())
+		{
+#if !UE_BUILD_SHIPPING
+			OnlineAchievements->ResetAchievements(*TestAccountId);
+#endif //!UE_BUILD_SHIPPING
+		}
+		else
+		{
+			UE_LOG_ONLINE(Error, TEXT("OSS Automation: IsValid() check on TestAccountId failed after a call to OnlineIdentity->CreateUniquePlayerId()"));
+		}
+
+		TestDone.Execute();
+		Cleanup();
+	}));
+
 	OnlineIdentity->Login(0, AccountCredentials);
 }
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.h b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.h
index 22d808865269..e2df5f0ad707 100644
--- a/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystem/Source/Test/Utils/OnlineTestCommon.h
@@ -158,6 +158,12 @@ public:
 
 	void UnblockFriendOnTestAccount(IOnlineIdentityPtr OI, IOnlineFriendsPtr OF, FName ST, const FDoneDelegate& TestDone);
 
+	void SendMessageToTestAccount(IOnlineIdentityPtr OI, IOnlineFriendsPtr OF, IOnlineMessagePtr OM, FName ST, const FDoneDelegate& TestDone);
+
+	void AddAchievementToTestAccount(IOnlineIdentityPtr OI, IOnlineAchievementsPtr OA, const FDoneDelegate& TestDone);
+
+	void ResetTestAccountAchievements(IOnlineIdentityPtr OI, IOnlineAchievementsPtr OA, const FDoneDelegate& TestDone);
+
 public:
 
 	FName SubsystemType;
@@ -166,6 +172,8 @@ public:
 
 	IOnlineIdentityPtr OnlineIdentity;
 	IOnlineFriendsPtr OnlineFriends;
+	IOnlineMessagePtr OnlineMessage;
+	IOnlineAchievementsPtr OnlineAchievements;
 
 	FDelegateHandle OnLogoutCompleteDelegateHandle;
 	FDelegateHandle	OnLoginCompleteDelegateHandle;
@@ -174,4 +182,5 @@ public:
 	FDelegateHandle OnRejectInviteCompleteDelegateHandle;
 	FDelegateHandle OnBlockedPlayerCompleteDelegateHandle;
 	FDelegateHandle OnUnblockedPlayerCompleteDelegateHandle;
-};
+	FDelegateHandle OnSendMessageCompleteDelegateHandle;
+};
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.cpp b/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.cpp
index 395e9a2e33cd..d632860dd229 100644
--- a/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.cpp
@@ -119,14 +119,14 @@ void FOnlineIdentityAmazon::TickLogin(float DeltaTime)
 				}
 				else
 				{
-					TriggerOnLoginCompleteDelegates(LocalUserNumPendingLogin, false, FUniqueNetIdString(TEXT("")), FString(TEXT("RegisterUser() failed to parse the user registration results")));
+					TriggerOnLoginCompleteDelegates(LocalUserNumPendingLogin, false, FUniqueNetIdAmazon(TEXT("")), FString(TEXT("RegisterUser() failed to parse the user registration results")));
 				}
 			}
 			// Trigger the delegate if we hit the timeout limit
 			else if (TotalCheckElapsedTime > MaxCheckElapsedTime)
 			{
 				bHasLoginOutstanding = false;
-				TriggerOnLoginCompleteDelegates(LocalUserNumPendingLogin, false, FUniqueNetIdString(TEXT("")), FString(TEXT("RegisterUser() timed out without getting the data")));
+				TriggerOnLoginCompleteDelegates(LocalUserNumPendingLogin, false, FUniqueNetIdAmazon(TEXT("")), FString(TEXT("RegisterUser() timed out without getting the data")));
 			}
 		}
 		// Reset our time trackers if we are done ticking for now
@@ -247,7 +247,7 @@ bool FOnlineIdentityAmazon::Login(int32 LocalUserNum, const FOnlineAccountCreden
 	}
 	if (!bWasSuccessful)
 	{
-		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdString(TEXT("")), FString(TEXT("RegisterUser() failed")));
+		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdAmazon(TEXT("")), FString(TEXT("RegisterUser() failed")));
 	}
 	return bWasSuccessful;
 }
@@ -257,14 +257,14 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityAmazon::CreateUniquePlayerId(uint8
 	if (Bytes != NULL && Size > 0)
 	{
 		FString StrId(Size, (TCHAR*)Bytes);
-		return MakeShareable(new FUniqueNetIdString(StrId));
+		return MakeShareable(new FUniqueNetIdAmazon(StrId));
 	}
 	return NULL;
 }
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityAmazon::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdAmazon(Str));
 }
 
 // All of the methods below here fail because they aren't supported
diff --git a/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.h b/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.h
index 050fd973cf85..43ad000e3b45 100644
--- a/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemAmazon/Source/Private/OnlineIdentityAmazon.h
@@ -11,6 +11,9 @@
 
 class FOnlineSubsystemAmazon;
 
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdAmazon, AMAZON_SUBSYSTEM);
+
 /**
  * Info associated with an user account generated by this online service
  */
@@ -36,7 +39,7 @@ public:
 	// FUserOnlineAccountAmazon
 
 	FUserOnlineAccountAmazon(const FString& InUserId=TEXT(""), const FString& InSecretKey=TEXT(""), const FString& InAuthTicket=TEXT("")) 
-		: UserIdPtr(new FUniqueNetIdString(InUserId))
+		: UserIdPtr(new FUniqueNetIdAmazon(InUserId))
 		, UserId(InUserId)
 		, SecretKey(InSecretKey)
 		, AuthTicket(InAuthTicket)
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook.Build.cs b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook.Build.cs
index 91c6fff40325..91e71608af88 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook.Build.cs
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook.Build.cs
@@ -91,8 +91,18 @@ public class OnlineSubsystemFacebook : ModuleRules
 			PublicDefinitions.Add("WITH_FACEBOOK=1");
 			bUsesRestfulImpl = true;
 		}
-		else
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
 		{
+			PublicDefinitions.Add("WITH_FACEBOOK=1");
+			bUsesRestfulImpl = true;
+		}
+        else if (Target.Platform == UnrealTargetPlatform.Switch)
+        {
+            PublicDefinitions.Add("WITH_FACEBOOK=1");
+            bUsesRestfulImpl = true;
+        }
+        else
+        {
 			PublicDefinitions.Add("WITH_FACEBOOK=0");
 			PrecompileForTargets = PrecompileTargetsType.None;
 		}
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook_UPL.xml b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook_UPL.xml
index 4e18a302667b..43d0c7760b17 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook_UPL.xml
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/OnlineSubsystemFacebook_UPL.xml
@@ -34,6 +34,12 @@
 		</if>
 	</prebuildCopies>
 	
+	<!-- Facebook requires at least android-26 SDK platform for resources -->
+	<minimumSDKAPI>
+		<insertValue value="26"/>
+		<insertNewline/>
+	</minimumSDKAPI>
+	
 	<!-- AAR dependencies -->
 	<AARImports>
 		<if condition="bEnabled">
@@ -53,7 +59,7 @@
 	<buildGradleAdditions>
 		<insert>
 dependencies {
-	compile('com.facebook.android:facebook-android-sdk:4.19.0')
+	implementation('com.facebook.android:facebook-android-sdk:4.32.0')
 }
 		</insert>
 	</buildGradleAdditions>
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Android/OnlineIdentityFacebook.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Android/OnlineIdentityFacebook.cpp
index fc82b09b234f..bbba2c0d9bb6 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Android/OnlineIdentityFacebook.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Android/OnlineIdentityFacebook.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "OnlineIdentityFacebook.h"
+#include "Interfaces/OnlineExternalUIInterface.h"
 #include "OnlineSubsystemFacebookPrivate.h"
 
 #if WITH_FACEBOOK
@@ -48,7 +49,7 @@ bool FOnlineIdentityFacebook::Login(int32 LocalUserNum, const FOnlineAccountCred
 					FString ErrorStr;
 					if (InResponseCode == EFacebookLoginResponse::RESPONSE_CANCELED)
 					{
-						ErrorStr = FB_AUTH_CANCELED;
+						ErrorStr = LOGIN_CANCELLED;
 					}
 					else
 					{
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.cpp
index 582a42c84134..bc118c64d4fb 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.cpp
@@ -4,6 +4,7 @@
 #include "OnlineIdentityFacebook.h"
 #include "OnlineSubsystemFacebookPrivate.h"
 #include "Interfaces/OnlineSharingInterface.h"
+#include "Interfaces/OnlineExternalUIInterface.h"
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
@@ -25,7 +26,7 @@ void FUserOnlineAccountFacebook::Parse(const FBSDKAccessToken* AccessToken)
 	if (UserIdPtr->ToString().IsEmpty() ||
 		UserIdPtr->ToString() != UserIdStr)
 	{
-		UserIdPtr = MakeShared<const FUniqueNetIdString>(UserIdStr);
+		UserIdPtr = MakeShared<const FUniqueNetIdFacebook>(UserIdStr);
 	}
 
 	const FString Token(AccessToken.tokenString);
@@ -40,7 +41,7 @@ void FUserOnlineAccountFacebook::Parse(const FBSDKProfile* NewProfile)
 	if (UserIdPtr->ToString().IsEmpty() ||
 		UserIdPtr->ToString() == NewProfileUserId)
 	{
-		UserIdPtr = MakeShared<const FUniqueNetIdString>(NewProfileUserId);
+		UserIdPtr = MakeShared<const FUniqueNetIdFacebook>(NewProfileUserId);
 
 		RealName = FString(NewProfile.name);
 
@@ -166,7 +167,7 @@ bool FOnlineIdentityFacebook::Login(int32 LocalUserNum, const FOnlineAccountCred
 						}
 						else if(result.isCancelled)
 						{
-							ErrorStr = FB_AUTH_CANCELED;
+							ErrorStr = LOGIN_CANCELLED;
 							UE_LOG(LogOnline, Display, TEXT("[FBSDKLoginManager logInWithReadPermissions = cancelled"));
 						}						
 						else
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.h
index 26f9a8f8a865..2acdd52249a1 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineIdentityFacebook.h
@@ -100,7 +100,7 @@ private:
 	 * Delegate called when current permission request completes
 	 *
 	 * @param LocalUserNum user that made the request
-	 * @param bWasSuccesful was the request successful
+	 * @param bWasSuccessful was the request successful
 	 * @param NewPermissions array of all known permissions
 	 */
 	void OnRequestCurrentPermissionsComplete(int32 LocalUserNum, bool bWasSuccessful, const TArray<FSharingPermission>& NewPermissions);
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineSubsystemFacebook.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineSubsystemFacebook.cpp
index bd88041837fa..77a116d61486 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineSubsystemFacebook.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/IOS/OnlineSubsystemFacebook.cpp
@@ -9,12 +9,15 @@
 #include "OnlineUserFacebook.h"
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
+#import <FBSDKCoreKit/FBSDKSettings.h>
 
 #include "Misc/CoreDelegates.h"
 #include "IOS/IOSAppDelegate.h"
 #include "Misc/CommandLine.h"
 #include "Misc/ConfigCacheIni.h"
 
+#define FACEBOOK_DEBUG_ENABLED 0
+
 FOnlineSubsystemFacebook::FOnlineSubsystemFacebook()
 {
 }
@@ -54,6 +57,47 @@ static void OnFacebookAppDidBecomeActive()
 	});
 }
 
+/** Add verbose logging for various Facebook SDK features */
+void SetFBLoggingBehavior()
+{
+#if FACEBOOK_DEBUG_ENABLED
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorAccessTokens];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorPerformanceCharacteristics];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorAppEvents];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorInformational];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorCacheErrors];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorUIControlErrors];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorGraphAPIDebugWarning];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorGraphAPIDebugInfo];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorNetworkRequests];
+	[FBSDKSettings enableLoggingBehavior:FBSDKLoggingBehaviorDeveloperErrors];
+#endif
+}
+
+/** Print various details about the Facebook SDK */
+void PrintSDKStatus()
+{
+	NSString* AppId = [FBSDKSettings appID];
+	NSString* SDKVersion = [FBSDKSettings sdkVersion];
+	NSString* GraphVer = [FBSDKSettings graphAPIVersion];
+	NSString* OverrideAppId = [FBSDKAppEvents loggingOverrideAppID];
+	NSSet* LoggingBehaviors = [FBSDKSettings loggingBehavior];
+
+	UE_LOG_ONLINE(Verbose, TEXT("Facebook SDK:%s"), *FString(SDKVersion));
+	UE_LOG_ONLINE(Verbose, TEXT("AppId:%s"), *FString(AppId));
+	UE_LOG_ONLINE(Verbose, TEXT("OverridAppId:%s"), *FString(OverrideAppId));
+	UE_LOG_ONLINE(Verbose, TEXT("GraphVer:%s"), *FString(GraphVer));
+
+	if (LoggingBehaviors != nil && [LoggingBehaviors count] > 0)
+	{
+		UE_LOG_ONLINE(Verbose, TEXT("Logging:"));
+		for (NSString* loggingBehavior in LoggingBehaviors)
+		{
+			UE_LOG_ONLINE(Verbose, TEXT(" - %s"), *FString(loggingBehavior));
+		}
+	}
+}
+
 bool FOnlineSubsystemFacebook::Init()
 {
 	bool bSuccessfullyStartedUp = false;
@@ -70,14 +114,27 @@ bool FOnlineSubsystemFacebook::Init()
 		FacebookSharing = MakeShareable(new FOnlineSharingFacebook(this));
 		FacebookFriends = MakeShareable(new FOnlineFriendsFacebook(this));
 		FacebookUser = MakeShareable(new FOnlineUserFacebook(this));
-		
+
+		FString AnalyticsId;
+		GConfig->GetString(TEXT("OnlineSubsystemFacebook"), TEXT("AnalyticsId"), AnalyticsId, GEngineIni);
+
+		NSString* APIVerStr = [NSString stringWithFString:GetAPIVer()];
+		[FBSDKSettings setGraphAPIVersion:APIVerStr];
+		SetFBLoggingBehavior();
+
 		// Trigger Facebook SDK last now that everything is setup
 		dispatch_async(dispatch_get_main_queue(), ^
 		{
 			UIApplication* sharedApp = [UIApplication sharedApplication];
 			NSDictionary* launchDict = [IOSAppDelegate GetDelegate].launchOptions;
+			if (!AnalyticsId.IsEmpty())
+			{
+				NSString* AnalyticsStr = [NSString stringWithFString:AnalyticsId];
+				[FBSDKAppEvents setLoggingOverrideAppID:AnalyticsStr];
+			}
 			[FBSDKAppEvents activateApp];
-			[[FBSDKApplicationDelegate sharedInstance] application:sharedApp didFinishLaunchingWithOptions : launchDict];
+			[[FBSDKApplicationDelegate sharedInstance] application:sharedApp didFinishLaunchingWithOptions: launchDict];
+			PrintSDKStatus();
 		});
 
 		bSuccessfullyStartedUp = FacebookIdentity.IsValid() && FacebookSharing.IsValid() && FacebookFriends.IsValid() && FacebookUser.IsValid();
@@ -85,7 +142,7 @@ bool FOnlineSubsystemFacebook::Init()
 	return bSuccessfullyStartedUp;
 }
 
-bool FOnlineSubsystemFacebook::Shutdown() 
+bool FOnlineSubsystemFacebook::Shutdown()
 {
 	bool bSuccessfullyShutdown = true;
 	StaticCastSharedPtr<FOnlineIdentityFacebook>(FacebookIdentity)->Shutdown();
@@ -109,3 +166,4 @@ bool FOnlineSubsystemFacebook::IsEnabled() const
 
 	return bEnableFacebookSupport;
 }
+
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.cpp
index 51bfc7857e9a..d954b31e04b5 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.cpp
@@ -14,7 +14,7 @@ bool FUserOnlineAccountFacebookCommon::Parse(const FString& InAuthTicket, const
 			{
 				if (!UserId.IsEmpty())
 				{
-					UserIdPtr = MakeShared<FUniqueNetIdString>(UserId);
+					UserIdPtr = MakeShared<FUniqueNetIdFacebook>(UserId);
 
 					// update the access token
 					AuthTicket = InAuthTicket;
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.h
index 154ddf8b94d7..d786be28d76c 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineAccountFacebookCommon.h
@@ -39,7 +39,7 @@ public:
 	// FUserOnlineAccountFacebookCommon
 
 	explicit FUserOnlineAccountFacebookCommon(const FString& InUserId = FString(), const FString& InAuthTicket = FString())
-		: UserIdPtr(new FUniqueNetIdString(InUserId))
+		: UserIdPtr(new FUniqueNetIdFacebook(InUserId))
 		, UserId(InUserId)
 		, AuthTicket(InAuthTicket)
 	{
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.cpp
index edd67efc7373..f7b9b4809703 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.cpp
@@ -9,7 +9,7 @@ bool FOnlineExternalUIFacebookCommon::ShowLoginUI(const int ControllerIndex, boo
 
 	FacebookSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
 	{
-		Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+		Delegate.ExecuteIfBound(nullptr, ControllerIndex, FOnlineError(false));
 	});
 
 	return bStarted;
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.h
index bcb76b32548f..ee9241d576cd 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineExternalUIFacebookCommon.h
@@ -40,6 +40,7 @@ public:
 
 	// IOnlineExternalUI
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName = NAME_GameSession) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.cpp
index 3663207c6d8c..176f2e1a2ab0 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.cpp
@@ -16,7 +16,7 @@
 #define FRIEND_JSON_PAGING "paging"
 #define FRIEND_JSON_NEXTURL "next"
 #define FRIEND_JSON_SUMMARY "summary"
-#define FRIEND_JSON_FRIENDCOUNT	"totalcount"
+#define FRIEND_JSON_FRIENDCOUNT	"total_count"
 
 // FOnlineFriendFacebook
 
@@ -64,7 +64,7 @@ bool FOnlineFriendFacebook::Parse(const TSharedPtr<FJsonObject>& JsonObject)
 	{
 		if (!UserIdStr.IsEmpty())
 		{
-			UserIdPtr = MakeShared<FUniqueNetIdString>(UserIdStr);
+			UserIdPtr = MakeShared<FUniqueNetIdFacebook>(UserIdStr);
 			bSuccess = true;
 		}
 	}
@@ -83,6 +83,9 @@ FOnlineFriendsFacebookCommon::FOnlineFriendsFacebookCommon(FOnlineSubsystemFaceb
 	{
 		UE_LOG_ONLINE(Warning, TEXT("Missing FriendsUrl= in [OnlineSubsystemFacebook.OnlineFriendsFacebook] of DefaultEngine.ini"));
 	}
+
+	FriendsUrl.ReplaceInline(TEXT("`ver"), *InSubsystem->GetAPIVer());
+
 	GConfig->GetArray(TEXT("OnlineSubsystemFacebook.OnlineFriendsFacebook"), TEXT("FriendsFields"), FriendsFields, GEngineIni);	
 
 	// always required fields
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.h
index 55e22bd09394..fcb3c1013ef1 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineFriendsFacebookCommon.h
@@ -46,7 +46,7 @@ public:
 	 * Init/default constructor
 	 */
 	FOnlineFriendFacebook(const FString& InUserId=TEXT("")) 
-		: UserIdPtr(new FUniqueNetIdString(InUserId))
+		: UserIdPtr(new FUniqueNetIdFacebook(InUserId))
 	{
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.cpp
index 63d3b6b1187f..794913d58159 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.cpp
@@ -21,6 +21,8 @@ FOnlineIdentityFacebookCommon::FOnlineIdentityFacebookCommon(FOnlineSubsystemFac
 		UE_LOG(LogOnline, Warning, TEXT("Missing MeURL= in [OnlineSubsystemFacebook.OnlineIdentityFacebook] of DefaultEngine.ini"));
 	}
 
+	MeURL.ReplaceInline(TEXT("`ver"), *InSubsystem->GetAPIVer());
+
 	// Setup permission scope fields
 	GConfig->GetArray(TEXT("OnlineSubsystemFacebook.OnlineIdentityFacebook"), TEXT("ProfileFields"), ProfileFields, GEngineIni);
 	// Add a few basic fields
@@ -33,7 +35,7 @@ FOnlineIdentityFacebookCommon::FOnlineIdentityFacebookCommon(FOnlineSubsystemFac
 
 const FUniqueNetId& FOnlineIdentityFacebookCommon::GetEmptyUniqueId()
 {
-	static TSharedRef<const FUniqueNetIdString> EmptyUniqueId = MakeShared<const FUniqueNetIdString>(FString());
+	static TSharedRef<const FUniqueNetIdFacebook> EmptyUniqueId = MakeShared<const FUniqueNetIdFacebook>(FString());
 	return *EmptyUniqueId;
 }
 
@@ -209,14 +211,14 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityFacebookCommon::CreateUniquePlayer
 	if (Bytes != nullptr && Size > 0)
 	{
 		FString StrId(Size, (TCHAR*)Bytes);
-		return MakeShareable(new FUniqueNetIdString(StrId));
+		return MakeShareable(new FUniqueNetIdFacebook(StrId));
 	}
 	return nullptr;
 }
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityFacebookCommon::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdFacebook(Str));
 }
 
 bool FOnlineIdentityFacebookCommon::AutoLogin(int32 LocalUserNum)
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.h
index 4598604979b0..45b40e22b9eb 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineIdentityFacebookCommon.h
@@ -12,7 +12,6 @@ class FUserOnlineAccountFacebookCommon;
 
 #define AUTH_TYPE_FACEBOOK TEXT("facebook")
 #define FB_AUTH_EXPIRED_CREDS TEXT("com.epicgames.fb.oauth.expiredcreds");
-#define FB_AUTH_CANCELED	  TEXT("com.epicgames.login.canceled");
 
 /**
  * Delegate fired after a Facebook profile request has been completed
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSharingFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSharingFacebookCommon.cpp
index f0ea809437f4..bc9e753b2ae6 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSharingFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSharingFacebookCommon.cpp
@@ -132,6 +132,8 @@ FOnlineSharingFacebookCommon::FOnlineSharingFacebookCommon(FOnlineSubsystemFaceb
 		UE_LOG(LogOnline, Warning, TEXT("Missing PermissionsURL= in [OnlineSubsystemFacebook.OnlineSharingFacebook] of DefaultEngine.ini"));
 	}
 
+	PermissionsURL.ReplaceInline(TEXT("`ver"), *InSubsystem->GetAPIVer());
+
 	CurrentPermissions.Setup();
 
 	IOnlineIdentityPtr IdentityInt = Subsystem->GetIdentityInterface();
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.cpp
index c7b4892874c3..323bb0b36e7c 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.cpp
@@ -10,6 +10,9 @@
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/CommandLine.h"
 
+/** Fallback to latest tested API version */
+#define FACEBOOK_API_VER TEXT("v2.12")
+
 FOnlineSubsystemFacebookCommon::FOnlineSubsystemFacebookCommon()
 	: FacebookIdentity(nullptr)
 	, FacebookFriends(nullptr)
@@ -17,10 +20,6 @@ FOnlineSubsystemFacebookCommon::FOnlineSubsystemFacebookCommon()
 	, FacebookUser(nullptr)
 	, FacebookExternalUI(nullptr)
 {
-	if (!GConfig->GetString(TEXT("OnlineSubsystemFacebook"), TEXT("ClientId"), ClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemFacebook] of DefaultEngine.ini"));
-	}
 }
 
 FOnlineSubsystemFacebookCommon::FOnlineSubsystemFacebookCommon(FName InInstanceName)
@@ -31,10 +30,6 @@ FOnlineSubsystemFacebookCommon::FOnlineSubsystemFacebookCommon(FName InInstanceN
 	, FacebookUser(nullptr)
 	, FacebookExternalUI(nullptr)
 {
-	if (!GConfig->GetString(TEXT("OnlineSubsystemFacebook"), TEXT("ClientId"), ClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemFacebook] of DefaultEngine.ini"));
-	}
 }
 
 FOnlineSubsystemFacebookCommon::~FOnlineSubsystemFacebookCommon()
@@ -43,6 +38,17 @@ FOnlineSubsystemFacebookCommon::~FOnlineSubsystemFacebookCommon()
 
 bool FOnlineSubsystemFacebookCommon::Init()
 {
+	if (!GConfig->GetString(TEXT("OnlineSubsystemFacebook"), TEXT("ClientId"), ClientId, GEngineIni))
+	{
+		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemFacebook] of DefaultEngine.ini"));
+	}
+
+	if (!GConfig->GetString(TEXT("OnlineSubsystemFacebook"), TEXT("APIVer"), APIVer, GEngineIni))
+	{
+		UE_LOG(LogOnline, Warning, TEXT("Missing APIVer= in [OnlineSubsystemFacebook] of DefaultEngine.ini"));
+		APIVer = FACEBOOK_API_VER;
+	}
+
 	return true;
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.h
index 09b75fb091e7..5c54dc87290b 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookCommon.h
@@ -59,6 +59,9 @@ public:
 
 	// FOnlineSubsystemFacebookCommon
 
+	/** @return the API version in use (depends on the Facebook app settings) */
+	const FString& GetAPIVer() const { return APIVer; }
+
 	/**
 	 * Destructor
 	 */
@@ -74,6 +77,8 @@ protected:
 
 	/** The client id given to us by Facebook */
 	FString ClientId;
+	/** Version of the API in use (depends on the Facebook app settings) */
+	FString APIVer;
 
 	/** Facebook implementation of identity interface */
 	FOnlineIdentityFacebookCommonPtr FacebookIdentity;
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookTypes.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookTypes.h
index 505435685ec7..0dab4d149979 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineSubsystemFacebookTypes.h
@@ -10,7 +10,6 @@
 #define PICTURE_DATA_SILHOUETTE "is_silhouette"
 #define PICTURE_DATA_URL "url"
 
-#if 0
 /**
  * Facebook specific implementation of the unique net id
  */
@@ -48,6 +47,16 @@ public:
 	{
 	}
 
+	explicit FUniqueNetIdFacebook(const FString& Str) :
+		UniqueNetId(FCString::Strtoui64(*Str, nullptr, 10))
+	{
+	}
+
+	virtual FName GetType() const override
+	{
+		return FACEBOOK_SUBSYSTEM;
+	}
+
 	//~ Begin FUniqueNetId Interface
 	virtual const uint8* GetBytes() const override
 	{
@@ -88,7 +97,6 @@ public:
 		return (uint32)(A.UniqueNetId) + ((uint32)((A.UniqueNetId) >> 32 ) * 23);
 	}
 };
-#endif
 
 /**
  * Facebook error from JSON payload
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.cpp
index 5b5cd64657e4..372df9c4be88 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.cpp
@@ -79,7 +79,7 @@ TSharedPtr<FOnlineUser> FOnlineUserFacebookCommon::GetUserInfo(int32 LocalUserNu
 
 bool FOnlineUserFacebookCommon::QueryUserIdMapping(const FUniqueNetId& UserId, const FString& DisplayNameOrEmail, const FOnQueryUserMappingComplete& Delegate)
 {
-	Delegate.ExecuteIfBound(false, UserId, DisplayNameOrEmail, FUniqueNetIdString(), TEXT("not implemented"));
+	Delegate.ExecuteIfBound(false, UserId, DisplayNameOrEmail, FUniqueNetIdFacebook(), TEXT("not implemented"));
 	return false;
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.h
index 364932680bde..9ed9355e951b 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/OnlineUserFacebookCommon.h
@@ -6,6 +6,7 @@
 // Module includes
 #include "Interfaces/OnlineUserInterface.h"
 #include "OnlineSubsystemFacebookPackage.h"
+#include "OnlineSubsystemFacebookTypes.h"
 
 class FOnlineSubsystemFacebookCommon;
 
@@ -30,7 +31,7 @@ public:
 	 * Init/default constructor
 	 */
 	FOnlineUserInfoFacebook(const FString& InUserId=TEXT("")) 
-		: UserId(new FUniqueNetIdString(InUserId))
+		: UserId(new FUniqueNetIdFacebook(InUserId))
 	{
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineExternalUIInterfaceFacebookRest.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineExternalUIInterfaceFacebookRest.cpp
index 48d2dc4ccaa7..f9b2d217d362 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineExternalUIInterfaceFacebookRest.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineExternalUIInterfaceFacebookRest.cpp
@@ -13,12 +13,10 @@
 #define FB_ERRORCODE_TOKEN TEXT("error_code")
 #define FB_ERRORDESC_TOKEN TEXT("error_description")
 
-#define LOGIN_ERROR_UNKNOWN TEXT("com.epicgames.login.unknown")
-#define LOGIN_ERROR_AUTH_FAILURE TEXT("com.epicgames.login.auth_failure")
-
 bool FOnlineExternalUIFacebook::ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate)
 {
 	bool bStarted = false;
+	FString ErrorStr;
 	if (ControllerIndex >= 0 && ControllerIndex < MAX_LOCAL_PLAYERS)
 	{
 		FOnlineIdentityFacebookPtr IdentityInt = StaticCastSharedPtr<FOnlineIdentityFacebook>(FacebookSubsystem->GetIdentityInterface());
@@ -34,14 +32,30 @@ bool FOnlineExternalUIFacebook::ShowLoginUI(const int ControllerIndex, bool bSho
 				TriggerOnLoginFlowUIRequiredDelegates(RequestedURL, OnRedirectURLDelegate, OnExternalLoginFlowCompleteDelegate, bShouldContinueLoginFlow);
 				bStarted = bShouldContinueLoginFlow;
 			}
+			else
+			{
+				ErrorStr = TEXT("ShowLoginUI: Url Details not properly configured");
+			}
 		}
+		else
+		{
+			ErrorStr = TEXT("ShowLoginUI: Missing identity interface");
+		}
+	}
+	else
+	{
+		ErrorStr = FString::Printf(TEXT("ShowLoginUI: Invalid controller index (%d)"), ControllerIndex);
 	}
 
 	if (!bStarted)
 	{
-		FacebookSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		UE_LOG_ONLINE(Warning, TEXT("%s"), *ErrorStr);
+
+		FOnlineError Error;
+		Error.SetFromErrorCode(MoveTemp(ErrorStr));
+		FacebookSubsystem->ExecuteNextTick([ControllerIndex, Delegate, Error = MoveTemp(Error)]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, Error);
 		});
 	}
 
@@ -113,7 +127,7 @@ FLoginFlowResult FOnlineExternalUIFacebook::ParseRedirectResult(const FFacebookL
 					// Set some default in case parsing fails
 					Result.Error.ErrorRaw = LOGIN_ERROR_UNKNOWN;
 					Result.Error.ErrorMessage = FText::FromString(LOGIN_ERROR_UNKNOWN);
-					Result.Error.ErrorCode = TEXT("-1");
+					Result.Error.ErrorCode = LOGIN_ERROR_UNKNOWN;
 					Result.Error.NumericErrorCode = -1;
 				}
 			}
@@ -147,7 +161,7 @@ FLoginFlowResult FOnlineExternalUIFacebook::OnLoginRedirectURL(const FString& Re
 					{
 						Result.Error.ErrorRaw = LOGIN_ERROR_AUTH_FAILURE;
 						Result.Error.ErrorMessage = FText::FromString(LOGIN_ERROR_AUTH_FAILURE);
-						Result.Error.ErrorCode = TEXT("-2");
+						Result.Error.ErrorCode = LOGIN_ERROR_AUTH_FAILURE;
 						Result.Error.NumericErrorCode = -2;
 					}
 				}
@@ -178,9 +192,10 @@ void FOnlineExternalUIFacebook::OnExternalLoginFlowComplete(const FLoginFlowResu
 
 	if (!bStarted)
 	{
-		FacebookSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		FOnlineError LoginFlowError = Result.Error;
+		FacebookSubsystem->ExecuteNextTick([ControllerIndex, LoginFlowError, Delegate]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, LoginFlowError);
 		});
 	}
 }
@@ -188,9 +203,9 @@ void FOnlineExternalUIFacebook::OnExternalLoginFlowComplete(const FLoginFlowResu
 void FOnlineExternalUIFacebook::OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& Error, FOnLoginUIClosedDelegate Delegate)
 {
 	TSharedPtr<const FUniqueNetId> StrongUserId = UserId.AsShared();
-	FacebookSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, Delegate]()
+	FacebookSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, bWasSuccessful, Delegate]()
 	{
-		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum);
+		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum, FOnlineError(bWasSuccessful));
 	});
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.cpp b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.cpp
index e98b7cdd1e42..40b466fa88d6 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.cpp
@@ -32,6 +32,8 @@ FOnlineIdentityFacebook::FOnlineIdentityFacebook(FOnlineSubsystemFacebook* InSub
 		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemFacebook] of DefaultEngine.ini"));
 	}
 
+	LoginURLDetails.LoginUrl.ReplaceInline(TEXT("`ver"), *InSubsystem->GetAPIVer());
+
 	// Setup permission scope fields
 	GConfig->GetArray(TEXT("OnlineSubsystemFacebook.OnlineIdentityFacebook"), TEXT("ScopeFields"), LoginURLDetails.ScopeFields, GEngineIni);
 	// always required login access fields
@@ -154,10 +156,10 @@ void FOnlineIdentityFacebook::OnAccessTokenLoginComplete(int32 LocalUserNum, boo
 	}
 }
 
-void FOnlineIdentityFacebook::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex)
+void FOnlineIdentityFacebook::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error)
 {
-	FString ErrorStr;
-	bool bWasSuccessful = UniqueId.IsValid() && UniqueId->IsValid();
+	const FString& ErrorStr = Error.ErrorCode;
+	const bool bWasSuccessful = Error.WasSuccessful() && UniqueId.IsValid() && UniqueId->IsValid();
 	OnAccessTokenLoginComplete(ControllerIndex, bWasSuccessful, bWasSuccessful ? *UniqueId : GetEmptyUniqueId(), ErrorStr);
 }
 
@@ -234,7 +236,7 @@ void FOnlineIdentityFacebook::RequestElevatedPermissions(int32 LocalUserNum, con
 	}
 }
 
-void FOnlineIdentityFacebook::OnExternalUIElevatedPermissionsComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, FOnLoginCompleteDelegate InCompletionDelegate)
+void FOnlineIdentityFacebook::OnExternalUIElevatedPermissionsComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error, FOnLoginCompleteDelegate InCompletionDelegate)
 {
 	FString ErrorStr;
 	bool bWasSuccessful = UniqueId.IsValid() && UniqueId->IsValid();
diff --git a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.h b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.h
index 8afa29e7ef05..277d998a22f3 100644
--- a/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.h
+++ b/Engine/Plugins/Online/OnlineSubsystemFacebook/Source/Private/Rest/OnlineIdentityFacebookRest.h
@@ -155,18 +155,18 @@ private:
 	/**
 	 * Delegate fired when the call to ShowLoginUI completes 
 	 */
-	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex);
+	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error);
 
 	/**
 	 * Delegate fired when the call to ShowLoginUI completes for requesting elevated permissions
 	 */
-	void OnExternalUIElevatedPermissionsComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, FOnLoginCompleteDelegate InCompletionDelegate);
+	void OnExternalUIElevatedPermissionsComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error, FOnLoginCompleteDelegate InCompletionDelegate);
 
 	/**
 	 * Delegate called when current permission request completes
 	 *
 	 * @param LocalUserNum user that made the request
-	 * @param bWasSuccesful was the request successful
+	 * @param bWasSuccessful was the request successful
 	 * @param NewPermissions array of all known permissions
 	 * @param CompletionDelegate follow up delegate after this request is complete
 	 */
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle.Build.cs b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle.Build.cs
index 318902a7cdce..7f5218060b1c 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle.Build.cs
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle.Build.cs
@@ -47,27 +47,12 @@ public class OnlineSubsystemGoogle : ModuleRules
 			)
 			);
 
-			PublicAdditionalFrameworks.Add(
-			new UEBuildFramework(
-				"GoogleAppUtilities",
-				"ThirdParty/IOS/GoogleSignInSDK/GoogleAppUtilities.embeddedframework.zip"
-			)
-			);
-
 			PublicAdditionalFrameworks.Add(
 			new UEBuildFramework(
 				"GoogleSignInDependencies",
 				"ThirdParty/IOS/GoogleSignInSDK/GoogleSignInDependencies.embeddedframework.zip"
 			)
 			);
-
-			PublicAdditionalFrameworks.Add(
-			new UEBuildFramework(
-				"GoogleSymbolUtilities",
-				"ThirdParty/IOS/GoogleSignInSDK/GoogleSymbolUtilities.embeddedframework.zip"
-			)
-			);
-
 		}
 		else if (Target.Platform == UnrealTargetPlatform.Android)
 		{
@@ -99,6 +84,14 @@ public class OnlineSubsystemGoogle : ModuleRules
 		{
 			bUsesRestfulImpl = true;
 		}
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+			bUsesRestfulImpl = true;
+		}
+        else if (Target.Platform == UnrealTargetPlatform.Switch)
+        {
+            bUsesRestfulImpl = true;
+        }
 		else
 		{
 			PrecompileForTargets = PrecompileTargetsType.None;
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle_UPL.xml b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle_UPL.xml
index 691d45e233de..d579cb67c991 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle_UPL.xml
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/OnlineSubsystemGoogle_UPL.xml
@@ -4,11 +4,20 @@
 	<!-- init section is always evaluated once per architecture -->
 	<init>
 		<log text="Google SDK Android init"/>
+
+        <!-- check if using Gradle -->
+        <setBoolFromProperty result="bGradle" ini="Engine" section="/Script/AndroidRuntimeSettings.AndroidRuntimeSettings" property="bEnableGradle" default="false"/>
+        <if condition="bGradle">
+            <true>
+                <log text="Google requires minimum SDK of 15"/>
+            </true>
+        </if>
+        
 		<!-- <trace enable="true"/> -->
 		<!-- get packaging for Google from ini and reset it if architecture not supported -->
 		<setBoolFromProperty result="bEnabled" ini="Engine" section="OnlineSubsystemGoogle" property="bEnabled" default="false"/>
-		<setStringFromProperty result="ClientId" ini="Engine" section="OnlineSubsystemGoogle" property="ClientId" default="0"/>
-		<setStringFromProperty result="ServerClientId" ini="Engine" section="OnlineSubsystemGoogle" property="ServerClientId" default="0"/>
+		<!-- <setStringFromProperty result="ClientId" ini="Engine" section="OnlineSubsystemGoogle" property="ClientId" default="0"/> -->
+		<!-- <setStringFromProperty result="ServerClientId" ini="Engine" section="OnlineSubsystemGoogle" property="ServerClientId" default="0"/> -->
 		<dumpvars/>
 	</init>
 	
@@ -31,12 +40,24 @@
 	<AARImports>
 		<if condition="bEnabled">
 			<true>
-				<insertValue value="com.google.android.gms,play-services-auth,11.0.4" />
-				<insertNewline/>
+                <if condition="bGradle">
+                    <false>
+                        <insertValue value="com.google.android.gms,play-services-auth,11.0.4" />
+                        <insertNewline/>
+                    </false>
+                </if>
 			</true>
 		</if>
 	</AARImports>
 
+    <buildGradleAdditions>
+        <insert>
+            dependencies {
+            implementation('com.google.android.gms:play-services-auth:11.8.0')
+            }
+        </insert>
+    </buildGradleAdditions>
+
 	<!-- optional updates applied to AndroidManifest.xml -->
 	<androidManifestUpdates>
 		<if condition="bEnabled">
@@ -106,6 +127,28 @@
 	// Begin Google gameActivityClassAdditions
 	private GoogleLogin googleLogin;
 	public GoogleLogin getGoogleLogin() { return googleLogin; }
+    
+    public int AndroidThunkJava_Google_Init(String clientId, String serverId)
+	{
+		Log.debug("[JAVA] - AndroidThunkJava_Google_Init begin:");
+        Log.debug("[JAVA] - clientId:" + clientId);
+        Log.debug("[JAVA] - serverId:" + serverId);
+        
+        int resultCode = -1;
+	    if ((googleLogin == null) || (!googleLogin.init(clientId, serverId)))
+	    {
+		    googleLogin = null;
+		    Log.error("[JAVA] - Google SDK failed to initialize!");
+	    }
+	    else
+	    {
+	    	Log.debug("[JAVA] - Google SDK success!");
+            resultCode = 0;
+	    }
+       
+		Log.debug("[JAVA] - AndroidThunkJava_Google_Init end: " + resultCode);
+        return resultCode;
+	}
 
 	public int AndroidThunkJava_Google_Login(String[] ScopeFields)
 	{
@@ -154,24 +197,8 @@
 			<true>
 				<insert>	
 	// Begin Google onCreate
-				</insert>
-				<insertValue value="    String androidClientId = &quot;$S(ClientId)&quot;;" />
-				<insertNewline/>
-				<insert>
-				</insert>
-				<insertValue value="    String serverClientId = &quot;$S(ServerClientId)&quot;;" />
-				<insertNewline/>
-				<insert>
-	googleLogin = new GoogleLogin(this, Log);
-	if (!googleLogin.init(getPackageName(), BuildConfiguration, androidClientId, serverClientId, savedInstanceState))
-	{
-		googleLogin = null;
-		Log.error("[JAVA] - Google SDK failed to initialize!");
-	}
-	else
-	{
-		Log.debug("[JAVA] - Google SDK success!");
-	}
+    Log.debug("[JAVA] - Google onCreate");
+    googleLogin = new GoogleLogin(this, Log, getPackageName(), BuildConfiguration);
 	// End Google onCreate
 				</insert>
 			</true>
@@ -184,6 +211,7 @@
 			<true>
 				<insert>                    
 	// Begin Google onDestroy
+    Log.debug("[JAVA] - Google onDestroy");
 	if (googleLogin != null)
 	{
 		googleLogin.onDestroy();
@@ -200,6 +228,7 @@
 			<true>
 				<insert>
 	// Begin Google onStart
+    Log.debug("[JAVA] - Google onStart");
 	if (googleLogin != null)
 	{
 		googleLogin.onStart();
@@ -216,6 +245,7 @@
 			<true>
 				<insert>
 	// Begin Google onStop
+    Log.debug("[JAVA] - Google onStop");
 	if (googleLogin != null)
 	{
 		googleLogin.onStop();
@@ -256,6 +286,7 @@
 			<true>
 				<insert>
 	// Begin Google onActivityResult
+    Log.debug("[JAVA] - Google onActivityResult");
 	if (googleLogin != null)
 	{
 		googleLogin.onActivityResult(requestCode, resultCode, data);
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.cpp
index 77865aa4e2e9..32bfea1bbd14 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "OnlineIdentityGoogle.h"
+#include "Interfaces/OnlineExternalUIInterface.h"
 #include "OnlineSubsystemGooglePrivate.h"
 
 #include "Android/AndroidJNI.h"
@@ -8,6 +9,10 @@
 #include "Misc/ConfigCacheIni.h"
 #include "Async/TaskGraphInterfaces.h"
 
+#define GOOGLE_JNI_CPP_ERROR -2
+#define GOOGLE_JNI_JAVA_ERROR -1
+#define GOOGLE_JNI_OK 0
+
 FOnlineIdentityGoogle::FOnlineIdentityGoogle(FOnlineSubsystemGoogle* InSubsystem)
 	: FOnlineIdentityGoogleCommon(InSubsystem)
 {
@@ -25,6 +30,19 @@ FOnlineIdentityGoogle::FOnlineIdentityGoogle(FOnlineSubsystemGoogle* InSubsystem
 	OnGoogleLogoutCompleteHandle = AddOnGoogleLogoutCompleteDelegate_Handle(LogoutDelegate);
 }
 
+bool FOnlineIdentityGoogle::Init()
+{
+	int32 ResultCode = GOOGLE_JNI_CPP_ERROR;
+	if (ensure(GoogleSubsystem))
+	{
+		extern int32 AndroidThunkCpp_Google_Init(const FString&, const FString&);
+		ResultCode = AndroidThunkCpp_Google_Init(GoogleSubsystem->GetClientId(), GoogleSubsystem->GetServerClientId());
+		ensureMsgf(ResultCode == GOOGLE_JNI_OK, TEXT("FOnlineIdentityGoogle::Init AndroidThunkCpp_Google_Init failed"));
+	}
+
+	return (ResultCode == GOOGLE_JNI_OK);
+}
+
 bool FOnlineIdentityGoogle::Login(int32 LocalUserNum, const FOnlineAccountCredentials& AccountCredentials)
 {
 	UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::Login"));
@@ -98,7 +116,7 @@ bool FOnlineIdentityGoogle::Login(int32 LocalUserNum, const FOnlineAccountCreden
 					FString ErrorStr;
 					if (InResponseCode == EGoogleLoginResponse::RESPONSE_CANCELED)
 					{
-						ErrorStr = GOOGLE_AUTH_CANCELED;
+						ErrorStr = LOGIN_CANCELLED;
 					}
 					else
 					{
@@ -108,14 +126,16 @@ bool FOnlineIdentityGoogle::Login(int32 LocalUserNum, const FOnlineAccountCreden
 				}
 			});
 
-			extern bool AndroidThunkCpp_Google_Login(const TArray<FString>&);
-			bTriggeredLogin = AndroidThunkCpp_Google_Login(ScopeFields);
-			if (!ensure(bTriggeredLogin))
+			extern int32 AndroidThunkCpp_Google_Login(const TArray<FString>&);
+			int32 Result = AndroidThunkCpp_Google_Login(ScopeFields);
+			if (!ensure(Result == GOOGLE_JNI_OK))
 			{
 				// Only if JEnv is wrong
-				UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::Login AndroidThunkCpp_Google_Login failed to trigger"));
+				UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::Login AndroidThunkCpp_Google_Login failed"));
 				OnLoginComplete(EGoogleLoginResponse::RESPONSE_ERROR, TEXT(""));
 			}
+
+			bTriggeredLogin = (Result == GOOGLE_JNI_OK);
 		}
 		else
 		{
@@ -172,12 +192,12 @@ void FOnlineIdentityGoogle::OnLoginAttemptComplete(int32 LocalUserNum, const FSt
 		});
 
 		// Clean up anything left behind from cached access tokens
-		extern bool AndroidThunkCpp_Google_Logout();
-		bool bTriggeredLogout = AndroidThunkCpp_Google_Logout();
-		if (!ensure(bTriggeredLogout))
+		extern int32 AndroidThunkCpp_Google_Logout();
+		int32 Result = AndroidThunkCpp_Google_Logout();
+		if (!ensure(Result == GOOGLE_JNI_OK))
 		{
 			// Only if JEnv is wrong
-			UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::OnLoginAttemptComplete AndroidThunkCpp_Google_Logout failed to trigger"));
+			UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::OnLoginAttemptComplete AndroidThunkCpp_Google_Logout failed"));
 			OnLogoutComplete(EGoogleLoginResponse::RESPONSE_ERROR);
 		}
 	}
@@ -216,14 +236,16 @@ bool FOnlineIdentityGoogle::Logout(int32 LocalUserNum)
 				});
 			});
 
-			extern bool AndroidThunkCpp_Google_Logout();
-			bTriggeredLogout = AndroidThunkCpp_Google_Logout();
-			if (!ensure(bTriggeredLogout))
+			extern int32 AndroidThunkCpp_Google_Logout();
+			int32 Result = AndroidThunkCpp_Google_Logout();
+			if (!ensure(Result == GOOGLE_JNI_OK))
 			{
 				// Only if JEnv is wrong
-				UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::Logout AndroidThunkCpp_Google_Logout failed to trigger"));
+				UE_LOG_ONLINE(Verbose, TEXT("FOnlineIdentityGoogle::Logout AndroidThunkCpp_Google_Logout failed"));
 				OnLogoutComplete(EGoogleLoginResponse::RESPONSE_ERROR);
 			}
+
+			bTriggeredLogout = (Result == GOOGLE_JNI_OK);
 		}
 		else
 		{
@@ -266,10 +288,44 @@ void FOnlineIdentityGoogle::OnLogoutComplete(EGoogleLoginResponse InResponseCode
 
 #define CHECK_JNI_METHOD(Id) checkf(Id != nullptr, TEXT("Failed to find " #Id));
 
-bool AndroidThunkCpp_Google_Login(const TArray<FString>& InScopeFields)
+int32 AndroidThunkCpp_Google_Init(const FString& InClientId, const FString& InServerId)
+{
+	FPlatformMisc::LowLevelOutputDebugStringf(TEXT("AndroidThunkCpp_Google_Init %s %s"), *InClientId, *InServerId);
+	int32 ReturnVal = GOOGLE_JNI_CPP_ERROR;
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		const bool bIsOptional = false;
+		static jmethodID GoogleInitGoogleMethod = FJavaWrapper::FindMethod(Env, FJavaWrapper::GameActivityClassID, "AndroidThunkJava_Google_Init", "(Ljava/lang/String;Ljava/lang/String;)I", bIsOptional);
+		CHECK_JNI_METHOD(GoogleInitGoogleMethod);
+		//FPlatformMisc::LowLevelOutputDebugStringf(TEXT("GoogleInitGoogleMethod 0x%08x"), GoogleInitGoogleMethod);
+
+		jstring jClientAuthId = Env->NewStringUTF(TCHAR_TO_UTF8(*InClientId));
+		jstring jServerAuthId = Env->NewStringUTF(TCHAR_TO_UTF8(*InServerId));
+
+		ReturnVal = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, GoogleInitGoogleMethod, jClientAuthId, jServerAuthId);
+		if (Env->ExceptionCheck())
+		{
+			Env->ExceptionDescribe();
+			Env->ExceptionClear();
+			ReturnVal = GOOGLE_JNI_CPP_ERROR;
+		}
+
+		Env->DeleteLocalRef(jClientAuthId);
+		Env->DeleteLocalRef(jServerAuthId);
+
+		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("AndroidThunkJava_Google_Init retval=%d"), ReturnVal);
+	}
+	else
+	{
+		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("AndroidThunkJava_Google_Init JNI error"));
+	}
+	return ReturnVal;
+}
+
+int32 AndroidThunkCpp_Google_Login(const TArray<FString>& InScopeFields)
 {
 	UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Login"));
-	bool bSuccess = false;
+	int32 ReturnVal = GOOGLE_JNI_CPP_ERROR;
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
 	{
 		const bool bIsOptional = false;
@@ -286,11 +342,16 @@ bool AndroidThunkCpp_Google_Login(const TArray<FString>& InScopeFields)
 			Env->DeleteLocalRef(StringValue);
 		}
 
-		int32 ReturnVal = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, GoogleLoginMethod, ScopeIDArray);
+		ReturnVal = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, GoogleLoginMethod, ScopeIDArray);
+		if (Env->ExceptionCheck())
+		{
+			Env->ExceptionDescribe();
+			Env->ExceptionClear();
+			ReturnVal = GOOGLE_JNI_CPP_ERROR;
+		}
 
 		// clean up references
 		Env->DeleteLocalRef(ScopeIDArray);
-		bSuccess = true;
 		UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Login retval=%d"), ReturnVal);
 	}
 	else
@@ -298,10 +359,10 @@ bool AndroidThunkCpp_Google_Login(const TArray<FString>& InScopeFields)
 		UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Login JNI error"));
 	}
 
-	return bSuccess;
+	return ReturnVal;
 }
 
-extern "C" void Java_com_epicgames_ue4_GoogleLogin_nativeLoginComplete(JNIEnv* jenv, jobject thiz, jsize responseCode, jstring javaData)
+JNI_METHOD void Java_com_epicgames_ue4_GoogleLogin_nativeLoginComplete(JNIEnv* jenv, jobject thiz, jsize responseCode, jstring javaData)
 {
 	EGoogleLoginResponse LoginResponse = (EGoogleLoginResponse)responseCode;
 
@@ -331,29 +392,34 @@ extern "C" void Java_com_epicgames_ue4_GoogleLogin_nativeLoginComplete(JNIEnv* j
 	);
 }
 
-bool AndroidThunkCpp_Google_Logout()
+int32 AndroidThunkCpp_Google_Logout()
 {
 	UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Logout"));
-	bool bSuccess = false;
+	int32 ReturnVal = GOOGLE_JNI_CPP_ERROR;
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
 	{
 		const bool bIsOptional = false;
 		static jmethodID GoogleLogoutMethod = FJavaWrapper::FindMethod(Env, FJavaWrapper::GameActivityClassID, "AndroidThunkJava_Google_Logout", "()I", bIsOptional);
 		CHECK_JNI_METHOD(GoogleLogoutMethod);
 		UE_LOG_ONLINE(Verbose, TEXT("GoogleLogoutMethod 0x%08x"), GoogleLogoutMethod);
-		int32 ReturnVal = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, GoogleLogoutMethod);
+		ReturnVal = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, GoogleLogoutMethod);
+		if (Env->ExceptionCheck())
+		{
+			Env->ExceptionDescribe();
+			Env->ExceptionClear();
+			ReturnVal = GOOGLE_JNI_CPP_ERROR;
+		}
 		
-		bSuccess = true;
 		UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Logout retval=%d"), ReturnVal);
 	}
 	else
 	{
 		UE_LOG_ONLINE(Verbose, TEXT("AndroidThunkCpp_Google_Logout JNI error"));
 	}
-	return bSuccess;
+	return ReturnVal;
 }
 
-extern "C" void Java_com_epicgames_ue4_GoogleLogin_nativeLogoutComplete(JNIEnv* jenv, jobject thiz, jsize responseCode)
+JNI_METHOD void Java_com_epicgames_ue4_GoogleLogin_nativeLogoutComplete(JNIEnv* jenv, jobject thiz, jsize responseCode)
 {
 	EGoogleLoginResponse LogoutResponse = (EGoogleLoginResponse)responseCode;
 	UE_LOG_ONLINE(Verbose, TEXT("nativeLogoutComplete %s"), ToString(LogoutResponse));
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.h
index 41c5486fe35e..83237b08afbc 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineIdentityGoogle.h
@@ -9,8 +9,6 @@
 
 class FOnlineSubsystemGoogle;
 
-#define GOOGLE_AUTH_CANCELED	  TEXT("com.epicgames.login.canceled");
-
 /** Tied to GoogleLogin.java */
 enum class EGoogleLoginResponse : uint8
 {
@@ -20,6 +18,8 @@ enum class EGoogleLoginResponse : uint8
 	RESPONSE_CANCELED = 1,
 	/** Google Sign In  SDK error */
 	RESPONSE_ERROR = 2,
+	/** Developer setup error */
+	RESPONSE_DEVELOPER_ERROR
 };
 
 inline const TCHAR* ToString(EGoogleLoginResponse Response)
@@ -32,6 +32,8 @@ inline const TCHAR* ToString(EGoogleLoginResponse Response)
 			return TEXT("RESPONSE_CANCELED");
 		case EGoogleLoginResponse::RESPONSE_ERROR:
 			return TEXT("RESPONSE_ERROR");
+		case EGoogleLoginResponse::RESPONSE_DEVELOPER_ERROR:
+			return TEXT("RESPONSE_DEVELOPER_ERROR");
 	}
 
 	return TEXT("");
@@ -86,6 +88,13 @@ public:
 
 	FOnlineIdentityGoogle(FOnlineSubsystemGoogle* InSubsystem);
 
+	/**	
+	 * Initialize the interface
+	 * 
+	 * @return true if successful, false if there was an issue
+	 */
+	bool Init();
+
 	/**
 	 * Destructor
 	 */
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineSubsystemGoogle.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineSubsystemGoogle.cpp
index dbbe3f57935d..c7bbc786d56e 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineSubsystemGoogle.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Android/OnlineSubsystemGoogle.cpp
@@ -25,12 +25,16 @@ bool FOnlineSubsystemGoogle::Init()
 	UE_LOG(LogOnline, VeryVerbose, TEXT("FOnlineSubsystemGoogle::Init()"));
 	if (FOnlineSubsystemGoogleCommon::Init())
 	{
-		GoogleIdentity = MakeShareable(new FOnlineIdentityGoogle(this));
+		FOnlineIdentityGooglePtr TempPtr = MakeShareable(new FOnlineIdentityGoogle(this));
+		if (TempPtr->Init())
+		{
+			GoogleIdentity = TempPtr;
+		}
+
 		GoogleExternalUI = MakeShareable(new FOnlineExternalUIGoogle(this));
-		return true;
 	}
 
-	return false;
+	return GoogleIdentity.IsValid() && GoogleExternalUI.IsValid();
 }
 
 bool FOnlineSubsystemGoogle::Shutdown()
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.cpp
index ac4558dcaafd..13bba5c0424e 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.cpp
@@ -2,6 +2,7 @@
 
 #include "OnlineIdentityGoogle.h"
 #include "OnlineSubsystemGooglePrivate.h"
+#include "Interfaces/OnlineExternalUIInterface.h"
 #include "GoogleHelper.h"
 
 #include "Misc/ConfigCacheIni.h"
@@ -91,7 +92,7 @@ bool FOnlineIdentityGoogle::Login(int32 LocalUserNum, const FOnlineAccountCreden
 							FString ErrorStr;
 							if (InResponseCode == EGoogleLoginResponse::RESPONSE_CANCELED)
 							{
-								ErrorStr = GOOGLE_AUTH_CANCELED;
+								ErrorStr = LOGIN_CANCELLED;
 							}
 							else
 							{
@@ -112,6 +113,7 @@ bool FOnlineIdentityGoogle::Login(int32 LocalUserNum, const FOnlineAccountCreden
 				}
 			};
 
+			bTriggeredLogin = true;
 			RetrieveDiscoveryDocument(MoveTemp(PendingLoginFn));
 		}
 		else
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.h
index 962fdf56527f..ce2a330c4fb2 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineIdentityGoogle.h
@@ -14,8 +14,6 @@ enum class EGoogleLoginResponse : uint8;
 
 @class FGoogleHelper;
 
-#define GOOGLE_AUTH_CANCELED	  TEXT("com.epicgames.login.canceled");
-
 /** iOS implementation of a Google user account */
 class FUserOnlineAccountGoogle : public FUserOnlineAccountGoogleCommon
 {
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineSubsystemGoogle.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineSubsystemGoogle.cpp
index 3f997a4589eb..4dbf304a05b7 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineSubsystemGoogle.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/IOS/OnlineSubsystemGoogle.cpp
@@ -12,6 +12,7 @@
 
 static void OnGoogleOpenURL(UIApplication* application, NSURL* url, NSString* sourceApplication, id annotation)
 {
+	// post iOS8 call signature
 	//bool bResult = [[GIDSignIn sharedInstance] handleURL:url
 	//						           sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
 	//								   annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.cpp
index 2fac07030240..8bc7ddcecced 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.cpp
@@ -47,7 +47,7 @@ bool FUserOnlineAccountGoogleCommon::Parse(const FAuthTokenGoogle& InAuthToken,
 			{
 				if (!UserId.IsEmpty())
 				{
-					UserIdPtr = MakeShared<FUniqueNetIdString>(UserId);
+					UserIdPtr = MakeShared<FUniqueNetIdGoogle>(UserId);
 
 					// update the access token
 					AuthToken = InAuthToken;
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.h
index af92573e20ea..42ab0b592b0a 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineAccountGoogleCommon.h
@@ -32,7 +32,7 @@ public:
 	// FUserOnlineAccountGoogleCommon
 
 	explicit FUserOnlineAccountGoogleCommon(const FString& InUserId = FString(), const FAuthTokenGoogle& InAuthToken = FAuthTokenGoogle())
-		: UserIdPtr(new FUniqueNetIdString(InUserId))
+		: UserIdPtr(new FUniqueNetIdGoogle(InUserId))
 		, UserId(InUserId)
 		, AuthToken(InAuthToken)
 	{
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.cpp
index 3f60b84046a4..585f355b3a14 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.cpp
@@ -14,7 +14,7 @@ bool FOnlineExternalUIGoogleCommon::ShowLoginUI(const int ControllerIndex, bool
 
 	GoogleSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
 	{
-		Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+		Delegate.ExecuteIfBound(nullptr, ControllerIndex, FOnlineError(false));
 	});
 
 	return bStarted;
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.h
index d158c114a3da..c664b70d3105 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineExternalUIGoogleCommon.h
@@ -41,6 +41,7 @@ public:
 
 	// IOnlineExternalUI
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName = NAME_GameSession) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineIdentityGoogleCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineIdentityGoogleCommon.cpp
index 0dab0ad44752..3ed4d25503a9 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineIdentityGoogleCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineIdentityGoogleCommon.cpp
@@ -58,40 +58,47 @@ bool FJsonWebTokenGoogle::Parse(const FString& InJWTStr)
 							{
 								// Verify that the value of aud in the ID token is equal to your app's client ID.
 								FOnlineSubsystemGoogle* GoogleSubsystem = static_cast<FOnlineSubsystemGoogle*>(IOnlineSubsystem::Get(GOOGLE_SUBSYSTEM));
-								if (Payload.Aud == GoogleSubsystem->GetAppId() ||
-									Payload.Aud == GoogleSubsystem->GetServerClientId())
+								if (ensure(GoogleSubsystem))
 								{
-									//https://www.codescience.com/blog/2016/oauth2-server-to-server-authentication-from-salesforce-to-google-apis
-									// exp	Required	The expiration time of the assertion, specified as seconds since 00:00:00 UTC, January 1, 1970. This value has a maximum of 1 hour after the issued time.
-									// iat	Required	The time the assertion was issued, specified as seconds since 00:00:00 UTC, January 1, 1970.
-
-									//Verify that the expiry time(exp) of the ID token has not passed.
-									FDateTime ExpiryTime = FDateTime::FromUnixTimestamp(Payload.EXP);
-									FDateTime IssueTime = FDateTime::FromUnixTimestamp(Payload.IAT);
-									if ((ExpiryTime - IssueTime) <= FTimespan(ETimespan::TicksPerHour) && ExpiryTime > FDateTime::UtcNow())
+									if (Payload.Aud == GoogleSubsystem->GetAppId() ||
+										Payload.Aud == GoogleSubsystem->GetServerClientId())
 									{
-										bSuccess = true;
-#if 0
-										TArray<uint8> Signature;
-										if (FBase64::Decode(Tokens[2], Signature))
+										//https://www.codescience.com/blog/2016/oauth2-server-to-server-authentication-from-salesforce-to-google-apis
+										// exp	Required	The expiration time of the assertion, specified as seconds since 00:00:00 UTC, January 1, 1970. This value has a maximum of 1 hour after the issued time.
+										// iat	Required	The time the assertion was issued, specified as seconds since 00:00:00 UTC, January 1, 1970.
+
+										//Verify that the expiry time(exp) of the ID token has not passed.
+										FDateTime ExpiryTime = FDateTime::FromUnixTimestamp(Payload.EXP);
+										FDateTime IssueTime = FDateTime::FromUnixTimestamp(Payload.IAT);
+										if ((ExpiryTime - IssueTime) <= FTimespan(ETimespan::TicksPerHour) && ExpiryTime > FDateTime::UtcNow())
 										{
 											bSuccess = true;
-										}
+#if 0
+											TArray<uint8> Signature;
+											if (FBase64::Decode(Tokens[2], Signature))
+											{
+												bSuccess = true;
+											}
 #endif
+										}
+										else
+										{
+											UE_LOG(LogOnline, Warning, TEXT("Google auth: Expiry Time inconsistency"));
+											UE_LOG(LogOnline, Warning, TEXT("	Expiry: %s"), *ExpiryTime.ToString());
+											UE_LOG(LogOnline, Warning, TEXT("	Issue: %s"), *IssueTime.ToString());
+										}
 									}
 									else
 									{
-										UE_LOG(LogOnline, Warning, TEXT("Google auth: Expiry Time inconsistency"));
-										UE_LOG(LogOnline, Warning, TEXT("	Expiry: %s"), *ExpiryTime.ToString());
-										UE_LOG(LogOnline, Warning, TEXT("	Issue: %s"), *IssueTime.ToString());
+										UE_LOG(LogOnline, Warning, TEXT("Google auth: Audience inconsistency"));
+										UE_LOG(LogOnline, Warning, TEXT("	Payload: %s"), *Payload.Aud);
+										UE_LOG(LogOnline, Warning, TEXT("	ClientId: %s"), *GoogleSubsystem->GetAppId());
+										UE_LOG(LogOnline, Warning, TEXT("	ServerClientId: %s"), *GoogleSubsystem->GetServerClientId());
 									}
 								}
 								else
 								{
-									UE_LOG(LogOnline, Warning, TEXT("Google auth: Audience inconsistency"));
-									UE_LOG(LogOnline, Warning, TEXT("	Payload: %s"), *Payload.Aud); 
-									UE_LOG(LogOnline, Warning, TEXT("	ClientId: %s"), *GoogleSubsystem->GetAppId());
-									UE_LOG(LogOnline, Warning, TEXT("	ServerClientId: %s"), *GoogleSubsystem->GetServerClientId());
+									UE_LOG(LogOnline, Warning, TEXT("Google auth: missing OSS"));
 								}
 							}
 							else
@@ -226,7 +233,7 @@ FOnlineIdentityGoogleCommon::FOnlineIdentityGoogleCommon(FOnlineSubsystemGoogle*
 
 const FUniqueNetId& FOnlineIdentityGoogleCommon::GetEmptyUniqueId()
 {
-	static TSharedRef<const FUniqueNetIdString> EmptyUniqueId = MakeShared<const FUniqueNetIdString>(FString());
+	static TSharedRef<const FUniqueNetIdGoogle> EmptyUniqueId = MakeShared<const FUniqueNetIdGoogle>(FString());
 	return *EmptyUniqueId;
 }
 
@@ -420,14 +427,14 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityGoogleCommon::CreateUniquePlayerId
 	if (Bytes != nullptr && Size > 0)
 	{
 		FString StrId(Size, (TCHAR*)Bytes);
-		return MakeShareable(new FUniqueNetIdString(StrId));
+		return MakeShareable(new FUniqueNetIdGoogle(StrId));
 	}
 	return nullptr;
 }
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityGoogleCommon::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdGoogle(Str));
 }
 
 bool FOnlineIdentityGoogleCommon::AutoLogin(int32 LocalUserNum)
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleCommon.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleCommon.cpp
index 8d9125815d93..eca5c22c69d4 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleCommon.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleCommon.cpp
@@ -7,33 +7,18 @@
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/CommandLine.h"
 
+#define GOOGLE_CLIENTAUTH_ID TEXT("ClientId")
+#define GOOGLE_SERVERAUTH_ID TEXT("ServerClientId")
+
 FOnlineSubsystemGoogleCommon::FOnlineSubsystemGoogleCommon()
 	: GoogleIdentity(nullptr)
 	, GoogleExternalUI(nullptr)
 {
-	if (!GConfig->GetString(TEXT("OnlineSubsystemGoogle"), TEXT("ClientId"), ClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemGoogle] of DefaultEngine.ini"));
-	}
-
-	if (!GConfig->GetString(TEXT("OnlineSubsystemGoogle"), TEXT("ServerClientId"), ServerClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ServerClientId= in [OnlineSubsystemGoogle] of DefaultEngine.ini"));
-	}
 }
 
 FOnlineSubsystemGoogleCommon::FOnlineSubsystemGoogleCommon(FName InInstanceName)
 	: FOnlineSubsystemImpl(GOOGLE_SUBSYSTEM, InInstanceName)
 {
-	if (!GConfig->GetString(TEXT("OnlineSubsystemGoogle"), TEXT("ClientId"), ClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [OnlineSubsystemGoogle] of DefaultEngine.ini"));
-	}
-
-	if (!GConfig->GetString(TEXT("OnlineSubsystemGoogle"), TEXT("ServerClientId"), ServerClientId, GEngineIni))
-	{
-		UE_LOG(LogOnline, Warning, TEXT("Missing ServerClientId= in [OnlineSubsystemGoogle] of DefaultEngine.ini"));
-	}
 }
 
 FOnlineSubsystemGoogleCommon::~FOnlineSubsystemGoogleCommon()
@@ -42,6 +27,46 @@ FOnlineSubsystemGoogleCommon::~FOnlineSubsystemGoogleCommon()
 
 bool FOnlineSubsystemGoogleCommon::Init()
 {
+	static FString ConfigSection(TEXT("OnlineSubsystemGoogle"));
+	if (!GConfig->GetString(*ConfigSection, GOOGLE_CLIENTAUTH_ID, ClientId, GEngineIni))
+	{
+		UE_LOG(LogOnline, Warning, TEXT("Missing ClientId= in [%s] of DefaultEngine.ini"), *ConfigSection);
+	}
+
+	if (!GConfig->GetString(*ConfigSection, GOOGLE_SERVERAUTH_ID, ServerClientId, GEngineIni))
+	{
+		UE_LOG(LogOnline, Warning, TEXT("Missing ServerClientId= in [%s] of DefaultEngine.ini"), *ConfigSection);
+	}
+
+	FString ConfigOverride;
+	FGoogleAuthConfig NewConfig;
+	if (GetConfigurationDelegate().ExecuteIfBound(ConfigOverride, NewConfig))
+	{
+		if (!NewConfig.Backend.IsEmpty())
+		{
+			FString IniSection = ConfigSection + FString(TEXT(" ")) + NewConfig.Backend;
+			FPlatformMisc::LowLevelOutputDebugStringf(TEXT("FOnlineSubsystemGoogleCommon::Init IniSection:%s"), *IniSection);
+
+			FString NewClientAuthId;
+			if (GConfig->GetString(*IniSection, GOOGLE_CLIENTAUTH_ID, NewClientAuthId, GEngineIni) && !NewClientAuthId.IsEmpty())
+			{
+				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("FOnlineSubsystemGoogleCommon::Init ClientId:%s"), *NewClientAuthId);
+				ClientId = NewClientAuthId;
+			}
+
+			FString NewServerAuthId;
+			if (GConfig->GetString(*IniSection, GOOGLE_SERVERAUTH_ID, NewServerAuthId, GEngineIni) && !NewServerAuthId.IsEmpty())
+			{
+				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("FOnlineSubsystemGoogleCommon::Init ServerClientId:%s"), *NewServerAuthId);
+				ServerClientId = NewServerAuthId;
+			}
+		}
+	}
+	else
+	{
+		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("GetConfigurationDelegate was not bound!"));
+	}
+
 	return true;
 }
 
@@ -66,6 +91,12 @@ bool FOnlineSubsystemGoogleCommon::Shutdown()
 	return true;
 }
 
+FOnlineSubsystemGoogleCommon::FGoogleConfigurationDelegate& FOnlineSubsystemGoogleCommon::GetConfigurationDelegate()
+{
+	static FGoogleConfigurationDelegate Delegate;
+	return Delegate;
+}
+
 bool FOnlineSubsystemGoogleCommon::Tick(float DeltaTime)
 {
 	if (!FOnlineSubsystemImpl::Tick(DeltaTime))
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleTypes.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleTypes.h
index c0bf3fdc38e2..cca4ca9b60dc 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/OnlineSubsystemGoogleTypes.h
@@ -11,6 +11,8 @@ class FAuthTokenGoogle;
 @class GIDGoogleUser;
 #endif
 
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdGoogle, GOOGLE_SUBSYSTEM);
 
 /**
  * Types of supported auth tokens
@@ -45,7 +47,9 @@ private:
 	{
 
 	public:
+		/** Algorithm used to sign the token */
 		FString Alg;
+		/** Key Id */
 		FString Kid;
 		BEGIN_ONLINE_JSON_SERIALIZER
 			ONLINE_JSON_SERIALIZE("alg", Alg);
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineExternalUIInterfaceGoogleRest.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineExternalUIInterfaceGoogleRest.cpp
index ac8e6894a948..b61fe587113a 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineExternalUIInterfaceGoogleRest.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineExternalUIInterfaceGoogleRest.cpp
@@ -11,13 +11,11 @@
 #define GOOGLE_ACCESS_TOKEN TEXT("code")
 #define GOOGLE_ERRORCODE_TOKEN TEXT("error")
 #define GOOGLE_ERRORCODE_DENY TEXT("access_denied")
-#define LOGIN_ERROR_CANCEL TEXT("com.epicgames.login.canceled")
-#define LOGIN_ERROR_UNKNOWN TEXT("com.epicgames.login.unknown")
-
 
 bool FOnlineExternalUIGoogle::ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate)
 {
 	bool bStarted = false;
+	FString ErrorStr;
 	if (ControllerIndex >= 0 && ControllerIndex < MAX_LOCAL_PLAYERS)
 	{
 		FOnlineIdentityGooglePtr IdentityInt = StaticCastSharedPtr<FOnlineIdentityGoogle>(GoogleSubsystem->GetIdentityInterface());
@@ -33,14 +31,31 @@ bool FOnlineExternalUIGoogle::ShowLoginUI(const int ControllerIndex, bool bShowO
 				TriggerOnLoginFlowUIRequiredDelegates(RequestedURL, OnRedirectURLDelegate, OnExternalLoginFlowCompleteDelegate, bShouldContinueLoginFlow);
 				bStarted = bShouldContinueLoginFlow;
 			}
+			else
+			{
+				ErrorStr = TEXT("ShowLoginUI: Url Details not properly configured");
+			}
 		}
+		else
+		{
+			ErrorStr = TEXT("ShowLoginUI: Missing identity interface");
+		}
+	}
+	else
+	{
+		ErrorStr = FString::Printf(TEXT("ShowLoginUI: Invalid controller index (%d)"), ControllerIndex);
 	}
 
 	if (!bStarted)
 	{
-		GoogleSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		UE_LOG_ONLINE(Warning, TEXT("%s"), *ErrorStr);
+
+		FOnlineError Error;
+		Error.SetFromErrorCode(MoveTemp(ErrorStr));
+
+		GoogleSubsystem->ExecuteNextTick([ControllerIndex, Delegate, Error = MoveTemp(Error)]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, FOnlineError(false));
 		});
 	}
 
@@ -104,9 +119,9 @@ FLoginFlowResult FOnlineExternalUIGoogle::OnLoginRedirectURL(const FString& Redi
 							{
 								if (*ErrorCode == GOOGLE_ERRORCODE_DENY)
 								{
-									Result.Error.ErrorRaw = LOGIN_ERROR_CANCEL;
-									Result.Error.ErrorMessage = FText::FromString(LOGIN_ERROR_CANCEL);
-									Result.Error.ErrorCode = TEXT("-1");
+									Result.Error.ErrorRaw = LOGIN_CANCELLED;
+									Result.Error.ErrorMessage = FText::FromString(LOGIN_CANCELLED);
+									Result.Error.ErrorCode = LOGIN_CANCELLED;
 									Result.Error.ErrorMessage = NSLOCTEXT("GoogleAuth", "GoogleAuthDeny", "Google Auth Denied");
 									Result.Error.NumericErrorCode = -1;
 								}
@@ -125,7 +140,7 @@ FLoginFlowResult FOnlineExternalUIGoogle::OnLoginRedirectURL(const FString& Redi
 								// Set some default in case parsing fails
 								Result.Error.ErrorRaw = LOGIN_ERROR_UNKNOWN;
 								Result.Error.ErrorMessage = FText::FromString(LOGIN_ERROR_UNKNOWN);
-								Result.Error.ErrorCode = TEXT("-2");
+								Result.Error.ErrorCode = LOGIN_ERROR_UNKNOWN;
 								Result.Error.NumericErrorCode = -2;
 							}
 						}
@@ -160,9 +175,10 @@ void FOnlineExternalUIGoogle::OnExternalLoginFlowComplete(const FLoginFlowResult
 
 	if (!bStarted)
 	{
-		GoogleSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		FOnlineError LoginFlowError = Result.Error;
+		GoogleSubsystem->ExecuteNextTick([ControllerIndex, LoginFlowError, Delegate]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, LoginFlowError);
 		});
 	}
 }
@@ -170,9 +186,9 @@ void FOnlineExternalUIGoogle::OnExternalLoginFlowComplete(const FLoginFlowResult
 void FOnlineExternalUIGoogle::OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& Error, FOnLoginUIClosedDelegate Delegate)
 {
 	TSharedPtr<const FUniqueNetId> StrongUserId = UserId.AsShared();
-	GoogleSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, Delegate]()
+	GoogleSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, bWasSuccessful, Delegate]()
 	{
-		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum);
+		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum, FOnlineError(bWasSuccessful));
 	});
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.cpp b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.cpp
index 0ca082f8ebcf..8fe533f2ba01 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.cpp
@@ -169,10 +169,10 @@ void FOnlineIdentityGoogle::OnAccessTokenLoginComplete(int32 LocalUserNum, bool
 	OnLoginAttemptComplete(LocalUserNum, Error);
 }
 
-void FOnlineIdentityGoogle::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex)
+void FOnlineIdentityGoogle::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error)
 {
-	FString ErrorStr;
-	bool bWasSuccessful = UniqueId.IsValid() && UniqueId->IsValid();
+	const FString& ErrorStr = Error.ErrorCode;
+	const bool bWasSuccessful = Error.WasSuccessful() && UniqueId.IsValid() && UniqueId->IsValid();
 	OnAccessTokenLoginComplete(ControllerIndex, bWasSuccessful, bWasSuccessful ? *UniqueId : GetEmptyUniqueId(), ErrorStr);
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.h
index 5a5548028f3d..418ffab58d38 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Private/Rest/OnlineIdentityGoogleRest.h
@@ -201,7 +201,7 @@ private:
 	/**
 	 * Delegate fired when the call to ShowLoginUI completes 
 	 */
-	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex);
+	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error);
 
 };
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Public/OnlineSubsystemGoogleCommon.h b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Public/OnlineSubsystemGoogleCommon.h
index 8b1b14e37b31..f8432efff94e 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Public/OnlineSubsystemGoogleCommon.h
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/Public/OnlineSubsystemGoogleCommon.h
@@ -11,6 +11,22 @@
 typedef TSharedPtr<class FOnlineIdentityGoogleCommon, ESPMode::ThreadSafe> FOnlineIdentityGoogleCommonPtr;
 typedef TSharedPtr<class FOnlineExternalUIGoogleCommon, ESPMode::ThreadSafe> FOnlineExternalUIGoogleCommonPtr;
 
+/**
+ * Configuration structure for overriding auth id parameters required by Google
+ */
+class FGoogleAuthConfig
+{
+public:
+	FGoogleAuthConfig() {}
+
+	/** 
+	 * Backend Name
+	 *
+	 * Added to [OnlineSubsystemGoogle <Backend>] to search the ini for specific overrides
+	 */
+	FString Backend;
+};
+
 /**
  *	OnlineSubsystemGoogleCommon - Implementation of the online subsystem for Google services
  */
@@ -61,12 +77,24 @@ public:
 	 */
 	virtual ~FOnlineSubsystemGoogleCommon();
 
+	/**
+	 * Delegate fired at initialization allowing the application to override the configuration parameters 
+	 *
+	 * @param ConfigOverride unused
+	 * @param OutConfig config parameters needed to be filled in in order to override the default engine ini settings
+	 */
+	DECLARE_DELEGATE_TwoParams(FGoogleConfigurationDelegate, const FString& /*ConfigOverride*/, FGoogleAuthConfig& /*OutConfig*/);
+	static FOnlineSubsystemGoogleCommon::FGoogleConfigurationDelegate& GetConfigurationDelegate();
+
 PACKAGE_SCOPE:
 
 	/** Only the factory makes instances */
 	FOnlineSubsystemGoogleCommon();
 	FOnlineSubsystemGoogleCommon(FName InInstanceName);
 
+	/** @return the backend server client id */
+	FString GetClientId() const { return ClientId; }
+
 	/** @return the backend server client id */
 	FString GetServerClientId() const { return ServerClientId; }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/Android/Java/GoogleLogin.java b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/Android/Java/GoogleLogin.java
index 13ab49f7ce33..0eabb04687a7 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/Android/Java/GoogleLogin.java
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/Android/Java/GoogleLogin.java
@@ -11,53 +11,54 @@ import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Base64;
 
-import com.google.android.gms.auth.api.Auth;
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
-import com.google.android.gms.auth.api.signin.GoogleSignInResult;
-import com.google.android.gms.auth.api.signin.GoogleSignInStatusCodes;
+import com.google.android.gms.common.api.Result;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.OptionalPendingResult;
-import com.google.android.gms.common.api.ResultCallback;
-import com.google.android.gms.common.api.Status;
+import com.google.android.gms.auth.api.signin.GoogleSignIn;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInClient;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInStatusCodes;
+import com.google.android.gms.common.api.ApiException;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
 
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-public class GoogleLogin implements
-		GoogleApiClient.OnConnectionFailedListener
+public class GoogleLogin
 {
 	/** Responses supported by this class */
 	public static final int GOOGLE_RESPONSE_OK = 0;
 	public static final int GOOGLE_RESPONSE_CANCELED = 1;
 	public static final int GOOGLE_RESPONSE_ERROR = 2;
+	public static final int GOOGLE_RESPONSE_DEVELOPER_ERROR = 3;
 
 	/** Debug output tag */
 	private static final String TAG = "UE4-GOOGLE";
 
-	/** Key to save in bundle when restoring state */
-	private static final String STATE_RESOLVING_ERROR = "resolving_error";
-	// Request code to use when launching the resolution activity
-	private static final int REQUEST_RESOLVE_ERROR = 1001;
-	// Bool to track whether the app is already resolving an error
-	private boolean bResolvingError = false;
-
 	// Output device for log messages.
 	private Logger GoogleLog;
 	private Logger ActivityLog;
 
+	/** Is this a shipping build */
+	boolean bShippingBuild = false;
+	/** Has init been called succesfully */
+	public boolean bInitialized = false;
+	/** Has onStart() been called */
+	public boolean bStarted = false;
+
 	/**
 	 * Activity needed here to send the signal back when user successfully logged in.
 	 */
 	private GameActivity activity;
 
+	/** Name of game package */
+	private String packageName;
 	/** Android key from Google API dashboard */
 	private String clientId;
 	/** Backend server key from Google API dashboard */
@@ -65,25 +66,21 @@ public class GoogleLogin implements
 	/** Unique request id when using sign in activity */
 	private static final int REQUEST_SIGN_IN = 9001;
 	/** Google API client needed for actual sign in */
-	private GoogleApiClient mGoogleApiClient;
-	/** Callbacks for handling Google sign in behavior */
-	private GoogleApiClient.ConnectionCallbacks connectionCallbacks;
-	/** Connection status */
-	private boolean bConnected = false;
+	private GoogleSignInClient mGoogleSignInClient;
 
-	public GoogleLogin(GameActivity activity, final Logger InLog) 
+	public GoogleLogin(GameActivity activity, final Logger InLog, String inPackageName, String BuildConfiguration) 
 	{
 		this.activity = activity;
 
 		GoogleLog = new Logger(TAG);
 		ActivityLog = InLog;
+
+		packageName = inPackageName;
+		bShippingBuild = BuildConfiguration.equals("Shipping");
 	} 
 
-	public boolean init(String inPackageName, String BuildConfiguration, String inClientId, String inServerClientId, Bundle savedInstanceState)
+	public boolean init(String inClientId, String inServerClientId)
 	{
-		boolean bInitSuccess = false;
-		boolean bShippingBuild = BuildConfiguration.equals("Shipping");
-
 		if (bShippingBuild)
 		{
 			GoogleLog.SuppressLogs();
@@ -99,19 +96,12 @@ public class GoogleLogin implements
 			GoogleLog.debug("Is Google Play Services Available:" + bIsAvailable);
 			if (bIsAvailable)
 			{
-				PrintGoogleServiceSettings();
-
-				bResolvingError = savedInstanceState != null &&
-					savedInstanceState.getBoolean(STATE_RESOLVING_ERROR, false);
-
-				GoogleLog.debug("inPackageName: " + inPackageName);
+				GoogleLog.debug("packageName: " + packageName);
 				clientId = inClientId;
 				GoogleLog.debug("GoogleSignIn clientId:" + clientId);
 				serverClientId = inServerClientId;
 				GoogleLog.debug("GoogleSignIn serverClientId:" + serverClientId);
 
-				connectionCallbacks = getConnectionCallbacks();
-
 				// Configure sign-in to request the user's ID, email address, and basic
 				// profile. ID and basic profile are included in DEFAULT_SIGN_IN.
 				GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
@@ -121,18 +111,11 @@ public class GoogleLogin implements
 						.requestEmail()
 						.build();
 
-				// Build a GoogleApiClient with access to the Google Sign-In API and the
-				// options specified by gso.
-				mGoogleApiClient = new GoogleApiClient.Builder(activity)
-						//.enableAutoManage(activity /* FragmentActivity */, this /* OnConnectionFailedListener */)
-						.addConnectionCallbacks(connectionCallbacks)
-						.addOnConnectionFailedListener(this)
-						.addApi(Auth.GOOGLE_SIGN_IN_API, gso)
-						.build();
-
-				PrintGoogleAPIState();
-				PrintKeyHash(inPackageName);
-				bInitSuccess = true;
+				// Build a GoogleSignInClient with the options specified by gso.
+				mGoogleSignInClient = GoogleSignIn.getClient(activity, gso);
+				
+				bInitialized = true;
+				PrintKeyHash(packageName);
 			}
 		}
 		else
@@ -140,108 +123,42 @@ public class GoogleLogin implements
 			GoogleLog.debug("clientId: " + inClientId + " or serverClientId: " + inServerClientId + " is invalid");
 		}
 
-		return bInitSuccess;
+		GoogleLog.debug("init complete: " + bInitialized);
+		return bInitialized;
 	}
 
 	public void onStart()
 	{
 		GoogleLog.debug("onStart");
-		mGoogleApiClient.connect();
-		PrintGoogleAPIState();
-
-		OptionalPendingResult<GoogleSignInResult> opr = Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient);
-		if (opr.isDone()) {
-			// If the user's cached credentials are valid, the OptionalPendingResult will be "done"
-			// and the GoogleSignInResult will be available instantly.
-			GoogleLog.debug("Got cached sign-in");
-			GoogleSignInResult result = opr.get();
-			handleSignInResult(result);
-		} else {
-			// If the user has not previously signed in on this device or the sign-in has expired,
-			// this asynchronous branch will attempt to sign in the user silently.  Cross-device
-			// single sign-on will occur in this branch.
-			opr.setResultCallback(new ResultCallback<GoogleSignInResult>() {
-				@Override
-				public void onResult(GoogleSignInResult googleSignInResult) {
-					GoogleLog.debug("Sign-in callback");
-					handleSignInResult(googleSignInResult);
-				}
-			});
-		}
-
-		PrintGoogleAPIState();
+		bStarted = true;
 	}
 
 	public void onStop()
 	{
 		GoogleLog.debug("onStop");
-		mGoogleApiClient.disconnect();
-	}
-
-	public void onSaveInstanceState(Bundle outState)
-	{
-		GoogleLog.debug("onSaveInstanceState");
-		outState.putBoolean(STATE_RESOLVING_ERROR, bResolvingError);
 	}
 
 	public void onDestroy()
 	{
 		GoogleLog.debug("onDestroy");
-		//mGoogleApiClient.unregisterConnectionCallbacks(connectionCallbacks);
-	}
-
-	private GoogleApiClient.ConnectionCallbacks getConnectionCallbacks()
-	{
-		return new GoogleApiClient.ConnectionCallbacks()
-		{
-			@Override
-			public void onConnected(Bundle connectionHint)
-			{
-				bConnected = true;
-				if (connectionHint != null) {
-					GoogleLog.debug("onConnected " + connectionHint.toString());
-				}
-				else
-				{
-					GoogleLog.debug("onConnected null bundle");
-				}
-			}
-			@Override
-			public void onConnectionSuspended(int cause)
-			{
-				// CAUSE_SERVICE_DISCONNECTED
-				// CAUSE_NETWORK_LOST;
-				GoogleLog.debug("onConnectionSuspended " + cause);
-				bConnected = false;
-			}
-		};
 	}
 
 	public int login(String[] ScopeFields)
 	{
 		GoogleLog.debug("login:" + ScopeFields.toString());
-		PrintGoogleAPIState();
 
 		int resultCode = GOOGLE_RESPONSE_ERROR;
-		if (!mGoogleApiClient.isConnecting()) 
+
+		Intent signInIntent = mGoogleSignInClient.getSignInIntent();
+		if (signInIntent != null)
 		{
-			GoogleLog.debug("login intent:");
-			Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
-			if (signInIntent != null)
-			{
-				GoogleLog.debug("login start activity:");
-				activity.startActivityForResult(signInIntent, REQUEST_SIGN_IN);
-				resultCode = GOOGLE_RESPONSE_OK;
-			} 
-			else 
-			{
-				GoogleLog.debug("getSignInIntent failure:");
-				nativeLoginComplete(GOOGLE_RESPONSE_ERROR, "");
-			}
-		}
-		else
+			GoogleLog.debug("login start activity:");
+			activity.startActivityForResult(signInIntent, REQUEST_SIGN_IN);
+			resultCode = GOOGLE_RESPONSE_OK;
+		} 
+		else 
 		{
-			GoogleLog.debug("onSignIn: still connecting");
+			GoogleLog.debug("getSignInIntent failure:");
 			nativeLoginComplete(GOOGLE_RESPONSE_ERROR, "");
 		}
 
@@ -251,31 +168,20 @@ public class GoogleLogin implements
 	public int logout()
 	{
 		GoogleLog.debug("logout");
-		PrintGoogleAPIState();
 
-		int resultCode = GOOGLE_RESPONSE_ERROR;
-		if (!mGoogleApiClient.isConnecting()) 
-		{
-			GoogleLog.debug("calling signout");
-			Auth.GoogleSignInApi.signOut(mGoogleApiClient).setResultCallback(
-				new ResultCallback<Status>() 
+		mGoogleSignInClient.signOut()
+			.addOnCompleteListener(activity, new OnCompleteListener<Void>()
+			{
+				@Override
+				public void onComplete(@NonNull Task<Void> task) 
 				{
-					@Override
-					public void onResult(Status status) 
-					{
-						GoogleLog.debug("onSignOut Complete" + status + " " + status.getStatusMessage());
-						nativeLogoutComplete(GOOGLE_RESPONSE_OK);
-					}
-				});
-			resultCode = GOOGLE_RESPONSE_OK;
-		}
-		else
-		{
-			GoogleLog.debug("onSignOut: still connecting");
-			nativeLogoutComplete(GOOGLE_RESPONSE_ERROR);
-		}
+					boolean bWasSuccessful = task.isSuccessful();
+					GoogleLog.debug("onSignOut Complete success:" + bWasSuccessful);
+					nativeLogoutComplete(bWasSuccessful ? GOOGLE_RESPONSE_OK : GOOGLE_RESPONSE_ERROR);
+				}
+			});
 
-		return resultCode;
+		return GOOGLE_RESPONSE_OK;
 	}
 
 	public void onActivityResult(int requestCode, int resultCode, Intent data) 
@@ -285,119 +191,41 @@ public class GoogleLogin implements
 		if (requestCode == REQUEST_SIGN_IN) 
 		{
 			GoogleLog.debug("onActivityResult REQUEST_SIGN_IN");
+			GoogleLog.debug("data: " + ((data != null) ? data.toString() : "null"));
+
 			if (resultCode == Activity.RESULT_OK)
 			{
 				GoogleLog.debug("signing in");
 			}
 
-			GoogleLog.debug("data: " + ((data != null) ? data.toString() : "null"));
-
-			GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
-			if (result != null)
+			Task<GoogleSignInAccount> completedTask = GoogleSignIn.getSignedInAccountFromIntent(data);
+			try
 			{
-				handleSignInResult(result);
-
-				GoogleLog.debug("onActivityResult result:" + result.isSuccess());
-				GoogleLog.debug("result:" + result.toString());
-				if (result.isSuccess()) 
+				// Try to access the account result
+				GoogleSignInAccount account = completedTask.getResult(ApiException.class);
+				
+				// Signed in successfully
+				GoogleLog.debug("Sign in success");
+				PrintUserAccountInfo(account);
+				nativeLoginComplete(GOOGLE_RESPONSE_OK, getLoginJsonStr(account));
+			}
+			catch (ApiException e)
+			{
+				// The ApiException status code indicates the detailed failure reason.
+				// Please refer to the GoogleSignInStatusCodes class reference for more information.
+				GoogleLog.debug("Sign in failure:" + GoogleSignInStatusCodes.getStatusCodeString(e.getStatusCode()));
+				if (e.getStatusCode() == GoogleSignInStatusCodes.DEVELOPER_ERROR)
 				{
-					// Signed in successfully...
-					GoogleSignInAccount acct = result.getSignInAccount();
-					nativeLoginComplete(GOOGLE_RESPONSE_OK, getLoginJsonStr(acct));
-				} 
-				else 
+					nativeLoginComplete(GOOGLE_RESPONSE_DEVELOPER_ERROR, "");
+				}
+				else
 				{
-					// Signed out
-					Status myStatus = result.getStatus();
-					GoogleLog.debug("Code:" + GoogleSignInStatusCodes.getStatusCodeString(myStatus.getStatusCode()));
-					GoogleLog.debug("Message:" + myStatus.getStatusMessage());
 					nativeLoginComplete(GOOGLE_RESPONSE_ERROR, "");
 				}
 			}
-			else
-			{
-				GoogleLog.debug("onActivityResult result is null");
-				nativeLoginComplete(GOOGLE_RESPONSE_ERROR, "");
-			}
+
 			GoogleLog.debug("onActivityResult end");
 		}
-
-		if (requestCode == REQUEST_RESOLVE_ERROR) 
-		{
-			bResolvingError = false;
-			if (resultCode == Activity.RESULT_OK)
-			{
-				// Make sure the app is not already connected or attempting to connect
-				if (!mGoogleApiClient.isConnecting() && !mGoogleApiClient.isConnected())
-				{
-					mGoogleApiClient.connect();
-				}
-			}
-		}
-	}
-
-	public void onConnectionFailed(ConnectionResult connectionResult) 
-	{
-		// An unresolvable error has occurred and Google APIs (including Sign-In) will not
-		// be available.
-		GoogleLog.debug("onConnectionFailed:" + connectionResult);
-		//PendingIntent signInIntent = connectionResult.getResolution();
-
-		if (bResolvingError)
-		{
-			// Already attempting to resolve an error.
-			GoogleLog.debug("already resolving");
-			return;
-		} 
-		else if (connectionResult.hasResolution())
-		{
-			try 
-			{
-				GoogleLog.debug("start resolving");
-				bResolvingError = true;
-				connectionResult.startResolutionForResult(activity, REQUEST_RESOLVE_ERROR);
-			} 
-			catch (IntentSender.SendIntentException e)
-			{
-				// There was an error with the resolution intent. Try again.
-				GoogleLog.debug("error resolving");
-				mGoogleApiClient.connect();
-			}
-		} 
-		else 
-		{
-			// Show dialog using GoogleApiAvailability.getErrorDialog()
-			//showErrorDialog(connectionResult.getErrorCode());
-			GoogleLog.debug("no resolution");
-			bResolvingError = true;
-		}
-	}
-
-	private void handleSignInResult(GoogleSignInResult result) 
-	{
-		if (result != null)
-		{
-			GoogleLog.debug("handleSignInResult:" + result.isSuccess());
-			if (result.isSuccess()) 
-			{
-				// Signed in successfully, show authenticated UI.
-				GoogleSignInAccount acct = result.getSignInAccount();
-				PrintUserAccountInfo(acct);
-				//nativeLoginComplete(GOOGLE_RESPONSE_OK, getLoginJsonStr(acct));
-			} 
-			else 
-			{
-				// Signed out
-				Status myStatus = result.getStatus();
-				GoogleLog.debug("Code:" + GoogleSignInStatusCodes.getStatusCodeString(myStatus.getStatusCode()));
-				GoogleLog.debug("Message:" + myStatus.getStatusMessage());
-				//nativeLoginComplete(GOOGLE_RESPONSE_ERROR, "");
-			}
-		}
-		else
-		{
-			GoogleLog.debug("handleSignInResult: result is null");
-		}
 	}
 
 	private String getLoginJsonStr(GoogleSignInAccount acct)
@@ -435,57 +263,24 @@ public class GoogleLogin implements
 		return "";
 	}
 
-	public void PrintGoogleAPIState()
-	{
-		boolean bEnabled = false;
-		if (bEnabled)
-		{
-			PrintWriter printWriter = new PrintWriter(System.out, true);
-			GoogleLog.debug("--------------------------------------");
-			mGoogleApiClient.dumpAll(TAG, FileDescriptor.out, printWriter, null);
-			GoogleLog.debug("Connected: " + mGoogleApiClient.isConnected() + " Connecting: " + mGoogleApiClient.isConnecting());
-			GoogleLog.debug("--------------------------------------");
-		}
-	}
-
-	private String GetResourceById(String resourceName, Resources resources, String packageName)
-	{
-		try
-		{
-			int resourceId = resources.getIdentifier(resourceName, "string", packageName);
-			return activity.getString(resourceId);
-		}
-		catch (Exception e) {
-			GoogleLog.debug("Resource: " + resourceName + " is not found!");
-			return "";
-		} 
-	}
-
-	public void PrintGoogleServiceSettings()
-	{
-		String packageName = activity.getPackageName();
-		Resources resources = activity.getResources();
-
-		GoogleLog.debug("--------------------------------------");
-		GoogleLog.debug("default_web_client_id:" + GetResourceById("default_web_client_id", resources, packageName));
-		GoogleLog.debug("gcm_defaultSenderId:" + GetResourceById("gcm_defaultSenderId", resources, packageName));
-		GoogleLog.debug("google_api_key:" + GetResourceById("google_api_key", resources, packageName));
-		GoogleLog.debug("google_app_id:" + GetResourceById("google_app_id", resources, packageName));
-		GoogleLog.debug("google_crash_reporting_api_key:" + GetResourceById("google_crash_reporting_api_key", resources, packageName));
-		GoogleLog.debug("--------------------------------------");
-	}
-
 	public void PrintUserAccountInfo(GoogleSignInAccount acct)
 	{
-		GoogleLog.debug("User Details:");
-		GoogleLog.debug("    DisplayName:" + acct.getDisplayName());
-		GoogleLog.debug("    Id:" + acct.getId());
-		GoogleLog.debug("    Email:" + acct.getEmail());
-		// 10.2.0 GoogleLog.debug("    Account:" + acct.getAccount().toString());
-
-		GoogleLog.debug("    Scopes:" + acct.getGrantedScopes());
-		GoogleLog.debug("    IdToken:" + acct.getIdToken());
-		GoogleLog.debug("    ServerAuthCode:" + acct.getServerAuthCode());
+		GoogleLog.debug("PrintUserAccountInfo");
+		if (acct != null)
+		{
+			GoogleLog.debug("User Details:");
+			GoogleLog.debug("    DisplayName:" + acct.getDisplayName());
+			GoogleLog.debug("    Id:" + acct.getId());
+			GoogleLog.debug("    Email:" + acct.getEmail());
+			GoogleLog.debug("    Account:" + acct.getAccount().toString());
+			GoogleLog.debug("    Scopes:" + acct.getGrantedScopes());
+			GoogleLog.debug("    IdToken:" + acct.getIdToken());
+			GoogleLog.debug("    ServerAuthCode:" + acct.getServerAuthCode());
+		}
+		else
+		{
+			GoogleLog.debug("Account is null");
+		}
 	}
 
 	private boolean isGooglePlayServicesAvailable() 
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/CHANGELOG.md b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/CHANGELOG.md
index 27f48e9da765..3eac8ae9cb91 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/CHANGELOG.md
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 2018-1-8 -- v4.1.2
+- Add `pod try` support for the GoogleSignIn CocoaPod.
+
+# 2017-10-17 -- v4.1.1
+- Fixes an issue that `GIDSignInUIDelegate`'s `signInWillDispatch:error:` was
+  not called on iOS 11. Please note that it is intended that neither
+  `signIn:presentViewController:` nor `signIn:dimissViewController:` is called
+  on iOS 11 because SFAuthenticationSession is not presented by the app's view
+  controller.
+
+# 2017-09-13 -- v4.1.0
+- Uses SFAuthenticationSession on iOS 11.
+
+# 2017-02-06 -- v4.0.2
+- No longer depends on GoogleAppUtilities.
+
 # 2016-10-24 -- v4.0.1
 - Switches to open source pod dependencies.
 - Appearance of sign-in button no longer depends on requested scopes.
diff --git a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/README.md b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/README.md
index 68c6c579cb87..4418b6649003 100644
--- a/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/README.md
+++ b/Engine/Plugins/Online/OnlineSubsystemGoogle/Source/ThirdParty/IOS/README.md
@@ -3,6 +3,16 @@
 The Google Sign-In SDK allows users to sign in with their Google account from
 third-party apps.
 
-Please visit [our developer
-site](https://developers.google.com/identity/sign-in/ios/) for integration
-instructions, documentation, support information, and terms of service.
+Please visit [our developer site](https://developers.google.com/identity/sign-in/ios/)
+for integration instructions, documentation, support information, and terms of
+service.
+
+## Getting Started
+
+* Try our example app with:
+  ```
+  $ pod try GoogleSignIn
+  ```
+  and follow the directions [here](https://developers.google.com/identity/sign-in/ios/start).
+* Read our [getting started guides](https://developers.google.com/identity/sign-in/ios/start-integrating).
+* Take a look at the [API reference](https://developers.google.com/identity/sign-in/ios/api/).
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/NboSerializerNull.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/NboSerializerNull.h
index 52e4dd896484..07fb3978b8fc 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/NboSerializerNull.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/NboSerializerNull.h
@@ -39,7 +39,7 @@ public:
 	/**
 	 * Adds Null Unique Id to the buffer
 	 */
-	friend inline FNboSerializeToBufferNull& operator<<(FNboSerializeToBufferNull& Ar, const FUniqueNetIdString& UniqueId)
+	friend inline FNboSerializeToBufferNull& operator<<(FNboSerializeToBufferNull& Ar, const FUniqueNetIdNull& UniqueId)
 	{
 		Ar << UniqueId.UniqueNetIdStr;
 		return Ar;
@@ -75,7 +75,7 @@ public:
 	/**
 	 * Reads Null Unique Id from the buffer
 	 */
-	friend inline FNboSerializeFromBufferNull& operator>>(FNboSerializeFromBufferNull& Ar, FUniqueNetIdString& UniqueId)
+	friend inline FNboSerializeFromBufferNull& operator>>(FNboSerializeFromBufferNull& Ar, FUniqueNetIdNull& UniqueId)
 	{
 		Ar >> UniqueId.UniqueNetIdStr;
 		return Ar;
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.cpp b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.cpp
index 4a5d511461ed..32bf14ea994f 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.cpp
@@ -2,6 +2,7 @@
 
 #include "OnlineAchievementsInterfaceNull.h"
 #include "OnlineSubsystem.h"
+#include "OnlineSubsystemNullTypes.h"
 
 FOnlineAchievementsNull::FOnlineAchievementsNull(class FOnlineSubsystemNull* InSubsystem)
 	:	NullSubsystem(InSubsystem)
@@ -30,7 +31,7 @@ void FOnlineAchievementsNull::WriteAchievements(const FUniqueNetId& PlayerId, FO
 		return;
 	}
 
-	FUniqueNetIdString NullId(PlayerId);
+	FUniqueNetIdNull NullId(PlayerId);
 	const TArray<FOnlineAchievement> * PlayerAch = PlayerAchievements.Find(NullId);
 	if (NULL == PlayerAch)
 	{
@@ -68,7 +69,7 @@ void FOnlineAchievementsNull::QueryAchievements( const FUniqueNetId& PlayerId, c
 		return;
 	}
 
-	FUniqueNetIdString NullId(PlayerId);
+	FUniqueNetIdNull NullId(PlayerId);
 	if (!PlayerAchievements.Find(NullId))
 	{
 		// copy for a new player
@@ -117,7 +118,7 @@ EOnlineCachedResult::Type FOnlineAchievementsNull::GetCachedAchievement(const FU
 		return EOnlineCachedResult::NotFound;
 	}
 
-	FUniqueNetIdString NullId(PlayerId);
+	FUniqueNetIdNull NullId(PlayerId);
 	const TArray<FOnlineAchievement> * PlayerAch = PlayerAchievements.Find(NullId);
 	if (NULL == PlayerAch)
 	{
@@ -147,7 +148,7 @@ EOnlineCachedResult::Type FOnlineAchievementsNull::GetCachedAchievements(const F
 		return EOnlineCachedResult::NotFound;
 	}
 
-	FUniqueNetIdString NullId(PlayerId);
+	FUniqueNetIdNull NullId(PlayerId);
 	const TArray<FOnlineAchievement> * PlayerAch = PlayerAchievements.Find(NullId);
 	if (NULL == PlayerAch)
 	{
@@ -194,7 +195,7 @@ bool FOnlineAchievementsNull::ResetAchievements(const FUniqueNetId& PlayerId)
 		return false;
 	}
 
-	FUniqueNetIdString NullId(PlayerId);
+	FUniqueNetIdNull NullId(PlayerId);
 	TArray<FOnlineAchievement> * PlayerAch = PlayerAchievements.Find(NullId);
 	if (NULL == PlayerAch)
 	{
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.h
index 47617caf265d..f1e862036bad 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineAchievementsInterfaceNull.h
@@ -7,6 +7,7 @@
 #include "Misc/ConfigCacheIni.h"
 #include "Interfaces/OnlineAchievementsInterface.h"
 #include "OnlineSubsystemNullPackage.h"
+#include "OnlineSubsystemNullTypes.h"
 
 /**
  *	IOnlineAchievements - Interface class for acheivements
@@ -89,7 +90,7 @@ private:
 	FOnlineAchievementsNull() {};
 
 	/** Mapping of players to their achievements */
-	TMap<FUniqueNetIdString, TArray<FOnlineAchievement>> PlayerAchievements;
+	TMap<FUniqueNetIdNull, TArray<FOnlineAchievement>> PlayerAchievements;
 
 	/** Cached achievement descriptions for an Id */
 	TMap<FString, FOnlineAchievementDesc> AchievementDescriptions;
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.cpp b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.cpp
index 0d6f8f711e58..69cc4acd65b2 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.cpp
@@ -86,7 +86,7 @@ bool FOnlineIdentityNull::Login(int32 LocalUserNum, const FOnlineAccountCredenti
 		{
 			FString RandomUserId = GenerateRandomUserId(LocalUserNum);
 
-			FUniqueNetIdString NewUserId(RandomUserId);
+			FUniqueNetIdNull NewUserId(RandomUserId);
 			UserAccountPtr = MakeShareable(new FUserOnlineAccountNull(RandomUserId));
 			UserAccountPtr->UserAttributes.Add(USER_ATTR_ID, RandomUserId);
 
@@ -98,7 +98,7 @@ bool FOnlineIdentityNull::Login(int32 LocalUserNum, const FOnlineAccountCredenti
 		}
 		else
 		{
-			const FUniqueNetIdString* UniqueIdStr = (FUniqueNetIdString*)(UserId->Get());
+			const FUniqueNetIdNull* UniqueIdStr = (FUniqueNetIdNull*)(UserId->Get());
 			TSharedRef<FUserOnlineAccountNull>* TempPtr = UserAccounts.Find(*UniqueIdStr);
 			check(TempPtr);
 			UserAccountPtr = *TempPtr;
@@ -108,7 +108,7 @@ bool FOnlineIdentityNull::Login(int32 LocalUserNum, const FOnlineAccountCredenti
 	if (!ErrorStr.IsEmpty())
 	{
 		UE_LOG_ONLINE(Warning, TEXT("Login request failed. %s"), *ErrorStr);
-		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdString(), ErrorStr);
+		TriggerOnLoginCompleteDelegates(LocalUserNum, false, FUniqueNetIdNull(), ErrorStr);
 		return false;
 	}
 
@@ -122,7 +122,7 @@ bool FOnlineIdentityNull::Logout(int32 LocalUserNum)
 	if (UserId.IsValid())
 	{
 		// remove cached user account
-		UserAccounts.Remove(FUniqueNetIdString(*UserId));
+		UserAccounts.Remove(FUniqueNetIdNull(*UserId));
 		// remove cached user id
 		UserIds.Remove(LocalUserNum);
 		// not async but should call completion delegate anyway
@@ -181,7 +181,7 @@ TSharedPtr<FUserOnlineAccount> FOnlineIdentityNull::GetUserAccount(const FUnique
 {
 	TSharedPtr<FUserOnlineAccount> Result;
 
-	FUniqueNetIdString StringUserId(UserId);
+	FUniqueNetIdNull StringUserId(UserId);
 	const TSharedRef<FUserOnlineAccountNull>* FoundUserAccount = UserAccounts.Find(StringUserId);
 	if (FoundUserAccount != NULL)
 	{
@@ -195,7 +195,7 @@ TArray<TSharedPtr<FUserOnlineAccount> > FOnlineIdentityNull::GetAllUserAccounts(
 {
 	TArray<TSharedPtr<FUserOnlineAccount> > Result;
 	
-	for (TMap<FUniqueNetIdString, TSharedRef<FUserOnlineAccountNull>>::TConstIterator It(UserAccounts); It; ++It)
+	for (TMap<FUniqueNetIdNull, TSharedRef<FUserOnlineAccountNull>>::TConstIterator It(UserAccounts); It; ++It)
 	{
 		Result.Add(It.Value());
 	}
@@ -218,14 +218,14 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityNull::CreateUniquePlayerId(uint8*
 	if (Bytes != NULL && Size > 0)
 	{
 		FString StrId(Size, (TCHAR*)Bytes);
-		return MakeShareable(new FUniqueNetIdString(StrId));
+		return MakeShareable(new FUniqueNetIdNull(StrId));
 	}
 	return NULL;
 }
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityNull::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShareable(new FUniqueNetIdString(Str));
+	return MakeShareable(new FUniqueNetIdNull(Str));
 }
 
 ELoginStatus::Type FOnlineIdentityNull::GetLoginStatus(int32 LocalUserNum) const
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.h
index 455132ad03d9..1cf92321ee78 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineIdentityNull.h
@@ -1,11 +1,12 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #pragma once
- 
+
 #include "CoreMinimal.h"
 #include "UObject/CoreOnline.h"
 #include "OnlineSubsystemTypes.h"
 #include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineSubsystemNullTypes.h"
 
 class FOnlineSubsystemNull;
 
@@ -34,7 +35,7 @@ public:
 	// FUserOnlineAccountNull
 
 	FUserOnlineAccountNull(const FString& InUserId=TEXT("")) 
-		: UserIdPtr(new FUniqueNetIdString(InUserId))
+		: UserIdPtr(new FUniqueNetIdNull(InUserId))
 	{ }
 
 	virtual ~FUserOnlineAccountNull()
@@ -105,7 +106,7 @@ private:
 	TMap<int32, TSharedPtr<const FUniqueNetId>> UserIds;
 
 	/** Ids mapped to locally registered users */
-	TMap<FUniqueNetIdString, TSharedRef<FUserOnlineAccountNull>> UserAccounts;
+	TMap<FUniqueNetIdNull, TSharedRef<FUserOnlineAccountNull>> UserAccounts;
 };
 
 typedef TSharedPtr<FOnlineIdentityNull, ESPMode::ThreadSafe> FOnlineIdentityNullPtr;
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineLeaderboardInterfaceNull.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineLeaderboardInterfaceNull.h
index d9694f41a76f..d2c0381d436c 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineLeaderboardInterfaceNull.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineLeaderboardInterfaceNull.h
@@ -8,6 +8,7 @@
 #include "OnlineStats.h"
 #include "Interfaces/OnlineLeaderboardInterface.h"
 #include "OnlineSubsystemNullPackage.h"
+#include "OnlineSubsystemNullTypes.h"
 
 class FOnlineSubsystemNull;
 
@@ -33,7 +34,7 @@ private:
 			if (Row == NULL)
 			{
 				// cannot have a better nickname here
-				FOnlineStatsRow NewRow(UserId.ToString(), MakeShareable(new FUniqueNetIdString(UserId)));
+				FOnlineStatsRow NewRow(UserId.ToString(), MakeShareable(new FUniqueNetIdNull(UserId)));
 				NewRow.Rank = -1;
 				Rows.Add(NewRow);
 			}
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.cpp b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.cpp
index aa30407e737a..a5e0ac9feea2 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.cpp
@@ -41,7 +41,7 @@ void FOnlineSessionInfoNull::Init(const FOnlineSubsystemNull& Subsystem)
 
 	FGuid OwnerGuid;
 	FPlatformMisc::CreateGuid(OwnerGuid);
-	SessionId = FUniqueNetIdString(OwnerGuid.ToString());
+	SessionId = FUniqueNetIdNull(OwnerGuid.ToString());
 }
 
 /**
@@ -205,7 +205,7 @@ bool FOnlineSessionNull::CreateSession(int32 HostingPlayerNum, FName SessionName
 		// if did not get a valid one, use just something
 		if (!Session->OwningUserId.IsValid())
 		{
-			Session->OwningUserId = MakeShareable(new FUniqueNetIdString(FString::Printf(TEXT("%d"), HostingPlayerNum)));
+			Session->OwningUserId = MakeShareable(new FUniqueNetIdNull(FString::Printf(TEXT("%d"), HostingPlayerNum)));
 			Session->OwningUserName = FString(TEXT("NullUser"));
 		}
 		
@@ -858,7 +858,7 @@ void FOnlineSessionNull::UnregisterVoice(const FUniqueNetId& PlayerId)
 bool FOnlineSessionNull::RegisterPlayer(FName SessionName, const FUniqueNetId& PlayerId, bool bWasInvited)
 {
 	TArray< TSharedRef<const FUniqueNetId> > Players;
-	Players.Add(MakeShareable(new FUniqueNetIdString(PlayerId)));
+	Players.Add(MakeShareable(new FUniqueNetIdNull(PlayerId)));
 	return RegisterPlayers(SessionName, Players, bWasInvited);
 }
 
@@ -909,7 +909,7 @@ bool FOnlineSessionNull::RegisterPlayers(FName SessionName, const TArray< TShare
 bool FOnlineSessionNull::UnregisterPlayer(FName SessionName, const FUniqueNetId& PlayerId)
 {
 	TArray< TSharedRef<const FUniqueNetId> > Players;
-	Players.Add(MakeShareable(new FUniqueNetIdString(PlayerId)));
+	Players.Add(MakeShareable(new FUniqueNetIdNull(PlayerId)));
 	return UnregisterPlayers(SessionName, Players);
 }
 
@@ -971,7 +971,7 @@ void FOnlineSessionNull::TickLanTasks(float DeltaTime)
 void FOnlineSessionNull::AppendSessionToPacket(FNboSerializeToBufferNull& Packet, FOnlineSession* Session)
 {
 	/** Owner of the session */
-	Packet << *StaticCastSharedPtr<const FUniqueNetIdString>(Session->OwningUserId)
+	Packet << *StaticCastSharedPtr<const FUniqueNetIdNull>(Session->OwningUserId)
 		<< Session->OwningUserName
 		<< Session->NumOpenPrivateConnections
 		<< Session->NumOpenPublicConnections;
@@ -1072,7 +1072,7 @@ void FOnlineSessionNull::ReadSessionFromPacket(FNboSerializeFromBufferNull& Pack
 #endif
 
 	/** Owner of the session */
-	FUniqueNetIdString* UniqueId = new FUniqueNetIdString;
+	FUniqueNetIdNull* UniqueId = new FUniqueNetIdNull;
 	Packet >> *UniqueId
 		>> Session->OwningUserName
 		>> Session->NumOpenPrivateConnections
@@ -1267,3 +1267,13 @@ bool FOnlineSessionNull::IsHost(const FNamedOnlineSession& Session) const
 	TSharedPtr<const FUniqueNetId> UserId = IdentityInt->GetUniquePlayerId(Session.HostingPlayerNum);
 	return (UserId.IsValid() && (*UserId == *Session.OwningUserId));
 }
+
+TSharedPtr<const FUniqueNetId> FOnlineSessionNull::CreateSessionIdFromString(const FString& SessionIdStr)
+{
+	TSharedPtr<const FUniqueNetId> SessionId;
+	if (!SessionIdStr.IsEmpty())
+	{
+		SessionId = MakeShared<FUniqueNetIdNull>(SessionIdStr);
+	}
+	return SessionId;
+}
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.h
index 7cb2b432d783..ff846da4ccc8 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSessionInterfaceNull.h
@@ -229,6 +229,8 @@ public:
 
 	virtual ~FOnlineSessionNull() {}
 
+	virtual TSharedPtr<const FUniqueNetId> CreateSessionIdFromString(const FString& SessionIdStr) override;
+
 	FNamedOnlineSession* GetNamedSession(FName SessionName) override
 	{
 		FScopeLock ScopeLock(&SessionLock);
diff --git a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSubsystemNullTypes.h b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSubsystemNullTypes.h
index bd078d00d5e7..fcef96e1b701 100644
--- a/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSubsystemNullTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystemNull/Source/Private/OnlineSubsystemNullTypes.h
@@ -8,6 +8,9 @@
 
 class FOnlineSubsystemNull;
 
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdNull, NULL_SUBSYSTEM);
+
 /** 
  * Implementation of session information
  */
@@ -40,7 +43,7 @@ PACKAGE_SCOPE:
 	/** The ip & port that the host is listening on (valid for LAN/GameServer) */
 	TSharedPtr<class FInternetAddr> HostAddr;
 	/** Unique Id for this session */
-	FUniqueNetIdString SessionId;
+	FUniqueNetIdNull SessionId;
 
 public:
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OculusEntitlementCallbackProxy.cpp b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OculusEntitlementCallbackProxy.cpp
index 3ca7d4847e94..122a4ef585be 100644
--- a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OculusEntitlementCallbackProxy.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OculusEntitlementCallbackProxy.cpp
@@ -22,7 +22,7 @@ void UOculusEntitlementCallbackProxy::Activate()
 
 	if (OculusIdentityInterface.IsValid())
 	{
-		auto Unused = new FUniqueNetIdString("UNUSED");
+		auto Unused = new FUniqueNetIdString("UNUSED", OCULUS_SUBSYSTEM);
 		OculusIdentityInterface->GetUserPrivilege(
 			*Unused,
 			EUserPrivileges::CanPlay,
diff --git a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.cpp b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.cpp
index 6f362a98ce4e..624e1ad0ac45 100644
--- a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.cpp
@@ -1206,6 +1206,13 @@ void FOnlineSessionOculus::UnregisterLocalPlayer(const FUniqueNetId& PlayerId, F
 	Delegate.ExecuteIfBound(PlayerId, false);
 }
 
+TSharedPtr<const FUniqueNetId> FOnlineSessionOculus::CreateSessionIdFromString(const FString& SessionIdStr)
+{
+	/* NYI */
+	TSharedPtr<const FUniqueNetId> SessionId;
+	return SessionId;
+}
+
 FNamedOnlineSession* FOnlineSessionOculus::GetNamedSession(FName SessionName)
 {
 	if (Sessions.Contains(SessionName))
diff --git a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.h b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.h
index 7a8d10142802..94850f79f234 100644
--- a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.h
+++ b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSessionInterfaceOculus.h
@@ -116,6 +116,7 @@ public:
 	virtual int32 GetNumSessions() override;
 	virtual void DumpSessionState() override;
 
+	virtual TSharedPtr<const FUniqueNetId> CreateSessionIdFromString(const FString& SessionIdStr) override;
 	FNamedOnlineSession* GetNamedSession(FName SessionName) override;
 	virtual void RemoveNamedSession(FName SessionName) override;
 	virtual EOnlineSessionState::Type GetSessionState(FName SessionName) const override;
diff --git a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSubsystemOculusTypes.h b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSubsystemOculusTypes.h
index b7a0e303b1fd..3b14cb018d49 100644
--- a/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSubsystemOculusTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystemOculus/Source/Private/OnlineSubsystemOculusTypes.h
@@ -14,6 +14,11 @@ private:
 protected:
 	bool Compare(const FUniqueNetId& Other) const override
 	{
+		if (Other.GetType() != GetType())
+		{
+			return false;
+		}
+
 		if (Other.GetSize() != sizeof(ovrID))
 		{
 			return false;
@@ -52,6 +57,11 @@ public:
 		}
 	}
 
+	virtual FName GetType() const override
+	{
+		return OCULUS_SUBSYSTEM;
+	}
+
 	// IOnlinePlatformData
 
 	virtual const uint8* GetBytes() const override
diff --git a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineExternalUIInterfaceSteam.h b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineExternalUIInterfaceSteam.h
index 36fce14c0d31..ea85beac7a2d 100644
--- a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineExternalUIInterfaceSteam.h
+++ b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineExternalUIInterfaceSteam.h
@@ -81,6 +81,7 @@ public:
 
 	// IOnlineExternalUI
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName = NAME_GameSession) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSessionInterfaceSteam.h b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSessionInterfaceSteam.h
index 502d0b1c003c..2a8f8b41b24a 100644
--- a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSessionInterfaceSteam.h
+++ b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSessionInterfaceSteam.h
@@ -438,6 +438,13 @@ public:
 
 	virtual ~FOnlineSessionSteam() {}
 
+	virtual TSharedPtr<const FUniqueNetId> CreateSessionIdFromString(const FString& SessionIdStr) override
+	{
+		/* NYI */
+		TSharedPtr<const FUniqueNetId> SessionId;
+		return SessionId;
+	}
+
 	FNamedOnlineSession* GetNamedSession(FName SessionName) override
 	{
 		FScopeLock ScopeLock(&SessionLock);
diff --git a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSubsystemSteamTypes.h b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSubsystemSteamTypes.h
index 213cd471aa9c..b1ead2d45664 100644
--- a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSubsystemSteamTypes.h
+++ b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/OnlineSubsystemSteamTypes.h
@@ -124,6 +124,11 @@ public:
 	{
 	}
 
+	virtual FName GetType() const override
+	{
+		return STEAM_SUBSYSTEM;
+	}
+
 	/**
 	 * Get the raw byte representation of this net id
 	 * This data is platform dependent and shouldn't be manipulated directly
diff --git a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/SocketSubsystemSteam.cpp b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/SocketSubsystemSteam.cpp
index f58e2e540088..7cd7b2910763 100644
--- a/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/SocketSubsystemSteam.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemSteam/Source/Private/SocketSubsystemSteam.cpp
@@ -474,6 +474,8 @@ void FSocketSubsystemSteam::P2PRemove(FUniqueNetIdSteam& SessionId, int32 Channe
  */
 bool FSocketSubsystemSteam::Tick(float DeltaTime)
 {	
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_SocketSubsystemSteam_Tick);
+
 	double CurSeconds = FPlatformTime::Seconds();
 
 	// Debug connection state information
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineAccountTwitch.cpp b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineAccountTwitch.cpp
index 59759072fc34..c8938d7658fa 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineAccountTwitch.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineAccountTwitch.cpp
@@ -51,7 +51,7 @@ bool FUserOnlineAccountTwitch::Parse(const FString& InAuthTicket, FTwitchTokenVa
 	{
 		if (ValidationResponse.bTokenIsValid)
 		{
-			UserId = MakeShared<FUniqueNetIdString>(ValidationResponse.UserId);
+			UserId = MakeShared<FUniqueNetIdTwitch>(ValidationResponse.UserId);
 			if (!ValidationResponse.UserName.IsEmpty())
 			{
 				SetAccountData(USER_ATTR_DISPLAYNAME, ValidationResponse.UserName);
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.cpp b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.cpp
index a81642fb26db..bac92a25bd08 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.cpp
@@ -8,11 +8,10 @@
 #define TWITCH_STATE_TOKEN TEXT("state")
 #define TWITCH_ACCESS_TOKEN TEXT("access_token")
 
-#define LOGIN_ERROR_UNKNOWN TEXT("com.epicgames.login.unknown")
-
 bool FOnlineExternalUITwitch::ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate)
 {
 	bool bStarted = false;
+	FString ErrorStr;
 	if (ControllerIndex >= 0 && ControllerIndex < MAX_LOCAL_PLAYERS)
 	{
 		FOnlineIdentityTwitchPtr IdentityInt = TwitchSubsystem->GetTwitchIdentityService();
@@ -48,31 +47,35 @@ bool FOnlineExternalUITwitch::ShowLoginUI(const int ControllerIndex, bool bShowO
 						bStarted = PlatformExternalUI->ShowWebURL(RequestedURL, ShowParams, OnConsoleShowWebUrlCompleteDelegate);
 						if (!bStarted)
 						{
-							UE_LOG_ONLINE(Warning, TEXT("FOnlineExternalUITwitch::ShowLoginUI: Console ShowWebURL failed"));
+							ErrorStr = TEXT("FOnlineExternalUITwitch::ShowLoginUI: Console ShowWebURL failed");
 						}
 					}
 				}
 			}
 			else
 			{
-				UE_LOG_ONLINE(Error, TEXT("ShowLoginUI: Url Details not properly configured"));
+				ErrorStr = TEXT("ShowLoginUI: Url Details not properly configured");
 			}
 		}
 		else
 		{
-			UE_LOG_ONLINE(Error, TEXT("ShowLoginUI: Missing identity interface"));
+			ErrorStr = TEXT("ShowLoginUI: Missing identity interface");
 		}
 	}
 	else
 	{
-		UE_LOG_ONLINE(Error, TEXT("ShowLoginUI: Invalid controller index (%d)"), ControllerIndex);
+		ErrorStr = FString::Printf(TEXT("ShowLoginUI: Invalid controller index (%d)"), ControllerIndex);
 	}
 
 	if (!bStarted)
 	{
-		TwitchSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		UE_LOG_ONLINE(Warning, TEXT("%s"), *ErrorStr);
+
+		FOnlineError Error;
+		Error.SetFromErrorCode(MoveTemp(ErrorStr));
+		TwitchSubsystem->ExecuteNextTick([ControllerIndex, Delegate, Error = MoveTemp(Error)]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, Error);
 		});
 	}
 
@@ -175,9 +178,10 @@ void FOnlineExternalUITwitch::OnLoginUIComplete(const FLoginFlowResult& Result,
 
 	if (!bStarted)
 	{
-		TwitchSubsystem->ExecuteNextTick([ControllerIndex, Delegate]()
+		FOnlineError LoginFlowError = Result.Error;
+		TwitchSubsystem->ExecuteNextTick([ControllerIndex, LoginFlowError, Delegate]()
 		{
-			Delegate.ExecuteIfBound(nullptr, ControllerIndex);
+			Delegate.ExecuteIfBound(nullptr, ControllerIndex, LoginFlowError);
 		});
 	}
 }
@@ -196,12 +200,18 @@ void FOnlineExternalUITwitch::OnConsoleShowWebUrlComplete(const FString& FinalUr
 	OnLoginUIComplete(Result, ControllerIndex, Delegate);
 }
 
-void FOnlineExternalUITwitch::OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& Error, FOnLoginUIClosedDelegate Delegate)
+void FOnlineExternalUITwitch::OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorStr, FOnLoginUIClosedDelegate Delegate)
 {
 	TSharedPtr<const FUniqueNetId> StrongUserId = UserId.AsShared();
-	TwitchSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, Delegate]()
+	FOnlineError Error(bWasSuccessful);
+	if (!bWasSuccessful)
 	{
-		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum);
+		Error.SetFromErrorCode(ErrorStr);
+	}
+
+	TwitchSubsystem->ExecuteNextTick([StrongUserId, LocalUserNum, Error, Delegate]()
+	{
+		Delegate.ExecuteIfBound(StrongUserId, LocalUserNum, Error);
 	});
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.h b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.h
index 624633f11d90..888a802ab2a3 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.h
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineExternalUITwitch.h
@@ -40,6 +40,7 @@ public:
 
 	// IOnlineExternalUI
 	virtual bool ShowLoginUI(const int ControllerIndex, bool bShowOnlineOnly, bool bShowSkipButton, const FOnLoginUIClosedDelegate& Delegate = FOnLoginUIClosedDelegate()) override;
+	virtual bool ShowAccountCreationUI(const int ControllerIndex, const FOnAccountCreationUIClosedDelegate& Delegate = FOnAccountCreationUIClosedDelegate()) override { /** NYI */ return false; }
 	virtual bool ShowFriendsUI(int32 LocalUserNum) override;
 	virtual bool ShowInviteUI(int32 LocalUserNum, FName SessionName = NAME_GameSession) override;
 	virtual bool ShowAchievementsUI(int32 LocalUserNum) override;
@@ -104,10 +105,10 @@ private:
 	 * @param LocalUserNum index of the local user initiating the request
 	 * @param bWasSuccessful was the login call successful
 	 * @param UserId user id of the logged in user, or null if login failed
-	 * @param Error error string if applicable
+	 * @param ErrorStr error string if applicable
 	 * @param Delegate UI closed delegate to fire, completing the external UIs part in the login process
 	 */
-	void OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& Error, FOnLoginUIClosedDelegate Delegate);
+	void OnAccessTokenLoginComplete(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorStr, FOnLoginUIClosedDelegate Delegate);
 };
 
 typedef TSharedPtr<FOnlineExternalUITwitch, ESPMode::ThreadSafe> FOnlineExternalUITwitchPtr;
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineIdentityTwitch.cpp b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineIdentityTwitch.cpp
index dca4bfb00fb6..f23d93089a58 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineIdentityTwitch.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineIdentityTwitch.cpp
@@ -178,14 +178,14 @@ TSharedPtr<const FUniqueNetId> FOnlineIdentityTwitch::CreateUniquePlayerId(uint8
 	if (Bytes != nullptr && Size > 0)
 	{
 		FString StrId(Size, (TCHAR*)Bytes);
-		return MakeShared<FUniqueNetIdString>(MoveTemp(StrId));
+		return MakeShared<FUniqueNetIdTwitch>(MoveTemp(StrId));
 	}
 	return nullptr;
 }
 
 TSharedPtr<const FUniqueNetId> FOnlineIdentityTwitch::CreateUniquePlayerId(const FString& Str)
 {
-	return MakeShared<FUniqueNetIdString>(Str);
+	return MakeShared<FUniqueNetIdTwitch>(Str);
 }
 
 bool FOnlineIdentityTwitch::Login(int32 LocalUserNum, const FOnlineAccountCredentials& AccountCredentials)
@@ -454,10 +454,10 @@ void FOnlineIdentityTwitch::OnLoginAttemptComplete(int32 LocalUserNum, const FSt
 	}
 }
 
-void FOnlineIdentityTwitch::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex)
+void FOnlineIdentityTwitch::OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error)
 {
-	FString ErrorStr;
-	bool bWasSuccessful = UniqueId.IsValid() && UniqueId->IsValid();
+	const FString& ErrorStr = Error.ErrorCode;
+	const bool bWasSuccessful = Error.WasSuccessful() && UniqueId.IsValid() && UniqueId->IsValid();
 	OnAccessTokenLoginComplete(ControllerIndex, bWasSuccessful, bWasSuccessful ? *UniqueId : *ZeroId, ErrorStr);
 }
 
@@ -605,7 +605,7 @@ void FOnlineIdentityTwitch::RevokeAuthToken_HttpRequestComplete(FHttpRequestPtr
 	
 	if (OnlineError.bSucceeded)
 	{
-		UE_LOG_ONLINE(Log, TEXT("User %s successfully revoked their auth token"), *UserId->ToString());
+		UE_LOG_ONLINE(Log, TEXT("User %s successfully revoked their auth token"), *UserId->ToDebugString());
 	}
 	else
 	{
@@ -705,7 +705,7 @@ FOnlineIdentityTwitch::FOnlineIdentityTwitch(FOnlineSubsystemTwitch* InSubsystem
 	: Subsystem(InSubsystem)
 	, LoginURLDetails(InSubsystem)
 	, bHasLoginOutstanding(false)
-	, ZeroId(MakeShared<FUniqueNetIdString>())
+	, ZeroId(MakeShared<FUniqueNetIdTwitch>())
 {
 	check(InSubsystem);
 }
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineSubsystemTwitchPrivate.h b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineSubsystemTwitchPrivate.h
index be0fddb6f0c2..58dbb972bdd4 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineSubsystemTwitchPrivate.h
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Private/OnlineSubsystemTwitchPrivate.h
@@ -11,3 +11,7 @@
 /** pre-pended to all Twitch logging */
 #undef ONLINE_LOG_PREFIX
 #define ONLINE_LOG_PREFIX TEXT("TWITCH: ")
+
+
+// from OnlineSubsystemTypes.h
+TEMP_UNIQUENETIDSTRING_SUBCLASS(FUniqueNetIdTwitch, TWITCH_SUBSYSTEM);
\ No newline at end of file
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineAccountTwitch.h b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineAccountTwitch.h
index 36e443681cf1..ef69e30beded 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineAccountTwitch.h
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineAccountTwitch.h
@@ -1,7 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #pragma once
- 
+
 #include "OnlineSubsystemTypes.h"
 #include "Serialization/JsonSerializerMacros.h"
 #include "OnlineSubsystemTwitchPackage.h"
@@ -31,7 +31,7 @@ public:
 
 	// FUserOnlineAccountTwitch
 	FUserOnlineAccountTwitch(const FString& InUserId = FString(), const FString& InAuthTicket = FString())
-		: UserId(MakeShared<FUniqueNetIdString>(InUserId))
+		: UserId(MakeShared<FUniqueNetIdTwitch>(InUserId))
 		, AuthTicket(InAuthTicket)
 	{
 	}
diff --git a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineIdentityTwitch.h b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineIdentityTwitch.h
index bce52d92588b..f4f160a38599 100644
--- a/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineIdentityTwitch.h
+++ b/Engine/Plugins/Online/OnlineSubsystemTwitch/Source/Public/OnlineIdentityTwitch.h
@@ -215,7 +215,7 @@ private:
 	/**
 	 * Delegate fired when the call to ShowLoginUI completes
 	 */
-	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex);
+	void OnExternalUILoginComplete(TSharedPtr<const FUniqueNetId> UniqueId, const int ControllerIndex, const FOnlineError& Error);
 
 	/** 
 	 * Function called after logging out has completed, or if the user revoked their auth token
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Classes/ShowLoginUICallbackProxy.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Classes/ShowLoginUICallbackProxy.h
index 8359b36bc025..0428a8a3a84a 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Classes/ShowLoginUICallbackProxy.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Classes/ShowLoginUICallbackProxy.h
@@ -9,6 +9,7 @@
 #include "ShowLoginUICallbackProxy.generated.h"
 
 class APlayerController;
+struct FOnlineError;
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnlineShowLoginUIResult, APlayerController*, PlayerController);
 
@@ -38,7 +39,7 @@ public:
 
 private:
 	// Internal callback when the login UI closes, calls out to the public success/failure callbacks
-	void OnShowLoginUICompleted(TSharedPtr<const FUniqueNetId> UniqueId, int LocalUserNum);
+	void OnShowLoginUICompleted(TSharedPtr<const FUniqueNetId> UniqueId, int LocalUserNum, const FOnlineError& Error);
 
 	// The player controller triggering things
 	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/FindTurnBasedMatchCallbackProxy.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/FindTurnBasedMatchCallbackProxy.cpp
index d9a62f6ea177..66bbe5cd0706 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/FindTurnBasedMatchCallbackProxy.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/FindTurnBasedMatchCallbackProxy.cpp
@@ -95,7 +95,7 @@ void FFindTurnBasedMatchCallbackProxyMatchmakerDelegate::OnMatchmakerFailed()
 
 void FFindTurnBasedMatchCallbackProxyMatchmakerDelegate::OnMatchFound(FTurnBasedMatchRef Match)
 {
-    UE_LOG(LogOnline, Verbose, TEXT("Turn-based match found: %s"), *Match->GetMatchID());
+    UE_LOG_ONLINE(Verbose, TEXT("Turn-based match found: %s"), *Match->GetMatchID());
 	TArray<uint8> MatchData;
 	
 	if (Match->GetMatchData(MatchData) && FindTurnBasedMatchCallbackProxy)
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpConnection.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpConnection.cpp
index 3065b04c91db..9c1096335429 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpConnection.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpConnection.cpp
@@ -9,6 +9,7 @@ Notes:
 
 #include "IpConnection.h"
 #include "SocketSubsystem.h"
+#include "Engine/Engine.h"
 
 #include "IPAddress.h"
 #include "Sockets.h"
@@ -126,10 +127,14 @@ void UIpConnection::LowLevelSend(void* Data, int32 CountBytes, int32 CountBits)
 		}
 		else
 		{
-			uint32 Addr;
 			// Host name resolution just now succeeded.
+#if PLATFORM_IOS
+			RemoteAddr->Copy(ResolveInfo->GetResolvedAddress());
+#else
+			uint32 Addr;
 			ResolveInfo->GetResolvedAddress().GetIp(Addr);
 			RemoteAddr->SetIp(Addr);
+#endif
 			UE_LOG(LogNet, Log, TEXT("Host name resolution completed"));
 			delete ResolveInfo;
 			ResolveInfo = NULL;
@@ -176,12 +181,30 @@ void UIpConnection::LowLevelSend(void* Data, int32 CountBytes, int32 CountBits)
 
 		if (CountBytes > 0)
 		{
-			Socket->SendTo(DataToSend, CountBytes, BytesSent, *RemoteAddr);
+			const bool bWasSendSuccessful = Socket->SendTo(DataToSend, CountBytes, BytesSent, *RemoteAddr);
+            if (bWasSendSuccessful)
+            {
+                UNCLOCK_CYCLES(Driver->SendCycles);
+                NETWORK_PROFILER(GNetworkProfiler.FlushOutgoingBunches(this));
+                NETWORK_PROFILER(GNetworkProfiler.TrackSocketSendTo(Socket->GetDescription(),DataToSend,BytesSent,NumPacketIdBits,NumBunchBits,NumAckBits,NumPaddingBits,this));
+            }
+            else
+            {
+                ISocketSubsystem* const SocketSubsystem = Driver->GetSocketSubsystem();
+                const ESocketErrors Error = SocketSubsystem->GetLastErrorCode();
+                if (Error != SE_EWOULDBLOCK &&
+                    Error != SE_NO_ERROR)
+                {
+                    FString ErrorString = FString::Printf(TEXT("UIpNetConnection::LowLevelSend: Socket->SendTo failed with error %i (%s). %s"),
+                        static_cast<int32>(Error),
+                        SocketSubsystem->GetSocketError(Error),
+                        *Describe());
+                    
+                    GEngine->BroadcastNetworkFailure(Driver->GetWorld(), Driver, ENetworkFailure::ConnectionLost, ErrorString);
+                    Close();
+                }
+            }
 		}
-
-		UNCLOCK_CYCLES(Driver->SendCycles);
-		NETWORK_PROFILER(GNetworkProfiler.FlushOutgoingBunches(this));
-		NETWORK_PROFILER(GNetworkProfiler.TrackSocketSendTo(Socket->GetDescription(),DataToSend,BytesSent,NumPacketIdBits,NumBunchBits,NumAckBits,NumPaddingBits,this));
 	}
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpNetDriver.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpNetDriver.cpp
index 672563c665bd..97b462066888 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpNetDriver.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/IpNetDriver.cpp
@@ -256,7 +256,10 @@ void UIpNetDriver::TickDispatch( float DeltaTime )
 			SCOPE_CYCLE_COUNTER(STAT_IpNetDriver_RecvFromSocket);
 			bOk = Socket->RecvFrom(Data, sizeof(Data), BytesRead, *FromAddr);
 		}
-		
+
+		UIpConnection* Connection = nullptr;
+		UIpConnection* const MyServerConnection = GetServerConnection();
+
 		if (bOk)
 		{
 			// Immediately stop processing (continuing to next receive), for empty packets (usually a DDoS)
@@ -278,14 +281,23 @@ void UIpNetDriver::TickDispatch( float DeltaTime )
 			}
 			else
 			{
-				// MalformedPacket: Client tried sending a packet that exceeded the maximum packet limit
+				// MalformedPacket: Client tried receiving a packet that exceeded the maximum packet limit
 				// enforced by the server
 				if (Error == SE_EMSGSIZE)
 				{
-					UIpConnection* Connection = nullptr;
-					if (GetServerConnection() && (*GetServerConnection()->RemoteAddr == *FromAddr))
+					if (MyServerConnection)
 					{
-						Connection = GetServerConnection();
+						if (*MyServerConnection->RemoteAddr == *FromAddr)
+						{
+							Connection = MyServerConnection;
+						}
+						else
+						{
+							UE_LOG(LogNet, Log, TEXT("Received packet with bytes > max MTU from an incoming IP address that doesn't match expected server address: Actual: %s Expected: %s"),
+								*FromAddr->ToString(true),
+								MyServerConnection->RemoteAddr.IsValid() ? *MyServerConnection->RemoteAddr->ToString(true) : TEXT("Invalid"));
+							continue;
+						}
 					}
 
 					if (Connection != nullptr)
@@ -296,19 +308,20 @@ void UIpNetDriver::TickDispatch( float DeltaTime )
 
 				if( Error != SE_ECONNRESET && Error != SE_UDP_ERR_PORT_UNREACH )
 				{
-					UE_LOG(LogNet, Warning, TEXT("UDP recvfrom error: %i (%s) from %s"),
-						(int32)Error,
+					FString ErrorString = FString::Printf(TEXT("UIpNetDriver::TickDispatch: Socket->RecvFrom: %i (%s) from %s"),
+						static_cast<int32>(Error),
 						SocketSubsystem->GetSocketError(Error),
 						*FromAddr->ToString(true));
 
+					GEngine->BroadcastNetworkFailure(GetWorld(), this, ENetworkFailure::ConnectionLost, ErrorString);
+					Shutdown();
+
 					// Unexpected packet errors should continue to the next iteration, rather than block all further receives this tick
 					continue;
 				}
 			}
 		}
 		// Figure out which socket the received data came from.
-		UIpConnection* Connection = nullptr;
-		UIpConnection* MyServerConnection = GetServerConnection();
 		if (MyServerConnection)
 		{
 			if ((*MyServerConnection->RemoteAddr == *FromAddr))
@@ -325,7 +338,7 @@ void UIpNetDriver::TickDispatch( float DeltaTime )
 		for( int32 i=0; i<ClientConnections.Num() && !Connection; i++ )
 		{
 			UIpConnection* TestConnection = (UIpConnection*)ClientConnections[i]; 
-            check(TestConnection);
+			check(TestConnection);
 			if(*TestConnection->RemoteAddr == *FromAddr)
 			{
 				Connection = TestConnection;
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/JoinSessionCallbackProxy.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/JoinSessionCallbackProxy.cpp
index 9a42d6a28205..1a476f199ce8 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/JoinSessionCallbackProxy.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/JoinSessionCallbackProxy.cpp
@@ -69,7 +69,7 @@ void UJoinSessionCallbackProxy::OnCompleted(FName SessionName, EOnJoinSessionCom
 				FString ConnectString;
 				if (Sessions->GetResolvedConnectString(NAME_GameSession, ConnectString) && PlayerControllerWeakPtr.IsValid())
 				{
-					UE_LOG(LogOnline, Log, TEXT("Join session: traveling to %s"), *ConnectString);
+					UE_LOG_ONLINE_SESSION(Log, TEXT("Join session: traveling to %s"), *ConnectString);
 					PlayerControllerWeakPtr->ClientTravel(ConnectString, TRAVEL_Absolute);
 					OnSuccess.Broadcast();
 					return;
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconClient.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconClient.cpp
index 9ec409f01bc3..b134d966c098 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconClient.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconClient.cpp
@@ -408,7 +408,7 @@ void AOnlineBeaconClient::FinalizeEncryptedConnection(const FEncryptionKeyRespon
 			}
 			else
 			{
-				FString ResponseStr(Lex::ToString(Response.Response));
+				FString ResponseStr(LexToString(Response.Response));
 				UE_LOG(LogBeacon, Warning, TEXT("AOnlineBeaconClient::FinalizeEncryptedConnection: encryption failure [%s] %s"), *ResponseStr, *Response.ErrorMsg);
 				OnFailure();
 			}
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconHost.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconHost.cpp
index 6f017933ede2..4df2b1d32ce6 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconHost.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineBeaconHost.cpp
@@ -369,7 +369,7 @@ void AOnlineBeaconHost::SendWelcomeControlMessage(const FEncryptionKeyResponse&
 			}
 			else
 			{
-				FString ResponseStr(Lex::ToString(Response.Response));
+				FString ResponseStr(LexToString(Response.Response));
 				UE_LOG(LogBeacon, Warning, TEXT("OnlineBeaconHost::SendWelcomeControlMessage: encryption failure [%s] %s"), *ResponseStr, *Response.ErrorMsg);
 				FNetControlMessage<NMT_Failure>::Send(Connection, ResponseStr);
 				Connection->FlushNet();
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.cpp
index ec137f23985b..681b6d12d680 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.cpp
@@ -65,12 +65,20 @@ void UOnlineEngineInterfaceImpl::DestroyOnlineSubsystem(FName OnlineIdentifier)
 	IOnlineSubsystem::Destroy(OnlineIdentifier);
 }
 
-#if OSS_DEDICATED_SERVER_VOICECHAT
 FName UOnlineEngineInterfaceImpl::GetDefaultOnlineSubsystemName() const
 {
 	return DefaultSubsystemName;
 }
-#endif
+
+uint8 UOnlineEngineInterfaceImpl::GetReplicationHashForSubsystem(FName InSubsystemName) const
+{
+	return Online::GetUtils()->GetReplicationHashForSubsystem(InSubsystemName);
+}
+
+FName UOnlineEngineInterfaceImpl::GetSubsystemFromReplicationHash(uint8 InHash) const
+{
+	return Online::GetUtils()->GetSubsystemFromReplicationHash(InHash);
+}
 
 FName UOnlineEngineInterfaceImpl::GetDedicatedServerSubsystemNameForSubsystem(const FName Subsystem) const
 {
@@ -96,30 +104,48 @@ FName UOnlineEngineInterfaceImpl::GetDedicatedServerSubsystemNameForSubsystem(co
 	return NAME_None;
 }
 
-TSharedPtr<const FUniqueNetId> UOnlineEngineInterfaceImpl::CreateUniquePlayerId(const FString& Str)
+TSharedPtr<const FUniqueNetId> UOnlineEngineInterfaceImpl::CreateUniquePlayerId(const FString& Str, FName Type)
 {
-	IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface();
-	if (IdentityInt.IsValid())
+	// Foreign types may be passed into this function, do not load OSS modules explicitly here
+	TSharedPtr<const FUniqueNetId> UniqueId = nullptr;
+	if (IsLoaded(Type))
 	{
-		return IdentityInt->CreateUniquePlayerId(Str);
+		IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface(Type);
+		if (IdentityInt.IsValid())
+		{
+			UniqueId = IdentityInt->CreateUniquePlayerId(Str);
+		}
 	}
-	return nullptr;
+	
+	if (!UniqueId.IsValid())
+	{
+		if (IOnlineSubsystemUtils* Utils = Online::GetUtils())
+		{
+			// Create a unique id for other platforms unknown to this instance
+			// Will not compare correctly against native types (do not use on platform where native type is available)
+			// Used to maintain opaque unique id that will compare against other non native types
+			UniqueId = Utils->CreateForeignUniqueNetId(Str, Type);
+		}
+	}
+	return UniqueId;
 }
 
-TSharedPtr<const FUniqueNetId> UOnlineEngineInterfaceImpl::GetUniquePlayerId(UWorld* World, int32 LocalUserNum)
+TSharedPtr<const FUniqueNetId> UOnlineEngineInterfaceImpl::GetUniquePlayerId(UWorld* World, int32 LocalUserNum, FName Type)
 {
-	IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface(World, Type);
 	if (IdentityInt.IsValid())
 	{
 		TSharedPtr<const FUniqueNetId> UniqueId = IdentityInt->GetUniquePlayerId(LocalUserNum);
 		return UniqueId;
 	}
+
+	UE_LOG_ONLINE(Verbose, TEXT("GetUniquePlayerId() returning null, can't find OSS of type %s"), *Type.ToString());
 	return nullptr;
 }
 
 FString UOnlineEngineInterfaceImpl::GetPlayerNickname(UWorld* World, const FUniqueNetId& UniqueId)
 {
-	IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInt = Online::GetIdentityInterface(World, UniqueId.GetType());
 	if (IdentityInt.IsValid())
 	{	
 		return IdentityInt->GetPlayerNickname(UniqueId);
@@ -364,7 +390,6 @@ TSharedPtr<FVoicePacket> UOnlineEngineInterfaceImpl::GetLocalPacket(UWorld* Worl
 	return nullptr;
 }
 
-#if OSS_DEDICATED_SERVER_VOICECHAT
 TSharedPtr<FVoicePacket> UOnlineEngineInterfaceImpl::SerializeRemotePacket(UWorld* World, const UNetConnection* const RemoteConnection, FArchive& Ar)
 {
 	FName VoiceSubsystemName = VoiceSubsystemNameOverride;
@@ -385,17 +410,6 @@ TSharedPtr<FVoicePacket> UOnlineEngineInterfaceImpl::SerializeRemotePacket(UWorl
 	}
 	return nullptr;
 }
-#else
-TSharedPtr<FVoicePacket> UOnlineEngineInterfaceImpl::SerializeRemotePacket(UWorld* World, FArchive& Ar)
-{
-	IOnlineVoicePtr VoiceInt = Online::GetVoiceInterface(World, VoiceSubsystemNameOverride);
-	if (VoiceInt.IsValid())
-	{
-		return VoiceInt->SerializeRemotePacket(Ar);
-	}
-	return nullptr;
-}
-#endif
 
 void UOnlineEngineInterfaceImpl::StartNetworkedVoice(UWorld* World, uint8 LocalUserNum)
 {
@@ -552,7 +566,7 @@ void UOnlineEngineInterfaceImpl::DumpVoiceState(UWorld* World)
 	IOnlineVoicePtr VoiceInt = Online::GetVoiceInterface(World);
 	if (VoiceInt.IsValid())
 	{
-		UE_LOG(LogOnline, Verbose, TEXT("\n%s"), *VoiceInt->GetVoiceDebugState());
+		UE_LOG_ONLINE(Verbose, TEXT("\n%s"), *VoiceInt->GetVoiceDebugState());
 	}
 }
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.h
index 1bc469b23a6b..d46c19345f61 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineEngineInterfaceImpl.h
@@ -8,11 +8,6 @@
 #include "Net/OnlineEngineInterface.h"
 #include "OnlineEngineInterfaceImpl.generated.h"
 
-/** If OnlineEngineInterface.h doesn't define this, it isn't available. */
-#ifndef OSS_DEDICATED_SERVER_VOICECHAT
-#define OSS_DEDICATED_SERVER_VOICECHAT 0
-#endif
-
 class Error;
 class FVoicePacket;
 struct FWorldContext;
@@ -32,9 +27,13 @@ public:
 	virtual bool DoesInstanceExist(FName OnlineIdentifier) override;
 	virtual void ShutdownOnlineSubsystem(FName OnlineIdentifier) override;
 	virtual void DestroyOnlineSubsystem(FName OnlineIdentifier) override;
-#if OSS_DEDICATED_SERVER_VOICECHAT
 	virtual FName GetDefaultOnlineSubsystemName() const override;
-#endif
+
+	/**
+	 * Utils
+	 */
+	virtual uint8 GetReplicationHashForSubsystem(FName InSubsystemName) const override;
+	virtual FName GetSubsystemFromReplicationHash(uint8 InHash) const override;
 
 private:
 
@@ -55,8 +54,8 @@ private:
 	 */
 public:
 
-	virtual TSharedPtr<const FUniqueNetId> CreateUniquePlayerId(const FString& Str) override;
-	virtual TSharedPtr<const FUniqueNetId> GetUniquePlayerId(UWorld* World, int32 LocalUserNum) override;
+	virtual TSharedPtr<const FUniqueNetId> CreateUniquePlayerId(const FString& Str, FName Type) override;
+	virtual TSharedPtr<const FUniqueNetId> GetUniquePlayerId(UWorld* World, int32 LocalUserNum, FName Type) override;
 
 	virtual FString GetPlayerNickname(UWorld* World, const FUniqueNetId& UniqueId) override;
 	virtual bool GetPlayerPlatformNickname(UWorld* World, int32 LocalUserNum, FString& OutNickname) override;
@@ -103,11 +102,7 @@ private:
 public:
 
 	virtual TSharedPtr<FVoicePacket> GetLocalPacket(UWorld* World, uint8 LocalUserNum) override;
-#if OSS_DEDICATED_SERVER_VOICECHAT
 	virtual TSharedPtr<FVoicePacket> SerializeRemotePacket(UWorld* World, const UNetConnection* const RemoteConnection, FArchive& Ar) override;
-#else
-	virtual TSharedPtr<FVoicePacket> SerializeRemotePacket(UWorld* World, FArchive& Ar) override;
-#endif
 
 	virtual void StartNetworkedVoice(UWorld* World, uint8 LocalUserNum) override;
 	virtual void StopNetworkedVoice(UWorld* World, uint8 LocalUserNum) override;
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.cpp
index 529bd2a1fb2e..5e3b0e500227 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.cpp
@@ -109,14 +109,14 @@ void UOnlinePIESettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyC
 	if (PropertyChangedEvent.Property != NULL)
 	{
 		FName MemberPropName = PropertyChangedEvent.MemberProperty->GetFName();
-		FName SubPropName = PropertyChangedEvent.Property->GetFName();
 		if (MemberPropName == GET_MEMBER_NAME_CHECKED(UOnlinePIESettings, bOnlinePIEEnabled))
 		{
 			// Possibly get rid of the null subsystem in favor of the real default or if we are disabling online pie then get rid of the real subsystem to replace it with null
 			IOnlineSubsystem::ReloadDefaultSubsystem();
 		}
-		if (MemberPropName == GET_MEMBER_NAME_CHECKED(UOnlinePIESettings, Logins))
+		else if (MemberPropName == GET_MEMBER_NAME_CHECKED(UOnlinePIESettings, Logins))
 		{
+			FName SubPropName = PropertyChangedEvent.Property->GetFName();
 			if (SubPropName == GET_MEMBER_NAME_CHECKED(FPIELoginSettingsInternal, Id))
 			{
 				for (FPIELoginSettingsInternal& Login : Logins)
@@ -143,25 +143,6 @@ void UOnlinePIESettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyC
 					Login.Type.TrimStartAndEndInline();
 				}
 			}
-
-			if (PropertyChangedEvent.ChangeType != EPropertyChangeType::ArrayAdd)
-			{
-				bool bOneLoginValid = false;
-				for (FPIELoginSettingsInternal& Login : Logins)
-				{
-					if (Login.IsValid())
-					{
-						bOneLoginValid = true;
-						break;
-					}
-				}
-
-				if (!bOneLoginValid)
-				{
-					// Disable PIE logins when there are no logins available
-					bOnlinePIEEnabled = false;
-				}
-			}
 		}
 	}
 }
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.h
index 2e78173168c5..90de7baf3c35 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlinePIESettings.h
@@ -45,7 +45,7 @@ public:
 };
 
 /**
- * Setup up login credentials for the Play In Editor (PIE) feature
+ * Setup login credentials for the Play In Editor (PIE) feature
  */
 UCLASS(config=EditorPerProjectUserSettings, meta = (DisplayName = "Play Credentials"))
 class UOnlinePIESettings : public UDeveloperSettings
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSessionClient.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSessionClient.cpp
index 82aee4000a39..2fb6948e997d 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSessionClient.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSessionClient.cpp
@@ -32,7 +32,7 @@ IOnlineSessionPtr UOnlineSessionClient::GetSessionInt()
 	UWorld* World = GetWorld();
 	if (World == nullptr)
 	{
-		UE_LOG(LogOnline, Warning, TEXT("UOnlineSessionClient::GetSessionInt: Called with NULL world."));
+		UE_LOG_ONLINE(Warning, TEXT("UOnlineSessionClient::GetSessionInt: Called with NULL world."));
 		return nullptr;
 	}
 
@@ -76,7 +76,7 @@ void UOnlineSessionClient::ClearOnlineDelegates()
 
 void UOnlineSessionClient::OnSessionUserInviteAccepted(bool bWasSuccessful, int32 ControllerId, TSharedPtr<const FUniqueNetId> UserId, const FOnlineSessionSearchResult& SearchResult)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnSessionUserInviteAccepted LocalUserNum: %d bSuccess: %d"), ControllerId, bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnSessionUserInviteAccepted LocalUserNum: %d bSuccess: %d"), ControllerId, bWasSuccessful);
 	// Don't clear invite accept delegate
 
 	if (bWasSuccessful)
@@ -88,14 +88,14 @@ void UOnlineSessionClient::OnSessionUserInviteAccepted(bool bWasSuccessful, int3
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Invite accept returned no search result."));
+			UE_LOG_ONLINE(Warning, TEXT("Invite accept returned no search result."));
 		}
 	}
 }
 
 void UOnlineSessionClient::OnEndForJoinSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnEndForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnEndForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	IOnlineSessionPtr SessionInt = GetSessionInt();
 	if (SessionInt.IsValid())
 	{
@@ -130,7 +130,7 @@ FDelegateHandle UOnlineSessionClient::EndExistingSession_Impl(FName SessionName,
 
 void UOnlineSessionClient::OnDestroyForJoinSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnDestroyForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnDestroyForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 
 	IOnlineSessionPtr SessionInt = GetSessionInt();
 
@@ -149,7 +149,7 @@ void UOnlineSessionClient::OnDestroyForJoinSessionComplete(FName SessionName, bo
 
 void UOnlineSessionClient::OnDestroyForMainMenuComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnDestroyForMainMenuComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnDestroyForMainMenuComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 
 	IOnlineSessionPtr SessionInt = GetSessionInt();
 
@@ -191,7 +191,7 @@ void UOnlineSessionClient::DestroyExistingSession_Impl(FDelegateHandle& OutResul
 
 void UOnlineSessionClient::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), static_cast<int32>(Result));
+	UE_LOG_ONLINE(Verbose, TEXT("OnJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), static_cast<int32>(Result));
 
 	IOnlineSessionPtr SessionInt = GetSessionInt();
 
@@ -217,7 +217,7 @@ void UOnlineSessionClient::OnJoinSessionComplete(FName SessionName, EOnJoinSessi
 			}
 			else
 			{
-				UE_LOG(LogOnline, Warning, TEXT("Failed to join session %s"), *SessionName.ToString());
+				UE_LOG_ONLINE(Warning, TEXT("Failed to join session %s"), *SessionName.ToString());
 			}
 		}
 	}
@@ -290,7 +290,7 @@ void UOnlineSessionClient::StartOnlineSession(FName SessionName)
 
 void UOnlineSessionClient::OnStartSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnStartSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnStartSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 
 	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());
 	if (SessionInterface.IsValid())
@@ -316,7 +316,7 @@ void UOnlineSessionClient::EndOnlineSession(FName SessionName)
 
 void UOnlineSessionClient::OnEndSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnEndSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE(Verbose, TEXT("OnEndSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 
 	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());
 	if (SessionInterface.IsValid())
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtils.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtils.cpp
index 158a48206e0d..0739c87d06ec 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtils.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtils.cpp
@@ -282,37 +282,37 @@ bool HandleVoiceCommands(IOnlineSubsystem* InOnlineSub, UWorld* InWorld, const T
 		bool bRequiresPushToTalk = false;
 		if (!GConfig->GetBool(TEXT("/Script/Engine.GameSession"), TEXT("bRequiresPushToTalk"), bRequiresPushToTalk, GGameIni))
 		{
-			UE_LOG(LogVoice, Warning, TEXT("Missing bRequiresPushToTalk key in [/Script/Engine.GameSession] of DefaultGame.ini"));
+			UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing bRequiresPushToTalk key in [/Script/Engine.GameSession] of DefaultGame.ini"));
 		}
 
 		int32 MaxLocalTalkers = 0;
 		if (!GConfig->GetInt(TEXT("OnlineSubsystem"), TEXT("MaxLocalTalkers"), MaxLocalTalkers, GEngineIni))
 		{
-			UE_LOG(LogVoice, Warning, TEXT("Missing MaxLocalTalkers key in OnlineSubsystem of DefaultEngine.ini"));
+			UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing MaxLocalTalkers key in OnlineSubsystem of DefaultEngine.ini"));
 		}
 
 		int32 MaxRemoteTalkers = 0;
 		if (!GConfig->GetInt(TEXT("OnlineSubsystem"), TEXT("MaxRemoteTalkers"), MaxRemoteTalkers, GEngineIni))
 		{
-			UE_LOG(LogVoice, Warning, TEXT("Missing MaxRemoteTalkers key in OnlineSubsystem of DefaultEngine.ini"));
+			UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing MaxRemoteTalkers key in OnlineSubsystem of DefaultEngine.ini"));
 		}
 		
 		float VoiceNotificationDelta = 0.0f;
 		if (!GConfig->GetFloat(TEXT("OnlineSubsystem"), TEXT("VoiceNotificationDelta"), VoiceNotificationDelta, GEngineIni))
 		{
-			UE_LOG(LogVoice, Warning, TEXT("Missing VoiceNotificationDelta key in OnlineSubsystem of DefaultEngine.ini"));
+			UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing VoiceNotificationDelta key in OnlineSubsystem of DefaultEngine.ini"));
 		}
 
 		bool bHasVoiceInterfaceEnabled = false;
 		if (!GConfig->GetBool(TEXT("OnlineSubsystem"), TEXT("bHasVoiceEnabled"), bHasVoiceInterfaceEnabled, GEngineIni))
 		{
-			UE_LOG(LogVoice, Log, TEXT("Voice interface disabled by config [OnlineSubsystem].bHasVoiceEnabled"));
+			UE_LOG_ONLINE_VOICE(Log, TEXT("Voice interface disabled by config [OnlineSubsystem].bHasVoiceEnabled"));
 		}
 
 		bool bDuckingOptOut = false;
 		if (!GConfig->GetBool(TEXT("OnlineSubsystem"), TEXT("bDuckingOptOut"), bDuckingOptOut, GEngineIni))
 		{
-			UE_LOG(LogVoice, Log, TEXT("Voice ducking not set by config [OnlineSubsystem].bDuckingOptOut"));
+			UE_LOG_ONLINE_VOICE(Log, TEXT("Voice ducking not set by config [OnlineSubsystem].bDuckingOptOut"));
 		}
 
 		FString VoiceDump;
@@ -325,21 +325,21 @@ bool HandleVoiceCommands(IOnlineSubsystem* InOnlineSub, UWorld* InWorld, const T
 			VoiceDump = VoiceInt->GetVoiceDebugState();
 		}
 
-		UE_LOG(LogVoice, Display, TEXT("Voice Module Available: %s"), bVoiceModule ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogVoice, Display, TEXT("Voice Module Enabled: %s"), bVoiceModuleEnabled ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogVoice, Display, TEXT("Voice Interface Available: %s"), bVoiceInterface ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogVoice, Display, TEXT("Voice Interface Enabled: %s"), bHasVoiceInterfaceEnabled ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogVoice, Display, TEXT("Ducking Opt Out Enabled: %s"), bDuckingOptOut ? TEXT("true") : TEXT("false"));
-		UE_LOG(LogVoice, Display, TEXT("Max Local Talkers: %d"), MaxLocalTalkers);
-		UE_LOG(LogVoice, Display, TEXT("Max Remote Talkers: %d"), MaxRemoteTalkers);
-		UE_LOG(LogVoice, Display, TEXT("Notification Delta: %0.2f"), VoiceNotificationDelta);
-		UE_LOG(LogVoice, Display, TEXT("Voice Requires Push To Talk: %s"), bRequiresPushToTalk ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Voice Module Available: %s"), bVoiceModule ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Voice Module Enabled: %s"), bVoiceModuleEnabled ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Voice Interface Available: %s"), bVoiceInterface ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Voice Interface Enabled: %s"), bHasVoiceInterfaceEnabled ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Ducking Opt Out Enabled: %s"), bDuckingOptOut ? TEXT("true") : TEXT("false"));
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Max Local Talkers: %d"), MaxLocalTalkers);
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Max Remote Talkers: %d"), MaxRemoteTalkers);
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Notification Delta: %0.2f"), VoiceNotificationDelta);
+		UE_LOG_ONLINE_VOICE(Display, TEXT("Voice Requires Push To Talk: %s"), bRequiresPushToTalk ? TEXT("true") : TEXT("false"));
 
 		TArray<FString> OutArray;
 		VoiceDump.ParseIntoArray(OutArray, TEXT("\n"), false);
 		for (const FString& Str : OutArray)
 		{
-			UE_LOG(LogVoice, Display, TEXT("%s"), *Str);
+			UE_LOG_ONLINE_VOICE(Display, TEXT("%s"), *Str);
 		}
 	}
 	else
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtilsModule.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtilsModule.cpp
index 213542481824..42620f0165c7 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtilsModule.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/OnlineSubsystemUtilsModule.cpp
@@ -50,6 +50,23 @@ public:
 		return Subsystem;
 	}
 
+	virtual TSharedPtr<const FUniqueNetId> CreateForeignUniqueNetId(const FString& Str, FName Type) const
+	{
+		return MakeShared<FUniqueNetIdString>(Str, Type);
+	}
+
+	virtual uint8 GetReplicationHashForSubsystem(FName SubsystemName) const
+	{
+		const uint8* NameHash = SubsystemNameToHash.Find(SubsystemName);
+		return NameHash ? *NameHash : 0;
+	}
+
+	virtual FName GetSubsystemFromReplicationHash(uint8 InHash) const
+	{
+		const FName* Name = HashToSubsystemName.Find(InHash);
+		return Name ? *Name : NAME_None;
+	}
+
 	virtual void OnOnlineSubsystemCreated(IOnlineSubsystem* NewSubsystem)
 	{
 		if (OnExternalUIChangeDelegate.IsBound())
@@ -162,6 +179,44 @@ private:
 	void Init()
 	{
 		FOnlineSubsystemDelegates::OnOnlineSubsystemCreated.AddRaw(this, &FOnlineSubsystemUtils::OnOnlineSubsystemCreated);
+		CreateNameHashes();
+	}
+
+	void CreateNameHashes()
+	{
+		int32 HashId = 1;
+#define CREATE_HASH(MacroName) \
+{ \
+ uint8 Hash = static_cast<uint8>(HashId); \
+ SubsystemNameToHash.Add(MacroName, Hash); \
+ HashToSubsystemName.Add(Hash, MacroName); \
+ HashId++; \
+}
+		CREATE_HASH(NULL_SUBSYSTEM); 
+		CREATE_HASH(MCP_SUBSYSTEM);
+		CREATE_HASH(STEAM_SUBSYSTEM);
+		CREATE_HASH(PS4_SUBSYSTEM);
+		CREATE_HASH(LIVE_SUBSYSTEM);
+		CREATE_HASH(GOOGLE_SUBSYSTEM);
+		CREATE_HASH(GOOGLEPLAY_SUBSYSTEM);
+		CREATE_HASH(FACEBOOK_SUBSYSTEM);
+		CREATE_HASH(IOS_SUBSYSTEM);
+		CREATE_HASH(TENCENT_SUBSYSTEM);
+		CREATE_HASH(SWITCH_SUBSYSTEM);
+		CREATE_HASH(AMAZON_SUBSYSTEM);
+		CREATE_HASH(GAMECIRCLE_SUBSYSTEM);
+		CREATE_HASH(THUNDERHEAD_SUBSYSTEM); 
+		CREATE_HASH(WECHAT_SUBSYSTEM); 
+		CREATE_HASH(TWITCH_SUBSYSTEM); 
+		CREATE_HASH(OCULUS_SUBSYSTEM); 
+		// Shouldn't need these as they are mocking interfaces for existing platforms
+		CREATE_HASH(PS4SERVER_SUBSYSTEM);
+		CREATE_HASH(LIVESERVER_SUBSYSTEM);
+
+#undef CREATE_HASH
+
+		ensure(SubsystemNameToHash.Num() == (HashId - 1));
+		ensure(HashToSubsystemName.Num() == (HashId - 1));
 	}
 
 	/** If false it will not try to do online PIE at all */
@@ -173,6 +228,9 @@ private:
 
 	/** Delegate binding when new online subsystems are created */
 	FDelegateHandle OnOnlineSubsystemCreatedDelegateHandle;
+	/** Mapping of OSS Names to uint8 hashes */
+	TMap<FName, uint8> SubsystemNameToHash;
+	TMap<uint8, FName> HashToSubsystemName;
 
 	friend FOnlineSubsystemUtilsModule;
 };
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconClient.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconClient.cpp
index 4cb7aad1bcb0..e2e7c9dbbd2d 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconClient.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconClient.cpp
@@ -66,8 +66,11 @@ void APartyBeaconClient::ClearTimers(bool bCallFailSafeIfNeeded)
 		UE_LOG(LogBeacon, Verbose, TEXT("Clearing timers with cancel reservation in flight.  Calling Failsafe."));
 
 		UWorld* World = GetWorld();
-		FTimerManager& TM = World->GetTimerManager();
-		TM.ClearTimer(CancelRPCFailsafe);
+		if (World)
+		{
+			FTimerManager& TM = World->GetTimerManager();
+			TM.ClearTimer(CancelRPCFailsafe);
+		}
 		OnCancelledFailsafe();
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconHost.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconHost.cpp
index 12267d2e9948..a2e310e52b59 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconHost.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconHost.cpp
@@ -519,18 +519,26 @@ EPartyReservationResult::Type APartyBeaconHost::AddPartyReservation(const FParty
 						}
 					}
 
-					SendReservationUpdates();
-
-					// Clean up the game entities for these duplicate players
-					DuplicateReservation.ExecuteIfBound(ReservationRequest);
-
-					// Add all players back into the pending join list
-					for (int32 Count = 0; Count < ReservationRequest.PartyMembers.Num(); Count++)
+					if (State->CrossPlayAllowed(ReservationRequest))
 					{
-						NewPlayerAdded(ReservationRequest.PartyMembers[Count]);
-					}
+						SendReservationUpdates();
 
-					Result = EPartyReservationResult::ReservationDuplicate;
+						// Clean up the game entities for these duplicate players
+						DuplicateReservation.ExecuteIfBound(ReservationRequest);
+
+						// Add all players back into the pending join list
+						for (int32 Count = 0; Count < ReservationRequest.PartyMembers.Num(); Count++)
+						{
+							NewPlayerAdded(ReservationRequest.PartyMembers[Count]);
+						}
+
+						Result = EPartyReservationResult::ReservationDuplicate;
+					}
+					else
+					{
+						// Cross play restriction
+						Result = EPartyReservationResult::ReservationDenied_CrossPlayRestriction;
+					}
 				}
 				else
 				{
@@ -547,7 +555,7 @@ EPartyReservationResult::Type APartyBeaconHost::AddPartyReservation(const FParty
 		else
 		{
 			// Check for players we already have reservations for
-			// Keep track of team index for existing members - if we have members on opposing teams, reject this reserveration
+			// Keep track of team index for existing members - if we have members on opposing teams, reject this reservation
 			bool bContainsExistingMembers = false;
 			int32 ExistingMemberReservationTeamNum = INDEX_NONE;
 			for (const FPlayerReservation& PartyMember : ReservationRequest.PartyMembers)
@@ -589,27 +597,35 @@ EPartyReservationResult::Type APartyBeaconHost::AddPartyReservation(const FParty
 					{
 						if (State->AreTeamsAvailable(ReservationRequest))
 						{
-							if (State->AddReservation(ReservationRequest))
+							if (State->CrossPlayAllowed(ReservationRequest))
 							{
-								// Keep track of newly added players
-								for (const FPlayerReservation& PartyMember : ReservationRequest.PartyMembers)
+								if (State->AddReservation(ReservationRequest))
 								{
-									NewPlayerAdded(PartyMember);
+									// Keep track of newly added players
+									for (const FPlayerReservation& PartyMember : ReservationRequest.PartyMembers)
+									{
+										NewPlayerAdded(PartyMember);
+									}
+
+									SendReservationUpdates();
+
+									NotifyReservationEventNextFrame(ReservationChanged);
+									if (State->IsBeaconFull())
+									{
+										NotifyReservationEventNextFrame(ReservationsFull);
+									}
+									Result = EPartyReservationResult::ReservationAccepted;
 								}
-
-								SendReservationUpdates();
-
-								NotifyReservationEventNextFrame(ReservationChanged);
-								if (State->IsBeaconFull())
+								else
 								{
-									NotifyReservationEventNextFrame(ReservationsFull);
+									// Something wrong with team assignment
+									Result = EPartyReservationResult::IncorrectPlayerCount;
 								}
-								Result = EPartyReservationResult::ReservationAccepted;
 							}
 							else
 							{
-								// Something wrong with team assignment
-								Result = EPartyReservationResult::IncorrectPlayerCount;
+								// Cross play restriction
+								Result = EPartyReservationResult::ReservationDenied_CrossPlayRestriction;
 							}
 						}
 						else
@@ -706,102 +722,109 @@ EPartyReservationResult::Type APartyBeaconHost::UpdatePartyReservation(const FPa
 					bool bPlayerRemovedFromReservation = false;
 					if (NewPlayers.Num() > 0)
 					{
-						// Copy new player entries into existing reservation
-						for (int32 PlayerIdx = 0; PlayerIdx < NewPlayers.Num(); PlayerIdx++)
+						if (State->CrossPlayAllowed(ReservationUpdateRequest))
 						{
-							const FPlayerReservation& PlayerRes = NewPlayers[PlayerIdx];
-
-							// Remove players that existed in other reservations before adding to this reservation
-							if (NumPlayersWithExistingReservation > 0)
+							// Copy new player entries into existing reservation
+							for (int32 PlayerIdx = 0; PlayerIdx < NewPlayers.Num(); PlayerIdx++)
 							{
-								const int32 FormerReservationIdx = State->GetExistingReservationContainingMember(PlayerRes.UniqueId);
-								if (FormerReservationIdx != INDEX_NONE)
+								const FPlayerReservation& PlayerRes = NewPlayers[PlayerIdx];
+
+								// Remove players that existed in other reservations before adding to this reservation
+								if (NumPlayersWithExistingReservation > 0)
 								{
-									FPartyReservation& FormerReservation = Reservations[FormerReservationIdx];
-									UE_LOG(LogPartyBeacon, Log, TEXT("APartyBeaconHost::UpdatePartyReservation: Removing player %s from former reservation with leader %s before adding to reservation with leader %s"),
-										*PlayerRes.UniqueId.ToString(), *FormerReservation.PartyLeader.ToString(), *ReservationUpdateRequest.PartyLeader.ToString());
-									if (UE_LOG_ACTIVE(LogPartyBeacon, Verbose))
+									const int32 FormerReservationIdx = State->GetExistingReservationContainingMember(PlayerRes.UniqueId);
+									if (FormerReservationIdx != INDEX_NONE)
 									{
-										FormerReservation.Dump();
-									}
-									int32 NumReservationsRemoved = FormerReservation.PartyMembers.RemoveAll([&PlayerRes](const FPlayerReservation& OtherRes)
-									{
-										return OtherRes.UniqueId == PlayerRes.UniqueId;
-									});
-
-									State->NumConsumedReservations -= NumReservationsRemoved;
-									UE_LOG(LogPartyBeacon, Verbose, TEXT("APartyBeaconHost::UpdatePartyReservation: Removed %d players, setting NumConsumedReservations to %d"), NumReservationsRemoved, State->NumConsumedReservations);
-
-									if (NumReservationsRemoved != 0)
-									{
-										bPlayerRemovedFromReservation = true;
-										if (FormerReservation.PartyLeader == PlayerRes.UniqueId)
+										FPartyReservation& FormerReservation = Reservations[FormerReservationIdx];
+										UE_LOG(LogPartyBeacon, Log, TEXT("APartyBeaconHost::UpdatePartyReservation: Removing player %s from former reservation with leader %s before adding to reservation with leader %s"),
+											*PlayerRes.UniqueId.ToString(), *FormerReservation.PartyLeader.ToString(), *ReservationUpdateRequest.PartyLeader.ToString());
+										if (UE_LOG_ACTIVE(LogPartyBeacon, Verbose))
 										{
-											UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Leader removed, finding member to promote"));
-											// Try to find a new leader for party reservation that lost its leader
-											bool bAnyMemberPromoted = false;
-											for (int32 FormerReservationPlayerIdx = 0; FormerReservationPlayerIdx < FormerReservation.PartyMembers.Num(); FormerReservationPlayerIdx++)
+											FormerReservation.Dump();
+										}
+										int32 NumReservationsRemoved = FormerReservation.PartyMembers.RemoveAll([&PlayerRes](const FPlayerReservation& OtherRes)
+										{
+											return OtherRes.UniqueId == PlayerRes.UniqueId;
+										});
+
+										State->NumConsumedReservations -= NumReservationsRemoved;
+										UE_LOG(LogPartyBeacon, Verbose, TEXT("APartyBeaconHost::UpdatePartyReservation: Removed %d players, setting NumConsumedReservations to %d"), NumReservationsRemoved, State->NumConsumedReservations);
+
+										if (NumReservationsRemoved != 0)
+										{
+											bPlayerRemovedFromReservation = true;
+											if (FormerReservation.PartyLeader == PlayerRes.UniqueId)
 											{
-												FPlayerReservation& FormerReservationPlayerEntry = FormerReservation.PartyMembers[FormerReservationPlayerIdx];
-												if (FormerReservationPlayerEntry.UniqueId != FormerReservation.PartyLeader && 
-													FormerReservationPlayerEntry.UniqueId.IsValid() &&
-													State->GetExistingReservation(FormerReservationPlayerEntry.UniqueId) == INDEX_NONE)
+												UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Leader removed, finding member to promote"));
+												// Try to find a new leader for party reservation that lost its leader
+												bool bAnyMemberPromoted = false;
+												for (int32 FormerReservationPlayerIdx = 0; FormerReservationPlayerIdx < FormerReservation.PartyMembers.Num(); FormerReservationPlayerIdx++)
 												{
-													// Promote to party leader (for now)
-													UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Promoting member %s to leader"), *FormerReservationPlayerEntry.UniqueId.ToString());
-													FormerReservation.PartyLeader = FormerReservationPlayerEntry.UniqueId;
-													bAnyMemberPromoted = true;
-													break;
+													FPlayerReservation& FormerReservationPlayerEntry = FormerReservation.PartyMembers[FormerReservationPlayerIdx];
+													if (FormerReservationPlayerEntry.UniqueId != FormerReservation.PartyLeader &&
+														FormerReservationPlayerEntry.UniqueId.IsValid() &&
+														State->GetExistingReservation(FormerReservationPlayerEntry.UniqueId) == INDEX_NONE)
+													{
+														// Promote to party leader (for now)
+														UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Promoting member %s to leader"), *FormerReservationPlayerEntry.UniqueId.ToString());
+														FormerReservation.PartyLeader = FormerReservationPlayerEntry.UniqueId;
+														bAnyMemberPromoted = true;
+														break;
+													}
 												}
+												if (!bAnyMemberPromoted)
+												{
+													UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Failed to find a player to promote to leader"));
+												}
+												State->SanityCheckReservations(true);
 											}
-											if (!bAnyMemberPromoted)
-											{
-												UE_LOG(LogPartyBeacon, Display, TEXT("APartyBeaconHost::UpdatePartyReservation: Failed to find a player to promote to leader"));
-											}
-											State->SanityCheckReservations(true);
 										}
 									}
-								}
 
+								}
+								ExistingReservation.PartyMembers.Add(PlayerRes);
+								// Keep track of newly added players
+								NewPlayerAdded(PlayerRes);
+								State->SanityCheckReservations(true);
 							}
-							ExistingReservation.PartyMembers.Add(PlayerRes);
-							// Keep track of newly added players
-							NewPlayerAdded(PlayerRes);
-							State->SanityCheckReservations(true);
-						}
 
-						// Update the reservation count before sending the response
-						State->NumConsumedReservations += NewPlayers.Num();
-						UE_LOG(LogPartyBeacon, Verbose, TEXT("APartyBeaconHost::UpdatePartyReservation: Added %d players, setting NumConsumedReservations to %d"), NewPlayers.Num(), State->NumConsumedReservations);
+							// Update the reservation count before sending the response
+							State->NumConsumedReservations += NewPlayers.Num();
+							UE_LOG(LogPartyBeacon, Verbose, TEXT("APartyBeaconHost::UpdatePartyReservation: Added %d players, setting NumConsumedReservations to %d"), NewPlayers.Num(), State->NumConsumedReservations);
 
-						// Tell any UI and/or clients that there has been a change in the reservation state
-						SendReservationUpdates();
+							// Tell any UI and/or clients that there has been a change in the reservation state
+							SendReservationUpdates();
 
-						// Tell the owner that we've received a reservation so the UI can be updated
-						NotifyReservationEventNextFrame(ReservationChanged);
-						if (State->IsBeaconFull())
-						{
-							// If we've hit our limit, fire the delegate so the host can do the
-							// next step in getting parties together
-							NotifyReservationEventNextFrame(ReservationsFull);
-						}
-
-						if (bPlayerRemovedFromReservation)
-						{
-							State->Reservations.RemoveAll([](const FPartyReservation& Reservation)
+							// Tell the owner that we've received a reservation so the UI can be updated
+							NotifyReservationEventNextFrame(ReservationChanged);
+							if (State->IsBeaconFull())
 							{
-								bool bEmptyReservation = Reservation.PartyMembers.Num() == 0;
-								if (bEmptyReservation)
+								// If we've hit our limit, fire the delegate so the host can do the
+								// next step in getting parties together
+								NotifyReservationEventNextFrame(ReservationsFull);
+							}
+
+							if (bPlayerRemovedFromReservation)
+							{
+								State->Reservations.RemoveAll([](const FPartyReservation& Reservation)
 								{
-									UE_LOG(LogPartyBeacon, Log, TEXT("Removing reservation with party leader %s because there are no more members in it"),
-										*Reservation.PartyLeader.ToString());
-								}
-								return bEmptyReservation;
-							});
-							State->SanityCheckReservations(false);
+									bool bEmptyReservation = Reservation.PartyMembers.Num() == 0;
+									if (bEmptyReservation)
+									{
+										UE_LOG(LogPartyBeacon, Log, TEXT("Removing reservation with party leader %s because there are no more members in it"),
+											*Reservation.PartyLeader.ToString());
+									}
+									return bEmptyReservation;
+								});
+								State->SanityCheckReservations(false);
+							}
+
+							Result = EPartyReservationResult::ReservationAccepted;
+						}
+						else
+						{
+							Result = EPartyReservationResult::ReservationDenied_CrossPlayRestriction;
 						}
-						
-						Result = EPartyReservationResult::ReservationAccepted;
 					}
 					else
 					{
@@ -960,6 +983,26 @@ void APartyBeaconHost::ProcessReservationUpdateRequest(APartyBeaconClient* Clien
 	}
 }
 
+bool APartyBeaconHost::HasCrossplayOptOutReservation() const
+{
+	if (State)
+	{
+		return State->HasCrossplayOptOutReservation();
+	}
+
+	return false;
+}
+
+int32 APartyBeaconHost::GetReservationPlatformCount(const FString& InPlatform) const
+{
+	if (State)
+	{
+		return State->GetReservationPlatformCount(InPlatform);
+	}
+
+	return 0;
+}
+
 void APartyBeaconHost::ProcessCancelReservationRequest(APartyBeaconClient* Client, const FUniqueNetIdRepl& PartyLeader)
 {
 	UE_LOG(LogPartyBeacon, Verbose, TEXT("ProcessCancelReservationRequest %s PartyLeader: %s from (%s)"), 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconState.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconState.cpp
index 41d94e8b7e8b..14567b5ea6b1 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconState.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/PartyBeaconState.cpp
@@ -28,6 +28,12 @@ bool FPartyReservation::IsValid() const
 				break;
 			}
 
+			if (PlayerRes.Platform.IsEmpty())
+			{
+				bIsValid = false;
+				break;
+			}
+
 			if (PartyLeader == PlayerRes.UniqueId &&
 				PlayerRes.ValidationStr.IsEmpty())
 			{
@@ -53,6 +59,7 @@ void FPartyReservation::Dump() const
 		UE_LOG(LogPartyBeacon, Display, TEXT("    Member %d"), PartyMemberIdx);
 		++PartyMemberIdx;
 		UE_LOG(LogPartyBeacon, Display, TEXT("      UniqueId: %s"), *PartyMember.UniqueId.ToString());
+		UE_LOG(LogPartyBeacon, Display, TEXT("		Crossplay: %s"), *LexToString(PartyMember.bAllowCrossplay));
 #if UE_BUILD_SHIPPING
 		UE_LOG(LogPartyBeacon, Display, TEXT("      ValidationStr: %d bytes"), PartyMember.ValidationStr.Len());
 #else
@@ -87,7 +94,8 @@ UPartyBeaconState::UPartyBeaconState(const FObjectInitializer& ObjectInitializer
 	NumPlayersPerTeam(0),
 	TeamAssignmentMethod(ETeamAssignmentMethod::Smallest),
 	ReservedHostTeamNum(0),
-	ForceTeamNum(0)
+	ForceTeamNum(0),
+	bRestrictCrossConsole(true)
 {
 }
 
@@ -420,6 +428,140 @@ bool UPartyBeaconState::AreTeamsAvailable(const FPartyReservation& ReservationRe
 	return false;
 }
 
+bool UPartyBeaconState::HasCrossplayOptOutReservation() const
+{
+	for (const FPartyReservation& ExistingReservation : Reservations)
+	{
+		for (const FPlayerReservation& ExistingPlayer : ExistingReservation.PartyMembers)
+		{
+			if (!ExistingPlayer.bAllowCrossplay)
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+int32 UPartyBeaconState::GetReservationPlatformCount(const FString& InPlatform) const
+{
+	int32 PlayerCount = 0;
+	for (const FPartyReservation& ExistingReservation : Reservations)
+	{
+		for (const FPlayerReservation& ExistingPlayer : ExistingReservation.PartyMembers)
+		{
+			if (ExistingPlayer.Platform == InPlatform)
+			{
+				PlayerCount++;
+			}
+		}
+	}
+
+	return PlayerCount;
+}
+
+bool UPartyBeaconState::CrossPlayAllowed(const FPartyReservation& ReservationRequest) const
+{
+	bool bCrossplayAllowed = true;
+
+	bool bEveryoneAllowsCrossplay = true;
+	TSet<FString> ExistingPlatforms;
+	for (const FPartyReservation& ExistingReservation : Reservations)
+	{
+		for (const FPlayerReservation& ExistingPlayer : ExistingReservation.PartyMembers)
+		{
+			bEveryoneAllowsCrossplay &= ExistingPlayer.bAllowCrossplay;
+			if (ExistingPlayer.Platform == OSS_PLATFORM_NAME_PS4)
+			{
+				ExistingPlatforms.Add(OSS_PLATFORM_NAME_PS4);
+			}
+			else if (ExistingPlayer.Platform == OSS_PLATFORM_NAME_XBOX)
+			{
+				ExistingPlatforms.Add(OSS_PLATFORM_NAME_XBOX);
+			}
+			else if (ExistingPlayer.Platform == OSS_PLATFORM_NAME_EREBUS)
+			{
+				ExistingPlatforms.Add(OSS_PLATFORM_NAME_EREBUS);
+			}
+			else
+			{
+				ExistingPlatforms.Add(OSS_PLATFORM_NAME_OTHER);
+			}
+		}
+	}
+
+	if (ExistingPlatforms.Num() > 0)
+	{
+		bool bPartyAllowsCrossplay = true;
+		TSet<FString> PartyPlatforms;
+		for (const FPlayerReservation& Player : ReservationRequest.PartyMembers)
+		{
+			bPartyAllowsCrossplay &= Player.bAllowCrossplay;
+			if (Player.Platform == OSS_PLATFORM_NAME_XBOX)
+			{
+				PartyPlatforms.Add(OSS_PLATFORM_NAME_XBOX);
+			}
+			else if (Player.Platform == OSS_PLATFORM_NAME_PS4)
+			{
+				PartyPlatforms.Add(OSS_PLATFORM_NAME_PS4);
+			}
+			else if (Player.Platform == OSS_PLATFORM_NAME_EREBUS)
+			{
+				PartyPlatforms.Add(OSS_PLATFORM_NAME_EREBUS);
+			}
+			else
+			{
+				PartyPlatforms.Add(OSS_PLATFORM_NAME_OTHER);
+			}
+		}
+
+		const bool bPS4SeenOtherConsole = (
+			((PartyPlatforms.Contains(OSS_PLATFORM_NAME_XBOX) || PartyPlatforms.Contains(OSS_PLATFORM_NAME_EREBUS)) && ExistingPlatforms.Contains(OSS_PLATFORM_NAME_PS4)) ||
+			(PartyPlatforms.Contains(OSS_PLATFORM_NAME_PS4) && (ExistingPlatforms.Contains(OSS_PLATFORM_NAME_XBOX) || ExistingPlatforms.Contains(OSS_PLATFORM_NAME_EREBUS)))
+		);
+
+
+		TSet<FString> Delta = PartyPlatforms.Intersect(ExistingPlatforms);
+
+		// The intersection of party/existing will be less if something new is added
+		const bool bPartyAddsNewPlatform = (Delta.Num() != PartyPlatforms.Num());
+		// There is something foreign if our party makeup doesn't exactly match the existing parties
+		const bool bExistingMatchesParty = (Delta.Num() == ExistingPlatforms.Num());
+
+		// Don't cross mingle consoles
+		const bool bCrossConsoleAllowed = (!bPS4SeenOtherConsole) || (bPS4SeenOtherConsole && !bRestrictCrossConsole);
+		const bool bExistingPlayersOk = (!bPartyAddsNewPlatform || (bPartyAddsNewPlatform && bEveryoneAllowsCrossplay));
+		const bool bIncomingPlayersOk = (bPartyAllowsCrossplay || bExistingMatchesParty);
+
+		bCrossplayAllowed = bCrossConsoleAllowed && bExistingPlayersOk && bIncomingPlayersOk;
+
+		FString ExistingStr;
+		for (const FString& Existing : ExistingPlatforms)
+		{
+			ExistingStr += Existing + TEXT("|");
+		}
+		UE_LOG(LogPartyBeacon, Verbose, TEXT("Existing: %s"), *ExistingStr);
+
+		FString PartyPlatformStr;
+		for (const FString& PartyPlatform : PartyPlatforms)
+		{
+			PartyPlatformStr += PartyPlatform + TEXT("|");
+		}
+		UE_LOG(LogPartyBeacon, Verbose, TEXT("NewParty: %s"), *PartyPlatformStr);
+
+		UE_LOG(LogPartyBeacon, Log, TEXT("UPartyBeaconState::CrossPlayAllowed bEveryoneAllowsCrossplay:%s bPartyAllowsCrossplay:%s bCrossConsoleAllowed:%s bExistingPlayersOk:%s bIncomingPlayersOk:%s bCrossPlayAllowed:%s"),
+			*LexToString(bEveryoneAllowsCrossplay),
+			*LexToString(bPartyAllowsCrossplay),
+			*LexToString(bCrossConsoleAllowed),
+			*LexToString(bExistingPlayersOk),
+			*LexToString(bIncomingPlayersOk),
+			*LexToString(bCrossplayAllowed));
+	}
+
+	return bCrossplayAllowed;
+}
+
 bool UPartyBeaconState::DoesReservationFit(const FPartyReservation& ReservationRequest) const
 {
 	const int32 IncomingPartySize = ReservationRequest.PartyMembers.Num();
@@ -897,7 +1039,7 @@ void UPartyBeaconState::DumpReservations() const
 		for (int32 MemberIndex = 0; MemberIndex < Reservations[PartyIndex].PartyMembers.Num(); MemberIndex++)
 		{
 			PlayerRes = Reservations[PartyIndex].PartyMembers[MemberIndex];
-			UE_LOG(LogPartyBeacon, Display, TEXT("\t  Party member: %s"), *PlayerRes.UniqueId->ToString());
+			UE_LOG(LogPartyBeacon, Display, TEXT("\t  Party member: %s [%s] Cross: %s"), *PlayerRes.UniqueId->ToString(), *PlayerRes.Platform, *LexToString(PlayerRes.bAllowCrossplay));
 		}
 	}
 	UE_LOG(LogPartyBeacon, Display, TEXT(""));
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/ShowLoginUICallbackProxy.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/ShowLoginUICallbackProxy.cpp
index d6bcc00334ed..70314987306c 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/ShowLoginUICallbackProxy.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/ShowLoginUICallbackProxy.cpp
@@ -68,7 +68,7 @@ void UShowLoginUICallbackProxy::Activate()
 	}
 }
 
-void UShowLoginUICallbackProxy::OnShowLoginUICompleted(TSharedPtr<const FUniqueNetId> UniqueId, int LocalPlayerNum)
+void UShowLoginUICallbackProxy::OnShowLoginUICompleted(TSharedPtr<const FUniqueNetId> UniqueId, int LocalPlayerNum, const FOnlineError& Error)
 {
 	// Update the cached unique ID for the local player and the player state.
 	APlayerController* MyPlayerController = PlayerControllerWeakPtr.Get();
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestAchievementsInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestAchievementsInterface.cpp
index 68072e5875a1..95301b4f2f41 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestAchievementsInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestAchievementsInterface.cpp
@@ -17,7 +17,7 @@
 
 void FTestAchievementsInterface::Test(UWorld* InWorld)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestAchievementsInterface::Test"));
+	UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("FTestAchievementsInterface::Test"));
 
 	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(InWorld, FName(*SubsystemName));
 	check(OnlineSub); 
@@ -35,7 +35,7 @@ void FTestAchievementsInterface::Test(UWorld* InWorld)
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: OSS [%s] does not have a valid achievement interface or identity interface for this test to run."), *SubsystemName );
+		UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: OSS [%s] does not have a valid achievement interface or identity interface for this test to run."), *SubsystemName );
 		delete this;
 	}
 }
@@ -50,24 +50,24 @@ void FTestAchievementsInterface::ReadAchievements()
 
 void FTestAchievementsInterface::OnQueryAchievementsComplete(const FUniqueNetId& PlayerId, const bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestAchievementsInterface::OnQueryAchievementsComplete"));
+	UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("FTestAchievementsInterface::OnQueryAchievementsComplete"));
 
 	if (bWasSuccessful)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Loaded Achievements"));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("Loaded Achievements"));
 
 		TArray<FOnlineAchievement> PlayerAchievements;
 		if (OnlineAchievements->GetCachedAchievements(*UserId.Get(), PlayerAchievements) != EOnlineCachedResult::Success || PlayerAchievements.Num() == 0)
 		{
-			UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
+			UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
 			delete this;
 			return;
 		}
 
-		UE_LOG(LogOnline, Display, TEXT("Number of Achievements: %d"), PlayerAchievements.Num());
+		UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("Number of Achievements: %d"), PlayerAchievements.Num());
 		for(int32 Idx = 0; Idx < PlayerAchievements.Num(); ++Idx)
 		{
-			UE_LOG(LogOnline, Display, TEXT(" Achievement %d: %s"), Idx, *PlayerAchievements[ Idx ].ToDebugString());
+			UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT(" Achievement %d: %s"), Idx, *PlayerAchievements[ Idx ].ToDebugString());
 		}
 
 		QueryAchievementDescriptions( PlayerId );
@@ -75,7 +75,7 @@ void FTestAchievementsInterface::OnQueryAchievementsComplete(const FUniqueNetId&
 	else
 	{
 		// if our test failed, be sure to clean itself up
-		UE_LOG(LogOnline, Display, TEXT("TEST FAILED: Failed to Load Achievements"));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("TEST FAILED: Failed to Load Achievements"));
 		delete this;
 	}
 }
@@ -90,16 +90,16 @@ void FTestAchievementsInterface::QueryAchievementDescriptions(const FUniqueNetId
 
 void FTestAchievementsInterface::OnQueryAchievementDescriptionsComplete(const FUniqueNetId& PlayerId, const bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestAchievementsInterface::OnQueryAchievementDescriptionsComplete"));
+	UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("FTestAchievementsInterface::OnQueryAchievementDescriptionsComplete"));
 
 	if (bWasSuccessful)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Loaded Achievement descriptions"));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("Loaded Achievement descriptions"));
 
 		TArray<FOnlineAchievement> PlayerAchievements;
 		if (OnlineAchievements->GetCachedAchievements(*UserId.Get(), PlayerAchievements) != EOnlineCachedResult::Success || PlayerAchievements.Num() == 0)
 		{
-			UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
+			UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
 			delete this;
 			return;
 		}
@@ -109,13 +109,13 @@ void FTestAchievementsInterface::OnQueryAchievementDescriptionsComplete(const FU
 			FOnlineAchievementDesc Desc;
 			if (OnlineAchievements->GetCachedAchievementDescription(PlayerAchievements[ Idx ].Id, Desc) != EOnlineCachedResult::Success)
 			{
-				UE_LOG(LogOnline, Warning, TEXT("Failed to GetCachedAchievementDescription() for achievement '%s'"),
+				UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("Failed to GetCachedAchievementDescription() for achievement '%s'"),
 					*PlayerAchievements[ Idx ].Id
 					);
 				delete this;
 				return;
 			}
-			UE_LOG(LogOnline, Display, TEXT(" Descriptor for achievement '%s': %s"), *PlayerAchievements[ Idx ].Id, *Desc.ToDebugString());
+			UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT(" Descriptor for achievement '%s': %s"), *PlayerAchievements[ Idx ].Id, *Desc.ToDebugString());
 		}
 		
 		WriteAchievements();
@@ -123,7 +123,7 @@ void FTestAchievementsInterface::OnQueryAchievementDescriptionsComplete(const FU
 	else
 	{
 		// if our test failed, be sure to clean itself up
-		UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: Failed to Load Achievement descriptions"));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: Failed to Load Achievement descriptions"));
 		delete this;
 	}
 }
@@ -137,7 +137,7 @@ void FTestAchievementsInterface::WriteAchievements()
 	TArray<FOnlineAchievement> PlayerAchievements;
 	if (OnlineAchievements->GetCachedAchievements(*UserId.Get(), PlayerAchievements) != EOnlineCachedResult::Success || PlayerAchievements.Num() == 0)
 	{
-		UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: Either GetCachedAchievements() failed or number of achievements is 0"));
 		delete this;
 		return;
 	}
@@ -166,7 +166,7 @@ void FTestAchievementsInterface::WriteAchievements()
 
 void FTestAchievementsInterface::OnAchievementsWritten(const FUniqueNetId& PlayerId, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestAchievementsInterface::OnAchievementsWritten( bWasSuccessful = %s )"), bWasSuccessful ? TEXT("true") : TEXT("false"));
+	UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("FTestAchievementsInterface::OnAchievementsWritten( bWasSuccessful = %s )"), bWasSuccessful ? TEXT("true") : TEXT("false"));
 
 	// Clear our delegate and delete this test.
 	OnlineAchievements->ClearOnAchievementUnlockedDelegate_Handle(OnAchievementUnlockedDelegateHandle);
@@ -177,13 +177,13 @@ void FTestAchievementsInterface::OnAchievementsWritten(const FUniqueNetId& Playe
 		OnlineAchievements->ResetAchievements(*UserId.Get());
 #endif // !UE_BUILD_SHIPPING
 		// TODO: spin for a while?
-		UE_LOG(LogOnline, Display, TEXT("TEST COMPLETED SUCCESSFULLY."));
+		UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("TEST COMPLETED SUCCESSFULLY."));
 	}
 	else
 	{
 		if (WriteObject->WriteState != EOnlineAsyncTaskState::Done)
 		{
-			UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: WriteObject->WriteState is not in state %s, but instead %s"),
+			UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: WriteObject->WriteState is not in state %s, but instead %s"),
 				EOnlineAsyncTaskState::ToString(EOnlineAsyncTaskState::Done),
 				EOnlineAsyncTaskState::ToString(WriteObject->WriteState)
 				);
@@ -191,7 +191,7 @@ void FTestAchievementsInterface::OnAchievementsWritten(const FUniqueNetId& Playe
 
 		if (!bWasSuccessful)
 		{
-			UE_LOG(LogOnline, Warning, TEXT("TEST FAILED: Write did not complete successfully") );
+			UE_LOG_ONLINE_ACHIEVEMENTS(Warning, TEXT("TEST FAILED: Write did not complete successfully") );
 		}
 	}
 
@@ -200,7 +200,7 @@ void FTestAchievementsInterface::OnAchievementsWritten(const FUniqueNetId& Playe
 
 void FTestAchievementsInterface::OnAchievementsUnlocked(const FUniqueNetId& PlayerId, const FString& AchievementId)
 {
-	UE_LOG(LogOnline, Display, TEXT("Achievement Unlocked - %s"), *AchievementId);
+	UE_LOG_ONLINE_ACHIEVEMENTS(Display, TEXT("Achievement Unlocked - %s"), *AchievementId);
 }
 
 #endif //WITH_DEV_AUTOMATION_TESTS
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestCloudInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestCloudInterface.cpp
index 7d09a4f5e674..05abc81ed222 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestCloudInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestCloudInterface.cpp
@@ -39,30 +39,32 @@ void FTestCloudInterface::Test(UWorld* InWorld)
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Cloud test failed.  Cloud API not supported."));
+			UE_LOG_ONLINE_CLOUD(Warning, TEXT("Cloud test failed.  Cloud API not supported."));
 			delete this;
 		}
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Cloud test failed.  No logged in user."));
+		UE_LOG_ONLINE_CLOUD(Warning, TEXT("Cloud test failed.  No logged in user."));
 		delete this;
 	}
 }
 
 bool FTestCloudInterface::Tick( float DeltaTime )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTestCloudInterface_Tick);
+
 	if (TestPhase != LastTestPhase)
 	{
 		if (!bOverallSuccess)
 		{
-			UE_LOG(LogOnline, Log, TEXT("Testing failed in phase %d"), LastTestPhase);
+			UE_LOG_ONLINE_CLOUD(Log, TEXT("Testing failed in phase %d"), LastTestPhase);
 			TestPhase = 10;
 		}
 		if (!SharedCloud.IsValid() && 
 			TestPhase > 4)
 		{
-			UE_LOG(LogOnline, Log, TEXT("Skipping shared cloud tests"));
+			UE_LOG_ONLINE_CLOUD(Log, TEXT("Skipping shared cloud tests"));
 			TestPhase = 10;
 		}
 
@@ -111,7 +113,7 @@ bool FTestCloudInterface::Tick( float DeltaTime )
 			break;	
 		case 10:
 			bOverallSuccess = bOverallSuccess && Cleanup();
-			UE_LOG(LogOnline, Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
+			UE_LOG_ONLINE_CLOUD(Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
 			delete this;
 			return false;
 		}
@@ -126,13 +128,13 @@ bool FTestCloudInterface::Cleanup()
 	if (UserCloud.IsValid() &&
 		!UserCloud->ClearFiles(*UserId))
 	{
-		UE_LOG(LogOnline, Log, TEXT("Failed to cleanup user files"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Failed to cleanup user files"));
 		bSuccess = false;
 	}
 	if (SharedCloud.IsValid() &&
 		!SharedCloud->ClearSharedFiles())
 	{
-		UE_LOG(LogOnline, Log, TEXT("Failed to cleanup shared files"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Failed to cleanup shared files"));
 		bSuccess = false;
 	}
 
@@ -147,8 +149,8 @@ void FTestCloudInterface::EnumerateUserFiles()
 
 void FTestCloudInterface::OnEnumerateUserFilesComplete(bool bWasSuccessful, const FUniqueNetId& InUserId)
 {
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("OnEnumerateUserFilesComplete Success:%d UserId:%s"), bWasSuccessful, *InUserId.ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("OnEnumerateUserFilesComplete Success:%d UserId:%s"), bWasSuccessful, *InUserId.ToDebugString());
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	TArray<FCloudFileHeader> UserFiles;
@@ -157,7 +159,7 @@ void FTestCloudInterface::OnEnumerateUserFilesComplete(bool bWasSuccessful, cons
 
 	for (int32 Idx=0; Idx<UserFiles.Num(); Idx++)
 	{
-		UE_LOG(LogOnline, Log, TEXT("\t%d FileName:%s DLName:%s Hash:%s Size:%d"),
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("\t%d FileName:%s DLName:%s Hash:%s Size:%d"),
 			Idx, *UserFiles[Idx].FileName, *UserFiles[Idx].DLName, *UserFiles[Idx].Hash, UserFiles[Idx].FileSize);
 	}
 
@@ -177,8 +179,8 @@ void FTestCloudInterface::WriteRandomFile(TArray<uint8>& Buffer, int32 Size)
 
 FDelegateHandle FTestCloudInterface::WriteNUserCloudFiles(const FUniqueNetId& InUserId, const FString& FileNameBase, int32 FileCount, FOnWriteUserFileCompleteDelegate& Delegate)
 {
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("Writing %d files to the cloud for user %s"), FileCount, *InUserId.ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Writing %d files to the cloud for user %s"), FileCount, *InUserId.ToDebugString());
 
 	FString FileName(FileNameBase);
 
@@ -199,8 +201,8 @@ FDelegateHandle FTestCloudInterface::WriteNUserCloudFiles(const FUniqueNetId& In
 
 FDelegateHandle FTestCloudInterface::WriteNSharedCloudFiles(const FUniqueNetId& InUserId, const FString& FileNameBase, int32 FileCount, FOnWriteSharedFileCompleteDelegate& Delegate)
 {
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("Writing %d files to the cloud and sharing for user %s"), FileCount, *InUserId.ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Writing %d files to the cloud and sharing for user %s"), FileCount, *InUserId.ToDebugString());
 
 	FString FileName(FileNameBase);
 
@@ -219,7 +221,7 @@ FDelegateHandle FTestCloudInterface::WriteNSharedCloudFiles(const FUniqueNetId&
 
 void FTestCloudInterface::OnWriteUserCloudFileComplete(bool bWasSuccessful, const FUniqueNetId& InUserId, const FString& FileName)
 {
-	UE_LOG(LogOnline, Log, TEXT("Write user file complete Success:%d UserId:%s FileName:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName);
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Write user file complete Success:%d UserId:%s FileName:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName);
 	
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
@@ -227,8 +229,8 @@ void FTestCloudInterface::OnWriteUserCloudFileComplete(bool bWasSuccessful, cons
 	NumWrittenCount++;
 	if (NumWrittenCount == WriteUserCloudFileCount)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Write %d User Files Complete!"), NumWrittenCount);
-		UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Write %d User Files Complete!"), NumWrittenCount);
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
 		UserCloud->ClearOnWriteUserFileCompleteDelegate_Handle(OnWriteUserCloudFileCompleteDelegateHandle);
 		NumWrittenCount = 0;
 		EnumerateUserFiles();
@@ -242,8 +244,8 @@ FDelegateHandle FTestCloudInterface::ReadEnumeratedUserFiles(FOnReadUserFileComp
 
 	ReadUserFileCount = UserFiles.Num();
 
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("Reading %d enumerated files for user %s"), ReadUserFileCount, *UserId->ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Reading %d enumerated files for user %s"), ReadUserFileCount, *UserId->ToDebugString());
 
 	FDelegateHandle Result;
 	if (ReadUserFileCount > 0)
@@ -251,7 +253,7 @@ FDelegateHandle FTestCloudInterface::ReadEnumeratedUserFiles(FOnReadUserFileComp
 		Result = UserCloud->AddOnReadUserFileCompleteDelegate_Handle(Delegate);
 		for (int32 Idx=0; Idx < ReadUserFileCount; Idx++)
 		{
-			UE_LOG(LogOnline, Log, TEXT("\tFileName:%s Size:%d"), *UserFiles[Idx].FileName, UserFiles[Idx].FileSize);
+			UE_LOG_ONLINE_CLOUD(Log, TEXT("\tFileName:%s Size:%d"), *UserFiles[Idx].FileName, UserFiles[Idx].FileSize);
 			UserCloud->ReadUserFile(*UserId, UserFiles[Idx].FileName);
 		}
 	}
@@ -275,15 +277,15 @@ void FTestCloudInterface::OnReadEnumeratedUserFilesComplete(bool bWasSuccessful,
 		buffer = (char *) FileContents.GetData();
 	}
 
-	UE_LOG(LogOnline, Log, TEXT("Read user file complete Success:%d UserId:%s FileName:%s Size:%d"), bWasSuccessful, *InUserId.ToDebugString(), *FileName, FileSize);
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Read user file complete Success:%d UserId:%s FileName:%s Size:%d"), bWasSuccessful, *InUserId.ToDebugString(), *FileName, FileSize);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	static int32 NumReadCount = 0;
 	NumReadCount++;
 	if (NumReadCount == ReadUserFileCount)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Read %d User Files Complete!"), NumReadCount);
-		UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Read %d User Files Complete!"), NumReadCount);
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
 		UserCloud->ClearOnReadUserFileCompleteDelegate_Handle(OnReadEnumeratedUserFilesCompleteDelegateHandle);
 		NumReadCount = 0;
 		EnumerateUserFiles();
@@ -297,15 +299,15 @@ FDelegateHandle FTestCloudInterface::DeleteEnumeratedUserFiles(bool bCloudDelete
 
 	DeleteUserFileCount = UserFiles.Num();
 
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("Deleting %d files from the cloud for user %s CLOUD: %s LOCAL: %s"), DeleteUserFileCount, *UserId->ToDebugString(), bCloudDelete ? TEXT("true") : TEXT("false"), bLocalDelete ? TEXT("true") : TEXT("false"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Deleting %d files from the cloud for user %s CLOUD: %s LOCAL: %s"), DeleteUserFileCount, *UserId->ToDebugString(), bCloudDelete ? TEXT("true") : TEXT("false"), bLocalDelete ? TEXT("true") : TEXT("false"));
 	FDelegateHandle Result;
 	if (DeleteUserFileCount > 0)
 	{
 		Result = UserCloud->AddOnDeleteUserFileCompleteDelegate_Handle(Delegate);
 		for (int32 Idx=0; Idx < DeleteUserFileCount; Idx++)
 		{
-			UE_LOG(LogOnline, Log, TEXT("\tFileName:%s Size:%d"), *UserFiles[Idx].FileName, UserFiles[Idx].FileSize);
+			UE_LOG_ONLINE_CLOUD(Log, TEXT("\tFileName:%s Size:%d"), *UserFiles[Idx].FileName, UserFiles[Idx].FileSize);
 			UserCloud->DeleteUserFile(*UserId, UserFiles[Idx].FileName, bCloudDelete, bLocalDelete);
 		}
 	}
@@ -319,15 +321,15 @@ FDelegateHandle FTestCloudInterface::DeleteEnumeratedUserFiles(bool bCloudDelete
 
 void FTestCloudInterface::OnDeleteEnumeratedUserFilesComplete(bool bWasSuccessful, const FUniqueNetId& InUserId, const FString& FileName)
 {
-	UE_LOG(LogOnline, Log, TEXT("Delete user file complete Success:%d UserId:%s FileName:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName);
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Delete user file complete Success:%d UserId:%s FileName:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	static int32 NumDeletedCount = 0;
 	NumDeletedCount++;
 	if (NumDeletedCount == DeleteUserFileCount)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Delete %d User Files Complete!"), NumDeletedCount);
-		UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Delete %d User Files Complete!"), NumDeletedCount);
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
 		UserCloud->ClearOnDeleteUserFileCompleteDelegate_Handle(OnDeleteEnumeratedUserFilesCompleteDelegateHandle);
 		NumDeletedCount = 0;
 		EnumerateUserFiles();
@@ -336,7 +338,7 @@ void FTestCloudInterface::OnDeleteEnumeratedUserFilesComplete(bool bWasSuccessfu
 
 void FTestCloudInterface::OnWriteSharedCloudFileComplete(bool bWasSuccessful, const FUniqueNetId& InUserId, const FString& FileName, const TSharedRef<FSharedContentHandle>& SharedHandle)
 {
-	UE_LOG(LogOnline, Log, TEXT("Write shared file complete Success:%d UserId:%s FileName:%s SharedHandle:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName, *SharedHandle->ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Write shared file complete Success:%d UserId:%s FileName:%s SharedHandle:%s"), bWasSuccessful, *InUserId.ToDebugString(), *FileName, *SharedHandle->ToDebugString());
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	CloudFileHandles.Add(SharedHandle);
@@ -345,8 +347,8 @@ void FTestCloudInterface::OnWriteSharedCloudFileComplete(bool bWasSuccessful, co
 	NumWrittenCount++;
 	if (NumWrittenCount == WriteSharedCloudFileCount)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Write %d Shared Files Complete!"), NumWrittenCount);
-		UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Write %d Shared Files Complete!"), NumWrittenCount);
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
 		SharedCloud->ClearOnWriteSharedFileCompleteDelegate_Handle(OnWriteSharedCloudFileCompleteDelegateHandle);
 		NumWrittenCount = 0;
 		// Enumeration will put the newly shared files into this user's list
@@ -365,8 +367,8 @@ FDelegateHandle FTestCloudInterface::ReadEnumeratedSharedFiles(bool bUseRandom,
 		ReadSharedFileCount = CloudFileHandles.Num();
 	}
 	
-	UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
-	UE_LOG(LogOnline, Log, TEXT("Reading %d enumerated shared files"), ReadSharedFileCount);
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Reading %d enumerated shared files"), ReadSharedFileCount);
 
 	FDelegateHandle Result;
 	if (ReadSharedFileCount > 0)
@@ -376,12 +378,12 @@ FDelegateHandle FTestCloudInterface::ReadEnumeratedSharedFiles(bool bUseRandom,
 		{
 			if (bUseRandom)
 			{
-				UE_LOG(LogOnline, Log, TEXT("\tHandle:%s"), *RandomSharedFileHandles[Idx]->ToDebugString());
+				UE_LOG_ONLINE_CLOUD(Log, TEXT("\tHandle:%s"), *RandomSharedFileHandles[Idx]->ToDebugString());
 				SharedCloud->ReadSharedFile(*RandomSharedFileHandles[Idx]);
 			}
 			else
 			{
-				UE_LOG(LogOnline, Log, TEXT("\tHandle:%s"), *CloudFileHandles[Idx]->ToDebugString());
+				UE_LOG_ONLINE_CLOUD(Log, TEXT("\tHandle:%s"), *CloudFileHandles[Idx]->ToDebugString());
 				SharedCloud->ReadSharedFile(*CloudFileHandles[Idx]);
 			}
 		}
@@ -396,15 +398,15 @@ FDelegateHandle FTestCloudInterface::ReadEnumeratedSharedFiles(bool bUseRandom,
 
 void FTestCloudInterface::OnReadEnumeratedSharedFileCompleteDelegate(bool bWasSuccessful, const FSharedContentHandle& SharedHandle)
 {
-	UE_LOG(LogOnline, Log, TEXT("Read shared file complete Success:%d SharedHandle:%s"), bWasSuccessful, *SharedHandle.ToDebugString());
+	UE_LOG_ONLINE_CLOUD(Log, TEXT("Read shared file complete Success:%d SharedHandle:%s"), bWasSuccessful, *SharedHandle.ToDebugString());
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	static int32 NumReadCount = 0;
 	NumReadCount++;
 	if (NumReadCount == ReadSharedFileCount)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Read %d Shared Files Complete!"), NumReadCount);
-		UE_LOG(LogOnline, Log, TEXT("------------------------------------------------"));
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("Read %d Shared Files Complete!"), NumReadCount);
+		UE_LOG_ONLINE_CLOUD(Log, TEXT("------------------------------------------------"));
 		SharedCloud->ClearOnReadSharedFileCompleteDelegate_Handle(OnReadEnumerateSharedFileCompleteDelegateHandle);
 		NumReadCount = 0;
 		EnumerateUserFiles();
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestEntitlementsInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestEntitlementsInterface.cpp
index 584bb27bb551..b5a7795ac685 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestEntitlementsInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestEntitlementsInterface.cpp
@@ -27,7 +27,7 @@ void FTestEntitlementsInterface::Test(UWorld* InWorld)
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Entitlement test failed. Failed to get entitlement service API"));
+			UE_LOG_ONLINE_ENTITLEMENT(Warning, TEXT("Entitlement test failed. Failed to get entitlement service API"));
 
 			// done with the test
 			FinishTest();
@@ -35,7 +35,7 @@ void FTestEntitlementsInterface::Test(UWorld* InWorld)
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Entitlement test failed. No logged in user"));
+		UE_LOG_ONLINE_ENTITLEMENT(Warning, TEXT("Entitlement test failed. No logged in user"));
 
 		// done with the test
 		FinishTest();
@@ -70,7 +70,7 @@ void FTestEntitlementsInterface::FinishTest()
 
 void FTestEntitlementsInterface::OnQueryEntitlementsComplete(bool bWasSuccessful, const FUniqueNetId& InUserId, const FString& Namespace, const FString& Error)
 {
-	UE_LOG(LogOnline, Log, TEXT("enumerated entitlements. UserId=%s Result=%s Error=[%s]"), 
+	UE_LOG_ONLINE_ENTITLEMENT(Log, TEXT("enumerated entitlements. UserId=%s Result=%s Error=[%s]"), 
 		*InUserId.ToDebugString(), bWasSuccessful ? TEXT("true") : TEXT("false"), *Error);
 
 	// Now check em out
@@ -80,7 +80,7 @@ void FTestEntitlementsInterface::OnQueryEntitlementsComplete(bool bWasSuccessful
 	for (auto It = Entitlements.CreateConstIterator(); It; ++It)
 	{
 		const TSharedRef<FOnlineEntitlement> Entry = *It;
-		UE_LOG(LogOnline, Log, TEXT("	entitlement id=%s name=%s"),
+		UE_LOG_ONLINE_ENTITLEMENT(Log, TEXT("	entitlement id=%s name=%s"),
 			*Entry->Id, *Entry->Name);
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.cpp
index 38a3c3be6139..c8b43c791ef2 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.cpp
@@ -22,7 +22,7 @@ void FTestExternalUIInterface::Test()
 	// Are we testing at least one of our external UI?
 	if (bTestLoginUI == false && bTestFriendsUI == false && bTestInviteUI == false && bTestAchievementsUI == false && bTestWebURL == false && bTestProfileUI == false)
 	{
-		UE_LOG(LogOnline, Error, TEXT("ExternalUI test -- No UIs selected to test"));
+		UE_LOG_ONLINE_EXTERNALUI(Error, TEXT("ExternalUI test -- No UIs selected to test"));
 		FinishTest();
 	}
 	else
@@ -33,7 +33,7 @@ void FTestExternalUIInterface::Test()
 
 void FTestExternalUIInterface::FinishTest()
 {
-	UE_LOG(LogOnline, Log, TEXT("FTestExternalUIInterface::FinishTest -- completed testing"));
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("FTestExternalUIInterface::FinishTest -- completed testing"));
 	ExternalUI->ClearOnExternalUIChangeDelegate_Handle(ExternalUIChangeDelegateHandle);
 	delete this;
 }
@@ -85,12 +85,12 @@ bool FTestExternalUIInterface::TestLoginUI()
 {
 	if (bTestLoginUI == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestLoginUI (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestLoginUI (skipping)"));
 		return false;
 	}
 
 	bool bShowingUI = ExternalUI->ShowLoginUI(0, true, false, FOnLoginUIClosedDelegate::CreateRaw(this, &FTestExternalUIInterface::OnLoginUIClosed));
-	UE_LOG(LogOnline, Log, TEXT("TestLoginUI bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestLoginUI bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
@@ -98,12 +98,12 @@ bool FTestExternalUIInterface::TestFriendsUI()
 {
 	if (bTestFriendsUI == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestFriendsUI (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestFriendsUI (skipping)"));
 		return false;
 	}
 
 	bool bShowingUI = ExternalUI->ShowFriendsUI(0);
-	UE_LOG(LogOnline, Log, TEXT("TestFriendsUI bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestFriendsUI bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
@@ -111,12 +111,12 @@ bool FTestExternalUIInterface::TestInviteUI()
 {
 	if (bTestInviteUI == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestInviteUI (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestInviteUI (skipping)"));
 		return false;
 	}
 
 	bool bShowingUI = ExternalUI->ShowInviteUI(0);
-	UE_LOG(LogOnline, Log, TEXT("TestInviteUI bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestInviteUI bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
@@ -125,12 +125,12 @@ bool FTestExternalUIInterface::TestAchievementsUI()
 {
 	if (bTestAchievementsUI == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestAchievementsUI (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestAchievementsUI (skipping)"));
 		return false;
 	}
 
 	bool bShowingUI = ExternalUI->ShowAchievementsUI(0);
-	UE_LOG(LogOnline, Log, TEXT("TestAchievementsUI bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestAchievementsUI bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
@@ -139,7 +139,7 @@ bool FTestExternalUIInterface::TestWebURL()
 {
 	if (bTestWebURL == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestWebURL (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestWebURL (skipping)"));
 		return false;
 	}
 
@@ -148,7 +148,7 @@ bool FTestExternalUIInterface::TestWebURL()
 		FShowWebUrlParams(),
 		FOnShowWebUrlClosedDelegate::CreateRaw(this, &FTestExternalUIInterface::OnShowWebUrlClosed));
 
-	UE_LOG(LogOnline, Log, TEXT("TestWebURL bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestWebURL bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
@@ -156,7 +156,7 @@ bool FTestExternalUIInterface::TestProfileUI()
 {
 	if (bTestProfileUI == false)
 	{
-		UE_LOG(LogOnline, Log, TEXT("TestProfileUI (skipping)"));
+		UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestProfileUI (skipping)"));
 		return false;
 	}
 
@@ -167,13 +167,13 @@ bool FTestExternalUIInterface::TestProfileUI()
 		*UserId.Get(),
 		FOnProfileUIClosedDelegate::CreateRaw(this, &FTestExternalUIInterface::OnProfileUIClosed));
 
-	UE_LOG(LogOnline, Log, TEXT("TestProfileUI bShowingUI: %d"), bShowingUI);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("TestProfileUI bShowingUI: %d"), bShowingUI);
 	return bShowingUI;
 }
 
 void FTestExternalUIInterface::OnExternalUIChange(bool bIsOpening)
 {
-	UE_LOG(LogOnline, Log, TEXT("OnExternalUIChange delegate invoked. bIsOpening = %d"), bIsOpening);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("OnExternalUIChange delegate invoked. bIsOpening = %d"), bIsOpening);
 
 	if (bIsOpening == false)
 	{
@@ -183,19 +183,19 @@ void FTestExternalUIInterface::OnExternalUIChange(bool bIsOpening)
 	}
 }
 
-void FTestExternalUIInterface::OnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInUserId, const int LocalUserId)
+void FTestExternalUIInterface::OnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInUserId, const int LocalUserId, const FOnlineError& Error)
 {
-	UE_LOG(LogOnline, Log, TEXT("Login UI closed by local user %d. Logged-in user = %s"), LocalUserId, *LoggedInUserId->ToString());
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("Login UI closed by local user %d. Logged-in user = %s.  Error = %s"), LocalUserId, *LoggedInUserId->ToString(), Error.ToLogString());
 }
 
 void FTestExternalUIInterface::OnProfileUIClosed()
 {
-	UE_LOG(LogOnline, Log, TEXT("Profile UI closed by user."));
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("Profile UI closed by user."));
 }
 
 void FTestExternalUIInterface::OnShowWebUrlClosed(const FString& FinalUrl)
 {
-	UE_LOG(LogOnline, Log, TEXT("Show Web Url closed with FinalUrl=%s."), *FinalUrl);
+	UE_LOG_ONLINE_EXTERNALUI(Log, TEXT("Show Web Url closed with FinalUrl=%s."), *FinalUrl);
 }
 
 #endif //WITH_DEV_AUTOMATION_TESTS
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.h
index 4bdd5b96d0f2..a528ffaef33b 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestExternalUIInterface.h
@@ -76,7 +76,7 @@ namespace ETestExternalUIInterfaceState
 	void OnExternalUIChange(bool bIsOpening);
 
 	/** Delegate executed when the user login UI has been closed. */
-	void OnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInUserId, const int LocalUserId);
+	void OnLoginUIClosed(TSharedPtr<const FUniqueNetId> LoggedInUserId, const int LocalUserId, const FOnlineError& Error);
 
 	/** Delegate executed when the user profile UI has been closed. */
 	void OnProfileUIClosed();
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestFriendsInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestFriendsInterface.cpp
index a753a00cbc57..f36b9355429e 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestFriendsInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestFriendsInterface.cpp
@@ -46,7 +46,7 @@ void FTestFriendsInterface::Test(UWorld* InWorld, const TArray<FString>& Invites
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to get friends interface for %s"), *SubsystemName);
+		UE_LOG_ONLINE_FRIEND(Warning, TEXT("Failed to get friends interface for %s"), *SubsystemName);
 		FinishTest();
 	}
 }
@@ -140,7 +140,7 @@ void FTestFriendsInterface::FinishTest()
 
 void FTestFriendsInterface::OnReadFriendsComplete(int32 LocalPlayer, bool bWasSuccessful, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE_FRIEND(Log,
 		TEXT("ReadFriendsList() for player (%d) was success=%d error=%s"), LocalPlayer, bWasSuccessful, *ErrorStr);
 
 	if (bWasSuccessful)
@@ -149,7 +149,7 @@ void FTestFriendsInterface::OnReadFriendsComplete(int32 LocalPlayer, bool bWasSu
 		// Grab the friends data so we can print it out
 		if (OnlineSub->GetFriendsInterface()->GetFriendsList(LocalPlayer, ListName, Friends))
 		{
-			UE_LOG(LogOnline, Log,
+			UE_LOG_ONLINE_FRIEND(Log,
 				TEXT("GetFriendsList(%d) returned %d friends"), LocalPlayer, Friends.Num());
 
 			// Clear old entries
@@ -160,23 +160,23 @@ void FTestFriendsInterface::OnReadFriendsComplete(int32 LocalPlayer, bool bWasSu
 			{
 				const FOnlineFriend& Friend = *Friends[Index];
 				const FOnlineUserPresence& Presence = Friend.GetPresence();
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t%s has unique id (%s)"), *Friend.GetDisplayName(), *Friend.GetUserId()->ToDebugString());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t Invite status (%s)"), EInviteStatus::ToString(Friend.GetInviteStatus()));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t Presence: %s"), *Presence.Status.StatusStr);
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t State: %s"), EOnlinePresenceState::ToString(Presence.Status.State));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t bIsOnline (%s)"), Presence.bIsOnline ? TEXT("true") : TEXT("false"));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t bIsPlaying (%s)"), Presence.bIsPlaying ? TEXT("true") : TEXT("false"));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t bIsPlayingThisGame (%s)"), Presence.bIsPlayingThisGame ? TEXT("true") : TEXT("false"));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t bIsJoinable (%s)"), Presence.bIsJoinable ? TEXT("true") : TEXT("false"));
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t\t bHasVoiceSupport (%s)"), Presence.bHasVoiceSupport ? TEXT("true") : TEXT("false"));
 
 				// keep track of pending invites from the list and accept them
@@ -190,7 +190,7 @@ void FTestFriendsInterface::OnReadFriendsComplete(int32 LocalPlayer, bool bWasSu
 		}	
 		else
 		{
-			UE_LOG(LogOnline, Log,
+			UE_LOG_ONLINE_FRIEND(Log,
 				TEXT("GetFriendsList(%d) failed"), LocalPlayer);
 		}
 	}
@@ -203,7 +203,7 @@ void FTestFriendsInterface::OnReadFriendsComplete(int32 LocalPlayer, bool bWasSu
 
 void FTestFriendsInterface::OnQueryRecentPlayersComplete(const FUniqueNetId& UserId, const FString& Namespace, bool bWasSuccessful, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE_FRIEND(Log,
 		TEXT("QueryRecentPlayers() for player (%s) was success=%d error=%s"), *UserId.ToDebugString(), bWasSuccessful, *ErrorStr);
 
 	if (bWasSuccessful)
@@ -212,15 +212,15 @@ void FTestFriendsInterface::OnQueryRecentPlayersComplete(const FUniqueNetId& Use
 		// Grab the friends data so we can print it out
 		if (OnlineSub->GetFriendsInterface()->GetRecentPlayers(UserId, Namespace, Players))
 		{
-			UE_LOG(LogOnline, Log,
+			UE_LOG_ONLINE_FRIEND(Log,
 				TEXT("GetRecentPlayers returned %d players"), Players.Num());
 
 			// Log each friend's data out
 			for (auto RecentPlayer : Players)
 			{
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t%s has unique id (%s)"), *RecentPlayer->GetDisplayName(), *RecentPlayer->GetUserId()->ToDebugString());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_FRIEND(Log,
 					TEXT("\t LastSeen (%s)"), *RecentPlayer->GetLastSeen().ToString());
 			}
 		}
@@ -234,7 +234,7 @@ void FTestFriendsInterface::OnQueryRecentPlayersComplete(const FUniqueNetId& Use
 
 void FTestFriendsInterface::OnAcceptInviteComplete(int32 LocalPlayer, bool bWasSuccessful, const FUniqueNetId& FriendId, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log, TEXT("AcceptInvite() for player (%d) from friend (%s) was success=%d. %s"), 
+	UE_LOG_ONLINE_FRIEND(Log, TEXT("AcceptInvite() for player (%d) from friend (%s) was success=%d. %s"), 
 		LocalPlayer, *FriendId.ToDebugString(), bWasSuccessful, *ErrorStr);
 
 	// done with this part of the test if no more invites to accept
@@ -254,7 +254,7 @@ void FTestFriendsInterface::OnAcceptInviteComplete(int32 LocalPlayer, bool bWasS
 
 void FTestFriendsInterface::OnSendInviteComplete(int32 LocalPlayer, bool bWasSuccessful, const FUniqueNetId& FriendId, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log, TEXT("SendInvite() for player (%d) to friend (%s) was success=%d. %s"), 
+	UE_LOG_ONLINE_FRIEND(Log, TEXT("SendInvite() for player (%d) to friend (%s) was success=%d. %s"), 
 		LocalPlayer, *FriendId.ToDebugString(), bWasSuccessful, *ErrorStr);
 
 	// done with this part of the test if no more invites to send
@@ -274,7 +274,7 @@ void FTestFriendsInterface::OnSendInviteComplete(int32 LocalPlayer, bool bWasSuc
 
 void FTestFriendsInterface::OnDeleteFriendComplete(int32 LocalPlayer, bool bWasSuccessful, const FUniqueNetId& FriendId, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log, TEXT("DeleteFriend() for player (%d) to friend (%s) was success=%d. %s"), 
+	UE_LOG_ONLINE_FRIEND(Log, TEXT("DeleteFriend() for player (%d) to friend (%s) was success=%d. %s"), 
 		LocalPlayer, *FriendId.ToDebugString(), bWasSuccessful, *ErrorStr);
 
 	// done with this part of the test if no more friends to delete
@@ -294,7 +294,7 @@ void FTestFriendsInterface::OnDeleteFriendComplete(int32 LocalPlayer, bool bWasS
 
 void FTestFriendsInterface::OnDeleteFriendsListComplete(int32 LocalPlayer, bool bWasSuccessful, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE_FRIEND(Log,
 		TEXT("DeleteFriendsList() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	// done with this part of the test
@@ -306,7 +306,7 @@ void FTestFriendsInterface::OnDeleteFriendsListComplete(int32 LocalPlayer, bool
 
 void FTestFriendsInterface::OnQueryBlockedPlayersComplete(const FUniqueNetId& UserId, bool bWasSuccessful, const FString& Error)
 {
-	UE_LOG(LogOnline, Log, TEXT("QueryBlockedPlayers() for player (%s) was success=%d"), *UserId.ToDebugString(), bWasSuccessful);
+	UE_LOG_ONLINE_FRIEND(Log, TEXT("QueryBlockedPlayers() for player (%s) was success=%d"), *UserId.ToDebugString(), bWasSuccessful);
 	bQueryBlockedPlayers = false;
 
 	if (bWasSuccessful)
@@ -314,17 +314,17 @@ void FTestFriendsInterface::OnQueryBlockedPlayersComplete(const FUniqueNetId& Us
 		TArray<TSharedRef<FOnlineBlockedPlayer>> BlockedPlayers;
 		if (OnlineSub->GetFriendsInterface()->GetBlockedPlayers(UserId, BlockedPlayers))
 		{
-			UE_LOG(LogOnline, Log, TEXT("GetBlockedPlayers() (%s) returned %d blocked users"), *UserId.ToDebugString(), BlockedPlayers.Num());
+			UE_LOG_ONLINE_FRIEND(Log, TEXT("GetBlockedPlayers() (%s) returned %d blocked users"), *UserId.ToDebugString(), BlockedPlayers.Num());
 
 			for (int32 Index = 0; Index < BlockedPlayers.Num(); Index++)
 			{
 				const FOnlineBlockedPlayer& BlockedPlayer = *BlockedPlayers[Index];
-				UE_LOG(LogOnline, Log, TEXT("\t%s (%s) is blocked"), *BlockedPlayer.GetRealName(), *BlockedPlayer.GetUserId()->ToDebugString());
+				UE_LOG_ONLINE_FRIEND(Log, TEXT("\t%s (%s) is blocked"), *BlockedPlayer.GetRealName(), *BlockedPlayer.GetUserId()->ToDebugString());
 			}
 		}
 		else
 		{
-			UE_LOG(LogOnline, Log, TEXT("GetBlockedPlayers() for player %s failed"), *UserId.ToDebugString());
+			UE_LOG_ONLINE_FRIEND(Log, TEXT("GetBlockedPlayers() for player %s failed"), *UserId.ToDebugString());
 		}
 	}
 
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestIdentityInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestIdentityInterface.cpp
index dd34e364963b..708ac4983576 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestIdentityInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestIdentityInterface.cpp
@@ -27,7 +27,7 @@ void FTestIdentityInterface::Test(UWorld* InWorld, const FOnlineAccountCredentia
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning,
+		UE_LOG_ONLINE_IDENTITY(Warning,
 			TEXT("Failed to get online identity interface for %s"), *SubsystemName);
 
 		// done with the test
@@ -70,7 +70,7 @@ void FTestIdentityInterface::OnLoginComplete(int32 LocalUserNum, bool bWasSucces
 {
 	if (bWasSuccessful)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Successful logged in user. UserId=[%s] "), 
+		UE_LOG_ONLINE_IDENTITY(Display, TEXT("Successful logged in user. UserId=[%s] "), 
 			*UserId.ToDebugString());
 
 		// update user info for newly registered user
@@ -78,7 +78,7 @@ void FTestIdentityInterface::OnLoginComplete(int32 LocalUserNum, bool bWasSucces
 	}
 	else
 	{
-		UE_LOG(LogOnline, Error, TEXT("Failed to log in new user. Error=[%s]"), 
+		UE_LOG_ONLINE_IDENTITY(Error, TEXT("Failed to log in new user. Error=[%s]"), 
 			*Error);
 
 	}
@@ -92,17 +92,17 @@ void FTestIdentityInterface::OnLogoutComplete(int32 LocalUserNum, bool bWasSucce
 {
 	if (bWasSuccessful)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Successful logged out user. LocalUserNum=[%d] "),
+		UE_LOG_ONLINE_IDENTITY(Display, TEXT("Successful logged out user. LocalUserNum=[%d] "),
 			LocalUserNum);
 	}
 	else if (!bIsUserLoggedIn)
 	{
-		UE_LOG(LogOnline, Display, TEXT("User is not logged in to be able to be logged out."));
+		UE_LOG_ONLINE_IDENTITY(Display, TEXT("User is not logged in to be able to be logged out."));
 	}
 	// If the user was logged out at the start of the test then there will be nothing to log out.
 	else
 	{
-		UE_LOG(LogOnline, Error, TEXT("Failed to log out user."));
+		UE_LOG_ONLINE_IDENTITY(Error, TEXT("Failed to log out user."));
 	}
 
 	UserInfo.Reset();
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestKeyValuePairs.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestKeyValuePairs.cpp
index 163115c8037a..384b582aa7e7 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestKeyValuePairs.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestKeyValuePairs.cpp
@@ -25,19 +25,19 @@ void TestKeyValuePairs()
  	TestKeyValuePairs.Add(TEXT("STRINGValue"), FVariantData(TEXT("This Is A Test!"))); 
  	TestKeyValuePairs.Add(TEXT("BLOBValue"), FVariantData(TestData)); 
 
-	UE_LOG(LogOnline, Display, TEXT("ConstIterator"));
+	UE_LOG_ONLINE(Display, TEXT("ConstIterator"));
 	for (TestDataType::TConstIterator It(TestKeyValuePairs); It; ++It)
 	{
-		UE_LOG(LogOnline, Display, TEXT("%s = %s"), *It.Key().ToString(), *It.Value().ToString());
+		UE_LOG_ONLINE(Display, TEXT("%s = %s"), *It.Key().ToString(), *It.Value().ToString());
 	}
 
-	UE_LOG(LogOnline, Display, TEXT("Iterator"));
+	UE_LOG_ONLINE(Display, TEXT("Iterator"));
 	for (TestDataType::TIterator It(TestKeyValuePairs); It; ++It)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
+		UE_LOG_ONLINE(Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
 	}
 
-	UE_LOG(LogOnline, Display, TEXT("Finding all elements"));
+	UE_LOG_ONLINE(Display, TEXT("Finding all elements"));
 	if (TestKeyValuePairs.Find(TEXT("INTValue")) == NULL)
 	{
 		bSuccess = false;
@@ -65,23 +65,23 @@ void TestKeyValuePairs()
 
 	if (!bSuccess)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Not all elements found!"));
+		UE_LOG_ONLINE(Display, TEXT("Not all elements found!"));
 	}
 
 	TestKeyValuePairs.Remove(TEXT("INTValue"));
 	TestKeyValuePairs.Remove(TEXT("BLOBValue"));
 
-	UE_LOG(LogOnline, Display, TEXT("Iterator AFTER removing int32 and Blob elements"));
+	UE_LOG_ONLINE(Display, TEXT("Iterator AFTER removing int32 and Blob elements"));
 	for (TestDataType::TIterator It(TestKeyValuePairs); It; ++It)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
+		UE_LOG_ONLINE(Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
 	}
 
 	TestKeyValuePairs.Empty();
-	UE_LOG(LogOnline, Display, TEXT("Iterator AFTER emptying structure"));
+	UE_LOG_ONLINE(Display, TEXT("Iterator AFTER emptying structure"));
 	for (TestDataType::TIterator It(TestKeyValuePairs); It; ++It)
 	{
-		UE_LOG(LogOnline, Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
+		UE_LOG_ONLINE(Display, TEXT("Iterator %s = %s"), *It.Key().ToString(), *It.Value().ToString());
 	}
 
 	bSuccess = TestKeyValuePairs.Num() == 0 ? true : false;
@@ -99,17 +99,17 @@ void TestKeyValuePairs()
 		bSuccess = bSuccess && (OutValue == TestValue);   
 		
 		CopyValue = OrigKeyValuePair; 
-		UE_LOG(LogOnline, Display, TEXT("int32 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("int32 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 
 		OrigKeyValuePair.Increment<int32,EOnlineKeyValuePairDataType::Int32>((int32)1);
-		UE_LOG(LogOnline, Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		OrigKeyValuePair.Decrement<int32,EOnlineKeyValuePairDataType::Int32>((int32)1);
-		UE_LOG(LogOnline, Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue); 
 		bSuccess = bSuccess && OrigKeyValuePair.FromString(TEXT("5"));
-		UE_LOG(LogOnline, Display, TEXT("int32 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("int32 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 	}
 
 	{
@@ -121,17 +121,17 @@ void TestKeyValuePairs()
 		bSuccess = bSuccess && (OutValue == TestValue);
 
 		CopyValue = OrigKeyValuePair; 
-		UE_LOG(LogOnline, Display, TEXT("float Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("float Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 
 		OrigKeyValuePair.Increment<float,EOnlineKeyValuePairDataType::Float>(1.0f);
-		UE_LOG(LogOnline, Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		OrigKeyValuePair.Decrement<float,EOnlineKeyValuePairDataType::Float>(1.0f);
-		UE_LOG(LogOnline, Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue); 
 		bSuccess = bSuccess && OrigKeyValuePair.FromString(TEXT("5.0"));
-		UE_LOG(LogOnline, Display, TEXT("float Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("float Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 	}
 
 	{
@@ -143,17 +143,17 @@ void TestKeyValuePairs()
 		bSuccess = bSuccess && (OutValue == TestValue);
 
 		CopyValue = OrigKeyValuePair; 
-		UE_LOG(LogOnline, Display, TEXT("double Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("double Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 
 		OrigKeyValuePair.Increment<double,EOnlineKeyValuePairDataType::Double>(1.0);
-		UE_LOG(LogOnline, Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		OrigKeyValuePair.Decrement<double,EOnlineKeyValuePairDataType::Double>(1.0);
-		UE_LOG(LogOnline, Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue); 
 		bSuccess = bSuccess && OrigKeyValuePair.FromString(TEXT("5.0"));
-		UE_LOG(LogOnline, Display, TEXT("double Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("double Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 	}
 
 	{
@@ -165,17 +165,17 @@ void TestKeyValuePairs()
 		bSuccess = bSuccess && (OutValue == TestValue);
 
 		CopyValue = OrigKeyValuePair; 
-		UE_LOG(LogOnline, Display, TEXT("uint64 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString()); 
+		UE_LOG_ONLINE(Display, TEXT("uint64 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString()); 
 
 		OrigKeyValuePair.Increment<uint64,EOnlineKeyValuePairDataType::Int64>(1.0);
-		UE_LOG(LogOnline, Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("+1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		OrigKeyValuePair.Decrement<uint64,EOnlineKeyValuePairDataType::Int64>(1.0);
-		UE_LOG(LogOnline, Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
+		UE_LOG_ONLINE(Display, TEXT("-1 Now is %s"), *OrigKeyValuePair.ToString());
 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue);
 		bSuccess = bSuccess && OrigKeyValuePair.FromString(TEXT("524288"));
-		UE_LOG(LogOnline, Display, TEXT("uint64 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("uint64 Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 	}
 
 	{
@@ -188,7 +188,7 @@ void TestKeyValuePairs()
 
 		CopyValue = OrigKeyValuePair; 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue);
-		UE_LOG(LogOnline, Display, TEXT("STRING Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString()); 
+		UE_LOG_ONLINE(Display, TEXT("STRING Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString()); 
 	}
 
 	{
@@ -206,10 +206,10 @@ void TestKeyValuePairs()
 
 		CopyValue = OrigKeyValuePair; 
 		bSuccess = bSuccess && (OrigKeyValuePair == CopyValue); 
-		UE_LOG(LogOnline, Display, TEXT("BLOB Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
+		UE_LOG_ONLINE(Display, TEXT("BLOB Test %s == %s"), *OrigKeyValuePair.ToString(), *CopyValue.ToString());
 	}
 
-	UE_LOG(LogOnline, Warning, TEXT("KeyValuePairTest: %s!"), bSuccess ? TEXT("PASSED") : TEXT("FAILED"));
+	UE_LOG_ONLINE(Warning, TEXT("KeyValuePairTest: %s!"), bSuccess ? TEXT("PASSED") : TEXT("FAILED"));
 }
 
 #endif //WITH_DEV_AUTOMATION_TESTS
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestLeaderboardInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestLeaderboardInterface.cpp
index cb3cdfb176bf..a52b387af168 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestLeaderboardInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestLeaderboardInterface.cpp
@@ -74,7 +74,7 @@ void FTestLeaderboardInterface::Test(UWorld* InWorld, const FString& InUserId)
 	OnlineSub = Online::GetSubsystem(InWorld, FName(*Subsystem));
 	if (!OnlineSub)
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to get online subsystem for %s"), *Subsystem);
+		UE_LOG_ONLINE_LEADERBOARD(Warning, TEXT("Failed to get online subsystem for %s"), *Subsystem);
 
 		bOverallSuccess = false;
 		return;
@@ -89,7 +89,7 @@ void FTestLeaderboardInterface::Test(UWorld* InWorld, const FString& InUserId)
 	Leaderboards = OnlineSub->GetLeaderboardsInterface();
 	if (!Leaderboards.IsValid())
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to get online leaderboards interface for %s"), *Subsystem);
+		UE_LOG_ONLINE_LEADERBOARD(Warning, TEXT("Failed to get online leaderboards interface for %s"), *Subsystem);
 
 		bOverallSuccess = false;
 		return;
@@ -111,7 +111,7 @@ void FTestLeaderboardInterface::WriteLeaderboards()
 
 void FTestLeaderboardInterface::OnLeaderboardFlushComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnLeaderboardFlushComplete Session: %s bWasSuccessful: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_LEADERBOARD(Verbose, TEXT("OnLeaderboardFlushComplete Session: %s bWasSuccessful: %d"), *SessionName.ToString(), bWasSuccessful);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	Leaderboards->ClearOnLeaderboardFlushCompleteDelegate_Handle(LeaderboardFlushDelegateHandle);
@@ -129,18 +129,18 @@ void FTestLeaderboardInterface::PrintLeaderboards()
 	for (int32 RowIdx = 0; RowIdx < ReadObject->Rows.Num(); ++RowIdx)
 	{
 		const FOnlineStatsRow& StatsRow = ReadObject->Rows[RowIdx];
-		UE_LOG(LogOnline, Log, TEXT("Leaderboard stats for: Nickname = %s, Rank = %d"), *StatsRow.NickName, StatsRow.Rank);
+		UE_LOG_ONLINE_LEADERBOARD(Log, TEXT("Leaderboard stats for: Nickname = %s, Rank = %d"), *StatsRow.NickName, StatsRow.Rank);
 
 		for (FStatsColumnArray::TConstIterator It(StatsRow.Columns); It; ++It)
 		{
-			UE_LOG(LogOnline, Log, TEXT("  %s = %s"), *It.Key().ToString(), *It.Value().ToString());
+			UE_LOG_ONLINE_LEADERBOARD(Log, TEXT("  %s = %s"), *It.Key().ToString(), *It.Value().ToString());
 		}
 	}
 }
 
 void FTestLeaderboardInterface::OnLeaderboardReadComplete(bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnLeaderboardReadComplete bWasSuccessful: %d"), bWasSuccessful);
+	UE_LOG_ONLINE_LEADERBOARD(Verbose, TEXT("OnLeaderboardReadComplete bWasSuccessful: %d"), bWasSuccessful);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	PrintLeaderboards();
@@ -151,7 +151,7 @@ void FTestLeaderboardInterface::OnLeaderboardReadComplete(bool bWasSuccessful)
 
 void FTestLeaderboardInterface::OnLeaderboardRankReadComplete(bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnLeaderboardRankReadComplete bWasSuccessful: %d"), bWasSuccessful);
+	UE_LOG_ONLINE_LEADERBOARD(Verbose, TEXT("OnLeaderboardRankReadComplete bWasSuccessful: %d"), bWasSuccessful);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	PrintLeaderboards();
@@ -162,7 +162,7 @@ void FTestLeaderboardInterface::OnLeaderboardRankReadComplete(bool bWasSuccessfu
 
 void FTestLeaderboardInterface::OnLeaderboardUserRankReadComplete(bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnLeaderboardUserRankReadComplete bWasSuccessful: %d"), bWasSuccessful);
+	UE_LOG_ONLINE_LEADERBOARD(Verbose, TEXT("OnLeaderboardUserRankReadComplete bWasSuccessful: %d"), bWasSuccessful);
 	bOverallSuccess = bOverallSuccess && bWasSuccessful;
 
 	PrintLeaderboards();
@@ -228,6 +228,8 @@ void FTestLeaderboardInterface::ReadLeaderboardsUser(int32 Range)
 
 bool FTestLeaderboardInterface::Tick( float DeltaTime )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTestLeaderboardInterface_Tick);
+
 	if (TestPhase != LastTestPhase)
 	{
 		LastTestPhase = TestPhase;
@@ -268,7 +270,7 @@ bool FTestLeaderboardInterface::Tick( float DeltaTime )
 			}
 		} break;
 		case 6:
-			UE_LOG(LogOnline, Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
+			UE_LOG_ONLINE_LEADERBOARD(Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
 			delete this;
 			return false;
 		}
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestMessageInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestMessageInterface.cpp
index 9b554d3350a9..169ccee04b78 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestMessageInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestMessageInterface.cpp
@@ -39,19 +39,19 @@ FTestMessageInterface::FTestMessageInterface(const FString& InSubsystem)
 	, bSendMessages(true)
 	, bDeleteMessages(false)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestMessageInterface::FTestMessageInterface"));
+	UE_LOG_ONLINE(Display, TEXT("FTestMessageInterface::FTestMessageInterface"));
 	SubsystemName = InSubsystem;
 }
 
 
 FTestMessageInterface::~FTestMessageInterface()
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestMessageInterface::~FTestMessageInterface"));
+	UE_LOG_ONLINE(Display, TEXT("FTestMessageInterface::~FTestMessageInterface"));
 }
 
 void FTestMessageInterface::Test(UWorld* InWorld, const TArray<FString>& InRecipients)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestMessageInterface::Test"));
+	UE_LOG_ONLINE(Display, TEXT("FTestMessageInterface::Test"));
 
 	OnlineSub = Online::GetSubsystem(InWorld, SubsystemName.Len() ? FName(*SubsystemName, FNAME_Find) : NAME_None);
 	if (OnlineSub != NULL &&
@@ -84,7 +84,7 @@ void FTestMessageInterface::Test(UWorld* InWorld, const TArray<FString>& InRecip
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning,
+		UE_LOG_ONLINE(Warning,
 			TEXT("Failed to get message interface for %s"), *SubsystemName);
 		
 		FinishTest();
@@ -155,7 +155,7 @@ void FTestMessageInterface::FinishTest()
 
 void FTestMessageInterface::OnEnumerateMessagesComplete(int32 LocalPlayer, bool bWasSuccessful, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE(Log,
 		TEXT("EnumerateMessages() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	if (bWasSuccessful)
@@ -163,7 +163,7 @@ void FTestMessageInterface::OnEnumerateMessagesComplete(int32 LocalPlayer, bool
 		TArray< TSharedRef<FOnlineMessageHeader> > MessageHeaders;
 		if (OnlineSub->GetMessageInterface()->GetMessageHeaders(LocalPlayer, MessageHeaders))
 		{
-			UE_LOG(LogOnline, Log,
+			UE_LOG_ONLINE(Log,
 				TEXT("GetMessageHeaders(%d) returned %d message headers"), LocalPlayer, MessageHeaders.Num());
 			
 			// Clear old entries
@@ -174,15 +174,15 @@ void FTestMessageInterface::OnEnumerateMessagesComplete(int32 LocalPlayer, bool
 			for (int32 Index = 0; Index < MessageHeaders.Num(); Index++)
 			{
 				const FOnlineMessageHeader& Header = *MessageHeaders[Index];
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("\t message id (%s)"), *Header.MessageId->ToDebugString());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("\t\t from user id (%s)"), *Header.FromUserId->ToDebugString());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("\t\t from name: %s"), *Header.FromName);
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("\t\t type (%s)"), *Header.Type);
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("\t\t time stamp (%s)"), *Header.TimeStamp);
 
 				// Add to list of messages to download
@@ -193,7 +193,7 @@ void FTestMessageInterface::OnEnumerateMessagesComplete(int32 LocalPlayer, bool
 		}	
 		else
 		{
-			UE_LOG(LogOnline, Log,
+			UE_LOG_ONLINE(Log,
 				TEXT("GetMessageHeaders(%d) failed"), LocalPlayer);
 		}
 	}
@@ -205,7 +205,7 @@ void FTestMessageInterface::OnEnumerateMessagesComplete(int32 LocalPlayer, bool
 
 void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSuccessful, const FUniqueMessageId& MessageId, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE(Log,
 		TEXT("ReadMessage() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	// Dump the message content back out
@@ -221,18 +221,18 @@ void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSu
 			{
 				if (Value != TestAttributeList[i].Value)
 				{
-					UE_LOG(LogOnline, Log,
+					UE_LOG_ONLINE(Log,
 						TEXT("Attribute %s is the wrong value in the received message payload"), *TestAttributeList[i].Name);
 				}
 				else
 				{
-					UE_LOG(LogOnline, Log,
+					UE_LOG_ONLINE(Log,
 						TEXT("Attribute %s MATCHED in the received message payload"), *TestAttributeList[i].Name);
 				}
 			}
 			else
 			{
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE(Log,
 					TEXT("Attribute %s is missing from the received message payload"), *TestAttributeList[i].Name);
 			}
 		}
@@ -245,7 +245,7 @@ void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSu
 				BLOBValue.GetValue(TestData);
 				if (TestData.Num() != sizeof(BLOBTestValue))
 				{
-					UE_LOG(LogOnline, Log,
+					UE_LOG_ONLINE(Log,
 						TEXT("Attribute BLOBValue is the wrong size in the received message payload"));
 				}
 				else
@@ -255,7 +255,7 @@ void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSu
 					{
 						if (TestData[i] != BLOBTestValue[i])
 						{
-							UE_LOG(LogOnline, Log,
+							UE_LOG_ONLINE(Log,
 								TEXT("Attribute BLOBValue contains the wrong data at position %d in the received message payload"), i);
 							bIsDataGood = false;
 							break;
@@ -264,14 +264,14 @@ void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSu
 
 					if (bIsDataGood)
 					{
-						UE_LOG(LogOnline, Log,
+						UE_LOG_ONLINE(Log,
 							TEXT("Attribute BLOBValue MATCHED in the received message payload"));
 					}
 				}
 			}
 			else
 			{
-				UE_LOG(LogOnline, Log, TEXT("Attribute BLOBValue is missing from the received message payload"));
+				UE_LOG_ONLINE(Log, TEXT("Attribute BLOBValue is missing from the received message payload"));
 			}
 		}
 	}
@@ -288,7 +288,7 @@ void FTestMessageInterface::OnReadMessageComplete(int32 LocalPlayer, bool bWasSu
 
 void FTestMessageInterface::OnSendMessageComplete(int32 LocalPlayer, bool bWasSuccessful, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE(Log,
 		TEXT("SendMessage() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	// done with this part of the test
@@ -300,7 +300,7 @@ void FTestMessageInterface::OnSendMessageComplete(int32 LocalPlayer, bool bWasSu
 
 void FTestMessageInterface::OnDeleteMessageComplete(int32 LocalPlayer, bool bWasSuccessful, const FUniqueMessageId& MessageId, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE(Log,
 		TEXT("DeleteMessage() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	// done with this part of the test if no more messages to delete
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestPresenceInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestPresenceInterface.cpp
index 3f6d249e51fd..45becc25b7de 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestPresenceInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestPresenceInterface.cpp
@@ -91,6 +91,8 @@ FString FTestPresenceInterface::PrintTestFailure() const
 
 bool FTestPresenceInterface::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTestPresenceInterface_Tick);
+
 	// If we don't get an update within 2min while this test runs, mark the delegate watch task as a failure
 	if (!EnumHasAnyFlags(CompletedTasks, EPresenceTestStatus::WorkingDelegate) &&
 		FPlatformTime::Seconds() - TestTimeStart > 120 &&
@@ -103,7 +105,7 @@ bool FTestPresenceInterface::Tick(float DeltaTime)
 
 	if (EnumHasAllFlags(CompletedTasks, RequiredFlags) || (bHasFailed && EnumHasAllFlags(TasksAttempted, RequiredFlags)))
 	{
-		UE_LOG_ONLINE(Log, TEXT("Presence testing completed! Success: %d Failed Tasks: %s"), !bHasFailed, *PrintTestFailure());
+		UE_LOG_ONLINE_PRESENCE(Log, TEXT("Presence testing completed! Success: %d Failed Tasks: %s"), !bHasFailed, *PrintTestFailure());
 		if (GEngine)
 		{
 			GEngine->AddOnScreenDebugMessage(PRESENCE_TEST_LOG_KEY, 5.f, (bHasFailed) ? FColor::Red : FColor::Green, 
@@ -117,7 +119,7 @@ bool FTestPresenceInterface::Tick(float DeltaTime)
 		// Fail out if there is another session in use.
 		if (SessionInt->GetNumSessions() != 0)
 		{
-			UE_LOG_ONLINE(Warning, TEXT("Presence testing was aborted as another session was detected."));
+			UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence testing was aborted as another session was detected."));
 			delete this;
 			return false;
 		}
@@ -137,7 +139,7 @@ bool FTestPresenceInterface::Tick(float DeltaTime)
 
 		if (!SessionInt->CreateSession(*CurrentUser, NAME_GameSession, SessionSettings))
 		{
-			UE_LOG_ONLINE(Warning, TEXT("Presence test session failed to create!"));
+			UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test session failed to create!"));
 			TasksAttempted |= EPresenceTestStatus::DelayedWriteFlags;
 			bHasFailed = true;
 		}
@@ -158,7 +160,7 @@ void FTestPresenceInterface::Test(UWorld* InWorld, const FString& RandomUser)
 
 	if (!SessionInt.IsValid() || !PresenceInt.IsValid() || !FriendsInt.IsValid() || !OnlineSub->GetIdentityInterface().IsValid())
 	{
-		UE_LOG_ONLINE(Warning, TEXT("The Presence test must be ran in an OSS that implements the Session, Identity, Presence and Friends interfaces"));
+		UE_LOG_ONLINE_PRESENCE(Warning, TEXT("The Presence test must be ran in an OSS that implements the Session, Identity, Presence and Friends interfaces"));
 		delete this;
 		return;
 	}
@@ -166,7 +168,7 @@ void FTestPresenceInterface::Test(UWorld* InWorld, const FString& RandomUser)
 	// As we need to push some session information around, it will be best that we require the user is not already in a session
 	if (SessionInt->GetNumSessions() != 0)
 	{
-		UE_LOG_ONLINE(Warning, TEXT("Presence test cannot be run while already in a session."));
+		UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test cannot be run while already in a session."));
 		delete this;
 		return;
 	}
@@ -187,7 +189,7 @@ void FTestPresenceInterface::Test(UWorld* InWorld, const FString& RandomUser)
 	// If we get a null sharedpointer or if the netid is invalid, we cannot continue.
 	if (!CurrentUser.IsValid() || !CurrentUser->IsValid())
 	{
-		UE_LOG_ONLINE(Warning, TEXT("Presence test requires a valid user logged in!"));
+		UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test requires a valid user logged in!"));
 		delete this;
 		return;
 	}
@@ -220,7 +222,7 @@ void FTestPresenceInterface::Test(UWorld* InWorld, const FString& RandomUser)
 	}
 	else
 	{
-		UE_LOG_ONLINE(Log, TEXT("Presence Interface Test is skipping random user presence fetch"));
+		UE_LOG_ONLINE_PRESENCE(Log, TEXT("Presence Interface Test is skipping random user presence fetch"));
 	}
 
 	// Push a presence update
@@ -240,11 +242,11 @@ void FTestPresenceInterface::PrintPresence(const FUniqueNetId& UserId, TSharedPt
 {
 	if (!UserId.IsValid() || !PresenceData.IsValid())
 	{
-		UE_LOG_ONLINE(Log, TEXT("Could not print out status data as it is invalid!"));
+		UE_LOG_ONLINE_PRESENCE(Log, TEXT("Could not print out status data as it is invalid!"));
 		return;
 	}
 
-	UE_LOG_ONLINE(Log, TEXT("UserId %s [%s] has presence: InSession[%d] Online[%d] Playing[%d] ThisGame[%d] Joinable[%d] StatusStr[%s]"), 
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("UserId %s [%s] has presence: InSession[%d] Online[%d] Playing[%d] ThisGame[%d] Joinable[%d] StatusStr[%s]"), 
 		*UserId.ToString(),
 		EOnlinePresenceState::ToString(PresenceData->Status.State),
 		((PresenceData->SessionId.IsValid()) ? PresenceData->SessionId->IsValid() : 0),
@@ -254,12 +256,12 @@ void FTestPresenceInterface::PrintPresence(const FUniqueNetId& UserId, TSharedPt
 		PresenceData->bIsJoinable,
 		((PresenceData->Status.StatusStr.IsEmpty()) ? TEXT("No Status") : *PresenceData->Status.StatusStr));
 
-	UE_LOG_ONLINE(Log, TEXT("Properties [%d] Key=Value"), PresenceData->Status.Properties.Num());
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("Properties [%d] Key=Value"), PresenceData->Status.Properties.Num());
 	for (FPresenceProperties::TConstIterator Itr(PresenceData->Status.Properties); Itr; ++Itr)
 	{
 		const FString& Key = Itr.Key();
 		const FString& Value = Itr.Value().ToString();
-		UE_LOG_ONLINE(Log, TEXT("%s=%s"), *Key, *Value);
+		UE_LOG_ONLINE_PRESENCE(Log, TEXT("%s=%s"), *Key, *Value);
 	}
 }
 
@@ -280,13 +282,13 @@ bool FTestPresenceInterface::DoesPresenceMatchWithCache(const TSharedPtr<FOnline
 
 	if (CachedPresence.StatusStr != PresenceToTest->Status.StatusStr)
 	{
-		UE_LOG_ONLINE(Warning, TEXT("Presence test fails, status strings are different"));
+		UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test fails, status strings are different"));
 		return false;
 	}
 
 	if (PresenceToTest->Status.Properties.Num() < CachedPresence.Properties.Num())
 	{
-		UE_LOG_ONLINE(Warning, TEXT("Presence test fails. Tested presence has %d keys over %d keys"), 
+		UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test fails. Tested presence has %d keys over %d keys"), 
 			PresenceToTest->Status.Properties.Num(),
 			CachedPresence.Properties.Num());
 		return false;
@@ -299,14 +301,14 @@ bool FTestPresenceInterface::DoesPresenceMatchWithCache(const TSharedPtr<FOnline
 		const FString& Value = Itr.Value().ToString();
 		if (PresenceToTest->Status.Properties.Find(Key) == nullptr)
 		{
-			UE_LOG_ONLINE(Warning, TEXT("Presence test fails, missing key %s"), *Key);
+			UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test fails, missing key %s"), *Key);
 			return false;
 		}
 
 		PresenceToTest->Status.Properties.Find(Key)->GetValue(TestValue);
 		if (Value != TestValue)
 		{
-			UE_LOG_ONLINE(Warning, TEXT("Presence test fails, key %s has different values. Cached=%s Has=%s"), *Key, *Value, *TestValue);
+			UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Presence test fails, key %s has different values. Cached=%s Has=%s"), *Key, *Value, *TestValue);
 			return false;
 		}
 	}
@@ -316,7 +318,7 @@ bool FTestPresenceInterface::DoesPresenceMatchWithCache(const TSharedPtr<FOnline
 
 void FTestPresenceInterface::OnSelfPresenceFetchComplete(const FUniqueNetId& UserId, const bool bWasSuccessful)
 {
-	UE_LOG_ONLINE(Log, TEXT("FTestPresenceInterface::OnSelfPresenceFetchComplete Succeeded? %d"), bWasSuccessful);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("FTestPresenceInterface::OnSelfPresenceFetchComplete Succeeded? %d"), bWasSuccessful);
 	TasksAttempted |= EPresenceTestStatus::FetchSelf;
 	if (bWasSuccessful)
 	{
@@ -355,7 +357,7 @@ void FTestPresenceInterface::OnPresencePushComplete(const FUniqueNetId& UserId,
 	}
 	
 	TasksAttempted |= EPresenceTestStatus::PushSelf;
-	UE_LOG_ONLINE(Log, TEXT("FTestPresenceInterface::OnPresencePushComplete Task Succeeded? %d Data correct? %d"), bWasSuccessful, bPushCorrect);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("FTestPresenceInterface::OnPresencePushComplete Task Succeeded? %d Data correct? %d"), bWasSuccessful, bPushCorrect);
 }
 
 void FTestPresenceInterface::OnPresencePushWithSessionComplete(const FUniqueNetId& UserId, const bool bWasSuccessful)
@@ -382,12 +384,12 @@ void FTestPresenceInterface::OnPresencePushWithSessionComplete(const FUniqueNetI
 	}
 
 	TasksAttempted |= EPresenceTestStatus::PushSelfSession;
-	UE_LOG_ONLINE(Log, TEXT("FTestPresenceInterface::OnPresencePushWithSessionComplete Task Succeeded? %d Data correct? %d"), bWasSuccessful, bPushCorrect);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("FTestPresenceInterface::OnPresencePushWithSessionComplete Task Succeeded? %d Data correct? %d"), bWasSuccessful, bPushCorrect);
 }
 
 void FTestPresenceInterface::OnFriendPresenceFetchComplete(const FUniqueNetId& UserId, const bool bWasSuccessful)
 {
-	UE_LOG_ONLINE(Log, TEXT("FTestPresenceInterface::OnFriendPresenceFetchComplete. User: %s Succeeded? %d"), *UserId.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("FTestPresenceInterface::OnFriendPresenceFetchComplete. User: %s Succeeded? %d"), *UserId.ToString(), bWasSuccessful);
 	TasksAttempted |= EPresenceTestStatus::FetchFriend;
 	if (bWasSuccessful)
 	{
@@ -404,7 +406,7 @@ void FTestPresenceInterface::OnFriendPresenceFetchComplete(const FUniqueNetId& U
 
 void FTestPresenceInterface::OnRandomUserFetchComplete(const FUniqueNetId& UserId, const bool bWasSuccessful)
 {
-	UE_LOG_ONLINE(Log, TEXT("FTestPresenceInterface::OnRandomUserFetchComplete User: %s Succeeded? %d"), *UserId.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("FTestPresenceInterface::OnRandomUserFetchComplete User: %s Succeeded? %d"), *UserId.ToString(), bWasSuccessful);
 	TasksAttempted |= EPresenceTestStatus::FetchRandom;
 	if (bWasSuccessful)
 	{
@@ -421,7 +423,7 @@ void FTestPresenceInterface::OnRandomUserFetchComplete(const FUniqueNetId& UserI
 
 void FTestPresenceInterface::OnPresenceRecieved(const FUniqueNetId& UserId, const TSharedRef<FOnlineUserPresence>& PresenceData)
 {
-	UE_LOG_ONLINE(Verbose, TEXT("Recieved a presence update event about user %s"), *UserId.ToString());
+	UE_LOG_ONLINE_PRESENCE(Verbose, TEXT("Recieved a presence update event about user %s"), *UserId.ToString());
 	// We expect to get a status update about someone on your friends list at least.
 	CompletedTasks |= EPresenceTestStatus::WorkingDelegate;
 	TasksAttempted |= EPresenceTestStatus::WorkingDelegate;
@@ -429,7 +431,7 @@ void FTestPresenceInterface::OnPresenceRecieved(const FUniqueNetId& UserId, cons
 
 void FTestPresenceInterface::OnReadFriendsListComplete(int32 LocalUserNum, bool bWasSuccessful, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG_ONLINE(Log, TEXT("Friends list fetch task for presence test complete. Success? %d"), bWasSuccessful);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("Friends list fetch task for presence test complete. Success? %d"), bWasSuccessful);
 	if (bWasSuccessful)
 	{
 		FriendsInt->GetFriendsList(0, EFriendsLists::ToString(EFriendsLists::Default), FriendsCache);
@@ -446,7 +448,7 @@ void FTestPresenceInterface::OnReadFriendsListComplete(int32 LocalUserNum, bool
 		}
 		else
 		{
-			UE_LOG_ONLINE(Warning, TEXT("Test user has no friends! Cannot fetch friend presence data if user has no friends!"));
+			UE_LOG_ONLINE_PRESENCE(Warning, TEXT("Test user has no friends! Cannot fetch friend presence data if user has no friends!"));
 		}
 	}
 
@@ -456,7 +458,7 @@ void FTestPresenceInterface::OnReadFriendsListComplete(int32 LocalUserNum, bool
 
 void FTestPresenceInterface::OnCreateSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG_ONLINE(Log, TEXT("Session creation task for presence test complete. Success? %d"), bWasSuccessful);
+	UE_LOG_ONLINE_PRESENCE(Log, TEXT("Session creation task for presence test complete. Success? %d"), bWasSuccessful);
 	if (bWasSuccessful && World != nullptr)
 	{
 		// Add a delay write to pushing new session information for the following reasons:
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSessionInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSessionInterface.cpp
index 0091f7ba4b36..0c2a02fb4e98 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSessionInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSessionInterface.cpp
@@ -221,7 +221,7 @@ void FTestSessionInterface::WorldDestroyed( UWorld* InWorld )
 
 void FTestSessionInterface::OnReadFriendsListComplete(int32 LocalUserNum, bool bWasSuccessful, const FString& ListName, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnReadFriendsListComplete LocalUserNum: %d bSuccess: %d %s"), LocalUserNum, bWasSuccessful, *ErrorStr);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnReadFriendsListComplete LocalUserNum: %d bSuccess: %d %s"), LocalUserNum, bWasSuccessful, *ErrorStr);
 	if (bWasSuccessful)
 	{
 		Friends->GetFriendsList(LocalUserNum, ListName, FriendsCache);
@@ -230,7 +230,7 @@ void FTestSessionInterface::OnReadFriendsListComplete(int32 LocalUserNum, bool b
 
 void FTestSessionInterface::OnSessionUserInviteAccepted(bool bWasSuccessful, int32 ControllerId, TSharedPtr<const FUniqueNetId> InUserId, const FOnlineSessionSearchResult& SearchResult)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnSessionInviteAccepted ControllerId: %d bSuccess: %d"), ControllerId, bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnSessionInviteAccepted ControllerId: %d bSuccess: %d"), ControllerId, bWasSuccessful);
 	// Don't clear invite accept delegate
 
 	if (bWasSuccessful)
@@ -241,7 +241,7 @@ void FTestSessionInterface::OnSessionUserInviteAccepted(bool bWasSuccessful, int
 
 void FTestSessionInterface::OnEndForJoinSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnEndForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnEndForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnEndSessionCompleteDelegate_Handle(OnEndForJoinSessionCompleteDelegateHandle);
 	OnDestroyForJoinSessionCompleteDelegateHandle = DestroyExistingSession(SessionName, OnDestroyForJoinSessionCompleteDelegate);
 }
@@ -255,7 +255,7 @@ FDelegateHandle FTestSessionInterface::EndExistingSession(FName SessionName, FOn
 
 void FTestSessionInterface::OnDestroyForJoinSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnDestroyForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnDestroyForJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnDestroySessionCompleteDelegate_Handle(OnDestroyForJoinSessionCompleteDelegateHandle);
 	JoinSession(0, SessionName, CachedSessionResult);
 }
@@ -269,13 +269,13 @@ FDelegateHandle FTestSessionInterface::DestroyExistingSession(FName SessionName,
 
 void FTestSessionInterface::OnRegisterPlayerComplete(FName SessionName, const TArray< TSharedRef<const FUniqueNetId> >& Players, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnRegisterPlayerComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnRegisterPlayerComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnRegisterPlayersCompleteDelegate_Handle(OnRegisterPlayersCompleteDelegateHandle);
 }
 
 void FTestSessionInterface::OnUnregisterPlayerComplete(FName SessionName, const TArray< TSharedRef<const FUniqueNetId> >& Players, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnUnregisterPlayerComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnUnregisterPlayerComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnUnregisterPlayersCompleteDelegate_Handle(OnUnregisterPlayersCompleteDelegateHandle);
 }
 
@@ -297,7 +297,7 @@ void FTestSessionInterface::JoinSession(int32 ControllerId, FName SessionName, c
 
 void FTestSessionInterface::OnCreateSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnCreateSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnCreateSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnCreateSessionCompleteDelegate_Handle(OnCreateSessionCompleteDelegateHandle);
 
 	bWasLastCommandSuccessful = bWasSuccessful;
@@ -305,7 +305,7 @@ void FTestSessionInterface::OnCreateSessionComplete(FName SessionName, bool bWas
 
 void FTestSessionInterface::OnStartSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnStartSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnStartSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnStartSessionCompleteDelegate_Handle(OnStartSessionCompleteDelegateHandle);
 
 	bWasLastCommandSuccessful = bWasSuccessful;
@@ -313,7 +313,7 @@ void FTestSessionInterface::OnStartSessionComplete(FName SessionName, bool bWasS
 
 void FTestSessionInterface::OnEndSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnEndSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnEndSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnEndSessionCompleteDelegate_Handle(OnEndSessionCompleteDelegateHandle);
 
 	bWasLastCommandSuccessful = bWasSuccessful;
@@ -321,19 +321,19 @@ void FTestSessionInterface::OnEndSessionComplete(FName SessionName, bool bWasSuc
 
 void FTestSessionInterface::OnDestroySessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnDestroySessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnDestroySessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnDestroySessionCompleteDelegate_Handle(OnDestroySessionCompleteDelegateHandle);
 }
 
 void FTestSessionInterface::OnUpdateSessionComplete(FName SessionName, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnUpdateSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnUpdateSessionComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	SessionInt->ClearOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegateHandle);
 }
 
 void FTestSessionInterface::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), static_cast<int32>(Result));
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnJoinSessionComplete %s bSuccess: %d"), *SessionName.ToString(), static_cast<int32>(Result));
 	SessionInt->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle);
 
 	if (Result == EOnJoinSessionCompleteResult::Success)
@@ -349,14 +349,14 @@ void FTestSessionInterface::OnJoinSessionComplete(FName SessionName, EOnJoinSess
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Failed to join session %s"), *SessionName.ToString());
+			UE_LOG_ONLINE_SESSION(Warning, TEXT("Failed to join session %s"), *SessionName.ToString());
 		}
 	}
 }
 
 void FTestSessionInterface::OnFindFriendSessionComplete(int32 LocalUserNum, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SearchResult)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnFindFriendSessionComplete LocalUserNum: %d bSuccess: %d"), LocalUserNum, bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnFindFriendSessionComplete LocalUserNum: %d bSuccess: %d"), LocalUserNum, bWasSuccessful);
 
 	FDelegateHandle DelegateHandle = OnFindFriendSessionCompleteDelegateHandles.FindRef(LocalUserNum);
 	SessionInt->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
@@ -370,14 +370,14 @@ void FTestSessionInterface::OnFindFriendSessionComplete(int32 LocalUserNum, bool
 		}
 		else
 		{
-			UE_LOG(LogOnline, Warning, TEXT("Join friend returned no search result."));
+			UE_LOG_ONLINE_SESSION(Warning, TEXT("Join friend returned no search result."));
 		}
 	}
 }
 
 void FTestSessionInterface::OnFindFriendSessionForListFriendSessionsComplete(int32 LocalUserNum, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SearchResult)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnFindFriendSessionComplete LocalUserNum: %d bSuccess: %d Result Count: %d"), LocalUserNum, bWasSuccessful, SearchResult.Num());
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnFindFriendSessionComplete LocalUserNum: %d bSuccess: %d Result Count: %d"), LocalUserNum, bWasSuccessful, SearchResult.Num());
 
 	FDelegateHandle DelegateHandle = OnFindFriendSessionCompleteDelegateHandles.FindRef(LocalUserNum);
 	SessionInt->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
@@ -385,17 +385,17 @@ void FTestSessionInterface::OnFindFriendSessionForListFriendSessionsComplete(int
 
 	for (const FOnlineSessionSearchResult& Result : SearchResult)
 	{
-		UE_LOG(LogOnline, Verbose, TEXT("\tSession:"));
+		UE_LOG_ONLINE_SESSION(Verbose, TEXT("\tSession:"));
 		DumpSession(&Result.Session);
 	}
 }
 
 void FTestSessionInterface::OnFindSessionsComplete(bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnFindSessionsComplete bSuccess: %d"), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnFindSessionsComplete bSuccess: %d"), bWasSuccessful);
 	SessionInt->ClearOnFindSessionsCompleteDelegate_Handle(OnFindSessionsCompleteDelegateHandle);
 
-	UE_LOG(LogOnline, Verbose, TEXT("Num Search Results: %d"), SearchSettings->SearchResults.Num());
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("Num Search Results: %d"), SearchSettings->SearchResults.Num());
 	for (int32 SearchIdx=0; SearchIdx<SearchSettings->SearchResults.Num(); SearchIdx++)
 	{
 		const FOnlineSessionSearchResult& SearchResult = SearchSettings->SearchResults[SearchIdx];
@@ -405,14 +405,14 @@ void FTestSessionInterface::OnFindSessionsComplete(bool bWasSuccessful)
 
 void FTestSessionInterface::OnCancelFindSessionsComplete(bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("OnCancelFindSessionsComplete bSuccess: %d"), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnCancelFindSessionsComplete bSuccess: %d"), bWasSuccessful);
 	SessionInt->ClearOnCancelFindSessionsCompleteDelegate_Handle(OnCancelFindSessionsCompleteDelegateHandle);
 }
 
 void FTestSessionInterface::OnMatchmakingComplete(FName SessionName, bool bWasSuccessful)
 {
 	SessionInt->ClearOnMatchmakingCompleteDelegate_Handle(OnMatchmakingCompleteDelegateHandle);
-	UE_LOG(LogOnline, Verbose, TEXT("OnMatchmakingComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
+	UE_LOG_ONLINE_SESSION(Verbose, TEXT("OnMatchmakingComplete %s bSuccess: %d"), *SessionName.ToString(), bWasSuccessful);
 	if (bWasSuccessful)
 	{
 		SessionInt->DumpSessionState();
@@ -421,12 +421,14 @@ void FTestSessionInterface::OnMatchmakingComplete(FName SessionName, bool bWasSu
 
 bool FTestSessionInterface::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTestSessionInterface_Tick);
+
 	if (TestPhase != LastTestPhase)
 	{
 		LastTestPhase = TestPhase;
 		if (!bOverallSuccess)
 		{
-			UE_LOG(LogOnline, Log, TEXT("Testing failed in phase %d"), LastTestPhase);
+			UE_LOG_ONLINE_SESSION(Log, TEXT("Testing failed in phase %d"), LastTestPhase);
 			TestPhase = 3;
 		}
 
@@ -435,7 +437,7 @@ bool FTestSessionInterface::Tick(float DeltaTime)
 		case 0:
 			break;
 		case 1:
-			UE_LOG(LogOnline, Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
+			UE_LOG_ONLINE_SESSION(Log, TEXT("TESTING COMPLETE Success:%s!"), bOverallSuccess ? TEXT("true") : TEXT("false"));
 			delete this;
 			return false;
 		}
@@ -621,7 +623,7 @@ bool FTestSessionInterface::Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevic
 		}
 		else if (FParse::Command(&Cmd, TEXT("QUIT")))
 		{
-			UE_LOG(LogOnline, Display, TEXT("Destroying TestSession."));
+			UE_LOG_ONLINE_SESSION(Display, TEXT("Destroying TestSession."));
 			SessionInt->CancelFindSessions();
 			bWasHandled = true;
 			// Make this last
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSharingInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSharingInterface.cpp
index a6e09939bd90..1585f66712f1 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSharingInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestSharingInterface.cpp
@@ -9,14 +9,14 @@
 
 FTestSharingInterface::FTestSharingInterface(const FString& InSubsystem)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::FTestSharingInterface"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::FTestSharingInterface"));
 	SubsystemName = InSubsystem;
 }
 
 
 FTestSharingInterface::~FTestSharingInterface()
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::~FTestSharingInterface"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::~FTestSharingInterface"));
 	
 	if(TestStatusUpdate.Image)
 	{
@@ -28,7 +28,7 @@ FTestSharingInterface::~FTestSharingInterface()
 
 void FTestSharingInterface::Test(UWorld* InWorld, bool bWithImage)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::Test"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::Test"));
 
 	IOnlineSubsystem* OnlineSub = Online::GetSubsystem(InWorld, FName(*SubsystemName));
 	check(OnlineSub); 
@@ -50,7 +50,7 @@ void FTestSharingInterface::Test(UWorld* InWorld, bool bWithImage)
 
 void FTestSharingInterface::RequestPermissionsToSharePosts()
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::RequestPermissionsToSharePosts"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::RequestPermissionsToSharePosts"));
 
 	ResponsesReceived = 0;
 	RequestPermissionsToPostToFeedDelegate = FOnRequestNewPublishPermissionsCompleteDelegate::CreateRaw(this, &FTestSharingInterface::OnStatusPostingPermissionsUpdated);
@@ -68,7 +68,7 @@ void FTestSharingInterface::RequestPermissionsToSharePosts()
 
 void FTestSharingInterface::OnStatusPostingPermissionsUpdated(int32 LocalUserNum, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface::OnStatusPostingPermissionsUpdated() - %d"), bWasSuccessful);
+	UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface::OnStatusPostingPermissionsUpdated() - %d"), bWasSuccessful);
 
 	FDelegateHandle DelegateHandle = RequestPermissionsToPostToFeedDelegateHandles.FindRef(LocalUserNum);
 	SharingInterface->ClearOnRequestNewPublishPermissionsCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
@@ -83,7 +83,7 @@ void FTestSharingInterface::OnStatusPostingPermissionsUpdated(int32 LocalUserNum
 
 void FTestSharingInterface::SharePost()
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::SharePost"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::SharePost"));
 
 	ResponsesReceived = 0;
 	OnPostSharedDelegate = FOnSharePostCompleteDelegate::CreateRaw(this, &FTestSharingInterface::OnPostShared);
@@ -98,7 +98,7 @@ void FTestSharingInterface::SharePost()
 
 void FTestSharingInterface::OnPostShared(int32 LocalPlayer, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::OnPostShared[PlayerIdx:%i - Successful:%i]"), LocalPlayer, bWasSuccessful);
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::OnPostShared[PlayerIdx:%i - Successful:%i]"), LocalPlayer, bWasSuccessful);
 
 	FDelegateHandle DelegateHandle = OnPostSharedDelegateHandles.FindRef(LocalPlayer);
 	SharingInterface->ClearOnSharePostCompleteDelegate_Handle(LocalPlayer, DelegateHandle);
@@ -112,7 +112,7 @@ void FTestSharingInterface::OnPostShared(int32 LocalPlayer, bool bWasSuccessful)
 
 void FTestSharingInterface::RequestPermissionsToReadNewsFeed()
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::RequestPermissionsToReadNewsFeed"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::RequestPermissionsToReadNewsFeed"));
 
 	ResponsesReceived = 0;
 	RequestPermissionsToReadFeedDelegate = FOnRequestNewReadPermissionsCompleteDelegate::CreateRaw(this, &FTestSharingInterface::OnReadFeedPermissionsUpdated);
@@ -130,7 +130,7 @@ void FTestSharingInterface::RequestPermissionsToReadNewsFeed()
 
 void FTestSharingInterface::OnReadFeedPermissionsUpdated(int32 LocalUserNum, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface::OnReadFeedPermissionsUpdated() - %d"), bWasSuccessful);
+	UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface::OnReadFeedPermissionsUpdated() - %d"), bWasSuccessful);
 
 	FDelegateHandle DelegateHandle = RequestPermissionsToReadFeedDelegateHandles.FindRef(LocalUserNum);
 	SharingInterface->ClearOnRequestNewReadPermissionsCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
@@ -145,7 +145,7 @@ void FTestSharingInterface::OnReadFeedPermissionsUpdated(int32 LocalUserNum, boo
 
 void FTestSharingInterface::ReadNewsFeed()
 {
-	UE_LOG(LogOnline, Verbose, TEXT("FTestSharingInterface::ReadNewsFeed"));
+	UE_LOG_ONLINE_SHARING(Verbose, TEXT("FTestSharingInterface::ReadNewsFeed"));
 
 	ResponsesReceived = 0;
 	OnNewsFeedReadDelegate = FOnReadNewsFeedCompleteDelegate::CreateRaw(this, &FTestSharingInterface::OnNewsFeedRead);
@@ -160,24 +160,24 @@ void FTestSharingInterface::ReadNewsFeed()
 
 void FTestSharingInterface::OnNewsFeedRead(int32 LocalPlayer, bool bWasSuccessful)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface::OnNewsFeedRead[PlayerIdx:%i - Successful:%i]"), LocalPlayer, bWasSuccessful);
+	UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface::OnNewsFeedRead[PlayerIdx:%i - Successful:%i]"), LocalPlayer, bWasSuccessful);
 
 	if (bWasSuccessful)
 	{
 		// Get the 1st cached post
 		FOnlineStatusUpdate FirstReadStatusUpdate;
 		SharingInterface->GetCachedNewsFeed(LocalPlayer, 0, FirstReadStatusUpdate);
-		UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface first read update: %s"), *FirstReadStatusUpdate.Message);
+		UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface first read update: %s"), *FirstReadStatusUpdate.Message);
 
 		// Get all the cached posts
 		TArray<FOnlineStatusUpdate> AllReadStatusUpdates;
 		SharingInterface->GetCachedNewsFeeds(LocalPlayer, AllReadStatusUpdates);
-		UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface number of read updates: %d"), AllReadStatusUpdates.Num());
+		UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface number of read updates: %d"), AllReadStatusUpdates.Num());
 
 		for (int Idx = 0; Idx < AllReadStatusUpdates.Num(); ++Idx)
 		{
 			const FOnlineStatusUpdate& StatusUpdate = AllReadStatusUpdates[Idx];
-			UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface status update [%d]: %s"), Idx, *StatusUpdate.Message);
+			UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface status update [%d]: %s"), Idx, *StatusUpdate.Message);
 		}
 	}
 
@@ -185,7 +185,7 @@ void FTestSharingInterface::OnNewsFeedRead(int32 LocalPlayer, bool bWasSuccessfu
 	SharingInterface->ClearOnReadNewsFeedCompleteDelegate_Handle(LocalPlayer, DelegateHandle);
 	if( ++ResponsesReceived == MAX_LOCAL_PLAYERS )
 	{
-		UE_LOG(LogOnline, Display, TEXT("FTestSharingInterface TESTS COMPLETED"), LocalPlayer, bWasSuccessful);
+		UE_LOG_ONLINE_SHARING(Display, TEXT("FTestSharingInterface TESTS COMPLETED"), LocalPlayer, bWasSuccessful);
 		delete this;
 	}
 }
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTimeInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTimeInterface.cpp
index f3deb2f32637..d3d830760f01 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTimeInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTimeInterface.cpp
@@ -18,7 +18,7 @@ void FTestTimeInterface::Test(UWorld* InWorld)
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning,
+		UE_LOG_ONLINE(Warning,
 			TEXT("Failed to get server time interface for %s"), *SubsystemName);
 
 		delete this;
@@ -31,11 +31,11 @@ void FTestTimeInterface::OnQueryServerUtcTimeComplete(bool bWasSuccessful, const
 
 	if (bWasSuccessful)
 	{
-		UE_LOG(LogOnline, Log, TEXT("Successful query for server time. Result=[%s]"), *DateTimeStr);
+		UE_LOG_ONLINE(Log, TEXT("Successful query for server time. Result=[%s]"), *DateTimeStr);
 	}
 	else
 	{
-		UE_LOG(LogOnline, Log, TEXT("Failed to query server time. Error=[%s]"), *Error);
+		UE_LOG_ONLINE(Log, TEXT("Failed to query server time. Error=[%s]"), *Error);
 	}
 
 	// done with the test
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTitleFileInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTitleFileInterface.cpp
index c9b77400d2a3..5dfb5f70d36f 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTitleFileInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestTitleFileInterface.cpp
@@ -16,7 +16,7 @@ void FTestTitleFileInterface::Test(UWorld* InWorld)
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning, TEXT("Failed to get title file interface for %s"), *SubsystemName);
+		UE_LOG_ONLINE_TITLEFILE(Warning, TEXT("Failed to get title file interface for %s"), *SubsystemName);
 	}
 }
 
@@ -30,7 +30,7 @@ FTestTitleFileInterface::FTestTitleFileInterface(const FString& InSubsystemName)
 
 void FTestTitleFileInterface::FinishTest()
 {
-	UE_LOG(LogOnline, Log, TEXT("Test finished"));
+	UE_LOG_ONLINE_TITLEFILE(Log, TEXT("Test finished"));
 
 	if (OnlineTitleFile.IsValid())
 	{
@@ -44,7 +44,7 @@ void FTestTitleFileInterface::OnEnumerateFilesComplete(bool bSuccess, const FStr
 {
 	TArray<FCloudFileHeader> Files;
 	OnlineTitleFile->GetFileList(Files);
-	UE_LOG(LogOnline, Log, TEXT("Found %i files"), Files.Num());
+	UE_LOG_ONLINE_TITLEFILE(Log, TEXT("Found %i files"), Files.Num());
 
 	NumPendingFileReads = Files.Num();
 	if (NumPendingFileReads > 0)
@@ -67,15 +67,15 @@ void FTestTitleFileInterface::OnReadFileComplete(bool bSuccess, const FString& F
 {
 	if (bSuccess)
 	{
-		UE_LOG(LogOnline, Log, TEXT("File read. file=[%s]"), *Filename);
+		UE_LOG_ONLINE_TITLEFILE(Log, TEXT("File read. file=[%s]"), *Filename);
 		TArray<uint8> FileContents;
 		OnlineTitleFile->GetFileContents(Filename, FileContents);
-		UE_LOG(LogOnline, Log, TEXT("File length=%d. file=[%s]"), FileContents.Num(), *Filename);
+		UE_LOG_ONLINE_TITLEFILE(Log, TEXT("File length=%d. file=[%s]"), FileContents.Num(), *Filename);
 		OnlineTitleFile->ClearFile(Filename);
 	}
 	else
 	{
-		UE_LOG(LogOnline, Log, TEXT("File not read. file=[%s]"), *Filename);
+		UE_LOG_ONLINE_TITLEFILE(Log, TEXT("File not read. file=[%s]"), *Filename);
 	}
 	
 	NumPendingFileReads--;
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestUserInterface.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestUserInterface.cpp
index 3293ad8675fb..17ac5bb0461f 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestUserInterface.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestUserInterface.cpp
@@ -10,19 +10,19 @@ FTestUserInterface::FTestUserInterface(const FString& InSubsystem)
 	: OnlineSub(NULL)
 	, bQueryUserInfo(true)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestUserInterface::FTestUserInterface"));
+	UE_LOG_ONLINE_USER(Display, TEXT("FTestUserInterface::FTestUserInterface"));
 	SubsystemName = InSubsystem;
 }
 
 
 FTestUserInterface::~FTestUserInterface()
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestUserInterface::~FTestUserInterface"));
+	UE_LOG_ONLINE_USER(Display, TEXT("FTestUserInterface::~FTestUserInterface"));
 }
 
 void FTestUserInterface::Test(UWorld* InWorld, const TArray<FString>& InUserIds)
 {
-	UE_LOG(LogOnline, Display, TEXT("FTestUserInterface::Test"));
+	UE_LOG_ONLINE_USER(Display, TEXT("FTestUserInterface::Test"));
 
 	OnlineSub = Online::GetSubsystem(InWorld, SubsystemName.Len() ? FName(*SubsystemName, FNAME_Find) : NAME_None);
 	if (OnlineSub != NULL &&
@@ -57,7 +57,7 @@ void FTestUserInterface::Test(UWorld* InWorld, const TArray<FString>& InUserIds)
 	}
 	else
 	{
-		UE_LOG(LogOnline, Warning,
+		UE_LOG_ONLINE_USER(Warning,
 			TEXT("Failed to get user interface for %s"), *SubsystemName);
 		
 		FinishTest();
@@ -89,7 +89,7 @@ void FTestUserInterface::FinishTest()
 
 void FTestUserInterface::OnQueryUserInfoComplete(int32 LocalPlayer, bool bWasSuccessful, const TArray< TSharedRef<const FUniqueNetId> >& UserIds, const FString& ErrorStr)
 {
-	UE_LOG(LogOnline, Log,
+	UE_LOG_ONLINE_USER(Log,
 		TEXT("GetUserInterface() for player (%d) was success=%d"), LocalPlayer, bWasSuccessful);
 
 	if (bWasSuccessful)
@@ -99,23 +99,23 @@ void FTestUserInterface::OnQueryUserInfoComplete(int32 LocalPlayer, bool bWasSuc
 			TSharedPtr<FOnlineUser> User = OnlineSub->GetUserInterface()->GetUserInfo(LocalPlayer, *UserIds[UserIdx]);
 			if (User.IsValid())
 			{
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_USER(Log,
 					TEXT("PlayerId=%s found"), *UserIds[UserIdx]->ToDebugString());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_USER(Log,
 					TEXT("	DisplayName=%s"), *User->GetDisplayName());
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_USER(Log,
 					TEXT("	RealName=%s"), *User->GetRealName());
 			}
 			else
 			{
-				UE_LOG(LogOnline, Log,
+				UE_LOG_ONLINE_USER(Log,
 					TEXT("PlayerId=%s not found"), *UserIds[UserIdx]->ToDebugString());
 			}
 		}
 	}
 	else
 	{
-		UE_LOG(LogOnline, Error, TEXT("GetUserInterface() failure. Error = %s"), *ErrorStr);
+		UE_LOG_ONLINE_USER(Error, TEXT("GetUserInterface() failure. Error = %s"), *ErrorStr);
 	}
 
 	// done
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestVoice.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestVoice.cpp
index 91c631de34c5..45389eb0b7b0 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestVoice.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/Tests/TestVoice.cpp
@@ -223,6 +223,8 @@ void FTestVoice::GenerateData(USoundWaveProcedural* InProceduralWave, int32 Samp
 
 bool FTestVoice::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTestVoice_Tick);
+
 	if (VoiceCapture.IsValid())
 	{
 		if (!IsRunningDedicatedServer() && VoiceComp == nullptr)
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceEngineImpl.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceEngineImpl.cpp
index f79ce30f515d..b2d7980ddf02 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceEngineImpl.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceEngineImpl.cpp
@@ -147,7 +147,7 @@ void FVoiceEngineImpl::VoiceCaptureUpdate() const
 		// If no data is available, we have finished capture the last (post-StopRecording) half-second of voice data
 		if (RecordingState == EVoiceCaptureState::NotCapturing)
 		{
-			UE_LOG(LogVoiceEngine, Log, TEXT("Internal voice capture complete."));
+			UE_LOG_ONLINE_VOICEENGINE(Log, TEXT("Internal voice capture complete."));
 
 			bPendingFinalCapture = false;
 
@@ -167,19 +167,19 @@ void FVoiceEngineImpl::VoiceCaptureUpdate() const
 
 void FVoiceEngineImpl::StartRecording() const
 {
-	UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("VOIP StartRecording"));
+	UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("VOIP StartRecording"));
 	if (VoiceCapture.IsValid())
 	{
 		if (!VoiceCapture->Start())
 		{
-			UE_LOG(LogVoiceEngine, Warning, TEXT("Failed to start voice recording"));
+			UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("Failed to start voice recording"));
 		}
 	}
 }
 
 void FVoiceEngineImpl::StopRecording() const
 {
-	UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("VOIP StopRecording"));
+	UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("VOIP StopRecording"));
 	if (VoiceCapture.IsValid())
 	{
 		VoiceCapture->Stop();
@@ -188,7 +188,7 @@ void FVoiceEngineImpl::StopRecording() const
 
 void FVoiceEngineImpl::StoppedRecording() const
 {
-	UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("VOIP StoppedRecording"));
+	UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("VOIP StoppedRecording"));
 }
 
 bool FVoiceEngineImpl::Init(int32 MaxLocalTalkers, int32 MaxRemoteTalkers)
@@ -251,7 +251,7 @@ uint32 FVoiceEngineImpl::StartLocalVoiceProcessing(uint32 LocalUserNum)
 	}
 	else
 	{
-		UE_LOG(LogVoiceEngine, Error, TEXT("StartLocalVoiceProcessing(): Device is currently owned by another user"));
+		UE_LOG_ONLINE_VOICEENGINE(Error, TEXT("StartLocalVoiceProcessing(): Device is currently owned by another user"));
 	}
 
 	return Return;
@@ -278,7 +278,7 @@ uint32 FVoiceEngineImpl::StopLocalVoiceProcessing(uint32 LocalUserNum)
 	}
 	else
 	{
-		UE_LOG(LogVoiceEngine, Error, TEXT("StopLocalVoiceProcessing: Ignoring stop request for non-owning user"));
+		UE_LOG_ONLINE_VOICEENGINE(Error, TEXT("StopLocalVoiceProcessing: Ignoring stop request for non-owning user"));
 	}
 
 	return Return;
@@ -331,13 +331,13 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 		EVoiceCaptureState::Type VoiceResult = VoiceCapture->GetCaptureState(NewVoiceDataBytes);
 		if (VoiceResult != EVoiceCaptureState::Ok && VoiceResult != EVoiceCaptureState::NoData)
 		{
-			UE_LOG(LogVoiceEngine, Warning, TEXT("ReadLocalVoiceData: GetAvailableVoice failure: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
+			UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("ReadLocalVoiceData: GetAvailableVoice failure: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
 			return E_FAIL;
 		}
 
 		if (NewVoiceDataBytes == 0)
 		{
-			UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("ReadLocalVoiceData: No Data: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
+			UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("ReadLocalVoiceData: No Data: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
 			*Size = 0;
 			return S_OK;
 		}
@@ -351,7 +351,7 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 		// But we have a max amount we can return so clamp it to that max value if we're asking for more bytes than we're allowed
 		if (TotalVoiceBytes > UVOIPStatics::GetMaxUncompressedVoiceDataSizePerChannel())
 		{
-			UE_LOG(LogVoiceEngine, Warning, TEXT("Exceeded uncompressed voice buffer size, clamping"))
+			UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("Exceeded uncompressed voice buffer size, clamping"))
 			TotalVoiceBytes = UVOIPStatics::GetMaxUncompressedVoiceDataSizePerChannel();
 		}
 
@@ -393,7 +393,7 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 			{
 				if (PlayerVoiceData[LocalUserNum].VoiceRemainderSize > MAX_VOICE_REMAINDER_SIZE)
 				{
-					UE_LOG(LogVoiceEngine, Warning, TEXT("Exceeded voice remainder buffer size, clamping"));
+					UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("Exceeded voice remainder buffer size, clamping"));
 					PlayerVoiceData[LocalUserNum].VoiceRemainderSize = MAX_VOICE_REMAINDER_SIZE;
 				}
 
@@ -406,13 +406,13 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 			double TimeSinceLastCall = (LastGetVoiceCallTime > 0) ? (CurTime - LastGetVoiceCallTime) : 0.0;
 			LastGetVoiceCallTime = CurTime;
 
-			UE_LOG(LogVoiceEngine, Log, TEXT("ReadLocalVoiceData: GetVoice: Result: %s, Available: %i, LastCall: %0.3f ms"), EVoiceCaptureState::ToString(VoiceResult), CompressedBytesAvailable, TimeSinceLastCall * 1000.0);
+			UE_LOG_ONLINE_VOICEENGINE(Log, TEXT("ReadLocalVoiceData: GetVoice: Result: %s, Available: %i, LastCall: %0.3f ms"), EVoiceCaptureState::ToString(VoiceResult), CompressedBytesAvailable, TimeSinceLastCall * 1000.0);
 			if (CompressedBytesAvailable > 0)
 			{
 				*Size = FMath::Min<int32>(*Size, CompressedBytesAvailable);
 				FMemory::Memcpy(Data, CompressedVoiceBuffer.GetData(), *Size);
 
-				UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("ReadLocalVoiceData: Size: %d"), *Size);
+				UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("ReadLocalVoiceData: Size: %d"), *Size);
 				return S_OK;
 			}
 			else
@@ -420,7 +420,7 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 				*Size = 0;
 				CompressedVoiceBuffer.Empty(UVOIPStatics::GetMaxCompressedVoiceDataSize());
 
-				UE_LOG(LogVoiceEngine, Warning, TEXT("ReadLocalVoiceData: GetVoice failure: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
+				UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("ReadLocalVoiceData: GetVoice failure: VoiceResult: %s"), EVoiceCaptureState::ToString(VoiceResult));
 				return E_FAIL;
 			}
 		}
@@ -431,7 +431,7 @@ uint32 FVoiceEngineImpl::ReadLocalVoiceData(uint32 LocalUserNum, uint8* Data, ui
 
 uint32 FVoiceEngineImpl::SubmitRemoteVoiceData(const FUniqueNetIdWrapper& RemoteTalkerId, uint8* Data, uint32* Size, uint64& InSampleCount)
 {
-	UE_LOG(LogVoiceEngine, VeryVerbose, TEXT("SubmitRemoteVoiceData(%s) Size: %d received!"), *RemoteTalkerId.ToDebugString(), *Size);
+	UE_LOG_ONLINE_VOICEENGINE(VeryVerbose, TEXT("SubmitRemoteVoiceData(%s) Size: %d received!"), *RemoteTalkerId.ToDebugString(), *Size);
 	
 	const FUniqueNetIdString& TalkerId = (const FUniqueNetIdString&) (*RemoteTalkerId);
 	FRemoteTalkerDataImpl& QueuedData = RemoteTalkerBuffers.FindOrAdd(TalkerId);
@@ -563,7 +563,7 @@ void FVoiceEngineImpl::GenerateVoiceData(USoundWaveProcedural* InProceduralWave,
 			const int32 AvailableSamples = QueuedData->CurrentUncompressedDataQueueSize / SampleSize;
 			if (AvailableSamples >= SamplesRequired)
 			{
-				UE_LOG(LogVoiceEngine, Verbose, TEXT("GenerateVoiceData %d / %d"), AvailableSamples, SamplesRequired);
+				UE_LOG_ONLINE_VOICEENGINE(Verbose, TEXT("GenerateVoiceData %d / %d"), AvailableSamples, SamplesRequired);
 				const int32 SamplesBytesTaken = AvailableSamples * SampleSize;
 				InProceduralWave->QueueAudio(QueuedData->UncompressedDataQueue.GetData(), SamplesBytesTaken);
 				QueuedData->UncompressedDataQueue.RemoveAt(0, SamplesBytesTaken, false);
@@ -571,7 +571,7 @@ void FVoiceEngineImpl::GenerateVoiceData(USoundWaveProcedural* InProceduralWave,
 			}
 			else
 			{
-				UE_LOG(LogVoiceEngine, Verbose, TEXT("Voice underflow"));
+				UE_LOG_ONLINE_VOICEENGINE(Verbose, TEXT("Voice underflow"));
 			}
 		}
 	}
@@ -584,13 +584,13 @@ void FVoiceEngineImpl::OnAudioFinished()
 		FRemoteTalkerDataImpl& RemoteData = It.Value();
 		if (RemoteData.VoipSynthComponent->IsIdling())
 		{
-			UE_LOG(LogVoiceEngine, Log, TEXT("Removing VOIP AudioComponent for Id: %s"), *It.Key().ToDebugString());
+			UE_LOG_ONLINE_VOICEENGINE(Log, TEXT("Removing VOIP AudioComponent for Id: %s"), *It.Key().ToDebugString());
 			RemoteData.VoipSynthComponent->Stop();
 			RemoteData.bIsActive = false;
 			break;
 		}
 	}
-	UE_LOG(LogVoiceEngine, Verbose, TEXT("Audio Finished"));
+	UE_LOG_ONLINE_VOICEENGINE(Verbose, TEXT("Audio Finished"));
 }
 
 void FVoiceEngineImpl::OnPostLoadMap(UWorld*)
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceInterfaceImpl.cpp b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceInterfaceImpl.cpp
index 8286fc6a6f5a..8c74832cc3ed 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceInterfaceImpl.cpp
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Private/VoiceInterfaceImpl.cpp
@@ -33,17 +33,17 @@ bool FOnlineVoiceImpl::Init()
 	if (!GConfig->GetInt(TEXT("OnlineSubsystem"),TEXT("MaxLocalTalkers"), MaxLocalTalkers, GEngineIni))
 	{
 		MaxLocalTalkers = MAX_SPLITSCREEN_TALKERS;
-		UE_LOG(LogVoice, Warning, TEXT("Missing MaxLocalTalkers key in OnlineSubsystem of DefaultEngine.ini"));
+		UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing MaxLocalTalkers key in OnlineSubsystem of DefaultEngine.ini"));
 	}
 	if (!GConfig->GetInt(TEXT("OnlineSubsystem"),TEXT("MaxRemoteTalkers"), MaxRemoteTalkers, GEngineIni))
 	{
 		MaxRemoteTalkers = MAX_REMOTE_TALKERS;
-		UE_LOG(LogVoice, Warning, TEXT("Missing MaxRemoteTalkers key in OnlineSubsystem of DefaultEngine.ini"));
+		UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing MaxRemoteTalkers key in OnlineSubsystem of DefaultEngine.ini"));
 	}
 	if (!GConfig->GetFloat(TEXT("OnlineSubsystem"),TEXT("VoiceNotificationDelta"), VoiceNotificationDelta, GEngineIni))
 	{
 		VoiceNotificationDelta = 0.2;
-		UE_LOG(LogVoice, Warning, TEXT("Missing VoiceNotificationDelta key in OnlineSubsystem of DefaultEngine.ini"));
+		UE_LOG_ONLINE_VOICE(Warning, TEXT("Missing VoiceNotificationDelta key in OnlineSubsystem of DefaultEngine.ini"));
 	}
 
 	bool bHasVoiceEnabled = false;
@@ -77,7 +77,7 @@ bool FOnlineVoiceImpl::Init()
 		if (!bSuccess)
 		{
 			// Not necessary to log here since VoiceEngine::Init() will report its own failure
-			//UE_LOG(LogVoice, Warning, TEXT("Failed to initialize voice interface"));
+			//UE_LOG_ONLINE_VOICE(Warning, TEXT("Failed to initialize voice interface"));
 
 			LocalTalkers.Empty();
 			RemoteTalkers.Empty();
@@ -86,7 +86,7 @@ bool FOnlineVoiceImpl::Init()
 	}
 	else
 	{
-		UE_LOG(LogVoice, Log, TEXT("Voice interface disabled by config [OnlineSubsystem].bHasVoiceEnabled"));
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Voice interface disabled by config [OnlineSubsystem].bHasVoiceEnabled"));
 	}
 
 	return bSuccess;
@@ -151,13 +151,13 @@ void FOnlineVoiceImpl::StartNetworkedVoice(uint8 LocalUserNum)
 		if (VoiceEngine.IsValid())
 		{
 			uint32 Return = VoiceEngine->StartLocalVoiceProcessing(LocalUserNum);
-			UE_LOG(LogVoice, Log, TEXT("StartLocalProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("StartLocalProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
 		}
-		UE_LOG(LogVoice, Log, TEXT("Starting networked voice for user: %d"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Starting networked voice for user: %d"), LocalUserNum);
 	}
 	else
 	{
-		UE_LOG(LogVoice, Log, TEXT("Invalid user specified in StartNetworkedVoice(%d)"),
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Invalid user specified in StartNetworkedVoice(%d)"),
 			(uint32)LocalUserNum);
 	}
 }
@@ -170,14 +170,14 @@ void FOnlineVoiceImpl::StopNetworkedVoice(uint8 LocalUserNum)
 		if (VoiceEngine.IsValid())
 		{
 			uint32 Return = VoiceEngine->StopLocalVoiceProcessing(LocalUserNum);
-			UE_LOG(LogVoice, Log, TEXT("StopLocalVoiceProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("StopLocalVoiceProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
 		}
 		LocalTalkers[LocalUserNum].bHasNetworkedVoice = false;
-		UE_LOG(LogVoice, Log, TEXT("Stopping networked voice for user: %d"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Stopping networked voice for user: %d"), LocalUserNum);
 	}
 	else
 	{
-		UE_LOG(LogVoice, Log, TEXT("Invalid user specified in StopNetworkedVoice(%d)"),
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Invalid user specified in StopNetworkedVoice(%d)"),
 			(uint32)LocalUserNum);
 	}
 }
@@ -198,7 +198,7 @@ bool FOnlineVoiceImpl::RegisterLocalTalker(uint32 LocalUserNum)
 			{
 				// Register the talker locally
 				Return = VoiceEngine->RegisterLocalTalker(LocalUserNum);
-				UE_LOG(LogVoice, Log, TEXT("RegisterLocalTalker(%d) returned 0x%08X"),	LocalUserNum, Return);
+				UE_LOG_ONLINE_VOICE(Log, TEXT("RegisterLocalTalker(%d) returned 0x%08X"),	LocalUserNum, Return);
 				if (Return == S_OK)
 				{
 					Talker.bIsRegistered = true;
@@ -207,7 +207,7 @@ bool FOnlineVoiceImpl::RegisterLocalTalker(uint32 LocalUserNum)
 						// If enabled, voice capture is continuous and "push to talk" merely sends packets
 						// Kick off the processing mode
 						Return = VoiceEngine->StartLocalVoiceProcessing(LocalUserNum);
-						UE_LOG(LogVoice, Log, TEXT("StartLocalProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
+						UE_LOG_ONLINE_VOICE(Log, TEXT("StartLocalProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
 					}
 				}
 			}
@@ -227,14 +227,14 @@ bool FOnlineVoiceImpl::RegisterLocalTalker(uint32 LocalUserNum)
 	}
 	else
 	{
-		UE_LOG(LogVoice, Log, TEXT("Invalid user specified in RegisterLocalTalker(%d)"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Invalid user specified in RegisterLocalTalker(%d)"), LocalUserNum);
 	}
 	return Return == S_OK;
 }
 
 void FOnlineVoiceImpl::RegisterLocalTalkers()
 {
-	UE_LOG(LogVoice, Log, TEXT("Registering all local talkers"));
+	UE_LOG_ONLINE_VOICE(Log, TEXT("Registering all local talkers"));
 	// Loop through the 4 available players and register them
 	for (uint32 Index = 0; Index < (uint32)MaxLocalTalkers ; Index++)
 	{
@@ -264,15 +264,15 @@ bool FOnlineVoiceImpl::UnregisterLocalTalker(uint32 LocalUserNum)
 				}
 				else
 				{
-					UE_LOG(LogVoice, Warning, TEXT("Invalid UserId for local player %d in UnregisterLocalTalker"), LocalUserNum);
+					UE_LOG_ONLINE_VOICE(Warning, TEXT("Invalid UserId for local player %d in UnregisterLocalTalker"), LocalUserNum);
 				}
 			}
 
 			// Remove them from engine too
 			Return = VoiceEngine->StopLocalVoiceProcessing(LocalUserNum);
-			UE_LOG(LogVoice, Log, TEXT("StopLocalVoiceProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("StopLocalVoiceProcessing(%d) returned 0x%08X"), LocalUserNum, Return);
 			Return = VoiceEngine->UnregisterLocalTalker(LocalUserNum);
-			UE_LOG(LogVoice, Log, TEXT("UnregisterLocalTalker(%d) returned 0x%08X"), LocalUserNum, Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("UnregisterLocalTalker(%d) returned 0x%08X"), LocalUserNum, Return);
 			Talker.bIsTalking = false;
 			Talker.bWasTalking = false;
 			Talker.bIsRegistered = false;
@@ -280,14 +280,14 @@ bool FOnlineVoiceImpl::UnregisterLocalTalker(uint32 LocalUserNum)
 	}
 	else
 	{
-		UE_LOG(LogVoice, Log, TEXT("Invalid user specified in UnregisterLocalTalker(%d)"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Log, TEXT("Invalid user specified in UnregisterLocalTalker(%d)"), LocalUserNum);
 	}
 	return Return == S_OK;
 }
 
 void FOnlineVoiceImpl::UnregisterLocalTalkers()
 {
-	UE_LOG(LogVoice, Log, TEXT("Unregistering all local talkers"));
+	UE_LOG_ONLINE_VOICE(Log, TEXT("Unregistering all local talkers"));
 	// Loop through the 4 available players and unregister them
 	for (uint32 Index = 0; Index < (uint32)MaxLocalTalkers; Index++)
 	{
@@ -318,12 +318,12 @@ bool FOnlineVoiceImpl::RegisterRemoteTalker(const FUniqueNetId& UniqueId)
 				Talker->TalkerId = MakeShareable(new FUniqueNetIdString(UniqueIdStr));
 				// Register the remote talker locally
 				Return = VoiceEngine->RegisterRemoteTalker(UniqueId);
-				UE_LOG(LogVoice, Log, TEXT("RegisterRemoteTalker(%s) returned 0x%08X"),
+				UE_LOG_ONLINE_VOICE(Log, TEXT("RegisterRemoteTalker(%s) returned 0x%08X"),
 					*UniqueId.ToDebugString(), Return);
 			}
 			else
 			{
-				UE_LOG(LogVoice, Verbose, TEXT("Remote talker %s is being re-registered"), *UniqueId.ToDebugString());
+				UE_LOG_ONLINE_VOICE(Verbose, TEXT("Remote talker %s is being re-registered"), *UniqueId.ToDebugString());
 				Return = S_OK;
 			}
 			
@@ -331,7 +331,7 @@ bool FOnlineVoiceImpl::RegisterRemoteTalker(const FUniqueNetId& UniqueId)
 			ProcessMuteChangeNotification();
 			// Now start processing the remote voices
 			Return = VoiceEngine->StartRemoteVoiceProcessing(UniqueId);
-			UE_LOG(LogVoice, Log, TEXT("StartRemoteVoiceProcessing(%s) returned 0x%08X"), *UniqueId.ToDebugString(), Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("StartRemoteVoiceProcessing(%s) returned 0x%08X"), *UniqueId.ToDebugString(), Return);
 		}
 	}
 	return Return == S_OK;
@@ -369,11 +369,11 @@ bool FOnlineVoiceImpl::UnregisterRemoteTalker(const FUniqueNetId& UniqueId)
 				}
 				// Remove them from voice engine
 				Return = VoiceEngine->UnregisterRemoteTalker(UniqueId);
-				UE_LOG(LogVoice, Log, TEXT("UnregisterRemoteTalker(%s) returned 0x%08X"), *UniqueId.ToDebugString(), Return);
+				UE_LOG_ONLINE_VOICE(Log, TEXT("UnregisterRemoteTalker(%s) returned 0x%08X"), *UniqueId.ToDebugString(), Return);
 			}
 			else
 			{
-				UE_LOG(LogVoice, Verbose, TEXT("Unknown remote talker (%s) specified to UnregisterRemoteTalker()"), *UniqueId.ToDebugString());
+				UE_LOG_ONLINE_VOICE(Verbose, TEXT("Unknown remote talker (%s) specified to UnregisterRemoteTalker()"), *UniqueId.ToDebugString());
 			}
 		}
 	}
@@ -382,7 +382,7 @@ bool FOnlineVoiceImpl::UnregisterRemoteTalker(const FUniqueNetId& UniqueId)
 
 void FOnlineVoiceImpl::RemoveAllRemoteTalkers()
 {
-	UE_LOG(LogVoice, Log, TEXT("Removing all remote talkers"));
+	UE_LOG_ONLINE_VOICE(Log, TEXT("Removing all remote talkers"));
 	if (VoiceEngine.IsValid())
 	{
 		// Work backwards through array removing the talkers
@@ -396,7 +396,7 @@ void FOnlineVoiceImpl::RemoveAllRemoteTalkers()
 			}
 
 			uint32 Return = VoiceEngine->UnregisterRemoteTalker(*Talker.TalkerId);
-			UE_LOG(LogVoice, Log, TEXT("UnregisterRemoteTalker(%s) returned 0x%08X"), *Talker.TalkerId->ToDebugString(), Return);
+			UE_LOG_ONLINE_VOICE(Log, TEXT("UnregisterRemoteTalker(%s) returned 0x%08X"), *Talker.TalkerId->ToDebugString(), Return);
 		}
 	}
 
@@ -480,18 +480,18 @@ bool FOnlineVoiceImpl::MuteRemoteTalker(uint8 LocalUserNum, const FUniqueNetId&
 				{
 					MuteList.AddUnique((const FUniqueNetIdString&)PlayerId);
 					Return = S_OK;
-					UE_LOG(LogVoice, Log, TEXT("Muting remote talker (%s)"), *PlayerId.ToDebugString());
+					UE_LOG_ONLINE_VOICE(Log, TEXT("Muting remote talker (%s)"), *PlayerId.ToDebugString());
 				}
 				else
 				{
-					UE_LOG(LogVoice, Verbose, TEXT("Unknown remote talker (%s) specified to MuteRemoteTalker()"), *PlayerId.ToDebugString());
+					UE_LOG_ONLINE_VOICE(Verbose, TEXT("Unknown remote talker (%s) specified to MuteRemoteTalker()"), *PlayerId.ToDebugString());
 				}
 			}
 		}
 	}
 	else
 	{
-		UE_LOG(LogVoice, Warning, TEXT("Invalid user specified in MuteRemoteTalker(%d)"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Warning, TEXT("Invalid user specified in MuteRemoteTalker(%d)"), LocalUserNum);
 	}
 
 	return Return == S_OK;
@@ -526,19 +526,19 @@ bool FOnlineVoiceImpl::UnmuteRemoteTalker(uint8 LocalUserNum, const FUniqueNetId
 					{
 						// Remove them from the mute list
 						MuteList.RemoveSingleSwap((const FUniqueNetIdString&)PlayerId);
-						UE_LOG(LogVoice, Log, TEXT("Unmuting remote talker (%s)"), *PlayerId.ToDebugString());
+						UE_LOG_ONLINE_VOICE(Log, TEXT("Unmuting remote talker (%s)"), *PlayerId.ToDebugString());
 					}
 				}
 				else
 				{
-					UE_LOG(LogVoice, Verbose, TEXT("Unknown remote talker (%s) specified to UnmuteRemoteTalker()"), *PlayerId.ToDebugString());
+					UE_LOG_ONLINE_VOICE(Verbose, TEXT("Unknown remote talker (%s) specified to UnmuteRemoteTalker()"), *PlayerId.ToDebugString());
 				}
 			}
 		}
 	}
 	else
 	{
-		UE_LOG(LogVoice, Warning, TEXT("Invalid user specified in UnmuteRemoteTalker(%d)"), LocalUserNum);
+		UE_LOG_ONLINE_VOICE(Warning, TEXT("Invalid user specified in UnmuteRemoteTalker(%d)"), LocalUserNum);
 	}
 
 	return Return == S_OK; //-V547
@@ -669,7 +669,7 @@ void FOnlineVoiceImpl::ProcessTalkingDelegates(float DeltaTime)
 				}
 
 				Talker.bWasTalking = Talker.bIsTalking;
-				UE_LOG(LogVoice, Log, TEXT("Trigger Local %d %sTALKING"), LocalUserNum, Talker.bIsTalking ? TEXT("") : TEXT("NOT"));
+				UE_LOG_ONLINE_VOICE(Log, TEXT("Trigger Local %d %sTALKING"), LocalUserNum, Talker.bIsTalking ? TEXT("") : TEXT("NOT"));
 			}
 		}
 	}
@@ -698,7 +698,7 @@ void FOnlineVoiceImpl::ProcessTalkingDelegates(float DeltaTime)
 				OnPlayerTalkingStateChangedDelegates.Broadcast(Talker.TalkerId.ToSharedRef(), Talker.bIsTalking);
 			}
 
-			UE_LOG(LogVoice, Log, TEXT("Trigger Remote %s %sTALKING"), *Talker.TalkerId->ToString(), Talker.bIsTalking ? TEXT("") : TEXT("NOT"));
+			UE_LOG_ONLINE_VOICE(Log, TEXT("Trigger Remote %s %sTALKING"), *Talker.TalkerId->ToString(), Talker.bIsTalking ? TEXT("") : TEXT("NOT"));
 
 			// Clear the flag so it only activates when needed
 			Talker.bWasTalking = Talker.bIsTalking;
@@ -764,12 +764,12 @@ void FOnlineVoiceImpl::ProcessLocalVoicePackets()
 						}
 						else
 						{
-							UE_LOG(LogVoiceEngine, Warning, TEXT("Voice data error in ReadLocalVoiceData"));
+							UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("Voice data error in ReadLocalVoiceData"));
 						}
 					}
 					else
 					{
-						UE_LOG(LogVoiceEngine, Warning, TEXT("Dropping voice data due to network layer not processing fast enough"));
+						UE_LOG_ONLINE_VOICEENGINE(Warning, TEXT("Dropping voice data due to network layer not processing fast enough"));
 						// Buffer overflow, so drop previous data
 						VoiceData.LocalPackets[Index].Length = 0;
 					}
@@ -803,7 +803,7 @@ void FOnlineVoiceImpl::ProcessRemoteVoicePackets()
 				uint32 Result = VoiceEngine->SubmitRemoteVoiceData(VoicePacket->Sender, VoicePacket->Buffer.GetData(), &VoiceBufferSize, VoiceSampleCounter);
 				if (Result != S_OK)
 				{
-					UE_LOG(LogVoiceEngine, Warning,
+					UE_LOG_ONLINE_VOICEENGINE(Warning,
 						TEXT("SubmitRemoteVoiceData(%s) failed with 0x%08X"),
 						*VoicePacket->Sender->ToDebugString(),
 						Result);
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/OnlineSubsystemUtils.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/OnlineSubsystemUtils.h
index 272029fa3f93..1448fc30f45b 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/OnlineSubsystemUtils.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/OnlineSubsystemUtils.h
@@ -93,6 +93,36 @@ public:
 	 */
 	virtual FName GetOnlineIdentifier(UWorld* World, const FName Subsystem = NAME_None) const = 0;
 
+	/**
+	 * Create a TRANSPORT LAYER unique id
+	 * NOTE: Do NOT Use this for anything other than replication to non native platforms
+	 * This is NOT a shortcut for creating unique ids
+	 * 
+	 * @param Str string form an opaque unique net id
+	 * @param Type name of the online subsystem this unique id belongs to
+	 *
+	 * @return unique net id in "transport" format
+	 */
+	virtual TSharedPtr<const FUniqueNetId> CreateForeignUniqueNetId(const FString& Str, FName Type) const = 0;
+
+	/** 
+	 * Return the replication hash for a given subsystem
+	 *
+	 * @param InSubsystemName name of subsystem to retrieve hash from
+	 *
+	 * @return replication hash, or 0 if invalid/unknown
+	 */
+	virtual uint8 GetReplicationHashForSubsystem(FName SubsystemName) const = 0;
+
+	/**
+	 * Return the name of the online subsystem associated with this hash
+	 *
+	 * @param InHash replication hash for an online subsystem
+	 *
+	 * @return name of subsystem this hash belongs to
+	 */
+	virtual FName GetSubsystemFromReplicationHash(uint8 InHash) const = 0;
+
 	/**
 	 * Bind a notification delegate when any subsystem external UI is opened/closed
 	 * *NOTE* there is only meant to be one delegate needed for this, game code should bind manually
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconHost.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconHost.h
index 6fbd3ceada17..416fe9654489 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconHost.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconHost.h
@@ -301,6 +301,24 @@ class ONLINESUBSYSTEMUTILS_API APartyBeaconHost : public AOnlineBeaconHostObject
 	 */
 	virtual void ProcessCancelReservationRequest(APartyBeaconClient* Client, const FUniqueNetIdRepl& PartyLeader);
 
+	/**
+	 * Crossplay
+	 */
+
+	/**
+	 * @return true if there are cross play restrictions, false otherwise
+	 */
+	virtual bool HasCrossplayOptOutReservation() const;
+
+	/**
+	 * Get a count of all players for a given platform
+	 * 
+	 * @param InPlatform platform to get a count for
+	 * 
+	 * @return number of players for a given platform
+	 */
+	virtual int32 GetReservationPlatformCount(const FString& InPlatform) const;
+
 	/**
 	 * Delegate fired when a the beacon host detects a reservation addition/removal
 	 */
diff --git a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconState.h b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconState.h
index bb71253e323e..2f1a08d21aea 100644
--- a/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconState.h
+++ b/Engine/Plugins/Online/OnlineSubsystemUtils/Source/OnlineSubsystemUtils/Public/PartyBeaconState.h
@@ -37,6 +37,8 @@ namespace EPartyReservationResult
 		ReservationAccepted,
 		/** The beacon is paused and not accepting new connections. */
 		ReservationDenied,
+		/** Some kind of cross play restriction prevents this party from joining */
+		ReservationDenied_CrossPlayRestriction,
 		/** This player is banned. */
 		ReservationDenied_Banned,
 		/** The reservation request was canceled before being sent. */
@@ -97,6 +99,10 @@ namespace EPartyReservationResult
 			{
 				return TEXT("Reservation Denied");
 			}
+			case ReservationDenied_CrossPlayRestriction:
+			{
+				return TEXT("Reservation Denied CrossPlayRestriction");
+			}
 			case ReservationDenied_Banned:
 			{
 				return TEXT("Reservation Banned");
@@ -172,8 +178,9 @@ struct FPlayerReservation
 {
 	GENERATED_USTRUCT_BODY()
 	
-	FPlayerReservation() :
-		ElapsedTime(0.0f)
+	FPlayerReservation()
+		: bAllowCrossplay(false)
+		, ElapsedTime(0.0f)
 	{}
 
 	/** Unique id for this reservation */
@@ -184,6 +191,14 @@ struct FPlayerReservation
 	UPROPERTY(Transient)
 	FString ValidationStr;
 
+	/** Platform this user is on */
+	UPROPERTY(Transient)
+	FString Platform;
+
+    /** Does this player opt in to crossplay */
+	UPROPERTY(Transient)
+	bool bAllowCrossplay;
+
 	/** Elapsed time since player made reservation and was last seen */
 	UPROPERTY(Transient)
 	float ElapsedTime;
@@ -195,8 +210,8 @@ struct ONLINESUBSYSTEMUTILS_API FPartyReservation
 {
 	GENERATED_USTRUCT_BODY()
 
-	FPartyReservation() :
-		TeamNum(INDEX_NONE)
+	FPartyReservation() 
+		: TeamNum(INDEX_NONE)
 	{}
 
 	/** Team assigned to this party */
@@ -491,6 +506,29 @@ class ONLINESUBSYSTEMUTILS_API UPartyBeaconState : public UObject
 	*/
 	virtual bool AreTeamsAvailable(const FPartyReservation& ReservationRequest) const;
 
+	/**
+	 * Perform a cross play compatible check for the new reservation against existing reservations
+	 * 
+	 * @param ReservationRequest new reservation to compare
+	 * 
+	 * @return true if there are no cross play restrictions, false otherwise
+	 */
+	virtual bool CrossPlayAllowed(const FPartyReservation& ReservationRequest) const;
+
+	/**
+	 * @return true if there are cross play restrictions, false otherwise
+	 */
+	virtual bool HasCrossplayOptOutReservation() const;
+
+	/**
+	 * Get a count of all players for a given platform
+	 * 
+	 * @param InPlatform platform to get a count for
+	 * 
+	 * @return number of players for a given platform
+	 */
+	virtual int32 GetReservationPlatformCount(const FString& InPlatform) const;
+
 	/**
 	* Determine the team number for the given party reservation request.
 	* Uses the list of current reservations to determine what teams have open slots.
@@ -531,6 +569,9 @@ protected:
 	/** Team that everyone is forced to in single team games */
 	UPROPERTY(Transient)
 	int32 ForceTeamNum;
+	/** Are multiple consoles types allowed to play together */
+	UPROPERTY(Config)
+	bool bRestrictCrossConsole;
 
 	/** Current reservations in the system */
 	UPROPERTY(Transient)
diff --git a/Engine/Plugins/Performance/PerformanceMonitor/Source/PerformanceMonitor/Private/PerformanceMonitor.cpp b/Engine/Plugins/Performance/PerformanceMonitor/Source/PerformanceMonitor/Private/PerformanceMonitor.cpp
index 8ba6668c64de..6cc40a4640ee 100644
--- a/Engine/Plugins/Performance/PerformanceMonitor/Source/PerformanceMonitor/Private/PerformanceMonitor.cpp
+++ b/Engine/Plugins/Performance/PerformanceMonitor/Source/PerformanceMonitor/Private/PerformanceMonitor.cpp
@@ -41,6 +41,7 @@ FPerformanceMonitorModule::~FPerformanceMonitorModule()
 
 bool FPerformanceMonitorModule::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FPerformanceMonitorModule_Tick);
 #if STATS
 
 	if (bRecording)
diff --git a/Engine/Plugins/Portal/LauncherChunkInstaller/LauncherChunkInstaller.uplugin b/Engine/Plugins/Portal/LauncherChunkInstaller/LauncherChunkInstaller.uplugin
new file mode 100644
index 000000000000..0f8bc467c48f
--- /dev/null
+++ b/Engine/Plugins/Portal/LauncherChunkInstaller/LauncherChunkInstaller.uplugin
@@ -0,0 +1,28 @@
+{
+	"FileVersion" : 3,
+	
+	"FriendlyName" : "Launcher Chunk Installer",
+	"Version" : 1,
+	"VersionName" : "1.0",
+	"Description" : "Chunk installer module that hooks into launcher",
+	"Category" : "Launcher",
+	"CreatedBy" : "Epic Games, Inc.",
+	"CreatedByURL" : "http://epicgames.com",
+	"EnabledByDefault" : true,
+		
+	 "Modules": 
+	 [
+        {
+            "Name": "LauncherChunkInstaller",
+            "Type": "Runtime",
+            "LoadingPhase" : "PostConfigInit",
+			"WhitelistPlatforms" :
+			[
+				"Win64",
+				"Win32",
+				"Linux",
+				"Mac"
+			]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/LauncherChunkInstaller.Build.cs b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/LauncherChunkInstaller.Build.cs
new file mode 100644
index 000000000000..c04a6a530bfa
--- /dev/null
+++ b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/LauncherChunkInstaller.Build.cs
@@ -0,0 +1,22 @@
+// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class LauncherChunkInstaller : ModuleRules
+{
+    public LauncherChunkInstaller(ReadOnlyTargetRules Target) : base(Target)
+    {
+        PrivateDependencyModuleNames.AddRange(
+            new string[] 
+            {
+                "Core",
+                "PakFile",
+            }
+        );
+
+        if (Target.Platform != UnrealTargetPlatform.Linux && Target.Platform != UnrealTargetPlatform.Win32 && Target.Platform != UnrealTargetPlatform.Win64 && Target.Platform != UnrealTargetPlatform.Mac)
+        {
+            PrecompileForTargets = PrecompileTargetsType.None;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Private/LauncherChunkInstaller.cpp b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Private/LauncherChunkInstaller.cpp
new file mode 100644
index 000000000000..1331571fa2ca
--- /dev/null
+++ b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Private/LauncherChunkInstaller.cpp
@@ -0,0 +1,77 @@
+// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+
+#include "LauncherChunkInstaller.h"
+#include "HAL/FileManager.h"
+#include "HAL/PlatformFilemanager.h"
+#include "IPlatformFilePak.h"
+#include "Misc/CommandLine.h"
+#include "Modules/ModuleManager.h"
+
+/**
+ * Module for the Launcher Chunk Installer
+ */
+class FLauncherChunkInstallerModule : public IPlatformChunkInstallModule
+{
+public:
+	TUniquePtr<IPlatformChunkInstall> ChunkInstaller;
+
+	FLauncherChunkInstallerModule()
+		: ChunkInstaller(new FLauncherChunkInstaller())
+	{
+
+	}
+
+	virtual IPlatformChunkInstall* GetPlatformChunkInstall()
+	{
+		return ChunkInstaller.Get();
+	}
+};
+
+IMPLEMENT_MODULE(FLauncherChunkInstallerModule, LauncherChunkInstaller);
+
+EChunkLocation::Type FLauncherChunkInstaller::GetChunkLocation(uint32 ChunkID)
+{
+	// get the platform pak file management API.
+	FPakPlatformFile* PakPlatformFile = (FPakPlatformFile*)(FPlatformFileManager::Get().FindPlatformFile(FPakPlatformFile::GetTypeName()));
+	if (PakPlatformFile)
+	{
+		// Initially get all pak folders.
+		// Go through each folder to find all pak files in the corresponding folder.
+		// Go through all pak files and find the first one that starts with the prefix 
+		// for the chunk we're interested in.
+
+		TArray<FString> PakFolders;
+		TArray<FString> AllPakFiles;
+		PakPlatformFile->GetPakFolders(FCommandLine::Get(), PakFolders);
+		for (const FString& PakFolder : PakFolders)
+		{
+			TArray<FString> PakFiles;
+			IFileManager::Get().FindFiles(PakFiles, *PakFolder, TEXT(".pak"));
+			for (const FString& PakFile : PakFiles)
+			{
+				AllPakFiles.Add(PakFile);
+			}
+		}
+
+		TArray<FStringFormatArg> FormatArgs = { ChunkID };
+		FString ChunkPrefix = FString::Format(TEXT("pakchunk{0}"), FormatArgs);
+
+		for (FString PakFile : AllPakFiles)
+		{
+			FString PakFileClean = FPaths::GetCleanFilename(PakFile);
+			if (PakFileClean.StartsWith(ChunkPrefix))
+			{
+				return EChunkLocation::LocalFast;
+			}
+		}
+	}
+
+	// This is a fall back for builds to fail on shipping or testing.
+	// This code will also force available to trigger when we're running editor
+
+#if UE_BUILD_SHIPPING || UE_BUILD_TEST
+	return EChunkLocation::NotAvailable;
+#else 
+	return EChunkLocation::LocalFast;
+#endif
+}
diff --git a/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Public/LauncherChunkInstaller.h b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Public/LauncherChunkInstaller.h
new file mode 100644
index 000000000000..c421c4ecf7c1
--- /dev/null
+++ b/Engine/Plugins/Portal/LauncherChunkInstaller/Source/LauncherChunkInstaller/Public/LauncherChunkInstaller.h
@@ -0,0 +1,14 @@
+// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "GenericPlatform/GenericPlatformChunkInstall.h"
+
+/**
+* Launcher Implementation of the platform chunk install module
+**/
+class LAUNCHERCHUNKINSTALLER_API FLauncherChunkInstaller : public FGenericPlatformChunkInstall
+{
+public:
+	virtual EChunkLocation::Type GetChunkLocation(uint32 ChunkID) override;
+};
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/Analytics/Adjust/Source/AndroidAdjust/Adjust_UPL.xml b/Engine/Plugins/Runtime/Analytics/Adjust/Source/AndroidAdjust/Adjust_UPL.xml
index 7f5af0f0c2e8..c4b35a772e19 100644
--- a/Engine/Plugins/Runtime/Analytics/Adjust/Source/AndroidAdjust/Adjust_UPL.xml
+++ b/Engine/Plugins/Runtime/Analytics/Adjust/Source/AndroidAdjust/Adjust_UPL.xml
@@ -32,6 +32,9 @@
 		<setBoolIsEqual result="bNoDefaultTracker" arg1="$S(DefaultTracker)" arg2=""/>
 		<setBoolIsEqual result="bNoProcessName" arg1="$S(ProcessName)" arg2=""/>
 		<setBoolIsEqual result="bNoDelayStart" arg1="$S(DelayStart)" arg2="0.0"/>
+
+		<!-- check if using Gradle -->
+		<setBoolFromProperty result="bGradle" ini="Engine" section="/Script/AndroidRuntimeSettings.AndroidRuntimeSettings" property="bEnableGradle" default="false"/>
 	</init>
 	
 	<!-- optional files or directories to copy to Intermediate/Android/APK -->
@@ -47,9 +50,21 @@
 
 	<!-- AAR dependencies -->
 	<AARImports>
-		<insertValue value="com.google.android.gms,play-services-analytics,11.0.4" />
-		<insertNewline/>
+		<if condition="bGradle">
+			<false>
+				<insertValue value="com.google.android.gms,play-services-analytics,11.0.4" />
+				<insertNewline/>
+			</false>
+		</if>
 	</AARImports>
+
+	<buildGradleAdditions>
+		<insert>
+dependencies {
+	implementation('com.google.android.gms:play-services-analytics:11.8.0')
+}
+		</insert>
+	</buildGradleAdditions>
 	
 	<!-- optional additions to proguard -->
 	<proguardAdditions>
diff --git a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileMatchingRules.h b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileMatchingRules.h
index b2f083fc4f24..51d9dafdf07c 100644
--- a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileMatchingRules.h
+++ b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileMatchingRules.h
@@ -17,6 +17,7 @@ enum ESourceType
 	SRC_DeviceModel,
 	SRC_VulkanVersion,
 	SRC_UsingHoudini,
+	SRC_VulkanAvailable,
 	SRC_MAX,
 };
 
diff --git a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelector.cpp b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelector.cpp
index a5f954666117..31145ad2d017 100644
--- a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelector.cpp
+++ b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelector.cpp
@@ -29,15 +29,17 @@ static UAndroidDeviceProfileMatchingRules* GetAndroidDeviceProfileMatchingRules(
 	return Rules;
 }
 
-FString FAndroidDeviceProfileSelector::FindMatchingProfile(FString GPUFamily, FString GLVersion, FString AndroidVersion, FString DeviceMake, FString DeviceModel, FString VulkanVersion, FString UsingHoudini, FString ProfileName)
+FString FAndroidDeviceProfileSelector::FindMatchingProfile(const FString& GPUFamily, const FString& GLVersion, const FString& AndroidVersion, const FString& DeviceMake, const FString& DeviceModel, const FString& VulkanAvailable, const FString& VulkanVersion, const FString& UsingHoudini, const FString& ProfileName)
 {
+	FString OutProfileName = ProfileName;
+
 	for (const FProfileMatch& Profile : GetAndroidDeviceProfileMatchingRules()->MatchProfile)
 	{
 		FString PreviousRegexMatch;
 		bool bFoundMatch = true;
 		for (const FProfileMatchItem& Item : Profile.Match)
 		{
-			FString* SourceString = nullptr;
+			const FString* SourceString = nullptr;
 			switch (Item.SourceType)
 			{
 			case SRC_PreviousRegexMatch:
@@ -64,6 +66,9 @@ FString FAndroidDeviceProfileSelector::FindMatchingProfile(FString GPUFamily, FS
 			case SRC_UsingHoudini:
 				SourceString = &UsingHoudini;
 				break;
+			case SRC_VulkanAvailable:
+				SourceString = &VulkanAvailable;
+				break;
 			default:
 				continue;
 			}
@@ -132,11 +137,11 @@ FString FAndroidDeviceProfileSelector::FindMatchingProfile(FString GPUFamily, FS
 
 		if (bFoundMatch)
 		{
-			ProfileName = Profile.Profile;
+			OutProfileName = Profile.Profile;
 			break;
 		}
 	}
-	return ProfileName;
+	return OutProfileName;
 }
 
 int32 FAndroidDeviceProfileSelector::GetNumProfiles()
diff --git a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelectorModule.cpp b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelectorModule.cpp
index 2f46ddd16fdc..c18c96509e64 100644
--- a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelectorModule.cpp
+++ b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Private/AndroidDeviceProfileSelectorModule.cpp
@@ -30,6 +30,7 @@ const FString FAndroidDeviceProfileSelectorModule::GetDeviceProfileName(const TM
 	// Pull out required device parameters:
 	FString GPUFamily = DeviceParameters.FindChecked("GPUFamily");
 	FString GLVersion = DeviceParameters.FindChecked("GLVersion");
+	FString VulkanAvailable = DeviceParameters.FindChecked("VulkanAvailable");
 	FString VulkanVersion = DeviceParameters.FindChecked("VulkanVersion");
 	FString AndroidVersion = DeviceParameters.FindChecked("AndroidVersion");
 	FString DeviceMake = DeviceParameters.FindChecked("DeviceMake");
@@ -40,13 +41,14 @@ const FString FAndroidDeviceProfileSelectorModule::GetDeviceProfileName(const TM
 	UE_LOG(LogAndroid, Log, TEXT("  Default profile: %s"), *ProfileName);
 	UE_LOG(LogAndroid, Log, TEXT("  GpuFamily: %s"), *GPUFamily);
 	UE_LOG(LogAndroid, Log, TEXT("  GlVersion: %s"), *GLVersion);
+	UE_LOG(LogAndroid, Log, TEXT("  VulkanAvailable: %s"), *VulkanAvailable);
 	UE_LOG(LogAndroid, Log, TEXT("  VulkanVersion: %s"), *VulkanVersion);
 	UE_LOG(LogAndroid, Log, TEXT("  AndroidVersion: %s"), *AndroidVersion);
 	UE_LOG(LogAndroid, Log, TEXT("  DeviceMake: %s"), *DeviceMake);
 	UE_LOG(LogAndroid, Log, TEXT("  DeviceModel: %s"), *DeviceModel);
 	UE_LOG(LogAndroid, Log, TEXT("  UsingHoudini: %s"), *UsingHoudini);
 
-	ProfileName = FAndroidDeviceProfileSelector::FindMatchingProfile(GPUFamily, GLVersion, AndroidVersion, DeviceMake, DeviceModel, VulkanVersion, UsingHoudini, ProfileName);
+	ProfileName = FAndroidDeviceProfileSelector::FindMatchingProfile(GPUFamily, GLVersion, AndroidVersion, DeviceMake, DeviceModel, VulkanAvailable, VulkanVersion, UsingHoudini, ProfileName);
 
 	UE_LOG(LogAndroid, Log, TEXT("Selected Device Profile: [%s]"), *ProfileName);
 
diff --git a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Public/AndroidDeviceProfileSelector.h b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Public/AndroidDeviceProfileSelector.h
index b2ccc883f9b1..af60bf29b551 100644
--- a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Public/AndroidDeviceProfileSelector.h
+++ b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelector/Public/AndroidDeviceProfileSelector.h
@@ -7,6 +7,6 @@
 class ANDROIDDEVICEPROFILESELECTOR_API FAndroidDeviceProfileSelector
 {
 public:
-	static FString FindMatchingProfile(FString GPUFamily, FString GLVersion, FString AndroidVersion, FString DeviceMake, FString DeviceModel, FString VulkanVersion, FString UsingHoudini, FString ProfileName);
+	static FString FindMatchingProfile(const FString& GPUFamily, const FString& GLVersion, const FString& AndroidVersion, const FString& DeviceMake, const FString& DeviceModel, const FString& VulkanAvailable, const FString& VulkanVersion, const FString& UsingHoudini, const FString& ProfileName);
 	static int32 GetNumProfiles();
 };
diff --git a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelectorRuntime/Private/AndroidDeviceProfileSelectorRuntimeModule.cpp b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelectorRuntime/Private/AndroidDeviceProfileSelectorRuntimeModule.cpp
index 3df72699c0d2..3d5ed305b395 100644
--- a/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelectorRuntime/Private/AndroidDeviceProfileSelectorRuntimeModule.cpp
+++ b/Engine/Plugins/Runtime/AndroidDeviceProfileSelector/Source/AndroidDeviceProfileSelectorRuntime/Private/AndroidDeviceProfileSelectorRuntimeModule.cpp
@@ -42,6 +42,7 @@ FString const FAndroidDeviceProfileSelectorRuntimeModule::GetRuntimeDeviceProfil
 		FString GLVersion = FAndroidMisc::GetGLVersion();
 
 		FString VulkanVersion = FAndroidMisc::GetVulkanVersion();
+		FString VulkanAvailable = FAndroidMisc::IsVulkanAvailable() ? TEXT("true") : TEXT("false");
 		FString AndroidVersion = FAndroidMisc::GetAndroidVersion();
 		FString DeviceMake = FAndroidMisc::GetDeviceMake();
 		FString DeviceModel = FAndroidMisc::GetDeviceModel();
@@ -52,12 +53,13 @@ FString const FAndroidDeviceProfileSelectorRuntimeModule::GetRuntimeDeviceProfil
 #else
 		bool bUsingHoudini = false;
 #endif
-		FString UsingHoudini = bUsingHoudini ? "true" : "false";
+		FString UsingHoudini = bUsingHoudini ? TEXT("true") : TEXT("false");
 
 		UE_LOG(LogAndroid, Log, TEXT("Checking %d rules from DeviceProfile ini file."), FAndroidDeviceProfileSelector::GetNumProfiles() );
-		UE_LOG(LogAndroid, Log, TEXT("  Default profile: %s"), *ProfileName);
+		UE_LOG(LogAndroid, Log, TEXT("  Default profile: %s"), * ProfileName);
 		UE_LOG(LogAndroid, Log, TEXT("  GpuFamily: %s"), *GPUFamily);
 		UE_LOG(LogAndroid, Log, TEXT("  GlVersion: %s"), *GLVersion);
+		UE_LOG(LogAndroid, Log, TEXT("  VulkanAvailable: %s"), *VulkanAvailable);
 		UE_LOG(LogAndroid, Log, TEXT("  VulkanVersion: %s"), *VulkanVersion);
 		UE_LOG(LogAndroid, Log, TEXT("  AndroidVersion: %s"), *AndroidVersion);
 		UE_LOG(LogAndroid, Log, TEXT("  DeviceMake: %s"), *DeviceMake);
@@ -66,7 +68,7 @@ FString const FAndroidDeviceProfileSelectorRuntimeModule::GetRuntimeDeviceProfil
 
 		CheckForJavaSurfaceViewWorkaround(DeviceMake, DeviceModel);
 
-		ProfileName = FAndroidDeviceProfileSelector::FindMatchingProfile(GPUFamily, GLVersion, AndroidVersion, DeviceMake, DeviceModel, VulkanVersion, UsingHoudini, ProfileName);
+		ProfileName = FAndroidDeviceProfileSelector::FindMatchingProfile(GPUFamily, GLVersion, AndroidVersion, DeviceMake, DeviceModel, VulkanAvailable, VulkanVersion, UsingHoudini, ProfileName);
 
 		UE_LOG(LogAndroid, Log, TEXT("Selected Device Profile: [%s]"), *ProfileName);
 	}
diff --git a/Engine/Plugins/Runtime/ApexDestruction/Source/ThirdParty/PhysX/ApexDestructionLib.Build.cs b/Engine/Plugins/Runtime/ApexDestruction/Source/ThirdParty/PhysX/ApexDestructionLib.Build.cs
index 847ee8b0e9ac..0c0955ece85b 100644
--- a/Engine/Plugins/Runtime/ApexDestruction/Source/ThirdParty/PhysX/ApexDestructionLib.Build.cs
+++ b/Engine/Plugins/Runtime/ApexDestruction/Source/ThirdParty/PhysX/ApexDestructionLib.Build.cs
@@ -29,8 +29,9 @@ public class ApexDestructionLib : ModuleRules
                     return APEXLibraryMode.Checked;
                 }
             case UnrealTargetConfiguration.Shipping:
+				return APEXLibraryMode.Shipping;
             case UnrealTargetConfiguration.Test:
-                return APEXLibraryMode.Shipping;
+                return APEXLibraryMode.Profile;
             case UnrealTargetConfiguration.Development:
             case UnrealTargetConfiguration.DebugGame:
             case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Plugins/Runtime/EditableMesh/Source/EditableMesh/Public/EditableMeshTypes.h b/Engine/Plugins/Runtime/EditableMesh/Source/EditableMesh/Public/EditableMeshTypes.h
index cdda9d2e7aaf..db0f87173387 100644
--- a/Engine/Plugins/Runtime/EditableMesh/Source/EditableMesh/Public/EditableMeshTypes.h
+++ b/Engine/Plugins/Runtime/EditableMesh/Source/EditableMesh/Public/EditableMeshTypes.h
@@ -23,7 +23,7 @@ namespace LogHelpers
 	template <typename ElementType, typename TEnableIf<TIsArithmetic<ElementType>::Value, int>::Type = 0>
 	inline FString ElementToString( const ElementType& Element )
 	{
-		return Lex::ToString( Element );
+		return LexToString( Element );
 	}
 
 	template <typename ArrayType>
@@ -383,9 +383,9 @@ struct FMeshElementAttributeValue
 			case EMeshElementAttributeType::FVector4: return Value_FVector4.ToString();
 			case EMeshElementAttributeType::FVector: return Value_FVector.ToString();
 			case EMeshElementAttributeType::FVector2D: return Value_FVector2D.ToString();
-			case EMeshElementAttributeType::Float: return Lex::ToString( Value_Float );
-			case EMeshElementAttributeType::Int: return Lex::ToString( Value_Int );
-			case EMeshElementAttributeType::Bool: return Lex::ToString( Value_Bool );
+			case EMeshElementAttributeType::Float: return LexToString( Value_Float );
+			case EMeshElementAttributeType::Int: return LexToString( Value_Int );
+			case EMeshElementAttributeType::Bool: return LexToString( Value_Bool );
 			case EMeshElementAttributeType::FName: return Value_FName.ToString();
 		}
 
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility.cpp
index 1deb377a03d0..4b4b717f1001 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility.cpp
@@ -9,6 +9,8 @@
 #include "AbilitySystemComponent.h"
 #include "Abilities/Tasks/AbilityTask.h"
 #include "GameplayCue_Types.h"
+#include "GameFramework/CharacterMovementComponent.h"
+#include "GameFramework/Character.h"
 
 UGameplayAbility::UGameplayAbility(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
@@ -63,6 +65,8 @@ UGameplayAbility::UGameplayAbility(const FObjectInitializer& ObjectInitializer)
 	InstancingPolicy = EGameplayAbilityInstancingPolicy::InstancedPerExecution;
 
 	ScopeLockCount = 0;
+
+	bMarkPendingKillOnAbilityEnd = false;
 }
 
 UWorld* UGameplayAbility::GetWorld() const
@@ -169,8 +173,9 @@ bool UGameplayAbility::DoesAbilitySatisfyTagRequirements(const UAbilitySystemCom
 	bool bBlocked = false;
 	bool bMissing = false;
 
-	const FGameplayTag& BlockedTag = UAbilitySystemGlobals::Get().ActivateFailTagsBlockedTag;
-	const FGameplayTag& MissingTag = UAbilitySystemGlobals::Get().ActivateFailTagsMissingTag;
+	UAbilitySystemGlobals& AbilitySystemGlobals = UAbilitySystemGlobals::Get();
+	const FGameplayTag& BlockedTag = AbilitySystemGlobals.ActivateFailTagsBlockedTag;
+	const FGameplayTag& MissingTag = AbilitySystemGlobals.ActivateFailTagsMissingTag;
 
 	// Check if any of this ability's tags are currently blocked
 	if (AbilitySystemComponent.AreAbilityTagsBlocked(AbilityTags))
@@ -266,7 +271,8 @@ bool UGameplayAbility::CanActivateAbility(const FGameplayAbilitySpecHandle Handl
 	// Don't set the actor info, CanActivate is called on the CDO
 
 	// A valid AvatarActor is required. Simulated proxy check means only authority or autonomous proxies should be executing abilities.
-	if (ActorInfo == nullptr || ActorInfo->AvatarActor == nullptr || !ShouldActivateAbility(ActorInfo->AvatarActor->Role))
+	AActor* const AvatarActor = ActorInfo ? ActorInfo->AvatarActor.Get() : nullptr;
+	if (AvatarActor == nullptr || !ShouldActivateAbility(AvatarActor->Role))
 	{
 		return false;
 	}
@@ -277,13 +283,14 @@ bool UGameplayAbility::CanActivateAbility(const FGameplayAbilitySpecHandle Handl
 
 	FGameplayTagContainer& OutTags = OptionalRelevantTags ? *OptionalRelevantTags : DummyContainer;
 
-	// make sure the ActorInfo and its ability system component are valid, if not bail out.
-	if (!ActorInfo->AbilitySystemComponent.IsValid())
+	// make sure theability system component is valid, if not bail out.
+	UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+	if (!AbilitySystemComponent)
 	{
 		return false;
 	}
 
-	if (ActorInfo->AbilitySystemComponent->GetUserAbilityActivationInhibited())
+	if (AbilitySystemComponent->GetUserAbilityActivationInhibited())
 	{
 		/**
 		 *	Input is inhibited (UI is pulled up, another ability may be blocking all other input, etc).
@@ -297,22 +304,24 @@ bool UGameplayAbility::CanActivateAbility(const FGameplayAbilitySpecHandle Handl
 		return false;
 	}
 	
-	if (!UAbilitySystemGlobals::Get().ShouldIgnoreCooldowns() && !CheckCooldown(Handle, ActorInfo, OptionalRelevantTags))
+	UAbilitySystemGlobals& AbilitySystemGlobals = UAbilitySystemGlobals::Get();
+
+	if (!AbilitySystemGlobals.ShouldIgnoreCooldowns() && !CheckCooldown(Handle, ActorInfo, OptionalRelevantTags))
 	{
 		return false;
 	}
 
-	if (!UAbilitySystemGlobals::Get().ShouldIgnoreCosts() && !CheckCost(Handle, ActorInfo, OptionalRelevantTags))
+	if (!AbilitySystemGlobals.ShouldIgnoreCosts() && !CheckCost(Handle, ActorInfo, OptionalRelevantTags))
 	{
 		return false;
 	}
 
-	if (!DoesAbilitySatisfyTagRequirements(*ActorInfo->AbilitySystemComponent.Get(), SourceTags, TargetTags, OptionalRelevantTags))
+	if (!DoesAbilitySatisfyTagRequirements(*AbilitySystemComponent, SourceTags, TargetTags, OptionalRelevantTags))
 	{	// If the ability's tags are blocked, or if it has a "Blocking" tag or is missing a "Required" tag, then it can't activate.
 		return false;
 	}
 
-	FGameplayAbilitySpec* Spec = ActorInfo->AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
+	FGameplayAbilitySpec* Spec = AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
 	if (!Spec)
 	{
 		ABILITY_LOG(Warning, TEXT("CanActivateAbility called with invalid Handle"));
@@ -320,7 +329,7 @@ bool UGameplayAbility::CanActivateAbility(const FGameplayAbilitySpecHandle Handl
 	}
 
 	// Check if this ability's input binding is currently blocked
-	if (ActorInfo->AbilitySystemComponent->IsAbilityInputBlocked(Spec->InputID))
+	if (AbilitySystemComponent->IsAbilityInputBlocked(Spec->InputID))
 	{
 		return false;
 	}
@@ -424,16 +433,18 @@ bool UGameplayAbility::CommitCheck(const FGameplayAbilitySpecHandle Handle, cons
 	// Ensure that the ability spec is even valid before trying to process the commit
 	if (!bValidHandle || !bValidActorInfoPieces || !bValidSpecFound)
 	{
-		ensureMsgf(false, TEXT("UGameplayAbility::CommitCheck provided an invalid handle or actor info or couldn't find ability spec: %s Handle Valid: %d ActorInfo Valid: %d Spec Not Found: %d"), *GetName(), bValidHandle, bValidActorInfoPieces, bValidSpecFound);
+		ABILITY_LOG(Warning, TEXT("UGameplayAbility::CommitCheck provided an invalid handle or actor info or couldn't find ability spec: %s Handle Valid: %d ActorInfo Valid: %d Spec Not Found: %d"), *GetName(), bValidHandle, bValidActorInfoPieces, bValidSpecFound);
 		return false;
 	}
 
-	if (!UAbilitySystemGlobals::Get().ShouldIgnoreCooldowns() && !CheckCooldown(Handle, ActorInfo))
+	UAbilitySystemGlobals& AbilitySystemGlobals = UAbilitySystemGlobals::Get();
+
+	if (!AbilitySystemGlobals.ShouldIgnoreCooldowns() && !CheckCooldown(Handle, ActorInfo))
 	{
 		return false;
 	}
 
-	if (!UAbilitySystemGlobals::Get().ShouldIgnoreCosts() && !CheckCost(Handle, ActorInfo))
+	if (!AbilitySystemGlobals.ShouldIgnoreCosts() && !CheckCost(Handle, ActorInfo))
 	{
 		return false;
 	}
@@ -605,38 +616,37 @@ void UGameplayAbility::EndAbility(const FGameplayAbilitySpecHandle Handle, const
 		}
 		ActiveTasks.Reset();	// Empty the array but dont resize memory, since this object is probably going to be destroyed very soon anyways.
 
-		// TODO: is this condition still required? validity of AbilitySystemComponent is checked by IsEndAbilityValid()
-		if (ActorInfo && ActorInfo->AbilitySystemComponent.IsValid())
+		if (UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get())
 		{
 			if (bReplicateEndAbility)
 			{
-				ActorInfo->AbilitySystemComponent->ReplicateEndOrCancelAbility(Handle, ActivationInfo, this, false);
+				AbilitySystemComponent->ReplicateEndOrCancelAbility(Handle, ActivationInfo, this, false);
 			}
 
 			// Remove tags we added to owner
-			ActorInfo->AbilitySystemComponent->RemoveLooseGameplayTags(ActivationOwnedTags);
+			AbilitySystemComponent->RemoveLooseGameplayTags(ActivationOwnedTags);
 
 			// Remove tracked GameplayCues that we added
 			for (FGameplayTag& GameplayCueTag : TrackedGameplayCues)
 			{
-				ActorInfo->AbilitySystemComponent->RemoveGameplayCue(GameplayCueTag);
+				AbilitySystemComponent->RemoveGameplayCue(GameplayCueTag);
 			}
 			TrackedGameplayCues.Empty();
 
 			if (CanBeCanceled())
 			{
 				// If we're still cancelable, cancel it now
-				ActorInfo->AbilitySystemComponent->HandleChangeAbilityCanBeCanceled(AbilityTags, this, false);
+				AbilitySystemComponent->HandleChangeAbilityCanBeCanceled(AbilityTags, this, false);
 			}
 			
 			if (IsBlockingOtherAbilities())
 			{
 				// If we're still blocking other abilities, cancel now
-				ActorInfo->AbilitySystemComponent->ApplyAbilityBlockAndCancelTags(AbilityTags, this, false, BlockAbilitiesWithTag, false, CancelAbilitiesWithTag);
+				AbilitySystemComponent->ApplyAbilityBlockAndCancelTags(AbilityTags, this, false, BlockAbilitiesWithTag, false, CancelAbilitiesWithTag);
 			}
 
 			// Tell owning AbilitySystemComponent that we ended so it can do stuff (including MarkPendingKill us)
-			ActorInfo->AbilitySystemComponent->NotifyAbilityEnded(Handle, this, bWasCancelled);
+			AbilitySystemComponent->NotifyAbilityEnded(Handle, this, bWasCancelled);
 		}
 	}
 }
@@ -680,6 +690,25 @@ void UGameplayAbility::PreActivate(const FGameplayAbilitySpecHandle Handle, cons
 {
 	UAbilitySystemComponent* Comp = ActorInfo->AbilitySystemComponent.Get();
 
+	//Flush any remaining server moves before activating the ability.
+	//	Flushing the server moves prevents situations where previously pending move's DeltaTimes are figured into montages that are about to play and update.
+	//	When this happened, clients would have a smaller delta time than the server which meant the server would get ahead and receive their notifies before the client, etc.
+	//	The system depends on the server not getting ahead, so it's important to send along any previously pending server moves here.
+	AActor* const MyActor = ActorInfo->AvatarActor.Get();
+	if (MyActor && !ActorInfo->IsNetAuthority())
+	{
+		ACharacter* MyCharacter = Cast<ACharacter>(MyActor);
+		if (MyCharacter)
+		{
+			UCharacterMovementComponent* CharMoveComp = Cast<UCharacterMovementComponent>(MyCharacter->GetMovementComponent());
+
+			if (CharMoveComp)
+			{
+				CharMoveComp->FlushServerMoves();
+			}
+		}
+	}
+
 	if (GetInstancingPolicy() != EGameplayAbilityInstancingPolicy::NonInstanced)
 	{
 		bIsActive = true;
@@ -752,17 +781,21 @@ bool UGameplayAbility::CheckCooldown(const FGameplayAbilitySpecHandle Handle, co
 	const FGameplayTagContainer* CooldownTags = GetCooldownTags();
 	if (CooldownTags)
 	{
-		check(ActorInfo->AbilitySystemComponent.IsValid());
-		if (CooldownTags->Num() > 0 && ActorInfo->AbilitySystemComponent->HasAnyMatchingGameplayTags(*CooldownTags))
+		if (CooldownTags->Num() > 0)
 		{
-			const FGameplayTag& CooldownTag = UAbilitySystemGlobals::Get().ActivateFailCooldownTag;
-
-			if (OptionalRelevantTags && CooldownTag.IsValid())
+			UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+			check(AbilitySystemComponent != nullptr);
+			if (AbilitySystemComponent->HasAnyMatchingGameplayTags(*CooldownTags))
 			{
-				OptionalRelevantTags->AddTag(CooldownTag);
-			}
+				const FGameplayTag& CooldownTag = UAbilitySystemGlobals::Get().ActivateFailCooldownTag;
 
-			return false;
+				if (OptionalRelevantTags && CooldownTag.IsValid())
+				{
+					OptionalRelevantTags->AddTag(CooldownTag);
+				}
+
+				return false;
+			}
 		}
 	}
 	return true;
@@ -782,8 +815,9 @@ bool UGameplayAbility::CheckCost(const FGameplayAbilitySpecHandle Handle, const
 	UGameplayEffect* CostGE = GetCostGameplayEffect();
 	if (CostGE)
 	{
-		check(ActorInfo->AbilitySystemComponent.IsValid());
-		if (!ActorInfo->AbilitySystemComponent->CanApplyAttributeModifiers(CostGE, GetAbilityLevel(Handle, ActorInfo), MakeEffectContext(Handle, ActorInfo)))
+		UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+		check(AbilitySystemComponent != nullptr);
+		if (!AbilitySystemComponent->CanApplyAttributeModifiers(CostGE, GetAbilityLevel(Handle, ActorInfo), MakeEffectContext(Handle, ActorInfo)))
 		{
 			const FGameplayTag& CostTag = UAbilitySystemGlobals::Get().ActivateFailCostTag;
 
@@ -814,13 +848,14 @@ float UGameplayAbility::GetCooldownTimeRemaining(const FGameplayAbilityActorInfo
 {
 	SCOPE_CYCLE_COUNTER(STAT_GameplayAbilityGetCooldownTimeRemaining);
 
-	if (ActorInfo->AbilitySystemComponent.IsValid())
+	const UAbilitySystemComponent* const ASC = ActorInfo->AbilitySystemComponent.Get();
+	if (ASC)
 	{
 		const FGameplayTagContainer* CooldownTags = GetCooldownTags();
 		if (CooldownTags && CooldownTags->Num() > 0)
 		{
 			FGameplayEffectQuery const Query = FGameplayEffectQuery::MakeQuery_MatchAnyOwningTags(*CooldownTags);
-			TArray< float > Durations = ActorInfo->AbilitySystemComponent->GetActiveEffectsTimeRemaining(Query);
+			TArray< float > Durations = ASC->GetActiveEffectsTimeRemaining(Query);
 			if (Durations.Num() > 0)
 			{
 				Durations.Sort();
@@ -834,9 +869,12 @@ float UGameplayAbility::GetCooldownTimeRemaining(const FGameplayAbilityActorInfo
 
 void UGameplayAbility::InvalidateClientPredictionKey() const
 {
-	if (CurrentActorInfo && CurrentActorInfo->AbilitySystemComponent.IsValid())
+	if (CurrentActorInfo)
 	{
-		CurrentActorInfo->AbilitySystemComponent->ScopedPredictionKey = FPredictionKey();
+		if (UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get())
+		{
+			AbilitySystemComponent->ScopedPredictionKey = FPredictionKey();
+		}
 	}
 }
 
@@ -844,16 +882,17 @@ void UGameplayAbility::GetCooldownTimeRemainingAndDuration(FGameplayAbilitySpecH
 {
 	SCOPE_CYCLE_COUNTER(STAT_GameplayAbilityGetCooldownTimeRemainingAndDuration);
 
-	check(ActorInfo->AbilitySystemComponent.IsValid());
-
 	TimeRemaining = 0.f;
 	CooldownDuration = 0.f;
 	
 	const FGameplayTagContainer* CooldownTags = GetCooldownTags();
 	if (CooldownTags && CooldownTags->Num() > 0)
 	{
+		UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+		check(AbilitySystemComponent != nullptr);
+
 		FGameplayEffectQuery const Query = FGameplayEffectQuery::MakeQuery_MatchAnyOwningTags(*CooldownTags);
-		TArray< TPair<float,float> > DurationAndTimeRemaining = ActorInfo->AbilitySystemComponent->GetActiveEffectsTimeRemainingAndDuration(Query);
+		TArray< TPair<float,float> > DurationAndTimeRemaining = AbilitySystemComponent->GetActiveEffectsTimeRemainingAndDuration(Query);
 		if (DurationAndTimeRemaining.Num() > 0)
 		{
 			int32 BestIdx = 0;
@@ -943,23 +982,26 @@ static FAutoConsoleVariableRef CVarAbilitySystemShowMakeOutgoingGameplayEffectSp
 FGameplayEffectSpecHandle UGameplayAbility::MakeOutgoingGameplayEffectSpec(const FGameplayAbilitySpecHandle Handle, const FGameplayAbilityActorInfo* ActorInfo, const FGameplayAbilityActivationInfo ActivationInfo, TSubclassOf<UGameplayEffect> GameplayEffectClass, float Level) const
 {
 	check(ActorInfo);
-
+	UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
 	
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	if (AbilitySystemShowMakeOutgoingGameplayEffectSpecs && HasAuthority(&ActivationInfo) == false)
 	{
-		ABILITY_LOG(Warning, TEXT("%s, MakeOutgoingGameplayEffectSpec: %s"), *ActorInfo->AbilitySystemComponent->GetFullName(),  *GameplayEffectClass->GetName()); 
+		ABILITY_LOG(Warning, TEXT("%s, MakeOutgoingGameplayEffectSpec: %s"), *AbilitySystemComponent->GetFullName(),  *GameplayEffectClass->GetName()); 
 	}
 #endif
 
-	FGameplayEffectSpecHandle NewHandle = ActorInfo->AbilitySystemComponent->MakeOutgoingSpec(GameplayEffectClass, Level, MakeEffectContext(Handle, ActorInfo));
+	FGameplayEffectSpecHandle NewHandle = AbilitySystemComponent->MakeOutgoingSpec(GameplayEffectClass, Level, MakeEffectContext(Handle, ActorInfo));
 	if (NewHandle.IsValid())
 	{
-		FGameplayAbilitySpec* AbilitySpec =  ActorInfo->AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
+		FGameplayAbilitySpec* AbilitySpec = AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
 		ApplyAbilityTagsToGameplayEffectSpec(*NewHandle.Data.Get(), AbilitySpec);
 
 		// Copy over set by caller magnitudes
-		NewHandle.Data->SetByCallerTagMagnitudes = AbilitySpec->SetByCallerTagMagnitudes;
+		if (AbilitySpec)
+		{
+			NewHandle.Data->SetByCallerTagMagnitudes = AbilitySpec->SetByCallerTagMagnitudes;
+		}
 
 	}
 	return NewHandle;
@@ -1039,9 +1081,10 @@ void UGameplayAbility::MontageJumpToSection(FName SectionName)
 {
 	check(CurrentActorInfo);
 
-	if (CurrentActorInfo->AbilitySystemComponent->IsAnimatingAbility(this))
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	if (AbilitySystemComponent->IsAnimatingAbility(this))
 	{
-		CurrentActorInfo->AbilitySystemComponent->CurrentMontageJumpToSection(SectionName);
+		AbilitySystemComponent->CurrentMontageJumpToSection(SectionName);
 	}
 }
 
@@ -1049,9 +1092,10 @@ void UGameplayAbility::MontageSetNextSectionName(FName FromSectionName, FName To
 {
 	check(CurrentActorInfo);
 
-	if (CurrentActorInfo->AbilitySystemComponent->IsAnimatingAbility(this))
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	if (AbilitySystemComponent->IsAnimatingAbility(this))
 	{
-		CurrentActorInfo->AbilitySystemComponent->CurrentMontageSetNextSectionName(FromSectionName, ToSectionName);
+		AbilitySystemComponent->CurrentMontageSetNextSectionName(FromSectionName, ToSectionName);
 	}
 }
 
@@ -1059,7 +1103,7 @@ void UGameplayAbility::MontageStop(float OverrideBlendOutTime)
 {
 	check(CurrentActorInfo);
 
-	UAbilitySystemComponent* AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
 	if (AbilitySystemComponent != nullptr)
 	{
 		// We should only stop the current montage if we are the animating ability
@@ -1351,11 +1395,14 @@ int32 UGameplayAbility::GetAbilityLevel() const
 int32 UGameplayAbility::GetAbilityLevel(FGameplayAbilitySpecHandle Handle, const FGameplayAbilityActorInfo* ActorInfo) const
 {
 	FGameplayAbilitySpec* Spec = ActorInfo->AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
-	if (ensure(Spec))
+	
+	if (Spec)
 	{
 		return Spec->Level;
 	}
 
+	// An ability was probably removed/ungranted then something came in and ask about its level. Caller should have detected this earlier.
+	ABILITY_LOG(Warning, TEXT("UGameplayAbility::GetAbilityLevel. Invalid AbilitySpecHandle %s for Ability %s. Returning level 1."), *Handle.ToString(), *GetNameSafe(this));
 	return 1;
 }
 
@@ -1372,10 +1419,11 @@ FGameplayEffectContextHandle UGameplayAbility::GetGrantedByEffectContext() const
 	check(CurrentActorInfo);
 	if (CurrentActorInfo)
 	{
-		FActiveGameplayEffectHandle ActiveHandle = CurrentActorInfo->AbilitySystemComponent->FindActiveGameplayEffectHandle(GetCurrentAbilitySpecHandle());
+		UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+		FActiveGameplayEffectHandle ActiveHandle = AbilitySystemComponent->FindActiveGameplayEffectHandle(GetCurrentAbilitySpecHandle());
 		if (ActiveHandle.IsValid())
 		{
-			return CurrentActorInfo->AbilitySystemComponent->GetEffectContextFromActiveGEHandle(ActiveHandle);
+			return AbilitySystemComponent->GetEffectContextFromActiveGEHandle(ActiveHandle);
 		}
 	}
 
@@ -1388,10 +1436,11 @@ void UGameplayAbility::RemoveGrantedByEffect()
 	check(CurrentActorInfo);
 	if (CurrentActorInfo)
 	{
-		FActiveGameplayEffectHandle ActiveHandle = CurrentActorInfo->AbilitySystemComponent->FindActiveGameplayEffectHandle(GetCurrentAbilitySpecHandle());
+		UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+		FActiveGameplayEffectHandle ActiveHandle = AbilitySystemComponent->FindActiveGameplayEffectHandle(GetCurrentAbilitySpecHandle());
 		if (ActiveHandle.IsValid())
 		{
-			CurrentActorInfo->AbilitySystemComponent->RemoveActiveGameplayEffect(ActiveHandle);
+			AbilitySystemComponent->RemoveActiveGameplayEffect(ActiveHandle);
 		}
 	}
 }
@@ -1400,7 +1449,7 @@ UObject* UGameplayAbility::GetSourceObject(FGameplayAbilitySpecHandle Handle, co
 {
 	if (ActorInfo != nullptr)
 	{
-		UAbilitySystemComponent* AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+		UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
 		if (AbilitySystemComponent != nullptr)
 		{
 			FGameplayAbilitySpec* AbilitySpec = AbilitySystemComponent->FindAbilitySpecFromHandle(Handle);
@@ -1451,10 +1500,11 @@ bool UGameplayAbility::IsTriggered() const
 
 bool UGameplayAbility::IsPredictingClient() const
 {
-	if (GetCurrentActorInfo()->OwnerActor.IsValid())
+	const FGameplayAbilityActorInfo* const CurrentActorInfoPtr = GetCurrentActorInfo();
+	if (CurrentActorInfoPtr->OwnerActor.IsValid())
 	{
-		bool bIsLocallyControlled = GetCurrentActorInfo()->IsLocallyControlled();
-		bool bIsAuthority = GetCurrentActorInfo()->IsNetAuthority();
+		bool bIsLocallyControlled = CurrentActorInfoPtr->IsLocallyControlled();
+		bool bIsAuthority = CurrentActorInfoPtr->IsNetAuthority();
 
 		// LocalPredicted and ServerInitiated are both valid because in both those modes the ability also runs on the client
 		if (!bIsAuthority && bIsLocallyControlled && (GetNetExecutionPolicy() == EGameplayAbilityNetExecutionPolicy::LocalPredicted || GetNetExecutionPolicy() == EGameplayAbilityNetExecutionPolicy::ServerInitiated))
@@ -1468,10 +1518,11 @@ bool UGameplayAbility::IsPredictingClient() const
 
 bool UGameplayAbility::IsForRemoteClient() const
 {
-	if (GetCurrentActorInfo()->OwnerActor.IsValid())
+	const FGameplayAbilityActorInfo* const CurrentActorInfoPtr = GetCurrentActorInfo();
+	if (CurrentActorInfoPtr->OwnerActor.IsValid())
 	{
-		bool bIsLocallyControlled = GetCurrentActorInfo()->IsLocallyControlled();
-		bool bIsAuthority = GetCurrentActorInfo()->IsNetAuthority();
+		bool bIsLocallyControlled = CurrentActorInfoPtr->IsLocallyControlled();
+		bool bIsAuthority = CurrentActorInfoPtr->IsNetAuthority();
 
 		if (bIsAuthority && !bIsLocallyControlled)
 		{
@@ -1484,9 +1535,10 @@ bool UGameplayAbility::IsForRemoteClient() const
 
 bool UGameplayAbility::IsLocallyControlled() const
 {
-	if (GetCurrentActorInfo()->OwnerActor.IsValid())
+	const FGameplayAbilityActorInfo* const CurrentActorInfoPtr = GetCurrentActorInfo();
+	if (CurrentActorInfoPtr->OwnerActor.IsValid())
 	{
-		return GetCurrentActorInfo()->IsLocallyControlled();
+		return CurrentActorInfoPtr->IsLocallyControlled();
 	}
 
 	return false;
@@ -1566,7 +1618,8 @@ FActiveGameplayEffectHandle UGameplayAbility::ApplyGameplayEffectSpecToOwner(con
 
 	if (SpecHandle.IsValid() && (HasAuthorityOrPredictionKey(ActorInfo, &ActivationInfo)))
 	{
-		return ActorInfo->AbilitySystemComponent->ApplyGameplayEffectSpecToSelf(*SpecHandle.Data.Get(), ActorInfo->AbilitySystemComponent->GetPredictionKeyForNewAction());
+		UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+		return AbilitySystemComponent->ApplyGameplayEffectSpecToSelf(*SpecHandle.Data.Get(), AbilitySystemComponent->GetPredictionKeyForNewAction());
 
 	}
 	return FActiveGameplayEffectHandle();
@@ -1712,7 +1765,13 @@ float UGameplayAbility::GetCooldownTimeRemaining() const
 void UGameplayAbility::SetRemoteInstanceHasEnded()
 {
 	// This could potentially happen in shutdown corner cases
-	if (IsPendingKill() || CurrentActorInfo == nullptr || CurrentActorInfo->AbilitySystemComponent.IsValid() == false)
+	if (IsPendingKill() || CurrentActorInfo == nullptr)
+	{
+		return;
+	}
+
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	if (AbilitySystemComponent == nullptr)
 	{
 		return;
 	}
@@ -1726,7 +1785,7 @@ void UGameplayAbility::SetRemoteInstanceHasEnded()
 			// Kill the ability to avoid getting stuck active.
 			
 			ABILITY_LOG(Log, TEXT("Ability %s is force cancelling because Task %s is waiting on remote player input and the  remote player has just ended the ability."), *GetName(), *Task->GetDebugString());
-			CurrentActorInfo->AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
+			AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
 			break;
 		}
 	}
@@ -1735,7 +1794,13 @@ void UGameplayAbility::SetRemoteInstanceHasEnded()
 void UGameplayAbility::NotifyAvatarDestroyed()
 {
 	// This could potentially happen in shutdown corner cases
-	if (IsPendingKill() || CurrentActorInfo == nullptr || CurrentActorInfo->AbilitySystemComponent.IsValid() == false)
+	if (IsPendingKill() || CurrentActorInfo == nullptr)
+	{
+		return;
+	}
+
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	if (AbilitySystemComponent == nullptr)
 	{
 		return;
 	}
@@ -1748,7 +1813,7 @@ void UGameplayAbility::NotifyAvatarDestroyed()
 			// We have a task waiting on some Avatar state but the avatar is destroyed, so force end the ability to avoid getting stuck on.
 			
 			ABILITY_LOG(Log, TEXT("Ability %s is force cancelling because Task %s is waiting on avatar data avatar has been destroyed."), *GetName(), *Task->GetDebugString());
-			CurrentActorInfo->AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
+			AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
 			break;
 		}
 	}
@@ -1757,12 +1822,14 @@ void UGameplayAbility::NotifyAvatarDestroyed()
 void UGameplayAbility::NotifyAbilityTaskWaitingOnPlayerData(class UAbilityTask* AbilityTask)
 {
 	// This should never happen since it will only be called from actively running ability tasks
-	check(CurrentActorInfo && CurrentActorInfo->AbilitySystemComponent.IsValid());
+	check(CurrentActorInfo);
+	UAbilitySystemComponent* const AbilitySystemComponent = CurrentActorInfo->AbilitySystemComponent.Get();
+	check(AbilitySystemComponent);
 
 	if (RemoteInstanceEnded)
 	{
 		ABILITY_LOG(Log, TEXT("Ability %s is force cancelling because Task %s has started after the remote player has ended the ability."), *GetName(), *AbilityTask->GetDebugString());
-		CurrentActorInfo->AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
+		AbilitySystemComponent->ForceCancelAbilityDueToReplication(this);
 	}
 }
 
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbilityTargetActor.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbilityTargetActor.cpp
index 1ca5614126f0..2c28237aec43 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbilityTargetActor.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbilityTargetActor.cpp
@@ -150,11 +150,10 @@ void AGameplayAbilityTargetActor::BindToConfirmCancelInputs()
 {
 	check(OwningAbility);
 
-	UAbilitySystemComponent* ASC = OwningAbility->GetCurrentActorInfo()->AbilitySystemComponent.Get();
+	const FGameplayAbilityActorInfo* const Info = OwningAbility->GetCurrentActorInfo();
+	UAbilitySystemComponent* const ASC = Info->AbilitySystemComponent.Get();
 	if (ASC)
 	{
-		const FGameplayAbilityActorInfo* Info = OwningAbility->GetCurrentActorInfo();
-
 		if (Info->IsLocallyControlled())
 		{
 			// We have to wait for the callback from the AbilitySystemComponent. Which will always be instigated locally
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility_Montage.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility_Montage.cpp
index d83ed8dd6ec6..549f88fd55bf 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility_Montage.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/Abilities/GameplayAbility_Montage.cpp
@@ -33,12 +33,16 @@ void UGameplayAbility_Montage::ActivateAbility(const FGameplayAbilitySpecHandle
 		// Apply GameplayEffects
 		TArray<const UGameplayEffect*> Effects;
 		GetGameplayEffectsWhileAnimating(Effects);
-		for (const UGameplayEffect* Effect : Effects)
+		if (Effects.Num() > 0)
 		{
-			FActiveGameplayEffectHandle EffectHandle = ActorInfo->AbilitySystemComponent->ApplyGameplayEffectToSelf(Effect, 1.f, MakeEffectContext(Handle, ActorInfo));
-			if (EffectHandle.IsValid())
+			UAbilitySystemComponent* const AbilitySystemComponent = ActorInfo->AbilitySystemComponent.Get();
+			for (const UGameplayEffect* Effect : Effects)
 			{
-				AppliedEffects.Add(EffectHandle);
+				FActiveGameplayEffectHandle EffectHandle = AbilitySystemComponent->ApplyGameplayEffectToSelf(Effect, 1.f, MakeEffectContext(Handle, ActorInfo));
+				if (EffectHandle.IsValid())
+				{
+					AppliedEffects.Add(EffectHandle);
+				}
 			}
 		}
 
@@ -55,10 +59,11 @@ void UGameplayAbility_Montage::ActivateAbility(const FGameplayAbilitySpecHandle
 	}
 }
 
-void UGameplayAbility_Montage::OnMontageEnded(UAnimMontage* Montage, bool bInterrupted, TWeakObjectPtr<UAbilitySystemComponent> AbilitySystemComponent, TArray<FActiveGameplayEffectHandle> AppliedEffects)
+void UGameplayAbility_Montage::OnMontageEnded(UAnimMontage* Montage, bool bInterrupted, TWeakObjectPtr<UAbilitySystemComponent> AbilitySystemComponentPtr, TArray<FActiveGameplayEffectHandle> AppliedEffects)
 {
 	// Remove any GameplayEffects that we applied
-	if (AbilitySystemComponent.IsValid())
+	UAbilitySystemComponent* const AbilitySystemComponent = AbilitySystemComponentPtr.Get();
+	if (AbilitySystemComponent)
 	{
 		for (FActiveGameplayEffectHandle Handle : AppliedEffects)
 		{
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemBlueprintLibrary.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemBlueprintLibrary.cpp
index db798efc80cc..1f02209b60c9 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemBlueprintLibrary.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemBlueprintLibrary.cpp
@@ -22,11 +22,13 @@ void UAbilitySystemBlueprintLibrary::SendGameplayEventToActor(AActor* Actor, FGa
 	if (Actor && !Actor->IsPendingKill())
 	{
 		IAbilitySystemInterface* AbilitySystemInterface = Cast<IAbilitySystemInterface>(Actor);
-		if (AbilitySystemInterface != NULL)
+		if (AbilitySystemInterface != nullptr)
 		{
 			UAbilitySystemComponent* AbilitySystemComponent = AbilitySystemInterface->GetAbilitySystemComponent();
-			if (AbilitySystemComponent != NULL)
+			if (AbilitySystemComponent != nullptr)
 			{
+				TWeakObjectPtr<UAbilitySystemComponent> ASC = AbilitySystemComponent;
+				ensureMsgf(ASC.IsValid(), TEXT("UAbilitySystemBlueprintLibrary::SendGameplayEventToActor: Invalid ability system component retrieved from Actor %s. EventTag was %s"), *Actor->GetName(), *EventTag.ToString());
 				FScopedPredictionWindow NewScopedWindow(AbilitySystemComponent, true);
 				AbilitySystemComponent->HandleGameplayEvent(EventTag, &Payload);
 			}
@@ -202,9 +204,10 @@ FGameplayAbilityTargetDataHandle UAbilitySystemBlueprintLibrary::FilterTargetDat
 	{
 		const FGameplayAbilityTargetData* UnfilteredData = TargetDataHandle.Get(i);
 		check(UnfilteredData);
-		if (UnfilteredData->GetActors().Num() > 0)
+		const TArray<TWeakObjectPtr<AActor>> UnfilteredActors = UnfilteredData->GetActors();
+		if (UnfilteredActors.Num() > 0)
 		{
-			TArray<TWeakObjectPtr<AActor>> FilteredActors = UnfilteredData->GetActors().FilterByPredicate(FilterHandle);
+			TArray<TWeakObjectPtr<AActor>> FilteredActors = UnfilteredActors.FilterByPredicate(FilterHandle);
 			if (FilteredActors.Num() > 0)
 			{
 				//Copy the data first, since we don't understand the internals of it
@@ -213,7 +216,7 @@ FGameplayAbilityTargetDataHandle UAbilitySystemBlueprintLibrary::FilterTargetDat
 				ScriptStruct->InitializeStruct(NewData);
 				ScriptStruct->CopyScriptStruct(NewData, UnfilteredData);
 				ReturnDataHandle.Data.Add(TSharedPtr<FGameplayAbilityTargetData>(NewData));
-				if (FilteredActors.Num() < UnfilteredData->GetActors().Num())
+				if (FilteredActors.Num() < UnfilteredActors.Num())
 				{
 					//We have lost some, but not all, of our actors, so replace the array. This should only be possible with targeting types that permit actor-array setting.
 					if (!NewData->SetActors(FilteredActors))
@@ -279,8 +282,8 @@ TArray<AActor*> UAbilitySystemBlueprintLibrary::GetActorsFromTargetData(const FG
 		TArray<AActor*>	ResolvedArray;
 		if (Data)
 		{
-			TArray<TWeakObjectPtr<AActor> > WeakArray = Data->GetActors();
-			for (TWeakObjectPtr<AActor> WeakPtr : WeakArray)
+			TArray<TWeakObjectPtr<AActor>> WeakArray = Data->GetActors();
+			for (TWeakObjectPtr<AActor>& WeakPtr : WeakArray)
 			{
 				ResolvedArray.Add(WeakPtr.Get());
 			}
@@ -297,9 +300,10 @@ bool UAbilitySystemBlueprintLibrary::DoesTargetDataContainActor(const FGameplayA
 		FGameplayAbilityTargetData* Data = TargetData.Data[Index].Get();
 		if (Data)
 		{
-			for (auto DataActorIter : Data->GetActors())
+			TArray<TWeakObjectPtr<AActor>> WeakArray = Data->GetActors();
+			for (TWeakObjectPtr<AActor>& WeakPtr : WeakArray)
 			{
-				if (DataActorIter == Actor)
+				if (WeakPtr == Actor)
 				{
 					return true;
 				}
@@ -529,9 +533,10 @@ int32 UAbilitySystemBlueprintLibrary::GetActorCount(FGameplayCueParameters Param
 
 AActor* UAbilitySystemBlueprintLibrary::GetActorByIndex(FGameplayCueParameters Parameters, int32 Index)
 {
-	if (Parameters.EffectContext.GetActors().IsValidIndex(Index))
+	const TArray<TWeakObjectPtr<AActor>> WeakActors = Parameters.EffectContext.GetActors();
+	if (WeakActors.IsValidIndex(Index))
 	{
-		return Parameters.EffectContext.GetActors()[Index].Get();
+		return WeakActors[Index].Get();
 	}
 	return NULL;
 }
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent.cpp
index eeb793206c8d..845b9ebb3bf7 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent.cpp
@@ -541,8 +541,9 @@ void UAbilitySystemComponent::NotifyTagMap_StackCountChange(const FGameplayTagCo
 FActiveGameplayEffectHandle UAbilitySystemComponent::ApplyGameplayEffectSpecToTarget(const FGameplayEffectSpec &Spec, UAbilitySystemComponent *Target, FPredictionKey PredictionKey)
 {
 	SCOPE_CYCLE_COUNTER(STAT_AbilitySystemComp_ApplyGameplayEffectSpecToTarget);
+	UAbilitySystemGlobals& AbilitySystemGlobals = UAbilitySystemGlobals::Get();
 
-	if (!UAbilitySystemGlobals::Get().ShouldPredictTargetGameplayEffects())
+	if (!AbilitySystemGlobals.ShouldPredictTargetGameplayEffects())
 	{
 		// If we don't want to predict target effects, clear prediction key
 		PredictionKey = FPredictionKey();
@@ -550,7 +551,7 @@ FActiveGameplayEffectHandle UAbilitySystemComponent::ApplyGameplayEffectSpecToTa
 
 	FActiveGameplayEffectHandle ReturnHandle;
 
-	if (!UAbilitySystemGlobals::Get().ShouldPredictTargetGameplayEffects())
+	if (!AbilitySystemGlobals.ShouldPredictTargetGameplayEffects())
 	{
 		// If we don't want to predict target effects, clear prediction key
 		PredictionKey = FPredictionKey();
@@ -2089,14 +2090,16 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 	FGameplayTagContainer OwnerTags;
 	GetOwnedGameplayTags(OwnerTags);
 
-	if (Info.Canvas) Info.Canvas->SetDrawColor(FColor::White);
+	if (Info.Canvas)
+	{
+		Info.Canvas->SetDrawColor(FColor::White);
+	}
 
 	DebugLine(Info, FString::Printf(TEXT("Owned Tags: %s"), *OwnerTags.ToStringSimple()), 4.f, 0.f);
 
 	if (BlockedAbilityTags.GetExplicitGameplayTags().Num() > 0)
 	{
 		DebugLine(Info, FString::Printf(TEXT("BlockedAbilityTags: %s"), *BlockedAbilityTags.GetExplicitGameplayTags().ToStringSimple()), 4.f, 0.f);
-		
 	}
 
 	TSet<FGameplayAttribute> DrawAttributes;
@@ -2198,8 +2201,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 	{
 		for (FActiveGameplayEffect& ActiveGE : &ActiveGameplayEffects)
 		{
-
-			if (Info.Canvas) Info.Canvas->SetDrawColor(FColor::White);
+			if (Info.Canvas)
+			{
+				Info.Canvas->SetDrawColor(FColor::White);
+			}
 
 			FString DurationStr = TEXT("Infinite Duration ");
 			if (ActiveGE.GetDuration() > 0.f)
@@ -2248,7 +2253,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 				}
 			}
 
-			if (Info.Canvas) Info.Canvas->SetDrawColor(ActiveGE.bIsInhibited ? FColor(128, 128, 128) : FColor::White);
+			if (Info.Canvas)
+			{
+				Info.Canvas->SetDrawColor(ActiveGE.bIsInhibited ? FColor(128, 128, 128) : FColor::White);
+			}
 
 			DebugLine(Info, FString::Printf(TEXT("%s %s %s %s %s"), *CleanupName(GetNameSafe(ActiveGE.Spec.Def)), *DurationStr, *StackString, *LevelString, *PredictionString), 4.f, 0.f);
 
@@ -2272,7 +2280,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 
 				DebugLine(Info, FString::Printf(TEXT("Mod: %s. %s. %.2f"), *ModInfo.Attribute.GetName(), *EGameplayModOpToString(ModInfo.ModifierOp), ModSpec.GetEvaluatedMagnitude()), 7.f, 0.f);
 
-				if (Info.Canvas) Info.Canvas->SetDrawColor(ActiveGE.bIsInhibited ? FColor(128, 128, 128) : FColor::White);
+				if (Info.Canvas)
+				{
+					Info.Canvas->SetDrawColor(ActiveGE.bIsInhibited ? FColor(128, 128, 128) : FColor::White);
+				}
 			}
 
 			AccumulateScreenPos(Info);
@@ -2283,7 +2294,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 
 	if (Info.bShowAttributes)
 	{
-		if (Info.Canvas) Info.Canvas->SetDrawColor(FColor::White);
+		if (Info.Canvas)
+		{
+			Info.Canvas->SetDrawColor(FColor::White);
+		}
 		for (UAttributeSet* Set : SpawnedAttributes)
 		{
 			for (TFieldIterator<UProperty> It(Set->GetClass()); It; ++It)
@@ -2349,7 +2363,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 			FString InputPressedStr = AbilitySpec.InputPressed ? TEXT("(InputPressed)") : TEXT("");
 			FString ActivationModeStr = AbilitySpec.IsActive() ? UEnum::GetValueAsString(TEXT("GameplayAbilities.EGameplayAbilityActivationMode"), AbilitySpec.ActivationInfo.ActivationMode) : TEXT("");
 
-			if (Info.Canvas) Info.Canvas->SetDrawColor(AbilityTextColor);
+			if (Info.Canvas)
+			{
+				Info.Canvas->SetDrawColor(AbilityTextColor);
+			}
 
 			DebugLine(Info, FString::Printf(TEXT("%s %s %s %s"), *CleanupName(GetNameSafe(AbilitySpec.Ability)), *StatusText, *InputPressedStr, *ActivationModeStr), 4.f, 0.f);
 
@@ -2362,7 +2379,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 					if (!Instance)
 						continue;
 
-					if (Info.Canvas) Info.Canvas->SetDrawColor(FColor::White);
+					if (Info.Canvas)
+					{
+						Info.Canvas->SetDrawColor(FColor::White);
+					}
 					for (UGameplayTask* Task : Instance->ActiveTasks)
 					{
 						if (Task)
@@ -2406,7 +2426,10 @@ void UAbilitySystemComponent::Debug_Internal(FAbilitySystemComponentDebugInfo& I
 
 					if (InstanceIdx < Instances.Num() - 2)
 					{
-						if (Info.Canvas) Info.Canvas->SetDrawColor(FColor(128, 128, 128));
+						if (Info.Canvas)
+						{
+							Info.Canvas->SetDrawColor(FColor(128, 128, 128));
+						}
 						DebugLine(Info, FString::Printf(TEXT("--------")), 7.f, 0.f);
 					}
 				}
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent_Abilities.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent_Abilities.cpp
index c8c5800f0891..a08b137fda1a 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent_Abilities.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemComponent_Abilities.cpp
@@ -31,8 +31,6 @@
 #include "TickableAttributeSetInterface.h"
 #include "GameplayTagResponseTable.h"
 #include "Engine/DemoNetDriver.h"
-#include "GameFramework/CharacterMovementComponent.h"
-#include "GameFramework/Character.h"
 
 #define LOCTEXT_NAMESPACE "AbilitySystemComponent"
 
@@ -118,6 +116,7 @@ void UAbilitySystemComponent::TickComponent(float DeltaTime, enum ELevelTick Tic
 void UAbilitySystemComponent::InitAbilityActorInfo(AActor* InOwnerActor, AActor* InAvatarActor)
 {
 	check(AbilityActorInfo.IsValid());
+	bool WasAbilityActorNull = (AbilityActorInfo->AvatarActor == nullptr);
 	bool AvatarChanged = (InAvatarActor != AbilityActorInfo->AvatarActor);
 
 	AbilityActorInfo->InitFromActor(InOwnerActor, InAvatarActor, this);
@@ -129,7 +128,8 @@ void UAbilitySystemComponent::InitAbilityActorInfo(AActor* InOwnerActor, AActor*
 	AvatarActor = InAvatarActor;
 
 	// if the avatar actor was null but won't be after this, we want to run the deferred gameplaycues that may not have run in NetDeltaSerialize
-	if (PrevAvatarActor == nullptr && InAvatarActor != nullptr)
+	// Conversely, if the ability actor was previously null, then the effects would not run in the NetDeltaSerialize. As such we want to run them now.
+	if ((WasAbilityActorNull || PrevAvatarActor == nullptr) && InAvatarActor != nullptr)
 	{
 		HandleDeferredGameplayCues(&ActiveGameplayEffects);
 	}
@@ -150,6 +150,8 @@ void UAbilitySystemComponent::InitAbilityActorInfo(AActor* InOwnerActor, AActor*
 	{
 		TagTable->RegisterResponseForEvents(this);
 	}
+	
+	LocalAnimMontageInfo = FGameplayAbilityLocalAnimMontage();
 
 	if (bPendingMontageRep)
 	{
@@ -307,6 +309,7 @@ void UAbilitySystemComponent::ClearAllAbilities()
 	check(AbilityScopeLockCount == 0);	// We should never be calling this from a scoped lock situation.
 
 	// Note we aren't marking any old abilities pending kill. This shouldn't matter since they will be garbage collected.
+	ABILITYLIST_SCOPE_LOCK();
 	for (FGameplayAbilitySpec& Spec : ActivatableAbilities.Items)
 	{
 		OnRemoveAbility(Spec);
@@ -423,6 +426,8 @@ void UAbilitySystemComponent::OnRemoveAbility(FGameplayAbilitySpec& Spec)
 		{
 			if (Instance->IsActive())
 			{
+				Instance->SetMarkPendingKillOnAbilityEnd(Instance->GetInstancingPolicy() == EGameplayAbilityInstancingPolicy::InstancedPerActor);
+
 				// End the ability but don't replicate it, OnRemoveAbility gets replicated
 				bool bReplicateEndAbility = false;
 				bool bWasCancelled = false;
@@ -682,8 +687,9 @@ void UAbilitySystemComponent::NotifyAbilityEnded(FGameplayAbilitySpecHandle Hand
 	AbilityEndedCallbacks.Broadcast(Ability);
 	OnAbilityEnded.Broadcast(FAbilityEndedData(Ability, Handle, false, bWasCancelled));
 	
-	/** If this is instanced per execution, mark pending kill and remove it from our instanced lists if we are the authority */
-	if (Ability->GetInstancingPolicy() == EGameplayAbilityInstancingPolicy::InstancedPerExecution)
+	/** If this is instanced per execution or flagged for cleanup, mark pending kill and remove it from our instanced lists if we are the authority */
+	if ((Ability->GetInstancingPolicy() == EGameplayAbilityInstancingPolicy::InstancedPerExecution) ||
+		Ability->IsMarkPendingKillOnAbilityEnd())
 	{
 		check(Ability->HasAnyFlags(RF_ClassDefaultObject) == false);	// Should never be calling this on a CDO for an instanced ability!
 
@@ -1036,29 +1042,6 @@ bool UAbilitySystemComponent::TryActivateAbility(FGameplayAbilitySpecHandle Abil
 		return false;
 	}
 
-	//Flush any remaining server moves before activating the ability.
-	//	Flushing the server moves prevents situations where previously pending move's DeltaTimes are figured into montages that are about to play and update.
-	//	When this happened, clients would have a smaller delta time than the server which meant the server would get ahead and receive their notifies before the client, etc.
-	//	The system depends on the server not getting ahead, so it's important to send along any previously pending server moves here.
-	if (ActorInfo && ActorInfo->AvatarActor.Get() && !ActorInfo->IsNetAuthority())
-	{
-		AActor* MyActor = ActorInfo->AvatarActor.Get();
-
-		if (MyActor)
-		{
-			ACharacter* MyCharacter = Cast<ACharacter>(MyActor);
-			if (MyCharacter)
-			{
-				UCharacterMovementComponent* CharMoveComp = Cast<UCharacterMovementComponent>(MyCharacter->GetMovementComponent());
-
-				if (CharMoveComp)
-				{
-					CharMoveComp->FlushServerMoves();
-				}
-			}
-		}
-	}
-
 	if (NetMode != ROLE_Authority && (Ability->GetNetExecutionPolicy() == EGameplayAbilityNetExecutionPolicy::ServerOnly || Ability->GetNetExecutionPolicy() == EGameplayAbilityNetExecutionPolicy::ServerInitiated))
 	{
 		if (bAllowRemoteActivation)
@@ -2329,6 +2312,7 @@ float UAbilitySystemComponent::PlayMontage(UGameplayAbility* InAnimatingAbility,
 
 			LocalAnimMontageInfo.AnimMontage = NewAnimMontage;
 			LocalAnimMontageInfo.AnimatingAbility = InAnimatingAbility;
+			LocalAnimMontageInfo.PlayBit = !LocalAnimMontageInfo.PlayBit;
 			
 			if (InAnimatingAbility)
 			{
@@ -2386,25 +2370,30 @@ void UAbilitySystemComponent::AnimMontage_UpdateReplicatedData()
 {
 	check(IsOwnerActorAuthoritative());
 
+	AnimMontage_UpdateReplicatedData(RepAnimMontageInfo);
+}
+
+void UAbilitySystemComponent::AnimMontage_UpdateReplicatedData(FGameplayAbilityRepAnimMontage& OutRepAnimMontageInfo)
+{
 	UAnimInstance* AnimInstance = AbilityActorInfo.IsValid() ? AbilityActorInfo->GetAnimInstance() : nullptr;
 	if (AnimInstance && LocalAnimMontageInfo.AnimMontage)
 	{
-		RepAnimMontageInfo.AnimMontage = LocalAnimMontageInfo.AnimMontage;
+		OutRepAnimMontageInfo.AnimMontage = LocalAnimMontageInfo.AnimMontage;
 
 		// Compressed Flags
 		bool bIsStopped = AnimInstance->Montage_GetIsStopped(LocalAnimMontageInfo.AnimMontage);
 
 		if (!bIsStopped)
 		{
-			RepAnimMontageInfo.PlayRate = AnimInstance->Montage_GetPlayRate(LocalAnimMontageInfo.AnimMontage);
-			RepAnimMontageInfo.Position = AnimInstance->Montage_GetPosition(LocalAnimMontageInfo.AnimMontage);
-			RepAnimMontageInfo.BlendTime = AnimInstance->Montage_GetBlendTime(LocalAnimMontageInfo.AnimMontage);
+			OutRepAnimMontageInfo.PlayRate = AnimInstance->Montage_GetPlayRate(LocalAnimMontageInfo.AnimMontage);
+			OutRepAnimMontageInfo.Position = AnimInstance->Montage_GetPosition(LocalAnimMontageInfo.AnimMontage);
+			OutRepAnimMontageInfo.BlendTime = AnimInstance->Montage_GetBlendTime(LocalAnimMontageInfo.AnimMontage);
 		}
 
-		if (RepAnimMontageInfo.IsStopped != bIsStopped)
+		if (OutRepAnimMontageInfo.IsStopped != bIsStopped)
 		{
 			// Set this prior to calling UpdateShouldTick, so we start ticking if we are playing a Montage
-			RepAnimMontageInfo.IsStopped = bIsStopped;
+			OutRepAnimMontageInfo.IsStopped = bIsStopped;
 
 			// When we start or stop an animation, update the clients right away for the Avatar Actor
 			if (AbilityActorInfo->AvatarActor != nullptr)
@@ -2418,25 +2407,30 @@ void UAbilitySystemComponent::AnimMontage_UpdateReplicatedData()
 
 		// Replicate NextSectionID to keep it in sync.
 		// We actually replicate NextSectionID+1 on a BYTE to put INDEX_NONE in there.
-		int32 CurrentSectionID = LocalAnimMontageInfo.AnimMontage->GetSectionIndexFromPosition(RepAnimMontageInfo.Position);
+		int32 CurrentSectionID = LocalAnimMontageInfo.AnimMontage->GetSectionIndexFromPosition(OutRepAnimMontageInfo.Position);
 		if (CurrentSectionID != INDEX_NONE)
 		{
 			int32 NextSectionID = AnimInstance->Montage_GetNextSectionID(LocalAnimMontageInfo.AnimMontage, CurrentSectionID);
 			if (NextSectionID >= (256 - 1))
 			{
 				ABILITY_LOG( Error, TEXT("AnimMontage_UpdateReplicatedData. NextSectionID = %d.  RepAnimMontageInfo.Position: %.2f, CurrentSectionID: %d. LocalAnimMontageInfo.AnimMontage %s"), 
-					NextSectionID, RepAnimMontageInfo.Position, CurrentSectionID, *GetNameSafe(LocalAnimMontageInfo.AnimMontage) );
+					NextSectionID, OutRepAnimMontageInfo.Position, CurrentSectionID, *GetNameSafe(LocalAnimMontageInfo.AnimMontage) );
 				ensure(NextSectionID < (256 - 1));
 			}
-			RepAnimMontageInfo.NextSectionID = uint8(NextSectionID + 1);
+			OutRepAnimMontageInfo.NextSectionID = uint8(NextSectionID + 1);
 		}
 		else
 		{
-			RepAnimMontageInfo.NextSectionID = 0;
+			OutRepAnimMontageInfo.NextSectionID = 0;
 		}
 	}
 }
 
+void UAbilitySystemComponent::AnimMontage_UpdateForcedPlayFlags(FGameplayAbilityRepAnimMontage& OutRepAnimMontageInfo)
+{
+	OutRepAnimMontageInfo.ForcePlayBit = LocalAnimMontageInfo.PlayBit;
+}
+
 void UAbilitySystemComponent::OnPredictiveMontageRejected(UAnimMontage* PredictiveMontage)
 {
 	static const float MONTAGE_PREDICTION_REJECT_FADETIME = 0.25f;
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemGlobals.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemGlobals.cpp
index 7cd745ff7d52..a13d6f7f18c3 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemGlobals.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AbilitySystemGlobals.cpp
@@ -182,6 +182,11 @@ UAbilitySystemComponent* UAbilitySystemGlobals::GetAbilitySystemComponentFromAct
 	return nullptr;
 }
 
+bool UAbilitySystemGlobals::ShouldPredictTargetGameplayEffects() const
+{
+	return PredictTargetGameplayEffects;
+}
+
 // --------------------------------------------------------------------
 
 UFunction* UAbilitySystemGlobals::GetGameplayCueFunction(const FGameplayTag& ChildTag, UClass* Class, FName &MatchedTag)
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AttributeSet.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AttributeSet.cpp
index a4361b8d681a..7242558499d7 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AttributeSet.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/AttributeSet.cpp
@@ -408,8 +408,10 @@ void UAttributeSet::PostNetReceive()
 }
 
 FAttributeMetaData::FAttributeMetaData()
-	: MinValue(0.f)
+	: BaseValue(0.0f)
+	, MinValue(0.f)
 	, MaxValue(1.f)
+	, bCanStack(false)
 {
 
 }
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTargetTypes.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTargetTypes.cpp
index ef23d9b7b2f2..657ace87fbdd 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTargetTypes.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTargetTypes.cpp
@@ -27,7 +27,7 @@ TArray<FActiveGameplayEffectHandle> FGameplayAbilityTargetData::ApplyGameplayEff
 	
 	AppliedHandles.Reserve(Actors.Num());
 
-	for (TWeakObjectPtr<AActor> TargetActor : Actors)
+	for (TWeakObjectPtr<AActor>& TargetActor : Actors)
 	{
 		UAbilitySystemComponent* TargetComponent = UAbilitySystemBlueprintLibrary::GetAbilitySystemComponent(TargetActor.Get());
 
@@ -49,9 +49,13 @@ TArray<FActiveGameplayEffectHandle> FGameplayAbilityTargetData::ApplyGameplayEff
 
 void FGameplayAbilityTargetData::AddTargetDataToContext(FGameplayEffectContextHandle& Context, bool bIncludeActorArray) const
 {
-	if (bIncludeActorArray && (GetActors().Num() > 0))
+	if (bIncludeActorArray)
 	{
-		Context.AddActors(GetActors());
+		const TArray<TWeakObjectPtr<AActor>> WeakArray = GetActors();
+		if (WeakArray.Num() > 0)
+		{
+			Context.AddActors(WeakArray);
+		}
 	}
 
 	if (HasHitResult() && !Context.GetHitResult())
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTypes.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTypes.cpp
index c3aa4270686d..e741f61cede5 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTypes.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayAbilityTypes.cpp
@@ -44,11 +44,11 @@ void FGameplayAbilityActorInfo::InitFromActor(AActor *InOwnerActor, AActor *InAv
 		InAbilitySystemComponent->OnPlayerControllerSet();
 	}
 
-	if (AvatarActor.Get())
+	if (AActor* const AvatarActorPtr = AvatarActor.Get())
 	{
 		// Grab Components that we care about
-		SkeletalMeshComponent = AvatarActor->FindComponentByClass<USkeletalMeshComponent>();
-		MovementComponent = AvatarActor->FindComponentByClass<UMovementComponent>();
+		SkeletalMeshComponent = AvatarActorPtr->FindComponentByClass<USkeletalMeshComponent>();
+		MovementComponent = AvatarActorPtr->FindComponentByClass<UMovementComponent>();
 	}
 	else
 	{
@@ -73,9 +73,9 @@ void FGameplayAbilityActorInfo::ClearActorInfo()
 
 bool FGameplayAbilityActorInfo::IsLocallyControlled() const
 {
-	if (PlayerController.IsValid())
+	if (const APlayerController* PC = PlayerController.Get())
 	{
-		return PlayerController->IsLocalController();
+		return PC->IsLocalController();
 	}
 	else if (IsNetAuthority())
 	{
@@ -88,9 +88,9 @@ bool FGameplayAbilityActorInfo::IsLocallyControlled() const
 
 bool FGameplayAbilityActorInfo::IsLocallyControlledPlayer() const
 {
-	if (PlayerController.IsValid())
+	if (const APlayerController* PC = PlayerController.Get())
 	{
-		return PlayerController->IsLocalController();
+		return PC->IsLocalController();
 	}
 
 	return false;
@@ -99,9 +99,10 @@ bool FGameplayAbilityActorInfo::IsLocallyControlledPlayer() const
 bool FGameplayAbilityActorInfo::IsNetAuthority() const
 {
 	// Make sure this works on pending kill actors
-	if (OwnerActor.IsValid(true))
+	AActor* const OwnerActorPtr = OwnerActor.Get(/*bEvenIfPendingKill=*/ true);
+	if (OwnerActorPtr)
 	{
-		return (OwnerActor.Get(true)->Role == ROLE_Authority);
+		return (OwnerActorPtr->Role == ROLE_Authority);
 	}
 
 	// This rarely happens during shutdown cases for reasons that aren't quite clear
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayCueManager.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayCueManager.cpp
index 66bff00618d7..f4f574417e6f 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayCueManager.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayCueManager.cpp
@@ -552,19 +552,6 @@ void UGameplayCueManager::InitializeRuntimeObjectLibrary()
 }
 
 #if WITH_EDITOR
-void UGameplayCueManager::ModifyCook(TArray<FName>& PackagesToCook, TArray<FName>& PackagesToNeverCook)
-{
-	if (RuntimeGameplayCueObjectLibrary.CueSet)
-	{
-		TArray<FSoftObjectPath> CuePaths;
-		RuntimeGameplayCueObjectLibrary.CueSet->GetSoftObjectPaths(CuePaths);
-		for (const FSoftObjectPath& Path : CuePaths)
-		{
-			PackagesToCook.Add(FName(*FPackageName::ObjectPathToPackageName(Path.ToString())));
-		}
-	}
-}
-
 void UGameplayCueManager::InitializeEditorObjectLibrary()
 {
 	SCOPE_LOG_TIME_IN_SECONDS(*FString::Printf(TEXT("UGameplayCueManager::InitializeEditorObjectLibrary")), nullptr)
@@ -695,6 +682,9 @@ static void SearchDynamicClassCues(const FName PropertyName, const TArray<FStrin
 
 				CuesToAdd.Add(FGameplayCueReferencePair(GameplayCueTag, StringRef));
 				AssetsToLoad.Add(StringRef);
+
+				// Make sure core knows about this ref so it can be properly detected during cook.
+				StringRef.PostLoadPath();
 			}
 			else
 			{
@@ -875,6 +865,9 @@ void UGameplayCueManager::BuildCuesToAddToGlobalSet(const TArray<FAssetData>& As
 				OutCuesToAdd.Add(FGameplayCueReferencePair(GameplayCueTag, StringRef));
 
 				OutAssetsToLoad.Add(StringRef);
+
+				// Make sure core knows about this ref so it can be properly detected during cook.
+				StringRef.PostLoadPath();
 			}
 			else
 			{
@@ -1009,6 +1002,9 @@ void UGameplayCueManager::HandleAssetAdded(UObject *Object)
 					CuesToAdd.Add(FGameplayCueReferencePair(ActorCDO->GameplayCueTag, StringRef));
 				}
 
+				// Make sure core knows about this ref so it can be properly detected during cook.
+				StringRef.PostLoadPath();
+
 				for (UGameplayCueSet* Set : GetGlobalCueSets())
 				{
 					Set->AddCues(CuesToAdd);
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayEffectTypes.cpp b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayEffectTypes.cpp
index 1efdacb59735..fc2bc3a22e47 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayEffectTypes.cpp
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Private/GameplayEffectTypes.cpp
@@ -297,9 +297,9 @@ void FGameplayEffectContext::GetOwnedGameplayTags(OUT FGameplayTagContainer& Act
 	{
 		TagInterface->GetOwnedGameplayTags(ActorTagContainer);
 	}
-	else if (InstigatorAbilitySystemComponent.IsValid())
+	else if (UAbilitySystemComponent* ASC = InstigatorAbilitySystemComponent.Get())
 	{
-		InstigatorAbilitySystemComponent->GetOwnedGameplayTags(ActorTagContainer);
+		ASC->GetOwnedGameplayTags(ActorTagContainer);
 	}
 }
 
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbility.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbility.h
index e6fdb45e759c..4875a9191763 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbility.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbility.h
@@ -860,4 +860,17 @@ protected:
 	/** Decreases the scope lock count. Runs the waiting to execute delegates if the count drops to zero. */
 	void DecrementListLock() const;
 
+
+public:
+	/** Setter for the bMarkPendingKillOnAbilityEnd */
+	void SetMarkPendingKillOnAbilityEnd(bool bInMarkPendingKillOnAbilityEnd) { bMarkPendingKillOnAbilityEnd = bInMarkPendingKillOnAbilityEnd; }
+
+	/** Is bMarkPendingKillOnAbilityEnd set */
+	bool IsMarkPendingKillOnAbilityEnd() const { return bMarkPendingKillOnAbilityEnd; }
+
+protected:
+
+	/** Flag that is set by AbilitySystemComponent::OnRemoveAbility to indicate the ability needs to be cleaned up in AbilitySystemComponent::NotifyAbilityEnded */
+	UPROPERTY(BlueprintReadOnly, Category = Ability)
+	bool bMarkPendingKillOnAbilityEnd;
 };
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTargetTypes.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTargetTypes.h
index 3d71d33b4bbb..e9af16a6ec90 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTargetTypes.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTargetTypes.h
@@ -151,6 +151,10 @@ struct GAMEPLAYABILITIES_API FGameplayAbilityTargetData
 		return false;
 	}
 
+	virtual void ReplaceHitWith(AActor* NewHitActor, const FHitResult* NewHitResult)
+	{
+		// Intended to be implemented in derived structs.
+	}
 };
 
 UENUM(BlueprintType)
@@ -605,6 +609,15 @@ struct GAMEPLAYABILITIES_API FGameplayAbilityTargetData_SingleTargetHit : public
 		return HitResult.Location;
 	}
 
+	virtual void ReplaceHitWith(AActor* NewHitActor, const FHitResult* NewHitResult)
+	{
+		HitResult = FHitResult();
+		if (NewHitResult != nullptr)
+		{
+			HitResult = *NewHitResult;
+		}
+	}
+
 	// -------------------------------------
 
 	/** Hit result that stores data */
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTypes.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTypes.h
index 7621c18a82e7..d0a6dec320cb 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTypes.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/Abilities/GameplayAbilityTypes.h
@@ -148,7 +148,11 @@ struct GAMEPLAYABILITIES_API FGameplayAbilityActorInfo
 	TWeakObjectPtr<UMovementComponent>	MovementComponent;
 
 	/** Accessor to get the current anim instance from the SkeletalMeshComponent */
-	UAnimInstance* GetAnimInstance() const { return (SkeletalMeshComponent.IsValid() ? SkeletalMeshComponent->GetAnimInstance() : nullptr); }
+	UAnimInstance* GetAnimInstance() const
+	{ 
+		const USkeletalMeshComponent* SKMC = SkeletalMeshComponent.Get();
+		return (SKMC ? SKMC->GetAnimInstance() : nullptr);
+	}
 
 	/** Returns true if this actor is locally controlled. Only true for players on the client that owns them */
 	bool IsLocallyControlled() const;
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemComponent.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemComponent.h
index 0ac790caf822..982b52b68f5e 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemComponent.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemComponent.h
@@ -1450,6 +1450,10 @@ protected:
 
 	/** Copy LocalAnimMontageInfo into RepAnimMontageInfo */
 	void AnimMontage_UpdateReplicatedData();
+	void AnimMontage_UpdateReplicatedData(FGameplayAbilityRepAnimMontage& OutRepAnimMontageInfo);
+
+	/** Copy over playing flags for duplicate animation data */
+	void AnimMontage_UpdateForcedPlayFlags(FGameplayAbilityRepAnimMontage& OutRepAnimMontageInfo);
 
 	/** Data structure for replicating montage info to simulated clients */
 	UPROPERTY(ReplicatedUsing=OnRep_ReplicatedAnimMontage)
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemGlobals.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemGlobals.h
index ed8ec649035b..7783901768ba 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemGlobals.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/AbilitySystemGlobals.h
@@ -71,10 +71,7 @@ class GAMEPLAYABILITIES_API UAbilitySystemGlobals : public UObject
 	virtual void PopCurrentAppliedGE() { }
 
 	/** Returns true if the ability system should try to predict gameplay effects applied to non local targets */
-	bool ShouldPredictTargetGameplayEffects() const
-	{
-		return PredictTargetGameplayEffects;
-	}
+	bool ShouldPredictTargetGameplayEffects() const;
 
 	/** Searches the passed in class to look for a UFunction implementing the gameplay cue tag, sets MatchedTag to the exact tag found */
 	UFunction* GetGameplayCueFunction(const FGameplayTag &Tag, UClass* Class, FName &MatchedTag);
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayCueManager.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayCueManager.h
index 499b53dc6a95..3cbddd2516f2 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayCueManager.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayCueManager.h
@@ -33,15 +33,15 @@ struct FGameplayCueObjectLibrary
 {
 	GENERATED_BODY()
 	FGameplayCueObjectLibrary()
+		: ActorObjectLibrary(nullptr)
+		, StaticObjectLibrary(nullptr)
+		, CueSet(nullptr)
+		, AsyncPriority(0)
+		, bShouldSyncScan(false)
+		, bShouldAsyncLoad(false)
+		, bShouldSyncLoad(false)
+		, bHasBeenInitialized(false)
 	{
-		ActorObjectLibrary = nullptr;
-		StaticObjectLibrary = nullptr;
-		CueSet = nullptr;
-		AsyncPriority = 0;
-		bShouldSyncScan = false;
-		bShouldAsyncLoad = false;
-		bShouldSyncLoad = false;
-		bHasBeenInitialized = false;
 	}
 
 	/** Paths to search for */
@@ -193,9 +193,6 @@ class GAMEPLAYABILITIES_API UGameplayCueManager : public UDataAsset
 	TArray<UGameplayCueSet*> GetGlobalCueSets();
 
 #if WITH_EDITOR
-	/** Call before cooking to add gameplay cue assets to the cook. Call after Initializing. */
-	virtual void ModifyCook(TArray<FName>& PackagesToCook, TArray<FName>& PackagesToNeverCook);
-	
 	/** Called from editor to soft load all gameplay cue notifies for the GameplayCueEditor */
 	void InitializeEditorObjectLibrary();
 
diff --git a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayEffectTypes.h b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayEffectTypes.h
index 4f1fd03336ac..af2355482738 100644
--- a/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayEffectTypes.h
+++ b/Engine/Plugins/Runtime/GameplayAbilities/Source/GameplayAbilities/Public/GameplayEffectTypes.h
@@ -1482,6 +1482,7 @@ struct GAMEPLAYABILITIES_API FMinimalReplicationTagCountMap
 	GENERATED_USTRUCT_BODY()
 
 	FMinimalReplicationTagCountMap()
+		: Owner(nullptr)
 	{
 		MapID = 0;
 	}
diff --git a/Engine/Plugins/Runtime/GoogleARCore/Source/GoogleARCoreBase/GoogleARCoreBase_APL.xml b/Engine/Plugins/Runtime/GoogleARCore/Source/GoogleARCoreBase/GoogleARCoreBase_APL.xml
index 4f839b90b6cf..e828301edd1b 100644
--- a/Engine/Plugins/Runtime/GoogleARCore/Source/GoogleARCoreBase/GoogleARCoreBase_APL.xml
+++ b/Engine/Plugins/Runtime/GoogleARCore/Source/GoogleARCoreBase/GoogleARCoreBase_APL.xml
@@ -5,7 +5,7 @@
   <init>
     <log text="GoogleARCorePlugin APL init"/>
     <setBoolFromProperty result="bGradle" ini="Engine" section="/Script/AndroidRuntimeSettings.AndroidRuntimeSettings" property="bEnableGradle" default="false"/>
-		<!-- Get the bARCoreRequiredApp setting from the Engine ini. -->
+  <!-- Get the bARCoreRequiredApp setting from the Engine ini. -->
 		<setBoolFromProperty result="bARCoreRequiredApp" ini="Engine" section="/Script/GoogleARCoreBase.GoogleARCoreEditorSettings" property="bARCoreRequiredApp" default="true" />
 	</init>
 
@@ -37,7 +37,7 @@
       <false>
         <addElements tag="application">
           <meta-data android:name="com.google.ar.core" android:value="optional" />
-        </addElements>
+  </addElements>
       </false>
     </if>
   </androidManifestUpdates>
@@ -122,7 +122,7 @@
   <buildGradleAdditions>
       <insert>
         dependencies {
-          compile('com.google.ar:core:1.1.0')
+          implementation('com.google.ar:core:1.1.0')
         }
       </insert>
   </buildGradleAdditions>
diff --git a/Engine/Plugins/Runtime/GoogleCloudMessaging/Source/GoogleCloudMessaging/GoogleCloudMessaging_UPL.xml b/Engine/Plugins/Runtime/GoogleCloudMessaging/Source/GoogleCloudMessaging/GoogleCloudMessaging_UPL.xml
index 6afb803cd894..56a065666398 100644
--- a/Engine/Plugins/Runtime/GoogleCloudMessaging/Source/GoogleCloudMessaging/GoogleCloudMessaging_UPL.xml
+++ b/Engine/Plugins/Runtime/GoogleCloudMessaging/Source/GoogleCloudMessaging/GoogleCloudMessaging_UPL.xml
@@ -9,19 +9,33 @@
     <setBoolIsEqual result="GCMClientSenderInvalid" arg1="$S(GCMClientSenderID)" arg2=""/>
     <setBoolNot result="GCMEnabled" source="$B(GCMClientSenderInvalid)"/>
     <log text="GCMClientSenderID set: $B(GCMEnabled)"/>
-  </init>
+		<!-- check if using Gradle -->
+		<setBoolFromProperty result="bGradle" ini="Engine" section="/Script/AndroidRuntimeSettings.AndroidRuntimeSettings" property="bEnableGradle" default="false"/>
+	</init>
 
-  <AARImports>
-    <!-- only modify AAR imports if enabled -->
-    <if condition="GCMEnabled">
-      <true>
-        <insert>com.google.android.gms,play-services-gcm,11.0.4</insert>
-        <insertNewline/>
-      </true>
-    </if>
-  </AARImports>
+	<AARImports>
+		<!-- only modify AAR imports if enabled -->
+		<if condition="GCMEnabled">
+			<true>
+				<if condition="bGradle">
+					<false>
+						<insert>com.google.android.gms,play-services-gcm,11.0.4</insert>
+						<insertNewline/>
+					</false>
+				</if>
+			</true>
+		</if>
+	</AARImports>
 
-  <!-- optional updates applied to AndroidManifest.xml -->
+	<buildGradleAdditions>
+		<insert>
+dependencies {
+	implementation('com.google.android.gms:play-services-gcm:11.8.0')
+}
+		</insert>
+	</buildGradleAdditions>
+
+	<!-- optional updates applied to AndroidManifest.xml -->
   <androidManifestUpdates>
     <!-- only modify manifest if enabled -->
     <if condition="GCMEnabled">
diff --git a/Engine/Plugins/Runtime/GoogleVR/GoogleVRHMD/Source/GoogleVRHMD/Private/GoogleVRHMD.cpp b/Engine/Plugins/Runtime/GoogleVR/GoogleVRHMD/Source/GoogleVRHMD/Private/GoogleVRHMD.cpp
index 4608cf9485ec..e42220d0c337 100644
--- a/Engine/Plugins/Runtime/GoogleVR/GoogleVRHMD/Source/GoogleVRHMD/Private/GoogleVRHMD.cpp
+++ b/Engine/Plugins/Runtime/GoogleVR/GoogleVRHMD/Source/GoogleVRHMD/Private/GoogleVRHMD.cpp
@@ -2201,13 +2201,13 @@ bool FGoogleVRHMD::OnStartGameFrame( FWorldContext& WorldContext )
 			GEngine->GameViewport->Viewport &&
 			GEngine->GameViewport->Viewport->GetClient() )
 		{
-			GEngine->GameViewport->Viewport->GetClient()->InputTouch(GEngine->GameViewport->Viewport, 0, 0, ETouchType::Began, FVector2D(-1, -1), FDateTime::Now(), 0);
-			GEngine->GameViewport->Viewport->GetClient()->InputTouch(GEngine->GameViewport->Viewport, 0, 0, ETouchType::Ended, FVector2D(-1, -1), FDateTime::Now(), 0);
+			GEngine->GameViewport->Viewport->GetClient()->InputTouch(GEngine->GameViewport->Viewport, 0, 0, ETouchType::Began, FVector2D(-1, -1), 1.f, FDateTime::Now(), 0);
+			GEngine->GameViewport->Viewport->GetClient()->InputTouch(GEngine->GameViewport->Viewport, 0, 0, ETouchType::Ended, FVector2D(-1, -1), 1.f, FDateTime::Now(), 0);
 		}
 		bTriggerDetected = false;
 	}
 
-	//Update the head pose at the begnning of a frame. This headpose will be used for both simulation and rendering.
+	//Update the head pose at the beginning of a frame. This headpose will be used for both simulation and rendering.
 	UpdatePoses();
 
 	// Update ViewportList from GVR API
diff --git a/Engine/Plugins/Runtime/HTTPChunkInstaller/Config/Localization/HTTPChunkInstaller.ini b/Engine/Plugins/Runtime/HTTPChunkInstaller/Config/Localization/HTTPChunkInstaller.ini
index 4045cfc534b2..2f4457be4074 100644
--- a/Engine/Plugins/Runtime/HTTPChunkInstaller/Config/Localization/HTTPChunkInstaller.ini
+++ b/Engine/Plugins/Runtime/HTTPChunkInstaller/Config/Localization/HTTPChunkInstaller.ini
@@ -1,6 +1,6 @@
 [CommonSettings]
-SourcePath=Plugins/Online/HTTPChunkInstaller/Content/Localization/HTTPChunkInstaller
-DestinationPath=Plugins/Online/HTTPChunkInstaller/Content/Localization/HTTPChunkInstaller
+SourcePath=Plugins/Runtime/HTTPChunkInstaller/Content/Localization/HTTPChunkInstaller
+DestinationPath=Plugins/Runtime/HTTPChunkInstaller/Content/Localization/HTTPChunkInstaller
 ManifestName=HTTPChunkInstaller.manifest
 ArchiveName=HTTPChunkInstaller.archive
 PortableObjectName=HTTPChunkInstaller.po
@@ -23,7 +23,7 @@ CulturesToGenerate=pt-BR
 ;Gather text from source code
 [GatherTextStep0]
 CommandletClass=GatherTextFromSource
-SearchDirectoryPaths=Plugins/Online/HTTPChunkInstaller/Source/
+SearchDirectoryPaths=Plugins/Runtime/HTTPChunkInstaller/Source/
 FileNameFilters=*.cpp
 FileNameFilters=*.h
 FileNameFilters=*.c
diff --git a/Engine/Plugins/Runtime/HTTPChunkInstaller/Source/Private/HTTPChunkInstaller.cpp b/Engine/Plugins/Runtime/HTTPChunkInstaller/Source/Private/HTTPChunkInstaller.cpp
index 03540ae8af51..50ffe401fe3c 100644
--- a/Engine/Plugins/Runtime/HTTPChunkInstaller/Source/Private/HTTPChunkInstaller.cpp
+++ b/Engine/Plugins/Runtime/HTTPChunkInstaller/Source/Private/HTTPChunkInstaller.cpp
@@ -986,6 +986,8 @@ FHTTPChunkInstall::~FHTTPChunkInstall()
 
 bool FHTTPChunkInstall::Tick(float DeltaSeconds)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FHTTPChunkInstall_Tick);
+
 	if (!bSystemInitialised)
 	{
 		InitialiseSystem();
diff --git a/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Private/BoneControllers/AnimNode_RigidBody.cpp b/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Private/BoneControllers/AnimNode_RigidBody.cpp
index 7f9b21951a7e..ced0c06974f7 100644
--- a/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Private/BoneControllers/AnimNode_RigidBody.cpp
+++ b/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Private/BoneControllers/AnimNode_RigidBody.cpp
@@ -22,12 +22,13 @@ using namespace ImmediatePhysics;
 
 #define LOCTEXT_NAMESPACE "ImmediatePhysics"
 
-TAutoConsoleVariable<int32> CVarEnableRigidBodyNode(TEXT("p.RigidBodyNode"), 1, TEXT("Enables/disables rigid body node updates and evaluations"));
+TAutoConsoleVariable<int32> CVarEnableRigidBodyNode(TEXT("p.RigidBodyNode"), 1, TEXT("Enables/disables rigid body node updates and evaluations"), ECVF_Scalability);
+TAutoConsoleVariable<int32> CVarRigidBodyLODThreshold(TEXT("p.RigidBodyLODThreshold"), -1, TEXT("Max LOD that rigid body node is allowed to run on. Provides a global threshold that overrides per-node the LODThreshold property. -1 means no override."), ECVF_Scalability);
 
 FAnimNode_RigidBody::FAnimNode_RigidBody():
 	QueryParams(NAME_None, FCollisionQueryParams::GetUnknownStatId())
 {
-	bResetSimulated = false;
+	ResetSimulatedTeleportType = ETeleportType::None;
 	PhysicsSimulation = nullptr;
 	OverridePhysicsAsset = nullptr;
 	bOverrideWorldGravity = false;
@@ -41,6 +42,17 @@ FAnimNode_RigidBody::FAnimNode_RigidBody():
 	UnsafeWorld = nullptr;
 	bSimulationStarted = false;
 	bCheckForBodyTransformInit = false;
+	OverlapChannel = ECC_WorldStatic;
+	bEnableWorldGeometry = false;
+	bTransferBoneVelocities = false;
+	bFreezeIncomingPoseOnStart = false;
+
+	PreviousTransform = CurrentTransform = FTransform::Identity;
+	PreviousComponentLinearVelocity = FVector::ZeroVector;	
+
+	ComponentLinearAccScale = FVector::ZeroVector;
+	ComponentLinearVelScale = FVector::ZeroVector;
+	ComponentAppliedLinearAccClamp = FVector(100000,100000,100000);
 }
 
 FAnimNode_RigidBody::~FAnimNode_RigidBody()
@@ -103,7 +115,7 @@ FORCEINLINE_DEBUGGABLE FTransform ConvertCSTransformToSimSpace(ESimulationSpace
 void FAnimNode_RigidBody::UpdateComponentPose_AnyThread(const FAnimationUpdateContext& Context)
 {
 	// Only freeze update graph after initial update, as we want to get that pose through.
-	if (bFreezeIncomingPoseOnStart && bSimulationStarted && !bResetSimulated)
+	if (bFreezeIncomingPoseOnStart && bSimulationStarted && ResetSimulatedTeleportType == ETeleportType::None)
 	{
 		// If we have a Frozen Pose captured, 
 		// then we don't need to update the rest of the graph.
@@ -132,7 +144,7 @@ void FAnimNode_RigidBody::EvaluateComponentPose_AnyThread(FComponentSpacePoseCon
 	{
 		// If we have a Frozen Pose captured, use it.
 		// Only after our intialize setup. As we need new pose for that.
-		if (!bResetSimulated && (CapturedFrozenPose.GetPose().GetNumBones() > 0))
+		if (ResetSimulatedTeleportType == ETeleportType::None && (CapturedFrozenPose.GetPose().GetNumBones() > 0))
 		{
 			Output.Pose.CopyPose(CapturedFrozenPose);
 			Output.Curve.CopyFrom(CapturedFrozenCurves);
@@ -203,12 +215,12 @@ void FAnimNode_RigidBody::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseC
 {
 	SCOPE_CYCLE_COUNTER(STAT_RigidBody_Eval);
 	SCOPE_CYCLE_COUNTER(STAT_ImmediateEvaluateSkeletalControl);
-	//FPlatformMisc::BeginNamedEvent(FColor::Magenta, "FAnimNode_Ragdoll::EvaluateSkeletalControl_AnyThread");
+	//SCOPED_NAMED_EVENT_TEXT("FAnimNode_Ragdoll::EvaluateSkeletalControl_AnyThread", FColor::Magenta);
 
 	// Update our eval counter, and decide whether we need to reset simulated bodies, if our anim instance hasn't updated in a while.
 	if(EvalCounter.HasEverBeenUpdated() && !EvalCounter.WasSynchronizedLastFrame(Output.AnimInstanceProxy->GetEvaluationCounter()))
 	{
-		bResetSimulated = true;
+		ResetSimulatedTeleportType = ETeleportType::ResetPhysics;
 	}
 	EvalCounter.SynchronizeWith(Output.AnimInstanceProxy->GetEvaluationCounter());
 
@@ -219,62 +231,98 @@ void FAnimNode_RigidBody::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseC
 	{
 		const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
 		const FTransform CompWorldSpaceTM = Output.AnimInstanceProxy->GetComponentTransform();
+		if(!EvalCounter.HasEverBeenUpdated())
+		{
+			PreviousCompWorldSpaceTM = CompWorldSpaceTM;
+		}
 		const FTransform BaseBoneTM = Output.Pose.GetComponentSpaceTransform(BaseBoneRef.GetCompactPoseIndex(BoneContainer));
 
 		// Initialize potential new bodies because of LOD change.
-		if (!bResetSimulated && bCheckForBodyTransformInit)
+		if (ResetSimulatedTeleportType == ETeleportType::None && bCheckForBodyTransformInit)
 		{
 			bCheckForBodyTransformInit = false;
 			InitializeNewBodyTransformsDuringSimulation(Output, CompWorldSpaceTM, BaseBoneTM);
 		}
 
 		// If time advances, update simulation
-		if (DeltaSeconds > 0)
+		// Reset if necessary
+		if (ResetSimulatedTeleportType != ETeleportType::None)
 		{
-			// First update, initialize bodies from animation.
-			if (bResetSimulated)
+			// Capture bone velocities if we have captured a bone velocity pose.
+			if (bTransferBoneVelocities && (CapturedBoneVelocityPose.GetPose().GetNumBones() > 0))
 			{
-				bResetSimulated = false;
-
-				// Capture bone velocities if we have captured a bone velocity pose.
-				if (bTransferBoneVelocities && (CapturedBoneVelocityPose.GetPose().GetNumBones() > 0))
+				for (const FOutputBoneData& OutputData : OutputBoneData)
 				{
-					for (const FOutputBoneData& OutputData : OutputBoneData)
+					const int32 BodyIndex = OutputData.BodyIndex;
+					FBodyAnimData& BodyData = BodyAnimData[BodyIndex];
+
+					if (BodyData.bIsSimulated)
 					{
-						const int32 BodyIndex = OutputData.BodyIndex;
-						FBodyAnimData& BodyData = BodyAnimData[BodyIndex];
+						const FCompactPoseBoneIndex NextCompactPoseBoneIndex = OutputData.CompactPoseBoneIndex;
+						// Convert CompactPoseBoneIndex to SkeletonBoneIndex...
+						const int32 PoseSkeletonBoneIndex = BoneContainer.GetPoseToSkeletonBoneIndexArray()[NextCompactPoseBoneIndex.GetInt()];
+						// ... So we can convert to the captured pose CompactPoseBoneIndex. 
+						// In case there was a LOD change, and poses are not compatible anymore.
+						const FCompactPoseBoneIndex PrevCompactPoseBoneIndex = CapturedBoneVelocityBoneContainer.GetCompactPoseIndexFromSkeletonIndex(PoseSkeletonBoneIndex);
 
-						if (BodyData.bIsSimulated)
+						if (PrevCompactPoseBoneIndex != FCompactPoseBoneIndex(INDEX_NONE))
 						{
-							const FCompactPoseBoneIndex NextCompactPoseBoneIndex = OutputData.CompactPoseBoneIndex;
-							// Convert CompactPoseBoneIndex to SkeletonBoneIndex...
-							const int32 PoseSkeletonBoneIndex = BoneContainer.GetPoseToSkeletonBoneIndexArray()[NextCompactPoseBoneIndex.GetInt()];
-							// ... So we can convert to the captured pose CompactPoseBoneIndex. 
-							// In case there was a LOD change, and poses are not compatible anymore.
-							const FCompactPoseBoneIndex PrevCompactPoseBoneIndex = CapturedBoneVelocityBoneContainer.GetCompactPoseIndexFromSkeletonIndex(PoseSkeletonBoneIndex);
+							const FTransform PrevCSTM = CapturedBoneVelocityPose.GetComponentSpaceTransform(PrevCompactPoseBoneIndex);
+							const FTransform NextCSTM = Output.Pose.GetComponentSpaceTransform(NextCompactPoseBoneIndex);
 
-							if (PrevCompactPoseBoneIndex != FCompactPoseBoneIndex(INDEX_NONE))
+							const FTransform PrevSSTM = ConvertCSTransformToSimSpace(SimulationSpace, PrevCSTM, CompWorldSpaceTM, BaseBoneTM);
+							const FTransform NextSSTM = ConvertCSTransformToSimSpace(SimulationSpace, NextCSTM, CompWorldSpaceTM, BaseBoneTM);
+
+							// Linear Velocity
+							if(DeltaSeconds > 0.0f)
 							{
-								const FTransform PrevCSTM = CapturedBoneVelocityPose.GetComponentSpaceTransform(PrevCompactPoseBoneIndex);
-								const FTransform NextCSTM = Output.Pose.GetComponentSpaceTransform(NextCompactPoseBoneIndex);
-
-								const FTransform PrevSSTM = ConvertCSTransformToSimSpace(SimulationSpace, PrevCSTM, CompWorldSpaceTM, BaseBoneTM);
-								const FTransform NextSSTM = ConvertCSTransformToSimSpace(SimulationSpace, NextCSTM, CompWorldSpaceTM, BaseBoneTM);
-
-								// Linear Velocity
 								BodyData.TransferedBoneVelocity.SetTranslation((NextSSTM.GetLocation() - PrevSSTM.GetLocation()) / DeltaSeconds);
-
-								// Angular Velocity
-								const FQuat DeltaRotation = (NextSSTM.GetRotation().Inverse() * PrevSSTM.GetRotation());
-								const float RotationAngle = DeltaRotation.GetAngle() / DeltaSeconds;
-								BodyData.TransferedBoneVelocity.SetRotation(FQuat(DeltaRotation.GetRotationAxis(), RotationAngle)); 
 							}
+							else
+							{
+								BodyData.TransferedBoneVelocity.SetTranslation(FVector::ZeroVector);
+							}
+
+							// Angular Velocity
+							const FQuat DeltaRotation = (NextSSTM.GetRotation().Inverse() * PrevSSTM.GetRotation());
+							const float RotationAngle = DeltaRotation.GetAngle() / DeltaSeconds;
+							BodyData.TransferedBoneVelocity.SetRotation(FQuat(DeltaRotation.GetRotationAxis(), RotationAngle)); 
 						}
 					}
 				}
+			}
 
-				// Initialize bodies.
+			
+			switch(ResetSimulatedTeleportType)
+			{
+				case ETeleportType::TeleportPhysics:
 				{
+					// Teleport bodies.
+					for (const FOutputBoneData& OutputData : OutputBoneData)
+					{
+						const int32 BodyIndex = OutputData.BodyIndex;
+						BodyAnimData[BodyIndex].bBodyTransformInitialized = true;
+
+						FTransform BodyTM = Bodies[BodyIndex]->GetWorldTransform();
+						FTransform ComponentSpaceTM;
+
+						switch(SimulationSpace)
+						{
+							case ESimulationSpace::ComponentSpace: ComponentSpaceTM = BodyTM; break;
+							case ESimulationSpace::WorldSpace: ComponentSpaceTM = BodyTM.GetRelativeTransform(PreviousCompWorldSpaceTM); break;
+							case ESimulationSpace::BaseBoneSpace: ComponentSpaceTM = BodyTM * BaseBoneTM; break;
+							default: ensureMsgf(false, TEXT("Unsupported Simulation Space")); ComponentSpaceTM = BodyTM;
+						}
+
+						BodyTM = ConvertCSTransformToSimSpace(SimulationSpace, ComponentSpaceTM, CompWorldSpaceTM, BaseBoneTM);
+						Bodies[BodyIndex]->SetWorldTransform(BodyTM);
+					}
+				}
+				break;
+
+				case ETeleportType::ResetPhysics:
+				{
+					// Completely reset bodies.
 					for (const FOutputBoneData& OutputData : OutputBoneData)
 					{
 						const int32 BodyIndex = OutputData.BodyIndex;
@@ -285,58 +333,107 @@ void FAnimNode_RigidBody::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseC
 						Bodies[BodyIndex]->SetWorldTransform(BodyTM);
 					}
 				}
+				break;
 			}
-			// Subsequent updates, update kinematic bodies and run simulation.
-			else
+
+			// Always reset after a teleport
+			PreviousCompWorldSpaceTM = CompWorldSpaceTM;
+			ResetSimulatedTeleportType = ETeleportType::None;
+			PreviousComponentLinearVelocity = FVector::ZeroVector;
+		}
+		// Only need to tick physics if we didn't reset and we have some time to simulate
+		else if(DeltaSeconds > 0.0f)
+		{
+			// Transfer bone velocities previously captured.
+			if (bTransferBoneVelocities && (CapturedBoneVelocityPose.GetPose().GetNumBones() > 0))
 			{
-				// Transfer bone velocities previously captured.
-				if (bTransferBoneVelocities && (CapturedBoneVelocityPose.GetPose().GetNumBones() > 0))
-				{
-					for (const FOutputBoneData& OutputData : OutputBoneData)
-					{
-						const int32 BodyIndex = OutputData.BodyIndex;
-						const FBodyAnimData& BodyData = BodyAnimData[BodyIndex];
-
-						if (BodyData.bIsSimulated)
-						{
-							ImmediatePhysics::FActorHandle* Body = Bodies[BodyIndex];
-							Body->SetLinearVelocity(BodyData.TransferedBoneVelocity.GetTranslation());
-
-							const FQuat AngularVelocity = BodyData.TransferedBoneVelocity.GetRotation();
-							Body->SetAngularVelocity(AngularVelocity.GetRotationAxis() * AngularVelocity.GetAngle());
-						}
-					}
-
-					// Free up our captured pose after it's been used.
-					CapturedBoneVelocityPose.Empty();
-				}
-
 				for (const FOutputBoneData& OutputData : OutputBoneData)
 				{
 					const int32 BodyIndex = OutputData.BodyIndex;
-					if (!BodyAnimData[BodyIndex].bIsSimulated)
-					{
-						const FTransform& ComponentSpaceTM = Output.Pose.GetComponentSpaceTransform(OutputData.CompactPoseBoneIndex);
-						const FTransform BodyTM = ConvertCSTransformToSimSpace(SimulationSpace, ComponentSpaceTM, CompWorldSpaceTM, BaseBoneTM);
+					const FBodyAnimData& BodyData = BodyAnimData[BodyIndex];
 
-						Bodies[BodyIndex]->SetKinematicTarget(BodyTM);
+					if (BodyData.bIsSimulated)
+					{
+						ImmediatePhysics::FActorHandle* Body = Bodies[BodyIndex];
+						Body->SetLinearVelocity(BodyData.TransferedBoneVelocity.GetTranslation());
+
+						const FQuat AngularVelocity = BodyData.TransferedBoneVelocity.GetRotation();
+						Body->SetAngularVelocity(AngularVelocity.GetRotationAxis() * AngularVelocity.GetAngle());
 					}
 				}
 
-				UpdateWorldForces(CompWorldSpaceTM, BaseBoneTM);
-				const FVector SimSpaceGravity = WorldVectorToSpaceNoScale(SimulationSpace, WorldSpaceGravity, CompWorldSpaceTM, BaseBoneTM);
+				// Free up our captured pose after it's been used.
+				CapturedBoneVelocityPose.Empty();
+			}
+			else if (SimulationSpace != ESimulationSpace::WorldSpace)
+			{
+				// Calc linear velocity
+				const FVector ComponentDeltaLocation = CurrentTransform.GetTranslation() - PreviousTransform.GetTranslation();
+				const FVector ComponentLinearVelocity = ComponentDeltaLocation / DeltaSeconds;
+				// Apply acceleration that opposed velocity (basically 'drag')
+				FVector ApplyLinearAcc = WorldVectorToSpaceNoScale(SimulationSpace, -ComponentLinearVelocity, CompWorldSpaceTM, BaseBoneTM) * ComponentLinearVelScale;
 
-				// Run simulation at a minimum of 30 FPS to prevent system from exploding.
-				// DeltaTime can be higher due to URO, so take multiple iterations in that case.
-				const float MaxDeltaSeconds = 1.f / 30.f;
-				const int32 NumIterations = FMath::Clamp(FMath::CeilToInt(DeltaSeconds / MaxDeltaSeconds), 1, 4);
-				const float StepDeltaTime = DeltaSeconds / float(NumIterations);
+				// Calc linear acceleration
+				const FVector ComponentLinearAcceleration = (ComponentLinearVelocity - PreviousComponentLinearVelocity) / DeltaSeconds;
+				PreviousComponentLinearVelocity = ComponentLinearVelocity;
+				// Apply opposite acceleration to bodies
+				ApplyLinearAcc += WorldVectorToSpaceNoScale(SimulationSpace, -ComponentLinearAcceleration, CompWorldSpaceTM, BaseBoneTM) * ComponentLinearAccScale;
 
-				for (int32 Step = 1; Step <= NumIterations; Step++)
+				// Iterate over bodies
+				for (const FOutputBoneData& OutputData : OutputBoneData)
 				{
-					PhysicsSimulation->Simulate(StepDeltaTime, SimSpaceGravity);
+					const int32 BodyIndex = OutputData.BodyIndex;
+					const FBodyAnimData& BodyData = BodyAnimData[BodyIndex];
+
+					if (BodyData.bIsSimulated)
+					{
+						ImmediatePhysics::FActorHandle* Body = Bodies[BodyIndex];
+
+						// Apply 
+						const float BodyInvMass = Body->GetInverseMass();
+						if (BodyInvMass > 0.f)
+						{
+							// Final desired acceleration to apply to body
+							FVector FinalBodyLinearAcc = ApplyLinearAcc;
+
+							// Clamp if desired
+							if (!ComponentAppliedLinearAccClamp.IsNearlyZero())
+							{
+								FinalBodyLinearAcc = FinalBodyLinearAcc.BoundToBox(-ComponentAppliedLinearAccClamp, ComponentAppliedLinearAccClamp);
+							}
+
+							// Apply to body
+							Body->AddForce(FinalBodyLinearAcc / BodyInvMass);
+						}
+					}
 				}
 			}
+
+			for (const FOutputBoneData& OutputData : OutputBoneData)
+			{
+				const int32 BodyIndex = OutputData.BodyIndex;
+				if (!BodyAnimData[BodyIndex].bIsSimulated)
+				{
+					const FTransform& ComponentSpaceTM = Output.Pose.GetComponentSpaceTransform(OutputData.CompactPoseBoneIndex);
+					const FTransform BodyTM = ConvertCSTransformToSimSpace(SimulationSpace, ComponentSpaceTM, CompWorldSpaceTM, BaseBoneTM);
+
+					Bodies[BodyIndex]->SetKinematicTarget(BodyTM);
+				}
+			}
+
+			UpdateWorldForces(CompWorldSpaceTM, BaseBoneTM);
+			const FVector SimSpaceGravity = WorldVectorToSpaceNoScale(SimulationSpace, WorldSpaceGravity, CompWorldSpaceTM, BaseBoneTM);
+
+			// Run simulation at a minimum of 30 FPS to prevent system from exploding.
+			// DeltaTime can be higher due to URO, so take multiple iterations in that case.
+			const float MaxDeltaSeconds = 1.f / 30.f;
+			const int32 NumIterations = FMath::Clamp(FMath::CeilToInt(DeltaSeconds / MaxDeltaSeconds), 1, 4);
+			const float StepDeltaTime = DeltaSeconds / float(NumIterations);
+
+			for (int32 Step = 1; Step <= NumIterations; Step++)
+			{
+				PhysicsSimulation->Simulate(StepDeltaTime, SimSpaceGravity);
+			}
 		}
 		
 		//write back to animation system
@@ -359,8 +456,9 @@ void FAnimNode_RigidBody::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseC
 				OutBoneTransforms.Add(FBoneTransform(OutputData.CompactPoseBoneIndex, ComponentSpaceTM));
 			}
 		}
+
+		PreviousCompWorldSpaceTM = CompWorldSpaceTM;
 	}
-	//FPlatformMisc::EndNamedEvent();
 }
 
 void ComputeBodyInsertionOrder(TArray<FBoneIndexType>& InsertionOrder, const USkeletalMeshComponent& SKC)
@@ -428,6 +526,8 @@ void FAnimNode_RigidBody::InitPhysics(const UAnimInstance* InAnimInstance)
 	SkeletonBoneIndexToBodyIndex.Reset(NumSkeletonBones);
 	SkeletonBoneIndexToBodyIndex.Init(INDEX_NONE, NumSkeletonBones);
 
+	PreviousTransform = InAnimInstance->GetSkelMeshComponent()->GetComponentToWorld();
+
 	if(UsePhysicsAsset)
 	{
 		delete PhysicsSimulation;
@@ -441,7 +541,7 @@ void FAnimNode_RigidBody::InitPhysics(const UAnimInstance* InAnimInstance)
 		
 		TArray<FBodyInstance*> HighLevelBodyInstances;
 		TArray<FConstraintInstance*> HighLevelConstraintInstances;
-		SkeletalMeshComp->InstantiatePhysicsAsset(*UsePhysicsAsset, SimulationSpace == ESimulationSpace::WorldSpace ? SkeletalMeshComp->GetComponentToWorld().GetScale3D() : FVector(1.f), HighLevelBodyInstances, HighLevelConstraintInstances);
+		SkeletalMeshComp->InstantiatePhysicsAssetRefPose(*UsePhysicsAsset, SimulationSpace == ESimulationSpace::WorldSpace ? SkeletalMeshComp->GetComponentToWorld().GetScale3D() : FVector(1.f), HighLevelBodyInstances, HighLevelConstraintInstances);
 
 		TMap<FName, FActorHandle*> NamesToHandles;
 		TArray<FActorHandle*> IgnoreCollisionActors;
@@ -572,7 +672,7 @@ void FAnimNode_RigidBody::InitPhysics(const UAnimInstance* InAnimInstance)
 				delete CI;
 			}
 
-			bResetSimulated = true;
+			ResetSimulatedTeleportType = ETeleportType::ResetPhysics;
 		}
 
 		TArray<FSimulation::FIgnorePair> IgnorePairs;
@@ -676,10 +776,11 @@ bool FAnimNode_RigidBody::NeedsDynamicReset() const
 	return true;
 }
 
-void FAnimNode_RigidBody::ResetDynamics()
+void FAnimNode_RigidBody::ResetDynamics(ETeleportType InTeleportType)
 {
-	// This will be picked up next evaluate and reset our simulation
-	bResetSimulated = true;
+	// This will be picked up next evaluate and reset our simulation.
+	// Teleport type can only go higher - i.e. if we have requested a reset, then a teleport will still reset fully
+	ResetSimulatedTeleportType = ((InTeleportType > ResetSimulatedTeleportType) ? InTeleportType : ResetSimulatedTeleportType);
 }
 
 DECLARE_CYCLE_STAT(TEXT("RigidBody_PreUpdate"), STAT_RigidBody_PreUpdate, STATGROUP_Anim);
@@ -716,9 +817,31 @@ void FAnimNode_RigidBody::PreUpdate(const UAnimInstance* InAnimInstance)
 		}
 
 		PendingRadialForces = SKC->GetPendingRadialForces();
+
+		PreviousTransform = CurrentTransform;
+		CurrentTransform = SKC->GetComponentToWorld();
 	}	
 }
 
+int32 FAnimNode_RigidBody::GetLODThreshold() const
+{
+	if(CVarRigidBodyLODThreshold.GetValueOnAnyThread() != -1)
+	{
+		if(LODThreshold != -1)
+		{
+			return FMath::Min(LODThreshold, CVarRigidBodyLODThreshold.GetValueOnAnyThread());
+		}
+		else
+		{
+			return CVarRigidBodyLODThreshold.GetValueOnAnyThread();
+		}
+	}
+	else
+	{
+		return LODThreshold;
+	}
+}
+
 DECLARE_CYCLE_STAT(TEXT("RigidBody_Update"), STAT_RigidBody_Update, STATGROUP_Anim);
 
 void FAnimNode_RigidBody::UpdateInternal(const FAnimationUpdateContext& Context)
diff --git a/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Public/BoneControllers/AnimNode_RigidBody.h b/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Public/BoneControllers/AnimNode_RigidBody.h
index 6c875184b20a..8c54d5477a1f 100644
--- a/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Public/BoneControllers/AnimNode_RigidBody.h
+++ b/Engine/Plugins/Runtime/ImmediatePhysics/Source/ImmediatePhysics/Public/BoneControllers/AnimNode_RigidBody.h
@@ -52,7 +52,8 @@ struct IMMEDIATEPHYSICS_API FAnimNode_RigidBody : public FAnimNode_SkeletalContr
 	virtual bool HasPreUpdate() const override { return true; }
 	virtual bool IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) override { return true; }
 	virtual bool NeedsDynamicReset() const override;
-	virtual void ResetDynamics() override;
+	virtual void ResetDynamics(ETeleportType InTeleportType) override;
+	virtual int32 GetLODThreshold() const override;
 	// End of FAnimNode_SkeletalControlBase interface
 
 	/** Physics asset to use. If empty use the skeletal mesh's default physics asset */
@@ -67,6 +68,18 @@ struct IMMEDIATEPHYSICS_API FAnimNode_RigidBody : public FAnimNode_SkeletalContr
 	UPROPERTY(EditAnywhere, Category = Settings, meta = (PinShownByDefault))
 	FVector ExternalForce;
 
+	/** When using non-world-space sim, this controls how much of the components world-space acceleration is passed on to the local-space simulation. */
+	UPROPERTY(EditAnywhere, Category = Settings)
+	FVector ComponentLinearAccScale;
+
+	/** When using non-world-space sim, this applies a 'drag' to the bodies in the local space simulation, based on the components world-space velocity. */
+	UPROPERTY(EditAnywhere, Category = Settings)
+	FVector ComponentLinearVelScale;
+
+	/** When using non-world-space sim, this is an overall clamp on acceleration derived from ComponentLinearAccScale and ComponentLinearVelScale, to ensure it is not too large. */
+	UPROPERTY(EditAnywhere, Category = Settings)
+	FVector	ComponentAppliedLinearAccClamp;
+
 	/** The channel we use to find static geometry to collide with */
 	UPROPERTY(EditAnywhere, Category = Settings, meta = (editcondition = "bEnableWorldGeometry"))
 	TEnumAsByte<ECollisionChannel> OverlapChannel;
@@ -169,6 +182,8 @@ private:
 	float AccumulatedDeltaTime;
 	float TotalMass;
 
+	FTransform PreviousCompWorldSpaceTM;
+
 	FSphere Bounds;
 	FSphere CachedBounds;
 
@@ -188,7 +203,11 @@ private:
 	FCSPose<FCompactHeapPose> CapturedFrozenPose;
 	FBlendedHeapCurve CapturedFrozenCurves;
 
-	bool bResetSimulated;
+	FTransform CurrentTransform;
+	FTransform PreviousTransform;
+	FVector PreviousComponentLinearVelocity;
+
+	ETeleportType ResetSimulatedTeleportType;
 	bool bSimulationStarted;
 	bool bCheckForBodyTransformInit;
 };
diff --git a/Engine/Plugins/Runtime/MixedRealityCaptureFramework/Source/MixedRealityCaptureFramework/Private/MixedRealityCaptureComponent.cpp b/Engine/Plugins/Runtime/MixedRealityCaptureFramework/Source/MixedRealityCaptureFramework/Private/MixedRealityCaptureComponent.cpp
index 45692fea1bdc..9ea08104ccd4 100644
--- a/Engine/Plugins/Runtime/MixedRealityCaptureFramework/Source/MixedRealityCaptureFramework/Private/MixedRealityCaptureComponent.cpp
+++ b/Engine/Plugins/Runtime/MixedRealityCaptureFramework/Source/MixedRealityCaptureFramework/Private/MixedRealityCaptureComponent.cpp
@@ -58,7 +58,7 @@ public:
 		if (Args.Num())
 		{
 			T NewVal;
-			Lex::FromString(NewVal, *Args[0]);
+			LexFromString(NewVal, *Args[0]);
 
 			if (NewVal != VarRef)
 			{
@@ -66,7 +66,7 @@ public:
 				Broadcast();
 			}
 		}
-		Ar.Logf(TEXT("%s = %s"), *CmdName, *Lex::ToString(VarRef));
+		Ar.Logf(TEXT("%s = %s"), *CmdName, *LexToString(VarRef));
 	}
 
 private:
@@ -81,7 +81,7 @@ void FMulticastCVarCommand<bool>::HandleCommand(const TArray<FString>& Args, UWo
 	if (Args.Num())
 	{
 		bool NewVal;
-		Lex::FromString(NewVal, *Args[0]);
+		LexFromString(NewVal, *Args[0]);
 
 		if (NewVal != VarRef)
 		{
diff --git a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/AESHandlerComponent.Build.cs b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/AESHandlerComponent.Build.cs
index 87a672c79cbe..2f9c00614117 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/AESHandlerComponent.Build.cs
+++ b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/AESHandlerComponent.Build.cs
@@ -56,4 +56,4 @@ public class AESHandlerComponent : ModuleRules
 				);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Private/AESHandlerComponent.cpp b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Private/AESHandlerComponent.cpp
index 55d67f9ba787..c609c841d36b 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Private/AESHandlerComponent.cpp
+++ b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Private/AESHandlerComponent.cpp
@@ -43,6 +43,11 @@ void FAESHandlerComponent::DisableEncryption()
 	bEncryptionEnabled = false;
 }
 
+bool FAESHandlerComponent::IsEncryptionEnabled() const
+{
+	return bEncryptionEnabled;
+}
+
 void FAESHandlerComponent::Initialize()
 {
 	SetActive(true);
diff --git a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Public/AESHandlerComponent.h b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Public/AESHandlerComponent.h
index cffdacb8344b..122bef65a279 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Public/AESHandlerComponent.h
+++ b/Engine/Plugins/Runtime/PacketHandlers/AESHandlerComponent/Source/Public/AESHandlerComponent.h
@@ -36,6 +36,9 @@ public:
 	// After calling this, future outgoing packets will not be encrypted (until a call to DisableEncryption).
 	virtual void DisableEncryption() override;
 
+	// Returns true if encryption is currently enabled.
+	virtual bool IsEncryptionEnabled() const override;
+
 	// HandlerComponent interface
 	virtual void Initialize() override;
 	virtual bool IsValid() const override;
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Oodle.uplugin b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Oodle.uplugin
index 8c6acaf5483c..fce64263951e 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Oodle.uplugin
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Oodle.uplugin
@@ -29,8 +29,9 @@
 				"PS4",
 				"XboxOne",
 				"Android",
-				"IOS"
+				"IOS",
+				"Switch"
 			]
 		}
 	]
-}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/OodleHandlerComponent.Build.cs b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/OodleHandlerComponent.Build.cs
index 401f314d2d96..a2a4525af5ef 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/OodleHandlerComponent.Build.cs
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/OodleHandlerComponent.Build.cs
@@ -38,7 +38,7 @@ public class OodleHandlerComponent : ModuleRules
 		{
 			OodleNotForLicenseesLibDir = System.IO.Path.Combine( Target.UEThirdPartySourceDirectory, "..", "..",
 				"Plugins", "Runtime", "PacketHandlers", "CompressionComponents", "Oodle", "Source", "ThirdParty", "NotForLicensees",
-				"Oodle", "255", "linux", "lib" );
+				"Oodle", "255", "Linux", "lib" );
 		}
 		else if ( Target.Platform == UnrealTargetPlatform.PS4 )
 		{
@@ -70,6 +70,12 @@ public class OodleHandlerComponent : ModuleRules
 			"Plugins", "Runtime", "PacketHandlers", "CompressionComponents", "Oodle", "Source", "ThirdParty", "NotForLicensees",
 			"Oodle", "255", "IOS", "lib");
 		}
+		else if (Target.Platform == UnrealTargetPlatform.Switch)
+		{
+			OodleNotForLicenseesLibDir = System.IO.Path.Combine(Target.UEThirdPartySourceDirectory, "..", "..",
+			"Plugins", "Runtime", "PacketHandlers", "CompressionComponents", "Oodle", "Source", "ThirdParty", "NotForLicensees",
+			"Oodle", "255", "Switch", "lib");
+		}
 
 		if (OodleNotForLicenseesLibDir.Length > 0)
 		{
@@ -93,4 +99,4 @@ public class OodleHandlerComponent : ModuleRules
 			PublicDefinitions.Add( "HAS_OODLE_SDK=0" );
 		}
     }
-}
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleArchives.cpp b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleArchives.cpp
index 7a1cf6a7b84d..3ebd62ca4c8b 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleArchives.cpp
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleArchives.cpp
@@ -289,26 +289,33 @@ uint32 FPacketCaptureArchive::GetPacketCount()
 		{
 			int64 ArcTotal = InnerArchive.TotalSize();
 
-			check(Header.PacketDataOffset.Get() != 0);
-
-			SeekPush(Header.PacketDataOffset.Get());
-
-			while ((InnerArchive.Tell() + (int64)sizeof(uint32)) < ArcTotal)
+			if (Header.PacketDataOffset.Get() != 0)
 			{
-				uint32 PacketSize = 0;
+				check(Header.PacketDataOffset.Get() != 0);
 
-				InnerArchive << PacketSize;
+				SeekPush(Header.PacketDataOffset.Get());
 
-				int64 NewPos = InnerArchive.Tell() + PacketSize;
-
-				if (NewPos <= ArcTotal)
+				while ((InnerArchive.Tell() + (int64)sizeof(uint32)) < ArcTotal)
 				{
-					InnerArchive.Seek(NewPos);
-					ReturnVal++;
-				}
-			}
+					uint32 PacketSize = 0;
 
-			SeekPop();
+					InnerArchive << PacketSize;
+
+					int64 NewPos = InnerArchive.Tell() + PacketSize;
+
+					if (NewPos <= ArcTotal)
+					{
+						InnerArchive.Seek(NewPos);
+						ReturnVal++;
+					}
+				}
+
+				SeekPop();
+			}
+			else
+			{
+				UE_LOG(OodleHandlerComponentLog, Warning, TEXT("Skipping packet file because it is malformed."));
+			}
 		}
 	}
 
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleCustomCompressor.cpp b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleCustomCompressor.cpp
new file mode 100644
index 000000000000..2663d5559458
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleCustomCompressor.cpp
@@ -0,0 +1,50 @@
+#include "CoreTypes.h"
+#include "Misc/Compression.h"
+#include "oodle2.h"
+
+struct FOodleCustomCompressor : ICustomCompressor
+{
+	OodleLZ_Compressor Compressor;
+	OodleLZ_CompressionLevel CompressionLevel;
+	OodleLZ_CompressOptions CompressionOptions;
+
+	FOodleCustomCompressor(OodleLZ_Compressor InCompressor, OodleLZ_CompressionLevel InCompressionLevel, int InSpaceSpeedTradeoffBytes)
+	{
+		Compressor = InCompressor;
+		CompressionLevel = InCompressionLevel;
+		CompressionOptions = *OodleLZ_CompressOptions_GetDefault(Compressor, CompressionLevel);
+		CompressionOptions.spaceSpeedTradeoffBytes = InSpaceSpeedTradeoffBytes;
+	}
+
+	virtual bool Compress(void* CompressedBuffer, int32& CompressedSize, const void* UncompressedBuffer, int32 UncompressedSize)
+	{
+		int32 Result = (int32)OodleLZ_Compress(Compressor, UncompressedBuffer, UncompressedSize, CompressedBuffer, CompressionLevel, &CompressionOptions);
+		if (Result > 0)
+		{
+			CompressedSize = Result;
+			return true;
+		}
+		return false;
+	}
+
+	virtual bool Uncompress(void* UncompressedBuffer, int32& UncompressedSize, const void* CompressedBuffer, int32 CompressedSize, int32 BitWindow = 0)
+	{
+		int32 Result = (int32)OodleLZ_Decompress(CompressedBuffer, CompressedSize, UncompressedBuffer, UncompressedSize, OodleLZ_FuzzSafe_No);
+		if (Result > 0)
+		{
+			UncompressedSize = Result;
+			return true;
+		}
+		return false;
+	}
+
+	virtual int32 GetCompressedBufferSize(int32 UncompressedSize)
+	{
+		return (int32)OodleLZ_GetCompressedBufferSizeNeeded(UncompressedSize);
+	}
+};
+
+ICustomCompressor* CreateOodleCustomCompressor()
+{
+	return new FOodleCustomCompressor(OodleLZ_Compressor_Mermaid, OodleLZ_CompressionLevel_Optimal2, 256);
+}
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleHandlerComponent.cpp b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleHandlerComponent.cpp
index 719f7a1e7578..a1e37c7a9ab5 100644
--- a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleHandlerComponent.cpp
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleHandlerComponent.cpp
@@ -18,6 +18,8 @@
 #include "Engine/Engine.h"
 #endif
 
+#include "Features/IModularFeature.h"
+#include "Features/IModularFeatures.h"
 
 DEFINE_LOG_CATEGORY(OodleHandlerComponentLog);
 
@@ -399,7 +401,7 @@ void OodleHandlerComponent::InitializeDictionaries()
 	FString ClientDictionaryPath;
 	bool bGotDictionaryPath = false;
 
-#if (!UE_BUILD_SHIPPING || OODLE_DEV_SHIPPING) && !(PLATFORM_PS4 || PLATFORM_XBOXONE)
+#if (!UE_BUILD_SHIPPING || OODLE_DEV_SHIPPING) && !(PLATFORM_PS4 || PLATFORM_XBOXONE || PLATFORM_SWITCH)
 	if (bUseDictionaryIfPresent)
 	{
 		bGotDictionaryPath = FindFallbackDictionaries(ServerDictionaryPath, ClientDictionaryPath);
@@ -454,7 +456,7 @@ void OodleHandlerComponent::InitializeDictionary(FString FilePath, TSharedPtr<FO
 
 			if (!BoundArc.IsError())
 			{
-				UE_LOG(OodleHandlerComponentLog, Log, TEXT("Loading dictionary file: %s"), *FilePath);
+				UE_LOG(OodleHandlerComponentLog, VeryVerbose, TEXT("Loading dictionary file: %s"), *FilePath);
 
 				// Uncompact the compressor state
 				uint32 CompressorStateSize = OodleNetwork1UDP_State_Size();
@@ -1394,6 +1396,38 @@ TSharedPtr<HandlerComponent> FOodleComponentModuleInterface::CreateComponentInst
 	return MakeShareable(new OodleHandlerComponent);
 }
 
+void* LoadOodleDll()
+{
+	void* OodleDllHandle = nullptr;
+#if PLATFORM_WINDOWS
+	// Load the Oodle library (NOTE: Path and fallback path mirrored in Oodle.Build.cs)
+	FString OodleBinaryPath = FPaths::ProjectDir() / TEXT( "Binaries/ThirdParty/Oodle/" );
+	FString OodleBinaryFile = TEXT( "oo2core_5" );
+
+#if PLATFORM_64BITS
+	OodleBinaryPath += TEXT("Win64/");
+	OodleBinaryFile += TEXT("_win64.dll");
+#else
+	OodleBinaryPath += TEXT("Win32/");
+	OodleBinaryFile += TEXT("_win32.dll");
+#endif
+
+	FPlatformProcess::PushDllDirectory(*OodleBinaryPath);
+
+	OodleDllHandle = FPlatformProcess::GetDllHandle(*(OodleBinaryPath + OodleBinaryFile));
+
+	FPlatformProcess::PopDllDirectory(*OodleBinaryPath);
+
+	if (OodleDllHandle == nullptr)
+	{
+		UE_LOG(OodleHandlerComponentLog, Fatal, TEXT("Could not find Oodle .dll's in path: %s" ),
+				*(OodleBinaryPath + OodleBinaryFile));
+	}
+#endif
+	return OodleDllHandle;
+}
+
+
 void FOodleComponentModuleInterface::StartupModule()
 {
 	// If Oodle is force-enabled on the commandline, execute the commandlet-enable command, which also adds to the PacketHandler list
@@ -1411,34 +1445,7 @@ void FOodleComponentModuleInterface::StartupModule()
 	GOodleSaveDir = FPaths::ConvertRelativePathToFull(FPaths::Combine(*FPaths::ProjectSavedDir(), TEXT("Oodle")));
 	GOodleContentDir = FPaths::ConvertRelativePathToFull(FPaths::Combine(*FPaths::ProjectContentDir(), TEXT("Oodle")));
 
-#if PLATFORM_WINDOWS
-	{
-		// Load the Oodle library (NOTE: Path and fallback path mirrored in Oodle.Build.cs)
-		FString OodleBinaryPath = FPaths::ProjectDir() / TEXT( "Binaries/ThirdParty/Oodle/" );
-		FString OodleBinaryFile = TEXT( "oo2core_5" );
-
-	#if PLATFORM_64BITS
-		OodleBinaryPath += TEXT("Win64/");
-		OodleBinaryFile += TEXT("_win64.dll");
-	#else
-		OodleBinaryPath += TEXT("Win32/");
-		OodleBinaryFile += TEXT("_win32.dll");
-	#endif
-
-		FPlatformProcess::PushDllDirectory(*OodleBinaryPath);
-
-		OodleDllHandle = FPlatformProcess::GetDllHandle(*(OodleBinaryPath + OodleBinaryFile));
-
-		FPlatformProcess::PopDllDirectory(*OodleBinaryPath);
-
-		if (OodleDllHandle == nullptr)
-		{
-			UE_LOG(OodleHandlerComponentLog, Fatal, TEXT("Could not find Oodle .dll's in path: %s" ),
-					*(OodleBinaryPath + OodleBinaryFile));
-		}
-	}
-#endif
-
+	OodleDllHandle = LoadOodleDll();
 
 	// @todo #JohnB: Remove after Oodle update, and after checking with Luigi
 	OodlePlugins_SetAssertion(&UEOodleDisplayAssert);
@@ -1473,3 +1480,15 @@ void FOodleComponentModuleInterface::ShutdownModule()
 #endif
 
 IMPLEMENT_MODULE( FOodleComponentModuleInterface, OodleHandlerComponent );
+
+#ifdef REGISTER_OODLE_CUSTOM_COMPRESSOR
+struct FOodleCompressorRegistration
+{
+	FOodleCompressorRegistration()
+	{
+		LoadOodleDll();
+		extern ICustomCompressor* CreateOodleCustomCompressor();
+		IModularFeatures::Get().RegisterModularFeature(CUSTOM_COMPRESSOR_FEATURE_NAME, CreateOodleCustomCompressor());
+	}
+} GOodleCompressionRegistration;
+#endif
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleUtils.cpp b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleUtils.cpp
new file mode 100644
index 000000000000..436c263c7b42
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Private/OodleUtils.cpp
@@ -0,0 +1,57 @@
+#include "OodleUtils.h"
+#include "Serialization/MemoryReader.h"
+#include "Serialization/MemoryWriter.h"
+#include "oodle2.h"
+
+#if HAS_OODLE_SDK
+
+namespace OodleUtils
+{
+	bool DecompressReplayData(const TArray<uint8>& InCompressed, TArray< uint8 >& OutBuffer)
+	{
+		int Size = 0;
+		int CompressedSize = 0;
+
+		FMemoryReader Reader(InCompressed);
+		Reader << Size;
+		Reader << CompressedSize;
+
+		OutBuffer.SetNum(Size, false);
+
+		return (OodleLZ_Decompress(InCompressed.GetData() + Reader.Tell(), (SINTa)CompressedSize, OutBuffer.GetData(), OutBuffer.Num()) == OutBuffer.Num());
+	}
+
+	bool CompressReplayData(const TArray<uint8>& InBuffer, TArray< uint8 >& OutCompressed)
+	{
+		int Size = InBuffer.Num();
+		int CompressedSize = 0;
+
+		FMemoryWriter Writer(OutCompressed);
+		Writer << Size;
+		Writer << CompressedSize;		// Make space
+
+		int64 ReservedBytes = Writer.Tell();
+
+		OutCompressed.SetNum(ReservedBytes + OodleLZ_GetCompressedBufferSizeNeeded(InBuffer.Num()));
+
+		const OodleLZ_Compressor			Compressor = OodleLZ_Compressor_LZB16;
+		const OodleLZ_CompressionLevel		Level = OodleLZ_CompressionLevel_VeryFast;
+
+		CompressedSize = OodleLZ_Compress(Compressor, InBuffer.GetData(), (SINTa)InBuffer.Num(), OutCompressed.GetData() + ReservedBytes, Level);
+
+		if (CompressedSize == OODLELZ_FAILED)
+		{
+			return false;
+		}
+
+		Writer.Seek(0);
+		Writer << Size;
+		Writer << CompressedSize;	// Save compressed size for real
+
+		OutCompressed.SetNum(CompressedSize + ReservedBytes, false);
+
+		return true;
+	}
+};
+
+#endif
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Public/OodleUtils.h b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Public/OodleUtils.h
new file mode 100644
index 000000000000..5185a7379421
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/Source/OodleHandlerComponent/Public/OodleUtils.h
@@ -0,0 +1,30 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+#if HAS_OODLE_SDK
+
+namespace OodleUtils
+{
+	/**
+	* Decompress replay data using Oodle, for use by INetworkReplayStreamer streamers
+	*
+	* @param InCompressed	The compressed replay source data (prefixed with size and uncompressed size)
+	* @param OutBuffer		The destination buffer for uncompressed data
+	* @return				Whether or not decompression succeeded
+	*/
+	OODLEHANDLERCOMPONENT_API bool DecompressReplayData(const TArray<uint8>& InCompressed, TArray< uint8 >& OutBuffer);
+
+	/**
+	* Compress replay data using Oodle, for use by INetworkReplayStreamer streamers
+	*
+	* @param InBuffer		The uncompressed replay source data 
+	* @param OutCompressed	The destination buffer for compressed data (prefixed with size and uncompressed size)
+	* @return				Whether or not compression succeeded
+	*/
+	OODLEHANDLERCOMPONENT_API bool CompressReplayData(const TArray<uint8>& InBuffer, TArray< uint8 >& OutCompressed);
+};
+
+#endif
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.cpp b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.cpp
new file mode 100644
index 000000000000..fa2d2ea0c9c2
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.cpp
@@ -0,0 +1,36 @@
+// These are normally defined by UBT, so we have to define them manually
+
+#define UE_BUILD_DEVELOPMENT 1
+#define WITH_EDITOR 0
+#define WITH_ENGINE 0
+#define WITH_UNREAL_DEVELOPER_TOOLS 0
+#define WITH_PLUGIN_SUPPORT 0
+#define UE_BUILD_MINIMAL 1
+#define IS_MONOLITHIC 1
+#define IS_PROGRAM 1
+
+#if defined __APPLE__ && __APPLE__
+	#include "TargetConditionals.h"
+	#if TARGET_OS_MAC
+		#define PLATFORM_MAC 1
+	#else
+		#error Unknown platform
+	#endif
+#elif WIN64
+	#define PLATFORM_WINDOWS 1
+#else
+	#error Unknown platform
+#endif
+
+#define CORE_API 
+
+#include <stdlib.h>
+#include "../Source/OodleHandlerComponent/Private/OodleCustomCompressor.cpp"
+
+extern "C"
+{
+	DLLEXPORT ICustomCompressor* CreateCustomCompressor(const TCHAR* Arguments)
+	{
+		return CreateOodleCustomCompressor();
+	}
+}
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.sln b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.sln
new file mode 100644
index 000000000000..3b7870196e4c
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27520.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnrealPakPlugin", "UnrealPakPlugin.vcxproj", "{B8EA6603-20C8-4181-A704-4E211583A1BA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B8EA6603-20C8-4181-A704-4E211583A1BA}.Debug|x64.ActiveCfg = Debug|x64
+		{B8EA6603-20C8-4181-A704-4E211583A1BA}.Debug|x64.Build.0 = Debug|x64
+		{B8EA6603-20C8-4181-A704-4E211583A1BA}.Release|x64.ActiveCfg = Release|x64
+		{B8EA6603-20C8-4181-A704-4E211583A1BA}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DE088CBD-A25B-4E27-9849-BE5EE66BF07C}
+	EndGlobalSection
+EndGlobal
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj
new file mode 100644
index 000000000000..a7fd9194ed4a
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{B8EA6603-20C8-4181-A704-4E211583A1BA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>CompressorDll</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;COMPRESSORDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\..\..\Engine\Source\Runtime\Core\Public;$(ProjectDir)..\Source\ThirdParty\NotForLicensees\Oodle\255\Win\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>../Source/ThirdParty/NotForLicensees/Oodle/255/Win/lib/oo2core_win64_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;COMPRESSORDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\..\..\Engine\Source\Runtime\Core\Public;$(ProjectDir)..\Source\ThirdParty\NotForLicensees\Oodle\255\Win\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>../Source/ThirdParty/NotForLicensees/Oodle/255/Win/lib/oo2core_win64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="UnrealPakPlugin.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj.filters b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj.filters
new file mode 100644
index 000000000000..c90c5af1067f
--- /dev/null
+++ b/Engine/Plugins/Runtime/PacketHandlers/CompressionComponents/Oodle/UnrealPakPlugin/UnrealPakPlugin.vcxproj.filters
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="UnrealPakPlugin.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/PhysXVehicles/Source/ThirdParty/PhysX/PhysXVehicleLib.Build.cs b/Engine/Plugins/Runtime/PhysXVehicles/Source/ThirdParty/PhysX/PhysXVehicleLib.Build.cs
index 367818c2df5e..27d6fad184d4 100644
--- a/Engine/Plugins/Runtime/PhysXVehicles/Source/ThirdParty/PhysX/PhysXVehicleLib.Build.cs
+++ b/Engine/Plugins/Runtime/PhysXVehicles/Source/ThirdParty/PhysX/PhysXVehicleLib.Build.cs
@@ -30,8 +30,9 @@ public class PhysXVehicleLib : ModuleRules
                     return PhysXLibraryMode.Checked;
                 }
             case UnrealTargetConfiguration.Shipping:
+				return PhysXLibraryMode.Shipping;
             case UnrealTargetConfiguration.Test:
-                return PhysXLibraryMode.Shipping;
+                return PhysXLibraryMode.Profile;
             case UnrealTargetConfiguration.Development:
             case UnrealTargetConfiguration.DebugGame:
             case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/BasicReplicationGraph.cpp b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/BasicReplicationGraph.cpp
new file mode 100644
index 000000000000..e868657cb7a3
--- /dev/null
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/BasicReplicationGraph.cpp
@@ -0,0 +1,186 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// 
+#include "BasicReplicationGraph.h"
+#include "Net/UnrealNetwork.h"
+#include "Engine/LevelStreaming.h"
+#include "EngineUtils.h"
+#include "CoreGlobals.h"
+#include "UObject/UObjectIterator.h"
+#include "Engine/NetConnection.h"
+
+UBasicReplicationGraph::UBasicReplicationGraph()
+{
+
+}
+
+void UBasicReplicationGraph::InitGlobalActorClassSettings()
+{
+	Super::InitGlobalActorClassSettings();
+
+	// ReplicationGraph stores internal associative data for actor classes. 
+	// We build this data here based on actor CDO values.
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		UClass* Class = *It;
+		AActor* ActorCDO = Cast<AActor>(Class->GetDefaultObject());
+		if (!ActorCDO || !ActorCDO->GetIsReplicated())
+		{
+			continue;
+		}
+
+		// Skip SKEL and REINST classes.
+		if (Class->GetName().StartsWith(TEXT("SKEL_")) || Class->GetName().StartsWith(TEXT("REINST_")))
+		{
+			continue;
+		}
+
+		FClassReplicationInfo ClassInfo;
+
+		// Replication Graph is frame based. Convert NetUpdateFrequency to ReplicationPeriodFrame based on Server MaxTickRate.
+		ClassInfo.ReplicationPeriodFrame = FMath::Max<uint32>( (uint32)FMath::RoundToFloat(NetDriver->NetServerMaxTickRate / ActorCDO->NetUpdateFrequency), 1);
+		
+		if (ActorCDO->bAlwaysRelevant || ActorCDO->bOnlyRelevantToOwner)
+		{
+			ClassInfo.CullDistanceSquared = 0.f;
+		}
+		else
+		{
+			ClassInfo.CullDistanceSquared = ActorCDO->NetCullDistanceSquared;
+		}
+		
+		GlobalActorReplicationInfoMap.SetClassInfo( Class, ClassInfo );
+	}
+}
+
+void UBasicReplicationGraph::InitGlobalGraphNodes()
+{
+	// Preallocate some replication lists.
+	PreAllocateRepList(3, 12);
+	PreAllocateRepList(6, 12);
+	PreAllocateRepList(128, 64);
+
+	// -----------------------------------------------
+	//	Spatial Actors
+	// -----------------------------------------------
+
+	GridNode = CreateNewNode<UReplicationGraphNode_GridSpatialization2D>();
+	GridNode->CellSize = 10000.f;
+	GridNode->SpatialBias = FVector2D(-WORLD_MAX, -WORLD_MAX);
+
+	AddGlobalGraphNode(GridNode);
+
+	// -----------------------------------------------
+	//	Always Relevant (to everyone) Actors
+	// -----------------------------------------------
+	AlwaysRelevantNode = CreateNewNode<UReplicationGraphNode_ActorList>();
+	AddGlobalGraphNode(AlwaysRelevantNode);
+}
+
+void UBasicReplicationGraph::InitConnectionGraphNodes(UNetReplicationGraphConnection* RepGraphConnection)
+{
+	Super::InitConnectionGraphNodes(RepGraphConnection);
+
+	UReplicationGraphNode_AlwaysRelevant_ForConnection* AlwaysRelevantNodeForConnection = CreateNewNode<UReplicationGraphNode_AlwaysRelevant_ForConnection>();
+	AddConnectionGraphNode(AlwaysRelevantNodeForConnection, RepGraphConnection);
+
+	AlwaysRelevantForConnectionList.Emplace(RepGraphConnection->NetConnection, AlwaysRelevantNodeForConnection);
+}
+
+void UBasicReplicationGraph::RouteAddNetworkActorToNodes(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& GlobalInfo)
+{
+	if (ActorInfo.Actor->bAlwaysRelevant)
+	{
+		AlwaysRelevantNode->NotifyAddNetworkActor(ActorInfo);
+	}
+	else if (ActorInfo.Actor->bOnlyRelevantToOwner)
+	{
+		ActorsWithoutNetConnection.Add(ActorInfo.Actor);
+	}
+	else
+	{
+		// Note that UReplicationGraphNode_GridSpatialization2D has 3 methods for adding actor based on the mobility of the actor. Since AActor lacks this information, we will
+		// add all spatialized actors as dormant actors: meaning they will be treated as possibly dynamic (moving) when not dormant, and as static (not moving) when dormant.
+		GridNode->AddActor_Dormancy(ActorInfo, GlobalInfo);
+	}
+}
+
+void UBasicReplicationGraph::RouteRemoveNetworkActorToNodes(const FNewReplicatedActorInfo& ActorInfo)
+{
+	if (ActorInfo.Actor->bAlwaysRelevant)
+	{
+		AlwaysRelevantNode->NotifyRemoveNetworkActor(ActorInfo);
+	}
+	else if (ActorInfo.Actor->bOnlyRelevantToOwner)
+	{
+		if (UReplicationGraphNode* Node = GetAlwaysRelevantNodeForConnection(ActorInfo.Actor->GetNetConnection()))
+		{
+			Node->NotifyRemoveNetworkActor(ActorInfo);
+		}
+	}
+	else
+	{
+		GridNode->RemoveActor_Dormancy(ActorInfo);
+	}
+}
+
+UReplicationGraphNode_AlwaysRelevant_ForConnection* UBasicReplicationGraph::GetAlwaysRelevantNodeForConnection(UNetConnection* Connection)
+{
+	UReplicationGraphNode_AlwaysRelevant_ForConnection* Node = nullptr;
+	if (Connection)
+	{
+		if (FConnectionAlwaysRelevantNodePair* Pair = AlwaysRelevantForConnectionList.FindByKey(Connection))
+		{
+			if (Pair->Node)
+			{
+				Node = Pair->Node;
+			}
+			else
+			{
+				UE_LOG(LogNet, Warning, TEXT("AlwaysRelevantNode for connection %s is null."), *GetNameSafe(Connection));
+			}
+		}
+		else
+		{
+			UE_LOG(LogNet, Warning, TEXT("Could not find AlwaysRelevantNode for connection %s. This should have been created in UBasicReplicationGraph::InitConnectionGraphNodes."), *GetNameSafe(Connection));
+		}
+	}
+	else
+	{
+		// Basic implementation requires owner is set on spawn that never changes. A more robust graph would have methods or ways of listening for owner to change
+		UE_LOG(LogNet, Warning, TEXT("Actor: %s is bOnlyRelevantToOwner but does not have an owning Netconnection. It will not be replicated"));
+	}
+
+	return Node;
+}
+
+int32 UBasicReplicationGraph::ServerReplicateActors(float DeltaSeconds)
+{
+	// Route Actors needing owning net connections to appropriate nodes
+	for (int32 idx=ActorsWithoutNetConnection.Num()-1; idx>=0; --idx)
+	{
+		bool bRemove = false;
+		if (AActor* Actor = ActorsWithoutNetConnection[idx])
+		{
+			if (UNetConnection* Connection = Actor->GetNetConnection())
+			{
+				bRemove = true;
+				if (UReplicationGraphNode_AlwaysRelevant_ForConnection* Node = GetAlwaysRelevantNodeForConnection(Actor->GetNetConnection()))
+				{
+					Node->NotifyAddNetworkActor(FNewReplicatedActorInfo(Actor));
+				}
+			}
+		}
+		else
+		{
+			bRemove = true;
+		}
+
+		if (bRemove)
+		{
+			ActorsWithoutNetConnection.RemoveAtSwap(idx, 1, false);
+		}
+	}
+
+
+	return Super::ServerReplicateActors(DeltaSeconds);
+}
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraph.cpp b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraph.cpp
index 621889f143fe..b54ff5fabbb6 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraph.cpp
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraph.cpp
@@ -8,21 +8,7 @@
  *
  * TODO Missing Features:
  *	-bNetTemporary
- *	
- *	 
- * TODO Refactors/cleanup:	 
- *	-Packet Budget: simplify or possibly remove. Maybe split into two concepts: a bitmask for filtering what gets pulled out of the graph and how traffic is tracked as it is sent.
- *
- *	-FActorRepList/FPrioritizedRepList/FActorRepListRefView: Probably can be replaced with regular TArrays/TArrayViews. The original problem these were solving were having lots of little
- *	lists that needed to be packed and ref counted. Neither is really needed anymore.
- *	
- *	
- * TODO Optimizations:	
- *	-Need to store stable pointers to FReplicationActorInfo/FGlobalActorReplicationInfo. See FPrioritizedRepList::GlobalData/ConnectionData. Want to make it so these are only ever looked up once per frame at most.
- *	 	
- *
- *	 	
- *	 	
+ * 	 	
  *	--------------------------------
  *	
  *	Game Code API
@@ -80,7 +66,7 @@ float CVar_RepGraph_FixedBudget = 0;
 static FAutoConsoleVariableRef CVarRepGraphFixedBudge(TEXT("Net.RepGraph.FixedBudget"), CVar_RepGraph_FixedBudget, TEXT("Set fixed (independent of frame rate) packet budget. In BIts/frame"), ECVF_Default );
 
 int32 CVar_RepGraph_SkipDistanceCull = 0;
-static FAutoConsoleVariableRef CVarRepGraphSkipDistanceCull(TEXT("Net.RepGraph.Skip Distance Cull"), CVar_RepGraph_SkipDistanceCull, TEXT(""), ECVF_Default );
+static FAutoConsoleVariableRef CVarRepGraphSkipDistanceCull(TEXT("Net.RepGraph.SkipDistanceCull"), CVar_RepGraph_SkipDistanceCull, TEXT(""), ECVF_Default );
 
 int32 CVar_RepGraph_PrintCulledOnConnectionClasses = 0;
 static FAutoConsoleVariableRef CVarRepGraphPrintCulledOnConnectionClasses(TEXT("Net.RepGraph.PrintCulledOnConnectionClasses"), CVar_RepGraph_PrintCulledOnConnectionClasses, TEXT(""), ECVF_Default );
@@ -299,19 +285,19 @@ void UReplicationGraph::SetWorld(UWorld* InWorld)
 
 	if (InWorld)
 	{
-		if (InWorld->AreActorsInitialized())
-		{
-			InitializeForWorld(InWorld);
-		}
-		else
-		{
-			// World isn't initialized yet. This happens when launching into a map directly from command line
-			InWorld->OnActorsInitialized.AddLambda([&](const UWorld::FActorsInitializedParams& P)
-			{
-				this->InitializeForWorld(P.World);
-			});
-		}
+	if (InWorld->AreActorsInitialized())
+	{
+		InitializeForWorld(InWorld);
 	}
+	else
+	{
+		// World isn't initialized yet. This happens when launching into a map directly from command line
+		InWorld->OnActorsInitialized.AddLambda([&](const UWorld::FActorsInitializedParams& P)
+		{
+			this->InitializeForWorld(P.World);
+		});
+	}
+}
 }
 
 void UReplicationGraph::InitializeForWorld(UWorld* World)
@@ -605,42 +591,6 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 
 		const bool bEnableFullActorPrioritzationDetails = DO_REPGRAPH_DETAILS(bEnableFullActorPrioritizationDetailsAllConnections || ConnectionManager->bEnableFullActorPrioritizationDetails);
 
-		// ------------------------------------------------------------------------------------------
-		// FIXME: Packet budget is probably not necessary at this time. This should be simplified/removed.
-		// 
-		// Setup Packet Budget. This will determine:
-		//	1) What actor lists we will pull from the graph
-		//  2) How much data we allow each list to write to the send buffer before bailing
-		// ------------------------------------------------------------------------------------------
-
-		// Temp: legacy/dynamic budget based on queuedBits
-		static FPacketBudget LegacyBudget;
-		LegacyBudget.BudgetItems.Reset();
-
-		if (CVar_RepGraph_FixedBudget > 0.f)
-		{
-			LegacyBudget.AddBudgetForCategory( MAX_uint32, -CVar_RepGraph_FixedBudget );
-		}
-		else
-		{
-			LegacyBudget.AddBudgetForCategory( MAX_uint32, -NetConnection->QueuedBits );
-		}
-		
-		LegacyBudget.Finalize();
-
-		// PacketBudget defines our target sizes for various categories of replication lists
-		FPacketBudget& PacketBudget =  CVar_RepGraph_UseLegacyBudget ? LegacyBudget : GetPacketBudgetForConnection(ConnectionManager, FrameNum);
-		repCheckf(PacketBudget.BudgetItems.Num() > 0, TEXT("PacketBudget has no entries, cannot replicate actors without a budget."));
-
-		// This will track our packet budget as we fill up the packet
-		FPacketBudgetTracker PacketBudgetTracker(PacketBudget);
-
-		// Setup output for packet budget recording (this would be for logging/profiling).
-		if (FPacketBudgetRecordBuffer* PacketBudgetRecord = ConnectionManager->PacketRecordBuffer)
-		{
-			PacketBudgetTracker.SetOutputRecord(PacketBudgetRecord->GetNextWriteRecord(PacketBudget));
-		}
-
 		// --------------------------------------------------------------------------------------------------------------
 		// GATHER list of ReplicationLists for this connection
 		// --------------------------------------------------------------------------------------------------------------
@@ -651,7 +601,7 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 
 		GatheredReplicationListsForConnection.Reset();
 
-		const FConnectionGatherActorListParameters Parameters(Viewer, *ConnectionManager, NetConnection->ClientVisibleLevelNames, PacketBudget, FrameNum, GatheredReplicationListsForConnection);
+		const FConnectionGatherActorListParameters Parameters(Viewer, *ConnectionManager, NetConnection->ClientVisibleLevelNames, FrameNum, GatheredReplicationListsForConnection);
 
 		int32 NumGatheredListsOnConnection = 0;
 		int32 NumGatheredActorsOnConnection = 0;
@@ -660,9 +610,6 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 		{
 			RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_GatherForConnection);
 
-			// Push default list category. Any nodes that don't specify a category will fallback to this
-			Parameters.AttemptPushListCategory(DefaultReplicationListCategory);
-
 			for (UReplicationGraphNode* Node : GlobalGraphNodes)
 			{
 				Node->GatherActorListsForConnection(Parameters);
@@ -690,155 +637,145 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 			// We will make a prioritized list for each item in the packet budget. (Each item may accept multiple categories. Each list has one category)
 			// This means, depending on the packet budget, a gathered list could end up in multiple prioritized lists. This would not be desirable in most cases but is not explicitly forbidden.
 
-			PrioritizedReplicationLists.Reset();
-			for (const FPacketBudget::FItem& BudgetItem : PacketBudget.BudgetItems)
-			{
-				const FReplicationListCategoryMask BudgetCategory = BudgetItem.ListCategory;
-				FPrioritizedRepList* PrioritizedList = new (PrioritizedReplicationLists) FPrioritizedRepList(BudgetCategory);
+			PrioritizedReplicationList.Reset();				
+			TArray<FPrioritizedRepList::FItem>* SortingArray = &PrioritizedReplicationList.Items;
+
+			NumGatheredListsOnConnection += GatheredReplicationListsForConnection.Num();
 				
-				TArray<FPrioritizedRepList::FItem>* SortingArray = &PrioritizedList->Items; // FIXME: Items is a TArray and this will cause memory allocations
+			const float MaxDistanceScaling = PrioritizationConstants.MaxDistanceScaling;
+			const uint32 MaxFramesSinceLastRep = PrioritizationConstants.MaxFramesSinceLastRep;
 
-				NumGatheredListsOnConnection += GatheredReplicationListsForConnection.Num();
-
-				for (FActorRepListRawView& List : GatheredReplicationListsForConnection)
+			for (FActorRepListRawView& List : GatheredReplicationListsForConnection)
+			{
+				// Add actors from gathered list
+				NumGatheredActorsOnConnection += List.Num();
+				for (AActor* Actor : List)
 				{
-					if ((List.Category & BudgetCategory) > 0)
+					RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop);
+
+					// -----------------------------------------------------------------------------------------------------------------
+					//	Prioritize Actor for Connection: this is the main block of code for calculating a final score for this actor
+					//		-This is still pretty rough. It would be nice if this was customizable per project without suffering virtual calls.
+					// -----------------------------------------------------------------------------------------------------------------
+
+					FConnectionReplicationActorInfo& ConnectionData = ConnectionActorInfoMap.FindOrAdd(Actor);
+
+					RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_ConnGlobalLookUp);
+
+					// Skip if dormant on this connection. We want this to always be the first/quickest check.
+					if (ConnectionData.bDormantOnConnection)
 					{
-						// Add actors from gathered list
-						NumGatheredActorsOnConnection += List.Num();
-						for (AActor* Actor : List)
+						DO_REPGRAPH_DETAILS(PrioritizedReplicationList.GetNextSkippedDebugDetails(Actor)->bWasDormant = true);
+						if (bCulledOnConnectionCount)
 						{
-							RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop);
+							DormancyClassAccumulator.Increment(Actor->GetClass());
+						}
+						continue;
+					}
 
-							// -----------------------------------------------------------------------------------------------------------------
-							//	Prioritize Actor for Connection: this is the main block of code for calculating a final score for this actor
-							//		-This is still pretty rough. It would be nice if this was customizable per project without suffering virtual calls.
-							// -----------------------------------------------------------------------------------------------------------------
+					FGlobalActorReplicationInfo& GlobalData = GlobalActorReplicationInfoMap.Get(Actor);
 
-							FConnectionReplicationActorInfo& ConnectionData = ConnectionActorInfoMap.FindOrAdd(Actor);
+					RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostGlobalLookUp);
 
-							RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_ConnGlobalLookUp);
+					// Skip if its not time to replicate on this connection yet. We have to look at ForceNetUpdateFrame here. It would be possible to clear
+					// NextReplicationFrameNum on all connections when ForceNetUpdate is called. This probably means more work overall per frame though. Something to consider.
+					if (!ReadyForNextReplication(ConnectionData, GlobalData, FrameNum))
+					{
+						DO_REPGRAPH_DETAILS(PrioritizedReplicationList.GetNextSkippedDebugDetails(Actor)->FramesTillNextReplication = (FrameNum - ConnectionData.LastRepFrameNum));
+						continue;
+					}
 
-							// Skip if dormant on this connection. We want this to always be the first/quickest check.
-							if (ConnectionData.bDormantOnConnection)
-							{
-								DO_REPGRAPH_DETAILS(PrioritizedList->GetNextSkippedDebugDetails(Actor)->bWasDormant = true);
-								if (bCulledOnConnectionCount)
-								{
-									DormancyClassAccumulator.Increment(Actor->GetClass());
-								}
-								continue;
-							}
-
-							FGlobalActorReplicationInfo& GlobalData = GlobalActorReplicationInfoMap.Get(Actor);
-
-							RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostGlobalLookUp);
-
-							// Skip if its not time to replicate on this connection yet. We have to look at ForceNetUpdateFrame here. It would be possible to clear
-							// NextReplicationFrameNum on all connections when ForceNetUpdate is called. This probably means more work overall per frame though. Something to consider.
-							if (!ReadyForNextReplication(ConnectionData, GlobalData, FrameNum))
-							{
-								DO_REPGRAPH_DETAILS(PrioritizedList->GetNextSkippedDebugDetails(Actor)->FramesTillNextReplication = (FrameNum - ConnectionData.LastRepFrameNum));
-								continue;
-							}
-
-							RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostReady);
+					RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostReady);
 							
-							// Output record for full debugging. This is not used in the actual sorting/prioritization of the list, just for logging/debugging purposes
-							FPrioritizedActorFullDebugDetails* DebugDetails = nullptr;
-							if (DO_REPGRAPH_DETAILS(UNLIKELY(bEnableFullActorPrioritzationDetails)))
+					// Output record for full debugging. This is not used in the actual sorting/prioritization of the list, just for logging/debugging purposes
+					FPrioritizedActorFullDebugDetails* DebugDetails = nullptr;
+					if (DO_REPGRAPH_DETAILS(UNLIKELY(bEnableFullActorPrioritzationDetails)))
+					{
+						DO_REPGRAPH_DETAILS(DebugDetails = PrioritizedReplicationList.GetNextFullDebugDetails(Actor));
+					}
+
+					float AccumulatedPriority = 0.f;
+
+					// -------------------
+					// Distance Scaling
+					// -------------------
+					if (GlobalData.Settings.DistancePriorityScale > 0.f)
+					{
+						const float DistSq = (GlobalData.WorldLocation - ConnectionViewLocation).SizeSquared();
+
+						if (bDistanceCull && ConnectionData.CullDistanceSquared > 0.f && DistSq > ConnectionData.CullDistanceSquared)
+						{
+							DO_REPGRAPH_DETAILS(PrioritizedReplicationList.GetNextSkippedDebugDetails(Actor)->DistanceCulled = FMath::Sqrt(DistSq));
+							if (bCulledOnConnectionCount)
 							{
-								DO_REPGRAPH_DETAILS(DebugDetails = PrioritizedList->GetNextFullDebugDetails(Actor));
+								DistanceClassAccumulator.Increment(Actor->GetClass());
 							}
+							continue;
+						}
 
-							float AccumulatedPriority = 0.f;
-
-							// -------------------
-							// Distance Scaling
-							// -------------------
-							if (GlobalData.Settings.DistancePriorityScale > 0.f)
-							{
-								const float MaxThreshold = 3000.f * 3000.f;
-								const float DistSq = (GlobalData.WorldLocation - ConnectionViewLocation).SizeSquared();
-
-								if (bDistanceCull && ConnectionData.CullDistanceSquared > 0.f && DistSq > ConnectionData.CullDistanceSquared)
-								{
-									DO_REPGRAPH_DETAILS(PrioritizedList->GetNextSkippedDebugDetails(Actor)->DistanceCulled = FMath::Sqrt(DistSq));
-									if (bCulledOnConnectionCount)
-									{
-										DistanceClassAccumulator.Increment(Actor->GetClass());
-									}
-									continue;
-								}
-
-								const float DistanceFactor = FMath::Clamp<float>( (DistSq) / MaxThreshold, 0.f, 1.f) * GlobalData.Settings.DistancePriorityScale;
-								AccumulatedPriority += DistanceFactor;
+						const float DistanceFactor = FMath::Clamp<float>( (DistSq) / MaxDistanceScaling, 0.f, 1.f) * GlobalData.Settings.DistancePriorityScale;
+						AccumulatedPriority += DistanceFactor;
 								
-								if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
-								{
-									DebugDetails->DistanceSq = DistSq;
-									DebugDetails->DistanceFactor = DistanceFactor;
-								}
-							}
-
-							RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostCull);
-
-							// Update the timeout frame number here. (Since this was returned by the graph, regardless if we end up replicating or not, we bump up the timeout frame num. This has to be done here because Distance Scaling can cull the actor
-							UpdateActorChannelCloseFrameNum(ConnectionData, GlobalData, FrameNum);
-
-							//UE_CLOG(DebugConnection, LogReplicationGraph, Display, TEXT("0x%X0x%X ConnectionData.ActorChannelCloseFrameNum=%d on %d"), Actor, NetConnection, ConnectionData.ActorChannelCloseFrameNum, FrameNum);
-
-							// -------------------
-							// Starvation Scaling
-							// -------------------
-							if (GlobalData.Settings.StarvationPriorityScale > 0.f)
-							{
-								// FIXME: Constant/Magic Num
-								const uint32 MaxFramesSinceLastRep = 20;
-								const uint32 FramesSinceLastRep = (FrameNum - ConnectionData.LastRepFrameNum);
-
-								const float StarvationFactor = 1.f - FMath::Clamp<float>((float)FramesSinceLastRep / (float)MaxFramesSinceLastRep, 0.f, 1.f);
-
-								AccumulatedPriority += StarvationFactor;
-
-								if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
-								{
-									DebugDetails->FramesSinceLastRap = FramesSinceLastRep;
-									DebugDetails->StarvationFactor = StarvationFactor;
-								}
-							}
-
-							// -------------------
-							//	Game code priority
-							// -------------------
-							
-							if (GlobalData.ForceNetUpdateFrame > 0)
-							{
-								uint32 ForceNetUpdateDelta = GlobalData.ForceNetUpdateFrame - ConnectionData.LastRepFrameNum;
-								if ( ForceNetUpdateDelta > 0 )
-								{
-									// Note that in legacy ForceNetUpdate did not actually bump priority. This gives us a hard coded bump if we haven't replicated since the last ForceNetUpdate frame.
-									AccumulatedPriority += 1.f;
-
-									if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
-									{
-										DebugDetails->GameCodeScaling = 1.f;
-									}
-								}
-							}
-							
-							SortingArray->Emplace(FPrioritizedRepList::FItem(AccumulatedPriority, Actor /*, &GlobalData, &ConnectionData*/ ));
+						if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
+						{
+							DebugDetails->DistanceSq = DistSq;
+							DebugDetails->DistanceFactor = DistanceFactor;
 						}
 					}
-				}
 
-				{
-					// Sort the merged priority list. We could potentially move this into the replicate loop below, this could potentially save use from sorting arrays that don't fit into the budget
-					RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_PrioritizeForConnection_Sort);
-					NumPrioritizedActorsOnConnection += SortingArray->Num();
-					SortingArray->Sort();
+					RG_QUICK_SCOPE_CYCLE_COUNTER(Prioritize_InnerLoop_PostCull);
+
+					// Update the timeout frame number here. (Since this was returned by the graph, regardless if we end up replicating or not, we bump up the timeout frame num. This has to be done here because Distance Scaling can cull the actor
+					UpdateActorChannelCloseFrameNum(ConnectionData, GlobalData, FrameNum);
+
+					//UE_CLOG(DebugConnection, LogReplicationGraph, Display, TEXT("0x%X0x%X ConnectionData.ActorChannelCloseFrameNum=%d on %d"), Actor, NetConnection, ConnectionData.ActorChannelCloseFrameNum, FrameNum);
+
+					// -------------------
+					// Starvation Scaling
+					// -------------------
+					if (GlobalData.Settings.StarvationPriorityScale > 0.f)
+					{
+						const uint32 FramesSinceLastRep = (FrameNum - ConnectionData.LastRepFrameNum);
+						const float StarvationFactor = 1.f - FMath::Clamp<float>((float)FramesSinceLastRep / (float)MaxFramesSinceLastRep, 0.f, 1.f);
+
+						AccumulatedPriority += StarvationFactor;
+
+						if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
+						{
+							DebugDetails->FramesSinceLastRap = FramesSinceLastRep;
+							DebugDetails->StarvationFactor = StarvationFactor;
+						}
+					}
+
+					// -------------------
+					//	Game code priority
+					// -------------------
+							
+					if (GlobalData.ForceNetUpdateFrame > 0)
+					{
+						uint32 ForceNetUpdateDelta = GlobalData.ForceNetUpdateFrame - ConnectionData.LastRepFrameNum;
+						if ( ForceNetUpdateDelta > 0 )
+						{
+							// Note that in legacy ForceNetUpdate did not actually bump priority. This gives us a hard coded bump if we haven't replicated since the last ForceNetUpdate frame.
+							AccumulatedPriority += 1.f;
+
+							if (DO_REPGRAPH_DETAILS(UNLIKELY(DebugDetails)))
+							{
+								DebugDetails->GameCodeScaling = 1.f;
+							}
+						}
+					}
+							
+					SortingArray->Emplace(FPrioritizedRepList::FItem(AccumulatedPriority, Actor, &GlobalData, &ConnectionData ));
 				}
 			}
+
+			{
+				// Sort the merged priority list. We could potentially move this into the replicate loop below, this could potentially save use from sorting arrays that don't fit into the budget
+				RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_PrioritizeForConnection_Sort);
+				NumPrioritizedActorsOnConnection += SortingArray->Num();
+				SortingArray->Sort();
+			}
 		}
 
 		// --------------------------------------------------------------------------------------------------------------
@@ -847,57 +784,35 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 		{
 			RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_ReplicateActorsForConnection);
 
-			int32 ListIdx=0;
-			for (; ListIdx < PrioritizedReplicationLists.Num(); ++ListIdx)
+			for (int32 ActorIdx=0; ActorIdx < PrioritizedReplicationList.Items.Num(); ++ActorIdx)
 			{
-				const FPrioritizedRepList& List = PrioritizedReplicationLists[ListIdx];
-				
-				// Tell packet budget tracker where these bits should be tracked
-				PacketBudgetTracker.SetBudgetItemIndex(ListIdx);
-				
-				for (int32 ActorIdx=0; ActorIdx < List.Items.Num(); ++ActorIdx)
+				const FPrioritizedRepList::FItem& RepItem = PrioritizedReplicationList.Items[ActorIdx];
+
+				AActor* Actor = RepItem.Actor;
+				FConnectionReplicationActorInfo& ActorInfo = *RepItem.ConnectionData;
+
+				// Always skip if we've already replicated this frame. This happens if an actor is in more than one replication list
+				if (ActorInfo.LastRepFrameNum == FrameNum)
 				{
-					const FPrioritizedRepList::FItem& RepItem = List.Items[ActorIdx];
-
-					AActor* Actor = RepItem.Actor;
-					FConnectionReplicationActorInfo& ActorInfo = ConnectionActorInfoMap.FindOrAdd(Actor); // FIXME: !!! *RepItem.ConnectionData;
-
-					// Always skip if we've already replicated this frame. This happens if an actor is in more than one replication list
-					if (ActorInfo.LastRepFrameNum == FrameNum)
-					{
-						INC_DWORD_STAT_BY( STAT_NetRepActorListDupes, 1 );
-						continue;
-					}
-
-					FGlobalActorReplicationInfo& GlobalActorInfo = GlobalActorReplicationInfoMap.Get(Actor);// FIXME *RepItem.GlobalData;
-
-					int64 BitsWritten = ReplicateSingleActor(Actor, ActorInfo, GlobalActorInfo, ConnectionActorInfoMap, NetConnection, FrameNum);
-
-					// --------------------------------------------------
-					//	Update Packet Budget Tracking
-					// --------------------------------------------------
-					
-					if (PacketBudgetTracker.TrackSentBits(BitsWritten) == false || IsConnectionReady(NetConnection) == false)
-					{
-						// We've exceeded the budget for this category of replication list.
-						RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_PartialStarvedActorList);
-						HandleStarvedActorList(List, ActorIdx+1, ConnectionActorInfoMap, FrameNum);
-						GNumSaturatedConnections++;
-						break;
-					}
+					INC_DWORD_STAT_BY( STAT_NetRepActorListDupes, 1 );
+					continue;
 				}
-			}
 
-			// ------------------------------------------
-			// Handle starved lists that we didn't get to
-			// ------------------------------------------
-			{
-				
-				RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_StarvedActorLists);
-				for (; ListIdx < PrioritizedReplicationLists.Num(); ++ListIdx)
+				FGlobalActorReplicationInfo& GlobalActorInfo = *RepItem.GlobalData;
+
+				int64 BitsWritten = ReplicateSingleActor(Actor, ActorInfo, GlobalActorInfo, ConnectionActorInfoMap, NetConnection, FrameNum);
+
+				// --------------------------------------------------
+				//	Update Packet Budget Tracking
+				// --------------------------------------------------
+					
+				if (IsConnectionReady(NetConnection) == false)
 				{
-					const FPrioritizedRepList& List = PrioritizedReplicationLists[ListIdx];
-					HandleStarvedActorList(List, 0, ConnectionActorInfoMap, FrameNum);
+					// We've exceeded the budget for this category of replication list.
+					RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_PartialStarvedActorList);
+					HandleStarvedActorList(PrioritizedReplicationList, ActorIdx+1, ConnectionActorInfoMap, FrameNum);
+					GNumSaturatedConnections++;
+					break;
 				}
 			}
 
@@ -910,7 +825,7 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 
 				for (auto MapIt = ConnectionActorInfoMap.CreateIterator(); MapIt; ++MapIt)
 				{
-					FConnectionReplicationActorInfo& ConnectionActorInfo = MapIt.Value();
+					FConnectionReplicationActorInfo& ConnectionActorInfo = *MapIt.Value().Get();
 					if (ConnectionActorInfo.Channel != nullptr && ConnectionActorInfo.ActorChannelCloseFrameNum > 0 && ConnectionActorInfo.ActorChannelCloseFrameNum <= FrameNum) //ConnectionActorInfo.StarvedFrameNum == 0 && ConnectionActorInfo.LastRepFrameNum < TimeOutFrame && )
 					{
 						AActor* Actor = MapIt.Key();
@@ -922,7 +837,7 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 						//UE_CLOG(DebugConnection, LogReplicationGraph, Display, TEXT("Closing Actor Channel:0x%x 0x%X0x%X, %s %d <= %d"), ConnectionActorInfo.Channel, Actor, NetConnection, *GetNameSafe(ConnectionActorInfo.Channel->Actor), ConnectionActorInfo.ActorChannelCloseFrameNum, FrameNum);
 
 						INC_DWORD_STAT_BY( STAT_NetActorChannelsClosed, 1 );
-						PacketBudgetTracker.TrackActorChannelCloseBits( ConnectionActorInfo.Channel->Close() );
+						ConnectionActorInfo.Channel->Close();
 					}
 				}
 			}
@@ -932,7 +847,7 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 			// ------------------------------------------
 			{
 				RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_ReplicateDestructionInfos);
-				PacketBudgetTracker.TrackDestructionInfoBits( ConnectionManager->ReplicateDestructionInfos(ConnectionViewLocation, DestructInfoMaxDistanceSquared) );
+				ConnectionManager->ReplicateDestructionInfos(ConnectionViewLocation, DestructInfoMaxDistanceSquared);
 			}
 
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
@@ -948,7 +863,7 @@ int32 UReplicationGraph::ServerReplicateActors(float DeltaSeconds)
 #endif
 
 			// Broadcast the list we just handled. This is intended to be for debugging/logging features.
-			ConnectionManager->OnPostReplicatePrioritizeLists.Broadcast( ConnectionManager, TArrayView<FPrioritizedRepList>(PrioritizedReplicationLists.GetData(), PrioritizedReplicationLists.Num()) );
+			ConnectionManager->OnPostReplicatePrioritizeLists.Broadcast( ConnectionManager, &PrioritizedReplicationList);
 
 			if (bCulledOnConnectionCount)
 			{
@@ -991,10 +906,7 @@ int64 UReplicationGraph::ReplicateSingleActor(AActor* Actor, FConnectionReplicat
 	ActorInfo.StarvedFrameNum = 0;
 	ActorInfo.NextReplicationFrameNum = FrameNum + ActorInfo.ReplicationPeriodFrame;
 
-	// -------------------------------------------
-	// FIXME: Call PreReplication if necessary. It kind of sucks to have an additional TMap lookup inside this loop, but hard to know otherwise what actors need it called.
-	// Lots of crappy code in ::PreReplication, but its probably unavoidable right now. This is still probably better than legacy calling it on every actor every tick that might replicate.
-	// -------------------------------------------
+	/** Call PreReplication if necessary. */
 	if (GlobalActorInfo.LastPreReplicationFrame != FrameNum)
 	{
 		RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_CallPreReplication);
@@ -1062,7 +974,7 @@ int64 UReplicationGraph::ReplicateSingleActor(AActor* Actor, FConnectionReplicat
 	{
 		RG_QUICK_SCOPE_CYCLE_COUNTER(NET_ReplicateActors_DependentActors);
 
-		const int32 CloseFrameNum = ActorInfo.ActorChannelCloseFrameNum; // cache this off since subsequent calls to FindOrAdd will invalidate ActorInfo.
+		const int32 CloseFrameNum = ActorInfo.ActorChannelCloseFrameNum;
 
 		for (AActor* DependentActor : DependentActorList)
 		{
@@ -1091,9 +1003,8 @@ void UReplicationGraph::HandleStarvedActorList(const FPrioritizedRepList& List,
 {
 	for (int32 ActorIdx=StartIdx; ActorIdx < List.Items.Num(); ++ActorIdx)
 	{
-		// FIXME[: we are looking up ConnectionActorInfoMap even though this could be stored in FPrioritizedRepList::FItem if the pointers were stable.
 		const FPrioritizedRepList::FItem& RepItem = List.Items[ActorIdx];
-		FConnectionReplicationActorInfo& ActorInfo = ConnectionActorInfoMap.FindOrAdd(RepItem.Actor); // FIXME: !!! *RepItem.ConnectionData;
+		FConnectionReplicationActorInfo& ActorInfo = *RepItem.ConnectionData;
 		
 		// Only update starve frame if not already starved (we want to use this to measure "how long have you been starved for")
 		if (ActorInfo.StarvedFrameNum == 0)
@@ -1107,7 +1018,7 @@ void UReplicationGraph::HandleStarvedActorList(const FPrioritizedRepList& List,
 		
 		if (DependentActorList.IsValid())
 		{
-			const uint32 CloseFrameNum = ActorInfo.ActorChannelCloseFrameNum; // cache this off since subsequent calls to FindOrAdd will invalidate ActorInfo.
+			const uint32 CloseFrameNum = ActorInfo.ActorChannelCloseFrameNum;
 			for (AActor* DependentActor : DependentActorList)
 			{
 				FConnectionReplicationActorInfo& DependentActorConnectionInfo = ConnectionActorInfoMap.FindOrAdd(DependentActor);
@@ -1325,13 +1236,15 @@ void UNetReplicationGraphConnection::NotifyActorChannelCleanedUp(UActorChannel*
 		// Also, the actor may be destroyed and garbage collected before this point.
 		for (auto It = ActorInfoMap.CreateIterator(); It; ++It)
 		{
-			if (It->Value.Channel == Channel)
+			FConnectionReplicationActorInfo& ActorInfo = *It->Value.Get();
+
+			if (ActorInfo.Channel == Channel)
 			{
 				if (Channel->Dormant)
 				{
 					// If the actor is just going dormant, clear the channel reference but leave the ActorInfo
 					// so that the graph can continue to track it.
-					It->Value.Channel = nullptr;
+					ActorInfo.Channel = nullptr;
 				}
 				else
 				{
@@ -1439,6 +1352,10 @@ void UNetReplicationGraphConnection::NotifyClientVisibleLevelNamesAdd(FName Leve
 	}
 
 	OnClientVisibleLevelNameAdd.Broadcast(LevelName, StreamingWorld);
+	if (FOnClientVisibleLevelNamesAdd* MapDelegate = OnClientVisibleLevelNameAddMap.Find(LevelName))
+	{
+		MapDelegate->Broadcast(LevelName, StreamingWorld);
+	}
 
 }
 
@@ -1517,16 +1434,17 @@ void FStreamingLevelActorListCollection::AddActor(const FNewReplicatedActorInfo&
 		ensureMsgf(Item->ReplicationActorList.Contains(ActorInfo.Actor) == false, TEXT("%s being added to %s twice! Streaming level: %s"), *GetActorRepListTypeDebugString(ActorInfo.Actor), *ActorInfo.StreamingLevelName.ToString() );
 	}
 	Item->ReplicationActorList.Add(ActorInfo.Actor);
-
 }
 
-void FStreamingLevelActorListCollection::RemoveActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound, UReplicationGraphNode* Outer)
+bool FStreamingLevelActorListCollection::RemoveActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound, UReplicationGraphNode* Outer)
 {
+	bool bRemovedSomething = false;
 	for (FStreamingLevelActors& StreamingList : StreamingLevelLists)
 	{
 		if (StreamingList.StreamingLevelName == ActorInfo.StreamingLevelName)
 		{
-			if (!StreamingList.ReplicationActorList.Remove(ActorInfo.Actor) && bWarnIfNotFound)
+			bRemovedSomething = StreamingList.ReplicationActorList.Remove(ActorInfo.Actor);
+			if (!bRemovedSomething && bWarnIfNotFound)
 			{
 				UE_LOG(LogReplicationGraph, Warning, TEXT("Attempted to remove %s from list %s but it was not found. (StreamingLevelName == %s)"), *GetActorRepListTypeDebugString(ActorInfo.Actor), *GetPathNameSafe(Outer), *ActorInfo.StreamingLevelName.ToString() );
 			}
@@ -1538,6 +1456,7 @@ void FStreamingLevelActorListCollection::RemoveActor(const FNewReplicatedActorIn
 			break;
 		}
 	}
+	return bRemovedSomething;
 }
 
 void FStreamingLevelActorListCollection::Reset()
@@ -1614,10 +1533,12 @@ void UReplicationGraphNode_ActorList::NotifyAddNetworkActor(const FNewReplicated
 	}
 }
 
-void UReplicationGraphNode_ActorList::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
+bool UReplicationGraphNode_ActorList::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
 {
 	UE_CLOG(CVar_RepGraph_LogActorRemove>0, LogReplicationGraph, Display, TEXT("UReplicationGraphNode_ActorList::NotifyRemoveNetworkActor %s on %s."), *ActorInfo.Actor->GetFullName(), *GetPathName());
 
+	bool bRemovedSomething = false;
+
 	if (ActorInfo.StreamingLevelName == NAME_None)
 	{
 		if (!ReplicationActorList.Remove(ActorInfo.Actor) && bWarnIfNotFound)
@@ -1634,6 +1555,8 @@ void UReplicationGraphNode_ActorList::NotifyRemoveNetworkActor(const FNewReplica
 	{
 		StreamingLevelCollection.RemoveActor(ActorInfo, bWarnIfNotFound, this);
 	}
+
+	return bRemovedSomething;
 }
 	
 void UReplicationGraphNode_ActorList::NotifyResetAllNetworkActors()
@@ -1714,10 +1637,11 @@ void UReplicationGraphNode_ActorListFrequencyBuckets::NotifyAddNetworkActor(cons
 	}
 }
 
-void UReplicationGraphNode_ActorListFrequencyBuckets::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
+bool UReplicationGraphNode_ActorListFrequencyBuckets::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
 {
 	UE_CLOG(CVar_RepGraph_LogActorRemove>0, LogReplicationGraph, Display, TEXT("UReplicationGraphNode_ActorListFrequencyBuckets::NotifyRemoveNetworkActor %s on %s."), *ActorInfo.Actor->GetFullName(), *GetPathName());
 
+	bool bRemovedSomething = false;
 	if (ActorInfo.StreamingLevelName == NAME_None)
 	{
 		bool bFound = false;
@@ -1725,13 +1649,14 @@ void UReplicationGraphNode_ActorListFrequencyBuckets::NotifyRemoveNetworkActor(c
 		{
 			if (List.Remove(ActorInfo.Actor))
 			{
+				bRemovedSomething = true;
 				TotalNumNonStreamingActors--;
 				CheckRebalance();
 
 				if (!CVar_RepGraph_Verify)
 				{
 					// Eary out if we dont have to verify
-					return;
+					return bRemovedSomething;
 				}
 
 				if (bFound)
@@ -1752,8 +1677,10 @@ void UReplicationGraphNode_ActorListFrequencyBuckets::NotifyRemoveNetworkActor(c
 	}
 	else
 	{
-		StreamingLevelCollection.RemoveActor(ActorInfo, bWarnIfNotFound, this);
+		bRemovedSomething = StreamingLevelCollection.RemoveActor(ActorInfo, bWarnIfNotFound, this);
 	}
+
+	return bRemovedSomething;
 }
 	
 void UReplicationGraphNode_ActorListFrequencyBuckets::NotifyResetAllNetworkActors()
@@ -1848,7 +1775,7 @@ void UReplicationGraphNode_ActorListFrequencyBuckets::LogNode(FReplicationGraphD
 
 void UReplicationGraphNode_ConnectionDormanyNode::GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params)
 {
-	ConditionalGatherDormantActorsForConnection(ReplicationActorList, Params);
+	ConditionalGatherDormantActorsForConnection(ReplicationActorList, Params, nullptr);
 	
 	for (int32 idx=StreamingLevelCollection.StreamingLevelLists.Num()-1; idx>=0; --idx)
 	{
@@ -1861,7 +1788,14 @@ void UReplicationGraphNode_ConnectionDormanyNode::GatherActorListsForConnection(
 
 		if (Params.CheckClientVisibilityForLevel(StreamingList.StreamingLevelName))
 		{
-			ConditionalGatherDormantActorsForConnection(StreamingList.ReplicationActorList, Params);
+			FStreamingLevelActorListCollection::FStreamingLevelActors* RemoveList = RemovedStreamingLevelActorListCollection.StreamingLevelLists.FindByKey(StreamingList.StreamingLevelName);
+			if (!RemoveList)
+			{
+				RemoveList = new (RemovedStreamingLevelActorListCollection.StreamingLevelLists) FStreamingLevelActorListCollection::FStreamingLevelActors(StreamingList.StreamingLevelName);
+				Params.ConnectionManager.OnClientVisibleLevelNameAddMap.FindOrAdd(StreamingList.StreamingLevelName).AddUObject(this, &UReplicationGraphNode_ConnectionDormanyNode::OnClientVisibleLevelNameAdd);
+			}
+
+			ConditionalGatherDormantActorsForConnection(StreamingList.ReplicationActorList, Params, &RemoveList->ReplicationActorList);
 		}
 		else
 		{
@@ -1870,7 +1804,7 @@ void UReplicationGraphNode_ConnectionDormanyNode::GatherActorListsForConnection(
 	}
 }
 
-void UReplicationGraphNode_ConnectionDormanyNode::ConditionalGatherDormantActorsForConnection(FActorRepListRefView& ConnectionList, const FConnectionGatherActorListParameters& Params)
+void UReplicationGraphNode_ConnectionDormanyNode::ConditionalGatherDormantActorsForConnection(FActorRepListRefView& ConnectionList, const FConnectionGatherActorListParameters& Params, FActorRepListRefView* RemovedList)
 {
 	FPerConnectionActorInfoMap& ConnectionActorInfoMap = Params.ConnectionManager.ActorInfoMap;
 
@@ -1885,6 +1819,12 @@ void UReplicationGraphNode_ConnectionDormanyNode::ConditionalGatherDormantActors
 		{
 			// He can be removed
 			ConnectionList.RemoveAtSwap(idx);
+			if (RemovedList)
+			{
+				RemovedList->PrepareForWrite();
+				RemovedList->Add(Actor);
+			}
+
 			UE_CLOG(CVar_RepGraph_LogNetDormancyDetails > 0, LogReplicationGraph, Display, TEXT("GRAPH_DORMANCY: Actor %s is Dormant on %s. Removing from list. (%d elements left)"), *Actor->GetPathName(), *GetName(), ConnectionList.Num());
 			bShouldTrickle = false; // Dont trickle this frame because we are still encountering dormant actors
 		}
@@ -1944,9 +1884,57 @@ void UReplicationGraphNode_ConnectionDormanyNode::NotifyActorDormancyFlush(FActo
 		{
 			Item->ReplicationActorList.Add(ActorInfo.Actor);
 		}
+
+		// Remove from RemoveList
+		FStreamingLevelActorListCollection::FStreamingLevelActors* RemoveList = RemovedStreamingLevelActorListCollection.StreamingLevelLists.FindByKey(ActorInfo.StreamingLevelName);
+		if (RemoveList)
+		{
+			RemoveList->ReplicationActorList.PrepareForWrite();
+			RemoveList->ReplicationActorList.Remove(Actor);
+		}
 	}
 }
 
+void UReplicationGraphNode_ConnectionDormanyNode::OnClientVisibleLevelNameAdd(FName LevelName, UWorld* World)
+{
+	FStreamingLevelActorListCollection::FStreamingLevelActors* RemoveList = RemovedStreamingLevelActorListCollection.StreamingLevelLists.FindByKey(LevelName);
+	if (!RemoveList)
+	{
+		UE_LOG(LogReplicationGraph, Warning, TEXT(":OnClientVisibleLevelNameAdd called on %s but there is no RemoveList. How did this get bound in the first place?. Level: %s"), *GetPathName(), *LevelName.ToString());
+		return;
+	}
+
+	FStreamingLevelActorListCollection::FStreamingLevelActors* AddList = StreamingLevelCollection.StreamingLevelLists.FindByKey(LevelName);
+	if (!AddList)
+	{
+		AddList = new (StreamingLevelCollection.StreamingLevelLists) FStreamingLevelActorListCollection::FStreamingLevelActors(LevelName);
+	}
+
+	AddList->ReplicationActorList.PrepareForWrite();
+	AddList->ReplicationActorList.CopyContentsFrom(RemoveList->ReplicationActorList);
+
+	RemoveList->ReplicationActorList.PrepareForWrite();
+	RemoveList->ReplicationActorList.Reset();
+}
+
+bool UReplicationGraphNode_ConnectionDormanyNode::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool WarnIfNotFound)
+{
+	// Remove from active list by calling super
+	if (Super::NotifyRemoveNetworkActor(ActorInfo, false))
+	{
+		return true;
+	}
+
+	// Not found in active list. We must check out RemovedActorList
+	return RemovedStreamingLevelActorListCollection.RemoveActor(ActorInfo, WarnIfNotFound, this);
+}
+
+void UReplicationGraphNode_ConnectionDormanyNode::NotifyResetAllNetworkActors()
+{
+	Super::NotifyResetAllNetworkActors();
+	RemovedStreamingLevelActorListCollection.Reset();
+}
+
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
 float UReplicationGraphNode_DormancyNode::MaxZForConnection = WORLD_MAX;
@@ -1955,12 +1943,12 @@ void UReplicationGraphNode_DormancyNode::NotifyResetAllNetworkActors()
 {
 	if (GraphGlobals.IsValid())
 	{
-		// Unregister dormancy callbacks first
-		for (FActorRepListType& Actor : ReplicationActorList)
-		{
+	// Unregister dormancy callbacks first
+	for (FActorRepListType& Actor : ReplicationActorList)
+	{
 			FGlobalActorReplicationInfo& GlobalInfo = GraphGlobals->GlobalActorReplicationInfoMap->Get(Actor);
-			GlobalInfo.Events.DormancyFlush.RemoveAll(this);
-		}
+		GlobalInfo.Events.DormancyFlush.RemoveAll(this);
+	}
 	}
 
 	// Dump our global actor list
@@ -2149,18 +2137,18 @@ void UReplicationGraphNode_GridCell::ConditionalCopyDormantActors(FActorRepListR
 {
 	if (GraphGlobals.IsValid())
 	{
-		for (int32 idx = FromList.Num()-1; idx >= 0; --idx)
-		{
-			FActorRepListType Actor = FromList[idx];
+	for (int32 idx = FromList.Num()-1; idx >= 0; --idx)
+	{
+		FActorRepListType Actor = FromList[idx];
 			FGlobalActorReplicationInfo& GlobalInfo = GraphGlobals->GlobalActorReplicationInfoMap->Get(Actor);
 			if (GlobalInfo.bWantsToBeDormant)
-			{
-				ToNode->NotifyAddNetworkActor(FNewReplicatedActorInfo(Actor));
-				FromList.RemoveAtSwap(idx);
-			}
+		{
+			ToNode->NotifyAddNetworkActor(FNewReplicatedActorInfo(Actor));
+			FromList.RemoveAtSwap(idx);
 		}
 	}
 }
+}
 
 void UReplicationGraphNode_GridCell::OnNetDormancyChange(FActorRepListType Actor, FGlobalActorReplicationInfo& GlobalInfo, ENetDormancy NewValue, ENetDormancy OldValue)
 {
@@ -2241,9 +2229,10 @@ void UReplicationGraphNode_GridSpatialization2D::NotifyAddNetworkActor(const FNe
 	ensureAlwaysMsgf(false, TEXT("UReplicationGraphNode_GridSpatialization2D::NotifyAddNetworkActor should not be called directly"));
 }
 
-void UReplicationGraphNode_GridSpatialization2D::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
+bool UReplicationGraphNode_GridSpatialization2D::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
 {
 	ensureAlwaysMsgf(false, TEXT("UReplicationGraphNode_GridSpatialization2D::NotifyRemoveNetworkActor should not be called directly"));
+	return false;
 }
 
 void UReplicationGraphNode_GridSpatialization2D::AddActor_Dormancy(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& ActorRepInfo)
@@ -2282,14 +2271,14 @@ void UReplicationGraphNode_GridSpatialization2D::RemoveActor_Dormancy(const FNew
 	{
 		FGlobalActorReplicationInfo& ActorRepInfo = GraphGlobals->GlobalActorReplicationInfoMap->Get(ActorInfo.Actor);
 		if (ActorRepInfo.bWantsToBeDormant)
-		{
-			RemoveActorInternal_Static(ActorInfo, ActorRepInfo, true);
-		}
-		else
-		{
-			RemoveActorInternal_Dynamic(ActorInfo);
-		}
+	{
+		RemoveActorInternal_Static(ActorInfo, ActorRepInfo, true);
 	}
+	else
+	{
+		RemoveActorInternal_Dynamic(ActorInfo);
+	}
+}
 }
 
 void UReplicationGraphNode_GridSpatialization2D::AddActorInternal_Dynamic(const FNewReplicatedActorInfo& ActorInfo)
@@ -2373,7 +2362,7 @@ void UReplicationGraphNode_GridSpatialization2D::RemoveActorInternal_Static(cons
 	{
 		Node->RemoveStaticActor(ActorInfo, ActorRepInfo, bWasAddedAsDormantActor);
 	}
-	
+
 	if (CVar_RepGraph_Verify)
 	{
 		// Verify this actor is in no nodes. This is pretty slow!
@@ -3028,78 +3017,6 @@ void UReplicationGraphNode_GridSpatialization2D::NotifyActorCullDistChange(AActo
 	}
 }
 
-
-// -------------------------------------------------------
-
-void UReplicationGraphNode_ClassCategories::NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo)
-{
-	if (UReplicationGraphNode** Node = ActorClassMap.Get(ActorInfo.Class))
-	{
-		(*Node)->NotifyAddNetworkActor(ActorInfo);
-	}
-	else
-	{
-		UE_LOG(LogReplicationGraph, Warning, TEXT("NotifyAddNetworkActor called on unmapped actor class %s. (This actor shouldn't have been passed to this class)"), *GetNameSafe(ActorInfo.Class));
-	}
-}
-	
-void UReplicationGraphNode_ClassCategories::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
-{
-	if (UReplicationGraphNode** Node = ActorClassMap.Get(ActorInfo.Class))
-	{
-		(*Node)->NotifyRemoveNetworkActor(ActorInfo, bWarnIfNotFound);
-	}
-	else
-	{
-		UE_LOG(LogReplicationGraph, Warning, TEXT("NotifyRemoveNetworkActor called on unmapped actor class %s. (This actor shouldn't have been passed to this class)"), *GetNameSafe(ActorInfo.Class));
-	}
-}
-
-void UReplicationGraphNode_ClassCategories::GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params)
-{
-	for (const FCategoryMapping& Item : Categories)
-	{
-		if (Params.AttemptPushListCategory(Item.Category))
-		{
-			Item.Node->GatherActorListsForConnection(Params);
-			Params.PopListCategory();
-		}
-	}
-}
-
-void UReplicationGraphNode_ClassCategories::AddCategory(FReplicationListCategory Category, UClass* ActorClass)
-{
-	repCheckf(Category, TEXT("::AddCategory called with invalid frequency. Values should be >= 1."));
-	ActorClassMap.Set(ActorClass, GetCategoryMapping(Category).Node );
-}
-
-void UReplicationGraphNode_ClassCategories::AddCategory(FReplicationListCategory Category, const TArray<UClass*>& ActorClasses)
-{
-	UReplicationGraphNode* Node = GetCategoryMapping(Category).Node;
-	repCheck(Node);
-	for (UClass* Class : ActorClasses)
-	{
-		ActorClassMap.Set(Class, Node);
-	}
-}
-
-// -------------------------------------------------------
-
-void UReplicationGraphNode_FrequencyLimiter::NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo)
-{
-	
-}
-	
-void UReplicationGraphNode_FrequencyLimiter::NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound)
-{
-	
-}
-
-void UReplicationGraphNode_FrequencyLimiter::GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params)
-{
-	RG_QUICK_SCOPE_CYCLE_COUNTER(UReplicationGraphNode_FrequencyLimiter_GatherActorListsForConnection);
-}
-
 // -------------------------------------------------------
 
 UReplicationGraphNode_AlwaysRelevant::UReplicationGraphNode_AlwaysRelevant()
@@ -3194,15 +3111,43 @@ void UReplicationGraphNode_TearOff_ForConnection::GatherActorListsForConnection(
 
 void UReplicationGraphNode_AlwaysRelevant_ForConnection::GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params)
 {
-	// This is not the ideal implementation. I would like to develop an API for making this a persistent list that is updated only when needed.
-	if (ChildNode == nullptr)
-	{
-		ChildNode = CreateChildNode();
-	}
+	// Call super to add any actors that were explicitly given to use via NotifyAddNetworkActor
+	Super::GatherActorListsForConnection(Params);
 
-	ChildNode->NotifyResetAllNetworkActors();
-	ChildNode->NotifyAddNetworkActor( FNewReplicatedActorInfo(Params.Viewer.InViewer) );
-	ChildNode->NotifyAddNetworkActor( FNewReplicatedActorInfo(Params.Viewer.ViewTarget) );
-	ChildNode->GatherActorListsForConnection(Params);
+	auto UpdateActor = [&](AActor* NewActor, AActor*& LastActor)
+	{
+		if (NewActor != LastActor)
+		{
+			if (NewActor)
+			{
+				// Zero out new actor cull distance
+				Params.ConnectionManager.ActorInfoMap.FindOrAdd(NewActor).CullDistanceSquared = 0.f;
+			}
+			if (LastActor)
+			{
+				// Reset previous actor culldistance
+				FConnectionReplicationActorInfo& ActorInfo = Params.ConnectionManager.ActorInfoMap.FindOrAdd(LastActor);
+				ActorInfo.CullDistanceSquared = GraphGlobals->GlobalActorReplicationInfoMap->Get(LastActor).Settings.CullDistanceSquared;
+			}
+
+			LastActor = NewActor;
+
+		}
+
+		if (NewActor && !ReplicationActorList.Contains(NewActor))
+		{
+			ReplicationActorList.Add(NewActor);
+		}
+	};
+
+	// Reset and rebuild another list that will contains our current viewer/viewtarget
+	ReplicationActorList.Reset();
+	UpdateActor(Params.Viewer.InViewer, LastViewer);
+	UpdateActor(Params.Viewer.ViewTarget, LastViewTarget);
+	
+	if (ReplicationActorList.Num() > 0)
+	{
+		Params.OutGatheredReplicationLists.AddReplicationActorList(ReplicationActorList);
+	}
 }
 
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphDebugging.cpp b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphDebugging.cpp
index 6e60410aa703..5686a7184051 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphDebugging.cpp
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphDebugging.cpp
@@ -82,7 +82,7 @@ void AReplicationGraphDebugActor::ServerStartDebugging_Implementation()
 		if (GridNode)
 		{
 			break;
-		}
+	}
 	}
 
 	if (GridNode == nullptr)
@@ -173,7 +173,13 @@ void AReplicationGraphDebugActor::PrintCullDistances()
 	for (auto It = ReplicationGraph->GlobalActorReplicationInfoMap.CreateActorMapIterator(); It; ++It)
 	{
 		AActor* Actor = It.Key();
-		FGlobalActorReplicationInfo& Info = It.Value();
+		TUniquePtr<FGlobalActorReplicationInfo>& InfoPtr = It.Value();
+		if (!InfoPtr || InfoPtr.Get() == nullptr)
+		{
+			continue;
+		}
+
+		FGlobalActorReplicationInfo& Info = *InfoPtr.Get();
 
 		bool bFound = false;
 		for (FData& ExistingData : DataList)
@@ -256,7 +262,7 @@ void AReplicationGraphDebugActor::PrintAllActorInfo(FString MatchString)
 		}
 
 		UClass* ParentClass = Class;
-		while(ParentClass && !ParentClass->IsNative() && ParentClass->GetSuperClass() && ParentClass->GetSuperClass() != AActor::StaticClass())
+		while (ParentClass && !ParentClass->IsNative() && ParentClass->GetSuperClass() && ParentClass->GetSuperClass() != AActor::StaticClass())
 		{
 			ParentClass = ParentClass->GetSuperClass();
 		}
@@ -293,6 +299,12 @@ void AReplicationGraphDebugActor::PrintAllActorInfo(FString MatchString)
 			Info->LogDebugString(*GLog);
 		}
 	}
+
+	GLog->Logf(TEXT(""));
+	GLog->Logf(TEXT("sizeof(FGlobalActorReplicationInfo): %d"), sizeof(FGlobalActorReplicationInfo));
+	GLog->Logf(TEXT("sizeof(FConnectionReplicationActorInfo): %d"), sizeof(FConnectionReplicationActorInfo));
+	GLog->Logf(TEXT("Total GlobalActorReplicationInfoMap Num/Size (Unfiltered): %d elements / %d bytes"), ReplicationGraph->GlobalActorReplicationInfoMap.Num(), ReplicationGraph->GlobalActorReplicationInfoMap.Num() * sizeof(FGlobalActorReplicationInfo) );
+	GLog->Logf(TEXT("Total PerConnectionActorInfoMap Num/Size (Unfiltered, for this connection only): %d elements / %d bytes"), ConnectionManager->ActorInfoMap.Num(), ConnectionManager->ActorInfoMap.Num() * sizeof(FConnectionReplicationActorInfo) );
 }
 
 FAutoConsoleCommandWithWorldAndArgs NetRepGraphPrintAllActorInfoCmd(TEXT("Net.RepGraph.PrintAllActorInfo"),TEXT(""),
@@ -329,7 +341,7 @@ void AReplicationGraphDebugActor::ServerCellInfo_Implementation()
 		if (GridNode)
 		{
 			break;
-		}
+	}
 	}
 
 	if (GridNode == nullptr)
@@ -390,6 +402,74 @@ FAutoConsoleCommandWithWorldAndArgs NetRepGraphCellInfo(TEXT("Net.RepGraph.Spati
 	})
 );
 
+// -------------------------------------------------------------
+
+bool AReplicationGraphDebugActor::ServerSetCullDistanceForClass_Validate(UClass* Class, float CullDistance)
+{
+	return true;
+}
+
+void AReplicationGraphDebugActor::ServerSetCullDistanceForClass_Implementation(UClass* Class, float CullDistance)
+{
+	if (!Class)
+	{
+		UE_LOG(LogReplicationGraph, Display, TEXT("Invalid Class"));
+		return;
+	}
+
+	const float CullDistSq = CullDistance;
+
+	FClassReplicationInfo& ClassInfo = ReplicationGraph->GlobalActorReplicationInfoMap.GetClassInfo(Class);
+	ClassInfo.CullDistanceSquared = CullDistSq;
+	UE_LOG(LogReplicationGraph, Display, TEXT("Setting cull distance for class %s to %.2f"), *Class->GetName(), CullDistance);
+
+	for (TActorIterator<AActor> ActorIt(GetWorld(), Class); ActorIt; ++ActorIt)
+	{
+		AActor* Actor = *ActorIt;
+		if (FGlobalActorReplicationInfo* ActorInfo = ReplicationGraph->GlobalActorReplicationInfoMap.Find(Actor))
+		{
+			ActorInfo->Settings.CullDistanceSquared = CullDistSq;
+			UE_LOG(LogReplicationGraph, Display, TEXT("Setting GlobalActorInfo cull distance for %s to %.2f"), *Actor->GetName(), CullDistance);
+		}
+
+
+		if (FConnectionReplicationActorInfo* ConnectionActorInfo = ConnectionManager->ActorInfoMap.Find(Actor))
+		{
+			ConnectionActorInfo->CullDistanceSquared = CullDistSq;
+			UE_LOG(LogReplicationGraph, Display, TEXT("Setting Connection cull distance for %s to %.2f"), *Actor->GetName(), CullDistance);
+		}
+	}
+}
+
+FAutoConsoleCommandWithWorldAndArgs NetRepGraphSetClassCullDistance(TEXT("Net.RepGraph.SetClassCullDistance"),TEXT(""),
+	FConsoleCommandWithWorldAndArgsDelegate::CreateLambda([](const TArray<FString>& Args, UWorld* World)
+	{
+		if (Args.Num() <= 1)
+		{
+			UE_LOG(LogReplicationGraph, Display, TEXT("Usage: Net.RepGraph.SetClassCullDistance <Class> <Distance>"));
+			return;
+		}
+
+		UClass* Class = FindObject<UClass>(ANY_PACKAGE, *Args[0]);
+		if (Class == nullptr)
+		{
+			UE_LOG(LogReplicationGraph, Display, TEXT("Could not find Class: %s"), *Args[0]);
+			return;
+		}
+
+		float Distance = 0.f;
+		if (!LexTryParseString<float>(Distance, *Args[1]))
+		{
+			UE_LOG(LogReplicationGraph, Display, TEXT("Could not parse %s as float."), *Args[1]);
+		}
+
+		for (TActorIterator<AReplicationGraphDebugActor> It(World); It; ++It)
+		{
+			It->ServerSetCullDistanceForClass(Class, Distance);
+		}
+	})
+);
+
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------------------------------------------------------------------
@@ -416,7 +496,7 @@ FAutoConsoleCommandWithWorldAndArgs NetRepGraphSetCellSize(TEXT("Net.RepGraph.Sp
 		float NewGridSize = 0.f;
 		if (Args.Num() > 0 )
 		{
-			Lex::FromString(NewGridSize, *Args[0]);
+			LexFromString(NewGridSize, *Args[0]);
 		}
 
 		if (NewGridSize <= 0.f)
@@ -453,7 +533,7 @@ FAutoConsoleCommand RepDriverListsAddTestmd(TEXT("Net.RepGraph.Lists.AddTest"),
 	int32 Num = 1;
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(Num,*Args[0]);
+		LexFromString(Num,*Args[0]);
 	}
 	
 	while(Num-- > 0)
@@ -467,7 +547,7 @@ FAutoConsoleCommand RepDriverListsStatsCmd(TEXT("Net.RepGraph.Lists.Stats"), TEX
 	int32 Mode = 0;
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(Mode,*Args[0]);
+		LexFromString(Mode,*Args[0]);
 	}
 
 	PrintRepListStats(Mode);
@@ -481,17 +561,17 @@ FAutoConsoleCommand RepDriverListDetailsCmd(TEXT("Net.RepGraph.Lists.Details"),
 	
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(PoolIdx,*Args[0]);
+		LexFromString(PoolIdx,*Args[0]);
 	}
 
 	if (Args.Num() > 1 )
 	{
-		Lex::FromString(BlockIdx,*Args[1]);
+		LexFromString(BlockIdx,*Args[1]);
 	}
 
 	if (Args.Num() > 2 )
 	{
-		Lex::FromString(ListIdx,*Args[2]);
+		LexFromString(ListIdx,*Args[2]);
 	}
 
 	PrintRepListDetails(PoolIdx, BlockIdx, ListIdx);
@@ -503,7 +583,7 @@ FAutoConsoleCommand RepDriverListsDisplayDebugCmd(TEXT("Net.RepGraph.Lists.Displ
 	static int32 Mode = 0;
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(Mode,*Args[0]);
+		LexFromString(Mode,*Args[0]);
 	}
 
 	if (Handle.IsValid())
@@ -542,7 +622,7 @@ FAutoConsoleCommand RepDriverStarvListCmd(TEXT("Net.RepGraph.StarvedList"), TEXT
 	static int32 ConnectionIdx = 0;
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(ConnectionIdx, *Args[0]);
+		LexFromString(ConnectionIdx, *Args[0]);
 	}
 	if (Handle.IsValid())
 	{
@@ -580,7 +660,7 @@ FAutoConsoleCommand RepDriverStarvListCmd(TEXT("Net.RepGraph.StarvedList"), TEXT
 
 									for (auto MapIt = ConIt->ActorInfoMap.CreateIterator(); MapIt; ++MapIt)
 									{
-										TheList.Emplace(MapIt.Key(), RepGraph->GetReplicationGraphFrame() - MapIt.Value().LastRepFrameNum);
+										TheList.Emplace(MapIt.Key(), RepGraph->GetReplicationGraphFrame() - MapIt.Value().Get()->LastRepFrameNum);
 									}
 									TheList.Sort();
 								
@@ -817,21 +897,6 @@ void UReplicationGraphNode_GridCell::LogNode(FReplicationGraphDebugInfo& DebugIn
 	DebugInfo.PopIndent();
 }
 
-void UReplicationGraphNode_ClassCategories::LogNode(FReplicationGraphDebugInfo& DebugInfo, const FString& NodeName) const
-{
-	DebugInfo.Log(NodeName);
-
-	DebugInfo.PushIndent();
-	for(const FCategoryMapping& Mapping : Categories)
-	{
-		if (Mapping.Node)
-		{
-			Mapping.Node->LogNode(DebugInfo, Mapping.Category.GetDebugStringSlow());
-		}
-	}
-	DebugInfo.PopIndent();
-}
-
 void UReplicationGraphNode_TearOff_ForConnection::LogNode(FReplicationGraphDebugInfo& DebugInfo, const FString& NodeName) const
 {
 	DebugInfo.Log(NodeName);
@@ -844,43 +909,42 @@ void UReplicationGraphNode_TearOff_ForConnection::LogNode(FReplicationGraphDebug
 //	Prioritization Debugging: help log/debug 
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
-void PrintPrioritizedList(FOutputDevice& Ar, UNetReplicationGraphConnection* ConnectionManager, const TArrayView<FPrioritizedRepList>& List)
+void PrintPrioritizedList(FOutputDevice& Ar, UNetReplicationGraphConnection* ConnectionManager, FPrioritizedRepList* PrioritizedList)
 {
 	UReplicationGraph* RepGraph = ConnectionManager->NetConnection->Driver->GetReplicationDriver<UReplicationGraph>();
 	uint32 RepFrameNum = RepGraph->GetReplicationGraphFrame();
-	for (const FPrioritizedRepList& PrioritizedList : List)
-	{
-		// Skipped actors
+	
+	// Skipped actors
 #if REPGRAPH_DETAILS
-		Ar.Logf(TEXT("%s [%d Skipped Actors]"), *PrioritizedList.ListCategory.GetDebugStringSlow(), PrioritizedList.Items.Num());
+	Ar.Logf(TEXT("[%d Skipped Actors]"), PrioritizedList->SkippedDebugDetails->Num());
 
-		FNativeClassAccumulator DormantClasses;
-		FNativeClassAccumulator CulledClasses;
+	FNativeClassAccumulator DormantClasses;
+	FNativeClassAccumulator CulledClasses;
 
-		for (const FSkippedActorFullDebugDetails& SkippedDetails : *PrioritizedList.SkippedDebugDetails)
+	for (const FSkippedActorFullDebugDetails& SkippedDetails : *PrioritizedList->SkippedDebugDetails)
+	{
+		FString SkippedStr;
+		if (SkippedDetails.bWasDormant)
 		{
-			FString SkippedStr;
-			if (SkippedDetails.bWasDormant)
-			{
-				SkippedStr = TEXT("Dormant");
-				DormantClasses.Increment(SkippedDetails.Actor->GetClass());
-			}
-			else if (SkippedDetails.DistanceCulled > 0.f)
-			{
-				SkippedStr = FString::Printf(TEXT("Dist Culled %.2f"), SkippedDetails.DistanceCulled);
-				CulledClasses.Increment(SkippedDetails.Actor->GetClass());
-			}
-			else if (SkippedDetails.FramesTillNextReplication > 0)
-			{
-				SkippedStr = FString::Printf(TEXT("Not ready (%d frames left)"), SkippedDetails.FramesTillNextReplication);
-			}
-			else
-			{
-				SkippedStr = TEXT("Unknown???");
-			}
-
-			Ar.Logf(TEXT("%-40s %s"), *GetActorRepListTypeDebugString(SkippedDetails.Actor), *SkippedStr);
+			SkippedStr = TEXT("Dormant");
+			DormantClasses.Increment(SkippedDetails.Actor->GetClass());
 		}
+		else if (SkippedDetails.DistanceCulled > 0.f)
+		{
+			SkippedStr = FString::Printf(TEXT("Dist Culled %.2f"), SkippedDetails.DistanceCulled);
+			CulledClasses.Increment(SkippedDetails.Actor->GetClass());
+		}
+		else if (SkippedDetails.FramesTillNextReplication > 0)
+		{
+			SkippedStr = FString::Printf(TEXT("Not ready (%d frames left)"), SkippedDetails.FramesTillNextReplication);
+		}
+		else
+		{
+			SkippedStr = TEXT("Unknown???");
+		}
+
+		Ar.Logf(TEXT("%-40s %s"), *GetActorRepListTypeDebugString(SkippedDetails.Actor), *SkippedStr);
+	}
 
 		Ar.Logf(TEXT(" Dormant Classes: %s"), *DormantClasses.BuildString());
 		Ar.Logf(TEXT(" Culled Classes: %s"), *CulledClasses.BuildString());
@@ -888,34 +952,33 @@ void PrintPrioritizedList(FOutputDevice& Ar, UNetReplicationGraphConnection* Con
 #endif
 
 		// Passed (not skipped) actors
-		Ar.Logf(TEXT("%s [%d Passed Actors]"), *PrioritizedList.ListCategory.GetDebugStringSlow(), PrioritizedList.Items.Num());
-		for (const FPrioritizedRepList::FItem& Item : PrioritizedList.Items)
-		{
-			const FConnectionReplicationActorInfo& ActorInfo = ConnectionManager->ActorInfoMap.FindOrAdd(Item.Actor);
-			const bool bWasStarved = ActorInfo.StarvedFrameNum > 0;
-			FString StarvedString = bWasStarved ? FString::Printf(TEXT(" (Starved %d) "), RepFrameNum - ActorInfo.LastRepFrameNum) : TEXT("");
+	Ar.Logf(TEXT("[%d Passed Actors]"), PrioritizedList->Items.Num());
+	for (const FPrioritizedRepList::FItem& Item : PrioritizedList->Items)
+	{
+		const FConnectionReplicationActorInfo& ActorInfo = ConnectionManager->ActorInfoMap.FindOrAdd(Item.Actor);
+		const bool bWasStarved = ActorInfo.StarvedFrameNum > 0;
+		FString StarvedString = bWasStarved ? FString::Printf(TEXT(" (Starved %d) "), RepFrameNum - ActorInfo.LastRepFrameNum) : TEXT("");
 
 #if REPGRAPH_DETAILS
 			
-			if (FPrioritizedActorFullDebugDetails* FullDetails = PrioritizedList.FullDebugDetails.Get()->FindByKey(Item.Actor))
-			{
-				Ar.Logf(TEXT("%-40s %.4f %s %s"), *GetActorRepListTypeDebugString(Item.Actor), Item.Priority, *FullDetails->BuildString(), *StarvedString);
-				continue;
-			}
+		if (FPrioritizedActorFullDebugDetails* FullDetails = PrioritizedList->FullDebugDetails.Get()->FindByKey(Item.Actor))
+		{
+			Ar.Logf(TEXT("%-40s %.4f %s %s"), *GetActorRepListTypeDebugString(Item.Actor), Item.Priority, *FullDetails->BuildString(), *StarvedString);
+			continue;
+		}
 #endif
 
-			// Simplified version without full details
-			UClass* Class = Item.Actor->GetClass();
-			while (Class && !Class->IsNative())
-			{
-				Class = Class->GetSuperClass();
-			}
-
-			Ar.Logf(TEXT("%-40s %-20s %.4f %s"), *GetActorRepListTypeDebugString(Item.Actor), *GetNameSafe(Class), Item.Priority, *StarvedString);
+		// Simplified version without full details
+		UClass* Class = Item.Actor->GetClass();
+		while (Class && !Class->IsNative())
+		{
+			Class = Class->GetSuperClass();
 		}
 
-		Ar.Logf(TEXT(""));
+		Ar.Logf(TEXT("%-40s %-20s %.4f %s"), *GetActorRepListTypeDebugString(Item.Actor), *GetNameSafe(Class), Item.Priority, *StarvedString);
 	}
+
+	Ar.Logf(TEXT(""));
 }
 
 TFunction<void()> LogPrioritizedListHelper(FOutputDevice& Ar, const TArray< FString >& Args, bool bAutoUnregister)
@@ -941,7 +1004,7 @@ TFunction<void()> LogPrioritizedListHelper(FOutputDevice& Ar, const TArray< FStr
 	static int32 ConnectionIdx = 0;
 	if (Args.Num() > 0 ) 
 	{
-		Lex::FromString(ConnectionIdx, *Args[0]);
+		LexFromString(ConnectionIdx, *Args[0]);
 	}
 
 	if (Graph->Connections.IsValidIndex(ConnectionIdx) == false)
@@ -957,7 +1020,7 @@ TFunction<void()> LogPrioritizedListHelper(FOutputDevice& Ar, const TArray< FStr
 	WeakConnectionManager = ConnectionManager;
 
 	DO_REPGRAPH_DETAILS(ConnectionManager->bEnableFullActorPrioritizationDetails = true);
-	Handle = ConnectionManager->OnPostReplicatePrioritizeLists.AddLambda([&Ar, bAutoUnregister](UNetReplicationGraphConnection* InConnectionManager, TArrayView<FPrioritizedRepList> List)
+	Handle = ConnectionManager->OnPostReplicatePrioritizeLists.AddLambda([&Ar, bAutoUnregister](UNetReplicationGraphConnection* InConnectionManager, FPrioritizedRepList* List)
 	{
 		PrintPrioritizedList(Ar, InConnectionManager, List);
 		if (bAutoUnregister)
@@ -1033,13 +1096,13 @@ FAutoConsoleCommand RepGraphPrintAllCmd(TEXT("Net.RepGraph.PrintAll"), TEXT(""),
 	int32 FrameCount = 1;
 	if (Args.Num() > 0 )
 	{
-		Lex::FromString(FrameCount, *Args[0]);
+		LexFromString(FrameCount, *Args[0]);
 	}
 
 	int32 ConnectionIdx = 0;
 	if (Args.Num() > 1 )
 	{
-		Lex::FromString(ConnectionIdx, *Args[1]);
+		LexFromString(ConnectionIdx, *Args[1]);
 	}
 
 	if (Graph->Connections.IsValidIndex(ConnectionIdx) == false)
@@ -1054,7 +1117,7 @@ FAutoConsoleCommand RepGraphPrintAllCmd(TEXT("Net.RepGraph.PrintAll"), TEXT(""),
 	*FrameCountPtr = FrameCount;
 
 	DO_REPGRAPH_DETAILS(ConnectionManager->bEnableFullActorPrioritizationDetails = true);
-	*Handle = ConnectionManager->OnPostReplicatePrioritizeLists.AddLambda([Handle, FrameCountPtr, Graph](UNetReplicationGraphConnection* InConnectionManager, TArrayView<FPrioritizedRepList> List)
+	*Handle = ConnectionManager->OnPostReplicatePrioritizeLists.AddLambda([Handle, FrameCountPtr, Graph](UNetReplicationGraphConnection* InConnectionManager, FPrioritizedRepList* List)
 	{
 		GLog->Logf(TEXT(""));
 		GLog->Logf(TEXT("===================================================="));
@@ -1082,206 +1145,6 @@ FAutoConsoleCommand RepGraphPrintAllCmd(TEXT("Net.RepGraph.PrintAll"), TEXT(""),
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
 
-TWeakObjectPtr<UNetReplicationGraphConnection> PacketBudgetHUDNetConnection;
-
-FPacketBudgetRecordBuffer DebugPacketBudgetBuffer;
-FPacketBudgetRecordBuffer** CurrentDebugPacketBudgetBufferPtr = nullptr;
-
-static void PacketBudgetOnHUDPostRender(AHUD* HUD, UCanvas* Canvas)
-{
-	if (PacketBudgetHUDNetConnection.IsValid() == false)
-	{
-		DebugPacketBudgetBuffer.Reset();
-		CurrentDebugPacketBudgetBufferPtr = nullptr;
-		return;
-	}
-
-	static float StartX = 100.f;
-	static float StartYOffset = -100.f;
-
-	static float BudgetWidth = 100.f;
-	static float BudgetHeightScale = 0.05f;
-
-	static float SpacingX = 10.f;
-	static float SpacingY = 5.f;
-
-	float CurrentX = StartX;
-	float StartY = Canvas->SizeY + StartYOffset;
-
-	for (int32 idx = DebugPacketBudgetBuffer.Num()-1; idx >= 0; --idx)
-	{
-		FPacketBudgetRecord& Record = DebugPacketBudgetBuffer.GetAtIndex(idx);
-		check(Record.Budget);
-
-		float CurrentY = StartY;
-
-		Canvas->SetDrawColor(FColor::White);
-		CurrentY -= Canvas->DrawText(GEngine->GetTinyFont(), Record.Budget->DebugName, CurrentX, CurrentY);
-		CurrentY -= SpacingY;
-
-		float BarStartY = CurrentY;
-
-		// -----------------------------------
-		// Draw budget
-		// -----------------------------------
-		static bool bDrawBudget = true;
-		if (bDrawBudget)
-		{
-			static float BudgetOverdraw = 10.f;
-
-			int64 BudgetTotalSize = 0;
-			for (const FPacketBudget::FItem& BudgetItem : Record.Budget->BudgetItems)
-			{
-				BudgetTotalSize += BudgetItem.MaxBits;
-
-				float Height = ((float)BudgetItem.MaxBits * BudgetHeightScale);
-				float LineY = CurrentY - Height;
-				Canvas->K2_DrawLine(FVector2D(CurrentX, LineY), FVector2D(CurrentX + BudgetWidth + BudgetOverdraw, LineY), 1.f, FColor::White);
-				
-				CurrentY -= Height;
-			}
-		}
-
-		CurrentY = BarStartY;
-
-		// -----------------------------------
-		// Draw packet
-		// -----------------------------------
-		
-		for (int32 ItemIdx=0; ItemIdx < Record.Items.Num(); ++ItemIdx)
-		{
-			FPacketBudgetRecord::FItem Item = Record.Items[ItemIdx];
-		
-			if (Item.BitsWritten <= 0)
-			{
-				continue;
-			}
-
-			float Height = (float)Item.BitsWritten * BudgetHeightScale;
-
-			Canvas->K2_DrawBox( FVector2D(CurrentX, CurrentY-Height), FVector2D(BudgetWidth, Height), 1.f, FColor::Red );
-			Canvas->DrawText(GEngine->GetTinyFont(), FString::Printf(TEXT("%s"), *Record.Budget->BudgetItems[ItemIdx].ListCategory.GetDebugStringSlow()), CurrentX, CurrentY - (Height / 2.f));
-			CurrentY -= Height;
-		}
-
-		CurrentX += BudgetWidth + SpacingX;
-	}
-
-}
-
-static void NetPacketBudgetHUDFunc(const TArray<FString>& Args, UWorld* World)
-{
-	static FDelegateHandle HUDDelegateHandle;
-	if (HUDDelegateHandle.IsValid())
-	{
-		AHUD::OnShowDebugInfo.Remove(HUDDelegateHandle);
-		HUDDelegateHandle.Reset();
-	}
-
-	UNetDriver* NetDriver = World->GetNetDriver();
-	int32 ConnectionIdx = 0;
-
-	// Force examine server for PIE
-	if (Args.FindByPredicate([](const FString& Str){ return Str.Contains(TEXT("SERVER")); }))
-	{
-		for (TObjectIterator<UWorld> It; It; ++It)
-		{		
-			UWorld* FoundWorld = *It;
-			if (FoundWorld && (FoundWorld->GetNetMode() == ENetMode::NM_DedicatedServer || FoundWorld->GetNetMode() == ENetMode::NM_ListenServer))
-			{
-				NetDriver = FoundWorld->GetNetDriver();
-				break;
-			}
-		}
-
-		for (const FString& Str : Args)
-		{
-			Lex::TryParseString<int32>(ConnectionIdx, *Str);
-		}
-	}
-
-	// Stop recording previous run
-	if (CurrentDebugPacketBudgetBufferPtr)
-	{
-		*CurrentDebugPacketBudgetBufferPtr = nullptr;
-		CurrentDebugPacketBudgetBufferPtr = nullptr;
-		DebugPacketBudgetBuffer.Reset();
-	}
-
-	UNetConnection* NetConnection = nullptr;
-
-	if (NetDriver)
-	{
-		if (NetDriver->ServerConnection)
-		{
-			NetConnection = NetDriver->ServerConnection;
-		}
-		else if (NetDriver->ClientConnections.IsValidIndex(ConnectionIdx))
-		{
-			NetConnection = NetDriver->ClientConnections[ConnectionIdx];
-		}
-		else
-		{
-			UE_LOG(LogNet, Warning, TEXT("Could Not find a valid connection for %d."), ConnectionIdx);
-		}
-
-
-		if (NetConnection)
-		{			
-			for (TObjectIterator<UNetReplicationGraphConnection> It; It; ++It)
-			{
-				if( It->NetConnection == NetConnection)
-				{
-					CurrentDebugPacketBudgetBufferPtr = &It->PacketRecordBuffer;
-					It->PacketRecordBuffer = &DebugPacketBudgetBuffer;
-					PacketBudgetHUDNetConnection = *It;
-					break;
-				}
-			}
-
-			if (CurrentDebugPacketBudgetBufferPtr)
-			{
-				HUDDelegateHandle = AHUD::OnHUDPostRender.AddStatic(&PacketBudgetOnHUDPostRender);
-			}
-			else
-			{
-				UE_LOG(LogNet, Warning, TEXT("Could Not find a valid ConnectionManager for %d."), ConnectionIdx);
-			}
-		}
-	}
-}
-
-FAutoConsoleCommandWithWorldAndArgs NetPacketBudgetHUDCmd(
-	TEXT("Net.PacketBudget.HUD"),
-	TEXT(""),
-	FConsoleCommandWithWorldAndArgsDelegate::CreateStatic(&NetPacketBudgetHUDFunc)
-);
-
-static void NetPacketBudgetHUDToggleFunc(const TArray<FString>& Args, UWorld* World)
-{
-	if (CurrentDebugPacketBudgetBufferPtr)
-	{
-		if (*CurrentDebugPacketBudgetBufferPtr)
-		{
-			*CurrentDebugPacketBudgetBufferPtr = nullptr;
-		}
-		else
-		{
-			*CurrentDebugPacketBudgetBufferPtr = &DebugPacketBudgetBuffer;
-		}
-	}
-
-}
-
-FAutoConsoleCommandWithWorldAndArgs NetPacketBudgetHUDToggleCmd(
-	TEXT("Net.PacketBudget.HUD.Toggle"),
-	TEXT(""),
-	FConsoleCommandWithWorldAndArgsDelegate::CreateStatic(&NetPacketBudgetHUDToggleFunc)
-);
-
-// ------------------------------------------------------------------------------
-
-
 #if USE_REPCSVPROFILER
 void FReplicationGraphProfiler::OnClientConnect()
 {
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphTypes.cpp b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphTypes.cpp
index a6f5b499dc1a..976f8818f1c8 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphTypes.cpp
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Private/ReplicationGraphTypes.cpp
@@ -23,66 +23,6 @@
 
 DEFINE_LOG_CATEGORY( LogReplicationGraph );
 
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-
-FReplicationListCategory::FGetDebugStringFunc FReplicationListCategory::CustomDebugStringFunc;
-
-FString FReplicationListCategory::GetDebugStringSlow() const
-{
-	if (CustomDebugStringFunc)
-	{
-		return CustomDebugStringFunc(*this);
-	}
-
-	return FString::Printf(TEXT("{%d}"), Value);
-}
-
-void FReplicationListCategory::SetDebugStringFunc(FGetDebugStringFunc Func)
-{
-	CustomDebugStringFunc = Func;
-}
-
-void FReplicationListCategory::SetDebugStringFunc_StandardEnum(TCHAR* EnumString)
-{
-	UEnum* Enum = FindObject<UEnum>(ANY_PACKAGE, EnumString);
-	if (!ensureMsgf(Enum, TEXT("Could not find UEnum named %s"), EnumString))
-	{
-		return;
-	}
-
-	SetDebugStringFunc([Enum](FReplicationListCategory Category)
-	{
-		QUICK_SCOPE_CYCLE_COUNTER(REPLICATION_CATEGORY_GETDEBUGSTR);
-		bool All = false;
-		FString Str = Enum->GetNameStringByValue(Category);
-		if (Str.IsEmpty())
-		{
-			All = true;
-			Str += TEXT("(");
-			for (uint32 ForValue = 1; ForValue <= Enum->GetMaxEnumValue(); ForValue <<= 1)
-			{
-				if ((Category & ForValue) > 0)
-				{
-					if (Str.Len() > 1)
-					{
-						Str += TEXT(" | ");
-					}
-					Str += Enum->GetNameStringByValue(ForValue);
-				}
-				else
-				{
-					All = false;
-				}
-			}
-			Str += TEXT(")");
-
-		}
-		return All ? TEXT("All") : Str;
-	});
-}
-
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // Actor List Allocator
@@ -367,7 +307,7 @@ void TActorListAllocator<NumListsPerBlock, MaxNumPools>::LogStats(int32 Mode, FO
 			{
 				for (int32 i=0; i < B->UsedListsBitArray.Num(); ++i)
 				{
-					BlockBinaryStr += B->UsedListsBitArray[i] ? *Lex::ToString(B->Lists[i].RefCount) : TEXT("0");
+					BlockBinaryStr += B->UsedListsBitArray[i] ? *LexToString(B->Lists[i].RefCount) : TEXT("0");
 				}
 				BlockBinaryStr += TEXT(" ");
 			}
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/BasicReplicationGraph.h b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/BasicReplicationGraph.h
new file mode 100644
index 000000000000..cd20dfc6d12a
--- /dev/null
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/BasicReplicationGraph.h
@@ -0,0 +1,66 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "ReplicationGraph.h"
+#include "BasicReplicationGraph.generated.h"
+
+USTRUCT()
+struct FConnectionAlwaysRelevantNodePair
+{
+	GENERATED_BODY()
+	FConnectionAlwaysRelevantNodePair() { }
+	FConnectionAlwaysRelevantNodePair(UNetConnection* InConnection, UReplicationGraphNode_AlwaysRelevant_ForConnection* InNode) : NetConnection(InConnection), Node(InNode) { }
+	bool operator==(const UNetConnection* InConnection) const { return InConnection == NetConnection; }
+
+	UPROPERTY()
+	UNetConnection* NetConnection = nullptr;
+
+	UPROPERTY()
+	UReplicationGraphNode_AlwaysRelevant_ForConnection* Node = nullptr;	
+};
+
+
+/** 
+ * A basic implementation of replication graph. It only supports NetCullDistanceSquared, bAlwaysRelevant, bOnlyRelevantToOwner. These values cannot change per-actor at runtime. 
+ * This is meant to provide a simple example implementation. More robust implementations will be required for more complex games. ShootGame is another example to check out.
+ * 
+ * To enable this via ini:
+ * [/Script/OnlineSubsystemUtils.IpNetDriver]
+ * ReplicationDriverClassName="/Script/ReplicationGraph.BasicReplicationGraph"
+ * 
+ **/
+UCLASS(transient, config=Engine)
+class UBasicReplicationGraph :public UReplicationGraph
+{
+	GENERATED_BODY()
+
+public:
+
+	UBasicReplicationGraph();
+
+	virtual void InitGlobalActorClassSettings() override;
+	virtual void InitGlobalGraphNodes() override;
+	virtual void InitConnectionGraphNodes(UNetReplicationGraphConnection* RepGraphConnection) override;
+	virtual void RouteAddNetworkActorToNodes(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& GlobalInfo) override;
+	virtual void RouteRemoveNetworkActorToNodes(const FNewReplicatedActorInfo& ActorInfo) override;
+
+	virtual int32 ServerReplicateActors(float DeltaSeconds) override;
+
+	UPROPERTY()
+	UReplicationGraphNode_GridSpatialization2D* GridNode;
+
+	UPROPERTY()
+	UReplicationGraphNode_ActorList* AlwaysRelevantNode;
+
+	UPROPERTY()
+	TArray<FConnectionAlwaysRelevantNodePair> AlwaysRelevantForConnectionList;
+
+	/** Actors that are only supposed to replicate to their owning connection, but that did not have a connection on spawn */
+	UPROPERTY()
+	TArray<AActor*> ActorsWithoutNetConnection;
+
+
+	UReplicationGraphNode_AlwaysRelevant_ForConnection* GetAlwaysRelevantNodeForConnection(UNetConnection* Connection);
+};
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraph.h b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraph.h
index a6dd770199df..2917bad920f5 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraph.h
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraph.h
@@ -4,7 +4,29 @@
 /*=============================================================================
 Replication Graph
 
-Implementation of Replication Driver. This is customizable via subclassing UReplicationGraph. Current default implementation does not fully function. This is a WIP.
+Implementation of Replication Driver. This is customizable via subclassing UReplicationGraph. Default implementation (UReplicationGraph) does not fully function and is intended to be overridden.
+	Check out BasicReplicationGraph.h for a minimal implementation that works "out of the box" with a minimal feature set.
+	Check out ShooterGame / UShooterReplicationGraph for a more advanced implementation.
+
+
+
+High level overview of ReplicationGraph:
+	* The graph is a collection of nodes which produce replication lists for each network connection. The graph essentially maintains persistent lists of actors to replicate and feeds them to connections. 
+	
+	* This allows for more work to be shared and greatly improves the scalability of the system with respect to number of actors * number of connections.
+	
+	* For example, one node on the graph is the spatialization node. All actors that essentially use distance based relevancy will go here. There are also always relevant nodes. Nodes can be global, per connection, or shared (E.g, "Always relevant for team" nodes).
+
+	* The main impact here is that virtual functions like IsNetRelevantFor and GetNetPriority are not used by the replication graph. Several properties are also not used or are slightly different in use. 
+
+	* Instead there are essentially three ways for game code to affect this part of replication:
+		* The graph itself. Adding new UReplicationNodes or changing the way an actor is placed in the graph.
+		* FGlobalActorReplicationInfo: The associative data the replication graph keeps, globally, about each actor. 
+		* FConnectionReplicationActorInfo: The associative data that the replication keeps, per connection, about each actor. 
+
+	* After returned from the graph, the actor lists are further culled for distance and frequency, then merged and prioritized. The end result is a sorted list of actors to replicate that we then do logic for creating or updating actor channels.
+
+
 
 Subclasses should implement these functions:
 
@@ -17,10 +39,10 @@ UReplicationGraph::InitGlobalGraphNodes
 UReplicationGraph::RouteAddNetworkActorToNodes/::RouteRemoveNetworkActorToNodes
 	Route actor spawning/despawning to the right node. (Or your nodes can gather the actors themselves)
 
-UFortReplicationGraph::InitConnectionGraphNodes
+UReplicationGraph::InitConnectionGraphNodes
 	Initialize per-connection nodes (or associate shared nodes with them via ::AddConnectionGraphNode)
-	
-	
+
+
 =============================================================================*/
 
 #pragma once
@@ -59,7 +81,7 @@ public:
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor ) PURE_VIRTUAL(UReplicationGraphNode::NotifyAddNetworkActor, );
 	
 	/** Called when a networked actor is being destroyed or no longer wants to replicate */
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& Actor, bool bWarnIfNotFound=true) PURE_VIRTUAL(UReplicationGraphNode::NotifyRemoveNetworkActor, );
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& Actor, bool bWarnIfNotFound=true) PURE_VIRTUAL(UReplicationGraphNode::NotifyRemoveNetworkActor, return false; );
 
 	/** Called when world changes or when all subclasses should dump any persistent data/lists about replicated actors here. (The new/next world will be set before this is called) */
 	virtual void NotifyResetAllNetworkActors();
@@ -102,6 +124,8 @@ public:
 		return NewNode;
 	}
 
+	void ToggleHighFrequencyPawns();
+
 protected:
 
 	UPROPERTY()
@@ -123,7 +147,7 @@ private:
 struct FStreamingLevelActorListCollection
 {
 	void AddActor(const FNewReplicatedActorInfo& ActorInfo);
-	void RemoveActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound, UReplicationGraphNode* Outer);
+	bool RemoveActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound, UReplicationGraphNode* Outer);
 	void Reset();
 	void Gather(const FConnectionGatherActorListParameters& Params);
 	void DeepCopyFrom(const FStreamingLevelActorListCollection& Source);
@@ -159,7 +183,7 @@ public:
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo) override;
 	
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
 	
 	virtual void NotifyResetAllNetworkActors() override;
 	
@@ -209,7 +233,7 @@ public:
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo) override;
 	
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
 	
 	virtual void NotifyResetAllNetworkActors() override;
 	
@@ -248,12 +272,20 @@ class REPLICATIONGRAPH_API UReplicationGraphNode_ConnectionDormanyNode : public
 	GENERATED_BODY()
 public:
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool WarnIfNotFound) override;
+	virtual void NotifyResetAllNetworkActors() override;
+
 	void NotifyActorDormancyFlush(FActorRepListType Actor);
 
+	void OnClientVisibleLevelNameAdd(FName LevelName, UWorld* World);
+
 private:
-	void ConditionalGatherDormantActorsForConnection(FActorRepListRefView& ConnectionRepList, const FConnectionGatherActorListParameters& Params);
+	void ConditionalGatherDormantActorsForConnection(FActorRepListRefView& ConnectionRepList, const FConnectionGatherActorListParameters& Params, FActorRepListRefView* RemovedList);
 	
 	int32 TrickleStartCounter = 10;
+
+	// Tracks actors we've removed in this per-connection node, so that we can restore them if the streaming level is unloaded and reloaded.
+	FStreamingLevelActorListCollection RemovedStreamingLevelActorListCollection;
 };
 
 
@@ -268,7 +300,7 @@ public:
 	static float MaxZForConnection; // Connection Z location has to be < this for ConnectionsNodes to be made.
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo) override { ensureMsgf(false, TEXT("UReplicationGraphNode_DormancyNode::NotifyAddNetworkActor not functional.")); }
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { ensureMsgf(false, TEXT("UReplicationGraphNode_DormancyNode::NotifyRemoveNetworkActor not functional.")); }
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { ensureMsgf(false, TEXT("UReplicationGraphNode_DormancyNode::NotifyRemoveNetworkActor not functional.")); return false; }
 	virtual void NotifyResetAllNetworkActors() override;
 	
 	void AddDormantActor(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& GlobalInfo);
@@ -291,7 +323,7 @@ class REPLICATIONGRAPH_API UReplicationGraphNode_GridCell : public UReplicationG
 public:
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo) override { ensureMsgf(false, TEXT("UReplicationGraphNode_Simple2DSpatializationLeaf::NotifyAddNetworkActor not functional.")); }
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { ensureMsgf(false, TEXT("UReplicationGraphNode_Simple2DSpatializationLeaf::NotifyRemoveNetworkActor not functional.")); }	
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { ensureMsgf(false, TEXT("UReplicationGraphNode_Simple2DSpatializationLeaf::NotifyRemoveNetworkActor not functional.")); return false; }	
 	virtual void NotifyResetAllNetworkActors() override;
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
 	virtual void LogNode(FReplicationGraphDebugInfo& DebugInfo, const FString& NodeName) const override;
@@ -332,7 +364,7 @@ public:
 	UReplicationGraphNode_GridSpatialization2D();
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor) override;	
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
 	virtual void NotifyResetAllNetworkActors() override;
 	virtual void PrepareForReplication() override;
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
@@ -361,6 +393,15 @@ public:
 	TArray<FString> DebugActorNames;
 #endif
 
+protected:
+
+	/** For adding new actor to the graph */
+	virtual void AddActorInternal_Dynamic(const FNewReplicatedActorInfo& ActorInfo);
+	virtual void AddActorInternal_Static(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& ActorRepInfo, bool IsDormancyDriven);
+
+	virtual void RemoveActorInternal_Dynamic(const FNewReplicatedActorInfo& Actor);
+	virtual void RemoveActorInternal_Static(const FNewReplicatedActorInfo& Actor, FGlobalActorReplicationInfo& ActorRepInfo, bool WasAddedAsDormantActor);
+
 private:
 
 	/** Called when an actor is out of spatial bounds */
@@ -398,13 +439,6 @@ private:
 
 	TMap<FActorRepListType, FCachedStaticActorInfo> StaticSpatializedActors;
 
-	/** For adding new actor to the graph */
-	void AddActorInternal_Dynamic(const FNewReplicatedActorInfo& Actor);
-	void AddActorInternal_Static(const FNewReplicatedActorInfo& Actor, FGlobalActorReplicationInfo& ActorRepInfo, bool bDormancyDriven);
-
-	void RemoveActorInternal_Dynamic(const FNewReplicatedActorInfo& Actor);	
-	void RemoveActorInternal_Static(const FNewReplicatedActorInfo& Actor, FGlobalActorReplicationInfo& ActorRepInfo, bool bWasAddedAsDormantActor);	
-
 	void OnNetDormancyChange(FActorRepListType Actor, FGlobalActorReplicationInfo& GlobalInfo, ENetDormancy NewVlue, ENetDormancy OldValue);
 	
 	void PutStaticActorIntoCell(const FNewReplicatedActorInfo& ActorInfo, FGlobalActorReplicationInfo& ActorRepInfo, bool bDormancyDriven);
@@ -452,68 +486,6 @@ private:
 	friend class AReplicationGraphDebugActor;
 };
 
-
-// -----------------------------------
-
-/** Node that provides simple bucketing for frequency of replication. */
-UCLASS()
-class REPLICATIONGRAPH_API UReplicationGraphNode_ClassCategories : public UReplicationGraphNode
-{
-	GENERATED_BODY()
-
-public:
-
-	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor) override;
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
-	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
-
-	void AddCategory(FReplicationListCategory Category, UClass* ActorClass);
-	void AddCategory(FReplicationListCategory Category, const TArray<UClass*>& ActorClasses);
-
-	virtual void LogNode(FReplicationGraphDebugInfo& DebugInfo, const FString& NodeName) const override;
-
-private:
-
-	struct FCategoryMapping
-	{
-		FCategoryMapping(FReplicationListCategory InCat, UReplicationGraphNode* InNode) : Category(InCat), Node(InNode)	{ }
-		bool operator==(FReplicationListCategory Cat) const { return Cat == Category; }
-		FReplicationListCategory Category;
-		UReplicationGraphNode* Node = nullptr;
-	};
-
-	TArray<FCategoryMapping> Categories;
-	TClassMap<UReplicationGraphNode*>	ActorClassMap;
-
-	FCategoryMapping& GetCategoryMapping(FReplicationListCategory Category)
-	{
-		FCategoryMapping* Mapping = Categories.FindByKey(Category);
-		if (Mapping == nullptr)
-		{
-			Mapping = new (Categories) FCategoryMapping(Category, CreateChildNode());
-		}
-		return *Mapping;
-	}
-};
-
-// -----------------------------------
-
-UCLASS()
-class REPLICATIONGRAPH_API UReplicationGraphNode_FrequencyLimiter : public UReplicationGraphNode
-{
-	GENERATED_BODY()
-
-public:
-
-	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor) override;
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override;
-	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;	
-
-private:
-	
-	FActorRepListRefView ReplicationActorList;
-};
-
 // -----------------------------------
 
 
@@ -527,7 +499,7 @@ public:
 	UReplicationGraphNode_AlwaysRelevant();
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor) override { }
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { }
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { return false; }
 	virtual void NotifyResetAllNetworkActors() override { }
 	virtual void PrepareForReplication() override;
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
@@ -547,19 +519,22 @@ protected:
 
 /** Adds actors that are always relevant for a connection. This engine version just adds the PlayerController and ViewTarget (usually the pawn) */
 UCLASS()
-class REPLICATIONGRAPH_API UReplicationGraphNode_AlwaysRelevant_ForConnection : public UReplicationGraphNode
+class REPLICATIONGRAPH_API UReplicationGraphNode_AlwaysRelevant_ForConnection : public UReplicationGraphNode_ActorList
 {
 	GENERATED_BODY()
 
 public:
-
-	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& Actor) override { }
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { }
-	virtual void NotifyResetAllNetworkActors() override { }
+	
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
 
+	/** Rebuilt-every-frame list based on UNetConnection state */
+	FActorRepListRefView ReplicationActorList;
+
 	UPROPERTY()
-	UReplicationGraphNode* ChildNode = nullptr;
+	AActor* LastViewer = nullptr;
+	
+	UPROPERTY()
+	AActor* LastViewTarget = nullptr;
 };
 
 // -----------------------------------
@@ -587,7 +562,7 @@ class REPLICATIONGRAPH_API UReplicationGraphNode_TearOff_ForConnection : public
 public:
 
 	virtual void NotifyAddNetworkActor(const FNewReplicatedActorInfo& ActorInfo) override { }
-	virtual void NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { }
+	virtual bool NotifyRemoveNetworkActor(const FNewReplicatedActorInfo& ActorInfo, bool bWarnIfNotFound=true) override { return false; }
 	virtual void NotifyResetAllNetworkActors() override { TearOffActors.Reset(); }
 	virtual void GatherActorListsForConnection(const FConnectionGatherActorListParameters& Params) override;
 	virtual void LogNode(FReplicationGraphDebugInfo& DebugInfo, const FString& NodeName) const override;
@@ -699,6 +674,16 @@ public:
 
 	uint32 GetReplicationGraphFrame() const { return ReplicationGraphFrame; }
 
+
+	/** Prioritization Constants: these affect how the final priority of an actor is calculated in the prioritize phase */
+	struct FPrioritizationConstants
+	{
+		float MaxDistanceScaling = 3000.f * 3000.f; // Distance scaling for prioritization scales up to this distance, everything passed this distance is the same or "capped"
+		uint32 MaxFramesSinceLastRep = 20;			// Time since last rep scales up to this
+	};
+
+	FPrioritizationConstants PrioritizationConstants;
+
 protected:
 
 	virtual void InitializeForWorld(UWorld* World);
@@ -714,8 +699,6 @@ protected:
 	/** Override this function to init/configure graph for a specific connection. Note they do not all have to be unique: connections can share nodes (e.g, 2 nodes for 2 teams) */
 	virtual void InitConnectionGraphNodes(UNetReplicationGraphConnection* ConnectionManager);
 
-	virtual FPacketBudget& GetPacketBudgetForConnection(UNetReplicationGraphConnection* ConnectionManager, const uint32 FrameNum) { return DefaultPacketBudget; }
-
 	UNetReplicationGraphConnection* FindOrAddConnectionManager(UNetConnection* NetConnection);
 
 	void HandleStarvedActorList(const FPrioritizedRepList& List, int32 StartIdx, FPerConnectionActorInfoMap& ConnectionActorInfoMap, uint32 FrameNum);
@@ -725,13 +708,10 @@ protected:
 	/** How long, in frames, without replicating before an actor channel is closed on a connection. This is a global value added to the individual actor's ActorChannelFrameTimeout */
 	uint32 GlobalActorChannelFrameNumTimeout;
 
-	FPacketBudget DefaultPacketBudget;
-
-	FReplicationListCategory DefaultReplicationListCategory;
-
 	TSharedPtr<FReplicationGraphGlobalData> GraphGlobals;
 
-	TArray<FPrioritizedRepList, TInlineAllocator<4> > PrioritizedReplicationLists;
+	/** Temporary List we use while prioritizing actors */
+	FPrioritizedRepList PrioritizedReplicationList;
 	
 	/** A list of nodes that can add actors to all connections. They don't necessarily *have to* add actors to each connection, but they will get a chance to. These are added via ::AddGlobalGraphNode  */
 	UPROPERTY()
@@ -786,14 +766,12 @@ public:
 	/** A map of all of our per-actor data */
 	FPerConnectionActorInfoMap ActorInfoMap;
 
-	/** Output buffer that records data about packets as we fill them up. This is used for debugging/logging */
-	FPacketBudgetRecordBuffer* PacketRecordBuffer = nullptr;
-
-	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnPostReplicatePrioritizedLists, UNetReplicationGraphConnection*, TArrayView<FPrioritizedRepList>);
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnPostReplicatePrioritizedLists, UNetReplicationGraphConnection*, FPrioritizedRepList*);
 	FOnPostReplicatePrioritizedLists OnPostReplicatePrioritizeLists;
 
 	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnClientVisibleLevelNamesAdd, FName, UWorld*);
-	FOnClientVisibleLevelNamesAdd OnClientVisibleLevelNameAdd;
+	FOnClientVisibleLevelNamesAdd OnClientVisibleLevelNameAdd;	// Global Delegate, will be called for every level
+	TMap<FName, FOnClientVisibleLevelNamesAdd> OnClientVisibleLevelNameAddMap; // LevelName lookup map delegates
 
 	DECLARE_MULTICAST_DELEGATE_OneParam(FOnClientVisibleLevelNamesRemove, FName);
 	FOnClientVisibleLevelNamesRemove OnClientVisibleLevelNameRemove;
@@ -908,6 +886,9 @@ public:
 	UFUNCTION(Server, Reliable, WithValidation)
 	void ServerPrintAllActorInfo(const FString& Str);
 
+	UFUNCTION(Server, Reliable, WithValidation)
+	void ServerSetCullDistanceForClass(UClass* Class, float CullDistance);
+
 	UFUNCTION(Client, Reliable)
 	void ClientCellInfo(FVector CellLocation, FVector CellExtent, const TArray<AActor*>& Actors);
 
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraphTypes.h b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraphTypes.h
index c9613ea45759..6d303a9a51e8 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraphTypes.h
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/Public/ReplicationGraphTypes.h
@@ -48,68 +48,6 @@ DECLARE_LOG_CATEGORY_EXTERN( LogReplicationGraph, Log, All );
 #endif
 
 
-
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// Replication List Category
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// 
-// ReplicationListCategory is just a bit in a uin32. All FReplicationListCategory must be power of 2 values so that they can be unioned in an FReplicationListCategoryMask.
-// This implementation was chosen to allow projects to be able to fully extend/customize categories while providing some type safety/clarity in code.
-//
-// The important high level concepts around categories are:
-//	1) They provide a way to broadly cull replication lists. Each list stored in the Replication Graph has a category associated with it. When gathering lists,
-//		the system will filter out categories that are not requested by the packet budget.
-//	2) Once we have the culled lists, categories are what the FPacketBudgets are specified in terms of.  That is, as we are filling up the packet, we using
-//		categories to determine how much space a list can occupy.
-
-
-// Enables run time ensure that FReplicationListCategory are initialized with power of 2 values
-#define REP_CAT_ENSURE_POW2 !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-
-struct REPLICATIONGRAPH_API FReplicationListCategory
-{
-	FReplicationListCategory() : Value(InvalidListCategory)	{ }
-	FReplicationListCategory(uint32 In): Value(In)
-	{ 
-#if REP_CAT_ENSURE_POW2
-		ensure(FMath::IsPowerOfTwo(Value));
-#endif
-	}
-	enum { InvalidListCategory = 0 };
-	operator uint32 () const { return Value; }
-	friend uint32 GetTypeHash(const FReplicationListCategory& ListCategory) { return GetTypeHash(ListCategory.Value); };
-	FORCEINLINE void Reset() { Value = InvalidListCategory; }
-	
-	FString GetDebugStringSlow() const;
-	
-	// Static methods for setting the string mapping function
-	typedef TFunction<FString (FReplicationListCategory)> FGetDebugStringFunc;
-	static void SetDebugStringFunc(FGetDebugStringFunc Func);
-	static void SetDebugStringFunc_StandardEnum(TCHAR* EnumString);
-
-protected:
-
-	uint32 Value;
-	static FGetDebugStringFunc CustomDebugStringFunc;
-
-	friend struct FReplicationListCategoryMask;
-};
-
-// Represents a mask or union of FReplicationListCategories. The purpose of this is to make clear what places are dealing with unions of categories vs which are expecting a single category
-struct REPLICATIONGRAPH_API FReplicationListCategoryMask : public FReplicationListCategory
-{
-	FReplicationListCategoryMask() : FReplicationListCategory() { }
-	FReplicationListCategoryMask(uint32 In) { Value = In; }
-
-	FReplicationListCategoryMask operator|(FReplicationListCategory const& Rhs) const { FReplicationListCategoryMask Result(*this); Result |= Rhs; return Result; }
-	FReplicationListCategoryMask operator&(FReplicationListCategory const& Rhs) const { FReplicationListCategoryMask Result(*this); Result &= Rhs; return Result; }
-
-	FReplicationListCategoryMask const& operator|=(FReplicationListCategory const& Rhs) { Value |= Rhs.Value; return *this; }
-	FReplicationListCategoryMask const& operator&=(FReplicationListCategory const& Rhs) { Value &= Rhs.Value; return *this; }
-};
-
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------------------------------------------------------------------
 // Actor Replication List Types
@@ -362,17 +300,8 @@ private:
 struct REPLICATIONGRAPH_API FActorRepListRawView : public TActorRepListViewBase<FActorRepList*>
 {
 	/** Standard ctor: make raw view from ref view */
-	FActorRepListRawView(const FActorRepListRefView& Source, FReplicationListCategory InCategory) : Category(InCategory) { RepList = Source.RepList.GetReference(); }
-	
-	/** Sublist cstor: make raw view from portion of a ref view */
-	FActorRepListRawView(const FActorRepListRefView& Source, FReplicationListCategory InCategory, int32 StartIdx, int32 Num) : Category(InCategory)
-	{
-
-	}
-	
+	FActorRepListRawView(const FActorRepListRefView& Source) { RepList = Source.RepList.GetReference(); }
 	FActorRepListRefView ToRefView() const { return FActorRepListRefView(*RepList); }
-
-	FReplicationListCategory Category;
 };
 
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
@@ -393,23 +322,17 @@ struct REPLICATIONGRAPH_API FGatheredReplicationActorLists
 	void AddReplicationActorList(const FActorRepListRefView& List)
 	{
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-		if (!ensureMsgf(CurrentListCategory, TEXT("FGatheredReplicationActorLists Attemping to add a ReplicationActorList with invalid ListCategory")))
-			return;
-
 		if (CVar_RepGraph_Verify)
 			List.VerifyContents_Slow();
 #endif
 		repCheck(List.IsValid());
 		if (List.Num() > 0)
 		{
-			OutReplicationLists.Emplace(FActorRepListRawView(List, CurrentListCategory)); 
+			OutReplicationLists.Emplace(FActorRepListRawView(List)); 
 		}
 	}
 
-	void Reset() { OutReplicationLists.Reset(); ListCategoryStack.Reset(); }
-	
-	void PushListCategory(FReplicationListCategory ListCategory) { ListCategoryStack.Push(CurrentListCategory); CurrentListCategory = ListCategory; }
-	void PopListCategory() { CurrentListCategory = ListCategoryStack.Last(); ListCategoryStack.Pop(); }	
+	void Reset() { OutReplicationLists.Reset(); }	
 
 	FORCEINLINE int32 Num() const { return OutReplicationLists.Num(); }
 	FORCEINLINE const FActorRepListRawView& operator[](int32 idx) const  { return OutReplicationLists[idx]; }
@@ -420,159 +343,6 @@ struct REPLICATIONGRAPH_API FGatheredReplicationActorLists
 private:	
 
 	TArray< FActorRepListRawView > OutReplicationLists;
-	FReplicationListCategory CurrentListCategory;
-	TArray< FReplicationListCategory, TInlineAllocator<1> > ListCategoryStack;
-};
-
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// Packet Budget
-// --------------------------------------------------------------------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------------------------------------------------------------------
-
-// Packet Budget represents the desired makeup of a replication packet. It maps ListCategories to the desired amount of data, It is the const data that we look at while building packets.
-struct FPacketBudget
-{
-	/** What happens when a budget item ends while being under/over the target budget */
-	enum EBalancePolicy
-	{
-		/** The balance is absorbed by this item. */
-		Absorb,
-		/** The balance rolls over to the next item (e.g, if > 0, the next item gets more bits, if < 0, the next item gets less bits). Note that a budget item cannot be completely pushed out - it will replicate at least once! */
-		RollOver
-	};
-
-	struct FItem
-	{
-		FItem(FReplicationListCategoryMask InListCategory, int64 InMaxBits, EBalancePolicy InUnderBudgetPolicy, EBalancePolicy InOverBudgetPolicy) 
-			: ListCategory(InListCategory), MaxBits(InMaxBits), UnderBudgetPolicy(InUnderBudgetPolicy), OverBudgetPolicy(InOverBudgetPolicy)  { }
-
-		FReplicationListCategoryMask ListCategory;
-		int64 MaxBits = 0;
-		EBalancePolicy UnderBudgetPolicy;
-		EBalancePolicy OverBudgetPolicy;
-	};
-
-	/** The actual list of items that make up this packet budget */
-	TArray<FItem> BudgetItems;
-
-	/** Combined mask for all categories this packet budget cares about: used for broad filtering during gather phase */
-	FReplicationListCategoryMask ListCategoryMask;
-
-	/** Identifying string for debug/logging only */
-	const TCHAR* DebugName = nullptr;
-
-	/** Adds a budget item for a given category. */
-	void AddBudgetForCategory(FReplicationListCategoryMask Category, int64 MaxBits, EBalancePolicy UnderBudgetPolicy = EBalancePolicy::Absorb, EBalancePolicy OverBudgetPolicy = EBalancePolicy::Absorb)
-	{
-		BudgetItems.Emplace(FItem(Category, MaxBits, UnderBudgetPolicy, OverBudgetPolicy));
-	}
-
-	/** Finalizes the budget: call this (once) after finished calling AddBudgetForCategory (as many times as you need) */
-	void Finalize()
-	{
-		ListCategoryMask = FReplicationListCategoryMask();
-		for (auto& Item : BudgetItems)
-		{
-			ListCategoryMask |= Item.ListCategory;
-		}
-
-		BudgetItems.Sort([](const FItem& ItemA, const FItem& ItemB) { return ItemA.ListCategory < ItemB.ListCategory; } );
-	}
-};
-
-// Represents a filled budget item during an actual frame. These are produced by FPacketBudgetTracker and mainly used for logging/profiling etc.
-struct FPacketBudgetRecord
-{
-	struct FItem
-	{
-		int64 BitsWritten = 0;
-	};
-
-	void SetBudget(const FPacketBudget* InBudget) { Budget = InBudget; Items.Reset(); Items.SetNum(InBudget->BudgetItems.Num()); }
-	void TrackSentBits(int64 NumBits, int32 BudgetIdx) {	Items[BudgetIdx].BitsWritten += NumBits; }
-	void TrackActorChannelCloseBits(int64 NumBits) { ActorChannelCloseBits += NumBits; }
-	void TrackDestructionInfoBits(int64 NumBits) { DestructionInfoBits += NumBits; }
-	
-	const FPacketBudget* Budget = nullptr;
-	TArray<FItem, TInlineAllocator<8> >	Items;
-	int64 ActorChannelCloseBits = 0;
-	int64 DestructionInfoBits = 0;
-};
-
-// The tracker is what actually does the book keeping between a given FPacketBudget and the data that is pushed into packets. Essentially, the runtime/dynamic data as we are replicating actors.
-struct FPacketBudgetTracker
-{
-	FPacketBudgetTracker(const FPacketBudget& InBudget) : Budget(InBudget), CurrentIdx(0), RemainingBits(0) { }
-	
-	/** Sets the current index of the FPacketBudget::FItem that we are filling (this is an index into this->Budget.BudgetItems) */
-	void SetBudgetItemIndex(int32 Index)
-	{
-		if ((RemainingBits < 0 && Budget.BudgetItems[CurrentIdx].OverBudgetPolicy == FPacketBudget::RollOver) || (Budget.BudgetItems[CurrentIdx].UnderBudgetPolicy == FPacketBudget::RollOver))
-		{
-			// Rollover the balance (note, don't check RemainingBits > 0 because that is an extra banch and effectively the exact same)
-			RemainingBits += Budget.BudgetItems[Index].MaxBits;
-		}
-		else
-		{
-			// Absorb the balance
-			RemainingBits = Budget.BudgetItems[Index].MaxBits;
-		}
-
-		CurrentIdx = Index;
-	}
-	
-	/** Called as bits are written to the send buffer. Returns true if the current budget item is not exceeded. (note: technically they are not "sent" yet, not until the net driver's send buffer is flushed) */
-	bool TrackSentBits(int64 NumBits)
-	{
-		if (OutRecord)
-		{
-			OutRecord->TrackSentBits(NumBits, CurrentIdx);
-		}
-
-		RemainingBits -= NumBits;
-		return (RemainingBits > 0);
-	}
-
-	void TrackActorChannelCloseBits(int64 NumBits) { if (OutRecord) OutRecord->TrackActorChannelCloseBits(NumBits); }
-	void TrackDestructionInfoBits(int64 NumBits) { if (OutRecord) OutRecord->TrackDestructionInfoBits(NumBits); }
-
-	/** Optional output: useful for logging/debugging etc */
-	void SetOutputRecord(struct FPacketBudgetRecord* NewOutRecord) { OutRecord = NewOutRecord; }
-	
-private:
-
-	const FPacketBudget& Budget;
-	FReplicationListCategory CurrentListCategory;
-	int32 CurrentIdx;
-	int64 RemainingBits;
-
-	FPacketBudgetRecord* OutRecord = nullptr;
-};
-
-
-struct FPacketBudgetRecordBuffer
-{
-	const int32 BufferSize = 64;
-	TArray<FPacketBudgetRecord, TInlineAllocator<64> > Records;
-	uint32 NextWriteIdx = 0;
-
-	FPacketBudgetRecordBuffer()
-	{
-		Records.SetNum(BufferSize);
-	}
-
-	FPacketBudgetRecord* GetNextWriteRecord(const FPacketBudget& ForBudget)
-	{
-		FPacketBudgetRecord* Record = &Records[NextWriteIdx % BufferSize];
-		Record->SetBudget(&ForBudget);
-		NextWriteIdx++;
-		return Record;
-	}
-
-	int32 Num() const { return FMath::Min<uint32>(BufferSize, NextWriteIdx); }
-	FPacketBudgetRecord& GetAtIndex(int32 idx) { return Records[(NextWriteIdx - Num() + idx) % Records.Num()]; }
-	void Reset() { Records.Reset(); Records.SetNum(BufferSize); NextWriteIdx = 0; }
 };
 
 // --------------------------------------------------------------------------------------------------------------------------------------------
@@ -584,45 +354,21 @@ struct FPacketBudgetRecordBuffer
 // Parameter structure for what we actually pass down during the Gather phase.
 struct FConnectionGatherActorListParameters
 {
-	FConnectionGatherActorListParameters(FNetViewer& InViewer, UNetReplicationGraphConnection& InConnectionManager, TSet<FName>& InClientVisibleLevelNamesRef, FPacketBudget& InPacketBudget, uint32 InReplicationFrameNum, FGatheredReplicationActorLists& InOutGatheredReplicationLists)
-		: Viewer(InViewer), ConnectionManager(InConnectionManager), PacketBudget(InPacketBudget), ReplicationFrameNum(InReplicationFrameNum), OutGatheredReplicationLists(InOutGatheredReplicationLists), ClientVisibleLevelNamesRef(InClientVisibleLevelNamesRef)
+	FConnectionGatherActorListParameters(FNetViewer& InViewer, UNetReplicationGraphConnection& InConnectionManager, TSet<FName>& InClientVisibleLevelNamesRef, uint32 InReplicationFrameNum, FGatheredReplicationActorLists& InOutGatheredReplicationLists)
+		: Viewer(InViewer), ConnectionManager(InConnectionManager), ReplicationFrameNum(InReplicationFrameNum), OutGatheredReplicationLists(InOutGatheredReplicationLists), ClientVisibleLevelNamesRef(InClientVisibleLevelNamesRef)
 	{
 	}
 
 	/** In: The Data the nodes have to work with */
 	FNetViewer& Viewer;
 	UNetReplicationGraphConnection& ConnectionManager;
-	FPacketBudget& PacketBudget;
 	uint32 ReplicationFrameNum;
 
 	/** Out: The data nodes are going to add to */
 	FGatheredReplicationActorLists& OutGatheredReplicationLists;
 
-	/** Attempts to push the ListCategory, returns true if the list category is currently allowed. If this returns true, you are expected to call PopListCategory when you are done! */
-	bool AttemptPushListCategory(FReplicationListCategory ListCategory) const
-	{
-		if ((PacketBudget.ListCategoryMask & ListCategory))
-		{
-			OutGatheredReplicationLists.PushListCategory(ListCategory);
-			return true;
-		}
-		return false;
-	}
-
-	/** Pop the list category that was pushed */
-	void PopListCategory() const
-	{
-		OutGatheredReplicationLists.PopListCategory();
-	}
-
 	bool CheckClientVisibilityForLevel(const FName& StreamingLevelName) const
 	{
-		// We track the last checked StreamingLevelName that was visible. This is a simple optimization under the premise that in an ideal replication graph,
-		// a connection is only pulling from nodes with 1 conditional streaming level. (E.g, even if you map has 300 streaming levels, spatially the client should
-		// only be "over" one of those levels, and should only attempt to pull from nodes that have that one level in its conditional actor lists.
-		// 
-		// Really this is still left over from legacy implementation. I would rather completely skip nodes in the spatialization graph based on level streaming status,
-		// but the way that level streaming works, there is no mechanism or guarantees about what space a streaming level takes up. This is ok for now.
 		if (StreamingLevelName == LastCheckedVisibleLevelName)
 		{
 			return true;
@@ -736,7 +482,7 @@ struct FGlobalActorReplicationInfo
 	FClassReplicationInfo Settings;
 
 	// -----------------------------------------------------------
-	//	Events
+	//	Events: Keep this last/at the bottom of the structure. The event data is the largest chunk but accessed the least
 	// -----------------------------------------------------------
 	FGlobalActorReplicationEvents Events;
 
@@ -847,34 +593,49 @@ struct FGlobalActorReplicationInfoMap
 	FGlobalActorReplicationInfo& Get(const FActorRepListType& Actor)
 	{
 		// Quick lookup - this is the most common case
-		if (FGlobalActorReplicationInfo* Ptr = ActorMap.Find(Actor))
+		if (TUniquePtr<FGlobalActorReplicationInfo>* Ptr = ActorMap.Find(Actor))
 		{
-			return *Ptr;
+			return *Ptr->Get();
 		}
 
 		// We need to add data for this actor
 		FClassReplicationInfo& ClassInfo = GetClassInfo( GetActorRepListTypeClass(Actor) );
-		return ActorMap.Emplace(Actor, ClassInfo);
+
+
+		FGlobalActorReplicationInfo* NewGlobalActorRepInfo = new FGlobalActorReplicationInfo(ClassInfo);
+		ActorMap.Emplace(Actor, TUniquePtr<FGlobalActorReplicationInfo>(NewGlobalActorRepInfo));
+		return *NewGlobalActorRepInfo;
 	}
 
 	// Same as above but outputs bool if it was created. This is uncommonly called. Don't want to slow down the frequently called version
 	FGlobalActorReplicationInfo& Get(const FActorRepListType& Actor, bool& bWasCreated)
 	{
 		// Quick lookup - this is the most common case
-		if (FGlobalActorReplicationInfo* Ptr = ActorMap.Find(Actor))
+		if (TUniquePtr<FGlobalActorReplicationInfo>* Ptr = ActorMap.Find(Actor))
 		{
-			return *Ptr;
+			return *Ptr->Get();
 		}
 
 		bWasCreated = true;
 
 		// We need to add data for this actor
 		FClassReplicationInfo& ClassInfo = GetClassInfo( GetActorRepListTypeClass(Actor) );
-		return ActorMap.Emplace(Actor, ClassInfo);
+
+		FGlobalActorReplicationInfo* NewGlobalActorRepInfo = new FGlobalActorReplicationInfo(ClassInfo);
+		ActorMap.Emplace(Actor, TUniquePtr<FGlobalActorReplicationInfo>(NewGlobalActorRepInfo));
+		return *NewGlobalActorRepInfo;
 	}
 
 	/** Finds data associated with the actor but does not create if its not there yet. */
-	FORCEINLINE FGlobalActorReplicationInfo* Find(const FActorRepListType& Actor) { return ActorMap.Find(Actor); }
+	FORCEINLINE FGlobalActorReplicationInfo* Find(const FActorRepListType& Actor)
+	{
+		if (TUniquePtr<FGlobalActorReplicationInfo>* Ptr = ActorMap.Find(Actor))
+		{
+			return Ptr->Get();
+		}
+
+		return nullptr;
+	}
 
 	/** Removes actor data from map */
 	FORCEINLINE int32 Remove(const FActorRepListType& Actor) { return ActorMap.Remove(Actor); }
@@ -885,12 +646,14 @@ struct FGlobalActorReplicationInfoMap
 	/** Sets class info for a given class and its derived classes if desired. Call this in your Replication Graphs setup */
 	FORCEINLINE void SetClassInfo(UClass* InClass, const FClassReplicationInfo& Info) {	ClassMap.Set(InClass, Info); }
 	
-	FORCEINLINE TMap<FActorRepListType, FGlobalActorReplicationInfo>::TIterator CreateActorMapIterator() { return ActorMap.CreateIterator(); }
+	FORCEINLINE TMap<FActorRepListType, TUniquePtr<FGlobalActorReplicationInfo>>::TIterator CreateActorMapIterator() { return ActorMap.CreateIterator(); }
 	FORCEINLINE TMap<FObjectKey, FClassReplicationInfo>::TIterator CreateClassMapIterator() { return ClassMap.CreateIterator(); }
 
+	int32 Num() const { return ActorMap.Num(); }
+
 private:
 
-	TMap<FActorRepListType, FGlobalActorReplicationInfo> ActorMap;
+	TMap<FActorRepListType, TUniquePtr<FGlobalActorReplicationInfo>> ActorMap;
 	TClassMap<FClassReplicationInfo> ClassMap;
 };
 
@@ -938,28 +701,34 @@ struct FPerConnectionActorInfoMap
 {
 	FORCEINLINE_DEBUGGABLE FConnectionReplicationActorInfo& FindOrAdd(const FActorRepListType& Actor)
 	{
-		if (FConnectionReplicationActorInfo* Value = Map.Find(Actor))
+		if (TUniquePtr<FConnectionReplicationActorInfo>* ValuePtr = Map.Find(Actor))
 		{
-			return *Value;
+			return *ValuePtr->Get();
 		}
-		FConnectionReplicationActorInfo NewInfo(GlobalMap->Get(Actor));
-
-		return Map.Emplace(Actor, GlobalMap->Get(Actor) );
+		FConnectionReplicationActorInfo* NewInfo = new FConnectionReplicationActorInfo(GlobalMap->Get(Actor));
+		Map.Emplace(Actor, TUniquePtr<FConnectionReplicationActorInfo>(NewInfo) );
+		return *NewInfo;
 	}
 
 	FORCEINLINE FConnectionReplicationActorInfo* Find(const FActorRepListType& Actor)
 	{
-		return Map.Find(Actor);
+		if (TUniquePtr<FConnectionReplicationActorInfo>* ValuePtr = Map.Find(Actor))
+		{
+			return ValuePtr->Get();
+		}
+
+		return nullptr;
 	}
 
-	FORCEINLINE TMap<FActorRepListType, FConnectionReplicationActorInfo>::TIterator CreateIterator()
+	FORCEINLINE TMap<FActorRepListType, TUniquePtr<FConnectionReplicationActorInfo>>::TIterator CreateIterator()
 	{
 		return Map.CreateIterator();
 	}
 
 	FORCEINLINE FConnectionReplicationActorInfo& FindChecked(const FActorRepListType& Actor)
 	{
-		return Map.FindChecked(Actor);
+		TUniquePtr<FConnectionReplicationActorInfo>& ValuePtr = Map.FindChecked(Actor);
+		return *ValuePtr.Get();
 	}
 
 	FORCEINLINE void SetGlobalMap(FGlobalActorReplicationInfoMap* InGlobalMap)
@@ -967,8 +736,10 @@ struct FPerConnectionActorInfoMap
 		GlobalMap = InGlobalMap;
 	}
 
+	int32 Num() const { return Map.Num(); }
+
 private:
-	TMap<FActorRepListType, FConnectionReplicationActorInfo> Map;
+	TMap<FActorRepListType, TUniquePtr<FConnectionReplicationActorInfo>> Map;
 	FGlobalActorReplicationInfoMap* GlobalMap;
 };
 
@@ -1032,26 +803,30 @@ struct FSkippedActorFullDebugDetails
 /** Prioritized List of actors to replicate. This is what we actually use to replicate actors. */
 struct FPrioritizedRepList
 {
-	FPrioritizedRepList(FReplicationListCategory InCategory) : ListCategory(InCategory) { }
+	FPrioritizedRepList() { }
 	struct FItem
 	{
-		// FIXME: We cannot store pointers to backing actor data yet because of how they are stored in (unstable) TMaps
-
-		FItem(float InPriority, FActorRepListType InActor /*, FGlobalActorReplicationInfo* InGlobal, FReplicationConnectionActorInfo* InConn*/) 
-			: Priority(InPriority), Actor(InActor) /*, GlobalData(InGlobal), ConnectionData(InConn)*/ { }
+		FItem(float InPriority, FActorRepListType InActor, FGlobalActorReplicationInfo* InGlobal, FConnectionReplicationActorInfo* InConn) 
+			: Priority(InPriority), Actor(InActor) , GlobalData(InGlobal), ConnectionData(InConn) { }
 		bool operator<(const FItem& Other) const { return Priority < Other.Priority; }
 
 		float Priority;
 		FActorRepListType Actor;
-
-		/*
+		
 		FGlobalActorReplicationInfo* GlobalData;
-		FReplicationConnectionActorInfo* ConnectionData;
-		*/
+		FConnectionReplicationActorInfo* ConnectionData;
 	};
 
 	TArray<FItem> Items;
-	FReplicationListCategory ListCategory;
+
+	void Reset()
+	{ 
+		Items.Reset(); 
+#if REPGRAPH_DETAILS
+		FullDebugDetails.Reset();
+		SkippedDebugDetails.Reset();
+#endif
+	}
 	
 #if REPGRAPH_DETAILS
 	FPrioritizedActorFullDebugDetails* GetNextFullDebugDetails(FActorRepListType Actor)
diff --git a/Engine/Plugins/Runtime/ReplicationGraph/Source/ReplicationGraph.Build.cs b/Engine/Plugins/Runtime/ReplicationGraph/Source/ReplicationGraph.Build.cs
index 119083310dd4..f80c82c3cad3 100644
--- a/Engine/Plugins/Runtime/ReplicationGraph/Source/ReplicationGraph.Build.cs
+++ b/Engine/Plugins/Runtime/ReplicationGraph/Source/ReplicationGraph.Build.cs
@@ -17,9 +17,9 @@ public class ReplicationGraph : ModuleRules
 			}
 		);
 
-        PrivateIncludePaths.AddRange(
-            new string[] {
-                "Private"
-            });     
-    }
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				"Private"
+			});     
+		}
 }
diff --git a/Engine/Plugins/Runtime/SignificanceManager/Source/SignificanceManager/Private/SignificanceManager.cpp b/Engine/Plugins/Runtime/SignificanceManager/Source/SignificanceManager/Private/SignificanceManager.cpp
index f9f961ec2d39..12ad9c79498a 100644
--- a/Engine/Plugins/Runtime/SignificanceManager/Source/SignificanceManager/Private/SignificanceManager.cpp
+++ b/Engine/Plugins/Runtime/SignificanceManager/Source/SignificanceManager/Private/SignificanceManager.cpp
@@ -409,7 +409,7 @@ void USignificanceManager::Update(TArrayView<const FTransform> InViewpoints)
 		SCOPE_CYCLE_COUNTER(STAT_SignificanceManager_SignificanceSort);
 		for (TPair<FName, TArray<const FManagedObjectInfo*>>& TagToObjectInfoArrayPair : ManagedObjectsByTag)
 		{
-			TagToObjectInfoArrayPair.Value.Sort(PickCompareBySignificance(bSortSignificanceAscending));
+			TagToObjectInfoArrayPair.Value.StableSort(PickCompareBySignificance(bSortSignificanceAscending));
 		}
 	}
 }
diff --git a/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Private/SoundNodeModPlayer.cpp b/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Private/SoundNodeModPlayer.cpp
index 26847ef66226..38345dd192b1 100644
--- a/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Private/SoundNodeModPlayer.cpp
+++ b/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Private/SoundNodeModPlayer.cpp
@@ -120,7 +120,7 @@ void USoundNodeModPlayer::ParseNodes( FAudioDevice* AudioDevice, const UPTRINT N
 	}
 }
 
-float USoundNodeModPlayer::GetDuration() const
+float USoundNodeModPlayer::GetDuration()
 {
 	float Duration = 0.f;
 	if (SoundMod)
diff --git a/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Public/SoundNodeModPlayer.h b/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Public/SoundNodeModPlayer.h
index 609dcd197d82..fe77b63a4be0 100644
--- a/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Public/SoundNodeModPlayer.h
+++ b/Engine/Plugins/Runtime/SoundMod/Source/SoundMod/Public/SoundNodeModPlayer.h
@@ -52,7 +52,7 @@ public:
 
 	//~ Begin USoundNode Interface
 	virtual int32 GetMaxChildNodes() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual void ParseNodes(FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances) override;
 #if WITH_EDITOR
 	virtual FText GetTitle() const override;
diff --git a/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Private/SoundSimple.cpp b/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Private/SoundSimple.cpp
index b67016b30deb..0b17c58745df 100644
--- a/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Private/SoundSimple.cpp
+++ b/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Private/SoundSimple.cpp
@@ -106,7 +106,7 @@ float USoundSimple::GetMaxDistance() const
 	return MaxDistance;
 }
 
-float USoundSimple::GetDuration() const
+float USoundSimple::GetDuration()
 {
 	return Duration;
 }
\ No newline at end of file
diff --git a/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Public/SoundSimple.h b/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Public/SoundSimple.h
index da74fff5ae6e..1d090c883142 100644
--- a/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Public/SoundSimple.h
+++ b/Engine/Plugins/Runtime/SoundUtilities/Source/SoundUtilities/Public/SoundSimple.h
@@ -59,7 +59,7 @@ public:
 	virtual bool IsPlayable() const override;
 	virtual void Parse(class FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances) override;
 	virtual float GetMaxDistance() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	//~ End USoundBase Interface.
 
 protected:
diff --git a/Engine/Plugins/Slate/SlateRemote/SlateRemote.uplugin b/Engine/Plugins/Slate/SlateRemote/SlateRemote.uplugin
index 5c80667acad0..3f66d2062e15 100644
--- a/Engine/Plugins/Slate/SlateRemote/SlateRemote.uplugin
+++ b/Engine/Plugins/Slate/SlateRemote/SlateRemote.uplugin
@@ -3,7 +3,7 @@
 	"Version" : 1,
 	"VersionName" : "1.0",
 	"FriendlyName" : "Slate Remote",
-	"Description" : "Enables support for the UE4 Remote iOS application to remotely control games with your iPhone, iPad or iPod.",
+	"Description" : "Enables support for the UE4 Remote iOS application to remotely control games with your iPhone, iPad or iPod.  Only available in non-shipping builds",
 	"Category" : "Misc",
 	"CreatedBy" : "Epic Games, Inc.",
 	"CreatedByURL" : "http://epicgames.com",
@@ -20,9 +20,12 @@
 			"Name" : "SlateRemote",
 			"Type" : "RuntimeNoCommandlet",
 			"LoadingPhase" : "Default",
-			"BlacklistPlatforms" :
+			"WhitelistPlatforms" :
 			[
-				"HTML5"
+				"Mac",
+				"Linux",
+				"Win32",
+				"Win64"
 			]
 		}
 	]
diff --git a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.cpp b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.cpp
index 6fb45d3cde03..b21f7c686f6e 100644
--- a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.cpp
+++ b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.cpp
@@ -1,6 +1,9 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Server/SlateRemoteServer.h"
+
+#if WITH_SLATE_REMOTE_SERVER
+
 #include "Common/UdpSocketBuilder.h"
 #include "Framework/Application/SlateApplication.h"
 #include "Widgets/SViewport.h"
@@ -168,7 +171,7 @@ void FSlateRemoteServer::ProcessTouchMessage( const FSlateRemoteServerMessage& M
 			}
 
 			// create the event struct
-			FPointerEvent Event(0, Message.Handle, ScreenPosition, LastTouchPositions[Message.Handle], Message.DataType != DT_TouchEnded);
+			FPointerEvent Event(0, Message.Handle, ScreenPosition, LastTouchPositions[Message.Handle], Message.DataType == DT_TouchEnded ? 0.0f : 1.0f, Message.DataType != DT_TouchEnded);
 			LastTouchPositions[Message.Handle] = ScreenPosition;
 
 			// send input to handler
@@ -198,6 +201,7 @@ void FSlateRemoteServer::ProcessTouchMessage( const FSlateRemoteServerMessage& M
 
 bool FSlateRemoteServer::HandleTicker( float DeltaTime )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FSlateRemoteServer_HandleTicker);
 	FSlateRemoteServerMessage Message; // @todo SlateRemote: this is sketchy; byte ordering and packing ignored; use FArchive!
 	int32 BytesRead;
 
@@ -265,3 +269,5 @@ bool FSlateRemoteServer::HandleTicker( float DeltaTime )
 
 	return true;
 }
+
+#endif // WITH_SLATE_REMOTE_SERVER
diff --git a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.h b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.h
index 66a44198b2de..36f5c86922ad 100644
--- a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.h
+++ b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServer.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#if WITH_SLATE_REMOTE_SERVER
+
 #include "CoreMinimal.h"
 #include "Containers/Ticker.h"
 #include "Layout/WidgetPath.h"
@@ -97,3 +99,5 @@ private:
 	/** Ever increasing timestamp to send to the input system. */
 	double Timestamp;
 };
+
+#endif // WITH_SLATE_REMOTE_SERVER
diff --git a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServerMessage.h b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServerMessage.h
index 80c3f58b85d2..bc28a4753916 100644
--- a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServerMessage.h
+++ b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/Server/SlateRemoteServerMessage.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#if WITH_SLATE_REMOTE_SERVER
+
 #include "CoreMinimal.h"
 
 // magic number that must match UDKRemote
@@ -67,3 +69,5 @@ struct FSlateRemoteServerMessage
 	/** X/Y or Pitch/Yaw data or CoreMotion data */
 	float Data[12];
 };
+
+#endif // WITH_SLATE_REMOTE_SERVER
diff --git a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/SlateRemoteModule.cpp b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/SlateRemoteModule.cpp
index cd8f90ef4a33..af519fce651b 100644
--- a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/SlateRemoteModule.cpp
+++ b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/Private/SlateRemoteModule.cpp
@@ -85,6 +85,7 @@ protected:
 	/** Initializes the Slate Remote server with the current settings. */
 	void InitializeRemoteServer()
 	{
+#if WITH_SLATE_REMOTE_SERVER
 		ShutdownRemoteServer();
 
 		USlateRemoteSettings* Settings = GetMutableDefault<USlateRemoteSettings>();
@@ -139,11 +140,13 @@ protected:
 		{
 			GLog->Logf(TEXT("Error: SlateRemote: Failed to acquire socket subsystem."));
 		}
+#endif
 	}
 
 	/** Restarts the services that this modules provides. */
 	void RestartServices()
 	{
+#if WITH_SLATE_REMOTE_SERVER
 		const USlateRemoteSettings& Settings = *GetDefault<USlateRemoteSettings>();
 
 		if (Settings.EnableRemoteServer)
@@ -157,12 +160,15 @@ protected:
 		{
 			ShutdownRemoteServer();
 		}
+#endif
 	}
 
 	/** Shuts down the Slate Remote server. */
 	void ShutdownRemoteServer()
 	{
+#if WITH_SLATE_REMOTE_SERVER
 		RemoteServer.Reset();
+#endif
 	}
 
 	/**
@@ -172,6 +178,7 @@ protected:
 	 */
 	bool SupportsSlateRemote() const
 	{
+#if WITH_SLATE_REMOTE_SERVER
 		// disallow for commandlets
 		if (IsRunningCommandlet())
 		{
@@ -179,6 +186,9 @@ protected:
 		}
 
 		return true;
+#else
+		return false;
+#endif // WITH_SLATE_REMOTE_SERVER
 	}
 
 private:
@@ -204,9 +214,10 @@ private:
 	}
 
 private:
-
+#if WITH_SLATE_REMOTE_SERVER
 	/** Holds the Slate Remote server. */
 	TSharedPtr<FSlateRemoteServer> RemoteServer;
+#endif
 };
 
 
diff --git a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/SlateRemote.Build.cs b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/SlateRemote.Build.cs
index 7d36a6947e25..559b37ba0552 100644
--- a/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/SlateRemote.Build.cs
+++ b/Engine/Plugins/Slate/SlateRemote/Source/SlateRemote/SlateRemote.Build.cs
@@ -33,6 +33,16 @@ namespace UnrealBuildTool.Rules
 					"SlateRemote/Private/Server",
 					"SlateRemote/Private/Shared",
 				});
+
+			// Only valid in non-shipping builds
+			if (Target.Configuration != UnrealTargetConfiguration.Shipping)
+			{
+				PrivateDefinitions.Add("WITH_SLATE_REMOTE_SERVER=1");
+			}
+			else
+			{
+				PrivateDefinitions.Add("WITH_SLATE_REMOTE_SERVER=0");
+			}
 		}
 	}
 }
diff --git a/Engine/Programs/CrashReportClient/Config/DefaultEngine.ini b/Engine/Programs/CrashReportClient/Config/DefaultEngine.ini
index e1a00af28d71..cbe03bcd0b53 100644
--- a/Engine/Programs/CrashReportClient/Config/DefaultEngine.ini
+++ b/Engine/Programs/CrashReportClient/Config/DefaultEngine.ini
@@ -5,4 +5,7 @@ bAllowToBeContacted=true
 bSendLogFile=true
 CanSendWhenUIFailedToInitialize=true
 UIInitRetryCount=10
-UIInitRetryInterval=2.0
\ No newline at end of file
+UIInitRetryInterval=2.0
+
+[/Script/Engine.NetworkSettings]
+n.VerifyPeer=false
diff --git a/Engine/Programs/ShaderCompileWorker/Config/Mac/MacEngine.ini b/Engine/Programs/ShaderCompileWorker/Config/Mac/MacEngine.ini
index c966376a32ae..1c8d41788116 100644
--- a/Engine/Programs/ShaderCompileWorker/Config/Mac/MacEngine.ini
+++ b/Engine/Programs/ShaderCompileWorker/Config/Mac/MacEngine.ini
@@ -1,3 +1,3 @@
 [DerivedDataBackendGraph]
-Shared=(Type=FileSystem, ReadOnly=false, Clean=false, Flush=false, DeleteUnused=true, UnusedFileAge=38, FoldersToClean=-1, Path=/Volumes/UE4DDC, EnvPathOverride=UE-SharedDataCachePath)
-AltShared=(Type=FileSystem, ReadOnly=true, Clean=false, Flush=false, DeleteUnused=true, UnusedFileAge=38, FoldersToClean=-1, Path=/Volumes/UE4DDC2, EnvPathOverride=UE-SharedDataCachePath2)
+Shared=(Type=FileSystem, ReadOnly=false, Clean=false, Flush=false, DeleteUnused=false, UnusedFileAge=38, FoldersToClean=-1, Path=/Volumes/UE4DDC, EnvPathOverride=UE-SharedDataCachePath)
+AltShared=(Type=FileSystem, ReadOnly=true, Clean=false, Flush=false, DeleteUnused=false, UnusedFileAge=38, FoldersToClean=-1, Path=/Volumes/UE4DDC2, EnvPathOverride=UE-SharedDataCachePath2)
diff --git a/Engine/Programs/UnrealGameSync/UnrealGameSync.ini b/Engine/Programs/UnrealGameSync/UnrealGameSync.ini
index a1b7a99caaae..0f1cc9146856 100644
--- a/Engine/Programs/UnrealGameSync/UnrealGameSync.ini
+++ b/Engine/Programs/UnrealGameSync/UnrealGameSync.ini
@@ -1,7 +1,12 @@
 [Options]
 UseFastModularVersioning=1
 +ExcludeChanges=lightmaps
-+ExcludeChanges=^Added collection '.*'\s*$
-+ExcludeChanges=^Added '.*' to collection '.*'\s*$
++ExcludeChanges=^Added collection '.*'\s*
++ExcludeChanges=^Added '.*' to collection '.*'\s*
 +ExcludeChanges=^Added \d+ objects to collection '.*':
++ExcludeChanges=^Removed '.*' from collection '.*'\s*
++ExcludeChanges=^Removed \d+ objects from collection '.*'
++ExcludeChanges=^Changed the dynamic query of collection '.*' to '.*'
 +ExcludeChanges=^Changed the parent of collection '.*'
++ExcludeChanges=^Upgraded collection '.*' \(was version \d+, now version \d+\)
++ExcludeChanges=^Collection '.*' not modified
\ No newline at end of file
diff --git a/Engine/Shaders/Private/CapsuleShadowShaders.usf b/Engine/Shaders/Private/CapsuleShadowShaders.usf
index 35559c64f077..c80a40c65319 100644
--- a/Engine/Shaders/Private/CapsuleShadowShaders.usf
+++ b/Engine/Shaders/Private/CapsuleShadowShaders.usf
@@ -993,8 +993,7 @@ void CapsuleShadowingCS(
 	float SceneDepth = CalcSceneDepth(ScreenUV);
 #endif
 	
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 OpaqueWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 	uint CulledDataParameter = 0;
 	bool bTileShouldComputeShadowing = true;
diff --git a/Engine/Shaders/Private/ColorSpace.ush b/Engine/Shaders/Private/ColorSpace.ush
new file mode 100644
index 000000000000..24481780ce64
--- /dev/null
+++ b/Engine/Shaders/Private/ColorSpace.ush
@@ -0,0 +1,134 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+//------------------------------------------------------------------
+// LMS
+// https://en.wikipedia.org/wiki/LMS_color_space
+//------------------------------------------------------------------
+
+static const float3x3 sRGB_2_LMS_MAT =
+{
+    17.8824,  43.5161,  4.1193,
+     3.4557,  27.1554,  3.8671,
+     0.02996,  0.18431, 1.4670,
+};
+
+static const float3x3 LMS_2_sRGB_MAT =
+{
+    0.0809,  -0.1305,   0.1167,
+   -0.0102,   0.0540,  -0.1136,
+   -0.0003,  -0.0041,   0.6935,
+};
+
+float3 sRGB_2_LMS( float3 RGB )
+{
+	return mul(sRGB_2_LMS_MAT, RGB);
+}
+
+float3 LMS_2_sRGB( float3 LMS )
+{
+	return mul(LMS_2_sRGB_MAT, LMS);
+}
+
+//------------------------------------------------------------------
+// CIE XYZ
+// https://en.wikipedia.org/wiki/CIE_1931_color_space
+//------------------------------------------------------------------
+
+static const float3x3 XYZ_2_LinearRGB_MAT =
+{
+	 3.2409699419, -1.5373831776, -0.4986107603,
+	-0.9692436363,  1.8759675015,  0.0415550574,
+	 0.0556300797, -0.2039769589,  1.0569715142,
+};
+
+static const float3x3 LinearRGB_2_XYZ_MAT =
+{
+	0.4124564, 0.3575761, 0.1804375,
+	0.2126729, 0.7151522, 0.0721750,
+	0.0193339, 0.1191920, 0.9503041,
+};
+
+float3 LinearRGB_2_XYZ( float3 LinearRGB )
+{
+	return mul(LinearRGB_2_XYZ_MAT, LinearRGB);
+}
+
+float3 XYZ_2_LinearRGB( float3 XYZ )
+{
+	return mul(XYZ_2_LinearRGB_MAT, XYZ);
+}
+
+//------------------------------------------------------------------
+// CIE LAB
+// https://en.wikipedia.org/wiki/Lab_color_space
+//------------------------------------------------------------------
+
+static const float3 XYZ_WHITE_REF_D65 = float3(95.047, 100.0, 108.883);
+static const float3 XYZ_WHITE_REF_D50 = float3(96.6797, 100.0, 82.5188);
+static const float XYZ_2_LAB_DELTA_SQUARED = 0.04280618311; // (6/29)^3
+static const float XYZ_2_LAB_DELTA_CUBED = 0.00885645167; // (6/29)^3
+
+float xyz_otherwise(float t)
+{
+	return (t / (3.0 * XYZ_2_LAB_DELTA_SQUARED)) + 4.0 / 29.0;
+}
+
+float3 LinearRGB_2_LAB( float3 LinearRGB, float3 ReferenceWhite )
+{
+	float3 XYZ = LinearRGB_2_XYZ(LinearRGB);
+
+	float t_X = XYZ.x / ReferenceWhite.x;
+	float t_Y = XYZ.y / ReferenceWhite.y;
+	float t_Z = XYZ.z / ReferenceWhite.z;
+
+	float f_X = (t_X > XYZ_2_LAB_DELTA_CUBED) ? pow(t_X, 1.0 / 3.0) : xyz_otherwise(t_X);
+	float f_Y = (t_Y > XYZ_2_LAB_DELTA_CUBED) ? pow(t_Y, 1.0 / 3.0) : xyz_otherwise(t_Y);
+	float f_Z = (t_Z > XYZ_2_LAB_DELTA_CUBED) ? pow(t_Z, 1.0 / 3.0) : xyz_otherwise(t_Z);
+
+	float L = ( 116.0 * f_Y ) - 16.0;
+	float a = 500.0 * ( f_X - f_Y );
+	float b = 200.0 * ( f_Y - f_Z );
+
+	return float3(L, a, b);
+}
+
+float lab_otherwise(float t)
+{
+	return (3.0 * XYZ_2_LAB_DELTA_SQUARED) * (t - (4.0 / 29.0));
+}
+
+float3 LAB_2_LinearRGB( float3 LAB, float3 ReferenceWhite)
+{
+	float L = LAB.x;
+	float a = LAB.y;
+	float b = LAB.z;
+
+	float t_y = (L + 16.0) / 116.0;
+	float t_x = t_y + (a / 500.0);
+	float t_z = t_y - (b / 200.0);
+
+	float f_x = pow(t_x, 3.0);
+	float f_y = pow(t_y, 3.0);
+	float f_z = pow(t_z, 3.0);
+
+	if (f_x <= XYZ_2_LAB_DELTA_CUBED)
+	{
+		f_x = lab_otherwise(t_x);
+	}
+
+	if (f_y <= XYZ_2_LAB_DELTA_CUBED)
+	{
+		f_y = lab_otherwise(t_y);
+	}
+
+	if (f_z <= XYZ_2_LAB_DELTA_CUBED)
+	{
+		f_z = lab_otherwise(t_z);
+	}
+
+	float X = ReferenceWhite.x * f_x;
+	float Y = ReferenceWhite.y * f_y;
+	float Z = ReferenceWhite.z * f_z;
+
+	return XYZ_2_LinearRGB(float3(X, Y, Z));
+}
\ No newline at end of file
diff --git a/Engine/Shaders/Private/DecalCommon.ush b/Engine/Shaders/Private/DecalCommon.ush
index 56c105289734..ef050461db10 100644
--- a/Engine/Shaders/Private/DecalCommon.ush
+++ b/Engine/Shaders/Private/DecalCommon.ush
@@ -23,6 +23,8 @@ half3 FrameBufferDecalBlendOp(half4 Source)
 	return (Source.rgb*Source.a) + (Dest.rgb*(1.0 - Source.a));
 #elif DECAL_BLEND_MODE == DECALBLENDMODEID_EMISSIVE
 	return (Source.rgb*Source.a) + Dest.rgb;
+#elif DECAL_BLEND_MODE == DECALBLENDMODEID_ALPHACOMPOSITE
+	return Source.rgb + (Dest.rgb*(1.0 - Source.a));
 #else
 	return Source.rgb;
 #endif
diff --git a/Engine/Shaders/Private/DeferredLightPixelShaders.usf b/Engine/Shaders/Private/DeferredLightPixelShaders.usf
index d8706bad8188..f4efddbecfc3 100644
--- a/Engine/Shaders/Private/DeferredLightPixelShaders.usf
+++ b/Engine/Shaders/Private/DeferredLightPixelShaders.usf
@@ -80,8 +80,7 @@ void DeferredLightPixelMain(
 		// With a perspective projection, the clip space position is NDC * Clip.w
 		// With an orthographic projection, clip space is the same as NDC
 		float2 ClipPosition = InScreenPosition.xy / InScreenPosition.w * (View.ViewToClip[3][3] < 1.0f ? SceneDepth : 1.0f);
-		float4 HomogeneousWorldPosition = mul(float4(ClipPosition, SceneDepth, 1), View.ScreenToWorld);
-		float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+		float3 WorldPosition = mul(float4(ClipPosition, SceneDepth, 1), View.ScreenToWorld).xyz;
 		float3 CameraVector = normalize(WorldPosition - View.WorldCameraOrigin);
 #else
 		float3 WorldPosition = ScreenVector * SceneDepth + View.WorldCameraOrigin;
diff --git a/Engine/Shaders/Private/DistanceFieldAOShared.ush b/Engine/Shaders/Private/DistanceFieldAOShared.ush
index f811015c6339..fd882a353000 100644
--- a/Engine/Shaders/Private/DistanceFieldAOShared.ush
+++ b/Engine/Shaders/Private/DistanceFieldAOShared.ush
@@ -60,21 +60,14 @@ SamplerState DistanceFieldNormalSampler;
 
 float4 EncodeDownsampledGBuffer(FGBufferData GBufferData, float SceneDepth)
 {
-	float DepthSign = HasDistanceFieldRepresentation(GBufferData) > 0 ? 1 : -1;
-	float ZSign = GBufferData.ShadingModelID == SHADINGMODELID_UNLIT ? -1 : 1;
-	float ZChannel = GBufferData.WorldNormal.z > 0 ? .5f : 1;
-	float4 OutValue = float4(GBufferData.WorldNormal.xy, ZChannel * ZSign, DepthSign * SceneDepth);
-	return OutValue;
-}
+	return float4(GBufferData.WorldNormal.xyz, SceneDepth);
+} 
 
-void GetDownsampledGBuffer(float2 ScreenUV, out float3 OutNormal, out float OutDepth, out bool bHasDistanceFieldRepresentation, out bool bLit)
+void GetDownsampledGBuffer(float2 ScreenUV, out float3 OutNormal, out float OutDepth)
 {
 	float4 TextureValue = Texture2DSampleLevel(DistanceFieldNormalTexture, DistanceFieldNormalSampler, ScreenUV, 0);
-	bHasDistanceFieldRepresentation = TextureValue.w > 0;
-	bLit = TextureValue.z > 0; 
-	OutDepth = abs(TextureValue.w);
-	OutNormal = float3(TextureValue.xy, sqrt(1 - dot(TextureValue.xy, TextureValue.xy)));
-	OutNormal.z *= abs(TextureValue.z) > .75f ? -1 : 1;
+	OutNormal = TextureValue.xyz;
+	OutDepth = TextureValue.w;
 }
 
 float GetDownsampledDepth(float2 ScreenUV)
@@ -173,6 +166,58 @@ float3 ComputeBentNormal(float3 RecordWorldNormal, uint RelativeRecordIndex)
 	return UnoccludedDirection;
 }
 
+float2 AOBufferBilinearUVMax;
+
+float3 UpsampleDFAO(float4 UVAndScreenPos)
+{
+	// Distance field AO was computed at 0,0 regardless of viewrect min
+	float2 DistanceFieldUVs = UVAndScreenPos.xy - View.ViewRectMin.xy * View.BufferSizeAndInvSize.zw;
+	DistanceFieldUVs = min(DistanceFieldUVs, AOBufferBilinearUVMax);
+
+#define BILATERAL_UPSAMPLE 1
+#if BILATERAL_UPSAMPLE
+	float2 LowResBufferSize = floor(View.BufferSizeAndInvSize.xy / AO_DOWNSAMPLE_FACTOR);
+	float2 LowResTexelSize = 1.0f / LowResBufferSize;
+	float2 Corner00UV = floor(DistanceFieldUVs * LowResBufferSize - .5f) / LowResBufferSize + .5f * LowResTexelSize;
+	float2 BilinearWeights = (DistanceFieldUVs - Corner00UV) * LowResBufferSize;
+
+	float4 TextureValues00 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV, 0);
+	float4 TextureValues10 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + float2(LowResTexelSize.x, 0), 0);
+	float4 TextureValues01 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + float2(0, LowResTexelSize.y), 0);
+	float4 TextureValues11 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + LowResTexelSize, 0);
+
+	float4 CornerWeights = float4(
+		(1 - BilinearWeights.y) * (1 - BilinearWeights.x),
+		(1 - BilinearWeights.y) * BilinearWeights.x,
+		BilinearWeights.y * (1 - BilinearWeights.x),
+		BilinearWeights.y * BilinearWeights.x);
+
+	float Epsilon = .0001f;
+
+	float4 CornerDepths = float4(TextureValues00.w, TextureValues10.w, TextureValues01.w, TextureValues11.w);
+	float SceneDepth = CalcSceneDepth(UVAndScreenPos.xy);
+	float4 DepthWeights = 1.0f / (abs(CornerDepths - SceneDepth.xxxx) + Epsilon);
+	float4 FinalWeights = CornerWeights * DepthWeights;
+
+	float InvWeight = 1.0f / dot(FinalWeights, 1);
+
+	float3 InterpolatedResult =
+		(FinalWeights.x * TextureValues00.xyz
+			+ FinalWeights.y * TextureValues10.xyz
+			+ FinalWeights.z * TextureValues01.xyz
+			+ FinalWeights.w * TextureValues11.xyz)
+		* InvWeight;
+
+	float3 BentNormal = InterpolatedResult.xyz;
+
+#else
+	float3 BentNormal = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, DistanceFieldUVs, 0).xyz;
+
+#endif
+
+	return BentNormal;
+}
+
 #ifndef CULLED_TILE_SIZEX
 #define CULLED_TILE_SIZEX 4
 #endif
@@ -223,10 +268,6 @@ float2 GetScreenUVFromScreenGrid(uint2 OutputCoordinate)
 
 Buffer<uint> CulledTilesStartOffsetArray;
 
-RWBuffer<uint> RWNumCulledTilesArray;
-RWBuffer<uint> RWCulledTilesStartOffsetArray;
-RWBuffer<uint> RWCulledTileDataArray;
-
 #define INVALID_TILE_INDEX 0xFFFF
 
 #ifndef CULLED_TILE_DATA_STRIDE
diff --git a/Engine/Shaders/Private/DistanceFieldGlobalIllumination.usf b/Engine/Shaders/Private/DistanceFieldGlobalIllumination.usf
index 72f556c03720..16764dea0a8a 100644
--- a/Engine/Shaders/Private/DistanceFieldGlobalIllumination.usf
+++ b/Engine/Shaders/Private/DistanceFieldGlobalIllumination.usf
@@ -1052,9 +1052,7 @@ void ComputeStepBentNormalScreenGridCS(
 
 	float3 WorldNormal;
 	float SceneDepth;
-	bool bHasDistanceFieldRepresentation;
-	bool bLit;
-	GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+	GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 	float3 TangentX;
 	float3 TangentY;
@@ -1100,9 +1098,7 @@ void ComputeIrradianceScreenGridCS(
 	{
 		float3 WorldNormal;
 		float SceneDepth;
-		bool bHasDistanceFieldRepresentation;
-		bool bLit;
-		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 		float3 TangentX;
 		float3 TangentY;
@@ -1113,8 +1109,7 @@ void ComputeIrradianceScreenGridCS(
 		float2 ScreenUV = GetScreenUVFromScreenGrid(OutputCoordinate);
 		float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 		
-		float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-		float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+		float3 OpaqueWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 		uint2 TileCoordinate = ComputeTileCoordinateFromScreenGrid(OutputCoordinate);
 
 		Irradiance = GatherIrradianceFromVPLs(OpaqueWorldPosition, WorldNormal, StepBentNormalBaseIndex, TileCoordinate, ThreadIndex);
diff --git a/Engine/Shaders/Private/DistanceFieldLightingPost.usf b/Engine/Shaders/Private/DistanceFieldLightingPost.usf
index c4250fe2337c..a0c1b45754b5 100644
--- a/Engine/Shaders/Private/DistanceFieldLightingPost.usf
+++ b/Engine/Shaders/Private/DistanceFieldLightingPost.usf
@@ -9,20 +9,11 @@
 #include "DistanceFieldLightingShared.ush"
 #include "DistanceFieldAOShared.ush"
 
-// Stores a confidence value for each AO value
-// A confidence of 0 means the AO value was constructed during the upsample from samples that were distant, which causes leaking
-Texture2D ConfidenceTexture;
-
 Texture2D BentNormalHistoryTexture;
-Texture2D ConfidenceHistoryTexture;
 SamplerState BentNormalHistorySampler;
-#if !SUPPORTS_INDEPENDENT_SAMPLERS
-SamplerState ConfidenceHistorySampler;
-#endif
 Texture2D IrradianceHistoryTexture;
 SamplerState IrradianceHistorySampler;
 float HistoryWeight;
-float AOHistoryMinConfidenceScale;
 float HistoryDistanceThreshold;
 float UseHistoryFilter;
 
@@ -32,19 +23,12 @@ float4 HistoryUVMinMax;
 Texture2D VelocityTexture;
 SamplerState VelocityTextureSampler;
 
-float ComputeHistoryWeightBasedOnPosition(float2 ScreenPosition, float SceneDepth, float2 OldScreenPosition, float HistoryDepth)
+float ComputeHistoryWeightBasedOnPosition(float2 ScreenPosition, float SceneDepth, float2 OldScreenPosition, float HistoryCameraDepth)
 {
-	float3 WorldPosition;
-	float3 PrevWorldPosition;
+	float3 WorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
-	{
-		float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-		WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
-
-		float4 PrevPositionTranslatedWorld = mul(float4(OldScreenPosition * HistoryDepth, HistoryDepth, 1), View.PrevScreenToTranslatedWorld);
-		PrevPositionTranslatedWorld.xyz /= PrevPositionTranslatedWorld.w;	
-		PrevWorldPosition = PrevPositionTranslatedWorld.xyz - View.PrevPreViewTranslation;
-	}
+	float3 PrevPositionTranslatedWorld = mul(float4(OldScreenPosition * HistoryCameraDepth, HistoryCameraDepth, 1), View.PrevScreenToTranslatedWorld).xyz;
+	float3 PrevWorldPosition = PrevPositionTranslatedWorld - View.PrevPreViewTranslation;
 
 	float DistanceToHistoryValue = length(PrevWorldPosition - WorldPosition);
 	float RelativeHistoryDistanceThreshold = HistoryDistanceThreshold / 1000.0f;
@@ -52,24 +36,142 @@ float ComputeHistoryWeightBasedOnPosition(float2 ScreenPosition, float SceneDept
 	return DistanceToHistoryValue / SceneDepth > RelativeHistoryDistanceThreshold ? 0.0f : 1.0f;
 }
 
+float2 DistanceFieldGBufferTexelSize;
+float2 DistanceFieldGBufferJitterOffset;
+float4 BentNormalBufferAndTexelSize;
+float MinDownsampleFactorToBaseLevel;
+
+float4 GetNormalWeights(float2 Corner00UV, float2 LowResTexelSize, float3 WorldNormal)
+{
+	float4 NormalWeights;
+
+	{
+		float3 SampleWorldNormal;
+		float Unused;
+		GetDownsampledGBuffer(Corner00UV, SampleWorldNormal, Unused);
+		NormalWeights.x = dot(SampleWorldNormal, WorldNormal);
+	}
+
+	{
+		float3 SampleWorldNormal;
+		float Unused;
+		GetDownsampledGBuffer(Corner00UV + float2(LowResTexelSize.x, 0), SampleWorldNormal, Unused);
+		NormalWeights.y = dot(SampleWorldNormal, WorldNormal);
+	}
+
+	{
+		float3 SampleWorldNormal;
+		float Unused;
+		GetDownsampledGBuffer(Corner00UV + float2(0, LowResTexelSize.y), SampleWorldNormal, Unused);
+		NormalWeights.z = dot(SampleWorldNormal, WorldNormal);
+	}
+
+	{
+		float3 SampleWorldNormal;
+		float Unused;
+		GetDownsampledGBuffer(Corner00UV + LowResTexelSize, SampleWorldNormal, Unused);
+		NormalWeights.w = dot(SampleWorldNormal, WorldNormal);
+	}
+
+	return max(NormalWeights, .0001f);
+}
+
+// 1 / ((1 - FadeDistanceFraction) * AOMaxViewDistance)
+float DistanceFadeScale;
+
+float ComputeSampleWeightBasedOnPosition(float4 ReferencePlane, float2 SampleScreenUV, float SampleDepth)
+{
+	float2 SampleScreenPosition = (SampleScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
+	float3 SampleWorldPosition = mul(float4(SampleScreenPosition * SampleDepth, SampleDepth, 1), View.ScreenToWorld).xyz;
+
+	float PlaneDistance = dot(ReferencePlane, float4(SampleWorldPosition, 1));
+
+	float Epsilon = .0001f;
+	float RelativeDistance = 1000 * abs(PlaneDistance) / SampleDepth;
+	return min(10.0f / (RelativeDistance + Epsilon), 1);
+}
+
+void GeometryAwareUpsample(float4 UVAndScreenPos, out float4 OutBentNormal)
+{
+	float3 WorldNormal;
+	float SceneDepth;
+	GetDownsampledGBuffer(UVAndScreenPos.xy, WorldNormal, SceneDepth);
+
+	float3 WorldPosition = mul(float4(UVAndScreenPos.zw * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
+
+	float4 ReferencePlane = float4(WorldNormal, -dot(WorldPosition, WorldNormal));
+
+	float2 LowResBufferSize = BentNormalBufferAndTexelSize.xy;
+	float2 LowResTexelSize = BentNormalBufferAndTexelSize.zw;
+	float2 Corner00UV = floor((UVAndScreenPos.xy - DistanceFieldGBufferJitterOffset) * LowResBufferSize) * LowResTexelSize;
+	float2 BilinearWeights = (UVAndScreenPos.xy - Corner00UV - DistanceFieldGBufferJitterOffset) * LowResBufferSize;
+	float2 LowResCorner00UV = Corner00UV + .5f * LowResTexelSize;
+
+	float4 TextureValues00 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV, 0);
+	float4 TextureValues10 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + float2(LowResTexelSize.x, 0), 0);
+	float4 TextureValues01 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + float2(0, LowResTexelSize.y), 0);
+	float4 TextureValues11 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + LowResTexelSize, 0);
+
+	float4 CornerWeights = float4(
+		(1 - BilinearWeights.y) * (1 - BilinearWeights.x),
+		(1 - BilinearWeights.y) * BilinearWeights.x,
+		BilinearWeights.y * (1 - BilinearWeights.x),
+		BilinearWeights.y * BilinearWeights.x);
+
+	float4 CornerDepths = float4(TextureValues00.w, TextureValues10.w, TextureValues01.w, TextureValues11.w);
+
+	float4 PositionWeights;
+	PositionWeights.x = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV, CornerDepths.x);
+	PositionWeights.y = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + float2(LowResTexelSize.x, 0), CornerDepths.y);
+	PositionWeights.z = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + float2(0, LowResTexelSize.y), CornerDepths.z);
+	PositionWeights.w = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + LowResTexelSize, CornerDepths.w);
+
+	//float4 DepthWeights = max(exp2(-abs(CornerDepths - SceneDepth.xxxx) * .01f), .001f);
+	float Epsilon = .0001f;
+	//float4 DepthWeights = min(10.0f / (abs(CornerDepths - SceneDepth.xxxx) + Epsilon), 1);
+
+	float2 FullResCorner00UV = Corner00UV + DistanceFieldGBufferJitterOffset + 0.5f * DistanceFieldGBufferTexelSize;
+	float4 NormalWeights = GetNormalWeights(FullResCorner00UV, LowResTexelSize, WorldNormal);
+
+	float4 FinalWeights = CornerWeights * PositionWeights * NormalWeights;
+
+	float InvSafeWeight = 1.0f / max(dot(FinalWeights, 1), .00001f);
+
+	float3 AverageBentNormal =
+		(FinalWeights.x * TextureValues00.xyz
+			+ FinalWeights.y * TextureValues10.xyz
+			+ FinalWeights.z * TextureValues01.xyz
+			+ FinalWeights.w * TextureValues11.xyz)
+		* InvSafeWeight;
+
+	OutBentNormal = float4(AverageBentNormal, SceneDepth);
+
+	// Fade to unoccluded in the distance
+	//@todo - box distance from largest cascade
+	float BentNormalLength = length(OutBentNormal.rgb);
+	float FadeAlpha = saturate((AOMaxViewDistance - SceneDepth) * DistanceFadeScale);
+	float3 NormalizedBentNormal = OutBentNormal.rgb / max(BentNormalLength, .0001f);
+	OutBentNormal.rgb = NormalizedBentNormal * lerp(1, BentNormalLength, FadeAlpha);
+	//OutBentNormal = float4(WorldNormal, SceneDepth);
+}
+
+void GeometryAwareUpsamplePS(
+	in float4 UVAndScreenPos : TEXCOORD0
+	, out float4 OutBentNormal : SV_Target0
+	)
+{
+	GeometryAwareUpsample(UVAndScreenPos, OutBentNormal);
+}
+
 /** Reproject the occlusion history. */
 void UpdateHistoryDepthRejectionPS(
 	in float4 UVAndScreenPos : TEXCOORD0
 	,out float4 OutBentNormal : SV_Target0
-	,out float OutConfidence : SV_Target1
-#if SUPPORT_IRRADIANCE
-	,out float4 OutIrradiance : SV_Target2
-#endif
 	)
 {
-	// Distance field AO was computed at 0,0 regardless of viewrect min
-	float2 DistanceFieldUVs = UVAndScreenPos.xy - View.ViewRectMin.xy * View.BufferSizeAndInvSize.zw;
-	float4 NewValue = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, DistanceFieldUVs, 0);
-#if SUPPORTS_INDEPENDENT_SAMPLERS
-	float NewConfidence = Texture2DSampleLevel(ConfidenceTexture, BentNormalAOSampler, DistanceFieldUVs, 0);
-#else
-	float NewConfidence = Texture2DSampleLevel(ConfidenceTexture, ConfidenceSampler, DistanceFieldUVs, 0);
-#endif
+	float4 NewValue;
+	GeometryAwareUpsample(UVAndScreenPos, NewValue);
+
 	float SceneDepth = NewValue.w;
 
 	float4 ThisClip = float4( UVAndScreenPos.zw, ConvertToDeviceZ(SceneDepth), 1 );
@@ -98,8 +200,8 @@ void UpdateHistoryDepthRejectionPS(
 		EffectiveHistoryWeight = 0;
 	}
 
-	// Only reduce history weight when we are moving enough that the flickering will not be apparent
-	float EffectiveHistoryMinConfidenceScale = lerp(1, AOHistoryMinConfidenceScale, saturate(PixelSpeed));
+	// It's not enough just to set EffectiveHistoryWeight to 0, as sampling from invalid history region may result in a NaN
+	OldDistanceFieldUVs = clamp(OldDistanceFieldUVs, HistoryUVMinMax.xy, HistoryUVMinMax.zw);
 
 // Manual resample disabled as it doesn't affect the artifacts that cause most ghosting
 #define MANUAL_HISTORY_RESAMPLE 0
@@ -118,18 +220,6 @@ void UpdateHistoryDepthRejectionPS(
 		float4 Corner11Value = Texture2DSampleLevel(BentNormalHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner11, 0);
 		float4 Corner10Value = Texture2DSampleLevel(BentNormalHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner10, 0);
 
-#if SUPPORTS_INDEPENDENT_SAMPLERS
-		float Corner00Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner00, 0);
-		float Corner01Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner01, 0);
-		float Corner11Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner11, 0);
-		float Corner10Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVsCorner10, 0);
-#else
-		float Corner00Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, ConfidenceHistorySampler, OldDistanceFieldUVsCorner00, 0);
-		float Corner01Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, ConfidenceHistorySampler, OldDistanceFieldUVsCorner01, 0);
-		float Corner11Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, ConfidenceHistorySampler, OldDistanceFieldUVsCorner11, 0);
-		float Corner10Confidence = Texture2DSampleLevel(ConfidenceHistoryTexture, ConfidenceHistorySampler, OldDistanceFieldUVsCorner10, 0);
-#endif
-
 	#define COMPUTE_SEPARATE_POSITION_WEIGHTS 1
 	#if COMPUTE_SEPARATE_POSITION_WEIGHTS
 		float PositionWeight00 = ComputeHistoryWeightBasedOnPosition(UVAndScreenPos.zw, SceneDepth, OldScreenPosition, Corner00Value.w);
@@ -146,16 +236,8 @@ void UpdateHistoryDepthRejectionPS(
 			+ BilinearWeight01 * lerp(NewValue.xyz, Corner01Value.xyz, PositionWeight01)
 			+ BilinearWeight11 * lerp(NewValue.xyz, Corner11Value.xyz, PositionWeight11)
 			+ BilinearWeight10 * lerp(NewValue.xyz, Corner10Value.xyz, PositionWeight10));
-		
-		float HistoryConfidence = (BilinearWeight00 * lerp(NewConfidence, Corner00Confidence, PositionWeight00)
-			+ BilinearWeight01 * lerp(NewConfidence, Corner01Confidence, PositionWeight01)
-			+ BilinearWeight11 * lerp(NewConfidence, Corner11Confidence, PositionWeight11)
-			+ BilinearWeight10 * lerp(NewConfidence, Corner10Confidence, PositionWeight10));
-
-		EffectiveHistoryWeight *= clamp(HistoryConfidence, EffectiveHistoryMinConfidenceScale, 1);
 
 		OutBentNormal.rgb = lerp(NewValue.rgb, HistoryValue.rgb, EffectiveHistoryWeight);
-		OutConfidence = lerp(NewConfidence, HistoryConfidence, EffectiveHistoryWeight);
 
 		EffectiveHistoryWeight *= (PositionWeight00 > 0 || PositionWeight01 > 0 || PositionWeight11 > 0 || PositionWeight10 > 0) ? 1.0f : 0.0f;
 		
@@ -182,61 +264,32 @@ void UpdateHistoryDepthRejectionPS(
 		float4 VerticalLerp1 = lerp(Corner10Value, Corner11Value, LerpWeights.y);
 		float4 HistoryValue = lerp(VerticalLerp0, VerticalLerp1, LerpWeights.x);
 
-		float VerticalLerp0Confidence = lerp(Corner00Confidence, Corner01Confidence, LerpWeights.y);
-		float VerticalLerp1Confidence = lerp(Corner10Confidence, Corner11Confidence, LerpWeights.y);
-		float HistoryConfidence = lerp(VerticalLerp0Confidence, VerticalLerp1Confidence, LerpWeights.x);
-
 		float PositionWeight = ComputeHistoryWeightBasedOnPosition(UVAndScreenPos.zw, SceneDepth, OldScreenPosition, HistoryValue.w);
 		EffectiveHistoryWeight *= PositionWeight;
-		EffectiveHistoryWeight *= clamp(HistoryConfidence, EffectiveHistoryMinConfidenceScale, 1);
 
 		OutBentNormal.rgb = lerp(NewValue.rgb, HistoryValue.rgb, EffectiveHistoryWeight);
-		OutConfidence = lerp(NewConfidence, HistoryConfidence, EffectiveHistoryWeight);
 	#endif
 
 #else
 	// Fast path that uses hardware interpolation
 	// This fails to reject based on depth consistently because the depth has been filtered
 	float4 HistoryValue = Texture2DSampleLevel(BentNormalHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVs, 0);
-#if SUPPORTS_INDEPENDENT_SAMPLERS
-	float HistoryConfidence = Texture2DSampleLevel(ConfidenceHistoryTexture, BentNormalHistorySampler, OldDistanceFieldUVs, 0);
-#else
-	float HistoryConfidence = Texture2DSampleLevel(ConfidenceHistoryTexture, ConfidenceHistorySampler, OldDistanceFieldUVs, 0);
-#endif
 	float PositionWeight = ComputeHistoryWeightBasedOnPosition(UVAndScreenPos.zw, SceneDepth, OldScreenPosition, HistoryValue.w);
 
 	EffectiveHistoryWeight *= PositionWeight;
-	EffectiveHistoryWeight *= clamp(HistoryConfidence, EffectiveHistoryMinConfidenceScale, 1);
 
 	OutBentNormal.rgb = lerp(NewValue.rgb, HistoryValue.rgb, EffectiveHistoryWeight);
-	OutConfidence = lerp(NewConfidence, HistoryConfidence, EffectiveHistoryWeight);
 #endif
 
-#if SUPPORT_IRRADIANCE
-	float3 NewIrradiance = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, DistanceFieldUVs, 0).xyz;
-	float3 HistoryIrradianceValue = Texture2DSampleLevel(IrradianceHistoryTexture, IrradianceHistorySampler, OldDistanceFieldUVs, 0).xyz;
-
-	OutIrradiance = float4(lerp(NewIrradiance, HistoryIrradianceValue, EffectiveHistoryWeight), 0);
-#endif
-
-	// Only discard histories when we are moving enough that the jittering we let through will not be apparent
-	float HistoryConfidenceThreshold = lerp(0, .99f, saturate(PixelSpeed));
-
-	// Mark pixels with less than full confidence as not having a valid history, so the history filter will fill them in from stable neighbors
-	// This reduces ghosting where foreground occlusion values have been transfered to the background during upsampling
-	if (HistoryConfidence < HistoryConfidenceThreshold)
-	{
-		EffectiveHistoryWeight = 0;
-	}
-
 #if XBOXONE_PROFILE
-    // Xbox shader compiler (FXC) does non-IEEE optimization by default unless __XBOX_CONTROL_NONIEEE is
-    // defined to 0, which is not done currently due to performance reason. As a result, we need to check
-    // for Nan manually on Xbox.
+	// Xbox shader compiler (FXC) does non-IEEE optimization by default unless __XBOX_CONTROL_NONIEEE is
+	// defined to 0, which is not done currently due to performance reason. As a result, we need to check
+	// for Nan manually on Xbox.
 	OutBentNormal.rgb = (asuint(OutBentNormal.rgb) & 0x7f800000) == 0x7f800000 ? 0 : OutBentNormal.rgb;
 #else
-    OutBentNormal.rgb = isnan(OutBentNormal.rgb) || isinf(OutBentNormal.rgb) ? 0 : OutBentNormal.rgb;
+	OutBentNormal.rgb = isnan(OutBentNormal.rgb) || isinf(OutBentNormal.rgb) ? 0 : OutBentNormal.rgb;
 #endif
+
 	OutBentNormal.a = SceneDepth;
 
 	FLATTEN
@@ -255,10 +308,6 @@ float2 MaxSampleBufferUV;
 void FilterHistoryPS(
 	in float4 UVAndScreenPos : TEXCOORD0
 	,out float4 OutBentNormal : SV_Target0
-	,out float OutConfidence : SV_Target1
-#if SUPPORT_IRRADIANCE
-	,out float4 OutIrradiance : SV_Target2
-#endif
 	)
 {
 	float2 BufferUV = UVAndScreenPos.xy;
@@ -268,15 +317,6 @@ void FilterHistoryPS(
 	#endif
 
 	float4 HistoryValue = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, BufferUV, 0);
-#if SUPPORTS_INDEPENDENT_SAMPLERS
-	float HistoryConfidence = Texture2DSampleLevel(ConfidenceTexture, BentNormalAOSampler, BufferUV, 0);
-#else
-	float HistoryConfidence = Texture2DSampleLevel(ConfidenceTexture, ConfidenceSampler, BufferUV, 0);
-#endif
-
-#if SUPPORT_IRRADIANCE
-	float3 IrradianceValue = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, BufferUV, 0).xyz;
-#endif
 
 	// Only do the spatial search for pixels who discarded their history value
 	if (HistoryValue.w < 0)
@@ -313,11 +353,6 @@ void FilterHistoryPS(
 
 				Accumulation.rgb += TextureValue.rgb * Weight;
 				Accumulation.a += Weight;
-
-				#if SUPPORT_IRRADIANCE
-					float3 Irradiance = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, SampleBufferUV, 0).xyz;
-					IrradianceAccumulation += Irradiance * Weight;
-				#endif
 			}
 		}
 
@@ -328,156 +363,29 @@ void FilterHistoryPS(
 			// Construct the history value as if the spatial search result was the previous history, 
 			// And the AO we just computed this frame was the new value
 			HistoryValue.xyz = lerp(HistoryValue.xyz, Accumulation.xyz * InvWeight, HistoryWeight);
-
-			#if SUPPORT_IRRADIANCE
-				IrradianceValue = lerp(IrradianceValue, IrradianceAccumulation * InvWeight, HistoryWeight);
-			#endif
 		}
 	}
 
 	OutBentNormal = HistoryValue;
-	OutConfidence = HistoryConfidence;
 	// Remove sign bit so future reprojection interpolation isn't affected
 	OutBentNormal.w = abs(OutBentNormal.w);
-
-#if SUPPORT_IRRADIANCE
-	OutIrradiance = float4(IrradianceValue, 0);
-#endif
 }
 
-#if MODULATE_SCENE_COLOR
-#define IRRADIANCE_TARGET SV_Target2
-#else
-#define IRRADIANCE_TARGET SV_Target1
-#endif
-
-float3 EncodeBentNormal(float3 BentNormal)
-{
-	return BentNormal;
-}
-
-Texture2D SpecularOcclusionTexture;
-SamplerState SpecularOcclusionSampler;
-
 float MinIndirectDiffuseOcclusion;
 
 /** Upsamples the AO results to full resolution using a bilateral filter. */
 void AOUpsamplePS(
 	in float4 UVAndScreenPos : TEXCOORD0
-	, out float4 OutBentNormal : SV_Target0
-#if MODULATE_SCENE_COLOR
-	, out float4 OutSceneColorModulate : SV_Target1
-#endif
-#if OUTPUT_BENT_NORMAL && SUPPORT_IRRADIANCE
-	, out float4 OutIrradiance : IRRADIANCE_TARGET
-#endif
+	,out float4 OutSceneColor : SV_Target0
 	)
 {
-	// Distance field AO was computed at 0,0 regardless of viewrect min
-	float2 DistanceFieldUVs = UVAndScreenPos.xy - View.ViewRectMin.xy * View.BufferSizeAndInvSize.zw;
-	float3 Irradiance = 0;
-	float SpecularOcclusion = 1;
-
-#define BILATERAL_UPSAMPLE 1
-#if BILATERAL_UPSAMPLE
-	float2 LowResBufferSize = floor(View.BufferSizeAndInvSize.xy / DOWNSAMPLE_FACTOR);
-	float2 LowResTexelSize = 1.0f / LowResBufferSize;
-	float2 Corner00UV = floor(DistanceFieldUVs * LowResBufferSize - .5f) / LowResBufferSize + .5f * LowResTexelSize;
-	float2 BilinearWeights = (DistanceFieldUVs - Corner00UV) * LowResBufferSize;
-
-	float4 TextureValues00 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV, 0);
-	float4 TextureValues10 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + float2(LowResTexelSize.x, 0), 0);
-	float4 TextureValues01 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + float2(0, LowResTexelSize.y), 0);
-	float4 TextureValues11 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, Corner00UV + LowResTexelSize, 0);
-
-	float4 CornerWeights = float4(
-		(1 - BilinearWeights.y) * (1 - BilinearWeights.x), 
-		(1 - BilinearWeights.y) * BilinearWeights.x,
-		BilinearWeights.y * (1 - BilinearWeights.x),
-		BilinearWeights.y * BilinearWeights.x);
-
-	float Epsilon = .0001f;
-
-	float4 CornerDepths = float4(TextureValues00.w, TextureValues10.w, TextureValues01.w, TextureValues11.w);
-	float SceneDepth = CalcSceneDepth(UVAndScreenPos.xy);
-	float4 DepthWeights = 1.0f / (abs(CornerDepths - SceneDepth.xxxx) + Epsilon);
-	float4 FinalWeights = CornerWeights * DepthWeights;
-
-	float InvWeight = 1.0f / dot(FinalWeights, 1);
-
-	float3 InterpolatedResult = 
-		(FinalWeights.x * TextureValues00.xyz 
-		+ FinalWeights.y * TextureValues10.xyz
-		+ FinalWeights.z * TextureValues01.xyz 
-		+ FinalWeights.w * TextureValues11.xyz)
-		* InvWeight;
-
-	float3 BentNormal = InterpolatedResult.xyz;
-
-	#if SUPPORT_IRRADIANCE
-		float4 IrradianceValues00 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, Corner00UV, 0);
-		float4 IrradianceValues10 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, Corner00UV + float2(LowResTexelSize.x, 0), 0);
-		float4 IrradianceValues01 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, Corner00UV + float2(0, LowResTexelSize.y), 0);
-		float4 IrradianceValues11 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, Corner00UV + LowResTexelSize, 0);
-
-		Irradiance = 
-			(FinalWeights.x * IrradianceValues00.xyz 
-			+ FinalWeights.y * IrradianceValues10.xyz
-			+ FinalWeights.z * IrradianceValues01.xyz 
-			+ FinalWeights.w * IrradianceValues11.xyz)
-			* InvWeight;
-	#endif
-
-	#if SUPPORT_SPECULAR_OCCLUSION
-		float SpecularOcclusionValues00 = Texture2DSampleLevel(SpecularOcclusionTexture, SpecularOcclusionSampler, Corner00UV, 0).x;
-		float SpecularOcclusionValues10 = Texture2DSampleLevel(SpecularOcclusionTexture, SpecularOcclusionSampler, Corner00UV + float2(LowResTexelSize.x, 0), 0).x;
-		float SpecularOcclusionValues01 = Texture2DSampleLevel(SpecularOcclusionTexture, SpecularOcclusionSampler, Corner00UV + float2(0, LowResTexelSize.y), 0).x;
-		float SpecularOcclusionValues11 = Texture2DSampleLevel(SpecularOcclusionTexture, SpecularOcclusionSampler, Corner00UV + LowResTexelSize, 0).x;
-
-		SpecularOcclusion = 
-			(FinalWeights.x * SpecularOcclusionValues00 
-			+ FinalWeights.y * SpecularOcclusionValues10
-			+ FinalWeights.z * SpecularOcclusionValues01 
-			+ FinalWeights.w * SpecularOcclusionValues11)
-			* InvWeight;
-	#endif
-
-#else
-	float3 BentNormal = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, DistanceFieldUVs, 0).xyz;
-
-	#if SUPPORT_IRRADIANCE
-		Irradiance = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, DistanceFieldUVs, 0).xyz;
-	#endif
-
-	#if SUPPORT_SPECULAR_OCCLUSION
-		SpecularOcclusion = Texture2DSampleLevel(SpecularOcclusionTexture, SpecularOcclusionSampler, DistanceFieldUVs, 0).x;
-	#endif
-#endif
+	float3 BentNormal = UpsampleDFAO(UVAndScreenPos);
 
 #if MODULATE_SCENE_COLOR
-	float Visibility = lerp(length(BentNormal), 1, MinIndirectDiffuseOcclusion);
-	OutSceneColorModulate = Visibility;
-#endif
-
-#if OUTPUT_AO
-
-	#if PASS_THROUGH_DEBUG_VALUE
-		OutBentNormal = float4(EncodeBentNormal(BentNormal), 1);
-	#else
-		OutBentNormal = float4(length(BentNormal).xxx, 1);
-	#endif
+	float Visibility = lerp(length(BentNormal), 1.0f, MinIndirectDiffuseOcclusion);
+	OutSceneColor = Visibility;
 #else
-	#if OUTPUT_BENT_NORMAL
-		OutBentNormal = float4(EncodeBentNormal(BentNormal), SpecularOcclusion);
-		#if SUPPORT_IRRADIANCE
-			OutIrradiance = float4(Irradiance, 1);
-		#endif
-	#else
+	OutSceneColor = float4(length(BentNormal).xxx, 1.0f);
 
-		// Output to RT0 to visualize Irradiance or BentNormal
-		#if SUPPORT_IRRADIANCE
-			OutBentNormal = float4(Irradiance, 1);
-		#endif
-	#endif
 #endif
 }
diff --git a/Engine/Shaders/Private/DistanceFieldLightingShared.ush b/Engine/Shaders/Private/DistanceFieldLightingShared.ush
index a552ffb101c5..b537a30b017c 100644
--- a/Engine/Shaders/Private/DistanceFieldLightingShared.ush
+++ b/Engine/Shaders/Private/DistanceFieldLightingShared.ush
@@ -54,7 +54,7 @@ uint GetCulledNumObjects()
 }
 
 // In float4's.  Must match equivalent C++ variables.
-#define OBJECT_DATA_STRIDE 18
+#define OBJECT_DATA_STRIDE 17
 
 uint NumSceneObjects;
 
@@ -127,49 +127,52 @@ float4x4 LoadGlobalObjectWorldToVolume(uint ObjectIndex)
 	float4 M0 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 0);
 	float4 M1 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 1);
 	float4 M2 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 2);
-	float4 M3 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 3);
-	return float4x4(M0, M1, M2, M3);
+
+	return transpose(float4x4(M0, M1, M2, float4(0.0f, 0.0f, 0.0f, 1.0f)));
 }
  
 float3 LoadGlobalObjectLocalPositionExtent(uint ObjectIndex)
 {
-	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 4).xyz;
-}
-
-float4 LoadGlobalObjectUVScale(uint ObjectIndex)
-{
-	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 5);
-}
-
-float3 LoadGlobalObjectUVAdd(uint ObjectIndex)
-{
-	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 6).xyz;
-}
-
-float2 LoadGlobalObjectDistanceFieldMAD(uint ObjectIndex)
-{
-	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 7).xy;
-}
-
-float2 LoadGlobalObjectMinMaxDrawDistance2(uint ObjectIndex)
-{
-    return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 7).zw;
-}
-
-void LoadGlobalObjectLocalVolumeBoundsMinMax(uint ObjectIndex, out float3 LocalVolumeBoundsMin, out float3 LocalVolumeBoundsMax)
-{
-	LocalVolumeBoundsMin = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 16).xyz;
-	LocalVolumeBoundsMax = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 17).xyz;
+	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 3).xyz;
 }
 
 uint LoadGlobalObjectOftenMoving(uint ObjectIndex)
 {
-	float WComponent = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 17).w;
-	return WComponent > 0.0f ? 1 : 0;
+	float WComponent = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 3).w;
+	return WComponent;
+}
+
+float4 LoadGlobalObjectUVScale(uint ObjectIndex)
+{
+	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 4);
+}
+
+float3 LoadGlobalObjectUVAdd(uint ObjectIndex)
+{
+	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 5).xyz;
+}
+
+float2 LoadGlobalObjectDistanceFieldMAD(uint ObjectIndex)
+{
+	return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 6).xy;
+}
+
+float2 LoadGlobalObjectMinMaxDrawDistance2(uint ObjectIndex)
+{
+    return LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 6).zw;
+}
+
+float4x4 LoadGlobalObjectOBBToWorld(uint ObjectIndex)
+{
+	float4 M0 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 14);
+	float4 M1 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 15);
+	float4 M2 = LoadFloat4(SceneObjectData, ObjectIndex * OBJECT_DATA_STRIDE + 16);
+
+	return transpose(float4x4(M0, M1, M2, float4(0.0f, 0.0f, 0.0f, 1.0f)));
 }
 
 // In float4's.  Must match equivalent C++ variables.
-#define CULLED_OBJECT_DATA_STRIDE 16
+#define CULLED_OBJECT_DATA_STRIDE 17
 #define CULLED_OBJECT_BOX_BOUNDS_STRIDE 5
 
 float4 LoadObjectPositionAndRadiusFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
@@ -182,50 +185,57 @@ float4x4 LoadObjectWorldToVolumeFromBuffer(uint ObjectIndex, StructuredBuffer<fl
 	float4 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 0];
 	float4 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 1];
 	float4 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 2];
-	float4 M3 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 3];
 
-	return float4x4(M0, M1, M2, M3);
+	return transpose(float4x4(M0, M1, M2, float4(0.0f, 0.0f, 0.0f, 1.0f)));
 }
  
 float3 LoadObjectLocalPositionExtentFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
 {
-	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 4].xyz;
+	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 3].xyz;
 }
 
 float4 LoadObjectUVScaleFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer, out bool bGeneratedAsTwoSided)
 {
-	float4 Value = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 5].xyzw;
+	float4 Value = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 4].xyzw;
 	bGeneratedAsTwoSided = Value.w < 0;
 	return float4(Value.xyz, abs(Value.w));
 }
 
 float4 LoadObjectUVAddAndSelfShadowBiasFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
 {
-	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 6];
+	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 5];
 }
 
 float2 LoadObjectDistanceFieldMADFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
 {
-	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 7].xy;
+	return InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 6].xy;
 }
 
 float3x3 LoadObjectVolumeToWorldFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
 {
-	float3 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 8].xyz;
-	float3 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 9].xyz;
-	float3 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 10].xyz;
+	float3 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 7].xyz;
+	float3 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 8].xyz;
+	float3 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 9].xyz;
 
 	return float3x3(M0, M1, M2);
 }
 
 float4x4 LoadObjectLocalToWorldFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
 {
-	float4 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 11];
-	float4 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 12];
-	float4 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 13];
-	float4 M3 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 14];
+	float4 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 10];
+	float4 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 11];
+	float4 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 12];
 
-	return float4x4(M0, M1, M2, M3);
+	return transpose(float4x4(M0, M1, M2, float4(0.0f, 0.0f, 0.0f, 1.0f)));
+}
+
+float4x4 LoadObjectOBBToWorldFromBuffer(uint ObjectIndex, StructuredBuffer<float4> InBuffer)
+{
+	float4 M0 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 14];
+	float4 M1 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 15];
+	float4 M2 = InBuffer[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 16];
+
+	return transpose(float4x4(M0, M1, M2, float4(0.0f, 0.0f, 0.0f, 1.0f)));
 }
 
 // These are structured buffers so they can be scalar memory loads on GCN
@@ -283,10 +293,15 @@ float4x4 LoadObjectLocalToWorld(uint ObjectIndex)
 	return LoadObjectLocalToWorldFromBuffer(ObjectIndex, CulledObjectData);
 }
 
+float4x4 LoadObjectOBBToWorld(uint ObjectIndex)
+{
+	return LoadObjectOBBToWorldFromBuffer(ObjectIndex, CulledObjectData);
+}
+
 // x = Offset in global buffer, y = NumLOD0, z = NumSurfels (all LODs), W = instance index
 uint4 LoadObjectSurfelCoordinate(uint ObjectIndex)
 {
-	return (uint4)CulledObjectData[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 15];
+	return (uint4)CulledObjectData[ObjectIndex * CULLED_OBJECT_DATA_STRIDE + 13];
 }
 
 void LoadObjectViewSpaceBox(uint ObjectIndex, out float3 ObjectViewSpaceMin, out float3 ObjectViewSpaceMax)
diff --git a/Engine/Shaders/Private/DistanceFieldObjectCulling.usf b/Engine/Shaders/Private/DistanceFieldObjectCulling.usf
index ad69d87d6037..43d98b2c2c08 100644
--- a/Engine/Shaders/Private/DistanceFieldObjectCulling.usf
+++ b/Engine/Shaders/Private/DistanceFieldObjectCulling.usf
@@ -439,6 +439,10 @@ bool IntersectObjectWithConeDepthRange(
 Buffer<float4> TileConeAxisAndCos;
 Buffer<float4> TileConeDepthRanges;
 
+RWBuffer<uint> RWNumCulledTilesArray;
+RWBuffer<uint> RWCulledTilesStartOffsetArray;
+RWBuffer<uint> RWCulledTileDataArray;
+
 /** Intersects a single object with the tile and adds to the intersection list if needed. */
 void ObjectCullPS(
 	FObjectCullVertexOutput Input, 
diff --git a/Engine/Shaders/Private/DistanceFieldScreenGridLighting.usf b/Engine/Shaders/Private/DistanceFieldScreenGridLighting.usf
index 270253ada566..4095ee15e7db 100644
--- a/Engine/Shaders/Private/DistanceFieldScreenGridLighting.usf
+++ b/Engine/Shaders/Private/DistanceFieldScreenGridLighting.usf
@@ -45,8 +45,6 @@ float TanConeHalfAngle;
 RWBuffer<uint> RWScreenGridConeVisibility;
 RWBuffer<float> RWConeDepthVisibilityFunction;
 
-#define CONE_TRACE_AGAINST_OBJECTS 1
-
 void HemisphereConeTraceAgainstTileCulledObjects(uint ObjectIndex, uint OutputBaseIndex, float3 WorldShadingPosition, float SceneDepth, float3 WorldNormal, float3 TangentX, float3 TangentY)
 {
 	float MaxWorldStepOffset = GetStepOffset(NUM_CONE_STEPS);
@@ -173,9 +171,7 @@ void ConeTraceObjectOcclusionCS(
 
 		float3 WorldNormal;
 		float SceneDepth;
-		bool bHasDistanceFieldRepresentation;
-		bool bLit;
-		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 		float3 TangentX;
 		float3 TangentY;
@@ -185,15 +181,9 @@ void ConeTraceObjectOcclusionCS(
 			float2 ScreenUV = GetScreenUVFromScreenGrid(OutputCoordinate);
 			float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 		
-			float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-			float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
-			float3 WorldShadingPosition = OpaqueWorldPosition;
+			float3 WorldShadingPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
-			#if CONE_TRACE_AGAINST_OBJECTS
-
-				HemisphereConeTraceAgainstTileCulledObjects(ObjectIndex, OutputBaseIndex, WorldShadingPosition, SceneDepth, WorldNormal, TangentX, TangentY);
-		
-			#endif
+			HemisphereConeTraceAgainstTileCulledObjects(ObjectIndex, OutputBaseIndex, WorldShadingPosition, SceneDepth, WorldNormal, TangentX, TangentY);
 		}
 
 #if PASS_THROUGH_DEBUG_VALUE
@@ -205,15 +195,30 @@ void ConeTraceObjectOcclusionCS(
 
 void HemisphereConeTraceAgainstGlobalDistanceFieldClipmap(
 	uniform uint ClipmapIndex,
-	uint OutputBaseIndex, 
-	float3 WorldShadingPosition, 
-	float SceneDepth, 
-	float3 WorldNormal, 
-	float3 TangentX, 
+	uint OutputBaseIndex,
+	float3 WorldShadingPosition,
+	float SceneDepth,
+	float3 WorldNormal,
+	float3 TangentX,
 	float3 TangentY)
 {
 	float MinStepSize = GlobalVolumeCenterAndExtent[ClipmapIndex].w * 2 / 300.0f;
 	float InvAOGlobalMaxOcclusionDistance = 1.0f / AOGlobalMaxOcclusionDistance;
+	float InitialOffset = GetStepOffset(NUM_CONE_STEPS);
+
+	float ConeTraceLeakFill = 1.0f;
+#if	!CONE_TRACE_OBJECTS
+	// Without the object cone trace there is a lot of AO leaking. Constant initial offset looks worse, but helps with leaking.
+	InitialOffset = GlobalVolumeCenterAndExtent[ClipmapIndex].w * GlobalVolumeTexelSize * 2.0f;
+
+	// Cover AO leaking by comparing initial step SDF value against initial step size.
+	{
+		float3 WorldSamplePosition = WorldShadingPosition + WorldNormal * InitialOffset;
+		float3 StepVolumeUV = ComputeGlobalUV(WorldSamplePosition, ClipmapIndex);
+		float DistanceToOccluder = SampleGlobalDistanceField(ClipmapIndex, StepVolumeUV).x;
+		ConeTraceLeakFill = saturate(Pow2(DistanceToOccluder / InitialOffset)) * 0.4f + 0.6f;
+	}
+#endif
 
 	LOOP
 	for (uint ConeIndex = 0; ConeIndex < NUM_CONE_DIRECTIONS; ConeIndex++)
@@ -222,8 +227,7 @@ void HemisphereConeTraceAgainstGlobalDistanceFieldClipmap(
 		float3 RotatedConeDirection = ConeDirection.x * TangentX + ConeDirection.y * TangentY + ConeDirection.z * WorldNormal;
 
 		float MinVisibility = 1;
-		float MaxObjectWorldStepOffset = GetStepOffset(NUM_CONE_STEPS);
-		float WorldStepOffset = CONE_TRACE_AGAINST_OBJECTS ? MaxObjectWorldStepOffset : 20;
+		float WorldStepOffset = InitialOffset;
 
 		LOOP
 		for (uint StepIndex = 0; StepIndex < NUM_CONE_STEPS && WorldStepOffset < AOGlobalMaxOcclusionDistance; StepIndex++)
@@ -247,6 +251,8 @@ void HemisphereConeTraceAgainstGlobalDistanceFieldClipmap(
 			WorldStepOffset += max(DistanceToOccluder, MinStepSize);
 		}
 
+		MinVisibility *= ConeTraceLeakFill;
+
 		#if PASS_THROUGH_DEBUG_VALUE
 			//InterlockedAdd(RWScreenGridConeVisibility[OutputBaseIndex + 0], 1);
 		#else
@@ -317,9 +323,7 @@ void ConeTraceGlobalOcclusionCS(
 
 		float3 WorldNormal;
 		float SceneDepth;
-		bool bHasDistanceFieldRepresentation;
-		bool bLit;
-		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 		float3 TangentX;
 		float3 TangentY;
@@ -328,9 +332,7 @@ void ConeTraceGlobalOcclusionCS(
 		float2 ScreenUV = GetScreenUVFromScreenGrid(OutputCoordinate);
 		float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 		
-		float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-		float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
-		float3 WorldShadingPosition = OpaqueWorldPosition;
+		float3 WorldShadingPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 		uint OutputBaseIndex = OutputCoordinate.y * ScreenGridConeVisibilitySize.x + OutputCoordinate.x;
 
@@ -340,6 +342,8 @@ void ConeTraceGlobalOcclusionCS(
 
 Buffer<uint> ScreenGridConeVisibility;
 RWTexture2D<float4> RWDistanceFieldBentNormal;
+uint2 ConeBufferMax;
+float2 DFNormalBufferUVMax;
 
 #ifndef COMBINE_CONES_SIZEX
 #define COMBINE_CONES_SIZEX 1
@@ -352,20 +356,20 @@ void CombineConeVisibilityCS(
 	uint3 DispatchThreadId : SV_DispatchThreadID,
     uint3 GroupThreadId : SV_GroupThreadID) 
 {
+	uint2 InputCoordinate = min(DispatchThreadId.xy, ConeBufferMax);
 	uint2 OutputCoordinate = DispatchThreadId.xy;
-	float2 BaseLevelScreenUV = GetBaseLevelScreenUVFromScreenGrid(OutputCoordinate);
+	float2 BaseLevelScreenUV = GetBaseLevelScreenUVFromScreenGrid(InputCoordinate);
+	BaseLevelScreenUV = min(BaseLevelScreenUV, DFNormalBufferUVMax);
 
 	float3 WorldNormal;
 	float SceneDepth;
-	bool bHasDistanceFieldRepresentation;
-	bool bLit;
-	GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+	GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 	float3 TangentX;
 	float3 TangentY;
 	FindBestAxisVectors2(WorldNormal, TangentX, TangentY);
 
-	uint InputBaseIndex = OutputCoordinate.y * ScreenGridConeVisibilitySize.x + OutputCoordinate.x;
+	uint InputBaseIndex = InputCoordinate.y * ScreenGridConeVisibilitySize.x + InputCoordinate.x;
 
 #if PASS_THROUGH_DEBUG_VALUE
 	float BufferValue = ScreenGridConeVisibility[InputBaseIndex + 0] - asuint(1.0f);
@@ -388,171 +392,4 @@ void CombineConeVisibilityCS(
 
 	RWDistanceFieldBentNormal[OutputCoordinate] = float4(BentNormal, SceneDepth);
 #endif
-}
-
-float2 DistanceFieldGBufferTexelSize;
-float4 BentNormalBufferAndTexelSize;
-float MinDownsampleFactorToBaseLevel;
-
-float4 GetNormalWeights(float2 Corner00UV, float2 LowResTexelSize, float3 WorldNormal)
-{
-	float4 NormalWeights;
-
-	{
-		float3 SampleWorldNormal;
-		float Unused; bool Unused2; bool Unused3;
-		GetDownsampledGBuffer(Corner00UV, SampleWorldNormal, Unused, Unused2, Unused3);
-		NormalWeights.x = dot(SampleWorldNormal, WorldNormal);
-	}
-
-	{
-		float3 SampleWorldNormal;
-		float Unused; bool Unused2; bool Unused3;
-		GetDownsampledGBuffer(Corner00UV + float2(LowResTexelSize.x, 0), SampleWorldNormal, Unused, Unused2, Unused3);
-		NormalWeights.y = dot(SampleWorldNormal, WorldNormal);
-	}
-
-	{
-		float3 SampleWorldNormal;
-		float Unused; bool Unused2; bool Unused3;
-		GetDownsampledGBuffer(Corner00UV + float2(0, LowResTexelSize.y), SampleWorldNormal, Unused, Unused2, Unused3);
-		NormalWeights.z = dot(SampleWorldNormal, WorldNormal);
-	}
-
-	{
-		float3 SampleWorldNormal;
-		float Unused; bool Unused2; bool Unused3;
-		GetDownsampledGBuffer(Corner00UV + LowResTexelSize, SampleWorldNormal, Unused, Unused2, Unused3);
-		NormalWeights.w = dot(SampleWorldNormal, WorldNormal);
-	}
-
-	return max(NormalWeights, .0001f);
-}
-
-// 1 / ((1 - FadeDistanceFraction) * AOMaxViewDistance)
-float DistanceFadeScale;
-
-float ComputeSampleWeightBasedOnPosition(float4 ReferencePlane, float2 SampleScreenUV, float SampleDepth)
-{
-	float2 SampleScreenPosition = (SampleScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
-	float4 SampleHomogeneousWorldPosition = mul(float4(SampleScreenPosition * SampleDepth, SampleDepth, 1), View.ScreenToWorld);
-	float3 SampleWorldPosition = SampleHomogeneousWorldPosition.xyz / SampleHomogeneousWorldPosition.w;
-
-	float PlaneDistance = dot(ReferencePlane, float4(SampleWorldPosition, 1));
-
-	float Epsilon = .0001f;
-	float RelativeDistance = 1000 * abs(PlaneDistance) / SampleDepth;
-	return min(10.0f / (RelativeDistance + Epsilon), 1);
-}
-
-/**  */
-void GeometryAwareUpsamplePS(
-	in float4 UVAndScreenPos : TEXCOORD0
-	,out float4 OutBentNormal : SV_Target0
-	,out float OutConfidence : SV_Target1
-#if SUPPORT_IRRADIANCE
-	,out float4 OutIrradiance : SV_Target2
-#endif
-	)
-{
-	float3 WorldNormal;
-	float SceneDepth;
-	bool bHasDistanceFieldRepresentation;
-	bool bLit;
-	GetDownsampledGBuffer(UVAndScreenPos.xy, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
-
-	float4 HomogeneousWorldPosition = mul(float4(UVAndScreenPos.zw * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
-
-	float4 ReferencePlane = float4(WorldNormal, -dot(WorldPosition, WorldNormal));
-
-	float2 LowResBufferSize = BentNormalBufferAndTexelSize.xy;
-	float2 LowResTexelSize = BentNormalBufferAndTexelSize.zw;
-	float2 Corner00UV = floor((UVAndScreenPos.xy - JitterOffset * DistanceFieldGBufferTexelSize) * LowResBufferSize) * LowResTexelSize;
-	float2 BilinearWeights = (UVAndScreenPos.xy - (Corner00UV + JitterOffset * DistanceFieldGBufferTexelSize)) * LowResBufferSize;
-	float2 LowResCorner00UV = Corner00UV + .5f * LowResTexelSize;
-
-	float4 TextureValues00 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV, 0);
-	float4 TextureValues10 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + float2(LowResTexelSize.x, 0), 0);
-	float4 TextureValues01 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + float2(0, LowResTexelSize.y), 0);
-	float4 TextureValues11 = Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, LowResCorner00UV + LowResTexelSize, 0);
-
-	float4 CornerWeights = float4(
-		(1 - BilinearWeights.y) * (1 - BilinearWeights.x), 
-		(1 - BilinearWeights.y) * BilinearWeights.x,
-		BilinearWeights.y * (1 - BilinearWeights.x),
-		BilinearWeights.y * BilinearWeights.x);
-
-	float4 CornerDepths = float4(TextureValues00.w, TextureValues10.w, TextureValues01.w, TextureValues11.w);
-
-	float4 PositionWeights;
-	PositionWeights.x = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV, CornerDepths.x);
-	PositionWeights.y = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + float2(LowResTexelSize.x, 0), CornerDepths.y);
-	PositionWeights.z = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + float2(0, LowResTexelSize.y), CornerDepths.z);
-	PositionWeights.w = ComputeSampleWeightBasedOnPosition(ReferencePlane, LowResCorner00UV + LowResTexelSize, CornerDepths.w);
-
-	//float4 DepthWeights = max(exp2(-abs(CornerDepths - SceneDepth.xxxx) * .01f), .001f);
-	float Epsilon = .0001f;
-	//float4 DepthWeights = min(10.0f / (abs(CornerDepths - SceneDepth.xxxx) + Epsilon), 1);
-
-	float2 FullResCorner00UV = Corner00UV + (JitterOffset + .5f) * DistanceFieldGBufferTexelSize;
-	float4 NormalWeights = GetNormalWeights(FullResCorner00UV, LowResTexelSize, WorldNormal);
-	
-	float4 FinalWeights = CornerWeights * PositionWeights * NormalWeights;
-
-	float InvSafeWeight = 1.0f / max(dot(FinalWeights, 1), .00001f);
-
-	float3 AverageBentNormal = 
-		(FinalWeights.x * TextureValues00.xyz 
-		+ FinalWeights.y * TextureValues10.xyz
-		+ FinalWeights.z * TextureValues01.xyz 
-		+ FinalWeights.w * TextureValues11.xyz)
-		* InvSafeWeight;
-	
-	// Output a confidence value based on position weights
-	// Confidence will be 0 when we detect that foreground occlusion values have been leaked onto the background, because no better low res samples were available
-	OutConfidence = dot(PositionWeights, 1) < .5f ? 0 : 1;
-
-	float BentNormalLength = length(AverageBentNormal);
-
-#if !PASS_THROUGH_DEBUG_VALUE
-	float AverageLength = 
-		(FinalWeights.x * length(TextureValues00.xyz) 
-		+ FinalWeights.y * length(TextureValues10.xyz)
-		+ FinalWeights.z * length(TextureValues01.xyz)
-		+ FinalWeights.w * length(TextureValues11.xyz))
-		* InvSafeWeight;
-
-	if (BentNormalLength < AverageLength && BentNormalLength > 0)
-	{
-		// Fixup normal shortening due to weighted average of vectors
-		AverageBentNormal = AverageBentNormal / BentNormalLength * AverageLength;
-	}
-#endif
-
-	OutBentNormal = float4(AverageBentNormal, SceneDepth);
-
-	// Fade to unoccluded in the distance
-	//@todo - box distance from largest cascade
-	BentNormalLength = length(OutBentNormal.rgb);
-	float FadeAlpha = saturate((AOMaxViewDistance - SceneDepth) * DistanceFadeScale);
-	float3 NormalizedBentNormal = OutBentNormal.rgb / max(BentNormalLength, .0001f);
-	OutBentNormal.rgb = NormalizedBentNormal * lerp(1, BentNormalLength, FadeAlpha);
-	//OutBentNormal = float4(WorldNormal, SceneDepth);
-
-	#if SUPPORT_IRRADIANCE
-		float4 IrradianceValues00 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, LowResCorner00UV, 0);
-		float4 IrradianceValues10 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, LowResCorner00UV + float2(LowResTexelSize.x, 0), 0);
-		float4 IrradianceValues01 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, LowResCorner00UV + float2(0, LowResTexelSize.y), 0);
-		float4 IrradianceValues11 = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, LowResCorner00UV + LowResTexelSize, 0);
-
-		float3 AverageIrradiance = 
-			(FinalWeights.x * IrradianceValues00.xyz 
-			+ FinalWeights.y * IrradianceValues10.xyz
-			+ FinalWeights.z * IrradianceValues01.xyz 
-			+ FinalWeights.w * IrradianceValues11.xyz)
-			* InvSafeWeight;
-
-		OutIrradiance = float4(AverageIrradiance, 0);
-	#endif
 }
\ No newline at end of file
diff --git a/Engine/Shaders/Private/DistanceFieldShadowing.usf b/Engine/Shaders/Private/DistanceFieldShadowing.usf
index 0170f1c3bba9..765506b70eb5 100644
--- a/Engine/Shaders/Private/DistanceFieldShadowing.usf
+++ b/Engine/Shaders/Private/DistanceFieldShadowing.usf
@@ -22,36 +22,24 @@ void CopyCulledObjectData(uint DestIndex, uint SourceIndex)
 		RWCulledObjectData[DestIndex * CULLED_OBJECT_DATA_STRIDE + VectorIndex] = LoadFloat4(SceneObjectData, SourceIndex * OBJECT_DATA_STRIDE + VectorIndex);
 	}
 
-	float3 LocalVolumeBoundsMin;
-	float3 LocalVolumeBoundsMax;
-	LoadGlobalObjectLocalVolumeBoundsMinMax(SourceIndex, LocalVolumeBoundsMin, LocalVolumeBoundsMax);
-
-	float3 LocalBoundsVertices[8];
-	LocalBoundsVertices[0] = float3(LocalVolumeBoundsMin.x, LocalVolumeBoundsMin.y, LocalVolumeBoundsMin.z);
-	LocalBoundsVertices[1] = float3(LocalVolumeBoundsMax.x, LocalVolumeBoundsMin.y, LocalVolumeBoundsMin.z);
-	LocalBoundsVertices[2] = float3(LocalVolumeBoundsMin.x, LocalVolumeBoundsMax.y, LocalVolumeBoundsMin.z);
-	LocalBoundsVertices[3] = float3(LocalVolumeBoundsMax.x, LocalVolumeBoundsMax.y, LocalVolumeBoundsMin.z);
-	LocalBoundsVertices[4] = float3(LocalVolumeBoundsMin.x, LocalVolumeBoundsMin.y, LocalVolumeBoundsMax.z);
-	LocalBoundsVertices[5] = float3(LocalVolumeBoundsMax.x, LocalVolumeBoundsMin.y, LocalVolumeBoundsMax.z);
-	LocalBoundsVertices[6] = float3(LocalVolumeBoundsMin.x, LocalVolumeBoundsMax.y, LocalVolumeBoundsMax.z);
-	LocalBoundsVertices[7] = float3(LocalVolumeBoundsMax.x, LocalVolumeBoundsMax.y, LocalVolumeBoundsMax.z);
-
 	float3 MinViewSpacePosition = float3(2000000, 2000000, 2000000);
 	float3 MaxViewSpacePosition = float3(-2000000, -2000000, -2000000);
 
-	float4 M0 = LoadFloat4(SceneObjectData, SourceIndex * OBJECT_DATA_STRIDE + 11);
-	float4 M1 = LoadFloat4(SceneObjectData, SourceIndex * OBJECT_DATA_STRIDE + 12);
-	float4 M2 = LoadFloat4(SceneObjectData, SourceIndex * OBJECT_DATA_STRIDE + 13);
-	float4 M3 = LoadFloat4(SceneObjectData, SourceIndex * OBJECT_DATA_STRIDE + 14);
-
-	float4x4 LocalToWorld = float4x4(M0, M1, M2, M3);
+	float4x4 ObjectOBBToWorld = LoadGlobalObjectOBBToWorld(SourceIndex);
 
 	float3 ViewSpaceBoundsVertices[8];
 
 	for (uint i = 0; i < 8; i++)
 	{
-		float3 WorldBoundsPosition = mul(float4(LocalBoundsVertices[i], 1), LocalToWorld).xyz;
-		float3 ViewSpacePosition = mul(float4(WorldBoundsPosition, 1), WorldToShadow).xyz;
+		float3 UnitBoxVertex;
+		UnitBoxVertex.x = i & 0x1 ? 1.0f : -1.0f;
+		UnitBoxVertex.y = i & 0x2 ? 1.0f : -1.0f;
+		UnitBoxVertex.z = i & 0x4 ? 1.0f : -1.0f;
+
+		UnitBoxVertex *= SDF_APPROX_MARGIN;
+
+		float3 WorldBoundsPosition = mul(float4(UnitBoxVertex, 1.0f), ObjectOBBToWorld).xyz;
+		float3 ViewSpacePosition = mul(float4(WorldBoundsPosition, 1.0f), WorldToShadow).xyz;
 		MinViewSpacePosition = min(MinViewSpacePosition, ViewSpacePosition);
 		MaxViewSpacePosition = max(MaxViewSpacePosition, ViewSpacePosition);
 		ViewSpaceBoundsVertices[i] = ViewSpacePosition;
@@ -181,12 +169,10 @@ RWBuffer<uint> RWShadowTileArrayData;
 
 struct FShadowObjectCullVertexOutput
 {
-	nointerpolation float4 PositionAndRadius : TEXCOORD0;
-	nointerpolation uint ObjectIndex : TEXCOORD1;
+	nointerpolation uint ObjectIndex : TEXCOORD0;
 };
 
-float ConservativeRadiusScale;
-float MinRadius;
+float MinExpandRadius;
 
 /** Used when culling objects into screenspace tile lists */
 void ShadowObjectCullVS(
@@ -194,14 +180,20 @@ void ShadowObjectCullVS(
 	uint ObjectIndex : SV_InstanceID,
 	out FShadowObjectCullVertexOutput Output,
 	out float4 OutPosition : SV_POSITION
-	)
+)
 {
-	float4 ObjectPositionAndRadius = LoadObjectPositionAndRadius(ObjectIndex);
-	// ConservativeRadiusScale pushes the sphere vertices out so the triangles between them lie completely outside the sphere
-	// MinRadius is for conservative rasterization
-	float EffectiveRadius = (ObjectPositionAndRadius.w + MinRadius) * ConservativeRadiusScale;
-	float3 WorldPosition = InPosition.xyz * EffectiveRadius + ObjectPositionAndRadius.xyz;
-	OutPosition = mul(float4(WorldPosition, 1), WorldToShadow);
+	float4x4 ObjectOBBToWorld = LoadObjectOBBToWorld(ObjectIndex);
+
+	float ObjectScaleX = length(ObjectOBBToWorld[0].xyz);
+	float ObjectScaleY = length(ObjectOBBToWorld[1].xyz);
+	float ObjectScaleZ = length(ObjectOBBToWorld[2].xyz);
+
+	ObjectOBBToWorld[0].xyz *= (SDF_APPROX_MARGIN + MinExpandRadius / ObjectScaleX);
+	ObjectOBBToWorld[1].xyz *= (SDF_APPROX_MARGIN + MinExpandRadius / ObjectScaleY);
+	ObjectOBBToWorld[2].xyz *= (SDF_APPROX_MARGIN + MinExpandRadius / ObjectScaleZ);
+
+	float3 WorldPosition = mul(float4(InPosition.xyz, 1.0f), ObjectOBBToWorld).xyz;
+	OutPosition = mul(float4(WorldPosition, 1.0f), WorldToShadow);
 
 	// Clamp the vertex to the near plane if it is in front of the near plane
 	if (OutPosition.z < 0)
@@ -210,7 +202,6 @@ void ShadowObjectCullVS(
 		OutPosition.w = 1.0f;
 	}
 
-	Output.PositionAndRadius = ObjectPositionAndRadius;
 	Output.ObjectIndex = ObjectIndex;
 } 
 
@@ -241,15 +232,13 @@ void ShadowObjectCullPS(
 
 #define OBJECT_OBB_INTERSECTION 1
 #if OBJECT_OBB_INTERSECTION
-	
+	float2 TilePositionForCulling = float2(TilePosition.x, ShadowTileListGroupSize.y - 1 - TilePosition.y);
+
 	float3 ShadowTileMin;
 	float3 ShadowTileMax;
+	ShadowTileMin.xy = (TilePositionForCulling + 0.0f) / (float2)ShadowTileListGroupSize * 2 - 1;
+	ShadowTileMax.xy = (TilePositionForCulling + 1.0f) / (float2)ShadowTileListGroupSize * 2 - 1;
 
-	float2 TilePositionForCulling = float2(TilePosition.x, ShadowTileListGroupSize.y - TilePosition.y);
-	//@todo - why is this expand needed
-	float TileExpand = 1;
-	ShadowTileMin.xy = (TilePositionForCulling - TileExpand) / (float2)ShadowTileListGroupSize * 2 - 1;
-	ShadowTileMax.xy = (TilePositionForCulling + 1) / (float2)ShadowTileListGroupSize * 2 - 1;
 	// Extrude toward light to avoid culling objects between the light and the shadow frustum
 	ShadowTileMin.z = -1000;
 	ShadowTileMax.z = 1;
@@ -502,8 +491,7 @@ void DistanceFieldShadowingCS(
 	float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 
 	float SceneDepth = CalcSceneDepth(ScreenUV);
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 OpaqueWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 	// Distance for directional lights to trace
 	float TraceDistance = TanLightAngleAndNormalThreshold.z;
@@ -581,7 +569,7 @@ void DistanceFieldShadowingCS(
 			float SubsurfaceDensity = 0;
 			bool bUseSubsurfaceTransmission = false;
 
-#if !FORWARD_SHADING
+#if !FORWARD_SHADING && DF_SHADOW_QUALITY > 1
 			FGBufferData GBufferData = GetGBufferData(ScreenUV);
 
 			BRANCH
diff --git a/Engine/Shaders/Private/DistanceFieldShadowingShared.ush b/Engine/Shaders/Private/DistanceFieldShadowingShared.ush
index e122888d5b27..d7ccc7eaff44 100644
--- a/Engine/Shaders/Private/DistanceFieldShadowingShared.ush
+++ b/Engine/Shaders/Private/DistanceFieldShadowingShared.ush
@@ -15,6 +15,10 @@ uint ShadowAverageObjectsPerTile;
 #define SHADOW_TILE_ARRAY_DATA_STRIDE 0
 #endif
 
+// Approximation of margin added to SDF objects during generation inside FMeshUtilities::GenerateSignedDistanceFieldVolumeData.
+// This can slightly clip RTDF shadow penumbra in very rare cases, but is much more faster than a conservative value and improves tracing accuracy inside the volume
+#define SDF_APPROX_MARGIN 0.7
+
 uint2 GetShadowTileHead(uint2 TileCoordinate)
 {
 	uint TileIndex = TileCoordinate.y * ShadowTileListGroupSize.x + TileCoordinate.x;
@@ -48,7 +52,7 @@ float TwoSidedMeshDistanceBias;
 float ShadowRayTraceThroughCulledObjects(
 	float3 WorldRayStart, 
 	float3 WorldRayEnd, 
-	float MaxRayTime, 
+	float MaxRayTime,
 	float TanLightAngle, 
 	float MinSphereRadius, 
 	float MaxSphereRadius, 
@@ -59,12 +63,11 @@ float ShadowRayTraceThroughCulledObjects(
 	uniform bool bUseScatterTileCulling,
 	bool bUseSubsurfaceTransmission)
 {
-	float MinRayTime = MaxRayTime;
 	float MinConeVisibility = 1;
 	float3 WorldRayUnitDirection = normalize(WorldRayEnd - WorldRayStart);
 
 	LOOP
-	for (uint ListObjectIndex = 0; ListObjectIndex < NumIntersectingObjects && MinRayTime >= MaxRayTime; ListObjectIndex++)
+	for (uint ListObjectIndex = 0; ListObjectIndex < NumIntersectingObjects; ListObjectIndex++)
 	{
 		uint ObjectIndex;
 
@@ -86,11 +89,6 @@ float ShadowRayTraceThroughCulledObjects(
 			ObjectIndex = ListObjectIndex;
 		}
 
-		float4 SphereCenterAndRadius = LoadObjectPositionAndRadius(ObjectIndex);
-		float ObjectCenterDistanceAlongRay = dot(SphereCenterAndRadius.xyz - WorldRayStart, WorldRayUnitDirection);
-
-		BRANCH
-		if (ObjectCenterDistanceAlongRay > -SphereCenterAndRadius.w)
 		{
 			float3 LocalPositionExtent = LoadObjectLocalPositionExtent(ObjectIndex);
 			float4x4 WorldToVolume = LoadObjectWorldToVolume(ObjectIndex);
@@ -112,15 +110,20 @@ float ShadowRayTraceThroughCulledObjects(
 			float SelfShadowScale = 1.0f / max(UVAddAndSelfShadowBias.w * WorldToVolumeScale, .0001f);
 
 			// Expand the intersection box by the radius of the cone at the distance of the object along the cone
-			float LocalConeRadiusAtObject = min(TanLightAngle * max(ObjectCenterDistanceAlongRay, 0) * WorldToVolumeScale, VolumeMaxSphereRadius);
+			float ObjectCenterDistanceAlongRay = dot(-VolumeRayStart, VolumeRayDirection);
+			float LocalConeRadiusAtObject = min(TanLightAngle * max(ObjectCenterDistanceAlongRay, 0), VolumeMaxSphereRadius);
 
-			float2 IntersectionTimes = LineBoxIntersect(VolumeRayStart, VolumeRayEnd, -LocalPositionExtent - LocalConeRadiusAtObject, LocalPositionExtent + LocalConeRadiusAtObject);
+			float2 IntersectionTimes = LineBoxIntersect(VolumeRayStart, VolumeRayEnd, -LocalPositionExtent * SDF_APPROX_MARGIN - LocalConeRadiusAtObject, LocalPositionExtent * SDF_APPROX_MARGIN + LocalConeRadiusAtObject);
 
 			BRANCH
-			if (IntersectionTimes.x < IntersectionTimes.y && IntersectionTimes.x < 1)
+			if (IntersectionTimes.x < IntersectionTimes.y)
 			{
 				float SampleRayTime = IntersectionTimes.x * VolumeRayLength;
+#if DF_SHADOW_QUALITY > 1
 				uint MaxSteps = 64;
+#else
+				uint MaxSteps = 32;
+#endif
 				float MinStepSize = 1.0f / (4 * MaxSteps);
 
 				float MinDistance = 1000000;
@@ -175,16 +178,15 @@ float ShadowRayTraceThroughCulledObjects(
 					}
 				}
 
-				if (MinConeVisibility < .01f || StepIndex == MaxSteps)
-				{
-					MinConeVisibility = 0;
-					MinRayTime = min(MinRayTime, SampleRayTime * UVScaleAndVolumeScale.w);
-				}
-
 				// Force to shadowed as we approach max steps
 				MinConeVisibility = min(MinConeVisibility, (1 - StepIndex / (float)MaxSteps));
 			}
 		}
+
+		if (MinConeVisibility < .01f)
+		{
+			break;
+		}
 	}
 
 	return MinConeVisibility;
diff --git a/Engine/Shaders/Private/DistanceFieldVisualization.usf b/Engine/Shaders/Private/DistanceFieldVisualization.usf
index 406a7774d6c7..080df91e5d87 100644
--- a/Engine/Shaders/Private/DistanceFieldVisualization.usf
+++ b/Engine/Shaders/Private/DistanceFieldVisualization.usf
@@ -165,8 +165,7 @@ void VisualizeMeshDistanceFieldCS(
 	float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 
 	float SceneDepth = CalcSceneDepth(ScreenUV);
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	float3 OpaqueWorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 OpaqueWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 	float TraceDistance = 40000;
 	float3 WorldRayStart = View.WorldCameraOrigin;
diff --git a/Engine/Shaders/Private/GpuSkinVertexFactory.ush b/Engine/Shaders/Private/GpuSkinVertexFactory.ush
index 23c904fd3555..fa94b2022835 100644
--- a/Engine/Shaders/Private/GpuSkinVertexFactory.ush
+++ b/Engine/Shaders/Private/GpuSkinVertexFactory.ush
@@ -37,6 +37,7 @@ Buffer<float2> ClothSimulVertsPositionsNormals;
 Buffer<float2> PreviousClothSimulVertsPositionsNormals;
 /** Transform to apply when positions/normals are loaded */
 float4x4 ClothLocalToWorld;
+float4x4 PreviousClothLocalToWorld;
 /** blend weight between simulated positions and original key-framed animation */
 float ClothBlendWeight;
 #endif// #if GPUSKIN_APEX_CLOTH
@@ -199,7 +200,7 @@ half2 GetShadowMapCoordinate(FVertexFactoryInterpolantsVSToPS Interpolants)
 
 #define FBoneMatrix float3x4
 
-#if FEATURE_LEVEL >= FEATURE_LEVEL_ES3_1
+#if FEATURE_LEVEL > FEATURE_LEVEL_ES3_1
 
 // The bone matrix buffer stored as 4x3 (3 float4 behind each other), all chunks of a skeletal mesh in one, each skeletal mesh has it's own buffer
 STRONG_TYPE Buffer<float4> BoneMatrices;
@@ -266,12 +267,14 @@ float3 GetClothSimulPosition(int Index, bool bPrevious)
 	if(bPrevious)
 	{
 		Position = float3(PreviousClothSimulVertsPositionsNormals[Index * 3], PreviousClothSimulVertsPositionsNormals[Index * 3 + 1].x);
+		return float3(mul(float4(Position, 1), PreviousClothLocalToWorld).xyz);
 	}
 	else
 	{
 		Position = float3(ClothSimulVertsPositionsNormals[Index * 3], ClothSimulVertsPositionsNormals[Index * 3 + 1].x);
+		return float3(mul(float4(Position, 1), ClothLocalToWorld).xyz);
 	}
-	return float3(mul(float4(Position, 1), ClothLocalToWorld).xyz);
+	
 #endif //FEATURE_LEVEL >= FEATURE_LEVEL_SM4
 }
 
@@ -282,12 +285,14 @@ float3 GetClothSimulNormal(int Index, bool bPrevious)
 	if(bPrevious)
 	{
 		Normal = float3(PreviousClothSimulVertsPositionsNormals[Index * 3 + 1].y, PreviousClothSimulVertsPositionsNormals[Index * 3 + 2]);
+		return float3(mul(float4(Normal, 0), PreviousClothLocalToWorld).xyz);
 	}
 	else
 	{
 		Normal = float3(ClothSimulVertsPositionsNormals[Index * 3 + 1].y, ClothSimulVertsPositionsNormals[Index * 3 + 2]);
+		return float3(mul(float4(Normal, 0), ClothLocalToWorld).xyz);
 	}
-	return float3(mul(float4(Normal, 0), ClothLocalToWorld).xyz);
+	
 #endif //FEATURE_LEVEL >= FEATURE_LEVEL_SM4
 
 }
@@ -323,7 +328,7 @@ float3 MorphPosition( FVertexFactoryInput Input, FVertexFactoryIntermediates Int
 
 FBoneMatrix GetBoneMatrix(int Index)
 {
-#if FEATURE_LEVEL >= FEATURE_LEVEL_ES3_1
+#if FEATURE_LEVEL > FEATURE_LEVEL_ES3_1
 	float4 A = BoneMatrices[Index * 3];
 	float4 B = BoneMatrices[Index * 3 + 1];
 	float4 C = BoneMatrices[Index * 3 + 2];
@@ -354,7 +359,7 @@ FBoneMatrix CalcBoneMatrix( FVertexFactoryInput Input )
 
 FBoneMatrix GetPreviousBoneMatrix(int Index)
 {
-#if FEATURE_LEVEL >= FEATURE_LEVEL_ES3_1
+#if FEATURE_LEVEL > FEATURE_LEVEL_ES3_1
 	float4 A = PreviousBoneMatrices[Index * 3 + 0];
 	float4 B = PreviousBoneMatrices[Index * 3 + 1];
 	float4 C = PreviousBoneMatrices[Index * 3 + 2];
diff --git a/Engine/Shaders/Private/HeightfieldLighting.usf b/Engine/Shaders/Private/HeightfieldLighting.usf
index 5f505e6bd09f..5d81f7abeb35 100644
--- a/Engine/Shaders/Private/HeightfieldLighting.usf
+++ b/Engine/Shaders/Private/HeightfieldLighting.usf
@@ -617,9 +617,7 @@ void CalculateHeightfieldOcclusionScreenGridCS(
 
 		float3 WorldNormal;
 		float SceneDepth;
-		bool bHasDistanceFieldRepresentation;
-		bool bLit;
-		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 		float3 TangentX;
 		float3 TangentY;
@@ -628,8 +626,7 @@ void CalculateHeightfieldOcclusionScreenGridCS(
 		float2 ScreenUV = GetScreenUVFromScreenGrid(OutputCoordinate);
 		float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 		
-		float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-		float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+		float3 WorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 		uint OutputBaseIndex = (OutputCoordinate.y * ScreenGridConeVisibilitySize.x + OutputCoordinate.x) * NUM_CONE_DIRECTIONS;
 
@@ -700,15 +697,12 @@ void CalculateHeightfieldIrradianceScreenGridCS(
 
 		float3 WorldNormal;
 		float SceneDepth;
-		bool bHasDistanceFieldRepresentation;
-		bool bLit;
-		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth, bHasDistanceFieldRepresentation, bLit);
+		GetDownsampledGBuffer(BaseLevelScreenUV, WorldNormal, SceneDepth);
 
 		float2 ScreenUV = GetScreenUVFromScreenGrid(OutputCoordinate);
 		float2 ScreenPosition = (ScreenUV.xy - View.ScreenPositionScaleBias.wz) / View.ScreenPositionScaleBias.xy;
 		
-		float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-		float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+		float3 WorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 		//@todo - constant time grid lookup
 		LOOP
diff --git a/Engine/Shaders/Private/LandscapeVertexFactory.ush b/Engine/Shaders/Private/LandscapeVertexFactory.ush
index 4692d07428d7..d809a8e553c2 100644
--- a/Engine/Shaders/Private/LandscapeVertexFactory.ush
+++ b/Engine/Shaders/Private/LandscapeVertexFactory.ush
@@ -392,12 +392,7 @@ FMaterialPixelParameters GetMaterialPixelParameters(FVertexFactoryInterpolantsVS
 
 #if (ES2_PROFILE || ES3_1_PROFILE) && PIXELSHADER
 
-#if WEBGL
 	Result.LayerWeights.xy = Texture2DSample(NormalmapTexture, NormalmapTextureSampler, Interpolants.WeightMapTexCoord).rg;
-#else
-	Result.LayerWeights.xy = Texture2DSample(NormalmapTexture, NormalmapTextureSampler, Interpolants.WeightMapTexCoord).rg;
-#endif 
-
 	Result.LayerWeights.z = saturate(BlendableLayerMask.z - dot(Result.LayerWeights.xy, BlendableLayerMask.xy));
 	Result.LayerWeights.w = 0; // Total weight need to be 1
 #endif
diff --git a/Engine/Shaders/Private/LocalVertexFactory.ush b/Engine/Shaders/Private/LocalVertexFactory.ush
index 4e2d2d8a09d6..f728884a57ab 100644
--- a/Engine/Shaders/Private/LocalVertexFactory.ush
+++ b/Engine/Shaders/Private/LocalVertexFactory.ush
@@ -689,7 +689,14 @@ half3x3 VertexFactoryGetTangentToLocal( FVertexFactoryInput Input, FVertexFactor
 float4 VertexFactoryGetWorldPosition(FVertexFactoryInput Input, FVertexFactoryIntermediates Intermediates)
 {
 #if USE_INSTANCING
-	return CalcWorldPosition(Input.Position, GetInstanceTransform(Intermediates)) * Intermediates.PerInstanceParams.z;
+	// Workaround for FORT-70572. It turns out on old Nvidia (AMD?) drivers, SV_VertexID must be used if
+    // SV_InstanceID is used. Otherwise, SV_InstanceID will get weird (SV_VertexID?) values
+    #if SM4_PROFILE && MANUAL_VERTEX_FETCH
+        float4 Position = Input.Position + Input.VertexId * asfloat(0x00800001);
+    #else
+        float4 Position = Input.Position;
+    #endif
+	return CalcWorldPosition(Position, GetInstanceTransform(Intermediates)) * Intermediates.PerInstanceParams.z;
 #else
 	return CalcWorldPosition(Input.Position);
 #endif	// USE_INSTANCING
diff --git a/Engine/Shaders/Private/MeshParticleVertexFactory.ush b/Engine/Shaders/Private/MeshParticleVertexFactory.ush
index 98c93b936646..a80c00354679 100644
--- a/Engine/Shaders/Private/MeshParticleVertexFactory.ush
+++ b/Engine/Shaders/Private/MeshParticleVertexFactory.ush
@@ -513,7 +513,15 @@ FVertexFactoryInterpolantsVSToPS VertexFactoryGetInterpolantsVSToPS(FVertexFacto
 	#endif
 #elif NUM_TEX_COORD_INTERPOLATORS
 	#if (ES2_PROFILE || ES3_1_PROFILE)
-		GetMaterialCustomizedUVs(VertexParameters, Interpolants.TexCoords);
+		float2 CustomizedUVs[NUM_TEX_COORD_INTERPOLATORS];
+		GetMaterialCustomizedUVs(VertexParameters, CustomizedUVs);
+		GetCustomInterpolators(VertexParameters, CustomizedUVs);
+
+		UNROLL
+		for(int CoordinateIndex = 0;CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS;++CoordinateIndex)
+		{
+			Interpolants.TexCoords[CoordinateIndex] = CustomizedUVs[CoordinateIndex];
+		}
 	#else
 		// Ensure the unused components of the last packed texture coordinate are initialized.
 		Interpolants.TexCoords[(NUM_TEX_COORD_INTERPOLATORS + 1) / 2 - 1] = 0;
diff --git a/Engine/Shaders/Private/MobileBasePassCommon.ush b/Engine/Shaders/Private/MobileBasePassCommon.ush
index 92edf941dc71..d2f5ccc24ad5 100644
--- a/Engine/Shaders/Private/MobileBasePassCommon.ush
+++ b/Engine/Shaders/Private/MobileBasePassCommon.ush
@@ -19,6 +19,12 @@
 
 #define USE_VERTEX_FOG					(!PROJECT_MOBILE_DISABLE_VERTEX_FOG) && MATERIAL_ENABLE_TRANSLUCENCY_FOGGING
 
+#ifndef PROJECT_MOBILE_USE_LEGACY_SHADING
+	#define PROJECT_MOBILE_USE_LEGACY_SHADING 0
+#endif
+
+#define USE_LEGACY_SPECULAR				(PROJECT_MOBILE_USE_LEGACY_SHADING)
+
 #define PACK_INTERPOLANTS (USE_VERTEX_FOG && NUM_VF_PACKED_INTERPOLANTS > 0 && (ES2_PROFILE || ES3_1_PROFILE))
 #define LANDSCAPE_BUG_WORKAROUND (IOS && IS_MOBILE_BASEPASS_VERTEX_SHADER && PACK_INTERPOLANTS)
 
diff --git a/Engine/Shaders/Private/MobileBasePassPixelShader.usf b/Engine/Shaders/Private/MobileBasePassPixelShader.usf
index 97691091b6a5..3dd9de14cd7d 100644
--- a/Engine/Shaders/Private/MobileBasePassPixelShader.usf
+++ b/Engine/Shaders/Private/MobileBasePassPixelShader.usf
@@ -20,6 +20,7 @@
 #include "ShadowFilteringCommon.ush"
 #include "DynamicLightingCommon.ush"
 #include "PlanarReflectionShared.ush"
+#include "MobileGGX.ush"
 
 // Add fading CSM plane:
 #define FADE_CSM 1
@@ -61,7 +62,7 @@ float4 LightColorAndFalloffExponent[MAX_DYNAMIC_POINT_LIGHTS];
 	TextureCube ReflectionCubemap;
 	SamplerState ReflectionCubemapSampler;
 	float3 InvReflectionCubemapAverageBrightness;
-	float UsingSkyReflection;
+	float4 MobileSkyReflectionParams;
 	#if HQ_REFLECTIONS
 	#define MAX_HQ_REFLECTIONS 3
 
@@ -95,6 +96,16 @@ half PhongApprox( half Roughness, half RoL )
 	return min(p, rcp_a2);						// Avoid overflow/underflow on Mali GPUs
 }
 
+
+half CalcSpecular(half Roughness, float RoL, float NoH, float3 H, float3 N)
+{
+#if USE_LEGACY_SPECULAR
+	return PhongApprox(Roughness, RoL);
+#else
+	return (Roughness*0.25 + 0.25) * GGX_Mobile(Roughness, NoH, H, N);
+#endif
+}
+
 #if !FULLY_ROUGH
 #if HQ_REFLECTIONS
 
@@ -190,6 +201,12 @@ half3 BlendReflectionCapture(FMaterialPixelParameters MaterialParameters, half R
 	// Fetch from cubemap and convert to linear HDR
 	float4 Reflection = ReflectionCube.SampleLevel(ReflectionSampler, ProjectedCaptureVector.xyz, MipLevel);
 	half3 SpecularIBL = RGBMDecode(Reflection, 16.0f);
+
+#if MOVABLE_DIRECTIONAL_LIGHT
+	// ignore average brightness for non-lightmap use case.
+	InvReflectionCubemapAverageBrightness = 1.0f;
+#endif
+
 	SpecularIBL = SpecularIBL * SpecularIBL * (InvReflectionCubemapAverageBrightness * ProjectedCaptureVector.w * BlendFactor);
 
 	BlendFactor = BlendFactor * (1.0 - ProjectedCaptureVector.w);
@@ -234,21 +251,30 @@ half3 GetImageBasedReflectionLighting(FMaterialPixelParameters MaterialParameter
 
 	half3 ProjectedCaptureVector = MaterialParameters.ReflectionVector;	
 
+	half UsingSkyReflection = MobileSkyReflectionParams.x > 0;
+	half CubemapMaxMip = UsingSkyReflection ? MobileSkyReflectionParams.x : ResolvedView.ReflectionCubemapMaxMip;
+
 	// Compute fractional mip from roughness
-	half AbsoluteSpecularMip = ComputeReflectionCaptureMipFromRoughness(Roughness, ResolvedView.ReflectionCubemapMaxMip);
+	half AbsoluteSpecularMip = ComputeReflectionCaptureMipFromRoughness(Roughness, CubemapMaxMip);
 	// Fetch from cubemap and convert to linear HDR
 	half3 SpecularIBL;
 	half4 SpecularIBLSample = ReflectionCubemap.SampleLevel(ReflectionCubemapSampler, ProjectedCaptureVector, AbsoluteSpecularMip);
 	if (UsingSkyReflection)
 	{
 		SpecularIBL = SpecularIBLSample.rgb;
+		// Apply sky colour if the reflection map is the sky.
+		SpecularIBL *= ResolvedView.SkyLightColor.rgb;
 	}
 	else
 	{
 		SpecularIBL = RGBMDecode(SpecularIBLSample, 16.0);
+		SpecularIBL = SpecularIBL * SpecularIBL;
+		// divide by average brightness for lightmap use cases only.
+		#if !MOVABLE_DIRECTIONAL_LIGHT
+			SpecularIBL *= InvReflectionCubemapAverageBrightness.x;
+		#endif
 	}
 
-	SpecularIBL = SpecularIBL * SpecularIBL * InvReflectionCubemapAverageBrightness.x;
 #endif
 	
 #if WEBGL
@@ -495,19 +521,16 @@ void Main(
 
 		float NoL = max(0, dot(float3(MaterialParameters.WorldNormal), float3(MobileDirectionalLight.DirectionalLightDirection)));
 		float RoL = max(0, dot(float3(MaterialParameters.ReflectionVector), float3(MobileDirectionalLight.DirectionalLightDirection)));
+		float3 H = normalize(MaterialParameters.CameraVector + MobileDirectionalLight.DirectionalLightDirection);
+		float NoH = max(0,dot(MaterialParameters.WorldNormal, H));
 
 		#if FULLY_ROUGH
 			Color += (Shadow * NoL) * MobileDirectionalLight.DirectionalLightColor.rgb * DiffuseColor;
 		#else
-			Color += (Shadow * NoL) * MobileDirectionalLight.DirectionalLightColor.rgb * (DiffuseColor + SpecularColor * PhongApprox(Roughness, RoL));
+			Color += (Shadow * NoL) * MobileDirectionalLight.DirectionalLightColor.rgb * (DiffuseColor + SpecularColor * CalcSpecular(Roughness, RoL, NoH, H, MaterialParameters.WorldNormal));
 			// Environment map has been prenormalized, scale by lightmap luminance
 			half3 SpecularIBL = GetImageBasedReflectionLighting(MaterialParameters, Roughness) * IndirectIrradiance;
-			if (UsingSkyReflection)
-			{
-				// Apply sky colour if the reflection map is via the sky light.
-				SpecularIBL *= ResolvedView.SkyLightColor.rgb;
-			}
-			//
+
 			#if MATERIAL_PLANAR_FORWARD_REFLECTIONS
 				BRANCH
 				if (abs(dot(ReflectionPlane.xyz, 1)) > .0001f)
@@ -523,7 +546,7 @@ void Main(
 		#if ENABLE_SKY_LIGHT
 			//@mw todo
 			// TODO: Also need to do specular.
-			Color += GetSkySHDiffuseSimple(MaterialParameters.WorldNormal) * ResolvedView.SkyLightColor.rgb * DiffuseColor;    
+			Color += GetSkySHDiffuseSimple(MaterialParameters.WorldNormal) * ResolvedView.SkyLightColor.rgb * DiffuseColor * MaterialAO;    
 		#endif
 
 		#if MAX_DYNAMIC_POINT_LIGHTS > 0
@@ -551,9 +574,11 @@ void Main(
 				float3 ToLight = LightPositionAndInvRadius[i].xyz - MaterialParameters.AbsoluteWorldPosition;
 				float DistanceSqr = dot(ToLight, ToLight);
 				float3 L = ToLight * rsqrt(DistanceSqr);
+				float3 H = normalize(MaterialParameters.CameraVector + L);
 
 				float PointNoL = max(0, dot(MaterialParameters.WorldNormal, L));
 				float PointRoL = max(0, dot(MaterialParameters.ReflectionVector, L));
+				float PointNoH = max(0, dot(MaterialParameters.WorldNormal, H));
 
 				float Attenuation;
 
@@ -571,7 +596,7 @@ void Main(
 				}
 
 				#if !FULLY_ROUGH
-					Color += min(65000.0, (Attenuation * PointNoL) * LightColorAndFalloffExponent[i].rgb * (DiffuseColor + SpecularColor * PhongApprox(Roughness, PointRoL)));
+					Color += min(65000.0, (Attenuation * PointNoL) * LightColorAndFalloffExponent[i].rgb * (1.0/PI) * (DiffuseColor + SpecularColor * CalcSpecular(Roughness, PointRoL, PointNoH, H, MaterialParameters.WorldNormal)));
 				#else
 					Color += (Attenuation * PointNoL) * LightColorAndFalloffExponent[i].rgb * DiffuseColor;
 				#endif
diff --git a/Engine/Shaders/Private/MobileGGX.tps b/Engine/Shaders/Private/MobileGGX.tps
new file mode 100644
index 000000000000..057358f3ebf7
--- /dev/null
+++ b/Engine/Shaders/Private/MobileGGX.tps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>D_GGX in mediump_half float</Name>
+  <Location>//Fortnite/Main/Engine/Shaders/Private/MobileBasePassPixelShader.usf</Location>
+  <Function>Shader code snippet to improve specular on mobile.</Function>
+  <Justification></Justification>
+  <Eula>https://www.apache.org/licenses/LICENSE-2.0</Eula>
+  <RedistributeTo>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>/Engine/Source/ThirdParty/Licenses/GGX_License.txt</LicenseFolder>
+</TpsData>
\ No newline at end of file
diff --git a/Engine/Shaders/Private/MobileGGX.ush b/Engine/Shaders/Private/MobileGGX.ush
new file mode 100644
index 000000000000..990a87d4a800
--- /dev/null
+++ b/Engine/Shaders/Private/MobileGGX.ush
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Note: comment out to assume fp32 computations
+#ifndef MOBILE_GGX_USE_FP16
+	#define MOBILE_GGX_USE_FP16 1
+#endif
+
+#define MEDIUMP_FLT_MAX    65504.0
+#define MEDIUMP_FLT_MIN    0.00006103515625
+
+#if MOBILE_GGX_USE_FP16
+	#define saturateMediump(x) min(x, MEDIUMP_FLT_MAX)
+#else
+	#define saturateMediump(x) (x)
+#endif
+
+// Taken from https://gist.github.com/romainguy/a2e9208f14cae37c579448be99f78f25
+// Modified by Epic Games, Inc. To account for premultiplied light color and code style rules.
+
+half GGX_Mobile(half Roughness, half NoH, half3 H, half3 N)
+{
+    // Walter et al. 2007, "Microfacet Models for Refraction through Rough Surfaces"
+
+    // In mediump, there are two problems computing 1.0 - NoH^2
+    // 1) 1.0 - NoH^2 suffers floating point cancellation when NoH^2 is close to 1 (highlights)
+    // 2) NoH doesn't have enough precision around 1.0
+    // Both problem can be fixed by computing 1-NoH^2 in highp and providing NoH in highp as well
+
+    // However, we can do better using Lagrange's identity:
+    //      ||a x b||^2 = ||a||^2 ||b||^2 - (a . b)^2
+    // since N and H are unit vectors: ||N x H||^2 = 1.0 - NoH^2
+    // This computes 1.0 - NoH^2 directly (which is close to zero in the highlights and has
+    // enough precision).
+    // Overall this yields better performance, keeping all computations in mediump
+
+#if MOBILE_GGX_USE_FP16
+	float3 NxH = cross(N, H);
+	float OneMinusNoHSqr = dot(NxH, NxH);
+#else
+    float OneMinusNoHSqr = 1.0 - NoH * NoH;
+#endif
+
+	half a = Roughness * Roughness;
+	float n = NoH * a;
+	float p = a / (OneMinusNoHSqr + n * n);
+	float d = p * p;
+	return saturateMediump(d);
+}
\ No newline at end of file
diff --git a/Engine/Shaders/Private/ModelforSimofColorVisionDeficiency.tps b/Engine/Shaders/Private/ModelforSimofColorVisionDeficiency.tps
new file mode 100644
index 000000000000..4544806f985d
--- /dev/null
+++ b/Engine/Shaders/Private/ModelforSimofColorVisionDeficiency.tps
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>A Model for Simulation of Color Vision Deficiency and A Color Contrast Enhancement Technique for Dichromats</Name>
+  <Location>\Engine\Shaders\Private\SlatePostProcessColorDeficiencyPixelShader.usf</Location>
+  <Function>Implemented as a shader for Slate.</Function>
+  <Eula>None</Eula>
+  <RedistributeTo>
+	<EndUserGroup>Licensees</EndUserGroup>
+    <EndUserGroup>Git</EndUserGroup>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>None</LicenseFolder>
+</TpsData>
\ No newline at end of file
diff --git a/Engine/Shaders/Private/ParticleBoundsShader.usf b/Engine/Shaders/Private/ParticleBoundsShader.usf
index 9fda58058f9d..8b91f56f326d 100644
--- a/Engine/Shaders/Private/ParticleBoundsShader.usf
+++ b/Engine/Shaders/Private/ParticleBoundsShader.usf
@@ -8,8 +8,6 @@
 	Compile time parameters:
 
 		THREAD_COUNT - The number of threads to launch per workgroup.
-		TEXTURE_SIZE_X - The width of the position texture.
-		TEXTURE_SIZE_Y - The height of the position texture.
 ------------------------------------------------------------------------------*/
 
 #include "Common.ush"
@@ -40,6 +38,10 @@ RWBuffer<float4> OutBounds;
 /** Local storage for bounds to be reduced by this workgroup. */
 groupshared float3 LocalBounds[2 * THREAD_COUNT];
 
+/** Particle texture dimensions */
+int TextureSizeX;
+int TextureSizeY;
+
 [numthreads(THREAD_COUNT,1,1)]
 void ComputeParticleBounds(
 	uint3 GroupThreadId : SV_GroupThreadID,
@@ -87,7 +89,7 @@ void ComputeParticleBounds(
 		{
 			// Read in the particle index and its position.
 			const float2 ParticleIndex = float2(InParticleIndices[InputIndex]);
-			int3 ParticleTexel = int3(ParticleIndex.xy * int2(TEXTURE_SIZE_X, TEXTURE_SIZE_Y), 0);
+			int3 ParticleTexel = int3(ParticleIndex.xy * int2(TextureSizeX, TextureSizeY), 0);
 			const float4 ParticlePosition = PositionTexture.Load(ParticleTexel);
 			if ( ParticlePosition.w <= 1.0f )
 			{
diff --git a/Engine/Shaders/Private/ParticleGPUSpriteVertexFactory.ush b/Engine/Shaders/Private/ParticleGPUSpriteVertexFactory.ush
index 6a71fc6e9844..8fa5a07e95ee 100644
--- a/Engine/Shaders/Private/ParticleGPUSpriteVertexFactory.ush
+++ b/Engine/Shaders/Private/ParticleGPUSpriteVertexFactory.ush
@@ -364,7 +364,7 @@ FVertexFactoryIntermediates GetVertexFactoryIntermediates( FVertexFactoryInput I
 	Intermediates.MotionBlurFade = 0.0f;
 #endif // #if USES_PARTICLE_MOTION_BLUR
 #if NEEDS_PARTICLE_RANDOM
-	Intermediates.Random = PseudoRandom(ParticleIndex.xy);
+	Intermediates.Random = PseudoRandom(ParticleIndex.xy + float2(EmitterDynamicUniforms.EmitterInstRandom,EmitterDynamicUniforms.EmitterInstRandom));
 #else
 	Intermediates.Random = 0.0f;
 #endif
diff --git a/Engine/Shaders/Private/ParticleSimulationShader.usf b/Engine/Shaders/Private/ParticleSimulationShader.usf
index b2d4879a62c4..f7e0f20e7dfc 100644
--- a/Engine/Shaders/Private/ParticleSimulationShader.usf
+++ b/Engine/Shaders/Private/ParticleSimulationShader.usf
@@ -26,13 +26,13 @@ struct FShaderInterpolants
 
 /*------------------------------------------------------------------------------
 	Vertex shader.
-
-	Compile time parameters:
-		TILE_SIZE_X - The width of a particle tile in the texture.
-		TILE_SIZE_Y - The height of a particle tile in the texture.
 ------------------------------------------------------------------------------*/
 #if VERTEXSHADER
 
+/** The width and height of a tile in the particle simulation texture */
+float TileSizeX;
+float TileSizeY;
+
 struct FVertexInput
 {
 	/** Unique vertex ID. */
@@ -54,7 +54,7 @@ void VertexMain(
 {
 	uint InstanceId = Input.InstanceId * TILES_PER_INSTANCE + Input.VertexId / 4;
 	
-float2 TileCoord = Input.TexCoord.xy * float2(TILE_SIZE_X,TILE_SIZE_Y) + TileOffsets[InstanceId];
+	float2 TileCoord = Input.TexCoord.xy * float2(TileSizeX,TileSizeY) + TileOffsets[InstanceId];
 
 	OutPosition = float4(
 		TileCoord.xy * float2(2.0f,-2.0f) + float2(-1.0f,1.0f),
@@ -271,8 +271,8 @@ float CollisionDepthBounds;
 /** TODO: Should be moved to Common.usf and used globaly. */
 float3 WorldPositionFromSceneDepth(float2 ScreenPosition, float SceneDepth)
 {
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	return HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 WorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
+	return WorldPosition;
 }
 
 float3 ComputeCollidingVelocity(
diff --git a/Engine/Shaders/Private/PostProcessMaterialShaders.usf b/Engine/Shaders/Private/PostProcessMaterialShaders.usf
index 6a11b696a7f9..9f794df4dcb6 100644
--- a/Engine/Shaders/Private/PostProcessMaterialShaders.usf
+++ b/Engine/Shaders/Private/PostProcessMaterialShaders.usf
@@ -7,16 +7,83 @@
 #include "Common.ush"
 #include "/Engine/Generated/Material.ush"
 
+struct FPostProcessMaterialVSToPS
+{
+	float4 Position : SV_POSITION;
+
+#if NUM_TEX_COORD_INTERPOLATORS
+	float4 TexCoords[(NUM_TEX_COORD_INTERPOLATORS+1)/2] : TEXCOORD0;
+#endif
+};
+
+#if NUM_TEX_COORD_INTERPOLATORS
+float2 GetUV(FPostProcessMaterialVSToPS Interpolants, int UVIndex)
+{
+	float4 UVVector = Interpolants.TexCoords[UVIndex / 2];
+	return Mod(UVIndex, 2) == 1 ? UVVector.zw : UVVector.xy;
+}
+
+void SetUV(inout FPostProcessMaterialVSToPS Interpolants, int UVIndex, float2 InValue)
+{
+	FLATTEN
+	if (Mod(UVIndex, 2) == 1)
+	{
+		Interpolants.TexCoords[UVIndex / 2].zw = InValue;
+	}
+	else
+	{
+		Interpolants.TexCoords[UVIndex / 2].xy = InValue;
+	}
+}
+#endif
+
+FMaterialVertexParameters GetPostProcessMaterialVSParameters(float2 UV)
+{
+	// Most params irrelevant so not a lot to fill out here
+	FMaterialVertexParameters Result = (FMaterialVertexParameters)0;
+	Result.VertexColor = 1.f.xxxx;
+	
+#if NUM_MATERIAL_TEXCOORDS_VERTEX
+	UNROLL
+	for (int CoordinateIndex = 0; CoordinateIndex < NUM_MATERIAL_TEXCOORDS_VERTEX; CoordinateIndex++)
+	{
+		Result.TexCoords[CoordinateIndex] = UV;
+	}
+#endif
+
+	return Result;
+}
+
 #if (FEATURE_LEVEL > FEATURE_LEVEL_ES3_1)
 
 #if VERTEXSHADER
 
 void MainVS(
 	in float4 InPosition : ATTRIBUTE0,
-	out float4 OutPosition : SV_POSITION
+	out FPostProcessMaterialVSToPS Output
 	)
 {
-	DrawRectangle(InPosition, OutPosition);
+	Output = (FPostProcessMaterialVSToPS)0;
+	DrawRectangle(InPosition, Output.Position);
+
+#if NUM_TEX_COORD_INTERPOLATORS
+	FMaterialVertexParameters VertexParameters = GetPostProcessMaterialVSParameters(InPosition.xy);
+	 
+	float2 CustomizedUVs[NUM_TEX_COORD_INTERPOLATORS];
+	GetMaterialCustomizedUVs(VertexParameters, CustomizedUVs);
+	GetCustomInterpolators(VertexParameters, CustomizedUVs);
+	
+	UNROLL
+	for (int CoordinateIndex = 0; CoordinateIndex < NUM_MATERIAL_TEXCOORDS; CoordinateIndex++)
+	{
+		SetUV(Output, CoordinateIndex, InPosition.xy);
+	}
+	UNROLL
+	for (int CoordinateIndex = NUM_MATERIAL_TEXCOORDS; CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS; CoordinateIndex++)
+	{
+		SetUV(Output, CoordinateIndex, CustomizedUVs[CoordinateIndex]);
+	}
+#endif
 }
 
 void MainVS_VideoOverlay(
@@ -32,7 +99,7 @@ void MainVS_VideoOverlay(
 #elif PIXELSHADER
 
 void MainPS(
-	in float4 SvPosition : SV_Position,		// after all interpolators
+	in FPostProcessMaterialVSToPS Input,
 	out float4 OutColor : SV_Target0
 	)
 {
@@ -41,13 +108,20 @@ void MainPS(
 	FPixelMaterialInputs PixelMaterialInputs;
 
 	// can be optimized
+	float4 SvPosition = Input.Position;
 	float2 ViewportUV = (SvPosition - ViewportRect.xy) * ViewportSize.zw;
 
-#if NUM_MATERIAL_TEXCOORDS
-	for(int CoordinateIndex = 0;CoordinateIndex < NUM_MATERIAL_TEXCOORDS;CoordinateIndex++)
+#if NUM_TEX_COORD_INTERPOLATORS
+	UNROLL
+	for (int CoordinateIndex = 0; CoordinateIndex < NUM_MATERIAL_TEXCOORDS; CoordinateIndex++)
 	{
 		Parameters.TexCoords[CoordinateIndex] = ViewportUV;
 	}
+	UNROLL
+	for (int CoordinateIndex = NUM_MATERIAL_TEXCOORDS; CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS; CoordinateIndex++)
+	{
+		Parameters.TexCoords[CoordinateIndex] = GetUV(Input, CoordinateIndex);
+	}
 #endif
 
 	Parameters.VertexColor = 1;
@@ -115,16 +189,35 @@ void MainPS_VideoOverlay(
 void MainVS_ES2(
 	in float4 InPosition : ATTRIBUTE0,
 	in float2 InTexCoord : ATTRIBUTE1,
-	out float2 OutUV : TEXCOORD0,
-	out float4 OutPosition : SV_POSITION
+	out FPostProcessMaterialVSToPS Output
 	)
 {
-	DrawRectangle(InPosition, InTexCoord, OutPosition, OutUV);
+	Output = (FPostProcessMaterialVSToPS)0;
+	float2 OutUV;
+	DrawRectangle(InPosition, InTexCoord, Output.Position, OutUV);
+	
+#if NUM_TEX_COORD_INTERPOLATORS
+	FMaterialVertexParameters VertexParameters = GetPostProcessMaterialVSParameters(OutUV);
+
+	float2 CustomizedUVs[NUM_TEX_COORD_INTERPOLATORS];
+	GetMaterialCustomizedUVs(VertexParameters, CustomizedUVs);
+	GetCustomInterpolators(VertexParameters, CustomizedUVs);
+
+	UNROLL
+	for (int CoordinateIndex = 0; CoordinateIndex < NUM_MATERIAL_TEXCOORDS; CoordinateIndex++)
+	{
+		SetUV(Output, CoordinateIndex, OutUV);
+	}
+	UNROLL
+	for (int CoordinateIndex = NUM_MATERIAL_TEXCOORDS; CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS; CoordinateIndex++)
+	{
+		SetUV(Output, CoordinateIndex, CustomizedUVs[CoordinateIndex]);
+	}
+#endif
 }
 
 void MainPS_ES2(
-	in float2 InUV : TEXCOORD0,
-	in float4 SvPosition : SV_Position,		// after all interpolators
+	in FPostProcessMaterialVSToPS Input,
 	out half4 OutColor : SV_Target0
 	)
 {
@@ -132,12 +225,13 @@ void MainPS_ES2(
 	FMaterialPixelParameters Parameters = MakeInitializedMaterialPixelParameters();
 	FPixelMaterialInputs PixelMaterialInputs;
 
-	float2 ScreenUV = InUV;
+	float4 SvPosition = Input.Position;
 
-#if NUM_MATERIAL_TEXCOORDS
-	for(int CoordinateIndex = 0;CoordinateIndex < NUM_MATERIAL_TEXCOORDS;CoordinateIndex++)
+#if NUM_TEX_COORD_INTERPOLATORS
+	UNROLL
+	for (int CoordinateIndex = 0; CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS; CoordinateIndex++)
 	{
-		Parameters.TexCoords[CoordinateIndex] = ScreenUV;
+		Parameters.TexCoords[CoordinateIndex] = GetUV(Input, CoordinateIndex);
 	}
 #endif
 
@@ -159,4 +253,4 @@ void MainPS_ES2(
 #endif
 	OutColor = FullSceneColor;
 }
-#endif //(FEATURE_LEVEL > FEATURE_LEVEL_ES3_1)
+#endif //(FEATURE_LEVEL > FEATURE_LEVEL_ES3_1)
\ No newline at end of file
diff --git a/Engine/Shaders/Private/PostProcessTemporalAA.usf b/Engine/Shaders/Private/PostProcessTemporalAA.usf
index efc5507af59b..1938a8cdbfe3 100644
--- a/Engine/Shaders/Private/PostProcessTemporalAA.usf
+++ b/Engine/Shaders/Private/PostProcessTemporalAA.usf
@@ -126,7 +126,7 @@
 	#define AA_BORDER 2
 	#define AA_CROSS 1
 	#define AA_DYNAMIC 1
-	#define AA_FILTERED 1
+	#define AA_FILTERED TAA_UPSAMPLE_FILTERED
 	#define AA_MANUALLY_CLAMP_HISTORY_UV 1
 	#define AA_TONE 1
 	#define AA_YCOCG 1
@@ -465,9 +465,16 @@ float4 HistoryBufferUVMinMax;
 #if COMPUTESHADER
 RWTexture2D<float4> OutComputeTex0;
 
+#if TAA_DOWNSAMPLE 
+// This shader permutation outputs half resolution image in addition to main full-res one.
+// It is more efficient than performing a separate downsampling pass afterwards.
+RWTexture2D<float4> OutComputeTexDownsampled;
+groupshared float4 GroupSharedDownsampleArray[THREADGROUP_SIZEX*THREADGROUP_SIZEY]; // TODO: share this with GroupSharedArrayF4 when possible
+#endif // TAA_DOWNSAMPLE
+
 #if HISTORY_RENDER_TARGETS == 2
 	RWTexture2D<float4> OutComputeTex1;
-#endif
+#endif // HISTORY_RENDER_TARGETS == 2
 #endif
 
 // Temporal upsample specific params.
@@ -1211,7 +1218,12 @@ FTAASceneColorSample SampleCachedSceneColorTexture(
 	uint ArrayPos = GetTileArrayIndexFromPixelOffset(InputParams, PixelOffset, LDS_COLOR_TILE_BORDER_SIZE);
 	
 	FTAASceneColorSample Sample;
+	Sample.CocRadius = 0;
 	
+	#if AA_HISTORY_PAYLOAD == HISTORY_PAYLOAD_RGB_COC || AA_HISTORY_PAYLOAD == HISTORY_PAYLOAD_RGB_OPACITY_COC
+		#error Unsupported history payload with LDS scene color caching.Test
+	#endif
+
 	#if LDS_USE_FLOAT4_ARRAY
 		Sample.Color = GroupSharedArrayF4[ArrayPos];
 
@@ -1659,16 +1671,16 @@ void ComputeNeighborhoodBoundingbox(
 		for( uint i = 0; i < AA_SAMPLES; i++ )
 		{
 			uint NeightborId = Indexes[i];
-
-			if (NeightborId == 4) continue;
-
-			float2 dPP = float2(kOffsets3x3[NeightborId]) - dKO;
-
-			FLATTEN
-			if (dot(dPP, dPP) < (DistThreshold * DistThreshold))
+			if (NeightborId != 4)
 			{
-				NeighborMin = MinPayload(NeighborMin, Neighbors[NeightborId]);
-				NeighborMax = MaxPayload(NeighborMax, Neighbors[NeightborId]);
+				float2 dPP = float2(kOffsets3x3[NeightborId]) - dKO;
+
+				FLATTEN
+				if (dot(dPP, dPP) < (DistThreshold * DistThreshold))
+				{
+					NeighborMin = MinPayload(NeighborMin, Neighbors[NeightborId]);
+					NeighborMax = MaxPayload(NeighborMax, Neighbors[NeightborId]);
+				}
 			}
 		}
 	}
@@ -2264,6 +2276,29 @@ void MainCS(
 			OutComputeTex1[PixelPos] = OutColor1;
 		#endif
 	}
+
+#if TAA_DOWNSAMPLE
+	{
+		// This shader permutation outputs half resolution image in addition to main full-res one.
+		// It is more efficient than performing a separate downsampling pass afterwards.
+		// Assumes output resolution is always even.
+
+		uint P0 = GroupThreadId.x + GroupThreadId.y * THREADGROUP_SIZEX;
+		uint P1 = P0 + 1;
+		uint P2 = P0 + THREADGROUP_SIZEX;
+		uint P3 = P2 + 1;
+
+		GroupSharedDownsampleArray[P0] = OutColor0;
+
+		GroupMemoryBarrierWithGroupSync();
+
+		if (((GroupThreadId.x | GroupThreadId.y) & 1) == 0)
+		{
+			OutComputeTexDownsampled[PixelPos / 2] =
+				(OutColor0 + GroupSharedDownsampleArray[P1] + GroupSharedDownsampleArray[P2] + GroupSharedDownsampleArray[P3]) * 0.25;
+		}
+	}
+#endif //TAA_DOWNSAMPLE
 }
 
 
diff --git a/Engine/Shaders/Private/PostProcessTonemap.usf b/Engine/Shaders/Private/PostProcessTonemap.usf
index 9486c96f8b75..becb4153515d 100644
--- a/Engine/Shaders/Private/PostProcessTonemap.usf
+++ b/Engine/Shaders/Private/PostProcessTonemap.usf
@@ -746,7 +746,13 @@ void MainPS_ES2(
 		#if USE_MSAA
 			SceneColor.rgb *= rcp(SceneColor.r*(-0.299) + SceneColor.g*(-0.587) + SceneColor.b*(-0.114) + 1.0);
 		#endif
-		OutColor.rgb = sqrt(SceneColor.rgb);
+
+		#if FEATURE_LEVEL == FEATURE_LEVEL_ES3_1
+			OutColor.rgb = pow(SceneColor.rgb, InverseGamma.x);
+		#else
+			OutColor.rgb = sqrt(SceneColor.rgb);
+		#endif
+
 	#else
 
 		#if USE_GRAIN_JITTER || USE_GRAIN_INTENSITY || USE_GRAIN_QUANTIZATION
@@ -790,7 +796,7 @@ void MainPS_ES2(
 			// Try to kill negatives and NaNs here
 			SceneColor.rgb = max(SceneColor.rgb, 0);
 		#endif
-
+			
 		#if USE_32BPP_HDR
 		{
 			SceneColor = Decode32BPPHDR(SceneColor, SvPosition, PostprocessInput0, PostprocessInput0Sampler, InTexCoords);
diff --git a/Engine/Shaders/Private/ReflectionEnvironmentPixelShader.usf b/Engine/Shaders/Private/ReflectionEnvironmentPixelShader.usf
index b535bc24b018..c8777a6b0aa4 100644
--- a/Engine/Shaders/Private/ReflectionEnvironmentPixelShader.usf
+++ b/Engine/Shaders/Private/ReflectionEnvironmentPixelShader.usf
@@ -9,6 +9,7 @@
 #include "BRDF.ush"
 #include "ReflectionEnvironmentShared.ush"
 #include "SkyLightingShared.ush"
+#include "DistanceFieldAOShared.ush"
 #include "ShadingModels.ush"
 #include "LightGridCommon.ush"
 
@@ -16,7 +17,7 @@
 #define REFLECTION_COMPOSITE_SUPPORT_SKYLIGHT_BLEND 1
 #include "ReflectionEnvironmentComposite.ush"
 
-float3 GatherRadiance(float CompositeAlpha, float3 WorldPosition, float3 RayDirection, float Roughness, float2 ScreenUV, float IndirectIrradiance, uint ShadingModelID, uint NumCulledReflectionCaptures, uint CaptureDataStartIndex)
+float3 GatherRadiance(float CompositeAlpha, float3 WorldPosition, float3 RayDirection, float Roughness, float3 BentNormal, float IndirectIrradiance, uint ShadingModelID, uint NumCulledReflectionCaptures, uint CaptureDataStartIndex)
 {
 	// Indirect occlusion from DFAO, which should be applied to reflection captures and skylight specular, but not SSR
 	float IndirectSpecularOcclusion = 1.0f;
@@ -24,7 +25,7 @@ float3 GatherRadiance(float CompositeAlpha, float3 WorldPosition, float3 RayDire
 
 #if SUPPORT_DFAO_INDIRECT_OCCLUSION
 	float IndirectDiffuseOcclusion;
-	GetDistanceFieldAOSpecularOcclusion(ScreenUV, RayDirection, Roughness, ShadingModelID == SHADINGMODELID_TWOSIDED_FOLIAGE, IndirectSpecularOcclusion, IndirectDiffuseOcclusion, ExtraIndirectSpecular);
+	GetDistanceFieldAOSpecularOcclusion(BentNormal, RayDirection, Roughness, ShadingModelID == SHADINGMODELID_TWOSIDED_FOLIAGE, IndirectSpecularOcclusion, IndirectDiffuseOcclusion, ExtraIndirectSpecular);
 	// Apply DFAO to IndirectIrradiance before mixing with indirect specular
 	IndirectIrradiance *= IndirectDiffuseOcclusion;
 #endif
@@ -36,19 +37,144 @@ float3 GatherRadiance(float CompositeAlpha, float3 WorldPosition, float3 RayDire
 Texture2D ScreenSpaceReflectionsTexture;
 SamplerState ScreenSpaceReflectionsSampler;
 
-void ReflectionEnvironmentTiledDeferredMain(
-	in noperspective float4 UVAndScreenPos : TEXCOORD0,
-	in float4 SvPosition : SV_Position,
-	out float4 OutColor : SV_Target0)
-{
-	float2 ScreenUV = UVAndScreenPos.xy;
-	float2 ScreenPosition = UVAndScreenPos.zw;
-	FScreenSpaceData ScreenSpaceData = GetScreenSpaceData(ScreenUV);
-	FGBufferData GBuffer = ScreenSpaceData.GBuffer;
-	float SceneDepth = CalcSceneDepth(ScreenUV);
-	
-	OutColor = 0;
+float3 ContrastAndNormalizeMulAdd;
+float OcclusionExponent;
+float OcclusionCombineMode;
 
+float3 SkyLightDiffuse(FScreenSpaceData ScreenSpaceData, float4 UVAndScreenPos, float3 BentNormal)
+{
+	float2 UV = UVAndScreenPos.xy;
+	float3 Lighting = 0;
+
+	FGBufferData GBuffer = ScreenSpaceData.GBuffer;
+
+	float SkyVisibility = 1;
+	float DotProductFactor = 1;
+	float3 SkyLightingNormal = GBuffer.WorldNormal;
+	float3 DiffuseIrradiance = 0;
+
+#if APPLY_SKY_SHADOWING
+#define USE_DIRECTIONAL_OCCLUSION_ON_SKY_DIFFUSE 1
+
+#if USE_DIRECTIONAL_OCCLUSION_ON_SKY_DIFFUSE
+	{
+		SkyVisibility = length(BentNormal);
+		float3 NormalizedBentNormal = BentNormal / (max(SkyVisibility, .00001f));
+
+		// Use more bent normal in corners
+		float BentNormalWeightFactor = SkyVisibility;
+
+		SkyLightingNormal = lerp(NormalizedBentNormal, GBuffer.WorldNormal, BentNormalWeightFactor);
+		DotProductFactor = lerp(dot(NormalizedBentNormal, GBuffer.WorldNormal), 1, BentNormalWeightFactor);
+	}
+#else
+	{
+		SkyVisibility = length(BentNormal);
+	}
+#endif
+
+	float ContrastCurve = 1 / (1 + exp(-ContrastAndNormalizeMulAdd.x * (SkyVisibility * 10 - 5)));
+	SkyVisibility = saturate(ContrastCurve * ContrastAndNormalizeMulAdd.y + ContrastAndNormalizeMulAdd.z);
+
+#if SUPPORT_IRRADIANCE
+	DiffuseIrradiance = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, UV, 0).xyz;
+#endif
+#endif
+
+	// Apply DFAO controls
+	SkyVisibility = pow(SkyVisibility, OcclusionExponent);
+	SkyVisibility = lerp(SkyVisibility, 1, OcclusionTintAndMinOcclusion.w);
+
+	// Combine with other AO sources
+	if (OcclusionCombineMode == 0)
+	{
+		// Combine with min which nicely avoids over-occlusion in cases where strong DFAO is present along with strong SSAO (distant trees)
+		SkyVisibility = min(SkyVisibility, min(GBuffer.GBufferAO, ScreenSpaceData.AmbientOcclusion));
+	}
+	else
+	{
+		// Combine with mul, which continues to add SSAO depth even indoors.  SSAO will need to be tweaked to be less strong.
+		SkyVisibility = SkyVisibility * min(GBuffer.GBufferAO, ScreenSpaceData.AmbientOcclusion);
+	}
+
+	float ScalarFactors = SkyVisibility;
+
+	float3 DiffuseColor = GBuffer.DiffuseColor;
+
+	BRANCH
+	if (GBuffer.ShadingModelID == SHADINGMODELID_TWOSIDED_FOLIAGE)
+	{
+		float3 SubsurfaceLookup = GetSkySHDiffuse(-GBuffer.WorldNormal) * View.SkyLightColor.rgb;
+		float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
+		Lighting += ScalarFactors * SubsurfaceLookup * SubsurfaceColor;
+	}
+
+	if (GBuffer.ShadingModelID == SHADINGMODELID_SUBSURFACE || GBuffer.ShadingModelID == SHADINGMODELID_PREINTEGRATED_SKIN)
+	{
+		float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
+		// Add subsurface energy to diffuse
+		DiffuseColor += SubsurfaceColor;
+	}
+
+	BRANCH
+	if (GBuffer.ShadingModelID == SHADINGMODELID_HAIR)
+	{
+		float3 N = GBuffer.WorldNormal;
+		float3 V = -normalize(mul(float4(UVAndScreenPos.zw, 1, 0), View.ScreenToWorld).xyz);
+		float3 L = normalize(V - N * dot(V, N));
+		SkyLightingNormal = L;
+		DiffuseColor = PI * HairShading(GBuffer, L, V, N, 1, 0, 0.2, uint2(0, 0));
+	}
+
+	if (GBuffer.ShadingModelID == SHADINGMODELID_CLOTH)
+	{
+		DiffuseColor += GBuffer.CustomData.rgb * GBuffer.CustomData.a;
+	}
+
+	// Compute the preconvolved incoming lighting with the bent normal direction
+	float3 DiffuseLookup = GetSkySHDiffuse(SkyLightingNormal) * View.SkyLightColor.rgb;
+
+	// Apply AO to the sky diffuse and account for darkening due to the geometry term
+	// apply the Diffuse color to the lighting (including OcclusionTintAndMinOcclusion as it's considered another light, that fixes SubsurfaceProfile being too dark)
+	Lighting += ((ScalarFactors * DotProductFactor) * DiffuseLookup + (1 - SkyVisibility) * OcclusionTintAndMinOcclusion.xyz) * DiffuseColor;
+
+	Lighting += DiffuseIrradiance * GBuffer.DiffuseColor * (GBuffer.GBufferAO * ScreenSpaceData.AmbientOcclusion);
+
+#if USE_PREEXPOSURE
+	Lighting *= View.PreExposure;
+#endif
+	
+	// For debugging
+#if SUPPORT_IRRADIANCE
+	//Lighting = max(Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, UV, 0).xyz, 0) + .01f * GetSkySHDiffuse(InGBufferData.WorldNormal);
+#endif
+
+	//Lighting = (Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, UV, 0).xyz);
+
+	return Lighting;
+}
+
+// Used during reflection captures and SM4 to get faked bounce light from specular surfaces
+float3 SpecularBounce(FScreenSpaceData ScreenSpaceData, float4 UVAndScreenPos)
+{
+	float2 UV = UVAndScreenPos.xy;
+
+	FGBufferData GBuffer = ScreenSpaceData.GBuffer;
+
+	float3 ScreenVector = normalize(mul(float4(UVAndScreenPos.zw, 1, 0), View.ScreenToWorld).xyz);
+
+	float3 N = GBuffer.WorldNormal;
+	float3 V = -ScreenVector;
+
+	float NoV = saturate(dot(N, V));
+
+	GBuffer.SpecularColor = EnvBRDFApprox(GBuffer.SpecularColor, GBuffer.Roughness, NoV);
+
+	return GBuffer.SpecularColor * GBuffer.IndirectIrradiance;
+}
+
+float3 ReflectionEnvironment(FScreenSpaceData ScreenSpaceData, float4 UVAndScreenPos, float4 SvPosition, float3 BentNormal)
+{
 #if USE_PREEXPOSURE
 	const float PreExposure = View.PreExposure;
 #else
@@ -56,9 +182,13 @@ void ReflectionEnvironmentTiledDeferredMain(
 #endif
 	
 	float4 Color = float4(0, 0, 0, 1);
+
+	float2 ScreenUV = UVAndScreenPos.xy;
+	float2 ScreenPosition = UVAndScreenPos.zw;
+	FGBufferData GBuffer = ScreenSpaceData.GBuffer;
+	float SceneDepth = CalcSceneDepth(ScreenUV);
 	
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld);
-	float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 WorldPosition = mul(float4(ScreenPosition * SceneDepth, SceneDepth, 1), View.ScreenToWorld).xyz;
 	float3 CameraToPixel = normalize(WorldPosition - View.WorldCameraOrigin);
 	float3 ReflectionVector = reflect(CameraToPixel, GBuffer.WorldNormal);
 	float IndirectIrradiance = GBuffer.IndirectIrradiance;
@@ -69,117 +199,138 @@ void ReflectionEnvironmentTiledDeferredMain(
 	if (ReflectionStruct.SkyLightParameters.y > 0 && ReflectionStruct.SkyLightParameters.z > 0)
 	{
 		float2 ScreenUV = ScreenPosition * View.ScreenPositionScaleBias.xy + View.ScreenPositionScaleBias.wz;
-		IndirectIrradiance += GetDynamicSkyIndirectIrradiance(ScreenUV, GBuffer.WorldNormal);
+		IndirectIrradiance += GetDynamicSkyIndirectIrradiance(BentNormal, GBuffer.WorldNormal);
 	}
 #endif
 
+
+	float3 N = GBuffer.WorldNormal;
+	float3 V = -CameraToPixel;
+	float3 R = 2 * dot( V, N ) * N - V;
+	float NoV = saturate( dot( N, V ) );
+
+	// Point lobe in off-specular peak direction
+	R = GetOffSpecularPeakReflectionDir(N, R, GBuffer.Roughness);
+
+#if 1
+	// Note: this texture may also contain planar reflections
+	float4 SSR = Texture2DSample( ScreenSpaceReflectionsTexture, ScreenSpaceReflectionsSampler, ScreenUV );
+	Color.rgb = SSR.rgb;
+	Color.a = 1 - SSR.a;
+#endif
+
+	if( GBuffer.ShadingModelID == SHADINGMODELID_CLEAR_COAT )
+	{
+		const float ClearCoat = GBuffer.CustomData.x;
+		Color = lerp( Color, float4(0,0,0,1), ClearCoat );
+
+#if CLEAR_COAT_BOTTOM_NORMAL
+		const float2 oct1 = ((float2(GBuffer.CustomData.a, GBuffer.CustomData.z) * 2) - (256.0/255.0)) + UnitVectorToOctahedron(GBuffer.WorldNormal);
+		const float3 ClearCoatUnderNormal = OctahedronToUnitVector(oct1);
+
+		const float3 BottomEffectiveNormal = ClearCoatUnderNormal;			
+		R = 2 * dot( V, ClearCoatUnderNormal ) * ClearCoatUnderNormal - V;
+#endif
+	}
+
+	float AO = GBuffer.GBufferAO * ScreenSpaceData.AmbientOcclusion;
+	float RoughnessSq = GBuffer.Roughness * GBuffer.Roughness;
+	float SpecularOcclusion = GetSpecularOcclusion(NoV, RoughnessSq, AO);
+	Color.a *= SpecularOcclusion;
+
+#if FEATURE_LEVEL >= FEATURE_LEVEL_SM5
+	float2 LocalPosition = SvPosition.xy - View.ViewRectMin.xy;
+
+	uint GridIndex = ComputeLightGridCellIndex(uint2(LocalPosition.x, LocalPosition.y), SceneDepth);
+	uint NumCulledEntryIndex = (ForwardLightData.NumGridCells + GridIndex) * NUM_CULLED_LIGHTS_GRID_STRIDE;
+	uint NumCulledReflectionCaptures = min(ForwardLightData.NumCulledLightsGrid[NumCulledEntryIndex + 0], ForwardLightData.NumReflectionCaptures);
+	uint DataStartIndex = ForwardLightData.NumCulledLightsGrid[NumCulledEntryIndex + 1];
+#else
+	uint DataStartIndex = 0;
+	uint NumCulledReflectionCaptures = 0;
+#endif
+
+	//bottom for clearcoat or the only reflection.
+	Color.rgb += PreExposure * GatherRadiance(Color.a, WorldPosition, R, GBuffer.Roughness, BentNormal, IndirectIrradiance, GBuffer.ShadingModelID, NumCulledReflectionCaptures, DataStartIndex);
+
+	BRANCH
+	if( GBuffer.ShadingModelID == SHADINGMODELID_CLEAR_COAT )
+	{
+		const float ClearCoat			= GBuffer.CustomData.x;
+		const float ClearCoatRoughness	= GBuffer.CustomData.y;
+
+		// TODO EnvBRDF should have a mask param
+		float2 AB = PreIntegratedGF.SampleLevel( PreIntegratedGFSampler, float2( NoV, GBuffer.Roughness ), 0 ).rg;
+		Color.rgb *= GBuffer.SpecularColor * AB.x + AB.y * saturate( 50 * GBuffer.SpecularColor.g ) * (1 - ClearCoat);
+		
+		// F_Schlick
+		float F0 = 0.04;
+		float Fc = Pow5( 1 - NoV );
+		float F = Fc + (1 - Fc) * F0;
+		F *= ClearCoat;
+			
+		float LayerAttenuation = (1 - F);		
+		Color.rgb *= LayerAttenuation;
+		Color.a = F;
+		
+			
+		Color.rgb += SSR.rgb * F;
+		Color.a *= 1 - SSR.a;
+			
+		Color.a *= SpecularOcclusion;
+
+		float3 TopLayerR = 2 * dot( V, N ) * N - V;
+		Color.rgb += PreExposure * GatherRadiance(Color.a, WorldPosition, TopLayerR, ClearCoatRoughness, BentNormal, IndirectIrradiance, GBuffer.ShadingModelID, NumCulledReflectionCaptures, DataStartIndex);
+	}
+	else
+	{
+		Color.rgb *= EnvBRDF( GBuffer.SpecularColor, GBuffer.Roughness, NoV );
+	}
+
+	// Transform NaNs to black, transform negative colors to black.
+	return -min(-Color.rgb, 0.0);
+}
+
+void ReflectionEnvironmentSkyLighting(
+	in noperspective float4 UVAndScreenPos : TEXCOORD0,
+	in float4 SvPosition : SV_Position,
+	out float4 OutColor : SV_Target0)
+{
+	float2 ScreenUV = UVAndScreenPos.xy;
+	FScreenSpaceData ScreenSpaceData = GetScreenSpaceData(ScreenUV);
+	uint ShadingModelID = GetShadingModelId(ScreenUV);
+
+	OutColor = 0.0f;
+
+	float3 BentNormal = ScreenSpaceData.GBuffer.WorldNormal;
+#if APPLY_SKY_SHADOWING
+	BentNormal = UpsampleDFAO(UVAndScreenPos);
+#endif
+
 	BRANCH
-	if( GBuffer.ShadingModelID != SHADINGMODELID_UNLIT && GBuffer.ShadingModelID != SHADINGMODELID_HAIR )
-	{		
-		float3 N = GBuffer.WorldNormal;
-		float3 V = -CameraToPixel;
-		float3 R = 2 * dot( V, N ) * N - V;
-		float NoV = saturate( dot( N, V ) );
+	// Only light pixels marked as lit
+	if (ShadingModelID > 0)
+	{
+#if ENABLE_DYNAMIC_SKY_LIGHT
+		float3 SkyLighting = SkyLightDiffuse(ScreenSpaceData, UVAndScreenPos, BentNormal);
 
-		// Point lobe in off-specular peak direction
-		R = GetOffSpecularPeakReflectionDir(N, R, GBuffer.Roughness);
+		// Scene color alpha is used for ScreenSpaceSubsurfaceScattering (if that is not needed it can be disabled with SUBSURFACE_CHANNEL_MODE)
+		FLightAccumulator LightAccumulator = (FLightAccumulator)0;
 
-#if 1
-		// Note: this texture may also contain planar reflections
-		float4 SSR = Texture2DSample( ScreenSpaceReflectionsTexture, ScreenSpaceReflectionsSampler, ScreenUV );
-		Color.rgb = SSR.rgb;
-		Color.a = 1 - SSR.a;
+		const bool bNeedsSeparateSubsurfaceLightAccumulation = ShadingModelID == SHADINGMODELID_SUBSURFACE_PROFILE;
+
+		LightAccumulator_Add(LightAccumulator, SkyLighting, SkyLighting, 1.0f, bNeedsSeparateSubsurfaceLightAccumulation);
+		OutColor = LightAccumulator_GetResult(LightAccumulator);
 #endif
+	}
 
-		if( GBuffer.ShadingModelID == SHADINGMODELID_CLEAR_COAT )
-		{
-			const float ClearCoat = GBuffer.CustomData.x;
-			Color = lerp( Color, float4(0,0,0,1), ClearCoat );
-
-#if CLEAR_COAT_BOTTOM_NORMAL
-			const float2 oct1 = ((float2(GBuffer.CustomData.a, GBuffer.CustomData.z) * 2) - (256.0/255.0)) + UnitVectorToOctahedron(GBuffer.WorldNormal);
-			const float3 ClearCoatUnderNormal = OctahedronToUnitVector(oct1);
-
-			const float3 BottomEffectiveNormal = ClearCoatUnderNormal;			
-			R = 2 * dot( V, ClearCoatUnderNormal ) * ClearCoatUnderNormal - V;
-#endif
-		}
-
-		float AO = GBuffer.GBufferAO * ScreenSpaceData.AmbientOcclusion;
-		float RoughnessSq = GBuffer.Roughness * GBuffer.Roughness;
-		float SpecularOcclusion = GetSpecularOcclusion(NoV, RoughnessSq, AO);
-		Color.a *= SpecularOcclusion;
-
-#if FEATURE_LEVEL >= FEATURE_LEVEL_SM5
-		float2 LocalPosition = SvPosition.xy - View.ViewRectMin.xy;
-
-		uint GridIndex = ComputeLightGridCellIndex(uint2(LocalPosition.x, LocalPosition.y), SceneDepth);
-		uint NumCulledEntryIndex = (ForwardLightData.NumGridCells + GridIndex) * NUM_CULLED_LIGHTS_GRID_STRIDE;
-		uint NumCulledReflectionCaptures = min(ForwardLightData.NumCulledLightsGrid[NumCulledEntryIndex + 0], ForwardLightData.NumReflectionCaptures);
-		uint DataStartIndex = ForwardLightData.NumCulledLightsGrid[NumCulledEntryIndex + 1];
+	BRANCH
+	if (ShadingModelID != SHADINGMODELID_UNLIT && ShadingModelID != SHADINGMODELID_HAIR)
+	{
+#if SPECULAR_BOUNCE
+		OutColor.xyz += SpecularBounce(ScreenSpaceData, UVAndScreenPos);
 #else
-		uint DataStartIndex = 0;
-		uint NumCulledReflectionCaptures = 0;
+		OutColor.xyz += ReflectionEnvironment(ScreenSpaceData, UVAndScreenPos, SvPosition, BentNormal);
 #endif
-
-		//bottom for clearcoat or the only reflection.
-		Color.rgb += PreExposure * GatherRadiance(Color.a, WorldPosition, R, GBuffer.Roughness, ScreenUV, IndirectIrradiance, GBuffer.ShadingModelID, NumCulledReflectionCaptures, DataStartIndex);
-
-		BRANCH
-		if( GBuffer.ShadingModelID == SHADINGMODELID_CLEAR_COAT )
-		{
-			const float ClearCoat			= GBuffer.CustomData.x;
-			const float ClearCoatRoughness	= GBuffer.CustomData.y;
-
-			// TODO EnvBRDF should have a mask param
-			float2 AB = PreIntegratedGF.SampleLevel( PreIntegratedGFSampler, float2( NoV, GBuffer.Roughness ), 0 ).rg;
-			Color.rgb *= GBuffer.SpecularColor * AB.x + AB.y * saturate( 50 * GBuffer.SpecularColor.g ) * (1 - ClearCoat);
-		
-			// F_Schlick
-			float F0 = 0.04;
-			float Fc = Pow5( 1 - NoV );
-			float F = Fc + (1 - Fc) * F0;
-			F *= ClearCoat;
-			
-			float LayerAttenuation = (1 - F);		
-			Color.rgb *= LayerAttenuation;
-			Color.a = F;
-		
-			
-			Color.rgb += SSR.rgb * F;
-			Color.a *= 1 - SSR.a;
-			
-			Color.a *= SpecularOcclusion;
-
-			float3 TopLayerR = 2 * dot( V, N ) * N - V;
-			Color.rgb += PreExposure * GatherRadiance(Color.a, WorldPosition, TopLayerR, ClearCoatRoughness, ScreenUV, IndirectIrradiance, GBuffer.ShadingModelID, NumCulledReflectionCaptures, DataStartIndex);
-		}
-		else
-		{
-			Color.rgb *= EnvBRDF( GBuffer.SpecularColor, GBuffer.Roughness, NoV );
-		}
-
-		// Transform NaNs to black, transform negative colors to black.
-		OutColor.rgb = -min(-Color.rgb, 0.0);
 	}
 }
-
-// Used during reflection captures and SM4 to get faked bounce light from specular surfaces
-void SpecularBouncePS(in noperspective float4 UVAndScreenPos : TEXCOORD0, out float4 OutColor : SV_Target0)
-{
-	float2 UV = UVAndScreenPos.xy;
-
-	FScreenSpaceData ScreenSpaceData = GetScreenSpaceData(UV);
-	FGBufferData GBuffer = ScreenSpaceData.GBuffer;
-
-	float3 ScreenVector = normalize( mul( float4(UVAndScreenPos.zw, 1, 0), View.ScreenToWorld ).xyz );
-
-	float3 N = GBuffer.WorldNormal;
-	float3 V = -ScreenVector;
-
-	float NoV = saturate( dot(N, V) );
-
-	GBuffer.SpecularColor = EnvBRDFApprox( GBuffer.SpecularColor, GBuffer.Roughness, NoV );
-	
-	OutColor = float4( GBuffer.SpecularColor * GBuffer.IndirectIrradiance, 0 );
-}
diff --git a/Engine/Shaders/Private/ReflectionEnvironmentShaders.usf b/Engine/Shaders/Private/ReflectionEnvironmentShaders.usf
index c084f2229522..1b885a68ace6 100644
--- a/Engine/Shaders/Private/ReflectionEnvironmentShaders.usf
+++ b/Engine/Shaders/Private/ReflectionEnvironmentShaders.usf
@@ -267,15 +267,6 @@ void FilterPS(
 	float2 ScaledUVs = Input.UV * 2 - 1;
 	float3 CubeCoordinates = GetCubemapVector(ScaledUVs);
 
-#if ES2_PROFILE || ES3_1_PROFILE || METAL_PROFILE
-//@todo - mwassmer.  Write filtering that works for ES2 so specular will work.
-#define FILTER_CUBEMAP 0
-#else
-#define FILTER_CUBEMAP 1
-#endif
-
-#if FILTER_CUBEMAP
-
 	float3 N = normalize(CubeCoordinates);
 	float3x3 TangentToWorld = GetTangentBasis( N );
 
@@ -360,12 +351,6 @@ void FilterPS(
 
 		OutColor = FilteredColor / Weight;
 	}
-
-#else
-
-	OutColor = SampleCubemap(CubeCoordinates, MipIndex);
-
-#endif
 }
 
 float4 CoefficientMask0;
diff --git a/Engine/Shaders/Private/ShadowProjectionPixelShader.usf b/Engine/Shaders/Private/ShadowProjectionPixelShader.usf
index 82bf88d71dfa..61903673c340 100644
--- a/Engine/Shaders/Private/ShadowProjectionPixelShader.usf
+++ b/Engine/Shaders/Private/ShadowProjectionPixelShader.usf
@@ -100,8 +100,7 @@ void Main(
 	float SceneW = CalcSceneDepth( ScreenUV );
 	float4 ScreenPosition = float4(((ScreenUV.xy - View.ScreenPositionScaleBias.wz ) / View.ScreenPositionScaleBias.xy) * SceneW, SceneW, 1);
 	float4 ShadowPosition = mul(ScreenPosition, ScreenToShadowMatrix);
-	float4 HomogeneousWorldPosition = mul(ScreenPosition, View.ScreenToWorld);
-	float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 WorldPosition = mul(ScreenPosition, View.ScreenToWorld).xyz;
 
 	float ShadowZ = ShadowPosition.z;
 	ShadowPosition.xyz /= ShadowPosition.w;
@@ -315,8 +314,7 @@ void MainOnePassPointLightPS(
 	float2 ScreenUV = float2( SVPos.xy * View.BufferSizeAndInvSize.zw );
 	float SceneW = CalcSceneDepth( ScreenUV );
 	float2 ScreenPosition = ( ScreenUV.xy - View.ScreenPositionScaleBias.wz ) / View.ScreenPositionScaleBias.xy;
-	float4 HomogeneousWorldPosition = mul(float4(ScreenPosition.xy * SceneW, SceneW, 1), View.ScreenToWorld);
- 	float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 WorldPosition = mul(float4(ScreenPosition.xy * SceneW, SceneW, 1), View.ScreenToWorld).xyz;
 
 	// For debugging
 #define OUTPUT_CUBE_SHADOW_DEPTH_NO_FILTERING 0
diff --git a/Engine/Shaders/Private/SkyLighting.usf b/Engine/Shaders/Private/SkyLighting.usf
deleted file mode 100644
index 344514b192c1..000000000000
--- a/Engine/Shaders/Private/SkyLighting.usf
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-/*=============================================================================
-	SkyLighting.usf - implementation of dynamic sky lighting
-=============================================================================*/
-
-#include "Common.ush"
-#include "DeferredShadingCommon.ush"
-#include "ReflectionEnvironmentShared.ush"
-#include "BRDF.ush"
-#include "ShadingModels.ush"
-
-Texture2D BentNormalAOTexture;
-SamplerState BentNormalAOSampler;
-
-float3 DecodeBentNormal(float3 EncodedBentNormal)
-{
-	return EncodedBentNormal;
-}
-
-Texture2D IrradianceTexture;
-SamplerState IrradianceSampler;
-
-float3 ContrastAndNormalizeMulAdd;
-float OcclusionExponent;
-float4 OcclusionTintAndMinOcclusion;
-float OcclusionCombineMode;
-
-/** Note: used by movable skylights only.  Stationary sky light diffuse is evaluated in the base pass, and Static sky lighting is baked into lightmaps. */
-void SkyLightDiffusePS(
-	in noperspective float4 UVAndScreenPos : TEXCOORD0, 
-	out float4 OutColor : SV_Target0)
-{
-	float2 UV = UVAndScreenPos.xy;
-	uint ShadingModelId = GetShadingModelId(UV);
-	float3 Lighting = 0; 
-
-	BRANCH
-	// Only light pixels marked as lit
-	if (ShadingModelId > 0)
-	{
-		FScreenSpaceData ScreenSpaceData = GetScreenSpaceData(UV);
-		FGBufferData GBuffer = ScreenSpaceData.GBuffer;
-
-		float SkyVisibility = 1;
-		float DotProductFactor = 1;
-		float3 SkyLightingNormal = GBuffer.WorldNormal;
-		float3 DiffuseIrradiance = 0;
-
-#if APPLY_SHADOWING
-		float3 BentNormal = DecodeBentNormal(Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, UV, 0).xyz);
-
-		#define USE_DIRECTIONAL_OCCLUSION_ON_SKY_DIFFUSE 1
-
-		#if USE_DIRECTIONAL_OCCLUSION_ON_SKY_DIFFUSE
-		{
-			SkyVisibility = length(BentNormal);
-			float3 NormalizedBentNormal = BentNormal / (max(SkyVisibility, .00001f));
-
-			// Use more bent normal in corners
-			float BentNormalWeightFactor = SkyVisibility;
-
-			SkyLightingNormal = lerp(NormalizedBentNormal, GBuffer.WorldNormal, BentNormalWeightFactor);
-			DotProductFactor = lerp(dot(NormalizedBentNormal, GBuffer.WorldNormal), 1, BentNormalWeightFactor);
-		}
-		#else
-		{
-			SkyVisibility = length(BentNormal);
-		}
-		#endif
-
-		float ContrastCurve = 1 / (1 + exp(-ContrastAndNormalizeMulAdd.x * (SkyVisibility * 10 - 5)));
-		SkyVisibility = saturate(ContrastCurve * ContrastAndNormalizeMulAdd.y + ContrastAndNormalizeMulAdd.z);
-		
-		#if SUPPORT_IRRADIANCE
-			DiffuseIrradiance = Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, UV, 0).xyz;
-		#endif
-#endif
-
-		// Apply DFAO controls
-		SkyVisibility = pow(SkyVisibility, OcclusionExponent);
-		SkyVisibility = lerp(SkyVisibility, 1, OcclusionTintAndMinOcclusion.w);
-
-		// Combine with other AO sources
-		if (OcclusionCombineMode == 0)
-		{
-			// Combine with min which nicely avoids over-occlusion in cases where strong DFAO is present along with strong SSAO (distant trees)
-			SkyVisibility = min(SkyVisibility, min(GBuffer.GBufferAO, ScreenSpaceData.AmbientOcclusion));
-		}
-		else
-		{
-			// Combine with mul, which continues to add SSAO depth even indoors.  SSAO will need to be tweaked to be less strong.
-			SkyVisibility = SkyVisibility * min(GBuffer.GBufferAO, ScreenSpaceData.AmbientOcclusion);
-		}
-
-		float ScalarFactors = SkyVisibility;
-
-		float3 DiffuseColor = GBuffer.DiffuseColor;
-
-		BRANCH 
-		if (ShadingModelId == SHADINGMODELID_TWOSIDED_FOLIAGE)
-		{
-			float3 SubsurfaceLookup = GetSkySHDiffuse(-GBuffer.WorldNormal) * View.SkyLightColor.rgb;
-			float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
-			Lighting += ScalarFactors * SubsurfaceLookup * SubsurfaceColor;
-		}
-
-		if (ShadingModelId == SHADINGMODELID_SUBSURFACE || ShadingModelId == SHADINGMODELID_PREINTEGRATED_SKIN)
-		{
-			float3 SubsurfaceColor = ExtractSubsurfaceColor(GBuffer);
-			// Add subsurface energy to diffuse
-			DiffuseColor += SubsurfaceColor;
-		}
-
-		BRANCH 
-		if (ShadingModelId == SHADINGMODELID_HAIR)
-		{
-			float3 N = GBuffer.WorldNormal;
-			float3 V = -normalize(mul(float4(UVAndScreenPos.zw, 1, 0), View.ScreenToWorld).xyz);
-			float3 L = normalize(V - N * dot(V,N));
-			SkyLightingNormal = L;
-			DiffuseColor = PI * HairShading( GBuffer, L, V, N, 1, 0, 0.2, uint2(0,0) );
-		}
-
-		if (ShadingModelId == SHADINGMODELID_CLOTH)
-		{
-			DiffuseColor += GBuffer.CustomData.rgb * GBuffer.CustomData.a;
-		}
-
-		// Compute the preconvolved incoming lighting with the bent normal direction
-		float3 DiffuseLookup = GetSkySHDiffuse(SkyLightingNormal) * View.SkyLightColor.rgb;
-
-		// Apply AO to the sky diffuse and account for darkening due to the geometry term
-		// apply the Diffuse color to the lighting (including OcclusionTintAndMinOcclusion as it's considered another light, that fixes SubsurfaceProfile being too dark)
-		Lighting += ((ScalarFactors * DotProductFactor) * DiffuseLookup + (1 - SkyVisibility) * OcclusionTintAndMinOcclusion.xyz) * DiffuseColor;
-
-		Lighting += DiffuseIrradiance * GBuffer.DiffuseColor * (GBuffer.GBufferAO * ScreenSpaceData.AmbientOcclusion);
-
-#if USE_PREEXPOSURE
-		Lighting *= View.PreExposure;
-#endif
-
-		// For debugging
-		#if SUPPORT_IRRADIANCE
-			//Lighting = max(Texture2DSampleLevel(IrradianceTexture, IrradianceSampler, UV, 0).xyz, 0) + .01f * GetSkySHDiffuse(InGBufferData.WorldNormal);
-		#endif
-
-		//Lighting = (Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, UV, 0).xyz);
-	}
-
-	// Scene color alpha is used for ScreenSpaceSubsurfaceScattering (if that is not needed it can be disabled with SUBSURFACE_CHANNEL_MODE)
-	{
-		FLightAccumulator LightAccumulator = (FLightAccumulator)0;
-
-		const bool bNeedsSeparateSubsurfaceLightAccumulation = ShadingModelId == SHADINGMODELID_SUBSURFACE_PROFILE;
-
-		LightAccumulator_Add(LightAccumulator, Lighting, Lighting, 1.0f, bNeedsSeparateSubsurfaceLightAccumulation);
-		OutColor = LightAccumulator_GetResult(LightAccumulator);
-	}
-}
diff --git a/Engine/Shaders/Private/SkyLightingShared.ush b/Engine/Shaders/Private/SkyLightingShared.ush
index 5d9a551a635d..9298ef283530 100644
--- a/Engine/Shaders/Private/SkyLightingShared.ush
+++ b/Engine/Shaders/Private/SkyLightingShared.ush
@@ -16,19 +16,11 @@ float ApproximateConeConeIntersection(float ArcLength0, float ArcLength1, float
 	return Intersection;
 }
 
-Texture2D BentNormalAOTexture;
-SamplerState BentNormalAOSampler;
-
-float3 DecodeBentNormal(float3 EncodedBentNormal)
-{
-	return EncodedBentNormal;
-}
-
 float ApplyBentNormalAO;
 float InvSkySpecularOcclusionStrength;
 float4 OcclusionTintAndMinOcclusion;
 
-void GetDistanceFieldAOSpecularOcclusion(float2 ScreenUV, float3 ReflectionVector, float Roughness, bool bTwoSidedFoliage, out float IndirectSpecularOcclusion, out float IndirectDiffuseOcclusion, out float3 ExtraIndirectSpecular)
+void GetDistanceFieldAOSpecularOcclusion(float3 BentNormalAO, float3 ReflectionVector, float Roughness, bool bTwoSidedFoliage, out float IndirectSpecularOcclusion, out float IndirectDiffuseOcclusion, out float3 ExtraIndirectSpecular)
 {
 	IndirectSpecularOcclusion = 1;
 	IndirectDiffuseOcclusion = 1;
@@ -37,7 +29,6 @@ void GetDistanceFieldAOSpecularOcclusion(float2 ScreenUV, float3 ReflectionVecto
 	BRANCH
 	if (ApplyBentNormalAO > 0)
 	{
-		float3 BentNormalAO = DecodeBentNormal(Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, ScreenUV, 0).xyz);
 		float BentNormalLength = length(BentNormalAO);
 
 		BRANCH
@@ -70,9 +61,8 @@ void GetDistanceFieldAOSpecularOcclusion(float2 ScreenUV, float3 ReflectionVecto
 	}
 }
 
-float GetDynamicSkyIndirectIrradiance(float2 ScreenUV, float3 WorldNormal)
+float GetDynamicSkyIndirectIrradiance(float3 BentNormal, float3 WorldNormal)
 {
-	float3 BentNormal = DecodeBentNormal(Texture2DSampleLevel(BentNormalAOTexture, BentNormalAOSampler, ScreenUV, 0).xyz);
 	float SkyVisibility = length(BentNormal);
 	float3 DiffuseLookup = GetSkySHDiffuse(WorldNormal) * View.SkyLightColor.rgb;
 	return Luminance(DiffuseLookup) * SkyVisibility;
diff --git a/Engine/Shaders/Private/SlateElementPixelShader.usf b/Engine/Shaders/Private/SlateElementPixelShader.usf
index 57b06308274c..e58b5c96e848 100644
--- a/Engine/Shaders/Private/SlateElementPixelShader.usf
+++ b/Engine/Shaders/Private/SlateElementPixelShader.usf
@@ -256,10 +256,6 @@ half4 Main( VertexToPixelInterpolants VIn ) : SV_Target0
 	OutColor.rgb = lerp( OutColor.rgb, Grayish, clamp( distance( OutColor.rgb, Grayish ), 0, .8)  );
 #endif
 
-#if !USE_MATERIALS
-	OutColor = ApplyColorVisionDeficiencyFilter(OutColor);
-#endif
-
 	// gamma correct
 	OutColor.rgb = GammaCorrect(OutColor.rgb);
 
diff --git a/Engine/Shaders/Private/SlatePostProcessColorDeficiencyPixelShader.usf b/Engine/Shaders/Private/SlatePostProcessColorDeficiencyPixelShader.usf
new file mode 100644
index 000000000000..e30506226cdc
--- /dev/null
+++ b/Engine/Shaders/Private/SlatePostProcessColorDeficiencyPixelShader.usf
@@ -0,0 +1,278 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Common.ush"
+#include "SlateShaderCommon.ush"
+#include "GammaCorrectionCommon.ush"
+#include "ColorSpace.ush"
+
+Texture2D ElementTexture;
+SamplerState ElementTextureSampler;
+
+#define CDV_NormalVision 0
+#define CDV_Deuteranope 1
+#define CDV_Protanope 2
+#define CDV_Tritanope 3
+
+float ColorVisionDeficiencyType;
+float ColorVisionDeficiencySeverity;
+float bCorrectDeficiency;
+float bSimulateCorrectionWithDeficiency;
+
+// CDV tables comes from:
+// A Model for Simulation of Color Vision Deficiency and A Color Contrast Enhancement Technique for Dichromats
+// - Gustavo M. Machado (2010)
+
+static const float3x3 RGB_2_Protanomaly[11] = 
+{
+	// Severity - 0
+	float3x3(1.0, 0.0, 0.0,
+			 0.0, 1.0, 0.0,
+			 0.0, 0.0, 1.0),
+	// Severity - 1
+	float3x3(0.856167, 0.182038, -0.038205,
+             0.029342, 0.955115, 0.015544,
+             -0.002880, -0.001563, 1.004443),
+	// Severity - 2
+	float3x3(0.734766, 0.334872, -0.069637,
+             0.051840, 0.919198, 0.028963,
+             -0.004928, -0.004209, 1.009137),
+	// Severity - 3
+	float3x3(0.630323, 0.465641, -0.095964,
+             0.069181, 0.890046, 0.040773,
+             -0.006308, -0.007724, 1.014032),
+	// Severity - 4
+	float3x3(0.539009, 0.579343, -0.118352,
+             0.082546, 0.866121, 0.051332,
+             -0.007136, -0.011959, 1.019095),
+	// Severity - 5
+	float3x3(0.458064, 0.679578, -0.137642,
+             0.092785, 0.846313, 0.060902,
+             -0.007494, -0.016807, 1.024301),
+	// Severity - 6
+	float3x3(0.385450, 0.769005, -0.154455,
+             0.100526, 0.829802, 0.069673,
+             -0.007442, -0.022190, 1.029632),
+	// Severity - 7
+	float3x3(0.319627, 0.849633, -0.169261,
+             0.106241, 0.815969, 0.077790,
+             -0.007025, -0.028051, 1.035076),
+	// Severity - 8
+	float3x3(0.259411, 0.923008, -0.182420,
+             0.110296, 0.804340, 0.085364,
+             -0.006276, -0.034346, 1.040622),
+	// Severity - 9
+	float3x3(0.203876, 0.990338, -0.194214,
+             0.112975, 0.794542, 0.092483,
+             -0.005222, -0.041043, 1.046265),
+	// Severity - 10
+	float3x3(0.152286, 1.052583, -0.204868,
+             0.114503, 0.786281, 0.099216,
+             -0.003882, -0.048116, 1.051998)
+};
+
+static const float3x3 RGB_2_Deuteranomaly[11] = 
+{
+  // Severity - 0
+  float3x3(1.0, 0.0, 0.0,
+       0.0, 1.0, 0.0,
+       0.0, 0.0, 1.0),
+    // Severity - 1
+    float3x3(0.866435, 0.177704, -0.044139,
+           0.049567, 0.939063, 0.011370,
+          -0.003453, 0.007233, 0.996220),
+    // Severity - 2
+  float3x3(0.760729, 0.319078, -0.079807,
+             0.090568, 0.889315, 0.020117,
+             -0.006027, 0.013325, 0.992702),
+  // Severity - 3
+  float3x3(0.675425, 0.433850, -0.109275,
+             0.125303, 0.847755, 0.026942,
+             -0.007950, 0.018572, 0.989378),
+  // Severity - 4
+  float3x3(0.605511, 0.528560, -0.134071,
+             0.155318, 0.812366, 0.032316,
+             -0.009376, 0.023176, 0.986200),
+  // Severity - 5
+  float3x3(0.547494, 0.607765, -0.155259,
+             0.181692, 0.781742, 0.036566,
+             -0.010410, 0.027275, 0.983136),
+  // Severity - 6
+  float3x3(0.498864, 0.674741, -0.173604,
+             0.205199, 0.754872, 0.039929,
+             -0.011131, 0.030969, 0.980162),
+  // Severity - 7
+  float3x3(0.457771, 0.731899, -0.189670,
+             0.226409, 0.731012, 0.042579,
+             -0.011595, 0.034333, 0.977261),
+  // Severity - 8
+  float3x3(0.422823, 0.781057, -0.203881,
+             0.245752, 0.709602, 0.044646,
+             -0.011843, 0.037423, 0.974421),
+    // Severity - 9
+  float3x3(0.392952, 0.823610, -0.216562,
+             0.263559, 0.690210, 0.046232,
+             -0.011910, 0.040281, 0.971630),
+   // Severity - 10
+  float3x3(0.367322, 0.860646, -0.227968,
+             0.280085, 0.672501, 0.047413,
+             -0.011820, 0.042940, 0.968881)
+};
+
+static const float3x3 RGB_2_Tritanomaly[11] = 
+{
+  // Severity - 0
+  float3x3(1.0, 0.0, 0.0,
+       0.0, 1.0, 0.0,
+       0.0, 0.0, 1.0),
+  // Severity - 1
+  float3x3(0.926670, 0.092514, -0.019184,
+             0.021191, 0.964503, 0.014306,
+             0.008437, 0.054813, 0.936750),
+  // Severity - 2
+  float3x3(0.895720, 0.133330, -0.029050,
+             0.029997, 0.945400, 0.024603,
+             0.013027, 0.104707, 0.882266),
+  // Severity - 3
+  float3x3(0.905871, 0.127791, -0.033662,
+             0.026856, 0.941251, 0.031893,
+             0.013410, 0.148296, 0.838294),
+  // Severity - 4
+  float3x3(0.948035, 0.089490, -0.037526,
+             0.014364, 0.946792, 0.038844,
+             0.010853, 0.193991, 0.795156),
+  // Severity - 5
+  float3x3(1.017277, 0.027029, -0.044306,
+             -0.006113, 0.958479, 0.047634,
+             0.006379, 0.248708, 0.744913),
+  // Severity - 6
+  float3x3(1.104996, -0.046633, -0.058363,
+             -0.032137, 0.971635, 0.060503,
+             0.001336, 0.317922, 0.680742),
+  // Severity - 7
+  float3x3(1.193214, -0.109812, -0.083402,
+             -0.058496, 0.979410, 0.079086,
+             -0.002346, 0.403492, 0.598854),
+  // Severity - 8
+  float3x3(1.257728, -0.139648, -0.118081,
+             -0.078003, 0.975409, 0.102594,
+             -0.003316, 0.501214, 0.502102),
+  // Severity - 9
+  float3x3(1.278864, -0.125333, -0.153531,
+             -0.084748, 0.957674, 0.127074,
+             -0.000989, 0.601151, 0.399838),
+  // Severity - 10
+  float3x3(1.255528, -0.076749, -0.178779,
+             -0.078411, 0.930809, 0.147602,
+             0.004733, 0.691367, 0.303900)
+};
+
+
+
+
+float3 ConvertSourceRGBToDeficientRGB(float3 SourceRGB)
+{
+	float3 DeficientRGB = SourceRGB;
+	if (ColorVisionDeficiencyType == CDV_Deuteranope)
+	{
+		DeficientRGB = mul( RGB_2_Deuteranomaly[(int)ColorVisionDeficiencySeverity], SourceRGB );
+	}
+	else if (ColorVisionDeficiencyType == CDV_Protanope)
+	{
+		DeficientRGB = mul( RGB_2_Protanomaly[(int)ColorVisionDeficiencySeverity], SourceRGB );
+	}
+	else if (ColorVisionDeficiencyType == CDV_Tritanope)
+	{
+		DeficientRGB = mul( RGB_2_Tritanomaly[(int)ColorVisionDeficiencySeverity], SourceRGB );
+	}
+
+	return DeficientRGB;
+}
+
+
+
+
+// http://www.daltonize.org
+static const float3x3 RGB_DALTONIZE_MAT =
+{
+	0.0, 0.7, 0.7,
+	0.0, 1.0, 0.0,
+	0.0, 0.0, 1.0,
+};
+
+static const float3x3 RGB_DALTONIZE_RED_BLIND =
+{
+	0.5, 1.0, 1.0,
+	0.5, 0.5, 0.5,
+	0.5, 0.5, 0.5,
+};
+
+static const float3x3 RGB_DALTONIZE_GREEN_BLIND =
+{
+	0.5, 0.0, 0.5,
+	1.0, 0.0, 1.0,
+	0.5, 0.0, 0.5,
+};
+
+static const float3x3 RGB_DALTONIZE_BLUE_BLIND =
+{
+	0.5, 0.5, 0.5,
+	0.5, 0.5, 0.5,
+	1.0, 1.0, 0.5,
+};
+
+
+#define USE_RGB_SPACE_CDV_CORRECTION 1
+#define USE_SINGLE_DALTONIZE_MATRIX 0
+
+
+float4 ColorDeficiencyMain(FScreenVertexOutput Input) : SV_Target0
+{
+	float4 SourceColor = Texture2DSample(ElementTexture, ElementTextureSampler, Input.UV);
+	float3 SourceRGB = SourceColor.rgb;
+
+	// Have to convert to linear color space first - so they say, but it doesn't appear to matter much.
+	//SourceRGB = sRGBToLinear(SourceRGB);
+
+	float3 DeficientRGB = ConvertSourceRGBToDeficientRGB(SourceRGB);
+
+	float3 OutRGB = DeficientRGB;
+
+	if (bCorrectDeficiency == 1)
+	{
+		#if USE_RGB_SPACE_CDV_CORRECTION
+			// 
+			float3 ErrorRGB = (SourceRGB - DeficientRGB);
+
+			#if USE_SINGLE_DALTONIZE_MATRIX
+				// 
+				float3 CorrectionRGB = mul( RGB_DALTONIZE_MAT, ErrorRGB );
+			#else
+				float3 CorrectionRGB = float3(0.0, 0.0, 0.0);
+				if (ColorVisionDeficiencyType == CDV_Deuteranope)
+				{
+					CorrectionRGB = mul( RGB_DALTONIZE_GREEN_BLIND, ErrorRGB );
+				}
+				else if (ColorVisionDeficiencyType == CDV_Protanope)
+				{
+					CorrectionRGB = mul( RGB_DALTONIZE_RED_BLIND, ErrorRGB );
+				}
+				else if (ColorVisionDeficiencyType == CDV_Tritanope)
+				{
+					CorrectionRGB = mul( RGB_DALTONIZE_BLUE_BLIND, ErrorRGB );
+				}
+			#endif
+
+			// 
+			OutRGB = SourceRGB + CorrectionRGB;
+		#endif
+
+		if (bSimulateCorrectionWithDeficiency == 1)
+		{
+			OutRGB = ConvertSourceRGBToDeficientRGB(OutRGB);
+		}
+	}
+
+	//OutRGB = LinearToSrgb(OutRGB);
+
+	return float4(OutRGB, SourceColor.a);
+}
diff --git a/Engine/Shaders/Private/SlateShaderCommon.ush b/Engine/Shaders/Private/SlateShaderCommon.ush
index e80f898efe7e..63b75af63b34 100644
--- a/Engine/Shaders/Private/SlateShaderCommon.ush
+++ b/Engine/Shaders/Private/SlateShaderCommon.ush
@@ -30,16 +30,6 @@
 #define ST_LineSegment	3
 #define ST_Custom		4
 
-/** Color Vision Deficiency Types (mirrored in EditorUserSettings.h) */
-#define CVD_NormalVision	0
-#define CVD_Deuteranomly	1
-#define CVD_Deuteranopia	2
-#define CVD_Protanomly		3
-#define CVD_Protanopia		4
-#define CVD_Tritanomaly		5
-#define CVD_Tritanopia		6
-#define CVD_Achromatopsia	7
-
 struct VertexToPixelInterpolants
 {
 	float4 Position : SV_POSITION;
@@ -55,48 +45,6 @@ float2 GetUV(VertexToPixelInterpolants Interpolants, uint UVIndex)
 	return Mod(UVIndex, 2) ? UVVector.zw : UVVector.xy;
 }
 
-half4 ApplyColorVisionDeficiencyFilter(half4 Color)
-{
-	half4 OutColor = Color;
-#if COLOR_VISION_DEFICIENCY_TYPE == CVD_Deuteranomly
-	OutColor.rgb = half3(
-		OutColor.r * 0.80000 + OutColor.g * 0.20000 + OutColor.b * 0.0,
-		OutColor.r * 0.25833 + OutColor.g * 0.74167 + OutColor.b * 0.0,
-		OutColor.r * 0.0     + OutColor.g * 0.14167 + OutColor.b * 0.85833);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Deuteranopia
-	OutColor.rgb = half3(
-		OutColor.r * 0.625 + OutColor.g * 0.375 + OutColor.b * 0.0,
-		OutColor.r * 0.700 + OutColor.g * 0.300 + OutColor.b * 0.0,
-		OutColor.r * 0.0   + OutColor.g * 0.300 + OutColor.b * 0.700);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Protanomly
-	OutColor.rgb = half3(
-		OutColor.r * 0.81667 + OutColor.g * 0.18333 + OutColor.b * 0.0,
-		OutColor.r * 0.33333 + OutColor.g * 0.66667 + OutColor.b * 0.0,
-		OutColor.r * 0.0     + OutColor.g * 0.12500 + OutColor.b * 0.87500);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Protanopia
-	OutColor.rgb = half3(
-		OutColor.r * 0.56667 + OutColor.g * 0.43333 + OutColor.b * 0.0,
-		OutColor.r * 0.55833 + OutColor.g * 0.44167 + OutColor.b * 0.0,
-		OutColor.r * 0.0     + OutColor.g * 0.24167 + OutColor.b * 0.75833);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Tritanomaly
-	OutColor.rgb = half3(
-		OutColor.r * 0.96667 + OutColor.g * 0.03333 + OutColor.b * 0.0,
-		OutColor.r * 0.0     + OutColor.g * 0.73333 + OutColor.b * 0.26667,
-		OutColor.r * 0.0     + OutColor.g * 0.18333 + OutColor.b * 0.81667);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Tritanopia
-	OutColor.rgb = half3(
-		OutColor.r * 0.950 + OutColor.g * 0.050 + OutColor.b * 0.0,
-		OutColor.r * 0.0   + OutColor.g * 0.433 + OutColor.b * 0.567,
-		OutColor.r * 0.0   + OutColor.g * 0.475 + OutColor.b * 0.525);
-#elif COLOR_VISION_DEFICIENCY_TYPE == CVD_Achromatopsia
-	OutColor.rgb = half3(
-		OutColor.r * 0.299 + OutColor.g * 0.587 + OutColor.b * 0.114,
-		OutColor.r * 0.299 + OutColor.g * 0.587 + OutColor.b * 0.114,
-		OutColor.r * 0.299 + OutColor.g * 0.587 + OutColor.b * 0.114);
-#endif
-	return OutColor;
-}
-
 float cross(float2 a, float2 b)
 {
 	return a.x*b.y - a.y*b.x;
diff --git a/Engine/Shaders/Private/TiledDeferredLightShaders.usf b/Engine/Shaders/Private/TiledDeferredLightShaders.usf
index 27647203da59..39fc711c3066 100644
--- a/Engine/Shaders/Private/TiledDeferredLightShaders.usf
+++ b/Engine/Shaders/Private/TiledDeferredLightShaders.usf
@@ -170,8 +170,7 @@ void TiledDeferredLightingMain(
 	// With a perspective projection, the clip space position is NDC * Clip.w
 	// With an orthographic projection, clip space is the same as NDC
 	float2 ClipPosition = ScreenPosition * (View.ViewToClip[3][3] < 1.0f ? SceneDepth : 1.0f);
-	float4 HomogeneousWorldPosition = mul(float4(ClipPosition, SceneDepth, 1), View.ScreenToWorld);
-	float3 WorldPosition = HomogeneousWorldPosition.xyz / HomogeneousWorldPosition.w;
+	float3 WorldPosition = mul(float4(ClipPosition, SceneDepth, 1), View.ScreenToWorld).xyz;
 
 	// RGB accumulated RGB HDR color, A: luminance for screenspace subsurface scattering
 	float4 CompositedLighting = 0;
diff --git a/Engine/Shaders/Public/MetalCommon.ush b/Engine/Shaders/Public/MetalCommon.ush
index 724a0a396917..be7b44781529 100644
--- a/Engine/Shaders/Public/MetalCommon.ush
+++ b/Engine/Shaders/Public/MetalCommon.ush
@@ -5,7 +5,8 @@
 =============================================================================*/
 
 // Update this GUID to improve shader recompilation for Metal only shaders
-// GUID = {2EC46B93-2FB6-4BEA-B3AD-09A0B1F054A5}
+// GUID = {812E84A9-7D28-4609-8037-FAA0B58275E0
+
   
 #pragma once
 
diff --git a/Engine/Shaders/Public/ShaderVersion.ush b/Engine/Shaders/Public/ShaderVersion.ush
index c69f32dddf95..dfba2eec5bfa 100644
--- a/Engine/Shaders/Public/ShaderVersion.ush
+++ b/Engine/Shaders/Public/ShaderVersion.ush
@@ -2,4 +2,4 @@
 // Each time the console command is executed it generates a new GUID. As this file is included
 // in Platform.ush (which should be included in any shader) it allows to invalidate the shader DDC.
 // 
-// GUID = 655DA074BADC40A1B8EFDEF3C906D9F0
+// GUID = 20965343E6BD444B9A1D010A80DFF469
\ No newline at end of file
diff --git a/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.cpp b/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.cpp
index 115cc520d96e..c7b864329bd0 100644
--- a/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.cpp
+++ b/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.cpp
@@ -310,6 +310,11 @@ void FAndroidTargetSettingsCustomization::BuildAppManifestSection(IDetailLayoutB
 	TSharedRef<IPropertyHandle> EnableGradleProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UAndroidRuntimeSettings, bEnableGradle));
 	FSimpleDelegate EnableGradleChange = FSimpleDelegate::CreateSP(this, &FAndroidTargetSettingsCustomization::OnEnableGradleChange);
 	EnableGradleProperty->SetOnPropertyValueChanged(EnableGradleChange);
+
+	// check for GoogleVR change
+	TSharedRef<IPropertyHandle> GoogleVRCapsProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UAndroidRuntimeSettings, GoogleVRCaps));
+	FSimpleDelegate GoogleVRCapsChange = FSimpleDelegate::CreateSP(this, &FAndroidTargetSettingsCustomization::OnGoogleVRCapsChange);
+	GoogleVRCapsProperty->SetOnPropertyValueChanged(GoogleVRCapsChange);
 }
 
 bool FAndroidTargetSettingsCustomization::IsLicenseInvalid() const
@@ -374,6 +379,22 @@ FReply FAndroidTargetSettingsCustomization::OnAcceptSDKLicenseClicked()
 	return FReply::Handled();
 }
 
+void FAndroidTargetSettingsCustomization::OnGoogleVRCapsChange()
+{
+/*	Doing this isn't really useful since has no effect if plugin isn't also enabled
+	Better to just have a warning in the log during packaging (and it isn't as expensive now)
+
+	const TArray<TEnumAsByte<EGoogleVRCaps::Type>> &GoogleCaps = GetDefault<UAndroidRuntimeSettings>()->GoogleVRCaps;
+
+	bool bIsDaydream = GoogleCaps.Contains(EGoogleVRCaps::Daydream33) || GoogleCaps.Contains(EGoogleVRCaps::Daydream63);
+	if (bIsDaydream && GetDefault<UAndroidRuntimeSettings>()->bAllowIMU)
+	{
+		// turn off IMU for Daydream (but user can turn it back on
+		GetMutableDefault<UAndroidRuntimeSettings>()->bAllowIMU = false;
+	}
+*/
+}
+
 void FAndroidTargetSettingsCustomization::OnEnableGradleChange()
 {
 	// only need to do this if enabling
diff --git a/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.h b/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.h
index 805023853d9f..246edecf04b6 100644
--- a/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.h
+++ b/Engine/Source/Developer/Android/AndroidPlatformEditor/Private/AndroidTargetSettingsCustomization.h
@@ -45,6 +45,9 @@ private:
 	// Called when the app id is modified
 	void OnAppIDModified();
 
+	// Called when GoogleVRCaps is modified
+	void OnGoogleVRCapsChange();
+
 	// Called when EnableGradle is modified
 	void OnEnableGradleChange();
 
diff --git a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalDerivedData.cpp b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalDerivedData.cpp
index 33b4de8f81ac..d889d63dc003 100644
--- a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalDerivedData.cpp
+++ b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalDerivedData.cpp
@@ -372,7 +372,7 @@ bool FMetalShaderOutputCooker::Build(TArray<uint8>& OutData)
 	FString const* FastIntrinsics = Input.Environment.GetDefinitions().Find(TEXT("METAL_USE_FAST_INTRINSICS"));
 	if (FastIntrinsics)
 	{
-		LexicalConversion::FromString(bAllowFastIntriniscs, *(*FastIntrinsics));
+		LexFromString(bAllowFastIntriniscs, *(*FastIntrinsics));
 	}
 
 	bool bForceInvariance = false;
diff --git a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderCompiler.cpp b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderCompiler.cpp
index c29fd915a14d..6ad6ab632f75 100644
--- a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderCompiler.cpp
+++ b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderCompiler.cpp
@@ -624,7 +624,7 @@ bool ModificationTimeRemoteFile(FString const& RemotePath, uint64& Time)
 	bool bOK = ExecRemoteProcess(TEXT("/usr/bin/stat"), *Args, &ReturnCode, &Output, nullptr);
 	if (bOK)
 	{
-		Lex::FromString(Time, *Output);
+		LexFromString(Time, *Output);
 	}
 	return bOK;
 }
@@ -978,7 +978,7 @@ void BuildMetalShaderOutput(
 	const ANSICHAR* SideTableString = FCStringAnsi::Strstr(USFSource, "@SideTable: ");
 	
 	EShaderFrequency Frequency = (EShaderFrequency)ShaderOutput.Target.Frequency;
-	const bool bIsMobile = (ShaderInput.Target.Platform == SP_METAL || ShaderInput.Target.Platform == SP_METAL_MRT);
+	const bool bIsMobile = (ShaderInput.Target.Platform == SP_METAL_MRT);
 	bool bNoFastMath = ShaderInput.Environment.CompilerFlags.Contains(CFLAG_NoFastMath);
 	FString const* UsingWPO = ShaderInput.Environment.GetDefinitions().Find(TEXT("USES_WORLD_POSITION_OFFSET"));
 	if (UsingWPO && FString("1") == *UsingWPO && bIsMobile && Frequency == SF_Vertex)
@@ -1368,6 +1368,11 @@ void BuildMetalShaderOutput(
 		// store data we can pickup later with ShaderCode.FindOptionalData('n'), could be removed for shipping
 		ShaderOutput.ShaderCode.AddOptionalData('n', TCHAR_TO_UTF8(*ShaderInput.GenerateShaderName()));
 
+		if (ShaderInput.ExtraSettings.bExtractShaderSource)
+		{
+			ShaderOutput.OptionalFinalShaderSource = MetalCode;
+		}
+
 		ShaderOutput.NumInstructions = NumLines;
 		ShaderOutput.NumTextureSamplers = Header.Bindings.NumSamplers;
 		ShaderOutput.bSucceeded = true;
@@ -1780,6 +1785,11 @@ void BuildMetalShaderOutput(
 			
 			ShaderOutput.NumTextureSamplers = Header.Bindings.NumSamplers;
 		}
+
+		if (ShaderInput.ExtraSettings.bExtractShaderSource)
+		{
+			ShaderOutput.OptionalFinalShaderSource = MetalCode;
+		}
 		
 		ShaderOutput.NumInstructions = NumLines;
 		ShaderOutput.bSucceeded = bSucceeded;
@@ -1906,7 +1916,7 @@ void CompileShader_Metal(const FShaderCompilerInput& _Input,FShaderCompilerOutpu
     {
         if(MaxVersion->IsNumeric())
         {
-            LexicalConversion::FromString(VersionEnum, *(*MaxVersion));
+            LexFromString(VersionEnum, *(*MaxVersion));
         }
     }
     
diff --git a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderFormat.cpp b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderFormat.cpp
index 2df94dda97fb..00e54d756c60 100644
--- a/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderFormat.cpp
+++ b/Engine/Source/Developer/Apple/MetalShaderFormat/Private/MetalShaderFormat.cpp
@@ -32,10 +32,12 @@ static FString METAL_MAP_EXTENSION(TEXT(".metalmap"));
 class FMetalShaderFormatArchive : public IShaderFormatArchive
 {
 public:
-	FMetalShaderFormatArchive(FName InFormat, FString const& WorkingDirectory)
-	: Format(InFormat)
+	FMetalShaderFormatArchive(FString const& InLibraryName, FName InFormat, FString const& WorkingDirectory)
+	: LibraryName(InLibraryName)
+	, Format(InFormat)
 	, WorkingDir(WorkingDirectory)
 	{
+		check(LibraryName.Len() > 0);
 		check(Format == NAME_SF_METAL || Format == NAME_SF_METAL_MRT || Format == NAME_SF_METAL_SM5_NOTESS || Format == NAME_SF_METAL_SM5 || Format == NAME_SF_METAL_MACES3_1 || Format == NAME_SF_METAL_MACES2 || Format == NAME_SF_METAL_MRT_MAC);
 		ArchivePath = (WorkingDir / Format.GetPlainNameString());
 		IFileManager::Get().DeleteDirectory(*ArchivePath, false, true);
@@ -65,11 +67,12 @@ public:
 	virtual bool Finalize( FString OutputDir, FString DebugOutputDir, TArray<FString>* OutputFiles )
 	{
 		bool bOK = false;
-		FString LibraryPath = (OutputDir / Format.GetPlainNameString()) + METAL_LIB_EXTENSION;
+		FString LibraryPlatformName = FString::Printf(TEXT("%s_%s"), *LibraryName, *Format.GetPlainNameString());
+		FString LibraryPath = (OutputDir / LibraryPlatformName) + METAL_LIB_EXTENSION;
 		
 		if (FinalizeLibrary_Metal(Format, ArchivePath, LibraryPath, Shaders, DebugOutputDir))
 		{
-			FString BinaryShaderFile = (OutputDir / Format.GetPlainNameString()) + METAL_MAP_EXTENSION;
+			FString BinaryShaderFile = (OutputDir / LibraryPlatformName) + METAL_MAP_EXTENSION;
 			FArchive* BinaryShaderAr = IFileManager::Get().CreateFileWriter(*BinaryShaderFile);
 			if( BinaryShaderAr != NULL )
 			{
@@ -94,6 +97,7 @@ public:
 	virtual ~FMetalShaderFormatArchive() { }
 	
 private:
+	FString LibraryName;
 	FName Format;
 	FString WorkingDir;
 	FString ArchivePath;
@@ -148,9 +152,9 @@ public:
 	{ 
 		return CanCompileBinaryShaders();
 	}
-    virtual class IShaderFormatArchive* CreateShaderArchive( FName Format, const FString& WorkingDirectory ) const override final
+    virtual class IShaderFormatArchive* CreateShaderArchive( FString const& LibraryName, FName Format, const FString& WorkingDirectory ) const override final
     {
-		return new FMetalShaderFormatArchive(Format, WorkingDirectory);
+		return new FMetalShaderFormatArchive(LibraryName, Format, WorkingDirectory);
     }
 	virtual bool CanCompileBinaryShaders() const override final
 	{
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetRenameManager.cpp b/Engine/Source/Developer/AssetTools/Private/AssetRenameManager.cpp
index baa3a57d0ef1..27d5c1b0596e 100644
--- a/Engine/Source/Developer/AssetTools/Private/AssetRenameManager.cpp
+++ b/Engine/Source/Developer/AssetTools/Private/AssetRenameManager.cpp
@@ -859,7 +859,7 @@ struct FSoftObjectPathRenameSerializer : public FArchiveUObject
 		, bFoundReference(false)
 	{
 		// Mark it as saving to correctly process all references
-		ArIsSaving = true;
+		this->SetIsSaving(true);
 	}
 
 	FArchive& operator<<(FSoftObjectPath& Value)
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp b/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp
index c76a75b4e1fc..6f0f2f3ad4a3 100644
--- a/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp
+++ b/Engine/Source/Developer/AssetTools/Private/AssetTools.cpp
@@ -51,6 +51,7 @@
 #include "AssetTypeActions/AssetTypeActions_CurveTable.h"
 #include "AssetTypeActions/AssetTypeActions_CurveVector.h"
 #include "AssetTypeActions/AssetTypeActions_CurveLinearColor.h"
+#include "AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.h"
 #include "AssetTypeActions/AssetTypeActions_DataAsset.h"
 #include "AssetTypeActions/AssetTypeActions_DataTable.h"
 #include "AssetTypeActions/AssetTypeActions_Enum.h"
@@ -59,6 +60,7 @@
 #include "AssetTypeActions/AssetTypeActions_Font.h"
 #include "AssetTypeActions/AssetTypeActions_FontFace.h"
 #include "AssetTypeActions/AssetTypeActions_ForceFeedbackEffect.h"
+#include "AssetTypeActions/AssetTypeActions_HLODProxy.h"
 #include "AssetTypeActions/AssetTypeActions_SubsurfaceProfile.h"
 #include "AssetTypeActions/AssetTypeActions_InstancedFoliageSettings.h"
 #include "AssetTypeActions/AssetTypeActions_InterpData.h"
@@ -167,6 +169,7 @@ UAssetToolsImpl::UAssetToolsImpl(const FObjectInitializer& ObjectInitializer)
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_CurveTable));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_CurveVector));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_CurveLinearColor));
+	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_CurveLinearColorAtlas));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_DataAsset));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_DataTable));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_Enum));
@@ -176,6 +179,7 @@ UAssetToolsImpl::UAssetToolsImpl(const FObjectInitializer& ObjectInitializer)
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_Font));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_FontFace));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_ForceFeedbackEffect));
+	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_HLODProxy));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_SubsurfaceProfile));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_InstancedFoliageSettings));
 	RegisterAssetTypeActions(MakeShareable(new FAssetTypeActions_InterpData));
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.cpp b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.cpp
new file mode 100644
index 000000000000..4b13390fa2d8
--- /dev/null
+++ b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.cpp
@@ -0,0 +1,20 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Engine/Texture2D.h"
+#include "EditorStyleSet.h"
+#include "Engine/TextureCube.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Engine/TextureRenderTargetCube.h"
+#include "AssetRegistryModule.h"
+
+#define LOCTEXT_NAMESPACE "AssetTypeActions"
+
+void FAssetTypeActions_CurveLinearColorAtlas::GetActions( const TArray<UObject*>& InObjects, FMenuBuilder& MenuBuilder )
+{
+	FAssetTypeActions_Texture::GetActions(InObjects, MenuBuilder);
+}
+
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.h b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.h
new file mode 100644
index 000000000000..5285721638f8
--- /dev/null
+++ b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CurveLinearColorAtlas.h
@@ -0,0 +1,22 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "AssetTypeActions/AssetTypeActions_Texture.h"
+#include "Curves/CurveLinearColorAtlas.h"
+
+class FMenuBuilder;
+
+class FAssetTypeActions_CurveLinearColorAtlas : public FAssetTypeActions_Texture
+{
+public:
+	// IAssetTypeActions Implementation
+	virtual FText GetName() const override { return NSLOCTEXT("AssetTypeActions", "AssetTypeActions_CurveLinearColorAtlas", "Curve Atlas"); }
+	virtual FColor GetTypeColor() const override { return FColor(128,64,64); }
+	virtual UClass* GetSupportedClass() const override { return UCurveLinearColorAtlas::StaticClass(); }
+	virtual bool HasActions ( const TArray<UObject*>& InObjects ) const override { return true; }
+	virtual void GetActions( const TArray<UObject*>& InObjects, FMenuBuilder& MenuBuilder ) override;
+	virtual bool IsImportedAsset() const override { return false; }
+
+};
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.cpp b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.cpp
new file mode 100644
index 000000000000..a06422fa0a43
--- /dev/null
+++ b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.cpp
@@ -0,0 +1,7 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "AssetTypeActions/AssetTypeActions_HLODProxy.h"
+
+#define LOCTEXT_NAMESPACE "AssetTypeActions"
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.h b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.h
new file mode 100644
index 000000000000..899c333ed2ec
--- /dev/null
+++ b/Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_HLODProxy.h
@@ -0,0 +1,19 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Toolkits/IToolkitHost.h"
+#include "AssetTypeActions_Base.h"
+#include "Engine/HLODProxy.h"
+
+class FAssetTypeActions_HLODProxy : public FAssetTypeActions_Base
+{
+public:
+	// IAssetTypeActions Implementation
+	virtual FText GetName() const override { return NSLOCTEXT("AssetTypeActions", "AssetTypeActions_HLODProxy", "HLOD Proxy"); }
+	virtual FColor GetTypeColor() const override { return FColor(0, 200, 200); }
+	virtual UClass* GetSupportedClass() const override { return UHLODProxy::StaticClass(); }
+	virtual uint32 GetCategories() override { return EAssetTypeCategories::Misc; }
+	virtual bool CanLocalize() const override { return false; }
+};
diff --git a/Engine/Source/Developer/AutomationController/Private/AutomationCommandline.cpp b/Engine/Source/Developer/AutomationController/Private/AutomationCommandline.cpp
index c7532ef71087..a54047c53407 100644
--- a/Engine/Source/Developer/AutomationController/Private/AutomationCommandline.cpp
+++ b/Engine/Source/Developer/AutomationController/Private/AutomationCommandline.cpp
@@ -316,6 +316,8 @@ public:
 
 	bool Tick(float DeltaTime)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FAutomationExecCmd_Tick);
+
 		// Update the automation controller to keep it running
 		AutomationController->Tick();
 
diff --git a/Engine/Source/Developer/AutomationController/Private/AutomationControllerManager.h b/Engine/Source/Developer/AutomationController/Private/AutomationControllerManager.h
index 0595eb457d50..77d4e716dd0c 100644
--- a/Engine/Source/Developer/AutomationController/Private/AutomationControllerManager.h
+++ b/Engine/Source/Developer/AutomationController/Private/AutomationControllerManager.h
@@ -34,36 +34,44 @@ public:
 	UPROPERTY()
 	EAutomationState State;
 
-	UPROPERTY()
-	TArray<FAutomationArtifact> Artifacts;
-
 	FAutomatedTestResult()
 	{
+		Warnings = 0;
+		Errors = 0;
 		State = EAutomationState::NotRun;
 	}
 
-	void SetEvents(const TArray<FAutomationEvent>& InEvents, int32 InWarnings, int32 InErrors)
+	void SetEvents(const TArray<FAutomationExecutionEntry>& InEntries, int32 InWarnings, int32 InErrors)
 	{
-		Events = InEvents;
+		Entries = InEntries;
 		Warnings = InWarnings;
 		Errors = InErrors;
 	}
 
+	void SetArtifacts(const TArray<FAutomationArtifact>& InArtifacts)
+	{
+		Artifacts = InArtifacts;
+	}
+
 	int32 GetWarningTotal() const { return Warnings; }
 	int32 GetErrorTotal() const { return Errors; }
 
-	const TArray<FAutomationEvent>& GetEvents() const { return Events; }
+	const TArray<FAutomationExecutionEntry>& GetEntries() const { return Entries; }
+	TArray<FAutomationArtifact>& GetArtifacts() { return Artifacts; }
 
 private:
 
 	UPROPERTY()
-	TArray<FAutomationEvent> Events;
+	TArray<FAutomationExecutionEntry> Entries;
 
 	UPROPERTY()
 	int32 Warnings;
 
 	UPROPERTY()
 	int32 Errors;
+
+	UPROPERTY()
+	TArray<FAutomationArtifact> Artifacts;
 };
 
 USTRUCT()
@@ -517,6 +525,7 @@ private:
 
 	/** The report folder override path that may have been provided over the commandline, -ReportOutputPath="" */
 	FString ReportOutputPath;
+	FString DisplayReportOutputPath;
 
 	FString DeveloperReportUrl;
 
diff --git a/Engine/Source/Developer/AutomationController/Private/AutomationControllerManger.cpp b/Engine/Source/Developer/AutomationController/Private/AutomationControllerManger.cpp
index 1a838d14381c..187597573afd 100644
--- a/Engine/Source/Developer/AutomationController/Private/AutomationControllerManger.cpp
+++ b/Engine/Source/Developer/AutomationController/Private/AutomationControllerManger.cpp
@@ -41,6 +41,8 @@ FAutomationControllerManager::FAutomationControllerManager()
 		}
 	}
 
+	FParse::Value(FCommandLine::Get(), TEXT("DisplayReportOutputPath="), DisplayReportOutputPath, false);
+
 	if ( FParse::Value(FCommandLine::Get(), TEXT("DeveloperReportUrl="), DeveloperReportUrl, false) )
 	{
 		DeveloperReportUrl = DeveloperReportUrl / TEXT("dev") / FString(FPlatformProcess::UserName()).ToLower() / TEXT("index.html");
@@ -201,10 +203,18 @@ void FAutomationControllerManager::ProcessComparisonQueue()
 
 			FImageComparisonResult Result = Entry->PendingComparison.Get();
 
+			const FGuid UniqueId = FGuid::NewGuid();
+
 			// Send the message back to the automation worker letting it know the results of the comparison test.
 			{
 				FAutomationWorkerImageComparisonResults* Message = new FAutomationWorkerImageComparisonResults(
-					Result.IsNew(), Result.AreSimilar(), Result.MaxLocalDifference, Result.GlobalDifference, Result.ErrorMessage.ToString());
+					UniqueId,
+					Result.IsNew(),
+					Result.AreSimilar(),
+					Result.MaxLocalDifference,
+					Result.GlobalDifference,
+					Result.ErrorMessage.ToString()
+				);
 
 				MessageEndpoint->Send(Message, Entry->Sender);
 			}
@@ -219,16 +229,16 @@ void FAutomationControllerManager::ProcessComparisonQueue()
 			if (Report.IsValid())
 			{
 				// Record the artifacts for the test.
-				FString ApprovedFolder = ScreenshotManager->GetLocalApprovedFolder();
-				FString UnapprovedFolder = ScreenshotManager->GetLocalUnapprovedFolder();
-				FString ComparisonFolder = ScreenshotManager->GetLocalComparisonFolder();
+				const FString ApprovedFolder = ScreenshotManager->GetLocalApprovedFolder();
+				const FString UnapprovedFolder = ScreenshotManager->GetLocalUnapprovedFolder();
+				const FString ComparisonFolder = ScreenshotManager->GetLocalComparisonFolder();
 
 				TMap<FString, FString> LocalFiles;
 				LocalFiles.Add(TEXT("approved"), ApprovedFolder / Result.ApprovedFile);
 				LocalFiles.Add(TEXT("unapproved"), UnapprovedFolder / Result.IncomingFile);
 				LocalFiles.Add(TEXT("difference"), ComparisonFolder / Result.ComparisonFile);
 
-				Report->AddArtifact(ClusterIndex, CurrentTestPass, FAutomationArtifact(Entry->Name, EAutomationArtifactType::Comparison, LocalFiles));
+				Report->AddArtifact(ClusterIndex, CurrentTestPass, FAutomationArtifact(UniqueId, Entry->Name, EAutomationArtifactType::Comparison, LocalFiles));
 			}
 			else
 			{
@@ -294,9 +304,9 @@ void FAutomationControllerManager::CollectTestResults(TSharedPtr<IAutomationRepo
 		FAutomatedTestResult& ReportResult = OurPassResults.Tests[i];
 		if ( ReportResult.FullTestPath == Report->GetFullTestPath() )
 		{
-			ReportResult.SetEvents(Results.GetEvents(), Results.GetWarningTotal(), Results.GetErrorTotal());
 			ReportResult.State = Results.State;
-			ReportResult.Artifacts = Results.Artifacts;
+			ReportResult.SetEvents(Results.GetEntries(), Results.GetWarningTotal(), Results.GetErrorTotal());
+			ReportResult.SetArtifacts(Results.Artifacts);
 
 			switch ( Results.State )
 			{
@@ -649,7 +659,14 @@ void FAutomationControllerManager::ProcessResults()
 		FAutomatedTestPassResults SerializedPassResults = OurPassResults;
 
 		SerializedPassResults.ComparisonExported = ExportResults.Success;
-		SerializedPassResults.ComparisonExportDirectory = ExportResults.ExportPath;
+		if (DisplayReportOutputPath.IsEmpty())
+		{
+			SerializedPassResults.ComparisonExportDirectory = ExportResults.ExportPath;
+		}
+		else
+		{
+			SerializedPassResults.ComparisonExportDirectory = DisplayReportOutputPath / FString::FromInt(FEngineVersion::Current().GetChangelist());
+		}
 
 		{
 			SerializedPassResults.Tests.StableSort([] (const FAutomatedTestResult& A, const FAutomatedTestResult& B) {
@@ -682,7 +699,7 @@ void FAutomationControllerManager::ProcessResults()
 
 			for ( FAutomatedTestResult& Test : SerializedPassResults.Tests )
 			{
-				for ( FAutomationArtifact& Artifact : Test.Artifacts )
+				for (FAutomationArtifact& Artifact : Test.GetArtifacts() )
 				{
 					for ( const auto& Entry : Artifact.LocalFiles )
 					{
@@ -1062,7 +1079,7 @@ void FAutomationControllerManager::HandleRunTestsReplyMessage(const FAutomationW
 		verify(DeviceClusterManager.FindDevice(Context->GetSender(), ClusterIndex, DeviceIndex));
 
 		TestResults.GameInstance = DeviceClusterManager.GetClusterDeviceName(ClusterIndex, DeviceIndex);
-		TestResults.SetEvents(Message.Events, Message.WarningTotal, Message.ErrorTotal);
+		TestResults.SetEvents(Message.Entries, Message.WarningTotal, Message.ErrorTotal);
 
 		// Verify this device thought it was busy
 		TSharedPtr<IAutomationReport> Report = DeviceClusterManager.GetTest(ClusterIndex, DeviceIndex);
@@ -1080,26 +1097,26 @@ void FAutomationControllerManager::HandleRunTestsReplyMessage(const FAutomationW
 		AutomationTestingLog.Open();
 #endif
 
-		for ( const FAutomationEvent& Event : TestResults.GetEvents() )
+		for ( const FAutomationExecutionEntry& Entry : TestResults.GetEntries() )
 		{
-			switch ( Event.Type )
+			switch (Entry.Event.Type)
 			{
 			case EAutomationEventType::Info:
-				GLog->Logf(ELogVerbosity::Log, TEXT("%s"), *Event.ToString());
+				GLog->Logf(ELogVerbosity::Log, TEXT("%s"), *Entry.ToString());
 #if WITH_EDITOR
-				AutomationTestingLog.Info(FText::FromString(Event.ToString()));
+				AutomationTestingLog.Info(FText::FromString(Entry.ToString()));
 #endif
 				break;
 			case EAutomationEventType::Warning:
-				GLog->Logf(ELogVerbosity::Warning, TEXT("%s"), *Event.ToString());
+				GLog->Logf(ELogVerbosity::Warning, TEXT("%s"), *Entry.ToString());
 #if WITH_EDITOR
-				AutomationTestingLog.Warning(FText::FromString(Event.ToString()));
+				AutomationTestingLog.Warning(FText::FromString(Entry.ToString()));
 #endif
 				break;
 			case EAutomationEventType::Error:
-				GLog->Logf(ELogVerbosity::Error, TEXT("%s"), *Event.ToString());
+				GLog->Logf(ELogVerbosity::Error, TEXT("%s"), *Entry.ToString());
 #if WITH_EDITOR
-				AutomationTestingLog.Error(FText::FromString(Event.ToString()));
+				AutomationTestingLog.Error(FText::FromString(Entry.ToString()));
 #endif
 				break;
 			}
@@ -1120,12 +1137,8 @@ void FAutomationControllerManager::HandleRunTestsReplyMessage(const FAutomationW
 #if WITH_EDITOR
 			AutomationTestingLog.Error(FText::FromString(*FailureString));
 #endif
-			//FAutomationTestFramework::Get().Lo
 		}
 
-		// const bool TestSucceeded = (TestResults.State == EAutomationState::Success);
-		//FAutomationTestFramework::Get().LogEndTestMessage(Report->GetDisplayName(), TestSucceeded);
-
 		// Device is now good to go
 		DeviceClusterManager.SetTest(ClusterIndex, DeviceIndex, NULL);
 	}
@@ -1229,6 +1242,6 @@ void FAutomationControllerManager::WriteLineToCheckpointFile(FString StringToWri
 
 void FAutomationControllerManager::ResetAutomationTestTimeout(const TCHAR* Reason)
 {
-	GLog->Logf(ELogVerbosity::Display, TEXT("Resetting automation test timeout: %s"), Reason);
+	//GLog->Logf(ELogVerbosity::Display, TEXT("Resetting automation test timeout: %s"), Reason);
 	LastTimeUpdateTicked = FPlatformTime::Seconds();
 }
diff --git a/Engine/Source/Developer/AutomationController/Private/AutomationReport.cpp b/Engine/Source/Developer/AutomationController/Private/AutomationReport.cpp
index 639731ad1fa0..24e593d82bb7 100644
--- a/Engine/Source/Developer/AutomationController/Private/AutomationReport.cpp
+++ b/Engine/Source/Developer/AutomationController/Private/AutomationReport.cpp
@@ -389,7 +389,7 @@ void FAutomationReport::SetResults( const int32 ClusterIndex, const int32 PassIn
 		TestInfo.InformOfNewDeviceRunningTest();
 	}
 
-	TArray<FAutomationArtifact> ExistingArtifacts = Results[ClusterIndex][PassIndex].Artifacts;
+	const TArray<FAutomationArtifact> ExistingArtifacts = Results[ClusterIndex][PassIndex].Artifacts;
 	Results[ClusterIndex][PassIndex] = InResults;
 	Results[ClusterIndex][PassIndex].Artifacts.Append(ExistingArtifacts);
 
diff --git a/Engine/Source/Developer/AutomationController/Private/AutomationReportManager.cpp b/Engine/Source/Developer/AutomationController/Private/AutomationReportManager.cpp
index d6c30576088a..5f550dd0f6a4 100644
--- a/Engine/Source/Developer/AutomationController/Private/AutomationReportManager.cpp
+++ b/Engine/Source/Developer/AutomationController/Private/AutomationReportManager.cpp
@@ -228,26 +228,26 @@ void FAutomationReportManager::AddResultReport(TSharedPtr< IAutomationReport > I
 
 
 				// Add any warning or errors
-				for ( const FAutomationEvent& Event : TestResults.GetEvents() )
+				for ( const FAutomationExecutionEntry& Entry : TestResults.GetEntries() )
 				{
-					switch ( Event.Type )
+					switch (Entry.Event.Type )
 					{
 					case EAutomationEventType::Info:
 						if ( EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_All) || EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_Logs) )
 						{
-							ResultsLog.Add(ErrorPrefixText + Event.ToString() + ErrorSufixText);
+							ResultsLog.Add(ErrorPrefixText + Entry.ToString() + ErrorSufixText);
 						}
 						break;
 					case EAutomationEventType::Warning:
 						if ( EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_All) || EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_Warnings) )
 						{
-							ResultsLog.Add(ErrorPrefixText + Event.ToString() + ErrorSufixText);
+							ResultsLog.Add(ErrorPrefixText + Entry.ToString() + ErrorSufixText);
 						}
 						break;
 					case EAutomationEventType::Error:
 						if ( EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_All) || EFileExportType::IsSet(FileExportTypeMask, EFileExportType::FET_Errors) )
 						{
-							ResultsLog.Add(ErrorPrefixText + Event.ToString() + ErrorSufixText);
+							ResultsLog.Add(ErrorPrefixText + Entry.ToString() + ErrorSufixText);
 						}
 						break;
 					}
diff --git a/Engine/Source/Developer/AutomationController/Public/IAutomationReport.h b/Engine/Source/Developer/AutomationController/Public/IAutomationReport.h
index 8f92ef59592a..0b4747e21786 100644
--- a/Engine/Source/Developer/AutomationController/Public/IAutomationReport.h
+++ b/Engine/Source/Developer/AutomationController/Public/IAutomationReport.h
@@ -85,8 +85,9 @@ public:
 	{
 	}
 
-	FAutomationArtifact(const FString& InName, EAutomationArtifactType InType, const TMap<FString, FString>& InLocalFiles)
-		: Name(InName)
+	FAutomationArtifact(FGuid InUniqueId, const FString& InName, EAutomationArtifactType InType, const TMap<FString, FString>& InLocalFiles)
+		: Id(InUniqueId)
+		, Name(InName)
 		, Type(InType)
 		, LocalFiles(InLocalFiles)
 	{
@@ -94,6 +95,9 @@ public:
 
 public:
 
+	UPROPERTY()
+	FGuid Id;
+
 	UPROPERTY()
 	FString Name;
 
@@ -103,7 +107,7 @@ public:
 	UPROPERTY()
 	TMap<FString, FString> Files;
 
-	// Local Files are the files generated during a testing run, once exported, the invidual file paths
+	// Local Files are the files generated during a testing run, once exported, the individual file paths
 	// should be stored in the Files map.
 	TMap<FString, FString> LocalFiles;
 };
@@ -127,22 +131,22 @@ struct FAutomationTestResults
 	void Reset()
 	{
 		State = EAutomationState::NotRun;
-		Events.Empty();
+		Entries.Empty();
 		Artifacts.Empty();
 		WarningTotal = 0;
 		ErrorTotal = 0;
 	}
 
-	void SetEvents(const TArray<FAutomationEvent>& InEvents, int32 InWarningTotal, int32 InErrorTotal)
+	void SetEvents(const TArray<FAutomationExecutionEntry>& InEvents, int32 InWarningTotal, int32 InErrorTotal)
 	{
-		Events = InEvents;
+		Entries = InEvents;
 		WarningTotal = InWarningTotal;
 		ErrorTotal = InErrorTotal;
 	}
 
-	void AddEvent(const FAutomationEvent& Event)
+	void AddEvent(const FAutomationExecutionEntry& Event)
 	{
-		switch ( Event.Type )
+		switch ( Event.Event.Type )
 		{
 		case EAutomationEventType::Warning:
 			WarningTotal++;
@@ -152,12 +156,12 @@ struct FAutomationTestResults
 			break;
 		}
 
-		Events.Add(Event);
+		Entries.Add(Event);
 	}
 
-	const TArray<FAutomationEvent>& GetEvents() const { return Events; }
+	const TArray<FAutomationExecutionEntry>& GetEntries() const { return Entries; }
 
-	int32 GetLogTotal() const { return Events.Num() - (WarningTotal + ErrorTotal); }
+	int32 GetLogTotal() const { return Entries.Num() - (WarningTotal + ErrorTotal); }
 	int32 GetWarningTotal() const { return WarningTotal; }
 	int32 GetErrorTotal() const { return ErrorTotal; }
 
@@ -176,7 +180,7 @@ public:
 
 private:
 	/* All events reported as part of this test */
-	TArray<FAutomationEvent> Events;
+	TArray<FAutomationExecutionEntry> Entries;
 
 	int32 WarningTotal;
 
diff --git a/Engine/Source/Developer/AutomationDriver/Private/PassThroughMessageHandler.cpp b/Engine/Source/Developer/AutomationDriver/Private/PassThroughMessageHandler.cpp
index 5a02c6d71480..37276f451854 100644
--- a/Engine/Source/Developer/AutomationDriver/Private/PassThroughMessageHandler.cpp
+++ b/Engine/Source/Developer/AutomationDriver/Private/PassThroughMessageHandler.cpp
@@ -238,24 +238,24 @@ public:
 		RealMessageHandler->OnEndGesture();
 	}
 
-	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
+	virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override
 	{
 		if (!bAllowMessageHandling)
 		{
 			return false;
 		}
 
-		return RealMessageHandler->OnTouchStarted(Window, Location, TouchIndex, ControllerId);
+		return RealMessageHandler->OnTouchStarted(Window, Location, Force, TouchIndex, ControllerId);
 	}
 
-	virtual bool OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
+	virtual bool OnTouchMoved(const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId) override
 	{
 		if (!bAllowMessageHandling)
 		{
 			return false;
 		}
 
-		return RealMessageHandler->OnTouchMoved(Location, TouchIndex, ControllerId);
+		return RealMessageHandler->OnTouchMoved(Location, Force, TouchIndex, ControllerId);
 	}
 
 	virtual bool OnTouchEnded(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
@@ -473,4 +473,4 @@ public:
 TSharedRef<IPassThroughMessageHandlerFactory> FPassThroughMessageHandlerFactoryFactory::Create()
 {
 	return MakeShareable(new FPassThroughMessageHandlerFactory());
-}
\ No newline at end of file
+}
diff --git a/Engine/Source/Developer/AutomationDriver/Private/StepExecutor.cpp b/Engine/Source/Developer/AutomationDriver/Private/StepExecutor.cpp
index 0c2e3dbe7c32..5a06d9b3275e 100644
--- a/Engine/Source/Developer/AutomationDriver/Private/StepExecutor.cpp
+++ b/Engine/Source/Developer/AutomationDriver/Private/StepExecutor.cpp
@@ -97,6 +97,8 @@ private:
 
 	bool ExecuteStep(float Delta, int32 StepIndex)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FStepExecutor_ExecuteStep);
+
 		check(IsInGameThread());
 
 		FStepResult Result = FStepResult(FStepResult::EState::FAILED, 0);
diff --git a/Engine/Source/Developer/AutomationWindow/Private/SAutomationWindow.cpp b/Engine/Source/Developer/AutomationWindow/Private/SAutomationWindow.cpp
index 9e76a0128b6b..b5995e6e2008 100644
--- a/Engine/Source/Developer/AutomationWindow/Private/SAutomationWindow.cpp
+++ b/Engine/Source/Developer/AutomationWindow/Private/SAutomationWindow.cpp
@@ -1486,18 +1486,18 @@ void SAutomationWindow::UpdateTestLog(TSharedPtr<IAutomationReport> Selection)
 					LogMessages.Add(MakeShareable(new FAutomationOutputMessage(PassHeader, TEXT("Automation.Header"))));
 				}
 
-				for (const FAutomationEvent& Event : TestResults.GetEvents())
+				for (const FAutomationExecutionEntry& Entry : TestResults.GetEntries())
 				{
-					switch ( Event.Type )
+					switch (Entry.Event.Type)
 					{
 					case EAutomationEventType::Info:
-						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Event.ToString(), TEXT("Automation.Normal"))));
+						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Entry.ToString(), TEXT("Automation.Normal"))));
 						break;
 					case EAutomationEventType::Warning:
-						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Event.ToString(), TEXT("Automation.Warning"))));
+						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Entry.ToString(), TEXT("Automation.Warning"))));
 						break;
 					case EAutomationEventType::Error:
-						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Event.ToString(), TEXT("Automation.Error"))));
+						LogMessages.Add(MakeShareable(new FAutomationOutputMessage(Entry.ToString(), TEXT("Automation.Error"))));
 						break;
 					}
 				}
diff --git a/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.cpp b/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.cpp
index ae7265f29671..0192211a48f0 100644
--- a/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.cpp
+++ b/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.cpp
@@ -328,7 +328,7 @@ FBlueprintNativeCodeGenPaths FBlueprintNativeCodeGenPaths::GetDefaultCodeGenPath
 				static const FName UBTTargetId_Windows = FName(TEXT("Windows"));
 
 				const FName UBTTargetId = (PlatformIt->UBTTargetId == UBTTargetId_Win32 || PlatformIt->UBTTargetId == UBTTargetId_Win64) ? UBTTargetId_Windows : PlatformIt->UBTTargetId;
-				DefaultPluginPath = FPaths::Combine(*DefaultPluginPath, *Lex::ToString(UBTTargetId), *Lex::ToString(PlatformIt->PlatformType));
+				DefaultPluginPath = FPaths::Combine(*DefaultPluginPath, *LexToString(UBTTargetId), *LexToString(PlatformIt->PlatformType));
 				break;
 			}
 		}
diff --git a/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.h b/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.h
index 5920b62e9842..0d24d8ac685f 100644
--- a/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.h
+++ b/Engine/Source/Developer/BlueprintNativeCodeGen/Private/BlueprintNativeCodeGenManifest.h
@@ -20,7 +20,7 @@ struct FConvertedAssetRecord
 	GENERATED_USTRUCT_BODY()
 
 public:
-	FConvertedAssetRecord() {}
+	FConvertedAssetRecord() : AssetType(nullptr) {}
 	FConvertedAssetRecord(const FAssetData& AssetInfo, const FBlueprintNativeCodeGenPaths& TargetPaths, const FCompilerNativizationOptions& NativizationOptions);
 
 public:
diff --git a/Engine/Source/Developer/CollectionManager/Private/Collection.cpp b/Engine/Source/Developer/CollectionManager/Private/Collection.cpp
index f6828f34145c..fb1f2e677352 100644
--- a/Engine/Source/Developer/CollectionManager/Private/Collection.cpp
+++ b/Engine/Source/Developer/CollectionManager/Private/Collection.cpp
@@ -966,18 +966,18 @@ bool FCollection::CheckinCollection(FText& OutError)
 		}
 	}
 
+	if (ChangelistDescBuilder.IsEmpty())
+	{
+		// No changes could be detected
+		ChangelistDescBuilder.AppendLineFormat(LOCTEXT("CollectionNotModifiedDesc", "Collection '{0}' not modified"), CollectionNameText);
+	}
+
 	if (FEngineBuildSettings::IsInternalBuild())
 	{
-		ChangelistDescBuilder.AppendLine(FString(TEXT("#robomerge #deadend")));
 		ChangelistDescBuilder.AppendLine(FString(TEXT("#jira none")));
 	}
 
 	FText ChangelistDesc = ChangelistDescBuilder.ToText();
-	if (ChangelistDesc.IsEmpty())
-	{
-		// No changes could be detected
-		ChangelistDesc = FText::Format(LOCTEXT("CollectionNotModifiedDesc", "Collection '{0}' not modified"), CollectionNameText);
-	}
 
 	// Finally check in the file
 	TSharedRef<FCheckIn, ESPMode::ThreadSafe> CheckInOperation = ISourceControlOperation::Create<FCheckIn>();
diff --git a/Engine/Source/Developer/CollectionManager/Private/CollectionManager.cpp b/Engine/Source/Developer/CollectionManager/Private/CollectionManager.cpp
index 447403f37b98..4b9cfd80bdc9 100644
--- a/Engine/Source/Developer/CollectionManager/Private/CollectionManager.cpp
+++ b/Engine/Source/Developer/CollectionManager/Private/CollectionManager.cpp
@@ -1577,6 +1577,8 @@ void FCollectionManager::HandleObjectDeleted(const FName& ObjectPath)
 
 bool FCollectionManager::TickFileCache(float InDeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCollectionManager_TickFileCache);
+
 	enum class ECollectionFileAction : uint8
 	{
 		None,
diff --git a/Engine/Source/Developer/CrashDebugHelper/Private/IOS/CrashDebugHelperIOS.cpp b/Engine/Source/Developer/CrashDebugHelper/Private/IOS/CrashDebugHelperIOS.cpp
index 0c32bfdf0a4f..198c09d86ec4 100644
--- a/Engine/Source/Developer/CrashDebugHelper/Private/IOS/CrashDebugHelperIOS.cpp
+++ b/Engine/Source/Developer/CrashDebugHelper/Private/IOS/CrashDebugHelperIOS.cpp
@@ -12,6 +12,13 @@
 #include <cxxabi.h>
 #endif
 
+#if PLATFORM_TCHAR_IS_CHAR16
+#define FP_TEXT_PASTE(x) L ## x
+#define WTEXT(x) FP_TEXT_PASTE(x)
+#else
+#define WTEXT TEXT
+#endif
+
 FString ExtractRelativePath( const TCHAR* BaseName, TCHAR const* FullName )
 {
 	FString FullPath = FString( FullName ).ToLower();
@@ -49,7 +56,7 @@ static int32 ParseReportVersion(TCHAR const* CrashLog, int32& OutVersion)
 	TCHAR const* VersionLine = FCStringWide::Strstr(CrashLog, TEXT("Report Version:"));
 	if (VersionLine)
 	{
-		Found = swscanf(VersionLine, TEXT("%*ls %*ls %d"), &OutVersion);
+		Found = swscanf(TCHAR_TO_WCHAR(VersionLine), WTEXT("%*ls %*ls %d"), &OutVersion);
 	}
 	return Found;
 }
@@ -61,7 +68,7 @@ static int32 ParseVersion(TCHAR const* CrashLog, int32& OutMajor, int32& OutMino
 	if (VersionLine)
 	{
 		TCHAR Branch[257] = {0};
-		Found = swscanf(VersionLine, TEXT("%*s %d.%d.%d (%*d.%*d.%*d-%d+%256ls)"), &OutMajor, &OutMinor, &OutBuild, &OutChangeList, Branch);
+		Found = swscanf(TCHAR_TO_WCHAR(VersionLine), WTEXT("%*s %d.%d.%d (%*d.%*d.%*d-%d+%256ls)"), &OutMajor, &OutMinor, &OutBuild, &OutChangeList, Branch);
 		if(Found == 5)
 		{
 			TCHAR* BranchEnd = FCStringWide::Strchr(Branch, TEXT(')'));
@@ -81,11 +88,11 @@ static int32 ParseOS(TCHAR const* CrashLog, uint16& OutMajor, uint16& OutMinor,
 	TCHAR const* VersionLine = FCStringWide::Strstr(CrashLog, TEXT("OS Version:"));
 	if (VersionLine)
 	{
-		Found = swscanf(VersionLine, TEXT("%*s %*s iPhone OS %hd.%hd.%hd (%hxd)"), &OutMajor, &OutMinor, &OutPatch, &OutBuild);
+		Found = swscanf(TCHAR_TO_WCHAR(VersionLine), WTEXT("%*s %*s iPhone OS %hd.%hd.%hd (%hxd)"), &OutMajor, &OutMinor, &OutPatch, &OutBuild);
         if ( Found == 2 )
         {
             OutPatch = 0;
-            Found += swscanf(VersionLine, TEXT("%*s %*s iPhone OS %*hd.%*hd (%hxd)"), &OutBuild) + 1;
+            Found += swscanf(TCHAR_TO_WCHAR(VersionLine), WTEXT("%*s %*s iPhone OS %*hd.%*hd (%hxd)"), &OutBuild) + 1;
         }
 	}
 	return Found;
@@ -208,10 +215,10 @@ static int32 ParseExceptionCode(TCHAR const* CrashLog, uint32& OutExceptionCode)
 	if(Line)
 	{
 		TCHAR Buffer[257] = {0};
-		Found = swscanf(Line, TEXT("%*s %*s %*s (%256ls)"), Buffer);
+		Found = swscanf(TCHAR_TO_WCHAR(Line), WTEXT("%*s %*s %*s (%256ls)"), Buffer);
 		if(!Found)
 		{
-			Found = swscanf(Line, TEXT("%*s %*s %256ls"), Buffer);
+			Found = swscanf(TCHAR_TO_WCHAR(Line), WTEXT("%*s %*s %256ls"), Buffer);
 		}
 		if(Found)
 		{
@@ -258,7 +265,7 @@ static int32 ParseExceptionCode(TCHAR const* CrashLog, uint32& OutExceptionCode)
 			}
 			else if(FString(Buffer).IsNumeric())
 			{
-				Found = swscanf(Buffer, TEXT("%u"), &OutExceptionCode);
+				Found = swscanf(TCHAR_TO_WCHAR(Buffer), WTEXT("%u"), &OutExceptionCode);
 			}
 			else
 			{
@@ -276,7 +283,7 @@ static int32 ParseCrashedThread(TCHAR const* CrashLog, uint32& OutThreadNumber)
 	TCHAR const* Line = FCStringWide::Strstr(CrashLog, TEXT("Crashed Thread:"));
 	if (Line)
 	{
-		Found = swscanf(Line, TEXT("%*s %*s %u"), &OutThreadNumber);
+		Found = swscanf(TCHAR_TO_WCHAR(Line), WTEXT("%*s %*s %u"), &OutThreadNumber);
 	}
 	return Found;
 }
@@ -287,7 +294,7 @@ static int32 ParseProcessID(TCHAR const* CrashLog, uint32& OutPID)
 	TCHAR const* Line = FCStringWide::Strstr(CrashLog, TEXT("Process:"));
 	if (Line)
 	{
-		Found = swscanf(Line, TEXT("%*s %*s [%u]"), &OutPID);
+		Found = swscanf(TCHAR_TO_WCHAR(Line), WTEXT("%*s %*s [%u]"), &OutPID);
 	}
 	return Found;
 }
@@ -324,14 +331,14 @@ static int32 ParseThreadStackLine(TCHAR const* StackLine, FString& OutModuleName
 	TCHAR FunctionName[1025];
 	TCHAR FileName[257];
 	
-	int32 Found = swscanf(StackLine, TEXT("%*d %256ls 0x%lx"), ModuleName, &OutProgramCounter);
+	int32 Found = swscanf(TCHAR_TO_WCHAR(StackLine), WTEXT("%*d %256ls 0x%lx"), ModuleName, &OutProgramCounter);
 	if(Found == 2)
 	{
 		uint64 FunctionAddress = 0;
 		uint32 FunctionOffset = 0;
-		if(swscanf(StackLine, TEXT("%*d %*ls %*lx 0x%lx + %d"), &FunctionAddress, &FunctionOffset) == 0)
+		if(swscanf(TCHAR_TO_WCHAR(StackLine), WTEXT("%*d %*ls %*lx 0x%lx + %d"), &FunctionAddress, &FunctionOffset) == 0)
 		{
-			Found += swscanf(StackLine, TEXT("%*d %*ls %*lx %1024ls + %*d (%256ls:%d)"), FunctionName, FileName, &OutLineNumber);
+			Found += swscanf(TCHAR_TO_WCHAR(StackLine), WTEXT("%*d %*ls %*lx %1024ls + %*d (%256ls:%d)"), FunctionName, FileName, &OutLineNumber);
 		}
 	}
 	
@@ -448,12 +455,12 @@ static TCHAR const* FindModules(TCHAR const* CrashLog)
 static int32 ParseModuleVersion(TCHAR const* Version, uint16& OutMajor, uint16& OutMinor, uint16& OutPatch, uint16& OutBuild)
 {
 	OutMajor = OutMinor = OutPatch = OutBuild = 0;
-	int32 Found = swscanf(Version, TEXT("%hu.%hu.%hu"), &OutMajor, &OutMinor, &OutPatch);
+	int32 Found = swscanf(TCHAR_TO_WCHAR(Version), WTEXT("%hu.%hu.%hu"), &OutMajor, &OutMinor, &OutPatch);
 	TCHAR const* CurrentStart = FCStringWide::Strchr(Version, TEXT('-'));
 	if(CurrentStart)
 	{
 		int32 Components[3] = {0, 0, 0};
-		int32 Result = swscanf(CurrentStart, TEXT("%*ls %d.%d.%d"), &Components[0], &Components[1], &Components[2]);
+		int32 Result = swscanf(TCHAR_TO_WCHAR(CurrentStart), WTEXT("%*ls %d.%d.%d"), &Components[0], &Components[1], &Components[2]);
 		OutBuild = (uint16)(Components[0] * 10000) + (Components[1] * 100) + (Components[2]);
 		Found = 4;
 	}
@@ -467,7 +474,7 @@ static bool ParseModuleLine(TCHAR const* ModuleLine, FCrashModuleInfo& OutModule
 	uint64 ModuleBase = 0;
 	uint64 ModuleEnd = 0;
 	
-	int32 Found = swscanf(ModuleLine, TEXT("%lx %*ls %lx %256ls"), &ModuleBase, &ModuleEnd, ModuleName);
+	int32 Found = swscanf(TCHAR_TO_WCHAR(ModuleLine), WTEXT("%lx %*ls %lx %256ls"), &ModuleBase, &ModuleEnd, ModuleName);
 	switch (Found)
 	{
 		case 3:
@@ -810,4 +817,4 @@ bool FCrashDebugHelperIOS::CreateMinidumpDiagnosticReport( const FString& InCras
 	}
 	
 	return bOK;
-}
+}
\ No newline at end of file
diff --git a/Engine/Source/Developer/CrashReportHelper/Private/CrashDescription.cpp b/Engine/Source/Developer/CrashReportHelper/Private/CrashDescription.cpp
index 4e19b550d38e..a37e6214e674 100644
--- a/Engine/Source/Developer/CrashReportHelper/Private/CrashDescription.cpp
+++ b/Engine/Source/Developer/CrashReportHelper/Private/CrashDescription.cpp
@@ -65,7 +65,7 @@ FCrashProperty& FCrashProperty::operator=(const bool NewValue)
 FCrashProperty& FCrashProperty::operator=(const int64 NewValue)
 {
 	bSet = true;
-	CachedValue = Lex::ToString( NewValue );
+	CachedValue = LexToString( NewValue );
 	Owner->SetCrashProperty( MainCategory, SecondCategory, CachedValue );
 	return *this;
 }
diff --git a/Engine/Source/Developer/CrashReportHelper/Private/CrashReportUnattended.cpp b/Engine/Source/Developer/CrashReportHelper/Private/CrashReportUnattended.cpp
index a585d0dfe09c..da855f9b5310 100644
--- a/Engine/Source/Developer/CrashReportHelper/Private/CrashReportUnattended.cpp
+++ b/Engine/Source/Developer/CrashReportHelper/Private/CrashReportUnattended.cpp
@@ -5,6 +5,7 @@
 #include "CrashReportConfig.h"
 #include "CrashDescription.h"
 #include "CrashReportAnalytics.h"
+#include "Stats/Stats.h"
 
 FCrashReportUnattended::FCrashReportUnattended(FPlatformErrorReport& InErrorReport, bool InDeleteFiles)
 	: ReceiverUploader(FCrashReportConfig::Get().GetReceiverAddress())
@@ -27,6 +28,8 @@ FCrashReportUnattended::FCrashReportUnattended(FPlatformErrorReport& InErrorRepo
 
 bool FCrashReportUnattended::Tick(float UnusedDeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCrashReportUnattended_Tick);
+
 	if (!FCrashUploadBase::IsInitialized())
 	{
 		FCrashUploadBase::StaticInitialize(ErrorReport);
diff --git a/Engine/Source/Developer/CrashReportHelper/Private/CrashUpload.cpp b/Engine/Source/Developer/CrashReportHelper/Private/CrashUpload.cpp
index 76ce0a39ef2d..036be509bd56 100644
--- a/Engine/Source/Developer/CrashReportHelper/Private/CrashUpload.cpp
+++ b/Engine/Source/Developer/CrashReportHelper/Private/CrashUpload.cpp
@@ -16,6 +16,8 @@
 #include "CrashDescription.h"
 #include "Misc/EngineBuildSettings.h"
 
+#include "Stats/Stats.h"
+
 // Switched off CRR upload - Jun 2016
 #define PRIMARY_UPLOAD_RECEIVER 0
 #define PRIMARY_UPLOAD_DATAROUTER 1
@@ -364,6 +366,8 @@ FCrashUploadToReceiver::~FCrashUploadToReceiver()
 
 bool FCrashUploadToReceiver::PingTimeout(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCrashUploadToReceiver_PingTimeout);
+
 	if (EUploadState::PingingServer == State)
 	{
 		SetCurrentState(EUploadState::ServerNotAvailable);
diff --git a/Engine/Source/Developer/CrashReportHelper/Public/CrashDescription.h b/Engine/Source/Developer/CrashReportHelper/Public/CrashDescription.h
index bb45959dc760..415f4830d453 100644
--- a/Engine/Source/Developer/CrashReportHelper/Public/CrashDescription.h
+++ b/Engine/Source/Developer/CrashReportHelper/Public/CrashDescription.h
@@ -78,22 +78,19 @@ struct FAnalyticsEventAttribute;
 	"bAllowToBeContacted"
  */
 
-namespace Lex
+inline void LexFromString( ECrashDescVersions& OutValue, const TCHAR* Buffer )
 {
-	inline void FromString( ECrashDescVersions& OutValue, const TCHAR* Buffer )
-	{
-		OutValue = (ECrashDescVersions)FCString::Atoi( Buffer );
-	}
+	OutValue = (ECrashDescVersions)FCString::Atoi( Buffer );
+}
 
-	inline void FromString( ECrashDumpMode& OutValue, const TCHAR* Buffer )
-	{
-		OutValue = (ECrashDumpMode)FCString::Atoi( Buffer );
-	}
+inline void LexFromString( ECrashDumpMode& OutValue, const TCHAR* Buffer )
+{
+	OutValue = (ECrashDumpMode)FCString::Atoi( Buffer );
+}
 
-	inline void FromString( FEngineVersion& OutValue, const TCHAR* Buffer )
-	{
-		FEngineVersion::Parse( Buffer, OutValue );
-	}
+inline void LexFromString( FEngineVersion& OutValue, const TCHAR* Buffer )
+{
+	FEngineVersion::Parse( Buffer, OutValue );
 }
 
 /** Simple crash property. Only for string values. */
@@ -438,7 +435,7 @@ protected:
 			const FXmlNode* CategoryNode = MainNode->FindChildNode( SecondCategory );
 			if (CategoryNode)
 			{
-				Lex::FromString( out_ReadValue, *FGenericCrashContext::UnescapeXMLString( CategoryNode->GetContent() ) );
+				LexFromString( out_ReadValue, *FGenericCrashContext::UnescapeXMLString( CategoryNode->GetContent() ) );
 			}
 		}
 	}
diff --git a/Engine/Source/Developer/DerivedDataCache/Private/DerivedDataBackendAsyncPutWrapper.cpp b/Engine/Source/Developer/DerivedDataCache/Private/DerivedDataBackendAsyncPutWrapper.cpp
index 0621657afca3..f27400b65768 100644
--- a/Engine/Source/Developer/DerivedDataCache/Private/DerivedDataBackendAsyncPutWrapper.cpp
+++ b/Engine/Source/Developer/DerivedDataCache/Private/DerivedDataBackendAsyncPutWrapper.cpp
@@ -56,7 +56,7 @@ public:
 			InnerBackend->PutCachedData(*CacheKey, Data, false);
 			if (!InnerBackend->CachedDataProbablyExists(*CacheKey))
 			{
-				UE_LOG(LogDerivedDataCache, Warning, TEXT("FDerivedDataBackendAsyncPutWrapper: Put failed, keeping in memory copy %s."),*CacheKey);
+				UE_LOG(LogDerivedDataCache, Log, TEXT("FDerivedDataBackendAsyncPutWrapper: Put failed, keeping in memory copy %s."),*CacheKey);
 				bOk = false;
 			}
 		}
diff --git a/Engine/Source/Developer/DesktopPlatform/Private/PlatformInfo.cpp b/Engine/Source/Developer/DesktopPlatform/Private/PlatformInfo.cpp
index 2ad50a1972e4..8fa258b3695a 100644
--- a/Engine/Source/Developer/DesktopPlatform/Private/PlatformInfo.cpp
+++ b/Engine/Source/Developer/DesktopPlatform/Private/PlatformInfo.cpp
@@ -133,7 +133,7 @@ static const FPlatformInfo AllPlatformInfoArray[] = {
 	BuildPlatformInfo(TEXT("AllDesktop"),				TEXT("AllDesktop"),			LOCTEXT("DesktopTargetPlatDisplay", "Desktop (Win+Mac+Linux)"),	EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/Desktop/Platform_Desktop_24x"), TEXT("Launcher/Desktop/Platform_Desktop_128x")),					TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnWindows /* see note below */,						TEXT(""),			TEXT(""),			false,					true,					false,			TEXT("AllDesktop"),	TEXT("Desktop")),
 
 	BuildPlatformInfo(TEXT("TVOS"),						TEXT("TVOS"),				LOCTEXT("TVOSTargetPlatDisplay", "tvOS"),						EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/TVOS/Platform_TVOS_24x"), TEXT("Launcher/TVOS/Platform_TVOS_128x")),								TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnWindows || IsAvailableOnMac,						TEXT("TVOS"),		TEXT("TVOS"),		false,					true,					false,			TEXT("TVOS"),		TEXT("Mobile")),
-	BuildPlatformInfo(TEXT("Switch"),					TEXT("Switch"),				LOCTEXT("Switch", "Switch"),									EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/Switch/Platform_Switch_24x"), TEXT("Launcher/Switch/Platform_Switch_128x")),						TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnWindows,											TEXT("Switch"),		TEXT("Switch"),		false,					true,					true,			TEXT("Switch"),		TEXT("Mobile")),
+	BuildPlatformInfo(TEXT("Switch"),					TEXT("Switch"),				LOCTEXT("Switch", "Switch"),									EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/Switch/Platform_Switch_24x"), TEXT("Launcher/Switch/Platform_Switch_128x")),						TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnWindows,											TEXT("Switch"),		TEXT("Switch"),		false,					true,					true,			TEXT("Switch"),		TEXT("Console")),
 	BuildPlatformInfo(TEXT("Lumin"),					TEXT("Lumin"),				LOCTEXT("Lumin", "Lumin"),										EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/LuminTarget/Platform_Lumin_24x"), TEXT("Launcher/Lumin/Platform_Lumin_128x")),					TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnLinux || IsAvailableOnWindows || IsAvailableOnMac,	TEXT("Lumin"),		TEXT("Lumin"),		false,					true,					false,			TEXT("Lumin"),		TEXT("Mobile")),
 	BuildPlatformInfo(TEXT("Quail"),					TEXT("Quail"),				LOCTEXT("Quail", "Quail"),										EPlatformType::Game,	EPlatformFlags::None,			FPlatformIconPaths(TEXT("Launcher/Quail/Platform_Quail_24x"), TEXT("Launcher/Quail/Platform_Quail_128x")),							TEXT(""),											TEXT(""),			EPlatformSDKStatus::Unknown,	TEXT(""),																								IsAvailableOnWindows,											TEXT("Quail"),		TEXT("Quail"),		false,					true,					true,			TEXT("Quail"),		TEXT("")),
 
@@ -328,24 +328,21 @@ const TArray<FName>& GetAllPlatformGroupNames()
 
 } // namespace PlatformInfo
 
-namespace Lex
+FString LexToString(const PlatformInfo::EPlatformType Value)
 {
-	FString ToString(const PlatformInfo::EPlatformType Value)
+	switch (Value)
 	{
-		switch (Value)
-		{
-		case PlatformInfo::EPlatformType::Game:
-			return TEXT("Game");
-		case PlatformInfo::EPlatformType::Editor:
-			return TEXT("Editor");
-		case PlatformInfo::EPlatformType::Client:
-			return TEXT("Client");
-		case PlatformInfo::EPlatformType::Server:
-			return TEXT("Server");
-		}
-
-		return TEXT("");
+	case PlatformInfo::EPlatformType::Game:
+		return TEXT("Game");
+	case PlatformInfo::EPlatformType::Editor:
+		return TEXT("Editor");
+	case PlatformInfo::EPlatformType::Client:
+		return TEXT("Client");
+	case PlatformInfo::EPlatformType::Server:
+		return TEXT("Server");
 	}
+
+	return TEXT("");
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Developer/DesktopPlatform/Public/PlatformInfo.h b/Engine/Source/Developer/DesktopPlatform/Public/PlatformInfo.h
index 57e3ec5ffa34..0e563f60e1c5 100644
--- a/Engine/Source/Developer/DesktopPlatform/Public/PlatformInfo.h
+++ b/Engine/Source/Developer/DesktopPlatform/Public/PlatformInfo.h
@@ -374,12 +374,9 @@ namespace PlatformInfo
 	DESKTOPPLATFORM_API const TArray<FName>& GetAllPlatformGroupNames();
 }
 
-namespace Lex
-{
-	DESKTOPPLATFORM_API FString ToString(const PlatformInfo::EPlatformType Value);
+DESKTOPPLATFORM_API FString LexToString(const PlatformInfo::EPlatformType Value);
 
-	inline void FromString(PlatformInfo::EPlatformType& OutValue, const TCHAR* Buffer)
-	{
-		OutValue = PlatformInfo::EPlatformTypeFromString(FString(Buffer));
-	}
-}
\ No newline at end of file
+inline void LexFromString(PlatformInfo::EPlatformType& OutValue, const TCHAR* Buffer)
+{
+	OutValue = PlatformInfo::EPlatformTypeFromString(FString(Buffer));
+}
diff --git a/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalAITest.h b/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalAITest.h
index 770e5fa6e91c..9372dff8e4ab 100644
--- a/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalAITest.h
+++ b/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalAITest.h
@@ -54,7 +54,12 @@ struct FAITestSpawnInfo
 	/** Gets filled owning spawn set upon game start */
 	FName SpawnSetName;
 
-	FAITestSpawnInfo() : NumberToSpawn(1)
+	FAITestSpawnInfo()
+		: BehaviorTree(nullptr)
+		, SpawnLocation(nullptr)
+		, NumberToSpawn(1)
+		, SpawnDelay(0.0f)
+		, PreSpawnDelay(0.0f)
 	{}
 
 	FORCEINLINE bool IsValid() const { return PawnClass != NULL && SpawnLocation != NULL; }
@@ -99,7 +104,9 @@ struct FAITestSpawnSet
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AISpawn)
 	AActor* FallbackSpawnLocation;
 
-	FAITestSpawnSet() : bEnabled(true)
+	FAITestSpawnSet()
+		: bEnabled(true)
+		, FallbackSpawnLocation(nullptr)
 	{}
 };
 
diff --git a/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalTest.h b/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalTest.h
index 0ee06ef7b3f8..1d2cf3e8f7c8 100644
--- a/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalTest.h
+++ b/Engine/Source/Developer/FunctionalTesting/Classes/FunctionalTest.h
@@ -17,6 +17,7 @@ class UBillboardComponent;
 class UTraceQueryTestResults;
 class UWorld;
 
+#if UE_EXTERNAL_PROFILING_ENABLED
 //Experimental effort at automated cpu captures from the functional testing.
 class FFunctionalTestExternalProfiler : public FScopedExternalProfilerBase
 {
@@ -24,6 +25,7 @@ public:
 	void StartProfiler(const bool bWantPause){ StartScopedTimer(bWantPause); }
 	void StopProfiler(){StopScopedTimer();}
 }; 
+#endif	// UE_EXTERNAL_PROFILING_ENABLED
 
 struct FStatsData
 {
@@ -174,7 +176,9 @@ public:
 	UFUNCTION(BlueprintCallable, Category = Perf)
 	void EndStatsFile();
 
+#if UE_EXTERNAL_PROFILING_ENABLED
 	FFunctionalTestExternalProfiler ExternalProfiler;
+#endif
 
 	/** The path and base name for all output files. */
 	FString OutputFileBase;
@@ -590,6 +594,7 @@ public:
 
 	TArray<FString> Steps;
 	
+	UPROPERTY(BlueprintReadOnly, Category = "Functional Testing")
 	float TotalTime;
 
 	uint32 RunFrame;
diff --git a/Engine/Source/Developer/FunctionalTesting/Classes/ScreenshotFunctionalTestBase.h b/Engine/Source/Developer/FunctionalTesting/Classes/ScreenshotFunctionalTestBase.h
index 579d65289c09..1d896307d2fb 100644
--- a/Engine/Source/Developer/FunctionalTesting/Classes/ScreenshotFunctionalTestBase.h
+++ b/Engine/Source/Developer/FunctionalTesting/Classes/ScreenshotFunctionalTestBase.h
@@ -6,6 +6,7 @@
 #include "UObject/ObjectMacros.h"
 #include "FunctionalTest.h"
 #include "AutomationScreenshotOptions.h"
+#include "Misc/AutomationTest.h"
 
 #include "ScreenshotFunctionalTestBase.generated.h"
 
@@ -54,13 +55,16 @@ protected:
 	void OnScreenShotCaptured(int32 InSizeX, int32 InSizeY, const TArray<FColor>& InImageData);
 
 	// Do some logging and trigger OnScreenshotTakenAndCompared
-	void OnComparisonComplete(bool bWasNew, bool bWasSimilar, double MaxLocalDifference, double GlobalDifference, FString ErrorMessage);
+	void OnComparisonComplete(const FAutomationScreenshotCompareResults& CompareResults);
 
 	// Restore viewport size and original environment settings
 	void RestoreViewSettings();
 
 protected:
 
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Screenshot", meta = (MultiLine = "true"))
+	FString Notes;
+
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Screenshot")
 	class UCameraComponent* ScreenshotCamera;
 
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/AutomationBlueprintFunctionLibrary.cpp b/Engine/Source/Developer/FunctionalTesting/Private/AutomationBlueprintFunctionLibrary.cpp
index 1df1acfb06e4..b7be0aa98580 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/AutomationBlueprintFunctionLibrary.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/AutomationBlueprintFunctionLibrary.cpp
@@ -32,6 +32,9 @@
 #include "Stats/StatsData.h"
 #include "HAL/PlatformProperties.h"
 #include "IAutomationControllerModule.h"
+#include "Scalability.h"
+#include "SceneViewExtension.h"
+#include "SceneView.h"
 
 #define LOCTEXT_NAMESPACE "Automation"
 
@@ -71,22 +74,7 @@ void FConsoleVariableSwapperTempl<T>::Set(T Value)
 			OriginalValue = ConsoleVariable->GetInt();
 		}
 
-		ConsoleVariable->Set(Value);
-	}
-}
-
-template<typename T>
-void FConsoleVariableSwapperTempl<T>::Restore()
-{
-	if (bModified)
-	{
-		IConsoleVariable* ConsoleVariable = IConsoleManager::Get().FindConsoleVariable(*ConsoleVariableName);
-		if (ensure(ConsoleVariable))
-		{
-			ConsoleVariable->Set(OriginalValue);
-		}
-
-		bModified = false;
+		ConsoleVariable->AsVariable()->SetWithCurrentPriority(Value);
 	}
 }
 
@@ -102,10 +90,133 @@ void FConsoleVariableSwapperTempl<float>::Set(float Value)
 			OriginalValue = ConsoleVariable->GetFloat();
 		}
 
-		ConsoleVariable->Set(Value);
+		// I need these overrides to superseded anything the user does while taking the shot.
+		ConsoleVariable->AsVariable()->SetWithCurrentPriority(Value);
 	}
 }
 
+template<typename T>
+void FConsoleVariableSwapperTempl<T>::Restore()
+{
+	if (bModified)
+	{
+		IConsoleVariable* ConsoleVariable = IConsoleManager::Get().FindConsoleVariable(*ConsoleVariableName);
+		if (ensure(ConsoleVariable))
+		{
+			// First we stomp the current with the original, then restore the original flags
+			// so that code continues to treat it using whatever source it was from originally, code, cmdline..etc.
+			ConsoleVariable->AsVariable()->SetWithCurrentPriority(OriginalValue);
+		}
+
+		bModified = false;
+	}
+}
+
+class FAutomationViewExtension : public FSceneViewExtensionBase
+{
+public:
+	FAutomationViewExtension(const FAutoRegister& AutoRegister, UWorld* InWorld, FAutomationScreenshotOptions& InOptions, float InCurrentTimeToSimulate)
+		: FSceneViewExtensionBase(AutoRegister)
+		, WorldPtr(InWorld)
+		, Options(InOptions)
+		, CurrentTime(InCurrentTimeToSimulate)
+	{
+	}
+	
+	/** ISceneViewExtension interface */
+	virtual void SetupView(FSceneViewFamily& InViewFamily, FSceneView& InView)
+	{
+		//if (Options.VisualizeBuffer != NAME_None)
+		//{
+		//	InViewFamily.ViewMode = VMI_VisualizeBuffer;
+		//	InViewFamily.EngineShowFlags.SetVisualizeBuffer(true);
+		//	InViewFamily.EngineShowFlags.SetTonemapper(false);
+
+		//	if (GetBufferVisualizationData().GetMaterial(Options.VisualizeBuffer) == NULL)
+		//	{
+		//		InView.CurrentBufferVisualizationMode = Options.VisualizeBuffer;
+		//	}
+		//}
+	}
+
+	virtual void SetupViewFamily(FSceneViewFamily& InViewFamily) override
+	{
+		if (UAutomationViewSettings* ViewSettings = Options.ViewSettings)
+		{
+			// Turn off common show flags for noisy sources of rendering.
+			FEngineShowFlags& ShowFlags = InViewFamily.EngineShowFlags;
+			ShowFlags.SetAntiAliasing(ViewSettings->AntiAliasing);
+			ShowFlags.SetMotionBlur(ViewSettings->MotionBlur);
+			ShowFlags.SetTemporalAA(ViewSettings->TemporalAA);
+			ShowFlags.SetScreenSpaceReflections(ViewSettings->ScreenSpaceReflections);
+			ShowFlags.SetScreenSpaceAO(ViewSettings->ScreenSpaceAO);
+			ShowFlags.SetDistanceFieldAO(ViewSettings->DistanceFieldAO);
+			ShowFlags.SetContactShadows(ViewSettings->ContactShadows);
+			ShowFlags.SetEyeAdaptation(ViewSettings->EyeAdaptation);
+			ShowFlags.SetBloom(ViewSettings->Bloom);
+		}
+
+		if (Options.bOverride_OverrideTimeTo)
+		{
+			// Turn off time the ultimate source of noise.
+			InViewFamily.CurrentWorldTime = Options.OverrideTimeTo;
+			InViewFamily.CurrentRealTime = Options.OverrideTimeTo;
+			InViewFamily.DeltaWorldTime = 0;
+		}
+
+		if (Options.bDisableNoisyRenderingFeatures)
+		{
+			//// Turn off common show flags for noisy sources of rendering.
+			//InViewFamily.EngineShowFlags.SetAntiAliasing(false);
+			//InViewFamily.EngineShowFlags.SetMotionBlur(false);
+			//InViewFamily.EngineShowFlags.SetTemporalAA(false);
+			//InViewFamily.EngineShowFlags.SetScreenSpaceReflections(false);
+			////InViewFamily.EngineShowFlags.SetScreenSpaceAO(false);
+			////InViewFamily.EngineShowFlags.SetDistanceFieldAO(false);
+			//InViewFamily.EngineShowFlags.SetContactShadows(false);
+			//InViewFamily.EngineShowFlags.SetEyeAdaptation(false);
+
+			//TODO Auto Exposure?
+			//TODO EyeAdaptation Gamma?
+
+			// Disable screen percentage.
+			//InViewFamily.EngineShowFlags.SetScreenPercentage(false);
+		}
+		
+		if (Options.bDisableTonemapping)
+		{
+			//InViewFamily.EngineShowFlags.SetEyeAdaptation(false);
+			//InViewFamily.EngineShowFlags.SetTonemapper(false);
+		}
+	}
+
+	virtual void BeginRenderViewFamily(FSceneViewFamily& InViewFamily) {}
+	virtual void PreRenderViewFamily_RenderThread(FRHICommandListImmediate& RHICmdList, FSceneViewFamily& InViewFamily) {}
+	virtual void PreRenderView_RenderThread(FRHICommandListImmediate& RHICmdList, FSceneView& InView) {}
+
+	virtual bool IsActiveThisFrame(class FViewport* InViewport) const
+	{
+		if (InViewport)
+		{
+			FViewportClient* Client = InViewport->GetClient();
+			if (Client)
+			{
+				return WorldPtr->GetWorld() == Client->GetWorld();
+			}
+		}
+
+		return false;
+	}
+
+	/** We always want to go last. */
+	virtual int32 GetPriority() const override { return MIN_int32; }
+
+private:
+	TWeakObjectPtr<UWorld> WorldPtr;
+	FAutomationScreenshotOptions Options;
+	float CurrentTime;
+};
+
 FAutomationTestScreenshotEnvSetup::FAutomationTestScreenshotEnvSetup()
 	: DefaultFeature_AntiAliasing(TEXT("r.DefaultFeature.AntiAliasing"))
 	, DefaultFeature_AutoExposure(TEXT("r.DefaultFeature.AutoExposure"))
@@ -116,14 +227,21 @@ FAutomationTestScreenshotEnvSetup::FAutomationTestScreenshotEnvSetup()
 	, EyeAdaptationQuality(TEXT("r.EyeAdaptationQuality"))
 	, ContactShadows(TEXT("r.ContactShadows"))
 	, TonemapperGamma(TEXT("r.TonemapperGamma"))
+	, TonemapperSharpen(TEXT("r.Tonemapper.Sharpen"))
 	, SecondaryScreenPercentage(TEXT("r.SecondaryScreenPercentage.GameViewport"))
 {
 }
 
-void FAutomationTestScreenshotEnvSetup::Setup(FAutomationScreenshotOptions& InOutOptions)
+FAutomationTestScreenshotEnvSetup::~FAutomationTestScreenshotEnvSetup()
+{
+}
+
+void FAutomationTestScreenshotEnvSetup::Setup(UWorld* InWorld, FAutomationScreenshotOptions& InOutOptions)
 {
 	check(IsInGameThread());
 
+	WorldPtr = InWorld;
+
 	if (InOutOptions.bDisableNoisyRenderingFeatures)
 	{
 		DefaultFeature_AntiAliasing.Set(0);
@@ -132,14 +250,16 @@ void FAutomationTestScreenshotEnvSetup::Setup(FAutomationScreenshotOptions& InOu
 		PostProcessAAQuality.Set(0);
 		MotionBlurQuality.Set(0);
 		ScreenSpaceReflectionQuality.Set(0);
-		EyeAdaptationQuality.Set(0);
 		ContactShadows.Set(0);
+		EyeAdaptationQuality.Set(0);
 		TonemapperGamma.Set(2.2f);
+		//TonemapperSharpen.Set(0);
 	}
 	else if (InOutOptions.bDisableTonemapping)
 	{
 		EyeAdaptationQuality.Set(0);
 		TonemapperGamma.Set(2.2f);
+		//TonemapperSharpen.Set(0);
 	}
 
 	// Ignore High-DPI settings
@@ -147,6 +267,10 @@ void FAutomationTestScreenshotEnvSetup::Setup(FAutomationScreenshotOptions& InOu
 
 	InOutOptions.SetToleranceAmounts(InOutOptions.Tolerance);
 
+	const float InCurrentTimeToSimulate = 0.0f;
+	AutomationViewExtension = FSceneViewExtensions::NewExtension<FAutomationViewExtension>(InWorld, InOutOptions, InCurrentTimeToSimulate);
+
+	// TODO - I don't like needing to set this here.  Because the gameviewport uses a console variable, it wins.
 	if (UGameViewportClient* ViewportClient = GEngine->GameViewport)
 	{
 		static IConsoleVariable* ICVar = IConsoleManager::Get().FindConsoleVariable(FBufferVisualizationData::GetVisualizationTargetConsoleCommandName());
@@ -175,8 +299,11 @@ void FAutomationTestScreenshotEnvSetup::Restore()
 	EyeAdaptationQuality.Restore();
 	ContactShadows.Restore();
 	TonemapperGamma.Restore();
+	//TonemapperSharpen.Restore();
 	SecondaryScreenPercentage.Restore();
 
+	AutomationViewExtension.Reset();
+
 	if (UGameViewportClient* ViewportClient = GEngine->GameViewport)
 	{
 		static IConsoleVariable* ICVar = IConsoleManager::Get().FindConsoleVariable(FBufferVisualizationData::GetVisualizationTargetConsoleCommandName());
@@ -195,16 +322,14 @@ void FAutomationTestScreenshotEnvSetup::Restore()
 class FAutomationScreenshotTaker
 {
 public:
-	FAutomationScreenshotTaker(UWorld* InWorld, const FString& InName, FAutomationScreenshotOptions InOptions)
+	FAutomationScreenshotTaker(UWorld* InWorld, const FString& InName, const FString& InNotes, FAutomationScreenshotOptions InOptions)
 		: World(InWorld)
 		, Name(InName)
+		, Notes(InNotes)
 		, Options(InOptions)
 		, bNeedsViewportSizeRestore(false)
 	{
-		GEngine->GameViewport->OnScreenshotCaptured().AddRaw(this, &FAutomationScreenshotTaker::GrabScreenShot);
-
-		EnvSetup.Setup(Options);
-		FlushRenderingCommands();
+		EnvSetup.Setup(InWorld, Options);
 
 		if (!FPlatformProperties::HasFixedResolution())
 		{
@@ -216,7 +341,7 @@ public:
 				UEditorEngine* EditorEngine = Cast<UEditorEngine>(GEngine);	
 
 				const bool bIsPIEViewport = GameViewport->IsPlayInEditorViewport();	
-				const bool bIsNewViewport = World.IsValid() && EditorEngine && EditorEngine->WorldIsPIEInNewViewport(World.Get());
+				const bool bIsNewViewport = InWorld && EditorEngine && EditorEngine->WorldIsPIEInNewViewport(InWorld);
 
 				if (!bIsPIEViewport || bIsNewViewport)
 #endif		
@@ -228,20 +353,37 @@ public:
 				}
 			}
 		}
+
+		FlushRenderingCommands();
+
+		GEngine->GameViewport->OnScreenshotCaptured().AddRaw(this, &FAutomationScreenshotTaker::GrabScreenShot);
+		FWorldDelegates::LevelRemovedFromWorld.AddRaw(this, &FAutomationScreenshotTaker::WorldDestroyed);
+		FScreenshotRequest::OnScreenshotRequestProcessed().AddRaw(this, &FAutomationScreenshotTaker::OnScreenshotProcessed);
 	}
 
 	virtual ~FAutomationScreenshotTaker()
 	{
+		FAutomationTestFramework::Get().OnScreenshotCompared.RemoveAll(this);
+		FScreenshotRequest::OnScreenshotRequestProcessed().RemoveAll(this);
+
+		if (GEngine->GameViewport)
+		{
+			GEngine->GameViewport->OnScreenshotCaptured().RemoveAll(this);
+		}
+
+		FWorldDelegates::LevelRemovedFromWorld.RemoveAll(this);
+
 		if (!FPlatformProperties::HasFixedResolution() && bNeedsViewportSizeRestore)
 		{
-			FSceneViewport* GameViewport = GEngine->GameViewport->GetGameViewport();
-			GameViewport->SetViewportSize(ViewportRestoreSize.X, ViewportRestoreSize.Y);
+			if (GEngine->GameViewport)
+			{
+				FSceneViewport* GameViewport = GEngine->GameViewport->GetGameViewport();
+				GameViewport->SetViewportSize(ViewportRestoreSize.X, ViewportRestoreSize.Y);
+			}
 		}
 
 		EnvSetup.Restore();
 
-		GEngine->GameViewport->OnScreenshotCaptured().RemoveAll(this);
-
 		FAutomationTestFramework::Get().NotifyScreenshotTakenAndCompared();
 	}
 
@@ -249,70 +391,78 @@ public:
 	{
 		check(IsInGameThread());
 
-		FAutomationScreenshotData Data = AutomationCommon::BuildScreenshotData(GWorld->GetName(), Name, InSizeX, InSizeY);
-
-		// Copy the relevant data into the metadata for the screenshot.
-		Data.bHasComparisonRules = true;
-		Data.ToleranceRed = Options.ToleranceAmount.Red;
-		Data.ToleranceGreen = Options.ToleranceAmount.Green;
-		Data.ToleranceBlue = Options.ToleranceAmount.Blue;
-		Data.ToleranceAlpha = Options.ToleranceAmount.Alpha;
-		Data.ToleranceMinBrightness = Options.ToleranceAmount.MinBrightness;
-		Data.ToleranceMaxBrightness = Options.ToleranceAmount.MaxBrightness;
-		Data.bIgnoreAntiAliasing = Options.bIgnoreAntiAliasing;
-		Data.bIgnoreColors = Options.bIgnoreColors;
-		Data.MaximumLocalError = Options.MaximumLocalError;
-		Data.MaximumGlobalError = Options.MaximumGlobalError;
-
-		FAutomationTestFramework::Get().OnScreenshotCaptured().ExecuteIfBound(InImageData, Data);
-
-		UE_LOG(AutomationFunctionLibrary, Log, TEXT("Screenshot captured as %s"), *Data.Path);
-
-		if ( GIsAutomationTesting )
+		if (World.IsValid())
 		{
-			FAutomationTestFramework::Get().OnScreenshotCompared.AddRaw(this, &FAutomationScreenshotTaker::OnComparisonComplete);
-		}
-		else
-		{
-			delete this;
+			FAutomationScreenshotData Data = AutomationCommon::BuildScreenshotData(World->GetName(), Name, InSizeX, InSizeY);
+
+			// Copy the relevant data into the metadata for the screenshot.
+			Data.bHasComparisonRules = true;
+			Data.ToleranceRed = Options.ToleranceAmount.Red;
+			Data.ToleranceGreen = Options.ToleranceAmount.Green;
+			Data.ToleranceBlue = Options.ToleranceAmount.Blue;
+			Data.ToleranceAlpha = Options.ToleranceAmount.Alpha;
+			Data.ToleranceMinBrightness = Options.ToleranceAmount.MinBrightness;
+			Data.ToleranceMaxBrightness = Options.ToleranceAmount.MaxBrightness;
+			Data.bIgnoreAntiAliasing = Options.bIgnoreAntiAliasing;
+			Data.bIgnoreColors = Options.bIgnoreColors;
+			Data.MaximumLocalError = Options.MaximumLocalError;
+			Data.MaximumGlobalError = Options.MaximumGlobalError;
+
+			// Record any user notes that were made to accompany this shot.
+			Data.Notes = Notes;
+
+			bool bAttemptToCompareShot = FAutomationTestFramework::Get().OnScreenshotCaptured().ExecuteIfBound(InImageData, Data);
+
+			UE_LOG(AutomationFunctionLibrary, Log, TEXT("Screenshot captured as %s"), *Data.Path);
+
+			if (GIsAutomationTesting)
+			{
+				FAutomationTestFramework::Get().OnScreenshotCompared.AddRaw(this, &FAutomationScreenshotTaker::OnComparisonComplete);
+				FScreenshotRequest::OnScreenshotRequestProcessed().RemoveAll(this);
+				return;
+			}
 		}
+		
+		delete this;
 	}
 
-	void OnComparisonComplete(bool bWasNew, bool bWasSimilar, double MaxLocalDifference, double GlobalDifference, FString ErrorMessage)
+	void OnScreenshotProcessed()
+	{
+		UE_LOG(AutomationFunctionLibrary, Log, TEXT("Screenshot processed, but not compared."));
+
+		// If it's done being processed 
+		delete this;
+	}
+
+	void OnComparisonComplete(const FAutomationScreenshotCompareResults& CompareResults)
 	{
 		FAutomationTestFramework::Get().OnScreenshotCompared.RemoveAll(this);
 
-		if ( bWasNew )
+		if (FAutomationTestBase* CurrentTest = FAutomationTestFramework::Get().GetCurrentTest())
 		{
-			UE_LOG(AutomationFunctionLibrary, Warning, TEXT("New Screenshot '%s' was discovered!  Please add a ground truth version of it."), *Name);
-		}
-		else
-		{
-			if ( bWasSimilar )
-			{
-				UE_LOG(AutomationFunctionLibrary, Display, TEXT("Screenshot '%s' was similar!  Global Difference = %f, Max Local Difference = %f"), *Name, GlobalDifference, MaxLocalDifference);
-			}
-			else
-			{
-				if ( ErrorMessage.IsEmpty() )
-				{
-					UE_LOG(AutomationFunctionLibrary, Error, TEXT("Screenshot '%s' test failed, Screenshots were different!  Global Difference = %f, Max Local Difference = %f"), *Name, GlobalDifference, MaxLocalDifference);
-				}
-				else
-				{
-					UE_LOG(AutomationFunctionLibrary, Error, TEXT("Screenshot '%s' test failed;  Error = %s"), *Name, *ErrorMessage);
-				}
-			}
+			CurrentTest->AddEvent(CompareResults.ToAutomationEvent(Name));
 		}
 
 		delete this;
 	}
 
+	void WorldDestroyed(ULevel* InLevel, UWorld* InWorld)
+	{
+		// If the InLevel is null, it's a signal that the entire world is about to disappear, so
+		// go ahead and remove this widget from the viewport, it could be holding onto too many
+		// dangerous actor references that won't carry over into the next world.
+		if (InLevel == nullptr && InWorld == World.Get())
+		{
+			delete this;
+		}
+	}
+
 private:
 
 	TWeakObjectPtr<UWorld> World;
 	
 	FString	Name;
+	FString Notes;
 	FAutomationScreenshotOptions Options;
 
 	FAutomationTestScreenshotEnvSetup EnvSetup;
@@ -340,6 +490,8 @@ void UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot()
 	UTexture::ForceUpdateTextureStreaming();
 
 	IStreamingManager::Get().StreamAllResources(0.0f);
+
+	//IStreamingManager::Get().
 }
 
 FIntPoint UAutomationBlueprintFunctionLibrary::GetAutomationScreenshotSize(const FAutomationScreenshotOptions& Options)
@@ -383,19 +535,19 @@ FIntPoint UAutomationBlueprintFunctionLibrary::GetAutomationScreenshotSize(const
 	return FIntPoint(ResolutionX, ResolutionY);
 }
 
-bool UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotInternal(UObject* WorldContextObject, const FString& Name, FAutomationScreenshotOptions Options)
+bool UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotInternal(UObject* WorldContextObject, const FString& Name, const FString& Notes, FAutomationScreenshotOptions Options)
 {
 	UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot();
 
 #if (WITH_DEV_AUTOMATION_TESTS || WITH_PERF_AUTOMATION_TESTS)
-	FAutomationScreenshotTaker* TempObject = new FAutomationScreenshotTaker(WorldContextObject ? WorldContextObject->GetWorld() : nullptr, Name, Options);
+	FAutomationScreenshotTaker* TempObject = new FAutomationScreenshotTaker(WorldContextObject ? WorldContextObject->GetWorld() : nullptr, Name, Notes, Options);
 #endif
 
 	FScreenshotRequest::RequestScreenshot(false);
 	return true; //-V773
 }
 
-void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshot(UObject* WorldContextObject, FLatentActionInfo LatentInfo, const FString& Name, const FAutomationScreenshotOptions& Options)
+void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshot(UObject* WorldContextObject, FLatentActionInfo LatentInfo, const FString& Name, const FString& Notes, const FAutomationScreenshotOptions& Options)
 {
 	if ( GIsAutomationTesting )
 	{
@@ -404,7 +556,7 @@ void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshot(UObject* Worl
 			FLatentActionManager& LatentActionManager = World->GetLatentActionManager();
 			if ( LatentActionManager.FindExistingAction<FTakeScreenshotAfterTimeLatentAction>(LatentInfo.CallbackTarget, LatentInfo.UUID) == nullptr )
 			{
-				LatentActionManager.AddNewAction(LatentInfo.CallbackTarget, LatentInfo.UUID, new FTakeScreenshotAfterTimeLatentAction(LatentInfo, Name, Options));
+				LatentActionManager.AddNewAction(LatentInfo.CallbackTarget, LatentInfo.UUID, new FTakeScreenshotAfterTimeLatentAction(LatentInfo, Name, Notes, Options));
 			}
 		}
 	}
@@ -414,7 +566,7 @@ void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshot(UObject* Worl
 	}
 }
 
-void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotAtCamera(UObject* WorldContextObject, FLatentActionInfo LatentInfo, ACameraActor* Camera, const FString& NameOverride, const FAutomationScreenshotOptions& Options)
+void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotAtCamera(UObject* WorldContextObject, FLatentActionInfo LatentInfo, ACameraActor* Camera, const FString& NameOverride, const FString& Notes, const FAutomationScreenshotOptions& Options)
 {
 	if ( Camera == nullptr )
 	{
@@ -447,7 +599,7 @@ void UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotAtCamera(UObje
 		FLatentActionManager& LatentActionManager = World->GetLatentActionManager();
 		if ( LatentActionManager.FindExistingAction<FTakeScreenshotAfterTimeLatentAction>(LatentInfo.CallbackTarget, LatentInfo.UUID) == nullptr )
 		{
-			LatentActionManager.AddNewAction(LatentInfo.CallbackTarget, LatentInfo.UUID, new FTakeScreenshotAfterTimeLatentAction(LatentInfo, ScreenshotName, Options));
+			LatentActionManager.AddNewAction(LatentInfo.CallbackTarget, LatentInfo.UUID, new FTakeScreenshotAfterTimeLatentAction(LatentInfo, ScreenshotName, Notes, Options));
 		}
 	}
 }
@@ -478,7 +630,7 @@ bool UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotOfUI_Immediate
 					}
 
 					// The screenshot taker deletes itself later.
-					FAutomationScreenshotTaker* TempObject = new FAutomationScreenshotTaker(World, Name, Options);
+					FAutomationScreenshotTaker* TempObject = new FAutomationScreenshotTaker(World, Name, TEXT(""), Options);
 
 					FAutomationScreenshotData Data = AutomationCommon::BuildScreenshotData(World->GetName(), Name, OutSize.X, OutSize.Y);
 
@@ -663,4 +815,25 @@ FAutomationScreenshotOptions UAutomationBlueprintFunctionLibrary::GetDefaultScre
 	return Options;
 }
 
+void UAutomationBlueprintFunctionLibrary::SetScalabilityQualityLevelRelativeToMax(UObject* WorldContextObject, int32 Value /*= 1*/)
+{
+	Scalability::FQualityLevels Quality;
+	Quality.SetFromSingleQualityLevelRelativeToMax(Value);
+	Scalability::SetQualityLevels(Quality, true);
+}
+
+void UAutomationBlueprintFunctionLibrary::SetScalabilityQualityToEpic(UObject* WorldContextObject)
+{
+	Scalability::FQualityLevels Quality;
+	Quality.SetFromSingleQualityLevelRelativeToMax(0);
+	Scalability::SetQualityLevels(Quality, true);
+}
+
+void UAutomationBlueprintFunctionLibrary::SetScalabilityQualityToLow(UObject* WorldContextObject)
+{
+	Scalability::FQualityLevels Quality;
+	Quality.SetFromSingleQualityLevel(0);
+	Scalability::SetQualityLevels(Quality, true);
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTest.cpp b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTest.cpp
index 841a97abf014..0a7309957eb3 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTest.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTest.cpp
@@ -176,7 +176,7 @@ void AFunctionalTest::OnConstruction(const FTransform& Transform)
 	{
 		if ( bIsEnabled )
 		{
-			TestName->SetTextRenderColor(FColor(11, 255, 0));
+			TestName->SetTextRenderColor(FColor(45, 255, 0));
 			TestName->SetText(FText::FromString(GetActorLabel()));
 		}
 		else
@@ -184,22 +184,22 @@ void AFunctionalTest::OnConstruction(const FTransform& Transform)
 			TestName->SetTextRenderColor(FColor(55, 55, 55));
 			TestName->SetText(FText::FromString(GetActorLabel() + TEXT("\n") + TEXT("# Disabled #")));
 		}
+
+		//TestName->SetTextMaterial();
 	}
 #endif
 }
 
 bool AFunctionalTest::RunTest(const TArray<FString>& Params)
 {
-	FAutomationTestFramework::Get().SetTreatWarningsAsErrors(bWarningsAsErrors);
+	ensure(GetWorld()->HasBegunPlay());
 
-	//Scalability::FQualityLevels Quality;
-	//Quality.SetDefaults();
-	//Scalability::SetQualityLevels(Quality);
+	FAutomationTestFramework::Get().SetTreatWarningsAsErrors(bWarningsAsErrors);
 
 	FailureMessage = TEXT("");
 	
 	//Do not collect garbage during the test. We force GC at the end.
-	GEngine->DelayGarbageCollection();
+	//GEngine->DelayGarbageCollection();
 
 	RunFrame = GFrameNumber;
 	RunTime = GetWorld()->GetTimeSeconds();
@@ -362,6 +362,12 @@ void AFunctionalTest::FinishTest(EFunctionalTestResult TestResult, const FString
 
 void AFunctionalTest::EndPlay(const EEndPlayReason::Type EndPlayReason)
 {
+	// If end play occurs and we're still running, notify that the testing has stopped.
+	if (bIsRunning)
+	{
+		TestFinishedObserver.ExecuteIfBound(this);
+	}
+
 	TestFinishedObserver.Unbind();
 
 	Super::EndPlay(EndPlayReason);
@@ -1262,14 +1268,18 @@ FPerfStatsRecord* UAutomationPerformaceHelper::GetCurrentRecord()
 
 void UAutomationPerformaceHelper::StartCPUProfiling()
 {
+#if UE_EXTERNAL_PROFILING_ENABLED
 	UE_LOG(LogFunctionalTest, Log, TEXT("START PROFILING..."));
 	ExternalProfiler.StartProfiler(false);
+#endif
 }
 
 void UAutomationPerformaceHelper::StopCPUProfiling()
 {
+#if UE_EXTERNAL_PROFILING_ENABLED
 	UE_LOG(LogFunctionalTest, Log, TEXT("STOP PROFILING..."));
 	ExternalProfiler.StopProfiler();
+#endif
 }
 
 void UAutomationPerformaceHelper::TriggerGPUTraceIfRecordFallsBelowBudget()
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingManager.cpp b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingManager.cpp
index 1a10ef1220f9..f280a5a0e6ee 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingManager.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingManager.cpp
@@ -187,14 +187,22 @@ UFunctionalTestingManager* UFunctionalTestingManager::GetManager(UObject* WorldC
 
 	if (Manager == nullptr)
 	{
-		if (UObject* World = GEngine->GetWorldFromContextObject(WorldContext, EGetWorldErrorMode::LogAndReturnNull))
+		if (UWorld* World = GEngine->GetWorldFromContextObject(WorldContext, EGetWorldErrorMode::LogAndReturnNull))
 		{
-			Manager = NewObject<UFunctionalTestingManager>(World);
-			IFunctionalTestingModule::Get().SetManager(Manager);
+			// Only add functional test managers for the PIE and Game Worlds.
+			if (World->WorldType == EWorldType::PIE || World->WorldType == EWorldType::Game)
+			{
+				Manager = NewObject<UFunctionalTestingManager>(World);
+				IFunctionalTestingModule::Get().SetManager(Manager);
 
-			// add to root and get notified on world cleanup to remove from root on map cleanup
-			Manager->AddToRoot();
-			FWorldDelegates::OnWorldCleanup.AddUObject(Manager, &UFunctionalTestingManager::OnWorldCleanedUp);
+				// add to root and get notified on world cleanup to remove from root on map cleanup
+				Manager->AddToRoot();
+				FWorldDelegates::OnWorldCleanup.AddUObject(Manager, &UFunctionalTestingManager::OnWorldCleanedUp);
+			}
+		}
+		else
+		{
+			ensureMsgf(false, TEXT("Tried to add a functional test manager to a non-game world."));
 		}
 	}
 
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingModule.cpp b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingModule.cpp
index 3668289c8b67..78eb728728b5 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingModule.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingModule.cpp
@@ -209,25 +209,29 @@ void FFunctionalTestingModule::SetLooping(const bool bLoop)
 
 UWorld* FFunctionalTestingModule::GetTestWorld()
 {
-	UWorld* TestWorld = nullptr;
-
 #if WITH_EDITOR
 	const TIndirectArray<FWorldContext>& WorldContexts = GEngine->GetWorldContexts();
 	for (const FWorldContext& Context : WorldContexts)
 	{
-		if ((Context.WorldType == EWorldType::PIE) && (Context.World() != nullptr))
+		if (Context.World() != nullptr)
 		{
-			TestWorld = Context.World();
+			if (Context.WorldType == EWorldType::PIE /*&& Context.PIEInstance == 0*/)
+			{
+				return Context.World();
+			}
+			
+			if (Context.WorldType == EWorldType::Game)
+			{
+				return Context.World();
+			}
 		}
 	}
 #endif
-	if (!TestWorld)
+
+	UWorld* TestWorld = GWorld;
+	if (GIsEditor)
 	{
-		TestWorld = GWorld;
-		if (GIsEditor)
-		{
-			UE_LOG(LogFunctionalTest, Warning, TEXT("Functional Test using GWorld.  Not correct for PIE"));
-		}
+		UE_LOG(LogFunctionalTest, Warning, TEXT("Functional Test using GWorld.  Not correct for PIE"));
 	}
 
 	return TestWorld;
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalUIScreenshotTest.cpp b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalUIScreenshotTest.cpp
index 8a10dd2a90fc..dc4c0650079b 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/FunctionalUIScreenshotTest.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/FunctionalUIScreenshotTest.cpp
@@ -171,10 +171,11 @@ void AFunctionalUIScreenshotTest::RequestScreenshot()
 			// Draw the game viewport (overlaid with the widget to screenshot) to our ScreenshotRT.
 			// Need to do this manually because the game viewport doesn't have a valid FViewportRHIRef
 			// when rendering to a separate render target
-			TSharedPtr<FWidgetRenderer> WidgetRenderer = MakeShareable(new FWidgetRenderer(true, false));
-			check(WidgetRenderer.IsValid());
+			FWidgetRenderer* WidgetRenderer = new FWidgetRenderer(true, false);
+			check(WidgetRenderer);
 			WidgetRenderer->DrawWidget(ScreenshotRT, ViewportWidget.ToSharedRef(), ScreenshotSize, 0.f);
 			FlushRenderingCommands();
+			BeginCleanup(WidgetRenderer);
 
 			ReadPixelsFromRT(ScreenshotRT, &OutColorData);
 		}
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTest.cpp b/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTest.cpp
index 90a670e9d8de..ed4905052b85 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTest.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTest.cpp
@@ -35,6 +35,9 @@ void AScreenshotFunctionalTest::Serialize(FArchive& Ar)
 
 void AScreenshotFunctionalTest::PrepareTest()
 {
+	// Pre-prep flush to allow rendering to temporary targets and other test resources
+	UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot();
+
 	Super::PrepareTest();
 
 	// Apply a camera cut if requested
@@ -52,6 +55,7 @@ void AScreenshotFunctionalTest::PrepareTest()
 		}
 	}
 
+	// Post-prep flush deal with any temporary resources allocated during prep before the main test
 	UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot();
 }
 
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTestBase.cpp b/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTestBase.cpp
index 4514d5317b53..4a36c19d3988 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTestBase.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/ScreenshotFunctionalTestBase.cpp
@@ -102,7 +102,7 @@ void AScreenshotFunctionalTestBase::PrepareForScreenshot()
 
 	if (bApplyScreenshotSettings)
 	{
-		ScreenshotEnvSetup->Setup(ScreenshotOptions);
+		ScreenshotEnvSetup->Setup(GetWorld(), ScreenshotOptions);
 		FlushRenderingCommands();
 		bNeedsViewSettingsRestore = true;
 
@@ -140,6 +140,9 @@ void AScreenshotFunctionalTestBase::OnScreenShotCaptured(int32 InSizeX, int32 In
 	Data.MaximumLocalError = ScreenshotOptions.MaximumLocalError;
 	Data.MaximumGlobalError = ScreenshotOptions.MaximumGlobalError;
 
+	// Add the notes
+	Data.Notes = Notes;
+
 	if (GIsAutomationTesting)
 	{
 		FAutomationTestFramework::Get().OnScreenshotCompared.AddUObject(this, &AScreenshotFunctionalTestBase::OnComparisonComplete);
@@ -163,31 +166,13 @@ void AScreenshotFunctionalTestBase::RequestScreenshot()
 	GameViewportClient->OnScreenshotCaptured().AddUObject(this, &AScreenshotFunctionalTestBase::OnScreenShotCaptured);
 }
 
-void AScreenshotFunctionalTestBase::OnComparisonComplete(bool bWasNew, bool bWasSimilar, double MaxLocalDifference, double GlobalDifference, FString ErrorMessage)
+void AScreenshotFunctionalTestBase::OnComparisonComplete(const FAutomationScreenshotCompareResults& CompareResults)
 {
 	FAutomationTestFramework::Get().OnScreenshotCompared.RemoveAll(this);
 
-	if (bWasNew)
+	if (FAutomationTestBase* CurrentTest = FAutomationTestFramework::Get().GetCurrentTest())
 	{
-		UE_LOG(LogScreenshotFunctionalTest, Warning, TEXT("New Screenshot '%s' was discovered!  Please add a ground truth version of it."), *GetName());
-	}
-	else
-	{
-		if (bWasSimilar)
-		{
-			UE_LOG(LogScreenshotFunctionalTest, Display, TEXT("Screenshot '%s' was similar!  Global Difference = %f, Max Local Difference = %f"), *GetName(), GlobalDifference, MaxLocalDifference);
-		}
-		else
-		{
-			if (ErrorMessage.IsEmpty())
-			{
-				UE_LOG(LogScreenshotFunctionalTest, Error, TEXT("Screenshot '%s' test failed, Screenshots were different!  Global Difference = %f, Max Local Difference = %f"), *GetName(), GlobalDifference, MaxLocalDifference);
-			}
-			else
-			{
-				UE_LOG(LogScreenshotFunctionalTest, Error, TEXT("Screenshot '%s' test failed;  Error = %s"), *GetName(), *ErrorMessage);
-			}
-		}
+		CurrentTest->AddEvent(CompareResults.ToAutomationEvent(GetName()));
 	}
 
 	FAutomationTestFramework::Get().NotifyScreenshotTakenAndCompared();
diff --git a/Engine/Source/Developer/FunctionalTesting/Private/TakeScreenshotAfterTimeLatentAction.cpp b/Engine/Source/Developer/FunctionalTesting/Private/TakeScreenshotAfterTimeLatentAction.cpp
index 1ecdc7a16d8d..0b0afa5fc864 100644
--- a/Engine/Source/Developer/FunctionalTesting/Private/TakeScreenshotAfterTimeLatentAction.cpp
+++ b/Engine/Source/Developer/FunctionalTesting/Private/TakeScreenshotAfterTimeLatentAction.cpp
@@ -7,16 +7,18 @@
 #include "EngineGlobals.h"
 #include "Misc/AutomationTest.h"
 
-FTakeScreenshotAfterTimeLatentAction::FTakeScreenshotAfterTimeLatentAction(const FLatentActionInfo& LatentInfo, const FString& InScreenshotName, FAutomationScreenshotOptions InOptions)
+FTakeScreenshotAfterTimeLatentAction::FTakeScreenshotAfterTimeLatentAction(const FLatentActionInfo& LatentInfo, const FString& InScreenshotName, const FString& InNotes, FAutomationScreenshotOptions InOptions)
 	: ExecutionFunction(LatentInfo.ExecutionFunction)
 	, OutputLink(LatentInfo.Linkage)
 	, CallbackTarget(LatentInfo.CallbackTarget)
 	, ScreenshotName(InScreenshotName)
+	, Notes(InNotes)
 	, SecondsRemaining(InOptions.Delay)
 	, IssuedScreenshotCapture(false)
 	, TakenScreenshot(false)
 	, Options(InOptions)
 {
+	UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot();
 }
 
 FTakeScreenshotAfterTimeLatentAction::~FTakeScreenshotAfterTimeLatentAction()
@@ -35,13 +37,15 @@ void FTakeScreenshotAfterTimeLatentAction::UpdateOperation(FLatentResponse& Resp
 	{
 		if ( !IssuedScreenshotCapture )
 		{
+			UAutomationBlueprintFunctionLibrary::FinishLoadingBeforeScreenshot();
+
 			SecondsRemaining -= Response.ElapsedTime();
 			if ( SecondsRemaining <= 0.0f )
 			{
 				UObject* Caller = CallbackTarget.IsValid() ? CallbackTarget.Get() : nullptr;
 				FAutomationTestFramework::Get().OnScreenshotTakenAndCompared.AddRaw(this, &FTakeScreenshotAfterTimeLatentAction::OnScreenshotTakenAndCompared);
 
-				if ( UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotInternal(Caller, ScreenshotName, Options) )
+				if ( UAutomationBlueprintFunctionLibrary::TakeAutomationScreenshotInternal(Caller, ScreenshotName, Notes, Options) )
 				{
 					IssuedScreenshotCapture = true;
 				}
diff --git a/Engine/Source/Developer/FunctionalTesting/Public/AutomationBlueprintFunctionLibrary.h b/Engine/Source/Developer/FunctionalTesting/Public/AutomationBlueprintFunctionLibrary.h
index d48d747b9f1d..abe7a62705f3 100644
--- a/Engine/Source/Developer/FunctionalTesting/Public/AutomationBlueprintFunctionLibrary.h
+++ b/Engine/Source/Developer/FunctionalTesting/Public/AutomationBlueprintFunctionLibrary.h
@@ -6,6 +6,7 @@
 #include "Engine/LatentActionManager.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "AutomationScreenshotOptions.h"
+#include "HAL/IConsoleManager.h"
 
 #include "AutomationBlueprintFunctionLibrary.generated.h"
 
@@ -22,7 +23,7 @@ class FUNCTIONALTESTING_API UAutomationBlueprintFunctionLibrary : public UBluepr
 public:
 	static void FinishLoadingBeforeScreenshot();
 
-	static bool TakeAutomationScreenshotInternal(UObject* WorldContextObject, const FString& Name, FAutomationScreenshotOptions Options);
+	static bool TakeAutomationScreenshotInternal(UObject* WorldContextObject, const FString& Name, const FString& Notes, FAutomationScreenshotOptions Options);
 
 	static FIntPoint GetAutomationScreenshotSize(const FAutomationScreenshotOptions& Options);
 
@@ -30,13 +31,13 @@ public:
 	 * Takes a screenshot of the game's viewport.  Does not capture any UI.
 	 */
 	UFUNCTION(BlueprintCallable, Category = "Automation", meta = (Latent, HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject", LatentInfo = "LatentInfo", Name = "" ))
-	static void TakeAutomationScreenshot(UObject* WorldContextObject, FLatentActionInfo LatentInfo, const FString& Name, const FAutomationScreenshotOptions& Options);
+	static void TakeAutomationScreenshot(UObject* WorldContextObject, FLatentActionInfo LatentInfo, const FString& Name, const FString& Notes, const FAutomationScreenshotOptions& Options);
 
 	/**
 	 * Takes a screenshot of the game's viewport, from a particular camera actors POV.  Does not capture any UI.
 	 */
 	UFUNCTION(BlueprintCallable, Category = "Automation", meta = (Latent, HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject", LatentInfo = "LatentInfo", NameOverride = "" ))
-	static void TakeAutomationScreenshotAtCamera(UObject* WorldContextObject, FLatentActionInfo LatentInfo, ACameraActor* Camera, const FString& NameOverride, const FAutomationScreenshotOptions& Options);
+	static void TakeAutomationScreenshotAtCamera(UObject* WorldContextObject, FLatentActionInfo LatentInfo, ACameraActor* Camera, const FString& NameOverride, const FString& Notes, const FAutomationScreenshotOptions& Options);
 
 	/**
 	 * 
@@ -84,6 +85,19 @@ public:
 	 */
 	UFUNCTION(BlueprintPure, Category="Automation")
 	static FAutomationScreenshotOptions GetDefaultScreenshotOptionsForRendering(EComparisonTolerance Tolerance = EComparisonTolerance::Low, float Delay = 0.2);
+
+	/**
+	 * Sets all other settings based on an overall value
+	 * @param Value 0:Cinematic, 1:Epic...etc.
+	 */
+	UFUNCTION(BlueprintCallable, Category = "Automation", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
+	static void SetScalabilityQualityLevelRelativeToMax(UObject* WorldContextObject, int32 Value = 1);
+
+	UFUNCTION(BlueprintCallable, Category = "Automation", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
+	static void SetScalabilityQualityToEpic(UObject* WorldContextObject);
+
+	UFUNCTION(BlueprintCallable, Category = "Automation", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
+	static void SetScalabilityQualityToLow(UObject* WorldContextObject);
 };
 
 #if (WITH_DEV_AUTOMATION_TESTS || WITH_PERF_AUTOMATION_TESTS)
@@ -109,12 +123,14 @@ class FAutomationTestScreenshotEnvSetup
 {
 public:
 	FAutomationTestScreenshotEnvSetup();
+	~FAutomationTestScreenshotEnvSetup();
 
 	// Disable AA, auto-exposure, motion blur, contact shadow if InOutOptions.bDisableNoisyRenderingFeatures.
 	// Update screenshot comparison tolerance stored in InOutOptions.
 	// Set visualization buffer name if required.
-	void Setup(FAutomationScreenshotOptions& InOutOptions);
+	void Setup(UWorld* InWorld, FAutomationScreenshotOptions& InOutOptions);
 
+	/** Restore the old settings. */
 	void Restore();
 
 private:
@@ -127,7 +143,11 @@ private:
 	FConsoleVariableSwapperTempl<int32> EyeAdaptationQuality;
 	FConsoleVariableSwapperTempl<int32> ContactShadows;
 	FConsoleVariableSwapperTempl<float> TonemapperGamma;
+	FConsoleVariableSwapperTempl<float> TonemapperSharpen;
 	FConsoleVariableSwapperTempl<float> SecondaryScreenPercentage;
+
+	TWeakObjectPtr<UWorld> WorldPtr;
+	TSharedPtr< class FAutomationViewExtension, ESPMode::ThreadSafe > AutomationViewExtension;
 };
 
 #endif
diff --git a/Engine/Source/Developer/FunctionalTesting/Public/AutomationScreenshotOptions.h b/Engine/Source/Developer/FunctionalTesting/Public/AutomationScreenshotOptions.h
index 12f092b16d2c..43a568aa1fa1 100644
--- a/Engine/Source/Developer/FunctionalTesting/Public/AutomationScreenshotOptions.h
+++ b/Engine/Source/Developer/FunctionalTesting/Public/AutomationScreenshotOptions.h
@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "UObject/ObjectMacros.h"
+#include "AutomationViewSettings.h"
 #include "AutomationScreenshotOptions.generated.h"
 
 UENUM(BlueprintType)
@@ -73,8 +74,11 @@ public:
 	FAutomationScreenshotOptions()
 		: Resolution(ForceInit)
 		, Delay(0.2f)
+		, bOverride_OverrideTimeTo(false)
+		, OverrideTimeTo(0.0f)
 		, bDisableNoisyRenderingFeatures(true)
 		, bDisableTonemapping(true)
+		, ViewSettings(nullptr)
 		, VisualizeBuffer(NAME_None)
 		, Tolerance(EComparisonTolerance::Zero)
 		, ToleranceAmount()
@@ -88,8 +92,11 @@ public:
 	FAutomationScreenshotOptions(EComparisonTolerance InTolerance)
 		: Resolution(ForceInit)
 		, Delay(0.2f)
+		, bOverride_OverrideTimeTo(false)
+		, OverrideTimeTo(0.0f)
 		, bDisableNoisyRenderingFeatures(true)
 		, bDisableTonemapping(true)
+		, ViewSettings(nullptr)
 		, VisualizeBuffer(NAME_None)
 		, Tolerance(InTolerance)
 		, ToleranceAmount()
@@ -114,6 +121,17 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Screenshot")
 	float Delay;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Overrides, meta = (PinHiddenByDefault, InlineEditConditionToggle))
+	bool bOverride_OverrideTimeTo;
+
+	/**
+	 * Overrides World Time, Real Time to the value provided.  Sets Delta Time to 0.  Only
+	 * affects the time being sent to the render thread and materials.  The time accumulating
+	 * on the game thread is unaffected.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Screenshot", meta=(editcondition = "bOverride_OverrideTimeTo"))
+	float OverrideTimeTo;
+
 	/**
 	 * Disables Anti-Aliasing, Motion Blur, Screen Space Reflections, Eye Adaptation, Tonemapper and Contact
 	 * Shadows, because those features contribute a lot to the noise in the final rendered image.  If you're
@@ -123,12 +141,19 @@ public:
 	bool bDisableNoisyRenderingFeatures;
 
 	/**
-	 * Disables Eye Adaptation and swaps Tonemapper to fixed gamma curve. Should generally be on unless
-	 * testing tonemapping or other post-processing results
+	 * Disables Eye Adaptation and sets Tonemapper to fixed gamma curve. Should generally be on unless
+	 * testing tone mapping or other post-processing results
 	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Screenshot")
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Screenshot", meta=(DisplayName = "Fixed Exposure"))
 	bool bDisableTonemapping;
 
+	/**
+	 * Assign custom view settings to control which rendering options we allow on while taking the
+	 * screenshot.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Screenshot")
+	UAutomationViewSettings* ViewSettings;
+
 	/**
 	 * Allows you to screenshot a buffer other than the default final lit scene image.  Useful if you're
 	 * trying to build a test for a specific GBuffer, that may be harder to tell if errors are introduced
diff --git a/Engine/Source/Developer/FunctionalTesting/Public/AutomationViewSettings.h b/Engine/Source/Developer/FunctionalTesting/Public/AutomationViewSettings.h
new file mode 100644
index 000000000000..183bf05da9eb
--- /dev/null
+++ b/Engine/Source/Developer/FunctionalTesting/Public/AutomationViewSettings.h
@@ -0,0 +1,56 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Engine/DataAsset.h"
+
+#include "AutomationViewSettings.generated.h"
+
+UCLASS(BlueprintType)
+class UAutomationViewSettings : public UDataAsset
+{
+	GENERATED_BODY()
+	
+public:
+	UAutomationViewSettings()
+		: AntiAliasing(true)
+		, MotionBlur(true)
+		, TemporalAA(true)
+		, ScreenSpaceReflections(true)
+		, ScreenSpaceAO(true)
+		, DistanceFieldAO(true)
+		, ContactShadows(true)
+		, EyeAdaptation(true)
+		, Bloom(true)
+	{
+	}
+
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool AntiAliasing;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool MotionBlur;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool TemporalAA;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool ScreenSpaceReflections;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool ScreenSpaceAO;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool DistanceFieldAO;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool ContactShadows;
+	
+	UPROPERTY(EditAnywhere, Category="Rendering")
+	bool EyeAdaptation;
+
+	UPROPERTY(EditAnywhere, Category = "Rendering")
+	bool Bloom;
+};
diff --git a/Engine/Source/Developer/FunctionalTesting/Public/TakeScreenshotAfterTimeLatentAction.h b/Engine/Source/Developer/FunctionalTesting/Public/TakeScreenshotAfterTimeLatentAction.h
index 843c370e2822..711b1a7cfa19 100644
--- a/Engine/Source/Developer/FunctionalTesting/Public/TakeScreenshotAfterTimeLatentAction.h
+++ b/Engine/Source/Developer/FunctionalTesting/Public/TakeScreenshotAfterTimeLatentAction.h
@@ -11,7 +11,7 @@ struct FLatentActionInfo;
 class FTakeScreenshotAfterTimeLatentAction : public FPendingLatentAction
 {
 public:
-	FTakeScreenshotAfterTimeLatentAction(const FLatentActionInfo& LatentInfo, const FString& InScreenshotName, FAutomationScreenshotOptions InOptions);
+	FTakeScreenshotAfterTimeLatentAction(const FLatentActionInfo& LatentInfo, const FString& InScreenshotName, const FString& InNotes, FAutomationScreenshotOptions InOptions);
 	virtual ~FTakeScreenshotAfterTimeLatentAction();
 
 	virtual void UpdateOperation(FLatentResponse& Response) override;
@@ -29,6 +29,7 @@ private:
 	int32 OutputLink;
 	FWeakObjectPtr CallbackTarget;
 	FString ScreenshotName;
+	FString Notes;
 	float SecondsRemaining;
 	bool IssuedScreenshotCapture;
 	bool TakenScreenshot;
diff --git a/Engine/Source/Developer/GameplayDebugger/Public/GameplayDebuggerConfig.h b/Engine/Source/Developer/GameplayDebugger/Public/GameplayDebuggerConfig.h
index 2464794263a8..ec75edb0b551 100644
--- a/Engine/Source/Developer/GameplayDebugger/Public/GameplayDebuggerConfig.h
+++ b/Engine/Source/Developer/GameplayDebugger/Public/GameplayDebuggerConfig.h
@@ -68,9 +68,12 @@ struct FGameplayDebuggerCategoryConfig
 	UPROPERTY(EditAnywhere, Category = Settings, EditFixedSize)
 	TArray<FGameplayDebuggerInputConfig> InputHandlers;
 
-	FGameplayDebuggerCategoryConfig() :
-		ActiveInGame(EGameplayDebuggerOverrideMode::UseDefault), ActiveInSimulate(EGameplayDebuggerOverrideMode::UseDefault),
-		Hidden(EGameplayDebuggerOverrideMode::UseDefault), bOverrideSlotIdx(false)
+	FGameplayDebuggerCategoryConfig()
+		: SlotIdx(0)
+		, ActiveInGame(EGameplayDebuggerOverrideMode::UseDefault)
+		, ActiveInSimulate(EGameplayDebuggerOverrideMode::UseDefault)
+		, Hidden(EGameplayDebuggerOverrideMode::UseDefault)
+		, bOverrideSlotIdx(false)
 	{}
 };
 
diff --git a/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODProxyProcessor.cpp b/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODProxyProcessor.cpp
index ad641ea07779..d43ad642469a 100644
--- a/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODProxyProcessor.cpp
+++ b/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODProxyProcessor.cpp
@@ -13,6 +13,9 @@
 #include "Logging/TokenizedMessage.h"
 #include "Logging/MessageLog.h"
 #include "Misc/UObjectToken.h"
+#include "Engine/HLODProxy.h"
+#include "HierarchicalLOD.h"
+#include "Algo/Transform.h"
 
 FHierarchicalLODProxyProcessor::FHierarchicalLODProxyProcessor()
 {
@@ -32,22 +35,23 @@ FHierarchicalLODProxyProcessor::~FHierarchicalLODProxyProcessor()
 
 bool FHierarchicalLODProxyProcessor::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FHierarchicalLODProxyProcessor_Tick);
+
 	FScopeLock Lock(&StateLock);
 
 	while (ToProcessJobs.Num())
 	{
 		FProcessData* Data = ToProcessJobs.Pop();
 		UStaticMesh* MainMesh = nullptr;		
-		for (UObject* AssetObject : Data->AssetObjects)
+		for (TStrongObjectPtr<UObject>& AssetObject : Data->AssetObjects)
 		{
 			// Check if this is the generated proxy (static-)mesh
-			UStaticMesh* StaticMesh = Cast<UStaticMesh>(AssetObject);
+			UStaticMesh* StaticMesh = Cast<UStaticMesh>(AssetObject.Get());
 			if (StaticMesh)
 			{
 				check(StaticMesh != nullptr);
 				MainMesh = StaticMesh;
 			}
-			AssetObject->RemoveFromRoot();
 		}
 		check(MainMesh != nullptr);
 
@@ -57,10 +61,13 @@ bool FHierarchicalLODProxyProcessor::Tick(float DeltaTime)
 		MainMesh->PostEditChange();
 
 		// Set new static mesh, location and sub-objects (UObjects)
+		bool bDirtyPackage = false;
+		UStaticMesh* PreviousStaticMesh = Data->LODActor->GetStaticMeshComponent()->GetStaticMesh();
+		bDirtyPackage |= (PreviousStaticMesh != MainMesh);
 		Data->LODActor->SetStaticMesh(MainMesh);
+		bDirtyPackage |= (Data->LODActor->GetActorLocation() != FVector::ZeroVector);
 		Data->LODActor->SetActorLocation(FVector::ZeroVector);
-		Data->LODActor->SubObjects = Data->AssetObjects;
-
+		
 		// Check resulting mesh and give a warning if it exceeds the vertex / triangle cap for certain platforms
 		FProjectStatus ProjectStatus;
 		if (IProjectManager::Get().QueryStatusForCurrentProject(ProjectStatus) && (ProjectStatus.IsTargetPlatformSupported(TEXT("Android")) || ProjectStatus.IsTargetPlatformSupported(TEXT("IOS"))))
@@ -84,26 +91,46 @@ bool FHierarchicalLODProxyProcessor::Tick(float DeltaTime)
 		FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
 		IHierarchicalLODUtilities* Utilities = Module.GetUtilities();
 		
+		float DrawDistance;
 		if (Data->LODSetup.bUseOverrideDrawDistance)
 		{
-			Data->LODActor->SetDrawDistance(Data->LODSetup.OverrideDrawDistance);
+			DrawDistance = Data->LODSetup.OverrideDrawDistance;
 		}
 		else
 		{
-			Data->LODActor->SetDrawDistance(Utilities->CalculateDrawDistanceFromScreenSize(Bounds.SphereRadius, Data->LODSetup.TransitionScreenSize, ProjectionMatrix));
+			DrawDistance = Utilities->CalculateDrawDistanceFromScreenSize(Bounds.SphereRadius, Data->LODSetup.TransitionScreenSize, ProjectionMatrix);
 		}
 		
+		bDirtyPackage |= (Data->LODActor->GetDrawDistance() != DrawDistance);
+		Data->LODActor->SetDrawDistance(DrawDistance);
+
+		Data->LODActor->DetermineShadowingFlags();
 		Data->LODActor->UpdateSubActorLODParents();
 
-		// Freshly build so mark not dirty
-		Data->LODActor->SetIsDirty(false);
+		// Link proxy to actor
+		UHLODProxy* PreviousProxy = Data->LODActor->GetProxy();
+		Data->Proxy->AddMesh(Data->LODActor, MainMesh, UHLODProxy::GenerateKeyForActor(Data->LODActor));
+		bDirtyPackage |= (Data->LODActor->GetProxy() != PreviousProxy);
+
+		if(bDirtyPackage)
+		{
+			Data->LODActor->MarkPackageDirty();
+		}
+
+		// Clean out standalone meshes from the proxy package as we are about to GC, and mesh merging creates assets that are 
+		// supposed to be standalone
+		Utilities->CleanStandaloneAssetsInPackage(Data->Proxy->GetOutermost());
+
+		// Collect garbage to clean up old unreferenced data in the HLOD package
+		CollectGarbage(GARBAGE_COLLECTION_KEEPFLAGS);
+
 		delete Data;
 	}
 
 	return true;
 }
 
-FGuid FHierarchicalLODProxyProcessor::AddProxyJob(ALODActor* InLODActor, const FHierarchicalSimplification& LODSetup)
+FGuid FHierarchicalLODProxyProcessor::AddProxyJob(ALODActor* InLODActor, UHLODProxy* InProxy, const FHierarchicalSimplification& LODSetup)
 {
 	FScopeLock Lock(&StateLock);
 	check(InLODActor);
@@ -112,6 +139,7 @@ FGuid FHierarchicalLODProxyProcessor::AddProxyJob(ALODActor* InLODActor, const F
 	// Set up processing data
 	FProcessData* Data = new FProcessData();
 	Data->LODActor = InLODActor;
+	Data->Proxy = InProxy;
 	Data->LODSetup = LODSetup;	
 
 	JobActorMap.Add(JobGuid, Data);
@@ -132,7 +160,7 @@ void FHierarchicalLODProxyProcessor::ProcessProxy(const FGuid InGuid, TArray<UOb
 		JobActorMap.Remove(InGuid);
 		if (Data && Data->LODActor && InAssetsToSync.Num())
 		{
-			Data->AssetObjects = InAssetsToSync;
+			Algo::Transform(InAssetsToSync, Data->AssetObjects, [](UObject* InItem){ return TStrongObjectPtr<UObject>(InItem); });
 			ToProcessJobs.Push(Data);
 		}
 	}
diff --git a/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODUtilities.cpp b/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODUtilities.cpp
index f327023cafa9..fafeb0b589db 100644
--- a/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODUtilities.cpp
+++ b/Engine/Source/Developer/HierarchicalLODUtilities/Private/HierarchicalLODUtilities.cpp
@@ -40,6 +40,8 @@
 #include "IMeshReductionManagerModule.h"
 #include "MeshMergeModule.h"
 #include "Algo/Transform.h"
+#include "Engine/HLODProxy.h"
+#include "HierarchicalLOD.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogHierarchicalLODUtilities, Verbose, All);
 
@@ -47,21 +49,7 @@ DEFINE_LOG_CATEGORY_STATIC(LogHierarchicalLODUtilities, Verbose, All);
 
 void FHierarchicalLODUtilities::ExtractStaticMeshComponentsFromLODActor(AActor* Actor, TArray<UStaticMeshComponent*>& InOutComponents)
 {
-	ALODActor* LODActor = CastChecked<ALODActor>(Actor);
-	for (AActor* ChildActor : LODActor->SubActors)
-	{
-		TArray<UStaticMeshComponent*> ChildComponents;
-		if (ChildActor->IsA<ALODActor>())
-		{
-			ExtractStaticMeshComponentsFromLODActor(ChildActor, ChildComponents);
-		}
-		else
-		{
-			ChildActor->GetComponents<UStaticMeshComponent>(ChildComponents);
-		}
-
-		InOutComponents.Append(ChildComponents);
-	}
+	UHLODProxy::ExtractStaticMeshComponentsFromLODActor(Cast<ALODActor>(Actor), InOutComponents);
 }
 
 void FHierarchicalLODUtilities::ExtractSubActorsFromLODActor(AActor* Actor, TArray<AActor*>& InOutActors)
@@ -93,28 +81,106 @@ float FHierarchicalLODUtilities::CalculateDrawDistanceFromScreenSize(const float
 	return ComputeBoundsDrawDistance(ScreenSize, SphereRadius, ProjectionMatrix);
 }
 
-UPackage* FHierarchicalLODUtilities::CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex)
+static FString GetHLODProxyName(const ULevel* InLevel, const uint32 InHLODLevelIndex)
 {
-	checkf(InLevel != nullptr, TEXT("Invalid Level supplied"));
+	UPackage* LevelOuterMost = InLevel->GetOutermost();
 
-	UPackage* HLODPackage = nullptr;
+	const FString BaseName = FPackageName::GetShortName(LevelOuterMost->GetPathName());	
+	return FString::Printf(TEXT("%s_%i_HLOD"), *BaseName, InHLODLevelIndex);
+}
+
+static FString GetHLODPackageName(const ULevel* InLevel, const uint32 InHLODLevelIndex, FString& InOutHLODProxyName)
+{
 	UPackage* LevelOuterMost = InLevel->GetOutermost();
 
 	const FString PathName = FPackageName::GetLongPackagePath(LevelOuterMost->GetPathName());
 	const FString BaseName = FPackageName::GetShortName(LevelOuterMost->GetPathName());	
-	const FString HLODLevelPackageName = GetDefault<UEditorExperimentalSettings>()->bUseNewHLODPackageNamingConvention ? FString::Printf(TEXT("%s/HLOD/%s_%i_HLOD"), *PathName, *BaseName, HLODLevelIndex) : FString::Printf(TEXT("%s/HLOD/%s_HLOD"), *PathName, *BaseName);
-	HLODPackage = CreatePackage(NULL, *HLODLevelPackageName);
+	InOutHLODProxyName = GetHLODProxyName(InLevel, InHLODLevelIndex);
+	return FString::Printf(TEXT("%s/HLOD/%s"), *PathName, *InOutHLODProxyName);
+}
+
+void FHierarchicalLODUtilities::CleanStandaloneAssetsInPackage(UPackage* InPackage)
+{
+	TArray<UObject*> Objects;
+	GetObjectsWithOuter(InPackage, Objects);
+	for(UObject* PackageObject : Objects)
+	{
+		if(PackageObject->HasAnyFlags(RF_Standalone))
+		{
+			if( PackageObject->IsA<UStaticMesh>() ||
+				PackageObject->IsA<UTexture>() ||
+				PackageObject->IsA<UMaterialInterface>())
+			{
+				PackageObject->ClearFlags(RF_Standalone);
+			}
+		}
+	}
+}
+
+UHLODProxy* FHierarchicalLODUtilities::CreateOrRetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex)
+{
+	UPackage* HLODPackage = CreateOrRetrieveLevelHLODPackage(InLevel, HLODLevelIndex);
+
+	// check if our asset exists
+	const FString HLODProxyName = GetHLODProxyName(InLevel, HLODLevelIndex);
+	UHLODProxy* Proxy = FindObject<UHLODProxy>(HLODPackage, *HLODProxyName);
+	if(Proxy == nullptr)
+	{
+		// make sure that the package doesnt have any standalone meshes etc. (i.e. this is an old style package)
+		CleanStandaloneAssetsInPackage(HLODPackage);
+
+		// create the new asset
+		Proxy = NewObject<UHLODProxy>(HLODPackage, *HLODProxyName, RF_Public | RF_Standalone);
+		Proxy->SetMap(UWorld::FindWorldInPackage(InLevel->GetOutermost()));
+	}
+
+	return Proxy;	
+}
+
+UPackage* FHierarchicalLODUtilities::CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex)
+{
+	checkf(InLevel != nullptr, TEXT("Invalid Level supplied"));
+
+	FString HLODProxyName;
+	const FString HLODLevelPackageName = GetHLODPackageName(InLevel, HLODLevelIndex, HLODProxyName);
+
+	// Find existing package
+	bool bCreatedNewPackage = false;
+	UPackage* HLODPackage = CreatePackage(nullptr, *HLODLevelPackageName);
 	HLODPackage->FullyLoad();
-	HLODPackage->Modify();
-	
+
 	// Target level filename
 	const FString HLODLevelFileName = FPackageName::LongPackageNameToFilename(HLODLevelPackageName);
 	// This is a hack to avoid save file dialog when we will be saving HLOD map package
 	HLODPackage->FileName = FName(*HLODLevelFileName);
 
-	return HLODPackage;	
+	return HLODPackage;
 }
 
+UHLODProxy* FHierarchicalLODUtilities::RetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex)
+{
+	checkf(InLevel != nullptr, TEXT("Invalid Level supplied"));
+	FString HLODProxyName;
+	const FString HLODLevelPackageName = GetHLODPackageName(InLevel, HLODLevelIndex, HLODProxyName);
+	UPackage* HLODPackage = FindPackage(nullptr, *HLODLevelPackageName);
+	if(HLODPackage)
+	{
+		HLODPackage->FullyLoad();
+		return FindObject<UHLODProxy>(HLODPackage, *HLODProxyName);
+	}
+
+	return nullptr;
+}
+
+UPackage* FHierarchicalLODUtilities::RetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex)
+{
+	UHLODProxy* Proxy = RetrieveLevelHLODProxy(InLevel, HLODLevelIndex);
+	if(Proxy)
+	{
+		return Proxy->GetOutermost();
+	}
+	return nullptr;
+}
 
 UPackage* FHierarchicalLODUtilities::CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel)
 {
@@ -142,89 +208,32 @@ UPackage* FHierarchicalLODUtilities::CreateOrRetrieveLevelHLODPackage(const ULev
 
 bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor, UPackage* AssetsOuter, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial)
 {
-	if (AssetsOuter && LODActor)
+	UHLODProxy* Proxy = FindObject<UHLODProxy>(AssetsOuter, *GetHLODProxyName(CastChecked<ULevel>(LODActor->GetOuter()), LODActor->LODLevel - 1));
+	return BuildStaticMeshForLODActor(LODActor, Proxy, LODSetup, InBaseMaterial);
+}
+
+bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor, UHLODProxy* Proxy, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial)
+{
+	if (Proxy && LODActor)
 	{
 		UE_LOG(LogHierarchicalLODUtilities, Log, TEXT("Building Proxy Mesh for Cluster %s"), *LODActor->GetName());
 		const FScopedTransaction Transaction(LOCTEXT("UndoAction_BuildProxyMesh", "Building Proxy Mesh for Cluster"));
-		LODActor->Modify();
 
-		// Delete actor assets before generating new ones
-		FHierarchicalLODUtilities::DestroyClusterData(LODActor);
+		// Pass false here and dirty package later if values have changed
+		LODActor->Modify(false);
+		Proxy->Modify();
+
+		// Clean out the proxy as we are rebuilding meshes
+		Proxy->Clean();
+		UPackage* AssetsOuter = Proxy->GetOutermost();
 
 		TArray<UPrimitiveComponent*> AllComponents;
-		{
-			for (AActor* Actor : LODActor->SubActors)
-			{
-				TArray<UStaticMeshComponent*> Components;
-
-				if (Actor->IsA<ALODActor>())
-				{
-					ExtractStaticMeshComponentsFromLODActor(Actor, Components);
-				}
-				else
-				{
-					Actor->GetComponents<UStaticMeshComponent>(Components);
-				}
-
-				Components.RemoveAll([&](UStaticMeshComponent* Val)
-				{
-					return !Val->ShouldGenerateAutoLOD(LODActor->LODLevel - 1);
-				});
-
-				AllComponents.Append(Components);
-			}
-		}
+		UHLODProxy::ExtractComponents(LODActor, AllComponents);
 
 		// it shouldn't even have come here if it didn't have any staticmesh
 		if (ensure(AllComponents.Num() > 0))
 		{
-			// In case we don't have outer generated assets should have same path as LOD level
-			const FString AssetsPath = AssetsOuter->GetName() + TEXT("/");
-
-			// Helper for recursive traversing LODActors to retrieve a semi deterministic first AActor for resulting asset naming 
-			auto RecursiveFindFirstActor = [&](ALODActor* InLODActor)
-			{
-				AActor* FirstActor = InLODActor->SubActors.IsValidIndex(0) ? InLODActor->SubActors[0] : nullptr;
-				while (FirstActor != nullptr && FirstActor->IsA<ALODActor>())
-				{
-					ALODActor* SubLODActor = Cast<ALODActor>(FirstActor);
-					if (SubLODActor)
-					{
-						SubLODActor->SubActors.IsValidIndex(0) ? SubLODActor->SubActors[0] : nullptr;
-					}
-					else
-					{
-						// Unable to find a valid actor
-						FirstActor = nullptr;
-					}
-				}
-				return FirstActor;
-			};
-
-			// Retrieve first 'valid' AActor (non ALODActor)
-			const AActor* FirstActor = [&]()
-			{
-				AActor* FirstValidActor = nullptr;
-
-				for (int32 Index = 0; Index < LODActor->SubActors.Num(); ++Index)
-				{
-					AActor* SubActor = LODActor->SubActors[Index];
-
-					if (ALODActor* SubLODActor = Cast<ALODActor>(SubActor))
-					{
-						SubActor = RecursiveFindFirstActor(SubLODActor);						
-					}
-
-					if (SubActor != nullptr)
-					{
-						FirstValidActor = SubActor;
-						break;
-					}										
-				}
-
-				check(FirstValidActor);
-				return FirstValidActor;
-			}();
+			const AActor* FirstActor = UHLODProxy::FindFirstActor(LODActor);
 
 			TArray<UObject*> OutAssets;
 			FVector OutProxyLocation = FVector::ZeroVector;
@@ -237,7 +246,7 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 			const IMeshMergeUtilities& MeshMergeUtilities = FModuleManager::Get().LoadModuleChecked<IMeshMergeModule>("MeshMergeUtilities").GetUtilities();
 			// should give unique name, so use level + actor name
 			
-			const FString PackageName = GetDefault<UEditorExperimentalSettings>()->bUseNewHLODPackageNamingConvention ? FString::Printf(TEXT("LOD_%s_%i_%s"), *FirstActor->GetOutermost()->GetName(), LODActor->LODLevel - 1, *FirstActor->GetName()) : FString::Printf(TEXT("LOD_%s"), *FirstActor->GetName());
+			const FString PackageName = FString::Printf(TEXT("LOD_%s_%i_%s"), *FirstActor->GetOutermost()->GetName(), LODActor->LODLevel - 1, *FirstActor->GetName());
 			if (bHasMeshReductionCapableModule && LODSetup.bSimplifyMesh)
 			{
 				FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
@@ -261,7 +270,7 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 					OverrideLODSetup.TransitionScreenSize = LODActor->TransitionScreenSize;
 				}
 
-				FGuid JobID = Processor->AddProxyJob(LODActor, OverrideLODSetup);
+				FGuid JobID = Processor->AddProxyJob(LODActor, Proxy, OverrideLODSetup);
 
 				TArray<UStaticMeshComponent*> StaticMeshComponents;
 				Algo::Transform(AllComponents, StaticMeshComponents, [](UPrimitiveComponent* InPrimitiveComponent) { return Cast<UStaticMeshComponent>(InPrimitiveComponent); });
@@ -277,6 +286,9 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 					MergeSettings.MaterialSettings = LODActor->MaterialSettings;
 				}
 
+				// update LOD parents before rebuild to ensure they are valid when mesh merge extensions are called.
+				LODActor->UpdateSubActorLODParents();
+
 				MeshMergeUtilities.MergeComponentsToStaticMesh(AllComponents, FirstActor->GetWorld(), MergeSettings, InBaseMaterial, AssetsOuter, PackageName, OutAssets, OutProxyLocation, LODSetup.TransitionScreenSize, true);
 
 				// set staticmesh
@@ -298,9 +310,12 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 				// make sure the mesh won't affect navmesh generation
 				MainMesh->MarkAsNotHavingNavigationData();
 
+				bool bDirtyPackage = false;
+				UStaticMesh* PreviousStaticMesh = LODActor->GetStaticMeshComponent()->GetStaticMesh();
+				bDirtyPackage |= (MainMesh != PreviousStaticMesh);
 				LODActor->SetStaticMesh(MainMesh);
+				bDirtyPackage |= (LODActor->GetActorLocation() != OutProxyLocation);
 				LODActor->SetActorLocation(OutProxyLocation);
-				LODActor->SubObjects = OutAssets;
 
 				// Check resulting mesh and give a warning if it exceeds the vertex / triangle cap for certain platforms
 				FProjectStatus ProjectStatus;
@@ -319,19 +334,37 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 				static const FMatrix ProjectionMatrix = FPerspectiveMatrix(FOVRad, 1920, 1080, 0.01f);
 				FBoxSphereBounds Bounds = LODActor->GetStaticMeshComponent()->CalcBounds(FTransform());
 
+				float DrawDistance;
 				if (LODSetup.bUseOverrideDrawDistance)
 				{
-					LODActor->SetDrawDistance(LODSetup.OverrideDrawDistance);
+					DrawDistance = LODSetup.OverrideDrawDistance;
 				}
 				else
 				{
-					LODActor->SetDrawDistance(CalculateDrawDistanceFromScreenSize(Bounds.SphereRadius, LODSetup.TransitionScreenSize, ProjectionMatrix));
+					DrawDistance = CalculateDrawDistanceFromScreenSize(Bounds.SphereRadius, LODSetup.TransitionScreenSize, ProjectionMatrix);
 				}
-			
-				LODActor->UpdateSubActorLODParents();
 
-				// Freshly build so mark not dirty
-				LODActor->SetIsDirty(false);
+				bDirtyPackage |= (LODActor->GetDrawDistance() != DrawDistance);
+				LODActor->SetDrawDistance(DrawDistance);
+			
+				LODActor->DetermineShadowingFlags();
+
+				// Link proxy to actor
+				UHLODProxy* PreviousProxy = LODActor->GetProxy();
+				Proxy->AddMesh(LODActor, MainMesh, UHLODProxy::GenerateKeyForActor(LODActor));
+				bDirtyPackage |= (LODActor->GetProxy() != PreviousProxy);
+
+				if(bDirtyPackage)
+				{
+					LODActor->MarkPackageDirty();
+				}
+
+				// Clean out standalone meshes from the proxy package as we are about to GC, and mesh merging creates assets that are 
+				// supposed to be standalone
+				CleanStandaloneAssetsInPackage(AssetsOuter);
+
+				// Collect garbage to clean up old unreferenced data in the HLOD package
+				CollectGarbage(GARBAGE_COLLECTION_KEEPFLAGS);
 
 				return true;
 			}
@@ -344,7 +377,9 @@ bool FHierarchicalLODUtilities::BuildStaticMeshForLODActor(ALODActor* LODActor,
 {
 	UMaterialInterface* BaseMaterial = LoadObject<UMaterialInterface>(NULL, TEXT("/Engine/EngineMaterials/BaseFlattenMaterial.BaseFlattenMaterial"), NULL, LOAD_None, NULL);
 	check(BaseMaterial);
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
 	return BuildStaticMeshForLODActor(LODActor, AssetsOuter, LODSetup, BaseMaterial);
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
 }
 
 EClusterGenerationError FHierarchicalLODUtilities::ShouldGenerateCluster(AActor* Actor, const int32 HLODLevelIndex)
@@ -461,9 +496,6 @@ void FHierarchicalLODUtilities::DestroyCluster(ALODActor* InActor)
 		InActor->RemoveSubActor(SubActor);
 	}
 
-	// Also destroy the cluster's data
-	DestroyClusterData(InActor);
-
 	World->DestroyActor(InActor);
 
 	if (ParentLOD != nullptr && !ParentLOD->HasAnySubActors())
@@ -474,24 +506,7 @@ void FHierarchicalLODUtilities::DestroyCluster(ALODActor* InActor)
 
 void FHierarchicalLODUtilities::DestroyClusterData(ALODActor* InActor)
 {
-	TArray<UObject*> AssetsToDelete;
-	AssetsToDelete.Append(InActor->SubObjects);
-	InActor->SubObjects.Empty();
 
-	for (UObject* AssetObject : AssetsToDelete)
-	{
-		if (AssetObject)
-		{
-#if WITH_EDITOR
-			// Close possible open editors using this asset	
-			FAssetEditorManager::Get().CloseAllEditorsForAsset(AssetObject);
-			InActor->PreviousSubObjects.Add(AssetObject);
-#endif // WITH_EDITOR
-		}
-	}
-
-	// Set Static Mesh to null since there isn't a mesh anymore
-	InActor->GetStaticMeshComponent()->SetStaticMesh(nullptr);
 }
 
 ALODActor* FHierarchicalLODUtilities::CreateNewClusterActor(UWorld* InWorld, const int32 InLODLevel, AWorldSettings* WorldSettings)
@@ -862,7 +877,6 @@ void FHierarchicalLODUtilities::HandleActorModified(AActor* InActor)
 	{
 		// So something in the actor changed that require use to flag the cluster as dirty
 		ParentActor->Modify();
-		ParentActor->SetIsDirty(true);
 	}
 }
 
diff --git a/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODProxyProcessor.h b/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODProxyProcessor.h
index 8d008ed5974e..082414a76a85 100644
--- a/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODProxyProcessor.h
+++ b/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODProxyProcessor.h
@@ -8,8 +8,10 @@
 #include "GameFramework/WorldSettings.h"
 #include "MeshUtilities.h"
 #include "IMeshReductionInterfaces.h"
+#include "UObject/StrongObjectPtr.h"
 
 class ALODActor;
+class UHLODProxy;
 
 class HIERARCHICALLODUTILITIES_API FHierarchicalLODProxyProcessor : public FTickerObjectBase
 {
@@ -24,10 +26,11 @@ public:
 	/**
 	* AddProxyJob
 	* @param InLODActor - LODActor for which the mesh will be generated
+	* @param InProxy - The proxy mesh used to store the mesh
 	* @param LODSetup - Simplification settings structure
 	* @return FGuid - Guid for the job
 	*/
-	FGuid AddProxyJob(ALODActor* InLODActor, const FHierarchicalSimplification& LODSetup);
+	FGuid AddProxyJob(ALODActor* InLODActor, UHLODProxy* InProxy, const FHierarchicalSimplification& LODSetup);
 	
 	/** Callback function used for processing finished mesh generation jobs	
 	* @param InGuid - Guid of the finished job
@@ -54,8 +57,10 @@ protected:
 	{
 		/** LODActor instance for which a proxy is generated */
 		ALODActor* LODActor;
+		/** Proxy mesh where the rendering data is stored */
+		UHLODProxy* Proxy;
 		/** Array with resulting asset objects from proxy generation (StaticMesh/Materials/Textures) */
-		TArray<class UObject*> AssetObjects;
+		TArray<TStrongObjectPtr<UObject>> AssetObjects;
 		/** HLOD settings structure used for creating the proxy */
 		FHierarchicalSimplification LODSetup;
 	};
diff --git a/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODUtilities.h b/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODUtilities.h
index 3920f73d330d..55e881c3f460 100644
--- a/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODUtilities.h
+++ b/Engine/Source/Developer/HierarchicalLODUtilities/Public/HierarchicalLODUtilities.h
@@ -22,6 +22,7 @@ class FHierarchicalLODUtilities : public IHierarchicalLODUtilities
 {
 public:
 	~FHierarchicalLODUtilities() {}
+	DEPRECATED(4.20, "Please use UHLODProxy::ExtractStaticMeshComponentsFromLODActor")
 	virtual void ExtractStaticMeshComponentsFromLODActor(AActor* Actor, TArray<UStaticMeshComponent*>& InOutComponents) override;
 	virtual void ExtractSubActorsFromLODActor(AActor* Actor, TArray<AActor*>& InOutActors) override;
 	virtual float CalculateScreenSizeFromDrawDistance(const float SphereRadius, const FMatrix& ProjectionMatrix, const float Distance) override;
@@ -29,12 +30,18 @@ public:
 	DEPRECATED(4.20, "This function signature is deprecated")
 	virtual UPackage* CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel) override;
 	virtual UPackage* CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex) override;
+	virtual UPackage* RetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex) override;
+	virtual UHLODProxy* CreateOrRetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex) override;
+	virtual UHLODProxy* RetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex) override;
 	DEPRECATED(4.20, "Use different signature containing BaseMaterial parameter")
 	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UPackage* AssetsOuter, const FHierarchicalSimplification& LODSetup) override;
+	DEPRECATED(4.20, "Use different signature using UHLODProxy")
 	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UPackage* AssetsOuter, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial) override;
+	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UHLODProxy* Proxy, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial) override;
 	virtual EClusterGenerationError ShouldGenerateCluster(AActor* Actor, const int32 HLODLevelIndex) override;
 	virtual ALODActor* GetParentLODActor(const AActor* InActor) override;
 	virtual void DestroyCluster(ALODActor* InActor) override;
+	DEPRECATED(4.20, "This function is no longer used")
 	virtual void DestroyClusterData(ALODActor* InActor) override;
 	virtual ALODActor* CreateNewClusterActor(UWorld* InWorld, const int32 InLODLevel, AWorldSettings* WorldSettings) override;
 	virtual ALODActor* CreateNewClusterFromActors(UWorld* InWorld, AWorldSettings* WorldSettings, const TArray<AActor*>& InActors, const int32 InLODLevel = 0) override;
@@ -55,5 +62,6 @@ public:
 	virtual AHierarchicalLODVolume* CreateVolumeForLODActor(ALODActor* InLODActor, UWorld* InWorld) override;
 	virtual void HandleActorModified(AActor* InActor) override;
 	virtual bool IsWorldUsedForStreaming(const UWorld* InWorld) override;
+	virtual void CleanStandaloneAssetsInPackage(UPackage* InPackage) override;
 };
 
diff --git a/Engine/Source/Developer/HierarchicalLODUtilities/Public/IHierarchicalLODUtilities.h b/Engine/Source/Developer/HierarchicalLODUtilities/Public/IHierarchicalLODUtilities.h
index 7c552ae03dd0..9558a5b1493f 100644
--- a/Engine/Source/Developer/HierarchicalLODUtilities/Public/IHierarchicalLODUtilities.h
+++ b/Engine/Source/Developer/HierarchicalLODUtilities/Public/IHierarchicalLODUtilities.h
@@ -13,6 +13,7 @@ class FStaticMeshRenderData;
 class ULevel;
 class UStaticMeshComponent;
 struct FHierarchicalSimplification;
+class UHLODProxy;
 
 enum class EClusterGenerationError : uint32
 {
@@ -65,6 +66,15 @@ public:
 	/** Creates or retrieves the HLOD package that is created for the given level */
 	virtual UPackage* CreateOrRetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex) = 0;
 
+	/** Retrieves the HLOD package that is created for the given level */
+	virtual UPackage* RetrieveLevelHLODPackage(const ULevel* InLevel, const uint32 HLODLevelIndex) = 0;
+
+	/** Creates or retrieves the HLOD proxy that is created for the given level */
+	virtual UHLODProxy* CreateOrRetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex) = 0;
+
+	/** Retrieves the HLOD proxy that is created for the given level */
+	virtual UHLODProxy* RetrieveLevelHLODProxy(const ULevel* InLevel, const uint32 HLODLevelIndex) = 0;
+
 	/**
 	* Builds a virtual mesh object for the given LODACtor
 	*
@@ -74,6 +84,7 @@ public:
 	*/
 	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UPackage* AssetsOuter, const FHierarchicalSimplification& LODSetup) = 0;
 	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UPackage* AssetsOuter, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial) = 0;
+	virtual bool BuildStaticMeshForLODActor(ALODActor* LODActor, UHLODProxy* Proxy, const FHierarchicalSimplification& LODSetup, UMaterialInterface* InBaseMaterial) = 0;
 	
 	/**
 	* Returns whether or not the given actor is eligible for creating a HLOD cluster creation
@@ -167,4 +178,10 @@ public:
 	* @param InWorld - World to check whether or not it is used as a streaming level
 	*/
 	virtual bool IsWorldUsedForStreaming(const UWorld* InWorld) = 0;
+
+	/** 
+	 * Cleans any standalone flags for meshes, textures and materials. This ensures that they get garbage collected when not referenced any more.
+	 * @param InPackage	The HLOD package to clean
+	 */
+	virtual void CleanStandaloneAssetsInPackage(UPackage* InPackage) = 0;
 };
diff --git a/Engine/Source/Developer/HotReload/Private/HotReload.cpp b/Engine/Source/Developer/HotReload/Private/HotReload.cpp
index 123d6a08041e..fda08e16b616 100644
--- a/Engine/Source/Developer/HotReload/Private/HotReload.cpp
+++ b/Engine/Source/Developer/HotReload/Private/HotReload.cpp
@@ -529,7 +529,7 @@ void FHotReloadModule::StartupModule()
 
 	FModuleManager::Get().OnModulesChanged().AddRaw(this, &FHotReloadModule::ModulesChangedCallback);
 
-	IPluginManager::Get().OnNewPluginMounted().AddRaw(this, &FHotReloadModule::PluginMountedCallback);
+	IPluginManager::Get().OnNewPluginCreated().AddRaw(this, &FHotReloadModule::PluginMountedCallback);
 }
 
 void FHotReloadModule::ShutdownModule()
@@ -1403,6 +1403,8 @@ void FHotReloadModule::ShutdownHotReloadWatcher()
 
 bool FHotReloadModule::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FHotReloadModule_Tick);
+
 	// We never want to block on a pending compile when checking compilation status during Tick().  We're
 	// just checking so that we can fire callbacks if and when compilation has finished.
 	// Ignored output variables
diff --git a/Engine/Source/Developer/IOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp b/Engine/Source/Developer/IOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp
index fc4e3cc2122d..0b85ef4432ae 100644
--- a/Engine/Source/Developer/IOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp
+++ b/Engine/Source/Developer/IOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp
@@ -1428,6 +1428,8 @@ const FSlateBrush* FIOSTargetSettingsCustomization::GetCertificateStatus() const
 
 bool FIOSTargetSettingsCustomization::UpdateStatusDelegate(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FIOSTargetSettingsCustomization_UpdateStatusDelegate);
+
 	if (IPPProcess.IsValid())
 	{
 		if (IPPProcess->Update())
diff --git a/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/IOSTargetPlatform.cpp b/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/IOSTargetPlatform.cpp
index a56e229f7386..9f3b3b313c21 100644
--- a/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/IOSTargetPlatform.cpp
+++ b/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/IOSTargetPlatform.cpp
@@ -275,6 +275,9 @@ int32 FIOSTargetPlatform::CheckRequirements(const FString& ProjectPath, bool bPr
 
 void FIOSTargetPlatform::PingNetworkDevices()
 {
+    //Only put this here in case we put in auto-detection of missing stats
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FIOSTargetPlatform_PingNetworkDevices);
+
 	// disabled for now because we find IOS devices from the USB, this is a relic from ULD, but it may be needed in the future
 /*	if (!MessageEndpoint.IsValid())
 	{
diff --git a/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/Windows/IOSDeviceHelperWindows.cpp b/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/Windows/IOSDeviceHelperWindows.cpp
index 912d596b7499..27c45ddcfd61 100644
--- a/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/Windows/IOSDeviceHelperWindows.cpp
+++ b/Engine/Source/Developer/IOS/IOSTargetPlatform/Private/Windows/IOSDeviceHelperWindows.cpp
@@ -339,6 +339,8 @@ static FTickerDelegate TickDelegate;
 
 bool FIOSDeviceHelper::MessageTickDelegate(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FIOSDeviceHelper_MessageTickDelegate);
+
 	for (int Index = 0; Index < NotificationMessages.Num(); ++Index)
 	{
 		FDeviceNotificationCallbackInformation cbi = NotificationMessages[Index];
diff --git a/Engine/Source/Developer/LauncherServices/Private/Launcher/LauncherWorker.cpp b/Engine/Source/Developer/LauncherServices/Private/Launcher/LauncherWorker.cpp
index 623c19549e4d..9eb808ec7346 100644
--- a/Engine/Source/Developer/LauncherServices/Private/Launcher/LauncherWorker.cpp
+++ b/Engine/Source/Developer/LauncherServices/Private/Launcher/LauncherWorker.cpp
@@ -678,7 +678,7 @@ FString FLauncherWorker::CreateUATCommand( const ILauncherProfileRef& InProfile,
 
 	if ( InProfile->IsIterateSharedCookedBuild() )
 	{
-		UATCommand += TEXT(" -iteratesharedcookedbuild");
+		UATCommand += TEXT(" -iteratesharedcookedbuild=usesyncedbuild");
 	}
 
 	if (InProfile->GetSkipCookingEditorContent())
diff --git a/Engine/Source/Developer/LauncherServices/Private/Profiles/LauncherProfile.h b/Engine/Source/Developer/LauncherServices/Private/Profiles/LauncherProfile.h
index e7d38398f50f..34bc050513d6 100644
--- a/Engine/Source/Developer/LauncherServices/Private/Profiles/LauncherProfile.h
+++ b/Engine/Source/Developer/LauncherServices/Private/Profiles/LauncherProfile.h
@@ -1474,15 +1474,18 @@ public:
 		FString Right;
 		while (CommandLine.Split(TEXT(" "), &Left, &Right))
 		{
-			FString Key;
-			FString Value;
-			if (!Left.Split(TEXT("="), &Key, &Value))
+			if(Left.Len() > 0)
 			{
-				Key = Left;
-				Value = TEXT("true");
+				FString Key;
+				FString Value;
+				if (!Left.Split(TEXT("="), &Key, &Value))
+				{
+					Key = Left;
+					Value = TEXT("true");
+				}
+				Key.RemoveFromStart(TEXT("-"));
+				RoleCommands.Add(Key, Value);
 			}
-			Key.RemoveFromStart(TEXT("-"));
-			RoleCommands.Add(Key, Value);
 			CommandLine = Right;
 		}
 		if (CommandLine.Len() > 0)
diff --git a/Engine/Source/Developer/Localization/Private/LocTextHelper.cpp b/Engine/Source/Developer/Localization/Private/LocTextHelper.cpp
index ed42f0d8f9b8..f1f6932e7223 100644
--- a/Engine/Source/Developer/Localization/Private/LocTextHelper.cpp
+++ b/Engine/Source/Developer/Localization/Private/LocTextHelper.cpp
@@ -246,7 +246,7 @@ bool FLocTextWordCounts::FromCSV(const FString& InCSVString, FText* OutError)
 
 			// Parse required data
 			FDateTime::Parse(CsvCells[DateTimeColumn], RowData.Timestamp);
-			Lex::FromString(RowData.SourceWordCount, CsvCells[WordCountColumn]);
+			LexFromString(RowData.SourceWordCount, CsvCells[WordCountColumn]);
 
 			// Parse per-culture data
 			for (const auto& PerCultureColumnPair : PerCultureColumns)
@@ -254,7 +254,7 @@ bool FLocTextWordCounts::FromCSV(const FString& InCSVString, FText* OutError)
 				if (CsvCells.IsValidIndex(PerCultureColumnPair.Value))
 				{
 					int32 PerCultureWordCount = 0;
-					Lex::FromString(PerCultureWordCount, CsvCells[PerCultureColumnPair.Value]);
+					LexFromString(PerCultureWordCount, CsvCells[PerCultureColumnPair.Value]);
 					RowData.PerCultureWordCounts.Add(PerCultureColumnPair.Key, PerCultureWordCount);
 				}
 			}
diff --git a/Engine/Source/Developer/Localization/Private/TextLocalizationResourceGenerator.cpp b/Engine/Source/Developer/Localization/Private/TextLocalizationResourceGenerator.cpp
index c87f96997c8d..efe72fa20394 100644
--- a/Engine/Source/Developer/Localization/Private/TextLocalizationResourceGenerator.cpp
+++ b/Engine/Source/Developer/Localization/Private/TextLocalizationResourceGenerator.cpp
@@ -18,7 +18,7 @@ bool FTextLocalizationResourceGenerator::GenerateLocMeta(const FLocTextHelper& I
 	return true;
 }
 
-bool FTextLocalizationResourceGenerator::GenerateLocRes(const FLocTextHelper& InLocTextHelper, const FString& InCultureToGenerate, const bool bSkipSourceCheck, const FString& InLocResID, FTextLocalizationResource& OutLocRes)
+bool FTextLocalizationResourceGenerator::GenerateLocRes(const FLocTextHelper& InLocTextHelper, const FString& InCultureToGenerate, const bool bSkipSourceCheck, const FTextLocalizationResourceId& InLocResID, FTextLocalizationResource& OutLocRes)
 {
 	// Add each manifest entry to the LocRes file
 	InLocTextHelper.EnumerateSourceTexts([&InLocTextHelper, &InCultureToGenerate, &bSkipSourceCheck, &InLocResID, &OutLocRes](TSharedRef<FManifestEntry> InManifestEntry) -> bool
@@ -31,12 +31,7 @@ bool FTextLocalizationResourceGenerator::GenerateLocRes(const FLocTextHelper& In
 			InLocTextHelper.GetRuntimeText(InCultureToGenerate, InManifestEntry->Namespace, Context.Key, Context.KeyMetadataObj, ELocTextExportSourceMethod::NativeText, InManifestEntry->Source, TranslationText, bSkipSourceCheck);
 
 			// Add this entry to the LocRes
-			FTextLocalizationResource::FKeysTable& KeyTable = OutLocRes.Namespaces.FindOrAdd(InManifestEntry->Namespace.GetString());
-			FTextLocalizationResource::FEntryArray& EntryArray = KeyTable.FindOrAdd(Context.Key.GetString());
-			FTextLocalizationResource::FEntry& NewEntry = EntryArray[EntryArray.AddDefaulted()];
-			NewEntry.LocResID = InLocResID;
-			NewEntry.SourceStringHash = FCrc::StrCrc32(*InManifestEntry->Source.Text);
-			NewEntry.LocalizedString = TranslationText.Text;
+			OutLocRes.AddEntry(InManifestEntry->Namespace.GetString(), Context.Key.GetString(), InManifestEntry->Source.Text, TranslationText.Text, InLocResID);
 		}
 
 		return true; // continue enumeration
@@ -147,14 +142,14 @@ bool FTextLocalizationResourceGenerator::GenerateLocResAndUpdateLiveEntriesFromC
 		}
 	}
 
-	TArray<FTextLocalizationResource> TextLocalizationResources;
+	TArray<TSharedPtr<FTextLocalizationResource>> TextLocalizationResources;
 	for (const FString& CultureName : CulturesToGenerate)
 	{
 		const FString CulturePath = DestinationPath / CultureName;
 		const FString ResourceFilePath = FPaths::ConvertRelativePathToFull(CulturePath / ResourceName);
 
-		FTextLocalizationResource& LocRes = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-		if (!GenerateLocRes(LocTextHelper, CultureName, bSkipSourceCheck, ResourceFilePath, LocRes))
+		TSharedPtr<FTextLocalizationResource>& LocRes = TextLocalizationResources.Add_GetRef(MakeShared<FTextLocalizationResource>());
+		if (!GenerateLocRes(LocTextHelper, CultureName, bSkipSourceCheck, FTextLocalizationResourceId(ResourceFilePath), *LocRes))
 		{
 			UE_LOG(LogTextLocalizationResourceGenerator, Error, TEXT("Failed to generate localization resource for culture '%s'."), *CultureName);
 			return false;
diff --git a/Engine/Source/Developer/Localization/Public/TextLocalizationResourceGenerator.h b/Engine/Source/Developer/Localization/Public/TextLocalizationResourceGenerator.h
index ef6f8585f976..bfa8874ccc31 100644
--- a/Engine/Source/Developer/Localization/Public/TextLocalizationResourceGenerator.h
+++ b/Engine/Source/Developer/Localization/Public/TextLocalizationResourceGenerator.h
@@ -3,6 +3,7 @@
 #pragma once 
 
 #include "CoreMinimal.h"
+#include "Internationalization/TextLocalizationResourceId.h"
 
 class FLocTextHelper;
 class FTextLocalizationMetaDataResource;
@@ -20,7 +21,7 @@ public:
 	/**
 	 * Given a loc text helper, generate a compiled LocRes resource for the given culture.
 	 */
-	LOCALIZATION_API static bool GenerateLocRes(const FLocTextHelper& InLocTextHelper, const FString& InCultureToGenerate, const bool bSkipSourceCheck, const FString& InLocResID, FTextLocalizationResource& OutLocRes);
+	LOCALIZATION_API static bool GenerateLocRes(const FLocTextHelper& InLocTextHelper, const FString& InCultureToGenerate, const bool bSkipSourceCheck, const FTextLocalizationResourceId& InLocResID, FTextLocalizationResource& OutLocRes);
 
 	/**
 	 * Given a config file, generate a compiled LocRes resource for the active culture and use it to update the live-entries in the localization manager.
diff --git a/Engine/Source/Developer/MaterialBaking/Private/ExportMaterialProxy.h b/Engine/Source/Developer/MaterialBaking/Private/ExportMaterialProxy.h
index a6051ea05d53..97ba3da25d83 100644
--- a/Engine/Source/Developer/MaterialBaking/Private/ExportMaterialProxy.h
+++ b/Engine/Source/Developer/MaterialBaking/Private/ExportMaterialProxy.h
@@ -470,7 +470,7 @@ public:
 	/**
 	* Should shaders compiled for this material be saved to disk?
 	*/
-	virtual bool IsPersistent() const override { return false; }
+	virtual bool IsPersistent() const override { return true; }
 	virtual FGuid GetMaterialId() const override { return Id; }
 
 	virtual UMaterialInterface* GetMaterialInterface() const override
diff --git a/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingHelpers.cpp b/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingHelpers.cpp
index 20d02d7f142f..24d4e8912ea3 100644
--- a/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingHelpers.cpp
+++ b/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingHelpers.cpp
@@ -4,7 +4,7 @@
 #include "Math/Color.h"
 #include "Async/ParallelFor.h"
 
-FColor FMaterialBakingHelpers::BoxBlurSample(TArray<FColor>& InBMP, int32 X, int32 Y, int32 InImageWidth, int32 InImageHeight, bool bIsNormalMap)
+static FColor BoxBlurSample(TArray<FColor>& InBMP, int32 X, int32 Y, int32 InImageWidth, int32 InImageHeight)
 {
 	const int32 SampleCount = 8;
 	const int32 PixelIndices[SampleCount] = { -(InImageWidth + 1), -InImageWidth, -(InImageWidth - 1),
@@ -16,7 +16,10 @@ FColor FMaterialBakingHelpers::BoxBlurSample(TArray<FColor>& InBMP, int32 X, int
 		-1, 0, 1 };
 
 	int32 PixelsSampled = 0;
-	FLinearColor CombinedColor = FColor::Black;
+	int32 CombinedColorR = 0;
+	int32 CombinedColorG = 0;
+	int32 CombinedColorB = 0;
+	int32 CombinedColorA = 0;
 
 	// Take samples for blur with square indices
 	for (int32 SampleIndex = 0; SampleIndex < SampleCount; ++SampleIndex)
@@ -27,26 +30,28 @@ FColor FMaterialBakingHelpers::BoxBlurSample(TArray<FColor>& InBMP, int32 X, int
 		// Check if we are not out of texture bounds
 		if (InBMP.IsValidIndex(PixelIndex) && XIndex >= 0 && XIndex < InImageWidth)
 		{
-			const FLinearColor SampledColor = InBMP[PixelIndex].ReinterpretAsLinear();
-			// Check if the pixel is a rendered one (not clear colour)
-			if ((!(SampledColor.R == 1.0f && SampledColor.B == 1.0f && SampledColor.G == 0.0f)) && (!bIsNormalMap || SampledColor.B != 0.0f))
+			const FColor SampledColor = InBMP[PixelIndex];
+			// Check if the pixel is a rendered one (not clear color)
+			if ((!(SampledColor.R == 255 && SampledColor.B == 255 && SampledColor.G == 0)))
 			{
-				CombinedColor += SampledColor;
+				CombinedColorR += SampledColor.R;
+				CombinedColorG += SampledColor.G;
+				CombinedColorB += SampledColor.B;
+				CombinedColorA += SampledColor.A;
 				++PixelsSampled;
 			}
 		}
 	}
-	CombinedColor /= PixelsSampled;
 
 	if (PixelsSampled == 0)
 	{
 		return InBMP[((Y * InImageWidth) + X)];
 	}
 
-	return CombinedColor.ToFColor(false);
+	return FColor(CombinedColorR / PixelsSampled, CombinedColorG / PixelsSampled, CombinedColorB / PixelsSampled, CombinedColorA / PixelsSampled);
 }
 
-void FMaterialBakingHelpers::PerformUVBorderSmear(TArray<FColor>& InOutPixels, int32 ImageWidth, int32 ImageHeight, bool bIsNormalMap, int32 MaxIterations)
+void FMaterialBakingHelpers::PerformUVBorderSmear(TArray<FColor>& InOutPixels, int32 ImageWidth, int32 ImageHeight, int32 MaxIterations)
 {
 	// This is ONLY possible because this is never called from multiple threads
 	static TArray<FColor> Swap;
@@ -66,10 +71,11 @@ void FMaterialBakingHelpers::PerformUVBorderSmear(TArray<FColor>& InOutPixels, i
 	}();
 
 	const int32 LinesPerThread = FMath::CeilToInt((float)ImageHeight / (float)NumThreads);
-	int32* MagentaPixels = new int32[NumThreads];
-	FMemory::Memzero(MagentaPixels, sizeof(int32) * NumThreads);
+	uint32* MagentaPixels = new uint32[NumThreads];
+	FMemory::Memset(MagentaPixels, 0xff, sizeof(uint32) * NumThreads);
 
-	int32 SummedMagentaPixels = 1;
+	uint32 TotalPixels = ImageWidth * ImageHeight;
+	uint32 SummedMagentaPixels = 1;
 
 	// Sampling
 	int32 LoopCount = 0;
@@ -77,33 +83,38 @@ void FMaterialBakingHelpers::PerformUVBorderSmear(TArray<FColor>& InOutPixels, i
 	{
 		SummedMagentaPixels = 0;
 		// Left / right, Top / down
-		ParallelFor(NumThreads, [ImageWidth, ImageHeight, bIsNormalMap, MaxIterations, LoopCount, Current, Scratch, &MagentaPixels, LinesPerThread]
+		ParallelFor(NumThreads, [ImageWidth, ImageHeight, MaxIterations, LoopCount, Current, Scratch, &MagentaPixels, LinesPerThread]
 		(int32 Index)
 		{
-			const int32 StartY = FMath::CeilToInt((Index)* LinesPerThread);
-			const int32 EndY = FMath::Min(FMath::CeilToInt((Index + 1) * LinesPerThread), ImageHeight);
-
-			for (int32 Y = StartY; Y < EndY; Y++)
+			if(MagentaPixels[Index] > 0)
 			{
-				for (int32 X = 0; X < ImageWidth; X++)
+				MagentaPixels[Index] = 0;
+
+				const int32 StartY = FMath::CeilToInt((Index)* LinesPerThread);
+				const int32 EndY = FMath::Min(FMath::CeilToInt((Index + 1) * LinesPerThread), ImageHeight);
+
+				for (int32 Y = StartY; Y < EndY; Y++)
 				{
-					const int32 PixelIndex = (Y * ImageWidth) + X;
-					FColor& Color = (*Current)[PixelIndex];
-					if ((Color.R == 255 && Color.B == 255 && Color.G == 0) || (bIsNormalMap && Color.B == 0))
+					for (int32 X = 0; X < ImageWidth; X++)
 					{
-						MagentaPixels[Index]++;
-						const FColor SampledColor = BoxBlurSample(*Scratch, X, Y, ImageWidth, ImageHeight, bIsNormalMap);
-						// If it's a valid pixel
-						if ((!(SampledColor.R == 255 && SampledColor.B == 255 && SampledColor.G == 0)) && (!bIsNormalMap || SampledColor.B != 0))
+						const int32 PixelIndex = (Y * ImageWidth) + X;
+						FColor& Color = (*Current)[PixelIndex];
+						if (Color.R == 255 && Color.B == 255 && Color.G == 0)
 						{
-							Color = SampledColor;
-						}
-						else
-						{
-							// If we are at the end of our iterations, replace the pixels with black
-							if (LoopCount == (MaxIterations - 1))
+							MagentaPixels[Index]++;
+							const FColor SampledColor = BoxBlurSample(*Scratch, X, Y, ImageWidth, ImageHeight);
+							// If it's a valid pixel
+							if (!(SampledColor.R == 255 && SampledColor.B == 255 && SampledColor.G == 0))
 							{
-								Color = FColor(0, 0, 0, 0);
+								Color = SampledColor;
+							}
+							else
+							{
+								// If we are at the end of our iterations, replace the pixels with black
+								if (LoopCount == (MaxIterations - 1))
+								{
+									Color = FColor(0, 0, 0, 0);
+								}
 							}
 						}
 					}
@@ -114,7 +125,13 @@ void FMaterialBakingHelpers::PerformUVBorderSmear(TArray<FColor>& InOutPixels, i
 		for (int32 ThreadIndex = 0; ThreadIndex < NumThreads; ++ThreadIndex)
 		{
 			SummedMagentaPixels += MagentaPixels[ThreadIndex];
-			MagentaPixels[ThreadIndex] = 0;
+		}
+
+		// If after iterating over all pixels we found they were all magenta, exit early
+		if(SummedMagentaPixels >= TotalPixels)
+		{
+			FMemory::Memset(Current->GetData(), 0, Current->Num() * sizeof(FColor));
+			break;
 		}
 
 		TArray<FColor>& Temp = *Scratch;
diff --git a/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingModule.cpp b/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingModule.cpp
index e8f5cd712ed3..f394a4067c71 100644
--- a/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingModule.cpp
+++ b/Engine/Source/Developer/MaterialBaking/Private/MaterialBakingModule.cpp
@@ -78,7 +78,7 @@ void FMaterialBakingModule::ShutdownModule()
 }
 
 void FMaterialBakingModule::BakeMaterials(const TArray<FMaterialData*>& MaterialSettings, const TArray<FMeshData*>& MeshSettings, TArray<FBakeOutput>& Output)
-{
+{	
 	checkf(MaterialSettings.Num() == MeshSettings.Num(), TEXT("Number of material settings does not match that of MeshSettings"));
 	const int32 NumMaterials = MaterialSettings.Num();
 	const bool bSaveIntermediateTextures = CVarSaveIntermediateTextures.GetValueOnAnyThread() == 1;
@@ -143,7 +143,7 @@ void FMaterialBakingModule::BakeMaterials(const TArray<FMaterialData*>& Material
 
 			FMeshMaterialRenderItem RenderItem(CurrentMaterialSettings, CurrentMeshSettings, MaterialPropertiesToBakeOut[0]);
 			FCanvas::FCanvasSortElement& SortElement = Canvas.GetSortElement(Canvas.TopDepthSortKey());
-
+			
 			for (int32 PropertyIndex = 0; PropertyIndex < NumPropertiesToRender; ++PropertyIndex)
 			{
 				const EMaterialProperty Property = MaterialPropertiesToBakeOut[PropertyIndex];
@@ -173,6 +173,17 @@ void FMaterialBakingModule::BakeMaterials(const TArray<FMaterialData*>& Material
 						Canvas.SetBaseTransform(Canvas.CalcBaseTransform2D(RenderTarget->GetSurfaceWidth(), RenderTarget->GetSurfaceHeight()));
 						PreviousRenderTarget = RenderTarget;
 					}
+					
+					// TODO find out why this is required
+					static bool bDoubleFlush = false;
+					if (IsRunningCommandlet() && !bDoubleFlush)
+					{
+						Canvas.Clear(RenderTarget->ClearColor);
+						SortElement.RenderBatchArray.Add(&RenderItem);
+						Canvas.Flush_GameThread();
+						FlushRenderingCommands();
+						bDoubleFlush = true;
+					}
 
 					// Clear canvas before rendering
 					Canvas.Clear(RenderTarget->ClearColor);
@@ -185,7 +196,11 @@ void FMaterialBakingModule::BakeMaterials(const TArray<FMaterialData*>& Material
 
 					SortElement.RenderBatchArray.Empty();
 					ReadTextureOutput(RenderTargetResource, Property, CurrentOutput);
-					FMaterialBakingHelpers::PerformUVBorderSmear(CurrentOutput.PropertyData[Property], RenderTarget->GetSurfaceWidth(), RenderTarget->GetSurfaceHeight(), Property == MP_Normal);
+
+					if(CurrentMaterialSettings->bPerformBorderSmear)
+					{
+						FMaterialBakingHelpers::PerformUVBorderSmear(CurrentOutput.PropertyData[Property], RenderTarget->GetSurfaceWidth(), RenderTarget->GetSurfaceHeight());
+					}
 #if WITH_EDITOR
 					// If saving intermediates is turned on
 					if (bSaveIntermediateTextures)
diff --git a/Engine/Source/Developer/MaterialBaking/Private/MaterialRenderItem.cpp b/Engine/Source/Developer/MaterialBaking/Private/MaterialRenderItem.cpp
index 85d6d26343d5..0d29f0a4d888 100644
--- a/Engine/Source/Developer/MaterialBaking/Private/MaterialRenderItem.cpp
+++ b/Engine/Source/Developer/MaterialBaking/Private/MaterialRenderItem.cpp
@@ -39,7 +39,10 @@ bool FMeshMaterialRenderItem::Render_GameThread(const FCanvas* Canvas)
 	ViewInitOptions.BackgroundColor = FLinearColor::Black;
 	ViewInitOptions.OverlayColor = FLinearColor::White;
 
-	const FSceneView* View = new FSceneView(ViewInitOptions);
+	FSceneView* View = new FSceneView(ViewInitOptions);
+	View->FinalPostProcessSettings.bOverride_IndirectLightingIntensity = 1;
+	View->FinalPostProcessSettings.IndirectLightingIntensity = 0.0f;
+
 
 	const bool bNeedsToSwitchVerticalAxis = RHINeedsToSwitchVerticalAxis(Canvas->GetShaderPlatform()) && !Canvas->GetAllowSwitchVerticalAxis();
 	check(bNeedsToSwitchVerticalAxis == false);
@@ -148,7 +151,10 @@ void FMeshMaterialRenderItem::PopulateWithQuadData()
 		Vert->Position.Set(ScaleX * X, ScaleY * Y, 0);
 		Vert->SetTangents(FVector(1, 0, 0), FVector(0, 1, 0), FVector(0, 0, 1));
 		FMemory::Memzero(&Vert->TextureCoordinate, sizeof(Vert->TextureCoordinate));
-		Vert->TextureCoordinate[0].Set(U + SizeU * X, V + SizeV * Y);
+		for (int32 TexcoordIndex = 0; TexcoordIndex < MAX_STATIC_TEXCOORDS; TexcoordIndex++)
+		{
+			Vert->TextureCoordinate[TexcoordIndex].Set(U + SizeU * X, V + SizeV * Y);
+		}		
 		Vert->Color = FColor::White;
 	}
 
@@ -171,11 +177,12 @@ void FMeshMaterialRenderItem::PopulateWithMeshData()
 	const float ScaleX = PropertySize.X;
 	const float ScaleY = PropertySize.Y;
 
+	const static int32 VertexPositionStoredUVChannel = 6;
 	// count number of texture coordinates for this mesh
 	const int32 NumTexcoords = [&]()
 	{
 		int32 Index = 1;
-		for (; Index < MAX_STATIC_TEXCOORDS; Index++)
+		for (; Index < VertexPositionStoredUVChannel; Index++)
 		{
 			if (RawMesh->WedgeTexCoords[Index].Num() == 0)
 			{
@@ -221,7 +228,14 @@ void FMeshMaterialRenderItem::PopulateWithMeshData()
 				{
 					Vert->TextureCoordinate[TexcoordIndex] = RawMesh->WedgeTexCoords[TexcoordIndex][SrcVertIndex];
 				}
-
+				
+				if (NumTexcoords < VertexPositionStoredUVChannel)
+				{
+					for (int32 TexcoordIndex = NumTexcoords; TexcoordIndex < VertexPositionStoredUVChannel; TexcoordIndex++)
+					{
+						Vert->TextureCoordinate[TexcoordIndex] = Vert->TextureCoordinate[FMath::Max(NumTexcoords - 1, 0)];
+					}
+				}
 				// Store original vertex positions in texture coordinate data
 				Vert->TextureCoordinate[6].X = RawMesh->VertexPositions[RawMesh->WedgeIndices[SrcVertIndex]].X;
 				Vert->TextureCoordinate[6].Y = RawMesh->VertexPositions[RawMesh->WedgeIndices[SrcVertIndex]].Y;
diff --git a/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingHelpers.h b/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingHelpers.h
index bdba49b0f7ff..2c21e33ac78d 100644
--- a/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingHelpers.h
+++ b/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingHelpers.h
@@ -14,10 +14,7 @@ public:
 	 * @param	InOutPixels		The image to apply the smear to
 	 * @param	ImageWidth		The width of the image in pixels
 	 * @param	ImageHeight		The height of the image in pixels
-	 * @param	bIsNormalMap	Whether the image represents a normal map
 	 * @param	MaxIterations	The max distance in pixels to smear the edges of the texture. When set to -1 this value is the max of the width and height of the buffer
 	 */
-	static void PerformUVBorderSmear(TArray<FColor>& InOutPixels, int32 ImageWidth, int32 ImageHeight, bool bIsNormalMap, int32 MaxIterations = -1);	
-protected:
-	static FColor BoxBlurSample(TArray<FColor>& InBMP, int32 X, int32 Y, int32 InImageWidth, int32 InImageHeight, bool bIsNormalMap);	
+	static void PerformUVBorderSmear(TArray<FColor>& InOutPixels, int32 ImageWidth, int32 ImageHeight, int32 MaxIterations = -1);
 };
\ No newline at end of file
diff --git a/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingStructures.h b/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingStructures.h
index a5f64fe707d6..a3207edaab7c 100644
--- a/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingStructures.h
+++ b/Engine/Source/Developer/MaterialBaking/Public/MaterialBakingStructures.h
@@ -14,12 +14,15 @@ struct FMaterialData
 {
 	FMaterialData()
 		: Material(nullptr)
+		, bPerformBorderSmear(true)
 	{}
 
 	/** Material to bake out */
 	UMaterialInterface* Material;
 	/** Properties and the texture size at which they should be baked out */
 	TMap<EMaterialProperty, FIntPoint> PropertySizes;
+	/** Whether to smear borders after baking */
+	bool bPerformBorderSmear;
 };
 
 struct FMeshData
diff --git a/Engine/Source/Developer/MaterialBaking/Public/MaterialOptions.h b/Engine/Source/Developer/MaterialBaking/Public/MaterialOptions.h
index 797b1f6b559b..83763f6e2b3e 100644
--- a/Engine/Source/Developer/MaterialBaking/Public/MaterialOptions.h
+++ b/Engine/Source/Developer/MaterialBaking/Public/MaterialOptions.h
@@ -22,17 +22,20 @@ struct FPropertyEntry
 {
 	GENERATED_BODY()
 
-	FPropertyEntry() : Property(MP_EmissiveColor), 
-		CustomSize(0, 0),
-		bUseConstantValue(false),
-		ConstantValue(0.0f) {}
+	FPropertyEntry()
+		: Property(MP_EmissiveColor)
+		, bUseCustomSize(false)
+		, CustomSize(0, 0)
+		, bUseConstantValue(false)
+		, ConstantValue(0.0f)
+	{}
 
 	FPropertyEntry(EMaterialProperty InProperty)
-		: Property(InProperty),
-		bUseCustomSize(false),
-		CustomSize(0, 0),
-		bUseConstantValue(false),
-		ConstantValue(0.0f)
+		: Property(InProperty)
+		, bUseCustomSize(false)
+		, CustomSize(0, 0)
+		, bUseConstantValue(false)
+		, ConstantValue(0.0f)
 	{}
 
 	/** Property which should be baked out */
diff --git a/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.cpp b/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.cpp
index 12114fcf8a7f..69f2139a7ffa 100644
--- a/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.cpp
+++ b/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.cpp
@@ -79,7 +79,7 @@ DEFINE_LOG_CATEGORY(LogMeshMerging);
 
 FMeshMergeUtilities::FMeshMergeUtilities()
 {
-	Processor = new FProxyGenerationProcessor();
+	Processor = new FProxyGenerationProcessor(this);
 
 	// Add callback for registering editor extensions with Skeletal/Static mesh editor
 	ModuleLoadedDelegateHandle = FModuleManager::Get().OnModulesChanged().AddStatic(&FMeshMergeEditorExtensions::OnModulesChanged);
@@ -732,17 +732,35 @@ void FMeshMergeUtilities::PopulatePropertyEntry(const FMaterialProxySettings& Ma
 	}();
 }
 
-void FMeshMergeUtilities::CopyTextureRect(const FColor* Src, const FIntPoint& SrcSize, FColor* Dst, const FIntPoint& DstSize, const FIntPoint& DstPos) const
+void FMeshMergeUtilities::CopyTextureRect(const FColor* Src, const FIntPoint& SrcSize, FColor* Dst, const FIntPoint& DstSize, const FIntPoint& DstPos, bool bCopyOnlyMaskedPixels) const
 {
 	const int32 RowLength = SrcSize.X * sizeof(FColor);
 	FColor* RowDst = Dst + DstSize.X*DstPos.Y;
 	const FColor* RowSrc = Src;
-
-	for (int32 RowIdx = 0; RowIdx < SrcSize.Y; ++RowIdx)
+	if(bCopyOnlyMaskedPixels)
 	{
-		FMemory::Memcpy(RowDst + DstPos.X, RowSrc, RowLength);
-		RowDst += DstSize.X;
-		RowSrc += SrcSize.X;
+		for (int32 RowIdx = 0; RowIdx < SrcSize.Y; ++RowIdx)
+		{
+			for (int32 ColIdx = 0; ColIdx < SrcSize.X; ++ColIdx)
+			{
+				if(RowSrc[ColIdx] != FColor::Magenta)
+				{
+					RowDst[DstPos.X + ColIdx] = RowSrc[ColIdx];
+				}
+			}
+
+			RowDst += DstSize.X;
+			RowSrc += SrcSize.X;
+		}
+	}
+	else
+	{
+		for (int32 RowIdx = 0; RowIdx < SrcSize.Y; ++RowIdx)
+		{
+			FMemory::Memcpy(RowDst + DstPos.X, RowSrc, RowLength);
+			RowDst += DstSize.X;
+			RowSrc += SrcSize.X;
+		}
 	}
 }
 
@@ -903,13 +921,13 @@ void FMeshMergeUtilities::MergeFlattenedMaterials(TArray<struct FFlattenMaterial
 		{
 			// Smear borders
 			const FIntPoint PropertySize = OutMergedMaterial.GetPropertySize(Property);
-			FMaterialBakingHelpers::PerformUVBorderSmear(OutMergedMaterial.GetPropertySamples(Property), PropertySize.X, PropertySize.Y, Property == EFlattenMaterialProperties::Normal);
+			FMaterialBakingHelpers::PerformUVBorderSmear(OutMergedMaterial.GetPropertySamples(Property), PropertySize.X, PropertySize.Y);
 		}
 	}
 
 }
 
-void FMeshMergeUtilities::FlattenBinnedMaterials(TArray<struct FFlattenMaterial>& InMaterialList, const TArray<FBox2D>& InMaterialBoxes, int32 InGutter, FFlattenMaterial& OutMergedMaterial, TArray<FUVOffsetScalePair>& OutUVTransforms) const
+void FMeshMergeUtilities::FlattenBinnedMaterials(TArray<struct FFlattenMaterial>& InMaterialList, const TArray<FBox2D>& InMaterialBoxes, int32 InGutter, bool bCopyOnlyMaskedPixels, FFlattenMaterial& OutMergedMaterial, TArray<FUVOffsetScalePair>& OutUVTransforms) const
 {
 	OutUVTransforms.AddZeroed(InMaterialList.Num());
 	// Flatten emissive scale across all incoming materials
@@ -953,7 +971,7 @@ void FMeshMergeUtilities::FlattenBinnedMaterials(TArray<struct FFlattenMaterial>
 
 					// Copy material data to the merged 'atlas' texture
 					FIntPoint OutputPosition = FIntPoint((OutTextureSize.X * MaterialBox.Min.X) + InGutter, (OutTextureSize.Y * MaterialBox.Min.Y) + InGutter);
-					CopyTextureRect(InputSamples.GetData(), OutputSize, OutSamples.GetData(), OutTextureSize, OutputPosition);
+					CopyTextureRect(InputSamples.GetData(), OutputSize, OutSamples.GetData(), OutTextureSize, OutputPosition, bCopyOnlyMaskedPixels);
 
 					// Set the UV tranforms only once
 					if (Index == 0)
@@ -976,7 +994,7 @@ void FMeshMergeUtilities::FlattenBinnedMaterials(TArray<struct FFlattenMaterial>
 			{
 				// Smear borders
 				const FIntPoint PropertySize = OutMergedMaterial.GetPropertySize(Property);
-				FMaterialBakingHelpers::PerformUVBorderSmear(OutSamples, PropertySize.X, PropertySize.Y, Property == EFlattenMaterialProperties::Normal);
+				FMaterialBakingHelpers::PerformUVBorderSmear(OutSamples, PropertySize.X, PropertySize.Y);
 			}
 		}
 	}
@@ -1487,6 +1505,8 @@ void FMeshMergeUtilities::CreateProxyMesh(const TArray<UStaticMeshComponent*>& I
 	Data->ProxyBasePackageName = InProxyBasePackageName;
 	Data->CallbackDelegate = InProxyCreatedDelegate;
 	Data->ImposterComponents = ImposterMeshComponents;
+	Data->StaticMeshComponents = ComponentsToMerge;
+	Data->StaticMeshComponents.RemoveAll([&](UStaticMeshComponent* Component) { return ImposterMeshComponents.Contains(Component); });
 	Data->BaseMaterial = InBaseMaterial;
 
 	// Lightmap resolution
@@ -1571,7 +1591,7 @@ void FMeshMergeUtilities::CreateProxyMesh(const TArray<UStaticMeshComponent*>& I
 
 bool FMeshMergeUtilities::IsValidBaseMaterial(const UMaterialInterface* InBaseMaterial, bool bShowToaster) const
 {
-	if (const UMaterial* Material = Cast<const UMaterial>(InBaseMaterial))
+	if (InBaseMaterial != nullptr)
 	{
 		TArray<FGuid> ParameterIds;
 		TArray<FString> MissingParameters;
@@ -1588,22 +1608,22 @@ bool FMeshMergeUtilities::IsValidBaseMaterial(const UMaterialInterface* InBaseMa
 
 		TArray<FMaterialParameterInfo> TextureParameterInfos;
 		TArray<FName> RequiredTextureNames = { TEXT("DiffuseTexture"), TEXT("NormalTexture"), TEXT("PackedTexture"), TEXT("MetallicTexture"), TEXT("SpecularTexture"), TEXT("RoughnessTexture"), TEXT("EmissiveTexture"), TEXT("OpacityTexture"), TEXT("OpacityMaskTexture"), TEXT("AmbientOcclusionTexture") };
-		Material->GetAllTextureParameterInfo(TextureParameterInfos, ParameterIds);
+		InBaseMaterial->GetAllTextureParameterInfo(TextureParameterInfos, ParameterIds);
 		NameCheckLambda(TextureParameterInfos, RequiredTextureNames);
 
 		TArray<FMaterialParameterInfo> ScalarParameterInfos;
 		TArray<FName> RequiredScalarNames = { TEXT("MetallicConst"), TEXT("SpecularConst"), TEXT("RoughnessConst"), TEXT("OpacityConst"), TEXT("OpacityMaskConst"), TEXT("AmbientOcclusionConst"), TEXT("EmissiveScale") };
-		Material->GetAllScalarParameterInfo(ScalarParameterInfos, ParameterIds);
+		InBaseMaterial->GetAllScalarParameterInfo(ScalarParameterInfos, ParameterIds);
 		NameCheckLambda(ScalarParameterInfos, RequiredScalarNames);
 
 		TArray<FMaterialParameterInfo> VectorParameterInfos;
 		TArray<FName> RequiredVectorNames = { TEXT("DiffuseConst"), TEXT("EmissiveConst") };
-		Material->GetAllVectorParameterInfo(VectorParameterInfos, ParameterIds);
+		InBaseMaterial->GetAllVectorParameterInfo(VectorParameterInfos, ParameterIds);
 		NameCheckLambda(VectorParameterInfos, RequiredVectorNames);
 
 		TArray<FMaterialParameterInfo> StaticSwitchParameterInfos;
 		TArray<FName> RequiredSwitchNames = { TEXT("UseDiffuse"), TEXT("PackMetallic"), TEXT("PackSpecular"), TEXT("PackRoughness"),TEXT("UseMetallic"), TEXT("UseSpecular"), TEXT("UseRoughness"), TEXT("UseEmissive"), TEXT("UseOpacity"), TEXT("UseOpacityMask"), TEXT("UseAmbientOcclusion") };
-		Material->GetAllStaticSwitchParameterInfo(StaticSwitchParameterInfos, ParameterIds);
+		InBaseMaterial->GetAllStaticSwitchParameterInfo(StaticSwitchParameterInfos, ParameterIds);
 		NameCheckLambda(StaticSwitchParameterInfos, RequiredSwitchNames);
 
 		if (MissingParameters.Num() > 0)
@@ -1648,13 +1668,11 @@ bool FMeshMergeUtilities::IsValidBaseMaterial(const UMaterialInterface* InBaseMa
 
 void FMeshMergeUtilities::RegisterExtension(IMeshMergeExtension* InExtension)
 {
-	checkf(!MeshMergeExtensions.Contains(InExtension), TEXT("Extension is already registered"));
 	MeshMergeExtensions.Add(InExtension);
 }
 
 void FMeshMergeUtilities::UnregisterExtension(IMeshMergeExtension* InExtension)
 {
-	checkf(MeshMergeExtensions.Contains(InExtension), TEXT("Extension is not registered"));
 	MeshMergeExtensions.Remove(InExtension);
 }
 
@@ -2118,6 +2136,53 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 			MaterialSettingPtrs.Add(&GlobalMaterialSettings[SettingsIndex]);
 		}
 
+		// If we are generating a single LOD and want to merge materials we can utilize texture space better by generating unique UVs
+		// for the merged mesh and baking out materials using those UVs
+		const bool bGloballyRemapUVs = !bMergeAllLODs && !InSettings.bReuseMeshLightmapUVs;
+		if(bGloballyRemapUVs)
+		{
+			TArray<FRawMesh> MergedRawMeshes;
+			CreateMergedRawMeshes(DataTracker, InSettings, StaticMeshComponentsToMerge, UniqueMaterials, CollapsedMaterialMap, OutputMaterialsMap, false, false, MergedAssetPivot, MergedRawMeshes);
+
+			// Create texture coords for the merged mesh
+			TArray<FVector2D> GlobalTextureCoordinates;
+			IMeshUtilities& MeshUtilities = FModuleManager::LoadModuleChecked<IMeshUtilities>("MeshUtilities");
+			MeshUtilities.GenerateUniqueUVsForStaticMesh(MergedRawMeshes[0], MaterialOptions->TextureSize.GetMax(), true, GlobalTextureCoordinates);
+			ScaleTextureCoordinatesToBox(FBox2D(FVector2D::ZeroVector, FVector2D(1, 1)), GlobalTextureCoordinates);
+
+			// copy UVs back to the un-merged mesh's custom texture coords
+			// iterate the raw meshes in the same way as when we combined the mesh above in CreateMergedRawMeshes()
+			int32 GlobalUVIndex = 0;
+			for (TConstRawMeshIterator RawMeshIterator = DataTracker.GetConstRawMeshIterator(); RawMeshIterator; ++RawMeshIterator)
+			{
+				const FMeshLODKey& Key = RawMeshIterator.Key();
+				const FRawMesh& RawMesh = RawMeshIterator.Value();
+
+				// Build a local array for this raw mesh
+				TArray<FVector2D> UniqueTextureCoordinates;
+				UniqueTextureCoordinates.SetNumUninitialized(RawMesh.WedgeIndices.Num());
+				for(FVector2D& UniqueTextureCoordinate : UniqueTextureCoordinates)
+				{
+					UniqueTextureCoordinate = GlobalTextureCoordinates[GlobalUVIndex++];
+				}
+
+				// copy to mesh data
+				for(FMeshData& MeshData : GlobalMeshSettings)
+				{
+					if(MeshData.RawMesh == &RawMesh)
+					{
+						MeshData.CustomTextureCoordinates = UniqueTextureCoordinates;
+					}
+				}
+			}
+
+			// Dont smear borders as we will copy back non-pink pixels
+			for(FMaterialData& MaterialData : GlobalMaterialSettings)
+			{
+				MaterialData.bPerformBorderSmear = false;
+			}
+		}
+
 		TArray<FBakeOutput> BakeOutputs;
 		IMaterialBakingModule& Module = FModuleManager::Get().LoadModuleChecked<IMaterialBakingModule>("MaterialBaking");
 		Module.BakeMaterials(MaterialSettingPtrs, MeshSettingPtrs, BakeOutputs);
@@ -2142,10 +2207,13 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 		TArray<FFlattenMaterial> FlattenedMaterials;
 		ConvertOutputToFlatMaterials(BakeOutputs, GlobalMaterialSettings, FlattenedMaterials);
 
-		// Try to optimize materials where possible	
-		for (FFlattenMaterial& InMaterial : FlattenedMaterials)
+		if(!bGloballyRemapUVs)
 		{
-			FMaterialUtilities::OptimizeFlattenMaterial(InMaterial);
+			// Try to optimize materials where possible	
+			for (FFlattenMaterial& InMaterial : FlattenedMaterials)
+			{
+				FMaterialUtilities::OptimizeFlattenMaterial(InMaterial);
+			}
 		}
 
 		FFlattenMaterial OutMaterial;
@@ -2158,33 +2226,49 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 			}
 		}
 
-		/** Reweighting */
-		float TotalValue = 0.0f;
-		for (const float& Value : SectionMaterialImportanceValues)
-		{
-			TotalValue += Value;
-		}
-
-		float Multiplier = 1.0f / TotalValue;
-
-		for (float& Value : SectionMaterialImportanceValues)
-		{
-			Value *= Multiplier;
-		}
-		/** End reweighting */
-
 		TArray<FUVOffsetScalePair> UVTransforms;
-		if (InSettings.bUseTextureBinning)
+		if(bGloballyRemapUVs)
 		{
+			// If we have globally remapped UVs we copy non-pink pixels over the dest texture rather than 
+			// copying sub-charts
 			TArray<FBox2D> MaterialBoxes;
-			FMaterialUtilities::GeneratedBinnedTextureSquares(FVector2D(1.0f, 1.0f), SectionMaterialImportanceValues, MaterialBoxes);
-			FlattenBinnedMaterials(FlattenedMaterials, MaterialBoxes, InSettings.GutterSize, OutMaterial, UVTransforms);
+			MaterialBoxes.SetNumUninitialized(GlobalMaterialSettings.Num());
+			for(FBox2D& Box2D : MaterialBoxes)
+			{
+				Box2D = FBox2D(FVector2D(0.0f, 0.0f), FVector2D(1.0f, 1.0f));
+			}
+
+			FlattenBinnedMaterials(FlattenedMaterials, MaterialBoxes, 0, true, OutMaterial, UVTransforms);
 		}
 		else
 		{
-			MergeFlattenedMaterials(FlattenedMaterials, InSettings.GutterSize, OutMaterial, UVTransforms);
+			/** Reweighting */
+			float TotalValue = 0.0f;
+			for (const float& Value : SectionMaterialImportanceValues)
+			{
+				TotalValue += Value;
+			}
+
+			float Multiplier = 1.0f / TotalValue;
+
+			for (float& Value : SectionMaterialImportanceValues)
+			{
+				Value *= Multiplier;
+			}
+			/** End reweighting */
+
+			if (InSettings.bUseTextureBinning)
+			{
+				TArray<FBox2D> MaterialBoxes;
+				FMaterialUtilities::GeneratedBinnedTextureSquares(FVector2D(1.0f, 1.0f), SectionMaterialImportanceValues, MaterialBoxes);
+				FlattenBinnedMaterials(FlattenedMaterials, MaterialBoxes, InSettings.GutterSize, false, OutMaterial, UVTransforms);
+			}
+			else
+			{
+				MergeFlattenedMaterials(FlattenedMaterials, InSettings.GutterSize, OutMaterial, UVTransforms);
+			}
 		}
-		
+
 		// Adjust UVs
 		for (int32 ComponentIndex = 0; ComponentIndex < StaticMeshComponentsToMerge.Num(); ++ComponentIndex)
 		{
@@ -2273,196 +2357,8 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 	}
 
 	TArray<FRawMesh> MergedRawMeshes;
-	if (bMergeAllLODs)
-	{
-		MergedRawMeshes.AddDefaulted(DataTracker.GetNumLODsForMergedMesh());
-		for (TConstLODIndexIterator Iterator = DataTracker.GetLODIndexIterator(); Iterator; ++Iterator)
-		{
-			// Find meshes for each lod
-			const int32 LODIndex = *Iterator;
-			FRawMesh& MergedMesh = MergedRawMeshes[LODIndex];
-			for (int32 ComponentIndex = 0; ComponentIndex < StaticMeshComponentsToMerge.Num(); ++ComponentIndex)
-			{
-				int32 RetrievedLODIndex = LODIndex;
-				FRawMesh* RawMeshPtr = DataTracker.TryFindRawMeshForLOD(ComponentIndex, RetrievedLODIndex);
-
-				if (RawMeshPtr != nullptr)
-				{
-					MergedMesh.FaceSmoothingMasks.Append(RawMeshPtr->FaceSmoothingMasks);
-
-					if (bMergeMaterialData)
-					{
-						MergedMesh.FaceMaterialIndices.AddZeroed(RawMeshPtr->FaceMaterialIndices.Num());
-					}
-					else
-					{
-						for (const int32 FaceIndex : RawMeshPtr->FaceMaterialIndices)
-						{
-							int32 NewIndex = UniqueMaterials.IndexOfByKey(CollapsedMaterialMap.FindChecked(DataTracker.GetMaterialForSectionIndex(FaceIndex)));
-							MergedMesh.FaceMaterialIndices.Add(FaceIndex);
-						}
-					}
-
-					DataTracker.AddComponentToWedgeMapping(ComponentIndex, LODIndex, MergedMesh.WedgeIndices.Num());
-					const int32 VertexOffset = MergedMesh.VertexPositions.Num();
-					for (int32 WedgeIndex : RawMeshPtr->WedgeIndices)
-					{
-						MergedMesh.WedgeIndices.Add(WedgeIndex + VertexOffset);
-					}
-
-					for (FVector VertexPos : RawMeshPtr->VertexPositions)
-					{
-						MergedMesh.VertexPositions.Add(VertexPos - MergedAssetPivot);
-					}
-
-					MergedMesh.WedgeTangentX.Append(RawMeshPtr->WedgeTangentX);
-					MergedMesh.WedgeTangentY.Append(RawMeshPtr->WedgeTangentY);
-					MergedMesh.WedgeTangentZ.Append(RawMeshPtr->WedgeTangentZ);
-
-					// Deal with vertex colors
-					// Some meshes may have it, in this case merged mesh will be forced to have vertex colors as well
-					if (InSettings.bBakeVertexDataToMesh)
-					{
-						if (DataTracker.DoesLODContainVertexColors(0) && RawMeshPtr->WedgeColors.Num())
-						{
-							MergedMesh.WedgeColors.Append(RawMeshPtr->WedgeColors);
-						}
-						else
-						{
-							// In case this source mesh does not have vertex colors, fill target with 0xFF
-							int32 ColorsOffset = MergedMesh.WedgeColors.Num();
-							int32 ColorsNum = RawMeshPtr->WedgeIndices.Num();
-							MergedMesh.WedgeColors.AddUninitialized(ColorsNum);
-							FMemory::Memset(&MergedMesh.WedgeColors[ColorsOffset], 0xFF, ColorsNum*MergedMesh.WedgeColors.GetTypeSize());
-						}
-					}
-
-					// Merge all other UV channels 
-					for (int32 ChannelIdx = 0; ChannelIdx < MAX_MESH_TEXTURE_COORDS; ++ChannelIdx)
-					{
-						// Whether this channel has data
-						if (DataTracker.DoesUVChannelContainData(ChannelIdx, LODIndex))
-						{
-							const TArray<FVector2D>& SourceChannel = RawMeshPtr->WedgeTexCoords[ChannelIdx];
-							TArray<FVector2D>& TargetChannel = MergedMesh.WedgeTexCoords[ChannelIdx];
-
-							// Whether source mesh has data in this channel
-							if (SourceChannel.Num())
-							{
-								TargetChannel.Append(SourceChannel);
-							}
-							else
-							{
-								// Fill with zero coordinates if source mesh has no data for this channel
-								const int32 TexCoordNum = RawMeshPtr->WedgeIndices.Num();
-								for (int32 CoordIdx = 0; CoordIdx < TexCoordNum; ++CoordIdx)
-								{
-									TargetChannel.Add(FVector2D::ZeroVector);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	else
-	{	
-		MergedRawMeshes.AddZeroed(1);
-		FRawMesh& MergedMesh = MergedRawMeshes.Last();
-		for (int32 ComponentIndex = 0; ComponentIndex < StaticMeshComponentsToMerge.Num(); ++ComponentIndex)
-		{
-			int32 LODIndex = 0;
-		
-			FRawMesh* RawMeshPtr = DataTracker.FindRawMeshAndLODIndex(ComponentIndex, LODIndex);
-
-			if (RawMeshPtr != nullptr)
-			{
-				MergedMesh.FaceSmoothingMasks.Append(RawMeshPtr->FaceSmoothingMasks);
-
-				if (bMergeMaterialData)
-				{
-					MergedMesh.FaceMaterialIndices.AddZeroed(RawMeshPtr->FaceMaterialIndices.Num());
-				}
-				else
-				{
-					for (const int32 Index : RawMeshPtr->FaceMaterialIndices)
-					{
-						int32 NewIndex = UniqueMaterials.IndexOfByKey(CollapsedMaterialMap.FindChecked(DataTracker.GetMaterialForSectionIndex(Index)));
-						MergedMesh.FaceMaterialIndices.Add(Index);
-					}
-				}
-
-				const int32 TargetLODIndex = 0;
-				DataTracker.AddComponentToWedgeMapping(ComponentIndex, TargetLODIndex, MergedMesh.WedgeIndices.Num());
-
-				const int32 VertexOffset = MergedMesh.VertexPositions.Num();
-
-				for (int32 Index : RawMeshPtr->WedgeIndices)
-				{
-					MergedMesh.WedgeIndices.Add(Index + VertexOffset);
-				}
-
-				for (FVector VertexPos : RawMeshPtr->VertexPositions)
-				{
-					MergedMesh.VertexPositions.Add(VertexPos - MergedAssetPivot);
-				}
-
-				MergedMesh.WedgeTangentX.Append(RawMeshPtr->WedgeTangentX);
-				MergedMesh.WedgeTangentY.Append(RawMeshPtr->WedgeTangentY);
-				MergedMesh.WedgeTangentZ.Append(RawMeshPtr->WedgeTangentZ);
-
-				// Deal with vertex colors
-				// Some meshes may have it, in this case merged mesh will be forced to have vertex colors as well
-				if (InSettings.bBakeVertexDataToMesh)
-				{
-					if (DataTracker.DoesAnyLODContainVertexColors() && RawMeshPtr->WedgeColors.Num())
-					{
-						MergedMesh.WedgeColors.Append(RawMeshPtr->WedgeColors);
-					}
-					else
-					{
-						// In case this source mesh does not have vertex colors, fill target with 0xFF
-						int32 ColorsOffset = MergedMesh.WedgeColors.Num();
-						int32 ColorsNum = RawMeshPtr->WedgeIndices.Num();
-						MergedMesh.WedgeColors.AddUninitialized(ColorsNum);
-						FMemory::Memset(&MergedMesh.WedgeColors[ColorsOffset], 0xFF, ColorsNum*MergedMesh.WedgeColors.GetTypeSize());
-					}
-				}
-
-				// Merge all other UV channels 
-				for (int32 ChannelIdx = 0; ChannelIdx < MAX_MESH_TEXTURE_COORDS; ++ChannelIdx)
-				{
-					// Whether this channel has data
-					if (DataTracker.DoesUVChannelContainData(ChannelIdx) && InSettings.OutputUVs[ChannelIdx] == EUVOutput::OutputChannel)
-					{
-						const TArray<FVector2D>& SourceChannel = RawMeshPtr->WedgeTexCoords[ChannelIdx];
-						TArray<FVector2D>& TargetChannel = MergedMesh.WedgeTexCoords[ChannelIdx];
-
-						// Whether source mesh has data in this channel
-						if (SourceChannel.Num())
-						{
-							TargetChannel.Append(SourceChannel);
-						}
-						else
-						{
-							// Fill with zero coordinates if source mesh has no data for this channel
-							const int32 TexCoordNum = RawMeshPtr->WedgeIndices.Num();
-							for (int32 CoordIdx = 0; CoordIdx < TexCoordNum; ++CoordIdx)
-							{
-								TargetChannel.Add(FVector2D::ZeroVector);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	for (IMeshMergeExtension* Extension : MeshMergeExtensions)
-	{
-		Extension->OnCreatedMergedRawMeshes(StaticMeshComponentsToMerge, DataTracker, MergedRawMeshes);
-	}
+	TMultiMap<FMeshLODKey, MaterialRemapPair> OutputMaterialsMap;
+	CreateMergedRawMeshes(DataTracker, InSettings, StaticMeshComponentsToMerge, UniqueMaterials, CollapsedMaterialMap, OutputMaterialsMap, bMergeAllLODs, bMergeMaterialData, MergedAssetPivot, MergedRawMeshes);
 
 	// Populate mesh section map
 	FMeshSectionInfoMap SectionInfoMap;	
@@ -2546,6 +2442,8 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 			Package->Modify();
 		}
 
+		FStaticMeshComponentRecreateRenderStateContext RecreateRenderStateContext(FindObject<UStaticMesh>(Package, *AssetName));
+
 		UStaticMesh* StaticMesh = NewObject<UStaticMesh>(Package, *AssetName, RF_Public | RF_Standalone);
 		StaticMesh->InitResources();
 
@@ -2560,7 +2458,7 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 		}
 
 		TArray<UMaterialInterface*> ImposterMaterials;
-
+		FBox ImposterBounds(EForceInit::ForceInit);
 		for (int32 LODIndex = 0; LODIndex < MergedRawMeshes.Num(); ++LODIndex)
 		{	
 			FRawMesh& MergedMeshLOD = MergedRawMeshes[LODIndex];
@@ -2577,12 +2475,25 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 				SrcModel.BuildSettings.MinLightmapResolution = InSettings.bComputedLightMapResolution ? DataTracker.GetLightMapDimension() : InSettings.TargetLightMapResolution;
 				SrcModel.BuildSettings.SrcLightmapIndex = 0;
 				SrcModel.BuildSettings.DstLightmapIndex = LightMapUVChannel;
+				if(!InSettings.bAllowDistanceField)
+				{
+					SrcModel.BuildSettings.DistanceFieldResolutionScale = 0.0f;
+				}
 
 				const bool bContainsImposters = ImposterComponents.Num() > 0;
 				if (bContainsImposters)
 				{
 					// Merge imposter meshes to rawmesh
-					FMeshMergeHelpers::MergeImpostersToRawMesh(ImposterComponents, MergedMeshLOD, MergedAssetPivot, UniqueMaterials.Num(), ImposterMaterials);
+					FMeshMergeHelpers::MergeImpostersToRawMesh(ImposterComponents, MergedMeshLOD, MergedAssetPivot, UniqueMaterials.Num(), ImposterMaterials);					
+
+					const FTransform PivotTransform = FTransform(MergedAssetPivot);
+					for (const UStaticMeshComponent* Component : ImposterComponents)
+					{
+						if (Component->GetStaticMesh())
+						{
+							ImposterBounds += Component->GetStaticMesh()->GetBoundingBox().TransformBy(Component->GetComponentToWorld().GetRelativeTransform(PivotTransform));
+						}
+					}
 				}
 
 				SrcModel.SaveRawMesh(MergedMeshLOD);
@@ -2665,13 +2576,268 @@ void FMeshMergeUtilities::MergeComponentsToStaticMesh(const TArray<UPrimitiveCom
 		StaticMesh->LightMapResolution = InSettings.bComputedLightMapResolution ? DataTracker.GetLightMapDimension() : InSettings.TargetLightMapResolution;
 
 		StaticMesh->Build(bSilent);
+
+		if (ImposterBounds.IsValid)
+		{
+			const FBox StaticMeshBox = StaticMesh->GetBoundingBox();
+			const FBox CombinedBox = StaticMeshBox + ImposterBounds;
+			StaticMesh->PositiveBoundsExtension = (CombinedBox.Max - StaticMeshBox.Max);
+			StaticMesh->NegativeBoundsExtension = (StaticMeshBox.Min - CombinedBox.Min);
+			StaticMesh->CalculateExtendedBounds();
+		}		
+
 		StaticMesh->PostEditChange();
 
 		OutAssetsToSync.Add(StaticMesh);
 		OutMergedActorLocation = MergedAssetPivot;
 	}
+}
 
-	return;
+void FMeshMergeUtilities::CreateMergedRawMeshes(FMeshMergeDataTracker& InDataTracker, const FMeshMergingSettings& InSettings, const TArray<UStaticMeshComponent*>& InStaticMeshComponentsToMerge, const TArray<UMaterialInterface*>& InUniqueMaterials, const TMap<UMaterialInterface*, UMaterialInterface*>& InCollapsedMaterialMap, const TMultiMap<FMeshLODKey, MaterialRemapPair>& InOutputMaterialsMap, bool bInMergeAllLODs, bool bInMergeMaterialData, const FVector& InMergedAssetPivot, TArray<FRawMesh>& OutMergedRawMeshes) const
+{
+	if (bInMergeAllLODs)
+	{
+		OutMergedRawMeshes.AddDefaulted(InDataTracker.GetNumLODsForMergedMesh());
+		for (TConstLODIndexIterator Iterator = InDataTracker.GetLODIndexIterator(); Iterator; ++Iterator)
+		{
+			// Find meshes for each lod
+			const int32 LODIndex = *Iterator;
+			FRawMesh& MergedMesh = OutMergedRawMeshes[LODIndex];
+			for (int32 ComponentIndex = 0; ComponentIndex < InStaticMeshComponentsToMerge.Num(); ++ComponentIndex)
+			{
+				int32 RetrievedLODIndex = LODIndex;
+				FRawMesh* RawMeshPtr = InDataTracker.TryFindRawMeshForLOD(ComponentIndex, RetrievedLODIndex);
+
+				if (RawMeshPtr != nullptr)
+				{
+					MergedMesh.FaceSmoothingMasks.Append(RawMeshPtr->FaceSmoothingMasks);
+
+					if (bInMergeMaterialData)
+					{
+						MergedMesh.FaceMaterialIndices.AddZeroed(RawMeshPtr->FaceMaterialIndices.Num());
+					}
+					else
+					{
+						TArray<SectionRemapPair> SectionMappings;
+						InDataTracker.GetMappingsForMeshLOD(FMeshLODKey(ComponentIndex, LODIndex), SectionMappings);
+	
+						for (const int32 FaceIndex : RawMeshPtr->FaceMaterialIndices)
+						{
+							// First map from original section index to unique material index
+							int32 UniqueIndex = INDEX_NONE;
+							// then map to the output material map, if any
+							if(InOutputMaterialsMap.Num() > 0)
+							{
+								TArray<MaterialRemapPair> MaterialMappings;
+								InOutputMaterialsMap.MultiFind(FMeshLODKey(ComponentIndex, LODIndex), MaterialMappings);
+								for(MaterialRemapPair& Pair : MaterialMappings)
+								{
+									if(Pair.Key == FaceIndex)
+									{
+										UniqueIndex = Pair.Value;
+										break;
+									}
+								}
+
+								// Note that at this point UniqueIndex is NOT a material index, but a unique section index!
+							}
+							else
+							{
+								UniqueIndex = FaceIndex;
+							}
+
+							MergedMesh.FaceMaterialIndices.Add(UniqueIndex);
+						}
+					}
+
+					InDataTracker.AddComponentToWedgeMapping(ComponentIndex, LODIndex, MergedMesh.WedgeIndices.Num());
+					const int32 VertexOffset = MergedMesh.VertexPositions.Num();
+					for (int32 WedgeIndex : RawMeshPtr->WedgeIndices)
+					{
+						MergedMesh.WedgeIndices.Add(WedgeIndex + VertexOffset);
+					}
+
+					for (FVector VertexPos : RawMeshPtr->VertexPositions)
+					{
+						MergedMesh.VertexPositions.Add(VertexPos - InMergedAssetPivot);
+					}
+
+					MergedMesh.WedgeTangentX.Append(RawMeshPtr->WedgeTangentX);
+					MergedMesh.WedgeTangentY.Append(RawMeshPtr->WedgeTangentY);
+					MergedMesh.WedgeTangentZ.Append(RawMeshPtr->WedgeTangentZ);
+
+					// Deal with vertex colors
+					// Some meshes may have it, in this case merged mesh will be forced to have vertex colors as well
+					if (InSettings.bBakeVertexDataToMesh)
+					{
+						if (InDataTracker.DoesLODContainVertexColors(0) && RawMeshPtr->WedgeColors.Num())
+						{
+							MergedMesh.WedgeColors.Append(RawMeshPtr->WedgeColors);
+						}
+						else
+						{
+							// In case this source mesh does not have vertex colors, fill target with 0xFF
+							int32 ColorsOffset = MergedMesh.WedgeColors.Num();
+							int32 ColorsNum = RawMeshPtr->WedgeIndices.Num();
+							MergedMesh.WedgeColors.AddUninitialized(ColorsNum);
+							FMemory::Memset(&MergedMesh.WedgeColors[ColorsOffset], 0xFF, ColorsNum*MergedMesh.WedgeColors.GetTypeSize());
+						}
+					}
+
+					// Merge all other UV channels 
+					for (int32 ChannelIdx = 0; ChannelIdx < MAX_MESH_TEXTURE_COORDS; ++ChannelIdx)
+					{
+						// Whether this channel has data
+						if (InDataTracker.DoesUVChannelContainData(ChannelIdx, RetrievedLODIndex))
+						{
+							const TArray<FVector2D>& SourceChannel = RawMeshPtr->WedgeTexCoords[ChannelIdx];
+							TArray<FVector2D>& TargetChannel = MergedMesh.WedgeTexCoords[ChannelIdx];
+
+							// Whether source mesh has data in this channel
+							if (SourceChannel.Num())
+							{
+								TargetChannel.Append(SourceChannel);
+							}
+							else
+							{
+								// Fill with zero coordinates if source mesh has no data for this channel
+								const int32 TexCoordNum = RawMeshPtr->WedgeIndices.Num();
+								for (int32 CoordIdx = 0; CoordIdx < TexCoordNum; ++CoordIdx)
+								{
+									TargetChannel.Add(FVector2D::ZeroVector);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+	{	
+		OutMergedRawMeshes.AddZeroed(1);
+		FRawMesh& MergedMesh = OutMergedRawMeshes.Last();
+		for (int32 ComponentIndex = 0; ComponentIndex < InStaticMeshComponentsToMerge.Num(); ++ComponentIndex)
+		{
+			int32 LODIndex = 0;
+		
+			FRawMesh* RawMeshPtr = InDataTracker.FindRawMeshAndLODIndex(ComponentIndex, LODIndex);
+
+			if (RawMeshPtr != nullptr)
+			{
+				FRawMesh& RawMesh = *RawMeshPtr;
+
+				MergedMesh.FaceSmoothingMasks.Append(RawMesh.FaceSmoothingMasks);
+
+				if (bInMergeMaterialData)
+				{
+					MergedMesh.FaceMaterialIndices.AddZeroed(RawMesh.FaceMaterialIndices.Num());
+				}
+				else
+				{
+					TArray<SectionRemapPair> SectionMappings;
+					InDataTracker.GetMappingsForMeshLOD(FMeshLODKey(ComponentIndex, LODIndex), SectionMappings);
+
+					for (const int32 FaceIndex : RawMesh.FaceMaterialIndices)
+					{
+						// First map from original section index to unique material index
+						int32 UniqueIndex = INDEX_NONE;
+
+						// then map to the output material map, if any
+						if(InOutputMaterialsMap.Num() > 0)
+						{
+							TArray<MaterialRemapPair> MaterialMappings;
+							InOutputMaterialsMap.MultiFind(FMeshLODKey(ComponentIndex, LODIndex), MaterialMappings);
+							for(MaterialRemapPair& Pair : MaterialMappings)
+							{
+								if(Pair.Key == FaceIndex)
+								{
+									UniqueIndex = Pair.Value;
+									break;
+								}
+							}
+
+							// Note that at this point UniqueIndex is NOT a material index, but a unique section index!
+						}
+						else
+						{
+							UniqueIndex = FaceIndex;
+						}
+
+						MergedMesh.FaceMaterialIndices.Add(UniqueIndex);
+					}
+				}
+
+				const int32 TargetLODIndex = 0;
+				InDataTracker.AddComponentToWedgeMapping(ComponentIndex, TargetLODIndex, MergedMesh.WedgeIndices.Num());
+
+				const int32 VertexOffset = MergedMesh.VertexPositions.Num();
+
+				for (int32 Index : RawMesh.WedgeIndices)
+				{
+					MergedMesh.WedgeIndices.Add(Index + VertexOffset);
+				}
+
+				for (FVector VertexPos : RawMesh.VertexPositions)
+				{
+					MergedMesh.VertexPositions.Add(VertexPos - InMergedAssetPivot);
+				}
+
+				MergedMesh.WedgeTangentX.Append(RawMesh.WedgeTangentX);
+				MergedMesh.WedgeTangentY.Append(RawMesh.WedgeTangentY);
+				MergedMesh.WedgeTangentZ.Append(RawMesh.WedgeTangentZ);
+
+				// Deal with vertex colors
+				// Some meshes may have it, in this case merged mesh will be forced to have vertex colors as well
+				if (InSettings.bBakeVertexDataToMesh)
+				{
+					if (InDataTracker.DoesAnyLODContainVertexColors() && RawMesh.WedgeColors.Num())
+					{
+						MergedMesh.WedgeColors.Append(RawMesh.WedgeColors);
+					}
+					else
+					{
+						// In case this source mesh does not have vertex colors, fill target with 0xFF
+						int32 ColorsOffset = MergedMesh.WedgeColors.Num();
+						int32 ColorsNum = RawMesh.WedgeIndices.Num();
+						MergedMesh.WedgeColors.AddUninitialized(ColorsNum);
+						FMemory::Memset(&MergedMesh.WedgeColors[ColorsOffset], 0xFF, ColorsNum*MergedMesh.WedgeColors.GetTypeSize());
+					}
+				}
+
+				// Merge all other UV channels 
+				for (int32 ChannelIdx = 0; ChannelIdx < MAX_MESH_TEXTURE_COORDS; ++ChannelIdx)
+				{
+					// Whether this channel has data
+					if (InDataTracker.DoesUVChannelContainData(ChannelIdx) && InSettings.OutputUVs[ChannelIdx] == EUVOutput::OutputChannel)
+					{
+						const TArray<FVector2D>& SourceChannel = RawMesh.WedgeTexCoords[ChannelIdx];
+						TArray<FVector2D>& TargetChannel = MergedMesh.WedgeTexCoords[ChannelIdx];
+
+						// Whether source mesh has data in this channel
+						if (SourceChannel.Num())
+						{
+							TargetChannel.Append(SourceChannel);
+						}
+						else
+						{
+							// Fill with zero coordinates if source mesh has no data for this channel
+							const int32 TexCoordNum = RawMesh.WedgeIndices.Num();
+							for (int32 CoordIdx = 0; CoordIdx < TexCoordNum; ++CoordIdx)
+							{
+								TargetChannel.Add(FVector2D::ZeroVector);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	for (IMeshMergeExtension* Extension : MeshMergeExtensions)
+	{
+		Extension->OnCreatedMergedRawMeshes(InStaticMeshComponentsToMerge, InDataTracker, OutMergedRawMeshes);
+	}
 }
 
 void FMeshMergeUtilities::MergeComponentsToInstances(const TArray<UPrimitiveComponent*>& ComponentsToMerge, UWorld* World, ULevel* Level, const FMeshInstancingSettings& InSettings, bool bActuallyMerge /*= true*/, FText* OutResultsText /*= nullptr*/) const
@@ -2899,16 +3065,6 @@ void FMeshMergeUtilities::MergeComponentsToInstances(const TArray<UPrimitiveComp
 						for(UStaticMeshComponent* OriginalComponent : ComponentEntry.OriginalComponents)
 						{
 							NewComponent->AddInstance(OriginalComponent->GetComponentTransform());
-
-							// Dirty any HLODs we are linked to
-							UPrimitiveComponent* LODParent = OriginalComponent->GetLODParentPrimitive();
-							if(LODParent != nullptr)
-							{
-								if(ALODActor* LODActor = Cast<ALODActor>(LODParent->GetOwner()))
-								{
-									LODActor->SetIsDirty(true);
-								}
-							}
 						}
 
 						NewComponent->RegisterComponent();
diff --git a/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.h b/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.h
index d0121aefa8ef..9683675fc759 100644
--- a/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.h
+++ b/Engine/Source/Developer/MeshMergeUtilities/Private/MeshMergeUtilities.h
@@ -5,12 +5,18 @@
 #include "IMeshMergeUtilities.h"
 #include "SceneTypes.h"
 
+class FMeshMergeDataTracker;
+struct FMeshLODKey;
+
+typedef TPair<uint32, uint32> MaterialRemapPair;
+
 /**
  * Mesh Merge Utilities
  */
 class MESHMERGEUTILITIES_API FMeshMergeUtilities : public IMeshMergeUtilities
 {
 public:	
+	friend class FProxyGenerationProcessor;
 	FMeshMergeUtilities();
 	virtual ~FMeshMergeUtilities() override;
 	virtual void BakeMaterialsForComponent(TArray<TWeakObjectPtr<UObject>>& OptionObjects, IMaterialBakingAdapter* Adapter) const override;
@@ -45,7 +51,9 @@ protected:
 	/** Merges flattened material into atlas textures */
 	void MergeFlattenedMaterials(TArray<struct FFlattenMaterial>& InMaterialList, int32 InGutter, FFlattenMaterial& OutMergedMaterial, TArray<FUVOffsetScalePair>& OutUVTransforms) const;
 	/** Merges flattened material into binned textures */
-	void FlattenBinnedMaterials(TArray<struct FFlattenMaterial>& InMaterialList, const TArray<FBox2D>& InMaterialBoxes, int32 InGutter, FFlattenMaterial& OutMergedMaterial, TArray<FUVOffsetScalePair>& OutUVTransforms) const;
+	void FlattenBinnedMaterials(TArray<struct FFlattenMaterial>& InMaterialList, const TArray<FBox2D>& InMaterialBoxes, int32 InGutter, bool bCopyOnlyMaskedPixels, FFlattenMaterial& OutMergedMaterial, TArray<FUVOffsetScalePair>& OutUVTransforms) const;
+	/** Helper function to create the final merged raw meshes */
+	void CreateMergedRawMeshes(FMeshMergeDataTracker& InDataTracker, const FMeshMergingSettings& InSettings, const TArray<UStaticMeshComponent*>& InStaticMeshComponentsToMerge, const TArray<UMaterialInterface*>& InUniqueMaterials, const TMap<UMaterialInterface*, UMaterialInterface*>& InCollapsedMaterialMap, const TMultiMap<FMeshLODKey, MaterialRemapPair>& InOutputMaterialsMap, bool bInMergeAllLODs, bool bInMergeMaterialData, const FVector& InMergedAssetPivot, TArray<FRawMesh>& OutMergedRawMeshes) const;
 protected:
 	/** Flattens out emissive scale across all flatten material instances */
 	float FlattenEmissivescale(TArray<struct FFlattenMaterial>& InMaterialList) const;
@@ -54,7 +62,7 @@ protected:
 	/** Populates a single property entry with correct material baking settings */
 	void PopulatePropertyEntry(const FMaterialProxySettings& MaterialSettings, EMaterialProperty MaterialProperty, struct FPropertyEntry& InOutPropertyEntry) const;
 	/** Copies part (box) from a texture to another texture */
-	void CopyTextureRect(const FColor* Src, const FIntPoint& SrcSize, FColor* Dst, const FIntPoint& DstSize, const FIntPoint& DstPos) const;
+	void CopyTextureRect(const FColor* Src, const FIntPoint& SrcSize, FColor* Dst, const FIntPoint& DstSize, const FIntPoint& DstPos, bool bCopyOnlyMaskedPixels = false) const;
 	/** Sets a part (box) on a texture to ColorValue */
 	void SetTextureRect(const FColor& ColorValue, const FIntPoint& SrcSize, FColor* Dst, const FIntPoint& DstSize, const FIntPoint& DstPos) const;
 	/** Conditionally resizes the source data into OutImage */
diff --git a/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.cpp b/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.cpp
index 723dac663942..8608f6e5bed9 100644
--- a/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.cpp
+++ b/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.cpp
@@ -2,10 +2,10 @@
 
 #include "ProxyGenerationProcessor.h"
 #include "MaterialUtilities.h"
-#include "MeshUtilities.h"
+#include "MeshMergeUtilities.h"
+#include "IMeshMergeExtension.h"
 #include "ProxyMaterialUtilities.h"
 #include "IMeshReductionInterfaces.h"
-
 #include "IMeshReductionManagerModule.h"
 #include "Modules/ModuleManager.h"
 
@@ -14,7 +14,8 @@
 #include "MeshMergeHelpers.h"
 #endif // WITH_EDITOR
 
-FProxyGenerationProcessor::FProxyGenerationProcessor()
+FProxyGenerationProcessor::FProxyGenerationProcessor(const FMeshMergeUtilities* InOwner)
+	: Owner(InOwner)
 {
 #if WITH_EDITOR
 	FEditorDelegates::MapChange.AddRaw(this, &FProxyGenerationProcessor::OnMapChange);
@@ -144,6 +145,11 @@ void FProxyGenerationProcessor::ProcessJob(const FGuid& JobGuid, FProxyGeneratio
 	// Create a new proxy material instance
 	UMaterialInstanceConstant* ProxyMaterial = ProxyMaterialUtilities::CreateProxyMaterialInstance(Data->MergeData->InOuter, Data->MergeData->InProxySettings.MaterialSettings, Data->MergeData->BaseMaterial, FlattenMaterial, AssetBasePath, AssetBaseName, OutAssetsToSync);
 
+	for (IMeshMergeExtension* Extension : Owner->MeshMergeExtensions)
+	{
+		Extension->OnCreatedProxyMaterial(Data->MergeData->StaticMeshComponents, ProxyMaterial);
+	}
+
 	// Set material static lighting usage flag if project has static lighting enabled
 	static const auto AllowStaticLightingVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.AllowStaticLighting"));
 	const bool bAllowStaticLighting = (!AllowStaticLightingVar || AllowStaticLightingVar->GetValueOnGameThread() != 0);
@@ -162,6 +168,8 @@ void FProxyGenerationProcessor::ProcessJob(const FGuid& JobGuid, FProxyGeneratio
 		MeshPackage->Modify();
 	}
 
+	FStaticMeshComponentRecreateRenderStateContext RecreateRenderStateContext(FindObject<UStaticMesh>(MeshPackage, *MeshAssetName));
+
 	UStaticMesh* StaticMesh = NewObject<UStaticMesh>(MeshPackage, FName(*MeshAssetName), RF_Public | RF_Standalone);
 	StaticMesh->InitResources();
 
@@ -191,6 +199,7 @@ void FProxyGenerationProcessor::ProcessJob(const FGuid& JobGuid, FProxyGeneratio
 	}
 
 	const bool bContainsImposters = Data->MergeData->ImposterComponents.Num() > 0;
+	FBox ImposterBounds(EForceInit::ForceInit);
 	if (bContainsImposters)
 	{
 		TArray<UMaterialInterface*> ImposterMaterials;
@@ -199,6 +208,15 @@ void FProxyGenerationProcessor::ProcessJob(const FGuid& JobGuid, FProxyGeneratio
 		// The base material index is always one here as we assume we only have one HLOD material
 		FMeshMergeHelpers::MergeImpostersToRawMesh(Data->MergeData->ImposterComponents, Data->RawMesh, FVector::ZeroVector, 1, ImposterMaterials);
 
+		
+		for (const UStaticMeshComponent* Component : Data->MergeData->ImposterComponents)
+		{
+			if (Component->GetStaticMesh())
+			{
+				ImposterBounds += Component->GetStaticMesh()->GetBoundingBox().TransformBy(Component->GetComponentToWorld());
+			}
+		}
+
 		if (!Data->MergeData->InProxySettings.bAllowVertexColors)
 		{
 			Data->RawMesh.WedgeColors.Empty();
@@ -247,7 +265,17 @@ void FProxyGenerationProcessor::ProcessJob(const FGuid& JobGuid, FProxyGeneratio
 	}
 
 	StaticMesh->Build();
-	StaticMesh->PostEditChange();
+
+	if (ImposterBounds.IsValid)
+	{
+		const FBox StaticMeshBox = StaticMesh->GetBoundingBox();
+		const FBox CombinedBox = StaticMeshBox + ImposterBounds;
+		StaticMesh->PositiveBoundsExtension = (CombinedBox.Max - StaticMeshBox.Max);
+		StaticMesh->NegativeBoundsExtension = (StaticMeshBox.Min - CombinedBox.Min);
+		StaticMesh->CalculateExtendedBounds();
+	}
+
+	StaticMesh->PostEditChange();	
 
 	OutAssetsToSync.Add(StaticMesh);
 
diff --git a/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.h b/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.h
index c5adb61991c7..f28075701439 100644
--- a/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.h
+++ b/Engine/Source/Developer/MeshMergeUtilities/Private/ProxyGenerationProcessor.h
@@ -8,13 +8,14 @@
 
 struct FMergeCompleteData;
 struct FProxyGenerationData;
+class FMeshMergeUtilities;
 
 DECLARE_LOG_CATEGORY_EXTERN(LogMeshMerging, Verbose, All);
 
 class FProxyGenerationProcessor : FTickerObjectBase
 {
 public:
-	FProxyGenerationProcessor();
+	FProxyGenerationProcessor(const FMeshMergeUtilities* InOwner);
 	~FProxyGenerationProcessor();
 
 	void AddProxyJob(FGuid InJobGuid, FMergeCompleteData* InCompleteData);
@@ -52,5 +53,7 @@ protected:
 	TMap<FGuid, FProxyGenerationData*> ToProcessJobDataMap;
 	/** Critical section to keep ProxyMeshJobs/ToProcessJobDataMap access thread-safe */
 	FCriticalSection StateLock;
+
+	const FMeshMergeUtilities* Owner;
 };
 
diff --git a/Engine/Source/Developer/MeshReductionInterface/Public/IMeshReductionInterfaces.h b/Engine/Source/Developer/MeshReductionInterface/Public/IMeshReductionInterfaces.h
index 3c9a1932831f..5ca4fd794746 100644
--- a/Engine/Source/Developer/MeshReductionInterface/Public/IMeshReductionInterfaces.h
+++ b/Engine/Source/Developer/MeshReductionInterface/Public/IMeshReductionInterfaces.h
@@ -84,6 +84,8 @@ struct FMergeCompleteData
 	FCreateProxyDelegate CallbackDelegate;
 	/** List of Components containing imposter LODs */
 	TArray<const UStaticMeshComponent*> ImposterComponents;
+	/** List of Components incorporated into the Proxy Mesh */
+	TArray<UStaticMeshComponent*> StaticMeshComponents;
 	/** Base material to instance for the proxy material */
 	UMaterialInterface* BaseMaterial;
 };
diff --git a/Engine/Source/Developer/MeshSimplifier/Private/QuadricMeshReduction.cpp b/Engine/Source/Developer/MeshSimplifier/Private/QuadricMeshReduction.cpp
index 63e2b2595035..6d631ba5e8de 100644
--- a/Engine/Source/Developer/MeshSimplifier/Private/QuadricMeshReduction.cpp
+++ b/Engine/Source/Developer/MeshSimplifier/Private/QuadricMeshReduction.cpp
@@ -187,6 +187,13 @@ public:
 	{
 		IMeshUtilities& MeshUtilities = FModuleManager::Get().LoadModuleChecked<IMeshUtilities>("MeshUtilities");
 
+		TArray<FVector> VertexPositions;
+		TArray<uint32> Indices;
+		if (InSettings.WeldingThreshold > 0.0f)
+		{
+			WeldVertexPositions(InMesh, InSettings.WeldingThreshold, VertexPositions, Indices);
+		}
+
 		const uint32 NumTexCoords = MAX_STATIC_TEXCOORDS;
 
 		TArray< TVertSimp< NumTexCoords > >	Verts;
@@ -203,7 +210,14 @@ public:
 			FVector Positions[3];
 			for (int32 CornerIndex = 0; CornerIndex < 3; CornerIndex++)
 			{
-				Positions[CornerIndex] = InMesh.VertexPositions[ InMesh.WedgeIndices[ FaceIndex * 3 + CornerIndex ] ];
+				if (InSettings.WeldingThreshold > 0.0f)
+				{
+					Positions[CornerIndex] = VertexPositions[Indices[FaceIndex * 3 + CornerIndex]];
+				}
+				else
+				{
+					Positions[CornerIndex] = InMesh.VertexPositions[InMesh.WedgeIndices[FaceIndex * 3 + CornerIndex]];
+				}
 			}
 
 			// Don't process degenerate triangles.
@@ -867,6 +881,53 @@ public:
 	{
 		return new FQuadricSimplifierMeshReduction;
 	}
+private:
+	void WeldVertexPositions(const FRawMesh& InMesh, const float WeldingThreshold, TArray<FVector>& OutVertexPositions, TArray<uint32>& OutIndices)
+	{
+		//The remap use to fix the indices after welding the vertex position buffer
+		TArray<int32> VertexRemap;
+		//Initialize some arrays
+		VertexRemap.AddZeroed(InMesh.VertexPositions.Num());
+		for (int32 VertexIndexRef = 0; VertexIndexRef < InMesh.VertexPositions.Num(); ++VertexIndexRef)
+		{
+			VertexRemap[VertexIndexRef] = INDEX_NONE;
+		}
+		OutVertexPositions.Reserve(InMesh.VertexPositions.Num());
+		//Weld overlapping vertex position
+		for (int32 VertexIndexRef = 0; VertexIndexRef < InMesh.VertexPositions.Num(); ++VertexIndexRef)
+		{
+			//Skip already remap vertex
+			if (VertexRemap[VertexIndexRef] != INDEX_NONE)
+			{
+				continue;
+			}
+			const FVector& PositionA = InMesh.VertexPositions[VertexIndexRef];
+			//Add this vertex to the new vertex buffer
+			VertexRemap[VertexIndexRef] = OutVertexPositions.Add(InMesh.VertexPositions[VertexIndexRef]);
+			//Find vertex to weld, search forward VertexIndexRef
+			for (int32 VertexIndex = VertexIndexRef + 1; VertexIndex < InMesh.VertexPositions.Num(); ++VertexIndex)
+			{
+				//skip already remap vertex
+				if (VertexRemap[VertexIndex] != INDEX_NONE)
+				{
+					continue;
+				}
+				const FVector& PositionB = InMesh.VertexPositions[VertexIndex];
+				if (PositionA.Equals(PositionB, WeldingThreshold))
+				{
+					//Remap this vertex to the "reference remapped vertex"
+					VertexRemap[VertexIndex] = VertexRemap[VertexIndexRef];
+				}
+			}
+		}
+		//Remap the indices to the new vertex position buffer
+		OutIndices.AddZeroed(InMesh.WedgeIndices.Num());
+		for (int32 WedgeIndex = 0; WedgeIndex < InMesh.WedgeIndices.Num(); ++WedgeIndex)
+		{
+			int32 VertexIndex = InMesh.WedgeIndices[WedgeIndex];
+			OutIndices[WedgeIndex] = VertexRemap[VertexIndex] == INDEX_NONE ? VertexIndex : VertexRemap[VertexIndex];
+		}
+	}
 };
 TUniquePtr<FQuadricSimplifierMeshReduction> GQuadricSimplifierMeshReduction;
 
diff --git a/Engine/Source/Developer/MeshUtilities/Private/MeshUtilities.cpp b/Engine/Source/Developer/MeshUtilities/Private/MeshUtilities.cpp
index e2421eb679eb..e61cd7fa307f 100644
--- a/Engine/Source/Developer/MeshUtilities/Private/MeshUtilities.cpp
+++ b/Engine/Source/Developer/MeshUtilities/Private/MeshUtilities.cpp
@@ -5934,18 +5934,73 @@ void FMeshUtilities::CreateProxyMesh(const TArray<AActor*>& InActors, const stru
 	Module.CreateProxyMesh(InActors, InMeshProxySettings, InOuter, InProxyBasePackageName, InGuid, InProxyCreatedDelegate, bAllowAsync, ScreenAreaSize);
 }
 
-bool FMeshUtilities::GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, TArray<FVector2D>& OutTexCoords) const
+bool FMeshUtilities::GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, bool bMergeIdenticalMaterials, TArray<FVector2D>& OutTexCoords) const
 {
 	// Create a copy of original mesh (only copy necessary data)
 	FRawMesh TempMesh;
-	TempMesh.WedgeTexCoords[0] = RawMesh.WedgeTexCoords[0];
-	TempMesh.WedgeIndices = RawMesh.WedgeIndices;
 	TempMesh.VertexPositions = RawMesh.VertexPositions;
 
+	// Remove all duplicate faces if we are merging identical materials
+	const int32 NumFaces = RawMesh.FaceMaterialIndices.Num();
+	TArray<int32> DuplicateFaceRecords;
+	
+	if(bMergeIdenticalMaterials)
+	{
+		TArray<int32> UniqueFaceIndices;
+		UniqueFaceIndices.Reserve(NumFaces);
+		DuplicateFaceRecords.SetNum(NumFaces);
+
+		TempMesh.WedgeTexCoords[0].Reserve(RawMesh.WedgeTexCoords[0].Num());
+		TempMesh.WedgeIndices.Reserve(RawMesh.WedgeIndices.Num());
+
+		// insert only non-duplicate faces
+		for(int32 FaceIndex = 0; FaceIndex < NumFaces; ++FaceIndex)
+		{
+			bool bFound = false;
+			int32 UniqueFaceIndex = 0;
+			for( ; UniqueFaceIndex < UniqueFaceIndices.Num(); ++UniqueFaceIndex)
+			{
+				int32 TestIndex = UniqueFaceIndices[UniqueFaceIndex];
+
+				if (TestIndex != FaceIndex &&
+					RawMesh.FaceMaterialIndices[FaceIndex] == RawMesh.FaceMaterialIndices[TestIndex] &&
+					RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 0] == RawMesh.WedgeTexCoords[0][(TestIndex * 3) + 0] &&
+					RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 1] == RawMesh.WedgeTexCoords[0][(TestIndex * 3) + 1] &&
+					RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 2] == RawMesh.WedgeTexCoords[0][(TestIndex * 3) + 2])
+				{
+					bFound = true;
+					break;
+				}
+			}
+
+			if(!bFound)
+			{
+				UniqueFaceIndices.Add(FaceIndex);
+				TempMesh.WedgeTexCoords[0].Add(RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 0]);
+				TempMesh.WedgeTexCoords[0].Add(RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 1]);
+				TempMesh.WedgeTexCoords[0].Add(RawMesh.WedgeTexCoords[0][(FaceIndex * 3) + 2]);
+				TempMesh.WedgeIndices.Add(RawMesh.WedgeIndices[(FaceIndex * 3) + 0]);
+				TempMesh.WedgeIndices.Add(RawMesh.WedgeIndices[(FaceIndex * 3) + 1]);
+				TempMesh.WedgeIndices.Add(RawMesh.WedgeIndices[(FaceIndex * 3) + 2]);
+
+				DuplicateFaceRecords[FaceIndex] = UniqueFaceIndices.Num() - 1;
+			}
+			else
+			{
+				DuplicateFaceRecords[FaceIndex] = UniqueFaceIndex;
+			}
+		}
+	}
+	else
+	{
+		TempMesh.WedgeTexCoords[0] = RawMesh.WedgeTexCoords[0];
+		TempMesh.WedgeIndices = RawMesh.WedgeIndices;	
+	}
+
 	// Find overlapping corners for UV generator. Allow some threshold - this should not produce any error in a case if resulting
 	// mesh will not merge these vertices.
 	FOverlappingCorners OverlappingCorners;
-	FModuleManager::Get().LoadModuleChecked<IMeshUtilities>("MeshUtilities").FindOverlappingCorners(OverlappingCorners, RawMesh.VertexPositions, RawMesh.WedgeIndices, THRESH_POINTS_ARE_SAME);
+	FModuleManager::Get().LoadModuleChecked<IMeshUtilities>("MeshUtilities").FindOverlappingCorners(OverlappingCorners, TempMesh.VertexPositions, TempMesh.WedgeIndices, THRESH_POINTS_ARE_SAME);
 
 	// Generate new UVs
 	FLayoutUV Packer(&TempMesh, 0, 1, FMath::Clamp(TextureResolution / 4, 32, 512));
@@ -5955,13 +6010,36 @@ bool FMeshUtilities::GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int
 	if (bPackSuccess)
 	{
 		Packer.CommitPackedUVs();
-		// Save generated UVs
-		OutTexCoords = TempMesh.WedgeTexCoords[1];
-	}
+
+		if(bMergeIdenticalMaterials)
+		{
+			// re-duplicate faces
+			OutTexCoords.SetNum(RawMesh.WedgeTexCoords[0].Num());
+
+			for(int32 FaceIndex = 0; FaceIndex < DuplicateFaceRecords.Num(); ++FaceIndex)
+			{
+				int32 SourceFaceIndex = DuplicateFaceRecords[FaceIndex];
+
+				OutTexCoords[(FaceIndex * 3) + 0] = TempMesh.WedgeTexCoords[1][(SourceFaceIndex * 3) + 0];
+				OutTexCoords[(FaceIndex * 3) + 1] = TempMesh.WedgeTexCoords[1][(SourceFaceIndex * 3) + 1];
+				OutTexCoords[(FaceIndex * 3) + 2] = TempMesh.WedgeTexCoords[1][(SourceFaceIndex * 3) + 2];
+			}
+		}
+		else
+		{
+			// Save generated UVs
+			OutTexCoords = TempMesh.WedgeTexCoords[1];	
+		}
+ 	}
 
 	return bPackSuccess;
 }
 
+bool FMeshUtilities::GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, TArray<FVector2D>& OutTexCoords) const
+{
+	return GenerateUniqueUVsForStaticMesh(RawMesh, TextureResolution, false, OutTexCoords);
+}
+
 void FMeshUtilities::FlattenMaterialsWithMeshData(TArray<UMaterialInterface*>& InMaterials, TArray<FRawMeshExt>& InSourceMeshes, TMap<FMeshIdAndLOD, TArray<int32>>& InMaterialIndexMap, TArray<bool>& InMeshShouldBakeVertexData, const FMaterialProxySettings &InMaterialProxySettings, TArray<FFlattenMaterial> &OutFlattenedMaterials) const
 {
 	checkf(false, TEXT("Function is removed, use functionality in new MeshMergeUtilities Module"));
diff --git a/Engine/Source/Developer/MeshUtilities/Private/MeshUtilitiesPrivate.h b/Engine/Source/Developer/MeshUtilities/Private/MeshUtilitiesPrivate.h
index 6649ca2a9c0f..33d1bb8e7c09 100644
--- a/Engine/Source/Developer/MeshUtilities/Private/MeshUtilitiesPrivate.h
+++ b/Engine/Source/Developer/MeshUtilities/Private/MeshUtilitiesPrivate.h
@@ -104,6 +104,7 @@ private:
 	virtual void RecomputeTangentsAndNormalsForRawMesh(bool bRecomputeTangents, bool bRecomputeNormals, const FMeshBuildSettings& InBuildSettings, const FOverlappingCorners& InOverlappingCorners, FRawMesh &OutRawMesh) const override;
 
 	virtual bool GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, TArray<FVector2D>& OutTexCoords) const override;
+	virtual bool GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, bool bMergeIdenticalMaterials, TArray<FVector2D>& OutTexCoords) const override;
 
 	virtual bool BuildSkeletalMesh(FSkeletalMeshLODModel& LODModel, const FReferenceSkeleton& RefSkeleton, const TArray<FVertInfluence>& Influences, const TArray<FMeshWedge>& Wedges, const TArray<FMeshFace>& Faces, const TArray<FVector>& Points, const TArray<int32>& PointToOriginalMap, const MeshBuildOptions& BuildOptions = MeshBuildOptions(), TArray<FText> * OutWarningMessages = NULL, TArray<FName> * OutWarningNames = NULL) override;
 	bool BuildSkeletalMesh_Legacy(FSkeletalMeshLODModel& LODModel, const FReferenceSkeleton& RefSkeleton, const TArray<FVertInfluence>& Influences, const TArray<FMeshWedge>& Wedges, const TArray<FMeshFace>& Faces, const TArray<FVector>& Points, const TArray<int32>& PointToOriginalMap, const FOverlappingThresholds& OverlappingThresholds, bool bComputeNormals = true, bool bComputeTangents = true, TArray<FText> * OutWarningMessages = NULL, TArray<FName> * OutWarningNames = NULL);
diff --git a/Engine/Source/Developer/MeshUtilities/Public/MeshUtilities.h b/Engine/Source/Developer/MeshUtilities/Public/MeshUtilities.h
index 785558717a4b..189a7502b32d 100644
--- a/Engine/Source/Developer/MeshUtilities/Public/MeshUtilities.h
+++ b/Engine/Source/Developer/MeshUtilities/Public/MeshUtilities.h
@@ -184,10 +184,12 @@ public:
 	*
 	* @param RawMesh - Raw Mesh to generate UV coordinates for
 	* @param TextureResolution - Texture resolution to take into account while generating the UVs
+	* @param bMergeIdenticalMaterials - Whether faces with identical materials can be treated as one in the resulting set of unique UVs
 	* @param OutTexCoords - New set of UV coordinates
 	* @return bool - whether or not generating the UVs succeeded
 	*/
 	virtual bool GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, TArray<FVector2D>& OutTexCoords) const = 0;
+	virtual bool GenerateUniqueUVsForStaticMesh(const FRawMesh& RawMesh, int32 TextureResolution, bool bMergeIdenticalMaterials, TArray<FVector2D>& OutTexCoords) const = 0;
 	
 	/** Returns the mesh reduction plugin if available. */
 	virtual IMeshReduction* GetStaticMeshReductionInterface() = 0;
diff --git a/Engine/Source/Developer/OutputLog/OutputLog.Build.cs b/Engine/Source/Developer/OutputLog/OutputLog.Build.cs
index f55431c09840..522251ebb0e9 100644
--- a/Engine/Source/Developer/OutputLog/OutputLog.Build.cs
+++ b/Engine/Source/Developer/OutputLog/OutputLog.Build.cs
@@ -10,14 +10,12 @@ public class OutputLog : ModuleRules
 			new string[] {
 				"Core",
 				"CoreUObject", // @todo Mac: for some reason it's needed to link in debug on Mac
-				"Engine",
                 "InputCore",
-				"UnrealEd",
 				"Slate",
 				"SlateCore",
                 "EditorStyle",
                 "TargetPlatform",
-                "DesktopPlatform",
+                "DesktopPlatform"
 			}
 		);
 	}
diff --git a/Engine/Source/Developer/OutputLog/Private/OutputLogModule.cpp b/Engine/Source/Developer/OutputLog/Private/OutputLogModule.cpp
index a35aa41e44db..e9be91ba0e65 100644
--- a/Engine/Source/Developer/OutputLog/Private/OutputLogModule.cpp
+++ b/Engine/Source/Developer/OutputLog/Private/OutputLogModule.cpp
@@ -89,9 +89,6 @@ TSharedRef<SDockTab> SpawnDeviceOutputLog( const FSpawnTabArgs& Args )
 
 void FOutputLogModule::StartupModule()
 {
-	CmdExec = MakeShared<FConsoleCommandExecutor>();
-	IModularFeatures::Get().RegisterModularFeature(IConsoleCommandExecutor::ModularFeatureName(), CmdExec.Get());
-
 	FGlobalTabmanager::Get()->RegisterNomadTabSpawner(OutputLogModule::OutputLogTabName, FOnSpawnTab::CreateStatic( &SpawnOutputLog ) )
 		.SetDisplayName(NSLOCTEXT("UnrealEditor", "OutputLogTab", "Output Log"))
 		.SetTooltipText(NSLOCTEXT("UnrealEditor", "OutputLogTooltipText", "Open the Output Log tab."))
@@ -110,8 +107,6 @@ void FOutputLogModule::StartupModule()
 
 void FOutputLogModule::ShutdownModule()
 {
-	IModularFeatures::Get().UnregisterModularFeature(IConsoleCommandExecutor::ModularFeatureName(), CmdExec.Get());
-
 	if (FSlateApplication::IsInitialized())
 	{
 		FGlobalTabmanager::Get()->UnregisterNomadTabSpawner(OutputLogModule::OutputLogTabName);
diff --git a/Engine/Source/Developer/OutputLog/Private/SOutputLog.cpp b/Engine/Source/Developer/OutputLog/Private/SOutputLog.cpp
index 64b37eb2afc6..9e2141b3cae4 100644
--- a/Engine/Source/Developer/OutputLog/Private/SOutputLog.cpp
+++ b/Engine/Source/Developer/OutputLog/Private/SOutputLog.cpp
@@ -20,146 +20,11 @@
 #include "Widgets/Views/SListView.h"
 #include "EditorStyleSet.h"
 #include "Classes/EditorStyleSettings.h"
-#include "EngineGlobals.h"
-#include "Editor.h"
-#include "Toolkits/GlobalEditorCommonCommands.h"
-#include "Engine/LocalPlayer.h"
-#include "GameFramework/GameStateBase.h"
 #include "Widgets/Input/SSearchBox.h"
 #include "Features/IModularFeatures.h"
+#include "Misc/CoreDelegates.h"
 
 #define LOCTEXT_NAMESPACE "SOutputLog"
-
- FName FConsoleCommandExecutor::StaticName()
- {
-	 static const FName CmdExecName = TEXT("Cmd");
-	 return CmdExecName;
- }
-
- FName FConsoleCommandExecutor::GetName() const
- {
-	 return StaticName();
- }
-
-FText FConsoleCommandExecutor::GetDisplayName() const
-{
-	return LOCTEXT("ConsoleCommandExecutorDisplayName", "Cmd");
-}
-
-FText FConsoleCommandExecutor::GetDescription() const
-{
-	return LOCTEXT("ConsoleCommandExecutorDescription", "Execute Unreal Console Commands");
-}
-
-FText FConsoleCommandExecutor::GetHintText() const
-{
-	return LOCTEXT("ConsoleCommandExecutorHintText", "Enter Console Command");
-}
-
-void FConsoleCommandExecutor::GetAutoCompleteSuggestions(const TCHAR* Input, TArray<FString>& Out)
-{
-	auto OnConsoleVariable = [&Out](const TCHAR *Name, IConsoleObject* CVar)
-	{
-#if (UE_BUILD_SHIPPING || UE_BUILD_TEST)
-		if (CVar->TestFlags(ECVF_Cheat))
-		{
-			return;
-		}
-#endif // (UE_BUILD_SHIPPING || UE_BUILD_TEST)
-		if (CVar->TestFlags(ECVF_Unregistered))
-		{
-			return;
-		}
-
-		Out.Add(Name);
-	};
-
-	IConsoleManager::Get().ForEachConsoleObjectThatContains(FConsoleObjectVisitor::CreateLambda(OnConsoleVariable), Input);
-}
-
-void FConsoleCommandExecutor::GetExecHistory(TArray<FString>& Out)
-{
-	IConsoleManager::Get().GetConsoleHistory(TEXT(""), Out);
-}
-
-bool FConsoleCommandExecutor::Exec(const TCHAR* Input)
-{
-	IConsoleManager::Get().AddConsoleHistoryEntry(TEXT(""), Input);
-
-	bool bWasHandled = false;
-	UWorld* World = nullptr;
-	UWorld* OldWorld = nullptr;
-
-	// The play world needs to handle these commands if it exists
-	if (GIsEditor && GEditor->PlayWorld && !GIsPlayInEditorWorld)
-	{
-		World = GEditor->PlayWorld;
-		OldWorld = SetPlayInEditorWorld(GEditor->PlayWorld);
-	}
-
-	ULocalPlayer* Player = GEngine->GetDebugLocalPlayer();
-	if (Player)
-	{
-		UWorld* PlayerWorld = Player->GetWorld();
-		if (!World)
-		{
-			World = PlayerWorld;
-		}
-		bWasHandled = Player->Exec(PlayerWorld, Input, *GLog);
-	}
-
-	if (!World)
-	{
-		World = GEditor->GetEditorWorldContext().World();
-	}
-	if (World)
-	{
-		if (!bWasHandled)
-		{
-			AGameModeBase* const GameMode = World->GetAuthGameMode();
-			AGameStateBase* const GameState = World->GetGameState();
-			if (GameMode && GameMode->ProcessConsoleExec(Input, *GLog, nullptr))
-			{
-				bWasHandled = true;
-			}
-			else if (GameState && GameState->ProcessConsoleExec(Input, *GLog, nullptr))
-			{
-				bWasHandled = true;
-			}
-		}
-
-		if (!bWasHandled)
-		{
-			if (GIsEditor)
-			{
-				bWasHandled = GEditor->Exec(World, Input, *GLog);
-			}
-			else
-			{
-				bWasHandled = GEngine->Exec(World, Input, *GLog);
-			}
-		}
-	}
-
-	// Restore the old world of there was one
-	if (OldWorld)
-	{
-		RestoreEditorWorld(OldWorld);
-	}
-
-	return bWasHandled;
-}
-
-bool FConsoleCommandExecutor::AllowHotKeyClose() const
-{
-	return true;
-}
-
-bool FConsoleCommandExecutor::AllowMultiLine() const
-{
-	return false;
-}
-
 /** Expression context to test the given messages against the current text filter */
 class FLogFilter_TextFilterExpressionContext : public ITextFilterExpressionContext
 {
@@ -193,7 +58,6 @@ void SConsoleInputBox::Construct(const FArguments& InArgs)
 	ConsoleCommandCustomExec = InArgs._ConsoleCommandCustomExec;
 	OnCloseConsole = InArgs._OnCloseConsole;
 
-	PreferredCommandExecutorName = FConsoleCommandExecutor::StaticName();
 	if (!ConsoleCommandCustomExec.IsBound()) // custom execs always show the default executor in the UI (which has the selector disabled)
 	{
 		FString PreferredCommandExecutorStr;
@@ -202,14 +66,16 @@ void SConsoleInputBox::Construct(const FArguments& InArgs)
 			PreferredCommandExecutorName = *PreferredCommandExecutorStr;
 		}
 	}
+
 	SyncActiveCommandExecutor();
 
 	IModularFeatures::Get().OnModularFeatureRegistered().AddSP(this, &SConsoleInputBox::OnCommandExecutorRegistered);
 	IModularFeatures::Get().OnModularFeatureUnregistered().AddSP(this, &SConsoleInputBox::OnCommandExecutorUnregistered);
-
+	EPopupMethod PopupMethod = GIsEditor ? EPopupMethod::CreateNewWindow : EPopupMethod::UseCurrentWindow;
 	ChildSlot
 	[
 		SAssignNew( SuggestionBox, SMenuAnchor )
+		.Method(PopupMethod)
 		.Placement( InArgs._SuggestionListPlacement )
 		[
 			SNew(SHorizontalBox)
@@ -355,7 +221,26 @@ void SConsoleInputBox::OnTextChanged(const FText& InText)
 		{
 			ActiveCommandExecutor->GetAutoCompleteSuggestions(*InputTextStr, AutoCompleteList);
 		}
+		else
+		{
+			auto OnConsoleVariable = [&AutoCompleteList](const TCHAR *Name, IConsoleObject* CVar)
+			{
+#if (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+				if (CVar->TestFlags(ECVF_Cheat))
+				{
+					return;
+				}
+#endif // (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+				if (CVar->TestFlags(ECVF_Unregistered))
+				{
+					return;
+				}
 
+				AutoCompleteList.Add(Name);
+			};
+
+			IConsoleManager::Get().ForEachConsoleObjectThatContains(FConsoleObjectVisitor::CreateLambda(OnConsoleVariable), *InputTextStr);
+		}
 		AutoCompleteList.Sort();
 		SetSuggestions(AutoCompleteList, FText::FromString(InputTextStr));
 	}
@@ -451,7 +336,10 @@ FReply SConsoleInputBox::OnPreviewKeyDown(const FGeometry& MyGeometry, const FKe
 				{
 					ActiveCommandExecutor->GetExecHistory(History);
 				}
-
+				else
+				{
+					IConsoleManager::Get().GetConsoleHistory(TEXT(""), History);
+				}
 				SetSuggestions(History, FText::GetEmpty());
 				
 				if(Suggestions.HasSuggestions())
@@ -578,7 +466,11 @@ void SConsoleInputBox::SyncActiveCommandExecutor()
 	TArray<IConsoleCommandExecutor*> CommandExecutors = IModularFeatures::Get().GetModularFeatureImplementations<IConsoleCommandExecutor>(IConsoleCommandExecutor::ModularFeatureName());
 	ActiveCommandExecutor = nullptr;
 
-	// First try and match from the active name
+	if (CommandExecutors.IsValidIndex(0))
+	{
+		ActiveCommandExecutor = CommandExecutors[0];
+	}
+	// to swap to a preferred executor, try and match from the active name
 	for (IConsoleCommandExecutor* CommandExecutor : CommandExecutors)
 	{
 		if (CommandExecutor->GetName() == PreferredCommandExecutorName)
@@ -587,19 +479,7 @@ void SConsoleInputBox::SyncActiveCommandExecutor()
 			break;
 		}
 	}
-
-	// Failing that, fallback to the default name
-	if (!ActiveCommandExecutor && PreferredCommandExecutorName != FConsoleCommandExecutor::StaticName())
-	{
-		for (IConsoleCommandExecutor* CommandExecutor : CommandExecutors)
-		{
-			if (CommandExecutor->GetName() == FConsoleCommandExecutor::StaticName())
-			{
-				ActiveCommandExecutor = CommandExecutor;
-				break;
-			}
-		}
-	}
+	
 }
 
 void SConsoleInputBox::SetActiveCommandExecutor(const FName InExecName)
@@ -678,12 +558,10 @@ TSharedRef<SWidget> SConsoleInputBox::GetCommandExecutorMenuContent()
 
 FReply SConsoleInputBox::OnKeyDownHandler(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent)
 {
-	const FInputChord OpenConsoleChord = *FGlobalEditorCommonCommands::Get().OpenConsoleCommandBox->GetActiveChord(EMultipleKeyBindingIndex::Primary);
 	const FInputChord InputChord = FInputChord(InKeyEvent.GetKey(), EModifierKey::FromBools(InKeyEvent.IsControlDown(), InKeyEvent.IsAltDown(), InKeyEvent.IsShiftDown(), InKeyEvent.IsCommandDown()));
 
 	// Intercept the "open console" key
-	if ((!ActiveCommandExecutor || ActiveCommandExecutor->AllowHotKeyClose()) 
-		&& OpenConsoleChord == InputChord)
+	if (ActiveCommandExecutor && (ActiveCommandExecutor->AllowHotKeyClose() && ActiveCommandExecutor->GetHotKey() == InputChord))
 	{
 		OnCloseConsole.ExecuteIfBound();
 		return FReply::Handled();
@@ -700,28 +578,37 @@ FReply SConsoleInputBox::OnKeyCharHandler(const FGeometry& MyGeometry, const FCh
 		return FReply::Handled();
 	}
 
-	const FInputChord OpenConsoleChord = *FGlobalEditorCommonCommands::Get().OpenConsoleCommandBox->GetActiveChord(EMultipleKeyBindingIndex::Primary);
+	FInputChord OpenConsoleChord;
+	if (ActiveCommandExecutor && ActiveCommandExecutor->AllowHotKeyClose())
+	{
+		OpenConsoleChord = ActiveCommandExecutor->GetHotKey();
 
-	const uint32* KeyCode = nullptr;
-	const uint32* CharCode = nullptr;
-	FInputKeyManager::Get().GetCodesFromKey(OpenConsoleChord.Key, KeyCode, CharCode);
-	if (CharCode == nullptr)
+		const uint32* KeyCode = nullptr;
+		const uint32* CharCode = nullptr;
+		FInputKeyManager::Get().GetCodesFromKey(OpenConsoleChord.Key, KeyCode, CharCode);
+		if (CharCode == nullptr)
+		{
+			return FReply::Unhandled();
+		}
+
+		// Intercept the "open console" key
+		if (InCharacterEvent.GetCharacter() == (TCHAR)*CharCode
+			&& OpenConsoleChord.NeedsControl() == InCharacterEvent.IsControlDown()
+			&& OpenConsoleChord.NeedsAlt() == InCharacterEvent.IsAltDown()
+			&& OpenConsoleChord.NeedsShift() == InCharacterEvent.IsShiftDown()
+			&& OpenConsoleChord.NeedsCommand() == InCharacterEvent.IsCommandDown())
+		{
+			return FReply::Handled();
+		}
+		else
+		{
+			return FReply::Unhandled();
+		}
+	}
+	else
 	{
 		return FReply::Unhandled();
 	}
-
-	// Intercept the "open console" key
-	if ((!ActiveCommandExecutor || ActiveCommandExecutor->AllowHotKeyClose())
-		&& InCharacterEvent.GetCharacter() == (TCHAR)*CharCode
-		&& OpenConsoleChord.NeedsControl() == InCharacterEvent.IsControlDown()
-		&& OpenConsoleChord.NeedsAlt() == InCharacterEvent.IsAltDown()
-		&& OpenConsoleChord.NeedsShift() == InCharacterEvent.IsShiftDown()
-		&& OpenConsoleChord.NeedsCommand() == InCharacterEvent.IsCommandDown())
-	{
-		return FReply::Handled();
-	}
-	
-	return FReply::Unhandled();
 }
 
 TSharedRef< FOutputLogTextLayoutMarshaller > FOutputLogTextLayoutMarshaller::Create(TArray< TSharedPtr<FLogMessage> > InMessages, FLogFilter* InFilter)
diff --git a/Engine/Source/Developer/OutputLog/Private/SOutputLog.h b/Engine/Source/Developer/OutputLog/Private/SOutputLog.h
index 9ca26fd2f93c..3835e9004b4d 100644
--- a/Engine/Source/Developer/OutputLog/Private/SOutputLog.h
+++ b/Engine/Source/Developer/OutputLog/Private/SOutputLog.h
@@ -20,24 +20,6 @@ class FOutputLogTextLayoutMarshaller;
 class FTextLayout;
 class SMenuAnchor;
 
-/**
- * Executor for Unreal console commands
- */
-class FConsoleCommandExecutor : public IConsoleCommandExecutor
-{
-public:
-	static FName StaticName();
-	virtual FName GetName() const override;
-	virtual FText GetDisplayName() const override;
-	virtual FText GetDescription() const override;
-	virtual FText GetHintText() const override;
-	virtual void GetAutoCompleteSuggestions(const TCHAR* Input, TArray<FString>& Out) override;
-	virtual void GetExecHistory(TArray<FString>& Out) override;
-	virtual bool Exec(const TCHAR* Input) override;
-	virtual bool AllowHotKeyClose() const override;
-	virtual bool AllowMultiLine() const override;
-};
-
 /**
 * A single log message for the output log, holding a message and
 * a style, for color and bolding of the message.
diff --git a/Engine/Source/Developer/OutputLog/Public/OutputLogModule.h b/Engine/Source/Developer/OutputLog/Public/OutputLogModule.h
index 8f0451d4c479..d8574a760ba4 100644
--- a/Engine/Source/Developer/OutputLog/Public/OutputLogModule.h
+++ b/Engine/Source/Developer/OutputLog/Public/OutputLogModule.h
@@ -6,8 +6,9 @@
 #include "Widgets/SWidget.h"
 #include "Modules/ModuleInterface.h"
 #include "Widgets/SWindow.h"
+#include "Features/IModularFeatures.h"
+#include "HAL/IConsoleManager.h"
 
-class FConsoleCommandExecutor;
 class SMultiLineEditableTextBox;
 
 /** Style of the debug console */
@@ -46,6 +47,22 @@ public:
 	/** Closes the debug console for the specified window */
 	virtual void CloseDebugConsole();
 
+	/**  Sets the active command executor from another module */
+	virtual void SetActiveCommandExecutor(TSharedPtr<IConsoleCommandExecutor> InExecutor)
+	{
+		CmdExec = InExecutor;
+		IModularFeatures::Get().RegisterModularFeature(IConsoleCommandExecutor::ModularFeatureName(), CmdExec.Get());
+	};
+
+	/** Removes an active command executor from another module */
+	virtual void RemoveActiveCommandExecutor(TSharedPtr<IConsoleCommandExecutor> InExecutor)
+	{
+		if (CmdExec.IsValid())
+		{
+			IModularFeatures::Get().UnregisterModularFeature(IConsoleCommandExecutor::ModularFeatureName(), CmdExec.Get());
+		}
+		CmdExec = nullptr;
+	};
 
 private:
 
@@ -53,5 +70,5 @@ private:
 	TWeakPtr< SWidget > DebugConsole;
 
 	/** Pointer to the classic "Cmd" executor */
-	TSharedPtr<FConsoleCommandExecutor> CmdExec;
+	TSharedPtr<IConsoleCommandExecutor> CmdExec;
 };
diff --git a/Engine/Source/Developer/PakFileUtilities/Private/PakFileUtilities.cpp b/Engine/Source/Developer/PakFileUtilities/Private/PakFileUtilities.cpp
index d3b40f5745a9..53b2092e66f8 100644
--- a/Engine/Source/Developer/PakFileUtilities/Private/PakFileUtilities.cpp
+++ b/Engine/Source/Developer/PakFileUtilities/Private/PakFileUtilities.cpp
@@ -478,6 +478,8 @@ void ProcessCommandLine(const TCHAR* CmdLine, const TArray<FString>& NonOptionAr
 	FString CompressorFileName;
 	if (FParse::Value(CmdLine, TEXT("compressor="), CompressorFileName))
 	{
+		FPlatformProcess::AddDllDirectory(*FPaths::GetPath(CompressorFileName));
+
 		void* CustomCompressorDll = FPlatformProcess::GetDllHandle(*CompressorFileName);
 		if (CustomCompressorDll == nullptr)
 		{
@@ -485,6 +487,8 @@ void ProcessCommandLine(const TCHAR* CmdLine, const TArray<FString>& NonOptionAr
 			return;
 		}
 
+		UE_LOG(LogPakFile, Display, TEXT("Loaded custom compressor from %s."), *CompressorFileName);
+
 		static const TCHAR* CreateCustomCompressorExport = TEXT("CreateCustomCompressor");
 		typedef ICustomCompressor* (CreateCustomCompressorFunc)(const TCHAR*);
 		CreateCustomCompressorFunc* CreateCustomCompressor = reinterpret_cast<CreateCustomCompressorFunc*>(FPlatformProcess::GetDllExport(CustomCompressorDll, CreateCustomCompressorExport));
@@ -778,9 +782,16 @@ bool UncompressCopyFile(FArchive& Dest, FArchive& Source, const FPakEntry& Entry
 		return false;
 	}
 
-	int64 WorkingSize = Entry.CompressionBlockSize;
-	int32 MaxCompressionBlockSize = FCompression::CompressMemoryBound((ECompressionFlags)Entry.CompressionMethod, WorkingSize);
-	WorkingSize += MaxCompressionBlockSize;
+	// The compression block size depends on the bit window that the PAK file was originally created with. Since this isn't stored in the PAK file itself,
+	// we can use FCompression::CompressMemoryBound as a guideline for the max expected size to avoid unncessary reallocations, but we need to make sure
+	// that we check if the actual size is not actually greater (eg. UE-59278).
+	int32 MaxCompressionBlockSize = FCompression::CompressMemoryBound((ECompressionFlags)Entry.CompressionMethod, Entry.CompressionBlockSize);
+	for (const FPakCompressedBlock& Block : Entry.CompressionBlocks)
+	{
+		MaxCompressionBlockSize = FMath::Max<int32>(MaxCompressionBlockSize, Block.CompressedEnd - Block.CompressedStart);
+	}
+
+	int64 WorkingSize = Entry.CompressionBlockSize + MaxCompressionBlockSize;
 	if (BufferSize < WorkingSize)
 	{
 		PersistentBuffer = (uint8*)FMemory::Realloc(PersistentBuffer, WorkingSize);
diff --git a/Engine/Source/Developer/ProfilerClient/Private/ProfilerClientManager.cpp b/Engine/Source/Developer/ProfilerClient/Private/ProfilerClientManager.cpp
index babbd4d6faf1..35c8cfd4bc77 100644
--- a/Engine/Source/Developer/ProfilerClient/Private/ProfilerClientManager.cpp
+++ b/Engine/Source/Developer/ProfilerClient/Private/ProfilerClientManager.cpp
@@ -634,6 +634,8 @@ bool FProfilerClientManager::HandleTicker(float DeltaTime)
 
 bool FProfilerClientManager::HandleMessagesTicker(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FProfilerClientManager_HandleMessagesTicker);
+
 #if STATS
 	for (auto It = Connections.CreateIterator(); It; ++It)
 	{
diff --git a/Engine/Source/Developer/ProfilerMessages/Public/ProfilerServiceMessages.h b/Engine/Source/Developer/ProfilerMessages/Public/ProfilerServiceMessages.h
index d20f73e2e136..2e8b64b8ffd4 100644
--- a/Engine/Source/Developer/ProfilerMessages/Public/ProfilerServiceMessages.h
+++ b/Engine/Source/Developer/ProfilerMessages/Public/ProfilerServiceMessages.h
@@ -61,7 +61,7 @@ struct FProfilerServiceData2
 	FString HexData;
 
 	/** Default constructor. */
-	FProfilerServiceData2() { }
+	FProfilerServiceData2() : Frame(0), CompressedSize(0), UncompressedSize(0) { }
 
 	/** Creates and initializes a new instance. */
 	FProfilerServiceData2(const FGuid& InInstance, int64 InFrame, const FString& InHexData, int32 InCompressedSize, int32 InUncompressedSize)
@@ -235,7 +235,7 @@ struct FProfilerServiceCapture
 	bool bRequestedCaptureState;
 
 	/** Default constructor. */
-	FProfilerServiceCapture() { }
+	FProfilerServiceCapture() : bRequestedCaptureState(false) { }
 
 	/** Creates and initializes a new instance. */
 	FProfilerServiceCapture(const bool bInRequestedCaptureState)
@@ -258,7 +258,7 @@ struct FProfilerServicePreview
 	bool bRequestedPreviewState;
 
 	/** Default constructor. */
-	FProfilerServicePreview() { }
+	FProfilerServicePreview() : bRequestedPreviewState(false) { }
 
 	/** Creates and initializes a new instance. */
 	FProfilerServicePreview(const bool bInRequestedPreviewState)
@@ -279,7 +279,7 @@ struct FProfilerServiceRequest
 	uint32 Request;
 
 	/** Default constructor. */
-	FProfilerServiceRequest() { }
+	FProfilerServiceRequest() : Request(0) { }
 
 	/** Creates and initializes a new instance. */
 	FProfilerServiceRequest(uint32 InRequest)
diff --git a/Engine/Source/Developer/ProfilerService/Private/ProfilerServiceManager.cpp b/Engine/Source/Developer/ProfilerService/Private/ProfilerServiceManager.cpp
index ffe7ce1e19a6..7d85df26defe 100644
--- a/Engine/Source/Developer/ProfilerService/Private/ProfilerServiceManager.cpp
+++ b/Engine/Source/Developer/ProfilerService/Private/ProfilerServiceManager.cpp
@@ -205,6 +205,8 @@ void FProfilerServiceManager::SetPreviewState( const FMessageAddress& ClientAddr
 
 bool FProfilerServiceManager::HandlePing( float DeltaTime )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FProfilerServiceManager_HandlePing);
+
 #if STATS
 	// check the active flags and reset if true, remove the client if false
 	TArray<FMessageAddress> Clients;
diff --git a/Engine/Source/Developer/RawMesh/Private/RawMesh.cpp b/Engine/Source/Developer/RawMesh/Private/RawMesh.cpp
index 934b6c9c169c..116a5b5008d5 100644
--- a/Engine/Source/Developer/RawMesh/Private/RawMesh.cpp
+++ b/Engine/Source/Developer/RawMesh/Private/RawMesh.cpp
@@ -255,7 +255,7 @@ void FRawMeshBulkData::SaveRawMesh(FRawMesh& InMesh)
 	BulkData.Lock(LOCK_READ_WRITE);
 	uint8* Dest = (uint8*)BulkData.Realloc(NumBytes);
 	FBufferWriter Ar(Dest, NumBytes);
-	Ar.ArIsPersistent = true;
+	Ar.SetIsPersistent(true);
 	Ar << InMesh;
 	check(Ar.AtEnd());
 	check(Dest == Ar.GetWriterData());
diff --git a/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp b/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp
index 10a54ba79b78..ff52d6ff8b1d 100644
--- a/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp
+++ b/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp
@@ -4,6 +4,7 @@
 #include "Misc/Paths.h"
 #include "Modules/ModuleManager.h"
 #include "HlslccDefinitions.h"
+#include "HAL/FileManager.h"
 
 IMPLEMENT_MODULE(FDefaultModuleImpl, ShaderCompilerCommon);
 
@@ -561,6 +562,186 @@ FString CreateShaderCompilerWorkerDirectCommandLine(const FShaderCompilerInput&
 	return Text;
 }
 
+static int Mali_ExtractNumberInstructions(const FString &MaliOutput)
+{
+	int ReturnedNum = 0;
+
+	// Parse the instruction count
+	const int32 InstructionStringLength = FPlatformString::Strlen(TEXT("Instructions Emitted:"));
+	const int32 InstructionsIndex = MaliOutput.Find(TEXT("Instructions Emitted:"));
+
+	if (InstructionsIndex != INDEX_NONE && InstructionsIndex + InstructionStringLength < MaliOutput.Len())
+	{
+		const int32 EndIndex = MaliOutput.Find(TEXT("\n"), ESearchCase::IgnoreCase, ESearchDir::FromStart, InstructionsIndex + InstructionStringLength);
+
+		if (EndIndex != INDEX_NONE)
+		{
+			int32 StartIndex = InstructionsIndex + InstructionStringLength;
+
+			bool bFoundNrStart = false;
+			int32 NumberIndex = 0;
+
+			while (StartIndex < EndIndex)
+			{
+				if (FChar::IsDigit(MaliOutput[StartIndex]) && !bFoundNrStart)
+				{
+					// found number's beginning
+					bFoundNrStart = true;
+					NumberIndex = StartIndex;
+				}
+				else if (FChar::IsWhitespace(MaliOutput[StartIndex]) && bFoundNrStart)
+				{
+					// found number's end
+					bFoundNrStart = false;
+					const FString NumberString = MaliOutput.Mid(NumberIndex, StartIndex - NumberIndex);
+					const float fNrInstructions = FCString::Atof(*NumberString);
+					ReturnedNum += ceil(fNrInstructions);
+				}
+
+				++StartIndex;
+			}
+		}
+	}
+
+	return ReturnedNum;
+}
+
+static FString Mali_ExtractErrors(const FString &MaliOutput)
+{
+	FString ReturnedErrors;
+
+	const int32 GlobalErrorIndex = MaliOutput.Find(TEXT("Compilation failed."));
+
+	// find each 'line' that begins with token "ERROR:" and copy it to the returned string
+	if (GlobalErrorIndex != INDEX_NONE)
+	{
+		int32 CompilationErrorIndex = MaliOutput.Find(TEXT("ERROR:"));
+		while (CompilationErrorIndex != INDEX_NONE)
+		{
+			int32 EndLineIndex = MaliOutput.Find(TEXT("\n"), ESearchCase::CaseSensitive, ESearchDir::FromStart, CompilationErrorIndex + 1);
+			EndLineIndex = EndLineIndex == INDEX_NONE ? MaliOutput.Len() - 1 : EndLineIndex;
+
+			ReturnedErrors += MaliOutput.Mid(CompilationErrorIndex, EndLineIndex - CompilationErrorIndex + 1);
+
+			CompilationErrorIndex = MaliOutput.Find(TEXT("ERROR:"), ESearchCase::CaseSensitive, ESearchDir::FromStart, EndLineIndex);
+		}
+	}
+
+	return ReturnedErrors;
+}
+
+void CompileOfflineMali(const FShaderCompilerInput& Input, FShaderCompilerOutput& ShaderOutput, const ANSICHAR* ShaderSource, const int32 SourceSize, bool bVulkanSpirV)
+{
+	const bool bCompilerExecutableExists = FPaths::FileExists(Input.ExtraSettings.OfflineCompilerPath);
+
+	if (bCompilerExecutableExists)
+	{
+		const auto Frequency = (EShaderFrequency)Input.Target.Frequency;
+		const FString WorkingDir(FPlatformProcess::ShaderDir());
+
+		FString CompilerPath = Input.ExtraSettings.OfflineCompilerPath;
+
+		// add process and thread ids to the file name to avoid collision between workers
+		auto ProcID = FPlatformProcess::GetCurrentProcessId();
+		auto ThreadID = FPlatformTLS::GetCurrentThreadId();
+		FString GLSLSourceFile = WorkingDir / TEXT("GLSLSource#") + FString::FromInt(ProcID) + TEXT("#") + FString::FromInt(ThreadID);
+
+		// setup compilation arguments
+		TCHAR *FileExt = nullptr;
+		switch (Frequency)
+		{
+			case SF_Vertex:
+				GLSLSourceFile += TEXT(".vert");
+				CompilerPath += TEXT(" -v");
+			break;
+			case SF_Pixel:
+				GLSLSourceFile += TEXT(".frag");
+				CompilerPath += TEXT(" -f");
+			break;
+			case SF_Geometry:
+				GLSLSourceFile += TEXT(".geom");
+				CompilerPath += TEXT(" -g");
+			break;
+			case SF_Hull:
+				GLSLSourceFile += TEXT(".tesc");
+				CompilerPath += TEXT(" -t");
+			break;
+			case SF_Domain:
+				GLSLSourceFile += TEXT(".tese");
+				CompilerPath += TEXT(" -e");
+			break;
+			case SF_Compute:
+				GLSLSourceFile += TEXT(".comp");
+				CompilerPath += TEXT(" -C");
+			break;
+
+			default:
+				GLSLSourceFile += TEXT(".shd");
+			break;
+		}
+
+		if (bVulkanSpirV)
+		{
+			CompilerPath += TEXT(" -p");
+		}
+		else
+		{
+			CompilerPath += TEXT(" -s");
+		}
+
+		FArchive* Ar = IFileManager::Get().CreateFileWriter(*GLSLSourceFile, FILEWRITE_EvenIfReadOnly);
+
+		if (Ar == nullptr)
+		{
+			return;
+		}
+
+		// write out the shader source to a file and use it below as input for the compiler
+		Ar->Serialize((void*)ShaderSource, SourceSize);
+		delete Ar;
+
+		FString StdOut;
+		FString StdErr;
+		int32 ReturnCode = 0;
+
+		// Run Mali shader compiler and wait for completion
+		FPlatformProcess::ExecProcess(*CompilerPath, *GLSLSourceFile, &ReturnCode, &StdOut, &StdErr);
+
+		// parse Mali's output and extract instruction count or eventual errors
+		ShaderOutput.bSucceeded = (ReturnCode >= 0);
+		if (ShaderOutput.bSucceeded)
+		{
+			// check for errors
+			if (StdErr.Len())
+			{
+				ShaderOutput.bSucceeded = false;
+
+				FShaderCompilerError* NewError = new(ShaderOutput.Errors) FShaderCompilerError();
+				NewError->StrippedErrorMessage = TEXT("[Mali Offline Complier]\n") + StdErr;
+			}
+			else
+			{
+				FString Errors = Mali_ExtractErrors(StdOut);
+
+				if (Errors.Len())
+				{
+					FShaderCompilerError* NewError = new(ShaderOutput.Errors) FShaderCompilerError();
+					NewError->StrippedErrorMessage = TEXT("[Mali Offline Complier]\n") + Errors;
+					ShaderOutput.bSucceeded = false;
+				}
+			}
+
+			// extract instruction count
+			if (ShaderOutput.bSucceeded)
+			{
+				ShaderOutput.NumInstructions = Mali_ExtractNumberInstructions(StdOut);
+			}
+		}
+
+		// we're done so delete the shader file
+		IFileManager::Get().Delete(*GLSLSourceFile, true, true);
+	}
+}
 
 namespace CrossCompiler
 {
diff --git a/Engine/Source/Developer/ShaderCompilerCommon/Public/ShaderCompilerCommon.h b/Engine/Source/Developer/ShaderCompilerCommon/Public/ShaderCompilerCommon.h
index e94596e27edd..a83ff3eff66c 100644
--- a/Engine/Source/Developer/ShaderCompilerCommon/Public/ShaderCompilerCommon.h
+++ b/Engine/Source/Developer/ShaderCompilerCommon/Public/ShaderCompilerCommon.h
@@ -57,6 +57,8 @@ extern SHADERCOMPILERCOMMON_API void StripInstancedStereo(FString& ShaderSource)
 
 extern SHADERCOMPILERCOMMON_API FString CreateShaderCompilerWorkerDirectCommandLine(const FShaderCompilerInput& Input);
 
+// calls 'Mali Offline Compiler' to compile the glsl source code and extract the generated instruction count
+extern SHADERCOMPILERCOMMON_API void CompileOfflineMali(const FShaderCompilerInput &Input, FShaderCompilerOutput& ShaderOutput, const ANSICHAR* ShaderSource, const int32 SourceSize, bool bVulkanSpirV);
 
 // Cross compiler support/common functionality
 namespace CrossCompiler
diff --git a/Engine/Source/Developer/ShaderFormatOpenGL/Private/GlslBackend.cpp b/Engine/Source/Developer/ShaderFormatOpenGL/Private/GlslBackend.cpp
index 5d54b2f3026d..0bb7ecd0800d 100644
--- a/Engine/Source/Developer/ShaderFormatOpenGL/Private/GlslBackend.cpp
+++ b/Engine/Source/Developer/ShaderFormatOpenGL/Private/GlslBackend.cpp
@@ -370,7 +370,7 @@ typedef std::list<SDMARange> TDMARangeList;
 typedef std::map<unsigned, TDMARangeList> TCBDMARangeMap;
 
 
-static void InsertRange( TCBDMARangeMap& CBAllRanges, unsigned SourceCB, unsigned SourceOffset, unsigned Size, unsigned DestCBIndex, unsigned DestCBPrecision, unsigned DestOffset )
+static void InsertRange( TCBDMARangeMap& CBAllRanges, unsigned SourceCB, unsigned SourceOffset, unsigned Size, unsigned DestCBIndex, unsigned DestCBPrecision, unsigned DestOffset ) 
 {
 	check(SourceCB < (1 << 12));
 	check(DestCBIndex < (1 << 12));
@@ -453,7 +453,7 @@ static void InsertRange( TCBDMARangeMap& CBAllRanges, unsigned SourceCB, unsigne
 	}
 }
 
-static TDMARangeList SortRanges( TCBDMARangeMap& CBRanges )
+static TDMARangeList SortRanges( TCBDMARangeMap& CBRanges ) 
 {
 	TDMARangeList Sorted;
 	for (auto& Pair : CBRanges)
@@ -559,6 +559,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 	bool bEmitPrecision;
 	bool bIsES31;
 	bool bIsWebGL;
+	EHlslCompileTarget CompileTarget;
 	_mesa_glsl_parser_targets ShaderTarget;
 
 	bool bGenerateLayoutLocations;
@@ -596,12 +597,15 @@ class ir_gen_glsl_visitor : public ir_visitor
 	/** Whether the shader being cross compiled needs EXT_shader_texture_lod. */
 	bool bUsesES2TextureLODExtension;
 
+	/** Whether the shader being cross compiled needs GL_EXT_texture_buffer. */
+	bool bUsesTexelFetch;
+
 	// Found dFdx or dFdy
 	bool bUsesDXDY;
 
 	// Uses gl_InstanceID
 	bool bUsesInstanceID;
-
+	
 	// Don't allow global uniforms; instead, wrap in a struct to make a proper uniform buffer
 	bool bNoGlobalUniforms;
 
@@ -614,7 +618,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		if (type->base_type == GLSL_TYPE_ARRAY &&
 			type->fields.array->base_type == GLSL_TYPE_ARRAY)
 		{
-			foreach_iter(exec_list_iterator, iter, used_md_arrays)
+			foreach_iter(exec_list_iterator, iter, used_md_arrays) 
 			{
 				md_array_entry* entry = (md_array_entry*)iter.get();
 				if (entry->type == type)
@@ -697,7 +701,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		if (t->base_type == GLSL_TYPE_ARRAY)
 		{
 			ralloc_asprintf_append(buffer, "_mdarr_");
-			do
+			do 
 			{
 				ralloc_asprintf_append(buffer, "%u_", t->length);
 				t = t->fields.array;
@@ -730,7 +734,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		{
 			ralloc_asprintf_append(buffer, "%s", t->name);
 		}
-		else
+		else 
 		{
 			std::string Name = FixHlslName(t, bIsES && !bIsES31 && !bIsWebGL);
 			ralloc_asprintf_append(buffer, "%s", Name.c_str());
@@ -880,10 +884,11 @@ class ir_gen_glsl_visitor : public ir_visitor
 		const char * const ESFSmode_str[] = { "", "uniform ", "varying ", "attribute ", "", "in ", "", "shared " };
 		const char * const GLSLinterp_str[] = { "", "smooth ", "flat ", "noperspective " };
 		const char * const ESinterp_str[] = { "", "", "", "" };
+		const char * const ES31interp_str[] = { "", "smooth ", "flat ", "" };
 		const char * const layout_str[] = { "", "layout(origin_upper_left) ", "layout(pixel_center_integer) ", "layout(origin_upper_left,pixel_center_integer) " };
 
 		const char * const * mode_str = bIsES ? ((ShaderTarget == vertex_shader) ? ESVSmode_str : ESFSmode_str) : GLSLmode_str;
-		const char * const * interp_str = bIsES ? ESinterp_str : GLSLinterp_str;
+		const char * const * interp_str = bIsES ? ESinterp_str : (bIsES31 ? ES31interp_str : GLSLinterp_str);
 
 		// Check for an initialized const variable
 		// If var is read-only and initialized, set it up as an initialized const
@@ -929,7 +934,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		}
 
 		const bool bBuiltinVariable = (var->name && strncmp(var->name, "gl_", 3) == 0);
-
+		
 		if (bBuiltinVariable && ShaderTarget == vertex_shader && strncmp(var->name, "gl_InstanceID", 13) == 0)
 		{
 			bUsesInstanceID = true;
@@ -953,7 +958,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			int layout_bits =
 				(var->origin_upper_left ? 0x1 : 0) |
 				(var->pixel_center_integer ? 0x2 : 0);
-
+			
 			// this is for NVN which doesn't support global params, so we wrap each of the typed
 			// buffer in a struct, which ends up as a proper, non global parameter, uniform buffer
 			bool bUseGlobalUniformBufferWrapper = false;
@@ -963,7 +968,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			}
 
 			if (scope_depth == 0 &&
-			   ((var->mode == ir_var_in) || (var->mode == ir_var_out)) &&
+			   ((var->mode == ir_var_in) || (var->mode == ir_var_out)) && 
 			   var->is_interface_block)
 			{
 				/**
@@ -984,19 +989,19 @@ class ir_gen_glsl_visitor : public ir_visitor
 				that dependency, we use structs.
 
 				*/
-
+				
 				if(bGenerateLayoutLocations && var->explicit_location && var->is_patch_constant == 0)
 				{
 					check(layout_bits == 0);
 
 					// Some devices (S6 G920L 6.0.1) may complain about second empty parameter in an INTERFACE_BLOCK macro
-					// Make sure we put something there
+					// Make sure we put something there 
 					const char* interp_qualifier = interp_str[var->interpolation];
 					if (bIsES31 && strlen(interp_qualifier) == 0)
 					{
 						interp_qualifier = "smooth ";
 					}
-
+										
 					ralloc_asprintf_append(
 						buffer,
 						"INTERFACE_BLOCK(%d, %s, %s%s%s%s, ",
@@ -1009,7 +1014,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 
 					print_type_pre(var->type);
 					ralloc_asprintf_append(buffer, ", ");
-
+					
 					const glsl_type* inner_type = var->type;
 					if (inner_type->is_array())
 					{
@@ -1019,7 +1024,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 					check(inner_type->length==1);
 					const glsl_struct_field* field = &inner_type->fields.structure[0];
 					check(strcmp(field->name,"Data")==0);
-
+					
 					if (bEmitPrecision)
 					{
 						if (field->type->is_integer())
@@ -1044,7 +1049,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 						patch_constant_str[var->is_patch_constant],
 						mode_str[var->mode]
 						);
-
+					
 					print_type_pre(var->type);
 
 					const glsl_type* inner_type = var->type;
@@ -1056,9 +1061,9 @@ class ir_gen_glsl_visitor : public ir_visitor
 					check(inner_type->length==1);
 					const glsl_struct_field* field = &inner_type->fields.structure[0];
 					check(strcmp(field->name,"Data")==0);
-
+					
 					ralloc_asprintf_append(buffer, " { %s", interp_str[var->interpolation]);
-
+					
 					print_type_pre(field->type);
 					ralloc_asprintf_append(buffer, " Data");
 					print_type_post(field->type);
@@ -1383,7 +1388,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		static const char * const gather_str[] = { "", "Gather" };
 		static const char * const querymips_str[] = { "", "QueryLevels" };
 		static const char * const EXT_str[] = { "", "EXT" };
-		const bool cube_array = tex->sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE &&
+		const bool cube_array = tex->sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE && 
 			tex->sampler->type->sampler_array;
 
 		ir_texture_opcode op = tex->op;
@@ -1402,6 +1407,11 @@ class ir_gen_glsl_visitor : public ir_visitor
 			bEmitEXT = true;
 		}
 
+		if (op == ir_txf)
+		{
+			bUsesTexelFetch = true;
+		}
+
 		// Emit texture function and sampler.
 		ralloc_asprintf_append(buffer, "%s%s%s%s%s%s%s%s%s%s(",
 			fetch_str[op == ir_txf],
@@ -1637,7 +1647,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		};
 		const int dst_elements = deref->type->vector_elements;
 		const int src_elements = (src) ? src->type->vector_elements : 1;
-
+		
 		bool bIsStructured = deref->type->is_record() || (!strncmp(deref->image->type->name, "RWStructuredBuffer<", 19) || !strncmp(deref->image->type->name, "StructuredBuffer<", 17));
 
 		//!strncmp(var->type->name, "RWStructuredBuffer<")
@@ -2184,7 +2194,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 
 	virtual void visit(ir_atomic *ir)
 	{
-		const char *sharedAtomicFunctions[] =
+		const char *sharedAtomicFunctions[] = 
 		{
 			"atomicAdd",
 			"atomicAnd",
@@ -2195,7 +2205,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			"atomicExchange",
 			"atomicCompSwap"
 		};
-		const char *imageAtomicFunctions[] =
+		const char *imageAtomicFunctions[] = 
 		{
 			"imageAtomicAdd",
 			"imageAtomicAnd",
@@ -2353,7 +2363,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 		// Generate structures that allow support for multi-dimensional arrays.
 		{
 			hash_table* ht = hash_table_ctor(32, hash_table_pointer_hash, hash_table_pointer_compare);
-			foreach_iter(exec_list_iterator, iter, used_md_arrays)
+			foreach_iter(exec_list_iterator, iter, used_md_arrays) 
 			{
 				md_array_entry* entry = (md_array_entry*)iter.get();
 				declare_md_array_struct(entry->type, ht);
@@ -3006,7 +3016,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			ralloc_asprintf_append(buffer, "tessellation.patchconstantfunc =  %s \n", tessellation.patchconstantfunc);
 			ralloc_asprintf_append(buffer, " */\n");
 		}
-#endif
+#endif		
 	}
 
 	void print_extensions(_mesa_glsl_parse_state* state, bool bUsesFramebufferFetchES2, bool bUsesDepthbufferFetchES2, bool bUsesES31Extensions, bool bInUsesExternalTexture)
@@ -3023,7 +3033,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			ralloc_asprintf_append(buffer, "#endif\n");
 		}
 
-		if (state->bSeparateShaderObjects && !state->bGenerateES &&
+		if (state->bSeparateShaderObjects && !state->bGenerateES && 
 			((state->target == tessellation_control_shader) || (state->target == tessellation_evaluation_shader)))
 		{
 			ralloc_asprintf_append(buffer, "#extension GL_ARB_tessellation_shader : enable\n");
@@ -3041,7 +3051,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			ralloc_asprintf_append(buffer, "#define gl_InstanceID gl_InstanceIDEXT\n");
 			ralloc_asprintf_append(buffer, "#endif\n");
 		}
-
+		
 		if (bUsesFramebufferFetchES2)
 		{
 			ralloc_asprintf_append(buffer, "\n#ifdef UE_EXT_shader_framebuffer_fetch\n");
@@ -3063,7 +3073,7 @@ class ir_gen_glsl_visitor : public ir_visitor
 			ralloc_asprintf_append(buffer, "\n#ifdef GL_EXT_gpu_shader5\n");
 			ralloc_asprintf_append(buffer, "#extension GL_EXT_gpu_shader5 : enable\n");
 			ralloc_asprintf_append(buffer, "\n#endif\n");
-
+			
 			ralloc_asprintf_append(buffer, "\n#ifdef GL_EXT_texture_buffer\n");
 			ralloc_asprintf_append(buffer, "#extension GL_EXT_texture_buffer : enable\n");
 			ralloc_asprintf_append(buffer, "\n#endif\n");
@@ -3085,7 +3095,15 @@ class ir_gen_glsl_visitor : public ir_visitor
 			{
 				ralloc_asprintf_append(buffer, "#extension GL_EXT_tessellation_shader : enable\n");
 			}
-
+		}
+		else if ((bIsES || bIsES31) && bUsesTexelFetch)
+		{
+			// Not supported by ES2 and ES3.1 spec, but many phones support this extension
+			// GPU particles require this
+			// App shall not use a shader if this extension is not supported on device
+			ralloc_asprintf_append(buffer, "\n#ifdef GL_EXT_texture_buffer\n");
+			ralloc_asprintf_append(buffer, "#extension GL_EXT_texture_buffer : enable\n");
+			ralloc_asprintf_append(buffer, "\n#endif\n");
 		}
 		ralloc_asprintf_append(buffer, "// end extensions\n");
 	}
@@ -3093,13 +3111,13 @@ class ir_gen_glsl_visitor : public ir_visitor
 public:
 
 	/** Constructor. */
-	ir_gen_glsl_visitor(bool bInIsES, bool bInEmitPrecision, bool bInIsES31, bool bInIsWebGL, _mesa_glsl_parser_targets InShaderTarget, bool bInGenerateLayoutLocations, bool bInDefaultPrecisionIsHalf, bool bInNoGlobalUniforms, bool bInUsesFrameBufferFetch, bool bInUsesExternalTexture)
+	ir_gen_glsl_visitor(bool bInIsES, bool bInEmitPrecision, bool bInIsWebGL, EHlslCompileTarget InCompileTarget, _mesa_glsl_parser_targets InShaderTarget, bool bInGenerateLayoutLocations, bool bInDefaultPrecisionIsHalf, bool bInNoGlobalUniforms, bool bInUsesFrameBufferFetch, bool bInUsesExternalTexture)
 		: early_depth_stencil(false)
 		, bIsES(bInIsES)
 		, bEmitPrecision(bInEmitPrecision)
-		, bIsES31(bInIsES31)
+		, bIsES31(InCompileTarget == HCT_FeatureLevelES3_1 || InCompileTarget == HCT_FeatureLevelES3_1Ext)
 		, bIsWebGL(bInIsWebGL)
-		, ShaderTarget(InShaderTarget)
+		, CompileTarget(InCompileTarget)		, ShaderTarget(InShaderTarget)
 		, bGenerateLayoutLocations(bInGenerateLayoutLocations)
 		, bDefaultPrecisionIsHalf(bInDefaultPrecisionIsHalf)
 		, bUsesFrameBufferFetch(bInUsesFrameBufferFetch)
@@ -3113,6 +3131,7 @@ public:
 		, should_print_uint_literals_as_ints(false)
 		, loop_count(0)
 		, bUsesES2TextureLODExtension(false)
+		, bUsesTexelFetch(false)
 		, bUsesDXDY(false)
 		, bUsesInstanceID(false)
 		, bNoGlobalUniforms(bInNoGlobalUniforms)
@@ -3144,11 +3163,11 @@ public:
 		if (bEmitPrecision && !(ShaderTarget == vertex_shader))
 		{
 			// TODO: Improve this...
-
+			
 			const char* DefaultPrecision = bDefaultPrecisionIsHalf ? "mediump" : "highp";
 			ralloc_asprintf_append(buffer, "precision %s float;\n", DefaultPrecision);
 			ralloc_asprintf_append(buffer, "precision %s int;\n", DefaultPrecision);
-			ralloc_asprintf_append(buffer, "\n#ifndef DONTEMITSAMPLERDEFAULTPRECISION\n");
+			ralloc_asprintf_append(buffer, "\n#ifndef DONTEMITSAMPLERDEFAULTPRECISION\n"); 
 			ralloc_asprintf_append(buffer, "precision %s sampler2D;\n", DefaultPrecision);
 			ralloc_asprintf_append(buffer, "precision %s samplerCube;\n\n", DefaultPrecision);
 			ralloc_asprintf_append(buffer, "#endif\n");
@@ -3210,8 +3229,8 @@ bool compiler_internal_AdjustIsFrontFacing(bool isFrontFacing)
 			if (state->language_version == 310)
 			{
 				// Append framebuffer fetch function. note: we want ES3.1 to throw an error if the device does not support framebuffer fetch.
-				// Fwd declare of FramebufferFetchES2 b/c we dont have access to out_Target0 yet,
-				// #define FramebufferFetchES2() (out_Target0) fails b/c adreno preprocessor does not consume braces at call site. i.e. (out_Target0)()
+				// Fwd declare of FramebufferFetchES2 b/c we dont have access to out_Target0 yet, 
+				// #define FramebufferFetchES2() (out_Target0) fails b/c adreno preprocessor does not consume braces at call site. i.e. (out_Target0)()			
 				ralloc_asprintf_append(buffer, "\n#ifdef UE_EXT_shader_framebuffer_fetch\n");
 				ralloc_asprintf_append(buffer, "	#define %sinout\n", ES31FrameBufferFetchStorageQualifier);
 				ralloc_asprintf_append(buffer, "	vec4 FramebufferFetchES2();\n");
@@ -3305,7 +3324,7 @@ bool compiler_internal_AdjustIsFrontFacing(bool isFrontFacing)
 
 		char* Extensions = ralloc_asprintf(mem_ctx, "");
 		buffer = &Extensions;
-		print_extensions(state, bUsesFrameBufferFetch, bUsesDepthbufferFetchES2, state->language_version == 310, bUsesExternalTexture);
+		print_extensions(state, bUsesFrameBufferFetch, bUsesDepthbufferFetchES2, CompileTarget == HCT_FeatureLevelES3_1Ext, bUsesExternalTexture);
 		if (state->bSeparateShaderObjects && !state->bGenerateES)
 		{
 			switch (state->target)
@@ -3386,7 +3405,7 @@ struct FBreakPrecisionChangesVisitor : public ir_rvalue_visitor
 	_mesa_glsl_parse_state* State;
 	const bool bDefaultPrecisionIsHalf;
 
-	FBreakPrecisionChangesVisitor(_mesa_glsl_parse_state* InState, bool bInDefaultPrecisionIsHalf)
+	FBreakPrecisionChangesVisitor(_mesa_glsl_parse_state* InState, bool bInDefaultPrecisionIsHalf) 
 		: State(InState)
 		, bDefaultPrecisionIsHalf(bInDefaultPrecisionIsHalf)
 	{}
@@ -3484,7 +3503,7 @@ char* FGlslCodeBackend::GenerateCode(exec_list* ir, _mesa_glsl_parse_state* stat
 
 	const bool bDefaultPrecisionIsHalf = ((HlslCompileFlags & HLSLCC_UseFullPrecisionInPS) == 0);
 	const bool bUsesExternalTexture = ((HlslCompileFlags & HLSLCC_UsesExternalTexture) == HLSLCC_UsesExternalTexture);
-
+	
 	FBreakPrecisionChangesVisitor BreakPrecisionChangesVisitor(state, bDefaultPrecisionIsHalf);
 	BreakPrecisionChangesVisitor.run(ir);
 
@@ -3499,8 +3518,8 @@ char* FGlslCodeBackend::GenerateCode(exec_list* ir, _mesa_glsl_parse_state* stat
 	const bool bUsesFrameBufferFetch = Frequency == HSF_PixelShader && UsesUEIntrinsic(ir, FRAMEBUFFER_FETCH_ES2);
 	ir_gen_glsl_visitor visitor(state->bGenerateES,
 								bEmitPrecision,
-								(Target == HCT_FeatureLevelES3_1Ext || Target == HCT_FeatureLevelES3_1),
 								bIsWebGL,
+								Target,
 								state->target,
 								bGenerateLayoutLocations,
 								bDefaultPrecisionIsHalf,
@@ -3560,7 +3579,7 @@ struct SPromoteSampleLevelES2 : public ir_hierarchical_visitor
 
 		return visit_continue;
 	}
-};
+}; 
 
 
 // Converts an array index expression using an integer input attribute, to a float input attribute using a conversion to int
@@ -3786,7 +3805,7 @@ static void ConfigureInOutVariableLayout(EHlslShaderFrequency Frequency,
 			)
 		{
 			int AttributeIndex = atoi(Semantic + PrefixLength);
-
+			
 			Variable->explicit_location = true;
 			Variable->location = AttributeIndex;
 			Variable->semantic = ralloc_strdup(Variable, Semantic);
@@ -3890,11 +3909,11 @@ static ir_rvalue* GenShaderInputSemantic(
 						if (FCStringAnsi::Stricmp(Semantic, "SV_Position") == 0 && Frequency == HSF_PixelShader)
 						{
 							// This is for input of gl_FragCoord into pixel shader only.
-
+							
 							// Generate a local variable to do the conversion in, keeping source type.
 							ir_variable* TempVariable = new(ParseState)ir_variable(Variable->type, NULL, ir_var_temporary);
 							DeclInstructions->push_tail(TempVariable);
-
+							
 							// Assign input to this variable
 							ir_dereference_variable* TempVariableDeref = new(ParseState)ir_dereference_variable(TempVariable);
 							DeclInstructions->push_tail(
@@ -3903,7 +3922,7 @@ static ir_rvalue* GenShaderInputSemantic(
 								VariableDeref
 								)
 							);
-
+							
 							// TempVariable.w = ( 1.0f / TempVariable.w );
 							DeclInstructions->push_tail(
 								new(ParseState)ir_assignment(
@@ -4016,7 +4035,9 @@ static ir_rvalue* GenShaderInputSemantic(
 
 	// Patch constants must be variables, not structs or interface blocks, in GLSL <= 4.10
 	bool bUseGLSL410Rules = InputQualifier.Fields.bIsPatchConstant && ParseState->language_version <= 410;
-	if (Frequency == HSF_VertexShader || ParseState->bGenerateES || bUseGLSL410Rules)
+	bool bUseESRules = ParseState->bGenerateES || ParseState->language_version == 310;
+
+	if (Frequency == HSF_VertexShader || bUseESRules || bUseGLSL410Rules)
 	{
 		const char* Prefix = "in";
 		if ((ParseState->bGenerateES && Frequency == HSF_PixelShader) || bUseGLSL410Rules)
@@ -4280,12 +4301,19 @@ static ir_rvalue* GenShaderOutputSemantic(
 	}
 
 	bool bUseGLSL410Rules = OutputQualifier.Fields.bIsPatchConstant && ParseState->language_version == 410;
-	if (Variable == NULL && (ParseState->bGenerateES || bUseGLSL410Rules))
+	bool bUseESRules = ParseState->bGenerateES || ParseState->language_version == 310;
+
+	if (Variable == NULL && (bUseESRules || bUseGLSL410Rules))
 	{
 		// Create a variable so that a struct will not get added
 		Variable = new(ParseState)ir_variable(Type, ralloc_asprintf(ParseState, "var_%s", Semantic), ir_var_out);
 	}
 
+	if (ParseState->bGenerateLayoutLocations && Variable && !Variable->is_patch_constant)
+	{
+		ConfigureInOutVariableLayout(Frequency, ParseState, Semantic, Variable, ir_var_out);
+	}
+
 	if (Variable)
 	{
 		// Up to this point, variables aren't contained in structs
diff --git a/Engine/Source/Developer/ShaderFormatOpenGL/Private/OpenGLShaderCompiler.cpp b/Engine/Source/Developer/ShaderFormatOpenGL/Private/OpenGLShaderCompiler.cpp
index 7a38f51617b7..df4201137760 100644
--- a/Engine/Source/Developer/ShaderFormatOpenGL/Private/OpenGLShaderCompiler.cpp
+++ b/Engine/Source/Developer/ShaderFormatOpenGL/Private/OpenGLShaderCompiler.cpp
@@ -935,7 +935,7 @@ void FOpenGLFrontend::BuildShaderOutput(
 
 		if (OptionalSerializeOutputAndReturnIfSerialized(Ar) == false)
 		{
-		Ar.Serialize((void*)USFSource, SourceLen + 1 - (USFSource - InShaderSource));
+			Ar.Serialize((void*)USFSource, SourceLen + 1 - (USFSource - InShaderSource));
 			ShaderOutput.bSucceeded = true;
 		}
 
@@ -944,7 +944,24 @@ void FOpenGLFrontend::BuildShaderOutput(
 		//			uncommenting this will cause the project to have non deterministic materials and will hurt patch sizes
 		//ShaderOutput.ShaderCode.AddOptionalData('n', TCHAR_TO_UTF8(*ShaderInput.GenerateShaderName()));
 
-		ShaderOutput.NumInstructions = 0;
+		// extract final source code as requested by the Material Editor
+		if (ShaderInput.ExtraSettings.bExtractShaderSource)
+		{
+			TArray<ANSICHAR> GlslCodeOriginal;
+			GlslCodeOriginal.Append(USFSource, FCStringAnsi::Strlen(USFSource) + 1);
+			ShaderOutput.OptionalFinalShaderSource = FString(GlslCodeOriginal.GetData());
+		}
+
+		// if available, attempt run an offline compilation and extract statistics
+		if (ShaderInput.ExtraSettings.OfflineCompilerPath.Len() > 0)
+		{
+			CompileOffline(ShaderInput, ShaderOutput, Version, USFSource);
+		}
+		else
+		{
+			ShaderOutput.NumInstructions = 0;
+		}
+
 		ShaderOutput.NumTextureSamplers = Header.Bindings.NumSamplers;
 	}
 }
@@ -1544,7 +1561,7 @@ void FOpenGLFrontend::CompileShader(const FShaderCompilerInput& Input,FShaderCom
 				free(GlslShaderSource);
 				GlslShaderSource = Dest;
 				GlslSourceLen = FCStringAnsi::Strlen(GlslShaderSource);
-					
+
 				FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*(Input.DumpDebugInfoPath / Input.VirtualSourceFilePath + TEXT(".glsl")));
 				if (FileWriter)
 				{
@@ -1595,3 +1612,403 @@ void FOpenGLFrontend::CompileShader(const FShaderCompilerInput& Input,FShaderCom
 		free(ErrorLog);
 	}
 }
+
+enum class EPlatformType
+{
+	Android,
+	IOS,
+	Web,
+	Desktop
+};
+
+struct FDeviceCapabilities
+{
+	EPlatformType TargetPlatform = EPlatformType::Android;
+	bool bUseES30ShadingLanguage;
+	bool bSupportsSeparateShaderObjects;
+	bool bRequiresUEShaderFramebufferFetchDef;
+	bool bRequiresDontEmitPrecisionForTextureSamplers;
+	bool bSupportsShaderTextureLod;
+	bool bSupportsShaderTextureCubeLod;
+	bool bRequiresTextureCubeLodEXTToTextureCubeLodDefine;
+};
+
+void FOpenGLFrontend::FillDeviceCapsOfflineCompilation(struct FDeviceCapabilities& Capabilities, const GLSLVersion ShaderVersion) const
+{
+	FMemory::Memzero(Capabilities);
+
+	if (ShaderVersion == GLSL_ES2 || ShaderVersion == GLSL_ES3_1_ANDROID)
+	{
+		Capabilities.TargetPlatform = EPlatformType::Android;
+
+		Capabilities.bUseES30ShadingLanguage = ShaderVersion == GLSL_ES3_1_ANDROID;
+		Capabilities.bRequiresUEShaderFramebufferFetchDef = true;
+		Capabilities.bRequiresDontEmitPrecisionForTextureSamplers = false;
+	}
+	else if (ShaderVersion == GLSL_ES2_WEBGL)
+	{
+		Capabilities.TargetPlatform = EPlatformType::Web;
+		Capabilities.bUseES30ShadingLanguage = true;
+	}
+	else if (ShaderVersion == GLSL_ES2_IOS)
+	{
+		Capabilities.TargetPlatform = EPlatformType::IOS;
+	}
+	else
+	{
+		Capabilities.TargetPlatform = EPlatformType::Desktop;
+
+		Capabilities.bSupportsSeparateShaderObjects = true;
+	}
+
+	Capabilities.bSupportsShaderTextureLod = true;
+	Capabilities.bSupportsShaderTextureCubeLod = false;
+	Capabilities.bRequiresTextureCubeLodEXTToTextureCubeLodDefine = true;
+}
+
+static bool MoveHashLines(FString& Destination, FString &Source)
+{
+	int32 Index = 0;
+	int32 LineStart = 0;
+
+	bool bFound = false;
+	while (Index != INDEX_NONE && !bFound)
+	{
+		LineStart = Index;
+		Index = Source.Find(TEXT("\n"), ESearchCase::IgnoreCase, ESearchDir::FromStart, Index);
+
+		for (int32 i = LineStart; i < Index; ++i)
+		{
+			const auto CharValue = Source[i];
+			if (CharValue == '#')
+			{
+				break;
+			}
+			else if (!FChar::IsWhitespace(CharValue))
+			{
+				bFound = true;
+				break;
+			}
+		}
+
+		++Index;
+	}
+
+	if (bFound)
+	{
+		Destination.Append(Source.Left(LineStart));
+		Source.RemoveAt(0, LineStart);
+	}
+
+	return bFound;
+}
+
+static bool OpenGLShaderPlatformNeedsBindLocation(const GLSLVersion InShaderPlatform)
+{
+	switch (InShaderPlatform)
+	{
+		case GLSL_430:
+		case GLSL_310_ES_EXT:
+		case GLSL_ES3_1_ANDROID:
+		case GLSL_150_ES3_1:
+			return false;
+
+		case GLSL_150:
+		case GLSL_150_ES2:
+		case GLSL_ES2:
+		case GLSL_150_ES2_NOUB:
+		case GLSL_ES2_WEBGL:
+		case GLSL_ES2_IOS:
+			return true;
+
+		default:
+			return true;
+		break;
+	}
+}
+
+inline bool OpenGLShaderPlatformSeparable(const GLSLVersion InShaderPlatform)
+{
+	switch (InShaderPlatform)
+	{
+		case GLSL_430:
+		case GLSL_150:
+		case GLSL_150_ES2:
+		case GLSL_150_ES2_NOUB:
+		case GLSL_150_ES3_1:
+			return true;
+
+		case GLSL_310_ES_EXT:
+		case GLSL_ES3_1_ANDROID:
+		case GLSL_ES2:
+		case GLSL_ES2_WEBGL:
+		case GLSL_ES2_IOS:
+			return false;
+
+		default:
+			return true;
+		break;
+	}
+}
+
+TSharedPtr<ANSICHAR> FOpenGLFrontend::PrepareCodeForOfflineCompilation(const GLSLVersion ShaderVersion, EShaderFrequency Frequency, const ANSICHAR* InShaderSource) const
+{
+	FString OriginalShaderSource(ANSI_TO_TCHAR(InShaderSource));
+	FString StrOutSource;
+
+	FDeviceCapabilities Capabilities;
+	FillDeviceCapsOfflineCompilation(Capabilities, ShaderVersion);
+
+	// Whether shader was compiled for ES 3.1
+	const TCHAR *ES310Version = TEXT("#version 310 es");
+	const bool bES31 = OriginalShaderSource.Find(ES310Version) != INDEX_NONE;
+
+	// Whether we need to emit mobile multi-view code or not.
+	const bool bEmitMobileMultiView = OriginalShaderSource.Find(TEXT("gl_ViewID_OVR")) != INDEX_NONE;
+
+	// Whether we need to emit texture external code or not.
+	const bool bEmitTextureExternal = OriginalShaderSource.Find(TEXT("samplerExternalOES")) != INDEX_NONE;
+
+	const bool bUseES30ShadingLanguage = Capabilities.bUseES30ShadingLanguage;
+
+	bool bNeedsExtDrawInstancedDefine = false;
+	if (Capabilities.TargetPlatform == EPlatformType::Android || Capabilities.TargetPlatform == EPlatformType::Web)
+	{
+		bNeedsExtDrawInstancedDefine = !bES31;
+		if (bES31)
+		{
+			StrOutSource.Append(ES310Version);
+			StrOutSource.Append(TEXT("\n"));
+			OriginalShaderSource.RemoveFromStart(ES310Version);
+		}
+		else if (IsES2Platform(ShaderVersion))
+		{
+			StrOutSource.Append(TEXT("#version 100\n"));
+			OriginalShaderSource.RemoveFromStart(TEXT("#version 100"));
+		}
+	}
+	else if (Capabilities.TargetPlatform == EPlatformType::IOS)
+	{
+		bNeedsExtDrawInstancedDefine = true;
+		StrOutSource.Append(TEXT("#version 100\n"));
+		OriginalShaderSource.RemoveFromStart(TEXT("#version 100"));
+	}
+
+	if (bNeedsExtDrawInstancedDefine)
+	{
+		// Check for the GL_EXT_draw_instanced extension if necessary (version < 300)
+		StrOutSource.Append(TEXT("#ifdef GL_EXT_draw_instanced\n"));
+		StrOutSource.Append(TEXT("#define UE_EXT_draw_instanced 1\n"));
+		StrOutSource.Append(TEXT("#endif\n"));
+	}
+
+	const GLenum TypeEnum = GLFrequencyTable[Frequency];
+	// The incoming glsl may have preprocessor code that is dependent on defines introduced via the engine.
+	// This is the place to insert such engine preprocessor defines, immediately after the glsl version declaration.
+	if (Capabilities.bRequiresUEShaderFramebufferFetchDef && TypeEnum == GL_FRAGMENT_SHADER)
+	{
+		// Some devices (Zenfone5) support GL_EXT_shader_framebuffer_fetch but do not define GL_EXT_shader_framebuffer_fetch in GLSL compiler
+		// We can't define anything with GL_, so we use UE_EXT_shader_framebuffer_fetch to enable frame buffer fetch
+		StrOutSource.Append(TEXT("#define UE_EXT_shader_framebuffer_fetch 1\n"));
+	}
+
+	if (bEmitMobileMultiView)
+	{
+		MoveHashLines(StrOutSource, OriginalShaderSource);
+
+		StrOutSource.Append(TEXT("\n\n"));
+		StrOutSource.Append(TEXT("#extension GL_OVR_multiview2 : enable\n"));
+		StrOutSource.Append(TEXT("\n\n"));
+	}
+
+	if (bEmitTextureExternal)
+	{
+		MoveHashLines(StrOutSource, OriginalShaderSource);
+		StrOutSource.Append(TEXT("#define samplerExternalOES sampler2D\n"));
+	}
+
+	// Only desktop with separable shader platform can use GL_ARB_separate_shader_objects for reduced shader compile/link hitches
+	// however ES3.1 relies on layout(location=) support
+	bool const bNeedsBindLocation = OpenGLShaderPlatformNeedsBindLocation(ShaderVersion) && !bES31;
+	if (OpenGLShaderPlatformSeparable(ShaderVersion) || !bNeedsBindLocation)
+	{
+		// Move version tag & extensions before beginning all other operations
+		MoveHashLines(StrOutSource, OriginalShaderSource);
+
+		// OpenGL SM5 shader platforms require location declarations for the layout, but don't necessarily use SSOs
+		if (Capabilities.bSupportsSeparateShaderObjects || !bNeedsBindLocation)
+		{
+			if (Capabilities.TargetPlatform == EPlatformType::Desktop)
+			{
+				StrOutSource.Append(TEXT("#extension GL_ARB_separate_shader_objects : enable\n"));
+				StrOutSource.Append(TEXT("#define INTERFACE_LOCATION(Pos) layout(location=Pos) \n"));
+				StrOutSource.Append(TEXT("#define INTERFACE_BLOCK(Pos, Interp, Modifiers, Semantic, PreType, PostType) layout(location=Pos) Interp Modifiers struct { PreType PostType; }\n"));
+			}
+			else
+			{
+				StrOutSource.Append(TEXT("#define INTERFACE_LOCATION(Pos) layout(location=Pos) \n"));
+				StrOutSource.Append(TEXT("#define INTERFACE_BLOCK(Pos, Interp, Modifiers, Semantic, PreType, PostType) layout(location=Pos) Modifiers Semantic { PreType PostType; }\n"));
+			}
+		}
+		else
+		{
+			StrOutSource.Append(TEXT("#define INTERFACE_LOCATION(Pos) \n"));
+			StrOutSource.Append(TEXT("#define INTERFACE_BLOCK(Pos, Interp, Modifiers, Semantic, PreType, PostType) Modifiers Semantic { Interp PreType PostType; }\n"));
+		}
+	}
+
+	if (Capabilities.TargetPlatform == EPlatformType::Android)
+	{
+		if (IsES2Platform(ShaderVersion) && !bES31)
+		{
+			StrOutSource.Append(TEXT("#define HDR_32BPP_ENCODE_MODE 0.0\n"));
+
+			// This #define fixes compiler errors on Android (which doesn't seem to support textureCubeLodEXT)
+			if (bUseES30ShadingLanguage)
+			{
+				if (TypeEnum == GL_VERTEX_SHADER)
+				{
+					StrOutSource.Append(TEXT("#define texture2D texture \n"
+						"#define texture2DProj textureProj \n"
+						"#define texture2DLod textureLod \n"
+						"#define texture2DLodEXT textureLod \n"
+						"#define texture2DProjLod textureProjLod \n"
+						"#define textureCube texture \n"
+						"#define textureCubeLod textureLod \n"
+						"#define textureCubeLodEXT textureLod \n"
+						"#define texture3D texture \n"
+						"#define texture3DProj textureProj \n"
+						"#define texture3DLod textureLod \n"));
+
+					OriginalShaderSource.Replace(TEXT("attribute"), TEXT("in"));
+					OriginalShaderSource.Replace(TEXT("varying"), TEXT("out"));
+				}
+				else if (TypeEnum == GL_FRAGMENT_SHADER)
+				{
+					// #extension directives have to come before any non-# directives. Because
+					// we add non-# stuff below and the #extension directives
+					// get added to the incoming shader source we move any # directives
+					// to be right after the #version to ensure they are always correct.
+					MoveHashLines(StrOutSource, OriginalShaderSource);
+
+					StrOutSource.Append(TEXT("#define texture2D texture \n"
+						"#define texture2DProj textureProj \n"
+						"#define texture2DLod textureLod \n"
+						"#define texture2DLodEXT textureLod \n"
+						"#define texture2DProjLod textureProjLod \n"
+						"#define textureCube texture \n"
+						"#define textureCubeLod textureLod \n"
+						"#define textureCubeLodEXT textureLod \n"
+						"#define texture3D texture \n"
+						"#define texture3DProj textureProj \n"
+						"#define texture3DLod textureLod \n"
+						"#define texture3DProjLod textureProjLod \n"
+						"\n"
+						"#define gl_FragColor out_FragColor \n"
+						"#ifdef EXT_shader_framebuffer_fetch_enabled \n"
+						"inout mediump vec4 out_FragColor; \n"
+						"#else \n"
+						"out mediump vec4 out_FragColor; \n"
+						"#endif \n"));
+
+					OriginalShaderSource.Replace(TEXT("varying"), TEXT("in"));
+				}
+			}
+			else
+			{
+				if (TypeEnum == GL_FRAGMENT_SHADER)
+				{
+					// Apply #defines to deal with incompatible sections of code
+
+					if (Capabilities.bRequiresDontEmitPrecisionForTextureSamplers)
+					{
+						StrOutSource.Append(TEXT("#define DONTEMITSAMPLERDEFAULTPRECISION \n"));
+					}
+
+					if (!Capabilities.bSupportsShaderTextureLod || !Capabilities.bSupportsShaderTextureCubeLod)
+					{
+						StrOutSource.Append(TEXT("#define DONTEMITEXTENSIONSHADERTEXTURELODENABLE \n"
+							"#define texture2DLodEXT(a, b, c) texture2D(a, b) \n"
+							"#define textureCubeLodEXT(a, b, c) textureCube(a, b) \n"));
+					}
+					else if (Capabilities.bRequiresTextureCubeLodEXTToTextureCubeLodDefine)
+					{
+						StrOutSource.Append(TEXT("#define textureCubeLodEXT textureCubeLod \n"));
+					}
+				}
+			}
+		}
+	}
+	else if (Capabilities.TargetPlatform == EPlatformType::Web)
+	{
+		// HTML5 use case is much simpler, use a separate chunk of code from android. 
+		if (!Capabilities.bSupportsShaderTextureLod)
+		{
+			StrOutSource.Append(TEXT("#define DONTEMITEXTENSIONSHADERTEXTURELODENABLE \n"
+				"#define texture2DLodEXT(a, b, c) texture2D(a, b) \n"
+				"#define textureCubeLodEXT(a, b, c) textureCube(a, b) \n"));
+		}
+	}
+
+	StrOutSource.Append(TEXT("#define HLSLCC_DX11ClipSpace 1 \n"));
+
+	// Append the possibly edited shader to the one we will compile.
+	// This is to make it easier to debug as we can see the whole
+	// shader source.
+	StrOutSource.Append(TEXT("\n\n"));
+	StrOutSource.Append(OriginalShaderSource);
+
+	const int32 SourceLen = StrOutSource.Len();
+	TSharedPtr<ANSICHAR> RetShaderSource = MakeShareable(new ANSICHAR[SourceLen + 1]);
+	FCStringAnsi::Strcpy(RetShaderSource.Get(), SourceLen + 1, TCHAR_TO_ANSI(*StrOutSource));
+
+	return RetShaderSource;
+}
+
+bool FOpenGLFrontend::PlatformSupportsOfflineCompilation(const GLSLVersion ShaderVersion) const
+{
+	switch (ShaderVersion)
+	{
+		// desktop
+		case GLSL_150:
+		case GLSL_430:
+		case GLSL_150_ES2:
+		case GLSL_150_ES2_NOUB:
+		case GLSL_150_ES3_1:
+		case GLSL_310_ES_EXT:
+		// web
+		case GLSL_ES2_WEBGL:
+		// switch
+		case GLSL_SWITCH:
+		case GLSL_SWITCH_FORWARD:
+			return false;
+		break;
+		// ios
+		case GLSL_ES2_IOS:
+		// android
+		case GLSL_ES2:
+		case GLSL_ES3_1_ANDROID:
+			return true;
+		break;
+	}
+
+	return false;
+}
+
+void FOpenGLFrontend::CompileOffline(const FShaderCompilerInput& Input, FShaderCompilerOutput& Output, const GLSLVersion ShaderVersion, const ANSICHAR* InShaderSource)
+{
+	const bool bSupportsOfflineCompilation = PlatformSupportsOfflineCompilation(ShaderVersion);
+
+	if (!bSupportsOfflineCompilation)
+		return;	
+
+	TSharedPtr<ANSICHAR> ShaderSource = PrepareCodeForOfflineCompilation(ShaderVersion, (EShaderFrequency)Input.Target.Frequency, InShaderSource);
+
+	PlatformCompileOffline(Input, Output, ShaderSource.Get(), ShaderVersion);
+}
+
+void FOpenGLFrontend::PlatformCompileOffline(const FShaderCompilerInput& Input, FShaderCompilerOutput& ShaderOutput, const ANSICHAR* ShaderSource, const GLSLVersion ShaderVersion)
+{
+	if (ShaderVersion == GLSL_ES2 || ShaderVersion == GLSL_ES3_1_ANDROID || ShaderVersion == GLSL_ES2_IOS)
+		CompileOfflineMali(Input, ShaderOutput, ShaderSource, FPlatformString::Strlen(ShaderSource), false);
+}
diff --git a/Engine/Source/Developer/ShaderFormatOpenGL/Private/ShaderFormatOpenGL.cpp b/Engine/Source/Developer/ShaderFormatOpenGL/Private/ShaderFormatOpenGL.cpp
index 89c8d151064b..17b760d946b7 100644
--- a/Engine/Source/Developer/ShaderFormatOpenGL/Private/ShaderFormatOpenGL.cpp
+++ b/Engine/Source/Developer/ShaderFormatOpenGL/Private/ShaderFormatOpenGL.cpp
@@ -24,16 +24,16 @@ class FShaderFormatGLSL : public IShaderFormat
 	enum
 	{
 		/** Version for shader format, this becomes part of the DDC key. */
-		UE_SHADER_GLSL_150_VER = 67,
-		UE_SHADER_GLSL_430_VER = 67,
-		UE_SHADER_GLSL_ES2_VER = 67,
-		UE_SHADER_GLSL_150ES2_VER = 67,
-		UE_SHADER_GLSL_150ES2NOUB_VER = 67,
-		UE_SHADER_GLSL_150ES3_1_VER = 67,
-		UE_SHADER_GLSL_ES2_VER_WEBGL = 67,
-		UE_SHADER_GLSL_ES2_IOS_VER = 67,
-		UE_SHADER_GLSL_310_ES_EXT_VER = 67,
-		UE_SHADER_GLSL_ES3_1_ANDROID_VER = 67,
+		UE_SHADER_GLSL_150_VER = 71,
+		UE_SHADER_GLSL_430_VER = 71,
+		UE_SHADER_GLSL_ES2_VER = 71,
+		UE_SHADER_GLSL_150ES2_VER = 71,
+		UE_SHADER_GLSL_150ES2NOUB_VER = 71,
+		UE_SHADER_GLSL_150ES3_1_VER = 71,
+		UE_SHADER_GLSL_ES2_VER_WEBGL = 71,
+		UE_SHADER_GLSL_ES2_IOS_VER = 71,
+		UE_SHADER_GLSL_310_ES_EXT_VER = 71,
+		UE_SHADER_GLSL_ES3_1_ANDROID_VER = 71,
 	}; 
 
 	void CheckFormat(FName Format) const
diff --git a/Engine/Source/Developer/ShaderFormatOpenGL/Public/ShaderFormatOpenGL.h b/Engine/Source/Developer/ShaderFormatOpenGL/Public/ShaderFormatOpenGL.h
index 970e75a6196c..2089ae0957b7 100644
--- a/Engine/Source/Developer/ShaderFormatOpenGL/Public/ShaderFormatOpenGL.h
+++ b/Engine/Source/Developer/ShaderFormatOpenGL/Public/ShaderFormatOpenGL.h
@@ -91,4 +91,16 @@ protected:
 	void BuildShaderOutput(FShaderCompilerOutput& ShaderOutput, const FShaderCompilerInput& ShaderInput, const ANSICHAR* InShaderSource, int32 SourceLen, GLSLVersion Version);
 	void PrecompileShader(FShaderCompilerOutput& ShaderOutput, const FShaderCompilerInput& ShaderInput, const ANSICHAR* ShaderSource, GLSLVersion Version, EHlslShaderFrequency Frequency);
 	void PrecompileGLSLES2(FShaderCompilerOutput& ShaderOutput, const FShaderCompilerInput& ShaderInput, const ANSICHAR* ShaderSource, EHlslShaderFrequency Frequency);
+
+	bool PlatformSupportsOfflineCompilation(const GLSLVersion ShaderVersion) const;
+
+	// fills device capabilities in 'offline', mostly hardcoded values
+	void FillDeviceCapsOfflineCompilation(struct FDeviceCapabilities &Caps, const GLSLVersion ShaderVersion) const;
+	// final source code processing, based on device capabilities, before actual (offline) compilation; it mostly mirrors the behaviour of OpenGLShaders.cpp/GLSLToDeviceCompatibleGLSL()
+	TSharedPtr<ANSICHAR> PrepareCodeForOfflineCompilation(GLSLVersion ShaderVersion, EShaderFrequency Frequency, const ANSICHAR* InShaderSource) const;
+
+	void CompileOffline(const FShaderCompilerInput& ShaderInput, FShaderCompilerOutput &Output, const GLSLVersion ShaderVersion, const ANSICHAR *InShaderSource);
+
+	// based on ShaderVersion decides what platform specific compiler to use
+	void PlatformCompileOffline(const FShaderCompilerInput &Input, FShaderCompilerOutput& ShaderOutput, const ANSICHAR* ShaderSource, const GLSLVersion ShaderVersion);
 };
diff --git a/Engine/Source/Developer/ShaderFormatVectorVM/Private/ir_vm_gen_bytecode_visitor.cpp b/Engine/Source/Developer/ShaderFormatVectorVM/Private/ir_vm_gen_bytecode_visitor.cpp
index 7b426907e8b1..80c33ec47c64 100644
--- a/Engine/Source/Developer/ShaderFormatVectorVM/Private/ir_vm_gen_bytecode_visitor.cpp
+++ b/Engine/Source/Developer/ShaderFormatVectorVM/Private/ir_vm_gen_bytecode_visitor.cpp
@@ -1084,7 +1084,7 @@ struct op_external_func : public op_base
 			}
 			check(input->is_scalar());
 			ComponentStr.Empty(64);
-			ComponentStr = LexicalConversion::ToString(input->offset);
+			ComponentStr = LexToString(input->offset);
 
 			Str += FString::Printf(TEXT("%s[%s]"), get_location_string(input->owner->location), *ComponentStr);
 		}
@@ -1099,7 +1099,7 @@ struct op_external_func : public op_base
 
 			ComponentStr.Empty(64);
 			check(output->is_scalar());
-			ComponentStr = LexicalConversion::ToString(output->offset);
+			ComponentStr = LexToString(output->offset);
 
 			Str += FString::Printf(TEXT("%s[%s]"), get_location_string(output->owner->location), *ComponentStr);
 		}
diff --git a/Engine/Source/Developer/SimplygonMeshReduction/Private/SimplygonMeshReduction.cpp b/Engine/Source/Developer/SimplygonMeshReduction/Private/SimplygonMeshReduction.cpp
index 4dbc032885aa..0b6adf42551c 100644
--- a/Engine/Source/Developer/SimplygonMeshReduction/Private/SimplygonMeshReduction.cpp
+++ b/Engine/Source/Developer/SimplygonMeshReduction/Private/SimplygonMeshReduction.cpp
@@ -236,8 +236,8 @@ public:
 		const int32 LODIndex
 		)
 	{
-		const bool bUsingMaxDeviation = (Settings.ReductionMethod == SMOT_MaxDeviation && Settings.MaxDeviationPercentage > 0.0f);
-		const bool bUsingReductionRatio = (Settings.ReductionMethod == SMOT_NumOfTriangles && Settings.NumOfTrianglesPercentage < 1.0f);
+		const bool bUsingMaxDeviation = (Settings.ReductionMethod != SMOT_NumOfTriangles && Settings.MaxDeviationPercentage > 0.0f);
+		const bool bUsingReductionRatio = (Settings.ReductionMethod != SMOT_MaxDeviation && Settings.NumOfTrianglesPercentage < 1.0f);
 		const bool bProcessGeometry = ( bUsingMaxDeviation || bUsingReductionRatio );
 		const bool bProcessBones = (Settings.MaxBonesPerVertex < MAX_TOTAL_INFLUENCES);
 		const bool bOptimizeMesh = (bProcessGeometry || bProcessBones);
@@ -283,11 +283,12 @@ public:
 
 			// We require the max deviation if we're calculating the LOD's display distance.
 			MaxDeviation = ReductionProcessor->GetResultDeviation();
-
-			CreateSkeletalLODModelFromGeometry( GeometryData, RefSkeleton, OutModel );
+			CreateSkeletalLODModelFromGeometry(GeometryData, RefSkeleton, OutModel);
+			// return true if it created any vertice
+			return (OutModel->NumVertices > 0);
 		}
 
-		return bOptimizeMesh;
+		return false;
 	}
 
 	bool RemoveMeshSection(FSkeletalMeshLODModel* Model, int32 SectionIndex)
@@ -528,6 +529,16 @@ public:
 			SrcModel->RawPointIndices.Unlock();
 			SrcModel->LegacyRawPointIndices.Unlock();
 
+			// See if we'd like to remove extra bones first
+			if (MeshBoneReductionInterface->GetBoneReductionData(SkeletalMesh, LODIndex, BonesToRemove))
+			{
+				// fix up chunks to remove the bones that set to be removed
+				for (int32 SectionIndex = 0; SectionIndex < NewModel->Sections.Num(); ++SectionIndex)
+				{
+					MeshBoneReductionInterface->FixUpSectionBoneMaps(NewModel->Sections[SectionIndex], BonesToRemove);
+				}
+			}
+						
 			//Clean up some section data
 			for (int32 SectionIndex = SrcModel->Sections.Num()-1; SectionIndex >= 0; --SectionIndex)
 			{
@@ -541,9 +552,11 @@ public:
 				}
 			}
 
+			SkeletalMesh->GetLODInfo(LODIndex)->LODMaterialMap = SkeletalMesh->GetLODInfo(BaseLOD)->LODMaterialMap;			
 			// Required bones are recalculated later on.
 			NewModel->RequiredBones.Empty();
-			SkeletalMesh->GetLODInfo(LODIndex)->bHasBeenSimplified = false;
+			SkeletalMesh->GetLODInfo(LODIndex)->bHasBeenSimplified = true;
+			SkeletalMesh->bHasBeenSimplified = true;
 		}
 
 		SkeletalMesh->CalculateRequiredBones(SkeletalMeshResource->LODModels[LODIndex], SkeletalMesh->RefSkeleton, &BonesToRemove);
@@ -1011,7 +1024,7 @@ public:
 
 		if (!InData.Num())
 		{
-			UE_LOG(LogSimplygon, Log, TEXT("The selected meshes are not valid. Make sure to select static meshes only."));
+			FailedDelegate.ExecuteIfBound(InJobGUID, TEXT("The selected meshes are not valid. Make sure to select static meshes only."));
 			OutProxyMesh.Empty();
 			return;
 		}
@@ -1083,7 +1096,12 @@ public:
 		RemeshingProcessor->AddObserver(&EventHandler, SimplygonSDK::SG_EVENT_PROGRESS);
 		RemeshingProcessor->GetRemeshingSettings()->SetOnScreenSize(InProxySettings.ScreenSize);
 		RemeshingProcessor->GetRemeshingSettings()->SetMergeDistance(InProxySettings.MergeDistance);
-		
+		if (InProxySettings.bUseHardAngleThreshold)
+		{
+			// Otherwise the default Remeshing setting of 80-degree will be used.
+			RemeshingProcessor->GetRemeshingSettings()->SetHardEdgeAngleInRadians(FMath::DegreesToRadians(InProxySettings.HardAngleThreshold));
+		}
+
 		// Setup sets for the remeshing processor
 		bool bUseClippingGeometry = clippingGeometrySet->GetItemCount() > 0 ? true : false;
 
@@ -2187,11 +2205,34 @@ private:
 	void SetReductionSettings( const FSkeletalMeshOptimizationSettings& Settings, float BoundsRadius, int32 SourceTriCount, SimplygonSDK::spReductionSettings ReductionSettings )
 	{
 		// Compute max deviation from quality.
-		float MaxDeviation = Settings.MaxDeviationPercentage > 0.0f ? Settings.MaxDeviationPercentage * BoundsRadius : SimplygonSDK::REAL_MAX;
-		// Set the reduction ratio such that at least 1 triangle or 5% of the original triangles remain, whichever is larger.
-		float MinReductionRatio = FMath::Max<float>(1.0f / SourceTriCount, 0.05f);
-		float MaxReductionRatio = (Settings.MaxDeviationPercentage > 0.0f && Settings.NumOfTrianglesPercentage == 1.0f) ? MinReductionRatio : 1.0f;
-		float ReductionRatio = FMath::Clamp(Settings.NumOfTrianglesPercentage, MinReductionRatio, MaxReductionRatio);
+		float MaxDeviation = (Settings.ReductionMethod != SMOT_NumOfTriangles)? Settings.MaxDeviationPercentage * BoundsRadius : SimplygonSDK::REAL_MAX;
+		
+		// Set the reduction ratio such that at least 1 triangle or 1% of the original triangles remain, whichever is larger.
+		float MinReductionRatio = FMath::Max<float>(1.0f / SourceTriCount, 0.01f);
+		float ReductionRatio = MinReductionRatio;
+
+		// if reduction is not deviate, we set the percentage
+		if (Settings.ReductionMethod != SMOT_MaxDeviation)
+		{
+			ReductionRatio = FMath::Clamp(Settings.NumOfTrianglesPercentage, MinReductionRatio, 1.f);
+		}
+		
+		unsigned int ReductionTarget = 0;
+		unsigned int StopCondition = SimplygonSDK::SG_STOPCONDITION_ANY;
+		switch (Settings.ReductionMethod)
+		{
+		case SMOT_MaxDeviation:
+			// we still give triangle ratio because otherwise you won't get any triangle back and crash render resource
+			ReductionTarget = SimplygonSDK::SG_REDUCTIONTARGET_TRIANGLERATIO | SimplygonSDK::SG_REDUCTIONTARGET_MAXDEVIATION;
+			break;
+		case SMOT_NumOfTriangles:
+			ReductionTarget = SimplygonSDK::SG_REDUCTIONTARGET_TRIANGLERATIO;
+			break;
+		case SMOT_TriangleOrDeviation:
+		default:
+			ReductionTarget = SimplygonSDK::SG_REDUCTIONTARGET_TRIANGLERATIO | SimplygonSDK::SG_REDUCTIONTARGET_MAXDEVIATION;
+			break;
+		}
 
 		const float ImportanceTable[] =
 		{
@@ -2209,8 +2250,8 @@ private:
 		check( Settings.ShadingImportance < SMOI_MAX );
 		check( Settings.SkinningImportance < SMOI_MAX );
 		
-		ReductionSettings->SetStopCondition(SimplygonSDK::SG_STOPCONDITION_ANY);
-		ReductionSettings->SetReductionTargets(SimplygonSDK::SG_REDUCTIONTARGET_TRIANGLERATIO | SimplygonSDK::SG_REDUCTIONTARGET_MAXDEVIATION);
+		ReductionSettings->SetStopCondition(StopCondition);
+		ReductionSettings->SetReductionTargets(ReductionTarget);
 		ReductionSettings->SetMaxDeviation( MaxDeviation );
 		ReductionSettings->SetTriangleRatio( ReductionRatio );
 		ReductionSettings->SetGeometryImportance( ImportanceTable[Settings.SilhouetteImportance] );
@@ -2925,7 +2966,11 @@ private:
 			else
 			{
 				FString ErrorMessage = ANSI_TO_TCHAR(GeometryValidator->GetErrorString());
-				UE_LOG(LogSimplygon, Warning, TEXT("Invalid mesh data: %s."), *ErrorMessage);
+
+				// Downgrade geometry validation errors to info
+				ErrorMessage = ErrorMessage.Replace(TEXT("Error:"), TEXT("Info:"));
+
+				UE_LOG(LogSimplygon, Log, TEXT("Invalid mesh data: %s."), *ErrorMessage);
 			}
 		}
 	}
diff --git a/Engine/Source/Developer/SlateReflector/Private/Widgets/SWidgetReflector.cpp b/Engine/Source/Developer/SlateReflector/Private/Widgets/SWidgetReflector.cpp
index 64882dfb7c12..69e0ae8cd26c 100644
--- a/Engine/Source/Developer/SlateReflector/Private/Widgets/SWidgetReflector.cpp
+++ b/Engine/Source/Developer/SlateReflector/Private/Widgets/SWidgetReflector.cpp
@@ -412,8 +412,11 @@ void SWidgetReflector::Construct( const FArguments& InArgs )
 
 #if SLATE_REFLECTOR_HAS_SESSION_SERVICES
 	{
-		TSharedRef<ISessionManager> SessionManager = FModuleManager::LoadModuleChecked<ISessionServicesModule>("SessionServices").GetSessionManager();
-		SessionManager->OnSessionsUpdated().AddSP(this, &SWidgetReflector::OnAvailableSnapshotTargetsChanged);
+		TSharedPtr<ISessionManager> SessionManager = FModuleManager::LoadModuleChecked<ISessionServicesModule>("SessionServices").GetSessionManager();
+		if (SessionManager.IsValid())
+		{
+			SessionManager->OnSessionsUpdated().AddSP(this, &SWidgetReflector::OnAvailableSnapshotTargetsChanged);
+		}
 	}
 #endif // SLATE_REFLECTOR_HAS_SESSION_SERVICES
 	SelectedSnapshotTargetInstanceId = FApp::GetInstanceId();
@@ -1596,29 +1599,31 @@ void SWidgetReflector::UpdateAvailableSnapshotTargets()
 
 #if SLATE_REFLECTOR_HAS_SESSION_SERVICES
 	{
-		TSharedRef<ISessionManager> SessionManager = FModuleManager::LoadModuleChecked<ISessionServicesModule>("SessionServices").GetSessionManager();
-
-		TArray<TSharedPtr<ISessionInfo>> AvailableSessions;
-		SessionManager->GetSessions(AvailableSessions);
-
-		for (const auto& AvailableSession : AvailableSessions)
+		TSharedPtr<ISessionManager> SessionManager = FModuleManager::LoadModuleChecked<ISessionServicesModule>("SessionServices").GetSessionManager();
+		if (SessionManager.IsValid())
 		{
-			// Only allow sessions belonging to the current user
-			if (AvailableSession->GetSessionOwner() != FApp::GetSessionOwner())
+			TArray<TSharedPtr<ISessionInfo>> AvailableSessions;
+			SessionManager->GetSessions(AvailableSessions);
+
+			for (const auto& AvailableSession : AvailableSessions)
 			{
-				continue;
-			}
+				// Only allow sessions belonging to the current user
+				if (AvailableSession->GetSessionOwner() != FApp::GetSessionOwner())
+				{
+					continue;
+				}
 
-			TArray<TSharedPtr<ISessionInstanceInfo>> AvailableInstances;
-			AvailableSession->GetInstances(AvailableInstances);
+				TArray<TSharedPtr<ISessionInstanceInfo>> AvailableInstances;
+				AvailableSession->GetInstances(AvailableInstances);
 
-			for (const auto& AvailableInstance : AvailableInstances)
-			{
-				FWidgetSnapshotTarget SnapshotTarget;
-				SnapshotTarget.DisplayName = FText::Format(LOCTEXT("SnapshotTargetDisplayNameFmt", "{0} ({1})"), FText::FromString(AvailableInstance->GetInstanceName()), FText::FromString(AvailableInstance->GetPlatformName()));
-				SnapshotTarget.InstanceId = AvailableInstance->GetInstanceId();
+				for (const auto& AvailableInstance : AvailableInstances)
+				{
+					FWidgetSnapshotTarget SnapshotTarget;
+					SnapshotTarget.DisplayName = FText::Format(LOCTEXT("SnapshotTargetDisplayNameFmt", "{0} ({1})"), FText::FromString(AvailableInstance->GetInstanceName()), FText::FromString(AvailableInstance->GetPlatformName()));
+					SnapshotTarget.InstanceId = AvailableInstance->GetInstanceId();
 
-				AvailableSnapshotTargets.Add(MakeShareable(new FWidgetSnapshotTarget(SnapshotTarget)));
+					AvailableSnapshotTargets.Add(MakeShareable(new FWidgetSnapshotTarget(SnapshotTarget)));
+				}
 			}
 		}
 	}
diff --git a/Engine/Source/Developer/SourceControl/Private/DefaultSourceControlProvider.h b/Engine/Source/Developer/SourceControl/Private/DefaultSourceControlProvider.h
index 2df508ffdef6..c194886ee75a 100644
--- a/Engine/Source/Developer/SourceControl/Private/DefaultSourceControlProvider.h
+++ b/Engine/Source/Developer/SourceControl/Private/DefaultSourceControlProvider.h
@@ -20,6 +20,7 @@ public:
 	virtual bool IsAvailable() const override;
 	virtual bool IsEnabled() const override;
 	virtual const FName& GetName(void) const override;
+	virtual bool QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest) override { return false; }
 	virtual void RegisterStateBranches(const TArray<FString>& BranchNames, const FString& ContentRoot) override {}
 	virtual int32 GetStateBranchIndex(const FString& BranchName) const override { return INDEX_NONE; }
 	virtual ECommandResult::Type GetState( const TArray<FString>& InFiles, TArray< TSharedRef<ISourceControlState, ESPMode::ThreadSafe> >& OutState, EStateCacheUsage::Type InStateCacheUsage ) override;
diff --git a/Engine/Source/Developer/SourceControl/Public/ISourceControlProvider.h b/Engine/Source/Developer/SourceControl/Public/ISourceControlProvider.h
index acd540981596..78d09e426383 100644
--- a/Engine/Source/Developer/SourceControl/Public/ISourceControlProvider.h
+++ b/Engine/Source/Developer/SourceControl/Public/ISourceControlProvider.h
@@ -117,6 +117,13 @@ public:
 	 */
 	SOURCECONTROL_API virtual ECommandResult::Type Login( const FString& InPassword = FString(), EConcurrency::Type InConcurrency = EConcurrency::Synchronous, const FSourceControlOperationComplete& InOperationCompleteDelegate = FSourceControlOperationComplete() );
 
+	/**
+	* Queries branch configuration from source control
+	* @param	ConfigSrc			The source path to the branch configuration file in source control
+	* @param	ConfigDest			The destination path to save the configuration to for parsing
+	*/
+	virtual bool QueryStateBranchConfig(const FString& ConfigSrc, const FString& ConfigDest) = 0;
+
 	/**
 	* Register branches to query for state in addition to the current branch
 	* @param	BranchNames			Names of the branches to query
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.cpp b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.cpp
index 6f104258a527..1dfbf86bc577 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.cpp
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.cpp
@@ -283,6 +283,11 @@ ISlateAtlasProvider* FSlateOpenGLRenderer::GetTextureAtlasProvider()
 	return nullptr;
 }
 
+FCriticalSection* FSlateOpenGLRenderer::GetResourceCriticalSection()
+{
+	return &ResourceCriticalSection;
+}
+
 int32 FSlateOpenGLRenderer::RegisterCurrentScene(FSceneInterface* Scene) 
 {
 	// This is a no-op
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.h b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.h
index 6dd7cdc37e29..f1144bbdc30b 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.h
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLRenderer.h
@@ -164,6 +164,7 @@ public:
 	virtual FSlateUpdatableTexture* CreateUpdatableTexture(uint32 Width, uint32 Height) override;
 	virtual void ReleaseUpdatableTexture(FSlateUpdatableTexture* Texture) override;
 	virtual ISlateAtlasProvider* GetTextureAtlasProvider() override;
+	virtual FCriticalSection* GetResourceCriticalSection() override;
 	virtual int32 RegisterCurrentScene(FSceneInterface* Scene) override;
 	virtual int32 GetCurrentSceneIndex() const override;
 	virtual void ClearScenes() override;
@@ -195,4 +196,5 @@ private:
 	FSlateOpenGLContext SharedContext;
 	/** Dynamic image brushes to remove when safe */
 	TArray<TSharedPtr<FSlateDynamicImageBrush>> DynamicBrushesToRemove;
+	FCriticalSection ResourceCriticalSection;
 };
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLTextureManager.cpp b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLTextureManager.cpp
index b47d886a0863..b2e476e2f1e6 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLTextureManager.cpp
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/OpenGL/SlateOpenGLTextureManager.cpp
@@ -123,9 +123,16 @@ bool FSlateOpenGLTextureManager::LoadTexture( const FSlateBrush& InBrush, uint32
 	TArray<uint8> Buffer;
 	if( FFileHelper::LoadFileToArray( Buffer, *ResourcePath ) )
 	{
-		// We assume all resources are png for now.
 		IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>( FName("ImageWrapper") );
-		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper( EImageFormat::PNG );
+
+		//Try and determine format, if that fails assume PNG
+		EImageFormat ImageFormat = ImageWrapperModule.DetectImageFormat(Buffer.GetData(), Buffer.Num());
+		if (ImageFormat == EImageFormat::Invalid)
+		{
+			ImageFormat = EImageFormat::PNG;
+		}
+		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper(ImageFormat);
+
 		if ( ImageWrapper.IsValid() && ImageWrapper->SetCompressed( Buffer.GetData(), Buffer.Num() ) )
 		{
 			// Determine the block size.  This is bytes per pixel
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.cpp b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.cpp
index b5a9407d8c4d..b767ead3a011 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.cpp
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.cpp
@@ -236,6 +236,11 @@ ISlateAtlasProvider* FSlateD3DRenderer::GetTextureAtlasProvider()
 	return nullptr;
 }
 
+FCriticalSection* FSlateD3DRenderer::GetResourceCriticalSection()
+{
+	return &ResourceCriticalSection;
+}
+
 int32 FSlateD3DRenderer::RegisterCurrentScene(FSceneInterface* Scene) 
 {
 	// This is a no-op
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.h b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.h
index 21f28d9ef3d6..0259b07b2cd4 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.h
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DRenderer.h
@@ -68,6 +68,7 @@ public:
 	virtual FSlateUpdatableTexture* CreateUpdatableTexture(uint32 Width, uint32 Height) override;
 	virtual void ReleaseUpdatableTexture(FSlateUpdatableTexture* Texture) override;
 	virtual ISlateAtlasProvider* GetTextureAtlasProvider() override;
+	virtual FCriticalSection* GetResourceCriticalSection() override;
 	virtual int32 RegisterCurrentScene(FSceneInterface* Scene) override;
 	virtual int32 GetCurrentSceneIndex() const override;
 	virtual void ClearScenes() override;
@@ -93,4 +94,5 @@ private:
 	TSharedPtr<FSlateD3DTextureManager> TextureManager;
 	TSharedPtr<FSlateD3D11RenderingPolicy> RenderingPolicy;
 	TArray<TSharedPtr<FSlateDynamicImageBrush>> DynamicBrushesToRemove;
+	FCriticalSection ResourceCriticalSection;
 };
diff --git a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DTextureManager.cpp b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DTextureManager.cpp
index 78b7488e5f5f..9dba351123c0 100644
--- a/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DTextureManager.cpp
+++ b/Engine/Source/Developer/StandaloneRenderer/Private/Windows/D3D/SlateD3DTextureManager.cpp
@@ -214,7 +214,15 @@ bool FSlateD3DTextureManager::LoadTexture( const FSlateBrush& InBrush, uint32& O
 	if( FFileHelper::LoadFileToArray( RawFileData, *ResourcePath ) )
 	{
 		IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>( FName("ImageWrapper") );
-		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper( EImageFormat::PNG );
+
+		//Try and determine format, if that fails assume PNG
+		EImageFormat ImageFormat = ImageWrapperModule.DetectImageFormat(RawFileData.GetData(), RawFileData.Num());
+		if (ImageFormat == EImageFormat::Invalid)
+		{
+			ImageFormat = EImageFormat::PNG;
+		}
+		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper(ImageFormat);
+
 		if ( ImageWrapper.IsValid() && ImageWrapper->SetCompressed( RawFileData.GetData(), RawFileData.Num() ) )
 		{
 			OutWidth = ImageWrapper->GetWidth();
diff --git a/Engine/Source/Developer/TargetDeviceServices/Private/Proxies/TargetDeviceProxyManager.cpp b/Engine/Source/Developer/TargetDeviceServices/Private/Proxies/TargetDeviceProxyManager.cpp
index b97312fa3bf8..d8454fb8deb3 100644
--- a/Engine/Source/Developer/TargetDeviceServices/Private/Proxies/TargetDeviceProxyManager.cpp
+++ b/Engine/Source/Developer/TargetDeviceServices/Private/Proxies/TargetDeviceProxyManager.cpp
@@ -119,6 +119,8 @@ void FTargetDeviceProxyManager::GetProxyList(FName TargetPlatformName, bool Incl
 
 void FTargetDeviceProxyManager::RemoveDeadProxies()
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTargetDeviceProxyManager_RemoveDeadProxies);
+
 	FDateTime CurrentTime = FDateTime::UtcNow();
 
 	for (auto ProxyIter = Proxies.CreateIterator(); ProxyIter; ++ProxyIter)
@@ -135,6 +137,8 @@ void FTargetDeviceProxyManager::RemoveDeadProxies()
 
 void FTargetDeviceProxyManager::SendPing()
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FTargetDeviceProxyManager_SendPing);
+
 	if (MessageEndpoint.IsValid())
 	{
 		MessageEndpoint->Publish(new FTargetDeviceServicePing(FPlatformProcess::UserName(false)), EMessageScope::Network);
diff --git a/Engine/Source/Developer/TargetDeviceServices/Public/TargetDeviceServiceMessages.h b/Engine/Source/Developer/TargetDeviceServices/Public/TargetDeviceServiceMessages.h
index 4a265a06361c..752a5d48ba17 100644
--- a/Engine/Source/Developer/TargetDeviceServices/Public/TargetDeviceServiceMessages.h
+++ b/Engine/Source/Developer/TargetDeviceServices/Public/TargetDeviceServiceMessages.h
@@ -112,7 +112,7 @@ struct FTargetDeviceServiceDeployFinished
 
 
 	/** Default constructor. */
-	FTargetDeviceServiceDeployFinished() { }
+	FTargetDeviceServiceDeployFinished() : Succeeded(false) { }
 
 	/** Creates and initializes a new instance. */
 	FTargetDeviceServiceDeployFinished(FName InVariant, const FString& InAppId, bool InSucceeded, FGuid InTransactionId)
@@ -163,7 +163,7 @@ struct FTargetDeviceServiceLaunchApp
 
 
 	/** Default constructor. */
-	FTargetDeviceServiceLaunchApp() { }
+	FTargetDeviceServiceLaunchApp() : BuildConfiguration(0) { }
 
 	/** Creates and initializes a new instance. */
 	FTargetDeviceServiceLaunchApp(FName InVariant, const FString& InAppId, uint8 InBuildConfiguration, const FString& InParams)
@@ -206,7 +206,7 @@ struct FTargetDeviceServiceLaunchFinished
 
 
 	/** Default constructor. */
-	FTargetDeviceServiceLaunchFinished() { }
+	FTargetDeviceServiceLaunchFinished() : ProcessId(0), Succeeded(false) { }
 
 	/** Creates and initializes a new instance. */
 	FTargetDeviceServiceLaunchFinished(const FString& InAppId, int32 InProcessId, bool InSucceeded)
@@ -535,7 +535,7 @@ struct FTargetDeviceServicePowerOff
 
 
 	/** Default constructor. */
-	FTargetDeviceServicePowerOff() { }
+	FTargetDeviceServicePowerOff() : Force(false) { }
 
 	/** Creates and initializes a new instance. */
 	FTargetDeviceServicePowerOff(const FString& InOperator, bool InForce)
@@ -656,7 +656,10 @@ struct FTargetDeviceServiceRunFinished
 
 
 	/** Default constructor. */
-	FTargetDeviceServiceRunFinished() { }
+	FTargetDeviceServiceRunFinished()
+		: ProcessId(0)
+		, Succeeded(false)
+	{ }
 
 	/** Creates and initializes a new instance. */
 	FTargetDeviceServiceRunFinished(FName InVariant, const FString& InExecutablePath, int32 InProcessId, bool InSucceeded)
diff --git a/Engine/Source/Developer/TargetPlatform/Public/Interfaces/IShaderFormat.h b/Engine/Source/Developer/TargetPlatform/Public/Interfaces/IShaderFormat.h
index 484296b9d2cc..e3cad81f92a8 100644
--- a/Engine/Source/Developer/TargetPlatform/Public/Interfaces/IShaderFormat.h
+++ b/Engine/Source/Developer/TargetPlatform/Public/Interfaces/IShaderFormat.h
@@ -67,11 +67,12 @@ public:
 	/**
      * Create a format specific archive for precompiled shader code.
      *
+     * @param LibraryName The name of this shader library.
      * @param Format The format of shaders to cache.
      * @param WorkingDirectory The working directory.
      * @returns An archive object on success or nullptr on failure.
      */
-    virtual class IShaderFormatArchive* CreateShaderArchive( FName Format, const FString& WorkingDirectory ) const { return nullptr; }
+    virtual class IShaderFormatArchive* CreateShaderArchive( FString const& LibraryName, FName Format, const FString& WorkingDirectory ) const { return nullptr; }
 	
 	/**
 	 * Can the shader format compile shaders to the native binary format for the platform.
diff --git a/Engine/Source/Developer/TaskGraph/Public/STimeline.h b/Engine/Source/Developer/TaskGraph/Public/STimeline.h
index 7123f8b8a26d..2164f36b4108 100644
--- a/Engine/Source/Developer/TaskGraph/Public/STimeline.h
+++ b/Engine/Source/Developer/TaskGraph/Public/STimeline.h
@@ -20,6 +20,7 @@ public:
 	SLATE_BEGIN_ARGS( STimeline )
 		: _MinValue( 0.0f )
 		, _MaxValue( 1.0f )
+		, _FixedLabelSpacing(1.0)
 		{}
 
 		/** Minimum value on the timeline */
diff --git a/Engine/Source/Developer/VulkanShaderFormat/Private/VulkanShaderCompiler.cpp b/Engine/Source/Developer/VulkanShaderFormat/Private/VulkanShaderCompiler.cpp
index 3652e857a036..82184d7e7660 100644
--- a/Engine/Source/Developer/VulkanShaderFormat/Private/VulkanShaderCompiler.cpp
+++ b/Engine/Source/Developer/VulkanShaderFormat/Private/VulkanShaderCompiler.cpp
@@ -749,6 +749,20 @@ static void BuildShaderOutput(
 	ShaderOutput.NumInstructions = 0;
 	ShaderOutput.NumTextureSamplers = Header.SerializedBindings.NumSamplers;
 	ShaderOutput.bSucceeded = true;
+
+	if (ShaderInput.ExtraSettings.bExtractShaderSource)
+	{
+		TArray<ANSICHAR> CodeOriginal;
+		CodeOriginal.Append(USFSource, FCStringAnsi::Strlen(USFSource) + 1);
+		ShaderOutput.OptionalFinalShaderSource = FString(CodeOriginal.GetData());
+	}
+	if (ShaderInput.ExtraSettings.OfflineCompilerPath.Len() > 0)
+	{
+		if (IsVulkanMobilePlatform((EShaderPlatform)ShaderInput.Target.Platform))
+		{
+			CompileOfflineMali(ShaderInput, ShaderOutput, (ANSICHAR *)Spirv.Data.GetData(), Spirv.Data.Num(), true);
+		}
+	}
 }
 
 //static void BuildShaderOutput(
diff --git a/Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3D11ShaderCompiler.cpp b/Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3D11ShaderCompiler.cpp
index 8b0f1e4f3559..aa1ed04f6f66 100644
--- a/Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3D11ShaderCompiler.cpp
+++ b/Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3D11ShaderCompiler.cpp
@@ -1122,6 +1122,11 @@ void CompileD3D11Shader(const FShaderCompilerInput& Input,FShaderCompilerOutput&
 		}
 		Output.Errors.Add(NewError);
 	}
+
+	if (Input.ExtraSettings.bExtractShaderSource)
+	{
+		Output.OptionalFinalShaderSource = PreprocessedShaderSource;
+	}
 }
 
 void CompileShader_Windows_SM5(const FShaderCompilerInput& Input,FShaderCompilerOutput& Output,const FString& WorkingDirectory)
diff --git a/Engine/Source/Developer/Windows/WindowsClientTargetPlatform/WindowsClientTargetPlatform.Build.cs b/Engine/Source/Developer/Windows/WindowsClientTargetPlatform/WindowsClientTargetPlatform.Build.cs
index ab20a1ed2813..e4fa9dd5c8c3 100644
--- a/Engine/Source/Developer/Windows/WindowsClientTargetPlatform/WindowsClientTargetPlatform.Build.cs
+++ b/Engine/Source/Developer/Windows/WindowsClientTargetPlatform/WindowsClientTargetPlatform.Build.cs
@@ -17,7 +17,7 @@ public class WindowsClientTargetPlatform : ModuleRules
 		if (Target.bCompileAgainstEngine)
 		{
 			PrivateDependencyModuleNames.AddRange( new string[] {
-				"Engine"
+				"Engine", "RHI"
 				}
 			);
 
diff --git a/Engine/Source/Developer/Windows/WindowsNoEditorTargetPlatform/WindowsNoEditorTargetPlatform.Build.cs b/Engine/Source/Developer/Windows/WindowsNoEditorTargetPlatform/WindowsNoEditorTargetPlatform.Build.cs
index 7f242d8a6a3a..b4d6e538a511 100644
--- a/Engine/Source/Developer/Windows/WindowsNoEditorTargetPlatform/WindowsNoEditorTargetPlatform.Build.cs
+++ b/Engine/Source/Developer/Windows/WindowsNoEditorTargetPlatform/WindowsNoEditorTargetPlatform.Build.cs
@@ -17,7 +17,7 @@ public class WindowsNoEditorTargetPlatform : ModuleRules
 		if (Target.bCompileAgainstEngine)
 		{
 			PrivateDependencyModuleNames.AddRange( new string[] {
-				"Engine"
+				"Engine", "RHI"
 				}
 			);
 
diff --git a/Engine/Source/Developer/Windows/WindowsServerTargetPlatform/WindowsServerTargetPlatform.Build.cs b/Engine/Source/Developer/Windows/WindowsServerTargetPlatform/WindowsServerTargetPlatform.Build.cs
index 3a02e96a72a2..d95cffccf3ea 100644
--- a/Engine/Source/Developer/Windows/WindowsServerTargetPlatform/WindowsServerTargetPlatform.Build.cs
+++ b/Engine/Source/Developer/Windows/WindowsServerTargetPlatform/WindowsServerTargetPlatform.Build.cs
@@ -17,7 +17,7 @@ public class WindowsServerTargetPlatform : ModuleRules
 		if (Target.bCompileAgainstEngine)
 		{
 			PrivateDependencyModuleNames.AddRange( new string[] {
-				"Engine"
+				"Engine", "RHI"
 				}
 			);
 
diff --git a/Engine/Source/Developer/Windows/WindowsTargetPlatform/Classes/WindowsTargetSettings.h b/Engine/Source/Developer/Windows/WindowsTargetPlatform/Classes/WindowsTargetSettings.h
index 0ccc0156df88..08d9f078f320 100644
--- a/Engine/Source/Developer/Windows/WindowsTargetPlatform/Classes/WindowsTargetSettings.h
+++ b/Engine/Source/Developer/Windows/WindowsTargetPlatform/Classes/WindowsTargetSettings.h
@@ -63,7 +63,7 @@ public:
 	int32 AudioSampleRate;
 
 	/** The amount of audio to compute each callback block. Lower values decrease latency but may increase CPU cost. */
-	UPROPERTY(config, EditAnywhere, Category = "Audio", meta = (ClampMin = "512", ClampMax = "4096", DisplayName = "Callback Buffer Size"))
+	UPROPERTY(config, EditAnywhere, Category = "Audio", meta = (ClampMin = "64", ClampMax = "4096", DisplayName = "Callback Buffer Size"))
 	int32 AudioCallbackBufferFrameSize;
 
 	/** The number of buffers to keep enqueued. More buffers increases latency, but can compensate for variable compute availability in audio callbacks on some platforms. */
diff --git a/Engine/Source/Developer/Windows/WindowsTargetPlatform/Private/GenericWindowsTargetPlatform.h b/Engine/Source/Developer/Windows/WindowsTargetPlatform/Private/GenericWindowsTargetPlatform.h
index fd5021e2ee50..c4e680b04c5c 100644
--- a/Engine/Source/Developer/Windows/WindowsTargetPlatform/Private/GenericWindowsTargetPlatform.h
+++ b/Engine/Source/Developer/Windows/WindowsTargetPlatform/Private/GenericWindowsTargetPlatform.h
@@ -12,6 +12,7 @@
 	#include "TextureResource.h"
 	#include "Engine/VolumeTexture.h"
 	#include "StaticMeshResources.h"
+	#include "RHI.h"
 #endif // WITH_ENGINE
 
 #define LOCTEXT_NAMESPACE "TGenericWindowsTargetPlatform"
@@ -153,6 +154,31 @@ public:
 			return IS_CLIENT_ONLY;
 		}
 
+		if (Feature == ETargetPlatformFeatures::MobileRendering)
+		{
+			static bool bCachedSupportsMobileRendering = false;
+#if WITH_ENGINE
+			static bool bHasCachedValue = false;
+			if (!bHasCachedValue)
+			{
+				TArray<FName> TargetedShaderFormats;
+				GetAllTargetedShaderFormats(TargetedShaderFormats);
+
+				for (const FName& Format : TargetedShaderFormats)
+				{
+					if (IsMobilePlatform(ShaderFormatToLegacyShaderPlatform(Format)))
+					{
+						bCachedSupportsMobileRendering = true;
+						break;
+					}
+				}
+				bHasCachedValue = true;
+			}
+#endif
+
+			return bCachedSupportsMobileRendering;
+		}
+
 		return TSuper::SupportsFeature(Feature);
 	}
 
@@ -186,6 +212,8 @@ public:
 			static FName NAME_OPENGL_150_ES2(TEXT("GLSL_150_ES2"));
 			static FName NAME_OPENGL_150_ES3_1(TEXT("GLSL_150_ES31"));
 			static FName NAME_VULKAN_SM5(TEXT("SF_VULKAN_SM5"));
+			static FName NAME_PCD3D_ES3_1(TEXT("PCD3D_ES31"));
+			static FName NAME_PCD3D_ES2(TEXT("PCD3D_ES2"));
 
 			OutFormats.AddUnique(NAME_PCD3D_SM5);
 			OutFormats.AddUnique(NAME_PCD3D_SM4);
@@ -195,6 +223,8 @@ public:
 			OutFormats.AddUnique(NAME_OPENGL_150_ES2);
 			OutFormats.AddUnique(NAME_OPENGL_150_ES3_1);
 			OutFormats.AddUnique(NAME_VULKAN_SM5);
+			OutFormats.AddUnique(NAME_PCD3D_ES3_1);
+			OutFormats.AddUnique(NAME_PCD3D_ES2);
 		}
 	}
 
diff --git a/Engine/Source/Developer/Windows/WindowsTargetPlatform/WindowsTargetPlatform.Build.cs b/Engine/Source/Developer/Windows/WindowsTargetPlatform/WindowsTargetPlatform.Build.cs
index 7ee68474ccb9..0a6ee69dd6c9 100644
--- a/Engine/Source/Developer/Windows/WindowsTargetPlatform/WindowsTargetPlatform.Build.cs
+++ b/Engine/Source/Developer/Windows/WindowsTargetPlatform/WindowsTargetPlatform.Build.cs
@@ -29,8 +29,11 @@ public class WindowsTargetPlatform : ModuleRules
 		// compile with Engine
 		if (Target.bCompileAgainstEngine)
 		{
-			PrivateDependencyModuleNames.Add("Engine");
-			PrivateIncludePathModuleNames.Add("TextureCompressor");
-		}
-	}
+			PrivateDependencyModuleNames.AddRange( new string[] {
+				"Engine", "RHI"
+				}
+			);
+            PrivateIncludePathModuleNames.Add("TextureCompressor");
+        }
+    }
 }
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyAdditive.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyAdditive.h
index f683d7b73269..99d0e41ff9ad 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyAdditive.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyAdditive.h
@@ -20,9 +20,12 @@ class UAnimGraphNode_ApplyAdditive : public UAnimGraphNode_Base
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
 	virtual FLinearColor GetNodeTitleColor() const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	// End of UEdGraphNode interface
 
 	// UAnimGraphNode_Base interface
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
 	virtual FString GetNodeCategory() const override;
 	virtual void ValidateAnimNodeDuringCompilation(class USkeleton* ForSkeleton, class FCompilerResultsLog& MessageLog) override;
 	// End of UAnimGraphNode_Base interface
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyLimits.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyLimits.h
new file mode 100644
index 000000000000..ad78381b2176
--- /dev/null
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyLimits.h
@@ -0,0 +1,37 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "AnimGraphNode_SkeletalControlBase.h"
+#include "BoneControllers/AnimNode_ApplyLimits.h"
+#include "AnimGraphNode_ApplyLimits.generated.h"
+
+UCLASS(MinimalAPI)
+class UAnimGraphNode_ApplyLimits : public UAnimGraphNode_SkeletalControlBase
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, Category = Settings)
+	FAnimNode_ApplyLimits Node;
+
+public:
+	// UObject interface
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
+
+	// UEdGraphNode interface
+	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual FText GetTooltipText() const override;
+	// End of UEdGraphNode interface
+
+protected:
+	
+	void DrawAngularLimits(FPrimitiveDrawInterface* PDI, USkeletalMeshComponent* SkelMeshComp, const FAnimNode_ApplyLimits& NodeToVisualize) const;
+
+	// UAnimGraphNode_SkeletalControlBase interface
+	virtual FText GetControllerDescription() const override;
+	virtual const FAnimNode_SkeletalControlBase* GetNode() const override { return &Node; }
+	virtual void Draw(FPrimitiveDrawInterface* PDI, USkeletalMeshComponent * PreviewSkelMeshComp) const override;
+	// End of UAnimGraphNode_SkeletalControlBase interface
+};
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyMeshSpaceAdditive.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyMeshSpaceAdditive.h
index 8de6b55d129a..a9d05e4077c8 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyMeshSpaceAdditive.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_ApplyMeshSpaceAdditive.h
@@ -20,9 +20,11 @@ class UAnimGraphNode_ApplyMeshSpaceAdditive : public UAnimGraphNode_Base
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
 	virtual FLinearColor GetNodeTitleColor() const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	// End of UEdGraphNode interface
 
 	// UAnimGraphNode_Base interface
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
 	virtual FString GetNodeCategory() const override;
 	virtual void ValidateAnimNodeDuringCompilation(class USkeleton* ForSkeleton, class FCompilerResultsLog& MessageLog) override;
 	// End of UAnimGraphNode_Base interface
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Base.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Base.h
index 690a5a57298b..f78772903b52 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Base.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Base.h
@@ -180,6 +180,9 @@ class ANIMGRAPH_API UAnimGraphNode_Base : public UK2Node
 	// Gives each visual node a chance to validate that they are still valid in the context of the compiled class, giving a last shot at error or warning generation after primary compilation is finished
 	virtual void ValidateAnimNodePostCompile(FCompilerResultsLog& MessageLog, UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex) {}
 
+	// If using CopyPoseFromMesh, the AnimBlueprint Compiler will cache this off for optimizations. 
+	virtual bool UsingCopyPoseFromMesh() { return false; }
+
 	// Gives each visual node a chance to update the node template before it is inserted in the compiled class
 	virtual void BakeDataDuringCompilation(FCompilerResultsLog& MessageLog) {}
 
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_CopyPoseFromMesh.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_CopyPoseFromMesh.h
index 0b93407c3dd5..18bf53f7b091 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_CopyPoseFromMesh.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_CopyPoseFromMesh.h
@@ -21,4 +21,8 @@ public:
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
 	virtual FText GetTooltipText() const override;
 	// End of UEdGraphNode interface
+
+	// UAnimGraphNode_Base interface
+	virtual bool UsingCopyPoseFromMesh() { return true; }
+	// End of UAnimGraphNode_Base interface
 };
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotateRootBone.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotateRootBone.h
index 0fe937288c0e..8bd8022940d8 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotateRootBone.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotateRootBone.h
@@ -21,9 +21,11 @@ class UAnimGraphNode_RotateRootBone : public UAnimGraphNode_Base
 	virtual FLinearColor GetNodeTitleColor() const override;
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	//~ End UEdGraphNode Interface.
 
 	//~ Begin UAnimGraphNode_Base Interface
 	virtual FString GetNodeCategory() const override;
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
 	//~ End UAnimGraphNode_Base Interface
 };
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotationOffsetBlendSpace.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotationOffsetBlendSpace.h
index b1201218a0c1..326bf30526e1 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotationOffsetBlendSpace.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_RotationOffsetBlendSpace.h
@@ -23,6 +23,7 @@ class UAnimGraphNode_RotationOffsetBlendSpace: public UAnimGraphNode_BlendSpaceB
 	// UEdGraphNode interface
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	// End of UEdGraphNode interface
 
 	// UAnimGraphNode_Base interface
@@ -31,6 +32,8 @@ class UAnimGraphNode_RotationOffsetBlendSpace: public UAnimGraphNode_BlendSpaceB
 	virtual void GetAllAnimationSequencesReferred(TArray<UAnimationAsset*>& AnimationAssets) const override;
 	virtual void ReplaceReferredAnimations(const TMap<UAnimationAsset*, UAnimationAsset*>& AnimAssetReplacementMap) override;
 	virtual EAnimAssetHandlerType SupportsAssetClass(const UClass* AssetClass) const override;
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
 	// End of UAnimGraphNode_Base interface
 
 	// UK2Node interface
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SequencePlayer.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SequencePlayer.h
index 9bc0ebf7aae6..770d2cb6ba81 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SequencePlayer.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SequencePlayer.h
@@ -24,9 +24,11 @@ class UAnimGraphNode_SequencePlayer : public UAnimGraphNode_AssetPlayerBase
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
 	virtual FText GetMenuCategory() const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	// End of UEdGraphNode interface
 
 	// UAnimGraphNode_Base interface
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
 	virtual void ValidateAnimNodeDuringCompilation(class USkeleton* ForSkeleton, class FCompilerResultsLog& MessageLog) override;
 	virtual void PreloadRequiredAssets() override;		
 	virtual void BakeDataDuringCompilation(class FCompilerResultsLog& MessageLog) override;
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SkeletalControlBase.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SkeletalControlBase.h
index 48786f85404f..969c2959c0df 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SkeletalControlBase.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_SkeletalControlBase.h
@@ -28,12 +28,15 @@ public:
 	// UEdGraphNode interface
 	virtual FLinearColor GetNodeTitleColor() const override;
 	virtual FText GetTooltipText() const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	// End of UEdGraphNode interface
 
 	// UAnimGraphNode_Base interface
 	virtual FString GetNodeCategory() const override;
 	virtual void CreateOutputPins() override;
 	virtual void ValidateAnimNodePostCompile(FCompilerResultsLog& MessageLog, UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex) override;
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
 	// End of UAnimGraphNode_Base interface
 
 	/**
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Trail.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Trail.h
index cd0dd60c449c..fe2feeccec65 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Trail.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_Trail.h
@@ -26,7 +26,12 @@ public:
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
 //	virtual FString GetNodeNativeTitle(ENodeTitleType::Type TitleType) const override;
 	virtual FText GetTooltipText() const override;
-	// End of UEdGraphNode interface
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
+	//~ End UEdGraphNode Interface.
+
+	//~ Begin UAnimGraphNode_Base Interface
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
+	//~ End UAnimGraphNode_Base Interface
 
 protected:
 	// UAnimGraphNode_SkeletalControlBase interface
diff --git a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_TwoWayBlend.h b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_TwoWayBlend.h
index 17e5f0f9ab6f..81b2e6168ea8 100644
--- a/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_TwoWayBlend.h
+++ b/Engine/Source/Editor/AnimGraph/Classes/AnimGraphNode_TwoWayBlend.h
@@ -20,9 +20,12 @@ class UAnimGraphNode_TwoWayBlend : public UAnimGraphNode_Base
 	virtual FLinearColor GetNodeTitleColor() const override;
 	virtual FText GetTooltipText() const override;
 	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	//~ End UEdGraphNode Interface.
 
 	//~ Begin UAnimGraphNode_Base Interface
 	virtual FString GetNodeCategory() const override;
+	virtual void CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const override;
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
 	//~ End UAnimGraphNode_Base Interface
 };
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_AnimDynamics.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_AnimDynamics.cpp
index 6c094f2d1327..34dc320e500f 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_AnimDynamics.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_AnimDynamics.cpp
@@ -236,6 +236,8 @@ FText UAnimGraphNode_AnimDynamics::GetControllerDescription() const
 
 void UAnimGraphNode_AnimDynamics::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
 {
+	Super::CustomizeDetails(DetailBuilder);
+
 	TSharedRef<IPropertyHandle> PreviewFlagHandle = DetailBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(UAnimGraphNode_AnimDynamics, bPreviewLive));
 
 	IDetailCategoryBuilder& PreviewCategory = DetailBuilder.EditCategory(TEXT("Preview"));
@@ -351,7 +353,7 @@ void UAnimGraphNode_AnimDynamics::ResetSim()
 	FAnimNode_AnimDynamics* PreviewNode = GetPreviewDynamicsNode();
 	if(PreviewNode)
 	{
-		PreviewNode->RequestInitialise();
+		PreviewNode->RequestInitialise(ETeleportType::ResetPhysics);
 	}
 }
 
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyAdditive.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyAdditive.cpp
index fb93516ea7cb..a6b7defa7607 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyAdditive.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyAdditive.cpp
@@ -4,6 +4,9 @@
 
 #include "Animation/AnimationSettings.h"
 #include "Kismet2/CompilerResultsLog.h"
+#include "ScopedTransaction.h"
+#include "Kismet2/BlueprintEditorUtils.h"
+#include "DetailLayoutBuilder.h"
 
 /////////////////////////////////////////////////////
 // UAnimGraphNode_ApplyAdditive
@@ -30,6 +33,127 @@ FText UAnimGraphNode_ApplyAdditive::GetNodeTitle(ENodeTitleType::Type TitleType)
 	return LOCTEXT("AnimGraphNode_ApplyAdditive_Title", "Apply Additive");
 }
 
+void UAnimGraphNode_ApplyAdditive::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, Alpha))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Float);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.AlphaScaleBias.GetFriendlyName(Node.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName));
+		}
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, bAlphaBoolEnabled))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Bool);
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, AlphaCurveName))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Curve);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_ApplyAdditive::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, AlphaScaleBias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	if (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, AlphaInputType))
+	{
+		FScopedTransaction Transaction(LOCTEXT("ChangeAlphaInputType", "Change Alpha Input Type"));
+		Modify();
+
+		// Break links to pins going away
+		for (int32 PinIndex = 0; PinIndex < Pins.Num(); ++PinIndex)
+		{
+			UEdGraphPin* Pin = Pins[PinIndex];
+			if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, Alpha))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Float)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, bAlphaBoolEnabled))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Bool)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyAdditive, AlphaCurveName))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Curve)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+		}
+
+		ReconstructNode();
+
+		FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(GetBlueprint());
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void UAnimGraphNode_ApplyAdditive::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	Super::CustomizeDetails(DetailBuilder);
+
+	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(FName(TEXT("Node")), GetClass());
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Bool)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, bAlphaBoolEnabled)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, AlphaBoolBlend)));
+	}
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Float)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, Alpha)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, AlphaScaleBias)));
+	}
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Curve)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, AlphaCurveName)));
+	}
+
+	if ((Node.AlphaInputType != EAnimAlphaInputType::Float)
+		&& (Node.AlphaInputType != EAnimAlphaInputType::Curve))
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyAdditive, AlphaScaleBiasClamp)));
+	}
+}
+
 FString UAnimGraphNode_ApplyAdditive::GetNodeCategory() const
 {
 	return TEXT("Blends");
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyLimits.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyLimits.cpp
new file mode 100644
index 000000000000..862c908ceb6a
--- /dev/null
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyLimits.cpp
@@ -0,0 +1,84 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "AnimGraphNode_ApplyLimits.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Materials/MaterialInstanceDynamic.h"
+
+/////////////////////////////////////////////////////
+// UAnimGraphNode_ApplyLimits
+
+#define LOCTEXT_NAMESPACE "A3Nodes"
+
+UAnimGraphNode_ApplyLimits::UAnimGraphNode_ApplyLimits(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+FText UAnimGraphNode_ApplyLimits::GetControllerDescription() const
+{
+	return LOCTEXT("ApplyLimits", "Apply Limits");
+}
+
+FText UAnimGraphNode_ApplyLimits::GetTooltipText() const
+{
+	return LOCTEXT("AnimGraphNode_ApplyLimits_Tooltip", "Apply Limits.");
+}
+
+FText UAnimGraphNode_ApplyLimits::GetNodeTitle(ENodeTitleType::Type TitleType) const
+{
+	return GetControllerDescription();
+}
+
+void UAnimGraphNode_ApplyLimits::Draw(FPrimitiveDrawInterface* PDI, USkeletalMeshComponent* PreviewSkelMeshComp) const
+{
+	DrawAngularLimits(PDI, PreviewSkelMeshComp, Node);
+}
+
+void UAnimGraphNode_ApplyLimits::DrawAngularLimits(FPrimitiveDrawInterface* PDI, USkeletalMeshComponent* SkelMeshComp, const FAnimNode_ApplyLimits& NodeToVisualize) const
+{
+	for(const FAngularRangeLimit& AngularRangeLimit : NodeToVisualize.AngularRangeLimits)
+	{
+		const int32 BoneIndex = SkelMeshComp->GetBoneIndex(AngularRangeLimit.Bone.BoneName);
+		if(BoneIndex != INDEX_NONE)
+		{
+			FTransform JointTransform = SkelMeshComp->GetBoneTransform(BoneIndex);
+
+			FVector XAxis = JointTransform.GetUnitAxis(EAxis::X);
+			FVector YAxis = JointTransform.GetUnitAxis(EAxis::Y);
+			FVector ZAxis = JointTransform.GetUnitAxis(EAxis::Z);
+
+			const FVector& MinAngles = AngularRangeLimit.LimitMin;
+			const FVector& MaxAngles = AngularRangeLimit.LimitMax;
+			FVector AngleRange = MaxAngles - MinAngles;
+			FVector Middle = MinAngles + AngleRange * 0.5f;
+
+			FTransform XAxisConeTM(YAxis, XAxis ^ YAxis, XAxis, JointTransform.GetTranslation());
+			XAxisConeTM.SetRotation(FQuat(XAxis, FMath::DegreesToRadians(-Middle.X)) * XAxisConeTM.GetRotation());
+			DrawCone(PDI, FScaleMatrix(30.0f) * XAxisConeTM.ToMatrixWithScale(), FMath::DegreesToRadians(AngleRange.X / 2.0f), 0.0f, 24, false, FLinearColor::Red, GEngine->ConstraintLimitMaterialX->GetRenderProxy(false), SDPG_World);
+
+			FTransform YAxisConeTM(ZAxis, YAxis ^ ZAxis, YAxis, JointTransform.GetTranslation());
+			YAxisConeTM.SetRotation(FQuat(YAxis, FMath::DegreesToRadians(Middle.Y)) * YAxisConeTM.GetRotation());
+			DrawCone(PDI, FScaleMatrix(30.0f) * YAxisConeTM.ToMatrixWithScale(), FMath::DegreesToRadians(AngleRange.Y / 2.0f), 0.0f, 24, false, FLinearColor::Green, GEngine->ConstraintLimitMaterialY->GetRenderProxy(false), SDPG_World);
+	
+			FTransform ZAxisConeTM(XAxis, ZAxis ^ XAxis, ZAxis, JointTransform.GetTranslation());
+			ZAxisConeTM.SetRotation(FQuat(ZAxis, FMath::DegreesToRadians(Middle.Z)) * ZAxisConeTM.GetRotation());
+			DrawCone(PDI, FScaleMatrix(30.0f) * ZAxisConeTM.ToMatrixWithScale(), FMath::DegreesToRadians(AngleRange.Z / 2.0f), 0.0f, 24, false, FLinearColor::Blue, GEngine->ConstraintLimitMaterialZ->GetRenderProxy(false), SDPG_World);
+		}
+	}
+}
+
+void UAnimGraphNode_ApplyLimits::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+
+	FName PropertyName = (PropertyChangedEvent.Property != NULL) ? PropertyChangedEvent.Property->GetFName() : NAME_None;
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(FAnimNode_ApplyLimits, AngularRangeLimits))
+	{
+		Node.RecalcLimits();
+
+		ReconstructNode();
+	}
+}
+
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyMeshSpaceAdditive.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyMeshSpaceAdditive.cpp
index 9482194cbbaf..1326499d8dc0 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyMeshSpaceAdditive.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ApplyMeshSpaceAdditive.cpp
@@ -30,6 +30,32 @@ FText UAnimGraphNode_ApplyMeshSpaceAdditive::GetNodeTitle(ENodeTitleType::Type T
 	return LOCTEXT("AnimGraphNode_ApplyMeshSpaceAdditive_Title", "Apply Mesh Space Additive");
 }
 
+void UAnimGraphNode_ApplyMeshSpaceAdditive::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyMeshSpaceAdditive, Alpha))
+	{
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.AlphaScaleBias.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_ApplyMeshSpaceAdditive::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_ApplyMeshSpaceAdditive, AlphaScaleBias)))
+	{
+		ReconstructNode();
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
 FString UAnimGraphNode_ApplyMeshSpaceAdditive::GetNodeCategory() const
 {
 	return TEXT("Blends");
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_BoneDrivenController.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_BoneDrivenController.cpp
index ddd9f0a42ce4..c86989eb9028 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_BoneDrivenController.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_BoneDrivenController.cpp
@@ -353,6 +353,8 @@ void UAnimGraphNode_BoneDrivenController::AddRangePropertyRow(const FText& Name,
 
 void UAnimGraphNode_BoneDrivenController::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
 {
+	Super::CustomizeDetails(DetailBuilder);
+
 	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(UAnimGraphNode_BoneDrivenController, Node), GetClass());
 
 	TAttribute<EVisibility> NotUsingCurveVisibility = TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateStatic(&UAnimGraphNode_BoneDrivenController::AreNonCurveMappingValuesVisible, &DetailBuilder));
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ObserveBone.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ObserveBone.cpp
index 3415dd33f4ef..85c98e41e882 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ObserveBone.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_ObserveBone.cpp
@@ -152,6 +152,8 @@ void UAnimGraphNode_ObserveBone::CustomizePinData(UEdGraphPin* Pin, FName Source
 
 void UAnimGraphNode_ObserveBone::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
 {
+	Super::CustomizeDetails(DetailBuilder);
+
 	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(UAnimGraphNode_ObserveBone, Node), GetClass());
 	DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, Alpha)));
 	DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, AlphaScaleBias)));
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotateRootBone.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotateRootBone.cpp
index d4e5178bddf6..5e317acaa213 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotateRootBone.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotateRootBone.cpp
@@ -33,4 +33,48 @@ FString UAnimGraphNode_RotateRootBone::GetNodeCategory() const
 	return TEXT("Tools");
 }
 
+void UAnimGraphNode_RotateRootBone::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotateRootBone, Pitch))
+	{
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.PitchScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotateRootBone, Yaw))
+	{
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.YawScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_RotateRootBone::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotationOffsetBlendSpace.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotationOffsetBlendSpace.cpp
index 03d3dd766199..986fb982201f 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotationOffsetBlendSpace.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_RotationOffsetBlendSpace.cpp
@@ -11,6 +11,9 @@
 #include "Animation/AnimationSettings.h"
 #include "Animation/AimOffsetBlendSpace.h"
 #include "Animation/AimOffsetBlendSpace1D.h"
+#include "DetailLayoutBuilder.h"
+#include "ScopedTransaction.h"
+#include "Kismet2/BlueprintEditorUtils.h"
 
 /////////////////////////////////////////////////////
 // UAnimGraphNode_RotationOffsetBlendSpace
@@ -223,4 +226,126 @@ EAnimAssetHandlerType UAnimGraphNode_RotationOffsetBlendSpace::SupportsAssetClas
 	}
 }
 
+void UAnimGraphNode_RotationOffsetBlendSpace::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, Alpha))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Float);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.AlphaScaleBias.GetFriendlyName(Node.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName));
+		}
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, bAlphaBoolEnabled))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Bool);
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaCurveName))
+	{
+		Pin->bHidden = (Node.AlphaInputType != EAnimAlphaInputType::Curve);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_RotationOffsetBlendSpace::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaScaleBias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	if (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaInputType))
+	{
+		FScopedTransaction Transaction(LOCTEXT("ChangeAlphaInputType", "Change Alpha Input Type"));
+		Modify();
+
+		// Break links to pins going away
+		for (int32 PinIndex = 0; PinIndex < Pins.Num(); ++PinIndex)
+		{
+			UEdGraphPin* Pin = Pins[PinIndex];
+			if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, Alpha))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Float)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, bAlphaBoolEnabled))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Bool)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaCurveName))
+			{
+				if (Node.AlphaInputType != EAnimAlphaInputType::Curve)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+		}
+
+		ReconstructNode();
+
+		FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(GetBlueprint());
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void UAnimGraphNode_RotationOffsetBlendSpace::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	Super::CustomizeDetails(DetailBuilder);
+
+	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(FName(TEXT("Node")), GetClass());
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Bool)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, bAlphaBoolEnabled)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaBoolBlend)));
+	}
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Float)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, Alpha)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaScaleBias)));
+	}
+
+	if (Node.AlphaInputType != EAnimAlphaInputType::Curve)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaCurveName)));
+	}
+
+	if ((Node.AlphaInputType != EAnimAlphaInputType::Float)
+		&& (Node.AlphaInputType != EAnimAlphaInputType::Curve))
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_RotationOffsetBlendSpace, AlphaScaleBiasClamp)));
+	}
+}
+
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SequencePlayer.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SequencePlayer.cpp
index 1133367c5c7d..2090f6424dd5 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SequencePlayer.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SequencePlayer.cpp
@@ -407,4 +407,60 @@ UScriptStruct* UAnimGraphNode_SequencePlayer::GetTimePropertyStruct() const
 	return FAnimNode_SequencePlayer::StaticStruct();
 }
 
+void UAnimGraphNode_SequencePlayer::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SequencePlayer, PlayRate))
+	{
+		if (!Pin->bHidden)
+		{
+			// Draw value for PlayRateBasis if the pin is not exposed
+			UEdGraphPin* PlayRateBasisPin = FindPin(GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SequencePlayer, PlayRateBasis));
+			if (!PlayRateBasisPin || PlayRateBasisPin->bHidden)
+			{
+				if (Node.PlayRateBasis != 1.f)
+				{
+					FFormatNamedArguments Args;
+					Args.Add(TEXT("PinFriendlyName"), Pin->PinFriendlyName);
+					Args.Add(TEXT("PlayRateBasis"), FText::AsNumber(Node.PlayRateBasis));
+					Pin->PinFriendlyName = FText::Format(LOCTEXT("FAnimNode_SequencePlayer_PlayRateBasis_Value", "({PinFriendlyName} / {PlayRateBasis})"), Args);
+				}
+			}
+			else // PlayRateBasisPin is visible
+			{
+				FFormatNamedArguments Args;
+				Args.Add(TEXT("PinFriendlyName"), Pin->PinFriendlyName);
+				Pin->PinFriendlyName = FText::Format(LOCTEXT("FAnimNode_SequencePlayer_PlayRateBasis_Name", "({PinFriendlyName} / PlayRateBasis)"), Args);
+			}
+
+			Pin->PinFriendlyName = Node.PlayRateScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_SequencePlayer::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SequencePlayer, PlayRateBasis))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SkeletalControlBase.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SkeletalControlBase.cpp
index 4230f8364823..4de9c4d5a5e5 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SkeletalControlBase.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_SkeletalControlBase.cpp
@@ -6,6 +6,9 @@
 #include "Animation/AnimationSettings.h"
 #include "Components/SkeletalMeshComponent.h"
 #include "Kismet2/CompilerResultsLog.h"
+#include "DetailLayoutBuilder.h"
+#include "ScopedTransaction.h"
+#include "Kismet2/BlueprintEditorUtils.h"
 #include "BoneControllers/AnimNode_SkeletalControlBase.h"
 
 /////////////////////////////////////////////////////
@@ -355,6 +358,130 @@ bool UAnimGraphNode_SkeletalControlBase::IsPinShown(const FName PinName) const
 	return false;
 }
 
+void UAnimGraphNode_SkeletalControlBase::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, Alpha))
+	{
+		Pin->bHidden = (GetNode()->AlphaInputType != EAnimAlphaInputType::Float);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = GetNode()->AlphaScaleBias.GetFriendlyName(GetNode()->AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName));
+		}
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, bAlphaBoolEnabled))
+	{
+		Pin->bHidden = (GetNode()->AlphaInputType != EAnimAlphaInputType::Bool);
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, AlphaCurveName))
+	{
+		Pin->bHidden = (GetNode()->AlphaInputType != EAnimAlphaInputType::Curve);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = GetNode()->AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_SkeletalControlBase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, AlphaScaleBias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	if (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, AlphaInputType))
+	{
+		FScopedTransaction Transaction(LOCTEXT("ChangeAlphaInputType", "Change Alpha Input Type"));
+		Modify();
+
+		const FAnimNode_SkeletalControlBase* SkelControlNode = GetNode();
+
+		// Break links to pins going away
+		for (int32 PinIndex = 0; PinIndex < Pins.Num(); ++PinIndex)
+		{
+			UEdGraphPin* Pin = Pins[PinIndex];
+			if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, Alpha))
+			{
+				if (GetNode()->AlphaInputType != EAnimAlphaInputType::Float)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, bAlphaBoolEnabled))
+			{
+				if (GetNode()->AlphaInputType != EAnimAlphaInputType::Bool)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_SkeletalControlBase, AlphaCurveName))
+			{
+				if (GetNode()->AlphaInputType != EAnimAlphaInputType::Curve)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+		}
+
+		ReconstructNode();
+
+		FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(GetBlueprint());
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void UAnimGraphNode_SkeletalControlBase::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	Super::CustomizeDetails(DetailBuilder);
+
+	const FAnimNode_SkeletalControlBase* SkelControlNode = GetNode();
+	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(FName(TEXT("Node")), GetClass());
+
+	if (SkelControlNode->AlphaInputType != EAnimAlphaInputType::Bool)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, bAlphaBoolEnabled)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, AlphaBoolBlend)));
+	}
+
+	if (SkelControlNode->AlphaInputType != EAnimAlphaInputType::Float)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, Alpha)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, AlphaScaleBias)));
+	}
+
+	if (SkelControlNode->AlphaInputType != EAnimAlphaInputType::Curve)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, AlphaCurveName)));
+	}
+
+	if ((SkelControlNode->AlphaInputType != EAnimAlphaInputType::Float) 
+		&& (SkelControlNode->AlphaInputType != EAnimAlphaInputType::Curve))
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_SkeletalControlBase, AlphaScaleBiasClamp)));
+	}
+}
+
 void UAnimGraphNode_SkeletalControlBase::ValidateAnimNodePostCompile(FCompilerResultsLog& MessageLog, UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex)
 {
 	if (UAnimationSettings::Get()->bEnablePerformanceLog)
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Slot.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Slot.cpp
index b756f32bf485..6c65df37fae0 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Slot.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Slot.cpp
@@ -68,7 +68,7 @@ FString UAnimGraphNode_Slot::GetNodeCategory() const
 void UAnimGraphNode_Slot::BakeDataDuringCompilation(class FCompilerResultsLog& MessageLog)
 {
 	UAnimBlueprint* AnimBlueprint = GetAnimBlueprint();
-	if (AnimBlueprint->TargetSkeleton)
+	if (!GIsCookerLoadingPackage && AnimBlueprint->TargetSkeleton) // Don't modify skeleton during cook
 	{
 		AnimBlueprint->TargetSkeleton->RegisterSlotNode(Node.SlotName);
 	}
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Trail.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Trail.cpp
index 129617908228..7f13f715e508 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Trail.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_Trail.cpp
@@ -53,4 +53,42 @@ void UAnimGraphNode_Trail::PostLoad()
 	Super::PostLoad();
 	Node.PostLoad();
 }
+
+
+void UAnimGraphNode_Trail::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_Trail, RelaxationSpeedScale))
+	{
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = Node.RelaxationSpeedScaleInputProcessor.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_Trail::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TransitionPoseEvaluator.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TransitionPoseEvaluator.cpp
index 0fbfbf82b00d..f5095bb2351e 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TransitionPoseEvaluator.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TransitionPoseEvaluator.cpp
@@ -67,6 +67,8 @@ void UAnimGraphNode_TransitionPoseEvaluator::GetMenuActions(FBlueprintActionData
 
 void UAnimGraphNode_TransitionPoseEvaluator::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
 {
+	Super::CustomizeDetails(DetailBuilder);
+
 	IDetailCategoryBuilder& PoseCategory = DetailBuilder.EditCategory("Pose", LOCTEXT("PoseCategoryName", "Pose"));
 
 	FString CacheFramesPropertyName = FString::Printf(TEXT("Node.%s"), GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TransitionPoseEvaluator, FramesToCachePose));
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoBoneIK.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoBoneIK.cpp
index d411217db825..be3a83ec925b 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoBoneIK.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoBoneIK.cpp
@@ -101,6 +101,8 @@ void UAnimGraphNode_TwoBoneIK::CopyPinDefaultsToNodeData(UEdGraphPin* InPin)
 
 void UAnimGraphNode_TwoBoneIK::CustomizeDetails(class IDetailLayoutBuilder& DetailBuilder)
 {
+	Super::CustomizeDetails(DetailBuilder);
+
 	// initialize just once
 	if (!TwoBoneIKDelegate.IsValid())
 	{
diff --git a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoWayBlend.cpp b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoWayBlend.cpp
index 66aab6debf9a..bba34ee2d8cb 100644
--- a/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoWayBlend.cpp
+++ b/Engine/Source/Editor/AnimGraph/Private/AnimGraphNode_TwoWayBlend.cpp
@@ -1,6 +1,9 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "AnimGraphNode_TwoWayBlend.h"
+#include "DetailLayoutBuilder.h"
+#include "ScopedTransaction.h"
+#include "Kismet2/BlueprintEditorUtils.h"
 
 /////////////////////////////////////////////////////
 // UAnimGraphNode_TwoWayBlend
@@ -32,5 +35,126 @@ FText UAnimGraphNode_TwoWayBlend::GetNodeTitle(ENodeTitleType::Type TitleType) c
 	return LOCTEXT("Blend", "Blend");
 }
 
+void UAnimGraphNode_TwoWayBlend::CustomizePinData(UEdGraphPin* Pin, FName SourcePropertyName, int32 ArrayIndex) const
+{
+	Super::CustomizePinData(Pin, SourcePropertyName, ArrayIndex);
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, Alpha))
+	{
+		Pin->bHidden = (BlendNode.AlphaInputType != EAnimAlphaInputType::Float);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = BlendNode.AlphaScaleBias.GetFriendlyName(BlendNode.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName));
+		}
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, bAlphaBoolEnabled))
+	{
+		Pin->bHidden = (BlendNode.AlphaInputType != EAnimAlphaInputType::Bool);
+	}
+
+	if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, AlphaCurveName))
+	{
+		Pin->bHidden = (BlendNode.AlphaInputType != EAnimAlphaInputType::Curve);
+
+		if (!Pin->bHidden)
+		{
+			Pin->PinFriendlyName = BlendNode.AlphaScaleBiasClamp.GetFriendlyName(Pin->PinFriendlyName);
+		}
+	}
+}
+
+void UAnimGraphNode_TwoWayBlend::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	const FName PropertyName = (PropertyChangedEvent.Property ? PropertyChangedEvent.Property->GetFName() : NAME_None);
+
+	// Reconstruct node to show updates to PinFriendlyNames.
+	if ((PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, AlphaScaleBias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bMapRange))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Min))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputRange, Max))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Scale))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, Bias))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bClampResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMin))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, ClampMax))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, bInterpResult))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedIncreasing))
+		|| (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FInputScaleBiasClamp, InterpSpeedDecreasing)))
+	{
+		ReconstructNode();
+	}
+
+	if (PropertyName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, AlphaInputType))
+	{
+		FScopedTransaction Transaction(LOCTEXT("ChangeAlphaInputType", "Change Alpha Input Type"));
+		Modify();
+
+		// Break links to pins going away
+		for (int32 PinIndex = 0; PinIndex < Pins.Num(); ++PinIndex)
+		{
+			UEdGraphPin* Pin = Pins[PinIndex];
+			if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, Alpha))
+			{
+				if (BlendNode.AlphaInputType != EAnimAlphaInputType::Float)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, bAlphaBoolEnabled))
+			{
+				if (BlendNode.AlphaInputType != EAnimAlphaInputType::Bool)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+			else if (Pin->PinName == GET_MEMBER_NAME_STRING_CHECKED(FAnimNode_TwoWayBlend, AlphaCurveName))
+			{
+				if (BlendNode.AlphaInputType != EAnimAlphaInputType::Curve)
+				{
+					Pin->BreakAllPinLinks();
+				}
+			}
+		}
+
+		ReconstructNode();
+
+		FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(GetBlueprint());
+	}
+
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void UAnimGraphNode_TwoWayBlend::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	Super::CustomizeDetails(DetailBuilder);
+
+	TSharedRef<IPropertyHandle> NodeHandle = DetailBuilder.GetProperty(FName(TEXT("BlendNode")), GetClass());
+
+	if (BlendNode.AlphaInputType != EAnimAlphaInputType::Bool)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, bAlphaBoolEnabled)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, AlphaBoolBlend)));
+	}
+
+	if (BlendNode.AlphaInputType != EAnimAlphaInputType::Float)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, Alpha)));
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, AlphaScaleBias)));
+	}
+
+	if (BlendNode.AlphaInputType != EAnimAlphaInputType::Curve)
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, AlphaCurveName)));
+	}
+
+	if ((BlendNode.AlphaInputType != EAnimAlphaInputType::Float)
+		&& (BlendNode.AlphaInputType != EAnimAlphaInputType::Curve))
+	{
+		DetailBuilder.HideProperty(NodeHandle->GetChildHandle(GET_MEMBER_NAME_CHECKED(FAnimNode_TwoWayBlend, AlphaScaleBiasClamp)));
+	}
+}
+
 #undef LOCTEXT_NAMESPACE
 
diff --git a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.cpp b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.cpp
index c6c148260d0b..305f17cab728 100644
--- a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.cpp
+++ b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.cpp
@@ -63,6 +63,9 @@
 #include "AnimGraphNode_RotationOffsetBlendSpace.h"
 #include "Algo/Transform.h"
 #include "ISkeletonTreeItem.h"
+#include "IPersonaViewport.h"
+#include "Widgets/Input/SButton.h"
+#include "EditorFontGlyphs.h"
 
 #define LOCTEXT_NAMESPACE "AnimationBlueprintEditor"
 
@@ -1479,5 +1482,147 @@ void FAnimationBlueprintEditor::HandlePreviewMeshChanged(USkeletalMesh* OldPrevi
 	}
 }
 
+void FAnimationBlueprintEditor::HandleViewportCreated(const TSharedRef<IPersonaViewport>& InPersonaViewport)
+{
+	auto GetCompilationStateText = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			switch (Blueprint->Status)
+			{
+			case BS_UpToDate:
+			case BS_UpToDateWithWarnings:
+				// Fall thru and return empty string
+				break;
+			case BS_Dirty:
+				return LOCTEXT("AnimBP_Dirty", "Preview out of date");
+			case BS_Error:
+				return LOCTEXT("AnimBP_CompileError", "Compile Error");
+			default:
+				return LOCTEXT("AnimBP_UnknownStatus", "Unknown Status");
+			}
+		}
+
+		return FText::GetEmpty();
+	};
+
+	auto GetCompilationStateVisibility = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			const bool bUpToDate = (Blueprint->Status == BS_UpToDate) || (Blueprint->Status == BS_UpToDateWithWarnings);
+			return bUpToDate ? EVisibility::Collapsed : EVisibility::Visible;
+		}
+
+		return EVisibility::Collapsed;
+	};
+
+	auto GetCompileButtonVisibility = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			return (Blueprint->Status == BS_Dirty) ? EVisibility::Visible : EVisibility::Collapsed;
+		}
+
+		return EVisibility::Collapsed;
+	};
+
+	auto CompileBlueprint = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			if (!Blueprint->IsUpToDate())
+			{
+				Compile();
+			}
+		}
+
+		return FReply::Handled();
+	};
+
+	auto GetErrorSeverity = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			return (Blueprint->Status == BS_Error) ? EMessageSeverity::Error : EMessageSeverity::Warning;
+		}
+
+		return EMessageSeverity::Warning;
+	};
+
+	auto GetIcon = [this]()
+	{
+		if (UBlueprint* Blueprint = GetBlueprintObj())
+		{
+			return (Blueprint->Status == BS_Error) ? FEditorFontGlyphs::Exclamation_Triangle : FEditorFontGlyphs::Eye;
+		}
+
+		return FEditorFontGlyphs::Eye;
+	};
+
+	InPersonaViewport->AddNotification(MakeAttributeLambda(GetErrorSeverity),
+		false,
+		SNew(SHorizontalBox)
+		.Visibility_Lambda(GetCompilationStateVisibility)
+		+SHorizontalBox::Slot()
+		.FillWidth(1.0f)
+		.Padding(4.0f, 4.0f)
+		[
+			SNew(SHorizontalBox)
+			.ToolTipText_Lambda(GetCompilationStateText)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+			[
+				SNew(STextBlock)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+				.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+				.Text_Lambda(GetIcon)
+			]
+			+SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1.0f)
+			[
+				SNew(STextBlock)
+				.Text_Lambda(GetCompilationStateText)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+			]
+		]
+		+SHorizontalBox::Slot()
+		.AutoWidth()
+		.Padding(2.0f, 0.0f)
+		[
+			SNew(SButton)
+			.ForegroundColor(FSlateColor::UseForeground())
+			.ButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+			.Visibility_Lambda(GetCompileButtonVisibility)
+			.ToolTipText(LOCTEXT("AnimBPViewportCompileButtonToolTip", "Compile this Animation Blueprint to update the preview to reflect any recent changes."))
+			.OnClicked_Lambda(CompileBlueprint)
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+					.Text(FEditorFontGlyphs::Cog)
+				]
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Text(LOCTEXT("AnimBPViewportCompileButtonLabel", "Compile"))
+				]
+			]
+		]
+	);
+}
+
 #undef LOCTEXT_NAMESPACE
 
diff --git a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.h b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.h
index 4240cd8ca7bc..76bb6e224fe7 100644
--- a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.h
+++ b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditor.h
@@ -60,6 +60,8 @@ namespace AnimationBlueprintEditorTabs
  */
 class FAnimationBlueprintEditor : public IAnimationBlueprintEditor
 {
+	friend class FAnimationBlueprintEditorMode;
+
 public:
 	/**
 	 * Edits the specified character asset(s)
@@ -257,6 +259,9 @@ private:
 	/** Handle the preview mesh changing (so we can re-hook debug anim links etc.) */
 	void HandlePreviewMeshChanged(USkeletalMesh* OldPreviewMesh, USkeletalMesh* NewPreviewMesh);
 
+	/** Handle the viewport being created */
+	void HandleViewportCreated(const TSharedRef<IPersonaViewport>& InPersonaViewport);
+
 	/** The extender to pass to the level editor to extend it's window menu */
 	TSharedPtr<FExtender> MenuExtender;
 
diff --git a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditorMode.cpp b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditorMode.cpp
index f957764a67c8..891118143390 100644
--- a/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditorMode.cpp
+++ b/Engine/Source/Editor/AnimationBlueprintEditor/Private/AnimationBlueprintEditorMode.cpp
@@ -123,7 +123,7 @@ FAnimationBlueprintEditorMode::FAnimationBlueprintEditorMode(const TSharedRef<FA
 	FPersonaModule& PersonaModule = FModuleManager::LoadModuleChecked<FPersonaModule>("Persona");
 
 	FPersonaViewportArgs ViewportArgs(InAnimationBlueprintEditor->GetPersonaToolkit()->GetPreviewScene());
-	ViewportArgs.BlueprintEditor = InAnimationBlueprintEditor;
+	ViewportArgs.OnViewportCreated = FOnViewportCreated::CreateSP(&InAnimationBlueprintEditor.Get(), &FAnimationBlueprintEditor::HandleViewportCreated);	ViewportArgs.BlueprintEditor = InAnimationBlueprintEditor;
 	ViewportArgs.bShowStats = false;
 	ViewportArgs.ContextName = TEXT("AnimationBlueprintEditor.Viewport");
 
diff --git a/Engine/Source/Editor/AudioEditor/Private/AssetTypeActions/AssetTypeActions_SoundEffectPreset.cpp b/Engine/Source/Editor/AudioEditor/Private/AssetTypeActions/AssetTypeActions_SoundEffectPreset.cpp
index 3d3123ab2257..ce3a3af36135 100644
--- a/Engine/Source/Editor/AudioEditor/Private/AssetTypeActions/AssetTypeActions_SoundEffectPreset.cpp
+++ b/Engine/Source/Editor/AudioEditor/Private/AssetTypeActions/AssetTypeActions_SoundEffectPreset.cpp
@@ -15,10 +15,33 @@ FAssetTypeActions_SoundEffectPreset::FAssetTypeActions_SoundEffectPreset(USoundE
 
 FText FAssetTypeActions_SoundEffectPreset::GetName() const
 {
-	return EffectPreset->GetAssetActionName();
+	FText AssetActionName = EffectPreset->GetAssetActionName();
+	if (AssetActionName.IsEmpty())
+	{
+		FString ClassName;
+		EffectPreset->GetClass()->GetName(ClassName);
+		ensureMsgf(false, TEXT("U%sGetAssetActionName not implemented. Please check that EFFECT_PRESET_METHODS(EffectClassName) is at the top of the declaration of %s."), *ClassName, *ClassName);
+		FString DefaultName = ClassName + FString(TEXT(" (Error: EFFECT_PRESET_METHODS() Not Used in Class Declaration)"));
+		return FText::FromString(DefaultName);
+	}
+	else
+	{
+		return EffectPreset->GetAssetActionName();
+	}
 }
 
 UClass* FAssetTypeActions_SoundEffectPreset::GetSupportedClass() const
 {
-	return EffectPreset->GetSupportedClass();
+	UClass* SupportedClass = EffectPreset->GetSupportedClass();
+	if (SupportedClass == nullptr)
+	{
+		FString ClassName;
+		EffectPreset->GetClass()->GetName(ClassName);
+		ensureMsgf(false, TEXT("U%s::GetSupportedClass not implemented. Please check that EFFECT_PRESET_METHODS(EffectClassName) is at the top of the declaration of %s."), *ClassName, *ClassName);
+		return EffectPreset->GetClass();
+	}
+	else
+	{
+		return SupportedClass;
+	}
 }
diff --git a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node.h b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node.h
index 14b82d9c3ba1..c0fd403a1351 100644
--- a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node.h
+++ b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node.h
@@ -83,13 +83,17 @@ struct FOptionalPinFromProperty
 	uint8 bIsOverridePinVisible:1;
 
 	FOptionalPinFromProperty()
-		: bIsMarkedForAdvancedDisplay(false)
+		: bShowPin(false)
+		, bCanToggleVisibility(false)
+		, bPropertyIsCustomized(false)
+		, bHasOverridePin(false)
+		, bIsMarkedForAdvancedDisplay(false)
 		, bIsOverrideEnabled(true)
 		, bIsSetValuePinVisible(true)
 		, bIsOverridePinVisible(true)
 	{
 	}
-	
+
 	FOptionalPinFromProperty(FName InPropertyName, bool bInShowPin, bool bInCanToggleVisibility, const FString& InFriendlyName, const FText& InTooltip, bool bInPropertyIsCustomized, FName InCategoryName, bool bInHasOverridePin)
 		: PropertyName(InPropertyName)
 		, PropertyFriendlyName(InFriendlyName)
diff --git a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_EditablePinBase.h b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_EditablePinBase.h
index 141d674f9e20..32228890a857 100644
--- a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_EditablePinBase.h
+++ b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_EditablePinBase.h
@@ -69,6 +69,7 @@ struct FKismetUserDeclaredFunctionMetadata
 public:
 	FKismetUserDeclaredFunctionMetadata()
 		: InstanceTitleColor(FLinearColor::White)
+		, bCallInEditor(false)
 		, HasLatentFunctions(INDEX_NONE)
 	{
 	}
diff --git a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_SetFieldsInStruct.h b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_SetFieldsInStruct.h
index c52aa3683d34..82f60bceacb9 100644
--- a/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_SetFieldsInStruct.h
+++ b/Engine/Source/Editor/BlueprintGraph/Classes/K2Node_SetFieldsInStruct.h
@@ -43,6 +43,8 @@ class UK2Node_SetFieldsInStruct : public UK2Node_MakeStruct
 	BLUEPRINTGRAPH_API void RestoreAllPins();
 
 protected:
+	void BackTracePinPath(UEdGraphPin* OutputPin, TFunctionRef<void(UEdGraphPin*)> Predicate) const;
+
 	struct FSetFieldsInStructPinManager : public FMakeStructPinManager
 	{
 	public:
@@ -56,4 +58,6 @@ private:
 	/** Constructing FText strings can be costly, so we cache the node's title/tooltip */
 	FNodeTextCache CachedTooltip;
 	FNodeTextCache CachedNodeTitle;
+
+	mutable bool bRecursionGuard;
 };
diff --git a/Engine/Source/Editor/BlueprintGraph/Private/BlueprintActionDatabase.cpp b/Engine/Source/Editor/BlueprintGraph/Private/BlueprintActionDatabase.cpp
index aaf2505abae7..a44f1e644fc3 100644
--- a/Engine/Source/Editor/BlueprintGraph/Private/BlueprintActionDatabase.cpp
+++ b/Engine/Source/Editor/BlueprintGraph/Private/BlueprintActionDatabase.cpp
@@ -1307,6 +1307,13 @@ void FBlueprintActionDatabase::RefreshAssetActions(UObject* const AssetObject)
 {
 	using namespace BlueprintActionDatabaseImpl;
 
+	// this method is very expensive and is only for blueprint editor functionality
+	// it should remain that way as *greatly* increases cook times, etc!
+	if (IsRunningCommandlet())
+	{
+		return;
+	}
+
 	FActionList& AssetActionList = ActionRegistry.FindOrAdd(AssetObject);
 	for (UBlueprintNodeSpawner* Action : AssetActionList)
 	{
diff --git a/Engine/Source/Editor/BlueprintGraph/Private/K2Node_SetFieldsInStruct.cpp b/Engine/Source/Editor/BlueprintGraph/Private/K2Node_SetFieldsInStruct.cpp
index 4271a0e266dc..a090ebe5b078 100644
--- a/Engine/Source/Editor/BlueprintGraph/Private/K2Node_SetFieldsInStruct.cpp
+++ b/Engine/Source/Editor/BlueprintGraph/Private/K2Node_SetFieldsInStruct.cpp
@@ -7,6 +7,8 @@
 #include "MakeStructHandler.h"
 #include "KismetCompiler.h"
 #include "BlueprintEditorSettings.h"
+#include "K2Node_VariableGet.h"
+#include "K2Node_Knot.h"
 
 #define LOCTEXT_NAMESPACE "K2Node_MakeStruct"
 
@@ -118,6 +120,7 @@ public:
 
 UK2Node_SetFieldsInStruct::UK2Node_SetFieldsInStruct(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
+	, bRecursionGuard(false)
 {
 }
 
@@ -194,6 +197,51 @@ void UK2Node_SetFieldsInStruct::ValidateNodeDuringCompilation(FCompilerResultsLo
 	{
 		FText ErrorMessage = LOCTEXT("SetStructFields_NoStructRefError", "The @@ pin must be connected to the struct that you wish to set.");
 		MessageLog.Error(*ErrorMessage.ToString(), FoundPin);
+		return;
+	}
+
+	// Attempt to determine if we're linked to a getter node for a BlueprintReadOnly property.
+
+	for (UEdGraphPin* SourceStructOutputPin : FoundPin->LinkedTo)
+	{
+		BackTracePinPath(SourceStructOutputPin, [&MessageLog](UEdGraphPin* LinkedStructSourcePin) {
+			if (UK2Node_VariableGet* GetterNode = Cast<UK2Node_VariableGet>(LinkedStructSourcePin->GetOwningNode()))
+			{
+				if (UProperty* BoundProperty = GetterNode->GetPropertyForVariable())
+				{
+					if (BoundProperty->HasAnyPropertyFlags(CPF_BlueprintReadOnly))
+					{
+						// TODO, This should REALLY be an error, but too much code may have been written not following this standard.
+						FText ErrorMessage = LOCTEXT("SetStructFields_StructIsConst", "The @@ is a Read Only property and can not be modified directly.");
+						MessageLog.Warning(*ErrorMessage.ToString(), LinkedStructSourcePin);
+					}
+				}
+			}
+		});
+	}
+}
+
+void UK2Node_SetFieldsInStruct::BackTracePinPath(UEdGraphPin* OutputPin, TFunctionRef<void(UEdGraphPin*)> Predicate) const
+{
+	if (bRecursionGuard)
+	{
+		return;
+	}
+	
+	TGuardValue<bool> RecursionGuard(bRecursionGuard, true);
+
+	UEdGraphNode* OwningNode = OutputPin->GetOwningNode();
+	if (UK2Node_Knot* KnotNode = Cast<UK2Node_Knot>(OwningNode))
+	{
+		UEdGraphPin* KnotInputPin = KnotNode->GetInputPin();
+		for (UEdGraphPin* KnotInput : KnotInputPin->LinkedTo)
+		{
+			BackTracePinPath(KnotInput, Predicate);
+		}
+	}
+	else if(OwningNode)
+	{
+		Predicate(OutputPin);
 	}
 }
 
diff --git a/Engine/Source/Editor/ClassViewer/Private/SClassViewer.cpp b/Engine/Source/Editor/ClassViewer/Private/SClassViewer.cpp
index 56c7ba1eb717..598827ff7d20 100644
--- a/Engine/Source/Editor/ClassViewer/Private/SClassViewer.cpp
+++ b/Engine/Source/Editor/ClassViewer/Private/SClassViewer.cpp
@@ -8,6 +8,7 @@
 #include "Modules/ModuleManager.h"
 #include "UObject/UObjectHash.h"
 #include "UObject/UObjectIterator.h"
+#include "UObject/CoreRedirects.h"
 #include "Misc/PackageName.h"
 #include "Widgets/SOverlay.h"
 #include "Layout/WidgetPath.h"
@@ -1933,20 +1934,22 @@ void FClassHierarchy::LoadUnloadedTagData(TSharedPtr<FClassViewerNode>& InOutCla
 	{
 		FString FullInterface;
 		FString RemainingString;
-		FString InterfaceName;
+		FString InterfacePath;
 		FString CurrentString = *ImplementedInterfaces;
 		while(CurrentString.Split(TEXT(","), &FullInterface, &RemainingString))
 		{
-			if(FullInterface.Split(TEXT("."), &CurrentString, &InterfaceName, ESearchCase::CaseSensitive, ESearchDir::FromEnd))
+			if (!CurrentString.StartsWith(TEXT("Graphs=(")))
 			{
-				if(!CurrentString.StartsWith(TEXT("Graphs=(")))
+				if (FullInterface.Split(TEXT("\""), &CurrentString, &InterfacePath, ESearchCase::CaseSensitive))
 				{
-					// The interfaces end with ' because of the path reference, so remove it.
-					InterfaceName.RemoveFromEnd("'");
+					// The interface paths in metadata end with "', so remove those
+					InterfacePath.RemoveFromEnd(TEXT("\"'"));
 
-					UnloadedBlueprintData->AddImplementedInterfaces(InterfaceName);
+					FCoreRedirectObjectName ResolvedInterfaceName = FCoreRedirects::GetRedirectedName(ECoreRedirectFlags::Type_Class, FCoreRedirectObjectName(InterfacePath));
+					UnloadedBlueprintData->AddImplementedInterface(ResolvedInterfaceName.ObjectName.ToString());
 				}
 			}
+			
 			CurrentString = RemainingString;
 		}
 	}
diff --git a/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.cpp b/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.cpp
index fdc28c6eceb5..7d9d32ed67e6 100644
--- a/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.cpp
+++ b/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.cpp
@@ -4,11 +4,9 @@
 #include "Engine/BlueprintGeneratedClass.h"
 
 
-FUnloadedBlueprintData::FUnloadedBlueprintData( TWeakPtr< FClassViewerNode > InClassViewerNode )
+FUnloadedBlueprintData::FUnloadedBlueprintData(TWeakPtr<FClassViewerNode> InClassViewerNode)
+	: ClassViewerNode(InClassViewerNode)
 {
-	ClassViewerNode = InClassViewerNode;
-
-	ClassFlags = CLASS_None;
 }
 
 bool FUnloadedBlueprintData::HasAnyClassFlags( uint32 InFlagsToCheck ) const
@@ -28,7 +26,7 @@ void FUnloadedBlueprintData::SetClassFlags(uint32 InFlags)
 
 bool FUnloadedBlueprintData::IsChildOf(const UClass* InClass) const
 {
-	TSharedPtr< FClassViewerNode > CurrentNode = ClassViewerNode.Pin()->ParentNode.Pin();
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->ParentNode.Pin();
 
 	// Keep going through parents till you find an invalid.
 	while (CurrentNode.IsValid())
@@ -45,14 +43,30 @@ bool FUnloadedBlueprintData::IsChildOf(const UClass* InClass) const
 
 bool FUnloadedBlueprintData::ImplementsInterface(const UClass* InInterface) const
 {
-	for(int InterfaceIdx = 0; InterfaceIdx < ImplementedInterfaces.Num(); ++InterfaceIdx)
+	// Does this blueprint implement the interface directly?
+	for (const FString& DirectlyImplementedInterface : ImplementedInterfaces)
 	{
-		if(ImplementedInterfaces[InterfaceIdx] == InInterface->GetName())
+		if (DirectlyImplementedInterface == InInterface->GetName())
 		{
 			return true;
 		}
 	}
 
+	// If not, does a parent class implement the interface?
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->ParentNode.Pin();
+	while (CurrentNode.IsValid())
+	{
+		if (CurrentNode->Class.IsValid() && CurrentNode->Class->ImplementsInterface(InInterface))
+		{
+			return true;
+		}
+		else if (CurrentNode->UnloadedBlueprintData.IsValid() && CurrentNode->UnloadedBlueprintData->ImplementsInterface(InInterface))
+		{
+			return true;
+		}
+		CurrentNode = CurrentNode->ParentNode.Pin();
+	}
+
 	return false;
 }
 
@@ -64,7 +78,7 @@ bool FUnloadedBlueprintData::IsA(const UClass* InClass) const
 
 const UClass* FUnloadedBlueprintData::GetClassWithin() const
 {
-	TSharedPtr< FClassViewerNode > CurrentNode = ClassViewerNode.Pin()->ParentNode.Pin();
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->ParentNode.Pin();
 
 	while (CurrentNode.IsValid())
 	{
@@ -82,12 +96,12 @@ const UClass* FUnloadedBlueprintData::GetClassWithin() const
 	return nullptr;
 }
 
-const TWeakPtr< class FClassViewerNode > FUnloadedBlueprintData::GetClassViewerNode() const
+const TWeakPtr<FClassViewerNode>& FUnloadedBlueprintData::GetClassViewerNode() const
 {
 	return ClassViewerNode;
 }
 
-void FUnloadedBlueprintData::AddImplementedInterfaces(FString& InterfaceName)
+void FUnloadedBlueprintData::AddImplementedInterface(const FString& InterfaceName)
 {
 	ImplementedInterfaces.Add(InterfaceName);
 }
diff --git a/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.h b/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.h
index 4b62bfac3c59..b164e59e2210 100644
--- a/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.h
+++ b/Engine/Source/Editor/ClassViewer/Private/UnloadedBlueprintData.h
@@ -8,7 +8,7 @@
 class FUnloadedBlueprintData : public IUnloadedBlueprintData
 {
 public:
-	FUnloadedBlueprintData( TWeakPtr< class FClassViewerNode > InClassViewerNode );
+	FUnloadedBlueprintData(TWeakPtr<FClassViewerNode> InClassViewerNode);
 
 	virtual ~FUnloadedBlueprintData() {}
 
@@ -27,22 +27,18 @@ public:
 	virtual const UClass* GetClassWithin() const override;
 
 	/** Retrieves the Class Viewer node this data is associated with. */
-	const TWeakPtr< class FClassViewerNode > GetClassViewerNode() const;
+	const TWeakPtr<FClassViewerNode>& GetClassViewerNode() const;
 
-	/** 
-	 * Adds an interface class to this object.
-	 *
-	 * @param InClass		The class to check against.
-	 */
-	void AddImplementedInterfaces(FString& InterfaceName);
+	/** Adds the name of an interface that this blueprint implements directly. */
+	void AddImplementedInterface(const FString& InterfaceName);
 
 private:
 	/** Flags for the class. */
-	uint32 ClassFlags;
+	uint32 ClassFlags = CLASS_None;
 
 	/** The implemented interfaces for this class. */
-	TArray< FString > ImplementedInterfaces;
+	TArray<FString> ImplementedInterfaces;
 
 	/** The node this class is contained in, used to gather hierarchical data as needed. */
-	TWeakPtr< class FClassViewerNode > ClassViewerNode;
+	TWeakPtr<FClassViewerNode> ClassViewerNode;
 };
diff --git a/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.cpp b/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.cpp
index c31dfa0bde80..035be6431519 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.cpp
@@ -16,9 +16,9 @@
 #include "Widgets/SWindow.h"
 #include "Framework/Application/SlateApplication.h"
 #include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 #include "Widgets/Input/SButton.h"
-#include "Widgets/Input/SMultiLineEditableTextBox.h"
 #include "EditorStyleSet.h"
 #include "EditorReimportHandler.h"
 #include "Components/ActorComponent.h"
@@ -49,6 +49,7 @@
 #include "ConsolidateWindow.h"
 #include "ReferencedAssetsUtils.h"
 #include "Internationalization/PackageLocalizationUtil.h"
+#include "Internationalization/TextLocalizationResource.h"
 
 #include "SourceControlWindows.h"
 #include "Kismet2/KismetEditorUtilities.h"
@@ -606,7 +607,7 @@ void FAssetContextMenu::MakeAssetLocalizationSubMenu(FMenuBuilder& MenuBuilder)
 
 	// Build up the list of cultures already used
 	{
-		TSet<FString> CulturePaths;
+		TSet<FString> CultureNames;
 
 		bool bIncludeEngineCultures = false;
 		bool bIncludeProjectCultures = false;
@@ -631,24 +632,26 @@ void FAssetContextMenu::MakeAssetLocalizationSubMenu(FMenuBuilder& MenuBuilder)
 					FString AssetLocalizationFileRoot;
 					if (FPackageName::TryConvertLongPackageNameToFilename(AssetLocalizationRoot, AssetLocalizationFileRoot))
 					{
+						TArray<FString> CulturePaths;
 						CulturePaths.Add(MoveTemp(AssetLocalizationFileRoot));
+						CultureNames.Append(TextLocalizationResourceUtil::GetLocalizedCultureNames(CulturePaths));
 					}
 				}
 			}
 		}
 
+		ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::None;
 		if (bIncludeEngineCultures)
 		{
-			CulturePaths.Append(FPaths::GetEngineLocalizationPaths());
+			LocLoadFlags |= ELocalizationLoadFlags::Engine;
 		}
-
 		if (bIncludeProjectCultures)
 		{
-			CulturePaths.Append(FPaths::GetGameLocalizationPaths());
+			LocLoadFlags |= ELocalizationLoadFlags::Game;
 		}
+		CultureNames.Append(FTextLocalizationManager::Get().GetLocalizedCultureNames(LocLoadFlags));
 
-		FInternationalization::Get().GetCulturesWithAvailableLocalization(CulturePaths.Array(), CurrentCultures, false);
-
+		CurrentCultures = FInternationalization::Get().GetAvailableCultures(CultureNames.Array(), false);
 		if (CurrentCultures.Num() == 0)
 		{
 			CurrentCultures.Add(FInternationalization::Get().GetCurrentCulture());
@@ -754,6 +757,26 @@ void FAssetContextMenu::MakeAssetLocalizationSubMenu(FMenuBuilder& MenuBuilder)
 	}
 #endif // USE_STABLE_LOCALIZATION_KEYS
 
+	// Add the localization cache options
+	if (SelectedAssets.Num() == 1)
+	{
+		FString PackageFilename;
+		if (FPackageName::DoesPackageExist(SelectedAssets[0].PackageName.ToString(), nullptr, &PackageFilename))
+		{
+			MenuBuilder.BeginSection(NAME_None, LOCTEXT("LocalizationCacheHeading", "Localization Cache"));
+			{
+				// Always show the reset localization ID option
+				MenuBuilder.AddMenuEntry(
+					LOCTEXT("ShowLocalizationCache", "Show Localization Cache"),
+					LOCTEXT("ShowLocalizationCacheTooltip", "Show the cached list of localized texts stored in the package header."),
+					FSlateIcon(),
+					FUIAction(FExecuteAction::CreateSP(this, &FAssetContextMenu::ExecuteShowLocalizationCache, PackageFilename))
+					);
+			}
+			MenuBuilder.EndSection();
+		}
+	}
+
 	// If we found source assets for localized assets, then we can show the Source Asset options
 	if (SourceAssetsState.CurrentAssets.Num() > 0)
 	{
@@ -2162,6 +2185,84 @@ void FAssetContextMenu::ExecuteResetLocalizationId()
 #endif // USE_STABLE_LOCALIZATION_KEYS
 }
 
+void FAssetContextMenu::ExecuteShowLocalizationCache(const FString InPackageFilename)
+{
+	FString CachedLocalizationId;
+	TArray<FGatherableTextData> GatherableTextDataArray;
+
+	// Read the localization data from the cache in the package header
+	{
+		TUniquePtr<FArchive> FileReader(IFileManager::Get().CreateFileReader(*InPackageFilename));
+		if (FileReader)
+		{
+			// Read package file summary from the file
+			FPackageFileSummary PackageFileSummary;
+			*FileReader << PackageFileSummary;
+
+			CachedLocalizationId = PackageFileSummary.LocalizationId;
+
+			if (PackageFileSummary.GatherableTextDataOffset > 0)
+			{
+				FileReader->Seek(PackageFileSummary.GatherableTextDataOffset);
+
+				GatherableTextDataArray.SetNum(PackageFileSummary.GatherableTextDataCount);
+				for (int32 GatherableTextDataIndex = 0; GatherableTextDataIndex < PackageFileSummary.GatherableTextDataCount; ++GatherableTextDataIndex)
+				{
+					*FileReader << GatherableTextDataArray[GatherableTextDataIndex];
+				}
+			}
+		}
+	}
+
+	// Convert the gathered text array into a readable format
+	FString LocalizationCacheStr = FString::Printf(TEXT("Package: %s"), *CachedLocalizationId);
+	for (const FGatherableTextData& GatherableTextData : GatherableTextDataArray)
+	{
+		if (LocalizationCacheStr.Len() > 0)
+		{
+			LocalizationCacheStr += TEXT("\n\n");
+		}
+
+		FString KeysStr;
+		FString EditorOnlyKeysStr;
+		for (const FTextSourceSiteContext& TextSourceSiteContext : GatherableTextData.SourceSiteContexts)
+		{
+			FString* KeysStrPtr = TextSourceSiteContext.IsEditorOnly ? &EditorOnlyKeysStr : &KeysStr;
+			if (KeysStrPtr->Len() > 0)
+			{
+				*KeysStrPtr += TEXT(", ");
+			}
+			*KeysStrPtr += TextSourceSiteContext.KeyName;
+		}
+
+		LocalizationCacheStr += FString::Printf(TEXT("Namespace: %s\n"), *GatherableTextData.NamespaceName);
+		if (KeysStr.Len() > 0)
+		{
+			LocalizationCacheStr += FString::Printf(TEXT("Keys: %s\n"), *KeysStr);
+		}
+		if (EditorOnlyKeysStr.Len() > 0)
+		{
+			LocalizationCacheStr += FString::Printf(TEXT("Keys (Editor-Only): %s\n"), *EditorOnlyKeysStr);
+		}
+		LocalizationCacheStr += FString::Printf(TEXT("Source: %s"), *GatherableTextData.SourceData.SourceString);
+	}
+
+	// Generate a message box for the result
+	SGenericDialogWidget::OpenDialog(LOCTEXT("LocalizationCache", "Localization Cache"), 
+		SNew(SBox)
+		.MaxDesiredWidth(800.0f)
+		.MaxDesiredHeight(400.0f)
+		[
+			SNew(SMultiLineEditableTextBox)
+			.IsReadOnly(true)
+			.AutoWrapText(true)
+			.Text(FText::AsCultureInvariant(LocalizationCacheStr))
+		],
+		SGenericDialogWidget::FArguments()
+		.UseScrollBox(false)
+	);
+}
+
 void FAssetContextMenu::ExecuteExport()
 {
 	TArray<UObject*> ObjectsToExport;
diff --git a/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.h b/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.h
index 3c088b00699c..8e89e5661197 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/AssetContextMenu.h
@@ -232,6 +232,9 @@ private:
 	/** Handler for resetting the localization ID of the current selection */
 	void ExecuteResetLocalizationId();
 
+	/** Handler for showing the cached list of localized texts stored in the package header */
+	void ExecuteShowLocalizationCache(const FString InPackageFilename);
+
 	/** Handler for Export */
 	void ExecuteExport();
 
diff --git a/Engine/Source/Editor/ContentBrowser/Private/AssetViewSortManager.cpp b/Engine/Source/Editor/ContentBrowser/Private/AssetViewSortManager.cpp
index 9ec74c33a862..b8c5c5774988 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/AssetViewSortManager.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/AssetViewSortManager.cpp
@@ -234,8 +234,8 @@ protected:
 		}
 
 		float FloatValue1 = 0.0f, FloatValue2 = 0.0f;
-		Lex::FromString(FloatValue1, *Value1);
-		Lex::FromString(FloatValue2, *Value2);
+		LexFromString(FloatValue1, *Value1);
+		LexFromString(FloatValue2, *Value2);
 
 		if (FloatValue1 < FloatValue2)
 		{
diff --git a/Engine/Source/Editor/ContentBrowser/Private/AssetViewWidgets.cpp b/Engine/Source/Editor/ContentBrowser/Private/AssetViewWidgets.cpp
index 08900ef1a0ec..e444871c92f2 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/AssetViewWidgets.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/AssetViewWidgets.cpp
@@ -1122,7 +1122,7 @@ void SAssetViewItem::CacheDisplayTags()
 				{
 					// Convert the number as a double
 					double Num = 0.0;
-					Lex::FromString(Num, *InNumberString);
+					LexFromString(Num, *InNumberString);
 
 					const FNumberFormattingOptions NumFormatOpts = FNumberFormattingOptions()
 						.SetMinimumFractionalDigits(NumDecimalPlaces)
@@ -1138,7 +1138,7 @@ void SAssetViewItem::CacheDisplayTags()
 					{
 						// Convert the number as a signed int
 						int64 Num = 0;
-						Lex::FromString(Num, *InNumberString);
+						LexFromString(Num, *InNumberString);
 
 						return FText::AsNumber(Num);
 					}
@@ -1146,7 +1146,7 @@ void SAssetViewItem::CacheDisplayTags()
 					{
 						// Convert the number as an unsigned int
 						uint64 Num = 0;
-						Lex::FromString(Num, *InNumberString);
+						LexFromString(Num, *InNumberString);
 
 						return FText::AsNumber(Num);
 					}
@@ -1168,7 +1168,7 @@ void SAssetViewItem::CacheDisplayTags()
 				{
 					// Memory should be a 64-bit unsigned number of bytes
 					uint64 NumBytes = 0;
-					Lex::FromString(NumBytes, *TagAndValuePair.Value);
+					LexFromString(NumBytes, *TagAndValuePair.Value);
 
 					DisplayValue = FText::AsMemory(NumBytes);
 				}
diff --git a/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.cpp b/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.cpp
index 4e3fd35eb1ab..d5b668e14cad 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.cpp
@@ -258,6 +258,8 @@ public:
 		: ReferencedDynamicCollections(InReferencedDynamicCollections)
 		, AssetPtr(nullptr)
 		, bIncludeClassName(true)
+		, bIncludeAssetPath(false)
+		, bIncludeCollectionNames(true)
 		, NameKeyName("Name")
 		, PathKeyName("Path")
 		, ClassKeyName("Class")
@@ -272,40 +274,11 @@ public:
 		AssetPtr = InAsset;
 		
 		AssetPtr->PackageName.AppendString(AssetFullPath);
+		AssetFullPath.ParseIntoArray(AssetSplitPath, TEXT("/"));
+
 		AssetPtr->GetExportTextName(AssetExportTextName);
-
-		// Test each piece of the path name, apart from the first
-		{
-			const TCHAR* Ptr = AssetFullPath.GetCharArray().GetData();
-			if (Ptr)
-			{
-				// Test each piece of the path name, apart from the first
-				bool bIsFirst = true;
-				while (const TCHAR* Delimiter = FCString::Strchr(Ptr, '/'))
-				{
-					const int32 Length = Delimiter - Ptr;
-
-					if (Length > 0)
-					{
-						if (bIsFirst)
-						{
-							bIsFirst = false;
-						}
-						else
-						{
-							AssetSplitPath.Emplace(Length, Ptr);
-						}
-					}
-
-					Ptr += (Length + 1);
-				}
-
-				if (*Ptr != 0)
-				{
-					AssetSplitPath.Emplace(Ptr);
-				}
-			}
-		}
+		const TCHAR* Delimiters[] = { TEXT("/"), TEXT("'") };
+		AssetExportTextName.ParseIntoArray(AssetSplitExportText, &Delimiters[0], 2, true);
 
 		if (FCollectionManagerModule::IsModuleAvailable())
 		{
@@ -332,6 +305,7 @@ public:
 		AssetFullPath.Reset();
 		AssetExportTextName.Reset();
 		AssetSplitPath.Reset();
+		AssetSplitExportText.Reset();
 		AssetCollectionNames.Reset();
 	}
 
@@ -345,11 +319,42 @@ public:
 		return bIncludeClassName;
 	}
 
+	void SetIncludeAssetPath(const bool InIncludeAssetPath)
+	{
+		bIncludeAssetPath = InIncludeAssetPath;
+	}
+
+	bool GetIncludeAssetPath() const
+	{
+		return bIncludeAssetPath;
+	}
+
+	void SetIncludeCollectionNames(const bool InIncludeCollectionNames)
+	{
+		bIncludeCollectionNames = InIncludeCollectionNames;
+	}
+
+	bool GetIncludeCollectionNames() const
+	{
+		return bIncludeCollectionNames;
+	}
+
 	virtual bool TestBasicStringExpression(const FTextFilterString& InValue, const ETextFilterTextComparisonMode InTextComparisonMode) const override
 	{
-		for (const FString& AssetPathPart : AssetSplitPath)
+		int32 NumPathParts = AssetSplitPath.Num();
+		if (bIncludeAssetPath)
 		{
-			if (TextFilterUtils::TestBasicStringExpression(AssetPathPart, InValue, InTextComparisonMode))
+			for (const FString& AssetPathPart : AssetSplitPath)
+			{
+				if (TextFilterUtils::TestBasicStringExpression(AssetPathPart, InValue, InTextComparisonMode))
+				{
+					return true;
+				}
+			}
+		}
+		else if (NumPathParts > 0)
+		{
+			if (TextFilterUtils::TestBasicStringExpression(AssetSplitPath[NumPathParts - 1], InValue, InTextComparisonMode))
 			{
 				return true;
 			}
@@ -362,18 +367,24 @@ public:
 				return true;
 			}
 
-			// Only test this if we're searching the class name too, as the exported text contains the type in the string
-			if (TextFilterUtils::TestBasicStringExpression(AssetExportTextName, InValue, InTextComparisonMode))
+			if (AssetSplitExportText.Num() > 0)
 			{
-				return true;
+				// Only test this if we're searching the class name too, as the exported text contains the type in the string
+				if (TextFilterUtils::TestBasicStringExpression(AssetSplitExportText[0], InValue, InTextComparisonMode))
+				{
+					return true;
+				}
 			}
 		}
 
-		for (const FName& AssetCollectionName : AssetCollectionNames)
+		if (bIncludeCollectionNames)
 		{
-			if (TextFilterUtils::TestBasicStringExpression(AssetCollectionName, InValue, InTextComparisonMode))
+			for (const FName& AssetCollectionName : AssetCollectionNames)
 			{
-				return true;
+				if (TextFilterUtils::TestBasicStringExpression(AssetCollectionName, InValue, InTextComparisonMode))
+				{
+					return true;
+				}
 			}
 		}
 
@@ -500,12 +511,21 @@ private:
 	/** Split path of the current asset */
 	TArray<FString> AssetSplitPath;
 
+	/** Split path of the Export Text */
+	TArray<FString> AssetSplitExportText;
+
 	/** Names of the collections that the current asset is in */
 	TArray<FName> AssetCollectionNames;
 
 	/** Are we supposed to include the class name in our basic string tests? */
 	bool bIncludeClassName;
 
+	/** Search inside the entire asset path? */
+	bool bIncludeAssetPath;
+
+	/** Search collection names? */
+	bool bIncludeCollectionNames;
+
 	/** Keys used by TestComplexExpression */
 	const FName NameKeyName;
 	const FName PathKeyName;
@@ -584,6 +604,38 @@ void FFrontendFilter_Text::SetIncludeClassName(const bool InIncludeClassName)
 	}
 }
 
+void FFrontendFilter_Text::SetIncludeAssetPath(const bool InIncludeAssetPath)
+{
+	if (TextFilterExpressionContext->GetIncludeAssetPath() != InIncludeAssetPath)
+	{
+		TextFilterExpressionContext->SetIncludeAssetPath(InIncludeAssetPath);
+
+		// Will trigger a re-filter with the new setting
+		BroadcastChangedEvent();
+	}
+}
+
+bool FFrontendFilter_Text::GetIncludeAssetPath() const
+{
+	return TextFilterExpressionContext->GetIncludeAssetPath();
+}
+
+void FFrontendFilter_Text::SetIncludeCollectionNames(const bool InIncludeCollectionNames)
+{
+	if (TextFilterExpressionContext->GetIncludeCollectionNames() != InIncludeCollectionNames)
+	{
+		TextFilterExpressionContext->SetIncludeCollectionNames(InIncludeCollectionNames);
+
+		// Will trigger a re-filter with the new collections
+		BroadcastChangedEvent();
+	}
+}
+
+bool FFrontendFilter_Text::GetIncludeCollectionNames() const
+{
+	return TextFilterExpressionContext->GetIncludeCollectionNames();
+}
+
 void FFrontendFilter_Text::HandleCollectionCreated(const FCollectionNameType& Collection)
 {
 	RebuildReferencedDynamicCollections();
diff --git a/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.h b/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.h
index d2dae5c41fb2..17e2bdd2fddd 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/FrontendFilters.h
@@ -41,6 +41,15 @@ public:
 	/** If bIncludeClassName is true, the text filter will include an asset's class name in the search */
 	void SetIncludeClassName(const bool InIncludeClassName);
 
+	/** If bIncludeAssetPath is true, the text filter will match against full Asset path */
+	void SetIncludeAssetPath(const bool InIncludeAssetPath);
+
+	bool GetIncludeAssetPath() const;
+
+	/** If bIncludeCollectionNames is true, the text filter will match against collection names as well */
+	void SetIncludeCollectionNames(const bool InIncludeCollectionNames);
+
+	bool GetIncludeCollectionNames() const;
 private:
 	/** Handles an on collection created event */
 	void HandleCollectionCreated(const FCollectionNameType& Collection);
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.cpp b/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.cpp
index d78f8f4e539a..4ebb4fd87f6a 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.cpp
@@ -93,8 +93,6 @@ void SAssetPicker::Construct( const FArguments& InArgs )
 	// Search box
 	if (!InArgs._AssetPickerConfig.bAutohideSearchBar)
 	{
-		TextFilter = MakeShareable( new FFrontendFilter_Text() );
-		TextFilter->SetIncludeClassName(InArgs._AssetPickerConfig.Filter.ClassNames.Num() != 1);
 		HighlightText = TAttribute< FText >( this, &SAssetPicker::GetHighlightedText );
 
 		OtherDevelopersFilter = MakeShareable( new FFrontendFilter_ShowOtherDevelopers(nullptr) );
@@ -264,10 +262,20 @@ void SAssetPicker::Construct( const FArguments& InArgs )
 		.OnPathSelected(this, &SAssetPicker::FolderEntered)
 		.HiddenColumnNames(InArgs._AssetPickerConfig.HiddenColumnNames)
 		.CustomColumns(InArgs._AssetPickerConfig.CustomColumns)
+		.OnSearchOptionsChanged(this, &SAssetPicker::HandleSearchSettingsChanged)
 	];
 
 	LoadSettings();
 
+	if (AssetViewPtr.IsValid() && !InArgs._AssetPickerConfig.bAutohideSearchBar)
+	{
+		TextFilter = MakeShareable(new FFrontendFilter_Text());
+		bool bClassNamesProvided = (InArgs._AssetPickerConfig.Filter.ClassNames.Num() != 1);
+		TextFilter->SetIncludeClassName(bClassNamesProvided || AssetViewPtr->IsIncludingClassNames());
+		TextFilter->SetIncludeAssetPath(AssetViewPtr->IsIncludingAssetPaths());
+		TextFilter->SetIncludeCollectionNames(AssetViewPtr->IsIncludingCollectionNames());
+	}
+
 	AssetViewPtr->RequestSlowFullListRefresh();
 }
 
@@ -395,8 +403,11 @@ void SAssetPicker::SetNewBackendFilter(const FARFilter& NewFilter)
 	CurrentBackendFilter.PackagePaths.Reset();
 
 	// Update the Text filter too, since now class names may no longer matter
-	TextFilter->SetIncludeClassName(NewFilter.ClassNames.Num() != 1);
-	
+	if (TextFilter.IsValid())
+	{
+		TextFilter->SetIncludeClassName(NewFilter.ClassNames.Num() != 1);
+	}
+
 	OnFilterChanged();
 }
 
@@ -572,4 +583,12 @@ void SAssetPicker::SaveSettings() const
 	}
 }
 
+void SAssetPicker::HandleSearchSettingsChanged()
+{
+	bool bClassNamesProvided = (FilterListPtr.IsValid() ? FilterListPtr->GetInitialClassFilters().Num() != 1 : false);
+	TextFilter->SetIncludeClassName(bClassNamesProvided || AssetViewPtr->IsIncludingClassNames());
+	TextFilter->SetIncludeAssetPath(AssetViewPtr->IsIncludingAssetPaths());
+	TextFilter->SetIncludeCollectionNames(AssetViewPtr->IsIncludingCollectionNames());
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.h b/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.h
index 357c3b12ac98..3654d7e02138 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/SAssetPicker.h
@@ -117,6 +117,8 @@ private:
 	/** Saves settings for this asset picker if SaveSettingsName was set */
 	void SaveSettings() const;
 
+	void HandleSearchSettingsChanged();
+
 private:
 
 	/** The list of FrontendFilters currently applied to the asset view */
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SAssetView.cpp b/Engine/Source/Editor/ContentBrowser/Private/SAssetView.cpp
index ff6530785c38..2d4be89d1425 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SAssetView.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/SAssetView.cpp
@@ -242,6 +242,7 @@ void SAssetView::Construct( const FArguments& InArgs )
 	OnPathSelected = InArgs._OnPathSelected;
 	HiddenColumnNames = DefaultHiddenColumnNames = InArgs._HiddenColumnNames;
 	CustomColumns = InArgs._CustomColumns;
+	OnSearchOptionsChanged = InArgs._OnSearchOptionsChanged;
 
 	if ( InArgs._InitialViewType >= 0 && InArgs._InitialViewType < EAssetViewType::MAX )
 	{
@@ -2963,6 +2964,49 @@ TSharedRef<SWidget> SAssetView::GetViewButtonContent()
 	}
 	MenuBuilder.EndSection();
 
+	MenuBuilder.BeginSection("Search", LOCTEXT("SearchHeading", "Search"));
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("IncludeClassNameOption", "Search Asset Class Names"),
+			LOCTEXT("IncludeClassesNameOptionTooltip", "Include asset type names in search criteria?  (e.g. Blueprint, Texture, Sound)"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SAssetView::ToggleIncludeClassNames),
+				FCanExecuteAction::CreateSP(this, &SAssetView::IsToggleIncludeClassNamesAllowed),
+				FIsActionChecked::CreateSP(this, &SAssetView::IsIncludingClassNames)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("IncludeAssetPathOption", "Search Asset Path"),
+			LOCTEXT("IncludeAssetPathOptionTooltip", "Include entire asset path in search criteria?"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SAssetView::ToggleIncludeAssetPaths),
+				FCanExecuteAction::CreateSP(this, &SAssetView::IsToggleIncludeAssetPathsAllowed),
+				FIsActionChecked::CreateSP(this, &SAssetView::IsIncludingAssetPaths)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("IncludeCollectionNameOption", "Search Collection Names"),
+			LOCTEXT("IncludeCollectionNameOptionTooltip", "Include Collection names in search criteria?"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SAssetView::ToggleIncludeCollectionNames),
+				FCanExecuteAction::CreateSP(this, &SAssetView::IsToggleIncludeCollectionNamesAllowed),
+				FIsActionChecked::CreateSP(this, &SAssetView::IsIncludingCollectionNames)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+	MenuBuilder.EndSection();
+
 	MenuBuilder.BeginSection("AssetThumbnails", LOCTEXT("ThumbnailsHeading", "Thumbnails"));
 	{
 		MenuBuilder.AddWidget(
@@ -3233,6 +3277,64 @@ bool SAssetView::IsShowingCppContent() const
 	return IsToggleShowCppContentAllowed() && GetDefault<UContentBrowserSettings>()->GetDisplayCppFolders();
 }
 
+void SAssetView::ToggleIncludeClassNames()
+{
+	const bool bIncludeClassNames = GetDefault<UContentBrowserSettings>()->GetIncludeClassNames();
+	GetMutableDefault<UContentBrowserSettings>()->SetIncludeClassNames(!bIncludeClassNames);
+	GetMutableDefault<UContentBrowserSettings>()->PostEditChange();
+
+	OnSearchOptionsChanged.ExecuteIfBound();
+}
+
+bool SAssetView::IsToggleIncludeClassNamesAllowed() const
+{
+	return true;
+}
+
+bool SAssetView::IsIncludingClassNames() const
+{
+	return IsToggleIncludeClassNamesAllowed() && GetDefault<UContentBrowserSettings>()->GetIncludeClassNames();
+}
+
+void SAssetView::ToggleIncludeAssetPaths()
+{
+	const bool bIncludeAssetPaths = GetDefault<UContentBrowserSettings>()->GetIncludeAssetPaths();
+	GetMutableDefault<UContentBrowserSettings>()->SetIncludeAssetPaths(!bIncludeAssetPaths);
+	GetMutableDefault<UContentBrowserSettings>()->PostEditChange();
+
+	OnSearchOptionsChanged.ExecuteIfBound();
+}
+
+bool SAssetView::IsToggleIncludeAssetPathsAllowed() const
+{
+	return true;
+}
+
+bool SAssetView::IsIncludingAssetPaths() const
+{
+	return IsToggleIncludeAssetPathsAllowed() && GetDefault<UContentBrowserSettings>()->GetIncludeAssetPaths();
+}
+
+void SAssetView::ToggleIncludeCollectionNames()
+{
+	const bool bIncludeCollectionNames = GetDefault<UContentBrowserSettings>()->GetIncludeCollectionNames();
+	GetMutableDefault<UContentBrowserSettings>()->SetIncludeCollectionNames(!bIncludeCollectionNames);
+	GetMutableDefault<UContentBrowserSettings>()->PostEditChange();
+
+	OnSearchOptionsChanged.ExecuteIfBound();
+}
+
+bool SAssetView::IsToggleIncludeCollectionNamesAllowed() const
+{
+	return true;
+}
+
+bool SAssetView::IsIncludingCollectionNames() const
+{
+	return IsToggleIncludeCollectionNamesAllowed() && GetDefault<UContentBrowserSettings>()->GetIncludeCollectionNames();
+}
+
+
 void SAssetView::SetCurrentViewType(EAssetViewType::Type NewType)
 {
 	if ( ensure(NewType != EAssetViewType::MAX) && NewType != CurrentViewType )
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SAssetView.h b/Engine/Source/Editor/ContentBrowser/Private/SAssetView.h
index f0df592ba8a1..5bc8ae76f3ec 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SAssetView.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/SAssetView.h
@@ -35,6 +35,9 @@ struct FPropertyChangedEvent;
 /** Delegate called when selection changed. Provides more context than FOnAssetSelected */
 DECLARE_DELEGATE_TwoParams(FOnAssetSelectionChanged, const FAssetData& /*InAssetData*/, ESelectInfo::Type /*InSelectInfo*/);
 
+/** Fires whenever one of the "Search" options changes, useful for modifying search criteria to match */
+DECLARE_DELEGATE(FOnSearchOptionChanged);
+
 /**
  * A widget to display a list of filtered assets
  */
@@ -200,10 +203,13 @@ public:
 
 		/** Columns to hide by default */
 		SLATE_ARGUMENT( TArray<FString>, HiddenColumnNames )
-
+			
 		/** Custom columns that can be use specific */
 		SLATE_ARGUMENT( TArray<FAssetViewCustomColumn>, CustomColumns )
 
+		/** Custom columns that can be use specific */
+		SLATE_EVENT( FOnSearchOptionChanged, OnSearchOptionsChanged)
+
 	SLATE_END_ARGS()
 
 	~SAssetView();
@@ -327,6 +333,15 @@ public:
 	 */
 	void ForceShowPluginFolder( bool bEnginePlugin );
 
+	/** @return true when we are including class names in search criteria */
+	bool IsIncludingClassNames() const;
+
+	/** @return true when we are including the entire asset path in search criteria */
+	bool IsIncludingAssetPaths() const;
+
+	/** @return true when we are including collection names in search criteria */
+	bool IsIncludingCollectionNames() const;
+
 private:
 
 	/** Sets the pending selection to the current selection (used when changing views or refreshing the view). */
@@ -518,6 +533,24 @@ private:
 	/** @return true when we are showing C++ content */
 	bool IsShowingCppContent() const;
 
+	/** Toggle whether class names should be included in search criteria */
+	void ToggleIncludeClassNames();
+
+	/** Whether or not it's possible to include class names in search criteria */
+	bool IsToggleIncludeClassNamesAllowed() const;
+
+	/** Toggle whether the entire asset path should be included in search criteria */
+	void ToggleIncludeAssetPaths();
+
+	/** Whether or not it's possible to include the entire asset path in search criteria */
+	bool IsToggleIncludeAssetPathsAllowed() const;
+
+	/** Toggle whether collection names should be included in search criteria */
+	void ToggleIncludeCollectionNames();
+
+	/** Whether or not it's possible to include collection names in search criteria */
+	bool IsToggleIncludeCollectionNamesAllowed() const;
+
 	/** Sets the view type and updates lists accordingly */
 	void SetCurrentViewType(EAssetViewType::Type NewType);
 
@@ -844,6 +877,9 @@ private:
 	/** Called to add extra asset data to the asset view, to display virtual assets. These get treated similar to Class assets */
 	FOnGetCustomSourceAssets OnGetCustomSourceAssets;
 
+	/** Called when a search option changes to notify that results should be rebuilt */
+	FOnSearchOptionChanged OnSearchOptionsChanged;
+
 	/** When true, filtered list items will be sorted next tick. Provided another sort hasn't happened recently or we are renaming an asset */
 	bool bPendingSortFilteredItems;
 	double CurrentTime;
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.cpp b/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.cpp
index ef06607f835b..702d08e5cdac 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.cpp
@@ -706,6 +706,7 @@ void SContentBrowser::Construct( const FArguments& InArgs, const FName& InInstan
 						.CanShowCollections(true)
 						.CanShowFavorites(true)
 						.AddMetaData<FTagMetaData>(FTagMetaData(TEXT("ContentBrowserAssets")))
+						.OnSearchOptionsChanged(this, &SContentBrowser::HandleAssetViewSearchOptionsChanged)
 					]
 				]
 			]
@@ -889,6 +890,12 @@ void SContentBrowser::ToggleFolderFavorite(const TArray<FString>& FolderPaths)
 	}
 }
 
+void SContentBrowser::HandleAssetViewSearchOptionsChanged()
+{
+	TextFilter->SetIncludeClassName(AssetViewPtr->IsIncludingClassNames());
+	TextFilter->SetIncludeAssetPath(AssetViewPtr->IsIncludingAssetPaths());
+	TextFilter->SetIncludeCollectionNames(AssetViewPtr->IsIncludingCollectionNames());
+}
 
 FText SContentBrowser::GetHighlightedText() const
 {
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.h b/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.h
index 1e0f7d410d2d..50eea87864f1 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/SContentBrowser.h
@@ -420,6 +420,9 @@ private:
 	/** Toggles the favorite status of an array of folders*/
 	void ToggleFolderFavorite(const TArray<FString>& FolderPaths);
 
+	/** Called when Asset View Options "Search" options change */
+	void HandleAssetViewSearchOptionsChanged();
+
 private:
 
 	/** The tab that contains this browser */
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SFilterList.cpp b/Engine/Source/Editor/ContentBrowser/Private/SFilterList.cpp
index cfe3106e85d2..0b680d9f2c6c 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SFilterList.cpp
+++ b/Engine/Source/Editor/ContentBrowser/Private/SFilterList.cpp
@@ -495,6 +495,11 @@ FReply SFilterList::OnMouseButtonUp( const FGeometry& MyGeometry, const FPointer
 	return FReply::Unhandled();
 }
 
+const TArray<UClass*>& SFilterList::GetInitialClassFilters()
+{
+	return InitialClassFilters;
+}
+
 bool SFilterList::HasAnyFilters() const
 {
 	return Filters.Num() > 0;
diff --git a/Engine/Source/Editor/ContentBrowser/Private/SFilterList.h b/Engine/Source/Editor/ContentBrowser/Private/SFilterList.h
index c799b6c8e281..66aa42c7e952 100644
--- a/Engine/Source/Editor/ContentBrowser/Private/SFilterList.h
+++ b/Engine/Source/Editor/ContentBrowser/Private/SFilterList.h
@@ -74,6 +74,7 @@ public:
 
 	virtual FReply OnMouseButtonUp( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent );
 
+	const TArray<UClass*>& GetInitialClassFilters();
 private:
 	/** Sets the active state of a frontend filter. */
 	void SetFrontendFilterActive(const TSharedRef<FFrontendFilter>& Filter, bool bActive);
diff --git a/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.cpp b/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.cpp
index 3fd7de389f8b..756ab0129d3c 100644
--- a/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.cpp
+++ b/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.cpp
@@ -14,10 +14,14 @@
 //#include "Toolkits/IToolkitHost.h"
 #include "Widgets/Docking/SDockTab.h"
 #include "Widgets/Input/SNumericDropDown.h"
+#include "Curves/CurveLinearColor.h"
+#include "IDetailsView.h"
+#include "PropertyEditorModule.h"
 
 #define LOCTEXT_NAMESPACE "CurveAssetEditor"
 
 const FName FCurveAssetEditor::CurveTabId( TEXT( "CurveAssetEditor_Curve" ) );
+const FName FCurveAssetEditor::ColorCurveEditorTabId(TEXT("CurveAssetEditor_ColorCurveEditor"));
 
 void FCurveAssetEditor::RegisterTabSpawners(const TSharedRef<class FTabManager>& InTabManager)
 {
@@ -29,35 +33,85 @@ void FCurveAssetEditor::RegisterTabSpawners(const TSharedRef<class FTabManager>&
 		.SetDisplayName( LOCTEXT("CurveTab", "Curve") )
 		.SetGroup(WorkspaceMenuCategory.ToSharedRef())
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.CurveBase"));
+
+	InTabManager->RegisterTabSpawner(ColorCurveEditorTabId, FOnSpawnTab::CreateSP(this, &FCurveAssetEditor::SpawnTab_ColorCurveEditor))
+		.SetDisplayName(LOCTEXT("ColorCurveEditorTab", "Color Curve Editor"))
+		.SetGroup(WorkspaceMenuCategory.ToSharedRef())
+		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.CurveBase"));
 }
 
 void FCurveAssetEditor::UnregisterTabSpawners(const TSharedRef<class FTabManager>& InTabManager)
 {
 	InTabManager->UnregisterTabSpawner( CurveTabId );
+	InTabManager->UnregisterTabSpawner(ColorCurveEditorTabId);
 }
 
 void FCurveAssetEditor::InitCurveAssetEditor( const EToolkitMode::Type Mode, const TSharedPtr< class IToolkitHost >& InitToolkitHost, UCurveBase* CurveToEdit )
 {	
-	TSharedRef<FTabManager::FLayout> StandaloneDefaultLayout = FTabManager::NewLayout( "Standalone_CurveAssetEditor_Layout" )
-	->AddArea
-	(
-		FTabManager::NewPrimaryArea()
-		->SetOrientation(Orient_Vertical)
-		->Split
-		(
-			FTabManager::NewStack()
-			->SetSizeCoefficient(0.1f)
-			->SetHideTabWell( true )
-			->AddTab(GetToolbarTabId(), ETabState::OpenedTab)
-		) 
-		->Split
-		(
-			FTabManager::NewStack()
-			->SetHideTabWell( true )
-			->AddTab( CurveTabId, ETabState::OpenedTab )
-		)
-	);
 
+	TSharedRef<FTabManager::FLayout> StandaloneDefaultLayout = FTabManager::NewLayout("Standalone_CurveAssetEditor_Layout_v1")
+		->AddArea
+		(
+			FTabManager::NewPrimaryArea()
+			->SetOrientation(Orient_Vertical)
+			->Split
+			(
+				FTabManager::NewStack()
+				->SetSizeCoefficient(0.1f)
+				->SetHideTabWell(true)
+				->AddTab(GetToolbarTabId(), ETabState::OpenedTab)
+			)
+			->Split
+			(
+				FTabManager::NewStack()
+				->SetSizeCoefficient(0.9f)
+				->SetHideTabWell(true)
+				->AddTab(CurveTabId, ETabState::OpenedTab)
+			)
+		);
+
+	UCurveLinearColor* ColorCurve = Cast<UCurveLinearColor>(CurveToEdit);
+	if (ColorCurve)
+	{
+
+		StandaloneDefaultLayout = FTabManager::NewLayout("Standalone_CurveAssetEditor_Layout_ColorCurvev2")
+			->AddArea
+			(
+				FTabManager::NewPrimaryArea()
+				->SetOrientation(Orient_Vertical)
+				->Split
+				(
+					FTabManager::NewStack()
+					->SetSizeCoefficient(0.1f)
+					->SetHideTabWell(true)
+					->AddTab(GetToolbarTabId(), ETabState::OpenedTab)
+				)
+				->Split
+				(
+					FTabManager::NewSplitter()
+					->SetOrientation(Orient_Horizontal)
+					->Split
+					(
+						FTabManager::NewStack()
+						->SetSizeCoefficient(0.8f)
+						->SetHideTabWell(true)
+						->AddTab(CurveTabId, ETabState::OpenedTab)
+					)
+
+					->Split
+					(
+						FTabManager::NewStack()
+						->SetSizeCoefficient(0.2f)
+						->SetHideTabWell(true)
+						->AddTab(ColorCurveEditorTabId, ETabState::OpenedTab)
+					)
+				)
+			);
+
+		FPropertyEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>("PropertyEditor");
+		const FDetailsViewArgs DetailsViewArgs(false, false, false, FDetailsViewArgs::HideNameArea);
+		ColorCurveDetailsView = PropertyEditorModule.CreateDetailView(DetailsViewArgs);
+	}
 	const bool bCreateDefaultStandaloneMenu = true;
 	const bool bCreateDefaultToolbar = true;
 	FAssetEditorToolkit::InitAssetEditor( Mode, InitToolkitHost, FCurveAssetEditorModule::CurveAssetEditorAppIdentifier, StandaloneDefaultLayout, bCreateDefaultStandaloneMenu, bCreateDefaultToolbar, CurveToEdit );
@@ -78,6 +132,11 @@ void FCurveAssetEditor::InitCurveAssetEditor( const EToolkitMode::Type Mode, con
 	{
 		RegenerateMenusAndToolbars();
 	}
+
+	if (ColorCurve)
+	{
+		ColorCurveDetailsView->SetObject(ColorCurve);
+	}
 }
 
 FName FCurveAssetEditor::GetToolkitFName() const
@@ -110,6 +169,8 @@ TSharedRef<SDockTab> FCurveAssetEditor::SpawnTab_CurveAsset( const FSpawnTabArgs
 	InputSnap = 0.1f;
 	OutputSnap = 0.05f;
 
+	UCurveBase* Curve = Cast<UCurveBase>(GetEditingObject());
+
 	TSharedRef<SDockTab> NewDockTab = SNew(SDockTab)
 		.Icon( FEditorStyle::GetBrush("CurveAssetEditor.Tabs.Properties") )
 		.Label( FText::Format(LOCTEXT("CurveAssetEditorTitle", "{0} Curve Asset"), FText::FromString(GetTabPrefix())))
@@ -132,7 +193,7 @@ TSharedRef<SDockTab> FCurveAssetEditor::SpawnTab_CurveAsset( const FSpawnTabArgs
 			]
 		];
 
-	UCurveBase* Curve = Cast<UCurveBase>(GetEditingObject());
+
 
 	FCurveOwnerInterface* CurveOwner = Curve;
 	
@@ -146,6 +207,22 @@ TSharedRef<SDockTab> FCurveAssetEditor::SpawnTab_CurveAsset( const FSpawnTabArgs
 	return NewDockTab;
 }
 
+TSharedRef<SDockTab> FCurveAssetEditor::SpawnTab_ColorCurveEditor(const FSpawnTabArgs& Args)
+{
+	check(Args.GetTabId().TabType == ColorCurveEditorTabId);
+
+
+	TSharedRef<SDockTab> NewDockTab = SNew(SDockTab)
+		.Icon(FEditorStyle::GetBrush("CurveAssetEditor.Tabs.Properties"))
+		.Label(LOCTEXT("ColorCurveEditor", "Color Curve Editor"))
+		.TabColorScale(GetTabColorScale())
+		[
+			ColorCurveDetailsView.ToSharedRef()
+		];
+
+	return NewDockTab;
+}
+
 float FCurveAssetEditor::GetInputSnap() const
 {
 	return InputSnap;
diff --git a/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.h b/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.h
index 68975a79b57b..cbdb6f6bc7d2 100644
--- a/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.h
+++ b/Engine/Source/Editor/CurveAssetEditor/Private/CurveAssetEditor.h
@@ -53,7 +53,8 @@ private:
 	float GetTimelineLength() const;
 	/**	Spawns the tab with the curve asset inside */
 	TSharedRef<SDockTab> SpawnTab_CurveAsset( const FSpawnTabArgs& Args );
-
+	/**	Spawns the details panel for the color curve */
+	TSharedRef<SDockTab> SpawnTab_ColorCurveEditor(const FSpawnTabArgs& Args);
 	/** Get the snapping value for the input domain. */
 	float GetInputSnap() const;
 	/** Gets the snapping value for the input domain as text. */
@@ -71,6 +72,8 @@ private:
 
 	/**	The tab id for the curve asset tab */
 	static const FName CurveTabId;
+	/**	The tab id for the color curve editor tab */
+	static const FName ColorCurveEditorTabId;
 
 	float ViewMinInput;
 	float ViewMaxInput;
@@ -79,4 +82,6 @@ private:
 	float InputSnap;
 	/** The snapping value for the output domain. */
 	float OutputSnap;
+	/* Holds the details panel for the color curve */
+	TSharedPtr<class IDetailsView> ColorCurveDetailsView;
 };
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/ColorGradingVectorCustomization.h b/Engine/Source/Editor/DetailCustomizations/Private/ColorGradingVectorCustomization.h
index 53d5fc455ec5..183738d5dcdb 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/ColorGradingVectorCustomization.h
+++ b/Engine/Source/Editor/DetailCustomizations/Private/ColorGradingVectorCustomization.h
@@ -5,6 +5,7 @@
 #include "MathStructCustomizations.h"
 #include "IDetailCustomNodeBuilder.h"
 #include "EditorUndoClient.h"
+#include "Widgets/Input/SNumericEntryBox.h"
 
 class FVector4StructCustomization;
 class SColorGradingPicker;
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/DataTableCustomization.h b/Engine/Source/Editor/DetailCustomizations/Private/DataTableCustomization.h
index c0dc069bfa52..f59d036ad2e5 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/DataTableCustomization.h
+++ b/Engine/Source/Editor/DetailCustomizations/Private/DataTableCustomization.h
@@ -66,7 +66,7 @@ private:
 
 	/** The comboButton objects */
 	TSharedPtr<SComboButton> RowNameComboButton;
-	TSharedPtr<SSearchBox> SearchBox;
+	TSharedPtr<class SSearchBox> SearchBox;
 	TSharedPtr<SListView<TSharedPtr<FString> > > RowNameComboListView;
 	TSharedPtr<FString> CurrentSelectedItem;	
 	/** Handle to the struct properties being customized */
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/DetailCustomizations.cpp b/Engine/Source/Editor/DetailCustomizations/Private/DetailCustomizations.cpp
index ddc768ade981..38d3f71d2f72 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/DetailCustomizations.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/DetailCustomizations.cpp
@@ -361,7 +361,6 @@ void FDetailCustomizationsModule::RegisterObjectCustomizations()
 	RegisterCustomClassLayout("SequencerGenericKeyStruct", FOnGetDetailCustomizationInstance::CreateStatic(&FSequencerGenericKeyStructCustomization::MakeInstance));
 
 	RegisterCustomClassLayout("AnalyticsPrivacySettings", FOnGetDetailCustomizationInstance::CreateStatic(&FImportantToggleSettingCustomization::MakeInstance));
-	RegisterCustomClassLayout("EndUserSettings", FOnGetDetailCustomizationInstance::CreateStatic(&FImportantToggleSettingCustomization::MakeInstance));
 
 	RegisterCustomClassLayout("AssetViewerSettings", FOnGetDetailCustomizationInstance::CreateStatic(&FAssetViewerSettingsCustomization::MakeInstance));
 
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/FbxImportUIDetails.cpp b/Engine/Source/Editor/DetailCustomizations/Private/FbxImportUIDetails.cpp
index 6ba8cdef5b34..c964599bf7b1 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/FbxImportUIDetails.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/FbxImportUIDetails.cpp
@@ -241,7 +241,15 @@ void FFbxImportUIDetails::CustomizeDetails( IDetailLayoutBuilder& DetailBuilder
 				{
 					if (Property->GetFName() == GET_MEMBER_NAME_CHECKED(UFbxStaticMeshImportData, StaticMeshLODGroup))
 					{
-						SetStaticMeshLODGroupWidget(PropertyRow, Handle);
+						//We cannot change the LODGroup when re-importing so hide the option
+						if (ImportUI->bIsReimport)
+						{
+							PropertyRow.Visibility(EVisibility::Collapsed);
+						}
+						else
+						{
+							SetStaticMeshLODGroupWidget(PropertyRow, Handle);
+						}
 					}
 
 					if (Property->GetFName() == GET_MEMBER_NAME_CHECKED(UFbxStaticMeshImportData, VertexOverrideColor))
@@ -253,8 +261,6 @@ void FFbxImportUIDetails::CustomizeDetails( IDetailLayoutBuilder& DetailBuilder
 					}
 				}
 			}
-
-			
 		}
 	}
 
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/HierarchicalSimplificationCustomizations.cpp b/Engine/Source/Editor/DetailCustomizations/Private/HierarchicalSimplificationCustomizations.cpp
index d58d0d24e103..82cbe4e2e0bd 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/HierarchicalSimplificationCustomizations.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/HierarchicalSimplificationCustomizations.cpp
@@ -58,6 +58,7 @@ void FHierarchicalSimplificationCustomizations::CustomizeChildren( TSharedRef<IP
 	TSharedPtr< IPropertyHandle > MergeMeshSettingPropertyHandle = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FHierarchicalSimplification, MergeSetting));
 	TSharedPtr< IPropertyHandle > TransitionScreenSizePropertyHandle = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FHierarchicalSimplification, TransitionScreenSize));
 	TSharedPtr< IPropertyHandle > OverrideDrawDistancePropertyHandle = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FHierarchicalSimplification, OverrideDrawDistance));
+	TSharedPtr< IPropertyHandle > ReusePreviousLevelClustersPropertyHandle = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FHierarchicalSimplification, bReusePreviousLevelClusters));
 
 	for (auto Iter(PropertyHandles.CreateConstIterator()); Iter; ++Iter)
 	{
@@ -85,6 +86,16 @@ void FHierarchicalSimplificationCustomizations::CustomizeChildren( TSharedRef<IP
 		{
 			IDetailPropertyRow& SettingsRow = MergeGroup.AddPropertyRow(Iter.Value().ToSharedRef());
 		}
+		else if (Iter.Value() == ReusePreviousLevelClustersPropertyHandle)
+		{
+			IDetailPropertyRow& SettingsRow = ClusterGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			uint32 Index = StructPropertyHandle->GetIndexInArray();
+			// Hide the property for HLOD level 0
+			SettingsRow.Visibility(TAttribute<EVisibility>::Create([Index]()
+			{
+				return (Index == INDEX_NONE || Index > 0) ? EVisibility::Visible : EVisibility::Collapsed;
+			}));
+		}
 		else
 		{
 			IDetailPropertyRow& SettingsRow = ClusterGroup.AddPropertyRow(Iter.Value().ToSharedRef());
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.cpp b/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.cpp
index 3f26d62d69b8..ce20607c22b9 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.cpp
@@ -53,10 +53,13 @@ void FMeshProxySettingsCustomizations::CustomizeChildren(TSharedRef<IPropertyHan
 
 
 	TSharedPtr< IPropertyHandle > HardAngleThresholdPropertyHandle        = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, HardAngleThreshold));
+	TSharedPtr< IPropertyHandle > NormalCalcMethodPropertyHandle          = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, NormalCalculationMethod));
+	TSharedPtr< IPropertyHandle > MaxRayCastDistdPropertyHandle           = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, MaxRayCastDist));
 	TSharedPtr< IPropertyHandle > RecalculateNormalsPropertyHandle        = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, bRecalculateNormals));
 	TSharedPtr< IPropertyHandle > UseLandscapeCullingPropertyHandle       = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, bUseLandscapeCulling));
 	TSharedPtr< IPropertyHandle > LandscapeCullingPrecisionPropertyHandle = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, LandscapeCullingPrecision));
 	TSharedPtr< IPropertyHandle > MergeDistanceHandle                     = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, MergeDistance));
+	TSharedPtr< IPropertyHandle > UnresolvedGeometryColorHandle           = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, UnresolvedGeometryColor));
 	TSharedPtr< IPropertyHandle > VoxelSizeHandle                         = PropertyHandles.FindChecked(GET_MEMBER_NAME_CHECKED(FMeshProxySettings, VoxelSize));
 	
 
@@ -67,8 +70,19 @@ void FMeshProxySettingsCustomizations::CustomizeChildren(TSharedRef<IPropertyHan
 		if (Iter.Value() == HardAngleThresholdPropertyHandle)
 		{
 			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			MeshProxySettingsRow.ToolTip(FText::FromString(FString("Angle at which a hard edge is introduced between faces.  Note: Increases vertex count and may introduce additional UV seams.  It is only recommended if not using normals maps")));
 			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsHardAngleThresholdVisible));
 		}
+		else if (Iter.Value() == NormalCalcMethodPropertyHandle)
+		{
+			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsNormalCalcMethodVisible));
+		}
+		else if (Iter.Value() == MaxRayCastDistdPropertyHandle)
+		{
+			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsSearchDistanceVisible));
+		}
 		else if (Iter.Value() == RecalculateNormalsPropertyHandle)
 		{
 			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
@@ -77,6 +91,8 @@ void FMeshProxySettingsCustomizations::CustomizeChildren(TSharedRef<IPropertyHan
 		else if (Iter.Value() == UseLandscapeCullingPropertyHandle)
 		{
 			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			MeshProxySettingsRow.DisplayName(FText::FromString(FString("Enable Volume Culling")));
+			MeshProxySettingsRow.ToolTip(FText::FromString(FString("Allow culling volumes to exclude geometry.")));
 			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsUseLandscapeCullingVisible));
 		}
 		else if (Iter.Value() == LandscapeCullingPrecisionPropertyHandle)
@@ -89,6 +105,11 @@ void FMeshProxySettingsCustomizations::CustomizeChildren(TSharedRef<IPropertyHan
 			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
 			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsMergeDistanceVisible));
 		}
+		else if (Iter.Value() == UnresolvedGeometryColorHandle)
+		{
+			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
+			MeshProxySettingsRow.Visibility(TAttribute<EVisibility>(this, &FMeshProxySettingsCustomizations::IsUnresolvedGeometryColorVisible));
+		}
 		else if (Iter.Value() == VoxelSizeHandle)
 		{
 			IDetailPropertyRow& MeshProxySettingsRow = MeshSettingsGroup.AddPropertyRow(Iter.Value().ToSharedRef());
@@ -114,9 +135,30 @@ EVisibility FMeshProxySettingsCustomizations::IsThirdPartySpecificVisible() cons
 	return EVisibility::Visible;
 }
 
+EVisibility FMeshProxySettingsCustomizations::IsProxyLODSpecificVisible() const
+{
+	// Static assignment.  The tool can only change during editor restart.
+	static bool bUseNativeTool = UseNativeProxyLODTool();
+
+	if (bUseNativeTool)
+	{
+		return EVisibility::Visible;
+	}
+
+	return EVisibility::Hidden;
+}
+
 EVisibility FMeshProxySettingsCustomizations::IsHardAngleThresholdVisible() const
 {
-	return IsThirdPartySpecificVisible();
+	// Only proxyLOD actually uses this setting.  Historically, it has been exposed for
+	// simplygon, but it was not actually connected!
+	return IsProxyLODSpecificVisible();
+}
+
+EVisibility FMeshProxySettingsCustomizations::IsNormalCalcMethodVisible() const
+{
+	// Only ProxyLOD
+	return IsProxyLODSpecificVisible();
 }
 
 EVisibility FMeshProxySettingsCustomizations::IsRecalculateNormalsVisible() const
@@ -126,7 +168,7 @@ EVisibility FMeshProxySettingsCustomizations::IsRecalculateNormalsVisible() cons
 
 EVisibility FMeshProxySettingsCustomizations::IsUseLandscapeCullingVisible() const
 {
-	return IsThirdPartySpecificVisible();
+	return EVisibility::Visible;
 }
 
 EVisibility FMeshProxySettingsCustomizations::IsUseLandscapeCullingPrecisionVisible() const
@@ -136,19 +178,19 @@ EVisibility FMeshProxySettingsCustomizations::IsUseLandscapeCullingPrecisionVisi
 
 EVisibility FMeshProxySettingsCustomizations::IsMergeDistanceVisible() const
 {
-	return IsThirdPartySpecificVisible();
+	return EVisibility::Visible;
+}
+EVisibility FMeshProxySettingsCustomizations::IsUnresolvedGeometryColorVisible() const
+{   // visible for proxylod but not third party tool (e.g. simplygon)
+	return IsProxyLODSpecificVisible();
+}
+EVisibility FMeshProxySettingsCustomizations::IsSearchDistanceVisible() const
+{
+	return IsProxyLODSpecificVisible();
 }
-
 EVisibility FMeshProxySettingsCustomizations::IsVoxelSizeVisible() const
 {
-	if (EVisibility::Visible == IsThirdPartySpecificVisible())
-	{
-		return EVisibility::Hidden;
-	}
-	else
-	{
-		return EVisibility::Visible;
-	}
+	return IsProxyLODSpecificVisible();
 }
 
 
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.h b/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.h
index 2f3670828be6..05ab0fbaab6e 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.h
+++ b/Engine/Source/Editor/DetailCustomizations/Private/MeshProxySettingsCustomizations.h
@@ -25,8 +25,12 @@ protected:
 	EVisibility IsUseLandscapeCullingVisible() const;
 	EVisibility IsUseLandscapeCullingPrecisionVisible() const;
 	EVisibility IsMergeDistanceVisible() const;
+	EVisibility IsUnresolvedGeometryColorVisible() const;
 	EVisibility IsVoxelSizeVisible() const;
+	EVisibility IsNormalCalcMethodVisible() const;
+	EVisibility IsSearchDistanceVisible() const;
 
 	EVisibility IsThirdPartySpecificVisible() const;
+	EVisibility IsProxyLODSpecificVisible() const;
 	bool UseNativeProxyLODTool() const;
 };
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.cpp b/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.cpp
index 3e6015d78a6a..fca3ecd272ef 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.cpp
@@ -15,10 +15,13 @@
 #include "DetailLayoutBuilder.h"
 #include "SPerPlatformPropertiesWidget.h"
 #include "ScopedTransaction.h"
+#include "IPropertyUtilities.h"
 
 template<typename PerPlatformType>
 void FPerPlatformPropertyCustomization<PerPlatformType>::CustomizeHeader(TSharedRef<IPropertyHandle> StructPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
 {
+	PropertyUtilities = StructCustomizationUtils.GetPropertyUtilities();
+
 	HeaderRow.NameContent()
 	[
 		StructPropertyHandle->CreatePropertyNameWidget()
@@ -133,6 +136,12 @@ bool FPerPlatformPropertyCustomization<PerPlatformType>::AddPlatformOverride(FNa
 							typename PerPlatformType::ValueType DefaultValue;
 							DefaultProperty->GetValue(DefaultValue);
 							ChildProperty->SetValue(DefaultValue);
+
+							if(PropertyUtilities.IsValid())
+							{
+								PropertyUtilities.Pin()->ForceRefresh();
+							}
+
 							return true;
 						}
 					}
@@ -167,6 +176,12 @@ bool FPerPlatformPropertyCustomization<PerPlatformType>::RemovePlatformOverride(
 						if (KeyProperty->GetValue(KeyName) == FPropertyAccess::Success && KeyName == PlatformGroupName)
 						{
 							MapProperty->DeleteItem(ChildIdx);
+
+							if(PropertyUtilities.IsValid())
+							{
+								PropertyUtilities.Pin()->ForceRefresh();
+							}
+
 							return true;
 						}
 					}
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.h b/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.h
index ca5c7c4781f4..aac2353567a3 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.h
+++ b/Engine/Source/Editor/DetailCustomizations/Private/PerPlatformPropertyCustomization.h
@@ -7,6 +7,8 @@
 #include "IPropertyTypeCustomization.h"
 #include "PerPlatformProperties.h"
 
+class FDetailWidgetDecl;
+
 /**
 * Implements a details panel customization for the FPerPlatform structures.
 */
@@ -34,4 +36,8 @@ protected:
 	bool AddPlatformOverride(FName PlatformGroupName, TSharedRef<IPropertyHandle> StructPropertyHandle);
 	bool RemovePlatformOverride(FName PlatformGroupName, TSharedRef<IPropertyHandle> StructPropertyHandle);
 	float CalcDesiredWidth(TSharedRef<IPropertyHandle> StructPropertyHandle);
+
+private:
+	/** Cached utils used for resetting customization when layout changes */
+	TWeakPtr<IPropertyUtilities> PropertyUtilities;
 };
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.cpp b/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.cpp
index 74fedc935d34..be771c250c60 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.cpp
+++ b/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.cpp
@@ -37,12 +37,13 @@ void FSkeletalMeshReductionSettingsDetails::CustomizeChildren(TSharedRef<IProper
 	StructBuilder.AddProperty(ReductionMethodPropertyHandle.ToSharedRef());
 
 	StructBuilder.AddCustomRow(LOCTEXT("PercentTriangles_Row", "Triangle Percentage"))
-		.Visibility(TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateSP(this, &FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethod, SMOT_NumOfTriangles)))
+		.Visibility(TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateSP(this, &FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethodIsNot, SMOT_MaxDeviation)))
 		.NameContent()
 		[
 			SNew(STextBlock)
 			.Font(IDetailLayoutBuilder::GetDetailFont())
-			.Text(LOCTEXT("PercentTriangles", "Percentage of Triangles"))
+			.Text(LOCTEXT("PercentTriangles", "Triangle Percentage"))
+			.ToolTipText(LOCTEXT("PercentTriangles_ToolTip", "The simplification uses this percentage of source mesh's triangle count as a target."))
 		]
 		.ValueContent()
 		[
@@ -54,25 +55,24 @@ void FSkeletalMeshReductionSettingsDetails::CustomizeChildren(TSharedRef<IProper
 			.OnValueChanged(this, &FSkeletalMeshReductionSettingsDetails::SetNumTrianglesPercentage)
 		];
 
-	StructBuilder.AddCustomRow(LOCTEXT("MaxDeviation_Row", "MaxDeviation Percentage"))
-		.Visibility(TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateSP(this, &FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethod, SMOT_MaxDeviation)))
+	StructBuilder.AddCustomRow(LOCTEXT("Accuracy_Row", "Accuracy Percentage"))
+		.Visibility(TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateSP(this, &FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethodIsNot, SMOT_NumOfTriangles)))
 		.NameContent()
 		[
 			SNew(STextBlock)
 			.Font(IDetailLayoutBuilder::GetDetailFont())
-			.Text(LOCTEXT("MaxDeviation", "Percentage of Max Deviation"))
-			.ToolTipText(LOCTEXT("MaxDeviation_ToolTip", "100% means it will deviate as much as mesh's bound radius."))
+			.Text(LOCTEXT("PercentAccuracy", "Accuracy Percentage"))
+			.ToolTipText(LOCTEXT("PercentAccuracy_ToolTip", "The simplification uses this as how much deviate from source mesh. Better works with hard surface meshes."))
 		]
 		.ValueContent()
 		[
 			SNew(SSpinBox<float>)
 			.Font(IDetailLayoutBuilder::GetDetailFont())
-			// if you're choosing reductionmethod to be max deviation, and if your MaxDeviation % is 0.f, that means you don't really reduce
-			// so we set min to be 1.0f, that means 1%, and translate to 0.01 for MaxDeviationPercentage value
-			.MinValue(1.0f)
-			.MaxValue(100.0f)
-			.Value(this, &FSkeletalMeshReductionSettingsDetails::GetMaxDeviationPercentage)
-			.OnValueChanged(this, &FSkeletalMeshReductionSettingsDetails::SetMaxDeviationPercentage)
+			.MinValue(0.0f)
+			// if you set 100% accuracy, which will set 0.f as max deviation, simplygon ignores the value. Considered invalid.
+			.MaxValue(100.f) 
+			.Value(this, &FSkeletalMeshReductionSettingsDetails::GetAccuracyPercentage)
+			.OnValueChanged(this, &FSkeletalMeshReductionSettingsDetails::SetAccuracyPercentage)
 		];
 
 	uint32 NumChildren = 0;
@@ -119,28 +119,30 @@ void FSkeletalMeshReductionSettingsDetails::SetNumTrianglesPercentage(float Valu
 	ensure(NumTrianglesPercentagePropertyHandle->SetValue(PropertyValue) != FPropertyAccess::Fail);
 }
 
-float FSkeletalMeshReductionSettingsDetails::GetMaxDeviationPercentage() const
+
+float FSkeletalMeshReductionSettingsDetails::GetAccuracyPercentage() const
 {
 	float CurrentValue;
 	if (MaxDeviationPercentagePropertyHandle->GetValue(CurrentValue) != FPropertyAccess::Fail)
 	{
-		return ConvertToPercentage(CurrentValue);
+		return ConvertToPercentage(1.f-CurrentValue);
 	}
 
 	return 0.f;
 }
-void FSkeletalMeshReductionSettingsDetails::SetMaxDeviationPercentage(float Value)
+void FSkeletalMeshReductionSettingsDetails::SetAccuracyPercentage(float Value)
 {
-	float PropertyValue = ConvertToDecimal(Value);
+	float PropertyValue = 1.f - ConvertToDecimal(Value);
 	ensure(MaxDeviationPercentagePropertyHandle->SetValue(PropertyValue) != FPropertyAccess::Fail);
 }
 
-EVisibility FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethod(enum SkeletalMeshOptimizationType ReductionType) const
+EVisibility FSkeletalMeshReductionSettingsDetails::GetVisibiltyIfCurrentReductionMethodIsNot(enum SkeletalMeshOptimizationType ReductionType) const
 {
 	uint8 CurrentEnum;
 	if (ReductionMethodPropertyHandle->GetValue(CurrentEnum) != FPropertyAccess::Fail)
 	{
-		if ((SkeletalMeshOptimizationType)CurrentEnum == ReductionType)
+		enum SkeletalMeshOptimizationType CurrentReductionType = (SkeletalMeshOptimizationType)CurrentEnum;
+		if (CurrentReductionType != ReductionType)
 		{
 			return EVisibility::Visible;
 		}
diff --git a/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.h b/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.h
index c7a7913eab16..4925e8649a86 100644
--- a/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.h
+++ b/Engine/Source/Editor/DetailCustomizations/Private/SkeletalMeshReductionSettingsDetails.h
@@ -31,8 +31,8 @@ private:
 	float GetNumTrianglesPercentage() const;
 	void SetNumTrianglesPercentage(float Value);
 
-	float GetMaxDeviationPercentage() const;
-	void SetMaxDeviationPercentage(float Value);
+	float GetAccuracyPercentage() const;
+	void SetAccuracyPercentage(float Value);
 
-	EVisibility GetVisibiltyIfCurrentReductionMethod(SkeletalMeshOptimizationType ReductionType) const;
+	EVisibility GetVisibiltyIfCurrentReductionMethodIsNot(SkeletalMeshOptimizationType ReductionType) const;
 };
diff --git a/Engine/Source/Editor/EditorStyle/Private/SlateEditorStyle.cpp b/Engine/Source/Editor/EditorStyle/Private/SlateEditorStyle.cpp
index 2b57fae4fe8f..2a05b2752e4a 100644
--- a/Engine/Source/Editor/EditorStyle/Private/SlateEditorStyle.cpp
+++ b/Engine/Source/Editor/EditorStyle/Private/SlateEditorStyle.cpp
@@ -60,12 +60,12 @@ FSlateEditorStyle::FStyle::FStyle( const TWeakObjectPtr< UEditorStyleSettings >&
 	, SelectionColor_Inactive_LinearRef( MakeShareable( new FLinearColor( 0.25f, 0.25f, 0.25f ) ) )
 	, SelectionColor_Pressed_LinearRef( MakeShareable( new FLinearColor( 0.701f, 0.225f, 0.003f ) ) )
 
-	, LogColor_Background_LinearRef(MakeShareable(new FLinearColor(FColor(0xFF3E3E3E))))
-	, LogColor_SelectionBackground_LinearRef(MakeShareable(new FLinearColor(FColor(0xff666666))))
+	, LogColor_Background_LinearRef(MakeShareable(new FLinearColor(FColor(0x040404FF))))
+	, LogColor_SelectionBackground_LinearRef(MakeShareable(new FLinearColor(FColor(0x020202FF))))
 	, LogColor_Normal_LinearRef(MakeShareable(new FLinearColor(FColor(0xffaaaaaa))))
 	, LogColor_Command_LinearRef(MakeShareable(new FLinearColor(FColor(0xff33dd33))))
-	, LogColor_Warning_LinearRef(MakeShareable(new FLinearColor(FColor(0xffbbbb44))))
-	, LogColor_Error_LinearRef(MakeShareable(new FLinearColor(FColor(0xffdd0000))))
+	, LogColor_Warning_LinearRef(MakeShareable(new FLinearColor(FColor(0xEBB000FF))))
+	, LogColor_Error_LinearRef(MakeShareable(new FLinearColor(FColor(0xFF0D0FFF))))
 
 	// These are the Slate colors which reference those above; these are the colors to put into the style
 	, DefaultForeground( DefaultForeground_LinearRef )
@@ -5248,12 +5248,15 @@ void FSlateEditorStyle::FStyle::SetupPersonaStyle()
 			.SetShadowOffset(FVector2D(1.0f, 1.0f))
 			.SetShadowColorAndOpacity(FLinearColor(0.0f, 0.0f, 0.0f)));
 		
-		Set( "Persona.Viewport.BlueprintDirtyText", FTextBlockStyle(NormalText)
-			.SetFont( DEFAULT_FONT( "BoldCondensed", 18 ) )
-			.SetColorAndOpacity( FLinearColor(0.8, 0.8f, 0.0f, 0.8f) )
-			.SetShadowOffset( FVector2D( 1,1 ) )
-			.SetShadowColorAndOpacity( FLinearColor(0,0,0,0.9f) )
-			);
+		// Viewport notifications 
+		Set("AnimViewport.Notification.Error", new BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(0.728f, 0.0f, 0.0f)));
+		Set("AnimViewport.Notification.Warning", new BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(0.728f, 0.364f, 0.003f)));
+		Set("AnimViewport.Notification.Message", new BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(0.364f, 0.364f, 0.364f)));
+
+		Set("AnimViewport.Notification.CloseButton", FButtonStyle()
+			.SetNormal(IMAGE_BRUSH("/Docking/CloseApp_Normal", Icon16x16))
+			.SetPressed(IMAGE_BRUSH("/Docking/CloseApp_Pressed", Icon16x16))
+			.SetHovered(IMAGE_BRUSH("/Docking/CloseApp_Hovered", Icon16x16)));
 
 		// persona commands
 		Set("Persona.AnimNotifyWindow", new IMAGE_BRUSH(TEXT("Icons/icon_Persona_AnimNotift_40x"), Icon40x40));
@@ -6732,8 +6735,8 @@ void FSlateEditorStyle::FStyle::SetupToolkitStyles()
 		Set( "MaterialEditor.ToggleMaterialStats.Small", new IMAGE_BRUSH( "Icons/icon_MatEd_Stats_40x", Icon20x20 ) );
 		Set( "MaterialEditor.ToggleBuiltinStats", new IMAGE_BRUSH( "Icons/icon_MatEd_BuiltInStats_40x", Icon40x40 ) );
 		Set( "MaterialEditor.ToggleBuiltinStats.Small", new IMAGE_BRUSH( "Icons/icon_MatEd_BuiltInStats_40x", Icon20x20 ) );
-		Set( "MaterialEditor.ToggleMobileStats", new IMAGE_BRUSH( "Icons/icon_MobileStats_40x", Icon40x40 ) );
-		Set( "MaterialEditor.ToggleMobileStats.Small", new IMAGE_BRUSH( "Icons/icon_MobileStats_40x", Icon20x20 ) );
+		Set( "MaterialEditor.TogglePlatformStats", new IMAGE_BRUSH( "Icons/icon_MobileStats_40x", Icon40x40 ) );
+		Set( "MaterialEditor.TogglePlatformStats.Small", new IMAGE_BRUSH( "Icons/icon_MobileStats_40x", Icon20x20 ) );
 		Set( "MaterialEditor.CleanUnusedExpressions", new IMAGE_BRUSH( "Icons/icon_MatEd_CleanUp_40x", Icon40x40 ) );
 		Set( "MaterialEditor.CleanUnusedExpressions.Small", new IMAGE_BRUSH( "Icons/icon_MatEd_CleanUp_40x", Icon20x20 ) );
 		Set( "MaterialEditor.ToggleRealtimeExpressions", new IMAGE_BRUSH( "Icons/icon_MatEd_LiveNodes_40x", Icon40x40 ) );
@@ -6761,6 +6764,8 @@ void FSlateEditorStyle::FStyle::SetupToolkitStyles()
 		Set("MaterialInstanceEditor.StackHeader", new FSlateColorBrush(FLinearColor(0.025f, 0.025f, 0.025f, 1.0f)));
 		Set("MaterialInstanceEditor.StackBody", new FSlateColorBrush(FLinearColor(0.045f, 0.045f, 0.045f, 1.0f)));
 		Set("MaterialInstanceEditor.StackBodyBlend", new FSlateColorBrush(FLinearColor(0.06f, 0.06f, 0.06f, 1.0f)));
+		Set("MaterialInstanceEditor.StackBodyDragged", new FSlateColorBrush(FLinearColor(0.0f, 0.0f, 0.0f, 1.0f)));
+		Set("MaterialInstanceEditor.StackBody_Highlighted", new BOX_BRUSH("Common/TextBox_Special_Active", FMargin(8.0f / 32.0f)));
 	}
 
 	// Sound Class Editor
@@ -6818,6 +6823,8 @@ void FSlateEditorStyle::FStyle::SetupToolkitStyles()
 		Set( "StaticMeshEditor.SetShowVertexColor.Small", new IMAGE_BRUSH( "Icons/icon_StaticMeshEd_VertColor_40x", Icon20x20 ) );
 		Set( "StaticMeshEditor.SetRealtimePreview", new IMAGE_BRUSH( "Icons/icon_MatEd_Realtime_40x", Icon40x40 ) );
 		Set( "StaticMeshEditor.SetRealtimePreview.Small", new IMAGE_BRUSH( "Icons/icon_MatEd_Realtime_40x", Icon20x20 ) );
+		Set( "StaticMeshEditor.ReimportMesh", new IMAGE_BRUSH(TEXT("Icons/icon_Persona_ReimportMesh_40x"), Icon40x40));
+		Set( "StaticMeshEditor.ReimportMesh.Small", new IMAGE_BRUSH(TEXT("Icons/icon_Persona_ReimportMesh_40x"), Icon20x20));
 		Set( "StaticMeshEditor.SetShowBounds", new IMAGE_BRUSH( "Icons/icon_StaticMeshEd_Bounds_40x", Icon40x40 ) );
 		Set( "StaticMeshEditor.SetShowBounds.Small", new IMAGE_BRUSH( "Icons/icon_StaticMeshEd_Bounds_40x", Icon20x20 ) );
 		Set( "StaticMeshEditor.SetShowCollision", new IMAGE_BRUSH( "Icons/icon_StaticMeshEd_Collision_40x", Icon40x40 ) );
@@ -7696,6 +7703,10 @@ void FSlateEditorStyle::FStyle::SetupUMGEditorStyles()
 
 	Set("UMGEditor.DesignerMessageBorder", new BOX_BRUSH("/UMG/MessageRoundedBorder", FMargin(18.0f / 64.0f)));
 
+	Set("UMGEditor.OrientLandscape", new IMAGE_BRUSH("Icons/UMG/Icon_Landscape_v2", Icon16x16));
+	Set("UMGEditor.OrientPortrait", new IMAGE_BRUSH("Icons/UMG/Icon_Portrait_v2", Icon16x16));
+	Set("UMGEditor.Mirror", new IMAGE_BRUSH("Icons/UMG/Icon_Mirror_v3", Icon16x16));
+
 	Set("UMGEditor.ResizeResolutionFont", DEFAULT_FONT("Bold", 10));
 }
 
diff --git a/Engine/Source/Editor/EditorStyle/Public/Classes/EditorStyleSettings.h b/Engine/Source/Editor/EditorStyle/Public/Classes/EditorStyleSettings.h
index b15206f0d177..6c358b5436a4 100644
--- a/Engine/Source/Editor/EditorStyle/Public/Classes/EditorStyleSettings.h
+++ b/Engine/Source/Editor/EditorStyle/Public/Classes/EditorStyleSettings.h
@@ -7,25 +7,9 @@
 #include "UObject/ObjectMacros.h"
 #include "UObject/Object.h"
 #include "Styling/SlateBrush.h"
+#include "Rendering/RenderingCommon.h"
 #include "EditorStyleSettings.generated.h"
 
-/**
- * Enumerates color vision deficiency types.
- */
-UENUM()
-enum EColorVisionDeficiency
-{
-	CVD_NormalVision UMETA(DisplayName="Normal Vision"),
-	CVD_Deuteranomly UMETA(DisplayName="Deuteranomly (6% of males, 0.4% of females)"),
-	CVD_Deuteranopia UMETA(DisplayName="Deuteranopia (1% of males)"),
-	CVD_Protanomly UMETA(DisplayName="Protanomly (1% of males, 0.01% of females)"),
-	CVD_Protanopia UMETA(DisplayName="Protanopia (1% of males)"),
-	CVD_Tritanomaly UMETA(DisplayName="Tritanomaly (0.01% of males and females)"),
-	CVD_Tritanopia UMETA(DisplayName="Tritanopia (1% of males and females)"),
-	CVD_Achromatopsia UMETA(DisplayName="Achromatopsia (Extremely Rare)"),
-};
-
-
 UENUM()
 enum class EAssetEditorOpenLocation : uint8
 {
@@ -64,6 +48,21 @@ public:
 	UPROPERTY(EditAnywhere, Category=UserInterface, meta = (ConfigRestartRequired = true, DisplayName="Enable High DPI Support"))
 	bool bEnableHighDPIAwareness;
 
+	/** Applies a color vision deficiency filter to the entire editor */
+	UPROPERTY(EditAnywhere, config, Category = "Accessibility")
+	EColorVisionDeficiency ColorVisionDeficiencyPreviewType;
+
+	UPROPERTY(EditAnywhere, config, Category = "Accessibility", meta=(ClampMin=0, ClampMax=10))
+	int32 ColorVisionDeficiencySeverity;
+
+	/** Shifts the color spectrum to the visible range based on the current ColorVisionDeficiencyPreviewType */
+	UPROPERTY(EditAnywhere, config, Category = "Accessibility")
+	bool bColorVisionDeficiencyCorrection;
+
+	/** If you're correcting the color deficiency, you can use this to visualize what the correction looks like with the deficiency. */
+	UPROPERTY(EditAnywhere, config, Category = "Accessibility")
+	bool bColorVisionDeficiencyCorrectionPreviewWithDeficiency;
+
 	/** The color used to represent selection */
 	UPROPERTY(EditAnywhere, config, Category=Colors, meta=(DisplayName="Selection Color"))
 	FLinearColor SelectionColor;
@@ -80,10 +79,6 @@ public:
 	UPROPERTY(EditAnywhere, config, Category=Colors, meta=(DisplayName="Keyboard Focus Color"), AdvancedDisplay)
 	FLinearColor KeyboardFocusColor;
 
-	/** Applies a color vision deficiency filter to the entire editor */
-	UPROPERTY(EditAnywhere, config, Category=Colors)
-	TEnumAsByte<EColorVisionDeficiency> ColorVisionDeficiencyPreviewType;
-
 	/** The color used to tint the editor window backgrounds */
 	UPROPERTY(EditAnywhere, config, Category=Colors)
 	FLinearColor EditorWindowBackgroundColor;
diff --git a/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp b/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp
index fb865d4cc3cc..81372992d7e0 100644
--- a/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp
+++ b/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp
@@ -60,6 +60,8 @@ DEFINE_LOG_CATEGORY_STATIC(LogFoliage, Log, Warning);
 
 DECLARE_CYCLE_STAT(TEXT("Calculate Potential Instance"), STAT_FoliageCalculatePotentialInstance, STATGROUP_Foliage);
 DECLARE_CYCLE_STAT(TEXT("Add Instance Imp"), STAT_FoliageAddInstanceImp, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("Add Instance For Brush"), STAT_FoliageAddInstanceBrush, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("Remove Instance For Brush"), STAT_FoliageRemoveInstanceBrush, STATGROUP_Foliage);
 DECLARE_CYCLE_STAT(TEXT("Spawn Instance"), STAT_FoliageSpawnInstance, STATGROUP_Foliage);
 
 namespace VREd
@@ -539,6 +541,19 @@ void FEdModeFoliage::Exit()
 
 	FEditorDelegates::EndPIE.RemoveAll(this);
 
+	// Reenable foliage engine scalability
+	for (AInstancedFoliageActor* Actor : InstanceFoliageActorList)
+	{
+		for (auto& FoliageMesh : Actor->FoliageMeshes)
+		{
+			if (FoliageMesh.Value->Component != nullptr)
+			{
+				FoliageMesh.Value->Component->bCanEnableDensityScaling = true;
+				FoliageMesh.Value->Component->UpdateDensityScaling();
+			}
+		}
+	}
+
 	FoliageMeshList.Empty();
 
 	// Call base Exit method to ensure proper cleanup
@@ -1422,20 +1437,42 @@ void FEdModeFoliage::AddInstances(UWorld* InWorld, const TArray<FDesiredFoliageI
 	}
 }
 
-static void SpawnFoliageInstance(UWorld* InWorld, const UFoliageType* Settings, const FFoliageUISettings* UISettings, const FFoliageInstance& Instance, UActorComponent* BaseComponent)
+static void SpawnFoliageInstance(UWorld* InWorld, const UFoliageType* Settings, const FFoliageUISettings* UISettings, const TArray<FFoliageInstance>& PlacedInstances)
 {
 	SCOPE_CYCLE_COUNTER(STAT_FoliageSpawnInstance);
-	
-	// We always spawn instances in base component level
-	ULevel* TargetLevel = (UISettings != nullptr && UISettings->GetIsInSpawnInCurrentLevelMode()) ? InWorld->GetCurrentLevel() : BaseComponent->GetComponentLevel();
-	CurrentFoliageTraceBrushAffectedLevels.AddUnique(TargetLevel);
 
-	AInstancedFoliageActor* IFA = AInstancedFoliageActor::GetInstancedFoliageActorForLevel(TargetLevel, true);
+	TMap<ULevel*, TSet<const FFoliageInstance*>> PerLevelPlacedInstances;
 
-	FFoliageMeshInfo* MeshInfo;
-	UFoliageType* FoliageSettings = IFA->AddFoliageType(Settings, &MeshInfo);
+	if (UISettings != nullptr && UISettings->GetIsInSpawnInCurrentLevelMode())
+	{
+		TSet<const FFoliageInstance*>& LevelInstances = PerLevelPlacedInstances.FindOrAdd(InWorld->GetCurrentLevel());
 
-	MeshInfo->AddInstance(IFA, FoliageSettings, Instance, BaseComponent, false);
+		for (const FFoliageInstance& PlacedInstance : PlacedInstances)
+		{
+			LevelInstances.Add(&PlacedInstance);
+		}
+	}
+	else
+	{
+		for (const FFoliageInstance& PlacedInstance : PlacedInstances)
+		{
+			TSet<const FFoliageInstance*>& LevelInstances = PerLevelPlacedInstances.FindOrAdd(PlacedInstance.BaseComponent->GetComponentLevel());
+			LevelInstances.Add(&PlacedInstance);
+		}
+	}
+
+	for (const auto& PlacedLevelInstances : PerLevelPlacedInstances)
+	{
+		ULevel* TargetLevel = PlacedLevelInstances.Key;
+
+		CurrentFoliageTraceBrushAffectedLevels.AddUnique(TargetLevel);
+		AInstancedFoliageActor* IFA = AInstancedFoliageActor::GetInstancedFoliageActorForLevel(TargetLevel, true);
+
+		FFoliageMeshInfo* MeshInfo = nullptr;
+		UFoliageType* FoliageSettings = IFA->AddFoliageType(Settings, &MeshInfo);
+
+		MeshInfo->AddInstances(IFA, FoliageSettings, PlacedLevelInstances.Value, false);
+	}
 }
 
 void FEdModeFoliage::RebuildFoliageTree(const UFoliageType* Settings)
@@ -1504,22 +1541,34 @@ void FEdModeFoliage::AddInstancesImp(UWorld* InWorld, const UFoliageType* Settin
 		// for the number that should be in the brush region.
 		const int32 BucketOffset = (ExistingInstanceBuckets.Num() ? ExistingInstanceBuckets[BucketIdx] : 0);
 		int32 AdditionalInstances = FMath::Clamp<int32>(FMath::RoundToInt(BucketFraction * (float)(PotentialInstances.Num() - BucketOffset) * Pressure), 0, PotentialInstances.Num());
-		for (int32 Idx = 0; Idx < AdditionalInstances; Idx++)
-		{
-			FPotentialInstance& PotentialInstance = PotentialInstances[Idx];
-			FFoliageInstance Inst;
-			if (PotentialInstance.PlaceInstance(InWorld, Settings, Inst))
-			{
-				Inst.ProceduralGuid = PotentialInstance.DesiredInstance.ProceduralGuid;
 
-				SpawnFoliageInstance(InWorld, Settings, UISettings, Inst, PotentialInstance.HitComponent);
+		{
+			SCOPE_CYCLE_COUNTER(STAT_FoliageSpawnInstance);
+
+			TArray<FFoliageInstance> PlacedInstances;
+			PlacedInstances.Reserve(AdditionalInstances);
+
+			for (int32 Idx = 0; Idx < AdditionalInstances; Idx++)
+			{
+				FPotentialInstance& PotentialInstance = PotentialInstances[Idx];
+				FFoliageInstance Inst;
+				if (PotentialInstance.PlaceInstance(InWorld, Settings, Inst))
+				{
+					Inst.ProceduralGuid = PotentialInstance.DesiredInstance.ProceduralGuid;
+					Inst.BaseComponent = PotentialInstance.HitComponent;
+					PlacedInstances.Add(MoveTemp(Inst));
+				}
 			}
+
+			SpawnFoliageInstance(InWorld, Settings, UISettings, PlacedInstances);
 		}
 	}
 }
 
 void FEdModeFoliage::AddSingleInstanceForBrush(UWorld* InWorld, const UFoliageType* Settings, float Pressure)
 {
+	SCOPE_CYCLE_COUNTER(STAT_FoliageAddInstanceBrush);
+
 	TArray<FDesiredFoliageInstance> DesiredInstances;
 	DesiredInstances.Reserve(1);
 
@@ -1539,6 +1588,8 @@ void FEdModeFoliage::AddSingleInstanceForBrush(UWorld* InWorld, const UFoliageTy
 /** Add instances inside the brush to match DesiredInstanceCount */
 void FEdModeFoliage::AddInstancesForBrush(UWorld* InWorld, const UFoliageType* Settings, const FSphere& BrushSphere, int32 DesiredInstanceCount, float Pressure)
 {
+	SCOPE_CYCLE_COUNTER(STAT_FoliageAddInstanceBrush);
+
 	UWorld* World = GetWorld();
 	const bool bHasValidLandscapeLayers = LandscapeLayersValid(Settings);
 
@@ -1594,6 +1645,8 @@ void FEdModeFoliage::AddInstancesForBrush(UWorld* InWorld, const UFoliageType* S
 /** Remove instances inside the brush to match DesiredInstanceCount */
 void FEdModeFoliage::RemoveInstancesForBrush(UWorld* InWorld, const UFoliageType* Settings, const FSphere& BrushSphere, int32 DesiredInstanceCount, float Pressure)
 {
+	SCOPE_CYCLE_COUNTER(STAT_FoliageRemoveInstanceBrush);
+
 	for (FFoliageMeshInfoIterator It(InWorld, Settings); It; ++It)
 	{
 		FFoliageMeshInfo* MeshInfo = (*It);
@@ -1618,7 +1671,7 @@ void FEdModeFoliage::RemoveInstancesForBrush(UWorld* InWorld, const UFoliageType
 			// Remove InstancesToKeep random PotentialInstancesToRemove from the array to leave those PotentialInstancesToRemove behind, and delete all the rest
 			for (int32 i = 0; i < InstancesToKeep; i++)
 			{
-				PotentialInstancesToRemove.RemoveAtSwap(FMath::Rand() % PotentialInstancesToRemove.Num());
+				PotentialInstancesToRemove.RemoveAtSwap(FMath::Rand() % PotentialInstancesToRemove.Num(), 1, false);
 			}
 		}
 
@@ -1635,7 +1688,7 @@ void FEdModeFoliage::RemoveInstancesForBrush(UWorld* InWorld, const UFoliageType
 			if (Base && !GeometryFilterFunc(Base))
 			{
 				// Instance should not be removed, so remove it from the removal list.
-				PotentialInstancesToRemove.RemoveAtSwap(Idx);
+				PotentialInstancesToRemove.RemoveAtSwap(Idx, 1, false);
 				Idx--;
 			}
 		}
@@ -2642,14 +2695,24 @@ void FEdModeFoliage::ApplyPaintBucket_Add(AActor* Actor)
 			}
 		}
 
-		// Place instances
-		for (FPotentialInstance& PotentialInstance : InstancesToPlace)
 		{
-			FFoliageInstance Inst;
-			if (PotentialInstance.PlaceInstance(World, Settings, Inst))
+			SCOPE_CYCLE_COUNTER(STAT_FoliageSpawnInstance);
+
+			// Place instances
+			TArray<FFoliageInstance> PlacedInstances;
+			PlacedInstances.Reserve(InstancesToPlace.Num());
+
+			for (FPotentialInstance& PotentialInstance : InstancesToPlace)
 			{
-				SpawnFoliageInstance(World, Settings, &UISettings, Inst, PotentialInstance.HitComponent);
+				FFoliageInstance Inst;
+				if (PotentialInstance.PlaceInstance(World, Settings, Inst))
+				{
+					Inst.BaseComponent = PotentialInstance.HitComponent;
+					PlacedInstances.Add(MoveTemp(Inst));
+				}
 			}
+
+			SpawnFoliageInstance(World, Settings, &UISettings, PlacedInstances);
 		}
 
 		RebuildFoliageTree(Settings);
diff --git a/Engine/Source/Editor/GraphEditor/Public/KismetPins/SGraphPinNum.h b/Engine/Source/Editor/GraphEditor/Public/KismetPins/SGraphPinNum.h
index 650df2ffd35d..9bf47c592d7b 100644
--- a/Engine/Source/Editor/GraphEditor/Public/KismetPins/SGraphPinNum.h
+++ b/Engine/Source/Editor/GraphEditor/Public/KismetPins/SGraphPinNum.h
@@ -49,13 +49,13 @@ protected:
 	TOptional<NumericType> GetNumericValue() const
 	{
 		NumericType Num = NumericType();
-		Lex::FromString(Num, *GraphPinObj->GetDefaultAsString());
+		LexFromString(Num, *GraphPinObj->GetDefaultAsString());
 		return Num;
 	}
 
 	void SetNumericValue(NumericType InValue, ETextCommit::Type CommitType)
 	{
-		const FString TypeValueString = Lex::ToString(InValue);
+		const FString TypeValueString = LexToString(InValue);
 		if (GraphPinObj->GetDefaultAsString() != TypeValueString)
 		{
 			const FScopedTransaction Transaction(NSLOCTEXT("GraphEditor", "ChangeNumberPinValue", "Change Number Pin Value"));
diff --git a/Engine/Source/Editor/HardwareTargeting/Private/HardwareTargetingModule.cpp b/Engine/Source/Editor/HardwareTargeting/Private/HardwareTargetingModule.cpp
index 5f0c836529fe..f232fe670db6 100644
--- a/Engine/Source/Editor/HardwareTargeting/Private/HardwareTargetingModule.cpp
+++ b/Engine/Source/Editor/HardwareTargeting/Private/HardwareTargetingModule.cpp
@@ -245,12 +245,6 @@ void FHardwareTargetingModule::GatherSettings(FMetaSettingGatherer& Builder)
 		UE_META_SETTING_ENTRY(Builder, URendererSettings, DefaultFeatureAntiAliasing, bHighEndPC ? AAM_TemporalAA : AAM_None);
 	}
 
-	{
-		// Mobile uses touch
-		UE_META_SETTING_ENTRY(Builder, UInputSettings, bUseMouseForTouch, bAnyMobile);
-		//@TODO: Use bAlwaysShowTouchInterface (sorta implied by bUseMouseForTouch)?
-	}
-
 	{
 		// Tablets or phones are usually shared-screen multiplayer instead of split-screen
 		UE_META_SETTING_ENTRY(Builder, UGameMapsSettings, bUseSplitscreen, bAnyPC);
diff --git a/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.cpp b/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.cpp
index 79aeac8b212b..5ac910925a4a 100644
--- a/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.cpp
+++ b/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.cpp
@@ -13,7 +13,6 @@
 #include "Framework/MultiBox/MultiBoxExtender.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 #include "Widgets/Input/SButton.h"
-#include "Widgets/Input/SSlider.h"
 #include "Widgets/Images/SImage.h"
 #include "EditorStyleSet.h"
 #include "Engine/MeshMerging.h"
@@ -40,6 +39,16 @@
 #include "HierarchicalLODUtilitiesModule.h"
 #include "Widgets/Images/SImage.h"
 #include "DrawDebugHelpers.h"
+#include "Widgets/Layout/SUniformGridPanel.h"
+#include "EditorFontGlyphs.h"
+#include "Widgets/Layout/SScrollBorder.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Layout/SWrapBox.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Toolkits/AssetEditorManager.h"
+#include "Engine/HLODProxy.h"
 
 #define LOCTEXT_NAMESPACE "HLODOutliner"
 
@@ -51,8 +60,7 @@ namespace HLODOutliner
 		CurrentWorld = nullptr;
 		CurrentWorldSettings = nullptr;
 		ForcedLODLevel = -1;
-		ForcedLODSliderValue = 0.0f;
-		bForcedSliderValueUpdating = false;
+		bArrangeHorizontally = false;
 
 		FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
 		HierarchicalLODUtilities = Module.GetUtilities();
@@ -81,53 +89,45 @@ namespace HLODOutliner
 		MainContentPanel = SNew(SVerticalBox);
 		ChildSlot
 			[
-				SNew(SBorder)
-				.BorderImage(FCoreStyle::Get().GetBrush("ToolPanel.GroupBorder"))
+				SNew(SVerticalBox)
+				+ SVerticalBox::Slot()
+				.AutoHeight()
 				[
-					SNew(SOverlay)
-					+SOverlay::Slot()
+					SNew(SBorder)
+					.BorderImage(FEditorStyle::GetBrush("SettingsEditor.CheckoutWarningBorder"))
+					.BorderBackgroundColor(FColor(166,137,0))							
 					[
-						SNew(SVerticalBox)
-						+ SVerticalBox::Slot()
-						.AutoHeight()
+						SNew(SHorizontalBox)
+						.Visibility_Lambda([this]() -> EVisibility 
+						{
+							bool bVisible = !bNeedsRefresh && CurrentWorld.IsValid() && HierarchicalLODUtilities->IsWorldUsedForStreaming(CurrentWorld.Get());
+							return bVisible ? EVisibility::Visible : EVisibility::Collapsed;
+						})
+
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						.Padding(4.0f, 0.0f, 4.0f, 0.0f)
 						[
-							SNew(SBorder)
-							.BorderImage(FEditorStyle::GetBrush("SettingsEditor.CheckoutWarningBorder"))
-							.BorderBackgroundColor(FColor(166,137,0))							
-							[
-								SNew(SHorizontalBox)
-								.Visibility_Lambda([this]() -> EVisibility 
-								{
-									bool bVisible = !bNeedsRefresh && CurrentWorld && HierarchicalLODUtilities->IsWorldUsedForStreaming(CurrentWorld);
-									return bVisible ? EVisibility::Visible : EVisibility::Collapsed;
-								})
-
-								+ SHorizontalBox::Slot()
-								.VAlign(VAlign_Center)
-								.AutoWidth()
-								.Padding(4.0f, 0.0f, 4.0f, 0.0f)
-								[
-									SNew(SImage)
-									.Image(FEditorStyle::GetBrush("SettingsEditor.WarningIcon"))
-								]
-
-								+SHorizontalBox::Slot()
-								.VAlign(VAlign_Center)
-								.AutoWidth()
-								.Padding(4.0f, 0.0f, 0.0f, 0.0f)
-								[
-									SNew(STextBlock)
-									.Text(LOCTEXT("HLODDisabledSublevel", "Changing the HLOD settings is disabled for sub-levels"))
-								]
-							]
+							SNew(SImage)
+							.Image(FEditorStyle::GetBrush("SettingsEditor.WarningIcon"))
 						]
 
-						// Overlay slot for the main HLOD window area
-						+ SVerticalBox::Slot()
+						+SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						.Padding(4.0f, 0.0f, 0.0f, 0.0f)
 						[
-							MainContentPanel.ToSharedRef()
-						]							
-					]						
+							SNew(STextBlock)
+							.Text(LOCTEXT("HLODDisabledSublevel", "Changing the HLOD settings is disabled for sub-levels"))
+						]
+					]
+				]
+
+				// Overlay slot for the main HLOD window area
+				+ SVerticalBox::Slot()
+				[
+					MainContentPanel.ToSharedRef()
 				]
 			];
 
@@ -140,119 +140,351 @@ namespace HLODOutliner
 			.AutoHeight()
 			.Padding(0.0f, 0.0f, 0.0f, 4.0f)
 			[
-				CreateButtonWidgets()
+				SNew(SBorder)
+				.BorderImage(FCoreStyle::Get().GetBrush("ToolPanel.GroupBorder"))
+				.Padding(1.0f)
+				[
+					CreateMainButtonWidgets()
+				]
 			];
 
-		MainContentPanel->AddSlot()
-			.AutoHeight()
-			.Padding(0.0f, 0.0f, 0.0f, 4.0f)
-			[				
-				CreateForcedViewSlider()
+		TSharedRef<SHLODTree> TreeViewWidget = CreateTreeviewWidget();
+
+		TSharedRef<SWidget> ClusterWidgets = 
+			SNew(SBorder)
+			.BorderImage(FCoreStyle::Get().GetBrush("ToolPanel.GroupBorder"))
+			.Padding(1.0f)
+			[
+				SNew(SVerticalBox)
+				+SVerticalBox::Slot()
+				.Padding(2.0f)
+				.FillHeight(1.0f)
+				[
+					SNew(SScrollBorder, TreeViewWidget)
+					[
+						TreeViewWidget
+					]
+				]
+				+SVerticalBox::Slot()
+				.AutoHeight()
+				.HAlign(HAlign_Right)
+				[
+					CreateClusterButtonWidgets()
+				]
+			];
+
+		TSharedRef<SWidget> DetailsWidgets = 
+			SNew(SBorder)
+			.BorderImage(FCoreStyle::Get().GetBrush("ToolPanel.GroupBorder"))
+			.Padding(1.0f)
+			[
+				SNew(SVerticalBox)
+				+SVerticalBox::Slot()
+				.AutoHeight()
+				[
+					SNew(SBorder)
+					.BorderImage(FEditorStyle::GetBrush("SettingsEditor.CheckoutWarningBorder"))
+					.BorderBackgroundColor(FColor(166,137,0))							
+					[
+						SNew(SHorizontalBox)
+						.Visibility_Lambda([this]() -> EVisibility 
+						{
+							return GetDefault<UHierarchicalLODSettings>()->bForceSettingsInAllMaps ? EVisibility::Visible : EVisibility::Collapsed;
+						})
+
+						+SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						.Padding(4.0f, 0.0f, 4.0f, 0.0f)
+						[
+							SNew(SImage)
+							.Image(FEditorStyle::GetBrush("Icons.Warning"))
+						]
+
+						+SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.FillWidth(1.0f)
+						.Padding(4.0f, 0.0f, 0.0f, 0.0f)
+						[
+							SNew(STextBlock)
+							.AutoWrapText(true)
+							.Text(LOCTEXT("HLODForcedGlobally", "Project level HLOD Settings forced, changing the HLOD settings is disabled"))
+						]
+					]
+				]
+				+SVerticalBox::Slot()
+				.Padding(2.0f, 1.0f)
+				[
+					SettingsView.ToSharedRef()
+				]
 			];
 
 		MainContentPanel->AddSlot()
 			.FillHeight(1.0f)
 			[
-				SNew(SSplitter)
-				.Orientation(Orient_Vertical)
-				.Style(FEditorStyle::Get(), "ContentBrowser.Splitter")
-				+ SSplitter::Slot()
-				.Value(0.5)
+				SNew(SWidgetSwitcher)
+				.WidgetIndex(this, &SHLODOutliner::GetSpitterWidgetIndex)
+				+SWidgetSwitcher::Slot()
 				[
-					CreateTreeviewWidget()										
+					SNew(SSplitter)
+					.Orientation(Orient_Horizontal)
+					.Style(FEditorStyle::Get(), "ContentBrowser.Splitter")
+					+ SSplitter::Slot()
+					.Value(0.5)
+					[
+						ClusterWidgets
+					]
+					+SSplitter::Slot()
+					.Value(0.5)
+					[
+						DetailsWidgets
+					]
 				]
-				+ SSplitter::Slot()
-				.Value(0.5)
+				+SWidgetSwitcher::Slot()
 				[
-					SNew(SVerticalBox)
-					+ SVerticalBox::Slot()
-					.AutoHeight()
+					SNew(SSplitter)
+					.Orientation(Orient_Vertical)
+					.Style(FEditorStyle::Get(), "ContentBrowser.Splitter")
+					+ SSplitter::Slot()
+					.Value(0.5)
 					[
-						SNew(SBorder)
-						.BorderImage(FEditorStyle::GetBrush("SettingsEditor.CheckoutWarningBorder"))
-						.BorderBackgroundColor(FColor(166,137,0))							
-						[
-							SNew(SHorizontalBox)
-							.Visibility_Lambda([this]() -> EVisibility 
-							{
-								return GetDefault<UHierarchicalLODSettings>()->bForceSettingsInAllMaps ? EVisibility::Visible : EVisibility::Collapsed;
-							})
-
-							+ SHorizontalBox::Slot()
-							.VAlign(VAlign_Center)
-							.AutoWidth()
-							.Padding(4.0f, 0.0f, 4.0f, 0.0f)
-							[
-								SNew(SImage)
-								.Image(FEditorStyle::GetBrush("SettingsEditor.WarningIcon"))
-							]
-
-							+SHorizontalBox::Slot()
-							.VAlign(VAlign_Center)
-							.AutoWidth()
-							.Padding(4.0f, 0.0f, 0.0f, 0.0f)
-							[
-								SNew(STextBlock)
-								.Text(LOCTEXT("HLODForcedGlobally", "Project level HLOD Settings forced, changing the HLOD settings is disabled"))
-							]
-						]
+						ClusterWidgets
 					]
-					+ SVerticalBox::Slot()			
+					+SSplitter::Slot()
+					.Value(0.5)
 					[
-						SettingsView.ToSharedRef()
+						DetailsWidgets
 					]
-				]		
+				]
 			];
 		
+		MainContentPanel->AddSlot()
+			.AutoHeight()
+			.Padding(0.0f, 4.0f, 0.0f, 0.0f)
+			[
+				SNew(SBorder)
+				.BorderImage(FEditorStyle::GetBrush("SettingsEditor.CheckoutWarningBorder"))
+				.BorderBackgroundColor(FColor(166,137,0))
+				[
+					SNew(SHorizontalBox)
+					.Visibility_Lambda([this]() -> EVisibility 
+					{
+						return bCachedNeedsBuild ? EVisibility::Visible : EVisibility::Collapsed;
+					})
+
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.AutoWidth()
+					.Padding(4.0f, 0.0f, 4.0f, 0.0f)
+					[
+						SNew(SImage)
+						.Image(FEditorStyle::GetBrush("Icons.Warning"))
+					]
+
+					+SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.FillWidth(1.0f)
+					.Padding(4.0f, 0.0f, 4.0f, 0.0f)
+					[
+						SNew(STextBlock)
+						.AutoWrapText(true)
+						.Text(LOCTEXT("HLODNeedsBuild", "Actors represented in HLOD have changed, generate proxy meshes to update."))
+					]
+				]
+			];
+
 		RegisterDelegates();
 	}
 
-	TSharedRef<SWidget> SHLODOutliner::CreateButtonWidgets()
+	TSharedRef<SWidget> SHLODOutliner::CreateMainButtonWidgets()
+	{
+		return SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.Padding(FMargin(0.0f, 2.0f))
+			[
+				SNew(SWrapBox)
+				.UseAllottedWidth(true)
+
+				+ SWrapBox::Slot()
+				.Padding(FMargin(2.0f))
+				[
+					SNew(SButton)
+					.ButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+					.HAlign(HAlign_Center)
+					.OnClicked(this, &SHLODOutliner::HandleBuildLODActors)
+					.IsEnabled(this, &SHLODOutliner::CanBuildLODActors)
+					.ToolTipText(this, &SHLODOutliner::GetBuildLODActorsTooltipText)
+					[
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.11"))
+							.Text(FEditorFontGlyphs::Building)
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(4, 0, 0, 0)
+						[
+							SNew( STextBlock )
+							.TextStyle( FEditorStyle::Get(), "ContentBrowser.TopBar.Font" )
+							.Text(this, &SHLODOutliner::GetBuildText)
+						]
+					]
+				]
+
+				+ SWrapBox::Slot()
+				.Padding(FMargin(2.0f))
+				[
+					SNew(SButton)
+					.ButtonStyle(FEditorStyle::Get(), "FlatButton.Danger")
+					.HAlign(HAlign_Center)
+					.OnClicked(this, &SHLODOutliner::HandleForceBuildLODActors)
+					.ToolTipText(LOCTEXT("BuildClustersAndMeshesToolTip", "Re-generates clusters and then proxy meshes for each of the generated clusters in the level. This dirties the level."))
+					[
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.11"))
+							.Text(FEditorFontGlyphs::Recycle)
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(4, 0, 0, 0)
+						[
+							SNew( STextBlock )
+							.TextStyle( FEditorStyle::Get(), "ContentBrowser.TopBar.Font" )
+							.Text(this, &SHLODOutliner::GetForceBuildText)
+						]
+					]
+				]
+
+				+ SWrapBox::Slot()
+				.Padding(FMargin(2.0f))
+				[
+					SNew(SButton)
+					.ButtonStyle(FEditorStyle::Get(), "FlatButton")
+					.HAlign(HAlign_Center)
+					.OnClicked(this, &SHLODOutliner::HandleSaveAll)
+					.ToolTipText(LOCTEXT("SaveAllToolTip", "Saves all external HLOD data: Meshes, materials etc."))
+					[
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.11"))
+							.Text(FEditorFontGlyphs::Floppy_O)
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(4, 0, 0, 0)
+						[
+							SNew( STextBlock )
+							.TextStyle( FEditorStyle::Get(), "ContentBrowser.TopBar.Font" )
+							.Text(LOCTEXT("SaveAll", "Save All"))
+						]
+					]
+				]
+
+				+ SWrapBox::Slot()
+				.Padding(FMargin(2.0f))
+				[
+					CreateForcedViewWidget()
+				]
+			];
+	}
+
+	TSharedRef<SWidget> SHLODOutliner::CreateClusterButtonWidgets()
 	{
 		return SNew(SVerticalBox)
 			+ SVerticalBox::Slot()
-			.Padding(FMargin(0.0f, 5.0f))
+			.Padding(FMargin(0.0f, 2.0f))
 			[
 				SNew(SHorizontalBox)
+
 				+ SHorizontalBox::Slot()
-				.AutoWidth()
+				.Padding(FMargin(2.0f))
 				.VAlign(VAlign_Center)
-				.Padding(FMargin(5.0f, 0.0f))
+				.AutoWidth()
 				[
 					SNew(SButton)
+					.ButtonStyle(FEditorStyle::Get(), "FlatButton")
 					.HAlign(HAlign_Center)
-					.Text(LOCTEXT("GenerateClusters", "Generate Clusters"))
 					.OnClicked(this, &SHLODOutliner::HandlePreviewHLODs)
-					.ToolTipText(LOCTEXT("GenerateClusterToolTip", "Generates Clusters (but not proxy meshes) for Meshes in the Level"))
+					.ToolTipText(LOCTEXT("GenerateClusterToolTip", "Generates clusters (but not proxy meshes) for meshes in the level"))
+					[
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.11"))
+							.Text(FEditorFontGlyphs::List)
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(4, 0, 0, 0)
+						[
+							SNew( STextBlock )
+							.TextStyle( FEditorStyle::Get(), "ContentBrowser.TopBar.Font" )
+							.Text(LOCTEXT("GenerateClusters", "Generate Clusters"))
+						]
+					]
 				]
 
 				+ SHorizontalBox::Slot()
-				.AutoWidth()
+				.Padding(FMargin(2.0f))
 				.VAlign(VAlign_Center)
-				.Padding(FMargin(5.0f, 0.0f))
+				.AutoWidth()
 				[
 					SNew(SButton)
+					.ButtonStyle(FEditorStyle::Get(), "FlatButton")
 					.HAlign(HAlign_Center)
-					.Text(LOCTEXT("DeleteClusters", "Delete Clusters"))
 					.OnClicked(this, &SHLODOutliner::HandleDeleteHLODs)
-					.ToolTipText(LOCTEXT("DeleteClusterToolTip", "Deletes all Clusters in the Level"))
+					.IsEnabled(this, &SHLODOutliner::CanDeleteHLODs)
+					.ToolTipText(LOCTEXT("DeleteClusterToolTip", "Deletes all clusters in the level"))
+					[
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.11"))
+							.Text(FEditorFontGlyphs::Trash)
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(4, 0, 0, 0)
+						[
+							SNew( STextBlock )
+							.TextStyle( FEditorStyle::Get(), "ContentBrowser.TopBar.Font" )
+							.Text(LOCTEXT("DeleteClusters", "Delete Clusters"))
+						]
+					]
 				]
-
-				+ SHorizontalBox::Slot()
-				.AutoWidth()
-				.VAlign(VAlign_Center)
-				.Padding(FMargin(5.0f, 0.0f))
-				[
-					SNew(SButton)
-					.HAlign(HAlign_Center)
-					.Text(LOCTEXT("BuildMeshes", "Generate Proxy Meshes"))
-					.OnClicked(this, &SHLODOutliner::HandleBuildLODActors)
-					.ToolTipText(LOCTEXT("GenerateProxyMeshesToolTip", "Generates Proxy Mesh for each Clusters in the Level"))
-				]
-			];	
+			];
 	}
 
-	TSharedRef<SWidget> SHLODOutliner::CreateTreeviewWidget()
+	TSharedRef<SHLODOutliner::SHLODTree> SHLODOutliner::CreateTreeviewWidget()
 	{
 		return SAssignNew(TreeView, SHLODTree)
 			.ItemHeight(24.0f)
@@ -288,32 +520,22 @@ namespace HLODOutliner
 			);
 	}
 
-	TSharedRef<SWidget> SHLODOutliner::CreateForcedViewSlider()
+	TSharedRef<SWidget> SHLODOutliner::CreateForcedViewWidget()
 	{
-		return SNew(SVerticalBox)
-			+ SVerticalBox::Slot()
-			.Padding(FMargin(0.0f, 5.0f))
-			[
-				SNew(SHorizontalBox)
-				+ SHorizontalBox::Slot()
-				.Padding(FMargin(5.0f, 0.0f))
-				.FillWidth(0.5f)
+		return SNew(SComboButton)
+				.ContentPadding(FMargin(4.0f, 2.0f))
+				.ForegroundColor(FLinearColor::White)
+				.ButtonStyle(FEditorStyle::Get(), "FlatButton")
+				.ComboButtonStyle(FEditorStyle::Get(), "ToolbarComboButton")
+				.HasDownArrow(true)
+				.OnGetMenuContent(this, &SHLODOutliner::GetForceLevelMenuContent)
+				.ToolTipText(LOCTEXT("ForcedLODButtonTooltip", "Choose the LOD level to view."))
+				.ButtonContent()
 				[
 					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
 					.Text(this, &SHLODOutliner::HandleForceLevelText)
-				]
-				+ SHorizontalBox::Slot()
-				.Padding(FMargin(5.0f, 0.0f))
-				.FillWidth(0.5f)
-				[
-					SNew(SSlider)
-					.OnValueChanged(this, &SHLODOutliner::HandleForcedLevelSliderValueChanged)
-					.OnMouseCaptureBegin(this, &SHLODOutliner::HandleForcedLevelSliderCaptureBegin)
-					.OnMouseCaptureEnd(this, &SHLODOutliner::HandleForcedLevelSliderCaptureEnd)
-					.Orientation(Orient_Horizontal)
-					.Value(this, &SHLODOutliner::HandleForcedLevelSliderValue)
-				]
-			];
+				];
 	}
 
 	void SHLODOutliner::CreateSettingsView()
@@ -341,9 +563,7 @@ namespace HLODOutliner
 			/** Delegate to show all properties */
 			static bool IsPropertyVisible(const FPropertyAndParent& PropertyAndParent, bool bInShouldShowNonEditable)
 			{
-				if (PropertyAndParent.Property.GetFName() == GET_MEMBER_NAME_CHECKED(FMeshMergingSettings, SpecificLOD)
-					|| PropertyAndParent.Property.GetFName() == GET_MEMBER_NAME_CHECKED(FMeshMergingSettings, LODSelectionType)
-					|| PropertyAndParent.Property.GetFName() == GET_MEMBER_NAME_CHECKED(AWorldSettings, bEnableHierarchicalLODSystem))
+				if (PropertyAndParent.Property.GetFName() == GET_MEMBER_NAME_CHECKED(AWorldSettings, bEnableHierarchicalLODSystem))
 				{
 					return false;
 				}
@@ -390,9 +610,9 @@ namespace HLODOutliner
 		for (AActor* Actor : SelectedLODActors)
 		{
 			const FBox BoundingBox = Actor->GetComponentsBoundingBox(true);		
-			DrawCircle(CurrentWorld, BoundingBox.GetCenter(), FVector(1, 0, 0), FVector(0, 1, 0), FColor::Red, BoundingBox.GetExtent().Size(), 32);
-			DrawCircle(CurrentWorld, BoundingBox.GetCenter(), FVector(1, 0, 0), FVector(0, 0, 1), FColor::Red, BoundingBox.GetExtent().Size(), 32);
-			DrawCircle(CurrentWorld, BoundingBox.GetCenter(), FVector(0, 1, 0), FVector(0, 0, 1), FColor::Red, BoundingBox.GetExtent().Size(), 32);
+			DrawCircle(CurrentWorld.Get(), BoundingBox.GetCenter(), FVector(1, 0, 0), FVector(0, 1, 0), FColor::Red, BoundingBox.GetExtent().Size(), 32);
+			DrawCircle(CurrentWorld.Get(), BoundingBox.GetCenter(), FVector(1, 0, 0), FVector(0, 0, 1), FColor::Red, BoundingBox.GetExtent().Size(), 32);
+			DrawCircle(CurrentWorld.Get(), BoundingBox.GetCenter(), FVector(0, 1, 0), FVector(0, 0, 1), FColor::Red, BoundingBox.GetExtent().Size(), 32);
 		}
 
 		bool bChangeMade = false;
@@ -433,25 +653,7 @@ namespace HLODOutliner
 			TreeView->RequestTreeRefresh();		
 		}			
 
-		// Update the forced LOD level, as the slider for it is being dragged
-		if (bForcedSliderValueUpdating)
-		{
-			// Snap values
-			int32 SnappedValue = FMath::RoundToInt(FMath::Min(ForcedLODSliderValue, 1.0f) * (float)LODLevelTransitionScreenSizes.Num());
-			if (SnappedValue - 1 != ForcedLODLevel)
-			{
-				RestoreForcedLODLevel(ForcedLODLevel);
-				ForcedLODLevel = -1;
-				SetForcedLODLevel(SnappedValue - 1);
-
-				// Invalidate viewport to make sure HLODs are visible while dragging
-				if (GEditor)
-				{
-					GEditor->GetActiveViewport()->Invalidate();
-				}				
-			}
-		}
-
+		bArrangeHorizontally = AllottedGeometry.Size.X > AllottedGeometry.Size.Y;
 	}
 
 	void SHLODOutliner::OnMouseEnter(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
@@ -484,9 +686,50 @@ namespace HLODOutliner
 		FullRefresh();
 	}
 
+	int32 SHLODOutliner::GetSpitterWidgetIndex() const
+	{
+		// Split vertically or horizontally based on dimensions
+		return bArrangeHorizontally ? 0 : 1;
+	}
+
+	bool SHLODOutliner::HasHLODActors() const
+	{
+		for(const TArray<TWeakObjectPtr<ALODActor>>& LODActorArray : LODLevelActors)
+		{
+			for(TWeakObjectPtr<ALODActor> LODActor : LODActorArray)
+			{
+				if(LODActor.IsValid())
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	EActiveTimerReturnType SHLODOutliner::UpdateNeedsBuildFlagTimer(double InCurrentTime, float InDeltaTime)
+	{
+		bCachedNeedsBuild = (CurrentWorld.IsValid() && CurrentWorld->HierarchicalLODBuilder && CurrentWorld->HierarchicalLODBuilder->NeedsBuild());
+
+		return EActiveTimerReturnType::Continue;
+	}
+
+	FText SHLODOutliner::GetBuildText() const
+	{
+		return GetDefault<UHierarchicalLODSettings>()->bInvalidateHLODClusters ? LOCTEXT("BuildMeshes", "Generate Proxy Meshes") : LOCTEXT("RebuildMeshes", "Re-generate Proxy Meshes");
+	}
+
+	FText SHLODOutliner::GetForceBuildText() const
+	{
+		return HasHLODActors() ? LOCTEXT("RebuildAllClustersAndMeshes", "Rebuild All") : LOCTEXT("BuildClustersAndMeshes", "Build");
+	}
+
 	FReply SHLODOutliner::HandleBuildHLODs()
 	{
-		if (CurrentWorld)
+		CloseOpenAssetEditors();
+
+		if (CurrentWorld.IsValid())
 		{
 			CurrentWorld->HierarchicalLODBuilder->Build();
 		}
@@ -499,7 +742,7 @@ namespace HLODOutliner
 
 	FReply SHLODOutliner::HandleDeleteHLODs()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			LODLevelActors.Empty();
 			CurrentWorld->HierarchicalLODBuilder->ClearHLODs();
@@ -512,9 +755,14 @@ namespace HLODOutliner
 		return FReply::Handled();
 	}
 
+	bool SHLODOutliner::CanDeleteHLODs() const
+	{
+		return HasHLODActors();
+	}
+
 	FReply SHLODOutliner::HandlePreviewHLODs()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			CurrentWorld->HierarchicalLODBuilder->PreviewBuild();
 		}
@@ -527,7 +775,7 @@ namespace HLODOutliner
 
 	FReply SHLODOutliner::HandleDeletePreviewHLODs()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			CurrentWorld->HierarchicalLODBuilder->ClearPreviewBuild();
 		}
@@ -537,13 +785,68 @@ namespace HLODOutliner
 
 	FReply SHLODOutliner::HandleBuildLODActors()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
+		{
+			auto Build = [this](bool bForce = true)
+			{
+				CloseOpenAssetEditors();
+
+				DestroySelectionActors();
+			
+				CurrentWorld->HierarchicalLODBuilder->BuildMeshesForLODActors(bForce);
+				SetForcedLODLevel(ForcedLODLevel);	
+			};
+
+			// Check if we have any dirty and pop a toast saying no rebuild needed (with optional force build).
+			if(!CurrentWorld->HierarchicalLODBuilder->NeedsBuild(true))
+			{
+				FNotificationInfo Info(LOCTEXT("NoLODActorsNeedBuilding", "No LOD actors need building."));
+				Info.ButtonDetails.Add(
+					FNotificationButtonInfo(
+						LOCTEXT("ForceBuildButtonLabel", "Force Build"), 
+						LOCTEXT("ForceBuildButtonTooltip", "Force a rebuild of all LOD actors."), 
+						FSimpleDelegate::CreateLambda(Build), SNotificationItem::CS_None));
+				Info.ExpireDuration = 6.0f;
+				FSlateNotificationManager::Get().AddNotification(Info);
+			}
+			else
+			{
+				Build(false);
+			}
+		}
+
+		FMessageLog("HLODResults").Open();		
+
+		return FReply::Handled();
+	}
+
+	bool SHLODOutliner::CanBuildLODActors() const
+	{
+		return HasHLODActors();
+	}
+
+	FText SHLODOutliner::GetBuildLODActorsTooltipText() const
+	{
+		return bCachedNeedsBuild ? LOCTEXT("GenerateProxyMeshesToolTip", "Generates a proxy mesh for each cluster in the level. This only dirties the generated mesh.") : LOCTEXT("GenerateProxyMeshesNoBuildNeededToolTip", "Generates a proxy mesh for each cluster in the level. This only dirties the generated mesh.\nCurrently no actors are dirty, so no build is necessary.");
+	}
+
+	FReply SHLODOutliner::HandleForceBuildLODActors()
+	{
+		CloseOpenAssetEditors();
+
+		if (CurrentWorld.IsValid())
 		{
 			DestroySelectionActors();
-			CurrentWorld->HierarchicalLODBuilder->BuildMeshesForLODActors(false);
-			SetForcedLODLevel(ForcedLODLevel);
+			LODLevelActors.Empty();
+			CurrentWorld->HierarchicalLODBuilder->ClearHLODs();
+			CurrentWorld->HierarchicalLODBuilder->PreviewBuild();
+			CurrentWorld->HierarchicalLODBuilder->BuildMeshesForLODActors(true);
 		}
 
+		SelectedLODActors.Empty();
+		ResetLODLevelForcing();
+		FullRefresh();
+
 		FMessageLog("HLODResults").Open();		
 
 		return FReply::Handled();
@@ -556,6 +859,16 @@ namespace HLODOutliner
 		return FReply::Handled();
 	}
 
+	FReply SHLODOutliner::HandleSaveAll()
+	{
+		if (CurrentWorld.IsValid())
+		{		
+			CurrentWorld->HierarchicalLODBuilder->SaveMeshesForActors();
+		}
+
+		return FReply::Handled();
+	}
+
 	END_SLATE_FUNCTION_BUILD_OPTIMIZATION
 
 	void SHLODOutliner::RegisterDelegates()
@@ -578,13 +891,14 @@ namespace HLODOutliner
 		// HLOD related events
 		GEditor->OnHLODActorMoved().AddSP(this, &SHLODOutliner::OnHLODActorMovedEvent);
 		GEditor->OnHLODActorAdded().AddSP(this, &SHLODOutliner::OnHLODActorAddedEvent);
-		GEditor->OnHLODActorMarkedDirty().AddSP(this, &SHLODOutliner::OnHLODActorMarkedDirtyEvent);
 		GEditor->OnHLODTransitionScreenSizeChanged().AddSP(this, &SHLODOutliner::OnHLODTransitionScreenSizeChangedEvent);
 		GEditor->OnHLODLevelsArrayChanged().AddSP(this, &SHLODOutliner::OnHLODLevelsArrayChangedEvent);
 		GEditor->OnHLODActorRemovedFromCluster().AddSP(this, &SHLODOutliner::OnHLODActorRemovedFromClusterEvent);
 
 		// Register to update when an undo/redo operation has been called to update our list of actors
 		GEditor->RegisterForUndo(this);
+
+		RegisterActiveTimer(0.1f, FWidgetActiveTimerDelegate::CreateSP(this, &SHLODOutliner::UpdateNeedsBuildFlagTimer));
 	}
 
 	void SHLODOutliner::DeregisterDelegates()
@@ -610,7 +924,6 @@ namespace HLODOutliner
 		{
 			GEditor->OnHLODActorMoved().RemoveAll(this);
 			GEditor->OnHLODActorAdded().RemoveAll(this);
-			GEditor->OnHLODActorMarkedDirty().RemoveAll(this);
 			GEditor->OnHLODLevelsArrayChanged().RemoveAll(this);
 			GEditor->OnHLODActorRemovedFromCluster().RemoveAll(this);
 
@@ -621,7 +934,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::ForceViewLODActor()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			const FScopedTransaction Transaction(LOCTEXT("UndoAction_LODLevelForcedView", "LOD Level Forced View"));
 
@@ -653,45 +966,60 @@ namespace HLODOutliner
 		return (LODLevelTransitionScreenSizes.Num() > 0 && bHLODsBuild);
 	}
 
-	void SHLODOutliner::HandleForcedLevelSliderValueChanged(float NewValue)
-	{
-		ForcedLODSliderValue = NewValue;					
-	}
-
-	void SHLODOutliner::HandleForcedLevelSliderCaptureBegin()
-	{
-		bForcedSliderValueUpdating = true;
-	}
-
-	void SHLODOutliner::HandleForcedLevelSliderCaptureEnd()
-	{	
-		bForcedSliderValueUpdating = false;		
-		ForcedLODSliderValue = ((1.0f / (LODLevelTransitionScreenSizes.Num())) * (ForcedLODLevel + 1));
-	}
-
-	float SHLODOutliner::HandleForcedLevelSliderValue() const
-	{
-		return ForcedLODSliderValue;
-	}
-
 	FText SHLODOutliner::HandleForceLevelText() const
 	{
-		return FText::FromString(FString("Forced viewing level: ") + ( (ForcedLODLevel == -1) ? FString("None") : FString::FromInt(ForcedLODLevel)));
+		return ForcedLODLevel == -1 ? LOCTEXT("AutoLOD", "LOD Auto") : FText::Format(LOCTEXT("LODLevelFormat", "LOD {0}"), FText::AsNumber(ForcedLODLevel));
 	}
 
-	bool SHLODOutliner::CanHLODLevelBeForced(const uint32 LODLevel) const
+	TSharedRef<SWidget> SHLODOutliner::GetForceLevelMenuContent() const
 	{
-		return LODLevelBuildFlags[LODLevel];
+		FMenuBuilder MenuBuilder(true, nullptr);
+
+		// Auto LOD
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("AutoLOD", "LOD Auto"),
+			LOCTEXT("AutoLODTooltip", "Determine LOD level automatically"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SHLODOutliner::SetForcedLODLevel, -1), 
+				FCanExecuteAction(), 
+				FGetActionCheckState::CreateLambda([this](){ return ForcedLODLevel == -1 ? ECheckBoxState::Checked : ECheckBoxState::Unchecked; })),
+			NAME_None,
+			EUserInterfaceActionType::RadioButton);
+
+		if(LODLevelTransitionScreenSizes.Num() > 0)
+		{
+			MenuBuilder.BeginSection("ForcedLODLevels", LOCTEXT("ForcedLODLevel", "Forced LOD Level"));
+			{
+				// Entry for each LOD level
+				for(int32 LODIndex = 0; LODIndex < LODLevelTransitionScreenSizes.Num(); ++LODIndex)
+				{
+					MenuBuilder.AddMenuEntry(
+						FText::Format(LOCTEXT("LODLevelFormat", "LOD {0}"), FText::AsNumber(LODIndex)),
+						FText::Format(LOCTEXT("LODLevelTooltipFormat", "Force LOD to level {0}"), FText::AsNumber(LODIndex)),
+						FSlateIcon(),
+						FUIAction(
+							FExecuteAction::CreateSP(this, &SHLODOutliner::SetForcedLODLevel, LODIndex), 
+							FCanExecuteAction(), 
+							FGetActionCheckState::CreateLambda([this, LODIndex](){ return ForcedLODLevel == LODIndex ? ECheckBoxState::Checked : ECheckBoxState::Unchecked; })),
+						NAME_None,
+						EUserInterfaceActionType::RadioButton);
+				}
+			}
+			MenuBuilder.EndSection();
+		}
+
+		return MenuBuilder.MakeWidget();
 	}
 
-	void SHLODOutliner::RestoreForcedLODLevel(const uint32 LODLevel)
+	void SHLODOutliner::RestoreForcedLODLevel(int32 LODLevel)
 	{
 		if (LODLevel == -1)
 		{
 			return;
 		}
 
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			for (auto LevelActors : LODLevelActors)
 			{
@@ -710,15 +1038,17 @@ namespace HLODOutliner
 		}
 	}
 
-	void SHLODOutliner::SetForcedLODLevel(const uint32 LODLevel)
+	void SHLODOutliner::SetForcedLODLevel(int32 LODLevel)
 	{
+		RestoreForcedLODLevel(ForcedLODLevel);
+
 		if (LODLevel == -1)
 		{
 			ForcedLODLevel = LODLevel;
 			return;
 		}
 
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			auto Level = CurrentWorld->GetCurrentLevel();
 			for (auto LevelActors : LODLevelActors)
@@ -743,7 +1073,6 @@ namespace HLODOutliner
 	{
 		RestoreForcedLODLevel(ForcedLODLevel);
 		SetForcedLODLevel(-1);
-		ForcedLODSliderValue = 0.0f;
 	}
 
 	void SHLODOutliner::CreateHierarchicalVolumeForActor()
@@ -757,14 +1086,14 @@ namespace HLODOutliner
 			FLODActorItem* ActorItem = (FLODActorItem*)(SelectedItem.Get());
 			ALODActor* LODActor = ActorItem->LODActor.Get();
 
-			AHierarchicalLODVolume* Volume = HierarchicalLODUtilities->CreateVolumeForLODActor(LODActor, CurrentWorld);
+			AHierarchicalLODVolume* Volume = HierarchicalLODUtilities->CreateVolumeForLODActor(LODActor, CurrentWorld.Get());
 			check(Volume);
 		}		
 	}
 
 	void SHLODOutliner::BuildLODActor()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			// This call came from a context menu
 			auto SelectedItems = TreeView->GetSelectedItems();
@@ -781,7 +1110,7 @@ namespace HLODOutliner
 					if (Type == ITreeItem::HierarchicalLODLevel)
 					{
 						FLODLevelItem* LevelItem = (FLODLevelItem*)(Parent.Get());
-						if (ActorItem->LODActor->IsDirty())
+						if (!ActorItem->LODActor->IsBuilt(true))
 						{
 							CurrentWorld->HierarchicalLODBuilder->BuildMeshForLODActor(ActorItem->LODActor.Get(), LevelItem->LODLevelIndex);
 						}
@@ -799,8 +1128,10 @@ namespace HLODOutliner
 
 	void SHLODOutliner::RebuildLODActor()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
+			CloseOpenAssetEditors();
+
 			// This call came from a context menu
 			auto SelectedItems = TreeView->GetSelectedItems();
 
@@ -816,15 +1147,14 @@ namespace HLODOutliner
 					if (Type == ITreeItem::HierarchicalLODLevel)
 					{
 						FLODLevelItem* LevelItem = (FLODLevelItem*)(Parent.Get());
-						ActorItem->LODActor->SetIsDirty(true);
 						CurrentWorld->HierarchicalLODBuilder->BuildMeshForLODActor(ActorItem->LODActor.Get(), LevelItem->LODLevelIndex);
 					}
 				}
 			}
 
 			SetForcedLODLevel(ForcedLODLevel);
-				TreeView->RequestScrollIntoView(SelectedItems[0]);
-			}
+			TreeView->RequestScrollIntoView(SelectedItems[0]);
+		}
 			
 		// Show message log if there was an HLOD message
 		FMessageLog("HLODResults").Open();
@@ -832,7 +1162,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::SelectLODActor()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			// This call came from a context menu
 			auto SelectedItems = TreeView->GetSelectedItems();
@@ -881,7 +1211,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::RemoveStaticMeshActorFromCluster()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			const FScopedTransaction Transaction(LOCTEXT("UndoAction_RemoveStaticMeshActorFromCluster", "Removed Static Mesh Actor From Cluster"));
 
@@ -923,7 +1253,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::RemoveLODActorFromCluster()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			// This call came from a context menu
 			auto SelectedItems = TreeView->GetSelectedItems();
@@ -951,7 +1281,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::CreateClusterFromActors(const TArray<AActor*>& Actors, uint32 LODLevelIndex)
 	{
-		HierarchicalLODUtilities->CreateNewClusterFromActors(CurrentWorld, CurrentWorldSettings, Actors, LODLevelIndex);
+		HierarchicalLODUtilities->CreateNewClusterFromActors(CurrentWorld.Get(), CurrentWorldSettings, Actors, LODLevelIndex);
 	}
 
 	void SHLODOutliner::SelectContainedActors()
@@ -978,7 +1308,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::UpdateDrawDistancesForLODLevel(const uint32 LODLevelIndex)
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			// Loop over all (streaming-)levels in the world
 			for (ULevel* Level : CurrentWorld->GetLevels())
@@ -991,7 +1321,7 @@ namespace HLODOutliner
 					{
 						if (LODActor->LODLevel == LODLevelIndex + 1)
 						{
-							if (!LODActor->IsDirty() && LODActor->GetStaticMeshComponent())
+							if (LODActor->IsBuilt(true) && LODActor->GetStaticMeshComponent())
 							{
 								const float ScreenSize = LODActor->bOverrideTransitionScreenSize ? LODActor->TransitionScreenSize : LODLevelTransitionScreenSizes[LODLevelIndex];
 								LODActor->RecalculateDrawingDistance(ScreenSize);
@@ -1005,9 +1335,9 @@ namespace HLODOutliner
 
 	void SHLODOutliner::RemoveLODLevelActors(const int32 HLODLevelIndex)
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
-			HierarchicalLODUtilities->DeleteLODActorsInHLODLevel(CurrentWorld, HLODLevelIndex);
+			HierarchicalLODUtilities->DeleteLODActorsInHLODLevel(CurrentWorld.Get(), HLODLevelIndex);
 		}
 	}
 
@@ -1016,7 +1346,7 @@ namespace HLODOutliner
 		TSharedRef<ITableRow> Widget = SNew(SHLODWidgetItem, OwnerTable)
 			.TreeItemToVisualize(InTreeItem)
 			.Outliner(this)
-			.World(CurrentWorld);
+			.World(CurrentWorld.Get());
 
 		return Widget;
 	}
@@ -1122,7 +1452,7 @@ namespace HLODOutliner
 
 	TSharedPtr<SWidget> SHLODOutliner::OnOpenContextMenu()
 	{
-		if (!CurrentWorld)
+		if (!CurrentWorld.IsValid())
 		{
 			return nullptr;
 		}
@@ -1303,7 +1633,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::OnLevelActorsAdded(AActor* InActor)
 	{
-		if (InActor->GetWorld() == CurrentWorld && !InActor->IsA<AWorldSettings>())
+		if (InActor->GetWorld() == CurrentWorld.Get() && !InActor->IsA<AWorldSettings>())
 		{
 			FullRefresh();
 		}	
@@ -1314,21 +1644,20 @@ namespace HLODOutliner
 		if (!InActor->IsA<AWorldSettings>())
 		{			
 			// Remove InActor from LOD actor which contains it
-			for (TArray<ALODActor*>& ActorArray : LODLevelActors)
+			for (TArray<TWeakObjectPtr<ALODActor>>& ActorArray : LODLevelActors)
 			{				
-				for (ALODActor* Actor : ActorArray)
+				for (TWeakObjectPtr<ALODActor> Actor : ActorArray)
 				{
 					// Check if actor is not null due to Destroy Actor
-					if (Actor)
+					if (Actor.IsValid())
 					{
-						checkf(Actor->IsValidLowLevel(), TEXT("Invalid LODActor found in ActorArray"));
 						Actor->CleanSubActorArray();
 						const bool bRemovedSubActor = Actor->RemoveSubActor(InActor);
 
 						if (bRemovedSubActor && Actor->SubActors.Num() == 0)
 						{
-							HierarchicalLODUtilities->DestroyCluster(Actor);
-							Actor->GetWorld()->DestroyActor(Actor);						
+							HierarchicalLODUtilities->DestroyCluster(Actor.Get());
+							Actor->GetWorld()->DestroyActor(Actor.Get());
 						}
 					}
 				}
@@ -1339,18 +1668,21 @@ namespace HLODOutliner
 	
 	void SHLODOutliner::OnMapChange(uint32 MapFlags)
 	{
+		CurrentWorld = nullptr;
 		ResetCachedData();
 		FullRefresh();
 	}
 
 	void SHLODOutliner::OnNewCurrentLevel()
 	{	
+		CurrentWorld = nullptr;
 		ResetCachedData();
 		FullRefresh();
 	}
 
 	void SHLODOutliner::OnMapLoaded(const FString& Filename, bool bAsTemplate)
 	{
+		CurrentWorld = nullptr;
 		ResetCachedData();
 		FullRefresh();
 	}
@@ -1391,8 +1723,7 @@ namespace HLODOutliner
 		if (ParentActor)
 		{
 			ParentActor->Modify();
-			ParentActor->SetIsDirty(true);
-		}		
+		}
 	}
 
 	void SHLODOutliner::OnHLODActorAddedEvent(const AActor* InActor, const AActor* ParentActor)
@@ -1435,18 +1766,13 @@ namespace HLODOutliner
 			}
 
 			// Set build flags according to whether or not this LOD actor is dirty 
-			LODLevelBuildFlags[ParentLODActor->LODLevel - 1] &= !ParentLODActor->IsDirty();
+			LODLevelBuildFlags[ParentLODActor->LODLevel - 1] &= ParentLODActor->IsBuilt(true);
 		}
 	}
 
-	void SHLODOutliner::OnHLODActorMarkedDirtyEvent(ALODActor* InActor)
-	{	
-		bool check = true;
-	}
-
 	void SHLODOutliner::OnHLODTransitionScreenSizeChangedEvent()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{	
 			const TArray<struct FHierarchicalSimplification>& HierarchicalLODSetups = CurrentWorldSettings->GetHierarchicalLODSetup();
 			int32 MaxLODLevel = FMath::Min(HierarchicalLODSetups.Num(), LODLevelTransitionScreenSizes.Num());			
@@ -1463,7 +1789,7 @@ namespace HLODOutliner
 
 	void SHLODOutliner::OnHLODLevelsArrayChangedEvent()
 	{
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			FullRefresh();
 		}
@@ -1502,7 +1828,7 @@ namespace HLODOutliner
 			}
 		}	
 
-		if (CurrentWorld)
+		if (CurrentWorld.IsValid())
 		{
 			// Retrieve current world settings
 			CurrentWorldSettings = CurrentWorld->GetWorldSettings();
@@ -1513,7 +1839,7 @@ namespace HLODOutliner
 		}
 		
 
-		return (CurrentWorld != nullptr);
+		return (CurrentWorld.IsValid());
 	}
 
 	void SHLODOutliner::Populate()
@@ -1614,7 +1940,7 @@ namespace HLODOutliner
 								}
 
 								// Set build flags according to whether or not this LOD actor is dirty 
-								LODLevelBuildFlags[LODActor->LODLevel - 1] &= !LODActor->IsDirty();
+								LODLevelBuildFlags[LODActor->LODLevel - 1] &= LODActor->IsBuilt(true);
 								// Add the actor to it's HLOD levels array
 								LODLevelActors[LODActor->LODLevel - 1].Add(LODActor);
 							}
@@ -1764,14 +2090,43 @@ namespace HLODOutliner
 				bHLODEnabled = CurrentWorldSettings->bEnableHierarchicalLODSystem;
 			}
 
-			if (bHLODEnabled && CurrentWorld != nullptr)
+			if (bHLODEnabled && CurrentWorld.IsValid())
 			{
-				bHLODEnabled = !HierarchicalLODUtilities->IsWorldUsedForStreaming(CurrentWorld);
+				bHLODEnabled = !HierarchicalLODUtilities->IsWorldUsedForStreaming(CurrentWorld.Get());
 			}
 		}	
 
 		return bHLODEnabled;
 	}
-};
+
+	void SHLODOutliner::CloseOpenAssetEditors()
+	{
+		// Close any asset editors that are looking at our data
+		if(CurrentWorld.IsValid())
+		{
+			for (ULevel* Level : CurrentWorld->GetLevels())
+			{
+				for (AActor* Actor : Level->Actors)
+				{
+					if (ALODActor* LODActor = Cast<ALODActor>(Actor))
+					{
+						if(UHLODProxy* Proxy = LODActor->GetProxy())
+						{
+							if(UPackage* HLODPackage = Proxy->GetOutermost())
+							{
+								TArray<UObject*> Objects;
+								GetObjectsWithOuter(HLODPackage, Objects);
+								for(UObject* PackageObject : Objects)
+								{
+									FAssetEditorManager::Get().CloseAllEditorsForAsset(PackageObject);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.h b/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.h
index 5eff062a55d6..06a964488570 100644
--- a/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.h
+++ b/Engine/Source/Editor/HierarchicalLODOutliner/Private/HLODOutliner.h
@@ -77,13 +77,16 @@ namespace HLODOutliner
 		void Construct(const FArguments& InArgs);
 
 		/** Create the panel's forced HLOD level viewer */
-		TSharedRef<SWidget> CreateForcedViewSlider();
+		TSharedRef<SWidget> CreateForcedViewWidget();
 
-		/** Creates the panel's ButtonWidget rows */
-		TSharedRef<SWidget> CreateButtonWidgets();
+		/** Creates the panel's main button widget rows */
+		TSharedRef<SWidget> CreateMainButtonWidgets();
+
+		/** Creates the panel's button widgets for cluster operations */
+		TSharedRef<SWidget> CreateClusterButtonWidgets();
 
 		/** Creates the panel's Tree view widget*/
-		TSharedRef<SWidget> CreateTreeviewWidget();
+		TSharedRef<SHLODTree> CreateTreeviewWidget();
 		
 		/** Initializes and creates the settings view */
 		void CreateSettingsView();
@@ -103,13 +106,20 @@ namespace HLODOutliner
 		// End of FEditorUndoClient	
 
 		/** Button handlers */
+		FText GetForceBuildText() const;
+		FText GetBuildText() const;
 		FReply HandleBuildHLODs();
 		FReply HandleDeleteHLODs();
+		bool CanDeleteHLODs() const;
 		FReply HandlePreviewHLODs();
 		FReply HandleDeletePreviewHLODs();
 		FReply RetrieveActors();
 		FReply HandleBuildLODActors();
+		bool CanBuildLODActors() const;
+		FText GetBuildLODActorsTooltipText() const;
+		FReply HandleForceBuildLODActors();
 		FReply HandleForceRefresh();
+		FReply HandleSaveAll();
 		/** End button handlers */
 
 	private:
@@ -119,6 +129,9 @@ namespace HLODOutliner
 		/** De-registers all the callback delegates required for keeping the treeview sync */
 		void DeregisterDelegates();
 
+		/** Helper function used to determine whether there are any LOD actors present */
+		bool HasHLODActors() const;
+
 	protected:
 		/** Forces viewing the mesh of a Cluster (LODActor) */
 		void ForceViewLODActor();
@@ -130,26 +143,6 @@ namespace HLODOutliner
 		*/
 		bool AreHLODsBuild() const;
 		
-		/**
-		* Handles changes in slider value, maps/snaps it to the corresponding HLOD level
-		*
-		* @param NewValue - New value of the slider (0.0 - 1.0)
-		*/
-		void HandleForcedLevelSliderValueChanged(float NewValue);
-
-		/** Delegate for starting the forced HLOD level capture from the slider */
-		void HandleForcedLevelSliderCaptureBegin();
-		
-		/** Delegate for ending the forced HLOD level capture from the slider */
-		void HandleForcedLevelSliderCaptureEnd();
-
-		/**
-		* Returns the float sliding value corresponding to the currently forced HLOD level
-		*
-		* @return float
-		*/
-		float HandleForcedLevelSliderValue() const;
-
 		/**
 		* Returns FText with information about current forced HLOD level "None", "1" etc.
 		*
@@ -157,29 +150,24 @@ namespace HLODOutliner
 		*/
 		FText HandleForceLevelText() const;
 
-		/**
-		* Returns whether or not a HLOD level can be forced, this depends on whether or not all of the Clusters with LODLevel are non-dirty (have their meshes build)
-		*
-		* @param LODLevel - LOD level to check for
-		* @return bool
-		*/
-		bool CanHLODLevelBeForced(const uint32 LODLevel) const;
+		/** Build the forced level widget */
+		TSharedRef<SWidget> GetForceLevelMenuContent() const;
 
 		/**
 		* Restores the forced viewing state for the given LOD levle
 		*
 		* @param LODLevel - LOD level to force
 		*/
-		void RestoreForcedLODLevel(const uint32 LODLevel);
+		void RestoreForcedLODLevel(int32 LODLevel);
 
 		/**
 		* Forces LODActors within the given LODLevel to show their meshes (other levels hide theirs)
 		*
 		* @param LODLevel - LOD level to force
 		*/
-		void SetForcedLODLevel(const uint32 LODLevel);
+		void SetForcedLODLevel(int32 LODLevel);
 
-		/** Resets the forced LOD level and the Slider value */
+		/** Resets the forced LOD level */
 		void ResetLODLevelForcing();
 
 		/** Creates a Hierarchical LOD Volume for the given LODActorItem, volume bounds correspond to those of the LODActor's SubActors */
@@ -225,6 +213,9 @@ namespace HLODOutliner
 		* @param LODLevelIndex -		
 		*/
 		void RemoveLODLevelActors(const int32 HLODLevelIndex);
+
+		/** Handle splitting horizontally or vertically based on dimensions */
+		int32 GetSpitterWidgetIndex() const;
 	protected:
 		/** Tree view callbacks */
 
@@ -354,9 +345,6 @@ namespace HLODOutliner
 		/** Called when and HLODActor is added to the level */
 		void OnHLODActorAddedEvent(const AActor* InActor, const AActor* ParentActor);
 
-		/** Called when and HLODActor is added to the level */
-		void OnHLODActorMarkedDirtyEvent(ALODActor* InActor);	
-
 		/** Called when a DrawDistance value within WorldSettings changed */
 		void OnHLODTransitionScreenSizeChangedEvent();
 
@@ -422,12 +410,19 @@ namespace HLODOutliner
 		* @param InItem - Item to select
 		*/
 		void SelectItemInTree(FTreeItemPtr InItem);
+
+		/** Timer to update cached 'needs build' flag */
+		EActiveTimerReturnType UpdateNeedsBuildFlagTimer(double InCurrentTime, float InDeltaTime);
+
+		/** Closes asset editors showing HLOD data */
+		void CloseOpenAssetEditors();
+
 	private:
 		/** Whether or not we need to do a refresh of the Tree view*/
 		bool bNeedsRefresh;
 
 		/** World instance we are currently representing/mirroring in the panel */
-		UWorld* CurrentWorld;
+		TWeakObjectPtr<UWorld> CurrentWorld;
 
 		/** World settings found in CurrentWorld */
 		AWorldSettings* CurrentWorldSettings;
@@ -460,18 +455,20 @@ namespace HLODOutliner
 		/** Currently forced LOD level*/
 		int32 ForcedLODLevel;
 
-		/** Updating slider value for the Forced LOD level */
-		float ForcedLODSliderValue;
-		bool bForcedSliderValueUpdating;
-
 		/** Array with flags for each LOD level (whether or not all their Clusters/LODActors have their meshes built) */
 		TArray<bool> LODLevelBuildFlags;
 		/** Array of LODActors/Cluster per LOD level*/
-		TArray<TArray<ALODActor*>> LODLevelActors;
+		TArray<TArray<TWeakObjectPtr<ALODActor>>> LODLevelActors;
 		/** Array of TransitionScreenSizes for each LOD Level*/
 		TArray<float> LODLevelTransitionScreenSizes;
 
 		/** Cached pointer to HLOD utilities */
 		IHierarchicalLODUtilities* HierarchicalLODUtilities;
+
+		/** Cached flag to see if we need to generate meshes (any actors are dirty) */
+		bool bCachedNeedsBuild;
+
+		/** Whether to arrange the main UI horizontally or vertically */
+		bool bArrangeHorizontally;
 	};
 };
diff --git a/Engine/Source/Editor/HierarchicalLODOutliner/Private/LODActorItem.cpp b/Engine/Source/Editor/HierarchicalLODOutliner/Private/LODActorItem.cpp
index 308bcc4b15e0..e3e03b0bdf53 100644
--- a/Engine/Source/Editor/HierarchicalLODOutliner/Private/LODActorItem.cpp
+++ b/Engine/Source/Editor/HierarchicalLODOutliner/Private/LODActorItem.cpp
@@ -32,7 +32,7 @@ void HLODOutliner::FLODActorItem::GenerateContextMenu(FMenuBuilder& MenuBuilder,
 
 	MenuBuilder.AddMenuEntry(LOCTEXT("SelectContainedActors", "Select Contained Actors"), FText(), FSlateIcon(), FUIAction(FExecuteAction::CreateRaw(&Outliner, &SHLODOutliner::SelectContainedActors)));
 
-	if (LODActor->IsDirty())
+	if (!LODActor->IsBuilt())
 	{
 		MenuBuilder.AddMenuEntry(LOCTEXT("BuildLODActorMesh", "Build Proxy Mesh"), FText(), FSlateIcon(), FUIAction(FExecuteAction::CreateRaw(&Outliner, &SHLODOutliner::BuildLODActor)));
 	}
@@ -62,7 +62,7 @@ FString HLODOutliner::FLODActorItem::GetDisplayString() const
 {
 	if (ALODActor* ActorPtr = LODActor.Get())
 	{
-		FString DisplayName = ActorPtr->GetName() + (!ActorPtr->HasValidSubActors() ? FString(" (Not enough mesh components)") : ((ActorPtr->IsDirty()) ? FString(" (Not built)") : FString()));
+		FString DisplayName = ActorPtr->GetName() + (!ActorPtr->HasValidSubActors() ? FString(" (Not enough mesh components)") : ((!ActorPtr->IsBuilt()) ? FString(" (Not built)") : FString()));
 
 		// Temporary indication of custom settings
 		if (ActorPtr->bOverrideMaterialMergeSettings || ActorPtr->bOverrideScreenSize || ActorPtr->bOverrideTransitionScreenSize)
@@ -86,7 +86,7 @@ FSlateColor HLODOutliner::FLODActorItem::GetTint() const
 	ALODActor* LODActorPtr = LODActor.Get();
 	if (LODActorPtr)
 	{
-		return LODActorPtr->IsDirty() ? FSlateColor::UseSubduedForeground() : FLinearColor(1.0f, 1.0f, 1.0f);
+		return !LODActorPtr->IsBuilt() ? FSlateColor::UseSubduedForeground() : FLinearColor(1.0f, 1.0f, 1.0f);
 	}
 
 	return FLinearColor(1.0f, 1.0f, 1.0f);
diff --git a/Engine/Source/Editor/InternationalizationSettings/Private/InternationalizationSettingsModelDetails.cpp b/Engine/Source/Editor/InternationalizationSettings/Private/InternationalizationSettingsModelDetails.cpp
index 99a3e498685f..637317a69f61 100644
--- a/Engine/Source/Editor/InternationalizationSettings/Private/InternationalizationSettingsModelDetails.cpp
+++ b/Engine/Source/Editor/InternationalizationSettings/Private/InternationalizationSettingsModelDetails.cpp
@@ -37,8 +37,14 @@ namespace
 
 		FLocalizedCulturesFlyweight()
 		{
-			FInternationalization::Get().GetCulturesWithAvailableLocalization(FPaths::GetEditorLocalizationPaths(), LocalizedCulturesForEditor, true);
-			FInternationalization::Get().GetCulturesWithAvailableLocalization(FPaths::GetGameLocalizationPaths(), LocalizedCulturesForGame, true);
+			{
+				const TArray<FString> LocalizedCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ELocalizationLoadFlags::Editor);
+				LocalizedCulturesForEditor = FInternationalization::Get().GetAvailableCultures(LocalizedCultureNames, true);
+			}
+			{
+				const TArray<FString> LocalizedCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ELocalizationLoadFlags::Game);
+				LocalizedCulturesForGame = FInternationalization::Get().GetAvailableCultures(LocalizedCultureNames, true);
+			}
 		}
 	};
 
diff --git a/Engine/Source/Editor/IntroTutorials/Private/TutorialStateSettings.h b/Engine/Source/Editor/IntroTutorials/Private/TutorialStateSettings.h
index 906ca030eedd..d803a9f41744 100644
--- a/Engine/Source/Editor/IntroTutorials/Private/TutorialStateSettings.h
+++ b/Engine/Source/Editor/IntroTutorials/Private/TutorialStateSettings.h
@@ -17,8 +17,10 @@ struct FTutorialProgress
 	GENERATED_USTRUCT_BODY()
 
 	FTutorialProgress()
+		: CurrentStage(0)
+		, bUserDismissed(false)
+		, bUserDismissedThisSession(false)
 	{
-		bUserDismissedThisSession = false;
 	}
 
 	UPROPERTY()
diff --git a/Engine/Source/Editor/Kismet/Private/BlueprintCompilationManager.cpp b/Engine/Source/Editor/Kismet/Private/BlueprintCompilationManager.cpp
index 891ce6b30108..c3838b5ebb10 100644
--- a/Engine/Source/Editor/Kismet/Private/BlueprintCompilationManager.cpp
+++ b/Engine/Source/Editor/Kismet/Private/BlueprintCompilationManager.cpp
@@ -911,6 +911,7 @@ void FBlueprintCompilationManagerImpl::FlushCompilationQueueImpl(TArray<UObject*
 
 			if(BP->GeneratedClass)
 			{
+				BP->GeneratedClass->ClassFlags &= ~CLASS_ReplicationDataIsSetUp;
 				BP->GeneratedClass->SetUpRuntimeReplicationData();
 			}
 
diff --git a/Engine/Source/Editor/KismetCompiler/Private/AnimBlueprintCompiler.cpp b/Engine/Source/Editor/KismetCompiler/Private/AnimBlueprintCompiler.cpp
index b3e5ef365b4b..81dac0f3e9b2 100644
--- a/Engine/Source/Editor/KismetCompiler/Private/AnimBlueprintCompiler.cpp
+++ b/Engine/Source/Editor/KismetCompiler/Private/AnimBlueprintCompiler.cpp
@@ -2503,15 +2503,24 @@ void FAnimBlueprintCompilerContext::PostCompileDiagnostics()
 
 	if (!bIsDerivedAnimBlueprint)
 	{
+		bool bUsingCopyPoseFromMesh = false;
+
 		// Run thru all nodes and make sure they like the final results
 		for (auto NodeIt = AllocatedAnimNodeIndices.CreateConstIterator(); NodeIt; ++NodeIt)
 		{
 			if (UAnimGraphNode_Base* Node = NodeIt.Key())
 			{
 				Node->ValidateAnimNodePostCompile(MessageLog, NewAnimBlueprintClass, NodeIt.Value());
+				bUsingCopyPoseFromMesh = bUsingCopyPoseFromMesh || Node->UsingCopyPoseFromMesh();
 			}
 		}
 
+		// Update CDO
+		if (UAnimInstance* const DefaultAnimInstance = CastChecked<UAnimInstance>(NewAnimBlueprintClass->GetDefaultObject()))
+		{
+			DefaultAnimInstance->bUsingCopyPoseFromMesh = bUsingCopyPoseFromMesh;
+		}
+
 		//
 		bool bDisplayAnimDebug = false;
 		if (!Blueprint->bIsRegeneratingOnLoad)
diff --git a/Engine/Source/Editor/KismetCompiler/Private/KismetCompiler.cpp b/Engine/Source/Editor/KismetCompiler/Private/KismetCompiler.cpp
index 6e8e7e889653..8d78da8dee96 100644
--- a/Engine/Source/Editor/KismetCompiler/Private/KismetCompiler.cpp
+++ b/Engine/Source/Editor/KismetCompiler/Private/KismetCompiler.cpp
@@ -2310,6 +2310,7 @@ void FKismetCompilerContext::FinishCompilingClass(UClass* Class)
 
 	// Add in any other needed flags
 	Class->ClassFlags |= (CLASS_Parsed | CLASS_CompiledFromBlueprint);
+	Class->ClassFlags &= ~CLASS_ReplicationDataIsSetUp;
 
 	// Look for OnRep 
 	for( TFieldIterator<UProperty> It(Class, EFieldIteratorFlags::ExcludeSuper); It; ++It)
diff --git a/Engine/Source/Editor/KismetCompiler/Private/KismetCompilerVMBackend.cpp b/Engine/Source/Editor/KismetCompiler/Private/KismetCompilerVMBackend.cpp
index f7c60063e8b4..135ca62fc314 100644
--- a/Engine/Source/Editor/KismetCompiler/Private/KismetCompilerVMBackend.cpp
+++ b/Engine/Source/Editor/KismetCompiler/Private/KismetCompilerVMBackend.cpp
@@ -717,14 +717,14 @@ public:
 			else if (FLiteralTypeHelper::IsInt64(&Term->Type, CoerceProperty))
 			{
 				int64 Value = 0;
-				Lex::FromString(Value, *(Term->Name));
+				LexFromString(Value, *(Term->Name));
 				Writer << EX_Int64Const;
 				Writer << Value;
 			}
 			else if (FLiteralTypeHelper::IsUInt64(&Term->Type, CoerceProperty))
 			{
 				uint64 Value = 0;
-				Lex::FromString(Value, *(Term->Name));
+				LexFromString(Value, *(Term->Name));
 				Writer << EX_UInt64Const;
 				Writer << Value;
 			}
diff --git a/Engine/Source/Editor/LandscapeEditor/Private/LandscapeEdMode.cpp b/Engine/Source/Editor/LandscapeEditor/Private/LandscapeEdMode.cpp
index 620e3703718b..364b6c02c68d 100644
--- a/Engine/Source/Editor/LandscapeEditor/Private/LandscapeEdMode.cpp
+++ b/Engine/Source/Editor/LandscapeEditor/Private/LandscapeEdMode.cpp
@@ -160,6 +160,7 @@ namespace LandscapeTool
 	UMaterialInstance* CreateMaterialInstance(UMaterialInterface* BaseMaterial)
 	{
 		ULandscapeMaterialInstanceConstant* MaterialInstance = NewObject<ULandscapeMaterialInstanceConstant>(GetTransientPackage());
+		MaterialInstance->bEditorToolUsage = true;
 		MaterialInstance->SetParentEditorOnly(BaseMaterial);
 		MaterialInstance->PostEditChange();
 		return MaterialInstance;
@@ -192,6 +193,7 @@ FEdModeLandscape::FEdModeLandscape()
 	GLandscapeBlackTexture   = LoadObject<UTexture2D>(nullptr, TEXT("/Engine/EngineResources/Black.Black"));
 	GLandscapeLayerUsageMaterial = LandscapeTool::CreateMaterialInstance(LoadObject<UMaterial>(nullptr, TEXT("/Engine/EditorLandscapeResources/LandscapeLayerUsageMaterial.LandscapeLayerUsageMaterial")));
 
+
 	// Initialize modes
 	InitializeToolModes();
 	CurrentToolMode = nullptr;
diff --git a/Engine/Source/Editor/LevelEditor/Private/LevelEditor.cpp b/Engine/Source/Editor/LevelEditor/Private/LevelEditor.cpp
index f4b7f05a8e73..65e577c2c2da 100644
--- a/Engine/Source/Editor/LevelEditor/Private/LevelEditor.cpp
+++ b/Engine/Source/Editor/LevelEditor/Private/LevelEditor.cpp
@@ -79,7 +79,7 @@ public:
 		FFormatNamedArguments Args;
 
 		Args.Add(TEXT("ProjectNameWatermarkPrefix"), FText::FromString(ProjectNameWatermarkPrefix));
-		Args.Add(TEXT("Branch"), FEngineBuildSettings::IsPerforceBuild() ? FText::FromString(FApp::GetBranchName()) : FText::GetEmpty());
+		Args.Add(TEXT("Branch"), FEngineBuildSettings::IsPerforceBuild() ? FText::FromString(FEngineVersion::Current().GetBranch()) : FText::GetEmpty());
 		Args.Add(TEXT("GameName"), FText::FromString(FString(FApp::GetProjectName())));
 		Args.Add(TEXT("EngineVersion"), (GetDefault<UEditorPerProjectUserSettings>()->bDisplayEngineVersionInBadge) ? FText::FromString("(" + EngineVersionString + ")") : FText());
 
@@ -105,7 +105,7 @@ public:
 			TooltipVersionStr += TEXT(" Unreal Studio");
 		}
 		TooltipArgs.Add(TEXT("Version"), FText::FromString(TooltipVersionStr));
-		TooltipArgs.Add(TEXT("Branch"), FText::FromString(FApp::GetBranchName()));
+		TooltipArgs.Add(TEXT("Branch"), FText::FromString(FEngineVersion::Current().GetBranch()));
 		TooltipArgs.Add(TEXT("BuildConfiguration"), EBuildConfigurations::ToText(BuildConfig));
 		TooltipArgs.Add(TEXT("BuildDate"), FText::FromString(FApp::GetBuildDate()));
 		RightContentTooltip = FText::Format(NSLOCTEXT("UnrealEditor", "TitleBarRightContentTooltip", "Version: {Version}\nBranch: {Branch}\nBuild Configuration: {BuildConfiguration}\nBuild Date: {BuildDate}"), TooltipArgs);
diff --git a/Engine/Source/Editor/LevelEditor/Private/LevelEditorActions.cpp b/Engine/Source/Editor/LevelEditor/Private/LevelEditorActions.cpp
index a0a2bf0c609d..644a37675427 100644
--- a/Engine/Source/Editor/LevelEditor/Private/LevelEditorActions.cpp
+++ b/Engine/Source/Editor/LevelEditor/Private/LevelEditorActions.cpp
@@ -549,6 +549,8 @@ void FLevelEditorActionCallbacks::SetMaterialQualityLevel( EMaterialQualityLevel
 	static IConsoleVariable* MaterialQualityLevelVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.MaterialQualityLevel"));
 	MaterialQualityLevelVar->Set(NewQualityLevel, ECVF_SetByScalability);
 
+	GUnrealEd->OnSceneMaterialsModified();
+
 	GUnrealEd->RedrawAllViewports();
 }
 
@@ -607,6 +609,7 @@ void FLevelEditorActionCallbacks::SetFeatureLevelPreview(ERHIFeatureLevel::Type
 		}
 	}
 
+	GUnrealEd->OnSceneMaterialsModified();
 	GUnrealEd->RedrawAllViewports();
 }
 
diff --git a/Engine/Source/Editor/LevelEditor/Private/SLevelEditor.cpp b/Engine/Source/Editor/LevelEditor/Private/SLevelEditor.cpp
index b6dede13370a..7f802594d8b5 100644
--- a/Engine/Source/Editor/LevelEditor/Private/SLevelEditor.cpp
+++ b/Engine/Source/Editor/LevelEditor/Private/SLevelEditor.cpp
@@ -719,12 +719,7 @@ TSharedRef<SDockTab> SLevelEditor::SpawnLevelEditorTab( const FSpawnTabArgs& Arg
 			.Label(Label)
 			.ToolTip(IDocumentation::Get()->CreateToolTip(Label, nullptr, "Shared/Editor/HLOD", "main"))
 			[
-				SNew(SBorder)
-				.Padding(0)
-				.BorderImage(FEditorStyle::GetBrush("ToolPanel.GroupBorder"))				
-				[
-					HLODModule.CreateHLODOutlinerWidget()
-				]
+				HLODModule.CreateHLODOutlinerWidget()
 			];
 	}
 	else if( TabIdentifier == WorldBrowserHierarchyTab )
diff --git a/Engine/Source/Editor/LevelEditor/Private/SLevelViewport.cpp b/Engine/Source/Editor/LevelEditor/Private/SLevelViewport.cpp
index 1ac895ec5ecc..5a1e8f61eef9 100644
--- a/Engine/Source/Editor/LevelEditor/Private/SLevelViewport.cpp
+++ b/Engine/Source/Editor/LevelEditor/Private/SLevelViewport.cpp
@@ -3455,6 +3455,8 @@ void SLevelViewport::StartPlayInEditorSession(UGameViewportClient* PlayClient, c
 	// Focus will be set when the game viewport is registered
 	FSlateApplication::Get().ClearKeyboardFocus(EFocusCause::SetDirectly);
 
+	PlayClient->SetPlayInEditorUseMouseForTouch(GetDefault<ULevelEditorPlaySettings>()->UseMouseForTouch);
+
 	// Attach global play world actions widget to view port
 	ActiveViewport = MakeShareable( new FSceneViewport( PlayClient, ViewportWidget) );
 	ActiveViewport->SetPlayInEditorViewport( true );
diff --git a/Engine/Source/Editor/MainFrame/Private/MainFrameModule.cpp b/Engine/Source/Editor/MainFrame/Private/MainFrameModule.cpp
index fa51311dfcd3..606ca454ff2f 100644
--- a/Engine/Source/Editor/MainFrame/Private/MainFrameModule.cpp
+++ b/Engine/Source/Editor/MainFrame/Private/MainFrameModule.cpp
@@ -29,6 +29,7 @@
 #include "EngineAnalytics.h"
 #include "Editor/EditorPerformanceSettings.h"
 #include "HAL/PlatformApplicationMisc.h"
+#include "Toolkits/FConsoleCommandExecutor.h"
 
 DEFINE_LOG_CATEGORY(LogMainFrame);
 #define LOCTEXT_NAMESPACE "FMainFrameModule"
@@ -319,7 +320,9 @@ TSharedRef<SWidget> FMainFrameModule::MakeDeveloperTools() const
 
 
 	// We need the output log module in order to instantiate SConsoleInputBox widgets
-	const FOutputLogModule& OutputLogModule = FModuleManager::LoadModuleChecked< FOutputLogModule >(TEXT("OutputLog"));
+	FOutputLogModule& OutputLogModule = FModuleManager::LoadModuleChecked< FOutputLogModule >(TEXT("OutputLog"));
+	TSharedPtr<FConsoleCommandExecutor> CmdExec = MakeShared<FConsoleCommandExecutor>();
+	OutputLogModule.SetActiveCommandExecutor(StaticCastSharedPtr<IConsoleCommandExecutor>(CmdExec));
 
 	const FSlateFontInfo& SmallFixedFont = FEditorStyle::GetFontStyle(TEXT("MainFrame.DebugTools.SmallFont") );
 	const FSlateFontInfo& NormalFixedFont = FEditorStyle::GetFontStyle(TEXT("MainFrame.DebugTools.NormalFont") );
@@ -521,6 +524,13 @@ void FMainFrameModule::StartupModule( )
 
 void FMainFrameModule::ShutdownModule( )
 {
+	FOutputLogModule* OutputLogModule = FModuleManager::GetModulePtr< FOutputLogModule >(TEXT("OutputLog"));
+	if (OutputLogModule)
+	{
+		TSharedPtr<FConsoleCommandExecutor> CmdExec = MakeShared<FConsoleCommandExecutor>();
+		OutputLogModule->RemoveActiveCommandExecutor(CmdExec);
+	}
+
 	// Destroy the main frame window
 	TSharedPtr< SWindow > ParentWindow( GetParentWindow() );
 	if( ParentWindow.IsValid() )
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditingLibrary.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditingLibrary.cpp
index 2ca370c8434d..1300af5c3adc 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditingLibrary.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditingLibrary.cpp
@@ -632,6 +632,13 @@ void UMaterialEditingLibrary::UpdateMaterialFunction(UMaterialFunctionInterface*
 						{
 							CurrentMaterial->MaterialGraph->RebuildGraph();
 						}
+
+						// if this instance was opened in an editor notify the change
+						auto* MaterialEditor = (IMaterialEditor*)FAssetEditorManager::Get().FindEditorForAsset(CurrentMaterial, false);
+						if (MaterialEditor)
+						{
+							MaterialEditor->NotifyExternalMaterialChange();
+						}
 					}
 				}
 			}
@@ -649,6 +656,14 @@ void UMaterialEditingLibrary::UpdateMaterialFunction(UMaterialFunctionInterface*
 						UpdateContext.AddMaterialInstance(CurrentInstance);
 						CurrentInstance->PreEditChange(nullptr);
 						CurrentInstance->PostEditChange();
+
+						// if this instance was opened in an editor notify the change
+						auto* MaterialEditor = (IMaterialEditor*)FAssetEditorManager::Get().FindEditorForAsset(CurrentInstance, false);
+						if (MaterialEditor)
+						{
+							MaterialEditor->NotifyExternalMaterialChange();
+						}
+
 						break;
 					}
 				}
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.cpp
index 5cf9998a6761..7b05aebd5f69 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.cpp
@@ -1,7 +1,6 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "MaterialEditor.h"
-#include "Widgets/Text/STextBlock.h"
 #include "EngineGlobals.h"
 #include "Engine/SkeletalMesh.h"
 #include "AI/NavigationSystemBase.h"
@@ -121,6 +120,8 @@
 #include "Materials/MaterialExpressionBlendMaterialAttributes.h"
 #include "Materials/MaterialExpressionMaterialLayerOutput.h"
 
+#include "MaterialStats.h"
+
 #define LOCTEXT_NAMESPACE "MaterialEditor"
 
 DEFINE_LOG_CATEGORY_STATIC(LogMaterialEditor, Log, All);
@@ -134,9 +135,7 @@ static TAutoConsoleVariable<int32> CVarMaterialEdUseDevShaders(
 const FName FMaterialEditor::PreviewTabId( TEXT( "MaterialEditor_Preview" ) );
 const FName FMaterialEditor::GraphCanvasTabId( TEXT( "MaterialEditor_GraphCanvas" ) );
 const FName FMaterialEditor::PropertiesTabId( TEXT( "MaterialEditor_MaterialProperties" ) );
-const FName FMaterialEditor::HLSLCodeTabId( TEXT( "MaterialEditor_HLSLCode" ) );
 const FName FMaterialEditor::PaletteTabId( TEXT( "MaterialEditor_Palette" ) );
-const FName FMaterialEditor::StatsTabId( TEXT( "MaterialEditor_Stats" ) );
 const FName FMaterialEditor::FindTabId( TEXT( "MaterialEditor_Find" ) );
 const FName FMaterialEditor::PreviewSettingsTabId( TEXT ("MaterialEditor_PreviewSettings" ) );
 const FName FMaterialEditor::ParameterDefaultsTabId( TEXT ("MaterialEditor_ParameterDefaults" ) );
@@ -254,26 +253,17 @@ void FMaterialEditor::RegisterTabSpawners(const TSharedRef<class FTabManager>& I
 		.SetGroup( WorkspaceMenuCategoryRef )
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "Kismet.Tabs.Palette"));
 
-	InTabManager->RegisterTabSpawner( StatsTabId, FOnSpawnTab::CreateSP(this, &FMaterialEditor::SpawnTab_Stats) )
-		.SetDisplayName( LOCTEXT("StatsTab", "Stats") )
-		.SetGroup( WorkspaceMenuCategoryRef )
-		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.StatsViewer"));
-	
 	InTabManager->RegisterTabSpawner(FindTabId, FOnSpawnTab::CreateSP(this, &FMaterialEditor::SpawnTab_Find))
 		.SetDisplayName(LOCTEXT("FindTab", "Find Results"))
 		.SetGroup( WorkspaceMenuCategoryRef )
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "Kismet.Tabs.FindResults"));
 
-	InTabManager->RegisterTabSpawner( HLSLCodeTabId, FOnSpawnTab::CreateSP(this, &FMaterialEditor::SpawnTab_HLSLCode) )
-		.SetDisplayName( LOCTEXT("HLSLCodeTab", "HLSL Code") )
-		.SetGroup( WorkspaceMenuCategoryRef )
-		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "MaterialEditor.Tabs.HLSLCode"));
-
 	InTabManager->RegisterTabSpawner(PreviewSettingsTabId, FOnSpawnTab::CreateSP(this, &FMaterialEditor::SpawnTab_PreviewSettings))
 		.SetDisplayName( LOCTEXT("PreviewSceneSettingsTab", "Preview Scene Settings") )
 		.SetGroup( WorkspaceMenuCategoryRef )
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Details"));
 
+
 	InTabManager->RegisterTabSpawner(ParameterDefaultsTabId, FOnSpawnTab::CreateSP(this, &FMaterialEditor::SpawnTab_ParameterDefaults))
 		.SetDisplayName(LOCTEXT("ParameterDefaultsTab", "Parameter Defaults"))
 		.SetGroup(WorkspaceMenuCategoryRef)
@@ -288,6 +278,8 @@ void FMaterialEditor::RegisterTabSpawners(const TSharedRef<class FTabManager>& I
 			.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Layers"));
 	}
 
+	MaterialStatsManager->RegisterTabs();
+
 	OnRegisterTabSpawners().Broadcast(InTabManager);
 }
 
@@ -300,13 +292,13 @@ void FMaterialEditor::UnregisterTabSpawners(const TSharedRef<class FTabManager>&
 	InTabManager->UnregisterTabSpawner( GraphCanvasTabId );
 	InTabManager->UnregisterTabSpawner( PropertiesTabId );
 	InTabManager->UnregisterTabSpawner( PaletteTabId );
-	InTabManager->UnregisterTabSpawner( StatsTabId );
 	InTabManager->UnregisterTabSpawner( FindTabId );
-	InTabManager->UnregisterTabSpawner( HLSLCodeTabId );
 	InTabManager->UnregisterTabSpawner( PreviewSettingsTabId );
 	InTabManager->UnregisterTabSpawner( ParameterDefaultsTabId );
 	InTabManager->UnregisterTabSpawner( LayerPropertiesTabId );
 
+	MaterialStatsManager->UnregisterTabs();
+
 	OnUnregisterTabSpawners().Broadcast(InTabManager);
 }
 
@@ -386,6 +378,9 @@ void FMaterialEditor::InitMaterialEditor( const EToolkitMode::Type Mode, const T
 
 	GEditor->RegisterForUndo(this);
 
+	MaterialStatsManager = FMaterialStatsUtils::CreateMaterialStats(this);
+	MaterialStatsManager->SetMaterialDisplayName(OriginalMaterial->GetName());
+
 	if (!Material->MaterialGraph)
 	{
 		Material->MaterialGraph = CastChecked<UMaterialGraph>(FBlueprintEditorUtils::CreateNewGraph(Material, NAME_None, UMaterialGraph::StaticClass(), UMaterialGraphSchema::StaticClass()));
@@ -481,10 +476,10 @@ void FMaterialEditor::InitMaterialEditor( const EToolkitMode::Type Mode, const T
 				(
 					FTabManager::NewStack()
 					->SetSizeCoefficient( 0.20f )
-					->AddTab( StatsTabId, ETabState::ClosedTab )
+						->AddTab(FMaterialStats::GetGridStatsTabName(), ETabState::ClosedTab)
+						->AddTab(FMaterialStats::GetGridOldStatsTabName(), ETabState::ClosedTab)
 					->AddTab( FindTabId, ETabState::ClosedTab )
 				)
-				
 			)
 			->Split
 			(
@@ -685,7 +680,7 @@ void FMaterialEditor::InitMaterialEditor( const EToolkitMode::Type Mode, const T
 	// Store the name of this material (for the tutorial widget meta)
 	if (OriginalMaterial != nullptr)
 	{
-		Material->MaterialGraph->OriginalMaterialFullName = OriginalMaterial->GetName();
+	Material->MaterialGraph->OriginalMaterialFullName = OriginalMaterial->GetName();
 	}
 	Material->MaterialGraph->RebuildGraph();
 	RecenterEditor();
@@ -724,9 +719,7 @@ FMaterialEditor::FMaterialEditor()
 	, bHideUnusedConnectors(false)
 	, bLivePreview(true)
 	, bIsRealtime(false)
-	, bShowStats(true)
 	, bShowBuiltinStats(false)
-	, bShowMobileStats(false)
 	, MenuExtensibilityManager(new FExtensibilityManager)
 	, ToolBarExtensibilityManager(new FExtensibilityManager)
 	, MaterialEditorInstance(NULL)
@@ -948,41 +941,6 @@ void FMaterialEditor::CreateInternalWidgets()
 	FindResults =
 		SNew(SFindInMaterial, SharedThis(this));
 
-	CodeViewUtility =
-		SNew(SVerticalBox)
-		// Copy Button
-		+SVerticalBox::Slot()
-		.AutoHeight()
-		[
-			SNew( SHorizontalBox )
-			+ SHorizontalBox::Slot()
-			.AutoWidth()
-			.Padding( 2.0f, 0.0f )
-			.VAlign(VAlign_Center)
-			.HAlign(HAlign_Left)
-			[
-				SNew(SButton)
-				.Text( LOCTEXT("CopyHLSLButton", "Copy") )
-				.ToolTipText( LOCTEXT("CopyHLSLButtonToolTip", "Copies all HLSL code to the clipboard.") )
-				.ContentPadding(3)
-				.OnClicked(this, &FMaterialEditor::CopyCodeViewTextToClipboard)
-			]
-		]
-		// Separator
-		+SVerticalBox::Slot()
-		.FillHeight(1)
-		[
-			SNew(SSeparator)
-		];
-
-	CodeView =
-		SNew(SScrollBox)
-		+SScrollBox::Slot() .Padding(5)
-		[
-			SNew(STextBlock)
-			.Text(this, &FMaterialEditor::GetCodeViewText)
-		];
-
 	RegenerateCodeView();
 }
 END_SLATE_FUNCTION_BUILD_OPTIMIZATION
@@ -1060,6 +1018,7 @@ FLinearColor FMaterialEditor::GetWorldCentricTabColorScale() const
 void FMaterialEditor::Tick( float InDeltaTime )
 {
 	UpdateMaterialInfoList();
+	UpdateMaterialinfoList_Old();
 	UpdateGraphNodeStates();
 }
 
@@ -1113,7 +1072,7 @@ void FMaterialEditor::ExtendToolbar()
 				ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().ToggleRealtimeExpressions);
 				ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().AlwaysRefreshAllPreviews);
 				ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().ToggleMaterialStats);
-				ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().ToggleMobileStats);
+				ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().TogglePlatformStats);
 			}
 			ToolbarBuilder.EndSection();
 		}
@@ -1174,13 +1133,8 @@ void FMaterialEditor::GetSaveableObjects(TArray<UObject*>& OutObjects) const
 void FMaterialEditor::SaveAsset_Execute()
 {
 	UE_LOG(LogMaterialEditor, Log, TEXT("Saving and Compiling material %s"), *GetEditingObjects()[0]->GetName());
-	
-	bool bUpdateSucceeded = true;
 
-	if (bMaterialDirty)
-	{
-		bUpdateSucceeded = UpdateOriginalMaterial();
-	}
+	const bool bUpdateSucceeded = (bMaterialDirty ? UpdateOriginalMaterial() : true);
 
 	if (bUpdateSucceeded)
 	{
@@ -1192,12 +1146,7 @@ void FMaterialEditor::SaveAssetAs_Execute()
 {
 	UE_LOG(LogMaterialEditor, Log, TEXT("Saving and Compiling material %s"), *GetEditingObjects()[0]->GetName());
 
-	bool bUpdateSucceeded = true;
-
-	if (bMaterialDirty)
-	{
-		bUpdateSucceeded = UpdateOriginalMaterial();
-	}
+	const bool bUpdateSucceeded = (bMaterialDirty ? UpdateOriginalMaterial() : true);
 
 	if (bUpdateSucceeded)
 	{
@@ -1262,18 +1211,17 @@ void FMaterialEditor::DrawMaterialInfoStrings(
 	if (bDrawInstructions)
 	{
 		// Display any errors and messages in the upper left corner of the viewport.
-		TArray<FString> Descriptions;
-		TArray<int32> InstructionCounts;
-		MaterialResource->GetRepresentativeInstructionCounts(Descriptions, InstructionCounts);
+		TArray<FMaterialStatsUtils::FShaderInstructionsInfo> Descriptions;
+		FMaterialStatsUtils::GetRepresentativeInstructionCounts(Descriptions, MaterialResource);
 
 		for (int32 InstructionIndex = 0; InstructionIndex < Descriptions.Num(); InstructionIndex++)
 		{
-			FString InstructionCountString = FString::Printf(TEXT("%s: %u instructions"),*Descriptions[InstructionIndex],InstructionCounts[InstructionIndex]);
+			FString InstructionCountString = FString::Printf(TEXT("%s: %u instructions"), *Descriptions[InstructionIndex].ShaderDescription, Descriptions[InstructionIndex].InstructionCount);
 			Canvas->DrawShadowedString(5, DrawPositionY, *InstructionCountString, FontToUse, FLinearColor(1, 1, 0));
 			DrawPositionY += SpacingBetweenLines;
 		}
 
-		// Display the number of samplers used by the material.
+		// Display the number of texture samplers and samplers used by the material.
 		const int32 SamplersUsed = MaterialResource->GetSamplerUsage();
 
 		if (SamplersUsed >= 0)
@@ -1290,6 +1238,21 @@ void FMaterialEditor::DrawMaterialInfoStrings(
 			DrawPositionY += SpacingBetweenLines;
 		}
 
+		uint32 NumVSTextureSamples = 0, NumPSTextureSamples = 0;
+		MaterialResource->GetEstimatedNumTextureSamples(NumVSTextureSamples, NumPSTextureSamples);
+
+		if (NumVSTextureSamples > 0 || NumPSTextureSamples > 0)
+		{
+			Canvas->DrawShadowedString(
+				5,
+				DrawPositionY,
+				*FString::Printf(TEXT("Texture Lookups (Est.): VS(%u), PS(%u)"), NumVSTextureSamples, NumPSTextureSamples),
+				FontToUse,
+				FLinearColor(1,1,0)
+				);
+			DrawPositionY += SpacingBetweenLines;
+		}
+
 		if (bGeneratedNewShaders)
 		{
 			int32 NumShaders = 0;
@@ -1469,12 +1432,6 @@ void FMaterialEditor::LoadEditorSettings()
 		}
 	}
 
-	if (EditorOptions->bShowMobileStats)
-	{
-		ToggleMobileStats();
-	}
-
-
 	// Primitive type
 	int32 PrimType;
 	if(GConfig->GetInt(TEXT("MaterialEditor"), TEXT("PrimType"), PrimType, GEditorPerProjectIni))
@@ -1492,7 +1449,6 @@ void FMaterialEditor::SaveEditorSettings()
 	{
 		EditorOptions->bShowGrid					= PreviewViewport->IsTogglePreviewGridChecked();
 		EditorOptions->bRealtimeMaterialViewport	= PreviewViewport->IsRealtime();
-		EditorOptions->bShowMobileStats				= bShowMobileStats;
 		EditorOptions->bHideUnusedConnectors		= !IsOnShowConnectorsChecked();
 		EditorOptions->bAlwaysRefreshAllPreviews	= IsOnAlwaysRefreshAllPreviews();
 		EditorOptions->bRealtimeExpressionViewport	= IsToggleRealTimeExpressionsChecked();
@@ -1503,68 +1459,15 @@ void FMaterialEditor::SaveEditorSettings()
 	GConfig->SetInt(TEXT("MaterialEditor"), TEXT("PrimType"), PreviewViewport->PreviewPrimType, GEditorPerProjectIni);
 }
 
-FText FMaterialEditor::GetCodeViewText() const
-{
-	return FText::FromString(HLSLCode);
-}
-
-FReply FMaterialEditor::CopyCodeViewTextToClipboard()
-{
-	FPlatformApplicationMisc::ClipboardCopy(*HLSLCode);
-	return FReply::Handled();
-}
-
 void FMaterialEditor::RegenerateCodeView(bool bForce)
 {
-#define MARKTAG TEXT("/*MARK_")
-#define MARKTAGLEN 7
-
-	HLSLCode = TEXT("");
-
-	if (!CodeTab.IsValid() || (!bLivePreview && !bForce))
+	if (!bLivePreview && !bForce)
 	{
 		//When bLivePreview is false then the source can be out of date. 
 		return;
 	}
 
-	FString MarkupSource;
-	if (Material->GetMaterialResource(GMaxRHIFeatureLevel)->GetMaterialExpressionSource(MarkupSource))
-	{
-		// Remove line-feeds and leave just CRs so the character counts match the selection ranges.
-		MarkupSource.ReplaceInline(TEXT("\r"), TEXT(""));
-
-		// Improve formatting: Convert tab to 4 spaces since STextBlock (currently) doesn't show tab characters
-		MarkupSource.ReplaceInline(TEXT("\t"), TEXT("    "));
-
-		// Extract highlight ranges from markup tags
-
-		// Make a copy so we can insert null terminators.
-		TCHAR* MarkupSourceCopy = new TCHAR[MarkupSource.Len()+1];
-		FCString::Strcpy(MarkupSourceCopy, MarkupSource.Len()+1, *MarkupSource);
-
-		TCHAR* Ptr = MarkupSourceCopy;
-		while( Ptr && *Ptr != '\0' )
-		{
-			TCHAR* NextTag = FCString::Strstr( Ptr, MARKTAG );
-			if( !NextTag )
-			{
-				// No more tags, so we're done!
-				HLSLCode += Ptr;
-				break;
-			}
-
-			// Copy the text up to the tag.
-			*NextTag = '\0';
-			HLSLCode += Ptr;
-
-			// Advance past the markup tag to see what type it is (beginning or end)
-			NextTag += MARKTAGLEN;
-			int32 TagNumber = FCString::Atoi(NextTag+1);
-			Ptr = FCString::Strstr(NextTag, TEXT("*/")) + 2;
-		}
-
-		delete[] MarkupSourceCopy;
-	}
+	MaterialStatsManager->SignalMaterialChanged();
 }
 
 void FMaterialEditor::UpdatePreviewMaterial( bool bForce )
@@ -1625,6 +1528,10 @@ void FMaterialEditor::UpdatePreviewMaterial( bool bForce )
 			MaterialLayersFunctionsInstance->Refresh();
 		}
 	}
+
+	MaterialStatsManager->SetMaterial(bStatsFromPreviewMaterial ? Material : OriginalMaterial);
+	MaterialStatsManager->SignalMaterialChanged();
+
 	// Reregister all components that use the preview material, since UMaterial::PEC does not reregister components using a bIsPreviewMaterial=true material
 	RefreshPreviewViewport();
 }
@@ -1655,15 +1562,15 @@ bool FMaterialEditor::UpdateOriginalMaterial()
 			}
 			else
 			{
-				FSuppressableWarningDialog::FSetupInfo Info(
-					FText::Format(NSLOCTEXT("UnrealEd", "Warning_CompileErrorsInMaterial", "The current material has compilation errors, so it will not render correctly in feature level {0}.\nAre you sure you wish to continue?"), FText::FromString(*FeatureLevelName)),
-					NSLOCTEXT("UnrealEd", "Warning_CompileErrorsInMaterial_Title", "Warning: Compilation errors in this Material"), "Warning_CompileErrorsInMaterial");
-				Info.ConfirmText = NSLOCTEXT("ModalDialogs", "CompileErrorsInMaterialConfirm", "Continue");
-				Info.CancelText = NSLOCTEXT("ModalDialogs", "CompileErrorsInMaterialCancel", "Abort");
+			FSuppressableWarningDialog::FSetupInfo Info(
+				FText::Format(NSLOCTEXT("UnrealEd", "Warning_CompileErrorsInMaterial", "The current material has compilation errors, so it will not render correctly in feature level {0}.\nAre you sure you wish to continue?"),FText::FromString(*FeatureLevelName)),
+				NSLOCTEXT("UnrealEd", "Warning_CompileErrorsInMaterial_Title", "Warning: Compilation errors in this Material" ), "Warning_CompileErrorsInMaterial");
+			Info.ConfirmText = NSLOCTEXT("ModalDialogs", "CompileErrorsInMaterialConfirm", "Continue");
+			Info.CancelText = NSLOCTEXT("ModalDialogs", "CompileErrorsInMaterialCancel", "Abort");
 
-				FSuppressableWarningDialog CompileErrorsWarning(Info);
-				if (CompileErrorsWarning.ShowModal() == FSuppressableWarningDialog::Cancel)
-				{
+			FSuppressableWarningDialog CompileErrorsWarning( Info );
+			if( CompileErrorsWarning.ShowModal() == FSuppressableWarningDialog::Cancel )
+			{
 					return false;
 				}
 			}
@@ -1789,13 +1696,6 @@ bool FMaterialEditor::UpdateOriginalMaterial()
 		// Manually copy bUsedAsSpecialEngineMaterial as it is duplicate transient to prevent accidental creation of new special engine materials
 		OriginalMaterial->bUsedAsSpecialEngineMaterial = Material->bUsedAsSpecialEngineMaterial;
 
-		// If we are showing stats for mobile materials, compile the full material for ES2 here. That way we can see if permutations
-		// not used for preview materials fail to compile.
-		if (bShowMobileStats)
-		{
-			OriginalMaterial->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1,true);
-		}
-
 		UMaterialEditingLibrary::RecompileMaterial(OriginalMaterial);
 
 		// clear the dirty flag
@@ -1808,8 +1708,9 @@ bool FMaterialEditor::UpdateOriginalMaterial()
 	return true;
 }
 
-void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
+void FMaterialEditor::UpdateMaterialinfoList_Old()
 {
+	bool bForceDisplay = false;
 	TArray< TSharedRef<class FTokenizedMessage> > Messages;
 
 	TArray<TSharedPtr<FMaterialInfo>> TempMaterialInfoList;
@@ -1818,13 +1719,7 @@ void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
 	int32 NumFeatureLevels = 0;
 	// Always show basic features so that errors aren't hidden
 	FeatureLevelsToDisplay[NumFeatureLevels++] = GMaxRHIFeatureLevel;
-	if (bShowMobileStats)
-	{
-		FeatureLevelsToDisplay[NumFeatureLevels++] = ERHIFeatureLevel::ES3_1;
-	}
 
-	if (NumFeatureLevels > 0) //-V547
-	{
 		UMaterial* MaterialForStats = bStatsFromPreviewMaterial ? Material : OriginalMaterial;
 
 		for (int32 i = 0; i < NumFeatureLevels; ++i)
@@ -1931,39 +1826,35 @@ void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
 			}
 
 			// Only show general info if there are no errors and stats are enabled - Stats show for Materials, layers and blends
-			if (CompileErrors.Num() == 0 && (!MaterialFunction || MaterialFunction->GetMaterialFunctionUsage() != Default) && bShowStats)
+		if (CompileErrors.Num() == 0 && (!MaterialFunction || MaterialFunction->GetMaterialFunctionUsage() != Default))
 			{
-				// Display any errors and messages in the upper left corner of the viewport.
-				TArray<FString> Descriptions;
-				TArray<int32> InstructionCounts;
-				TArray<FString> EmptyDescriptions;
-				TArray<int32> EmptyInstructionCounts;
-
-				MaterialResource->GetRepresentativeInstructionCounts(Descriptions, InstructionCounts);
+			TArray<FMaterialStatsUtils::FShaderInstructionsInfo> Results;
+			TArray<FMaterialStatsUtils::FShaderInstructionsInfo> EmptyMaterialResults;
+			FMaterialStatsUtils::GetRepresentativeInstructionCounts(Results, MaterialResource);
 
 				//Built in stats is no longer exposed to the UI but may still be useful so they're still in the code.
 				bool bBuiltinStats = false;
-				const FMaterialResource* EmptyMaterialResource = EmptyMaterial ? EmptyMaterial->GetMaterialResource(FeatureLevel) : NULL;
-				if (bShowBuiltinStats && bStatsFromPreviewMaterial && EmptyMaterialResource && InstructionCounts.Num() > 0)
+			const FMaterialResource* EmptyMaterialResource = EmptyMaterial ? EmptyMaterial->GetMaterialResource(FeatureLevel) : nullptr;
+			if (bShowBuiltinStats && bStatsFromPreviewMaterial && EmptyMaterialResource && Results.Num() > 0)
 				{
-					EmptyMaterialResource->GetRepresentativeInstructionCounts(EmptyDescriptions, EmptyInstructionCounts);
+				FMaterialStatsUtils::GetRepresentativeInstructionCounts(EmptyMaterialResults, EmptyMaterialResource);
 
-					if (EmptyInstructionCounts.Num() > 0)
+				if (EmptyMaterialResults.Num() > 0)
 					{
 						//The instruction counts should match. If not, the preview material has been changed without the EmptyMaterial being updated to match.
-						if (ensure(InstructionCounts.Num() == EmptyInstructionCounts.Num()))
+					if (ensure(Results.Num() == EmptyMaterialResults.Num()))
 						{
 							bBuiltinStats = true;
 						}
 					}
 				}
 
-				for (int32 InstructionIndex = 0; InstructionIndex < Descriptions.Num(); InstructionIndex++)
+			for (int32 InstructionIndex = 0; InstructionIndex < Results.Num(); InstructionIndex++)
 				{
-					FString InstructionCountString = FString::Printf(TEXT("%s: %u instructions"),*Descriptions[InstructionIndex], InstructionCounts[InstructionIndex]);
+				FString InstructionCountString = FString::Printf(TEXT("%s: %u instructions"), *Results[InstructionIndex].ShaderDescription, Results[InstructionIndex].InstructionCount);
 					if (bBuiltinStats)
 					{
-						InstructionCountString += FString::Printf(TEXT(" - Built-in instructions: %u"), EmptyInstructionCounts[InstructionIndex]);
+					InstructionCountString += FString::Printf(TEXT(" - Built-in instructions: %u"), EmptyMaterialResults[InstructionIndex].InstructionCount);
 					}
 					TempMaterialInfoList.Add(MakeShareable(new FMaterialInfo(InstructionCountString, FLinearColor::Yellow)));
 					TSharedRef<FTokenizedMessage> Line = FTokenizedMessage::Create(EMessageSeverity::Info);
@@ -1983,6 +1874,20 @@ void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
 					Line->AddToken( FTextToken::Create( FText::FromString( SamplersString ) ) );
 					Messages.Add(Line);
 				}
+				
+				// Display estimated texture look-up/sample counts
+				uint32 NumVSTextureSamples = 0, NumPSTextureSamples = 0;
+				MaterialResource->GetEstimatedNumTextureSamples(NumVSTextureSamples, NumPSTextureSamples);
+
+				if (NumVSTextureSamples > 0 || NumPSTextureSamples > 0)
+				{
+					FString SamplesString = FString::Printf(TEXT("Texture Lookups (Est.): VS(%u), PS(%u)"), NumVSTextureSamples, NumPSTextureSamples);
+
+					TempMaterialInfoList.Add(MakeShareable(new FMaterialInfo(SamplesString, FLinearColor::Yellow)));
+					TSharedRef<FTokenizedMessage> Line = FTokenizedMessage::Create(EMessageSeverity::Info);
+					Line->AddToken(FTextToken::Create(FText::FromString(SamplesString)));
+					Messages.Add(Line);
+				}
 
 				// Display the number of custom/user interpolators used by the material.
 				uint32 UVScalarsUsed, CustomInterpolatorScalarsUsed;
@@ -2015,7 +1920,6 @@ void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
 				bForceDisplay = true;
 			}
 		}
-	}
 
 	bool bNeedsRefresh = false;
 	if (TempMaterialInfoList.Num() != MaterialInfoList.Num())
@@ -2041,30 +1945,97 @@ void FMaterialEditor::UpdateMaterialInfoList(bool bForceDisplay)
 	if (bNeedsRefresh)
 	{
 		MaterialInfoList = TempMaterialInfoList;
-		/*TSharedPtr<SWidget> TitleBar = GraphEditor->GetTitleBar();
-		if (TitleBar.IsValid())
+
+		auto Listing = MaterialStatsManager->GetOldStatsListing();
+		Listing->ClearMessages();
+		Listing->AddMessages(Messages);
+
+		if (bForceDisplay)
 		{
-			StaticCastSharedPtr<SMaterialEditorTitleBar>(TitleBar)->RequestRefresh();
-		}*/
+			TabManager->InvokeTab(MaterialStatsManager->GetGridOldStatsTabName());
+		}
+	}
+}
+
+void FMaterialEditor::UpdateMaterialInfoList()
+{
+	// setup stats widget visibility
+	if (MaterialFunction)
+	{
+		return;
+	}
+
+	UMaterial* MaterialForStats = bStatsFromPreviewMaterial ? Material : OriginalMaterial;
+
+	// check for errors
+	TArray<FString> CompileErrors;
+	if (MaterialFunction && ExpressionPreviewMaterial)
+	{
+		// Add a compile error message for functions missing an output
+		CompileErrors = ExpressionPreviewMaterial->GetMaterialResource(GMaxRHIFeatureLevel)->GetCompileErrors();
+
+		bool bFoundFunctionOutput = false;
+		for (int32 ExpressionIndex = 0; ExpressionIndex < Material->Expressions.Num(); ExpressionIndex++)
+		{
+			if (Material->Expressions[ExpressionIndex]->IsA(UMaterialExpressionFunctionOutput::StaticClass()))
+			{
+				bFoundFunctionOutput = true;
+				break;
+			}
+		}
+
+		if (!bFoundFunctionOutput)
+		{
+			CompileErrors.Add(TEXT("Missing a function output"));
+		}
+	}
+
+	// compute error crc
+	FString NewErrorHash;
+	for (int32 ErrorIndex = 0; ErrorIndex < CompileErrors.Num(); ErrorIndex++)
+	{
+		NewErrorHash += FMD5::HashAnsiString(*CompileErrors[ErrorIndex]);
+	}
+
+	TSharedPtr<SWidget> TitleBar = GraphEditor->GetTitleBar();
+	if (NewErrorHash != MaterialErrorHash)
+	{
+		MaterialErrorHash = NewErrorHash;
+		MaterialInfoList.Reset();
+
+		TArray< TSharedRef<class FTokenizedMessage> > Messages;
+		FString FeatureLevelName;
+		GetFeatureLevelName(GMaxRHIFeatureLevel, FeatureLevelName);
+		for (int32 ErrorIndex = 0; ErrorIndex < CompileErrors.Num(); ErrorIndex++)
+		{
+			FString ErrorString = FString::Printf(TEXT("[%s] %s"), *FeatureLevelName, *CompileErrors[ErrorIndex]);
+			TSharedRef<FTokenizedMessage> Line = FTokenizedMessage::Create(EMessageSeverity::Error);
+			Line->AddToken(FTextToken::Create(FText::FromString(ErrorString)));
+			Messages.Add(Line);
+
+			MaterialInfoList.Add(MakeShareable(new FMaterialInfo(ErrorString, FLinearColor::Red)));
+		}
 
 		StatsListing->ClearMessages();
 		StatsListing->AddMessages(Messages);
 
-		if (bForceDisplay)
-		{
-			TabManager->InvokeTab(StatsTabId);
-		}
+		StaticCastSharedPtr<SMaterialEditorTitleBar>(TitleBar)->RequestRefresh();
+		TitleBar->SetVisibility(EVisibility::Visible);
 	}
+	else if (!CompileErrors.Num())
+		{
+		TitleBar->SetVisibility(EVisibility::Collapsed);
+	}
+
+	// extract material stats
+	MaterialStatsManager->SetMaterial(MaterialForStats);
+	MaterialStatsManager->Update();
 }
 
 void FMaterialEditor::UpdateGraphNodeStates()
 {
 	const FMaterialResource* ErrorMaterialResource = PreviewExpression ? ExpressionPreviewMaterial->GetMaterialResource(GMaxRHIFeatureLevel) : Material->GetMaterialResource(GMaxRHIFeatureLevel);
 	const FMaterialResource* ErrorMaterialResourceES2 = NULL;
-	if (bShowMobileStats)
-	{
-		ErrorMaterialResourceES2 = PreviewExpression ? ExpressionPreviewMaterial->GetMaterialResource(ERHIFeatureLevel::ES3_1) : Material->GetMaterialResource(ERHIFeatureLevel::ES3_1);
-	}
 
 	bool bUpdatedErrorState = false;
 
@@ -2170,18 +2141,6 @@ void FMaterialEditor::BindCommands()
 		FCanExecuteAction(),
 		FIsActionChecked::CreateSP(this, &FMaterialEditor::IsOnAlwaysRefreshAllPreviews));
 
-	ToolkitCommands->MapAction(
-		Commands.ToggleMaterialStats,
-		FExecuteAction::CreateSP(this, &FMaterialEditor::ToggleStats),
-		FCanExecuteAction(),
-		FIsActionChecked::CreateSP(this, &FMaterialEditor::IsToggleStatsChecked));
-
-	ToolkitCommands->MapAction(
-		Commands.ToggleMobileStats,
-		FExecuteAction::CreateSP(this, &FMaterialEditor::ToggleMobileStats),
-		FCanExecuteAction(),
-		FIsActionChecked::CreateSP(this, &FMaterialEditor::IsToggleMobileStatsChecked));
-
 	ToolkitCommands->MapAction(
 		Commands.UseCurrentTexture,
 		FExecuteAction::CreateSP(this, &FMaterialEditor::OnUseCurrentTexture));
@@ -2248,6 +2207,8 @@ void FMaterialEditor::OnApply()
 	UE_LOG(LogMaterialEditor, Log, TEXT("Applying material %s"), *GetEditingObjects()[0]->GetName());
 
 	UpdateOriginalMaterial();
+
+	GEditor->OnSceneMaterialsModified();
 }
 
 bool FMaterialEditor::OnApplyEnabled() const
@@ -2310,48 +2271,6 @@ bool FMaterialEditor::IsOnAlwaysRefreshAllPreviews() const
 	return bAlwaysRefreshAllPreviews == true;
 }
 
-void FMaterialEditor::ToggleStats()
-{
-	// Toggle the showing of material stats each time the user presses the show stats button
-	bShowStats = !bShowStats;
-	UpdateMaterialInfoList(bShowStats);
-}
-
-bool FMaterialEditor::IsToggleStatsChecked() const
-{
-	return bShowStats == true;
-}
-
-void FMaterialEditor::ToggleMobileStats()
-{
-	// Toggle the showing of material stats each time the user presses the show stats button
-	bShowMobileStats = !bShowMobileStats;
-	UPreviewMaterial* PreviewMaterial = Cast<UPreviewMaterial>(Material);
-	if (PreviewMaterial)
-	{
-		{
-			// Sync with the rendering thread but don't reregister components. We will manually do so.
-			FMaterialUpdateContext UpdateContext(FMaterialUpdateContext::EOptions::SyncWithRenderingThread);
-			UpdateContext.AddMaterial(PreviewMaterial);
-			PreviewMaterial->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1,bShowMobileStats);
-			PreviewMaterial->ForceRecompileForRendering();
-			if (!bStatsFromPreviewMaterial)
-			{
-				OriginalMaterial->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1,bShowMobileStats);
-				OriginalMaterial->ForceRecompileForRendering();
-			}
-		}
-		UpdateStatsMaterials();
-		RefreshPreviewViewport();
-	}
-	UpdateMaterialInfoList(bShowMobileStats);
-}
-
-bool FMaterialEditor::IsToggleMobileStatsChecked() const
-{
-	return bShowMobileStats == true;
-}
-
 void FMaterialEditor::OnUseCurrentTexture()
 {
 	// Set the currently selected texture in the generic browser
@@ -3188,31 +3107,6 @@ TSharedRef<SDockTab> FMaterialEditor::SpawnTab_MaterialProperties(const FSpawnTa
 	return SpawnedTab;
 }
 
-TSharedRef<SDockTab> FMaterialEditor::SpawnTab_HLSLCode(const FSpawnTabArgs& Args)
-{
-	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
-		.Label(LOCTEXT("HLSLCodeTitle", "HLSL Code"))
-		[
-			SNew(SVerticalBox)
-			+SVerticalBox::Slot()
-			.AutoHeight()
-			[
-				CodeViewUtility.ToSharedRef()
-			]
-			+SVerticalBox::Slot()
-			.FillHeight(1)
-			[
-				CodeView.ToSharedRef()
-			]
-		];
-
-	CodeTab = SpawnedTab;
-
-	RegenerateCodeView();
-
-	return SpawnedTab;
-}
-
 TSharedRef<SDockTab> FMaterialEditor::SpawnTab_Palette(const FSpawnTabArgs& Args)
 {
 	check( Args.GetTabId() == PaletteTabId );
@@ -3231,24 +3125,6 @@ TSharedRef<SDockTab> FMaterialEditor::SpawnTab_Palette(const FSpawnTabArgs& Args
 	return SpawnedTab;
 }
 
-TSharedRef<SDockTab> FMaterialEditor::SpawnTab_Stats(const FSpawnTabArgs& Args)
-{
-	check( Args.GetTabId() == StatsTabId );
-
-	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
-		.Icon(FEditorStyle::GetBrush("Kismet.Tabs.CompilerResults"))
-		.Label(LOCTEXT("MaterialStatsTitle", "Stats"))
-		[
-			SNew( SBox )
-			.AddMetaData<FTagMetaData>(FTagMetaData(TEXT("MaterialStats")))
-			[
-				Stats.ToSharedRef()
-			]
-		];
-
-	return SpawnedTab;
-}
-
 TSharedRef<SDockTab> FMaterialEditor::SpawnTab_Find(const FSpawnTabArgs& Args)
 {
 	check(Args.GetTabId() == FindTabId);
@@ -4346,8 +4222,8 @@ TSharedRef<SGraphEditor> FMaterialEditor::CreateGraphEditorWidget()
 
 	// Create the title bar widget
 	TSharedPtr<SWidget> TitleBarWidget = SNew(SMaterialEditorTitleBar)
-		.TitleText(this, &FMaterialEditor::GetOriginalObjectName);
-		//.MaterialInfoList(&MaterialInfoList);
+		.TitleText(this, &FMaterialEditor::GetOriginalObjectName)
+		.MaterialInfoList(&MaterialInfoList);
 
 	return SNew(SGraphEditor)
 		.AdditionalCommands(GraphEditorCommands)
@@ -4705,8 +4581,6 @@ void FMaterialEditor::UpdateStatsMaterials()
 		FString EmptyMaterialName = FString(TEXT("MEStatsMaterial_Empty_")) + Material->GetName();
 		EmptyMaterial = (UMaterial*)StaticDuplicateObject(Material, GetTransientPackage(), *EmptyMaterialName, ~RF_Standalone, UPreviewMaterial::StaticClass());
 
-		EmptyMaterial->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1, bShowMobileStats);
-
 		EmptyMaterial->Expressions.Empty();
 
 		//Disconnect all properties from the expressions
@@ -4724,4 +4598,9 @@ void FMaterialEditor::UpdateStatsMaterials()
 	}
 }
 
+void FMaterialEditor::NotifyExternalMaterialChange()
+{
+	MaterialStatsManager->SignalMaterialChanged();
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.h
index 9d91c9fb6413..ba4f900a8618 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.h
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.h
@@ -18,7 +18,6 @@
 #include "Editor/PropertyEditor/Public/IDetailsView.h"
 #include "SMaterialEditorViewport.h"
 #include "Materials/Material.h"
-#include "Widgets/Layout/SScrollBox.h"
 #include "Tickable.h"
 
 struct FAssetData;
@@ -312,10 +311,9 @@ public:
 
 	/**
 	 * Updates list of Material Info used to show stats
-	 *
-	 * @param bForceDisplay	Whether we want to ensure stats tab is displayed.
 	 */
-	void UpdateMaterialInfoList(bool bForceDisplay = false);
+	void UpdateMaterialInfoList();
+	void UpdateMaterialinfoList_Old();
 
 	/**
 	 * Updates flags on the Material Nodes to avoid expensive look up calls when rendering
@@ -375,6 +373,14 @@ public:
 	virtual TSharedPtr<FExtensibilityManager> GetMenuExtensibilityManager() { return MenuExtensibilityManager; }
 	virtual TSharedPtr<FExtensibilityManager> GetToolBarExtensibilityManager() { return ToolBarExtensibilityManager; }
 
+	FORCEINLINE bool IsShowingBuiltinStats()
+	{
+		return bShowBuiltinStats;
+	}
+
+	/** call this to notify the editor that the edited material changed from outside */
+	virtual void NotifyExternalMaterialChange() override;
+
 public:
 	/** Set to true when modifications have been made to the material */
 	bool bMaterialDirty;
@@ -520,12 +526,6 @@ private:
 	 */
 	void SaveEditorSettings();
 
-	/** Gets the text in the code view widget */
-	FText GetCodeViewText() const;
-
-	/** Copies all the HLSL Code View code to the clipboard */
-	FReply CopyCodeViewTextToClipboard();
-
 	/**
 	* Rebuilds dependant Material Instance Editors
 	* @param		MatInst	Material Instance to search dependent editors and force refresh of them.
@@ -555,16 +555,12 @@ private:
 	void OnAlwaysRefreshAllPreviews();
 	bool IsOnAlwaysRefreshAllPreviews() const;
 	/** Command for the stats button */
-	void ToggleStats();
-	bool IsToggleStatsChecked() const;
+
 	void ToggleReleaseStats();
 	bool IsToggleReleaseStatsChecked() const;
 	void ToggleBuiltinStats();
 	bool IsToggleBuiltinStatsChecked() const;
 
-	/** Mobile stats button. */
-	void ToggleMobileStats();
-	bool IsToggleMobileStatsChecked() const;
 	/** Command for using currently selected texture */
 	void OnUseCurrentTexture();
 	/** Command for converting nodes to objects */
@@ -692,9 +688,7 @@ private:
 	TSharedRef<SDockTab> SpawnTab_Preview(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_GraphCanvas(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_MaterialProperties(const FSpawnTabArgs& Args);
-	TSharedRef<SDockTab> SpawnTab_HLSLCode(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_Palette(const FSpawnTabArgs& Args);
-	TSharedRef<SDockTab> SpawnTab_Stats(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_Find(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_PreviewSettings(const FSpawnTabArgs& Args);
 	TSharedRef<SDockTab> SpawnTab_ParameterDefaults(const FSpawnTabArgs& Args);
@@ -720,16 +714,8 @@ private:
 	/** Preview viewport widget used for UI materials */
 	TSharedPtr<class SMaterialEditorUIPreviewViewport> PreviewUIViewport;
 
-	/** Widget to hold utility components for the HLSL Code View */
-	TSharedPtr<SWidget> CodeViewUtility;
-
-	/** Widget for the HLSL Code View */
-	TSharedPtr<class SScrollBox> CodeView;
-	/** Cached Code for the widget */
-	FString HLSLCode;
-
-	/** Tracks whether the code tab is open, so we don't have to update it when closed. */
-	TWeakPtr<SDockTab> CodeTab;
+	/** Hashed error code use to refresh the error displaying widget when this will change */
+	FString MaterialErrorHash;
 
 	/** Palette of Material Expressions and functions */
 	TSharedPtr<class SMaterialPalette> Palette;
@@ -753,7 +739,7 @@ private:
 	/** Material expression previews. */
 	TIndirectArray<class FMatExpressionPreview> ExpressionPreviews;
 
-	/** Information about material to show when stats are enabled */
+	/** Used to store material errors */
 	TArray<TSharedPtr<FMaterialInfo>> MaterialInfoList;
 
 	TArray<FName> OverriddenVectorParametersToRevert;
@@ -768,15 +754,9 @@ private:
 	/** Just storing this choice for now, not sure what difference it will make to Graph Editor */
 	bool bIsRealtime;
 
-	/** If true, show material stats like number of shader instructions. */
-	bool bShowStats;
-
 	/** If true, show stats for an empty material. Helps artists to judge the cost of their changes to the graph. */
 	bool bShowBuiltinStats;
 
-	/** If true, show material stats and errors for mobile. */
-	bool bShowMobileStats;
-
 	/** Command list for this editor */
 	TSharedPtr<FUICommandList> GraphEditorCommands;
 
@@ -784,12 +764,10 @@ private:
 	TSharedPtr<FExtensibilityManager> ToolBarExtensibilityManager;
 
 	/**	The tab ids for the material editor */
-	static const FName PreviewTabId;		
-	static const FName GraphCanvasTabId;	
-	static const FName PropertiesTabId;	
-	static const FName HLSLCodeTabId;	
+	static const FName PreviewTabId;
+	static const FName GraphCanvasTabId;
+	static const FName PropertiesTabId;
 	static const FName PaletteTabId;
-	static const FName StatsTabId;
 	static const FName FindTabId;
 	static const FName PreviewSettingsTabId;
 	static const FName ParameterDefaultsTabId;
@@ -797,4 +775,7 @@ private:
 
 	/** Object that stores all of the possible parameters we can edit. */
 	class UMaterialEditorPreviewParameters* MaterialEditorInstance;
+
+	/** Object used as material statistics manager */
+	TSharedPtr<class FMaterialStats> MaterialStatsManager;
 };
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorActions.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorActions.cpp
index e5dc0a2bdb85..7e061cd5e464 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorActions.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorActions.cpp
@@ -10,7 +10,7 @@
 
 void FMaterialEditorCommands::RegisterCommands()
 {
-	UI_COMMAND( Apply, "Apply", "Apply changes to original material and its use in the world.", EUserInterfaceActionType::Button, FInputChord(EKeys::Enter) );
+	UI_COMMAND( Apply, "Apply", "Apply changes to original material and its use in the world.", EUserInterfaceActionType::Button, FInputChord());
 	UI_COMMAND( Flatten, "Flatten", "Flatten the material to a texture for mobile devices.", EUserInterfaceActionType::Button, FInputChord() );
 
 	UI_COMMAND( ShowAllMaterialParameters, "Params", "Show or Hide all the materials parameters", EUserInterfaceActionType::ToggleButton, FInputChord() );
@@ -30,7 +30,7 @@ void FMaterialEditorCommands::RegisterCommands()
 	UI_COMMAND( ToggleRealtimeExpressions, "Live Nodes", "Toggles real time update of the graph canvas.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( AlwaysRefreshAllPreviews, "Live Update", "All nodes are previewed live.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( ToggleMaterialStats, "Stats", "Toggles displaying of the material's stats.", EUserInterfaceActionType::ToggleButton, FInputChord());
-	UI_COMMAND( ToggleMobileStats, "Mobile Stats", "Toggles material stats and compilation errors for mobile.", EUserInterfaceActionType::ToggleButton, FInputChord() );
+	UI_COMMAND(TogglePlatformStats, "Platform Stats", "Toggles the window that shows material stats and compilation errors for multiple platforms.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( NewComment, "New Comment", "Creates a new comment node.", EUserInterfaceActionType::Button, FInputChord() );
 	UI_COMMAND( MatertialPasteHere, "Paste Here", "Pastes copied items at this location.", EUserInterfaceActionType::Button, FInputChord() );
 	UI_COMMAND( UseCurrentTexture, "Use Current Texture", "Uses the current texture selected in the content browser.", EUserInterfaceActionType::Button, FInputChord() );
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.cpp
index f9b91d451b12..4d520e795c2e 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.cpp
@@ -31,6 +31,8 @@
 #include "MaterialPropertyHelpers.h"
 #include "MaterialEditor/DEditorMaterialLayersParameterValue.h"
 #include "PropertyCustomizationHelpers.h"
+#include "Curves/CurveLinearColor.h"
+#include "IPropertyUtilities.h"
 
 #define LOCTEXT_NAMESPACE "MaterialEditor"
 
@@ -65,7 +67,7 @@ void FMaterialEditorParameterDetails::OnValueCommitted(float NewValue, ETextComm
 
 void FMaterialEditorParameterDetails::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
 {
-	TSharedRef<IPropertyUtilities> PropertyUtils = DetailLayout.GetPropertyUtilities();
+	PropertyUtilities = DetailLayout.GetPropertyUtilities();
 	// Create a new category for a custom layout for the MIC parameters at the very top
 	FName GroupsCategoryName = TEXT("ParameterGroups");
 	IDetailCategoryBuilder& GroupsCategory = DetailLayout.EditCategory(GroupsCategoryName, LOCTEXT("MICParamGroupsTitle", "Parameter Groups"));
@@ -188,6 +190,10 @@ void FMaterialEditorParameterDetails::CreateSingleGroupWidget(FEditorParameterGr
 		{
 			CreateVectorChannelMaskParameterValueWidget(Parameter, ParameterProperty, DetailGroup);
 		}
+		if (ScalarParam && ScalarParam->AtlasData.bIsUsedAsAtlasPosition)
+		{
+			CreateScalarAtlasPositionParameterValueWidget(Parameter, ParameterProperty, DetailGroup);
+		}
 		else if (ScalarParam || SwitchParam || TextureParam || VectorParam || FontParam)
 		{
 			if (ScalarParam && ScalarParam->SliderMax > ScalarParam->SliderMin)
@@ -360,6 +366,52 @@ void FMaterialEditorParameterDetails::CreateVectorChannelMaskParameterValueWidge
 	}
 }
 
+void FMaterialEditorParameterDetails::CreateScalarAtlasPositionParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup)
+{
+	TSharedPtr<IPropertyHandle> ParameterValueProperty = ParameterProperty->GetChildHandle("ParameterValue");
+
+	if (ParameterValueProperty->IsValidHandle())
+	{
+		TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, Parameter));
+
+		IDetailPropertyRow& PropertyRow = DetailGroup.AddPropertyRow(ParameterValueProperty.ToSharedRef());
+	
+		const FText ParameterName = FText::FromName(Parameter->ParameterInfo.Name);
+		UDEditorScalarParameterValue* AtlasParameter = Cast<UDEditorScalarParameterValue>(Parameter);
+
+		FDetailWidgetRow& CustomWidget = PropertyRow.CustomWidget();
+		CustomWidget
+			.FilterString(ParameterName)
+			.NameContent()
+			[
+				SNew(STextBlock)
+				.Text(ParameterName)
+				.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(Parameter, MaterialEditorInstance))
+				.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+			]
+			.ValueContent()
+			.HAlign(HAlign_Fill)
+			.MaxDesiredWidth(400.0f)
+			[
+				SNew(SObjectPropertyEntryBox)
+				.ObjectPath(this, &FMaterialEditorParameterDetails::GetCurvePath, AtlasParameter)
+				.AllowedClass(UCurveLinearColor::StaticClass())
+				.NewAssetFactories(TArray<UFactory*>())
+				.DisplayThumbnail(true)
+				.ThumbnailPool(PropertyUtilities.Pin()->GetThumbnailPool())
+				.OnShouldSetAsset(FOnShouldSetAsset::CreateStatic(&FMaterialPropertyHelpers::OnShouldSetCurveAsset, AtlasParameter->AtlasData.Atlas))
+				.OnObjectChanged(FOnSetObject::CreateStatic(&FMaterialPropertyHelpers::SetPositionFromCurveAsset, AtlasParameter->AtlasData.Atlas, AtlasParameter, ParameterProperty, (UObject*)MaterialEditorInstance))
+				.DisplayCompactSize(true)
+			];
+	}
+}
+
+FString FMaterialEditorParameterDetails::GetCurvePath(UDEditorScalarParameterValue* Parameter) const
+{
+	FString Path = Parameter->AtlasData.Curve->GetPathName();
+	return Path;
+}
+
 FText FMaterialEditorParameterDetails::GetParameterExpressionDescription(UDEditorParameterValue* Parameter) const
 {
 	UMaterial* BaseMaterial = MaterialEditorInstance->OriginalMaterial->GetMaterial();
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.h
index c21543f97400..8064cddb0af2 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.h
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorDetailCustomization.h
@@ -41,7 +41,8 @@ private:
 	void CreateParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
 	void CreateMaskParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
 	void CreateVectorChannelMaskParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
-
+	void CreateScalarAtlasPositionParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
+	FString GetCurvePath(class UDEditorScalarParameterValue* Parameter) const;
 	/** Gets the expression description of this parameter from the the base material */
 	FText GetParameterExpressionDescription(class UDEditorParameterValue* Parameter) const;
 
@@ -49,6 +50,9 @@ private:
 	/** Object that stores all of the possible parameters we can edit */
 	UMaterialEditorPreviewParameters* MaterialEditorInstance;
 
+	/** Associated UMaterialEditorPreviewParameters utilities */
+	TWeakPtr<class IPropertyUtilities> PropertyUtilities;
+
 };
 
 class FMaterialExpressionParameterDetails : public IDetailCustomization
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.cpp
index 3535481fc7b3..57b6415fa03b 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.cpp
@@ -44,6 +44,8 @@
 #include "Materials/MaterialFunctionInterface.h"
 #include "Materials/MaterialFunction.h"
 #include "Materials/MaterialFunctionInstance.h"
+#include "Curves/CurveLinearColor.h"
+#include "IPropertyUtilities.h"
 
 #define LOCTEXT_NAMESPACE "MaterialInstanceEditor"
 
@@ -88,6 +90,8 @@ FString FMaterialInstanceParameterDetails::GetFunctionParentPath() const
 
 void FMaterialInstanceParameterDetails::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
 {
+	PropertyUtilities = DetailLayout.GetPropertyUtilities();
+
 	// Create a new category for a custom layout for the MIC parameters at the very top
 	FName GroupsCategoryName = TEXT("ParameterGroups");
 	IDetailCategoryBuilder& GroupsCategory = DetailLayout.EditCategory(GroupsCategoryName, LOCTEXT("MICParamGroupsTitle", "Parameter Groups"));
@@ -369,6 +373,10 @@ void FMaterialInstanceParameterDetails::CreateSingleGroupWidget(FEditorParameter
 			{
 				CreateVectorChannelMaskParameterValueWidget(Parameter, ParameterProperty, DetailGroup);
 			}
+			if (ScalarParam && ScalarParam->AtlasData.bIsUsedAsAtlasPosition)
+			{
+				CreateScalarAtlasPositionParameterValueWidget(Parameter, ParameterProperty, DetailGroup);
+			}
 			else if (ScalarParam || SwitchParam || TextureParam || VectorParam || FontParam)
 			{
 				if (ScalarParam && ScalarParam->SliderMax > ScalarParam->SliderMin)
@@ -564,6 +572,61 @@ void FMaterialInstanceParameterDetails::CreateVectorChannelMaskParameterValueWid
 	}
 }
 
+void FMaterialInstanceParameterDetails::CreateScalarAtlasPositionParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup)
+{
+	TSharedPtr<IPropertyHandle> ParameterValueProperty = ParameterProperty->GetChildHandle("ParameterValue");
+
+	if (ParameterValueProperty->IsValidHandle())
+	{
+		TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, Parameter));
+
+		IDetailPropertyRow& PropertyRow = DetailGroup.AddPropertyRow(ParameterValueProperty.ToSharedRef());
+		PropertyRow.EditCondition(IsParamEnabled, FOnBooleanValueChanged::CreateStatic(&FMaterialPropertyHelpers::OnOverrideParameter, Parameter, MaterialEditorInstance));
+		// Handle reset to default manually
+		PropertyRow.Visibility(TAttribute<EVisibility>::Create(TAttribute<EVisibility>::FGetter::CreateStatic(&FMaterialPropertyHelpers::ShouldShowExpression, Parameter, MaterialEditorInstance, ShowHiddenDelegate)));
+
+		const FText ParameterName = FText::FromName(Parameter->ParameterInfo.Name);
+		UDEditorScalarParameterValue* AtlasParameter = Cast<UDEditorScalarParameterValue>(Parameter);
+
+		FIsResetToDefaultVisible IsResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldShowResetToDefault, Parameter, MaterialEditorInstance);
+		FResetToDefaultHandler ResetHandler = FResetToDefaultHandler::CreateStatic(&FMaterialPropertyHelpers::ResetCurveToDefault, Parameter, MaterialEditorInstance);
+		FResetToDefaultOverride ResetOverride = FResetToDefaultOverride::Create(IsResetVisible, ResetHandler);
+
+		PropertyRow.OverrideResetToDefault(ResetOverride);
+
+		FDetailWidgetRow& CustomWidget = PropertyRow.CustomWidget();
+		CustomWidget
+			.FilterString(ParameterName)
+			.NameContent()
+			[
+				SNew(STextBlock)
+				.Text(ParameterName)
+				.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(Parameter, MaterialEditorInstance))
+				.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+			]
+			.ValueContent()
+			.HAlign(HAlign_Fill)
+			.MaxDesiredWidth(400.0f)
+			[
+				SNew(SObjectPropertyEntryBox)
+				.ObjectPath(this, &FMaterialInstanceParameterDetails::GetCurvePath, AtlasParameter)
+				.AllowedClass(UCurveLinearColor::StaticClass())
+				.NewAssetFactories(TArray<UFactory*>())
+				.DisplayThumbnail(true)
+				.ThumbnailPool(PropertyUtilities.Pin()->GetThumbnailPool())
+				.OnShouldSetAsset(FOnShouldSetAsset::CreateStatic(&FMaterialPropertyHelpers::OnShouldSetCurveAsset, AtlasParameter->AtlasData.Atlas))
+				.OnObjectChanged(FOnSetObject::CreateStatic(&FMaterialPropertyHelpers::SetPositionFromCurveAsset, AtlasParameter->AtlasData.Atlas, AtlasParameter, ParameterProperty, (UObject*)MaterialEditorInstance))
+				.DisplayCompactSize(true)
+			];
+	}
+}
+
+FString FMaterialInstanceParameterDetails::GetCurvePath(UDEditorScalarParameterValue* Parameter) const
+{
+	FString Path = Parameter->AtlasData.Curve->GetPathName();
+	return Path;
+}
+
 bool FMaterialInstanceParameterDetails::IsVisibleExpression(UDEditorParameterValue* Parameter)
 {
 	return MaterialEditorInstance->VisibleExpressions.Contains(Parameter->ParameterInfo);
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.h
index ad25e75189da..c903b5ac20d9 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.h
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorInstanceDetailCustomization.h
@@ -8,6 +8,7 @@
 #include "IDetailCustomization.h"
 #include "Input/Reply.h"
 
+
 struct FAssetData;
 class IDetailGroup;
 class IDetailLayoutBuilder;
@@ -50,6 +51,9 @@ private:
 	void CreateParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
 	void CreateMaskParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
 	void CreateVectorChannelMaskParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
+	void CreateScalarAtlasPositionParameterValueWidget(class UDEditorParameterValue* Parameter, TSharedPtr<IPropertyHandle> ParameterProperty, IDetailGroup& DetailGroup);
+
+	FString GetCurvePath(class UDEditorScalarParameterValue * Parameter) const;
 
 	/** Returns true if the parameter is in the visible expressions list */
 	bool IsVisibleExpression(class UDEditorParameterValue* Parameter);
@@ -92,5 +96,8 @@ private:
 
 	/** Delegate to call to determine if hidden parameters should be shown */
 	FGetShowHiddenParameters ShowHiddenDelegate;
+
+	/** Associated FMaterialInstance utilities */
+	TWeakPtr<class IPropertyUtilities> PropertyUtilities;
 };
 
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorModule.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorModule.cpp
index 2f2b62f6d66f..ec320f45afd3 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorModule.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorModule.cpp
@@ -19,10 +19,20 @@
 #include "Framework/Application/SlateApplication.h"
 #include "Widgets/Images/SImage.h"
 #include "Misc/EngineBuildSettings.h"
+#include "MaterialEditorSettings.h"
+
+#include "ISettingsModule.h"
 
 const FName MaterialEditorAppIdentifier = FName(TEXT("MaterialEditorApp"));
 const FName MaterialInstanceEditorAppIdentifier = FName(TEXT("MaterialInstanceEditorApp"));
 
+namespace MaterialEditorModuleConstants
+{
+	const static FName SettingsContainerName("Editor");
+	const static FName SettingsCategoryName("ContentEditors");
+	const static FName SettingsSectionName("Material Editor");
+}
+
 class SNewSubstanceMenuEntry : public SCompoundWidget
 {
 public:
@@ -116,6 +126,18 @@ public:
 		MenuExtensibilityManager = MakeShareable(new FExtensibilityManager);
 		ToolBarExtensibilityManager = MakeShareable(new FExtensibilityManager);
 
+		ISettingsModule* SettingsModule = FModuleManager::LoadModulePtr<ISettingsModule>("Settings");
+		if (SettingsModule)
+		{
+			SettingsModule->RegisterSettings(
+				MaterialEditorModuleConstants::SettingsContainerName,
+				MaterialEditorModuleConstants::SettingsCategoryName,
+				MaterialEditorModuleConstants::SettingsSectionName,
+				NSLOCTEXT("MaterialEditorModule", "SettingsName", "Material Editor"),
+				NSLOCTEXT("MaterialEditorModule", "SettingsDesc", "Settings related to the material editor."),
+				GetMutableDefault<UMaterialEditorSettings>());
+		}
+
 		if(!FEngineBuildSettings::IsInternalBuild() && !FEngineBuildSettings::IsSourceDistribution())
 		{
 			TSharedPtr<IPlugin> SubstancePlugin = IPluginManager::Get().FindPlugin(TEXT("Substance"));
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorUtilities.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorUtilities.cpp
index 48c2dd417d7a..614956fddaa3 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorUtilities.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialEditorUtilities.cpp
@@ -502,9 +502,9 @@ void FMaterialEditorUtilities::GetVisibleMaterialParametersFromExpression(
 
 			if (LayersExpression->bIsLayerGraphBuilt)
 			{
-				for (int32 LayerIndex = 0; LayerIndex < LayersExpression->LayerCallers.Num(); ++LayerIndex)
+				for (auto* Layer : LayersExpression->LayerCallers)
 				{
-					if (auto* Layer = LayersExpression->LayerCallers[LayerIndex])
+					if (Layer && Layer->MaterialFunction)
 					{
 						TUniquePtr<FGetVisibleMaterialParametersFunctionState> NewFunctionState = MakeUnique<FGetVisibleMaterialParametersFunctionState>(Layer);
 						FunctionStack.Push(NewFunctionState.Get());
@@ -515,9 +515,9 @@ void FMaterialEditorUtilities::GetVisibleMaterialParametersFromExpression(
 					}
 				}
 
-				for (int32 BlendIndex = 0; BlendIndex < LayersExpression->BlendCallers.Num(); ++BlendIndex)
+				for (auto* Blend : LayersExpression->BlendCallers)
 				{
-					if (auto* Blend = LayersExpression->BlendCallers[BlendIndex])
+					if (Blend && Blend->MaterialFunction)
 					{
 						TUniquePtr<FGetVisibleMaterialParametersFunctionState> NewFunctionState = MakeUnique<FGetVisibleMaterialParametersFunctionState>(Blend);
 						FunctionStack.Push(NewFunctionState.Get());
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.cpp
index f29f8d4a2787..466e305a2406 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.cpp
@@ -40,6 +40,7 @@
 #include "Misc/MessageDialog.h"
 #include "Framework/Commands/UICommandInfo.h"
 #include "EditorStyleSet.h"
+#include "MaterialStats.h"
 
 #define LOCTEXT_NAMESPACE "MaterialInstanceEditor"
 
@@ -240,6 +241,8 @@ void FMaterialInstanceEditor::RegisterTabSpawners(const TSharedRef<class FTabMan
 		.SetGroup(WorkspaceMenuCategoryRef)
 		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.Details"));
 
+	MaterialStatsManager->RegisterTabs();
+
 	OnRegisterTabSpawners().Broadcast(InTabManager);
 }
 
@@ -256,6 +259,8 @@ void FMaterialInstanceEditor::UnregisterTabSpawners(const TSharedRef<class FTabM
 	}
 	InTabManager->UnregisterTabSpawner( PreviewSettingsTabId );
 
+	MaterialStatsManager->UnregisterTabs();
+
 	OnUnregisterTabSpawners().Broadcast(InTabManager);
 }
 
@@ -351,7 +356,6 @@ void FMaterialInstanceEditor::InitMaterialInstanceEditor( const EToolkitMode::Ty
 	UMaterialInstanceConstant* InstanceConstant = bIsFunctionPreviewMaterial ? FunctionInstanceProxy : Cast<UMaterialInstanceConstant>(ObjectToEdit);
 
 	bShowAllMaterialParameters = false;
-	bShowMobileStats = false;
 
 	// Construct a temp holder for our instance parameters.
 	MaterialEditorInstance = NewObject<UMaterialEditorInstanceConstant>(GetTransientPackage(), NAME_None, RF_Transactional);
@@ -362,6 +366,9 @@ void FMaterialInstanceEditor::InitMaterialInstanceEditor( const EToolkitMode::Ty
 	MaterialEditorInstance->SetSourceInstance(InstanceConstant);
 	MaterialEditorInstance->SetSourceFunction(MaterialFunctionOriginal);
 
+	MaterialStatsManager = FMaterialStatsUtils::CreateMaterialStats(this);
+	MaterialStatsManager->SetMaterialDisplayName(MaterialEditorInstance->SourceInstance->GetName());
+
 	// Register our commands. This will only register them if not previously registered
 	FMaterialEditorCommands::Register();
 
@@ -638,7 +645,9 @@ void FMaterialInstanceEditor::BindCommands()
 	ToolkitCommands->MapAction(
 		Commands.Apply,
 		FExecuteAction::CreateSP( this, &FMaterialInstanceEditor::OnApply ),
-		FCanExecuteAction::CreateSP( this, &FMaterialInstanceEditor::OnApplyEnabled ) );
+		FCanExecuteAction::CreateSP( this, &FMaterialInstanceEditor::OnApplyEnabled ),
+		FIsActionChecked(),
+		FIsActionButtonVisible::CreateSP(this, &FMaterialInstanceEditor::OnApplyVisible));
 
 	ToolkitCommands->MapAction(
 		Commands.ShowAllMaterialParameters,
@@ -651,12 +660,6 @@ void FMaterialInstanceEditor::BindCommands()
 		FExecuteAction::CreateSP( PreviewVC.ToSharedRef(), &SMaterialEditor3DPreviewViewport::OnToggleRealtime ),
 		FCanExecuteAction(),
 		FIsActionChecked::CreateSP( PreviewVC.ToSharedRef(), &SMaterialEditor3DPreviewViewport::IsRealtime ) );
-
-	ToolkitCommands->MapAction(
-		Commands.ToggleMobileStats,
-		FExecuteAction::CreateSP(this, &FMaterialInstanceEditor::ToggleMobileStats),
-		FCanExecuteAction(),
-		FIsActionChecked::CreateSP(this, &FMaterialInstanceEditor::IsToggleMobileStatsChecked));
 }
 
 void FMaterialInstanceEditor::OnApply()
@@ -674,6 +677,11 @@ bool FMaterialInstanceEditor::OnApplyEnabled() const
 	return MaterialEditorInstance && MaterialEditorInstance->bIsFunctionInstanceDirty == true;
 }
 
+bool FMaterialInstanceEditor::OnApplyVisible() const
+{
+	return MaterialEditorInstance && MaterialEditorInstance->bIsFunctionPreviewMaterial == true;
+}
+
 bool FMaterialInstanceEditor::OnRequestClose()
 {
 	if (MaterialEditorInstance->bIsFunctionInstanceDirty)
@@ -715,38 +723,6 @@ bool FMaterialInstanceEditor::IsShowAllMaterialParametersChecked() const
 	return bShowAllMaterialParameters;
 }
 
-void FMaterialInstanceEditor::ToggleMobileStats()
-{
-	bShowMobileStats = !bShowMobileStats;
-	UMaterialInstanceConstant* MIC = Cast<UMaterialInstanceConstant>(GetMaterialInterface());
-	if (bShowMobileStats && MIC)
-	{
-		UMaterial* BaseMaterial = MIC->GetBaseMaterial();
-		if (BaseMaterial)
-		{
-			FMaterialUpdateContext UpdateContext;
-			UpdateContext.AddMaterial(BaseMaterial);
-			do 
-			{
-				MIC->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1,bShowMobileStats);
-				if (MIC->bHasStaticPermutationResource)
-				{
-					MIC->ForceRecompileForRendering();
-				}
-				MIC = Cast<UMaterialInstanceConstant>(MIC->Parent);
-			} while (MIC);
-			BaseMaterial->SetFeatureLevelToCompile(ERHIFeatureLevel::ES3_1,bShowMobileStats);
-			BaseMaterial->ForceRecompileForRendering();
-		}
-	}
-	PreviewVC->RefreshViewport();
-}
-
-bool FMaterialInstanceEditor::IsToggleMobileStatsChecked() const
-{
-	return bShowMobileStats;
-}
-
 void FMaterialInstanceEditor::OnOpenMaterial(TWeakObjectPtr<UMaterialInterface> InMaterial)
 {
 	OpenSelectedParentEditor(InMaterial.Get());
@@ -795,7 +771,6 @@ void FMaterialInstanceEditor::CreateInternalWidgets()
 	}
 }
 
-
 void FMaterialInstanceEditor::UpdatePreviewViewportsVisibility()
 {
 	UMaterial* PreviewMaterial = GetMaterialInterface()->GetBaseMaterial();
@@ -823,7 +798,7 @@ void FMaterialInstanceEditor::FillToolbar(FToolBarBuilder& ToolbarBuilder)
 	{
 		ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().ShowAllMaterialParameters);
 		// TODO: support in material instance editor.
-		ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().ToggleMobileStats);
+		ToolbarBuilder.AddToolBarButton(FMaterialEditorCommands::Get().TogglePlatformStats);
 	}
 	ToolbarBuilder.EndSection();
 	ToolbarBuilder.BeginSection("Parent");
@@ -1114,6 +1089,9 @@ void FMaterialInstanceEditor::NotifyPostChange( const FPropertyChangedEvent& Pro
 		UpdatePropertyWindow();
 	}
 
+	// something was changed in the material so we need to reflect this in the stats
+	MaterialStatsManager->SignalMaterialChanged();
+
 	// Update the preview window when the user changes a property.
 	PreviewVC->RefreshViewport();
 }
@@ -1226,16 +1204,10 @@ void FMaterialInstanceEditor::DrawMessages( FViewport* Viewport, FCanvas* Canvas
 		if ( BaseMaterial && MaterialResource )
 		{
 			const bool bGeneratedNewShaders = MaterialEditorInstance->SourceInstance->bHasStaticPermutationResource;
-			FMaterialEditor::DrawMaterialInfoStrings( Canvas, BaseMaterial, MaterialResource, MaterialResource->GetCompileErrors(), DrawPositionY, true, bGeneratedNewShaders );
-		}
-		if (bShowMobileStats)
-		{
-			const FMaterialResource* MaterialResourceES2 = MaterialEditorInstance->SourceInstance->GetMaterialResource(ERHIFeatureLevel::ES3_1);
-			if ( BaseMaterial && MaterialResourceES2 )
-			{
-				FMaterialEditor::DrawMaterialInfoStrings( Canvas, BaseMaterial, MaterialResourceES2, MaterialResourceES2->GetCompileErrors(), DrawPositionY, true );
-			}
+			const bool bAllowOldMaterialStats = true;
+			FMaterialEditor::DrawMaterialInfoStrings( Canvas, BaseMaterial, MaterialResource, MaterialResource->GetCompileErrors(), DrawPositionY, bAllowOldMaterialStats, bGeneratedNewShaders );
 		}
+
 		DrawSamplerWarningStrings( Canvas, DrawPositionY );
 	}
 	Canvas->PopTransform();
@@ -1344,6 +1316,17 @@ void FMaterialInstanceEditor::GetShowHiddenParameters(bool& bShowHiddenParameter
 	bShowHiddenParameters = bShowAllMaterialParameters;
 }
 
+void FMaterialInstanceEditor::Tick(float DeltaTime)
+{
+	MaterialStatsManager->SetMaterial(MaterialEditorInstance->SourceInstance);
+	MaterialStatsManager->Update();
+}
+
+TStatId FMaterialInstanceEditor::GetStatId() const
+{
+	RETURN_QUICK_DECLARE_CYCLE_STAT(FMaterialInstanceEditor, STATGROUP_Tickables);
+}
+
 void FMaterialInstanceEditor::SaveAsset_Execute()
 {
 	if (bIsFunctionPreviewMaterial && MaterialEditorInstance)
@@ -1371,7 +1354,6 @@ void FMaterialInstanceEditor::SaveSettings()
 	GConfig->SetBool(TEXT("MaterialInstanceEditor"), TEXT("bShowGrid"), PreviewVC->IsTogglePreviewGridChecked(), GEditorPerProjectIni);
 	GConfig->SetBool(TEXT("MaterialInstanceEditor"), TEXT("bDrawGrid"), PreviewVC->IsRealtime(), GEditorPerProjectIni);
 	GConfig->SetInt(TEXT("MaterialInstanceEditor"), TEXT("PrimType"), PreviewVC->PreviewPrimType, GEditorPerProjectIni);
-	GConfig->SetBool(TEXT("MaterialInstanceEditor"), TEXT("bWantsMobileStats"), IsToggleMobileStatsChecked(), GEditorPerProjectIni);
 }
 
 void FMaterialInstanceEditor::LoadSettings()
@@ -1379,16 +1361,9 @@ void FMaterialInstanceEditor::LoadSettings()
 	bool bRealtime=false;
 	bool bShowGrid=false;
 	int32 PrimType=static_cast<EThumbnailPrimType>( TPT_Sphere );
-	bool bWantsMobileStats=false;
 	GConfig->GetBool(TEXT("MaterialInstanceEditor"), TEXT("bShowGrid"), bShowGrid, GEditorPerProjectIni);
 	GConfig->GetBool(TEXT("MaterialInstanceEditor"), TEXT("bDrawGrid"), bRealtime, GEditorPerProjectIni);
 	GConfig->GetInt(TEXT("MaterialInstanceEditor"), TEXT("PrimType"), PrimType, GEditorPerProjectIni);
-	GConfig->GetBool(TEXT("MaterialInstanceEditor"), TEXT("bWantsMobileStats"), bWantsMobileStats, GEditorPerProjectIni);
-
-	if (bWantsMobileStats)
-	{
-		ToggleMobileStats();
-	}
 
 	if(PreviewVC.IsValid())
 	{
@@ -1503,4 +1478,9 @@ void FMaterialInstanceEditor::PostRedo( bool bSuccess )
 	Refresh();
 }
 
+void FMaterialInstanceEditor::NotifyExternalMaterialChange()
+{
+	MaterialStatsManager->SignalMaterialChanged();
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.h
index 947594831a05..1631a8e22855 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.h
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialInstanceEditor.h
@@ -10,9 +10,10 @@
 #include "IMaterialEditor.h"
 #include "IDetailsView.h"
 #include "SMaterialEditorViewport.h"
-#include "Widgets/Views/STableViewBase.h"
 #include "Widgets/Views/STableRow.h"
 
+#include "TickableEditorObject.h"
+
 class FCanvas;
 class UMaterialEditorInstanceConstant;
 class UMaterialInterface;
@@ -24,7 +25,7 @@ template <typename ItemType> class SListView;
 /**
  * Material Instance Editor class
  */
-class FMaterialInstanceEditor : public IMaterialEditor, public FNotifyHook, public FGCObject, public FEditorUndoClient
+class FMaterialInstanceEditor : public IMaterialEditor, public FNotifyHook, public FGCObject, public FEditorUndoClient, public FTickableEditorObject
 {
 public:
 	
@@ -102,6 +103,12 @@ public:
 	virtual TSharedPtr<FExtensibilityManager> GetMenuExtensibilityManager() { return MenuExtensibilityManager; }
 	virtual TSharedPtr<FExtensibilityManager> GetToolBarExtensibilityManager() { return ToolBarExtensibilityManager; }
 
+	virtual void Tick(float DeltaTime) override;
+	virtual TStatId GetStatId() const override;
+
+	/** call this to notify the editor that the edited material changed from outside */
+	virtual void NotifyExternalMaterialChange() override;
+
 protected:
 	//~ FAssetEditorToolkit interface
 	virtual void SaveAsset_Execute() override;
@@ -130,15 +137,13 @@ private:
 	/** Command for the apply button */
 	void OnApply();
 	bool OnApplyEnabled() const;
+	bool OnApplyVisible() const;
+
 
 	/** Commands for the ShowAllMaterialParametersEnabled button */
 	void ToggleShowAllMaterialParameters();
 	bool IsShowAllMaterialParametersChecked() const;
 
-	/** Commands for the ToggleMobileStats button */
-	void ToggleMobileStats();
-	bool IsToggleMobileStatsChecked() const;
-
 	/** Commands for the Parents menu */
 	void OnOpenMaterial(TWeakObjectPtr<UMaterialInterface> InMaterial);
 	void OnOpenFunction(TWeakObjectPtr<UMaterialFunctionInterface> InFunction);
@@ -221,9 +226,6 @@ private:
 	/** Whether or not we should be displaying all the material parameters */
 	bool bShowAllMaterialParameters;
 
-	/** Whether to show mobile material stats. */
-	bool bShowMobileStats;
-
 	/** If editing instance of a function instead of a material. */
 	bool bIsFunctionPreviewMaterial;
 
@@ -241,4 +243,7 @@ private:
 	static const FName PropertiesTabId;	
 	static const FName LayerPropertiesTabId;
 	static const FName PreviewSettingsTabId;
+
+	/** Object used as material statistics manager */
+	TSharedPtr<class FMaterialStats> MaterialStatsManager;
 };
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialPropertyHelpers.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialPropertyHelpers.cpp
index 47ce5ed655f7..10eb65afde61 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/MaterialPropertyHelpers.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialPropertyHelpers.cpp
@@ -50,6 +50,8 @@
 #include "Materials/MaterialFunctionMaterialLayerBlend.h"
 #include "Factories/MaterialFunctionMaterialLayerFactory.h"
 #include "Factories/MaterialFunctionMaterialLayerBlendFactory.h"
+#include "Curves/CurveLinearColorAtlas.h"
+#include "Curves/CurveLinearColor.h"
 
 #define LOCTEXT_NAMESPACE "MaterialPropertyHelper"
 
@@ -57,6 +59,42 @@ FText FMaterialPropertyHelpers::LayerID = LOCTEXT("LayerID", "Layer Asset");
 FText FMaterialPropertyHelpers::BlendID = LOCTEXT("BlendID", "Blend Asset");
 FName FMaterialPropertyHelpers::LayerParamName = FName("Global Material Layers Parameter Values");
 
+
+void SLayerHandle::Construct(const FArguments& InArgs)
+{
+	OwningStack = InArgs._OwningStack;
+
+	ChildSlot
+		[
+			InArgs._Content.Widget
+		];
+}
+
+FReply SLayerHandle::OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.IsMouseButtonDown(EKeys::LeftMouseButton))
+	{
+		{
+			TSharedPtr<FDragDropOperation> DragDropOp = CreateDragDropOperation(OwningStack.Pin());
+			if (DragDropOp.IsValid())
+			{
+				OwningStack.Pin()->OnLayerDragDetected();
+				return FReply::Handled().BeginDragDrop(DragDropOp.ToSharedRef());
+			}
+		}
+	}
+
+	return FReply::Unhandled();
+
+}
+
+TSharedPtr<FLayerDragDropOp> SLayerHandle::CreateDragDropOperation(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> InOwningStack)
+{
+	TSharedPtr<FLayerDragDropOp> Operation = MakeShareable(new FLayerDragDropOp(InOwningStack));
+
+	return Operation;
+}
+
 EVisibility FMaterialPropertyHelpers::ShouldShowExpression(UDEditorParameterValue* Parameter, UMaterialEditorInstanceConstant* MaterialEditorInstance, FGetShowHiddenParameters ShowHiddenDelegate)
 {
 	bool bShowHidden = true;
@@ -346,7 +384,7 @@ void FMaterialPropertyHelpers::CopyMaterialToInstance(UMaterialInstanceConstant*
 }
 
 
-void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceConstant* ChildInstance, TArray<FEditorParameterGroup> &ParameterGroups)
+void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceConstant* ChildInstance, TArray<FEditorParameterGroup> &ParameterGroups, bool bForceCopy)
 {
 	if (ChildInstance)
 	{
@@ -368,7 +406,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 					UDEditorScalarParameterValue* ScalarParameterValue = Cast<UDEditorScalarParameterValue>(Group.Parameters[ParameterIdx]);
 					if (ScalarParameterValue)
 					{
-						if (ScalarParameterValue->bOverride)
+						if (ScalarParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedScalarInfo = FMaterialParameterInfo();
 							TransitionedScalarInfo.Name = ScalarParameterValue->ParameterInfo.Name;
@@ -379,7 +417,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 					UDEditorFontParameterValue* FontParameterValue = Cast<UDEditorFontParameterValue>(Group.Parameters[ParameterIdx]);
 					if (FontParameterValue)
 					{
-						if (FontParameterValue->bOverride)
+						if (FontParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedFontInfo = FMaterialParameterInfo();
 							TransitionedFontInfo.Name = FontParameterValue->ParameterInfo.Name;
@@ -391,7 +429,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 					UDEditorTextureParameterValue* TextureParameterValue = Cast<UDEditorTextureParameterValue>(Group.Parameters[ParameterIdx]);
 					if (TextureParameterValue)
 					{
-						if (TextureParameterValue->bOverride)
+						if (TextureParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedTextureInfo = FMaterialParameterInfo();
 							TransitionedTextureInfo.Name = TextureParameterValue->ParameterInfo.Name;
@@ -402,7 +440,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 					UDEditorVectorParameterValue* VectorParameterValue = Cast<UDEditorVectorParameterValue>(Group.Parameters[ParameterIdx]);
 					if (VectorParameterValue)
 					{
-						if (VectorParameterValue->bOverride)
+						if (VectorParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedVectorInfo = FMaterialParameterInfo();
 							TransitionedVectorInfo.Name = VectorParameterValue->ParameterInfo.Name;
@@ -417,7 +455,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 						bool SwitchValue = StaticSwitchParameterValue->ParameterValue;
 						FGuid ExpressionIdValue = StaticSwitchParameterValue->ExpressionId;
 
-						if (StaticSwitchParameterValue->bOverride)
+						if (StaticSwitchParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedSwitchInfo = FMaterialParameterInfo();
 							TransitionedSwitchInfo.Name = StaticSwitchParameterValue->ParameterInfo.Name;
@@ -437,7 +475,7 @@ void FMaterialPropertyHelpers::TransitionAndCopyParameters(UMaterialInstanceCons
 						bool MaskA = StaticComponentMaskParameterValue->ParameterValue.A;
 						FGuid ExpressionIdValue = StaticComponentMaskParameterValue->ExpressionId;
 
-						if (StaticComponentMaskParameterValue->bOverride)
+						if (StaticComponentMaskParameterValue->bOverride || bForceCopy)
 						{
 							FMaterialParameterInfo TransitionedMaskInfo = FMaterialParameterInfo();
 							TransitionedMaskInfo.Name = StaticComponentMaskParameterValue->ParameterInfo.Name;
@@ -1099,5 +1137,93 @@ TArray<UFactory*> FMaterialPropertyHelpers::GetAssetFactories(EMaterialParameter
 	return NewAssetFactories;
 }
 
+
+TSharedRef<SWidget> FMaterialPropertyHelpers::MakeStackReorderHandle(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> InOwningStack)
+{
+	TSharedRef<SLayerHandle> Handle = SNew(SLayerHandle)
+		.Content()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+		.Padding(5.0f, 0.0f)
+		[
+			SNew(SImage)
+			.Image(FCoreStyle::Get().GetBrush("VerticalBoxDragIndicatorShort"))
+		]
+		]
+	.OwningStack(InOwningStack);
+	return Handle;
+}
+
+bool FMaterialPropertyHelpers::OnShouldSetCurveAsset(const FAssetData& AssetData, TSoftObjectPtr<class UCurveLinearColorAtlas> InAtlas)
+{
+	UCurveLinearColorAtlas* Atlas = Cast<UCurveLinearColorAtlas>(InAtlas.Get());
+	UCurveLinearColor* Curve = Cast<UCurveLinearColor>(AssetData.GetAsset());
+	if (!Atlas || !Curve)
+	{
+		return false;
+	}
+	int32 Index = Atlas->GradientCurves.Find(Curve);
+	return Index != INDEX_NONE;
+}
+
+void FMaterialPropertyHelpers::SetPositionFromCurveAsset(const FAssetData& AssetData, TSoftObjectPtr<class UCurveLinearColorAtlas> InAtlas, UDEditorScalarParameterValue* InParameter, TSharedPtr<IPropertyHandle> PropertyHandle, UObject* MaterialEditorInstance)
+{
+	UCurveLinearColorAtlas* Atlas = Cast<UCurveLinearColorAtlas>(InAtlas.Get());
+	UCurveLinearColor* Curve = Cast<UCurveLinearColor>(AssetData.GetAsset());
+	if (!Atlas || !Curve)
+	{
+		return;
+	}
+	int32 Index = Atlas->GradientCurves.Find(Curve);
+	if (Index == INDEX_NONE)
+	{
+		return;
+	}
+
+	float NewValue = ((float)Index * Atlas->GradientPixelSize) / Atlas->TextureSize + (0.5f * Atlas->GradientPixelSize) / Atlas->TextureSize;
+
+	// If changed, propagate the update
+	if (InParameter->ParameterValue != NewValue)
+	{
+		const FScopedTransaction Transaction(LOCTEXT("SetScalarAtlasPositionValue", "Set Scalar Atlas Position Value"));
+		InParameter->Modify();
+
+		PropertyHandle->NotifyPreChange();
+		
+		InParameter->AtlasData.Curve = TSoftObjectPtr<UCurveLinearColor>(FSoftObjectPath(Curve->GetPathName()));
+		InParameter->ParameterValue = NewValue;
+		UMaterialEditorInstanceConstant* MaterialInstanceEditor = Cast<UMaterialEditorInstanceConstant>(MaterialEditorInstance);
+		if (MaterialInstanceEditor)
+		{
+			MaterialInstanceEditor->CopyToSourceInstance();
+		}
+
+		PropertyHandle->NotifyPostChange();
+	}
+}
+
+void FMaterialPropertyHelpers::ResetCurveToDefault(TSharedPtr<IPropertyHandle> PropertyHandle, class UDEditorParameterValue* Parameter, UMaterialEditorInstanceConstant* MaterialEditorInstance)
+{
+	const FScopedTransaction Transaction(LOCTEXT("ResetToDefault", "Reset To Default"));
+	Parameter->Modify();
+	bool TempBool;
+	const FMaterialParameterInfo& ParameterInfo = Parameter->ParameterInfo;
+
+	UDEditorScalarParameterValue* ScalarParam = Cast<UDEditorScalarParameterValue>(Parameter);
+
+	if (ScalarParam)
+	{
+		float OutValue;
+		if (MaterialEditorInstance->SourceInstance->GetScalarParameterDefaultValue(ParameterInfo, OutValue))
+		{
+			ScalarParam->ParameterValue = OutValue;
+			MaterialEditorInstance->SourceInstance->IsScalarParameterUsedAsAtlasPosition(ParameterInfo, TempBool, ScalarParam->AtlasData.Curve, ScalarParam->AtlasData.Atlas);
+			MaterialEditorInstance->CopyToSourceInstance();
+		}
+	}
+}
+
+
 #undef LOCTEXT_NAMESPACE
 
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.cpp
new file mode 100644
index 000000000000..ed1e291bb61f
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.cpp
@@ -0,0 +1,1116 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "MaterialStats.h"
+#include "MaterialStatsGrid.h"
+#include "SMaterialEditorStatsWidget.h"
+#include "EditorStyleSet.h"
+#include "Widgets/Input/SComboBox.h"
+#include "Widgets/Docking/SDockTab.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Layout/SSeparator.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "HAL/PlatformApplicationMisc.h"
+#include "MaterialEditorActions.h"
+#include "Materials/MaterialInstance.h"
+#include "IMaterialEditor.h"
+#include "Preferences/MaterialStatsOptions.h"
+#include "MaterialEditorSettings.h"
+
+#include "Modules/ModuleManager.h"
+#include "Developer/MessageLog/Public/MessageLogModule.h"
+
+#define LOCTEXT_NAMESPACE "MaterialStats"
+
+const FName FMaterialStats::StatsTabId(TEXT("MaterialStats_Grid"));
+const FName FMaterialStats::OldStatsTabId(TEXT("OldMaterialStats_Grid"));
+const FName FMaterialStats::HLSLCodeTabId(TEXT("MaterialStats_HLSLCode"));
+
+/***********************************************************************************************************************/
+/*begin FShaderPlatformSettings functions*/
+
+FShaderPlatformSettings::FShaderPlatformSettings(
+	const EPlatformCategoryType _PlatformType,
+	const EShaderPlatform _ShaderPlatformID,
+	const FName _Name,
+	const bool _bAllowPresenceInGrid,
+	const bool _bAllowCodeView,
+	const FString& _Description)
+	:
+	PlatformType(_PlatformType),
+	PlatformShaderID(_ShaderPlatformID),
+	PlatformName(_Name),
+	PlatformDescription(_Description),
+	bAllowCodeView(_bAllowCodeView),
+	bAllowPresenceInGrid(_bAllowPresenceInGrid)
+{
+	PlatformNameID = *FMaterialStatsUtils::ShaderPlatformTypeName(PlatformShaderID);
+}
+
+void FShaderPlatformSettings::ClearResources()
+{
+	// free material resources
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		if (PlatformData[i].MaterialResourcesStats != nullptr)
+		{
+			delete PlatformData[i].MaterialResourcesStats;
+			PlatformData[i].MaterialResourcesStats = nullptr;
+		}
+
+		PlatformData[i].ArrShaderNames.Empty();
+
+		PlatformData[i].bCompilingShaders = false;
+		PlatformData[i].bNeedShaderRecompilation = true;
+	}
+}
+
+FText FShaderPlatformSettings::GetSelectedShaderViewComboText(EMaterialQualityLevel::Type QualityLevel) const
+{
+	if (PlatformData[QualityLevel].ArrShaderNames.Num() == 0)
+	{
+		return FText::FromString(TEXT("-Compiling-Shaders-"));
+	}
+
+	return FText::FromName(PlatformData[QualityLevel].ComboBoxSelectedName);
+}
+
+void FShaderPlatformSettings::OnShaderViewComboSelectionChanged(TSharedPtr<FName> Item, EMaterialQualityLevel::Type QualityType)
+{
+	if (Item.IsValid())
+	{
+		PlatformData[QualityType].ComboBoxSelectedName = *Item.Get();
+		PlatformData[QualityType].bUpdateShaderCode = true;
+	}
+}
+
+FText FShaderPlatformSettings::GetShaderCode(const EMaterialQualityLevel::Type QualityType)
+{
+	// if there were no change to the material return the cached shader code
+	if (!PlatformData[QualityType].bUpdateShaderCode)
+	{
+		return PlatformData[QualityType].ShaderCode;
+	}
+
+	PlatformData[QualityType].ShaderCode = LOCTEXT("ShaderCodeMsg", "Shader code compiling or not available!");
+
+	FMaterialResource *Resource = PlatformData[QualityType].MaterialResourcesStats;
+	const FMaterialShaderMap* MaterialShaderMap = Resource->GetGameThreadShaderMap();
+
+	const bool bCompilationFinished = Resource->IsCompilationFinished() && (MaterialShaderMap != nullptr);
+
+	// check if shader compilation is done and extract shader code
+	if (bCompilationFinished)
+	{
+		TMap<FName, FShader*> ShaderMap;
+		MaterialShaderMap->GetShaderList(ShaderMap);
+
+		const auto Entry = ShaderMap.Find(PlatformData[QualityType].ComboBoxSelectedName);
+		if (Entry != nullptr)
+		{
+			const FShader* Shader = *Entry;
+
+			const FName ShaderFName = Shader->GetType()->GetFName();
+			const FString* ShaderSource = MaterialShaderMap->GetShaderSource(ShaderFName);
+			if (ShaderSource != nullptr)
+			{
+				PlatformData[QualityType].bUpdateShaderCode = false;
+				PlatformData[QualityType].ShaderCode = FText::FromString(*ShaderSource);
+			}
+		}
+	}
+
+	return PlatformData[QualityType].ShaderCode;
+}
+
+void FShaderPlatformSettings::AllocateMaterialResources()
+{
+	ClearResources();
+
+	const ERHIFeatureLevel::Type TargetFeatureLevel = GetMaxSupportedFeatureLevel(PlatformShaderID);
+
+	for (int32 QualityLevelIndex = 0; QualityLevelIndex < EMaterialQualityLevel::Num; QualityLevelIndex++)
+	{
+		PlatformData[QualityLevelIndex].MaterialResourcesStats = new FMaterialResourceStats();
+		PlatformData[QualityLevelIndex].MaterialResourcesStats->SetMaterial(Material, (EMaterialQualityLevel::Type)QualityLevelIndex, true, (ERHIFeatureLevel::Type)TargetFeatureLevel, MaterialInstance);
+	}
+}
+
+void FShaderPlatformSettings::SetMaterial(UMaterial* InMaterial)
+{
+	// if this is a different material, clear away the old one's resources and compile new shaders
+	if (Material != InMaterial)
+	{
+		Material = InMaterial;
+		MaterialInstance = nullptr;
+
+		AllocateMaterialResources();
+	}
+}
+
+void FShaderPlatformSettings::SetMaterial(UMaterialInstance* InMaterialInstance)
+{
+	if (MaterialInstance != InMaterialInstance)
+	{
+		MaterialInstance = InMaterialInstance;
+		Material = MaterialInstance->GetMaterial();
+
+		AllocateMaterialResources();
+	}
+}
+
+bool FShaderPlatformSettings::CheckShaders()
+{
+	bool bRetValue = false;
+
+	if (Material != nullptr)
+	{
+		// check and triggers shader recompilation if needed
+		for (int32 QualityLevelIndex = 0; QualityLevelIndex < EMaterialQualityLevel::Num; QualityLevelIndex++)
+		{
+			auto &Data = PlatformData[QualityLevelIndex];
+			const bool bNeedsShaders = (bPresentInGrid && Data.bExtractStats) || Data.bExtractCode;
+			if (Data.bNeedShaderRecompilation && bNeedsShaders)
+			{
+				Data.MaterialResourcesStats->CancelCompilation();
+
+				Material->RebuildExpressionTextureReferences();
+
+				if (MaterialInstance != nullptr)
+				{
+					MaterialInstance->PermutationTextureReferences.Empty();
+					MaterialInstance->AppendReferencedTextures(MaterialInstance->PermutationTextureReferences);
+				}
+
+				FMaterialShaderMapId ShaderMapId;
+				Data.MaterialResourcesStats->GetShaderMapId(PlatformShaderID, ShaderMapId);
+				Data.MaterialResourcesStats->CacheShaders(ShaderMapId, PlatformShaderID, false);
+
+				Data.bCompilingShaders = true;
+				Data.bUpdateShaderCode = true;
+				Data.bNeedShaderRecompilation = false;
+
+				Data.ShaderStatsInfo.Reset();
+
+				bRetValue = true;
+			}
+		}
+	}
+
+	return bRetValue;
+}
+
+bool FShaderPlatformSettings::Update()
+{
+	bool bRetValue = CheckShaders();
+
+	// if a shader compilation has been requested check if completed and extract shader names needed by code viewer combo-box
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		auto& QualityItem = PlatformData[i];
+		if (QualityItem.bCompilingShaders)
+		{
+			FMaterialResource* Resource = QualityItem.MaterialResourcesStats;
+
+			// if compilation is complete extract the list of compiled shader names
+			const bool bCompilationFinished = Resource->IsCompilationFinished();
+			if (bCompilationFinished)
+			{
+				QualityItem.bCompilingShaders = false;
+				QualityItem.bUpdateShaderCode = true;
+
+				const FMaterialShaderMap* MaterialShaderMap = Resource->GetGameThreadShaderMap();
+				if (MaterialShaderMap != nullptr)
+				{
+					TMap<FShaderId, FShader*> ShaderMap;
+					MaterialShaderMap->GetShaderList(ShaderMap);
+
+					QualityItem.ArrShaderNames.Empty();
+					for (const auto Entry : ShaderMap)
+					{
+						QualityItem.ArrShaderNames.Add(MakeShareable(new FName(Entry.Key.ShaderType->GetFName())));
+					}
+
+					if (QualityItem.ArrShaderNames.Num() > 0)
+					{
+						QualityItem.ComboBoxSelectedName = *QualityItem.ArrShaderNames[0];
+					}
+				}
+
+				FMaterialStatsUtils::ExtractMatertialStatsInfo(QualityItem.ShaderStatsInfo, Resource);
+
+				bRetValue = true;
+			}
+		}
+	}
+
+	return bRetValue;
+}
+
+/*end FShaderPlatformSettings functions*/
+/***********************************************************************************************************************/
+
+/***********************************************************************************************************************/
+/*begin FMaterialStats functions*/
+
+FMaterialStats::~FMaterialStats()
+{
+	SaveSettings();
+}
+
+void FMaterialStats::Initialize(IMaterialEditor* InMaterialEditor)
+{
+	MaterialEditor = InMaterialEditor;
+
+	StatsGrid = MakeShareable(new FMaterialStatsGrid(AsShared()));
+
+	BuildShaderPlatformDB();
+
+	LoadSettings();
+
+	StatsGrid->BuildGrid();
+
+	GridStatsWidget = SNew(SMaterialEditorStatsWidget)
+		.MaterialStatsWPtr(SharedThis(this));
+
+	FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>("MessageLog");
+	FMessageLogInitializationOptions LogOptions;
+	// Show Pages so that user is never allowed to clear log messages
+	LogOptions.bShowPages = false;
+	LogOptions.bShowFilters = false; //TODO - Provide custom filters? E.g. "Critical Errors" vs "Errors" needed for materials?
+	LogOptions.bAllowClear = false;
+	LogOptions.MaxPageCount = 1;
+	OldStatsListing = MessageLogModule.CreateLogListing("MaterialEditorStats", LogOptions);
+	OldStatsWidget = MessageLogModule.CreateLogListingWidget(OldStatsListing.ToSharedRef());
+
+	auto ToolkitCommands = MaterialEditor->GetToolkitCommands();
+	const FMaterialEditorCommands& Commands = FMaterialEditorCommands::Get();
+
+	ToolkitCommands->MapAction(
+		Commands.TogglePlatformStats,
+		FExecuteAction::CreateSP(this, &FMaterialStats::ToggleStats),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &FMaterialStats::IsShowingStats));
+
+	ToolkitCommands->MapAction(
+		Commands.ToggleMaterialStats,
+		FExecuteAction::CreateSP(this, &FMaterialStats::ToggleOldStats),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &FMaterialStats::IsShowingOldStats));
+}
+
+void FMaterialStats::LoadSettings()
+{
+	Options = NewObject<UMaterialStatsOptions>();
+
+	for (const auto PlatformEntry : ShaderPlatformStatsDB)
+	{
+		const EShaderPlatform PlatformID = PlatformEntry.Key;
+		const bool bPresentInGrid = !!Options->bPlatformUsed[PlatformID];
+
+		auto Platform = PlatformEntry.Value;
+		Platform->SetPresentInGrid(bPresentInGrid);
+	}
+
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		const bool bUsed = !!Options->bMaterialQualityUsed[i];
+		bArrStatsQualitySelector[(EMaterialQualityLevel::Type)i] = bUsed;
+
+		for (const auto PlatformEntry : ShaderPlatformStatsDB)
+		{
+			TSharedPtr<FShaderPlatformSettings> SomePlatform = PlatformEntry.Value;
+			if (SomePlatform.IsValid())
+			{
+				SomePlatform->SetExtractStatsQualityLevel((EMaterialQualityLevel::Type)i, bUsed);
+			}
+		}
+	}
+}
+
+void FMaterialStats::SaveSettings()
+{
+	for (const auto PlatformEntry : ShaderPlatformStatsDB)
+	{
+		const EShaderPlatform PlatformID = PlatformEntry.Key;
+		const auto Platform = PlatformEntry.Value;
+
+		const bool bPresentInGrid = Platform->IsPresentInGrid();
+		Options->bPlatformUsed[PlatformID] = bPresentInGrid ? 1 : 0;
+	}
+
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		const bool bQualityPresent = GetStatsQualityFlag((EMaterialQualityLevel::Type)i);
+
+		Options->bMaterialQualityUsed[i] = bQualityPresent ? 1 : 0;
+	}
+
+	Options->SaveConfig();
+}
+
+void FMaterialStats::SetShowStats(const bool bValue)
+{
+	bShowStats = bValue;
+
+	// open/close stats tab
+	DisplayStatsGrid(bShowStats);
+
+	GetGridStatsWidget()->RequestRefresh();
+}
+
+void FMaterialStats::SetShowOldStats(const bool bValue)
+{
+	bShowOldStats = bValue;
+
+	// open/close stats tab
+	DisplayOldStats(bShowOldStats);
+}
+
+void FMaterialStats::ToggleStats()
+{
+	// Toggle the showing of material stats each time the user presses the show stats button
+	SetShowStats(!bShowStats);
+}
+
+void FMaterialStats::ToggleOldStats()
+{
+	// Toggle the showing of material stats each time the user presses the show stats button
+	SetShowOldStats(!bShowOldStats);
+}
+
+void FMaterialStats::DisplayOldStats(const bool bShow)
+{
+	if (bShow)
+	{
+		MaterialEditor->GetTabManager()->InvokeTab(OldStatsTabId);
+	}
+	else if (!bShowOldStats && OldStatsTab.IsValid())
+	{
+		OldStatsTab.Pin()->RequestCloseTab();
+	}
+}
+
+void FMaterialStats::DisplayStatsGrid(const bool bShow)
+{
+	if (bShow)
+	{
+		MaterialEditor->GetTabManager()->InvokeTab(StatsTabId);
+	}
+	else if (!bShowStats && StatsTab.IsValid())
+	{
+		StatsTab.Pin()->RequestCloseTab();
+	}
+}
+
+void FMaterialStats::RefreshStatsGrid()
+{
+	GetGridStatsWidget()->RequestRefresh();
+}
+
+void FMaterialStats::BuildShaderPlatformDB()
+{
+#if PLATFORM_WINDOWS
+	// DirectX
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_PCD3D_SM5, TEXT("DirectX SM5"), true, true, TEXT("Desktop, DirectX, Shader Model 5"));
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_PCD3D_SM4, TEXT("DirectX SM4"), true, true, TEXT("Desktop, DirectX, Shader Model 4"));
+#endif
+
+	// Vulkan
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_VULKAN_SM5, TEXT("Vulkan SM5"), false, true, TEXT("Desktop, Vulkan, Shader Model 5"));
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_VULKAN_SM4, TEXT("Vulkan SM4"), false, true, TEXT("Desktop, Vulkan, Shader Model 4"));
+
+	// OpenGL
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_OPENGL_SM5, TEXT("OpenGL SM5"), false, true, TEXT("Desktop, OpenGL, Shader Model 5"));
+	AddShaderPlatform(EPlatformCategoryType::Desktop, SP_OPENGL_SM4, TEXT("OpenGL SM4"), false, true, TEXT("Desktop, OpenGL, Shader Model 4"));
+
+	// Android
+	AddShaderPlatform(EPlatformCategoryType::Android, SP_OPENGL_ES3_1_ANDROID, TEXT("Android GLES 3.1"), true, true, TEXT("Android, OpenGLES 3.1"));
+	AddShaderPlatform(EPlatformCategoryType::Android, SP_OPENGL_ES2_ANDROID, TEXT("Android GLES 2.0"), true, true, TEXT("Android, OpenGLES 2.0"));
+	AddShaderPlatform(EPlatformCategoryType::Android, SP_VULKAN_ES3_1_ANDROID, TEXT("Android Vulkan"), true, true, TEXT("Android, Vulkan"));
+
+	// iOS
+	AddShaderPlatform(EPlatformCategoryType::IOS, SP_METAL_SM5, TEXT("Metal SM5"), false, true, TEXT("iOS, Metal, Shader Model 5"));
+}
+
+TSharedPtr<FShaderPlatformSettings> FMaterialStats::AddShaderPlatform(const EPlatformCategoryType PlatformType, const EShaderPlatform PlatformID, const FName PlatformName,
+	const bool bAllowPresenceInGrid, const bool bAllowCodeView, const FString& Description)
+{
+	TSharedPtr<FShaderPlatformSettings> PlatformPtr = MakeShareable(new FShaderPlatformSettings(PlatformType, PlatformID, PlatformName, bAllowPresenceInGrid, bAllowCodeView, Description));
+	ShaderPlatformStatsDB.Add(PlatformID, PlatformPtr);
+
+	auto& ArrayPlatforms = PlatformTypeDB.FindOrAdd(PlatformType);
+	ArrayPlatforms.Add(PlatformPtr);
+
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		PlatformPtr->SetExtractStatsFlag((EMaterialQualityLevel::Type)i, bArrStatsQualitySelector[i]);
+	}
+
+	return PlatformPtr;
+}
+
+void FMaterialStats::SignalMaterialChanged()
+{
+	ExtractHLSLCode();
+
+	for (auto Entry : ShaderPlatformStatsDB)
+	{
+		for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+			Entry.Value->SetNeedShaderCompilation((EMaterialQualityLevel::Type)i, true);
+	}
+}
+
+bool FMaterialStats::SwitchShaderPlatformUseStats(const EShaderPlatform PlatformID)
+{
+	bool bRetValue = false;
+
+	auto* Item = ShaderPlatformStatsDB.Find(PlatformID);
+	if (Item != nullptr)
+	{
+		bRetValue = (*Item)->FlipPresentInGrid();
+
+		GetStatsGrid()->OnAddOrRemovePlatform(*Item);
+		SaveSettings();
+	}
+
+	return bRetValue;
+}
+
+void FMaterialStats::SetStatusQualityFlag(const EMaterialQualityLevel::Type QualityLevel, const bool bValue)
+{
+	check(QualityLevel < EMaterialQualityLevel::Num);
+
+	bArrStatsQualitySelector[QualityLevel] = bValue;
+
+	for (const auto PlatformEntry : ShaderPlatformStatsDB)
+	{
+		TSharedPtr<FShaderPlatformSettings> SomePlatform = PlatformEntry.Value;
+		if (SomePlatform.IsValid())
+		{
+			SomePlatform->SetExtractStatsQualityLevel(QualityLevel, bValue);
+		}
+	}
+
+	SaveSettings();
+}
+
+bool FMaterialStats::SwitchStatsQualityFlag(EMaterialQualityLevel::Type Quality)
+{
+	check(Quality < EMaterialQualityLevel::Num);
+
+	const bool bValue = !bArrStatsQualitySelector[Quality];
+	SetStatusQualityFlag(Quality, bValue);
+
+	return bValue;
+}
+
+void FMaterialStats::SetShaderPlatformUseCodeView(const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type Quality, const bool bValue)
+{
+	auto* Item = ShaderPlatformStatsDB.Find(PlatformID);
+	if (Item != nullptr)
+	{
+		(*Item)->SetCodeViewNeeded(Quality, bValue);
+	}
+}
+
+FName FMaterialStats::GetPlatformName(const EShaderPlatform InEnumValue) const
+{
+	FName PlatformName = NAME_None;
+
+	auto* Entry = ShaderPlatformStatsDB.Find(InEnumValue);
+	if (Entry != nullptr && Entry->IsValid())
+	{
+		PlatformName = (*Entry)->GetPlatformName();
+	}
+
+	return PlatformName;
+}
+
+EShaderPlatform FMaterialStats::GetShaderPlatformID(const FName InName) const
+{
+	for (auto Entry : ShaderPlatformStatsDB)
+	{
+		if (Entry.Value.Get()->GetPlatformName() == InName)
+		{
+			return Entry.Key;
+		}
+	}
+
+	return SP_NumPlatforms;
+}
+
+TSharedPtr<FShaderPlatformSettings> FMaterialStats::GetPlatformSettings(const EShaderPlatform PlatformID)
+{
+	auto* Entry = ShaderPlatformStatsDB.Find(PlatformID);
+	if (Entry == nullptr)
+	{
+		return TSharedPtr<FShaderPlatformSettings>(nullptr);
+	}
+
+	return *Entry;
+}
+
+TSharedPtr<FShaderPlatformSettings> FMaterialStats::GetPlatformSettings(const FName PlatformName)
+{
+	const EShaderPlatform PlatformID = GetShaderPlatformID(PlatformName);
+
+	return GetPlatformSettings(PlatformID);
+}
+
+FText FMaterialStats::GetShaderCode(const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type QualityType)
+{
+	auto* Entry = ShaderPlatformStatsDB.Find(PlatformID);
+	if (Entry == nullptr)
+	{
+		return FText::FromString(TEXT("Shader code compiling or not available!"));
+	}
+
+	return (*Entry)->GetShaderCode(QualityType);
+}
+
+void FMaterialStats::Update()
+{
+	const bool bNeedsUpdate = IsShowingStats() || IsCodeViewWindowActive();
+	if (!bNeedsUpdate)
+	{
+		return;
+	}
+
+	bool bInfoChanged = false;
+
+	for (const auto Entry : ShaderPlatformStatsDB)
+	{
+		auto PlatformStats = Entry.Value;
+		bInfoChanged |= PlatformStats->Update();
+	}
+
+	if (bInfoChanged)
+	{
+		GetStatsGrid()->OnShaderChanged();
+	}
+
+	ComputeGridWarnings();
+}
+
+TSharedRef<class SDockTab> FMaterialStats::SpawnTab_HLSLCode(const class FSpawnTabArgs& Args)
+{
+	auto CodeViewUtility =
+		SNew(SVerticalBox)
+		// Copy Button
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(2.0f, 0.0f)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Left)
+			[
+				SNew(SButton)
+				.Text(LOCTEXT("CopyHLSLButton", "Copy"))
+				.ToolTipText(LOCTEXT("CopyHLSLButtonToolTip", "Copies all HLSL code to the clipboard."))
+				.ContentPadding(3)
+				.OnClicked_Lambda
+				(
+					[Code = &HLSLCode]()
+					{
+						FPlatformApplicationMisc::ClipboardCopy(**Code);
+						return FReply::Handled();
+					}
+				)
+			]
+		]
+		// Separator
+		+ SVerticalBox::Slot()
+		.FillHeight(1)
+		[
+			SNew(SSeparator)
+		];
+
+	auto CodeView =
+		SNew(SScrollBox)
+		+ SScrollBox::Slot().Padding(5)
+		[
+			SNew(STextBlock)
+			.Text_Lambda([Code = &HLSLCode]() { return FText::FromString(*Code); })
+		];
+
+
+	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
+		.Label(LOCTEXT("HLSLCodeTitle", "HLSL Code"))
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				CodeViewUtility
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			[
+				CodeView
+			]
+		];
+
+	HLSLTab = SpawnedTab;
+
+	ExtractHLSLCode();
+
+	return SpawnedTab;
+}
+
+TSharedRef<SDockTab> FMaterialStats::SpawnTab_ShaderCode(const FSpawnTabArgs& Args, const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type QualityLevel)
+{
+	SetShaderPlatformUseCodeView(PlatformID, QualityLevel, true);
+
+	const FString PlatformName = GetPlatformName(PlatformID).ToString();
+	const FString FullPlatformName = PlatformName + TEXT(" -- ") + FMaterialStatsUtils::MaterialQualityToString(QualityLevel);
+
+	TSharedPtr<FShaderPlatformSettings> PlatformPtr = GetPlatformSettings(PlatformID);
+	check(PlatformPtr.IsValid());
+
+	TSharedRef<SComboBox<TSharedPtr<FName>>> ShaderBox = SNew(SComboBox<TSharedPtr<FName>>)
+		.OptionsSource(PlatformPtr->GetShaderNames(QualityLevel))
+		.OnGenerateWidget_Lambda([](TSharedPtr<FName> Value) { return SNew(STextBlock).Text(FText::FromName(*Value.Get())); })
+		.OnSelectionChanged_Lambda([PlatformPtr, QualityLevel](TSharedPtr<FName> Item, ESelectInfo::Type SelectInfo) { PlatformPtr->OnShaderViewComboSelectionChanged(Item, QualityLevel); })
+		[
+			SNew(STextBlock)
+			.Text_Lambda([PlatformPtr, QualityLevel]() { return PlatformPtr->GetSelectedShaderViewComboText(QualityLevel); })
+		];
+
+	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SVerticalBox)
+				// Copy Button
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(2.0f, 0.0f)
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Left)
+					[
+						SNew(SButton)
+						.Text(LOCTEXT("CopyShaderCodeButton", "Copy"))
+						.ToolTipText(LOCTEXT("CopyShaderCodeButtonToolTip", "Copies all shader code to the clipboard."))
+						.ContentPadding(3)
+						.OnClicked_Lambda
+						(
+							[MaterialStats = TWeakPtr<FMaterialStats>(SharedThis(this)), PlatformID, QualityLevel]()
+							{
+								auto StatsPtr = MaterialStats.Pin();
+								if (StatsPtr.IsValid())
+								{
+									FText ShaderCode = StatsPtr->GetShaderCode(PlatformID, QualityLevel);
+									FPlatformApplicationMisc::ClipboardCopy(*ShaderCode.ToString());
+									return FReply::Handled();
+								}
+
+								return FReply::Unhandled();
+							}
+						)
+					]
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(2.0f, 2.0f)
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Left)
+					[
+						SNew(STextBlock)
+						.Text(FText::FromString(FullPlatformName))
+					]
+				]
+				// Separator
+				+ SVerticalBox::Slot()
+				.FillHeight(1)
+				[
+					SNew(SSeparator)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				ShaderBox
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			[
+				PlatformPtr->GetShaderViewerScrollBox(QualityLevel).ToSharedRef()
+			]
+		];
+
+	PlatformPtr->SetCodeViewerTab(QualityLevel, SpawnedTab);
+
+	SpawnedTab->SetLabel(FText::FromString(PlatformName));
+
+	return SpawnedTab;
+}
+
+FName FMaterialStats::MakeTabName(const EPlatformCategoryType PlatformType, const EShaderPlatform ShaderPlatformType, const EMaterialQualityLevel::Type QualityLevel)
+{
+	const FString TabName = FMaterialStatsUtils::GetPlatformTypeName(PlatformType) + FMaterialStatsUtils::ShaderPlatformTypeName(ShaderPlatformType) + FMaterialStatsUtils::MaterialQualityToString(QualityLevel);
+
+	return FName(*TabName);
+}
+
+void FMaterialStats::BuildViewShaderCodeMenus()
+{
+	auto TabManager = MaterialEditor->GetTabManager();
+	auto ParentCategoryRef = MaterialEditor->GetWorkspaceMenuCategory();
+
+	TSharedPtr<FWorkspaceItem> PlatformGroupMenuItem = ParentCategoryRef->AddGroup(LOCTEXT("ViewShaderCodePlatformsGroupMenu", "Shader Code"),
+		FSlateIcon(FEditorStyle::GetStyleSetName(), "MaterialEditor.Tabs.HLSLCode"));
+
+	// add hlsl code viewer tab
+	TabManager->RegisterTabSpawner( HLSLCodeTabId, FOnSpawnTab::CreateSP(this, &FMaterialStats::SpawnTab_HLSLCode))
+		.SetDisplayName( LOCTEXT("HLSLCodeTab", "HLSL Code") )
+		.SetGroup( PlatformGroupMenuItem.ToSharedRef() )
+		.SetIcon( FSlateIcon(FEditorStyle::GetStyleSetName(), "MaterialEditor.Tabs.HLSLCode") );
+
+	for (auto MapEntry : PlatformTypeDB)
+	{
+		const EPlatformCategoryType PlatformType = MapEntry.Key;
+
+		const FString PlatformName = FMaterialStatsUtils::GetPlatformTypeName(PlatformType);
+		TSharedPtr<FWorkspaceItem> PlatformMenuItem = PlatformGroupMenuItem->AddGroup(FText::FromString(PlatformName), FSlateIcon(FEditorStyle::GetStyleSetName(), "MaterialEditor.Tabs.HLSLCode"));
+
+		TArray<TSharedPtr<FShaderPlatformSettings>>& ArrShaderPlatforms = MapEntry.Value;
+
+		for (int32 i = 0; i < ArrShaderPlatforms.Num(); ++i)
+		{
+			TSharedPtr<FShaderPlatformSettings> PlatformPtr = ArrShaderPlatforms[i];
+
+			if (!PlatformPtr.IsValid())
+			{
+				continue;
+			}
+
+			const EShaderPlatform PlatformID = PlatformPtr->GetPlatformShaderType();
+
+			if (PlatformID == SP_NumPlatforms || !PlatformPtr->IsCodeViewAllowed())
+			{
+				continue;
+			}
+
+			const FString ShaderPlatformName = PlatformPtr->GetPlatformName().ToString();
+			TSharedPtr<FWorkspaceItem> ShaderPlatformMenuItem = PlatformMenuItem->AddGroup(FText::FromString(ShaderPlatformName), FSlateIcon(FEditorStyle::GetStyleSetName(), "MaterialEditor.Tabs.HLSLCode"));
+
+			for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+			{
+				const EMaterialQualityLevel::Type QualityLevel = (EMaterialQualityLevel::Type)q;
+
+				const FString MaterialQualityName = FMaterialStatsUtils::MaterialQualityToString(QualityLevel);
+				const FName TabName = MakeTabName(PlatformType, PlatformID, QualityLevel);
+
+				TabManager->RegisterTabSpawner(TabName, FOnSpawnTab::CreateSP<FMaterialStats, EShaderPlatform, EMaterialQualityLevel::Type>(this, &FMaterialStats::SpawnTab_ShaderCode, PlatformID, QualityLevel))
+					.SetGroup(ShaderPlatformMenuItem.ToSharedRef())
+					.SetDisplayName(FText::FromString(MaterialQualityName));
+
+				auto CodeScrollBox = SNew(SScrollBox)
+					+ SScrollBox::Slot().Padding(5)
+					[
+						SNew(STextBlock)
+						.Text_Lambda([MaterialStats = TWeakPtr<FMaterialStats>(SharedThis(this)), PlatformID, QualityLevel]()
+						{
+							auto StatsPtr = MaterialStats.Pin();
+							if (StatsPtr.IsValid())
+							{
+								return StatsPtr->GetShaderCode(PlatformID, QualityLevel);
+							}
+
+							return FText::FromString(TEXT("Error reading shader code!"));
+						})
+					];
+
+				PlatformPtr->GetPlatformData(QualityLevel).CodeScrollBox = CodeScrollBox;
+			}
+		}
+	}
+}
+
+bool FMaterialStats::IsCodeViewWindowActive() const
+{
+	for (const auto MapEntry : ShaderPlatformStatsDB)
+	{
+		TSharedPtr<FShaderPlatformSettings> PlatformPtr = MapEntry.Value;
+
+		for (int q = 0; q < EMaterialQualityLevel::Num; ++q)
+		{
+			if (PlatformPtr->GetCodeViewerTab((EMaterialQualityLevel::Type)q).IsValid())
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+TSharedRef<SDockTab> FMaterialStats::SpawnTab_Stats(const FSpawnTabArgs& Args)
+{
+	check(Args.GetTabId() == StatsTabId);
+
+	FString TabName = FString::Printf(TEXT(""), *GetMaterialName().ToString());
+
+	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
+		.Icon(FEditorStyle::GetBrush("Kismet.Tabs.CompilerResults"))
+		.Label(LOCTEXT("Platform Stats", "Platform Stats"))
+		.OnTabClosed_Lambda([&bShowStats = bShowStats](TSharedRef<SDockTab>) { bShowStats = false; })
+		[
+			SNew(SBox)
+			.AddMetaData<FTagMetaData>(FTagMetaData(TEXT("MaterialStats")))
+			[
+				GetGridStatsWidget().ToSharedRef()
+			]
+		];
+
+	StatsTab = SpawnedTab;
+
+	// like so because the material editor will automatically restore this tab if it was still opened when the editor shuts down
+	bShowStats = true;
+
+	return SpawnedTab;
+}
+
+TSharedRef<SDockTab> FMaterialStats::SpawnTab_OldStats(const FSpawnTabArgs& Args)
+{
+	check(Args.GetTabId() == OldStatsTabId);
+
+	TSharedRef<SDockTab> SpawnedTab = SNew(SDockTab)
+		.Icon(FEditorStyle::GetBrush("Kismet.Tabs.CompilerResults"))
+		.Label(LOCTEXT("Stats", "Stats"))
+		.OnTabClosed_Lambda([&bShowStats = bShowOldStats](TSharedRef<SDockTab>) { bShowStats = false; })
+		[
+			SNew(SBox)
+			.AddMetaData<FTagMetaData>(FTagMetaData(TEXT("MaterialStats")))
+			[
+				OldStatsWidget.ToSharedRef()
+			]
+		];
+
+	OldStatsTab = SpawnedTab;
+
+	// like so because the material editor will automatically restore this tab if it was still opened when the editor shuts down
+	bShowOldStats = true;
+
+	return SpawnedTab;
+}
+
+void FMaterialStats::BuildStatsTab()
+{
+	const auto ParentCategoryRef = MaterialEditor->GetWorkspaceMenuCategory();
+	auto TabManager = MaterialEditor->GetTabManager();
+
+	TabManager->RegisterTabSpawner(StatsTabId, FOnSpawnTab::CreateSP(this, &FMaterialStats::SpawnTab_Stats))
+		.SetDisplayName(LOCTEXT("StatsTab", "Platform Stats"))
+		.SetGroup(ParentCategoryRef)
+		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.StatsViewer"));
+}
+
+void FMaterialStats::BuildOldStatsTab()
+{
+	const auto ParentCategoryRef = MaterialEditor->GetWorkspaceMenuCategory();
+	auto TabManager = MaterialEditor->GetTabManager();
+
+	TabManager->RegisterTabSpawner(OldStatsTabId, FOnSpawnTab::CreateSP(this, &FMaterialStats::SpawnTab_OldStats))
+		.SetDisplayName(LOCTEXT("OldStatsTab", "Stats"))
+		.SetGroup(ParentCategoryRef)
+		.SetIcon(FSlateIcon(FEditorStyle::GetStyleSetName(), "LevelEditor.Tabs.StatsViewer"));
+}
+
+void FMaterialStats::RegisterTabs()
+{
+	BuildStatsTab();
+	BuildOldStatsTab();
+	BuildViewShaderCodeMenus();
+}
+
+void FMaterialStats::UnregisterTabs()
+{
+	auto TabManager = MaterialEditor->GetTabManager();
+
+	for (auto MapEntry : PlatformTypeDB)
+	{
+		const EPlatformCategoryType PlatformType = MapEntry.Key;
+		TArray<TSharedPtr<FShaderPlatformSettings>>& ArrShaderPlatforms = MapEntry.Value;
+
+		for (int32 i = 0; i < ArrShaderPlatforms.Num(); ++i)
+		{
+			TSharedPtr<FShaderPlatformSettings> PlatformPtr = ArrShaderPlatforms[i];
+
+			if (!PlatformPtr.IsValid())
+			{
+				continue;
+			}
+
+			const EShaderPlatform ShaderPlatformID = PlatformPtr->GetPlatformShaderType();
+
+			for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+			{
+				const FName TabName = MakeTabName(PlatformType, ShaderPlatformID, (EMaterialQualityLevel::Type)q);
+
+				TabManager->UnregisterTabSpawner(TabName);
+			}
+		}
+	}
+
+	TabManager->UnregisterTabSpawner(StatsTabId);
+	TabManager->UnregisterTabSpawner(OldStatsTabId);
+	TabManager->UnregisterTabSpawner(HLSLCodeTabId);
+}
+
+void FMaterialStats::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	Collector.AddReferencedObject(Options);
+}
+
+void FMaterialStats::ComputeGridWarnings()
+{
+	auto GridPtr = GetGridStatsWidget();
+	if (!GridPtr.IsValid())
+	{
+		return;
+	}
+
+	int32 Warnings = 0;
+	TArray<EShaderPlatform> CompilerWarnings;
+	TArray<FString> WarningMessages;
+
+	bool bAnyQualityPresent = false;
+	for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+	{
+		auto Quality = static_cast<EMaterialQualityLevel::Type>(q);
+
+		bAnyQualityPresent |= GetStatsQualityFlag(Quality);
+	}
+
+	if (!bAnyQualityPresent)
+	{
+		Warnings |= WarningNoQuality;
+		WarningMessages.Emplace("No material quality selected. Please use the 'Settings' button and choose the desired quality level to be analyzed.");
+	}
+
+	bool bAnyPlatformPresent = false;
+	bool bPlatformsNeedOfflineCompiler = false;
+
+	const auto& PlatformList = GetPlatformsDB();
+	for (auto Pair : PlatformList)
+	{
+		auto& PlatformPtr = Pair.Value;
+
+		if (PlatformPtr->IsPresentInGrid())
+		{
+			bAnyPlatformPresent = true;
+
+			auto ShaderPlatformType = PlatformPtr->GetPlatformShaderType();
+			bool bNeedsOfflineCompiler = FMaterialStatsUtils::PlatformNeedsOfflineCompiler(ShaderPlatformType);
+			if (bNeedsOfflineCompiler)
+			{
+				bool bCompilerAvailable = FMaterialStatsUtils::IsPlatformOfflineCompilerAvailable(ShaderPlatformType);
+
+				if (!bCompilerAvailable)
+				{
+					CompilerWarnings.Add(ShaderPlatformType);
+					auto WarningString = FString::Printf(TEXT("Platform %s needs an offline shader compiler to extract instruction count. Please check 'Editor Preferences' -> 'Content Editors' -> 'Material Editor' for additional settings."), *PlatformPtr->GetPlatformName().ToString());
+					WarningMessages.Add(MoveTemp(WarningString));
+				}
+			}
+		}
+	}
+
+	if (!bAnyPlatformPresent)
+	{
+		Warnings |= WarningNoPlatform;
+		WarningMessages.Emplace("No platform selected. Please use the 'Settings' button and choose desired platform to be analyzed.");
+	}
+
+	bool bRefreshWarnings = (Warnings != LastGenericWarning) || (CompilerWarnings.Num() != LastMissingCompilerWarnings.Num());
+	if (!bRefreshWarnings)
+	{
+		for (int32 i = 0; i < CompilerWarnings.Num(); ++i)
+		{
+			if (CompilerWarnings[i] != LastMissingCompilerWarnings[i])
+			{
+				bRefreshWarnings = true;
+				break;
+			}
+		}
+	}
+
+	if (bRefreshWarnings)
+	{
+		LastGenericWarning = Warnings;
+		LastMissingCompilerWarnings = CompilerWarnings;
+
+		GridPtr->ClearWarningMessages();
+
+		for (int32 i = 0; i < WarningMessages.Num(); ++i)
+		{
+			GridPtr->AddWarningMessage(WarningMessages[i]);
+		}
+	}
+}
+
+void FMaterialStats::ExtractHLSLCode()
+{
+#define MARKTAG TEXT("/*MARK_")
+#define MARKTAGLEN 7
+
+	HLSLCode = TEXT("");
+
+ 	if (!HLSLTab.IsValid())
+	{
+		return;
+	}
+
+	FString MarkupSource;
+	if (MaterialInterface != nullptr && MaterialInterface->GetMaterialResource(GMaxRHIFeatureLevel)->GetMaterialExpressionSource(MarkupSource))
+	{
+		// Remove line-feeds and leave just CRs so the character counts match the selection ranges.
+		MarkupSource.ReplaceInline(TEXT("\r"), TEXT(""));
+
+		// Improve formatting: Convert tab to 4 spaces since STextBlock (currently) doesn't show tab characters
+		MarkupSource.ReplaceInline(TEXT("\t"), TEXT("    "));
+
+		// Extract highlight ranges from markup tags
+
+		// Make a copy so we can insert null terminators.
+		TCHAR* MarkupSourceCopy = new TCHAR[MarkupSource.Len() + 1];
+		FCString::Strcpy(MarkupSourceCopy, MarkupSource.Len() + 1, *MarkupSource);
+
+		TCHAR* Ptr = MarkupSourceCopy;
+		while (Ptr && *Ptr != '\0')
+		{
+			TCHAR* NextTag = FCString::Strstr(Ptr, MARKTAG);
+			if (!NextTag)
+			{
+				// No more tags, so we're done!
+				HLSLCode += Ptr;
+				break;
+			}
+
+			// Copy the text up to the tag.
+			*NextTag = '\0';
+			HLSLCode += Ptr;
+
+			// Advance past the markup tag to see what type it is (beginning or end)
+			NextTag += MARKTAGLEN;
+			int32 TagNumber = FCString::Atoi(NextTag + 1);
+			Ptr = FCString::Strstr(NextTag, TEXT("*/")) + 2;
+		}
+
+		delete[] MarkupSourceCopy;
+	}
+}
+
+#undef LOCTEXT_NAMESPACE
+
+/*end FMaterialStats functions*/
+/***********************************************************************************************************************/
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.h
new file mode 100644
index 000000000000..f640b9775e5d
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialStats.h
@@ -0,0 +1,630 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Materials/Material.h"
+#include "MaterialStatsCommon.h"
+#include "UObject/GCObject.h"
+
+/** structure used to store various statistics extracted from compiled shaders */
+struct FShaderStatsInfo
+{
+	struct FContent
+	{
+		FString StrDescription;
+		FString StrDescriptionLong;
+	};
+
+	TMap<ERepresentativeShader, FContent> ShaderInstructionCount;
+	FContent SamplersCount;
+	FContent InterpolatorsCount;
+	FContent TextureSampleCount;
+	FString StrShaderErrors;
+
+	void Reset()
+	{
+		ShaderInstructionCount.Empty();
+
+		SamplersCount.StrDescription = TEXT("Compiling...");
+		SamplersCount.StrDescriptionLong = TEXT("Compiling...");
+
+		InterpolatorsCount.StrDescription = TEXT("Compiling...");
+		InterpolatorsCount.StrDescriptionLong = TEXT("Compiling...");
+
+		TextureSampleCount.StrDescription = TEXT("Compiling...");
+		TextureSampleCount.StrDescriptionLong = TEXT("Compiling...");
+		
+		StrShaderErrors.Empty();
+	}
+
+	void Empty()
+	{
+		ShaderInstructionCount.Empty();
+
+		SamplersCount.StrDescription.Empty();
+		SamplersCount.StrDescriptionLong.Empty();
+
+		InterpolatorsCount.StrDescription.Empty();
+		InterpolatorsCount.StrDescriptionLong.Empty();
+		
+		TextureSampleCount.StrDescription.Empty();
+		TextureSampleCount.StrDescriptionLong.Empty();
+
+		StrShaderErrors.Empty();
+	}
+
+	bool HasErrors()
+	{
+		return !StrShaderErrors.IsEmpty();
+	}
+};
+
+/** structure used to manage shader compilation and source code extraction for a specified shader platform
+*   used for building the material stats */
+struct FShaderPlatformSettings
+{
+public:
+	/////////////////////
+	/** inner structure used to hold properties for a single material platform and with a specific quality level */
+	struct FPlatformData
+	{
+		/** pointer to the material resource created for this platform
+		*  mainly used to compile the shaders and extract information from them */
+		FMaterialResourceStats* MaterialResourcesStats = nullptr;
+
+		/** array of shader ids for this platform; needed to fill ComboBox in MaterialEditor's shader viewer
+		* generated from ShaderID.ShaderType->GetFName() */
+		TArray<TSharedPtr<FName>> ArrShaderNames;
+
+		/** ComboBox current entry */
+		FName ComboBoxSelectedName;
+
+		/** flag that marks the usage of this data structure */
+		bool bExtractStats = false;
+
+		/** true when code is listed in his own tab */
+		bool bExtractCode = false;
+
+		/** cached shader code computed by FShaderPlatformSettings::GetShaderCode() */
+		FText ShaderCode;
+		/** when true we should update the content of [FText ShaderCode] variable */
+		bool bUpdateShaderCode = false;
+		/** flag that marks an ongoing shader compilation */
+		bool bCompilingShaders = false;
+		/** flag suggests we needed to recompile shaders due to changes in the material */
+		bool bNeedShaderRecompilation = false;
+		/** object used to display the content of [FText ShaderCode] */
+		TSharedPtr<class SScrollBox> CodeScrollBox;
+		/** weak pointer to the spawned shader code viewer tab */
+		TWeakPtr<class SDockTab> CodeViewerTab;
+
+		FShaderStatsInfo ShaderStatsInfo;
+	};
+	/////////////////////
+
+private:
+	/** array of the above defined data structure, for each material quality setting */
+	FPlatformData PlatformData[EMaterialQualityLevel::Num];
+
+	/** type of platform for this material setting (Desktop, Android etc) */
+	EPlatformCategoryType PlatformType;
+	/** shader type used for this material setting (eg VULKAN_SM5) */
+	EShaderPlatform PlatformShaderID;
+	/** The name of the platform given at its creation time (ie the constructor) */
+	FName PlatformName;
+	/** The id of the platform computed from PlatformID */
+	FName PlatformNameID;
+
+	FString PlatformDescription;
+
+	/** if true this will be visible in the material stats. grid */
+	bool bPresentInGrid = false;
+
+	/** if true this will be listed in the 'view code' menu */
+	bool bAllowCodeView = false;
+
+	/** if true this can be added in the stats grid widget to be analyzed */
+	bool bAllowPresenceInGrid = false;
+
+	/** pointer to the material whose stats are analyzed */
+	UMaterial *Material = nullptr;
+	/** pointer to the material instance whose stats are analyzed */
+	UMaterialInstance *MaterialInstance = nullptr;
+
+private:
+	/** function used to trigger shader rebuilding when needed */
+	/** returns true if shaders are being recompiled, false otherwise */
+	bool CheckShaders();
+
+	/** builds material resources needed to compile shaders */
+	void AllocateMaterialResources();
+
+	/** frees the material resources allocated by AllocateMaterialResources() */
+	void ClearResources();
+
+public:
+	FShaderPlatformSettings(
+		const EPlatformCategoryType _PlatformType,
+		const EShaderPlatform _ShaderPlatformID,
+		const FName _Name,
+		const bool _bAllowPresenceInGrid,
+		const bool _bAllowCodeView,
+		const FString& _Description);
+	~FShaderPlatformSettings();
+
+	/** returns the name of this platform given in the constructor */
+	FORCEINLINE FName GetPlatformName() const;
+
+	/** retuns the id of this platform as a FName computed by FMaterialStatsUtils::ShaderPlatformTypeName() */
+	FORCEINLINE FName GetPlatformID() const;
+
+	/** returns the type of this platform (desktop, android, ios...) */
+	FORCEINLINE EPlatformCategoryType GetCategoryType() const;
+
+	FORCEINLINE FString GetPlatformDescription() const;
+
+	/** returns the assigned scrollbox used to view shaders for a specific material quality level */
+	FORCEINLINE TSharedPtr<class SScrollBox> GetShaderViewerScrollBox(const EMaterialQualityLevel::Type QualityLevel);
+
+	/** stores a pointer to the spawned window tab that will contain the shader code */
+	/** we need this to keep track of opened tabs */
+	FORCEINLINE void SetCodeViewerTab(const EMaterialQualityLevel::Type QualityLevel, TSharedRef<SDockTab> Tab);
+
+	/** retrives the pointer to the spawned window tab that contains the shader code */
+	FORCEINLINE TWeakPtr<class SDockTab> GetCodeViewerTab(const EMaterialQualityLevel::Type QualityLevel);
+
+	/** returns an array with the names of all the compiled shaders for this material with specified quality level */
+	FORCEINLINE const TArray<TSharedPtr<FName>> *GetShaderNames(const EMaterialQualityLevel::Type QualityLevel);
+
+	/** when set this flag will indicate the presence of this material with a particular quality level inside the stats widget */
+	void SetExtractStatsFlag(const EMaterialQualityLevel::Type QualityType, const bool bValue);
+
+	/** returns whether or not this material is allowed to display its shader code; set in the contructor */
+	FORCEINLINE bool IsCodeViewAllowed() const;
+
+	FORCEINLINE bool IsStatsGridPresenceAllowed() const;
+
+	/** flag the need to extract and display the shaders generated by this material with a certain quality level */
+	FORCEINLINE void SetCodeViewNeeded(const EMaterialQualityLevel::Type Quality, const bool bValue);
+
+	/** returns whether or not this material was chosen to be displayed in the stats grid widget with any material quality level */
+	FORCEINLINE bool IsPresentInGrid() const;
+
+	/** used by the grid widget to enable or disable the presence of this material */
+	FORCEINLINE bool FlipPresentInGrid();
+
+	/** used  to enable or disable the presence of this material in the stats grid widget */
+	FORCEINLINE void SetPresentInGrid(const bool bValue);
+
+	/** marks the need to extract statistics for the specified material quality */
+	FORCEINLINE void SetExtractStatsQualityLevel(const EMaterialQualityLevel::Type Quality, const bool bActive);
+
+	/** flags shader compilation for a specific quality level */
+	FORCEINLINE void SetNeedShaderCompilation(const EMaterialQualityLevel::Type QualityLevel, const bool bValue);
+
+	/** returns the shader type used by this platform as set at construction time */
+	FORCEINLINE EShaderPlatform GetPlatformShaderType() const;
+
+	/** returns a reference to the platform settings used for a specified material quality level; see the definition of FPlatformData inner structure */
+	FORCEINLINE FPlatformData& GetPlatformData(const EMaterialQualityLevel::Type QualityLevel);
+
+	/** returns the shader name chosen in the shader viewer combo-box */
+	FText GetSelectedShaderViewComboText(EMaterialQualityLevel::Type QualityLevel) const;
+
+	/** callback function called when we change the content of the shader viewer combo-box, used to select a different shader to be displayed */
+	void OnShaderViewComboSelectionChanged(TSharedPtr<FName> Item, EMaterialQualityLevel::Type QualityType);
+
+	/** returns the actual shader source selected by the shaders viewer's combo-box */
+	FText GetShaderCode(const EMaterialQualityLevel::Type QualityType);
+
+	/** call this whenever the analyzed material or material instance is changed */
+	void SetMaterial(UMaterial *InMaterial);
+	void SetMaterial(UMaterialInstance *InMaterialInstance);
+
+	/** main function used to update the state of this platform; will be called from FMaterialStats::Update() */
+	/** returns true if something changed for this the update call, false otherwise */
+	bool Update();
+};
+
+/** name alias used bellow in FMaterialStats */
+using TMapPlatformSettings = TMap<EPlatformCategoryType, TArray<TSharedPtr<FShaderPlatformSettings>>>;
+using TMapPlatformTypeSettings = TMap<EShaderPlatform, TSharedPtr<FShaderPlatformSettings>>;
+
+/** structure used as a collection of the above FShaderPlatformSettings, for each needed shader platform */
+/** also manages material stats extraction and stats grid content */
+class FMaterialStats : public FGCObject, public TSharedFromThis<FMaterialStats>
+{
+	/** friendship established because FMaterialStatsUtils does the actual instantiation of this class */
+	friend class FMaterialStatsUtils;
+
+	/** maps that contain the collection of all platforms from which we can extract statistics */
+	TMapPlatformTypeSettings ShaderPlatformStatsDB; //sorted by shader platform (gl_sm5, d3d_sm4, etc)
+	TMapPlatformSettings PlatformTypeDB; // sorted by platform type (desktop, android, ios etc)
+
+	/** pointer to the widget that will display the collected data from all the above platforms */
+	TSharedPtr<class SMaterialEditorStatsWidget> GridStatsWidget;
+	TSharedPtr<class SWidget> OldStatsWidget;
+	TSharedPtr<class IMessageLogListing> OldStatsListing;
+
+	/** pointer to the logical grid that will prepare data to be displayed by the above GridStatsWidget */
+	TSharedPtr<class FMaterialStatsGrid> StatsGrid;
+
+	/** array of bools that flag a specific global material quality setting of the stats grid widget */
+	bool bArrStatsQualitySelector[EMaterialQualityLevel::Num] = { false };
+
+	/** name of the analyzed material */
+	FText MaterialName;
+
+	/** the id of the stats grid widget tab */
+	static const FName StatsTabId;
+	static const FName OldStatsTabId;
+	static const FName HLSLCodeTabId;
+
+	/** If true, show material stats like number of shader instructions. */
+	bool bShowStats = false;
+	bool bShowOldStats = false;
+
+	/** Tracks whether the code tab is open, so we don't have to update it when closed. */
+	TWeakPtr<SDockTab> StatsTab;
+	TWeakPtr<SDockTab> OldStatsTab;
+	TWeakPtr<SDockTab> HLSLTab;
+
+	/** Cached HLSL code for analyzed material */
+	FString HLSLCode;
+
+	class UMaterialStatsOptions *Options = nullptr;
+
+	/** Pointer to Material Editor or to Material Instance Editor set by Initialize() function */
+	class IMaterialEditor *MaterialEditor = nullptr;
+
+	/** pointer to the material interface whose stats are analyzed */
+	class UMaterialInterface *MaterialInterface = nullptr;
+
+	/** grid warning messages ids */
+	static const int32 WarningNoQuality = 1;
+	static const int32 WarningNoPlatform = 2;
+
+	int32 LastGenericWarning = 0;
+	TArray<EShaderPlatform> LastMissingCompilerWarnings;
+
+private:
+	/** adds a specified platform in the grid widget for analysis; usually called from BuildShaderPlatformDB() */
+	TSharedPtr<FShaderPlatformSettings> AddShaderPlatform(const EPlatformCategoryType PlatformType, const EShaderPlatform PlatformID, const FName PlatformName,
+		const bool bAllowPresenceInGrid, const bool bAllowCodeView, const FString& Description);
+
+	/** build a collection of available shader platform for which we can extract various statistics */
+	void BuildShaderPlatformDB();
+
+	/** this will spawn the window that will display the a specific set of shaders from the analyzed material */
+	TSharedRef<class SDockTab> SpawnTab_ShaderCode(const class FSpawnTabArgs& Args, const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type QualityType);
+	TSharedRef<class SDockTab> SpawnTab_HLSLCode(const class FSpawnTabArgs& Args);
+
+	/** utility function used to build names for the shader viewing tabs  */
+	static FName MakeTabName(const EPlatformCategoryType PlatformType, const EShaderPlatform ShaderPlatformType, const EMaterialQualityLevel::Type QualityLevel);
+
+	/** functions responsible for construction and spawning of the window that will display the stats grid widget */
+	void BuildStatsTab();
+	TSharedRef<SDockTab> SpawnTab_Stats(const FSpawnTabArgs& Args);
+
+	void BuildOldStatsTab();
+	TSharedRef<SDockTab> SpawnTab_OldStats(const FSpawnTabArgs& Args);
+
+	/** adds shader view menus for the given IMaterialEditor */
+	void BuildViewShaderCodeMenus();
+
+	/** displays or hides the window that displays the stats grid widget */
+	void ToggleStats();
+	void ToggleOldStats();
+	void SetShowStats(const bool bValue);
+	void SetShowOldStats(const bool bValue);
+
+	/** wrapper function that calls SetCodeViewNeeded on the specified platform to signal the need (or not) to extract compile its shaders and extract the source code */
+	void SetShaderPlatformUseCodeView(const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type Quality, const bool bValue);
+
+	/** checks if there are any opened windows that display shader code */
+	bool IsCodeViewWindowActive() const;
+
+	/** true when we are displaying any content in the stats grid widget */
+	FORCEINLINE bool IsShowingStats() const;
+	FORCEINLINE bool IsShowingOldStats() const;
+
+	/** triggers and refresh call for the stats grid widget */
+	void RefreshStatsGrid();
+	/** this will display/hide the stats grid widget */
+	void DisplayStatsGrid(const bool bShow);
+	void DisplayOldStats(const bool bShow);
+
+	void LoadSettings();
+	void SaveSettings();
+
+	/** function that will collect (eventual) warning messages when the stats grid is not properly configured */
+	/** the actual display is handled by the SMaterialEditorStatsWidget class */
+	void ComputeGridWarnings();
+
+	/** extracts the HLSL code for analyzed material */
+	void ExtractHLSLCode();
+
+	/** use FMaterialStatsUtils::CreateMaterialStats() to create an instance of this class */
+	FMaterialStats() {}
+public:
+	~FMaterialStats();
+
+	///////////////////////////////////////////
+	// Utilities Functions
+	/** return the name of the window that displays the grid stats widget */
+	static FORCEINLINE FName GetGridStatsTabName();
+	static FORCEINLINE FName GetGridOldStatsTabName();
+
+	/** returns the material name we're analyzing */
+	FORCEINLINE FText GetMaterialName() const;
+
+	/** returns a pointer to the material stats grid widget */
+	FORCEINLINE TSharedPtr<class SMaterialEditorStatsWidget> GetGridStatsWidget();
+
+	/** functions that return references to the collection of stored platforms that analyze the current material */
+	FORCEINLINE const TMapPlatformTypeSettings& GetPlatformsDB() const;
+	FORCEINLINE const TMapPlatformSettings& GetPlatformsTypeDB() const;
+
+	FORCEINLINE TSharedPtr<FMaterialStatsGrid> GetStatsGrid();
+
+	FORCEINLINE TSharedPtr<class IMessageLogListing> GetOldStatsListing();
+
+	/** functions used to query or set a material quality level that is to be analyzed in the material stats grid widget */
+	bool SwitchStatsQualityFlag(const EMaterialQualityLevel::Type Quality);
+	void SetStatusQualityFlag(const EMaterialQualityLevel::Type Quality, const bool bValue);
+	FORCEINLINE bool GetStatsQualityFlag(const EMaterialQualityLevel::Type Quality);
+
+	/** switches on or off the presence of a specified shader platform inside the stats grid widget for this material */
+	bool SwitchShaderPlatformUseStats(const EShaderPlatform PlatformID);
+
+	/** Sets the name of the material that will be displayed in the stats grid widget */
+	template <typename TString>
+	void SetMaterialDisplayName(TString&& Name);
+
+	/** returns a platform name given at its construction time */
+	FName GetPlatformName(const EShaderPlatform InEnumValue) const;
+
+	/** returns the shader type used by a platform with the specified name */
+	EShaderPlatform GetShaderPlatformID(const FName InName) const;
+
+	/** utility functions that return pointers to the requested platforms */
+	TSharedPtr<FShaderPlatformSettings> GetPlatformSettings(const EShaderPlatform PlatformID);
+	TSharedPtr<FShaderPlatformSettings> GetPlatformSettings(const FName PlatformName);
+
+	/** returns the shader code computed by the specified platform with some quality level */
+	FText GetShaderCode(const EShaderPlatform PlatformID, const EMaterialQualityLevel::Type QualityType);
+
+	/** call this whenever some material property is changed, as it will trigger shader recompilation */
+	void SignalMaterialChanged();
+
+	/** FGCObject interface */
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+	// end Utilities Functions
+	///////////////////////////////////////////
+
+	///////////////////////////////////////////
+	// Setup Functions
+	/** call this from chosen IMaterialEditor, when all other tabs are registered, to add the material stats grid tab and shader view menus */
+	void RegisterTabs();
+
+	/** call this from chosen IMaterialEditor, when all other tabs are unregistered, to remove material stats grid tab and shader view menus */
+	void UnregisterTabs();
+
+private:
+	/** this function will do the setup procedure and its called from FMaterialStatsUtils::CreateMaterialStats()  */
+	void Initialize(IMaterialEditor *MaterialEditor);
+public:
+	//end Setup Functions
+	///////////////////////////////////////////
+
+	///////////////////////////////////////////
+	// Update Functions
+	/** call this from chosen IMaterialEditor whenever an update to this analysis tool in appropriate */
+	void Update();
+
+	/** this will set the material to be analyzed by this class */
+	/** TMaterial should be UMaterial or UMaterialInstance */
+	template <typename TMaterial>
+	void SetMaterial(TMaterial *InMaterial);
+
+	// end Update Functions
+	///////////////////////////////////////////
+};
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// FMaterialStats implementation
+
+FORCEINLINE const TMapPlatformTypeSettings& FMaterialStats::GetPlatformsDB() const
+{
+	return ShaderPlatformStatsDB;
+}
+
+FORCEINLINE const TMapPlatformSettings& FMaterialStats::GetPlatformsTypeDB() const
+{
+	return PlatformTypeDB;
+}
+
+FORCEINLINE TSharedPtr<FMaterialStatsGrid> FMaterialStats::GetStatsGrid()
+{
+	return StatsGrid;
+}
+
+FORCEINLINE TSharedPtr<class IMessageLogListing> FMaterialStats::GetOldStatsListing()
+{
+	return OldStatsListing;
+}
+
+FORCEINLINE bool FMaterialStats::IsShowingStats() const
+{
+	return bShowStats;
+}
+
+FORCEINLINE bool FMaterialStats::IsShowingOldStats() const
+{
+	return bShowOldStats;
+}
+
+template <typename TString>
+void FMaterialStats::SetMaterialDisplayName(TString&& Name)
+{
+	MaterialName = FText::FromString(Forward<TString>(Name));
+}
+
+FORCEINLINE FText FMaterialStats::GetMaterialName() const
+{
+	return MaterialName;
+}
+
+FORCEINLINE FName FMaterialStats::GetGridStatsTabName()
+{
+	return StatsTabId;
+}
+
+FORCEINLINE FName FMaterialStats::GetGridOldStatsTabName()
+{
+	return OldStatsTabId;
+}
+
+FORCEINLINE bool FMaterialStats::GetStatsQualityFlag(const EMaterialQualityLevel::Type Quality)
+{
+	check(Quality < EMaterialQualityLevel::Num);
+	return bArrStatsQualitySelector[(int32)Quality];
+}
+
+FORCEINLINE TSharedPtr<class SMaterialEditorStatsWidget> FMaterialStats::GetGridStatsWidget()
+{
+	return GridStatsWidget;
+}
+
+//TMaterial should be UMaterial or UMaterialInstance
+template <typename TMaterial>
+void FMaterialStats::SetMaterial(TMaterial *MaterialPtr)
+{
+	if (MaterialInterface != MaterialPtr)
+	{
+		MaterialInterface = MaterialPtr;
+
+		for (const auto Entry : ShaderPlatformStatsDB)
+		{
+			auto Platform = Entry.Value;
+			Platform->SetMaterial(MaterialPtr);
+		}
+	}
+}
+
+// end FMaterialStats implementation
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// FShaderPlatformSettings implementation
+FORCEINLINE FShaderPlatformSettings::~FShaderPlatformSettings()
+{
+	ClearResources();
+}
+
+FORCEINLINE FName FShaderPlatformSettings::GetPlatformName() const
+{
+	return PlatformName;
+}
+
+FORCEINLINE FName FShaderPlatformSettings::GetPlatformID() const
+{
+	return PlatformNameID;
+}
+
+FORCEINLINE EPlatformCategoryType FShaderPlatformSettings::GetCategoryType() const
+{
+	return PlatformType;
+}
+
+FORCEINLINE FString FShaderPlatformSettings::GetPlatformDescription() const
+{
+	return PlatformDescription;
+}
+
+FORCEINLINE TSharedPtr<class SScrollBox> FShaderPlatformSettings::GetShaderViewerScrollBox(const EMaterialQualityLevel::Type QualityLevel)
+{
+	FPlatformData& SomePlatformData = GetPlatformData(QualityLevel);
+	return SomePlatformData.CodeScrollBox;
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetCodeViewerTab(const EMaterialQualityLevel::Type QualityLevel, TSharedRef<SDockTab> Tab)
+{
+	FPlatformData& SomePlatformData = GetPlatformData(QualityLevel);
+	SomePlatformData.CodeViewerTab = Tab;
+}
+
+FORCEINLINE TWeakPtr<class SDockTab> FShaderPlatformSettings::GetCodeViewerTab(const EMaterialQualityLevel::Type QualityLevel)
+{
+	FPlatformData& SomePlatformData = GetPlatformData(QualityLevel);
+	return SomePlatformData.CodeViewerTab;
+}
+
+FORCEINLINE const TArray<TSharedPtr<FName>> *FShaderPlatformSettings::GetShaderNames(const EMaterialQualityLevel::Type QualityLevel)
+{
+	FPlatformData& SomePlatformData = GetPlatformData(QualityLevel);
+	return &SomePlatformData.ArrShaderNames;
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetExtractStatsFlag(const EMaterialQualityLevel::Type QualityType, const bool bValue)
+{
+	check(QualityType != EMaterialQualityLevel::Num);
+	PlatformData[QualityType].bExtractStats = bValue;
+}
+
+FORCEINLINE bool FShaderPlatformSettings::IsCodeViewAllowed() const
+{
+	return bAllowCodeView;
+}
+
+FORCEINLINE bool FShaderPlatformSettings::IsStatsGridPresenceAllowed() const
+{
+	return bAllowPresenceInGrid;
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetCodeViewNeeded(const EMaterialQualityLevel::Type Quality, const bool bValue)
+{
+	PlatformData[Quality].bExtractCode = bValue;
+}
+
+FORCEINLINE bool FShaderPlatformSettings::IsPresentInGrid() const
+{
+	return bPresentInGrid;
+}
+
+FORCEINLINE bool FShaderPlatformSettings::FlipPresentInGrid()
+{
+	SetPresentInGrid(!IsPresentInGrid());
+
+	return IsPresentInGrid();
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetPresentInGrid(const bool bValue)
+{
+	bPresentInGrid = bValue;
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetExtractStatsQualityLevel(const EMaterialQualityLevel::Type Quality, const bool bActive)
+{
+	PlatformData[Quality].bExtractStats = bActive;
+}
+
+FORCEINLINE void FShaderPlatformSettings::SetNeedShaderCompilation(const EMaterialQualityLevel::Type QualityLevel, const bool bValue)
+{
+	check(QualityLevel != EMaterialQualityLevel::Num);
+	PlatformData[QualityLevel].bNeedShaderRecompilation = bValue;
+}
+
+FORCEINLINE EShaderPlatform FShaderPlatformSettings::GetPlatformShaderType() const
+{
+	return PlatformShaderID;
+}
+
+FORCEINLINE FShaderPlatformSettings::FPlatformData& FShaderPlatformSettings::GetPlatformData(const EMaterialQualityLevel::Type QualityLevel)
+{
+	check(QualityLevel != EMaterialQualityLevel::Num);
+	return PlatformData[QualityLevel];
+}
+// end FShaderPlatformSettings implementation
+//////////////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsCommon.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsCommon.cpp
new file mode 100644
index 000000000000..f9a624814ec1
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsCommon.cpp
@@ -0,0 +1,721 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+//
+#include "MaterialStatsCommon.h"
+#include "EngineGlobals.h"
+#include "MaterialStats.h"
+#include "LocalVertexFactory.h"
+#include "GPUSkinVertexFactory.h"
+#include "MaterialEditorSettings.h"
+
+/***********************************************************************************************************************/
+/*begin FMaterialResourceStats functions*/
+
+void FMaterialResourceStats::SetupExtaCompilationSettings(const EShaderPlatform Platform, FExtraShaderCompilerSettings& Settings) const
+{
+	Settings.bExtractShaderSource = true;
+	Settings.OfflineCompilerPath = FMaterialStatsUtils::GetPlatformOfflineCompilerPath(Platform);
+}
+
+/*end FMaterialResourceStats functions*/
+/***********************************************************************************************************************/
+
+/***********************************************************************************************************************/
+/*begin FMaterialStatsUtils */
+const FLinearColor FMaterialStatsUtils::BlueColor(0.1851f, 1.0f, 0.940258f);
+const FLinearColor FMaterialStatsUtils::YellowColor(1.0f, 0.934216f, 0.199542f);
+const FLinearColor FMaterialStatsUtils::GreenColor(0.540805f, 1.0f, 0.321716f);
+const FLinearColor FMaterialStatsUtils::OrangeColor(1.0f, 0.316738f, 0.095488f);
+const FLinearColor FMaterialStatsUtils::DefaultGridTextColor(0.244819f, 0.301351f, 0.390625f);
+
+TSharedPtr<FMaterialStats> FMaterialStatsUtils::CreateMaterialStats(class IMaterialEditor* MaterialEditor)
+{
+	TSharedPtr<FMaterialStats> MaterialStats = MakeShareable(new FMaterialStats());
+	MaterialStats->Initialize(MaterialEditor);
+
+	return MaterialStats;
+}
+
+FString FMaterialStatsUtils::MaterialQualityToString(const EMaterialQualityLevel::Type Quality)
+{
+	FString StrQuality;
+
+	switch (Quality)
+	{
+		case EMaterialQualityLevel::High:
+			StrQuality = TEXT("High Quality");
+		break;
+		case EMaterialQualityLevel::Medium:
+			StrQuality = TEXT("Medium Quality");
+		break;
+		case EMaterialQualityLevel::Low:
+			StrQuality = TEXT("Low Quality");
+		break;
+	}
+
+	return StrQuality;
+}
+
+FString FMaterialStatsUtils::MaterialQualityToShortString(const EMaterialQualityLevel::Type Quality)
+{
+	FString StrQuality;
+
+	switch (Quality)
+	{
+		case EMaterialQualityLevel::High:
+			StrQuality = TEXT("High");
+		break;
+		case EMaterialQualityLevel::Medium:
+			StrQuality = TEXT("Medium");
+		break;
+		case EMaterialQualityLevel::Low:
+			StrQuality = TEXT("Low");
+		break;
+	}
+
+	return StrQuality;
+}
+
+EMaterialQualityLevel::Type FMaterialStatsUtils::StringToMaterialQuality(const FString& StrQuality)
+{
+	if (StrQuality.Equals(TEXT("High Quality")))
+	{
+		return EMaterialQualityLevel::High;
+	}		
+	else if (StrQuality.Equals(TEXT("Medium Quality")))
+	{
+		return EMaterialQualityLevel::Medium;
+	}
+	else if (StrQuality.Equals(TEXT("Low Quality")))
+	{
+		return EMaterialQualityLevel::Low;
+	}
+
+	return EMaterialQualityLevel::Num;
+}
+
+FString FMaterialStatsUtils::GetPlatformTypeName(const EPlatformCategoryType InEnumValue)
+{
+	FString PlatformName;
+
+	switch (InEnumValue)
+	{
+		case EPlatformCategoryType::Desktop:
+			PlatformName = FString("Desktop");
+		break;
+		case EPlatformCategoryType::Android:
+			PlatformName = FString("Android");
+		break;
+		case EPlatformCategoryType::IOS:
+			PlatformName = FString("IOS");
+		break;
+	}
+
+	return PlatformName;
+}
+
+FString FMaterialStatsUtils::ShaderPlatformTypeName(const EShaderPlatform PlatformID)
+{
+	switch (PlatformID)
+	{
+		case SP_PCD3D_SM5:
+			return FString("PCD3D_SM5");
+		break;
+		case SP_OPENGL_SM4:
+			return FString("OPENGL_SM4");
+		break;
+		case SP_PS4:
+			return FString("OPENGL_SM4");
+		break;
+		case SP_OPENGL_PCES2:
+			return FString("OPENGL_PCES2");
+		break;
+		case SP_XBOXONE_D3D12:
+			return FString("XBOXONE_D3D12");
+		break;
+		case SP_PCD3D_SM4:
+			return FString("PCD3D_SM4");
+		break;
+		case SP_OPENGL_SM5:
+			return FString("OPENGL_SM5");
+		break;
+		case SP_PCD3D_ES2:
+			return FString("PCD3D_ES2");
+		break;
+		case SP_OPENGL_ES2_ANDROID:
+			return FString("OPENGL_ES2_ANDROID");
+		break;
+		case SP_OPENGL_ES2_WEBGL:
+			return FString("OPENGL_ES2_WEBGL");
+		break;
+		case SP_OPENGL_ES2_IOS:
+			return FString("OPENGL_ES2_IOS");
+		break;
+		case SP_METAL:
+			return FString("METAL");
+		break;
+		case SP_METAL_MRT:
+			return FString("METAL_MRT");
+		break;
+		case SP_OPENGL_ES31_EXT:
+			return FString("OPENGL_ES31_EXT");
+		break;
+		case SP_PCD3D_ES3_1:
+			return FString("PCD3D_ES3_1");
+		break;
+		case SP_OPENGL_PCES3_1:
+			return FString("OPENGL_PCES3_1");
+		break;
+		case SP_METAL_SM5:
+			return FString("METAL_SM5");
+		break;
+		case SP_VULKAN_PCES3_1:
+			return FString("VULKAN_PCES3_1");
+		break;
+		case SP_METAL_SM5_NOTESS:
+			return FString("METAL_SM5_NOTESS");
+		break;
+		case SP_VULKAN_SM4:
+			return FString("VULKAN_SM4");
+		break;
+		case SP_VULKAN_SM5:
+			return FString("VULKAN_SM5");
+		break;
+		case SP_VULKAN_ES3_1_ANDROID:
+			return FString("VULKAN_ES3_1_ANDROID");
+		break;
+		case SP_METAL_MACES3_1:
+			return FString("METAL_MACES3_1");
+		break;
+		case SP_METAL_MACES2:
+			return FString("METAL_MACES2");
+		break;
+		case SP_OPENGL_ES3_1_ANDROID:
+			return FString("OPENGL_ES3_1_ANDROID");
+		break;
+		case SP_SWITCH:
+			return FString("SWITCH");
+		break;
+		case SP_SWITCH_FORWARD:
+			return FString("SWITCH_FORWARD");
+		break;
+		case SP_METAL_MRT_MAC:
+			return FString("METAL_MRT_MAC");
+		break;
+
+		default:
+			return FString("!Unknown platform!");
+		break;
+	}
+
+	return FString("!Unknown platform!");
+}
+
+FString FMaterialStatsUtils::GetPlatformOfflineCompilerPath(const EShaderPlatform ShaderPlatform)
+{
+	switch (ShaderPlatform)
+	{
+		case SP_OPENGL_ES2_ANDROID:
+		case SP_OPENGL_ES3_1_ANDROID:
+		case SP_VULKAN_ES3_1_ANDROID:
+		case SP_OPENGL_ES2_IOS:
+			return FPaths::ConvertRelativePathToFull(GetDefault<UMaterialEditorSettings>()->MaliOfflineCompilerPath.FilePath);
+		break;
+
+		default:
+			return FString();
+		break;
+	}
+
+	return FString();
+}
+
+bool FMaterialStatsUtils::IsPlatformOfflineCompilerAvailable(const EShaderPlatform ShaderPlatform)
+{
+	FString CompilerPath = GetPlatformOfflineCompilerPath(ShaderPlatform);
+
+	bool bCompilerExists = FPaths::FileExists(CompilerPath);
+
+	return bCompilerExists;
+}
+
+bool FMaterialStatsUtils::PlatformNeedsOfflineCompiler(const EShaderPlatform ShaderPlatform)
+{
+	switch (ShaderPlatform)
+	{
+		case SP_OPENGL_SM4:
+		case SP_PS4:
+		case SP_OPENGL_PCES2:
+		case SP_OPENGL_SM5:
+		case SP_OPENGL_ES2_ANDROID:
+		case SP_OPENGL_ES31_EXT:
+		case SP_OPENGL_PCES3_1:
+		case SP_OPENGL_ES2_WEBGL:
+		case SP_OPENGL_ES2_IOS:
+		case SP_VULKAN_PCES3_1:
+		case SP_VULKAN_SM4:
+		case SP_VULKAN_SM5:
+		case SP_VULKAN_ES3_1_ANDROID:
+		case SP_OPENGL_ES3_1_ANDROID:
+			return true;
+		break;
+
+
+		case SP_PCD3D_SM5:
+		case SP_XBOXONE_D3D12:
+		case SP_PCD3D_SM4:
+		case SP_PCD3D_ES2:
+		case SP_METAL:
+		case SP_METAL_MRT:
+		case SP_PCD3D_ES3_1:
+		case SP_METAL_SM5:
+		case SP_METAL_SM5_NOTESS:
+		case SP_METAL_MACES3_1:
+		case SP_METAL_MACES2:
+		case SP_SWITCH:
+		case SP_SWITCH_FORWARD:
+		case SP_METAL_MRT_MAC:
+			return false;
+		break;
+
+		default:
+			return false;
+		break;	
+	}
+
+	return false;
+}
+
+FString FMaterialStatsUtils::RepresentativeShaderTypeToString(const ERepresentativeShader ShaderType)
+{
+	switch (ShaderType)
+	{
+		case ERepresentativeShader::StationarySurface:
+			return TEXT("Stationary surface");
+		break;
+
+		case ERepresentativeShader::StationarySurfaceCSM:
+			return TEXT("Stationary surface + CSM");
+		break;
+
+		case ERepresentativeShader::StationarySurface1PointLight:
+		case ERepresentativeShader::StationarySurfaceNPointLights:
+			return TEXT("Stationary surface + Point Lights");
+		break;
+
+		case ERepresentativeShader::DynamicallyLitObject:
+			return TEXT("Dynamically lit object");
+		break;
+
+		case ERepresentativeShader::StaticMesh:
+			return TEXT("Static Mesh");
+		break;
+
+		case ERepresentativeShader::SkeletalMesh:
+			return TEXT("Skeletal Mesh");
+		break;
+
+		case ERepresentativeShader::UIDefaultFragmentShader:
+			return TEXT("UI Pixel Shader");
+		break;
+
+		case ERepresentativeShader::UIDefaultVertexShader:
+			return TEXT("UI Vertex Shader");
+		break;
+
+		case ERepresentativeShader::UIInstancedVertexShader:
+			return TEXT("UI Instanced Vertex Shader");
+		break;
+
+		default:
+			return TEXT("Unknown shader name");
+		break;
+	}
+}
+
+FLinearColor FMaterialStatsUtils::PlatformTypeColor(EPlatformCategoryType PlatformType)
+{
+	FLinearColor Color(FLinearColor::Blue);
+
+	switch (PlatformType)
+	{
+		case EPlatformCategoryType::Desktop:
+			Color = BlueColor;
+		break;
+		case EPlatformCategoryType::Android:
+			Color = GreenColor;
+		break;
+		case EPlatformCategoryType::IOS:
+			Color = FLinearColor::Gray;
+		break;
+
+		default:
+			return Color;
+		break;
+	}
+
+	return Color;
+}
+
+FLinearColor FMaterialStatsUtils::QualitySettingColor(const EMaterialQualityLevel::Type QualityType)
+{
+	switch (QualityType)
+	{
+		case EMaterialQualityLevel::Low:
+			return GreenColor;
+		break;
+		case EMaterialQualityLevel::High:
+			return OrangeColor;
+		break;
+		case EMaterialQualityLevel::Medium:
+			return YellowColor;
+		break;
+
+		default:
+			return FLinearColor::Black;
+		break;
+	}
+
+	return FLinearColor::Black;
+}
+
+void FMaterialStatsUtils::GetRepresentativeShaderTypesAndDescriptions(TMap<FName, TArray<FRepresentativeShaderInfo>>& ShaderTypeNamesAndDescriptions, const FMaterial* TargetMaterial)
+{
+	static auto* MobileHDR = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.MobileHDR"));
+	bool bMobileHDR = MobileHDR && MobileHDR->GetValueOnAnyThread() == 1;
+
+	static const FName FLocalVertexFactoryName = FLocalVertexFactory::StaticType.GetFName();
+	static const FName FGPUFactoryName = TGPUSkinVertexFactory<true>::StaticType.GetFName();
+
+	if (TargetMaterial->IsUIMaterial())
+	{
+		static FName TSlateMaterialShaderPSDefaultfalseName = TEXT("TSlateMaterialShaderPSDefaultfalse");
+		ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+			.Add(FRepresentativeShaderInfo(ERepresentativeShader::UIDefaultFragmentShader, TSlateMaterialShaderPSDefaultfalseName, TEXT("Default UI Pixel Shader")));
+
+		static FName TSlateMaterialShaderVSfalseName = TEXT("TSlateMaterialShaderVSfalse");
+		ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+			.Add(FRepresentativeShaderInfo(ERepresentativeShader::UIDefaultVertexShader, TSlateMaterialShaderVSfalseName, TEXT("Default UI Vertex Shader")));
+
+		static FName TSlateMaterialShaderVStrueName = TEXT("TSlateMaterialShaderVStrue");
+		ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+			.Add(FRepresentativeShaderInfo(ERepresentativeShader::UIInstancedVertexShader, TSlateMaterialShaderVStrueName, TEXT("Instanced UI Vertex Shader")));
+	}
+	else if (TargetMaterial->GetFeatureLevel() >= ERHIFeatureLevel::SM4)
+	{
+		if (TargetMaterial->GetShadingModel() == MSM_Unlit)
+		{
+			//unlit materials are never lightmapped
+			static FName TBasePassPSFNoLightMapPolicyName = TEXT("TBasePassPSFNoLightMapPolicy");
+			ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface, TBasePassPSFNoLightMapPolicyName, TEXT("Base pass shader without light map")));
+		}
+		else
+		{
+			//also show a dynamically lit shader
+			static FName TBasePassPSFNoLightMapPolicyName = TEXT("TBasePassPSFNoLightMapPolicy");
+			ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::DynamicallyLitObject, TBasePassPSFNoLightMapPolicyName, TEXT("Base pass shader")));
+
+			static auto* CVarAllowStaticLighting = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.AllowStaticLighting"));
+			const bool bAllowStaticLighting = CVarAllowStaticLighting->GetValueOnAnyThread() != 0;
+
+			if (bAllowStaticLighting)
+			{
+				if (TargetMaterial->IsUsedWithStaticLighting())
+				{
+					static FName TBasePassPSTLightMapPolicyName = TEXT("TBasePassPSTDistanceFieldShadowsAndLightMapPolicyHQ");
+					ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+						.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface, TBasePassPSTLightMapPolicyName, TEXT("Base pass shader with Surface Lightmap")));
+				}
+
+				static FName TBasePassPSFPrecomputedVolumetricLightmapLightingPolicyName = TEXT("TBasePassPSFPrecomputedVolumetricLightmapLightingPolicy");
+				ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+					.Add(FRepresentativeShaderInfo(ERepresentativeShader::DynamicallyLitObject, TBasePassPSFPrecomputedVolumetricLightmapLightingPolicyName, TEXT("Base pass shader with Volumetric Lightmap")));
+			}
+		}
+
+		static FName TBasePassVSFNoLightMapPolicyName = TEXT("TBasePassVSFNoLightMapPolicy");
+		ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+			.Add(FRepresentativeShaderInfo(ERepresentativeShader::StaticMesh, TBasePassVSFNoLightMapPolicyName, TEXT("Base pass vertex shader")));
+
+		ShaderTypeNamesAndDescriptions.FindOrAdd(FGPUFactoryName)
+			.Add(FRepresentativeShaderInfo(ERepresentativeShader::SkeletalMesh, TBasePassVSFNoLightMapPolicyName, TEXT("Base pass vertex shader")));
+	}
+	else
+	{
+		const TCHAR* DescSuffix = bMobileHDR ? TEXT(" (HDR)") : TEXT(" (LDR)");
+
+		if (TargetMaterial->GetShadingModel() == MSM_Unlit)
+		{
+			//unlit materials are never lightmapped
+			static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFNoLightMapPolicy0HDRLinear64");
+			static FName Name_LDRGamma32 = TEXT("TMobileBasePassPSFNoLightMapPolicy0LDRGamma32");
+
+			const FName TBasePassForForwardShadingPSFNoLightMapPolicy0Name = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+
+			const FString Description = FString::Printf(TEXT("Mobile base pass shader without light map%s"), DescSuffix);
+			ShaderTypeNamesAndDescriptions.Add(FLocalVertexFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface, TBasePassForForwardShadingPSFNoLightMapPolicy0Name, Description));
+		}
+		else
+		{
+			static auto* CVarAllowDistanceFieldShadows = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Mobile.AllowDistanceFieldShadows"));
+			const bool bAllowDistanceFieldShadows = CVarAllowDistanceFieldShadows->GetValueOnAnyThread() != 0;
+
+			static auto* CVarPointLights = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.MobileNumDynamicPointLights"));
+			const bool bPointLights = CVarPointLights->GetValueOnAnyThread() > 0;
+
+			static auto* CVarPointLightsStaticBranch = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.MobileDynamicPointLightsUseStaticBranch"));
+			const bool bPointLightsStaticBranch = CVarPointLightsStaticBranch->GetValueOnAnyThread() != 0;
+
+			const int32 NumPointLights = bPointLightsStaticBranch ? CVarPointLights->GetValueOnAnyThread() : 1;
+
+			if (TargetMaterial->IsUsedWithStaticLighting())
+			{
+				if (bAllowDistanceFieldShadows)// distance field shadows
+				{
+					// distance field shadows only shaders
+					{
+						static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsAndLQLightMapPolicy0HDRLinear64");
+						static FName Name_LDRGamma32 = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsAndLQLightMapPolicy0LDRGamma32");
+						static FName ShaderName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+
+						const FString Description = FString::Printf(TEXT("Mobile base pass shader with distance field shadows%s"), DescSuffix);
+						ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+							.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface, ShaderName, Description));
+					}
+
+					static auto* CVarAllowDistanceFieldShadowsAndCSM = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Mobile.EnableStaticAndCSMShadowReceivers"));
+					const bool bAllowDistanceFieldShadowsAndCSM = CVarAllowDistanceFieldShadowsAndCSM->GetValueOnAnyThread() != 0;
+					if (bAllowDistanceFieldShadowsAndCSM)
+					{
+						// distance field shadows & CSM shaders
+						{
+							static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicy0HDRLinear64");
+							static FName Name_LDRGamma32 = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicy0LDRGamma32");
+							static FName ShaderName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+
+							const FString Description = FString::Printf(TEXT("Mobile base pass shader with distance field shadows and CSM%s"), DescSuffix);
+							ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+								.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurfaceCSM, ShaderName, Description));
+						}
+
+						if (bPointLights) // add point lights shaders + distance field shadows
+						{
+							static FName Name_HDRLinear64_OneLight = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicy1HDRLinear64");
+							static FName Name_LDRGamma32_OneLight = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicy1LDRGamma32");
+
+							static FName Name_HDRLinear64_NLights = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicyINT32_MAXHDRLinear64");
+							static FName Name_LDRGamma32_NLights = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsLightMapAndCSMLightingPolicyINT32_MAXLDRGamma32");
+
+							static FName ShaderName = bMobileHDR ?
+								(bPointLightsStaticBranch ? Name_HDRLinear64_NLights : Name_HDRLinear64_OneLight) :
+								(bPointLightsStaticBranch ? Name_LDRGamma32_NLights : Name_LDRGamma32_OneLight);
+
+							const FString Description = FString::Printf(TEXT("Mobile base pass shader with distance field shadows, CSM and %s point light(s) %s"), bPointLightsStaticBranch ? TEXT("N") : TEXT("1"), DescSuffix);
+
+							FRepresentativeShaderInfo ShaderInfo = bPointLightsStaticBranch ?
+								FRepresentativeShaderInfo(ERepresentativeShader::StationarySurfaceNPointLights, ShaderName, Description) :
+								FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface1PointLight, ShaderName, Description);
+
+							ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName).Add(ShaderInfo);
+								
+						}
+					}
+				}
+				else //no shadows & lightmapped
+				{
+					static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSTLightMapPolicyLQ0HDRLinear64");
+					static FName Name_LDRGamma32 = TEXT("TMobileBasePassPSTLightMapPolicyLQ0LDRGamma32");
+					static FName TSlateMaterialShaderVStrueName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+
+					ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+						.Add(FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface, TSlateMaterialShaderVStrueName,
+							FString::Printf(TEXT("Mobile base pass shader with static lighting%s"), DescSuffix)));
+
+					if (bPointLights) // add point lights + lightmap
+					{
+						static FName Name_HDRLinear64_OneLight = TEXT("TMobileBasePassPSTLightMapPolicyLQ1HDRLinear64");
+						static FName Name_LDRGamma32_OneLight = TEXT("TMobileBasePassPSTLightMapPolicyLQ1LDRGamma32");
+
+						static FName Name_HDRLinear64_NLights = TEXT("TMobileBasePassPSTLightMapPolicyLQINT32_MAXHDRLinear64");
+						static FName Name_LDRGamma32_NLights = TEXT("TMobileBasePassPSTLightMapPolicyLQINT32_MAXLDRGamma32");
+
+						static FName ShaderName = bMobileHDR ?
+							(bPointLightsStaticBranch ? Name_HDRLinear64_NLights : Name_HDRLinear64_OneLight) :
+							(bPointLightsStaticBranch ? Name_LDRGamma32_NLights : Name_LDRGamma32_OneLight);
+
+						const FString Description = FString::Printf(TEXT("Mobile base pass shader with static lighting and %s point light(s) %s"), bPointLightsStaticBranch ? TEXT("N") : TEXT("1"), DescSuffix);
+
+						FRepresentativeShaderInfo ShaderInfo = bPointLightsStaticBranch ?
+							FRepresentativeShaderInfo(ERepresentativeShader::StationarySurfaceNPointLights, ShaderName, Description) :
+							FRepresentativeShaderInfo(ERepresentativeShader::StationarySurface1PointLight, ShaderName, Description);
+
+						ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName).Add(ShaderInfo);
+					}
+				}
+			}
+
+			// dynamically lit shader			
+			static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFMobileMovableDirectionalLightCSMLightingPolicy0HDRLinear64");
+			static FName Name_LDRGamma32 = TEXT("TMobileBasePassPSFMobileMovableDirectionalLightCSMLightingPolicy0LDRGamma32");
+			const FName TBasePassForForwardShadingPSFSimpleDirectionalLightAndSHIndirectPolicy0Name = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+			ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::DynamicallyLitObject, TBasePassForForwardShadingPSFSimpleDirectionalLightAndSHIndirectPolicy0Name,
+				FString::Printf(TEXT("Mobile base pass shader with only dynamic lighting%s"), DescSuffix)));
+		}
+
+		{
+			static FName Name_HDRLinear64 = TEXT("TMobileBasePassVSFNoLightMapPolicyHDRLinear64");
+			static FName Name_LDRGamma32 = TEXT("TMobileBasePassVSFNoLightMapPolicyLDRGamma32");
+			const FName TBasePassForForwardShadingVSFNoLightMapPolicyName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
+			ShaderTypeNamesAndDescriptions.FindOrAdd(FLocalVertexFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::StaticMesh, TBasePassForForwardShadingVSFNoLightMapPolicyName,
+				FString::Printf(TEXT("Mobile base pass vertex shader%s"), DescSuffix)));
+
+			ShaderTypeNamesAndDescriptions.FindOrAdd(FGPUFactoryName)
+				.Add(FRepresentativeShaderInfo(ERepresentativeShader::SkeletalMesh, TBasePassForForwardShadingVSFNoLightMapPolicyName,
+				FString::Printf(TEXT("Mobile base pass vertex shader%s"), DescSuffix)));
+		}
+	}
+}
+
+/**
+* Gets instruction counts that best represent the likely usage of this material based on shading model and other factors.
+* @param Results - an array of descriptions to be populated
+*/
+void FMaterialStatsUtils::GetRepresentativeInstructionCounts(TArray<FShaderInstructionsInfo>& Results, const FMaterialResource* Target)
+{
+	TMap<FName, TArray<FRepresentativeShaderInfo>> ShaderTypeNamesAndDescriptions;
+	Results.Empty();
+
+	//when adding a shader type here be sure to update FPreviewMaterial::ShouldCache()
+	//so the shader type will get compiled with preview materials
+	const FMaterialShaderMap* MaterialShaderMap = Target->GetGameThreadShaderMap();
+	if (MaterialShaderMap && MaterialShaderMap->IsCompilationFinalized())
+	{
+		GetRepresentativeShaderTypesAndDescriptions(ShaderTypeNamesAndDescriptions, Target);
+
+		if (Target->IsUIMaterial())
+		{
+			//for (const TPair<FName, FRepresentativeShaderInfo>& ShaderTypePair : ShaderTypeNamesAndDescriptions)
+			for (auto DescriptionPair : ShaderTypeNamesAndDescriptions)
+			{
+				auto& DescriptionArray = DescriptionPair.Value;
+				for (int32 i = 0; i < DescriptionArray.Num(); ++i)
+				{
+					const FRepresentativeShaderInfo& ShaderInfo = DescriptionArray[i];
+
+					FShaderType* ShaderType = FindShaderTypeByName(ShaderInfo.ShaderName);
+					const int32 NumInstructions = MaterialShaderMap->GetMaxNumInstructionsForShader(ShaderType);
+
+					FShaderInstructionsInfo Info;
+					Info.ShaderType = ShaderInfo.ShaderType;
+					Info.ShaderDescription = ShaderInfo.ShaderDescription;
+					Info.InstructionCount = NumInstructions;
+
+					Results.Push(Info);
+				}
+			}
+		}
+		else
+		{
+			for (auto DescriptionPair : ShaderTypeNamesAndDescriptions)
+			{
+				FVertexFactoryType* FactoryType = FindVertexFactoryType(DescriptionPair.Key);
+				const FMeshMaterialShaderMap* MeshShaderMap = MaterialShaderMap->GetMeshShaderMap(FactoryType);
+				if (MeshShaderMap)
+				{
+					TMap<FName, FShader*> ShaderMap;
+					MeshShaderMap->GetShaderList(ShaderMap);
+
+					auto& DescriptionArray = DescriptionPair.Value;
+
+					for (int32 i = 0; i < DescriptionArray.Num(); ++i)
+					{
+						const FRepresentativeShaderInfo& ShaderInfo = DescriptionArray[i];
+
+						FShader** ShaderEntry = ShaderMap.Find(ShaderInfo.ShaderName);
+						if (ShaderEntry != nullptr)
+						{
+							FShaderType* ShaderType = (*ShaderEntry)->GetType();
+							{
+								const int32 NumInstructions = MeshShaderMap->GetMaxNumInstructionsForShader(ShaderType);
+
+								FShaderInstructionsInfo Info;
+								Info.ShaderType = ShaderInfo.ShaderType;
+								Info.ShaderDescription = ShaderInfo.ShaderDescription;
+								Info.InstructionCount = NumInstructions;
+
+								Results.Push(Info);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void FMaterialStatsUtils::ExtractMatertialStatsInfo(FShaderStatsInfo& OutInfo, const FMaterialResource* MaterialResource)
+{
+	// extract potential errors
+	const ERHIFeatureLevel::Type MaterialFeatureLevel = MaterialResource->GetFeatureLevel();
+	FString FeatureLevelName;
+	GetFeatureLevelName(MaterialFeatureLevel, FeatureLevelName);
+
+	OutInfo.Empty();
+	TArray<FString> CompileErrors = MaterialResource->GetCompileErrors();
+	for (int32 ErrorIndex = 0; ErrorIndex < CompileErrors.Num(); ErrorIndex++)
+	{
+		OutInfo.StrShaderErrors += FString::Printf(TEXT("[%s] %s\n"), *FeatureLevelName, *CompileErrors[ErrorIndex]);
+	}
+
+	bool bNoErrors = OutInfo.StrShaderErrors.Len() == 0;
+
+	if (bNoErrors)
+	{
+		// extract instructions info
+		TArray<FMaterialStatsUtils::FShaderInstructionsInfo> ShaderInstructionInfo;
+		GetRepresentativeInstructionCounts(ShaderInstructionInfo, MaterialResource);
+
+		for (int32 InstructionIndex = 0; InstructionIndex < ShaderInstructionInfo.Num(); InstructionIndex++)
+		{
+			FShaderStatsInfo::FContent Content;
+
+			Content.StrDescription = ShaderInstructionInfo[InstructionIndex].InstructionCount > 0 ? FString::Printf(TEXT("%u"), ShaderInstructionInfo[InstructionIndex].InstructionCount) : TEXT("n/a");
+			Content.StrDescriptionLong = ShaderInstructionInfo[InstructionIndex].InstructionCount > 0 ?
+				FString::Printf(TEXT("%s: %u instructions"), *ShaderInstructionInfo[InstructionIndex].ShaderDescription, ShaderInstructionInfo[InstructionIndex].InstructionCount) :
+				TEXT("Offline shader compiler not available or an error was encountered!");
+
+			OutInfo.ShaderInstructionCount.Add(ShaderInstructionInfo[InstructionIndex].ShaderType, Content);
+		}
+
+		// extract samplers info
+		const int32 SamplersUsed = FMath::Max(MaterialResource->GetSamplerUsage(), 0);
+		const int32 MaxSamplers = GetExpectedFeatureLevelMaxTextureSamplers(MaterialResource->GetFeatureLevel());
+		OutInfo.SamplersCount.StrDescription = FString::Printf(TEXT("%u/%u"), SamplersUsed, MaxSamplers);
+		OutInfo.SamplersCount.StrDescriptionLong = FString::Printf(TEXT("%s samplers: %u/%u"), TEXT("Texture"), SamplersUsed, MaxSamplers);
+
+		// extract esimated sample info
+		uint32 NumVSTextureSamples = 0, NumPSTextureSamples = 0;
+		MaterialResource->GetEstimatedNumTextureSamples(NumVSTextureSamples, NumPSTextureSamples);
+
+		OutInfo.TextureSampleCount.StrDescription = FString::Printf(TEXT("VS(%u), PS(%u)"), NumVSTextureSamples, NumPSTextureSamples);
+		OutInfo.TextureSampleCount.StrDescriptionLong = FString::Printf(TEXT("Texture Lookups (Est.): Vertex(%u), Pixel(%u)"), NumVSTextureSamples, NumPSTextureSamples);
+
+		// extract interpolators info
+		uint32 UVScalarsUsed, CustomInterpolatorScalarsUsed;
+		MaterialResource->GetUserInterpolatorUsage(UVScalarsUsed, CustomInterpolatorScalarsUsed);
+
+		const uint32 TotalScalars = UVScalarsUsed + CustomInterpolatorScalarsUsed;
+		const uint32 MaxScalars = FMath::DivideAndRoundUp(TotalScalars, 4u) * 4;
+
+		OutInfo.InterpolatorsCount.StrDescription = FString::Printf(TEXT("%u/%u"), TotalScalars, MaxScalars);
+		OutInfo.InterpolatorsCount.StrDescriptionLong = FString::Printf(TEXT("User interpolators: %u/%u Scalars (%u/4 Vectors) (TexCoords: %i, Custom: %i)"),
+			TotalScalars, MaxScalars, MaxScalars / 4, UVScalarsUsed, CustomInterpolatorScalarsUsed);
+	}
+}
+
+/*end FMaterialStatsUtils */
+/***********************************************************************************************************************/
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.cpp b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.cpp
new file mode 100644
index 000000000000..f65465a2f1ad
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.cpp
@@ -0,0 +1,875 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+//
+
+#include "MaterialStatsGrid.h"
+#include "MaterialStats.h"
+#include "MaterialStatsCommon.h"
+
+/*==============================================================================================================*/
+/* FGridRow functions*/
+
+void FStatsGridRow::AddCell(FName ColumnName, TSharedPtr<FGridCell> Cell)
+{
+	RowCells.Add(ColumnName, Cell);
+}
+
+void FStatsGridRow::RemoveCell(FName ColumnName)
+{
+	RowCells.Remove(ColumnName);
+}
+
+TSharedPtr<FGridCell> FStatsGridRow::GetCell(const FName ColumnName)
+{
+	TSharedPtr<FGridCell> RetCell = nullptr;
+
+	auto* CellPtr = RowCells.Find(ColumnName);
+
+	if (CellPtr != nullptr)
+	{
+		RetCell = *CellPtr;
+	}
+
+	return RetCell;
+}
+
+void FStatsGridRow::RemovePlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	RemoveCell(ColumnName);
+}
+
+void FStatsGridRow::FillPlatformCellsHelper(TSharedPtr<FMaterialStats> StatsManager)
+{
+	auto& PlatformDB = StatsManager->GetPlatformsDB();
+	for (auto Pair : PlatformDB)
+	{
+		auto Platform = Pair.Value;
+		if (!Platform->IsPresentInGrid())
+		{
+			continue;
+		}
+
+		for (int32 q = 0; q < (int32)EMaterialQualityLevel::Num; ++q)
+		{
+			EMaterialQualityLevel::Type QualityLevel = (EMaterialQualityLevel::Type)q;
+
+			if (StatsManager->GetStatsQualityFlag(QualityLevel))
+			{
+				// call implementation specific function to build the needed cell
+				AddPlatform(StatsManager, Platform, QualityLevel);
+			}
+		}
+	}
+}
+
+/* end FGridRow functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Empty functions*/
+
+void FStatsGridRow_Empty::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// just an array of empty cells
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, MakeShareable(new FGridCell_Empty()));
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Empty::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	TSharedPtr<FGridCell_Empty> Cell = MakeShareable(new FGridCell_Empty());
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/* end FStatsGridRow_Empty functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Quality functions*/
+
+void FStatsGridRow_Quality::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// we don't use a descriptor for this row
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, MakeShareable(new FGridCell_Empty()));
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Quality::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// translate material quality to string and store it inside a StaticString cell
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_StaticString> Cell = MakeShareable(new FGridCell_StaticString(CellContent, CellContent));
+
+	Cell->SetContentBold(true);
+	auto CellColor = FMaterialStatsUtils::QualitySettingColor(QualityLevel);
+	Cell->SetColor(CellColor);
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_Quality functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Errors functions*/
+
+void FStatsGridRow_Errors::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// add an "Error" string in the descriptor column
+	TSharedPtr<FGridCell> HeaderCell = MakeShareable(new FGridCell_StaticString(TEXT("Errors"), TEXT("Errors")));
+	HeaderCell->SetColor(FMaterialStatsUtils::OrangeColor);
+	HeaderCell->SetContentBold(true);
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, HeaderCell);
+
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Errors::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// add a cell that will query any available errors for this platform
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_ShaderValue> Cell = MakeShareable(new FGridCell_ShaderValue(StatsManager, EShaderInfoType::Errors, ERepresentativeShader::Num, QualityLevel, Platform->GetPlatformShaderType()));
+	Cell->SetColor(FMaterialStatsUtils::OrangeColor);
+	Cell->SetHorizontalAlignment(HAlign_Fill);
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_Errors functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Shaders functions*/
+
+FStatsGridRow_Shaders::FStatsGridRow_Shaders(ERepresentativeShader RepresentativeShader, bool bHeader)
+{
+	bIsHeaderRow = bHeader;
+	ShaderType = RepresentativeShader;
+}
+
+FStatsGridRow_Shaders::EShaderClass FStatsGridRow_Shaders::GetShaderClass(const ERepresentativeShader Shader)
+{
+	switch (Shader)
+	{
+		case ERepresentativeShader::StationarySurface:
+		case ERepresentativeShader::StationarySurfaceCSM:
+		case ERepresentativeShader::StationarySurface1PointLight:
+		case ERepresentativeShader::StationarySurfaceNPointLights:
+		case ERepresentativeShader::DynamicallyLitObject:
+		case ERepresentativeShader::UIDefaultFragmentShader:
+			return EShaderClass::FragmentShader;
+		break;
+
+		case ERepresentativeShader::StaticMesh:
+		case ERepresentativeShader::SkeletalMesh:
+		case ERepresentativeShader::UIDefaultVertexShader:
+		case ERepresentativeShader::UIInstancedVertexShader:
+			return EShaderClass::VertexShader;
+		break;
+	}
+
+	return EShaderClass::VertexShader;
+}
+
+void FStatsGridRow_Shaders::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	TSharedPtr<FGridCell> HeaderCell;
+
+	// in the first row of this type add a "Vertex/Fragment Shader" static text
+	if (bIsHeaderRow)
+	{
+		EShaderClass ShaderClass = GetShaderClass(ShaderType);
+		FString HeaderContent = ShaderClass == EShaderClass::VertexShader ? TEXT("Vertex Shader") : TEXT("Pixel Shader");
+
+		HeaderCell = MakeShareable(new FGridCell_StaticString(HeaderContent, HeaderContent));
+		HeaderCell->SetContentBold(true);
+		HeaderCell->SetColor(FLinearColor::Gray);
+	}
+	else
+	{
+		HeaderCell = MakeShareable(new FGridCell_Empty());
+	}
+
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, HeaderCell);
+
+	// now add a cell that can display the name of this shader's class
+	FString ShaderColumnContent = FMaterialStatsUtils::RepresentativeShaderTypeToString(ShaderType);
+	TSharedPtr<FGridCell> ShaderNameCell = MakeShareable(new FGridCell_StaticString(ShaderColumnContent, ShaderColumnContent));
+	ShaderNameCell->SetHorizontalAlignment(HAlign_Fill);
+	ShaderNameCell->SetContentBold(true);
+	ShaderNameCell->SetColor(FLinearColor::Gray);
+	AddCell(FMaterialStatsGrid::ShaderColumnName, ShaderNameCell);
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Shaders::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// add a cell that display the instruction count for this platform
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_ShaderValue> Cell = MakeShareable(new FGridCell_ShaderValue(StatsManager, EShaderInfoType::InstructionsCount, ShaderType, QualityLevel, Platform->GetPlatformShaderType()));
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_Shaders functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Samplers functions*/
+
+void FStatsGridRow_Samplers::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// static text in the descriptor column
+	TSharedPtr<FGridCell> HeaderCell = MakeShareable(new FGridCell_StaticString(TEXT("Samplers"), TEXT("Texture Samplers")));
+	HeaderCell->SetColor(FLinearColor::Gray);
+	HeaderCell->SetContentBold(true);
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, HeaderCell);
+
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Samplers::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// cell that will enumerate the total number of samplers in this material
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_ShaderValue> Cell = MakeShareable(new FGridCell_ShaderValue(StatsManager, EShaderInfoType::SamplersCount, ERepresentativeShader::Num, QualityLevel, Platform->GetPlatformShaderType()));
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_Samplers functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_Interpolators functions*/
+
+void FStatsGridRow_Interpolators::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// static string in the descriptor column
+	TSharedPtr<FGridCell> HeaderCell = MakeShareable(new FGridCell_StaticString(TEXT("Interpolators"), TEXT("Interpolators")));
+	HeaderCell->SetColor(FLinearColor::Gray);
+	HeaderCell->SetContentBold(true);
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, HeaderCell);
+
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_Interpolators::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// cell that will enumerate the total number of interpolators in this material
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_ShaderValue> Cell = MakeShareable(new FGridCell_ShaderValue(StatsManager, EShaderInfoType::InterpolatorsCount, ERepresentativeShader::Num, QualityLevel, Platform->GetPlatformShaderType()));
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_Interpolators functions*/
+/*==============================================================================================================*/
+
+/*==============================================================================================================*/
+/* FStatsGridRow_NumTextureSamples functions*/
+
+void FStatsGridRow_NumTextureSamples::CreateRow(TSharedPtr<FMaterialStats> StatsManager)
+{
+	// static string in the descriptor column
+	TSharedPtr<FGridCell> HeaderCell = MakeShareable(new FGridCell_StaticString(TEXT("Texture Lookups (Est.)"), TEXT("Texture Lookups (Est.)")));
+	HeaderCell->SetColor(FLinearColor::Gray);
+	HeaderCell->SetContentBold(true);
+	AddCell(FMaterialStatsGrid::DescriptorColumnName, HeaderCell);
+
+	AddCell(FMaterialStatsGrid::ShaderColumnName, MakeShareable(new FGridCell_Empty()));
+
+	FillPlatformCellsHelper(StatsManager);
+}
+
+void FStatsGridRow_NumTextureSamples::AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel)
+{
+	// cell that will enumerate the total number of texture samples in this material
+	const FString CellContent = FMaterialStatsUtils::MaterialQualityToShortString(QualityLevel);
+	TSharedPtr<FGridCell_ShaderValue> Cell = MakeShareable(new FGridCell_ShaderValue(StatsManager, EShaderInfoType::TextureSampleCount, ERepresentativeShader::Num, QualityLevel, Platform->GetPlatformShaderType()));
+
+	const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+	AddCell(ColumnName, Cell);
+}
+
+/*end FStatsGridRow_NumTextureSamples functions*/
+/*==============================================================================================================*/
+
+/***********************************************************************************************************************/
+/*FShaderStatsGrid functions*/
+
+const FName FMaterialStatsGrid::DescriptorColumnName = TEXT("Descriptor");
+const FName FMaterialStatsGrid::ShaderColumnName = TEXT("ShaderList");
+
+FMaterialStatsGrid::FMaterialStatsGrid(TWeakPtr<FMaterialStats> _StatsManager)
+{
+	StatsManagerWPtr = _StatsManager;
+}
+
+FMaterialStatsGrid::~FMaterialStatsGrid()
+{
+	StaticRows.Empty();
+	VertexShaderRows.Empty();
+	FragmentShaderRows.Empty();
+	GridColumnContent.Empty();
+}
+
+TSharedPtr<FGridCell> FMaterialStatsGrid::GetCell(int32 RowID, FName ColumnName)
+{
+	// if there is no such row return a newly created cell with empty content
+	ERowType RowType;
+	int32 Index;
+	DissasambleRowKey(RowType, Index, RowID);
+
+	if (RowType == ERowType::FragmentShader && Index >= 0 && Index < FragmentShaderRows.Num())
+	{
+		return FragmentShaderRows[Index]->GetCell(ColumnName);
+	}
+	else if (RowType == ERowType::VertexShader && Index >= 0 && Index < VertexShaderRows.Num())
+	{
+		return VertexShaderRows[Index]->GetCell(ColumnName);
+	}
+	else
+	{
+		auto* RowPtr = StaticRows.Find(RowType);
+		if (RowPtr != nullptr)
+		{
+			return (*RowPtr)->GetCell(ColumnName);
+		}
+	}
+
+	return MakeShareable(new FGridCell_Empty());
+}
+
+void FMaterialStatsGrid::CollectShaderInfo(const TSharedPtr<FShaderPlatformSettings>& PlatformPtr, const EMaterialQualityLevel::Type QualityLevel)
+{
+	const FShaderPlatformSettings::FPlatformData& PlatformData = PlatformPtr->GetPlatformData(QualityLevel);
+
+	for (int32 i = 0; i < (int32)ERepresentativeShader::Num; ++i)
+	{
+		UsedShaders[i] |= PlatformData.ShaderStatsInfo.ShaderInstructionCount.Contains((ERepresentativeShader)i);
+	}
+}
+
+void FMaterialStatsGrid::CollectShaderInfo()
+{
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	for (int32 i = 0; i < UsedShaders.Num(); ++i)
+	{
+		UsedShaders[i] = false;
+	}
+
+	auto& PlatformDB = StatsManager->GetPlatformsDB();
+	for (auto Pair : PlatformDB)
+	{
+		auto Platform = Pair.Value;
+
+		if (!Platform->IsPresentInGrid())
+		{
+			continue;
+		}
+
+		for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+		{
+			EMaterialQualityLevel::Type QualitySetting = static_cast<EMaterialQualityLevel::Type>(q);
+
+			CollectShaderInfo(Platform, QualitySetting);
+		}
+	}
+}
+
+FString FMaterialStatsGrid::GetColumnContent(const FName ColumnName) const
+{
+	auto* Ptr = GridColumnContent.Find(ColumnName);
+
+	return Ptr != nullptr ? Ptr->Content : TEXT("");
+}
+
+FString FMaterialStatsGrid::GetColumnContentLong(const FName ColumnName) const
+{
+	auto* Ptr = GridColumnContent.Find(ColumnName);
+
+	return Ptr != nullptr ? Ptr->ContentLong : TEXT("");
+}
+
+FLinearColor FMaterialStatsGrid::GetColumnColor(const FName ColumnName) const
+{
+	auto* Ptr = GridColumnContent.Find(ColumnName);
+
+	return Ptr != nullptr ? Ptr->Color : FLinearColor::Gray;
+}
+
+void FMaterialStatsGrid::BuildKeyAndInsert(const ERowType RowType, int16 Index /*= 0*/)
+{
+	int32 Key = AssembleRowKey(RowType, Index);
+	RowIDs.Add(MakeShareable(new int32(Key)));
+}
+
+void FMaterialStatsGrid::CheckForErrors()
+{
+	PlatformErrorsType = EGlobalErrorsType::NoErrors;
+
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (StatsManager.IsValid())
+	{
+		auto& PlatformDB = StatsManager->GetPlatformsDB();
+		for (auto Pair : PlatformDB)
+		{
+			auto Platform = Pair.Value;
+
+			if (!Platform->IsPresentInGrid())
+			{
+				continue;
+			}
+
+			for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+			{
+				EMaterialQualityLevel::Type QualitySetting = static_cast<EMaterialQualityLevel::Type>(q);
+				if (StatsManager->GetStatsQualityFlag(QualitySetting))
+				{
+					auto &Data = Platform->GetPlatformData(QualitySetting);
+
+					if (Data.ShaderStatsInfo.HasErrors())
+					{
+						PlatformErrorsType = PlatformErrorsType == EGlobalErrorsType::SpecificPlatformErrors ? EGlobalErrorsType::SpecificPlatformErrors : EGlobalErrorsType::GlobalPlatformErrors;
+					}
+					else
+					{
+						PlatformErrorsType = PlatformErrorsType == EGlobalErrorsType::NoErrors ? EGlobalErrorsType::NoErrors : EGlobalErrorsType::SpecificPlatformErrors;
+					}
+				}
+			}
+		}
+	}
+}
+
+void FMaterialStatsGrid::BuildRowIds()
+{
+	RowIDs.Reset();
+
+	BuildKeyAndInsert(ERowType::Quality);
+
+	// add errors row if at least one platform has issues
+	if (PlatformErrorsType != EGlobalErrorsType::NoErrors)
+	{
+		BuildKeyAndInsert(ERowType::Errors);
+	}
+
+	// add the rest of the rows only if there's at least one error free platform
+	if (PlatformErrorsType != EGlobalErrorsType::GlobalPlatformErrors)
+	{
+		for (int32 i = 0; i < FragmentShaderRows.Num(); ++i)
+		{
+			BuildKeyAndInsert(ERowType::FragmentShader, (int16)i);
+		}
+
+		if (FragmentShaderRows.Num())
+		{
+			BuildKeyAndInsert(ERowType::Empty);
+		}
+
+		for (int32 i = 0; i < VertexShaderRows.Num(); ++i)
+		{
+			BuildKeyAndInsert(ERowType::VertexShader, (int16)i);
+		}
+
+		if (VertexShaderRows.Num())
+		{
+			BuildKeyAndInsert(ERowType::Empty);
+		}
+
+		BuildKeyAndInsert(ERowType::Samplers);
+		BuildKeyAndInsert(ERowType::TextureSamples);
+		BuildKeyAndInsert(ERowType::Interpolators);	
+	}
+}
+
+void FMaterialStatsGrid::OnShaderChanged()
+{
+	CollectShaderInfo();
+	BuildShaderRows();
+	CheckForErrors();
+
+	BuildRowIds();
+}
+
+void FMaterialStatsGrid::BuildStaticRows()
+{
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	StaticRows.Reset();
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_Empty());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::Empty, Row);
+	}
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_Quality());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::Quality, Row);
+	}
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_Errors());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::Errors, Row);
+	}
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_Samplers());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::Samplers, Row);
+	}
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_NumTextureSamples());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::TextureSamples, Row);
+	}
+	{
+		TSharedPtr<FStatsGridRow> Row = MakeShareable(new FStatsGridRow_Interpolators());
+		Row->CreateRow(StatsManager);
+		StaticRows.Add(ERowType::Interpolators, Row);
+	}
+}
+
+void FMaterialStatsGrid::BuildShaderRows()
+{
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	VertexShaderRows.Empty();
+	FragmentShaderRows.Empty();
+
+	// fragment shaders
+	for (auto i = (int32)ERepresentativeShader::FirstFragmentShader; i <= (int32)ERepresentativeShader::LastFragmentShader; ++i)
+	{
+		if (UsedShaders[i])
+		{
+			bool bFirstShader = !FragmentShaderRows.Num();
+
+			TSharedPtr<FStatsGridRow> FragShaderRow = MakeShareable(new FStatsGridRow_Shaders((ERepresentativeShader)i, bFirstShader));
+			FragShaderRow->CreateRow(StatsManager);
+
+			FragmentShaderRows.Add(FragShaderRow);
+		}
+	}
+
+	// vertex shaders
+	for (auto i = (int32)ERepresentativeShader::FirstVertexShader; i <= (int32)ERepresentativeShader::LastVertexShader; ++i)
+	{
+		if (UsedShaders[i])
+		{
+			bool bFirstShader = !VertexShaderRows.Num();
+
+			TSharedPtr<FStatsGridRow> VertShaderRow = MakeShareable(new FStatsGridRow_Shaders((ERepresentativeShader)i, bFirstShader));
+			VertShaderRow->CreateRow(StatsManager);
+
+			VertexShaderRows.Add(VertShaderRow);
+		}
+	}
+}
+
+void FMaterialStatsGrid::BuildColumnInfo()
+{
+	GridColumnContent.Add(DescriptorColumnName, FColumnInfo());
+	GridColumnContent.Add(ShaderColumnName, FColumnInfo());
+
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	const auto& PlatformDB = StatsManager->GetPlatformsDB();
+	for (auto PlatformPair : PlatformDB)
+	{
+		if (!PlatformPair.Value->IsPresentInGrid())
+		{
+			continue;
+		}
+
+		for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+		{
+			auto QualityLevel = static_cast<EMaterialQualityLevel::Type>(q);
+
+			if (!StatsManager->GetStatsQualityFlag(QualityLevel))
+			{
+				continue;
+			}
+
+			AddColumnInfo(PlatformPair.Value, QualityLevel);
+		}
+	}
+}
+
+void FMaterialStatsGrid::BuildGrid()
+{
+	CollectShaderInfo();
+
+	BuildStaticRows();
+	BuildShaderRows();
+	BuildColumnInfo();
+	CheckForErrors();
+
+	BuildRowIds();
+}
+
+void FMaterialStatsGrid::AddColumnInfo(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel)
+{
+	FColumnInfo Info;
+
+	Info.Color = FMaterialStatsUtils::PlatformTypeColor(PlatformPtr->GetCategoryType());
+	Info.Content = PlatformPtr->GetPlatformName().ToString();
+	Info.ContentLong = PlatformPtr->GetPlatformDescription();
+
+	const FName ColumnName = MakePlatformColumnName(PlatformPtr, QualityLevel);
+	GridColumnContent.Add(ColumnName, Info);
+}
+
+void FMaterialStatsGrid::RemoveColumnInfo(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel)
+{
+	const FName ColumnName = MakePlatformColumnName(PlatformPtr, QualityLevel);
+	GridColumnContent.Remove(ColumnName);
+}
+
+void FMaterialStatsGrid::AddOrRemovePlatform(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const bool bAdd, const EMaterialQualityLevel::Type QualityLevel)
+{
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	// update column record
+	if (bAdd)
+	{
+		AddColumnInfo(PlatformPtr, QualityLevel);
+	}
+	else
+	{
+		RemoveColumnInfo(PlatformPtr, QualityLevel);
+	}
+
+	for (auto RowPair : StaticRows)
+	{
+		if (bAdd)
+		{
+			RowPair.Value->AddPlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+		else
+		{
+			RowPair.Value->RemovePlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+	}
+
+	for (int32 i = 0; i < VertexShaderRows.Num(); ++i)
+	{
+		if (bAdd)
+		{
+			VertexShaderRows[i]->AddPlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+		else
+		{
+			VertexShaderRows[i]->RemovePlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+	}
+
+	for (int32 i = 0; i < FragmentShaderRows.Num(); ++i)
+	{
+		if (bAdd)
+		{
+			FragmentShaderRows[i]->AddPlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+		else
+		{
+			FragmentShaderRows[i]->RemovePlatform(StatsManager, PlatformPtr, QualityLevel);
+		}
+	}
+}
+
+void FMaterialStatsGrid::OnAddOrRemovePlatform(TSharedPtr<FShaderPlatformSettings> PlatformPtr)
+{
+	bool bAdded = PlatformPtr->IsPresentInGrid();
+
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+	{
+		return;
+	}
+
+	for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+	{
+		auto QualityLevel = static_cast<EMaterialQualityLevel::Type>(q);
+
+		if (!StatsManager->GetStatsQualityFlag(QualityLevel))
+		{
+			continue;
+		}
+
+		AddOrRemovePlatform(PlatformPtr, bAdded, QualityLevel);
+	}
+
+	// recheck shader rows in case something changed
+	OnShaderChanged();
+}
+
+void FMaterialStatsGrid::OnQualitySettingChanged(const EMaterialQualityLevel::Type QualityLevel)
+{
+	TSharedPtr<FMaterialStats> StatsManager = StatsManagerWPtr.Pin();
+	if (!StatsManager.IsValid())
+		return;
+
+	bool bQualityOn = StatsManager->GetStatsQualityFlag(QualityLevel);
+
+	const auto& PlatformDB = StatsManager->GetPlatformsDB();
+	for (auto PlatformPair : PlatformDB)
+	{
+		if (PlatformPair.Value->IsPresentInGrid())
+		{
+			AddOrRemovePlatform(PlatformPair.Value, bQualityOn, QualityLevel);
+		}
+	}
+
+	// recheck shader rows in case something changed
+	OnShaderChanged();
+}
+
+FName FMaterialStatsGrid::MakePlatformColumnName(const TSharedPtr<FShaderPlatformSettings>& Platform, const EMaterialQualityLevel::Type Quality)
+{
+	FName RetName = *(Platform->GetPlatformID().ToString() + "_" + FMaterialStatsUtils::MaterialQualityToString(Quality));
+	return RetName;
+}
+
+/*end FShaderStatsGrid functions*/
+/***********************************************************************************************************************/
+
+/***********************************************************************************************************************/
+/* FGridCell functions */
+
+FGridCell::FGridCell()
+{
+	CellColor = FMaterialStatsUtils::DefaultGridTextColor;
+}
+
+FString FGridCell_Empty::GetCellContent()
+{
+	return TEXT("");
+}
+
+FString FGridCell_Empty::GetCellContentLong()
+{
+	return TEXT("");
+}
+
+FGridCell_StaticString::FGridCell_StaticString(const FString& _Content, const FString& _ContentLong)
+{
+	Content = _Content;
+	ContentLong = _ContentLong;
+}
+
+FString FGridCell_StaticString::GetCellContent()
+{
+	return Content;
+}
+
+FString FGridCell_StaticString::GetCellContentLong()
+{
+	return ContentLong;
+}
+
+FGridCell_ShaderValue::FGridCell_ShaderValue(const TWeakPtr<FMaterialStats>& _MaterialStatsWPtr, const EShaderInfoType _InfoType, const ERepresentativeShader _ShaderType,
+	const EMaterialQualityLevel::Type _QualityLevel, const EShaderPlatform _PlatformType)
+{
+	MaterialStatsWPtr = _MaterialStatsWPtr;
+
+	InfoType = _InfoType;
+	ShaderType = _ShaderType;
+	QualityLevel = _QualityLevel;
+	PlatformType = _PlatformType;
+}
+
+FString FGridCell_ShaderValue::InternalGetContent(bool bLongContent)
+{
+	auto MaterialStats = MaterialStatsWPtr.Pin();
+	if (!MaterialStats.IsValid())
+	{
+		return TEXT("");
+	}
+
+	auto Platform = MaterialStats->GetPlatformSettings(PlatformType);
+	if (!Platform.IsValid())
+	{
+		return TEXT("");
+	}
+
+	auto PlatformData = Platform->GetPlatformData(QualityLevel);
+
+	switch (InfoType)
+	{
+		case EShaderInfoType::Errors:
+			return PlatformData.ShaderStatsInfo.StrShaderErrors;
+		break;
+
+		case EShaderInfoType::InstructionsCount:
+		{
+			auto* Count = PlatformData.ShaderStatsInfo.ShaderInstructionCount.Find(ShaderType);
+			if (Count)
+			{
+				return bLongContent ? Count->StrDescriptionLong : Count->StrDescription;
+			}
+		}
+		break;
+
+		case EShaderInfoType::InterpolatorsCount:
+			return bLongContent ? PlatformData.ShaderStatsInfo.InterpolatorsCount.StrDescriptionLong : PlatformData.ShaderStatsInfo.InterpolatorsCount.StrDescription;
+		break;
+
+		case EShaderInfoType::TextureSampleCount:
+			return bLongContent ? PlatformData.ShaderStatsInfo.TextureSampleCount.StrDescriptionLong : PlatformData.ShaderStatsInfo.TextureSampleCount.StrDescription;
+		break;
+
+		case EShaderInfoType::SamplersCount:
+			return bLongContent ? PlatformData.ShaderStatsInfo.SamplersCount.StrDescriptionLong : PlatformData.ShaderStatsInfo.SamplersCount.StrDescription;
+		break;
+	}
+
+	return TEXT("");
+}
+
+FString FGridCell_ShaderValue::GetCellContent()
+{
+	return InternalGetContent(false);
+}
+
+FString FGridCell_ShaderValue::GetCellContentLong()
+{
+	return InternalGetContent(true);
+}
diff --git a/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.h b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.h
new file mode 100644
index 000000000000..a352fbd6b83f
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/MaterialStatsGrid.h
@@ -0,0 +1,392 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "EngineGlobals.h"
+#include "SceneTypes.h"
+#include "Types/SlateEnums.h"
+#include "RHIDefinitions.h"
+#include "MaterialStatsCommon.h"
+#include "Containers/StaticArray.h"
+#include "MaterialStats.h"
+
+/** class to represent a single cell inside the material stats grid */
+class FGridCell
+{
+protected:
+	/** attributes used at display time to configure widgets */
+	FLinearColor CellColor;
+	bool bBoldContent = false;
+
+	EHorizontalAlignment HAlignment = EHorizontalAlignment::HAlign_Center;
+	EVerticalAlignment VAlignment = EVerticalAlignment::VAlign_Center;
+
+public:
+	FGridCell();
+	virtual ~FGridCell() {}
+
+	/** returns the main content of this cell */
+	virtual FString GetCellContent() = 0;
+	/** this can be used for tool tips or other detailed descriptions */
+	virtual FString GetCellContentLong() = 0;
+
+	FORCEINLINE FLinearColor GetColor() const;
+	FORCEINLINE void SetColor(const FLinearColor& Color);
+
+	FORCEINLINE bool IsContentBold() const;
+	FORCEINLINE void SetContentBold(bool bValue);
+
+	virtual EHorizontalAlignment GetHorizontalAlignment();
+	FORCEINLINE void SetHorizontalAlignment(EHorizontalAlignment Align);
+
+	FORCEINLINE EVerticalAlignment GetVerticalAlignment() const;
+	FORCEINLINE void SetVerticalAlignment(EVerticalAlignment Align);
+};
+
+/** this time of cell with just return an empty string and its mainly used to separate rows */
+class FGridCell_Empty : public FGridCell
+{
+public:
+	FString GetCellContent() override;
+	FString GetCellContentLong() override;
+};
+
+/** cell that stores & returns a simple static string */
+class FGridCell_StaticString : public FGridCell
+{
+	FString Content;
+	FString ContentLong;
+
+public:
+	FGridCell_StaticString(const FString& _Content, const FString& _ContentLong);
+
+	FString GetCellContent() override;
+	FString GetCellContentLong() override;
+};
+
+/** enumeration used to classify arguments for FGridCell_ShaderValue */
+enum class EShaderInfoType
+{
+	Errors,
+	InstructionsCount,
+	SamplersCount,
+	InterpolatorsCount,
+	TextureSampleCount,
+};
+
+/** this type of cell will query certain type of informations from the material */
+class FGridCell_ShaderValue : public FGridCell
+{
+private:
+	TWeakPtr<class FMaterialStats> MaterialStatsWPtr;
+
+	EShaderInfoType InfoType;
+	ERepresentativeShader ShaderType;
+	EMaterialQualityLevel::Type QualityLevel;
+	EShaderPlatform PlatformType;
+
+	FString InternalGetContent(bool bLongContent);
+
+public:
+	FGridCell_ShaderValue(const TWeakPtr<FMaterialStats>& _MaterialStatsWPtr, const EShaderInfoType _InfoType, const ERepresentativeShader _ShaderType,
+		const EMaterialQualityLevel::Type _QualityLevel, const EShaderPlatform _PlatformType);
+
+	FString GetCellContent() override;
+	FString GetCellContentLong() override;
+};
+
+/** virtual class to model grid row generation */
+class FStatsGridRow
+{
+protected:
+	/** key is column name */
+	TMap<FName, TSharedPtr<FGridCell>> RowCells;
+
+protected:
+	void AddCell(FName ColumnName, TSharedPtr<FGridCell> Cell);
+	void RemoveCell(FName ColumnName);
+
+	/** helper function that will loop through all platforms present in the grid and attempt to build their columns by calling AddPlatform() function */
+	void FillPlatformCellsHelper(TSharedPtr<FMaterialStats> StatsManager);
+
+public:
+	FStatsGridRow() {}
+	virtual ~FStatsGridRow() {}
+
+	/** this function should generate all needed cells  */
+	virtual void CreateRow(TSharedPtr<FMaterialStats> StatsManager) = 0;
+
+	/** Add/RemovePlatforms should be called when a platform is added or removed from the grid */
+	virtual void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel) = 0;
+	virtual void RemovePlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel);
+
+	TSharedPtr<FGridCell> GetCell(const FName ColumnName);
+};
+
+/** separator row */
+class FStatsGridRow_Empty : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** row that will produce static string from EMaterialQualityLevel::Type */
+class FStatsGridRow_Quality : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** row that will display eventual shader errors */
+class FStatsGridRow_Errors : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** row that will extract and the number of instructions for each used shader */
+class FStatsGridRow_Shaders : public FStatsGridRow
+{
+public:
+	enum class EShaderClass
+	{
+		VertexShader,
+		FragmentShader
+	};
+
+private:
+	// if this is true it will add a text in the 'description' column with 'fragment/vertex shader' text
+	bool bIsHeaderRow = false;
+
+	//EShaderType ShaderType;
+	ERepresentativeShader ShaderType;
+private:
+	EShaderClass GetShaderClass(const ERepresentativeShader Shader);
+
+public:
+	FStatsGridRow_Shaders(ERepresentativeShader RepresentativeShader, bool bHeader);
+
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** this row will display the global number of samplers present in the material for a specified platform */
+class FStatsGridRow_Samplers : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** this row will display the global number of interpolators present in the material for a specified platform */
+class FStatsGridRow_Interpolators : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** this row will display the global number of texture samples present in the material for a specified platform */
+class FStatsGridRow_NumTextureSamples : public FStatsGridRow
+{
+public:
+	void CreateRow(TSharedPtr<FMaterialStats> StatsManager) override;
+
+	void AddPlatform(TSharedPtr<FMaterialStats> StatsManager, const TSharedPtr<FShaderPlatformSettings> Platform, const EMaterialQualityLevel::Type QualityLevel) override;
+};
+
+/** class that models the logical material stats grid */
+class FMaterialStatsGrid
+{
+	/** enum used whether any shader platform reported errors */
+	enum class EGlobalErrorsType
+	{
+		// no errors at all
+		NoErrors,
+		// there are some platform specific errors
+		SpecificPlatformErrors,
+		// all platforms have errors
+		GlobalPlatformErrors
+	};
+
+	/** enum used to differentiate between various row types */
+	enum class ERowType
+	{
+		Empty,
+		Quality,
+		Errors,
+		Samplers,
+		Interpolators,
+		TextureSamples,
+
+		VertexShader,
+		FragmentShader,
+	};
+
+	/** collection of row object that will not change as shader platforms are added or removed */
+	TMap<ERowType, TSharedPtr<FStatsGridRow>> StaticRows;
+	/** array of shader columns that vary with the number of shaders present in each analyzed material */
+	TArray<TSharedPtr<FStatsGridRow>> VertexShaderRows;
+	TArray<TSharedPtr<FStatsGridRow>> FragmentShaderRows;
+
+	/** this structure will held additional informations about the columns of this grid, needed at display time */
+	struct FColumnInfo
+	{
+		FString Content = TEXT("");
+		FString ContentLong = TEXT("");
+		FLinearColor Color = FLinearColor::Gray;
+	};
+
+	/** collection of column information sorted by their names */
+	TMap<FName, FColumnInfo> GridColumnContent;
+
+	/** array feed into a SListView used by GridStatsWidget
+	*  each entry is a pointer to the id of each row inside the grid
+	*  the ids are assembled/disassabled with AssembleRowKey()/DissasambleRowKey()
+	*/
+	TArray<TSharedPtr<int32>> RowIDs;
+
+	/** pointer to stats manager who will actually create an instance of this class */
+	TWeakPtr<class FMaterialStats> StatsManagerWPtr;
+
+	/** helper array that mark the presence or absence of each type of shader (ERepresentativeShader) in the analyzed material */
+	TStaticArray<bool, (int32)ERepresentativeShader::Num> UsedShaders;
+
+	/** variable used to indicate the presence of errors in any of the analyzed shader platforms */
+	/** this will be updated every time a shader is compiled */
+	EGlobalErrorsType PlatformErrorsType;
+
+public:
+	const static FName DescriptorColumnName;
+	const static FName ShaderColumnName;
+
+private:
+	void AddColumnInfo(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel);
+	void RemoveColumnInfo(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const EMaterialQualityLevel::Type QualityLevel);
+
+	/** this function will go through all available shader platforms and will call build the content of GridColumnContent */
+	void BuildColumnInfo();
+
+	/** setup functions that will perform the actual row building */
+	/** BuildShaderRows will be called after each shader compilation */
+	void BuildShaderRows();
+	void BuildStaticRows();
+
+	void CheckForErrors();
+
+	/** this functions will build the content of UsedShaders array */
+	void CollectShaderInfo(const TSharedPtr<FShaderPlatformSettings>& PlatformPtr, const EMaterialQualityLevel::Type QualityLevel);
+	void CollectShaderInfo();
+
+	/** functions that build the row ids array used by GridStatsWidget to identify available rows inside this logical grid */
+	void BuildKeyAndInsert(const ERowType RowType, int16 Index = 0);
+	void BuildRowIds();
+
+	/** helper functions to create an ID for each row */
+	FORCEINLINE int32 AssembleRowKey(const ERowType RowType, const int16 Index);
+	FORCEINLINE void DissasambleRowKey(ERowType& RowType, int32& Index, const int32 Key);
+
+	void AddOrRemovePlatform(TSharedPtr<FShaderPlatformSettings> PlatformPtr, const bool bAdd, const EMaterialQualityLevel::Type QualityLevel);
+
+public:
+	FMaterialStatsGrid(TWeakPtr<FMaterialStats> _StatsManager);
+	~FMaterialStatsGrid();
+
+	TSharedPtr<FGridCell> GetCell(int32 RowID, FName ColumnName);
+
+	FORCEINLINE const TArray<TSharedPtr<int32>>* GetGridRowIDs() const;
+
+	FORCEINLINE TArray<FName> GetVisibleColumnNames() const;
+
+	void OnShaderChanged();
+
+	void OnAddOrRemovePlatform(TSharedPtr<FShaderPlatformSettings> PlatformPtr);
+	void OnQualitySettingChanged(const EMaterialQualityLevel::Type QualityLevel);
+
+	/** call to build the content of this grid */
+	void BuildGrid();
+
+	FString GetColumnContent(const FName ColumnName) const;
+	FString GetColumnContentLong(const FName ColumnName) const;
+	FLinearColor GetColumnColor(const FName ColumnName) const;
+
+	/** helper function that will assemble a column name from the given arguments */
+	static FName MakePlatformColumnName(const TSharedPtr<FShaderPlatformSettings>& Platform, const EMaterialQualityLevel::Type Quality);
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// FShaderStatsGrid implementation
+FORCEINLINE const TArray<TSharedPtr<int32>> *FMaterialStatsGrid::GetGridRowIDs() const
+{
+	return &RowIDs;
+}
+
+FORCEINLINE int32 FMaterialStatsGrid::AssembleRowKey(const ERowType RowType, const int16 Index)
+{
+	int32 Key = ((int32)Index << 16) | (int32)RowType;
+	return Key;
+}
+
+FORCEINLINE void FMaterialStatsGrid::DissasambleRowKey(ERowType& RowType, int32& Index, const int32 Key)
+{
+	RowType = (ERowType)(Key & 0xffff);
+	Index = Key >> 16;
+}
+
+FORCEINLINE TArray<FName> FMaterialStatsGrid::GetVisibleColumnNames() const
+{
+	TArray<FName> ColumnList;
+	GridColumnContent.GenerateKeyArray(ColumnList);
+
+	return ColumnList;
+}
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+FORCEINLINE FLinearColor FGridCell::GetColor() const
+{
+	return CellColor;
+}
+
+FORCEINLINE void FGridCell::SetColor(const FLinearColor& Color)
+{
+	CellColor = Color;
+}
+
+FORCEINLINE bool FGridCell::IsContentBold() const
+{
+	return bBoldContent;
+}
+
+FORCEINLINE void FGridCell::SetContentBold(bool bValue)
+{
+	bBoldContent = bValue;
+}
+
+FORCEINLINE EHorizontalAlignment FGridCell::GetHorizontalAlignment()
+{
+	return HAlignment;
+}
+
+FORCEINLINE void FGridCell::SetHorizontalAlignment(EHorizontalAlignment Align)
+{
+	HAlignment = Align;
+}
+
+FORCEINLINE EVerticalAlignment FGridCell::GetVerticalAlignment() const
+{
+	return VAlignment;
+}
+
+FORCEINLINE void FGridCell::SetVerticalAlignment(EVerticalAlignment Align)
+{
+	VAlignment = Align;
+}
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.cpp b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.cpp
new file mode 100644
index 000000000000..7490acab345b
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.cpp
@@ -0,0 +1,711 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "SMaterialEditorStatsWidget.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "Widgets/Layout/SExpandableArea.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Images/SImage.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Fonts/FontMeasure.h"
+#include "EditorStyleSet.h"
+#include "MaterialStatsGrid.h"
+#include "Framework/Application/SlateApplication.h"
+
+#define LOCTEXT_NAMESPACE "MaterialEditorStatsWidget"
+
+const float SMaterialEditorStatsWidget::ColumnSizeSmall = 100.0f;
+const float SMaterialEditorStatsWidget::ColumnSizeMedium = 150.0f;
+const float SMaterialEditorStatsWidget::ColumnSizeLarge = 200.0f;
+const float SMaterialEditorStatsWidget::ColumnSizeExtraLarge = 400.0f;
+
+const FName SMaterialEditorStatsWidget::RegularFontStyle = TEXT("DataTableEditor.CellText");
+const FName SMaterialEditorStatsWidget::BoldFontStyle = TEXT("RichTextBlock.Bold");
+
+class SMaterialStatsViewRow : public SMultiColumnTableRow<TSharedPtr<int32>>
+{
+public:
+	SLATE_BEGIN_ARGS(SMaterialStatsViewRow) {}
+		/** The list item for this row */
+		SLATE_ARGUMENT(TSharedPtr<int32>, PtrRowID)
+		SLATE_ARGUMENT(TWeakPtr<FMaterialStats>, MaterialStatsWPtr)
+	SLATE_END_ARGS()
+
+	/** Construct function for this widget */
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView)
+	{
+		PtrRowID = InArgs._PtrRowID;
+		MaterialStatsWPtr = InArgs._MaterialStatsWPtr;
+
+		SMultiColumnTableRow<TSharedPtr<int32>>::Construct(
+			FSuperRowType::FArguments()
+			.Style(FEditorStyle::Get(), "DataTableEditor.CellListViewRow"),
+			InOwnerTableView
+		);
+	}
+
+	/** Overridden from SMultiColumnTableRow.  Generates a widget for this column of the list view. */
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& ColumnName) override;
+
+	FText GetTextForCell(const FName Name, const bool bToolTip) const;
+	FSlateColor GetColorForCell(const FName Name) const;
+	EHorizontalAlignment GetHAlignForCell(const FName Name) const;
+	EVerticalAlignment GetVAlignForCell(const FName Name) const;
+
+private:
+	/** The item associated with this row of data */
+	TSharedPtr<int32> PtrRowID;
+
+	TWeakPtr<FMaterialStats> MaterialStatsWPtr;
+};
+
+TSharedRef<SWidget> SMaterialStatsViewRow::GenerateWidgetForColumn(const FName& ColumnName)
+{
+	EHorizontalAlignment HAlign = EHorizontalAlignment::HAlign_Fill;
+	EVerticalAlignment VALign = EVerticalAlignment::VAlign_Top;
+
+	FName UsedFontStyle = SMaterialEditorStatsWidget::GetRegulatFontStyleName();
+
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid() && PtrRowID.IsValid())
+	{
+		const int32 RowID = *PtrRowID;
+
+		auto Cell = StatsPtr->GetStatsGrid()->GetCell(RowID, ColumnName);
+
+		UsedFontStyle = Cell->IsContentBold() ? SMaterialEditorStatsWidget::GetBoldFontStyleName() : SMaterialEditorStatsWidget::GetRegulatFontStyleName();
+		HAlign = Cell->GetHorizontalAlignment();
+		VALign = Cell->GetVerticalAlignment();
+	}
+
+	return SNew(SBox)
+		.Padding(FMargin(4, 2, 4, 2))
+		.HAlign(HAlign)
+		.VAlign(VALign)
+		[
+			SNew(STextBlock)
+			.TextStyle(FEditorStyle::Get(), UsedFontStyle)
+			.ColorAndOpacity(this, &SMaterialStatsViewRow::GetColorForCell, ColumnName)
+			.Text(this, &SMaterialStatsViewRow::GetTextForCell, ColumnName, false)
+			.ToolTipText(this, &SMaterialStatsViewRow::GetTextForCell, ColumnName, true)
+			.AutoWrapText(true)
+		];
+}
+
+FText SMaterialStatsViewRow::GetTextForCell(const FName Name, const bool bToolTip) const
+{
+	FString CellContent;
+
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid() && PtrRowID.IsValid())
+	{
+		const int32 RowID = *PtrRowID;
+
+		auto Cell = StatsPtr->GetStatsGrid()->GetCell(RowID, Name);
+		if (Cell.IsValid())
+		{
+			CellContent = bToolTip ? Cell->GetCellContentLong() : Cell->GetCellContent();
+		}
+	}
+
+	FText FinalText = CellContent.Len() > 0 ? FText::FromString(CellContent) : FText::FromString(TEXT(""));
+	return FinalText;
+}
+
+FSlateColor SMaterialStatsViewRow::GetColorForCell(const FName Name) const
+{
+	FSlateColor Color(FColorList::White);
+
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid() && PtrRowID.IsValid())
+	{
+		const int32 RowID = *PtrRowID;
+
+		const auto Cell = StatsPtr->GetStatsGrid()->GetCell(RowID, Name);
+
+		return Cell->GetColor();
+	}
+
+	return Color;
+}
+
+EHorizontalAlignment SMaterialStatsViewRow::GetHAlignForCell(const FName Name) const
+{
+	EHorizontalAlignment Align = HAlign_Center;
+
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid() && PtrRowID.IsValid())
+	{
+		const int32 RowID = *PtrRowID;
+
+		const auto Cell = StatsPtr->GetStatsGrid()->GetCell(RowID, Name);
+
+		Align = Cell->GetHorizontalAlignment();
+	}
+
+	return Align;
+}
+
+EVerticalAlignment SMaterialStatsViewRow::GetVAlignForCell(const FName Name) const
+{
+	EVerticalAlignment Align = VAlign_Center;
+
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid() && PtrRowID.IsValid())
+	{
+		const int32 RowID = *PtrRowID;
+
+		const auto Cell = StatsPtr->GetStatsGrid()->GetCell(RowID, Name);
+
+		Align = Cell->GetVerticalAlignment();
+	}
+
+	return Align;
+}
+
+float SMaterialEditorStatsWidget::GetColumnSize(const FName ColumnName) const
+{
+	float ColumnSize = ColumnSizeSmall;
+
+	if (ColumnName == FMaterialStatsGrid::DescriptorColumnName)
+	{
+		ColumnSize = ColumnSizeMedium;
+	}
+	else if (ColumnName == FMaterialStatsGrid::ShaderColumnName)
+	{
+		ColumnSize = ColumnSizeLarge;
+	}
+	else
+	{
+		auto StatsPtr = MaterialStatsWPtr.Pin();
+		if (StatsPtr.IsValid())
+		{
+			TSharedRef<FSlateFontMeasure> FontMeasureService = FSlateApplication::Get().GetRenderer()->GetFontMeasureService();
+			FSlateFontInfo FontInfo = FEditorStyle::GetFontStyle(BoldFontStyle);
+
+			auto ArrRowIds = *StatsPtr->GetStatsGrid()->GetGridRowIDs();
+
+			for (int32 i = 0; i < ArrRowIds.Num(); ++i)
+			{
+				if (ArrRowIds[i].IsValid())
+				{
+					const auto Cell = StatsPtr->GetStatsGrid()->GetCell(*ArrRowIds[i], ColumnName);
+
+					const FString Content = Cell->GetCellContent();
+
+					FVector2D FontMeasure = FontMeasureService->Measure(Content, FontInfo);
+
+					ColumnSize = FMath::Clamp(FontMeasure.X, ColumnSize, ColumnSizeExtraLarge);
+				}
+			}
+		}
+	}
+
+	return ColumnSize;
+}
+
+SHeaderRow::FColumn::FArguments SMaterialEditorStatsWidget::CreateColumnArgs(const FName ColumnName)
+{
+	FLinearColor Color = FLinearColor::Gray;
+	FString Content;
+	FString ContentLong;
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid())
+	{
+		Content = StatsPtr->GetStatsGrid()->GetColumnContent(ColumnName);
+		ContentLong = StatsPtr->GetStatsGrid()->GetColumnContentLong(ColumnName);
+		Color = StatsPtr->GetStatsGrid()->GetColumnColor(ColumnName);
+	}
+
+	const auto ColumnArgs = SHeaderRow::Column(ColumnName)
+		.DefaultLabel(FText::FromString(Content))
+		.HAlignHeader(EHorizontalAlignment::HAlign_Center)
+		.ManualWidth(this, &SMaterialEditorStatsWidget::GetColumnSize, ColumnName)
+		.HeaderContent()
+		[
+			SNew(STextBlock)
+			.ColorAndOpacity(Color)
+			.Text(FText::FromString(Content))
+			.ToolTipText(FText::FromString(ContentLong))
+		];
+
+	return ColumnArgs;
+}
+
+void SMaterialEditorStatsWidget::InsertColumnAfter(const FName ColumnName, const FName PreviousColumn)
+{
+	int32 InsertIndex = -1;
+
+	auto& ColumnArray = PlatformColumnHeader->GetColumns();
+	auto Iterator = ColumnArray.CreateConstIterator();
+	while (Iterator)
+	{
+		if (Iterator->ColumnId == PreviousColumn)
+		{
+			InsertIndex = Iterator.GetIndex() + 1;
+			break;
+		}
+
+		++Iterator;
+	}
+
+	if (InsertIndex != -1)
+	{
+		const auto Column = CreateColumnArgs(ColumnName);
+		PlatformColumnHeader->InsertColumn(Column, InsertIndex);
+	}
+}
+
+void SMaterialEditorStatsWidget::AddColumn(const FName ColumnName)
+{
+	const auto Column = CreateColumnArgs(ColumnName);
+	PlatformColumnHeader->AddColumn(Column);
+}
+
+void SMaterialEditorStatsWidget::RemoveColumn(const FName ColumnName)
+{
+	PlatformColumnHeader->RemoveColumn(ColumnName);
+}
+
+void SMaterialEditorStatsWidget::RebuildColumns()
+{
+	PlatformColumnHeader->ClearColumns();
+
+	auto StatsManager = MaterialStatsWPtr.Pin();
+	if (StatsManager.IsValid())
+	{
+		auto Grid = StatsManager->GetStatsGrid();
+
+		if (Grid.IsValid())
+		{
+			auto ColumnNames = Grid->GetVisibleColumnNames();
+
+			for (int32 i = 0; i < ColumnNames.Num(); ++i)
+			{
+				AddColumn(ColumnNames[i]);
+			}
+		}
+	}
+}
+
+void SMaterialEditorStatsWidget::CreatePlatformMenus(FMenuBuilder& Builder, EPlatformCategoryType Category)
+{
+	const auto StatsPtr = MaterialStatsWPtr.Pin();
+
+	if (!StatsPtr.IsValid())
+	{
+		return;
+	}
+
+	auto& PlatformsDB = StatsPtr->GetPlatformsTypeDB();
+	auto* ArrPlaformsPtr = PlatformsDB.Find(Category);
+	if (ArrPlaformsPtr == nullptr)
+	{
+		return;
+	}
+
+	auto& ArrPlatforms = *ArrPlaformsPtr;
+
+	for (int32 i = 0; i < ArrPlatforms.Num(); ++i)
+	{
+		auto PlatformPtr = ArrPlatforms[i];
+		if (!PlatformPtr.IsValid() || !PlatformPtr->IsStatsGridPresenceAllowed())
+		{
+			continue;
+		}
+
+		const FName PlatformName = PlatformPtr->GetPlatformName();
+
+		// lambda function used to determine the check-state for the shader platform checkboxes
+		auto Lamda_PlatformCheckState = [PlatformPtr = PlatformPtr]()
+		{
+			if (PlatformPtr.IsValid())
+			{
+				return PlatformPtr->IsPresentInGrid() ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+			}
+
+			return ECheckBoxState::Unchecked;
+		};
+
+		// lambda used with shader platform checkboxes to add or remove selected shader platforms
+		auto Lamda_PlatformFlipState = [WidgetPtr = this, PlatformPtr = PlatformPtr](const ECheckBoxState NewState)
+		{
+			auto MaterialStats = WidgetPtr->MaterialStatsWPtr.Pin();
+			if (PlatformPtr.IsValid() && MaterialStats.IsValid())
+			{
+				const bool bSwitchValue = MaterialStats->SwitchShaderPlatformUseStats(PlatformPtr->GetPlatformShaderType());
+
+				for (int32 q = 0; q < EMaterialQualityLevel::Num; ++q)
+				{
+					EMaterialQualityLevel::Type QualityLevel = static_cast<EMaterialQualityLevel::Type>(q);
+					if (MaterialStats->GetStatsQualityFlag(QualityLevel))
+					{
+						const FName PlatformColumnName = FMaterialStatsGrid::MakePlatformColumnName(PlatformPtr, QualityLevel);
+
+						if (bSwitchValue)
+						{
+							WidgetPtr->AddColumn(PlatformColumnName);
+						}
+						else
+						{
+							WidgetPtr->RemoveColumn(PlatformColumnName);
+						}
+					}
+				}
+			}
+
+			WidgetPtr->RequestRefresh();
+		};
+
+//		const FLinearColor PlatformColor = FMaterialStatsUtils::PlatformTypeColor(PlatformPtr->GetCategoryType());
+		auto PlatformWidget = SNew(SCheckBox)			
+			.OnCheckStateChanged_Lambda(Lamda_PlatformFlipState)
+			.IsChecked_Lambda(Lamda_PlatformCheckState)
+			.Content()
+			[
+				SNew(STextBlock)
+//				.ColorAndOpacity(PlatformColor)
+				.TextStyle(FEditorStyle::Get(), "RichTextBlock.Bold")
+				.Text(FText::FromName(PlatformName))
+				.Margin(FMargin(2.0f, 2.0f, 4.0f, 2.0f))
+			];
+
+		Builder.AddMenuEntry(FUIAction(), PlatformWidget);
+	}
+}
+
+void SMaterialEditorStatsWidget::CreatePlatformCategoryMenus(FMenuBuilder& Builder)
+{
+	for (int32 i = 0; i < (int32)EPlatformCategoryType::Num; ++i)
+	{
+		const EPlatformCategoryType PlatformType = static_cast<EPlatformCategoryType>(i);
+
+//		const FLinearColor PlatformColor = FMaterialStatsUtils::PlatformTypeColor(PlatformType);
+
+		auto PlatformTypeWidget = SNew(STextBlock)
+			.TextStyle(FEditorStyle::Get(), "RichTextBlock.Bold")
+			.Text(FText::FromString(FMaterialStatsUtils::GetPlatformTypeName(PlatformType)));
+//			.ColorAndOpacity(PlatformColor);
+
+		Builder.AddSubMenu(PlatformTypeWidget, FNewMenuDelegate::CreateSP(this, &SMaterialEditorStatsWidget::CreatePlatformMenus, PlatformType));
+	}
+}
+
+void SMaterialEditorStatsWidget::OnFlipQualityState(const ECheckBoxState NewState, const EMaterialQualityLevel::Type QualityLevel)
+{
+	auto StatsPtr = MaterialStatsWPtr.Pin();
+	if (StatsPtr.IsValid())
+	{
+		bool bSwitchValue = StatsPtr->SwitchStatsQualityFlag(QualityLevel);
+
+		StatsPtr->GetStatsGrid()->OnQualitySettingChanged(QualityLevel);
+
+		auto& PlatformDB = StatsPtr->GetPlatformsDB();
+		for (auto Pair : PlatformDB)
+		{
+			TSharedPtr<FShaderPlatformSettings> Platform = Pair.Value;
+			if (Platform->IsPresentInGrid())
+			{
+				const FName ColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, QualityLevel);
+
+				if (bSwitchValue)
+				{
+					// find insert spot, right after the a column used by the same platform, with other quality settings
+					EMaterialQualityLevel::Type InsertAfterQuality = QualityLevel;
+
+					for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+					{
+						if (StatsPtr->GetStatsQualityFlag((EMaterialQualityLevel::Type)i) && i != QualityLevel)
+						{
+							InsertAfterQuality = (EMaterialQualityLevel::Type)i;
+							break;
+						}
+					}
+
+					if (QualityLevel != InsertAfterQuality)
+					{
+						const FName PreviousColumnName = FMaterialStatsGrid::MakePlatformColumnName(Platform, InsertAfterQuality);
+						InsertColumnAfter(ColumnName, PreviousColumnName);
+					}
+					else
+					{
+						AddColumn(ColumnName);
+					}
+				}
+				else
+				{
+					RemoveColumn(ColumnName);
+				}
+			}
+		}
+
+		RequestRefresh();
+	}
+}
+
+void SMaterialEditorStatsWidget::CreateQualityMenus(FMenuBuilder& Builder)
+{
+	for (int32 i = 0; i < EMaterialQualityLevel::Num; ++i)
+	{
+		auto QualityLevel = static_cast<EMaterialQualityLevel::Type>(i);
+
+		auto Lamda_QualityCheckState = [QualityType = (EMaterialQualityLevel::Type)i, MaterialStatsWPtr = MaterialStatsWPtr]()
+		{
+			const auto StatsPtr = MaterialStatsWPtr.Pin();
+			if (StatsPtr.IsValid())
+			{
+				return StatsPtr->GetStatsQualityFlag(QualityType) ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+			}
+
+			return ECheckBoxState::Unchecked;
+		};
+
+//		const FLinearColor QualityColor = FMaterialStatsUtils::QualitySettingColor(QualityLevel);
+		const FText QualitySettingName = FText::FromString(FMaterialStatsUtils::MaterialQualityToString(QualityLevel));
+
+		auto QualityWidget = SNew(SCheckBox)
+			.OnCheckStateChanged(this, &SMaterialEditorStatsWidget::OnFlipQualityState, QualityLevel)
+			.IsChecked_Lambda(Lamda_QualityCheckState)
+			.Content()
+			[
+				SNew(STextBlock)
+//				.ColorAndOpacity(QualityColor)
+				.TextStyle(FEditorStyle::Get(), "RichTextBlock.Bold")
+				.Text(QualitySettingName)
+			];
+
+		Builder.AddMenuEntry(FUIAction(), QualityWidget);
+	}
+}
+
+void SMaterialEditorStatsWidget::CreateGlobalQualityMenu(class FMenuBuilder& Builder)
+{
+//	FColor GreenShade(119, 184, 42);
+
+	auto GlobalQualityWidget = SNew(STextBlock)
+//		.ColorAndOpacity(FLinearColor(GreenShade))
+		.TextStyle(FEditorStyle::Get(), "RichTextBlock.Bold")
+		.Text(LOCTEXT("GlobalQualitySettings", "Global Quality Settings"));
+
+	Builder.AddSubMenu(GlobalQualityWidget, FNewMenuDelegate::CreateSP(this, &SMaterialEditorStatsWidget::CreateQualityMenus));
+}
+
+TSharedRef<SWidget> SMaterialEditorStatsWidget::GetSettingsButtonContent()
+{
+	FMenuBuilder Builder(false, nullptr);
+
+	CreatePlatformCategoryMenus(Builder);
+	Builder.AddMenuSeparator();
+	CreateGlobalQualityMenu(Builder);
+
+	return Builder.MakeWidget();
+}
+
+TSharedPtr<SWidget> SMaterialEditorStatsWidget::BuildMessageArea()
+{
+	MessageBoxWidget = SNew(SVerticalBox)
+		+ SVerticalBox::Slot()
+		.AutoHeight();
+
+	return MessageBoxWidget;
+}
+
+void SMaterialEditorStatsWidget::AddWarningMessage(const FString& Message)
+{
+	MessageBoxWidget->AddSlot()
+		.AutoHeight()
+		.Padding(2.5, 2.5)
+		[
+			SNew(SBorder)
+			.BorderImage(FEditorStyle::GetBrush(TEXT("ToolPanel.GroupBorder")))
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(SImage)
+					.Image(FEditorStyle::GetBrush("MessageLog.Warning"))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), TEXT("RichTextBlock.Bold"))
+					.ColorAndOpacity(FMaterialStatsUtils::YellowColor)
+					.Text(FText::FromString(Message))
+					.ToolTipText(FText::FromString(Message))
+				]
+			]
+		];
+}
+
+void SMaterialEditorStatsWidget::ClearWarningMessages()
+{
+	MessageBoxWidget->ClearChildren();
+}
+
+void SMaterialEditorStatsWidget::Construct(const FArguments& InArgs)
+{
+	MaterialStatsWPtr = InArgs._MaterialStatsWPtr;
+	
+	const auto StatsPtr = MaterialStatsWPtr.Pin();
+
+	if (!StatsPtr.IsValid())
+	{
+		return;
+	}
+
+	auto MessageArea = BuildMessageArea();
+
+	Visibility = EVisibility::SelfHitTestInvisible;
+
+	// construct default column headers
+	PlatformColumnHeader = SNew(SHeaderRow);
+	RebuildColumns();
+
+	const auto VerticalScrollbar = SNew(SScrollBar)
+		.Orientation(Orient_Vertical)
+		.Thickness(FVector2D(7.0f, 7.0f));
+
+	const auto HorizontalScrollbar = SNew(SScrollBar)
+		.Orientation(Orient_Horizontal)
+		.Thickness(FVector2D(7.0f, 7.0f));
+
+	this->ChildSlot
+	[
+		SNew(SVerticalBox)
+		+SVerticalBox::Slot() // this will contain the tool bar
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FEditorStyle::GetBrush(TEXT("ToolPanel.GroupBorder")))
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew(SComboButton)
+					.ComboButtonStyle(FEditorStyle::Get(), "ToolbarComboButton")
+					.ForegroundColor(FLinearColor::White)
+					.ContentPadding(0)
+					.OnGetMenuContent(this, &SMaterialEditorStatsWidget::GetSettingsButtonContent)
+					.ButtonContent()
+					[
+						SNew(SHorizontalBox)
+						// Icon
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						[
+							SNew(SImage)
+							.Image(FEditorStyle::GetBrush("LevelEditor.Tabs.StatsViewer"))
+						]
+						// Text
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						.VAlign(VAlign_Center)
+						.Padding(0, 0, 2, 0)
+						[
+							SNew(STextBlock)
+							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+							.Text(LOCTEXT("SettingsButton", "Settings"))
+						]
+					]
+				]
+			]
+		]
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FEditorStyle::GetBrush(TEXT("Graph.TitleBackground")))
+			[
+				MessageArea.ToSharedRef()
+			]
+		]
+		+ SVerticalBox::Slot() // this will contain the stats grid
+		[
+			SNew(SBorder)
+			.BorderImage(FEditorStyle::GetBrush(TEXT("Graph.TitleBackground")))
+			.HAlign(HAlign_Fill)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				[
+					SNew(SScrollBox)
+					.Orientation(Orient_Vertical)
+					.ExternalScrollbar(VerticalScrollbar)
+					+ SScrollBox::Slot()
+					[
+						// ########## Material stats grid ##########
+						SNew(SVerticalBox)
+						+ SVerticalBox::Slot()
+						.VAlign(VAlign_Fill)
+						.AutoHeight()
+						[
+							SNew(SHorizontalBox)
+							+ SHorizontalBox::Slot()
+							.HAlign(HAlign_Fill)
+							.FillWidth(1.f)
+							.Padding(5, 0)
+							[
+								SNew(SScrollBox)
+								.Orientation(Orient_Horizontal)
+								.ExternalScrollbar(HorizontalScrollbar)
+								+ SScrollBox::Slot()
+								[
+									SAssignNew(MaterialInfoList, SListView<TSharedPtr<int32>>)
+									.ExternalScrollbar(VerticalScrollbar)
+									.ListItemsSource(StatsPtr->GetStatsGrid()->GetGridRowIDs())
+									.OnGenerateRow(this, &SMaterialEditorStatsWidget::MakeMaterialInfoWidget)
+									.Visibility(EVisibility::Visible)
+									.SelectionMode(ESelectionMode::Single)
+									.HeaderRow(PlatformColumnHeader)
+								]
+							]
+						]
+						+ SVerticalBox::Slot()
+						.AutoHeight()
+						[
+							HorizontalScrollbar
+						]
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					VerticalScrollbar
+				]
+			]
+		]
+	];
+}
+
+TSharedRef<ITableRow> SMaterialEditorStatsWidget::MakeMaterialInfoWidget(const TSharedPtr<int32> PtrRowID, const TSharedRef<STableViewBase>& OwnerTable) const
+{
+	return SNew(SMaterialStatsViewRow, OwnerTable)
+		.PtrRowID(PtrRowID)
+		.MaterialStatsWPtr(MaterialStatsWPtr);
+}
+
+void SMaterialEditorStatsWidget::RequestRefresh()
+{
+	MaterialInfoList->RequestListRefresh();
+}
+
+FName SMaterialEditorStatsWidget::GetRegulatFontStyleName()
+{
+	return RegularFontStyle;
+}
+
+FName SMaterialEditorStatsWidget::GetBoldFontStyleName()
+{
+	return BoldFontStyle;
+}
+
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.h b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.h
new file mode 100644
index 000000000000..d680c12b5080
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorStatsWidget.h
@@ -0,0 +1,80 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "MaterialStats.h"
+
+//////////////////////////////////////////////////////////////////////////
+// SMaterialEditorStatsWidget
+
+/** Widget class used to display stats extracted from materials; used in the material editor */
+class SMaterialEditorStatsWidget : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SMaterialEditorStatsWidget)
+		: _MaterialStatsWPtr(nullptr)
+	{}
+
+		SLATE_ARGUMENT(TWeakPtr<FMaterialStats>, MaterialStatsWPtr)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+
+	/** Callback used to populate SListView */
+	TSharedRef<ITableRow> MakeMaterialInfoWidget(const TSharedPtr<int32> Item, const TSharedRef<STableViewBase>& OwnerTable) const;
+
+	/** Request a refresh of the list view */
+	void RequestRefresh();
+
+	void AddWarningMessage(const FString& Message);
+	void ClearWarningMessages();
+
+	void FillWarningMessages();
+
+	static FName GetRegulatFontStyleName();
+	static FName GetBoldFontStyleName();
+
+private:
+	void RebuildColumns();
+	void AddColumn(const FName ColumnName);
+	void InsertColumnAfter(const FName ColumnName, const FName PreviousColumn);
+	void RemoveColumn(const FName ColumnName);
+
+	SHeaderRow::FColumn::FArguments CreateColumnArgs(const FName ColumnName);
+
+	float GetColumnSize(const FName ColumnName) const;
+
+	TSharedRef<SWidget> GetSettingsButtonContent();
+
+	void CreatePlatformMenus(class FMenuBuilder& Builder, EPlatformCategoryType Category);
+	void CreatePlatformCategoryMenus(class FMenuBuilder& Builder);
+
+	void CreateQualityMenus(class FMenuBuilder& Builder);
+	void CreateGlobalQualityMenu(class FMenuBuilder& Builder);
+
+	void OnFlipQualityState(const ECheckBoxState NewState, const EMaterialQualityLevel::Type QualitySetting);
+
+	TSharedPtr<SWidget> BuildMessageArea();
+
+protected:
+	static const float ColumnSizeSmall;
+	static const float ColumnSizeMedium;
+	static const float ColumnSizeLarge;
+	static const float ColumnSizeExtraLarge;
+
+	static const FName RegularFontStyle;
+	static const FName BoldFontStyle;
+
+	TSharedPtr<SVerticalBox> MessageBoxWidget;
+
+	TWeakPtr<FMaterialStats> MaterialStatsWPtr;
+
+	TSharedPtr<SListView<TSharedPtr<int32>>> MaterialInfoList;
+
+	TSharedPtr<SHeaderRow> PlatformColumnHeader;
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorViewportToolBar.cpp b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorViewportToolBar.cpp
index 8cdd96bf06d9..ca1316d3f415 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorViewportToolBar.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/SMaterialEditorViewportToolBar.cpp
@@ -69,7 +69,6 @@ TSharedRef<SWidget> SMaterialEditorViewportToolBar::GenerateShowMenu() const
 		auto Commands = FMaterialEditorCommands::Get();
 
 		ShowMenuBuilder.AddMenuEntry(Commands.ToggleMaterialStats);
-		ShowMenuBuilder.AddMenuEntry(Commands.ToggleMobileStats);
 
 		ShowMenuBuilder.AddMenuSeparator();
 
diff --git a/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.cpp b/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.cpp
index d76f66a8a244..ac5285184bf7 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.cpp
+++ b/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.cpp
@@ -32,610 +32,888 @@
 #include "Widgets/Input/SButton.h"
 #include "Widgets/Text/SInlineEditableTextBlock.h"
 #include "Materials/MaterialFunctionInstance.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Toolkits/AssetEditorManager.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Curves/CurveLinearColor.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 
 #define LOCTEXT_NAMESPACE "MaterialLayerCustomization"
 
-class SMaterialLayersFunctionsInstanceTreeItem : public STableRow< TSharedPtr<FStackSortedData> >
+FString SMaterialLayersFunctionsInstanceTreeItem::GetCurvePath(UDEditorScalarParameterValue* Parameter) const
 {
-public:
+	FString Path = Parameter->AtlasData.Curve->GetPathName();
+	return Path;
+}
 
-	SLATE_BEGIN_ARGS(SMaterialLayersFunctionsInstanceTreeItem)
-		: _StackParameterData(nullptr),
-		 _MaterialEditorInstance(nullptr)
-	{}
-
-	/** The item content. */
-	SLATE_ARGUMENT(TSharedPtr<FStackSortedData>, StackParameterData)
-	SLATE_ARGUMENT(UMaterialEditorInstanceConstant*, MaterialEditorInstance)
-	SLATE_ARGUMENT(SMaterialLayersFunctionsInstanceTree*, InTree)
-	SLATE_END_ARGS()
-
-	FMaterialTreeColumnSizeData ColumnSizeData;
-
-	void RefreshOnRowChange(const FAssetData& AssetData, SMaterialLayersFunctionsInstanceTree* InTree)
+const FSlateBrush* SMaterialLayersFunctionsInstanceTreeItem::GetBorderImage() const
+{
+	if (StackParameterData->StackDataType == EStackDataType::Stack)
 	{
-		if (SMaterialLayersFunctionsInstanceWrapper* Wrapper = InTree->GetWrapper())
+		if (bIsBeingDragged)
 		{
-			if (Wrapper->OnLayerPropertyChanged.IsBound())
+			return FEditorStyle::GetBrush("MaterialInstanceEditor.StackBodyDragged");
+		}
+		else if (bIsHoveredDragTarget)
+		{
+			return FEditorStyle::GetBrush("MaterialInstanceEditor.StackBody_Highlighted");
+		}
+		else
+		{
+			return FEditorStyle::GetBrush("MaterialInstanceEditor.StackHeader");
+		}
+	}
+	else
+	{
+		if (bIsHoveredDragTarget)
+		{
+			return FEditorStyle::GetBrush("MaterialInstanceEditor.StackBody_Highlighted");
+		}
+		else
+		{
+			return FEditorStyle::GetBrush("MaterialInstanceEditor.StackBody");
+		}
+	}
+}
+
+void SMaterialLayersFunctionsInstanceTreeItem::RefreshOnRowChange(const FAssetData& AssetData, SMaterialLayersFunctionsInstanceTree* InTree)
+{
+	if (SMaterialLayersFunctionsInstanceWrapper* Wrapper = InTree->GetWrapper())
+	{
+		if (Wrapper->OnLayerPropertyChanged.IsBound())
+		{
+			Wrapper->OnLayerPropertyChanged.Execute();
+		}
+		else
+		{
+			InTree->CreateGroupsWidget();
+		}
+	}
+}
+
+bool SMaterialLayersFunctionsInstanceTreeItem::GetFilterState(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const
+{
+	if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
+	{
+		return InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index];
+	}
+	if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
+	{
+		return InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index];
+	}
+	return false;
+}
+
+void SMaterialLayersFunctionsInstanceTreeItem::FilterClicked(const ECheckBoxState NewCheckedState, SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData)
+{
+	if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
+	{
+		InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index] = !InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index];
+	}
+	if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
+	{
+		InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index] = !InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index];
+	}
+}
+
+ECheckBoxState SMaterialLayersFunctionsInstanceTreeItem::GetFilterChecked(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const
+{
+	return GetFilterState(InTree, InStackData) ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+}
+
+FText SMaterialLayersFunctionsInstanceTreeItem::GetLayerName(SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter) const
+{
+	return InTree->FunctionInstance->GetLayerName(Counter);
+}
+
+void SMaterialLayersFunctionsInstanceTreeItem::OnNameChanged(const FText& InText, ETextCommit::Type CommitInfo, SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter)
+{
+	const FScopedTransaction Transaction(LOCTEXT("RenamedSection", "Renamed layer and blend section"));
+	InTree->FunctionInstanceHandle->NotifyPreChange();
+	InTree->FunctionInstance->LayerNames[Counter] = InText;
+	InTree->MaterialEditorInstance->CopyToSourceInstance(false);
+	InTree->FunctionInstanceHandle->NotifyPostChange();
+}
+
+
+int32 GetNewParamIndex(EMaterialParameterAssociation InAssociation, int32 InIndex, int32 OriginalIndex, int32 NewIndex, int32 OriginalBlendIndex, int32 NewBlendIndex)
+{
+	int32 ParamIndex = InIndex;
+	int32 OriginalIndexToUse;
+	int32 NewIndexToUse;
+	if (InAssociation == EMaterialParameterAssociation::LayerParameter)
+	{
+		OriginalIndexToUse = OriginalIndex;
+		NewIndexToUse = NewIndex;
+	}
+	else if (InAssociation == EMaterialParameterAssociation::BlendParameter)
+	{
+		OriginalIndexToUse = OriginalBlendIndex;
+		NewIndexToUse = NewBlendIndex;
+	}
+	else
+	{
+		return ParamIndex;
+	}
+
+	if (NewIndexToUse < OriginalIndexToUse)
+	{
+		if (InIndex == OriginalIndexToUse)
+		{
+			ParamIndex = NewIndexToUse;
+		}
+		else if (InIndex >= NewIndexToUse && InIndex < OriginalIndexToUse)
+		{
+			ParamIndex++;
+		}
+	}
+	else if (NewIndexToUse > OriginalIndexToUse)
+	{
+		if (InIndex == OriginalIndexToUse)
+		{
+			ParamIndex = NewIndexToUse;
+		}
+		else if (InIndex <= NewIndexToUse && InIndex > OriginalIndexToUse)
+		{
+			ParamIndex--;
+		}
+	}
+
+	return ParamIndex;
+}
+
+FReply SMaterialLayersFunctionsInstanceTreeItem::OnLayerDrop(const FDragDropEvent& DragDropEvent)
+{
+	if (!bIsHoveredDragTarget)
+	{
+		return FReply::Unhandled();
+	}
+	FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "MoveLayer", "Move Layer"));
+	Tree->FunctionInstanceHandle->NotifyPreChange();
+	bIsHoveredDragTarget = false;
+	TSharedPtr<FLayerDragDropOp> ArrayDropOp = DragDropEvent.GetOperationAs< FLayerDragDropOp >();
+	TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> LayerPtr = nullptr;
+	if (ArrayDropOp.IsValid() && ArrayDropOp->OwningStack.IsValid())
+	{
+		LayerPtr = ArrayDropOp->OwningStack.Pin();
+		LayerPtr->bIsBeingDragged = false;
+	}
+	if (!LayerPtr.IsValid())
+	{
+		return FReply::Unhandled();
+	}
+	TSharedPtr<FStackSortedData> SwappingPropertyData = LayerPtr->StackParameterData;
+	TSharedPtr<FStackSortedData> SwappablePropertyData = StackParameterData;
+	if (SwappingPropertyData.IsValid() && SwappablePropertyData.IsValid())
+	{
+		if (SwappingPropertyData != SwappablePropertyData)
+		{
+			int32 OriginalIndex = SwappingPropertyData->ParameterInfo.Index;
+			int32 NewIndex = SwappablePropertyData->ParameterInfo.Index;
+			int32 OriginalBlendIndex = SwappingPropertyData->ParameterInfo.Index - 1;
+			int32 NewBlendIndex = SwappablePropertyData->ParameterInfo.Index;
+			if (SwappablePropertyData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
 			{
-				Wrapper->OnLayerPropertyChanged.Execute();
+				NewIndex++;
 			}
-			else
+
+			if (SwappablePropertyData->ParameterInfo.Association != EMaterialParameterAssociation::BlendParameter)
 			{
-				InTree->CreateGroupsWidget();
+				NewBlendIndex--;
+			}
+
+
+			for (int32 ParamIt = 0; ParamIt < Tree->MaterialEditorInstance->SourceInstance->ScalarParameterValues.Num(); ParamIt++)
+			{
+				FScalarParameterValue* Param = &Tree->MaterialEditorInstance->SourceInstance->ScalarParameterValues[ParamIt];
+				Param->ParameterInfo.Index = GetNewParamIndex(Param->ParameterInfo.Association, Param->ParameterInfo.Index, OriginalIndex, NewIndex, OriginalBlendIndex, NewBlendIndex);
+			}
+
+			for (int32 ParamIt = 0; ParamIt < Tree->MaterialEditorInstance->SourceInstance->VectorParameterValues.Num(); ParamIt++)
+			{
+				FVectorParameterValue* Param = &Tree->MaterialEditorInstance->SourceInstance->VectorParameterValues[ParamIt];
+				Param->ParameterInfo.Index = GetNewParamIndex(Param->ParameterInfo.Association, Param->ParameterInfo.Index, OriginalIndex, NewIndex, OriginalBlendIndex, NewBlendIndex);
+			}
+
+			for (int32 ParamIt = 0; ParamIt < Tree->MaterialEditorInstance->SourceInstance->TextureParameterValues.Num(); ParamIt++)
+			{
+				FTextureParameterValue* Param = &Tree->MaterialEditorInstance->SourceInstance->TextureParameterValues[ParamIt];
+				Param->ParameterInfo.Index = GetNewParamIndex(Param->ParameterInfo.Association, Param->ParameterInfo.Index, OriginalIndex, NewIndex, OriginalBlendIndex, NewBlendIndex);
+			}
+
+			for (int32 ParamIt = 0; ParamIt < Tree->MaterialEditorInstance->SourceInstance->FontParameterValues.Num(); ParamIt++)
+			{
+				FFontParameterValue* Param = &Tree->MaterialEditorInstance->SourceInstance->FontParameterValues[ParamIt];
+				Param->ParameterInfo.Index = GetNewParamIndex(Param->ParameterInfo.Association, Param->ParameterInfo.Index, OriginalIndex, NewIndex, OriginalBlendIndex, NewBlendIndex);
+			}
+
+
+			if (NewIndex > OriginalIndex)
+			{
+				NewIndex += 1;
+			}
+			if (NewBlendIndex > OriginalBlendIndex)
+			{
+				NewBlendIndex += 1;
+			}
+			TSharedPtr<IPropertyHandle> ParentHandle = Tree->FunctionInstanceHandle;
+			TSharedPtr<IPropertyHandleArray> LayerHandle = ParentHandle->GetChildHandle("Layers")->AsArray();
+			TSharedPtr<IPropertyHandleArray> BlendHandle = ParentHandle->GetChildHandle("Blends")->AsArray();
+			TSharedPtr<IPropertyHandleArray> LayerNameHandle = ParentHandle->GetChildHandle("LayerNames")->AsArray();
+			TSharedPtr<IPropertyHandleArray> LayerFilterHandle = ParentHandle->GetChildHandle("RestrictToLayerRelatives")->AsArray();
+			TSharedPtr<IPropertyHandleArray> BlendFilterHandle = ParentHandle->GetChildHandle("RestrictToBlendRelatives")->AsArray();
+			TSharedPtr<IPropertyHandleArray> LayerStateHandle = ParentHandle->GetChildHandle("LayerStates")->AsArray();
+
+			if (LayerHandle.IsValid() && BlendHandle.IsValid())
+			{
+				// Need to save the moving and target expansion states before swapping
+				bool bOriginalSwappableExpansion = IsItemExpanded();
+				bool bOriginalSwappingExpansion = LayerPtr->IsItemExpanded();
+				LayerHandle->MoveElementTo(OriginalIndex, NewIndex);
+				LayerNameHandle->MoveElementTo(OriginalIndex, NewIndex);
+				LayerFilterHandle->MoveElementTo(OriginalIndex, NewIndex);
+				LayerStateHandle->MoveElementTo(OriginalIndex, NewIndex);
+				BlendHandle->MoveElementTo(OriginalBlendIndex, NewBlendIndex);
+				BlendFilterHandle->MoveElementTo(OriginalBlendIndex, NewBlendIndex);
+				Tree->FunctionInstance->UpdateStaticPermutationString();
+				Tree->OnExpansionChanged(SwappablePropertyData, bOriginalSwappingExpansion);
+				Tree->OnExpansionChanged(SwappingPropertyData, bOriginalSwappableExpansion);
+				Tree->FunctionInstanceHandle->NotifyPostChange();
+				Tree->CreateGroupsWidget();
+				Tree->RequestTreeRefresh();
+				Tree->SetParentsExpansionState();
 			}
 		}
 	}
 
-	bool GetFilterState(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const
-	{
-		if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
-		{
-			return InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index];
-		}
-		if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
-		{
-			return InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index];
-		}
-		return false;
-	}
+	return FReply::Handled();
+}
 
-	void FilterClicked(const ECheckBoxState NewCheckedState, SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData)
-	{
-		if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
-		{
-			InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index] = !InTree->FunctionInstance->RestrictToLayerRelatives[InStackData->ParameterInfo.Index];
-		}
-		if (InStackData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
-		{
-			InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index] = !InTree->FunctionInstance->RestrictToBlendRelatives[InStackData->ParameterInfo.Index];
-		}
-	}
 
-	ECheckBoxState GetFilterChecked(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const
-	{
-		return GetFilterState(InTree, InStackData) ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
-	}
+void SMaterialLayersFunctionsInstanceTreeItem::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView)
+{
+	StackParameterData = InArgs._StackParameterData;
+	MaterialEditorInstance = InArgs._MaterialEditorInstance;
+	Tree = InArgs._InTree;
+	ColumnSizeData.LeftColumnWidth = TAttribute<float>(Tree, &SMaterialLayersFunctionsInstanceTree::OnGetLeftColumnWidth);
+	ColumnSizeData.RightColumnWidth = TAttribute<float>(Tree, &SMaterialLayersFunctionsInstanceTree::OnGetRightColumnWidth);
+	ColumnSizeData.OnWidthChanged = SSplitter::FOnSlotResized::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::OnSetColumnWidth);
 
-	FText GetLayerName(SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter) const
-	{
-		return InTree->FunctionInstance->GetLayerName(Counter);
-	}
-
-	void OnNameChanged(const FText& InText, ETextCommit::Type CommitInfo, SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter)
-	{
-		const FScopedTransaction Transaction(LOCTEXT("RenamedSection", "Renamed layer and blend section"));
-		InTree->FunctionInstanceHandle->NotifyPreChange();
-		InTree->FunctionInstance->LayerNames[Counter] = InText;
-		InTree->FunctionInstanceHandle->NotifyPostChange();
-	};
-
-	/**
-	* Construct the widget
-	*
-	* @param InArgs   A declaration from which to construct the widget
-	*/
-	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView)
-	{
-		StackParameterData = InArgs._StackParameterData;
-		MaterialEditorInstance = InArgs._MaterialEditorInstance;
-		SMaterialLayersFunctionsInstanceTree* Tree = InArgs._InTree;
-		ColumnSizeData.LeftColumnWidth = TAttribute<float>(Tree, &SMaterialLayersFunctionsInstanceTree::OnGetLeftColumnWidth);
-		ColumnSizeData.RightColumnWidth = TAttribute<float>(Tree, &SMaterialLayersFunctionsInstanceTree::OnGetRightColumnWidth);
-		ColumnSizeData.OnWidthChanged = SSplitter::FOnSlotResized::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::OnSetColumnWidth);
-
-		TSharedRef<SWidget> LeftSideWidget = SNullWidget::NullWidget;
-		TSharedRef<SWidget> RightSideWidget = SNullWidget::NullWidget;
-		FText NameOverride;
-		TSharedRef<SVerticalBox> WrapperWidget = SNew(SVerticalBox);
+	TSharedRef<SWidget> LeftSideWidget = SNullWidget::NullWidget;
+	TSharedRef<SWidget> RightSideWidget = SNullWidget::NullWidget;
+	FText NameOverride;
+	TSharedRef<SVerticalBox> WrapperWidget = SNew(SVerticalBox);
 
 // STACK --------------------------------------------------
-		if (StackParameterData->StackDataType == EStackDataType::Stack)
+	if (StackParameterData->StackDataType == EStackDataType::Stack)
+	{
+		WrapperWidget->AddSlot()
+			.Padding(3.0f)
+			.AutoHeight()
+			[
+				SNullWidget::NullWidget
+			];
+#if WITH_EDITOR
+		NameOverride = Tree->FunctionInstance->GetLayerName(StackParameterData->ParameterInfo.Index);
+#endif
+		TSharedRef<SHorizontalBox> HeaderRowWidget = SNew(SHorizontalBox);
+
+		if (StackParameterData->ParameterInfo.Index != 0)
 		{
-			WrapperWidget->AddSlot()
-				.Padding(3.0f)
-				.AutoHeight()
+			TAttribute<bool>::FGetter IsEnabledGetter = TAttribute<bool>::FGetter::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::IsLayerVisible, StackParameterData->ParameterInfo.Index);
+			TAttribute<bool> IsEnabledAttribute = TAttribute<bool>::Create(IsEnabledGetter);
+
+			FOnClicked VisibilityClickedDelegate = FOnClicked::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::ToggleLayerVisibility, StackParameterData->ParameterInfo.Index);
+
+			HeaderRowWidget->AddSlot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					PropertyCustomizationHelpers::MakeVisibilityButton(VisibilityClickedDelegate, FText(), IsEnabledAttribute)
+				];
+		}
+		const float ThumbnailSize = 24.0f;
+		TArray<TSharedPtr<FStackSortedData>> AssetChildren = StackParameterData->Children;
+		if (AssetChildren.Num() > 0)
+		{
+			HeaderRowWidget->AddSlot()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding(2.5f, 0)
+				.AutoWidth()
 				[
 					SNullWidget::NullWidget
 				];
-#if WITH_EDITOR
-			NameOverride = Tree->FunctionInstance->GetLayerName(StackParameterData->ParameterInfo.Index);
-#endif
-			TSharedRef<SHorizontalBox> HeaderRowWidget = SNew(SHorizontalBox);
-
-			if (StackParameterData->ParameterInfo.Index != 0)
+		}
+		for (TSharedPtr<FStackSortedData> AssetChild : AssetChildren)
+		{
+			TSharedPtr<SBox> ThumbnailBox;
+			UObject* AssetObject;
+			AssetChild->ParameterHandle->GetValue(AssetObject);
+			int32 PreviewIndex = INDEX_NONE;
+			int32 ThumbnailIndex = INDEX_NONE;
+			EMaterialParameterAssociation PreviewAssociation = EMaterialParameterAssociation::GlobalParameter;
+			if (AssetObject)
 			{
-				TAttribute<bool>::FGetter IsEnabledGetter = TAttribute<bool>::FGetter::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::IsLayerVisible, StackParameterData->ParameterInfo.Index);
-				TAttribute<bool> IsEnabledAttribute = TAttribute<bool>::Create(IsEnabledGetter);
-
-				FOnClicked VisibilityClickedDelegate = FOnClicked::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::ToggleLayerVisibility, StackParameterData->ParameterInfo.Index);
-
-				HeaderRowWidget->AddSlot()
-					.AutoWidth()
-					.VAlign(VAlign_Center)
-					[
-						PropertyCustomizationHelpers::MakeVisibilityButton(VisibilityClickedDelegate, FText(), IsEnabledAttribute)
-					];
-			}
-			const float ThumbnailSize = 24.0f;
-			TArray<TSharedPtr<FStackSortedData>> AssetChildren = StackParameterData->Children;
-			if (AssetChildren.Num() > 0)
-			{
-				HeaderRowWidget->AddSlot()
-					.HAlign(HAlign_Center)
-					.VAlign(VAlign_Center)
-					.Padding(2.5f, 0)
-					.AutoWidth()
-					[
-						SNullWidget::NullWidget
-					];
-			}
-			for (TSharedPtr<FStackSortedData> AssetChild : AssetChildren)
-			{
-				TSharedPtr<SBox> ThumbnailBox;
-				UObject* AssetObject;
-				AssetChild->ParameterHandle->GetValue(AssetObject);
-				int32 PreviewIndex = INDEX_NONE;
-				int32 ThumbnailIndex = INDEX_NONE;
-				EMaterialParameterAssociation PreviewAssociation = EMaterialParameterAssociation::GlobalParameter;
-				if (AssetObject)
+				if (Cast<UMaterialFunctionInterface>(AssetObject)->GetMaterialFunctionUsage() == EMaterialFunctionUsage::MaterialLayer)
 				{
-					if (Cast<UMaterialFunctionInterface>(AssetObject)->GetMaterialFunctionUsage() == EMaterialFunctionUsage::MaterialLayer)
-					{
-						PreviewIndex = StackParameterData->ParameterInfo.Index;
-						PreviewAssociation = EMaterialParameterAssociation::LayerParameter;
-						Tree->UpdateThumbnailMaterial(PreviewAssociation, PreviewIndex);
-						ThumbnailIndex = PreviewIndex;
-					}
-					if (Cast<UMaterialFunctionInterface>(AssetObject)->GetMaterialFunctionUsage() == EMaterialFunctionUsage::MaterialLayerBlend)
-					{
-						PreviewIndex = StackParameterData->ParameterInfo.Index;
-						PreviewAssociation = EMaterialParameterAssociation::BlendParameter;
-						Tree->UpdateThumbnailMaterial(PreviewAssociation, PreviewIndex, true);
-						ThumbnailIndex = PreviewIndex - 1;
-					}
+					PreviewIndex = StackParameterData->ParameterInfo.Index;
+					PreviewAssociation = EMaterialParameterAssociation::LayerParameter;
+					Tree->UpdateThumbnailMaterial(PreviewAssociation, PreviewIndex);
+					ThumbnailIndex = PreviewIndex;
+				}
+				if (Cast<UMaterialFunctionInterface>(AssetObject)->GetMaterialFunctionUsage() == EMaterialFunctionUsage::MaterialLayerBlend)
+				{
+					PreviewIndex = StackParameterData->ParameterInfo.Index;
+					PreviewAssociation = EMaterialParameterAssociation::BlendParameter;
+					Tree->UpdateThumbnailMaterial(PreviewAssociation, PreviewIndex, true);
+					ThumbnailIndex = PreviewIndex - 1;
 				}
-				HeaderRowWidget->AddSlot()
-					.AutoWidth()
-					.HAlign(HAlign_Center)
-					.VAlign(VAlign_Center)
-					.Padding(4.0f)
-					.MaxWidth(ThumbnailSize)
-					[
-						SAssignNew(ThumbnailBox, SBox)
-						[
-							Tree->CreateThumbnailWidget(PreviewAssociation, ThumbnailIndex, ThumbnailSize)
-						]
-					];
-				ThumbnailBox->SetMaxDesiredHeight(ThumbnailSize);
-				ThumbnailBox->SetMinDesiredHeight(ThumbnailSize);
-				ThumbnailBox->SetMinDesiredWidth(ThumbnailSize);
-				ThumbnailBox->SetMaxDesiredWidth(ThumbnailSize);
 			}
+			HeaderRowWidget->AddSlot()
+				.AutoWidth()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding(4.0f)
+				.MaxWidth(ThumbnailSize)
+				[
+					SAssignNew(ThumbnailBox, SBox)
+					[
+						Tree->CreateThumbnailWidget(PreviewAssociation, ThumbnailIndex, ThumbnailSize)
+					]
+				];
+			ThumbnailBox->SetMaxDesiredHeight(ThumbnailSize);
+			ThumbnailBox->SetMinDesiredHeight(ThumbnailSize);
+			ThumbnailBox->SetMinDesiredWidth(ThumbnailSize);
+			ThumbnailBox->SetMaxDesiredWidth(ThumbnailSize);
+		}
 
 		
 
-			if (StackParameterData->ParameterInfo.Index != 0)
-			{
-				HeaderRowWidget->AddSlot()
-					.VAlign(VAlign_Center)
-					.AutoWidth()
-					.Padding(5.0f)
-					[
-						SNew(SInlineEditableTextBlock)
-						.Text(TAttribute<FText>::Create(TAttribute<FText>::FGetter::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::GetLayerName, InArgs._InTree, StackParameterData->ParameterInfo.Index)))
-						.OnTextCommitted(FOnTextCommitted::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::OnNameChanged, InArgs._InTree, StackParameterData->ParameterInfo.Index))
-						.Font(FEditorStyle::GetFontStyle(TEXT("MaterialEditor.Layers.EditableFontImportant")))
-					];
-				HeaderRowWidget->AddSlot()
-					.FillWidth(1.0f)
-					.VAlign(VAlign_Center)
-					[
-						SNullWidget::NullWidget
-					];
-				HeaderRowWidget->AddSlot()
-					.AutoWidth()
-					.VAlign(VAlign_Center)
-					.Padding(0.0f, 0.0f, 5.0f, 0.0f)
-					[
-						PropertyCustomizationHelpers::MakeClearButton(FSimpleDelegate::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::RemoveLayer, StackParameterData->ParameterInfo.Index))
-					];
-			}
-			else
-			{
-				HeaderRowWidget->AddSlot()
-					.VAlign(VAlign_Center)
-					.AutoWidth()
-					.Padding(5.0f)
-					[
-						SNew(STextBlock)
-						.Text(NameOverride)
-						.TextStyle(FEditorStyle::Get(), "NormalText.Important")
-					];
-			}
-			LeftSideWidget = HeaderRowWidget;
+		if (StackParameterData->ParameterInfo.Index != 0)
+		{
+			HeaderRowWidget->AddSlot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				.Padding(5.0f)
+				[
+					SNew(SEditableTextBox)
+					.BackgroundColor(FLinearColor(0.045f, 0.045f, 0.045f, 1.0f))
+					.Text(TAttribute<FText>::Create(TAttribute<FText>::FGetter::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::GetLayerName, InArgs._InTree, StackParameterData->ParameterInfo.Index)))
+					.OnTextCommitted(FOnTextCommitted::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::OnNameChanged, InArgs._InTree, StackParameterData->ParameterInfo.Index))
+					.Font(FEditorStyle::GetFontStyle(TEXT("MaterialEditor.Layers.EditableFontImportant")))
+					.ForegroundColor(FLinearColor::White)
+				];
+			HeaderRowWidget->AddSlot()
+				.FillWidth(1.0f)
+				.VAlign(VAlign_Center)
+				[
+					SNullWidget::NullWidget
+				];
+			HeaderRowWidget->AddSlot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 5.0f, 0.0f)
+				[
+					PropertyCustomizationHelpers::MakeClearButton(FSimpleDelegate::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::RemoveLayer, StackParameterData->ParameterInfo.Index))
+				];
 		}
+		else
+		{
+			HeaderRowWidget->AddSlot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				.Padding(5.0f)
+				[
+					SNew(STextBlock)
+					.Text(NameOverride)
+					.TextStyle(FEditorStyle::Get(), "NormalText.Important")
+				];
+		}
+		LeftSideWidget = HeaderRowWidget;
+	}
 // END STACK
 
 // GROUP --------------------------------------------------
-		if (StackParameterData->StackDataType == EStackDataType::Group)
-		{
-			NameOverride = FText::FromName(StackParameterData->Group.GroupName);
-			LeftSideWidget = SNew(STextBlock)
-				.Text(NameOverride)
-				.TextStyle(FEditorStyle::Get(), "TinyText");
-			const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
-			LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
-			RightSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
-		}
+	if (StackParameterData->StackDataType == EStackDataType::Group)
+	{
+		NameOverride = FText::FromName(StackParameterData->Group.GroupName);
+		LeftSideWidget = SNew(STextBlock)
+			.Text(NameOverride)
+			.TextStyle(FEditorStyle::Get(), "TinyText");
+		const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
+		LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
+		RightSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
+	}
 // END GROUP
 
 // ASSET --------------------------------------------------
-		if (StackParameterData->StackDataType == EStackDataType::Asset)
+	if (StackParameterData->StackDataType == EStackDataType::Asset)
+	{
+		FOnSetObject ObjectChanged = FOnSetObject::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::RefreshOnRowChange, Tree);
+		StackParameterData->ParameterHandle->GetProperty()->SetMetaData(FName(TEXT("DisplayThumbnail")), TEXT("true"));
+		FIntPoint ThumbnailOverride;
+		if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
 		{
-			FOnSetObject ObjectChanged = FOnSetObject::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::RefreshOnRowChange, Tree);
-			StackParameterData->ParameterHandle->GetProperty()->SetMetaData(FName(TEXT("DisplayThumbnail")), TEXT("true"));
-			FIntPoint ThumbnailOverride;
-			if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
-			{
-				NameOverride = FMaterialPropertyHelpers::LayerID;
-				ThumbnailOverride = FIntPoint(64, 64);
-			}
-			else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
-			{
-				NameOverride = FMaterialPropertyHelpers::BlendID;
-				ThumbnailOverride = FIntPoint(32, 32);
-			}
+			NameOverride = FMaterialPropertyHelpers::LayerID;
+			ThumbnailOverride = FIntPoint(64, 64);
+		}
+		else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
+		{
+			NameOverride = FMaterialPropertyHelpers::BlendID;
+			ThumbnailOverride = FIntPoint(32, 32);
+		}
 
 
-			TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, StackParameterData->Parameter));
-			FIsResetToDefaultVisible IsAssetResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldLayerAssetShowResetToDefault, StackParameterData, MaterialEditorInstance->Parent);
-			FResetToDefaultHandler ResetAssetHandler = FResetToDefaultHandler::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::ResetAssetToDefault, StackParameterData);
-			FResetToDefaultOverride ResetAssetOverride = FResetToDefaultOverride::Create(IsAssetResetVisible, ResetAssetHandler);
+		TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, StackParameterData->Parameter));
+		FIsResetToDefaultVisible IsAssetResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldLayerAssetShowResetToDefault, StackParameterData, MaterialEditorInstance->Parent);
+		FResetToDefaultHandler ResetAssetHandler = FResetToDefaultHandler::CreateSP(InArgs._InTree, &SMaterialLayersFunctionsInstanceTree::ResetAssetToDefault, StackParameterData);
+		FResetToDefaultOverride ResetAssetOverride = FResetToDefaultOverride::Create(IsAssetResetVisible, ResetAssetHandler);
 
-			IDetailTreeNode& Node = *StackParameterData->ParameterNode;
-			FNodeWidgets NodeWidgets = Node.CreateNodeWidgets();
+		IDetailTreeNode& Node = *StackParameterData->ParameterNode;
+		FNodeWidgets NodeWidgets = Node.CreateNodeWidgets();
 
-			LeftSideWidget = StackParameterData->ParameterHandle->CreatePropertyNameWidget(NameOverride);
+		LeftSideWidget = StackParameterData->ParameterHandle->CreatePropertyNameWidget(NameOverride);
 
-			StackParameterData->ParameterHandle->MarkResetToDefaultCustomized(false);
+		StackParameterData->ParameterHandle->MarkResetToDefaultCustomized(false);
 
-			EMaterialParameterAssociation InAssociation = StackParameterData->ParameterInfo.Association;
+		EMaterialParameterAssociation InAssociation = StackParameterData->ParameterInfo.Association;
 
-			FOnShouldFilterAsset AssetFilter = FOnShouldFilterAsset::CreateStatic(&FMaterialPropertyHelpers::FilterLayerAssets, Tree->FunctionInstance, InAssociation, StackParameterData->ParameterInfo.Index);
+		FOnShouldFilterAsset AssetFilter = FOnShouldFilterAsset::CreateStatic(&FMaterialPropertyHelpers::FilterLayerAssets, Tree->FunctionInstance, InAssociation, StackParameterData->ParameterInfo.Index);
 
-			FOnSetObject AssetChanged = FOnSetObject::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::RefreshOnAssetChange, StackParameterData->ParameterInfo.Index, InAssociation);
+		FOnSetObject AssetChanged = FOnSetObject::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::RefreshOnAssetChange, StackParameterData->ParameterInfo.Index, InAssociation);
 
-			FOnClicked OnChildButtonClicked;
-			FOnClicked OnSiblingButtonClicked;
-			UMaterialFunctionInterface* LocalFunction = nullptr;
-			TSharedPtr<SBox> ThumbnailBox;
+		FOnClicked OnChildButtonClicked;
+		FOnClicked OnSiblingButtonClicked;
+		UMaterialFunctionInterface* LocalFunction = nullptr;
+		TSharedPtr<SBox> ThumbnailBox;
 
-			if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
-			{
-				LocalFunction = Tree->FunctionInstance->Layers[StackParameterData->ParameterInfo.Index];
-			}
-			else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
-			{
-				LocalFunction = Tree->FunctionInstance->Blends[StackParameterData->ParameterInfo.Index];
-			}
+		if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter)
+		{
+			LocalFunction = Tree->FunctionInstance->Layers[StackParameterData->ParameterInfo.Index];
+		}
+		else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter)
+		{
+			LocalFunction = Tree->FunctionInstance->Blends[StackParameterData->ParameterInfo.Index];
+		}
 
-			OnChildButtonClicked = FOnClicked::CreateStatic(&FMaterialPropertyHelpers::OnClickedSaveNewLayerInstance,
-				ImplicitConv<UMaterialFunctionInterface*>(LocalFunction), StackParameterData);
+		OnChildButtonClicked = FOnClicked::CreateStatic(&FMaterialPropertyHelpers::OnClickedSaveNewLayerInstance,
+			ImplicitConv<UMaterialFunctionInterface*>(LocalFunction), StackParameterData);
 
-			TSharedPtr<SHorizontalBox> SaveInstanceBox;
+		TSharedPtr<SHorizontalBox> SaveInstanceBox;
 
-			RightSideWidget = SNew(SVerticalBox)
-				+SVerticalBox::Slot()
-				[
-					SNew(SHorizontalBox)
-					+SHorizontalBox::Slot()
-					.AutoWidth()
-					.HAlign(HAlign_Center)
-					.VAlign(VAlign_Center)
-					.Padding(4.0f)
-					.MaxWidth(ThumbnailOverride.X)
-					[
-						SAssignNew(ThumbnailBox, SBox)
-						[
-							Tree->CreateThumbnailWidget(StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, ThumbnailOverride.X)
-						]
-					]
-					+ SHorizontalBox::Slot()
-					.FillWidth(1.0)
-					[
-						SNew(SObjectPropertyEntryBox)
-						.AllowedClass(UMaterialFunctionInterface::StaticClass())
-						.ObjectPath(this, &SMaterialLayersFunctionsInstanceTreeItem::GetInstancePath, Tree)
-						.OnShouldFilterAsset(AssetFilter)
-						.OnObjectChanged(AssetChanged)
-						.CustomResetToDefault(ResetAssetOverride)
-						.DisplayCompactSize(true)
-						.NewAssetFactories(FMaterialPropertyHelpers::GetAssetFactories(InAssociation))
-					]
-					+ SHorizontalBox::Slot()
-					.Padding(0.0f, 2.0f, 0.0f, 0.0f)
-					.AutoWidth()
-					.VAlign(VAlign_Center)
-					[
-						SNew(SCheckBox)
-						.Type(ESlateCheckBoxType::ToggleButton)
-						.Style(&FCoreStyle::Get().GetWidgetStyle< FCheckBoxStyle >("ToggleButtonCheckbox"))
-						.OnCheckStateChanged(this, &SMaterialLayersFunctionsInstanceTreeItem::FilterClicked, InArgs._InTree, StackParameterData)
-						.IsChecked(this, &SMaterialLayersFunctionsInstanceTreeItem::GetFilterChecked, InArgs._InTree, StackParameterData)
-						.ToolTipText(LOCTEXT("FilterLayerAssets", "Filter asset picker to only show related layers or blends. \nStaying within the inheritance hierarchy can improve instruction count."))
-						.Content()
-						[
-							SNew(STextBlock)
-							.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
-							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.10"))
-							.Text(FText::FromString(FString(TEXT("\xf0b0"))) /*fa-filter*/)
-						]
-					]
-				]
-				+ SVerticalBox::Slot()
-				.AutoHeight()
-				[
-					SAssignNew(SaveInstanceBox, SHorizontalBox)
-					+ SHorizontalBox::Slot()
-					.AutoWidth()
-					.FillWidth(1.0)
-					[
-						SNullWidget::NullWidget
-					]
-				]
-			;
-			ThumbnailBox->SetMaxDesiredHeight(ThumbnailOverride.Y);
-			ThumbnailBox->SetMinDesiredHeight(ThumbnailOverride.Y);
-			ThumbnailBox->SetMinDesiredWidth(ThumbnailOverride.X);
-			ThumbnailBox->SetMaxDesiredWidth(ThumbnailOverride.X);
-
-			SaveInstanceBox->AddSlot()
+		RightSideWidget = SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
 				.AutoWidth()
-				.Padding(2.0f)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding(4.0f)
+				.MaxWidth(ThumbnailOverride.X)
 				[
-					SNew(SButton)
-					.ButtonStyle(FEditorStyle::Get(), "FlatButton.Dark")
-					.HAlign(HAlign_Center)
-					.OnClicked(OnChildButtonClicked)
-					.ToolTipText(LOCTEXT("SaveToChildInstance", "Save To Child Instance"))
+					SAssignNew(ThumbnailBox, SBox)
+					[
+						Tree->CreateThumbnailWidget(StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, ThumbnailOverride.X)
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0)
+				[
+					SNew(SObjectPropertyEntryBox)
+					.AllowedClass(UMaterialFunctionInterface::StaticClass())
+					.ObjectPath(this, &SMaterialLayersFunctionsInstanceTreeItem::GetInstancePath, Tree)
+					.OnShouldFilterAsset(AssetFilter)
+					.OnObjectChanged(AssetChanged)
+					.CustomResetToDefault(ResetAssetOverride)
+					.DisplayCompactSize(true)
+					.NewAssetFactories(FMaterialPropertyHelpers::GetAssetFactories(InAssociation))
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(0.0f, 2.0f, 0.0f, 0.0f)
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(SCheckBox)
+					.Type(ESlateCheckBoxType::ToggleButton)
+					.Style(&FCoreStyle::Get().GetWidgetStyle< FCheckBoxStyle >("ToggleButtonCheckbox"))
+					.OnCheckStateChanged(this, &SMaterialLayersFunctionsInstanceTreeItem::FilterClicked, InArgs._InTree, StackParameterData)
+					.IsChecked(this, &SMaterialLayersFunctionsInstanceTreeItem::GetFilterChecked, InArgs._InTree, StackParameterData)
+					.ToolTipText(LOCTEXT("FilterLayerAssets", "Filter asset picker to only show related layers or blends. \nStaying within the inheritance hierarchy can improve instruction count."))
 					.Content()
 					[
-						SNew(SHorizontalBox)
-						+ SHorizontalBox::Slot()
-						.AutoWidth()
-						[
-							SNew(STextBlock)
-							.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.10"))
-							.TextStyle(FEditorStyle::Get(), "NormalText.Important")
-							.Text(FText::FromString(FString(TEXT("\xf0c7 \xf149"))) /*fa-filter*/)
-						]
-						+ SHorizontalBox::Slot()
-						.AutoWidth()
-						[
-							SNew(STextBlock)
-							.TextStyle(FEditorStyle::Get(), "NormalText.Important")
-							.Text(FText::FromString(FString(TEXT(" Save Child"))) /*fa-filter*/)
-						]
+						SNew(STextBlock)
+						.TextStyle(FEditorStyle::Get(), "ContentBrowser.TopBar.Font")
+						.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.10"))
+						.Text(FText::FromString(FString(TEXT("\xf0b0"))) /*fa-filter*/)
 					]
-				];
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SAssignNew(SaveInstanceBox, SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.FillWidth(1.0)
+				[
+					SNullWidget::NullWidget
+				]
+			]
+		;
+		ThumbnailBox->SetMaxDesiredHeight(ThumbnailOverride.Y);
+		ThumbnailBox->SetMinDesiredHeight(ThumbnailOverride.Y);
+		ThumbnailBox->SetMinDesiredWidth(ThumbnailOverride.X);
+		ThumbnailBox->SetMaxDesiredWidth(ThumbnailOverride.X);
+
+		SaveInstanceBox->AddSlot()
+			.AutoWidth()
+			.Padding(2.0f)
+			[
+				SNew(SButton)
+				.ButtonStyle(FEditorStyle::Get(), "FlatButton.Dark")
+				.HAlign(HAlign_Center)
+				.OnClicked(OnChildButtonClicked)
+				.ToolTipText(LOCTEXT("SaveToChildInstance", "Save To Child Instance"))
+				.Content()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					[
+						SNew(STextBlock)
+						.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.10"))
+						.TextStyle(FEditorStyle::Get(), "NormalText.Important")
+						.Text(FText::FromString(FString(TEXT("\xf0c7 \xf149"))) /*fa-filter*/)
+					]
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					[
+						SNew(STextBlock)
+						.TextStyle(FEditorStyle::Get(), "NormalText.Important")
+						.Text(FText::FromString(FString(TEXT(" Save Child"))) /*fa-filter*/)
+					]
+				]
+			];
 			
-			const int32 LayerStateIndex = InAssociation == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
-			const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex];
-			LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
-			RightSideWidget->SetEnabled(bEnabled);
+		const int32 LayerStateIndex = InAssociation == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
+		const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex];
+		LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
+		RightSideWidget->SetEnabled(bEnabled);
 
 
-		}
+	}
 // END ASSET
 
 // PROPERTY ----------------------------------------------
-		if (StackParameterData->StackDataType == EStackDataType::Property)
+	if (StackParameterData->StackDataType == EStackDataType::Property)
+	{
+
+		UDEditorStaticComponentMaskParameterValue* CompMaskParam = Cast<UDEditorStaticComponentMaskParameterValue>(StackParameterData->Parameter);
+		UDEditorVectorParameterValue* VectorParam = Cast<UDEditorVectorParameterValue>(StackParameterData->Parameter);
+		UDEditorScalarParameterValue* ScalarParam = Cast<UDEditorScalarParameterValue>(StackParameterData->Parameter);
+
+		TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, StackParameterData->Parameter));
+		NameOverride = FText::FromName(StackParameterData->Parameter->ParameterInfo.Name);
+		FIsResetToDefaultVisible IsResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldShowResetToDefault, StackParameterData->Parameter, MaterialEditorInstance);
+		FResetToDefaultHandler ResetHandler = FResetToDefaultHandler::CreateStatic(&FMaterialPropertyHelpers::ResetToDefault, StackParameterData->Parameter, MaterialEditorInstance);
+		FResetToDefaultOverride ResetOverride = FResetToDefaultOverride::Create(IsResetVisible, ResetHandler);
+		
+		if (ScalarParam && ScalarParam->AtlasData.bIsUsedAsAtlasPosition)
 		{
-			TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, StackParameterData->Parameter));
-			NameOverride = FText::FromName(StackParameterData->Parameter->ParameterInfo.Name);
-			FIsResetToDefaultVisible IsResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldShowResetToDefault, StackParameterData->Parameter, MaterialEditorInstance);
-			FResetToDefaultHandler ResetHandler = FResetToDefaultHandler::CreateStatic(&FMaterialPropertyHelpers::ResetToDefault, StackParameterData->Parameter, MaterialEditorInstance);
-			FResetToDefaultOverride ResetOverride = FResetToDefaultOverride::Create(IsResetVisible, ResetHandler);
-			
-			IDetailTreeNode& Node = *StackParameterData->ParameterNode;
-			TSharedPtr<IDetailPropertyRow> GeneratedRow = StaticCastSharedPtr<IDetailPropertyRow>(Node.GetRow());
-			IDetailPropertyRow& Row = *GeneratedRow.Get();
-			Row
-				.DisplayName(NameOverride)
-				.OverrideResetToDefault(ResetOverride)
-				.EditCondition(IsParamEnabled, FOnBooleanValueChanged::CreateStatic(&FMaterialPropertyHelpers::OnOverrideParameter, StackParameterData->Parameter, MaterialEditorInstance));
+			IsResetVisible = FIsResetToDefaultVisible::CreateStatic(&FMaterialPropertyHelpers::ShouldShowResetToDefault, StackParameterData->Parameter, MaterialEditorInstance);
+			ResetHandler = FResetToDefaultHandler::CreateStatic(&FMaterialPropertyHelpers::ResetCurveToDefault, StackParameterData->Parameter, MaterialEditorInstance);
+			ResetOverride = FResetToDefaultOverride::Create(IsResetVisible, ResetHandler);
+		}
 
+		IDetailTreeNode& Node = *StackParameterData->ParameterNode;
+		TSharedPtr<IDetailPropertyRow> GeneratedRow = StaticCastSharedPtr<IDetailPropertyRow>(Node.GetRow());
+		IDetailPropertyRow& Row = *GeneratedRow.Get();
+		Row
+			.DisplayName(NameOverride)
+			.OverrideResetToDefault(ResetOverride)
+			.EditCondition(IsParamEnabled, FOnBooleanValueChanged::CreateStatic(&FMaterialPropertyHelpers::OnOverrideParameter, StackParameterData->Parameter, MaterialEditorInstance));
 
-			UDEditorStaticComponentMaskParameterValue* CompMaskParam = Cast<UDEditorStaticComponentMaskParameterValue>(StackParameterData->Parameter);
-			UDEditorVectorParameterValue* VectorParam = Cast<UDEditorVectorParameterValue>(StackParameterData->Parameter);
+		if (VectorParam && VectorParam->bIsUsedAsChannelMask)
+		{
+			FOnGetPropertyComboBoxStrings GetMaskStrings = FOnGetPropertyComboBoxStrings::CreateStatic(&FMaterialPropertyHelpers::GetVectorChannelMaskComboBoxStrings);
+			FOnGetPropertyComboBoxValue GetMaskValue = FOnGetPropertyComboBoxValue::CreateStatic(&FMaterialPropertyHelpers::GetVectorChannelMaskValue, StackParameterData->Parameter);
+			FOnPropertyComboBoxValueSelected SetMaskValue = FOnPropertyComboBoxValueSelected::CreateStatic(&FMaterialPropertyHelpers::SetVectorChannelMaskValue, StackParameterData->ParameterNode->CreatePropertyHandle(), StackParameterData->Parameter, (UObject*)MaterialEditorInstance);
 
-			if (VectorParam && VectorParam->bIsUsedAsChannelMask)
-			{
-				FOnGetPropertyComboBoxStrings GetMaskStrings = FOnGetPropertyComboBoxStrings::CreateStatic(&FMaterialPropertyHelpers::GetVectorChannelMaskComboBoxStrings);
-				FOnGetPropertyComboBoxValue GetMaskValue = FOnGetPropertyComboBoxValue::CreateStatic(&FMaterialPropertyHelpers::GetVectorChannelMaskValue, StackParameterData->Parameter);
-				FOnPropertyComboBoxValueSelected SetMaskValue = FOnPropertyComboBoxValueSelected::CreateStatic(&FMaterialPropertyHelpers::SetVectorChannelMaskValue, StackParameterData->ParameterNode->CreatePropertyHandle(), StackParameterData->Parameter, (UObject*)MaterialEditorInstance);
+			FDetailWidgetRow& CustomWidget = Row.CustomWidget();
+			CustomWidget
+			.FilterString(NameOverride)
+			.NameContent()
+			[
+				SNew(STextBlock)
+				.Text(NameOverride)
+				.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
+				.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+			]
+			.ValueContent()
+			.MaxDesiredWidth(200.0f)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0f)
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						PropertyCustomizationHelpers::MakePropertyComboBox(StackParameterData->ParameterNode->CreatePropertyHandle(), GetMaskStrings, GetMaskValue, SetMaskValue)
+					]
+				]
+			];
+		}
+		if (ScalarParam && ScalarParam->AtlasData.bIsUsedAsAtlasPosition)
+		{
+			const FText ParameterName = FText::FromName(StackParameterData->Parameter->ParameterInfo.Name);
 
-				FDetailWidgetRow& CustomWidget = Row.CustomWidget();
-				CustomWidget
-				.FilterString(NameOverride)
+			FDetailWidgetRow& CustomWidget = Row.CustomWidget();
+			CustomWidget
+				.FilterString(ParameterName)
 				.NameContent()
+				[
+					SNew(STextBlock)
+					.Text(ParameterName)
+					.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
+					.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+				]
+				.ValueContent()
+				.HAlign(HAlign_Fill)
+				.MaxDesiredWidth(400.0f)
+				[
+					SNew(SObjectPropertyEntryBox)
+					.ObjectPath(this, &SMaterialLayersFunctionsInstanceTreeItem::GetCurvePath, ScalarParam)
+					.AllowedClass(UCurveLinearColor::StaticClass())
+					.NewAssetFactories(TArray<UFactory*>())
+					.DisplayThumbnail(true)
+					.ThumbnailPool(InArgs._InTree->GetTreeThumbnailPool())
+					.OnShouldSetAsset(FOnShouldSetAsset::CreateStatic(&FMaterialPropertyHelpers::OnShouldSetCurveAsset, ScalarParam->AtlasData.Atlas))
+					.OnObjectChanged(FOnSetObject::CreateStatic(&FMaterialPropertyHelpers::SetPositionFromCurveAsset, ScalarParam->AtlasData.Atlas, ScalarParam, StackParameterData->ParameterHandle, (UObject*)MaterialEditorInstance))
+					.DisplayCompactSize(true)
+				];
+			
+		}
+		else if (!CompMaskParam)
+		{
+			FNodeWidgets StoredNodeWidgets = Node.CreateNodeWidgets();
+			TSharedRef<SWidget> StoredRightSideWidget = StoredNodeWidgets.ValueWidget.ToSharedRef();
+			FDetailWidgetRow& CustomWidget = Row.CustomWidget();
+			CustomWidget
+			.FilterString(NameOverride)
+			.NameContent()
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
 				[
 					SNew(STextBlock)
 					.Text(NameOverride)
 					.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
 					.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
 				]
-				.ValueContent()
-				.MaxDesiredWidth(200.0f)
-				[
-					SNew(SHorizontalBox)
-					+ SHorizontalBox::Slot()
-					.FillWidth(1.0f)
-					[
-						SNew(SHorizontalBox)
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							PropertyCustomizationHelpers::MakePropertyComboBox(StackParameterData->ParameterNode->CreatePropertyHandle(), GetMaskStrings, GetMaskValue, SetMaskValue)
-						]
-					]
-				];
-			}
-			else if (!CompMaskParam)
-			{
-				FNodeWidgets StoredNodeWidgets = Node.CreateNodeWidgets();
-				TSharedRef<SWidget> StoredRightSideWidget = StoredNodeWidgets.ValueWidget.ToSharedRef();
-				FDetailWidgetRow& CustomWidget = Row.CustomWidget();
-				CustomWidget
-				.FilterString(NameOverride)
-				.NameContent()
-				[
-					SNew(SHorizontalBox)
-					+SHorizontalBox::Slot()
-					.VAlign(VAlign_Center)
-					[
-						SNew(STextBlock)
-						.Text(NameOverride)
-						.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
-						.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
-					]
-				]
-				.ValueContent()
-				[
-					StoredRightSideWidget
-				];
+			]
+			.ValueContent()
+			[
+				StoredRightSideWidget
+			];
 
-			}
-			else
-			{
-				TSharedPtr<IPropertyHandle> RMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("R");
-				TSharedPtr<IPropertyHandle> GMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("G");
-				TSharedPtr<IPropertyHandle> BMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("B");
-				TSharedPtr<IPropertyHandle> AMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("A");
-				FDetailWidgetRow& CustomWidget = Row.CustomWidget();
-				CustomWidget
-				.FilterString(NameOverride)
-				.NameContent()
-				[
-					SNew(SHorizontalBox)
-					+ SHorizontalBox::Slot()
-					.VAlign(VAlign_Center)
-					[
-						SNew(STextBlock)
-						.Text(NameOverride)
-						.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
-						.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
-					]
-				]
-				.ValueContent()
-				.MaxDesiredWidth(200.0f)
-				[
-					SNew(SHorizontalBox)
-					+ SHorizontalBox::Slot()
-					.FillWidth(1.0f)
-					[
-						SNew(SHorizontalBox)
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							RMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							RMaskProperty->CreatePropertyValueWidget()
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
-						.AutoWidth()
-						[
-							GMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							GMaskProperty->CreatePropertyValueWidget()
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
-						.AutoWidth()
-						[
-							BMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							BMaskProperty->CreatePropertyValueWidget()
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
-						.AutoWidth()
-						[
-							AMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
-						]
-						+ SHorizontalBox::Slot()
-						.HAlign(HAlign_Left)
-						.AutoWidth()
-						[
-							AMaskProperty->CreatePropertyValueWidget()
-						]
-					]	
-				];
-			}
-
-			FNodeWidgets NodeWidgets = Node.CreateNodeWidgets();
-			LeftSideWidget = NodeWidgets.NameWidget.ToSharedRef();
-			RightSideWidget = NodeWidgets.ValueWidget.ToSharedRef();
-
-			StackParameterData->ParameterNode->CreatePropertyHandle()->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial, StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, false));
-			StackParameterData->ParameterNode->CreatePropertyHandle()->SetOnChildPropertyValueChanged(FSimpleDelegate::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial, StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, false));
-
-			const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
-			const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && Tree->FunctionInstance->LayerStates[LayerStateIndex];
-			LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
-			RightSideWidget->SetEnabled(bEnabled);
 		}
+		else
+		{
+			TSharedPtr<IPropertyHandle> RMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("R");
+			TSharedPtr<IPropertyHandle> GMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("G");
+			TSharedPtr<IPropertyHandle> BMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("B");
+			TSharedPtr<IPropertyHandle> AMaskProperty = StackParameterData->ParameterNode->CreatePropertyHandle()->GetChildHandle("A");
+			FDetailWidgetRow& CustomWidget = Row.CustomWidget();
+			CustomWidget
+			.FilterString(NameOverride)
+			.NameContent()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(NameOverride)
+					.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
+					.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+				]
+			]
+			.ValueContent()
+			.MaxDesiredWidth(200.0f)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0f)
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						RMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						RMaskProperty->CreatePropertyValueWidget()
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
+					.AutoWidth()
+					[
+						GMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						GMaskProperty->CreatePropertyValueWidget()
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
+					.AutoWidth()
+					[
+						BMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						BMaskProperty->CreatePropertyValueWidget()
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.Padding(FMargin(10.0f, 0.0f, 0.0f, 0.0f))
+					.AutoWidth()
+					[
+						AMaskProperty->CreatePropertyNameWidget(FText::GetEmpty(), FText::GetEmpty(), false)
+					]
+					+ SHorizontalBox::Slot()
+					.HAlign(HAlign_Left)
+					.AutoWidth()
+					[
+						AMaskProperty->CreatePropertyValueWidget()
+					]
+				]	
+			];
+		}
+
+		FNodeWidgets NodeWidgets = Node.CreateNodeWidgets();
+		LeftSideWidget = NodeWidgets.NameWidget.ToSharedRef();
+		RightSideWidget = NodeWidgets.ValueWidget.ToSharedRef();
+
+		StackParameterData->ParameterNode->CreatePropertyHandle()->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial, StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, false));
+		StackParameterData->ParameterNode->CreatePropertyHandle()->SetOnChildPropertyValueChanged(FSimpleDelegate::CreateSP(Tree, &SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial, StackParameterData->ParameterInfo.Association, StackParameterData->ParameterInfo.Index, false));
+
+		const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
+		const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && Tree->FunctionInstance->LayerStates[LayerStateIndex];
+		LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
+		RightSideWidget->SetEnabled(bEnabled);
+	}
 // END PROPERTY
 
 // PROPERTY CHILD ----------------------------------------
-		if (StackParameterData->StackDataType == EStackDataType::PropertyChild)
-		{
-			FNodeWidgets NodeWidgets = StackParameterData->ParameterNode->CreateNodeWidgets();
-			LeftSideWidget = NodeWidgets.NameWidget.ToSharedRef();
-			RightSideWidget = NodeWidgets.ValueWidget.ToSharedRef();
+	if (StackParameterData->StackDataType == EStackDataType::PropertyChild)
+	{
+		FNodeWidgets NodeWidgets = StackParameterData->ParameterNode->CreateNodeWidgets();
+		LeftSideWidget = NodeWidgets.NameWidget.ToSharedRef();
+		RightSideWidget = NodeWidgets.ValueWidget.ToSharedRef();
 
-			const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
-			const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && Tree->FunctionInstance->LayerStates[LayerStateIndex];
-			LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
-			RightSideWidget->SetEnabled(bEnabled);
-		}
+		const int32 LayerStateIndex = StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter ? StackParameterData->ParameterInfo.Index + 1 : StackParameterData->ParameterInfo.Index;
+		const bool bEnabled = FMaterialPropertyHelpers::IsOverriddenExpression(StackParameterData->Parameter) && Tree->FunctionInstance->LayerStates[LayerStateIndex];
+		LeftSideWidget->SetEnabled(InArgs._InTree->FunctionInstance->LayerStates[LayerStateIndex]);
+		RightSideWidget->SetEnabled(bEnabled);
+	}
 // END PROPERTY CHILD
 
 // FINAL WRAPPER
-		if (StackParameterData->StackDataType == EStackDataType::Stack)
-		{
-			WrapperWidget->AddSlot()
-				.AutoHeight()
+	if (StackParameterData->StackDataType == EStackDataType::Stack)
+	{
+		TSharedPtr<SHorizontalBox> FinalStack;
+		WrapperWidget->AddSlot()
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.BorderImage(this, &SMaterialLayersFunctionsInstanceTreeItem::GetBorderImage)
+				.Padding(0.0f)
 				[
-					SNew(SBorder)
-					.BorderImage(FEditorStyle::GetBrush("MaterialInstanceEditor.StackHeader"))
-					.Padding(0.0f)
+					SAssignNew(FinalStack, SHorizontalBox)
+				]
+			];
+		if (StackParameterData->ParameterInfo.Index != 0)
+		{
+			FinalStack->AddSlot()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding(2.5f, 0)
+				.AutoWidth()
+				[
+					FMaterialPropertyHelpers::MakeStackReorderHandle(SharedThis(this))
+				];
+		}
+		FinalStack->AddSlot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(FMargin(2.0f))
+			[
+				SNew(SExpanderArrow, SharedThis(this))
+			];
+		FinalStack->AddSlot()
+			.Padding(FMargin(2.0f))
+			.VAlign(VAlign_Center)
+			[
+				LeftSideWidget
+			];
+	}
+	else
+	{
+		FSlateBrush* StackBrush;
+		switch (StackParameterData->ParameterInfo.Association)
+		{
+		case EMaterialParameterAssociation::LayerParameter:
+		{
+			StackBrush = const_cast<FSlateBrush*>(FEditorStyle::GetBrush("MaterialInstanceEditor.StackBody"));
+			break;
+		}
+		case EMaterialParameterAssociation::BlendParameter:
+		{
+			StackBrush = const_cast<FSlateBrush*>(FEditorStyle::GetBrush("MaterialInstanceEditor.StackBodyBlend"));
+			break;
+		}
+		default:
+			break;
+		}
+		WrapperWidget->AddSlot()
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.BorderImage(this, &SMaterialLayersFunctionsInstanceTreeItem::GetBorderImage)
+				.Padding(0.0f)
+				[
+					SNew(SSplitter)
+					.Style(FEditorStyle::Get(), "DetailsView.Splitter")
+					.PhysicalSplitterHandleSize(1.0f)
+					.HitDetectionSplitterHandleSize(5.0f)
+					+ SSplitter::Slot()
+					.Value(ColumnSizeData.LeftColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnWidthChanged)
+					.Value(0.25f)
 					[
 						SNew(SHorizontalBox)
 						+ SHorizontalBox::Slot()
 						.AutoWidth()
 						.VAlign(VAlign_Center)
-						.Padding(FMargin(2.0f))
+						.Padding(FMargin(3.0f))
 						[
 							SNew(SExpanderArrow, SharedThis(this))
 						]
@@ -646,107 +924,56 @@ public:
 							LeftSideWidget
 						]
 					]
-				];
-		}
-		else
-		{
-			FSlateBrush* StackBrush;
-			switch (StackParameterData->ParameterInfo.Association)
-			{
-			case EMaterialParameterAssociation::LayerParameter:
-				StackBrush = const_cast<FSlateBrush*>(FEditorStyle::GetBrush("MaterialInstanceEditor.StackBody"));
-				break;
-			case EMaterialParameterAssociation::BlendParameter:
-				StackBrush = const_cast<FSlateBrush*>(FEditorStyle::GetBrush("MaterialInstanceEditor.StackBodyBlend"));
-				break;
-			default:
-				StackBrush = nullptr;
-				break;
-			}
-			WrapperWidget->AddSlot()
-				.AutoHeight()
-				[
-					SNew(SBorder)
-					.BorderImage(StackBrush)
-					.Padding(0.0f)
+					+ SSplitter::Slot()
+					.Value(ColumnSizeData.RightColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnWidthChanged)
 					[
-						SNew(SSplitter)
-						.Style(FEditorStyle::Get(), "DetailsView.Splitter")
-						.PhysicalSplitterHandleSize(1.0f)
-						.HitDetectionSplitterHandleSize(5.0f)
-						+ SSplitter::Slot()
-						.Value(ColumnSizeData.LeftColumnWidth)
-						.OnSlotResized(ColumnSizeData.OnWidthChanged)
-						.Value(0.25f)
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.MaxWidth(350.0f)
+						.Padding(FMargin(5.0f, 2.0f, 0.0f, 2.0f))
 						[
-							SNew(SHorizontalBox)
-							+ SHorizontalBox::Slot()
-							.AutoWidth()
-							.VAlign(VAlign_Center)
-							.Padding(FMargin(3.0f))
-							[
-								SNew(SExpanderArrow, SharedThis(this))
-							]
-							+ SHorizontalBox::Slot()
-							.Padding(FMargin(2.0f))
-							.VAlign(VAlign_Center)
-							[
-								LeftSideWidget
-							]
-						]
-						+ SSplitter::Slot()
-						.Value(ColumnSizeData.RightColumnWidth)
-						.OnSlotResized(ColumnSizeData.OnWidthChanged)
-						[
-							SNew(SHorizontalBox)
-							+ SHorizontalBox::Slot()
-							.MaxWidth(350.0f)
-							.Padding(FMargin(5.0f, 2.0f, 0.0f, 2.0f))
-							[
-								RightSideWidget
-							]
+							RightSideWidget
 						]
 					]
-				];
-		}
-	
-
-		this->ChildSlot
-			[
-				WrapperWidget
+				]
 			];
-
-		STableRow< TSharedPtr<FStackSortedData> >::ConstructInternal(
-			STableRow::FArguments()
-			.Style(FEditorStyle::Get(), "DetailsView.TreeView.TableRow")
-			.ShowSelection(false),
-			InOwnerTableView
-		);
 	}
 
-	// Disable double-click expansion
-	virtual FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent) override { return FReply::Handled(); };
 
-	/** The node info to build the tree view row from. */
-	TSharedPtr<FStackSortedData> StackParameterData;
+	this->ChildSlot
+		[
+			WrapperWidget
+		];
 
-	UMaterialEditorInstanceConstant* MaterialEditorInstance;
+	FOnTableRowDragEnter LayerDragDelegate = FOnTableRowDragEnter::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::OnLayerDragEnter);
+	FOnTableRowDragLeave LayerDragLeaveDelegate = FOnTableRowDragLeave::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::OnLayerDragLeave);
+	FOnTableRowDrop LayerDropDelegate = FOnTableRowDrop::CreateSP(this, &SMaterialLayersFunctionsInstanceTreeItem::OnLayerDrop);
 
-	FString GetInstancePath(SMaterialLayersFunctionsInstanceTree* InTree) const
+	STableRow< TSharedPtr<FStackSortedData> >::ConstructInternal(
+		STableRow::FArguments()
+		.Style(FEditorStyle::Get(), "DetailsView.TreeView.TableRow")
+		.ShowSelection(false)
+		.OnDragEnter(LayerDragDelegate)
+		.OnDragLeave(LayerDragLeaveDelegate)
+		.OnDrop(LayerDropDelegate),
+		InOwnerTableView
+	);
+}
+
+FString SMaterialLayersFunctionsInstanceTreeItem::GetInstancePath(SMaterialLayersFunctionsInstanceTree* InTree) const
+{
+	FString InstancePath;
+	if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter && InTree->FunctionInstance->Blends.IsValidIndex(StackParameterData->ParameterInfo.Index))
 	{
-		FString InstancePath;
-		if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::BlendParameter && InTree->FunctionInstance->Blends.IsValidIndex(StackParameterData->ParameterInfo.Index))
-		{
-			InstancePath = InTree->FunctionInstance->Blends[StackParameterData->ParameterInfo.Index]->GetPathName();
-		}
-		else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter && InTree->FunctionInstance->Layers.IsValidIndex(StackParameterData->ParameterInfo.Index))
-		{
-			InstancePath = InTree->FunctionInstance->Layers[StackParameterData->ParameterInfo.Index]->GetPathName();
-		}
-		return InstancePath;
+		InstancePath = InTree->FunctionInstance->Blends[StackParameterData->ParameterInfo.Index]->GetPathName();
 	}
-};
-
+	else if (StackParameterData->ParameterInfo.Association == EMaterialParameterAssociation::LayerParameter && InTree->FunctionInstance->Layers.IsValidIndex(StackParameterData->ParameterInfo.Index))
+	{
+		InstancePath = InTree->FunctionInstance->Layers[StackParameterData->ParameterInfo.Index]->GetPathName();
+	}
+	return InstancePath;
+}
 
 void SMaterialLayersFunctionsInstanceTree::Construct(const FArguments& InArgs)
 {
@@ -855,7 +1082,7 @@ void SMaterialLayersFunctionsInstanceTree::RefreshOnAssetChange(const struct FAs
 void SMaterialLayersFunctionsInstanceTree::ResetAssetToDefault(TSharedPtr<IPropertyHandle> InHandle, TSharedPtr<FStackSortedData> InData)
 {
 	FMaterialPropertyHelpers::ResetLayerAssetToDefault(FunctionInstanceHandle.ToSharedRef(), InData->Parameter, InData->ParameterInfo.Association, InData->ParameterInfo.Index, MaterialEditorInstance);
-	UpdateThumbnailMaterial(InData->ParameterInfo.Association, InData->ParameterInfo.Index, true);
+	UpdateThumbnailMaterial(InData->ParameterInfo.Association, InData->ParameterInfo.Index, false);
 	CreateGroupsWidget();
 	RequestTreeRefresh();
 }
@@ -882,12 +1109,40 @@ void SMaterialLayersFunctionsInstanceTree::RemoveLayer(int32 Index)
 
 FReply SMaterialLayersFunctionsInstanceTree::ToggleLayerVisibility(int32 Index)
 {
-	const FScopedTransaction Transaction(LOCTEXT("ToggleLayerAndBlendVisibility", "Toggles visibility for a blended layer"));
-	FunctionInstanceHandle->NotifyPreChange();
-	FunctionInstance->ToggleBlendedLayerVisibility(Index);
-	FunctionInstanceHandle->NotifyPostChange();
-	CreateGroupsWidget();
-	return FReply::Handled();
+	if (!FSlateApplication::Get().GetModifierKeys().AreModifersDown(EModifierKey::Alt))
+	{
+		bLayerIsolated = false;
+		const FScopedTransaction Transaction(LOCTEXT("ToggleLayerAndBlendVisibility", "Toggles visibility for a blended layer"));
+		FunctionInstanceHandle->NotifyPreChange();
+		FunctionInstance->ToggleBlendedLayerVisibility(Index);
+		FunctionInstanceHandle->NotifyPostChange();
+		CreateGroupsWidget();
+		return FReply::Handled();
+	}
+	else
+	{
+		const FScopedTransaction Transaction(LOCTEXT("ToggleLayerAndBlendVisibility", "Toggles visibility for a blended layer"));
+		FunctionInstanceHandle->NotifyPreChange();
+		if (FunctionInstance->GetLayerVisibility(Index) == false)
+		{
+			// Reset if clicking on a disabled layer
+			FunctionInstance->SetBlendedLayerVisibility(Index, true);
+			bLayerIsolated = false;
+		}
+		for (int32 LayerIt = 1; LayerIt < FunctionInstance->LayerStates.Num(); LayerIt++)
+		{
+			if (LayerIt != Index)
+			{
+				FunctionInstance->SetBlendedLayerVisibility(LayerIt, bLayerIsolated);
+			}
+		}
+
+		bLayerIsolated = !bLayerIsolated;
+		FunctionInstanceHandle->NotifyPostChange();
+		CreateGroupsWidget();
+		return FReply::Handled();
+	}
+
 }
 
 TSharedPtr<class FAssetThumbnailPool> SMaterialLayersFunctionsInstanceTree::GetTreeThumbnailPool()
@@ -1125,7 +1380,9 @@ TSharedRef<SWidget> SMaterialLayersFunctionsInstanceTree::CreateThumbnailWidget(
 		ThumbnailObject = MaterialEditorInstance->StoredBlendPreviews[InIndex];
 	}
 	const TSharedPtr<FAssetThumbnail> AssetThumbnail = MakeShareable(new FAssetThumbnail(ThumbnailObject, InThumbnailSize, InThumbnailSize, GetTreeThumbnailPool()));
-	return AssetThumbnail->MakeThumbnailWidget();
+	TSharedRef<SWidget> ThumbnailWidget = AssetThumbnail->MakeThumbnailWidget();
+	ThumbnailWidget->SetOnMouseDoubleClick(FPointerEventHandler::CreateSP(this, &SMaterialLayersFunctionsInstanceTree::OnThumbnailDoubleClick, InAssociation, InIndex));
+	return ThumbnailWidget;
 }
 
 void SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial(TEnumAsByte<EMaterialParameterAssociation> InAssociation, int32 InIndex, bool bAlterBlendIndex)
@@ -1174,10 +1431,29 @@ void SMaterialLayersFunctionsInstanceTree::UpdateThumbnailMaterial(TEnumAsByte<E
 	}
 	if (MaterialToUpdate != nullptr)
 	{
-		FMaterialPropertyHelpers::TransitionAndCopyParameters(MaterialToUpdate, ParameterGroups);
+		FMaterialPropertyHelpers::TransitionAndCopyParameters(MaterialToUpdate, ParameterGroups, true);
 	}
 }
 
+FReply SMaterialLayersFunctionsInstanceTree::OnThumbnailDoubleClick(const FGeometry& Geometry, const FPointerEvent& MouseEvent, EMaterialParameterAssociation InAssociation, int32 InIndex)
+{
+	UMaterialFunctionInterface* AssetToOpen = nullptr;
+	if (InAssociation == EMaterialParameterAssociation::BlendParameter)
+	{
+		AssetToOpen = FunctionInstance->Blends[InIndex];
+	}
+	else if (InAssociation == EMaterialParameterAssociation::LayerParameter)
+	{
+		AssetToOpen = FunctionInstance->Layers[InIndex];
+	}
+	if (AssetToOpen != nullptr)
+	{
+		FAssetEditorManager::Get().OpenEditorForAsset(AssetToOpen);
+		return FReply::Handled();
+	}
+	return FReply::Unhandled();
+}
+
 void SMaterialLayersFunctionsInstanceTree::ShowSubParameters(TSharedPtr<FStackSortedData> ParentParameter)
 {
 	for (FLayerParameterUnsortedData Property : NonLayerProperties)
@@ -1421,6 +1697,9 @@ public:
 	*
 	* @param InArgs   A declaration from which to construct the widget
 	*/
+	FString GetCurvePath(UDEditorScalarParameterValue* Parameter) const;
+
+
 	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView)
 	{
 		// todo: add tooltips
@@ -1564,6 +1843,7 @@ public:
 
 			UDEditorStaticComponentMaskParameterValue* CompMaskParam = Cast<UDEditorStaticComponentMaskParameterValue>(StackParameterData->Parameter);
 			UDEditorVectorParameterValue* VectorParam = Cast<UDEditorVectorParameterValue>(StackParameterData->Parameter);
+			UDEditorScalarParameterValue* ScalarParam = Cast<UDEditorScalarParameterValue>(StackParameterData->Parameter);
 
 			if (VectorParam && VectorParam->bIsUsedAsChannelMask)
 			{
@@ -1598,6 +1878,39 @@ public:
 					]
 				];
 			}
+			if (ScalarParam && ScalarParam->AtlasData.bIsUsedAsAtlasPosition)
+			{
+
+				TAttribute<bool> IsParamEnabled = TAttribute<bool>::Create(TAttribute<bool>::FGetter::CreateStatic(&FMaterialPropertyHelpers::IsOverriddenExpression, StackParameterData->Parameter));
+
+				const FText ParameterName = FText::FromName(StackParameterData->Parameter->ParameterInfo.Name);
+
+				FDetailWidgetRow& CustomWidget = Row.CustomWidget();
+				CustomWidget
+					.FilterString(ParameterName)
+					.NameContent()
+					[
+						SNew(STextBlock)
+						.Text(ParameterName)
+						.ToolTipText(FMaterialPropertyHelpers::GetParameterExpressionDescription(StackParameterData->Parameter, MaterialEditorInstance))
+						.Font(FEditorStyle::GetFontStyle(TEXT("PropertyWindow.NormalFont")))
+					]
+					.ValueContent()
+					.HAlign(HAlign_Fill)
+					.MaxDesiredWidth(400.0f)
+					[
+						SNew(SObjectPropertyEntryBox)
+						.ObjectPath(this, &SMaterialLayersFunctionsMaterialTreeItem::GetCurvePath, ScalarParam)
+						.AllowedClass(UCurveLinearColor::StaticClass())
+						.NewAssetFactories(TArray<UFactory*>())
+						.DisplayThumbnail(true)
+						.ThumbnailPool(InArgs._InTree->GetTreeThumbnailPool())
+						.OnShouldSetAsset(FOnShouldSetAsset::CreateStatic(&FMaterialPropertyHelpers::OnShouldSetCurveAsset, ScalarParam->AtlasData.Atlas))
+						.OnObjectChanged(FOnSetObject::CreateStatic(&FMaterialPropertyHelpers::SetPositionFromCurveAsset, ScalarParam->AtlasData.Atlas, ScalarParam, StackParameterData->ParameterHandle, (UObject*)MaterialEditorInstance))
+						.DisplayCompactSize(true)
+					];
+
+			}
 			else if (!CompMaskParam)
 			{
 				FNodeWidgets StoredNodeWidgets = Node.CreateNodeWidgets();
@@ -1852,6 +2165,12 @@ public:
 	UMaterialEditorPreviewParameters* MaterialEditorInstance;
 };
 
+FString SMaterialLayersFunctionsMaterialTreeItem::GetCurvePath(UDEditorScalarParameterValue* Parameter) const
+{
+	FString Path = Parameter->AtlasData.Curve->GetPathName();
+	return Path;
+}
+
 void SMaterialLayersFunctionsMaterialWrapper::Refresh()
 {
 	LayerParameter = nullptr;
@@ -2277,4 +2596,5 @@ void SMaterialLayersFunctionsMaterialTree::ShowSubParameters(TSharedPtr<FStackSo
 }
 
 
+
 #undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.h b/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.h
index 1d87dbd237e0..d47491b9dc4e 100644
--- a/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.h
+++ b/Engine/Source/Editor/MaterialEditor/Private/SMaterialLayersFunctionsTree.h
@@ -17,6 +17,78 @@
 
 class IPropertyHandle;
 class UMaterialEditorInstanceConstant;
+class SMaterialLayersFunctionsInstanceTree;
+
+class SMaterialLayersFunctionsInstanceTreeItem : public STableRow< TSharedPtr<FStackSortedData> >
+{
+public:
+
+	SLATE_BEGIN_ARGS(SMaterialLayersFunctionsInstanceTreeItem)
+		: _StackParameterData(nullptr),
+		_MaterialEditorInstance(nullptr)
+	{}
+
+	/** The item content. */
+	SLATE_ARGUMENT(TSharedPtr<FStackSortedData>, StackParameterData)
+	SLATE_ARGUMENT(UMaterialEditorInstanceConstant*, MaterialEditorInstance)
+	SLATE_ARGUMENT(SMaterialLayersFunctionsInstanceTree*, InTree)
+	SLATE_END_ARGS()
+
+	FMaterialTreeColumnSizeData ColumnSizeData;
+	bool bIsBeingDragged;
+
+private:
+	bool bIsHoveredDragTarget;
+
+
+	FString GetCurvePath(UDEditorScalarParameterValue* Parameter) const;
+	const FSlateBrush* GetBorderImage() const;
+
+public:
+
+	void RefreshOnRowChange(const FAssetData& AssetData, SMaterialLayersFunctionsInstanceTree* InTree);
+	bool GetFilterState(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const;
+	void FilterClicked(const ECheckBoxState NewCheckedState, SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData);
+	ECheckBoxState GetFilterChecked(SMaterialLayersFunctionsInstanceTree* InTree, TSharedPtr<FStackSortedData> InStackData) const;
+	FText GetLayerName(SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter) const;
+	void OnNameChanged(const FText& InText, ETextCommit::Type CommitInfo, SMaterialLayersFunctionsInstanceTree* InTree, int32 Counter);
+
+
+	void OnLayerDragEnter(const FDragDropEvent& DragDropEvent)
+	{
+		if (StackParameterData->ParameterInfo.Index != 0)
+		{
+			bIsHoveredDragTarget = true;
+		}
+	}
+
+	void OnLayerDragLeave(const FDragDropEvent& DragDropEvent)
+	{
+		bIsHoveredDragTarget = false;
+	}
+
+	void OnLayerDragDetected()
+	{
+		bIsBeingDragged = true;
+	}
+
+	FReply OnLayerDrop(const FDragDropEvent& DragDropEvent);
+	/**
+	* Construct the widget
+	*
+	* @param InArgs   A declaration from which to construct the widget
+	*/
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView);
+
+	/** The node info to build the tree view row from. */
+	TSharedPtr<FStackSortedData> StackParameterData;
+
+	SMaterialLayersFunctionsInstanceTree* Tree;
+
+	UMaterialEditorInstanceConstant* MaterialEditorInstance;
+
+	FString GetInstancePath(SMaterialLayersFunctionsInstanceTree* InTree) const;
+};
 
 class SMaterialLayersFunctionsInstanceWrapper : public SCompoundWidget
 {
@@ -87,6 +159,7 @@ public:
 
 	TSharedRef<SWidget> CreateThumbnailWidget(EMaterialParameterAssociation InAssociation, int32 InIndex, float InThumbnailSize);
 	void UpdateThumbnailMaterial(TEnumAsByte<EMaterialParameterAssociation> InAssociation, int32 InIndex, bool bAlterBlendIndex = false);
+	FReply OnThumbnailDoubleClick(const FGeometry& Geometry, const FPointerEvent& MouseEvent, EMaterialParameterAssociation InAssociation, int32 InIndex);
 protected:
 
 	void ShowSubParameters(TSharedPtr<FStackSortedData> ParentParameter);
@@ -103,6 +176,8 @@ private:
 
 	TSharedPtr<class IPropertyRowGenerator> Generator;
 
+	bool bLayerIsolated;
+
 };
 
 class UMaterialEditorPreviewParameters;
diff --git a/Engine/Source/Editor/MaterialEditor/Public/IMaterialEditor.h b/Engine/Source/Editor/MaterialEditor/Public/IMaterialEditor.h
index 53dd666ff6f5..c8b3eb38796f 100644
--- a/Engine/Source/Editor/MaterialEditor/Public/IMaterialEditor.h
+++ b/Engine/Source/Editor/MaterialEditor/Public/IMaterialEditor.h
@@ -117,6 +117,9 @@ public:
 	DECLARE_EVENT(IMaterialEditorModule, FMaterialEditorClosedEvent);
 	virtual FMaterialEditorClosedEvent& OnMaterialEditorClosed() { return MaterialEditorClosedEvent; };
 
+	/** call this to notify the editor that the edited material changed from outside */
+	virtual void NotifyExternalMaterialChange() {}
+
 private:
 	FMaterialEditorClosedEvent MaterialEditorClosedEvent;
 	FRegisterTabSpawnersEvent RegisterTabSpawnersEvent;
diff --git a/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorActions.h b/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorActions.h
index e356165ff505..32622dd98f1a 100644
--- a/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorActions.h
+++ b/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorActions.h
@@ -96,8 +96,8 @@ public:
 	/** Toggles the material stats on the canvas pane */
 	TSharedPtr< FUICommandInfo > ToggleMaterialStats;
 
-	/** Shows material stats and errors when compiled for mobile. */
-	TSharedPtr< FUICommandInfo > ToggleMobileStats;
+	/** Shows material stats and errors for multiple shader platforms. */
+	TSharedPtr< FUICommandInfo > TogglePlatformStats;
 	
 	/** Creates a new comment node */
 	TSharedPtr< FUICommandInfo > NewComment;
diff --git a/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorSettings.h b/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorSettings.h
new file mode 100644
index 000000000000..31b8c2e10ee7
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Public/MaterialEditorSettings.h
@@ -0,0 +1,20 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/EngineTypes.h"
+#include "MaterialEditorSettings.generated.h"
+
+UCLASS(config = EditorPerProjectUserSettings)
+class MATERIALEDITOR_API UMaterialEditorSettings : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	/**
+	Path to user installed Mali shader compiler that can be used by the material editor to compile and extract shader informations for Android platforms.
+	Official website address: https://developer.arm.com/products/software-development-tools/graphics-development-tools/mali-offline-compiler/downloads
+	*/
+	UPROPERTY(config, EditAnywhere, Category = "Offline Shader Compilers", meta = (DisplayName = "Mali Offline Compiler"))
+	FFilePath MaliOfflineCompilerPath;
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/MaterialEditor/Public/MaterialPropertyHelpers.h b/Engine/Source/Editor/MaterialEditor/Public/MaterialPropertyHelpers.h
index b7431d086f2d..c48085e73aa4 100644
--- a/Engine/Source/Editor/MaterialEditor/Public/MaterialPropertyHelpers.h
+++ b/Engine/Source/Editor/MaterialEditor/Public/MaterialPropertyHelpers.h
@@ -9,8 +9,10 @@
 #include "Input/Reply.h"
 #include "Widgets/Layout/SSplitter.h"
 #include "MaterialEditor/MaterialEditorInstanceConstant.h"
+#include "DragAndDrop/DecoratedDragDropOp.h"
 #include "MaterialPropertyHelpers.generated.h"
 
+
 struct FAssetData;
 class IDetailGroup;
 class IDetailLayoutBuilder;
@@ -18,6 +20,7 @@ class IPropertyHandle;
 class UMaterialEditorInstanceConstant;
 enum class ECheckBoxState : uint8;
 class UMaterialInterface;
+class SMaterialLayersFunctionsInstanceTreeItem;
 
 DECLARE_DELEGATE_OneParam(FGetShowHiddenParameters, bool&);
 
@@ -73,6 +76,66 @@ struct FMaterialTreeColumnSizeData
 	void SetColumnWidth(float InWidth) { OnWidthChanged.ExecuteIfBound(InWidth); }
 };
 
+class SLayerHandle : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SLayerHandle)
+	{}
+	SLATE_DEFAULT_SLOT(FArguments, Content)
+		SLATE_ARGUMENT(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem>, OwningStack)
+		SLATE_END_ARGS()
+
+		void Construct(const FArguments& InArgs);
+
+	FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled().DetectDrag(SharedThis(this), EKeys::LeftMouseButton);
+	};
+
+
+	FReply OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	TSharedPtr<class FLayerDragDropOp> CreateDragDropOperation(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> InOwningStack);
+
+private:
+	TWeakPtr<SMaterialLayersFunctionsInstanceTreeItem> OwningStack;
+};
+
+
+class FLayerDragDropOp : public FDecoratedDragDropOp
+{
+public:
+	DRAG_DROP_OPERATOR_TYPE(FLayerDragDropOp, FDecoratedDragDropOp)
+
+	FLayerDragDropOp(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> InOwningStack)
+	{
+		OwningStack = InOwningStack;
+		DecoratorWidget = SNew(SBorder)
+			.BorderImage(FEditorStyle::GetBrush("Graph.ConnectorFeedback.Border"))
+			.Content()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(NSLOCTEXT("LayerDragDrop", "PlaceLayerHere", "Place Layer and Blend Here"))
+				]
+			];
+
+		Construct();
+	};
+
+	TSharedPtr<SWidget> DecoratorWidget;
+
+	virtual TSharedPtr<SWidget> GetDefaultDecorator() const override
+	{
+		return DecoratorWidget;
+	}
+
+	TWeakPtr<class SMaterialLayersFunctionsInstanceTreeItem> OwningStack;
+};
+
 /*-----------------------------------------------------------------------------
    FMaterialInstanceBaseParameterDetails
 -----------------------------------------------------------------------------*/
@@ -110,7 +173,7 @@ public:
 	static FReply OnClickedSaveNewMaterialInstance(class UMaterialInterface* Object, UObject* EditorObject);
 
 	static void CopyMaterialToInstance(class UMaterialInstanceConstant* ChildInstance, TArray<struct FEditorParameterGroup> &ParameterGroups);
-	static void TransitionAndCopyParameters(class UMaterialInstanceConstant* ChildInstance, TArray<struct FEditorParameterGroup> &ParameterGroups);
+	static void TransitionAndCopyParameters(class UMaterialInstanceConstant* ChildInstance, TArray<struct FEditorParameterGroup> &ParameterGroups, bool bForceCopy = false);
 	static FReply OnClickedSaveNewFunctionInstance(class UMaterialFunctionInterface* Object, class UMaterialInterface* PreviewMaterial, UObject* EditorObject);
 	static FReply OnClickedSaveNewLayerInstance(class UMaterialFunctionInterface* Object, TSharedPtr<FStackSortedData> InSortedData);
 
@@ -119,7 +182,6 @@ public:
 	static void SetVectorChannelMaskValue(const FString& StringValue, TSharedPtr<IPropertyHandle> PropertyHandle, class UDEditorParameterValue* InParameter, UObject* MaterialEditorInstance);
 
 	static TArray<class UFactory*> GetAssetFactories(EMaterialParameterAssociation AssetType);
-
 	/**
 	*  Returns group for parameter. Creates one if needed.
 	*
@@ -127,6 +189,13 @@ public:
 	*/
 	static FEditorParameterGroup&  GetParameterGroup(class UMaterial* InMaterial, FName& ParameterGroup, TArray<struct FEditorParameterGroup>& ParameterGroups);
 
+	static TSharedRef<SWidget> MakeStackReorderHandle(TSharedPtr<SMaterialLayersFunctionsInstanceTreeItem> InOwningStack);
+
+	static bool OnShouldSetCurveAsset(const FAssetData& AssetData, TSoftObjectPtr<class UCurveLinearColorAtlas> InAtlas);
+	static void SetPositionFromCurveAsset(const FAssetData& AssetData, TSoftObjectPtr<class UCurveLinearColorAtlas> InAtlas, class UDEditorScalarParameterValue* InParameter, TSharedPtr<IPropertyHandle> PropertyHandle, UObject* MaterialEditorInstance);
+
+	static void ResetCurveToDefault(TSharedPtr<IPropertyHandle> PropertyHandle, class UDEditorParameterValue* Parameter, UMaterialEditorInstanceConstant* MaterialEditorInstance);
+
 	static FText LayerID;
 	static FText BlendID;
 	static FName LayerParamName;
diff --git a/Engine/Source/Editor/MaterialEditor/Public/MaterialStatsCommon.h b/Engine/Source/Editor/MaterialEditor/Public/MaterialStatsCommon.h
new file mode 100644
index 000000000000..ce1c624edd56
--- /dev/null
+++ b/Engine/Source/Editor/MaterialEditor/Public/MaterialStatsCommon.h
@@ -0,0 +1,114 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "SceneTypes.h"
+#include "RHIDefinitions.h"
+#include "MaterialShared.h"
+
+/** custom resource material class used to mark the resource as used for shader stats extraction */
+class MATERIALEDITOR_API FMaterialResourceStats : public FMaterialResource
+{
+public:
+	FMaterialResourceStats() {}
+	virtual ~FMaterialResourceStats() {}
+
+	FORCEINLINE UMaterial* GetMaterial()
+	{
+		return Material;
+	}
+
+	/** this will enable shader source extraction and pass paths to (eventual) offline shader compilers */
+	virtual void SetupExtaCompilationSettings(const EShaderPlatform Platform, FExtraShaderCompilerSettings& Settings) const override;
+};
+
+/** enumeration used to group shader platforms */
+enum class EPlatformCategoryType : int32
+{
+	Desktop,
+	Android,
+	IOS,
+
+	Num
+};
+
+/** enumeration containing the "types" of used shaders to display statistics  */
+enum class ERepresentativeShader
+{
+	FirstFragmentShader,
+	StationarySurface = FirstFragmentShader,
+	StationarySurfaceCSM,
+	StationarySurface1PointLight,
+	StationarySurfaceNPointLights,
+	DynamicallyLitObject,
+	UIDefaultFragmentShader,
+	LastFragmentShader = UIDefaultFragmentShader,
+
+	FirstVertexShader,
+	StaticMesh = FirstVertexShader,
+	SkeletalMesh,
+
+	UIDefaultVertexShader,
+	UIInstancedVertexShader,
+	LastVertexShader = UIInstancedVertexShader,
+
+	Num
+};
+
+/** class used for various stats utilities */
+class FMaterialStatsUtils
+{
+public:
+	struct MATERIALEDITOR_API FShaderInstructionsInfo
+	{
+		ERepresentativeShader ShaderType;
+		FString ShaderDescription;
+		int32 InstructionCount;
+	};
+
+	struct MATERIALEDITOR_API FRepresentativeShaderInfo
+	{
+		ERepresentativeShader ShaderType;
+		FName ShaderName;
+		FString ShaderDescription;
+
+		FRepresentativeShaderInfo(const ERepresentativeShader _ShaderType, const FName _ShaderName, const FString& _StrDescription) :
+			ShaderType(_ShaderType), ShaderName(_ShaderName), ShaderDescription(_StrDescription)
+		{}
+	};
+
+	static const FLinearColor BlueColor;
+	static const FLinearColor YellowColor;
+	static const FLinearColor GreenColor;
+	static const FLinearColor OrangeColor;
+	static const FLinearColor DefaultGridTextColor;
+
+public:
+	/** call this to create an instance to FMaterialStats */
+	static TSharedPtr<class FMaterialStats> CreateMaterialStats(class IMaterialEditor* MaterialEditor);
+
+	/** utility functions that translate various enum values to strings */
+	static FString MaterialQualityToString(const EMaterialQualityLevel::Type Quality);
+	static FString MaterialQualityToShortString(const EMaterialQualityLevel::Type Quality);
+	static EMaterialQualityLevel::Type StringToMaterialQuality(const FString& StrQuality);
+
+	static FString GetPlatformTypeName(const EPlatformCategoryType InEnumValue);
+	static FString ShaderPlatformTypeName(const EShaderPlatform PlatformID);
+
+	/**
+	* Gets instruction counts that best represent the likely usage of this material based on shading model and other factors.
+	* @param Results - an array of descriptions to be populated
+	*/
+	static void GetRepresentativeInstructionCounts(TArray<FShaderInstructionsInfo>& Results, const class FMaterialResource* Target);
+
+	MATERIALEDITOR_API static void GetRepresentativeShaderTypesAndDescriptions(TMap<FName, TArray<FRepresentativeShaderInfo>>& OutShaderTypeNameAndDescriptions, const class FMaterial* TargetMaterial);
+	MATERIALEDITOR_API static void ExtractMatertialStatsInfo(struct FShaderStatsInfo& OutInfo, const FMaterialResource* Target);
+
+	static FString RepresentativeShaderTypeToString(const ERepresentativeShader ShaderType);
+
+	static FLinearColor QualitySettingColor(const EMaterialQualityLevel::Type QualityType);
+	static FLinearColor PlatformTypeColor(EPlatformCategoryType PlatformType);
+
+	MATERIALEDITOR_API static bool IsPlatformOfflineCompilerAvailable(const EShaderPlatform ShaderPlatform);
+	MATERIALEDITOR_API static FString GetPlatformOfflineCompilerPath(const EShaderPlatform ShaderPlatform);
+	MATERIALEDITOR_API static bool PlatformNeedsOfflineCompiler(const EShaderPlatform ShaderPlatform);
+};
diff --git a/Engine/Source/Editor/MeshPaintMode/Private/PaintModeSettings.h b/Engine/Source/Editor/MeshPaintMode/Private/PaintModeSettings.h
index 95cc9a12f00d..b382131781c1 100644
--- a/Engine/Source/Editor/MeshPaintMode/Private/PaintModeSettings.h
+++ b/Engine/Source/Editor/MeshPaintMode/Private/PaintModeSettings.h
@@ -49,7 +49,9 @@ public:
 		bWriteAlpha(false),
 		TextureWeightType(ETextureWeightTypes::AlphaLerp),
 		PaintTextureWeightIndex(ETexturePaintIndex::TextureOne),
-		EraseTextureWeightIndex(ETexturePaintIndex::TextureTwo)	{}	
+		EraseTextureWeightIndex(ETexturePaintIndex::TextureTwo),
+		bPaintOnSpecificLOD(false),
+		LODIndex(0) {}
 
 	UPROPERTY()
 	EMeshPaintMode MeshPaintMode;
diff --git a/Engine/Source/Editor/MovieSceneCaptureDialog/Private/MovieSceneCaptureDialogModule.cpp b/Engine/Source/Editor/MovieSceneCaptureDialog/Private/MovieSceneCaptureDialogModule.cpp
index 769eed34c4f5..2ece231ec780 100644
--- a/Engine/Source/Editor/MovieSceneCaptureDialog/Private/MovieSceneCaptureDialogModule.cpp
+++ b/Engine/Source/Editor/MovieSceneCaptureDialog/Private/MovieSceneCaptureDialogModule.cpp
@@ -726,10 +726,13 @@ void FNewProcessCapture::Cancel()
 
 	// Attempt to send a remote command to gracefully terminate the process
 	ISessionServicesModule& SessionServices = FModuleManager::Get().LoadModuleChecked<ISessionServicesModule>("SessionServices");
-	TSharedRef<ISessionManager> SessionManager = SessionServices.GetSessionManager();
+	TSharedPtr<ISessionManager> SessionManager = SessionServices.GetSessionManager();
 
 	TArray<TSharedPtr<ISessionInfo>> Sessions;
-	SessionManager->GetSessions(Sessions);
+	if (SessionManager.IsValid())
+	{
+		SessionManager->GetSessions(Sessions);
+	}
 
 	for (const TSharedPtr<ISessionInfo>& Session : Sessions)
 	{
diff --git a/Engine/Source/Editor/MovieSceneTools/MovieSceneTools.Build.cs b/Engine/Source/Editor/MovieSceneTools/MovieSceneTools.Build.cs
index 13e861b2c7b9..c4a1bfdce178 100644
--- a/Engine/Source/Editor/MovieSceneTools/MovieSceneTools.Build.cs
+++ b/Engine/Source/Editor/MovieSceneTools/MovieSceneTools.Build.cs
@@ -25,7 +25,7 @@ public class MovieSceneTools : ModuleRules
 				"Engine",
                 "InputCore",
                 "MovieSceneCapture",
-                "UnrealEd",
+				"UnrealEd",
 				"Sequencer"
 			}
 		);
@@ -38,10 +38,10 @@ public class MovieSceneTools : ModuleRules
                 "DesktopPlatform",
                 "Json",
                 "JsonUtilities",
-                "LevelSequence",
+				"LevelSequence",
                 "MessageLog",
 				"MovieScene",
- 				"MovieSceneTracks",
+				"MovieSceneTracks",
 				"BlueprintGraph",
 				"KismetCompiler",
                 "GraphEditor",
@@ -56,6 +56,7 @@ public class MovieSceneTools : ModuleRules
 				"RHI",
 				"ShaderCore",
 				"SequenceRecorder",
+				"TimeManagement",
                 "AnimationCore",
 				"TimeManagement",
                 "XmlParser",
diff --git a/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceProfileSelectorModule.cpp b/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceProfileSelectorModule.cpp
index 30629693e489..b974a5e45d8b 100644
--- a/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceProfileSelectorModule.cpp
+++ b/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceProfileSelectorModule.cpp
@@ -57,6 +57,7 @@ void FPIEPreviewDeviceModule::InitPreviewDevice()
 					TMap<FString, FString> DeviceParameters;
 					DeviceParameters.Add("GPUFamily", AndroidProperties.GPUFamily);
 					DeviceParameters.Add("GLVersion", AndroidProperties.GLVersion);
+					DeviceParameters.Add("VulkanAvailable", AndroidProperties.VulkanAvailable ? "true" : "false");
 					DeviceParameters.Add("VulkanVersion", AndroidProperties.VulkanVersion);
 					DeviceParameters.Add("AndroidVersion", AndroidProperties.AndroidVersion);
 					DeviceParameters.Add("DeviceMake", AndroidProperties.DeviceMake);
diff --git a/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceSpecification.h b/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceSpecification.h
index a79e0cc77572..c5da39a1da32 100644
--- a/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceSpecification.h
+++ b/Engine/Source/Editor/PIEPreviewDeviceProfileSelector/Private/PIEPreviewDeviceSpecification.h
@@ -82,6 +82,8 @@ public:
 	UPROPERTY()
 	FString DeviceModel;
 	UPROPERTY()
+	bool VulkanAvailable;
+	UPROPERTY()
 	bool UsingHoudini;
 
 	UPROPERTY()
diff --git a/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.cpp b/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.cpp
index 0e03516aee72..3f5132f6b103 100644
--- a/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.cpp
+++ b/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.cpp
@@ -48,6 +48,34 @@ UObject* FPackageItem::GetPackageObject() const
 	return nullptr;
 }
 
+bool FPackageItem::HasMultipleAssets() const
+{
+	bool bHasMultipleAssets = false;
+	if ( !EntryName.StartsWith(TEXT("/Temp/Untitled")) )
+	{
+		TArray<UObject*> ObjectsInPackage;
+		GetObjectsWithOuter(Package, ObjectsInPackage, false);
+		UObject* FirstObj = nullptr;
+		for (UObject* Obj : ObjectsInPackage)
+		{
+			if (Obj->IsAsset())
+			{
+				if(FirstObj == nullptr)
+				{
+					FirstObj = Obj;
+				}
+				else
+				{
+					bHasMultipleAssets = true;
+					break;
+				}
+			}
+		}
+	}
+	return bHasMultipleAssets;
+}
+
+
 bool FPackageItem::GetTypeNameAndColor(FString& OutName, FColor& OutColor) const
 {
 	// Resolve the object belonging to the package and cache.
@@ -63,14 +91,21 @@ bool FPackageItem::GetTypeNameAndColor(FString& OutName, FColor& OutColor) const
 		const TSharedPtr<IAssetTypeActions> AssetTypeActions = AssetToolsModule.Get().GetAssetTypeActionsForClass(Object->GetClass()).Pin();
 		if ( AssetTypeActions.IsValid() )
 		{
-			const FColor EngineBorderColor = AssetTypeActions->GetTypeColor();
-			OutColor = FColor(						// Copied from ContentBrowserCLR.cpp
-				127 + EngineBorderColor.R / 2,		// Desaturate the colors a bit (GB colors were too.. much)
-				127 + EngineBorderColor.G / 2,
-				127 + EngineBorderColor.B / 2, 
-				200);		// Opacity
-			OutName = AssetTypeActions->GetName().ToString();
-
+			if(HasMultipleAssets())
+			{
+				OutColor = FColor::White;
+				OutName = LOCTEXT("MultipleAssets", "Multiple Assets").ToString();
+			}
+			else
+			{
+				const FColor EngineBorderColor = AssetTypeActions->GetTypeColor();
+				OutColor = FColor(						// Copied from ContentBrowserCLR.cpp
+					127 + EngineBorderColor.R / 2,		// Desaturate the colors a bit (GB colors were too.. much)
+					127 + EngineBorderColor.G / 2,
+					127 + EngineBorderColor.B / 2, 
+					200);		// Opacity
+				OutName = AssetTypeActions->GetName().ToString();
+			}
 			return true;
 		}
 	}
diff --git a/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.h b/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.h
index d81cebf6ff83..5c0d53bbd5c7 100644
--- a/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.h
+++ b/Engine/Source/Editor/PackagesDialog/Private/SPackagesDialog.h
@@ -182,11 +182,19 @@ public:
 
 	/** 
 	 * Get the object belonging to the package, if any
-	 * 
+	 *
 	 * @return the object which is in the package, if any
 	 */
 	UObject* GetPackageObject() const;
 
+
+	/** 
+	 * Get whether the package contains multiple assets
+	 *
+	 * @return whether the package contains multiple assets
+	 */
+	bool HasMultipleAssets() const;
+
 	/**
 	 * Checks to see if the checkbox item is disabled
 	 *
diff --git a/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.cpp b/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.cpp
index 0e52634d4c65..95f8b99e37a0 100644
--- a/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.cpp
+++ b/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.cpp
@@ -107,6 +107,23 @@ FAnimationEditorPreviewScene::~FAnimationEditorPreviewScene()
 	{
 		GEditor->UnregisterForUndo(this);
 	}
+
+	UDebugSkelMeshComponent* MeshComponent = GetPreviewMeshComponent();
+	if (MeshComponent)
+	{
+		MeshComponent->SelectionOverrideDelegate.Unbind();
+	}
+}
+
+void FAnimationEditorPreviewScene::SetPreviewMeshComponent(UDebugSkelMeshComponent* InSkeletalMeshComponent) 
+{
+	SkeletalMeshComponent = InSkeletalMeshComponent; 
+
+	if(SkeletalMeshComponent)
+	{
+		SkeletalMeshComponent->SelectionOverrideDelegate = UPrimitiveComponent::FSelectionOverride::CreateRaw(this, &FAnimationEditorPreviewScene::PreviewComponentSelectionOverride);
+		SkeletalMeshComponent->PushSelectionToProxy();	
+	}
 }
 
 void FAnimationEditorPreviewScene::SetPreviewMesh(USkeletalMesh* NewPreviewMesh)
@@ -844,6 +861,8 @@ void FAnimationEditorPreviewScene::RecordAnimation()
 	{
 		PersonaModule.OnRecord().ExecuteIfBound(SkeletalMeshComponent);
 	}
+
+	OnRecordingStateChangedDelegate.Broadcast();
 }
 
 bool FAnimationEditorPreviewScene::IsRecording() const
@@ -859,6 +878,8 @@ void FAnimationEditorPreviewScene::StopRecording()
 {
 	FPersonaModule& PersonaModule = FModuleManager::GetModuleChecked<FPersonaModule>("Persona");
 	PersonaModule.OnStopRecording().ExecuteIfBound(SkeletalMeshComponent);
+
+	OnRecordingStateChangedDelegate.Broadcast();
 }
 
 UAnimSequence* FAnimationEditorPreviewScene::GetCurrentRecording() const
@@ -877,6 +898,17 @@ float FAnimationEditorPreviewScene::GetCurrentRecordingTime() const
 	return RecordingTime;
 }
 
+bool FAnimationEditorPreviewScene::PreviewComponentSelectionOverride(const UPrimitiveComponent* InComponent) const
+{
+	if (InComponent == GetPreviewMeshComponent())
+	{
+		const USkeletalMeshComponent* Component = CastChecked<USkeletalMeshComponent>(InComponent);
+		return (Component->GetSelectedEditorSection() != INDEX_NONE || Component->GetSelectedEditorMaterial() != INDEX_NONE);
+	}
+
+	return false;
+}
+
 TWeakObjectPtr<AWindDirectionalSource> FAnimationEditorPreviewScene::CreateWindActor(UWorld* World)
 {
 	TWeakObjectPtr<AWindDirectionalSource> Wind = World->SpawnActor<AWindDirectionalSource>(PrevWindLocation, PrevWindRotation);
diff --git a/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.h b/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.h
index da81bbaba043..9e481a4ebda7 100644
--- a/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.h
+++ b/Engine/Source/Editor/Persona/Private/AnimationEditorPreviewScene.h
@@ -31,7 +31,7 @@ public:
 	virtual void InvalidateViews() override;
 	virtual void FocusViews() override;
 	virtual UDebugSkelMeshComponent* GetPreviewMeshComponent() const override { return SkeletalMeshComponent; }
-	virtual void SetPreviewMeshComponent(UDebugSkelMeshComponent* InSkeletalMeshComponent) override { SkeletalMeshComponent = InSkeletalMeshComponent; }
+	virtual void SetPreviewMeshComponent(UDebugSkelMeshComponent* InSkeletalMeshComponent) override;
 	virtual void SetAdditionalMeshes(class UDataAsset* InAdditionalMeshes) override;
 	virtual void RefreshAdditionalMeshes() override;
 	virtual void ShowReferencePose(bool bShowRefPose, bool bResetBoneTransforms = false) override;
@@ -267,6 +267,9 @@ public:
 	/** Stop recording in this Persona instance */
 	void StopRecording();
 
+	/** Delegate fired when recording state changes */
+	FSimpleMulticastDelegate& OnRecordingStateChanged() { return OnRecordingStateChangedDelegate; }
+
 	/** Get the currently recording animation */
 	UAnimSequence* GetCurrentRecording() const;
 
@@ -286,6 +289,9 @@ public:
 	virtual bool BroadcastMeshClick(HActor* HitProxy, const FViewportClick& Click) {
 		OnMeshClick.Broadcast(HitProxy, Click); return OnMeshClick.IsBound(); }
 
+	/** Override for preview component selection to inform the editor we consider it selected */
+	bool PreviewComponentSelectionOverride(const UPrimitiveComponent* InComponent) const;
+
 private:
 	/** Set preview mesh internal use only. The mesh should be verified by now. */
 	void SetPreviewMeshInternal(USkeletalMesh* NewPreviewMesh);
@@ -392,6 +398,9 @@ private:
 	FSimpleMulticastDelegate OnPreTickDelegate;
 	FSimpleMulticastDelegate OnPostTickDelegate;
 
+	/** Delegate fired when recording state changes */
+	FSimpleMulticastDelegate OnRecordingStateChangedDelegate;
+
 	/** The last time we were flagged for ticking */
 	double LastTickTime;
 	/** Bone selection changed delegate */
diff --git a/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.cpp b/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.cpp
index 74e327bf1cfd..7e1110180286 100644
--- a/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.cpp
+++ b/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.cpp
@@ -148,10 +148,6 @@ FAnimationViewportClient::FAnimationViewportClient(const TSharedRef<IPersonaPrev
 	InPreviewScene->RegisterOnPreTick(FSimpleDelegate::CreateRaw(this, &FAnimationViewportClient::HandlePreviewScenePreTick));
 	InPreviewScene->RegisterOnPostTick(FSimpleDelegate::CreateRaw(this, &FAnimationViewportClient::HandlePreviewScenePostTick));
 
-	UDebugSkelMeshComponent* MeshComponent = InPreviewScene->GetPreviewMeshComponent();
-	MeshComponent->SelectionOverrideDelegate = UPrimitiveComponent::FSelectionOverride::CreateRaw(this, &FAnimationViewportClient::PreviewComponentSelectionOverride);
-	MeshComponent->PushSelectionToProxy();
-
 	// Register delegate to update the show flags when the post processing is turned on or off
 	UAssetViewerSettings::Get()->OnAssetViewerSettingsChanged().AddRaw(this, &FAnimationViewportClient::OnAssetViewerSettingsChanged);
 	// Set correct flags according to current profile settings
@@ -166,12 +162,6 @@ FAnimationViewportClient::~FAnimationViewportClient()
 	{
 		TSharedPtr<IPersonaPreviewScene> ScenePtr = PreviewScenePtr.Pin();
 
-		UDebugSkelMeshComponent* MeshComponent = ScenePtr->GetPreviewMeshComponent();
-		if (MeshComponent)
-		{
-			MeshComponent->SelectionOverrideDelegate.Unbind();
-		}
-
 		ScenePtr->UnregisterOnPreviewMeshChanged(this);
 		ScenePtr->UnregisterOnInvalidateViews(this);
 		ScenePtr->UnregisterOnCameraOverrideChanged(this);
@@ -1549,17 +1539,6 @@ void FAnimationViewportClient::GetAllVertexIndicesUsedInSection(const FRawStatic
 	}
 }
 
-bool FAnimationViewportClient::PreviewComponentSelectionOverride(const UPrimitiveComponent* InComponent) const
-{
-	if (InComponent == GetPreviewScene()->GetPreviewMeshComponent())
-	{
-		const USkeletalMeshComponent* Component = CastChecked<USkeletalMeshComponent>(InComponent);
-		return (Component->GetSelectedEditorSection() != INDEX_NONE || Component->GetSelectedEditorMaterial() != INDEX_NONE);
-	}
-
-	return false;
-}
-
 FBox FAnimationViewportClient::ComputeBoundingBoxForSelectedEditorSection() const
 {
 	UDebugSkelMeshComponent* const PreviewMeshComponent = GetAnimPreviewScene()->GetPreviewMeshComponent();
diff --git a/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.h b/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.h
index 8d387774db0b..cd08a8d12ef1 100644
--- a/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.h
+++ b/Engine/Source/Editor/Persona/Private/AnimationEditorViewportClient.h
@@ -442,9 +442,6 @@ private:
 										  const FSkelMeshRenderSection& SkelMeshSection,
 										  TArray<int32>& OutIndices) const;
 
-	/** Override for preview component selection to inform the editor we consider it selected */
-	bool PreviewComponentSelectionOverride(const UPrimitiveComponent* InComponent) const;
-
 	/** Used for camera tracking - store data about the scene pre-tick */
 	void HandlePreviewScenePreTick();
 
diff --git a/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.cpp b/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.cpp
index 0153cdac97c5..bcf3fb2eefb2 100644
--- a/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.cpp
+++ b/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.cpp
@@ -42,6 +42,7 @@
 #include "Rendering/SkeletalMeshModel.h"
 #include "IContentBrowserSingleton.h"
 #include "ContentBrowserModule.h"
+#include "EditorFramework/AssetImportData.h"
 
 #if WITH_APEX_CLOTHING
 	#include "ApexClothingUtils.h"
@@ -76,6 +77,15 @@
 
 #define LOCTEXT_NAMESPACE "PersonaMeshDetails"
 
+/*
+* Custom data key
+*/
+enum SK_CustomDataKey
+{
+	CustomDataKey_LODVisibilityState = 0, //This is the key to know if a LOD is shown in custom mode. Do CustomDataKey_LODVisibilityState + LodIndex for a specific LOD
+	CustomDataKey_LODEditMode = 100 //This is the key to know the state of the custom lod edit mode.
+};
+
 namespace PersonaMeshDetailsConstants
 {
 	/** Number to extend the num lods slider beyond the currently existing number of lods in the mesh */
@@ -129,7 +139,7 @@ private:
 			{
 				FSkeletalMeshLODInfo& LODInfo = *(SkelMesh->GetLODInfo(LODIndex));
 
-				bDoesSourceFileExist_Cached = !LODInfo.SourceImportFilename.IsEmpty() && FPaths::FileExists(LODInfo.SourceImportFilename);
+				bDoesSourceFileExist_Cached = !LODInfo.SourceImportFilename.IsEmpty() && FPaths::FileExists(UAssetImportData::ResolveImportFilename(LODInfo.SourceImportFilename, nullptr));
 			}
 		}
 		return EActiveTimerReturnType::Continue;
@@ -796,8 +806,6 @@ void FPersonaMeshDetails::AddLODLevelCategories(IDetailLayoutBuilder& DetailLayo
 			.OnCheckStateChanged(this, &FPersonaMeshDetails::SetLODCustomModeCheck, (int32)INDEX_NONE)
 			.ToolTipText(LOCTEXT("LODCustomModeFirstRowTooltip", "Custom Mode allow editing multiple LOD in same time."))
 		];
-		//Set the custom mode to false
-		CustomLODEditMode = false;
 
 		LodCategories.Empty(SkelMeshLODCount);
 		DetailDisplayLODs.Reset();
@@ -866,7 +874,8 @@ void FPersonaMeshDetails::AddLODLevelCategories(IDetailLayoutBuilder& DetailLayo
 				SectionListDelegates.OnPasteSectionItem.BindSP(this, &FPersonaMeshDetails::OnPasteSectionItem);
 				SectionListDelegates.OnEnableSectionItem.BindSP(this, &FPersonaMeshDetails::OnSectionEnabledChanged);
 
-				LODCategory.AddCustomBuilder(MakeShareable(new FSectionList(LODCategory.GetParentLayout(), SectionListDelegates, false, 64, LODIndex)));
+				FName SkeletalMeshSectionListName = FName(*(FString(TEXT("SkeletalMeshSectionListNameLOD_")) + FString::FromInt(LODIndex)));
+				LODCategory.AddCustomBuilder(MakeShareable(new FSectionList(LODCategory.GetParentLayout(), SectionListDelegates, false, 64, LODIndex, SkeletalMeshSectionListName)));
 
 				GetPersonaToolkit()->GetPreviewScene()->RegisterOnSelectedLODChanged(FOnSelectedLODChanged::CreateSP(this, &FPersonaMeshDetails::UpdateLODCategoryVisibility));
 			}
@@ -998,6 +1007,35 @@ void FPersonaMeshDetails::AddLODLevelCategories(IDetailLayoutBuilder& DetailLayo
 			LODCustomModeCategory.SetCategoryVisibility(true);
 			LODCustomModeCategory.SetShowAdvanced(false);
 		}
+
+		//Restore the state of the custom check LOD
+		for (int32 DetailLODIndex = 0; DetailLODIndex < SkelMeshLODCount; ++DetailLODIndex)
+		{
+			int32 LodCheckValue = GetPersonaToolkit()->GetCustomData(CustomDataKey_LODVisibilityState + DetailLODIndex);
+			if (LodCheckValue != INDEX_NONE && DetailDisplayLODs.IsValidIndex(DetailLODIndex))
+			{
+				DetailDisplayLODs[DetailLODIndex] = LodCheckValue > 0;
+			}
+		}
+
+		//Restore the state of the custom LOD mode if its true (greater then 0)
+		bool bCustomLodEditMode = GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0;
+		if (bCustomLodEditMode)
+		{
+			for (int32 DetailLODIndex = 0; DetailLODIndex < SkelMeshLODCount; ++DetailLODIndex)
+			{
+				if (!LodCategories.IsValidIndex(DetailLODIndex))
+				{
+					break;
+				}
+				LodCategories[DetailLODIndex]->SetCategoryVisibility(DetailDisplayLODs[DetailLODIndex]);
+			}
+		}
+
+		if (LodCustomCategory != nullptr)
+		{
+			LodCustomCategory->SetShowAdvanced(bCustomLodEditMode);
+		}
 	}
 }
 
@@ -1025,7 +1063,7 @@ ECheckBoxState FPersonaMeshDetails::IsLODCustomModeCheck(int32 LODIndex) const
 	}
 	if (LODIndex == INDEX_NONE)
 	{
-		return CustomLODEditMode ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+		return (GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0) ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
 	}
 	return DetailDisplayLODs[LODIndex] ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
 }
@@ -1041,7 +1079,7 @@ void FPersonaMeshDetails::SetLODCustomModeCheck(ECheckBoxState NewState, int32 L
 	{
 		if (NewState == ECheckBoxState::Unchecked)
 		{
-			CustomLODEditMode = false;
+			GetPersonaToolkit()->SetCustomData(CustomDataKey_LODEditMode, 0);
 			SetCurrentLOD(CurrentLodIndex);
 			for (int32 DetailLODIndex = 0; DetailLODIndex < LODCount; ++DetailLODIndex)
 			{
@@ -1054,16 +1092,17 @@ void FPersonaMeshDetails::SetLODCustomModeCheck(ECheckBoxState NewState, int32 L
 		}
 		else
 		{
-			CustomLODEditMode = true;
+			GetPersonaToolkit()->SetCustomData(CustomDataKey_LODEditMode, 1);
 			SetCurrentLOD(0);
 		}
 	}
-	else if (CustomLODEditMode)
+	else if ((GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0))
 	{
 		DetailDisplayLODs[LODIndex] = NewState == ECheckBoxState::Checked;
+		GetPersonaToolkit()->SetCustomData(CustomDataKey_LODVisibilityState + LODIndex, DetailDisplayLODs[LODIndex] ? 1 : 0);
 	}
 
-	if (CustomLODEditMode)
+	if ((GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0))
 	{
 		for (int32 DetailLODIndex = 0; DetailLODIndex < LODCount; ++DetailLODIndex)
 		{
@@ -1077,7 +1116,7 @@ void FPersonaMeshDetails::SetLODCustomModeCheck(ECheckBoxState NewState, int32 L
 
 	if (LodCustomCategory != nullptr)
 	{
-		LodCustomCategory->SetShowAdvanced(CustomLODEditMode);
+		LodCustomCategory->SetShowAdvanced((GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0));
 	}
 }
 
@@ -1088,7 +1127,7 @@ bool FPersonaMeshDetails::IsLODCustomModeEnable(int32 LODIndex) const
 		// Custom checkbox is always enable
 		return true;
 	}
-	return CustomLODEditMode;
+	return (GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0);
 }
 
 TOptional<int32> FPersonaMeshDetails::GetLodSliderMaxValue() const
@@ -2449,7 +2488,7 @@ void FPersonaMeshDetails::SetCurrentLOD(int32 NewLodIndex)
 
 void FPersonaMeshDetails::UpdateLODCategoryVisibility() const
 {
-	if (CustomLODEditMode == true)
+	if (GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		//Do not change the Category visibility if we are in custom mode
 		return;
@@ -2513,7 +2552,7 @@ TSharedRef<SWidget> FPersonaMeshDetails::OnGenerateLodComboBoxForLodPicker()
 EVisibility FPersonaMeshDetails::LodComboBoxVisibilityForLodPicker() const
 {
 	//No combo box when in Custom mode
-	if (CustomLODEditMode == true)
+	if (GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		return EVisibility::Hidden;
 	}
@@ -2523,7 +2562,7 @@ EVisibility FPersonaMeshDetails::LodComboBoxVisibilityForLodPicker() const
 bool FPersonaMeshDetails::IsLodComboBoxEnabledForLodPicker() const
 {
 	//No combo box when in Custom mode
-	return !CustomLODEditMode;
+	return !(GetPersonaToolkit()->GetCustomData(CustomDataKey_LODEditMode) > 0);
 }
 
 TSharedRef<SWidget> FPersonaMeshDetails::OnGenerateLodMenuForLodPicker()
diff --git a/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.h b/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.h
index d1a56a96f8c5..8c3ca027075b 100644
--- a/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.h
+++ b/Engine/Source/Editor/Persona/Private/PersonaMeshDetails.h
@@ -48,7 +48,7 @@ struct FClothAssetSubmeshIndex
 struct FClothingComboInfo
 {
 	/* Per-material clothing combo boxes, array size must be same to # of sections */
-	TArray<TSharedPtr< STextComboBox >>		ClothingComboBoxes;
+	TArray<TSharedPtr< class STextComboBox >>		ClothingComboBoxes;
 	/* Clothing combo box strings */
 	TArray<TSharedPtr<FString> >			ClothingComboStrings;
 	/* Mapping from a combo box string to the asset and submesh it was generated from */
diff --git a/Engine/Source/Editor/Persona/Private/PersonaToolkit.cpp b/Engine/Source/Editor/Persona/Private/PersonaToolkit.cpp
index 8ca3c2719302..8ee9d3364f93 100644
--- a/Engine/Source/Editor/Persona/Private/PersonaToolkit.cpp
+++ b/Engine/Source/Editor/Persona/Private/PersonaToolkit.cpp
@@ -340,6 +340,20 @@ void FPersonaToolkit::SetPreviewMesh(class USkeletalMesh* InSkeletalMesh, bool b
 	}
 }
 
+int32 FPersonaToolkit::GetCustomData(const int32 Key) const
+{
+	if (!CustomEditorData.Contains(Key))
+	{
+		return INDEX_NONE;
+	}
+	return CustomEditorData[Key];
+}
+
+void FPersonaToolkit::SetCustomData(const int32 Key, const int32 CustomData)
+{
+	CustomEditorData.FindOrAdd(Key) = CustomData;
+}
+
 FName FPersonaToolkit::GetContext() const
 {
 	if (InitialAssetClass != nullptr)
diff --git a/Engine/Source/Editor/Persona/Private/PersonaToolkit.h b/Engine/Source/Editor/Persona/Private/PersonaToolkit.h
index 41eba7b34826..d5a4a4d06c7a 100644
--- a/Engine/Source/Editor/Persona/Private/PersonaToolkit.h
+++ b/Engine/Source/Editor/Persona/Private/PersonaToolkit.h
@@ -43,6 +43,8 @@ public:
 	virtual class TSharedRef<IPersonaPreviewScene> GetPreviewScene() const override;
 	virtual class USkeletalMesh* GetPreviewMesh() const override;
 	virtual void SetPreviewMesh(class USkeletalMesh* InSkeletalMesh, bool bSetPreviewMeshInAsset = true) override;
+	virtual int32 GetCustomData(const int32 Key) const override;
+	virtual void SetCustomData(const int32 Key, const int32 CustomData) override;
 	virtual FName GetContext() const override;
 
 private:
@@ -67,6 +69,9 @@ private:
 	/** The generic asset we are editing */
 	UObject* Asset;
 
+	/** Allow custom data for this editor */
+	TMap<int32, int32> CustomEditorData;
+
 	/** Preview scene for the editor */
 	TSharedPtr<FAnimationEditorPreviewScene> PreviewScene;
 
diff --git a/Engine/Source/Editor/Persona/Private/SAnimCurvePanel.cpp b/Engine/Source/Editor/Persona/Private/SAnimCurvePanel.cpp
index e4276b544906..86b54d4f75b1 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimCurvePanel.cpp
+++ b/Engine/Source/Editor/Persona/Private/SAnimCurvePanel.cpp
@@ -901,10 +901,8 @@ void SAnimCurvePanel::UpdatePanel()
 
 			const bool bEditable = Curve.GetCurveTypeFlag(AACF_Editable);
 			const bool bConstant = Curve.GetCurveTypeFlag(AACF_Metadata);
-			FName CurveName;
-
 			// if editable, add to the list
-			if(bEditable && NameMapping->GetName(Curve.Name.UID, CurveName))
+			if(bEditable)
 			{
 				const bool bIsExpanded = ExpandedState.Contains(Curve.Name.UID) ? ExpandedState.FindChecked(Curve.Name.UID) : false;
 
diff --git a/Engine/Source/Editor/Persona/Private/SAnimCurveViewer.cpp b/Engine/Source/Editor/Persona/Private/SAnimCurveViewer.cpp
index bc4be1516e2b..dcd422591e59 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimCurveViewer.cpp
+++ b/Engine/Source/Editor/Persona/Private/SAnimCurveViewer.cpp
@@ -1046,7 +1046,7 @@ void SAnimCurveViewer::OnNameCommitted(const FText& InNewName, ETextCommit::Type
 		{
 			// Do nothing if trying to rename to existing name...
 		}
-		else if (!Mapping->Exists(NewName))
+		else if (NewName != NAME_None && !Mapping->Exists(NewName))
 		{
 			EditableSkeletonPtr.Pin()->RenameSmartname(ContainerName, Item->SmartName.UID, NewName);
 			// remove it, so that it can readd it. 
@@ -1056,7 +1056,7 @@ void SAnimCurveViewer::OnNameCommitted(const FText& InNewName, ETextCommit::Type
 		{
 			FFormatNamedArguments Args;
 			Args.Add(TEXT("InvalidName"), FText::FromName(NewName) );
-			FNotificationInfo Info(FText::Format(LOCTEXT("AnimCurveRenamed", "The name \"{InvalidName}\" is already used."), Args));
+			FNotificationInfo Info(FText::Format(LOCTEXT("AnimCurveRenamed", "The name \"{InvalidName}\" is invalid or already used."), Args));
 
 			Info.bUseLargeFont = false;
 			Info.ExpireDuration = 5.0f;
diff --git a/Engine/Source/Editor/Persona/Private/SAnimNotifyPanel.cpp b/Engine/Source/Editor/Persona/Private/SAnimNotifyPanel.cpp
index e95d04c67e19..0a8fac23b632 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimNotifyPanel.cpp
+++ b/Engine/Source/Editor/Persona/Private/SAnimNotifyPanel.cpp
@@ -151,13 +151,16 @@ struct FNotifyNodeInterface : public INodeObjectInterface
 {
 	FAnimNotifyEvent* NotifyEvent;
 
+	// Cached notify name (can be generated by blueprints so want to cache this instead of hitting VM) 
+	FName CachedNotifyName;
+
 	FNotifyNodeInterface(FAnimNotifyEvent* InAnimNotifyEvent) : NotifyEvent(InAnimNotifyEvent) {}
 	virtual ENodeObjectTypes::Type GetType() const override { return ENodeObjectTypes::NOTIFY; }
 	virtual FAnimNotifyEvent* GetNotifyEvent() override { return NotifyEvent; }
 	virtual int GetTrackIndex() const override{ return NotifyEvent->TrackIndex; }
 	virtual float GetTime(EAnimLinkMethod::Type ReferenceFrame = EAnimLinkMethod::Absolute) const override{ return NotifyEvent->GetTime(ReferenceFrame); }
 	virtual float GetDuration() override { return NotifyEvent->GetDuration(); }
-	virtual FName GetName() override { return NotifyEvent->NotifyName; }
+	virtual FName GetName() override { return CachedNotifyName; }
 	virtual bool IsBranchingPoint() override { return NotifyEvent->IsBranchingPoint(); }
 	virtual TOptional<FLinearColor> GetEditorColor() override 
 	{
@@ -237,11 +240,15 @@ struct FNotifyNodeInterface : public INodeObjectInterface
 	{
 		if (NotifyEvent->Notify)
 		{
-			NotifyEvent->NotifyName = FName(*NotifyEvent->Notify->GetNotifyName());
+			CachedNotifyName = FName(*NotifyEvent->Notify->GetNotifyName());
 		}
 		else if (NotifyEvent->NotifyStateClass)
 		{
-			NotifyEvent->NotifyName = FName(*NotifyEvent->NotifyStateClass->GetNotifyName());
+			CachedNotifyName = FName(*NotifyEvent->NotifyStateClass->GetNotifyName());
+		}
+		else
+		{
+			CachedNotifyName = NotifyEvent->NotifyName;
 		}
 	}
 
@@ -2571,14 +2578,9 @@ FAnimNotifyEvent& SAnimNotifyTrack::CreateNewNotify(FString NewNotifyName, UClas
 		// Set default duration to 1 frame for AnimNotifyState.
 		if( NewEvent.NotifyStateClass )
 		{
-			NewEvent.NotifyName = FName(*NewEvent.NotifyStateClass->GetNotifyName());
 			NewEvent.SetDuration(1 / 30.f);
 			NewEvent.EndLink.Link(Sequence, NewEvent.EndLink.GetTime());
 		}
-		else
-		{
-			NewEvent.NotifyName = FName(*NewEvent.Notify->GetNotifyName());
-		}
 	}
 	else
 	{
diff --git a/Engine/Source/Editor/Persona/Private/SAnimTrackCurvePanel.cpp b/Engine/Source/Editor/Persona/Private/SAnimTrackCurvePanel.cpp
index 5d73c71b1680..21788efd3571 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimTrackCurvePanel.cpp
+++ b/Engine/Source/Editor/Persona/Private/SAnimTrackCurvePanel.cpp
@@ -666,10 +666,9 @@ void SAnimTrackCurvePanel::UpdatePanel()
 			FTransformCurve&  Curve = Sequence->RawCurveData.TransformCurves[CurrentIt];
 
 			const bool bEditable = Curve.GetCurveTypeFlag(AACF_Editable);
-			FName CurveName;
 
 			// if editable, add to the list
-			if(bEditable && NameMapping->GetName(Curve.Name.UID, CurveName))
+			if(bEditable)
 			{
 				TSharedPtr<STransformCurveEdTrack> CurrentTrack;
 				PanelSlot->AddSlot()
diff --git a/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.cpp b/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.cpp
index f05bc97a4743..2a6ce9944712 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.cpp
+++ b/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.cpp
@@ -32,6 +32,8 @@
 #include "AssetViewerSettings.h"
 #include "Editor/EditorPerProjectUserSettings.h"
 #include "Materials/Material.h"
+#include "EditorFontGlyphs.h"
+#include "Toolkits/AssetEditorManager.h"
 #include "SkeletalMeshTypes.h"
 #include "IPersonaToolkit.h"
 
@@ -270,6 +272,107 @@ TSharedRef<IPinnedCommandList> SAnimationEditorViewportTabBody::GetPinnedCommand
 	return ViewportWidget->GetViewportToolbar()->GetPinnedCommandList().ToSharedRef();
 }
 
+TWeakPtr<SWidget> SAnimationEditorViewportTabBody::AddNotification(TAttribute<EMessageSeverity::Type> InSeverity, TAttribute<bool> InCanBeDismissed, const TSharedRef<SWidget>& InNotificationWidget)
+{
+	TSharedPtr<SBorder> ContainingWidget = nullptr;
+	TWeakPtr<SWidget> WeakNotificationWidget = InNotificationWidget;
+
+	auto GetPadding = [WeakNotificationWidget]()
+	{
+		if(WeakNotificationWidget.IsValid())
+		{
+			return WeakNotificationWidget.Pin()->GetVisibility() == EVisibility::Visible ? FMargin(2.0f) : FMargin(0.0f);
+		}
+
+		return FMargin(0.0f);
+	};
+
+	auto GetVisibility = [WeakNotificationWidget]()
+	{
+		if(WeakNotificationWidget.IsValid())
+		{
+			return WeakNotificationWidget.Pin()->GetVisibility();
+		}
+
+		return EVisibility::Collapsed;
+	};
+
+	auto GetBrushForSeverity = [InSeverity]()
+	{
+		switch(InSeverity.Get())
+		{
+		case EMessageSeverity::CriticalError:
+		case EMessageSeverity::Error:
+			return FEditorStyle::GetBrush("AnimViewport.Notification.Error");
+		case EMessageSeverity::PerformanceWarning:
+		case EMessageSeverity::Warning:
+			return FEditorStyle::GetBrush("AnimViewport.Notification.Warning");
+		default:
+		case EMessageSeverity::Info:
+			return FEditorStyle::GetBrush("AnimViewport.Notification.Message");
+		}
+	};
+
+	TSharedPtr<SHorizontalBox> BodyBox = nullptr;
+
+	ViewportNotificationsContainer->AddSlot()
+	.HAlign(HAlign_Right)
+	.AutoHeight()
+	.Padding(MakeAttributeLambda(GetPadding))
+	[
+		SAssignNew(ContainingWidget, SBorder)
+		.Visibility_Lambda(GetVisibility)
+		.BorderImage_Lambda(GetBrushForSeverity)
+		[
+			SAssignNew(BodyBox, SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.FillWidth(1.0f)
+			[
+				InNotificationWidget
+			]
+		]
+	];
+
+	TWeakPtr<SWidget> WeakContainingWidget = ContainingWidget;
+	auto DismissNotification = [this, WeakContainingWidget]()
+	{
+		if(WeakContainingWidget.IsValid())
+		{
+			RemoveNotification(WeakContainingWidget.Pin().ToSharedRef());
+		}
+
+		return FReply::Handled();
+	};
+
+	auto GetDismissButtonVisibility = [InCanBeDismissed]()
+	{
+		return InCanBeDismissed.Get() ? EVisibility::Visible : EVisibility::Collapsed;
+	};
+
+	// add dismiss button
+	BodyBox->InsertSlot(0)
+	.AutoWidth()
+	.HAlign(HAlign_Center)
+	.VAlign(VAlign_Top)
+	[
+		SNew(SButton)
+		.Visibility_Lambda(GetDismissButtonVisibility)
+		.ButtonStyle(FEditorStyle::Get(), "AnimViewport.Notification.CloseButton")
+		.ToolTipText(LOCTEXT("DismissNotificationToolTip", "Dismiss this notification."))
+		.OnClicked_Lambda(DismissNotification)
+	];
+
+	return ContainingWidget;
+}
+
+void SAnimationEditorViewportTabBody::RemoveNotification(const TWeakPtr<SWidget>& InContainingWidget)
+{
+	if(InContainingWidget.IsValid())
+	{
+		ViewportNotificationsContainer->RemoveSlot(InContainingWidget.Pin().ToSharedRef());
+	}
+}
+
 void SAnimationEditorViewportTabBody::RefreshViewport()
 {
 	LevelViewportClient->Invalidate();
@@ -354,17 +457,7 @@ void SAnimationEditorViewportTabBody::Construct(const FArguments& InArgs, const
 			.VAlign(VAlign_Bottom)
 			.HAlign(HAlign_Right)
 			[
-				SNew(SButton)
-				.ButtonStyle(FEditorStyle::Get(), "NoBorder")
-				.Visibility(this, &SAnimationEditorViewportTabBody::GetViewportCornerTextVisibility)
-				.OnClicked(this, &SAnimationEditorViewportTabBody::ClickedOnViewportCornerText)
-				.Content()
-				[
-					SNew(STextBlock)
-					.TextStyle(FEditorStyle::Get(), "Persona.Viewport.BlueprintDirtyText")
-					.Text(this, &SAnimationEditorViewportTabBody::GetViewportCornerText)
-					.ToolTipText(this, &SAnimationEditorViewportTabBody::GetViewportCornerTooltip)
-				]
+				SAssignNew(ViewportNotificationsContainer, SVerticalBox)
 			]
 		]
 	];
@@ -403,6 +496,10 @@ void SAnimationEditorViewportTabBody::Construct(const FArguments& InArgs, const
 	BindCommands();
 
 	PopulateNumUVChannels();
+
+	GetPreviewScene()->OnRecordingStateChanged().AddSP(this, &SAnimationEditorViewportTabBody::AddRecordingNotification);
+
+	AddPostProcessNotification();
 }
 
 void SAnimationEditorViewportTabBody::BindCommands()
@@ -964,6 +1061,8 @@ void SAnimationEditorViewportTabBody::OnToggleDisablePostProcess()
 	if(UDebugSkelMeshComponent* PreviewComponent = GetPreviewScene()->GetPreviewMeshComponent())
 	{
 		PreviewComponent->ToggleDisablePostProcessBlueprint();
+
+		AddPostProcessNotification();
 	}
 }
 
@@ -1783,90 +1882,281 @@ bool SAnimationEditorViewportTabBody::IsSectionsDisplayMode(ESectionDisplayMode
 }
 #endif // #if WITH_APEX_CLOTHING
 
-EVisibility SAnimationEditorViewportTabBody::GetViewportCornerTextVisibility() const
+void SAnimationEditorViewportTabBody::AddRecordingNotification()
 {
-	if (GetPreviewScene()->IsRecording())
+	if(WeakRecordingNotification.IsValid())
 	{
-		return EVisibility::Visible;
-	}
-	else if (BlueprintEditorPtr.IsValid() && BlueprintEditorPtr.Pin()->IsModeCurrent(FPersonaModes::AnimBlueprintEditMode))
-	{
-		if (UBlueprint* Blueprint = BlueprintEditorPtr.Pin()->GetBlueprintObj())
-		{
-			const bool bUpToDate = (Blueprint->Status == BS_UpToDate) || (Blueprint->Status == BS_UpToDateWithWarnings);
-			return bUpToDate ? EVisibility::Collapsed : EVisibility::Visible;
-		}		
+		return;
 	}
 
-	return EVisibility::Collapsed;
+	auto GetRecordingStateText = [this]()
+	{
+		if(GetPreviewScene()->IsRecording())
+		{
+			UAnimSequence* Recording = GetPreviewScene()->GetCurrentRecording();
+			const FString& Name = Recording ? Recording->GetName() : TEXT("None");
+			float TimeRecorded = GetPreviewScene()->GetCurrentRecordingTime();
+			FNumberFormattingOptions NumberOption;
+			NumberOption.MaximumFractionalDigits = 2;
+			NumberOption.MinimumFractionalDigits = 2;
+			return FText::Format(LOCTEXT("AnimRecorder", "Recording '{0}' {1} secs"),
+				FText::FromString(Name), FText::AsNumber(TimeRecorded, &NumberOption));
+		}
+
+		return FText::GetEmpty();
+	};
+
+	auto GetRecordingStateStateVisibility = [this]()
+	{
+		if (GetPreviewScene()->IsRecording())
+		{
+			return EVisibility::Visible;
+		}
+
+		return EVisibility::Collapsed;
+	};
+
+	auto StopRecording = [this]()
+	{
+		if (GetPreviewScene()->IsRecording())
+		{
+			GetPreviewScene()->StopRecording();
+		}
+
+		return FReply::Handled();
+	};
+
+	WeakRecordingNotification = AddNotification(EMessageSeverity::Info,
+		true,
+		SNew(SHorizontalBox)
+		.Visibility_Lambda(GetRecordingStateStateVisibility)
+		.ToolTipText(LOCTEXT("RecordingStatusTooltip", "Shows the status of animation recording."))
+		+SHorizontalBox::Slot()
+		.FillWidth(1.0f)
+		.Padding(2.0f, 4.0f)
+		[
+			SNew(SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+			[
+				SNew(STextBlock)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+				.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+				.Text(FEditorFontGlyphs::Video_Camera)
+			]
+			+SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1.0f)
+			[
+				SNew(STextBlock)
+				.Text_Lambda(GetRecordingStateText)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+			]
+		]
+		+SHorizontalBox::Slot()
+		.AutoWidth()
+		.Padding(2.0f, 0.0f)
+		[
+			SNew(SButton)
+			.ForegroundColor(FSlateColor::UseForeground())
+			.ButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+			.ToolTipText(LOCTEXT("RecordingInViewportStop", "Stop recording animation."))
+			.OnClicked_Lambda(StopRecording)
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+					.Text(FEditorFontGlyphs::Stop)
+				]
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Text(LOCTEXT("AnimViewportStopRecordingButtonLabel", "Stop"))
+				]
+			]
+		]
+	);
 }
 
-FText SAnimationEditorViewportTabBody::GetViewportCornerText() const
+void SAnimationEditorViewportTabBody::AddPostProcessNotification()
 {
-	if(GetPreviewScene()->IsRecording())
+	if(WeakPostProcessNotification.IsValid())
 	{
-		UAnimSequence* Recording = GetPreviewScene()->GetCurrentRecording();
-		const FString& Name = Recording ? Recording->GetName() : TEXT("None");
-		float TimeRecorded = GetPreviewScene()->GetCurrentRecordingTime();
-		FNumberFormattingOptions NumberOption;
-		NumberOption.MaximumFractionalDigits = 2;
-		NumberOption.MinimumFractionalDigits = 2;
-		return FText::Format(LOCTEXT("AnimRecorder", "Recording '{0}' [{1} sec(s)]"),
-			FText::FromString(Name), FText::AsNumber(TimeRecorded, &NumberOption));
+		return;
 	}
 
-	if (BlueprintEditorPtr.IsValid() && BlueprintEditorPtr.Pin()->IsModeCurrent(FPersonaModes::AnimBlueprintEditMode))
+	auto GetVisibility = [this]()
 	{
-		if (UBlueprint* Blueprint = BlueprintEditorPtr.Pin()->GetBlueprintObj())
+		return CanDisablePostProcess() ? EVisibility::Visible : EVisibility::Collapsed;
+	};
+
+	auto GetPostProcessGraphName = [this]()
+	{
+		if (UDebugSkelMeshComponent* PreviewComponent = GetPreviewScene()->GetPreviewMeshComponent())
 		{
-			switch (Blueprint->Status)
+			if(PreviewComponent->SkeletalMesh && PreviewComponent->SkeletalMesh->PostProcessAnimBlueprint && PreviewComponent->SkeletalMesh->PostProcessAnimBlueprint->ClassGeneratedBy)
 			{
-			case BS_UpToDate:
-			case BS_UpToDateWithWarnings:
-				// Fall thru and return empty string
-				break;
-			case BS_Dirty:
-				return LOCTEXT("AnimBP_Dirty", "Preview out of date\nClick to recompile");
-			case BS_Error:
-				return LOCTEXT("AnimBP_CompileError", "Compile Error");
-			default:
-				return LOCTEXT("AnimBP_UnknownStatus", "Unknown Status");
-			}
-		}		
-	}
-
-	return FText::GetEmpty();
-}
-
-FText SAnimationEditorViewportTabBody::GetViewportCornerTooltip() const
-{
-	if(GetPreviewScene()->IsRecording())
-	{
-		return LOCTEXT("RecordingStatusTooltip", "Shows the status of animation recording.");
-	}
-
-	if(BlueprintEditorPtr.IsValid() && BlueprintEditorPtr.Pin()->IsModeCurrent(FPersonaModes::AnimBlueprintEditMode))
-	{
-		return LOCTEXT("BlueprintStatusTooltip", "Shows the status of the animation blueprint.\nClick to recompile a dirty blueprint");
-	}
-
-	return FText::GetEmpty();
-}
-
-FReply SAnimationEditorViewportTabBody::ClickedOnViewportCornerText()
-{
-	if(BlueprintEditorPtr.IsValid())
-	{
-		if (UBlueprint* Blueprint = BlueprintEditorPtr.Pin()->GetBlueprintObj())
-		{
-			if (!Blueprint->IsUpToDate())
-			{
-				BlueprintEditorPtr.Pin()->Compile();
+				return FText::FromString(PreviewComponent->SkeletalMesh->PostProcessAnimBlueprint->ClassGeneratedBy->GetName());
 			}
 		}
-	}
 
-	return FReply::Handled();
+		return FText::GetEmpty();
+	};
+
+	auto DoesPostProcessModifyCurves = [this]()
+	{
+		if (UDebugSkelMeshComponent* PreviewComponent = GetPreviewScene()->GetPreviewMeshComponent())
+		{
+			return (PreviewComponent->PostProcessAnimInstance && PreviewComponent->PostProcessAnimInstance->HasActiveCurves());
+		}
+
+		return false;
+	};
+
+	auto GetText = [this, GetPostProcessGraphName, DoesPostProcessModifyCurves]()
+	{
+		return IsDisablePostProcessChecked() ? 
+			FText::Format(LOCTEXT("PostProcessDisabledText", "Post process Animation Blueprint '{0}' is disabled."), GetPostProcessGraphName()) : 
+			FText::Format(LOCTEXT("PostProcessRunningText", "Post process Animation Blueprint '{0}' is running. {1}"), GetPostProcessGraphName(), DoesPostProcessModifyCurves() ? LOCTEXT("PostProcessModifiesCurves", "Post process modifes curves.") : FText::GetEmpty()) ;
+	};
+
+	auto GetButtonText = [this]()
+	{
+		return IsDisablePostProcessChecked() ? LOCTEXT("PostProcessEnableText", "Enable") : LOCTEXT("PostProcessDisableText", "Disable");
+	};
+
+	auto GetButtonTooltipText = [this]()
+	{
+		return IsDisablePostProcessChecked() ? LOCTEXT("PostProcessEnableTooltip", "Enable post process animation blueprint.") : LOCTEXT("PostProcessDisableTooltip", "Disable post process animation blueprint.");
+	};
+
+	auto GetButtonIcon = [this]()
+	{
+		return IsDisablePostProcessChecked() ? FEditorFontGlyphs::Check : FEditorFontGlyphs::Times;
+	};
+
+	auto EnablePostProcess = [this]()
+	{
+		OnToggleDisablePostProcess();
+		return FReply::Handled();
+	};
+
+	auto EditPostProcess = [this]()
+	{
+		if (UDebugSkelMeshComponent* PreviewComponent = GetPreviewScene()->GetPreviewMeshComponent())
+		{
+			if(PreviewComponent->SkeletalMesh && PreviewComponent->SkeletalMesh->PostProcessAnimBlueprint)
+			{
+				FAssetEditorManager::Get().OpenEditorForAssets(TArray<UObject*>({ PreviewComponent->SkeletalMesh->PostProcessAnimBlueprint->ClassGeneratedBy }));
+			}
+		}
+
+		return FReply::Handled();
+	};
+
+	WeakPostProcessNotification = AddNotification(EMessageSeverity::Warning,
+		true,
+		SNew(SHorizontalBox)
+		.Visibility_Lambda(GetVisibility)
+		+SHorizontalBox::Slot()
+		.FillWidth(1.0f)
+		.Padding(4.0f, 4.0f)
+		[
+			SNew(SHorizontalBox)
+			.ToolTipText_Lambda(GetText)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+			[
+				SNew(STextBlock)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+				.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+				.Text(FEditorFontGlyphs::Exclamation_Triangle)
+			]
+			+SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1.0f)
+			[
+				SNew(STextBlock)
+				.Text_Lambda(GetText)
+				.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+			]
+		]
+		+SHorizontalBox::Slot()
+		.AutoWidth()
+		.Padding(2.0f, 0.0f)
+		[
+			SNew(SButton)
+			.ForegroundColor(FSlateColor::UseForeground())
+			.ButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+			.ToolTipText_Lambda(GetButtonTooltipText)
+			.OnClicked_Lambda(EnablePostProcess)
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+					.Text_Lambda(GetButtonIcon)
+				]
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Text_Lambda(GetButtonText)
+				]
+			]
+		]
+		+SHorizontalBox::Slot()
+		.AutoWidth()
+		.Padding(2.0f, 0.0f)
+		[
+			SNew(SButton)
+			.ForegroundColor(FSlateColor::UseForeground())
+			.ButtonStyle(FEditorStyle::Get(), "FlatButton")
+			.ToolTipText(LOCTEXT("EditPostProcessAnimBPButtonToolTip", "Edit the post process Animation Blueprint."))
+			.OnClicked_Lambda(EditPostProcess)
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Font(FEditorStyle::Get().GetFontStyle("FontAwesome.9"))
+					.Text(FEditorFontGlyphs::Pencil)
+				]
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.TextStyle(FEditorStyle::Get(), "AnimViewport.MessageText")
+					.Text(LOCTEXT("EditPostProcessAnimBPButtonText", "Edit"))
+				]
+			]
+		]
+	);
 }
 
 void SAnimationEditorViewportTabBody::HandleFocusCamera()
diff --git a/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.h b/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.h
index efb8eb2067ae..a5f68aaa8c65 100644
--- a/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.h
+++ b/Engine/Source/Editor/Persona/Private/SAnimationEditorViewport.h
@@ -211,7 +211,9 @@ public:
 	virtual void RestoreState(TSharedRef<IPersonaViewportState> InState) override;
 	virtual FEditorViewportClient& GetViewportClient() const override;
 	virtual TSharedRef<IPinnedCommandList> GetPinnedCommandList() const override;
-	
+	virtual TWeakPtr<SWidget> AddNotification(TAttribute<EMessageSeverity::Type> InSeverity, TAttribute<bool> InCanBeDismissed, const TSharedRef<SWidget>& InNotificationWidget) override;
+	virtual void RemoveNotification(const TWeakPtr<SWidget>& InContainingWidget) override;
+
 	/** SWidget interface */
 	virtual FReply OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent) override;
 
@@ -549,6 +551,15 @@ private:
 	/** Box that contains scrub panel */
 	TSharedPtr<SVerticalBox> ScrubPanelContainer;
 
+	/** Box that contains notifications */
+	TSharedPtr<SVerticalBox> ViewportNotificationsContainer;
+
+	/** Post process notification */
+	TWeakPtr<SWidget> WeakPostProcessNotification;
+
+	/** Recording notification */
+	TWeakPtr<SWidget> WeakRecordingNotification;
+
 	/** Current LOD selection*/
 	int32 LODSelection;
 
@@ -567,10 +578,10 @@ private:
 
 	/** Update scrub panel to reflect viewed animation asset */
 	void UpdateScrubPanel(UAnimationAsset* AnimAsset);
-private:
-	EVisibility GetViewportCornerTextVisibility() const;
-	FText GetViewportCornerText() const;
-	FText GetViewportCornerTooltip() const;
-	FReply ClickedOnViewportCornerText();
 
+	/** Adds a persistent notification to display recording state when recording */
+	void AddRecordingNotification();
+
+	/** Adds a persistent notification to display post process graph state */
+	void AddPostProcessNotification();
 };
diff --git a/Engine/Source/Editor/Persona/Public/IPersonaToolkit.h b/Engine/Source/Editor/Persona/Public/IPersonaToolkit.h
index 54ec5b7313af..d47c7b768ddd 100644
--- a/Engine/Source/Editor/Persona/Public/IPersonaToolkit.h
+++ b/Engine/Source/Editor/Persona/Public/IPersonaToolkit.h
@@ -51,6 +51,18 @@ public:
 	 */
 	virtual void SetPreviewMesh(class USkeletalMesh* InSkeletalMesh, bool bSetPreviewMeshInAsset = true) = 0;
 
+	/** Retrieve editor custom data. Return INDEX_NONE if the key is invalid */
+	virtual int32 GetCustomData(const int32 Key) const { return INDEX_NONE; }
+	
+	/*
+	 * Store the custom data using the key.
+	 * Remark:
+	 * The custom data memory should be clear when the editor is close by the user, this is not persistent data.
+	 * Currently we use it to store the state of the editor UI to restore it properly when a refresh happen.
+	 */
+	virtual void SetCustomData(const int32 Key, const int32 CustomData) {}
+
+	
 	/** Get the context in which this toolkit is being used (usually the class name of the asset) */
 	virtual FName GetContext() const = 0;
 };
diff --git a/Engine/Source/Editor/Persona/Public/IPersonaViewport.h b/Engine/Source/Editor/Persona/Public/IPersonaViewport.h
index 380b3dd3d7be..e5bc62cb7c5b 100644
--- a/Engine/Source/Editor/Persona/Public/IPersonaViewport.h
+++ b/Engine/Source/Editor/Persona/Public/IPersonaViewport.h
@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "Widgets/SCompoundWidget.h"
+#include "Logging/TokenizedMessage.h"
 
 class FEditorViewportClient;
 class IPinnedCommandList;
@@ -28,4 +29,19 @@ public:
 
 	/** Get the pinned commands list for this viewport */
 	virtual TSharedRef<IPinnedCommandList> GetPinnedCommandList() const = 0;
+
+	/** 
+	 * Add a notification widget 
+	 * @param	InSeverity				The severity of the message
+	 * @param	InCanBeDismissed		Whether the message can be manually dismissed
+	 * @param	InNotificationWidget	The widget showing the notification
+	 * @return the widget containing the notification
+	 */
+	virtual TWeakPtr<SWidget> AddNotification(TAttribute<EMessageSeverity::Type> InSeverity, TAttribute<bool> InCanBeDismissed, const TSharedRef<SWidget>& InNotificationWidget) = 0;
+
+	/** 
+	 * Remove a notification widget 
+	 * @param	InContainingWidget		The containing widget returned from AddNotification()
+	 */
+	virtual void RemoveNotification(const TWeakPtr<SWidget>& InContainingWidget) = 0;
 };
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/PhysicsAssetEditor.Build.cs b/Engine/Source/Editor/PhysicsAssetEditor/PhysicsAssetEditor.Build.cs
index 61e41923d610..42f527c5ef00 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/PhysicsAssetEditor.Build.cs
+++ b/Engine/Source/Editor/PhysicsAssetEditor/PhysicsAssetEditor.Build.cs
@@ -6,7 +6,12 @@ public class PhysicsAssetEditor : ModuleRules
 {
 	public PhysicsAssetEditor(ReadOnlyTargetRules Target) : base(Target)
 	{
-		PublicIncludePaths.Add("Editor/UnrealEd/Public");
+		PublicIncludePaths.AddRange(
+             new string[] {
+                "Editor/UnrealEd/Public",
+                "Editor/Persona/Public"
+            }
+        );
 
         PrivateIncludePaths.AddRange(
             new string[] {
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.cpp b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.cpp
index 5415d44beab0..07a26e8bbbf0 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.cpp
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.cpp
@@ -1637,6 +1637,8 @@ void FPhysicsAssetEditor::OnChangeDefaultMesh(USkeletalMesh* OldPreviewMesh, USk
 		MeshUtilities.CalcBoneVertInfos(NewPreviewMesh, SharedData->AnyWeightBoneInfos, false);
 
 		RefreshHierachyTree();
+
+		SharedData->EditorSkelComp->SetDisablePostProcessBlueprint(true);
 	}
 }
 
@@ -2767,9 +2769,10 @@ void FPhysicsAssetEditor::HandlePreviewSceneCreated(const TSharedRef<IPersonaPre
 	SharedData->EditorSkelComp->SharedData = SharedData.Get();
 	SharedData->EditorSkelComp->SetSkeletalMesh(SharedData->PhysicsAsset->GetPreviewMesh());
 	SharedData->EditorSkelComp->SetPhysicsAsset(SharedData->PhysicsAsset, true);
+	SharedData->EditorSkelComp->SetDisablePostProcessBlueprint(true);
 	InPersonaPreviewScene->SetPreviewMeshComponent(SharedData->EditorSkelComp);
 	InPersonaPreviewScene->AddComponent(SharedData->EditorSkelComp, FTransform::Identity);
-		
+
 	// set root component, so we can attach to it. 
 	Actor->SetRootComponent(SharedData->EditorSkelComp);
 
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.h b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.h
index a23bc35635c0..c66f084d085e 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.h
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditor.h
@@ -102,6 +102,9 @@ public:
 		return FString(TEXT("Engine/Physics/PhysicsAssetEditor"));
 	}
 
+	/** IHasPersonaToolkit interface */
+	virtual TSharedRef<IPersonaToolkit> GetPersonaToolkit() const override { return PersonaToolkit.ToSharedRef(); }
+
 	/** FGCObject interface */
 	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
 
@@ -121,8 +124,6 @@ public:
 
 	void HandleCreateNewConstraint(int32 BodyIndex0, int32 BodyIndex1);
 
-	TSharedRef<IPersonaToolkit> GetPersonaToolkit() const { return PersonaToolkit.ToSharedRef(); }
-
 	TSharedPtr<ISkeletonTree> GetSkeletonTree() const { return SkeletonTree.ToSharedRef(); }
 
 	/** Reset bone collision for selected or regenerate all bodies if no bodies are selected */
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorModule.cpp b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorModule.cpp
index 09a1f717eb56..ee5baa02c7cd 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorModule.cpp
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorModule.cpp
@@ -55,9 +55,15 @@ public:
 	{
 		TSharedRef<FPhysicsAssetEditor> NewPhysicsAssetEditor(new FPhysicsAssetEditor());
 		NewPhysicsAssetEditor->InitPhysicsAssetEditor(Mode, InitToolkitHost, PhysicsAsset);
+		OnPhysicsAssetEditorCreatedDelegate.Broadcast(NewPhysicsAssetEditor);
 		return NewPhysicsAssetEditor;
 	}
 
+	virtual FOnPhysicsAssetEditorCreated& OnPhysicsAssetEditorCreated() override
+	{
+		return OnPhysicsAssetEditorCreatedDelegate;
+	}
+
 	virtual void OpenNewBodyDlg(EAppReturnType::Type* NewBodyResponse) override
 	{
 		FPhysicsAssetEditorSharedData::OpenNewBodyDlg(NewBodyResponse);
@@ -73,6 +79,9 @@ private:
 
 	/** Node factory for skeleton graph */
 	TSharedPtr<FPhysicsAssetGraphPanelNodeFactory> PhysicsAssetGraphPanelNodeFactory;
+
+	/** Delegate called when a physics asset editor is created */
+	FOnPhysicsAssetEditorCreated OnPhysicsAssetEditorCreatedDelegate;
 };
 
 IMPLEMENT_MODULE(FPhysicsAssetEditorModule, PhysicsAssetEditor);
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorSharedData.cpp b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorSharedData.cpp
index 2072451afcc7..a1abdcc3627d 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorSharedData.cpp
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Private/PhysicsAssetEditorSharedData.cpp
@@ -1636,7 +1636,9 @@ void FPhysicsAssetEditorSharedData::EnableSimulation(bool bEnableSimulation)
 {
 	if (bEnableSimulation)
 	{
+
 		// We should not already have an instance (destroyed when stopping sim).
+		EditorSkelComp->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics);
 		EditorSkelComp->SetSimulatePhysics(true);
 		EditorSkelComp->ResetAllBodiesSimulatePhysics();
 		EditorSkelComp->SetPhysicsBlendWeight(EditorOptions->PhysicsBlend);
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Private/SkeletonTreePhysicsShapeItem.cpp b/Engine/Source/Editor/PhysicsAssetEditor/Private/SkeletonTreePhysicsShapeItem.cpp
index 85fc1c601f66..dfd7abef47b8 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Private/SkeletonTreePhysicsShapeItem.cpp
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Private/SkeletonTreePhysicsShapeItem.cpp
@@ -98,31 +98,31 @@ FString FSkeletonTreePhysicsShapeItem::GetNameAsString() const
 	case EAggCollisionShape::Sphere:
 		if(BodySetup->AggGeom.SphereElems.IsValidIndex(ShapeIndex))
 		{
-			StringName = BodySetup->AggGeom.SphereElems[ShapeIndex].GetName();
+			StringName = BodySetup->AggGeom.SphereElems[ShapeIndex].GetName().GetPlainNameString();
 		}
 		break;
 	case EAggCollisionShape::Box:
 		if(BodySetup->AggGeom.BoxElems.IsValidIndex(ShapeIndex))
 		{
-			StringName = BodySetup->AggGeom.BoxElems[ShapeIndex].GetName();
+			StringName = BodySetup->AggGeom.BoxElems[ShapeIndex].GetName().GetPlainNameString();
 		}
 		break;
 	case EAggCollisionShape::Sphyl:
 		if(BodySetup->AggGeom.SphylElems.IsValidIndex(ShapeIndex))
 		{
-			StringName = BodySetup->AggGeom.SphylElems[ShapeIndex].GetName();
+			StringName = BodySetup->AggGeom.SphylElems[ShapeIndex].GetName().GetPlainNameString();
 		}
 		break;
 	case EAggCollisionShape::Convex:
 		if(BodySetup->AggGeom.ConvexElems.IsValidIndex(ShapeIndex))
 		{
-			StringName = BodySetup->AggGeom.ConvexElems[ShapeIndex].GetName();
+			StringName = BodySetup->AggGeom.ConvexElems[ShapeIndex].GetName().GetPlainNameString();
 		}
 		break;
 	case EAggCollisionShape::TaperedCapsule:
 		if(BodySetup->AggGeom.TaperedCapsuleElems.IsValidIndex(ShapeIndex))
 		{
-			StringName = BodySetup->AggGeom.TaperedCapsuleElems[ShapeIndex].GetName();
+			StringName = BodySetup->AggGeom.TaperedCapsuleElems[ShapeIndex].GetName().GetPlainNameString();
 		}
 		break;
 	}
@@ -153,31 +153,31 @@ void FSkeletonTreePhysicsShapeItem::HandleTextCommitted(const FText& InText, ETe
 		case EAggCollisionShape::Sphere:
 			if(BodySetup->AggGeom.SphereElems.IsValidIndex(ShapeIndex))
 			{
-				BodySetup->AggGeom.SphereElems[ShapeIndex].SetName(InText.ToString());
+				BodySetup->AggGeom.SphereElems[ShapeIndex].SetName(*InText.ToString());
 			}
 			break;
 		case EAggCollisionShape::Box:
 			if(BodySetup->AggGeom.BoxElems.IsValidIndex(ShapeIndex))
 			{
-				BodySetup->AggGeom.BoxElems[ShapeIndex].SetName(InText.ToString());
+				BodySetup->AggGeom.BoxElems[ShapeIndex].SetName(*InText.ToString());
 			}
 			break;
 		case EAggCollisionShape::Sphyl:
 			if(BodySetup->AggGeom.SphylElems.IsValidIndex(ShapeIndex))
 			{
-				BodySetup->AggGeom.SphylElems[ShapeIndex].SetName(InText.ToString());
+				BodySetup->AggGeom.SphylElems[ShapeIndex].SetName(*InText.ToString());
 			}
 			break;
 		case EAggCollisionShape::Convex:
 			if(BodySetup->AggGeom.ConvexElems.IsValidIndex(ShapeIndex))
 			{
-				BodySetup->AggGeom.ConvexElems[ShapeIndex].SetName(InText.ToString());
+				BodySetup->AggGeom.ConvexElems[ShapeIndex].SetName(*InText.ToString());
 			}
 			break;
 		case EAggCollisionShape::TaperedCapsule:
 			if(BodySetup->AggGeom.TaperedCapsuleElems.IsValidIndex(ShapeIndex))
 			{
-				BodySetup->AggGeom.TaperedCapsuleElems[ShapeIndex].SetName(InText.ToString());
+				BodySetup->AggGeom.TaperedCapsuleElems[ShapeIndex].SetName(*InText.ToString());
 			}
 			break;
 		default:
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Public/IPhysicsAssetEditor.h b/Engine/Source/Editor/PhysicsAssetEditor/Public/IPhysicsAssetEditor.h
index 153b34dc09e9..946adc213559 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Public/IPhysicsAssetEditor.h
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Public/IPhysicsAssetEditor.h
@@ -4,13 +4,14 @@
 
 #include "CoreMinimal.h"
 #include "WorkflowOrientedApp/WorkflowCentricApplication.h"
+#include "IHasPersonaToolkit.h"
 
 
 /*-----------------------------------------------------------------------------
    IPhysicsAssetEditor
 -----------------------------------------------------------------------------*/
 
-class IPhysicsAssetEditor : public FWorkflowCentricApplication
+class IPhysicsAssetEditor : public FWorkflowCentricApplication, public IHasPersonaToolkit
 {
 
 };
diff --git a/Engine/Source/Editor/PhysicsAssetEditor/Public/PhysicsAssetEditorModule.h b/Engine/Source/Editor/PhysicsAssetEditor/Public/PhysicsAssetEditorModule.h
index f836ecec130f..723b03092996 100644
--- a/Engine/Source/Editor/PhysicsAssetEditor/Public/PhysicsAssetEditorModule.h
+++ b/Engine/Source/Editor/PhysicsAssetEditor/Public/PhysicsAssetEditorModule.h
@@ -7,9 +7,12 @@
 #include "Toolkits/AssetEditorToolkit.h"
 
 class UPhysicsAsset;
+class IPhysicsAssetEditor;
 
 DECLARE_LOG_CATEGORY_EXTERN(LogPhysicsAssetEditor, Log, All);
 
+/** Delegate called when a physics asset editor is created */
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnPhysicsAssetEditorCreated, const TSharedRef<IPhysicsAssetEditor>& /*InPhysicsAssetEditor*/);
 
 /*-----------------------------------------------------------------------------
    IPhysicsAssetEditorModule
@@ -20,7 +23,10 @@ class IPhysicsAssetEditorModule : public IModuleInterface,
 {
 public:
 	/** Creates a new PhysicsAssetEditor instance */
-	virtual TSharedRef<class IPhysicsAssetEditor> CreatePhysicsAssetEditor(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, UPhysicsAsset* PhysicsAsset) = 0;
+	virtual TSharedRef<IPhysicsAssetEditor> CreatePhysicsAssetEditor(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, UPhysicsAsset* PhysicsAsset) = 0;
+
+	/** Delegate called when a physics asset editor is created */
+	virtual FOnPhysicsAssetEditorCreated& OnPhysicsAssetEditorCreated() = 0;
 
 	/** Opens a "New Asset/Body" modal dialog window */
 	virtual void OpenNewBodyDlg(EAppReturnType::Type* NewBodyResponse) = 0;
diff --git a/Engine/Source/Editor/ProjectSettingsViewer/Private/ProjectSettingsViewerModule.cpp b/Engine/Source/Editor/ProjectSettingsViewer/Private/ProjectSettingsViewerModule.cpp
index 69a3c453b9ed..a398d6d5d3eb 100644
--- a/Engine/Source/Editor/ProjectSettingsViewer/Private/ProjectSettingsViewerModule.cpp
+++ b/Engine/Source/Editor/ProjectSettingsViewer/Private/ProjectSettingsViewerModule.cpp
@@ -34,7 +34,6 @@
 
 
 #include "AISystem.h"
-#include "Engine/EndUserSettings.h"
 #include "Runtime/Slate/Public/SlateSettings.h"
 
 #define LOCTEXT_NAMESPACE "FProjectSettingsViewerModule"
@@ -171,13 +170,6 @@ protected:
 			GetMutableDefault<UCrowdManager>()
 			);
 
-		// End-user settings
-		SettingsModule.RegisterSettings("Project", "Engine", "EndUser",
-			LOCTEXT("EndUserSettingsName", "End-User Settings"),
-			LOCTEXT("EndUserSettingsDescription", "Settings you may wish to expose to end-users of your game."),
-			GetMutableDefault<UEndUserSettings>()
-			);
-
 		SettingsModule.RegisterSettings("Project", "Engine", "Slate",
 			LOCTEXT("SlateSettingsName", "Slate Settings"),
 			LOCTEXT("SlateSettingsDescription", "Settings for Slate."),
diff --git a/Engine/Source/Editor/PropertyEditor/Private/DetailItemNode.cpp b/Engine/Source/Editor/PropertyEditor/Private/DetailItemNode.cpp
index ceee8543d1f3..a1ed3992c45d 100644
--- a/Engine/Source/Editor/PropertyEditor/Private/DetailItemNode.cpp
+++ b/Engine/Source/Editor/PropertyEditor/Private/DetailItemNode.cpp
@@ -499,13 +499,6 @@ static bool PassesAllFilters( FDetailItemNode* ItemNode, const FDetailLayoutCust
 		bPassesAllFilters = false;
 		if( PropertyNodePin.IsValid() && !PropertyNodePin->AsCategoryNode())
 		{
-			UClass* ObjectClass = nullptr;
-			FObjectPropertyNode* PropertyNodeParent = PropertyNodePin->FindObjectItemParent();
-			if (PropertyNodeParent)
-			{
-				ObjectClass = PropertyNodeParent->GetObjectBaseClass();
-			}
-
 			const bool bIsNotBeingFiltered = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsBeingFiltered) == 0;
 			const bool bIsSeenDueToFiltering = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering) != 0;
 			const bool bIsParentSeenDueToFiltering = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsParentSeenDueToFiltering) != 0;
@@ -513,7 +506,21 @@ static bool PassesAllFilters( FDetailItemNode* ItemNode, const FDetailLayoutCust
 			const bool bPassesSearchFilter = bSearchFilterIsEmpty || ( bIsNotBeingFiltered || bIsSeenDueToFiltering || bIsParentSeenDueToFiltering );
 			const bool bPassesModifiedFilter = bPassesSearchFilter && ( InFilter.bShowOnlyModifiedProperties == false || PropertyNodePin->GetDiffersFromDefault() == true );
 			const bool bPassesDifferingFilter = InFilter.bShowOnlyDiffering ? InFilter.WhitelistedProperties.Find(*FPropertyNode::CreatePropertyPath(PropertyNodePin.ToSharedRef())) != nullptr : true;
-			const bool bPassesKeyableFilter = (InFilter.bShowKeyable == false || (ObjectClass ? Local::ItemIsKeyable(ItemNode, ObjectClass, PropertyNodePin) : false));
+
+			bool bPassesKeyableFilter = true;
+			if (InFilter.bShowKeyable)
+			{
+				FObjectPropertyNode* ParentPropertyNode = PropertyNodePin->FindObjectItemParent();
+				if (ParentPropertyNode != nullptr)
+				{
+					UClass* ObjectClass = ParentPropertyNode->GetObjectBaseClass();
+					bPassesKeyableFilter = Local::ItemIsKeyable(ItemNode, ObjectClass, PropertyNodePin);
+				}
+				else
+				{
+					bPassesKeyableFilter = false;
+				}
+			}
 			const bool bPassesAnimatedFilter = (InFilter.bShowAnimated == false || Local::ItemIsAnimated(ItemNode, PropertyNodePin));
 
 			// The property node is visible (note categories are never visible unless they have a child that is visible )
diff --git a/Engine/Source/Editor/PropertyEditor/Private/PropertyCustomizationHelpers.cpp b/Engine/Source/Editor/PropertyEditor/Private/PropertyCustomizationHelpers.cpp
index a45b9b91686e..64ef37cf40da 100644
--- a/Engine/Source/Editor/PropertyEditor/Private/PropertyCustomizationHelpers.cpp
+++ b/Engine/Source/Editor/PropertyEditor/Private/PropertyCustomizationHelpers.cpp
@@ -1597,11 +1597,12 @@ private:
 };
 
 
-FSectionList::FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& InSectionListDelegates, bool bInAllowCollapse, int32 InThumbnailSize, int32 InSectionsLodIndex)
+FSectionList::FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& InSectionListDelegates, bool bInInitiallyCollapsed, int32 InThumbnailSize, int32 InSectionsLodIndex, FName InSectionListName)
 	: SectionListDelegates(InSectionListDelegates)
 	, DetailLayoutBuilder(InDetailLayoutBuilder)
 	, SectionListBuilder(new FSectionListBuilder(InThumbnailSize))
-	, bAllowCollpase(bInAllowCollapse)
+	, bInitiallyCollapsed(bInInitiallyCollapsed)
+	, SectionListName(InSectionListName)
 	, ThumbnailSize(InThumbnailSize)
 	, SectionsLodIndex(InSectionsLodIndex)
 {
diff --git a/Engine/Source/Editor/PropertyEditor/Private/PropertyHandleImpl.cpp b/Engine/Source/Editor/PropertyEditor/Private/PropertyHandleImpl.cpp
index 87f960f886bd..6226e190caee 100644
--- a/Engine/Source/Editor/PropertyEditor/Private/PropertyHandleImpl.cpp
+++ b/Engine/Source/Editor/PropertyEditor/Private/PropertyHandleImpl.cpp
@@ -1632,9 +1632,6 @@ void FPropertyValueImpl::SwapChildren( TSharedPtr<FPropertyNode> FirstChildNode,
 
 void FPropertyValueImpl::MoveElementTo(int32 OriginalIndex, int32 NewIndex)
 {
-	FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "MoveRow", "Move Row"));
-
-	GetPropertyNode()->NotifyPreChange(GetPropertyNode()->GetProperty(), NotifyHook);
 	// Insert into the middle or add to the end
 	if (NewIndex < GetPropertyNode()->GetNumChildNodes())
 	{
@@ -1927,12 +1924,6 @@ void FPropertyValueImpl::MoveElementTo(int32 OriginalIndex, int32 NewIndex)
 				ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
 			}
 		}
-		FPropertyChangedEvent MoveEvent(ParentNode->GetProperty(), EPropertyChangeType::Unspecified);
-		GetPropertyNode()->NotifyPostChange(MoveEvent, NotifyHook);
-		if (PropertyUtilities.IsValid())
-		{
-			PropertyUtilities.Pin()->NotifyFinishedChangingProperties(MoveEvent);
-		}
 	}
 }
 
@@ -3219,7 +3210,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const int8& NewValue, EProp
 	// Clamp the value from any meta data ranges stored on the property value
 	int8 FinalValue = ClampIntegerValueFromMetaData<int8>( NewValue, *Implementation->GetPropertyNode() );
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 
 	return Res;
@@ -3232,7 +3223,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const int16& NewValue, EPro
 	// Clamp the value from any meta data ranges stored on the property value
 	int16 FinalValue = ClampIntegerValueFromMetaData<int16>(NewValue, *Implementation->GetPropertyNode());
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 
 	return Res;
@@ -3245,7 +3236,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue( const int32& NewValue, EPr
 	// Clamp the value from any meta data ranges stored on the property value
 	int32 FinalValue = ClampIntegerValueFromMetaData<int32>( NewValue, *Implementation->GetPropertyNode() );
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText( ValueStr, Flags );
 
 	return Res;
@@ -3258,7 +3249,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const int64& NewValue, EPro
 	// Clamp the value from any meta data ranges stored on the property value
 	int64 FinalValue = ClampIntegerValueFromMetaData<int64>(NewValue, *Implementation->GetPropertyNode());
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 	return Res;
 }
@@ -3269,7 +3260,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint16& NewValue, EPr
 	// Clamp the value from any meta data ranges stored on the property value
 	uint16 FinalValue = ClampIntegerValueFromMetaData<uint16>(NewValue, *Implementation->GetPropertyNode());
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 
 	return Res;
@@ -3282,7 +3273,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint32& NewValue, EPr
 	// Clamp the value from any meta data ranges stored on the property value
 	uint32 FinalValue = ClampIntegerValueFromMetaData<uint32>(NewValue, *Implementation->GetPropertyNode());
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 
 	return Res;
@@ -3294,7 +3285,7 @@ FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint64& NewValue, EPr
 	// Clamp the value from any meta data ranges stored on the property value
 	uint64 FinalValue = ClampIntegerValueFromMetaData<uint64>(NewValue, *Implementation->GetPropertyNode());
 
-	const FString ValueStr = Lex::ToString(FinalValue);
+	const FString ValueStr = LexToString(FinalValue);
 	Res = Implementation->ImportText(ValueStr, Flags);
 	return Res;
 }
diff --git a/Engine/Source/Editor/PropertyEditor/Private/SDetailSingleItemRow.cpp b/Engine/Source/Editor/PropertyEditor/Private/SDetailSingleItemRow.cpp
index ac64578a205e..3988084dfd03 100644
--- a/Engine/Source/Editor/PropertyEditor/Private/SDetailSingleItemRow.cpp
+++ b/Engine/Source/Editor/PropertyEditor/Private/SDetailSingleItemRow.cpp
@@ -199,7 +199,19 @@ FReply SDetailSingleItemRow::OnArrayDrop(const FDragDropEvent& DragDropEvent)
 				SwappablePropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, bOriginalSwappingExpansion);
 				SwappingPropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, bOriginalSwappableExpansion);
 				OwnerTreeNode.Pin()->GetDetailsView()->SaveExpandedItems(SwappablePropertyNode->GetParentNodeSharedPtr().ToSharedRef());
+				FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "MoveRow", "Move Row"));
+
+				SwappingHandle->GetParentHandle()->NotifyPreChange();
+
 				ParentHandle->MoveElementTo(OriginalIndex, NewIndex);
+
+
+				FPropertyChangedEvent MoveEvent(SwappingHandle->GetParentHandle()->GetProperty(), EPropertyChangeType::Unspecified);
+				SwappingHandle->GetParentHandle()->NotifyPostChange();
+				if (OwnerTreeNode.Pin()->GetDetailsView()->GetPropertyUtilities().IsValid())
+				{
+					OwnerTreeNode.Pin()->GetDetailsView()->GetPropertyUtilities()->NotifyFinishedChangingProperties(MoveEvent);
+				}
 			}
 		}
 	}
diff --git a/Engine/Source/Editor/PropertyEditor/Public/PropertyCustomizationHelpers.h b/Engine/Source/Editor/PropertyEditor/Public/PropertyCustomizationHelpers.h
index 5c1bd3ab1328..729573737ace 100644
--- a/Engine/Source/Editor/PropertyEditor/Public/PropertyCustomizationHelpers.h
+++ b/Engine/Source/Editor/PropertyEditor/Public/PropertyCustomizationHelpers.h
@@ -787,7 +787,7 @@ struct FSectionListItem
 class FSectionList : public IDetailCustomNodeBuilder, public TSharedFromThis<FSectionList>
 {
 public:
-	PROPERTYEDITOR_API FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& SectionListDelegates, bool bInAllowCollapse, int32 InThumbnailSize, int32 InSectionsLodIndex);
+	PROPERTYEDITOR_API FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& SectionListDelegates, bool bInInitiallyCollapsed, int32 InThumbnailSize, int32 InSectionsLodIndex, FName InSectionListName);
 
 	/**
 	* @return true if Sections are being displayed
@@ -810,8 +810,11 @@ private:
 	virtual void Tick(float DeltaTime) override;
 	virtual void GenerateHeaderRowContent(FDetailWidgetRow& NodeRow) override;
 	virtual void GenerateChildContent(IDetailChildrenBuilder& ChildrenBuilder) override;
-	virtual FName GetName() const override { return NAME_None; }
-	virtual bool InitiallyCollapsed() const override { return bAllowCollpase; }
+	virtual FName GetName() const override { return SectionListName; }
+	virtual bool InitiallyCollapsed() const override
+	{
+		return bInitiallyCollapsed;
+	}
 
 	/**
 	* Adds a new Section item to the list
@@ -847,8 +850,11 @@ private:
 	TSet<uint32> ExpandedSlots;
 	/** Section list builder used to generate Sections */
 	TSharedRef<class FSectionListBuilder> SectionListBuilder;
-	/** Allow Collapse of Section header row. Right now if you allow collapse, it will initially collapse. */
-	bool bAllowCollpase;
+
+	/** Set the initial state of the collapse. */
+	bool bInitiallyCollapsed;
+
+	FName SectionListName;
 
 	int32 ThumbnailSize;
 	int32 SectionsLodIndex;
diff --git a/Engine/Source/Editor/SceneOutliner/Private/SceneOutlinerGutter.cpp b/Engine/Source/Editor/SceneOutliner/Private/SceneOutlinerGutter.cpp
index 735240f50af6..8de43119a1a8 100644
--- a/Engine/Source/Editor/SceneOutliner/Private/SceneOutlinerGutter.cpp
+++ b/Engine/Source/Editor/SceneOutliner/Private/SceneOutlinerGutter.cpp
@@ -262,7 +262,7 @@ private:
 	}
 
 	/** Called when this widget had captured the mouse, but that capture has been revoked for some reason. */
-	virtual void OnMouseCaptureLost() override
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override
 	{
 		UndoTransaction.Reset();
 	}
diff --git a/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.cpp b/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.cpp
index 33c50199b8e7..56194bde6853 100644
--- a/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.cpp
+++ b/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.cpp
@@ -222,7 +222,7 @@ void FAnimationRecorder::StartRecord(USkeletalMeshComponent* Component, UAnimSeq
 	AnimationObject->NumFrames = 0;
 
 	RecordedCurves.Reset();
-	UIDList = nullptr;
+	UIDToArrayIndexLUT = nullptr;
 
 	USkeleton* AnimSkeleton = AnimationObject->GetSkeleton();
 	// add all frames
@@ -301,56 +301,59 @@ UAnimSequence* FAnimationRecorder::StopRecord(bool bShowMessage)
 		// @todo figure out why removing redundant keys is inconsistent
 
 		// add to real curve data 
-		if (RecordedCurves.Num() == NumFrames && UIDList)
+		if (RecordedCurves.Num() == NumFrames && UIDToArrayIndexLUT)
 		{
 			USkeleton* SkeletonObj = AnimationObject->GetSkeleton();
-			for (int32 CurveIndex = 0; CurveIndex < (*UIDList).Num(); ++CurveIndex)
+			for (int32 CurveUID = 0; CurveUID < UIDToArrayIndexLUT->Num(); ++CurveUID)
 			{
-				USkeleton::AnimCurveUID UID = (*UIDList)[CurveIndex];
+				int32 CurveIndex = (*UIDToArrayIndexLUT)[CurveUID];
 
-				FFloatCurve* FloatCurveData = nullptr;
-
-				TArray<float> TimesToRecord;
-				TArray<float> ValuesToRecord;
-				TimesToRecord.SetNum(NumFrames);
-				ValuesToRecord.SetNum(NumFrames);
-
-				for (int32 FrameIndex = 0; FrameIndex < NumFrames; ++FrameIndex)
+				if (CurveIndex != MAX_uint16)
 				{
-					const float TimeToRecord = FrameIndex*IntervalTime;
-					FCurveElement& CurCurve = RecordedCurves[FrameIndex][CurveIndex];
-					if (FrameIndex == 0)
+					FFloatCurve* FloatCurveData = nullptr;
+
+					TArray<float> TimesToRecord;
+					TArray<float> ValuesToRecord;
+					TimesToRecord.SetNum(NumFrames);
+					ValuesToRecord.SetNum(NumFrames);
+
+					for (int32 FrameIndex = 0; FrameIndex < NumFrames; ++FrameIndex)
 					{
-						// add one and save the cache
-						FSmartName CurveName;
-						if (SkeletonObj->GetSmartNameByUID(USkeleton::AnimCurveMappingName, UID, CurveName))
+						const float TimeToRecord = FrameIndex*IntervalTime;
+						FCurveElement& CurCurve = RecordedCurves[FrameIndex][CurveIndex];
+						if (FrameIndex == 0)
 						{
-							// give default curve flag for recording 
-							AnimationObject->RawCurveData.AddFloatCurveKey(CurveName, AACF_DefaultCurve, TimeToRecord, CurCurve.Value);
-							FloatCurveData = static_cast<FFloatCurve*>(AnimationObject->RawCurveData.GetCurveData(UID, ERawCurveTrackTypes::RCT_Float));
+							// add one and save the cache
+							FSmartName CurveName;
+							if (SkeletonObj->GetSmartNameByUID(USkeleton::AnimCurveMappingName, CurveUID, CurveName))
+							{
+								// give default curve flag for recording 
+								AnimationObject->RawCurveData.AddFloatCurveKey(CurveName, AACF_DefaultCurve, TimeToRecord, CurCurve.Value);
+								FloatCurveData = static_cast<FFloatCurve*>(AnimationObject->RawCurveData.GetCurveData(CurveUID, ERawCurveTrackTypes::RCT_Float));
+							}
+						}
+
+						if (FloatCurveData)
+						{
+							TimesToRecord[FrameIndex] = TimeToRecord;
+							ValuesToRecord[FrameIndex] = CurCurve.Value;
 						}
 					}
 
+					// Fill all the curve data at once
 					if (FloatCurveData)
 					{
-						TimesToRecord[FrameIndex] = TimeToRecord;
-						ValuesToRecord[FrameIndex] = CurCurve.Value;
-					}
-				}
+						TArray<FRichCurveKey> Keys;
+						for (int32 Index = 0; Index < TimesToRecord.Num(); ++Index)
+						{
+							FRichCurveKey Key(TimesToRecord[Index], ValuesToRecord[Index]);
+							Key.InterpMode = InterpMode;
+							Key.TangentMode = TangentMode;
+							Keys.Add(Key);
+						}
 
-				// Fill all the curve data at once
-				if (FloatCurveData)
-				{
-					TArray<FRichCurveKey> Keys;
-					for (int32 Index = 0; Index < TimesToRecord.Num(); ++Index)
-					{
-						FRichCurveKey Key(TimesToRecord[Index], ValuesToRecord[Index]);
-						Key.InterpMode = InterpMode;
-						Key.TangentMode = TangentMode;
-						Keys.Add(Key);
+						FloatCurveData->FloatCurve.SetKeys(Keys);
 					}
-
-					FloatCurveData->FloatCurve.SetKeys(Keys);
 				}
 			}	
 		}
@@ -627,13 +630,13 @@ bool FAnimationRecorder::Record(USkeletalMeshComponent* Component, FTransform co
 		if (AnimationCurves.Elements.Num() > 0)
 		{
 			RecordedCurves.Add(AnimationCurves.Elements);
-			if (UIDList == nullptr)
+			if (UIDToArrayIndexLUT == nullptr)
 			{
-				UIDList = AnimationCurves.UIDList;
+				UIDToArrayIndexLUT = AnimationCurves.UIDToArrayIndexLUT;
 			}
 			else
 			{
-				ensureAlways(UIDList == AnimationCurves.UIDList);
+				ensureAlways(UIDToArrayIndexLUT == AnimationCurves.UIDToArrayIndexLUT);
 			}
 		}
 
diff --git a/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.h b/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.h
index 521d5a72627c..8c8332a765f8 100644
--- a/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.h
+++ b/Engine/Source/Editor/SequenceRecorder/Private/AnimationRecorder.h
@@ -92,7 +92,7 @@ private:
 
 	// recording curve data 
 	TArray< TArray<FCurveElement> >  RecordedCurves;
-	TArray<SmartName::UID_Type> const * UIDList;
+	TArray<uint16> const * UIDToArrayIndexLUT;
 };
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Engine/Source/Editor/Sequencer/Private/SSequencerSection.cpp b/Engine/Source/Editor/Sequencer/Private/SSequencerSection.cpp
index 7d49e1054b1f..966cb07fd6e4 100644
--- a/Engine/Source/Editor/Sequencer/Private/SSequencerSection.cpp
+++ b/Engine/Source/Editor/Sequencer/Private/SSequencerSection.cpp
@@ -721,7 +721,7 @@ void SSequencerSection::GetKeysUnderMouse( const FVector2D& MousePosition, const
 
 	UMovieSceneSection& Section = *SectionInterface->GetSectionObject();
 
-	FTimeToPixel    TimeToPixelConverter = ConstructTimeConverterForSection(SectionGeometry, Section, GetSequencer());
+	FTimeToPixel TimeToPixelConverter = ConstructTimeConverterForSection(SectionGeometry, Section, GetSequencer());
 	const FVector2D MousePixel           = SectionGeometry.AbsoluteToLocal( MousePosition );
 
 	// HitTest 
diff --git a/Engine/Source/Editor/Sequencer/Private/SSequencerSplitterOverlay.h b/Engine/Source/Editor/Sequencer/Private/SSequencerSplitterOverlay.h
index 83bb45cb4fdc..683f71fbbbe4 100644
--- a/Engine/Source/Editor/Sequencer/Private/SSequencerSplitterOverlay.h
+++ b/Engine/Source/Editor/Sequencer/Private/SSequencerSplitterOverlay.h
@@ -104,10 +104,10 @@ public:
 		return Reply;
 	}
 	
-	virtual void OnMouseCaptureLost() override
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override
 	{
 		SetVisibility(EVisibility::SelfHitTestInvisible);
-		SOverlay::OnMouseCaptureLost();
+		SOverlay::OnMouseCaptureLost(CaptureLostEvent);
 	}
 
 	virtual FReply OnMouseButtonUp( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override
diff --git a/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.cpp b/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.cpp
index c7f2a1aea1d0..3e471e70865c 100644
--- a/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.cpp
+++ b/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.cpp
@@ -401,7 +401,7 @@ void SSequencerTrackArea::OnMouseLeave(const FPointerEvent& MouseEvent)
 }
 
 
-void SSequencerTrackArea::OnMouseCaptureLost()
+void SSequencerTrackArea::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	if ( Sequencer.IsValid() )
 	{
diff --git a/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.h b/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.h
index 45befa9673fe..f5c79cfceb31 100644
--- a/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.h
+++ b/Engine/Source/Editor/Sequencer/Private/SSequencerTrackArea.h
@@ -103,7 +103,7 @@ public:
 	virtual void OnMouseEnter(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
 	virtual void OnMouseLeave(const FPointerEvent& MouseEvent) override;
 	virtual int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 	virtual FCursorReply OnCursorQuery( const FGeometry& MyGeometry, const FPointerEvent& CursorEvent ) const override;
 	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
 	virtual void OnArrangeChildren( const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren ) const override;
diff --git a/Engine/Source/Editor/Sequencer/Private/Sequencer.cpp b/Engine/Source/Editor/Sequencer/Private/Sequencer.cpp
index 733970d42d13..b8b542c30168 100644
--- a/Engine/Source/Editor/Sequencer/Private/Sequencer.cpp
+++ b/Engine/Source/Editor/Sequencer/Private/Sequencer.cpp
@@ -6832,8 +6832,20 @@ void FSequencer::SetKey()
 		KeyAreas.Reset();
 		SequencerHelpers::GetAllKeyAreas(Node, KeyAreas);
 
-		TSharedPtr<FSequencerObjectBindingNode> ParentObjectBinding = Node->FindParentObjectBindingNode();
-		FGuid ObjectBinding = ParentObjectBinding.IsValid() ? ParentObjectBinding->GetObjectBinding() : FGuid();
+		FGuid ObjectBinding;
+		if (Node->GetType() == ESequencerNode::Object)
+		{
+			TSharedPtr<FSequencerObjectBindingNode> ObjectBindingNode = StaticCastSharedRef<FSequencerObjectBindingNode>(Node);
+			if (ObjectBindingNode.IsValid())
+			{
+				ObjectBinding = ObjectBindingNode->GetObjectBinding();
+			}
+		}
+		else
+		{
+			TSharedPtr<FSequencerObjectBindingNode> ParentObjectBinding = Node->FindParentObjectBindingNode();
+			ObjectBinding = ParentObjectBinding.IsValid() ? ParentObjectBinding->GetObjectBinding() : FGuid();
+		}
 
 		for (TSharedPtr<IKeyArea> KeyArea : KeyAreas)
 		{
diff --git a/Engine/Source/Editor/Sequencer/Private/SequencerTimeSliderController.cpp b/Engine/Source/Editor/Sequencer/Private/SequencerTimeSliderController.cpp
index 6e35b0f0ef35..cefe2fac8170 100644
--- a/Engine/Source/Editor/Sequencer/Private/SequencerTimeSliderController.cpp
+++ b/Engine/Source/Editor/Sequencer/Private/SequencerTimeSliderController.cpp
@@ -42,7 +42,7 @@ FSequencerTimeSliderController::FSequencerTimeSliderController( const FTimeSlide
 	, MouseDragType( DRAG_NONE )
 	, bPanning( false )
 {
-	ScrubFillBrush                 = FEditorStyle::GetBrush( TEXT( "Sequencer.Timeline.ScrubFill" ) );
+	ScrubFillBrush              = FEditorStyle::GetBrush( TEXT( "Sequencer.Timeline.ScrubFill" ) );
 	FrameBlockScrubHandleUpBrush   = FEditorStyle::GetBrush( TEXT( "Sequencer.Timeline.FrameBlockScrubHandleUp" ) ); 
 	FrameBlockScrubHandleDownBrush = FEditorStyle::GetBrush( TEXT( "Sequencer.Timeline.FrameBlockScrubHandleDown" ) );
 	VanillaScrubHandleUpBrush      = FEditorStyle::GetBrush( TEXT( "Sequencer.Timeline.VanillaScrubHandleUp" ) ); 
@@ -211,9 +211,9 @@ void FSequencerTimeSliderController::DrawTicks( FSlateWindowElementList& OutDraw
 	LinePoints.SetNumUninitialized(2);
 
 	const bool bAntiAliasLines = false;
-	
-	const double FirstMajorLine  = FMath::FloorToDouble(ViewRange.GetLowerBoundValue() / MajorGridStep) * MajorGridStep;
-	const double LastMajorLine   = FMath::CeilToDouble(ViewRange.GetUpperBoundValue() / MajorGridStep) * MajorGridStep;
+
+	const double FirstMajorLine = FMath::FloorToDouble(ViewRange.GetLowerBoundValue() / MajorGridStep) * MajorGridStep;
+	const double LastMajorLine  = FMath::CeilToDouble(ViewRange.GetUpperBoundValue() / MajorGridStep) * MajorGridStep;
 
 	const float  FlooredScrubPx  = RangeToScreen.InputToLocalX(ConvertFrameTime(TimeSliderArgs.ScrubPosition.Get(), TickResolution, GetDisplayRate()).FloorToFrame() / DisplayRate);
 
@@ -987,26 +987,26 @@ int32 FSequencerTimeSliderController::OnPaintSectionView( const FGeometry& Allot
 			);
 		}
 
-		// Draw a line for the scrub position
-		TArray<FVector2D> LinePoints;
-		{
+			// Draw a line for the scrub position
+			TArray<FVector2D> LinePoints;
+			{
 			float LinePos = RangeToScreen.InputToLocalX(ScrubPosition.AsSeconds());
 
-			LinePoints.AddUninitialized(2);
+				LinePoints.AddUninitialized(2);
 			LinePoints[0] = FVector2D( LinePos, 0.0f );
 			LinePoints[1] = FVector2D( LinePos, FMath::FloorToFloat( AllottedGeometry.Size.Y ) );
-		}
+			}
 
-		FSlateDrawElement::MakeLines(
-			OutDrawElements,
-			LayerId+1,
+			FSlateDrawElement::MakeLines(
+				OutDrawElements,
+				LayerId+1,
 			AllottedGeometry.ToPaintGeometry(),
-			LinePoints,
-			DrawEffects,
-			FLinearColor(1.f, 1.f, 1.f, .5f),
-			false
-		);
-	}
+				LinePoints,
+				DrawEffects,
+				FLinearColor(1.f, 1.f, 1.f, .5f),
+				false
+			);
+		}
 
 	return LayerId;
 }
diff --git a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.cpp b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.cpp
index 0a162c02500e..b38753e5069e 100644
--- a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.cpp
+++ b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.cpp
@@ -35,6 +35,8 @@
 #include "Settings/EditorExperimentalSettings.h"
 #include "Algo/Transform.h"
 #include "ISkeletonTreeItem.h"
+#include "FbxMeshUtils.h"
+#include "LODUtilities.h"
 
 #include "LODUtilities.h"
 #include "ScopedTransaction.h"
@@ -161,6 +163,9 @@ void FSkeletalMeshEditor::BindCommands()
 	ToolkitCommands->MapAction(FSkeletalMeshEditorCommands::Get().ReimportMesh,
 		FExecuteAction::CreateSP(this, &FSkeletalMeshEditor::HandleReimportMesh));
 
+	ToolkitCommands->MapAction(FSkeletalMeshEditorCommands::Get().ReimportAllMesh,
+		FExecuteAction::CreateSP(this, &FSkeletalMeshEditor::HandleReimportAllMesh));
+
 	ToolkitCommands->MapAction(FSkeletalMeshEditorCommands::Get().MeshSectionSelection,
 		FExecuteAction::CreateSP(this, &FSkeletalMeshEditor::ToggleMeshSectionSelection),
 		FCanExecuteAction(), 
@@ -181,8 +186,22 @@ void FSkeletalMeshEditor::ExtendToolbar()
 
 	ToolbarExtender = MakeShareable(new FExtender);
 
+	auto ConstructReimportContextMenu = [this]()
+	{
+		FMenuBuilder MenuBuilder(true, nullptr);
+		MenuBuilder.AddMenuEntry(FSkeletalMeshEditorCommands::Get().ReimportMesh->GetLabel(),
+			FSkeletalMeshEditorCommands::Get().ReimportMesh->GetDescription(),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &FSkeletalMeshEditor::HandleReimportMesh)));
+		MenuBuilder.AddMenuEntry(FSkeletalMeshEditorCommands::Get().ReimportAllMesh->GetLabel(),
+			FSkeletalMeshEditorCommands::Get().ReimportAllMesh->GetDescription(),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &FSkeletalMeshEditor::HandleReimportAllMesh)));
+		return MenuBuilder.MakeWidget();
+	};
+
 	// extend extra menu/toolbars
-	auto FillToolbar = [this](FToolBarBuilder& ToolbarBuilder)
+	auto FillToolbar = [this, ConstructReimportContextMenu](FToolBarBuilder& ToolbarBuilder)
 	{
 		FPersonaModule& PersonaModule = FModuleManager::LoadModuleChecked<FPersonaModule>("Persona");
 		FPersonaModule::FCommonToolbarExtensionArgs Args;
@@ -192,6 +211,12 @@ void FSkeletalMeshEditor::ExtendToolbar()
 		ToolbarBuilder.BeginSection("Mesh");
 		{
 			ToolbarBuilder.AddToolBarButton(FSkeletalMeshEditorCommands::Get().ReimportMesh);
+			ToolbarBuilder.AddComboButton(
+				FUIAction(),
+				FOnGetContent::CreateLambda(ConstructReimportContextMenu),
+				TAttribute<FText>(),
+				TAttribute<FText>()
+			);
 		}
 		ToolbarBuilder.EndSection();
 
@@ -682,6 +707,39 @@ void FSkeletalMeshEditor::HandleReimportMesh()
 	}
 }
 
+void FSkeletalMeshEditor::HandleReimportAllMesh()
+{
+	// Reimport the asset
+	if (SkeletalMesh)
+	{
+		//Reimport base LOD
+		if (FReimportManager::Instance()->Reimport(SkeletalMesh, true))
+		{
+			//Reimport all custom LODs
+			for (int32 LodIndex = 1; LodIndex < SkeletalMesh->GetLODNum(); ++LodIndex)
+			{
+				//Do not reimport LOD that was re-import with the base mesh
+				if (SkeletalMesh->GetLODInfo(LodIndex)->bImportWithBaseMesh)
+				{
+					continue;
+				}
+				if (SkeletalMesh->GetLODInfo(LodIndex)->bHasBeenSimplified == false)
+				{
+					FbxMeshUtils::ImportMeshLODDialog(SkeletalMesh, LodIndex);
+				}
+				else
+				{
+					//Regenerate the LOD
+					FSkeletalMeshUpdateContext UpdateContext;
+					UpdateContext.SkeletalMesh = SkeletalMesh;
+					UpdateContext.AssociatedComponents.Push(GetPersonaToolkit()->GetPreviewMeshComponent());
+					FLODUtilities::SimplifySkeletalMeshLOD(UpdateContext, LodIndex);
+				}
+			}
+		}
+	}
+}
+
 void FSkeletalMeshEditor::ToggleMeshSectionSelection()
 {
 	TSharedRef<IPersonaPreviewScene> PreviewScene = GetPersonaToolkit()->GetPreviewScene();
diff --git a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.h b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.h
index 03775a1b3f51..c3a78c258a72 100644
--- a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.h
+++ b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditor.h
@@ -97,6 +97,7 @@ private:
 	void HandleSelectionChanged(const TArrayView<TSharedPtr<ISkeletonTreeItem>>& InSelectedItems, ESelectInfo::Type InSelectInfo);
 
 	void HandleReimportMesh();
+	void HandleReimportAllMesh();
 
 	/** Callback for toggling UV drawing in the viewport */
 	void ToggleMeshSectionSelection();
diff --git a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.cpp b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.cpp
index 338e0a574939..07551805bf4f 100644
--- a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.cpp
+++ b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.cpp
@@ -8,6 +8,7 @@
 void FSkeletalMeshEditorCommands::RegisterCommands()
 {
 	UI_COMMAND(ReimportMesh, "Reimport Mesh", "Reimport the current mesh.", EUserInterfaceActionType::Button, FInputChord());
+	UI_COMMAND(ReimportAllMesh, "Reimport All Mesh", "Reimport the current mesh and all the custom LODs.", EUserInterfaceActionType::Button, FInputChord());
 
 	UI_COMMAND(MeshSectionSelection, "Section Selection", "Enables selecting Mesh Sections in the viewport (disables selecting bones using their physics shape).", EUserInterfaceActionType::ToggleButton, FInputChord());
 }
diff --git a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.h b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.h
index 4508eaac87d1..6a4b04ebd910 100644
--- a/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.h
+++ b/Engine/Source/Editor/SkeletalMeshEditor/Private/SkeletalMeshEditorCommands.h
@@ -21,6 +21,9 @@ public:
 	// reimport current mesh
 	TSharedPtr<FUICommandInfo> ReimportMesh;
 
+	// reimport current mesh
+	TSharedPtr<FUICommandInfo> ReimportAllMesh;
+
 	// selecting mesh section using hit proxies
 	TSharedPtr<FUICommandInfo> MeshSectionSelection;
 };
diff --git a/Engine/Source/Editor/SkeletonEditor/Private/SSkeletonTree.cpp b/Engine/Source/Editor/SkeletonEditor/Private/SSkeletonTree.cpp
index 9c3336a1bfb8..a18a899169ec 100644
--- a/Engine/Source/Editor/SkeletonEditor/Private/SSkeletonTree.cpp
+++ b/Engine/Source/Editor/SkeletonEditor/Private/SSkeletonTree.cpp
@@ -746,6 +746,7 @@ TSharedPtr< SWidget > SSkeletonTree::CreateContextMenu()
 						FUIAction RecursiveRetargetingAnimationAction = FUIAction(FExecuteAction::CreateSP(this, &SSkeletonTree::SetBoneTranslationRetargetingModeRecursive, EBoneTranslationRetargetingMode::Animation));
 						FUIAction RecursiveRetargetingAnimationScaledAction = FUIAction(FExecuteAction::CreateSP(this, &SSkeletonTree::SetBoneTranslationRetargetingModeRecursive, EBoneTranslationRetargetingMode::AnimationScaled));
 						FUIAction RecursiveRetargetingAnimationRelativeAction = FUIAction(FExecuteAction::CreateSP(this, &SSkeletonTree::SetBoneTranslationRetargetingModeRecursive, EBoneTranslationRetargetingMode::AnimationRelative));
+						FUIAction RecursiveRetargetingOrientAndScaleAction = FUIAction(FExecuteAction::CreateSP(this, &SSkeletonTree::SetBoneTranslationRetargetingModeRecursive, EBoneTranslationRetargetingMode::OrientAndScale));
 
 						MenuBuilder.AddMenuEntry
 							(LOCTEXT("SetTranslationRetargetingSkeletonChildrenAction", "Recursively Set Translation Retargeting Skeleton")
@@ -774,6 +775,13 @@ TSharedPtr< SWidget > SSkeletonTree::CreateContextMenu()
 							, FSlateIcon()
 							, RecursiveRetargetingAnimationRelativeAction
 							);
+
+						MenuBuilder.AddMenuEntry
+							(LOCTEXT("SetTranslationRetargetingOrientAndScaleChildrenAction", "Recursively Set Translation Retargeting OrientAndScale")
+							, LOCTEXT("BoneTranslationRetargetingOrientAndScaleToolTip", "Orient And Scale Translation.")
+							, FSlateIcon()
+							, RecursiveRetargetingOrientAndScaleAction
+						);
 					}
 					MenuBuilder.EndSection();
 				}
diff --git a/Engine/Source/Editor/SkeletonEditor/Private/SkeletonTreeBoneItem.cpp b/Engine/Source/Editor/SkeletonEditor/Private/SkeletonTreeBoneItem.cpp
index dc39ced14d81..b4bfff680413 100644
--- a/Engine/Source/Editor/SkeletonEditor/Private/SkeletonTreeBoneItem.cpp
+++ b/Engine/Source/Editor/SkeletonEditor/Private/SkeletonTreeBoneItem.cpp
@@ -175,6 +175,10 @@ TSharedRef< SWidget > FSkeletonTreeBoneItem::CreateBoneTranslationRetargetingMod
 
 		FUIAction ActionRetargetingAnimationRelative = FUIAction(FExecuteAction::CreateSP(this, &FSkeletonTreeBoneItem::SetBoneTranslationRetargetingMode, EBoneTranslationRetargetingMode::AnimationRelative));
 		MenuBuilder.AddMenuEntry( Enum->GetDisplayNameTextByValue(EBoneTranslationRetargetingMode::AnimationRelative), LOCTEXT("BoneTranslationRetargetingAnimationRelativeToolTip", "Use relative translation from animation similar to an additive animation."), FSlateIcon(), ActionRetargetingAnimationRelative);
+
+		FUIAction ActionRetargetingOrientAndScale = FUIAction(FExecuteAction::CreateSP(this, &FSkeletonTreeBoneItem::SetBoneTranslationRetargetingMode, EBoneTranslationRetargetingMode::OrientAndScale));
+		MenuBuilder.AddMenuEntry(Enum->GetDisplayNameTextByValue(EBoneTranslationRetargetingMode::OrientAndScale), LOCTEXT("BoneTranslationRetargetingOrientAndScaleToolTip", "Orient And Scale Translation."), FSlateIcon(), ActionRetargetingOrientAndScale);
+
 	}
 	MenuBuilder.EndSection();
 
diff --git a/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.cpp b/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.cpp
index fdb4e13adbd7..353f605adbc4 100644
--- a/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.cpp
+++ b/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.cpp
@@ -193,7 +193,7 @@ void SSourceControlSubmitWidget::Construct(const FArguments& InArgs)
 					.HAlign(HAlign_Center)
 					.ContentPadding(FEditorStyle::GetMargin("StandardDialog.ContentPadding"))
 					.IsEnabled(this, &SSourceControlSubmitWidget::IsOKEnabled)
-					.Text( NSLOCTEXT("SourceControl.SubmitPanel", "OKButton", "OK") )
+					.Text( NSLOCTEXT("SourceControl.SubmitPanel", "OKButton", "Submit") )
 					.OnClicked(this, &SSourceControlSubmitWidget::OKClicked)
 				]
 				+SUniformGridPanel::Slot(1,0)
diff --git a/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.h b/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.h
index 9c977df4d13b..da8d2533561a 100644
--- a/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.h
+++ b/Engine/Source/Editor/SourceControlWindows/Private/SSourceControlSubmit.h
@@ -118,7 +118,6 @@ public:
 
 	/** Does the user want to keep the files checked out */
 	bool WantToKeepCheckedOut();
-
 private:
 	/**
 	 * @return the desired toggle state for the ToggleSelectedCheckBox.
diff --git a/Engine/Source/Editor/SourceControlWindows/Public/SourceControlWindows.h b/Engine/Source/Editor/SourceControlWindows/Public/SourceControlWindows.h
index 6f0f5f2b66db..58ceeea0e43d 100644
--- a/Engine/Source/Editor/SourceControlWindows/Public/SourceControlWindows.h
+++ b/Engine/Source/Editor/SourceControlWindows/Public/SourceControlWindows.h
@@ -97,6 +97,8 @@ protected:
 	/** Delegate called when the user has decided to cancel the check in process */
 	static void ChoosePackagesToCheckInCancelled(FSourceControlOperationRef InOperation);
 
+	/** Delegate called when the user clicks submit.  if the return value is true the submit dialog is closed.  Otherwise it is left open for further corrections */
+	static bool OnSubmitClicked(TSharedRef<class SSourceControlSubmitWidget> SourceControlWidget);
 private:
 	/** The notification in place while we choose packages to check in */
 	static TWeakPtr<class SNotificationItem> ChoosePackagesToCheckInNotification;
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.cpp b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.cpp
index ae85703116bc..544ebdde3e17 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.cpp
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.cpp
@@ -43,6 +43,8 @@
 #include "AdvancedPreviewSceneModule.h"
 
 #include "ConvexDecompositionNotification.h"
+#include "FbxMeshUtils.h"
+#include "RawMesh.h"
 
 #define LOCTEXT_NAMESPACE "StaticMeshEditor"
 
@@ -514,11 +516,41 @@ void FStaticMeshEditor::ExtendToolBar()
 	{
 		static void FillToolbar(FToolBarBuilder& ToolbarBuilder, FStaticMeshEditor* ThisEditor) 
 		{
+			auto ConstructReimportContextMenu = [ThisEditor]()
+			{
+				FMenuBuilder MenuBuilder(true, nullptr);
+				MenuBuilder.AddMenuEntry(FStaticMeshEditorCommands::Get().ReimportMesh->GetLabel(),
+					FStaticMeshEditorCommands::Get().ReimportMesh->GetDescription(),
+					FSlateIcon(),
+					FUIAction(FExecuteAction::CreateSP(ThisEditor, &FStaticMeshEditor::HandleReimportMesh)));
+				MenuBuilder.AddMenuEntry(FStaticMeshEditorCommands::Get().ReimportAllMesh->GetLabel(),
+					FStaticMeshEditorCommands::Get().ReimportAllMesh->GetDescription(),
+					FSlateIcon(),
+					FUIAction(FExecuteAction::CreateSP(ThisEditor, &FStaticMeshEditor::HandleReimportAllMesh)));
+				return MenuBuilder.MakeWidget();
+			};
+
 			ToolbarBuilder.BeginSection("Realtime");
 			{
 				ToolbarBuilder.AddToolBarButton(FEditorViewportCommands::Get().ToggleRealTime);
 			}
 			ToolbarBuilder.EndSection();
+			
+			ToolbarBuilder.BeginSection("Mesh");
+			{
+				ToolbarBuilder.AddToolBarButton(FUIAction(FExecuteAction::CreateSP(ThisEditor, &FStaticMeshEditor::HandleReimportMesh)),
+					NAME_None,
+					FStaticMeshEditorCommands::Get().ReimportMesh->GetLabel(),
+					FStaticMeshEditorCommands::Get().ReimportMesh->GetDescription(),
+					FStaticMeshEditorCommands::Get().ReimportMesh->GetIcon());
+				ToolbarBuilder.AddComboButton(
+					FUIAction(),
+					FOnGetContent::CreateLambda(ConstructReimportContextMenu),
+					TAttribute<FText>(),
+					TAttribute<FText>()
+				);
+			}
+			ToolbarBuilder.EndSection();
 	
 			ToolbarBuilder.BeginSection("Command");
 			{
@@ -1179,6 +1211,42 @@ void FStaticMeshEditor::ComboBoxSelectionChanged( TSharedPtr<FString> NewSelecti
 	Viewport->RefreshViewport();
 }
 
+void FStaticMeshEditor::HandleReimportMesh()
+{
+	// Reimport the asset
+	if (StaticMesh)
+	{
+		FReimportManager::Instance()->Reimport(StaticMesh, true);
+	}
+}
+
+void FStaticMeshEditor::HandleReimportAllMesh()
+{
+	// Reimport the asset
+	if (StaticMesh)
+	{
+		//Reimport base LOD, generated mesh will be rebuild here, the static mesh is always using the base mesh to reduce LOD
+		if (FReimportManager::Instance()->Reimport(StaticMesh, true))
+		{
+			TArray<FStaticMeshSourceModel>& SourceModels = StaticMesh->SourceModels;
+			//Reimport all custom LODs
+			for (int32 LodIndex = 1; LodIndex < StaticMesh->GetNumLODs(); ++LodIndex)
+			{
+				//Skip LOD import in the same file as the base mesh, they are already re-import
+				if (SourceModels[LodIndex].bImportWithBaseMesh)
+				{
+					continue;
+				}
+				bool bHasBeenSimplified = SourceModels[LodIndex].RawMeshBulkData->IsEmpty() || SourceModels[LodIndex].ReductionSettings.PercentTriangles < 1.0f || SourceModels[LodIndex].ReductionSettings.MaxDeviation > 0.0f;
+				if (!bHasBeenSimplified)
+				{
+					FbxMeshUtils::ImportMeshLODDialog(StaticMesh, LodIndex);
+				}
+			}
+		}
+	}
+}
+
 int32 FStaticMeshEditor::GetCurrentUVChannel()
 {
 	return FMath::Min(CurrentViewedUVChannel, GetNumUVChannels());
@@ -1200,6 +1268,20 @@ int32 FStaticMeshEditor::GetCurrentLODIndex()
 	return Index == 0? 0 : Index - 1;
 }
 
+int32 FStaticMeshEditor::GetCustomData(const int32 Key) const
+{
+	if (!CustomEditorData.Contains(Key))
+	{
+		return INDEX_NONE;
+	}
+	return CustomEditorData[Key];
+}
+
+void FStaticMeshEditor::SetCustomData(const int32 Key, const int32 CustomData)
+{
+	CustomEditorData.FindOrAdd(Key) = CustomData;
+}
+
 void FStaticMeshEditor::GenerateKDop(const FVector* Directions, uint32 NumDirections)
 {
 	TArray<FVector>	DirArray;
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.h b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.h
index fc998efef17a..ddfd97ea6446 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.h
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditor.h
@@ -113,6 +113,9 @@ public:
 	virtual int32 GetCurrentLODLevel() override;
 	virtual int32 GetCurrentLODIndex() override;
 
+	virtual int32 GetCustomData(const int32 Key) const override;
+	virtual void SetCustomData(const int32 Key, const int32 CustomData) override;
+
 	virtual void RefreshTool() override;
 	virtual void RefreshViewport() override;
 	virtual void DoDecomp(uint32 InHullCount, int32 InMaxHullVerts, uint32 InHullPrecision) override;
@@ -211,6 +214,12 @@ private:
 	/** A general callback for the combo boxes in the Static Mesh Editor to force a viewport refresh when a selection changes. */
 	void ComboBoxSelectionChanged(TSharedPtr<FString> NewSelection, ESelectInfo::Type SelectInfo);
 
+	/* Callback to reimport the base mesh*/
+	void HandleReimportMesh();
+	
+	/* Callback to reimport the base mesh and also all custom LODs*/
+	void HandleReimportAllMesh();
+
 	/**
 	 *	Sets the editor's current mesh and refreshes various settings to correspond with the new data.
 	 *
@@ -389,4 +398,7 @@ private:
 	static const FName SocketManagerTabId;
 	static const FName CollisionTabId;
 	static const FName PreviewSceneSettingsTabId;
+
+	/** Allow custom data for this editor */
+	TMap<int32, int32> CustomEditorData;
 };
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorActions.cpp b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorActions.cpp
index 40fb82714679..ab1d0283c8b3 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorActions.cpp
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorActions.cpp
@@ -17,6 +17,9 @@ void FStaticMeshEditorCommands::RegisterCommands()
 	UI_COMMAND( SetShowSockets, "Sockets", "Displays the static mesh sockets.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( SetDrawAdditionalData, "Additional Data", "Draw additional user data associated with asset.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 
+	UI_COMMAND( ReimportMesh, "Reimport Mesh", "Reimport the current mesh.", EUserInterfaceActionType::Button, FInputChord() );
+	UI_COMMAND( ReimportAllMesh, "Reimport All Mesh", "Reimport the current mesh and all the custom LODs.", EUserInterfaceActionType::Button, FInputChord() );
+
 	UI_COMMAND( SetShowNormals, "Normals", "Toggles display of vertex normals in the Preview Pane.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( SetShowTangents, "Tangents", "Toggles display of vertex tangents in the Preview Pane.", EUserInterfaceActionType::ToggleButton, FInputChord() );
 	UI_COMMAND( SetShowBinormals, "Binormals", "Toggles display of vertex binormals (orthogonal vector to normal and tangent) in the Preview Pane.", EUserInterfaceActionType::ToggleButton, FInputChord() );
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.cpp b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.cpp
index adc8f7e9d4e7..a6a50b27f151 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.cpp
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.cpp
@@ -36,6 +36,9 @@
 #include "Engine/SkeletalMesh.h"
 #include "IMeshReductionManagerModule.h"
 #include "HAL/PlatformApplicationMisc.h"
+#include "Widgets/Input/SFilePathPicker.h"
+#include "EditorDirectories.h"
+#include "EditorFramework/AssetImportData.h"
 
 const uint32 MaxHullCount = 64;
 const uint32 MinHullCount = 2;
@@ -55,6 +58,16 @@ const int32 DefaultVertsPerHull = 16;
 #define LOCTEXT_NAMESPACE "StaticMeshEditor"
 DEFINE_LOG_CATEGORY_STATIC(LogStaticMeshEditorTools,Log,All);
 
+/*
+* Custom data key
+*/
+enum SM_CustomDataKey
+{
+	CustomDataKey_LODVisibilityState = 0, //This is the key to know if a LOD is shown in custom mode. Do CustomDataKey_LODVisibilityState + LodIndex for a specific LOD
+	CustomDataKey_LODEditMode = 100 //This is the key to know the state of the custom lod edit mode.
+};
+
+
 FStaticMeshDetails::FStaticMeshDetails( class FStaticMeshEditor& InStaticMeshEditor )
 	: StaticMeshEditor( InStaticMeshEditor )
 {}
@@ -1412,8 +1425,9 @@ void FMeshSectionSettingsLayout::AddToCategory( IDetailCategoryBuilder& Category
 	SectionListDelegates.OnCopySectionItem.BindSP(this, &FMeshSectionSettingsLayout::OnCopySectionItem);
 	SectionListDelegates.OnCanCopySectionItem.BindSP(this, &FMeshSectionSettingsLayout::OnCanCopySectionItem);
 	SectionListDelegates.OnPasteSectionItem.BindSP(this, &FMeshSectionSettingsLayout::OnPasteSectionItem);
-
-	CategoryBuilder.AddCustomBuilder(MakeShareable(new FSectionList(CategoryBuilder.GetParentLayout(), SectionListDelegates, false, 64, LODIndex)));
+	//We need a valid name if we want the section expand state to be saved
+	FName StaticMeshSectionListName = FName(*(FString(TEXT("StaticMeshSectionListNameLOD_")) + FString::FromInt(LODIndex)));
+	CategoryBuilder.AddCustomBuilder(MakeShareable(new FSectionList(CategoryBuilder.GetParentLayout(), SectionListDelegates, true, 64, LODIndex, StaticMeshSectionListName)));
 
 	StaticMeshEditor.RegisterOnSelectedLODChanged(FOnSelectedLODChanged::CreateSP(this, &FMeshSectionSettingsLayout::UpdateLODCategoryVisibility), false);
 }
@@ -1957,7 +1971,7 @@ void FMeshSectionSettingsLayout::SetCurrentLOD(int32 NewLodIndex)
 
 void FMeshSectionSettingsLayout::UpdateLODCategoryVisibility()
 {
-	if (CustomLODEditModePtr != nullptr && *CustomLODEditModePtr == true)
+	if (StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		//Do not change the Category visibility if we are in custom mode
 		return;
@@ -2954,8 +2968,6 @@ void FLevelOfDetailSettingsLayout::AddLODLevelCategories( IDetailLayoutBuilder&
 			.OnCheckStateChanged(this, &FLevelOfDetailSettingsLayout::SetLODCustomModeCheck, (int32)INDEX_NONE)
 			.ToolTipText(LOCTEXT("LODCustomModeFirstRowTooltip", "Custom Mode allow editing multiple LOD in same time."))
 		];
-		//Set the custom mode to false
-		CustomLODEditMode = false;
 		// Create information panel for each LOD level.
 		for(int32 LODIndex = 0; LODIndex < StaticMeshLODCount; ++LODIndex)
 		{
@@ -3020,45 +3032,63 @@ void FLevelOfDetailSettingsLayout::AddLODLevelCategories( IDetailLayoutBuilder&
 			CategoryName.AppendInt( LODIndex );
 
 			FText LODLevelString = FText::FromString(FString(TEXT("LOD ")) + FString::FromInt(LODIndex) );
+			bool bHasBeenSimplified = StaticMesh->SourceModels[LODIndex].RawMeshBulkData->IsEmpty() || StaticMesh->SourceModels[LODIndex].ReductionSettings.PercentTriangles < 1.0f || StaticMesh->SourceModels[LODIndex].ReductionSettings.MaxDeviation > 0.0f;
+			FText GeneratedString = FText::FromString(bHasBeenSimplified ? TEXT("[generated]") : TEXT(""));
 
 			IDetailCategoryBuilder& LODCategory = DetailBuilder.EditCategory( *CategoryName, LODLevelString, ECategoryPriority::Important );
 			LodCategories.Add(&LODCategory);
 
 			LODCategory.HeaderContent
 			(
-				SNew( SBox )
-				.HAlign( HAlign_Right )
+				SNew( SHorizontalBox )
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
 				[
-					SNew( SHorizontalBox )
-					+ SHorizontalBox::Slot()
-					.Padding(FMargin(5.0f, 0.0f))
-					.AutoWidth()
+					SNew(SBox)
+					.Padding(FMargin(4.0f, 0.0f))
 					[
 						SNew(STextBlock)
-						.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
-						.Text(this, &FLevelOfDetailSettingsLayout::GetLODScreenSizeTitle, LODIndex)
-						.Visibility( LODIndex > 0 ? EVisibility::Visible : EVisibility::Collapsed )
+						.Text(GeneratedString)
+						.Font(IDetailLayoutBuilder::GetDetailFontItalic())
 					]
-					+ SHorizontalBox::Slot()
-					.Padding( FMargin( 5.0f, 0.0f ) )
-					.AutoWidth()
+				]
+				+SHorizontalBox::Slot()
+				.FillWidth(1.0f)
+				[
+					SNew( SBox )
+					.HAlign( HAlign_Right )
 					[
-						SNew(STextBlock)
-						.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
-						.Text( FText::Format( LOCTEXT("Triangles_MeshSimplification", "Triangles: {0}"), FText::AsNumber( StaticMeshEditor.GetNumTriangles(LODIndex) ) ) )
-					]
-					+ SHorizontalBox::Slot()
-					.Padding( FMargin( 5.0f, 0.0f ) )
-					.AutoWidth()
-					[
-						SNew(STextBlock)
-						.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
-						.Text( FText::Format( LOCTEXT("Vertices_MeshSimplification", "Vertices: {0}"), FText::AsNumber( StaticMeshEditor.GetNumVertices(LODIndex) ) ) )
+						SNew( SHorizontalBox )
+						+ SHorizontalBox::Slot()
+						.Padding(FMargin(5.0f, 0.0f))
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
+							.Text(this, &FLevelOfDetailSettingsLayout::GetLODScreenSizeTitle, LODIndex)
+							.Visibility( LODIndex > 0 ? EVisibility::Visible : EVisibility::Collapsed )
+						]
+						+ SHorizontalBox::Slot()
+						.Padding( FMargin( 5.0f, 0.0f ) )
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
+							.Text( FText::Format( LOCTEXT("Triangles_MeshSimplification", "Triangles: {0}"), FText::AsNumber( StaticMeshEditor.GetNumTriangles(LODIndex) ) ) )
+						]
+						+ SHorizontalBox::Slot()
+						.Padding( FMargin( 5.0f, 0.0f ) )
+						.AutoWidth()
+						[
+							SNew(STextBlock)
+							.Font(FEditorStyle::GetFontStyle("StaticMeshEditor.NormalFont"))
+							.Text( FText::Format( LOCTEXT("Vertices_MeshSimplification", "Vertices: {0}"), FText::AsNumber( StaticMeshEditor.GetNumVertices(LODIndex) ) ) )
+						]
 					]
 				]
 			);
 					
-			SectionSettingsWidgets[ LODIndex ] = MakeShareable( new FMeshSectionSettingsLayout( StaticMeshEditor, LODIndex, LodCategories, &CustomLODEditMode) );
+			SectionSettingsWidgets[ LODIndex ] = MakeShareable( new FMeshSectionSettingsLayout( StaticMeshEditor, LODIndex, LodCategories) );
 			SectionSettingsWidgets[ LODIndex ]->AddToCategory( LODCategory );
 
 			LODCategory.AddCustomRow(( LOCTEXT("ScreenSizeRow", "ScreenSize")))
@@ -3079,6 +3109,32 @@ void FLevelOfDetailSettingsLayout::AddLODLevelCategories( IDetailLayoutBuilder&
 				.PlatformOverrideNames(this, &FLevelOfDetailSettingsLayout::GetLODScreenSizePlatformOverrideNames, LODIndex)
 			];
 
+			if(LODIndex > 0 && StaticMesh->SourceModels.IsValidIndex(LODIndex) && !StaticMesh->SourceModels[LODIndex].RawMeshBulkData->IsEmpty())
+			{
+				FString FileTypeFilter = TEXT("All files (*.*)|*.*");
+				LODCategory.AddCustomRow(( LOCTEXT("SourceImporFilenameRow", "SourceImportFilename")))
+				.NameContent()
+				[
+					SNew(STextBlock)
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+					.Text(LOCTEXT("SourceImportFilenameName", "Source Import Filename"))
+				]
+				.ValueContent()
+					.MinDesiredWidth(125.0f)
+					.MaxDesiredWidth(0.0f)
+				[
+					SNew(SFilePathPicker)
+						.BrowseButtonImage(FEditorStyle::GetBrush("PropertyWindow.Button_Ellipsis"))
+						.BrowseButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
+						.BrowseButtonToolTip(LOCTEXT("FileButtonToolTipText", "Choose a source import file"))
+						.BrowseDirectory(FEditorDirectories::Get().GetLastDirectory(ELastDirectory::GENERIC_OPEN))
+						.BrowseTitle(LOCTEXT("PropertyEditorTitle", "Source import file picker..."))
+						.FilePath(this, &FLevelOfDetailSettingsLayout::GetSourceImportFilename, LODIndex)
+						.FileTypeFilter(FileTypeFilter)
+						.OnPathPicked(this, &FLevelOfDetailSettingsLayout::SetSourceImportFilename, LODIndex)
+				];
+			}
+
 			if (BuildSettingsWidgets[LODIndex].IsValid())
 			{
 				LODCategory.AddCustomBuilder( BuildSettingsWidgets[LODIndex].ToSharedRef() );
@@ -3115,6 +3171,37 @@ void FLevelOfDetailSettingsLayout::AddLODLevelCategories( IDetailLayoutBuilder&
 			LODCustomModeCategory.SetCategoryVisibility(true);
 			LODCustomModeCategory.SetShowAdvanced(false);
 		}
+
+
+
+		//Restore the state of the custom check LOD
+		for (int32 DetailLODIndex = 0; DetailLODIndex < StaticMeshLODCount; ++DetailLODIndex)
+		{
+			int32 LodCheckValue = StaticMeshEditor.GetCustomData(CustomDataKey_LODVisibilityState + DetailLODIndex);
+			if (LodCheckValue != INDEX_NONE)
+			{
+				DetailDisplayLODs[DetailLODIndex] = LodCheckValue > 0;
+			}
+		}
+
+		//Restore the state of the custom LOD mode if its true (greater then 0)
+		bool bCustomLodEditMode = StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0;
+		if (bCustomLodEditMode)
+		{
+			for (int32 DetailLODIndex = 0; DetailLODIndex < StaticMeshLODCount; ++DetailLODIndex)
+			{
+				if (!LodCategories.IsValidIndex(DetailLODIndex))
+				{
+					break;
+				}
+				LodCategories[DetailLODIndex]->SetCategoryVisibility(DetailDisplayLODs[DetailLODIndex]);
+			}
+		}
+
+		if (LodCustomCategory != nullptr)
+		{
+			LodCustomCategory->SetShowAdvanced(bCustomLodEditMode);
+		}
 	}
 }
 
@@ -3123,6 +3210,34 @@ FLevelOfDetailSettingsLayout::~FLevelOfDetailSettingsLayout()
 {
 }
 
+FString FLevelOfDetailSettingsLayout::GetSourceImportFilename(int32 LODIndex) const
+{
+	UStaticMesh* Mesh = StaticMeshEditor.GetStaticMesh();
+	if (!Mesh->SourceModels.IsValidIndex(LODIndex) || Mesh->SourceModels[LODIndex].SourceImportFilename.IsEmpty())
+	{
+		return FString(TEXT(""));
+	}
+	return UAssetImportData::ResolveImportFilename(Mesh->SourceModels[LODIndex].SourceImportFilename, nullptr);
+}
+
+void FLevelOfDetailSettingsLayout::SetSourceImportFilename(const FString& SourceFileName, int32 LODIndex) const
+{
+	UStaticMesh* Mesh = StaticMeshEditor.GetStaticMesh();
+	if (!Mesh->SourceModels.IsValidIndex(LODIndex))
+	{
+		return;
+	}
+	if (SourceFileName.IsEmpty())
+	{
+		Mesh->SourceModels[LODIndex].SourceImportFilename = SourceFileName;
+	}
+	else
+	{
+		Mesh->SourceModels[LODIndex].SourceImportFilename = UAssetImportData::SanitizeImportFilename(SourceFileName, nullptr);
+	}
+	Mesh->Modify();
+}
+
 int32 FLevelOfDetailSettingsLayout::GetLODCount() const
 {
 	return LODCount;
@@ -3327,23 +3442,32 @@ void FLevelOfDetailSettingsLayout::OnLODGroupChanged(TSharedPtr<FString> NewValu
 	FName NewGroup = LODGroupNames[GroupIndex];
 	if (StaticMesh->LODGroup != NewGroup)
 	{
-		EAppReturnType::Type DialogResult = FMessageDialog::Open(
-			EAppMsgType::YesNo,
-			FText::Format( LOCTEXT("ApplyDefaultLODSettings", "Changing LOD group will overwrite the current settings with the defaults from LOD group '{0}'. Do you wish to continue?"), FText::FromString( **NewValue ) )
-			);
-		if (DialogResult == EAppReturnType::Yes)
+		if (NewGroup != NAME_None)
 		{
-			StaticMesh->SetLODGroup(NewGroup);
-			// update the internal count
-			LODCount = StaticMesh->SourceModels.Num();
-			StaticMeshEditor.RefreshTool();
+			EAppReturnType::Type DialogResult = FMessageDialog::Open(
+				EAppMsgType::YesNo,
+				FText::Format(LOCTEXT("ApplyDefaultLODSettings", "Changing LOD group will overwrite the current settings with the defaults from LOD group '{0}'. Do you wish to continue?"), FText::FromString(**NewValue))
+			);
+			if (DialogResult == EAppReturnType::Yes)
+			{
+				StaticMesh->SetLODGroup(NewGroup);
+				// update the internal count
+				LODCount = StaticMesh->SourceModels.Num();
+				StaticMeshEditor.RefreshTool();
+			}
+			else
+			{
+				// Overriding the selection; ensure that the widget correctly reflects the property value
+				int32 Index = LODGroupNames.Find(StaticMesh->LODGroup);
+				check(Index != INDEX_NONE);
+				LODGroupComboBox->SetSelectedItem(LODGroupOptions[Index]);
+			}
 		}
 		else
 		{
-			// Overriding the selection; ensure that the widget correctly reflects the property value
-			int32 Index = LODGroupNames.Find(StaticMesh->LODGroup);
-			check(Index != INDEX_NONE);
-			LODGroupComboBox->SetSelectedItem(LODGroupOptions[Index]);
+			//Setting to none just change the LODGroup to None, the LOD count will not change
+			StaticMesh->SetLODGroup(NewGroup);
+			StaticMeshEditor.RefreshTool();
 		}
 	}
 }
@@ -3630,7 +3754,7 @@ ECheckBoxState FLevelOfDetailSettingsLayout::IsLODCustomModeCheck(int32 LODIndex
 	}
 	if (LODIndex == INDEX_NONE)
 	{
-		return CustomLODEditMode ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+		return StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0 ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
 	}
 	return DetailDisplayLODs[LODIndex] ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
 }
@@ -3646,7 +3770,7 @@ void FLevelOfDetailSettingsLayout::SetLODCustomModeCheck(ECheckBoxState NewState
 	{
 		if (NewState == ECheckBoxState::Unchecked)
 		{
-			CustomLODEditMode = false;
+			StaticMeshEditor.SetCustomData(CustomDataKey_LODEditMode, 0);
 			SectionSettingsWidgets[0]->SetCurrentLOD(CurrentLodIndex);
 			for (int32 DetailLODIndex = 0; DetailLODIndex < MAX_STATIC_MESH_LODS; ++DetailLODIndex)
 			{
@@ -3659,16 +3783,17 @@ void FLevelOfDetailSettingsLayout::SetLODCustomModeCheck(ECheckBoxState NewState
 		}
 		else
 		{
-			CustomLODEditMode = true;
+			StaticMeshEditor.SetCustomData(CustomDataKey_LODEditMode, 1);
 			SectionSettingsWidgets[0]->SetCurrentLOD(0);
 		}
 	}
-	else if(CustomLODEditMode)
+	else if(StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		DetailDisplayLODs[LODIndex] = NewState == ECheckBoxState::Checked;
+		StaticMeshEditor.SetCustomData(CustomDataKey_LODVisibilityState + LODIndex, DetailDisplayLODs[LODIndex] ? 1 : 0);
 	}
 
-	if (CustomLODEditMode)
+	if (StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		for (int32 DetailLODIndex = 0; DetailLODIndex < MAX_STATIC_MESH_LODS; ++DetailLODIndex)
 		{
@@ -3682,7 +3807,7 @@ void FLevelOfDetailSettingsLayout::SetLODCustomModeCheck(ECheckBoxState NewState
 
 	if (LodCustomCategory != nullptr)
 	{
-		LodCustomCategory->SetShowAdvanced(CustomLODEditMode);
+		LodCustomCategory->SetShowAdvanced(StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0);
 	}
 }
 
@@ -3693,7 +3818,7 @@ bool FLevelOfDetailSettingsLayout::IsLODCustomModeEnable(int32 LODIndex) const
 		// Custom checkbox is always enable
 		return true;
 	}
-	return CustomLODEditMode;
+	return StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0;
 }
 
 TSharedRef<SWidget> FLevelOfDetailSettingsLayout::OnGenerateLodComboBoxForLodPicker()
@@ -3716,7 +3841,7 @@ TSharedRef<SWidget> FLevelOfDetailSettingsLayout::OnGenerateLodComboBoxForLodPic
 EVisibility FLevelOfDetailSettingsLayout::LodComboBoxVisibilityForLodPicker() const
 {
 	//No combo box when in Custom mode
-	if (CustomLODEditMode == true)
+	if (StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) > 0)
 	{
 		return EVisibility::Hidden;
 	}
@@ -3726,7 +3851,7 @@ EVisibility FLevelOfDetailSettingsLayout::LodComboBoxVisibilityForLodPicker() co
 bool FLevelOfDetailSettingsLayout::IsLodComboBoxEnabledForLodPicker() const
 {
 	//No combo box when in Custom mode
-	return !CustomLODEditMode;
+	return StaticMeshEditor.GetCustomData(CustomDataKey_LODEditMode) <= 0;
 }
 
 TSharedRef<SWidget> FLevelOfDetailSettingsLayout::OnGenerateLodMenuForLodPicker()
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.h b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.h
index 23c54b7d5687..5ac4b2fc5a42 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.h
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorTools.h
@@ -267,11 +267,10 @@ private:
 class FMeshSectionSettingsLayout : public TSharedFromThis<FMeshSectionSettingsLayout>
 {
 public:
-	FMeshSectionSettingsLayout( IStaticMeshEditor& InStaticMeshEditor, int32 InLODIndex, TArray<class IDetailCategoryBuilder*> &InLodCategories, bool *InCustomLODEditModePtr)
+	FMeshSectionSettingsLayout( IStaticMeshEditor& InStaticMeshEditor, int32 InLODIndex, TArray<class IDetailCategoryBuilder*> &InLodCategories)
 		: StaticMeshEditor( InStaticMeshEditor )
 		, LODIndex( InLODIndex )
 		, LodCategoriesPtr(&InLodCategories)
-		, CustomLODEditModePtr(InCustomLODEditModePtr)
 	{}
 
 	virtual ~FMeshSectionSettingsLayout();
@@ -344,7 +343,6 @@ private:
 	int32 LODIndex;
 
 	TArray<class IDetailCategoryBuilder*> *LodCategoriesPtr;
-	bool *CustomLODEditModePtr;
 };
 
 struct FSectionLocalizer
@@ -488,6 +486,9 @@ private:
 	void OnLODScreenSizeCommitted(float NewValue, ETextCommit::Type CommitType, FName PlatformGroupName, int32 LODIndex);
 	float GetScreenSizeWidgetWidth(int32 LODIndex) const;
 
+	FString GetSourceImportFilename(int32 LODIndex) const;
+	void SetSourceImportFilename(const FString& SourceFileName, int32 LODIndex) const;
+
 	void OnBuildSettingsExpanded(bool bIsExpanded, int32 LODIndex);
 	void OnReductionSettingsExpanded(bool bIsExpanded, int32 LODIndex);
 	void OnSectionSettingsExpanded(bool bIsExpanded, int32 LODIndex);
@@ -552,6 +553,5 @@ private:
 	TArray<class IDetailCategoryBuilder*> LodCategories;
 	IDetailCategoryBuilder* LodCustomCategory;
 
-	bool CustomLODEditMode;
 	bool DetailDisplayLODs[MAX_STATIC_MESH_LODS];
 };
diff --git a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorViewportClient.cpp b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorViewportClient.cpp
index b911dbfd85a9..fb025683e151 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorViewportClient.cpp
+++ b/Engine/Source/Editor/StaticMeshEditor/Private/StaticMeshEditorViewportClient.cpp
@@ -13,6 +13,7 @@
 #include "Engine/StaticMeshSocket.h"
 #include "Utils.h"
 #include "IStaticMeshEditor.h"
+#include "UnrealEngine.h"
 
 #include "StaticMeshResources.h"
 #include "RawMesh.h"
@@ -830,6 +831,19 @@ void FStaticMeshEditorViewportClient::DrawCanvas( FViewport& InViewport, FSceneV
 
 	StaticMeshEditorViewport->PopulateOverlayText(TextItems);
 
+ 	int32 X = Canvas.GetRenderTarget()->GetSizeXY().X - 300;
+ 	int32 Y = 30;
+	// Make sure draws to the canvas are not rendered upside down.
+	Canvas.SetAllowSwitchVerticalAxis(false);
+	if (StaticMesh->BodySetup)
+	{
+		if (!(StaticMesh->BodySetup->bHasCookedCollisionData || StaticMesh->BodySetup->bNeverNeedsCookedCollisionData) || StaticMesh->BodySetup->bFailedToCreatePhysicsMeshes)
+		{
+			static const FText Message = NSLOCTEXT("Renderer", "NoCookedCollisionObject", "NO COOKED COLLISION OBJECT: TOO SMALL?");
+			Canvas.DrawShadowedText(X, Y, Message, GetStatsFont(), FLinearColor(1.0, 0.05, 0.05, 1.0));
+		}
+	}
+
 	if(bDrawUVs && StaticMesh->RenderData->LODResources.Num() > 0)
 	{
 		const int32 YPos = 160;
diff --git a/Engine/Source/Editor/StaticMeshEditor/Public/IStaticMeshEditor.h b/Engine/Source/Editor/StaticMeshEditor/Public/IStaticMeshEditor.h
index 567d2775b11d..02768e2ad581 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Public/IStaticMeshEditor.h
+++ b/Engine/Source/Editor/StaticMeshEditor/Public/IStaticMeshEditor.h
@@ -200,6 +200,17 @@ public:
 	/** Retrieves the current LOD index */
 	virtual int32 GetCurrentLODIndex() = 0;
 
+	/* Retrieve editor custom data. Return INDEX_NONE if the key is invalid */
+	virtual int32 GetCustomData(const int32 Key) const { return INDEX_NONE; }
+	
+	/*
+	 * Store the custom data using the key.
+	 * Remark:
+	 * The custom data memory should be clear when the editor is close by the user, this is not persistent data.
+	 * Currently we use it to store the state of the editor UI to restore it properly when a refresh happen.
+	 */
+	virtual void SetCustomData(const int32 Key, const int32 CustomData) {}
+
 	/** Refreshes the Static Mesh Editor's viewport. */
 	virtual void RefreshViewport() = 0;
 
diff --git a/Engine/Source/Editor/StaticMeshEditor/Public/StaticMeshEditorActions.h b/Engine/Source/Editor/StaticMeshEditor/Public/StaticMeshEditorActions.h
index 5a998e3d5c72..efe26cc7a6e4 100644
--- a/Engine/Source/Editor/StaticMeshEditor/Public/StaticMeshEditorActions.h
+++ b/Engine/Source/Editor/StaticMeshEditor/Public/StaticMeshEditorActions.h
@@ -41,6 +41,10 @@ public:
 	TSharedPtr< FUICommandInfo > SetShowSockets;
 	TSharedPtr< FUICommandInfo > SetDrawAdditionalData;
 
+	// Mesh toolbar Commands
+	TSharedPtr< FUICommandInfo > ReimportMesh;
+	TSharedPtr< FUICommandInfo > ReimportAllMesh;
+
 	// View Menu Commands
 	TSharedPtr< FUICommandInfo > SetShowNormals;
 	TSharedPtr< FUICommandInfo > SetShowTangents;
diff --git a/Engine/Source/Editor/StaticMeshEditor/StaticMeshEditor.Build.cs b/Engine/Source/Editor/StaticMeshEditor/StaticMeshEditor.Build.cs
index 4abb69891c7c..69d256110e3f 100644
--- a/Engine/Source/Editor/StaticMeshEditor/StaticMeshEditor.Build.cs
+++ b/Engine/Source/Editor/StaticMeshEditor/StaticMeshEditor.Build.cs
@@ -39,7 +39,8 @@ public class StaticMeshEditor : ModuleRules
                 "Json",
                 "JsonUtilities",
                 "AdvancedPreviewScene",
-                "DesktopPlatform"
+                "DesktopPlatform",
+                "DesktopWidgets"
             }
 		);
 
diff --git a/Engine/Source/Editor/SwarmInterface/Private/SwarmMessages.h b/Engine/Source/Editor/SwarmInterface/Private/SwarmMessages.h
index 2585bf27e8b9..c0794f14b5e1 100644
--- a/Engine/Source/Editor/SwarmInterface/Private/SwarmMessages.h
+++ b/Engine/Source/Editor/SwarmInterface/Private/SwarmMessages.h
@@ -27,7 +27,9 @@ struct FSwarmPongMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	FString ComputerName;
 
-	FSwarmPongMessage() { }
+	FSwarmPongMessage()
+		: bIsEditor(false)
+	{ }
 
 	FSwarmPongMessage(bool bInIsEditor, const TCHAR* InComputerName)
 		: bIsEditor(bInIsEditor)
@@ -77,7 +79,10 @@ struct FSwarmAlertMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	FString TextMessage;
 
-	FSwarmAlertMessage() { }
+	FSwarmAlertMessage() 
+		: AlertLevel(0)
+		, TypeId(0)
+	{ }
 
 	FSwarmAlertMessage(const FGuid& InJobGuid, NSwarm::TAlertLevel InAlertLevel, const FGuid& InObjectGuid, int32 InTypeId, const FString& InTextMessage)
 		: JobGuid(InJobGuid)
@@ -102,7 +107,10 @@ struct FSwarmTimingMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	int32 ThreadNum;
 
-	FSwarmTimingMessage() { }
+	FSwarmTimingMessage()
+		: State(0)
+		, ThreadNum(0)
+	{ }
 
 	FSwarmTimingMessage(NSwarm::TProgressionState InState, int32 InThreadNum)
 		: State(InState)
@@ -163,7 +171,10 @@ struct FSwarmTaskRequestSpecificationMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	TArray<FString> Dependencies;
 
-	FSwarmTaskRequestSpecificationMessage() { }
+	FSwarmTaskRequestSpecificationMessage()
+		: Flags(0)
+		, Cost(0)
+	{ }
 
 	FSwarmTaskRequestSpecificationMessage(FGuid InTaskGuid, const FString& InParameters, NSwarm::TJobTaskFlags InFlags, const TArray<FString>& InDependencies)
 		: TaskGuid(InTaskGuid)
@@ -197,7 +208,11 @@ struct FSwarmJobStateMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	double RunningTime;
 
-	FSwarmJobStateMessage() { }
+	FSwarmJobStateMessage()
+		: State(0)
+		, ExitCode(0)
+		, RunningTime(0.0)
+	{ }
 
 	FSwarmJobStateMessage(FGuid InGuid, NSwarm::TJobTaskState InState, const FString& InMessage, int32 InExitCode, double InRunningTime)
 		: Guid(InGuid)
@@ -232,7 +247,11 @@ struct FSwarmTaskStateMessage
 	UPROPERTY(EditAnywhere, Category="Message")
 	double RunningTime;
 
-	FSwarmTaskStateMessage() { }
+	FSwarmTaskStateMessage()
+		: State(0)
+		, ExitCode()
+		, RunningTime(0.0)
+	{ }
 
 	FSwarmTaskStateMessage(FGuid InGuid, NSwarm::TJobTaskState InState, const FString& InMessage, int32 InExitCode, double InRunningTime)
 		: Guid(InGuid)
diff --git a/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.cpp b/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.cpp
new file mode 100644
index 000000000000..a8b2556c77c7
--- /dev/null
+++ b/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.cpp
@@ -0,0 +1,33 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Customizations/CurveLinearColorAtlasDetailsCustomization.h"
+#include "Misc/MessageDialog.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Engine/Texture.h"
+#include "Engine/Texture2D.h"
+#include "Editor.h"
+#include "DetailLayoutBuilder.h"
+#include "DetailWidgetRow.h"
+#include "IDetailPropertyRow.h"
+#include "DetailCategoryBuilder.h"
+#include "Widgets/Input/SNumericEntryBox.h"
+#include "Widgets/Input/STextComboBox.h"
+
+#define LOCTEXT_NAMESPACE "FTextureDetails"
+
+
+TSharedRef<IDetailCustomization> FCurveLinearColorAtlasDetails::MakeInstance()
+{
+	return MakeShareable(new FCurveLinearColorAtlasDetails);
+}
+
+void FCurveLinearColorAtlasDetails::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	DetailBuilder.HideCategory("Compression");
+	DetailBuilder.HideCategory("LevelOfDetail");
+	DetailBuilder.HideCategory("Texture");
+	DetailBuilder.HideCategory("File Path");
+	DetailBuilder.HideCategory("Compositing");
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.h b/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.h
new file mode 100644
index 000000000000..e12eb51ec6be
--- /dev/null
+++ b/Engine/Source/Editor/TextureEditor/Private/Customizations/CurveLinearColorAtlasDetailsCustomization.h
@@ -0,0 +1,27 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SlateFwd.h"
+#include "UObject/WeakObjectPtr.h"
+#include "Types/SlateEnums.h"
+#include "TextureDetailsCustomization.h"
+
+class IDetailLayoutBuilder;
+class IPropertyHandle;
+
+class FCurveLinearColorAtlasDetails : public FTextureDetails
+{
+public:
+	/** Makes a new instance of this detail layout class for a specific detail view requesting it */
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+private:
+	FCurveLinearColorAtlasDetails()
+	{}
+
+	/** IDetailCustomization interface */
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
+};
+
diff --git a/Engine/Source/Editor/TextureEditor/Private/Customizations/TextureDetailsCustomization.h b/Engine/Source/Editor/TextureEditor/Private/Customizations/TextureDetailsCustomization.h
index c32f2c90dfee..b310d7081180 100644
--- a/Engine/Source/Editor/TextureEditor/Private/Customizations/TextureDetailsCustomization.h
+++ b/Engine/Source/Editor/TextureEditor/Private/Customizations/TextureDetailsCustomization.h
@@ -17,11 +17,11 @@ public:
 	/** Makes a new instance of this detail layout class for a specific detail view requesting it */
 	static TSharedRef<IDetailCustomization> MakeInstance();
 
-private:
+protected:
 	FTextureDetails()
 		: bIsUsingSlider(false)
 	{}
-
+private:
 	/** IDetailCustomization interface */
 	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailBuilder) override;
 
diff --git a/Engine/Source/Editor/TextureEditor/Private/TextureEditorModule.cpp b/Engine/Source/Editor/TextureEditor/Private/TextureEditorModule.cpp
index c1040f601a3a..e18b2ae6cade 100644
--- a/Engine/Source/Editor/TextureEditor/Private/TextureEditorModule.cpp
+++ b/Engine/Source/Editor/TextureEditor/Private/TextureEditorModule.cpp
@@ -12,6 +12,7 @@
 #include "TextureEditorToolkit.h"
 #include "ISettingsModule.h"
 #include "Customizations/TextureDetailsCustomization.h"
+#include "Customizations/CurveLinearColorAtlasDetailsCustomization.h"
 
 
 #define LOCTEXT_NAMESPACE "FTextureEditorModule"
@@ -73,6 +74,7 @@ public:
 
 		FPropertyEditorModule& PropertyModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>("PropertyEditor");
 		PropertyModule.RegisterCustomClassLayout("Texture", FOnGetDetailCustomizationInstance::CreateStatic(&FTextureDetails::MakeInstance));
+		PropertyModule.RegisterCustomClassLayout("CurveLinearColorAtlas", FOnGetDetailCustomizationInstance::CreateStatic(&FCurveLinearColorAtlasDetails::MakeInstance));
 	}
 
 	virtual void ShutdownModule( ) override
@@ -91,6 +93,7 @@ public:
 
 		FPropertyEditorModule& PropertyModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>("PropertyEditor");
 		PropertyModule.UnregisterCustomClassLayout("Texture");
+		PropertyModule.UnregisterCustomClassLayout("CurveLinearColorAtlas");
 	}
 
 private:
diff --git a/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.cpp b/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.cpp
index 9cc6be29494b..18bf842f5df3 100644
--- a/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.cpp
+++ b/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.cpp
@@ -35,6 +35,7 @@
 #include "Widgets/Docking/SDockTab.h"
 #include "Widgets/Input/SNumericEntryBox.h"
 #include "DeviceProfiles/DeviceProfile.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 #define LOCTEXT_NAMESPACE "FTextureEditorToolkit"
 
@@ -851,25 +852,6 @@ void FTextureEditorToolkit::CreateInternalWidgets( )
 BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
 void FTextureEditorToolkit::ExtendToolBar( )
 {
-	struct Local
-	{
-		static void FillToolbar(FToolBarBuilder& ToolbarBuilder, const TSharedRef< FUICommandList > ToolkitCommands, TSharedRef<SWidget> LODControl)
-		{
-			ToolbarBuilder.BeginSection("TextureMisc");
-			{
-				ToolbarBuilder.AddToolBarButton(FTextureEditorCommands::Get().CompressNow);
-				ToolbarBuilder.AddToolBarButton(FTextureEditorCommands::Get().Reimport);
-			}
-			ToolbarBuilder.EndSection();
-
-			ToolbarBuilder.BeginSection("TextureMipAndExposure");
-			{
-				ToolbarBuilder.AddWidget(LODControl);
-			}
-			ToolbarBuilder.EndSection();
-		}
-	};
-
 	TSharedRef<SWidget> LODControl = SNew(SBox)
 		.WidthOverride(240.0f)
 		[
@@ -960,7 +942,7 @@ void FTextureEditorToolkit::ExtendToolBar( )
 		"Asset",
 		EExtensionHook::After,
 		GetToolkitCommands(),
-		FToolBarExtensionDelegate::CreateStatic(&Local::FillToolbar, GetToolkitCommands(), LODControl)
+		FToolBarExtensionDelegate::CreateSP(this, &FTextureEditorToolkit::FillToolbar, GetToolkitCommands(), LODControl)
 	);
 
 	AddToolbarExtender(ToolbarExtender);
@@ -968,6 +950,27 @@ void FTextureEditorToolkit::ExtendToolBar( )
 	ITextureEditorModule* TextureEditorModule = &FModuleManager::LoadModuleChecked<ITextureEditorModule>("TextureEditor");
 	AddToolbarExtender(TextureEditorModule->GetToolBarExtensibilityManager()->GetAllExtenders(GetToolkitCommands(), GetEditingObjects()));
 }
+
+void FTextureEditorToolkit::FillToolbar(FToolBarBuilder& ToolbarBuilder, const TSharedRef< FUICommandList > InToolkitCommands, TSharedRef<SWidget> LODControl)
+{
+	UCurveLinearColorAtlas* Atlas = Cast<UCurveLinearColorAtlas>(GetTexture());
+	if (!Atlas)
+	{
+		ToolbarBuilder.BeginSection("TextureMisc");
+		{
+			ToolbarBuilder.AddToolBarButton(FTextureEditorCommands::Get().CompressNow);
+			ToolbarBuilder.AddToolBarButton(FTextureEditorCommands::Get().Reimport);
+		}
+		ToolbarBuilder.EndSection();
+
+		ToolbarBuilder.BeginSection("TextureMipAndExposure");
+		{
+			ToolbarBuilder.AddWidget(LODControl);
+		}
+		ToolbarBuilder.EndSection();
+	}
+}
+
 END_SLATE_FUNCTION_BUILD_OPTIMIZATION
 
 
@@ -1207,7 +1210,7 @@ bool FTextureEditorToolkit::HandleRedChannelActionIsChecked( ) const
 
 bool FTextureEditorToolkit::HandleReimportActionCanExecute( ) const
 {
-	if (Texture->IsA<ULightMapTexture2D>() || Texture->IsA<UShadowMapTexture2D>() || Texture->IsA<UTexture2DDynamic>() || Texture->IsA<UTextureRenderTarget>())
+	if (Texture->IsA<ULightMapTexture2D>() || Texture->IsA<UShadowMapTexture2D>() || Texture->IsA<UTexture2DDynamic>() || Texture->IsA<UTextureRenderTarget>() || Texture->IsA<UCurveLinearColorAtlas>())
 	{
 		return false;
 	}
diff --git a/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.h b/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.h
index 04cf560f131a..97c6072ce86c 100644
--- a/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.h
+++ b/Engine/Source/Editor/TextureEditor/Private/TextureEditorToolkit.h
@@ -121,6 +121,7 @@ protected:
 	 */
 	void ExtendToolBar( );
 
+	void FillToolbar(FToolBarBuilder& ToolbarBuilder, const TSharedRef< FUICommandList > ToolkitCommands, TSharedRef<SWidget> LODControl);
 	/**
 	 * Gets the highest mip map level that this texture supports.
 	 *
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.cpp b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.cpp
new file mode 100644
index 000000000000..007df7f2249d
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.cpp
@@ -0,0 +1,66 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "DynamicEntryBoxDetails.h"
+
+#include "Editor/PropertyEditor/Public/DetailLayoutBuilder.h"
+#include "Editor/PropertyEditor/Public/DetailCategoryBuilder.h"
+#include "Components/DynamicEntryBox.h"
+#include "PropertyCustomizationHelpers.h"
+
+TSharedRef<IDetailCustomization> FDynamicEntryBoxDetails::MakeInstance()
+{
+	return MakeShareable(new FDynamicEntryBoxDetails());
+}
+
+void FDynamicEntryBoxDetails::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
+{
+	TArray<TWeakObjectPtr<UObject>> Objects;
+	DetailLayout.GetObjectsBeingCustomized(Objects);
+	if (Objects.Num() != 1)
+	{
+		return;
+	}
+	EntryBox = Cast<UDynamicEntryBox>(Objects[0].Get());
+	if (!EntryBox.IsValid())
+	{
+		return;
+	}
+
+	IDetailCategoryBuilder& EntryLayoutCategory = DetailLayout.EditCategory(TEXT("EntryLayout"));
+
+	const TAttribute<bool> CanEditAignmentAttribute(this, &FDynamicEntryBoxDetails::CanEditAlignment);
+	EntryLayoutCategory.AddProperty(DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, EntryHorizontalAlignment)))
+		.IsEnabled(CanEditAignmentAttribute);
+	EntryLayoutCategory.AddProperty(DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, EntryVerticalAlignment)))
+		.IsEnabled(CanEditAignmentAttribute);
+
+	EntryLayoutCategory.AddProperty(DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, MaxElementSize)))
+		.IsEnabled(TAttribute<bool>(this, &FDynamicEntryBoxDetails::CanEditMaxElementSize));
+	EntryLayoutCategory.AddProperty(DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, EntrySpacing)))
+		.IsEnabled(TAttribute<bool>(this, &FDynamicEntryBoxDetails::CanEditEntrySpacing));
+	EntryLayoutCategory.AddProperty(DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, SpacingPattern)))
+		.IsEnabled(TAttribute<bool>(this, &FDynamicEntryBoxDetails::CanEditSpacingPattern));
+
+	AddEntryClassPicker(*EntryBox, EntryLayoutCategory, DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UDynamicEntryBox, EntryWidgetClass)));
+}
+
+bool FDynamicEntryBoxDetails::CanEditSpacingPattern() const
+{
+	return EntryBox->GetBoxType() == EDynamicBoxType::Overlay;
+}
+
+bool FDynamicEntryBoxDetails::CanEditEntrySpacing() const
+{
+	return EntryBox->SpacingPattern.Num() == 0;
+}
+
+bool FDynamicEntryBoxDetails::CanEditAlignment() const
+{
+	return EntryBox->GetBoxType() != EDynamicBoxType::Overlay || CanEditEntrySpacing();
+}
+
+bool FDynamicEntryBoxDetails::CanEditMaxElementSize() const
+{
+	const EDynamicBoxType BoxType = EntryBox->GetBoxType();
+	return BoxType == EDynamicBoxType::Horizontal || BoxType == EDynamicBoxType::Vertical;
+}
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.h b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.h
new file mode 100644
index 000000000000..dc0830401083
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryBoxDetails.h
@@ -0,0 +1,26 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "DynamicEntryWidgetDetailsBase.h"
+
+
+class IPropertyHandle;
+class UDynamicEntryBox;
+
+class FDynamicEntryBoxDetails : public FDynamicEntryWidgetDetailsBase
+{
+public:
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	/* Main customization of details */
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailLayout) override;
+
+private:
+	bool CanEditSpacingPattern() const;
+	bool CanEditEntrySpacing() const;
+	bool CanEditAlignment() const;
+	bool CanEditMaxElementSize() const;
+
+	TWeakObjectPtr<UDynamicEntryBox> EntryBox;
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.cpp b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.cpp
new file mode 100644
index 000000000000..1b6937a45dad
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.cpp
@@ -0,0 +1,55 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "DynamicEntryWidgetDetailsBase.h"
+
+#include "Editor/PropertyEditor/Public/DetailLayoutBuilder.h"
+#include "Editor/PropertyEditor/Public/DetailCategoryBuilder.h"
+#include "PropertyCustomizationHelpers.h"
+
+const UClass* FDynamicEntryWidgetDetailsBase::GetSelectedEntryClass() const
+{
+	if (EntryClassHandle.IsValid())
+	{
+		const UObject* SelectedClassObj = nullptr;
+		EntryClassHandle->GetValue(SelectedClassObj);
+		return Cast<UClass>(SelectedClassObj);
+
+	}
+	return nullptr;
+}
+
+void FDynamicEntryWidgetDetailsBase::HandleNewEntryClassSelected(const UClass* NewEntryClass) const
+{
+	if (EntryClassHandle.IsValid())
+	{
+		EntryClassHandle->SetValueFromFormattedString(NewEntryClass->GetPathName());
+	}
+}
+
+void FDynamicEntryWidgetDetailsBase::AddEntryClassPickerInternal(const UClass* EntryBaseClass, const UClass* RequiredEntryInterface, IDetailCategoryBuilder& CategoryBuilder) const
+{
+	// Create a custom class picker here that filters according to the EntryClass 
+	IDetailPropertyRow& EntryClassRow = CategoryBuilder.AddProperty(EntryClassHandle);
+	TSharedPtr<SWidget> NameWidget;
+	TSharedPtr<SWidget> ValueWidget;
+	FDetailWidgetRow Row;
+	EntryClassRow.GetDefaultWidgets(NameWidget, ValueWidget, Row);
+
+	EntryClassRow.CustomWidget()
+		.NameContent()
+		[
+			NameWidget.ToSharedRef()
+		]
+		.ValueContent()
+		.MinDesiredWidth(Row.ValueWidget.MinWidth)
+		.MaxDesiredWidth(Row.ValueWidget.MaxWidth)
+		[
+			SNew(SClassPropertyEntryBox)
+			.AllowNone(false)
+			.IsBlueprintBaseOnly(true)
+			.RequiredInterface(RequiredEntryInterface)
+			.MetaClass(EntryBaseClass ? EntryBaseClass : UUserWidget::StaticClass())
+			.SelectedClass(this, &FDynamicEntryWidgetDetailsBase::GetSelectedEntryClass)
+			.OnSetClass(this, &FDynamicEntryWidgetDetailsBase::HandleNewEntryClassSelected)
+		];
+}
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.h b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.h
new file mode 100644
index 000000000000..784c57b40d60
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/DynamicEntryWidgetDetailsBase.h
@@ -0,0 +1,74 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "IDetailCustomization.h"
+#include "Blueprint/UserWidget.h"
+
+class IDetailCategoryBuilder;
+class IPropertyHandle;
+
+/** Base helper for customizations on widget classes that dynamically generate entries of a given widget class */
+class FDynamicEntryWidgetDetailsBase : public IDetailCustomization
+{
+protected:
+	template <typename WidgetT>
+	void AddEntryClassPicker(WidgetT& WidgetInstance, IDetailCategoryBuilder& CategoryBuilder, TSharedRef<IPropertyHandle> InEntryClassHandle)
+	{
+		static const FName EntryInterfaceMetaKey = TEXT("EntryInterface");
+		static const FName EntryClassMetaKey = TEXT("EntryClass");
+
+		EntryClassHandle = InEntryClassHandle;
+
+		const UClass* RequiredInterface = nullptr;
+		const UClass* BaseClass = nullptr; 
+
+		if (UUserWidget* OwningUserWidget = WidgetInstance.template GetTypedOuter<UUserWidget>())
+		{
+			// Find the native BindWidget UProperty that corresponds to this table view
+			for (TFieldIterator<UObjectProperty> PropertyIter(OwningUserWidget->GetClass()); PropertyIter; ++PropertyIter)
+			{
+				UObjectProperty* Property = *PropertyIter;
+				if (Property->PropertyClass && Property->PropertyClass->IsChildOf<WidgetT>())
+				{
+					WidgetT** WidgetPropertyInstance = Property->ContainerPtrToValuePtr<WidgetT*>(OwningUserWidget);
+					if (*WidgetPropertyInstance == &WidgetInstance)
+					{
+						BaseClass = Property->GetClassMetaData(EntryClassMetaKey);
+						RequiredInterface = Property->GetClassMetaData(EntryInterfaceMetaKey);
+						break;
+					}
+				}
+			}
+		}
+
+		// If the property binding didn't exist or didn't specify a class/interface, check with the class itself (including parents as needed)
+		const UClass* WidgetClass = WidgetInstance.GetClass();
+		while (WidgetClass && WidgetClass->IsChildOf<UWidget>() && (!BaseClass || !RequiredInterface))
+		{
+			if (!BaseClass)
+			{
+				BaseClass = WidgetClass->GetClassMetaData(EntryClassMetaKey);
+			}
+			if (!RequiredInterface)
+			{
+				RequiredInterface = WidgetClass->GetClassMetaData(EntryInterfaceMetaKey);
+			}
+			WidgetClass = WidgetClass->GetSuperClass();
+		}
+		
+		// If a valid base class has been specified, create a custom class picker that filters accordingly
+		if (BaseClass || RequiredInterface)
+		{
+			AddEntryClassPickerInternal(BaseClass, RequiredInterface, CategoryBuilder);
+		}
+	}
+
+private:
+	void AddEntryClassPickerInternal(const UClass* EntryBaseClass, const UClass* RequiredEntryInterface, IDetailCategoryBuilder& CategoryBuilder) const;
+
+	const UClass* GetSelectedEntryClass() const;
+	void HandleNewEntryClassSelected(const UClass* NewEntryClass) const;
+	
+	TSharedPtr<IPropertyHandle> EntryClassHandle;
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.cpp b/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.cpp
new file mode 100644
index 000000000000..6014015ce970
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.cpp
@@ -0,0 +1,31 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "ListViewBaseDetails.h"
+
+#include "Editor/PropertyEditor/Public/DetailLayoutBuilder.h"
+#include "Editor/PropertyEditor/Public/DetailCategoryBuilder.h"
+#include "Components/ListViewBase.h"
+#include "PropertyCustomizationHelpers.h"
+
+TSharedRef<IDetailCustomization> FListViewBaseDetails::MakeInstance()
+{
+	return MakeShareable(new FListViewBaseDetails());
+}
+
+void FListViewBaseDetails::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
+{
+	TArray<TWeakObjectPtr<UObject>> Objects;
+	DetailLayout.GetObjectsBeingCustomized(Objects);
+	if (Objects.Num() != 1)
+	{
+		return;
+	}
+	UListViewBase* ListView = Cast<UListViewBase>(Objects[0].Get());
+	if (!ListView)
+	{
+		return;
+	}
+
+	IDetailCategoryBuilder& ListEntriesCategory = DetailLayout.EditCategory(TEXT("ListEntries"));
+	AddEntryClassPicker(*ListView, ListEntriesCategory, DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UListViewBase, EntryWidgetClass)));
+}
\ No newline at end of file
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.h b/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.h
new file mode 100644
index 000000000000..8c48681b6571
--- /dev/null
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/ListViewBaseDetails.h
@@ -0,0 +1,13 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "DynamicEntryWidgetDetailsBase.h"
+
+class FListViewBaseDetails : public FDynamicEntryWidgetDetailsBase
+{
+public:
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailLayout) override;
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/UMGEditor/Private/Customizations/UMGDetailCustomizations.cpp b/Engine/Source/Editor/UMGEditor/Private/Customizations/UMGDetailCustomizations.cpp
index bdd28144cf03..947e1759080a 100644
--- a/Engine/Source/Editor/UMGEditor/Private/Customizations/UMGDetailCustomizations.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/Customizations/UMGDetailCustomizations.cpp
@@ -102,7 +102,7 @@ void FBlueprintWidgetCustomization::CreateEventCustomization( IDetailLayoutBuild
 	IDetailPropertyRow& PropertyRow = PropertyCategory.AddProperty(DelegatePropertyHandle);
 	PropertyRow.OverrideResetToDefault(FResetToDefaultOverride::Create(FResetToDefaultHandler::CreateSP(this, &FBlueprintWidgetCustomization::ResetToDefault_RemoveBinding)));
 
-	FString LabelStr = Property->GetName();
+	FString LabelStr = Property->GetDisplayNameText().ToString();
 	LabelStr.RemoveFromEnd(TEXT("Event"));
 
 	FText Label = FText::FromString(LabelStr);
@@ -220,7 +220,7 @@ void FBlueprintWidgetCustomization::CreateMulticastEventCustomization(IDetailLay
 
 	IDetailCategoryBuilder& PropertyCategory = DetailLayout.EditCategory("Events", LOCTEXT("Events", "Events"), ECategoryPriority::Uncommon);
 
-	FText DelegatePropertyName = FText::FromString(DelegateProperty->GetName());
+	FText DelegatePropertyName = DelegateProperty->GetDisplayNameText();
 	PropertyCategory.AddCustomRow(DelegatePropertyName)
 	.NameContent()
 	[
@@ -302,7 +302,7 @@ void FBlueprintWidgetCustomization::PerformBindingCustomization(IDetailLayoutBui
 			if ( UDelegateProperty* DelegateProperty = Cast<UDelegateProperty>(*PropertyIt) )
 			{
 				//TODO Remove the code to use ones that end with "Event".  Prefer metadata flag.
-				if ( DelegateProperty->GetBoolMetaData(IsBindableEventName) || DelegateProperty->GetName().EndsWith(TEXT("Event")) )
+				if ( DelegateProperty->HasMetaData(IsBindableEventName) || DelegateProperty->GetName().EndsWith(TEXT("Event")) )
 				{
 					CreateEventCustomization(DetailLayout, DelegateProperty, Widget);
 				}
diff --git a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerToolBar.cpp b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerToolBar.cpp
index d7da7a34ab8b..ced4a83b7782 100644
--- a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerToolBar.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerToolBar.cpp
@@ -209,7 +209,10 @@ TSharedRef<SWidget> SDesignerToolBar::FillLocalizationPreviewMenu()
 	FMenuBuilder LocationGridMenuBuilder(bShouldCloseWindowAfterMenuSelection, CommandList);
 
 	TArray<FCultureRef> GameCultures;
-	FInternationalization::Get().GetCulturesWithAvailableLocalization(FPaths::GetGameLocalizationPaths(), GameCultures, false);
+	{
+		const TArray<FString> LocalizedCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ELocalizationLoadFlags::Game);
+		GameCultures = FInternationalization::Get().GetAvailableCultures(LocalizedCultureNames, false);
+	}
 
 	LocationGridMenuBuilder.BeginSection("LocalizationPreviewLanguage", LOCTEXT("LocalizationPreviewLanguage", "Preview Language"));
 	LocationGridMenuBuilder.AddMenuEntry(
diff --git a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.cpp b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.cpp
index 83dbd2e36ec2..b984eb3db4c5 100644
--- a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.cpp
@@ -67,6 +67,8 @@
 
 #include "Fonts/FontMeasure.h"
 #include "UMGEditorProjectSettings.h"
+#include "DeviceProfiles/DeviceProfile.h"
+#include "DeviceProfiles/DeviceProfileManager.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
@@ -312,11 +314,12 @@ UWidget* SDesignerView::GetWidgetInDesignScopeFromSlateWidget(TSharedRef<SWidget
 
 /////////////////////////////////////////////////////
 // SDesignerView
-
+ 
 const FString SDesignerView::ConfigSectionName = "UMGEditor.Designer";
 const uint32 SDesignerView::DefaultResolutionWidth = 1280;
 const uint32 SDesignerView::DefaultResolutionHeight = 720;
 const FString SDesignerView::DefaultAspectRatio = "16:9";
+const FString SDesignerView::DefaultPreviewOverrideName = "";
 
 void SDesignerView::Construct(const FArguments& InArgs, TSharedPtr<FWidgetBlueprintEditor> InBlueprintEditor)
 {
@@ -565,22 +568,52 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 			SNew(SDesignerToolBar)
 			.CommandList(CommandList)
 		]
+		+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			[
+				SNew(SButton)
+				.ButtonStyle(FEditorStyle::Get(), "ViewportMenu.Button")
+				.ToolTipText(LOCTEXT("ZoomToFit_ToolTip", "Zoom To Fit"))
+				.OnClicked(this, &SDesignerView::HandleZoomToFitClicked)
+				.ContentPadding(FEditorStyle::Get().GetMargin("ViewportMenu.SToolBarButtonBlock.Button.Padding"))
+				[
+					SNew(SImage)
+					.Image(FEditorStyle::GetBrush("UMGEditor.ZoomToFit"))
+				]
+			]
 
 		+ SHorizontalBox::Slot()
-		.AutoWidth()
-		.VAlign(VAlign_Center)
-		[
-			SNew(SButton)
-			.ButtonStyle(FEditorStyle::Get(), "ViewportMenu.Button")
-			.ToolTipText(LOCTEXT("ZoomToFit_ToolTip", "Zoom To Fit"))
-			.OnClicked(this, &SDesignerView::HandleZoomToFitClicked)
-			.ContentPadding(FEditorStyle::Get().GetMargin("ViewportMenu.SToolBarButtonBlock.Button.Padding"))
+			.AutoWidth()
+			.VAlign(VAlign_Center)
 			[
-				SNew(SImage)
-				.Image(FEditorStyle::GetBrush("UMGEditor.ZoomToFit"))
+				SNew(SButton)
+				.ButtonStyle(FEditorStyle::Get(), "ViewportMenu.Button")
+				.ToolTipText(LOCTEXT("SwapAspectRatio_ToolTip", "Switch between Landscape and Portrait"))
+				.OnClicked(this, &SDesignerView::HandleSwapAspectRatioClicked)
+				.ContentPadding(FEditorStyle::Get().GetMargin("ViewportMenu.SToolBarButtonBlock.Button.Padding"))
+				.IsEnabled(this, &SDesignerView::GetAspectRatioSwitchEnabled)
+				[
+					SNew(SImage)
+					.Image(this, &SDesignerView::GetAspectRatioSwitchImage)
+				]
 			]
-		]
-		
+		+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			[
+				SNew(SButton)
+				.ButtonStyle(FEditorStyle::Get(), "ViewportMenu.Button")
+				.ToolTipText(LOCTEXT("Mirror_ToolTip", "Flip the current safe zones"))
+				.OnClicked(this, &SDesignerView::HandleFlipSafeZonesClicked)
+				.ContentPadding(FEditorStyle::Get().GetMargin("ViewportMenu.SToolBarButtonBlock.Button.Padding"))	
+				.IsEnabled(this, &SDesignerView::GetFlipDeviceEnabled)
+				[
+					SNew(SImage)
+					.Image(FEditorStyle::Get().GetBrush("UMGEditor.Mirror"))
+				]
+			]
+
 		// Preview Screen Size
 		+ SHorizontalBox::Slot()
 		.AutoWidth()
@@ -626,13 +659,14 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 			.AllowSpin(true)
 			.Delta(1)
 			.MinSliderValue(1)
-			.MinValue(1)
+			.MinValue(0)
 			.MaxSliderValue(TOptional<int32>(10000))
 			.Value(this, &SDesignerView::GetCustomResolutionWidth)
 			.OnValueChanged(this, &SDesignerView::OnCustomResolutionWidthChanged)
 			.Visibility(this, &SDesignerView::GetCustomResolutionEntryVisibility)
 			.MinDesiredValueWidth(50)
 			.LabelPadding(0)
+			.ToolTipText(LOCTEXT("CustomSize_WidthTooltip", "1+\tSets the width of the widget in the designer.\n0\tThe width will match the desired width of the widget."))
 			.Label()
 			[
 				SNumericEntryBox<int32>::BuildLabel(LOCTEXT("Width", "Width"), FLinearColor::White, SNumericEntryBox<int32>::RedLabelBackgroundColor)
@@ -649,11 +683,12 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 			.Delta(1)
 			.MinSliderValue(1)
 			.MaxSliderValue(TOptional<int32>(10000))
-			.MinValue(1)
+			.MinValue(0)
 			.Value(this, &SDesignerView::GetCustomResolutionHeight)
 			.OnValueChanged(this, &SDesignerView::OnCustomResolutionHeightChanged)
 			.Visibility(this, &SDesignerView::GetCustomResolutionEntryVisibility)
 			.MinDesiredValueWidth(50)
+			.ToolTipText(LOCTEXT("CustomSize_HeightTooltip", "1+\tSets the height of the widget in the designer.\n0\tThe height will match the desired height of the widget."))
 			.LabelPadding(0)
 			.Label()
 			[
@@ -690,16 +725,35 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 	.VAlign(VAlign_Bottom)
 	[
 		SNew(SHorizontalBox)
-
 		+ SHorizontalBox::Slot()
 		.AutoWidth()
 		.Padding(6, 0, 0, 2)
 		[
-			SNew(STextBlock)
-			.Visibility(this, &SDesignerView::GetResolutionTextVisibility)
-			.TextStyle(FEditorStyle::Get(), "Graph.ZoomText")
-			.Text(this, &SDesignerView::GetCurrentResolutionText)
-			.ColorAndOpacity(this, &SDesignerView::GetResolutionTextColorAndOpacity)
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			[
+				SNew(STextBlock)
+				.Visibility(this, &SDesignerView::GetResolutionTextVisibility)
+				.TextStyle(FEditorStyle::Get(), "Graph.ZoomText")
+				.Text(this, &SDesignerView::GetCurrentScaleFactorText)
+				.ColorAndOpacity(this, &SDesignerView::GetResolutionTextColorAndOpacity)
+			]
+			+ SVerticalBox::Slot()
+			[
+				SNew(STextBlock)
+				.Visibility(this, &SDesignerView::GetResolutionTextVisibility)
+				.TextStyle(FEditorStyle::Get(), "Graph.ZoomText")
+				.Text(this, &SDesignerView::GetCurrentSafeZoneText)
+				.ColorAndOpacity(this, &SDesignerView::GetResolutionTextColorAndOpacity)
+			]
+			+SVerticalBox::Slot()
+			[			
+				SNew(STextBlock)
+				.Visibility(this, &SDesignerView::GetResolutionTextVisibility)
+				.TextStyle(FEditorStyle::Get(), "Graph.ZoomText")
+				.Text(this, &SDesignerView::GetCurrentResolutionText)
+				.ColorAndOpacity(this, &SDesignerView::GetResolutionTextColorAndOpacity)
+			]
 		]
 
 		+ SHorizontalBox::Slot()
@@ -708,9 +762,9 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 		.Padding(0, 0, 6, 2)
 		[
 			SNew(SHorizontalBox)
-
 			+ SHorizontalBox::Slot()
 			.AutoWidth()
+			.VAlign(VAlign_Bottom)
 			[
 				SNew(STextBlock)
 				.TextStyle(FEditorStyle::Get(), "Graph.ZoomText")
@@ -721,6 +775,7 @@ TSharedRef<SWidget> SDesignerView::CreateOverlayUI()
 			+ SHorizontalBox::Slot()
 			.AutoWidth()
 			.Padding(6, 0, 0, 0)
+			.VAlign(VAlign_Bottom)
 			[
 				SNew(SButton)
 				.ButtonStyle(FEditorStyle::Get(), "HoverHintOnly")
@@ -881,6 +936,47 @@ void SDesignerView::SetStartupResolution()
 		GConfig->SetString(*ConfigSectionName, TEXT("PreviewAspectRatio"), *DefaultAspectRatio, GEditorPerProjectIni);
 		PreviewAspectRatio = DefaultAspectRatio;
 	}
+	// Portrait Mode
+	if (!GConfig->GetBool(*ConfigSectionName, TEXT("bIsInPortraitMode"), bPreviewIsPortrait, GEditorPerProjectIni))
+	{
+		GConfig->SetBool(*ConfigSectionName, TEXT("bIsInPortraitMode"), false, GEditorPerProjectIni);
+		bPreviewIsPortrait = false;
+	}
+	// Profile Type
+	if (!GConfig->GetString(*ConfigSectionName, TEXT("ProfileName"), PreviewOverrideName, GEditorPerProjectIni))
+	{
+		GConfig->SetString(*ConfigSectionName, TEXT("ProfileName"), *DefaultPreviewOverrideName, GEditorPerProjectIni);
+		PreviewOverrideName = DefaultPreviewOverrideName;
+	}
+	// Scale factor
+	if (!GConfig->GetFloat(*ConfigSectionName, TEXT("ScaleFactor"), ScaleFactor, GEditorPerProjectIni))
+	{
+		GConfig->SetFloat(*ConfigSectionName, TEXT("ScaleFactor"), 1.0f, GEditorPerProjectIni);
+		ScaleFactor = 1.0f;
+	}
+	if (!GConfig->GetBool(*ConfigSectionName, TEXT("bCanPreviewSwapAspectRatio"), bCanPreviewSwapAspectRatio, GEditorPerProjectIni))
+	{
+		GConfig->SetBool(*ConfigSectionName, TEXT("bCanPreviewSwapAspectRatio"), false, GEditorPerProjectIni);
+		bCanPreviewSwapAspectRatio = false;
+	}
+
+	if (!PreviewOverrideName.IsEmpty())
+	{
+		ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+		DesignerSafeZoneOverride = PlaySettings->CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	else
+	{
+		FSlateApplication::Get().ResetCustomSafeZone();
+		FSlateApplication::Get().GetSafeZoneSize(DesignerSafeZoneOverride, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	FMargin SafeZoneRatio = DesignerSafeZoneOverride;
+	SafeZoneRatio.Left /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Right /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Bottom /= (PreviewHeight / 2.0f);
+	SafeZoneRatio.Top /= (PreviewHeight / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
 }
 
 float SDesignerView::GetPreviewScale() const
@@ -987,6 +1083,10 @@ void SDesignerView::SetPreviewAreaSize(int32 Width, int32 Height)
 					GConfig->SetInt(*ConfigSectionName, TEXT("PreviewWidth"), Width, GEditorPerProjectIni);
 					GConfig->SetInt(*ConfigSectionName, TEXT("PreviewHeight"), Height, GEditorPerProjectIni);
 					GConfig->SetString(*ConfigSectionName, TEXT("PreviewAspectRatio"), *PreviewAspectRatio, GEditorPerProjectIni);
+					GConfig->SetBool(*ConfigSectionName, TEXT("bIsInPortraitMode"), bPreviewIsPortrait, GEditorPerProjectIni);
+					GConfig->SetString(*ConfigSectionName, TEXT("ProfileName"), *PreviewOverrideName, GEditorPerProjectIni);
+					GConfig->SetFloat(*ConfigSectionName, TEXT("ScaleFactor"), ScaleFactor, GEditorPerProjectIni);
+					GConfig->SetBool(*ConfigSectionName, TEXT("bCanPreviewSwapAspectRatio"), bCanPreviewSwapAspectRatio, GEditorPerProjectIni);
 				}
 				break;
 			}
@@ -1049,15 +1149,33 @@ void SDesignerView::GetPreviewAreaAndSize(FVector2D& Area, FVector2D& Size) cons
 		{
 		case EDesignPreviewSizeMode::Custom:
 			Area = DefaultWidget->DesignTimeSize;
-			Size = DefaultWidget->DesignTimeSize;
-			return;
+			// If the custom size is 0 in some dimension, use the desired size instead.
+			if (Area.X == 0)
+			{
+				Area.X = CachedPreviewDesiredSize.X;
+			}
+			if (Area.Y == 0)
+			{
+				Area.Y = CachedPreviewDesiredSize.Y;
+			}
+			Size = Area;
+			break;
 		case EDesignPreviewSizeMode::CustomOnScreen:
 			Size = DefaultWidget->DesignTimeSize;
+
+			// If the custom size is 0 in some dimension, use the desired size instead.
+			if (Size.X == 0)
+			{
+				Size.X = CachedPreviewDesiredSize.X;
+			}
+			if (Size.Y == 0)
+			{
+				Size.Y = CachedPreviewDesiredSize.Y;
+			}
 			return;
 		case EDesignPreviewSizeMode::Desired:
 			Area = CachedPreviewDesiredSize;
-			Size = CachedPreviewDesiredSize;
-			return;
+			// Fall through to DesiredOnScreen
 		case EDesignPreviewSizeMode::DesiredOnScreen:
 			Size = CachedPreviewDesiredSize;
 			return;
@@ -1149,13 +1267,16 @@ void SDesignerView::OnEditorSelectionChanged()
 			WidgetRef.GetPreview()->DeselectByDesigner();
 		}
 
-		// Find all named slot host widgets that are hierarchical ancestors of this widget and call deselect on them as well
-		TArray<FWidgetReference> AncestorSlotHostWidgets;
-		FWidgetBlueprintEditorUtils::FindAllAncestorNamedSlotHostWidgetsForContent(AncestorSlotHostWidgets, WidgetRef.GetTemplate(), BPEd.ToSharedRef());
-
-		for (FWidgetReference SlotHostWidget : AncestorSlotHostWidgets)
+		if (UWidget* WidgetTemplate = WidgetRef.GetTemplate())
 		{
-			SlotHostWidget.GetPreview()->DeselectByDesigner();
+			// Find all named slot host widgets that are hierarchical ancestors of this widget and call deselect on them as well
+			TArray<FWidgetReference> AncestorSlotHostWidgets;
+			FWidgetBlueprintEditorUtils::FindAllAncestorNamedSlotHostWidgetsForContent(AncestorSlotHostWidgets, WidgetTemplate, BPEd.ToSharedRef());
+
+			for (FWidgetReference SlotHostWidget : AncestorSlotHostWidgets)
+			{
+				SlotHostWidget.GetPreview()->DeselectByDesigner();
+			}
 		}
 	}
 
@@ -1166,13 +1287,16 @@ void SDesignerView::OnEditorSelectionChanged()
 		{
 			WidgetRef.GetPreview()->SelectByDesigner();
 
-			// Find all named slot host widgets that are hierarchical ancestors of this widget and call select on them as well
-			TArray<FWidgetReference> AncestorSlotHostWidgets;
-			FWidgetBlueprintEditorUtils::FindAllAncestorNamedSlotHostWidgetsForContent(AncestorSlotHostWidgets, WidgetRef.GetTemplate(), BPEd.ToSharedRef());
-
-			for (FWidgetReference SlotHostWidget : AncestorSlotHostWidgets)
+			if (UWidget* WidgetTemplate = WidgetRef.GetTemplate())
 			{
-				SlotHostWidget.GetPreview()->SelectByDesigner();
+				// Find all named slot host widgets that are hierarchical ancestors of this widget and call select on them as well
+				TArray<FWidgetReference> AncestorSlotHostWidgets;
+				FWidgetBlueprintEditorUtils::FindAllAncestorNamedSlotHostWidgetsForContent(AncestorSlotHostWidgets, WidgetTemplate, BPEd.ToSharedRef());
+
+				for (FWidgetReference SlotHostWidget : AncestorSlotHostWidgets)
+				{
+					SlotHostWidget.GetPreview()->SelectByDesigner();
+				}
 			}
 		}
 	}
@@ -2039,40 +2163,22 @@ void SDesignerView::DrawSafeZone(const FOnPaintHandlerParams& PaintArgs)
 	}
 
 	if ( bCanShowSafeZone )
-	{
-		IConsoleVariable* SafeZoneDebugMode = IConsoleManager::Get().FindConsoleVariable(TEXT("r.DebugSafeZone.Mode"));
-		check(SafeZoneDebugMode);
-
-		int32 DebugSafeZoneMode = SafeZoneDebugMode->GetInt();
-		if ( DebugSafeZoneMode != 0 )
+{
+		const float UnsafeZoneAlpha = 0.2f;
+		const FLinearColor UnsafeZoneColor(1.0f, 0.5f, 0.5f, UnsafeZoneAlpha);
+		const FSlateBrush* WhiteBrush = FEditorStyle::GetBrush("WhiteBrush");
+			
+		FGeometry PreviewGeometry = PreviewAreaConstraint->GetCachedGeometry();
+		PreviewGeometry.AppendTransform(FSlateLayoutTransform(Inverse(PaintArgs.Args.GetWindowToDesktopTransform())));
+		
+		const float Width = PreviewWidth;
+		const float Height = PreviewHeight;
+		if (PreviewOverrideName.IsEmpty())
 		{
-			FDisplayMetrics Metrics;
-			FSlateApplication::Get().GetDisplayMetrics(Metrics);
-
-			const FMargin DebugSafeMargin = 
-				// FVector4(X,Y,Z,W) being used like FMargin(left, top, right, bottom)
-				( DebugSafeZoneMode == 1 )
-				? FMargin(Metrics.TitleSafePaddingSize.X, Metrics.TitleSafePaddingSize.Y, Metrics.TitleSafePaddingSize.Z, Metrics.TitleSafePaddingSize.W)
-				: FMargin(Metrics.ActionSafePaddingSize.X, Metrics.ActionSafePaddingSize.Y, Metrics.ActionSafePaddingSize.Z, Metrics.ActionSafePaddingSize.W);
-
-
-			float PaddingRatio = DebugSafeMargin.Left / ( Metrics.PrimaryDisplayWidth * 0.5 );
-
-			const FMargin SafeMargin = FMargin(PaddingRatio * PreviewWidth * 0.5, PaddingRatio * PreviewHeight * 0.5);
-
-			const float UnsafeZoneAlpha = 0.2f;
-			const FLinearColor UnsafeZoneColor(1.0f, 0.5f, 0.5f, UnsafeZoneAlpha);
-
-			const float Width = PreviewWidth;
-			const float Height = PreviewHeight;
-
+			FMargin SafeMargin;
+			FSlateApplication::Get().ResetCustomSafeZone();
+			FSlateApplication::Get().GetSafeZoneSize(SafeMargin, FVector2D(Width, Height));
 			const float HeightOfSides = Height - SafeMargin.GetTotalSpaceAlong<Orient_Vertical>();
-
-			FGeometry PreviewGeometry = PreviewAreaConstraint->GetCachedGeometry();
-			PreviewGeometry.AppendTransform(FSlateLayoutTransform(Inverse(PaintArgs.Args.GetWindowToDesktopTransform())));
-
-			const FSlateBrush* WhiteBrush = FEditorStyle::GetBrush("WhiteBrush");
-
 			// Top bar
 			FSlateDrawElement::MakeBox(
 				PaintArgs.OutDrawElements,
@@ -2112,6 +2218,33 @@ void SDesignerView::DrawSafeZone(const FOnPaintHandlerParams& PaintArgs)
 				ESlateDrawEffect::None,
 				UnsafeZoneColor
 			);
+
+		}
+		else
+		{
+			ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+			if (bSafeZoneFlipped)
+			{
+				DesignerSafeZoneOverride = PlaySettings->FlipCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+			}
+			else
+			{
+				DesignerSafeZoneOverride = PlaySettings->CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+			}
+
+			for (int ZoneIndex = 0; ZoneIndex < CustomSafeZoneStarts.Num(); ZoneIndex++)
+			{
+				FVector2D Start = CustomSafeZoneStarts[ZoneIndex];
+				FVector2D Dimensions = CustomSafeZoneDimensions[ZoneIndex];
+				FSlateDrawElement::MakeBox(
+					PaintArgs.OutDrawElements,
+					PaintArgs.Layer,
+					PreviewGeometry.ToPaintGeometry(Start, Dimensions),
+					WhiteBrush,
+					ESlateDrawEffect::None,
+					UnsafeZoneColor
+				);
+			}
 		}
 	}
 }
@@ -2174,6 +2307,8 @@ void SDesignerView::UpdatePreviewWidget(bool bForceUpdate)
 void SDesignerView::BroadcastDesignerChanged()
 {
 	UUserWidget* LatestPreviewWidget = BlueprintEditor.Pin()->GetPreview();
+	ULevelEditorPlaySettings* PlayInSettings = GetMutableDefault<ULevelEditorPlaySettings>();
+	
 	if ( LatestPreviewWidget )
 	{
 		FDesignerChangedEventArgs EventArgs;
@@ -2270,20 +2405,12 @@ void SDesignerView::Tick( const FGeometry& AllottedGeometry, const double InCurr
 		SideRuler->SetCursor(TOptional<FVector2D>());
 	}
 
-	DefaultWidget = GetDefaultWidget();
-	if (DefaultWidget)
+	if ( PreviewWidget )
 	{
-		const bool bNeedDesiredSize = 
-			DefaultWidget->DesignSizeMode == EDesignPreviewSizeMode::Desired || 
-			DefaultWidget->DesignSizeMode == EDesignPreviewSizeMode::DesiredOnScreen;
-
-		if ( bNeedDesiredSize && PreviewWidget )
+		TSharedPtr<SWidget> CachedWidget = PreviewWidget->GetCachedWidget();
+		if ( CachedWidget.IsValid() )
 		{
-			TSharedPtr<SWidget> CachedWidget = PreviewWidget->GetCachedWidget();
-			if ( CachedWidget.IsValid() )
-			{
-				CachedPreviewDesiredSize = CachedWidget->GetDesiredSize();
-			}
+			CachedPreviewDesiredSize = CachedWidget->GetDesiredSize();
 		}
 	}
 }
@@ -2950,6 +3077,33 @@ FText SDesignerView::GetCurrentDPIScaleText() const
 	return FText::Format(LOCTEXT("CurrentDPIScaleFormat", "DPI Scale {0}"), DPIString);
 }
 
+FText SDesignerView::GetCurrentScaleFactorText() const
+{
+	FInternationalization& I18N = FInternationalization::Get();
+
+	FNumberFormattingOptions Options;
+	Options.MinimumIntegralDigits = 1;
+	Options.MaximumFractionalDigits = 2;
+	Options.MinimumFractionalDigits = 1;
+
+	FText DPIString = FText::AsNumber(ScaleFactor, &Options, I18N.GetInvariantCulture());
+	return FText::Format(LOCTEXT("CurrentContentScale", "Device Content Scale {0}"), DPIString);
+}
+
+FText SDesignerView::GetCurrentSafeZoneText() const
+{
+	if (PreviewOverrideName.IsEmpty())
+	{
+		float SafeZone = FDisplayMetrics::GetDebugTitleSafeZoneRatio();
+		if (FMath::IsNearlyEqual(SafeZone, 1.0f))
+		{
+			return LOCTEXT("NoSafeZoneSet", "No Device Safe Zone Set");
+		}
+		return FText::Format(LOCTEXT("UniformSafeZone", "Uniform Safe Zone: {0}"), FText::AsNumber(SafeZone));
+	}
+	return FText::FromString(PreviewOverrideName);
+}
+
 FSlateColor SDesignerView::GetResolutionTextColorAndOpacity() const
 {
 	return FLinearColor(1, 1, 1, 1.25f - ResolutionTextFade.GetLerp());
@@ -3028,15 +3182,63 @@ FReply SDesignerView::HandleDPISettingsClicked()
 	return FReply::Handled();
 }
 
-void SDesignerView::HandleOnCommonResolutionSelected(int32 Width, int32 Height, FString AspectRatio)
+void SDesignerView::HandleOnCommonResolutionSelected(FPlayScreenResolution InResolution)
 {
-	PreviewWidth = Width;
-	PreviewHeight = Height;
-	PreviewAspectRatio = AspectRatio;
+	bSafeZoneFlipped = false;
+	bCanPreviewSwapAspectRatio = InResolution.bCanSwapAspectRatio;
+	// Phone/tablet resolutions can be stored in either portrait or landscape mode, and may need to be flipped
+	if (bCanPreviewSwapAspectRatio && ((!bPreviewIsPortrait && InResolution.Width < InResolution.Height) ||
+		(bPreviewIsPortrait && InResolution.Width > InResolution.Height)))
+	{
+		PreviewWidth = InResolution.Height;
+		PreviewHeight = InResolution.Width;
+	}
+	else
+	{
+		PreviewWidth = InResolution.Width;
+		PreviewHeight = InResolution.Height;
+		bPreviewIsPortrait = PreviewWidth < PreviewHeight;
+	}
+	PreviewAspectRatio = InResolution.AspectRatio;
 
-	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewWidth"), Width, GEditorPerProjectIni);
-	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewHeight"), Height, GEditorPerProjectIni);
-	GConfig->SetString(*ConfigSectionName, TEXT("PreviewAspectRatio"), *AspectRatio, GEditorPerProjectIni);
+	PreviewOverrideName = InResolution.ProfileName;
+
+	if (!bCanPreviewSwapAspectRatio)
+	{
+		bPreviewIsPortrait = (PreviewHeight > PreviewWidth);
+	}
+
+	ScaleFactor = 1.0f;
+	ULevelEditorPlaySettings* PlayInSettings = GetMutableDefault<ULevelEditorPlaySettings>();
+	UDeviceProfile* DeviceProfile = UDeviceProfileManager::Get().FindProfile(PreviewOverrideName, false);
+	if (DeviceProfile)
+	{
+		PlayInSettings->RescaleForMobilePreview(DeviceProfile, PreviewWidth, PreviewHeight, ScaleFactor);
+	}
+
+	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewWidth"), PreviewWidth, GEditorPerProjectIni);
+	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewHeight"), PreviewHeight, GEditorPerProjectIni);
+	GConfig->SetString(*ConfigSectionName, TEXT("PreviewAspectRatio"), *PreviewAspectRatio, GEditorPerProjectIni);
+	GConfig->SetBool(*ConfigSectionName, TEXT("bIsInPortraitMode"), bPreviewIsPortrait, GEditorPerProjectIni);
+	GConfig->SetString(*ConfigSectionName, TEXT("ProfileName"), *PreviewOverrideName, GEditorPerProjectIni);
+	GConfig->SetFloat(*ConfigSectionName, TEXT("ScaleFactor"), ScaleFactor, GEditorPerProjectIni);
+	GConfig->SetBool(*ConfigSectionName, TEXT("bCanPreviewSwapAspectRatio"), bCanPreviewSwapAspectRatio, GEditorPerProjectIni);
+
+	if (!PreviewOverrideName.IsEmpty())
+	{
+		DesignerSafeZoneOverride = PlayInSettings->CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	else
+	{
+		FSlateApplication::Get().ResetCustomSafeZone();
+		FSlateApplication::Get().GetSafeZoneSize(DesignerSafeZoneOverride, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	FMargin SafeZoneRatio = DesignerSafeZoneOverride;
+	SafeZoneRatio.Left /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Right /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Bottom /= (PreviewHeight / 2.0f);
+	SafeZoneRatio.Top /= (PreviewHeight / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
 
 	if (UUserWidget* DefaultWidget = GetDefaultWidget())
 	{
@@ -3060,7 +3262,7 @@ void SDesignerView::HandleOnCommonResolutionSelected(int32 Width, int32 Height,
 	ResolutionTextFade.Play(this->AsShared());
 }
 
-bool SDesignerView::HandleIsCommonResolutionSelected(int32 Width, int32 Height) const
+bool SDesignerView::HandleIsCommonResolutionSelected(FPlayScreenResolution InResolution) const
 {
 	// If we're using a custom design time size, none of the other resolutions should appear selected, even if they match.
 	if ( UUserWidget* DefaultWidget = GetDefaultWidget() )
@@ -3070,19 +3272,24 @@ bool SDesignerView::HandleIsCommonResolutionSelected(int32 Width, int32 Height)
 			return false;
 		}
 	}
-	
-	return ( Width == PreviewWidth ) && ( Height == PreviewHeight );
+
+	if (!InResolution.ProfileName.IsEmpty())
+	{
+		return InResolution.ProfileName.Equals(PreviewOverrideName);
+	}
+
+	return ((InResolution.Width == PreviewWidth ) && (InResolution.Height == PreviewHeight )) || (InResolution.bCanSwapAspectRatio && (InResolution.Height == PreviewWidth) && (InResolution.Width == PreviewHeight));
 }
 
-void SDesignerView::AddScreenResolutionSection(FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution>& Resolutions, const FText& SectionName)
+void SDesignerView::AddScreenResolutionSection(FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution> Resolutions, const FText SectionName)
 {
 	MenuBuilder.BeginSection(NAME_None, SectionName);
 	{
 		for ( auto Iter = Resolutions.CreateConstIterator(); Iter; ++Iter )
 		{
 			// Actions for the resolution menu entry
-			FExecuteAction OnResolutionSelected = FExecuteAction::CreateRaw(this, &SDesignerView::HandleOnCommonResolutionSelected, Iter->Width, Iter->Height, Iter->AspectRatio);
-			FIsActionChecked OnIsResolutionSelected = FIsActionChecked::CreateRaw(this, &SDesignerView::HandleIsCommonResolutionSelected, Iter->Width, Iter->Height);
+			FExecuteAction OnResolutionSelected = FExecuteAction::CreateRaw(this, &SDesignerView::HandleOnCommonResolutionSelected, *Iter);
+			FIsActionChecked OnIsResolutionSelected = FIsActionChecked::CreateRaw(this, &SDesignerView::HandleIsCommonResolutionSelected, *Iter);
 			FUIAction Action(OnResolutionSelected, FCanExecuteAction(), OnIsResolutionSelected);
 
 			MenuBuilder.AddMenuEntry(FText::FromString(Iter->Description), GetResolutionText(Iter->Width, Iter->Height, Iter->AspectRatio), FSlateIcon(), Action, NAME_None, EUserInterfaceActionType::Check);
@@ -3158,20 +3365,48 @@ TSharedRef<SWidget> SDesignerView::GetResolutionsMenu()
 {
 	const ULevelEditorPlaySettings* PlaySettings = GetDefault<ULevelEditorPlaySettings>();
 	FMenuBuilder MenuBuilder(true, nullptr);
-
 	// Add the normal set of resolution options.
-	AddScreenResolutionSection(MenuBuilder, PlaySettings->PhoneScreenResolutions, LOCTEXT("CommonPhonesSectionHeader", "Phones"));
-	AddScreenResolutionSection(MenuBuilder, PlaySettings->TabletScreenResolutions, LOCTEXT("CommonTabletsSectionHeader", "Tablets"));
-	AddScreenResolutionSection(MenuBuilder, PlaySettings->LaptopScreenResolutions, LOCTEXT("CommonLaptopsSectionHeader", "Laptops"));
-	AddScreenResolutionSection(MenuBuilder, PlaySettings->MonitorScreenResolutions, LOCTEXT("CommoMonitorsSectionHeader", "Monitors"));
-	AddScreenResolutionSection(MenuBuilder, PlaySettings->TelevisionScreenResolutions, LOCTEXT("CommonTelevesionsSectionHeader", "Televisions"));
+	FText PhoneTitle = LOCTEXT("CommonPhonesSectionHeader", "Phones");
+	FText TabletTitle = LOCTEXT("CommonTabletsSectionHeader", "Tablets");
+	FText LaptopTitle = LOCTEXT("CommonLaptopsSectionHeader", "Laptops");
+	FText MonitorTitle = LOCTEXT("CommonMonitorsSectionHeader", "Monitors");
+	FText TelevisionTitle = LOCTEXT("CommonTelevesionsSectionHeader", "Televisions");
+	MenuBuilder.AddSubMenu(
+		PhoneTitle,
+		FText(),
+		FNewMenuDelegate::CreateRaw(this, &SDesignerView::AddScreenResolutionSection, (PlaySettings->PhoneScreenResolutions), PhoneTitle),
+		false,
+		FSlateIcon());
+	MenuBuilder.AddSubMenu(
+		TabletTitle,
+		FText(),
+		FNewMenuDelegate::CreateRaw(this, &SDesignerView::AddScreenResolutionSection, (PlaySettings->TabletScreenResolutions), TabletTitle),
+		false,
+		FSlateIcon());
+	MenuBuilder.AddSubMenu(
+		LaptopTitle,
+		FText(),
+		FNewMenuDelegate::CreateRaw(this, &SDesignerView::AddScreenResolutionSection, (PlaySettings->LaptopScreenResolutions), LaptopTitle),
+		false,
+		FSlateIcon());
+	MenuBuilder.AddSubMenu(
+		MonitorTitle,
+		FText(),
+		FNewMenuDelegate::CreateRaw(this, &SDesignerView::AddScreenResolutionSection, (PlaySettings->MonitorScreenResolutions), MonitorTitle),
+		false,
+		FSlateIcon());
+	MenuBuilder.AddSubMenu(
+		TelevisionTitle,
+		FText(),
+		FNewMenuDelegate::CreateRaw(this, &SDesignerView::AddScreenResolutionSection, (PlaySettings->TelevisionScreenResolutions), TelevisionTitle),
+		false,
+		FSlateIcon());
 
 	return MenuBuilder.MakeWidget();
 }
 
 TSharedRef<SWidget> SDesignerView::GetScreenSizingFillMenu()
 {
-	const ULevelEditorPlaySettings* PlaySettings = GetDefault<ULevelEditorPlaySettings>();
 	FMenuBuilder MenuBuilder(true, nullptr);
 
 	CreateScreenFillEntry(MenuBuilder, EDesignPreviewSizeMode::FillScreen);
@@ -3228,6 +3463,25 @@ void SDesignerView::OnScreenFillRuleSelected(EDesignPreviewSizeMode SizeMode)
 	}
 }
 
+const FSlateBrush* SDesignerView::GetAspectRatioSwitchImage() const
+{
+	if (PreviewHeight > PreviewWidth)
+	{
+		return FEditorStyle::Get().GetBrush("UMGEditor.OrientPortrait");
+	}
+	return FEditorStyle::Get().GetBrush("UMGEditor.OrientLandscape");
+}
+
+bool SDesignerView::GetAspectRatioSwitchEnabled() const
+{
+	return bCanPreviewSwapAspectRatio;
+}
+
+bool SDesignerView::GetFlipDeviceEnabled() const
+{
+	return PreviewWidth > PreviewHeight && !PreviewOverrideName.IsEmpty();
+}
+
 void SDesignerView::BeginTransaction(const FText& SessionName)
 {
 	if ( ScopedTransaction == nullptr )
@@ -3270,6 +3524,85 @@ FReply SDesignerView::HandleZoomToFitClicked()
 	return FReply::Handled();
 }
 
+FReply SDesignerView::HandleSwapAspectRatioClicked()
+{
+	bSafeZoneFlipped = false;
+	int32 OldPreviewHeight = PreviewHeight;
+	PreviewHeight = PreviewWidth;
+	PreviewWidth = OldPreviewHeight;
+	bPreviewIsPortrait = (PreviewHeight > PreviewWidth);
+	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewWidth"), PreviewWidth, GEditorPerProjectIni);
+	GConfig->SetInt(*ConfigSectionName, TEXT("PreviewHeight"), PreviewHeight, GEditorPerProjectIni);
+	GConfig->SetString(*ConfigSectionName, TEXT("PreviewAspectRatio"), *PreviewAspectRatio, GEditorPerProjectIni);
+	GConfig->SetBool(*ConfigSectionName, TEXT("bIsInPortraitMode"), bPreviewIsPortrait, GEditorPerProjectIni);
+	GConfig->SetString(*ConfigSectionName, TEXT("ProfileName"), *PreviewOverrideName, GEditorPerProjectIni);
+	GConfig->SetFloat(*ConfigSectionName, TEXT("ScaleFactor"), ScaleFactor, GEditorPerProjectIni);
+	GConfig->SetBool(*ConfigSectionName, TEXT("bCanPreviewSwapAspectRatio"), bCanPreviewSwapAspectRatio, GEditorPerProjectIni);
+
+	if (!PreviewOverrideName.IsEmpty())
+	{
+		ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+		DesignerSafeZoneOverride = PlaySettings->CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	else
+	{
+		FSlateApplication::Get().ResetCustomSafeZone();
+		FSlateApplication::Get().GetSafeZoneSize(DesignerSafeZoneOverride, FVector2D(PreviewWidth, PreviewHeight));
+	}
+	FMargin SafeZoneRatio = DesignerSafeZoneOverride;
+	SafeZoneRatio.Left /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Right /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Bottom /= (PreviewHeight / 2.0f);
+	SafeZoneRatio.Top /= (PreviewHeight / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
+	if (UUserWidget* DefaultWidget = GetDefaultWidget())
+	{
+		MarkDesignModifed(/*bRequiresRecompile*/ false);
+	}
+
+	BroadcastDesignerChanged();
+
+	ResolutionTextFade.Play(this->AsShared());
+
+	return FReply::Handled();
+}
+
+FReply SDesignerView::HandleFlipSafeZonesClicked()
+{
+	if (!PreviewOverrideName.IsEmpty())
+	{
+		ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+		if (!bSafeZoneFlipped)
+		{
+			DesignerSafeZoneOverride = PlaySettings->FlipCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+			bSafeZoneFlipped = true;
+		}
+		else
+		{
+			DesignerSafeZoneOverride = PlaySettings->CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, PreviewOverrideName, FVector2D(PreviewWidth, PreviewHeight));
+			bSafeZoneFlipped = false;
+		}
+	}
+
+	FMargin SafeZoneRatio = DesignerSafeZoneOverride;
+	SafeZoneRatio.Left /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Right /= (PreviewWidth / 2.0f);
+	SafeZoneRatio.Bottom /= (PreviewHeight / 2.0f);
+	SafeZoneRatio.Top /= (PreviewHeight / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
+	if (UUserWidget* DefaultWidget = GetDefaultWidget())
+	{
+		MarkDesignModifed(/*bRequiresRecompile*/ false);
+	}
+	BroadcastDesignerChanged();
+
+	ResolutionTextFade.Play(this->AsShared());
+
+	return FReply::Handled();
+}
+
 EVisibility SDesignerView::GetRulerVisibility() const
 {
 	return EVisibility::Visible;
diff --git a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.h b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.h
index 1f8056eaead3..063a2ab2eb15 100644
--- a/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.h
+++ b/Engine/Source/Editor/UMGEditor/Private/Designer/SDesignerView.h
@@ -182,6 +182,8 @@ private:
 
 	FText GetCurrentResolutionText() const;
 	FText GetCurrentDPIScaleText() const;
+	FText GetCurrentScaleFactorText() const;
+	FText GetCurrentSafeZoneText() const;
 	FSlateColor GetResolutionTextColorAndOpacity() const;
 	EVisibility GetResolutionTextVisibility() const;
 
@@ -192,9 +194,9 @@ private:
 	EVisibility GetCustomResolutionEntryVisibility() const;
 	
 	// Handles selecting a common screen resolution.
-	void HandleOnCommonResolutionSelected(int32 Width, int32 Height, FString AspectRatio);
-	bool HandleIsCommonResolutionSelected(int32 Width, int32 Height) const;
-	void AddScreenResolutionSection(FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution>& Resolutions, const FText& SectionName);
+	void HandleOnCommonResolutionSelected(FPlayScreenResolution InResolution);
+	bool HandleIsCommonResolutionSelected(FPlayScreenResolution InResolution) const;
+	void AddScreenResolutionSection(FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution> Resolutions, const FText SectionName);
 	TSharedRef<SWidget> GetResolutionsMenu();
 
 	TSharedRef<SWidget> GetScreenSizingFillMenu();
@@ -203,6 +205,9 @@ private:
 	bool GetIsScreenFillRuleSelected(EDesignPreviewSizeMode SizeMode) const;
 	void OnScreenFillRuleSelected(EDesignPreviewSizeMode SizeMode);
 
+	const FSlateBrush* GetAspectRatioSwitchImage() const;
+	bool GetAspectRatioSwitchEnabled() const;
+	bool GetFlipDeviceEnabled() const;
 	EVisibility GetDesignerOutlineVisibility() const;
 	FSlateColor GetDesignerOutlineColor() const;
 	FText GetDesignerOutlineText() const;
@@ -240,6 +245,8 @@ private:
 
 private:
 	FReply HandleZoomToFitClicked();
+	FReply HandleSwapAspectRatioClicked();
+	FReply HandleFlipSafeZonesClicked();
 	EVisibility GetRulerVisibility() const;
 
 private:
@@ -247,6 +254,7 @@ private:
 	static const uint32 DefaultResolutionWidth;
 	static const uint32 DefaultResolutionHeight;
 	static const FString DefaultAspectRatio;
+	static const FString DefaultPreviewOverrideName;
 
 	/** Extensions for the designer to allow for custom widgets to be inserted onto the design surface as selection changes. */
 	TArray< TSharedRef<FDesignerExtension> > DesignerExtensions;
@@ -347,6 +355,18 @@ private:
 	// Resolution Info
 	FString PreviewAspectRatio;
 
+	// Whether or not the resolution can flip between portrait and landscape
+	bool bCanPreviewSwapAspectRatio;
+
+	FString PreviewOverrideName;
+
+	float ScaleFactor;
+
+	bool bSafeZoneFlipped;
+
+	// Whether the preview is currently in portrait mode
+	bool bPreviewIsPortrait;
+
 	/** Curve to handle fading of the resolution */
 	FCurveSequence ResolutionTextFade;
 
@@ -373,4 +393,10 @@ private:
 
 	/** The message stack to display the last item to the user in a non-modal fashion. */
 	TArray<FText> DesignerMessageStack;
+
+	TArray<FVector2D> CustomSafeZoneStarts;
+
+	TArray<FVector2D> CustomSafeZoneDimensions;
+
+	FMargin DesignerSafeZoneOverride;
 };
diff --git a/Engine/Source/Editor/UMGEditor/Private/UMGEditorModule.cpp b/Engine/Source/Editor/UMGEditor/Private/UMGEditorModule.cpp
index 934cc977f54e..7bcc79433c8b 100644
--- a/Engine/Source/Editor/UMGEditor/Private/UMGEditorModule.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/UMGEditorModule.cpp
@@ -32,6 +32,9 @@
 #include "SequencerSettings.h"
 
 #include "BlueprintEditorModule.h"
+#include "PropertyEditorModule.h"
+#include "DynamicEntryBoxDetails.h"
+#include "ListViewBaseDetails.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
@@ -86,6 +89,11 @@ public:
 		WidgetMaterialTrackEditorCreateTrackEditorHandle  = SequencerModule.RegisterTrackEditor(FOnCreateTrackEditor::CreateStatic(&FWidgetMaterialTrackEditor::CreateTrackEditor));
 
 		RegisterSettings();
+
+		// Class detail customizations
+		FPropertyEditorModule& PropertyModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>(TEXT("PropertyEditor"));
+		PropertyModule.RegisterCustomClassLayout(TEXT("DynamicEntryBox"), FOnGetDetailCustomizationInstance::CreateStatic(&FDynamicEntryBoxDetails::MakeInstance));
+		PropertyModule.RegisterCustomClassLayout(TEXT("ListViewBase"), FOnGetDetailCustomizationInstance::CreateStatic(&FListViewBaseDetails::MakeInstance));
 	}
 
 	/** Called before the module is unloaded, right before the module object is destroyed. */
diff --git a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprint.cpp b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprint.cpp
index 92eb76235a71..b8bafa713332 100644
--- a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprint.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprint.cpp
@@ -32,6 +32,10 @@
 #include "Interfaces/ITargetPlatform.h"
 #include "Modules/ModuleManager.h"
 #endif
+#include "Kismet2/BlueprintEditorUtils.h"
+#include "K2Node_CallFunction.h"
+#include "K2Node_MacroInstance.h"
+#include "K2Node_Composite.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
@@ -522,6 +526,7 @@ bool FWidgetAnimation_DEPRECATED::SerializeFromMismatchedTag(struct FPropertyTag
 
 UWidgetBlueprint::UWidgetBlueprint(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
+	, TickFrequency(EWidgetTickFrequency::Auto)
 	, SupportDynamicCreation(EWidgetSupportsDynamicCreation::Default)
 {
 	WidgetTree = CreateDefaultSubobject<UWidgetTree>(TEXT("WidgetTree"));
@@ -545,6 +550,15 @@ void UWidgetBlueprint::ReplaceDeprecatedNodes()
 	Super::ReplaceDeprecatedNodes();
 }
 
+#if WITH_EDITORONLY_DATA
+void UWidgetBlueprint::PreSave(const class ITargetPlatform* TargetPlatform)
+{
+	Super::PreSave(TargetPlatform);
+
+	PropertyBindings = Bindings.Num();
+}
+#endif // WITH_EDITORONLY_DATA
+
 void UWidgetBlueprint::Serialize(FArchive& Ar)
 {
 	Super::Serialize(Ar);
@@ -608,6 +622,8 @@ void UWidgetBlueprint::PostLoad()
 			Graph->Schema = UWidgetGraphSchema::StaticClass();
 		}
 	}
+
+	PropertyBindings = Bindings.Num();
 }
 
 void UWidgetBlueprint::PostDuplicate(bool bDuplicateForPIE)
@@ -806,6 +822,149 @@ void UWidgetBlueprint::ForEachSourceWidgetImpl (TFunctionRef<void(UWidget*)> Fn)
 	);
 }
 
+static bool HasLatentActions(UEdGraph* Graph)
+{
+	for (const UEdGraphNode* Node : Graph->Nodes)
+	{
+		if (const UK2Node_CallFunction* CallFunctionNode = Cast<UK2Node_CallFunction>(Node))
+		{
+			// Check any function call nodes to see if they are latent.
+			UFunction* TargetFunction = CallFunctionNode->GetTargetFunction();
+			if (TargetFunction && TargetFunction->HasMetaData(FBlueprintMetadata::MD_Latent))
+			{
+				return true;
+			}
+		}
+
+		else if (const UK2Node_MacroInstance* MacroInstanceNode = Cast<UK2Node_MacroInstance>(Node))
+		{
+			// Any macro graphs that haven't already been checked need to be checked for latent function calls
+			//if (InspectedGraphList.Find(MacroInstanceNode->GetMacroGraph()) == INDEX_NONE)
+			{
+				if (HasLatentActions(MacroInstanceNode->GetMacroGraph()))
+				{
+					return true;
+				}
+			}
+		}
+		else if (const UK2Node_Composite* CompositeNode = Cast<UK2Node_Composite>(Node))
+		{
+			// Any collapsed graphs that haven't already been checked need to be checked for latent function calls
+			//if (InspectedGraphList.Find(CompositeNode->BoundGraph) == INDEX_NONE)
+			{
+				if (HasLatentActions(CompositeNode->BoundGraph))
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+void UWidgetBlueprint::UpdateTickabilityStats(bool& OutHasLatentActions, bool& OutHasAnimations, bool& OutClassRequiresNativeTick)
+{
+	if (GeneratedClass && GeneratedClass->ClassConstructor)
+	{
+		UWidgetBlueprintGeneratedClass* WidgetBPGeneratedClass = CastChecked<UWidgetBlueprintGeneratedClass>(GeneratedClass);
+		UUserWidget* DefaultWidget = WidgetBPGeneratedClass->GetDefaultObject<UUserWidget>();
+
+		TArray<UBlueprint*> BlueprintParents;
+		UBlueprint::GetBlueprintHierarchyFromClass(WidgetBPGeneratedClass, BlueprintParents);
+
+		bool bHasLatentActions = false;
+		bool bHasAnimations = false;
+		const bool bHasScriptImplementedTick = DefaultWidget->bHasScriptImplementedTick;
+
+		for (UBlueprint* Blueprint : BlueprintParents)
+		{
+			UWidgetBlueprint* WidgetBP = Cast<UWidgetBlueprint>(Blueprint);
+			if (WidgetBP)
+			{
+				bHasAnimations |= WidgetBP->Animations.Num() > 0;
+
+				if (!bHasLatentActions)
+				{
+					TArray<UEdGraph*> AllGraphs;
+					WidgetBP->GetAllGraphs(AllGraphs);
+
+					for (UEdGraph* Graph : AllGraphs)
+					{
+						if (HasLatentActions(Graph))
+						{
+							bHasLatentActions = true;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		UClass* NativeParent = FBlueprintEditorUtils::GetNativeParent(this);
+		static const FName DisableNativeTickMetaTag("DisableNativeTick");
+		const bool bClassRequiresNativeTick = !NativeParent->HasMetaData(DisableNativeTickMetaTag);
+
+		TickFrequency = DefaultWidget->GetDesiredTickFrequency();
+		TickPredictionReason = TEXT("");
+		TickPrediction = EWidgetCompileTimeTickPrediction::WontTick;
+		switch (TickFrequency)
+		{
+		case EWidgetTickFrequency::Never:
+			TickPrediction = EWidgetCompileTimeTickPrediction::WontTick;
+			break;
+		case EWidgetTickFrequency::Auto:
+		{
+			TArray<FString> Reasons;
+			if (bHasScriptImplementedTick)
+			{
+				Reasons.Add(TEXT("Script"));
+			}
+
+			if (bClassRequiresNativeTick)
+			{
+				Reasons.Add(TEXT("Native"));
+			}
+
+			if (bHasAnimations)
+			{
+				Reasons.Add(TEXT("Anim"));
+			}
+
+			if (bHasLatentActions)
+			{
+				Reasons.Add(TEXT("Latent"));
+			}
+
+			for (int32 ReasonIdx = 0; ReasonIdx < Reasons.Num(); ++ReasonIdx)
+			{
+				TickPredictionReason += Reasons[ReasonIdx];
+				if (ReasonIdx != Reasons.Num() - 1)
+				{
+					TickPredictionReason.AppendChar('|');
+				}
+			}
+
+			if (bHasScriptImplementedTick || bClassRequiresNativeTick)
+			{
+				// Widget has an implemented tick or the generated class is not a direct child of UUserWidget (means it could have a native tick) then it will definitely tick
+				TickPrediction = EWidgetCompileTimeTickPrediction::WillTick;
+			}
+			else if (bHasAnimations || bHasLatentActions)
+			{
+				// Widget has latent actions or animations and will tick if these are triggered
+				TickPrediction = EWidgetCompileTimeTickPrediction::OnDemand;
+			}
+		}
+		break;
+		}
+
+		OutHasLatentActions = bHasLatentActions;
+		OutHasAnimations = bHasAnimations;
+		OutClassRequiresNativeTick = bClassRequiresNativeTick;
+	}
+}
+
 bool UWidgetBlueprint::WidgetSupportsDynamicCreation() const
 {
 	switch (SupportDynamicCreation)
diff --git a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintCompiler.cpp b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintCompiler.cpp
index 62e81c9f9d61..ff8994a1725e 100644
--- a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintCompiler.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintCompiler.cpp
@@ -18,15 +18,12 @@
 #include "WidgetBlueprintEditorUtils.h"
 #include "WidgetGraphSchema.h"
 #include "IUMGModule.h"
-#include "IWidgetEditorExtension.h"
 #include "UMGEditorProjectSettings.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
 #define CPF_Instanced (CPF_PersistentInstance | CPF_ExportObject | CPF_InstancedReference)
 
-const FName IWidgetEditorExtension::ServiceFeatureName(TEXT("WidgetEditorExtension"));
-
 extern COREUOBJECT_API bool GMinimalCompileOnLoad;
 
 FWidgetBlueprintCompiler::FWidgetBlueprintCompiler(UWidgetBlueprint* SourceSketch, FCompilerResultsLog& InMessageLog, const FKismetCompilerOptions& InCompilerOptions, TArray<UObject*>* InObjLoaded)
@@ -320,23 +317,59 @@ void FWidgetBlueprintCompiler::CopyTermDefaultsToDefaultObject(UObject* DefaultO
 		const UFunction* ReceiveTickEvent = FKismetCompilerUtilities::FindOverriddenImplementableEvent(GET_FUNCTION_NAME_CHECKED(UUserWidget, Tick), NewWidgetBlueprintClass);
 		if (ReceiveTickEvent)
 		{
-			DefaultWidget->bCanEverTick = true;
+			DefaultWidget->bHasScriptImplementedTick = true;
 		}
 		else
 		{
-			DefaultWidget->bCanEverTick = false;
+			DefaultWidget->bHasScriptImplementedTick = false;
 		}
 
 		//TODO Once we handle multiple derived blueprint classes, we need to check parent versions of the class.
 		if ( const UFunction* ReceivePaintEvent = FKismetCompilerUtilities::FindOverriddenImplementableEvent(GET_FUNCTION_NAME_CHECKED(UUserWidget, OnPaint), NewWidgetBlueprintClass) )
 		{
-			DefaultWidget->bCanEverPaint = true;
+			DefaultWidget->bHasScriptImplementedPaint = true;
 		}
 		else
 		{
-			DefaultWidget->bCanEverPaint = false;
+			DefaultWidget->bHasScriptImplementedPaint = false;
+		}
+
+	}
+
+
+	bool bClassOrParentsHaveLatentActions = false;
+	bool bClassOrParentsHaveAnimations = false;
+	bool bClassRequiresNativeTick = false;
+
+
+	WidgetBP->UpdateTickabilityStats(bClassOrParentsHaveLatentActions, bClassOrParentsHaveAnimations, bClassRequiresNativeTick);
+	WidgetClass->SetClassRequiresNativeTick(bClassRequiresNativeTick);
+
+	// If the widget is not tickable, warn the user that widgets with animations or implemented ticks will most likely not work
+	if (DefaultWidget->GetDesiredTickFrequency() == EWidgetTickFrequency::Never)
+	{
+		if (bClassOrParentsHaveAnimations)
+		{
+			MessageLog.Warning(*LOCTEXT("NonTickableButAnimationsFound", "This widget has animations but the widget is set to never tick.  These animations will not function correctly.").ToString());
+		}
+
+		if (bClassOrParentsHaveLatentActions)
+		{
+			MessageLog.Warning(*LOCTEXT("NonTickableButLatentActionsFound", "This widget has latent actions but the widget is set to never tick.  These latent actions will not function correctly.").ToString());
+		}
+
+		if (bClassRequiresNativeTick)
+		{
+			MessageLog.Warning(*LOCTEXT("NonTickableButNativeTickFound", "This widget may require a native tick but the widget is set to never tick.  Native tick will not be called.").ToString());
+		}
+
+		if (DefaultWidget->bHasScriptImplementedTick)
+		{
+			MessageLog.Warning(*LOCTEXT("NonTickableButTickFound", "This widget has a blueprint implemented Tick event but the widget is set to never tick.  This tick event will never be called.").ToString());
 		}
 	}
+
+
 }
 
 bool FWidgetBlueprintCompiler::CanAllowTemplate(FCompilerResultsLog& MessageLog, UWidgetBlueprintGeneratedClass* InClass)
@@ -357,13 +390,6 @@ bool FWidgetBlueprintCompiler::CanAllowTemplate(FCompilerResultsLog& MessageLog,
 		return false;
 	}
 
-	// This widget never dynamically constructed, it's stored as part of another widget hierarchy exclusively
-	// so there's no reason to maintain a fast construction template separately for it.
-	if (!WidgetBP->WidgetSupportsDynamicCreation())
-	{
-		return false;
-	}
-
 	// If this widget forces the slow construction path, we can't template it.
 	if ( WidgetBP->bForceSlowConstructionPath )
 	{
@@ -468,57 +494,61 @@ void FWidgetBlueprintCompiler::FinishCompilingClass(UClass* Class)
 				BPGClass->NamedSlots.Add(Widget->GetFName());
 			}
 		});
-	}
 
-	// Make sure that we don't have dueling widget hierarchies
-	if (UWidgetBlueprintGeneratedClass* SuperBPGClass = Cast<UWidgetBlueprintGeneratedClass>(BPGClass->GetSuperClass()))
-	{
-		UWidgetBlueprint* SuperBlueprint = Cast<UWidgetBlueprint>(SuperBPGClass->ClassGeneratedBy);
-		if (SuperBlueprint->WidgetTree != nullptr)
+		// Make sure that we don't have dueling widget hierarchies
+		if (UWidgetBlueprintGeneratedClass* SuperBPGClass = Cast<UWidgetBlueprintGeneratedClass>(BPGClass->GetSuperClass()))
 		{
-			if ((SuperBlueprint->WidgetTree->RootWidget != nullptr) && (WidgetBlueprint()->WidgetTree->RootWidget != nullptr))
+			UWidgetBlueprint* SuperBlueprint = Cast<UWidgetBlueprint>(SuperBPGClass->ClassGeneratedBy);
+			if (SuperBlueprint->WidgetTree != nullptr)
 			{
-				// We both have a widget tree, terrible things will ensue
-				// @todo: nickd - we need to switch this back to a warning in engine, but note for games
-				MessageLog.Note(*LOCTEXT("ParentAndChildBothHaveWidgetTrees", "This widget @@ and parent class widget @@ both have a widget hierarchy, which is not supported.  Only one of them should have a widget tree.").ToString(),
-					WidgetBP, SuperBPGClass->ClassGeneratedBy);
+				if ((SuperBlueprint->WidgetTree->RootWidget != nullptr) && (WidgetBlueprint()->WidgetTree->RootWidget != nullptr))
+				{
+					// We both have a widget tree, terrible things will ensue
+					// @todo: nickd - we need to switch this back to a warning in engine, but note for games
+					MessageLog.Note(*LOCTEXT("ParentAndChildBothHaveWidgetTrees", "This widget @@ and parent class widget @@ both have a widget hierarchy, which is not supported.  Only one of them should have a widget tree.").ToString(),
+						WidgetBP, SuperBPGClass->ClassGeneratedBy);
+				}
 			}
 		}
-	}
-	
-	//
-	UClass* ParentClass = WidgetBP->ParentClass;
-	for ( TUObjectPropertyBase<UWidget*>* WidgetProperty : TFieldRange<TUObjectPropertyBase<UWidget*>>( ParentClass ) )
-	{
-		bool bIsOptional;
-		bool bIsBindWidget = FWidgetBlueprintEditorUtils::IsBindWidgetProperty(WidgetProperty, bIsOptional);
 
-		if ( bIsBindWidget && !bIsOptional )
+		// Check that all BindWidget properties are present and of the appropriate type
+		UClass* ParentClass = WidgetBP->ParentClass;
+		for (TUObjectPropertyBase<UWidget*>* WidgetProperty : TFieldRange<TUObjectPropertyBase<UWidget*>>(ParentClass))
 		{
-			const FText RequiredWidgetNotBoundError = LOCTEXT("RequiredWidgetNotBound", "A required widget binding @@ of type @@ was not found.");
-			const FText IncorrectWidgetTypeError = LOCTEXT("IncorrectWidgetTypes", "The widget @@ is of type @@, but the bind widget property is of type @@.");
+			bool bIsOptional = false;
 
-			UWidget* const* Widget = WidgetToMemberVariableMap.FindKey( WidgetProperty );
-			if (!Widget)
+			if (FWidgetBlueprintEditorUtils::IsBindWidgetProperty(WidgetProperty, bIsOptional))
 			{
-				if (Blueprint->bIsNewlyCreated)
+				const FText OptionalBindingAvailableNote = LOCTEXT("OptionalWidgetNotBound", "An optional widget binding @@ of type @@ is available.");
+				const FText RequiredWidgetNotBoundError = LOCTEXT("RequiredWidgetNotBound", "A required widget binding @@ of type @@ was not found.");
+				const FText IncorrectWidgetTypeError = LOCTEXT("IncorrectWidgetTypes", "The widget @@ is of type @@, but the bind widget property is of type @@.");
+
+				UWidget* const* Widget = WidgetToMemberVariableMap.FindKey(WidgetProperty);
+				if (!Widget)
 				{
-					MessageLog.Warning(*RequiredWidgetNotBoundError.ToString(), WidgetProperty, WidgetProperty->PropertyClass);
+					if (bIsOptional)
+					{
+						MessageLog.Note(*OptionalBindingAvailableNote.ToString(), WidgetProperty, WidgetProperty->PropertyClass);
+					}
+					else if (Blueprint->bIsNewlyCreated)
+					{
+						MessageLog.Warning(*RequiredWidgetNotBoundError.ToString(), WidgetProperty, WidgetProperty->PropertyClass);
+					}
+					else
+					{
+						MessageLog.Error(*RequiredWidgetNotBoundError.ToString(), WidgetProperty, WidgetProperty->PropertyClass);
+					}
 				}
-				else
+				else if (!(*Widget)->IsA(WidgetProperty->PropertyClass))
 				{
-					MessageLog.Error(*RequiredWidgetNotBoundError.ToString(), WidgetProperty, WidgetProperty->PropertyClass);
-				}
-			}
-			else if (!(*Widget)->IsA(WidgetProperty->PropertyClass))
-			{
-				if (Blueprint->bIsNewlyCreated)
-				{
-					MessageLog.Warning(*IncorrectWidgetTypeError.ToString(), *Widget, (*Widget)->GetClass(), WidgetProperty->PropertyClass);
-				}
-				else
-				{
-					MessageLog.Error(*IncorrectWidgetTypeError.ToString(), *Widget, (*Widget)->GetClass(), WidgetProperty->PropertyClass);
+					if (Blueprint->bIsNewlyCreated)
+					{
+						MessageLog.Warning(*IncorrectWidgetTypeError.ToString(), *Widget, (*Widget)->GetClass(), WidgetProperty->PropertyClass);
+					}
+					else
+					{
+						MessageLog.Error(*IncorrectWidgetTypeError.ToString(), *Widget, (*Widget)->GetClass(), WidgetProperty->PropertyClass);
+					}
 				}
 			}
 		}
@@ -540,37 +570,37 @@ void FWidgetBlueprintCompiler::PostCompile()
 	WidgetClass->bAllowDynamicCreation = WidgetBP->WidgetSupportsDynamicCreation();
 	WidgetClass->bAllowTemplate = CanAllowTemplate(MessageLog, NewWidgetBlueprintClass);
 
-	if ( WidgetClass->bAllowTemplate )
+	if (!Blueprint->bIsRegeneratingOnLoad && bIsFullCompile)
 	{
-		if ( !Blueprint->bIsRegeneratingOnLoad && bIsFullCompile )
+		WidgetClass->GetDefaultObject<UUserWidget>()->ValidateBlueprint(*WidgetBP->WidgetTree, MessageLog);
+
+		if (MessageLog.NumErrors == 0 && WidgetClass->bAllowTemplate)
 		{
 			UUserWidget* WidgetTemplate = NewObject<UUserWidget>(GetTransientPackage(), WidgetClass);
 			WidgetTemplate->TemplateInit();
 
-			// Determine if we can generate a template for this widget to speed up CreateWidget time.
-			TArray<FText> OutErrors;
-			const bool bCanTemplate = CanTemplateWidget(MessageLog, WidgetTemplate, OutErrors);
+			int32 TotalWidgets = 0;
+			WidgetTemplate->WidgetTree->ForEachWidgetAndDescendants([&TotalWidgets](UWidget* Widget) {
+				TotalWidgets++;
+			});
+			WidgetBP->InclusiveWidgets = TotalWidgets;
 
-			if ( bCanTemplate )
+			// Determine if we can generate a template for this widget to speed up CreateWidget time.
+			TArray<FText> PostCompileErrors;
+			if (CanTemplateWidget(MessageLog, WidgetTemplate, PostCompileErrors))
 			{
 				MessageLog.Note(*LOCTEXT("TemplateSuccess", "Fast Template Successfully Created.").ToString());
 			}
 			else
 			{
 				MessageLog.Error(*LOCTEXT("NoTemplate", "Unable To Create Template For Widget.").ToString());
-
-				for ( FText& Error : OutErrors )
+				for (FText& Error : PostCompileErrors)
 				{
 					MessageLog.Error(*Error.ToString());
 				}
 			}
 		}
 	}
-
-	TArray<IWidgetEditorExtension*> Extensions = IModularFeatures::Get().GetModularFeatureImplementations<IWidgetEditorExtension>(IWidgetEditorExtension::ServiceFeatureName);
-	for (IWidgetEditorExtension* Extension : Extensions)
-	{
-	}
 }
 
 void FWidgetBlueprintCompiler::EnsureProperGeneratedClass(UClass*& TargetUClass)
diff --git a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintEditorUtils.cpp b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintEditorUtils.cpp
index 8f4f230fa2b4..a74aee3a6bc9 100644
--- a/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintEditorUtils.cpp
+++ b/Engine/Source/Editor/UMGEditor/Private/WidgetBlueprintEditorUtils.cpp
@@ -763,7 +763,9 @@ bool FWidgetBlueprintEditorUtils::CanBeReplacedWithTemplate(TSharedRef<FWidgetBl
 			}
 		}
 		UUserWidget* NewUserWidget = CastChecked<UUserWidget>(FWidgetTemplateBlueprintClass(SelectedUserWidget).Create(BP->WidgetTree));
-		return BP->IsWidgetFreeFromCircularReferences(NewUserWidget);
+		const bool bFreeFromCircularRefs = BP->IsWidgetFreeFromCircularReferences(NewUserWidget);
+		NewUserWidget->Rename(nullptr, nullptr);
+		return bFreeFromCircularRefs;
 	}
 
 	UClass* WidgetClass = BlueprintEditor->GetSelectedTemplate().Get();
diff --git a/Engine/Source/Editor/UMGEditor/Public/IWidgetEditorExtension.h b/Engine/Source/Editor/UMGEditor/Public/IWidgetEditorExtension.h
deleted file mode 100644
index 5805044cfad5..000000000000
--- a/Engine/Source/Editor/UMGEditor/Public/IWidgetEditorExtension.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Features/IModularFeature.h"
-#include "Features/IModularFeatures.h"
-
-/**
- * Provides studios a means to better extend and control what happens when widgets are compiled.
- * Generally this is used to run behind designers and vet their creations with scripts that can check
- * additional things during compiling and verify that something is or isn't being done that is expected
- * to be used or not.
- */
-class IWidgetEditorExtension : public IModularFeature
-{
-public:
-	static const FName ServiceFeatureName;
-
-	/**
-	 * Virtual destructor
-	 */
-	virtual ~IWidgetEditorExtension() {}
-
-
-
-
-};
diff --git a/Engine/Source/Editor/UMGEditor/Public/WidgetBlueprint.h b/Engine/Source/Editor/UMGEditor/Public/WidgetBlueprint.h
index 6f110f8c3e0b..ecd1e8e568cb 100644
--- a/Engine/Source/Editor/UMGEditor/Public/WidgetBlueprint.h
+++ b/Engine/Source/Editor/UMGEditor/Public/WidgetBlueprint.h
@@ -20,6 +20,9 @@ class UUserWidget;
 class UWidget;
 class UWidgetAnimation;
 class FKismetCompilerContext;
+enum class EWidgetTickFrequency : uint8;
+enum class EWidgetCompileTimeTickPrediction : uint8;
+
 
 /** */
 USTRUCT()
@@ -181,6 +184,23 @@ enum class EWidgetSupportsDynamicCreation : uint8
 	No,
 };
 
+/**
+ * This represents the tickability of a widget computed at compile time
+ * It is designed as a hint so the runtime can determine if ticking needs to be enabled
+ * A lot of widgets set to WillTick means you might have a performance problem
+ */
+UENUM()
+enum class EWidgetCompileTimeTickPrediction : uint8
+{
+	/** The widget is manually set to never tick or we dont detect any animations, latent actions, and/or script or possible native tick methods */
+	WontTick,
+
+	/** This widget is set to auto tick and we detect animations, latent actions but not script or native tick methods*/
+	OnDemand,
+
+	/** This widget has an implemented script tick or native tick */
+	WillTick,
+};
 
 /**
  * The widget blueprint enables extending UUserWidget the user extensible UWidget.
@@ -190,49 +210,14 @@ class UMGEDITOR_API UWidgetBlueprint : public UBlueprint
 {
 	GENERATED_UCLASS_BODY()
 
-public:
-
-#if WITH_EDITORONLY_DATA
-	/** A tree of the widget templates to be created */
-	UPROPERTY()
-	class UWidgetTree* WidgetTree;
-
-	UPROPERTY()
-	TArray< FDelegateEditorBinding > Bindings;
-
-	UPROPERTY()
-	TArray<FWidgetAnimation_DEPRECATED> AnimationData_DEPRECATED;
-
-	UPROPERTY()
-	TArray<UWidgetAnimation*> Animations;
-
-	/**
-	 * Don't directly modify this property to change the palette category.  The actual value is stored 
-	 * in the CDO of the UUserWidget, but a copy is stored here so that it's available in the serialized 
-	 * Tag data in the asset header for access in the FAssetData.
-	 */
-	UPROPERTY(AssetRegistrySearchable, AssetRegistrySearchable)
-	FString PaletteCategory;
-
-	UPROPERTY(EditAnywhere, AdvancedDisplay, Category=WidgetBlueprintOptions, AssetRegistrySearchable)
-	bool bForceSlowConstructionPath;
-
-private:
-	/**
-	 * Widgets by default all support calling CreateWidget for them, however for mobile games
-	 * you may want to disable this by default, or on a per widget basis as it can save several
-	 * MB on a large game from lots of widget templates being cooked ready to make dynamic
-	 * construction faster.
-	 */
-	UPROPERTY(EditAnywhere, AdvancedDisplay, Category=WidgetBlueprintOptions, AssetRegistrySearchable)
-	EWidgetSupportsDynamicCreation SupportDynamicCreation;
-#endif
-
 public:
 
 	/** UObject interface */
 	virtual void PostLoad() override;
 	virtual void PostDuplicate(bool bDuplicateForPIE) override;
+#if WITH_EDITORONLY_DATA
+	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
+#endif // WITH_EDITORONLY_DATA
 	virtual void Serialize(FArchive& Ar) override;
 
 	UPackage* GetWidgetTemplatePackage() const;
@@ -278,10 +263,82 @@ public:
 	
 	static TSharedPtr<FKismetCompilerContext> GetCompilerForWidgetBP(UBlueprint* BP, FCompilerResultsLog& InMessageLog, const FKismetCompilerOptions& InCompileOptions);
 
+	void UpdateTickabilityStats(bool& OutHasLatentActions, bool& OutHasAnimations, bool& OutClassRequiresNativeTick);
+
 private:
 	void ForEachSourceWidgetImpl(TFunctionRef<void(UWidget*)> Fn) const;
 
 #if WITH_EDITOR
 	virtual void LoadModulesRequiredForCompilation() override;
 #endif 
+
+public:
+
+#if WITH_EDITORONLY_DATA
+	/** A tree of the widget templates to be created */
+	UPROPERTY()
+	class UWidgetTree* WidgetTree;
+
+	UPROPERTY()
+	TArray<FDelegateEditorBinding> Bindings;
+
+	UPROPERTY()
+	TArray<FWidgetAnimation_DEPRECATED> AnimationData_DEPRECATED;
+
+	UPROPERTY()
+	TArray<UWidgetAnimation*> Animations;
+
+	/**
+	* Don't directly modify this property to change the palette category.  The actual value is stored
+	* in the CDO of the UUserWidget, but a copy is stored here so that it's available in the serialized
+	* Tag data in the asset header for access in the FAssetData.
+	*/
+	UPROPERTY(AssetRegistrySearchable)
+	FString PaletteCategory;
+
+	UPROPERTY(EditAnywhere, AdvancedDisplay, Category = WidgetBlueprintOptions, AssetRegistrySearchable)
+	bool bForceSlowConstructionPath;
+
+	/**
+	 * The total number of widgets this widget contains.  This is a good way to find the "largest" widgets.
+	 */
+	UPROPERTY(AssetRegistrySearchable)
+	int32 InclusiveWidgets;
+
+private:
+	/**
+	 * The desired tick frequency set by the user on the UserWidget's CDO.
+	 */
+	UPROPERTY(AssetRegistrySearchable)
+	EWidgetTickFrequency TickFrequency;
+
+	/**
+	 * The computed frequency that the widget will need to be ticked at.  You can find the reasons for
+	 * this decision by looking at TickPredictionReason.
+	 */
+	UPROPERTY(AssetRegistrySearchable)
+	EWidgetCompileTimeTickPrediction TickPrediction;
+
+	/**
+	 * The reasons we may need to tick this widget.
+	 */
+	UPROPERTY(AssetRegistrySearchable)
+	FString TickPredictionReason;
+
+	/**
+	 * Widgets by default all support calling CreateWidget for them, however for mobile games
+	 * you may want to disable this by default, or on a per widget basis as it can save several
+	 * MB on a large game from lots of widget templates being cooked ready to make dynamic
+	 * construction faster.
+	 */
+	UPROPERTY(EditAnywhere, AdvancedDisplay, Category = WidgetBlueprintOptions, AssetRegistrySearchable)
+	EWidgetSupportsDynamicCreation SupportDynamicCreation;
+
+	/**
+	 * The total number of property bindings.  Consider this as a performance warning.
+	 */
+	UPROPERTY(AssetRegistrySearchable)
+	int32 PropertyBindings;
+
+#endif
 };
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/GatherTextFromAssetsCommandlet.h b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/GatherTextFromAssetsCommandlet.h
index f7b017b5cd6e..f0dff47a0a2e 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/GatherTextFromAssetsCommandlet.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/GatherTextFromAssetsCommandlet.h
@@ -31,6 +31,14 @@ public:
 
 	//~ End UCommandlet Interface
 
+	/** Localization cache states of a package */
+	enum class EPackageLocCacheState : uint8
+	{
+		Uncached_TooOld = 0,
+		Uncached_NoCache,
+		Cached, // Cached must come last as it acts as a count for an array
+	};
+
 private:
 	/** Struct containing the data needed by a pending package that we will gather text from */
 	struct FPackagePendingGather
@@ -43,6 +51,12 @@ private:
 
 		/** The complete set of dependencies for the package */
 		TSet<FName> Dependencies;
+
+		/** Localization cache state of this package */
+		EPackageLocCacheState PackageLocCacheState;
+
+		/** Contains the localization cache data for this package (if cached) */
+		TArray<FGatherableTextData> GatherableTextDataArray;
 	};
 
 	static const FString UsageText;
@@ -67,6 +81,9 @@ private:
 	TSet<UObject*> ObjectsToKeepAlive;
 
 	bool bSkipGatherCache;
+	bool bReportStaleGatherCache;
+	bool bFixStaleGatherCache;
+	bool bFixMissingGatherCache;
 	bool ShouldGatherFromEditorOnlyData;
 	bool ShouldExcludeDerivedClasses;
 };
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/MergeShaderPipelineCachesCommandlet.h b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/MergeShaderPipelineCachesCommandlet.h
new file mode 100644
index 000000000000..accc07c00784
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/MergeShaderPipelineCachesCommandlet.h
@@ -0,0 +1,20 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Commandlets/Commandlet.h"
+#include "MergeShaderPipelineCachesCommandlet.generated.h"
+
+UCLASS()
+class UMergeShaderPipelineCachesCommandlet
+	: public UCommandlet
+{
+	GENERATED_UCLASS_BODY()
+
+	//~ Begin UCommandlet Interface
+	virtual int32 Main(const FString& Params) override;
+	//~ End UCommandlet Interface
+};
+
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ResavePackagesCommandlet.h b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ResavePackagesCommandlet.h
index e99aa40b8199..8246d139df14 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ResavePackagesCommandlet.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ResavePackagesCommandlet.h
@@ -71,6 +71,9 @@ protected:
 	/** if we should auto checkout packages that need to be saved**/
 	bool bAutoCheckOut;
 
+	/** if we should simply skip checked out files rather than error-ing out */
+	bool bSkipCheckedOutFiles;
+
 	/** if we should auto checkin packages that were checked out**/
 	bool bAutoCheckIn;
 
@@ -184,7 +187,9 @@ protected:
 	// Get the changelist description to use if automatically checking packages out
 	virtual FText GetChangelistDescription() const;
 
-	bool CheckoutFile(const FString& Filename, bool bAddFile = false);
+	bool CheckoutFile(const FString& Filename, bool bAddFile = false, bool bIgnoreAlreadyCheckedOut = false);
+
+	bool CanCheckoutFile(const FString& Filename, FString& CheckedOutUser);
 
 	// Print out a message only if running in very verbose mode
 	void VerboseMessage(const FString& Message);
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ShaderPipelineCacheToolsCommandlet.h b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ShaderPipelineCacheToolsCommandlet.h
new file mode 100644
index 000000000000..8faaf2505486
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Classes/Commandlets/ShaderPipelineCacheToolsCommandlet.h
@@ -0,0 +1,22 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Commandlets/Commandlet.h"
+#include "ShaderPipelineCacheToolsCommandlet.generated.h"
+
+UCLASS()
+class UShaderPipelineCacheToolsCommandlet
+	: public UCommandlet
+{
+	GENERATED_UCLASS_BODY()
+
+	//~ Begin UCommandlet Interface
+	virtual int32 Main(const FString& Params) override;
+	//~ End UCommandlet Interface
+
+	static int32 StaticMain(const FString& Params);
+};
+
diff --git a/Engine/Source/Editor/UnrealEd/Classes/CookOnTheSide/CookOnTheFlyServer.h b/Engine/Source/Editor/UnrealEd/Classes/CookOnTheSide/CookOnTheFlyServer.h
index ca60c04ab834..82bd94d04911 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/CookOnTheSide/CookOnTheFlyServer.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/CookOnTheSide/CookOnTheFlyServer.h
@@ -90,6 +90,7 @@ enum class ECookTickFlags : uint8
 {
 	None =									0x00000000, /* no flags */
 	MarkupInUsePackages =					0x00000001, /** Markup packages for partial gc */
+	HideProgressDisplay =					0x00000002, /** Hides the progress report */
 };
 ENUM_CLASS_FLAGS(ECookTickFlags);
 
@@ -380,6 +381,11 @@ private:
 			SynchronizationObject.Unlock();
 		}
 
+		int32 Num() 
+		{ 
+			return FilesProcessed.Num();
+		}
+
 		void Add(const FFilePlatformCookedPackage& Request)
 		{
 			FScopeLock ScopeLock(&SynchronizationObject);
@@ -736,45 +742,47 @@ private:
 	};
 
 	/** Simple thread safe proxy for TSet<FName> */
-	class FThreadSafeNameSet
+	template <typename T>
+	class FThreadSafeSet
 	{
-		TSet<FName> Names;
-		FCriticalSection NamesCritical;
+		TSet<T> InnerSet;
+		FCriticalSection SetCritical;
 	public:
-		void Add(FName InName)
+		void Add(T InValue)
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			Names.Add(InName);
+			FScopeLock SetLock(&SetCritical);
+			InnerSet.Add(InValue);
 		}
-		bool AddUnique(FName InName)
+		bool AddUnique(T InValue)
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			if (!Names.Contains(InName))
+			FScopeLock SetLock(&SetCritical);
+			if (!InnerSet.Contains(InValue))
 			{
-				Names.Add(InName);
+				InnerSet.Add(InValue);
 				return true;
 			}
 			return false;
 		}
-		bool Contains(FName InName)
+		bool Contains(T InValue)
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			return Names.Contains(InName);
+			FScopeLock SetLock(&SetCritical);
+			return InnerSet.Contains(InValue);
 		}
-		void Remove(FName InName)
+		void Remove(T InValue)
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			Names.Remove(InName);
+			FScopeLock SetLock(&SetCritical);
+			InnerSet.Remove(InValue);
 		}
 		void Empty()
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			Names.Empty();
+			FScopeLock SetLock(&SetCritical);
+			InnerSet.Empty();
 		}
-		void GetNames(TSet<FName>& OutNames)
+
+		void GetValues(TSet<T>& OutSet)
 		{
-			FScopeLock NamesLock(&NamesCritical);
-			OutNames.Append(Names);
+			FScopeLock SetLock(&SetCritical);
+			OutSet.Append(InnerSet);
 		}
 	};
 private:
@@ -941,8 +949,8 @@ private:
 	FFilenameQueue CookRequests; // list of requested files
 	FThreadSafeUnsolicitedPackagesList UnsolicitedCookedPackages;
 	FThreadSafeFilenameSet CookedPackages; // set of files which have been cooked when needing to recook a file the entry will need to be removed from here
-	FThreadSafeNameSet NeverCookPackageList;
-	FThreadSafeNameSet UncookedEditorOnlyPackages; // set of packages that have been rejected due to being referenced by editor-only properties
+	FThreadSafeSet<FName> NeverCookPackageList;
+	FThreadSafeSet<FName> UncookedEditorOnlyPackages; // set of packages that have been rejected due to being referenced by editor-only properties
 
 
 	FString GetCachedPackageFilename( const FName& PackageName ) const;
@@ -975,6 +983,9 @@ private:
 	/** Map of platform name to asset registry generators, which hold the state of asset registry data for a platform */
 	TMap<FName, FAssetRegistryGenerator*> RegistryGenerators;
 
+	/** Map of platform name to scl.csv files we saved out. */
+	TMap<FName, TArray<FString>> OutSCLCSVPaths;
+
 	/** List of filenames that may be out of date in the asset registry */
 	TSet<FName> ModifiedAssetFilenames;
 
@@ -1323,6 +1334,31 @@ private:
 	*/
 	void AddFileToCook( TArray<FName>& InOutFilesToCook, const FString &InFilename ) const;
 
+    /**
+     * Invokes the necessary FShaderCodeLibrary functions to start cooking the shader code library.
+     */
+    void InitShaderCodeLibrary(void);
+    
+	/**
+	* Invokes the necessary FShaderCodeLibrary functions to open a named code library.
+	*/
+	void OpenShaderCodeLibrary(FString const& Name);
+    
+	/**
+	* Invokes the necessary FShaderCodeLibrary functions to save and close a named code library.
+	*/
+	void SaveShaderCodeLibrary(FString const& Name);
+
+	/**
+	* Calls the ShaderPipelineCacheToolsCommandlet to build a upipelinecache file from the .stablepc.csv file, if any
+	*/
+	void ProcessShaderCodeLibraries(const FString& LibraryName);
+
+    /**
+     * Invokes the necessary FShaderCodeLibrary functions to clean out all the temporary files.
+     */
+    void CleanShaderCodeLibraries();
+
 	/**
 	* Call back from the TickCookOnTheSide when a cook by the book finishes (when started form StartCookByTheBook)
 	*/
@@ -1622,6 +1658,8 @@ private:
 	*/
 	FString GetBaseDirectoryForDLC() const;
 
+	FString GetContentDirecctoryForDLC() const;
+
 	inline bool IsCreatingReleaseVersion()
 	{
 		if ( CookByTheBookOptions )
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Editor/EditorEngine.h b/Engine/Source/Editor/UnrealEd/Classes/Editor/EditorEngine.h
index cb0239b719ca..9799bfbbee12 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Editor/EditorEngine.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Editor/EditorEngine.h
@@ -335,6 +335,19 @@ struct FSelectionStateOfLevel
 	TArray<FString> SelectedComponents;
 };
 
+/** Overrides you can pass when starting PIE to temporarily supress the user's options for dedicated server, number of clients..etc. */
+struct FPlayInEditorOverrides
+{
+	FPlayInEditorOverrides()
+		: bDedicatedServer()
+		, NumberOfClients()
+	{
+	}
+
+	TOptional<bool> bDedicatedServer;
+	TOptional<int32> NumberOfClients;
+};
+
 /**
  * Engine that drives the Editor.
  * Separate from UGameEngine because it may have much different functionality than desired for an instance of a game itself.
@@ -735,9 +748,11 @@ public:
 
 	/** Editor-only event triggered when a HLOD Actor is marked dirty */
 	DECLARE_EVENT_OneParam(UEngine, FHLODActorMarkedDirtyEvent, class ALODActor*);
+	DEPRECATED(4.20, "This function is no longer used.")
 	FHLODActorMarkedDirtyEvent& OnHLODActorMarkedDirty() { return HLODActorMarkedDirtyEvent; }
 
 	/** Called by internal engine systems after a HLOD Actor is marked dirty */
+	DEPRECATED(4.20, "This function is no longer used.")
 	void BroadcastHLODActorMarkedDirty(class ALODActor* InActor) { HLODActorMarkedDirtyEvent.Broadcast(InActor); }
 
 	/** Editor-only event triggered when a HLOD Actor is marked dirty */
@@ -1758,7 +1773,7 @@ public:
 	 * @param	InWorld		World context
 	 * @param	bInSimulateInEditor	True to start an in-editor simulation session, or false to start a play-in-editor session
 	 */
-	virtual void PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor );
+	virtual void PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor, FPlayInEditorOverrides Overrides = FPlayInEditorOverrides());
 
 	virtual UGameInstance* CreatePIEGameInstance(int32 InPIEInstance, bool bInSimulateInEditor, bool bAnyBlueprintErrors, bool bStartInSpectatorMode, bool bPlayNetDedicated, bool bPlayStereoscopic, float PIEStartTime);
 
@@ -2951,6 +2966,23 @@ public:
 
 	void AutomationLoadMap(const FString& MapName, FString* OutError);
 
+	/** This function should be called to notify the editor that new materials were added to our scene or some materials were modified */
+	void OnSceneMaterialsModified();
+
+protected:
+	/** For some platforms (e.g. mobiles), when running in editor mode, we emulate the shaders functionality on available running GPU (e.g. DirectX),
+	 *  but when displaying the shader complexity we need to be able compile and extract statistics (instruction count) from the real shaders that
+	 *  will be compiled when the game will run on the specific platform. Thus (if compiler available) we perform an 'offline' shader compilation step,
+	 *  extract the needed statistics and transfer them to the emulated editor running shaders.
+	 *  This function will be called from OnSceneMaterialsModified() */
+	void UpdateShaderComplexityMaterials();
+
+	/** Utility function that can determine whether some input world is using materials who's shaders are emulated in the editor */
+	bool IsEditorShaderPlatformEmulated(UWorld* World);
+
+	/** Utility function that checks if, for the current shader platform used by the editor, there's an available offline shader compiler */
+	bool IsOfflineShaderCompilerAvailable(UWorld* World);
+
 protected:
 
 	UPROPERTY(EditAnywhere, config, Category = Advanced, meta = (MetaClass = "ActorGroupingUtils"))
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Editor/Transactor.h b/Engine/Source/Editor/UnrealEd/Classes/Editor/Transactor.h
index 2f6563ae2b29..415a2e7aeeeb 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Editor/Transactor.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Editor/Transactor.h
@@ -313,8 +313,9 @@ protected:
 				, SerializedObject(InSerializedObject)
 				, Offset(0)
 			{
-				ArWantBinaryPropertySerialization = bWantBinarySerialization;
-				ArIsLoading = ArIsTransacting = 1;
+				this->SetWantBinaryPropertySerialization(bWantBinarySerialization);
+				this->SetIsLoading(true);
+				this->SetIsTransacting(true);
 			}
 
 			virtual int64 Tell() override {return Offset;}
@@ -390,8 +391,9 @@ protected:
 					ObjectMap.Add(SerializedObject.ReferencedObjects[ObjIndex].Get(), ObjIndex);
 				}
 
-				ArWantBinaryPropertySerialization = bWantBinarySerialization;
-				ArIsSaving = ArIsTransacting = 1;
+				this->SetWantBinaryPropertySerialization(bWantBinarySerialization);
+				this->SetIsSaving(true);
+				this->SetIsTransacting(true);
 			}
 
 			virtual int64 Tell() override {return Offset;}
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Factories/CurveLinearColorAtlasFactory.h b/Engine/Source/Editor/UnrealEd/Classes/Factories/CurveLinearColorAtlasFactory.h
new file mode 100644
index 000000000000..1135ce6c648e
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Classes/Factories/CurveLinearColorAtlasFactory.h
@@ -0,0 +1,41 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+//~=============================================================================
+// UCurveLinearColorAtlasFactory
+//~=============================================================================
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Factories/Factory.h"
+#include "CurveLinearColorAtlasFactory.generated.h"
+
+UCLASS(hidecategories=(Object, Texture))
+class UCurveLinearColorAtlasFactory : public UFactory
+{
+	GENERATED_UCLASS_BODY()
+
+	/** Width of the texture render target */
+	UPROPERTY(meta=(ToolTip="Width of the texture render target"))
+	int32 Width;
+
+	/** Height of the texture render target */
+	UPROPERTY(meta=(ToolTip="Height of the texture render target"))
+	int32 Height;
+
+	/** Pixel format of the texture render target */
+	UPROPERTY(meta=(ToolTip="Pixel format of the texture render target"))
+	uint8 Format;
+
+	virtual FText GetDisplayName() const override;
+
+	uint32 GetMenuCategories() const override;
+
+	//~ Begin UFactory Interface
+	virtual UObject* FactoryCreateNew(UClass* Class,UObject* InParent,FName Name,EObjectFlags Flags,UObject* Context,FFeedbackContext* Warn) override;
+	//~ Begin UFactory Interface	
+};
+
+
+
diff --git a/Engine/Source/Editor/UnrealEd/Classes/MaterialEditor/DEditorScalarParameterValue.h b/Engine/Source/Editor/UnrealEd/Classes/MaterialEditor/DEditorScalarParameterValue.h
index 0dbf0df3f521..768b6fd4c90c 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/MaterialEditor/DEditorScalarParameterValue.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/MaterialEditor/DEditorScalarParameterValue.h
@@ -8,15 +8,35 @@
 
 #include "DEditorScalarParameterValue.generated.h"
 
+USTRUCT()
+struct FScalarParameterAtlasData
+{
+	GENERATED_BODY()
+public:
+	UPROPERTY(Transient)
+	bool bIsUsedAsAtlasPosition;
+
+	UPROPERTY(Transient)
+	TSoftObjectPtr<class UCurveLinearColor> Curve;
+
+	UPROPERTY(Transient)
+	TSoftObjectPtr<class UCurveLinearColorAtlas> Atlas;
+};
+
 UCLASS(hidecategories=Object, collapsecategories, editinlinenew)
 class UNREALED_API UDEditorScalarParameterValue : public UDEditorParameterValue
 {
 	GENERATED_UCLASS_BODY()
 
+public:
 	UPROPERTY(EditAnywhere, Category=DEditorScalarParameterValue)
 	float ParameterValue;
 
 	float SliderMin;
 	float SliderMax;
+
+	UPROPERTY(Transient)
+	FScalarParameterAtlasData AtlasData;
+
 };
 
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialEditorOptions.h b/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialEditorOptions.h
index 666ada92da2c..c9bb5af6e248 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialEditorOptions.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialEditorOptions.h
@@ -46,13 +46,8 @@ class UNREALED_API UMaterialEditorOptions : public UObject
 	UPROPERTY(EditAnywhere, config, Category=Options)
 	uint32 bUseUnsortedMenus:1;
 
-	/** If true, show mobile statis and errors. */
-	UPROPERTY(EditAnywhere, config, Category=Options)
-	uint32 bShowMobileStats:1;
-
 	/** The users favorite material expressions. */
 	UPROPERTY(EditAnywhere, config, Category=Options)
 	TArray<FString> FavoriteExpressions;
-
 };
 
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialStatsOptions.h b/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialStatsOptions.h
new file mode 100644
index 000000000000..d9786edfd0f2
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Classes/Preferences/MaterialStatsOptions.h
@@ -0,0 +1,27 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/**
+*
+* A configuration class used by the FMaterialStats to save settings across sessions.
+*/
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Object.h"
+#include "RHIDefinitions.h"
+#include "SceneTypes.h"
+#include "MaterialStatsOptions.generated.h"
+
+UCLASS(hidecategories = Object, config = EditorPerProjectUserSettings)
+class UNREALED_API UMaterialStatsOptions : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, config, Category=Options)
+	int32 bPlatformUsed[SP_NumPlatforms];
+
+	UPROPERTY(EditAnywhere, config, Category = Options)
+	int32 bMaterialQualityUsed[EMaterialQualityLevel::Num];
+};
\ No newline at end of file
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Settings/ContentBrowserSettings.h b/Engine/Source/Editor/UnrealEd/Classes/Settings/ContentBrowserSettings.h
index 30865fd9a94d..d841921b1216 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Settings/ContentBrowserSettings.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Settings/ContentBrowserSettings.h
@@ -132,6 +132,42 @@ public:
 		return DisplayCppFolders;
 	}
 
+	/** Sets whether text searches should also search in asset class names */
+	void SetIncludeClassNames(bool bInclude)
+	{
+		IncludeClassNames = bInclude;
+	}
+
+	/** Gets whether text searches should also search in asset class names */
+	bool GetIncludeClassNames() const
+	{
+		return IncludeClassNames;
+	}
+
+	/** Sets whether text searches should also search asset paths (instead of asset name only) */
+	void SetIncludeAssetPaths(bool bInclude)
+	{
+		IncludeAssetPaths = bInclude;
+	}
+
+	/** Gets whether text searches should also search asset paths (instead of asset name only) */
+	bool GetIncludeAssetPaths() const
+	{
+		return IncludeAssetPaths;
+	}
+
+	/** Sets whether text searches should also search for collection names */
+	void SetIncludeCollectionNames(bool bInclude)
+	{
+		IncludeCollectionNames = bInclude;
+	}
+
+	/** Gets whether text searches should also search for collection names */
+	bool GetIncludeCollectionNames() const
+	{
+		return IncludeCollectionNames;
+	}
+
 	/**
 	 * Returns an event delegate that is executed when a setting has changed.
 	 *
@@ -181,6 +217,15 @@ private:
 	UPROPERTY(config)
 	bool DisplayCppFolders;
 
+	UPROPERTY(config)
+	bool IncludeClassNames;
+
+	UPROPERTY(config)
+	bool IncludeAssetPaths;
+
+	UPROPERTY(config)
+	bool IncludeCollectionNames;
+
 	// Holds an event delegate that is executed when a setting has changed.
 	static FSettingChangedEvent SettingChangedEvent;
 };
\ No newline at end of file
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Settings/EditorExperimentalSettings.h b/Engine/Source/Editor/UnrealEd/Classes/Settings/EditorExperimentalSettings.h
index ad83cea932d0..851a0715d652 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Settings/EditorExperimentalSettings.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Settings/EditorExperimentalSettings.h
@@ -125,13 +125,6 @@ public:
 	UPROPERTY(EditAnywhere, config, Category = Core)
 	bool bTextAssetFormatSupport;
 
-	/** Enable material layering assets and workflow - Requires project setting 'Support new material layering' to be enabled */
-	UPROPERTY(EditAnywhere, config, Category = Materials, meta = (DisplayName = "Enable material layering assets and workflow"))
-	bool bMaterialLayeringEnabled;
-
-	UPROPERTY(EditAnywhere, config, Category = HLOD, meta = (DisplayName = "Use new HLOD packages naming convention"))
-	bool bUseNewHLODPackageNamingConvention;
-
 	/** When creating new Material Layers and Material Layer Blends, set up example graphs. */
 	UPROPERTY(EditAnywhere, config, Category = Materials)
 	bool bExampleLayersAndBlends;
diff --git a/Engine/Source/Editor/UnrealEd/Classes/Settings/LevelEditorPlaySettings.h b/Engine/Source/Editor/UnrealEd/Classes/Settings/LevelEditorPlaySettings.h
index 29f6fc4d5f92..74e1c1cef83d 100644
--- a/Engine/Source/Editor/UnrealEd/Classes/Settings/LevelEditorPlaySettings.h
+++ b/Engine/Source/Editor/UnrealEd/Classes/Settings/LevelEditorPlaySettings.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "UObject/ObjectMacros.h"
 #include "UObject/Object.h"
+#include "Layout/Margin.h"
 #include "Layout/Visibility.h"
 #include "LevelEditorPlaySettings.generated.h"
 
@@ -148,6 +149,14 @@ public:
 	/** The screen resolution's aspect ratio (as a string). */
 	UPROPERTY(config)
 	FString AspectRatio;
+
+	/** Whether or not this device supports both landscape and portrait modes */
+	UPROPERTY(config)
+	bool bCanSwapAspectRatio;
+	
+	/** The name of the device profile this links to */
+	UPROPERTY(config)
+	FString ProfileName;
 };
 
 /**
@@ -171,6 +180,10 @@ public:
 	UPROPERTY(config, EditAnywhere, Category=PlayInEditor, meta=(ToolTip="Give the game mouse control when PIE starts or require a click in the viewport first"))
 	bool GameGetsMouseControl;
 
+	/** While using the game viewport, it sends mouse movement and clicks as touch events, instead of as mouse events. */
+	UPROPERTY(config, EditAnywhere, Category=PlayInEditor)
+	bool UseMouseForTouch;
+
 	/** Whether to show a label for mouse control gestures in the PIE view. */
 	UPROPERTY(config, EditAnywhere, Category=PlayInEditor)
 	bool ShowMouseControlLabel;
@@ -210,6 +223,23 @@ public:
 	UPROPERTY(config, EditAnywhere, Category = PlayInEditor, meta = (DisplayName="Stream Sub-Levels during Play in Editor", ToolTip="Prefer to stream sub-levels from the disk instead of duplicating editor sub-levels"))
 	uint32 bPreferToStreamLevelsInPIE:1;
 
+public:
+	/** The width of the new view port window in pixels (0 = use the desktop's screen resolution). */
+	UPROPERTY(config, EditAnywhere, Category=GameViewportSettings, meta=(ClampMin=0))
+	int32 NewWindowWidth;
+
+	/** The height of the new view port window in pixels (0 = use the desktop's screen resolution). */
+	UPROPERTY(config, EditAnywhere, Category=GameViewportSettings, meta=(ClampMin=0))
+	int32 NewWindowHeight;
+
+	/** The position of the new view port window on the screen in pixels. */
+	UPROPERTY(config, EditAnywhere, Category = GameViewportSettings)
+	FIntPoint NewWindowPosition;
+
+	/** Whether the new window should be centered on the screen. */
+	UPROPERTY(config, EditAnywhere, Category = GameViewportSettings)
+	uint32 CenterNewWindow:1;
+
 public:
 
 	/** Whether to automatically bind any active level sequences to a PIE world */
@@ -224,48 +254,16 @@ public:
 
 	/** Whether to always have the PIE window on top of the parent windows. */
 	UPROPERTY(config, EditAnywhere, Category = PlayInNewWindow, meta = (ToolTip="Always have the PIE window on top of the parent windows."))
-	bool PIEAlwaysOnTop;
-
-	/** The width of the new view port window in pixels (0 = use the desktop's screen resolution). */
-	UPROPERTY(config, EditAnywhere, Category=PlayInNewWindow, meta=(ClampMin=0))
-	int32 NewWindowWidth;
-
-	/** The height of the new view port window in pixels (0 = use the desktop's screen resolution). */
-	UPROPERTY(config, EditAnywhere, Category=PlayInNewWindow, meta=(ClampMin=0))
-	int32 NewWindowHeight;
-
-	/** The position of the new view port window on the screen in pixels. */
-	UPROPERTY(config, EditAnywhere, Category=PlayInNewWindow)
-	FIntPoint NewWindowPosition;
-
-	/** Whether the new window should be centered on the screen. */
-	UPROPERTY(config, EditAnywhere, Category=PlayInNewWindow)
-	bool CenterNewWindow;
+	uint32 PIEAlwaysOnTop:1;
 
 public:
 
-	/** The width of the standalone game window in pixels (0 = use the desktop's screen resolution). */
-	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame, meta=(ClampMin = 0))
-	int32 StandaloneWindowWidth;
-
-	/** The height of the standalone game window in pixels (0 = use the desktop's screen resolution). */
-	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame, meta=(ClampMin = 0))
-	int32 StandaloneWindowHeight;
-
-	/** The position of the standalone game window on the screen in pixels. */
-	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame)
-	FIntPoint StandaloneWindowPosition;
-
-	/** Whether the standalone game window should be centered on the screen. */
-	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame)
-	bool CenterStandaloneWindow;
-
 	/** Whether sound should be disabled when playing standalone games. */
-	UPROPERTY(config , EditAnywhere, Category=PlayInStandaloneGame, AdvancedDisplay)
+	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame)
 	uint32 DisableStandaloneSound:1;
 
 	/** Extra parameters to be include as part of the command line for the standalone game. */
-	UPROPERTY(config , EditAnywhere, Category=PlayInStandaloneGame, AdvancedDisplay)
+	UPROPERTY(config, EditAnywhere, Category=PlayInStandaloneGame)
 	FString AdditionalLaunchParameters;
 
 public:
@@ -457,9 +455,24 @@ public:
 	UPROPERTY(config)
 	TArray<FPlayScreenResolution> TelevisionScreenResolutions;
 
+	UPROPERTY(config, VisibleAnywhere, Category = GameViewportSettings)
+	FString DeviceToEmulate;
+
+	UPROPERTY(config)
+	FMargin PIESafeZoneOverride;
+
+	UPROPERTY(config)
+	TArray<FVector2D> CustomUnsafeZoneStarts;
+
+	UPROPERTY(config)
+	TArray<FVector2D> CustomUnsafeZoneDimensions;
+
 	// UObject interface
 	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
 	virtual void PostInitProperties() override;
 	// End of UObject interface
-};
 
+	FMargin CalculateCustomUnsafeZones(TArray<FVector2D>& CustomSafeZoneStarts, TArray<FVector2D>& CustomSafeZoneDimensions, FString& DeviceType, FVector2D PreviewSize);
+	FMargin FlipCustomUnsafeZones(TArray<FVector2D>& CustomSafeZoneStarts, TArray<FVector2D>& CustomSafeZoneDimensions, FString& DeviceType, FVector2D PreviewSize);
+	void RescaleForMobilePreview(class UDeviceProfile* DeviceProfile, int32 &PreviewWidth, int32 &PreviewHeight, float &ScaleFactor);
+};
diff --git a/Engine/Source/Editor/UnrealEd/Classes/ThumbnailRendering/CurveLinearColorThumbnailRenderer.h b/Engine/Source/Editor/UnrealEd/Classes/ThumbnailRendering/CurveLinearColorThumbnailRenderer.h
new file mode 100644
index 000000000000..afea11ed58ea
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Classes/ThumbnailRendering/CurveLinearColorThumbnailRenderer.h
@@ -0,0 +1,29 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/**
+ *
+ * This thumbnail renderer displays a given linear color curve
+ */
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "ThumbnailRendering/ThumbnailRenderer.h"
+#include "CurveLinearColorThumbnailRenderer.generated.h"
+
+class FCanvas;
+class FRenderTarget;
+
+UCLASS(config=Editor, MinimalAPI)
+class UCurveLinearColorThumbnailRenderer : public UThumbnailRenderer
+{
+	GENERATED_UCLASS_BODY()
+public:
+
+	// Begin UThumbnailRenderer Object
+	virtual void GetThumbnailSize(UObject* Object, float Zoom, uint32& OutWidth, uint32& OutHeight) const override;
+	virtual void Draw(UObject* Object, int32 X, int32 Y, uint32 Width, uint32 Height, FRenderTarget*, FCanvas* Canvas) override;
+	// End UThumbnailRenderer Object
+};
+
diff --git a/Engine/Source/Editor/UnrealEd/Private/Animation/DebugSkelMeshComponent.cpp b/Engine/Source/Editor/UnrealEd/Private/Animation/DebugSkelMeshComponent.cpp
index 2d91a830e520..c0e6c673da13 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Animation/DebugSkelMeshComponent.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Animation/DebugSkelMeshComponent.cpp
@@ -766,8 +766,11 @@ void UDebugSkelMeshComponent::TickComponent(float DeltaTime, enum ELevelTick Tic
 		SetRelativeRotation(Rotation);
 	}
 
-        // Brute force approach to ensure that when materials are changed the names are cached parameter names are updated 
+    // Brute force approach to ensure that when materials are changed the names are cached parameter names are updated 
 	bCachedMaterialParameterIndicesAreDirty = true;
+	
+	// Force retargeting data to be re-cached to take into account skeleton edits.
+	bRequiredBonesUpToDate = false;
 
 	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/AssetRegistryGenerator.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/AssetRegistryGenerator.cpp
index ffec794289f0..e683230997a2 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/AssetRegistryGenerator.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/AssetRegistryGenerator.cpp
@@ -208,6 +208,15 @@ bool FAssetRegistryGenerator::GenerateStreamingInstallManifest(int64 InExtraFlav
 	FString PakChunkLayerInfoFilename = FString::Printf(TEXT("%s/pakchunklayers.txt"), *TmpPackagingDir);
 	TUniquePtr<FArchive> ChunkLayerFile(IFileManager::Get().CreateFileWriter(*PakChunkLayerInfoFilename));
 
+	TArray<FString> CompressedChunkWildcards;
+	{
+		FConfigFile PlatformIniFile;
+		FConfigCacheIni::LoadLocalIniFile(PlatformIniFile, TEXT("Game"), true, *TargetPlatform->IniPlatformName());
+		FString ConfigString;
+		PlatformIniFile.GetArray(TEXT("/Script/UnrealEd.ProjectPackagingSettings"), TEXT("CompressedChunkWildcard"), CompressedChunkWildcards);
+	}
+
+
 	// generate per-chunk pak list files
 	for (int32 Index = 0; Index < FinalChunkManifests.Num(); ++Index)
 	{
@@ -228,6 +237,16 @@ bool FAssetRegistryGenerator::GenerateStreamingInstallManifest(int64 InExtraFlav
 			{
 				PakChunkFilename = FString::Printf(TEXT("pakchunk%d_s%d.txt"), Index, SubChunkIndex);
 			}
+
+			FString PakChunkOptions;
+			for ( FString CompressedChunkWildcard : CompressedChunkWildcards)
+			{
+				if ( PakChunkFilename.MatchesWildcard(CompressedChunkWildcard) )
+				{
+					PakChunkOptions += " compressed";
+				}
+			}
+
 			++SubChunkIndex;
 			FString PakListFilename = FString::Printf(TEXT("%s/%s"), *TmpPackagingDir, *PakChunkFilename, Index);
 			TUniquePtr<FArchive> PakListFile(IFileManager::Get().CreateFileWriter(*PakListFilename));
@@ -278,7 +297,7 @@ bool FAssetRegistryGenerator::GenerateStreamingInstallManifest(int64 InExtraFlav
 			PakListFile->Close();
 
 			// add this pakfilelist to our master list of pakfilelists
-			FString PakChunkListLine = FString::Printf(TEXT("%s\r\n"), *PakChunkFilename);
+			FString PakChunkListLine = FString::Printf(TEXT("%s%s\r\n"), *PakChunkFilename, *PakChunkOptions);
 			PakChunkListFile->Serialize(TCHAR_TO_ANSI(*PakChunkListLine), PakChunkListLine.Len());
 
 			int32 TargetLayer = 0;
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/ContentCommandlets.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/ContentCommandlets.cpp
index 94432b21bc74..a8ec23cbc79e 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/ContentCommandlets.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/ContentCommandlets.cpp
@@ -67,6 +67,7 @@ DEFINE_LOG_CATEGORY(LogContentCommandlet);
 #include "HierarchicalLODProxyProcessor.h"
 #include "GenericPlatform/GenericPlatformProcess.h"
 #include "HAL/ThreadManager.h"
+#include "ShaderCompiler.h"
 
 /**-----------------------------------------------------------------------------
  *	UResavePackages commandlet.
@@ -663,9 +664,10 @@ void UResavePackagesCommandlet::LoadAndSaveOnePackage(const FString& Filename)
 							FSourceControlStatePtr SourceControlState = SourceControlProvider.GetState( Package, EStateCacheUsage::ForceUpdate );
 							if(SourceControlState.IsValid())
 							{
-								if( SourceControlState->IsCheckedOutOther() )
+								FString OtherCheckedOutUser;
+								if( SourceControlState->IsCheckedOutOther(&OtherCheckedOutUser) )
 								{
-									UE_LOG(LogContentCommandlet, Warning, TEXT("[REPORT] Overwriting package %s (already checked out by someone else), will not submit"), *Filename);
+									UE_LOG(LogContentCommandlet, Warning, TEXT("[REPORT] Overwriting package %s already checked out by someone else (%s), will not submit"), *Filename, *OtherCheckedOutUser);
 								}
 								else if( !SourceControlState->IsCurrent() )
 								{
@@ -690,7 +692,15 @@ void UResavePackagesCommandlet::LoadAndSaveOnePackage(const FString& Filename)
 					// if the file is still read only then we failed and need to emit an error and go to the next package
 					if (IFileManager::Get().IsReadOnly( *Filename ) == true)
 					{
-						UE_LOG(LogContentCommandlet, Error, TEXT("Unable to check out the Package: %s"), *Filename );
+						if (bSkipCheckedOutFiles)
+						{
+							UE_LOG(LogContentCommandlet, Warning, TEXT("Skipping Package: %s (unable to check out)"), *Filename);
+						}
+						else
+						{
+							UE_LOG(LogContentCommandlet, Error, TEXT("Unable to check out the Package: %s"), *Filename);
+						}
+						
 						return;
 					}
 
@@ -823,6 +833,8 @@ int32 UResavePackagesCommandlet::Main( const FString& Params )
 	bOnlySaveDirtyPackages = Switches.Contains(TEXT("OnlySaveDirtyPackages"));
 	/** if we should auto checkout packages that need to be saved**/
 	bAutoCheckOut = Switches.Contains(TEXT("AutoCheckOutPackages")) || Switches.Contains(TEXT("AutoCheckOut"));
+	/** if we should simply skip checked out files rather than error-ing out */
+	bSkipCheckedOutFiles = Switches.Contains(TEXT("SkipCheckedOutPackages"));
 	/** if we should auto checkin packages that were checked out**/
 	bAutoCheckIn = bAutoCheckOut && (Switches.Contains(TEXT("AutoCheckIn")) || Switches.Contains(TEXT("AutoSubmit")));
 	/** determine if we are building lighting for the map packages on the pass. **/
@@ -930,6 +942,12 @@ int32 UResavePackagesCommandlet::Main( const FString& Params )
 	// Avoid crash saving blueprint
 	FFindInBlueprintSearchManager::Get();
 
+	// Tick shader compiler if we are rendering
+	if(IsAllowCommandletRendering() && GShaderCompilingManager)
+	{
+		GShaderCompilingManager->ProcessAsyncResults(true, false);
+	}
+
 	// Iterate over all packages.
 	for( int32 PackageIndex = 0; PackageIndex < PackageNames.Num(); PackageIndex++ )
 	{
@@ -956,6 +974,12 @@ int32 UResavePackagesCommandlet::Main( const FString& Params )
 		// Load and save this package
 		LoadAndSaveOnePackage(Filename);
 
+		// Tick shader compiler if we are rendering
+		if(IsAllowCommandletRendering() && GShaderCompilingManager)
+		{
+			GShaderCompilingManager->ProcessAsyncResults(true, false);
+		}
+
 		// Break out if we've resaved enough packages
 		if( MaxPackagesToResave > -1 && PackagesRequiringResave >= MaxPackagesToResave )
 		{
@@ -1064,6 +1088,10 @@ FText UResavePackagesCommandlet::GetChangelistDescription() const
 	{
 		ChangelistDescription = NSLOCTEXT("ContentCmdlets", "ChangelistDescriptionRedirectors", "Fixing Redirectors");
 	}
+	else if (bShouldBuildHLOD)
+	{
+		ChangelistDescription = NSLOCTEXT("ContentCmdlets", "ChangelistDescriptionHLODs", "Rebuilding HLODs");
+	}
 	else
 	{
 		ChangelistDescription = NSLOCTEXT("ContentCmdlets", "ChangelistDescription", "Resave Deprecated Packages");
@@ -1124,7 +1152,7 @@ void UResavePackagesCommandlet::PerformPreloadOperations( FLinkerLoad* PackageLi
 	}
 }
 
-bool UResavePackagesCommandlet::CheckoutFile(const FString& Filename, bool bAddFile )
+bool UResavePackagesCommandlet::CheckoutFile(const FString& Filename, bool bAddFile, bool bIgnoreAlreadyCheckedOut)
 {
 	if (!bAutoCheckOut)
 	{
@@ -1142,9 +1170,10 @@ bool UResavePackagesCommandlet::CheckoutFile(const FString& Filename, bool bAddF
 	FSourceControlStatePtr SourceControlState = SourceControlProvider.GetState(*Filename, EStateCacheUsage::ForceUpdate);
 	if (SourceControlState.IsValid())
 	{
-		if (SourceControlState->IsCheckedOutOther())
+		FString CurrentlyCheckedOutUser;
+		if (SourceControlState->IsCheckedOutOther(&CurrentlyCheckedOutUser) && !bIgnoreAlreadyCheckedOut)
 		{
-			UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] %s level is already checked out by someone else, can not submit!"), *Filename);
+			UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] %s level is already checked out by someone else (%s), can not submit!"), *Filename, *CurrentlyCheckedOutUser);
 		}
 		else if (!SourceControlState->IsCurrent())
 		{
@@ -1179,13 +1208,31 @@ bool UResavePackagesCommandlet::CheckoutFile(const FString& Filename, bool bAddF
 			}
 			else
 			{
-				UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] %s could not be checked out!"), *Filename);
+				UE_LOG(LogContentCommandlet, Warning, TEXT("[REPORT] %s could not be checked out!"), *Filename);
 			}
 		}
 	}
 	return false;
 }
 
+
+bool UResavePackagesCommandlet::CanCheckoutFile(const FString& Filename, FString& CheckedOutUser)
+{
+	ISourceControlProvider& SourceControlProvider = ISourceControlModule::Get().GetProvider();
+	FSourceControlStatePtr SourceControlState = SourceControlProvider.GetState(*Filename, EStateCacheUsage::ForceUpdate);
+	bool bCanCheckout = true;
+	if (SourceControlState.IsValid())
+	{
+		if (!SourceControlState->IsCheckedOut() && SourceControlState->IsCheckedOutOther(&CheckedOutUser))
+		{
+			bCanCheckout = false;
+		}
+	}
+
+	return bCanCheckout;
+}
+
+
 void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World, bool& bSavePackage)
 {
 	check(World);
@@ -1255,27 +1302,40 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 			}
 		};
 
-		// if we can't check out the main map or it's not up to date then we can't do the lighting rebuild at all!
 		FString WorldPackageName;
+		FString WorldPackageCheckedOutUser;
 		if (FPackageName::DoesPackageExist(World->GetOutermost()->GetName(), NULL, &WorldPackageName))
 		{
-			if (CheckoutFile(WorldPackageName))
+			if(bShouldBuildHLOD)
 			{
+				if (CanCheckoutFile(WorldPackageName, WorldPackageCheckedOutUser) || !bSkipCheckedOutFiles)
+				{
 				SublevelFilenames.Add(WorldPackageName);
-
-				CheckOutLevelFile(World->PersistentLevel);
+			}
+				else 
+				{
+					bShouldProceedWithRebuild = false;
+				}				
 			}
 			else
 			{
-				bShouldProceedWithRebuild = false;
+				// if we can't check out the main map or it's not up to date then we can't do the lighting rebuild at all!
+				if (CheckoutFile(WorldPackageName))
+				{
+					SublevelFilenames.Add(WorldPackageName);
+
+					CheckOutLevelFile(World->PersistentLevel);
+				}
+				else
+				{
+					bShouldProceedWithRebuild = false;
+				}
 			}
 		}
 		else
 		{
 			bShouldProceedWithRebuild = false;
 		}
-		
-
 
 		if (bShouldProceedWithRebuild)
 		{
@@ -1283,21 +1343,41 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 
 			for (ULevelStreaming* NextStreamingLevel : World->GetStreamingLevels())
 			{
-				CheckOutLevelFile(NextStreamingLevel->GetLoadedLevel());
+				// If we are building HLODs, we dont check out ahead of time
+				if(!bShouldBuildHLOD)
+				{
+					CheckOutLevelFile(NextStreamingLevel->GetLoadedLevel());
+				}
 
 				FString StreamingLevelPackageFilename;
 				const FString StreamingLevelWorldAssetPackageName = NextStreamingLevel->GetWorldAssetPackageName();
 				if (FPackageName::DoesPackageExist(StreamingLevelWorldAssetPackageName, NULL, &StreamingLevelPackageFilename))
 				{
-					// check to see if we need to check this package out
-					if (CheckoutFile(StreamingLevelPackageFilename))
+					// If we are building HLODs, we dont check out ahead of time
+					if(bShouldBuildHLOD)
 					{
+						FString CurrentlyCheckedOutUser;
+						if (CanCheckoutFile(StreamingLevelPackageFilename, CurrentlyCheckedOutUser) || !bSkipCheckedOutFiles)
+						{
 						SublevelFilenames.Add(StreamingLevelPackageFilename);
+					}
+						else 
+						{
+							UE_LOG(LogContentCommandlet, Warning, TEXT("[REPORT] Skipping %s as it is checked out by %s"), *StreamingLevelPackageFilename, *CurrentlyCheckedOutUser);
+						}						
 					}
 					else
 					{
-						bShouldProceedWithRebuild = false;
-						break;
+						// check to see if we need to check this package out
+						if (CheckoutFile(StreamingLevelPackageFilename))
+						{
+							SublevelFilenames.Add(StreamingLevelPackageFilename);
+						}
+						else
+						{
+							bShouldProceedWithRebuild = false;
+							break;
+						}
 					}
 				}
 
@@ -1312,6 +1392,18 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 		{
 			World->FlushLevelStreaming(EFlushLevelStreamingType::Full);
 
+			// If we are (minimally) rebuilding HLOD, set the visible streamed-in levels packages to clean (as FlushLevelStreaming will dirty their packages in this commandlet context)
+			if(bShouldBuildHLOD)
+			{
+				for (const ULevel* Level : GWorld->GetLevels())
+				{
+					if (Level->bIsVisible)
+					{
+						Level->GetOutermost()->SetDirtyFlag(false);
+					}
+				}
+			}
+
 			// We need any deferred commands added when loading to be executed before we start building lighting.
 			GEngine->TickDeferredCommands();
 
@@ -1377,6 +1469,12 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 					FPlatformProcess::Sleep(0.1f);
 				}
 
+				// Flush shader compiler manager so we end up writing out any shaders we generated
+				if(GShaderCompilingManager)
+				{
+					GShaderCompilingManager->ProcessAsyncResults(false, false);
+				}
+
 				IHierarchicalLODUtilities* Utilities = Module.GetUtilities();
 				for (const ULevel* Level : GWorld->GetLevels())
 				{
@@ -1388,24 +1486,29 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 						for (int32 HLODIndex = 0; HLODIndex < NumHLODLevels; ++HLODIndex)
 						{
 							UPackage* HLODPackage = Utilities->CreateOrRetrieveLevelHLODPackage(Level, HLODIndex);
-							FString HLODDataFilename;
-							if (FPackageName::TryConvertLongPackageNameToFilename(HLODPackage->GetName(), HLODDataFilename, FPackageName::GetAssetPackageExtension()))
-							{
-								if (IFileManager::Get().FileExists(*HLODDataFilename))
-								{
-									if (CheckoutFile(HLODDataFilename, true))
-									{
-										SublevelFilenames.Add(HLODDataFilename);
-									}
 
-									SavePackageHelper(HLODPackage, HLODDataFilename);
-								}
-								else
+							// skip packages we havent modified
+							if(HLODPackage->IsDirty())
+							{
+								FString HLODDataFilename;
+								if (FPackageName::TryConvertLongPackageNameToFilename(HLODPackage->GetName(), HLODDataFilename, FPackageName::GetAssetPackageExtension()))
 								{
-									SavePackageHelper(HLODPackage, HLODDataFilename);
-									if (CheckoutFile(HLODDataFilename, true))
+									if (IFileManager::Get().FileExists(*HLODDataFilename))
 									{
-										SublevelFilenames.Add(HLODDataFilename);
+										if (CheckoutFile(HLODDataFilename, true))
+										{
+											SublevelFilenames.Add(HLODDataFilename);
+										}
+
+										SavePackageHelper(HLODPackage, HLODDataFilename);
+									}
+									else
+									{
+										SavePackageHelper(HLODPackage, HLODDataFilename);
+										if (CheckoutFile(HLODDataFilename, true))
+										{
+											SublevelFilenames.Add(HLODDataFilename);
+										}
 									}
 								}
 							}
@@ -1420,24 +1523,24 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
  				LightingOptions.QualityLevel = LightingBuildQuality;
 
 				auto BuildFailedDelegate = [&bShouldProceedWithRebuild,&World]() {
-				UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] Failed building lighting for %s"), *World->GetOutermost()->GetName());
+					UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] Failed building lighting for %s"), *World->GetOutermost()->GetName());
 					bShouldProceedWithRebuild = false;
-			};
+				};
 
-			FDelegateHandle BuildFailedDelegateHandle = FEditorDelegates::OnLightingBuildFailed.AddLambda(BuildFailedDelegate);
+				FDelegateHandle BuildFailedDelegateHandle = FEditorDelegates::OnLightingBuildFailed.AddLambda(BuildFailedDelegate);
 
-			GEditor->BuildLighting(LightingOptions);
-			while (GEditor->IsLightingBuildCurrentlyRunning())
-			{
-				GEditor->UpdateBuildLighting();
-			}
+				GEditor->BuildLighting(LightingOptions);
+				while (GEditor->IsLightingBuildCurrentlyRunning())
+				{
+					GEditor->UpdateBuildLighting();
+				}
 
-			if (bShouldBuildReflectionCaptures)
-			{
-				GEditor->BuildReflectionCaptures();
-			}
+				if (bShouldBuildReflectionCaptures)
+				{
+					GEditor->BuildReflectionCaptures();
+				}
 
-			FEditorDelegates::OnLightingBuildFailed.Remove(BuildFailedDelegateHandle);
+				FEditorDelegates::OnLightingBuildFailed.Remove(BuildFailedDelegateHandle);
 			}
 			auto SaveMapBuildData = [this, &SublevelFilenames](ULevel* InLevel)
 			{
@@ -1484,12 +1587,29 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 				{
 					FString StreamingLevelPackageFilename;
 					const FString StreamingLevelWorldAssetPackageName = NextStreamingLevel->GetWorldAssetPackageName();
-					if (FPackageName::DoesPackageExist(StreamingLevelWorldAssetPackageName, NULL, &StreamingLevelPackageFilename))
+					if (FPackageName::DoesPackageExist(StreamingLevelWorldAssetPackageName, NULL, &StreamingLevelPackageFilename) && SublevelFilenames.Contains(StreamingLevelWorldAssetPackageName))
 					{
 						UPackage* SubLevelPackage = NextStreamingLevel->GetLoadedLevel()->GetOutermost();
-						if (!SavePackageHelper(SubLevelPackage, StreamingLevelPackageFilename))
+						bool bSaveSubLevelPackage = true;
+						if(bShouldBuildHLOD)
 						{
-							UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] Failed to save sub level: %s"), *StreamingLevelPackageFilename);
+							// If we are building HLOD, only save packages that were dirtied
+							bSaveSubLevelPackage = SubLevelPackage->IsDirty();
+						}
+
+						if(bSaveSubLevelPackage)
+						{
+							// When building HLODs we dont check out/modify maps unless dirty
+							bool bFileCheckedOut = true;
+							if(bShouldBuildHLOD)
+							{
+								bFileCheckedOut = CheckoutFile(StreamingLevelPackageFilename, true);
+							}
+
+							if (!bFileCheckedOut || !SavePackageHelper(SubLevelPackage, StreamingLevelPackageFilename))
+							{
+								UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] Failed to save sub level: %s"), *StreamingLevelPackageFilename);
+							}
 						}
 
 						SaveMapBuildData(NextStreamingLevel->GetLoadedLevel());
@@ -1499,8 +1619,15 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 		}
 		else
 		{
+			if (bShouldBuildHLOD)
+			{
+				UE_LOG(LogContentCommandlet, Warning, TEXT("[REPORT] Skipping %s as it is checked out by %s"), *World->GetName(), *WorldPackageCheckedOutUser);
+			}
+			else
+			{
 			UE_LOG(LogContentCommandlet, Error, TEXT("[REPORT] Failed to complete steps necessary to start a lightmass or texture streaming build of %s"), *World->GetName());
 		}
+		}
 
 		if ((bShouldProceedWithRebuild == false)||(bSavePackage == false))
 		{
@@ -1522,6 +1649,12 @@ void UResavePackagesCommandlet::PerformAdditionalOperations(class UWorld* World,
 			{
 				FilesToSubmit.AddUnique(SublevelFilename);
 			}
+
+			if(bShouldBuildHLOD)
+			{
+				// Don't save outer package if it isn't dirty
+				bSavePackage = World->GetOutermost()->IsDirty();
+			}
 		}
 
 		
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/CookCommandlet.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/CookCommandlet.cpp
index 580041c4b288..a5aa9a13ae32 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/CookCommandlet.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/CookCommandlet.cpp
@@ -202,13 +202,13 @@ namespace DetailedCookStats
 				double AssetTimeSec = 0.0;
 				if (AssetTimeSecAttr)
 				{
-					Lex::FromString(AssetTimeSec, *AssetTimeSecAttr->Value);
+					LexFromString(AssetTimeSec, *AssetTimeSecAttr->Value);
 				}
 				const FCookStatsManager::StringKeyValue* AssetSizeMBAttr = StatAttributes.FindByPredicate([](const FCookStatsManager::StringKeyValue& Item) { return Item.Key == TEXT("MB"); });
 				double AssetSizeMB = 0.0;
 				if (AssetSizeMBAttr)
 				{
-					Lex::FromString(AssetSizeMB, *AssetSizeMBAttr->Value);
+					LexFromString(AssetSizeMB, *AssetSizeMBAttr->Value);
 				}
 				const FCookStatsManager::StringKeyValue* ThreadNameAttr = StatAttributes.FindByPredicate([](const FCookStatsManager::StringKeyValue& Item) { return Item.Key == TEXT("ThreadName"); });
 				bool bIsGameThreadTime = ThreadNameAttr != nullptr && ThreadNameAttr->Value == TEXT("GameThread");
@@ -221,7 +221,7 @@ namespace DetailedCookStats
 					const FCookStatsManager::StringKeyValue* CountAttr = StatAttributes.FindByPredicate([](const FCookStatsManager::StringKeyValue& Item) { return Item.Key == TEXT("Count"); });
 					if (CountAttr)
 					{
-						Lex::FromString(AssetsBuilt, *CountAttr->Value);
+						LexFromString(AssetsBuilt, *CountAttr->Value);
 					}
 				}
 
@@ -465,7 +465,7 @@ bool UCookCommandlet::CookOnTheFly( FGuid InstanceId, int32 Timeout, bool bForce
 	while (!GIsRequestingExit)
 	{
 		uint32 CookedPkgCount = 0;
-		uint32 TickResults = CookOnTheFlyServer->TickCookOnTheSide(/*TimeSlice =*/10.f, CookedPkgCount);
+		uint32 TickResults = CookOnTheFlyServer->TickCookOnTheSide(/*TimeSlice =*/10.f, CookedPkgCount, ShowProgress ? ECookTickFlags::None : ECookTickFlags::HideProgressDisplay);
 
 		// Flush the asset registry before GC
 		FAssetRegistryModule::TickAssetRegistry(-1.0f);
@@ -543,7 +543,8 @@ int32 UCookCommandlet::Main(const FString& CmdLineParams)
 	bCookSinglePackage = Switches.Contains(TEXT("cooksinglepackage"));
 	bVerboseCookerWarnings = Switches.Contains(TEXT("verbosecookerwarnings"));
 	bPartialGC = Switches.Contains(TEXT("Partialgc"));
-	ShowErrorCount = !Switches.Contains(TEXT("DIFFONLY")); // Suppress warning summary when diffing against existing cook
+	ShowErrorCount = !Switches.Contains(TEXT("DIFFONLY"));
+	ShowProgress = !Switches.Contains(TEXT("DIFFONLY"));
 
 	COOK_STAT(DetailedCookStats::CookProject = FApp::GetProjectName());
 
@@ -910,7 +911,7 @@ bool UCookCommandlet::CookByTheBook( const TArray<ITargetPlatform*>& Platforms,
 				uint32 TickResults = 0;
 				static const float CookOnTheSideTimeSlice = 10.0f;
 
-				TickResults = CookOnTheFlyServer->TickCookOnTheSide( CookOnTheSideTimeSlice, NonMapPackageCountSinceLastGC );
+				TickResults = CookOnTheFlyServer->TickCookOnTheSide( CookOnTheSideTimeSlice, NonMapPackageCountSinceLastGC, ShowProgress ? ECookTickFlags::None : ECookTickFlags::HideProgressDisplay );
 
 				{
 					COOK_STAT(FScopedDurationTimer ShaderProcessAsyncTimer(DetailedCookStats::TickLoopShaderProcessAsyncResultsTimeSec));
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/FixConflictingLocalizationKeys.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/FixConflictingLocalizationKeys.cpp
index b23cf0a3b984..2eac7413f58a 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/FixConflictingLocalizationKeys.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/FixConflictingLocalizationKeys.cpp
@@ -37,7 +37,7 @@ bool UnmanglePropertyName(const FString& InName, FString& OutName, EMangledPrope
 			OutName = InName.Left(IndexStartIndex);
 
 			const FString IndexStr = InName.Mid(IndexStartIndex + 1, InName.Len() - IndexStartIndex - 1);
-			Lex::FromString(OutIndex, *IndexStr);
+			LexFromString(OutIndex, *IndexStr);
 
 			OutType = EMangledPropertyContainerType::Fixed;
 			return true;
@@ -63,7 +63,7 @@ bool UnmanglePropertyName(const FString& InName, FString& OutName, EMangledPrope
 			}
 
 			const FString IndexStr = InName.Mid(IndexStartIndex + 1, IndexLen);
-			Lex::FromString(OutIndex, *IndexStr);
+			LexFromString(OutIndex, *IndexStr);
 
 			OutType = InName[InName.Len() - 2] == TEXT('y') ? EMangledPropertyContainerType::DynamicKey : EMangledPropertyContainerType::Dynamic;
 			return true;
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/GatherTextFromAssetsCommandlet.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/GatherTextFromAssetsCommandlet.cpp
index 6892b0817574..0969f964a06c 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/GatherTextFromAssetsCommandlet.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/GatherTextFromAssetsCommandlet.cpp
@@ -13,6 +13,7 @@
 #include "Modules/ModuleManager.h"
 #include "Serialization/PropertyLocalizationDataGathering.h"
 #include "Misc/PackageName.h"
+#include "Misc/FileHelper.h"
 #include "UObject/PackageFileSummary.h"
 #include "Framework/Commands/Commands.h"
 #include "Commandlets/GatherTextFromSourceCommandlet.h"
@@ -134,13 +135,6 @@ private:
 class FAssetGatherCacheMetrics
 {
 public:
-	enum class EUncachedAssetReason : uint8
-	{
-		TooOld = 0,
-		NoCache,
-		Num,
-	};
-
 	FAssetGatherCacheMetrics()
 		: CachedAssetCount(0)
 		, UncachedAssetCount(0)
@@ -153,11 +147,11 @@ public:
 		++CachedAssetCount;
 	}
 
-	void CountUncachedAsset(const EUncachedAssetReason InReason)
+	void CountUncachedAsset(const UGatherTextFromAssetsCommandlet::EPackageLocCacheState InState)
 	{
-		check(InReason != EUncachedAssetReason::Num);
+		check(InState != UGatherTextFromAssetsCommandlet::EPackageLocCacheState::Cached);
 		++UncachedAssetCount;
-		++UncachedAssetBreakdown[(int32)InReason];
+		++UncachedAssetBreakdown[(int32)InState];
 	}
 
 	void LogMetrics() const
@@ -171,15 +165,15 @@ public:
 			TEXT("Asset gather cache metrics: %d cached, %d uncached (%d too old, %d no cache or contained bytecode)"), 
 			CachedAssetCount, 
 			UncachedAssetCount, 
-			UncachedAssetBreakdown[(int32)EUncachedAssetReason::TooOld], 
-			UncachedAssetBreakdown[(int32)EUncachedAssetReason::NoCache]
+			UncachedAssetBreakdown[(int32)UGatherTextFromAssetsCommandlet::EPackageLocCacheState::Uncached_TooOld], 
+			UncachedAssetBreakdown[(int32)UGatherTextFromAssetsCommandlet::EPackageLocCacheState::Uncached_NoCache]
 			);
 	}
 
 private:
 	int32 CachedAssetCount;
 	int32 UncachedAssetCount;
-	int32 UncachedAssetBreakdown[(int32)EUncachedAssetReason::Num];
+	int32 UncachedAssetBreakdown[(int32)UGatherTextFromAssetsCommandlet::EPackageLocCacheState::Cached];
 };
 
 #define LOC_DEFINE_REGION
@@ -357,6 +351,63 @@ void UGatherTextFromAssetsCommandlet::AddReferencedObjects(UObject* InThis, FRef
 	Collector.AddReferencedObjects(This->ObjectsToKeepAlive);
 }
 
+bool IsGatherableTextDataIdentical(const TArray<FGatherableTextData>& GatherableTextDataArrayOne, const TArray<FGatherableTextData>& GatherableTextDataArrayTwo)
+{
+	struct FSignificantGatherableTextData
+	{
+		FLocKey Identity;
+		FString SourceString;
+	};
+
+	auto ExtractSignificantGatherableTextData = [](const TArray<FGatherableTextData>& InGatherableTextDataArray)
+	{
+		TArray<FSignificantGatherableTextData> SignificantGatherableTextDataArray;
+
+		for (const FGatherableTextData& GatherableTextData : InGatherableTextDataArray)
+		{
+			for (const FTextSourceSiteContext& TextSourceSiteContext : GatherableTextData.SourceSiteContexts)
+			{
+				SignificantGatherableTextDataArray.Add({ FString::Printf(TEXT("%s:%s"), *GatherableTextData.NamespaceName, *TextSourceSiteContext.KeyName), GatherableTextData.SourceData.SourceString });
+			}
+		}
+
+		SignificantGatherableTextDataArray.Sort([](const FSignificantGatherableTextData& SignificantGatherableTextDataOne, const FSignificantGatherableTextData& SignificantGatherableTextDataTwo)
+		{
+			return SignificantGatherableTextDataOne.Identity < SignificantGatherableTextDataTwo.Identity;
+		});
+
+		return SignificantGatherableTextDataArray;
+	};
+
+	TArray<FSignificantGatherableTextData> SignificantGatherableTextDataArrayOne = ExtractSignificantGatherableTextData(GatherableTextDataArrayOne);
+	TArray<FSignificantGatherableTextData> SignificantGatherableTextDataArrayTwo = ExtractSignificantGatherableTextData(GatherableTextDataArrayTwo);
+
+	if (SignificantGatherableTextDataArrayOne.Num() != SignificantGatherableTextDataArrayTwo.Num())
+	{
+		return false;
+	}
+
+	// These arrays are sorted by identity, so everything should match as we iterate through the array
+	// If it doesn't, then these caches aren't identical
+	for (int32 Idx = 0; Idx < SignificantGatherableTextDataArrayOne.Num(); ++Idx)
+	{
+		const FSignificantGatherableTextData& SignificantGatherableTextDataOne = SignificantGatherableTextDataArrayOne[Idx];
+		const FSignificantGatherableTextData& SignificantGatherableTextDataTwo = SignificantGatherableTextDataArrayTwo[Idx];
+
+		if (SignificantGatherableTextDataOne.Identity != SignificantGatherableTextDataTwo.Identity)
+		{
+			return false;
+		}
+
+		if (!SignificantGatherableTextDataOne.SourceString.Equals(SignificantGatherableTextDataTwo.SourceString, ESearchCase::CaseSensitive))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
 int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 {
 	// Parse command line.
@@ -377,6 +428,14 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 		return -1;
 	}
 
+	// Get destination path
+	FString DestinationPath;
+	if (!GetPathFromConfig(*SectionName, TEXT("DestinationPath"), DestinationPath, GatherTextConfigPath))
+	{
+		UE_LOG(LogGatherTextFromAssetsCommandlet, Error, TEXT("No destination path specified."));
+		return -1;
+	}
+
 	// Add any manifest dependencies if they were provided
 	{
 		bool HasFailedToAddManifestDependency = false;
@@ -560,6 +619,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 			FPackagePendingGather& PackagePendingGather = PackagesPendingGather[PackagesPendingGather.AddDefaulted()];
 			PackagePendingGather.PackageName = PackageNameToGather;
 			PackagePendingGather.PackageFilename = MoveTemp(PackageFilename);
+			PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Cached;
 		}
 	}
 
@@ -567,7 +627,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 	TMap<FString, FName> AssignedPackageLocalizationIds;
 
 	// Process all packages that do not need to be loaded. Remove processed packages from the list.
-	PackagesPendingGather.RemoveAll([&](const FPackagePendingGather& PackagePendingGather) -> bool
+	PackagesPendingGather.RemoveAll([&](FPackagePendingGather& PackagePendingGather) -> bool
 	{
 		TUniquePtr<FArchive> FileReader(IFileManager::Get().CreateFileReader(*PackagePendingGather.PackageFilename));
 		if (!FileReader)
@@ -592,7 +652,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 			}
 		}
 
-		FAssetGatherCacheMetrics::EUncachedAssetReason UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::Num;
+		PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Cached;
 
 		// Have we been asked to skip the cache of text that exists in the header of newer packages?
 		if (bSkipGatherCache && PackageFileSummary.GetFileVersionUE4() >= VER_UE4_SERIALIZE_TEXT_IN_PACKAGES)
@@ -600,7 +660,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 			// Fallback on the old package flag check.
 			if (PackageFileSummary.PackageFlags & PKG_RequiresLocalizationGather)
 			{
-				UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::NoCache;
+				PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Uncached_NoCache;
 			}
 		}
 
@@ -609,7 +669,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 		// Packages not resaved since localization gathering flagging was added to packages must be loaded.
 		if (PackageFileSummary.GetFileVersionUE4() < VER_UE4_PACKAGE_REQUIRES_LOCALIZATION_GATHER_FLAGGING)
 		{
-			UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::TooOld;
+			PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Uncached_TooOld;
 		}
 		// Package not resaved since gatherable text data was added to package headers must be loaded, since their package header won't contain pregathered text data.
 		else if (PackageFileSummary.GetFileVersionUE4() < VER_UE4_SERIALIZE_TEXT_IN_PACKAGES || (!EditorVersion || EditorVersion->Version < FEditorObjectVersion::GatheredTextEditorOnlyPackageLocId))
@@ -617,7 +677,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 			// Fallback on the old package flag check.
 			if (PackageFileSummary.PackageFlags & PKG_RequiresLocalizationGather)
 			{
-				UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::TooOld;
+				PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Uncached_TooOld;
 			}
 		}
 		else if (PackageFileSummary.GetFileVersionUE4() < VER_UE4_DIALOGUE_WAVE_NAMESPACE_AND_CONTEXT_CHANGES)
@@ -628,7 +688,7 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 			{
 				if (AssetData.AssetClass == UDialogueWave::StaticClass()->GetFName())
 				{
-					UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::TooOld;
+					PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Uncached_TooOld;
 				}
 			}
 		}
@@ -636,12 +696,12 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 		// If this package doesn't have any cached data, then we have to load it for gather
 		if (PackageFileSummary.GetFileVersionUE4() >= VER_UE4_SERIALIZE_TEXT_IN_PACKAGES && PackageFileSummary.GatherableTextDataOffset == 0 && (PackageFileSummary.PackageFlags & PKG_RequiresLocalizationGather))
 		{
-			UncachedAssetReason = FAssetGatherCacheMetrics::EUncachedAssetReason::NoCache;
+			PackagePendingGather.PackageLocCacheState = EPackageLocCacheState::Uncached_NoCache;
 		}
 
-		if (UncachedAssetReason != FAssetGatherCacheMetrics::EUncachedAssetReason::Num)
+		if (PackagePendingGather.PackageLocCacheState != EPackageLocCacheState::Cached)
 		{
-			AssetGatherCacheMetrics.CountUncachedAsset(UncachedAssetReason);
+			AssetGatherCacheMetrics.CountUncachedAsset(PackagePendingGather.PackageLocCacheState);
 			return false;
 		}
 
@@ -652,15 +712,21 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 
 			FileReader->Seek(PackageFileSummary.GatherableTextDataOffset);
 
-			TArray<FGatherableTextData> GatherableTextDataArray;
-			GatherableTextDataArray.SetNum(PackageFileSummary.GatherableTextDataCount);
-
+			PackagePendingGather.GatherableTextDataArray.SetNum(PackageFileSummary.GatherableTextDataCount);
 			for (int32 GatherableTextDataIndex = 0; GatherableTextDataIndex < PackageFileSummary.GatherableTextDataCount; ++GatherableTextDataIndex)
 			{
-				(*FileReader) << GatherableTextDataArray[GatherableTextDataIndex];
+				(*FileReader) << PackagePendingGather.GatherableTextDataArray[GatherableTextDataIndex];
 			}
 
-			ProcessGatherableTextDataArray(GatherableTextDataArray);
+			ProcessGatherableTextDataArray(PackagePendingGather.GatherableTextDataArray);
+		}
+
+		// If we're reporting or fixing assets with a stale gather cache then we still need to load this 
+		// package in order to do that, but the PackageLocCacheState prevents it being gathered again
+		if (bReportStaleGatherCache || bFixStaleGatherCache)
+		{
+			check(PackagePendingGather.PackageLocCacheState == EPackageLocCacheState::Cached);
+			return false;
 		}
 
 		return true;
@@ -678,6 +744,8 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 
 	CalculateDependenciesForPackagesPendingGather();
 
+	TArray<FName> PackagesWithStaleGatherCache;
+
 	// Process the packages in batches
 	TArray<FGatherableTextData> GatherableTextDataArray;
 	for (int32 BatchIndex = 0; BatchIndex < BatchCount; ++BatchIndex)
@@ -720,7 +788,54 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 				EPropertyLocalizationGathererResultFlags GatherableTextResultFlags = EPropertyLocalizationGathererResultFlags::Empty;
 				FPropertyLocalizationDataGatherer(GatherableTextDataArray, Package, GatherableTextResultFlags);
 
-				ProcessGatherableTextDataArray(GatherableTextDataArray);
+				bool bSavePackage = false;
+
+				// Optionally check to see whether the clean gather we did is in-sync with the gather cache and deal with it accordingly
+				if ((bReportStaleGatherCache || bFixStaleGatherCache) && PackagePendingGather.PackageLocCacheState == EPackageLocCacheState::Cached)
+				{
+					// Look for any structurally significant changes (missing, added, or changed texts) in the cache
+					// Ignore insignificant things (like source changes caused by assets moving or being renamed)
+					if (!IsGatherableTextDataIdentical(GatherableTextDataArray, PackagePendingGather.GatherableTextDataArray))
+					{
+						PackagesWithStaleGatherCache.Add(PackagePendingGather.PackageName);
+						
+						if (bFixStaleGatherCache)
+						{
+							bSavePackage = true;
+						}
+					}
+				}
+
+				// Optionally save the package if it is missing a gather cache
+				if (bFixMissingGatherCache && PackagePendingGather.PackageLocCacheState == EPackageLocCacheState::Uncached_TooOld)
+				{
+					bSavePackage = true;
+				}
+
+				// Re-save the package to attempt to fix it?
+				if (bSavePackage)
+				{
+					UE_LOG(LogGatherTextFromAssetsCommandlet, Display, TEXT("Resaving package: '%s'."), *PackageNameStr);
+
+					bool bSavedPackage = false;
+					{
+						FLoadPackageLogOutputRedirector::FScopedCapture ScopedCapture(&LogOutputRedirector, PackageNameStr);
+						bSavedPackage = FLocalizedAssetSCCUtil::SavePackageWithSCC(SourceControlInfo, Package, PackagePendingGather.PackageFilename);
+					}
+
+					if (!bSavedPackage)
+					{
+						UE_LOG(LogGatherTextFromAssetsCommandlet, Error, TEXT("Failed to resave package: '%s'."), *PackageNameStr);
+					}
+				}
+
+				// This package may have already been cached in cases where we're reporting or fixing assets with a stale gather cache
+				// This check prevents it being gathered a second time
+				if (PackagePendingGather.PackageLocCacheState != EPackageLocCacheState::Cached)
+				{
+					ProcessGatherableTextDataArray(GatherableTextDataArray);
+				}
+
 				GatherableTextDataArray.Reset();
 			}
 
@@ -738,6 +853,29 @@ int32 UGatherTextFromAssetsCommandlet::Main(const FString& Params)
 	}
 	check(PackagesPendingGather.Num() == 0);
 
+	PackagesWithStaleGatherCache.Sort();
+
+	if (bReportStaleGatherCache)
+	{
+		FString StaleGatherCacheReport;
+		for (const FName& PackageWithStaleGatherCache : PackagesWithStaleGatherCache)
+		{
+			StaleGatherCacheReport += PackageWithStaleGatherCache.ToString();
+			StaleGatherCacheReport += TEXT("\n");
+		}
+
+		const FString StaleGatherCacheReportFilename = DestinationPath / TEXT("StaleGatherCacheReport.txt");
+		const bool bStaleGatherCacheReportSaved = FLocalizedAssetSCCUtil::SaveFileWithSCC(SourceControlInfo, StaleGatherCacheReportFilename, [&StaleGatherCacheReport](const FString& InSaveFileName) -> bool
+		{
+			return FFileHelper::SaveStringToFile(StaleGatherCacheReport, *InSaveFileName, FFileHelper::EEncodingOptions::ForceUTF8);
+		});
+
+		if (!bStaleGatherCacheReportSaved)
+		{
+			UE_LOG(LogGatherTextFromAssetsCommandlet, Error, TEXT("Failed to save report: '%s'."), *StaleGatherCacheReportFilename);
+		}
+	}
+
 	return 0;
 }
 
@@ -863,12 +1001,20 @@ bool UGatherTextFromAssetsCommandlet::ConfigureFromScript(const FString& GatherT
 		ShouldGatherFromEditorOnlyData = false;
 	}
 
-	bSkipGatherCache = FParse::Param(FCommandLine::Get(), TEXT("SkipGatherCache"));
-	if (!bSkipGatherCache)
+	auto ReadBoolFlagWithFallback = [this, &SectionName, &GatherTextConfigPath](const TCHAR* FlagName, bool& OutValue)
 	{
-		GetBoolFromConfig(*SectionName, TEXT("SkipGatherCache"), bSkipGatherCache, GatherTextConfigPath);
-	}
-	UE_LOG(LogGatherTextFromAssetsCommandlet, Display, TEXT("SkipGatherCache: %s"), bSkipGatherCache ? TEXT("true") : TEXT("false"));
+		OutValue = FParse::Param(FCommandLine::Get(), FlagName);
+		if (!OutValue)
+		{
+			GetBoolFromConfig(*SectionName, FlagName, OutValue, GatherTextConfigPath);
+		}
+		UE_LOG(LogGatherTextFromAssetsCommandlet, Display, TEXT("%s: %s"), FlagName, OutValue ? TEXT("true") : TEXT("false"));
+	};
+
+	ReadBoolFlagWithFallback(TEXT("SkipGatherCache"), bSkipGatherCache);
+	ReadBoolFlagWithFallback(TEXT("ReportStaleGatherCache"), bReportStaleGatherCache);
+	ReadBoolFlagWithFallback(TEXT("FixStaleGatherCache"), bFixStaleGatherCache);
+	ReadBoolFlagWithFallback(TEXT("FixMissingGatherCache"), bFixMissingGatherCache);
 
 	// Read some settings from the editor config
 	{
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/GenerateTextLocalizationResourceCommandlet.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/GenerateTextLocalizationResourceCommandlet.cpp
index bb37f7ef2b13..cbdeceee0915 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/GenerateTextLocalizationResourceCommandlet.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/GenerateTextLocalizationResourceCommandlet.cpp
@@ -160,7 +160,7 @@ int32 UGenerateTextLocalizationResourceCommandlet::Main(const FString& Params)
 		const bool bLocResFileSaved = FLocalizedAssetSCCUtil::SaveFileWithSCC(SourceControlInfo, TextLocalizationResourcePath, [&LocTextHelper, &CultureName, &bSkipSourceCheck](const FString& InSaveFileName) -> bool
 		{
 			FTextLocalizationResource LocRes;
-			return FTextLocalizationResourceGenerator::GenerateLocRes(LocTextHelper, CultureName, bSkipSourceCheck, InSaveFileName, LocRes) && LocRes.SaveToFile(InSaveFileName);
+			return FTextLocalizationResourceGenerator::GenerateLocRes(LocTextHelper, CultureName, bSkipSourceCheck, FTextLocalizationResourceId(InSaveFileName), LocRes) && LocRes.SaveToFile(InSaveFileName);
 		});
 
 		if (!bLocResFileSaved)
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/MergeShaderPipelineCachesCommandlet.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/MergeShaderPipelineCachesCommandlet.cpp
new file mode 100644
index 000000000000..72bbd8c5f0e4
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/MergeShaderPipelineCachesCommandlet.cpp
@@ -0,0 +1,65 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Commandlets/MergeShaderPipelineCachesCommandlet.h"
+#include "Misc/Paths.h"
+
+#include "PipelineFileCache.h"
+
+DEFINE_LOG_CATEGORY_STATIC(LogMergeShaderPipelineCachesCommandlet, Log, All);
+
+UMergeShaderPipelineCachesCommandlet::UMergeShaderPipelineCachesCommandlet(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+int32 UMergeShaderPipelineCachesCommandlet::Main(const FString& Params)
+{
+	TArray<FString> Tokens;
+	TArray<FString> Switches;
+	TMap<FString, FString> ParamVals;
+	UCommandlet::ParseCommandLine(*Params, Tokens, Switches, ParamVals);
+
+	bool bOK = (Tokens.Num() >= 3);
+	
+	FPipelineFileCache::PSOOrder Order = FPipelineFileCache::PSOOrder::Default;
+	if (const FString* OrderVal = ParamVals.Find(FString(TEXT("Sort"))))
+	{
+		if(*OrderVal == TEXT("Default"))
+		{
+			Order = FPipelineFileCache::PSOOrder::Default;
+		}
+		else if(*OrderVal == TEXT("FirstUsed"))
+		{
+			Order = FPipelineFileCache::PSOOrder::FirstToLatestUsed;
+		}
+		else if(*OrderVal == TEXT("MostUsed"))
+		{
+			Order = FPipelineFileCache::PSOOrder::MostToLeastUsed;
+		}
+		else
+		{
+			bOK = false;
+		}
+	}
+	else
+	{
+		bOK = false;
+	}
+	
+	FString A, B, Output;
+	if (bOK)
+	{
+		A = Tokens[0];
+		B = Tokens[1];
+		Output = Tokens[2];
+	}
+	
+	if (bOK == false)
+	{
+		UE_LOG(LogMergeShaderPipelineCachesCommandlet, Warning, TEXT("Usage: FilePathA FilePathB -Sort=<Order> OutputPath.\n\tOrder Values:Default/FirstUsed/MostUsed.\n\tCache files must be have the same game version, shader platform and format version."));
+        UE_LOG(LogMergeShaderPipelineCachesCommandlet, Warning, TEXT("Provided arguments: %s\n\tA: %s\n\tB: %s\n\tOutput: %s."), *Params, *A, *B, *Output);
+		return 0;
+	}
+	
+	return !FPipelineFileCache::MergePipelineFileCaches(A, B, Order, Output);
+}
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/PackageUtilities.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/PackageUtilities.cpp
index 983ef5cacf11..afcf1aa10f76 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/PackageUtilities.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/PackageUtilities.cpp
@@ -52,6 +52,9 @@
 
 #include "EngineUtils.h"
 #include "Materials/Material.h"
+#include "Serialization/ArchiveStackTrace.h"
+#include "Misc/OutputDeviceHelper.h"
+#include "Misc/OutputDeviceFile.h"
 
 DEFINE_LOG_CATEGORY(LogPackageHelperFunctions);
 DEFINE_LOG_CATEGORY_STATIC(LogPackageUtilities, Log, All);
@@ -906,7 +909,7 @@ FLinkerLoad* CreateLinkerForFilename(const FString& InFilename)
  *
  * @param	InLinker	if specified, changes this reporter's Linker before generating the report.
  */
-void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL*/ )
+void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker /*=nullptr*/, FOutputDevice& Out /*=*GWarn*/)
 {
 	check(InLinker);
 
@@ -917,56 +920,55 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 	if ( PackageCount++ > 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT(""));
+		Out.Logf(ELogVerbosity::Display, TEXT(""));
+	}
+
+	if (InLinker->IsTextFormat())
+	{
+		Out.Logf(ELogVerbosity::Warning, TEXT("\tPackageReports are not currently supported for text based assets"));
+		return;
 	}
 
 	// Display information about the package.
 	FName LinkerName = Linker->LinkerRoot->GetFName();
-
 	// Display summary info.
-	UE_LOG(LogPackageUtilities, Display, TEXT("********************************************") );
-	UE_LOG(LogPackageUtilities, Display, TEXT("Package '%s' Summary"), *LinkerName.ToString() );
-	UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
+	Out.Logf(ELogVerbosity::Display, TEXT("********************************************") );
+	Out.Logf(ELogVerbosity::Display, TEXT("Package '%s' Summary"), *LinkerName.ToString() );
+	Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
 
-	if (InLinker->IsTextFormat())
-	{
-		UE_LOG(LogPackageUtilities, Warning, TEXT("\tPackageReports are not currently supported for text based assets"));
-		return;
-	}
-
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t         Filename: %s"), *Linker->Filename);
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t     File Version: %i"), Linker->UE4Ver() );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t   Engine Version: %s"), *Linker->Summary.SavedByEngineVersion.ToString());
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t   Compat Version: %s"), *Linker->Summary.CompatibleWithEngineVersion.ToString());
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t     PackageFlags: %X"), Linker->Summary.PackageFlags );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t        NameCount: %d"), Linker->Summary.NameCount );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t       NameOffset: %d"), Linker->Summary.NameOffset );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t      ImportCount: %d"), Linker->Summary.ImportCount );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t     ImportOffset: %d"), Linker->Summary.ImportOffset );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t      ExportCount: %d"), Linker->Summary.ExportCount );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t     ExportOffset: %d"), Linker->Summary.ExportOffset );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\tCompression Flags: %X"), Linker->Summary.CompressionFlags);
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t  Custom Versions:\n%s"), *Linker->Summary.GetCustomVersionContainer().ToString("\t\t"));
+	Out.Logf(ELogVerbosity::Display, TEXT("\t         Filename: %s"), *Linker->Filename);
+	Out.Logf(ELogVerbosity::Display, TEXT("\t     File Version: %i"), Linker->UE4Ver() );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t   Engine Version: %s"), *Linker->Summary.SavedByEngineVersion.ToString());
+	Out.Logf(ELogVerbosity::Display, TEXT("\t   Compat Version: %s"), *Linker->Summary.CompatibleWithEngineVersion.ToString());
+	Out.Logf(ELogVerbosity::Display, TEXT("\t     PackageFlags: %X"), Linker->Summary.PackageFlags );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t        NameCount: %d"), Linker->Summary.NameCount );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t       NameOffset: %d"), Linker->Summary.NameOffset );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t      ImportCount: %d"), Linker->Summary.ImportCount );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t     ImportOffset: %d"), Linker->Summary.ImportOffset );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t      ExportCount: %d"), Linker->Summary.ExportCount );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t     ExportOffset: %d"), Linker->Summary.ExportOffset );
+	Out.Logf(ELogVerbosity::Display, TEXT("\tCompression Flags: %X"), Linker->Summary.CompressionFlags);
+	Out.Logf(ELogVerbosity::Display, TEXT("\t  Custom Versions:\n%s"), *Linker->Summary.GetCustomVersionContainer().ToString("\t\t"));
 	
 
 	FString szGUID = Linker->Summary.Guid.ToString();
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t             Guid: %s"), *szGUID );
-	UE_LOG(LogPackageUtilities, Display, TEXT("\t      Generations:"));
+	Out.Logf(ELogVerbosity::Display, TEXT("\t             Guid: %s"), *szGUID );
+	Out.Logf(ELogVerbosity::Display, TEXT("\t      Generations:"));
 	for( int32 i = 0; i < Linker->Summary.Generations.Num(); ++i )
 	{
 		const FGenerationInfo& generationInfo = Linker->Summary.Generations[ i ];
-		UE_LOG(LogPackageUtilities, Display,TEXT("\t\t\t%d) ExportCount=%d, NameCount=%d "), i, generationInfo.ExportCount, generationInfo.NameCount );
+		Out.Logf(ELogVerbosity::Display,TEXT("\t\t\t%d) ExportCount=%d, NameCount=%d "), i, generationInfo.ExportCount, generationInfo.NameCount );
 	}
 
 	if( (InfoFlags&PKGINFO_Names) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-		UE_LOG(LogPackageUtilities, Display, TEXT("Name Map"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("========"));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+		Out.Logf(ELogVerbosity::Display, TEXT("Name Map"));
+		Out.Logf(ELogVerbosity::Display, TEXT("========"));
 		for( int32 i = 0; i < Linker->NameMap.Num(); ++i )
 		{
 			FName& name = Linker->NameMap[ i ];
-			UE_LOG(LogPackageUtilities, Display, TEXT("\t%d: Name '%s' Comparison Index %d Display Index %d [Internal: %s, %d]"), i, *name.ToString(), name.GetComparisonIndex(), name.GetDisplayIndex(), *name.GetPlainNameString(), name.GetNumber() );
+			Out.Logf(ELogVerbosity::Display, TEXT("\t%d: Name '%s' Comparison Index %d Display Index %d [Internal: %s, %d]"), i, *name.ToString(), name.GetComparisonIndex(), name.GetDisplayIndex(), *name.GetPlainNameString(), name.GetNumber() );
 		}
 	}
 
@@ -975,9 +977,9 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 	{
 		if( (InfoFlags&PKGINFO_Imports) != 0 )
 		{
-			UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-			UE_LOG(LogPackageUtilities, Display, TEXT("Import Map"));
-			UE_LOG(LogPackageUtilities, Display, TEXT("=========="));
+			Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+			Out.Logf(ELogVerbosity::Display, TEXT("Import Map"));
+			Out.Logf(ELogVerbosity::Display, TEXT("=========="));
 		}
 
 		TArray<FName> DependentPackages;
@@ -1011,19 +1013,19 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 			if ( (InfoFlags&PKGINFO_Imports) != 0 )
 			{
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t*************************"));
-				UE_LOG(LogPackageUtilities, Display, TEXT("\tImport %d: '%s'"), i, *import.ObjectName.ToString() );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t       Outer: '%s' (%d)"), *OuterName.ToString(), import.OuterIndex.ForDebugging());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t     Package: '%s'"), *PackageName.ToString());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t       Class: '%s'"), *import.ClassName.ToString() );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\tClassPackage: '%s'"), *import.ClassPackage.ToString() );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t     XObject: %s"), import.XObject ? TEXT("VALID") : TEXT("NULL"));
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t SourceIndex: %d"), import.SourceIndex );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t*************************"));
+				Out.Logf(ELogVerbosity::Display, TEXT("\tImport %d: '%s'"), i, *import.ObjectName.ToString() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t       Outer: '%s' (%d)"), *OuterName.ToString(), import.OuterIndex.ForDebugging());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t     Package: '%s'"), *PackageName.ToString());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t       Class: '%s'"), *import.ClassName.ToString() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\tClassPackage: '%s'"), *import.ClassPackage.ToString() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t     XObject: %s"), import.XObject ? TEXT("VALID") : TEXT("NULL"));
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t SourceIndex: %d"), import.SourceIndex );
 
 				// dump depends info
 				if (InfoFlags & PKGINFO_Depends)
 				{
-					UE_LOG(LogPackageUtilities, Display, TEXT("\t\t  All Depends:"));
+					Out.Logf(ELogVerbosity::Display, TEXT("\t\t  All Depends:"));
 
 					TSet<FDependencyRef> AllDepends;
 					Linker->GatherImportDependencies(i, AllDepends);
@@ -1033,11 +1035,11 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 						const FDependencyRef& Ref = *It;
 						if (Ref.Linker)
 						{
-							UE_LOG(LogPackageUtilities, Display, TEXT("\t\t\t%i) %s"), DependsIndex++, *Ref.Linker->GetExportFullName(Ref.ExportIndex));
+							Out.Logf(ELogVerbosity::Display, TEXT("\t\t\t%i) %s"), DependsIndex++, *Ref.Linker->GetExportFullName(Ref.ExportIndex));
 						}
 						else
 						{
-							UE_LOG(LogPackageUtilities, Display, TEXT("\t\t\t%i) NULL"), DependsIndex++);
+							Out.Logf(ELogVerbosity::Display, TEXT("\t\t\t%i) NULL"), DependsIndex++);
 						}
 					}
 				}
@@ -1061,20 +1063,20 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 		if ( DependentPackages.Num() )
 		{
-			UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-			UE_LOG(LogPackageUtilities, Display, TEXT("\tPackages referenced by %s:"), *LinkerName.ToString());
+			Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+			Out.Logf(ELogVerbosity::Display, TEXT("\tPackages referenced by %s:"), *LinkerName.ToString());
 			for ( int32 i = 0; i < DependentPackages.Num(); i++ )
 			{
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t%i) %s"), i, *DependentPackages[i].ToString());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t%i) %s"), i, *DependentPackages[i].ToString());
 			}
 		}
 	}
 
 	if( (InfoFlags&PKGINFO_Exports) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-		UE_LOG(LogPackageUtilities, Display, TEXT("Export Map"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("=========="));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+		Out.Logf(ELogVerbosity::Display, TEXT("Export Map"));
+		Out.Logf(ELogVerbosity::Display, TEXT("=========="));
 
 		TArray<FExportInfo> SortedExportMap;
 		SortedExportMap.Empty(Linker->ExportMap.Num());
@@ -1124,10 +1126,10 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 		{
 			for( const auto& ExportInfo : SortedExportMap )
 			{
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t*************************"));
+				Out.Logf(ELogVerbosity::Display, TEXT("\t*************************"));
 				const FObjectExport& Export = ExportInfo.Export;
 
-				UE_LOG(LogPackageUtilities, Display, TEXT("\tExport %d: '%s'"), ExportInfo.ExportIndex, *Export.ObjectName.ToString() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\tExport %d: '%s'"), ExportInfo.ExportIndex, *Export.ObjectName.ToString() );
 
 				// find the name of this object's class
 				FPackageIndex ClassIndex = Export.ClassIndex;
@@ -1178,24 +1180,24 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 					}
 				}
 
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t         Class: '%s' (%i)"), *ClassName.ToString(), ClassIndex.ForDebugging() );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t        Parent: '%s' (%d)"), *ParentName, Export.SuperIndex.ForDebugging());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t      Template: '%s' (%d)"), *TemplateName, Export.TemplateIndex.ForDebugging());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t         Outer: '%s' (%d)"), *OuterName, Export.OuterIndex.ForDebugging() );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t      Pkg Guid: %s"), *Export.PackageGuid.ToString());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t   ObjectFlags: 0x%08X"), (uint32)Export.ObjectFlags );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t          Size: %d"), Export.SerialSize );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t         Class: '%s' (%i)"), *ClassName.ToString(), ClassIndex.ForDebugging() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t        Parent: '%s' (%d)"), *ParentName, Export.SuperIndex.ForDebugging());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t      Template: '%s' (%d)"), *TemplateName, Export.TemplateIndex.ForDebugging());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t         Outer: '%s' (%d)"), *OuterName, Export.OuterIndex.ForDebugging() );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t      Pkg Guid: %s"), *Export.PackageGuid.ToString());
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t   ObjectFlags: 0x%08X"), (uint32)Export.ObjectFlags );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t          Size: %d"), Export.SerialSize );
 				if ( !bHideOffsets )
 				{
-					UE_LOG(LogPackageUtilities, Display, TEXT("\t\t      Offset: %d"), Export.SerialOffset );
+					Out.Logf(ELogVerbosity::Display, TEXT("\t\t      Offset: %d"), Export.SerialOffset );
 				}
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t       Object: %s"), Export.Object ? TEXT("VALID") : TEXT("NULL"));
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t       Object: %s"), Export.Object ? TEXT("VALID") : TEXT("NULL"));
 				if ( !bHideOffsets )
 				{
-					UE_LOG(LogPackageUtilities, Display, TEXT("\t\t    HashNext: %d"), Export.HashNext );
+					Out.Logf(ELogVerbosity::Display, TEXT("\t\t    HashNext: %d"), Export.HashNext );
 				}
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t   bNotForClient: %d"), Export.bNotForClient );
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t   bNotForServer: %d"), Export.bNotForServer );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t   bNotForClient: %d"), Export.bNotForClient );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t   bNotForServer: %d"), Export.bNotForServer );
 
 				// dump depends info
 				if (InfoFlags & PKGINFO_Depends)
@@ -1203,11 +1205,11 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 					if (ExportInfo.ExportIndex < Linker->DependsMap.Num())
 					{
 						TArray<FPackageIndex>& Depends = Linker->DependsMap[ExportInfo.ExportIndex];
-						UE_LOG(LogPackageUtilities, Display, TEXT("\t\t  DependsMap:"));
+						Out.Logf(ELogVerbosity::Display, TEXT("\t\t  DependsMap:"));
 
 						for (int32 DependsIndex = 0; DependsIndex < Depends.Num(); DependsIndex++)
 						{
-							UE_LOG(LogPackageUtilities, Display,TEXT("\t\t\t%i) %s (%i)"),
+							Out.Logf(ELogVerbosity::Display,TEXT("\t\t\t%i) %s (%i)"),
 								DependsIndex, 
 								*Linker->GetFullImpExpName(Depends[DependsIndex]),
 								Depends[DependsIndex].ForDebugging()
@@ -1216,21 +1218,21 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 						TSet<FDependencyRef> AllDepends;
 						Linker->GatherExportDependencies(ExportInfo.ExportIndex, AllDepends);
-						UE_LOG(LogPackageUtilities, Display, TEXT("\t\t  All Depends:"));
+						Out.Logf(ELogVerbosity::Display, TEXT("\t\t  All Depends:"));
 						int32 DependsIndex = 0;
 						for(TSet<FDependencyRef>::TConstIterator It(AllDepends);It;++It)
 						{
 							const FDependencyRef& Ref = *It;
 							if (Ref.Linker)
 							{
-								UE_LOG(LogPackageUtilities, Display,TEXT("\t\t\t%i) %s (%i)"),
+								Out.Logf(ELogVerbosity::Display,TEXT("\t\t\t%i) %s (%i)"),
 									DependsIndex++,
 									*Ref.Linker->GetExportFullName(Ref.ExportIndex),
 									Ref.ExportIndex);
 							}
 							else
 							{
-								UE_LOG(LogPackageUtilities, Display,TEXT("\t\t\t%i) NULL (%i)"),
+								Out.Logf(ELogVerbosity::Display,TEXT("\t\t\t%i) NULL (%i)"),
 									DependsIndex++,
 									Ref.ExportIndex);
 							}
@@ -1244,7 +1246,7 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 			for( const auto& ExportInfo : SortedExportMap )
 			{
 				const FObjectExport& Export = ExportInfo.Export;
-				UE_LOG(LogPackageUtilities, Display, TEXT("  %8i %10i %32s %s"), ExportInfo.ExportIndex, Export.SerialSize, 
+				Out.Logf(ELogVerbosity::Display, TEXT("  %8i %10i %32s %s"), ExportInfo.ExportIndex, Export.SerialSize, 
 					*(Linker->GetExportClassName(ExportInfo.ExportIndex).ToString()), 
 					(InfoFlags&PKGINFO_Paths) != 0 ? *Linker->GetExportPathName(ExportInfo.ExportIndex) : *Export.ObjectName.ToString());
 			}
@@ -1253,24 +1255,24 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 	if( (InfoFlags&PKGINFO_Text) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-		UE_LOG(LogPackageUtilities, Display, TEXT("Gatherable Text Data Map"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("=========="));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+		Out.Logf(ELogVerbosity::Display, TEXT("Gatherable Text Data Map"));
+		Out.Logf(ELogVerbosity::Display, TEXT("=========="));
 
 		if (Linker->SerializeGatherableTextDataMap(true))
 		{
-			UE_LOG(LogPackageUtilities, Display, TEXT("Number of Text Data Entries: %d"), Linker->GatherableTextDataMap.Num());
+			Out.Logf(ELogVerbosity::Display, TEXT("Number of Text Data Entries: %d"), Linker->GatherableTextDataMap.Num());
 
 			for (int32 i = 0; i < Linker->GatherableTextDataMap.Num(); ++i)
 			{
 				const FGatherableTextData& GatherableTextData = Linker->GatherableTextDataMap[i];
-				UE_LOG(LogPackageUtilities, Display, TEXT("Entry %d:"), 1 + i);
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t   String: %s"), *GatherableTextData.SourceData.SourceString.ReplaceCharWithEscapedChar());
-				UE_LOG(LogPackageUtilities, Display, TEXT("\tNamespace: %s"), *GatherableTextData.NamespaceName);
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t   Key(s): %d"), GatherableTextData.SourceSiteContexts.Num());
+				Out.Logf(ELogVerbosity::Display, TEXT("Entry %d:"), 1 + i);
+				Out.Logf(ELogVerbosity::Display, TEXT("\t   String: %s"), *GatherableTextData.SourceData.SourceString.ReplaceCharWithEscapedChar());
+				Out.Logf(ELogVerbosity::Display, TEXT("\tNamespace: %s"), *GatherableTextData.NamespaceName);
+				Out.Logf(ELogVerbosity::Display, TEXT("\t   Key(s): %d"), GatherableTextData.SourceSiteContexts.Num());
 				for (const FTextSourceSiteContext& TextSourceSiteContext : GatherableTextData.SourceSiteContexts)
 				{
-					UE_LOG(LogPackageUtilities, Display, TEXT("\t\t%s from %s"), *TextSourceSiteContext.KeyName, *TextSourceSiteContext.SiteDescription);
+					Out.Logf(ELogVerbosity::Display, TEXT("\t\t%s from %s"), *TextSourceSiteContext.KeyName, *TextSourceSiteContext.SiteDescription);
 				}
 			}
 		}
@@ -1286,9 +1288,9 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 	if( (InfoFlags&PKGINFO_Thumbs) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-		UE_LOG(LogPackageUtilities, Display, TEXT("Thumbnail Data"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("=========="));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+		Out.Logf(ELogVerbosity::Display, TEXT("Thumbnail Data"));
+		Out.Logf(ELogVerbosity::Display, TEXT("=========="));
 
 		if ( Linker->SerializeThumbnails(true) )
 		{
@@ -1309,7 +1311,7 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 					FName& ObjectFullName = It.Key();
 					FObjectThumbnail& Thumb = It.Value();
 
-					UE_LOG(LogPackageUtilities, Display,TEXT("\t\t%i) %*s: %ix%i\t\tImage Data:%i bytes"), ThumbIdx++, MaxObjectNameSize, *ObjectFullName.ToString(), Thumb.GetImageWidth(), Thumb.GetImageHeight(), Thumb.GetCompressedDataSize());
+					Out.Logf(ELogVerbosity::Display,TEXT("\t\t%i) %*s: %ix%i\t\tImage Data:%i bytes"), ThumbIdx++, MaxObjectNameSize, *ObjectFullName.ToString(), Thumb.GetImageWidth(), Thumb.GetImageHeight(), Thumb.GetCompressedDataSize());
 				}
 			}
 			else
@@ -1328,23 +1330,23 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 
 	if( (InfoFlags&PKGINFO_Lazy) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------") );
-		UE_LOG(LogPackageUtilities, Display, TEXT("Lazy Pointer Data"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("==============="));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------") );
+		Out.Logf(ELogVerbosity::Display, TEXT("Lazy Pointer Data"));
+		Out.Logf(ELogVerbosity::Display, TEXT("==============="));
 	}
 
 	if( (InfoFlags&PKGINFO_AssetRegistry) != 0 )
 	{
-		UE_LOG(LogPackageUtilities, Display, TEXT("--------------------------------------------"));
+		Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------"));
 
 		{
 			const int32 NextOffset = Linker->Summary.WorldTileInfoDataOffset ? Linker->Summary.WorldTileInfoDataOffset : Linker->Summary.TotalHeaderSize;
 			const int32 AssetRegistrySize = NextOffset - Linker->Summary.AssetRegistryDataOffset;
-			UE_LOG(LogPackageUtilities, Display, TEXT("Asset Registry Size: %10i"), AssetRegistrySize);
+			Out.Logf(ELogVerbosity::Display, TEXT("Asset Registry Size: %10i"), AssetRegistrySize);
 		}
 
-		UE_LOG(LogPackageUtilities, Display, TEXT("Asset Registry Data"));
-		UE_LOG(LogPackageUtilities, Display, TEXT("=========="));
+		Out.Logf(ELogVerbosity::Display, TEXT("Asset Registry Data"));
+		Out.Logf(ELogVerbosity::Display, TEXT("=========="));
 
 		if( Linker->Summary.AssetRegistryDataOffset > 0 )
 		{
@@ -1355,7 +1357,7 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 			int32 AssetCount = 0;
 			*Linker << AssetCount;
 
-			UE_LOG(LogPackageUtilities, Display, TEXT("Number of assets with Asset Registry data: %d"), AssetCount );
+			Out.Logf(ELogVerbosity::Display, TEXT("Number of assets with Asset Registry data: %d"), AssetCount );
 
 			// If there are any Asset Registry tags, print them
 			for (int32 AssetIdx = 0; AssetIdx < AssetCount; ++AssetIdx)
@@ -1369,7 +1371,7 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 				*Linker << ObjectClassName;
 				*Linker << TagCount;
 
-				UE_LOG(LogPackageUtilities, Display, TEXT("\t\t%d) %s'%s' (%d Tags)"), AssetIdx, *ObjectClassName, *ObjectPath, TagCount );
+				Out.Logf(ELogVerbosity::Display, TEXT("\t\t%d) %s'%s' (%d Tags)"), AssetIdx, *ObjectClassName, *ObjectPath, TagCount );
 
 				// Now display all tags on this asset
 				for (int32 TagIdx = 0; TagIdx < TagCount; ++TagIdx)
@@ -1379,7 +1381,7 @@ void FPkgInfoReporter_Log::GeneratePackageReport( FLinkerLoad* InLinker/*=00NULL
 					*Linker << Key;
 					*Linker << Value;
 
-					UE_LOG(LogPackageUtilities, Display, TEXT("\t\t\t\"%s\": \"%s\""), *Key, *Value );
+					Out.Logf(ELogVerbosity::Display, TEXT("\t\t\t\"%s\": \"%s\""), *Key, *Value );
 				}
 			}
 		}
@@ -1395,16 +1397,13 @@ UPkgInfoCommandlet::UPkgInfoCommandlet(const FObjectInitializer& ObjectInitializ
 
 int32 UPkgInfoCommandlet::Main( const FString& Params )
 {
-	// turn off as it makes diffing hard
-	auto bOldGPrintLogTimes = GPrintLogTimes;
-	GPrintLogTimes = ELogTimes::None;
-
 	const TCHAR* Parms = *Params;
 
 	TArray<FString> Tokens, Switches;
 	ParseCommandLine(Parms, Tokens, Switches);
 
 	// find out which type of info we're looking for
+	bool bDumpProperties = false;
 	uint32 InfoFlags = PKGINFO_None;
 	if ( Switches.Contains(TEXT("names")) )
 	{
@@ -1442,11 +1441,24 @@ int32 UPkgInfoCommandlet::Main( const FString& Params )
 	{
 		InfoFlags |= PKGINFO_AssetRegistry;
 	}
+	if (Switches.Contains(TEXT("properties")))
+	{
+		bDumpProperties = true;
+	}
 	if ( Switches.Contains(TEXT("all")) )
 	{
+		bDumpProperties = true;
 		InfoFlags |= PKGINFO_All;
 	}
 
+	// Create a file writer to dump the info to
+	FOutputDevice* OutputOverride = GWarn;
+	FString OutputFilename;
+	if (FParse::Value(*Params, TEXT("dumptofile="), OutputFilename))
+	{
+		OutputOverride = new FOutputDeviceFile(*OutputFilename, true);
+	}
+
 	const bool bHideOffsets = Switches.Contains(TEXT("HideOffsets"));
 
 	FPkgInfoReporter* Reporter = new FPkgInfoReporter_Log(InfoFlags, bHideOffsets);
@@ -1525,21 +1537,102 @@ int32 UPkgInfoCommandlet::Main( const FString& Params )
 			}
 		}
 
-		BeginLoad();
-		FLinkerLoad* Linker = CreateLinkerForFilename(Filename);
-		EndLoad();
+		FLinkerLoad* Linker = nullptr;
+		UPackage* Package = nullptr;
+		FArchiveStackTraceReader* Reader = nullptr;
 
-		if( Linker )
+		if (!bDumpProperties)
 		{
-			Reporter->GeneratePackageReport(Linker);
+			TGuardValue<bool> GuardAllowUnversionedContentInEditor(GAllowUnversionedContentInEditor, true);
+			BeginLoad();
+			Linker = CreateLinkerForFilename(Filename);
+			EndLoad();
 		}
+		else
+		{
+			FString TempPackageName = Filename;
+			const TCHAR* ContentFolderString = TEXT("/Content/");
+			int32 ContentFolderIndex = TempPackageName.Find(ContentFolderString);
+			if (ContentFolderIndex >= 0)
+			{
+				TempPackageName = Filename.Mid(ContentFolderIndex + FCString::Strlen(ContentFolderString));
+			}
+			TempPackageName = FPaths::Combine(TEXT("/Temp"), *FPaths::GetPath(TempPackageName.Mid(TempPackageName.Find(TEXT(":"), ESearchCase::CaseSensitive) + 1)), *FPaths::GetBaseFilename(TempPackageName));
+			Package = FindObjectFast<UPackage>(nullptr, *TempPackageName);
+			if (!Package)
+			{
+				Package = CreatePackage(nullptr, *TempPackageName);
+			}
 
+			Reader = FArchiveStackTraceReader::CreateFromFile(*Filename);
+			if (Reader)
+			{
+				TGuardValue<bool> GuardAllowUnversionedContentInEditor(GAllowUnversionedContentInEditor, true);
+				UPackage* LoadedPackage = LoadPackage(Package, *Filename, LOAD_NoVerify, Reader);
+				if (LoadedPackage)
+				{
+					check(LoadedPackage == Package);
+					Linker = Package->LinkerLoad;
+					check(Linker);
+				}
+				else
+				{
+					UE_LOG(LogPackageUtilities, Error, TEXT("Unable to fully load package %s"), *Filename);
+					bDumpProperties = false;
+				}
+			}
+			else
+			{
+				UE_LOG(LogPackageUtilities, Error, TEXT("Unable to create archive for package %s"), *Filename);
+				bDumpProperties = false;
+			}
+		}
+		{
+			// Turn off log categories etc as it makes diffing hard
+			TGuardValue<ELogTimes::Type> GuardPrintLogTimes(GPrintLogTimes, ELogTimes::None);
+			TGuardValue<bool> GuardPrintLogCategory(GPrintLogCategory, false);
+			TGuardValue<bool> GuardPrintLogVerbosity(GPrintLogVerbosity, false);
+
+			if (Linker)
+			{
+				Reporter->GeneratePackageReport(Linker, *OutputOverride);
+			}
+			if (bDumpProperties)
+			{
+				check(Reader);
+				const int32 BaseIndent = FOutputDeviceHelper::FormatLogLine(ELogVerbosity::Display, LogPackageUtilities.GetCategoryName(), TEXT(""), GPrintLogTimes).Len();
+				FOutputDevice& Out = *OutputOverride;
+
+				Out.Logf(ELogVerbosity::Display, TEXT("--------------------------------------------"));
+				Out.Logf(ELogVerbosity::Display, TEXT("Serialize calls for exports"));
+				Out.Logf(ELogVerbosity::Display, TEXT("==========================="));
+
+				int64 TotalSerializeCalls = 0;
+				for (int32 SerializeCallIndex = 0; SerializeCallIndex < Reader->GetSerializeTrace().Num(); ++SerializeCallIndex)
+				{
+					FString IndexString = FString::FromInt(SerializeCallIndex);
+					const TCHAR* Indent = FCString::Spc(BaseIndent + IndexString.Len() + 2);
+					const FArchiveStackTraceReader::FSerializeData& SerializeData = Reader->GetSerializeTrace()[SerializeCallIndex];
+					FString DisplayText = FString::Printf(TEXT("[%s] Offset: %lld\n%s Object: %s\n%s Property: %s\n%s Size: %lld\n%s Count: %lld"),
+						*IndexString,
+						SerializeData.Offset,
+						Indent, *GetFullNameSafe(SerializeData.Object),
+						Indent, *GetFullNameSafe(SerializeData.Property),
+						Indent, SerializeData.Size,
+						Indent, SerializeData.Count);
+					Out.Logf(ELogVerbosity::Display, TEXT("%s"), *DisplayText);
+					TotalSerializeCalls += SerializeData.Count;
+				}
+				Out.Logf(ELogVerbosity::Display, TEXT("Total number of Serialize calls: %lld"), TotalSerializeCalls);
+			}
+		}
 		CollectGarbage(RF_NoFlags);
 	}
 
-	// turn off as it makes diffing hard
-	GPrintLogTimes = bOldGPrintLogTimes;
-
+	if (OutputOverride != GWarn)
+	{
+		delete OutputOverride;		
+	}
 	delete Reporter;
 	Reporter = NULL;
 	return 0;
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/ShaderPipelineCacheToolsCommandlet.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/ShaderPipelineCacheToolsCommandlet.cpp
new file mode 100644
index 000000000000..76ba175c03b5
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/ShaderPipelineCacheToolsCommandlet.cpp
@@ -0,0 +1,1066 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Commandlets/ShaderPipelineCacheToolsCommandlet.h"
+#include "Misc/Paths.h"
+
+#include "PipelineFileCache.h"
+#include "ShaderCodeLibrary.h"
+#include "Misc/FileHelper.h"
+#include "ShaderPipelineCache.h"
+
+DEFINE_LOG_CATEGORY_STATIC(LogShaderPipelineCacheTools, Log, All);
+
+
+void ExpandWildcards(TArray<FString>& Parts)
+{
+	TArray<FString> NewParts;
+	for (const FString& OldPart : Parts)
+	{
+		if (OldPart.Contains(TEXT("*")) || OldPart.Contains(TEXT("?")))
+		{
+			TArray<FString> ExpandedFiles;
+			IFileManager::Get().FindFilesRecursive(ExpandedFiles, *FPaths::GetPath(OldPart), *FPaths::GetCleanFilename(OldPart), true, false);
+			UE_CLOG(!ExpandedFiles.Num(), LogShaderPipelineCacheTools, Warning, TEXT("Expanding %s....did not match anything."), *OldPart);
+			UE_CLOG(ExpandedFiles.Num(), LogShaderPipelineCacheTools, Log, TEXT("Expanding matched %4d files: %s"), ExpandedFiles.Num(), *OldPart);
+			for (const FString& Item : ExpandedFiles)
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Log, TEXT("                             : %s"), *Item);
+				NewParts.Add(Item);
+			}
+		}
+		else
+		{
+			NewParts.Add(OldPart);
+		}
+	}
+	Parts = NewParts;
+}
+
+
+void LoadStableSCL(TMultiMap<FStableShaderKeyAndValue, FSHAHash>& StableMap, const FString& Filename)
+{
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loading %s...."), *Filename);
+	TArray<FString> SourceFileContents;
+
+	if (FFileHelper::LoadFileToStringArray(SourceFileContents, *Filename))
+	{
+		StableMap.Reserve(StableMap.Num() + SourceFileContents.Num() - 1);
+		for (int32 Index = 1; Index < SourceFileContents.Num(); Index++)
+		{
+			FStableShaderKeyAndValue Item;
+			FMemory::Memzero(Item);
+			Item.ParseFromString(SourceFileContents[Index]);
+			check(!(Item.OutputHash == FSHAHash()));
+			StableMap.AddUnique(Item, Item.OutputHash);
+		}
+	}
+	if (SourceFileContents.Num() < 1)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Could not load %s"), *Filename);
+		return;
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d shader info lines"), SourceFileContents.Num() - 1);
+}
+
+
+static void PrintShaders(const TMap<FSHAHash, TArray<FString>>& InverseMap, const FSHAHash& Shader)
+{
+	if (Shader == FSHAHash())
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    null"));
+		return;
+	}
+	const TArray<FString>* Out = InverseMap.Find(Shader);
+	if (!Out)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    No shaders found with hash %s"), *Shader.ToString());
+		return;
+	}
+
+	for (const FString& Item : *Out)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    %s"), *Item);
+	}
+}
+
+void CheckPSOStringInveribility(const FPipelineCacheFileFormatPSO& Item)
+{
+	FPipelineCacheFileFormatPSO TempItem(Item);
+	TempItem.Hash = 0;
+
+	FString StringRep;
+	if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+	{
+		StringRep = TempItem.ComputeDesc.ToString();
+	}
+	else
+	{
+		StringRep = TempItem.GraphicsDesc.ToString();
+	}
+	FPipelineCacheFileFormatPSO DupItem;
+	FMemory::Memzero(DupItem.GraphicsDesc);
+	DupItem.Type = Item.Type;
+	if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+	{
+		DupItem.ComputeDesc.FromString(StringRep);
+	}
+	else
+	{
+		DupItem.GraphicsDesc.FromString(StringRep);
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("CheckPSOStringInveribility: %s"), *StringRep);
+
+	check(DupItem == TempItem);
+	check(GetTypeHash(DupItem) == GetTypeHash(TempItem));
+}
+
+int32 DumpPSOSC(FString& Token)
+{
+	TSet<FPipelineCacheFileFormatPSO> PSOs;
+
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loading %s...."), *Token);
+	if (!FPipelineFileCache::LoadPipelineFileCacheInto(Token, PSOs))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("Could not load %s or it was empty."), *Token);
+		return 1;
+	}
+
+	for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+	{
+		FString StringRep;
+		if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+		{
+			check(!(Item.ComputeDesc.ComputeShader == FSHAHash()));
+			StringRep = Item.ComputeDesc.ToString();
+		}
+		else
+		{
+			check(!(Item.GraphicsDesc.VertexShader == FSHAHash()));
+			StringRep = Item.GraphicsDesc.ToString();
+		}
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("%s"), *StringRep);
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("%s"), *FPipelineCacheFileFormatPSO::GraphicsDescriptor::HeaderLine());
+
+	for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+	{
+		CheckPSOStringInveribility(Item);
+	}
+
+	return 0;
+}
+
+static void PrintShaders(const TMap<FSHAHash, TArray<FStableShaderKeyAndValue>>& InverseMap, const FSHAHash& Shader, const TCHAR *Label)
+{
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT(" -- %s"), Label);
+
+	if (Shader == FSHAHash())
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    null"));
+		return;
+	}
+	const TArray<FStableShaderKeyAndValue>* Out = InverseMap.Find(Shader);
+	if (!Out)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    No shaders found with hash %s"), *Shader.ToString());
+		return;
+	}
+	for (const FStableShaderKeyAndValue& Item : *Out)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    %s"), *Item.ToString());
+	}
+}
+
+static bool GetStableShadersAndZeroHash(const TMap<FSHAHash, TArray<FStableShaderKeyAndValue>>& InverseMap, const FSHAHash& Shader, TArray<FStableShaderKeyAndValue>& StableShaders, bool& bOutAnyActiveButMissing)
+{
+	if (Shader == FSHAHash())
+	{
+		return false;
+	}
+	const TArray<FStableShaderKeyAndValue>* Out = InverseMap.Find(Shader);
+	if (!Out)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("No shaders found with hash %s"), *Shader.ToString());
+		UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("If you can find the old .scl.csv file for this build, adding it will allow these PSOs to be usable."));
+		bOutAnyActiveButMissing = true;
+		return false;
+	}
+	StableShaders.Reserve(Out->Num());
+	for (const FStableShaderKeyAndValue& Item : *Out)
+	{
+		FStableShaderKeyAndValue Temp = Item;
+		Temp.OutputHash = FSHAHash();
+		if (StableShaders.Contains(Temp))
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("Duplicate stable shader. This is bad because it means our stable key is not exhaustive."));
+			UE_LOG(LogShaderPipelineCacheTools, Error, TEXT(" %s"), *Item.ToString());
+			continue;
+		}
+		StableShaders.Add(Temp);
+	}
+	return true;
+}
+
+// return true if these two shaders could be part of the same stable PSO
+// for example, if they come from two different vertex factories, we return false because that situation cannot occur
+bool CouldBeUsedTogether(const FStableShaderKeyAndValue& A, const FStableShaderKeyAndValue& B)
+{
+	static FName NAME_FDeferredDecalVS("FDeferredDecalVS");
+	static FName NAME_FWriteToSliceVS("FWriteToSliceVS");
+	static FName NAME_FPostProcessVS("FPostProcessVS");
+	if (
+		A.ShaderType == NAME_FDeferredDecalVS || B.ShaderType == NAME_FDeferredDecalVS ||
+		A.ShaderType == NAME_FWriteToSliceVS || B.ShaderType == NAME_FWriteToSliceVS ||
+		A.ShaderType == NAME_FPostProcessVS || B.ShaderType == NAME_FPostProcessVS
+		)
+	{
+		// oddball mix and match with any material shader.
+		return true;
+	}
+	if (A.ShaderClass != B.ShaderClass)
+	{
+		return false;
+	}
+	if (A.VFType != B.VFType)
+	{
+		return false;
+	}
+	if (A.FeatureLevel != B.FeatureLevel)
+	{
+		return false;
+	}
+	if (A.QualityLevel != B.QualityLevel)
+	{
+		return false;
+	}
+	if (A.TargetPlatform != B.TargetPlatform)
+	{
+		return false;
+	}
+	if (!(A.ClassNameAndObjectPath == B.ClassNameAndObjectPath))
+	{
+		return false;
+	}
+	return true;
+}
+
+int32 DumpSCLCSV(const FString& Token)
+{
+
+	TMultiMap<FStableShaderKeyAndValue, FSHAHash> StableMap;
+	LoadStableSCL(StableMap, Token);
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    %s"), *FStableShaderKeyAndValue::HeaderLine());
+	for (const auto& Pair : StableMap)
+	{
+		FStableShaderKeyAndValue Temp(Pair.Key);
+		Temp.OutputHash = Pair.Value;
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    %s"), *Temp.ToString());
+	}
+	return 0;
+}
+
+void IntersectSets(TSet<FCompactFullName>& Intersect, const TSet<FCompactFullName>& ShaderAssets)
+{
+	if (!Intersect.Num() && ShaderAssets.Num())
+	{
+		Intersect = ShaderAssets;
+	}
+	else if (Intersect.Num() && ShaderAssets.Num())
+	{
+		Intersect  = Intersect.Intersect(ShaderAssets);
+	}
+}
+
+struct FPermuation
+{
+	FStableShaderKeyAndValue Slots[SF_NumFrequencies];
+};
+
+void GeneratePermuations(TArray<FPermuation>& Permutations, FPermuation& WorkingPerm, int32 SlotIndex , const TArray<FStableShaderKeyAndValue> StableShadersPerSlot[SF_NumFrequencies], const bool ActivePerSlot[SF_NumFrequencies])
+{
+	check(SlotIndex >= 0 && SlotIndex <= SF_NumFrequencies);
+	while (SlotIndex < SF_NumFrequencies && !ActivePerSlot[SlotIndex])
+	{
+		SlotIndex++;
+	}
+	if (SlotIndex >= SF_NumFrequencies)
+	{
+		Permutations.Add(WorkingPerm);
+		return;
+	}
+	for (int32 StableIndex = 0; StableIndex < StableShadersPerSlot[SlotIndex].Num(); StableIndex++)
+	{
+		bool bKeep = true;
+		// check compatibility with shaders in the working perm
+		for (int32 SlotIndexInner = 0; SlotIndexInner < SlotIndex; SlotIndexInner++)
+		{
+			if (SlotIndex == SlotIndexInner || !ActivePerSlot[SlotIndexInner])
+			{
+				continue;
+			}
+			check(SlotIndex != SF_Compute && SlotIndexInner != SF_Compute); // there is never any matching with compute shaders
+			if (!CouldBeUsedTogether(StableShadersPerSlot[SlotIndex][StableIndex], WorkingPerm.Slots[SlotIndexInner]))
+			{
+				bKeep = false;
+				break;
+			}
+		}
+		if (!bKeep)
+		{
+			continue;
+		}
+		WorkingPerm.Slots[SlotIndex] = StableShadersPerSlot[SlotIndex][StableIndex];
+		GeneratePermuations(Permutations, WorkingPerm, SlotIndex + 1, StableShadersPerSlot, ActivePerSlot);
+	}
+}
+
+int32 ExpandPSOSC(const TArray<FString>& Tokens)
+{
+	TMultiMap<FStableShaderKeyAndValue, FSHAHash> StableMap;
+	check(Tokens.Last().EndsWith(TEXT(".stablepc.csv")));
+	for (int32 Index = 0; Index < Tokens.Num() - 1; Index++)
+	{
+		if (Tokens[Index].EndsWith(TEXT(".scl.csv")))
+		{
+			LoadStableSCL(StableMap, Tokens[Index]);
+		}
+	}
+	if (UE_LOG_ACTIVE(LogShaderPipelineCacheTools, Verbose))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("    %s"), *FStableShaderKeyAndValue::HeaderLine());
+		for (const auto& Pair : StableMap)
+		{
+			FStableShaderKeyAndValue Temp(Pair.Key);
+			Temp.OutputHash = Pair.Value;
+			UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("    %s"), *Temp.ToString());
+		}
+	}
+	//self test
+	for (const auto& Pair : StableMap)
+	{
+		FStableShaderKeyAndValue Item(Pair.Key);
+		Item.OutputHash = Pair.Value;
+		check(Pair.Value != FSHAHash());
+		FString TestString = Item.ToString();
+		FStableShaderKeyAndValue TestItem;
+		TestItem.ParseFromString(TestString);
+		check(Item == TestItem);
+		check(GetTypeHash(Item) == GetTypeHash(TestItem));
+		check(Item.OutputHash == TestItem.OutputHash);
+	}
+	// end self test
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d unique shader info lines total."), StableMap.Num());
+
+	TSet<FPipelineCacheFileFormatPSO> PSOs;
+
+	for (int32 Index = 0; Index < Tokens.Num() - 1; Index++)
+	{
+		if (Tokens[Index].EndsWith(TEXT(".upipelinecache")))
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loading %s...."), *Tokens[Index]);
+			TSet<FPipelineCacheFileFormatPSO> TempPSOs;
+			if (!FPipelineFileCache::LoadPipelineFileCacheInto(Tokens[Index], TempPSOs))
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("Could not load %s or it was empty."), *Tokens[Index]);
+				continue;
+			}
+			UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d PSOs"), TempPSOs.Num());
+			PSOs.Append(TempPSOs);
+
+		}
+		else
+		{
+			check(Tokens[Index].EndsWith(TEXT(".scl.csv")));
+		}
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d PSOs total."), PSOs.Num());
+
+	//self test
+	for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+	{
+		CheckPSOStringInveribility(Item);
+	}
+	// end self test
+	if (UE_LOG_ACTIVE(LogShaderPipelineCacheTools, Verbose))
+	{
+		TMap<FSHAHash, TArray<FString>> InverseMap;
+
+		for (const auto& Pair : StableMap)
+		{
+			FStableShaderKeyAndValue Temp(Pair.Key);
+			Temp.OutputHash = Pair.Value;
+			InverseMap.FindOrAdd(Pair.Value).Add(Temp.ToString());
+		}
+
+		for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+		{
+			if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("ComputeShader"));
+				PrintShaders(InverseMap, Item.ComputeDesc.ComputeShader);
+			}
+			else
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("VertexShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.VertexShader);
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("FragmentShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.FragmentShader);
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("GeometryShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.GeometryShader);
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("HullShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.HullShader);
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("DomainShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.DomainShader);
+			}
+		}
+	}
+	TMap<FSHAHash, TArray<FStableShaderKeyAndValue>> InverseMap;
+
+	for (const auto& Pair : StableMap)
+	{
+		FStableShaderKeyAndValue Item(Pair.Key);
+		Item.OutputHash = Pair.Value;
+		InverseMap.FindOrAdd(Item.OutputHash).AddUnique(Item);
+	}
+
+	int32 TotalStablePSOs = 0;
+
+	struct FPermsPerPSO
+	{
+		const FPipelineCacheFileFormatPSO* PSO;
+		bool ActivePerSlot[SF_NumFrequencies];
+		TArray<FPermuation> Permutations;
+
+		FPermsPerPSO()
+			: PSO(nullptr)
+		{
+			for (int32 Index = 0; Index < SF_NumFrequencies; Index++)
+			{
+				ActivePerSlot[Index] = false;
+			}
+		}
+	};
+
+	TArray<FPermsPerPSO> StableResults;
+	StableResults.Reserve(PSOs.Num());
+	int32 NumSkipped = 0;
+	int32 NumExamined = 0;
+
+	for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+	{ 
+		NumExamined++;
+		check(SF_Vertex == 0 && SF_Compute == 5);
+		TArray<FStableShaderKeyAndValue> StableShadersPerSlot[SF_NumFrequencies];
+		bool ActivePerSlot[SF_NumFrequencies] = { false };
+
+		bool OutAnyActiveButMissing = false;
+
+		if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+		{
+			ActivePerSlot[SF_Compute] = GetStableShadersAndZeroHash(InverseMap, Item.ComputeDesc.ComputeShader, StableShadersPerSlot[SF_Compute], OutAnyActiveButMissing);
+		}
+		else
+		{
+			ActivePerSlot[SF_Vertex] = GetStableShadersAndZeroHash(InverseMap, Item.GraphicsDesc.VertexShader, StableShadersPerSlot[SF_Vertex], OutAnyActiveButMissing);
+			ActivePerSlot[SF_Pixel] = GetStableShadersAndZeroHash(InverseMap, Item.GraphicsDesc.FragmentShader, StableShadersPerSlot[SF_Pixel], OutAnyActiveButMissing);
+			ActivePerSlot[SF_Geometry] = GetStableShadersAndZeroHash(InverseMap, Item.GraphicsDesc.GeometryShader, StableShadersPerSlot[SF_Geometry], OutAnyActiveButMissing);
+			ActivePerSlot[SF_Hull] = GetStableShadersAndZeroHash(InverseMap, Item.GraphicsDesc.HullShader, StableShadersPerSlot[SF_Hull], OutAnyActiveButMissing);
+			ActivePerSlot[SF_Domain] = GetStableShadersAndZeroHash(InverseMap, Item.GraphicsDesc.DomainShader, StableShadersPerSlot[SF_Domain], OutAnyActiveButMissing);
+		}
+
+
+		if (OutAnyActiveButMissing)
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("PSO had an active shader slot that did not match any current shaders, ignored."));
+			if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				PrintShaders(InverseMap, Item.ComputeDesc.ComputeShader, TEXT("ComputeShader"));
+			}
+			else
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("   %s"), *Item.GraphicsDesc.StateToString());
+				PrintShaders(InverseMap, Item.GraphicsDesc.VertexShader, TEXT("VertexShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.FragmentShader, TEXT("FragmentShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.GeometryShader, TEXT("GeometryShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.HullShader, TEXT("HullShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.DomainShader, TEXT("DomainShader"));
+			}
+			continue;
+		}
+		if (Item.Type != FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+		{
+			check(!ActivePerSlot[SF_Compute]); // this is NOT a compute shader
+			bool bRemovedAll = false;
+			bool bAnyActive = false;
+			// Quite the nested loop. It isn't clear if this could be made faster, but the thing to realize is that the same set of shaders will be used in multiple PSOs we could take advantage of that...we don't.
+			for (int32 SlotIndex = 0; SlotIndex < SF_NumFrequencies; SlotIndex++)
+			{
+				if (!ActivePerSlot[SlotIndex])
+				{
+					check(!StableShadersPerSlot[SlotIndex].Num());
+					continue;
+				}
+				bAnyActive = true;
+				for (int32 StableIndex = 0; StableIndex < StableShadersPerSlot[SlotIndex].Num(); StableIndex++)
+				{
+					bool bKeep = true;
+					for (int32 SlotIndexInner = 0; SlotIndexInner < SF_Compute; SlotIndexInner++) //SF_Compute here because this is NOT a compute shader
+					{
+						if (SlotIndex == SlotIndexInner || !ActivePerSlot[SlotIndexInner])
+						{
+							continue;
+						}
+						bool bFoundCompat = false;
+						for (int32 StableIndexInner = 0; StableIndexInner < StableShadersPerSlot[SlotIndexInner].Num(); StableIndexInner++)
+						{
+							if (CouldBeUsedTogether(StableShadersPerSlot[SlotIndex][StableIndex], StableShadersPerSlot[SlotIndexInner][StableIndexInner]))
+							{
+								bFoundCompat = true;
+								break;
+							}
+						}
+						if (!bFoundCompat)
+						{
+							bKeep = false;
+							break;
+						}
+					}
+					if (!bKeep)
+					{
+						StableShadersPerSlot[SlotIndex].RemoveAt(StableIndex--);
+					}
+				}
+				if (!StableShadersPerSlot[SlotIndex].Num())
+				{
+					bRemovedAll = true;
+				}
+			}
+			if (!bAnyActive)
+			{
+				NumSkipped++;
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("PSO did not create any stable PSOs! (no active shader slots)"));
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("   %s"), *Item.GraphicsDesc.StateToString());
+				continue;
+			}
+			if (bRemovedAll)
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("PSO did not create any stable PSOs! (no cross shader slot compatibility)"));
+				UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("   %s"), *Item.GraphicsDesc.StateToString());
+
+				PrintShaders(InverseMap, Item.GraphicsDesc.VertexShader, TEXT("VertexShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.FragmentShader, TEXT("FragmentShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.GeometryShader, TEXT("GeometryShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.HullShader, TEXT("HullShader"));
+				PrintShaders(InverseMap, Item.GraphicsDesc.DomainShader, TEXT("DomainShader"));
+
+				continue;
+			}
+			// We could have done this on the fly, but that loop was already pretty complicated. Here we generate all plausible permutations and write them out
+		}
+
+		StableResults.AddDefaulted();
+		FPermsPerPSO& Current = StableResults.Last();
+		Current.PSO = &Item;
+
+		for (int32 Index = 0; Index < SF_NumFrequencies; Index++)
+		{
+			Current.ActivePerSlot[Index] = ActivePerSlot[Index];
+		}
+
+		TArray<FPermuation>& Permutations(Current.Permutations);
+		FPermuation WorkingPerm;
+		GeneratePermuations(Permutations, WorkingPerm, 0, StableShadersPerSlot, ActivePerSlot);
+		if (!Permutations.Num())
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("PSO did not create any stable PSOs! (somehow)"));
+			// this is fatal because now we have a bogus thing in the list
+			UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("   %s"), *Item.GraphicsDesc.StateToString());
+			continue;
+		}
+
+		UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("----- PSO created %d stable permutations --------------"), Permutations.Num());
+		TotalStablePSOs += Permutations.Num();
+	}
+	UE_CLOG(NumSkipped > 0, LogShaderPipelineCacheTools, Warning, TEXT("%d/%d PSO did not create any stable PSOs! (no active shader slots)"), NumSkipped, NumExamined);
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Generated %d stable PSOs total"), TotalStablePSOs);
+	if (!TotalStablePSOs || !StableResults.Num())
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("No stable PSOs created."));
+		return 1;
+	}
+
+	TArray<FString> OutputLines;
+	TSet<FString> DeDup;
+
+	{
+		FString PSOLine = FString::Printf(TEXT("\"%s\""), *FPipelineCacheFileFormatPSO::GraphicsDescriptor::StateHeaderLine());
+		for (int32 SlotIndex = 0; SlotIndex < SF_Compute; SlotIndex++) // SF_Compute here because the stablepc.csv file format does not have a compute slot
+		{
+			PSOLine += FString::Printf(TEXT(",\"shaderslot%d: %s\""), SlotIndex, *FStableShaderKeyAndValue::HeaderLine());
+		}
+		OutputLines.Add(PSOLine);
+	}
+
+	for (const FPermsPerPSO& Item : StableResults)
+	{
+		if (UE_LOG_ACTIVE(LogShaderPipelineCacheTools, Verbose))
+		{
+			if (Item.PSO->Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT(" Compute"));
+			}
+			else
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT(" %s"), *Item.PSO->GraphicsDesc.StateToString());
+			}
+			int32 PermIndex = 0;
+			for (const FPermuation& Perm : Item.Permutations)
+			{
+				UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("  ----- perm %d"), PermIndex);
+				for (int32 SlotIndex = 0; SlotIndex < SF_NumFrequencies; SlotIndex++)
+				{
+					if (!Item.ActivePerSlot[SlotIndex])
+					{
+						continue;
+					}
+					UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("   %s"), *Perm.Slots[SlotIndex].ToString());
+				}
+				PermIndex++;
+			}
+
+			UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("-----"));
+		}
+		for (const FPermuation& Perm : Item.Permutations)
+		{
+			// because it is a CSV, and for backward compat, compute shaders will just be a zeroed graphics desc with the shader in the hull shader slot.
+			FString PSOLine;
+
+			if (Item.PSO->Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				FPipelineCacheFileFormatPSO::GraphicsDescriptor Zero;
+				FMemory::Memzero(Zero);
+				PSOLine = FString::Printf(TEXT("\"%s\""), *Zero.StateToString());
+				for (int32 SlotIndex = 0; SlotIndex < SF_Compute; SlotIndex++)  // SF_Compute here because the stablepc.csv file format does not have a compute slot
+				{
+					check(!Item.ActivePerSlot[SlotIndex]); // none of these should be active for a compute shader
+					if (SlotIndex == SF_Hull)
+					{
+						PSOLine += FString::Printf(TEXT(",\"%s\""), *Perm.Slots[SF_Compute].ToString());
+					}
+					else
+					{
+						PSOLine += FString::Printf(TEXT(",\"\""));
+					}
+				}
+			}
+			else
+			{
+				PSOLine = FString::Printf(TEXT("\"%s\""), *Item.PSO->GraphicsDesc.StateToString());
+				for (int32 SlotIndex = 0; SlotIndex < SF_Compute; SlotIndex++) // SF_Compute here because the stablepc.csv file format does not have a compute slot
+				{
+					if (!Item.ActivePerSlot[SlotIndex])
+					{
+						PSOLine += FString::Printf(TEXT(",\"\""));
+						continue;
+					}
+					PSOLine += FString::Printf(TEXT(",\"%s\""), *Perm.Slots[SlotIndex].ToString());
+				}
+			}
+
+
+			if (!DeDup.Contains(PSOLine))
+			{
+				DeDup.Add(PSOLine); 
+				OutputLines.Add(PSOLine);
+			}
+		}
+	}
+
+	if (IFileManager::Get().FileExists(*Tokens.Last()))
+	{
+		IFileManager::Get().Delete(*Tokens.Last(), false, true);
+	}
+	if (IFileManager::Get().FileExists(*Tokens.Last()))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Could not delete %s"), *Tokens.Last());
+	}
+	FFileHelper::SaveStringArrayToFile(OutputLines, *Tokens.Last());
+	int64 Size = IFileManager::Get().FileSize(*Tokens.Last());
+	if (Size < 1)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Failed to write %s"), *Tokens.Last());
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Wrote stable PSOs, %d lines (%lldKB) to %s"), OutputLines.Num(), (Size + 1023) / 1024, *Tokens.Last());
+
+	return 0;
+}
+
+void ParseQuoteComma(const FString& InLine, TArray<FString>& OutParts)
+{
+	FString Line = InLine;
+	while (true)
+	{
+		int32 QuoteLoc = 0;
+		if (!Line.FindChar(TCHAR('\"'), QuoteLoc))
+		{
+			break;
+		}
+		Line = Line.RightChop(QuoteLoc + 1);
+		if (!Line.FindChar(TCHAR('\"'), QuoteLoc))
+		{
+			break;
+		}
+		OutParts.Add(Line.Left(QuoteLoc));
+		Line = Line.RightChop(QuoteLoc + 1);
+	}
+}
+
+
+int32 BuildPSOSC(const TArray<FString>& Tokens)
+{
+	TMultiMap<FStableShaderKeyAndValue, FSHAHash> StableMap;
+	check(Tokens.Last().EndsWith(TEXT(".upipelinecache")));
+
+	for (int32 Index = 0; Index < Tokens.Num() - 1; Index++)
+	{
+		if (Tokens[Index].EndsWith(TEXT(".scl.csv")))
+		{
+			LoadStableSCL(StableMap, Tokens[Index]);
+		}
+	}
+	if (UE_LOG_ACTIVE(LogShaderPipelineCacheTools, Verbose))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("    %s"), *FStableShaderKeyAndValue::HeaderLine());
+		for (const auto& Pair : StableMap)
+		{
+			FStableShaderKeyAndValue Temp(Pair.Key);
+			Temp.OutputHash = Pair.Value;
+			UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("    %s"), *Temp.ToString());
+		}
+	}
+	//self test
+	for (const auto& Pair : StableMap)
+	{
+		FStableShaderKeyAndValue Item(Pair.Key);
+		Item.OutputHash = Pair.Value;
+		check(Pair.Value != FSHAHash());
+		FString TestString = Item.ToString();
+		FStableShaderKeyAndValue TestItem;
+		TestItem.ParseFromString(TestString);
+		check(Item == TestItem);
+		check(GetTypeHash(Item) == GetTypeHash(TestItem));
+		check(Item.OutputHash == TestItem.OutputHash);
+	}
+	// end self test
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d unique shader info lines total."), StableMap.Num());
+
+	TSet<FPipelineCacheFileFormatPSO> PSOs;
+	FName TargetPlatform;
+
+
+	for (int32 TokenIndex = 0; TokenIndex < Tokens.Num() - 1; TokenIndex++)
+	{
+		if (!Tokens[TokenIndex].EndsWith(TEXT(".stablepc.csv")))
+		{
+			check(Tokens[TokenIndex].EndsWith(TEXT(".scl.csv")));
+			continue;
+		}
+
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loading %s...."), *Tokens[TokenIndex]);
+		TArray<FString> SourceFileContents;
+
+		if (!FFileHelper::LoadFileToStringArray(SourceFileContents, *Tokens[TokenIndex]) || SourceFileContents.Num() < 2)
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Could not load %s"), *Tokens[TokenIndex]);
+			return 1;
+		}
+
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d stable PSO lines."), SourceFileContents.Num() - 1);
+
+		for (int32 Index = 1; Index < SourceFileContents.Num(); Index++)
+		{
+			TArray<FString> Parts;
+			ParseQuoteComma(SourceFileContents[Index], Parts);
+			check(Parts.Num() == 1 + SF_Compute); // SF_Compute here because the stablepc.csv file format does not have a compute slot
+
+			FPipelineCacheFileFormatPSO PSO;
+			FMemory::Memzero(PSO);
+			PSO.Type = FPipelineCacheFileFormatPSO::DescriptorType::Graphics; // we will change this to compute later if needed
+			PSO.GraphicsDesc.StateFromString(Parts[0]);
+
+			bool bValid = true;
+
+			bool bLooksLikeAComputeShader = false;
+
+			static FName NAME_SF_Compute("SF_Compute");
+			// because it is a CSV, and for backward compat, compute shaders will just be a zeroed graphics desc with the shader in the hull shader slot.
+			for (int32 SlotIndex = 0; SlotIndex < SF_Compute; SlotIndex++) // SF_Compute here because the stablepc.csv file format does not have a compute slot
+			{
+				if (!Parts[SlotIndex + 1].Len())
+				{
+					continue;
+				}
+
+				FStableShaderKeyAndValue Shader;
+				Shader.ParseFromString(Parts[SlotIndex + 1]);
+
+				if (SlotIndex == SF_Hull)
+				{
+					if (Shader.TargetFrequency == NAME_SF_Compute)
+					{
+						bLooksLikeAComputeShader = true;
+					}
+				}
+				else
+				{
+					check(Shader.TargetFrequency != NAME_SF_Compute);
+				}
+
+				FSHAHash Match;
+				int32 Count = 0;
+				for (auto Iter = StableMap.CreateConstKeyIterator(Shader); Iter; ++Iter)
+				{
+					check(Iter.Value() != FSHAHash());
+					Match = Iter.Value();
+					if (TargetPlatform == NAME_None)
+					{
+						TargetPlatform = Iter.Key().TargetPlatform;
+					}
+					else
+					{
+						check(TargetPlatform == Iter.Key().TargetPlatform);
+					}
+					Count++;
+				}
+
+				if (!Count)
+				{
+					UE_LOG(LogShaderPipelineCacheTools, Log, TEXT("Stable PSO not found, rejecting %s"), *Shader.ToString());
+					bValid = false;
+					break;
+				}
+
+				if (Count > 1)
+				{
+					UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("Stable PSO maps to multiple shaders. This is usually a bad thing and means you used .scl.csv files from multiple builds. Ignoring all but the last %s"), *Shader.ToString());
+				}
+
+				switch (SlotIndex)
+				{
+				case SF_Vertex:
+					PSO.GraphicsDesc.VertexShader = Match;
+					break;
+				case SF_Pixel:
+					PSO.GraphicsDesc.FragmentShader = Match;
+					break;
+				case SF_Geometry:
+					PSO.GraphicsDesc.GeometryShader = Match;
+					break;
+				case SF_Hull:
+					PSO.GraphicsDesc.HullShader = Match;
+					break;
+				case SF_Domain:
+					PSO.GraphicsDesc.DomainShader = Match;
+					break;
+				}
+			}
+			if (bValid)
+			{
+				if (
+					PSO.GraphicsDesc.VertexShader == FSHAHash() &&
+					PSO.GraphicsDesc.FragmentShader == FSHAHash() &&
+					PSO.GraphicsDesc.GeometryShader == FSHAHash() &&
+					!(PSO.GraphicsDesc.HullShader == FSHAHash()) &&    // Compute shaders are stored in the hull slot
+					PSO.GraphicsDesc.DomainShader == FSHAHash() &&
+					bLooksLikeAComputeShader
+					)
+				{
+					// this is a compute shader
+					PSO.Type = FPipelineCacheFileFormatPSO::DescriptorType::Compute;
+					PSO.ComputeDesc.ComputeShader = PSO.GraphicsDesc.HullShader;
+					PSO.GraphicsDesc.HullShader = FSHAHash();
+				}
+				else
+				{
+					PSO.Type = FPipelineCacheFileFormatPSO::DescriptorType::Graphics;
+					check(!bLooksLikeAComputeShader);
+					if (PSO.GraphicsDesc.VertexShader == FSHAHash())
+					{
+						UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("Stable PSO with null vertex shader, ignored."));
+						bValid = false;
+					}
+				}
+			}
+
+			if (bValid)
+			{
+				PSOs.Add(PSO);
+			}
+		}
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Re-deduplicated into %d binary PSOs."), PSOs.Num());
+	if (PSOs.Num() < 1)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("No PSO were created!"));
+		return 1;
+	}
+
+	if (UE_LOG_ACTIVE(LogShaderPipelineCacheTools, Verbose))
+	{
+		for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+		{
+			FString StringRep;
+			if (Item.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				check(!(Item.ComputeDesc.ComputeShader == FSHAHash()));
+				StringRep = Item.ComputeDesc.ToString();
+			}
+			else
+			{
+				check(!(Item.GraphicsDesc.VertexShader == FSHAHash()));
+				StringRep = Item.GraphicsDesc.ToString();
+			}
+			UE_LOG(LogShaderPipelineCacheTools, Verbose, TEXT("%s"), *StringRep);
+		}
+	}
+
+	check(TargetPlatform != NAME_None);
+	EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(TargetPlatform);
+	check(Platform != SP_NumPlatforms);
+
+	if (IFileManager::Get().FileExists(*Tokens.Last()))
+	{
+		IFileManager::Get().Delete(*Tokens.Last(), false, true);
+	}
+	if (IFileManager::Get().FileExists(*Tokens.Last()))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Could not delete %s"), *Tokens.Last());
+	}
+	if (!FPipelineFileCache::SavePipelineFileCacheFrom(FShaderPipelineCache::GetGameVersionForPSOFileCache(), Platform, Tokens.Last(), PSOs))
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Error, TEXT("Failed to save %s"), *Tokens.Last());
+		return 1;
+	}
+	int64 Size = IFileManager::Get().FileSize(*Tokens.Last());
+	if (Size < 1)
+	{
+		UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Failed to write %s"), *Tokens.Last());
+	}
+	UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Wrote binary PSOs, (%lldKB) to %s"), (Size + 1023) / 1024, *Tokens.Last());
+	return 0;
+}
+
+
+int32 DiffStable(const TArray<FString>& Tokens)
+{
+	TArray<TSet<FString>> Sets;
+	for (int32 TokenIndex = 0; TokenIndex < Tokens.Num(); TokenIndex++)
+	{
+		if (!Tokens[TokenIndex].EndsWith(TEXT(".stablepc.csv")))
+		{
+			check(0);
+			continue;
+		}
+
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loading %s...."), *Tokens[TokenIndex]);
+		TArray<FString> SourceFileContents;
+
+		if (!FFileHelper::LoadFileToStringArray(SourceFileContents, *Tokens[TokenIndex]) || SourceFileContents.Num() < 2)
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Fatal, TEXT("Could not load %s"), *Tokens[TokenIndex]);
+			return 1;
+		}
+
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("Loaded %d stable PSO lines."), SourceFileContents.Num() - 1);
+
+		Sets.AddDefaulted();
+
+		for (int32 Index = 1; Index < SourceFileContents.Num(); Index++)
+		{
+			Sets.Last().Add(SourceFileContents[Index]);
+		}
+	}
+	TSet<FString> Inter;
+	for (int32 TokenIndex = 0; TokenIndex < Sets.Num(); TokenIndex++)
+	{
+		if (TokenIndex)
+		{
+			Inter = Sets[TokenIndex];
+		}
+		else
+		{
+			Inter = Inter.Intersect(Sets[TokenIndex]);
+		}
+	}
+
+	for (int32 TokenIndex = 0; TokenIndex < Sets.Num(); TokenIndex++)
+	{
+		TSet<FString> InterSet = Sets[TokenIndex].Difference(Inter);
+
+		UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("********************* Loaded %d not in others %s"), InterSet.Num(), *Tokens[TokenIndex]);
+		for (const FString& Item : InterSet)
+		{
+			UE_LOG(LogShaderPipelineCacheTools, Display, TEXT("    %s"), *Item);
+		}
+	}
+	return 0;
+}
+
+UShaderPipelineCacheToolsCommandlet::UShaderPipelineCacheToolsCommandlet(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+int32 UShaderPipelineCacheToolsCommandlet::Main(const FString& Params)
+{
+	return StaticMain(Params);
+}
+
+int32 UShaderPipelineCacheToolsCommandlet::StaticMain(const FString& Params)
+{
+	TArray<FString> Tokens;
+	TArray<FString> Switches;
+	TMap<FString, FString> ParamVals;
+	UCommandlet::ParseCommandLine(*Params, Tokens, Switches, ParamVals);
+
+	if (Tokens.Num() >= 1)
+	{
+		ExpandWildcards(Tokens);
+		if (Tokens[0] == TEXT("Expand") && Tokens.Num() >= 4)
+		{
+			Tokens.RemoveAt(0);
+			return ExpandPSOSC(Tokens);
+		}
+		else if (Tokens[0] == TEXT("Build") && Tokens.Num() >= 4)
+		{
+			Tokens.RemoveAt(0);
+			return BuildPSOSC(Tokens);
+		}
+		else if (Tokens[0] == TEXT("Diff") && Tokens.Num() >= 3)
+		{
+			Tokens.RemoveAt(0);
+			return DiffStable(Tokens);
+		}
+		else if (Tokens[0] == TEXT("Dump") && Tokens.Num() >= 2)
+		{
+			Tokens.RemoveAt(0);
+			for (int32 Index = 0; Index < Tokens.Num(); Index++)
+			{
+				if (Tokens[Index].EndsWith(TEXT(".upipelinecache")))
+				{
+					return DumpPSOSC(Tokens[Index]);
+				}
+				if (Tokens[Index].EndsWith(TEXT(".scl.csv")))
+				{
+					return DumpSCLCSV(Tokens[Index]);
+				}
+			}
+		}
+	}
+	
+	UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("Usage: Dump ShaderCache1.upipelinecache SCLInfo2.scl.csv [...]]\n"));
+	UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("Usage: Diff ShaderCache1.stablepc.csv ShaderCache1.stablepc.csv [...]]\n"));
+	UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("Usage: Expand Input1.upipelinecache Dir2/*.upipelinecache InputSCLInfo1.scl.csv Dir2/*.scl.csv InputSCLInfo3.scl.csv [...] Output.stablepc.csv\n"));
+	UE_LOG(LogShaderPipelineCacheTools, Warning, TEXT("Usage: Build Input.stablepc.csv InputDir2/*.stablepc.csv InputSCLInfo1.scl.csv Dir2/*.scl.csv InputSCLInfo3.scl.csv [...] Output.upipelinecache\n"));
+	return 0;
+}
diff --git a/Engine/Source/Editor/UnrealEd/Private/Commandlets/StabilizeLocalizationKeys.cpp b/Engine/Source/Editor/UnrealEd/Private/Commandlets/StabilizeLocalizationKeys.cpp
index 4bc5bb204808..7864ce1c9ca9 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Commandlets/StabilizeLocalizationKeys.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Commandlets/StabilizeLocalizationKeys.cpp
@@ -78,7 +78,7 @@ public:
 		: PackageTextKeyMap(&InOutPackageTextKeyMap)
 		, PackageNamespace(TextNamespaceUtil::EnsurePackageNamespace(InPackage))
 	{
-		ArIsSaving = true;
+		this->SetIsSaving(true);
 
 		TArray<UObject*> AllObjectsInPackage;
 		GetObjectsWithOuter(InPackage, AllObjectsInPackage, true, RF_Transient, EInternalObjectFlags::PendingKill);
diff --git a/Engine/Source/Editor/UnrealEd/Private/CookOnTheFlyServer.cpp b/Engine/Source/Editor/UnrealEd/Private/CookOnTheFlyServer.cpp
index 296a4678dc45..1fb8107d806b 100644
--- a/Engine/Source/Editor/UnrealEd/Private/CookOnTheFlyServer.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/CookOnTheFlyServer.cpp
@@ -92,6 +92,8 @@
 
 #include "Async/ParallelFor.h"
 
+#include "Commandlets/ShaderPipelineCacheToolsCommandlet.h"
+
 #define LOCTEXT_NAMESPACE "Cooker"
 
 DEFINE_LOG_CATEGORY_STATIC(LogCook, Log, All);
@@ -101,6 +103,21 @@ DEFINE_LOG_CATEGORY_STATIC(LogCook, Log, All);
 
 #define PROFILE_NETWORK 0
 
+
+#define COOKER_DISPLAY_REMAINING 1
+#define COOKER_DISPLAY_PACKAGE_NAME 2
+int32 GCookProgressDisplay = COOKER_DISPLAY_REMAINING;
+static FAutoConsoleVariableRef CVarCookDisplayMode(
+	TEXT("cook.displaymode"),
+	GCookProgressDisplay,
+	TEXT("Controls the display for cooker logging of packages:\n")
+	TEXT("  0: No display\n")
+	TEXT("  1: Display packages remaining\n")
+	TEXT("  2: Display each package by name\n")
+	TEXT("  3: Both\n"),
+	ECVF_Default);
+
+
 #if OUTPUT_TIMING
 #include "ProfilingDebugging/ScopedTimers.h"
 
@@ -1132,7 +1149,7 @@ public:
 		, RootSet(InRootSet)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsSaving = true;
+		this->SetIsSaving(true);
 
 		for ( UObject* Object : RootSet )
 		{
@@ -1325,10 +1342,14 @@ bool UCookOnTheFlyServer::ContainsRedirector(const FName& PackageName, TMap<FNam
 
 				if (!bDestinationValid)
 				{
-					FName StandardPackageName = GetCachedStandardPackageFileFName(FName(*FPackageName::ObjectPathToPackageName(RedirectedPathString)));
-					if (StandardPackageName != NAME_None)
+					// we can;t call GetCachedStandardPackageFileFName with None
+					if (RedirectedPath != NAME_None)
 					{
-						bDestinationValid = true;
+						FName StandardPackageName = GetCachedStandardPackageFileFName(FName(*FPackageName::ObjectPathToPackageName(RedirectedPathString)));
+						if (StandardPackageName != NAME_None)
+						{
+							bDestinationValid = true;
+						}
 					}
 				}
 
@@ -1380,6 +1401,13 @@ FString UCookOnTheFlyServer::GetBaseDirectoryForDLC() const
 	return FPaths::ProjectPluginsDir() / CookByTheBookOptions->DlcName;
 }
 
+FString UCookOnTheFlyServer::GetContentDirecctoryForDLC() const
+{
+	TSharedPtr<IPlugin> Plugin = IPluginManager::Get().FindPlugin(CookByTheBookOptions->DlcName);
+	check(Plugin.IsValid());
+	return Plugin->GetContentDir();
+}
+
 COREUOBJECT_API extern bool GOutputCookingWarnings;
 
 bool UCookOnTheFlyServer::RequestPackage(const FName& StandardPackageFName, const TArray<FName>& TargetPlatforms, const bool bForceFrontOfQueue)
@@ -1504,6 +1532,12 @@ uint32 UCookOnTheFlyServer::TickCookOnTheSide( const float TimeSlice, uint32 &Co
 
 	while (!GIsRequestingExit || CurrentCookMode == ECookMode::CookByTheBook)
 	{
+		if (CookRequests.Num() > 0)
+		{
+			UE_CLOG(!(TickFlags & ECookTickFlags::HideProgressDisplay) && (GCookProgressDisplay & COOKER_DISPLAY_REMAINING), 
+			LogCook, Display, TEXT("Cooked packages %d Packages Remain %d Total %d"), CookedPackages.Num(), CookRequests.Num(), CookedPackages.Num() + CookRequests.Num());
+		}
+
 		// if we just cooked a map then don't process anything the rest of this tick
 		if ( Result & COSR_RequiresGC )
 		{
@@ -2279,7 +2313,7 @@ bool UCookOnTheFlyServer::SaveCookedPackages(TArray<UPackage*>& PackagesToSave,
 
 			if ( HasCheckedAllPackagesAreCached && (AllObjectsCookedDataCached == false) )
 			{
-				UE_LOG(LogCook, Display, TEXT("Forcing save package %s because was already requeued once"), *PackageFName.ToString());
+				UE_LOG(LogCook, Verbose, TEXT("Forcing save package %s because was already requeued once"), *PackageFName.ToString());
 			}
 
 
@@ -2307,7 +2341,21 @@ bool UCookOnTheFlyServer::SaveCookedPackages(TArray<UPackage*>& PackagesToSave,
 				SaveFlags |= KeepEditorOnlyPackages ? SAVE_KeepEditorOnlyCookedPackages : SAVE_None;
 
 				GOutputCookingWarnings = IsCookFlagSet(ECookInitializationFlags::OutputVerboseCookerWarnings);
-				SaveCookedPackage(Package, SaveFlags, SaveTargetPlatformNames, SavePackageResults);
+				try
+				{
+					SaveCookedPackage(Package, SaveFlags, SaveTargetPlatformNames, SavePackageResults);
+				}
+				catch (std::exception& e)
+				{
+					FString TargetPlatforms;
+					for ( const FName& PlatformFName : SaveTargetPlatformNames )
+					{
+						TargetPlatforms += FString::Printf( TEXT("%s, "), *PlatformFName.ToString());
+					}
+					UE_LOG(LogCook, Warning, TEXT("Tried to save package %s for target platforms %s but threw an exception"), *Package->GetPathName(), *TargetPlatforms);
+					throw e;
+				}
+				
 				GOutputCookingWarnings = false;
 				check(SaveTargetPlatformNames.Num() == SavePackageResults.Num());
 				for (int iResultIndex = 0; iResultIndex < SavePackageResults.Num(); iResultIndex++)
@@ -2430,7 +2478,7 @@ void UCookOnTheFlyServer::PostLoadPackageFixup(UPackage* Package)
 			if (World->GetStreamingLevels().Num())
 			{
 				TSet<FName> NeverCookPackageNames;
-				NeverCookPackageList.GetNames(NeverCookPackageNames);
+				NeverCookPackageList.GetValues(NeverCookPackageNames);
 				//World->LoadSecondaryLevels(true, &PreviouslyCookedPackages);
 				World->LoadSecondaryLevels(true, &NeverCookPackageNames);
 			}
@@ -3086,6 +3134,169 @@ bool UCookOnTheFlyServer::MakePackageFullyLoaded(UPackage* Package) const
 	return bPackageFullyLoaded;
 }
 
+class FDiffModeCookServerUtils
+{
+	/** Misc / common settings */
+	bool bDiffEnabled;
+	FString PackageFilter;
+
+	/** DumpObjList settings */
+	bool bDumpObjList;
+	FString DumpObjListParams;
+
+	/** DumpObjects settings */
+	bool bDumpObjects;
+	bool bDumpObjectsSorted;
+
+public:
+
+	FDiffModeCookServerUtils()
+	{
+		bDiffEnabled = FParse::Param(FCommandLine::Get(), TEXT("DIFFONLY"));
+		bDumpObjList = false;
+		bDumpObjects = false;
+		bDumpObjectsSorted = false;
+
+		ParseCmds();
+	}
+
+	bool IsRunningCookDiff() const
+	{
+		return bDiffEnabled;
+	}
+
+	void ProcessPackage(UPackage* InPackage)
+	{
+		ConditionallyDumpObjList(InPackage);
+		ConditionallyDumpObjects(InPackage);
+	}
+
+private:
+
+	void RemoveParam(FString& InOutParams, const TCHAR* InParamToRemove)
+	{
+		int32 ParamIndex = InOutParams.Find(InParamToRemove);
+		if (ParamIndex >= 0)
+		{
+			int32 NextParamIndex = InOutParams.Find(TEXT(" -"), ESearchCase::IgnoreCase, ESearchDir::FromStart, ParamIndex + 1);
+			if (NextParamIndex < ParamIndex)
+			{
+				NextParamIndex = InOutParams.Len();
+			}
+			InOutParams = InOutParams.Mid(0, ParamIndex) + InOutParams.Mid(NextParamIndex);
+		}
+	}
+	void ParseDumpObjList(FString InParams)
+	{
+		const TCHAR* PackageFilterParam = TEXT("-packagefilter=");
+		FParse::Value(*InParams, PackageFilterParam, PackageFilter);
+		RemoveParam(InParams, PackageFilterParam);
+
+		// Add support for more parameters here
+		// After all parameters have been parsed and removed, pass the remaining string as objlist params
+		DumpObjListParams = InParams;
+	}
+	void ParseDumpObjects(FString InParams)
+	{
+		const TCHAR* PackageFilterParam = TEXT("-packagefilter=");
+		FParse::Value(*InParams, PackageFilterParam, PackageFilter);
+		RemoveParam(InParams, PackageFilterParam);
+
+		const TCHAR* SortParam = TEXT("sort");
+		bDumpObjectsSorted = FParse::Param(*InParams, SortParam);
+		RemoveParam(InParams, SortParam);
+	}
+
+	void ParseCmds()
+	{
+		const TCHAR* DumpObjListParam = TEXT("dumpobjlist");
+		const TCHAR* DumpObjectsParam = TEXT("dumpobjects");
+
+		FString CmdsText;
+		if (FParse::Value(FCommandLine::Get(), TEXT("-diffcmds="), CmdsText, false))
+		{
+			CmdsText = CmdsText.TrimQuotes();
+			TArray<FString> CmdsList;
+			CmdsText.ParseIntoArray(CmdsList, TEXT(","));
+			for (FString Cmd : CmdsList)
+			{
+				if (Cmd.StartsWith(DumpObjListParam))
+				{
+					bDumpObjList = true;
+					ParseDumpObjList(*Cmd + FCString::Strlen(DumpObjListParam));
+				}
+				else if (Cmd.StartsWith(DumpObjectsParam))
+				{
+					bDumpObjects = true;
+					ParseDumpObjects(*Cmd + FCString::Strlen(DumpObjectsParam));
+				}
+			}
+		}
+	}
+	bool FilterPackageName(UPackage* InPackage, const FString& InWildcard)
+	{
+		bool bInclude = false;
+		FString PackageName = InPackage->GetName();
+		if (PackageName.MatchesWildcard(InWildcard))
+		{
+			bInclude = true;
+		}
+		else if (FPackageName::GetShortName(PackageName).MatchesWildcard(InWildcard))
+		{
+			bInclude = true;
+		}
+		else if (InPackage->LinkerLoad && InPackage->LinkerLoad->Filename.MatchesWildcard(InWildcard))
+		{
+			bInclude = true;
+		}
+		return bInclude;
+	}
+	void ConditionallyDumpObjList(UPackage* InPackage)
+	{
+		if (bDumpObjList)
+		{
+			if (FilterPackageName(InPackage, PackageFilter))
+			{
+				FString ObjListExec = TEXT("OBJ LIST ");
+				ObjListExec += DumpObjListParams;
+
+				TGuardValue<ELogTimes::Type> GuardLogTimes(GPrintLogTimes, ELogTimes::None);
+				TGuardValue<bool> GuardLogCategory(GPrintLogCategory, false);
+				TGuardValue<bool> GuardPrintLogVerbosity(GPrintLogVerbosity, false);
+
+				GEngine->Exec(nullptr, *ObjListExec);
+			}
+		}
+	}
+	void ConditionallyDumpObjects(UPackage* InPackage)
+	{
+		if (bDumpObjects)
+		{
+			if (FilterPackageName(InPackage, PackageFilter))
+			{
+				TArray<FString> AllObjects;
+				for (FObjectIterator It; It; ++It)
+				{
+					AllObjects.Add(*It->GetFullName());
+				}
+				if (bDumpObjectsSorted)
+				{
+					AllObjects.Sort();
+				}
+
+				TGuardValue<ELogTimes::Type> GuardLogTimes(GPrintLogTimes, ELogTimes::None);
+				TGuardValue<bool> GuardLogCategory(GPrintLogCategory, false);
+				TGuardValue<bool> GuardPrintLogVerbosity(GPrintLogVerbosity, false);
+
+				for (const FString& Obj : AllObjects)
+				{
+					UE_LOG(LogCook, Display, TEXT("%s"), *Obj);
+				}
+			}
+		}
+	}
+};
+
 void UCookOnTheFlyServer::SaveCookedPackage(UPackage* Package, uint32 SaveFlags, TArray<FName> &TargetPlatformNames, TArray<FSavePackageResultStruct>& SavePackageResults)
 {
 	check( SavePackageResults.Num() == 0);
@@ -3203,6 +3414,13 @@ void UCookOnTheFlyServer::SaveCookedPackage(UPackage* Package, uint32 SaveFlags,
 				bCookPackage = false;
 			}
 
+			// Check whether or not game-specific behaviour should prevent this package from being cooked for the target platform
+			if (UAssetManager::IsValid() && !UAssetManager::Get().ShouldCookForPlatform(Package, Target))
+			{
+				bCookPackage = false;
+				UE_LOG(LogCook, Display, TEXT("Excluding %s -> %s"), *Package->GetName(), *PlatFilename);
+			}
+
 			if (bCookPackage == true)
 			{
 				bool bPackageFullyLoaded = false;
@@ -3223,7 +3441,7 @@ void UCookOnTheFlyServer::SaveCookedPackage(UPackage* Package, uint32 SaveFlags,
 
 				if (bPackageFullyLoaded)
 				{
-					UE_LOG(LogCook, Display, TEXT("Cooking %s -> %s"), *Package->GetName(), *PlatFilename);
+					UE_CLOG(GCookProgressDisplay & COOKER_DISPLAY_PACKAGE_NAME, LogCook, Display, TEXT("Cooking %s -> %s"), *Package->GetName(), *PlatFilename);
 
 					bool bSwap = (!Target->IsLittleEndian()) ^ (!PLATFORM_LITTLE_ENDIAN);
 
@@ -3257,10 +3475,14 @@ void UCookOnTheFlyServer::SaveCookedPackage(UPackage* Package, uint32 SaveFlags,
 					}
 					else
 					{
+						static FDiffModeCookServerUtils DiffModeHelper;
 						SCOPE_TIMER(GEditorSavePackage);
 						GIsCookerLoadingPackage = true;
-						if (FParse::Param(FCommandLine::Get(), TEXT("DIFFONLY")))
+
+						if (DiffModeHelper.IsRunningCookDiff())
 						{
+							DiffModeHelper.ProcessPackage(Package);
+
 							// When looking for deterministic cook issues, first serialize the package to memory and do a simple diff with the existing package
 							uint32 DiffSaveFlags = SaveFlags | SAVE_DiffOnly;
 							FArchiveDiffMap DiffMap;
@@ -5343,6 +5565,228 @@ const FString UCookOnTheFlyServer::GetCookedAssetRegistryFilename(const FString&
 	return CookedAssetRegistryFilename;
 }
 
+void UCookOnTheFlyServer::InitShaderCodeLibrary(void)
+{
+    const UProjectPackagingSettings* const PackagingSettings = GetDefault<UProjectPackagingSettings>();
+    bool const bCacheShaderLibraries = (CurrentCookMode == ECookMode::CookByTheBook);
+    ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
+    if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
+    {
+        FShaderCodeLibrary::InitForCooking(PackagingSettings->bSharedMaterialNativeLibraries);
+        
+        for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
+        {
+            FString TargetPlatformNameString = TargetPlatformName.ToString();
+            const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
+            
+            TArray<FName> ShaderFormats;
+            TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
+            if (ShaderFormats.Num() > 0)
+			{
+				if (!IsCookFlagSet(ECookInitializationFlags::Iterative))
+				{
+					FShaderCodeLibrary::CleanDirectories(ShaderFormats);
+				}
+				FShaderCodeLibrary::CookShaderFormats(ShaderFormats);
+			}
+        }
+    }
+}
+
+static FString GenerateShaderCodeLibraryName(FString const& Name, bool bIsIterateSharedBuild, bool bIsChildCooker)
+{
+	FString ActualName = (!bIsIterateSharedBuild) ? Name : Name + TEXT("_SC");
+	if (bIsChildCooker)
+	{
+		static FGuid Guid = FGuid::NewGuid();
+		ActualName += TEXT(".") + Guid.ToString();
+	}
+	return ActualName;
+}
+
+void UCookOnTheFlyServer::OpenShaderCodeLibrary(FString const& Name)
+{
+	const UProjectPackagingSettings* const PackagingSettings = GetDefault<UProjectPackagingSettings>();
+    bool const bCacheShaderLibraries = (CurrentCookMode == ECookMode::CookByTheBook);
+    if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
+	{
+		FString ActualName = GenerateShaderCodeLibraryName(Name, IsCookFlagSet(ECookInitializationFlags::IterateSharedBuild), IsChildCooker());
+		
+		// The shader code library directory doesn't matter while cooking
+		FShaderCodeLibrary::OpenLibrary(ActualName, TEXT(""));
+	}
+}
+
+void UCookOnTheFlyServer::ProcessShaderCodeLibraries(const FString& LibraryName)
+{
+	ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
+
+	for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
+	{
+		// make sure we have a registry generate for all the platforms 
+		TArray<FString>* SCLCSVPaths = OutSCLCSVPaths.Find(TargetPlatformName);
+		if (SCLCSVPaths && SCLCSVPaths->Num())
+		{
+			FString TargetPlatformNameString = TargetPlatformName.ToString();
+			const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
+
+			TArray<FName> ShaderFormats;
+			TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
+			for (FName ShaderFormat : ShaderFormats)
+			{
+				const FString Filename = FString::Printf(TEXT("*%s_%s.stablepc.csv"), *LibraryName, *ShaderFormat.ToString());
+				const FString StablePCPath = FPaths::ProjectDir() / TEXT("Build") / TargetPlatform->IniPlatformName() / TEXT("PipelineCaches") / Filename;
+
+				TArray<FString> ExpandedFiles;
+				IFileManager::Get().FindFilesRecursive(ExpandedFiles, *FPaths::GetPath(StablePCPath), *FPaths::GetCleanFilename(StablePCPath), true, false);
+				if (ExpandedFiles.Num())
+				{
+					UE_LOG(LogCook, Display, TEXT("---- Running UShaderPipelineCacheToolsCommandlet for platform %s"), *TargetPlatformName.ToString());
+
+					const FString OutFilename = FString::Printf(TEXT("%s_%s.stable.upipelinecache"), *LibraryName, *ShaderFormat.ToString());
+					const FString PCUncookedPath = FPaths::ProjectDir() / TEXT("Content") / TEXT("PipelineCaches") / TargetPlatform->IniPlatformName() / OutFilename;
+
+					if (IFileManager::Get().FileExists(*PCUncookedPath))
+					{
+						UE_LOG(LogCook, Warning, TEXT("Deleting %s, cooked data doesn't belong here."), *PCUncookedPath);
+						IFileManager::Get().Delete(*PCUncookedPath, false, true);
+					}
+
+					const FString PCCookedPath = ConvertToFullSandboxPath(*PCUncookedPath, true);
+					const FString PCPath = PCCookedPath.Replace(TEXT("[Platform]"), *TargetPlatform->PlatformName());
+
+
+					FString Args(TEXT("build "));
+					Args += StablePCPath;
+
+					int32 NumMatched = 0;
+					for (int32 Index = 0; Index < SCLCSVPaths->Num(); Index++)
+					{
+						if (!(*SCLCSVPaths)[Index].Contains(ShaderFormat.ToString()))
+						{
+							continue;
+						}
+						NumMatched++;
+						Args += TEXT(" ");
+						Args += (*SCLCSVPaths)[Index];
+					}
+					if (!NumMatched)
+					{
+						LogCookerMessage(FString::Printf(TEXT("Shader format %s for platform %s had this file %s, but no .scl.csv files."), *ShaderFormat.ToString(), *TargetPlatformNameString, *StablePCPath), EMessageSeverity::Error);
+						continue;
+					}
+
+					Args += TEXT(" ");
+					Args += PCPath;
+					UE_LOG(LogCook, Display, TEXT("  With Args: %s"), *Args);
+
+					int32 Result = UShaderPipelineCacheToolsCommandlet::StaticMain(Args);
+
+					if (Result)
+					{
+						LogCookerMessage(FString::Printf(TEXT("UShaderPipelineCacheToolsCommandlet failed %d"), Result), EMessageSeverity::Error);
+					}
+					else
+					{
+						UE_LOG(LogCook, Display, TEXT("---- Done running UShaderPipelineCacheToolsCommandlet for platform %s"), *TargetPlatformName.ToString());
+					}
+				}
+			}
+		}
+	}
+}
+
+
+void UCookOnTheFlyServer::SaveShaderCodeLibrary(FString const& Name)
+{
+    const UProjectPackagingSettings* const PackagingSettings = GetDefault<UProjectPackagingSettings>();
+    bool const bCacheShaderLibraries = (CurrentCookMode == ECookMode::CookByTheBook);
+    ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
+    if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
+    {
+        FString ActualName = GenerateShaderCodeLibraryName(Name, IsCookFlagSet(ECookInitializationFlags::IterateSharedBuild), IsChildCooker());
+        
+        // Save shader code map - cleaning directories is deliebrately a separate loop here as we open the cache once per shader platform and we don't assume that they can't be shared across target platforms.
+        for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
+        {
+            FString TargetPlatformNameString = TargetPlatformName.ToString();
+            const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
+            
+            FString BasePath = !IsCookingDLC() ? FPaths::ProjectContentDir() : GetContentDirecctoryForDLC();
+            
+            FString ShaderCodeDir = ConvertToFullSandboxPath(*BasePath, true, TargetPlatformNameString);
+
+			const FString RootMetaDataPath = FPaths::ProjectDir() / TEXT("Metadata") / TEXT("PipelineCaches");
+			const FString MetaDataPathSB = ConvertToFullSandboxPath(*RootMetaDataPath, true);
+			const FString MetaDataPath = MetaDataPathSB.Replace(TEXT("[Platform]"), *TargetPlatform->PlatformName());
+
+            TArray<FName> ShaderFormats;
+            TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
+            if (ShaderFormats.Num() > 0)
+            {
+                bool bSaved = false;
+                if (!IsChildCooker())
+                {
+					FString OutSCLCSVPath;
+                    bSaved = FShaderCodeLibrary::SaveShaderCodeMaster(ShaderCodeDir, MetaDataPath, ShaderFormats, OutSCLCSVPath);
+					if (OutSCLCSVPath.Len())
+					{
+						OutSCLCSVPaths.FindOrAdd(TargetPlatformName).Add(OutSCLCSVPath);
+					}
+                }
+                else
+                {
+                    bSaved = FShaderCodeLibrary::SaveShaderCodeChild(ShaderCodeDir, MetaDataPath, ShaderFormats);
+                }
+                
+                if(!bSaved)
+                {
+                    LogCookerMessage(FString::Printf(TEXT("Shared Material Shader Code Library failed for %s."),*TargetPlatformNameString), EMessageSeverity::Error);
+                }
+				else if (!IsChildCooker())
+				{
+					if (PackagingSettings->bSharedMaterialNativeLibraries)
+					{
+						bSaved = FShaderCodeLibrary::PackageNativeShaderLibrary(ShaderCodeDir, ShaderFormats);
+						if (!bSaved)
+						{
+							// This is fatal - In this case we should cancel any launch on device operation or package write but we don't want to assert and crash the editor
+							LogCookerMessage(FString::Printf(TEXT("Package Native Shader Library failed for %s."), *TargetPlatformNameString), EMessageSeverity::Error);
+						}
+					}
+
+
+				}
+            }
+        }
+        
+        FShaderCodeLibrary::CloseLibrary(ActualName);
+    }
+}
+
+void UCookOnTheFlyServer::CleanShaderCodeLibraries()
+{
+    const UProjectPackagingSettings* const PackagingSettings = GetDefault<UProjectPackagingSettings>();
+    bool const bCacheShaderLibraries = (CurrentCookMode == ECookMode::CookByTheBook);
+    ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
+    // If not iterative and not a child cooker then clean up our temporary files
+    if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode && !IsCookFlagSet(ECookInitializationFlags::Iterative) && !IsChildCooker())
+    {
+        for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
+        {
+            FString TargetPlatformNameString = TargetPlatformName.ToString();
+            const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
+            
+            TArray<FName> ShaderFormats;
+            TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
+            if (ShaderFormats.Num() > 0)
+            {
+                FShaderCodeLibrary::CleanDirectories(ShaderFormats);
+            }
+        }
+    }
+}
+
 void UCookOnTheFlyServer::CookByTheBookFinished()
 {
 	check( IsInGameThread() );
@@ -5357,35 +5801,7 @@ void UCookOnTheFlyServer::CookByTheBookFinished()
 	UCookerSettings const* CookerSettings = GetDefault<UCookerSettings>();
 
 	const UProjectPackagingSettings* const PackagingSettings = GetDefault<UProjectPackagingSettings>();
-	bool const bCacheShaderLibraries = !IsCookingDLC() && (CurrentCookMode == ECookMode::CookByTheBook);
-    bool bShaderLibrarySaved = false;
-	if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
-	{
-		ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
-		
-		// Save shader code map
-		{
-			for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
-			{
-				FString TargetPlatformNameString = TargetPlatformName.ToString();
-				const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
-				FString ShaderCodeDir = ConvertToFullSandboxPath(*FPaths::ProjectContentDir(), true, TargetPlatformNameString);
-				FString DebugShaderCodeDir = ShaderCodeDir + TEXT("ShaderDebug");
-				
-				TArray<FName> ShaderFormats;
-				TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
-				if (ShaderFormats.Num() > 0)
-				{
-					bShaderLibrarySaved = FShaderCodeLibrary::SaveShaderCode(ShaderCodeDir, DebugShaderCodeDir, ShaderFormats);
-					if(!bShaderLibrarySaved)
-					{
-						LogCookerMessage(FString::Printf(TEXT("Shared Material Shader Code Library failed for %s."),*TargetPlatformNameString), EMessageSeverity::Error);
-					}
-				}
-			}
-		}
-	}
-	
+	bool const bCacheShaderLibraries = (CurrentCookMode == ECookMode::CookByTheBook);
 	if (IsChildCooker())
 	{
 		// if we are the child cooker create a list of all the packages which we think wes hould have cooked but didn't
@@ -5402,7 +5818,12 @@ void UCookOnTheFlyServer::CookByTheBookFinished()
 		
 		if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
 		{
+			// Save shader code map
+			FString LibraryName = !IsCookingDLC() ? FApp::GetProjectName() : CookByTheBookOptions->DlcName;
+			SaveShaderCodeLibrary(LibraryName);
+			
 			FShaderCodeLibrary::Shutdown();
+
 		}
 	}
 	else
@@ -5434,34 +5855,20 @@ void UCookOnTheFlyServer::CookByTheBookFinished()
 		// Save modified asset registry with all streaming chunk info generated during cook
 		const FString& SandboxRegistryFilename = GetSandboxAssetRegistryFilename();
 
-		ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
-		if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
+	   	if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
 		{
-			if (PackagingSettings->bSharedMaterialNativeLibraries && bShaderLibrarySaved)
-			{
-				for (const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames)
-				{
-					FString TargetPlatformNameString = TargetPlatformName.ToString();
-					const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformNameString);
-					FString ShaderCodeDir = ConvertToFullSandboxPath(*FPaths::ProjectContentDir(), true, TargetPlatformNameString);
-					FString DebugShaderCodeDir = ShaderCodeDir + TEXT("ShaderDebug");
-					
-					TArray<FName> ShaderFormats;
-					TargetPlatform->GetAllTargetedShaderFormats(ShaderFormats);
-					
-					if(!FShaderCodeLibrary::PackageNativeShaderLibrary(ShaderCodeDir, DebugShaderCodeDir, ShaderFormats))
-					{
-						// This is fatal - In this case we should cancel any launch on device operation or package write but we don't want to assert and crash the editor
-						LogCookerMessage(FString::Printf(TEXT("Package Native Shader Library failed for %s."),*TargetPlatformNameString), EMessageSeverity::Error);
-					}
-				}
-			}
-			
+			// Save shader code map
+			FString LibraryName = !IsCookingDLC() ? FApp::GetProjectName() : CookByTheBookOptions->DlcName;
+			SaveShaderCodeLibrary(LibraryName);
+            CleanShaderCodeLibraries();
+			ProcessShaderCodeLibraries(LibraryName);
+            
 			FShaderCodeLibrary::Shutdown();
 		}				
 		
 		{
 			SCOPE_TIMER(SavingCurrentIniSettings)
+			ITargetPlatformManagerModule& TPM = GetTargetPlatformManagerRef();
 			for ( const FName& TargetPlatformName : CookByTheBookOptions->TargetPlatformNames )
 			{
 				const ITargetPlatform* TargetPlatform = TPM.FindTargetPlatform(TargetPlatformName.ToString());
@@ -5520,7 +5927,7 @@ void UCookOnTheFlyServer::CookByTheBookFinished()
 
 				// ignore packages that weren't cooked because they were only referenced by editor-only properties
 				TSet<FName> UncookedEditorOnlyPackageNames;
-				UncookedEditorOnlyPackages.GetNames(UncookedEditorOnlyPackageNames);
+				UncookedEditorOnlyPackages.GetValues(UncookedEditorOnlyPackageNames);
 				for (FName UncookedEditorOnlyPackage : UncookedEditorOnlyPackageNames)
 				{
 					IgnorePackageNames.Add(UncookedEditorOnlyPackage);
@@ -5554,6 +5961,12 @@ void UCookOnTheFlyServer::CookByTheBookFinished()
 						Generator.WriteCookerOpenOrder();
 					}
 				}
+				{
+					if (FParse::Param(FCommandLine::Get(), TEXT("fastcook")))
+					{
+						FFileHelper::SaveStringToFile(FString(), *(GetSandboxDirectory(PlatformName.ToString()) / TEXT("fastcook.txt")));
+					}
+				}
 				if (IsCreatingReleaseVersion())
 				{
 					const FString VersionedRegistryPath = GetReleaseVersionAssetRegistryPath(CookByTheBookOptions->CreateReleaseVersion, PlatformName);
@@ -5897,9 +6310,9 @@ void UCookOnTheFlyServer::StartCookByTheBook( const FCookByTheBookStartupOptions
 			struct FNeverCookDirectoryWalker : public IPlatformFile::FDirectoryVisitor
 			{
 			private:
-				FThreadSafeNameSet &NeverCookPackageList;
+				FThreadSafeSet<FName> &NeverCookPackageList;
 			public:
-				FNeverCookDirectoryWalker(FThreadSafeNameSet &InNeverCookPackageList) : NeverCookPackageList(InNeverCookPackageList) { }
+				FNeverCookDirectoryWalker(FThreadSafeSet<FName> &InNeverCookPackageList) : NeverCookPackageList(InNeverCookPackageList) { }
 
 				// IPlatformFile::FDirectoryVisitor interface
 				virtual bool Visit(const TCHAR* FilenameOrDirectory, bool bIsDirectory)
@@ -5991,13 +6404,10 @@ void UCookOnTheFlyServer::StartCookByTheBook( const FCookByTheBookStartupOptions
 		}
 	}
 	
-	// shader code sharing does not support multiple packages yet
-	bool const bCacheShaderLibraries = !IsCookingDLC() && (CurrentCookMode == ECookMode::CookByTheBook);
-	if (bCacheShaderLibraries && PackagingSettings->bShareMaterialShaderCode)
-	{
-		FShaderCodeLibrary::InitForCooking(PackagingSettings->bSharedMaterialNativeLibraries);
-	}
-
+	// start shader code library cooking
+	InitShaderCodeLibrary();
+    CleanShaderCodeLibraries();
+	
 	if ( IsCookingDLC() )
 	{
 		// if we are cooking dlc we must be based of a release version cook
@@ -6052,7 +6462,17 @@ void UCookOnTheFlyServer::StartCookByTheBook( const FCookByTheBookStartupOptions
 	// don't resave the global shader map files in dlc
 	if (!IsCookingDLC() && !IsChildCooker() && !(CookByTheBookStartupOptions.CookOptions & ECookByTheBookOptions::ForceDisableSaveGlobalShaders))
 	{
+		OpenShaderCodeLibrary(TEXT("Global"));
+
 		SaveGlobalShaderMapFiles(TargetPlatforms);
+
+		SaveShaderCodeLibrary(TEXT("Global"));
+	}
+	
+	// Open the shader code library for the current project or the current DLC pack, depending on which we are cooking
+    {
+		FString LibraryName = !IsCookingDLC() ? FApp::GetProjectName() : CookByTheBookOptions->DlcName;
+		OpenShaderCodeLibrary(LibraryName);
 	}
 
 	TArray<FName> FilesInPath;
@@ -6094,6 +6514,15 @@ void UCookOnTheFlyServer::StartCookByTheBook( const FCookByTheBookStartupOptions
 		UE_LOG(LogCook, Warning, TEXT("No files found."));
 	}
 
+	if (FParse::Param(FCommandLine::Get(), TEXT("DIFFONLY")) && !FParse::Param(FCommandLine::Get(), TEXT("DIFFNORANDCOOK")))
+	{
+		//randomize the array, taking the Array_Shuffle approach, in order to help bring cooking determinism issues to the surface.
+		for (int32 FileIndex = 0; FileIndex < FilesInPath.Num(); ++FileIndex)
+		{
+			FilesInPath.Swap(FileIndex, FMath::RandRange(0, FilesInPath.Num() - 1));
+		}
+	}
+
 	{
 #if OUTPUT_TIMING
 		SCOPE_TIMER(GenerateLongPackageName);
@@ -6529,7 +6958,7 @@ void UCookOnTheFlyServer::MaybeMarkPackageAsAlreadyLoaded(UPackage *Package)
 	if (NeverCookPackageList.Contains(StandardName))
 	{
 		bShouldMarkAsAlreadyProcessed = true;
-		UE_LOG(LogCook, Display, TEXT("Marking %s as reloading for cooker because it was requested as never cook package."), *StandardName.ToString());
+		UE_LOG(LogCook, Verbose, TEXT("Marking %s as reloading for cooker because it was requested as never cook package."), *StandardName.ToString());
 	}
 
 	if (bShouldMarkAsAlreadyProcessed)
@@ -6808,6 +7237,10 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 				GIsCookerLoadingPackage = true;
 				SCOPE_TIMER(LoadPackage);
 				LoadPackage(nullptr, *BuildFilename, LOAD_None);
+				if (GShaderCompilingManager)
+				{
+					GShaderCompilingManager->ProcessAsyncResults(true, false);
+				}
 				GIsCookerLoadingPackage = false;
 			}
 		}
@@ -6926,6 +7359,7 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 							}
 
 							bool bAllPlatformDataLoaded = true;
+							bool bIsTexture = Obj->IsA(UTexture::StaticClass());
 							for (const ITargetPlatform* TargetPlatform : AllTargetPlatforms)
 							{
 								if (bSaveConcurrent)
@@ -6938,6 +7372,7 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 									GIsCookerLoadingPackage = false;
 								}
 
+								if (!bIsTexture)
 								{
 									SCOPE_TIMER(FullLoadAndSave_BeginCache);
 									Obj->BeginCacheForCookedPlatformData(TargetPlatform);
@@ -7006,6 +7441,10 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 				if (!NeverCookPackageList.Contains(BuildFilenameFName))
 				{
 					LoadPackage(nullptr, *ToLoad, LOAD_None);
+					if (GShaderCompilingManager)
+					{
+						GShaderCompilingManager->ProcessAsyncResults(true, false);
+					}
 				}
 			}
 			GIsCookerLoadingPackage = false;
@@ -7072,11 +7511,39 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 		}
 
 		int64 ParallelSavedPackages = 0;
-		ParallelFor(PackagesToSave.Num(), [this, &PackagesToSave, &AllTargetPlatforms, &ParallelSavedPackages, SaveFlags](int32 PackageIdx)
+		ParallelFor(PackagesToSave.Num(), [this, &PackagesToSave, &AllTargetPlatforms, &ParallelSavedPackages, SaveFlags, bSaveConcurrent](int32 PackageIdx)
 		{
 			UPackage* Package = PackagesToSave[PackageIdx];
 			check(Package);
 
+			// when concurrent saving is supported, precaching will need to be refactored for concurrency
+			if (!bSaveConcurrent)
+			{
+				// precache texture platform data ahead of save
+				const int32 PrecacheOffset = 512;
+				UPackage* PrecachePackage = PackageIdx + PrecacheOffset < PackagesToSave.Num() ? PackagesToSave[PackageIdx + PrecacheOffset] : nullptr;
+				if (PrecachePackage)
+				{
+					TArray<UObject*> ObjsInPackage;
+					{
+						GetObjectsWithOuter(PrecachePackage, ObjsInPackage, false);
+					}
+
+					for (UObject* Obj : ObjsInPackage)
+					{
+						if (Obj->HasAnyFlags(RF_Transient) || !Obj->IsA(UTexture::StaticClass()))
+						{
+							continue;
+						}
+
+						for (const ITargetPlatform* TargetPlatform : AllTargetPlatforms)
+						{
+							Obj->BeginCacheForCookedPlatformData(TargetPlatform);
+						}
+					}
+				}
+			}
+
 			FName PackageName = Package->GetFName();
 			FCachedPackageFilename* CachedPackageFilename = PackageFilenameCache.Find(PackageName);
 			check(CachedPackageFilename);
@@ -7117,11 +7584,14 @@ uint32 UCookOnTheFlyServer::FullLoadAndSave(uint32& CookedPackageCount)
 
 					// don't save Editor resources from the Engine if the target doesn't have editoronly data
 					bool bCookPackage = (!bExcludeFromNonEditorTargets || Target->HasEditorOnlyData());
+					if (UAssetManager::IsValid() && !UAssetManager::Get().ShouldCookForPlatform(Package, Target))
+					{
+						bCookPackage = false;
+					}
+
 					if (bCookPackage)
 					{
 						FString PlatFilename = Filename.Replace(TEXT("[Platform]"), *Target->PlatformName());
-								
-						//UE_LOG(LogCook, Display, TEXT("Cooking %s -> %s"), *Package->GetName(), *PlatFilename);
 
 						bool bSwap = (!Target->IsLittleEndian()) ^ (!PLATFORM_LITTLE_ENDIAN);
 						if (!Target->HasEditorOnlyData())
diff --git a/Engine/Source/Editor/UnrealEd/Private/Dialogs/Dialogs.cpp b/Engine/Source/Editor/UnrealEd/Private/Dialogs/Dialogs.cpp
index 8765c5c6e9f4..35e38a1f2bbc 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Dialogs/Dialogs.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Dialogs/Dialogs.cpp
@@ -11,9 +11,10 @@
 #include "Widgets/Layout/SBorder.h"
 #include "Widgets/Images/SImage.h"
 #include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SScrollBox.h"
 #include "Widgets/Layout/SUniformGridPanel.h"
 #include "Widgets/Input/SButton.h"
-#include "Widgets/Layout/SScrollBox.h"
 #include "Widgets/Input/SCheckBox.h"
 #include "EditorStyleSet.h"
 #include "Editor.h"
@@ -864,50 +865,63 @@ bool PromptUserIfExistingObject( const FString& Name, const FString& Package, co
 
 void SGenericDialogWidget::Construct( const FArguments& InArgs )
 {
-	TSharedPtr< SScrollBox > ScrollBox;
+	TSharedPtr<SWidget> ContentWidget;
+	if (InArgs._UseScrollBox)
+	{
+		ContentWidget = 
+			SNew(SBox)
+			.MaxDesiredHeight(InArgs._ScrollBoxMaxHeight)
+			[
+				SNew(SScrollBox)
+				+SScrollBox::Slot()
+				[
+					InArgs._Content.Widget
+				]
+			];
+	}
+	else
+	{
+		ContentWidget = InArgs._Content.Widget;
+	}
 
 	this->ChildSlot
 	[
 		SNew(SVerticalBox)
 		+SVerticalBox::Slot()
-		.AutoHeight()
-		.MaxHeight(300.0f)
 		[
-			SAssignNew(ScrollBox, SScrollBox)
+			ContentWidget.ToSharedRef()
 		]
 
 		+SVerticalBox::Slot()
-			.HAlign(HAlign_Right)
-			.AutoHeight()
-			.Padding(0.0f, 2.0f, 0.0f, 0.0f)
-			[
-				SNew(SButton)
-					.Text( NSLOCTEXT("UnrealEd", "OK", "OK") )
-					.OnClicked(this, &SGenericDialogWidget::OnOK_Clicked)
-			]
-	];
-
-	ScrollBox->AddSlot()
-	[
-		InArgs._Content.Widget
+		.HAlign(HAlign_Right)
+		.AutoHeight()
+		.Padding(0.0f, 2.0f, 0.0f, 0.0f)
+		[
+			SNew(SButton)
+			.Text( NSLOCTEXT("UnrealEd", "OK", "OK") )
+			.OnClicked(this, &SGenericDialogWidget::OnOK_Clicked)
+		]
 	];
 }
 
-void SGenericDialogWidget::OpenDialog (const FText& InDialogTitle, const TSharedRef< SWidget >& DisplayContent)
+void SGenericDialogWidget::OpenDialog(const FText& InDialogTitle, const TSharedRef< SWidget >& DisplayContent, const FArguments& InArgs)
 {
 	TSharedPtr< SWindow > Window;
 	TSharedPtr< SGenericDialogWidget > GenericDialogWidget;
 
 	Window = SNew(SWindow)
 		.Title(InDialogTitle)
-		.SizingRule( ESizingRule::Autosized )
-		.SupportsMaximize(false) .SupportsMinimize(false)
+		.SizingRule(ESizingRule::Autosized)
+		.SupportsMaximize(false)
+		.SupportsMinimize(false)
 		[
 			SNew( SBorder )
 			.Padding( 4.f )
 			.BorderImage( FEditorStyle::GetBrush( "ToolPanel.GroupBorder" ) )
 			[
 				SAssignNew(GenericDialogWidget, SGenericDialogWidget)
+				.UseScrollBox(InArgs._UseScrollBox)
+				.ScrollBoxMaxHeight(InArgs._ScrollBoxMaxHeight)
 				[
 					DisplayContent
 				]
diff --git a/Engine/Source/Editor/UnrealEd/Private/EditorBuildUtils.cpp b/Engine/Source/Editor/UnrealEd/Private/EditorBuildUtils.cpp
index 35c44d2a0027..f3d282773657 100644
--- a/Engine/Source/Editor/UnrealEd/Private/EditorBuildUtils.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/EditorBuildUtils.cpp
@@ -39,6 +39,8 @@
 #include "MaterialUtilities.h"
 #include "UnrealEngine.h"
 #include "DebugViewModeHelpers.h"
+#include "MaterialStatsCommon.h"
+#include "Materials/MaterialInstance.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogEditorBuildUtils, Log, All);
 
@@ -1149,11 +1151,26 @@ bool FEditorBuildUtils::EditorBuildTextureStreaming(UWorld* InWorld, EViewModeIn
 
 bool FEditorBuildUtils::CompileViewModeShaders(UWorld* InWorld, EViewModeIndex SelectedViewMode)
 {
-	if (!InWorld || SelectedViewMode != VMI_RequiredTextureResolution) return false;
-	const EDebugViewShaderMode ShaderMode = DVSM_RequiredTextureResolution;
+	if (!InWorld)
+	{
+		return false;
+	}
+
+	// This process is incredibly slow for large projects even if we end up compiling no shaders
+	// but isn't essential and we will lazily compile shaders afterwards. This upfront compile
+	// was found to cause minute-long stalls every time the view mode was activated on a simulated
+	// feature level so the check for !bExtractComplexityStats has been removed for shader complexity.
+	//const EShaderPlatform ShaderPlatform = GetFeatureLevelShaderPlatform(FeatureLevel);
+	//bool bIsSimulated = IsSimulatedPlatform(ShaderPlatform);
+	//bool bExtractComplexityStats = bIsSimulated && (SelectedViewMode == VMI_ShaderComplexity || SelectedViewMode == VMI_ShaderComplexityWithQuadOverdraw);
+
+	if (SelectedViewMode != VMI_RequiredTextureResolution)
+	{
+		return false;
+	}
 
-	const EMaterialQualityLevel::Type QualityLevel = GetCachedScalabilityCVars().MaterialQualityLevel;;
 	const ERHIFeatureLevel::Type FeatureLevel = InWorld->FeatureLevel;
+	const EMaterialQualityLevel::Type QualityLevel = GetCachedScalabilityCVars().MaterialQualityLevel;;
 
 	FScopedSlowTask CompileShaderTask(3.f, LOCTEXT("CompileDebugViewModeShaders", "Compiling Missing ViewMode Shaders")); // { Get Used Materials, Sync Pending Shader, Wait for Compilation }
 	CompileShaderTask.MakeDialog(true);
@@ -1168,9 +1185,20 @@ bool FEditorBuildUtils::CompileViewModeShaders(UWorld* InWorld, EViewModeIndex S
 
 	if (Materials.Num())
 	{
-		if (!CompileDebugViewModeShaders(ShaderMode, QualityLevel, FeatureLevel, false, true, Materials, CompileShaderTask))
+		// As mentioned above this is now only done if the SelectedViewMode is VMI_RequiredTextureResolution so removing the unused code
+/*		if (SelectedViewMode == VMI_ShaderComplexity || SelectedViewMode == VMI_ShaderComplexityWithQuadOverdraw)
 		{
-			return false;
+			if (!CompileShadersComplexityViewMode(QualityLevel, FeatureLevel, Materials, CompileShaderTask))
+			{
+				return false;
+			}
+		}
+		else if (SelectedViewMode == VMI_RequiredTextureResolution)*/
+		{
+			if (!CompileDebugViewModeShaders(DVSM_RequiredTextureResolution, QualityLevel, FeatureLevel, false, true, Materials, CompileShaderTask))
+			{
+				return false;
+			}
 		}
 	}
 	else
@@ -1182,4 +1210,116 @@ bool FEditorBuildUtils::CompileViewModeShaders(UWorld* InWorld, EViewModeIndex S
 	return true;
 }
 
+/** classed used to compile shaders for a specific (mobile) platform and copy the number of instruction to the editor-emulated (mobile) platform */
+class FMaterialOfflineCompilation : public FMaterialResource
+{
+public:
+	FMaterialOfflineCompilation() {}
+	virtual ~FMaterialOfflineCompilation() {}
+
+	/** this will pass paths to (eventual) offline shader compilers */
+	virtual void SetupExtaCompilationSettings(const EShaderPlatform Platform, FExtraShaderCompilerSettings& Settings) const override;
+
+	/** this function will copy the number of instruction in each of its shaders to editor's emulated shaders */
+	void CopyPlatformSpecificStats();
+};
+
+void FMaterialOfflineCompilation::SetupExtaCompilationSettings(const EShaderPlatform Platform, FExtraShaderCompilerSettings& Settings) const
+{
+	Settings.OfflineCompilerPath = FMaterialStatsUtils::GetPlatformOfflineCompilerPath(Platform);
+}
+
+bool FEditorBuildUtils::CompileShadersComplexityViewMode(EMaterialQualityLevel::Type QualityLevel, ERHIFeatureLevel::Type FeatureLevel, TSet<UMaterialInterface*>& Materials, FSlowTask& ProgressTask)
+{
+	check(Materials.Num());
+
+	// Finish compiling pending shaders first.
+	if (!WaitForShaderCompilation(LOCTEXT("CompileShaders_Complexity_FinishPendingShadersCompilation", "Waiting For Pending Shaders Compilation"), ProgressTask))
+	{
+		return false;
+	}
+
+	TArray<TSharedPtr<FMaterialOfflineCompilation>> OfflineShaderResources;
+
+	const double StartTime = FPlatformTime::Seconds();
+	const float OneOverNumMaterials = 1.f / (float)Materials.Num();
+
+	const auto SimulatedShaderPlatform = GetFeatureLevelShaderPlatform(FeatureLevel);
+	const auto ShaderPlatform = GetSimulatedPlatform(SimulatedShaderPlatform);
+
+	bool bResult = false;
+
+	// trigger shader compilation/loading for each of the passed materials
+	for (UMaterialInterface* MaterialInterface : Materials)
+	{
+		check(MaterialInterface);
+
+		TSharedPtr<FMaterialOfflineCompilation> SpecialResource = MakeShareable(new FMaterialOfflineCompilation());
+		SpecialResource->SetMaterial(MaterialInterface->GetMaterial(), QualityLevel, true, FeatureLevel, Cast<UMaterialInstance>(MaterialInterface));
+
+		FMaterialShaderMapId ResourceId;
+		SpecialResource->GetShaderMapId(ShaderPlatform, ResourceId);
+		SpecialResource->CacheShaders(ResourceId, ShaderPlatform, false);
+
+		OfflineShaderResources.Add(SpecialResource);
+	}
+
+	// wait for compilation to be done and copy the number of instruction from the compiled shaders to the emulated shader set
+	if (WaitForShaderCompilation(LOCTEXT("CompileDebugViewModeShaders", "Offline Shader Compilation"), ProgressTask))
+	{
+		FSuspendRenderingThread SuspendObject(false);
+
+		for (int32 i = 0; i < OfflineShaderResources.Num(); ++i)
+		{
+			OfflineShaderResources[i]->CopyPlatformSpecificStats();
+		}
+
+		UE_LOG(LogShaders, Display, TEXT("Offline shader compilation took %.3f seconds."), FPlatformTime::Seconds() - StartTime);
+		bResult = true;
+	}
+
+	OfflineShaderResources.Reset();
+	return bResult;
+}
+
+void FMaterialOfflineCompilation::CopyPlatformSpecificStats()
+{
+	auto Quality = GetQualityLevel();
+	auto Feature = GetFeatureLevel();
+
+	FMaterialResource* Resource = GetMaterialInterface()->GetMaterialResource(Feature, Quality);
+
+	if (Resource == nullptr)
+	{
+		return;
+	}
+
+	const FMaterialShaderMap* DstShaderMap = Resource->GetGameThreadShaderMap();
+	const FMaterialShaderMap* SrcShaderMap = GetGameThreadShaderMap();
+
+	if (DstShaderMap == nullptr || SrcShaderMap == nullptr)
+	{
+		return;
+	}
+
+	TMap<FName, FShader*> SrcShaders;
+	SrcShaderMap->GetShaderList(SrcShaders);
+
+	TMap<FName, FShader*> DstShaders;
+	DstShaderMap->GetShaderList(DstShaders);
+
+	for (auto Pair : SrcShaders)
+	{
+		auto *DestinationShaderPtr = DstShaders.Find(Pair.Key);
+		if (DestinationShaderPtr != nullptr)
+		{
+			FShader *DestinationShader = *DestinationShaderPtr;
+			FShader *SourceShader = Pair.Value;
+
+			auto NumInstructions = SourceShader->GetNumInstructions();
+			DestinationShader->SetNumInstructions(NumInstructions);
+		}
+	}
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Editor/UnrealEd/Private/EditorEngine.cpp b/Engine/Source/Editor/UnrealEd/Private/EditorEngine.cpp
index 75b2fed22940..5e8fd3bbf4be 100644
--- a/Engine/Source/Editor/UnrealEd/Private/EditorEngine.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/EditorEngine.cpp
@@ -200,6 +200,8 @@
 #include "DynamicResolutionState.h"
 
 #include "Developer/HotReload/Public/IHotReload.h"
+#include "EditorBuildUtils.h"
+#include "MaterialStatsCommon.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogEditor, Log, All);
 
@@ -600,8 +602,13 @@ void UEditorEngine::InitEditor(IEngineLoop* InEngineLoop)
 
 	if ( FSlateApplication::IsInitialized() )
 	{
-		FSlateApplication::Get().GetRenderer()->SetColorVisionDeficiencyType((uint32)( GetDefault<UEditorStyleSettings>()->ColorVisionDeficiencyPreviewType.GetValue() ));
-		FSlateApplication::Get().EnableMenuAnimations(GetDefault<UEditorStyleSettings>()->bEnableWindowAnimations);
+		const UEditorStyleSettings* EditorSettings = GetDefault<UEditorStyleSettings>();
+		const EColorVisionDeficiency DeficiencyType = EditorSettings->ColorVisionDeficiencyPreviewType;
+		const int32 Severity = EditorSettings->ColorVisionDeficiencySeverity;
+		const bool bCorrectDeficiency = EditorSettings->bColorVisionDeficiencyCorrection;
+		const bool bShowCorrectionWithDeficiency = EditorSettings->bColorVisionDeficiencyCorrectionPreviewWithDeficiency;
+		FSlateApplication::Get().GetRenderer()->SetColorVisionDeficiencyType(DeficiencyType, Severity, bCorrectDeficiency, bShowCorrectionWithDeficiency);
+		FSlateApplication::Get().EnableMenuAnimations(EditorSettings->bEnableWindowAnimations);
 	}
 
 	UEditorStyleSettings* StyleSettings = GetMutableDefault<UEditorStyleSettings>();
@@ -808,13 +815,20 @@ void UEditorEngine::HandlePackageReloaded(const EPackageReloadPhase InPackageRel
 void UEditorEngine::HandleSettingChanged( FName Name )
 {
 	// When settings are reset to default, the property name will be "None" so make sure that case is handled.
-	if (Name == FName(TEXT("ColorVisionDeficiencyPreviewType")) || Name == NAME_None)
+	if (Name == FName(TEXT("ColorVisionDeficiencyPreviewType")) || 
+		Name == FName(TEXT("bColorVisionDeficiencyCorrection")) ||
+		Name == FName(TEXT("bColorVisionDeficiencyCorrectionPreviewWithDeficiency")) ||
+		Name == FName(TEXT("ColorVisionDeficiencySeverity")) ||
+		Name == NAME_None)
 	{
-		uint32 DeficiencyType = (uint32)GetDefault<UEditorStyleSettings>()->ColorVisionDeficiencyPreviewType.GetValue();
-		FSlateApplication::Get().GetRenderer()->SetColorVisionDeficiencyType(DeficiencyType);
-
-		GEngine->Exec(NULL, TEXT("RecompileShaders /Engine/Private/SlateElementPixelShader.usf"));
+		const UEditorStyleSettings* EditorSettings = GetDefault<UEditorStyleSettings>();
+		const EColorVisionDeficiency DeficiencyType = EditorSettings->ColorVisionDeficiencyPreviewType;
+		const int32 Severity = EditorSettings->ColorVisionDeficiencySeverity;
+		const bool bCorrectDeficiency = EditorSettings->bColorVisionDeficiencyCorrection;
+		const bool bShowCorrectionWithDeficiency = EditorSettings->bColorVisionDeficiencyCorrectionPreviewWithDeficiency;
+		FSlateApplication::Get().GetRenderer()->SetColorVisionDeficiencyType(DeficiencyType, Severity, bCorrectDeficiency, bShowCorrectionWithDeficiency);
 	}
+
 	if (Name == FName("SelectionColor") || Name == NAME_None)
 	{
 		// Selection outline color and material color use the same color but sometimes the selected material color can be overidden so these need to be set independently
@@ -7248,12 +7262,18 @@ void UEditorEngine::AutomationLoadMap(const FString& MapName, FString* OutError)
 		FEditorFileUtils::LoadMap(*MapName, bLoadAsTemplate, bShowProgress);
 		bNeedPieStart = true;
 	}
+
 	// special precaution needs to be taken while triggering PIE since it can
 	// fail if there are BP compilation issues
 	if (bNeedPieStart)
 	{
+		UE_LOG(LogEditor, Log, TEXT("Starting PIE for the automation tests for world, %s"), *GWorld->GetMapName());
+
 		FFailedGameStartHandler FailHandler;
-		PlayInEditor(GWorld, /*bInSimulateInEditor=*/false);
+		FPlayInEditorOverrides Overrides;
+		Overrides.bDedicatedServer = false;
+		Overrides.NumberOfClients = 1;
+		PlayInEditor(GWorld, /*bInSimulateInEditor=*/false, Overrides);
 		if (!FailHandler.CanProceed())
 		{
 			*OutError = TEXT("Error encountered.");
@@ -7281,4 +7301,56 @@ void UEditorEngine::OnModuleCompileFinished(const FString& CompilationOutput, EC
 	bIsCompiling = false;
 }
 
+bool UEditorEngine::IsEditorShaderPlatformEmulated(UWorld* World)
+{
+	const EShaderPlatform ShaderPlatform = GetFeatureLevelShaderPlatform(World->FeatureLevel);
+
+	bool bIsSimulated = IsSimulatedPlatform(ShaderPlatform);
+
+	return bIsSimulated;
+}
+
+bool UEditorEngine::IsOfflineShaderCompilerAvailable(UWorld* World)
+{
+	const auto ShaderPlatform = GetFeatureLevelShaderPlatform(World->FeatureLevel);
+
+	const auto RealPlatform = GetSimulatedPlatform(ShaderPlatform);
+
+	return FMaterialStatsUtils::IsPlatformOfflineCompilerAvailable(RealPlatform);
+}
+
+void UEditorEngine::UpdateShaderComplexityMaterials()
+{
+	TSet<UWorld *> WorldSet;
+
+	for (int32 i = 0; i < LevelViewportClients.Num(); ++i)
+	{
+		auto *ViewportClient = LevelViewportClients[i];
+
+		auto ViewMode = ViewportClient->GetViewMode();
+		if (ViewMode == EViewModeIndex::VMI_ShaderComplexity || ViewMode == EViewModeIndex::VMI_ShaderComplexityWithQuadOverdraw)
+		{
+			WorldSet.Add(ViewportClient->GetWorld());
+		}
+	}
+
+	for (auto* SomeWorld : WorldSet)
+	{
+		bool bShadersEmulated = IsEditorShaderPlatformEmulated(SomeWorld);
+		if (bShadersEmulated)
+		{
+			bool bOfflineCompilerAvailable = IsOfflineShaderCompilerAvailable(SomeWorld);
+			if (bOfflineCompilerAvailable)
+			{
+				FEditorBuildUtils::CompileViewModeShaders(SomeWorld, VMI_ShaderComplexity);
+			}
+		}
+	}
+}
+
+void UEditorEngine::OnSceneMaterialsModified()
+{
+	UpdateShaderComplexityMaterials();
+}
+
 #undef LOCTEXT_NAMESPACE 
diff --git a/Engine/Source/Editor/UnrealEd/Private/EditorLevelUtils.cpp b/Engine/Source/Editor/UnrealEd/Private/EditorLevelUtils.cpp
index fa9bbf5236a5..586b4ea74ab7 100644
--- a/Engine/Source/Editor/UnrealEd/Private/EditorLevelUtils.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/EditorLevelUtils.cpp
@@ -422,12 +422,12 @@ ULevelStreaming* UEditorLevelUtils::SetStreamingClassForLevel(ULevelStreaming* I
 	return NewStreamingLevel;
 }
 
-void UEditorLevelUtils::MakeLevelCurrent(ULevel* InLevel)
+void UEditorLevelUtils::MakeLevelCurrent(ULevel* InLevel, bool bEvenIfLocked)
 {
 	if (ensureAsRuntimeWarning(InLevel != nullptr))
 	{
 		// Locked levels can't be made current.
-		if (!FLevelUtils::IsLevelLocked(InLevel))
+		if (bEvenIfLocked || !FLevelUtils::IsLevelLocked(InLevel))
 		{
 			// Make current broadcast if it changed
 			if (InLevel->OwningWorld->SetCurrentLevel(InLevel))
@@ -617,7 +617,9 @@ bool UEditorLevelUtils::RemoveLevelFromWorld(ULevel* InLevel)
 	{
 		if (bRemovingCurrentLevel)
 		{
-			MakeLevelCurrent(OwningWorld->PersistentLevel);
+			// we must set a new level.  It must succeed
+			bool bEvenIfLocked = true;
+			MakeLevelCurrent(OwningWorld->PersistentLevel, bEvenIfLocked);
 		}
 
 		FEditorSupportDelegates::PrepareToCleanseEditorObject.Broadcast(InLevel);
diff --git a/Engine/Source/Editor/UnrealEd/Private/EditorViewportClient.cpp b/Engine/Source/Editor/UnrealEd/Private/EditorViewportClient.cpp
index 521436e0df9a..87abab53caa6 100644
--- a/Engine/Source/Editor/UnrealEd/Private/EditorViewportClient.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/EditorViewportClient.cpp
@@ -1035,9 +1035,11 @@ FSceneView* FEditorViewportClient::CalcSceneView(FSceneViewFamily* ViewFamily, c
 	ViewInitOptions.OverrideLODViewOrigin = FVector::ZeroVector;
 	ViewInitOptions.bUseFauxOrthoViewPos = true;
 
+	ViewInitOptions.FOV = ViewFOV;
 	if (bUseControllingActorViewInfo)
 	{
 		ViewInitOptions.bUseFieldOfViewForLOD = ControllingActorViewInfo.bUseFieldOfViewForLOD;
+		ViewInitOptions.FOV = ControllingActorViewInfo.FOV;
 	}
 
 	ViewInitOptions.OverrideFarClippingPlaneDistance = FarPlane;
@@ -5330,7 +5332,7 @@ void FEditorViewportClient::ProcessScreenShots(FViewport* InViewport)
 		
 		// Done with the request
 		FScreenshotRequest::Reset();
-		FScreenshotRequest::OnScreenshotRequestProcessed().ExecuteIfBound();
+		FScreenshotRequest::OnScreenshotRequestProcessed().Broadcast();
 
 		// Re-enable screen messages - if we are NOT capturing a movie
 		GAreScreenMessagesEnabled = GScreenMessagesRestoreState;
diff --git a/Engine/Source/Editor/UnrealEd/Private/Factories/CSVImportFactory.cpp b/Engine/Source/Editor/UnrealEd/Private/Factories/CSVImportFactory.cpp
index 72bd508110a5..5f649a5e5a21 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Factories/CSVImportFactory.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Factories/CSVImportFactory.cpp
@@ -207,16 +207,19 @@ UObject* UCSVImportFactory::FactoryCreateText(UClass* InClass, UObject* InParent
 			UClass* DataTableClass = UDataTable::StaticClass();
 
 			// If there is an existing table, need to call this to free data memory before recreating object
+			bool bStripFromClientBuilds = false;
 			if(ExistingTable != NULL)
 			{
 				DataTableClass = ExistingTable->GetClass();
 				ExistingTable->EmptyTable();
+				bStripFromClientBuilds = ExistingTable->bStripFromClientBuilds;
 			}
 
 			// Create/reset table
 			UDataTable* NewTable = NewObject<UDataTable>(InParent, DataTableClass, InName, Flags);
 			NewTable->RowStruct = ImportRowStruct;
 			NewTable->AssetImportData->Update(CurrentFilename);
+			NewTable->bStripFromClientBuilds = bStripFromClientBuilds;
 			// Go ahead and create table from string
 			Problems = DoImportDataTable(NewTable, String);
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp b/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp
index 0f32eaa660bb..9637d3dc6d74 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Factories/EditorFactories.cpp
@@ -253,6 +253,8 @@
 #include "Editor/EditorPerProjectUserSettings.h"
 #include "JsonObjectConverter.h"
 #include "MaterialEditorModule.h"
+#include "Factories/CurveLinearColorAtlasFactory.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 #include "Misc/App.h"
 
@@ -1970,6 +1972,61 @@ UObject* UCanvasRenderTarget2DFactoryNew::FactoryCreateNew(UClass* Class,UObject
 	return( Result );
 }
 
+/*-----------------------------------------------------------------------------
+UCurveLinearColorAtlasFactory
+-----------------------------------------------------------------------------*/
+
+UCurveLinearColorAtlasFactory::UCurveLinearColorAtlasFactory(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	SupportedClass = UCurveLinearColorAtlas::StaticClass();
+	bCreateNew = true;
+	bEditAfterNew = true;
+	bEditorImport = false;
+
+	Width = 256;
+	Height = 256;
+	Format = 0;
+}
+
+FText UCurveLinearColorAtlasFactory::GetDisplayName() const
+{
+	return LOCTEXT("CurveAtlas", "Curve Atlas");
+}
+
+uint32 UCurveLinearColorAtlasFactory::GetMenuCategories() const
+{
+	return EAssetTypeCategories::Misc;
+}
+
+UObject* UCurveLinearColorAtlasFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn)
+{
+	// Do not create a texture with bad dimensions.
+	if ((Width & (Width - 1)) || (Height & (Height - 1)))
+	{
+		return nullptr;
+	}
+
+	UCurveLinearColorAtlas* Object = NewObject<UCurveLinearColorAtlas>(InParent, Class, Name, Flags);
+	Object->Source.Init2DWithMipChain(Width, Height, TSF_BGRA8);
+	Object->SrcData.AddUninitialized(Object->TextureSize*Object->TextureSize);
+	uint8* MipData = Object->Source.LockMip(0);
+	for (uint32 y = 0; y < Object->TextureSize; y++)
+	{
+		// Create base mip for the texture we created.
+		FColor Src = FLinearColor::White.ToFColor(false);
+		for (uint32 x = 0; x < Object->TextureSize; x++)
+		{
+			Object->SrcData[x*Object->TextureSize + y] = Src;
+		}
+	}
+	FMemory::Memcpy(MipData, Object->SrcData.GetData(), Object->TextureSize*Object->TextureSize * sizeof(FColor));
+	Object->Source.UnlockMip(0);
+
+	Object->UpdateResource();
+	return Object;
+}
+
 
 /*-----------------------------------------------------------------------------
 	UTextureRenderTargetCubeFactoryNew
@@ -5026,7 +5083,7 @@ UTextureCube* UReimportTextureFactory::CreateTextureCube( UObject* InParent, FNa
 bool UReimportTextureFactory::CanReimport( UObject* Obj, TArray<FString>& OutFilenames )
 {	
 	UTexture* pTex = Cast<UTexture>(Obj);
-	if( pTex && !pTex->IsA<UTextureRenderTarget>() )
+	if( pTex && !pTex->IsA<UTextureRenderTarget>() && !pTex->IsA<UCurveLinearColorAtlas>())
 	{
 		pTex->AssetImportData->ExtractFilenames(OutFilenames);
 		return true;
@@ -5188,7 +5245,8 @@ bool UReimportFbxStaticMeshFactory::CanReimport( UObject* Obj, TArray<FString>&
 				//This mesh was import with a scene import, we cannot reimport it
 				return false;
 			}
-			else if (!FbxAssetImportData)
+
+			if (FPaths::GetExtension(Mesh->AssetImportData->GetFirstFilename()) == TEXT("abc"))
 			{
 				return false;
 			}
@@ -5263,6 +5321,13 @@ EReimportResult::Type UReimportFbxStaticMeshFactory::Reimport( UObject* Obj )
 		ReimportUI->bIsReimport = true;
 		ReimportUI->StaticMeshImportData = ImportData;
 		
+		//Force the bAutoGenerateCollision to false if the Mesh Customize collision is true
+		bool bOldAutoGenerateCollision = ReimportUI->StaticMeshImportData->bAutoGenerateCollision;
+		if (Mesh->bCustomizedCollision)
+		{
+			ReimportUI->StaticMeshImportData->bAutoGenerateCollision = false;
+		}
+		
 		bool bImportOperationCanceled = false;
 		bool bForceImportType = true;
 		bool bShowOptionDialog = true;
@@ -5270,6 +5335,12 @@ EReimportResult::Type UReimportFbxStaticMeshFactory::Reimport( UObject* Obj )
 		bool bIsObjFormat = false;
 		bool bIsAutomated = false;
 		GetImportOptions( FFbxImporter, ReimportUI, bShowOptionDialog, bIsAutomated, Obj->GetPathName(), bOperationCanceled, bOutImportAll, bIsObjFormat, bForceImportType, FBXIT_StaticMesh, Mesh);
+		
+		//Put back the original bAutoGenerateCollision settings since the user cancel the re-import
+		if (bOperationCanceled && Mesh->bCustomizedCollision)
+		{
+			ReimportUI->StaticMeshImportData->bAutoGenerateCollision = bOldAutoGenerateCollision;
+		}
 	}
 	ImportOptions->bCanShowDialog = !IsUnattended;
 	//We do not touch bAutoComputeLodDistances when we re-import, setting it to true will make sure we do not change anything.
diff --git a/Engine/Source/Editor/UnrealEd/Private/Factories/SkeletalMeshImport.cpp b/Engine/Source/Editor/UnrealEd/Private/Factories/SkeletalMeshImport.cpp
index 36791bbd34c2..8c0c3b898778 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Factories/SkeletalMeshImport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Factories/SkeletalMeshImport.cpp
@@ -472,6 +472,7 @@ ExistingSkelMeshData* SaveExistingSkelMeshData(USkeletalMesh* ExistingSkelMesh,
 		ExistingMeshDataPtr = new ExistingSkelMeshData();
 		
 		ExistingMeshDataPtr->UseMaterialNameSlotWorkflow = SkeletalMeshIsUsingMaterialSlotNameWorkflow(ExistingSkelMesh->AssetImportData);
+		ExistingMeshDataPtr->MinLOD = ExistingSkelMesh->MinLod;
 
 		FSkeletalMeshModel* ImportedResource = ExistingSkelMesh->GetImportedModel();
 
@@ -636,6 +637,8 @@ void RestoreExistingSkelMeshData(ExistingSkelMeshData* MeshData, USkeletalMesh*
 		return;
 	}
 
+	SkeletalMesh->MinLod = MeshData->MinLOD;
+
 	//Create a remap material Index use to find the matching section later
 	TArray<int32> RemapMaterial;
 	RemapMaterial.AddZeroed(SkeletalMesh->Materials.Num());
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxFactory.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxFactory.cpp
index f0a353ddcdab..ffd174c01d3e 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxFactory.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxFactory.cpp
@@ -27,6 +27,8 @@
 #include "AssetImportTask.h"
 #include "HAL/FileManager.h"
 
+#include "LODUtilities.h"
+
 #define LOCTEXT_NAMESPACE "FBXFactory"
 
 UFbxFactory::UFbxFactory(const FObjectInitializer& ObjectInitializer)
@@ -441,7 +443,19 @@ UObject* UFbxFactory::FactoryCreateFile
 						for (int32 LODIndex = 1; LODIndex < FbxMeshesLod.Num(); ++LODIndex)
 						{
 							TArray<FbxNode*> &LODMeshesArray = FbxMeshesLod[LODIndex];
-							FbxImporter->ImportStaticMeshAsSingle(InParent, LODMeshesArray, Name, Flags, ImportUI->StaticMeshImportData, NewStaticMesh, LODIndex);
+
+							if (LODMeshesArray[0]->GetMesh() == nullptr)
+							{
+								FbxImporter->AddStaticMeshSourceModelGeneratedLOD(NewStaticMesh, LODIndex);
+							}
+							else
+							{
+								FbxImporter->ImportStaticMeshAsSingle(InParent, LODMeshesArray, Name, Flags, ImportUI->StaticMeshImportData, NewStaticMesh, LODIndex);
+								if (NewStaticMesh && NewStaticMesh->SourceModels.IsValidIndex(LODIndex))
+								{
+									NewStaticMesh->SourceModels[LODIndex].bImportWithBaseMesh = true;
+								}
+							}
 						}
 						
 						//Build the staticmesh
@@ -587,6 +601,21 @@ UObject* UFbxFactory::FactoryCreateFile
 									SuccessfulLodIndex++;
 								}
 							}
+							else if (CreatedObject && SkelMeshNodeArray[0]->GetMesh() == nullptr)
+							{
+								USkeletalMesh* BaseSkeletalMesh = Cast<USkeletalMesh>(CreatedObject);
+								FSkeletalMeshUpdateContext UpdateContext;
+								UpdateContext.SkeletalMesh = BaseSkeletalMesh;
+								//Add a autogenerated LOD to the BaseSkeletalMesh
+								FSkeletalMeshLODInfo& LODInfo = BaseSkeletalMesh->AddLODInfo();
+								LODInfo.ReductionSettings.NumOfTrianglesPercentage = FMath::Pow(0.5f, (float)(SuccessfulLodIndex));
+								LODInfo.ReductionSettings.BaseLOD = 0;
+								LODInfo.bImportWithBaseMesh = true;
+								LODInfo.SourceImportFilename = FString(TEXT(""));
+								FLODUtilities::SimplifySkeletalMeshLOD(UpdateContext, SuccessfulLodIndex, false);
+								ImportedSuccessfulLodIndex = SuccessfulLodIndex;
+								SuccessfulLodIndex++;
+							}
 							else if (CreatedObject) // the base skeletal mesh is imported successfully
 							{
 								USkeletalMesh* BaseSkeletalMesh = Cast<USkeletalMesh>(CreatedObject);
@@ -606,6 +635,9 @@ UObject* UFbxFactory::FactoryCreateFile
 
 								if (bImportSucceeded)
 								{
+									FSkeletalMeshLODInfo* LODInfo = BaseSkeletalMesh->GetLODInfo(SuccessfulLodIndex);
+									LODInfo->bImportWithBaseMesh = true;
+									LODInfo->SourceImportFilename = FString(TEXT(""));
 									ImportedSuccessfulLodIndex = SuccessfulLodIndex;
 									SuccessfulLodIndex++;
 								}
@@ -643,12 +675,13 @@ UObject* UFbxFactory::FactoryCreateFile
 							UnFbx::FFbxImporter::UpdateSkeletalMeshImportData(SkeletalMesh, ImportUI->SkeletalMeshImportData, INDEX_NONE, nullptr, nullptr);
 							
 							//If we have import some morph target we have to rebuild the render resources since morph target are now using GPU
-							if (SkeletalMesh && SkeletalMesh->MorphTargets.Num() > 0)
+							if (SkeletalMesh)// && SkeletalMesh->MorphTargets.Num() > 0)
 							{
 								SkeletalMesh->ReleaseResources();
 								//Rebuild the resources with a post edit change since we have added some morph targets
 								SkeletalMesh->PostEditChange();
 							}
+
 						}
 					}
 				
@@ -751,10 +784,43 @@ UObject* UFbxFactory::RecursiveImportNode(void* VoidFbxImporter, void* VoidNode,
 				FbxImporter->FindAllLODGroupNode(AllNodeInLod, Node, LODIndex);
 				if (AllNodeInLod.Num() > 0)
 				{
-					TmpVoidArray.Empty();
-					for (FbxNode* LodNode : AllNodeInLod)
+					if (AllNodeInLod[0]->GetMesh() == nullptr)
 					{
-						TmpVoidArray.Add(LodNode);
+						UStaticMesh* NewStaticMesh = Cast<UStaticMesh>(CreatedObject);
+						//Add a Lod generated model
+						while (NewStaticMesh->SourceModels.Num() <= LODIndex)
+						{
+							new(NewStaticMesh->SourceModels) FStaticMeshSourceModel();
+						}
+						if (LODIndex - 1 > 0 && (NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles < 1.0f || NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation > 0.0f))
+						{
+							if (NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles < 1.0f)
+							{
+								NewStaticMesh->SourceModels[LODIndex].ReductionSettings.PercentTriangles = NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles * 0.5f;
+							}
+							else if (NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation > 0.0f)
+							{
+								NewStaticMesh->SourceModels[LODIndex].ReductionSettings.MaxDeviation = NewStaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation + 1.0f;
+							}
+						}
+						else
+						{
+							NewStaticMesh->SourceModels[LODIndex].ReductionSettings.PercentTriangles = FMath::Pow(0.5f, (float)LODIndex);
+						}
+					}
+					else
+					{
+						TmpVoidArray.Empty();
+						for (FbxNode* LodNode : AllNodeInLod)
+						{
+							TmpVoidArray.Add(LodNode);
+						}
+						ImportANode(VoidFbxImporter, TmpVoidArray, InParent, InName, Flags, NodeIndex, Total, CreatedObject, LODIndex);
+						UStaticMesh* NewStaticMesh = Cast<UStaticMesh>(CreatedObject);
+						if(NewStaticMesh->SourceModels.IsValidIndex(LODIndex))
+						{
+							NewStaticMesh->SourceModels[LODIndex].bImportWithBaseMesh = true;
+						}
 					}
 					ImportANode(VoidFbxImporter, TmpVoidArray, InParent, InName, Flags, NodeIndex, Total, CreatedObject, LODIndex);
 				}
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainExport.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainExport.cpp
index 9839c80d3846..09e2d9a1bbd0 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainExport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainExport.cpp
@@ -1598,14 +1598,16 @@ FbxNode* FFbxExporter::ExportActor(AActor* Actor, bool bExportComponents, INodeN
 
 		// For cameras and lights: always add a rotation to get the correct coordinate system.
         FTransform RotationDirectionConvert = FTransform::Identity;
-		if (Actor->IsA(ACameraActor::StaticClass()) || Actor->IsA(ALight::StaticClass()))
+		const bool bIsCameraActor = Actor->IsA(ACameraActor::StaticClass());
+		const bool bIsLightActor = Actor->IsA(ALight::StaticClass());
+		if (bIsCameraActor || bIsLightActor)
 		{
-			if (Actor->IsA(ACameraActor::StaticClass()))
+			if (bIsCameraActor)
 			{
                 FRotator Rotator = FFbxDataConverter::GetCameraRotation().GetInverse();
 				RotationDirectionConvert = FTransform(Rotator);
 			}
-			else if (Actor->IsA(ALight::StaticClass()))
+			else if (bIsLightActor)
 			{
 				FRotator Rotator = FFbxDataConverter::GetLightRotation().GetInverse();
 				RotationDirectionConvert = FTransform(Rotator);
@@ -1700,15 +1702,16 @@ FbxNode* FFbxExporter::ExportActor(AActor* Actor, bool bExportComponents, INodeN
 				USceneComponent* Component = ComponentsToExport[CompIndex];
 
                 RotationDirectionConvert = FTransform::Identity;
-                // For cameras and lights: always add a rotation to get the correct coordinate system.
+                // For cameras and lights: always add a rotation to get the correct coordinate system
+				// Unless we are parented to an Actor of the same type, since the rotation direction was already added
 				if (Component->IsA(UCameraComponent::StaticClass()) || Component->IsA(ULightComponent::StaticClass()))
 				{
-					if (Component->IsA(UCameraComponent::StaticClass()))
+					if (!bIsCameraActor && Component->IsA(UCameraComponent::StaticClass()))
 					{
                     	FRotator Rotator = FFbxDataConverter::GetCameraRotation().GetInverse();
 						RotationDirectionConvert = FTransform(Rotator);
 					}
-					else if (Component->IsA(ULightComponent::StaticClass()))
+					else if (!bIsLightActor && Component->IsA(ULightComponent::StaticClass()))
 					{
 						FRotator Rotator = FFbxDataConverter::GetLightRotation().GetInverse();
 						RotationDirectionConvert = FTransform(Rotator);
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainImport.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainImport.cpp
index 8d781c9fe86b..84eeeb602790 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainImport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxMainImport.cpp
@@ -36,6 +36,7 @@ DEFINE_LOG_CATEGORY(LogFbx);
 
 #define LOCTEXT_NAMESPACE "FbxMainImport"
 
+#define GeneratedLODNameSuffix "_GeneratedLOD_"
 namespace UnFbx
 {
 
@@ -1166,6 +1167,8 @@ bool FFbxImporter::ImportFromFile(const FString& Filename, const FString& Type,
 			//Warn the user if there is some geometry that cannot be imported because they are not reference by any scene node attribute
 			ValidateAllMeshesAreReferenceByNodeAttribute();
 
+			ConvertLodPrefixToLodGroup();
+
 			MeshNamesCache.Empty();
 		}
 		
@@ -1542,6 +1545,129 @@ void FFbxImporter::ValidateAllMeshesAreReferenceByNodeAttribute()
 	}
 }
 
+void FFbxImporter::ConvertLodPrefixToLodGroup()
+{
+	const FString LodPrefix = TEXT("LOD");
+	TMap<FString, TArray<uint64>> LodPrefixNodeMap;
+	TMap<uint64, FbxNode*> NodeMap;
+	for (int NodeIndex = 0; NodeIndex < Scene->GetNodeCount(); ++NodeIndex)
+	{
+		FbxNode *SceneNode = Scene->GetNode(NodeIndex);
+		if (SceneNode == nullptr)
+		{
+			continue;
+		}
+		FbxGeometry *NodeGeometry = static_cast<FbxGeometry*>(SceneNode->GetMesh());
+		if (NodeGeometry && NodeGeometry->GetUniqueID() != SceneNode->GetUniqueID())
+		{
+			FString SceneNodeName = UTF8_TO_TCHAR(SceneNode->GetName());
+			if (SceneNodeName.Len() > 5 && SceneNodeName.StartsWith(LodPrefix, ESearchCase::CaseSensitive) && SceneNodeName[4] == '_')
+			{
+				FString LODXNumber = SceneNodeName.RightChop(3).Left(1);
+				if (LODXNumber.IsNumeric())
+				{
+					NodeMap.FindOrAdd(SceneNode->GetUniqueID()) = SceneNode;
+					int32 LodNumber = FPlatformString::Atoi(*FString(&SceneNodeName[3]));
+
+					FString MatchName = SceneNodeName.RightChop(5);
+					if (SceneNode->GetParent())
+					{
+						uint64 ParentUniqueID = SceneNode->GetParent()->GetUniqueID();
+						FString ParentID = FString::FromInt((int32)ParentUniqueID);
+						if (ParentUniqueID > MAX_int32)
+						{
+							ParentID = FString::FromInt((int32)(ParentUniqueID >> 32)) + FString::FromInt((int32)ParentUniqueID);
+						}
+						MatchName += TEXT("_") + ParentID;
+					}
+					TArray<uint64>& LodPrefixNodeValues = LodPrefixNodeMap.FindOrAdd(MatchName);
+					//Add LOD in the correct order
+					if (LodNumber >= LodPrefixNodeValues.Num())
+					{
+						int32 AddCount = LodNumber + 1 - LodPrefixNodeValues.Num();
+						for (int32 AddIndex = 0; AddIndex < AddCount; ++AddIndex)
+						{
+							LodPrefixNodeValues.Add(MAX_uint64);
+						}
+					}
+					LodPrefixNodeValues[LodNumber] = SceneNode->GetUniqueID();
+				}
+			}
+		}
+	}
+	
+	for (const auto& Kvp : LodPrefixNodeMap)
+	{
+		if (Kvp.Value.Num() <= 1)
+		{
+			continue;
+		}
+		//Find the first valid node to be able to discover the parent of this LOD Group
+		const TArray<uint64>& LodGroupNodes = Kvp.Value;
+		FbxNode* FirstNode = nullptr;
+		int32 ValidNodeCount = 0;
+		for (int CurrentLodIndex = 0; CurrentLodIndex < LodGroupNodes.Num(); ++CurrentLodIndex)
+		{
+			if (LodGroupNodes[CurrentLodIndex] != MAX_uint64)
+			{
+				if (FirstNode == nullptr)
+				{
+					FirstNode = NodeMap[LodGroupNodes[CurrentLodIndex]];
+				}
+				ValidNodeCount++;
+			}
+		}
+		//Do not create LODGroup with less then two child
+		if (ValidNodeCount <= 1)
+		{
+			continue;
+		}
+		check(FirstNode != nullptr);
+		//Set the parent node, we assume all node in LodGroupNodes have the same parent
+		FbxNode* ParentNode = FirstNode->GetParent() == nullptr ? Scene->GetRootNode() : FirstNode->GetParent();
+		if (ParentNode->GetNodeAttribute() && ParentNode->GetNodeAttribute()->GetAttributeType() == FbxNodeAttribute::eLODGroup)
+		{
+			//LODGroup already exist no need to create one
+			continue;
+		}
+
+		//Get a valid name for the LODGroup actor
+		FString FbxNodeName = UTF8_TO_TCHAR(FirstNode->GetName());
+		FbxNodeName = FbxNodeName.RightChop(5);
+		FbxNodeName += TEXT("_LodGroup");
+		//Create a LodGroup and child all fbx node to the Group
+		FbxNode* ActorNode = FbxNode::Create(Scene, TCHAR_TO_UTF8(*FbxNodeName));
+		FString FbxLODGroupName = FbxNodeName + TEXT("Attribute");
+		FbxLODGroup *FbxLodGroupAttribute = FbxLODGroup::Create(Scene, TCHAR_TO_UTF8(*FbxLODGroupName));
+		ActorNode->AddNodeAttribute(FbxLodGroupAttribute);
+
+		for (int CurrentLodIndex = 0; CurrentLodIndex < LodGroupNodes.Num(); ++CurrentLodIndex)
+		{
+			if (LodGroupNodes[CurrentLodIndex] == MAX_uint64)
+			{
+				FString FbxGeneratedNodeName = UTF8_TO_TCHAR(FirstNode->GetName());
+				FbxGeneratedNodeName = FbxGeneratedNodeName.RightChop(5);
+				FbxGeneratedNodeName += TEXT(GeneratedLODNameSuffix) + FString::FromInt(CurrentLodIndex);
+				//Generated LOD add dummy FbxNode to tell the import to add such a LOD
+				FbxNode* DummyGeneratedLODActorNode = FbxNode::Create(Scene, TCHAR_TO_UTF8(*FbxGeneratedNodeName));
+				ActorNode->AddChild(DummyGeneratedLODActorNode);
+				continue;
+			}
+			FbxNode* CurrentNode = NodeMap[LodGroupNodes[CurrentLodIndex]];
+			if (CurrentNode->GetParent() != nullptr)
+			{
+				//All parent should be the same for a LOD group
+				check(ParentNode == CurrentNode->GetParent());
+				ParentNode->RemoveChild(CurrentNode);
+			}
+			ActorNode->AddChild(CurrentNode);
+		}
+		//We must have a parent node
+		check(ParentNode != nullptr);
+		ParentNode->AddChild(ActorNode);
+	}
+}
+
 FbxNode *FFbxImporter::RecursiveGetFirstMeshNode(FbxNode* Node, FbxNode* NodeToFind)
 {
 	if (Node->GetMesh() != nullptr)
@@ -1571,6 +1697,23 @@ void FFbxImporter::RecursiveGetAllMeshNode(TArray<FbxNode *> &OutAllNode, FbxNod
 		OutAllNode.Add(Node);
 		return;
 	}
+	else
+	{
+		//Look if its a generated LOD
+		FString FbxGeneratedNodeName = UTF8_TO_TCHAR(Node->GetName());
+		if (FbxGeneratedNodeName.Contains(TEXT(GeneratedLODNameSuffix)))
+		{
+			FString SuffixSearch = TEXT(GeneratedLODNameSuffix);
+			int32 SuffixIndex = FbxGeneratedNodeName.Find(SuffixSearch, ESearchCase::CaseSensitive, ESearchDir::FromEnd);
+			SuffixIndex += SuffixSearch.Len();
+			FString LODXNumber = FbxGeneratedNodeName.RightChop(SuffixIndex).Left(1);
+			if (LODXNumber.IsNumeric())
+			{
+				OutAllNode.Add(Node);
+				return;
+			}
+		}
+	}
 	for (int32 ChildIndex = 0; ChildIndex < Node->GetChildCount(); ++ChildIndex)
 	{
 		RecursiveGetAllMeshNode(OutAllNode, Node->GetChild(ChildIndex));
@@ -1604,12 +1747,16 @@ FbxNode *FFbxImporter::RecursiveFindParentLodGroup(FbxNode *ParentNode)
 
 void FFbxImporter::RecursiveFixSkeleton(FbxNode* Node, TArray<FbxNode*> &SkelMeshes, bool bImportNestedMeshes )
 {
-	for (int32 i = 0; i < Node->GetChildCount(); i++)
+	FbxNodeAttribute* Attr = Node->GetNodeAttribute();
+	bool NodeIsLodGroup = (Attr && (Attr->GetAttributeType() == FbxNodeAttribute::eLODGroup));
+	if (!NodeIsLodGroup)
 	{
-		RecursiveFixSkeleton(Node->GetChild(i), SkelMeshes, bImportNestedMeshes );
+		for (int32 i = 0; i < Node->GetChildCount(); i++)
+		{
+			RecursiveFixSkeleton(Node->GetChild(i), SkelMeshes, bImportNestedMeshes);
+		}
 	}
 
-	FbxNodeAttribute* Attr = Node->GetNodeAttribute();
 	if ( Attr && (Attr->GetAttributeType() == FbxNodeAttribute::eMesh || Attr->GetAttributeType() == FbxNodeAttribute::eNull ) )
 	{
 		if( bImportNestedMeshes  && Attr->GetAttributeType() == FbxNodeAttribute::eMesh )
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSceneImportFactory.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSceneImportFactory.cpp
index 01870a52ef3e..0eef73f818f2 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSceneImportFactory.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSceneImportFactory.cpp
@@ -57,6 +57,7 @@
 #include "Math/UnitConversion.h"
 
 #include "HAL/FileManager.h"
+#include "LODUtilities.h"
 
 #define LOCTEXT_NAMESPACE "FBXSceneImportFactory"
 
@@ -1974,22 +1975,37 @@ UObject* UFbxSceneImportFactory::ImportOneSkeletalMesh(void* VoidRootNodeToImpor
 		else if (NewObject && GlobalImportSettings->bImportSkeletalMeshLODs) // the base skeletal mesh is imported successfully
 		{
 			USkeletalMesh* BaseSkeletalMesh = Cast<USkeletalMesh>(NewObject);
-			FName LODObjectName = NAME_None;
-			//Import skeletal mesh LOD
-			UnFbx::FFbxImporter::FImportSkeletalMeshArgs ImportSkeletalMeshArgs;
-			ImportSkeletalMeshArgs.InParent = BaseSkeletalMesh->GetOutermost();
-			ImportSkeletalMeshArgs.NodeArray = bUseSkelMeshNodePivotArray ? SkelMeshNodePivotArray : SkelMeshNodeArray;
-			ImportSkeletalMeshArgs.Name = LODObjectName;
-			ImportSkeletalMeshArgs.Flags = RF_Transient;
-			ImportSkeletalMeshArgs.TemplateImportData = SkeletalMeshImportData;
-			ImportSkeletalMeshArgs.LodIndex = LODIndex;
-			ImportSkeletalMeshArgs.OutData = &OutData;
-
-			USkeletalMesh *LODObject = FbxImporter->ImportSkeletalMesh(ImportSkeletalMeshArgs);
-			bool bImportSucceeded = FbxImporter->ImportSkeletalMeshLOD(LODObject, BaseSkeletalMesh, LODIndex);
-			if (!bImportSucceeded)
+			if ((bUseSkelMeshNodePivotArray ? SkelMeshNodePivotArray : SkelMeshNodeArray)[0]->GetMesh() == nullptr)
 			{
-				FbxImporter->AddTokenizedErrorMessage(FTokenizedMessage::Create(EMessageSeverity::Error, LOCTEXT("FailedToImport_SkeletalMeshLOD", "Failed to import Skeletal mesh LOD.")), FFbxErrors::SkeletalMesh_LOD_FailedToImport);
+				FSkeletalMeshUpdateContext UpdateContext;
+				UpdateContext.SkeletalMesh = BaseSkeletalMesh;
+				//Add a autogenerated LOD to the BaseSkeletalMesh
+				FSkeletalMeshLODInfo& LODInfo = BaseSkeletalMesh->AddLODInfo();
+				LODInfo.ReductionSettings.NumOfTrianglesPercentage = FMath::Pow(0.5f, (float)(LODIndex));
+				LODInfo.ReductionSettings.BaseLOD = 0;
+				LODInfo.bImportWithBaseMesh = true;
+				LODInfo.SourceImportFilename = FString(TEXT(""));
+				FLODUtilities::SimplifySkeletalMeshLOD(UpdateContext, LODIndex, false);
+			}
+			else
+			{
+				FName LODObjectName = NAME_None;
+				//Import skeletal mesh LOD
+				UnFbx::FFbxImporter::FImportSkeletalMeshArgs ImportSkeletalMeshArgs;
+				ImportSkeletalMeshArgs.InParent = BaseSkeletalMesh->GetOutermost();
+				ImportSkeletalMeshArgs.NodeArray = bUseSkelMeshNodePivotArray ? SkelMeshNodePivotArray : SkelMeshNodeArray;
+				ImportSkeletalMeshArgs.Name = LODObjectName;
+				ImportSkeletalMeshArgs.Flags = RF_Transient;
+				ImportSkeletalMeshArgs.TemplateImportData = SkeletalMeshImportData;
+				ImportSkeletalMeshArgs.LodIndex = LODIndex;
+				ImportSkeletalMeshArgs.OutData = &OutData;
+
+				USkeletalMesh *LODObject = FbxImporter->ImportSkeletalMesh(ImportSkeletalMeshArgs);
+				bool bImportSucceeded = FbxImporter->ImportSkeletalMeshLOD(LODObject, BaseSkeletalMesh, LODIndex);
+				if (!bImportSucceeded)
+				{
+					FbxImporter->AddTokenizedErrorMessage(FTokenizedMessage::Create(EMessageSeverity::Error, LOCTEXT("FailedToImport_SkeletalMeshLOD", "Failed to import Skeletal mesh LOD.")), FFbxErrors::SkeletalMesh_LOD_FailedToImport);
+				}
 			}
 		}
 
@@ -2151,15 +2167,22 @@ UObject* UFbxSceneImportFactory::RecursiveImportNode(void* VoidFbxImporter, void
 					}
 					AllNodeInLod.Empty();
 					FFbxImporter->FindAllLODGroupNode(AllNodeInLod, Node, LODIndex);
-					TmpVoidArray.Empty();
 					if (AllNodeInLod.Num() > 0)
 					{
-						for (FbxNode* LodNode : AllNodeInLod)
+						if (AllNodeInLod[0]->GetMesh() == nullptr)
 						{
-							TmpVoidArray.Add(LodNode);
+							UStaticMesh *BaseStaticMesh = Cast<UStaticMesh>(NewObject);
+							FFbxImporter->AddStaticMeshSourceModelGeneratedLOD(BaseStaticMesh, LODIndex);
+						}
+						else
+						{
+							TmpVoidArray.Empty();
+							for (FbxNode* LodNode : AllNodeInLod)
+							{
+								TmpVoidArray.Add(LodNode);
+							}
+							ImportANode(VoidFbxImporter, TmpVoidArray, Flags, NodeIndex, SceneInfo, OutNodeInfo, PackagePath, Total, NewObject, LODIndex);
 						}
-						
-						ImportANode(VoidFbxImporter, TmpVoidArray, Flags, NodeIndex, SceneInfo, OutNodeInfo, PackagePath, Total, NewObject, ImportedLodIndex++);
 					}
 				}
 			}
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSkeletalMeshImport.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSkeletalMeshImport.cpp
index 0565b58da579..cc2da891dbc7 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSkeletalMeshImport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxSkeletalMeshImport.cpp
@@ -52,6 +52,7 @@
 #include "PhysicsEngine/PhysicsAsset.h"
 #include "Engine/SkeletalMeshSocket.h"
 #include "Assets/ClothingAsset.h"
+#include "LODUtilities.h"
 
 #define LOCTEXT_NAMESPACE "FBXImpoter"
 
@@ -2088,6 +2089,11 @@ USkeletalMesh* UnFbx::FFbxImporter::ReimportSkeletalMesh(USkeletalMesh* Mesh, UF
 
 	if (FbxNodes)
 	{
+		for (int32 LODCounter = 1; LODCounter < Mesh->GetLODNum(); ++LODCounter)
+		{
+			//Reset all import with base mesh flags
+			Mesh->GetLODInfo(LODCounter)->bImportWithBaseMesh = false;
+		}
 		//Empty the morph target before re-importing, it will prevent to have old data that can point on random vertex
 		if (Mesh->MorphTargets.Num() > 0)
 		{
@@ -2124,8 +2130,11 @@ USkeletalMesh* UnFbx::FFbxImporter::ReimportSkeletalMesh(USkeletalMesh* Mesh, UF
 		TArray<FImportMeshLodSectionsData> ImportMeshLodData;
 
 		int32 LODIndex;
+		int32 SuccessfulLodIndex = 0;
+		bool bOperationCanceled = false;
 		for (LODIndex = 0; LODIndex < MaxLODLevel; LODIndex++)
 		{
+			int32 ImportedSuccessfulLodIndex = INDEX_NONE;
 			TArray<FbxNode*> SkelMeshNodeArray;
 			for (int32 j = 0; j < (*FbxNodes).Num(); j++)
 			{
@@ -2162,11 +2171,42 @@ USkeletalMesh* UnFbx::FFbxImporter::ReimportSkeletalMesh(USkeletalMesh* Mesh, UF
 				ImportSkeletalMeshArgs.Flags = RF_Public | RF_Standalone;
 				ImportSkeletalMeshArgs.TemplateImportData = TemplateImportData;
 				ImportSkeletalMeshArgs.LodIndex = LODIndex;
+				ImportSkeletalMeshArgs.bCancelOperation = &bOperationCanceled;
 				ImportSkeletalMeshArgs.ImportMaterialOriginalNameData = &ImportMaterialOriginalNameData;
 				ImportSkeletalMeshArgs.ImportMeshSectionsData = &ImportMeshLodData[0];
 				ImportSkeletalMeshArgs.OutData = &OutData;
 
 				NewMesh = ImportSkeletalMesh( ImportSkeletalMeshArgs );
+				if (bOperationCanceled)
+				{
+					// User cancelled, clean up and return
+					return nullptr;
+				}
+				if (NewMesh)
+				{
+					ImportedSuccessfulLodIndex = SuccessfulLodIndex;
+					SuccessfulLodIndex++;
+				}
+			}
+			else if (NewMesh && ImportOptions->bImportSkeletalMeshLODs && SkelMeshNodeArray[0]->GetMesh() == nullptr)
+			{
+				FSkeletalMeshUpdateContext UpdateContext;
+				UpdateContext.SkeletalMesh = NewMesh;
+				//Add a autogenerated LOD to the BaseSkeletalMesh
+				if(SuccessfulLodIndex >= NewMesh->GetLODNum())
+				{
+					NewMesh->AddLODInfo();
+					check(SuccessfulLodIndex == NewMesh->GetLODNum() - 1);
+				}
+				ImportMeshLodData.AddZeroed();
+				FSkeletalMeshLODInfo* LODInfo = NewMesh->GetLODInfo(SuccessfulLodIndex);
+				LODInfo->ReductionSettings.NumOfTrianglesPercentage = FMath::Pow(0.5f, (float)(SuccessfulLodIndex));
+				LODInfo->ReductionSettings.BaseLOD = 0;
+				FLODUtilities::SimplifySkeletalMeshLOD(UpdateContext, SuccessfulLodIndex, false);
+				LODInfo->bImportWithBaseMesh = true;
+				LODInfo->SourceImportFilename = FString(TEXT(""));
+				ImportedSuccessfulLodIndex = SuccessfulLodIndex;
+				SuccessfulLodIndex++;
 			}
 			else if (NewMesh && ImportOptions->bImportSkeletalMeshLODs) // the base skeletal mesh is imported successfully
 			{
@@ -2180,42 +2220,59 @@ USkeletalMesh* UnFbx::FFbxImporter::ReimportSkeletalMesh(USkeletalMesh* Mesh, UF
 				ImportSkeletalMeshArgs.Name = NAME_None;
 				ImportSkeletalMeshArgs.Flags = RF_Transient;
 				ImportSkeletalMeshArgs.TemplateImportData = TemplateImportData;
-				ImportSkeletalMeshArgs.LodIndex = LODIndex;
+				ImportSkeletalMeshArgs.LodIndex = SuccessfulLodIndex;
+				ImportSkeletalMeshArgs.bCancelOperation = &bOperationCanceled;
 				ImportSkeletalMeshArgs.ImportMaterialOriginalNameData = &ImportMaterialOriginalNameDataLOD;
-				ImportSkeletalMeshArgs.ImportMeshSectionsData = &ImportMeshLodData[LODIndex];
+				ImportSkeletalMeshArgs.ImportMeshSectionsData = &ImportMeshLodData[SuccessfulLodIndex];
 				ImportSkeletalMeshArgs.OutData = &OutData;
 
 				UObject *LODObject = ImportSkeletalMesh( ImportSkeletalMeshArgs );
-				ImportSkeletalMeshLOD( Cast<USkeletalMesh>(LODObject), BaseSkeletalMesh, LODIndex, true, nullptr, TemplateImportData);
+				bool bImportSucceeded = !bOperationCanceled && ImportSkeletalMeshLOD( Cast<USkeletalMesh>(LODObject), BaseSkeletalMesh, SuccessfulLodIndex, false, nullptr, TemplateImportData);
 
-				for (FName MaterialImportNameLOD : ImportMaterialOriginalNameDataLOD)
+				if (bImportSucceeded)
 				{
-					bool bFoundMaterial = false;
-					for (FName MaterialImportName : ImportMaterialOriginalNameData)
+					FSkeletalMeshLODInfo* LODInfo = BaseSkeletalMesh->GetLODInfo(SuccessfulLodIndex);
+					LODInfo->bImportWithBaseMesh = true;
+					LODInfo->SourceImportFilename = FString(TEXT(""));
+					ImportedSuccessfulLodIndex = SuccessfulLodIndex;
+					SuccessfulLodIndex++;
+					for (FName MaterialImportNameLOD : ImportMaterialOriginalNameDataLOD)
 					{
-						if (MaterialImportNameLOD == MaterialImportName)
+						bool bFoundMaterial = false;
+						for (FName MaterialImportName : ImportMaterialOriginalNameData)
 						{
-							bFoundMaterial = true;
-							break;
+							if (MaterialImportNameLOD == MaterialImportName)
+							{
+								bFoundMaterial = true;
+								break;
+							}
+						}
+						if (!bFoundMaterial)
+						{
+							//Add the LOD material at the end of the original array
+							ImportMaterialOriginalNameData.Add(MaterialImportNameLOD);
 						}
 					}
-					if (!bFoundMaterial)
-					{
-						//Add the LOD material at the end of the original array
-						ImportMaterialOriginalNameData.Add(MaterialImportNameLOD);
-					}
 				}
+				else
+				{
+					AddTokenizedErrorMessage(FTokenizedMessage::Create(EMessageSeverity::Error, LOCTEXT("FailedToImport_SkeletalMeshLOD", "Failed to import Skeletal mesh LOD.")), FFbxErrors::SkeletalMesh_LOD_FailedToImport);
+				}
+				
 			}
 
-			// import morph target
-			if ((ImportOptions->bImportSkeletalMeshLODs || LODIndex == 0) &&
-				NewMesh &&
-				ImportOptions->bImportMorph &&
-				NewMesh->GetImportedModel() &&
-				NewMesh->GetImportedModel()->LODModels.IsValidIndex(LODIndex))
+			if (NewMesh)
 			{
-				// @fixme: @question : where do they import this morph? where to? What morph target sets?
-				ImportFbxMorphTarget(SkelMeshNodeArray, NewMesh, NewMesh->GetOutermost(), LODIndex, OutData);
+				// import morph target
+				if ((ImportOptions->bImportSkeletalMeshLODs || LODIndex == 0) &&
+					ImportOptions->bImportMorph &&
+					ImportedSuccessfulLodIndex != INDEX_NONE &&
+					NewMesh->GetImportedModel() &&
+					NewMesh->GetImportedModel()->LODModels.IsValidIndex(LODIndex))
+				{
+					// @fixme: @question : where do they import this morph? where to? What morph target sets?
+					ImportFbxMorphTarget(SkelMeshNodeArray, NewMesh, NewMesh->GetOutermost(), ImportedSuccessfulLodIndex, OutData);
+				}
 			}
 		}
 		if (NewMesh)
diff --git a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxStaticMeshImport.cpp b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxStaticMeshImport.cpp
index c49512f36f02..7f5fcf53171c 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxStaticMeshImport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Fbx/FbxStaticMeshImport.cpp
@@ -984,8 +984,22 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportSceneStaticMesh(uint64 FbxNodeUniqueId
 				{
 					AllNodeInLod.Empty();
 					FindAllLODGroupNode(AllNodeInLod, NodeParent, LODIndex);
-					//For LOD we don't pass the ExistMeshDataPtr
-					ImportStaticMeshAsSingle(Mesh->GetOutermost(), AllNodeInLod, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, FirstBaseMesh, LODIndex, nullptr);
+					if (AllNodeInLod.Num() > 0)
+					{
+						if (AllNodeInLod[0]->GetMesh() == nullptr)
+						{
+							AddStaticMeshSourceModelGeneratedLOD(FirstBaseMesh, LODIndex);
+						}
+						else
+						{
+							//For LOD we don't pass the ExistMeshDataPtr
+							ImportStaticMeshAsSingle(Mesh->GetOutermost(), AllNodeInLod, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, FirstBaseMesh, LODIndex, nullptr);
+							if (FirstBaseMesh->SourceModels.IsValidIndex(LODIndex))
+							{
+								FirstBaseMesh->SourceModels[LODIndex].bImportWithBaseMesh = true;
+							}
+						}
+					}
 				}
 			}
 			if (FirstBaseMesh != nullptr)
@@ -1026,6 +1040,29 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportSceneStaticMesh(uint64 FbxNodeUniqueId
 	return FirstBaseMesh;
 }
 
+void UnFbx::FFbxImporter::AddStaticMeshSourceModelGeneratedLOD(UStaticMesh* StaticMesh, int32 LODIndex)
+{
+	//Add a Lod generated model
+	while (StaticMesh->SourceModels.Num() <= LODIndex)
+	{
+		new(StaticMesh->SourceModels) FStaticMeshSourceModel();
+	}
+	if (LODIndex - 1 > 0 && (StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles < 1.0f || StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation > 0.0f))
+	{
+		if (StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles < 1.0f)
+		{
+			StaticMesh->SourceModels[LODIndex].ReductionSettings.PercentTriangles = StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.PercentTriangles * 0.5f;
+		}
+		else if (StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation > 0.0f)
+		{
+			StaticMesh->SourceModels[LODIndex].ReductionSettings.MaxDeviation = StaticMesh->SourceModels[LODIndex - 1].ReductionSettings.MaxDeviation + 1.0f;
+		}
+	}
+	else
+	{
+		StaticMesh->SourceModels[LODIndex].ReductionSettings.PercentTriangles = FMath::Pow(0.5f, (float)LODIndex);
+	}
+}
 
 UStaticMesh* UnFbx::FFbxImporter::ReimportStaticMesh(UStaticMesh* Mesh, UFbxStaticMeshImportData* TemplateImportData)
 {
@@ -1036,16 +1073,81 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportStaticMesh(UStaticMesh* Mesh, UFbxStat
 	UStaticMesh* NewMesh = NULL;
 
 	// get meshes in Fbx file
-	//the function also fill the collision models, so we can update collision models correctly
-	FillFbxMeshArray(Scene->GetRootNode(), FbxMeshArray, this);
+	bool bImportStaticMeshLODs = ImportOptions->bImportStaticMeshLODs;
+	bool bCombineMeshes = ImportOptions->bCombineToSingle;
+	bool bCombineMeshesLOD = false;
+	TArray<TArray<FbxNode*>> FbxMeshesLod;
+
+	if (bCombineMeshes && !bImportStaticMeshLODs)
+	{
+		//the function also fill the collision models, so we can update collision models correctly
+		FillFbxMeshArray(Scene->GetRootNode(), FbxMeshArray, this);
+	}
+	else
+	{
+		// count meshes in lod groups if we dont care about importing LODs
+		bool bCountLODGroupMeshes = !bImportStaticMeshLODs;
+		int32 NumLODGroups = 0;
+		GetFbxMeshCount(Scene->GetRootNode(), bCountLODGroupMeshes, NumLODGroups);
+		// if there were LODs in the file, do not combine meshes even if requested
+		if (bImportStaticMeshLODs && bCombineMeshes && NumLODGroups > 0)
+		{
+			TArray<FbxNode*> FbxLodGroups;
+			
+			FillFbxMeshAndLODGroupArray(Scene->GetRootNode(), FbxLodGroups, FbxMeshArray);
+			FbxMeshesLod.Add(FbxMeshArray);
+			for (FbxNode* LODGroup : FbxLodGroups)
+			{
+				if (LODGroup->GetNodeAttribute() && LODGroup->GetNodeAttribute()->GetAttributeType() == FbxNodeAttribute::eLODGroup && LODGroup->GetChildCount() > 0)
+				{
+					for (int32 GroupLodIndex = 0; GroupLodIndex < LODGroup->GetChildCount(); ++GroupLodIndex)
+					{
+						if (GroupLodIndex >= MAX_STATIC_MESH_LODS)
+						{
+							AddTokenizedErrorMessage(FTokenizedMessage::Create(EMessageSeverity::Warning, FText::Format(LOCTEXT("ImporterLimits_MaximumStaticMeshLODReach", "Reach the maximum LOD number({0}) for a staticmesh."), FText::AsNumber(MAX_STATIC_MESH_LODS))), FFbxErrors::Generic_Mesh_TooManyLODs);
+							continue;
+						}
+						TArray<FbxNode*> AllNodeInLod;
+						FindAllLODGroupNode(AllNodeInLod, LODGroup, GroupLodIndex);
+						if (AllNodeInLod.Num() > 0)
+						{
+							if (FbxMeshesLod.Num() <= GroupLodIndex)
+							{
+								FbxMeshesLod.Add(AllNodeInLod);
+							}
+							else
+							{
+								TArray<FbxNode*> &LODGroupArray = FbxMeshesLod[GroupLodIndex];
+								for (FbxNode* NodeToAdd : AllNodeInLod)
+								{
+									LODGroupArray.Add(NodeToAdd);
+								}
+							}
+						}
+					}
+				}
+			}
+			bCombineMeshesLOD = true;
+			bCombineMeshes = false;
+			//Set the first LOD
+			FbxMeshArray = FbxMeshesLod[0];
+		}
+		else
+		{
+			FillFbxMeshArray(Scene->GetRootNode(), FbxMeshArray, this);
+		}
+	}
+	
+	
+	
 	
 	// if there is only one mesh, use it without name checking 
 	// (because the "Used As Full Name" option enables users name the Unreal mesh by themselves
-	if (FbxMeshArray.Num() == 1)
+	if (!bCombineMeshesLOD && FbxMeshArray.Num() == 1)
 	{
 		Node = FbxMeshArray[0];
 	}
-	else if(!ImportOptions->bCombineToSingle)
+	else if(!bCombineMeshes && !bCombineMeshesLOD)
 	{
 		// find the Fbx mesh node that the Unreal Mesh matches according to name
 		int32 MeshIndex;
@@ -1090,7 +1192,7 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportStaticMesh(UStaticMesh* Mesh, UFbxStat
 
 	// If there is no match it may be because an LOD group was imported where
 	// the mesh name does not match the file name. This is actually the common case.
-	if (!Node && FbxMeshArray.IsValidIndex(0))
+	if (!bCombineMeshesLOD && !Node && FbxMeshArray.IsValidIndex(0))
 	{
 		FbxNode* BaseLODNode = FbxMeshArray[0];
 		
@@ -1108,7 +1210,42 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportStaticMesh(UStaticMesh* Mesh, UFbxStat
 	struct ExistingStaticMeshData* ExistMeshDataPtr = SaveExistingStaticMeshData(Mesh, ImportOptions, INDEX_NONE);
 
 	TArray<int32> ReimportLodList;
-	if (Node)
+	if (bCombineMeshesLOD)
+	{
+		TArray<FbxNode*> LodZeroNodes;
+		//Import the LOD root
+		if (FbxMeshesLod.Num() > 0)
+		{
+			TArray<FbxNode*> &LODMeshesArray = FbxMeshesLod[0];
+			LodZeroNodes = FbxMeshesLod[0];
+			NewMesh = ImportStaticMeshAsSingle(Mesh->GetOuter(), LODMeshesArray, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, Mesh, 0, ExistMeshDataPtr);
+			ReimportLodList.Add(0);
+		}
+		//Import all LODs
+		for (int32 LODIndex = 1; LODIndex < FbxMeshesLod.Num(); ++LODIndex)
+		{
+			TArray<FbxNode*> &LODMeshesArray = FbxMeshesLod[LODIndex];
+
+			if (LODMeshesArray[0]->GetMesh() == nullptr)
+			{
+				AddStaticMeshSourceModelGeneratedLOD(NewMesh, LODIndex);
+			}
+			else
+			{
+				ImportStaticMeshAsSingle(Mesh->GetOuter(), LODMeshesArray, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, NewMesh, LODIndex, nullptr);
+				ReimportLodList.Add(LODIndex);
+				if (NewMesh && NewMesh->SourceModels.IsValidIndex(LODIndex))
+				{
+					NewMesh->SourceModels[LODIndex].bImportWithBaseMesh = true;
+				}
+			}
+		}
+		if (NewMesh != nullptr)
+		{
+			PostImportStaticMesh(NewMesh, LodZeroNodes);
+		}
+	}
+	else if (Node)
 	{
 		FbxNode* NodeParent = RecursiveFindParentLodGroup(Node->GetParent());
 
@@ -1135,9 +1272,20 @@ UStaticMesh* UnFbx::FFbxImporter::ReimportStaticMesh(UStaticMesh* Mesh, UFbxStat
 					FindAllLODGroupNode(AllNodeInLod, NodeParent, LODIndex);
 					if (AllNodeInLod.Num() > 0)
 					{
-						//For LOD we don't pass the ExistMeshDataPtr
-						ImportStaticMeshAsSingle(Mesh->GetOuter(), AllNodeInLod, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, NewMesh, LODIndex, nullptr);
-						ReimportLodList.Add(LODIndex);
+						if (AllNodeInLod[0]->GetMesh() == nullptr)
+						{
+							AddStaticMeshSourceModelGeneratedLOD(NewMesh, LODIndex);
+						}
+						else
+						{
+							//For LOD we don't pass the ExistMeshDataPtr
+							ImportStaticMeshAsSingle(Mesh->GetOuter(), AllNodeInLod, *Mesh->GetName(), RF_Public | RF_Standalone, TemplateImportData, NewMesh, LODIndex, nullptr);
+							ReimportLodList.Add(LODIndex);
+							if (NewMesh->SourceModels.IsValidIndex(LODIndex))
+							{
+								NewMesh->SourceModels[LODIndex].bImportWithBaseMesh = true;
+							}
+						}
 					}
 				}
 			}
@@ -1204,31 +1352,31 @@ FString GetFbxPropertyStringValue(const FbxProperty& Property)
 	case eFbxBool:
 		{
 			FbxBool BoolValue = Property.Get<FbxBool>();
-			ValueStr = Lex::ToString(BoolValue);
+			ValueStr = LexToString(BoolValue);
 		}
 		break;
 	case eFbxInt:
 		{
 			FbxInt IntValue = Property.Get<FbxInt>();
-			ValueStr = Lex::ToString(IntValue);
+			ValueStr = LexToString(IntValue);
 		}
 		break;
 	case eFbxEnum:
 		{
 			FbxEnum EnumValue = Property.Get<FbxEnum>();
-			ValueStr = Lex::ToString(EnumValue);
+			ValueStr = LexToString(EnumValue);
 		}
 		break;
 	case eFbxFloat:
 		{
 			FbxFloat FloatValue = Property.Get<FbxFloat>();
-			ValueStr = Lex::ToString(FloatValue);
+			ValueStr = LexToString(FloatValue);
 		}
 		break;
 	case eFbxDouble:
 		{
 			FbxDouble DoubleValue = Property.Get<FbxDouble>();
-			ValueStr = Lex::ToString(DoubleValue);
+			ValueStr = LexToString(DoubleValue);
 		}
 		break;
 	case eFbxDouble2:
@@ -1564,7 +1712,15 @@ UStaticMesh* UnFbx::FFbxImporter::ImportStaticMeshAsSingle(UObject* InParent, TA
 				}
 				if (MaterialIndex == INDEX_NONE)
 				{
-					MaterialIndex = PolygonGroupID.GetValue();
+					if (LODIndex > 0 && ExistMeshData != nullptr)
+					{
+						//Do not add Material slot when reimporting a LOD just use the index found in the fbx if valid or use the last MaterialSlot index
+						MaterialIndex = StaticMesh->StaticMaterials.Num() - 1;
+					}
+					else
+					{
+						MaterialIndex = PolygonGroupID.GetValue();
+					}
 				}
 				FMeshSectionInfo Info = StaticMesh->SectionInfoMap.Get(LODIndex, SectionIndex);
 				Info.MaterialIndex = MaterialIndex;
@@ -1631,7 +1787,11 @@ UStaticMesh* UnFbx::FFbxImporter::ImportStaticMeshAsSingle(UObject* InParent, TA
 			SrcModel.BuildSettings.bGenerateLightmapUVs = false;
 		}
 
-		StaticMesh->LODGroup = ImportOptions->StaticMeshLODGroup;
+		//LODGroup should never change during a re-import or when we import a LOD > 0
+		if (LODIndex == 0 && InStaticMesh == nullptr)
+		{
+			StaticMesh->LODGroup = ImportOptions->StaticMeshLODGroup;
+		}
 
 		//Set the Imported version before calling the build
 		//We set it here because the remap index is build in RestoreExistingMeshSettings call before the build
@@ -1642,8 +1802,6 @@ UStaticMesh* UnFbx::FFbxImporter::ImportStaticMeshAsSingle(UObject* InParent, TA
 			RestoreExistingMeshSettings(ExistMeshData, InStaticMesh, StaticMesh->LODGroup != NAME_None ? INDEX_NONE : LODIndex);
 		}
 
-		
-
 		// The code to check for bad lightmap UVs doesn't scale well with number of triangles.
 		// Skip it here because Lightmass will warn about it during a light build anyway.
 		bool bWarnOnBadLightmapUVs = false;
diff --git a/Engine/Source/Editor/UnrealEd/Private/FbxMeshUtils.cpp b/Engine/Source/Editor/UnrealEd/Private/FbxMeshUtils.cpp
index 78b3f3a2e267..2a2bbcb2e7ba 100644
--- a/Engine/Source/Editor/UnrealEd/Private/FbxMeshUtils.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/FbxMeshUtils.cpp
@@ -20,7 +20,7 @@
 #include "Components/SkeletalMeshComponent.h"
 #include "SkelImport.h"
 #include "Rendering/SkeletalMeshModel.h"
-
+#include "EditorFramework/AssetImportData.h"
 #include "DesktopPlatformModule.h"
 
 #if WITH_APEX_CLOTHING
@@ -206,7 +206,11 @@ namespace FbxMeshUtils
 					NotificationInfo.Text = FText::Format(LOCTEXT("LODImportSuccessful", "Mesh for LOD {0} imported successfully!"), FText::AsNumber(LODLevel));
 					NotificationInfo.ExpireDuration = 5.0f;
 					FSlateNotificationManager::Get().AddNotification(NotificationInfo);
-
+					if (BaseStaticMesh->SourceModels.IsValidIndex(LODLevel))
+					{
+						BaseStaticMesh->SourceModels[LODLevel].SourceImportFilename = UAssetImportData::SanitizeImportFilename(Filename, nullptr);
+						BaseStaticMesh->SourceModels[LODLevel].bImportWithBaseMesh = false;
+					}
 					bSuccess = true;
 				}
 				else
@@ -498,7 +502,8 @@ namespace FbxMeshUtils
 					{
 						bSuccess = true;
 						// Set LOD source filename
-						SelectedSkelMesh->GetLODInfo(SelectedLOD)->SourceImportFilename = Filename;
+						SelectedSkelMesh->GetLODInfo(SelectedLOD)->SourceImportFilename = UAssetImportData::SanitizeImportFilename(Filename, nullptr);
+						SelectedSkelMesh->GetLODInfo(SelectedLOD)->bImportWithBaseMesh = false;
 
 						// Notification of success
 						FNotificationInfo NotificationInfo(FText::GetEmpty());
@@ -615,7 +620,18 @@ namespace FbxMeshUtils
 		{
 			if(SkeletalMesh->IsValidLODIndex(LODLevel))
 			{
-				FilenameToImport = SkeletalMesh->GetLODInfo(LODLevel)->SourceImportFilename;
+				FilenameToImport = SkeletalMesh->GetLODInfo(LODLevel)->SourceImportFilename.IsEmpty() ?
+					SkeletalMesh->GetLODInfo(LODLevel)->SourceImportFilename :
+					UAssetImportData::ResolveImportFilename(SkeletalMesh->GetLODInfo(LODLevel)->SourceImportFilename, nullptr);
+			}
+		}
+		else if (StaticMesh)
+		{
+			if (StaticMesh->SourceModels.IsValidIndex(LODLevel))
+			{
+				FilenameToImport = StaticMesh->SourceModels[LODLevel].SourceImportFilename.IsEmpty() ?
+					StaticMesh->SourceModels[LODLevel].SourceImportFilename :
+					UAssetImportData::ResolveImportFilename(StaticMesh->SourceModels[LODLevel].SourceImportFilename, nullptr);
 			}
 		}
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/FeedbackContextEditor.cpp b/Engine/Source/Editor/UnrealEd/Private/FeedbackContextEditor.cpp
index afc440a57383..a19bea30f5ea 100644
--- a/Engine/Source/Editor/UnrealEd/Private/FeedbackContextEditor.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/FeedbackContextEditor.cpp
@@ -17,6 +17,7 @@
 #include "Dialogs/SBuildProgress.h"
 #include "Interfaces/IMainFrameModule.h"
 #include "HAL/PlatformApplicationMisc.h"
+#include "Engine/Engine.h"
 
 /** Called to cancel the slow task activity */
 DECLARE_DELEGATE( FOnCancelClickedDelegate );
@@ -383,9 +384,27 @@ void FFeedbackContextEditor::StartSlowTask( const FText& Task, bool bShowCancelB
 {
 	FFeedbackContext::StartSlowTask( Task, bShowCancelButton );
 
-	// Attempt to parent the slow task window to the slate main frame
 	TSharedPtr<SWindow> ParentWindow;
-	if( FModuleManager::Get().IsModuleLoaded( "MainFrame" ) )
+	if (GEditor)
+	{		
+		// If there is a pie window and it is active attempt to parent any slow task dialogs to it to prevent the game window from falling behind due to a slowtask window opening.
+		if (FWorldContext* PieWorldContext = GEditor->GetPIEWorldContext())
+		{
+			FSlatePlayInEditorInfo* SlatePlayInEditorSession = GEditor->SlatePlayInEditorMap.Find(PieWorldContext->ContextHandle);
+	
+
+			if (SlatePlayInEditorSession && SlatePlayInEditorSession->SlatePlayInEditorWindow.IsValid())
+			{
+				if (FSlateApplication::Get().GetActiveTopLevelWindow() == SlatePlayInEditorSession->SlatePlayInEditorWindow)
+				{
+					ParentWindow = SlatePlayInEditorSession->SlatePlayInEditorWindow.Pin();
+				}
+			}
+		}
+	}
+
+	// Attempt to parent the slow task window to the slate main frame
+	if(!ParentWindow.IsValid() && FModuleManager::Get().IsModuleLoaded( "MainFrame" ) )
 	{
 		IMainFrameModule& MainFrame = FModuleManager::LoadModuleChecked<IMainFrameModule>( "MainFrame" );
 		ParentWindow = MainFrame.GetParentWindow();
diff --git a/Engine/Source/Editor/UnrealEd/Private/HierarchicalLOD.cpp b/Engine/Source/Editor/UnrealEd/Private/HierarchicalLOD.cpp
index b9cd2dbe824f..58736834ef61 100644
--- a/Engine/Source/Editor/UnrealEd/Private/HierarchicalLOD.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/HierarchicalLOD.cpp
@@ -28,8 +28,13 @@
 
 
 #include "HierarchicalLODVolume.h"
+#include "EngineUtils.h"
+#include "FileHelpers.h"
+#include "Serialization/ArchiveObjectCrc32.h"
+#include "IMeshReductionManagerModule.h"
+#include "Engine/HLODProxy.h"
 
-DEFINE_LOG_CATEGORY_STATIC(LogLODGenerator, Warning, All);
+DEFINE_LOG_CATEGORY_STATIC(LogLODGenerator, Log, All);
 
 #define LOCTEXT_NAMESPACE "HierarchicalLOD"
 #define CM_TO_METER		0.01f
@@ -135,120 +140,103 @@ void FHierarchicalLODBuilder::BuildClusters(ULevel* InLevel, const bool bCreateM
 	
 	LODLevelLODActors.Empty();
 	ValidStaticMeshActorsInLevel.Empty();
+	HLODVolumeActors.Empty();
 
 	// I'm using stack mem within this scope of the function
 	// so we need this
 	FMemMark Mark(FMemStack::Get());
 	
-	DeleteLODActors(InLevel, !bCreateMeshes);
+	DeleteLODActors(InLevel);
 	
 	LODLevelLODActors.AddDefaulted(BuildLODLevelSettings.Num());
-	const int32 TotalNumLOD = BuildLODLevelSettings.Num();
+	const int32 NumHLODLevels = BuildLODLevelSettings.Num();
 
 	LODLevelLODActors.Empty();
-	LODLevelLODActors.AddZeroed(TotalNumLOD);
+	LODLevelLODActors.AddZeroed(NumHLODLevels);
 
 	// only build if it's enabled
 	if (InLevel->GetWorldSettings()->bEnableHierarchicalLODSystem && BuildLODLevelSettings.Num() > 0)
 	{
 		if (InLevel->GetWorldSettings()->bGenerateSingleClusterForLevel)
 		{
-			Clusters.Empty();
-
-			ALODActor* PreviousLevelActor = nullptr;
-
-			TArray<AActor*> GenerationActors;
-
-			for (int32 LODId = 0; LODId < TotalNumLOD; ++LODId)
-			{
-				FLODCluster LevelCluster;
-
-				if (PreviousLevelActor == nullptr)
-				{					
-					for (int32 ActorId = 0; ActorId < InLevel->Actors.Num(); ++ActorId)
-					{
-						AActor* Actor = InLevel->Actors[ActorId];
-						if (ShouldGenerateCluster(Actor, !bCreateMeshes, LODId))
-						{
-							FLODCluster ActorCluster(Actor);
-							ValidStaticMeshActorsInLevel.Add(Actor);
-
-							LevelCluster += ActorCluster;
-						}
-						else
-						{
-							GenerationActors.Add(Actor);
-						}
-					}
-				}
-				else
-				{
-					LevelCluster += PreviousLevelActor;
-					// Make sure we take into account previously excluded actors, could be caused by specifically disabled inclusion in previos HLOD level(s)
-					for (int32 ActorIndex = 0; ActorIndex < GenerationActors.Num(); ++ActorIndex)
-					{
-						AActor* Actor = GenerationActors[ActorIndex];
-						if (ShouldGenerateCluster(Actor, !bCreateMeshes, LODId))
-						{
-							FLODCluster ActorCluster(Actor);
-							ValidStaticMeshActorsInLevel.Add(Actor);
-							LevelCluster += ActorCluster;
-							GenerationActors.Remove(Actor);
-							--ActorIndex;
-						}
-					}
-				}
-
-				if (LevelCluster.IsValid())
-				{
-					ALODActor* LODActor = LevelCluster.BuildActor(InLevel, LODId, bCreateMeshes);
-					PreviousLevelActor = LODActor;
-				}
-			}
-		}
+			GenerateAsSingleCluster(NumHLODLevels, InLevel, bCreateMeshes);
+		}		
 		else
 		{
 			// Handle HierachicalLOD volumes first
 			HandleHLODVolumes(InLevel);
 
-			for (int32 LODId = 0; LODId < TotalNumLOD; ++LODId)
+			for (int32 LODId = 0; LODId < NumHLODLevels; ++LODId)
 			{
-				// we use meter for bound. Otherwise it's very easy to get to overflow and have problem with filling ratio because
-				// bound is too huge
-				const float DesiredBoundRadius = BuildLODLevelSettings[LODId].DesiredBoundRadius * CM_TO_METER;
-				const float DesiredFillingRatio = BuildLODLevelSettings[LODId].DesiredFillingPercentage * 0.01f;
-				ensure(DesiredFillingRatio != 0.f);
-				const float HighestCost = FMath::Pow(DesiredBoundRadius, 3) / (DesiredFillingRatio);
-				const int32 MinNumActors = BuildLODLevelSettings[LODId].MinNumberOfActorsToBuild;
-				check(MinNumActors > 0);
-				// test parameter I was playing with to cull adding to the array
-				// intialization can have too many elements, decided to cull
-				// the problem can be that we can create disconnected tree
-				// my assumption is that if the merge cost is too high, then it's not worth merge anyway
-				static int32 CullMultiplier = 1;
-
-				// since to show progress of initialization, I'm scoping it
+				// Reuse clusters from previous HLOD level (only works for HLOD level 1 and beyond)
+				if (BuildLODLevelSettings[LODId].bReusePreviousLevelClusters && LODId > 0)
 				{
-					FString LevelName = FPackageName::GetShortName(InLevel->GetOutermost()->GetName());
-					FFormatNamedArguments Arguments;
-					Arguments.Add(TEXT("LODIndex"), FText::AsNumber(LODId + 1));
-					Arguments.Add(TEXT("LevelName"), FText::FromString(LevelName));
+					for (ALODActor* PreviousLODActor : LODLevelLODActors[LODId - 1])
+					{
+						FLODCluster PreviousActorCluster(PreviousLODActor);
 
-					FScopedSlowTask SlowTask(100, FText::Format(LOCTEXT("HierarchicalLOD_InitializeCluster", "Initializing Clusters for LOD {LODIndex} of {LevelName}..."), Arguments));
-					SlowTask.MakeDialog();
+						if (BuildLODLevelSettings[LODId].bOnlyGenerateClustersForVolumes)
+						{
+							AHierarchicalLODVolume** VolumePtr = HLODVolumeActors.Find(PreviousLODActor);
+							if (VolumePtr)
+							{
+								AHierarchicalLODVolume* Volume = *VolumePtr;
+								for (AActor* Actor : ValidStaticMeshActorsInLevel)
+								{
+									if (ShouldGenerateCluster(Actor, !bCreateMeshes, LODId) && Volume->EncompassesPoint(Actor->GetActorLocation(), Volume->bIncludeOverlappingActors ? Actor->GetComponentsBoundingBox().GetSize().Size() : 0.0f, nullptr))
+									{
+										FLODCluster ActorCluster(Actor);
+										PreviousActorCluster += ActorCluster;
+									}
+								}
+							}
+						}
 
-					// initialize Clusters
-					InitializeClusters(InLevel, LODId, HighestCost*CullMultiplier, !bCreateMeshes, BuildLODLevelSettings[LODId].bOnlyGenerateClustersForVolumes);
+						ALODActor* LODActor = PreviousActorCluster.BuildActor(InLevel, LODId, bCreateMeshes);
+						LODLevelLODActors[LODId].Add(LODActor);
 
-					// move a half way - I know we can do this better but as of now this is small progress
-					SlowTask.EnterProgressFrame(50);
-
-					// now we have all pair of nodes
-					FindMST();
+						ValidStaticMeshActorsInLevel.RemoveAll([PreviousActorCluster](AActor* InActor) { return PreviousActorCluster.Actors.Contains(InActor); });
+					}
 				}
+				else
+				{
+					// we use meter for bound. Otherwise it's very easy to get to overflow and have problem with filling ratio because
+					// bound is too huge
+					const float DesiredBoundRadius = BuildLODLevelSettings[LODId].DesiredBoundRadius * CM_TO_METER;
+					const float DesiredFillingRatio = BuildLODLevelSettings[LODId].DesiredFillingPercentage * 0.01f;
+					ensure(DesiredFillingRatio != 0.f);
+					const float HighestCost = FMath::Pow(DesiredBoundRadius, 3) / (DesiredFillingRatio);
+					const int32 MinNumActors = BuildLODLevelSettings[LODId].MinNumberOfActorsToBuild;
+					check(MinNumActors > 0);
+					// test parameter I was playing with to cull adding to the array
+					// intialization can have too many elements, decided to cull
+					// the problem can be that we can create disconnected tree
+					// my assumption is that if the merge cost is too high, then it's not worth merge anyway
+					static int32 CullMultiplier = 1;
 
-				// now we have to calculate merge clusters and build actors
-				MergeClustersAndBuildActors(InLevel, LODId, HighestCost, MinNumActors, bCreateMeshes);
+					// since to show progress of initialization, I'm scoping it
+					{
+						FString LevelName = FPackageName::GetShortName(InLevel->GetOutermost()->GetName());
+						FFormatNamedArguments Arguments;
+						Arguments.Add(TEXT("LODIndex"), FText::AsNumber(LODId + 1));
+						Arguments.Add(TEXT("LevelName"), FText::FromString(LevelName));
+
+						FScopedSlowTask SlowTask(100, FText::Format(LOCTEXT("HierarchicalLOD_InitializeCluster", "Initializing Clusters for LOD {LODIndex} of {LevelName}..."), Arguments));
+						SlowTask.MakeDialog();
+
+						// initialize Clusters
+						InitializeClusters(InLevel, LODId, HighestCost*CullMultiplier, !bCreateMeshes, BuildLODLevelSettings[LODId].bOnlyGenerateClustersForVolumes);
+
+						// move a half way - I know we can do this better but as of now this is small progress
+						SlowTask.EnterProgressFrame(50);
+
+						// now we have all pair of nodes
+						FindMST();
+					}
+
+					// now we have to calculate merge clusters and build actors
+					MergeClustersAndBuildActors(InLevel, LODId, HighestCost, MinNumActors, bCreateMeshes);
+				}
 			}
 		}
 	}
@@ -268,6 +256,60 @@ void FHierarchicalLODBuilder::BuildClusters(ULevel* InLevel, const bool bCreateM
 	Clusters.Shrink();
 }
 
+void FHierarchicalLODBuilder::GenerateAsSingleCluster(const int32 NumHLODLevels, ULevel* InLevel, const bool bCreateMeshes)
+{
+	Clusters.Empty();
+
+	ALODActor* PreviousLevelActor = nullptr;
+	TArray<AActor*> GenerationActors;
+	for (int32 LODId = 0; LODId < NumHLODLevels; ++LODId)
+	{
+		FLODCluster LevelCluster;
+
+		if (PreviousLevelActor == nullptr)
+		{
+			for (int32 ActorId = 0; ActorId < InLevel->Actors.Num(); ++ActorId)
+			{
+				AActor* Actor = InLevel->Actors[ActorId];
+				if (ShouldGenerateCluster(Actor, !bCreateMeshes, LODId))
+				{
+					FLODCluster ActorCluster(Actor);
+					ValidStaticMeshActorsInLevel.Add(Actor);
+
+					LevelCluster += ActorCluster;
+				}
+				else
+				{
+					GenerationActors.Add(Actor);
+				}
+			}
+		}
+		else
+		{
+			LevelCluster += PreviousLevelActor;
+			// Make sure we take into account previously excluded actors, could be caused by specifically disabled inclusion in previos HLOD level(s)
+			for (int32 ActorIndex = 0; ActorIndex < GenerationActors.Num(); ++ActorIndex)
+			{
+				AActor* Actor = GenerationActors[ActorIndex];
+				if (ShouldGenerateCluster(Actor, !bCreateMeshes, LODId))
+				{
+					FLODCluster ActorCluster(Actor);
+					ValidStaticMeshActorsInLevel.Add(Actor);
+					LevelCluster += ActorCluster;
+					GenerationActors.Remove(Actor);
+					--ActorIndex;
+				}
+			}
+		}
+
+		if (LevelCluster.IsValid())
+		{
+			ALODActor* LODActor = LevelCluster.BuildActor(InLevel, LODId, bCreateMeshes);
+			PreviousLevelActor = LODActor;
+		}
+	}
+}
+
 void FHierarchicalLODBuilder::InitializeClusters(ULevel* InLevel, const int32 LODIdx, float CullCost, const bool bPreviewBuild, bool const bVolumesOnly)
 {
 	SCOPE_LOG_TIME(TEXT("STAT_HLOD_InitializeClusters"), nullptr);
@@ -307,23 +349,30 @@ void FHierarchicalLODBuilder::InitializeClusters(ULevel* InLevel, const int32 LO
 						ValidStaticMeshActorsInLevel.Add(Actor);
 					}
 				}
+				else if ( Actor != nullptr )
+				{
+					ValidStaticMeshActorsInLevel.Add(Actor);
+				}
 			}
 			
-			// Create clusters using actor pairs
-			for (int32 ActorId = 0; ActorId<ValidStaticMeshActorsInLevel.Num(); ++ActorId)
+			if (!bVolumesOnly)
 			{
-				AActor* Actor1 = ValidStaticMeshActorsInLevel[ActorId];
-
-				for (int32 SubActorId = ActorId + 1; SubActorId<ValidStaticMeshActorsInLevel.Num(); ++SubActorId)
+				// Create clusters using actor pairs
+				for (int32 ActorId = 0; ActorId < ValidStaticMeshActorsInLevel.Num(); ++ActorId)
 				{
-					AActor* Actor2 = ValidStaticMeshActorsInLevel[SubActorId];
+					AActor* Actor1 = ValidStaticMeshActorsInLevel[ActorId];
 
-					FLODCluster NewClusterCandidate = FLODCluster(Actor1, Actor2);
-					float NewClusterCost = NewClusterCandidate.GetCost();
-
-					if ( NewClusterCost <= CullCost)
+					for (int32 SubActorId = ActorId + 1; SubActorId < ValidStaticMeshActorsInLevel.Num(); ++SubActorId)
 					{
-						Clusters.Add(NewClusterCandidate);
+						AActor* Actor2 = ValidStaticMeshActorsInLevel[SubActorId];
+
+						FLODCluster NewClusterCandidate = FLODCluster(Actor1, Actor2);
+						float NewClusterCost = NewClusterCandidate.GetCost();
+
+						if (NewClusterCost <= CullCost)
+						{
+							Clusters.Add(NewClusterCandidate);
+						}
 					}
 				}
 			}
@@ -505,7 +554,7 @@ void FHierarchicalLODBuilder::ClearHLODs()
 		bVisibleLevelsWarning |= !Level->bIsVisible;
 		if (Level->bIsVisible)
 		{
-			DeleteLODActors(Level, false);
+			DeleteLODActors(Level);
 		}
 	}
 
@@ -528,7 +577,7 @@ void FHierarchicalLODBuilder::ClearPreviewBuild()
 		bVisibleLevelsWarning |= !Level->bIsVisible;
 		if ( Level->bIsVisible )
 		{
-			DeleteLODActors(Level, true);
+			DeleteLODActors(Level);
 		}		
 	}
 
@@ -577,42 +626,53 @@ void FHierarchicalLODBuilder::BuildMeshesForLODActors(bool bForceAll)
 				if (Actor && Actor->IsA<ALODActor>())
 				{
 					ALODActor* LODActor = CastChecked<ALODActor>(Actor);
-						
-					if (bForceAll || (LODActor->IsDirty() && LODActor->HasValidSubActors()))
+
+					if (bForceAll || (!LODActor->IsBuilt(true) && LODActor->HasValidSubActors()))
 					{
+						// Dirty actors that werent already if we are forcing
+						if(bForceAll && LODActor->IsBuilt())
+						{
+							LODActor->ForceUnbuilt();
+						}
 						LODLevelActors[LODActor->LODLevel - 1].Add(LODActor);
 						NumLODActors++;
 					}
 				}
-			}		
+			}
 
 			// If there are any available process them
-			bool bBuildSuccesfull = true;
+			bool bBuildSuccessful = true;
 			if (NumLODActors)
 			{
-				// Only create the outer package if we are going to save something to it (otherwise we end up with an empty HLOD folder)				
+				// Only create the outer package if we are going to save something to it (otherwise we end up with an empty HLOD folder)
 				const int32 NumLODLevels = LODLevelActors.Num();
-				LevelIter->MarkPackageDirty();
+
+				if(NumLODLevels > 0)
+				{
+					UE_LOG(LogLODGenerator, Log, TEXT("Building HLOD meshes for %s"), *LevelIter->GetOutermost()->GetName());
+				}
 
 				for (int32 LODIndex = 0; LODIndex < NumLODLevels; ++LODIndex)
 				{
-					UPackage* AssetsOuter = Utilities->CreateOrRetrieveLevelHLODPackage(LevelIter, LODIndex);
+					UHLODProxy* Proxy = Utilities->CreateOrRetrieveLevelHLODProxy(LevelIter, LODIndex);
+					UPackage* AssetsOuter = Proxy->GetOutermost();
 					checkf(AssetsOuter != nullptr, TEXT("Failed to created outer for generated HLOD assets"));
+					AssetsOuter->Modify();
 
 					int32 CurrentLODLevel = LODIndex;
 					int32 LODActorIndex = 0;
 					TArray<ALODActor*>& LODLevel = LODLevelActors[CurrentLODLevel];
 					for (ALODActor* Actor : LODLevel)
 					{
-						bBuildSuccesfull &= Utilities->BuildStaticMeshForLODActor(Actor, AssetsOuter, BuildLODLevelSettings[CurrentLODLevel], BaseMaterial);
 						SlowTask.EnterProgressFrame(100.0f / (float)NumLODActors, FText::Format(LOCTEXT("HierarchicalLOD_BuildLODActorMeshesProgress", "Building LODActor Mesh {1} of {2} (LOD Level {0})"), FText::AsNumber(LODIndex + 1), FText::AsNumber(LODActorIndex), FText::AsNumber(LODLevelActors[CurrentLODLevel].Num())));
+						bBuildSuccessful &= Utilities->BuildStaticMeshForLODActor(Actor, AssetsOuter, BuildLODLevelSettings[CurrentLODLevel], BaseMaterial);
 						++LODActorIndex;
 					}
 				}
 			}
-						
-			check(bBuildSuccesfull);
-		}		
+
+			check(bBuildSuccessful);
+		}
 	}
 
 	// Fire map check warnings for hidden levels 
@@ -621,12 +681,79 @@ void FHierarchicalLODBuilder::BuildMeshesForLODActors(bool bForceAll)
 		FMessageLog MapCheck("MapCheck");
 		MapCheck.Warning()
 			->AddToken(FUObjectToken::Create(World->GetWorldSettings()))
-			->AddToken(FTextToken::Create(LOCTEXT("MapCheck_Message_NoBuildHLODHiddenLevels", "Certain levels are marked as hidden, Hierarchical LODs will not be build for hidden levels.")));
+			->AddToken(FTextToken::Create(LOCTEXT("MapCheck_Message_NoBuildHLODHiddenLevels", "Certain levels are marked as hidden, Hierarchical LODs will not be built for hidden levels.")));
 	}
-
 }
 
-void FHierarchicalLODBuilder::DeleteLODActors(ULevel* InLevel, const bool bPreviewOnly)
+void FHierarchicalLODBuilder::SaveMeshesForActors()
+{
+	TArray<UPackage*> PackagesToSave;
+
+	const TArray<ULevel*>& Levels = World->GetLevels();
+	for (const ULevel* Level : Levels)
+	{
+		const TArray<FHierarchicalSimplification>& BuildLODLevelSettings = Level->GetWorldSettings()->GetHierarchicalLODSetup();
+		UMaterialInterface* BaseMaterial = Level->GetWorldSettings()->GetHierarchicalLODBaseMaterial();
+		TArray<TArray<ALODActor*>> LODLevelActors;
+		LODLevelActors.AddDefaulted(BuildLODLevelSettings.Num());
+
+		if (Level->Actors.Num() > 0)
+		{
+			FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
+			IHierarchicalLODUtilities* Utilities = Module.GetUtilities();
+
+			// Retrieve LOD actors from the level
+			uint32 NumLODActors = 0;
+			for (int32 ActorId = 0; ActorId < Level->Actors.Num(); ++ActorId)
+			{
+				AActor* Actor = Level->Actors[ActorId];
+				if (Actor && Actor->IsA<ALODActor>())
+				{
+					ALODActor* LODActor = CastChecked<ALODActor>(Actor);
+						
+					LODLevelActors[LODActor->LODLevel - 1].Add(LODActor);
+					NumLODActors++;
+				}
+			}		
+
+			if (NumLODActors)
+			{
+				const int32 NumLODLevels = LODLevelActors.Num();
+				for (int32 LODIndex = 0; LODIndex < NumLODLevels; ++LODIndex)
+				{
+					UPackage* AssetsOuter = Utilities->RetrieveLevelHLODPackage(Level, LODIndex);
+					if(AssetsOuter)
+					{
+						PackagesToSave.Add(AssetsOuter);
+					}
+				}
+			}
+		}
+
+		// Levels might also need a resave
+		PackagesToSave.Add(Level->GetOutermost());
+	}
+
+	UEditorLoadingAndSavingUtils::SavePackagesWithDialog(PackagesToSave, true);
+}
+
+bool FHierarchicalLODBuilder::NeedsBuild(bool bInForce) const
+{
+	if(World)
+	{
+		for (TActorIterator<ALODActor> HLODIt(World); HLODIt; ++HLODIt)
+		{
+			if (!HLODIt->IsBuilt(bInForce))
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+void FHierarchicalLODBuilder::DeleteLODActors(ULevel* InLevel)
 {
 	FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
 	IHierarchicalLODUtilities* Utilities = Module.GetUtilities();
@@ -636,7 +763,7 @@ void FHierarchicalLODBuilder::DeleteLODActors(ULevel* InLevel, const bool bPrevi
 	for (int32 ActorId = InLevel->Actors.Num() - 1; ActorId >= 0; --ActorId)
 	{
 		ALODActor* LodActor = Cast<ALODActor>(InLevel->Actors[ActorId]);
-		if (LodActor && ((LodActor->GetStaticMeshComponent()->GetStaticMesh() == nullptr && bPreviewOnly) || !bPreviewOnly))
+		if (LodActor)
 		{
 			Utilities->DestroyLODActor(LodActor);
 		}
@@ -651,7 +778,8 @@ void FHierarchicalLODBuilder::BuildMeshForLODActor(ALODActor* LODActor, const ui
 	FHierarchicalLODUtilitiesModule& Module = FModuleManager::LoadModuleChecked<FHierarchicalLODUtilitiesModule>("HierarchicalLODUtilities");
 	IHierarchicalLODUtilities* Utilities = Module.GetUtilities();
 
-	UPackage* AssetsOuter = Utilities->CreateOrRetrieveLevelHLODPackage(LODActor->GetLevel(), LODLevel);
+	UHLODProxy* Proxy = Utilities->CreateOrRetrieveLevelHLODProxy(LODActor->GetLevel(), LODLevel);
+	UPackage* AssetsOuter = Proxy->GetOutermost();
 	const bool bResult = Utilities->BuildStaticMeshForLODActor(LODActor, AssetsOuter, BuildLODLevelSettings[LODLevel], BaseMaterial);
 
 	if (bResult == false)
@@ -745,7 +873,7 @@ void FHierarchicalLODBuilder::MergeClustersAndBuildActors(ULevel* InLevel, const
 
 		if (LODIdx == 0)
 		{
-			for (TPair<AHierarchicalLODVolume*, FLODCluster>& Cluster : HLODVolumeClusters)
+			  for (TPair<AHierarchicalLODVolume*, FLODCluster>& Cluster : HLODVolumeClusters)
 			{
 				Clusters.Add(Cluster.Value);
 			}
@@ -779,6 +907,11 @@ void FHierarchicalLODBuilder::MergeClustersAndBuildActors(ULevel* InLevel, const
 						if (LODActor)
 						{
 							LODLevelLODActors[LODIdx].Add(LODActor);
+
+							if (AHierarchicalLODVolume* const* Volume = HLODVolumeClusters.FindKey(Cluster))
+							{
+								HLODVolumeActors.Add(LODActor, *Volume);
+							}
 						}
 
 						for (AActor* RemoveActor : Cluster.Actors)
diff --git a/Engine/Source/Editor/UnrealEd/Private/Kismet2/BlueprintEditorUtils.cpp b/Engine/Source/Editor/UnrealEd/Private/Kismet2/BlueprintEditorUtils.cpp
index 9238c31de1cd..a1040f43ed42 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Kismet2/BlueprintEditorUtils.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Kismet2/BlueprintEditorUtils.cpp
@@ -908,7 +908,7 @@ public:
 		: TargetBlueprint(TargetBP)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = false;
+		this->SetIsPersistent(false);
 		ArIgnoreArchetypeRef = false;
 	}
 
@@ -1436,6 +1436,7 @@ UClass* FBlueprintEditorUtils::RegenerateBlueprintClass(UBlueprint* Blueprint, U
 			if (Blueprint->GeneratedClass)
 			{
 				FBlueprintEditorUtils::RecreateClassMetaData(Blueprint, Blueprint->GeneratedClass, true);
+				Blueprint->GeneratedClass->ClassFlags &= ~CLASS_ReplicationDataIsSetUp;
 				Blueprint->GeneratedClass->SetUpRuntimeReplicationData();
 			}
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/Kismet2/ComponentEditorUtils.cpp b/Engine/Source/Editor/UnrealEd/Private/Kismet2/ComponentEditorUtils.cpp
index 90bf7833bdb5..f5cdbd503b43 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Kismet2/ComponentEditorUtils.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Kismet2/ComponentEditorUtils.cpp
@@ -768,6 +768,7 @@ bool FComponentEditorUtils::AttemptApplyMaterialToComponent(USceneComponent* Sce
 		}
 
 		SceneComponent->MarkRenderStateDirty();
+		GEditor->OnSceneMaterialsModified();
 	}
 
 	return bResult;
diff --git a/Engine/Source/Editor/UnrealEd/Private/Kismet2/DebuggerCommands.cpp b/Engine/Source/Editor/UnrealEd/Private/Kismet2/DebuggerCommands.cpp
index 54e522ecfef3..a19d7b954251 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Kismet2/DebuggerCommands.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Kismet2/DebuggerCommands.cpp
@@ -842,9 +842,9 @@ TSharedRef< SWidget > FPlayWorldCommands::GeneratePlayMenuContent( TSharedRef<FU
 		{
 			TSharedRef<SWidget> NumPlayers = SNew(SSpinBox<int32>)	// Copy limits from PlayNumberOfClients meta data
 				.MinValue(1)
-				.MaxValue(TNumericLimits<int32>::Max())
+				.MaxValue(64)
 				.MinSliderValue(1)
-				.MaxSliderValue(64)
+				.MaxSliderValue(4)
 				.ToolTipText(LOCTEXT( "NumberOfClientsToolTip", "The editor and listen server count as players, a dedicated server will not. Clients make up the remainder." ))
 				.Value(FInternalPlayWorldCommandCallbacks::GetNumberOfClients())
 				.OnValueCommitted_Static(&FInternalPlayWorldCommandCallbacks::SetNumberOfClients);
diff --git a/Engine/Source/Editor/UnrealEd/Private/Kismet2/Kismet2.cpp b/Engine/Source/Editor/UnrealEd/Private/Kismet2/Kismet2.cpp
index c156ea9d5bc9..6fc70134fc93 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Kismet2/Kismet2.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Kismet2/Kismet2.cpp
@@ -104,7 +104,7 @@ public:
 	FArchiveInvalidateTransientRefs()
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = false;
+		this->SetIsPersistent(false);
 		ArIgnoreArchetypeRef = false;
 	}
 protected:
diff --git a/Engine/Source/Editor/UnrealEd/Private/Kismet2/KismetReinstanceUtilities.cpp b/Engine/Source/Editor/UnrealEd/Private/Kismet2/KismetReinstanceUtilities.cpp
index 3703d78ca55d..83def6416d2e 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Kismet2/KismetReinstanceUtilities.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Kismet2/KismetReinstanceUtilities.cpp
@@ -1339,7 +1339,7 @@ namespace InstancedPropertyUtils
 			, InstancedPropertyMap(PropertyMapOut)
 		{
 			ArIsObjectReferenceCollector = true;
-			ArIsPersistent = false;
+			this->SetIsPersistent(false);
 			ArIgnoreArchetypeRef = false;
 
 			if (bAutoSerialize)
diff --git a/Engine/Source/Editor/UnrealEd/Private/LODCluster.cpp b/Engine/Source/Editor/UnrealEd/Private/LODCluster.cpp
index 562d9eafa443..1d5fe09b9d0f 100644
--- a/Engine/Source/Editor/UnrealEd/Private/LODCluster.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/LODCluster.cpp
@@ -6,7 +6,7 @@
 #include "Components/StaticMeshComponent.h"
 #include "GameFramework/Volume.h"
 #include "Components/InstancedStaticMeshComponent.h"
-
+#include "Engine/HLODProxy.h"
 
 #if WITH_EDITOR
 #include "Engine/LODActor.h"
@@ -16,7 +16,6 @@
 #endif // WITH_EDITOR
 
 
-
 #define LOCTEXT_NAMESPACE "LODCluster"
 #define CM_TO_METER		0.01f
 #define METER_TO_CM		100.0f
@@ -187,6 +186,11 @@ FLODCluster& FLODCluster::operator=(const FLODCluster& Other)
 	return *this;
 }
 
+bool FLODCluster::operator==(const FLODCluster& Other) const
+{
+	return Actors == Other.Actors;
+}
+
 void FLODCluster::MergeClusters(const FLODCluster& Other)
 {
 	// please note that when merge, we merge two boxes from each cluster, not exactly all actors' bound
@@ -310,12 +314,10 @@ ALODActor* FLODCluster::BuildActor(ULevel* InLevel, const int32 LODIdx, const bo
 				NewActor->AddSubActor(Actor);
 			}
 
-			// Mark dirty according to whether or not this is a preview build
-			NewActor->SetIsDirty(!bCreateMeshes);
-
 			if (bCreateMeshes)
 			{
-				UPackage* AssetsOuter = Utilities->CreateOrRetrieveLevelHLODPackage(InLevel, LODIdx);
+				UHLODProxy* Proxy = Utilities->CreateOrRetrieveLevelHLODProxy(InLevel, LODIdx);
+				UPackage* AssetsOuter = Proxy->GetOutermost();
 				checkf(AssetsOuter != nullptr, TEXT("Failed to created outer for generated HLOD assets"));
 				Utilities->BuildStaticMeshForLODActor(NewActor, AssetsOuter, LODSetup);
 			}
diff --git a/Engine/Source/Editor/UnrealEd/Private/LODUtilities.cpp b/Engine/Source/Editor/UnrealEd/Private/LODUtilities.cpp
index 9d2badf4f218..d02859646ebc 100644
--- a/Engine/Source/Editor/UnrealEd/Private/LODUtilities.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/LODUtilities.cpp
@@ -22,6 +22,8 @@
 #include "ComponentReregisterContext.h"
 #include "IMeshReductionManagerModule.h"
 
+DEFINE_LOG_CATEGORY_STATIC(LogLODUtilities, Log, All);
+
 bool FLODUtilities::RegenerateLOD(USkeletalMesh* SkeletalMesh, int32 NewLODCount /*= 0*/, bool bRegenerateEvenIfImported /*= false*/)
 {
 	if (SkeletalMesh)
@@ -237,7 +239,7 @@ struct FTargetMatch
 void ProjectTargetOnBase(const TArray<FSoftSkinVertex>& BaseVertices, const TArray<TArray<uint32>>& PerSectionBaseTriangleIndices,
 						 TArray<FTargetMatch>& TargetMatchData, const TArray<FSkelMeshSection>& TargetSections, const TArray<int32>& TargetSectionMatchBaseIndex)
 {
-	bool bEnsureMsgDone = false;
+	bool bNoMatchMsgDone = false;
 	TArray<FTriangleElement> Triangles;
 	//Project section target vertices on match base section using the UVs coordinates
 	for (int32 SectionIndex = 0; SectionIndex < TargetSections.Num(); ++SectionIndex)
@@ -289,7 +291,20 @@ void ProjectTargetOnBase(const TArray<FSoftSkinVertex>& BaseVertices, const TArr
 			FVector2D TargetUV = TargetVertices[TargetVertexIndex].UVs[0];
 			//Reset the last data without flushing the memmery allocation
 			QuadTreeTriangleResults.Reset();
-			uint32 FullTargetIndex = TargetSections[SectionIndex].BaseVertexIndex + TargetVertexIndex;
+			const uint32 FullTargetIndex = TargetSections[SectionIndex].BaseVertexIndex + TargetVertexIndex;
+			//Make sure the array is allocate properly
+			if (!TargetMatchData.IsValidIndex(FullTargetIndex))
+			{
+				continue;
+			}
+			//Set default data for the target match, in case we cannot found a match
+			FTargetMatch& TargetMatch = TargetMatchData[FullTargetIndex];
+			for (int32 Corner = 0; Corner < 3; ++Corner)
+			{
+				TargetMatch.Indices[Corner] = INDEX_NONE;
+				TargetMatch.BarycentricWeight[Corner] = 0.3333f; //The weight will be use to found the proper delta
+			}
+
 			FVector2D Extent(DistanceThreshold, DistanceThreshold);
 			FBox2D CurBox(TargetUV - Extent, TargetUV + Extent);
 			QuadTree.GetElements(CurBox, QuadTreeTriangleResults);
@@ -301,10 +316,10 @@ void ProjectTargetOnBase(const TArray<FSoftSkinVertex>& BaseVertices, const TArr
 				if(!FindTriangleUVMatch(TargetUV, Triangles, QuadTreeTriangleResults, MatchTriangleIndexes))
 				{
 					//We should always have a match
-					if (!bEnsureMsgDone)
+					if (!bNoMatchMsgDone)
 					{
-						ensureMsgf(FoundIndexMatch != INDEX_NONE, TEXT("Reduce LOD vertex should always have a valid matched triangle in the BaseLOD.")); //-V547
-						bEnsureMsgDone = true;
+						UE_LOG(LogLODUtilities, Warning, TEXT("Reduce LOD, remap morph target: Cannot find a triangle from the base LOD that contain a vertex UV in the target LOD. Remap morph target quality will be lower."));
+						bNoMatchMsgDone = true;
 					}
 					continue;
 				}
@@ -331,7 +346,6 @@ void ProjectTargetOnBase(const TArray<FSoftSkinVertex>& BaseVertices, const TArr
 				//We should always have a valid match at this point
 				check(FoundIndexMatch != INDEX_NONE);
 				FTriangleElement& BestTriangle = Triangles[FoundIndexMatch];
-				FTargetMatch& TargetMatch = TargetMatchData[FullTargetIndex];
 				//Found the surface area of the 3 barycentric triangles from the UVs
 				FVector BarycentricWeight;
 				BarycentricWeight = GetBaryCentric(FVector(TargetUV, 0.0f), FVector(BestTriangle.Vertices[0].UVs[0], 0.0f), FVector(BestTriangle.Vertices[1].UVs[0], 0.0f), FVector(BestTriangle.Vertices[2].UVs[0], 0.0f));
@@ -344,10 +358,10 @@ void ProjectTargetOnBase(const TArray<FSoftSkinVertex>& BaseVertices, const TArr
 			}
 			else
 			{
-				if (!bEnsureMsgDone)
+				if (!bNoMatchMsgDone)
 				{
-					ensureMsgf(QuadTreeTriangleResults.Num() > 0, TEXT("Reduce LOD vertex should always have a valid matched triangle in the BaseLOD."));
-					bEnsureMsgDone = true;
+					UE_LOG(LogLODUtilities, Warning, TEXT("Reduce LOD, remap morph target: Cannot find a triangle from the base LOD that contain a vertex UV in the target LOD. Remap morph target quality will be lower."));
+					bNoMatchMsgDone = true;
 				}
 				continue;
 			}
@@ -586,6 +600,11 @@ void FLODUtilities::ApplyMorphTargetsToLOD(USkeletalMesh* SkeletalMesh, const FS
 			for (int32 TargetIndex = 0; TargetIndex < TargetMatchData.Num(); ++TargetIndex)
 			{
 				const FTargetMatch& TargetMatch = TargetMatchData[TargetIndex];
+				if (TargetMatch.Indices[0] == INDEX_NONE)
+				{
+					//In case this vertex did not found a triangle match
+					continue;
+				}
 				if (TargetMatch.Indices[0] == MorphDelta.SourceIdx || TargetMatch.Indices[1] == MorphDelta.SourceIdx || TargetMatch.Indices[2] == MorphDelta.SourceIdx)
 				{
 					TArray<uint32>& TargetIndexes = BaseMorphIndexToTargetIndexList.FindOrAdd(MorphDelta.SourceIdx);
@@ -662,8 +681,11 @@ void FLODUtilities::SimplifySkeletalMeshLOD(FSkeletalMeshUpdateContext& UpdateCo
 	{
 		SimplifySkeletalMeshLOD(SkeletalMesh, DesiredLOD, bReregisterComponent);
 		
-		//Notify calling system of change
-		UpdateContext.OnLODChanged.ExecuteIfBound();
+		if (UpdateContext.OnLODChanged.IsBound())
+		{
+			//Notify calling system of change
+			UpdateContext.OnLODChanged.ExecuteIfBound();
+		}
 	}
 }
 void FLODUtilities::RefreshLODChange(const USkeletalMesh* SkeletalMesh)
diff --git a/Engine/Source/Editor/UnrealEd/Private/LevelEditorViewport.cpp b/Engine/Source/Editor/UnrealEd/Private/LevelEditorViewport.cpp
index 086f07d95943..6758acbf1928 100644
--- a/Engine/Source/Editor/UnrealEd/Private/LevelEditorViewport.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/LevelEditorViewport.cpp
@@ -563,6 +563,11 @@ static bool AttemptApplyObjToComponent(UObject* ObjToUse, USceneComponent* Compo
 				else
 				{
 					bResult = FComponentEditorUtils::AttemptApplyMaterialToComponent(ComponentToApplyTo, DroppedObjAsMaterial, TargetMaterialSlot);
+
+					if (bResult)
+					{
+						GEditor->OnSceneMaterialsModified();
+					}
 				}
 			}
 		}
diff --git a/Engine/Source/Editor/UnrealEd/Private/PlayLevel.cpp b/Engine/Source/Editor/UnrealEd/Private/PlayLevel.cpp
index 1dd4c885f11a..bbaa088fe0ad 100644
--- a/Engine/Source/Editor/UnrealEd/Private/PlayLevel.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/PlayLevel.cpp
@@ -1045,8 +1045,8 @@ void GetWindowSizeForInstanceType(FIntPoint &WindowSize, const ULevelEditorPlayS
 	const EPlayNetMode PlayNetMode = [&PlayInSettings]{ EPlayNetMode NetMode(PIE_Standalone); return (PlayInSettings->GetPlayNetMode(NetMode) ? NetMode : PIE_Standalone); }();
 	if (PlayNetMode == PIE_Standalone)
 	{
-		WindowSize.X = PlayInSettings->StandaloneWindowWidth;
-		WindowSize.Y = PlayInSettings->StandaloneWindowHeight;
+		WindowSize.X = PlayInSettings->NewWindowWidth;
+		WindowSize.Y = PlayInSettings->NewWindowHeight;
 	}
 	else
 	{
@@ -1060,8 +1060,8 @@ void SetWindowSizeForInstanceType(const FIntPoint &WindowSize, ULevelEditorPlayS
 	const EPlayNetMode PlayNetMode = [&PlayInSettings]{ EPlayNetMode NetMode(PIE_Standalone); return (PlayInSettings->GetPlayNetMode(NetMode) ? NetMode : PIE_Standalone); }();
 	if (PlayNetMode == PIE_Standalone)
 	{
-		PlayInSettings->StandaloneWindowWidth = WindowSize.X;
-		PlayInSettings->StandaloneWindowHeight = WindowSize.Y;
+		PlayInSettings->NewWindowWidth = WindowSize.X;
+		PlayInSettings->NewWindowHeight = WindowSize.Y;
 	}
 	else
 	{
@@ -1421,7 +1421,7 @@ void UEditorEngine::PlayStandaloneLocalPc(FString MapNameOverride, FIntPoint* Wi
 	
 	// Check if centered
 	FString Params;
-	if (PlayInSettings->CenterStandaloneWindow)
+	if (PlayInSettings->CenterNewWindow)
 	{
 		Params = FString::Printf(TEXT("%s %s -game -PIEVIACONSOLE -ResX=%d -ResY=%d %s%s %s"),
 			*GameNameOrProjectFile,
@@ -1440,8 +1440,8 @@ void UEditorEngine::PlayStandaloneLocalPc(FString MapNameOverride, FIntPoint* Wi
 		Params = FString::Printf(TEXT("%s %s -game -PIEVIACONSOLE -WinX=%d -WinY=%d -ResX=%d -ResY=%d %s%s %s"),
 			*GameNameOrProjectFile,
 			*BuildPlayWorldURL(*SavedMapNames[0], false, URLParms),
-			PlayInSettings->StandaloneWindowPosition.X,
-			PlayInSettings->StandaloneWindowPosition.Y,
+			PlayInSettings->NewWindowPosition.X,
+			PlayInSettings->NewWindowPosition.Y,
 			WinSize.X,
 			WinSize.Y,
 			*FCommandLine::GetSubprocessCommandline(),
@@ -1462,6 +1462,13 @@ void UEditorEngine::PlayStandaloneLocalPc(FString MapNameOverride, FIntPoint* Wi
 		UE_LOG(LogPlayLevel, Error, TEXT("Failed to run a copy of the game on this PC."));
 	}
 
+	FMargin SafeZoneRatio = PlayInSettings->PIESafeZoneOverride;
+	SafeZoneRatio.Left /= (PlayInSettings->NewWindowPosition.X / 2.0f);
+	SafeZoneRatio.Right /= (PlayInSettings->NewWindowPosition.X / 2.0f);
+	SafeZoneRatio.Bottom /= (PlayInSettings->NewWindowPosition.Y / 2.0f);
+	SafeZoneRatio.Top /= (PlayInSettings->NewWindowPosition.Y / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
 	FEditorDelegates::BeginStandaloneLocalPlay.Broadcast(ProcessID);
 }
 
@@ -2198,7 +2205,7 @@ bool UEditorEngine::SpawnPlayFromHereStart( UWorld* World, AActor*& PlayerStart,
 	return true;
 }
 
-void UEditorEngine::PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor )
+void UEditorEngine::PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor, FPlayInEditorOverrides Overrides )
 {
 	// Broadcast PreBeginPIE before checks that might block PIE below (BeginPIE is broadcast below after the checks)
 	FEditorDelegates::PreBeginPIE.Broadcast(bInSimulateInEditor);
@@ -2360,9 +2367,12 @@ void UEditorEngine::PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor )
 	bool CanRunUnderOneProcess = [&PlayInSettings]{ bool RunUnderOneProcess(false); return (PlayInSettings->GetRunUnderOneProcess(RunUnderOneProcess) && RunUnderOneProcess); }();
 	if (CanRunUnderOneProcess)
 	{
-		const bool CanPlayNetDedicated = [&PlayInSettings]{ bool PlayNetDedicated(false); return (PlayInSettings->GetPlayNetDedicated(PlayNetDedicated) && PlayNetDedicated); }();
-		const int32 PlayNumberOfClients = [&PlayInSettings]{ int32 NumberOfClients(0); return (PlayInSettings->GetPlayNumberOfClients(NumberOfClients) ? NumberOfClients : 0); }();
+		bool CanPlayNetDedicated = [&PlayInSettings]{ bool PlayNetDedicated(false); return (PlayInSettings->GetPlayNetDedicated(PlayNetDedicated) && PlayNetDedicated); }();
+		CanPlayNetDedicated = Overrides.bDedicatedServer.Get(CanPlayNetDedicated);
+		int32 PlayNumberOfClients = [&PlayInSettings]{ int32 NumberOfClients(0); return (PlayInSettings->GetPlayNumberOfClients(NumberOfClients) ? NumberOfClients : 0); }();
+		PlayNumberOfClients = Overrides.NumberOfClients.Get(PlayNumberOfClients);
 		const bool WillAutoConnectToServer = [&PlayInSettings]{ bool AutoConnectToServer(false); return (PlayInSettings->GetAutoConnectToServer(AutoConnectToServer) && AutoConnectToServer); }();
+
 		if (!CanPlayNetDedicated && (PlayNumberOfClients == 1 || !WillAutoConnectToServer))
 		{
 			// Since we don't expose PlayNetMode as an option when doing RunUnderOnProcess,
@@ -2486,6 +2496,13 @@ void UEditorEngine::PlayInEditor( UWorld* InWorld, bool bInSimulateInEditor )
 		FSlateApplication::Get().SetAllUserFocusToGameViewport();
 	}
 
+	FMargin SafeZoneRatio = PlayInSettings->PIESafeZoneOverride;
+	SafeZoneRatio.Left /= (PlayInSettings->NewWindowWidth / 2.0f);
+	SafeZoneRatio.Right /= (PlayInSettings->NewWindowWidth / 2.0f);
+	SafeZoneRatio.Bottom /= (PlayInSettings->NewWindowHeight / 2.0f);
+	SafeZoneRatio.Top /= (PlayInSettings->NewWindowHeight / 2.0f);
+	FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
 	FEditorDelegates::PostPIEStarted.Broadcast( bInSimulateInEditor );
 }
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/PreferenceStubs.cpp b/Engine/Source/Editor/UnrealEd/Private/PreferenceStubs.cpp
index 78680ebe1a7f..8cac9ada2294 100644
--- a/Engine/Source/Editor/UnrealEd/Private/PreferenceStubs.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/PreferenceStubs.cpp
@@ -7,6 +7,7 @@
 #include "Preferences/MaterialEditorOptions.h"
 #include "Preferences/PersonaOptions.h"
 #include "Preferences/PhysicsAssetEditorOptions.h"
+#include "Preferences/MaterialStatsOptions.h"
 
 // @todo find a better place for all of this, preferably in the appropriate modules
 // though this would require the classes to be relocated as well
@@ -57,6 +58,18 @@ UMaterialEditorOptions::UMaterialEditorOptions(const FObjectInitializer& ObjectI
 {
 }
 
+UMaterialStatsOptions::UMaterialStatsOptions(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+#if PLATFORM_WINDOWS
+	bPlatformUsed[GMaxRHIFeatureLevel == ERHIFeatureLevel::SM5 ? SP_PCD3D_SM5 : SP_PCD3D_SM4] = 1;
+#elif PLATFORM_IOS
+	bPlatformUsed[SP_OPENGL_ES2_IOS] = 1;
+#endif
+
+	bMaterialQualityUsed[EMaterialQualityLevel::High] = 1;
+}
+
 
 UCurveEdOptions::UCurveEdOptions(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
diff --git a/Engine/Source/Editor/UnrealEd/Private/PreviewMaterial.cpp b/Engine/Source/Editor/UnrealEd/Private/PreviewMaterial.cpp
index 64f011097ebb..b667ac6cd403 100644
--- a/Engine/Source/Editor/UnrealEd/Private/PreviewMaterial.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/PreviewMaterial.cpp
@@ -30,6 +30,7 @@
 #include "IDetailsView.h"
 #include "MaterialEditingLibrary.h"
 #include "MaterialPropertyHelpers.h"
+#include "MaterialStatsCommon.h"
 
 /**
  * Class for rendering the material on the preview mesh in the Material Editor
@@ -114,20 +115,33 @@ public:
 				}
 			}
 
-			if (bEditorStatsMaterial || IsMobilePlatform(Platform))
+			// Only allow shaders that are used in the stats.
+			if (bEditorStatsMaterial)
 			{
-				TMap<FName, FString> ShaderTypeNamesAndDescriptions;
-				GetRepresentativeShaderTypesAndDescriptions(ShaderTypeNamesAndDescriptions);
+				TMap<FName, TArray<FMaterialStatsUtils::FRepresentativeShaderInfo>> ShaderTypeNamesAndDescriptions;
+				FMaterialStatsUtils::GetRepresentativeShaderTypesAndDescriptions(ShaderTypeNamesAndDescriptions, this);
 
-				//Only allow shaders that are used in the stats.
-				return ShaderTypeNamesAndDescriptions.Contains(ShaderType->GetFName());
+				for (auto DescriptionPair : ShaderTypeNamesAndDescriptions)
+				{
+					auto &DescriptionArray = DescriptionPair.Value;
+					if (DescriptionArray.FindByPredicate([ShaderType = ShaderType](auto& Info) { return Info.ShaderName == ShaderType->GetFName(); }))
+					{
+						return true;
+					}
+				}
+
+				return false;
 			}
 
 			// look for any of the needed type
 			bool bShaderTypeMatches = false;
 
 			// For FMaterialResource::GetRepresentativeInstructionCounts
-			if (FCString::Stristr(ShaderType->GetName(), TEXT("BasePassPSTDistanceFieldShadowsAndLightMapPolicyHQ")))
+			if (FCString::Stricmp(ShaderType->GetName(), TEXT("MobileDirectionalLight")))
+			{
+				bShaderTypeMatches = true;
+			}
+			else if (FCString::Stristr(ShaderType->GetName(), TEXT("BasePassPSTDistanceFieldShadowsAndLightMapPolicyHQ")))
 			{
 				bShaderTypeMatches = true;
 			}
@@ -363,6 +377,7 @@ void UMaterialEditorPreviewParameters::RegenerateArrays()
 			if (PreviewMaterial->GetScalarParameterValue(ParameterValue.ParameterInfo, Value))
 			{
 				ParentMaterial->GetScalarParameterSliderMinMax(ParameterName, ParameterValue.SliderMin, ParameterValue.SliderMax);
+				ParentMaterial->IsScalarParameterUsedAsAtlasPosition(ParameterName, ParameterValue.AtlasData.bIsUsedAsAtlasPosition, ParameterValue.AtlasData.Curve, ParameterValue.AtlasData.Atlas);
 				ParameterValue.ParameterValue = Value;
 			}
 			if (ParentMaterial->GetParameterSortPriority(ParameterName, SortPriority))
@@ -963,6 +978,7 @@ void UMaterialEditorInstanceConstant::RegenerateArrays()
 
 			if (SourceInstance->GetScalarParameterValue(ParameterInfo, ParameterValue.ParameterValue))
 			{
+				SourceInstance->IsScalarParameterUsedAsAtlasPosition(ParameterInfo, ParameterValue.AtlasData.bIsUsedAsAtlasPosition, ParameterValue.AtlasData.Curve, ParameterValue.AtlasData.Atlas);
 				SourceInstance->GetScalarParameterSliderMinMax(ParameterInfo, ParameterValue.SliderMin, ParameterValue.SliderMax);		
 			}
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/SColorGradientEditor.cpp b/Engine/Source/Editor/UnrealEd/Private/SColorGradientEditor.cpp
index 7fae7139e9ef..db2f1e968ae5 100644
--- a/Engine/Source/Editor/UnrealEd/Private/SColorGradientEditor.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/SColorGradientEditor.cpp
@@ -23,6 +23,7 @@
 #include "Widgets/Colors/SColorPicker.h"
 #include "SCurveEditor.h"
 #include "ScopedTransaction.h"
+#include "Misc/Optional.h"
 
 
 #define LOCTEXT_NAMESPACE "SColorGradientEditor"
@@ -177,6 +178,9 @@ int32 SColorGradientEditor::OnPaint( const FPaintArgs& Args, const FGeometry& Al
 
 			// Sample the curve
 			FLinearColor Color = CurveOwner->GetLinearColorValue( Time );
+			//Slate MakeGradient call expects the linear colors to be pre-converted to sRGB
+			FColor ColorNosRGB = Color.ToFColor(true);
+			Color = ColorNosRGB.ReinterpretAsLinear();
 			if( !bHasAnyAlphaKeys )
 			{
 				// Only show alpha if there is at least one key.  For some curves, alpha may not be important
@@ -214,7 +218,7 @@ int32 SColorGradientEditor::OnPaint( const FPaintArgs& Args, const FGeometry& Al
 				GradientAreaGeometry.ToPaintGeometry(),
 				Stops,
 				Orient_Vertical,
-				DrawEffects | ESlateDrawEffect::NoGamma
+				DrawEffects | ESlateDrawEffect::None
 			);	
 		}
 
@@ -304,7 +308,8 @@ FReply SColorGradientEditor::OnMouseButtonDown( const FGeometry& MyGeometry, con
 {
 	if( IsEditingEnabled.Get() == true )
 	{
-		if( MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
+		// Don't capture shift+click as the Curve Editor already handles this
+		if( MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton && !MouseEvent.IsShiftDown() )
 		{
 			// Select the stop under the mouse if any and capture the mouse to get detect dragging
 			SelectedStop = GetGradientStopAtPoint( MouseEvent.GetScreenSpacePosition(), MyGeometry );
@@ -721,6 +726,7 @@ void SColorGradientEditor::DrawGradientStopMark( const FGradientStopMark& Mark,
 	);
 
 	// Draw a box with the gradient stop color
+	//Slate MakeGradient call expects the linear colors to be pre-converted to sRGB
 	FSlateDrawElement::MakeBox
 	( 
 		OutDrawElements,
@@ -728,7 +734,7 @@ void SColorGradientEditor::DrawGradientStopMark( const FGradientStopMark& Mark,
 		Geometry.ToPaintGeometry( FVector2D( XPos-HandleRect.Left+3, bColor ? HandleRect.Top+3.0f : HandleRect.Top+6), FVector2D( HandleRect.Right-6, HandleRect.Bottom-9 ) ),
 		WhiteBrush,
 		DrawEffects,
-		Color.ToFColor(false)
+		Color.ToFColor(true)
 	);
 }
 FGeometry SColorGradientEditor::GetColorMarkAreaGeometry( const FGeometry& InGeometry ) const
diff --git a/Engine/Source/Editor/UnrealEd/Private/SCurveEditor.cpp b/Engine/Source/Editor/UnrealEd/Private/SCurveEditor.cpp
index d56ae5aae1b3..7fadc14d5cef 100644
--- a/Engine/Source/Editor/UnrealEd/Private/SCurveEditor.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/SCurveEditor.cpp
@@ -1422,7 +1422,7 @@ void SCurveEditor::AddNewKey(FGeometry InMyGeometry, FVector2D ScreenPosition, T
 	}
 }
 
-void SCurveEditor::OnMouseCaptureLost()
+void SCurveEditor::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	// if we began a drag transaction we need to finish it to make sure undo doesn't get out of sync
 	if (DragState == EDragState::DragKey || DragState == EDragState::FreeDrag || DragState == EDragState::DragTangent)
diff --git a/Engine/Source/Editor/UnrealEd/Private/Settings/LevelEditorPlaySettingsCustomization.h b/Engine/Source/Editor/UnrealEd/Private/Settings/LevelEditorPlaySettingsCustomization.h
index 31e32ddbe532..a9c758c66f48 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Settings/LevelEditorPlaySettingsCustomization.h
+++ b/Engine/Source/Editor/UnrealEd/Private/Settings/LevelEditorPlaySettingsCustomization.h
@@ -20,12 +20,15 @@
 #include "DetailCategoryBuilder.h"
 #include "Framework/MultiBox/MultiBoxBuilder.h"
 #include "Widgets/Text/STextBlock.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
 #include "Widgets/Input/SComboButton.h"
 #include "IDetailPropertyRow.h"
 #include "DetailWidgetRow.h"
 #include "Widgets/Input/SComboBox.h"
 #include "Runtime/Engine/Classes/Sound/AudioSettings.h"
-
+#include "DeviceProfiles/DeviceProfileManager.h"
+#include "DeviceProfiles/DeviceProfile.h"
 
 #define LOCTEXT_NAMESPACE "FLevelEditorPlaySettingsCustomization"
 
@@ -55,29 +58,28 @@ public:
 
 		ChildSlot
 		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
 			SNew(SHorizontalBox)
-
 			+ SHorizontalBox::Slot()
-				.AutoWidth()
+			[
+				SNew(SVerticalBox)
+				.IsEnabled(this, &SScreenPositionCustomization::HandleNewWindowPositionPropertyIsEnabled)
+				+ SVerticalBox::Slot()
+				.AutoHeight()
 				[
-					SNew(SVerticalBox)
-						.IsEnabled(this, &SScreenPositionCustomization::HandleNewWindowPositionPropertyIsEnabled)
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							InWindowPositionProperty->CreatePropertyNameWidget(LOCTEXT("WindowPosXLabel", "Left Position"))
-						]
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							InWindowPositionProperty->GetChildHandle(0)->CreatePropertyValueWidget()
-						]
+					InWindowPositionProperty->CreatePropertyNameWidget(LOCTEXT("WindowPosXLabel", "Left Position"))
 				]
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				[
+					InWindowPositionProperty->GetChildHandle(0)->CreatePropertyValueWidget()
+				]
+			]
 
 			+ SHorizontalBox::Slot()
-				.AutoWidth()
 				.Padding(8.0f, 0.0f, 0.0f, 0.0f)
 				[
 					SNew(SVerticalBox)
@@ -91,24 +93,29 @@ public:
 
 					+ SVerticalBox::Slot()
 						.AutoHeight()
-						[
-							InWindowPositionProperty->GetChildHandle(1)->CreatePropertyValueWidget()
-						]
+					[
+						InWindowPositionProperty->GetChildHandle(1)->CreatePropertyValueWidget()
+					]
 				]
-
-			+ SHorizontalBox::Slot()
+			]
+			+SVerticalBox::Slot()
+			.Padding(0.0f, 2.0f)
+			.AutoHeight()
+				[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
 				.AutoWidth()
-				.Padding(8.0f, 0.0f, 0.0f, 0.0f)
-				.VAlign(VAlign_Bottom)
 				[
 					InCenterWindowProperty->CreatePropertyValueWidget()
 				]
-
-			+ SHorizontalBox::Slot()
-				.AutoWidth()
-				.VAlign(VAlign_Bottom)
-				[
-					InWindowPositionProperty->CreatePropertyNameWidget(LOCTEXT("CenterWindowLabel", "Always center window to screen"))
+				+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(4.0f, 0.0f, 0.0f, 0.0f)
+					.VAlign(VAlign_Bottom)
+					[
+						InWindowPositionProperty->CreatePropertyNameWidget(LOCTEXT("CenterWindowLabel", "Always center window to screen"))
+					]
 				]
 		];
 	}
@@ -159,66 +166,84 @@ public:
 
 		WindowHeightProperty = InWindowHeightProperty;
 		WindowWidthProperty = InWindowWidthProperty;
-
+		
+		FSimpleDelegate SizeChangeDelegate = FSimpleDelegate::CreateSP(this, &SScreenResolutionCustomization::OnSizeChanged);
+		WindowHeightProperty->SetOnPropertyValueChanged(SizeChangeDelegate);
+		WindowWidthProperty->SetOnPropertyValueChanged(SizeChangeDelegate);
 		ChildSlot
 		[
-			SNew(SHorizontalBox)
-
-			+ SHorizontalBox::Slot()
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.VAlign(VAlign_Bottom)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
 				.AutoWidth()
-				[
-					SNew(SVerticalBox)
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							WindowWidthProperty->CreatePropertyNameWidget(LOCTEXT("WindowWidthLabel", "Window Width"))
-						]
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							WindowWidthProperty->CreatePropertyValueWidget()
-						]
-				]
-
-			+ SHorizontalBox::Slot()
-				.AutoWidth()
-				.Padding(8.0f, 0.0f)
-				[
-					SNew(SVerticalBox)
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							WindowHeightProperty->CreatePropertyNameWidget(LOCTEXT("WindowHeightLabel", "Window Height"))
-						]
-
-					+ SVerticalBox::Slot()
-						.AutoHeight()
-						[
-							WindowHeightProperty->CreatePropertyValueWidget()
-						]
-				]
-
-			+ SHorizontalBox::Slot()
-				.AutoWidth()
-				.VAlign(VAlign_Bottom)
+				.VAlign(VAlign_Center)
 				[
 					SNew(SComboButton)
-						.ButtonContent()
-						[
-							SNew(STextBlock)
-								.Font(LayoutBuilder->GetDetailFont())
-								.Text(LOCTEXT("CommonResolutionsButtonText", "Common Window Sizes"))
-						]
-						.ContentPadding(FMargin(6.0f, 1.0f))
-						.MenuContent()
-						[
-							MakeCommonResolutionsMenu()
-						]
-						.ToolTipText(LOCTEXT("CommonResolutionsButtonTooltip", "Pick from a list of common screen resolutions"))
-				]		
+					.VAlign(VAlign_Center)
+					.ButtonContent()
+					[
+						SNew(STextBlock)
+						.Font(LayoutBuilder->GetDetailFont())
+						.Text(LOCTEXT("CommonResolutionsButtonText", "Common Window Sizes"))
+					]
+					.ContentPadding(FMargin(6.0f, 2.0f))
+					.MenuContent()
+					[
+						MakeCommonResolutionsMenu()
+					]
+					.ToolTipText(LOCTEXT("CommonResolutionsButtonTooltip", "Pick from a list of common screen resolutions"))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(SButton)
+					.OnClicked(this, &SScreenResolutionCustomization::HandleSwapAspectRatioClicked)
+					.ContentPadding(FMargin(3.0f, 0.0f, 3.0f, 1.0f))
+					.Content()
+					[
+						SNew(SImage)
+						.Image(this, &SScreenResolutionCustomization::GetAspectRatioSwitchImage)
+					]
+					.ToolTipText(LOCTEXT("SwapAspectRatioTooltip", "Swap between portrait and landscape orientation."))
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				[
+					SNew(SVerticalBox)
+					+ SVerticalBox::Slot()
+					.AutoHeight()
+					[
+						WindowWidthProperty->CreatePropertyNameWidget(LOCTEXT("WindowWidthLabel", "Window Width"))
+					]
+					+ SVerticalBox::Slot()
+					[
+						WindowWidthProperty->CreatePropertyValueWidget()
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(8.0f, 0.0f, 0.0f, 0.0f)
+				[
+					SNew(SVerticalBox)
+					+ SVerticalBox::Slot()
+					.AutoHeight()
+					[
+						WindowHeightProperty->CreatePropertyNameWidget(LOCTEXT("WindowHeightLabel", "Window Height"))
+					]
+					+ SVerticalBox::Slot()
+					.AutoHeight()
+					[
+						WindowHeightProperty->CreatePropertyValueWidget()
+					]
+				]
+			]
 		];
 	}
 
@@ -238,13 +263,13 @@ protected:
 	 * @param Resolutions The collection of screen resolutions to add.
 	 * @param SectionName The name of the section to add.
 	 */
-	void AddScreenResolutionSection( FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution>& Resolutions, const FText& SectionName )
+	void AddScreenResolutionSection( FMenuBuilder& MenuBuilder, const TArray<FPlayScreenResolution> Resolutions, const FText SectionName )
 	{
 		MenuBuilder.BeginSection(NAME_None, SectionName);
 		{
 			for (auto Iter = Resolutions.CreateConstIterator(); Iter; ++Iter)
 			{
-				FUIAction Action(FExecuteAction::CreateRaw(this, &SScreenResolutionCustomization::HandleCommonResolutionSelected, Iter->Width, Iter->Height));
+				FUIAction Action(FExecuteAction::CreateRaw(this, &SScreenResolutionCustomization::HandleCommonResolutionSelected, *Iter));
 
 				FInternationalization& I18N = FInternationalization::Get();
 
@@ -269,22 +294,153 @@ protected:
 		const ULevelEditorPlaySettings* PlaySettings = GetDefault<ULevelEditorPlaySettings>();
 		FMenuBuilder MenuBuilder(true, NULL);
 
-		AddScreenResolutionSection(MenuBuilder, PlaySettings->PhoneScreenResolutions, LOCTEXT("CommonPhonesSectionHeader", "Phones"));
-		AddScreenResolutionSection(MenuBuilder, PlaySettings->TabletScreenResolutions, LOCTEXT("CommonTabletsSectionHeader", "Tablets"));
-		AddScreenResolutionSection(MenuBuilder, PlaySettings->LaptopScreenResolutions, LOCTEXT("CommonLaptopsSectionHeader", "Laptops"));
-		AddScreenResolutionSection(MenuBuilder, PlaySettings->MonitorScreenResolutions, LOCTEXT("CommoMonitorsSectionHeader", "Monitors"));
-		AddScreenResolutionSection(MenuBuilder, PlaySettings->TelevisionScreenResolutions, LOCTEXT("CommonTelevesionsSectionHeader", "Televisions"));
+
+		FText PhoneTitle = LOCTEXT("CommonPhonesSectionHeader", "Phones");
+		FText TabletTitle = LOCTEXT("CommonTabletsSectionHeader", "Tablets");
+		FText LaptopTitle = LOCTEXT("CommonLaptopsSectionHeader", "Laptops");
+		FText MonitorTitle = LOCTEXT("CommonMonitorsSectionHeader", "Monitors");
+		FText TelevisionTitle = LOCTEXT("CommonTelevesionsSectionHeader", "Televisions");
+		MenuBuilder.AddSubMenu(
+			PhoneTitle,
+			FText(),
+			FNewMenuDelegate::CreateRaw(this, &SScreenResolutionCustomization::AddScreenResolutionSection, (PlaySettings->PhoneScreenResolutions), PhoneTitle),
+			false,
+			FSlateIcon());
+		MenuBuilder.AddSubMenu(
+			TabletTitle,
+			FText(),
+			FNewMenuDelegate::CreateRaw(this, &SScreenResolutionCustomization::AddScreenResolutionSection, (PlaySettings->TabletScreenResolutions), TabletTitle),
+			false,
+			FSlateIcon());
+		MenuBuilder.AddSubMenu(
+			LaptopTitle,
+			FText(),
+			FNewMenuDelegate::CreateRaw(this, &SScreenResolutionCustomization::AddScreenResolutionSection, (PlaySettings->LaptopScreenResolutions), LaptopTitle),
+			false,
+			FSlateIcon());
+		MenuBuilder.AddSubMenu(
+			MonitorTitle,
+			FText(),
+			FNewMenuDelegate::CreateRaw(this, &SScreenResolutionCustomization::AddScreenResolutionSection, (PlaySettings->MonitorScreenResolutions), MonitorTitle),
+			false,
+			FSlateIcon());
+		MenuBuilder.AddSubMenu(
+			TelevisionTitle,
+			FText(),
+			FNewMenuDelegate::CreateRaw(this, &SScreenResolutionCustomization::AddScreenResolutionSection, (PlaySettings->TelevisionScreenResolutions), TelevisionTitle),
+			false,
+			FSlateIcon());
 
 		return MenuBuilder.MakeWidget();
 	}
 
+	FReply HandleSwapAspectRatioClicked()
+	{
+		FString HeightString;
+		WindowHeightProperty->GetValueAsDisplayString(HeightString);
+		FString WidthString;
+		WindowWidthProperty->GetValueAsDisplayString(WidthString);
+		int32 NewHeight = FCString::Atoi(*WidthString);
+		int32 NewWidth = FCString::Atoi(*HeightString);
+
+		ULevelEditorPlaySettings* PlayInSettings = GetMutableDefault<ULevelEditorPlaySettings>();
+
+		if (!PlayInSettings->DeviceToEmulate.IsEmpty())
+		{
+			PlayInSettings->PIESafeZoneOverride = PlayInSettings->CalculateCustomUnsafeZones(PlayInSettings->CustomUnsafeZoneStarts, PlayInSettings->CustomUnsafeZoneDimensions, PlayInSettings->DeviceToEmulate, FVector2D(NewWidth, NewHeight));
+		}
+		else
+		{
+			FSlateApplication::Get().ResetCustomSafeZone();
+			FSlateApplication::Get().GetSafeZoneSize(PlayInSettings->PIESafeZoneOverride, FVector2D(NewWidth, NewHeight));
+		}
+		FMargin SafeZoneRatio = PlayInSettings->PIESafeZoneOverride;
+		SafeZoneRatio.Left /= (NewWidth / 2.0f);
+		SafeZoneRatio.Right /= (NewWidth / 2.0f);
+		SafeZoneRatio.Bottom /= (NewHeight / 2.0f);
+		SafeZoneRatio.Top /= (NewHeight / 2.0f);
+		FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+
+
+		bSetFromMenu = true;
+		WindowHeightProperty->SetValue(NewHeight);
+		bSetFromMenu = true;
+		WindowWidthProperty->SetValue(NewWidth);
+
+		return FReply::Handled();
+	}
 private:
 
 	// Handles selecting a common screen resolution.
-	void HandleCommonResolutionSelected( int32 Width, int32 Height )
+	void HandleCommonResolutionSelected(FPlayScreenResolution Resolution)
 	{
+		int32 Width = Resolution.Width;
+		int32 Height = Resolution.Height;
+		float ScaleFactor;
+		ULevelEditorPlaySettings* PlayInSettings = GetMutableDefault<ULevelEditorPlaySettings>();
+
+		UDeviceProfile* DeviceProfile = UDeviceProfileManager::Get().FindProfile(Resolution.ProfileName, false);
+		if (DeviceProfile)
+		{
+			PlayInSettings->DeviceToEmulate = Resolution.ProfileName;
+			PlayInSettings->RescaleForMobilePreview(DeviceProfile, Width, Height, ScaleFactor);
+			PlayInSettings->PIESafeZoneOverride = PlayInSettings->CalculateCustomUnsafeZones(PlayInSettings->CustomUnsafeZoneStarts, PlayInSettings->CustomUnsafeZoneDimensions, PlayInSettings->DeviceToEmulate, FVector2D(Width, Height));
+		}
+		else
+		{
+			PlayInSettings->DeviceToEmulate = FString();
+			FSlateApplication::Get().ResetCustomSafeZone();
+			FSlateApplication::Get().GetSafeZoneSize(PlayInSettings->PIESafeZoneOverride, FVector2D(Width, Height));
+		}
+		FMargin SafeZoneRatio = PlayInSettings->PIESafeZoneOverride;
+		SafeZoneRatio.Left /= (Width / 2.0f);
+		SafeZoneRatio.Right /= (Width / 2.0f);
+		SafeZoneRatio.Bottom /= (Height / 2.0f);
+		SafeZoneRatio.Top /= (Height / 2.0f);
+		bSetFromMenu = true;
 		WindowHeightProperty->SetValue(Height);
+		bSetFromMenu = true;
 		WindowWidthProperty->SetValue(Width);
+		FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+	}
+
+	const FSlateBrush* GetAspectRatioSwitchImage() const
+	{
+		FString HeightString;
+		WindowHeightProperty->GetValueAsDisplayString(HeightString);
+		int32 Height = FCString::Atoi(*HeightString);
+		FString WidthString;
+		WindowWidthProperty->GetValueAsDisplayString(WidthString);
+		int32 Width = FCString::Atoi(*WidthString);
+		if(Height > Width)
+		{
+			return FEditorStyle::Get().GetBrush("UMGEditor.OrientPortrait");
+		}
+		return FEditorStyle::Get().GetBrush("UMGEditor.OrientLandscape");
+	}
+
+	void OnSizeChanged()
+	{
+		if (!bSetFromMenu)
+		{
+			FString HeightString;
+			WindowHeightProperty->GetValueAsDisplayString(HeightString);
+			int32 Height = FCString::Atoi(*HeightString);
+			FString WidthString;
+			WindowWidthProperty->GetValueAsDisplayString(WidthString);
+			int32 Width = FCString::Atoi(*WidthString);
+			ULevelEditorPlaySettings* PlayInSettings = GetMutableDefault<ULevelEditorPlaySettings>();
+			PlayInSettings->DeviceToEmulate = FString();
+			FSlateApplication::Get().ResetCustomSafeZone();
+			FSlateApplication::Get().GetSafeZoneSize(PlayInSettings->PIESafeZoneOverride, FVector2D(Width, Height));
+			FMargin SafeZoneRatio = PlayInSettings->PIESafeZoneOverride;
+			SafeZoneRatio.Left /= (Width / 2.0f);
+			SafeZoneRatio.Right /= (Width / 2.0f);
+			SafeZoneRatio.Bottom /= (Height / 2.0f);
+			SafeZoneRatio.Top /= (Height / 2.0f);
+			FSlateApplication::Get().OnDebugSafeZoneChanged.Broadcast(SafeZoneRatio);
+		}
+		bSetFromMenu = false;
 	}
 
 private:
@@ -294,6 +450,9 @@ private:
 
 	// Holds the handle to the window width property.
 	TSharedPtr<IPropertyHandle> WindowWidthProperty;
+
+	// True if a property was set from the resolution menu
+	bool bSetFromMenu;
 };
 
 
@@ -358,11 +517,68 @@ public:
 
 
 		}
+		IDetailCategoryBuilder& GameViewportSettings = LayoutBuilder.EditCategory("GameViewportSettings");
+		{
+		// new window size
+		TSharedRef<IPropertyHandle> WindowHeightHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowHeight));
+		TSharedRef<IPropertyHandle> WindowWidthHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowWidth));
+		TSharedRef<IPropertyHandle> WindowPositionHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowPosition));
+		TSharedRef<IPropertyHandle> CenterNewWindowHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, CenterNewWindow));
+		TSharedRef<IPropertyHandle> EmulatedDeviceHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, DeviceToEmulate));
+
+		WindowHeightHandle->MarkHiddenByCustomization();
+		WindowWidthHandle->MarkHiddenByCustomization();
+		WindowPositionHandle->MarkHiddenByCustomization();
+		CenterNewWindowHandle->MarkHiddenByCustomization();
+		EmulatedDeviceHandle->MarkHiddenByCustomization();
+
+		GameViewportSettings.AddCustomRow(LOCTEXT("NewWindowSizeRow", "New Window Size"), false)
+			.NameContent()
+			[
+				SNew(STextBlock)
+				.Font(LayoutBuilder.GetDetailFont())
+				.Text(LOCTEXT("NewWindowSizeName", "New Window Size"))
+				.ToolTipText(LOCTEXT("NewWindowSizeTooltip", "Sets the width and height of floating PIE windows (in pixels)"))
+			]
+			.ValueContent()
+			.MaxDesiredWidth(MaxPropertyWidth)
+			[
+				SNew(SScreenResolutionCustomization, &LayoutBuilder, WindowHeightHandle, WindowWidthHandle)
+			];
+
+			GameViewportSettings.AddCustomRow(LOCTEXT("NewWindowPositionRow", "New Window Position"), false)
+			.NameContent()
+			[
+				SNew(STextBlock)
+				.Font(LayoutBuilder.GetDetailFont())
+				.Text(LOCTEXT("NewWindowPositionName", "New Window Position"))
+				.ToolTipText(LOCTEXT("NewWindowPositionTooltip", "Sets the screen coordinates for the top-left corner of floating PIE windows (in pixels)"))
+			]
+			.ValueContent()
+			.MaxDesiredWidth(MaxPropertyWidth)
+			[
+				SNew(SScreenPositionCustomization, &LayoutBuilder, WindowPositionHandle, CenterNewWindowHandle)
+			];
+
+			GameViewportSettings.AddCustomRow(LOCTEXT("SafeZonePreviewName", "Safe Zone Preview"), false)
+				.NameContent()
+				[
+					SNew(STextBlock)
+					.Font(LayoutBuilder.GetDetailFont())
+					.Text(LOCTEXT("SafeZonePreviewName", "Safe Zone Preview"))
+				]
+				.ValueContent()
+				[
+					SNew(STextBlock)
+					.Font(LayoutBuilder.GetDetailFont())
+					.Text(this, &FLevelEditorPlaySettingsCustomization::GetPreviewText)
+				];
+		}
 
 		// play in new window settings
 		IDetailCategoryBuilder& PlayInNewWindowCategory = LayoutBuilder.EditCategory("PlayInNewWindow");
 		{
-		// Mac does not support parenting, do not show
+			// Mac does not support parenting, do not show
 #if PLATFORM_MAC
 			PlayInNewWindowCategory.AddProperty("PIEAlwaysOnTop")
 				.DisplayName(LOCTEXT("PIEAlwaysOnTop", "Always On Top"))
@@ -371,96 +587,18 @@ public:
 			PlayInNewWindowCategory.AddProperty("PIEAlwaysOnTop")
 				.DisplayName(LOCTEXT("PIEAlwaysOnTop", "Always On Top"));
 #endif
-
-			// new window size
-			TSharedRef<IPropertyHandle> WindowHeightHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowHeight));
-			TSharedRef<IPropertyHandle> WindowWidthHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowWidth));
-			TSharedRef<IPropertyHandle> WindowPositionHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, NewWindowPosition));
-			TSharedRef<IPropertyHandle> CenterNewWindowHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, CenterNewWindow));
-
-			WindowHeightHandle->MarkHiddenByCustomization();
-			WindowWidthHandle->MarkHiddenByCustomization();
-			WindowPositionHandle->MarkHiddenByCustomization();
-			CenterNewWindowHandle->MarkHiddenByCustomization();
-
-			PlayInNewWindowCategory.AddCustomRow(LOCTEXT("NewWindowSizeRow", "New Window Size"), false)
-				.NameContent()
-				[
-					SNew(STextBlock)
-						.Font(LayoutBuilder.GetDetailFont())
-						.Text(LOCTEXT("NewWindowSizeName", "New Window Size"))
-						.ToolTipText(LOCTEXT("NewWindowSizeTooltip", "Sets the width and height of floating PIE windows (in pixels)"))
-				]
-				.ValueContent()
-				.MaxDesiredWidth(MaxPropertyWidth)
-				[
-					SNew(SScreenResolutionCustomization, &LayoutBuilder, WindowHeightHandle, WindowWidthHandle)
-				];
-
-			PlayInNewWindowCategory.AddCustomRow(LOCTEXT("NewWindowPositionRow", "New Window Position"), false)
-				.NameContent()
-				[
-					SNew(STextBlock)
-						.Font(LayoutBuilder.GetDetailFont())
-						.Text(LOCTEXT("NewWindowPositionName", "New Window Position"))
-						.ToolTipText(LOCTEXT("NewWindowPositionTooltip", "Sets the screen coordinates for the top-left corner of floating PIE windows (in pixels)"))
-				]
-				.ValueContent()
-				.MaxDesiredWidth(MaxPropertyWidth)
-				[
-					SNew(SScreenPositionCustomization, &LayoutBuilder, WindowPositionHandle, CenterNewWindowHandle)
-				];
 		}
+			
 
 		// play in standalone game settings
 		IDetailCategoryBuilder& PlayInStandaloneCategory = LayoutBuilder.EditCategory("PlayInStandaloneGame");
 		{
-			// standalone window size
-			TSharedRef<IPropertyHandle> WindowHeightHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, StandaloneWindowHeight));
-			TSharedRef<IPropertyHandle> WindowWidthHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, StandaloneWindowWidth));
-			TSharedRef<IPropertyHandle> WindowPositionHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, StandaloneWindowPosition));
-			TSharedRef<IPropertyHandle> CenterNewWindowHandle = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, CenterStandaloneWindow));
-
-			WindowHeightHandle->MarkHiddenByCustomization();
-			WindowWidthHandle->MarkHiddenByCustomization();
-			WindowPositionHandle->MarkHiddenByCustomization();
-			CenterNewWindowHandle->MarkHiddenByCustomization();
-
-			PlayInStandaloneCategory.AddCustomRow(LOCTEXT("StandaloneWindowSizeName", "Standalone Window Size"), false)
-				.NameContent()
-				[
-					SNew(STextBlock)
-						.Font(LayoutBuilder.GetDetailFont())
-						.Text(LOCTEXT("StandaloneWindowSizeName", "Standalone Window Size"))
-						.ToolTipText(LOCTEXT("StandaloneWindowSizeTooltip", "Sets the width and height of standalone game windows (in pixels)"))
-				]
-				.ValueContent()
-				.MaxDesiredWidth(MaxPropertyWidth)
-				[
-					SNew(SScreenResolutionCustomization, &LayoutBuilder, WindowHeightHandle, WindowWidthHandle)
-				];
-
-			PlayInStandaloneCategory.AddCustomRow(LOCTEXT("StandaloneWindowPosName", "Standalone Window Position"), false)
-				.NameContent()
-				[
-					SNew(STextBlock)
-						.Font(LayoutBuilder.GetDetailFont())
-						.Text(LOCTEXT("StandaloneWindowPosName", "Standalone Window Position"))
-						.ToolTipText(LOCTEXT("StandaloneWindowSizeTooltip", "Sets the width and height of standalone game windows (in pixels)"))
-				]
-				.ValueContent()
-				.MaxDesiredWidth(MaxPropertyWidth)
-				[
-					SNew(SScreenPositionCustomization, &LayoutBuilder, WindowPositionHandle, CenterNewWindowHandle)
-				];
-
-
 			// command line options
 			TSharedPtr<IPropertyHandle> DisableStandaloneSoundProperty = LayoutBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, DisableStandaloneSound));
 
 			DisableStandaloneSoundProperty->MarkHiddenByCustomization();
 
-			PlayInStandaloneCategory.AddCustomRow(LOCTEXT("AdditionalStandaloneDetails", "Additional Options"), true)
+			PlayInStandaloneCategory.AddCustomRow(LOCTEXT("AdditionalStandaloneDetails", "Additional Options"), false)
 				.NameContent()
 				[
 					SNew(STextBlock)
@@ -795,6 +933,19 @@ private:
 		return (QualityLevel >= 0 && QualityLevel < AudioSettings->QualityLevels.Num() ? AudioSettings->QualityLevels[QualityLevel].DisplayName : FText::GetEmpty());
 	}
 
+	FText GetPreviewText() const 
+	{
+		if (GetDefault<ULevelEditorPlaySettings>()->DeviceToEmulate.IsEmpty())
+		{
+			float SafeZone = FDisplayMetrics::GetDebugTitleSafeZoneRatio();
+			if (FMath::IsNearlyEqual(SafeZone, 1.0f))
+			{
+				return LOCTEXT("NoSafeZoneSet", "No Device Safe Zone Set");
+			}
+			return FText::Format(LOCTEXT("UniformSafeZone", "Uniform Safe Zone: {0}"), FText::AsNumber(SafeZone));
+		}
+		return FText::FromString(GetDefault<ULevelEditorPlaySettings>()->DeviceToEmulate);
+	}
 private:
 
 	/** Collection of possible quality levels we can use as a parent for this profile */
@@ -805,4 +956,4 @@ private:
 };
 
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Editor/UnrealEd/Private/Settings/ProjectPackagingSettingsCustomization.h b/Engine/Source/Editor/UnrealEd/Private/Settings/ProjectPackagingSettingsCustomization.h
index ac7e422951ed..92231255ba06 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Settings/ProjectPackagingSettingsCustomization.h
+++ b/Engine/Source/Editor/UnrealEd/Private/Settings/ProjectPackagingSettingsCustomization.h
@@ -42,10 +42,11 @@ public:
 		IsFilteringCultures = InIsFilteringCultures;
 
 		// Identify if this culture has localization data.
-		TArray< FCultureRef > LocalizedCultures;
-		TArray<FString> LocalizationPaths = FPaths::GetGameLocalizationPaths();
-		FInternationalization::Get().GetCulturesWithAvailableLocalization(LocalizationPaths, LocalizedCultures, true);
-		HasLocalizationData = LocalizedCultures.Contains(Culture.ToSharedRef());
+		{
+			const TArray<FString> LocalizedCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ELocalizationLoadFlags::Game);
+			const TArray<FCultureRef> LocalizedCultures = FInternationalization::Get().GetAvailableCultures(LocalizedCultureNames, true);
+			HasLocalizationData = LocalizedCultures.Contains(Culture.ToSharedRef());
+		}
 
 		ChildSlot
 			[
@@ -293,9 +294,8 @@ protected:
 
 		case EFilterCulturesChoices::OnlyLocalizedCultures:
 			{
-				TArray<FCultureRef> LocalizedCultureList;
-				TArray<FString> LocalizationPaths = FPaths::GetGameLocalizationPaths();
-				FInternationalization::Get().GetCulturesWithAvailableLocalization(LocalizationPaths, LocalizedCultureList, true);
+				const TArray<FString> LocalizedCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ELocalizationLoadFlags::Game);
+				const TArray<FCultureRef> LocalizedCultureList = FInternationalization::Get().GetAvailableCultures(LocalizedCultureNames, true);
 
 				CultureList.Reset();
 				CultureList.Append(LocalizedCultureList);
diff --git a/Engine/Source/Editor/UnrealEd/Private/Settings/SettingsClasses.cpp b/Engine/Source/Editor/UnrealEd/Private/Settings/SettingsClasses.cpp
index 6f67e70bbdff..bddc6958808e 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Settings/SettingsClasses.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Settings/SettingsClasses.cpp
@@ -33,6 +33,8 @@
 #include "Interfaces/IProjectManager.h"
 #include "ProjectDescriptor.h"
 #include "Settings/SkeletalMeshEditorSettings.h"
+#include "DeviceProfiles/DeviceProfile.h"
+#include "DeviceProfiles/DeviceProfileManager.h"
 
 #define LOCTEXT_NAMESPACE "SettingsClasses"
 
@@ -113,7 +115,6 @@ UEditorExperimentalSettings::UEditorExperimentalSettings( const FObjectInitializ
 	, bEnableLocalizationDashboard(true)
 	, bUseOpenCLForConvexHullDecomp(false)
 	, bAllowPotentiallyUnsafePropertyEditing(false)
-	, bUseNewHLODPackageNamingConvention(false)
 {
 }
 
@@ -384,7 +385,6 @@ ULevelEditorPlaySettings::ULevelEditorPlaySettings( const FObjectInitializer& Ob
 	LaunchConfiguration = EPlayOnLaunchConfiguration::LaunchConfig_Default;
 	bAutoCompileBlueprintsOnLaunch = true;
 	CenterNewWindow = true;
-	CenterStandaloneWindow = true;
 
 	bBindSequencerToPIE = false;
 	bBindSequencerToSimulate = true;
@@ -415,9 +415,178 @@ void ULevelEditorPlaySettings::PostInitProperties()
 
 	NewWindowWidth = FMath::Max(0, NewWindowWidth);
 	NewWindowHeight = FMath::Max(0, NewWindowHeight);
-	StandaloneWindowWidth = FMath::Max(0, StandaloneWindowWidth);
-	StandaloneWindowHeight = FMath::Max(0, StandaloneWindowHeight);
+}
 
+FMargin ULevelEditorPlaySettings::CalculateCustomUnsafeZones(TArray<FVector2D>& CustomSafeZoneStarts, TArray<FVector2D>& CustomSafeZoneDimensions, FString& DeviceType, FVector2D PreviewSize)
+{
+	int32 PreviewHeight = PreviewSize.Y;
+	int32 PreviewWidth = PreviewSize.X;
+	bool bPreviewIsPortrait = PreviewHeight > PreviewWidth;
+	FMargin CustomSafeZoneOverride = FMargin();
+	CustomSafeZoneStarts.Empty();
+	CustomSafeZoneDimensions.Empty();
+	UDeviceProfile* DeviceProfile = UDeviceProfileManager::Get().FindProfile(DeviceType, false);
+	if (DeviceProfile)
+	{
+		FString CVarUnsafeZonesString;
+		if (DeviceProfile->GetConsolidatedCVarValue(TEXT("r.CustomUnsafeZones"), CVarUnsafeZonesString))
+		{
+			TArray<FString> UnsafeZones;
+			CVarUnsafeZonesString.ParseIntoArray(UnsafeZones, TEXT(";"), true);
+			for (FString UnsafeZone : UnsafeZones)
+			{
+				FString Orientation;
+				FString FixedState;
+				FString TempString;
+				FVector2D Start;
+				FVector2D Dimensions;
+				bool bAdjustsToDeviceRotation = false;
+				UnsafeZone.Split(TEXT("("), &TempString, &UnsafeZone);
+				Orientation = UnsafeZone.Left(1);
+				UnsafeZone.Split(TEXT("["), &TempString, &UnsafeZone);
+				if (TempString.Contains(TEXT("free")))
+				{
+					bAdjustsToDeviceRotation = true;
+				}
+
+				UnsafeZone.Split(TEXT(","), &TempString, &UnsafeZone);
+				Start.X = FCString::Atof(*TempString);
+				UnsafeZone.Split(TEXT("]"), &TempString, &UnsafeZone);
+				Start.Y = FCString::Atof(*TempString);
+				UnsafeZone.Split(TEXT("["), &TempString, &UnsafeZone);
+				UnsafeZone.Split(TEXT(","), &TempString, &UnsafeZone);
+				Dimensions.X = FCString::Atof(*TempString);
+				Dimensions.Y = FCString::Atof(*UnsafeZone);
+
+				bool bShouldScale = false;
+				float CVarMobileContentScaleFactor = FCString::Atof(*DeviceProfile->GetCVarValue(TEXT("r.MobileContentScaleFactor")));
+				if (CVarMobileContentScaleFactor != 0)
+				{
+					bShouldScale = true;
+				}
+				else
+				{
+					if (DeviceProfile->GetConsolidatedCVarValue(TEXT("r.MobileContentScaleFactor"), CVarMobileContentScaleFactor, true))
+					{
+						bShouldScale = true;
+					}
+				}
+				if (bShouldScale)
+				{
+					Start *= CVarMobileContentScaleFactor;
+					Dimensions *= CVarMobileContentScaleFactor;
+				}
+
+				if (!bAdjustsToDeviceRotation && ((Orientation.Contains(TEXT("L")) && bPreviewIsPortrait) ||
+					(Orientation.Contains(TEXT("P")) && !bPreviewIsPortrait)))
+				{
+					float Placeholder = Start.X;
+					Start.X = Start.Y;
+					Start.Y = Placeholder;
+
+					Placeholder = Dimensions.X;
+					Dimensions.X = Dimensions.Y;
+					Dimensions.Y = Placeholder;
+				}
+
+				if (Start.X < 0)
+				{
+					Start.X += PreviewWidth;
+				}
+				if (Start.Y < 0)
+				{
+					Start.Y += PreviewHeight;
+				}
+
+				// Remove any overdraw if this is an unsafe zone that could adjust with device rotation
+				if (bAdjustsToDeviceRotation)
+				{
+					if (Dimensions.X + Start.X > PreviewWidth)
+					{
+						Dimensions.X = PreviewWidth - Start.X;
+					}
+					if (Dimensions.Y + Start.Y > PreviewHeight)
+					{
+						Dimensions.Y = PreviewHeight - Start.Y;
+					}
+				}
+
+				CustomSafeZoneStarts.Add(Start);
+				CustomSafeZoneDimensions.Add(Dimensions);
+
+				if (Start.X + Dimensions.X == PreviewWidth && !FMath::IsNearlyZero(Start.X))
+				{
+					CustomSafeZoneOverride.Right = FMath::Max(CustomSafeZoneOverride.Right, Dimensions.X);
+				}
+				else if (Start.X == 0.0f && Start.X + Dimensions.X != PreviewWidth)
+				{
+					CustomSafeZoneOverride.Left = FMath::Max(CustomSafeZoneOverride.Left, Dimensions.X);
+				}
+				if (Start.Y + Dimensions.Y == PreviewHeight && !FMath::IsNearlyZero(Start.Y))
+				{
+					CustomSafeZoneOverride.Bottom = FMath::Max(CustomSafeZoneOverride.Bottom, Dimensions.Y);
+				}
+				else if (Start.Y == 0.0f && Start.Y + Dimensions.Y != PreviewHeight)
+				{
+					CustomSafeZoneOverride.Top = FMath::Max(CustomSafeZoneOverride.Top, Dimensions.Y);
+				}
+			}
+		}
+	}
+	return CustomSafeZoneOverride;
+}
+
+FMargin ULevelEditorPlaySettings::FlipCustomUnsafeZones(TArray<FVector2D>& CustomSafeZoneStarts, TArray<FVector2D>& CustomSafeZoneDimensions, FString& DeviceType, FVector2D PreviewSize)
+{
+	FMargin CustomSafeZoneOverride = CalculateCustomUnsafeZones(CustomSafeZoneStarts, CustomSafeZoneDimensions, DeviceType, PreviewSize);
+	for (FVector2D& CustomSafeZoneStart : CustomSafeZoneStarts)
+	{
+		CustomSafeZoneStart.X = PreviewSize.X - CustomSafeZoneStart.X;
+	}
+	for (FVector2D& CustomSafeZoneDimension : CustomSafeZoneDimensions)
+	{
+		CustomSafeZoneDimension.X *= -1.0f;
+	}
+	float Placeholder = CustomSafeZoneOverride.Left;
+	CustomSafeZoneOverride.Left = CustomSafeZoneOverride.Right;
+	CustomSafeZoneOverride.Right = Placeholder;
+	return CustomSafeZoneOverride;
+}
+
+void ULevelEditorPlaySettings::RescaleForMobilePreview(UDeviceProfile* DeviceProfile, int32 &PreviewWidth, int32 &PreviewHeight, float &ScaleFactor)
+{
+	bool bShouldScale = false;
+	float CVarMobileContentScaleFactor = FCString::Atof(*DeviceProfile->GetCVarValue(TEXT("r.MobileContentScaleFactor")));
+	if (CVarMobileContentScaleFactor != 0)
+	{
+		bShouldScale = true;
+	}
+	else
+	{
+		if (DeviceProfile->GetConsolidatedCVarValue(TEXT("r.MobileContentScaleFactor"), CVarMobileContentScaleFactor, true))
+		{
+			bShouldScale = true;
+		}
+	}
+	if (bShouldScale)
+	{
+		if (DeviceProfile->DeviceType == TEXT("Android"))
+		{
+			if (PreviewHeight > PreviewWidth)
+			{
+				PreviewHeight = 1280;
+				PreviewWidth = 720;
+			}
+			else
+			{
+				PreviewHeight = 720;
+				PreviewWidth = 1280;
+			}
+		}
+		PreviewWidth *= CVarMobileContentScaleFactor;
+		PreviewHeight *= CVarMobileContentScaleFactor;
+		ScaleFactor = CVarMobileContentScaleFactor;
+	}
 }
 
 /* ULevelEditorViewportSettings interface
diff --git a/Engine/Source/Editor/UnrealEd/Private/StaticMeshEdit.cpp b/Engine/Source/Editor/UnrealEd/Private/StaticMeshEdit.cpp
index 8cf0f46f2063..59932e4db671 100644
--- a/Engine/Source/Editor/UnrealEd/Private/StaticMeshEdit.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/StaticMeshEdit.cpp
@@ -1072,6 +1072,7 @@ struct ExistingLODMeshData
 	UMeshDescription*			ExistingMeshDescription;
 	TArray<FStaticMaterial>		ExistingMaterials;
 	FPerPlatformFloat			ExistingScreenSize;
+	FString						ExistingSourceImportFilename;
 };
 
 struct ExistingStaticMeshData
@@ -1101,6 +1102,7 @@ struct ExistingStaticMeshData
 	float						LpvBiasMultiplier;
 	bool						bHasNavigationData;
 	FName						LODGroup;
+	FPerPlatformInt				MinLOD;
 
 	int32						ImportVersion;
 
@@ -1219,14 +1221,10 @@ ExistingStaticMeshData* SaveExistingStaticMeshData(UStaticMesh* ExistingMesh, Un
 				}
 			}
 
-			//The normals, tangent and tangent space build setting depend of the import options, so we cannot restore them, we have to set them when re-importing
-			ExistingMesh->SourceModels[i].BuildSettings.bRecomputeNormals = ImportOptions->NormalImportMethod == FBXNIM_ComputeNormals;
-			ExistingMesh->SourceModels[i].BuildSettings.bRecomputeTangents = ImportOptions->NormalImportMethod != FBXNIM_ImportNormalsAndTangents;
-			ExistingMesh->SourceModels[i].BuildSettings.bUseMikkTSpace = (ImportOptions->NormalGenerationMethod == EFBXNormalGenerationMethod::MikkTSpace) && (!ImportOptions->ShouldImportNormals() || !ImportOptions->ShouldImportTangents());
-
 			ExistingMeshDataPtr->ExistingLODData[i].ExistingBuildSettings = ExistingMesh->SourceModels[i].BuildSettings;
 			ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings = ExistingMesh->SourceModels[i].ReductionSettings;
 			ExistingMeshDataPtr->ExistingLODData[i].ExistingScreenSize = ExistingMesh->SourceModels[i].ScreenSize.Default;
+			ExistingMeshDataPtr->ExistingLODData[i].ExistingSourceImportFilename = ExistingMesh->SourceModels[i].SourceImportFilename;
 			ExistingMeshDataPtr->ExistingLODData[i].ExistingMeshDescription = ExistingMesh->SourceModels[i].OriginalMeshDescription;
 			ExistingMesh->SourceModels[i].RawMeshBulkData->LoadRawMesh(ExistingMeshDataPtr->ExistingLODData[i].ExistingRawMesh);
 		}
@@ -1247,6 +1245,7 @@ ExistingStaticMeshData* SaveExistingStaticMeshData(UStaticMesh* ExistingMesh, Un
 		ExistingMeshDataPtr->LpvBiasMultiplier = ExistingMesh->LpvBiasMultiplier;
 		ExistingMeshDataPtr->bHasNavigationData = ExistingMesh->bHasNavigationData;
 		ExistingMeshDataPtr->LODGroup = ExistingMesh->LODGroup;
+		ExistingMeshDataPtr->MinLOD = ExistingMesh->MinLOD;
 
 		ExistingMeshDataPtr->ExistingGenerateMeshDistanceField = ExistingMesh->bGenerateMeshDistanceField;
 		ExistingMeshDataPtr->ExistingLODForCollision = ExistingMesh->LODForCollision;
@@ -1288,6 +1287,7 @@ void RestoreExistingMeshSettings(ExistingStaticMeshData* ExistingMesh, UStaticMe
 		return;
 	}
 	NewMesh->LODGroup = ExistingMesh->LODGroup;
+	NewMesh->MinLOD = ExistingMesh->MinLOD;
 	int32 ExistingNumLods = ExistingMesh->ExistingLODData.Num();
 	int32 CurrentNumLods = NewMesh->SourceModels.Num();
 	if (LODIndex == INDEX_NONE)
@@ -1311,10 +1311,15 @@ void RestoreExistingMeshSettings(ExistingStaticMeshData* ExistingMesh, UStaticMe
 			{
 				NewMesh->AddSourceModel();
 			}
-
-			NewMesh->SourceModels[i].ReductionSettings = ExistingMesh->ExistingLODData[i].ExistingReductionSettings;
+			bool bSwapFromGeneratedToImported = !ExistingMesh->ExistingLODData[i].ExistingRawMesh.IsValid() && !NewMesh->SourceModels[i].RawMeshBulkData->IsEmpty();
+			bool bWasReduced = ExistingMesh->ExistingLODData[i].ExistingReductionSettings.PercentTriangles < 1.0f || ExistingMesh->ExistingLODData[i].ExistingReductionSettings.MaxDeviation > 0.0f;
+			if (!bSwapFromGeneratedToImported && bWasReduced)
+			{
+				NewMesh->SourceModels[i].ReductionSettings = ExistingMesh->ExistingLODData[i].ExistingReductionSettings;
+			}
 			NewMesh->SourceModels[i].BuildSettings = ExistingMesh->ExistingLODData[i].ExistingBuildSettings;
 			NewMesh->SourceModels[i].ScreenSize = ExistingMesh->ExistingLODData[i].ExistingScreenSize;
+			NewMesh->SourceModels[i].SourceImportFilename = ExistingMesh->ExistingLODData[i].ExistingSourceImportFilename;
 		}
 	}
 	else
@@ -1322,9 +1327,15 @@ void RestoreExistingMeshSettings(ExistingStaticMeshData* ExistingMesh, UStaticMe
 		//Just set the old configuration for the desired LODIndex
 		if(LODIndex >= 0 && LODIndex < CurrentNumLods && LODIndex < ExistingNumLods)
 		{
-			NewMesh->SourceModels[LODIndex].ReductionSettings = ExistingMesh->ExistingLODData[LODIndex].ExistingReductionSettings;
+			bool bSwapFromGeneratedToImported = !ExistingMesh->ExistingLODData[LODIndex].ExistingRawMesh.IsValid() && !NewMesh->SourceModels[LODIndex].RawMeshBulkData->IsEmpty();
+			bool bWasReduced = ExistingMesh->ExistingLODData[LODIndex].ExistingReductionSettings.PercentTriangles < 1.0f || ExistingMesh->ExistingLODData[LODIndex].ExistingReductionSettings.MaxDeviation > 0.0f;
+			if (!bSwapFromGeneratedToImported && bWasReduced)
+			{
+				NewMesh->SourceModels[LODIndex].ReductionSettings = ExistingMesh->ExistingLODData[LODIndex].ExistingReductionSettings;
+			}
 			NewMesh->SourceModels[LODIndex].BuildSettings = ExistingMesh->ExistingLODData[LODIndex].ExistingBuildSettings;
 			NewMesh->SourceModels[LODIndex].ScreenSize = ExistingMesh->ExistingLODData[LODIndex].ExistingScreenSize;
+			NewMesh->SourceModels[LODIndex].SourceImportFilename = ExistingMesh->ExistingLODData[LODIndex].ExistingSourceImportFilename;
 		}
 	}
 
@@ -1585,8 +1596,15 @@ void RestoreExistingMeshData(ExistingStaticMeshData* ExistingMeshDataPtr, UStati
 	for(int32 i=0; i<NumCommonLODs; i++)
 	{
 		NewMesh->SourceModels[i].BuildSettings = ExistingMeshDataPtr->ExistingLODData[i].ExistingBuildSettings;
-		NewMesh->SourceModels[i].ReductionSettings = ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings;
+		//Restore the reduction settings only if the existing data was a using reduction. Because we can set some value if we reimport from existing rawmesh to auto generated.
+		bool bSwapFromGeneratedToImported = !ExistingMeshDataPtr->ExistingLODData[i].ExistingRawMesh.IsValid() && !NewMesh->SourceModels[i].RawMeshBulkData->IsEmpty();
+		bool bWasReduced = ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings.PercentTriangles < 1.0f || ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings.MaxDeviation > 0.0f;
+		if ( !bSwapFromGeneratedToImported && bWasReduced)
+		{
+			NewMesh->SourceModels[i].ReductionSettings = ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings;
+		}
 		NewMesh->SourceModels[i].ScreenSize = ExistingMeshDataPtr->ExistingLODData[i].ExistingScreenSize;
+		NewMesh->SourceModels[i].SourceImportFilename = ExistingMeshDataPtr->ExistingLODData[i].ExistingSourceImportFilename;
 	}
 
 	for(int32 i=NumCommonLODs; i < ExistingMeshDataPtr->ExistingLODData.Num(); ++i)
@@ -1603,6 +1621,7 @@ void RestoreExistingMeshData(ExistingStaticMeshData* ExistingMeshDataPtr, UStati
 		SrcModel.BuildSettings = ExistingMeshDataPtr->ExistingLODData[i].ExistingBuildSettings;
 		SrcModel.ReductionSettings = ExistingMeshDataPtr->ExistingLODData[i].ExistingReductionSettings;
 		SrcModel.ScreenSize = ExistingMeshDataPtr->ExistingLODData[i].ExistingScreenSize;
+		SrcModel.SourceImportFilename = ExistingMeshDataPtr->ExistingLODData[i].ExistingSourceImportFilename;
 	}
 
 	// Restore the section info of the just imported LOD so is section info map is remap to fit the mesh material array
diff --git a/Engine/Source/Editor/UnrealEd/Private/ThumbnailRendering/CurveLinearColorThumbnailRenderer.cpp b/Engine/Source/Editor/UnrealEd/Private/ThumbnailRendering/CurveLinearColorThumbnailRenderer.cpp
new file mode 100644
index 000000000000..11b6f52195db
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Private/ThumbnailRendering/CurveLinearColorThumbnailRenderer.cpp
@@ -0,0 +1,40 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "ThumbnailRendering/CurveLinearColorThumbnailRenderer.h"
+#include "Misc/App.h"
+#include "ShowFlags.h"
+#include "SceneView.h"
+#include "ThumbnailHelpers.h"
+
+#include "Curves/CurveLinearColor.h"
+#include "CanvasTypes.h"
+
+UCurveLinearColorThumbnailRenderer::UCurveLinearColorThumbnailRenderer(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void UCurveLinearColorThumbnailRenderer::GetThumbnailSize(UObject* Object, float Zoom, uint32& OutWidth, uint32& OutHeight) const
+{
+	UCurveLinearColor* GradientCurve = Cast<UCurveLinearColor>(Object);
+	if (GradientCurve)
+	{
+		OutWidth = 255;
+		OutHeight = 255;
+	}
+	else
+	{
+		OutWidth = 0;
+		OutHeight = 0;
+	}
+}
+
+void UCurveLinearColorThumbnailRenderer::Draw(UObject* Object, int32 X, int32 Y, uint32 Width, uint32 Height, FRenderTarget* Viewport, FCanvas* Canvas)
+{
+	UCurveLinearColor* GradientCurve = Cast<UCurveLinearColor>(Object);
+	if (GradientCurve)
+	{
+		FVector2D TextureSize = Canvas->GetRenderTarget()->GetSizeXY();
+		GradientCurve->DrawThumbnail(Canvas, FVector2D(0.f, 0.f), TextureSize);
+	}
+}
diff --git a/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorManager.cpp b/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorManager.cpp
index d30f72bb91c4..f84aa481a23e 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorManager.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorManager.cpp
@@ -547,6 +547,8 @@ void FAssetEditorManager::OpenEditorForAsset(const FString& AssetPathName)
 
 bool FAssetEditorManager::HandleTicker( float DeltaTime )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FAssetEditorManager_HandleTicker);
+
 	if (bRequestRestorePreviouslyOpenAssets)
 	{
 		RestorePreviouslyOpenAssets();
diff --git a/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorToolkit.cpp b/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorToolkit.cpp
index eb3d60db959f..3421d8d01a7b 100644
--- a/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorToolkit.cpp
+++ b/Engine/Source/Editor/UnrealEd/Private/Toolkits/AssetEditorToolkit.cpp
@@ -229,7 +229,8 @@ void FAssetEditorToolkit::InitAssetEditor( const EToolkitMode::Type Mode, const
 
 	ToolkitCommands->MapAction(
 		FAssetEditorCommonCommands::Get().ReimportAsset,
-		FExecuteAction::CreateSP( this, &FAssetEditorToolkit::Reimport_Execute ) );
+		FExecuteAction::CreateSP( this, &FAssetEditorToolkit::Reimport_Execute ),
+		FCanExecuteAction::CreateSP(this, &FAssetEditorToolkit::CanReimport));
 
 	FGlobalEditorCommonCommands::MapActions(ToolkitCommands);
 
diff --git a/Engine/Source/Editor/UnrealEd/Private/Toolkits/FConsoleCommandExecutor.cpp b/Engine/Source/Editor/UnrealEd/Private/Toolkits/FConsoleCommandExecutor.cpp
new file mode 100644
index 000000000000..27b7234f3d58
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Private/Toolkits/FConsoleCommandExecutor.cpp
@@ -0,0 +1,142 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Toolkits/FConsoleCommandExecutor.h"
+#include "EngineGlobals.h"
+#include "Editor.h"
+#include "Toolkits/GlobalEditorCommonCommands.h"
+#include "Engine/LocalPlayer.h"
+#include "GameFramework/GameStateBase.h"
+
+#define LOCTEXT_NAMESPACE "SOutputLog"
+
+FName FConsoleCommandExecutor::StaticName()
+{
+	static const FName CmdExecName = TEXT("Cmd");
+	return CmdExecName;
+}
+
+FName FConsoleCommandExecutor::GetName() const
+{
+	return StaticName();
+}
+
+FText FConsoleCommandExecutor::GetDisplayName() const
+{
+	return LOCTEXT("ConsoleCommandExecutorDisplayName", "Cmd");
+}
+
+FText FConsoleCommandExecutor::GetDescription() const
+{
+	return LOCTEXT("ConsoleCommandExecutorDescription", "Execute Unreal Console Commands");
+}
+
+FText FConsoleCommandExecutor::GetHintText() const
+{
+	return LOCTEXT("ConsoleCommandExecutorHintText", "Enter Console Command");
+}
+
+void FConsoleCommandExecutor::GetAutoCompleteSuggestions(const TCHAR* Input, TArray<FString>& Out)
+{
+	auto OnConsoleVariable = [&Out](const TCHAR *Name, IConsoleObject* CVar)
+	{
+#if (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+		if (CVar->TestFlags(ECVF_Cheat))
+		{
+			return;
+		}
+#endif // (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+		if (CVar->TestFlags(ECVF_Unregistered))
+		{
+			return;
+		}
+
+		Out.Add(Name);
+	};
+
+	IConsoleManager::Get().ForEachConsoleObjectThatContains(FConsoleObjectVisitor::CreateLambda(OnConsoleVariable), Input);
+}
+
+void FConsoleCommandExecutor::GetExecHistory(TArray<FString>& Out)
+{
+	IConsoleManager::Get().GetConsoleHistory(TEXT(""), Out);
+}
+
+bool FConsoleCommandExecutor::Exec(const TCHAR* Input)
+{
+	IConsoleManager::Get().AddConsoleHistoryEntry(TEXT(""), Input);
+
+	bool bWasHandled = false;
+	UWorld* World = nullptr;
+	UWorld* OldWorld = nullptr;
+
+	// The play world needs to handle these commands if it exists
+	if (GIsEditor && GEditor->PlayWorld && !GIsPlayInEditorWorld)
+	{
+		World = GEditor->PlayWorld;
+		OldWorld = SetPlayInEditorWorld(GEditor->PlayWorld);
+	}
+
+	ULocalPlayer* Player = GEngine->GetDebugLocalPlayer();
+	if (Player)
+	{
+		UWorld* PlayerWorld = Player->GetWorld();
+		if (!World)
+		{
+			World = PlayerWorld;
+		}
+		bWasHandled = Player->Exec(PlayerWorld, Input, *GLog);
+	}
+
+	if (!World)
+	{
+		World = GEditor->GetEditorWorldContext().World();
+	}
+	if (World)
+	{
+		if (!bWasHandled)
+		{
+			AGameModeBase* const GameMode = World->GetAuthGameMode();
+			AGameStateBase* const GameState = World->GetGameState();
+			if (GameMode && GameMode->ProcessConsoleExec(Input, *GLog, nullptr))
+			{
+				bWasHandled = true;
+			}
+			else if (GameState && GameState->ProcessConsoleExec(Input, *GLog, nullptr))
+			{
+				bWasHandled = true;
+			}
+		}
+
+		if (!bWasHandled && !Player)
+		{
+			if (GIsEditor)
+			{
+				bWasHandled = GEditor->Exec(World, Input, *GLog);
+			}
+			else
+			{
+				bWasHandled = GEngine->Exec(World, Input, *GLog);
+			}
+		}
+	}
+
+	// Restore the old world of there was one
+	if (OldWorld)
+	{
+		RestoreEditorWorld(OldWorld);
+	}
+
+	return bWasHandled;
+}
+
+bool FConsoleCommandExecutor::AllowHotKeyClose() const
+{
+	return true;
+}
+
+bool FConsoleCommandExecutor::AllowMultiLine() const
+{
+	return false;
+}
+
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Editor/UnrealEd/Public/Dialogs/Dialogs.h b/Engine/Source/Editor/UnrealEd/Public/Dialogs/Dialogs.h
index e04d423cf93a..8455d20de9e3 100644
--- a/Engine/Source/Editor/UnrealEd/Public/Dialogs/Dialogs.h
+++ b/Engine/Source/Editor/UnrealEd/Public/Dialogs/Dialogs.h
@@ -170,8 +170,21 @@ private:
 class SGenericDialogWidget : public SCompoundWidget
 {
 public:
-	SLATE_BEGIN_ARGS( SGenericDialogWidget ){}
+	SLATE_BEGIN_ARGS( SGenericDialogWidget )
+		: _UseScrollBox(true)
+		, _ScrollBoxMaxHeight(300.0f)
+	{
+	}
+		
+		/** Should this dialog use a scroll box for over-sized content? (default: true) */
+		SLATE_ARGUMENT( bool, UseScrollBox )
+
+		/** Max height for the scroll box (default: 300f) */
+		SLATE_ARGUMENT( int32, ScrollBoxMaxHeight )
+
+		/** Content for the dialog */
 		SLATE_DEFAULT_SLOT( FArguments, Content )
+
 	SLATE_END_ARGS()
 
 	void Construct( const FArguments& InArgs );
@@ -182,7 +195,7 @@ public:
 		MyWindow = InWindow;
 	}
 
-	UNREALED_API static void OpenDialog(const FText& InDialogTitle, const TSharedRef< SWidget >& DisplayContent);
+	UNREALED_API static void OpenDialog(const FText& InDialogTitle, const TSharedRef< SWidget >& DisplayContent, const FArguments& InArgs = FArguments());
 
 private:
 	FReply OnOK_Clicked(void);
diff --git a/Engine/Source/Editor/UnrealEd/Public/EditorBuildUtils.h b/Engine/Source/Editor/UnrealEd/Public/EditorBuildUtils.h
index bbea6fefcd7a..bb94e1cd008b 100644
--- a/Engine/Source/Editor/UnrealEd/Public/EditorBuildUtils.h
+++ b/Engine/Source/Editor/UnrealEd/Public/EditorBuildUtils.h
@@ -8,6 +8,8 @@
 
 #include "CoreMinimal.h"
 #include "Engine/EngineBaseTypes.h"
+#include "SceneTypes.h"
+#include "RHIDefinitions.h"
 
 /** Names of the built-in editor build types. */
 struct FBuildOptions
@@ -239,6 +241,15 @@ private:
 	 */
 	static void TriggerHierarchicalLODBuilder(UWorld* InWorld, FName Id);
 
+	/** this will attempt to trigger the associated real shader in respect to the current (mobile) emulated versions used by the editor and copy
+	 * obtained number of instructions in place of the emulated ones
+	 *
+	 * @param	QualityLevel	Material quality setting for which the shaders to be compiled
+	 * @param	FeatureLevel	RHI feature level
+	 * @param	Materials		Set of materials to compile shaders for
+	 */
+	static bool CompileShadersComplexityViewMode(EMaterialQualityLevel::Type QualityLevel, ERHIFeatureLevel::Type FeatureLevel, TSet<class UMaterialInterface*>& Materials, struct FSlowTask& ProgressTask);
+
 	/** Intentionally hide constructors, etc. to prevent instantiation */
 	FEditorBuildUtils();
 	~FEditorBuildUtils();
diff --git a/Engine/Source/Editor/UnrealEd/Public/EditorLevelUtils.h b/Engine/Source/Editor/UnrealEd/Public/EditorLevelUtils.h
index e0f5afb34855..01b1c724e9ed 100644
--- a/Engine/Source/Editor/UnrealEd/Public/EditorLevelUtils.h
+++ b/Engine/Source/Editor/UnrealEd/Public/EditorLevelUtils.h
@@ -77,10 +77,12 @@ public:
 	/**
 	 * Makes the specified level the current level for editing.
 	 * The current level is where actors are spawned to when calling SpawnActor
+	 * @param InLevel			The level to make current
+	 * @param bForceOperation	True if the operation should succeed even if the level is locked.  In certian circumstances (like removing the current level, we must be able to set a new current level even if the only one left is locked)
 	 *
 	 * @return	true	If a level was removed.
 	 */
-	static UNREALED_API void MakeLevelCurrent(ULevel* InLevel);
+	static UNREALED_API void MakeLevelCurrent(ULevel* InLevel, bool bEvenIfLocked = false);
 
 	
 	static UNREALED_API int32 MoveActorsToLevel(const TArray<AActor*>& ActorsToMove, ULevel* DestLevel, bool bWarnAboutReferences = true);
diff --git a/Engine/Source/Editor/UnrealEd/Public/FbxImporter.h b/Engine/Source/Editor/UnrealEd/Public/FbxImporter.h
index ccbe3219a450..4c699f85f8f1 100644
--- a/Engine/Source/Editor/UnrealEd/Public/FbxImporter.h
+++ b/Engine/Source/Editor/UnrealEd/Public/FbxImporter.h
@@ -712,6 +712,11 @@ public:
 	void ImportStaticMeshGlobalSockets( UStaticMesh* StaticMesh );
 	void ImportStaticMeshLocalSockets( UStaticMesh* StaticMesh, TArray<FbxNode*>& MeshNodeArray);
 
+	/*
+	 * Add a GeneratedLOD to the staticmesh at the specified LOD index
+	 */
+	void AddStaticMeshSourceModelGeneratedLOD(UStaticMesh* StaticMesh, int32 LODIndex);
+
 	/**
 	 * re-import Unreal static mesh from updated Fbx file
 	 * if the Fbx mesh is in LODGroup, the LOD of mesh will be updated
@@ -1055,6 +1060,14 @@ private:
 	*/
 	void ValidateAllMeshesAreReferenceByNodeAttribute();
 
+	/*
+	 * Parse the fbx and create some LODGroup for matching LODX_ prefix
+	 * Simply change the hierarchy to incorporate LODGroup and child all LODX_ prefix with the matching geometry name.
+	 * The LODX_ prefix support X from 0 to 9
+	 * The X parameter do not have to be continuous, but the LOD will be set in the correct order.
+	 */
+	void ConvertLodPrefixToLodGroup();
+
 	/**
 	* Recursive search for a node having a mesh attribute
 	*
diff --git a/Engine/Source/Editor/UnrealEd/Public/HierarchicalLOD.h b/Engine/Source/Editor/UnrealEd/Public/HierarchicalLOD.h
index f28e2b74aa26..dd7bbc24d536 100644
--- a/Engine/Source/Editor/UnrealEd/Public/HierarchicalLOD.h
+++ b/Engine/Source/Editor/UnrealEd/Public/HierarchicalLOD.h
@@ -95,6 +95,15 @@ struct UNREALED_API FHierarchicalLODBuilder
 	/** Builds the LOD meshes for all LODActors inside of the World's Levels */
 	void BuildMeshesForLODActors(bool bForceAll);
 
+	/** Saves HLOD meshes for actors in all the World's levels */
+	void SaveMeshesForActors();
+
+	/** 
+	 * @param	bInForce	Whether to force the recalculation of this actor's build flag. If this is false then the cached flag is used an only recalculated every so often.
+	 * @return whether a build is needed (i.e. any LOD actors are dirty) 
+	 */
+	bool NeedsBuild(bool bInForce = false) const;
+
 	/**
 	* Build a single LOD Actor's mesh
 	*
@@ -112,6 +121,9 @@ private:
 	*/
 	void BuildClusters(ULevel* InLevel, const bool bCreateMeshes);
 
+	/** Generates a single cluster for the ULevel (across all HLOD levels) */
+	void GenerateAsSingleCluster(const int32 NumHLODLevels, ULevel* InLevel, const bool bCreateMeshes);
+
 	/**
 	* Initializes the clusters, creating one for each actor within the level eligble for HLOD-ing
 	*
@@ -158,7 +170,7 @@ private:
 	* @param bPreviewOnly - Only delete preview actors
 	* @return void
 	*/
-	void DeleteLODActors(ULevel* InLevel, const bool bPreviewOnly);
+	void DeleteLODActors(ULevel* InLevel);
 
 	/** Array of LOD Clusters - this is only valid within scope since mem stack allocator */
 	TArray<FLODCluster, TMemStackAllocator<>> Clusters;
@@ -168,6 +180,7 @@ private:
 
 	/** Array of LOD clusters created for the HierachicalLODVolumes found within the level */
 	TMap<AHierarchicalLODVolume*, FLODCluster> HLODVolumeClusters;	
+	TMap<ALODActor*, AHierarchicalLODVolume*> HLODVolumeActors;
 
 	const UHierarchicalLODSettings* HLODSettings;
 
diff --git a/Engine/Source/Editor/UnrealEd/Public/LODCluster.h b/Engine/Source/Editor/UnrealEd/Public/LODCluster.h
index 0799eb7ed98c..21d79949e8d7 100644
--- a/Engine/Source/Editor/UnrealEd/Public/LODCluster.h
+++ b/Engine/Source/Editor/UnrealEd/Public/LODCluster.h
@@ -34,6 +34,8 @@ struct FLODCluster
 	FLODCluster operator-=(const FLODCluster& Other);
 	FLODCluster& operator=(const FLODCluster & Other);
 
+	bool operator==(const FLODCluster& Other) const;
+
 	/** Invalidates this cluster */
 	inline void Invalidate() { bValid = false; }
 	
diff --git a/Engine/Source/Editor/UnrealEd/Public/PackageUtilityWorkers.h b/Engine/Source/Editor/UnrealEd/Public/PackageUtilityWorkers.h
index 311d5028c1f6..c668e2b5b8ad 100644
--- a/Engine/Source/Editor/UnrealEd/Public/PackageUtilityWorkers.h
+++ b/Engine/Source/Editor/UnrealEd/Public/PackageUtilityWorkers.h
@@ -52,7 +52,7 @@ struct FPkgInfoReporter
 	 *
 	 * @param	InLinker	if specified, changes this reporter's Linker before generating the report.
 	 */
-	virtual void GeneratePackageReport( class FLinkerLoad* InLinker=NULL )=0;
+	virtual void GeneratePackageReport( class FLinkerLoad* InLinker = nullptr, FOutputDevice& Out = *GWarn)=0;
 
 	/**
 	 * Changes the target linker for this reporter.  Useful when generating reports for multiple packages.
@@ -98,5 +98,5 @@ struct FPkgInfoReporter_Log : public FPkgInfoReporter
 	 *
 	 * @param	InLinker	if specified, changes this reporter's Linker before generating the report.
 	 */
-	virtual void GeneratePackageReport( class FLinkerLoad* InLinker=NULL );
+	virtual void GeneratePackageReport( class FLinkerLoad* InLinker = nullptr, FOutputDevice& Out = *GWarn);
 };
diff --git a/Engine/Source/Editor/UnrealEd/Public/SCurveEditor.h b/Engine/Source/Editor/UnrealEd/Public/SCurveEditor.h
index ab62bffc3403..be6e4ff7f6c9 100644
--- a/Engine/Source/Editor/UnrealEd/Public/SCurveEditor.h
+++ b/Engine/Source/Editor/UnrealEd/Public/SCurveEditor.h
@@ -499,7 +499,7 @@ protected:
 	UNREALED_API virtual FReply OnMouseMove( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	UNREALED_API virtual FReply OnMouseWheel( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	UNREALED_API virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent ) override;
-	UNREALED_API virtual void   OnMouseCaptureLost() override;
+	UNREALED_API virtual void   OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 
 private:
 	/** Attempts to start a drag operation when the mouse moves. */
diff --git a/Engine/Source/Editor/UnrealEd/Public/SkelImport.h b/Engine/Source/Editor/UnrealEd/Public/SkelImport.h
index 7c2bf8b62b21..bbc3b15a52e2 100644
--- a/Engine/Source/Editor/UnrealEd/Public/SkelImport.h
+++ b/Engine/Source/Editor/UnrealEd/Public/SkelImport.h
@@ -255,6 +255,7 @@ struct ExistingSkelMeshData
 	TArray<TArray<FName>> LastImportMeshLodSectionMaterialData;
 
 	FSkeletalMeshSamplingInfo				ExistingSamplingInfo;
+	FPerPlatformInt							MinLOD;
 };
 
 /**
diff --git a/Engine/Source/Editor/UnrealEd/Public/Tests/FbxAutomationCommon.h b/Engine/Source/Editor/UnrealEd/Public/Tests/FbxAutomationCommon.h
index 64538cd64a42..b041c4dcbcfb 100644
--- a/Engine/Source/Editor/UnrealEd/Public/Tests/FbxAutomationCommon.h
+++ b/Engine/Source/Editor/UnrealEd/Public/Tests/FbxAutomationCommon.h
@@ -114,6 +114,7 @@ struct FFbxTestPlanExpectedResult
 	TArray< FString > ExpectedPresetsDataString;
 
 	FFbxTestPlanExpectedResult()
+		: ExpectedPresetsType(EFBXExpectedResultPreset::Error_Number)
 	{
 	}
 };
diff --git a/Engine/Source/Editor/UnrealEd/Public/Toolkits/FConsoleCommandExecutor.h b/Engine/Source/Editor/UnrealEd/Public/Toolkits/FConsoleCommandExecutor.h
new file mode 100644
index 000000000000..28436d6ac11d
--- /dev/null
+++ b/Engine/Source/Editor/UnrealEd/Public/Toolkits/FConsoleCommandExecutor.h
@@ -0,0 +1,31 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HAL/IConsoleManager.h"
+#include "GlobalEditorCommonCommands.h"
+
+
+/**
+* Executor for Unreal console commands
+*/
+class UNREALED_API FConsoleCommandExecutor : public IConsoleCommandExecutor
+{
+public:
+	static FName StaticName();
+	virtual FName GetName() const override;
+	virtual FText GetDisplayName() const override;
+	virtual FText GetDescription() const override;
+	virtual FText GetHintText() const override;
+	virtual void GetAutoCompleteSuggestions(const TCHAR* Input, TArray<FString>& Out) override;
+	virtual void GetExecHistory(TArray<FString>& Out) override;
+	virtual bool Exec(const TCHAR* Input) override;
+	virtual bool AllowHotKeyClose() const override;
+	virtual bool AllowMultiLine() const override;
+
+	virtual FInputChord GetHotKey() const override
+	{
+		return FGlobalEditorCommonCommands::Get().OpenConsoleCommandBox->GetActiveChord(EMultipleKeyBindingIndex::Primary).Get();
+	}
+};
diff --git a/Engine/Source/Editor/VREditor/UI/VREditorRadialFloatingUI.cpp b/Engine/Source/Editor/VREditor/UI/VREditorRadialFloatingUI.cpp
index ece0ac007392..ef3b7c6afb37 100644
--- a/Engine/Source/Editor/VREditor/UI/VREditorRadialFloatingUI.cpp
+++ b/Engine/Source/Editor/VREditor/UI/VREditorRadialFloatingUI.cpp
@@ -544,7 +544,7 @@ void AVREditorRadialFloatingUI::SimulateLeftClick()
 		}
 		if (ButtonTypeOverride == FName(TEXT("SButton")))
 		{
-			const FPointerEvent& SimulatedPointer = FPointerEvent(uint32(0), uint32(0), FVector2D::ZeroVector, FVector2D::ZeroVector, true);
+			const FPointerEvent& SimulatedPointer = FPointerEvent(uint32(0), uint32(0), FVector2D::ZeroVector, FVector2D::ZeroVector, 1.0f, true);
 			const FGeometry& ChildGeometry = FGeometry();
 			CurrentlyHoveredButton->OnMouseButtonDown(ChildGeometry, SimulatedPointer);
 			CurrentlyHoveredButton->OnMouseButtonUp(ChildGeometry, SimulatedPointer);
diff --git a/Engine/Source/Editor/ViewportInteraction/Public/ViewportInteractionTypes.h b/Engine/Source/Editor/ViewportInteraction/Public/ViewportInteractionTypes.h
index 174558564c23..59bf1b420a62 100644
--- a/Engine/Source/Editor/ViewportInteraction/Public/ViewportInteractionTypes.h
+++ b/Engine/Source/Editor/ViewportInteraction/Public/ViewportInteractionTypes.h
@@ -17,11 +17,13 @@ struct VIEWPORTINTERACTION_API FViewportActionKeyInput
 	
 	FViewportActionKeyInput() :
 		ActionType( NAME_None ),
+		Event( IE_Pressed ),
 		bIsInputCaptured( false )
 	{}
 
 	FViewportActionKeyInput( const FName& InActionType ) : 
 		ActionType( InActionType ),
+		Event( IE_Pressed ),
 		bIsInputCaptured( false )
 	{}
 
diff --git a/Engine/Source/Editor/WorldBrowser/Private/Tiles/WorldTileThumbnails.cpp b/Engine/Source/Editor/WorldBrowser/Private/Tiles/WorldTileThumbnails.cpp
index ecef583d3347..e4a2c639040d 100644
--- a/Engine/Source/Editor/WorldBrowser/Private/Tiles/WorldTileThumbnails.cpp
+++ b/Engine/Source/Editor/WorldBrowser/Private/Tiles/WorldTileThumbnails.cpp
@@ -113,7 +113,7 @@ FSlateTextureDataPtr FTileThumbnail::ToSlateTextureData(const FObjectThumbnail*
 
 FTileAtlasPage::FTileAtlasPage()
 {
-	AtlasTexture = UTexture2DDynamic::Create(TileThumbnailAtlasSize, TileThumbnailAtlasSize, PF_B8G8R8A8, false);
+	AtlasTexture = UTexture2DDynamic::Create(TileThumbnailAtlasSize, TileThumbnailAtlasSize, FTexture2DDynamicCreateInfo(PF_B8G8R8A8, false));
 	AtlasTexture->AddToRoot();
 
 	static int32 NextPageUniqueID = 1;
diff --git a/Engine/Source/Programs/AutomationTool/Android/AndroidPlatform.Automation.cs b/Engine/Source/Programs/AutomationTool/Android/AndroidPlatform.Automation.cs
index 54efbd83b2e7..a52e0183b75f 100644
--- a/Engine/Source/Programs/AutomationTool/Android/AndroidPlatform.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Android/AndroidPlatform.Automation.cs
@@ -61,16 +61,76 @@ public class AndroidPlatform : Platform
 		return ApkName;
 	}
 
-	private static string GetFinalSymbolizedSODirectory(DeploymentContext SC, string Architecture, string GPUArchitecture)
-	{
-		ConfigHierarchy Ini = ConfigCache.ReadHierarchy(ConfigHierarchyType.Engine, DirectoryReference.FromFile(SC.RawProjectPath), SC.StageTargetPlatform.PlatformType);
-		int StoreVersion;
-		Ini.GetInt32("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "StoreVersion", out StoreVersion);
+	private static bool bHaveReadEngineVersion = false;
+	private static string EngineMajorVersion = "4";
+	private static string EngineMinorVersion = "0";
+	private static string EnginePatchVersion = "0";
+	private static string EngineChangelist = "0";
 
-		return SC.ShortProjectName + "_Symbols_v" + StoreVersion + "/" + SC.ShortProjectName + Architecture + GPUArchitecture;
+	private static string ReadEngineVersion(string EngineDirectory)
+	{
+		if (!bHaveReadEngineVersion)
+		{
+			string EngineVersionFile = Path.Combine(EngineDirectory, "Source", "Runtime", "Launch", "Resources", "Version.h");
+			string[] EngineVersionLines = File.ReadAllLines(EngineVersionFile);
+			for (int i = 0; i < EngineVersionLines.Length; ++i)
+			{
+				if (EngineVersionLines[i].StartsWith("#define ENGINE_MAJOR_VERSION"))
+				{
+					EngineMajorVersion = EngineVersionLines[i].Split('\t')[1].Trim(' ');
+				}
+				else if (EngineVersionLines[i].StartsWith("#define ENGINE_MINOR_VERSION"))
+				{
+					EngineMinorVersion = EngineVersionLines[i].Split('\t')[1].Trim(' ');
+				}
+				else if (EngineVersionLines[i].StartsWith("#define ENGINE_PATCH_VERSION"))
+				{
+					EnginePatchVersion = EngineVersionLines[i].Split('\t')[1].Trim(' ');
+				}
+				else if (EngineVersionLines[i].StartsWith("#define BUILT_FROM_CHANGELIST"))
+				{
+					EngineChangelist = EngineVersionLines[i].Split(new char[] { ' ', '\t' })[2].Trim(' ');
+				}
+			}
+
+			bHaveReadEngineVersion = true;
+		}
+
+		return EngineMajorVersion + "." + EngineMinorVersion + "." + EnginePatchVersion;
 	}
 
-	private static string GetFinalObbName(string ApkName)
+	private static int GetStoreVersion(DeploymentContext SC)
+	{
+		ConfigHierarchy Ini = ConfigCache.ReadHierarchy(ConfigHierarchyType.Engine, DirectoryReference.FromFile(SC.RawProjectPath), SC.StageTargetPlatform.PlatformType);
+		int StoreVersion = 1;
+		Ini.GetInt32("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "StoreVersion", out StoreVersion);
+
+		bool bUseChangeListAsStoreVersion = false;
+		Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bUseChangeListAsStoreVersion", out bUseChangeListAsStoreVersion);
+
+		// override store version with changelist if enabled and is build machine
+		if (bUseChangeListAsStoreVersion && Environment.GetEnvironmentVariable("IsBuildMachine") == "1")
+		{
+			int Changelist = 0;
+			ReadEngineVersion(SC.EngineRoot.FullName);
+			if (int.TryParse(EngineChangelist, out Changelist))
+			{
+				if (Changelist != 0)
+				{
+					StoreVersion = Changelist;
+				}
+			}
+		}
+
+		return StoreVersion;
+	}
+
+	private static string GetFinalSymbolizedSODirectory(DeploymentContext SC, string Architecture, string GPUArchitecture)
+	{
+		return SC.ShortProjectName + "_Symbols_v" + GetStoreVersion(SC) + "/" + SC.ShortProjectName + Architecture + GPUArchitecture;
+	}
+
+	private static string GetFinalObbName(string ApkName, bool bUseAppType = true)
 	{
 		// calculate the name for the .obb file
 		string PackageName = GetPackageInfo(ApkName, false);
@@ -91,7 +151,7 @@ public class AndroidPlatform : Platform
 			PackageVersion = IntVersion.ToString("0");
 		}
 
-		string AppType = GetMetaAppType();
+		string AppType = bUseAppType ? GetMetaAppType() : "";
 		if (AppType.Length > 0)
 		{
 			AppType += ".";
@@ -105,9 +165,23 @@ public class AndroidPlatform : Platform
 		return ObbName;
 	}
 
+
+	public override string GetPlatformPakCommandLine(ProjectParams Params, DeploymentContext SC)
+	{
+		string PakParams = "";
+
+		string OodleDllPath = DirectoryReference.Combine(SC.ProjectRoot, "Binaries/ThirdParty/Oodle/Win64/UnrealPakPlugin.dll").FullName;
+		if (File.Exists(OodleDllPath))
+		{
+			PakParams += String.Format(" -customcompressor=\"{0}\"", OodleDllPath);
+		}
+
+		return PakParams;
+	}
+
 	private static string GetDeviceObbName(string ApkName)
 	{
-        string ObbName = GetFinalObbName(ApkName);
+        string ObbName = GetFinalObbName(ApkName, false);
         string PackageName = GetPackageInfo(ApkName, false);
         return TargetAndroidLocation + PackageName + "/" + Path.GetFileName(ObbName);
 	}
@@ -248,7 +322,30 @@ public class AndroidPlatform : Platform
 							e.CurrentEntry.FileName);
 					}
 				};
-			ObbFile.AddDirectory(SC.StageDirectory+"/"+SC.ShortProjectName, SC.ShortProjectName);
+
+
+
+			FileFilter ObbFileFilter = new FileFilter(FileFilterType.Include);
+			ConfigHierarchy EngineIni = ConfigCache.ReadHierarchy(ConfigHierarchyType.Engine, DirectoryReference.FromFile(Params.RawProjectPath), UnrealTargetPlatform.Android);
+			List<string> ObbFilters;
+			EngineIni.GetArray("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "ObbFilters", out ObbFilters);
+			if (ObbFilters != null)
+			{
+				ObbFileFilter.AddRules(ObbFilters);
+			}
+
+			string StageDirectoryPath = Path.Combine(SC.StageDirectory.FullName, SC.ShortProjectName);
+			List<FileReference> FilesToObb = ObbFileFilter.ApplyToDirectory(new DirectoryReference(StageDirectoryPath), true);
+
+			foreach (FileReference FileToObb in FilesToObb)
+			{
+				string DestinationPath = Path.GetDirectoryName(FileToObb.FullName).Replace(StageDirectoryPath, SC.ShortProjectName);
+				ObbFile.AddFile(FileToObb.FullName, DestinationPath);
+			}
+			
+
+
+			// ObbFile.AddDirectory(SC.StageDirectory+"/"+SC.ShortProjectName, SC.ShortProjectName);
 			try
 			{
 				ObbFile.Save();
@@ -726,7 +823,7 @@ public class AndroidPlatform : Platform
 
 	private static string GetAdbCommandLine(ProjectParams Params, string SerialNumber, string Args)
 	{
-	    if (SerialNumber != "")
+	    if (string.IsNullOrEmpty(SerialNumber) == false)
 		{
 			SerialNumber = "-s " + SerialNumber;
 		}
@@ -757,7 +854,7 @@ public class AndroidPlatform : Platform
 		return Message;
 	}
 
-	public static IProcessResult RunAdbCommand(ProjectParams Params, string SerialNumber, string Args, string Input = null, ERunOptions Options = ERunOptions.Default)
+	public static IProcessResult RunAdbCommand(ProjectParams Params, string SerialNumber, string Args, string Input = null, ERunOptions Options = ERunOptions.Default, bool bShouldLogCommand = false)
 	{
 		string AdbCommand = Environment.ExpandEnvironmentVariables("%ANDROID_HOME%/platform-tools/adb" + (Utils.IsRunningOnMono ? "" : ".exe"));
 		if (Options.HasFlag(ERunOptions.AllowSpew) || Options.HasFlag(ERunOptions.SpewIsVerbose))
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/AutomationUtils.Automation.csproj b/Engine/Source/Programs/AutomationTool/AutomationUtils/AutomationUtils.Automation.csproj
index 272b93863925..cfbec3569994 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/AutomationUtils.Automation.csproj
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/AutomationUtils.Automation.csproj
@@ -40,6 +40,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
@@ -57,8 +58,8 @@
     <Compile Include="BuildUtils.cs" />
     <Compile Include="CommandEnvironment.cs" />
     <Compile Include="DeviceReservation.cs" />
+    <Compile Include="ImageUtils.cs" />
     <Compile Include="LogUtils.cs" />
-    <Compile Include="ManagedProcess.cs" />
     <Compile Include="CommandletUtils.cs" />
     <Compile Include="CommandUtils.cs" />
     <Compile Include="DeploymentContext.cs" />
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandEnvironment.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandEnvironment.cs
index 7d50190f9052..8f692fc9d675 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandEnvironment.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandEnvironment.cs
@@ -112,7 +112,12 @@ namespace AutomationTool
 				}
 				CommandUtils.SetEnvVar(EnvVarNames.LogFolder, LogFolder);
 			}
-			ClearLogFolder(LogFolder);
+
+			// clear the logfolder if we're the only running instance
+			if (InternalUtils.IsSoleInstance)
+			{
+				ClearLogFolder(LogFolder);
+			}
 
 			FinalLogFolder = CommandUtils.GetEnvVar(EnvVarNames.FinalLogFolder);
 			if(String.IsNullOrEmpty(FinalLogFolder))
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandletUtils.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandletUtils.cs
index 1ed4dd52af95..6694b6887e83 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandletUtils.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/CommandletUtils.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -88,9 +88,6 @@ namespace AutomationTool
                 CommandletArguments += (CommandletArguments.Length > 0 ? " " : "") + CulturesToCookArg;
             }
 
-			// UAT has it's own option for appending log timestamps; we don't need the UE4 timestamps too.
-			CommandletArguments += " -NoLogTimes";
-
             RunCommandlet(ProjectName, UE4Exe, "Cook", String.Format("{0} -TargetPlatform={1} {2}",  CommandletArguments, TargetPlatform, Parameters));
 		}
 
@@ -257,7 +254,7 @@ namespace AutomationTool
 			string LocalLogFile = LogUtils.GetUniqueLogName(CombinePaths(CmdEnv.EngineSavedFolder, Commandlet));
 			Log("Commandlet log file is {0}", LocalLogFile);
 			string Args = String.Format(
-				"{0} -run={1} {2} -abslog={3} -stdout -CrashForUAT -unattended {5}{4}",
+				"{0} -run={1} {2} -abslog={3} -stdout -CrashForUAT -unattended -NoLogTimes {5}{4}",
 				(ProjectName == null) ? "" : CommandUtils.MakePathSafeToUseWithCommandLine(ProjectName.FullName),
 				Commandlet,
 				String.IsNullOrEmpty(Parameters) ? "" : Parameters,
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/ImageUtils.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/ImageUtils.cs
new file mode 100644
index 000000000000..c182f98164e4
--- /dev/null
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/ImageUtils.cs
@@ -0,0 +1,50 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Linq;
+
+namespace AutomationTool
+{
+	public static class ImageUtils
+	{
+		/// <summary>
+		/// Resave an image file as a .jpg file, with the specified quality and scale.
+		/// </summary>
+		public static void ResaveImageAsJpgWithScaleAndQuality(string SrcImagePath, string DstImagePath, float Scale, int JpgQuality)
+		{
+			// Find the built-in jpg encoder
+			var Codec = ImageCodecInfo.GetImageDecoders().Where(d => d.FormatID == ImageFormat.Jpeg.Guid).First();
+
+			using (var SrcImage = Image.FromFile(SrcImagePath))
+			{
+				// Create a resized destination bitmap
+				var DstRect = new Rectangle(0, 0, (int)(SrcImage.Width * Scale), (int)(SrcImage.Height * Scale));
+				using (var DstImage = new Bitmap(DstRect.Width, DstRect.Height))
+				{
+					DstImage.SetResolution(SrcImage.HorizontalResolution, SrcImage.VerticalResolution);
+
+					// Draw and scale the original image into the new bitmap.
+					using (var Grfx = Graphics.FromImage(DstImage))
+					using (var ImageAttrs = new ImageAttributes())
+					{
+						Grfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
+						Grfx.CompositingQuality = CompositingQuality.HighQuality;
+						Grfx.CompositingMode = CompositingMode.SourceCopy;
+						Grfx.PixelOffsetMode = PixelOffsetMode.HighQuality;
+						Grfx.SmoothingMode = SmoothingMode.HighQuality;
+
+						ImageAttrs.SetWrapMode(WrapMode.TileFlipXY);
+						Grfx.DrawImage(SrcImage, DstRect, 0, 0, SrcImage.Width, SrcImage.Height, GraphicsUnit.Pixel, ImageAttrs);
+					}
+					
+					// Save using the Jpg encoder and a custom quality level.
+					var EncParams = new EncoderParameters(1);
+					EncParams.Param[0] = new EncoderParameter(Encoder.Quality, JpgQuality);
+					DstImage.Save(DstImagePath, Codec, EncParams);
+				}
+			}
+		}
+	}
+}
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/MCPPublic.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/MCPPublic.cs
index d4089a010851..3949c0ee1053 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/MCPPublic.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/MCPPublic.cs
@@ -158,11 +158,15 @@ namespace EpicGames.MCP.Automation
         /// BuildVersion of the App we are staging.
         /// </summary>
         public readonly string BuildVersion;
-        /// <summary>
-        /// Directory where builds will be staged. Rooted at the BuildRootPath, using a subfolder passed in the ctor, 
-        /// and using BuildVersion/PlatformName to give each builds their own home.
-        /// </summary>
-        public readonly string StagingDir;
+		/// <summary>
+		/// Metadata for the build consisting of arbitrary json data. Will be null if no metadata exists.
+		/// </summary>
+		public BuildMetadataBase Metadata;
+		/// <summary>
+		/// Directory where builds will be staged. Rooted at the BuildRootPath, using a subfolder passed in the ctor, 
+		/// and using BuildVersion/PlatformName to give each builds their own home.
+		/// </summary>
+		public readonly string StagingDir;
         /// <summary>
         /// Path to the CloudDir where chunks will be written (relative to the BuildRootPath)
         /// This is used to copy to the web server, so it can use the same relative path to the root build directory.
@@ -289,6 +293,7 @@ namespace EpicGames.MCP.Automation
             StagingDir = CommandUtils.CombinePaths(BuildRootPath, stagingDirRelativePath, BuildVersion, Platform.ToString());
             CloudDirRelativePath = CommandUtils.CombinePaths(stagingDirRelativePath, "CloudDir");
             CloudDir = CommandUtils.CombinePaths(BuildRootPath, CloudDirRelativePath);
+			Metadata = null;
         }
 
 		/// <summary>
@@ -325,6 +330,7 @@ namespace EpicGames.MCP.Automation
 			StagingDir = CommandUtils.CombinePaths(BuildRootPath, StagingDirRelativePath, BuildVersion, StagingDirSuffix);
 			CloudDirRelativePath = CommandUtils.CombinePaths(StagingDirRelativePath, "CloudDir");
 			CloudDir = CommandUtils.CombinePaths(BuildRootPath, CloudDirRelativePath);
+			Metadata = null;
 		}
 
 		/// <summary>
@@ -338,6 +344,7 @@ namespace EpicGames.MCP.Automation
 			BuildVersion = InBuildVersion;
 			Platform = InPlatform;
 			CloudDir = InCloudDir;
+			Metadata = null;
 		}
 
 		/// <summary>
@@ -350,6 +357,7 @@ namespace EpicGames.MCP.Automation
 			AppID = InAppID;
 			BuildVersion = InBuildVersion;
 			Platform = InPlatform;
+			Metadata = null;
 			if (InStagingDir != null)
 			{
 				StagingDir = InStagingDir.FullName;
@@ -370,6 +378,38 @@ namespace EpicGames.MCP.Automation
 			}
 		}
 
+		/// <summary>
+		/// Associates a piece of metadata (in the form of a key value pair) with the build info.
+		/// </summary>
+		/// <param name="Key">The key to store the metadata against.</param>
+		/// <param name="Value">The value of the metadata to associate.</param>
+		/// <param name="bClobber">Optional, specifies whether to overwrite the existing key if it exists, default true.</param>
+		/// <returns>The BuildPatchToolStagingInfo to facilitate fluent syntax.</returns>
+		public BuildPatchToolStagingInfo WithMetadata(string Key, string Value, bool bClobber = true)
+		{
+			BuildMetadataBase NewMeta = BuildInfoPublisherBase.Get().CreateBuildMetadata(string.Format(@"{{""{0}"":""{1}""}}", Key, Value));
+			return WithMetadata(NewMeta, bClobber);
+		}
+
+		/// <summary>
+		/// Associates new metadata with the build info.
+		/// </summary>
+		/// <param name="NewMetadata">The metadata object to merge in.</param>
+		/// <param name="bClobber">Optional, specifies whether to overwrite the existing key if it exists, default true.</param>
+		/// <returns>The BuildPatchToolStagingInfo to facilitate fluent syntax.</returns>
+		public BuildPatchToolStagingInfo WithMetadata(BuildMetadataBase NewMetadata, bool bClobber = true)
+		{
+			if (Metadata != null)
+			{
+				Metadata.MergeWith(NewMetadata, bClobber);
+			}
+			else
+			{
+				Metadata = NewMetadata;
+			}
+			return this;
+		}
+
 		/// <summary>
 		/// Returns the manifest filename, querying build info for it if necessary.
 		/// If ManifestFilename has already set (either during construction or by a previous call to this method) the cached value will be returned unless bForce is specified.
@@ -393,7 +433,19 @@ namespace EpicGames.MCP.Automation
 
 			return _ManifestFilename;
 		}
-    }
+
+		/// <summary>
+		/// Adds and returns the metadata for this build, querying build info for any additional fields.
+		/// </summary>
+		/// <param name="McpConfigName">Optional, name of which MCP config to check against, default null which will use the one stored in this BuildPatchToolStagingInfo.</param>
+		/// <param name="bClobber">Optional, specifies whether to overwrite existing metadata keys with those received, default false.</param>
+		/// <returns>The Metadata dictionary</returns>
+		public BuildMetadataBase RetrieveBuildMetadata(string McpConfigName = null, bool bClobber = false)
+		{
+			BuildInfoPublisherBase BI = BuildInfoPublisherBase.Get();
+			return BI.GetBuildMetaData(this, McpConfigName ?? McpConfigKey, bClobber);
+		}
+	}
 
 	/// <summary>
 	/// Class that provides programmatic access to the BuildPatchTool
@@ -813,11 +865,24 @@ namespace EpicGames.MCP.Automation
 		public abstract void Execute(PackageChunksOptions Opts, ToolVersion Version = ToolVersion.Live);
 	}
 
+	/// <summary>
+	/// Class that provides programmatic access to the metadata field from build info.
+	/// </summary>
+	public abstract class BuildMetadataBase
+	{
+		/// <summary>
+		/// Merges provided metadata object into this one.
+		/// </summary>
+		/// <param name="Other">The other metadata to merge in.</param>
+		/// <param name="bClobber">Optional, specifies whether to overwrite existing metadata keys with those in Other, default true.</param>
+		/// <returns>this object to facilitate fluent syntax.</returns>
+		abstract public BuildMetadataBase MergeWith(BuildMetadataBase Other, bool bClobber = true);
+	}
 
-    /// <summary>
-    /// Helper class
-    /// </summary>
-    public abstract class BuildInfoPublisherBase
+	/// <summary>
+	/// Helper class
+	/// </summary>
+	public abstract class BuildInfoPublisherBase
     {
         static BuildInfoPublisherBase Handler = null;
  
@@ -846,6 +911,13 @@ namespace EpicGames.MCP.Automation
             return Handler;
         }
 
+		/// <summary>
+		/// Creates a metadata object implementation, initialized with the provided JSON object.
+		/// </summary>
+		/// <param name="JsonRepresentation">JSON object representation to initialize with.</param>
+		/// <returns>new instance of metadata implementation.</returns>
+		abstract public BuildMetadataBase CreateBuildMetadata(string JsonRepresentation);
+
 		/// <summary>
 		/// Determines whether a given build is registered in build info
 		/// </summary>
@@ -881,6 +953,24 @@ namespace EpicGames.MCP.Automation
 		/// <param name="McpConfigName">Name of which MCP config to query.</param>
 		/// <returns></returns>
 		abstract public string GetBuildManifestUrl(BuildPatchToolStagingInfo StagingInfo, string McpConfigName);
+
+		/// <summary>
+		/// Given a staging info defining our build, return the manifest hash for that registered build
+		/// </summary>
+		/// <param name="StagingInfo">Staging Info describing the BuildInfo to query.</param>
+		/// <param name="McpConfigName">Name of which MCP config to query.</param>
+		/// <returns>Manifest SHA1 hash as a hex string</returns>
+		abstract public string GetBuildManifestHash(BuildPatchToolStagingInfo StagingInfo, string McpConfigName);
+
+		/// <summary>
+		/// Given a staging info defining our build, fetch and apply the metadata for that registered build.
+		/// </summary>
+		/// <param name="StagingInfo">Staging Info describing the BuildInfo to query.</param>
+		/// <param name="McpConfigName">Name of which MCP config to query.</param>
+		/// <param name="bClobber">Optional, specifies whether to overwrite existing metadata keys with those received, default false.</param>
+		/// <returns>The metadata object for convenience.</returns>
+		abstract public BuildMetadataBase GetBuildMetaData(BuildPatchToolStagingInfo StagingInfo, string McpConfigName, bool bClobber = false);
+
 		/// <summary>
 		/// Get a label string for the specific Platform requested.
 		/// </summary>
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/Platform.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/Platform.cs
index 1e564a51efff..0e198bf4532b 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/Platform.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/Platform.cs
@@ -387,16 +387,6 @@ namespace AutomationTool
             return new List<string>();
         }
 
-		/// <summary>
-		/// Remaps movie directory for platforms that need a remap
-		/// If true, CopyBuildToStagingDirectory.Automation.cs will do this. 
-		/// If false, each platform can still do this individually.
-		/// </summary>
-		public virtual bool StageMovies
-		{
-			get { return true; }
-		}
-
 		/// <summary>
 		/// UnrealTargetPlatform type for this platform.
 		/// </summary>
@@ -467,7 +457,7 @@ namespace AutomationTool
 		/// <summary>
 		/// Returns platform specific command line options for UnrealPak
 		/// </summary>
-		public virtual string GetPlatformPakCommandLine()
+		public virtual string GetPlatformPakCommandLine(ProjectParams Params, DeploymentContext SC)
 		{
 			return "";
 		}
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/ProjectParams.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/ProjectParams.cs
index a30794ae027f..dfdf94d7dd67 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/ProjectParams.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/ProjectParams.cs
@@ -330,6 +330,7 @@ namespace AutomationTool
 			this.ServerConfigsToBuild = InParams.ServerConfigsToBuild;
 			this.NumClients = InParams.NumClients;
             this.Compressed = InParams.Compressed;
+			this.AdditionalPakOptions = InParams.AdditionalPakOptions;
             this.UseDebugParamForEditorExe = InParams.UseDebugParamForEditorExe;
 			this.Archive = InParams.Archive;
 			this.ArchiveDirectoryParam = InParams.ArchiveDirectoryParam;
@@ -390,9 +391,10 @@ namespace AutomationTool
 			bool? SkipServer = null,
 			bool? Clean = null,
             bool? Compressed = null,
+			string AdditionalPakOptions = null,
             bool? UseDebugParamForEditorExe = null,
             bool? IterativeCooking = null,
-			bool? IterateSharedCookedBuild = null,
+			string IterateSharedCookedBuild = null,
 			bool? IterateSharedBuildUsePrecompiledExe = null,
 			bool? CookAll = null,
 			bool? CookPartialGC = null,
@@ -630,9 +632,11 @@ namespace AutomationTool
                 this.NumCookersToSpawn = Command.ParseParamInt("NumCookersToSpawn");
             }
             this.Compressed = GetParamValueIfNotSpecified(Command, Compressed, this.Compressed, "compressed");
+			this.AdditionalPakOptions = ParseParamValueIfNotSpecified(Command, AdditionalPakOptions, "AdditionalPakOptions");
             this.UseDebugParamForEditorExe = GetParamValueIfNotSpecified(Command, UseDebugParamForEditorExe, this.UseDebugParamForEditorExe, "UseDebugParamForEditorExe");
 			this.IterativeCooking = GetParamValueIfNotSpecified(Command, IterativeCooking, this.IterativeCooking, new string[] { "iterativecooking", "iterate" });
-			this.IterateSharedCookedBuild = GetParamValueIfNotSpecified(Command, IterateSharedCookedBuild, this.IterateSharedCookedBuild, new string[] { "IterateSharedCookedBuild"});
+			this.IterateSharedCookedBuild = GetParamValueIfNotSpecified(Command, false, false, "iteratesharedcookedbuild") ? "usesyncedbuild" : null;
+			this.IterateSharedCookedBuild = ParseParamValueIfNotSpecified(Command, IterateSharedCookedBuild, "IterateSharedCookedBuild", String.Empty);
 			this.IterateSharedBuildUsePrecompiledExe = GetParamValueIfNotSpecified(Command, IterateSharedBuildUsePrecompiledExe, this.IterateSharedBuildUsePrecompiledExe, new string[] { "IterateSharedBuildUsePrecompiledExe" });
 			
 			this.SkipCookOnTheFly = GetParamValueIfNotSpecified(Command, SkipCookOnTheFly, this.SkipCookOnTheFly, "skipcookonthefly");
@@ -1525,6 +1529,11 @@ namespace AutomationTool
         /// </summary>
         public bool Compressed;
 
+		/// <summary>
+		/// Additional parameters when generating the PAK file
+		/// </summary>
+		public string AdditionalPakOptions;
+
         /// <summary>
         /// put -debug on the editorexe commandline
         /// </summary>
@@ -1546,7 +1555,7 @@ namespace AutomationTool
 		/// Cook: Iterate from a build on the network
 		/// </summary>
 		[Help("Iteratively cook from a shared cooked build")]
-		public bool IterateSharedCookedBuild;
+		public string IterateSharedCookedBuild;
 
 		/// <summary>
 		/// Build: Don't build the game instead use the prebuild exe (requires iterate shared cooked build
@@ -2158,6 +2167,11 @@ namespace AutomationTool
 			get { return !CommandUtils.IsNullOrEmpty(DirectoriesToCook); }
 		}
 
+		public bool HasIterateSharedCookedBuild
+		{
+			get { return !String.IsNullOrEmpty(IterateSharedCookedBuild);  }
+		}
+
         public bool HasInternationalizationPreset
         {
             get { return !String.IsNullOrEmpty(InternationalizationPreset); }
@@ -2536,7 +2550,7 @@ namespace AutomationTool
                 throw new AutomationException("Can't create a release version at the same time as creating dlc.");
             }
 
-            if (HasBasedOnReleaseVersion && (IterativeCooking || IterativeDeploy || IterateSharedCookedBuild))
+            if (HasBasedOnReleaseVersion && (IterativeCooking || IterativeDeploy || HasIterateSharedCookedBuild))
             {
                 throw new AutomationException("Can't use iterative cooking / deploy on dlc or patching or creating a release");
             }
@@ -2561,10 +2575,10 @@ namespace AutomationTool
 				throw new AutomationException("-createchunkinstall must specify the chunk install data version string with -chunkinstallversion=");
 			}
 
-			if(IsGeneratingRemaster && string.IsNullOrEmpty(DiscVersion))
+			/*if(IsGeneratingRemaster && string.IsNullOrEmpty(DiscVersion))
 			{
 				throw new AutomationException("DiscVersion is required for generating remaster package.");
-			}
+			}*/
 		}
 
 		protected bool bLogged = false;
@@ -2592,6 +2606,7 @@ namespace AutomationTool
 				CommandUtils.LogLog("ClientCookedTargets={0}", ClientCookedTargets.ToString());
 				CommandUtils.LogLog("ClientTargetPlatform={0}", string.Join(",", ClientTargetPlatforms));
 				CommandUtils.LogLog("Compressed={0}", Compressed);
+				CommandUtils.LogLog("AdditionalPakOptions={0}", AdditionalPakOptions);
 				CommandUtils.LogLog("UseDebugParamForEditorExe={0}", UseDebugParamForEditorExe);
 				CommandUtils.LogLog("CookOnTheFly={0}", CookOnTheFly);
 				CommandUtils.LogLog("CookOnTheFlyStreaming={0}", CookOnTheFlyStreaming);
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/UE4Build.cs b/Engine/Source/Programs/AutomationTool/AutomationUtils/UE4Build.cs
index df9971daa57a..7506e6743875 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/UE4Build.cs
+++ b/Engine/Source/Programs/AutomationTool/AutomationUtils/UE4Build.cs
@@ -1203,6 +1203,11 @@ namespace AutomationTool
 			return UnrealBuildTool.PlatformExports.CanUseXGE(Platform);
 		}
 
+		public bool CanUseParallelExecutor(UnrealBuildTool.UnrealTargetPlatform Platform)
+		{
+			return UnrealBuildTool.PlatformExports.CanUseParallelExecutor(Platform);
+		}
+
 		private bool ParseParam(string Name)
 		{
 			return OwnerCommand != null && OwnerCommand.ParseParam(Name);
@@ -1356,7 +1361,7 @@ namespace AutomationTool
 				}
 				foreach (var Target in Agenda.Targets)
 				{
-					if (Target.TargetName == "UnrealHeaderTool" || !CanUseXGE(Target.Platform))
+					if (Target.TargetName == "UnrealHeaderTool" || !(bCanUseXGE? CanUseXGE(Target.Platform) : CanUseParallelExecutor(Target.Platform)))
 					{
 						// When building a target for Mac or iOS, use UBT's -flushmac option to clean up the remote builder
 						bool bForceFlushMac = DeleteBuildProducts && (Target.Platform == UnrealBuildTool.UnrealTargetPlatform.Mac || Target.Platform == UnrealBuildTool.UnrealTargetPlatform.IOS);
@@ -1373,7 +1378,7 @@ namespace AutomationTool
 				CommandUtils.LogSetProgress(InShowProgress, "Generating headers...");
 				foreach (var Target in Agenda.Targets)
 				{
-					if (Target.TargetName != "UnrealHeaderTool" && CanUseXGE(Target.Platform))
+					if (Target.TargetName != "UnrealHeaderTool" && (bCanUseXGE? CanUseXGE(Target.Platform) : CanUseParallelExecutor(Target.Platform)))
 					{
 						XGEItem Item = XGEPrepareBuildWithUBT(Target.TargetName, Target.Platform, Target.Config.ToString(), Target.UprojectPath, bForceMonolithic, bForceNonUnity, bForceDebugInfo, Target.UBTArgs, bForceUnity);
 						if(InTargetToManifest != null)
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Graph.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Graph.cs
index 917124112e3b..193421c515e0 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Graph.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Graph.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 using System;
 using System.Collections.Generic;
@@ -473,6 +473,7 @@ namespace AutomationTool
 							JsonWriter.WriteObjectStart();
 							JsonWriter.WriteValue("Name", Node.Name);
 							JsonWriter.WriteValue("DependsOn", String.Join(";", Node.GetDirectOrderDependencies().Where(x => NodesToExecute.Contains(x) && x.ControllingTrigger == Trigger)));
+							JsonWriter.WriteValue("RunEarly", Node.bRunEarly);
 							JsonWriter.WriteObjectStart("Notify");
 							JsonWriter.WriteValue("Default", String.Join(";", Node.NotifyUsers));
 							JsonWriter.WriteValue("Submitters", String.Join(";", Node.NotifySubmitters));
@@ -659,7 +660,7 @@ namespace AutomationTool
 						CommandUtils.Log("        Agent: {0} ({1})", Agent.Name, String.Join(";", Agent.PossibleTypes));
 						foreach(Node Node in Nodes)
 						{
-							CommandUtils.Log("            Node: {0}{1}", Node.Name, CompletedNodes.Contains(Node)? " (completed)" : "");
+							CommandUtils.Log("            Node: {0}{1}", Node.Name, CompletedNodes.Contains(Node)? " (completed)" : Node.bRunEarly? " (early)" : "");
 							if(PrintOptions.HasFlag(GraphPrintOptions.ShowDependencies))
 							{
 								HashSet<Node> InputDependencies = new HashSet<Node>(Node.GetDirectInputDependencies());
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Node.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Node.cs
index 48c75628c1df..5210f60e9524 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Node.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Node.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 using System;
 using System.Collections.Generic;
@@ -103,6 +103,11 @@ namespace AutomationTool
 		/// </summary>
 		public HashSet<string> NotifySubmitters = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
 
+		/// <summary>
+		/// Whether to start this node as soon as its dependencies are satisfied, rather than waiting for all of its agent's dependencies to be met.
+		/// </summary>
+		public bool bRunEarly = false;
+
 		/// <summary>
 		/// Whether to ignore warnings produced by this node
 		/// </summary>
@@ -298,6 +303,11 @@ namespace AutomationTool
 				Writer.WriteAttributeString("NotifyOnWarnings", bNotifyOnWarnings.ToString());
 			}
 
+			if(bRunEarly)
+			{
+				Writer.WriteAttributeString("RunEarly", bRunEarly.ToString());
+			}
+
 			foreach (CustomTask Task in Tasks)
 			{
 				Task.Write(Writer);
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Schema.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Schema.cs
index 0ca6de430dc4..16594055d5e1 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Schema.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Schema.cs
@@ -550,6 +550,7 @@ namespace AutomationTool
 			Extension.Attributes.Add(CreateSchemaAttribute("After", ScriptSchemaStandardType.NameOrTagList, XmlSchemaUse.Optional));
 			Extension.Attributes.Add(CreateSchemaAttribute("Token", ScriptSchemaStandardType.BalancedString, XmlSchemaUse.Optional));
 			Extension.Attributes.Add(CreateSchemaAttribute("If", ScriptSchemaStandardType.BalancedString, XmlSchemaUse.Optional));
+			Extension.Attributes.Add(CreateSchemaAttribute("RunEarly", ScriptSchemaStandardType.Boolean, XmlSchemaUse.Optional));
 			Extension.Attributes.Add(CreateSchemaAttribute("NotifyOnWarnings", ScriptSchemaStandardType.Boolean, XmlSchemaUse.Optional));
 
 			XmlSchemaComplexContent ContentModel = new XmlSchemaComplexContent();
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Script.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Script.cs
index 290bae4fbd27..c48935e94b6a 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Script.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Script.cs
@@ -938,6 +938,7 @@ namespace AutomationTool
 				string[] ProducesNames = ReadListAttribute(Element, "Produces");
 				string[] AfterNames = ReadListAttribute(Element, "After");
 				string[] TokenFileNames = ReadListAttribute(Element, "Token");
+				bool bRunEarly = ReadBooleanAttribute(Element, "RunEarly", false);
 				bool bNotifyOnWarnings = ReadBooleanAttribute(Element, "NotifyOnWarnings", true);
 
 				// Resolve all the inputs we depend on
@@ -1015,6 +1016,7 @@ namespace AutomationTool
 				{
 					// Add it to the node lookup
 					Node NewNode = new Node(Name, Inputs.ToArray(), ValidOutputNames.ToArray(), InputDependencies.ToArray(), OrderDependencies.ToArray(), ControllingTrigger, RequiredTokens.ToArray());
+					NewNode.bRunEarly = bRunEarly;
 					NewNode.bNotifyOnWarnings = bNotifyOnWarnings;
 					Graph.NameToNode.Add(Name, NewNode);
 
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/CopyTask.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/CopyTask.cs
index 476783e12ed9..63311888b4a4 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/CopyTask.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/CopyTask.cs
@@ -36,6 +36,12 @@ namespace BuildGraph.Tasks
 		[TaskParameter(ValidationType = TaskParameterValidationType.FileSpec)]
 		public string To;
 
+		/// <summary>
+		/// Whether or not to overwrite existing files
+		/// </summary>
+		[TaskParameter(Optional = true)]
+		public bool Overwrite = true;
+
 		/// <summary>
 		/// Tag to be applied to build products of this task
 		/// </summary>
@@ -88,6 +94,20 @@ namespace BuildGraph.Tasks
 			// Build the file mapping
 			Dictionary<FileReference, FileReference> TargetFileToSourceFile = FilePattern.CreateMapping(Files, ref SourcePattern, ref TargetPattern);
 
+			//  If we're not overwriting, remove any files where the destination file already exists.
+			if(!Parameters.Overwrite)
+			{
+				TargetFileToSourceFile = TargetFileToSourceFile.Where(File =>
+				{
+					if (FileReference.Exists(File.Key))
+					{
+						CommandUtils.Log("Not copying existing file {0}", File.Key);
+						return false;
+					}
+					return true;
+				}).ToDictionary(Pair => Pair.Key, Pair => Pair.Value);
+			}
+
 			// Check we got some files
 			if(TargetFileToSourceFile.Count == 0)
 			{
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SubmitTask.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SubmitTask.cs
index 713d6358e950..cf02a7d6a591 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SubmitTask.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SubmitTask.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 using System;
 using System.Collections.Generic;
@@ -118,7 +118,7 @@ namespace AutomationTool.Tasks
 				}
 
 				// Get the latest version of it
-				int NewCL = SubmitP4.CreateChange(Description: Parameters.Description);
+				int NewCL = SubmitP4.CreateChange(Description: Parameters.Description.Replace("\\n", "\n"));
 				foreach(FileReference File in Files)
 				{
 					SubmitP4.Revert(String.Format("-k \"{0}\"", File.FullName));
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SymStoreTask.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SymStoreTask.cs
index ef43a0b589ed..a03568b0334b 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SymStoreTask.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/SymStoreTask.cs
@@ -78,7 +78,7 @@ namespace AutomationTool
 
 			// Take the lock before accessing the symbol server, if required by the platform
 			Platform TargetPlatform = Platform.GetPlatform(Parameters.Platform);
-			LockFile.OptionallyTakeLock(TargetPlatform.SymbolServerRequiresLock, StoreDir, TimeSpan.FromMinutes(30), () =>
+			LockFile.OptionallyTakeLock(TargetPlatform.SymbolServerRequiresLock, StoreDir, TimeSpan.FromMinutes(60), () =>
 			{
 				if (!TargetPlatform.PublishSymbols(StoreDir, Files, Parameters.Product))
 				{
diff --git a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/TagReceiptTask.cs b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/TagReceiptTask.cs
index 0c938ca5d137..92edc59ec001 100644
--- a/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/TagReceiptTask.cs
+++ b/Engine/Source/Programs/AutomationTool/BuildGraph/Tasks/TagReceiptTask.cs
@@ -158,7 +158,7 @@ namespace AutomationTool.Tasks
 				{
 					foreach (BuildProduct BuildProduct in Receipt.BuildProducts)
 					{
-						if (String.IsNullOrEmpty(Parameters.BuildProductType) || BuildProduct.Type == BuildProductType)
+						if ((String.IsNullOrEmpty(Parameters.BuildProductType) && TargetReceipt.GetStageTypeFromBuildProductType(BuildProduct) == StagedFileType) || BuildProduct.Type == BuildProductType)
 						{
 							Files.Add(BuildProduct.Path);
 						}
diff --git a/Engine/Source/Programs/AutomationTool/HTML5/HTML5Platform.Automation.cs b/Engine/Source/Programs/AutomationTool/HTML5/HTML5Platform.Automation.cs
index fea17c55728f..9fcf8155a6bf 100644
--- a/Engine/Source/Programs/AutomationTool/HTML5/HTML5Platform.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/HTML5/HTML5Platform.Automation.cs
@@ -592,7 +592,7 @@ public class HTML5Platform : Platform
 		return HTMLPakAutomation.CanCreateMapPaks(Params) ? PakType.Never : PakType.Always;
 	}
 
-	public override string GetPlatformPakCommandLine()
+	public override string GetPlatformPakCommandLine(ProjectParams Params, DeploymentContext SC)
 	{
 		return Compressed ? " -compress" : "";
 	}
diff --git a/Engine/Source/Programs/AutomationTool/IOS/IOSPlatform.Automation.cs b/Engine/Source/Programs/AutomationTool/IOS/IOSPlatform.Automation.cs
index 706c4e4f6cee..3d67bc5a0f8a 100644
--- a/Engine/Source/Programs/AutomationTool/IOS/IOSPlatform.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/IOS/IOSPlatform.Automation.cs
@@ -938,17 +938,6 @@ public class IOSPlatform : Platform
 			}
 		}
 
-		// Per-project, per-platform setting to skip all movies. By default this is false.
-		bool bSkipMovies = false;
-		ConfigHierarchy PlatformGameIniConfig = ConfigCache.ReadHierarchy(ConfigHierarchyType.Game, DirectoryReference.FromFile(Params.RawProjectPath), SC.StageTargetPlatform.IniPlatformType);
-		PlatformGameIniConfig.GetBool("/Script/UnrealEd.ProjectPackagingSettings", "bSkipMovies", out bSkipMovies);
-
-		if (!bSkipMovies)
-        {
-            StageMovieFiles(DirectoryReference.Combine(SC.EngineRoot, "Content", "Movies"), SC);
-			StageMovieFiles(DirectoryReference.Combine(SC.ProjectRoot, "Content", "Movies"), SC);
-        }
-
 		{
 			// Stage any *.metallib files as NonUFS.
 			// Get the final output directory for cooked data
@@ -1026,8 +1015,22 @@ public class IOSPlatform : Platform
 			}
 		}
 	}
+	protected void StageMovieFile(DirectoryReference InputDir, string Filename, DeploymentContext SC)
+	{
+		if (DirectoryReference.Exists(InputDir))
+		{
+			foreach (FileReference InputFile in DirectoryReference.EnumerateFiles(InputDir, "*", SearchOption.AllDirectories))
+			{
 
-    public override void GetFilesToArchive(ProjectParams Params, DeploymentContext SC)
+				if (!InputFile.HasExtension(".uasset") && !InputFile.HasExtension(".umap") && InputFile.GetFileNameWithoutExtension().Contains(Filename))
+				{
+					SC.StageFile(StagedFileType.NonUFS, InputFile);
+				}
+			}
+		}
+	}
+
+	public override void GetFilesToArchive(ProjectParams Params, DeploymentContext SC)
 	{
 		if (SC.StageTargetConfigurations.Count != 1)
 		{
@@ -1705,11 +1708,6 @@ public class IOSPlatform : Platform
 		}*/
 	}
 
-	public override bool StageMovies
-	{
-		get { return false; }
-	}
-
 	public override bool RequiresPackageToDeploy
 	{
 		get { return true; }
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/BuildPhysX.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/BuildPhysX.Automation.cs
index efaf92fd67ac..5bc0ab4491b5 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/BuildPhysX.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/BuildPhysX.Automation.cs
@@ -22,6 +22,7 @@ using Tools.DotNETCommon;
 [Help("SkipDeploySource", "Do not perform source deployment to the engine. If this argument is not supplied source will be copied into the engine.")]
 [Help("SkipCreateChangelist", "Do not create a P4 changelist for source or libs. If this argument is not supplied source and libs will be added to a Perforce changelist.")]
 [Help("SkipSubmit", "Do not perform P4 submit of source or libs. If this argument is not supplied source and libs will be automatically submitted to Perforce. If SkipCreateChangelist is specified, this argument applies by default.")]
+[Help("Robomerge", "Which robomerge action to apply to the submission. If we're skipping submit, this is not used.")]
 [RequireP4]
 class BuildPhysX : BuildCommand
 {
@@ -846,7 +847,7 @@ class BuildPhysX : BuildCommand
 				throw new AutomationException("EMSCRIPTEN SDK TOOLCHAIN NOT FOUND...");
 			}
 			// warm up emscripten config file
-			HTML5SDKInfo.SetUpEmscriptenConfigFile();
+			HTML5SDKInfo.SetUpEmscriptenConfigFile(true);
 			Environment.SetEnvironmentVariable("PATH",
 					Environment.GetEnvironmentVariable("EMSCRIPTEN") + ";" +
 					Environment.GetEnvironmentVariable("NODEPATH") + ";" +
@@ -1493,6 +1494,31 @@ class BuildPhysX : BuildCommand
 		{
 			bAutoSubmit = false;
 		}
+		
+		// if we don't pass anything, we'll just merge by default
+		string RobomergeAction = ParseParamValue("Robomerge", "").ToLower();
+		if(!string.IsNullOrEmpty(RobomergeAction))
+		{
+			// empty for merge default action
+			if(RobomergeAction == "merge")
+			{
+				RobomergeAction = "";
+			}
+			// otherwise add hashtags
+			else if(RobomergeAction == "ignore")
+			{
+				RobomergeAction = "#ignore";
+			}
+			else if(RobomergeAction == "null")
+			{
+				RobomergeAction = "#null";
+			}
+			// otherwise the submit will likely fail.
+			else
+			{
+				throw new AutomationException("Invalid Robomerge param passed in {0}.  Must be empty, \"null\", or \"ignore\"", RobomergeAction);
+			}
+		}
 
 		// Parse out the libs we want to build
 		List<PhysXTargetLib> TargetLibs = GetTargetLibs();
@@ -1586,7 +1612,12 @@ class BuildPhysX : BuildCommand
 				LibDeploymentDesc += " " + TargetData.ToString();
 			}
 
-            P4ChangeList = P4.CreateChange(P4Env.Client, String.Format("BuildPhysX.Automation: Deploying {0} libs.", LibDeploymentDesc) + Environment.NewLine + "#rb none" + Environment.NewLine + "#lockdown Nick.Penwarden" + Environment.NewLine + "#tests none" + Environment.NewLine + "#jira none" + Environment.NewLine + "#robomerge none");
+			string RobomergeLine = string.Empty;
+			if(!string.IsNullOrEmpty(RobomergeAction))
+			{
+				RobomergeLine = Environment.NewLine + "#robomerge " + RobomergeAction;
+			}
+            P4ChangeList = P4.CreateChange(P4Env.Client, String.Format("BuildPhysX.Automation: Deploying {0} libs.", LibDeploymentDesc) + Environment.NewLine + "#rb none" + Environment.NewLine + "#lockdown Nick.Penwarden" + Environment.NewLine + "#tests none" + Environment.NewLine + "#jira none" + RobomergeLine);
 		}
 
 
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/CookCommand.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/CookCommand.Automation.cs
index 6a17012d2783..f8055fb6409f 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/CookCommand.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/CookCommand.Automation.cs
@@ -167,7 +167,7 @@ public partial class Project : CommandUtils
                 {
                     CommandletParams += " -iterate -iterateshash";
                 }
-				if ( Params.IterateSharedCookedBuild)
+				if ( Params.HasIterateSharedCookedBuild)
 				{
 					SharedCookedBuild.CopySharedCookedBuild(Params);
 					CommandletParams += " -iteratesharedcookedbuild";					
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
index 3d8d378e7de0..6e752b926c00 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
@@ -117,7 +117,7 @@ public partial class Project : CommandUtils
 		string UnrealPakResponseFileName = CombinePaths(CmdEnv.LogFolder, "PakList_" + PakName + ".txt");
 		WritePakResponseFile(UnrealPakResponseFileName, UnrealPakResponseFile, Compressed, CryptoSettings);
 		CmdLine.AppendFormat(" -create={0}", CommandUtils.MakePathSafeToUseWithCommandLine(UnrealPakResponseFileName));
-		
+
 		if(CryptoKeysCacheFilename != null)
 		{
 			CmdLine.AppendFormat(" -cryptokeys={0}", CommandUtils.MakePathSafeToUseWithCommandLine(CryptoKeysCacheFilename.FullName));
@@ -137,10 +137,10 @@ public partial class Project : CommandUtils
 		CmdLine.Append(PlatformOptions);
 
 		return CmdLine.ToString();
-	}
+		}
 
 	static public void RunUnrealPak(ProjectParams Params, Dictionary<string, string> UnrealPakResponseFile, FileReference OutputLocation, FileReference PakOrderFileLocation, string PlatformOptions, bool Compressed, EncryptionAndSigning.CryptoSettings CryptoSettings, FileReference CryptoKeysCacheFilename, String PatchSourceContentPath)
-	{
+		{
 		if (UnrealPakResponseFile.Count < 1)
 		{
 			return;
@@ -272,7 +272,7 @@ public partial class Project : CommandUtils
 
 		Log("Creating Staging Manifest...");
 
-		if (Params.IterateSharedCookedBuild)
+		if (Params.HasIterateSharedCookedBuild)
 		{
 			// can't do shared cooked builds with DLC that's madness!!
 			//check( Params.HasDLCName == false );
@@ -547,7 +547,7 @@ public partial class Project : CommandUtils
 				bool bSkipMovies = false;
 				PlatformGameConfig.GetBool("/Script/UnrealEd.ProjectPackagingSettings", "bSkipMovies", out bSkipMovies);
 
-				if (!bSkipMovies && SC.StageTargetPlatform.StageMovies && !SC.DedicatedServer)
+				if (!bSkipMovies && !SC.DedicatedServer)
 				{
 					// UFS is required when using a file server
 					StagedFileType MovieFileType = Params.FileServer ? StagedFileType.UFS : StagedFileType.NonUFS;
@@ -566,6 +566,42 @@ public partial class Project : CommandUtils
 						SC.StageFiles(MovieFileType, MovieFiles.Where(x => !x.HasExtension(".uasset") && !x.HasExtension(".umap")));
 					}
 				}
+				else if (!SC.DedicatedServer)
+				{
+					// check to see if we have any specific movies we want to stage for non ufs and ufs files
+					// we still use the movie directories to find the paths to the movies and the list in the ini file is just the substring filename you wish to have staged
+					List<string> NonUFSMovieList;
+					List<string> UFSMovieList;
+					PlatformGameConfig.GetArray("/Script/UnrealEd.ProjectPackagingSettings", "NonUFSMovies", out NonUFSMovieList);
+					PlatformGameConfig.GetArray("/Script/UnrealEd.ProjectPackagingSettings", "UFSMovies", out UFSMovieList);
+					DirectoryReference EngineMoviesDir = DirectoryReference.Combine(SC.EngineRoot, "Content", "Movies");
+					if (DirectoryReference.Exists(EngineMoviesDir))
+					{
+						List<FileReference> MovieFiles = SC.FindFilesToStage(EngineMoviesDir, StageFilesSearch.AllDirectories);
+                        if (NonUFSMovieList != null)
+                        {
+						    SC.StageFiles(StagedFileType.NonUFS, MovieFiles.Where(x => !x.HasExtension(".uasset") && !x.HasExtension(".umap") && NonUFSMovieList.Where(y => x.GetFileNameWithoutExtension().Contains(y)).Any()));
+                        }
+                        if (UFSMovieList != null)
+                        {
+						    SC.StageFiles(StagedFileType.UFS, MovieFiles.Where(x => !x.HasExtension(".uasset") && !x.HasExtension(".umap") && UFSMovieList.Where(y => x.GetFileNameWithoutExtension().Contains(y)).Any()));
+                        }
+					}
+
+					DirectoryReference ProjectMoviesDir = DirectoryReference.Combine(SC.ProjectRoot, "Content", "Movies");
+					if (DirectoryReference.Exists(ProjectMoviesDir))
+					{
+						List<FileReference> MovieFiles = SC.FindFilesToStage(ProjectMoviesDir, StageFilesSearch.AllDirectories);
+                        if (NonUFSMovieList != null)
+                        {
+                            SC.StageFiles(StagedFileType.NonUFS, MovieFiles.Where(x => !x.HasExtension(".uasset") && !x.HasExtension(".umap") && NonUFSMovieList.Where(y => x.GetFileNameWithoutExtension().Contains(y)).Any()));
+                        }
+                        if (UFSMovieList != null)
+                        {
+                            SC.StageFiles(StagedFileType.UFS, MovieFiles.Where(x => !x.HasExtension(".uasset") && !x.HasExtension(".umap") && UFSMovieList.Where(y => x.GetFileNameWithoutExtension().Contains(y)).Any()));
+                        }
+					}
+				}
 
 				// shader cache
 				{
@@ -573,6 +609,15 @@ public partial class Project : CommandUtils
 					List<FileReference> ShaderCacheFiles = SC.FindFilesToStage(ShaderCacheRoot, "DrawCache-*.ushadercache", StageFilesSearch.TopDirectoryOnly);
 					SC.StageFiles(StagedFileType.UFS, ShaderCacheFiles);
 				}
+                // pipeline cache
+                {
+                    DirectoryReference ShaderCacheRoot = DirectoryReference.Combine(SC.ProjectRoot, "Content", "PipelineCaches", SC.PlatformDir);
+                    if (DirectoryReference.Exists(ShaderCacheRoot))
+                    {
+                        List<FileReference> ShaderCacheFiles = SC.FindFilesToStage(ShaderCacheRoot, "*.upipelinecache", StageFilesSearch.TopDirectoryOnly);
+                        SC.StageFiles(StagedFileType.UFS, ShaderCacheFiles);
+                    }
+                }
 
 				// Get the final output directory for cooked data
 				DirectoryReference CookOutputDir;
@@ -880,6 +925,11 @@ public partial class Project : CommandUtils
 			{
 				return false;
 			}
+
+			if(NormalizedPath == "designertoolsconfig.ini")
+			{
+				return false;
+			}
 		}
 		else
 		{
@@ -936,6 +986,7 @@ public partial class Project : CommandUtils
 			case "hardware.ini":
 			case "input.ini":
 			case "scalability.ini":
+			case "runtimeoptions.ini":
 				return true;
 			case "encryption.ini":
 			case "crypto.ini":
@@ -1161,7 +1212,7 @@ public partial class Project : CommandUtils
 
 		List<CreatePakParams> PakInputs = new List<CreatePakParams>();
 		PakInputs.Add(new CreatePakParams(SC.ShortProjectName, UnrealPakResponseFile));
-		CreatePaks(Params, SC, PakInputs, PakCryptoSettings, CryptoKeysCacheFilename);
+		CreatePaks(Params, SC, PakInputs, PakCryptoSettings, CryptoKeysCacheFilename, Params.Compressed);
 	}
 
 	/// <summary>
@@ -1306,7 +1357,7 @@ public partial class Project : CommandUtils
 	/// <param name="SC"></param>
 	/// <param name="UnrealPakResponseFile"></param>
 	/// <param name="PakName"></param>
-	private static void CreatePaks(ProjectParams Params, DeploymentContext SC, List<CreatePakParams> PakParamsList, EncryptionAndSigning.CryptoSettings CryptoSettings, FileReference CryptoKeysCacheFilename)
+	private static void CreatePaks(ProjectParams Params, DeploymentContext SC, List<CreatePakParams> PakParamsList, EncryptionAndSigning.CryptoSettings CryptoSettings, FileReference CryptoKeysCacheFilename, bool bCompressed)
 	{
 		bool bShouldGeneratePatch = Params.IsGeneratingPatch && SC.StageTargetPlatform.GetPlatformPatchesWithDiffPak(Params, SC);
 
@@ -1320,7 +1371,7 @@ public partial class Project : CommandUtils
 		{
 			PostFix += "_P";
 		}
-		else if (Params.IterateSharedCookedBuild)
+		else if (Params.HasIterateSharedCookedBuild)
 		{
 			// shared cooked builds will produce a patch
 			// then be combined with the shared cooked build
@@ -1369,104 +1420,104 @@ public partial class Project : CommandUtils
 			}
 			OutputFilename = OutputFilename + PostFix;
 
-			StagedFileReference OutputRelativeLocation;
-			if (Params.HasDLCName)
+		StagedFileReference OutputRelativeLocation;
+		if (Params.HasDLCName)
+		{
+			OutputRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, Params.DLCFile.Directory.MakeRelativeTo(SC.ProjectRoot), "Content", "Paks", SC.FinalCookPlatform, Params.DLCFile.GetFileNameWithoutExtension() + ".pak");
+		}
+		else
+		{
+			OutputRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, "Content", "Paks", OutputFilename + OutputFilenameExtension);
+		}
+		if (SC.StageTargetPlatform.DeployLowerCaseFilenames())
+		{
+			OutputRelativeLocation = OutputRelativeLocation.ToLowerInvariant();
+		}
+		OutputRelativeLocation = SC.StageTargetPlatform.Remap(OutputRelativeLocation);
+
+		FileReference OutputLocation = FileReference.Combine(SC.RuntimeRootDir, OutputRelativeLocation.Name);
+		// Add input file to control order of file within the pak
+		DirectoryReference PakOrderFileLocationBase = DirectoryReference.Combine(SC.ProjectRoot, "Build", SC.FinalCookPlatform, "FileOpenOrder");
+
+		FileReference PakOrderFileLocation = null;
+
+		string[] OrderFileNames = new string[] { "GameOpenOrder.log", "CookerOpenOrder.log", "EditorOpenOrder.log" };
+		foreach (string OrderFileName in OrderFileNames)
+		{
+			PakOrderFileLocation = FileReference.Combine(PakOrderFileLocationBase, OrderFileName);
+
+			if (FileExists_NoExceptions(PakOrderFileLocation.FullName))
 			{
-				OutputRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, Params.DLCFile.Directory.MakeRelativeTo(SC.ProjectRoot), "Content", "Paks", SC.FinalCookPlatform, Params.DLCFile.GetFileNameWithoutExtension() + ".pak");
+				break;
 			}
-			else
-			{
-				OutputRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, "Content", "Paks", OutputFilename + OutputFilenameExtension);
-			}
-			if (SC.StageTargetPlatform.DeployLowerCaseFilenames())
-			{
-				OutputRelativeLocation = OutputRelativeLocation.ToLowerInvariant();
-			}
-			OutputRelativeLocation = SC.StageTargetPlatform.Remap(OutputRelativeLocation);
+		}
 
-			FileReference OutputLocation = FileReference.Combine(SC.RuntimeRootDir, OutputRelativeLocation.Name);
-			// Add input file to control order of file within the pak
-			DirectoryReference PakOrderFileLocationBase = DirectoryReference.Combine(SC.ProjectRoot, "Build", SC.FinalCookPlatform, "FileOpenOrder");
+		bool bCopiedExistingPak = false;
 
-			FileReference PakOrderFileLocation = null;
-
-			string[] OrderFileNames = new string[] { "GameOpenOrder.log", "CookerOpenOrder.log", "EditorOpenOrder.log" };
-			foreach (string OrderFileName in OrderFileNames)
-			{
-				PakOrderFileLocation = FileReference.Combine(PakOrderFileLocationBase, OrderFileName);
-
-				if (FileExists_NoExceptions(PakOrderFileLocation.FullName))
-				{
-					break;
-				}
-			}
-
-			bool bCopiedExistingPak = false;
-
-			if (SC.StageTargetPlatform != SC.CookSourcePlatform)
-			{
-				// Check to see if we have an existing pak file we can use
+		if (SC.StageTargetPlatform != SC.CookSourcePlatform)
+		{
+			// Check to see if we have an existing pak file we can use
 
 				StagedFileReference SourceOutputRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, "Content/Paks/", PakParams.PakName + "-" + SC.CookPlatform + PostFix + ".pak");
-				if (SC.CookSourcePlatform.DeployLowerCaseFilenames())
-				{
-					SourceOutputRelativeLocation = SourceOutputRelativeLocation.ToLowerInvariant();
-				}
-				SourceOutputRelativeLocation = SC.CookSourcePlatform.Remap(SourceOutputRelativeLocation);
-
-				FileReference SourceOutputLocation = FileReference.Combine(SC.CookSourceRuntimeRootDir, SourceOutputRelativeLocation.Name);
-				if (FileExists_NoExceptions(SourceOutputLocation.FullName))
-				{
-					InternalUtils.SafeCreateDirectory(Path.GetDirectoryName(OutputLocation.FullName), true);
-
-					if (InternalUtils.SafeCopyFile(SourceOutputLocation.FullName, OutputLocation.FullName))
-					{
-						Log("Copying source pak from {0} to {1} instead of creating new pak", SourceOutputLocation, OutputLocation);
-						bCopiedExistingPak = true;
-
-						FileReference InSigFile = SourceOutputLocation.ChangeExtension(".sig");
-						if (FileReference.Exists(InSigFile))
-						{
-							FileReference OutSigFile = OutputLocation.ChangeExtension(".sig");
-
-							Log("Copying pak sig from {0} to {1}", InSigFile, OutSigFile);
-
-							if (!InternalUtils.SafeCopyFile(InSigFile.FullName, OutSigFile.FullName))
-							{
-								Log("Failed to copy pak sig {0} to {1}, creating new pak", InSigFile, InSigFile);
-								bCopiedExistingPak = false;
-							}
-						}
-
-					}
-				}
-				if (!bCopiedExistingPak)
-				{
-					Log("Failed to copy source pak from {0} to {1}, creating new pak", SourceOutputLocation, OutputLocation);
-				}
-			}
-
-			string PatchSourceContentPath = null;
-			if (bShouldGeneratePatch)
+			if (SC.CookSourcePlatform.DeployLowerCaseFilenames())
 			{
-				// don't include the post fix in this filename because we are looking for the source pak path
-				string PakFilename = PakParams.PakName + "-" + SC.FinalCookPlatform + "*.pak";
-				PatchSourceContentPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, PakFilename);
+				SourceOutputRelativeLocation = SourceOutputRelativeLocation.ToLowerInvariant();
+			}
+			SourceOutputRelativeLocation = SC.CookSourcePlatform.Remap(SourceOutputRelativeLocation);
+
+			FileReference SourceOutputLocation = FileReference.Combine(SC.CookSourceRuntimeRootDir, SourceOutputRelativeLocation.Name);
+			if (FileExists_NoExceptions(SourceOutputLocation.FullName))
+			{
+				InternalUtils.SafeCreateDirectory(Path.GetDirectoryName(OutputLocation.FullName), true);
+
+				if (InternalUtils.SafeCopyFile(SourceOutputLocation.FullName, OutputLocation.FullName))
+				{
+					Log("Copying source pak from {0} to {1} instead of creating new pak", SourceOutputLocation, OutputLocation);
+					bCopiedExistingPak = true;
+
+					FileReference InSigFile = SourceOutputLocation.ChangeExtension(".sig");
+					if (FileReference.Exists(InSigFile))
+					{
+						FileReference OutSigFile = OutputLocation.ChangeExtension(".sig");
+
+						Log("Copying pak sig from {0} to {1}", InSigFile, OutSigFile);
+
+						if (!InternalUtils.SafeCopyFile(InSigFile.FullName, OutSigFile.FullName))
+						{
+							Log("Failed to copy pak sig {0} to {1}, creating new pak", InSigFile, InSigFile);
+							bCopiedExistingPak = false;
+						}
+					}
+
+				}
 			}
-		
 			if (!bCopiedExistingPak)
 			{
-				if (FileReference.Exists(OutputLocation))
+				Log("Failed to copy source pak from {0} to {1}, creating new pak", SourceOutputLocation, OutputLocation);
+			}
+		}
+
+		string PatchSourceContentPath = null;
+		if (bShouldGeneratePatch)
+		{
+			// don't include the post fix in this filename because we are looking for the source pak path
+				string PakFilename = PakParams.PakName + "-" + SC.FinalCookPlatform + "*.pak";
+			PatchSourceContentPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, PakFilename);
+		}
+		
+		if (!bCopiedExistingPak)
+		{
+			if (FileReference.Exists(OutputLocation))
+			{
+				string UnrealPakResponseFileName = CombinePaths(CmdEnv.LogFolder, "PakList_" + OutputLocation.GetFileNameWithoutExtension() + ".txt");
+				if (File.Exists(UnrealPakResponseFileName) && FileReference.GetLastWriteTimeUtc(OutputLocation) > File.GetLastWriteTimeUtc(UnrealPakResponseFileName))
 				{
-					string UnrealPakResponseFileName = CombinePaths(CmdEnv.LogFolder, "PakList_" + OutputLocation.GetFileNameWithoutExtension() + ".txt");
-					if (File.Exists(UnrealPakResponseFileName) && FileReference.GetLastWriteTimeUtc(OutputLocation) > File.GetLastWriteTimeUtc(UnrealPakResponseFileName))
-					{
-						bCopiedExistingPak = true;
-					}
+					bCopiedExistingPak = true;
 				}
-				if (!bCopiedExistingPak)
-				{
-					Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PakOrderFileLocation, SC.StageTargetPlatform.GetPlatformPakCommandLine(), Params.Compressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath));
+			}
+			if (!bCopiedExistingPak)
+			{
+					Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PakOrderFileLocation, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + " " + Params.AdditionalPakOptions, bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath));
 				}
 			}
 
@@ -1489,127 +1540,127 @@ public partial class Project : CommandUtils
 			StagedFileReference OutputRelativeLocation = Outputs[Idx].Item2;
 			string PatchSourceContentPath = Outputs[Idx].Item3;
 
-			if (Params.HasCreateReleaseVersion)
-			{
-				// copy the created pak to the release version directory we might need this later if we want to generate patches
-				//string ReleaseVersionPath = CombinePaths( SC.ProjectRoot, "Releases", Params.CreateReleaseVersion, SC.StageTargetPlatform.GetCookPlatform(Params.DedicatedServer, false), Path.GetFileName(OutputLocation) );
-				string ReleaseVersionPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, OutputLocation.GetFileName());
+		if (Params.HasCreateReleaseVersion)
+		{
+			// copy the created pak to the release version directory we might need this later if we want to generate patches
+			//string ReleaseVersionPath = CombinePaths( SC.ProjectRoot, "Releases", Params.CreateReleaseVersion, SC.StageTargetPlatform.GetCookPlatform(Params.DedicatedServer, false), Path.GetFileName(OutputLocation) );
+			string ReleaseVersionPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, OutputLocation.GetFileName());
 
-				InternalUtils.SafeCreateDirectory(Path.GetDirectoryName(ReleaseVersionPath));
-				InternalUtils.SafeCopyFile(OutputLocation.FullName, ReleaseVersionPath);
+			InternalUtils.SafeCreateDirectory(Path.GetDirectoryName(ReleaseVersionPath));
+			InternalUtils.SafeCopyFile(OutputLocation.FullName, ReleaseVersionPath);
+		}
+
+		if (Params.CreateChunkInstall)
+		{
+			var RegEx = new Regex("pakchunk(\\d+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+			var Matches = RegEx.Matches(PakName);
+
+			int ChunkID = 0;
+			if (Matches.Count != 0 && Matches[0].Groups.Count > 1)
+			{
+				ChunkID = Convert.ToInt32(Matches[0].Groups[1].ToString());
 			}
-
-			if (Params.CreateChunkInstall)
+			else if (Params.HasDLCName)
 			{
-				var RegEx = new Regex("pakchunk(\\d+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-				var Matches = RegEx.Matches(PakName);
-
-				int ChunkID = 0;
-				if (Matches.Count != 0 && Matches[0].Groups.Count > 1)
-				{
-					ChunkID = Convert.ToInt32(Matches[0].Groups[1].ToString());
-				}
-				else if (Params.HasDLCName)
-				{
-					// Assuming DLC is a single pack file
-					ChunkID = 1;
-				}
-				else
-				{
-					throw new AutomationException(String.Format("Failed Creating Chunk Install Data, Unable to parse chunk id from {0}", PakName));
-				}
-
-				if (ChunkID != 0)
-				{
-					var BPTExe = GetBuildPatchToolExecutable();
-					EnsureBuildPatchToolExists();
-
-					string VersionString = Params.ChunkInstallVersionString;
-					string ChunkInstallBasePath = CombinePaths(Params.ChunkInstallDirectory, SC.FinalCookPlatform);
-					string RawDataPath = CombinePaths(ChunkInstallBasePath, VersionString, PakName);
-					string RawDataPakPath = CombinePaths(RawDataPath, PakName + "-" + SC.FinalCookPlatform + PostFix + ".pak");
-					//copy the pak chunk to the raw data folder
-					if (InternalUtils.SafeFileExists(RawDataPakPath, true))
-					{
-						InternalUtils.SafeDeleteFile(RawDataPakPath, true);
-					}
-					InternalUtils.SafeCreateDirectory(RawDataPath, true);
-					InternalUtils.SafeCopyFile(OutputLocation.FullName, RawDataPakPath);
-					InternalUtils.SafeDeleteFile(OutputLocation.FullName, true);
-
-					if (Params.IsGeneratingPatch)
-					{
-						if (String.IsNullOrEmpty(PatchSourceContentPath))
-						{
-							throw new AutomationException(String.Format("Failed Creating Chunk Install Data. No source pak for patch pak {0} given", OutputLocation));
-						}
-						// If we are generating a patch, then we need to copy the original pak across
-						// for distribution.
-						string SourceRawDataPakPath = CombinePaths(RawDataPath, PakName + "-" + SC.FinalCookPlatform + ".pak");
-						InternalUtils.SafeCopyFile(PatchSourceContentPath, SourceRawDataPakPath);
-					}
-
-					string BuildRoot = MakePathSafeToUseWithCommandLine(RawDataPath);
-					string CloudDir = MakePathSafeToUseWithCommandLine(CombinePaths(ChunkInstallBasePath, "CloudDir"));
-					string ManifestDir = CombinePaths(ChunkInstallBasePath, "ManifestDir");
-					var AppID = 1; // For a chunk install this value doesn't seem to matter
-					string AppName = String.Format("{0}_{1}", SC.ShortProjectName, PakName);
-					string AppLaunch = ""; // For a chunk install this value doesn't seem to matter
-					string ManifestFilename = AppName + VersionString + ".manifest";
-					string SourceManifestPath = CombinePaths(CloudDir, ManifestFilename);
-					string DestManifestPath = CombinePaths(ManifestDir, ManifestFilename);
-					InternalUtils.SafeCreateDirectory(ManifestDir, true);
-
-					string CmdLine = String.Format("-BuildRoot=\"{0}\" -CloudDir=\"{1}\" -AppID={2} -AppName=\"{3}\" -BuildVersion=\"{4}\" -AppLaunch=\"{5}\"", BuildRoot, CloudDir, AppID, AppName, VersionString, AppLaunch);
-					CmdLine += " -AppArgs=\"\"";
-					CmdLine += " -custom=\"bIsPatch=false\"";
-					CmdLine += String.Format(" -customint=\"ChunkID={0}\"", ChunkID);
-					CmdLine += " -customint=\"PakReadOrdering=0\"";
-					CmdLine += " -stdout";
-
-					string UnrealPakLogFileName = "UnrealPak_" + PakName;
-					RunAndLog(CmdEnv, BPTExe, CmdLine, UnrealPakLogFileName, Options: ERunOptions.Default | ERunOptions.UTF8Output);
-
-					InternalUtils.SafeCopyFile(SourceManifestPath, DestManifestPath);
-				}
-				else
-				{
-					// add the first pak file as needing deployment and convert to lower case again if needed
-					SC.FilesToStage.UFSFiles.Add(OutputRelativeLocation, OutputLocation);
-				}
+				// Assuming DLC is a single pack file
+				ChunkID = 1;
 			}
 			else
 			{
-				// add the pak file as needing deployment and convert to lower case again if needed
-				SC.FilesToStage.UFSFiles.Add(OutputRelativeLocation, OutputLocation);
+				throw new AutomationException(String.Format("Failed Creating Chunk Install Data, Unable to parse chunk id from {0}", PakName));
+			}
 
-				// add the base pak files to deployment as well
-				if (bShouldGeneratePatch)
+			if (ChunkID != 0)
+			{
+				var BPTExe = GetBuildPatchToolExecutable();
+				EnsureBuildPatchToolExists();
+
+				string VersionString = Params.ChunkInstallVersionString;
+				string ChunkInstallBasePath = CombinePaths(Params.ChunkInstallDirectory, SC.FinalCookPlatform);
+				string RawDataPath = CombinePaths(ChunkInstallBasePath, VersionString, PakName);
+				string RawDataPakPath = CombinePaths(RawDataPath, PakName + "-" + SC.FinalCookPlatform + PostFix + ".pak");
+				//copy the pak chunk to the raw data folder
+				if (InternalUtils.SafeFileExists(RawDataPakPath, true))
 				{
-					string ExistingPatchSearchPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, null);
-					if (Directory.Exists(ExistingPatchSearchPath))
+					InternalUtils.SafeDeleteFile(RawDataPakPath, true);
+				}
+				InternalUtils.SafeCreateDirectory(RawDataPath, true);
+				InternalUtils.SafeCopyFile(OutputLocation.FullName, RawDataPakPath);
+				InternalUtils.SafeDeleteFile(OutputLocation.FullName, true);
+
+				if (Params.IsGeneratingPatch)
+				{
+					if (String.IsNullOrEmpty(PatchSourceContentPath))
 					{
-						IEnumerable<string> PakFileSet = Directory.EnumerateFiles(ExistingPatchSearchPath, PakName + "-" + SC.FinalCookPlatform + "*" + OutputFilenameExtension);
-						foreach (string PakFilePath in PakFileSet)
+						throw new AutomationException(String.Format("Failed Creating Chunk Install Data. No source pak for patch pak {0} given", OutputLocation));
+					}
+					// If we are generating a patch, then we need to copy the original pak across
+					// for distribution.
+					string SourceRawDataPakPath = CombinePaths(RawDataPath, PakName + "-" + SC.FinalCookPlatform + ".pak");
+					InternalUtils.SafeCopyFile(PatchSourceContentPath, SourceRawDataPakPath);
+				}
+
+				string BuildRoot = MakePathSafeToUseWithCommandLine(RawDataPath);
+				string CloudDir = MakePathSafeToUseWithCommandLine(CombinePaths(ChunkInstallBasePath, "CloudDir"));
+				string ManifestDir = CombinePaths(ChunkInstallBasePath, "ManifestDir");
+				var AppID = 1; // For a chunk install this value doesn't seem to matter
+				string AppName = String.Format("{0}_{1}", SC.ShortProjectName, PakName);
+				string AppLaunch = ""; // For a chunk install this value doesn't seem to matter
+				string ManifestFilename = AppName + VersionString + ".manifest";
+				string SourceManifestPath = CombinePaths(CloudDir, ManifestFilename);
+				string DestManifestPath = CombinePaths(ManifestDir, ManifestFilename);
+				InternalUtils.SafeCreateDirectory(ManifestDir, true);
+
+				string CmdLine = String.Format("-BuildRoot=\"{0}\" -CloudDir=\"{1}\" -AppID={2} -AppName=\"{3}\" -BuildVersion=\"{4}\" -AppLaunch=\"{5}\"", BuildRoot, CloudDir, AppID, AppName, VersionString, AppLaunch);
+				CmdLine += " -AppArgs=\"\"";
+				CmdLine += " -custom=\"bIsPatch=false\"";
+				CmdLine += String.Format(" -customint=\"ChunkID={0}\"", ChunkID);
+				CmdLine += " -customint=\"PakReadOrdering=0\"";
+				CmdLine += " -stdout";
+
+				string UnrealPakLogFileName = "UnrealPak_" + PakName;
+				RunAndLog(CmdEnv, BPTExe, CmdLine, UnrealPakLogFileName, Options: ERunOptions.Default | ERunOptions.UTF8Output);
+
+				InternalUtils.SafeCopyFile(SourceManifestPath, DestManifestPath);
+			}
+			else
+			{
+				// add the first pak file as needing deployment and convert to lower case again if needed
+				SC.FilesToStage.UFSFiles.Add(OutputRelativeLocation, OutputLocation);
+			}
+		}
+		else
+		{
+			// add the pak file as needing deployment and convert to lower case again if needed
+			SC.FilesToStage.UFSFiles.Add(OutputRelativeLocation, OutputLocation);
+
+			// add the base pak files to deployment as well
+			if (bShouldGeneratePatch)
+			{
+				string ExistingPatchSearchPath = SC.StageTargetPlatform.GetReleasePakFilePath(SC, Params, null);
+				if (Directory.Exists(ExistingPatchSearchPath))
+				{
+					IEnumerable<string> PakFileSet = Directory.EnumerateFiles(ExistingPatchSearchPath, PakName + "-" + SC.FinalCookPlatform + "*" + OutputFilenameExtension);
+					foreach (string PakFilePath in PakFileSet)
+					{
+						FileReference OutputDestinationPath = FileReference.Combine(OutputLocation.Directory, Path.GetFileName(PakFilePath));
+						if (!File.Exists(OutputDestinationPath.FullName))
 						{
-							FileReference OutputDestinationPath = FileReference.Combine(OutputLocation.Directory, Path.GetFileName(PakFilePath));
-							if (!File.Exists(OutputDestinationPath.FullName))
+							InternalUtils.SafeCopyFile(PakFilePath, OutputDestinationPath.FullName);
+							StagedFileReference OutputDestinationRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, "Content/Paks/", Path.GetFileName(PakFilePath));
+							if (SC.StageTargetPlatform.DeployLowerCaseFilenames())
 							{
-								InternalUtils.SafeCopyFile(PakFilePath, OutputDestinationPath.FullName);
-								StagedFileReference OutputDestinationRelativeLocation = StagedFileReference.Combine(SC.RelativeProjectRootForStage, "Content/Paks/", Path.GetFileName(PakFilePath));
-								if (SC.StageTargetPlatform.DeployLowerCaseFilenames())
-								{
-									OutputDestinationRelativeLocation = OutputDestinationRelativeLocation.ToLowerInvariant();
-								}
-								OutputDestinationRelativeLocation = SC.StageTargetPlatform.Remap(OutputDestinationRelativeLocation);
-								SC.FilesToStage.UFSFiles.Add(OutputDestinationRelativeLocation, OutputDestinationPath);
+								OutputDestinationRelativeLocation = OutputDestinationRelativeLocation.ToLowerInvariant();
 							}
+							OutputDestinationRelativeLocation = SC.StageTargetPlatform.Remap(OutputDestinationRelativeLocation);
+							SC.FilesToStage.UFSFiles.Add(OutputDestinationRelativeLocation, OutputDestinationPath);
 						}
 					}
 				}
 			}
 		}
 	}
+	}
 
     /// <summary>
     /// Creates pak files using streaming install chunk manifests.
@@ -1714,6 +1765,22 @@ public partial class Project : CommandUtils
         }
     }
 
+	private class ChunkDefinition
+	{
+		public ChunkDefinition(string InChunkName)
+		{
+			ChunkName = InChunkName;
+			ResponseFile = new Dictionary<string, string>();
+			Manifest = null;
+			bCompressed = false;
+		}
+
+		public string ChunkName;
+		public Dictionary<string, string> ResponseFile;
+		public HashSet<string> Manifest;
+		public bool bCompressed;
+	}
+
     /// <summary>
     /// Creates pak files using streaming install chunk manifests.
     /// </summary>
@@ -1724,51 +1791,142 @@ public partial class Project : CommandUtils
 		Log("Creating pak using streaming install manifests.");
 		DumpManifest(SC, CombinePaths(CmdEnv.LogFolder, "PrePak" + (SC.DedicatedServer ? "_Server" : "")));
 
+
+		List<ChunkDefinition> ChunkDefinitions = new List<ChunkDefinition>();
+
 		var TmpPackagingPath = GetTmpPackagingPath(Params, SC);
-		var ChunkListFilename = GetChunkPakManifestListFilename(Params, SC);
-		var ChunkList = ReadAllLines(ChunkListFilename);
-		var ChunkResponseFiles = new HashSet<string>[ChunkList.Length];
-		for (int Index = 0; Index < ChunkList.Length; ++Index)
-		{
-			var ChunkManifestFilename = CombinePaths(TmpPackagingPath, ChunkList[Index]);
-			ChunkResponseFiles[Index] = ReadPakChunkManifest(ChunkManifestFilename);
-		}
+
+
 		// We still want to have a list of all files to stage. We will use the chunk manifests
 		// to put the files from staging manifest into the right chunk
 		var StagingManifestResponseFile = CreatePakResponseFileFromStagingManifest(SC, SC.FilesToStage.UFSFiles);
+
+		{
 		// DefaultChunkIndex assumes 0 is the 'base' chunk
 		const int DefaultChunkIndex = 0;
-		var PakResponseFiles = new Dictionary<string, string>[ChunkList.Length];
-		for (int Index = 0; Index < PakResponseFiles.Length; ++Index)
+
+			var ChunkListFilename = GetChunkPakManifestListFilename(Params, SC);
+			List<string> ChunkList = new List<string>(ReadAllLines(ChunkListFilename));
+			
+			for (int Index = 0; Index < ChunkList.Count; ++Index)
+			{
+				ChunkDefinition CD = new ChunkDefinition(ChunkList[Index]);
+				string[] ChunkOptions = ChunkList[Index].Split(' ');
+				var ChunkManifestFilename = CombinePaths(TmpPackagingPath, ChunkOptions[0]);
+				for ( int I = 1; I < ChunkOptions.Length; ++I )
 		{
-			PakResponseFiles[Index] = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+					if ( string.Compare(ChunkOptions[I], "compressed", true) == 0)
+					{
+						CD.bCompressed = true;
+					}
+				}
+				CD.Manifest = ReadPakChunkManifest(ChunkManifestFilename);
+				ChunkDefinitions.Add(CD);
 		}
+
+			const string OptionalBulkDataFileExtension = ".uptnl";
+			Dictionary<string, ChunkDefinition> OptionalChunks = new Dictionary<string, ChunkDefinition>();
+			
+			
+			ChunkDefinition DefaultChunk = ChunkDefinitions[DefaultChunkIndex];
+
 		foreach (var StagingFile in StagingManifestResponseFile)
 		{
 			bool bAddedToChunk = false;
-			for (int ChunkIndex = 0; !bAddedToChunk && ChunkIndex < ChunkResponseFiles.Length; ++ChunkIndex)
+				for (int ChunkIndex = 0; !bAddedToChunk && ChunkIndex < ChunkDefinitions.Count; ++ChunkIndex)
 			{
+					ChunkDefinition Chunk = ChunkDefinitions[ChunkIndex];
 				string OriginalFilename = StagingFile.Key;
 				string NoExtension = CombinePaths(Path.GetDirectoryName(OriginalFilename), Path.GetFileNameWithoutExtension(OriginalFilename));
 				string OriginalReplaceSlashes = OriginalFilename.Replace('/', '\\');
 				string NoExtensionReplaceSlashes = NoExtension.Replace('/', '\\');
 
-				if (ChunkResponseFiles[ChunkIndex].Contains(OriginalFilename) ||
-							ChunkResponseFiles[ChunkIndex].Contains(OriginalReplaceSlashes) ||
-							ChunkResponseFiles[ChunkIndex].Contains(NoExtension) ||
-							ChunkResponseFiles[ChunkIndex].Contains(NoExtensionReplaceSlashes))
+					if (Chunk.Manifest.Contains(OriginalFilename) ||
+								Chunk.Manifest.Contains(OriginalReplaceSlashes) ||
+								Chunk.Manifest.Contains(NoExtension) ||
+								Chunk.Manifest.Contains(NoExtensionReplaceSlashes))
+					{
+						string OrigExt = Path.GetExtension(OriginalFilename);
+						if (OrigExt.Equals(OptionalBulkDataFileExtension))
+						{
+							// any optional files encountered we want to put in a separate pak file
+							string OptionalChunkName = Path.GetFileNameWithoutExtension(Chunk.ChunkName) + "optional.txt";
+							ChunkDefinition OptionalChunk = null;
+							if ( !OptionalChunks.TryGetValue(OptionalChunkName, out OptionalChunk) )
 				{
-					PakResponseFiles[ChunkIndex].Add(StagingFile.Key, StagingFile.Value);
+								OptionalChunk = new ChunkDefinition(OptionalChunkName);
+								OptionalChunks.Add(OptionalChunkName, OptionalChunk);
+							}
+							OptionalChunk.ResponseFile.Add(StagingFile.Key, StagingFile.Value);
+						}
+						else
+						{
+							Chunk.ResponseFile.Add(StagingFile.Key, StagingFile.Value);
+						}
 					bAddedToChunk = true;
 				}
 			}
 			if (!bAddedToChunk)
 			{
 				//Log("No chunk assigned found for {0}. Using default chunk.", StagingFile.Key);
-				PakResponseFiles[DefaultChunkIndex].Add(StagingFile.Key, StagingFile.Value);
+					DefaultChunk.ResponseFile.Add(StagingFile.Key, StagingFile.Value);
+				}
+			}
+
+			foreach ( var OptionalChunkIt in OptionalChunks )
+			{
+				ChunkDefinitions.Add(OptionalChunkIt.Value);
 			}
 		}
 
+		ConfigHierarchy PlatformGameConfig = ConfigCache.ReadHierarchy(ConfigHierarchyType.Game, DirectoryReference.FromFile(Params.RawProjectPath), SC.StageTargetPlatform.IniPlatformType);
+		bool bShouldGenerateEarlyDownloaderPakFile = false;
+		const string EarlyChunkFilename = "pakChunkEarly.txt";
+		PlatformGameConfig.GetBool("/Script/UnrealEd.ProjectPackagingSettings", "GenerateEarlyDownloaderPakFile", out bShouldGenerateEarlyDownloaderPakFile);
+
+
+		// chunk downloader pak file is a minimal pak file which contains no content.  It can be provided with as a minimal download so that the game can download all the content from another source.
+		if ( bShouldGenerateEarlyDownloaderPakFile)
+		{
+			ChunkDefinition EarlyChunk = new ChunkDefinition(EarlyChunkFilename);
+
+			EarlyChunk.bCompressed = true;
+
+			Dictionary<string,string> EarlyPakFile = EarlyChunk.ResponseFile;
+
+			// find the list of files to put in the early downloader pak file
+			List<string> FilesInEarlyPakFile = new List<string>();
+			PlatformGameConfig.GetArray("/Script/UnrealEd.ProjectPackagingSettings", "EarlyDownloaderPakFileFiles", out FilesInEarlyPakFile);
+
+			/*for (int Index = 0; Index < FilesInEarlyPakFile.Count; ++Index)
+			{
+				// config file reader adds extra slashes...
+				FilesInEarlyPakFile[Index] = FilesInEarlyPakFile[Index].Replace("\\\\", "\\");
+			}*/
+
+			FileFilter EarlyPakFileFilter = new FileFilter();
+			foreach (string FileFilter in FilesInEarlyPakFile)
+			{
+				EarlyPakFileFilter.AddRule(FileFilter);
+			}
+
+			List<string> FilesToFilter = new List<string>();
+			foreach (var ResponseFile in StagingManifestResponseFile)
+			{
+				FilesToFilter.Add(ResponseFile.Key);
+			}
+
+			foreach ( string FilteredFile in EarlyPakFileFilter.ApplyTo(FilesToFilter) )
+			{
+				EarlyPakFile.Add(FilteredFile, StagingManifestResponseFile[FilteredFile]);
+			}
+
+			ChunkDefinitions.Add(EarlyChunk);
+		}
+
+
+
+
 		if (Params.CreateChunkInstall)
 		{
 			string ManifestDir = CombinePaths(Params.ChunkInstallDirectory, SC.FinalCookPlatform, "ManifestDir");
@@ -1786,22 +1944,33 @@ public partial class Project : CommandUtils
 			}
 		}
 
-        // Parse and cache crypto settings from INI file
-        EncryptionAndSigning.CryptoSettings PakCryptoSettings = EncryptionAndSigning.ParseCryptoSettings(DirectoryReference.FromFile(Params.RawProjectPath), SC.StageTargetPlatform.IniPlatformType);
+		// Parse and cache crypto settings from INI file
+		EncryptionAndSigning.CryptoSettings PakCryptoSettings = EncryptionAndSigning.ParseCryptoSettings(DirectoryReference.FromFile(Params.RawProjectPath), SC.StageTargetPlatform.IniPlatformType);
 		FileReference CryptoKeysCacheFilename = FileReference.Combine(SC.MetadataDir, "Crypto.json");
 		PakCryptoSettings.Save(CryptoKeysCacheFilename);
 
+		System.Threading.Tasks.ParallelOptions Options = new System.Threading.Tasks.ParallelOptions();
+
+		Log("Creating Pak files utilizing {0} cores", Environment.ProcessorCount);
+		Options.MaxDegreeOfParallelism = Environment.ProcessorCount;
+
+		bool bCompression = false;
 		List<CreatePakParams> PakInputs = new List<CreatePakParams>();
-		for(int Idx = 0; Idx < PakResponseFiles.Length; Idx++)
-		{
-            if (PakResponseFiles[Idx].Count > 0)
-            {
-				string ChunkName = Path.GetFileNameWithoutExtension(ChunkList[Idx]);
-				PakInputs.Add(new CreatePakParams(ChunkName, PakResponseFiles[Idx]));
-            }
+		//System.Threading.Tasks.Parallel.ForEach(ChunkDefinitions, Options, (Chunk) =>
+		foreach (var Chunk in ChunkDefinitions)
+		{			
+			bCompression |= Params.Compressed;
+			bCompression |= Chunk.bCompressed;
+
+			var ChunkName = Path.GetFileNameWithoutExtension(Chunk.ChunkName);
+			if (Chunk.ResponseFile.Count > 0)
+			{
+				PakInputs.Add(new CreatePakParams(ChunkName, Chunk.ResponseFile));
+				//CreatePak(Params, SC, Chunk.ResponseFile, ChunkName, PakCryptoSettings, CryptoKeysCacheFilename, bCompression);
+			}
 		}
 
-		CreatePaks(Params, SC, PakInputs, PakCryptoSettings, CryptoKeysCacheFilename);
+		CreatePaks(Params, SC, PakInputs, PakCryptoSettings, CryptoKeysCacheFilename, bCompression);
 
 		if (Params.CreateChunkInstall)
 		{
@@ -2404,7 +2573,7 @@ public partial class Project : CommandUtils
 
 					// if we are attempting to gathering multiple platforms, the files aren't required
 					bool bJustPackaging = Params.SkipStage && Params.Package;
-					bool bIsIterativeSharedCooking = Params.IterateSharedCookedBuild;
+					bool bIsIterativeSharedCooking = Params.HasIterateSharedCookedBuild;
 					bool bRequireStagedFilesToExist = SubPlatformsToStage.Length == 1 && PlatformsToStage.Count == 1 && !bJustPackaging && !bIsIterativeSharedCooking;
 
 					foreach (UnrealTargetPlatform ReceiptPlatform in SubPlatformsToStage)
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/CopySharedCookedBuild.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/CopySharedCookedBuild.Automation.cs
index abb721905e52..07980dd3adb2 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/CopySharedCookedBuild.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/CopySharedCookedBuild.Automation.cs
@@ -68,6 +68,8 @@ class CopySharedCookedBuild : BuildCommand
 
 		bool bOnlyCopyAssetRegistry = ParseParam("onlycopyassetregistry");
 
+		string SharedBuildCL = ParseParamValue("buildcl", "usesyncedbuild");
+
 		List<UnrealTargetPlatform> TargetPlatforms = new List<UnrealTargetPlatform>();
 		var PlatformNames = new List<string>(CmdLinePlatform.Split('+'));
 		foreach (var PlatformName in PlatformNames)
@@ -88,7 +90,7 @@ class CopySharedCookedBuild : BuildCommand
 
 		foreach (var PlatformType in TargetPlatforms)
 		{
-			SharedCookedBuild.CopySharedCookedBuildForTarget(ProjectFile.FullName, PlatformType, PlatformType.ToString(), bOnlyCopyAssetRegistry);
+			SharedCookedBuild.CopySharedCookedBuildForTarget(ProjectFile.FullName, PlatformType, PlatformType.ToString(), SharedBuildCL, bOnlyCopyAssetRegistry);
 			SharedCookedBuild.WaitForCopy();
 		}
 
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/RebuildHLODCommand.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/RebuildHLODCommand.Automation.cs
index 517b8ef834fe..1644d5098749 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/RebuildHLODCommand.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/RebuildHLODCommand.Automation.cs
@@ -123,7 +123,7 @@ namespace AutomationScripts.Automation
 		{
 			Log("Running Step:- RebuildHLOD::CheckOutMaps");
 			// Setup a P4 Cl we will use to submit the new HLOD data
-			WorkingCL = P4.CreateChange(P4Env.Client, String.Format("{0} rebuilding HLODs from changelist {1}\n#rb None\n#tests None", Params.ShortProjectName, P4Env.Changelist));
+			WorkingCL = P4.CreateChange(P4Env.Client, String.Format("{0} rebuilding HLODs from changelist {1}\n#rb None\n#tests None\n#jira none\n#robomerge #DisregardExcludedAuthors", Params.ShortProjectName, P4Env.Changelist));
 			Log("Working in {0}", WorkingCL);
 
 		}
@@ -145,6 +145,9 @@ namespace AutomationScripts.Automation
             {
 				var CommandletParams = IsBuildMachine ? "-unattended -buildmachine -fileopenlog" : "-fileopenlog";
                 CommandletParams += " -AutoCheckOutPackages";
+                CommandletParams += " -xgeshadercompile";
+                CommandletParams += " -AllowSoftwareRendering";
+                CommandletParams += " -SkipCheckedOutPackages";
 
                 string BuildOptions = ParseParamValue("BuildOptions", "");
                 if ( BuildOptions.Length >0)
@@ -205,7 +208,7 @@ namespace AutomationScripts.Automation
 			if (WorkingCL != -1)
 			{
                 Log("Running Step:- Submitting CL " + WorkingCL);
-				//P4.Submit(WorkingCL, out SubmittedCL, true, true);
+				P4.Submit(WorkingCL, out SubmittedCL, true, true);
 				Log("INFO: HLODs successfully submitted in cl " + SubmittedCL.ToString());
 			}
 		}
@@ -295,45 +298,48 @@ namespace AutomationScripts.Automation
 		 */
         void SendCompletionMessage(bool bWasSuccessful, String MessageBody)
 		{
-			MailMessage Message = new System.Net.Mail.MailMessage();
-			Message.Priority = MailPriority.High;
-			Message.From = new MailAddress("unrealbot@epicgames.com");
+            if(StakeholdersEmailAddresses != null)
+            { 
+			    MailMessage Message = new System.Net.Mail.MailMessage();
+			    Message.Priority = MailPriority.High;
+			    Message.From = new MailAddress("unrealbot@epicgames.com");
 
-            string Branch = "Unknown";
-            if ( P4Enabled )
-            {
-                Branch = P4Env.Branch;
-            }
+                string Branch = "Unknown";
+                if ( P4Enabled )
+                {
+                    Branch = P4Env.Branch;
+                }
 
-			foreach (String NextStakeHolder in StakeholdersEmailAddresses)
-			{
-				Message.To.Add(new MailAddress(NextStakeHolder));
-			}
+			    foreach (String NextStakeHolder in StakeholdersEmailAddresses)
+			    {
+				    Message.To.Add(new MailAddress(NextStakeHolder));
+			    }
 
-			ConfigHierarchy Ini = ConfigCache.ReadHierarchy(ConfigHierarchyType.EditorPerProjectUserSettings, DirectoryReference.FromFile(ProjectFullPath), UnrealTargetPlatform.Win64);
-			List<string> Emails;
-			Ini.GetArray("RebuildHLODSettings", "EmailNotification", out Emails);
-			foreach (var Email in Emails)
-			{
-				Message.CC.Add(new MailAddress(Email));
-			}
+			    ConfigHierarchy Ini = ConfigCache.ReadHierarchy(ConfigHierarchyType.EditorPerProjectUserSettings, DirectoryReference.FromFile(ProjectFullPath), UnrealTargetPlatform.Win64);
+			    List<string> Emails;
+			    Ini.GetArray("RebuildHLODSettings", "EmailNotification", out Emails);
+			    foreach (var Email in Emails)
+			    {
+				    Message.CC.Add(new MailAddress(Email));
+			    }
 
-			Message.Subject = String.Format("Nightly HLOD rebuild {0} for {1}", bWasSuccessful ? "[SUCCESS]" : "[FAILED]", Branch);
-			Message.Body = MessageBody;
-            /*Attachment Attach = new Attachment();
-            Message.Attachments.Add()*/
-			try
-			{
-				#pragma warning disable CS0618 // Mono 4.6.x obsoletes this class
-				SmtpClient MailClient = new SmtpClient("smtp.epicgames.net");
-				MailClient.Send(Message);
-				#pragma warning restore CS0618
-			}
-			catch (Exception Ex)
-			{
-				LogError("Failed to send notify email to {0} ({1})", String.Join(", ", StakeholdersEmailAddresses.ToArray()), Ex.Message);
-			}
-		}
+			    Message.Subject = String.Format("Nightly HLOD rebuild {0} for {1}", bWasSuccessful ? "[SUCCESS]" : "[FAILED]", Branch);
+			    Message.Body = MessageBody;
+                /*Attachment Attach = new Attachment();
+                Message.Attachments.Add()*/
+			    try
+			    {
+				    #pragma warning disable CS0618 // Mono 4.6.x obsoletes this class
+				    SmtpClient MailClient = new SmtpClient("smtp.epicgames.net");
+				    MailClient.Send(Message);
+				    #pragma warning restore CS0618
+			    }
+			    catch (Exception Ex)
+			    {
+				    LogError("Failed to send notify email to {0} ({1})", String.Join(", ", StakeholdersEmailAddresses.ToArray()), Ex.Message);
+			    }
+		    }
+        }
 
 		#endregion
 
diff --git a/Engine/Source/Programs/AutomationTool/Scripts/SharedCookedBuild.cs b/Engine/Source/Programs/AutomationTool/Scripts/SharedCookedBuild.cs
index 0740b2c45ba2..83cee3eb838d 100644
--- a/Engine/Source/Programs/AutomationTool/Scripts/SharedCookedBuild.cs
+++ b/Engine/Source/Programs/AutomationTool/Scripts/SharedCookedBuild.cs
@@ -9,24 +9,156 @@ using System.Threading.Tasks;
 using AutomationTool;
 using UnrealBuildTool;
 using Tools.DotNETCommon;
+using System.Text.RegularExpressions;
 
 public class SharedCookedBuild
 {
 	private static Task CopySharedCookedBuildTask = null;
 
-	private static bool CopySharedCookedBuildForTargetInternal(string CookedBuildPath, string CookPlatform, string LocalPath, bool bOnlyCopyAssetRegistry)
+	private static bool FindBestSharedCookedBuild(ref string FinalCookedBuildPath, string ProjectFullPath, UnrealTargetPlatform TargetPlatform, string CookPlatform, string SharedCookedBuildCL )
 	{
-
 		string BuildRoot = CommandUtils.P4Enabled ? CommandUtils.P4Env.Branch.Replace("/", "+") : "";
-		string RecentCL = CommandUtils.P4Enabled ? CommandUtils.P4Env.Changelist.ToString() : "";
+		int CurrentCLInt = CommandUtils.P4Enabled ? CommandUtils.P4Env.Changelist : 0;
 
 		BuildVersion Version;
 		if (BuildVersion.TryRead(BuildVersion.GetDefaultFileName(), out Version))
 		{
-			RecentCL = Version.Changelist.ToString();
+			CurrentCLInt = Version.Changelist;
 			BuildRoot = Version.BranchName;
 		}
 		System.GC.Collect();
+		string CurrentCL = CurrentCLInt.ToString();
+
+
+		FileReference ProjectFileRef = new FileReference(ProjectFullPath);
+		// get network location 
+		ConfigHierarchy Hierarchy = ConfigCache.ReadHierarchy(ConfigHierarchyType.Engine, DirectoryReference.FromFile(ProjectFileRef), TargetPlatform);
+		List<string> CookedBuildPaths;
+		if (Hierarchy.GetArray("SharedCookedBuildSettings", "SharedCookedBuildPath", out CookedBuildPaths) == false)
+		{
+			CommandUtils.Log("Unable to copy shared cooked build: SharedCookedBuildPath not set in Engine.ini SharedCookedBuildSettings");
+			return false;
+		}
+
+		const string MetaDataFilename = "\\Metadata\\DevelopmentAssetRegistry.bin";
+
+
+		if (SharedCookedBuildCL == "usesyncedbuild")
+		{
+			foreach (string CookedBuildPath in CookedBuildPaths)
+			{
+				if (CurrentCL == "" && FinalCookedBuildPath.Contains("[CL]"))
+				{
+					CommandUtils.Log("Unable to copy shared cooked build: Unable to determine CL number from P4 or UGS, and is required by SharedCookedBuildPath");
+					return false;
+				}
+
+				if (CurrentCL == "" && FinalCookedBuildPath.Contains("[BRANCHNAME]"))
+				{
+					CommandUtils.Log("Unable to copy shared cooked build: Unable to determine BRANCHNAME number from P4 or UGS, and is required by SharedCookedBuildPath");
+					return false;
+				}
+
+
+				FinalCookedBuildPath = FinalCookedBuildPath.Replace("[CL]", CurrentCL.ToString());
+				FinalCookedBuildPath = FinalCookedBuildPath.Replace("[BRANCHNAME]", BuildRoot);
+				FinalCookedBuildPath = FinalCookedBuildPath.Replace("[PLATFORM]", CookPlatform);
+
+				// make sure that the directory and metadata file exist.  otherwise this build might not be finished yet and we should skip it
+				if (Directory.Exists(FinalCookedBuildPath))
+				{
+					if ( File.Exists( FinalCookedBuildPath + MetaDataFilename) )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		else if (SharedCookedBuildCL == "userecentbuild")
+		{
+
+			// build our CookedBUildPath into a regex which we can execute on the directories and extract info from
+
+
+
+			string BestBuild = null;
+			int BestCLNumber = 0;
+
+			// find all the recent builds which are valid
+			foreach (string CookedBuildPath in CookedBuildPaths)
+			{
+				int IndexOfFirstParam = CookedBuildPath.IndexOf("[");
+				int CustomFolderStart = CookedBuildPath.LastIndexOf("\\", IndexOfFirstParam);
+
+				string CookedBuildDirectory = CookedBuildPath.Substring(0, CustomFolderStart);
+
+				string BuildNameWildcard = CookedBuildPath.Substring(CustomFolderStart);
+
+
+				BuildNameWildcard += MetaDataFilename;
+
+				FileFilter BuildSearch = new FileFilter();
+
+				// we know the platform and the branch name;
+				string BuildRule = BuildNameWildcard;
+				BuildRule = BuildRule.Replace("[BRANCHNAME]", BuildRoot);
+				BuildRule = BuildRule.Replace("[PLATFORM]", CookPlatform);
+
+				string IncludeRule = BuildRule.Replace("[CL]", "*");
+				string ForgetRule = BuildRule.Replace("[CL]", "*-PF-*"); // get rid of any preflights from the list... they don't count because who knows what they did...
+
+				BuildSearch.AddRule(IncludeRule);
+				BuildSearch.AddRule(ForgetRule, FileFilterType.Exclude);
+
+				List<FileReference> ValidBuilds = BuildSearch.ApplyToDirectory(new DirectoryReference(CookedBuildDirectory), false);
+
+				// figure out what the CL is
+				string BuildNameRegex = String.Format(".*{0}", CookedBuildPath.Substring(CustomFolderStart));
+				BuildNameRegex = BuildNameRegex.Replace("\\", "\\\\");
+				BuildNameRegex = BuildNameRegex.Replace("[BRANCHNAME]", BuildRoot);
+				BuildNameRegex = BuildNameRegex.Replace("+", "\\+");
+				BuildNameRegex = BuildNameRegex.Replace("[PLATFORM]", CookPlatform);
+				BuildNameRegex = BuildNameRegex.Replace("[CL]", "(?<CL>.*)");
+				
+				Regex ExtractCL = new Regex(BuildNameRegex);
+
+				foreach ( FileReference ValidBuild in ValidBuilds )
+				{
+					string BuildPath = ValidBuild.FullName.Replace(MetaDataFilename, "");
+
+					Match CLMatch = ExtractCL.Match(BuildPath);
+					if ( CLMatch != null )
+					{
+						string CLNumber = CLMatch.Result("${CL}");
+						int CLNumberInt = int.Parse(CLNumber);
+						if ( CLNumberInt <= CurrentCLInt )
+						{
+							if ( CLNumberInt > BestCLNumber )
+							{
+								BestCLNumber = CLNumberInt;
+								BestBuild = BuildPath;
+							}
+						}
+					}
+				}
+				
+			}
+
+			if ( string.IsNullOrEmpty(BestBuild) )
+			{
+				return false;
+			}
+
+			FinalCookedBuildPath = BestBuild;
+			return true;
+		}
+
+
+		return false;
+	}
+
+	private static bool CopySharedCookedBuildForTargetInternal(string CookedBuildPath, string CookPlatform, string LocalPath, bool bOnlyCopyAssetRegistry)
+	{
 
 		// check to see if we have already synced this build ;)
 		var SyncedBuildFile = CommandUtils.CombinePaths(LocalPath, "SyncedBuild.txt");
@@ -36,48 +168,22 @@ public class SharedCookedBuild
 			BuildCL = File.ReadAllText(SyncedBuildFile);
 		}
 
-		if (RecentCL == "" && CookedBuildPath.Contains("[CL]"))
+		CommandUtils.Log("Attempting download of latest shared build from {0}", CookedBuildPath);
+
+		string SavedBuildCL = string.Format( "{0} {1}", CookedBuildPath, bOnlyCopyAssetRegistry ? "RegistryOnly" : "" );
+
+		if (BuildCL == SavedBuildCL)
 		{
-			CommandUtils.Log("Unable to copy shared cooked build: Unable to determine CL number from P4 or UGS, and is required by SharedCookedBuildPath");
+			CommandUtils.Log("Already downloaded latest shared build at CL {0}", SavedBuildCL);
 			return false;
 		}
 
-		if (RecentCL == "" && CookedBuildPath.Contains("[BRANCHNAME]"))
-		{
-			CommandUtils.Log("Unable to copy shared cooked build: Unable to determine BRANCHNAME number from P4 or UGS, and is required by SharedCookedBuildPath");
-			return false;
-		}
-
-
-		CookedBuildPath = CookedBuildPath.Replace("[CL]", RecentCL.ToString());
-		CookedBuildPath = CookedBuildPath.Replace("[BRANCHNAME]", BuildRoot);
-		CookedBuildPath = CookedBuildPath.Replace("[PLATFORM]", CookPlatform);
-
 		if (Directory.Exists(CookedBuildPath) == false)
 		{
 			CommandUtils.Log("Unable to copy shared cooked build: Unable to find shared build at location {0} check SharedCookedBuildPath in Engine.ini SharedCookedBuildSettings is correct", CookedBuildPath);
 			return false;
 		}
-
-		CommandUtils.Log("Attempting download of latest shared build CL {0} from location {1}", RecentCL, CookedBuildPath);
-
-		if (BuildCL == RecentCL.ToString())
-		{
-			CommandUtils.Log("Already downloaded latest shared build at CL {0}", RecentCL);
-			return false;
-		}
-
-		if (bOnlyCopyAssetRegistry)
-		{
-			RecentCL += "RegistryOnly";
-		}
-
-		if ( BuildCL == RecentCL )
-		{
-			CommandUtils.Log("Already downloaded latest shared build at CL {0}", RecentCL);
-			return false;
-		}
-
+		
 		// delete all the stuff
 		CommandUtils.Log("Deleting previous shared build because it was out of date");
 		CommandUtils.DeleteDirectory(LocalPath);
@@ -122,38 +228,27 @@ public class SharedCookedBuild
 							File.Copy(SourceFileName, DestFileName);
 						}
 					}
-					File.WriteAllText(SyncedBuildFile, RecentCL.ToString());
+					File.WriteAllText(SyncedBuildFile, SavedBuildCL);
 				}
 				);
 		}
 		else
 		{
-			File.WriteAllText(SyncedBuildFile, RecentCL.ToString());
+			File.WriteAllText(SyncedBuildFile, SavedBuildCL);
 		}
 
 		
 		return true;
 	}
 
-	public static void CopySharedCookedBuildForTarget(string ProjectFullPath, UnrealTargetPlatform TargetPlatform, string CookPlatform, bool bOnlyCopyAssetRegistry = false)
+	public static void CopySharedCookedBuildForTarget(string ProjectFullPath, UnrealTargetPlatform TargetPlatform, string CookPlatform, string BuildCl, bool bOnlyCopyAssetRegistry = false)
 	{
 		var LocalPath = CommandUtils.CombinePaths(Path.GetDirectoryName(ProjectFullPath), "Saved", "SharedIterativeBuild", CookPlatform);
-
-		FileReference ProjectFileRef = new FileReference(ProjectFullPath);
-		// get network location 
-		ConfigHierarchy Hierarchy = ConfigCache.ReadHierarchy(ConfigHierarchyType.Engine, DirectoryReference.FromFile(ProjectFileRef), TargetPlatform);
-		List<string> CookedBuildPaths;
-		if (Hierarchy.GetArray("SharedCookedBuildSettings", "SharedCookedBuildPath", out CookedBuildPaths) == false)
+		
+		string CookedBuildPath = null;
+		if ( FindBestSharedCookedBuild(ref CookedBuildPath, ProjectFullPath, TargetPlatform, CookPlatform, BuildCl) )
 		{
-			CommandUtils.Log("Unable to copy shared cooked build: SharedCookedBuildPath not set in Engine.ini SharedCookedBuildSettings");
-			return;
-		}
-		foreach (var CookedBuildPath in CookedBuildPaths)
-		{
-			if (CopySharedCookedBuildForTargetInternal(CookedBuildPath, CookPlatform, LocalPath, bOnlyCopyAssetRegistry) == true)
-			{
-				return;
-			}
+			CopySharedCookedBuildForTargetInternal(CookedBuildPath, CookPlatform, LocalPath, bOnlyCopyAssetRegistry);
 		}
 
 		return;
@@ -169,7 +264,7 @@ public class SharedCookedBuild
 				// Use the data platform, sometimes we will copy another platform's data
 				var DataPlatformDesc = Params.GetCookedDataPlatformForClientTarget(ClientPlatform);
 				string PlatformToCook = Platform.Platforms[DataPlatformDesc].GetCookPlatform(false, Params.Client);
-				CopySharedCookedBuildForTarget(Params.RawProjectPath.FullName, ClientPlatform.Type, PlatformToCook);
+				CopySharedCookedBuildForTarget(Params.RawProjectPath.FullName, ClientPlatform.Type, PlatformToCook, Params.IterateSharedCookedBuild);
 			}
 		}
 		if (Params.DedicatedServer)
@@ -179,7 +274,7 @@ public class SharedCookedBuild
 				// Use the data platform, sometimes we will copy another platform's data
 				var DataPlatformDesc = Params.GetCookedDataPlatformForServerTarget(ServerPlatform);
 				string PlatformToCook = Platform.Platforms[DataPlatformDesc].GetCookPlatform(true, false);
-				CopySharedCookedBuildForTarget(Params.RawProjectPath.FullName, ServerPlatform.Type, PlatformToCook);
+				CopySharedCookedBuildForTarget(Params.RawProjectPath.FullName, ServerPlatform.Type, PlatformToCook, Params.IterateSharedCookedBuild);
 			}
 		}
 	}
diff --git a/Engine/Source/Programs/AutomationTool/Win/WinPlatform.Automation.cs b/Engine/Source/Programs/AutomationTool/Win/WinPlatform.Automation.cs
index 994c28f57620..b3959f89b618 100644
--- a/Engine/Source/Programs/AutomationTool/Win/WinPlatform.Automation.cs
+++ b/Engine/Source/Programs/AutomationTool/Win/WinPlatform.Automation.cs
@@ -177,7 +177,7 @@ public abstract class BaseWinPlatform : Platform
 		return "Windows";
 	}
 
-    public override string GetPlatformPakCommandLine()
+    public override string GetPlatformPakCommandLine(ProjectParams Params, DeploymentContext SC)
     {
         return " -patchpaddingalign=2048";
     }
@@ -268,11 +268,8 @@ public abstract class BaseWinPlatform : Platform
 			// Stage files in subdirs
 			foreach (DirectoryReference DependencyDirectory in DirectoryReference.EnumerateDirectories(BaseAppLocalDependenciesPath))
 			{	
-				SC.StageFiles(StagedFileType.NonUFS, DependencyDirectory, StageFilesSearch.TopDirectoryOnly, StagedBinariesDir);
+				SC.StageFiles(StagedFileType.NonUFS, DependencyDirectory, StageFilesSearch.AllDirectories, StagedBinariesDir);
 			}
-				
-			// stage loose files here
-			SC.StageFiles(StagedFileType.NonUFS, BaseAppLocalDependenciesPath, StageFilesSearch.AllDirectories, StagedBinariesDir);
 		}
 	}
 
@@ -398,21 +395,31 @@ public abstract class BaseWinPlatform : Platform
             return false;
         }
 
-        bool bSuccess = true;
-        foreach (var File in Files.Where(x => x.HasExtension(".pdb") || x.HasExtension(".exe") || x.HasExtension(".dll")))
-        {
-            ProcessStartInfo StartInfo = new ProcessStartInfo();
-            StartInfo.FileName = SymStoreExe.FullName;
-            StartInfo.Arguments = string.Format("add /f \"{0}\" /s \"{1}\" /t \"{2}\" /compress", File.FullName, SymbolStoreDirectory.FullName, Product);
-            StartInfo.UseShellExecute = false;
-            StartInfo.CreateNoWindow = true;
-            if (Utils.RunLocalProcessAndLogOutput(StartInfo) != 0)
-            {
-                bSuccess = false;
-            }
+		List<FileReference> FilesToAdd = Files.Where(x => x.HasExtension(".pdb") || x.HasExtension(".exe") || x.HasExtension(".dll")).ToList();
+		if(FilesToAdd.Count > 0)
+		{
+			string TempFileName = Path.GetTempFileName();
+			try
+			{
+				File.WriteAllLines(TempFileName, FilesToAdd.Select(x => x.FullName), Encoding.ASCII);
+
+				ProcessStartInfo StartInfo = new ProcessStartInfo();
+				StartInfo.FileName = SymStoreExe.FullName;
+				StartInfo.Arguments = string.Format("add /f \"@{0}\" /s \"{1}\" /t \"{2}\" /compress", TempFileName, SymbolStoreDirectory.FullName, Product);
+				StartInfo.UseShellExecute = false;
+				StartInfo.CreateNoWindow = true;
+				if (Utils.RunLocalProcessAndLogOutput(StartInfo) != 0)
+				{
+					return false;
+				}
+			}
+			finally
+			{
+				File.Delete(TempFileName);
+			}
         }
 
-        return bSuccess;
+		return true;
     }
 
     public override string[] SymbolServerDirectoryStructure
diff --git a/Engine/Source/Programs/BuildPatchTool/BuildPatchTool.Build.cs b/Engine/Source/Programs/BuildPatchTool/BuildPatchTool.Build.cs
index 940e8e8cae5a..2d8aa00f7592 100644
--- a/Engine/Source/Programs/BuildPatchTool/BuildPatchTool.Build.cs
+++ b/Engine/Source/Programs/BuildPatchTool/BuildPatchTool.Build.cs
@@ -16,6 +16,7 @@ public class BuildPatchTool : ModuleRules
 			new string[]
 			{
 				"Core",
+				"CoreUObject",
 				"ApplicationCore",
 				"BuildPatchServices",
 				"Projects",
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.cpp b/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.cpp
index b05fa23b3728..e5f5d97196b6 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.cpp
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.cpp
@@ -65,7 +65,7 @@ FCrashProperty& FCrashProperty::operator=(const bool NewValue)
 FCrashProperty& FCrashProperty::operator=(const int64 NewValue)
 {
 	bSet = true;
-	CachedValue = Lex::ToString( NewValue );
+	CachedValue = LexToString( NewValue );
 	Owner->SetCrashProperty( MainCategory, SecondCategory, CachedValue );
 	return *this;
 }
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.h b/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.h
index bb45959dc760..415f4830d453 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.h
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashDescription.h
@@ -78,22 +78,19 @@ struct FAnalyticsEventAttribute;
 	"bAllowToBeContacted"
  */
 
-namespace Lex
+inline void LexFromString( ECrashDescVersions& OutValue, const TCHAR* Buffer )
 {
-	inline void FromString( ECrashDescVersions& OutValue, const TCHAR* Buffer )
-	{
-		OutValue = (ECrashDescVersions)FCString::Atoi( Buffer );
-	}
+	OutValue = (ECrashDescVersions)FCString::Atoi( Buffer );
+}
 
-	inline void FromString( ECrashDumpMode& OutValue, const TCHAR* Buffer )
-	{
-		OutValue = (ECrashDumpMode)FCString::Atoi( Buffer );
-	}
+inline void LexFromString( ECrashDumpMode& OutValue, const TCHAR* Buffer )
+{
+	OutValue = (ECrashDumpMode)FCString::Atoi( Buffer );
+}
 
-	inline void FromString( FEngineVersion& OutValue, const TCHAR* Buffer )
-	{
-		FEngineVersion::Parse( Buffer, OutValue );
-	}
+inline void LexFromString( FEngineVersion& OutValue, const TCHAR* Buffer )
+{
+	FEngineVersion::Parse( Buffer, OutValue );
 }
 
 /** Simple crash property. Only for string values. */
@@ -438,7 +435,7 @@ protected:
 			const FXmlNode* CategoryNode = MainNode->FindChildNode( SecondCategory );
 			if (CategoryNode)
 			{
-				Lex::FromString( out_ReadValue, *FGenericCrashContext::UnescapeXMLString( CategoryNode->GetContent() ) );
+				LexFromString( out_ReadValue, *FGenericCrashContext::UnescapeXMLString( CategoryNode->GetContent() ) );
 			}
 		}
 	}
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashReportClient.cpp b/Engine/Source/Programs/CrashReportClient/Private/CrashReportClient.cpp
index 6415fa1cbcbe..436b031314c1 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashReportClient.cpp
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashReportClient.cpp
@@ -222,6 +222,8 @@ void FCrashReportClient::StoreCommentAndUpload()
 
 bool FCrashReportClient::Tick(float UnusedDeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCrashReportClient_Tick);
+
 	// We are waiting for diagnose report task to complete.
 	if( IsProcessingCallstack() )
 	{
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashReportClientUnattended.cpp b/Engine/Source/Programs/CrashReportClient/Private/CrashReportClientUnattended.cpp
index c932bb1ff0c5..bc6426106035 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashReportClientUnattended.cpp
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashReportClientUnattended.cpp
@@ -23,6 +23,8 @@ FCrashReportClientUnattended::FCrashReportClientUnattended(FPlatformErrorReport&
 
 bool FCrashReportClientUnattended::Tick(float UnusedDeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCrashReportClientUnattended_Tick);
+
 	if (!FCrashUploadBase::IsInitialized())
 	{
 		FCrashUploadBase::StaticInitialize(ErrorReport);
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.cpp b/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.cpp
index 1a65c856923e..daff68666b1b 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.cpp
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.cpp
@@ -16,6 +16,7 @@
 #include "PendingReports.h"
 #include "CrashDescription.h"
 #include "Misc/EngineBuildSettings.h"
+#include "Misc/CommandLine.h"
 
 // Switched off CRR upload - Jun 2016
 #define PRIMARY_UPLOAD_RECEIVER 0
@@ -343,6 +344,24 @@ void FCrashUploadBase::AddReportToFailedList() const
 	}
 }
 
+void FCrashUploadBase::CleanCrashReportDirectory(const FString& CrashReportDirectory)
+{
+	// Clean crash report folder if requested
+	if (FParse::Param(FCommandLine::Get(), TEXT("CleanCrashReports")))
+	{
+		// Check that the crash directory is valid and resides in /Saved/Crashes
+		FString NormalizedReportDirectory = CrashReportDirectory;
+		FPaths::NormalizeDirectoryName(NormalizedReportDirectory);
+		if (NormalizedReportDirectory.Contains(TEXT("/Saved/Crashes/")))
+		{
+			UE_LOG(CrashReportClientLog, Log, TEXT("Removing crash report directory %s"), *CrashReportDirectory);
+			IFileManager& FileManager = IFileManager::Get();
+			FileManager.DeleteDirectory(*CrashReportDirectory, false, true);
+		}
+	}
+}
+
+
 // FCrashUploadToReceiver //////////////////////////////////////////////////////
 
 FCrashUploadToReceiver::FCrashUploadToReceiver(const FString& InReceiverAddress)
@@ -365,6 +384,8 @@ FCrashUploadToReceiver::~FCrashUploadToReceiver()
 
 bool FCrashUploadToReceiver::PingTimeout(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FCrashUploadToReceiver_PingTimeout);
+
 	if (EUploadState::PingingServer == State)
 	{
 		SetCurrentState(EUploadState::ServerNotAvailable);
@@ -765,7 +786,7 @@ void FCrashUploadToDataRouter::CompressAndSendData()
 #if PRIMARY_UPLOAD_DATAROUTER
 		// completed upload to DR so send analytics
 		FPrimaryCrashProperties::Get()->SendPostUploadAnalytics();
-#endif
+#endif		
 		return;
 	}
 	else
@@ -800,6 +821,8 @@ void FCrashUploadToDataRouter::OnProcessRequestComplete(FHttpRequestPtr HttpRequ
 		}
 		else
 		{
+			// Successfully submitted crash report
+			CleanCrashReportDirectory(ErrorReport.GetReportDirectory());
 			CheckPendingReportsForFilesToUpload();
 		}
 		break;
diff --git a/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.h b/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.h
index c4a4737761f0..63ef3189355f 100644
--- a/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.h
+++ b/Engine/Source/Programs/CrashReportClient/Private/CrashUpload.h
@@ -99,6 +99,12 @@ protected:
 	*/
 	void AddReportToFailedList() const;
 
+	/**
+	* Removes crash report folder once submitted to the crash reporting backend, as to not fill up server
+	* -CleanCrashReports must be specified on the crash report client command line
+	*/
+	void CleanCrashReportDirectory(const FString& CrashReportDirectory);
+
 protected:
 	bool bUploadCalled;
 
diff --git a/Engine/Source/Programs/DotNETCommon/DotNETUtilities/DotNETUtilities.csproj b/Engine/Source/Programs/DotNETCommon/DotNETUtilities/DotNETUtilities.csproj
index fdb3cb35cf58..5d55c325c40d 100644
--- a/Engine/Source/Programs/DotNETCommon/DotNETUtilities/DotNETUtilities.csproj
+++ b/Engine/Source/Programs/DotNETCommon/DotNETUtilities/DotNETUtilities.csproj
@@ -76,6 +76,7 @@
     <Compile Include="FileSystemReference.cs" />
     <Compile Include="JsonObject.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="ManagedProcess.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResXResource\UEResXReader.cs" />
     <Compile Include="ResXResource\UEResXWriter.cs" />
diff --git a/Engine/Source/Programs/AutomationTool/AutomationUtils/ManagedProcess.cs b/Engine/Source/Programs/DotNETCommon/DotNETUtilities/ManagedProcess.cs
similarity index 88%
rename from Engine/Source/Programs/AutomationTool/AutomationUtils/ManagedProcess.cs
rename to Engine/Source/Programs/DotNETCommon/DotNETUtilities/ManagedProcess.cs
index 1fa38e967b68..985c274774f2 100644
--- a/Engine/Source/Programs/AutomationTool/AutomationUtils/ManagedProcess.cs
+++ b/Engine/Source/Programs/DotNETCommon/DotNETUtilities/ManagedProcess.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 using Microsoft.Win32.SafeHandles;
 using System;
@@ -8,14 +8,15 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
-namespace AutomationTool
+namespace Tools.DotNETCommon
 {
 	/// <summary>
 	/// Possible priority values for new processes.
 	/// </summary>
-	enum ManagedProcessPriority
+	public enum ManagedProcessPriority
 	{
 		BelowNormal,
 		Normal,
@@ -27,7 +28,7 @@ namespace AutomationTool
 	/// Uses job objects to ensure that the process will be terminated automatically by the O/S if the current process is terminated, and polls pipe reads to avoid blocking on unmanaged code
 	/// if the calling thread is terminated. Currently only implemented for Windows; makes heavy use of P/Invoke.
 	/// </summary>
-	class ManagedProcess : IDisposable
+	public sealed class ManagedProcess : IDisposable
 	{
 		[StructLayout(LayoutKind.Sequential)]
 		class SECURITY_ATTRIBUTES
@@ -136,7 +137,6 @@ namespace AutomationTool
 		{
 			CREATE_NO_WINDOW = 0x08000000,
 			CREATE_SUSPENDED = 0x00000004,
-			CREATE_BREAKAWAY_FROM_JOB = 0x01000000,
 			BELOW_NORMAL_PRIORITY_CLASS = 0x00004000,
 			NORMAL_PRIORITY_CLASS = 0x00000020,
 			ABOVE_NORMAL_PRIORITY_CLASS = 0x00008000,
@@ -167,6 +167,17 @@ namespace AutomationTool
 		[DllImport("kernel32.dll", SetLastError = true)]
 		static extern int GetExitCodeProcess(SafeFileHandle hProcess, out int lpExitCode);
 
+		[DllImport ("kernel32.dll")]
+		static extern bool IsProcessInJob(IntPtr hProcess, IntPtr hJob, out bool Result);
+
+		[DllImport("kernel32.dll", SetLastError=true)]
+		static extern int TerminateProcess(SafeHandleZeroOrMinusOneIsInvalid hProcess, uint uExitCode);
+
+		const UInt32 INFINITE = 0xFFFFFFFF;
+
+		[DllImport("kernel32.dll", SetLastError=true)]
+		static extern UInt32 WaitForSingleObject(SafeHandleZeroOrMinusOneIsInvalid hHandle, UInt32 dwMilliseconds);
+
 		/// <summary>
 		/// Handle for the child process.
 		/// </summary>
@@ -261,7 +272,7 @@ namespace AutomationTool
 				try
 				{
 					// Get the flags to create the new process
-					ProcessCreationFlags Flags = ProcessCreationFlags.CREATE_NO_WINDOW | ProcessCreationFlags.CREATE_SUSPENDED | ProcessCreationFlags.CREATE_BREAKAWAY_FROM_JOB;
+					ProcessCreationFlags Flags = ProcessCreationFlags.CREATE_NO_WINDOW | ProcessCreationFlags.CREATE_SUSPENDED;
 					switch(Priority)
 					{
 						case ManagedProcessPriority.BelowNormal:
@@ -287,6 +298,7 @@ namespace AutomationTool
 						{
 							// Create stdin and stdout pipes for the child process. We'll close the handles for the child process' ends after it's been created.
 							SECURITY_ATTRIBUTES SecurityAttributes = new SECURITY_ATTRIBUTES();
+							SecurityAttributes.nLength = Marshal.SizeOf(SecurityAttributes);
 							SecurityAttributes.bInheritHandle = 1;
 
 							if(CreatePipe(out StdInRead, out StdInWrite, SecurityAttributes, 0) == 0 || SetHandleInformation(StdInWrite, HANDLE_FLAG_INHERIT, 0) == 0)
@@ -297,7 +309,7 @@ namespace AutomationTool
 							{
 								throw new Win32Exception();
 							}
-							if(DuplicateHandle(GetCurrentProcess(), StdOutWrite, GetCurrentProcess(), out StdErrWrite, DUPLICATE_SAME_ACCESS, true, 0) == 0)
+							if(DuplicateHandle(GetCurrentProcess(), StdOutWrite, GetCurrentProcess(), out StdErrWrite, 0, true, DUPLICATE_SAME_ACCESS) == 0)
 							{
 								throw new Win32Exception();
 							}
@@ -339,7 +351,16 @@ namespace AutomationTool
 					// Add it to our job object
 					if(AssignProcessToJobObject(JobHandle, ProcessInfo.hProcess) == 0)
 					{
-						throw new Win32Exception();
+						// Support for nested job objects was only addeed in Windows 8; prior to that, assigning processes to job objects would fail. Figure out if we're already in a job, and ignore the error if we are.
+						int OriginalError = Marshal.GetLastWin32Error();
+
+						bool bProcessInJob;
+						IsProcessInJob(GetCurrentProcess(), IntPtr.Zero, out bProcessInJob);
+
+						if(!bProcessInJob)
+						{
+							throw new Win32Exception(OriginalError);
+						}
 					}
 
 					// Allow the thread to start running
@@ -394,6 +415,9 @@ namespace AutomationTool
 		{
 			if(ProcessHandle != null)
 			{
+				TerminateProcess(ProcessHandle, 0);
+				WaitForSingleObject(ProcessHandle, INFINITE);
+
 				ProcessHandle.Dispose();
 				ProcessHandle = null;
 			}
@@ -469,19 +493,32 @@ namespace AutomationTool
 		/// Block until the process outputs a line of text, or terminates.
 		/// </summary>
 		/// <param name="Line">Variable to receive the output line</param>
-		/// <returns>True if a line was read, false if the process terminated without writing another line.</returns>
-		public bool TryReadLine(out string Line)
+		/// <param name="Token">Cancellation token which can be used to abort the read operation.</param>
+		/// <returns>True if a line was read, false if the process terminated without writing another line, or the cancellation token was signaled.</returns>
+		public bool TryReadLine(out string Line, CancellationToken? Token = null)
 		{
-			// Busy wait for the ReadLine call to finish, so we can get interrupted by thread abort exceptions
-			Task<string> ReadLineTask = ReadStream.ReadLineAsync();
-			for(;;)
+			try
 			{
-				if(ReadLineTask.Wait(20))
+				// Busy wait for the ReadLine call to finish, so we can get interrupted by thread abort exceptions
+				Task<string> ReadLineTask = ReadStream.ReadLineAsync();
+				for (;;)
 				{
-					Line = ReadLineTask.IsCompleted? ReadLineTask.Result : null;
-					return Line != null;
+					const int MillisecondsTimeout = 20;
+					if (Token.HasValue 
+							? ReadLineTask.Wait(MillisecondsTimeout, Token.Value) 
+							: ReadLineTask.Wait(MillisecondsTimeout))
+					{
+						Line = ReadLineTask.IsCompleted ? ReadLineTask.Result : null;
+						return Line != null;
+					}
 				}
 			}
+			catch (OperationCanceledException)
+			{
+				// If the cancel token is signalled, just return false.
+				Line = null;
+				return false;
+			}
 		}
 
 		/// <summary>
diff --git a/Engine/Source/Programs/IOS/DeploymentInterface/DeploymentInterface.cs b/Engine/Source/Programs/IOS/DeploymentInterface/DeploymentInterface.cs
index 0928cae10438..ed0cefb4efa9 100644
--- a/Engine/Source/Programs/IOS/DeploymentInterface/DeploymentInterface.cs
+++ b/Engine/Source/Programs/IOS/DeploymentInterface/DeploymentInterface.cs
@@ -41,7 +41,8 @@ namespace iPhonePackager
         ConnectedDeviceInfo [] EnumerateConnectedDevices();
         bool InstallIPAOnDevice(string IPAPath);
 		bool InstallFilesOnDevice(string BundleIdentifier, string ManifestFile);
-		bool BackupDocumentsDirectory(string BundleIdentifier, string DestinationDocumentsDirectory);
+        bool CopyFileToDevice(string BundleIdentifier, string SourceFile, string DestFile);
+        bool BackupDocumentsDirectory(string BundleIdentifier, string DestinationDocumentsDirectory);
 		bool BackupFiles(string BundleIdentifier, string[] Files);
 		bool ListApplications();
 	}
diff --git a/Engine/Source/Programs/IOS/DeploymentServer/DeployTime.cs b/Engine/Source/Programs/IOS/DeploymentServer/DeployTime.cs
index 5e55fbb5120a..952f4d3b5750 100644
--- a/Engine/Source/Programs/IOS/DeploymentServer/DeployTime.cs
+++ b/Engine/Source/Programs/IOS/DeploymentServer/DeployTime.cs
@@ -77,8 +77,11 @@ namespace DeploymentServer
 		{
 			return Deployer.InstallFilesOnDevice(BundleIdentifier, ManifestFile);
 		}
-
-		public bool BackupDocumentsDirectory(string BundleIdentifier, string DestinationDocumentsDirectory)
+        public bool CopyFileToDevice(string BundleIdentifier, string SourceFile, string DestFile)
+        {
+            return Deployer.CopyFileToDevice(BundleIdentifier, SourceFile, DestFile);
+        }
+        public bool BackupDocumentsDirectory(string BundleIdentifier, string DestinationDocumentsDirectory)
 		{
 			return Deployer.BackupDocumentsDirectory(BundleIdentifier, DestinationDocumentsDirectory);
 		}
@@ -458,7 +461,27 @@ namespace DeploymentServer
 				}
 				return bResult;
 			});
-		}
+        }
+
+		/// <summary>
+		/// Copies a single file to a specified location on the device for the given bundle
+		/// </summary>
+        public bool CopyFileToDevice(string BundleIdentifier, string SourceFile, string DestFile)
+        {
+            return PerformActionOnAllDevices(StandardEnumerationDelayMS, delegate (MobileDeviceInstance Device)
+            {
+                bool bResult = true;
+                string DeviceType = Device.ProductType;
+                if (String.IsNullOrEmpty(DeviceId) || Device.DeviceId == DeviceId ||
+                    (DeviceId.Contains("All_tvOS_On") && DeviceType.Contains("TV")) ||
+                    (DeviceId.Contains("All_iOS_On") && !DeviceType.Contains("TV")))
+                {
+                    bResult = Device.TryCopyFile(BundleIdentifier, SourceFile, DestFile);
+                    ReportIF.Log("");
+                }
+                return bResult;
+            });
+        }
 
         public bool BackupDocumentsDirectory(string BundleIdentifier, string DestinationDocumentsDirectory)
         {
diff --git a/Engine/Source/Programs/IOS/DeploymentServer/Program.cs b/Engine/Source/Programs/IOS/DeploymentServer/Program.cs
index ffcc373d4870..c0e04bdf12f6 100644
--- a/Engine/Source/Programs/IOS/DeploymentServer/Program.cs
+++ b/Engine/Source/Programs/IOS/DeploymentServer/Program.cs
@@ -166,7 +166,11 @@ namespace DeploymentServer
 					bResult = Deployer.InstallFilesOnDevice(Bundle, Manifest);
 					break;
 
-				case "install":
+                case "copyfile":
+                    bResult = Deployer.CopyFileToDevice(Bundle, FileList[0], FileList[1]);
+                    break;
+
+                case "install":
 					bResult = Deployer.InstallIPAOnDevice(ipaPath);
 					break;
 
diff --git a/Engine/Source/Programs/IOS/MobileDeviceInterface/MobileDeviceInstance.cs b/Engine/Source/Programs/IOS/MobileDeviceInterface/MobileDeviceInstance.cs
index 1472e1d2e923..fcb3807dcf93 100644
--- a/Engine/Source/Programs/IOS/MobileDeviceInterface/MobileDeviceInstance.cs
+++ b/Engine/Source/Programs/IOS/MobileDeviceInterface/MobileDeviceInstance.cs
@@ -567,11 +567,38 @@ namespace Manzana
             }
         }
 
-		/// <summary>
-		/// Tries to copy all of the files in a particular directory on the PC to the phone directory
-		/// (requires the bundle identifier to be able to mount that directory)
-		/// </summary>
-		public bool TryCopy(string BundleIdentifier, string SourceFolderOnPC, string TargetFolderOnDevice)
+        /// <summary>
+        /// Tries to copy the specified file from the PC to a specified file path on the target device.
+        /// (requires the bundle identifier to be able to mount that directory)
+        /// </summary>
+        public bool TryCopyFile(string BundleIdentifier, string SourceFileOnPC, string TargetFileOnDevice)
+        {
+            if (ConnectToBundle(BundleIdentifier))
+            {
+                WriteProgressLine("Connected to bundle '{0}'", 0, BundleIdentifier);
+                try
+                {
+                    CopyFileToPhone(SourceFileOnPC, TargetFileOnDevice, 1024 * 1024);
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    WriteProgressLine("Failed to transfer a file, extended error is '{0}'", 100, ex.Message);
+                    return false;
+                }
+            }
+			else
+			{
+				WriteProgressLine("Error: Failed to connect to bundle '{0}'", 100, BundleIdentifier);
+				return false;
+			}
+        }
+
+        /// <summary>
+        /// Tries to copy all of the files in a particular directory on the PC to the phone directory
+        /// (requires the bundle identifier to be able to mount that directory)
+        /// </summary>
+        public bool TryCopy(string BundleIdentifier, string SourceFolderOnPC, string TargetFolderOnDevice)
 		{
 			if (ConnectToBundle(BundleIdentifier))
 			{
diff --git a/Engine/Source/Programs/IOS/iPhonePackager/CodeSigning.cs b/Engine/Source/Programs/IOS/iPhonePackager/CodeSigning.cs
index 53e8807d23c5..11c3c3650728 100644
--- a/Engine/Source/Programs/IOS/iPhonePackager/CodeSigning.cs
+++ b/Engine/Source/Programs/IOS/iPhonePackager/CodeSigning.cs
@@ -573,6 +573,7 @@ namespace iPhonePackager
 			Rules1.Add("^", true);
 			Rules1.Add("^.*\\.lproj/", CreateOptionalResource(1000));
 			Rules1.Add("^.*\\.lproj/locversion.plist$", CreateOmittedResource(1100));
+			Rules1.Add("^Base\\.lproj", CreateResource(1010));
 			Rules1.Add("^version.plist$", true);
 
 			Dictionary<string, object> Rules2 = new Dictionary<string, object>();
@@ -583,6 +584,7 @@ namespace iPhonePackager
 			Rules2.Add("^.*", true);
 			Rules2.Add("^.*\\.lproj/", CreateOptionalResource(1000));
 			Rules2.Add("^.*\\.lproj/locversion.plist$", CreateOmittedResource(1100));
+			Rules2.Add("^Base\\.lproj", CreateResource(1010));
 			Rules2.Add("^Info\\.plist$", CreateOmittedResource(20));
 			Rules2.Add("^PkgInfo$", CreateOmittedResource(20));
 			Rules2.Add("^[^/]+$", CreateNestedResource(10));
@@ -604,7 +606,8 @@ namespace iPhonePackager
 
 			// Hash each file
 			IEnumerable<string> FileList = FileSystem.GetAllPayloadFiles();
-			SHA1CryptoServiceProvider HashProvider = new SHA1CryptoServiceProvider();
+			SHA1CryptoServiceProvider Hash1Provider = new SHA1CryptoServiceProvider();
+			SHA256CryptoServiceProvider Hash2Provider = new SHA256CryptoServiceProvider();
 
 			Utilities.PListHelper HashedFileEntries1 = new Utilities.PListHelper();
 			Utilities.PListHelper HashedFileEntries2 = new Utilities.PListHelper();
@@ -612,17 +615,23 @@ namespace iPhonePackager
 			{
 				if (!TrueExclusionList1.ContainsKey(Filename))
 				{
-					byte[] FileData = FileSystem.ReadAllBytes(Filename);
-					byte[] HashData = HashProvider.ComputeHash(FileData);
-
+					System.IO.Stream Stream = FileSystem.OpenRead(Filename);
+					byte[] HashData = Hash1Provider.ComputeHash(Stream);
+					FileSystem.CloseFile(Stream);
 					HashedFileEntries1.AddKeyValuePair(Filename, HashData);
 				}
 				if (!TrueExclusionList2.ContainsKey(Filename))
 				{
-					byte[] FileData = FileSystem.ReadAllBytes(Filename);
-					byte[] HashData = HashProvider.ComputeHash(FileData);
-
-					HashedFileEntries2.AddKeyValuePair(Filename, HashData);
+					System.IO.Stream Stream = FileSystem.OpenRead(Filename);
+					byte[] Hash1Data = Hash1Provider.ComputeHash(Stream);
+					FileSystem.CloseFile(Stream);
+					Stream = FileSystem.OpenRead(Filename);
+					byte[] Hash2Data = Hash2Provider.ComputeHash(Stream);
+					FileSystem.CloseFile(Stream);
+					Utilities.PListHelper HashEntries = new Utilities.PListHelper();
+					HashEntries.AddKeyValuePair("hash", Hash1Data);
+					HashEntries.AddKeyValuePair("hash2", Hash2Data);
+					HashedFileEntries2.AddKeyValuePair(Filename, HashEntries);
 				}
 			}
 
diff --git a/Engine/Source/Programs/IOS/iPhonePackager/FileOperations.cs b/Engine/Source/Programs/IOS/iPhonePackager/FileOperations.cs
index ba8a408f96e8..ae35b9424536 100644
--- a/Engine/Source/Programs/IOS/iPhonePackager/FileOperations.cs
+++ b/Engine/Source/Programs/IOS/iPhonePackager/FileOperations.cs
@@ -505,6 +505,7 @@ namespace iPhonePackager
 		{
 			public abstract byte[] ReadAllBytes(string RelativeFilename);
 			public abstract Stream OpenRead(string RelativeFilename);
+			public abstract void CloseFile(Stream InStream);
 			public abstract void WriteAllBytes(string RelativeFilename, byte[] Data);
 			public abstract void Close();
 
@@ -549,6 +550,11 @@ namespace iPhonePackager
 				return File.OpenRead(GetNativePath(RelativeFilename));
 			}
 
+			public override void CloseFile(Stream InStream)
+			{
+
+			}
+
 			public override void WriteAllBytes(string RelativeFilename, byte[] Data)
 			{
 				File.WriteAllBytes(GetNativePath(RelativeFilename), Data);
@@ -653,7 +659,7 @@ namespace iPhonePackager
 			{
 				string FullPath = InternalRootPath + RelativeFilename;
 
-				MemoryStream ReadStream;
+				Stream ReadStream;
 
 				byte[] PreviousData;
 				if (PendingWrites.TryGetValue(FullPath, out PreviousData))
@@ -665,8 +671,16 @@ namespace iPhonePackager
 					if (Zip.ContainsEntry(FullPath))
 					{
 						ZipEntry Entry = Zip[FullPath];
-						ReadStream = new MemoryStream((int)Entry.UncompressedSize);
-						Zip[FullPath].Extract(ReadStream);
+						if (Entry.UncompressedSize >= (2L * 1024 * 1024 * 1024))
+						{
+							Entry.Extract(Path.GetTempPath());
+							ReadStream = File.OpenRead(Path.Combine(Path.GetTempPath(), Entry.FileName));
+						}
+						else
+						{
+							ReadStream = new MemoryStream((int)Entry.UncompressedSize);
+							Zip[FullPath].Extract(ReadStream);
+						}
 					}
 					else
 					{
@@ -680,6 +694,15 @@ namespace iPhonePackager
 				return ReadStream;
 			}
 
+			public override void CloseFile(Stream InStream)
+			{
+				if ((InStream as System.IO.FileStream) != null)
+				{
+					InStream.Close();
+					File.Delete((InStream as System.IO.FileStream).Name);
+				}
+			}
+
 			public override void WriteAllBytes(string RelativeFilename, byte[] Data)
 			{
 				string FullPath = InternalRootPath + RelativeFilename;
diff --git a/Engine/Source/Programs/IncludeTool/IncludeTool/Rules.cs b/Engine/Source/Programs/IncludeTool/IncludeTool/Rules.cs
index 80d973b76d29..b1e25e1b2602 100644
--- a/Engine/Source/Programs/IncludeTool/IncludeTool/Rules.cs
+++ b/Engine/Source/Programs/IncludeTool/IncludeTool/Rules.cs
@@ -193,10 +193,6 @@ namespace IncludeTool
 			{
 				return true;
 			}
-			if(NormalizedPath.EndsWith("/guidgenerator.cpp"))
-			{
-				return true;
-			}
 			if(NormalizedPath.EndsWith("/recastmesh.cpp") || NormalizedPath.EndsWith("/recastfilter.cpp") || NormalizedPath.EndsWith("/recastcontour.cpp") || NormalizedPath.EndsWith("/framepro.h") || NormalizedPath.EndsWith("/framepro.cpp"))
 			{
 				return true;
diff --git a/Engine/Source/Programs/SlateViewer/Private/SlateViewerApp.cpp b/Engine/Source/Programs/SlateViewer/Private/SlateViewerApp.cpp
index f3a2e3db2c2d..30a9bf563a6d 100644
--- a/Engine/Source/Programs/SlateViewer/Private/SlateViewerApp.cpp
+++ b/Engine/Source/Programs/SlateViewer/Private/SlateViewerApp.cpp
@@ -81,8 +81,11 @@ int RunSlateViewer( const TCHAR* CommandLine )
 		FSlateApplication::Get().Tick();		
 		FPlatformProcess::Sleep(0);
 	}
-	FModuleManager::Get().UnloadModulesAtShutdown();
+
+	FCoreDelegates::OnExit.Broadcast();
 	FSlateApplication::Shutdown();
+	FModuleManager::Get().UnloadModulesAtShutdown();
+
 
 	return 0;
 }
diff --git a/Engine/Source/Programs/UnrealBuildTool/Configuration/BuildConfiguration.cs b/Engine/Source/Programs/UnrealBuildTool/Configuration/BuildConfiguration.cs
index 0c86741eaba4..0afb6b02ee74 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Configuration/BuildConfiguration.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Configuration/BuildConfiguration.cs
@@ -134,6 +134,12 @@ namespace UnrealBuildTool
 		[XmlConfigFile]
 		public bool bAllowDistcc = false;
 
+		/// <summary>
+		/// Whether to allow using parallel executor on Windows.
+		/// </summary>
+		[XmlConfigFile]
+		public bool bAllowParallelExecutor = true;
+
 		/// <summary>
 		/// If specified, we will only build this particular source file, ignore all other outputs.  Useful for testing non-Unity builds.
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/Configuration/TargetRules.cs b/Engine/Source/Programs/UnrealBuildTool/Configuration/TargetRules.cs
index bdbe86e23b43..b3663c89ad7c 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Configuration/TargetRules.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Configuration/TargetRules.cs
@@ -328,6 +328,12 @@ namespace UnrealBuildTool
 		/// </summary>
 		public List<string> AdditionalPlugins = new List<string>();
 
+		/// <summary>
+		/// List of plugins to be excluded from this target. Note that the project file may still reference them, so they should be marked
+		/// as optional to avoid failing to find them at runtime.
+		/// </summary>
+		public List<string> ExcludePlugins = new List<string>();
+
 		/// <summary>
 		/// Path to the set of pak signing keys to embed in the executable.
 		/// </summary>
@@ -805,6 +811,7 @@ namespace UnrealBuildTool
 		/// Whether to use incremental linking or not. Incremental linking can yield faster iteration times when making small changes.
 		/// Currently disabled by default because it tends to behave a bit buggy on some computers (PDB-related compile errors).
 		/// </summary>
+		[CommandLine("-IncrementalLinking")]
 		[XmlConfigFile(Category = "BuildConfiguration")]
 		public bool bUseIncrementalLinking = false;
 
@@ -1105,6 +1112,11 @@ namespace UnrealBuildTool
 		/// </summary>
 		public AndroidTargetRules AndroidPlatform = new AndroidTargetRules();
 
+		/// <summary>
+		/// IOS-specific target settings.
+		/// </summary>
+		public IOSTargetRules IOSPlatform = new IOSTargetRules();
+
 		/// <summary>
 		/// Lumin-specific target settings.
 		/// </summary>
@@ -1335,6 +1347,7 @@ namespace UnrealBuildTool
 		{
 			yield return this;
 			yield return AndroidPlatform;
+			yield return IOSPlatform;
 			yield return LuminPlatform;
 			yield return MacPlatform;
 			yield return PS4Platform;
@@ -1387,6 +1400,7 @@ namespace UnrealBuildTool
 		{
 			this.Inner = Inner;
 			AndroidPlatform = new ReadOnlyAndroidTargetRules(Inner.AndroidPlatform);
+			IOSPlatform = new ReadOnlyIOSTargetRules(Inner.IOSPlatform);
 			LuminPlatform = new ReadOnlyLuminTargetRules(Inner.LuminPlatform);
 			MacPlatform = new ReadOnlyMacTargetRules(Inner.MacPlatform);
 			PS4Platform = new ReadOnlyPS4TargetRules(Inner.PS4Platform);
@@ -1484,6 +1498,11 @@ namespace UnrealBuildTool
 			get { return Inner.AdditionalPlugins; }
 		}
 
+		public IEnumerable<string> ExcludePlugins
+		{
+			get { return Inner.ExcludePlugins; }
+		}
+
 		public string PakSigningKeysFile
 		{
 			get { return Inner.PakSigningKeysFile; }
@@ -2060,6 +2079,12 @@ namespace UnrealBuildTool
 			private set;
 		}
 
+		public ReadOnlyIOSTargetRules IOSPlatform
+		{
+			get;
+			private set;
+		}
+
 		public ReadOnlyMacTargetRules MacPlatform
 		{
 			get;
diff --git a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildModuleCPP.cs b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildModuleCPP.cs
index 0bb02212fde6..d0ca5069b7d3 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildModuleCPP.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildModuleCPP.cs
@@ -486,7 +486,7 @@ namespace UnrealBuildTool
 			{
 				MinSourceFilesForUnityBuild = Rules.MinSourceFilesForUnityBuildOverride;
 			}
-			else if (!Rules.bTreatAsEngineModule)
+			else if (Target.ProjectFile != null && RulesFile.IsUnderDirectory(DirectoryReference.Combine(Target.ProjectFile.Directory, "Source")))
 			{
 				// Game modules with only a small number of source files are usually better off having faster iteration times
 				// on single source file changes, so we forcibly disable unity build for those modules
diff --git a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildPlatform.cs b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildPlatform.cs
index 334e63c503c3..040a840b3a9b 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildPlatform.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildPlatform.cs
@@ -181,6 +181,16 @@ namespace UnrealBuildTool
 			}
 		}
 
+		/// <summary>
+		/// Enumerates any additional directories needed to clean this target
+		/// </summary>
+		/// <param name="Target">The target to clean</param>
+		/// <param name="FilesToDelete">Receives a list of files to be removed</param>
+		/// <param name="DirectoriesToDelete">Receives a list of directories to be removed</param>
+		public virtual void FindAdditionalBuildProductsToClean(ReadOnlyTargetRules Target, List<FileReference> FilesToDelete, List<DirectoryReference> DirectoriesToDelete)
+		{
+		}
+
 		/// <summary>
 		/// Determines if a filename is a default UBT build product
 		/// </summary>
@@ -519,6 +529,14 @@ namespace UnrealBuildTool
 			return true;
 		}
 
+		/// <summary>
+		/// If this platform can be compiled with the parallel executor
+		/// </summary>
+		public virtual bool CanUseParallelExecutor()
+		{
+			return CanUseXGE();
+		}
+
 		/// <summary>
 		/// If this platform can be compiled with DMUCS/Distcc
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildTarget.cs b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildTarget.cs
index 764e713d4c00..31684fbf8b05 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildTarget.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Configuration/UEBuildTarget.cs
@@ -1255,6 +1255,13 @@ namespace UnrealBuildTool
 				}
 			}
 
+			// Get all the additional intermediate folders created by this platform
+			List<FileReference> AdditionalFilesToDelete = new List<FileReference>();
+			List<DirectoryReference> AdditionalDirectoriesToDelete = new List<DirectoryReference>();
+			UEBuildPlatform.GetBuildPlatform(Platform).FindAdditionalBuildProductsToClean(Rules, AdditionalFilesToDelete, AdditionalDirectoriesToDelete);
+			FilesToDelete.AddRange(AdditionalFilesToDelete);
+			DirectoriesToDelete.AddRange(AdditionalDirectoriesToDelete);
+
 			// Delete all the directories, then all the files. By sorting the list of directories before we delete them, we avoid spamming the log if a parent directory is deleted first.
 			foreach (DirectoryReference DirectoryToDelete in DirectoriesToDelete.OrderBy(x => x.FullName))
 			{
@@ -1587,17 +1594,12 @@ namespace UnrealBuildTool
 			if (Rules.bUsesSlate)
 			{
 				AddRuntimeDependenciesFromDir(DirectoryReference.Combine(UnrealBuildTool.EngineDirectory, "Content", "Slate"), StagedFileType.UFS);
-				if (Configuration != UnrealTargetConfiguration.Shipping)
-				{
-					AddRuntimeDependenciesFromDir(DirectoryReference.Combine(UnrealBuildTool.EngineDirectory, "Content", "SlateDebug"), StagedFileType.UFS);
-				}
+				AddRuntimeDependenciesFromDir(DirectoryReference.Combine(UnrealBuildTool.EngineDirectory, "Content", "SlateDebug"), StagedFileType.UFS);
+
 				if (ProjectFile != null)
 				{
 					AddRuntimeDependenciesFromDir(DirectoryReference.Combine(ProjectDirectory, "Content", "Slate"), StagedFileType.UFS);
-					if (Configuration != UnrealTargetConfiguration.Shipping)
-					{
-						AddRuntimeDependenciesFromDir(DirectoryReference.Combine(ProjectDirectory, "Content", "SlateDebug"), StagedFileType.UFS);
-					}
+					AddRuntimeDependenciesFromDir(DirectoryReference.Combine(ProjectDirectory, "Content", "SlateDebug"), StagedFileType.UFS);
 				}
 			}
 
@@ -3426,6 +3428,19 @@ namespace UnrealBuildTool
 				return null;
 			}
 
+			// If this plugin is listed to be excluded, do so here. The reference must be optional in this case.
+			if(Rules.ExcludePlugins.Contains(Reference.Name, StringComparer.InvariantCultureIgnoreCase))
+			{
+				if(!Reference.bOptional)
+				{
+					throw new BuildException("The '{0}' plugin is listed in the target's ExcludePlugins list, but is not referenced (via {1}) without the bOptional flag set. This will cause load failures at runtime.", Reference.Name, ReferenceChain);
+				}
+				else
+				{
+					return null;
+				}
+			}
+
 			// Try to get an existing reference to this plugin
 			UEBuildPlugin Instance;
 			if(NameToInstance.TryGetValue(Reference.Name, out Instance))
@@ -4091,7 +4106,7 @@ namespace UnrealBuildTool
 								ModuleDescriptor ProjectModule = (ProjectDescriptor.Modules == null)? null : ProjectDescriptor.Modules.FirstOrDefault(x => x.Name == ModuleName);
 								if (ProjectModule != null)
 								{
-									ModuleType = UHTModuleTypeExtensions.GameModuleTypeFromHostType(ProjectModule.Type);
+									ModuleType = UHTModuleTypeExtensions.GameModuleTypeFromHostType(ProjectModule.Type) ?? UHTModuleType.GameRuntime;
 								}
 								else
 								{
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidToolChain.cs
index 7fb7d97f5b22..a7dda46bca72 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidToolChain.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidToolChain.cs
@@ -125,6 +125,8 @@ namespace UnrealBuildTool
 		[CommandLine("-Architectures=", ListSeparator = '+')]
 		public List<string> ArchitectureArg = new List<string>();
 
+		protected bool bEnableGcSections = true;
+
 		public AndroidToolChain(FileReference InProjectFile, bool bInUseLdGold, IReadOnlyList<string> InAdditionalArches, IReadOnlyList<string> InAdditionalGPUArches)
 			: this(CppPlatform.Android, InProjectFile, bInUseLdGold, InAdditionalArches, InAdditionalGPUArches, false)
 		{
@@ -842,7 +844,10 @@ namespace UnrealBuildTool
 			Result += " -nostdlib";
 			Result += " -Wl,-shared,-Bsymbolic";
 			Result += " -Wl,--no-undefined";
-			Result += " -Wl,-gc-sections"; // Enable garbage collection of unused input sections. works best with -ffunction-sections, -fdata-sections
+			if(bEnableGcSections)
+			{
+				Result += " -Wl,-gc-sections"; // Enable garbage collection of unused input sections. works best with -ffunction-sections, -fdata-sections
+			}
 
 			if (!LinkEnvironment.bCreateDebugInfo)
 			{
@@ -885,6 +890,8 @@ namespace UnrealBuildTool
 			// make sure the DT_SONAME field is set properly (or we can a warning toast at startup on new Android)
 			Result += " -Wl,-soname,libUE4.so";
 
+			Result += " -Wl,--build-id";				// add build-id to make debugging easier
+
 			// verbose output from the linker
 			// Result += " -v";
 
@@ -966,6 +973,16 @@ namespace UnrealBuildTool
 				}
 			}
 
+			// deal with .so files with wrong architecture
+			if (Path.GetExtension(Lib) == ".so")
+			{
+				string ParentDirectory = Path.GetDirectoryName(Lib);
+				if (!IsDirectoryForArch(ParentDirectory, Arch))
+				{
+					return true;
+				}
+			}
+
 			// if another architecture is in the filename, reject it
 			foreach (string ComboName in AllComboNames)
 			{
@@ -990,7 +1007,7 @@ namespace UnrealBuildTool
 		protected virtual void ModifySourceFiles(CppCompileEnvironment CompileEnvironment, List<FileItem> SourceFiles, string ModuleName)
 		{
 			// We need to add the extra glue and cpu code only to Launch module.
-			if (ModuleName.Equals("Launch"))
+			if (ModuleName.Equals("Launch") || ModuleName.Equals("AndroidLauncher"))
 			{
 				SourceFiles.Add(FileItem.GetItemByPath(GetNativeGluePath()));
 
@@ -1212,7 +1229,7 @@ namespace UnrealBuildTool
 			string NativeGluePath = Path.GetFullPath(GetNativeGluePath());
 
 			// Deal with Launch module special if first time seen
-			if (!bHasHandledLaunchModule && ModuleName.Equals("Launch"))
+			if (!bHasHandledLaunchModule && (ModuleName.Equals("Launch") || ModuleName.Equals("AndroidLauncher")))
 			{
 				// Directly added NDK files for NDK extensions
 				ModifySourceFiles(CompileEnvironment, InputFiles, ModuleName);
@@ -1318,11 +1335,7 @@ namespace UnrealBuildTool
 						bDisableOptimizations = bDisableOptimizations || !CompileEnvironment.bOptimizeCode;
 
 						// Add C or C++ specific compiler arguments.
-						if (CompileEnvironment.PrecompiledHeaderAction == PrecompiledHeaderAction.Create)
-						{
-							FileArguments += GetCompileArguments_PCH(bDisableOptimizations);
-						}
-						else if (bIsPlainCFile)
+						if (bIsPlainCFile)
 						{
 							FileArguments += GetCompileArguments_C(bDisableOptimizations);
 
@@ -1332,6 +1345,10 @@ namespace UnrealBuildTool
 								bDisableShadowWarning = true;
 							}
 						}
+						else if (CompileEnvironment.PrecompiledHeaderAction == PrecompiledHeaderAction.Create)
+						{
+							FileArguments += GetCompileArguments_PCH(bDisableOptimizations);
+						}
 						else
 						{
 							FileArguments += GetCompileArguments_CPP(bDisableOptimizations);
@@ -1343,7 +1360,7 @@ namespace UnrealBuildTool
 						// Add the C++ source file and its included files to the prerequisite item list.
 						AddPrerequisiteSourceFile(CompileEnvironment, SourceFile, CompileAction.PrerequisiteItems);
 
-						if (CompileEnvironment.PrecompiledHeaderAction == PrecompiledHeaderAction.Create)
+						if (CompileEnvironment.PrecompiledHeaderAction == PrecompiledHeaderAction.Create && !bIsPlainCFile)
 						{
 							// Add the precompiled header file to the produced item list.
 							FileItem PrecompiledHeaderFile = FileItem.GetItemByFileReference(
@@ -1370,6 +1387,11 @@ namespace UnrealBuildTool
 
 							string ObjectFileExtension = BuildPlatform.GetBinaryExtension(UEBuildBinaryType.Object);
 
+							if(CompileEnvironment.AdditionalArguments != null && CompileEnvironment.AdditionalArguments.Contains("-emit-llvm"))
+							{
+								ObjectFileExtension = ".bc";
+							}
+
 							// Add the object file to the produced item list.
 							FileItem ObjectFile = FileItem.GetItemByFileReference(
 								FileReference.Combine(
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEBuildAndroid.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEBuildAndroid.cs
index 3af7a4f66437..7774e3e30bc9 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEBuildAndroid.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEBuildAndroid.cs
@@ -14,7 +14,7 @@ namespace UnrealBuildTool
 	/// <summary>
 	/// Android-specific target settings
 	/// </summary>
-	public class AndroidTargetRules
+	public partial class AndroidTargetRules
 	{
 		/// <summary>
 		/// Lists Architectures that you want to build
@@ -32,7 +32,7 @@ namespace UnrealBuildTool
 	/// <summary>
 	/// Read-only wrapper for Android-specific target settings
 	/// </summary>
-	public class ReadOnlyAndroidTargetRules
+	public partial class ReadOnlyAndroidTargetRules
 	{
 		/// <summary>
 		/// The private mutable settings object
@@ -172,6 +172,16 @@ namespace UnrealBuildTool
 			return new string [] {};
 		}
 
+		public override void FindAdditionalBuildProductsToClean(ReadOnlyTargetRules Target, List<FileReference> FilesToDelete, List<DirectoryReference> DirectoriesToDelete)
+		{
+			base.FindAdditionalBuildProductsToClean(Target, FilesToDelete, DirectoriesToDelete);
+
+			if(Target.ProjectFile != null)
+			{
+				DirectoriesToDelete.Add(DirectoryReference.Combine(DirectoryReference.FromFile(Target.ProjectFile), "Intermediate", "Android"));
+			}
+		}
+
 		public virtual bool HasSpecificDefaultBuildConfig(UnrealTargetPlatform Platform, DirectoryReference ProjectPath)
 		{
 			string[] BoolKeys = new string[] {
@@ -190,6 +200,7 @@ namespace UnrealBuildTool
 			}
 			return true;
 		}
+
 		public override bool HasDefaultBuildConfig(UnrealTargetPlatform Platform, DirectoryReference ProjectPath)
 		{
 			// @todo Lumin: This is kinda messy - better way?
@@ -334,7 +345,7 @@ namespace UnrealBuildTool
 		public override void AddExtraModules(ReadOnlyTargetRules Target, List<string> PlatformExtraModules)
 		{
 			bool bVulkanExists = IsVulkanSDKAvailable();
-			if (bVulkanExists)
+			if (bVulkanExists && Target.Type != TargetType.Program)
 			{
 				PlatformExtraModules.Add("VulkanRHI");
 			}
@@ -417,6 +428,15 @@ namespace UnrealBuildTool
 			CompileEnvironment.IncludePaths.SystemIncludePaths.Add(DirectoryReference.Combine(NdkDir, "sources/android/native_app_glue"));
 			CompileEnvironment.IncludePaths.SystemIncludePaths.Add(DirectoryReference.Combine(NdkDir, "sources/android/cpufeatures"));
 
+
+			// if the project has an Oodle compression Dll, enable the decompressor on Android
+			DirectoryReference ProjectDir = Target.ProjectFile != null ? DirectoryReference.GetParentDirectory(Target.ProjectFile) : UnrealBuildTool.EngineDirectory;
+			string OodleDllPath = DirectoryReference.Combine(ProjectDir, "Binaries/ThirdParty/Oodle/Win64/UnrealPakPlugin.dll").FullName;
+			if (File.Exists(OodleDllPath))
+			{
+				CompileEnvironment.Definitions.Add("REGISTER_OODLE_CUSTOM_COMPRESSOR=1");
+			}
+
 			//@TODO: Tegra Gfx Debugger - standardize locations - for now, change the hardcoded paths and force this to return true to test
 			if (UseTegraGraphicsDebugger(Target))
 			{
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs
index bd3a9a7e09ff..63df4b66170a 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs
@@ -15,6 +15,8 @@ namespace UnrealBuildTool
 {
 	class UEDeployAndroid : UEBuildDeploy, IAndroidDeploy
 	{
+		private const string XML_HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+
 		// Minimum Android SDK that must be used for Java compiling
 		readonly int MinimumSDKLevel = 23;
 
@@ -105,9 +107,9 @@ namespace UnrealBuildTool
 				{
 					GoogleVRPluginEnabled = true;
 					continue;
-			}
+				}
 
-			// check if Crashlytics plugin was enabled
+				// check if Crashlytics plugin was enabled
 				// NOTE: There is a thirdparty plugin using Crashlytics_UPL_Android.xml which shouldn't use this code so check full name
 				if (Plugin.Contains("Crashlytics_UPL.xml"))
 				{
@@ -204,7 +206,7 @@ namespace UnrealBuildTool
 		}
 
 		private string CachedSDKLevel = null;
-		private string GetSdkApiLevel(AndroidToolChain ToolChain)
+		private string GetSdkApiLevel(AndroidToolChain ToolChain, bool bGradleEnabled = false)
 		{
 			if (CachedSDKLevel == null)
 			{
@@ -253,7 +255,14 @@ namespace UnrealBuildTool
 				// validate the platform SDK is installed
 				if (!ValidateSDK(PlatformsDir, SDKLevel))
 				{
-					throw new BuildException("The SDK API requested '{0}' not installed in {1}", SDKLevel, PlatformsDir);
+					if (bGradleEnabled)
+					{
+						Log.TraceWarning("The SDK API requested '{0}' not installed in {1}; Gradle will attempt to download it.", SDKLevel, PlatformsDir);
+					}
+					else
+					{
+						throw new BuildException("The SDK API requested '{0}' not installed in {1}", SDKLevel, PlatformsDir);
+					}
 				}
 
 				Log.TraceInformation("Building Java with SDK API level '{0}'", SDKLevel);
@@ -534,6 +543,27 @@ namespace UnrealBuildTool
 			throw new BuildException("Unable to find ant.bat (via %ANT_HOME% or %ANDROID_HOME%/../eclipse/plugins/org.apache.ant*");
 		}
 
+		private static bool SafeDeleteFile(string Filename, bool bCheckExists = true)
+		{
+			if (!bCheckExists || File.Exists(Filename))
+			{
+				try
+				{
+					File.SetAttributes(Filename, FileAttributes.Normal);
+					File.Delete(Filename);
+					return true;
+				}
+				catch (System.UnauthorizedAccessException)
+				{
+					throw new BuildException("File '{0}' is in use; unable to modify it.", Filename);
+				}
+				catch (System.Exception)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 
 		private static void CopyFileDirectory(string SourceDir, string DestDir, Dictionary<string, string> Replacements = null, string[] Excludes = null)
 		{
@@ -571,11 +601,7 @@ namespace UnrealBuildTool
 				}
 
 				// make the dst filename with the same structure as it was in SourceDir
-				string DestFilename = Path.Combine(DestDir, Utils.MakePathRelativeTo(Filename, SourceDir));
-				if (File.Exists(DestFilename))
-				{
-					File.Delete(DestFilename);
-				}
+				string DestFilename = Path.Combine(DestDir, Utils.MakePathRelativeTo(Filename, SourceDir)).Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); 
 
 				// make the subdirectory if needed
 				string DestSubdir = Path.GetDirectoryName(DestFilename);
@@ -596,16 +622,32 @@ namespace UnrealBuildTool
 						Contents = Contents.Replace(Pair.Key, Pair.Value);
 					}
 
-					// write out file
-					File.WriteAllText(DestFilename, Contents);
+					bool bWriteFile = true;
+					if (File.Exists(DestFilename))
+					{
+						string OriginalContents = File.ReadAllText(DestFilename);
+						if (Contents == OriginalContents)
+						{
+							bWriteFile = false;
+						}
+					}
+
+					// write out file if different
+					if (bWriteFile)
+					{
+						SafeDeleteFile(DestFilename);
+						File.WriteAllText(DestFilename, Contents);
+					}
 				}
 				else
 				{
+					SafeDeleteFile(DestFilename);
 					File.Copy(Filename, DestFilename);
 
-					// remove any read only flags
+					// preserve timestamp and clear read-only flags
 					FileInfo DestFileInfo = new FileInfo(DestFilename);
 					DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
+					File.SetLastWriteTimeUtc(DestFilename, File.GetLastWriteTimeUtc(Filename));
 				}
 			}
 		}
@@ -662,9 +704,112 @@ namespace UnrealBuildTool
 
 		private void CleanCopyDirectory(string SourceDir, string DestDir, string[] Excludes = null)
 		{
-			// remove directory and any subdirectories before copying
-			DeleteDirectory(DestDir);
-			CopyFileDirectory(SourceDir, DestDir, null, Excludes);
+			if (!Directory.Exists(SourceDir))
+			{
+				return;
+			}
+			if (!Directory.Exists(DestDir))
+			{
+				CopyFileDirectory(SourceDir, DestDir, null, Excludes);
+				return;
+			}
+
+			// copy files that are different and make a list of ones to keep
+			string[] StartingSourceFiles = Directory.GetFiles(SourceDir, "*.*", SearchOption.AllDirectories);
+			List<string> FilesToKeep = new List<string>();
+			foreach (string Filename in StartingSourceFiles)
+			{
+				if (Excludes != null)
+				{
+					// skip files in excluded directories
+					string DirectoryName = Path.GetFileName(Path.GetDirectoryName(Filename));
+					bool bExclude = false;
+					foreach (string Exclude in Excludes)
+					{
+						if (DirectoryName == Exclude)
+						{
+							bExclude = true;
+							break;
+						}
+					}
+					if (bExclude)
+					{
+						continue;
+					}
+				}
+
+				// make the dest filename with the same structure as it was in SourceDir
+				string DestFilename = Path.Combine(DestDir, Utils.MakePathRelativeTo(Filename, SourceDir));
+
+				// remember this file to keep
+				FilesToKeep.Add(DestFilename);
+
+				// only copy files that are new or different
+				if (FilesAreDifferent(Filename, DestFilename))
+				{
+					if (File.Exists(DestFilename))
+					{
+						// xml files may have been rewritten but contents still the same so check contents also
+						string Ext = Path.GetExtension(Filename);
+						if (Ext == ".xml")
+						{
+							if (File.ReadAllText(Filename) == File.ReadAllText(DestFilename))
+							{
+								continue;
+							}
+						}
+
+						// delete it so can copy over it
+						SafeDeleteFile(DestFilename);
+					}
+
+					// make the subdirectory if needed
+					string DestSubdir = Path.GetDirectoryName(DestFilename);
+					if (!Directory.Exists(DestSubdir))
+					{
+						Directory.CreateDirectory(DestSubdir);
+					}
+
+					// copy it
+					File.Copy(Filename, DestFilename);
+
+					// preserve timestamp and clear read-only flags
+					FileInfo DestFileInfo = new FileInfo(DestFilename);
+					DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
+					File.SetLastWriteTimeUtc(DestFilename, File.GetLastWriteTimeUtc(Filename));
+
+					Log.TraceInformation("Copied file {0}.", DestFilename);
+				}
+			}
+
+			// delete any files not in the keep list
+			string[] StartingDestFiles = Directory.GetFiles(DestDir, "*.*", SearchOption.AllDirectories);
+			foreach (string Filename in StartingDestFiles)
+			{
+				if (!FilesToKeep.Contains(Filename))
+				{
+					Log.TraceInformation("Deleting unneeded file {0}.", Filename);
+					SafeDeleteFile(Filename);
+				}
+			}
+
+			// delete any empty directories
+			try
+			{
+				IEnumerable<string> BaseDirectories = Directory.EnumerateDirectories(DestDir, "*", SearchOption.AllDirectories).OrderByDescending(x => x);
+				foreach (string directory in BaseDirectories)
+				{
+					if (Directory.Exists(directory) && Directory.GetFiles(directory, "*.*", SearchOption.AllDirectories).Count() == 0)
+					{
+						Log.TraceInformation("Cleaning Directory {0} as empty.", directory);
+						Directory.Delete(directory, true);
+					}
+				}
+			}
+			catch (Exception)
+			{
+				// likely System.IO.DirectoryNotFoundException, ignore it
+			}
 		}
 
 		public string GetUE4BuildFilePath(String EngineDirectory)
@@ -754,6 +899,39 @@ namespace UnrealBuildTool
 			return CachedStoreVersion;
 		}
 
+		private string CachedVersionDisplayName;
+
+		public string GetVersionDisplayName()
+		{
+			if (string.IsNullOrEmpty(CachedVersionDisplayName))
+			{
+				ConfigHierarchy Ini = GetConfigCacheIni(ConfigHierarchyType.Engine);
+				string VersionDisplayName = "";
+				Ini.GetString("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "VersionDisplayName", out VersionDisplayName);
+
+				if (Environment.GetEnvironmentVariable("IsBuildMachine") == "1")
+				{
+					bool bAppendChangeListToVersionDisplayName = false;
+					Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bAppendChangeListToVersionDisplayName", out bAppendChangeListToVersionDisplayName);
+					if (bAppendChangeListToVersionDisplayName)
+					{
+						VersionDisplayName = string.Format("{0}-{1}", VersionDisplayName, EngineChangelist);
+					}
+
+					bool bAppendPlatformToVersionDisplayName = false;
+					Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bAppendPlatformToVersionDisplayName", out bAppendPlatformToVersionDisplayName);
+					if (bAppendPlatformToVersionDisplayName)
+					{
+						VersionDisplayName = string.Format("{0}-Android", VersionDisplayName);
+					}
+				}
+
+				CachedVersionDisplayName = VersionDisplayName;
+			}
+
+			return CachedVersionDisplayName;
+		}
+
 		public void WriteJavaOBBDataFile(string FileName, string PackageName, List<string> ObbSources, string CookFlavor, bool bPackageDataInsideApk)
 		{
 			Log.TraceInformation("\n==== Writing to OBB data file {0} ====", FileName);
@@ -765,7 +943,7 @@ namespace UnrealBuildTool
 			string AppType = "";
 			if (CookFlavor.EndsWith("Client"))
 			{
-				AppType = ".Client";
+//				AppType = ".Client";		// should always be empty now; fix up the name in batch file instead
 			}
 
 			int StoreVersion = GetStoreVersion();
@@ -951,9 +1129,7 @@ namespace UnrealBuildTool
 			System.DateTime CurrentDateTime = System.DateTime.Now;
 			string BuildID = Guid.NewGuid().ToString();
 
-			ConfigHierarchy Ini = GetConfigCacheIni(ConfigHierarchyType.Engine);
-			string VersionDisplayName = "";
-			Ini.GetString("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "VersionDisplayName", out VersionDisplayName);
+			string VersionDisplayName = GetVersionDisplayName();
 
 			StringBuilder CrashPropertiesContent = new StringBuilder("");
 			CrashPropertiesContent.Append("# This file is automatically generated by Crashlytics to uniquely\n");
@@ -1020,7 +1196,7 @@ namespace UnrealBuildTool
 			}
 		}
 
-		private static void StripDebugSymbols(string SourceFileName, string TargetFileName, string UE4Arch)
+		private static void StripDebugSymbols(string SourceFileName, string TargetFileName, string UE4Arch, bool bStripAll = false)
 		{
 			// Copy the file and remove read-only if necessary
 			File.Copy(SourceFileName, TargetFileName, true);
@@ -1032,13 +1208,20 @@ namespace UnrealBuildTool
 
 			ProcessStartInfo StartInfo = new ProcessStartInfo();
 			StartInfo.FileName = AndroidToolChain.GetStripExecutablePath(UE4Arch);
-			StartInfo.Arguments = "--strip-debug \"" + TargetFileName + "\"";
+			if (bStripAll)
+			{
+				StartInfo.Arguments = "--strip-unneeded \"" + TargetFileName + "\"";
+			}
+			else
+			{
+				StartInfo.Arguments = "--strip-debug \"" + TargetFileName + "\"";
+			}
 			StartInfo.UseShellExecute = false;
 			StartInfo.CreateNoWindow = true;
 			Utils.RunLocalProcessAndLogOutput(StartInfo);
 		}
 
-		private static void CopySTL(AndroidToolChain ToolChain, string UE4BuildPath, string UE4Arch, string NDKArch, bool bForDistribution)
+		private static void CopySTL(AndroidToolChain ToolChain, string UE4BuildPath, string UE4Arch, string NDKArch, bool bForDistribution, bool bGradleEnabled)
 		{
 			string GccVersion = "4.6";
 			if (Directory.Exists(Environment.ExpandEnvironmentVariables("%NDKROOT%/sources/cxx-stl/gnu-libstdc++/4.9")))
@@ -1050,30 +1233,54 @@ namespace UnrealBuildTool
 				GccVersion = "4.8";
 			}
 
-			// copy it in!
-			string SourceSTLSOName = Environment.ExpandEnvironmentVariables("%NDKROOT%/sources/cxx-stl/gnu-libstdc++/") + GccVersion + "/libs/" + NDKArch + "/libgnustl_shared.so";
-			string FinalSTLSOName = UE4BuildPath + "/libs/" + NDKArch + "/libgnustl_shared.so";
-
-			// check to see if libgnustl_shared.so is newer than last time we copied (or needs stripping for distribution)
-			bool bFileExists = File.Exists(FinalSTLSOName);
-			TimeSpan Diff = File.GetLastWriteTimeUtc(FinalSTLSOName) - File.GetLastWriteTimeUtc(SourceSTLSOName);
-			if (bForDistribution || !bFileExists || Diff.TotalSeconds < -1 || Diff.TotalSeconds > 1)
+			if (bGradleEnabled)
 			{
-				if (bFileExists)
-				{
-					File.Delete(FinalSTLSOName);
-				}
-				Directory.CreateDirectory(Path.GetDirectoryName(FinalSTLSOName));
-				if (bForDistribution)
-				{
-					// Strip debug symbols for distribution builds
-					StripDebugSymbols(SourceSTLSOName, FinalSTLSOName, UE4Arch);
-				}
-				else
+				// copy it in!
+				string SourceSTLSOName = Environment.ExpandEnvironmentVariables("%NDKROOT%/sources/cxx-stl/gnu-libstdc++/") + GccVersion + "/libs/" + NDKArch + "/libgnustl_shared.so";
+				string FinalSTLSOName = UE4BuildPath + "/jni/" + NDKArch + "/libgnustl_shared.so";
+
+				// remove from location for Ant if previously copied
+				string WrongSTLSOName = UE4BuildPath + "/libs/" + NDKArch + "/libgnustl_shared.so";
+				SafeDeleteFile(WrongSTLSOName);
+
+				// check to see if libgnustl_shared.so is newer than last time we copied
+				bool bFileExists = File.Exists(FinalSTLSOName);
+				TimeSpan Diff = File.GetLastWriteTimeUtc(FinalSTLSOName) - File.GetLastWriteTimeUtc(SourceSTLSOName);
+				if (!bFileExists || Diff.TotalSeconds < -1 || Diff.TotalSeconds > 1)
 				{
+					SafeDeleteFile(FinalSTLSOName);
+					Directory.CreateDirectory(Path.GetDirectoryName(FinalSTLSOName));
 					File.Copy(SourceSTLSOName, FinalSTLSOName, true);
 				}
 			}
+			else
+			{
+				// copy it in!
+				string SourceSTLSOName = Environment.ExpandEnvironmentVariables("%NDKROOT%/sources/cxx-stl/gnu-libstdc++/") + GccVersion + "/libs/" + NDKArch + "/libgnustl_shared.so";
+				string FinalSTLSOName = UE4BuildPath + "/libs/" + NDKArch + "/libgnustl_shared.so";
+
+				// remove from location for Gradle if previously copied
+				string WrongSTLSOName = UE4BuildPath + "/jni/" + NDKArch + "/libgnustl_shared.so";
+				SafeDeleteFile(WrongSTLSOName);
+
+				// check to see if libgnustl_shared.so is newer than last time we copied (or needs stripping for distribution)
+				bool bFileExists = File.Exists(FinalSTLSOName);
+				TimeSpan Diff = File.GetLastWriteTimeUtc(FinalSTLSOName) - File.GetLastWriteTimeUtc(SourceSTLSOName);
+				if (bForDistribution || !bFileExists || Diff.TotalSeconds < -1 || Diff.TotalSeconds > 1)
+				{
+					SafeDeleteFile(FinalSTLSOName);
+					Directory.CreateDirectory(Path.GetDirectoryName(FinalSTLSOName));
+					if (bForDistribution)
+					{
+						// Strip debug symbols for distribution builds
+						StripDebugSymbols(SourceSTLSOName, FinalSTLSOName, UE4Arch, true);
+					}
+					else
+					{
+						File.Copy(SourceSTLSOName, FinalSTLSOName, true);
+					}
+				}
+			}
 		}
 
 		private void CopyGfxDebugger(string UE4BuildPath, string UE4Arch, string NDKArch)
@@ -1331,7 +1538,7 @@ namespace UnrealBuildTool
 			{
 				// @todo android: If a user had a project.properties in the game, NEVER do this
 				Log.TraceInformation("There were too many libs already referenced in project.properties, tossing it");
-				File.Delete(ProjectPropertiesFile);
+				SafeDeleteFile(ProjectPropertiesFile);
 
 				LibsToBeAdded.Clear();
 				foreach (string LibDir in LibDirs)
@@ -1357,7 +1564,7 @@ namespace UnrealBuildTool
 		}
 
 
-		private string GetAllBuildSettings(AndroidToolChain ToolChain, string BuildPath, bool bForDistribution, bool bMakeSeparateApks, bool bPackageDataInsideApk, bool bDisableVerifyOBBOnStartUp, bool bUseExternalFilesDir)
+		private string GetAllBuildSettings(AndroidToolChain ToolChain, string BuildPath, bool bForDistribution, bool bMakeSeparateApks, bool bPackageDataInsideApk, bool bDisableVerifyOBBOnStartUp, bool bUseExternalFilesDir, bool bGradleEnabled)
 		{
 			// make the settings string - this will be char by char compared against last time
 			StringBuilder CurrentSettings = new StringBuilder();
@@ -1366,7 +1573,7 @@ namespace UnrealBuildTool
 			CurrentSettings.AppendLine(string.Format("ANT_HOME={0}", Environment.GetEnvironmentVariable("ANT_HOME")));
 			CurrentSettings.AppendLine(string.Format("JAVA_HOME={0}", Environment.GetEnvironmentVariable("JAVA_HOME")));
 			CurrentSettings.AppendLine(string.Format("NDKVersion={0}", ToolChain.GetNdkApiLevel()));
-			CurrentSettings.AppendLine(string.Format("SDKVersion={0}", GetSdkApiLevel(ToolChain)));
+			CurrentSettings.AppendLine(string.Format("SDKVersion={0}", GetSdkApiLevel(ToolChain, bGradleEnabled)));
 			CurrentSettings.AppendLine(string.Format("bForDistribution={0}", bForDistribution));
 			CurrentSettings.AppendLine(string.Format("bMakeSeparateApks={0}", bMakeSeparateApks));
 			CurrentSettings.AppendLine(string.Format("bPackageDataInsideApk={0}", bPackageDataInsideApk));
@@ -1600,18 +1807,12 @@ namespace UnrealBuildTool
 			if (!bNeedPortrait)
 			{
 				string LayoutPath = UE4BuildPath + "/res/layout-port/downloader_progress.xml";
-				if (File.Exists(LayoutPath))
-				{
-					File.Delete(LayoutPath);
-				}
+				SafeDeleteFile(LayoutPath);
 			}
 			if (!bNeedLandscape)
 			{
 				string LayoutPath = UE4BuildPath + "/res/layout-land/downloader_progress.xml";
-				if (File.Exists(LayoutPath))
-				{
-					File.Delete(LayoutPath);
-				}
+				SafeDeleteFile(LayoutPath);
 			}
 
 			// Loop through each of the resolutions (only /res/drawable/ is required, others are optional)
@@ -1629,10 +1830,7 @@ namespace UnrealBuildTool
 				else
 				{
 					// Remove unused image
-					if (File.Exists(PortraitFilename))
-					{
-						File.Delete(PortraitFilename);
-					}
+					SafeDeleteFile(PortraitFilename);
 				}
 
 				string LandscapeFilename = UE4BuildPath + ResolutionPath + "downloadimageh.png";
@@ -1646,10 +1844,7 @@ namespace UnrealBuildTool
 				else
 				{
 					// Remove unused image
-					if (File.Exists(LandscapeFilename))
-					{
-						File.Delete(LandscapeFilename);
-					}
+					SafeDeleteFile(LandscapeFilename);
 				}
 			}
 		}
@@ -1665,17 +1860,11 @@ namespace UnrealBuildTool
 
 				// Remove the Daydream app  tile background.
 				string AppTileBackgroundPath = UE4BuildPath + "/res/drawable-nodpi/vr_icon_background.png";
-				if (File.Exists(AppTileBackgroundPath))
-				{
-					File.Delete(AppTileBackgroundPath);
-				}
+				SafeDeleteFile(AppTileBackgroundPath);
 
 				// Remove the Daydream app tile icon.
 				string AppTileIconPath = UE4BuildPath + "/res/drawable-nodpi/vr_icon.png";
-				if (File.Exists(AppTileIconPath))
-				{
-					File.Delete(AppTileIconPath);
-				}
+				SafeDeleteFile(AppTileIconPath);
 			}
 		}
 
@@ -1697,18 +1886,12 @@ namespace UnrealBuildTool
 			if (!bNeedPortrait)
 			{
 				string StylesPath = UE4BuildPath + "/res/values-port/styles.xml";
-				if (File.Exists(StylesPath))
-				{
-					File.Delete(StylesPath);
-				}
+				SafeDeleteFile(StylesPath);
 			}
 			if (!bNeedLandscape)
 			{
 				string StylesPath = UE4BuildPath + "/res/values-land/styles.xml";
-				if (File.Exists(StylesPath))
-				{
-					File.Delete(StylesPath);
-				}
+				SafeDeleteFile(StylesPath);
 			}
 
 			// Loop through each of the resolutions (only /res/drawable/ is required, others are optional)
@@ -1726,10 +1909,7 @@ namespace UnrealBuildTool
 				else
 				{
 					// Remove unused image
-					if (File.Exists(PortraitFilename))
-					{
-						File.Delete(PortraitFilename);
-					}
+					SafeDeleteFile(PortraitFilename);
 				}
 
 				string LandscapeFilename = UE4BuildPath + ResolutionPath + "splashscreen_landscape.png";
@@ -1743,10 +1923,7 @@ namespace UnrealBuildTool
 				else
 				{
 					// Remove unused image
-					if (File.Exists(LandscapeFilename))
-					{
-						File.Delete(LandscapeFilename);
-					}
+					SafeDeleteFile(LandscapeFilename);
 				}
 			}
 		}
@@ -1907,6 +2084,7 @@ namespace UnrealBuildTool
 			// ini file to get settings from
 			ConfigHierarchy Ini = GetConfigCacheIni(ConfigHierarchyType.Engine);
 			string PackageName = GetPackageName(ProjectName);
+			string VersionDisplayName = GetVersionDisplayName();
 			bool bEnableGooglePlaySupport;
 			Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bEnableGooglePlaySupport", out bEnableGooglePlaySupport);
 			bool bUseGetAccounts;
@@ -1917,8 +2095,6 @@ namespace UnrealBuildTool
 			Ini.GetInt32("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "MinSDKVersion", out MinSDKVersion);
 			int TargetSDKVersion = MinSDKVersion;
 			Ini.GetInt32("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "TargetSDKVersion", out TargetSDKVersion);
-			string VersionDisplayName;
-			Ini.GetString("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "VersionDisplayName", out VersionDisplayName);
 			float MaxAspectRatioValue;
 			if (!Ini.TryGetValue("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "MaxAspectRatio", out MaxAspectRatioValue))
 			{
@@ -1958,6 +2134,13 @@ namespace UnrealBuildTool
 			bool bBuildForES31 = false;
 			Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bBuildForES31", out bBuildForES31);
 
+			bool bAllowIMU = true;
+			Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bAllowIMU", out bAllowIMU);
+			if (IsPackagingForDaydream(Ini) && bAllowIMU)
+			{
+				Log.TraceInformation("Daydream and IMU both enabled, recommend disabling IMU if not needed.");
+			}
+
 			string InstallLocation;
 			Ini.GetString("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "InstallLocation", out InstallLocation);
 			switch (InstallLocation.ToLower())
@@ -2102,7 +2285,7 @@ namespace UnrealBuildTool
 			CookedFlavors = (CookedFlavors == "") ? "" : CookedFlavors.Substring(0, CookedFlavors.Length - 1);
 
 			StringBuilder Text = new StringBuilder();
-			Text.AppendLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+			Text.AppendLine(XML_HEADER);
 			Text.AppendLine("<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"");
 			Text.AppendLine(string.Format("          package=\"{0}\"", PackageName));
 			if (ExtraManifestNodeTags != null)
@@ -2220,6 +2403,7 @@ namespace UnrealBuildTool
 			Text.AppendLine(string.Format("\t\t<meta-data android:name=\"com.epicgames.ue4.GameActivity.CookedFlavors\" android:value=\"{0}\"/>", CookedFlavors));
 			Text.AppendLine(string.Format("\t\t<meta-data android:name=\"com.epicgames.ue4.GameActivity.bValidateTextureFormats\" android:value=\"{0}\"/>", bValidateTextureFormats ? "true" : "false"));
 			Text.AppendLine(string.Format("\t\t<meta-data android:name=\"com.epicgames.ue4.GameActivity.bUseExternalFilesDir\" android:value=\"{0}\"/>", bUseExternalFilesDir ? "true" : "false"));
+			Text.AppendLine(string.Format("\t\t<meta-data android:name=\"com.epicgames.ue4.GameActivity.bAllowIMU\" android:value=\"{0}\"/>", bAllowIMU ? "true" : "false"));
 			if (bUseNEONForArmV7)
 			{
 				Text.AppendLine("\t\t<meta-data android:name=\"com.epicgames.ue4.GameActivity.bUseNEONForArmV7\" android:value=\"{true}\"/>");
@@ -2513,7 +2697,7 @@ namespace UnrealBuildTool
 					NewAppId = IniAppId;
 				}
 
-				File.WriteAllText(Filename, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n\t<string name=\"app_id\">" + NewAppId + "</string>\n</resources>\n");
+				File.WriteAllText(Filename, XML_HEADER + "\n<resources>\n\t<string name=\"app_id\">" + NewAppId + "</string>\n</resources>\n");
 			}
 		}
 
@@ -2764,8 +2948,10 @@ namespace UnrealBuildTool
 				}
 			}
 
+			bool bIsBuildMachine = Environment.GetEnvironmentVariable("IsBuildMachine") == "1";
+
 			// do this here so we'll stop early if there is a problem with the SDK API level (cached so later calls will return the same)
-			string SDKAPILevel = GetSdkApiLevel(ToolChain);
+			string SDKAPILevel = GetSdkApiLevel(ToolChain, bGradleEnabled);
 			int SDKLevelInt = GetApiLevelInt(SDKAPILevel);
 			string BuildToolsVersion = GetBuildToolsVersion(bGradleEnabled);
 
@@ -2788,6 +2974,13 @@ namespace UnrealBuildTool
 			string GameBuildFilesPath = Path.Combine(ProjectDirectory, "Build/Android");
 			string UE4BuildAssetsPath = Path.Combine(UE4BuildPath, "assets");
 
+			// force create from scratch if on build machine
+			if (bIsBuildMachine)
+			{
+				DeleteDirectory(IntermediateAndroidPath);
+				Directory.CreateDirectory(IntermediateAndroidPath);
+			}
+
 			// cache if we want data in the Apk
 			bool bPackageDataInsideApk = bDisallowPackagingDataInApk ? false : GetPackageDataInsideApk();
 			bool bDisableVerifyOBBOnStartUp = DisableVerifyOBBOnStartUp();
@@ -2857,18 +3050,14 @@ namespace UnrealBuildTool
 							continue;
 
 						Log.TraceInformation("Cleaning up file {0}", filename);
-						FileAttributes Attribs = File.GetAttributes(filename);
-						File.SetAttributes(filename, Attribs & ~FileAttributes.ReadOnly);
-						File.Delete(filename);
+						SafeDeleteFile(filename, false);
 
 						// Check to see if this file also exists in our target destination, and if so nuke it too
 						string DestFilename = Path.Combine(ImmediateBaseDir, Utils.MakePathRelativeTo(filename, CleanUpBaseDir));
 						if (File.Exists(DestFilename))
 						{
 							Log.TraceInformation("Cleaning up file {0}", DestFilename);
-							Attribs = File.GetAttributes(DestFilename);
-							File.SetAttributes(DestFilename, Attribs & ~FileAttributes.ReadOnly);
-							File.Delete(DestFilename);
+							SafeDeleteFile(DestFilename, false);
 						}
 					}
 				}
@@ -2912,7 +3101,7 @@ namespace UnrealBuildTool
 
 
 			// check to see if any "meta information" is newer than last time we build
-			string CurrentBuildSettings = GetAllBuildSettings(ToolChain, UE4BuildPath, bForDistribution, bMakeSeparateApks, bPackageDataInsideApk, bDisableVerifyOBBOnStartUp, bUseExternalFilesDir);
+			string CurrentBuildSettings = GetAllBuildSettings(ToolChain, UE4BuildPath, bForDistribution, bMakeSeparateApks, bPackageDataInsideApk, bDisableVerifyOBBOnStartUp, bUseExternalFilesDir, bGradleEnabled);
 			string BuildSettingsCacheFile = Path.Combine(UE4BuildPath, "UEBuildSettings.txt");
 
 			// do we match previous build settings?
@@ -3067,10 +3256,7 @@ namespace UnrealBuildTool
 			{
 				string ObbFileDestination = UE4BuildPath + "/assets";
 				string DestFileName = Path.Combine(ObbFileDestination, "main.obb.png");
-				if (File.Exists(DestFileName))
-				{
-					File.Delete(DestFileName);
-				}
+				SafeDeleteFile(DestFileName);
 			}
 
 			// See if we need to stage a UE4CommandLine.txt file in assets
@@ -3089,10 +3275,7 @@ namespace UnrealBuildTool
 			}
 			else // try to remove the file if we aren't packaging one
 			{
-				if (File.Exists(CommandLineDestFileName))
-				{
-					File.Delete(CommandLineDestFileName);
-				}
+				SafeDeleteFile(CommandLineDestFileName);
 			}
 
 			string AARExtractListFilename = Path.Combine(UE4BuildPath, "JavaLibs", "AARExtractList.txt");
@@ -3213,31 +3396,54 @@ namespace UnrealBuildTool
 
 				String FinalSOName;
 
-				if (HasNDKPath)
+				if (bGradleEnabled)
 				{
-					string LibDir = UE4BuildPath + "/jni/" + NDKArch;
-					FinalSOName = LibDir + "/libUE4.so";
+					string JniDir = UE4BuildPath + "/jni/" + NDKArch;
+					FinalSOName = JniDir + "/libUE4.so";
+
+					// clear out libs directory like ndk-build would have
+					string LibsDir = Path.Combine(UE4BuildPath, "libs");
+					DeleteDirectory(LibsDir);
+					MakeDirectoryIfRequired(LibsDir);
 
 					// check to see if libUE4.so needs to be copied
 					if (BuildListComboTotal > 1 || FilesAreDifferent(SourceSOName, FinalSOName))
 					{
 						Log.TraceInformation("\nCopying new .so {0} file to jni folder...", SourceSOName);
-						Directory.CreateDirectory(LibDir);
+						Directory.CreateDirectory(JniDir);
 						// copy the binary to the standard .so location
 						File.Copy(SourceSOName, FinalSOName, true);
+						File.SetLastWriteTimeUtc(FinalSOName, File.GetLastWriteTimeUtc(SourceSOName));
 					}
 				}
 				else
 				{
-					// if no NDK, we don't need any of the debugger stuff, so we just copy the .so to where it will end up
-					FinalSOName = UE4BuildPath + "/libs/" + NDKArch + "/libUE4.so";
-
-					// check to see if libUE4.so needs to be copied
-					if (BuildListComboTotal > 1 || FilesAreDifferent(SourceSOName, FinalSOName))
+					if (HasNDKPath)
 					{
-						Log.TraceInformation("\nCopying .so {0} file to jni folder...", SourceSOName);
-						Directory.CreateDirectory(Path.GetDirectoryName(FinalSOName));
-						File.Copy(SourceSOName, FinalSOName, true);
+						string LibDir = UE4BuildPath + "/jni/" + NDKArch;
+						FinalSOName = LibDir + "/libUE4.so";
+
+						// check to see if libUE4.so needs to be copied
+						if (BuildListComboTotal > 1 || FilesAreDifferent(SourceSOName, FinalSOName))
+						{
+							Log.TraceInformation("\nCopying new .so {0} file to jni folder...", SourceSOName);
+							Directory.CreateDirectory(LibDir);
+							// copy the binary to the standard .so location
+							File.Copy(SourceSOName, FinalSOName, true);
+						}
+					}
+					else
+					{
+						// if no NDK, we don't need any of the debugger stuff, so we just copy the .so to where it will end up
+						FinalSOName = UE4BuildPath + "/libs/" + NDKArch + "/libUE4.so";
+
+						// check to see if libUE4.so needs to be copied
+						if (BuildListComboTotal > 1 || FilesAreDifferent(SourceSOName, FinalSOName))
+						{
+							Log.TraceInformation("\nCopying .so {0} file to jni folder...", SourceSOName);
+							Directory.CreateDirectory(Path.GetDirectoryName(FinalSOName));
+							File.Copy(SourceSOName, FinalSOName, true);
+						}
 					}
 				}
 
@@ -3246,8 +3452,8 @@ namespace UnrealBuildTool
 				DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
 				File.SetLastWriteTimeUtc(FinalSOName, File.GetLastWriteTimeUtc(SourceSOName));
 
-				// if we need to run ndk-build, do it now
-				if (HasNDKPath)
+				// if we need to run ndk-build, do it now (Ant-only)
+				if (!bGradleEnabled && HasNDKPath)
 				{
 					string LibSOName = UE4BuildPath + "/libs/" + NDKArch + "/libUE4.so";
 					// always delete libs up to this point so fat binaries and incremental builds work together (otherwise we might end up with multiple
@@ -3274,7 +3480,7 @@ namespace UnrealBuildTool
 
 				// after ndk-build is called, we can now copy in the stl .so (ndk-build deletes old files)
 				// copy libgnustl_shared.so to library (use 4.8 if possible, otherwise 4.6)
-				CopySTL(ToolChain, UE4BuildPath, Arch, NDKArch, bForDistribution);
+				CopySTL(ToolChain, UE4BuildPath, Arch, NDKArch, bForDistribution, bGradleEnabled);
 				CopyGfxDebugger(UE4BuildPath, Arch, NDKArch);
 				CopyVulkanValidationLayers(UE4BuildPath, Arch, NDKArch, Configuration);
 
@@ -3293,10 +3499,7 @@ namespace UnrealBuildTool
 						// Generate the Proguard file contents and write it
 						string ProguardContents = GenerateProguard(NDKArch, UE4BuildFilesPath, GameBuildFilesPath);
 						string ProguardFilename = Path.Combine(UE4BuildPath, "proguard-project.txt");
-						if (File.Exists(ProguardFilename))
-						{
-							File.Delete(ProguardFilename);
-						}
+						SafeDeleteFile(ProguardFilename);
 						File.WriteAllText(ProguardFilename, ProguardContents);
 
 						// this will write out ant.properties with info needed to sign a distribution build
@@ -3330,7 +3533,7 @@ namespace UnrealBuildTool
 					}
 
 					// upload Crashlytics symbols if plugin enabled and using build machine
-					if (CrashlyticsPluginEnabled && Environment.GetEnvironmentVariable("IsBuildMachine") == "1")
+					if (CrashlyticsPluginEnabled && bIsBuildMachine)
 					{
 						AntOptions = "crashlytics-upload-symbols";
 						RunCommandLineProgramWithException(UE4BuildPath, ShellExecutable, ShellParametersBegin + "\"" + GetAntPath() + "\" " + AntOptions + ShellParametersEnd, "Uploading Crashlytics symbols");
@@ -3352,6 +3555,39 @@ namespace UnrealBuildTool
 
 					string CompileSDKVersion = SDKAPILevel.Replace("android-", "");
 
+					// check if any plugins want to increase the required compile SDK version
+					string CompileSDKMin = UPL.ProcessPluginNode(NDKArch, "minimumSDKAPI", "");
+					if (CompileSDKMin != "")
+					{
+						int CompileSDKVersionInt;
+						if (!int.TryParse(CompileSDKVersion, out CompileSDKVersionInt))
+						{
+							CompileSDKVersionInt = 23;
+						}
+
+						bool bUpdatedCompileSDK = false;
+						string[] CompileSDKLines = CompileSDKMin.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+						foreach (string CompileLine in CompileSDKLines)
+						{
+							string VersionString = CompileLine.Replace("android-", "");
+							int VersionInt;
+							if (int.TryParse(CompileLine, out VersionInt))
+							{
+								if (VersionInt > CompileSDKVersionInt)
+								{
+									CompileSDKVersionInt = VersionInt;
+									bUpdatedCompileSDK = true;
+								}
+							}
+						}
+
+						if (bUpdatedCompileSDK)
+						{
+							CompileSDKVersion = CompileSDKVersionInt.ToString();
+							Log.TraceInformation("Building Java with SDK API Level 'android-{0}' due to enabled plugin requirements", CompileSDKVersion);
+						}
+					}
+
 					// stage files into gradle app directory
 					string GradleManifest = Path.Combine(UE4BuildGradleMainPath, "AndroidManifest.xml");
 					MakeDirectoryIfRequired(GradleManifest);
@@ -3378,30 +3614,49 @@ namespace UnrealBuildTool
 							break;
 					}
 
-					CleanCopyDirectory(Path.Combine(UE4BuildPath, "assets"), Path.Combine(UE4BuildGradleMainPath, "assets"));
-					CleanCopyDirectory(Path.Combine(UE4BuildPath, "jni"), Path.Combine(UE4BuildGradleMainPath, "jni"), Excludes);     // has debug symbols
-					CleanCopyDirectory(Path.Combine(UE4BuildPath, "obj"), Path.Combine(UE4BuildGradleMainPath, "obj"), Excludes);     // has debug symbols
+					var DestResPath = Path.Combine(UE4BuildGradleMainPath, "res");
+					CleanCopyDirectory(Path.Combine(UE4BuildPath, "jni"), Path.Combine(UE4BuildGradleMainPath, "jniLibs"), Excludes);     // has debug symbols
 					CleanCopyDirectory(Path.Combine(UE4BuildPath, "libs"), Path.Combine(UE4BuildGradleMainPath, "libs"), Excludes);
-					CleanCopyDirectory(Path.Combine(UE4BuildPath, "res"), Path.Combine(UE4BuildGradleMainPath, "res"));
+
+					CleanCopyDirectory(Path.Combine(UE4BuildPath, "assets"), Path.Combine(UE4BuildGradleMainPath, "assets"));
+					CleanCopyDirectory(Path.Combine(UE4BuildPath, "res"), Path.Combine(UE4BuildGradleMainPath, DestResPath));
 					CleanCopyDirectory(Path.Combine(UE4BuildPath, "src"), Path.Combine(UE4BuildGradleMainPath, "java"));
 
-					if (CrashlyticsPluginEnabled)
+					// do any plugin requested copies
+					UPL.ProcessPluginNode(NDKArch, "gradleCopies", "");
+
+					List<string> AdditionalValuesFiles;
+					if (Ini.GetArray("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "AdditionalValuesFiles", out AdditionalValuesFiles) &&
+						AdditionalValuesFiles.Count != 0)
 					{
-						// make a copy of the fabric.properties with our secret key
-						File.Copy(Path.Combine(UE4BuildPath, "fabric.properties"), Path.Combine(UE4BuildGradleAppPath, "fabric.properties"), true);
+						XDocument EmptyResourceFileDoc = new XDocument(new XElement("resources"));
+
+						foreach (string FileName in AdditionalValuesFiles)
+						{
+							var ResourceFileDoc = new XDocument(EmptyResourceFileDoc);
+							var DestPath = Path.Combine(DestResPath, "values", FileName + ".xml");
+							UPL.ProcessPluginNode(NDKArch, "valuesFile", "", ref ResourceFileDoc);
+							File.WriteAllText(DestPath, XML_HEADER + "\n" + ResourceFileDoc.ToString());
+						}
 					}
 
 					// move JavaLibs into subprojects
 					string JavaLibsDir = Path.Combine(UE4BuildPath, "JavaLibs");
 					PrepareJavaLibsForGradle(JavaLibsDir, UE4BuildGradlePath, CompileSDKVersion, BuildToolsVersion);
 
+					// Create local.properties
+					String LocalPropertiesFilename = Path.Combine(UE4BuildGradlePath, "local.properties");
+					StringBuilder LocalProperties = new StringBuilder();
+					LocalProperties.AppendLine(string.Format("ndk.dir={0}", Environment.GetEnvironmentVariable("NDKROOT").Replace("\\", "/")));
+					LocalProperties.AppendLine(string.Format("sdk.dir={0}", Environment.GetEnvironmentVariable("ANDROID_HOME").Replace("\\", "/")));
+					File.WriteAllText(LocalPropertiesFilename, LocalProperties.ToString());
+
 					// Create gradle.properties
 					string GradlePropertiesFilename = Path.Combine(UE4BuildGradlePath, "gradle.properties");
 					StringBuilder GradleProperties = new StringBuilder();
 
 					int StoreVersion = GetStoreVersion();
-					string VersionDisplayName;
-					Ini.GetString("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "VersionDisplayName", out VersionDisplayName);
+					string VersionDisplayName = GetVersionDisplayName();
 					int MinSDKVersion;
 					Ini.GetInt32("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "MinSDKVersion", out MinSDKVersion);
 					int TargetSDKVersion = MinSDKVersion;
@@ -3438,6 +3693,8 @@ namespace UnrealBuildTool
 						}
 					}
 
+					GradleProperties.AppendLine("org.gradle.daemon=false");
+					GradleProperties.AppendLine("org.gradle.jvmargs=-Xmx8192m");
 					GradleProperties.AppendLine(string.Format("COMPILE_SDK_VERSION={0}", CompileSDKVersion));
 					GradleProperties.AppendLine(string.Format("BUILD_TOOLS_VERSION={0}", BuildToolsVersion));
 					GradleProperties.AppendLine(string.Format("PACKAGE_NAME={0}", PackageName));
@@ -3445,7 +3702,12 @@ namespace UnrealBuildTool
 					GradleProperties.AppendLine(string.Format("TARGET_SDK_VERSION={0}", TargetSDKVersion.ToString()));
 					GradleProperties.AppendLine(string.Format("STORE_VERSION={0}", StoreVersion.ToString()));
 					GradleProperties.AppendLine(string.Format("VERSION_DISPLAY_NAME={0}", VersionDisplayName));
-					GradleProperties.AppendLine(string.Format("OUTPUT_PATH={0}", DestApkName.Replace("\\", "/")));
+
+					GradleProperties.AppendLine(string.Format("OUTPUT_PATH={0}", Path.GetDirectoryName(DestApkName).Replace("\\", "/")));
+					GradleProperties.AppendLine(string.Format("OUTPUT_FILENAME={0}", Path.GetFileName(DestApkName)));
+
+					// add any Gradle properties from UPL
+					GradleProperties.AppendLine(UPL.ProcessPluginNode(NDKArch, "gradleProperties", ""));
 
 					File.WriteAllText(GradlePropertiesFilename, GradleProperties.ToString());
 
@@ -3460,11 +3722,9 @@ namespace UnrealBuildTool
 					GradleBuildAdditionsContent.AppendLine("\t\t}");
 					GradleBuildAdditionsContent.AppendLine("\t}");
 
-					string GradleBuildType = ":app:assembleDebug";
 					if (bForDistribution)
 					{
 						bool bDisableV2Signing = false;
-						GradleBuildType = ":app:assembleRelease";
 
 						if (IsPackagingForGearVR())
 						{
@@ -3511,10 +3771,7 @@ namespace UnrealBuildTool
 						// Generate the Proguard file contents and write it
 						string ProguardContents = GenerateProguard(NDKArch, UE4BuildFilesPath, GameBuildFilesPath);
 						string ProguardFilename = Path.Combine(UE4BuildGradleAppPath, "proguard-rules.pro");
-						if (File.Exists(ProguardFilename))
-						{
-							File.Delete(ProguardFilename);
-						}
+						SafeDeleteFile(ProguardFilename);
 						File.WriteAllText(ProguardFilename, ProguardContents);
 					}
 					else
@@ -3525,7 +3782,7 @@ namespace UnrealBuildTool
 						GradleBuildAdditionsContent.AppendLine("\t\t}");
 						GradleBuildAdditionsContent.AppendLine("\t}");
 					}
-						GradleBuildAdditionsContent.AppendLine("}");
+					GradleBuildAdditionsContent.AppendLine("}");
 
 					// Add any UPL app buildGradleAdditions
 					GradleBuildAdditionsContent.Append(UPL.ProcessPluginNode(NDKArch, "buildGradleAdditions", ""));
@@ -3533,9 +3790,27 @@ namespace UnrealBuildTool
 					string GradleBuildAdditionsFilename = Path.Combine(UE4BuildGradleAppPath, "buildAdditions.gradle");
 					File.WriteAllText(GradleBuildAdditionsFilename, GradleBuildAdditionsContent.ToString());
 
+					// Add lint if requested (note depreciation warnings can be suppressed with @SuppressWarnings("deprecation")
+					string GradleBaseBuildAdditionsContents = "";
+					bool bEnableLint = false;
+					Ini.GetBool("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings", "bEnableLint", out bEnableLint);
+					if (bEnableLint)
+					{
+						GradleBaseBuildAdditionsContents =
+							"allprojects {\n" +
+							"\ttasks.withType(JavaCompile) {\n" +
+							"\t\toptions.compilerArgs << \"-Xlint:unchecked\" << \"-Xlint:deprecation\"\n" +
+							"\t}\n" +
+							"}\n\n";
+					}
+
 					// Create baseBuildAdditions.gradle from plugins baseBuildGradleAdditions
 					string GradleBaseBuildAdditionsFilename = Path.Combine(UE4BuildGradlePath, "baseBuildAdditions.gradle");
-					File.WriteAllText(GradleBaseBuildAdditionsFilename, UPL.ProcessPluginNode(NDKArch, "baseBuildGradleAdditions", ""));
+					File.WriteAllText(GradleBaseBuildAdditionsFilename, UPL.ProcessPluginNode(NDKArch, "baseBuildGradleAdditions", GradleBaseBuildAdditionsContents));
+
+					// Create buildscriptAdditions.gradle from plugins buildscriptGradleAdditions
+					string GradleBuildScriptAdditionsFilename = Path.Combine(UE4BuildGradlePath, "buildscriptAdditions.gradle");
+					File.WriteAllText(GradleBuildScriptAdditionsFilename, UPL.ProcessPluginNode(NDKArch, "buildscriptGradleAdditions", ""));
 
 					string GradleScriptPath = Path.Combine(UE4BuildGradlePath, "gradlew");
 					if (Utils.IsRunningOnMono)
@@ -3555,25 +3830,40 @@ namespace UnrealBuildTool
 						}
 					}
 
-					string GradleOptions = GradleBuildType;
-					// upload Crashlytics symbols if plugin enabled and using build machine (use Ant for this right now)
-					if (CrashlyticsPluginEnabled && Environment.GetEnvironmentVariable("IsBuildMachine") == "1")
+					string GradleBuildType = bForDistribution ? ":app:assembleRelease" : ":app:assembleDebug";
+
+					// collect optional additional Gradle parameters from plugins
+					string GradleOptions = UPL.ProcessPluginNode(NDKArch, "gradleParameters", GradleBuildType); //  "--stacktrace --debug " + GradleBuildType);
+
+					// check for Android Studio project, call Gradle if doesn't exist (assume user will build with Android Studio)
+					string GradleAppImlFilename = Path.Combine(UE4BuildGradlePath, "app.iml");
+					if (!File.Exists(GradleAppImlFilename))
 					{
-						GradleOptions += bForDistribution ? " crashlyticsUploadSymbolsRelease"
-														  : " crashlyticsUploadSymbolsDebug";
+						// make sure destination exists
+						Directory.CreateDirectory(Path.GetDirectoryName(DestApkName));
+
+						// Use gradle to build the .apk file
+						string ShellExecutable = Utils.IsRunningOnMono ? "/bin/sh" : "cmd.exe";
+						string ShellParametersBegin = Utils.IsRunningOnMono ? "-c '" : "/c ";
+						string ShellParametersEnd = Utils.IsRunningOnMono ? "'" : "";
+						RunCommandLineProgramWithException(UE4BuildGradlePath, ShellExecutable, ShellParametersBegin + "\"" + GradleScriptPath + "\" " + GradleOptions + ShellParametersEnd, "Making .apk with Gradle...");
+
+						// For build machine run a clean afterward to clean up intermediate files (does not remove final APK)
+						if (bIsBuildMachine)
+						{
+							//GradleOptions = "tasks --all";
+							//RunCommandLineProgramWithException(UE4BuildGradlePath, ShellExecutable, ShellParametersBegin + "\"" + GradleScriptPath + "\" " + GradleOptions + ShellParametersEnd, "Listing all tasks...");
+
+							GradleOptions = "clean";
+							RunCommandLineProgramWithException(UE4BuildGradlePath, ShellExecutable, ShellParametersBegin + "\"" + GradleScriptPath + "\" " + GradleOptions + ShellParametersEnd, "Cleaning Gradle intermediates...");
+						}
 					}
-
-					// Use gradle to build the .apk file
-					string ShellExecutable = Utils.IsRunningOnMono ? "/bin/sh" : "cmd.exe";
-					string ShellParametersBegin = Utils.IsRunningOnMono ? "-c '" : "/c ";
-					string ShellParametersEnd = Utils.IsRunningOnMono ? "'" : "";
-					RunCommandLineProgramWithException(UE4BuildGradlePath, ShellExecutable, ShellParametersBegin + "\"" + GradleScriptPath + "\" " + GradleOptions + ShellParametersEnd, "Making .apk with Gradle...");
-
-					// For build machine run a clean afterward to clean up intermediate files (does not remove final APK)
-					if (Environment.GetEnvironmentVariable("IsBuildMachine") == "1")
+					else
 					{
-						GradleOptions = "clean";
-						RunCommandLineProgramWithException(UE4BuildGradlePath, ShellExecutable, ShellParametersBegin + "\"" + GradleScriptPath + "\" " + GradleOptions + ShellParametersEnd, "Cleaning Gradle intermediates...");
+						Log.TraceInformation("=============================================================================================");
+						Log.TraceInformation("Android Studio project found, skipping Gradle; complete creation of APK in Android Studio!!!!");
+						Log.TraceInformation("Delete '{0} if you want to have UnrealBuildTool run Gradle for future runs.", GradleAppImlFilename);
+						Log.TraceInformation("=============================================================================================");
 					}
 				}
 
@@ -3763,9 +4053,12 @@ namespace UnrealBuildTool
 
 		private void UpdateGameActivity(string UE4Arch, string NDKArch, string EngineDir, string UE4BuildPath)
 		{
-			string SourceFilename = Path.Combine(EngineDir, "Build", "Android", "Java", "src", "com", "epicgames", "ue4", "GameActivity.java");
+			string SourceFilename = Path.Combine(EngineDir, "Build", "Android", "Java", "src", "com", "epicgames", "ue4", "GameActivity.java.template");
 			string DestFilename = Path.Combine(UE4BuildPath, "src", "com", "epicgames", "ue4", "GameActivity.java");
 
+			// check for GameActivity.java.template override
+			SourceFilename = UPL.ProcessPluginNode(NDKArch, "gameActivityReplacement", SourceFilename);
+
 			string LoadLibraryDefaults = "";
 
 			string AndroidGraphicsDebugger;
@@ -3815,6 +4108,7 @@ namespace UnrealBuildTool
 			string[] TemplateSrc = File.ReadAllLines(SourceFilename);
 			string[] TemplateDest = File.Exists(DestFilename) ? File.ReadAllLines(DestFilename) : null;
 
+			bool TemplateChanged = false;
 			for (int LineIndex = 0; LineIndex < TemplateSrc.Length; ++LineIndex)
 			{
 				string SrcLine = TemplateSrc[LineIndex];
@@ -3830,9 +4124,16 @@ namespace UnrealBuildTool
 				if (Changed)
 				{
 					TemplateSrc[LineIndex] = SrcLine;
+					TemplateChanged = true;
 				}
 			}
 
+			if (TemplateChanged)
+			{
+				// deal with insertions of newlines
+				TemplateSrc = string.Join("\n", TemplateSrc).Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+			}
+
 			if (TemplateDest == null || TemplateSrc.Length != TemplateDest.Length || !TemplateSrc.SequenceEqual(TemplateDest))
 			{
                 Log.TraceInformation("\n==== Writing new GameActivity.java file to {0} ====", DestFilename);
@@ -3840,7 +4141,7 @@ namespace UnrealBuildTool
 			}
 		}
 
-		private AndroidAARHandler CreateAARHandler(string EngineDir, string UE4BuildPath, List<string> NDKArches, bool HandleDependencies=true)
+		private AndroidAARHandler CreateAARHandler(string EngineDir, string UE4BuildPath, List<string> NDKArches, bool bGradleEnabled, bool HandleDependencies=true)
 		{
 			AndroidAARHandler AARHandler = new AndroidAARHandler();
 			string ImportList = "";
@@ -3851,10 +4152,18 @@ namespace UnrealBuildTool
 
 			// Add the AARs from the default aar-imports.txt
 			// format: Package,Name,Version
-			string ImportsFile = Path.Combine(UE4BuildPath, "aar-imports.txt");
-			if (File.Exists(ImportsFile))
+			string ImportsAntFile = Path.Combine(UE4BuildPath, "aar-imports-ant.txt");
+			if (!bGradleEnabled && File.Exists(ImportsAntFile))
 			{
-				ImportList = File.ReadAllText(ImportsFile);
+				ImportList = File.ReadAllText(ImportsAntFile);
+			}
+			else
+			{
+				string ImportsFile = Path.Combine(UE4BuildPath, "aar-imports.txt");
+				if (File.Exists(ImportsFile))
+				{
+					ImportList = File.ReadAllText(ImportsFile);
+				}
 			}
 
 			// Run the UPL imports section for each architecture and add any new imports (duplicates will be removed)
@@ -3906,6 +4215,7 @@ namespace UnrealBuildTool
 			StringBuilder SettingsGradleContent = new StringBuilder();
 			StringBuilder ProjectDependencyContent = new StringBuilder();
 
+			SettingsGradleContent.AppendLine("rootProject.name='app'");
 			SettingsGradleContent.AppendLine("include ':app'");
 			ProjectDependencyContent.AppendLine("dependencies {");
 
@@ -3915,7 +4225,7 @@ namespace UnrealBuildTool
 				string RelativePath = Path.GetFileName(LibDir);
 
 				SettingsGradleContent.AppendLine(string.Format("include ':{0}'", RelativePath));
-				ProjectDependencyContent.AppendLine(string.Format("\tcompile project(':{0}')", RelativePath));
+				ProjectDependencyContent.AppendLine(string.Format("\timplementation project(':{0}')", RelativePath));
 
 				string GradleProjectPath = Path.Combine(UE4BuildGradlePath, RelativePath);
 				string GradleProjectMainPath = Path.Combine(GradleProjectPath, "src", "main");
@@ -4022,7 +4332,7 @@ namespace UnrealBuildTool
 
 		private void GenerateGradleAARImports(string EngineDir, string UE4BuildPath, List<string> NDKArches)
 		{
-			AndroidAARHandler AARHandler = CreateAARHandler(EngineDir, UE4BuildPath, NDKArches, false);
+			AndroidAARHandler AARHandler = CreateAARHandler(EngineDir, UE4BuildPath, NDKArches, true, false);
 			StringBuilder AARImportsContent = new StringBuilder();
 
 			// Add repositories
@@ -4038,7 +4348,7 @@ namespace UnrealBuildTool
 			AARImportsContent.AppendLine("dependencies {");
 			foreach (AndroidAARHandler.AndroidAAREntry Dependency in AARHandler.AARList)
 			{
-				AARImportsContent.AppendLine(string.Format("\tcompile '{0}:{1}:{2}'", Dependency.Filename, Dependency.BaseName, Dependency.Version));
+				AARImportsContent.AppendLine(string.Format("\timplementation '{0}:{1}:{2}'", Dependency.Filename, Dependency.BaseName, Dependency.Version));
 			}
 			AARImportsContent.AppendLine("}");
 
@@ -4048,7 +4358,7 @@ namespace UnrealBuildTool
 
 		private void ExtractAARAndJARFiles(string EngineDir, string UE4BuildPath, List<string> NDKArches, string AppPackageName, string AARExtractListFilename)
 		{
-			AndroidAARHandler AARHandler = CreateAARHandler(EngineDir, UE4BuildPath, NDKArches, true);
+			AndroidAARHandler AARHandler = CreateAARHandler(EngineDir, UE4BuildPath, NDKArches, false, true);
 
 			// Finally, extract the AARs and copy the JARs
 			AARHandler.ExtractAARs(UE4BuildPath, AppPackageName);
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs
index 28d832e2d13d..0f2328b7526f 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/HTML5/HTML5SDKInfo.cs
@@ -282,7 +282,7 @@ namespace UnrealBuildTool
 		///
 		/// </summary>
 		/// <returns></returns>
-		public static string SetUpEmscriptenConfigFile()
+		public static string SetUpEmscriptenConfigFile( bool bHome=false )
 		{
 			// If user has configured a custom Emscripten toolchain, use that automatically.
 			if (Environment.GetEnvironmentVariable("EMSDK") != null && Environment.GetEnvironmentVariable("EM_CONFIG") != null && File.Exists(Environment.GetEnvironmentVariable("EM_CONFIG")))
@@ -371,6 +371,16 @@ namespace UnrealBuildTool
 			// --------------------------------------------------
 			// restore a few things
 			Environment.SetEnvironmentVariable(PLATFORM_USER_HOME, HOME_SAVE);
+			if ( bHome )
+			{
+				ProcessStartInfo processInfo2 = new ProcessStartInfo(PYTHON, cmd + " -v");
+				processInfo2.CreateNoWindow = true;
+				processInfo2.UseShellExecute = false;
+				Process process2 = Process.Start(processInfo2);
+				process2.WaitForExit();
+				Log.TraceInformation("emcc ExitCode: {0} - special", process2.ExitCode);
+				process2.Close();
+			}
 			Environment.SetEnvironmentVariable("PATH", PATH_SAVE);
 
 			// --------------------------------------------------
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/IOSToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/IOSToolChain.cs
index 2a7e66eaea2f..019e3a473b92 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/IOSToolChain.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/IOSToolChain.cs
@@ -326,7 +326,7 @@ namespace UnrealBuildTool
 				Result += " -isysroot " + Settings.Value.BaseSDKDir + "/" +  Settings.Value.DevicePlatformName + Settings.Value.IOSSDKVersion + ".sdk";
 			}
 
-			Result += " -m" +  GetXcodeMinVersionParam() + "=" + ProjectSettings.RuntimeVersion;
+			Result += " -m" + GetXcodeMinVersionParam() + "=" + ProjectSettings.RuntimeVersion;
 			
 			bool bStaticAnalysis = false;
 			string StaticAnalysisMode = Environment.GetEnvironmentVariable("CLANG_STATIC_ANALYZER_MODE");
@@ -493,14 +493,16 @@ namespace UnrealBuildTool
 			}
 			else
 			{
+				string ResultsText;
+
 				// Delete the local dest directory if it exists
 				if (Directory.Exists(Path))
 				{
-					Directory.Delete(Path, true);
+					// this can deal with linked files
+					RunExecutableAndWait("rm", String.Format("-rf \"{0}\"", Path), out ResultsText);
 				}
 
 				// Create the intermediate local directory
-				string ResultsText;
 				RunExecutableAndWait("mkdir", String.Format("-p \"{0}\"", Path), out ResultsText);
 			}
 		}
@@ -940,6 +942,14 @@ namespace UnrealBuildTool
 			FileItem RemoteOutputFile = LocalToRemoteFileItem(OutputFile, false);
 			LinkAction.ProducedItems.Add(RemoteOutputFile);
 
+			// Add arguments to generate a map file too
+			if (!LinkEnvironment.bIsBuildingLibrary && LinkEnvironment.bCreateMapFile)
+			{
+				FileItem MapFile = FileItem.GetItemByFileReference(new FileReference(OutputFile.Location.FullName + ".map"));
+				LinkCommandArguments += string.Format(" -Wl,-map,\"{0}\"", MapFile.Location.FullName);
+				LinkAction.ProducedItems.Add(MapFile);
+			}
+
 			// Add the input files to a response file, and pass the response file on the command-line.
 			List<string> InputFileNames = new List<string>();
 			foreach (FileItem InputFile in LinkEnvironment.InputFiles)
@@ -1470,10 +1480,11 @@ namespace UnrealBuildTool
                     new string []{ "IPhoneIcon60@3x.png", "Icon60@3x.png", "Icon180.png" },
                     new string []{ "IPadIcon20.png", "Icon20.png" },
                     new string []{ "IPadIcon20@2x.png", "Icon20@2x.png", "Icon40.png" },
-                    new string []{ "IPadIcon29.png", "Icon29.png" },
+					new string []{ "IPadIcon29.png", "Icon29.png" },
                     new string []{ "IPadIcon29@2x.png", "Icon29@2x.png", "Icon58.png" },
                     new string []{ "IPadIcon40.png", "Icon40.png", "Icon20@2x.png" },
-                    new string []{ "IPadIcon76.png", "Icon76.png" },
+					new string []{ "IPadIcon40@2x.png", "Icon80.png", "Icon40@2x.png" },
+					new string []{ "IPadIcon76.png", "Icon76.png" },
                     new string []{ "IPadIcon76@2x.png", "Icon76@2x.png", "Icon152.png" },
                     new string []{ "IPadIcon83.5@2x.png", "Icon83.5@2x.png", "Icon167.png" },
                     new string []{ "Icon1024.png", "Icon1024.png" },
@@ -1637,7 +1648,10 @@ namespace UnrealBuildTool
 				}
 				File.Copy(Target.OutputPath.FullName, FinalRemoteExecutablePath, true);
 
-				GenerateCrashlyticsData(RemoteShadowDirectoryMac, Path.GetFileName(Target.OutputPath.FullName), Target.ProjectDirectory.FullName, AppName);
+				if (!Target.Rules.IOSPlatform.bSkipCrashlytics)
+				{
+					GenerateCrashlyticsData(RemoteShadowDirectoryMac, Path.GetFileName(Target.OutputPath.FullName), Target.ProjectDirectory.FullName, AppName);
+				}
 
 				if (Target.Rules.bCreateStubIPA)
 				{
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEBuildIOS.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEBuildIOS.cs
index 98a52cdd4237..245dcda142fb 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEBuildIOS.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEBuildIOS.cs
@@ -11,6 +11,55 @@ using Tools.DotNETCommon;
 
 namespace UnrealBuildTool
 {
+	/// <summary>
+	/// IOS-specific target settings
+	/// </summary>
+	public class IOSTargetRules
+	{
+		/// <summary>
+		/// Don't generate crashlytics data
+		/// </summary>
+		[CommandLine("-skipcrashlytics")]
+		public bool bSkipCrashlytics = false;
+	}
+
+	/// <summary>
+	/// Read-only wrapper for IOS-specific target settings
+	/// </summary>
+	public class ReadOnlyIOSTargetRules
+	{
+		/// <summary>
+		/// The private mutable settings object
+		/// </summary>
+		private IOSTargetRules Inner;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="Inner">The settings object to wrap</param>
+		public ReadOnlyIOSTargetRules(IOSTargetRules Inner)
+		{
+			this.Inner = Inner;
+		}
+
+		/// <summary>
+		/// Accessors for fields on the inner TargetRules instance
+		/// </summary>
+		#region Read-only accessor properties 
+#if !__MonoCS__
+#pragma warning disable CS1591
+#endif
+		public bool bSkipCrashlytics
+		{
+			get { return Inner.bSkipCrashlytics; }
+		}
+
+#if !__MonoCS__
+#pragma warning restore CS1591
+#endif
+		#endregion
+	}
+
 	/// <summary>
 	/// Stores project-specific IOS settings. Instances of this object are cached by IOSPlatform.
 	/// </summary>
@@ -25,12 +74,14 @@ namespace UnrealBuildTool
 		/// Whether to generate a dSYM file or not.
 		/// </summary>
 		[ConfigFile(ConfigHierarchyType.Engine, "/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bGeneratedSYMFile")]
+		[CommandLine("-skipgeneratedsymfile", Value="false")]
 		public readonly bool bGeneratedSYMFile = true;
 
 		/// <summary>
 		/// Whether to generate a dSYM bundle or not.
 		/// </summary>
 		[ConfigFile(ConfigHierarchyType.Engine, "/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bGeneratedSYMBundle")]
+		[CommandLine("-skipgeneratedsymbundle", Value = "false")]
 		public readonly bool bGeneratedSYMBundle = false;
 
         /// <summary>
@@ -806,6 +857,7 @@ namespace UnrealBuildTool
 
 			LinkEnvironment.AdditionalFrameworks.Add(new UEBuildFramework("GameKit"));
 			LinkEnvironment.AdditionalFrameworks.Add(new UEBuildFramework("StoreKit"));
+			LinkEnvironment.AdditionalFrameworks.Add(new UEBuildFramework("DeviceCheck"));
 		}
 
 		/// <summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEDeployIOS.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEDeployIOS.cs
index 41d65e0c6692..a72558979a3c 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEDeployIOS.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/IOS/UEDeployIOS.cs
@@ -15,11 +15,11 @@ namespace UnrealBuildTool
 {
 	class UEDeployIOS : UEBuildDeploy
 	{
-        public UEDeployIOS()
-        {
-        }
+		public UEDeployIOS()
+		{
+		}
 
-        protected UnrealPluginLanguage UPL = null;
+		protected UnrealPluginLanguage UPL = null;
 		protected delegate bool FilenameFilter(string InFilename);
 
 		protected class VersionUtilities
@@ -27,24 +27,24 @@ namespace UnrealBuildTool
 			public static string BuildDirectory
 			{
 				get;
-				set;
+			set;
 			}
-			public static string GameName
+				public static string GameName
 			{
 				get;
-				set;
+			set;
 			}
 
-			static string RunningVersionFilename
+				static string RunningVersionFilename
 			{
 				get { return Path.Combine(BuildDirectory, GameName + ".PackageVersionCounter"); }
 			}
 
-			/// <summary>
-			/// Reads the GameName.PackageVersionCounter from disk and bumps the minor version number in it
-			/// </summary>
-			/// <returns></returns>
-			public static string ReadRunningVersion()
+				/// <summary>
+				/// Reads the GameName.PackageVersionCounter from disk and bumps the minor version number in it
+				/// </summary>
+				/// <returns></returns>
+				public static string ReadRunningVersion()
 			{
 				string CurrentVersion = "0.0";
 				if (File.Exists(RunningVersionFilename))
@@ -97,9 +97,9 @@ namespace UnrealBuildTool
 			/// <summary>
 			/// Parses the version string (expected to be of the form major.minor or major)
 			/// Also parses the major.minor from the running version file and increments it's minor by 1.
-			/// 
+			///
 			/// If the running version major matches and the running version minor is newer, then the bundle version is updated.
-			/// 
+			///
 			/// In either case, the running version is set to the current bundle version number and written back out.
 			/// </summary>
 			/// <returns>The (possibly updated) bundle version</returns>
@@ -144,37 +144,37 @@ namespace UnrealBuildTool
 			public static string UpdateBundleVersion(string OldPList, string EngineDirectory)
 			{
 				string CFBundleVersion = "-1";
-                if (Environment.GetEnvironmentVariable("IsBuildMachine") != "1")
-                {
-                    int Index = OldPList.IndexOf("CFBundleVersion");
-                    if (Index != -1)
-                    {
-                        int Start = OldPList.IndexOf("<string>", Index) + ("<string>").Length;
-                        CFBundleVersion = OldPList.Substring(Start, OldPList.IndexOf("</string>", Index) - Start);
-                        CFBundleVersion = CalculateUpdatedMinorVersionString(CFBundleVersion);
-                    }
-                    else
-                    {
-                        CFBundleVersion = "0.0";
-                    }
-                }
-                else
-                {
-                    // get the changelist from version.h
-                    string EngineVersionFile = Path.Combine(EngineDirectory, "Source", "Runtime", "Launch", "Resources", "Version.h");
-                    string[] EngineVersionLines = File.ReadAllLines(EngineVersionFile);
-                    for (int i = 0; i < EngineVersionLines.Length; ++i)
-                    {
-                        if (EngineVersionLines[i].StartsWith("#define BUILT_FROM_CHANGELIST"))
-                        {
-                            CFBundleVersion = EngineVersionLines[i].Split(new char[] { ' ', '\t' })[2].Trim(' ');
-                            break;
-                        }
-                    }
+				if (Environment.GetEnvironmentVariable("IsBuildMachine") != "1")
+				{
+					int Index = OldPList.IndexOf("CFBundleVersion");
+					if (Index != -1)
+					{
+						int Start = OldPList.IndexOf("<string>", Index) + ("<string>").Length;
+						CFBundleVersion = OldPList.Substring(Start, OldPList.IndexOf("</string>", Index) - Start);
+						CFBundleVersion = CalculateUpdatedMinorVersionString(CFBundleVersion);
+					}
+					else
+					{
+						CFBundleVersion = "0.0";
+					}
+				}
+				else
+				{
+					// get the changelist from version.h
+					string EngineVersionFile = Path.Combine(EngineDirectory, "Source", "Runtime", "Launch", "Resources", "Version.h");
+					string[] EngineVersionLines = File.ReadAllLines(EngineVersionFile);
+					for (int i = 0; i < EngineVersionLines.Length; ++i)
+					{
+						if (EngineVersionLines[i].StartsWith("#define BUILT_FROM_CHANGELIST"))
+						{
+							CFBundleVersion = EngineVersionLines[i].Split(new char[] { ' ', '\t' })[2].Trim(' ');
+							break;
+						}
+					}
 
-                }
+				}
 
-                return CFBundleVersion;
+				return CFBundleVersion;
 			}
 		}
 
@@ -226,16 +226,16 @@ namespace UnrealBuildTool
 			bool bSupported = true;
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bSupportsPortraitOrientation", out bSupported);
 			SupportedOrientations += bSupported ? "\t\t<string>UIInterfaceOrientationPortrait</string>\n" : "";
-            bSupportsPortrait = bSupported;
+			bSupportsPortrait = bSupported;
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bSupportsUpsideDownOrientation", out bSupported);
 			SupportedOrientations += bSupported ? "\t\t<string>UIInterfaceOrientationPortraitUpsideDown</string>\n" : "";
-            bSupportsPortrait |= bSupported;
+			bSupportsPortrait |= bSupported;
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bSupportsLandscapeLeftOrientation", out bSupported);
 			SupportedOrientations += bSupported ? "\t\t<string>UIInterfaceOrientationLandscapeLeft</string>\n" : "";
-            bSupportsLandscape = bSupported;
+			bSupportsLandscape = bSupported;
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bSupportsLandscapeRightOrientation", out bSupported);
 			SupportedOrientations += bSupported ? "\t\t<string>UIInterfaceOrientationLandscapeRight</string>\n" : "";
-            bSupportsLandscape |= bSupported;
+			bSupportsLandscape |= bSupported;
 
 			// bundle display name
 			string BundleDisplayName;
@@ -250,15 +250,15 @@ namespace UnrealBuildTool
 			Ini.GetString("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "BundleName", out BundleName);
 
 			// disable https requirement
-            bool bDisableHTTPS;
-            Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bDisableHTTPS", out bDisableHTTPS);
+			bool bDisableHTTPS;
+			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bDisableHTTPS", out bDisableHTTPS);
 
 			// short version string
 			string BundleShortVersion;
 			Ini.GetString("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "VersionInfo", out BundleShortVersion);
 
-            // required capabilities
-            string RequiredCaps = "";
+			// required capabilities
+			string RequiredCaps = "";
 
 			IOSProjectSettings ProjectSettings = ((IOSPlatform)UEBuildPlatform.GetBuildPlatform(UnrealTargetPlatform.IOS)).ReadProjectSettings(ProjectFile);
 			if (InThis != null)
@@ -295,27 +295,27 @@ namespace UnrealBuildTool
 			{
 				switch (MinVersion)
 				{
-					case "IOS_61":
-						Log.TraceWarning("IOS 6 is no longer supported in UE4 as 4.11");
-						MinVersion = "7.0";
-						break;
-					case "IOS_7":
-						Log.TraceWarning("IOS 7 is no longer supported in UE4 as 4.15");
-						MinVersion = "7.0";
-						break;
-					case "IOS_8":
-						Log.TraceWarning("IOS 8 is no longer supported in UE4 as 4.18");
-						MinVersion = "8.0";
-						break;
-					case "IOS_9":
-						MinVersion = "9.0";
-						break;
-					case "IOS_10":
-						MinVersion = "10.0";
-						break;
-					case "IOS_11":
-						MinVersion = "11.0";
-						break;
+				case "IOS_61":
+					Log.TraceWarning("IOS 6 is no longer supported in UE4 as 4.11");
+					MinVersion = "7.0";
+					break;
+				case "IOS_7":
+					Log.TraceWarning("IOS 7 is no longer supported in UE4 as 4.15");
+					MinVersion = "7.0";
+					break;
+				case "IOS_8":
+					Log.TraceWarning("IOS 8 is no longer supported in UE4 as 4.18");
+					MinVersion = "8.0";
+					break;
+				case "IOS_9":
+					MinVersion = "9.0";
+					break;
+				case "IOS_10":
+					MinVersion = "10.0";
+					break;
+				case "IOS_11":
+					MinVersion = "11.0";
+					break;
 				}
 			}
 			else
@@ -347,7 +347,7 @@ namespace UnrealBuildTool
 			bool bRemoteNotificationsSupported = false;
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bEnableRemoteNotificationsSupport", out bRemoteNotificationsSupported);
 
-			// Get any Location Services permission descriptions added 
+			// Get any Location Services permission descriptions added
 			string LocationAlwaysUsageDescription = "";
 			string LocationWhenInUseDescription = "";
 			Ini.GetString("/Script/LocationServicesIOSEditor.LocationServicesIOSSettings", "LocationAlwaysUsageDescription", out LocationAlwaysUsageDescription);
@@ -413,7 +413,7 @@ namespace UnrealBuildTool
 			Text.AppendLine("\t<false/>");
 			Text.AppendLine("\t<key>UISupportedInterfaceOrientations</key>");
 			Text.AppendLine("\t<array>");
-			foreach (string Line in SupportedOrientations.Split("\r\n".ToCharArray()))
+			foreach(string Line in SupportedOrientations.Split("\r\n".ToCharArray()))
 			{
 				if (!string.IsNullOrWhiteSpace(Line))
 				{
@@ -423,7 +423,7 @@ namespace UnrealBuildTool
 			Text.AppendLine("\t</array>");
 			Text.AppendLine("\t<key>UIRequiredDeviceCapabilities</key>");
 			Text.AppendLine("\t<array>");
-			foreach (string Line in RequiredCaps.Split("\r\n".ToCharArray()))
+			foreach(string Line in RequiredCaps.Split("\r\n".ToCharArray()))
 			{
 				if (!string.IsNullOrWhiteSpace(Line))
 				{
@@ -432,92 +432,92 @@ namespace UnrealBuildTool
 			}
 			Text.AppendLine("\t</array>");
 
-            if (IOSExports.SupportsIconCatalog(new DirectoryReference(ProjectDirectory), BuildRecieptFileName))
-            {
-                bSkipIcons = true;
-                Text.AppendLine("\t<key>CFBundleIcons</key>");
-                Text.AppendLine("\t<dict>");
-                Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
-                Text.AppendLine("\t\t<dict>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
-                Text.AppendLine("\t\t\t<array>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon20x20</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon29x29</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon40x40</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon60x60</string>");
-                Text.AppendLine("\t\t\t</array>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconName</key>");
-                Text.AppendLine("\t\t\t<string>AppIcon</string>");
-                Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
-                Text.AppendLine("\t\t\t<true/>");
-                Text.AppendLine("\t\t</dict>");
-                Text.AppendLine("\t</dict>");
-                Text.AppendLine("\t<key>CFBundleIcons~ipad</key>");
-                Text.AppendLine("\t<dict>");
-                Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
-                Text.AppendLine("\t\t<dict>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
-                Text.AppendLine("\t\t\t<array>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon20x20</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon29x29</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon40x40</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon60x60</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon76x76</string>");
-                Text.AppendLine("\t\t\t\t<string>AppIcon83.5x83.5</string>");
-                Text.AppendLine("\t\t\t</array>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconName</key>");
-                Text.AppendLine("\t\t\t<string>AppIcon</string>");
-                Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
-                Text.AppendLine("\t\t\t<true/>");
-                Text.AppendLine("\t\t</dict>");
-                Text.AppendLine("\t</dict>");
-            }
-            else
-            {
-                bSkipIcons = false;
-                Text.AppendLine("\t<key>CFBundleIcons</key>");
-                Text.AppendLine("\t<dict>");
-                Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
-                Text.AppendLine("\t\t<dict>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
-                Text.AppendLine("\t\t\t<array>");
-                Text.AppendLine("\t\t\t\t<string>Icon29.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon29@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon40.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon40@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon57.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon57@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon60@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon60@3x.png</string>");
-                Text.AppendLine("\t\t\t</array>");
-                Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
-                Text.AppendLine("\t\t\t<true/>");
-                Text.AppendLine("\t\t</dict>");
-                Text.AppendLine("\t</dict>");
-                Text.AppendLine("\t<key>CFBundleIcons~ipad</key>");
-                Text.AppendLine("\t<dict>");
-                Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
-                Text.AppendLine("\t\t<dict>");
-                Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
-                Text.AppendLine("\t\t\t<array>");
-                Text.AppendLine("\t\t\t\t<string>Icon29.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon29@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon40.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon40@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon50.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon50@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon72.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon72@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon76.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon76@2x.png</string>");
-                Text.AppendLine("\t\t\t\t<string>Icon83.5@2x.png</string>");
-                Text.AppendLine("\t\t\t</array>");
-                Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
-                Text.AppendLine("\t\t\t<true/>");
-                Text.AppendLine("\t\t</dict>");
-                Text.AppendLine("\t</dict>");
-            }
-            if (File.Exists(LaunchXib))
+			if (IOSExports.SupportsIconCatalog(new DirectoryReference(ProjectDirectory), BuildRecieptFileName))
+			{
+				bSkipIcons = true;
+				Text.AppendLine("\t<key>CFBundleIcons</key>");
+				Text.AppendLine("\t<dict>");
+				Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
+				Text.AppendLine("\t\t<dict>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
+				Text.AppendLine("\t\t\t<array>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon20x20</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon29x29</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon40x40</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon60x60</string>");
+				Text.AppendLine("\t\t\t</array>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconName</key>");
+				Text.AppendLine("\t\t\t<string>AppIcon</string>");
+				Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
+				Text.AppendLine("\t\t\t<true/>");
+				Text.AppendLine("\t\t</dict>");
+				Text.AppendLine("\t</dict>");
+				Text.AppendLine("\t<key>CFBundleIcons~ipad</key>");
+				Text.AppendLine("\t<dict>");
+				Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
+				Text.AppendLine("\t\t<dict>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
+				Text.AppendLine("\t\t\t<array>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon20x20</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon29x29</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon40x40</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon60x60</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon76x76</string>");
+				Text.AppendLine("\t\t\t\t<string>AppIcon83.5x83.5</string>");
+				Text.AppendLine("\t\t\t</array>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconName</key>");
+				Text.AppendLine("\t\t\t<string>AppIcon</string>");
+				Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
+				Text.AppendLine("\t\t\t<true/>");
+				Text.AppendLine("\t\t</dict>");
+				Text.AppendLine("\t</dict>");
+			}
+			else
+			{
+				bSkipIcons = false;
+				Text.AppendLine("\t<key>CFBundleIcons</key>");
+				Text.AppendLine("\t<dict>");
+				Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
+				Text.AppendLine("\t\t<dict>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
+				Text.AppendLine("\t\t\t<array>");
+				Text.AppendLine("\t\t\t\t<string>Icon29.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon29@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon40.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon40@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon57.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon57@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon60@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon60@3x.png</string>");
+				Text.AppendLine("\t\t\t</array>");
+				Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
+				Text.AppendLine("\t\t\t<true/>");
+				Text.AppendLine("\t\t</dict>");
+				Text.AppendLine("\t</dict>");
+				Text.AppendLine("\t<key>CFBundleIcons~ipad</key>");
+				Text.AppendLine("\t<dict>");
+				Text.AppendLine("\t\t<key>CFBundlePrimaryIcon</key>");
+				Text.AppendLine("\t\t<dict>");
+				Text.AppendLine("\t\t\t<key>CFBundleIconFiles</key>");
+				Text.AppendLine("\t\t\t<array>");
+				Text.AppendLine("\t\t\t\t<string>Icon29.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon29@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon40.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon40@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon50.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon50@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon72.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon72@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon76.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon76@2x.png</string>");
+				Text.AppendLine("\t\t\t\t<string>Icon83.5@2x.png</string>");
+				Text.AppendLine("\t\t\t</array>");
+				Text.AppendLine("\t\t\t<key>UIPrerenderedIcon</key>");
+				Text.AppendLine("\t\t\t<true/>");
+				Text.AppendLine("\t\t</dict>");
+				Text.AppendLine("\t</dict>");
+			}
+			if (File.Exists(LaunchXib))
 			{
 				// TODO: compile the xib via remote tool
 				Text.AppendLine("\t<key>UILaunchStoryboardName</key>");
@@ -528,36 +528,36 @@ namespace UnrealBuildTool
 			{
 				// this is a temp way to inject the iphone 6 images without needing to upgrade everyone's plist
 				// eventually we want to generate this based on what the user has set in the project settings
-				string[] IPhoneConfigs =  
-					{
-                        "Default-IPhone6-Landscape.png", "Landscape", "{375, 667}", "8.0",
-                        "Default-IPhone6.png", "Portrait", "{375, 667}",  "8.0",
-                        "Default-IPhone6Plus-Landscape.png", "Landscape", "{414, 736}",  "8.0",
-                        "Default-IPhone6Plus-Portrait.png", "Portrait", "{414, 736}",  "8.0",
-                        "Default.png", "Portrait", "{320, 480}", "7.0",
-                        "Default-568h.png", "Portrait", "{320, 568}", "7.0",
-                        "Default-IPhoneX-Landscape.png", "Landscape", "{375, 812}",  "11.0",
-                        "Default-IPhoneX-Portrait.png", "Portrait", "{375, 812}",  "11.0",
-					};
+				string[] IPhoneConfigs =
+				{
+					"Default-IPhone6-Landscape.png", "Landscape", "{375, 667}", "8.0",
+					"Default-IPhone6.png", "Portrait", "{375, 667}",  "8.0",
+					"Default-IPhone6Plus-Landscape.png", "Landscape", "{414, 736}",  "8.0",
+					"Default-IPhone6Plus-Portrait.png", "Portrait", "{414, 736}",  "8.0",
+					"Default.png", "Portrait", "{320, 480}", "7.0",
+					"Default-568h.png", "Portrait", "{320, 568}", "7.0",
+					"Default-IPhoneX-Landscape.png", "Landscape", "{375, 812}",  "11.0",
+					"Default-IPhoneX-Portrait.png", "Portrait", "{375, 812}",  "11.0",
+				};
 
 				Text.AppendLine("\t<key>UILaunchImages~iphone</key>");
 				Text.AppendLine("\t<array>");
 				for (int ConfigIndex = 0; ConfigIndex < IPhoneConfigs.Length; ConfigIndex += 4)
 				{
-                    if ((bSupportsPortrait && IPhoneConfigs[ConfigIndex + 1] == "Portrait") ||
-                        (bSupportsLandscape && (IPhoneConfigs[ConfigIndex + 1] == "Landscape") || ConfigIndex > 12))
-                    {
-                        Text.AppendLine("\t\t<dict>");
-                        Text.AppendLine("\t\t\t<key>UILaunchImageMinimumOSVersion</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 3]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageName</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 0]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageOrientation</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 1]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageSize</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 2]));
-                        Text.AppendLine("\t\t</dict>");
-                    }
+					if ((bSupportsPortrait && IPhoneConfigs[ConfigIndex + 1] == "Portrait") ||
+						(bSupportsLandscape && (IPhoneConfigs[ConfigIndex + 1] == "Landscape") || ConfigIndex > 12))
+					{
+						Text.AppendLine("\t\t<dict>");
+						Text.AppendLine("\t\t\t<key>UILaunchImageMinimumOSVersion</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 3]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageName</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 0]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageOrientation</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 1]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageSize</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPhoneConfigs[ConfigIndex + 2]));
+						Text.AppendLine("\t\t</dict>");
+					}
 				}
 
 				// close it out
@@ -565,32 +565,32 @@ namespace UnrealBuildTool
 
 				// this is a temp way to inject the iPad Pro without needing to upgrade everyone's plist
 				// eventually we want to generate this based on what the user has set in the project settings
-				string[] IPadConfigs =  
-					{
-                        "Default-Landscape.png", "Landscape", "{768, 1024}", "7.0",
-                        "Default-Portrait.png", "Portrait", "{768, 1024}",  "7.0",
-                        "Default-Landscape-1336.png", "Landscape", "{1024, 1366}",  "9.0",
-                        "Default-Portrait-1336.png", "Portrait", "{1024, 1366}",  "9.0",
-					};
+				string[] IPadConfigs =
+				{
+					"Default-Landscape.png", "Landscape", "{768, 1024}", "7.0",
+					"Default-Portrait.png", "Portrait", "{768, 1024}",  "7.0",
+					"Default-Landscape-1336.png", "Landscape", "{1024, 1366}",  "9.0",
+					"Default-Portrait-1336.png", "Portrait", "{1024, 1366}",  "9.0",
+				};
 
 				Text.AppendLine("\t<key>UILaunchImages~ipad</key>");
 				Text.AppendLine("\t<array>");
 				for (int ConfigIndex = 0; ConfigIndex < IPadConfigs.Length; ConfigIndex += 4)
 				{
-                    if ((bSupportsPortrait && IPhoneConfigs[ConfigIndex + 1] == "Portrait") ||
-                        (bSupportsLandscape && IPhoneConfigs[ConfigIndex + 1] == "Landscape"))
-                    {
-                        Text.AppendLine("\t\t<dict>");
-                        Text.AppendLine("\t\t\t<key>UILaunchImageMinimumOSVersion</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 3]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageName</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 0]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageOrientation</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 1]));
-                        Text.AppendLine("\t\t\t<key>UILaunchImageSize</key>");
-                        Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 2]));
-                        Text.AppendLine("\t\t</dict>");
-                    }
+					if ((bSupportsPortrait && IPhoneConfigs[ConfigIndex + 1] == "Portrait") ||
+						(bSupportsLandscape && IPhoneConfigs[ConfigIndex + 1] == "Landscape"))
+					{
+						Text.AppendLine("\t\t<dict>");
+						Text.AppendLine("\t\t\t<key>UILaunchImageMinimumOSVersion</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 3]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageName</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 0]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageOrientation</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 1]));
+						Text.AppendLine("\t\t\t<key>UILaunchImageSize</key>");
+						Text.AppendLine(string.Format("\t\t\t<string>{0}</string>", IPadConfigs[ConfigIndex + 2]));
+						Text.AppendLine("\t\t</dict>");
+					}
 				}
 				Text.AppendLine("\t</array>");
 			}
@@ -604,20 +604,20 @@ namespace UnrealBuildTool
 			Text.AppendLine("\t<key>ITSAppUsesNonExemptEncryption</key>");
 			Text.AppendLine("\t<false/>");
 			// add location services descriptions if used
-			Text.AppendLine ("\t<key>NSLocationAlwaysUsageDescription</key>");
-			Text.AppendLine (string.Format("\t<string>{0}</string>", LocationAlwaysUsageDescription));
-			Text.AppendLine ("\t<key>NSLocationWhenInUseUsageDescription</key>");
-			Text.AppendLine (string.Format("\t<string>{0}></string>", LocationWhenInUseDescription));
-			
+			Text.AppendLine("\t<key>NSLocationAlwaysUsageDescription</key>");
+			Text.AppendLine(string.Format("\t<string>{0}</string>", LocationAlwaysUsageDescription));
+			Text.AppendLine("\t<key>NSLocationWhenInUseUsageDescription</key>");
+			Text.AppendLine(string.Format("\t<string>{0}></string>", LocationWhenInUseDescription));
+
 			// disable HTTPS requirement
-            if (bDisableHTTPS)
-            {
-                Text.AppendLine("\t<key>NSAppTransportSecurity</key>");
-                Text.AppendLine("\t\t<dict>");
-                Text.AppendLine("\t\t\t<key>NSAllowsArbitraryLoads</key><true/>");
-                Text.AppendLine("\t\t</dict>");
-            }
-            
+			if (bDisableHTTPS)
+			{
+				Text.AppendLine("\t<key>NSAppTransportSecurity</key>");
+				Text.AppendLine("\t\t<dict>");
+				Text.AppendLine("\t\t\t<key>NSAllowsArbitraryLoads</key><true/>");
+				Text.AppendLine("\t\t</dict>");
+			}
+
 			if (bEnableFacebookSupport)
 			{
 				Text.AppendLine("\t<key>FacebookAppID</key>");
@@ -629,6 +629,7 @@ namespace UnrealBuildTool
 				Text.AppendLine("\t<array>");
 				Text.AppendLine("\t\t<string>fbapi</string>");
 				Text.AppendLine("\t\t<string>fb-messenger-api</string>");
+				Text.AppendLine("\t\t<string>fb-messenger-share-api</string>");
 				Text.AppendLine("\t\t<string>fbauth2</string>");
 				Text.AppendLine("\t\t<string>fbshareextension</string>");
 				Text.AppendLine("\t</array>");
@@ -637,7 +638,7 @@ namespace UnrealBuildTool
 			if (!string.IsNullOrEmpty(ExtraData))
 			{
 				ExtraData = ExtraData.Replace("\\n", "\n");
-				foreach (string Line in ExtraData.Split("\r\n".ToCharArray()))
+				foreach(string Line in ExtraData.Split("\r\n".ToCharArray()))
 				{
 					if (!string.IsNullOrWhiteSpace(Line))
 					{
@@ -656,10 +657,10 @@ namespace UnrealBuildTool
 			// Add remote-notifications as background mode
 			if (bRemoteNotificationsSupported)
 			{
-                Text.AppendLine("\t<key>UIBackgroundModes</key>");
-                Text.AppendLine("\t<array>");
-                Text.AppendLine("\t\t<string>remote-notification</string>");
-                Text.AppendLine("\t</array>");
+				Text.AppendLine("\t<key>UIBackgroundModes</key>");
+				Text.AppendLine("\t<array>");
+				Text.AppendLine("\t\t<string>remote-notification</string>");
+				Text.AppendLine("\t</array>");
 			}
 
 			Text.AppendLine("</dict>");
@@ -671,7 +672,7 @@ namespace UnrealBuildTool
 				Directory.CreateDirectory(IntermediateDirectory);
 			}
 
-			if(InThis != null && InThis.UPL != null)
+			if (InThis != null && InThis.UPL != null)
 			{
 				// Allow UPL to modify the plist here
 				XDocument XDoc;
@@ -686,12 +687,12 @@ namespace UnrealBuildTool
 
 				XDoc.DocumentType.InternalSubset = "";
 				InThis.UPL.ProcessPluginNode("None", "iosPListUpdates", "", ref XDoc);
-                string result = XDoc.Declaration.ToString() + "\n" + XDoc.ToString().Replace("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"[]>", "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
+				string result = XDoc.Declaration.ToString() + "\n" + XDoc.ToString().Replace("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"[]>", "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
 				File.WriteAllText(PListFile, result);
-				
+
 				Text = new StringBuilder(result);
 			}
-			
+
 			File.WriteAllText(PListFile, Text.ToString());
 
 			if (BuildHostPlatform.Current.Platform == UnrealTargetPlatform.Mac)
@@ -717,21 +718,21 @@ namespace UnrealBuildTool
 			List<string> ProjectArches = new List<string>();
 			ProjectArches.Add("None");
 
-            string BundlePath;
+			string BundlePath;
 
-            // get the receipt
-            if (bIsUE4Game)
-            {
- //               ReceiptFilename = TargetReceipt.GetDefaultPath(UnrealBuildTool.EngineDirectory, "UE4Game", UnrealTargetPlatform.IOS, Config, "");
-                BundlePath = Path.Combine(UnrealBuildTool.EngineDirectory.ToString(), "Intermediate", "IOS-Deploy", "UE4Game", Config.ToString(), "Payload", "UE4Game.app");
-            }
-            else
-            {
-//                ReceiptFilename = TargetReceipt.GetDefaultPath(new DirectoryReference(ProjectDirectory), GameName, UnrealTargetPlatform.IOS, Config, "");
+			// get the receipt
+			if (bIsUE4Game)
+			{
+				//               ReceiptFilename = TargetReceipt.GetDefaultPath(UnrealBuildTool.EngineDirectory, "UE4Game", UnrealTargetPlatform.IOS, Config, "");
+				BundlePath = Path.Combine(UnrealBuildTool.EngineDirectory.ToString(), "Intermediate", "IOS-Deploy", "UE4Game", Config.ToString(), "Payload", "UE4Game.app");
+			}
+			else
+			{
+				//                ReceiptFilename = TargetReceipt.GetDefaultPath(new DirectoryReference(ProjectDirectory), GameName, UnrealTargetPlatform.IOS, Config, "");
 				BundlePath = AppDirectory;//Path.Combine(ProjectDirectory, "Binaries", "IOS", "Payload", ProjectName + ".app");
-            }
+			}
 
-            string RelativeEnginePath = UnrealBuildTool.EngineDirectory.MakeRelativeTo(DirectoryReference.GetCurrentDirectory());
+			string RelativeEnginePath = UnrealBuildTool.EngineDirectory.MakeRelativeTo(DirectoryReference.GetCurrentDirectory());
 
 			UPL = new UnrealPluginLanguage(ProjectFile, CollectPluginDataPaths(TargetReceipt.Read(BuildRecieptFileName, UnrealBuildTool.EngineDirectory, new DirectoryReference(ProjectDirectory))), ProjectArches, "", "", UnrealTargetPlatform.IOS);
 
@@ -741,87 +742,91 @@ namespace UnrealBuildTool
 			return GenerateIOSPList(ProjectFile, Config, ProjectDirectory, bIsUE4Game, GameName, ProjectName, InEngineDir, AppDirectory, BuildRecieptFileName, out bSupportsPortrait, out bSupportsLandscape, out bSkipIcons, this);
 		}
 
+		protected virtual void CopyCloudResources(string InEngineDir, string AppDirectory)
+		{
+			CopyFiles(InEngineDir + "/Build/IOS/Cloud", AppDirectory, "*.json", true);
+		}
 		protected virtual void CopyGraphicsResources(bool bSkipDefaultPNGs, bool bSkipIcons, string InEngineDir, string AppDirectory, string BuildDirectory, string IntermediateDir, bool bSupportsPortrait, bool bSupportsLandscape)
-        {
-            // copy engine assets in (IOS and TVOS shared in IOS)
-            if (bSkipDefaultPNGs)
-            {
-                // we still want default icons
-                if (!bSkipIcons)
-                {
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Icon*.png", true);
-                }
-            }
-            else
-            {
-                if (!bSkipIcons)
-                {
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Icon*.png", true);
-                }
-                if (bSupportsPortrait)
-                {
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Portrait.png", true);
- //                   CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait@2x.png", true);
-//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait-1336.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait-1336@2x.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhoneX-Portrait.png", true);
-                }
-                if (bSupportsLandscape)
-                {
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6-Landscape.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Landscape.png", true);
-//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape@2x.png", true);
-//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape-1336.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape-1336@2x.png", true);
-                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhoneX-Landscape.png", true);
-                }
-//                CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default.png", true);
-                CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default@2x.png", true);
-                CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-568h@2x.png", true);
-            }
-            // merge game assets on top
-            // @todo tvos: Do we want to copy IOS and TVOS both in? (Engine/IOS -> Game/IOS -> Game/TVOS)?
-            if (Directory.Exists(BuildDirectory + "/Resources/Graphics"))
-            {
-                if (!bSkipIcons)
-                {
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Icon*.png", true);
-                }
-                if (bSupportsPortrait)
-                {
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Portrait.png", true);
-//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait@2x.png", true);
-//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait-1336.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait-1336@2x.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhoneX-Portrait.png", true);
-                }
-                if (bSupportsLandscape)
-                {
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6-Landscape.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Landscape.png", true);
-//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape@2x.png", true);
-//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape-1336.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape-1336@2x.png", true);
-                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhoneX-Landscape.png", true);
-                }
-//                CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default.png", true);
-                CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default@2x.png", true);
-                CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-568h@2x.png", true);
-            }
-        }
+		{
+			// copy engine assets in (IOS and TVOS shared in IOS)
+			if (bSkipDefaultPNGs)
+			{
+				// we still want default icons
+				if (!bSkipIcons)
+				{
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Icon*.png", true);
+				}
+			}
+			else
+			{
+				if (!bSkipIcons)
+				{
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Icon*.png", true);
+				}
+				if (bSupportsPortrait)
+				{
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Portrait.png", true);
+					//                   CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait@2x.png", true);
+					//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait-1336.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Portrait-1336@2x.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhoneX-Portrait.png", true);
+				}
+				if (bSupportsLandscape)
+				{
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6-Landscape.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Landscape.png", true);
+					//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape@2x.png", true);
+					//                    CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape-1336.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-Landscape-1336@2x.png", true);
+					CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-IPhoneX-Landscape.png", true);
+				}
+				//                CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default.png", true);
+				CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default@2x.png", true);
+				CopyFiles(InEngineDir + "/Build/IOS/Resources/Graphics", AppDirectory, "Default-568h@2x.png", true);
+			}
+			// merge game assets on top
+			// @todo tvos: Do we want to copy IOS and TVOS both in? (Engine/IOS -> Game/IOS -> Game/TVOS)?
+			if (Directory.Exists(BuildDirectory + "/Resources/Graphics"))
+			{
+				if (!bSkipIcons)
+				{
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Icon*.png", true);
+				}
+				if (bSupportsPortrait)
+				{
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Portrait.png", true);
+					//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait@2x.png", true);
+					//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait-1336.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Portrait-1336@2x.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhoneX-Portrait.png", true);
+				}
+				if (bSupportsLandscape)
+				{
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6-Landscape.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhone6Plus-Landscape.png", true);
+					//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape@2x.png", true);
+					//                    CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape-1336.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-Landscape-1336@2x.png", true);
+					CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-IPhoneX-Landscape.png", true);
+				}
+				//                CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default.png", true);
+				CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default@2x.png", true);
+				CopyFiles(BuildDirectory + "/Resources/Graphics", AppDirectory, "Default-568h@2x.png", true);
+			}
+		}
 		protected virtual void CopyLocalizationsResources(string InEngineDir, string AppDirectory, string BuildDirectory, string IntermediateDir)
 		{
 			string LocalizationsPath = BuildDirectory + "/Resources/Localizations";
 			if (Directory.Exists(LocalizationsPath))
 			{
 				Log.TraceInformation("Copy localizations from Resources {0}, {1}", LocalizationsPath, AppDirectory);
-				CopyFolder(BuildDirectory + "/Resources/Localizations", AppDirectory, true, delegate (string InFilename)
+				CopyFolder(BuildDirectory + "/Resources/Localizations", AppDirectory, true, delegate(string InFilename)
 				{
 					if (Path.GetFileName(InFilename).Equals(".DS_Store")) return false;
 					return true;
@@ -829,7 +834,7 @@ namespace UnrealBuildTool
 			}
 		}
 
-        public bool PrepForUATPackageOrDeploy(UnrealTargetConfiguration Config, FileReference ProjectFile, string InProjectName, string InProjectDirectory, string InExecutablePath, string InEngineDir, bool bForDistribution, string CookFlavor, bool bIsDataDeploy, bool bCreateStubIPA, FileReference BuildReceiptFileName)
+		public bool PrepForUATPackageOrDeploy(UnrealTargetConfiguration Config, FileReference ProjectFile, string InProjectName, string InProjectDirectory, string InExecutablePath, string InEngineDir, bool bForDistribution, string CookFlavor, bool bIsDataDeploy, bool bCreateStubIPA, FileReference BuildReceiptFileName)
 		{
 			if (BuildHostPlatform.Current.Platform != UnrealTargetPlatform.Mac)
 			{
@@ -912,7 +917,7 @@ namespace UnrealBuildTool
 				{
 					if (Directory.Exists(BuildDirectory))
 					{
-						foreach (string Provision in Directory.EnumerateFiles(BuildDirectory, "*.mobileprovision", SearchOption.AllDirectories))
+						foreach(string Provision in Directory.EnumerateFiles(BuildDirectory, "*.mobileprovision", SearchOption.AllDirectories))
 						{
 							if (!File.Exists(Environment.GetEnvironmentVariable("HOME") + "/Library/MobileDevice/Provisioning Profiles/" + Path.GetFileName(Provision)) || File.GetLastWriteTime(Environment.GetEnvironmentVariable("HOME") + "/Library/MobileDevice/Provisioning Profiles/" + Path.GetFileName(Provision)) < File.GetLastWriteTime(Provision))
 							{
@@ -934,7 +939,7 @@ namespace UnrealBuildTool
 					// always look for provisions in the IOS dir, even for TVOS
 					if (Directory.Exists(InEngineDir + "/Build/IOS"))
 					{
-						foreach (string Provision in Directory.EnumerateFiles(InEngineDir + "/Build/IOS", "*.mobileprovision", SearchOption.AllDirectories))
+						foreach(string Provision in Directory.EnumerateFiles(InEngineDir + "/Build/IOS", "*.mobileprovision", SearchOption.AllDirectories))
 						{
 							if (!File.Exists(Environment.GetEnvironmentVariable("HOME") + "/Library/MobileDevice/Provisioning Profiles/" + Path.GetFileName(Provision)) || File.GetLastWriteTime(Environment.GetEnvironmentVariable("HOME") + "/Library/MobileDevice/Provisioning Profiles/" + Path.GetFileName(Provision)) < File.GetLastWriteTime(Provision))
 							{
@@ -981,17 +986,17 @@ namespace UnrealBuildTool
 				DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
 			}
 
-            // compile the launch .xib
-            // @todo tvos: Is this needed for IOS, but not TVOS?
-            //			string LaunchXib = InEngineDir + "/Build/IOS/Resources/Interface/LaunchScreen.xib";
-            //			if (File.Exists(BuildDirectory + "/Resources/Interface/LaunchScreen.xib"))
-            //			{
-            //				LaunchXib = BuildDirectory + "/Resources/Interface/LaunchScreen.xib";
-            //			}
+			// compile the launch .xib
+			// @todo tvos: Is this needed for IOS, but not TVOS?
+			//			string LaunchXib = InEngineDir + "/Build/IOS/Resources/Interface/LaunchScreen.xib";
+			//			if (File.Exists(BuildDirectory + "/Resources/Interface/LaunchScreen.xib"))
+			//			{
+			//				LaunchXib = BuildDirectory + "/Resources/Interface/LaunchScreen.xib";
+			//			}
 
-            bool bSupportsPortrait = true;
-            bool bSupportsLandscape = false;
-            bool bSkipIcons = false;
+			bool bSupportsPortrait = true;
+			bool bSupportsLandscape = false;
+			bool bSkipIcons = false;
 			bool bSkipDefaultPNGs = GeneratePList(ProjectFile, Config, InProjectDirectory, bIsUE4Game, GameExeName, InProjectName, InEngineDir, AppDirectory, BuildReceiptFileName, out bSupportsPortrait, out bSupportsLandscape, out bSkipIcons);
 
 			// ensure the destination is writable
@@ -1006,28 +1011,30 @@ namespace UnrealBuildTool
 
 			if (!bCreateStubIPA)
 			{
-                CopyGraphicsResources(bSkipDefaultPNGs, bSkipIcons, InEngineDir, AppDirectory, BuildDirectory, IntermediateDirectory, bSupportsPortrait, bSupportsLandscape);
+				CopyGraphicsResources(bSkipDefaultPNGs, bSkipIcons, InEngineDir, AppDirectory, BuildDirectory, IntermediateDirectory, bSupportsPortrait, bSupportsLandscape);
 				CopyLocalizationsResources(InEngineDir, AppDirectory, BuildDirectory, IntermediateDirectory);
 
-                // copy additional engine framework assets in
-                // @todo tvos: TVOS probably needs its own assets?
-                string FrameworkAssetsPath = InEngineDir + "/Intermediate/IOS/FrameworkAssets";
+				CopyCloudResources(InProjectDirectory, AppDirectory);
 
-                // Let project override assets if they exist
-                if (Directory.Exists(InProjectDirectory + "/Intermediate/IOS/FrameworkAssets"))
-                {
-                    FrameworkAssetsPath = InProjectDirectory + "/Intermediate/IOS/FrameworkAssets";
-                }
+				// copy additional engine framework assets in
+				// @todo tvos: TVOS probably needs its own assets?
+				string FrameworkAssetsPath = InEngineDir + "/Intermediate/IOS/FrameworkAssets";
 
-                if (Directory.Exists(FrameworkAssetsPath))
-                {
-                    CopyFolder(FrameworkAssetsPath, AppDirectory, true);
-                }
+				// Let project override assets if they exist
+				if (Directory.Exists(InProjectDirectory + "/Intermediate/IOS/FrameworkAssets"))
+				{
+					FrameworkAssetsPath = InProjectDirectory + "/Intermediate/IOS/FrameworkAssets";
+				}
 
-                Directory.CreateDirectory(CookedContentDirectory);
-            }
+				if (Directory.Exists(FrameworkAssetsPath))
+				{
+					CopyFolder(FrameworkAssetsPath, AppDirectory, true);
+				}
 
-            return true;
+				Directory.CreateDirectory(CookedContentDirectory);
+			}
+
+			return true;
 		}
 
 		public override bool PrepTargetForDeployment(UEBuildDeployTarget InTarget)
@@ -1039,7 +1046,7 @@ namespace UnrealBuildTool
 			string ProjectDirectory = InTarget.ProjectDirectory.FullName;
 			bool bIsUE4Game = GameName.Contains("UE4Game");
 
-Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.ProjectFile == null) ? "" : Path.GetFileNameWithoutExtension(InTarget.ProjectFile.FullName));
+			Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.ProjectFile == null) ? "" : Path.GetFileNameWithoutExtension(InTarget.ProjectFile.FullName));
 
 			string DecoratedGameName;
 			if (InTarget.Configuration == UnrealTargetConfiguration.Development)
@@ -1057,8 +1064,8 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 			}
 			else
 			{
-                // @todo tvos merge: This used to copy the bundle back - where did that code go? It needs to be fixed up for TVOS directories
-                bool bSupportPortrait, bSupportLandscape, bSkipIcons;
+				// @todo tvos merge: This used to copy the bundle back - where did that code go? It needs to be fixed up for TVOS directories
+				bool bSupportPortrait, bSupportLandscape, bSkipIcons;
 				GeneratePList(InTarget.ProjectFile, InTarget.Configuration, ProjectDirectory, bIsUE4Game, GameName, (InTarget.ProjectFile == null) ? "" : Path.GetFileNameWithoutExtension(InTarget.ProjectFile.FullName), "../../Engine", "", InTarget.BuildReceiptFileName, out bSupportPortrait, out bSupportLandscape, out bSkipIcons);
 			}
 			return true;
@@ -1076,7 +1083,7 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 
 			// collect plugin extra data paths from target receipt
 			IEnumerable<ReceiptProperty> Results = Receipt.AdditionalProperties.Where(x => x.Name == "IOSPlugin");
-			foreach (ReceiptProperty Property in Results)
+			foreach(ReceiptProperty Property in Results)
 			{
 				// Keep only unique paths
 				string PluginPath = Property.Value;
@@ -1099,7 +1106,7 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 			Ini.GetBool("/Script/IOSRuntimeSettings.IOSRuntimeSettings", "bEnableCloudKitSupport", out bCloudKitSupported);
 
 			Directory.CreateDirectory(Path.GetDirectoryName(OutputFilename));
-			// we need to have something so Xcode will compile, so we just set the get-task-allow, since we know the value, 
+			// we need to have something so Xcode will compile, so we just set the get-task-allow, since we know the value,
 			// which is based on distribution or not (true means debuggable)
 			StringBuilder Text = new StringBuilder();
 			Text.AppendLine("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -1174,10 +1181,10 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 		protected void CopyFiles(string SourceDirectory, string DestinationDirectory, string TargetFiles, bool bOverwrite = false)
 		{
 			DirectoryInfo SourceFolderInfo = new DirectoryInfo(SourceDirectory);
-			if(SourceFolderInfo.Exists)
+			if (SourceFolderInfo.Exists)
 			{
 				FileInfo[] SourceFiles = SourceFolderInfo.GetFiles(TargetFiles);
-				foreach (FileInfo SourceFile in SourceFiles)
+				foreach(FileInfo SourceFile in SourceFiles)
 				{
 					string DestinationPath = Path.Combine(DestinationDirectory, SourceFile.Name);
 					SafeFileCopy(SourceFile, DestinationPath, bOverwrite);
@@ -1193,7 +1200,7 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 
 		static private void RecursiveFolderCopy(DirectoryInfo SourceFolderInfo, DirectoryInfo DestFolderInfo, bool bOverwrite = false, FilenameFilter Filter = null)
 		{
-			foreach (FileInfo SourceFileInfo in SourceFolderInfo.GetFiles())
+			foreach(FileInfo SourceFileInfo in SourceFolderInfo.GetFiles())
 			{
 				string DestinationPath = Path.Combine(DestFolderInfo.FullName, SourceFileInfo.Name);
 				if (Filter != null && !Filter(DestinationPath))
@@ -1203,7 +1210,7 @@ Console.WriteLine("1 GameName: {0}, ProjectName: {1}", GameName, (InTarget.Proje
 				SafeFileCopy(SourceFileInfo, DestinationPath, bOverwrite);
 			}
 
-			foreach (DirectoryInfo SourceSubFolderInfo in SourceFolderInfo.GetDirectories())
+			foreach(DirectoryInfo SourceSubFolderInfo in SourceFolderInfo.GetDirectories())
 			{
 				string DestFolderName = Path.Combine(DestFolderInfo.FullName, SourceSubFolderInfo.Name);
 				Directory.CreateDirectory(DestFolderName);
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/UEBuildLinux.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/UEBuildLinux.cs
index 4ebd98eb5abf..c38a44ea019d 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/UEBuildLinux.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Linux/UEBuildLinux.cs
@@ -187,6 +187,12 @@ namespace UnrealBuildTool
 			return false;//BuildHostPlatform.Current.Platform == UnrealTargetPlatform.Linux;
 		}
 
+		public override bool CanUseParallelExecutor()
+		{
+			// No known problems with parallel executor, always use for build machines
+			return true;
+		}
+
 		/// <summary>
 		/// Determines if the given name is a build product for a target.
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Mac/MacToolChain.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Mac/MacToolChain.cs
index bbec5edbf222..7eaaf37ff95a 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Mac/MacToolChain.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Mac/MacToolChain.cs
@@ -1217,11 +1217,11 @@ namespace UnrealBuildTool
 					AppendMacLine(FinalizeAppBundleScript, FormatCopyCommand(InfoPlistFile, TempInfoPlist));
 
 					// Fix contents of Info.plist
-					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" \"s/\\${0}/{1}/g\" \"{2}\"", "{EXECUTABLE_NAME}", ExeName, TempInfoPlist);
-					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" \"s/\\${0}/{1}/g\" \"{2}\"", "{APP_NAME}", bBuildingEditor ? ("com.epicgames." + GameName) : (BundleIdentifier.Replace("[PROJECT_NAME]", GameName).Replace("_", "")), TempInfoPlist);
-					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" \"s/\\${0}/{1}/g\" \"{2}\"", "{MACOSX_DEPLOYMENT_TARGET}", Settings.MinMacOSVersion, TempInfoPlist);
-					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" \"s/\\${0}/{1}/g\" \"{2}\"", "{ICON_NAME}", GameName, TempInfoPlist);
-					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" \"s/\\${0}/{1}/g\" \"{2}\"", "{BUNDLE_VERSION}", BundleVersion, TempInfoPlist);
+					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" -e \"s/\\${0}/{1}/g\" \"{2}\"", "{EXECUTABLE_NAME}", ExeName, TempInfoPlist);
+					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" -e \"s/\\${0}/{1}/g\" \"{2}\"", "{APP_NAME}", bBuildingEditor ? ("com.epicgames." + GameName) : (BundleIdentifier.Replace("[PROJECT_NAME]", GameName).Replace("_", "")), TempInfoPlist);
+					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" -e \"s/\\${0}/{1}/g\" \"{2}\"", "{MACOSX_DEPLOYMENT_TARGET}", Settings.MinMacOSVersion, TempInfoPlist);
+					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" -e \"s/\\${0}/{1}/g\" \"{2}\"", "{ICON_NAME}", GameName, TempInfoPlist);
+					AppendMacLine(FinalizeAppBundleScript, "sed -i \"\" -e \"s/\\${0}/{1}/g\" \"{2}\"", "{BUNDLE_VERSION}", BundleVersion, TempInfoPlist);
 
 					// Copy it into place
 					AppendMacLine(FinalizeAppBundleScript, FormatCopyCommand(TempInfoPlist, String.Format("{0}.app/Contents/Info.plist", ExeName)));
diff --git a/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs
index 8b9a2a99a5ef..0f2641a0692b 100644
--- a/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs
@@ -136,6 +136,7 @@ namespace UnrealBuildTool
 		XCode,
 		Eddie,
 		VisualStudioCode,
+		VisualStudioMac,
 		CLion
 	}
 
diff --git a/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudio/VCProjectFileGenerator.cs b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudio/VCProjectFileGenerator.cs
index 32c44a6cf57c..2ea2c19a21e3 100644
--- a/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudio/VCProjectFileGenerator.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudio/VCProjectFileGenerator.cs
@@ -54,7 +54,13 @@ namespace UnrealBuildTool
 		/// The version of Visual Studio to generate project files for.
 		/// </summary>
 		[XmlConfigFile(Name = "Version")]
-		VCProjectFileFormat ProjectFileFormat = VCProjectFileFormat.Default;
+		protected VCProjectFileFormat ProjectFileFormat = VCProjectFileFormat.Default;
+
+		/// <summary>
+		/// Whether to write a solution option (suo) file for the sln
+		/// </summary>
+		[XmlConfigFile(Category = "BuildConfiguration")]
+		protected bool bWriteSolutionOptionFile = true;
 
 		/// <summary>
 		/// Whether to add the -FastPDB option to build command lines by default
@@ -958,7 +964,7 @@ namespace UnrealBuildTool
 
 
 			// Save a solution config file which selects the development editor configuration by default.
-			if (bSuccess)
+			if (bSuccess && bWriteSolutionOptionFile)
 			{
 				// Figure out the filename for the SUO file. VS will automatically import the options from earlier versions if necessary.
 				FileReference SolutionOptionsFileName;
diff --git a/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioMac/VisualStudioMacProjectFileGenerator.cs b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioMac/VisualStudioMacProjectFileGenerator.cs
new file mode 100644
index 000000000000..ec8ec241a042
--- /dev/null
+++ b/Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioMac/VisualStudioMacProjectFileGenerator.cs
@@ -0,0 +1,86 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using Tools.DotNETCommon;
+
+namespace UnrealBuildTool
+{
+    
+    /// <summary>
+    /// Visual Studio for Mac project file generator implementation
+    /// </summary>
+    class VCMacProjectFileGenerator : VCProjectFileGenerator
+    {
+       
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="InOnlyGameProject">The single project to generate project files for, or null</param>
+        /// <param name="InOverrideCompiler">Override the compiler version to use</param>
+        public VCMacProjectFileGenerator(FileReference InOnlyGameProject, WindowsCompiler InOverrideCompiler)
+			: base(InOnlyGameProject, VCProjectFileFormat.Default, InOverrideCompiler)
+        {
+            // no suo file, requires ole32
+            bWriteSolutionOptionFile = false;
+        }
+
+        /// True if we should include IntelliSense data in the generated project files when possible
+        override public bool ShouldGenerateIntelliSenseData()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Writes the project files to disk
+        /// </summary>
+        /// <returns>True if successful</returns>
+        protected override bool WriteProjectFiles()
+        {
+            // This can be reset by higher level code when it detects that we don't have
+            // VS2015 installed (TODO - add custom format for Mac?)
+            ProjectFileFormat = VCProjectFileFormat.VisualStudio2015;
+
+            // we can't generate native projects so clear them here, we will just
+            // write out OtherProjectFiles and AutomationProjectFiles
+            GeneratedProjectFiles.Clear();
+
+            if (!base.WriteProjectFiles())
+            {
+                return false;
+            }
+
+
+            // Write AutomationReferences file
+            if (AutomationProjectFiles.Any())
+            {
+                XNamespace NS = XNamespace.Get("http://schemas.microsoft.com/developer/msbuild/2003");
+
+                DirectoryReference AutomationToolDir = DirectoryReference.Combine(UnrealBuildTool.EngineSourceDirectory, "Programs", "AutomationTool");
+                new XDocument(
+                    new XElement(NS + "Project",
+                        new XAttribute("ToolsVersion", VCProjectFileGenerator.GetProjectFileToolVersionString(ProjectFileFormat)),
+                        new XAttribute("DefaultTargets", "Build"),
+                        new XElement(NS + "ItemGroup",
+                            from AutomationProject in AutomationProjectFiles
+                            select new XElement(NS + "ProjectReference",
+                                new XAttribute("Include", AutomationProject.ProjectFilePath.MakeRelativeTo(AutomationToolDir)),
+                                new XElement(NS + "Project", (AutomationProject as VCSharpProjectFile).ProjectGUID.ToString("B")),
+                                new XElement(NS + "Name", AutomationProject.ProjectFilePath.GetFileNameWithoutExtension()),
+                                new XElement(NS + "Private", "false")
+                            )
+                        )
+                    )
+                ).Save(FileReference.Combine(AutomationToolDir, "AutomationTool.csproj.References").FullName);
+            }
+
+            return true;
+        }
+
+    }
+
+}
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/ActionGraph.cs b/Engine/Source/Programs/UnrealBuildTool/System/ActionGraph.cs
index c8e4459c9ef0..30cf3e2519c5 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/ActionGraph.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/ActionGraph.cs
@@ -489,6 +489,10 @@ namespace UnrealBuildTool
 				{
 					Executor = new SNDBS();
 				}
+				else if(ParallelExecutor.IsAvailable() && BuildConfiguration.bAllowParallelExecutor)
+				{
+					Executor = new ParallelExecutor();
+				}
 				else
 				{
 					Executor = new LocalExecutor();
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/CommandLine.cs b/Engine/Source/Programs/UnrealBuildTool/System/CommandLine.cs
index af358df60150..eb1c8af4fe0e 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/CommandLine.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/CommandLine.cs
@@ -13,7 +13,7 @@ namespace UnrealBuildTool
 	/// <summary>
 	/// Functions for parsing command line arguments
 	/// </summary>
-	static class CommandLine
+	public static class CommandLine
 	{
 		/// <summary>
 		/// Stores information about the field to receive command line arguments
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/ModuleDescriptor.cs b/Engine/Source/Programs/UnrealBuildTool/System/ModuleDescriptor.cs
index a8e3ae0f5438..b0c6282cc078 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/ModuleDescriptor.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/ModuleDescriptor.cs
@@ -95,6 +95,11 @@ namespace UnrealBuildTool
 		/// </summary>
 		PostConfigInit,
 
+		/// <summary>
+		/// After PostConfigInit and before coreUobject initialized. used for early boot loading screens before the uobjects are initialized
+		/// </summary>
+		PreEarlyLoadingScreen,
+
 		/// <summary>
 		/// Loaded before the engine is fully initialized for modules that need to hook into the loading screen before it triggers
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/ParallelExecutor.cs b/Engine/Source/Programs/UnrealBuildTool/System/ParallelExecutor.cs
new file mode 100644
index 000000000000..f9ff5a3bb920
--- /dev/null
+++ b/Engine/Source/Programs/UnrealBuildTool/System/ParallelExecutor.cs
@@ -0,0 +1,277 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Tools.DotNETCommon;
+
+namespace UnrealBuildTool
+{
+	/// <summary>
+	/// This executor is similar to LocalExecutor, but uses p/invoke on Windows to ensure that child processes are started at a lower priority and are terminated when the parent process terminates.
+	/// </summary>
+	class ParallelExecutor : ActionExecutor
+	{
+		[DebuggerDisplay("{Caption}")]
+		class BuildAction
+		{
+			public int SortIndex;
+			public Action Inner;
+
+			public HashSet<BuildAction> Dependencies = new HashSet<BuildAction>();
+			public int MissingDependencyCount;
+
+			public HashSet<BuildAction> Dependants = new HashSet<BuildAction>();
+			public int TotalDependantCount;
+
+			public List<string> LogLines = new List<string>();
+			public int ExitCode = -1;
+		}
+
+		/// <summary>
+		/// Processor count multiplier for local execution. Can be below 1 to reserve CPU for other tasks.
+		/// </summary>
+		[XmlConfigFile(Category = "BuildConfiguration")]
+		double ProcessorCountMultiplier = 1.0;
+
+		/// <summary>
+		/// Maximum processor count for local execution. 
+		/// </summary>
+		[XmlConfigFile(Category = "BuildConfiguration")]
+		int MaxProcessorCount = int.MaxValue;
+
+		/// <summary>
+		/// When enabled, will stop compiling targets after a compile error occurs.
+		/// </summary>
+		[XmlConfigFile(Category = "BuildConfiguration")]
+		bool bStopCompilationAfterErrors = false;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public ParallelExecutor()
+		{
+			XmlConfig.ApplyTo(this);
+		}
+
+		/// <summary>
+		/// Returns the name of this executor
+		/// </summary>
+		public override string Name
+		{
+			get { return "Parallel"; }
+		}
+
+		/// <summary>
+		/// Checks whether the parallel executor can be used
+		/// </summary>
+		/// <returns>True if the parallel executor can be used</returns>
+		public static bool IsAvailable()
+		{
+			return Environment.OSVersion.Platform == PlatformID.Win32NT;
+		}
+
+		/// <summary>
+		/// Executes the specified actions locally.
+		/// </summary>
+		/// <returns>True if all the tasks successfully executed, or false if any of them failed.</returns>
+		public override bool ExecuteActions(List<Action> InputActions, bool bLogDetailedActionStats)
+		{
+			// Figure out how many processors to use
+			int MaxProcesses = Math.Min((int)(Environment.ProcessorCount * ProcessorCountMultiplier), MaxProcessorCount);
+			Log.TraceInformation("Building with {0} {1}...", MaxProcesses, (MaxProcesses == 1)? "process" : "processes");
+
+			// Create actions with all our internal metadata
+			List<BuildAction> Actions = new List<BuildAction>();
+			for(int Idx = 0; Idx < InputActions.Count; Idx++)
+			{
+				BuildAction Action = new BuildAction();
+				Action.SortIndex = Idx;
+				Action.Inner = InputActions[Idx];
+				Actions.Add(Action);
+			}
+
+			// Build a map of items to their producing actions
+			Dictionary<FileItem, BuildAction> FileToProducingAction = new Dictionary<FileItem, BuildAction>();
+			foreach(BuildAction Action in Actions)
+			{
+				foreach(FileItem ProducedItem in Action.Inner.ProducedItems)
+				{
+					FileToProducingAction[ProducedItem] = Action;
+				}
+			}
+
+			// Update all the actions with all their dependencies
+			foreach(BuildAction Action in Actions)
+			{
+				foreach(FileItem PrerequisiteItem in Action.Inner.PrerequisiteItems)
+				{
+					BuildAction Dependency;
+					if(FileToProducingAction.TryGetValue(PrerequisiteItem, out Dependency))
+					{
+						Action.Dependencies.Add(Dependency);
+						Dependency.Dependants.Add(Action);
+					}
+				}
+			}
+
+			// Figure out the recursive dependency count
+			HashSet<BuildAction> VisitedActions = new HashSet<BuildAction>();
+			foreach(BuildAction Action in Actions)
+			{
+				Action.MissingDependencyCount = Action.Dependencies.Count;
+				RecursiveIncDependents(Action, VisitedActions);
+			}
+
+			// Create the list of things to process
+			List<BuildAction> QueuedActions = new List<BuildAction>();
+			foreach(BuildAction Action in Actions)
+			{
+				if(Action.MissingDependencyCount == 0)
+				{
+					QueuedActions.Add(Action);
+				}
+			}
+
+			// Execute the actions
+			using (ScopedLogIndent Indent = new ScopedLogIndent("  "))
+			{
+				// Create a job object for all the child processes
+				bool bResult = true;
+				Dictionary<BuildAction, Thread> ExecutingActions = new Dictionary<BuildAction,Thread>();
+				List<BuildAction> CompletedActions = new List<BuildAction>();
+
+				using(AutoResetEvent CompletedEvent = new AutoResetEvent(false))
+				{
+					int NumCompletedActions = 0;
+					using (ProgressWriter ProgressWriter = new ProgressWriter("Compiling C++ source code...", false))
+					{
+						while(QueuedActions.Count > 0 || ExecutingActions.Count > 0)
+						{
+							// Sort the actions by the number of things dependent on them
+							QueuedActions.Sort((A, B) => (A.TotalDependantCount == B.TotalDependantCount)? (B.SortIndex - A.SortIndex) : (B.TotalDependantCount - A.TotalDependantCount));
+
+							// Create threads up to the maximum number of actions
+							while(ExecutingActions.Count < MaxProcesses && QueuedActions.Count > 0)
+							{
+								BuildAction Action = QueuedActions[QueuedActions.Count - 1];
+								QueuedActions.RemoveAt(QueuedActions.Count - 1);
+
+								Thread ExecutingThread = new Thread(() => { ExecuteAction(Action, CompletedActions, CompletedEvent); });
+								ExecutingThread.Name = String.Format("Build:{0}", Action.Inner.StatusDescription);
+								ExecutingThread.Start();
+
+								ExecutingActions.Add(Action, ExecutingThread);
+							}
+
+							// Wait for something to finish
+							CompletedEvent.WaitOne();
+
+							// Wait for something to finish and flush it to the log
+							lock(CompletedActions)
+							{
+								foreach(BuildAction CompletedAction in CompletedActions)
+								{
+									// Join the thread
+									Thread CompletedThread = ExecutingActions[CompletedAction];
+									CompletedThread.Join();
+									ExecutingActions.Remove(CompletedAction);
+
+									// Write it to the log
+									if(CompletedAction.LogLines.Count > 0)
+									{
+										foreach(string LogLine in CompletedAction.LogLines)
+										{
+											Log.TraceInformation(LogLine);
+										}
+									}
+
+									// Update the progress
+									NumCompletedActions++;
+									ProgressWriter.Write(NumCompletedActions, InputActions.Count);
+
+									// Check the exit code
+									if(CompletedAction.ExitCode == 0)
+									{
+										// Mark all the dependents as done
+										foreach(BuildAction DependantAction in CompletedAction.Dependants)
+										{
+											if(--DependantAction.MissingDependencyCount == 0)
+											{
+												QueuedActions.Add(DependantAction);
+											}
+										}
+									}
+									else
+									{
+										// Update the exit code if it's not already set
+										if(bResult && CompletedAction.ExitCode != 0)
+										{
+											bResult = false;
+										}
+									}
+								}
+								CompletedActions.Clear();
+							}
+
+							// If we've already got a non-zero exit code, clear out the list of queued actions so nothing else will run
+							if(!bResult && bStopCompilationAfterErrors)
+							{
+								QueuedActions.Clear();
+							}
+						}
+					}
+				}
+
+				return bResult;
+			}
+		}
+
+		/// <summary>
+		/// Execute an individual action
+		/// </summary>
+		/// <param name="Action">The action to execute</param>
+		/// <param name="CompletedActions">On completion, the list to add the completed action to</param>
+		/// <param name="CompletedEvent">Event to set once an event is complete</param>
+		static void ExecuteAction(BuildAction Action, List<BuildAction> CompletedActions, AutoResetEvent CompletedEvent)
+		{
+			if (Action.Inner.bShouldOutputStatusDescription && !String.IsNullOrEmpty(Action.Inner.StatusDescription))
+			{
+				Action.LogLines.Add(Action.Inner.StatusDescription);
+			}
+
+			using(ManagedProcess Process = new ManagedProcess(Action.Inner.CommandPath, Action.Inner.CommandArguments, Action.Inner.WorkingDirectory, null, null, ManagedProcessPriority.BelowNormal))
+			{
+				Action.LogLines.AddRange(Process.ReadAllLines());
+				Action.ExitCode = Process.ExitCode;
+			}
+
+			lock(CompletedActions)
+			{
+				CompletedActions.Add(Action);
+			}
+
+			CompletedEvent.Set();
+		}
+
+		/// <summary>
+		/// Increment the number of dependants of an action, recursively
+		/// </summary>
+		/// <param name="Action">The action to update</param>
+		/// <param name="VisitedActions">Set of visited actions</param>
+		private static void RecursiveIncDependents(BuildAction Action, HashSet<BuildAction> VisitedActions)
+		{
+			foreach(BuildAction Dependency in Action.Dependants)
+			{
+				if(!VisitedActions.Contains(Action))
+				{
+					VisitedActions.Add(Action);
+					Dependency.TotalDependantCount++;
+					RecursiveIncDependents(Dependency, VisitedActions);
+				}
+			}
+		}
+	}
+}
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/PlatformExports.cs b/Engine/Source/Programs/UnrealBuildTool/System/PlatformExports.cs
index 924edf8a35f8..68b0ff290e69 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/PlatformExports.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/PlatformExports.cs
@@ -97,6 +97,16 @@ namespace UnrealBuildTool
 			return UEBuildPlatform.IsPlatformAvailable(Platform) && UEBuildPlatform.GetBuildPlatform(Platform).CanUseXGE();
 		}
 
+		/// <summary>
+		/// Check whether the given platform supports the parallel executor in UAT
+		/// </summary>
+		/// <param name="Platform">Platform to check</param>
+		/// <returns>True if the platform supports the parallel executor in UAT</returns>
+		public static bool CanUseParallelExecutor(UnrealTargetPlatform Platform)
+		{
+			return UEBuildPlatform.IsPlatformAvailable(Platform) && UEBuildPlatform.GetBuildPlatform(Platform).CanUseParallelExecutor();
+		}
+
 		/// <summary>
 		///
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/TargetReceipt.cs b/Engine/Source/Programs/UnrealBuildTool/System/TargetReceipt.cs
index b4bab8001649..e4939dad9315 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/TargetReceipt.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/TargetReceipt.cs
@@ -461,6 +461,19 @@ namespace UnrealBuildTool
 			}
 		}
 
+		/// <summary>
+		/// Determine whether a BuildProduct Type is NonUFS or DebugNonUFS
+		/// </summary>
+		/// <param name="BuildProduct">The build product to check</param>
+		public static StagedFileType GetStageTypeFromBuildProductType(BuildProduct BuildProduct)
+		{
+			if (BuildProduct.Type == BuildProductType.SymbolFile || BuildProduct.Type == BuildProductType.MapFile)
+			{
+				return StagedFileType.DebugNonUFS;
+			}
+			return StagedFileType.NonUFS;
+		}
+
 		/// <summary>
 		/// Read a receipt from disk.
 		/// </summary>
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/UnrealPluginLanguage.cs b/Engine/Source/Programs/UnrealBuildTool/System/UnrealPluginLanguage.cs
index 498c85cec92f..9572d3e5f20f 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/UnrealPluginLanguage.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/UnrealPluginLanguage.cs
@@ -12,7 +12,7 @@ using Tools.DotNETCommon;
 
 namespace UnrealBuildTool
 {
-    /* UnrealPluginLanguage (UPL) is a simple XML-based language for manipulating XML and returning
+	/* UnrealPluginLanguage (UPL) is a simple XML-based language for manipulating XML and returning
 	 * strings.  It contains an <init> section which is evaluated once per architecture before any
 	 * other sections.  The state is maintained and carried forward to the next section evaluated
 	 * so the order the sections are executed matters.
@@ -189,7 +189,7 @@ namespace UnrealBuildTool
 	 *	
 	 * is the equivalent of:
 	 * 
-	 *	<if condition="$B(Distribution)">
+	 *	<if condition="Distribution">
 	 *		<!-- do stuff -->
 	 *	</if>
 	 * 
@@ -274,8 +274,9 @@ namespace UnrealBuildTool
 	 *	<addElement tag="" name=""/>
 	 *	<addElements tag=""> body </addElements>
 	 *	<removeElement tag=""/>
-	 *	<setStringFromTag result="" tag="" name=""/>
+	 *	<setStringFromTag result="" tag=""/>
 	 *	<setStringFromAttribute result="" tag="" name=""/>
+	 *	<setStringFromTagText result="" tag=""/>
 	 *	<addAttribute tag="" name="" value=""/>
 	 *	<removeAttribute tag="" name=""/>
 	 *	<loopElements tag=""> instructions </loopElements>
@@ -299,8 +300,10 @@ namespace UnrealBuildTool
 	 *	
 	 * Finally, these nodes allow copying of files useful for staging jar and so files:
 	 * 
-	 *	<copyFile src="" dst=""/>
-	 *	<copyDir src="" dst=""/>
+	 *	<copyFile src="" dst="" force=""/>
+	 *	<copyDir src="" dst="" force=""/>
+	 *
+	 * If force is false the file(s) are replaced only if length or timestamp don't match.  Default is true.
 	 *	
 	 * The following should be used as the base for the src and dst paths:
 	 * 
@@ -339,6 +342,9 @@ namespace UnrealBuildTool
 	 * 	<!-- optional base build.gradle additions -->
 	 * 	<baseBuildGradleAdditions>  </baseBuildGradleAdditions>
 	 *
+	 *	<!-- optional base build.gradle buildscript additions -->
+	 *	<buildscriptGradleAdditions>  </buildscriptGradleAdditions>
+	 *	
 	 * 	<!-- optional app build.gradle additions -->
 	 * 	<buildGradleAdditions>  </buildGradleAdditions>
 	 * 	
@@ -351,6 +357,18 @@ namespace UnrealBuildTool
 	 * 	<!-- optional files or directories to copy or delete from Intermediate/Android/APK after ndk-build -->
 	 * 	<resourceCopies> </resourceCopies>
 	 * 	
+	 * 	<!-- optional files or directories to copy or delete from Intermediate/Android/APK before Gradle -->
+	 * 	<gradleCopies> </gradleCopies>
+	 * 	
+	 * 	<!-- optional properties to add to gradle.properties -->
+	 * 	<gradleProperties> </gradleProperties>
+	 *
+ 	 * 	<!-- optional parameters to add to Gradle commandline (prefix with a space or will run into previous parameter(s)) -->
+	 * 	<gradleParameters> </gradleParameters>
+	 *
+	 *  <!-- optional minimum SDK API level required -->
+	 *  <minimumSDKAPI> </minimumSDKAPI>
+	 * 	
 	 * 	<!-- optional additions to the GameActivity imports in GameActivity.java -->
 	 * 	<gameActivityImportAdditions> </gameActivityImportAdditions>
 	 *
@@ -439,7 +457,7 @@ namespace UnrealBuildTool
 	 * 
 	 */
 
-    class UnrealPluginLanguage
+	class UnrealPluginLanguage
 	{
 		/** The merged XML program to run */
 		private XDocument XDoc;
@@ -476,8 +494,14 @@ namespace UnrealBuildTool
 				StringVariables = new Dictionary<string, string>();
 				ElementVariables = new Dictionary<string, XElement>();
 
+				if (PluginDir == null || PluginDir == "")
+				{
+					PluginDir = ".";
+				}
+				StringVariables["PluginDir"] = PluginDir.Replace("\\", "/");
+				StringVariables["AbsPluginDir"] = Path.GetFullPath(PluginDir).Replace("\\", "/");
+
 				StringVariables["Architecture"] = Architecture;
-				StringVariables["PluginDir"] = PluginDir;
 
 				bTrace = false;
 			}
@@ -505,7 +529,7 @@ namespace UnrealBuildTool
 			foreach (string Basename in InXMLFiles)
 			{
 				string Filename = Path.Combine(PathPrefix, Basename.Replace("\\", "/"));
-				Log.TraceInformation("\nUPL: {0}", Filename);
+				Log.TraceInformation("UPL: {0}", Filename);
 				if (File.Exists(Filename))
 				{
 					string PluginDir = Path.GetDirectoryName(Filename);
@@ -816,7 +840,41 @@ namespace UnrealBuildTool
 			return config;
 		}
 
-		private static void CopyFileDirectory(string SourceDir, string DestDir)
+		private static bool FilesAreDifferent(string SourceFilename, string DestFilename)
+		{
+			// source must exist
+			FileInfo SourceInfo = new FileInfo(SourceFilename);
+			if (!SourceInfo.Exists)
+			{
+				Log.TraceInformation("File {0} does not exist", SourceFilename);
+				return false;
+			}
+
+			// different if destination doesn't exist
+			FileInfo DestInfo = new FileInfo(DestFilename);
+			if (!DestInfo.Exists)
+			{
+				return true;
+			}
+
+			// file lengths differ?
+			if (SourceInfo.Length != DestInfo.Length)
+			{
+				return true;
+			}
+
+			// validate timestamps
+			TimeSpan Diff = DestInfo.LastWriteTimeUtc - SourceInfo.LastWriteTimeUtc;
+			if (Diff.TotalSeconds < -1 || Diff.TotalSeconds > 1)
+			{
+				return true;
+			}
+
+			// could check actual bytes just to be sure, but good enough
+			return false;
+		}
+
+		private static void CopyFileDirectory(string SourceDir, string DestDir, bool bForce = false)
 		{
 			if (!Directory.Exists(SourceDir))
 			{
@@ -828,23 +886,29 @@ namespace UnrealBuildTool
 			{
 				// make the dst filename with the same structure as it was in SourceDir
 				string DestFilename = Path.Combine(DestDir, Utils.MakePathRelativeTo(Filename, SourceDir));
-				if (File.Exists(DestFilename))
+
+				if (bForce || FilesAreDifferent(Filename, DestFilename))
 				{
-					File.Delete(DestFilename);
+					if (File.Exists(DestFilename))
+					{
+						File.SetAttributes(DestFilename, FileAttributes.Normal);
+						File.Delete(DestFilename);
+					}
+
+					// make the subdirectory if needed
+					string DestSubdir = Path.GetDirectoryName(DestFilename);
+					if (!Directory.Exists(DestSubdir))
+					{
+						Directory.CreateDirectory(DestSubdir);
+					}
+
+					File.Copy(Filename, DestFilename);
+
+					// remove any read only flags and keep timestamp
+					FileInfo DestFileInfo = new FileInfo(DestFilename);
+					DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
+					File.SetLastWriteTimeUtc(DestFilename, File.GetLastWriteTimeUtc(Filename));
 				}
-
-				// make the subdirectory if needed
-				string DestSubdir = Path.GetDirectoryName(DestFilename);
-				if (!Directory.Exists(DestSubdir))
-				{
-					Directory.CreateDirectory(DestSubdir);
-				}
-
-				File.Copy(Filename, DestFilename);
-
-				// remove any read only flags
-				FileInfo DestFileInfo = new FileInfo(DestFilename);
-				DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
 			}
 		}
 
@@ -861,6 +925,7 @@ namespace UnrealBuildTool
 			string[] Files = Directory.GetFiles(BaseDir, Mask, SearchOption.TopDirectoryOnly);
 			foreach (string Filename in Files)
 			{
+				File.SetAttributes(Filename, FileAttributes.Normal);
 				File.Delete(Filename);
 				Log.TraceInformation("\nDeleted file {0}", Filename);
 			}
@@ -1612,28 +1677,33 @@ namespace UnrealBuildTool
 						{
 							string Src = GetAttribute(CurrentContext, Node, "src");
 							string Dst = GetAttribute(CurrentContext, Node, "dst");
+							bool bForce = StringToBool(GetAttribute(CurrentContext, Node, "once", true, false, "true"));
 							if (Src != null && Dst != null)
 							{
 								if (File.Exists(Src))
 								{
 									// check to see if newer than last time we copied
-									bool bFileExists = File.Exists(Dst);
-									TimeSpan Diff = File.GetLastWriteTimeUtc(Dst) - File.GetLastWriteTimeUtc(Src);
-									if (!bFileExists || Diff.TotalSeconds < -1 || Diff.TotalSeconds > 1)
+									if (bForce || FilesAreDifferent(Src, Dst))
 									{
-										if (bFileExists)
+										if (File.Exists(Dst))
 										{
+											File.SetAttributes(Dst, FileAttributes.Normal);
 											File.Delete(Dst);
 										}
 										Directory.CreateDirectory(Path.GetDirectoryName(Dst));
 										File.Copy(Src, Dst, true);
 										Log.TraceInformation("\nFile {0} copied to {1}", Src, Dst);
 
-										// remove any read only flags
+										// remove any read only flags and keep timestamp
 										FileInfo DestFileInfo = new FileInfo(Dst);
 										DestFileInfo.Attributes = DestFileInfo.Attributes & ~FileAttributes.ReadOnly;
+										File.SetLastWriteTimeUtc(Dst, File.GetLastWriteTimeUtc(Src));
 									}
 								}
+								else
+								{
+									Log.TraceInformation("\nFile {0} does not exist, not copied!", Src);
+								}
 							}
 						}
 						break;
@@ -1642,10 +1712,11 @@ namespace UnrealBuildTool
 						{
 							string Src = GetAttribute(CurrentContext, Node, "src");
 							string Dst = GetAttribute(CurrentContext, Node, "dst");
+							bool bForce = StringToBool(GetAttribute(CurrentContext, Node, "once", true, false, "true"));
 							if (Src != null && Dst != null)
 							{
-								CopyFileDirectory(Src, Dst);
-								Log.TraceInformation("\nDirectory {0} copied to {1}", Src, Dst);
+								CopyFileDirectory(Src, Dst, bForce);
+								Log.TraceInformation("\nDirectory {0} copied to {1}", Src, Dst, bForce);
 							}
 						}
 						break;
@@ -2143,6 +2214,39 @@ namespace UnrealBuildTool
 						}
 						break;
 
+					case "setStringFromTagText":
+						{
+							string Result = GetAttribute(CurrentContext, Node, "result");
+							string Tag = GetAttribute(CurrentContext, Node, "tag", true, false, "$");
+							if (Result != null)
+							{
+								XElement Element = CurrentElement;
+								if (Tag.StartsWith("$"))
+								{
+									if (Tag.Length > 1)
+									{
+										if (!CurrentContext.ElementVariables.TryGetValue(Tag.Substring(1), out Element))
+										{
+											if (!GlobalContext.ElementVariables.TryGetValue(Tag.Substring(1), out Element))
+											{
+												Log.TraceWarning("\nMissing element variable '{0}' in '{1}' (skipping instruction)", Tag, TraceNodeString(Node));
+												continue;
+											}
+										}
+									}
+								}
+
+								if (Element.Value == null)
+								{
+									Log.TraceWarning("\nExpected text in element '{0}' in '{1}' but found none (skipping instruction)", Element.Name.ToString(), TraceNodeString(Node));
+									continue;
+								}
+
+								CurrentContext.StringVariables[Result] = Element.Value;
+							}
+						}
+						break;
+
 					case "setStringFromProperty":
 						{
 							string Result = GetAttribute(CurrentContext, Node, "result");
@@ -2286,11 +2390,29 @@ namespace UnrealBuildTool
 		public void Init(List<string> Architectures, bool bDistribution, string EngineDirectory, string BuildDirectory, string ProjectDirectory, string Configuration)
 		{
 			GlobalContext.BoolVariables["Distribution"] = bDistribution;
-			GlobalContext.StringVariables["EngineDir"] = EngineDirectory;
-			GlobalContext.StringVariables["BuildDir"] = BuildDirectory;
-			GlobalContext.StringVariables["ProjectDir"] = ProjectDirectory;
 			GlobalContext.StringVariables["Configuration"] = Configuration;
 
+			GlobalContext.StringVariables["EngineDir"] = EngineDirectory.Replace("\\", "/");
+			GlobalContext.StringVariables["BuildDir"] = BuildDirectory.Replace("\\", "/");
+			GlobalContext.StringVariables["ProjectDir"] = ProjectDirectory.Replace("\\", "/");
+
+			if (GlobalContext.StringVariables["EngineDir"].Length < 1)
+			{
+				GlobalContext.StringVariables["EngineDir"] = "./";
+			}
+			if (GlobalContext.StringVariables["BuildDir"].Length < 1)
+			{
+				GlobalContext.StringVariables["BuildDir"] = "./";
+			}
+			if (GlobalContext.StringVariables["ProjectDir"].Length < 1)
+			{
+				GlobalContext.StringVariables["ProjectDir"] = "./";
+			}
+
+			GlobalContext.StringVariables["AbsEngineDir"] = Path.GetFullPath(GlobalContext.StringVariables["EngineDir"]).Replace("\\", "/");
+			GlobalContext.StringVariables["AbsBuildDir"] = Path.GetFullPath(GlobalContext.StringVariables["BuildDir"]).Replace("\\", "/");
+			GlobalContext.StringVariables["AbsProjectDir"] = Path.GetFullPath(GlobalContext.StringVariables["ProjectDir"]).Replace("\\", "/");
+
 			foreach (string Arch in Architectures)
 			{
 				Log.TraceInformation("UPL Init: {0}", Arch);
diff --git a/Engine/Source/Programs/UnrealBuildTool/System/XmlConfig.cs b/Engine/Source/Programs/UnrealBuildTool/System/XmlConfig.cs
index e7d05ef9a7f7..08392618fb07 100644
--- a/Engine/Source/Programs/UnrealBuildTool/System/XmlConfig.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/System/XmlConfig.cs
@@ -87,6 +87,8 @@ namespace UnrealBuildTool
 				{
 					if(!TryReadFile(InputFile, CategoryToFields, TypeToValues, Schema))
 					{
+						Log.TraceError("Failed to properly read XML file : {0}", InputFile.FullName);
+
 						return false;
 					}
 				}
diff --git a/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.cs b/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.cs
index b69f998e1f0c..145964207824 100644
--- a/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.cs
@@ -734,6 +734,11 @@ namespace UnrealBuildTool
 							bGenerateProjectFiles = true;
 							ProjectFileFormats.Add(ProjectFileFormat.VisualStudioCode);
 						}
+						else if (LowercaseArg == "-vsmac")
+						{
+							bGenerateProjectFiles = true;
+							ProjectFileFormats.Add(ProjectFileFormat.VisualStudioMac);
+						}
 						else if (LowercaseArg == "-clion")
 						{
 							bGenerateProjectFiles = true;
@@ -881,9 +886,6 @@ namespace UnrealBuildTool
 								case ProjectFileFormat.VisualStudioCode:
 									Generator = new VSCodeProjectFileGenerator(ProjectFile);
 									break;
-								case ProjectFileFormat.CLion:
-									Generator = new CLionGenerator(ProjectFile);
-									break;
 								default:
 									throw new BuildException("Unhandled project file type '{0}", ProjectFileFormat);
 							}
diff --git a/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj b/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj
index f147a6962a53..792fdb8223ea 100644
--- a/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj
+++ b/Engine/Source/Programs/UnrealBuildTool/UnrealBuildTool.csproj
@@ -169,6 +169,7 @@
     <Compile Include="System\BuildVersion.cs" />
     <Compile Include="System\CppCompileEnvironment.cs" />
     <Compile Include="System\DataDrivenPlatformInfo.cs" />
+    <Compile Include="System\ParallelExecutor.cs" />
     <Compile Include="System\ModuleManifest.cs" />
     <Compile Include="System\PluginReferenceDescriptor.cs" />
     <Compile Include="System\PrecompiledManifest.cs" />
@@ -210,6 +211,7 @@
     <Compile Include="System\XmlConfigFile.cs" />
     <Compile Include="System\XmlConfigFileAttribute.cs" />
     <Compile Include="System\UnrealPluginLanguage.cs" />
+    <Compile Include="ProjectFiles\VisualStudioMac\VisualStudioMacProjectFileGenerator.cs" />
   </ItemGroup>
   <Choose>
     <When Condition="Exists('Platform\TVOS\UEBuildTVOS.cs')">
@@ -407,4 +409,7 @@
       <Name>DotNETUtilities</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ProjectFiles\VisualStudioMac\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Engine/Source/Programs/UnrealFrontend/Private/Commands/StatsConvertCommand.cpp b/Engine/Source/Programs/UnrealFrontend/Private/Commands/StatsConvertCommand.cpp
index b8b723af00a8..e8695bacb092 100644
--- a/Engine/Source/Programs/UnrealFrontend/Private/Commands/StatsConvertCommand.cpp
+++ b/Engine/Source/Programs/UnrealFrontend/Private/Commands/StatsConvertCommand.cpp
@@ -89,18 +89,18 @@ void FCSVStatsProfiler::ReadStatsFrame( const TArray<FStatMessage>& CondensedMes
 				FString StatValue;
 				if (StatMessage.NameAndInfo.GetFlag( EStatMetaFlags::IsPackedCCAndDuration ))
 				{
-					StatValue = Lex::ToString(MillisecondsPerCycle * FromPackedCallCountDuration_Duration( StatMessage.GetValue_int64() ));
+					StatValue = LexToString(MillisecondsPerCycle * FromPackedCallCountDuration_Duration( StatMessage.GetValue_int64() ));
 				}
 				else if (StatMessage.NameAndInfo.GetFlag( EStatMetaFlags::IsCycle ))
 				{
-					StatValue = Lex::ToString(MillisecondsPerCycle * StatMessage.GetValue_int64());
+					StatValue = LexToString(MillisecondsPerCycle * StatMessage.GetValue_int64());
 				}
 				else
 				{
 					switch (StatMessage.NameAndInfo.GetField<EStatDataType>())
 					{
-					case EStatDataType::ST_double: StatValue = Lex::ToString(StatMessage.GetValue_double()); break;
-					case EStatDataType::ST_int64: StatValue = Lex::ToString(StatMessage.GetValue_int64()); break;
+					case EStatDataType::ST_double: StatValue = LexToString(StatMessage.GetValue_double()); break;
+					case EStatDataType::ST_int64: StatValue = LexToString(StatMessage.GetValue_int64()); break;
 					case EStatDataType::ST_FName: StatValue = StatMessage.GetValue_FName().ToString(); break;
 					default: StatValue = TEXT("<unknown type>");
 					}
diff --git a/Engine/Source/Programs/UnrealFrontend/Private/Commands/UserInterfaceCommand.cpp b/Engine/Source/Programs/UnrealFrontend/Private/Commands/UserInterfaceCommand.cpp
index ffc2997d6bf5..18423a58e561 100644
--- a/Engine/Source/Programs/UnrealFrontend/Private/Commands/UserInterfaceCommand.cpp
+++ b/Engine/Source/Programs/UnrealFrontend/Private/Commands/UserInterfaceCommand.cpp
@@ -15,6 +15,7 @@
 #include "Framework/Application/SlateApplication.h"
 #include "HAL/PlatformProcess.h"
 #include "HAL/PlatformApplicationMisc.h"
+#include "OutputLog/Public/OutputLogModule.h"
 
 #define IDEAL_FRAMERATE 60;
 
@@ -38,6 +39,7 @@ void FUserInterfaceCommand::Run(  )
 	// load required modules
 	FModuleManager::Get().LoadModuleChecked("EditorStyle");
 	FModuleManager::Get().LoadModuleChecked("Messaging");
+	FModuleManager::Get().LoadModuleChecked("OutputLog");
 
 	IAutomationControllerModule& AutomationControllerModule = FModuleManager::LoadModuleChecked<IAutomationControllerModule>("AutomationController");
 	AutomationControllerModule.Init();
@@ -114,8 +116,9 @@ void FUserInterfaceCommand::InitializeSlateApplication( const FString& LayoutIni
 
 	if (bAllowDebugTools)
 	{
-		ISlateReflectorModule* SlateReflectorModule = FModuleManager::GetModulePtr<ISlateReflectorModule>("SlateReflector");
-
+		static const FName SlateReflectorModuleName("SlateReflector");
+		FModuleManager::LoadModuleChecked<ISlateReflectorModule>(SlateReflectorModuleName);
+		ISlateReflectorModule* SlateReflectorModule = FModuleManager::GetModulePtr<ISlateReflectorModule>(SlateReflectorModuleName);
 		if (SlateReflectorModule != nullptr)
 		{
 			SlateReflectorModule->RegisterTabSpawner(UserInterfaceCommand::DeveloperTools);
@@ -125,13 +128,14 @@ void FUserInterfaceCommand::InitializeSlateApplication( const FString& LayoutIni
 	const float DPIScaleFactor = FPlatformApplicationMisc::GetDPIScaleFactorAtPoint(10.0f, 10.0f);
 
 	// restore application layout
-	TSharedRef<FTabManager::FLayout> NewLayout = FTabManager::NewLayout("SessionFrontendLayout_v1.1")
+	TSharedRef<FTabManager::FLayout> NewLayout = FTabManager::NewLayout("SessionFrontendLayout_v1.2")
 		->AddArea
 		(
 			FTabManager::NewArea(1280.f * DPIScaleFactor, 720.0f * DPIScaleFactor)
 				->Split
 				(
 					FTabManager::NewStack()
+						->AddTab(FName("DeviceOutputLog"), ETabState::OpenedTab)
 						->AddTab(FName("DeviceManager"), ETabState::OpenedTab)
 						->AddTab(FName("MessagingDebugger"), ETabState::ClosedTab)
 						->AddTab(FName("SessionFrontend"), ETabState::OpenedTab)
diff --git a/Engine/Source/Programs/UnrealFrontend/UnrealFrontend.Build.cs b/Engine/Source/Programs/UnrealFrontend/UnrealFrontend.Build.cs
index 10f34e4f63df..004b71961e53 100644
--- a/Engine/Source/Programs/UnrealFrontend/UnrealFrontend.Build.cs
+++ b/Engine/Source/Programs/UnrealFrontend/UnrealFrontend.Build.cs
@@ -25,6 +25,7 @@ public class UnrealFrontend : ModuleRules
 				"DeviceManager",
 				"LauncherServices",
 				"Messaging",
+                "OutputLog",
 				"Profiler",
 				"ProfilerClient",
                 "ProjectLauncher",
@@ -48,7 +49,7 @@ public class UnrealFrontend : ModuleRules
 
 		DynamicallyLoadedModuleNames.AddRange(
 			new string[] {
-				"SlateReflector",
+				"SlateReflector"
 			}
 		);
 
diff --git a/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp b/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
index 2356e719f979..a12deeb70907 100644
--- a/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
+++ b/Engine/Source/Programs/UnrealHeaderTool/Private/CodeGenerator.cpp
@@ -20,6 +20,7 @@
 #include "Misc/Guid.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/FeedbackContext.h"
+#include "Misc/OutputDeviceNull.h"
 #include "UObject/ErrorException.h"
 #include "UObject/Script.h"
 #include "UObject/ObjectMacros.h"
@@ -48,6 +49,7 @@
 #include "Manifest.h"
 #include "StringUtils.h"
 #include "Features/IModularFeatures.h"
+#include "Algo/Copy.h"
 #include "Algo/Sort.h"
 #include "Algo/Reverse.h"
 #include "Misc/ScopeExit.h"
@@ -497,7 +499,7 @@ FString CreateUTF8LiteralString(const FString& Str)
 }
 
 // Returns the METADATA_PARAMS for this output
-static FString OutputMetaDataCodeForObject(FOutputDevice& Out, const UObject* Object, const TCHAR* MetaDataBlockName, const TCHAR* Spaces)
+static FString OutputMetaDataCodeForObject(FOutputDevice& OutDeclaration, FOutputDevice& Out, const UObject* Object, const TCHAR* MetaDataBlockName, const TCHAR* DeclSpaces, const TCHAR* Spaces)
 {
 	TMap<FName, FString>* MetaData = UMetaData::GetMapForObject(Object);
 
@@ -524,8 +526,19 @@ static FString OutputMetaDataCodeForObject(FOutputDevice& Out, const UObject* Ob
 	FString Result;
 	if (MetaDataOutput.Len())
 	{
+		FString MetaDataBlockNameWithoutScope = MetaDataBlockName;
+		int32 ScopeIndex = MetaDataBlockNameWithoutScope.Find(TEXT("::"), ESearchCase::CaseSensitive);
+		if (ScopeIndex != INDEX_NONE)
+		{
+			MetaDataBlockNameWithoutScope = MetaDataBlockNameWithoutScope.RightChop(ScopeIndex + 2);
+		}
+
+		OutDeclaration.Log (TEXT("#if WITH_METADATA\r\n"));
+		OutDeclaration.Logf(TEXT("%sstatic const UE4CodeGen_Private::FMetaDataPairParam %s[];\r\n"), DeclSpaces, *MetaDataBlockNameWithoutScope);
+		OutDeclaration.Log (TEXT("#endif\r\n"));
+
 		Out.Log (TEXT("#if WITH_METADATA\r\n"));
-		Out.Logf(TEXT("%sstatic const UE4CodeGen_Private::FMetaDataPairParam %s[] = {\r\n"), Spaces, MetaDataBlockName);
+		Out.Logf(TEXT("%sconst UE4CodeGen_Private::FMetaDataPairParam %s[] = {\r\n"), Spaces, MetaDataBlockName);
 		Out.Log (*MetaDataOutput);
 		Out.Logf(TEXT("%s};\r\n"), Spaces);
 		Out.Log (TEXT("#endif\r\n"));
@@ -872,7 +885,7 @@ FString FNativeClassHeaderGenerator::GetUTF8OverriddenNameForLiteral(const UFiel
 	return CreateUTF8LiteralString(Item->GetName());
 }
 
-void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Prop, const TCHAR* OffsetStr, const TCHAR* Name, const TCHAR* Spaces, const TCHAR* SourceStruct)
+void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& DeclOut, FOutputDevice& Out, UProperty* Prop, const TCHAR* OffsetStr, const TCHAR* Name, const TCHAR* DeclSpaces, const TCHAR* Spaces, const TCHAR* SourceStruct)
 {
 	FString        PropName             = CreateUTF8LiteralString(FNativeClassHeaderGenerator::GetOverriddenName(Prop));
 	FString        PropNameDep          = Prop->HasAllPropertyFlags(CPF_Deprecated) ? Prop->GetName() + TEXT("_DEPRECATED") : Prop->GetName();
@@ -884,12 +897,23 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	FString ArrayDim = (Prop->ArrayDim != 1) ? FString::Printf(TEXT("CPP_ARRAY_DIM(%s, %s)"), *PropNameDep, SourceStruct) : TEXT("1");
 
-	FString MetaDataParams = OutputMetaDataCodeForObject(Out, Prop, *FString::Printf(TEXT("%s_MetaData"), Name), Spaces);
+	FString MetaDataParams = OutputMetaDataCodeForObject(DeclOut, Out, Prop, *FString::Printf(TEXT("%s_MetaData"), Name), DeclSpaces, Spaces);
+
+	FString NameWithoutScope = Name;
+	FString Scope;
+	int32 ScopeIndex = NameWithoutScope.Find(TEXT("::"), ESearchCase::CaseSensitive);
+	if (ScopeIndex != INDEX_NONE)
+	{
+		Scope = NameWithoutScope.Left(ScopeIndex) + TEXT("_");
+		NameWithoutScope = NameWithoutScope.RightChop(ScopeIndex + 2);
+	}
 
 	if (UByteProperty* TypedProp = Cast<UByteProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FBytePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FBytePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Byte, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FBytePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Byte, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -908,8 +932,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UInt8Property* TypedProp = Cast<UInt8Property>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FInt8PropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FInt8PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int8, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FInt8PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int8, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -927,8 +953,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UInt16Property* TypedProp = Cast<UInt16Property>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FInt16PropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FInt16PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int16, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FInt16PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int16, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -946,10 +974,14 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UIntProperty* TypedProp = Cast<UIntProperty>(Prop))
 	{
+		const TCHAR* PropTypeName = GUnsizedProperties.Contains(TypedProp) ? TEXT("FUnsizedIntPropertyParams") : TEXT("FIntPropertyParams");
+
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::%s %s;\r\n"), DeclSpaces, PropTypeName, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::%s %s = { UE4CodeGen_Private::EPropertyClass::Int, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::%s %s = { UE4CodeGen_Private::EPropertyClass::Int, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
-			GUnsizedProperties.Contains(TypedProp) ? TEXT("FUnsizedIntPropertyParams") : TEXT("FIntPropertyParams"),
+			PropTypeName,
 			Name,
 			*PropName,
 			UPropertyObjectFlags,
@@ -966,8 +998,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UInt64Property* TypedProp = Cast<UInt64Property>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FInt64PropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FInt64PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int64, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FInt64PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Int64, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -985,8 +1019,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UUInt16Property* TypedProp = Cast<UUInt16Property>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FUInt16PropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FUInt16PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::UInt16, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FUInt16PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::UInt16, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1004,10 +1040,14 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UUInt32Property* TypedProp = Cast<UUInt32Property>(Prop))
 	{
+		const TCHAR* PropTypeName = GUnsizedProperties.Contains(TypedProp) ? TEXT("FUnsizedUIntPropertyParams") : TEXT("FUInt32PropertyParams");
+
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::%s %s;\r\n"), DeclSpaces, PropTypeName, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::%s %s = { UE4CodeGen_Private::EPropertyClass::UInt32, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::%s %s = { UE4CodeGen_Private::EPropertyClass::UInt32, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
-			GUnsizedProperties.Contains(TypedProp) ? TEXT("FUnsizedUIntPropertyParams") : TEXT("FUInt32PropertyParams"),
+			PropTypeName,
 			Name,
 			*PropName,
 			UPropertyObjectFlags,
@@ -1024,8 +1064,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UUInt64Property* TypedProp = Cast<UUInt64Property>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FUInt64PropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FUInt64PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::UInt64, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FUInt64PropertyParams %s = { UE4CodeGen_Private::EPropertyClass::UInt64, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1043,8 +1085,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UFloatProperty* TypedProp = Cast<UFloatProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FFloatPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FFloatPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Float, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FFloatPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Float, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1062,8 +1106,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UDoubleProperty* TypedProp = Cast<UDoubleProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FDoublePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FDoublePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Double, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FDoublePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Double, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1092,19 +1138,21 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 		else
 		{
 			OuterSize = FString::Printf(TEXT("sizeof(%s)"), SourceStruct);
-			Out.Logf(
-				TEXT("%sauto %s_SetBit = [](void* Obj){ ((%s*)Obj)->%s%s = 1; };\r\n"),
-				Spaces,
-				Name,
-				SourceStruct,
-				*Prop->GetName(),
-				Prop->HasAllPropertyFlags(CPF_Deprecated) ? TEXT("_DEPRECATED") : TEXT("")
-			);
-			Setter = FString::Printf(TEXT("&UE4CodeGen_Private::TBoolSetBitWrapper<decltype(%s_SetBit)>::SetBit"), Name);
+
+			DeclOut.Logf(TEXT("%sstatic void %s_SetBit(void* Obj);\r\n"), DeclSpaces, *NameWithoutScope);
+
+			Out.Logf(TEXT("%svoid %s_SetBit(void* Obj)\r\n"), Spaces, Name);
+			Out.Logf(TEXT("%s{\r\n"), Spaces);
+			Out.Logf(TEXT("%s\t((%s*)Obj)->%s%s = 1;\r\n"), Spaces, SourceStruct, *Prop->GetName(), Prop->HasAllPropertyFlags(CPF_Deprecated) ? TEXT("_DEPRECATED") : TEXT(""));
+			Out.Logf(TEXT("%s}\r\n"), Spaces);
+
+			Setter = FString::Printf(TEXT("&%s_SetBit"), Name);
 		}
 
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FBoolPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FBoolPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Bool, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, sizeof(%s), %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FBoolPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Bool, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, sizeof(%s), %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1125,8 +1173,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (USoftClassProperty* TypedProp = Cast<USoftClassProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FSoftClassPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FSoftClassPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::SoftClass, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FSoftClassPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::SoftClass, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1145,8 +1195,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UWeakObjectProperty* TypedProp = Cast<UWeakObjectProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FWeakObjectPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FWeakObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::WeakObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FWeakObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::WeakObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1165,8 +1217,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (ULazyObjectProperty* TypedProp = Cast<ULazyObjectProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FLazyObjectPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FLazyObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::LazyObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FLazyObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::LazyObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1185,8 +1239,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (USoftObjectProperty* TypedProp = Cast<USoftObjectProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FSoftObjectPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FSoftObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::SoftObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FSoftObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::SoftObject, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1205,8 +1261,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UClassProperty* TypedProp = Cast<UClassProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FClassPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FClassPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Class, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FClassPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Class, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1226,8 +1284,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UObjectProperty* TypedProp = Cast<UObjectProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FObjectPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Object, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FObjectPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Object, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1246,8 +1306,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UInterfaceProperty* TypedProp = Cast<UInterfaceProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FInterfacePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FInterfacePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Interface, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FInterfacePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Interface, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1266,8 +1328,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UNameProperty* TypedProp = Cast<UNameProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FNamePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FNamePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Name, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FNamePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Name, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1285,8 +1349,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UStrProperty* TypedProp = Cast<UStrProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FStrPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FStrPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Str, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FStrPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Str, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1304,8 +1370,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UArrayProperty* TypedProp = Cast<UArrayProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FArrayPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FArrayPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Array, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FArrayPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Array, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1323,8 +1391,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UMapProperty* TypedProp = Cast<UMapProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FMapPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FMapPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Map, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FMapPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Map, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1342,8 +1412,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (USetProperty* TypedProp = Cast<USetProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FSetPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FSetPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Set, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FSetPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Set, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1361,8 +1433,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UStructProperty* TypedProp = Cast<UStructProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FStructPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FStructPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Struct, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FStructPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Struct, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1381,8 +1455,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UDelegateProperty* TypedProp = Cast<UDelegateProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FDelegatePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FDelegatePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Delegate, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FDelegatePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Delegate, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1401,8 +1477,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UMulticastDelegateProperty* TypedProp = Cast<UMulticastDelegateProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FMulticastDelegatePropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FMulticastDelegatePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::MulticastDelegate, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FMulticastDelegatePropertyParams %s = { UE4CodeGen_Private::EPropertyClass::MulticastDelegate, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1421,8 +1499,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UTextProperty* TypedProp = Cast<UTextProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FTextPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FTextPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Text, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FTextPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Text, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1440,8 +1520,10 @@ void FNativeClassHeaderGenerator::PropertyNew(FOutputDevice& Out, UProperty* Pro
 
 	if (UEnumProperty* TypedProp = Cast<UEnumProperty>(Prop))
 	{
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FEnumPropertyParams %s;\r\n"), DeclSpaces, *NameWithoutScope);
+
 		Out.Logf(
-			TEXT("%sstatic const UE4CodeGen_Private::FEnumPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Enum, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
+			TEXT("%sconst UE4CodeGen_Private::FEnumPropertyParams %s = { UE4CodeGen_Private::EPropertyClass::Enum, %s, %s, (EPropertyFlags)0x%016llx, %s, %s, %s, %s, %s };%s\r\n"),
 			Spaces,
 			Name,
 			*PropName,
@@ -1477,19 +1559,19 @@ bool IsEditorOnlyDataProperty(UProperty* Prop)
 	return false;
 }
 
-void FNativeClassHeaderGenerator::OutputProperties(FOutputDevice& OutputDevice, FString& OutPropertyRange, const TArray<UProperty*>& Properties, const TCHAR* Spaces)
+FString FNativeClassHeaderGenerator::OutputProperties(FOutputDevice& DeclOut, FOutputDevice& Out, const TCHAR* Scope, const TArray<UProperty*>& Properties, const TCHAR* DeclSpaces, const TCHAR* Spaces)
 {
 	if (Properties.Num() == 0)
 	{
-		OutPropertyRange = TEXT("nullptr, 0");
-		return;
+		return TEXT("nullptr, 0");
 	}
 
 	TArray<FPropertyNamePointerPair> PropertyNamesAndPointers;
 	bool bHasAllEditorOnlyDataProperties = true;
 
 	{
-		FMacroBlockEmitter WithEditorOnlyMacroEmitter(OutputDevice, TEXT("WITH_EDITORONLY_DATA"));
+		FMacroBlockEmitter WithEditorOnlyMacroEmitter(Out, TEXT("WITH_EDITORONLY_DATA"));
+		FMacroBlockEmitter WithEditorOnlyMacroEmitterDecl(DeclOut, TEXT("WITH_EDITORONLY_DATA"));
 
 		for (int32 Index = Properties.Num() - 1; Index >= 0; Index--)
 		{
@@ -1502,31 +1584,36 @@ void FNativeClassHeaderGenerator::OutputProperties(FOutputDevice& OutputDevice,
 			}
 
 			WithEditorOnlyMacroEmitter(bRequiresHasEditorOnlyMacro);
-			OutputProperty(OutputDevice, PropertyNamesAndPointers, Prop, Spaces);
+			WithEditorOnlyMacroEmitterDecl(bRequiresHasEditorOnlyMacro);
+			OutputProperty(DeclOut, Out, Scope, PropertyNamesAndPointers, Prop, DeclSpaces, Spaces);
 		}
 
 		WithEditorOnlyMacroEmitter(bHasAllEditorOnlyDataProperties);
-		OutputDevice.Logf(TEXT("%sstatic const UE4CodeGen_Private::FPropertyParamsBase* const PropPointers[] = {\r\n"), Spaces);
+		WithEditorOnlyMacroEmitterDecl(bHasAllEditorOnlyDataProperties);
+		DeclOut.Logf(TEXT("%sstatic const UE4CodeGen_Private::FPropertyParamsBase* const PropPointers[];\r\n"), DeclSpaces);
+		Out.Logf(TEXT("%sconst UE4CodeGen_Private::FPropertyParamsBase* const %sPropPointers[] = {\r\n"), Spaces, Scope);
 
 		for (const FPropertyNamePointerPair& PropNameAndPtr : PropertyNamesAndPointers)
 		{
 			bool bRequiresHasEditorOnlyMacro = IsEditorOnlyDataProperty(PropNameAndPtr.Prop);
 
 			WithEditorOnlyMacroEmitter(bRequiresHasEditorOnlyMacro);
-			OutputDevice.Logf(TEXT("%s\t(const UE4CodeGen_Private::FPropertyParamsBase*)&%s,\r\n"), Spaces, *PropNameAndPtr.Name);
+			WithEditorOnlyMacroEmitterDecl(bRequiresHasEditorOnlyMacro);
+			Out.Logf(TEXT("%s\t(const UE4CodeGen_Private::FPropertyParamsBase*)&%s,\r\n"), Spaces, *PropNameAndPtr.Name);
 		}
 
 		WithEditorOnlyMacroEmitter(bHasAllEditorOnlyDataProperties);
-		OutputDevice.Logf(TEXT("%s};\r\n"), Spaces);
+		WithEditorOnlyMacroEmitterDecl(bHasAllEditorOnlyDataProperties);
+		Out.Logf(TEXT("%s};\r\n"), Spaces);
 	}
 
 	if (bHasAllEditorOnlyDataProperties)
 	{
-		OutPropertyRange = TEXT("IF_WITH_EDITORONLY_DATA(PropPointers, nullptr), IF_WITH_EDITORONLY_DATA(ARRAY_COUNT(PropPointers), 0)");
+		return FString::Printf(TEXT("IF_WITH_EDITORONLY_DATA(%sPropPointers, nullptr), IF_WITH_EDITORONLY_DATA(ARRAY_COUNT(%sPropPointers), 0)"), Scope, Scope);
 	}
 	else
 	{
-		OutPropertyRange = TEXT("PropPointers, ARRAY_COUNT(PropPointers)");
+		return FString::Printf(TEXT("%sPropPointers, ARRAY_COUNT(%sPropPointers)"), Scope, Scope);
 	}
 }
 
@@ -1555,19 +1642,19 @@ inline FString GetEventStructParamsName(UObject* Outer, const TCHAR* FunctionNam
 	return Result;
 }
 
-void FNativeClassHeaderGenerator::OutputProperty(FOutputDevice& OutputDevice, TArray<FPropertyNamePointerPair>& PropertyNamesAndPointers, UProperty* Prop, const TCHAR* Spaces)
+void FNativeClassHeaderGenerator::OutputProperty(FOutputDevice& DeclOut, FOutputDevice& Out, const TCHAR* Scope, TArray<FPropertyNamePointerPair>& PropertyNamesAndPointers, UProperty* Prop, const TCHAR* DeclSpaces, const TCHAR* Spaces)
 {
 	FString PropName = Prop->GetName();
 
-	FString PropVariableName = FString::Printf(TEXT("NewProp_%s"), *PropName);
+	FString PropVariableName = FString::Printf(TEXT("%sNewProp_%s"), Scope, *PropName);
 
 	// Helper to handle the creation of the underlying properties if they're enum properties
-	auto HandleUnderlyingEnumProperty = [this, &PropertyNamesAndPointers, &OutputDevice, Spaces](UProperty* LocalProp, const FString& OuterName)
+	auto HandleUnderlyingEnumProperty = [this, &PropertyNamesAndPointers, &DeclOut, &Out, DeclSpaces, Spaces](UProperty* LocalProp, const FString& OuterName)
 	{
 		if (UEnumProperty* EnumProp = Cast<UEnumProperty>(LocalProp))
 		{
 			FString PropVarName = OuterName + TEXT("_Underlying");
-			PropertyNew(OutputDevice, EnumProp->UnderlyingProp, TEXT("0"), *PropVarName, Spaces);
+			PropertyNew(DeclOut, Out, EnumProp->UnderlyingProp, TEXT("0"), *PropVarName, DeclSpaces, Spaces);
 			PropertyNamesAndPointers.Emplace(MoveTemp(PropVarName), EnumProp->UnderlyingProp);
 		}
 	};
@@ -1601,16 +1688,16 @@ void FNativeClassHeaderGenerator::OutputProperty(FOutputDevice& OutputDevice, TA
 
 		FString PropMacroOuterClass = FString::Printf(TEXT("STRUCT_OFFSET(%s, %s)"), *SourceStruct, *PropNameDep);
 
-		PropertyNew(OutputDevice, Prop, *PropMacroOuterClass, *PropVariableName, Spaces, *SourceStruct);
+		PropertyNew(DeclOut, Out, Prop, *PropMacroOuterClass, *PropVariableName, DeclSpaces, Spaces, *SourceStruct);
 		PropertyNamesAndPointers.Emplace(PropVariableName, Prop);
 		HandleUnderlyingEnumProperty(Prop, PropVariableName);
 	}
 
 	if (UArrayProperty* ArrayProperty = Cast<UArrayProperty>(Prop))
 	{
-		FString InnerVariableName = FString::Printf(TEXT("NewProp_%s_Inner"), *ArrayProperty->Inner->GetName());
+		FString InnerVariableName = FString::Printf(TEXT("%sNewProp_%s_Inner"), Scope, *ArrayProperty->Inner->GetName());
 
-		PropertyNew(OutputDevice, ArrayProperty->Inner, TEXT("0"), *InnerVariableName, Spaces);
+		PropertyNew(DeclOut, Out, ArrayProperty->Inner, TEXT("0"), *InnerVariableName, DeclSpaces, Spaces);
 		PropertyNamesAndPointers.Emplace(InnerVariableName, ArrayProperty->Inner);
 		HandleUnderlyingEnumProperty(ArrayProperty->Inner, InnerVariableName);
 	}
@@ -1620,14 +1707,14 @@ void FNativeClassHeaderGenerator::OutputProperty(FOutputDevice& OutputDevice, TA
 		UProperty* Key   = MapProperty->KeyProp;
 		UProperty* Value = MapProperty->ValueProp;
 
-		FString KeyVariableName   = FString::Printf(TEXT("NewProp_%s_KeyProp"), *Key->GetName());
-		FString ValueVariableName = FString::Printf(TEXT("NewProp_%s_ValueProp"), *Value->GetName());
+		FString KeyVariableName   = FString::Printf(TEXT("%sNewProp_%s_KeyProp"), Scope, *Key->GetName());
+		FString ValueVariableName = FString::Printf(TEXT("%sNewProp_%s_ValueProp"), Scope, *Value->GetName());
 
-		PropertyNew(OutputDevice, Key, TEXT("0"), *KeyVariableName, Spaces);
+		PropertyNew(DeclOut, Out, Key, TEXT("0"), *KeyVariableName, DeclSpaces, Spaces);
 		PropertyNamesAndPointers.Emplace(KeyVariableName, Key);
 		HandleUnderlyingEnumProperty(Key, KeyVariableName);
 
-		PropertyNew(OutputDevice, Value, TEXT("1"), *ValueVariableName, Spaces);
+		PropertyNew(DeclOut, Out, Value, TEXT("1"), *ValueVariableName, DeclSpaces, Spaces);
 		PropertyNamesAndPointers.Emplace(ValueVariableName, Value);
 		HandleUnderlyingEnumProperty(Value, ValueVariableName);
 	}
@@ -1636,9 +1723,9 @@ void FNativeClassHeaderGenerator::OutputProperty(FOutputDevice& OutputDevice, TA
 	{
 		UProperty* Inner = SetProperty->ElementProp;
 
-		FString ElementVariableName = FString::Printf(TEXT("NewProp_%s_ElementProp"), *Inner->GetName());
+		FString ElementVariableName = FString::Printf(TEXT("%sNewProp_%s_ElementProp"), Scope, *Inner->GetName());
 
-		PropertyNew(OutputDevice, Inner, TEXT("0"), *ElementVariableName, Spaces);
+		PropertyNew(DeclOut, Out, Inner, TEXT("0"), *ElementVariableName, DeclSpaces, Spaces);
 		PropertyNamesAndPointers.Emplace(ElementVariableName, Inner);
 		HandleUnderlyingEnumProperty(Inner, ElementVariableName);
 	}
@@ -1774,7 +1861,8 @@ void FNativeClassHeaderGenerator::ExportGeneratedPackageInitCode(FOutputDevice&
 		Out.Logf(TEXT("%s"), *Extern);
 	}
 
-	FString MetaDataParams = OutputMetaDataCodeForObject(Out, InPackage, TEXT("Package_MetaDataParams"), TEXT("\t\t\t"));
+	FOutputDeviceNull OutputDeviceNull;
+	FString MetaDataParams = OutputMetaDataCodeForObject(OutputDeviceNull, Out, InPackage, TEXT("Package_MetaDataParams"), TEXT(""), TEXT("\t\t\t"));
 
 	Out.Logf(TEXT("\tUPackage* %s\r\n"), *SingletonName);
 	Out.Logf(TEXT("\t{\r\n"));
@@ -1819,6 +1907,8 @@ void FNativeClassHeaderGenerator::ExportNativeGeneratedInitCode(FOutputDevice& O
 {
 	check(!OutFriendText.Len());
 
+	UE_CLOG(Class->ClassGeneratedBy, LogCompile, Fatal, TEXT("For intrinsic and compiled-in classes, ClassGeneratedBy should always be null"));
+
 	const bool   bIsNoExport  = Class->HasAnyClassFlags(CLASS_NoExport);
 	const bool   bIsDynamic   = FClass::IsDynamic(Class);
 	const TCHAR* ClassNameCPP = NameLookupCPP.GetNameCPP(Class);
@@ -1870,9 +1960,166 @@ void FNativeClassHeaderGenerator::ExportNativeGeneratedInitCode(FOutputDevice& O
 		}
 		FString SingletonName = GetSingletonName(Class);
 
-		OutFriendText.Logf(TEXT("\tfriend %sclass UClass* %s;\r\n"), *ApiString, *SingletonName);
+		FString StaticsStructName = SingletonName.LeftChop(2) + TEXT("_Statics");
+
+		OutFriendText.Logf(TEXT("\tfriend struct %s;\r\n"), *StaticsStructName);
 		OutDeclarations.Log(FTypeSingletonCache::Get(Class).GetExternDecl());
 
+		GeneratedClassRegisterFunctionText.Logf(TEXT("\tstruct %s\r\n"), *StaticsStructName);
+		GeneratedClassRegisterFunctionText.Logf(TEXT("\t{\r\n"));
+
+		FUHTStringBuilder StaticDefinitions;
+
+		FUHTStringBuilder Singletons;
+		UClass* SuperClass = Class->GetSuperClass();
+		if (SuperClass && SuperClass != Class)
+		{
+			OutDeclarations.Log(FTypeSingletonCache::Get(SuperClass).GetExternDecl());
+			Singletons.Logf(TEXT("\t\t(UObject* (*)())%s,\r\n"), *GetSingletonName(SuperClass).LeftChop(2));
+		}
+		if (!bIsDynamic)
+		{
+			FString PackageSingletonName = GetPackageSingletonName(Class->GetOutermost());
+
+			OutDeclarations.Logf(TEXT("\t%s_API UPackage* %s;\r\n"), *ApiString, *PackageSingletonName);
+			Singletons.Logf(TEXT("\t\t(UObject* (*)())%s,\r\n"), *PackageSingletonName.LeftChop(2));
+		}
+
+		const TCHAR* SingletonsRange;
+		if (Singletons.Len() != 0)
+		{
+			GeneratedClassRegisterFunctionText.Logf(TEXT("\t\tstatic UObject* (*const DependentSingletons[])();\r\n"));
+
+			StaticDefinitions.Logf(TEXT("\tUObject* (*const %s::DependentSingletons[])() = {\r\n"), *StaticsStructName);
+			StaticDefinitions.Log (*Singletons);
+			StaticDefinitions.Logf(TEXT("\t};\r\n"));
+
+			SingletonsRange = TEXT("DependentSingletons, ARRAY_COUNT(DependentSingletons)");
+		}
+		else
+		{
+			SingletonsRange = TEXT("nullptr, 0");
+		}
+
+		if (FunctionsToExport.Num() != 0)
+		{
+			GeneratedClassRegisterFunctionText.Log(BEGIN_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
+			GeneratedClassRegisterFunctionText.Log(TEXT("\t\tstatic const FClassFunctionLinkInfo FuncInfo[];\r\n"));
+			GeneratedClassRegisterFunctionText.Log(END_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
+
+			StaticDefinitions.Log(BEGIN_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
+			StaticDefinitions.Logf(TEXT("\tconst FClassFunctionLinkInfo %s::FuncInfo[] = {\r\n"), *StaticsStructName);
+
+			for (UFunction* Function : FunctionsToExport)
+			{
+				const bool bIsEditorOnlyFunction = Function->HasAnyFunctionFlags(FUNC_EditorOnly);
+
+				if (!Function->IsA<UDelegateFunction>())
+				{
+					OutDeclarations.Logf(
+						TEXT("%s%s%s"),
+						BEGIN_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction),
+						*FTypeSingletonCache::Get(Function).GetExternDecl(),
+						END_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction)
+					);
+					ExportFunction(Out, SourceFile, Function, bIsNoExport);
+				}
+
+				StaticDefinitions.Logf(
+					TEXT("%s\t\t{ &%s, %s },%s\r\n%s"),
+					BEGIN_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction),
+					*GetSingletonNameFuncAddr(Function),
+					*FNativeClassHeaderGenerator::GetUTF8OverriddenNameForLiteral(Function),
+					*GetGeneratedCodeCRCTag(Function),
+					END_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction)
+				);
+			}
+
+			StaticDefinitions.Log(TEXT("\t};\r\n"));
+			StaticDefinitions.Log(END_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
+		}
+
+		TMap<FName, FString>* MetaDataMap = UMetaData::GetMapForObject(Class);
+		if (MetaDataMap)
+		{
+			FClassMetaData* ClassMetaData = GScriptHelper.FindClassData(Class);
+			if (ClassMetaData && ClassMetaData->bObjectInitializerConstructorDeclared)
+			{
+				MetaDataMap->Add(FName(TEXT("ObjectInitializerConstructorDeclared")), TEXT(""));
+			}
+		}
+
+		FString MetaDataParams = OutputMetaDataCodeForObject(GeneratedClassRegisterFunctionText, StaticDefinitions, Class, *FString::Printf(TEXT("%s::Class_MetaDataParams"), *StaticsStructName), TEXT("\t\t"), TEXT("\t"));
+
+		TArray<UProperty*> Props;
+		Algo::Copy(TFieldRange<UProperty>(Class, EFieldIteratorFlags::ExcludeSuper), Props);
+
+		FString PropertyRange = OutputProperties(GeneratedClassRegisterFunctionText, StaticDefinitions, *FString::Printf(TEXT("%s::"), *StaticsStructName), Props, TEXT("\t\t"), TEXT("\t"));
+
+		const TCHAR* InterfaceRange;
+		if (Class->Interfaces.Num() > 0)
+		{
+			GeneratedClassRegisterFunctionText.Log(TEXT("\t\tstatic const UE4CodeGen_Private::FImplementedInterfaceParams InterfaceParams[];\r\n"));
+
+			StaticDefinitions.Logf(TEXT("\t\tconst UE4CodeGen_Private::FImplementedInterfaceParams %s::InterfaceParams[] = {\r\n"), *StaticsStructName);
+			for (const FImplementedInterface& Inter : Class->Interfaces)
+			{
+				check(Inter.Class);
+				FString OffsetString;
+				if (Inter.PointerOffset)
+				{
+					OffsetString = FString::Printf(TEXT("(int32)VTABLE_OFFSET(%s, %s)"), ClassNameCPP, NameLookupCPP.GetNameCPP(Inter.Class, true));
+				}
+				else
+				{
+					OffsetString = TEXT("0");
+				}
+				StaticDefinitions.Logf(
+					TEXT("\t\t\t{ %s, %s, %s },\r\n"),
+					*GetSingletonName(Inter.Class, false).LeftChop(2),
+					*OffsetString,
+					Inter.bImplementedByK2 ? TEXT("true") : TEXT("false")
+				);
+			}
+			StaticDefinitions.Log(TEXT("\t\t};\r\n"));
+
+			InterfaceRange = TEXT("InterfaceParams, ARRAY_COUNT(InterfaceParams)");
+		}
+		else
+		{
+			InterfaceRange = TEXT("nullptr, 0");
+		}
+
+		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\tstatic const FCppClassTypeInfoStatic StaticCppClassTypeInfo;\r\n"));
+
+		StaticDefinitions.Logf(TEXT("\tconst FCppClassTypeInfoStatic %s::StaticCppClassTypeInfo = {\r\n"), *StaticsStructName);
+		StaticDefinitions.Logf(TEXT("\t\tTCppClassTypeTraits<%s>::IsAbstract,\r\n"), NameLookupCPP.GetNameCPP(Class, Class->HasAllClassFlags(CLASS_Interface)));
+		StaticDefinitions.Logf(TEXT("\t};\r\n"));
+
+		GeneratedClassRegisterFunctionText.Log (TEXT("\t\tstatic const UE4CodeGen_Private::FClassParams ClassParams;\r\n"));
+
+		uint32 ClassFlags = (uint32)Class->ClassFlags;
+		if (!bIsNoExport)
+		{
+			ClassFlags = ClassFlags | CLASS_MatchedSerializers;
+		}
+		ClassFlags = ClassFlags & CLASS_SaveInCompiledInClasses;
+
+		StaticDefinitions.Logf(TEXT("\tconst UE4CodeGen_Private::FClassParams %s::ClassParams = {\r\n"), *StaticsStructName);
+		StaticDefinitions.Logf(TEXT("\t\t&%s::StaticClass,\r\n"), ClassNameCPP);
+		StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), SingletonsRange);
+		StaticDefinitions.Logf(TEXT("\t\t0x%08Xu,\r\n"), ClassFlags);
+		StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), (FunctionsToExport.Num() != 0) ? (bAllEditorOnlyFunctions ? TEXT("IF_WITH_EDITOR(FuncInfo, nullptr), IF_WITH_EDITOR(ARRAY_COUNT(FuncInfo), 0)") : TEXT("FuncInfo, ARRAY_COUNT(FuncInfo)")) : TEXT("nullptr, 0"));
+		StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), *PropertyRange);
+		StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), (Class->ClassConfigName != NAME_None) ? *CreateUTF8LiteralString(Class->ClassConfigName.ToString()) : TEXT("nullptr"));
+		StaticDefinitions.Log (TEXT("\t\t&StaticCppClassTypeInfo,\r\n"));
+		StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), InterfaceRange);
+		StaticDefinitions.Logf(TEXT("\t\t%s\r\n"), *MetaDataParams);
+		StaticDefinitions.Log (TEXT("\t};\r\n"));
+
+		GeneratedClassRegisterFunctionText.Logf(TEXT("\t};\r\n"));
+		GeneratedClassRegisterFunctionText.Log(*StaticDefinitions);
+
 		GeneratedClassRegisterFunctionText.Logf(TEXT("\tUClass* %s\r\n"), *SingletonName);
 		GeneratedClassRegisterFunctionText.Logf(TEXT("\t{\r\n"));
 		if (!bIsDynamic)
@@ -1889,141 +2136,7 @@ void FNativeClassHeaderGenerator::ExportNativeGeneratedInitCode(FOutputDevice& O
 		}
 
 		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t{\r\n"));
-
-		FUHTStringBuilder Singletons;
-		UClass* SuperClass = Class->GetSuperClass();
-		if (SuperClass && SuperClass != Class)
-		{
-			OutDeclarations.Log(FTypeSingletonCache::Get(SuperClass).GetExternDecl());
-			Singletons.Logf(TEXT("\t\t\t\t(UObject* (*)())%s,\r\n"), *GetSingletonName(SuperClass).LeftChop(2));
-		}
-		if (!bIsDynamic)
-		{
-			FString PackageSingletonName = GetPackageSingletonName(Class->GetOutermost());
-
-			OutDeclarations.Logf(TEXT("\t%s_API UPackage* %s;\r\n"), *ApiString, *PackageSingletonName);
-			Singletons.Logf(TEXT("\t\t\t\t(UObject* (*)())%s,\r\n"), *PackageSingletonName.LeftChop(2));
-		}
-
-		if (Singletons.Len() != 0)
-		{
-			GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\tstatic UObject* (*const DependentSingletons[])() = {\r\n"));
-			GeneratedClassRegisterFunctionText.Log (*Singletons);
-			GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t};\r\n"));
-		}
-
-		if (FunctionsToExport.Num() != 0)
-		{
-			GeneratedClassRegisterFunctionText.Log(BEGIN_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
-			GeneratedClassRegisterFunctionText.Log(TEXT("\t\t\tstatic const FClassFunctionLinkInfo FuncInfo[] = {\r\n"));
-
-			for (UFunction* Function : FunctionsToExport)
-			{
-				const bool bIsEditorOnlyFunction = Function->HasAnyFunctionFlags(FUNC_EditorOnly);
-
-				if (!Function->IsA<UDelegateFunction>())
-				{
-					OutDeclarations.Logf(
-						TEXT("%s%s%s"),
-						BEGIN_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction),
-						*FTypeSingletonCache::Get(Function).GetExternDecl(),
-						END_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction)
-					);
-					ExportFunction(Out, SourceFile, Function, bIsNoExport);
-				}
-
-				GeneratedClassRegisterFunctionText.Logf(
-					TEXT("%s\t\t\t\t{ &%s, %s },%s\r\n%s"),
-					BEGIN_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction),
-					*GetSingletonNameFuncAddr(Function),
-					*FNativeClassHeaderGenerator::GetUTF8OverriddenNameForLiteral(Function),
-					*GetGeneratedCodeCRCTag(Function),
-					END_WRAP_EDITOR_ONLY(bIsEditorOnlyFunction)
-				);
-			}
-
-			GeneratedClassRegisterFunctionText.Log(TEXT("\t\t\t};\r\n"));
-			GeneratedClassRegisterFunctionText.Log(END_WRAP_EDITOR_ONLY(bAllEditorOnlyFunctions));
-		}
-
-		TMap<FName, FString>* MetaDataMap = UMetaData::GetMapForObject(Class);
-		if (MetaDataMap)
-		{
-			FClassMetaData* ClassMetaData = GScriptHelper.FindClassData(Class);
-			if (ClassMetaData && ClassMetaData->bObjectInitializerConstructorDeclared)
-			{
-				MetaDataMap->Add(FName(TEXT("ObjectInitializerConstructorDeclared")), TEXT(""));
-			}
-		}
-		FString MetaDataParams = OutputMetaDataCodeForObject(GeneratedClassRegisterFunctionText, Class, TEXT("Class_MetaDataParams"), TEXT("\t\t\t"));
-
-		TArray<UProperty*> Props;
-		for (UProperty* Prop : TFieldRange<UProperty>(Class, EFieldIteratorFlags::ExcludeSuper))
-		{
-			Props.Add(Prop);
-		}
-
-		UE_CLOG(Class->ClassGeneratedBy, LogCompile, Fatal, TEXT("For intrinsic and compiled-in classes, ClassGeneratedBy should always be null"));
-
-		FString PropertyRange;
-		OutputProperties(GeneratedClassRegisterFunctionText, PropertyRange, Props, TEXT("\t\t\t"));
-
-		FString InterfaceRange;
-		if (Class->Interfaces.Num() > 0)
-		{
-			GeneratedClassRegisterFunctionText.Log(TEXT("\t\t\tstatic const UE4CodeGen_Private::FImplementedInterfaceParams InterfaceParams[] = {\r\n"));
-			for (const FImplementedInterface& Inter : Class->Interfaces)
-			{
-				check(Inter.Class);
-				FString OffsetString;
-				if (Inter.PointerOffset)
-				{
-					OffsetString = FString::Printf(TEXT("(int32)VTABLE_OFFSET(%s, %s)"), ClassNameCPP, NameLookupCPP.GetNameCPP(Inter.Class, true));
-				}
-				else
-				{
-					OffsetString = TEXT("0");
-				}
-				GeneratedClassRegisterFunctionText.Logf(
-					TEXT("\t\t\t\t{ %s, %s, %s },\r\n"),
-					*GetSingletonName(Inter.Class, false).LeftChop(2),
-					*OffsetString,
-					Inter.bImplementedByK2 ? TEXT("true") : TEXT("false")
-				);
-			}
-			GeneratedClassRegisterFunctionText.Log(TEXT("\t\t\t};\r\n"));
-
-			InterfaceRange = TEXT("InterfaceParams, ARRAY_COUNT(InterfaceParams)");
-		}
-		else
-		{
-			InterfaceRange = TEXT("nullptr, 0");
-		}
-
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\tstatic const FCppClassTypeInfoStatic StaticCppClassTypeInfo = {\r\n"));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\tTCppClassTypeTraits<%s>::IsAbstract,\r\n"), NameLookupCPP.GetNameCPP(Class, Class->HasAllClassFlags(CLASS_Interface)));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t};\r\n"));
-
-		uint32 ClassFlags = (uint32)Class->ClassFlags;
-		if (!bIsNoExport)
-		{
-			ClassFlags = ClassFlags | CLASS_MatchedSerializers;
-		}
-
-		ClassFlags = ClassFlags & CLASS_SaveInCompiledInClasses;
-
-		GeneratedClassRegisterFunctionText.Log (TEXT("\t\t\tstatic const UE4CodeGen_Private::FClassParams ClassParams = {\r\n"));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t&%s::StaticClass,\r\n"), ClassNameCPP);
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), (Singletons.Len() != 0) ? TEXT("DependentSingletons, ARRAY_COUNT(DependentSingletons)") : TEXT("nullptr, 0"));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t0x%08Xu,\r\n"), ClassFlags);
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), (FunctionsToExport.Num() != 0) ? (bAllEditorOnlyFunctions ? TEXT("IF_WITH_EDITOR(FuncInfo, nullptr), IF_WITH_EDITOR(ARRAY_COUNT(FuncInfo), 0)") : TEXT("FuncInfo, ARRAY_COUNT(FuncInfo)")) : TEXT("nullptr, 0"));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *PropertyRange);
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), (Class->ClassConfigName != NAME_None) ? *CreateUTF8LiteralString(Class->ClassConfigName.ToString()) : TEXT("nullptr"));
-		GeneratedClassRegisterFunctionText.Log (TEXT("\t\t\t\t&StaticCppClassTypeInfo,\r\n"));
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *InterfaceRange);
-		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\t\t%s\r\n"), *MetaDataParams);
-		GeneratedClassRegisterFunctionText.Log (TEXT("\t\t\t};\r\n"));
-		GeneratedClassRegisterFunctionText.Log (TEXT("\t\t\tUE4CodeGen_Private::ConstructUClass(OuterClass, ClassParams);\r\n"));
+		GeneratedClassRegisterFunctionText.Logf(TEXT("\t\t\tUE4CodeGen_Private::ConstructUClass(OuterClass, %s::ClassParams);\r\n"), *StaticsStructName);
 
 		if (bIsDynamic)
 		{
@@ -2101,9 +2214,11 @@ void FNativeClassHeaderGenerator::ExportFunction(FOutputDevice& Out, const FUnre
 
 	bool bIsDelegate = Function->HasAnyFunctionFlags(FUNC_Delegate);
 
-	const FString SingletonName = GetSingletonName(Function);
+	FString SingletonName = GetSingletonName(Function);
+	FString StaticsStructName = SingletonName.LeftChop(2) + TEXT("_Statics");
 
 	FUHTStringBuilder CurrentFunctionText;
+	FUHTStringBuilder StaticDefinitions;
 
 	// Begin wrapping editor only functions.  Note: This should always be the first step!
 	if (bIsEditorOnlyFunction)
@@ -2111,8 +2226,8 @@ void FNativeClassHeaderGenerator::ExportFunction(FOutputDevice& Out, const FUnre
 		CurrentFunctionText.Logf(BeginEditorOnlyGuard);
 	}
 
-	CurrentFunctionText.Logf(TEXT("\tUFunction* %s\r\n"), *SingletonName);
-	CurrentFunctionText.Logf(TEXT("\t{\r\n"));
+	CurrentFunctionText.Logf(TEXT("\tstruct %s\r\n"), *StaticsStructName);
+	CurrentFunctionText.Log (TEXT("\t{\r\n"));
 
 	if (bIsNoExport || !(Function->FunctionFlags&FUNC_Event))  // non-events do not export a params struct, so lets do that locally for offset determination
 	{
@@ -2138,25 +2253,8 @@ void FNativeClassHeaderGenerator::ExportFunction(FOutputDevice& Out, const FUnre
 		OuterFunc = TEXT("nullptr");
 	}
 
-	if (!bIsDynamic)
-	{
-		CurrentFunctionText.Logf(TEXT("\t\tstatic UFunction* ReturnFunction = nullptr;\r\n"));
-	}
-	else
-	{
-		FString FunctionName = FNativeClassHeaderGenerator::GetOverriddenNameForLiteral(Function);
-		CurrentFunctionText.Logf(TEXT("\t\tUObject* Outer = %s();\r\n"), *OuterFunc);
-		CurrentFunctionText.Logf(TEXT("\t\tUFunction* ReturnFunction = static_cast<UFunction*>(StaticFindObjectFast( UFunction::StaticClass(), Outer, %s ));\r\n"), *FunctionName);
-	}
-
-	CurrentFunctionText.Logf(TEXT("\t\tif (!ReturnFunction)\r\n"));
-	CurrentFunctionText.Logf(TEXT("\t\t{\r\n"));
-
 	TArray<UProperty*> Props;
-	for (TFieldIterator<UProperty> ItInner(Function, EFieldIteratorFlags::ExcludeSuper); ItInner; ++ItInner)
-	{
-		Props.Add(*ItInner);
-	}
+	Algo::Copy(TFieldRange<UProperty>(Function, EFieldIteratorFlags::ExcludeSuper), Props);
 
 	FString StructureSize;
 	if (Props.Num())
@@ -2182,17 +2280,19 @@ void FNativeClassHeaderGenerator::ExportFunction(FOutputDevice& Out, const FUnre
 	const TCHAR* UFunctionType = bIsDelegate ? TEXT("UDelegateFunction") : TEXT("UFunction");
 	const TCHAR* UFunctionObjectFlags = FClass::IsOwnedByDynamicType(Function) ? TEXT("RF_Public|RF_Transient") : TEXT("RF_Public|RF_Transient|RF_MarkAsNative");
 
-	FString PropertyRange;
-	OutputProperties(CurrentFunctionText, PropertyRange, Props, TEXT("\t\t\t"));
+	FString PropertyRange = OutputProperties(CurrentFunctionText, StaticDefinitions, *FString::Printf(TEXT("%s::"), *StaticsStructName), Props, TEXT("\t\t"), TEXT("\t"));
 
 	const FFunctionData* CompilerInfo = FFunctionData::FindForFunction(Function);
 	const FFuncInfo&     FunctionData = CompilerInfo->GetFunctionData();
 	const bool           bIsNet       = !!(FunctionData.FunctionFlags & (FUNC_NetRequest | FUNC_NetResponse));
 
-	FString MetaDataParams = OutputMetaDataCodeForObject(CurrentFunctionText, Function, TEXT("Function_MetaDataParams"), TEXT("\t\t\t"));
+	FString MetaDataParams = OutputMetaDataCodeForObject(CurrentFunctionText, StaticDefinitions, Function, *FString::Printf(TEXT("%s::Function_MetaDataParams"), *StaticsStructName), TEXT("\t\t"), TEXT("\t"));
 
-	CurrentFunctionText.Logf(
-		TEXT("\t\t\tstatic const UE4CodeGen_Private::FFunctionParams FuncParams = { (UObject*(*)())%s, %s, %s, %s, (EFunctionFlags)0x%08X, %s, %s, %d, %d, %s };\r\n"),
+	CurrentFunctionText.Log(TEXT("\t\tstatic const UE4CodeGen_Private::FFunctionParams FuncParams;\r\n"));
+
+	StaticDefinitions.Logf(
+		TEXT("\tconst UE4CodeGen_Private::FFunctionParams %s::FuncParams = { (UObject*(*)())%s, %s, %s, %s, (EFunctionFlags)0x%08X, %s, %s, %d, %d, %s };\r\n"),
+		*StaticsStructName,
 		*OuterFunc,
 		*CreateUTF8LiteralString(FNativeClassHeaderGenerator::GetOverriddenName(Function)),
 		UFunctionObjectFlags,
@@ -2205,10 +2305,29 @@ void FNativeClassHeaderGenerator::ExportFunction(FOutputDevice& Out, const FUnre
 		*MetaDataParams
 	);
 
-	CurrentFunctionText.Log(TEXT("\t\t\tUE4CodeGen_Private::ConstructUFunction(ReturnFunction, FuncParams);\r\n"));
-	CurrentFunctionText.Logf(TEXT("\t\t}\r\n"));
-	CurrentFunctionText.Logf(TEXT("\t\treturn ReturnFunction;\r\n"));
-	CurrentFunctionText.Logf(TEXT("\t}\r\n"));
+	CurrentFunctionText.Log(TEXT("\t};\r\n"));
+	CurrentFunctionText.Log(*StaticDefinitions);
+
+	CurrentFunctionText.Logf(TEXT("\tUFunction* %s\r\n"), *SingletonName);
+	CurrentFunctionText.Log (TEXT("\t{\r\n"));
+
+	if (!bIsDynamic)
+	{
+		CurrentFunctionText.Logf(TEXT("\t\tstatic UFunction* ReturnFunction = nullptr;\r\n"));
+	}
+	else
+	{
+		FString FunctionName = FNativeClassHeaderGenerator::GetOverriddenNameForLiteral(Function);
+		CurrentFunctionText.Logf(TEXT("\t\tUObject* Outer = %s();\r\n"), *OuterFunc);
+		CurrentFunctionText.Logf(TEXT("\t\tUFunction* ReturnFunction = static_cast<UFunction*>(StaticFindObjectFast( UFunction::StaticClass(), Outer, %s ));\r\n"), *FunctionName);
+	}
+
+	CurrentFunctionText.Logf(TEXT("\t\tif (!ReturnFunction)\r\n"));
+	CurrentFunctionText.Logf(TEXT("\t\t{\r\n"));
+	CurrentFunctionText.Logf(TEXT("\t\t\tUE4CodeGen_Private::ConstructUFunction(ReturnFunction, %s::FuncParams);\r\n"), *StaticsStructName);
+	CurrentFunctionText.Log (TEXT("\t\t}\r\n"));
+	CurrentFunctionText.Log (TEXT("\t\treturn ReturnFunction;\r\n"));
+	CurrentFunctionText.Log (TEXT("\t}\r\n"));
 
 	// End wrapping editor only functions.  Note: This should always be the last step!
 	if (bIsEditorOnlyFunction)
@@ -2521,7 +2640,7 @@ void FNativeClassHeaderGenerator::ExportClassFromSourceFileInner(
 		PrologMacroCalls.Logf(TEXT("\t%s\r\n"), *MacroName);
 
 		// VM -> C++ proxies (events and delegates).
-		FUHTStringBuilder NullOutput;
+		FOutputDeviceNull NullOutput;
 		FOutputDevice& CallbackOut = Class->HasAnyClassFlags(CLASS_NoExport) ? NullOutput : OutCpp;
 		FString CallbackWrappersMacroName = SourceFile.GetGeneratedMacroName(ClassData, TEXT("_CALLBACK_WRAPPERS"));
 		ExportCallbackFunctions(
@@ -3112,20 +3231,20 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 
 	const TCHAR* StructNameCPP = NameLookupCPP.GetNameCPP(Struct);
 
+	const FString SingletonName = GetSingletonName(Struct);
+
 	// Export struct.
 	if (Struct->StructFlags & STRUCT_Native)
 	{
 		check(Struct->StructMacroDeclaredLineNumber != INDEX_NONE);
 
-		const FString StaticConstructionString = GetSingletonName(Struct);
-
 		FString RequiredAPI;
 		if (!(Struct->StructFlags & STRUCT_RequiredAPI))
 		{
 			RequiredAPI = FriendApiString;
 		}
 
-		const FString FriendLine = FString::Printf(TEXT("\tfriend %sclass UScriptStruct* %s;\r\n"), *FriendApiString, *StaticConstructionString);
+		const FString FriendLine = FString::Printf(TEXT("\tfriend struct %s_Statics;\r\n"), *SingletonName.LeftChop(2));
 		const FString StaticClassLine = FString::Printf(TEXT("\t%sstatic class UScriptStruct* StaticStruct();\r\n"), *RequiredAPI);
 		const FString PrivatePropertiesOffset = PrivatePropertiesOffsetGetters(Struct, StructNameCPP);
 		const FString SuperTypedef = BaseStruct ? FString::Printf(TEXT("\ttypedef %s Super;\r\n"), NameLookupCPP.GetNameCPP(BaseStruct)) : FString();
@@ -3136,8 +3255,7 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 		const FString Macroized = Macroize(*MacroName, *CombinedLine);
 		OutGeneratedHeaderText.Log(*Macroized);
 
-		FString SingletonName = StaticConstructionString.Replace(TEXT("()"), TEXT(""), ESearchCase::CaseSensitive); // function address
-		FString GetCRCName = FString::Printf(TEXT("Get_%s_CRC"), *SingletonName);
+		FString GetCRCName = FString::Printf(TEXT("Get_%s_CRC"), *SingletonName.LeftChop(2));
 
 		Out.Logf(TEXT("class UScriptStruct* %s::StaticStruct()\r\n"), StructNameCPP);
 		Out.Logf(TEXT("{\r\n"));
@@ -3161,7 +3279,7 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 		Out.Logf(TEXT("\t\textern %suint32 %s();\r\n"), *FriendApiString, *GetCRCName);
 
 		Out.Logf(TEXT("\t\tSingleton = GetStaticStruct(%s, %s, TEXT(\"%s\"), sizeof(%s), %s());\r\n"),
-			*SingletonName, *OuterName, *ActualStructName, StructNameCPP, *GetCRCName);
+			*SingletonName.LeftChop(2), *OuterName, *ActualStructName, StructNameCPP, *GetCRCName);
 
 		Out.Logf(TEXT("\t}\r\n"));
 		Out.Logf(TEXT("\treturn Singleton;\r\n"));
@@ -3192,41 +3310,21 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 		}
 	}
 
-	const FString SingletonName = GetSingletonName(Struct);
+	FString StaticsStructName = SingletonName.LeftChop(2) + TEXT("_Statics");
 
 	FUHTStringBuilder GeneratedStructRegisterFunctionText;
+	FUHTStringBuilder StaticDefinitions;
 
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\tUScriptStruct* %s\r\n"), *SingletonName);
+	GeneratedStructRegisterFunctionText.Logf(TEXT("\tstruct %s\r\n"), *StaticsStructName);
 	GeneratedStructRegisterFunctionText.Logf(TEXT("\t{\r\n"));
 
 	// if this is a no export struct, we will put a local struct here for offset determination
-	TArray<UScriptStruct*> Structs = FindNoExportStructs(Struct);
-	for (UScriptStruct* NoExportStruct : Structs)
+	TArray<UScriptStruct*> NoExportStructs = FindNoExportStructs(Struct);
+	for (UScriptStruct* NoExportStruct : NoExportStructs)
 	{
 		ExportMirrorsForNoexportStruct(GeneratedStructRegisterFunctionText, NoExportStruct, /*Indent=*/ 2);
 	}
 
-	FString CRCFuncName = FString::Printf(TEXT("Get_%s_CRC"), *SingletonName.Replace(TEXT("()"), TEXT(""), ESearchCase::CaseSensitive));
-	// Structs can either have a UClass or UPackage as outer (if declared in non-UClass header).
-	if (!bIsDynamic)
-	{
-		GeneratedStructRegisterFunctionText.Logf(TEXT("#if WITH_HOT_RELOAD\r\n"));
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\textern uint32 %s();\r\n"), *CRCFuncName);
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUPackage* Outer = %s;\r\n"), *GetPackageSingletonName(CastChecked<UPackage>(Struct->GetOuter())));
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tstatic UScriptStruct* ReturnStruct = FindExistingStructIfHotReloadOrDynamic(Outer, TEXT(\"%s\"), sizeof(%s), %s(), false);\r\n"), *ActualStructName, StructNameCPP, *CRCFuncName);
-		GeneratedStructRegisterFunctionText.Logf(TEXT("#else\r\n"));
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tstatic UScriptStruct* ReturnStruct = nullptr;\r\n"));
-		GeneratedStructRegisterFunctionText.Logf(TEXT("#endif\r\n"));
-	}
-	else
-	{
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\textern uint32 %s();\r\n"), *CRCFuncName);
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUPackage* Outer = FindOrConstructDynamicTypePackage(TEXT(\"%s\"));\r\n"), *FClass::GetTypePackageName(Struct));
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUScriptStruct* ReturnStruct = FindExistingStructIfHotReloadOrDynamic(Outer, TEXT(\"%s\"), sizeof(%s), %s(), true);\r\n"), *ActualStructName, StructNameCPP, *CRCFuncName);
-	}
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tif (!ReturnStruct)\r\n"));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t{\r\n"));
-
 	FString BaseStructString;
 	if (BaseStruct)
 	{
@@ -3238,17 +3336,6 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 		BaseStructString = TEXT("nullptr");
 	}
 
-	FString CppStructOpsString;
-	if (Struct->StructFlags & STRUCT_Native)
-	{
-		//@todo .u we don't need the auto register versions of these (except for hotreload, which should be fixed)
-		CppStructOpsString = FString::Printf(TEXT("new UScriptStruct::TCppStructOps<%s>"), StructNameCPP);
-	}
-	else
-	{
-		CppStructOpsString = TEXT("nullptr");
-	}
-
 	EStructFlags UncomputedFlags = (EStructFlags)(Struct->StructFlags & ~STRUCT_ComputedFlags);
 
 	FString OuterFunc;
@@ -3258,47 +3345,97 @@ void FNativeClassHeaderGenerator::ExportGeneratedStructBodyMacros(FOutputDevice&
 	}
 	else
 	{
-		OuterFunc = FString::Printf(TEXT("[](){ return (UObject*)FindOrConstructDynamicTypePackage(TEXT(\"%s\")); }"), *FClass::GetTypePackageName(Struct));
+		GeneratedStructRegisterFunctionText.Log(TEXT("\t\tstatic UObject* OuterFuncGetter();\r\n"));
+
+		StaticDefinitions.Logf(TEXT("\tUObject* %s::OuterFuncGetter()\r\n"), *StaticsStructName);
+		StaticDefinitions.Log (TEXT("\t{\r\n"));
+		StaticDefinitions.Logf(TEXT("\t\treturn FindOrConstructDynamicTypePackage(TEXT(\"%s\"));"), *FClass::GetTypePackageName(Struct));
+		StaticDefinitions.Log (TEXT("\t}\r\n"));
+
+		OuterFunc = TEXT("&OuterFuncGetter");
 	}
 
-	FString MetaDataParams = OutputMetaDataCodeForObject(GeneratedStructRegisterFunctionText, Struct, TEXT("Struct_MetaDataParams"), TEXT("\t\t\t"));
+	FString MetaDataParams = OutputMetaDataCodeForObject(GeneratedStructRegisterFunctionText, StaticDefinitions, Struct, *FString::Printf(TEXT("%s::Struct_MetaDataParams"), *StaticsStructName), TEXT("\t\t"), TEXT("\t"));
 
 	TArray<UProperty*> Props;
-	for (UProperty* Prop : TFieldRange<UProperty>(Struct, EFieldIteratorFlags::ExcludeSuper))
-	{
-		Props.Add(Prop);
-	}
+	Algo::Copy(TFieldRange<UProperty>(Struct, EFieldIteratorFlags::ExcludeSuper), Props);
 
 	FString NewStructOps;
 	if (Struct->StructFlags & STRUCT_Native)
 	{
-		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\tauto NewStructOpsLambda = []() -> void* { return (UScriptStruct::ICppStructOps*)new UScriptStruct::TCppStructOps<%s>(); };\r\n"), StructNameCPP);
-		NewStructOps = TEXT("&UE4CodeGen_Private::TNewCppStructOpsWrapper<decltype(NewStructOpsLambda)>::NewCppStructOps");
+		GeneratedStructRegisterFunctionText.Log(TEXT("\t\tstatic void* NewStructOps();\r\n"));
+
+		StaticDefinitions.Logf(TEXT("\tvoid* %s::NewStructOps()\r\n"), *StaticsStructName);
+		StaticDefinitions.Log (TEXT("\t{\r\n"));
+		StaticDefinitions.Logf(TEXT("\t\treturn (UScriptStruct::ICppStructOps*)new UScriptStruct::TCppStructOps<%s>();\r\n"), StructNameCPP);
+		StaticDefinitions.Log (TEXT("\t}\r\n"));
+
+		NewStructOps = TEXT("&NewStructOps");
 	}
 	else
 	{
 		NewStructOps = TEXT("nullptr");
 	}
 
-	FString PropertyRange;
-	OutputProperties(GeneratedStructRegisterFunctionText, PropertyRange, Props, TEXT("\t\t\t"));
+	FString PropertyRange = OutputProperties(GeneratedStructRegisterFunctionText, StaticDefinitions, *FString::Printf(TEXT("%s::"), *StaticsStructName), Props, TEXT("\t\t"), TEXT("\t"));
 
-	GeneratedStructRegisterFunctionText.Log (TEXT("\t\t\tstatic const UE4CodeGen_Private::FStructParams ReturnStructParams = {\r\n"));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t(UObject* (*)())%s,\r\n"), *OuterFunc);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *GetSingletonNameFuncAddr(BaseStruct));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *NewStructOps);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *CreateUTF8LiteralString(ActualStructName));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), bIsDynamic ? TEXT("RF_Public|RF_Transient") : TEXT("RF_Public|RF_Transient|RF_MarkAsNative"));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\tEStructFlags(0x%08X),\r\n"), (uint32)UncomputedFlags);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\tsizeof(%s),\r\n"), StructNameCPP);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\talignof(%s),\r\n"), StructNameCPP);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s,\r\n"), *PropertyRange);
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\t\t%s\r\n"), *MetaDataParams);
-	GeneratedStructRegisterFunctionText.Log (TEXT("\t\t\t};\r\n"));
-	GeneratedStructRegisterFunctionText.Log (TEXT("\t\t\tUE4CodeGen_Private::ConstructUScriptStruct(ReturnStruct, ReturnStructParams);\r\n"));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t}\r\n"));
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t\tstatic const UE4CodeGen_Private::FStructParams ReturnStructParams;\r\n"));
+
+	StaticDefinitions.Logf(TEXT("\tconst UE4CodeGen_Private::FStructParams %s::ReturnStructParams = {\r\n"), *StaticsStructName);
+	StaticDefinitions.Logf(TEXT("\t\t(UObject* (*)())%s,\r\n"), *OuterFunc);
+	StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), *GetSingletonNameFuncAddr(BaseStruct));
+	StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), *NewStructOps);
+	StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), *CreateUTF8LiteralString(ActualStructName));
+	StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), bIsDynamic ? TEXT("RF_Public|RF_Transient") : TEXT("RF_Public|RF_Transient|RF_MarkAsNative"));
+	StaticDefinitions.Logf(TEXT("\t\tEStructFlags(0x%08X),\r\n"), (uint32)UncomputedFlags);
+	StaticDefinitions.Logf(TEXT("\t\tsizeof(%s),\r\n"), StructNameCPP);
+	StaticDefinitions.Logf(TEXT("\t\talignof(%s),\r\n"), StructNameCPP);
+	StaticDefinitions.Logf(TEXT("\t\t%s,\r\n"), *PropertyRange);
+	StaticDefinitions.Logf(TEXT("\t\t%s\r\n"), *MetaDataParams);
+	StaticDefinitions.Log (TEXT("\t};\r\n"));
+
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t};\r\n"));
+
+	GeneratedStructRegisterFunctionText.Log(StaticDefinitions);
+
+	GeneratedStructRegisterFunctionText.Logf(TEXT("\tUScriptStruct* %s\r\n"), *SingletonName);
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t{\r\n"));
+
+	FString NoExportStructNameCPP;
+	if (NoExportStructs.Contains(Struct))
+	{
+		NoExportStructNameCPP = FString::Printf(TEXT("%s::%s"), *StaticsStructName, StructNameCPP);
+	}
+	else
+	{
+		NoExportStructNameCPP = StructNameCPP;
+	}
+
+	FString CRCFuncName = FString::Printf(TEXT("Get_%s_CRC"), *SingletonName.Replace(TEXT("()"), TEXT(""), ESearchCase::CaseSensitive));
+	// Structs can either have a UClass or UPackage as outer (if declared in non-UClass header).
+	if (!bIsDynamic)
+	{
+		GeneratedStructRegisterFunctionText.Log (TEXT("#if WITH_HOT_RELOAD\r\n"));
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\textern uint32 %s();\r\n"), *CRCFuncName);
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUPackage* Outer = %s;\r\n"), *GetPackageSingletonName(CastChecked<UPackage>(Struct->GetOuter())));
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tstatic UScriptStruct* ReturnStruct = FindExistingStructIfHotReloadOrDynamic(Outer, TEXT(\"%s\"), sizeof(%s), %s(), false);\r\n"), *ActualStructName, *NoExportStructNameCPP, *CRCFuncName);
+		GeneratedStructRegisterFunctionText.Log (TEXT("#else\r\n"));
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tstatic UScriptStruct* ReturnStruct = nullptr;\r\n"));
+		GeneratedStructRegisterFunctionText.Log (TEXT("#endif\r\n"));
+	}
+	else
+	{
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\textern uint32 %s();\r\n"), *CRCFuncName);
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUPackage* Outer = FindOrConstructDynamicTypePackage(TEXT(\"%s\"));\r\n"), *FClass::GetTypePackageName(Struct));
+		GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tUScriptStruct* ReturnStruct = FindExistingStructIfHotReloadOrDynamic(Outer, TEXT(\"%s\"), sizeof(%s), %s(), true);\r\n"), *ActualStructName, *NoExportStructNameCPP, *CRCFuncName);
+	}
+	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\tif (!ReturnStruct)\r\n"));
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t\t{\r\n"));
+
+	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\t\tUE4CodeGen_Private::ConstructUScriptStruct(ReturnStruct, %s::ReturnStructParams);\r\n"), *StaticsStructName);
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t\t}\r\n"));
 	GeneratedStructRegisterFunctionText.Logf(TEXT("\t\treturn ReturnStruct;\r\n"));
-	GeneratedStructRegisterFunctionText.Logf(TEXT("\t}\r\n"));
+	GeneratedStructRegisterFunctionText.Log (TEXT("\t}\r\n"));
 
 	uint32 StructCrc = GenerateTextCRC(*GeneratedStructRegisterFunctionText);
 	GGeneratedCodeCRCs.Add(Struct, StructCrc);
@@ -3417,7 +3554,8 @@ void FNativeClassHeaderGenerator::ExportGeneratedEnumInitCode(FOutputDevice& Out
 	}
 	GeneratedEnumRegisterFunctionText.Logf(TEXT("\t\t\t};\r\n"));
 
-	FString MetaDataParams = OutputMetaDataCodeForObject(GeneratedEnumRegisterFunctionText, Enum, TEXT("Enum_MetaDataParams"), TEXT("\t\t\t"));
+	FOutputDeviceNull OutputDeviceNull;
+	FString MetaDataParams = OutputMetaDataCodeForObject(OutputDeviceNull, GeneratedEnumRegisterFunctionText, Enum, TEXT("Enum_MetaDataParams"), TEXT(""), TEXT("\t\t\t"));
 
 	GeneratedEnumRegisterFunctionText.Logf(TEXT("\t\t\tstatic const UE4CodeGen_Private::FEnumParams EnumParams = {\r\n"));
 	GeneratedEnumRegisterFunctionText.Logf(TEXT("\t\t\t\t(UObject*(*)())%s,\r\n"), *OuterString.LeftChop(2));
@@ -4112,22 +4250,22 @@ void FNativeClassHeaderGenerator::ExportNativeFunctionHeader(
 			// all methods in interface classes are pure virtuals
 			if (bIsK2Override)
 			{
-				// For BlueprintNativeEvent methods we use the PURE_VIRTUAL() expansion. This allows Blueprints that implement the interface class to be nativized.
+				// For BlueprintNativeEvent methods we emit a stub implementation. This allows Blueprints that implement the interface class to be nativized.
 				FString ReturnValue;
 				if (ReturnProperty != nullptr)
 				{
 					UByteProperty* ByteProperty = Cast<UByteProperty>(ReturnProperty);
 					if (ByteProperty != nullptr && ByteProperty->Enum != nullptr && ByteProperty->Enum->GetCppForm() != UEnum::ECppForm::EnumClass)
 					{
-						ReturnValue = FString::Printf(TEXT(" return TEnumAsByte<%s>(%s);"), *ByteProperty->Enum->CppType, *GetNullParameterValue(ReturnProperty, false));
+						ReturnValue = FString::Printf(TEXT(" return TEnumAsByte<%s>(%s); "), *ByteProperty->Enum->CppType, *GetNullParameterValue(ReturnProperty, false));
 					}
 					else
 					{
-						ReturnValue = FString::Printf(TEXT(" return %s;"), *GetNullParameterValue(ReturnProperty, false));
+						ReturnValue = FString::Printf(TEXT(" return %s; "), *GetNullParameterValue(ReturnProperty, false));
 					}
 				}
 
-				Out.Logf(TEXT(" PURE_VIRTUAL(%s::%s,%s)"), NameLookupCPP.GetNameCPP(CastChecked<UClass>(Function->GetOuter()), true), *FunctionName, *ReturnValue);
+				Out.Logf(TEXT(" {%s}"), *ReturnValue);
 			}
 			else
 			{
diff --git a/Engine/Source/Programs/UnrealHeaderTool/Private/HeaderParser.cpp b/Engine/Source/Programs/UnrealHeaderTool/Private/HeaderParser.cpp
index e0caea48fce7..bc23d30d5c17 100644
--- a/Engine/Source/Programs/UnrealHeaderTool/Private/HeaderParser.cpp
+++ b/Engine/Source/Programs/UnrealHeaderTool/Private/HeaderParser.cpp
@@ -8699,7 +8699,7 @@ bool FHeaderParser::DefaultValueStringCppFormatToInnerFormat(const UProperty* Pr
 			int64 Value;
 			if (FDefaultValueHelper::ParseInt64(CppForm, Value))
 			{
-				OutForm = Lex::ToString(Value);
+				OutForm = LexToString(Value);
 				return EnumProp->GetUnderlyingProperty()->CanHoldValue(Value);
 			}
 		}
diff --git a/Engine/Source/Programs/UnrealHeaderTool/Private/NativeClassExporter.h b/Engine/Source/Programs/UnrealHeaderTool/Private/NativeClassExporter.h
index 868e6951262a..6a3dd7539e5b 100644
--- a/Engine/Source/Programs/UnrealHeaderTool/Private/NativeClassExporter.h
+++ b/Engine/Source/Programs/UnrealHeaderTool/Private/NativeClassExporter.h
@@ -357,34 +357,42 @@ private:
 	/**
 	 * Function to output the C++ code necessary to set up the given array of properties
 	 * 
-	 * @param	Meta			Returned string of meta data generator code
-	 * @param	OutputDevice	String output device to send the generated code to
+	 * @param	DeclOut			String output device to send the generated declarations to
+	 * @param	Out				String output device to send the generated code to
+	 * @param	Scope			The scope to prefix on all variable definitions
 	 * @param	Properties		Array of properties to export
+	 * @param	Spaces			String of spaces to use as an indent for the declaration
 	 * @param	Spaces			String of spaces to use as an indent
+	 *
+	 * @return	The string which represents a range of the emitted properties.
 	 */
-	void OutputProperties(FOutputDevice& OutputDevice, FString& OutPropertyRange, const TArray<UProperty*>& Properties, const TCHAR* Spaces);
+	FString OutputProperties(FOutputDevice& DeclOut, FOutputDevice& Out, const TCHAR* Scope, const TArray<UProperty*>& Properties, const TCHAR* DeclSpaces, const TCHAR* Spaces);
 
 	/**
 	 * Function to output the C++ code necessary to set up a property
 	 * 
-	 * @param	Meta			Returned string of meta data generator code
-	 * @param	OutputDevice	String output device to send the generated code to
+	 * @param	DeclOut			String output device to send the generated declarations to
+	 * @param	Out				String output device to send the generated code to
+	 * @param	Scope			The scope to prefix on all variable definitions
 	 * @param	Prop			Property to export
+	 * @param	DeclSpaces		String of spaces to use as an indent for the declaration
 	 * @param	Spaces			String of spaces to use as an indent
 	**/
-	void OutputProperty(FOutputDevice& OutputDevice, TArray<FPropertyNamePointerPair>& PropertyNamesAndPointers, UProperty* Prop, const TCHAR* Spaces);
+	void OutputProperty(FOutputDevice& DeclOut, FOutputDevice& Out, const TCHAR* Scope, TArray<FPropertyNamePointerPair>& PropertyNamesAndPointers, UProperty* Prop, const TCHAR* DeclSpaces, const TCHAR* Spaces);
 
 	/**
 	 * Function to output the C++ code necessary to set up a property, including an array property and its inner, array dimensions, etc.
 	 *
+	 * @param	DeclOut			The destination to write declarations to.
 	 * @param	Out				The destination to write to.
 	 * @param	Prop			Property to export
 	 * @param	OffsetStr		String specifying the property offset
 	 * @param	Name			Name for the generated variable
+	 * @param	DeclSpaces		String of spaces to use as an indent for the declaration
 	 * @param	Spaces			String of spaces to use as an indent
 	 * @param	SourceStruct	Structure that the property offset is relative to
 	**/
-	void PropertyNew(FOutputDevice& Out, UProperty* Prop, const TCHAR* OffsetStr, const TCHAR* Name, const TCHAR* Spaces, const TCHAR* SourceStruct = NULL);
+	void PropertyNew(FOutputDevice& DeclOut, FOutputDevice& Out, UProperty* Prop, const TCHAR* OffsetStr, const TCHAR* Name, const TCHAR* DeclSpaces, const TCHAR* Spaces, const TCHAR* SourceStruct = NULL);
 
 	/**
 	 * Exports the proxy definitions for the list of enums specified
diff --git a/Engine/Source/Programs/UnrealVS/CommandLineEditor.cs b/Engine/Source/Programs/UnrealVS/CommandLineEditor.cs
index 5180714d8abb..4bac8802a895 100644
--- a/Engine/Source/Programs/UnrealVS/CommandLineEditor.cs
+++ b/Engine/Source/Programs/UnrealVS/CommandLineEditor.cs
@@ -291,10 +291,12 @@ namespace UnrealVS
 								if (FullCommandLine.Length == 0)
 								{
 									PropertyStorage.RemoveProperty("LocalDebuggerCommandArguments", ProjectConfigurationName, (uint)_PersistStorageType.PST_USER_FILE);
+									PropertyStorage.RemoveProperty("RemoteDebuggerCommandArguments", ProjectConfigurationName, (uint)_PersistStorageType.PST_USER_FILE);
 								}
 								else
 								{
 									PropertyStorage.SetPropertyValue("LocalDebuggerCommandArguments", ProjectConfigurationName, (uint)_PersistStorageType.PST_USER_FILE, FullCommandLine);
+									PropertyStorage.SetPropertyValue("RemoteDebuggerCommandArguments", ProjectConfigurationName, (uint)_PersistStorageType.PST_USER_FILE, FullCommandLine);
 								}
 							}
 							else
diff --git a/Engine/Source/Programs/UnrealVS/QuickBuild.cs b/Engine/Source/Programs/UnrealVS/QuickBuild.cs
index 52af1669a89a..5fe2b3c4df54 100644
--- a/Engine/Source/Programs/UnrealVS/QuickBuild.cs
+++ b/Engine/Source/Programs/UnrealVS/QuickBuild.cs
@@ -197,6 +197,7 @@ namespace UnrealVS
 				new SubMenu {Name = "WinRT_ARM", SubMenuId = 0x1D00, DynamicStartCommandId = 0x1D30},
 				new SubMenu {Name = "HTML5", SubMenuId = 0x1E00, DynamicStartCommandId = 0x1E30},
 				new SubMenu {Name = "Linux", SubMenuId = 0x1F00, DynamicStartCommandId = 0x1F30},
+				new SubMenu {Name = "Switch", SubMenuId = 0x2000, DynamicStartCommandId = 0x2030},
 			};
 
 		/// The main root command of the Quick Build menu hierarchy - used to hide it when not active
diff --git a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BTCompositeNode.h b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BTCompositeNode.h
index cac022c06a5d..89cc5311fb81 100644
--- a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BTCompositeNode.h
+++ b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BTCompositeNode.h
@@ -59,7 +59,7 @@ struct FBTDecoratorLogic
 	UPROPERTY()
 	uint16 Number;
 
-	FBTDecoratorLogic() : Operation(EBTDecoratorLogic::Invalid) {}
+	FBTDecoratorLogic() : Operation(EBTDecoratorLogic::Invalid), Number(0) {}
 	FBTDecoratorLogic(uint8 InOperation, uint16 InNumber) : Operation(InOperation), Number(InNumber) {}
 };
 
diff --git a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeManager.h b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeManager.h
index a7f28918ab24..512087022b8d 100644
--- a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeManager.h
+++ b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeManager.h
@@ -29,7 +29,7 @@ struct FBehaviorTreeTemplateInfo
 	uint16 InstanceMemorySize;
 };
 
-UCLASS(config=Engine)
+UCLASS(config=Engine, Transient)
 class AIMODULE_API UBehaviorTreeManager : public UObject
 {
 	GENERATED_UCLASS_BODY()
diff --git a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeTypes.h b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeTypes.h
index 9fe286eb6641..81835459c9e8 100644
--- a/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeTypes.h
+++ b/Engine/Source/Runtime/AIModule/Classes/BehaviorTree/BehaviorTreeTypes.h
@@ -458,7 +458,7 @@ struct AIMODULE_API FBlackboardKeySelector
 {
 	GENERATED_USTRUCT_BODY()
 
-	FBlackboardKeySelector() : SelectedKeyID(FBlackboard::InvalidKey)
+	FBlackboardKeySelector() : SelectedKeyID(FBlackboard::InvalidKey), bNoneIsAllowedValue(false)
 	{}
 
 	/** array of allowed types with additional properties (e.g. uobject's base class) 
diff --git a/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryManager.h b/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryManager.h
index cdd7c180945f..5297b235b29f 100644
--- a/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryManager.h
+++ b/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryManager.h
@@ -152,11 +152,15 @@ FORCEINLINE bool operator== (const FEQSDebugger::FEnvQueryInfo & Left, const FEQ
 }
 #endif // USE_EQS_DEBUGGER
 
-UCLASS(config = Game, defaultconfig)
+UCLASS(config = Game, defaultconfig, Transient)
 class AIMODULE_API UEnvQueryManager : public UObject, public FTickableGameObject, public FSelfRegisteringExec
 {
 	GENERATED_UCLASS_BODY()
 
+	// makes sure we don't have any UEnvQueryManager instances serialized in. 
+	// Any loaded instance will get marked as PendingKill
+	virtual void PostLoad() override;
+
 	// We need to implement GetWorld() so that any EQS-related blueprints (such as blueprint contexts) can implement
 	// GetWorld() and so provide access to blueprint nodes using hidden WorldContextObject parameters.
 	virtual UWorld* GetWorld() const override;
diff --git a/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryTypes.h b/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryTypes.h
index 75e80d5e0408..5c92b1e05147 100644
--- a/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryTypes.h
+++ b/Engine/Source/Runtime/AIModule/Classes/EnvironmentQuery/EnvQueryTypes.h
@@ -320,8 +320,12 @@ struct AIMODULE_API FEnvTraceData
 		Detailed,
 	};
 
-	FEnvTraceData() : 
-		ProjectDown(1024.0f), ProjectUp(1024.0f), ExtentX(10.0f), ExtentY(10.0f), ExtentZ(10.0f), bOnlyBlockingHits(true),
+	FEnvTraceData() :
+		VersionNum(0), 
+		ProjectDown(1024.0f), ProjectUp(1024.0f), ExtentX(10.0f), ExtentY(10.0f), ExtentZ(10.0f),
+		PostProjectionVerticalOffset(0.0f),	TraceChannel(TraceTypeQuery1), SerializedChannel(ECC_WorldStatic),
+		TraceShape(EEnvTraceShape::Line), TraceMode(EEnvQueryTrace::None),
+		bTraceComplex(false), bOnlyBlockingHits(true),
 		bCanTraceOnNavMesh(true), bCanTraceOnGeometry(true), bCanDisableTrace(true), bCanProjectDown(false)
 	{
 	}
@@ -419,6 +423,8 @@ struct AIMODULE_API FEnvOverlapData
 		ExtentY(10.0f),
 		ExtentZ(10.0f),
 		ShapeOffset(FVector::ZeroVector),
+		OverlapChannel(ECC_WorldStatic),
+		OverlapShape(EEnvOverlapShape::Box),
 		bOnlyBlockingHits(true),
 		bOverlapComplex(false)
 	{
@@ -533,8 +539,8 @@ public:
 	void GetAllAsActors(TArray<AActor*>& OutActors) const;
 	void GetAllAsLocations(TArray<FVector>& OutLocations) const;
 
-	FEnvQueryResult() : ItemType(NULL), Status(EEnvQueryStatus::Processing), OptionIndex(0) {}
-	FEnvQueryResult(const EEnvQueryStatus::Type& InStatus) : ItemType(NULL), Status(InStatus), OptionIndex(0) {}
+	FEnvQueryResult() : ItemType(NULL), Status(EEnvQueryStatus::Processing), OptionIndex(0), QueryID(0) {}
+	FEnvQueryResult(const EEnvQueryStatus::Type& InStatus) : ItemType(NULL), Status(InStatus), OptionIndex(0), QueryID(0) {}
 
 	FORCEINLINE bool IsFinished() const { return Status != EEnvQueryStatus::Processing; }
 	FORCEINLINE bool IsAborted() const { return Status == EEnvQueryStatus::Aborted; }
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AIPerceptionSystem.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AIPerceptionSystem.h
index f3b3bf518bf5..11e3a6651d24 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AIPerceptionSystem.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AIPerceptionSystem.h
@@ -119,6 +119,20 @@ public:
 		// otherwise there's no one interested in this event, skip it.
 	}
 
+	template<typename FEventClass>
+	void OnEventsBatch(const TArray<FEventClass>& Events)
+	{
+		if (Events.Num() > 0)
+		{
+			const FAISenseID SenseID = UAISense::GetSenseID<typename FEventClass::FSenseClass>();
+			if (Senses.IsValidIndex(SenseID) && Senses[SenseID] != nullptr)
+			{
+				((typename FEventClass::FSenseClass*)Senses[SenseID])->RegisterEventsBatch(Events);
+			}
+		}
+		// otherwise there's no one interested in this event, skip it.
+	}
+
 	template<typename FEventClass>
 	static void OnEvent(UWorld* World, const FEventClass& Event)
 	{
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Hearing.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Hearing.h
index 636f5861ac49..2a06330ac980 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Hearing.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Hearing.h
@@ -88,6 +88,8 @@ protected:
 
 public:	
 	void RegisterEvent(const FAINoiseEvent& Event);	
+	void RegisterEventsBatch(const TArray<FAINoiseEvent>& Events);
+
 	// part of BP interface. Translates PerceptionEvent to FAINoiseEvent and call RegisterEvent(const FAINoiseEvent& Event)
 	virtual void RegisterWrappedEvent(UAISenseEvent& PerceptionEvent) override;
 
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Prediction.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Prediction.h
index fa90de23b589..c9f6d8b79ae7 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Prediction.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Prediction.h
@@ -26,7 +26,7 @@ struct AIMODULE_API FAIPredictionEvent
 
 	float TimeToPredict;
 		
-	FAIPredictionEvent(){}
+	FAIPredictionEvent() : Requestor(nullptr), PredictedActor(nullptr) {}
 	
 	FAIPredictionEvent(AActor* InRequestor, AActor* InPredictedActor, float PredictionTime)
 		: Requestor(InRequestor), PredictedActor(InPredictedActor), TimeToPredict(PredictionTime)
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Sight.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Sight.h
index bff074a9f2fa..bb34819991c8 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Sight.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Sight.h
@@ -38,7 +38,7 @@ struct AIMODULE_API FAISightEvent
 	UPROPERTY()
 	AActor* Observer;
 
-	FAISightEvent(){}
+	FAISightEvent() : SeenActor(nullptr), Observer(nullptr) {}
 
 	FAISightEvent(AActor* InSeenActor, AActor* InObserver, ESightPerceptionEventName::Type InEventType)
 		: Age(0.f), EventType(InEventType), SeenActor(InSeenActor), Observer(InObserver)
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Team.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Team.h
index ca9ed916c8d9..8a5ca1152fdf 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Team.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Team.h
@@ -32,7 +32,7 @@ public:
 	UPROPERTY()
 	AActor* Enemy;
 		
-	FAITeamStimulusEvent(){}	
+	FAITeamStimulusEvent() : Broadcaster(nullptr), Enemy(nullptr) {}
 	FAITeamStimulusEvent(AActor* InBroadcaster, AActor* InEnemy, const FVector& InLastKnowLocation, float EventRange, float PassedInfoAge = 0.f, float InStrength = 1.f);
 
 	FORCEINLINE void CacheBroadcastLocation()
diff --git a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Touch.h b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Touch.h
index 84a45725df91..022bf876feef 100644
--- a/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Touch.h
+++ b/Engine/Source/Runtime/AIModule/Classes/Perception/AISense_Touch.h
@@ -24,7 +24,7 @@ struct AIMODULE_API FAITouchEvent
 	UPROPERTY()
 	AActor* OtherActor;
 		
-	FAITouchEvent(){}
+	FAITouchEvent() : TouchReceiver(nullptr), OtherActor(nullptr) {}
 	
 	FAITouchEvent(AActor* InTouchReceiver, AActor* InOtherActor, const FVector& EventLocation)
 		: Location(EventLocation), TouchReceiver(InTouchReceiver), OtherActor(InOtherActor)
diff --git a/Engine/Source/Runtime/AIModule/Private/AIModule.cpp b/Engine/Source/Runtime/AIModule/Private/AIModule.cpp
index 7e62b71002f5..649d8788b433 100644
--- a/Engine/Source/Runtime/AIModule/Private/AIModule.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/AIModule.cpp
@@ -4,6 +4,7 @@
 #include "Templates/SubclassOf.h"
 #include "AISystem.h"
 #include "VisualLogger/VisualLogger.h"
+#include "GameFramework/WorldSettings.h"
 
 #if WITH_EDITOR
 #include "Developer/AssetTools/Public/IAssetTools.h"
@@ -107,8 +108,30 @@ UAISystemBase* FAIModule::CreateAISystemInstance(UWorld* World)
 {
 	UE_LOG(LogAIModule, Log, TEXT("Creating AISystem for world %s"), *GetNameSafe(World));
 	
-	TSubclassOf<UAISystemBase> AISystemClass = LoadClass<UAISystemBase>(NULL, *UAISystem::GetAISystemClassName().ToString(), NULL, LOAD_None, NULL);
-	return NewObject<UAISystemBase>(World, AISystemClass);
+	FSoftClassPath AISystemClassName = UAISystemBase::GetAISystemClassName();
+
+	if (World)
+	{
+		AWorldSettings* WorldSettings = World->GetWorldSettings();
+		if (WorldSettings)
+		{
+			AISystemClassName = WorldSettings->GetAISystemClassName();
+		}
+	}
+
+	UAISystemBase* AISystemInstance = nullptr;
+	if (AISystemClassName.IsValid())
+	{
+		TSubclassOf<UAISystemBase> AISystemClass = LoadClass<UAISystemBase>(nullptr, *AISystemClassName.ToString(), nullptr, LOAD_None, nullptr);
+
+		AISystemInstance = AISystemClass ? NewObject<UAISystemBase>(World, AISystemClass) : nullptr;
+		if (AISystemInstance == nullptr)
+		{
+			UE_LOG(LogAIModule, Error, TEXT("Failed to create AISystem instance of class %s!"), *AISystemClassName.ToString());
+		}
+	}
+
+	return AISystemInstance;
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/AIModule/Private/DataProviders/AIDataProvider.cpp b/Engine/Source/Runtime/AIModule/Private/DataProviders/AIDataProvider.cpp
index c2d25708728a..274d35f4925b 100644
--- a/Engine/Source/Runtime/AIModule/Private/DataProviders/AIDataProvider.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/DataProviders/AIDataProvider.cpp
@@ -76,6 +76,7 @@ bool FAIDataProviderStructValue::IsMatchingType(UProperty* PropType) const
 // FAIDataProviderIntValue
 
 FAIDataProviderIntValue::FAIDataProviderIntValue()
+	: DefaultValue(0)
 {
 	PropertyType = UIntProperty::StaticClass();
 }
@@ -95,6 +96,7 @@ FString FAIDataProviderIntValue::ValueToString() const
 // FAIDataProviderFloatValue
 
 FAIDataProviderFloatValue::FAIDataProviderFloatValue()
+	: DefaultValue(0.0f)
 {
 	PropertyType = UFloatProperty::StaticClass();
 }
@@ -114,6 +116,7 @@ FString FAIDataProviderFloatValue::ValueToString() const
 // FAIDataProviderBoolValue
 
 FAIDataProviderBoolValue::FAIDataProviderBoolValue()
+	: DefaultValue(false)
 {
 	PropertyType = UBoolProperty::StaticClass();
 }
diff --git a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EQSRenderingComponent.cpp b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EQSRenderingComponent.cpp
index 06c147a044d9..3be305a4c259 100644
--- a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EQSRenderingComponent.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EQSRenderingComponent.cpp
@@ -315,8 +315,37 @@ void UEQSRenderingComponent::StoreDebugData(const EQSDebug::FQueryData& DebugDat
 
 FBoxSphereBounds UEQSRenderingComponent::CalcBounds(const FTransform& LocalToWorld) const
 {
-	static FBox BoundingBox(FVector(-HALF_WORLD_MAX), FVector(HALF_WORLD_MAX));
-	return FBoxSphereBounds(BoundingBox);
+#if USE_EQS_DEBUGGER 
+	TArray<FDebugRenderSceneProxy::FSphere> Spheres;
+	Spheres.Append(DebugDataSolidSpheres);
+	const IEQSQueryResultSourceInterface* QueryDataSource = Cast<const IEQSQueryResultSourceInterface>(GetOwner());
+	if (QueryDataSource == nullptr)
+	{
+		QueryDataSource = Cast<const IEQSQueryResultSourceInterface>(this);
+	}
+
+	if (QueryDataSource != nullptr)
+	{
+		TArray<EQSDebug::FDebugHelper> DebugItems;
+
+		TArray<FDebugRenderSceneProxy::FText3d> Texts;
+		FEQSSceneProxy::CollectEQSData(this, QueryDataSource, Spheres, Texts, DebugItems);	
+	}
+
+	if (Spheres.Num())
+	{
+		FBoxSphereBounds DebugBounds(FSphere(Spheres[0].Location, Spheres[0].Radius));
+		for (int32 Index = 1; Index < Spheres.Num(); ++Index)
+		{
+			DebugBounds = DebugBounds + FSphere(Spheres[Index].Location, Spheres[Index].Radius);
+		}
+
+		return DebugBounds;
+	}
+#endif
+
+	static FSphere BoundingSphere(FVector::ZeroVector, 0.f);
+	return FBoxSphereBounds(BoundingSphere).TransformBy(LocalToWorld);
 }
 
 void UEQSRenderingComponent::CreateRenderState_Concurrent()
diff --git a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryManager.cpp b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryManager.cpp
index 5ed623792c7f..f8b58727a29d 100644
--- a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryManager.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryManager.cpp
@@ -126,6 +126,12 @@ UEnvQueryManager::UEnvQueryManager(const FObjectInitializer& ObjectInitializer)
 #endif
 }
 
+void UEnvQueryManager::PostLoad()
+{
+	Super::PostLoad();
+	MarkPendingKill();
+}
+
 UWorld* UEnvQueryManager::GetWorld() const
 {
 	return Cast<UWorld>(GetOuter());
diff --git a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryTypes.cpp b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryTypes.cpp
index db2f50b943fa..107a488a71cd 100644
--- a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryTypes.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/EnvQueryTypes.cpp
@@ -363,7 +363,10 @@ void FAIDynamicParam::GenerateConfigurableParamsFromNamedValues(UObject &QueryOw
 // FEQSQueryExecutionParams
 //----------------------------------------------------------------------//
 FEQSParametrizedQueryExecutionRequest::FEQSParametrizedQueryExecutionRequest()
-	: bInitialized(false)
+	: QueryTemplate(nullptr)
+	, RunMode(EEnvQueryRunMode::SingleResult)
+	, bUseBBKeyForQueryTemplate(false)
+	, bInitialized(false)
 {
 	//EQSQueryBlackboardKey.AddObjectFilter(this, GET_MEMBER_NAME_CHECKED(FEQSQueryExecutionParams, EQSQueryBlackboardKey), UEnvQuery::StaticClass());
 }
diff --git a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/Generators/EnvQueryGenerator_Donut.cpp b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/Generators/EnvQueryGenerator_Donut.cpp
index 676b36db940f..3dd7dabda42d 100644
--- a/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/Generators/EnvQueryGenerator_Donut.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/EnvironmentQuery/Generators/EnvQueryGenerator_Donut.cpp
@@ -92,7 +92,7 @@ void UEnvQueryGenerator_Donut::GenerateItems(FEnvQueryInstance& QueryInstance) c
 	int32 NumRings = NumberOfRings.GetValue();
 	int32 NumPoints = PointsPerRing.GetValue();
 
-	if ((InnerRadiusValue <= 0.f) || (OuterRadiusValue <= 0.f) ||
+	if ((InnerRadiusValue < 0.f) || (OuterRadiusValue <= 0.f) ||
 		(InnerRadiusValue > OuterRadiusValue) ||
 		(NumRings < 1) || (NumPoints < 1))
 	{
diff --git a/Engine/Source/Runtime/AIModule/Private/Perception/AISense_Hearing.cpp b/Engine/Source/Runtime/AIModule/Private/Perception/AISense_Hearing.cpp
index ba9d8e17da5a..60237d973e87 100644
--- a/Engine/Source/Runtime/AIModule/Private/Perception/AISense_Hearing.cpp
+++ b/Engine/Source/Runtime/AIModule/Private/Perception/AISense_Hearing.cpp
@@ -170,6 +170,13 @@ void UAISense_Hearing::RegisterEvent(const FAINoiseEvent& Event)
 	RequestImmediateUpdate();
 }
 
+void UAISense_Hearing::RegisterEventsBatch(const TArray<FAINoiseEvent>& Events)
+{
+	NoiseEvents.Append(Events);
+
+	RequestImmediateUpdate();
+}
+
 void UAISense_Hearing::RegisterWrappedEvent(UAISenseEvent& PerceptionEvent)
 {
 	UAISenseEvent_Hearing* HearingEvent = Cast<UAISenseEvent_Hearing>(&PerceptionEvent);
diff --git a/Engine/Source/Runtime/ALAudio/Private/ALAudioBuffer.cpp b/Engine/Source/Runtime/ALAudio/Private/ALAudioBuffer.cpp
index 835adc03e8ad..4a9116f1abd3 100644
--- a/Engine/Source/Runtime/ALAudio/Private/ALAudioBuffer.cpp
+++ b/Engine/Source/Runtime/ALAudio/Private/ALAudioBuffer.cpp
@@ -110,7 +110,7 @@ void FALSoundBuffer::CreateNativeBuffer(FALAudioDevice* AudioDevice, USoundWave*
 	{
 		SCOPE_CYCLE_COUNTER( STAT_AudioResourceCreationTime );
 
-		check(Wave->bIsPrecacheDone);
+		check(Wave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 
 		// Create new buffer.
 		Buffer = new FALSoundBuffer(AudioDevice);
diff --git a/Engine/Source/Runtime/Advertising/Android/AndroidAdvertising/AndroidAdvertising_APL.xml b/Engine/Source/Runtime/Advertising/Android/AndroidAdvertising/AndroidAdvertising_APL.xml
index 5badba7ee59d..a68c16326573 100644
--- a/Engine/Source/Runtime/Advertising/Android/AndroidAdvertising/AndroidAdvertising_APL.xml
+++ b/Engine/Source/Runtime/Advertising/Android/AndroidAdvertising/AndroidAdvertising_APL.xml
@@ -15,18 +15,33 @@
 				<log text="Not including AdMob support. Enable in Android project settings if you need to use it."/>
 			</false>
 		</if>
+
+		<!-- check if using Gradle -->
+		<setBoolFromProperty result="bGradle" ini="Engine" section="/Script/AndroidRuntimeSettings.AndroidRuntimeSettings" property="bEnableGradle" default="false"/>
 	</init>
 
 	<!-- AAR dependencies -->
 	<AARImports>
 		<if condition="bSupportAdMob">
 			<true>
-				<insertValue value="com.google.android.gms,play-services-ads,11.0.4"/>
-				<insertNewline/>
+				<if condition="bGradle">
+					<false>
+						<insertValue value="com.google.android.gms,play-services-ads,11.0.4"/>
+						<insertNewline/>
+					</false>
+				</if>
 			</true>
 		</if>
 	</AARImports>
 
+	<buildGradleAdditions>
+		<insert>
+dependencies {
+	implementation('com.google.android.gms:play-services-ads:11.8.0')
+}
+		</insert>
+	</buildGradleAdditions>
+
 	<!-- optional updates applied to AndroidManifest.xml -->
 	<androidManifestUpdates>
 		<if condition="bSupportAdMob">
diff --git a/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsConversion.h b/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsConversion.h
index 7467ea56a066..43c7b9c04e68 100644
--- a/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsConversion.h
+++ b/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsConversion.h
@@ -3,29 +3,27 @@
 #pragma once
 
 #include "CoreMinimal.h"
-// This MUST be included here to allow code that uses FGuids to work with the ToString template below.
-// 2-phase instantiation will only find overloads that it knows about at the time of definition,
-// so we must pre-include all types that have a Lex::ToString overload we may want to use.
-// Super ugly, but the only better solution is to have everyone override ToString at the global namespace
-// so ADL would find the implementation at instantiation instead.
-#include "Misc/Guid.h"
 
 /** Helpers for converting various common types to strings that analytics providers can consume. */
 namespace AnalyticsConversion
 {
 	/** Lexical conversion. Allow any type that we have a Lex for. Can't use universal references here because it then eats all non-perfect matches for the array and TMap conversions below, which we want to use a custom, analytics specific implementation for. */
 	template <typename T>
-	inline auto ToString(const T& Value) -> decltype(Lex::ToString(Value)) 
+#if PLATFORM_COMPILER_HAS_DECLTYPE_AUTO
+	inline decltype(auto) ToString(const T& Value)
+#else
+	inline auto ToString(const T& Value) -> decltype(LexToString(Value)) 
+#endif
 	{
-		return Lex::ToString(Value);
+		return LexToString(Value);
 	}
 	inline FString ToString(float Value)
 	{
-		return Lex::ToSanitizedString(Value);
+		return LexToSanitizedString(Value);
 	}
 	inline FString ToString(double Value)
 	{
-		return Lex::ToSanitizedString(Value);
+		return LexToSanitizedString(Value);
 	}
 
 	/** Array conversion. Creates comma-separated list. */
diff --git a/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsEventAttribute.h b/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsEventAttribute.h
index 36bea3138633..53335271a4e9 100644
--- a/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsEventAttribute.h
+++ b/Engine/Source/Runtime/Analytics/Analytics/Public/AnalyticsEventAttribute.h
@@ -57,10 +57,10 @@ struct FAnalyticsEventAttribute
 			return AttrValueString;
 		case AttrTypeEnum::Number:
 			if (AttrValueNumber - FMath::TruncToFloat(AttrValueNumber) == 0.0)
-				return Lex::ToSanitizedString((int64)AttrValueNumber);
-			return Lex::ToSanitizedString(AttrValueNumber);
+				return LexToSanitizedString((int64)AttrValueNumber);
+			return LexToSanitizedString(AttrValueNumber);
 		case AttrTypeEnum::Boolean:
-			return Lex::ToString(AttrValueBool);
+			return LexToString(AttrValueBool);
 		case AttrTypeEnum::Null:
 			return TEXT("null");
 		default:
@@ -72,7 +72,7 @@ struct FAnalyticsEventAttribute
 public: // null
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, FJsonNull)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(0)
 		, AttrValueBool(false)
@@ -83,7 +83,7 @@ public: // null
 public: // numeric types
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, double InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(InValue)
 		, AttrValueBool(false)
@@ -92,7 +92,7 @@ public: // numeric types
 	}
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, float InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(InValue)
 		, AttrValueBool(false)
@@ -101,7 +101,7 @@ public: // numeric types
 	}
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, int32 InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(InValue)
 		, AttrValueBool(false)
@@ -110,7 +110,7 @@ public: // numeric types
 	}
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, uint32 InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(InValue)
 		, AttrValueBool(false)
@@ -121,7 +121,7 @@ public: // numeric types
 public: // boolean
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, bool InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString()
 		, AttrValueNumber(0)
 		, AttrValueBool(InValue)
@@ -132,7 +132,7 @@ public: // boolean
 public: // json fragment
 	template <typename NameType>
 	FAnalyticsEventAttribute(NameType&& InName, FJsonFragment&& Fragment)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString(MoveTemp(Fragment.FragmentString))
 		, AttrValueNumber(0)
 		, AttrValueBool(false)
@@ -142,14 +142,14 @@ public: // json fragment
 
 public: // string (catch-all)
 	/**
-	 * Helper constructor to make an attribute from a name/value pair by forwarding through Lex::ToString and AnalyticsConversion::ToString.
+	 * Helper constructor to make an attribute from a name/value pair by forwarding through LexToString and AnalyticsConversion::ToString.
 	 * 
-	 * @param InName Name of the attribute. Will be converted to a string via forwarding to Lex::ToString
+	 * @param InName Name of the attribute. Will be converted to a string via forwarding to LexToString
 	 * @param InValue Value of the attribute. Will be converted to a string via forwarding to AnalyticsConversion::ToString (same as Lex but with basic support for arrays and maps)
 	 */
 	template <typename NameType, typename ValueType>
 	FAnalyticsEventAttribute(NameType&& InName, ValueType&& InValue)
-		: AttrName(Lex::ToString(Forward<NameType>(InName)))
+		: AttrName(LexToString(Forward<NameType>(InName)))
 		, AttrValueString(AnalyticsConversion::ToString(Forward<ValueType>(InValue)))
 		, AttrValueNumber(0)
 		, AttrValueBool(false)
diff --git a/Engine/Source/Runtime/Analytics/AnalyticsET/Private/HttpServiceTracker.cpp b/Engine/Source/Runtime/Analytics/AnalyticsET/Private/HttpServiceTracker.cpp
index d61fca640df0..226695576a56 100644
--- a/Engine/Source/Runtime/Analytics/AnalyticsET/Private/HttpServiceTracker.cpp
+++ b/Engine/Source/Runtime/Analytics/AnalyticsET/Private/HttpServiceTracker.cpp
@@ -42,7 +42,7 @@ bool FHttpServiceTracker::Tick(float DeltaTime)
 				// one attribute per response code.
 				for (const auto& ResponseCodeMapPair : MetricsMapPair.Value.ResponseCodes)
 				{
-					Attrs.Emplace(FString(TEXT("Code-")) + Lex::ToString(ResponseCodeMapPair.Key), ResponseCodeMapPair.Value);
+					Attrs.Emplace(FString(TEXT("Code-")) + LexToString(ResponseCodeMapPair.Key), ResponseCodeMapPair.Value);
 				}
 				AnalyticsProvider->RecordEvent(MetricsMapPair.Key.ToString(), Attrs);
 			}
diff --git a/Engine/Source/Runtime/Analytics/AnalyticsET/Private/IAnalyticsProviderET.cpp b/Engine/Source/Runtime/Analytics/AnalyticsET/Private/IAnalyticsProviderET.cpp
index fc2c237177e9..c2d82e32a1b8 100644
--- a/Engine/Source/Runtime/Analytics/AnalyticsET/Private/IAnalyticsProviderET.cpp
+++ b/Engine/Source/Runtime/Analytics/AnalyticsET/Private/IAnalyticsProviderET.cpp
@@ -38,7 +38,7 @@ struct FAnalyticsPerfTracker : FTickerObjectBase
 			LogFile.Serialize(TEXT("Date,CL,RunID,Time,WindowSeconds,ProfiledSeconds,Frames,Flushes,Events,Bytes,FrameCounter"), ELogVerbosity::Log, FName());
 			LastSubmitTime = StartTime;
 			StartDate = FDateTime::UtcNow().ToIso8601();
-			CL = Lex::ToString(FEngineVersion::Current().GetChangelist());
+			CL = LexToString(FEngineVersion::Current().GetChangelist());
 		}
 	}
 
@@ -75,6 +75,8 @@ private:
 	/** Check to see if we need to log another window of time. */
 	virtual bool Tick(float DeltaTime) override
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_IAnalyticsProviderET_Tick);
+
 		if (bEnabled)
 		{
 			++FramesThisWindow;
@@ -402,9 +404,9 @@ bool FAnalyticsProviderET::Tick(float DeltaSeconds)
 				FTimespan TimeSinceLastFailure = FDateTime::UtcNow() - LastFailedFlush;
 				if (TimeSinceLastFailure.GetTotalSeconds() >= RetryDelaySecs)
 				{
-			FlushEvents();
-		}
-	}
+					FlushEvents();
+				}
+			}
 		}
 	}
 	return true;
diff --git a/Engine/Source/Runtime/Android/AndroidAudio/Private/AndroidAudioBuffer.cpp b/Engine/Source/Runtime/Android/AndroidAudio/Private/AndroidAudioBuffer.cpp
index b8c32e4a3b45..ccb5f9ab3eaa 100644
--- a/Engine/Source/Runtime/Android/AndroidAudio/Private/AndroidAudioBuffer.cpp
+++ b/Engine/Source/Runtime/Android/AndroidAudio/Private/AndroidAudioBuffer.cpp
@@ -40,7 +40,7 @@ FSLESSoundBuffer::~FSLESSoundBuffer( void )
 
 FSLESSoundBuffer* FSLESSoundBuffer::CreateQueuedBuffer( FSLESAudioDevice* AudioDevice, USoundWave* InWave )
 {
-	check(InWave->bIsPrecacheDone);
+	check(InWave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 	
 	// Always create a new buffer for real time decompressed sounds
 	FSLESSoundBuffer* Buffer = new FSLESSoundBuffer( AudioDevice);
diff --git a/Engine/Source/Runtime/Android/AndroidRuntimeSettings/Classes/AndroidRuntimeSettings.h b/Engine/Source/Runtime/Android/AndroidRuntimeSettings/Classes/AndroidRuntimeSettings.h
index 24566cfa04c2..4350c5f0eb69 100644
--- a/Engine/Source/Runtime/Android/AndroidRuntimeSettings/Classes/AndroidRuntimeSettings.h
+++ b/Engine/Source/Runtime/Android/AndroidRuntimeSettings/Classes/AndroidRuntimeSettings.h
@@ -6,12 +6,7 @@
 #include "UObject/ObjectMacros.h"
 #include "UObject/Object.h"
 #include "Engine/EngineTypes.h"
-
-#if WITH_ENGINE
 #include "AudioCompressionSettings.h"
-#else
-struct FPlatformRuntimeAudioCompressionOverrides;
-#endif
 
 #include "AndroidRuntimeSettings.generated.h"
 
@@ -217,6 +212,10 @@ public:
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "APK Packaging", Meta = (DisplayName = "Enable Gradle instead of Ant"))
 	bool bEnableGradle;
 
+	// Enable -Xlint:unchecked and -Xlint:depreciation for Java compiling (Gradle only)
+	UPROPERTY(GlobalConfig, EditAnywhere, Category = "APK Packaging", Meta = (DisplayName = "Enable Lint depreciation checks"))
+	bool bEnableLint;
+
 	// Should the data be placed into the .apk file instead of a separate .obb file. Amazon requires this to be enabled, but Google Play Store will not allow .apk files larger than 50MB, so only small games will work with this enabled.
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = "APK Packaging", Meta = (DisplayName = "Package game data inside .apk?"))
 	bool bPackageDataInsideApk;
@@ -409,6 +408,14 @@ public:
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = LaunchImages, meta = (DisplayName = "Show launch image"))
 	bool bShowLaunchImage;
 
+	/** Allows accelerometer, magnetometer, and gyroscope event handling, disabling may improve performance. */
+	UPROPERTY(GlobalConfig, EditAnywhere, Category = Input, meta = (DisplayName = "Allow IMU Sampling"))
+	bool bAllowIMU;
+
+	// If checked, Bluetooth connected controllers will send input
+	UPROPERTY(GlobalConfig, EditAnywhere, Category = Input, meta = (DisplayName = "Allow Bluetooth controllers"))
+	bool bAllowControllers;
+
 	/** Android encoding options. */
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = Audio, meta = (DisplayName = "Encoding Format"))
 	TEnumAsByte<EAndroidAudio::Type> AndroidAudio;
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimGraphRuntimeModule.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimGraphRuntimeModule.cpp
index 5f2f69f68700..5aaa2fb20522 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimGraphRuntimeModule.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimGraphRuntimeModule.cpp
@@ -2,6 +2,9 @@
 
 #include "Modules/ModuleInterface.h"
 #include "Modules/ModuleManager.h"
+#include "BoneControllers/AnimNode_AnimDynamics.h"
+#include "UObject/UObjectIterator.h"
+#include "Animation/AnimInstance.h"
 
 //////////////////////////////////////////////////////////////////////////
 // FAnimGraphRuntimeModule
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_AimOffsetLookAt.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_AimOffsetLookAt.cpp
index 0525305bf904..cdb633a81496 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_AimOffsetLookAt.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_AimOffsetLookAt.cpp
@@ -50,7 +50,7 @@ void FAnimNode_AimOffsetLookAt::UpdateAssetPlayer(const FAnimationUpdateContext&
 {
 	EvaluateGraphExposedInputs.Execute(Context);
 
-	bIsLODEnabled = IsLODEnabled(Context.AnimInstanceProxy, LODThreshold);
+	bIsLODEnabled = IsLODEnabled(Context.AnimInstanceProxy);
 
 	// We don't support ticking and advancing time, because Inputs are determined during Evaluate.
 	// it may be possible to advance time there (is it a problem with notifies?)
@@ -178,6 +178,7 @@ void FAnimNode_AimOffsetLookAt::GatherDebugData(FNodeDebugData& DebugData)
 
 FAnimNode_AimOffsetLookAt::FAnimNode_AimOffsetLookAt()
 	: LODThreshold(INDEX_NONE)
+	, bIsLODEnabled(false)
 	, SocketAxis(1.0f, 0.0f, 0.0f)
 	, Alpha(1.f)
 {
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_ApplyAdditive.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_ApplyAdditive.cpp
index 9f943deb5bf6..455d17bdaf1d 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_ApplyAdditive.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_ApplyAdditive.cpp
@@ -2,6 +2,7 @@
 
 #include "AnimNodes/AnimNode_ApplyAdditive.h"
 #include "AnimationRuntime.h"
+#include "Animation/AnimInstanceProxy.h"
 
 /////////////////////////////////////////////////////
 // FAnimNode_ApplyAdditive
@@ -12,6 +13,9 @@ void FAnimNode_ApplyAdditive::Initialize_AnyThread(const FAnimationInitializeCon
 
 	Base.Initialize(Context);
 	Additive.Initialize(Context);
+
+	AlphaBoolBlend.Reinitialize();
+	AlphaScaleBiasClamp.Reinitialize();
 }
 
 void FAnimNode_ApplyAdditive::CacheBones_AnyThread(const FAnimationCacheBonesContext& Context) 
@@ -25,12 +29,28 @@ void FAnimNode_ApplyAdditive::Update_AnyThread(const FAnimationUpdateContext& Co
 	Base.Update(Context);
 
 	ActualAlpha = 0.f;
-	if (IsLODEnabled(Context.AnimInstanceProxy, LODThreshold))
+	if (IsLODEnabled(Context.AnimInstanceProxy))
 	{
 		// @note: If you derive from this class, and if you have input that you rely on for base
 		// this is not going to work	
 		EvaluateGraphExposedInputs.Execute(Context);
-		ActualAlpha = AlphaScaleBias.ApplyTo(Alpha);
+
+		switch (AlphaInputType)
+		{
+		case EAnimAlphaInputType::Float:
+			ActualAlpha = AlphaScaleBias.ApplyTo(AlphaScaleBiasClamp.ApplyTo(Alpha, Context.GetDeltaTime()));
+			break;
+		case EAnimAlphaInputType::Bool:
+			ActualAlpha = AlphaBoolBlend.ApplyTo(bAlphaBoolEnabled, Context.GetDeltaTime());
+			break;
+		case EAnimAlphaInputType::Curve:
+			if (UAnimInstance* AnimInstance = Cast<UAnimInstance>(Context.AnimInstanceProxy->GetAnimInstanceObject()))
+			{
+				ActualAlpha = AlphaScaleBiasClamp.ApplyTo(AnimInstance->GetCurveValue(AlphaCurveName), Context.GetDeltaTime());
+			}
+			break;
+		};
+
 		if (FAnimWeight::IsRelevant(ActualAlpha))
 		{
 			Additive.Update(Context.FractionalWeight(ActualAlpha));
@@ -62,6 +82,8 @@ FAnimNode_ApplyAdditive::FAnimNode_ApplyAdditive()
 	: Alpha(1.0f)
 	, LODThreshold(INDEX_NONE)
 	, ActualAlpha(0.f)
+	, AlphaInputType(EAnimAlphaInputType::Float)
+	, bAlphaBoolEnabled(true)
 {
 }
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_CopyPoseFromMesh.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_CopyPoseFromMesh.cpp
index 3fcb621358ff..3fa857b79f60 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_CopyPoseFromMesh.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_CopyPoseFromMesh.cpp
@@ -134,6 +134,10 @@ void FAnimNode_CopyPoseFromMesh::Evaluate_AnyThread(FPoseContext& Output)
 
 void FAnimNode_CopyPoseFromMesh::GatherDebugData(FNodeDebugData& DebugData)
 {
+	FString DebugLine = DebugData.GetNodeName(this);
+
+	DebugLine += FString::Printf(TEXT("('%s')"), *GetNameSafe(CurrentlyUsedSourceMeshComponent.Get() ? CurrentlyUsedSourceMeshComponent.Get()->SkeletalMesh : nullptr));
+	DebugData.AddDebugItem(DebugLine, true);
 }
 
 void FAnimNode_CopyPoseFromMesh::ReinitializeMeshComponent(USkeletalMeshComponent* NewSourceMeshComponent, FAnimInstanceProxy* AnimInstanceProxy)
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_LayeredBoneBlend.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_LayeredBoneBlend.cpp
index b42a9386ffe3..504eb3c29139 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_LayeredBoneBlend.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_LayeredBoneBlend.cpp
@@ -78,27 +78,32 @@ void FAnimNode_LayeredBoneBlend::ReinitializeBoneBlendWeights(const FBoneContain
 	//Reinitialize bone blend weights now that we have cleared them
 	FAnimationRuntime::UpdateDesiredBoneWeight(DesiredBoneBlendWeights, CurrentBoneBlendWeights, BlendWeights);
 
-	TArray<SmartName::UID_Type> const & CurveUIDs = RequiredBones.GetAnimCurveNameUids();
-	CurvePoseSourceIndices.Reset(CurveUIDs.Num());
+	TArray<uint16> const& CurveUIDFinder = RequiredBones.GetUIDToArrayLookupTable();
+	const int32 TotalCount = FBlendedCurve::GetValidElementCount(&CurveUIDFinder);
+	CurvePoseSourceIndices.Reset(TotalCount);
 	// initialize with FF - which is default
-	CurvePoseSourceIndices.Init(DEFAULT_SOURCEINDEX, CurveUIDs.Num());
+	CurvePoseSourceIndices.Init(DEFAULT_SOURCEINDEX, TotalCount);
 
 	// now go through point to correct source indices. Curve only picks one source index
-	for (int32 CurveBlendIter = 0; CurveBlendIter < CurvePoseSourceIndices.Num(); ++CurveBlendIter)
+	for (int32 UIDIndex = 0; UIDIndex < CurveUIDFinder.Num(); ++UIDIndex)
 	{
-		SmartName::UID_Type CurveUID = CurveUIDs[CurveBlendIter];
-		
-		const FCurveMetaData* CurveMetaData = Skeleton->GetCurveMetaData(CurveUID);
-		if (CurveMetaData && CurveMetaData->LinkedBones.Num() > 0)
+		int32 CurrentPoseIndex = CurveUIDFinder[UIDIndex];
+		if (CurrentPoseIndex != MAX_uint16)
 		{
-			for (int32 LinkedBoneIndex = 0; LinkedBoneIndex < CurveMetaData->LinkedBones.Num(); ++LinkedBoneIndex)
+			SmartName::UID_Type CurveUID = (SmartName::UID_Type)UIDIndex;
+
+			const FCurveMetaData* CurveMetaData = Skeleton->GetCurveMetaData(CurveUID);
+			if (CurveMetaData && CurveMetaData->LinkedBones.Num() > 0)
 			{
-				FCompactPoseBoneIndex CompactPoseIndex = CurveMetaData->LinkedBones[LinkedBoneIndex].GetCompactPoseIndex(RequiredBones);
-				if (CompactPoseIndex != INDEX_NONE)
+				for (int32 LinkedBoneIndex = 0; LinkedBoneIndex < CurveMetaData->LinkedBones.Num(); ++LinkedBoneIndex)
 				{
-					if (DesiredBoneBlendWeights[CompactPoseIndex.GetInt()].BlendWeight > 0.f)
+					FCompactPoseBoneIndex CompactPoseIndex = CurveMetaData->LinkedBones[LinkedBoneIndex].GetCompactPoseIndex(RequiredBones);
+					if (CompactPoseIndex != INDEX_NONE)
 					{
-						CurvePoseSourceIndices[CurveBlendIter] = DesiredBoneBlendWeights[CompactPoseIndex.GetInt()].SourceIndex;
+						if (DesiredBoneBlendWeights[CompactPoseIndex.GetInt()].BlendWeight > 0.f)
+						{
+							CurvePoseSourceIndices[CurrentPoseIndex] = DesiredBoneBlendWeights[CompactPoseIndex.GetInt()].SourceIndex;
+						}
 					}
 				}
 			}
@@ -123,54 +128,62 @@ void FAnimNode_LayeredBoneBlend::CacheBones_AnyThread(const FAnimationCacheBones
 
 void FAnimNode_LayeredBoneBlend::Update_AnyThread(const FAnimationUpdateContext& Context)
 {
-	EvaluateGraphExposedInputs.Execute(Context);
-
 	bHasRelevantPoses = false;
 	int32 RootMotionBlendPose = -1;
 	float RootMotionWeight = 0.f;
 	const float RootMotionClearWeight = bBlendRootMotionBasedOnRootBone ? 0.f : 1.f;
 
-	for (int32 ChildIndex = 0; ChildIndex < BlendPoses.Num(); ++ChildIndex)
+	if (IsLODEnabled(Context.AnimInstanceProxy))
 	{
-		const float ChildWeight = BlendWeights[ChildIndex];
-		if (FAnimWeight::IsRelevant(ChildWeight))
+		EvaluateGraphExposedInputs.Execute(Context);
+
+		for (int32 ChildIndex = 0; ChildIndex < BlendPoses.Num(); ++ChildIndex)
 		{
-			if (bHasRelevantPoses == false)
+			const float ChildWeight = BlendWeights[ChildIndex];
+			if (FAnimWeight::IsRelevant(ChildWeight))
 			{
-				// If our cache is invalid, attempt to update it.
-				if (IsCacheInvalid(Context.AnimInstanceProxy->GetSkeleton()))
+				if (bHasRelevantPoses == false)
 				{
-					ReinitializeBoneBlendWeights(Context.AnimInstanceProxy->GetRequiredBones(), Context.AnimInstanceProxy->GetSkeleton());
-
-					// If Cache is still invalid, we don't have correct DesiredBoneBlendWeights, so abort.
-					// bHasRelevantPoses == false, will passthrough in evaluate.
-					if (!ensure(IsCacheInvalid(Context.AnimInstanceProxy->GetSkeleton())))
+					// If our cache is invalid, attempt to update it.
+					if (IsCacheInvalid(Context.AnimInstanceProxy->GetSkeleton()))
 					{
-						break;
+						ReinitializeBoneBlendWeights(Context.AnimInstanceProxy->GetRequiredBones(), Context.AnimInstanceProxy->GetSkeleton());
+
+						// If Cache is still invalid, we don't have correct DesiredBoneBlendWeights, so abort.
+						// bHasRelevantPoses == false, will passthrough in evaluate.
+						if (!ensure(IsCacheInvalid(Context.AnimInstanceProxy->GetSkeleton())))
+						{
+							break;
+						}
+					}
+					else
+					{
+						FAnimationRuntime::UpdateDesiredBoneWeight(DesiredBoneBlendWeights, CurrentBoneBlendWeights, BlendWeights);
+					}
+
+					bHasRelevantPoses = true;
+
+					if(bBlendRootMotionBasedOnRootBone)
+					{
+						const float NewRootMotionWeight = CurrentBoneBlendWeights[0].BlendWeight;
+						if(NewRootMotionWeight > ZERO_ANIMWEIGHT_THRESH)
+						{
+							RootMotionWeight = NewRootMotionWeight;
+							RootMotionBlendPose = CurrentBoneBlendWeights[0].SourceIndex;
+						}
 					}
 				}
-				else
-				{
-					FAnimationRuntime::UpdateDesiredBoneWeight(DesiredBoneBlendWeights, CurrentBoneBlendWeights, BlendWeights);
-				}
 
-				bHasRelevantPoses = true;
-
-				if(bBlendRootMotionBasedOnRootBone)
-				{
-					const float NewRootMotionWeight = CurrentBoneBlendWeights[0].BlendWeight;
-					if(NewRootMotionWeight > ZERO_ANIMWEIGHT_THRESH)
-					{
-						RootMotionWeight = NewRootMotionWeight;
-						RootMotionBlendPose = CurrentBoneBlendWeights[0].SourceIndex;
-					}
-				}
+				const float ThisPoseRootMotionWeight = (ChildIndex == RootMotionBlendPose) ? RootMotionWeight : RootMotionClearWeight;
+				BlendPoses[ChildIndex].Update(Context.FractionalWeightAndRootMotion(ChildWeight, ThisPoseRootMotionWeight));
 			}
-
-			const float ThisPoseRootMotionWeight = (ChildIndex == RootMotionBlendPose) ? RootMotionWeight : RootMotionClearWeight;
-			BlendPoses[ChildIndex].Update(Context.FractionalWeightAndRootMotion(ChildWeight, ThisPoseRootMotionWeight));
 		}
 	}
+	else
+	{
+		// Clear BlendWeights if disabled by LODThreshold.
+		BlendWeights.Init(0.f, BlendWeights.Num());
+	}
 
 	// initialize children
 	const float BaseRootMotionWeight = 1.f - RootMotionWeight;
@@ -225,20 +238,26 @@ void FAnimNode_LayeredBoneBlend::Evaluate_AnyThread(FPoseContext& Output)
 		}
 
 		// filter to make sure it only includes curves that is linked to the correct bone filter
-		const TArray<SmartName::UID_Type>& UIDList = (*Output.Curve.UIDList);
-		for (int32 CurveIndex = 0; CurveIndex < CurvePoseSourceIndices.Num(); ++CurveIndex)
+		TArray<uint16> const* CurveUIDFinder = Output.Curve.UIDToArrayIndexLUT;
+		const int32 TotalCount = Output.Curve.NumValidCurveCount;
+		// now go through point to correct source indices. Curve only picks one source index
+		for (int32 UIDIndex = 0; UIDIndex < CurveUIDFinder->Num(); ++UIDIndex)
 		{
-			int32 SourceIndex = CurvePoseSourceIndices[CurveIndex];
-			if (SourceIndex != DEFAULT_SOURCEINDEX)
+			int32 CurvePoseIndex = Output.Curve.GetArrayIndexByUID(UIDIndex);
+			if (CurvePoseIndex != INDEX_NONE)
 			{
-				// if source index is set, clear base pose curve value
-				BasePoseContext.Curve.Set(UIDList[CurveIndex], 0.f);
-				for (int32 ChildIndex = 0; ChildIndex < NumPoses; ++ChildIndex)
+				int32 SourceIndex = CurvePoseSourceIndices[CurvePoseIndex];
+				if (SourceIndex != DEFAULT_SOURCEINDEX)
 				{
-					if (SourceIndex != ChildIndex)
+					// if source index is set, clear base pose curve value
+					BasePoseContext.Curve.Set(UIDIndex, 0.f);
+					for (int32 ChildIndex = 0; ChildIndex < NumPoses; ++ChildIndex)
 					{
-						// if not source, clear it
-						TargetBlendCurves[ChildIndex].Set(UIDList[CurveIndex], 0.f);
+						if (SourceIndex != ChildIndex)
+						{
+							// if not source, clear it
+							TargetBlendCurves[ChildIndex].Set(UIDIndex, 0.f);
+						}
 					}
 				}
 			}
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_MakeDynamicAdditive.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_MakeDynamicAdditive.cpp
index 757f203a63be..405550edd78f 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_MakeDynamicAdditive.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_MakeDynamicAdditive.cpp
@@ -7,6 +7,7 @@
 // FAnimNode_MakeDynamicAdditive
 
 FAnimNode_MakeDynamicAdditive::FAnimNode_MakeDynamicAdditive()
+	: bMeshSpaceAdditive(false)
 {
 }
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseBlendNode.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseBlendNode.cpp
index 6046f9d6c038..75d4fe1e008c 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseBlendNode.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseBlendNode.cpp
@@ -8,6 +8,7 @@
 // FAnimPoseByNameNode
 
 FAnimNode_PoseBlendNode::FAnimNode_PoseBlendNode()
+	: CustomCurve(nullptr)
 {
 	BlendOption = EAlphaBlendOption::Linear;
 }
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseDriver.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseDriver.cpp
index 4e79c4dad221..3deea4d4480f 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseDriver.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseDriver.cpp
@@ -16,6 +16,9 @@ FAnimNode_PoseDriver::FAnimNode_PoseDriver()
 	DriveOutput = EPoseDriverOutput::DrivePoses;
 
 	RBFParams.DistanceMethod = ERBFDistanceMethod::SwingAngle;
+
+	TwistAxis_DEPRECATED = BA_X;
+	bOnlyDriveSelectedBones = false;
 }
 
 void FAnimNode_PoseDriver::Initialize_AnyThread(const FAnimationInitializeContext& Context)
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseSnapshot.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseSnapshot.cpp
index 7a4fb015a0fa..2606ca7e7a90 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseSnapshot.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_PoseSnapshot.cpp
@@ -8,6 +8,7 @@
 
 FAnimNode_PoseSnapshot::FAnimNode_PoseSnapshot()
 {
+	Mode = ESnapshotSourceMode::NamedSnapshot;
 	MappedSourceMeshName = NAME_None;
 	MappedTargetMeshName = NAME_None;
 	TargetBoneNameMesh = NAME_None;
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RandomPlayer.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RandomPlayer.cpp
index e758693c1ca1..975ad63a9d10 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RandomPlayer.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RandomPlayer.cpp
@@ -5,7 +5,8 @@
 #include "Animation/AnimInstanceProxy.h"
 
 FAnimNode_RandomPlayer::FAnimNode_RandomPlayer()
-: CurrentEntry(INDEX_NONE)
+: bShuffleMode(false)
+, CurrentEntry(INDEX_NONE)
 , NextEntry(INDEX_NONE)
 , CurrentDataIndex(0)
 {
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotateRootBone.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotateRootBone.cpp
index bc0e436655d2..c49538f23b94 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotateRootBone.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotateRootBone.cpp
@@ -10,6 +10,9 @@ void FAnimNode_RotateRootBone::Initialize_AnyThread(const FAnimationInitializeCo
 	FAnimNode_Base::Initialize_AnyThread(Context);
 
 	BasePose.Initialize(Context);
+
+	PitchScaleBiasClamp.Reinitialize();
+	YawScaleBiasClamp.Reinitialize();
 }
 
 void FAnimNode_RotateRootBone::CacheBones_AnyThread(const FAnimationCacheBonesContext& Context) 
@@ -21,6 +24,9 @@ void FAnimNode_RotateRootBone::Update_AnyThread(const FAnimationUpdateContext& C
 {
 	EvaluateGraphExposedInputs.Execute(Context);
 	BasePose.Update(Context);
+
+	ActualPitch = PitchScaleBiasClamp.ApplyTo(Pitch, Context.GetDeltaTime());
+	ActualYaw = YawScaleBiasClamp.ApplyTo(Yaw, Context.GetDeltaTime());
 }
 
 void FAnimNode_RotateRootBone::Evaluate_AnyThread(FPoseContext& Output)
@@ -28,9 +34,6 @@ void FAnimNode_RotateRootBone::Evaluate_AnyThread(FPoseContext& Output)
 	// Evaluate the input
 	BasePose.Evaluate(Output);
 
-	const float ActualPitch = PitchScaleBiasClamp.ApplyTo(Pitch);
-	const float ActualYaw = YawScaleBiasClamp.ApplyTo(Yaw);
-
 	checkSlow(!FMath::IsNaN(ActualYaw) && FMath::IsFinite(ActualYaw));
 	checkSlow(!FMath::IsNaN(ActualPitch) && FMath::IsFinite(ActualPitch));
 
@@ -55,9 +58,6 @@ void FAnimNode_RotateRootBone::Evaluate_AnyThread(FPoseContext& Output)
 void FAnimNode_RotateRootBone::GatherDebugData(FNodeDebugData& DebugData)
 {
 	FString DebugLine = DebugData.GetNodeName(this);
-	
-	const float ActualPitch = PitchScaleBiasClamp.ApplyTo(Pitch);
-	const float ActualYaw = YawScaleBiasClamp.ApplyTo(Yaw);
 
 	DebugLine += FString::Printf(TEXT("Pitch(%.2f) Yaw(%.2f)"), ActualPitch, ActualYaw);
 	DebugData.AddDebugItem(DebugLine);
@@ -69,5 +69,7 @@ FAnimNode_RotateRootBone::FAnimNode_RotateRootBone()
 	: Pitch(0.0f)
 	, Yaw(0.0f)
 	, MeshToComponent(FRotator::ZeroRotator)
+	, ActualPitch(0.f)
+	, ActualYaw(0.f)
 {
 }
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotationOffsetBlendSpace.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotationOffsetBlendSpace.cpp
index c07a094d9859..9f977ce88fda 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotationOffsetBlendSpace.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_RotationOffsetBlendSpace.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "AnimNodes/AnimNode_RotationOffsetBlendSpace.h"
+#include "Animation/AnimInstanceProxy.h"
 #include "AnimationRuntime.h"
 
 /////////////////////////////////////////////////////
@@ -8,7 +9,11 @@
 
 FAnimNode_RotationOffsetBlendSpace::FAnimNode_RotationOffsetBlendSpace()
 	: LODThreshold(INDEX_NONE)
+	, bIsLODEnabled(false)
+	, AlphaInputType(EAnimAlphaInputType::Float)
 	, Alpha(1.f)
+	, ActualAlpha(0.0f)
+	, bAlphaBoolEnabled(false)
 {
 }
 
@@ -26,13 +31,36 @@ void FAnimNode_RotationOffsetBlendSpace::CacheBones_AnyThread(const FAnimationCa
 
 void FAnimNode_RotationOffsetBlendSpace::UpdateAssetPlayer(const FAnimationUpdateContext& Context)
 {
-	EvaluateGraphExposedInputs.Execute(Context);
-
-	ActualAlpha = AlphaScaleBias.ApplyTo(Alpha);
-	bIsLODEnabled = IsLODEnabled(Context.AnimInstanceProxy, LODThreshold);
-	if (bIsLODEnabled && FAnimWeight::IsRelevant(ActualAlpha))
+	ActualAlpha = 0.f;
+	bIsLODEnabled = IsLODEnabled(Context.AnimInstanceProxy);
+	if (bIsLODEnabled)
 	{
-		UpdateInternal(Context);
+		EvaluateGraphExposedInputs.Execute(Context);
+
+		// Determine Actual Alpha.
+		switch (AlphaInputType)
+		{
+		case EAnimAlphaInputType::Float:
+			ActualAlpha = AlphaScaleBias.ApplyTo(AlphaScaleBiasClamp.ApplyTo(Alpha, Context.GetDeltaTime()));
+			break;
+		case EAnimAlphaInputType::Bool:
+			ActualAlpha = AlphaBoolBlend.ApplyTo(bAlphaBoolEnabled, Context.GetDeltaTime());
+			break;
+		case EAnimAlphaInputType::Curve:
+			if (UAnimInstance* AnimInstance = Cast<UAnimInstance>(Context.AnimInstanceProxy->GetAnimInstanceObject()))
+			{
+				ActualAlpha = AlphaScaleBiasClamp.ApplyTo(AnimInstance->GetCurveValue(AlphaCurveName), Context.GetDeltaTime());
+			}
+			break;
+		};
+
+		// Make sure Alpha is clamped between 0 and 1.
+		ActualAlpha = FMath::Clamp<float>(ActualAlpha, 0.f, 1.f);
+
+		if (FAnimWeight::IsRelevant(ActualAlpha))
+		{
+			UpdateInternal(Context);
+		}
 	}
 
 	BasePose.Update(Context);
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_Slot.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_Slot.cpp
index cbf63ec0f6ed..7aef8e178146 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_Slot.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_Slot.cpp
@@ -96,5 +96,6 @@ void FAnimNode_Slot::GatherDebugData(FNodeDebugData& DebugData)
 
 FAnimNode_Slot::FAnimNode_Slot()
 	: SlotName(FAnimSlotGroup::DefaultSlotName)
+	, bAlwaysUpdateSourcePose(false)
 {
 }
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_TwoWayBlend.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_TwoWayBlend.cpp
index 5fa1059c2b72..cafa73951ed7 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_TwoWayBlend.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/AnimNodes/AnimNode_TwoWayBlend.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "AnimNodes/AnimNode_TwoWayBlend.h"
+#include "Animation/AnimInstanceProxy.h"
 #include "AnimationRuntime.h"
 
 /////////////////////////////////////////////////////
@@ -15,6 +16,9 @@ void FAnimNode_TwoWayBlend::Initialize_AnyThread(const FAnimationInitializeConte
 
 	bAIsRelevant = false;
 	bBIsRelevant = false;
+
+	AlphaBoolBlend.Reinitialize();
+	AlphaScaleBiasClamp.Reinitialize();
 }
 
 void FAnimNode_TwoWayBlend::CacheBones_AnyThread(const FAnimationCacheBonesContext& Context) 
@@ -28,7 +32,26 @@ void FAnimNode_TwoWayBlend::Update_AnyThread(const FAnimationUpdateContext& Cont
 	QUICK_SCOPE_CYCLE_COUNTER(STAT_FAnimationNode_TwoWayBlend_Update);
 	EvaluateGraphExposedInputs.Execute(Context);
 
-	InternalBlendAlpha = AlphaScaleBias.ApplyTo(Alpha);
+	InternalBlendAlpha = 0.f;
+	switch (AlphaInputType)
+	{
+	case EAnimAlphaInputType::Float:
+		InternalBlendAlpha = AlphaScaleBias.ApplyTo(AlphaScaleBiasClamp.ApplyTo(Alpha, Context.GetDeltaTime()));
+		break;
+	case EAnimAlphaInputType::Bool:
+		InternalBlendAlpha = AlphaBoolBlend.ApplyTo(bAlphaBoolEnabled, Context.GetDeltaTime());
+		break;
+	case EAnimAlphaInputType::Curve:
+		if (UAnimInstance* AnimInstance = Cast<UAnimInstance>(Context.AnimInstanceProxy->GetAnimInstanceObject()))
+		{
+			InternalBlendAlpha = AlphaScaleBiasClamp.ApplyTo(AnimInstance->GetCurveValue(AlphaCurveName), Context.GetDeltaTime());
+		}
+		break;
+	};
+
+	// Make sure Alpha is clamped between 0 and 1.
+	InternalBlendAlpha = FMath::Clamp<float>(InternalBlendAlpha, 0.f, 1.f);
+
 	const bool bNewAIsRelevant = !FAnimWeight::IsFullWeight(InternalBlendAlpha);
 	const bool bNewBIsRelevant = FAnimWeight::IsRelevant(InternalBlendAlpha);
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNodeRotationMultiplier.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNodeRotationMultiplier.cpp
index e29f1e5fd4b9..1a9445748dc2 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNodeRotationMultiplier.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNodeRotationMultiplier.cpp
@@ -9,6 +9,9 @@
 // FAnimNode_RotationMultiplier
 
 FAnimNode_RotationMultiplier::FAnimNode_RotationMultiplier()
+	: Multiplier(0.0f)
+	, RotationAxisToRefer(BA_X)
+	, bIsAdditive(false)
 {
 }
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_AnimDynamics.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_AnimDynamics.cpp
index 812938543871..dbf75b74888e 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_AnimDynamics.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_AnimDynamics.cpp
@@ -11,15 +11,116 @@ DEFINE_STAT(STAT_AnimDynamicsBoneEval);
 DEFINE_STAT(STAT_AnimDynamicsSubSteps);
 
 TAutoConsoleVariable<int32> CVarRestrictLod(TEXT("p.AnimDynamicsRestrictLOD"), -1, TEXT("Forces anim dynamics to be enabled for only a specified LOD, -1 to enable on all LODs."));
-TAutoConsoleVariable<int32> CVarEnableDynamics(TEXT("p.AnimDynamics"), 1, TEXT("Enables/Disables anim dynamics node updates."));
+TAutoConsoleVariable<int32> CVarLODThreshold(TEXT("p.AnimDynamicsLODThreshold"), -1, TEXT("Max LOD that anim dynamics is allowed to run on. Provides a global threshold that overrides per-node the LODThreshold property. -1 means no override."), ECVF_Scalability);
+TAutoConsoleVariable<int32> CVarEnableDynamics(TEXT("p.AnimDynamics"), 1, TEXT("Enables/Disables anim dynamics node updates."), ECVF_Scalability);
 TAutoConsoleVariable<int32> CVarEnableAdaptiveSubstep(TEXT("p.AnimDynamicsAdaptiveSubstep"), 0, TEXT("Enables/disables adaptive substepping. Adaptive substepping will substep the simulation when it is necessary and maintain a debt buffer for time, always trying to utilise as much time as possible."));
 TAutoConsoleVariable<int32> CVarAdaptiveSubstepNumDebtFrames(TEXT("p.AnimDynamicsNumDebtFrames"), 5, TEXT("Number of frames to maintain as time debt when using adaptive substepping, this should be at least 1 or the time debt will never be cleared."));
-TAutoConsoleVariable<int32> CVarEnableWind(TEXT("p.AnimDynamicsWind"), 1, TEXT("Enables/Disables anim dynamics wind forces globally."));
+TAutoConsoleVariable<int32> CVarEnableWind(TEXT("p.AnimDynamicsWind"), 1, TEXT("Enables/Disables anim dynamics wind forces globally."), ECVF_Scalability);
 
 const float FAnimNode_AnimDynamics::MaxTimeDebt = (1.0f / 60.0f) * 5.0f; // 5 frames max debt
 
+#if ENABLE_ANIM_DRAW_DEBUG
+
+TAutoConsoleVariable<int32> CVarShowDebug(TEXT("p.animdynamics.showdebug"), 0, TEXT("Enable/disable the drawing of animdynamics data."));
+TAutoConsoleVariable<FString> CVarDebugBone(TEXT("p.animdynamics.debugbone"), FString(), TEXT("Filters p.animdynamics.showdebug to a specific bone by name."));
+
+void FAnimNode_AnimDynamics::DrawBodies(FComponentSpacePoseContext& InContext, const TArray<FAnimPhysRigidBody*>& InBodies)
+{
+	if(CVarShowDebug.GetValueOnAnyThread() == 0)
+	{
+		return;
+	}
+
+	auto ToWorldT = [this](FComponentSpacePoseContext& InPoseContext, const FTransform& SimTransform)
+	{
+		FTransform OutTransform = GetComponentSpaceTransformFromSimSpace(SimulationSpace, InPoseContext, SimTransform);
+		OutTransform *= InPoseContext.AnimInstanceProxy->GetComponentTransform();
+		return OutTransform;
+	};
+
+	auto ToWorldV = [this](FComponentSpacePoseContext& InPoseContext, const FVector& SimLocation)
+	{
+		FVector OutLoc = GetComponentSpaceTransformFromSimSpace(SimulationSpace, InPoseContext, FTransform(SimLocation)).GetTranslation();
+		OutLoc = InPoseContext.AnimInstanceProxy->GetComponentTransform().TransformPosition(SimLocation);
+		return OutLoc;
+	};
+
+	FAnimInstanceProxy* Proxy = InContext.AnimInstanceProxy;
+
+	check(Proxy);
+
+	const FString FilteredBoneName = CVarDebugBone.GetValueOnAnyThread();
+	const bool bFilterBone = FilteredBoneName.Len() > 0;
+
+	const int32 NumBodies = Bodies.Num();
+	for(int32 BodyIndex = 0 ; BodyIndex < NumBodies ; ++BodyIndex)
+	{
+		const FAnimPhysRigidBody& Body = Bodies[BodyIndex].RigidBody.PhysBody;
+
+		if(bFilterBone && BoundBoneReferences[BodyIndex].BoneName != FName(*FilteredBoneName))
+		{
+			continue;
+		}
+
+		FTransform Transform(Body.Pose.Orientation, Body.Pose.Position + Body.Pose.Orientation.RotateVector(JointOffsets[BodyIndex]));
+		Transform = GetComponentSpaceTransformFromSimSpace(SimulationSpace, InContext, Transform);
+		Transform *= Proxy->GetComponentTransform();
+
+		Proxy->AnimDrawDebugCoordinateSystem(Transform.GetTranslation(), Transform.Rotator(), 2.0f, false, -1.0f, 0.15f);
+
+		for(const FAnimPhysShape& Shape : Body.Shapes)
+		{
+			const int32 NumTris = Shape.Triangles.Num();
+			for(int32 TriIndex = 0; TriIndex < NumTris; ++TriIndex)
+			{
+				FIntVector Tri = Shape.Triangles[TriIndex];
+
+				Proxy->AnimDrawDebugLine(ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.X])), ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.Y])), FColor::Yellow, false, -1.0f, 0.15f);
+				Proxy->AnimDrawDebugLine(ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.Y])), ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.Z])), FColor::Yellow, false, -1.0f, 0.15f);
+				Proxy->AnimDrawDebugLine(ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.Z])), ToWorldV(InContext, Transform.TransformPosition(Shape.Vertices[Tri.X])), FColor::Yellow, false, -1.0f, 0.15f);
+			}
+		}
+	}
+
+	if(SimulationSpace != AnimPhysSimSpaceType::World)
+	{
+		FTransform Origin;
+
+		switch(SimulationSpace)
+		{
+			case AnimPhysSimSpaceType::Actor:
+			{
+				Origin = Proxy->GetActorTransform();
+			}
+			break;
+			case AnimPhysSimSpaceType::BoneRelative:
+			{
+				Origin = Proxy->GetComponentTransform() * InContext.Pose.GetComponentSpaceTransform(FCompactPoseBoneIndex(RelativeSpaceBone.BoneIndex));
+			}
+			break;
+			case AnimPhysSimSpaceType::Component:
+			{
+				Origin = Proxy->GetComponentTransform();
+			}
+			break;
+			case AnimPhysSimSpaceType::RootRelative:
+			{
+				Origin = Proxy->GetComponentTransform() * InContext.Pose.GetComponentSpaceTransform(FCompactPoseBoneIndex(0));
+			}
+			break;
+
+			default: break;
+		}
+
+		Proxy->AnimDrawDebugSphere(Origin.GetTranslation(), 25.0f, 16, FColor::Green, false, -1.0f, 0.15f);
+		Proxy->AnimDrawDebugCoordinateSystem(Origin.GetTranslation(), Origin.Rotator(), 3.0f, false, -1.0f, 0.15f);
+	}
+}
+#endif
+
 FAnimNode_AnimDynamics::FAnimNode_AnimDynamics()
 : SimulationSpace(AnimPhysSimSpaceType::Component)
+, bChain(false)
 , BoxExtents(0.0f)
 , LocalJointOffset(0.0f)
 , GravityScale(1.0f)
@@ -28,6 +129,7 @@ FAnimNode_AnimDynamics::FAnimNode_AnimDynamics()
 , LinearSpringConstant(0.0f)
 , AngularSpringConstant(0.0f)
 , bEnableWind(true)
+, bWindWasEnabled(false)
 , WindScale(1.0f)
 , bOverrideLinearDamping(false)
 , LinearDampingOverride(0.0f)
@@ -40,6 +142,12 @@ FAnimNode_AnimDynamics::FAnimNode_AnimDynamics()
 , NumSolverIterationsPreUpdate(4)
 , NumSolverIterationsPostUpdate(1)
 , bUsePlanarLimit(true)
+, bUseSphericalLimits(false)
+, CollisionType(AnimPhysCollisionType::CoM)
+, SphereCollisionRadius(0.0f)
+#if ENABLE_ANIM_DRAW_DEBUG
+, FilteredBoneIndex(INDEX_NONE)
+#endif
 {
 	
 }
@@ -54,7 +162,7 @@ void FAnimNode_AnimDynamics::Initialize_AnyThread(const FAnimationInitializeCont
 
 	if(BoundBone.IsValidToEvaluate(RequiredBones))
 	{
-		RequestInitialise();
+		RequestInitialise(ETeleportType::ResetPhysics);
 	}
 
 	NextTimeStep = 0.0f;
@@ -91,10 +199,10 @@ void FAnimNode_AnimDynamics::EvaluateSkeletalControl_AnyThread(FComponentSpacePo
 
 		// Pretty nasty - but there isn't really a good way to get clean bone transforms (without the modification from
 		// previous runs) so we have to initialize here, checking often so we can restart a simulation in the editor.
-		if (bRequiresInit)
+		if (InitTeleportType != ETeleportType::None)
 		{
 			InitPhysics(Output);
-			bRequiresInit = false;
+			InitTeleportType = ETeleportType::None;
 		}
 
 		const FBoneContainer& RequiredBones = Output.Pose.GetPose().GetBoneContainer();
@@ -134,6 +242,7 @@ void FAnimNode_AnimDynamics::EvaluateSkeletalControl_AnyThread(FComponentSpacePo
 
 			if (CVarEnableAdaptiveSubstep.GetValueOnAnyThread() == 1)
 			{
+				float CurrentTimeDilation = Output.AnimInstanceProxy->GetTimeDilation();
 				float FixedTimeStep = MaxSubstepDeltaTime * CurrentTimeDilation;
 
 				// Clamp the fixed timestep down to max physics tick time.
@@ -169,6 +278,10 @@ void FAnimNode_AnimDynamics::EvaluateSkeletalControl_AnyThread(FComponentSpacePo
 				UpdateLimits(Output);
 				FAnimPhys::PhysicsUpdate(NextTimeStep, SimBodies, LinearLimits, AngularLimits, Springs, SimSpaceGravityDirection, OrientedExternalForce, NumSolverIterationsPreUpdate, NumSolverIterationsPostUpdate);
 			}
+
+#if ENABLE_ANIM_DRAW_DEBUG
+			DrawBodies(Output, SimBodies);
+#endif
 		}
 
 		if (bDoEval)
@@ -200,6 +313,10 @@ void FAnimNode_AnimDynamics::EvaluateSkeletalControl_AnyThread(FComponentSpacePo
 
 		// Store our sim space incase it changes
 		LastSimSpace = SimulationSpace;
+
+		// Store previous component and actor space transform
+		PreviousCompWorldSpaceTM = Output.AnimInstanceProxy->GetComponentTransform();
+		PreviousActorWorldSpaceTM = Output.AnimInstanceProxy->GetActorTransform();
 	}
 }
 
@@ -338,191 +455,233 @@ const FBoneReference* FAnimNode_AnimDynamics::GetBoundBoneReference(int32 Index)
 
 #endif
 
+void FAnimNode_AnimDynamics::RequestInitialise(ETeleportType InTeleportType)
+{ 
+	// Request an initialization. Teleport type can only go higher - i.e. if we have requested a reset, then a teleport will still reset fully
+	InitTeleportType = ((InTeleportType > InitTeleportType) ? InTeleportType : InitTeleportType); 
+}
+
 void FAnimNode_AnimDynamics::InitPhysics(FComponentSpacePoseContext& Output)
 {
-	// Clear up any existing physics data
-	TermPhysics();
+	switch(InitTeleportType)
+	{
+		case ETeleportType::ResetPhysics:
+		{
+			// Clear up any existing physics data
+			TermPhysics();
 
-	const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
+			const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
 
 	
-	// List of bone indices in the chain.
-	TArray<int32> ChainBoneIndices;
-	TArray<FName> ChainBoneNames;
+			// List of bone indices in the chain.
+			TArray<int32> ChainBoneIndices;
+			TArray<FName> ChainBoneNames;
 
-	if(ChainEnd.IsValidToEvaluate(BoneContainer))
-	{
-		// Add the end of the chain. We have to walk from the bottom upwards to find a chain
-		// as walking downwards doesn't guarantee a single end point.
-
-		ChainBoneIndices.Add(ChainEnd.BoneIndex);
-		ChainBoneNames.Add(ChainEnd.BoneName);
-
-		int32 ParentBoneIndex = BoneContainer.GetParentBoneIndex(ChainEnd.BoneIndex);
-
-		// Walk up the chain until we either find the top or hit the root bone
-		while(ParentBoneIndex != 0)
-		{
-			ChainBoneIndices.Add(ParentBoneIndex);
-			ChainBoneNames.Add(BoneContainer.GetReferenceSkeleton().GetBoneName(ParentBoneIndex));
-
-			if(ParentBoneIndex == BoundBone.BoneIndex)
+			if(ChainEnd.IsValidToEvaluate(BoneContainer))
 			{
-				// Found the top of the chain
-				break;
-			}
+				// Add the end of the chain. We have to walk from the bottom upwards to find a chain
+				// as walking downwards doesn't guarantee a single end point.
 
-			ParentBoneIndex = BoneContainer.GetParentBoneIndex(ParentBoneIndex);
-		}
+				ChainBoneIndices.Add(ChainEnd.BoneIndex);
+				ChainBoneNames.Add(ChainEnd.BoneName);
 
-		// Bail if we can't find a chain, and let the user know
-		if(ParentBoneIndex != BoundBone.BoneIndex)
-		{
-			UE_LOG(LogAnimation, Error, TEXT("AnimDynamics: Attempted to find bone chain starting at %s and ending at %s but failed."), *BoundBone.BoneName.ToString(), *ChainEnd.BoneName.ToString());
-			return;
-		}
-	}
-	else
-	{
-		// No chain specified, just use the bound bone
-		ChainBoneIndices.Add(BoundBone.BoneIndex);
-		ChainBoneNames.Add(BoundBone.BoneName);
-	}
+				int32 ParentBoneIndex = BoneContainer.GetParentBoneIndex(ChainEnd.BoneIndex);
 
-	Bodies.Reserve(ChainBoneIndices.Num());
-	// Walk backwards here as the chain was discovered in reverse order
-	for (int32 Idx = ChainBoneIndices.Num() - 1; Idx >= 0; --Idx)
-	{
-		TArray<FAnimPhysShape> BodyShapes;
-		BodyShapes.Add(FAnimPhysShape::MakeBox(BoxExtents));
+				// Walk up the chain until we either find the top or hit the root bone
+				while(ParentBoneIndex != 0)
+				{
+					ChainBoneIndices.Add(ParentBoneIndex);
+					ChainBoneNames.Add(BoneContainer.GetReferenceSkeleton().GetBoneName(ParentBoneIndex));
 
-		FBoneReference LinkBoneRef;
-		LinkBoneRef.BoneName = ChainBoneNames[Idx];
-		LinkBoneRef.Initialize(BoneContainer);
+					if(ParentBoneIndex == BoundBone.BoneIndex)
+					{
+						// Found the top of the chain
+						break;
+					}
 
-		// Calculate joint offsets by looking at the length of the bones and extending the provided offset
-		if (BoundBoneReferences.Num() > 0)
-		{
-			FTransform CurrentBoneTransform = GetBoneTransformInSimSpace(Output, LinkBoneRef.GetCompactPoseIndex(BoneContainer));
-			FTransform PreviousBoneTransform = GetBoneTransformInSimSpace(Output, BoundBoneReferences.Last().GetCompactPoseIndex(BoneContainer));
+					ParentBoneIndex = BoneContainer.GetParentBoneIndex(ParentBoneIndex);
+				}
 
-			FVector PreviousAnchor = PreviousBoneTransform.TransformPosition(-LocalJointOffset);
-			float DistanceToAnchor = (PreviousBoneTransform.GetTranslation() - CurrentBoneTransform.GetTranslation()).Size() * 0.5f;
-
-			if(LocalJointOffset.SizeSquared() < SMALL_NUMBER)
-			{
-				// No offset, just use the position between chain links as the offset
-				// This is likely to just look horrible, but at least the bodies will
-				// be placed correctly and not stack up at the top of the chain.
-				JointOffsets.Add(PreviousAnchor - CurrentBoneTransform.GetTranslation());
+				// Bail if we can't find a chain, and let the user know
+				if(ParentBoneIndex != BoundBone.BoneIndex)
+				{
+					UE_LOG(LogAnimation, Error, TEXT("AnimDynamics: Attempted to find bone chain starting at %s and ending at %s but failed."), *BoundBone.BoneName.ToString(), *ChainEnd.BoneName.ToString());
+					return;
+				}
 			}
 			else
 			{
-				// Extend offset along chain.
-				JointOffsets.Add(LocalJointOffset.GetSafeNormal() * DistanceToAnchor);
+				// No chain specified, just use the bound bone
+				ChainBoneIndices.Add(BoundBone.BoneIndex);
+				ChainBoneNames.Add(BoundBone.BoneName);
+			}
+
+			Bodies.Reserve(ChainBoneIndices.Num());
+			// Walk backwards here as the chain was discovered in reverse order
+			for (int32 Idx = ChainBoneIndices.Num() - 1; Idx >= 0; --Idx)
+			{
+				TArray<FAnimPhysShape> BodyShapes;
+				BodyShapes.Add(FAnimPhysShape::MakeBox(BoxExtents));
+
+				FBoneReference LinkBoneRef;
+				LinkBoneRef.BoneName = ChainBoneNames[Idx];
+				LinkBoneRef.Initialize(BoneContainer);
+
+				// Calculate joint offsets by looking at the length of the bones and extending the provided offset
+				if (BoundBoneReferences.Num() > 0)
+				{
+					FTransform CurrentBoneTransform = GetBoneTransformInSimSpace(Output, LinkBoneRef.GetCompactPoseIndex(BoneContainer));
+					FTransform PreviousBoneTransform = GetBoneTransformInSimSpace(Output, BoundBoneReferences.Last().GetCompactPoseIndex(BoneContainer));
+
+					FVector PreviousAnchor = PreviousBoneTransform.TransformPosition(-LocalJointOffset);
+					float DistanceToAnchor = (PreviousBoneTransform.GetTranslation() - CurrentBoneTransform.GetTranslation()).Size() * 0.5f;
+
+					if(LocalJointOffset.SizeSquared() < SMALL_NUMBER)
+					{
+						// No offset, just use the position between chain links as the offset
+						// This is likely to just look horrible, but at least the bodies will
+						// be placed correctly and not stack up at the top of the chain.
+						JointOffsets.Add(PreviousAnchor - CurrentBoneTransform.GetTranslation());
+					}
+					else
+					{
+						// Extend offset along chain.
+						JointOffsets.Add(LocalJointOffset.GetSafeNormal() * DistanceToAnchor);
+					}
+				}
+				else
+				{
+					// No chain to worry about, just use the specified offset.
+					JointOffsets.Add(LocalJointOffset);
+				}
+
+				BoundBoneReferences.Add(LinkBoneRef);
+
+				FTransform BodyTransform = GetBoneTransformInSimSpace(Output, LinkBoneRef.GetCompactPoseIndex(BoneContainer));
+
+				BodyTransform.SetTranslation(BodyTransform.GetTranslation() + BodyTransform.GetRotation().RotateVector(-LocalJointOffset));
+
+				FAnimPhysLinkedBody NewChainBody(BodyShapes, BodyTransform.GetTranslation(), LinkBoneRef);
+				FAnimPhysRigidBody& PhysicsBody = NewChainBody.RigidBody.PhysBody;
+				PhysicsBody.Pose.Orientation = BodyTransform.GetRotation();
+				PhysicsBody.PreviousOrientation = PhysicsBody.Pose.Orientation;
+				PhysicsBody.NextOrientation = PhysicsBody.Pose.Orientation;
+				PhysicsBody.CollisionType = CollisionType;
+
+				switch(PhysicsBody.CollisionType)
+				{
+					case AnimPhysCollisionType::CustomSphere:
+						PhysicsBody.SphereCollisionRadius = SphereCollisionRadius;
+						break;
+					case AnimPhysCollisionType::InnerSphere:
+						PhysicsBody.SphereCollisionRadius = BoxExtents.GetAbsMin() / 2.0f;
+						break;
+					case AnimPhysCollisionType::OuterSphere:
+						PhysicsBody.SphereCollisionRadius = BoxExtents.GetAbsMax() / 2.0f;
+						break;
+					default:
+						break;
+				}
+
+				if (bOverrideLinearDamping)
+				{
+					PhysicsBody.bLinearDampingOverriden = true;
+					PhysicsBody.LinearDamping = LinearDampingOverride;
+				}
+
+				if (bOverrideAngularDamping)
+				{
+					PhysicsBody.bAngularDampingOverriden = true;
+					PhysicsBody.AngularDamping = AngularDampingOverride;
+				}
+
+				PhysicsBody.GravityScale = GravityScale;
+				PhysicsBody.bWindEnabled = bWindWasEnabled;
+
+				// Link to parent
+				if (Bodies.Num() > 0)
+				{
+					NewChainBody.ParentBody = &Bodies.Last().RigidBody;
+				}
+
+				Bodies.Add(NewChainBody);
+				ActiveBoneIndices.Add(Bodies.Num() - 1);
+			}
+	
+			BaseBodyPtrs.Empty();
+			for(FAnimPhysLinkedBody& Body : Bodies)
+			{
+				BaseBodyPtrs.Add(&Body.RigidBody.PhysBody);
+			}
+
+			// Set up transient constraint data
+			const bool bXAxisLocked = ConstraintSetup.LinearXLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.X - ConstraintSetup.LinearAxesMax.X == 0.0f;
+			const bool bYAxisLocked = ConstraintSetup.LinearYLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.Y - ConstraintSetup.LinearAxesMax.Y == 0.0f;
+			const bool bZAxisLocked = ConstraintSetup.LinearZLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.Z - ConstraintSetup.LinearAxesMax.Z == 0.0f;
+
+			ConstraintSetup.bLinearFullyLocked = bXAxisLocked && bYAxisLocked && bZAxisLocked;
+
+			// Cache physics settings to avoid accessing UPhysicsSettings continuously
+			if(UPhysicsSettings* Settings = UPhysicsSettings::Get())
+			{
+				MaxPhysicsDeltaTime = Settings->MaxPhysicsDeltaTime;
+				MaxSubstepDeltaTime = Settings->MaxSubstepDeltaTime;
+				MaxSubsteps = Settings->MaxSubsteps;
+			}
+			else
+			{
+				MaxPhysicsDeltaTime = (1.0f/30.0f);
+				MaxSubstepDeltaTime = (1.0f/60.0f);
+				MaxSubsteps = 4;
+			}
+
+			SimSpaceGravityDirection = TransformWorldVectorToSimSpace(Output, FVector(0.0f, 0.0f, -1.0f));
+		}
+		break;
+
+		case ETeleportType::TeleportPhysics:
+		{
+			// Clear any external forces
+			ExternalForce = FVector::ZeroVector;
+
+			// Move any active bones
+			for(const int32& BodyIndex : ActiveBoneIndices)
+			{
+				FAnimPhysRigidBody& Body = Bodies[BodyIndex].RigidBody.PhysBody;
+
+				// Get old comp space transform
+				FTransform BodyTransform(Body.Pose.Orientation, Body.Pose.Position + Body.Pose.Orientation.RotateVector(JointOffsets[BodyIndex]));
+				BodyTransform = GetComponentSpaceTransformFromSimSpace(SimulationSpace, Output, BodyTransform, PreviousCompWorldSpaceTM, PreviousActorWorldSpaceTM);
+
+				// move to new space
+				BodyTransform = GetSimSpaceTransformFromComponentSpace(SimulationSpace, Output, BodyTransform);
+				
+				Body.Pose.Orientation = BodyTransform.GetRotation();
+				Body.PreviousOrientation = Body.Pose.Orientation;
+				Body.NextOrientation = Body.Pose.Orientation;
+
+				Body.Pose.Position = BodyTransform.GetTranslation() - Body.Pose.Orientation.RotateVector(JointOffsets[BodyIndex]);
 			}
 		}
-		else
-		{
-			// No chain to worry about, just use the specified offset.
-			JointOffsets.Add(LocalJointOffset);
-		}
-
-		BoundBoneReferences.Add(LinkBoneRef);
-
-		FTransform BodyTransform = GetBoneTransformInSimSpace(Output, LinkBoneRef.GetCompactPoseIndex(BoneContainer));
-
-		BodyTransform.SetTranslation(BodyTransform.GetTranslation() + BodyTransform.GetRotation().RotateVector(-LocalJointOffset));
-
-		FAnimPhysLinkedBody NewChainBody(BodyShapes, BodyTransform.GetTranslation(), LinkBoneRef);
-		FAnimPhysRigidBody& PhysicsBody = NewChainBody.RigidBody.PhysBody;
-		PhysicsBody.Pose.Orientation = BodyTransform.GetRotation();
-		PhysicsBody.PreviousOrientation = PhysicsBody.Pose.Orientation;
-		PhysicsBody.NextOrientation = PhysicsBody.Pose.Orientation;
-		PhysicsBody.CollisionType = CollisionType;
-
-		switch(PhysicsBody.CollisionType)
-		{
-			case AnimPhysCollisionType::CustomSphere:
-				PhysicsBody.SphereCollisionRadius = SphereCollisionRadius;
-				break;
-			case AnimPhysCollisionType::InnerSphere:
-				PhysicsBody.SphereCollisionRadius = BoxExtents.GetAbsMin() / 2.0f;
-				break;
-			case AnimPhysCollisionType::OuterSphere:
-				PhysicsBody.SphereCollisionRadius = BoxExtents.GetAbsMax() / 2.0f;
-				break;
-			default:
-				break;
-		}
-
-		if (bOverrideLinearDamping)
-		{
-			PhysicsBody.bLinearDampingOverriden = true;
-			PhysicsBody.LinearDamping = LinearDampingOverride;
-		}
-
-		if (bOverrideAngularDamping)
-		{
-			PhysicsBody.bAngularDampingOverriden = true;
-			PhysicsBody.AngularDamping = AngularDampingOverride;
-		}
-
-		PhysicsBody.GravityScale = GravityScale;
-		PhysicsBody.bWindEnabled = bWindWasEnabled;
-
-		// Link to parent
-		if (Bodies.Num() > 0)
-		{
-			NewChainBody.ParentBody = &Bodies.Last().RigidBody;
-		}
-
-		Bodies.Add(NewChainBody);
-		ActiveBoneIndices.Add(Bodies.Num() - 1);
-	}
-	
-	BaseBodyPtrs.Empty();
-	for(FAnimPhysLinkedBody& Body : Bodies)
-	{
-		BaseBodyPtrs.Add(&Body.RigidBody.PhysBody);
+		break;
 	}
 
-	// Set up transient constraint data
-	const bool bXAxisLocked = ConstraintSetup.LinearXLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.X - ConstraintSetup.LinearAxesMax.X == 0.0f;
-	const bool bYAxisLocked = ConstraintSetup.LinearYLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.Y - ConstraintSetup.LinearAxesMax.Y == 0.0f;
-	const bool bZAxisLocked = ConstraintSetup.LinearZLimitType != AnimPhysLinearConstraintType::Free && ConstraintSetup.LinearAxesMin.Z - ConstraintSetup.LinearAxesMax.Z == 0.0f;
-
-	ConstraintSetup.bLinearFullyLocked = bXAxisLocked && bYAxisLocked && bZAxisLocked;
-
-	// Cache physics settings to avoid accessing UPhysicsSettings continuously
-	if(UPhysicsSettings* Settings = UPhysicsSettings::Get())
-	{
-		MaxPhysicsDeltaTime = Settings->MaxPhysicsDeltaTime;
-		MaxSubstepDeltaTime = Settings->MaxSubstepDeltaTime;
-		MaxSubsteps = Settings->MaxSubsteps;
-	}
-	else
-	{
-		MaxPhysicsDeltaTime = (1.0f/30.0f);
-		MaxSubstepDeltaTime = (1.0f/60.0f);
-		MaxSubsteps = 4;
-	}
-
-	SimSpaceGravityDirection = TransformWorldVectorToSimSpace(Output, FVector(0.0f, 0.0f, -1.0f));
-
-	bRequiresInit = false;
+	InitTeleportType = ETeleportType::None;
+	PreviousCompWorldSpaceTM = Output.AnimInstanceProxy->GetComponentTransform();
+	PreviousActorWorldSpaceTM = Output.AnimInstanceProxy->GetActorTransform();
 }
 
 void FAnimNode_AnimDynamics::TermPhysics()
 {
-	Bodies.Empty();
-	LinearLimits.Empty();
-	AngularLimits.Empty();
-	Springs.Empty();
+	Bodies.Reset();
+	LinearLimits.Reset();
+	AngularLimits.Reset();
+	Springs.Reset();
+	ActiveBoneIndices.Reset();
 
-	BoundBoneReferences.Empty();
-	JointOffsets.Empty();
-	BodiesToReset.Empty();
+	BoundBoneReferences.Reset();
+	JointOffsets.Reset();
+	BodiesToReset.Reset();
 }
 
 void FAnimNode_AnimDynamics::UpdateLimits(FComponentSpacePoseContext& Output)
@@ -679,6 +838,20 @@ void FAnimNode_AnimDynamics::UpdateLimits(FComponentSpacePoseContext& Output)
 	}
 }
 
+bool FAnimNode_AnimDynamics::HasPreUpdate() const
+{
+	if(CVarEnableDynamics.GetValueOnGameThread() == 1)
+	{
+		return (CVarEnableWind.GetValueOnGameThread() == 1 && (bEnableWind || bWindWasEnabled))
+#if ENABLE_ANIM_DRAW_DEBUG
+				|| (CVarShowDebug.GetValueOnGameThread() == 1 && !CVarDebugBone.GetValueOnGameThread().IsEmpty())
+#endif
+				;
+	}
+
+	return false;
+}
+
 void FAnimNode_AnimDynamics::PreUpdate(const UAnimInstance* InAnimInstance)
 {
 	// If dynamics are disabled, skip all this work as it'll never get used
@@ -703,9 +876,6 @@ void FAnimNode_AnimDynamics::PreUpdate(const UAnimInstance* InAnimInstance)
 
 	const UWorld* World = SkelComp->GetWorld();
 
-	check(World->GetWorldSettings());
-
-	CurrentTimeDilation = World->GetWorldSettings()->GetEffectiveTimeDilation();
 	if(CVarEnableWind.GetValueOnAnyThread() == 1 && bEnableWind)
 	{
 		SCOPE_CYCLE_COUNTER(STAT_AnimDynamicsWindData);
@@ -742,6 +912,37 @@ void FAnimNode_AnimDynamics::PreUpdate(const UAnimInstance* InAnimInstance)
 			Body->bWindEnabled = false;
 		}
 	}
+
+#if ENABLE_ANIM_DRAW_DEBUG
+	FilteredBoneIndex = INDEX_NONE;
+	if(SkelComp)
+	{
+		FString FilteredBoneName = CVarDebugBone.GetValueOnGameThread();
+		if(FilteredBoneName.Len() > 0)
+		{
+			FilteredBoneIndex = SkelComp->GetBoneIndex(FName(*FilteredBoneName));
+		}
+	}
+#endif
+}
+
+int32 FAnimNode_AnimDynamics::GetLODThreshold() const
+{
+	if(CVarLODThreshold.GetValueOnAnyThread() != -1)
+	{
+		if(LODThreshold != -1)
+		{
+			return FMath::Min(LODThreshold, CVarLODThreshold.GetValueOnAnyThread());
+		}
+		else
+		{
+			return CVarLODThreshold.GetValueOnAnyThread();
+		}
+	}
+	else
+	{
+		return LODThreshold;
+	}
 }
 
 FTransform FAnimNode_AnimDynamics::GetBoneTransformInSimSpace(FComponentSpacePoseContext& Output, const FCompactPoseBoneIndex& BoneIndex)
@@ -752,6 +953,11 @@ FTransform FAnimNode_AnimDynamics::GetBoneTransformInSimSpace(FComponentSpacePos
 }
 
 FTransform FAnimNode_AnimDynamics::GetComponentSpaceTransformFromSimSpace(AnimPhysSimSpaceType SimSpace, FComponentSpacePoseContext& Output, const FTransform& InSimTransform)
+{
+	return GetComponentSpaceTransformFromSimSpace(SimSpace, Output, InSimTransform, Output.AnimInstanceProxy->GetComponentTransform(), Output.AnimInstanceProxy->GetActorTransform());
+}
+
+FTransform FAnimNode_AnimDynamics::GetComponentSpaceTransformFromSimSpace(AnimPhysSimSpaceType SimSpace, FComponentSpacePoseContext& Output, const FTransform& InSimTransform, const FTransform& InCompWorldSpaceTM, const FTransform& InActorWorldSpaceTM)
 {
 	FTransform OutTransform = InSimTransform;
 
@@ -765,8 +971,8 @@ FTransform FAnimNode_AnimDynamics::GetComponentSpaceTransformFromSimSpace(AnimPh
 
 	case AnimPhysSimSpaceType::Actor:
 	{
-		FTransform WorldTransform(OutTransform * Output.AnimInstanceProxy->GetActorTransform());
-		WorldTransform.SetToRelativeTransform(Output.AnimInstanceProxy->GetComponentTransform());
+		FTransform WorldTransform(OutTransform * InActorWorldSpaceTM);
+		WorldTransform.SetToRelativeTransform(InCompWorldSpaceTM);
 		OutTransform = WorldTransform;
 
 		break;
@@ -797,7 +1003,7 @@ FTransform FAnimNode_AnimDynamics::GetComponentSpaceTransformFromSimSpace(AnimPh
 	}
 	case AnimPhysSimSpaceType::World:
 	{
-		OutTransform *= Output.AnimInstanceProxy->GetComponentTransform().Inverse();
+		OutTransform *= InCompWorldSpaceTM.Inverse();
 	}
 
 	default:
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ApplyLimits.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ApplyLimits.cpp
new file mode 100644
index 000000000000..bb84b0991e1b
--- /dev/null
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ApplyLimits.cpp
@@ -0,0 +1,121 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "BoneControllers/AnimNode_ApplyLimits.h"
+#include "AnimationCoreLibrary.h"
+#include "Animation/AnimInstanceProxy.h"
+#include "AnimationRuntime.h"
+
+/////////////////////////////////////////////////////
+// FAnimNode_ApplyLimits
+
+FAnimNode_ApplyLimits::FAnimNode_ApplyLimits()
+{
+}
+
+void FAnimNode_ApplyLimits::GatherDebugData(FNodeDebugData& DebugData)
+{
+	FString DebugLine = DebugData.GetNodeName(this);
+
+	DebugLine += "(";
+	AddDebugNodeData(DebugLine);
+	DebugLine += FString::Printf(TEXT(")"));
+	DebugData.AddDebugItem(DebugLine);
+
+	ComponentPose.GatherDebugData(DebugData);
+}
+
+bool ConstrainAngularRange(FQuat& InOutQuatRotation, const FQuat& InRefRotation, const FVector& InLimitMinDegrees, const FVector& InLimitMaxDegrees)
+{
+	// Simple clamping of euler angles. This might be better off refactored to use switch/twist decomposition and maybe an ellipsoid clamp
+
+	FQuat DeltaQuat = InRefRotation * InOutQuatRotation.Inverse();
+	FRotator DeltaRotator = DeltaQuat.Rotator();
+	FRotator NewRotator;
+	NewRotator.Pitch = FMath::Clamp(DeltaRotator.Pitch, InLimitMinDegrees.Y, InLimitMaxDegrees.Y);
+	NewRotator.Yaw = FMath::Clamp(DeltaRotator.Yaw, InLimitMinDegrees.X, InLimitMaxDegrees.X);
+	NewRotator.Roll = FMath::Clamp(DeltaRotator.Roll, InLimitMinDegrees.Z, InLimitMaxDegrees.Z);
+	DeltaQuat = FQuat(NewRotator);
+
+	InOutQuatRotation = DeltaQuat.Inverse() * InRefRotation;
+
+	return !NewRotator.Equals(DeltaRotator);
+}
+
+void FAnimNode_ApplyLimits::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms)
+{
+	checkSlow(OutBoneTransforms.Num() == 0);
+
+	FPoseContext LocalPose0(Output.AnimInstanceProxy);
+	FPoseContext LocalPose1(Output.AnimInstanceProxy);
+	Output.Pose.ConvertToLocalPoses(LocalPose0.Pose);
+	Output.Pose.ConvertToLocalPoses(LocalPose1.Pose);
+	LocalPose0.Curve = Output.Curve;
+	LocalPose1.Curve = Output.Curve;
+
+	const FTransform ComponentTransform = Output.AnimInstanceProxy->GetComponentTransform();
+	const FBoneContainer& BoneContainer = LocalPose0.Pose.GetBoneContainer();
+
+	bool bAppliedLimit = false;
+	const int32 AngularLimitCount = AngularRangeLimits.Num();
+	for (int32 AngularLimitIndex = 0; AngularLimitIndex < AngularLimitCount; ++AngularLimitIndex)
+	{
+		const FAngularRangeLimit& AngularLimit = AngularRangeLimits[AngularLimitIndex];
+		const FCompactPoseBoneIndex BoneIndex = AngularLimit.Bone.GetCompactPoseIndex(BoneContainer);
+
+		FTransform& BoneTransform = LocalPose0.Pose[BoneIndex];
+
+		const FTransform& RefBoneTransform = BoneContainer.GetRefPoseTransform(BoneIndex);
+
+		FQuat BoneRotation = BoneTransform.GetRotation();
+		if (ConstrainAngularRange(BoneRotation, RefBoneTransform.GetRotation(), AngularLimit.LimitMin + AngularOffsets[AngularLimitIndex], AngularLimit.LimitMax + AngularOffsets[AngularLimitIndex]))
+		{
+			BoneTransform.SetRotation(BoneRotation);
+			bAppliedLimit = true;
+		}
+	}
+
+	if(bAppliedLimit)
+	{
+		const float BlendWeight = FMath::Clamp<float>(ActualAlpha, 0.f, 1.f);
+
+		FPoseContext BlendedPose(Output.AnimInstanceProxy);
+		FAnimationRuntime::BlendTwoPosesTogether(LocalPose0.Pose, LocalPose1.Pose, LocalPose0.Curve, LocalPose1.Curve, BlendWeight, BlendedPose.Pose, BlendedPose.Curve);
+
+ 		Output.Pose.InitPose(BlendedPose.Pose);
+	 	Output.Curve = BlendedPose.Curve;
+	}
+}
+
+bool FAnimNode_ApplyLimits::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones)
+{
+	for (FAngularRangeLimit& AngularLimit : AngularRangeLimits)
+	{
+		if (AngularLimit.Bone.IsValidToEvaluate(RequiredBones))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void FAnimNode_ApplyLimits::RecalcLimits()
+{
+	AngularOffsets.SetNumZeroed(AngularRangeLimits.Num());
+}
+
+void FAnimNode_ApplyLimits::OnInitializeAnimInstance(const FAnimInstanceProxy* InProxy, const UAnimInstance* InAnimInstance)
+{
+	RecalcLimits();
+}
+
+void FAnimNode_ApplyLimits::InitializeBoneReferences(const FBoneContainer& RequiredBones)
+{
+	for (FAngularRangeLimit& AngularLimit : AngularRangeLimits)
+	{
+		AngularLimit.Bone.Initialize(RequiredBones);
+	}
+
+	RecalcLimits();
+}
+
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_BoneDrivenController.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_BoneDrivenController.cpp
index 787a2ecc649b..5b70ff1ec97c 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_BoneDrivenController.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_BoneDrivenController.cpp
@@ -10,6 +10,7 @@
 
 FAnimNode_BoneDrivenController::FAnimNode_BoneDrivenController()
 	: SourceComponent(EComponentType::None)
+	, DrivingCurve(nullptr)
 	, Multiplier(1.0f)
 	, bUseRange(false)
 	, RangeMin(-1.0f)
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_HandIKRetargeting.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_HandIKRetargeting.cpp
index be5ae6ad9e85..2112dc4f9c26 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_HandIKRetargeting.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_HandIKRetargeting.cpp
@@ -32,16 +32,44 @@ void FAnimNode_HandIKRetargeting::EvaluateSkeletalControl_AnyThread(FComponentSp
 	checkSlow(OutBoneTransforms.Num() == 0);
 
 	const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
-	// Get component space transforms for all of our IK and FK bones.
-	const FTransform& RightHandFKTM = Output.Pose.GetComponentSpaceTransform(RightHandFK.GetCompactPoseIndex(BoneContainer));
-	const FTransform& LeftHandFKTM = Output.Pose.GetComponentSpaceTransform(LeftHandFK.GetCompactPoseIndex(BoneContainer));
-	const FTransform& RightHandIKTM = Output.Pose.GetComponentSpaceTransform(RightHandIK.GetCompactPoseIndex(BoneContainer));
-	const FTransform& LeftHandIKTM = Output.Pose.GetComponentSpaceTransform(LeftHandIK.GetCompactPoseIndex(BoneContainer));
+
+	FVector FKLocation = FVector::ZeroVector;
+	FVector IKLocation = FVector::ZeroVector;
+
+	if (FAnimWeight::IsFullWeight(HandFKWeight))
+	{
+		const FCompactPoseBoneIndex RightHandFKBoneIndex = RightHandFK.GetCompactPoseIndex(BoneContainer);
+		const FCompactPoseBoneIndex RightHandIKBoneIndex = RightHandIK.GetCompactPoseIndex(BoneContainer);
+
+		FKLocation = Output.Pose.GetComponentSpaceTransform(RightHandFKBoneIndex).GetTranslation();
+		IKLocation = Output.Pose.GetComponentSpaceTransform(RightHandIKBoneIndex).GetTranslation();
+	}
+	else if (!FAnimWeight::IsRelevant(HandFKWeight))
+	{
+		const FCompactPoseBoneIndex LeftHandFKBoneIndex = LeftHandFK.GetCompactPoseIndex(BoneContainer);
+		const FCompactPoseBoneIndex LeftHandIKBoneIndex = LeftHandIK.GetCompactPoseIndex(BoneContainer);
+
+		FKLocation = Output.Pose.GetComponentSpaceTransform(LeftHandFKBoneIndex).GetTranslation();
+		IKLocation = Output.Pose.GetComponentSpaceTransform(LeftHandIKBoneIndex).GetTranslation();
+	}
+	else
+	{
+		const FCompactPoseBoneIndex RightHandFKBoneIndex = RightHandFK.GetCompactPoseIndex(BoneContainer);
+		const FCompactPoseBoneIndex RightHandIKBoneIndex = RightHandIK.GetCompactPoseIndex(BoneContainer);
+		const FCompactPoseBoneIndex LeftHandFKBoneIndex = LeftHandFK.GetCompactPoseIndex(BoneContainer);
+		const FCompactPoseBoneIndex LeftHandIKBoneIndex = LeftHandIK.GetCompactPoseIndex(BoneContainer);
+
+		const FVector RightHandFKLocation = Output.Pose.GetComponentSpaceTransform(RightHandFKBoneIndex).GetTranslation();
+		const FVector RightHandIKLocation = Output.Pose.GetComponentSpaceTransform(RightHandIKBoneIndex).GetTranslation();
+		const FVector LeftHandFKLocation = Output.Pose.GetComponentSpaceTransform(LeftHandFKBoneIndex).GetTranslation();
+		const FVector LeftHandIKLocation = Output.Pose.GetComponentSpaceTransform(LeftHandIKBoneIndex).GetTranslation();
+
+		// Compute weight FK and IK hand location. And translation from IK to FK.
+		FKLocation = FMath::Lerp<FVector>(LeftHandFKLocation, RightHandFKLocation, HandFKWeight);
+		IKLocation = FMath::Lerp<FVector>(LeftHandIKLocation, RightHandIKLocation, HandFKWeight);
+	}
 	
-	// Compute weight FK and IK hand location. And translation from IK to FK.
-	FVector const FKLocation = FMath::Lerp<FVector>(LeftHandFKTM.GetTranslation(), RightHandFKTM.GetTranslation(), HandFKWeight);
-	FVector const IKLocation = FMath::Lerp<FVector>(LeftHandIKTM.GetTranslation(), RightHandIKTM.GetTranslation(), HandFKWeight);
-	FVector const IK_To_FK_Translation = FKLocation - IKLocation;
+	const FVector IK_To_FK_Translation = FKLocation - IKLocation;
 
 	// If we're not translating, don't send any bones to update.
 	if (!IK_To_FK_Translation.IsNearlyZero())
@@ -51,18 +79,18 @@ void FAnimNode_HandIKRetargeting::EvaluateSkeletalControl_AnyThread(FComponentSp
 		{
 			if (BoneReference.IsValidToEvaluate(BoneContainer))
 			{
-				FCompactPoseBoneIndex BoneIndex = BoneReference.GetCompactPoseIndex(BoneContainer);
+				const FCompactPoseBoneIndex BoneIndex = BoneReference.GetCompactPoseIndex(BoneContainer);
 				FTransform BoneTransform = Output.Pose.GetComponentSpaceTransform(BoneIndex);
 				BoneTransform.AddToTranslation(IK_To_FK_Translation);
 
 				OutBoneTransforms.Add(FBoneTransform(BoneIndex, BoneTransform));
 			}
 		}
-	}
 
-	if (OutBoneTransforms.Num() > 0)
-	{
-		OutBoneTransforms.Sort(FCompareBoneTransformIndex());
+		if (OutBoneTransforms.Num() > 0)
+		{
+			OutBoneTransforms.Sort(FCompareBoneTransformIndex());
+		}
 	}
 }
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LegIK.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LegIK.cpp
index 5d73c1ed7fcb..6e8cbe13b23c 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LegIK.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LegIK.cpp
@@ -73,7 +73,7 @@ void FAnimLegIKData::InitializeTransforms(FAnimInstanceProxy* MyAnimInstanceProx
 	IKFootTransform = MeshBases.GetComponentSpaceTransform(IKFootBoneIndex);
 
 	FKLegBoneTransforms.Reset(NumBones);
-	for (auto LegBoneIndex : FKLegBoneIndices)
+	for (const FCompactPoseBoneIndex& LegBoneIndex : FKLegBoneIndices)
 	{
 		FKLegBoneTransforms.Add(MeshBases.GetComponentSpaceTransform(LegBoneIndex));
 	}
@@ -92,38 +92,54 @@ void FAnimNode_LegIK::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseConte
 {
 	SCOPE_CYCLE_COUNTER(STAT_LegIK_Eval);
 
-#if ENABLE_ANIM_DEBUG
-	check(Output.AnimInstanceProxy->GetSkelMeshComponent());
-#endif
 	check(OutBoneTransforms.Num() == 0);
 
 	// Get transforms for each leg.
+	for (int32 LimbIndex = 0; LimbIndex < LegsData.Num(); LimbIndex++)
 	{
-		for (FAnimLegIKData& LegData : LegsData)
+		FAnimLegIKData& LegData = LegsData[LimbIndex];
+
+		LegData.InitializeTransforms(MyAnimInstanceProxy, Output.Pose);
+
+		// rotate hips so foot aligns with effector.
+		const bool bOrientedLegTowardsIK = OrientLegTowardsIK(LegData);
+
+		// expand/compress leg, so foot reaches effector.
+		const bool bDidLegReachIK = DoLegReachIK(LegData);
+
+		// Adjust knee twist orientation
+		const bool bAdjustedKneeTwist = LegData.LegDefPtr->bEnableKneeTwistCorrection ? AdjustKneeTwist(LegData) : false;
+
+		// Override Foot FK Rotation with Foot IK Rotation.
+		bool bModifiedLimb = bOrientedLegTowardsIK || bDidLegReachIK || bAdjustedKneeTwist;
+		bool bOverrideFootFKRotation = false;
+		const FQuat IKFootRotation = LegData.IKFootTransform.GetRotation();
+		if (bModifiedLimb || !LegData.FKLegBoneTransforms[0].GetRotation().Equals(IKFootRotation))
 		{
-			LegData.InitializeTransforms(MyAnimInstanceProxy, Output.Pose);
+			LegData.FKLegBoneTransforms[0].SetRotation(IKFootRotation);
+			bOverrideFootFKRotation = true;
+			bModifiedLimb = true;
+		}
 
-			// rotate hips so foot aligns with effector.
-			OrientLegTowardsIK(LegData);
-
-			// expand/compress leg, so foot reaches effector.
-			DoLegReachIK(LegData);
-
-			if (LegData.LegDefPtr->bEnableKneeTwistCorrection)
-			{
-				// Adjust knee twist orientation
-				AdjustKneeTwist(LegData);
-			}
-
-			// Override Foot FK, with IK.
-			LegData.FKLegBoneTransforms[0].SetRotation(LegData.IKFootTransform.GetRotation());
-
-			// Add transforms
+		if (bModifiedLimb)
+		{
+			// Add modified transforms
 			for (int32 Index = 0; Index < LegData.NumBones; Index++)
 			{
 				OutBoneTransforms.Add(FBoneTransform(LegData.FKLegBoneIndices[Index], LegData.FKLegBoneTransforms[Index]));
 			}
 		}
+
+#if ENABLE_ANIM_DEBUG
+		const bool bShowDebug = (CVarAnimNodeLegIKDebug.GetValueOnAnyThread() == 1);
+		if (bShowDebug)
+		{
+			FString DebugString = FString::Printf(TEXT("Limb[%d/%d] (%s) bModifiedLimb(%d) bOrientedLegTowardsIK(%d) bDidLegReachIK(%d) bAdjustedKneeTwist(%d) bOverrideFootFKRotation(%d)"),
+				LimbIndex + 1, LegsData.Num(), *LegData.LegDefPtr->FKFootBone.BoneName.ToString(), 
+				bModifiedLimb, bOrientedLegTowardsIK, bDidLegReachIK, bAdjustedKneeTwist, bOverrideFootFKRotation);
+			MyAnimInstanceProxy->AnimDrawDebugOnScreenMessage(DebugString, FColor::Red);
+		}
+#endif
 	}
 
 	// Sort OutBoneTransforms so indices are in increasing order.
@@ -137,7 +153,7 @@ static bool RotateLegByQuat(const FQuat& InDeltaRotation, FAnimLegIKData& InLegD
 		const FVector HipLocation = InLegData.FKLegBoneTransforms.Last().GetLocation();
 
 		// Rotate Leg so it is aligned with IK Target
-		for (auto& LegBoneTransform : InLegData.FKLegBoneTransforms)
+		for (FTransform& LegBoneTransform : InLegData.FKLegBoneTransforms)
 		{
 			LegBoneTransform.SetRotation(InDeltaRotation * LegBoneTransform.GetRotation());
 
@@ -163,7 +179,7 @@ static bool RotateLegByDeltaNormals(const FVector& InInitialDir, const FVector&
 	return false;
 }
 
-void FAnimNode_LegIK::OrientLegTowardsIK(FAnimLegIKData& InLegData)
+bool FAnimNode_LegIK::OrientLegTowardsIK(FAnimLegIKData& InLegData)
 {
 	check(InLegData.NumBones > 1);
 	const FVector HipLocation = InLegData.FKLegBoneTransforms.Last().GetLocation();
@@ -182,12 +198,19 @@ void FAnimNode_LegIK::OrientLegTowardsIK(FAnimLegIKData& InLegData)
 			DrawDebugLeg(InLegData, MyAnimInstanceProxy, FColor::Green);
 		}
 #endif
+		return true;
 	}
+
+	return false;
 }
 
-void FIKChain::InitializeFromLegData(const FAnimLegIKData& InLegData, FAnimInstanceProxy* InAnimInstanceProxy)
+void FIKChain::InitializeFromLegData(FAnimLegIKData& InLegData, FAnimInstanceProxy* InAnimInstanceProxy)
 {
-	Links.Reset(InLegData.NumBones);
+	if (Links.Num() != InLegData.NumBones)
+	{
+		Links.Init(FIKChainLink(), InLegData.NumBones);
+	}
+	
 	MaximumReach = 0.f;
 
 	check(InLegData.NumBones > 1);
@@ -196,14 +219,19 @@ void FIKChain::InitializeFromLegData(const FAnimLegIKData& InLegData, FAnimInsta
 		const FVector BoneLocation = InLegData.FKLegBoneTransforms[Index].GetLocation();
 		const FVector ParentLocation = InLegData.FKLegBoneTransforms[Index + 1].GetLocation();
 		const float BoneLength = FVector::Dist(BoneLocation, ParentLocation);
-		Links.Add(FIKChainLink(BoneLocation, BoneLength));
+
+		FIKChainLink& Link = Links[Index];
+		Link.Location = BoneLocation;
+		Link.Length = BoneLength;
+
 		MaximumReach += BoneLength;
 	}
 
 	// Add root bone last
-	const FVector RootLocation = InLegData.FKLegBoneTransforms.Last().GetLocation();
+	const int32 RootIndex = InLegData.NumBones - 1;
+	Links[RootIndex].Location = InLegData.FKLegBoneTransforms[RootIndex].GetLocation();
+	Links[RootIndex].Length = 0.f;
 
-	Links.Add(FIKChainLink(RootLocation, 0.f));
 	NumLinks = Links.Num();
 	check(NumLinks == InLegData.NumBones);
 
@@ -214,12 +242,18 @@ void FIKChain::InitializeFromLegData(const FAnimLegIKData& InLegData, FAnimInsta
 		{
 			MinRotationAngleRadians = FMath::DegreesToRadians(FMath::Clamp(InLegData.LegDefPtr->MinRotationAngle, 0.f, 90.f));
 		}
+
+		HingeRotationAxis = (InLegData.LegDefPtr->HingeRotationAxis != EAxis::None)
+			? InLegData.FKLegBoneTransforms.Last().GetUnitAxis(InLegData.LegDefPtr->HingeRotationAxis)
+			: FVector::ZeroVector;
 	}
 
 	MyAnimInstanceProxy = InAnimInstanceProxy;
 	bInitialized = true;
 }
 
+TAutoConsoleVariable<int32> CVarAnimLegIKTwoBone(TEXT("a.AnimNode.LegIK.EnableTwoBone"), 1, TEXT("Enable Two Bone Code Path."));
+
 void FIKChain::ReachTarget(const FVector& InTargetLocation, float InReachPrecision, int32 InMaxIterations)
 {
 	if (!bInitialized)
@@ -235,6 +269,11 @@ void FIKChain::ReachTarget(const FVector& InTargetLocation, float InReachPrecisi
 		const FVector Direction = (InTargetLocation - RootLocation).GetSafeNormal();
 		OrientAllLinksToDirection(Direction);
 	}
+	// Two Bones, we can figure out solution instantly
+	else if (NumLinks == 3 && (CVarAnimLegIKTwoBone.GetValueOnAnyThread() == 1))
+	{
+		SolveTwoBoneIK(InTargetLocation);
+	}
 	// Do iterative approach based on FABRIK
 	else
 	{
@@ -250,7 +289,76 @@ void FIKChain::OrientAllLinksToDirection(const FVector& InDirection)
 	}
 }
 
-void FAnimNode_LegIK::DoLegReachIK(FAnimLegIKData& InLegData)
+void FIKChain::SolveTwoBoneIK(const FVector& InTargetLocation)
+{
+	check(Links.Num() == 3);
+
+	FVector& pA = Links[0].Location; // Foot
+	FVector& pB = Links[1].Location; // Knee
+	FVector& pC = Links[2].Location; // Hip / Root
+
+	// Move foot directly to target.
+	pA = InTargetLocation;
+
+	const FVector HipToFoot = pA - pC;
+
+	// Use Law of Cosines to work out solution.
+	// At this point we know the target location is reachable, and we are already aligned with that location. So the leg is in the right plane.
+	const float a = Links[1].Length;	// hip to knee
+	const float b = HipToFoot.Size();	// hip to foot
+	const float c = Links[0].Length;	// knee to foot
+
+	const float Two_ab = 2.f * a * b;
+	const float CosC = !FMath::IsNearlyZero(Two_ab) ? (a * a + b * b - c * c) / Two_ab : 0.f;
+ 	const float C = FMath::Acos(CosC);
+	
+	// Project Knee onto Hip to Foot line.
+	const FVector HipToFootDir = !FMath::IsNearlyZero(b) ? HipToFoot / b : FVector::ZeroVector;
+	const FVector HipToKnee = pB - pC;
+	const FVector ProjKnee = pC + HipToKnee.ProjectOnToNormal(HipToFootDir);
+
+	const FVector ProjKneeToKnee = (pB - ProjKnee);
+	FVector BendDir = ProjKneeToKnee.GetSafeNormal(KINDA_SMALL_NUMBER);
+	
+	// If we have a HingeRotationAxis defined, we can cache 'BendDir'
+	// and use it when we can't determine it. (When limb is straight without a bend).
+	// We do this instead of using an explicit one, so we carry over the pole vector that animators use. 
+	// So they can animate it, and we try to extract it from the animation.
+	if ((HingeRotationAxis != FVector::ZeroVector) && (HipToFootDir != FVector::ZeroVector) && !FMath::IsNearlyZero(a))
+	{
+		const FVector HipToKneeDir = HipToKnee / a;
+		const float KneeBendDot = HipToKneeDir | HipToFootDir;
+
+		FVector& CachedRealBendDir = Links[1].RealBendDir;
+		FVector& CachedBaseBendDir = Links[1].BaseBendDir;
+
+		// Valid 'bend', cache 'BendDir'
+		if ((BendDir != FVector::ZeroVector) && (KneeBendDot < 0.99f))
+		{
+			CachedRealBendDir = BendDir;
+			CachedBaseBendDir = HingeRotationAxis ^ HipToFootDir;
+		}
+		// Limb is too straight, can't determine BendDir accurately, so use cached value if possible.
+		else 
+		{
+			// If we have cached 'BendDir', then reorient it based on 'HingeRotationAxis'
+			if (CachedRealBendDir != FVector::ZeroVector)
+			{
+				const FVector CurrentBaseBendDir = HingeRotationAxis ^ HipToFootDir;
+				const FQuat DeltaCachedToCurrBendDir = FQuat::FindBetweenNormals(CachedBaseBendDir, CurrentBaseBendDir);
+				BendDir = DeltaCachedToCurrBendDir.RotateVector(CachedRealBendDir);
+			}
+		}
+	}
+
+	// We just combine both lines into one to save a multiplication.
+	// const FVector NewProjectedKneeLoc = pC + HipToFootDir * a * CosC;
+	// const FVector NewKneeLoc = NewProjectedKneeLoc + Dir_LegLineToKnee * a * FMath::Sin(C);
+	const FVector NewKneeLoc = pC + a * (HipToFootDir * CosC + BendDir * FMath::Sin(C));
+	pB = NewKneeLoc;
+}
+
+bool FAnimNode_LegIK::DoLegReachIK(FAnimLegIKData& InLegData)
 {
 	SCOPE_CYCLE_COUNTER(STAT_LegIK_FABRIK_Eval);
 
@@ -260,10 +368,10 @@ void FAnimNode_LegIK::DoLegReachIK(FAnimLegIKData& InLegData)
 	// If we're already reaching our IK Target, we have no work to do.
 	if (FootFKLocation.Equals(FootIKLocation, ReachPrecision))
 	{
-		return;
+		return false;
 	}
 
-	FIKChain IKChain;
+	FIKChain& IKChain = InLegData.IKChain;
 	IKChain.InitializeFromLegData(InLegData, MyAnimInstanceProxy);
 
 	const int32 MaxIterationsOverride = CVarAnimLegIKMaxIterations.GetValueOnAnyThread() > 0 ? CVarAnimLegIKMaxIterations.GetValueOnAnyThread() : MaxIterations;
@@ -306,6 +414,8 @@ void FAnimNode_LegIK::DoLegReachIK(FAnimLegIKData& InLegData)
 		DrawDebugLeg(InLegData, MyAnimInstanceProxy, FColor::Yellow);
 	}
 #endif
+
+	return true;
 }
 
 void FIKChain::DrawDebugIKChain(const FIKChain& IKChain, const FColor& InColor)
@@ -632,7 +742,7 @@ void FIKChain::SolveFABRIK(const FVector& InTargetLocation, float InReachPrecisi
 	}
 }
 
-void FAnimNode_LegIK::AdjustKneeTwist(FAnimLegIKData& InLegData)
+bool FAnimNode_LegIK::AdjustKneeTwist(FAnimLegIKData& InLegData)
 {
 	const FVector FootFKLocation = InLegData.FKLegBoneTransforms[0].GetLocation();
 	const FVector FootIKLocation = InLegData.IKFootTransform.GetLocation();
@@ -657,7 +767,10 @@ void FAnimNode_LegIK::AdjustKneeTwist(FAnimLegIKData& InLegData)
 			DrawDebugLeg(InLegData, MyAnimInstanceProxy, FColor::Magenta);
 		}
 #endif
+		return true;
 	}
+
+	return false;
 }
 
 bool FAnimNode_LegIK::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones)
@@ -686,8 +799,18 @@ static void PopulateLegBoneIndices(FAnimLegIKData& InLegData, const FCompactPose
 
 void FAnimNode_LegIK::InitializeBoneReferences(const FBoneContainer& RequiredBones)
 {
+	// Preserve FIKChain for each leg, as we're trying to maintain CachedBendDir between LOD transitions.
+	TMap<FName, FIKChain> IKChainLUT;
+	for(const FAnimLegIKData& LegData : LegsData)
+	{
+		if (LegData.LegDefPtr)
+		{
+			IKChainLUT.Add(LegData.LegDefPtr->FKFootBone.BoneName, LegData.IKChain);
+		}
+	}
+
 	LegsData.Reset();
-	for (auto& LegDef : LegsDefinition)
+	for (FAnimLegIKDefinition& LegDef : LegsDefinition)
 	{
 		LegDef.IKFootBone.Initialize(RequiredBones);
 		LegDef.FKFootBone.Initialize(RequiredBones);
@@ -704,6 +827,10 @@ void FAnimNode_LegIK::InitializeBoneReferences(const FBoneContainer& RequiredBon
 			if (LegData.FKLegBoneIndices.Num() >= 3)
 			{
 				LegData.NumBones = LegData.FKLegBoneIndices.Num();
+				if (FIKChain* IKChainPtr = IKChainLUT.Find(LegDef.FKFootBone.BoneName))
+				{
+					LegData.IKChain = *IKChainPtr;
+				}
 				LegData.LegDefPtr = &LegDef;
 				LegsData.Add(LegData);
 			}
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LookAt.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LookAt.cpp
index fff2af059c12..21ddce845b5a 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LookAt.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_LookAt.cpp
@@ -19,10 +19,12 @@ FAnimNode_LookAt::FAnimNode_LookAt()
 	, LookAtAxis_DEPRECATED(EAxisOption::Y)
 	, CustomLookAtAxis_DEPRECATED(FVector(0.f, 1.f, 0.f))
 	, LookAt_Axis(DefaultLookAtAxis)
+	, bUseLookUpAxis(false)
 	, LookUpAxis_DEPRECATED(EAxisOption::X)
 	, CustomLookUpAxis_DEPRECATED(FVector(1.f, 0.f, 0.f))
 	, LookUp_Axis(DefaultLookUpAxis)
 	, LookAtClamp(0.f)
+	, InterpolationType(EInterpolationBlend::Linear)
 	, InterpolationTime(0.f)
 	, InterpolationTriggerThreashold(0.f)
 	, CurrentLookAtLocation(FVector::ZeroVector)
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ScaleChainLength.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ScaleChainLength.cpp
index 21bbd5d9071a..7c6caa5a22a1 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ScaleChainLength.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_ScaleChainLength.cpp
@@ -9,7 +9,10 @@
 // FAnimNode_ScaleChainLength
 
 FAnimNode_ScaleChainLength::FAnimNode_ScaleChainLength()
-	: Alpha(1.f)
+	: DefaultChainLength(0.0f)
+	, Alpha(1.f)
+	, ActualAlpha(0.0f)
+	, bBoneIndicesCached(false)
 {
 	ChainInitialLength = EScaleChainInitialLength::FixedDefaultLengthValue;
 }
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_SkeletalControlBase.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_SkeletalControlBase.cpp
index 5257ae7ac2b0..42640a2d2fa5 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_SkeletalControlBase.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_SkeletalControlBase.cpp
@@ -53,6 +53,9 @@ void FAnimNode_SkeletalControlBase::Initialize_AnyThread(const FAnimationInitial
 	FAnimNode_Base::Initialize_AnyThread(Context);
 
 	ComponentPose.Initialize(Context);
+
+	AlphaBoolBlend.Reinitialize();
+	AlphaScaleBiasClamp.Reinitialize();
 }
 
 void FAnimNode_SkeletalControlBase::CacheBones_AnyThread(const FAnimationCacheBonesContext& Context) 
@@ -76,12 +79,30 @@ void FAnimNode_SkeletalControlBase::Update_AnyThread(const FAnimationUpdateConte
 	UpdateComponentPose_AnyThread(Context);
 
 	ActualAlpha = 0.f;
-	if (IsLODEnabled(Context.AnimInstanceProxy, LODThreshold))
+	if (IsLODEnabled(Context.AnimInstanceProxy))
 	{
 		EvaluateGraphExposedInputs.Execute(Context);
 
 		// Apply the skeletal control if it's valid
-		ActualAlpha = AlphaScaleBias.ApplyTo(Alpha);
+		switch (AlphaInputType)
+		{
+		case EAnimAlphaInputType::Float : 
+			ActualAlpha = AlphaScaleBias.ApplyTo(AlphaScaleBiasClamp.ApplyTo(Alpha, Context.GetDeltaTime()));
+			break;
+		case EAnimAlphaInputType::Bool :
+			ActualAlpha = AlphaBoolBlend.ApplyTo(bAlphaBoolEnabled, Context.GetDeltaTime());
+			break;
+		case EAnimAlphaInputType::Curve :
+			if (UAnimInstance* AnimInstance = Cast<UAnimInstance>(Context.AnimInstanceProxy->GetAnimInstanceObject()))
+			{
+				ActualAlpha = AlphaScaleBiasClamp.ApplyTo(AnimInstance->GetCurveValue(AlphaCurveName), Context.GetDeltaTime());
+			}
+			break;
+		};
+
+		// Make sure Alpha is clamped between 0 and 1.
+		ActualAlpha = FMath::Clamp<float>(ActualAlpha, 0.f, 1.f);
+
 		if (FAnimWeight::IsRelevant(ActualAlpha) && IsValidToEvaluate(Context.AnimInstanceProxy->GetSkeleton(), Context.AnimInstanceProxy->GetRequiredBones()))
 		{
 			UpdateInternal(Context);
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_Trail.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_Trail.cpp
index 2cc385f03e4e..c59c0ac614cb 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_Trail.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_Trail.cpp
@@ -13,6 +13,7 @@ FAnimNode_Trail::FAnimNode_Trail()
 	, ChainBoneAxis(EAxis::X)
 	, bInvertChainBoneAxis(false)
 	, TrailRelaxation_DEPRECATED(10.f)
+	, RelaxationSpeedScale(1.f)
 	, bLimitStretch(false)
 	, StretchLimit(0)
 	, FakeVelocity(FVector::ZeroVector)
@@ -28,7 +29,7 @@ void FAnimNode_Trail::UpdateInternal(const FAnimationUpdateContext& Context)
 {
 	FAnimNode_SkeletalControlBase::UpdateInternal(Context);
 
-	ThisTimstep = Context.GetDeltaTime();
+	ThisTimstep += Context.GetDeltaTime();
 }
 
 void FAnimNode_Trail::GatherDebugData(FNodeDebugData& DebugData)
@@ -48,6 +49,8 @@ void FAnimNode_Trail::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseConte
 	SCOPE_CYCLE_COUNTER(STAT_Trail_Eval);
 
 	check(OutBoneTransforms.Num() == 0);
+	const float TimeStep = ThisTimstep;
+	ThisTimstep = 0.f;
 
 	if( ChainBoneIndices.Num() <= 0 )
 	{
@@ -107,7 +110,7 @@ void FAnimNode_Trail::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseConte
 	// Add fake velocity if present to all but root bone
 	if(!FakeVelocity.IsZero())
 	{
-		FVector FakeMovement = -FakeVelocity * ThisTimstep;
+		FVector FakeMovement = -FakeVelocity * TimeStep;
 
 		if (bActorSpaceFakeVel)
 		{
@@ -154,7 +157,8 @@ void FAnimNode_Trail::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseConte
 		FVector Error = (ChildTarget - ChildPos);
 
 		// Calculate how much to push the child towards its target
-		float Correction = FMath::Clamp<float>(ThisTimstep * PerJointTrailData[i].TrailRelaxationSpeedPerSecond, 0.f, 1.f);
+		const float SpeedScale = RelaxationSpeedScaleInputProcessor.ApplyTo(RelaxationSpeedScale, TimeStep);
+		const float Correction = FMath::Clamp<float>(TimeStep * SpeedScale * PerJointTrailData[i].TrailRelaxationSpeedPerSecond, 0.f, 1.f);
 
 		// Scale correction vector and apply to get new world-space child position.
 		TrailBoneLocations[i] = ChildPos + (Error * Correction);
@@ -225,7 +229,7 @@ bool FAnimNode_Trail::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneCo
 		}
 	}
 
-	return true;
+	return (ChainBoneIndices.Num() > 0);
 }
 
 void FAnimNode_Trail::InitializeBoneReferences(const FBoneContainer& RequiredBones) 
@@ -320,4 +324,6 @@ void FAnimNode_Trail::Initialize_AnyThread(const FAnimationInitializeContext& Co
 			PerJointTrailData[Idx].TrailRelaxationSpeedPerSecond = TrailRelaxRichCurve->Eval(Interval * Idx);
 		}
 	}
+
+	RelaxationSpeedScaleInputProcessor.Reinitialize();
 }
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_TwoBoneIK.cpp b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_TwoBoneIK.cpp
index 977627288e9a..e1c764f2b72f 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_TwoBoneIK.cpp
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Private/BoneControllers/AnimNode_TwoBoneIK.cpp
@@ -28,6 +28,7 @@ FAnimNode_TwoBoneIK::FAnimNode_TwoBoneIK()
 	, JointTargetLocationSpace(BCS_ComponentSpace)
 	, JointTargetLocation(FVector::ZeroVector)
 	, bAllowTwist(true)
+	, bNoTwist_DEPRECATED(false)
 	, CachedUpperLimbIndex(INDEX_NONE)
 	, CachedLowerLimbIndex(INDEX_NONE)
 {
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_AimOffsetLookAt.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_AimOffsetLookAt.h
index 5bd5a9b43c12..7c826ce1e4a6 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_AimOffsetLookAt.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_AimOffsetLookAt.h
@@ -29,6 +29,8 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_AimOffsetLookAt : public FAnimNode_BlendSp
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta = (DisplayName = "LOD Threshold"))
 	int32 LODThreshold;
 
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 	UPROPERTY(Transient)
 	bool bIsLODEnabled;
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_ApplyAdditive.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_ApplyAdditive.h
index 572058d7b044..0fbb40a16287 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_ApplyAdditive.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_ApplyAdditive.h
@@ -19,10 +19,10 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_ApplyAdditive : public FAnimNode_Base
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Links)
 	FPoseLink Additive;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings, meta=(PinShownByDefault))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Alpha, meta=(PinShownByDefault))
 	mutable float Alpha;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Alpha)
 	FInputScaleBias AlphaScaleBias;
 
 	/* 
@@ -34,9 +34,26 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_ApplyAdditive : public FAnimNode_Base
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta=(DisplayName="LOD Threshold"))
 	int32 LODThreshold;
 
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 	UPROPERTY(Transient)
 	float ActualAlpha;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	EAnimAlphaInputType AlphaInputType;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault, DisplayName = "bEnabled"))
+	mutable bool bAlphaBoolEnabled;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (DisplayName = "Blend Settings"))
+	FInputAlphaBoolBlend AlphaBoolBlend;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	mutable FName AlphaCurveName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	FInputScaleBiasClamp AlphaScaleBiasClamp;
+
 public:	
 	FAnimNode_ApplyAdditive();
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendBoneByChannel.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendBoneByChannel.h
index 701b25a82632..29c29070e1cb 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendBoneByChannel.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendBoneByChannel.h
@@ -85,6 +85,8 @@ public:
 	FAnimNode_BlendBoneByChannel()
 		: Alpha(0.0f)
 		, TransformsSpace(EBoneControlSpace::BCS_BoneSpace)
+		, InternalBlendAlpha(0.0f)
+		, bBIsRelevant(false)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListBase.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListBase.h
index 144f7ddf8239..d8dfa2f01fba 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListBase.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListBase.h
@@ -58,7 +58,10 @@ protected:
 
 public:	
 	FAnimNode_BlendListBase()
-		: LastActiveChildIndex(0)
+		: BlendType(EAlphaBlendOption::Linear)
+		, CustomBlendCurve(nullptr)
+		, BlendProfile(nullptr)
+		, LastActiveChildIndex(0)
 		, bResetChildOnActivation(false)
 	{
 		BlendWeights.Empty();
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByBool.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByBool.h
index 5d99862ba556..c0df80bfbb16 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByBool.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByBool.h
@@ -20,6 +20,7 @@ public:
 public:	
 	FAnimNode_BlendListByBool()
 		: FAnimNode_BlendListBase()
+		, bActiveValue(false)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByEnum.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByEnum.h
index 4d02664f40db..f86e5eccffae 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByEnum.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_BlendListByEnum.h
@@ -24,6 +24,7 @@ public:
 public:	
 	FAnimNode_BlendListByEnum()
 		: FAnimNode_BlendListBase()
+		, ActiveEnumValue(0)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_LayeredBoneBlend.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_LayeredBoneBlend.h
index ea9b8572028c..52f13f7d696d 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_LayeredBoneBlend.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_LayeredBoneBlend.h
@@ -50,6 +50,17 @@ public:
 	UPROPERTY(Transient)
 	bool bHasRelevantPoses;
 
+	/*
+ 	 * Max LOD that this node is allowed to run
+	 * For example if you have LODThreadhold to be 2, it will run until LOD 2 (based on 0 index)
+	 * when the component LOD becomes 3, it will stop update/evaluate
+	 * currently transition would be issue and that has to be re-visited
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta = (DisplayName = "LOD Threshold"))
+	int32 LODThreshold;
+
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 protected:
 
 	// This is buffer to serialize blend weight data for each joints
@@ -73,6 +84,10 @@ protected:
 
 public:	
 	FAnimNode_LayeredBoneBlend()
+		: bMeshSpaceRotationBlend(false)
+		, CurveBlendOption(ECurveBlendOption::MaxWeight)
+		, bHasRelevantPoses(false)
+		, LODThreshold(INDEX_NONE)
 	{
 		bBlendRootMotionBasedOnRootBone = true;
 	}
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotateRootBone.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotateRootBone.h
index 07362015da12..3df1357db12d 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotateRootBone.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotateRootBone.h
@@ -32,6 +32,12 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_RotateRootBone : public FAnimNode_Base
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings, meta=(PinShownByDefault))
 	mutable FRotator MeshToComponent;
 
+	UPROPERTY(Transient)
+	float ActualPitch;
+
+	UPROPERTY(Transient)
+	float ActualYaw;
+
 public:	
 	FAnimNode_RotateRootBone();
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotationOffsetBlendSpace.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotationOffsetBlendSpace.h
index 85660aff1c5b..789968bcd693 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotationOffsetBlendSpace.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_RotationOffsetBlendSpace.h
@@ -27,19 +27,36 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_RotationOffsetBlendSpace : public FAnimNod
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta = (DisplayName = "LOD Threshold"))
 	int32 LODThreshold;
 
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 	UPROPERTY(Transient)
 	bool bIsLODEnabled;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	EAnimAlphaInputType AlphaInputType;
+
 	// Current strength of the AimOffset
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinShownByDefault))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
 	mutable float Alpha;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
 	FInputScaleBias AlphaScaleBias;
 
 	UPROPERTY(Transient)
 	float ActualAlpha;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault, DisplayName = "bEnabled"))
+	mutable bool bAlphaBoolEnabled;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (DisplayName = "Blend Settings"))
+	FInputAlphaBoolBlend AlphaBoolBlend;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	mutable FName AlphaCurveName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	FInputScaleBiasClamp AlphaScaleBiasClamp;
+
 public:	
 	FAnimNode_RotationOffsetBlendSpace();
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_SequenceEvaluator.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_SequenceEvaluator.h
index eef1cf92fb64..09fda8a147e5 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_SequenceEvaluator.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_SequenceEvaluator.h
@@ -60,10 +60,13 @@ public:
 
 public:	
 	FAnimNode_SequenceEvaluator()
-		: ExplicitTime(0.0f)
+		: Sequence(nullptr)
+		, ExplicitTime(0.0f)
+		, bShouldLoop(false)
 		, bTeleportToExplicitTime(true)
 		, StartPosition(0.f)
 		, ReinitializationBehavior(ESequenceEvalReinit::ExplicitTime)
+		, bReinitialized(false)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_TwoWayBlend.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_TwoWayBlend.h
index 0c179a255bee..7404fe1d929a 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_TwoWayBlend.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/AnimNodes/AnimNode_TwoWayBlend.h
@@ -21,12 +21,27 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Links)
 	FPoseLink B;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	EAnimAlphaInputType AlphaInputType;
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings, meta=(PinShownByDefault))
 	mutable float Alpha;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings)
 	FInputScaleBias AlphaScaleBias;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinShownByDefault, DisplayName = "bEnabled"))
+	mutable bool bAlphaBoolEnabled;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (DisplayName = "Blend Settings"))
+	FInputAlphaBoolBlend AlphaBoolBlend;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinShownByDefault))
+	mutable FName AlphaCurveName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	FInputScaleBiasClamp AlphaScaleBiasClamp;
+
 protected:
 	UPROPERTY(Transient)
 	mutable float InternalBlendAlpha;
@@ -43,7 +58,13 @@ protected:
 
 public:
 	FAnimNode_TwoWayBlend()
-		: Alpha(0.0f)
+		: AlphaInputType(EAnimAlphaInputType::Float)
+		, Alpha(0.0f)
+		, bAlphaBoolEnabled(true)
+		, AlphaCurveName(NAME_None)
+		, InternalBlendAlpha(0.0f)
+		, bAIsRelevant(false)
+		, bBIsRelevant(false)
 		, bResetChildOnActivation(false)
 	{
 	}
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_AnimDynamics.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_AnimDynamics.h
index 81f1ad6330fd..22acc9378f14 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_AnimDynamics.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_AnimDynamics.h
@@ -9,11 +9,22 @@
 #include "Animation/AnimPhysicsSolver.h"
 #include "BonePose.h"
 #include "BoneControllers/AnimNode_SkeletalControlBase.h"
+#include "Animation/AnimInstanceProxy.h"
 #include "AnimNode_AnimDynamics.generated.h"
 
 class UAnimInstance;
 class USkeletalMeshComponent;
 
+extern TAutoConsoleVariable<int32> CVarEnableDynamics;
+extern TAutoConsoleVariable<int32> CVarEnableWind;
+
+#if ENABLE_ANIM_DRAW_DEBUG
+
+extern TAutoConsoleVariable<int32> CVarShowDebug;
+extern TAutoConsoleVariable<FString> CVarDebugBone;
+
+#endif
+
 DECLARE_CYCLE_STAT_EXTERN(TEXT("Anim Dynamics Overall"), STAT_AnimDynamicsOverall, STATGROUP_Physics, ANIMGRAPHRUNTIME_API);
 DECLARE_CYCLE_STAT_EXTERN(TEXT("Anim Dynamics Wind Data Update"), STAT_AnimDynamicsWindData, STATGROUP_Physics, ANIMGRAPHRUNTIME_API);
 DECLARE_CYCLE_STAT_EXTERN(TEXT("Anim Dynamics Bone Evaluation"), STAT_AnimDynamicsBoneEval, STATGROUP_Physics, ANIMGRAPHRUNTIME_API);
@@ -85,6 +96,8 @@ struct FAnimPhysConstraintSetup
 	, AngularXAngle_DEPRECATED(0.0f)
 	, AngularYAngle_DEPRECATED(0.0f)
 	, AngularZAngle_DEPRECATED(0.0f)
+	, AngularTargetAxis(AnimPhysTwistAxis::AxisX)
+	, bLinearFullyLocked(false)
 	{}
 
 	/** Whether to limit the linear X axis */
@@ -355,13 +368,14 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_AnimDynamics : public FAnimNode_SkeletalCo
 	virtual void UpdateInternal(const FAnimationUpdateContext& Context) override;
 	virtual void EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms) override;
 	virtual void GatherDebugData(FNodeDebugData& DebugData) override;
-	virtual bool HasPreUpdate() const override { return true; }
+	virtual bool HasPreUpdate() const override;
 	virtual void PreUpdate(const UAnimInstance* InAnimInstance) override;
-	virtual bool NeedsDynamicReset() const { return true; }
-	virtual void ResetDynamics() { RequestInitialise(); }
+	virtual bool NeedsDynamicReset() const override { return true; }
+	virtual void ResetDynamics(ETeleportType InTeleportType) override { RequestInitialise(InTeleportType); }
+	virtual int32 GetLODThreshold() const override;
 	// End of FAnimNode_SkeletalControlBase interface
 
-	void RequestInitialise() { bRequiresInit = true; }
+	void RequestInitialise(ETeleportType InTeleportType);
 	void InitPhysics(FComponentSpacePoseContext& Output);
 	void TermPhysics();
 
@@ -395,6 +409,8 @@ private:
 
 	// Given a transform in simulation space, convert it back to component space
 	FTransform GetComponentSpaceTransformFromSimSpace(AnimPhysSimSpaceType SimSpace, FComponentSpacePoseContext& Output, const FTransform& InSimTransform);
+	FTransform GetComponentSpaceTransformFromSimSpace(AnimPhysSimSpaceType SimSpace, FComponentSpacePoseContext& Output, const FTransform& InSimTransform, const FTransform& InCompWorldSpaceTM, const FTransform& InActorWorldSpaceTM);
+
 	// Given a transform in component space, convert it to the current sim space
 	FTransform GetSimSpaceTransformFromComponentSpace(AnimPhysSimSpaceType SimSpace, FComponentSpacePoseContext& Output, const FTransform& InComponentTransform);
 
@@ -405,7 +421,7 @@ private:
 
 	// We can't get clean bone positions unless we are in the evaluate step.
 	// Requesting an init or reinit sets this flag for us to pick up during evaluate
-	bool bRequiresInit;
+	ETeleportType InitTeleportType;
 
 	// Maximum time to consider when accumulating time debt to avoid spiraling
 	static const float MaxTimeDebt;
@@ -416,9 +432,6 @@ private:
 	// Current amount of time debt
 	float TimeDebt;
 
-	// Current time dilation
-	float CurrentTimeDilation;
-
 	// Cached physics settings. We cache these on initialise to avoid the cost of accessing UPhysicsSettings a lot each frame
 	float MaxPhysicsDeltaTime;
 	float MaxSubstepDeltaTime;
@@ -459,4 +472,17 @@ private:
 
 	// Gravity direction in sim space
 	FVector SimSpaceGravityDirection;
+
+	// Previous component & actor transforms, used to account for teleports
+	FTransform PreviousCompWorldSpaceTM;
+	FTransform PreviousActorWorldSpaceTM;
+
+	//////////////////////////////////////////////////////////////////////////
+	// Live debug
+	//////////////////////////////////////////////////////////////////////////
+#if ENABLE_ANIM_DRAW_DEBUG
+	void DrawBodies(FComponentSpacePoseContext& InContext, const TArray<FAnimPhysRigidBody*>& InBodies);
+
+	int32 FilteredBoneIndex;
+#endif
 };
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_ApplyLimits.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_ApplyLimits.h
new file mode 100644
index 000000000000..7da03ae48e62
--- /dev/null
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_ApplyLimits.h
@@ -0,0 +1,63 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "BoneContainer.h"
+#include "BonePose.h"
+#include "BoneControllers/AnimNode_SkeletalControlBase.h"
+#include "AnimNode_ApplyLimits.generated.h"
+
+class USkeletalMeshComponent;
+
+USTRUCT()
+struct FAngularRangeLimit
+{
+	GENERATED_BODY()
+
+	FAngularRangeLimit()
+		: LimitMin(-180, -180, -180)
+		, LimitMax(+180, +180, +180)
+	{}
+
+	UPROPERTY(EditAnywhere, Category = Angular, meta = (UIMin = "-180", UIMax = "180", ClampMin = "-180", ClampMax = "180"))
+	FVector LimitMin;
+
+	UPROPERTY(EditAnywhere, Category = Angular, meta = (UIMin = "-180", UIMax = "180", ClampMin = "-180", ClampMax = "180"))
+	FVector LimitMax;
+
+	UPROPERTY(EditAnywhere, Category = Angular)
+	FBoneReference Bone;
+};
+
+USTRUCT(BlueprintInternalUseOnly)
+struct ANIMGRAPHRUNTIME_API FAnimNode_ApplyLimits : public FAnimNode_SkeletalControlBase
+{
+	GENERATED_USTRUCT_BODY();
+
+	FAnimNode_ApplyLimits();
+
+	UPROPERTY(EditAnywhere, Category = Angular)
+	TArray<FAngularRangeLimit> AngularRangeLimits;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, EditFixedSize, Category = "Angular", meta = (PinHiddenByDefault))
+	TArray<FVector> AngularOffsets;
+
+	void RecalcLimits();
+
+	// FAnimNode_Base interface
+	virtual void GatherDebugData(FNodeDebugData& DebugData) override;
+	virtual void OnInitializeAnimInstance(const FAnimInstanceProxy* InProxy, const UAnimInstance* InAnimInstance) override;
+	// End of FAnimNode_Base interface
+
+	// FAnimNode_SkeletalControlBase interface
+	virtual void EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms) override;
+	virtual bool IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) override;
+	// End of FAnimNode_SkeletalControlBase interface
+
+private:
+	// FAnimNode_SkeletalControlBase interface
+	virtual void InitializeBoneReferences(const FBoneContainer& RequiredBones) override;
+	// End of FAnimNode_SkeletalControlBase interface
+};
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_BoneDrivenController.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_BoneDrivenController.h
index ed7c5a5aee96..f4c01ac3d67a 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_BoneDrivenController.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_BoneDrivenController.h
@@ -7,6 +7,7 @@
 #include "BoneContainer.h"
 #include "BonePose.h"
 #include "BoneControllers/AnimNode_SkeletalControlBase.h"
+#include "Animation/AnimTypes.h"
 #include "AnimNode_BoneDrivenController.generated.h"
 
 class UCurveFloat;
@@ -15,26 +16,6 @@ class USkeletalMeshComponent;
 // Evaluation of the bone transforms relies on the size and ordering of this
 // enum, if this needs to change make sure EvaluateSkeletalControl_AnyThread is updated.
 
-// The transform component (attribute) to read from
-UENUM()
-namespace EComponentType
-{
-	enum Type
-	{
-		None = 0,
-		TranslationX,
-		TranslationY,
-		TranslationZ,
-		RotationX,
-		RotationY,
-		RotationZ,
-		Scale UMETA(DisplayName="Scale (largest component)"),
-		ScaleX,
-		ScaleY,
-		ScaleZ
-	};
-}
-
 // The type of modification to make to the destination component(s)
 UENUM()
 enum class EDrivenBoneModificationMode : uint8
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_LegIK.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_LegIK.h
index 86065d498a09..f305e3b2945c 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_LegIK.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_LegIK.h
@@ -11,6 +11,87 @@
 #include "AnimNode_LegIK.generated.h"
 
 class USkeletalMeshComponent;
+struct FAnimLegIKData;
+
+USTRUCT()
+struct FIKChainLink
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	FVector Location;
+	float Length;
+	FVector LinkAxisZ;
+	FVector RealBendDir;
+	FVector BaseBendDir;
+	FName BoneName;
+
+	FIKChainLink()
+		: Location(FVector::ZeroVector)
+		, Length(0.f)
+		, LinkAxisZ(FVector::ZeroVector)
+		, RealBendDir(FVector::ZeroVector)
+		, BaseBendDir(FVector::ZeroVector)
+		, BoneName(NAME_None)
+	{}
+
+	FIKChainLink(FVector InLocation, float InLength)
+		: Location(InLocation)
+		, Length(InLength)
+		, LinkAxisZ(FVector::ZeroVector)
+		, RealBendDir(FVector::ZeroVector)
+		, BaseBendDir(FVector::ZeroVector)
+		, BoneName(NAME_None)
+	{}
+};
+
+USTRUCT()
+struct FIKChain
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	TArray<FIKChainLink> Links;
+	float MinRotationAngleRadians;
+
+private:
+	bool bInitialized;
+	float MaximumReach;
+	int32 NumLinks;
+	bool bEnableRotationLimit;
+	FAnimInstanceProxy* MyAnimInstanceProxy;
+	FVector HingeRotationAxis;
+
+public:
+	FIKChain()
+		: bInitialized(false)
+		, MaximumReach(0.f)
+		, NumLinks(INDEX_NONE)
+		, bEnableRotationLimit(false)
+		, MyAnimInstanceProxy(nullptr)
+		, HingeRotationAxis(FVector::ZeroVector)
+	{}
+
+	void InitializeFromLegData(FAnimLegIKData& InLegData, FAnimInstanceProxy* InAnimInstanceProxy);
+	void ReachTarget(const FVector& InTargetLocation, float InReachPrecision, int32 InMaxIterations);
+
+	float GetMaximumReach() const
+	{
+		return MaximumReach;
+	}
+
+private:
+	void OrientAllLinksToDirection(const FVector& InDirection);
+	void SolveTwoBoneIK(const FVector& InTargetLocation);
+	void SolveFABRIK(const FVector& InTargetLocation, float InReachPrecision, int32 InMaxIterations);
+
+	static void FABRIK_ForwardReach(const FVector& InTargetLocation, FIKChain& IKChain);
+	static void FABRIK_BackwardReach(const FVector& InRootTargetLocation, FIKChain& IKChain);
+	static void FABRIK_ApplyLinkConstraints_Forward(FIKChain& IKChain, int32 LinkIndex);
+	static void FABRIK_ApplyLinkConstraints_Backward(FIKChain& IKChain, int32 LinkIndex);
+
+	static void DrawDebugIKChain(const FIKChain& IKChain, const FColor& InColor);
+};
 
 /** Per foot definitions */
 USTRUCT()
@@ -31,6 +112,10 @@ struct FAnimLegIKDefinition
 	UPROPERTY(EditAnywhere, Category = "Settings")
 	TEnumAsByte<EAxis::Type> FootBoneForwardAxis;
 
+	/** Hinge Bones Rotation Axis. This is essentially the plane normal for (hip - knee - foot). */
+	UPROPERTY(EditAnywhere, Category = "Settings")
+	TEnumAsByte<EAxis::Type> HingeRotationAxis;
+
 	/** If enabled, we prevent the leg from bending backwards and enforce a min compression angle */
 	UPROPERTY(EditAnywhere, Category = "Settings")
 	bool bEnableRotationLimit;
@@ -47,6 +132,7 @@ struct FAnimLegIKDefinition
 	FAnimLegIKDefinition()
 		: NumBonesInLimb(2)
 		, FootBoneForwardAxis(EAxis::Y)
+		, HingeRotationAxis(EAxis::None)
 		, bEnableRotationLimit(false)
 		, MinRotationAngle(15.f)
 		, bEnableKneeTwistCorrection(true)
@@ -69,81 +155,19 @@ public:
 	TArray<FCompactPoseBoneIndex> FKLegBoneIndices;
 	TArray<FTransform> FKLegBoneTransforms;
 
+	FIKChain IKChain;
+
 public:
 	void InitializeTransforms(FAnimInstanceProxy* MyAnimInstanceProxy, FCSPose<FCompactPose>& MeshBases);
 
 	FAnimLegIKData()
 		: IKFootBoneIndex(INDEX_NONE)
+		, IKFootTransform(FTransform::Identity)
 		, LegDefPtr(nullptr)
 		, NumBones(INDEX_NONE)
 	{}
 };
 
-USTRUCT()
-struct FIKChainLink
-{
-	GENERATED_USTRUCT_BODY()
-
-		FVector Location;
-	float Length;
-	FVector LinkAxisZ;
-
-	FIKChainLink()
-		: Location(FVector::ZeroVector)
-		, Length(0.f)
-		, LinkAxisZ(FVector::ZeroVector)
-	{}
-
-	FIKChainLink(FVector InLocation, float InLength)
-		: Location(InLocation)
-		, Length(InLength)
-		, LinkAxisZ(FVector::ZeroVector)
-	{}
-};
-
-USTRUCT()
-struct FIKChain
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-	TArray<FIKChainLink> Links;
-	float MinRotationAngleRadians;
-
-private:
-	bool bInitialized;
-	float MaximumReach;
-	int32 NumLinks;
-	bool bEnableRotationLimit;
-	FAnimInstanceProxy* MyAnimInstanceProxy;
-
-public:
-	FIKChain()
-		: bInitialized(false)
-		, MaximumReach(0.f)
-		, MyAnimInstanceProxy(nullptr)
-	{}
-
-	void InitializeFromLegData(const FAnimLegIKData& InLegData, FAnimInstanceProxy* InAnimInstanceProxy);
-	void ReachTarget(const FVector& InTargetLocation, float InReachPrecision, int32 InMaxIterations);
-
-	float GetMaximumReach() const
-	{
-		return MaximumReach;
-	}
-
-private:
-	void OrientAllLinksToDirection(const FVector& InDirection);
-	void SolveFABRIK(const FVector& InTargetLocation, float InReachPrecision, int32 InMaxIterations);
-
-	static void FABRIK_ForwardReach(const FVector& InTargetLocation, FIKChain& IKChain);
-	static void FABRIK_BackwardReach(const FVector& InRootTargetLocation, FIKChain& IKChain);
-	static void FABRIK_ApplyLinkConstraints_Forward(FIKChain& IKChain, int32 LinkIndex);
-	static void FABRIK_ApplyLinkConstraints_Backward(FIKChain& IKChain, int32 LinkIndex);
-
-	static void DrawDebugIKChain(const FIKChain& IKChain, const FColor& InColor);
-};
-
 USTRUCT()
 struct ANIMGRAPHRUNTIME_API FAnimNode_LegIK : public FAnimNode_SkeletalControlBase
 {
@@ -178,9 +202,9 @@ public:
 	virtual bool IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) override;
 	// End of FAnimNode_SkeletalControlBase interface
 
-	void OrientLegTowardsIK(FAnimLegIKData& InLegData);
-	void DoLegReachIK(FAnimLegIKData& InLegData);
-	void AdjustKneeTwist(FAnimLegIKData& InLegData);
+	bool OrientLegTowardsIK(FAnimLegIKData& InLegData);
+	bool DoLegReachIK(FAnimLegIKData& InLegData);
+	bool AdjustKneeTwist(FAnimLegIKData& InLegData);
 
 private:
 	// FAnimNode_SkeletalControlBase interface
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_SkeletalControlBase.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_SkeletalControlBase.h
index a2264d48c979..4cf1ec6dadd5 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_SkeletalControlBase.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_SkeletalControlBase.h
@@ -299,13 +299,6 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_SkeletalControlBase : public FAnimNode_Bas
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Links)
 	FComponentSpacePoseLink ComponentPose;
 
-	// Current strength of the skeletal control
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings, meta=(PinShownByDefault))
-	mutable float Alpha;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Settings)
-	FInputScaleBias AlphaScaleBias;
-
 	/*
 	* Max LOD that this node is allowed to run
 	* For example if you have LODThreadhold to be 2, it will run until LOD 2 (based on 0 index)
@@ -315,15 +308,41 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_SkeletalControlBase : public FAnimNode_Bas
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta = (DisplayName = "LOD Threshold"))
 	int32 LODThreshold;
 
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 	UPROPERTY(Transient)
 	float ActualAlpha;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	EAnimAlphaInputType AlphaInputType;
+
+	// Current strength of the skeletal control
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	mutable float Alpha;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	FInputScaleBias AlphaScaleBias;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault, DisplayName = "bEnabled"))
+	mutable bool bAlphaBoolEnabled;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (DisplayName = "Blend Settings"))
+	FInputAlphaBoolBlend AlphaBoolBlend;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	mutable FName AlphaCurveName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha)
+	FInputScaleBiasClamp AlphaScaleBiasClamp;
+
 public:
 
 	FAnimNode_SkeletalControlBase()
-		: Alpha(1.0f)
-		, LODThreshold(INDEX_NONE)
+		: LODThreshold(INDEX_NONE)
 		, ActualAlpha(0.f)
+		, AlphaInputType(EAnimAlphaInputType::Float)
+		, Alpha(1.0f)
+		, bAlphaBoolEnabled(true)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_Trail.h b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_Trail.h
index 2aec13474e04..46106d3816e6 100644
--- a/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_Trail.h
+++ b/Engine/Source/Runtime/AnimGraphRuntime/Public/BoneControllers/AnimNode_Trail.h
@@ -53,6 +53,12 @@ struct ANIMGRAPHRUNTIME_API FAnimNode_Trail : public FAnimNode_SkeletalControlBa
 	UPROPERTY(EditAnywhere, Category=Trail, meta=(CustomizeProperty))
 	FRuntimeFloatCurve TrailRelaxationSpeed;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Trail, meta = (PinHiddenByDefault))
+	float RelaxationSpeedScale;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Trail)
+	FInputScaleBiasClamp RelaxationSpeedScaleInputProcessor;
+
 	/** Limit the amount that a bone can stretch from its ref-pose length. */
 	UPROPERTY(EditAnywhere, Category=Limit)
 	bool	bLimitStretch;
diff --git a/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.cpp b/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.cpp
index 0c5bf5b81f11..bcc13de3662b 100644
--- a/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.cpp
+++ b/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.cpp
@@ -157,7 +157,7 @@ FReply SEyeDropperButton::OnMouseMove(const FGeometry& MyGeometry, const FPointe
 	return SButton::OnMouseMove(MyGeometry, MouseEvent);
 }
 
-void SEyeDropperButton::OnMouseCaptureLost()
+void SEyeDropperButton::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	if (bWasClickActivated && bWasLeft && !bWasReEntered)
 	{
diff --git a/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.h b/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.h
index 371ec9b90b29..56f213dbf47a 100644
--- a/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.h
+++ b/Engine/Source/Runtime/AppFramework/Private/Widgets/Colors/SEyeDropperButton.h
@@ -51,7 +51,7 @@ public:
 	virtual FReply OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
 	virtual FReply OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent) override;
 	virtual FCursorReply OnCursorQuery(const FGeometry& MyGeometry, const FPointerEvent& CursorEvent) const override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 
 private:
 
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.cpp
index 483489ba528a..7b71a8f7f0bd 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.cpp
@@ -254,6 +254,8 @@ FMetalBuffer FMetalSubBufferHeap::NewBuffer(NSUInteger length)
 {
 	NSUInteger Size = Align(length, MinAlign);
 	
+	check(ParentBuffer && ParentBuffer.GetPtr());
+	
 	FMetalBuffer Result;
 	FScopeLock Lock(&PoolMutex);
 	if (MaxAvailableSize() >= Size)
@@ -293,7 +295,7 @@ FMetalBuffer FMetalSubBufferHeap::NewBuffer(NSUInteger length)
 			}
 		}
 	}
-
+	check(Result && Result.GetPtr());
 	return Result;
 }
 
@@ -344,12 +346,14 @@ void FMetalSubBufferMagazine::FreeRange(ns::Range const& Range)
 		GetMetalDeviceContext().ValidateIsInactiveBuffer(Buf);
 	}
 #endif
-    
-	FreeRanges.Push(new ns::Range(Range.Location, Range.Length));
-	UsedSize -= Range.Length;
 	
-	INC_MEMORY_STAT_BY(STAT_MetalBufferUnusedMemory, Range.Length);
-	INC_MEMORY_STAT_BY(STAT_MetalMagazineBufferUnusedMemory, Range.Length);
+	{
+		FreeRanges.Push(new ns::Range(Range.Location, Range.Length));
+		FPlatformAtomics::InterlockedAdd(&UsedSize, -((int64)Range.Length));
+		
+		INC_MEMORY_STAT_BY(STAT_MetalBufferUnusedMemory, Range.Length);
+		INC_MEMORY_STAT_BY(STAT_MetalMagazineBufferUnusedMemory, Range.Length);
+	}
 }
 
 ns::String FMetalSubBufferMagazine::GetLabel() const
@@ -379,12 +383,12 @@ NSUInteger FMetalSubBufferMagazine::GetSize() const
 
 NSUInteger FMetalSubBufferMagazine::GetUsedSize() const
 {
-	return UsedSize;
+	return (NSUInteger)FPlatformAtomics::AtomicRead(&UsedSize);
 }
 
 NSUInteger FMetalSubBufferMagazine::GetFreeSize() const 
 {
-	return GetSize() - UsedSize;
+	return GetSize() - GetUsedSize();
 }
 
 void FMetalSubBufferMagazine::SetLabel(const ns::String& label)
@@ -396,17 +400,20 @@ FMetalBuffer FMetalSubBufferMagazine::NewBuffer()
 {
 	NSUInteger Size = MinAlign;
 	
+	check(ParentBuffer && ParentBuffer.GetPtr());
+	
 	FMetalBuffer Result;
 	ns::Range* Range = FreeRanges.Pop();
 	if (Range)
 	{
-		UsedSize += Range->Length;
+		FPlatformAtomics::InterlockedAdd(&UsedSize, ((int64)Range->Length));
 		DEC_MEMORY_STAT_BY(STAT_MetalBufferUnusedMemory, Range->Length);
 		DEC_MEMORY_STAT_BY(STAT_MetalMagazineBufferUnusedMemory, Range->Length);
 		Result = FMetalBuffer(MTLPP_VALIDATE(mtlpp::Buffer, ParentBuffer, SafeGetRuntimeDebuggingLevel() >= EMetalDebugLevelValidation, NewBuffer(*Range)), this);
 		delete Range;
 	}
 
+	check(Result && Result.GetPtr());
 	return Result;
 }
 
@@ -938,7 +945,8 @@ FMetalBuffer FMetalResourceHeap::CreateBuffer(uint32 Size, uint32 Alignment, mtl
 					}
 					check(Found);
 					
-					return Found->NewBuffer();
+					Buffer = Found->NewBuffer();
+					check(Buffer && Buffer.GetPtr());
 				}
 				else if (!bForceUnique && BlockSize <= HeapSizes[NumHeapSizes - 1] && (Storage == AllocShared || bSupportsPrivateBufferSubAllocation))
 				{
@@ -964,7 +972,8 @@ FMetalBuffer FMetalResourceHeap::CreateBuffer(uint32 Size, uint32 Alignment, mtl
 					}
 					check(Found);
 					
-					return Found->NewBuffer(BlockSize);
+					Buffer = Found->NewBuffer(BlockSize);
+					check(Buffer && Buffer.GetPtr());
 				}
 				else
 				{
@@ -992,7 +1001,7 @@ FMetalBuffer FMetalResourceHeap::CreateBuffer(uint32 Size, uint32 Alignment, mtl
 	}
 	
     METAL_DEBUG_OPTION(GetMetalDeviceContext().ValidateIsInactiveBuffer(Buffer));
-	
+	check(Buffer && Buffer.GetPtr());
 	return Buffer;
 }
 
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.h b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.h
index 253d9abeb685..52056f912303 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalBuffer.h
@@ -75,7 +75,7 @@ public:
 
 private:
 	NSUInteger MinAlign;
-	NSUInteger UsedSize;
+	int64 volatile UsedSize;
 	mtlpp::Buffer ParentBuffer;
 	TLockFreePointerListLIFO<ns::Range> FreeRanges;
 };
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommandQueue.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommandQueue.cpp
index b790993a26a0..eccd59488277 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommandQueue.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommandQueue.cpp
@@ -69,9 +69,15 @@ FMetalCommandQueue::FMetalCommandQueue(mtlpp::Device InDevice, uint32 const MaxN
 		
 		if(Vers.majorVersion > 10 || (Vers.majorVersion == 10 && Vers.minorVersion >= 3))
         {
-            Features |= EMetalFeaturesGPUCommandBufferTimes;
+            // This isn't currently working, with GPUStartTime and GPUStopTime usually coming back as zero.
+            // The docs say this means the GPU isn't finished with the command buffer yet, but we are running
+            // in the completed handler and the status is MTLCommandBufferStatusCompleted, so it has to be
+            // finished. My guess is that the command buffer is empty so the GPU isn't executing it.
+            //Features |= EMetalFeaturesGPUCommandBufferTimes;
+            
 			Features |= EMetalFeaturesLinearTextures;
-			Features |= EMetalFeaturesEfficientBufferBlits;
+			// InjectCurves() does not work with this
+			//Features |= EMetalFeaturesEfficientBufferBlits;
 			Features |= EMetalFeaturesPrivateBufferSubAllocation;
 			
 			if(!bNoMetalv2 && ([Device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily3_v2] || [Device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily2_v3] || [Device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily1_v3]))
@@ -91,7 +97,12 @@ FMetalCommandQueue::FMetalCommandQueue(mtlpp::Device InDevice, uint32 const MaxN
 		Features = EMetalFeaturesSeparateStencil | EMetalFeaturesSetBufferOffset;
 	}
 #else // Assume that Mac & other platforms all support these from the start. They can diverge later.
-	Features = EMetalFeaturesSeparateStencil | EMetalFeaturesSetBufferOffset | EMetalFeaturesDepthClipMode | EMetalFeaturesResourceOptions | EMetalFeaturesDepthStencilBlitOptions | EMetalFeaturesCountingQueries | EMetalFeaturesBaseVertexInstance | EMetalFeaturesIndirectBuffer | EMetalFeaturesLayeredRendering | EMetalFeaturesShaderVersions | EMetalFeaturesCombinedDepthStencil | EMetalFeaturesCubemapArrays;
+	const bool bIsNVIDIA = [Device.GetName().GetPtr() rangeOfString:@"Nvidia" options:NSCaseInsensitiveSearch].location != NSNotFound;
+	Features = EMetalFeaturesSeparateStencil | EMetalFeaturesDepthClipMode | EMetalFeaturesResourceOptions | EMetalFeaturesDepthStencilBlitOptions | EMetalFeaturesCountingQueries | EMetalFeaturesBaseVertexInstance | EMetalFeaturesIndirectBuffer | EMetalFeaturesLayeredRendering | EMetalFeaturesShaderVersions | EMetalFeaturesCombinedDepthStencil | EMetalFeaturesCubemapArrays;
+	if (!bIsNVIDIA)
+	{
+		Features |= EMetalFeaturesSetBufferOffset;
+	}
 	if (!FParse::Param(FCommandLine::Get(),TEXT("nometalv2")) && Device.SupportsFeatureSet(mtlpp::FeatureSet::macOS_GPUFamily1_v2))
     {
         Features |= EMetalFeaturesStencilView | EMetalFeaturesDepth16 | EMetalFeaturesTessellation | EMetalFeaturesFunctionConstants | EMetalFeaturesGraphicsUAVs | EMetalFeaturesDeferredStoreActions | EMetalFeaturesMSAADepthResolve | EMetalFeaturesMSAAStoreAndResolve;
@@ -112,7 +123,7 @@ FMetalCommandQueue::FMetalCommandQueue(mtlpp::Device InDevice, uint32 const MaxN
 			Features |= EMetalFeaturesPrivateBufferSubAllocation;
 		}
     }
-    else if (FString(Device.GetName()).Contains(TEXT("Nvidia")))
+    else if ([Device.GetName().GetPtr() rangeOfString:@"Nvidia" options:NSCaseInsensitiveSearch].location != NSNotFound)
     {
 		// Using set*Bytes fixes bugs on Nvidia for 10.11 so we should use it...
     	Features |= EMetalFeaturesSetBytes;
@@ -137,7 +148,7 @@ FMetalCommandQueue::FMetalCommandQueue(mtlpp::Device InDevice, uint32 const MaxN
 		Features |= EMetalFeaturesValidation;
 	}
 #endif
-	
+    
 	static const auto CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.Shaders.Optimize"));
 	if (CVar->GetInt() == 0 || FParse::Param(FCommandLine::Get(),TEXT("metalshaderdebug")))
 	{
@@ -331,7 +342,7 @@ mtlpp::ResourceOptions FMetalCommandQueue::GetCompatibleResourceOptions(mtlpp::R
 void FMetalCommandQueue::InsertDebugCaptureBoundary(void)
 {
 	PRAGMA_DISABLE_DEPRECATION_WARNINGS
-	CommandQueue.InsertDebugCaptureBoundary();
+	[CommandQueue insertDebugCaptureBoundary];
 	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 }
 
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommands.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommands.cpp
index 821b1f5b7e09..f087522e5b95 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommands.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalCommands.cpp
@@ -621,11 +621,6 @@ void FMetalRHICommandContext::RHISetRenderTargets(uint32 NumSimultaneousRenderTa
 	}
 }
 
-void FMetalDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
-{
-	// Deliberate do nothing - Metal doesn't care about this.
-}
-
 void FMetalRHICommandContext::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo)
 {
 	@autoreleasepool {
@@ -1006,6 +1001,11 @@ void FMetalRHICommandContext::RHISubmitCommandsHint()
 	}
 }
 
+void FMetalRHICommandContext::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
+{
+	Context->GetCurrentState().DiscardRenderTargets(Depth, Stencil, ColorBitMask);
+}
+
 IRHICommandContext* FMetalDynamicRHI::RHIGetDefaultContext()
 {
 	return &ImmediateContext;
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalContext.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalContext.cpp
index a2f14fb596ca..dfe1bc4b247a 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalContext.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalContext.cpp
@@ -669,7 +669,7 @@ FMetalTexture FMetalDeviceContext::CreateTexture(FMetalSurface* Surface, mtlpp::
 FMetalBuffer FMetalDeviceContext::CreatePooledBuffer(FMetalPooledBufferArgs const& Args)
 {
 	FMetalBuffer Buffer = Heap.CreateBuffer(Args.Size, BufferOffsetAlignment, GetCommandQueue().GetCompatibleResourceOptions((mtlpp::ResourceOptions)(BUFFER_CACHE_MODE | mtlpp::ResourceOptions::HazardTrackingModeUntracked | ((NSUInteger)Args.Storage << mtlpp::ResourceStorageModeShift))));
-						 
+	check(Buffer && Buffer.GetPtr());
 #if METAL_DEBUG_OPTIONS
 	static bool bSupportsHeaps = SupportsFeature(EMetalFeaturesHeaps);
 	if (GMetalResourcePurgeOnDelete && !Buffer.GetHeap())
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalPipeline.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalPipeline.cpp
index e8da01f38ab5..3ff6eac5bca8 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalPipeline.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalPipeline.cpp
@@ -305,12 +305,17 @@ struct FMetalGraphicsPipelineKey
 		else
 		{
 			Key.SetHashValue(Offset_IndexType, NumBits_IndexType, EMetalIndexType_None);
+			Key.DomainBufferHash = 0;
 		}
 		if (PixelShader)
 		{
 			Key.PixelFunction = PixelShader->GetHash();
 			Key.PixelBufferHash = PixelShader->GetBindingHash(PixelBufferTypes);
 		}
+		else
+		{
+			Key.PixelBufferHash = 0;
+		}
 	}
 };
 
@@ -864,7 +869,7 @@ static FMetalShaderPipeline* GetMTLRenderPipeline(bool const bSync, FMetalGraphi
 	static TMap<FMetalGraphicsPipelineKey, FMetalShaderPipeline*> Pipelines;
 	
 	SCOPE_CYCLE_COUNTER(STAT_MetalPipelineStateTime);
-
+	
 	FMetalGraphicsPipelineKey Key;
 	InitMetalGraphicsPipelineKey(Key, Init, IndexType, VertexBufferTypes, PixelBufferTypes, DomainBufferTypes);
 
@@ -875,14 +880,14 @@ static FMetalShaderPipeline* GetMTLRenderPipeline(bool const bSync, FMetalGraphi
 	FMetalShaderPipeline* Desc = Pipelines.FindRef(Key);
 	if (Desc == nil)
 	{
+		Desc = CreateMTLRenderPipeline(bSync, Key, Init, IndexType, VertexBufferTypes, PixelBufferTypes, DomainBufferTypes);
+
 		// Now we are a writer as we want to create & add the new pipeline
 		Lock.ReleaseReadOnlyLockAndAcquireWriteLock_USE_WITH_CAUTION();
 		
 		// Retest to ensure no-one beat us here!
-		Desc = Pipelines.FindRef(Key);
-		if (Desc == nil)
+		if (Pipelines.FindRef(Key) == nil)
 		{
-			Desc = CreateMTLRenderPipeline(bSync, Key, Init, IndexType, VertexBufferTypes, PixelBufferTypes, DomainBufferTypes);
 			Pipelines.Add(Key, Desc);
 		}
 	}
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHI.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHI.cpp
index f66dd9002cdb..0cefccb1980d 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHI.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHI.cpp
@@ -413,8 +413,28 @@ FMetalDynamicRHI::FMetalDynamicRHI(ERHIFeatureLevel::Type RequestedFeatureLevel)
 			CVarTranslucentLightingVolume->Set(0);
 		}
 	}
-	
+
+#if PLATFORM_MAC
+	if (IsRHIDeviceIntel())
+	{
+		static auto CVarVolumetricFog = IConsoleManager::Get().FindConsoleVariable(TEXT("r.VolumetricFog"));
+		if(CVarVolumetricFog && CVarVolumetricFog->GetInt() != 0)
+		{
+			CVarVolumetricFog->Set(0);
+		}
+
+		static auto CVarSGShadowQuality = IConsoleManager::Get().FindConsoleVariable((TEXT("sg.ShadowQuality")));
+		if(CVarSGShadowQuality && CVarSGShadowQuality->GetInt() != 0)
+		{
+			CVarSGShadowQuality->Set(0);
+		}
+	}
+#endif
+
+#if UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT
+	// we don't want to auto-enable draw events in Test
 	SetEmitDrawEvents(GetEmitDrawEvents() | ENABLE_METAL_GPUEVENTS);
+#endif
 
 	GSupportsShaderFramebufferFetch = !PLATFORM_MAC;
 	GHardwareHiddenSurfaceRemoval = true;
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHIPrivate.h b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHIPrivate.h
index 9ce47097dd9b..bd4ef1c0abf6 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHIPrivate.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalRHIPrivate.h
@@ -95,8 +95,11 @@ extern FMetalBufferFormat GMetalBufferFormats[PF_MAX];
 extern bool GMetalSupportsTileShaders;
 
 /** Set to 1 to enable GPU events in Xcode frame debugger */
-#define ENABLE_METAL_GPUEVENTS	(UE_BUILD_DEBUG | UE_BUILD_DEVELOPMENT | METAL_STATISTICS)
-#define ENABLE_METAL_GPUPROFILE	(ENABLE_METAL_GPUEVENTS & 1)
+#ifndef ENABLE_METAL_GPUEVENTS_IN_TEST
+	#define ENABLE_METAL_GPUEVENTS_IN_TEST 0
+#endif
+#define ENABLE_METAL_GPUEVENTS	(UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT || (UE_BUILD_TEST && ENABLE_METAL_GPUEVENTS_IN_TEST) || METAL_STATISTICS)
+#define ENABLE_METAL_GPUPROFILE	(ENABLE_METAL_GPUEVENTS && 1)
 
 #if ENABLE_METAL_GPUPROFILE
 #define METAL_GPUPROFILE(Code) Code
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalShaders.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalShaders.cpp
index ac8ba7e25b01..c97b6ad39a4d 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalShaders.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalShaders.cpp
@@ -89,8 +89,11 @@ public:
 	void Add(FMetalCompiledShaderKey Key, mtlpp::Library const& Lib, mtlpp::Function const& Function)
 	{
 		FRWScopeLock ScopedLock(Lock, SLT_Write);
-		Cache.Add(Key, Function);
-		LibCache.Add(Function.GetPtr(), Lib);
+		if (Cache.FindRef(Key) == nil)
+		{
+			Cache.Add(Key, Function);
+			LibCache.Add(Function.GetPtr(), Lib);
+		}
 	}
 	
 private:
@@ -1064,8 +1067,8 @@ FDomainShaderRHIRef FMetalDynamicRHI::CreateDomainShader_RenderThread(class FRHI
 	return RHICreateDomainShader(Library, Hash);
 }
 
-FMetalShaderLibrary::FMetalShaderLibrary(EShaderPlatform InPlatform, mtlpp::Library InLibrary, FMetalShaderMap const& InMap)
-: FRHIShaderLibrary(InPlatform)
+FMetalShaderLibrary::FMetalShaderLibrary(EShaderPlatform InPlatform, FString const& Name, mtlpp::Library InLibrary, FMetalShaderMap const& InMap)
+: FRHIShaderLibrary(InPlatform, Name)
 , Library(InLibrary)
 , Map(InMap)
 {
@@ -1077,6 +1080,18 @@ FMetalShaderLibrary::~FMetalShaderLibrary()
 	
 }
 
+bool FMetalShaderLibrary::ContainsEntry(const FSHAHash& Hash)
+{
+	TPair<uint8, TArray<uint8>>* Code = Map.HashMap.Find(Hash);
+	return (Code != nullptr);
+}
+
+bool FMetalShaderLibrary::RequestEntry(const FSHAHash& Hash, FArchive* Ar)
+{
+	TPair<uint8, TArray<uint8>>* Code = Map.HashMap.Find(Hash);
+	return (Code != nullptr);
+}
+
 FPixelShaderRHIRef FMetalShaderLibrary::CreatePixelShader(const FSHAHash& Hash)
 {
 	TPair<uint8, TArray<uint8>>* Code = Map.HashMap.Find(Hash);
@@ -1199,21 +1214,34 @@ FRHIShaderLibrary::FShaderLibraryEntry FMetalShaderLibrary::FMetalShaderLibraryI
 	return Entry;
 }
 
-FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath)
+FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath, FString Name)
 {
-	return RHICreateShaderLibrary(Platform, FilePath);
+	return RHICreateShaderLibrary(Platform, FilePath, Name);
 }
 
-FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary(EShaderPlatform Platform, FString FolderPath)
+FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary(EShaderPlatform Platform, FString const& FilePath, FString const& Name)
 {
 	@autoreleasepool {
 	FRHIShaderLibraryRef Result = nullptr;
 	
 	FName PlatformName = LegacyShaderPlatformToShaderFormat(Platform);
+	FString LibName = FString::Printf(TEXT("%s_%s"), *Name, *PlatformName.GetPlainNameString());
+	LibName.ToLowerInline();
 	
 	FMetalShaderMap Map;
-	FString BinaryShaderFile = FolderPath / PlatformName.GetPlainNameString() + METAL_MAP_EXTENSION;
+	FString BinaryShaderFile = FilePath / LibName + METAL_MAP_EXTENSION;
+
+	if ( IFileManager::Get().FileExists(*BinaryShaderFile) == false )
+	{
+		// the metal map files are stored in UFS file system
+		// for pak files this means they might be stored in a different location as the pak files will mount them to the project content directory
+		// the metal libraries are stores non UFS and could be anywhere on the file system.
+		// if we don't find the metalmap file straight away try the pak file path
+		BinaryShaderFile = FPaths::ProjectContentDir() / LibName + METAL_MAP_EXTENSION;
+	}
+
 	FArchive* BinaryShaderAr = IFileManager::Get().CreateFileReader(*BinaryShaderFile);
+
 	if( BinaryShaderAr != NULL )
 	{
 		*BinaryShaderAr << Map;
@@ -1223,7 +1251,7 @@ FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary(EShaderPlatform Pl
 		// Would be good to check the language version of the library with the archive format here.
 		if (Map.Format == PlatformName.GetPlainNameString())
 		{
-			FString MetalLibraryFilePath = FolderPath / PlatformName.GetPlainNameString() + METAL_LIB_EXTENSION;
+			FString MetalLibraryFilePath = FilePath / LibName + METAL_LIB_EXTENSION;
 			MetalLibraryFilePath = FPaths::ConvertRelativePathToFull(MetalLibraryFilePath);
 #if !PLATFORM_MAC
 			MetalLibraryFilePath = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*MetalLibraryFilePath);
@@ -1234,7 +1262,7 @@ FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary(EShaderPlatform Pl
 			mtlpp::Library Library = [GetMetalDeviceContext().GetDevice() newLibraryWithFile:MetalLibraryFilePath.GetNSString() error:&Error];
 			if (Library != nil)
 			{
-				Result = new FMetalShaderLibrary(Platform, Library, Map);
+				Result = new FMetalShaderLibrary(Platform, Name, Library, Map);
 			}
 			else
 			{
@@ -1243,12 +1271,12 @@ FRHIShaderLibraryRef FMetalDynamicRHI::RHICreateShaderLibrary(EShaderPlatform Pl
 		}
 		else
 		{
-			UE_LOG(LogMetal, Display, TEXT("Wrong shader platform wanted: %s, got: %s"), *PlatformName.GetPlainNameString(), *Map.Format);
+			UE_LOG(LogMetal, Display, TEXT("Wrong shader platform wanted: %s, got: %s"), *LibName, *Map.Format);
 		}
 	}
 	else
 	{
-		UE_LOG(LogMetal, Display, TEXT("No .metalmap file found for %s!"), *PlatformName.GetPlainNameString());
+		UE_LOG(LogMetal, Display, TEXT("No .metalmap file found for %s!"), *LibName);
 	}
 	
 	return Result;
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalState.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalState.cpp
index e3e74e403316..d17c22ee2a1f 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalState.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalState.cpp
@@ -119,6 +119,46 @@ static mtlpp::ColorWriteMask TranslateWriteMask(EColorWriteMask WriteMask)
 	return (mtlpp::ColorWriteMask)Result;
 }
 
+static EBlendOperation TranslateBlendOp(MTLBlendOperation BlendOp)
+{
+	switch(BlendOp)
+	{
+		case MTLBlendOperationSubtract:		return BO_Subtract;
+		case MTLBlendOperationMin:			return BO_Min;
+		case MTLBlendOperationMax:			return BO_Max;
+		case MTLBlendOperationAdd: default:	return BO_Add;
+	};
+}
+
+
+static EBlendFactor TranslateBlendFactor(MTLBlendFactor BlendFactor)
+{
+	switch(BlendFactor)
+	{
+		case MTLBlendFactorOne:							return BF_One;
+		case MTLBlendFactorSourceColor:					return BF_SourceColor;
+		case MTLBlendFactorOneMinusSourceColor:			return BF_InverseSourceColor;
+		case MTLBlendFactorSourceAlpha:					return BF_SourceAlpha;
+		case MTLBlendFactorOneMinusSourceAlpha:			return BF_InverseSourceAlpha;
+		case MTLBlendFactorDestinationAlpha:			return BF_DestAlpha;
+		case MTLBlendFactorOneMinusDestinationAlpha:	return BF_InverseDestAlpha;
+		case MTLBlendFactorDestinationColor:			return BF_DestColor;
+		case MTLBlendFactorOneMinusDestinationColor:	return BF_InverseDestColor;
+		case MTLBlendFactorZero: default:				return BF_Zero;
+	};
+}
+
+static EColorWriteMask TranslateWriteMask(MTLColorWriteMask WriteMask)
+{
+	uint32 Result = 0;
+	Result |= (WriteMask & MTLColorWriteMaskRed) ? (CW_RED) : 0;
+	Result |= (WriteMask & MTLColorWriteMaskGreen) ? (CW_GREEN) : 0;
+	Result |= (WriteMask & MTLColorWriteMaskBlue) ? (CW_BLUE) : 0;
+	Result |= (WriteMask & MTLColorWriteMaskAlpha) ? (CW_ALPHA) : 0;
+	
+	return (EColorWriteMask)Result;
+}
+
 static bool operator==(const FSamplerStateInitializerRHI& Left, const FSamplerStateInitializerRHI& Right)
 {
 	bool bSame = Left.Filter == Right.Filter
@@ -328,11 +368,18 @@ FMetalRasterizerState::~FMetalRasterizerState()
 	
 }
 
+bool FMetalRasterizerState::GetInitializer(FRasterizerStateInitializerRHI& Init)
+{
+	Init = State;
+	return true;
+}
 
 static FMetalStateObjectCache<FDepthStencilStateInitializerRHI, mtlpp::DepthStencilState> DepthStencilStates;
 
-FMetalDepthStencilState::FMetalDepthStencilState(mtlpp::Device Device, const FDepthStencilStateInitializerRHI& Initializer)
+FMetalDepthStencilState::FMetalDepthStencilState(mtlpp::Device Device, const FDepthStencilStateInitializerRHI& InInitializer)
 {
+	Initializer = InInitializer;
+
 	State = DepthStencilStates.Find(Initializer);
 	if (!State.GetPtr())
 	{
@@ -394,6 +441,12 @@ FMetalDepthStencilState::~FMetalDepthStencilState()
 {
 }
 
+bool FMetalDepthStencilState::GetInitializer(FDepthStencilStateInitializerRHI& Init)
+{
+	Init = Initializer;
+	return true;
+}
+
 
 
 // statics
@@ -404,6 +457,7 @@ FCriticalSection FMetalBlendState::Mutex;
 
 FMetalBlendState::FMetalBlendState(const FBlendStateInitializerRHI& Initializer)
 {
+	bUseIndependentRenderTargetBlendStates = Initializer.bUseIndependentRenderTargetBlendStates;
 	for(uint32 RenderTargetIndex = 0;RenderTargetIndex < MaxSimultaneousRenderTargets; ++RenderTargetIndex)
 	{
 		// which initializer to use
@@ -468,6 +522,35 @@ FMetalBlendState::~FMetalBlendState()
 {
 }
 
+bool FMetalBlendState::GetInitializer(FBlendStateInitializerRHI& Initializer)
+{
+	Initializer.bUseIndependentRenderTargetBlendStates = bUseIndependentRenderTargetBlendStates;
+	for(uint32 RenderTargetIndex = 0;RenderTargetIndex < MaxSimultaneousRenderTargets; ++RenderTargetIndex)
+	{
+		// which initializer to use
+		FBlendStateInitializerRHI::FRenderTarget& Init = Initializer.RenderTargets[RenderTargetIndex];
+		MTLRenderPipelineColorAttachmentDescriptor* CurrentState = RenderTargetStates[RenderTargetIndex].BlendState;
+		
+		if (CurrentState)
+		{
+			Init.ColorSrcBlend = TranslateBlendFactor(CurrentState.sourceRGBBlendFactor);
+			Init.ColorDestBlend = TranslateBlendFactor(CurrentState.destinationRGBBlendFactor);
+			Init.ColorBlendOp = TranslateBlendOp(CurrentState.rgbBlendOperation);
+			Init.AlphaSrcBlend = TranslateBlendFactor(CurrentState.sourceAlphaBlendFactor);
+			Init.AlphaDestBlend = TranslateBlendFactor(CurrentState.destinationAlphaBlendFactor);
+			Init.AlphaBlendOp = TranslateBlendOp(CurrentState.alphaBlendOperation);
+			Init.ColorWriteMask = TranslateWriteMask(CurrentState.writeMask);
+		}
+		
+		if (!bUseIndependentRenderTargetBlendStates)
+		{
+			break;
+		}
+	}
+	
+	return true;
+}
+
 
 
 
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.cpp
index 266953f45223..2053210ce318 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.cpp
@@ -2062,3 +2062,23 @@ FTexture2DRHIRef FMetalStateCache::CreateFallbackDepthStencilSurface(uint32 Widt
 	return FallbackDepthStencilSurface;
 }
 
+void FMetalStateCache::DiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
+{
+	if (Depth)
+	{
+		DepthStore = mtlpp::StoreAction::DontCare;
+	}
+
+	if (Stencil)
+	{
+		StencilStore = mtlpp::StoreAction::DontCare;
+	}
+
+	for (uint32 Index = 0; Index < MaxSimultaneousRenderTargets; ++Index)
+	{
+		if ((ColorBitMask & (1u << Index)) != 0)
+		{
+			ColorStore[Index] = mtlpp::StoreAction::DontCare;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.h b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.h
index 9e6d1986a6d4..5ea5660abe81 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalStateCache.h
@@ -158,6 +158,7 @@ public:
     void SetComputePipelineState(FMetalCommandEncoder& CommandEncoder);
 	void FlushVisibilityResults(FMetalCommandEncoder& CommandEncoder);
 
+	void DiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask);
 private:
 	void ConditionalUpdateBackBuffer(FMetalSurface& Surface);
 	
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalTexture.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalTexture.cpp
index b05348129ac5..9fc2f8235073 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalTexture.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalTexture.cpp
@@ -9,6 +9,7 @@
 #include "MetalCommandBuffer.h"
 #include "RenderUtils.h"
 #include "Containers/ResourceArray.h"
+#include "Misc/ScopeRWLock.h"
 
 volatile int64 FMetalSurface::ActiveUploads = 0;
 
@@ -104,6 +105,12 @@ static mtlpp::TextureUsage ConvertFlagsToUsage(uint32 Flags)
 		Usage |= mtlpp::TextureUsage::PixelFormatView;
 	}
 	
+	// offline textures are normal shader read textures
+	if (Flags & TexCreate_OfflineProcessed)
+	{
+		Usage |= mtlpp::TextureUsage::ShaderRead;
+	}
+
 	//if the high level is doing manual resolves then the textures specifically markes as resolve targets
 	//are likely to be used in a manual shader resolve by the high level and must be bindable as rendertargets.
 	const bool bSeparateResolveTargets = FMetalCommandQueue::SupportsSeparateMSAAAndResolveTarget();
@@ -683,13 +690,20 @@ static TMap<uint64, uint8>& GetMetalPixelFormatKeyMap()
 
 uint8 GetMetalPixelFormatKey(mtlpp::PixelFormat Format)
 {
+	static FRWLock Mutex;
 	static uint8 NextKey = 1; // 0 is reserved for mtlpp::PixelFormat::Invalid
+	FRWScopeLock Lock(Mutex, SLT_ReadOnly);
 	uint8* Key = GetMetalPixelFormatKeyMap().Find((uint64)Format);
 	if (Key == NULL)
 	{
-		Key = &GetMetalPixelFormatKeyMap().Add((uint64)Format, NextKey++);
-		// only giving 5 bits to the key
-		checkf(NextKey < 32, TEXT("Too many unique pixel formats to fit into the PipelineStateHash"));
+		Lock.ReleaseReadOnlyLockAndAcquireWriteLock_USE_WITH_CAUTION();
+		Key = GetMetalPixelFormatKeyMap().Find((uint64)Format);
+		if (Key == NULL)
+		{
+			Key = &GetMetalPixelFormatKeyMap().Add((uint64)Format, NextKey++);
+			// only giving 5 bits to the key
+			checkf(NextKey < 32, TEXT("Too many unique pixel formats to fit into the PipelineStateHash"));
+		}
 	}
 	return *Key;
 }
@@ -1792,8 +1806,8 @@ struct FMetalRHICommandAsyncReallocateTexture2D final : public FRHICommand<FMeta
 		{
 			const uint32 UnalignedMipSizeX = FMath::Max<uint32>(1, NewSizeX >> (MipIndex + DestMipOffset));
 			const uint32 UnalignedMipSizeY = FMath::Max<uint32>(1, NewSizeY >> (MipIndex + DestMipOffset));
-			const uint32 MipSizeX = (bPixelFormatASTC) ? AlignArbitrary(UnalignedMipSizeX, BlockSizeX) : UnalignedMipSizeX;
-			const uint32 MipSizeY = (bPixelFormatASTC) ? AlignArbitrary(UnalignedMipSizeY, BlockSizeY) : UnalignedMipSizeY;
+			const uint32 MipSizeX = FMath::Max<uint32>(1, NewSizeX >> (MipIndex + DestMipOffset));
+			const uint32 MipSizeY = FMath::Max<uint32>(1, NewSizeY >> (MipIndex + DestMipOffset));
 			
 			bAsync &= Context.AsyncCopyFromTextureToTexture(OldTexture->Surface.Texture, SliceIndex, MipIndex + SourceMipOffset, Origin, mtlpp::Size(MipSizeX, MipSizeY, 1), NewTexture->Surface.Texture, SliceIndex, MipIndex + DestMipOffset, Origin);
 		}
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexBuffer.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexBuffer.cpp
index fc7681b6a68c..c1d9a89fa6e7 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexBuffer.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexBuffer.cpp
@@ -200,6 +200,8 @@ void FMetalRHIBuffer::Alloc(uint32 InSize, EResourceLockMode LockMode)
 		mtlpp::StorageMode Mode = (bUsePrivateMem ? mtlpp::StorageMode::Private : BUFFER_STORAGE_MODE);
 		FMetalPooledBufferArgs Args(GetMetalDeviceContext().GetDevice(), InSize, Mode);
 		Buffer = GetMetalDeviceContext().CreatePooledBuffer(Args);
+		check(Buffer && Buffer.GetPtr());
+
         METAL_INC_DWORD_STAT_BY(Type, MemAlloc, InSize);
         
 		if (FMetalCommandQueue::SupportsFeature(EMetalFeaturesLinearTextures) && (Usage & (BUF_UnorderedAccess|BUF_ShaderResource)))
@@ -219,6 +221,7 @@ void FMetalRHIBuffer::Alloc(uint32 InSize, EResourceLockMode LockMode)
 	{
         FMetalPooledBufferArgs ArgsCPU(GetMetalDeviceContext().GetDevice(), InSize, mtlpp::StorageMode::Shared);
 		CPUBuffer = GetMetalDeviceContext().CreatePooledBuffer(ArgsCPU);
+		check(CPUBuffer && CPUBuffer.GetPtr());
         METAL_INC_DWORD_STAT_BY(Type, MemAlloc, InSize);
 	}
 }
@@ -309,6 +312,7 @@ void* FMetalRHIBuffer::Lock(EResourceLockMode LockMode, uint32 Offset, uint32 In
 	
 	if (Data)
 	{
+		check(Data->Data);
 		return ((uint8*)Data->Data) + Offset;
 	}
 	
@@ -375,7 +379,10 @@ void* FMetalRHIBuffer::Lock(EResourceLockMode LockMode, uint32 Offset, uint32 In
 		GetMetalDeviceContext().SubmitCommandBufferAndWait();
 	}
 #endif
-	
+
+	check(theBufferToUse && theBufferToUse.GetPtr());
+	check(theBufferToUse.GetContents());
+
 	return ((uint8*)MTLPP_VALIDATE(mtlpp::Buffer, theBufferToUse, SafeGetRuntimeDebuggingLevel() >= EMetalDebugLevelValidation, GetContents())) + Offset;
 }
 
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexDeclaration.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexDeclaration.cpp
index a924ca127a6f..bb3edc3b88a3 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexDeclaration.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalVertexDeclaration.cpp
@@ -191,7 +191,7 @@ void FMetalVertexDeclaration::GenerateLayout(const FVertexDeclarationElementList
 	ns::Array<mtlpp::VertexBufferLayoutDescriptor> Layouts = NewLayout.GetLayouts();
 	ns::Array<mtlpp::VertexAttributeDescriptor> Attributes = NewLayout.GetAttributes();
 
-	BaseHash = FCrc::MemCrc_DEPRECATED(InElements.GetData(),InElements.Num()*sizeof(FVertexElement));
+	BaseHash = 0;
 	uint32 StrideHash = BaseHash;
 
 	TMap<uint32, uint32> BufferStrides;
@@ -202,7 +202,13 @@ void FMetalVertexDeclaration::GenerateLayout(const FVertexDeclarationElementList
 		checkf(Element.Stride == 0 || Element.Offset + TranslateElementTypeToSize(Element.Type) <= Element.Stride, 
 			TEXT("Stream component is bigger than stride: Offset: %d, Size: %d [Type %d], Stride: %d"), Element.Offset, TranslateElementTypeToSize(Element.Type), (uint32)Element.Type, Element.Stride);
 
-		StrideHash = FCrc::MemCrc32(&Element.Stride, sizeof(Element.Stride), StrideHash);
+		BaseHash = FCrc::MemCrc32(&Element.StreamIndex, sizeof(Element.StreamIndex), BaseHash);
+		BaseHash = FCrc::MemCrc32(&Element.Offset, sizeof(Element.Offset), BaseHash);
+		BaseHash = FCrc::MemCrc32(&Element.Type, sizeof(Element.Type), BaseHash);
+		BaseHash = FCrc::MemCrc32(&Element.AttributeIndex, sizeof(Element.AttributeIndex), BaseHash);
+		
+		uint32 Stride = Element.Stride;
+		StrideHash = FCrc::MemCrc32(&Stride, sizeof(Stride), StrideHash);
 
 		// Vertex & Constant buffers are set up in the same space, so add VB's from the top
 		uint32 ShaderBufferIndex = UNREAL_TO_METAL_BUFFER_INDEX(Element.StreamIndex);
@@ -214,9 +220,13 @@ void FMetalVertexDeclaration::GenerateLayout(const FVertexDeclarationElementList
 			// handle 0 stride buffers
 			mtlpp::VertexStepFunction Function = (Element.Stride == 0 ? mtlpp::VertexStepFunction::Constant : (Element.bUseInstanceIndex ? mtlpp::VertexStepFunction::PerInstance : mtlpp::VertexStepFunction::PerVertex));
 			uint32 StepRate = (Element.Stride == 0 ? 0 : 1);
-			// even with MTLVertexStepFunctionConstant, it needs a non-zero stride (not sure why)
-			uint32 Stride = (Element.Stride == 0 ? TranslateElementTypeToSize(Element.Type) : Element.Stride);
 
+			// even with MTLVertexStepFunctionConstant, it needs a non-zero stride (not sure why)
+			if (Element.Stride == 0)
+			{
+				Stride = TranslateElementTypeToSize(Element.Type);
+			}
+						
 			// look for any unset strides coming from UE4 (this can be removed when all are fixed)
 			if (Element.Stride == 0xFFFF)
 			{
@@ -246,5 +256,5 @@ void FMetalVertexDeclaration::GenerateLayout(const FVertexDeclarationElementList
 		Attrib.SetBufferIndex(ShaderBufferIndex);
 	}
 	
-	Layout = FMetalHashedVertexDescriptor(NewLayout, StrideHash);
+	Layout = FMetalHashedVertexDescriptor(NewLayout, HashCombine(BaseHash, StrideHash));
 }
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalViewport.cpp b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalViewport.cpp
index 15dc7907e00b..b332d49ce000 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalViewport.cpp
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Private/MetalViewport.cpp
@@ -21,6 +21,15 @@ extern int32 GMetalSeparatePresentThread;
 extern int32 GMetalNonBlockingPresent;
 extern float GMetalPresentFramePacing;
 
+#if PLATFORM_IOS
+int32 GEnablePresentPacing = 0;
+static FAutoConsoleVariableRef CVarMetalEnablePresentPacing(
+	   TEXT("ios.PresentPacing"),
+	   GEnablePresentPacing,
+	   TEXT(""),
+		ECVF_Default);
+#endif
+
 #if PLATFORM_MAC
 
 // Quick way to disable availability warnings is to duplicate the definitions into a new type - gotta love ObjC dynamic-dispatch!
@@ -376,6 +385,10 @@ void FMetalViewport::Present(FMetalCommandQueue& CommandQueue, bool bLockToVsync
 	
 	if (!Block)
 	{
+#if !PLATFORM_MAC
+		uint32 FramePace = FPlatformRHIFramePacer::GetFramePace();
+		float MinPresentDuration = FramePace ? (1.0f / (float)FramePace) : 0.0f;
+#endif
 		Block = Block_copy(^(uint32 InDisplayID, double OutputSeconds, double OutputDuration)
 		{
 			bool bIsInLiveResize = false;
@@ -447,8 +460,19 @@ void FMetalViewport::Present(FMetalCommandQueue& CommandQueue, bool bLockToVsync
 #endif
 						};
 						
-                       	mtlpp::CommandBufferHandler H = [LocalDrawable](mtlpp::CommandBuffer const&) {
-							[LocalDrawable present];
+#if !PLATFORM_IOS
+						mtlpp::CommandBufferHandler H = [LocalDrawable](mtlpp::CommandBuffer const&) {
+#else
+						mtlpp::CommandBufferHandler H = [LocalDrawable, MinPresentDuration, FramePace](mtlpp::CommandBuffer const&) {
+							if (MinPresentDuration && GEnablePresentPacing)
+							{
+								[LocalDrawable presentAfterMinimumDuration:1.0f/(float)FramePace];
+							}
+							else
+#endif
+							{
+								[LocalDrawable present];
+							};
 						};
 						
 						CurrentCommandBuffer.AddCompletedHandler(C);
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHI.h b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHI.h
index 500dde080343..879aa9b053d9 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHI.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHI.h
@@ -39,7 +39,7 @@ public:
 	virtual void Shutdown() {}
 	virtual const TCHAR* GetName() override { return TEXT("Metal"); }
 
-	virtual FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString FolderPath) final override;
+	virtual FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString const& FilePath, FString const& Name) final override;
 	virtual FSamplerStateRHIRef RHICreateSamplerState(const FSamplerStateInitializerRHI& Initializer) final override;
 	virtual FRasterizerStateRHIRef RHICreateRasterizerState(const FRasterizerStateInitializerRHI& Initializer) final override;
 	virtual FDepthStencilStateRHIRef RHICreateDepthStencilState(const FDepthStencilStateInitializerRHI& Initializer) final override;
@@ -132,7 +132,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef Viewport, uint32 SizeX, uint32 SizeY, bool bIsFullscreen, EPixelFormat PreferredPixelFormat) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets,const FVertexBufferRHIParamRef* VertexBuffers,const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override;
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual bool RHIGetAvailableResolutions(FScreenResolutionArray& Resolutions, bool bIgnoreRefreshRate) final override;
 	virtual void RHIGetSupportedResolution(uint32& Width, uint32& Height) final override;
@@ -208,8 +207,8 @@ public:
 	virtual FHullShaderRHIRef CreateHullShader_RenderThread(class FRHICommandListImmediate& RHICmdList, FRHIShaderLibraryParamRef Library, FSHAHash Hash) final override;
 	virtual FDomainShaderRHIRef CreateDomainShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override;
 	virtual FDomainShaderRHIRef CreateDomainShader_RenderThread(class FRHICommandListImmediate& RHICmdList, FRHIShaderLibraryParamRef Library, FSHAHash Hash) final override;
-	virtual FRHIShaderLibraryRef RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath) final override;
-	
+	virtual FRHIShaderLibraryRef RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath, FString Name) final override;
+
 	virtual void RHICalibrateTimers() final override;
 private:
 	FTextureMemoryStats MemoryStats;
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHIContext.h b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHIContext.h
index ecd26e749d89..f8bc8fa6b305 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHIContext.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalRHIContext.h
@@ -64,6 +64,8 @@ public:
 	void RHIEndOcclusionQueryBatch();
 	
 	virtual void RHISubmitCommandsHint() override;
+
+	virtual void RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask) final override;
 	
 	// This method is queued with an RHIThread, otherwise it will flush after it is queued; without an RHI thread there is no benefit to queuing this frame advance commands
 	virtual void RHIBeginDrawingViewport(FViewportRHIParamRef Viewport, FTextureRHIParamRef RenderTargetRHI) override;
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalResources.h b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalResources.h
index 04b8ec54f27c..6cfe1295ed08 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalResources.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalResources.h
@@ -55,6 +55,12 @@ public:
 	
 	/** Hash without considering strides which may be overriden */
 	uint32 BaseHash;
+	
+	virtual bool GetInitializer(FVertexDeclarationElementList& Init)
+	{
+		Init = Elements;
+		return true;
+	}
 
 protected:
 	void GenerateLayout(const FVertexDeclarationElementList& Elements);
@@ -961,7 +967,7 @@ private:
 class FMetalShaderLibrary final : public FRHIShaderLibrary
 {	
 public:
-	FMetalShaderLibrary(EShaderPlatform Platform, mtlpp::Library Library, FMetalShaderMap const& Map);
+	FMetalShaderLibrary(EShaderPlatform Platform, FString const& Name, mtlpp::Library Library, FMetalShaderMap const& Map);
 	virtual ~FMetalShaderLibrary();
 	
 	virtual bool IsNativeLibrary() const override final {return true;}
@@ -992,6 +998,9 @@ public:
 		return new FMetalShaderLibraryIterator(this);
 	}
 	
+	virtual bool ContainsEntry(const FSHAHash& Hash) final override;
+	virtual bool RequestEntry(const FSHAHash& Hash, FArchive* Ar) final override;
+	
 	virtual uint32 GetShaderCount(void) const final override { return Map.HashMap.Num(); }
 	
 private:
diff --git a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalState.h b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalState.h
index d9502181c27d..5fa86c3f92ab 100644
--- a/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalState.h
+++ b/Engine/Source/Runtime/Apple/MetalRHI/Public/MetalState.h
@@ -35,6 +35,8 @@ public:
 	FMetalRasterizerState(const FRasterizerStateInitializerRHI& Initializer);
 	~FMetalRasterizerState();
 	
+	virtual bool GetInitializer(FRasterizerStateInitializerRHI& Init) override final;
+	
 	FRasterizerStateInitializerRHI State;
 };
 
@@ -48,10 +50,12 @@ public:
 	FMetalDepthStencilState(mtlpp::Device Device, const FDepthStencilStateInitializerRHI& Initializer);
 	~FMetalDepthStencilState();
 	
+	virtual bool GetInitializer(FDepthStencilStateInitializerRHI& Init) override final;
+	
+	FDepthStencilStateInitializerRHI Initializer;
 	mtlpp::DepthStencilState State;
 	bool bIsDepthWriteEnabled;
 	bool bIsStencilWriteEnabled;
-	
 };
 
 class FMetalBlendState : public FRHIBlendState
@@ -64,6 +68,7 @@ public:
 	FMetalBlendState(const FBlendStateInitializerRHI& Initializer);
 	~FMetalBlendState();
 	
+	virtual bool GetInitializer(FBlendStateInitializerRHI& Init) override final;
 
 	struct FBlendPerMRT
 	{
@@ -71,6 +76,7 @@ public:
 		uint8 BlendStateKey;
 	};
 	FBlendPerMRT RenderTargetStates[MaxSimultaneousRenderTargets];
+	bool bUseIndependentRenderTargetBlendStates;
 
 private:
 	// this tracks blend settings (in a bit flag) into a unique key that uses few bits, for PipelineState MRT setup
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplication.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplication.cpp
index 3e0d9a57d7e0..5dfe3a33ae2e 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplication.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplication.cpp
@@ -3,6 +3,7 @@
 #include "Android/AndroidApplication.h"
 #include "Android/AndroidInputInterface.h"
 #include "Android/AndroidWindow.h"
+#include "Android/AndroidCursor.h"
 #include "IInputDeviceModule.h"
 #include "HAL/OutputDevices.h"
 #include "Misc/AssertionMacros.h"
@@ -19,15 +20,15 @@ FAndroidApplication* FAndroidApplication::CreateAndroidApplication()
 }
 
 FAndroidApplication::FAndroidApplication()
-	: GenericApplication(NULL)
-	, InputInterface(FAndroidInputInterface::Create(MessageHandler))
+	: GenericApplication(MakeShareable(new FAndroidCursor()))
+	, InputInterface( FAndroidInputInterface::Create( MessageHandler, Cursor ) )
 	, bHasLoadedInputPlugins(false)
 {
 	_application = this;
 }
 
 FAndroidApplication::FAndroidApplication(TSharedPtr<class FAndroidInputInterface> InInputInterface)
-	: GenericApplication(NULL)
+	: GenericApplication(InInputInterface.IsValid() ? InInputInterface->GetCursor() : MakeShareable(new FAndroidCursor()))
 	, InputInterface(InInputInterface)
 	, bHasLoadedInputPlugins(false)
 {
@@ -95,6 +96,12 @@ IInputInterface* FAndroidApplication::GetInputInterface()
 	return InputInterface.Get();
 }
 
+void FAndroidApplication::Tick(const float TimeDelta)
+{
+	//generate event that will end up calling 'QueryCursor' in slate to support proper reporting of the cursor's type.
+	MessageHandler->OnCursorSet();
+}
+
 bool FAndroidApplication::IsGamepadAttached() const
 {
 	FAndroidInputInterface* AndroidInputInterface = (FAndroidInputInterface*)InputInterface.Get();
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplicationMisc.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplicationMisc.cpp
index 25199f183b7d..fc51c663aaa0 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplicationMisc.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidApplicationMisc.cpp
@@ -184,8 +184,8 @@ EScreenPhysicalAccuracy FAndroidApplicationMisc::ComputePhysicalScreenDensity(in
 	DPIStrings.ParseIntoArray(DPIValues, TEXT(","));
 
 	float xdpi, ydpi;
-	LexicalConversion::FromString(xdpi, *DPIValues[0]);
-	LexicalConversion::FromString(ydpi, *DPIValues[1]);
+	LexFromString(xdpi, *DPIValues[0]);
+	LexFromString(ydpi, *DPIValues[1]);
 
 	OutScreenDensity = ( xdpi + ydpi ) / 2.0f;
 
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidCursor.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidCursor.cpp
new file mode 100644
index 000000000000..543603c47245
--- /dev/null
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidCursor.cpp
@@ -0,0 +1,95 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Android/AndroidCursor.h"
+#include "Android/AndroidApplication.h"
+
+FAndroidCursor::FAndroidCursor() 
+	: CurrentType(EMouseCursor::None)
+	, CurrentPosition(FVector2D::ZeroVector)
+	, CursorClipRect()
+	, bShow(false)
+{	
+}
+
+void FAndroidCursor::SetPosition( const int32 X, const int32 Y )
+{
+	FVector2D NewPosition(X, Y);
+	UpdateCursorClipping(NewPosition);
+	
+	CurrentPosition = NewPosition;
+}
+
+void FAndroidCursor::SetType( const EMouseCursor::Type InNewCursor )
+{
+	CurrentType = InNewCursor;
+}
+
+void FAndroidCursor::GetSize(int32& Width, int32& Height) const
+{
+	Width = 32;
+	Height = 32;
+}
+
+void FAndroidCursor::Show(bool bInShow)
+{
+	bShow = bInShow;
+}
+
+void FAndroidCursor::Lock(const RECT* const Bounds)
+{
+	if (Bounds == NULL)
+	{
+		FDisplayMetrics DisplayMetrics;
+		FDisplayMetrics::GetDisplayMetrics(DisplayMetrics);
+
+		// The Android cursor should never leave the screen
+		CursorClipRect.Min = FIntPoint::ZeroValue;
+		CursorClipRect.Max.X = DisplayMetrics.PrimaryDisplayWidth - 1;
+		CursorClipRect.Max.Y = DisplayMetrics.PrimaryDisplayHeight - 1;
+	}
+	else
+	{
+		CursorClipRect.Min.X = FMath::TruncToInt(Bounds->left);
+		CursorClipRect.Min.Y = FMath::TruncToInt(Bounds->top);
+		CursorClipRect.Max.X = FMath::TruncToInt(Bounds->right) - 1;
+		CursorClipRect.Max.Y = FMath::TruncToInt(Bounds->bottom) - 1;
+	}
+
+	FVector2D Position = GetPosition();
+	if (UpdateCursorClipping(Position))
+	{
+		SetPosition(Position.X, Position.Y);
+	}
+}
+
+bool FAndroidCursor::UpdateCursorClipping(FVector2D& CursorPosition)
+{
+	bool bAdjusted = false;
+
+	if (CursorClipRect.Area() > 0)
+	{
+		if (CursorPosition.X < CursorClipRect.Min.X)
+		{
+			CursorPosition.X = CursorClipRect.Min.X;
+			bAdjusted = true;
+		}
+		else if (CursorPosition.X > CursorClipRect.Max.X)
+		{
+			CursorPosition.X = CursorClipRect.Max.X;
+			bAdjusted = true;
+		}
+
+		if (CursorPosition.Y < CursorClipRect.Min.Y)
+		{
+			CursorPosition.Y = CursorClipRect.Min.Y;
+			bAdjusted = true;
+		}
+		else if (CursorPosition.Y > CursorClipRect.Max.Y)
+		{
+			CursorPosition.Y = CursorClipRect.Max.Y;
+			bAdjusted = true;
+		}
+	}
+
+	return bAdjusted;
+}
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidInputInterface.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidInputInterface.cpp
index 93ca8319fa21..1c37ddd76817 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidInputInterface.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidInputInterface.cpp
@@ -3,6 +3,7 @@
 #include "Android/AndroidInputInterface.h"
 #if USE_ANDROID_INPUT
 //#include "AndroidInputDeviceMappings.h"
+#include "Misc/ConfigCacheIni.h"
 #include "IInputDevice.h"
 #include "GenericPlatform/GenericApplicationMessageHandler.h"
 #include "HAL/ThreadingBase.h"
@@ -19,6 +20,8 @@ FAndroidGamepadDeviceMapping FAndroidInputInterface::DeviceMapping[MAX_NUM_CONTR
 bool FAndroidInputInterface::VibeIsOn;
 FForceFeedbackValues FAndroidInputInterface::VibeValues;
 
+bool FAndroidInputInterface::bAllowControllers = true;
+
 FAndroidControllerData FAndroidInputInterface::OldControllerData[MAX_NUM_CONTROLLERS];
 FAndroidControllerData FAndroidInputInterface::NewControllerData[MAX_NUM_CONTROLLERS];
 
@@ -33,6 +36,9 @@ int32 FAndroidInputInterface::DeferredMessageQueueDroppedCount   = 0;
 TArray<FAndroidInputInterface::MotionData> FAndroidInputInterface::MotionDataStack
 	= TArray<FAndroidInputInterface::MotionData>();
 
+TArray<FAndroidInputInterface::MouseData> FAndroidInputInterface::MouseDataStack
+	= TArray<FAndroidInputInterface::MouseData>();
+
 int32 GAndroidOldXBoxWirelessFirmware = 0;
 static FAutoConsoleVariableRef CVarAndroidOldXBoxWirelessFirmware(
 	TEXT("Android.OldXBoxWirelessFirmware"),
@@ -40,9 +46,9 @@ static FAutoConsoleVariableRef CVarAndroidOldXBoxWirelessFirmware(
 	TEXT("Determines how XBox Wireless controller mapping is handled. 0 assumes new firmware, 1 will use old firmware mapping (Default: 0)"),
 	ECVF_Default);
 
-TSharedRef< FAndroidInputInterface > FAndroidInputInterface::Create(  const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler )
+TSharedRef< FAndroidInputInterface > FAndroidInputInterface::Create(const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler, const TSharedPtr< ICursor >& InCursor)
 {
-	return MakeShareable( new FAndroidInputInterface( InMessageHandler ) );
+	return MakeShareable(new FAndroidInputInterface(InMessageHandler, InCursor));
 }
 
 FAndroidInputInterface::~FAndroidInputInterface()
@@ -55,9 +61,12 @@ namespace AndroidKeyNames
 	const FGamepadKeyNames::Type Android_Menu("Android_Menu");
 }
 
-FAndroidInputInterface::FAndroidInputInterface( const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler )
+FAndroidInputInterface::FAndroidInputInterface(const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler, const TSharedPtr< ICursor >& InCursor)
 	: MessageHandler( InMessageHandler )
+	, Cursor(InCursor)
 {
+	GConfig->GetBool(TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings"), TEXT("bAllowControllers"), bAllowControllers, GEngineIni);
+
 	ButtonMapping[0] = FGamepadKeyNames::FaceButtonBottom;
 	ButtonMapping[1] = FGamepadKeyNames::FaceButtonRight;
 	ButtonMapping[2] = FGamepadKeyNames::FaceButtonLeft;
@@ -716,140 +725,148 @@ static uint32 CharMapShift[] =
 	0
 };
 
+extern void AndroidThunkCpp_PushSensorEvents();
+
 void FAndroidInputInterface::SendControllerEvents()
 {
+	// trigger any motion updates before the lock so they can be queued
+	AndroidThunkCpp_PushSensorEvents();
+
 	FScopeLock Lock(&TouchInputCriticalSection);
 
-	// Check for gamepads needing validation
-	for (int32 DeviceIndex = 0; DeviceIndex < MAX_NUM_CONTROLLERS; DeviceIndex++)
+	// Check for gamepads needing validation if enabled
+	if (bAllowControllers)
 	{
-		FAndroidGamepadDeviceMapping& CurrentDevice = DeviceMapping[DeviceIndex];
-
-		if (CurrentDevice.DeviceState == MappingState::ToValidate)
+		for (int32 DeviceIndex = 0; DeviceIndex < MAX_NUM_CONTROLLERS; DeviceIndex++)
 		{
-			// Query for the device type from Java side
-			if (AndroidThunkCpp_GetInputDeviceInfo(CurrentDevice.DeviceInfo.DeviceId, CurrentDevice.DeviceInfo))
+			FAndroidGamepadDeviceMapping& CurrentDevice = DeviceMapping[DeviceIndex];
+
+			if (CurrentDevice.DeviceState == MappingState::ToValidate)
 			{
-				// It is possible this is actually a previously assigned controller if it disconnected and reconnected (device ID can change)
-				int32 FoundMatch = -1;
-				for (int32 DeviceScan = 0; DeviceScan < MAX_NUM_CONTROLLERS; DeviceScan++)
+				// Query for the device type from Java side
+				if (AndroidThunkCpp_GetInputDeviceInfo(CurrentDevice.DeviceInfo.DeviceId, CurrentDevice.DeviceInfo))
 				{
-					if (DeviceMapping[DeviceScan].DeviceState != MappingState::Valid)
-						continue;
-
-					if (DeviceMapping[DeviceScan].DeviceInfo.Descriptor.Equals(CurrentDevice.DeviceInfo.Descriptor))
+					// It is possible this is actually a previously assigned controller if it disconnected and reconnected (device ID can change)
+					int32 FoundMatch = -1;
+					for (int32 DeviceScan = 0; DeviceScan < MAX_NUM_CONTROLLERS; DeviceScan++)
 					{
-						FoundMatch = DeviceScan;
-						break;
+						if (DeviceMapping[DeviceScan].DeviceState != MappingState::Valid)
+							continue;
+
+						if (DeviceMapping[DeviceScan].DeviceInfo.Descriptor.Equals(CurrentDevice.DeviceInfo.Descriptor))
+						{
+							FoundMatch = DeviceScan;
+							break;
+						}
 					}
-				}
 
-				// Deal with new controller
-				if (FoundMatch == -1)
-				{
-					CurrentDevice.DeviceState = MappingState::Valid;
-
-					// Generic mappings
-					CurrentDevice.ButtonRemapping = ButtonRemapType::Normal;
-					CurrentDevice.LTAnalogRangeMinimum = 0.0f;
-					CurrentDevice.RTAnalogRangeMinimum = 0.0f;
-					CurrentDevice.bSupportsHat = false;
-					CurrentDevice.bMapL1R1ToTriggers = false;
-					CurrentDevice.bMapZRZToTriggers = false;
-					CurrentDevice.bRightStickZRZ = true;
-					CurrentDevice.bRightStickRXRY = false;
-
-					// Use device name to decide on mapping scheme
-					if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon")))
+					// Deal with new controller
+					if (FoundMatch == -1)
 					{
-						if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon Fire Game Controller")))
+						CurrentDevice.DeviceState = MappingState::Valid;
+
+						// Generic mappings
+						CurrentDevice.ButtonRemapping = ButtonRemapType::Normal;
+						CurrentDevice.LTAnalogRangeMinimum = 0.0f;
+						CurrentDevice.RTAnalogRangeMinimum = 0.0f;
+						CurrentDevice.bSupportsHat = false;
+						CurrentDevice.bMapL1R1ToTriggers = false;
+						CurrentDevice.bMapZRZToTriggers = false;
+						CurrentDevice.bRightStickZRZ = true;
+						CurrentDevice.bRightStickRXRY = false;
+
+						// Use device name to decide on mapping scheme
+						if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon")))
+						{
+							if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon Fire Game Controller")))
+							{
+								CurrentDevice.bSupportsHat = true;
+							}
+							else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon Fire TV Remote")))
+							{
+							}
+							else
+							{
+							}
+						}
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("NVIDIA Corporation NVIDIA Controller")))
 						{
 							CurrentDevice.bSupportsHat = true;
 						}
-						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Amazon Fire TV Remote")))
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Samsung Game Pad EI-GP20")))
 						{
-						}
-						else
-						{
-						}
-					}
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("NVIDIA Corporation NVIDIA Controller")))
-					{
-						CurrentDevice.bSupportsHat = true;
-					}
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Samsung Game Pad EI-GP20")))
-					{
-						CurrentDevice.bSupportsHat = true;
-						CurrentDevice.bMapL1R1ToTriggers = true;
-						CurrentDevice.bRightStickZRZ = false;
-						CurrentDevice.bRightStickRXRY = true;
-					}
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Mad Catz C.T.R.L.R")))
-					{
-						CurrentDevice.bSupportsHat = true;
-					}
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Xbox Wireless Controller")))
-					{
-						CurrentDevice.bSupportsHat = true;
-
-						if (GAndroidOldXBoxWirelessFirmware == 1)
-						{
-							// Apply mappings for older firmware before 3.1.1221.0
-							CurrentDevice.ButtonRemapping = ButtonRemapType::XBoxWireless;
-							CurrentDevice.bMapL1R1ToTriggers = false;
-							CurrentDevice.bMapZRZToTriggers = true;
+							CurrentDevice.bSupportsHat = true;
+							CurrentDevice.bMapL1R1ToTriggers = true;
 							CurrentDevice.bRightStickZRZ = false;
 							CurrentDevice.bRightStickRXRY = true;
 						}
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Mad Catz C.T.R.L.R")))
+						{
+							CurrentDevice.bSupportsHat = true;
+						}
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("Xbox Wireless Controller")))
+						{
+							CurrentDevice.bSupportsHat = true;
+
+							if (GAndroidOldXBoxWirelessFirmware == 1)
+							{
+								// Apply mappings for older firmware before 3.1.1221.0
+								CurrentDevice.ButtonRemapping = ButtonRemapType::XBoxWireless;
+								CurrentDevice.bMapL1R1ToTriggers = false;
+								CurrentDevice.bMapZRZToTriggers = true;
+								CurrentDevice.bRightStickZRZ = false;
+								CurrentDevice.bRightStickRXRY = true;
+							}
+						}
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("SteelSeries Stratus XL")))
+						{
+							CurrentDevice.bSupportsHat = true;
+
+							// For some reason the left trigger is at 0.5 when at rest so we have to adjust for that.
+							CurrentDevice.LTAnalogRangeMinimum = 0.5f;
+						}
+
+						// The PS4 controller name is just "Wireless Controller" which is hardly unique so we can't trust a name
+						// comparison. Instead we check the product and vendor IDs to ensure it's the correct one.
+						else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("PS4 Wireless Controller")))
+						{
+							CurrentDevice.ButtonRemapping = ButtonRemapType::PS4;
+							CurrentDevice.bSupportsHat = true;
+							CurrentDevice.bRightStickZRZ = true;
+						}
+
+						FCoreDelegates::OnControllerConnectionChange.Broadcast(true, -1, DeviceIndex);
+
+						FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Assigned new gamepad controller %d: DeviceId=%d, ControllerId=%d, DeviceName=%s, Descriptor=%s"),
+							DeviceIndex, CurrentDevice.DeviceInfo.DeviceId, CurrentDevice.DeviceInfo.ControllerId, *CurrentDevice.DeviceInfo.Name, *CurrentDevice.DeviceInfo.Descriptor);
+						continue;
 					}
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("SteelSeries Stratus XL")))
+					else
 					{
-						CurrentDevice.bSupportsHat = true;
+						// Already assigned this controller so reconnect it
+						DeviceMapping[FoundMatch].DeviceInfo.DeviceId = CurrentDevice.DeviceInfo.DeviceId;
+						CurrentDevice.DeviceInfo.DeviceId = 0;
+						CurrentDevice.DeviceState = MappingState::Unassigned;
 
-						// For some reason the left trigger is at 0.5 when at rest so we have to adjust for that.
-						CurrentDevice.LTAnalogRangeMinimum = 0.5f;
+						// Transfer state back to this controller
+						NewControllerData[FoundMatch] = NewControllerData[DeviceIndex];
+						NewControllerData[FoundMatch].DeviceId = FoundMatch;
+						OldControllerData[FoundMatch].DeviceId = FoundMatch;
+
+						//@TODO: uncomment this line in the future when disconnects are detected
+						//FCoreDelegates::OnControllerConnectionChange.Broadcast(true, -1, FoundMatch);
+
+						FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Reconnected gamepad controller %d: DeviceId=%d, ControllerId=%d, DeviceName=%s, Descriptor=%s"),
+							FoundMatch, DeviceMapping[FoundMatch].DeviceInfo.DeviceId, CurrentDevice.DeviceInfo.ControllerId, *CurrentDevice.DeviceInfo.Name, *CurrentDevice.DeviceInfo.Descriptor);
 					}
-
-					// The PS4 controller name is just "Wireless Controller" which is hardly unique so we can't trust a name
-					// comparison. Instead we check the product and vendor IDs to ensure it's the correct one.
-					else if (CurrentDevice.DeviceInfo.Name.StartsWith(TEXT("PS4 Wireless Controller")))
-					{
-						CurrentDevice.ButtonRemapping = ButtonRemapType::PS4;
-						CurrentDevice.bSupportsHat = true;
-						CurrentDevice.bRightStickZRZ = true;
-					}
-
-					FCoreDelegates::OnControllerConnectionChange.Broadcast(true, -1, DeviceIndex);
-
-					FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Assigned new gamepad controller %d: DeviceId=%d, ControllerId=%d, DeviceName=%s, Descriptor=%s"),
-						DeviceIndex, CurrentDevice.DeviceInfo.DeviceId, CurrentDevice.DeviceInfo.ControllerId, *CurrentDevice.DeviceInfo.Name, *CurrentDevice.DeviceInfo.Descriptor);
-					continue;
 				}
 				else
 				{
-					// Already assigned this controller so reconnect it
-					DeviceMapping[FoundMatch].DeviceInfo.DeviceId = CurrentDevice.DeviceInfo.DeviceId;
-					CurrentDevice.DeviceInfo.DeviceId = 0;
-					CurrentDevice.DeviceState = MappingState::Unassigned;
-
-					// Transfer state back to this controller
-					NewControllerData[FoundMatch] = NewControllerData[DeviceIndex];
-					NewControllerData[FoundMatch].DeviceId = FoundMatch;
-					OldControllerData[FoundMatch].DeviceId = FoundMatch;
-
-					//@TODO: uncomment this line in the future when disconnects are detected
-					//FCoreDelegates::OnControllerConnectionChange.Broadcast(true, -1, FoundMatch);
-
-					FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Reconnected gamepad controller %d: DeviceId=%d, ControllerId=%d, DeviceName=%s, Descriptor=%s"),
-						FoundMatch, DeviceMapping[FoundMatch].DeviceInfo.DeviceId, CurrentDevice.DeviceInfo.ControllerId, *CurrentDevice.DeviceInfo.Name, *CurrentDevice.DeviceInfo.Descriptor);
+					// Did not find match so clear the assignment
+					FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Failed to assign gamepad controller %d: DeviceId=%d"), DeviceIndex, CurrentDevice.DeviceInfo.DeviceId);
 				}
-			}
-			else
-			{
-				// Did not find match so clear the assignment
-				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Failed to assign gamepad controller %d: DeviceId=%d"), DeviceIndex, CurrentDevice.DeviceInfo.DeviceId);
-			}
 
+			}
 		}
 	}
 
@@ -863,103 +880,106 @@ void FAndroidInputInterface::SendControllerEvents()
 		switch ( Touch.Type )
 		{
 		case TouchBegan:
-			MessageHandler->OnTouchStarted(nullptr, Touch.Position, Touch.Handle, ControllerId);
+			MessageHandler->OnTouchStarted(nullptr, Touch.Position, 1.0f, Touch.Handle, ControllerId);
 			break;
 		case TouchEnded:
 			MessageHandler->OnTouchEnded(Touch.Position, Touch.Handle, ControllerId);
 			break;
 		case TouchMoved:
-			MessageHandler->OnTouchMoved(Touch.Position, Touch.Handle, ControllerId);
+			MessageHandler->OnTouchMoved(Touch.Position, 1.0f, Touch.Handle, ControllerId);
 			break;
 		}
 	}
 
 	// Extract differences in new and old states and send messages
-	for (int32 ControllerIndex = 0; ControllerIndex < MAX_NUM_CONTROLLERS; ControllerIndex++)
+	if (bAllowControllers)
 	{
-		// Skip unassigned or invalid controllers (treat first one as special case)
-		if (ControllerIndex > 0 && (DeviceMapping[ControllerIndex].DeviceState !=  MappingState::Valid))
+		for (int32 ControllerIndex = 0; ControllerIndex < MAX_NUM_CONTROLLERS; ControllerIndex++)
 		{
-			continue;
-		}
-
-		FAndroidControllerData& OldControllerState = OldControllerData[ControllerIndex];
-		FAndroidControllerData& NewControllerState = NewControllerData[ControllerIndex];
-
-		if (NewControllerState.LXAnalog != OldControllerState.LXAnalog)
-		{
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftAnalogX, NewControllerState.DeviceId, NewControllerState.LXAnalog);
-		}
-		if (NewControllerState.LYAnalog != OldControllerState.LYAnalog)
-		{
-			//LOGD("    Sending updated LeftAnalogY value of %f", NewControllerState.LYAnalog);
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftAnalogY, NewControllerState.DeviceId, NewControllerState.LYAnalog);
-		}
-		if (NewControllerState.RXAnalog != OldControllerState.RXAnalog)
-		{
-			//LOGD("    Sending updated RightAnalogX value of %f", NewControllerState.RXAnalog);
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightAnalogX, NewControllerState.DeviceId, NewControllerState.RXAnalog);
-		}
-		if (NewControllerState.RYAnalog != OldControllerState.RYAnalog)
-		{
-			//LOGD("    Sending updated RightAnalogY value of %f", NewControllerState.RYAnalog);
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightAnalogY, NewControllerState.DeviceId, NewControllerState.RYAnalog);
-		}
-		if (NewControllerState.LTAnalog != OldControllerState.LTAnalog)
-		{
-			//LOGD("    Sending updated LeftTriggerAnalog value of %f", NewControllerState.LTAnalog);
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftTriggerAnalog, NewControllerState.DeviceId, NewControllerState.LTAnalog);
-
-			// Handle the trigger theshold "virtual" button state
-			//check(ButtonMapping[10] == FGamepadKeyNames::LeftTriggerThreshold);
-			NewControllerState.ButtonStates[10] = NewControllerState.LTAnalog >= 0.1f;
-		}
-		if (NewControllerState.RTAnalog != OldControllerState.RTAnalog)
-		{
-			//LOGD("    Sending updated RightTriggerAnalog value of %f", NewControllerState.RTAnalog);
-			MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightTriggerAnalog, NewControllerState.DeviceId, NewControllerState.RTAnalog);
-
-			// Handle the trigger theshold "virtual" button state
-			//check(ButtonMapping[11] == FGamepadKeyNames::RightTriggerThreshold);
-			NewControllerState.ButtonStates[11] = NewControllerState.RTAnalog >= 0.1f;
-		}
-
-		const double CurrentTime = FPlatformTime::Seconds();
-
-		// For each button check against the previous state and send the correct message if any
-		for (int32 ButtonIndex = 0; ButtonIndex < MAX_NUM_CONTROLLER_BUTTONS; ButtonIndex++)
-		{
-			if (NewControllerState.ButtonStates[ButtonIndex] != OldControllerState.ButtonStates[ButtonIndex])
+			// Skip unassigned or invalid controllers (treat first one as special case)
+			if (ControllerIndex > 0 && (DeviceMapping[ControllerIndex].DeviceState !=  MappingState::Valid))
 			{
-				if (NewControllerState.ButtonStates[ButtonIndex])
-				{
-					//LOGD("    Sending joystick button down %d (first)", ButtonMapping[ButtonIndex]);
-					MessageHandler->OnControllerButtonPressed(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, false);
-				}
-				else
-				{
-					//LOGD("    Sending joystick button up %d", ButtonMapping[ButtonIndex]);
-					MessageHandler->OnControllerButtonReleased(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, false);
-				}
+				continue;
+			}
 
-				if (NewControllerState.ButtonStates[ButtonIndex])
+			FAndroidControllerData& OldControllerState = OldControllerData[ControllerIndex];
+			FAndroidControllerData& NewControllerState = NewControllerData[ControllerIndex];
+
+			if (NewControllerState.LXAnalog != OldControllerState.LXAnalog)
+			{
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftAnalogX, NewControllerState.DeviceId, NewControllerState.LXAnalog);
+			}
+			if (NewControllerState.LYAnalog != OldControllerState.LYAnalog)
+			{
+				//LOGD("    Sending updated LeftAnalogY value of %f", NewControllerState.LYAnalog);
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftAnalogY, NewControllerState.DeviceId, NewControllerState.LYAnalog);
+			}
+			if (NewControllerState.RXAnalog != OldControllerState.RXAnalog)
+			{
+				//LOGD("    Sending updated RightAnalogX value of %f", NewControllerState.RXAnalog);
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightAnalogX, NewControllerState.DeviceId, NewControllerState.RXAnalog);
+			}
+			if (NewControllerState.RYAnalog != OldControllerState.RYAnalog)
+			{
+				//LOGD("    Sending updated RightAnalogY value of %f", NewControllerState.RYAnalog);
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightAnalogY, NewControllerState.DeviceId, NewControllerState.RYAnalog);
+			}
+			if (NewControllerState.LTAnalog != OldControllerState.LTAnalog)
+			{
+				//LOGD("    Sending updated LeftTriggerAnalog value of %f", NewControllerState.LTAnalog);
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::LeftTriggerAnalog, NewControllerState.DeviceId, NewControllerState.LTAnalog);
+
+				// Handle the trigger theshold "virtual" button state
+				//check(ButtonMapping[10] == FGamepadKeyNames::LeftTriggerThreshold);
+				NewControllerState.ButtonStates[10] = NewControllerState.LTAnalog >= 0.1f;
+			}
+			if (NewControllerState.RTAnalog != OldControllerState.RTAnalog)
+			{
+				//LOGD("    Sending updated RightTriggerAnalog value of %f", NewControllerState.RTAnalog);
+				MessageHandler->OnControllerAnalog(FGamepadKeyNames::RightTriggerAnalog, NewControllerState.DeviceId, NewControllerState.RTAnalog);
+
+				// Handle the trigger theshold "virtual" button state
+				//check(ButtonMapping[11] == FGamepadKeyNames::RightTriggerThreshold);
+				NewControllerState.ButtonStates[11] = NewControllerState.RTAnalog >= 0.1f;
+			}
+
+			const double CurrentTime = FPlatformTime::Seconds();
+
+			// For each button check against the previous state and send the correct message if any
+			for (int32 ButtonIndex = 0; ButtonIndex < MAX_NUM_CONTROLLER_BUTTONS; ButtonIndex++)
+			{
+				if (NewControllerState.ButtonStates[ButtonIndex] != OldControllerState.ButtonStates[ButtonIndex])
 				{
-					// This button was pressed - set the button's NextRepeatTime to the InitialButtonRepeatDelay
-					NewControllerState.NextRepeatTime[ButtonIndex] = CurrentTime + InitialButtonRepeatDelay;
+					if (NewControllerState.ButtonStates[ButtonIndex])
+					{
+						//LOGD("    Sending joystick button down %d (first)", ButtonMapping[ButtonIndex]);
+						MessageHandler->OnControllerButtonPressed(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, false);
+					}
+					else
+					{
+						//LOGD("    Sending joystick button up %d", ButtonMapping[ButtonIndex]);
+						MessageHandler->OnControllerButtonReleased(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, false);
+					}
+
+					if (NewControllerState.ButtonStates[ButtonIndex])
+					{
+						// This button was pressed - set the button's NextRepeatTime to the InitialButtonRepeatDelay
+						NewControllerState.NextRepeatTime[ButtonIndex] = CurrentTime + InitialButtonRepeatDelay;
+					}
+				}
+				else if (NewControllerState.ButtonStates[ButtonIndex] && NewControllerState.NextRepeatTime[ButtonIndex] <= CurrentTime)
+				{
+					// Send button repeat events
+					MessageHandler->OnControllerButtonPressed(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, true);
+
+					// Set the button's NextRepeatTime to the ButtonRepeatDelay
+					NewControllerState.NextRepeatTime[ButtonIndex] = CurrentTime + ButtonRepeatDelay;
 				}
 			}
-			else if (NewControllerState.ButtonStates[ButtonIndex] && NewControllerState.NextRepeatTime[ButtonIndex] <= CurrentTime)
-			{
-				// Send button repeat events
-				MessageHandler->OnControllerButtonPressed(ButtonMapping[ButtonIndex], NewControllerState.DeviceId, true);
 
-				// Set the button's NextRepeatTime to the ButtonRepeatDelay
-				NewControllerState.NextRepeatTime[ButtonIndex] = CurrentTime + ButtonRepeatDelay;
-			}
+			// Update the state for next time
+			OldControllerState = NewControllerState;
 		}
-
-		// Update the state for next time
-		OldControllerState = NewControllerState;
 	}
 
 	for (int i = 0; i < FAndroidInputInterface::MotionDataStack.Num(); ++i)
@@ -972,6 +992,35 @@ void FAndroidInputInterface::SendControllerEvents()
 			0);
 	}
 
+	for (int i = 0; i < FAndroidInputInterface::MouseDataStack.Num(); ++i)
+	{
+		MouseData mouse_data = FAndroidInputInterface::MouseDataStack[i];
+
+		switch (mouse_data.EventType)
+		{
+			case MouseEventType::MouseMove:
+				if (Cursor.IsValid())
+				{
+					Cursor->SetPosition(mouse_data.AbsoluteX, mouse_data.AbsoluteX);
+					MessageHandler->OnMouseMove();
+				}
+				MessageHandler->OnRawMouseMove(mouse_data.DeltaX, mouse_data.DeltaY);
+				break;
+
+			case MouseEventType::MouseWheel:
+				MessageHandler->OnMouseWheel(mouse_data.WheelDelta);
+				break;
+
+			case MouseEventType::MouseButtonDown:
+				MessageHandler->OnMouseDown(nullptr, mouse_data.Button);
+				break;
+
+			case MouseEventType::MouseButtonUp:
+				MessageHandler->OnMouseUp(mouse_data.Button);
+				break;
+		}
+	}
+
 	for (int32 MessageIndex = 0; MessageIndex < FMath::Min(DeferredMessageQueueLastEntryIndex, MAX_DEFERRED_MESSAGE_QUEUE_SIZE); ++MessageIndex)
 	{
 		const FDeferredAndroidMessage& DeferredMessage = DeferredMessages[MessageIndex];
@@ -1005,6 +1054,8 @@ void FAndroidInputInterface::SendControllerEvents()
 
 	FAndroidInputInterface::MotionDataStack.Empty();
 
+	FAndroidInputInterface::MouseDataStack.Empty();
+
 	for (auto DeviceIt = ExternalInputDevices.CreateIterator(); DeviceIt; ++DeviceIt)
 	{
 		(*DeviceIt)->SendControllerEvents();
@@ -1020,6 +1071,11 @@ void FAndroidInputInterface::QueueTouchInput(const TArray<TouchInput>& InTouchEv
 
 int32 FAndroidInputInterface::FindExistingDevice(int32 deviceId)
 {
+	if (!bAllowControllers)
+	{
+		return -1;
+	}
+	
 	// Treat non-positive devices ids special
 	if (deviceId < 1)
 		return -1;
@@ -1038,6 +1094,11 @@ int32 FAndroidInputInterface::FindExistingDevice(int32 deviceId)
 
 int32 FAndroidInputInterface::GetControllerIndex(int32 deviceId)
 {
+	if (!bAllowControllers)
+	{
+		return -1;
+	}
+	
 	// Treat non-positive device ids special (always controller 0)
 	if (deviceId < 1)
 		return 0;
@@ -1271,6 +1332,35 @@ void FAndroidInputInterface::JoystickButtonEvent(int32 deviceId, int32 buttonId,
 	}
 }
 
+void FAndroidInputInterface::MouseMoveEvent(int32 deviceId, float absoluteX, float absoluteY, float deltaX, float deltaY)
+{
+	// for now only deal with one mouse
+	FScopeLock Lock(&TouchInputCriticalSection);
+
+	FAndroidInputInterface::MouseDataStack.Push(
+		MouseData{ MouseEventType::MouseMove, EMouseButtons::Invalid, (int32)absoluteX, (int32)absoluteY, (int32)deltaX, (int32)deltaY, 0.0f });
+}
+
+void FAndroidInputInterface::MouseWheelEvent(int32 deviceId, float wheelDelta)
+{
+	// for now only deal with one mouse
+	FScopeLock Lock(&TouchInputCriticalSection);
+
+	FAndroidInputInterface::MouseDataStack.Push(
+		MouseData{ MouseEventType::MouseWheel, EMouseButtons::Invalid, 0, 0, 0, 0, wheelDelta });
+}
+
+void FAndroidInputInterface::MouseButtonEvent(int32 deviceId, int32 buttonId, bool buttonDown)
+{
+	// for now only deal with one mouse
+	FScopeLock Lock(&TouchInputCriticalSection);
+
+	MouseEventType EventType = buttonDown ? MouseEventType::MouseButtonDown : MouseEventType::MouseButtonUp;
+	EMouseButtons::Type UE4Button = (buttonId == 0) ? EMouseButtons::Left : (buttonId == 1) ? EMouseButtons::Right : EMouseButtons::Middle;
+	FAndroidInputInterface::MouseDataStack.Push(
+		MouseData{ EventType, UE4Button, 0, 0, 0, 0, 0.0f });
+}
+
 void FAndroidInputInterface::DeferMessage(const FDeferredAndroidMessage& DeferredMessage)
 {
 	FScopeLock Lock(&TouchInputCriticalSection);
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidWindow.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidWindow.cpp
index 2c466061a2c7..109556a65201 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidWindow.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Android/AndroidWindow.cpp
@@ -8,6 +8,8 @@
 #endif
 #include "HAL/OutputDevices.h"
 #include "HAL/IConsoleManager.h"
+#include "Misc/CommandLine.h"
+#include "HAL/PlatformStackWalk.h"
 
 // Cached calculated screen resolution
 static int32 WindowWidth = -1;
@@ -147,6 +149,12 @@ FPlatformRect FAndroidWindow::GetScreenRect()
 	// If the app is for Gear VR then always use 0 as ScaleFactor (to match window size).
 	float RequestedContentScaleFactor = (!bIsGearVRApp) ? CVar->GetFloat() : 0;
 
+	FString CmdLineCSF;
+	if (FParse::Value(FCommandLine::Get(), TEXT("mcsf="), CmdLineCSF, false))
+	{
+		RequestedContentScaleFactor = FCString::Atof(*CmdLineCSF);
+	}
+	
 	ANativeWindow* Window = (ANativeWindow*)FAndroidWindow::GetHardwareWindow();
 	static const bool bIsDaydreamApp = FAndroidMisc::IsDaydreamApplication();
 	if (bIsDaydreamApp && Window == NULL)
@@ -355,14 +363,57 @@ void FAndroidWindow::CalculateSurfaceSize(void* InWindow, int32_t& SurfaceWidth,
 
 #else
 
-	check(InWindow);
-
 	static const bool bIsMobileVRApp = AndroidThunkCpp_IsGearVRApplication() || FAndroidMisc::IsDaydreamApplication();
 
 	ANativeWindow* Window = (ANativeWindow*)InWindow;
 
-	SurfaceWidth = (GSurfaceViewWidth > 0) ? GSurfaceViewWidth : ANativeWindow_getWidth(Window);
-	SurfaceHeight = (GSurfaceViewHeight > 0) ? GSurfaceViewHeight : ANativeWindow_getHeight(Window);
+	if (InWindow == nullptr)
+	{
+		// log the issue and callstack for backtracking the issue
+		// dump the stack HERE
+		{
+			const SIZE_T StackTraceSize = 65535;
+			ANSICHAR* StackTrace = (ANSICHAR*)FMemory::Malloc(StackTraceSize);
+			StackTrace[0] = 0;
+
+			// Walk the stack and dump it to the allocated memory.
+			FPlatformStackWalk::StackWalkAndDump(StackTrace, StackTraceSize, 0, NULL);
+
+			FPlatformMisc::LowLevelOutputDebugString(TEXT("== WARNNG: CalculateSurfaceSize called with NULL window:"));
+
+			ANSICHAR* Start = StackTrace;
+			ANSICHAR* Next = StackTrace;
+			FPlatformMisc::LowLevelOutputDebugString(TEXT("==> STACK TRACE"));
+			while (*Next)
+			{
+				while (*Next)
+				{
+					if (*Next == 10 || *Next == 13)
+					{
+						while (*Next == 10 || *Next == 13)
+						{
+							*Next++ = 0;
+						}
+						break;
+					}
+					++Next;
+				}
+				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("==> %s"), ANSI_TO_TCHAR(Start));
+				Start = Next;
+			}
+			FPlatformMisc::LowLevelOutputDebugString(TEXT("<== STACK TRACE"));
+
+			FMemory::Free(StackTrace);
+		}
+
+		SurfaceWidth = (GSurfaceViewWidth > 0) ? GSurfaceViewWidth : 1280;
+		SurfaceHeight = (GSurfaceViewHeight > 0) ? GSurfaceViewHeight : 720;
+	}
+	else
+	{
+		SurfaceWidth = (GSurfaceViewWidth > 0) ? GSurfaceViewWidth : ANativeWindow_getWidth(Window);
+		SurfaceHeight = (GSurfaceViewHeight > 0) ? GSurfaceViewHeight : ANativeWindow_getHeight(Window);
+	}
 
 	// some phones gave it the other way (so, if swap if the app is landscape, but width < height)
 	if ((GAndroidIsPortrait && SurfaceWidth > SurfaceHeight) || 
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericPlatformApplicationMisc.cpp b/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericPlatformApplicationMisc.cpp
index ba9df73a8ba9..0aae0487888c 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericPlatformApplicationMisc.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericPlatformApplicationMisc.cpp
@@ -16,7 +16,7 @@ bool FGenericPlatformApplicationMisc::CachedPhysicalScreenData = false;
 EScreenPhysicalAccuracy FGenericPlatformApplicationMisc::CachedPhysicalScreenAccuracy = EScreenPhysicalAccuracy::Unknown;
 int32 FGenericPlatformApplicationMisc::CachedPhysicalScreenDensity = 0;
 
-static int32 bEnableHighDPIAwareness = 0;
+static int32 bEnableHighDPIAwareness = 1;
 
 FAutoConsoleVariableRef FGenericPlatformApplicationMisc::CVarEnableHighDPIAwareness(
 	TEXT("EnableHighDPIAwareness"),
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericWindow.cpp b/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericWindow.cpp
index ad64ebbf3422..f4b7140a3353 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericWindow.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/GenericPlatform/GenericWindow.cpp
@@ -161,6 +161,10 @@ const FGenericWindowDefinition& FGenericWindow::GetDefinition() const
 	return *Definition.Get();
 }
 
+bool FGenericWindow::IsDefinitionValid() const
+{
+	return Definition.IsValid();
+}
 
 void FGenericWindow::AdjustCachedSize( FVector2D& Size ) const
 {
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSAppDelegate.cpp b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSAppDelegate.cpp
index c5321a780727..390b99c6aaa3 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSAppDelegate.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSAppDelegate.cpp
@@ -26,13 +26,20 @@
 
 // this is the size of the game thread stack, it must be a multiple of 4k
 #if (UE_BUILD_SHIPPING || UE_BUILD_TEST)
-#define GAME_THREAD_STACK_SIZE 1024 * 1024
+#define GAME_THREAD_STACK_SIZE 2 * 1024 * 1024
 #else
 #define GAME_THREAD_STACK_SIZE 16 * 1024 * 1024
 #endif
 
 DEFINE_LOG_CATEGORY(LogIOSAudioSession);
 
+int GAudio_ForceAmbientCategory = 1;
+//static FAutoConsoleVariableRef CVar_ForceAmbientCategory(
+//															  TEXT("audio.ForceAmbientCategory"),
+//															  GAudio_ForceAmbientCategory,
+//															  TEXT("Force the iOS AVAudioSessionCategoryAmbient category over AVAudioSessionCategorySoloAmbient")
+//															  );
+
 extern bool GShowSplashScreen;
 
 FIOSCoreDelegates::FOnOpenURL FIOSCoreDelegates::OnOpenURL;
@@ -204,8 +211,15 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 	[self InitIdleTimerSettings];
 
 	bEngineInit = true;
-	// @PJS - need a better way to allow the game to turn off the splash screen
-    GShowSplashScreen = false;
+    
+    // put a render thread job to turn off the splash screen after the first render flip
+    if (GShowSplashScreen)
+    {
+        FGraphEventRef SplashTask = FFunctionGraphTask::CreateAndDispatchWhenReady([]()
+        {
+            GShowSplashScreen = false;
+        }, TStatId(), NULL, ENamedThreads::ActualRenderingThread);
+    }
 
 	for (NSDictionary* openUrlParameter in self.savedOpenUrlParameters)
 	{
@@ -227,6 +241,18 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
         }
         else
         {
+			bool bOtherAudioPlayingNow = [self IsBackgroundAudioPlaying];
+			if (bOtherAudioPlayingNow != self.bLastOtherAudioPlaying)
+			{
+				FGraphEventRef UserMusicInterruptTask = FFunctionGraphTask::CreateAndDispatchWhenReady([bOtherAudioPlayingNow]()
+				   {
+					   //NSLog(@"UserMusicInterrupt Change: %s", bOtherAudioPlayingNow ? "playing" : "paused");
+					   FCoreDelegates::UserMusicInterruptDelegate.Broadcast(bOtherAudioPlayingNow);
+				   }, TStatId(), NULL, ENamedThreads::GameThread);
+				
+				self.bLastOtherAudioPlaying = bOtherAudioPlayingNow;
+			}
+			
             FAppEntry::Tick();
         
             // free any autoreleased objects every once in awhile to keep memory use down (strings, splash screens, etc)
@@ -234,7 +260,7 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
             {
 				// If you crash upon release, turn on Zombie Objects (Edit Scheme... | Diagnostics | Zombie Objects)
 				// This will list the last object sent the release message, which will help identify the double free
-				[AutoreleasePool release];
+                [AutoreleasePool release];
                 AutoreleasePool = [[NSAutoreleasePool alloc] init];
             }
         }
@@ -272,9 +298,15 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 {
 	float TimerDuration = 0.0F;
 	GConfig->GetFloat(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("IdleTimerEnablePeriod"), TimerDuration, GEngineIni);
-	IdleTimerEnablePeriod = TimerDuration;
-	
-	self.IdleTimerEnableTimer = nil;
+    if (TimerDuration > 0.f)
+    {
+        IdleTimerEnablePeriod = TimerDuration;
+        self.IdleTimerEnableTimer = nil;
+    }
+    else
+    {
+        [self EnableIdleTimer: NO];
+    }
 }
 
 -(void)DeferredEnableIdleTimer
@@ -316,76 +348,43 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 	self.bCommandLineReady = true;
 }
 
--(void)AudioInterrupted:(NSNotification*)notification
-{
-	// pull the type of notification out
-	NSDictionary* Info = [notification userInfo];
-	NSNumber* Type = (NSNumber*)[Info valueForKey:AVAudioSessionInterruptionTypeKey];
-
-	NSLog(@"AUDIO INTERRUPTION NOTIFICATION: %d, (began = %d, ended = %d)", (int)[Type integerValue], (int)AVAudioSessionInterruptionTypeBegan, (int)AVAudioSessionInterruptionTypeEnded);
-	if ([Type integerValue] == AVAudioSessionInterruptionTypeBegan)
-	{
-		FAppEntry::Suspend();
-		[self ToggleAudioSession:false];
-	}
-	else if ([Type integerValue] == AVAudioSessionInterruptionTypeEnded)
-	{
-		[self ToggleAudioSession:true];
-	    FAppEntry::Resume();
-	}
-}
-
 - (void)InitializeAudioSession
 {
-	// get notified about interruptions
-	// @todo ios8: Test this (I can't make a notification happen so far)
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(AudioInterrupted:) name:AVAudioSessionInterruptionNotification object:[AVAudioSession sharedInstance]];
-	
-	self.bUsingBackgroundMusic = [self IsBackgroundAudioPlaying];
-	if (!self.bUsingBackgroundMusic)
+	[[NSNotificationCenter defaultCenter] addObserverForName:AVAudioSessionInterruptionNotification object:nil queue:nil usingBlock:^(NSNotification *notification)
 	{
-		NSError* ActiveError = nil;
-		[[AVAudioSession sharedInstance] setActive:YES error:&ActiveError];
-		if (ActiveError)
+		//NSLog(@"AVAudioSessionInterruptionNotification: AVAudioSessionInterruptionType: %d, AVAudioSessionInterruptionOption: %d", (int)[[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] unsignedIntegerValue], (int)[[[notification userInfo] objectForKey:AVAudioSessionInterruptionOptionKey] unsignedIntegerValue]);
+		switch ([[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] unsignedIntegerValue])
 		{
-			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session as active!"));
+			case AVAudioSessionInterruptionTypeBegan:
+				self.bAudioActive = false;
+				FAppEntry::Suspend();
+				break;
+				
+			case AVAudioSessionInterruptionTypeEnded:
+				FAppEntry::Resume();
+				[self ToggleAudioSession:true force:true];
+				break;
 		}
-		ActiveError = nil;
-		
-		[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategorySoloAmbient error:&ActiveError];
-		if (ActiveError)
-		{
-			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategorySoloAmbient!"));
-		}
-		ActiveError = nil;
-	}
-	else
-	{
-		// Allow iPod music to continue playing in the background
-		NSError* ActiveError = nil;
-		[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
-		if (ActiveError)
-		{
-			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient!"));
-		}
-		ActiveError = nil;
-	}
+	}];
 
-    self.bAudioActive = true;
+	self.bUsingBackgroundMusic = [self IsBackgroundAudioPlaying];
+	self.bLastOtherAudioPlaying = !self.bUsingBackgroundMusic;
+
+	[self ToggleAudioSession:true force:true];
 }
 
-- (void)ToggleAudioSession:(bool)bActive
+- (void)ToggleAudioSession:(bool)bActive force:(bool)bForce
 {
 	if (bActive)
 	{
-        if (!self.bAudioActive)
+        if (bForce || !self.bAudioActive)
         {
 			bool bWasUsingBackgroundMusic = self.bUsingBackgroundMusic;
 			self.bUsingBackgroundMusic = [self IsBackgroundAudioPlaying];
 	
-			if (bWasUsingBackgroundMusic != self.bUsingBackgroundMusic)
+			if (bWasUsingBackgroundMusic != self.bUsingBackgroundMusic || GAudio_ForceAmbientCategory)
 			{
-				if (!self.bUsingBackgroundMusic)
+				if (!self.bUsingBackgroundMusic || GAudio_ForceAmbientCategory)
 				{
 					NSError* ActiveError = nil;
 					[[AVAudioSession sharedInstance] setActive:YES error:&ActiveError];
@@ -395,27 +394,67 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 					}
 					ActiveError = nil;
 	
-					[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategorySoloAmbient error:&ActiveError];
-					if (ActiveError)
+                    if (!self.bVoiceChatEnabled)
+                    {
+						if (!GAudio_ForceAmbientCategory)
+						{
+        					[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategorySoloAmbient error:&ActiveError];
+        					if (ActiveError)
+        					{
+        						UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategorySoloAmbient! [Error = %s]"), *FString([ActiveError description]));
+        					}
+						}
+						else
+						{
+							[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
+							if (ActiveError)
+							{
+								UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
+							}
+						}
+    					ActiveError = nil;
+                    }
+					else
 					{
-						UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategorySoloAmbient! [Error = %s]"), *FString([ActiveError description]));
+						AVAudioSessionCategoryOptions opts =
+    						AVAudioSessionCategoryOptionAllowBluetoothA2DP |
+#if !PLATFORM_TVOS
+    						AVAudioSessionCategoryOptionDefaultToSpeaker |
+#endif
+    						AVAudioSessionCategoryOptionMixWithOthers;
+						
+						if (@available(iOS 10, *))
+						{
+							[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord mode:AVAudioSessionModeVoiceChat options:opts error:&ActiveError];
+						}
+						else
+						{
+							[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:opts error:&ActiveError];
+						}
+						if (ActiveError)
+						{
+							UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category!"));
+						}
+						ActiveError = nil;
 					}
-					ActiveError = nil;
-	
+
 					/* TODO::JTM - Jan 16, 2013 05:05PM - Music player support */
 				}
 				else
 				{
 					/* TODO::JTM - Jan 16, 2013 05:05PM - Music player support */
 	
-					// Allow iPod music to continue playing in the background
-					NSError* ActiveError = nil;
-					[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
-					if (ActiveError)
-					{
-						UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
-					}
-					ActiveError = nil;
+                    if (!self.bVoiceChatEnabled)
+                    {
+    					// Allow iPod music to continue playing in the background
+    					NSError* ActiveError = nil;
+    					[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
+    					if (ActiveError)
+    					{
+    						UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
+    					}
+    					ActiveError = nil;
+                    }
 				}
 			}
 			else if (!self.bUsingBackgroundMusic)
@@ -427,33 +466,66 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 					UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session as active! [Error = %s]"), *FString([ActiveError description]));
 				}
 				ActiveError = nil;
-				
-				[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategorySoloAmbient error:&ActiveError];
-				if (ActiveError)
+                
+                if (!self.bVoiceChatEnabled)
+                {
+					if (!GAudio_ForceAmbientCategory)
+					{
+						[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategorySoloAmbient error:&ActiveError];
+						if (ActiveError)
+						{
+							UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategorySoloAmbient! [Error = %s]"), *FString([ActiveError description]));
+						}
+					}
+					else
+					{
+						[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
+						if (ActiveError)
+						{
+							UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
+						}
+					}
+    				ActiveError = nil;
+                }
+				else
 				{
-					UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategorySoloAmbient! [Error = %s]"), *FString([ActiveError description]));
+					AVAudioSessionCategoryOptions opts =
+					AVAudioSessionCategoryOptionAllowBluetoothA2DP |
+#if !PLATFORM_TVOS
+					AVAudioSessionCategoryOptionDefaultToSpeaker |
+#endif
+					AVAudioSessionCategoryOptionMixWithOthers;
+					
+					if (@available(iOS 10, *))
+					{
+						[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord mode:AVAudioSessionModeVoiceChat options:opts error:&ActiveError];
+					}
+					else
+					{
+						[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:opts error:&ActiveError];
+					}
+					if (ActiveError)
+					{
+						UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category!"));
+					}
+					ActiveError = nil;
 				}
-				ActiveError = nil;
 			}
         }
 	}
-	else if (self.bAudioActive && !self.bUsingBackgroundMusic)
+	else if ((bForce || self.bAudioActive) && !self.bUsingBackgroundMusic)
 	{
 		NSError* ActiveError = nil;
-		[[AVAudioSession sharedInstance] setActive:NO error:&ActiveError];
-		if (ActiveError)
-		{
-			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session as inactive! [Error = %s]"), *FString([ActiveError description]));
-		}
-		ActiveError = nil;
-        
-		// Necessary to prevent audio from getting killing when setup for background iPod audio playback
-		[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
-		if (ActiveError)
-		{
-			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
-		}
-		ActiveError = nil;
+        if (!self.bVoiceChatEnabled)
+        {
+    		// Necessary to prevent audio from getting killing when setup for background iPod audio playback
+    		[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&ActiveError];
+    		if (ActiveError)
+    		{
+    			UE_LOG(LogIOSAudioSession, Error, TEXT("Failed to set audio session category to AVAudioSessionCategoryAmbient! [Error = %s]"), *FString([ActiveError description]));
+    		}
+    		ActiveError = nil;
+        }
  	}
     self.bAudioActive = bActive;
 }
@@ -464,6 +536,17 @@ void EngineCrashHandler(const FGenericCrashContext& GenericContext)
 	return Session.otherAudioPlaying;
 }
 
+- (void)EnableVoiceChat:(bool)bEnable
+{
+    self.bVoiceChatEnabled = bEnable;
+	[self ToggleAudioSession:self.bAudioActive force:true];
+}
+
+- (bool)IsVoiceChatEnabled
+{
+	return self.bVoiceChatEnabled;
+}
+
 - (int)GetAudioVolume
 {
 	float vol = [[AVAudioSession sharedInstance] outputVolume];
@@ -551,7 +634,7 @@ bool GIsSuspended = 0;
 		// Don't deadlock here because a msg box may appear super early blocking the game thread and then the app may go into the background
 		double	startTime = FPlatformTime::Seconds();
 
-		// don't wait for FDefaultGameMoviePlayer::WaitForMovieToFinish(), crash with 0x8badf00d if “Wait for Movies to Complete” is checked
+		// don't wait for FDefaultGameMoviePlayer::WaitForMovieToFinish(), crash with 0x8badf00d if “Wait for Movies to Complete� is checked
 		while(!self.bHasSuspended && !FAppEntry::IsStartupMoviePlaying() &&  (FPlatformTime::Seconds() - startTime) < cMaxThreadWaitTime)
 		{
             FIOSPlatformRHIFramePacer::Suspend();
@@ -653,7 +736,7 @@ bool GIsSuspended = 0;
 		// use IPhone6 image for now
 		[ImageString appendString : @"-IPhone6Plus-Landscape"];
 	}
-	else if (Device == FPlatformMisc::IOS_IPadPro_129)
+	else if (Device == FPlatformMisc::IOS_IPadPro_129 || Device == FPlatformMisc::IOS_IPadPro2_129)
 	{
 		if (!self.bDeviceInPortraitMode)
 		{
@@ -770,8 +853,6 @@ bool GIsSuspended = 0;
 
 	if (@available(iOS 11, *))
 	{
-		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(temperatureChanged:) name:NSProcessInfoThermalStateDidChangeNotification object:nil];
-
 		FCoreDelegates::OnGetOnScreenMessages.AddLambda(
 			[](TMultiMap<FCoreDelegates::EOnScreenMessageSeverity, FText >& OutMessages)
 			{
@@ -783,12 +864,26 @@ bool GIsSuspended = 0;
 					case NSProcessInfoThermalStateCritical:	OutMessages.Add(FCoreDelegates::EOnScreenMessageSeverity::Error, FText::FromString(TEXT("Thermals are Critical"))); break;
 				}
 
+				// Uncomment to view the state of the AVAudioSession category, mode, and options.
+//#define VIEW_AVAUDIOSESSION_INFO
+#if defined(VIEW_AVAUDIOSESSION_INFO)
+				FString Message = FString::Printf(TEXT("Session Category: %s, Mode: %s, Options: %x"), UTF8_TO_TCHAR([[AVAudioSession sharedInstance].category UTF8String]), UTF8_TO_TCHAR([[AVAudioSession sharedInstance].mode UTF8String]),
+												  [AVAudioSession sharedInstance].categoryOptions);
+				OutMessages.Add(FCoreDelegates::EOnScreenMessageSeverity::Info, FText::FromString(Message));
+#endif // defined(VIEW_AVAUDIOSESSION_INFO)
+
 			});
 	}
 
 
 #endif
 
+	if (@available(iOS 11, tvOS 11, *))
+	{
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(temperatureChanged:) name:NSProcessInfoThermalStateDidChangeNotification object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(lowPowerModeChanged:) name:NSProcessInfoPowerStateDidChangeNotification object:nil];
+	}
+    
 	[self InitializeAudioSession];
 	
 #if !PLATFORM_TVOS
@@ -870,6 +965,9 @@ bool GIsSuspended = 0;
 FCriticalSection RenderSuspend;
 - (void)applicationWillResignActive:(UIApplication *)application
 {
+    
+    FIOSPlatformMisc::ResetBrightness();
+    
 	/*
 	 Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
 	 Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
@@ -892,15 +990,27 @@ FCriticalSection RenderSuspend;
 			}
 		}
     }
-
+    
+    RenderSuspend.TryLock();
+    if (FTaskGraphInterface::IsRunning())
+    {
+        if (bEngineInit)
+        {
+            FGraphEventRef ResignTask = FFunctionGraphTask::CreateAndDispatchWhenReady([]()
+            {
+                FScopeLock ScopeLock(&RenderSuspend);
+            }, TStatId(), NULL, ENamedThreads::GameThread);
+        }
+        else
+        {
+            FGraphEventRef ResignTask = FFunctionGraphTask::CreateAndDispatchWhenReady([]()
+            {
+                FScopeLock ScopeLock(&RenderSuspend);
+            }, TStatId(), NULL, ENamedThreads::ActualRenderingThread);
+        }
+    }
 	[self ToggleSuspend:true];
-	[self ToggleAudioSession:false];
-
-	RenderSuspend.TryLock();
-	FGraphEventRef ResignTask = FFunctionGraphTask::CreateAndDispatchWhenReady([]()
-	{
-		FScopeLock ScopeLock(&RenderSuspend);
-	}, TStatId(), NULL, ENamedThreads::ActualRenderingThread);
+	[self ToggleAudioSession:false force:true];
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
@@ -909,7 +1019,6 @@ FCriticalSection RenderSuspend;
 	 Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
 	 If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 	 */
-
     FCoreDelegates::ApplicationWillEnterBackgroundDelegate.Broadcast();
 }
 
@@ -918,7 +1027,6 @@ FCriticalSection RenderSuspend;
 	/*
 	 Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 	 */
-
     FCoreDelegates::ApplicationHasEnteredForegroundDelegate.Broadcast();
 }
 
@@ -929,7 +1037,7 @@ FCriticalSection RenderSuspend;
 	 */
 	RenderSuspend.Unlock();
 	[self ToggleSuspend : false];
-	[self ToggleAudioSession:true];
+	[self ToggleAudioSession:true force:true];
 
     if (bEngineInit)
     {
@@ -1193,15 +1301,18 @@ PRAGMA_ENABLE_DEPRECATION_WARNINGS
  */
 -(void)ShowAchievements
 {
+#if !PLATFORM_TVOS
 	// create the leaderboard display object 
 	GKGameCenterViewController* GameCenterDisplay = [[[GKGameCenterViewController alloc] init] autorelease];
-#if !PLATFORM_TVOS
+    if (@available(iOS 7, tvOS 999, *))
+    {
 	GameCenterDisplay.viewState = GKGameCenterViewControllerStateAchievements;
-#endif
+    }
 	GameCenterDisplay.gameCenterDelegate = self;
 
 	// show it 
 	[self ShowController : GameCenterDisplay];
+#endif // !PLATFORM_TVOS
 }
 
 /**
@@ -1247,6 +1358,15 @@ CORE_API bool IOSShowAchievementsUI()
 	}
 }
 
+-(void)lowPowerModeChanged:(NSNotification *)notification
+{
+	if (@available(iOS 11, *))
+	{
+		bool bInLowPowerMode = [[NSProcessInfo processInfo] isLowPowerModeEnabled];
+		FCoreDelegates::OnLowPowerMode.Broadcast(bInLowPowerMode);
+	}
+}
+
 -(UIWindow*)window
 {
 	return Window;
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSInputInterface.cpp b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSInputInterface.cpp
index c57af78f97ac..8d0b46f31a66 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSInputInterface.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSInputInterface.cpp
@@ -4,12 +4,19 @@
 #include "IOS/IOSAppDelegate.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/ScopeLock.h"
+#include "HAL/IConsoleManager.h"
 
 #import <AudioToolbox/AudioToolbox.h>
 
 DECLARE_LOG_CATEGORY_EXTERN(LogIOSInput, Log, All);
 
 
+static TAutoConsoleVariable<float> CVarHapticsKickHeavy(TEXT("ios.VibrationHapticsKickHeavyValue"), 0.65f, TEXT("Vibation values higher than this will kick a haptics heavy Impact"));
+static TAutoConsoleVariable<float> CVarHapticsKickMedium(TEXT("ios.VibrationHapticsKickMediumValue"), 0.5f, TEXT("Vibation values higher than this will kick a haptics medium Impact"));
+static TAutoConsoleVariable<float> CVarHapticsKickLight(TEXT("ios.VibrationHapticsKickLightValue"), 0.3f, TEXT("Vibation values higher than this will kick a haptics light Impact"));
+static TAutoConsoleVariable<float> CVarHapticsRest(TEXT("ios.VibrationHapticsRestValue"), 0.2f, TEXT("Vibation values lower than this will allow haptics to Kick again when going over ios.VibrationHapticsKickValue"));
+
+
 //@interface FControllerHelper : NSObject
 //{
 //	FIOSInputInterface
@@ -32,6 +39,8 @@ FIOSInputInterface::FIOSInputInterface( const TSharedRef< FGenericApplicationMes
 	, bTreatRemoteAsSeparateController(false)
 	, bUseRemoteAsVirtualJoystick(true)
 	, bUseRemoteAbsoluteDpadValues(false)
+	, bAllowControllers(true)
+    , LastHapticValue(0.0f)
 {
 #if !PLATFORM_TVOS
 	MotionManager = nil;
@@ -42,8 +51,8 @@ FIOSInputInterface::FIOSInputInterface( const TSharedRef< FGenericApplicationMes
 	GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bAllowRemoteRotation"), bAllowRemoteRotation, GEngineIni);
 	GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bUseRemoteAsVirtualJoystick"), bUseRemoteAsVirtualJoystick, GEngineIni);
 	GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bUseRemoteAbsoluteDpadValues"), bUseRemoteAbsoluteDpadValues, GEngineIni);
+	GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bAllowControllers"), bAllowControllers, GEngineIni);
 
-	
 	[[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidConnectNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification* Notification)
 	 {
 		HandleConnection(Notification.object);
@@ -55,11 +64,8 @@ FIOSInputInterface::FIOSInputInterface( const TSharedRef< FGenericApplicationMes
 	 }];
 	
 
-	[GCController startWirelessControllerDiscoveryWithCompletionHandler:^{
-	 }];
-//	[GCController stopWirelessControllerDiscovery];
-	
-	
+	[GCController startWirelessControllerDiscoveryWithCompletionHandler:^{ }];
+
 	FMemory::Memzero(Controllers, sizeof(Controllers));
 }
 
@@ -81,6 +87,12 @@ void FIOSInputInterface::HandleConnection(GCController* Controller)
 	// if we want to use the Remote as a separate player, then we treat it as a Gamepad for player assignment
 	bool bIsTreatedAsGamepad = bIsGamepadType || bTreatRemoteAsSeparateController;
 
+	// disallow gamepad types (but still connect remote)
+	if (bIsGamepadType && !bAllowControllers)
+	{
+		return;
+	}
+
 	// find a good controller index to use
 	bool bFoundSlot = false;
 	for (int32 ControllerIndex = 0; ControllerIndex < ARRAY_COUNT(Controllers); ControllerIndex++)
@@ -127,6 +139,12 @@ void FIOSInputInterface::HandleConnection(GCController* Controller)
 
 void FIOSInputInterface::HandleDisconnect(GCController* Controller)
 {
+	// if we don't allow controllers, there could be unset player index here
+	if (Controller.playerIndex == GCControllerPlayerIndexUnset)
+	{
+		return;
+	}
+	
 	UE_LOG(LogIOS, Log, TEXT("Controller for playerIndex %d was removed"), Controller.playerIndex);
 	
 	// mark this controller as disconnected, and reset the state
@@ -218,7 +236,7 @@ void FIOSInputInterface::ProcessTouchesAndKeys(uint32 ControllerId)
 		// send input to handler
 		if (Touch.Type == TouchBegan)
 		{
-			MessageHandler->OnTouchStarted( NULL, Touch.Position, Touch.Handle, ControllerId);
+			MessageHandler->OnTouchStarted( NULL, Touch.Position, Touch.Force, Touch.Handle, ControllerId);
 		}
 		else if (Touch.Type == TouchEnded)
 		{
@@ -226,7 +244,7 @@ void FIOSInputInterface::ProcessTouchesAndKeys(uint32 ControllerId)
 		}
 		else
 		{
-			MessageHandler->OnTouchMoved(Touch.Position, Touch.Handle, ControllerId);
+			MessageHandler->OnTouchMoved(Touch.Position, Touch.Force, Touch.Handle, ControllerId);
 		}
 	}
 	
@@ -283,12 +301,6 @@ void FIOSInputInterface::SendControllerEvents()
 	
 	for (GCController* Cont in [GCController controllers])
  	{
-		// make sure the connection handler has run on this guy
-		if (Cont.playerIndex == GCControllerPlayerIndexUnset)
-		{
-			HandleConnection(Cont);
-		}
-		
 		GCGamepad* Gamepad = Cont.gamepad;
 		GCExtendedGamepad* ExtendedGamepad = Cont.extendedGamepad;
 #if PLATFORM_TVOS
@@ -296,6 +308,18 @@ void FIOSInputInterface::SendControllerEvents()
 #endif
 		GCMotion* Motion = Cont.motion;
 
+		// skip over gamepads if we don't allow controllers
+		if (Gamepad != nil && !bAllowControllers)
+		{
+			continue;
+		}
+		
+		// make sure the connection handler has run on this guy
+		if (Cont.playerIndex == GCControllerPlayerIndexUnset)
+		{
+			HandleConnection(Cont);
+		}
+
 		FUserController& Controller = Controllers[Cont.playerIndex];
 		
 		if (Controller.bPauseWasPressed)
@@ -612,10 +636,56 @@ bool FIOSInputInterface::IsControllerAssignedToGamepad(int32 ControllerId)
 
 void FIOSInputInterface::SetForceFeedbackChannelValue(int32 ControllerId, FForceFeedbackChannelType ChannelType, float Value)
 {
-	if (Value >= 0.3f)
+	// if we are at rest, then kick when we are over the Kick cutoff
+	if (LastHapticValue == 0.0f && Value > 0.0f)
 	{
-		AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+		const float HeavyKickVal = CVarHapticsKickHeavy.GetValueOnGameThread();
+		const float MediumKickVal = CVarHapticsKickMedium.GetValueOnGameThread();
+		const float LightKickVal = CVarHapticsKickLight.GetValueOnGameThread();
+		// once we get past the
+		if (Value > LightKickVal)
+		{
+			if (Value > HeavyKickVal)
+			{
+				FPlatformMisc::PrepareMobileHaptics(EMobileHapticsType::ImpactHeavy);
+			}
+			else if (Value > MediumKickVal)
+			{
+				FPlatformMisc::PrepareMobileHaptics(EMobileHapticsType::ImpactMedium);
+			}
+			else
+			{
+				FPlatformMisc::PrepareMobileHaptics(EMobileHapticsType::ImpactLight);
+			}
+
+			FPlatformMisc::TriggerMobileHaptics();
+			
+			// remember it to not kick again
+			LastHapticValue = Value;
+		}
 	}
+	else
+	{
+		const float RestVal = CVarHapticsRest.GetValueOnGameThread();
+
+		if (Value >= RestVal)
+		{
+			// always remember the last value if we are over the Rest amount
+			LastHapticValue = Value;
+		}
+		else
+		{
+			// release the haptics
+			FPlatformMisc::ReleaseMobileHaptics();
+			
+			// rest
+			LastHapticValue = 0.0f;
+		}
+	}
+	
+//	{
+//		AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+//	}
 }
 
 void FIOSInputInterface::SetForceFeedbackChannelValues(int32 ControllerId, const FForceFeedbackValues &Values)
@@ -625,8 +695,6 @@ void FIOSInputInterface::SetForceFeedbackChannelValues(int32 ControllerId, const
 	float MaxRight = Values.RightLarge > Values.RightSmall ? Values.RightLarge : Values.RightSmall;
 	float Value = MaxLeft > MaxRight ? MaxLeft : MaxRight;
 
-	if (Value >= 0.3f)
-	{
-		AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
-	}
+	// the other function will just play, regardless of channel
+	SetForceFeedbackChannelValue(ControllerId, FForceFeedbackChannelType::LEFT_LARGE, Value);
 }
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformApplicationMisc.cpp b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformApplicationMisc.cpp
index 96e538124ee7..4f5a0f5e9527 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformApplicationMisc.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformApplicationMisc.cpp
@@ -15,7 +15,7 @@ FIOSApplication* FIOSPlatformApplicationMisc::CachedApplication = nullptr;
 
 EAppReturnType::Type MessageBoxExtImpl( EAppMsgType::Type MsgType, const TCHAR* Text, const TCHAR* Caption )
 {
-#if UE_BUILD_SHIPPING || PLATFORM_TVOS
+#if PLATFORM_TVOS
 	return FGenericPlatformMisc::MessageBoxExt(MsgType, Text, Caption);
 #else
 	NSString* CocoaText = (NSString*)FPlatformString::TCHARToCFString(Text);
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformFramePacer.cpp b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformFramePacer.cpp
index bfee38be9a4f..99f9d0591d1f 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformFramePacer.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSPlatformFramePacer.cpp
@@ -116,6 +116,7 @@ namespace IOSDisplayConstants
 
 uint32 FIOSPlatformRHIFramePacer::FrameInterval = 1;
 FIOSFramePacer* FIOSPlatformRHIFramePacer::FramePacer = nil;
+uint32 FIOSPlatformRHIFramePacer::Pace = 0;
 
 
 bool FIOSPlatformRHIFramePacer::IsEnabled()
@@ -148,6 +149,9 @@ bool FIOSPlatformRHIFramePacer::IsEnabled()
 			FrameInterval = IOSDisplayConstants::MaxRefreshRate / FrameRateLock;
 
 			bIsRHIFramePacerEnabled = (FrameInterval > 0);
+			
+			// remember the Pace if we are enabled
+			Pace = bIsRHIFramePacerEnabled ? FrameRateLock : 0;
 		}
 		bInitialized = true;
 	}
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSView.cpp b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSView.cpp
index 928d28101485..00af809a9390 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSView.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/IOS/IOSView.cpp
@@ -216,6 +216,12 @@ id<MTLDevice> GMetalDevice = nil;
 		static IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.MobileContentScaleFactor"));
 		float RequestedContentScaleFactor = CVar->GetFloat();
 
+		FString CmdLineCSF;
+		if (FParse::Value(FCommandLine::Get(), TEXT("mcsf="), CmdLineCSF, false))
+		{
+			RequestedContentScaleFactor = FCString::Atof(*CmdLineCSF);
+		}
+
 		// 0 means to leave the scale alone, use native
 		if (RequestedContentScaleFactor == 0.0f)
 		{
@@ -347,7 +353,7 @@ id<MTLDevice> GMetalDevice = nil;
 #if HAS_METAL
 - (id<CAMetalDrawable>)MakeDrawable
 {
-	return[(CAMetalLayer*)self.layer nextDrawable];
+    return [(CAMetalLayer*)self.layer nextDrawable];
 }
 #endif
 
@@ -486,6 +492,14 @@ id<MTLDevice> GMetalDevice = nil;
 		// get info from the touch
 		CGPoint Loc = [Touch locationInView:self];
 		CGPoint PrevLoc = [Touch previousLocationInView:self];
+	
+		// skip moves that didn't actually move - this will help input handling to skip over the first
+		// move since it is likely a big pop from the TouchBegan location (iOS filters out small movements
+		// on first press)
+		if (Type == TouchMoved && PrevLoc.x == Loc.x && PrevLoc.y == Loc.y)
+		{
+			continue;
+		}
 
 		// convert TOuch pointer to a unique 0 based index
 		int32 TouchIndex = [self GetTouchIndex:Touch];
@@ -494,23 +508,27 @@ id<MTLDevice> GMetalDevice = nil;
 			continue;
 		}
 
+		float Force = Touch.force;
+		// map larger values to 1..10, so 10 is a max across platforms
+		if (Force > 1.0f)
+		{
+			Force = 10.0f * Force / Touch.maximumPossibleForce;
+		}
+
+		// Handle devices without force touch 
+		if ((Type == TouchBegan || Type == TouchMoved) && Force == 0.f)
+		{
+			Force = 1.f;
+		}
+		
 		// make a new touch event struct
 		TouchInput TouchMessage;
 		TouchMessage.Handle = TouchIndex;
 		TouchMessage.Type = Type;
 		TouchMessage.Position = FVector2D(FMath::Min<float>(self.frame.size.width - 1, Loc.x), FMath::Min<float>(self.frame.size.height - 1, Loc.y)) * Scale;
 		TouchMessage.LastPosition = FVector2D(FMath::Min<float>(self.frame.size.width - 1, PrevLoc.x), FMath::Min<float>(self.frame.size.height - 1, PrevLoc.y)) * Scale;
+		TouchMessage.Force = Force;
 		TouchesArray.Add(TouchMessage);
-
-		if (Type == TouchBegan)
-		{
-			TouchInput EmulatedMessage;
-			EmulatedMessage.Handle = TouchMessage.Handle;
-			EmulatedMessage.Type = TouchMoved;
-			EmulatedMessage.Position = TouchMessage.Position;
-			EmulatedMessage.LastPosition = TouchMessage.Position;
-			TouchesArray.Add(EmulatedMessage);
-		}
 		
 		// clear out the touch when it ends
 		if (Type == TouchEnded)
@@ -1052,7 +1070,10 @@ id<MTLDevice> GMetalDevice = nil;
 	return YES;
 }
 
-
+- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures
+{
+	return UIRectEdgeBottom;
+}
 
 
 
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxApplication.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxApplication.cpp
index a2dcb116a572..24637c9d0ce0 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxApplication.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxApplication.cpp
@@ -959,7 +959,7 @@ void FLinuxApplication::ProcessDeferredMessage( SDL_Event Event )
 				Touches.Add(FingerId, NewTouch);
 
 				UE_LOG(LogLinuxWindow, Verbose, TEXT("OnTouchStarted at (%f, %f), finger %d (system touch id %llu)"), NewTouch.Location.X, NewTouch.Location.Y, NewTouch.TouchIndex, FingerId);
-				MessageHandler->OnTouchStarted(CurrentEventWindow, NewTouch.Location, NewTouch.TouchIndex, 0);// NewTouch.DeviceId);
+				MessageHandler->OnTouchStarted(CurrentEventWindow, NewTouch.Location, 1.0f, NewTouch.TouchIndex, 0);// NewTouch.DeviceId);
 			}
 			else
 			{
@@ -1029,7 +1029,7 @@ void FLinuxApplication::ProcessDeferredMessage( SDL_Event Event )
 					{
 						TouchContext->Location = Location;
 						UE_LOG(LogLinuxWindow, Verbose, TEXT("OnTouchMoved at (%f, %f), finger %d (system touch id %llu)"), TouchContext->Location.X, TouchContext->Location.Y, TouchContext->TouchIndex, FingerId);
-						MessageHandler->OnTouchMoved(TouchContext->Location, TouchContext->TouchIndex, 0);// TouchContext->DeviceId);
+						MessageHandler->OnTouchMoved(TouchContext->Location, 1.0f, TouchContext->TouchIndex, 0);// TouchContext->DeviceId);
 	}
 }
 			}
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxCursor.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxCursor.cpp
index a73f73e3e24a..3f153edf9056 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxCursor.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxCursor.cpp
@@ -311,7 +311,11 @@ void FLinuxCursor::Lock( const RECT* const Bounds )
 		CursorClipRect.w = FMath::TruncToInt(Bounds->right) - FMath::TruncToInt(Bounds->left) - 1 - ExceedingWindowPrevention;
 		CursorClipRect.h = FMath::TruncToInt(Bounds->bottom) - FMath::TruncToInt(Bounds->top) - 1 - ExceedingWindowPrevention;
 
-		SDL_ConfineCursor(CurrentFocusWindow->GetHWnd(), &CursorClipRect);
+		// We dont want to set a negative bounding region. If Top, Left, Bottom, Right are all 0
+		if (CursorClipRect.x >= 0 && CursorClipRect.y >= 0 && CursorClipRect.w > 0 && CursorClipRect.h > 0)
+		{
+			SDL_ConfineCursor(CurrentFocusWindow->GetHWnd(), &CursorClipRect);
+		}
 	}
 }
 
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Mac/HIDInputInterface.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Mac/HIDInputInterface.cpp
index 89be11b72ef9..f68c1ab45d9e 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Mac/HIDInputInterface.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Mac/HIDInputInterface.cpp
@@ -157,6 +157,7 @@ void HIDInputInterface::FHIDDeviceInfo::SetupMappings()
 	}
 	else if (VendorID == 0x54c && ProductID == 0x5c4)
 	{
+		// PlayStation 4 Controller
 		ButtonsMapping[1]	= 2;	// Square		->	X
 		ButtonsMapping[2]	= 0;	// Cross		->	A
 		ButtonsMapping[3]	= 1;	// Circle		->	B
@@ -165,10 +166,10 @@ void HIDInputInterface::FHIDDeviceInfo::SetupMappings()
 		ButtonsMapping[6]	= 5;	// R1			->	Right Shoulder
 		ButtonsMapping[7]	= 10;	// L2			->	Left Trigger
 		ButtonsMapping[8]	= 11;	// R2			->	Right Trigger
-		ButtonsMapping[9]	= 7;	// Share		->	Back
 		ButtonsMapping[10]	= 6;	// Options		->	Start
 		ButtonsMapping[11]	= 8;	// L3			->	Left Thumbstick
 		ButtonsMapping[12]	= 9;	// R3			->	Right Thumbstick
+		ButtonsMapping[14]	= 7;	// Touchpad		->	Back
 
 		LeftAnalogXMapping = kHIDUsage_GD_X;
 		LeftAnalogYMapping = kHIDUsage_GD_Y;
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsApplication.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsApplication.cpp
index 541c3d302e75..9ae812442d6f 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsApplication.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsApplication.cpp
@@ -82,6 +82,7 @@ FWindowsApplication::FWindowsApplication( const HINSTANCE HInstance, const HICON
 	, bUsingHighPrecisionMouseInput( false )
 	, bIsMouseAttached( false )
 	, bForceActivateByMouse( false )
+	, bForceNoGamepads( false )
 	, XInput( XInputInterface::Create( MessageHandler ) )
 	, bHasLoadedInputPlugins( false )
 	, bAllowedToDeferMessageProcessing(true)
@@ -99,11 +100,6 @@ FWindowsApplication::FWindowsApplication( const HINSTANCE HInstance, const HICON
 	// that message pumping doesn't occur (which causes these messages).
 	::DisableProcessWindowsGhosting();
 
-	if (GIsEditor)
-	{
-		FWindowsPlatformApplicationMisc::SetHighDPIMode();
-	}
-
 	// Register the Win32 class for Slate windows and assign the application instance and icon
 	const bool bClassRegistered = RegisterClass( InstanceHandle, IconHandle );
 
@@ -173,6 +169,11 @@ FWindowsApplication::FWindowsApplication( const HINSTANCE HInstance, const HICON
 	AllowAccessibilityShortcutKeys(false);
 
 	QueryConnectedMice();
+
+	if (FParse::Param(FCommandLine::Get(), TEXT("NoGamepad")))
+	{
+		bForceNoGamepads = true;
+	}
 }
 
 void FWindowsApplication::AllowAccessibilityShortcutKeys(const bool bAllowKeys)
@@ -308,6 +309,11 @@ void FWindowsApplication::SetMessageHandler( const TSharedRef< FGenericApplicati
 
 bool FWindowsApplication::IsGamepadAttached() const
 {
+	if (bForceNoGamepads)
+	{
+		return false;
+	}
+
 	if (XInput->IsGamepadAttached())
 	{
 		return true;
@@ -1815,7 +1821,7 @@ int32 FWindowsApplication::ProcessDeferredMessage( const FDeferredWindowsMessage
 									
 									TouchIDs[TouchIndex] = TOptional<int32>(Input.dwID);
 									UE_LOG(LogWindowsDesktop, Verbose, TEXT("OnTouchStarted at (%f, %f), finger %d (system touch id %d)"), Location.X, Location.Y, TouchIndex, Input.dwID);
-									MessageHandler->OnTouchStarted(CurrentNativeEventWindowPtr, Location, TouchIndex, 0);
+									MessageHandler->OnTouchStarted(CurrentNativeEventWindowPtr, Location, 1.0f, TouchIndex, 0);
 								}
 								else
 								{
@@ -1828,7 +1834,7 @@ int32 FWindowsApplication::ProcessDeferredMessage( const FDeferredWindowsMessage
 								if ( TouchIndex >= 0 )
 								{
 									UE_LOG(LogWindowsDesktop, Verbose, TEXT("OnTouchMoved at (%f, %f), finger %d (system touch id %d)"), Location.X, Location.Y, TouchIndex, Input.dwID);
-									MessageHandler->OnTouchMoved(Location, TouchIndex, 0);
+									MessageHandler->OnTouchMoved(Location, 1.0f, TouchIndex, 0);
 								}
 							}
 							else if ( Input.dwFlags & TOUCHEVENTF_UP )
@@ -2219,6 +2225,11 @@ void FWindowsApplication::ProcessDeferredEvents( const float TimeDelta )
 
 void FWindowsApplication::PollGameDeviceState( const float TimeDelta )
 {
+	if (bForceNoGamepads)
+	{
+		return;
+	}
+
 	// initialize any externally-implemented input devices (we delay load initialize the array so any plugins have had time to load)
 	if (!bHasLoadedInputPlugins)
 	{
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsPlatformApplicationMisc.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsPlatformApplicationMisc.cpp
index bec94e43af0c..c6352232f37f 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsPlatformApplicationMisc.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Windows/WindowsPlatformApplicationMisc.cpp
@@ -276,7 +276,7 @@ bool FWindowsPlatformApplicationMisc::GetWindowTitleMatchingText(const TCHAR* Ti
 
 float FWindowsPlatformApplicationMisc::GetDPIScaleFactorAtPoint(float X, float Y)
 {
-	if (GIsEditor && IsHighDPIAwarenessEnabled())
+	if (IsHighDPIAwarenessEnabled())
 	{
 		if (GetDpiForMonitor)
 		{
@@ -286,7 +286,7 @@ float FWindowsPlatformApplicationMisc::GetDPIScaleFactorAtPoint(float X, float Y
 			{
 				uint32 DPIX = 0;
 				uint32 DPIY = 0;
-				return SUCCEEDED(GetDpiForMonitor(Monitor, 0/*MDT_EFFECTIVE_DPI_VALUE*/, &DPIX, &DPIY)) ? DPIX / 96.0f : 1.0f;
+				return SUCCEEDED(GetDpiForMonitor(Monitor, 0 /*MDT_EFFECTIVE_DPI*/, &DPIX, &DPIY)) ? DPIX / 96.0f : 1.0f;
 			}
 		}
 		else
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidApplication.h b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidApplication.h
index a4bcb4dfce38..8b3692ea97d6 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidApplication.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidApplication.h
@@ -96,6 +96,8 @@ public:
 
 	static void OnWindowSizeChanged();
 
+	virtual void Tick(const float TimeDelta) override;
+
 	virtual bool IsGamepadAttached() const override;
 
 protected:
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidCursor.h b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidCursor.h
new file mode 100644
index 000000000000..f6589bb15e29
--- /dev/null
+++ b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidCursor.h
@@ -0,0 +1,47 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "GenericPlatform/ICursor.h"
+#include "Math/IntRect.h"
+
+class FAndroidCursor : public ICursor
+{
+public:
+
+	FAndroidCursor();
+
+	virtual ~FAndroidCursor()
+	{
+	}
+
+	virtual FVector2D GetPosition() const override
+	{
+		return CurrentPosition;
+	}
+
+	virtual void SetPosition(const int32 X, const int32 Y) override;
+
+	virtual void SetType(const EMouseCursor::Type InNewCursor) override;
+
+	virtual EMouseCursor::Type GetType() const override
+	{
+		return CurrentType;
+	}
+
+	virtual void GetSize(int32& Width, int32& Height) const override;
+
+	virtual void Show(bool bInShow) override;
+
+	virtual void Lock(const RECT* const Bounds) override;
+
+	virtual void SetTypeShape(EMouseCursor::Type InCursorType, void* CursorHandle) override { }
+
+private:
+	bool UpdateCursorClipping(FVector2D& CursorPosition);
+
+	EMouseCursor::Type CurrentType;
+	FVector2D CurrentPosition;
+	FIntRect CursorClipRect;
+	bool bShow;
+};
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidInputInterface.h b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidInputInterface.h
index b5eeb57db331..cbc3c77d99e7 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidInputInterface.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidInputInterface.h
@@ -12,6 +12,7 @@
 #include <android/input.h>
 #include <android/keycodes.h>
 #include <android/api-level.h>
+#include "GenericPlatform/ICursor.h"
 #include "GenericPlatform/IInputInterface.h"
 #include "GenericPlatform/IForceFeedbackSystem.h"
 #include "Math/Vector.h"
@@ -205,7 +206,7 @@ class FAndroidInputInterface : public IForceFeedbackSystem
 {
 public:
 
-	static TSharedRef< FAndroidInputInterface > Create(  const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler );
+	static TSharedRef< FAndroidInputInterface > Create(  const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler, const TSharedPtr< ICursor >& InCursor);
 
 
 public:
@@ -231,6 +232,10 @@ public:
 	static void JoystickAxisEvent(int32 deviceId, int32 axisId, float axisValue);
 	static void JoystickButtonEvent(int32 deviceId, int32 buttonId, bool buttonDown);
 
+	static void MouseMoveEvent(int32 deviceId, float absoluteX, float absoluteY, float deltaX, float deltaY);
+	static void MouseWheelEvent(int32 deviceId, float wheelDelta);
+	static void MouseButtonEvent(int32 deviceId, int32 buttonId, bool buttonDown);
+
 	static void DeferMessage(const FDeferredAndroidMessage& DeferredMessage);
 
 	static void QueueMotionData(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration);
@@ -246,9 +251,11 @@ public:
 
 	virtual void AddExternalInputDevice(TSharedPtr<class IInputDevice> InputDevice);
 
+	const TSharedPtr< ICursor > GetCursor() const { return Cursor; }
+	
 private:
 
-	FAndroidInputInterface( const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler );
+	FAndroidInputInterface( const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler, const TSharedPtr< ICursor >& InCursor);
 
 
 private:
@@ -270,6 +277,25 @@ private:
 		FVector Acceleration;
 	};
 
+	enum MouseEventType
+	{
+		MouseMove,
+		MouseWheel,
+		MouseButtonDown,
+		MouseButtonUp
+	};
+
+	struct MouseData
+	{
+		MouseEventType EventType;
+		EMouseButtons::Type Button;
+		int32 AbsoluteX;
+		int32 AbsoluteY;
+		int32 DeltaX;
+		int32 DeltaY;
+		float WheelDelta;
+	};
+
 	// protects the input stack
 	static FCriticalSection TouchInputCriticalSection;
 
@@ -279,6 +305,9 @@ private:
 	static bool VibeIsOn;
 	static FForceFeedbackValues VibeValues;
 
+	// should we allow controllers to send input
+	static bool bAllowControllers;
+
 	static FAndroidGamepadDeviceMapping DeviceMapping[MAX_NUM_CONTROLLERS];
 
 	static FAndroidControllerData OldControllerData[MAX_NUM_CONTROLLERS];
@@ -294,8 +323,10 @@ private:
 	static int32 DeferredMessageQueueDroppedCount;
 
 	static TArray<MotionData> MotionDataStack;
+	static TArray<MouseData> MouseDataStack;
 
 	TSharedRef< FGenericApplicationMessageHandler > MessageHandler;
+	const TSharedPtr< ICursor > Cursor;
 
 	/** List of input devices implemented in external modules. */
 	TArray<TSharedPtr<class IInputDevice>> ExternalInputDevices;
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplication.h b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplication.h
index 77a50e5f0ce4..d3600eb94780 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplication.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplication.h
@@ -383,10 +383,9 @@ struct FDisplayMetrics
 	/** Logs out display metrics */
 	APPLICATIONCORE_API void PrintToLog() const;
 
-protected:
 	// The title safe zone ratio that will be returned by FDisplayMetrics::GetDisplayMetrics on platforms that don't have a defined safe zone
-	static float GetDebugTitleSafeZoneRatio();
-
+	APPLICATIONCORE_API static float GetDebugTitleSafeZoneRatio();
+protected:
 	// The action safe zone ratio that will be returned by FDisplayMetrics::GetDisplayMetrics on platforms that don't have a defined safe zone
 	static float GetDebugActionSafeZoneRatio();
 
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplicationMessageHandler.h b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplicationMessageHandler.h
index a76cb931b1b8..d9598df39ac1 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplicationMessageHandler.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericApplicationMessageHandler.h
@@ -337,12 +337,24 @@ public:
     {
     }
 
+	DEPRECATED(4.20, "This function signature is deprecated, use OnTouchStarted that takes a Force")
 	virtual bool OnTouchStarted( const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId )
+	{
+		return OnTouchStarted(Window, Location, 1.0f, TouchIndex, ControllerId);
+	}
+
+	virtual bool OnTouchStarted( const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId )
 	{
 		return false;
 	}
 
+	DEPRECATED(4.20, "This function signature is deprecated, use OnTouchMoved that takes a Force")
 	virtual bool OnTouchMoved( const FVector2D& Location, int32 TouchIndex, int32 ControllerId )
+	{
+		return OnTouchMoved(Location, 1.0f, TouchIndex, ControllerId);
+	}
+
+	virtual bool OnTouchMoved( const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId )
 	{
 		return false;
 	}
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericPlatformFramePacer.h b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericPlatformFramePacer.h
index fdec45cf324b..1555fc26c63e 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericPlatformFramePacer.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericPlatformFramePacer.h
@@ -33,4 +33,9 @@ struct APPLICATIONCORE_API FGenericPlatformRHIFramePacer
      * Teardown the Frame Pacer.
      */
     static void Destroy() {}
+	
+	/**
+	 * The pace we are running at (30 = 30fps, 0 = unpaced)
+	 */
+	static uint32 GetFramePace() { return 0; };
 };
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericWindow.h b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericWindow.h
index 22101cce9e59..1030e01c5593 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericWindow.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericWindow.h
@@ -155,6 +155,9 @@ public:
 	/** @return	The definition describing properties of the window */
 	virtual const FGenericWindowDefinition& GetDefinition() const;
 
+	/** @return	Returns true if the window definition is valid */
+	virtual bool IsDefinitionValid() const;
+
 	/** @return	Gives the native window a chance to adjust our stored window size before we cache it off */
 	virtual void AdjustCachedSize( FVector2D& Size ) const;
 
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSAppDelegate.h b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSAppDelegate.h
index 954ba15682ed..cd8976244e43 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSAppDelegate.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSAppDelegate.h
@@ -125,12 +125,16 @@ UITextFieldDelegate>
 
 /** TRUE if the device is playing background music and we want to allow that */
 @property (assign) bool bUsingBackgroundMusic;
+@property (assign) bool bLastOtherAudioPlaying;
 
 - (void)InitializeAudioSession;
-- (void)ToggleAudioSession:(bool)bActive;
+- (void)ToggleAudioSession:(bool)bActive force:(bool)bForce;
 - (bool)IsBackgroundAudioPlaying;
+- (void)EnableVoiceChat:(bool)bEnable;
+- (bool)IsVoiceChatEnabled;
 
 @property (atomic) bool bAudioActive;
+@property (atomic) bool bVoiceChatEnabled;
 
 @property (atomic) bool bIsSuspended;
 @property (atomic) bool bHasSuspended;
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSInputInterface.h b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSInputInterface.h
index 97819a66d21d..fd37a0a81801 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSInputInterface.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSInputInterface.h
@@ -34,6 +34,7 @@ struct TouchInput
 	TouchType Type;
 	FVector2D LastPosition;
 	FVector2D Position;
+	float Force;
 };
 
 /**
@@ -142,6 +143,9 @@ private:
 	// should the tracking use the pad center as the virtual joystick center?
 	bool bUseRemoteAbsoluteDpadValues;
 	
+	// should we allow controllers to send input
+	bool bAllowControllers;
+	
 #if !PLATFORM_TVOS
 	/** Access to the ios devices motion */
 	CMMotionManager* MotionManager;
@@ -168,4 +172,7 @@ private:
 
 	/** When using just acceleration (without full motion) we store a frame of accel data to filter by */
 	FVector FilteredAccelerometer;
+
+	/** Last value sent to mobile haptics */
+	float LastHapticValue;
 };
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSPlatformFramePacer.h b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSPlatformFramePacer.h
index c700cde8bfaf..ad311c0b33ab 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSPlatformFramePacer.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSPlatformFramePacer.h
@@ -25,12 +25,17 @@ struct FIOSPlatformRHIFramePacer : public FGenericPlatformRHIFramePacer
 	static void AddHandler(FIOSFramePacerHandler Handler);
 	static void RemoveHandler(FIOSFramePacerHandler Handler);
     static void Destroy();
+	static uint32 GetFramePace() { return Pace; };
+
     
     /** Access to the IOS Frame Pacer: CADisplayLink */
     static FIOSFramePacer* FramePacer;
     
     /** Number of frames before the CADisplayLink triggers it's readied callback */
     static uint32 FrameInterval;
+	
+	/** Frame rate we are pacing to */
+	static uint32 Pace;
     
     /** Suspend the frame pacer so we can enter the background state */
     static void Suspend();
diff --git a/Engine/Source/Runtime/ApplicationCore/Public/Windows/WindowsApplication.h b/Engine/Source/Runtime/ApplicationCore/Public/Windows/WindowsApplication.h
index cdaa5f122f67..3368aff92546 100644
--- a/Engine/Source/Runtime/ApplicationCore/Public/Windows/WindowsApplication.h
+++ b/Engine/Source/Runtime/ApplicationCore/Public/Windows/WindowsApplication.h
@@ -453,6 +453,8 @@ private:
 
 	bool bForceActivateByMouse;
 
+	bool bForceNoGamepads;
+
 	TArray<FDeferredWindowsMessage> DeferredMessages;
 
 	TArray<FDeferredWindowsDragDropOperation> DeferredDragDropOperations;
diff --git a/Engine/Source/Runtime/AssetRegistry/Private/NameTableArchive.cpp b/Engine/Source/Runtime/AssetRegistry/Private/NameTableArchive.cpp
index f6e3b2ba0ff0..906f11e0e3ec 100644
--- a/Engine/Source/Runtime/AssetRegistry/Private/NameTableArchive.cpp
+++ b/Engine/Source/Runtime/AssetRegistry/Private/NameTableArchive.cpp
@@ -9,7 +9,7 @@ FNameTableArchiveReader::FNameTableArchiveReader(int32 SerializationVersion, con
 	, ProxyAr(nullptr)
 	, FileAr(nullptr)
 {
-	ArIsLoading = true;
+	this->SetIsLoading(true);
 
 	FileAr = IFileManager::Get().CreateFileReader(*Filename, FILEREAD_Silent);
 	if (FileAr && !FileAr->IsError() && FileAr->TotalSize() > 0)
@@ -44,7 +44,7 @@ FNameTableArchiveReader::FNameTableArchiveReader(FArchive& WrappedArchive)
 	, ProxyAr(&WrappedArchive)
 	, FileAr(nullptr)
 {
-	ArIsLoading = true;
+	this->SetIsLoading(true);
 
 	if (!SerializeNameMap())
 	{
@@ -218,7 +218,7 @@ FNameTableArchiveWriter::FNameTableArchiveWriter(int32 SerializationVersion, con
 	, FinalFilename(Filename)
 	, TempFilename(Filename + TEXT(".tmp"))
 {
-	ArIsSaving = true;
+	this->SetIsSaving(true);
 
 	// Save to a temp file first, then move to the destination to avoid corruption
 	FileAr = IFileManager::Get().CreateFileWriter(*TempFilename, 0);
@@ -249,7 +249,7 @@ FNameTableArchiveWriter::FNameTableArchiveWriter(FArchive& WrappedArchive)
 	, ProxyAr(&WrappedArchive)
 	, FileAr(nullptr)
 {
-	ArIsSaving = true;
+	this->SetIsSaving(true);
 
 	// Just write a 0 for the name table offset for now. This will be overwritten later when we are done serializing
 	NameOffsetLoc = Tell();
diff --git a/Engine/Source/Runtime/AssetRegistry/Private/PackageReader.cpp b/Engine/Source/Runtime/AssetRegistry/Private/PackageReader.cpp
index b942883c959f..d62242f4c3f3 100644
--- a/Engine/Source/Runtime/AssetRegistry/Private/PackageReader.cpp
+++ b/Engine/Source/Runtime/AssetRegistry/Private/PackageReader.cpp
@@ -13,8 +13,8 @@ FPackageReader::FPackageReader()
 {
 	Loader = nullptr;
 	PackageFileSize = 0;
-	ArIsLoading		= true;
-	ArIsPersistent	= true;
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
 }
 
 FPackageReader::~FPackageReader()
diff --git a/Engine/Source/Runtime/AssetRegistry/Public/AssetData.h b/Engine/Source/Runtime/AssetRegistry/Public/AssetData.h
index 3a7314c7d2d6..b4e186544789 100644
--- a/Engine/Source/Runtime/AssetRegistry/Public/AssetData.h
+++ b/Engine/Source/Runtime/AssetRegistry/Public/AssetData.h
@@ -465,7 +465,7 @@ inline bool FAssetData::GetTagValue(const FName InTagName, ValueType& OutTagValu
 	if (const FString* FoundValue = TagsAndValues.Find(InTagName))
 	{
 		FMemory::Memzero(&OutTagValue, sizeof(ValueType));
-		Lex::FromString(OutTagValue, **FoundValue);
+		LexFromString(OutTagValue, **FoundValue);
 		return true;
 	}
 	return false;
@@ -496,7 +496,7 @@ inline ValueType FAssetData::GetTagValueRef(const FName InTagName) const
 	FMemory::Memzero(&TmpValue, sizeof(ValueType));
 	if (const FString* FoundValue = TagsAndValues.Find(InTagName))
 	{
-		Lex::FromString(TmpValue, **FoundValue);
+		LexFromString(TmpValue, **FoundValue);
 	}
 	return TmpValue;
 }
diff --git a/Engine/Source/Runtime/AudioMixer/Classes/SubmixEffects/AudioMixerSubmixEffectReverb.h b/Engine/Source/Runtime/AudioMixer/Classes/SubmixEffects/AudioMixerSubmixEffectReverb.h
index ffa1fd7fb3e4..88e1eb39445a 100644
--- a/Engine/Source/Runtime/AudioMixer/Classes/SubmixEffects/AudioMixerSubmixEffectReverb.h
+++ b/Engine/Source/Runtime/AudioMixer/Classes/SubmixEffects/AudioMixerSubmixEffectReverb.h
@@ -63,6 +63,7 @@ struct AUDIOMIXER_API FSubmixEffectReverbSettings
 	FSubmixEffectReverbSettings()
 	: Density(0.85f)
 	, Diffusion(0.85f)
+	, Gain(0.0f)
 	, GainHF(0.89f)
 	, DecayTime(1.49f)
 	, DecayHFRatio(0.83f)
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixer.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixer.cpp
index a1f394edc66d..1a1f3a2c0f2b 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixer.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixer.cpp
@@ -256,6 +256,7 @@ namespace Audio
 				BufferDataPtr[i] = (BufferType)(BufferDataPtr[i] * FadeParam.Update());
 			}
 
+			bFadedOut = (FadeVolume == 0.0f);
 			bPerformingFade = false;
 			AudioFadeEvent->Trigger();
 		}
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerBuffer.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerBuffer.cpp
index d1465a5dc175..0dbd5feac0dd 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerBuffer.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerBuffer.cpp
@@ -320,7 +320,7 @@ namespace Audio
 
 	FMixerBuffer* FMixerBuffer::CreateNativeBuffer(FMixerDevice* InMixer, USoundWave* InWave)
 	{
-		check(InWave->bIsPrecacheDone);
+		check(InWave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 
 		FMixerBuffer* Buffer = new FMixerBuffer(InMixer, InWave, EBufferType::PCM);
 		return Buffer;
@@ -358,7 +358,7 @@ namespace Audio
 	{
 		check(InMixer);
 		check(InWave);
-		check(InWave->bIsPrecacheDone);
+		check(InWave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 
 		// Create a new buffer for real-time sounds
 		FMixerBuffer* Buffer = new FMixerBuffer(InMixer, InWave, EBufferType::PCMRealTime);
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
index bcb5cb5300d4..510aa2dc7add 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerDevice.cpp
@@ -124,6 +124,7 @@ namespace Audio
 			OpenStreamParams.OutputDeviceIndex = AUDIO_MIXER_DEFAULT_DEVICE_INDEX; // TODO: Support overriding which audio device user wants to open, not necessarily default.
 			OpenStreamParams.SampleRate = SampleRate;
 			OpenStreamParams.AudioMixer = this;
+			OpenStreamParams.MaxChannels = GetMaxChannels();
 
 			FString DefaultDeviceName = AudioMixerPlatform->GetDefaultDeviceName();
 
@@ -163,8 +164,11 @@ namespace Audio
 				// Initialize some data that depends on speaker configuration, etc.
 				InitializeChannelAzimuthMap(PlatformInfo.NumChannels);
 
+				// We initialize the number of sources to be 2 times the max channels
+				// This extra source count is used for "stopping sources", which are sources
+				// which are fading out (very quickly) to avoid discontinuities when stopping sounds
 				FSourceManagerInitParams SourceManagerInitParams;
-				SourceManagerInitParams.NumSources = MaxChannels;
+				SourceManagerInitParams.NumSources = GetMaxChannels();
 				SourceManagerInitParams.NumSourceWorkers = 4;
 
 				SourceManager.Init(SourceManagerInitParams);
@@ -210,6 +214,11 @@ namespace Audio
 
 				AudioMixerPlatform->PostInitializeHardware();
 
+				// Initialize the data used for audio thread sub-frame timing.
+				AudioThreadTimingData.StartTime = FPlatformTime::Seconds();
+				AudioThreadTimingData.AudioThreadTime = 0.0;
+				AudioThreadTimingData.AudioRenderThreadTime = 0.0;
+
 				// Start streaming audio
 				return AudioMixerPlatform->StartAudioStream();
 			}
@@ -251,10 +260,20 @@ namespace Audio
 		}
 	}
 
+	void FMixerDevice::UpdateHardwareTiming()
+	{
+		// Get the relative audio thread time (from start of audio engine)
+		// Add some jitter delta to account for any audio thread timing jitter.
+		const double AudioThreadJitterDelta = AudioClockDelta;
+		AudioThreadTimingData.AudioThreadTime = FPlatformTime::Seconds() - AudioThreadTimingData.StartTime + AudioThreadJitterDelta;
+	}
+
 	void FMixerDevice::UpdateHardware()
 	{
 		SourceManager.Update();
 
+		AudioMixerPlatform->OnHardwareUpdate();
+
 		if (AudioMixerPlatform->CheckAudioDeviceChange())
 		{
 			// Get the platform device info we're using
@@ -378,6 +397,9 @@ namespace Audio
 		// This function could be called in a task manager, which means the thread ID may change between calls.
 		ResetAudioRenderingThreadId();
 
+		// Update the audio render thread time at the head of the render
+		AudioThreadTimingData.AudioRenderThreadTime = FPlatformTime::Seconds() - AudioThreadTimingData.StartTime;
+
 		// Pump the command queue to the audio render thread
 		PumpCommandQueue();
 
@@ -393,6 +415,9 @@ namespace Audio
 			MasterSubmix->ProcessAudio(ESubmixChannelFormat::Device, Output);
 		}
 
+		// Reset stopping sounds and clear their state after submixes have been mixed
+		SourceManager.ClearStoppingSounds();
+
 		// Do any debug output performing
 		if (bDebugOutputEnabled)
 		{
@@ -420,10 +445,12 @@ namespace Audio
 	{
 		if (!IsInAudioThread())
 		{
+			DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.InitSoundSubmixes"), STAT_InitSoundSubmixes, STATGROUP_AudioThreadCommands);
+
 			FAudioThread::RunCommandOnAudioThread([this]()
 			{
 				InitSoundSubmixes();
-			});
+			}, GET_STATID(STAT_InitSoundSubmixes));
 			return;
 		}
 
@@ -500,6 +527,7 @@ namespace Audio
 
 				USoundSubmix* MasterReverbSubix = FMixerDevice::MasterSubmixes[EMasterSubmixType::Reverb];
 				USubmixEffectReverbPreset* ReverbPreset = NewObject<USubmixEffectReverbPreset>(MasterReverbSubix, TEXT("Master Reverb Effect Preset"));
+				ReverbPreset->AddToRoot();
 
 				FSoundEffectSubmix* ReverbEffectSubmix = static_cast<FSoundEffectSubmix*>(ReverbPreset->CreateNewEffect());
 
@@ -518,6 +546,7 @@ namespace Audio
 			// Setup the master EQ
 			USoundSubmix* MasterEQSoundSubmix = FMixerDevice::MasterSubmixes[EMasterSubmixType::EQ];
 			USubmixEffectSubmixEQPreset* EQPreset = NewObject<USubmixEffectSubmixEQPreset>(MasterEQSoundSubmix, TEXT("Master EQ Effect preset"));
+			EQPreset->AddToRoot();
 
 			FSoundEffectSubmix* EQEffectSubmix = static_cast<FSoundEffectSubmix*>(EQPreset->CreateNewEffect());
 			EQEffectSubmix->Init(InitData);
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.cpp
index db64c84c7fda..b0983ff7468d 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.cpp
@@ -348,8 +348,16 @@ namespace Audio
 			// Not all wave data types have a non-zero duration
 			if (InWaveInstance->WaveData->Duration > 0)
 			{
-				NumTotalFrames = InWaveInstance->WaveData->Duration * MixerBuffer->GetSampleRate();
-				check(NumTotalFrames > 0);
+				if (!InWaveInstance->WaveData->bIsBus)
+				{
+					NumTotalFrames = InWaveInstance->WaveData->Duration * InWaveInstance->WaveData->GetSampleRateForCurrentPlatform();
+					check(NumTotalFrames > 0);
+				}
+				else if (!InWaveInstance->WaveData->IsLooping())
+				{
+					NumTotalFrames = InWaveInstance->WaveData->Duration * AudioDevice->GetSampleRate();
+					check(NumTotalFrames > 0);
+				}
 			}
 
 			// Set up buffer areas to decompress audio into
@@ -430,32 +438,99 @@ namespace Audio
 			MixerSourceVoice->Play();
 		}
 
+		bIsStopping = false;
 		Paused = false;
 		Playing = true;
 		bBuffersToFlush = false;
 		bLoopCallback = false;
+		bIsFinished = false;
 	}
 
-	void FMixerSource::Stop()
+	void FMixerSource::StopInternal(bool bStopNow)
 	{
-		bInitialized = false;
 		IStreamingManager::Get().GetAudioStreamingManager().RemoveStreamingSoundSource(this);
 
 		if (WaveInstance)
 		{
-			FScopeLock Lock(&RenderThreadCritSect);
+			// We stop procedural sources immediately, since we do not know whether implementations of USoundWaveProcedural will correctly handle delayed stops.
+			const bool bIsProcedural = WaveInstance->WaveData && WaveInstance->WaveData->DecompressionType == DTYPE_Procedural;
 
-			if (MixerSourceVoice && Playing)
+			// If we've finished naturally or we're paused or we're told to immediately stop
+			if (bIsFinished || bIsProcedural || bStopNow || (MixerSourceVoice && MixerSourceVoice->IsPaused()))
 			{
-				MixerSourceVoice->Stop();
+				FScopeLock Lock(&RenderThreadCritSect);
+
+				// Stop immediately stops a sound with no fade
+				if (MixerSourceVoice && Playing)
+				{
+					MixerSourceVoice->Stop();
+				}
+
+				Paused = false;
+				Playing = false;
+				bIsStopping = false;
+
+				FreeResources();
 			}
+			// Otherwise, we need to do a quick fade-out of the sound and put the state
+			// of the sound into "stopping" mode. This prevents this source from
+			// being put into the "free" pool and prevents the source from freeing its resources
+			// until the sound has finished naturally (i.e. faded all the way out)
+			else if (!bIsStopping)
+			{
+				FScopeLock Lock(&RenderThreadCritSect);
 
-			Paused = false;
-			Playing = false;
+				bIsStopping = true;
 
-			FreeResources();
+				// StopFade will stop a sound with a very small fade to avoid discontinuities
+				if (MixerSourceVoice && Playing)
+				{
+					MixerSourceVoice->StopFade();
+				}
+
+				Paused = false;
+			}
 		}
 
+		if (!bIsStopping)
+		{
+			bInitialized = false;
+			FSoundSource::Stop();
+		}
+	}
+
+
+	void FMixerSource::Stop()
+	{
+		StopInternal(false);
+	}
+
+	void FMixerSource::StopNow()
+	{
+		StopInternal(true);
+	}
+
+	void FMixerSource::EnsureStopped()
+	{
+		// Make sure the source finishes its fadeout
+		if (MixerSourceVoice)
+		{
+			MixerSourceVoice->EnsureStopped();
+			bIsStopping = false;
+			check(MixerSourceVoice->IsDone());
+		}
+	}
+
+	void FMixerSource::ReleaseStoppedSound()
+	{
+		// Do state reset and free resources
+		bInitialized = false;
+		Paused = false;
+		Playing = false;
+		bIsStopping = false;
+
+		FreeResources();
+
 		FSoundSource::Stop();
 	}
 
@@ -489,8 +564,9 @@ namespace Audio
 				WaveInstance->NotifyFinished();
 				return true;
 			}
-			// Buses don't do buffer end callbacks, so we need to directly query buses doneness
-			else if (WaveInstance->WaveData->bIsBus)
+			// Buses don't do buffer end callbacks, so we need to directly query doneness. 
+			// Also need to query if we're currently stopping
+			else if (WaveInstance->WaveData->bIsBus || bIsStopping)
 			{
 				if (MixerSourceVoice->IsSourceEffectTailsDone() && MixerSourceVoice->IsDone())
 				{
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.h b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.h
index bdbcd703d0aa..50ed42a94018 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.h
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSource.h
@@ -58,6 +58,10 @@ namespace Audio
 		virtual bool IsPreparedToInit() override;
 		virtual void Play() override;
 		virtual void Stop() override;
+		virtual void StopNow() override;
+		virtual bool IsStopping() override { return bIsStopping; }
+		virtual void EnsureStopped() override;
+		virtual void ReleaseStoppedSound() override;
 		virtual void Pause() override;
 		virtual bool IsFinished() override;
 		virtual FString Describe(bool bUseLongName) override;
@@ -86,6 +90,9 @@ namespace Audio
 			AsynchronousSkipFirstFrame
 		};
 
+		/** Internal stop function. */
+		void StopInternal(bool bStopNow);
+
 		/** Submit the current decoded PCM buffer to the contained source voice. */
 		void SubmitPCMBuffers();
 
@@ -180,6 +187,7 @@ namespace Audio
 
 		FThreadSafeBool bPlayedCachedBuffer;
 		FThreadSafeBool bPlaying;
+		FThreadSafeBool bIsStopping;
 		FThreadSafeBool bLoopCallback;
 		FThreadSafeBool bIsFinished;
 		FThreadSafeBool bIsPlayingEffectTails;
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.cpp
index 88ced3d36fe9..7dd99a425e42 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.cpp
@@ -103,6 +103,7 @@ namespace Audio
 			SourceInfo.CurrentFrameAlpha = 0.0f;
 			SourceInfo.CurrentFrameIndex = 0;
 			SourceInfo.NumFramesPlayed = 0;
+			SourceInfo.StartTime = 0.0;
 			SourceInfo.SubmixSends.Reset();
 			SourceInfo.BusId = INDEX_NONE;
 			SourceInfo.BusDurationFrames = INDEX_NONE;
@@ -122,6 +123,7 @@ namespace Audio
 			SourceInfo.bIsActive = false;
 			SourceInfo.bIsPlaying = false;
 			SourceInfo.bIsPaused = false;
+			SourceInfo.bIsStopping = false;
 			SourceInfo.bIsDone = false;
 			SourceInfo.bIsLastBuffer = false;
 			SourceInfo.bIsBusy = false;
@@ -216,7 +218,7 @@ namespace Audio
 			const int32 NextIndex = !CurrentGameIndex;
 
 			// Make sure we've actually emptied the command queue from the render thread before writing to it
-			check(CommandBuffers[NextIndex].SourceCommandQueue.IsEmpty());
+			check(CommandBuffers[NextIndex].SourceCommandQueue.Num() == 0);
 			AudioThreadCommandBufferIndex.Set(NextIndex);
 			bPumpQueue = true;
 		}
@@ -253,10 +255,6 @@ namespace Audio
 				Buses.Remove(SourceInfo.BusId);
 			}
 		}
-		else
-		{
-			ActiveSourceIds.Remove(SourceId);
-		}
 
 		// Remove this source's send list from the bus data registry
 		for (int32 BusSendType = 0; BusSendType < (int32)EBusSendType::Count; ++BusSendType)
@@ -341,6 +339,7 @@ namespace Audio
 		SourceInfo.CurrentFrameAlpha = 0.0f;
 		SourceInfo.CurrentFrameIndex = 0;
 		SourceInfo.NumFramesPlayed = 0;
+		SourceInfo.StartTime = 0.0;
 		SourceInfo.PostEffectBuffers = nullptr;
 		SourceInfo.bIs3D = false;
 		SourceInfo.bIsCenterChannelOnly = false;
@@ -349,6 +348,7 @@ namespace Audio
 		SourceInfo.bIsDone = true;
 		SourceInfo.bIsLastBuffer = false;
 		SourceInfo.bIsPaused = false;
+		SourceInfo.bIsStopping = false;
 		SourceInfo.bIsBusy = false;
 		SourceInfo.bUseHRTFSpatializer = false;
 		SourceInfo.bUseOcclusionPlugin = false;
@@ -479,6 +479,7 @@ namespace Audio
 
 			SourceInfo.bIsPlaying = false;
 			SourceInfo.bIsPaused = false;
+			SourceInfo.bIsStopping = false;
 			SourceInfo.bIsActive = true;
 			SourceInfo.bIsBusy = true;
 			SourceInfo.bIsDone = false;
@@ -689,16 +690,21 @@ namespace Audio
 		AUDIO_MIXER_CHECK(GameThreadInfo.bIsBusy[SourceId]);
 		AUDIO_MIXER_CHECK_GAME_THREAD(MixerDevice);
 
-		AudioMixerThreadCommand([this, SourceId]()
+		// Compute the frame within which to start the sound based on the current "thread faction" on the audio thread
+		double StartTime = MixerDevice->GetAudioThreadTime();
+
+		AudioMixerThreadCommand([this, SourceId, StartTime]()
 		{
 			AUDIO_MIXER_CHECK_AUDIO_PLAT_THREAD(MixerDevice);
 
 			FSourceInfo& SourceInfo = SourceInfos[SourceId];
-
+			
 			SourceInfo.bIsPlaying = true;
 			SourceInfo.bIsPaused = false;
 			SourceInfo.bIsActive = true;
 
+			SourceInfo.StartTime = StartTime;
+
 			AUDIO_MIXER_DEBUG_LOG(SourceId, TEXT("Is playing"));
 		});
 	}
@@ -719,10 +725,33 @@ namespace Audio
 			SourceInfo.bIsPaused = false;
 			SourceInfo.bIsActive = false;
 
-			AUDIO_MIXER_DEBUG_LOG(SourceId, TEXT("Is stopping"));
+			AUDIO_MIXER_DEBUG_LOG(SourceId, TEXT("Is immediately stopping"));
 		});
 	}
 
+	void FMixerSourceManager::StopFade(const int32 SourceId)
+	{
+		AUDIO_MIXER_CHECK(SourceId < NumTotalSources);
+		AUDIO_MIXER_CHECK(GameThreadInfo.bIsBusy[SourceId]);
+		AUDIO_MIXER_CHECK_GAME_THREAD(MixerDevice);
+
+		AudioMixerThreadCommand([this, SourceId]()
+		{
+			AUDIO_MIXER_CHECK_AUDIO_PLAT_THREAD(MixerDevice);
+
+			FSourceInfo& SourceInfo = SourceInfos[SourceId];
+
+			SourceInfo.bIsPaused = false;
+			SourceInfo.bIsStopping = true;
+
+			// Set the volume to 0.0 on the source. This will naturally interpolate to 0.0 through the output frames
+			SourceInfo.VolumeSourceParam.SetValue(0.0f, NumOutputFrames);
+
+			AUDIO_MIXER_DEBUG_LOG(SourceId, TEXT("Is stopping with fade"));
+		});
+	}
+
+
 	void FMixerSourceManager::Pause(const int32 SourceId)
 	{
 		AUDIO_MIXER_CHECK(SourceId < NumTotalSources);
@@ -765,7 +794,13 @@ namespace Audio
 			AUDIO_MIXER_CHECK_AUDIO_PLAT_THREAD(MixerDevice);
 			check(NumOutputFrames > 0);
 
-			SourceInfos[SourceId].VolumeSourceParam.SetValue(Volume, NumOutputFrames);
+			FSourceInfo& SourceInfo = SourceInfos[SourceId];
+
+			// Only set the volume if we're not stopping. Stopping sources are setting their volume to 0.0.
+			if (!SourceInfo.bIsStopping)
+			{
+				SourceInfo.VolumeSourceParam.SetValue(Volume, NumOutputFrames);
+			}
 		});
 	}
 
@@ -1100,6 +1135,9 @@ namespace Audio
 	{
 		SCOPE_CYCLE_COUNTER(STAT_AudioMixerSourceBuffers);
 
+		const double AudioRenderThreadTime = MixerDevice->GetAudioRenderThreadTime();
+		const double AudioClockDelta = MixerDevice->GetAudioClockDelta();
+
 		for (int32 SourceId = SourceIdStart; SourceId < SourceIdEnd; ++SourceId)
 		{
 			FSourceInfo& SourceInfo = SourceInfos[SourceId];
@@ -1166,70 +1204,81 @@ namespace Audio
 				// Simply copy into the pre distance attenuation buffer ptr
 				FMemory::Memcpy(PreDistanceAttenBufferPtr, BusBufferPtr, sizeof(float) * NumFramesPlayed * SourceInfo.NumInputChannels);
 			}
-			// Otherwise we need to generate source audio using buffer queues and perform SRC
 			else
 			{
-				int32 SampleIndex = 0;
-
-				for (int32 Frame = 0; Frame < NumOutputFrames; ++Frame)
+				// If we're not going to start yet, just continue
+				double StartFraction = (SourceInfo.StartTime - AudioRenderThreadTime) / AudioClockDelta;
+				if (StartFraction >= 1.0)
 				{
-					// If the source is done, then we'll just write out 0s
-					if (!SourceInfo.bIsLastBuffer)
-					{
-						// Whether or not we need to read another sample from the source buffers
-						// If we haven't yet played any frames, then we will need to read the first source samples no matter what
-						bool bReadNextSample = !SourceInfo.bHasStarted;
+					// note this is already zero'd so no need to write zeroes
+					SourceInfo.PitchSourceParam.Reset();
+					continue;
+				}
+				
+				// Init the frame index iterator to 0 (i.e. render whole buffer)
+				int32 StartFrame = 0;
 
-						// Reset that we've started generating audio
-						SourceInfo.bHasStarted = true;
+				// If the start fraction is greater than 0.0 (and is less than 1.0), we are starting on a sub-frame
+				// Otherwise, just start playing it right away
+				if (StartFraction > 0.0)
+				{
+					StartFrame = NumOutputFrames * StartFraction;
+				}
 
-						// Update the PrevFrameIndex value for the source based on alpha value
-						while (SourceInfo.CurrentFrameAlpha >= 1.0f)
-						{
-							// Our inter-frame alpha lerping value is causing us to read new source frames
-							bReadNextSample = true;
+				// Update sample index to the frame we're starting on, accounting for source channels
+				int32 SampleIndex = StartFrame * SourceInfo.NumInputChannels;
+				bool bWriteOutZeros = true;
 
-							// Bump up the current frame index
-							SourceInfo.CurrentFrameIndex++;
-
-							// Bump up the frames played -- this is tracking the total frames in source file played
-							// CurrentFrameIndex can wrap for looping sounds so won't be accurate in that case
-							SourceInfo.NumFramesPlayed++;
-
-							SourceInfo.CurrentFrameAlpha -= 1.0f;
-						}
-
-						// If our alpha parameter caused us to jump to a new source frame, we need
-						// read new samples into our prev and next frame sample data
-						if (bReadNextSample)
-						{
-							ReadSourceFrame(SourceId);
-						}
-					}
-
-					// If we've finished reading all buffer data, then just write out 0s
+				for (int32 Frame = StartFrame; Frame < NumOutputFrames; ++Frame)
+				{
+					// If we've read our last buffer, we're done
 					if (SourceInfo.bIsLastBuffer)
 					{
-						for (int32 Channel = 0; Channel < SourceInfo.NumInputChannels; ++Channel)
-						{
-							PreDistanceAttenBufferPtr[SampleIndex++] = 0.0f;
-						}
+						break;
 					}
-					else
+
+					// Whether or not we need to read another sample from the source buffers
+					// If we haven't yet played any frames, then we will need to read the first source samples no matter what
+					bool bReadNextSample = !SourceInfo.bHasStarted;
+
+					// Reset that we've started generating audio
+					SourceInfo.bHasStarted = true;
+
+					// Update the PrevFrameIndex value for the source based on alpha value
+					while (SourceInfo.CurrentFrameAlpha >= 1.0f)
 					{
-						// perform linear SRC to get the next sample value from the decoded buffer
-						for (int32 Channel = 0; Channel < SourceInfo.NumInputChannels; ++Channel)
-						{
-							const float CurrFrameValue = SourceInfo.CurrentFrameValues[Channel];
-							const float NextFrameValue = SourceInfo.NextFrameValues[Channel];
-							const float CurrentAlpha = SourceInfo.CurrentFrameAlpha;
+						// Our inter-frame alpha lerping value is causing us to read new source frames
+						bReadNextSample = true;
 
-							PreDistanceAttenBufferPtr[SampleIndex++] = FMath::Lerp(CurrFrameValue, NextFrameValue, CurrentAlpha);
-						}
-						const float CurrentPitchScale = SourceInfo.PitchSourceParam.Update();
+						// Bump up the current frame index
+						SourceInfo.CurrentFrameIndex++;
 
-						SourceInfo.CurrentFrameAlpha += CurrentPitchScale;
+						// Bump up the frames played -- this is tracking the total frames in source file played
+						// CurrentFrameIndex can wrap for looping sounds so won't be accurate in that case
+						SourceInfo.NumFramesPlayed++;
+
+						SourceInfo.CurrentFrameAlpha -= 1.0f;
 					}
+
+					// If our alpha parameter caused us to jump to a new source frame, we need
+					// read new samples into our prev and next frame sample data
+					if (bReadNextSample)
+					{
+						ReadSourceFrame(SourceId);
+					}
+
+					// perform linear SRC to get the next sample value from the decoded buffer
+					for (int32 Channel = 0; Channel < SourceInfo.NumInputChannels; ++Channel)
+					{
+						const float CurrFrameValue = SourceInfo.CurrentFrameValues[Channel];
+						const float NextFrameValue = SourceInfo.NextFrameValues[Channel];
+						const float CurrentAlpha = SourceInfo.CurrentFrameAlpha;
+
+						PreDistanceAttenBufferPtr[SampleIndex++] = FMath::Lerp(CurrFrameValue, NextFrameValue, CurrentAlpha);
+					}
+					const float CurrentPitchScale = SourceInfo.PitchSourceParam.Update();
+
+					SourceInfo.CurrentFrameAlpha += CurrentPitchScale;
 				}
 
 				// After processing the frames, reset the pitch param
@@ -1969,25 +2018,44 @@ namespace Audio
 		{		
 			FSourceInfo& SourceInfo = SourceInfos[SourceId];
 
+			// Check for the stopping condition to "turn the sound off"
 			if (SourceInfo.bIsLastBuffer)
 			{
 				SourceInfo.bIsDone = true;
 			}
-			else
-			{
-				SourceInfo.bIsDone = false;
-			}
 
 			GameThreadInfo.bIsDone[SourceId] = SourceInfo.bIsDone;
 			GameThreadInfo.bEffectTailsDone[SourceId] = SourceInfo.bEffectTailsDone;
 		}
 	}
 
+	void FMixerSourceManager::ClearStoppingSounds()
+	{
+		for (int32 SourceId = 0; SourceId < NumTotalSources; ++SourceId)
+		{
+			FSourceInfo& SourceInfo = SourceInfos[SourceId];
+
+			// Check for the stopping condition to "turn the sound off"
+			if (!SourceInfo.bIsDone && SourceInfo.bIsStopping)
+			{
+				const float CurrentVolumeValue = SourceInfo.VolumeSourceParam.GetValue();
+				if (CurrentVolumeValue == 0.0f)
+				{
+					SourceInfo.bIsDone = true;
+					GameThreadInfo.bIsDone[SourceId] = true;
+
+					// Allow any waits to clear if they were waiting on this source to stop
+					MixerSources[SourceId]->NotifyStopped();
+				}
+			}
+		}
+	}
+
 	void FMixerSourceManager::AudioMixerThreadCommand(TFunction<void()> InFunction)
 	{
 		// Add the function to the command queue
 		int32 AudioThreadCommandIndex = AudioThreadCommandBufferIndex.GetValue();
-		CommandBuffers[AudioThreadCommandIndex].SourceCommandQueue.Enqueue(MoveTemp(InFunction));
+		CommandBuffers[AudioThreadCommandIndex].SourceCommandQueue.Add(MoveTemp(InFunction));
 	}
 
 	void FMixerSourceManager::PumpCommandQueue()
@@ -1999,12 +2067,14 @@ namespace Audio
 		FCommands& Commands = CommandBuffers[CurrentRenderThreadIndex];
 
 		// Pop and execute all the commands that came since last update tick
-		TFunction<void()> CommandFunction;
-		while (Commands.SourceCommandQueue.Dequeue(CommandFunction))
+		for (int32 Id = 0; Id < Commands.SourceCommandQueue.Num(); ++Id)
 		{
+			TFunction<void()>& CommandFunction = Commands.SourceCommandQueue[Id];
 			CommandFunction();
 		}
 
+		Commands.SourceCommandQueue.Reset();
+
 		RenderThreadCommandBufferIndex.Set(!CurrentRenderThreadIndex);
 	}
 
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.h b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.h
index 81e0508d9548..456a3c634d63 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.h
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceManager.h
@@ -235,6 +235,7 @@ namespace Audio
 
 		void Play(const int32 SourceId);
 		void Stop(const int32 SourceId);
+		void StopFade(const int32 SourceId);
 		void Pause(const int32 SourceId);
 		void SetPitch(const int32 SourceId, const float Pitch);
 		void SetVolume(const int32 SourceId, const float Volume);
@@ -255,6 +256,7 @@ namespace Audio
 		bool IsEffectTailsDone(const int32 SourceId) const;
 		bool NeedsSpeakerMap(const int32 SourceId) const;
 		void ComputeNextBlockOfSamples();
+		void ClearStoppingSounds();
 		void MixOutputBuffers(const int32 SourceId, const ESubmixChannelFormat InSubmixChannelType, const float SendLevel, AlignedFloatBuffer& OutWetBuffer) const;
 
 		void SetSubmixSendInfo(const int32 SourceId, const FMixerSourceSubmixSend& SubmixSend);
@@ -337,7 +339,7 @@ namespace Audio
 		// A command queue to execute commands from audio thread (or game thread) to audio mixer device thread.
 		struct FCommands
 		{
-			TQueue<TFunction<void()>> SourceCommandQueue;
+			TArray<TFunction<void()>> SourceCommandQueue;
 		};
 
 		FCommands CommandBuffers[2];
@@ -386,6 +388,9 @@ namespace Audio
 			int32 CurrentFrameIndex;
 			int64 NumFramesPlayed;
 
+			// The number of frames to wait before starting the source
+			double StartTime;
+
 			TArray<FMixerSourceSubmixSend> SubmixSends;
 
 			// What bus Id this source is, if it is a bus. This is INDEX_NONE for sources which are not buses.
@@ -433,24 +438,25 @@ namespace Audio
 			FSubmixChannelTypeInfo SubmixChannelInfo[(int32) ESubmixChannelFormat::Count];
 
 			// State management
-			bool bIs3D;
-			bool bIsCenterChannelOnly;
-			bool bIsActive;
-			bool bIsPlaying;
-			bool bIsPaused;
-			bool bHasStarted;
-			bool bIsBusy;
-			bool bUseHRTFSpatializer;
-			bool bUseOcclusionPlugin;
-			bool bUseReverbPlugin;
-			bool bIsDone;
-			bool bIsLastBuffer;
-			bool bOutputToBusOnly;
-			bool bIsVorbis;
-			bool bIsBypassingLPF;
-			bool bIsBypassingHPF;
+			uint8 bIs3D:1;
+			uint8 bIsCenterChannelOnly:1;
+			uint8 bIsActive:1;
+			uint8 bIsPlaying:1;
+			uint8 bIsPaused:1;
+			uint8 bIsStopping:1;
+			uint8 bHasStarted:1;
+			uint8 bIsBusy:1;
+			uint8 bUseHRTFSpatializer:1;
+			uint8 bUseOcclusionPlugin:1;
+			uint8 bUseReverbPlugin:1;
+			uint8 bIsDone:1;
+			uint8 bIsLastBuffer:1;
+			uint8 bOutputToBusOnly:1;
+			uint8 bIsVorbis:1;
+			uint8 bIsBypassingLPF:1;
+			uint8 bIsBypassingHPF:1;
+			uint8 bIsDebugMode:1;
 
-			bool bIsDebugMode;
 			FString DebugName;
 
 			// Source format info
@@ -471,9 +477,6 @@ namespace Audio
 		// Array of source infos.
 		TArray<FSourceInfo> SourceInfos;
 
-		// Array of active source ids
-		TArray<int32> ActiveSourceIds;
-
 		// Map of bus object Id's to bus data. 
 		TMap<uint32, FMixerBus> Buses;
 
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.cpp b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.cpp
index 71fb21d45a41..cb97937fbb5a 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.cpp
@@ -14,11 +14,17 @@ namespace Audio
 
 	FMixerSourceVoice::FMixerSourceVoice()
 	{
+		SourceStoppedEvent = FPlatformProcess::GetSynchEventFromPool();;
+
 		Reset(nullptr);
 	}
 
 	FMixerSourceVoice::~FMixerSourceVoice()
 	{
+		if (SourceStoppedEvent != nullptr)
+		{
+			FPlatformProcess::ReturnSynchEventToPool(SourceStoppedEvent);
+		}
 	}
 
 	void FMixerSourceVoice::Reset(FMixerDevice* InMixerDevice)
@@ -67,6 +73,11 @@ namespace Audio
 				SubmixSends.Add(InitParams.SubmixSends[i].Submix->GetId(), InitParams.SubmixSends[i]);
 			}
 
+			if (SourceStoppedEvent)
+			{
+				SourceStoppedEvent->Reset();
+			}
+
 			SourceManager->InitSource(SourceId, InitParams);
 			return true;
 		}
@@ -167,6 +178,7 @@ namespace Audio
 		bIsPlaying = true;
 		bIsPaused = false;
 		bIsActive = true;
+
 		SourceManager->Play(SourceId);
 	}
 
@@ -180,6 +192,31 @@ namespace Audio
 		SourceManager->Stop(SourceId);
 	}
 
+	void FMixerSourceVoice::StopFade()
+	{
+		AUDIO_MIXER_CHECK_GAME_THREAD(MixerDevice);
+
+		bIsPaused = false;
+		SourceManager->StopFade(SourceId);
+	}
+
+	void FMixerSourceVoice::EnsureStopped()
+	{
+		if (SourceStoppedEvent)
+		{
+			SourceStoppedEvent->Wait();
+		}
+	}
+
+	void FMixerSourceVoice::NotifyStopped()
+	{
+		if (SourceStoppedEvent)
+		{
+			SourceStoppedEvent->Trigger();
+		}
+	}
+
+
 	void FMixerSourceVoice::Pause()
 	{
 		AUDIO_MIXER_CHECK_GAME_THREAD(MixerDevice);
diff --git a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.h b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.h
index 2fd734673624..e54855e77825 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.h
+++ b/Engine/Source/Runtime/AudioMixer/Private/AudioMixerSourceVoice.h
@@ -65,9 +65,18 @@ namespace Audio
 		// Pauses the source voice (i.e. stops generating output but keeps its state as "active and playing". Can be restarted.)
 		void Pause();
 
-		// Stops the source voice (no longer playing or active, can't be restarted.)
+		// Immediately stops the source voice (no longer playing or active, can't be restarted.)
 		void Stop();
 
+		// Does a faded stop (to avoid discontinuity)
+		void StopFade();
+
+		// Makes sure the source has stopped
+		void EnsureStopped();
+
+		// Triggers the stop event
+		void NotifyStopped();
+
 		// Queries if the voice is playing
 		bool IsPlaying() const;
 
@@ -80,6 +89,9 @@ namespace Audio
 		// Queries if the source voice has finished playing all its audio.
 		bool IsDone() const;
 
+		// Queries if the source has finished its fade out.
+		bool IsStopFadedOut() const;
+
 		// Queries if the source ffect tails have finished
 		bool IsSourceEffectTailsDone() const;
 
@@ -105,6 +117,7 @@ namespace Audio
 
 		friend class FMixerSourceManager;
 
+		FEvent* SourceStoppedEvent;
 		FMixerSourceManager* SourceManager;
 		TMap<uint32, FMixerSourceSubmixSend> SubmixSends;
 		FMixerDevice* MixerDevice;
diff --git a/Engine/Source/Runtime/AudioMixer/Private/Components/SynthComponent.cpp b/Engine/Source/Runtime/AudioMixer/Private/Components/SynthComponent.cpp
index 269d300aae87..b5d38ec3e534 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/Components/SynthComponent.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/Components/SynthComponent.cpp
@@ -282,7 +282,9 @@ void USynthComponent::OnUnregister()
 
 bool USynthComponent::IsReadyForOwnerToAutoDestroy() const
 {
-	return !AudioComponent || (AudioComponent && !AudioComponent->IsPlaying());
+	const bool bIsAudioComponentReadyForDestroy = !AudioComponent || (AudioComponent && !AudioComponent->IsPlaying());
+	const bool bIsSynthSoundReadyForDestroy = !Synth || Synth->bIsReadyForDestroy;
+	return bIsAudioComponentReadyForDestroy && bIsSynthSoundReadyForDestroy;
 }
 
 #if WITH_EDITOR
@@ -347,6 +349,12 @@ int32 USynthComponent::OnGeneratePCMAudio(float* GeneratedPCMData, int32 NumSamp
 
 void USynthComponent::Start()
 {
+	// Only need to start if we're not already active
+	if (bIsActive)
+	{
+		return;
+	}
+		
 	// This will try to create the audio component if it hasn't yet been created
 	CreateAudioComponent();
 
diff --git a/Engine/Source/Runtime/AudioMixer/Private/DSP/Filter.cpp b/Engine/Source/Runtime/AudioMixer/Private/DSP/Filter.cpp
index 38d262013159..d6ed37a5b133 100644
--- a/Engine/Source/Runtime/AudioMixer/Private/DSP/Filter.cpp
+++ b/Engine/Source/Runtime/AudioMixer/Private/DSP/Filter.cpp
@@ -5,6 +5,11 @@
 
 namespace Audio
 {
+    float FBiquadFilter::ClampCutoffFrequency(float InCutoffFrequency)
+    {
+        return FMath::Clamp(InCutoffFrequency, 5.0f, SampleRate / 2.0f - 1.0f);
+    }
+    
 	FBiquadFilter::FBiquadFilter()
 		: FilterType(EBiquadFilter::Lowpass)
 		, Biquad(nullptr)
@@ -30,7 +35,7 @@ namespace Audio
 		SampleRate = InSampleRate;
 		NumChannels = InNumChannels;
 		FilterType = InFilterType;
-		Frequency = FMath::Max(InCutoffFrequency, 20.0f);
+        Frequency = ClampCutoffFrequency(InCutoffFrequency);
 		Bandwidth = InBandwidth;
 		GainDB = InGainDB;
 
@@ -73,7 +78,7 @@ namespace Audio
 
 	void FBiquadFilter::SetParams(const EBiquadFilter::Type InFilterType, const float InCutoffFrequency, const float InBandwidth, const float InGainDB)
 	{
-		const float InCutoffFrequencyClamped = FMath::Max(InCutoffFrequency, 20.0f);
+		const float InCutoffFrequencyClamped = ClampCutoffFrequency(InCutoffFrequency);
 
 		if (FilterType != InFilterType ||
 			!FMath::IsNearlyEqual(Frequency, InCutoffFrequencyClamped) ||
@@ -99,7 +104,7 @@ namespace Audio
 
 	void FBiquadFilter::SetFrequency(const float InCutoffFrequency)
 	{
-		const float InCutoffFrequencyClamped = FMath::Max(InCutoffFrequency, 0.0f);
+        const float InCutoffFrequencyClamped = ClampCutoffFrequency(InCutoffFrequency);
 		if (Frequency != InCutoffFrequencyClamped)
 		{
 			Frequency = InCutoffFrequencyClamped;
diff --git a/Engine/Source/Runtime/AudioMixer/Public/AudioMixer.h b/Engine/Source/Runtime/AudioMixer/Public/AudioMixer.h
index 825d1c67c4e2..146a5c217410 100644
--- a/Engine/Source/Runtime/AudioMixer/Public/AudioMixer.h
+++ b/Engine/Source/Runtime/AudioMixer/Public/AudioMixer.h
@@ -171,6 +171,9 @@ namespace Audio
 		/** Whether or not to try and restore audio to this stream if the audio device is removed (and the device becomes available again). */
 		bool bRestoreIfRemoved;
 
+		/* The maximum number of sources we will try to decode or playback at once. */
+		int32 MaxChannels;
+
 		FAudioMixerOpenStreamParams()
 			: OutputDeviceIndex(INDEX_NONE)
 			, NumFrames(1024)
@@ -178,6 +181,7 @@ namespace Audio
 			, AudioMixer(nullptr)
 			, SampleRate(44100)
 			, bRestoreIfRemoved(false)
+			, MaxChannels(32)
 		{}
 	};
 
@@ -410,6 +414,9 @@ namespace Audio
         // Function to resume audio rendering. Used on mobile platforms which can suspend the application.
         virtual void ResumeContext() {}
         
+		// Function called at the beginning of every call of UpdateHardware on the audio thread.
+		virtual void OnHardwareUpdate() {}
+
 	public: // Public Functions
 		//~ Begin FRunnable
 		uint32 Run() override;
@@ -528,8 +535,4 @@ namespace Audio
 		FThreadSafeBool bFadedOut;
 		FThreadSafeBool bIsDeviceInitialized;
 	};
-
-
-
-
 }
diff --git a/Engine/Source/Runtime/AudioMixer/Public/AudioMixerDevice.h b/Engine/Source/Runtime/AudioMixer/Public/AudioMixerDevice.h
index 3e6d74511177..72f4e77a474b 100644
--- a/Engine/Source/Runtime/AudioMixer/Public/AudioMixerDevice.h
+++ b/Engine/Source/Runtime/AudioMixer/Public/AudioMixerDevice.h
@@ -28,6 +28,29 @@ namespace Audio
 		{}
 	};
 
+	/** Data used to schedule events automatically in the audio renderer in audio mixer. */
+	struct FAudioThreadTimingData
+	{
+		/** The time since audio device started. */
+		double StartTime;
+
+		/** The clock of the audio thread, periodically synced to the audio render thread time. */
+		double AudioThreadTime;
+
+		/** The clock of the audio render thread. */
+		double AudioRenderThreadTime;
+
+		/** The current audio thread fraction for audio events relative to the render thread. */
+		double AudioThreadTimeJitterDelta;
+
+		FAudioThreadTimingData()
+			: StartTime(0.0)
+			, AudioThreadTime(0.0)
+			, AudioRenderThreadTime(0.0)
+			, AudioThreadTimeJitterDelta(0.05)
+		{}
+	};
+
 	// Master submixes
 	namespace EMasterSubmixType
 	{
@@ -55,6 +78,7 @@ namespace Audio
 		virtual void FadeIn() override;
 		virtual void FadeOut() override;
 		virtual void TeardownHardware() override;
+		virtual void UpdateHardwareTiming() override;
 		virtual void UpdateHardware() override;
 		virtual double GetAudioTime() const override;
 		virtual FAudioEffectsManager* CreateEffectsManager() override;
@@ -150,6 +174,11 @@ namespace Audio
 		// Retrieves the listener transforms
 		const TArray<FTransform>* GetListenerTransforms();
 
+		// Audio thread tick timing relative to audio render thread timing
+		double GetAudioThreadTime() const { return AudioThreadTimingData.AudioThreadTime; }
+		double GetAudioRenderThreadTime() const { return AudioThreadTimingData.AudioRenderThreadTime; }
+		double GetAudioClockDelta() const { return AudioClockDelta; }
+
 	private:
 		// Resets the thread ID used for audio rendering
 		void ResetAudioRenderingThreadId();
@@ -201,6 +230,9 @@ namespace Audio
 		/** The audio clock from device initialization, updated at block rate. */
 		double AudioClock;
 
+		/** Timing data for audio thread. */
+		FAudioThreadTimingData AudioThreadTimingData;
+
 		/** The platform device info for this mixer device. */
 		FAudioPlatformDeviceInfo PlatformInfo;
 
diff --git a/Engine/Source/Runtime/AudioMixer/Public/DSP/Filter.h b/Engine/Source/Runtime/AudioMixer/Public/DSP/Filter.h
index 3d24dbb129c8..6575728429ba 100644
--- a/Engine/Source/Runtime/AudioMixer/Public/DSP/Filter.h
+++ b/Engine/Source/Runtime/AudioMixer/Public/DSP/Filter.h
@@ -64,6 +64,9 @@ namespace Audio
 		// Function computes biquad coefficients based on current filter settings
 		void CalculateBiquadCoefficients();
 
+        // Function used to clamp the cutoff frequency.
+        float ClampCutoffFrequency(float InCutoffFrequency);
+        
 		// What kind of filter to use when computing coefficients
 		EBiquadFilter::Type FilterType;
 
diff --git a/Engine/Source/Runtime/AudioPlatformConfiguration/Private/AudioCompressionSettings.cpp b/Engine/Source/Runtime/AudioPlatformConfiguration/Private/AudioCompressionSettings.cpp
index c2988f8f8d52..31ff4469cea2 100644
--- a/Engine/Source/Runtime/AudioPlatformConfiguration/Private/AudioCompressionSettings.cpp
+++ b/Engine/Source/Runtime/AudioPlatformConfiguration/Private/AudioCompressionSettings.cpp
@@ -6,6 +6,7 @@ FPlatformRuntimeAudioCompressionOverrides::FPlatformRuntimeAudioCompressionOverr
 	: bOverrideCompressionTimes(false)
 	, DurationThreshold(5.0f)
 	, MaxNumRandomBranches(0)
+	, SoundCueQualityIndex(0)
 {
 	
 }
diff --git a/Engine/Source/Runtime/AutomationMessages/Public/AutomationWorkerMessages.h b/Engine/Source/Runtime/AutomationMessages/Public/AutomationWorkerMessages.h
index e309b0ecdcf1..8aee8cf6f68a 100644
--- a/Engine/Source/Runtime/AutomationMessages/Public/AutomationWorkerMessages.h
+++ b/Engine/Source/Runtime/AutomationMessages/Public/AutomationWorkerMessages.h
@@ -39,7 +39,7 @@ struct FAutomationWorkerFindWorkers
 	FGuid SessionId;
 
 	/** Default constructor. */
-	FAutomationWorkerFindWorkers() { }
+	FAutomationWorkerFindWorkers() : Changelist(0) { }
 
 	/** Creates and initializes a new instance. */
 	FAutomationWorkerFindWorkers(int32 InChangelist, const FString& InGameName, const FString& InProcessName, const FGuid& InSessionId)
@@ -100,7 +100,7 @@ struct FAutomationWorkerFindWorkersResponse
 	FGuid SessionId;
 
 	/** Default constructor. */
-	FAutomationWorkerFindWorkersResponse() { }
+	FAutomationWorkerFindWorkersResponse() : RAMInGB(0) { }
 };
 
 
@@ -158,7 +158,7 @@ struct FAutomationWorkerRequestTests
 	uint32 RequestedTestFlags;
 
 	/** Default constructor. */
-	FAutomationWorkerRequestTests() { }
+	FAutomationWorkerRequestTests() : DeveloperDirectoryIncluded(false), RequestedTestFlags(0) { }
 
 	/** Creates and initializes a new instance. */
 	FAutomationWorkerRequestTests(bool InDeveloperDirectoryIncluded, uint32 InRequestedTestFlags)
@@ -207,7 +207,7 @@ struct FAutomationWorkerSingleTestReply
 	uint32 NumParticipantsRequired;
 
 	/** Default constructor. */
-	FAutomationWorkerSingleTestReply() { }
+	FAutomationWorkerSingleTestReply() : SourceFileLine(0), TestFlags(0), NumParticipantsRequired(0) { }
 
 	/** Creates and initializes a new instance. */
 	FAutomationWorkerSingleTestReply(const FAutomationTestInfo& InTestInfo)
@@ -283,7 +283,7 @@ struct FAutomationWorkerRunTests
 	bool bSendAnalytics;
 
 	/** Default constructor. */
-	FAutomationWorkerRunTests( ) { }
+	FAutomationWorkerRunTests( ) :ExecutionCount(0), RoleIndex(0), bSendAnalytics(false) { }
 
 	/** Creates and initializes a new instance. */
 	FAutomationWorkerRunTests( uint32 InExecutionCount, int32 InRoleIndex, FString InTestName, FString InBeautifiedTestName, bool InSendAnalytics)
@@ -312,7 +312,7 @@ public:
 
 	/** */
 	UPROPERTY(EditAnywhere, Category="Message")
-	TArray<FAutomationEvent> Events;
+	TArray<FAutomationExecutionEntry> Entries;
 
 	UPROPERTY(EditAnywhere, Category="Message")
 	int32 WarningTotal;
@@ -346,7 +346,7 @@ struct FAutomationWorkerRequestNextNetworkCommand
 	uint32 ExecutionCount;
 
 	/** Default constructor. */
-	FAutomationWorkerRequestNextNetworkCommand() { }
+	FAutomationWorkerRequestNextNetworkCommand() : ExecutionCount(0) { }
 
 	/** Creates and initializes a new instance. */
 	FAutomationWorkerRequestNextNetworkCommand(uint32 InExecutionCount)
@@ -375,6 +375,8 @@ public:
 	FString Name;
 	UPROPERTY(EditAnywhere, Category="Message")
 	FString Context;
+	UPROPERTY(EditAnywhere, Category = "Message")
+	FString Notes;
 
 	UPROPERTY(EditAnywhere, Category="Message")
 	FGuid Id;
@@ -463,6 +465,7 @@ public:
 		// Human readable name and associated context the screenshot was taken in.
 		Name = Data.Name;
 		Context = Data.Context;
+		Notes = Data.Notes;
 
 		// Unique Id so we know if this screenshot has already been imported.
 		Id = Data.Id;
@@ -620,11 +623,14 @@ public:
 	FAutomationWorkerImageComparisonResults()
 		: bNew(false)
 		, bSimilar(false)
+		, MaxLocalDifference(0.0)
+		, GlobalDifference(0.0)
 	{
 	}
 
-	FAutomationWorkerImageComparisonResults(bool InIsNew, bool InAreSimilar, double InMaxLocalDifference, double InGlobalDifference, FString InErrorMessage)
-		: bNew(InIsNew)
+	FAutomationWorkerImageComparisonResults(FGuid InUniqueId, bool InIsNew, bool InAreSimilar, double InMaxLocalDifference, double InGlobalDifference, FString InErrorMessage)
+		: UniqueId(InUniqueId)
+		, bNew(InIsNew)
 		, bSimilar(InAreSimilar)
 		, MaxLocalDifference(InMaxLocalDifference)
 		, GlobalDifference(InGlobalDifference)
@@ -632,6 +638,10 @@ public:
 	{
 	}
 
+	/** The unique id for the comparison. */
+	UPROPERTY(EditAnywhere, Category="Message")
+	FGuid UniqueId;
+
 	/** Was this a new image we've never seen before and have no ground truth for? */
 	UPROPERTY(EditAnywhere, Category="Message")
 	bool bNew;
diff --git a/Engine/Source/Runtime/AutomationWorker/Private/AutomationWorkerModule.cpp b/Engine/Source/Runtime/AutomationWorker/Private/AutomationWorkerModule.cpp
index d2304f5d05e9..6ec9ca80982c 100644
--- a/Engine/Source/Runtime/AutomationWorker/Private/AutomationWorkerModule.cpp
+++ b/Engine/Source/Runtime/AutomationWorker/Private/AutomationWorkerModule.cpp
@@ -232,7 +232,7 @@ void FAutomationWorkerModule::ReportTestComplete()
 			Message->ExecutionCount = ExecutionCount;
 			Message->Success = bSuccess;
 			Message->Duration = ExecutionInfo.Duration;
-			Message->Events = ExecutionInfo.GetEvents();
+			Message->Entries = ExecutionInfo.GetEntries();
 			Message->WarningTotal = ExecutionInfo.GetWarningTotal();
 			Message->ErrorTotal = ExecutionInfo.GetErrorTotal();
 
@@ -385,7 +385,15 @@ void FAutomationWorkerModule::HandlePostTestingEvent()
 void FAutomationWorkerModule::HandleScreenShotCompared(const FAutomationWorkerImageComparisonResults& Message, const TSharedRef<IMessageContext, ESPMode::ThreadSafe>& Context)
 {
 	// Image comparison finished.
-	FAutomationTestFramework::Get().NotifyScreenshotComparisonComplete(Message.bNew, Message.bSimilar, Message.MaxLocalDifference, Message.GlobalDifference, Message.ErrorMessage);
+	FAutomationScreenshotCompareResults CompareResults;
+	CompareResults.UniqueId = Message.UniqueId;
+	CompareResults.bWasNew = Message.bNew;
+	CompareResults.bWasSimilar = Message.bSimilar;
+	CompareResults.MaxLocalDifference = Message.MaxLocalDifference;
+	CompareResults.GlobalDifference = Message.GlobalDifference;
+	CompareResults.ErrorMessage = Message.ErrorMessage;
+
+	FAutomationTestFramework::Get().NotifyScreenshotComparisonComplete(CompareResults);
 }
 
 void FAutomationWorkerModule::HandleTestDataRetrieved(const FAutomationWorkerTestDataResponse& Message, const TSharedRef<IMessageContext, ESPMode::ThreadSafe>& Context)
diff --git a/Engine/Source/Runtime/CinematicCamera/Private/CineCameraComponent.cpp b/Engine/Source/Runtime/CinematicCamera/Private/CineCameraComponent.cpp
index c16729d25923..cc91010ed80b 100644
--- a/Engine/Source/Runtime/CinematicCamera/Private/CineCameraComponent.cpp
+++ b/Engine/Source/Runtime/CinematicCamera/Private/CineCameraComponent.cpp
@@ -343,12 +343,15 @@ void UCineCameraComponent::UpdateDebugFocusPlane()
 	{
 		FVector const CamLocation = GetComponentTransform().GetLocation();
 		FVector const CamDir = GetComponentTransform().GetRotation().Vector();
-		FVector const FocusPoint = GetComponentTransform().GetLocation() + CamDir * GetDesiredFocusDistance(CamLocation);
+
+		UWorld const* const World = GetWorld();
+		float const FocusDistance = (World && World->IsGameWorld()) ? CurrentFocusDistance : GetDesiredFocusDistance(CamLocation);		// in editor, use desired focus distance directly, no interp
+		FVector const FocusPoint = GetComponentTransform().GetLocation() + CamDir * FocusDistance;
+
 		DebugFocusPlaneComponent->SetWorldLocation(FocusPoint);
 	}
 }
 
-
 void UCineCameraComponent::UpdateCameraLens(float DeltaTime, FMinimalViewInfo& DesiredView)
 {
 	if (FocusSettings.FocusMethod == ECameraFocusMethod::None)
@@ -416,7 +419,7 @@ void UCineCameraComponent::CreateDebugFocusPlane()
 		{
 			DebugFocusPlaneComponent = NewObject<UStaticMeshComponent>(MyOwner, NAME_None, RF_Transactional | RF_TextExportTransient);
 			DebugFocusPlaneComponent->SetupAttachment(this);
-			DebugFocusPlaneComponent->bIsEditorOnly = true;
+			DebugFocusPlaneComponent->bIsEditorOnly = false;
 			DebugFocusPlaneComponent->SetStaticMesh(FocusPlaneVisualizationMesh);
 			DebugFocusPlaneComponent->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
 			DebugFocusPlaneComponent->bHiddenInGame = false;
diff --git a/Engine/Source/Runtime/ClientPilot/ClientPilot.Build.cs b/Engine/Source/Runtime/ClientPilot/ClientPilot.Build.cs
new file mode 100644
index 000000000000..4bfe1148533a
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/ClientPilot.Build.cs
@@ -0,0 +1,17 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+using UnrealBuildTool;
+
+public class ClientPilot : ModuleRules
+{
+    public ClientPilot(ReadOnlyTargetRules Target) : base(Target)
+    {
+        PrivateDependencyModuleNames.AddRange(
+            new string[] {
+                "Core",
+                "CoreUObject",
+                "InputCore",
+            }
+        );
+    }
+}
diff --git a/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboard.cpp b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboard.cpp
new file mode 100644
index 000000000000..fc753530215c
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboard.cpp
@@ -0,0 +1,66 @@
+#include "ClientPilotBlackboard.h"
+
+void UClientPilotBlackboard::InitializeFromProfile(FString ProfileCategoryAndName)
+{
+
+}
+
+FString UClientPilotBlackboard::GetStringValue(FString KeyName)
+{
+	FString RetVal = TEXT("");
+	if (Blackboard.Contains(KeyName))
+	{
+		RetVal = Blackboard[KeyName];
+	}
+	return RetVal;
+}
+
+FVector UClientPilotBlackboard::GetVectorValue(FString KeyName)
+{
+	FVector RetVal;
+	if (Blackboard.Contains(KeyName))
+	{
+		RetVal.InitFromString(*Blackboard[KeyName]);
+	}
+	return RetVal;
+}
+
+float UClientPilotBlackboard::GetFloatValue(FString KeyName)
+{
+	float RetVal = 0.f;
+	if (Blackboard.Contains(KeyName))
+	{
+		RetVal = FCString::Atof(*Blackboard[KeyName]);
+	}
+	return RetVal;
+}
+
+int UClientPilotBlackboard::GetIntValue(FString KeyName)
+{
+	int RetVal = 0;
+	if (Blackboard.Contains(KeyName))
+	{
+		RetVal = FCString::Atoi(*Blackboard[KeyName]);
+	}
+	return RetVal;
+}
+
+void UClientPilotBlackboard::AddOrUpdateValue(FString KeyName, float Value)
+{
+	Blackboard.Emplace(KeyName, FString::SanitizeFloat(Value));
+}
+
+void UClientPilotBlackboard::AddOrUpdateValue(FString KeyName, int Value)
+{
+	Blackboard.Emplace(KeyName, FString::FromInt(Value));
+}
+
+void UClientPilotBlackboard::AddOrUpdateValue(FString KeyName, FString Value)
+{
+	Blackboard.Emplace(KeyName, Value);
+}
+
+void UClientPilotBlackboard::AddOrUpdateValue(FString KeyName, FVector Value)
+{
+	Blackboard.Emplace(KeyName, Value.ToString());
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboardManager.cpp b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboardManager.cpp
new file mode 100644
index 000000000000..3657a0cb1167
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotBlackboardManager.cpp
@@ -0,0 +1,15 @@
+#include "ClientPilotBlackboardManager.h"
+
+UClientPilotBlackboardManager* UClientPilotBlackboardManager::ObjectInstance = nullptr;
+
+UClientPilotBlackboardManager* UClientPilotBlackboardManager::GetInstance()
+{
+#if !UE_BUILD_SHIPPING
+	if (ObjectInstance == nullptr)
+	{
+		ObjectInstance = NewObject<UClientPilotBlackboardManager>();
+		ObjectInstance->AddToRoot();
+	}
+#endif
+	return ObjectInstance;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClientPilot/Private/ClientPilotComponent.cpp b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotComponent.cpp
new file mode 100644
index 000000000000..1b77fa2560a0
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Private/ClientPilotComponent.cpp
@@ -0,0 +1,20 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "ClientPilotComponent.h"
+#include "Modules/ModuleManager.h"
+
+
+UClientPilotComponent::UClientPilotComponent()
+{
+}
+
+UClientPilotBlackboard* UClientPilotComponent::GetBlackboardInstance()
+{
+	return UClientPilotBlackboardManager::GetInstance() ? UClientPilotBlackboardManager::GetInstance()->PilotBlackboard : nullptr;
+}
+
+void UClientPilotComponent::ThinkAndAct() 
+{
+}
+
+IMPLEMENT_MODULE(FDefaultModuleImpl, ClientPilot);
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboard.h b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboard.h
new file mode 100644
index 000000000000..e2c734d365b6
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboard.h
@@ -0,0 +1,34 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "ClientPilotBlackboard.generated.h"
+
+UCLASS()
+class CLIENTPILOT_API UClientPilotBlackboard : public UObject
+{
+GENERATED_BODY()
+public:
+	virtual void InitializeFromProfile(FString CategoryToUse);
+
+	void AddOrUpdateValue(FString KeyName, float Value);
+	void AddOrUpdateValue(FString KeyName, int Value);
+	void AddOrUpdateValue(FString KeyName, FString Value);
+	void AddOrUpdateValue(FString KeyName, FVector Value);
+
+	FString GetStringValue(FString KeyName);
+	int GetIntValue(FString KeyName);
+	float GetFloatValue(FString KeyName);
+	FVector GetVectorValue(FString KeyName);
+
+	void RemoveKey(FString Key) 
+	{ 
+		Blackboard.Remove(Key);
+	}
+	void ResetBlackboard()
+	{
+		Blackboard.Empty();
+	}
+
+protected:
+	TMap<FString, FString> Blackboard;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboardManager.h b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboardManager.h
new file mode 100644
index 000000000000..0bccf738ac61
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotBlackboardManager.h
@@ -0,0 +1,19 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "ClientPilotBlackboard.h"
+#include "ClientPilotBlackboardManager.generated.h"
+
+
+UCLASS()
+class CLIENTPILOT_API UClientPilotBlackboardManager : public UObject
+{
+GENERATED_BODY()
+protected:
+	static UClientPilotBlackboardManager * ObjectInstance;
+
+public:
+	static UClientPilotBlackboardManager * GetInstance();
+	UPROPERTY()
+	UClientPilotBlackboard* PilotBlackboard;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClientPilot/Public/ClientPilotComponent.h b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotComponent.h
new file mode 100644
index 000000000000..28dab445f6c8
--- /dev/null
+++ b/Engine/Source/Runtime/ClientPilot/Public/ClientPilotComponent.h
@@ -0,0 +1,16 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "ClientPilotBlackboardManager.h"
+#include "ClientPilotComponent.generated.h"
+
+UCLASS()
+class CLIENTPILOT_API UClientPilotComponent : public UObject
+{
+	GENERATED_BODY()
+public:
+	UClientPilotComponent();
+	UClientPilotBlackboard* GetBlackboardInstance();
+	virtual void ThinkAndAct();
+
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClothingSystemRuntime/Private/Assets/ClothingAsset.cpp b/Engine/Source/Runtime/ClothingSystemRuntime/Private/Assets/ClothingAsset.cpp
index 0b8ff38682f2..a1ec83a49fd3 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntime/Private/Assets/ClothingAsset.cpp
+++ b/Engine/Source/Runtime/ClothingSystemRuntime/Private/Assets/ClothingAsset.cpp
@@ -208,15 +208,31 @@ bool UClothingAsset::BindToSkeletalMesh(USkeletalMesh* InSkelMesh, int32 InMeshL
 		}
 	}
 
+	// We have to copy the bone map to verify we don't exceed the maximum while adding the clothing bones
+	TArray<FBoneIndexType> TempBoneMap = OriginalSection.BoneMap;
+
 	for(FName& BoneName : UsedBoneNames)
 	{
 		const int32 BoneIndex = InSkelMesh->RefSkeleton.FindBoneIndex(BoneName);
 
 		if(BoneIndex != INDEX_NONE)
 		{
-			OriginalSection.BoneMap.AddUnique(BoneIndex);
+			TempBoneMap.AddUnique(BoneIndex);
 		}
 	}
+	
+	// Verify number of bones against current capabilities
+	if(TempBoneMap.Num() > FGPUBaseSkinVertexFactory::GetMaxGPUSkinBones())
+	{
+		// Failed to apply as we've exceeded the number of bones we can skin
+		FText Error = FText::Format(LOCTEXT("Error_TooManyBones", "Failed to bind clothing asset {0} LOD{1} as this causes the section to require {2} bones. The maximum per section is currently {3}."), FText::FromString(GetName()), FText::AsNumber(InAssetLodIndex), FText::AsNumber(TempBoneMap.Num()), FText::AsNumber(FGPUBaseSkinVertexFactory::GetMaxGPUSkinBones()));
+		LogAndToastClothingInfo(Error);
+
+		return false;
+	}
+
+	// After verifying copy the new bone map to the section
+	OriginalSection.BoneMap = TempBoneMap;
 
 	// Array of re-import contexts for components using this mesh
 	TIndirectArray<FComponentReregisterContext> ComponentContexts;
@@ -994,37 +1010,6 @@ bool FClothConfig::HasSelfCollision() const
 	return SelfCollisionRadius > 0.0f && SelfCollisionStiffness > 0.0f;
 }
 
-void FClothCollisionData::Reset()
-{
-	Spheres.Reset();
-	SphereConnections.Reset();
-	Convexes.Reset();
-}
-
-void FClothCollisionData::Append(const FClothCollisionData& InOther)
-{
-	const int32 NumSpheresBefore = Spheres.Num();
-	const int32 NumSphereConnectionsBefore = SphereConnections.Num();
-
-	Spheres.Append(InOther.Spheres);
-	SphereConnections.Append(InOther.SphereConnections);
-
-	const int32 NumSphereConnectionsAfter = SphereConnections.Num();
-
-	if(NumSpheresBefore > 0)
-	{
-		// Each connection that was added needs to have its sphere indices increased to match the new spheres that were added
-		for(int32 NewConnectionIndex = NumSphereConnectionsBefore; NewConnectionIndex < NumSphereConnectionsAfter; ++NewConnectionIndex)
-		{
-			FClothCollisionPrim_SphereConnection& Connection = SphereConnections[NewConnectionIndex];
-			Connection.SphereIndices[0] += NumSpheresBefore;
-			Connection.SphereIndices[1] += NumSpheresBefore;
-		}
-	}
-
-	Convexes.Append(InOther.Convexes);
-}
-
 void FClothPhysicalMeshData::Reset(const int32 InNumVerts)
 {
 	Vertices.Reset();
diff --git a/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulation.cpp b/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulation.cpp
index 58eadf536efe..25d3a7609c4a 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulation.cpp
+++ b/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulation.cpp
@@ -8,6 +8,11 @@
 #include "ClothingSystemRuntimeModule.h"
 #include "Assets/ClothingAsset.h"
 
+static TAutoConsoleVariable<float> GClothMaxDeltaTimeTeleportMultiplier(
+	TEXT("p.Cloth.MaxDeltaTimeTeleportMultiplier"),
+	1.5f,
+	TEXT("A multiplier of the MaxPhysicsDelta time at which we will automatically just teleport cloth to its new location\n")
+	TEXT(" default: 1.5"));
 
 DECLARE_CYCLE_STAT(TEXT("Skin Physics Mesh"), STAT_ClothSkinPhysMesh, STATGROUP_Physics);
 
@@ -195,7 +200,14 @@ void FClothingSimulationBase::FillContext(USkeletalMeshComponent* InComponent, f
 
 	BaseContext->DeltaSeconds = FMath::Min(InDeltaTime, MaxPhysicsDelta);
 
-	BaseContext->TeleportMode = InComponent->ClothTeleportMode;
+	if(InDeltaTime > (MaxPhysicsDelta * GClothMaxDeltaTimeTeleportMultiplier.GetValueOnGameThread()))
+	{
+		BaseContext->TeleportMode = EClothingTeleportMode::Teleport;
+	}
+	else
+	{
+		BaseContext->TeleportMode = InComponent->ClothTeleportMode;
+	}	
 
 	BaseContext->MaxDistanceScale = InComponent->GetClothMaxDistanceScale();
 
diff --git a/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulationNv.cpp b/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulationNv.cpp
index 5c1a057d4949..e17a5b7a697f 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulationNv.cpp
+++ b/Engine/Source/Runtime/ClothingSystemRuntime/Private/ClothingSimulationNv.cpp
@@ -558,6 +558,15 @@ void FClothingSimulationNv::Simulate(IClothingSimulationContext* InContext)
 
 		// Push the component position into the actor, this will set up the forces in local space to simulate the movement
 		FTransform RootBoneWorldTransform = RootBoneTransform * NvContext->ComponentToWorld;
+
+		if(bTeleport)
+		{
+			// Due to how NvCloth handles teleports we normally lose the velocity on a teleport. Here we instead teleport to the new location minus one step
+			// of velocity integration, which will preserve the velocity and help us to avoid pops.
+			CurrentCloth->teleportToLocation(U2PVector(RootBoneWorldTransform.GetTranslation()), U2PQuat(RootBoneWorldTransform.GetRotation()));
+			CurrentCloth->ignoreVelocityDiscontinuity();
+		}
+
 		CurrentCloth->setTranslation(U2PVector(RootBoneWorldTransform.GetTranslation()));
 		CurrentCloth->setRotation(U2PQuat(RootBoneWorldTransform.GetRotation()));
 
@@ -570,11 +579,6 @@ void FClothingSimulationNv::Simulate(IClothingSimulationContext* InContext)
 			CurrentCloth->setGravity(U2PVector(Actor.AssetCreatedFrom->ClothConfig.GravityScale * NvContext->WorldGravity));
 		}
 
-		if(bTeleport)
-		{
-			CurrentCloth->clearInertia();
-		}
-
 		Actor.UpdateMotionConstraints(NvContext);
 		
 		{
@@ -651,6 +655,11 @@ void FClothingSimulationNv::Simulate(IClothingSimulationContext* InContext)
 
 		Actor.UpdateWind(NvContext, NvContext->WindVelocity);
 		Actor.UpdateAnimDrive(NvContext);
+
+		// Cache this frames velocity for teleport resolution
+		Actor.LastVelocity = NvContext->DeltaSeconds > 0.0f ? (RootBoneWorldTransform.GetTranslation() - Actor.LastRootTransform.GetTranslation()) / NvContext->DeltaSeconds : FVector(0.0f, 0.0f, 0.0f);
+		// Cache the last root bone transform
+		Actor.LastRootTransform = RootBoneWorldTransform;
 	}
 
 	// Sim
@@ -812,6 +821,7 @@ void FClothingSimulationNv::GetSimulationData(TMap<int32, FClothSimulData>& OutD
 			ClothData.Reset();
 			
 			ClothData.Transform = RootBoneTransform;
+			ClothData.ComponentRelativeTransform = RootBoneTransform.GetRelativeTransform(OwnerTransform);
 
 			nv::cloth::MappedRange<physx::PxVec4> Particles = Actor.LodData[CurrentClothingLod].Cloth->getCurrentParticles();
 			for(uint32 ParticleIdx = 0; ParticleIdx < NumParticles; ++ParticleIdx)
@@ -899,6 +909,20 @@ FBoxSphereBounds FClothingSimulationNv::GetBounds(const USkeletalMeshComponent*
 	const bool bUsingMaster = InOwnerComponent->MasterPoseComponent.IsValid();
 	const USkinnedMeshComponent* ActualComponent = bUsingMaster ? InOwnerComponent->MasterPoseComponent.Get() : InOwnerComponent;
 
+	const TArray<FTransform>& CSTransforms = ActualComponent->GetComponentSpaceTransforms();
+
+	if(CSTransforms.Num() == 0)
+	{
+		const bool bRegistered = ActualComponent->IsRegistered();
+		FString ComponentName = ActualComponent->GetName();
+		USkeletalMesh* CurrentMesh = ActualComponent->SkeletalMesh;
+		FString MeshName = CurrentMesh ? CurrentMesh->GetName() : FString(TEXT("No Mesh"));
+
+		UE_LOG(LogSkeletalMesh, Warning, TEXT("Attempted to calculate clothing bounds for a skeletal mesh that has no component transforms. Registered=%s, Component=%s, Mesh=%s"), bRegistered ? TEXT("True") : TEXT("False"), *ComponentName, *MeshName);
+
+		return CurrentBounds;
+	}
+
 	for(const FClothingActorNv& Actor : Actors)
 	{
 		// Only do this for active actors
@@ -1474,6 +1498,8 @@ FClothingActorNv::FClothingActorNv()
 	, CurrentAnimDriveDamperStiffness(0.0f)
 	, bUseGravityOverride(false)
 	, GravityOverride(0.0f, 0.0f, 0.0f)
+	, LastVelocity(FVector::ZeroVector)
+	, LastRootTransform(FTransform::Identity)
 	, CurrentLodIndex(INDEX_NONE)
 	, bCollisionsDirty(true)
 	, SimDataIndex(INDEX_NONE)
@@ -1481,7 +1507,7 @@ FClothingActorNv::FClothingActorNv()
 	, CurrentSkinnedPositionIndex(0)
 	, PreviousTimestep(0.0f)
 {
-
+	
 }
 
 void FClothingActorNv::SkinPhysicsMesh(FClothingSimulationContextNv* InContext)
diff --git a/Engine/Source/Runtime/ClothingSystemRuntime/Public/Assets/ClothingAsset.h b/Engine/Source/Runtime/ClothingSystemRuntime/Public/Assets/ClothingAsset.h
index 07def8771b00..6013669de955 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntime/Public/Assets/ClothingAsset.h
+++ b/Engine/Source/Runtime/ClothingSystemRuntime/Public/Assets/ClothingAsset.h
@@ -135,6 +135,7 @@ struct FClothVertBoneData
 	GENERATED_BODY()
 
 	FClothVertBoneData()
+		: NumInfluences(0)
 	{
 		FMemory::Memset(BoneIndices, (uint8)INDEX_NONE, sizeof(BoneIndices));
 		FMemory::Memset(BoneWeights, 0, sizeof(BoneWeights));
diff --git a/Engine/Source/Runtime/ClothingSystemRuntime/Public/ClothingSimulationNv.h b/Engine/Source/Runtime/ClothingSystemRuntime/Public/ClothingSimulationNv.h
index 54ec04b8db0b..ad8257286ecd 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntime/Public/ClothingSimulationNv.h
+++ b/Engine/Source/Runtime/ClothingSystemRuntime/Public/ClothingSimulationNv.h
@@ -96,6 +96,10 @@ public:
 	bool bUseGravityOverride;
 	FVector GravityOverride;
 
+	// Cache for previous state for handling teleports
+	FVector LastVelocity;
+	FTransform LastRootTransform;
+
 private:
 
 	// Builds a list of particle velocities given the current simulation state
diff --git a/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Private/ClothingSystemRuntimeTypes.cpp b/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Private/ClothingSystemRuntimeTypes.cpp
new file mode 100644
index 000000000000..0a99837b328b
--- /dev/null
+++ b/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Private/ClothingSystemRuntimeTypes.cpp
@@ -0,0 +1,34 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "ClothingSystemRuntimeTypes.h"
+
+void FClothCollisionData::Reset()
+{
+	Spheres.Reset();
+	SphereConnections.Reset();
+	Convexes.Reset();
+}
+
+void FClothCollisionData::Append(const FClothCollisionData& InOther)
+{
+	const int32 NumSpheresBefore = Spheres.Num();
+	const int32 NumSphereConnectionsBefore = SphereConnections.Num();
+
+	Spheres.Append(InOther.Spheres);
+	SphereConnections.Append(InOther.SphereConnections);
+
+	const int32 NumSphereConnectionsAfter = SphereConnections.Num();
+
+	if(NumSpheresBefore > 0)
+	{
+		// Each connection that was added needs to have its sphere indices increased to match the new spheres that were added
+		for(int32 NewConnectionIndex = NumSphereConnectionsBefore; NewConnectionIndex < NumSphereConnectionsAfter; ++NewConnectionIndex)
+		{
+			FClothCollisionPrim_SphereConnection& Connection = SphereConnections[NewConnectionIndex];
+			Connection.SphereIndices[0] += NumSpheresBefore;
+			Connection.SphereIndices[1] += NumSpheresBefore;
+		}
+	}
+
+	Convexes.Append(InOther.Convexes);
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Public/ClothingSystemRuntimeTypes.h b/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Public/ClothingSystemRuntimeTypes.h
index 35fa87d8c669..cdb37b619ab8 100644
--- a/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Public/ClothingSystemRuntimeTypes.h
+++ b/Engine/Source/Runtime/ClothingSystemRuntimeInterface/Public/ClothingSystemRuntimeTypes.h
@@ -23,6 +23,9 @@ struct FClothSimulData
 
 	// Transform applied per position/normal element when loaded
 	FTransform Transform;
+
+	// Transform relative to the component to update clothing root transform when not ticking clothing but rendering a component
+	FTransform ComponentRelativeTransform;
 };
 
 enum class EClothingTeleportMode : uint8
@@ -89,7 +92,7 @@ struct FClothCollisionPrim_Convex
 };
 
 USTRUCT()
-struct FClothCollisionData
+struct CLOTHINGSYSTEMRUNTIMEINTERFACE_API FClothCollisionData
 {
 	GENERATED_BODY()
 
diff --git a/Engine/Source/Runtime/Core/Core.Build.cs b/Engine/Source/Runtime/Core/Core.Build.cs
index 595607a733e7..98969aefa3ef 100644
--- a/Engine/Source/Runtime/Core/Core.Build.cs
+++ b/Engine/Source/Runtime/Core/Core.Build.cs
@@ -75,7 +75,7 @@ public class Core : ModuleRules
 			AddEngineThirdPartyPrivateStaticDependencies(Target,
 				"zlib"
 				);
-			PublicFrameworks.AddRange(new string[] { "UIKit", "Foundation", "AudioToolbox", "AVFoundation", "GameKit", "StoreKit", "CoreVideo", "CoreMedia", "CoreGraphics", "GameController", "SystemConfiguration" });
+			PublicFrameworks.AddRange(new string[] { "UIKit", "Foundation", "AudioToolbox", "AVFoundation", "GameKit", "StoreKit", "CoreVideo", "CoreMedia", "CoreGraphics", "GameController", "SystemConfiguration", "DeviceCheck" });
 			if (Target.Platform == UnrealTargetPlatform.IOS)
 			{
 				PublicFrameworks.AddRange(new string[] { "CoreMotion", "AdSupport", "WebKit" });
diff --git a/Engine/Source/Runtime/Core/Private/Android/AndroidFile.cpp b/Engine/Source/Runtime/Core/Private/Android/AndroidFile.cpp
index 973c7963bcf5..d2baca8abd0e 100644
--- a/Engine/Source/Runtime/Core/Private/Android/AndroidFile.cpp
+++ b/Engine/Source/Runtime/Core/Private/Android/AndroidFile.cpp
@@ -80,6 +80,8 @@ FString GAndroidAppType;
 FString GFilePathBase;
 // Obb File Path base - setup during load
 FString GOBBFilePathBase;
+// Internal File Direcory Path (for application) - setup during load
+FString GInternalFilePath;
 // External File Direcory Path (for application) - setup during load
 FString GExternalFilePath;
 // External font path base - setup during load
@@ -957,9 +959,8 @@ public:
 			// See <http://developer.android.com/google/play/expansion-files.html>
 			FString OBBDir1 = GOBBFilePathBase + FString(TEXT("/Android/obb/") + GPackageName);
 			FString OBBDir2 = GOBBFilePathBase + FString(TEXT("/obb/") + GPackageName);
-			FString Period = GAndroidAppType.IsEmpty() ? TEXT("") : TEXT(".");
-			FString MainOBBName = FString::Printf(TEXT("main.%d.%s.%s%sobb"), GAndroidPackageVersion, *GPackageName, *GAndroidAppType, *Period);
-			FString PatchOBBName = FString::Printf(TEXT("patch.%d.%s.%s%sobb"), GAndroidPackageVersion, *GPackageName, *GAndroidAppType, *Period);
+			FString MainOBBName = FString::Printf(TEXT("main.%d.%s.obb"), GAndroidPackageVersion, *GPackageName);
+			FString PatchOBBName = FString::Printf(TEXT("patch.%d.%s.obb"), GAndroidPackageVersion, *GPackageName);
 			if (FileExists(*(OBBDir1 / MainOBBName), true))
 			{
 				MountOBB(*(OBBDir1 / MainOBBName));
@@ -1868,9 +1869,10 @@ private:
 #endif
 		if (!AndroidPath.IsEmpty())
 		{
-			if ((AllowLocal && AndroidPath.StartsWith(TEXT("/"))) ||
+			if (AndroidPath.StartsWith(TEXT("/")) ||	// (AllowLocal && AndroidPath.StartsWith(TEXT("/"))) ||		// requiring AllowLocal isn't really useful; system will do permission checks anyway
 				AndroidPath.StartsWith(GFontPathBase) ||
 				AndroidPath.StartsWith(TEXT("/system/etc/")) ||
+				AndroidPath.StartsWith(GInternalFilePath.Left(AndroidPath.Len())) ||
 				AndroidPath.StartsWith(GExternalFilePath.Left(AndroidPath.Len())))
 			{
 				// Absolute paths are only local.
diff --git a/Engine/Source/Runtime/Core/Private/Android/AndroidMemory.cpp b/Engine/Source/Runtime/Core/Private/Android/AndroidMemory.cpp
index b22a3d2d120b..9ad577f3adf1 100644
--- a/Engine/Source/Runtime/Core/Private/Android/AndroidMemory.cpp
+++ b/Engine/Source/Runtime/Core/Private/Android/AndroidMemory.cpp
@@ -39,17 +39,8 @@ static int64 GetNativeHeapAllocatedSize()
 
 void FAndroidPlatformMemory::Init()
 {
-#if ENABLE_LOW_LEVEL_MEM_TRACKER
-	FPlatformMemoryStats Stats = FAndroidPlatformMemory::GetStats();
-	uint64 ProgramSize = Stats.UsedPhysical;
-#endif
-
 	FGenericPlatformMemory::Init();
 
-#if ENABLE_LOW_LEVEL_MEM_TRACKER
-	FLowLevelMemTracker::Get().SetProgramSize(ProgramSize);
-#endif
-
 	const FPlatformMemoryConstants& MemoryConstants = FPlatformMemory::GetConstants();
 	FPlatformMemoryStats MemoryStats = GetStats();
 	UE_LOG(LogInit, Log, TEXT("Memory total: Physical=%.2fMB (%dGB approx) Available=%.2fMB PageSize=%.1fKB"), 
@@ -212,6 +203,32 @@ FPlatformMemoryStats FAndroidPlatformMemory::GetStats()
 	return MemoryStats;
 }
 
+uint64 FAndroidPlatformMemory::GetMemoryUsedFast()
+{
+	// minimal code to get Used memory
+	if (FILE* ProcMemStats = fopen("/proc/self/status", "r"))
+	{
+		while (1)
+		{
+			char LineBuffer[256] = { 0 };
+			char *Line = fgets(LineBuffer, ARRAY_COUNT(LineBuffer), ProcMemStats);
+			if (Line == nullptr)
+			{
+				break;	// eof or an error
+			}
+			else if (strstr(Line, "VmRSS:") == Line)
+			{
+				fclose(ProcMemStats);
+				return AndroidPlatformMemory::GetBytesFromStatusLine(Line);
+			}
+		} 
+		fclose(ProcMemStats);
+	}
+
+	return 0;
+}
+
+
 const FPlatformMemoryConstants& FAndroidPlatformMemory::GetConstants()
 {
 	static FPlatformMemoryConstants MemoryConstants;
@@ -257,6 +274,12 @@ EPlatformMemorySizeBucket FAndroidPlatformMemory::GetMemorySizeBucket()
 
 FMalloc* FAndroidPlatformMemory::BaseAllocator()
 {
+#if ENABLE_LOW_LEVEL_MEM_TRACKER
+	// make sure LLM is using UsedPhysical for program size, instead of Availble-Free
+	FPlatformMemoryStats Stats = FAndroidPlatformMemory::GetStats();
+	FLowLevelMemTracker::Get().SetProgramSize(Stats.UsedPhysical);
+#endif
+
 #if USE_MALLOC_BINNED2
 	return new FMallocBinned2();
 #else
diff --git a/Engine/Source/Runtime/Core/Private/Android/AndroidMisc.cpp b/Engine/Source/Runtime/Core/Private/Android/AndroidMisc.cpp
index 8ab0d9a2c35e..738c8d603f64 100644
--- a/Engine/Source/Runtime/Core/Private/Android/AndroidMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/Android/AndroidMisc.cpp
@@ -15,6 +15,7 @@
 #include <sys/statfs.h>
 #include <sys/syscall.h>
 #include <sched.h>
+#include <jni.h>
 
 #include "Android/AndroidPlatformCrashContext.h"
 #include "HAL/PlatformMallocCrash.h"
@@ -139,7 +140,7 @@ static volatile bool HeadPhonesArePluggedIn = false;
 static FAndroidMisc::FBatteryState CurrentBatteryState;
 
 static FCriticalSection ReceiversLock;
-static struct  
+static struct
 {
 	int		Volume;
 	double	TimeOfChange;
@@ -450,8 +451,14 @@ bool FAndroidMisc::HasPlatformFeature(const TCHAR* FeatureName)
 	return FGenericPlatformMisc::HasPlatformFeature(FeatureName);
 }
 
-bool FAndroidMisc::AllowRenderThread()
+bool FAndroidMisc::UseRenderThread()
 {
+	// if we in general don't want to use the render thread due to commandline, etc, then don't
+	if (!FGenericPlatformMisc::UseRenderThread())
+	{
+		return false;
+	}
+
 	// Check for DisableThreadedRendering CVar from DeviceProfiles config
 	// Any devices in the future that need to disable threaded rendering should be given a device profile and use this CVar
 	const IConsoleVariable *const CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.AndroidDisableThreadedRendering"));
@@ -460,10 +467,10 @@ bool FAndroidMisc::AllowRenderThread()
 		return false;
 	}
 
-	// there is a crash with the nvidia tegra dual core processors namely the optimus 2x and xoom 
+	// there is a crash with the nvidia tegra dual core processors namely the optimus 2x and xoom
 	// when running multithreaded it can't handle multiple threads using opengl (bug)
-	// tested with lg optimus 2x and motorola xoom 
-	// come back and revisit this later 
+	// tested with lg optimus 2x and motorola xoom
+	// come back and revisit this later
 	// https://code.google.com/p/android/issues/detail?id=32636
 	if (FAndroidMisc::GetGPUFamily() == FString(TEXT("NVIDIA Tegra")) && FPlatformMisc::NumberOfCores() <= 2 && FAndroidMisc::GetGLVersion().StartsWith(TEXT("OpenGL ES 2.")))
 	{
@@ -637,7 +644,7 @@ FAndroidMisc::FCPUState& FAndroidMisc::GetCPUState(){
 			CurrentCPUState.Status[n] = 0;
 			CurrentCPUState.PreviousUsage[n] = CurrentCPUState.CurrentUsage[n];
 		}
-		
+
 		while (fgets(Buffer, 100, FileHandle)) {
 #if PLATFORM_64BITS
 			sscanf(Buffer, "%5s %8lu %8lu %8lu %8lu %8lu %8lu %8lu", CurrentCPUState.Name,
@@ -676,7 +683,7 @@ FAndroidMisc::FCPUState& FAndroidMisc::GetCPUState(){
 
 		double WallTime;
 		double CPULoad[CurrentCPUState.CoreCount];
-		CurrentCPUState.AverageUtilization = 0.0; 
+		CurrentCPUState.AverageUtilization = 0.0;
 		for (size_t n = 0; n < CurrentCPUState.CoreCount; n++) {
 			if (CurrentCPUState.CurrentUsage[n].TotalTime <= CurrentCPUState.PreviousUsage[n].TotalTime) {
 				CPULoad[n] = 0;
@@ -696,7 +703,7 @@ FAndroidMisc::FCPUState& FAndroidMisc::GetCPUState(){
 		}
 		CurrentCPUState.AverageUtilization /= (double)CurrentCPUState.CoreCount;
 	}else{
-		FMemory::Memzero(CurrentCPUState);		
+		FMemory::Memzero(CurrentCPUState);
 	}
 	return CurrentCPUState;
 }
@@ -738,7 +745,7 @@ void DefaultCrashHandler(const FAndroidCrashContext& Context)
 			GLog->SetCurrentThreadAsMasterThread();
 			GLog->Flush();
 		}
-		
+
 		if (GWarn)
 		{
 			GWarn->Flush();
@@ -749,7 +756,7 @@ void DefaultCrashHandler(const FAndroidCrashContext& Context)
 /** Global pointer to crash handler */
 void (* GCrashHandlerPointer)(const FGenericCrashContext& Context) = NULL;
 
-const int32 TargetSignals[] = 
+const int32 TargetSignals[] =
 {
 	SIGQUIT, // SIGQUIT is a user-initiated "crash".
 	SIGILL,
@@ -925,6 +932,29 @@ class IPlatformChunkInstall* FAndroidMisc::GetPlatformChunkInstall()
 	return ChunkInstall;
 }
 
+void FAndroidMisc::PrepareMobileHaptics(EMobileHapticsType Type)
+{
+}
+
+void FAndroidMisc::TriggerMobileHaptics()
+{
+	extern void AndroidThunkCpp_Vibrate(int32 Duration);
+	// tiny little vibration
+	AndroidThunkCpp_Vibrate(10);
+}
+
+void FAndroidMisc::ReleaseMobileHaptics()
+{
+
+}
+
+void FAndroidMisc::ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY)
+{
+	extern void AndroidThunkCpp_ShareURL(const FString& URL, const FText& Description, const FText& SharePrompt, int32 LocationHintX, int32 LocationHintY);
+	AndroidThunkCpp_ShareURL(URL, Description, NSLOCTEXT("AndroidMisc", "ShareURL", "Share URL"), LocationHintX, LocationHintY);
+}
+
+
 void FAndroidMisc::SetVersionInfo( FString InAndroidVersion, FString InDeviceMake, FString InDeviceModel, FString InOSLanguage )
 {
 	AndroidVersion = InAndroidVersion;
@@ -1302,12 +1332,12 @@ static EDeviceVulkanSupportStatus AttemptVulkanInit(void* VulkanLib)
 	PFN_vkDestroyInstance vkDestroyInstance = (PFN_vkDestroyInstance)dlsym(VulkanLib, "vkDestroyInstance");
 	PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices = (PFN_vkEnumeratePhysicalDevices)dlsym(VulkanLib, "vkEnumeratePhysicalDevices");
 	PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)dlsym(VulkanLib, "vkGetPhysicalDeviceProperties");
-	
+
 	if (!vkCreateInstance || !vkDestroyInstance || !vkEnumeratePhysicalDevices || !vkGetPhysicalDeviceProperties)
 	{
 		return EDeviceVulkanSupportStatus::NotSupported;
 	}
-		
+
 	// try to create instance to verify driver available
 	VkApplicationInfo App;
 	FMemory::Memzero(App);
@@ -1361,8 +1391,7 @@ static EDeviceVulkanSupportStatus AttemptVulkanInit(void* VulkanLib)
 	return EDeviceVulkanSupportStatus::Supported;
 }
 
-// Test for device vulkan support.
-static void EstablishVulkanDeviceSupport()
+bool FAndroidMisc::HasVulkanDriverSupport()
 {
 // @todo Lumin: this isn't really the best #define to check here - but basically, without JNI and other version checking, we can't safely do it - we'll need
 // non-JNI platforms that support Vulkan to figure out a way to force it (if they want GL + Vulkan support)
@@ -1370,110 +1399,144 @@ static void EstablishVulkanDeviceSupport()
 	VulkanSupport = EDeviceVulkanSupportStatus::NotSupported;
 	VulkanVersionString = TEXT("0.0.0");
 #else
-	// just do this check once
-	check(VulkanSupport == EDeviceVulkanSupportStatus::Uninitialized);
-	// assume no
-	VulkanSupport = EDeviceVulkanSupportStatus::NotSupported;
-	VulkanVersionString = TEXT("0.0.0");
+	// this version does not check for VulkanRHI or disabled by cvars!
+	if (VulkanSupport == EDeviceVulkanSupportStatus::Uninitialized)
 
-	// make sure the Vulkan RHI is compiled in
-	if (FModuleManager::Get().ModuleExists(TEXT("VulkanRHI")))
 	{
-		FPlatformMisc::LowLevelOutputDebugString(TEXT("Testing for Vulkan availability:"));
+		// assume no
+		VulkanSupport = EDeviceVulkanSupportStatus::NotSupported;
+		VulkanVersionString = TEXT("0.0.0");
 
-		// does commandline override (using GL or ES2 for legacy commandlines)
-		bool bForceOpenGL = FParse::Param(FCommandLine::Get(), TEXT("GL")) || FParse::Param(FCommandLine::Get(), TEXT("OpenGL")) || FParse::Param(FCommandLine::Get(), TEXT("ES2"));
-
-		if (!bForceOpenGL)
+		// check for libvulkan.so
+		void* VulkanLib = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
+		if (VulkanLib != nullptr)
 		{
-			// check for libvulkan.so
-			void* VulkanLib = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
-			if (VulkanLib != nullptr)
+			FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan library detected, checking for available driver"));
+
+			// if Nougat, we can check the Vulkan version
+			if (FAndroidMisc::GetAndroidBuildVersion() >= 24)
 			{
-				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan library detected, checking for available driver"));
-
-				// if Nougat, we can check the Vulkan version
-				if (FAndroidMisc::GetAndroidBuildVersion() >= 24)
+				extern int32 AndroidThunkCpp_GetMetaDataInt(const FString& Key);
+				int32 VulkanVersion = AndroidThunkCpp_GetMetaDataInt(TEXT("android.hardware.vulkan.version"));
+				if (VulkanVersion >= UE_VK_API_VERSION)
 				{
-					extern int32 AndroidThunkCpp_GetMetaDataInt(const FString& Key);
-					int32 VulkanVersion = AndroidThunkCpp_GetMetaDataInt(TEXT("android.hardware.vulkan.version"));
-					if (VulkanVersion >= UE_VK_API_VERSION)
-					{
-						// final check, try initializing the instance
-						VulkanSupport = AttemptVulkanInit(VulkanLib);
-					}
-				}
-				else
-				{
-					// otherwise, we need to try initializing the instance
+					// final check, try initializing the instance
 					VulkanSupport = AttemptVulkanInit(VulkanLib);
 				}
-
-				dlclose(VulkanLib);
-
-				if (VulkanSupport == EDeviceVulkanSupportStatus::Supported)
-				{
-					FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI is available, Vulkan capable device detected."));
-				}
-				else
-				{
-					FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan driver NOT available."));
-				}
 			}
 			else
 			{
-				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan library NOT detected."));
+				// otherwise, we need to try initializing the instance
+				VulkanSupport = AttemptVulkanInit(VulkanLib);
+			}
+
+			dlclose(VulkanLib);
+
+			if (VulkanSupport == EDeviceVulkanSupportStatus::Supported)
+			{
+				FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI is available, Vulkan capable device detected."));
+				return true;
+			}
+			else
+			{
+				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan driver NOT available."));
 			}
 		}
 		else
 		{
-			FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI disabled due to command line forcing OpenGL ES."));
+			FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan library NOT detected."));
 		}
 	}
-	else
-	{
-		FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI not present."));
-	}
 #endif
+	return VulkanSupport == EDeviceVulkanSupportStatus::Supported;
+}
+
+// Test for device vulkan support.
+static void EstablishVulkanDeviceSupport()
+{
+	// just do this check once
+	if (VulkanSupport == EDeviceVulkanSupportStatus::Uninitialized)
+	{
+		// this call will initialize VulkanSupport
+		FAndroidMisc::HasVulkanDriverSupport();
+	}
+}
+
+bool FAndroidMisc::IsVulkanAvailable()
+{
+	check(VulkanSupport != EDeviceVulkanSupportStatus::Uninitialized);
+
+	static int CachedVulkanAvailable = -1;
+	if (CachedVulkanAvailable == -1)
+	{
+		CachedVulkanAvailable = 0;
+		if (VulkanSupport == EDeviceVulkanSupportStatus::Supported)
+		{
+			bool bSupportsVulkan = false;
+			GConfig->GetBool(TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings"), TEXT("bSupportsVulkan"), bSupportsVulkan, GEngineIni);
+
+			// @todo Lumin: Double check all this stuff after merging general android Vulkan SM5 from main
+			const bool bSupportsVulkanSM5 = ShouldUseDesktopVulkan();
+
+			const bool bVulkanDisabledCmdLine = FParse::Param(FCommandLine::Get(), TEXT("GL")) || FParse::Param(FCommandLine::Get(), TEXT("OpenGL")) || FParse::Param(FCommandLine::Get(), TEXT("ES2"));
+
+			if (!FModuleManager::Get().ModuleExists(TEXT("VulkanRHI")))
+			{
+				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan not available as VulkanRHI not present."));
+			}
+			else if (!(bSupportsVulkan || bSupportsVulkanSM5))
+			{
+				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan not available as project packaged without bSupportsVulkan or bSupportsVulkanSM5."));
+			}
+			else if (bVulkanDisabledCmdLine)
+			{
+				FPlatformMisc::LowLevelOutputDebugString(TEXT("Vulkan is disabled by a command line option."));
+			}
+			else
+			{
+				CachedVulkanAvailable = 1;
+			}
+		}
+	}
+
+	return CachedVulkanAvailable == 1;
 }
 
 bool FAndroidMisc::ShouldUseVulkan()
 {
 	check(VulkanSupport != EDeviceVulkanSupportStatus::Uninitialized);
-	static int CachedVulkanSupport = -1;
+	static int CachedShouldUseVulkan = -1;
 
-	if (CachedVulkanSupport == -1)
+	if (CachedShouldUseVulkan == -1)
 	{
-		static const auto CVarDisableVulkan = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Android.DisableVulkanSupport"));
-		bool bSupportsVulkan = false;
-		GConfig->GetBool(TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings"), TEXT("bSupportsVulkan"), bSupportsVulkan, GEngineIni);
-		const bool bShouldUseVulkan = (bSupportsVulkan || ShouldUseDesktopVulkan()) && VulkanSupport == EDeviceVulkanSupportStatus::Supported && CVarDisableVulkan->GetValueOnAnyThread() == 0;
-		CachedVulkanSupport = bShouldUseVulkan ? 1 : 0;
+		CachedShouldUseVulkan = 0;
 
-		if (bShouldUseVulkan)
+		static const auto CVarDisableVulkan = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Android.DisableVulkanSupport"));
+
+		const bool bVulkanAvailable = IsVulkanAvailable();
+		const bool bVulkanDisabledCVar = CVarDisableVulkan->GetValueOnAnyThread() == 1;
+
+		if (bVulkanAvailable && !bVulkanDisabledCVar)
 		{
+			CachedShouldUseVulkan = 1;
 			FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI will be used!"));
 		}
 		else
 		{
 			FPlatformMisc::LowLevelOutputDebugString(TEXT("VulkanRHI will NOT be used:"));
-			if(!bSupportsVulkan)
+			if (!bVulkanAvailable)
 			{
-				FPlatformMisc::LowLevelOutputDebugString(TEXT(" ** Vulkan support is disabled in config."));
+				FPlatformMisc::LowLevelOutputDebugString(TEXT(" ** Vulkan support is not available (Driver, RHI or shaders are missing, or disabled by cmdline)"));
 			}
-			if (CVarDisableVulkan->GetValueOnAnyThread() != 0)
+			if (bVulkanDisabledCVar)
 			{
 				FPlatformMisc::LowLevelOutputDebugString(TEXT(" ** Vulkan is disabled via console variable."));
 			}
-			if (VulkanSupport != EDeviceVulkanSupportStatus::Supported)
-			{
-				FPlatformMisc::LowLevelOutputDebugString(TEXT(" ** Vulkan is not support by the device."));
-			}
 			FPlatformMisc::LowLevelOutputDebugString(TEXT("OpenGL ES will be used."));
 		}
 	}
 
-	return CachedVulkanSupport == 1;
+	return CachedShouldUseVulkan == 1;
 }
 
 bool FAndroidMisc::ShouldUseDesktopVulkan()
@@ -1503,27 +1566,70 @@ bool FAndroidMisc::IsDaydreamApplication()
 #endif
 }
 
+static bool bDetectedDebugger = false;
+
+JNI_METHOD void Java_com_epicgames_ue4_GameActivity_nativeSetAndroidStartupState(JNIEnv* jenv, jobject thiz, jboolean bDebuggerAttached)
+{
+	// if Java debugger attached, mark detected (but don't lose previous trigger state)
+	if (bDebuggerAttached)
+	{
+		bDetectedDebugger = true;
+	}
+}
+
 #if !UE_BUILD_SHIPPING
 bool FAndroidMisc::IsDebuggerPresent()
 {
-	bool Result = false;
-#if 0
-	JNIEnv* JEnv = AndroidJavaEnv::GetJavaEnv();
-	if (nullptr != JEnv)
+	extern CORE_API bool GIgnoreDebugger;
+	if (GIgnoreDebugger)
 	{
-		jclass Class = AndroidJavaEnv::FindJavaClass("android/os/Debug");
-		if (nullptr != Class)
-		{
-			// This segfaults for some reason. So this is all disabled for now.
-			jmethodID Method = JEnv->GetStaticMethodID(Class, "isDebuggerConnected", "()Z");
-			if (nullptr != Method)
-			{
-				Result = JEnv->CallStaticBooleanMethod(Class, Method);
-			}
-		}
+		return false;
 	}
-#endif
-	return Result;
+
+	if (bDetectedDebugger)
+	{
+		return true;
+	}
+
+	// If a process is tracing this one then TracerPid in /proc/self/status will
+	// be the id of the tracing process. Use SignalHandler safe functions
+
+	int StatusFile = open("/proc/self/status", O_RDONLY);
+	if (StatusFile == -1)
+	{
+		// Failed - unknown debugger status.
+		return false;
+	}
+
+	char Buffer[256];
+	ssize_t Length = read(StatusFile, Buffer, sizeof(Buffer));
+
+	bool bDebugging = false;
+	const char* TracerString = "TracerPid:\t";
+	const ssize_t LenTracerString = strlen(TracerString);
+	int i = 0;
+
+	while ((Length - i) > LenTracerString)
+	{
+		// TracerPid is found
+		if (strncmp(&Buffer[i], TracerString, LenTracerString) == 0)
+		{
+			// 0 if no process is tracing.
+			bDebugging = Buffer[i + LenTracerString] != '0';
+			break;
+		}
+		++i;
+	}
+
+	close(StatusFile);
+
+	// remember if we detected debugger so we can skip check next time
+	if (bDebugging)
+	{
+		bDetectedDebugger = true;
+	}
+
+	return bDebugging;
 }
 #endif
 
@@ -1625,12 +1731,22 @@ FString FAndroidMisc::GetLoginId()
 	}
 
 	// Check for existing identifier file
+	extern FString GInternalFilePath;
 	extern FString GExternalFilePath;
+	FString InternalLoginIdFilename = GInternalFilePath / TEXT("login-identifier.txt");
+	if (FPaths::FileExists(InternalLoginIdFilename))
+	{
+		if (FFileHelper::LoadFileToString(LoginId, *InternalLoginIdFilename))
+		{
+			return LoginId;
+		}
+	}
 	FString LoginIdFilename = GExternalFilePath / TEXT("login-identifier.txt");
 	if (FPaths::FileExists(LoginIdFilename))
 	{
 		if (FFileHelper::LoadFileToString(LoginId, *LoginIdFilename))
 		{
+			FFileHelper::SaveStringToFile(LoginId, *InternalLoginIdFilename);
 			return LoginId;
 		}
 	}
@@ -1639,7 +1755,7 @@ FString FAndroidMisc::GetLoginId()
 	FGuid DeviceGuid;
 	FPlatformMisc::CreateGuid(DeviceGuid);
 	LoginId = DeviceGuid.ToString();
-	FFileHelper::SaveStringToFile(LoginId, *LoginIdFilename);
+	FFileHelper::SaveStringToFile(LoginId, *InternalLoginIdFilename);
 
 	return LoginId;
 }
@@ -1686,16 +1802,47 @@ bool FAndroidMisc::IsRunningOnBattery()
 	return BatteryState.State == BATTERY_STATE_DISCHARGING;
 }
 
+float FAndroidMisc::GetDeviceTemperatureLevel()
+{
+	return GetBatteryState().Temperature;
+}
+
 bool FAndroidMisc::AreHeadPhonesPluggedIn()
 {
 	return HeadPhonesArePluggedIn;
 }
 
+#define ANDROIDTHUNK_CONNECTION_TYPE_NONE 0
+#define ANDROIDTHUNK_CONNECTION_TYPE_AIRPLANEMODE 1
+#define ANDROIDTHUNK_CONNECTION_TYPE_ETHERNET 2
+#define ANDROIDTHUNK_CONNECTION_TYPE_CELL 3
+#define ANDROIDTHUNK_CONNECTION_TYPE_WIFI 4
+#define ANDROIDTHUNK_CONNECTION_TYPE_WIMAX 5
+#define ANDROIDTHUNK_CONNECTION_TYPE_BLUETOOTH 6
+
+ENetworkConnectionType FAndroidMisc::GetNetworkConnectionType()
+{
+	extern int32 AndroidThunkCpp_GetNetworkConnectionType();
+
+	switch (AndroidThunkCpp_GetNetworkConnectionType())
+	{
+		case ANDROIDTHUNK_CONNECTION_TYPE_NONE:				return ENetworkConnectionType::None;
+		case ANDROIDTHUNK_CONNECTION_TYPE_AIRPLANEMODE:		return ENetworkConnectionType::AirplaneMode;
+		case ANDROIDTHUNK_CONNECTION_TYPE_ETHERNET:			return ENetworkConnectionType::Ethernet;
+		case ANDROIDTHUNK_CONNECTION_TYPE_CELL:				return ENetworkConnectionType::Cell;
+		case ANDROIDTHUNK_CONNECTION_TYPE_WIFI:				return ENetworkConnectionType::WiFi;
+		case ANDROIDTHUNK_CONNECTION_TYPE_WIMAX:			return ENetworkConnectionType::WiMAX;
+		case ANDROIDTHUNK_CONNECTION_TYPE_BLUETOOTH:		return ENetworkConnectionType::Bluetooth;
+	}
+	return ENetworkConnectionType::Unknown;
+}
+
 #if USE_ANDROID_JNI
 bool FAndroidMisc::HasActiveWiFiConnection()
 {
-	extern bool AndroidThunkCpp_HasActiveWiFiConnection();
-	return AndroidThunkCpp_HasActiveWiFiConnection();
+	ENetworkConnectionType ConnectionType = GetNetworkConnectionType();
+	return (ConnectionType == ENetworkConnectionType::WiFi ||
+			ConnectionType == ENetworkConnectionType::WiMAX);
 }
 #endif
 
@@ -1712,7 +1859,7 @@ void FAndroidMisc::SetOnReInitWindowCallback(FAndroidMisc::ReInitWindowCallbackT
 }
 
 FString FAndroidMisc::GetCPUVendor()
-{	
+{
 	return DeviceMake;
 }
 
@@ -1744,7 +1891,7 @@ bool FAndroidMisc::GetDiskTotalAndFreeSpace(const FString& InPath, uint64& Total
 	struct statfs FSStat = { 0 };
 	FTCHARToUTF8 Converter(*GExternalFilePath);
 	int Err = statfs((ANSICHAR*)Converter.Get(), &FSStat);
-	
+
 	if (Err == 0)
 	{
 		TotalNumberOfBytes = FSStat.f_blocks * FSStat.f_bsize;
@@ -1755,7 +1902,7 @@ bool FAndroidMisc::GetDiskTotalAndFreeSpace(const FString& InPath, uint64& Total
 		int ErrNo = errno;
 		UE_LOG(LogAndroid, Warning, TEXT("Unable to statfs('%s'): errno=%d (%s)"), *GExternalFilePath, ErrNo, UTF8_TO_TCHAR(strerror(ErrNo)));
 	}
-	
+
 	return (Err == 0);
 #else
 	return false;
diff --git a/Engine/Source/Runtime/Core/Private/Android/AndroidPlatformStackWalk.cpp b/Engine/Source/Runtime/Core/Private/Android/AndroidPlatformStackWalk.cpp
index 4a4cae41e3e7..08b3ea51526c 100644
--- a/Engine/Source/Runtime/Core/Private/Android/AndroidPlatformStackWalk.cpp
+++ b/Engine/Source/Runtime/Core/Private/Android/AndroidPlatformStackWalk.cpp
@@ -21,6 +21,8 @@ void FAndroidPlatformStackWalk::ProgramCounterToSymbolInfo(uint64 ProgramCounter
 		return;
 	}
 
+	out_SymbolInfo.ProgramCounter = ProgramCounter;
+
 	int32 Status = 0;
 	ANSICHAR* DemangledName = NULL;
 
@@ -50,7 +52,7 @@ void FAndroidPlatformStackWalk::ProgramCounterToSymbolInfo(uint64 ProgramCounter
 	// TODO open libUE4.so from the apk and get the DWARF-2 data.
 	FCStringAnsi::Strcat(out_SymbolInfo.Filename, "Unknown");
 	out_SymbolInfo.LineNumber = 0;
-	
+
 	// Offset of the symbol in the module, eg offset into libUE4.so needed for offline addr2line use.
 	out_SymbolInfo.OffsetInModule = ProgramCounter - (uint64)DylibInfo.dli_fbase;
 
@@ -77,13 +79,19 @@ namespace AndroidStackWalkHelpers
 	{
 		uint32* DepthPtr = (uint32*)InDepthPtr;
 
-		if (*DepthPtr < MaxDepth)
+		// stop if filled the buffer
+		if (*DepthPtr >= MaxDepth)
 		{
-			BackTrace[*DepthPtr] = (uint64)_Unwind_GetIP(Context);
+			return _Unwind_Reason_Code::_URC_END_OF_STACK;
 		}
 
-		(*DepthPtr)++;
-		return (_Unwind_Reason_Code)0;
+		uint64 ip = (uint64)_Unwind_GetIP(Context);
+		if (ip)
+		{
+			BackTrace[*DepthPtr] = ip;
+			(*DepthPtr)++;
+		}
+		return _Unwind_Reason_Code::_URC_NO_REASON;
 	}
 }
 
@@ -117,3 +125,77 @@ uint32 FAndroidPlatformStackWalk::CaptureStackBackTrace(uint64* BackTrace, uint3
 	_Unwind_Backtrace(AndroidStackWalkHelpers::BacktraceCallback, &Depth);
 	return Depth;
 }
+
+bool FAndroidPlatformStackWalk::SymbolInfoToHumanReadableString(const FProgramCounterSymbolInfo& SymbolInfo, ANSICHAR* HumanReadableString, SIZE_T HumanReadableStringSize)
+{
+	const int32 MAX_TEMP_SPRINTF = 256;
+
+	//
+	// Callstack lines should be written in this standard format
+	//
+	//	0xaddress module!func [file]
+	// 
+	// E.g. 0x045C8D01 (0x00009034) OrionClient.self!UEngine::PerformError() [D:\Epic\Orion\Engine\Source\Runtime\Engine\Private\UnrealEngine.cpp:6481]
+	//
+	// Module may be omitted, everything else should be present, or substituted with a string that conforms to the expected type
+	//
+	// E.g 0x00000000 (0x00000000) UnknownFunction []
+	//
+	// 
+	if (HumanReadableString && HumanReadableStringSize > 0)
+	{
+		ANSICHAR StackLine[MAX_SPRINTF] = { 0 };
+
+		// Strip module path.
+		const ANSICHAR* Pos0 = FCStringAnsi::Strrchr(SymbolInfo.ModuleName, '\\');
+		const ANSICHAR* Pos1 = FCStringAnsi::Strrchr(SymbolInfo.ModuleName, '/');
+		const UPTRINT RealPos = FMath::Max((UPTRINT)Pos0, (UPTRINT)Pos1);
+		const ANSICHAR* StrippedModuleName = RealPos > 0 ? (const ANSICHAR*)(RealPos + 1) : SymbolInfo.ModuleName;
+
+		// Start with address
+		ANSICHAR PCAddress[MAX_TEMP_SPRINTF] = { 0 };
+		FCStringAnsi::Snprintf(PCAddress, MAX_TEMP_SPRINTF, "0x%016llX ", SymbolInfo.ProgramCounter);
+		FCStringAnsi::Strncat(StackLine, PCAddress, MAX_SPRINTF);
+		FCStringAnsi::Snprintf(PCAddress, MAX_TEMP_SPRINTF, "(0x%016llX) ", SymbolInfo.OffsetInModule);
+		FCStringAnsi::Strncat(StackLine, PCAddress, MAX_SPRINTF);
+
+		// Module if it's present
+		const bool bHasValidModuleName = FCStringAnsi::Strlen(StrippedModuleName) > 0;
+		if (bHasValidModuleName)
+		{
+			FCStringAnsi::Strncat(StackLine, StrippedModuleName, MAX_SPRINTF);
+			FCStringAnsi::Strncat(StackLine, "!", MAX_SPRINTF);
+		}
+
+		// Function if it's available, unknown if it's not
+		const bool bHasValidFunctionName = FCStringAnsi::Strlen(SymbolInfo.FunctionName) > 0;
+		if (bHasValidFunctionName)
+		{
+			FCStringAnsi::Strncat(StackLine, SymbolInfo.FunctionName, MAX_SPRINTF);
+		}
+		else
+		{
+			FCStringAnsi::Strncat(StackLine, "UnknownFunction", MAX_SPRINTF);
+		}
+
+		// file info
+		const bool bHasValidFilename = FCStringAnsi::Strlen(SymbolInfo.Filename) > 0 && SymbolInfo.LineNumber > 0;
+		if (bHasValidFilename)
+		{
+			ANSICHAR FilenameAndLineNumber[MAX_TEMP_SPRINTF] = { 0 };
+			FCStringAnsi::Snprintf(FilenameAndLineNumber, MAX_TEMP_SPRINTF, " [%s:%i]", SymbolInfo.Filename, SymbolInfo.LineNumber);
+			FCStringAnsi::Strncat(StackLine, FilenameAndLineNumber, MAX_SPRINTF);
+		}
+		else
+		{
+			FCStringAnsi::Strncat(StackLine, " []", MAX_SPRINTF);
+		}
+
+		// Append the stack line.
+		FCStringAnsi::Strncat(HumanReadableString, StackLine, HumanReadableStringSize);
+
+		// Return true, if we have a valid function name.
+		return bHasValidFunctionName;
+	}
+	return false;
+}
diff --git a/Engine/Source/Runtime/Core/Private/Android/AndroidString.cpp b/Engine/Source/Runtime/Core/Private/Android/AndroidString.cpp
index 8b44665f97af..cd14abd92915 100644
--- a/Engine/Source/Runtime/Core/Private/Android/AndroidString.cpp
+++ b/Engine/Source/Runtime/Core/Private/Android/AndroidString.cpp
@@ -63,6 +63,13 @@ int vswprintf( TCHAR *buf, int max, const TCHAR *fmt, va_list args )
 			src++;
 		}
 
+		// Skip modifier flags that don't need additional processing;
+		// they still get passed to snprintf() below based on the conversion.
+		if (*src == '+')
+		{
+			src++;
+		}
+
 		// check for field width requests...
 		if ((*src == '-') || ((*src >= '0') && (*src <= '9')))
 		{
diff --git a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformCrashContext.cpp b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformCrashContext.cpp
index eff520176232..d2eed30c0a26 100644
--- a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformCrashContext.cpp
+++ b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformCrashContext.cpp
@@ -136,17 +136,23 @@ void FApplePlatformCrashContext::WriteLine(int ReportFile, const ANSICHAR* Line)
 void FApplePlatformCrashContext::WriteUTF16String(int ReportFile, const TCHAR* UTFString4BytesChar, uint32 NumChars)
 {
 	check(UTFString4BytesChar != NULL || NumChars == 0);
-	static_assert(sizeof(TCHAR) == 4, "Platform TCHAR is not 4 bytes. Revisit this function.");
+	static_assert(sizeof(TCHAR) == 4 || sizeof(TCHAR) == 2, "Unexpected platform TCHAR size. Revisit this function.");
 	
-	for (uint32 Idx = 0; Idx < NumChars; ++Idx)
-	{
-		write(ReportFile, &UTFString4BytesChar[Idx], 2);
-	}
+    if(sizeof(TCHAR) == 4)
+    {
+        for (uint32 Idx = 0; Idx < NumChars; ++Idx)
+        {
+            write(ReportFile, &UTFString4BytesChar[Idx], 2);
+        }
+    }
+    else // sizeof(TCHAR) == 2
+    {
+        write(ReportFile, UTFString4BytesChar, NumChars * 2);
+    }
 }
 
 void FApplePlatformCrashContext::WriteUTF16String(int ReportFile, const TCHAR* UTFString4BytesChar)
 {
-	static_assert(sizeof(TCHAR) == 4, "Platform TCHAR is not 4 bytes. Revisit this function.");
 	uint32 NumChars = FCString::Strlen(UTFString4BytesChar);
 	WriteUTF16String(ReportFile, UTFString4BytesChar, NumChars);
 }
diff --git a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMemory.cpp b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMemory.cpp
index 0e0fadb337ec..4c3c12006224 100644
--- a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMemory.cpp
+++ b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMemory.cpp
@@ -183,25 +183,11 @@ void FApplePlatformMemory::ConfigureDefaultCFAllocator(void)
 	CFAllocatorSetDefault(Alloc);
 }
 
-#if ENABLE_LOW_LEVEL_MEM_TRACKER
-static uint64 GetProgramSize()
-{
-	uint64 ProgramSize = FApplePlatformMemory::GetStats().UsedPhysical;
-	return ProgramSize;
-}
-#endif
-
 void FApplePlatformMemory::Init()
 {
-#if ENABLE_LOW_LEVEL_MEM_TRACKER
-    FPlatformMemoryStats Stats = FApplePlatformMemory::GetStats();
-    uint64 ProgramSize = Stats.UsedPhysical;
-#endif
-    
 	FGenericPlatformMemory::Init();
-	
-	LLM(FLowLevelMemTracker::Get().SetProgramSize(GetProgramSize()));
-	
+    
+
 	const FPlatformMemoryConstants& MemoryConstants = FPlatformMemory::GetConstants();
 	UE_LOG(LogInit, Log, TEXT("Memory total: Physical=%.1fGB (%dGB approx) Pagefile=%.1fGB Virtual=%.1fGB"),
 		   float(MemoryConstants.TotalPhysical/1024.0/1024.0/1024.0),
@@ -215,9 +201,12 @@ void FApplePlatformMemory::Init()
 
 FMalloc* FApplePlatformMemory::BaseAllocator()
 {
-	LLM(GetProgramSize());
+#if ENABLE_LOW_LEVEL_MEM_TRACKER
+	FPlatformMemoryStats MemStats = FApplePlatformMemory::GetStats();
+	FLowLevelMemTracker::Get().SetProgramSize(MemStats.UsedPhysical);
+#endif
 	LLM(AppleLLM::Initialise());
-	
+
 	if (FORCE_ANSI_ALLOCATOR)
 	{
 		AllocatorToUse = EMemoryAllocatorToUse::Ansi;
@@ -324,6 +313,14 @@ const FPlatformMemoryConstants& FApplePlatformMemory::GetConstants()
 	return MemoryConstants;
 }
 
+uint64 FApplePlatformMemory::GetMemoryUsedFast()
+{
+	mach_task_basic_info_data_t TaskInfo;
+	mach_msg_type_number_t TaskInfoCount = MACH_TASK_BASIC_INFO_COUNT;
+	task_info( mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&TaskInfo, &TaskInfoCount );
+	return TaskInfo.resident_size;
+}
+
 bool FApplePlatformMemory::PageProtect(void* const Ptr, const SIZE_T Size, const bool bCanRead, const bool bCanWrite)
 {
 	int32 ProtectMode;
@@ -353,6 +350,11 @@ void* FApplePlatformMemory::BinnedAllocFromOS( SIZE_T Size )
     return FGenericPlatformMemory::BinnedAllocFromOS(Size);
 #else
     void* Ptr = mmap(nullptr, Size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+    if (Ptr == (void*)-1)
+    {
+        UE_LOG(LogTemp, Warning, TEXT("mmap failure allocating %d, error code: %d"), Size, errno);
+        Ptr = nullptr;
+    }
     LLM(FLowLevelMemTracker::Get().OnLowLevelAlloc(ELLMTracker::Platform, Ptr, Size));
     return Ptr;
 #endif // USE_MALLOC_BINNED2
diff --git a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMisc.cpp b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMisc.cpp
index 34b144b7320a..789a708cce6a 100644
--- a/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/Apple/ApplePlatformMisc.cpp
@@ -22,7 +22,7 @@ void FApplePlatformMisc::GetEnvironmentVariable(const TCHAR* VariableName, TCHAR
 	ANSICHAR *AnsiResult = getenv(TCHAR_TO_ANSI(*FixedVariableName));
 	if (AnsiResult)
 	{
-		wcsncpy(Result, ANSI_TO_TCHAR(AnsiResult), ResultLength);
+		FCString::Strncpy(Result, ANSI_TO_TCHAR(AnsiResult), ResultLength);
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/Core/Private/Async/TaskGraph.cpp b/Engine/Source/Runtime/Core/Private/Async/TaskGraph.cpp
index 152859f4dbbb..7836d9470666 100644
--- a/Engine/Source/Runtime/Core/Private/Async/TaskGraph.cpp
+++ b/Engine/Source/Runtime/Core/Private/Async/TaskGraph.cpp
@@ -37,7 +37,7 @@ DEFINE_STAT(STAT_ParallelForTask);
 
 static int32 GNumWorkerThreadsToIgnore = 0;
 
-#if (PLATFORM_XBOXONE || PLATFORM_PS4 || PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_UNIX || PLATFORM_SWITCH) && !IS_PROGRAM && WITH_ENGINE && !UE_SERVER
+#if (PLATFORM_XBOXONE || PLATFORM_PS4 || PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_UNIX || PLATFORM_SWITCH || PLATFORM_ANDROID) && !IS_PROGRAM && WITH_ENGINE && !UE_SERVER
 	#define CREATE_HIPRI_TASK_THREADS (1)
 	#define CREATE_BACKGROUND_TASK_THREADS (1)
 #else
@@ -715,6 +715,7 @@ public:
 
 		if (ThreadToStart >= 0)
 		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_TaskGraph_EnqueueFromOtherThread_Trigger);
 			checkThreadGraph(ThreadToStart == 0);
 			TASKGRAPH_SCOPE_CYCLE_COUNTER(1, STAT_TaskGraph_EnqueueFromOtherThread_Trigger);
 			Queue(QueueIndex).StallRestartEvent->Trigger();
@@ -832,6 +833,7 @@ public:
 
 	virtual void WakeUp() final override
 	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_TaskGraph_Wakeup_Trigger);
 		TASKGRAPH_SCOPE_CYCLE_COUNTER(1, STAT_TaskGraph_Wakeup_Trigger);
 		Queue.StallRestartEvent->Trigger();
 	}
@@ -1208,10 +1210,11 @@ public:
 					Priority = ENamedThreads::NormalThreadPriority >> ENamedThreads::ThreadPriorityShift; // we don't have hi priority threads, demote to normal
 					TaskPriority = ENamedThreads::HighTaskPriority >> ENamedThreads::TaskPriorityShift; // promote to hi task pri
 				}
+				uint32 PriIndex = TaskPriority ? 0 : 1;
 				check(Priority >= 0 && Priority < MAX_THREAD_PRIORITIES);
 				{
 					TASKGRAPH_SCOPE_CYCLE_COUNTER(4, STAT_TaskGraph_QueueTask_IncomingAnyThreadTasks_Push);
-					int32 IndexToStart = IncomingAnyThreadTasks[Priority].Push(Task, TaskPriority);
+					int32 IndexToStart = IncomingAnyThreadTasks[Priority].Push(Task, PriIndex);
 					if (IndexToStart >= 0)
 					{
 						StartTaskThread(Priority, IndexToStart);
diff --git a/Engine/Source/Runtime/Core/Private/Containers/String.cpp b/Engine/Source/Runtime/Core/Private/Containers/String.cpp
index 60ba472df289..6370fca9bb02 100644
--- a/Engine/Source/Runtime/Core/Private/Containers/String.cpp
+++ b/Engine/Source/Runtime/Core/Private/Containers/String.cpp
@@ -1488,7 +1488,7 @@ int32 FindMatchingClosingParenthesis(const FString& TargetString, const int32 St
 	return INDEX_NONE;
 }
 
-FString SlugStringForValidName(const FString& DisplayString)
+FString SlugStringForValidName(const FString& DisplayString, const TCHAR* ReplaceWith /*= TEXT("")*/)
 {
 	FString GeneratedName = DisplayString;
 
@@ -1498,7 +1498,7 @@ FString SlugStringForValidName(const FString& DisplayString)
 		for ( int32 BadCharacterIndex = 0; BadCharacterIndex < ARRAY_COUNT(INVALID_OBJECTNAME_CHARACTERS) - 1; ++BadCharacterIndex )
 		{
 			const TCHAR TestChar[2] = { INVALID_OBJECTNAME_CHARACTERS[BadCharacterIndex], 0 };
-			const int32 NumReplacedChars = GeneratedName.ReplaceInline(TestChar, TEXT(""));
+			const int32 NumReplacedChars = GeneratedName.ReplaceInline(TestChar, ReplaceWith);
 		}
 	}
 
diff --git a/Engine/Source/Runtime/Core/Private/FramePro/FramePro.cpp b/Engine/Source/Runtime/Core/Private/FramePro/FramePro.cpp
index d6dc54949a0a..93971652bbd2 100644
--- a/Engine/Source/Runtime/Core/Private/FramePro/FramePro.cpp
+++ b/Engine/Source/Runtime/Core/Private/FramePro/FramePro.cpp
@@ -3385,7 +3385,7 @@ namespace FramePro
 		uint64 m_OSThreadId;
 
 // START EPIC
-		#if !FRAMEPRO_WIN_BASED_PLATFORM
+		#if !FRAMEPRO_WIN_BASED_PLATFORM && !FRAMEPRO_UE4_BASED_PLATFORM
 // END EPIC
 
 			static int m_NewThreadId;
@@ -7076,7 +7076,7 @@ namespace FramePro
 {
 	//------------------------------------------------------------------------
 // START EPIC
-	#if !FRAMEPRO_WIN_BASED_PLATFORM
+	#if !FRAMEPRO_WIN_BASED_PLATFORM && !FRAMEPRO_UE4_BASED_PLATFORM
 // END EPIC
 		int FrameProTLS::m_NewThreadId = 1;
 	#endif
@@ -7118,7 +7118,9 @@ namespace FramePro
 		,m_SendCallstacks(false)
 #endif
 	{
-		#if FRAMEPRO_WIN_BASED_PLATFORM
+// START EPIC
+		#if FRAMEPRO_WIN_BASED_PLATFORM || FRAMEPRO_UE4_BASED_PLATFORM
+// END EPIC
 			m_ThreadId = (int)m_OSThreadId;
 		#else
 			m_ThreadId = m_NewThreadId++;
diff --git a/Engine/Source/Runtime/Core/Private/FramePro/FrameProProfiler.cpp b/Engine/Source/Runtime/Core/Private/FramePro/FrameProProfiler.cpp
index c04234ebcbbe..490e4bfc75a4 100644
--- a/Engine/Source/Runtime/Core/Private/FramePro/FrameProProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/FramePro/FrameProProfiler.cpp
@@ -23,6 +23,13 @@ static FAutoConsoleVariableRef CVarVerboseScriptStats(
 	ECVF_Default
 );
 
+#if PLATFORM_TCHAR_IS_CHAR16
+#define FP_TEXT_PASTE(x) L ## x
+#define WTEXT(x) FP_TEXT_PASTE(x)
+#else
+#define WTEXT TEXT
+#endif
+
 /** One entry in timer scope stack */
 struct FFrameProProfilerScope
 {
@@ -47,7 +54,8 @@ struct FFrameProProfilerScope
 
 	FORCEINLINE void BeginScope(const TCHAR* Text)
 	{
-		StatStringId = FramePro::RegisterString(Text);
+
+		StatStringId = FramePro::RegisterString(TCHAR_TO_WCHAR(Text));
 		FRAMEPRO_GET_CLOCK_COUNT(StartTime);
 	}
 
@@ -97,7 +105,7 @@ public:
 		int64 EndTime;
 		FRAMEPRO_GET_CLOCK_COUNT(EndTime);
 
-		StatStringId = FramePro::RegisterString(Override);
+		StatStringId = FramePro::RegisterString(TCHAR_TO_WCHAR(Override));
 
 		EndScopeImpl(EndTime);
 	}
@@ -120,8 +128,11 @@ class FFrameProProfilerContext : public TThreadSingleton<FFrameProProfilerContex
 		{
 			ThreadName = FThreadManager::Get().GetThreadName(ThreadId);
 		}
-		
-		FramePro::SetThreadName(TCHAR_TO_ANSI(*ThreadName));
+
+		if (ThreadName.Len())
+		{
+			FramePro::SetThreadName(TCHAR_TO_ANSI(*ThreadName));
+		}
 	}
 	
 	/** Array that represents thread of scopes */
@@ -236,18 +247,23 @@ void FFrameProProfiler::FrameStart()
 	{
 		UE_LOG(LogFramePro, Log, TEXT("FramePro Support Available"));
 
-		FramePro::SendSessionInfo(TEXT(""), *FString::Printf(TEXT("%d"), FEngineVersion::Current().GetChangelist()));
+		FramePro::SendSessionInfo(WTEXT(""), *FString::Printf(TEXT("%d"), FEngineVersion::Current().GetChangelist()));
 
-		FRAMEPRO_THREAD_ORDER(TEXT("GameThread"));
-		FRAMEPRO_THREAD_ORDER(TEXT("RenderThread"));
-		FRAMEPRO_THREAD_ORDER(TEXT("RenderThread 2"));
-		FRAMEPRO_THREAD_ORDER(TEXT("RenderThread 3"));
-		FRAMEPRO_THREAD_ORDER(TEXT("RenderThread 7"));
-		FRAMEPRO_THREAD_ORDER(TEXT("TaskGraphThreadNP 0"));
-		FRAMEPRO_THREAD_ORDER(TEXT("TaskGraphThreadNP 1"));
-		FRAMEPRO_THREAD_ORDER(TEXT("TaskGraphThreadNP 2"));
-		FRAMEPRO_THREAD_ORDER(TEXT("TaskGraphThreadNP 3"));
-		FRAMEPRO_THREAD_ORDER(TEXT("AudioThread"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("GameThread"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 1"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 2"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 3"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 4"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 5"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 6"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RenderThread 7"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("RHIThread"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("TaskGraphThreadNP 0"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("TaskGraphThreadNP 1"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("TaskGraphThreadNP 2"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("TaskGraphThreadNP 3"));
+		FRAMEPRO_THREAD_ORDER(WTEXT("AudioThread"));
 
 		bFirstFrame = false;
 	}
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformCrashContext.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformCrashContext.cpp
index 33e70ec43fb7..fd6bfef7cd8d 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformCrashContext.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformCrashContext.cpp
@@ -17,6 +17,7 @@
 #include "Misc/App.h"
 #include "Misc/EngineVersion.h"
 #include "Misc/EngineBuildSettings.h"
+#include "Stats/Stats.h"
 
 #ifndef NOINITCRASHREPORTER
 #define NOINITCRASHREPORTER 0
@@ -178,6 +179,8 @@ void FGenericCrashContext::Initialize()
 	const float PollingInterval = 1.0f;
 	FTicker::GetCoreTicker().AddTicker( FTickerDelegate::CreateLambda( []( float DeltaTime )
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_NCachedCrashContextProperties_LambdaTicker);
+
 		NCachedCrashContextProperties::SecondsSinceStart = int32(FPlatformTime::Seconds() - GStartTime);
 		return true;
 	} ), PollingInterval );
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMemory.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMemory.cpp
index aca3e51ebb12..641aff5d9c0d 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMemory.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMemory.cpp
@@ -18,6 +18,7 @@
 #include "Misc/CoreDelegates.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/CommandLine.h"
+#include "Misc/MessageDialog.h"
 
 #if PLATFORM_UNIX || PLATFORM_MAC || PLATFORM_IOS
 	#include <sys/mman.h>
@@ -73,6 +74,8 @@ struct FGenericStatsUpdater
 	/** Gathers and sets all platform memory statistics into the corresponding stats. */
 	static void DoUpdateStats()
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FGenericStatsUpdater_DoUpdateStats);
+
 		// This is slow, so do it on the task graph.
 		FPlatformMemoryStats MemoryStats = FPlatformMemory::GetStats();
 		SET_MEMORY_STAT( STAT_TotalPhysical, MemoryStats.TotalPhysical );
@@ -474,11 +477,13 @@ EPlatformMemorySizeBucket FGenericPlatformMemory::GetMemorySizeBucket()
 		bCalculatedBucket = true;
 
 		// get values for this platform from it's .ini
-		int32 LargestMemoryGB=0, LargerMemoryGB=0, DefaultMemoryGB=0, SmallerMemoryGB=0;
+		int32 LargestMemoryGB=0, LargerMemoryGB=0, DefaultMemoryGB=0, SmallerMemoryGB=0,SmallestMemoryGB=0,TiniestMemoryGB=0;
 		GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("LargestMemoryBucket_MinGB"), LargestMemoryGB, GEngineIni);
 		GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("LargerMemoryBucket_MinGB"), LargerMemoryGB, GEngineIni);
 		GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("DefaultMemoryBucket_MinGB"), DefaultMemoryGB, GEngineIni);
 		GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("SmallerMemoryBucket_MinGB"), SmallerMemoryGB, GEngineIni);
+		GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("SmallestMemoryBucket_MinGB"), SmallestMemoryGB, GEngineIni);
+        GConfig->GetInt(TEXT("PlatformMemoryBuckets"), TEXT("TiniestMemoryBucket_MinGB"), TiniestMemoryGB, GEngineIni);
 
 		FPlatformMemoryStats Stats = FPlatformMemory::GetStats();
 
@@ -497,10 +502,14 @@ EPlatformMemorySizeBucket FGenericPlatformMemory::GetMemorySizeBucket()
 			{
 				Bucket = EPlatformMemorySizeBucket::Smaller;
 			}
-			else
+			else if (CurMemoryGB >= SmallestMemoryGB)
 			{
 				Bucket = EPlatformMemorySizeBucket::Smallest;
 			}
+            else
+            {
+                Bucket = EPlatformMemorySizeBucket::Tiniest;
+            }
 		}
 		if (DefaultMemoryGB > 0 && CurMemoryGB >= DefaultMemoryGB)
 		{
@@ -521,7 +530,8 @@ EPlatformMemorySizeBucket FGenericPlatformMemory::GetMemorySizeBucket()
 			Bucket = (EPlatformMemorySizeBucket)BucketOverride;
 		}
 
-		const TCHAR* BucketName = Bucket == EPlatformMemorySizeBucket::Smallest ? TEXT("Smallest") :
+        const TCHAR* BucketName = Bucket == EPlatformMemorySizeBucket::Tiniest ? TEXT("Tiniest") :
+            Bucket == EPlatformMemorySizeBucket::Smallest ? TEXT("Smallest") :
 			Bucket == EPlatformMemorySizeBucket::Smaller ? TEXT("Smaller") :
 			Bucket == EPlatformMemorySizeBucket::Default ? TEXT("Default") :
 			Bucket == EPlatformMemorySizeBucket::Larger ? TEXT("Larger") :
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp
index ecfa640971f2..544862c6e6e5 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp
@@ -27,6 +27,8 @@
 #include "GenericPlatform/GenericPlatformCrashContext.h"
 #include "GenericPlatform/GenericPlatformDriver.h"
 #include "ProfilingDebugging/ExternalProfiler.h"
+#include "HAL/LowLevelMemTracker.h"
+#include "Templates/Function.h"
 
 #include "Misc/UProjectInfo.h"
 #include "Internationalization/Culture.h"
@@ -179,6 +181,39 @@ FString FSHA256Signature::ToString() const
 	return LocalHashStr;
 }
 
+/* ENetworkConnectionType interface
+ *****************************************************************************/
+
+    const TCHAR* LexToString( ENetworkConnectionType Target )
+    {
+        switch (Target)
+        {
+            case ENetworkConnectionType::None:
+                return TEXT("None");
+                
+            case ENetworkConnectionType::AirplaneMode:
+                return TEXT("AirplaneMode");
+                
+            case ENetworkConnectionType::Cell:
+                return TEXT("Cell");
+                
+            case ENetworkConnectionType::WiFi:
+                return TEXT("WiFi");
+                
+            case ENetworkConnectionType::Ethernet:
+                return TEXT("Ethernet");
+                
+			case ENetworkConnectionType::Bluetooth:
+				return TEXT("Bluetooth");
+
+			case ENetworkConnectionType::WiMAX:
+				return TEXT("WiMAX");
+
+			default:
+                return TEXT("Unknown");
+        }
+    }
+
 /* FGenericPlatformMisc interface
  *****************************************************************************/
 
@@ -359,17 +394,19 @@ void FGenericPlatformMisc::RaiseException(uint32 ExceptionCode)
 
 void FGenericPlatformMisc::BeginNamedEvent(const struct FColor& Color, const ANSICHAR* Text)
 {
+#if UE_EXTERNAL_PROFILING_ENABLED
 	//If there's an external profiler attached, trigger its scoped event.
 	FExternalProfiler* CurrentProfiler = FActiveExternalProfilerBase::GetActiveProfiler();
-
 	if (CurrentProfiler != NULL)
 	{
 		CurrentProfiler->StartScopedEvent(ANSI_TO_TCHAR(Text));
 	}
+#endif
 }
 
 void FGenericPlatformMisc::BeginNamedEvent(const struct FColor& Color, const TCHAR* Text)
 {
+#if UE_EXTERNAL_PROFILING_ENABLED
 	//If there's an external profiler attached, trigger its scoped event.
 	FExternalProfiler* CurrentProfiler = FActiveExternalProfilerBase::GetActiveProfiler();
 
@@ -377,10 +414,12 @@ void FGenericPlatformMisc::BeginNamedEvent(const struct FColor& Color, const TCH
 	{
 		CurrentProfiler->StartScopedEvent(Text);
 	}
+#endif
 }
 
 void FGenericPlatformMisc::EndNamedEvent()
 {
+#if UE_EXTERNAL_PROFILING_ENABLED
 	//If there's an external profiler attached, trigger its scoped event.
 	FExternalProfiler* CurrentProfiler = FActiveExternalProfilerBase::GetActiveProfiler();
 
@@ -388,6 +427,7 @@ void FGenericPlatformMisc::EndNamedEvent()
 	{
 		CurrentProfiler->EndScopedEvent();
 	}
+#endif
 }
 
 bool FGenericPlatformMisc::SetStoredValue(const FString& InStoreId, const FString& InSectionName, const FString& InKeyName, const FString& InValue)
@@ -480,7 +520,9 @@ void FGenericPlatformMisc::SetUTF8Output()
 
 void FGenericPlatformMisc::LocalPrint( const TCHAR* Str )
 {
-#if PLATFORM_USE_LS_SPEC_FOR_WIDECHAR
+#if PLATFORM_TCHAR_IS_CHAR16
+	printf("%s", TCHAR_TO_UTF8(Str));
+#elif PLATFORM_USE_LS_SPEC_FOR_WIDECHAR
 	printf("%ls", Str);
 #else
 	wprintf(TEXT("%s"), Str);
@@ -899,11 +941,55 @@ const TCHAR* FGenericPlatformMisc::GetDefaultDeviceProfileName()
 	return TEXT("Default");
 }
 
+float FGenericPlatformMisc::GetDeviceTemperatureLevel()
+{
+	return -1.0f;
+}
+
 void FGenericPlatformMisc::SetOverrideProjectDir(const FString& InOverrideDir)
 {
 	OverrideProjectDir = InOverrideDir;
 }
 
+bool FGenericPlatformMisc::UseRenderThread()
+{
+	// look for disabling commandline options (-onethread is old-school, here for compatibility with people's brains)
+	if (FParse::Param(FCommandLine::Get(), TEXT("norenderthread")) || FParse::Param(FCommandLine::Get(), TEXT("onethread")))
+	{
+		return false;
+	}
+
+	// single core devices shouldn't use it (unless that platform overrides this function - maybe RT could be required?)
+	if (FPlatformMisc::NumberOfCoresIncludingHyperthreads() < 2)
+	{
+		return false;
+	}
+
+	// if the platform doesn't allow threading at all, we really can't use it
+	if (FPlatformProcess::SupportsMultithreading() == false)
+	{
+		return false;
+	}
+
+	// dedicated servers should not use a rendering thread
+	if (IsRunningDedicatedServer())
+	{
+		return false;
+	}
+
+
+#if ENABLE_LOW_LEVEL_MEM_TRACKER
+	// disable rendering thread when LLM wants to so that memory is attributer better
+	if (FLowLevelMemTracker::Get().ShouldReduceThreads())
+	{
+		return false;
+	}
+#endif
+
+	// allow if not overridden
+	return true;
+}
+
 bool FGenericPlatformMisc::AllowThreadHeartBeat()
 {
 	if (FParse::Param(FCommandLine::Get(), TEXT("noheartbeatthread")))
@@ -1103,3 +1189,13 @@ void FGenericPlatformMisc::UnregisterForRemoteNotifications()
 {
 	// not implemented by default
 }
+
+void FGenericPlatformMisc::RequestDeviceCheckToken(TFunction<void(const TArray<uint8>&)> QueryCompleteFunc)
+{
+	// not implemented by default
+}
+
+TArray<FChunkTagID> FGenericPlatformMisc::GetOnDemandChunkTagIDs()
+{
+	return TArray<FChunkTagID>();
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformOutputDevices.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformOutputDevices.cpp
index 9aef25e08fba..aa91383f602d 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformOutputDevices.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformOutputDevices.cpp
@@ -121,7 +121,12 @@ class FOutputDevice* FGenericPlatformOutputDevices::GetLog()
 #endif // WITH_LOGGING_TO_MEMORY
 			if (!LogDevice)
 			{
-				LogDevice = MakeUnique<FOutputDeviceFile>();
+#if (!UE_BUILD_SHIPPING) || PRESERVE_LOG_BACKUPS_IN_SHIPPING
+				const bool bDisableBackup = false;
+#else
+				const bool bDisableBackup = true;
+#endif
+				LogDevice = MakeUnique<FOutputDeviceFile>(nullptr, bDisableBackup);
 			}
 		}
 
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformTime.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformTime.cpp
index 03ec24ca5011..4835410cd056 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformTime.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformTime.cpp
@@ -7,6 +7,7 @@
 #include "Delegates/IDelegateInstance.h"
 #include "Containers/Ticker.h"
 #include "HAL/IConsoleManager.h"
+#include "Stats/Stats.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogGenericPlatformTime, Log, All);
 
@@ -207,6 +208,8 @@ protected:
 	/** Retrieves the current CPU time. */
 	bool OnAddCPUTime( float /*DeltaTime*/ )
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FCPUTimeDump_OnAddCPUTime);
+
 		const FCPUTime CPUTime = FPlatformTime::GetCPUTime();
 		CPUTimes.Add( CPUTime );
 		return true;
@@ -215,6 +218,8 @@ protected:
 	/** Prints the average CPU time from the last n frames. */
 	bool OnCPUTimeDump( float /*DeltaTime*/ )
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FCPUTimeDump_OnCPUTimeDump);
+
 		FCPUTime TotalCPUTime(0.0f,0.0f);
 		const int32 NumCPUTimes = CPUTimes.Num();
 		for( int32 Nx = 0; Nx < NumCPUTimes; ++Nx )
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp
new file mode 100644
index 000000000000..4f56ec429cd5
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp
@@ -0,0 +1,553 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "GenericPlatform/GenericWidePlatformString.h"
+#include "HAL/UnrealMemory.h"
+#include "Templates/UnrealTemplate.h"
+#include "Logging/LogCategory.h"
+#include "Logging/LogMacros.h"
+
+#if PLATFORM_TCHAR_IS_CHAR16
+
+DEFINE_LOG_CATEGORY_STATIC(LogStandardPlatformString, Log, All);
+
+WIDECHAR* FGenericWidePlatformString::Strcpy(WIDECHAR* Dest, SIZE_T DestCount, const WIDECHAR* Src)
+{
+	TCHAR *BufPtr = Dest;
+	
+	while (*Src && --DestCount)
+	{
+		*BufPtr++ = *Src++;
+	}
+	
+	*BufPtr = 0;
+	
+	return Dest;
+}
+
+WIDECHAR* FGenericWidePlatformString::Strncpy(WIDECHAR* Dest, const WIDECHAR* Src, SIZE_T MaxLen)
+{
+	TCHAR *BufPtr = Dest;
+	
+	// the spec says that strncpy should fill the buffer with zeroes
+	// we break the spec by enforcing a trailing zero, so we do --MaxLen instead of MaxLen--
+	bool bFillWithZero = false;
+	while (--MaxLen)
+	{
+		if (bFillWithZero)
+		{
+			*BufPtr++ = 0;
+		}
+		else
+		{
+			if (*Src == 0)
+			{
+				bFillWithZero = true;
+			}
+			*BufPtr++ = *Src++;
+		}
+	}
+	
+	// always have trailing zero
+	*BufPtr = 0;
+	
+	return Dest;
+}
+
+WIDECHAR* FGenericWidePlatformString::Strcat(WIDECHAR* Dest, SIZE_T DestCount, const WIDECHAR* Src)
+{
+	TCHAR *String = Dest;
+	
+	while (*String != 0 && DestCount > 1)
+	{
+		String++;
+		// remove how much we can copy in the lower loop
+		DestCount--;
+	}
+	
+	while (*Src != 0 && DestCount > 1)
+	{
+		*String++ = *Src++;
+		DestCount--;
+	}
+	
+//	// rewind 1 for trailing zero
+//	String--;
+	*String = 0;
+	
+	return Dest;
+}
+
+int32 FGenericWidePlatformString::Strtoi( const WIDECHAR* Start, WIDECHAR** End, int32 Base )
+{
+	if (End == nullptr)
+	{
+		return Strtoi(TCHAR_TO_UTF8(Start), nullptr, Base);
+	}
+
+#if UE_BUILD_DEBUG
+	// make sure we aren't using high byte characters
+	// @todo this!
+#endif
+	
+	// convert to ANSI, and remember the end to get an offset
+	auto Ansi = StringCast<ANSICHAR>(Start);
+	ANSICHAR* AnsiEnd;
+	int32 Result = Strtoi(Ansi.Get(), &AnsiEnd, Base);
+	
+	// the end is the offset from
+	*End = const_cast<WIDECHAR*>(Start) + (AnsiEnd - Ansi.Get());
+
+	return Result;
+}
+
+int64 FGenericWidePlatformString::Strtoi64( const WIDECHAR* Start, WIDECHAR** End, int32 Base )
+{
+	if (End == nullptr)
+	{
+		return Strtoi64(TCHAR_TO_UTF8(Start), nullptr, Base);
+	}
+
+#if UE_BUILD_DEBUG
+	// make sure we aren't using high byte characters
+	// @todo this!
+#endif
+	
+	// convert to ANSI, and remember the end to get an offset
+	auto Ansi = StringCast<ANSICHAR>(Start);
+	ANSICHAR* AnsiEnd;
+	int64 Result = Strtoi64(Ansi.Get(), &AnsiEnd, Base);
+	
+	// the end is the offset from
+	*End = const_cast<WIDECHAR*>(Start) + (AnsiEnd - Ansi.Get());
+
+	return Result;
+}
+
+uint64 FGenericWidePlatformString::Strtoui64( const WIDECHAR* Start, WIDECHAR** End, int32 Base )
+{
+	if (End == nullptr)
+	{
+		return Strtoui64(TCHAR_TO_UTF8(Start), nullptr, Base);
+	}
+
+#if UE_BUILD_DEBUG
+	// make sure we aren't using high byte characters
+	// @todo this!
+#endif
+	
+	// convert to ANSI, and remember the end to get an offset
+	auto Ansi = StringCast<ANSICHAR>(Start);
+	ANSICHAR* AnsiEnd;
+	uint64 Result = Strtoui64(Ansi.Get(), &AnsiEnd, Base);
+	
+	// the end is the offset from
+	*End = const_cast<WIDECHAR*>(Start) + (AnsiEnd - Ansi.Get());
+
+	return Result;
+}
+
+float FGenericWidePlatformString::Atof(const WIDECHAR* String)
+{
+	return Atof(TCHAR_TO_UTF8(String));
+}
+
+double FGenericWidePlatformString::Atod(const WIDECHAR* String)
+{
+	return Atod(TCHAR_TO_UTF8(String));
+}
+
+
+#if PLATFORM_ANDROID
+// This is a full copy of iswspace function from Android sources
+// For some reason function from libc does not work correctly for some korean characters like: 0xBE0C
+int iswspace(wint_t wc)
+{
+	static const wchar_t spaces[] = {
+		' ', '\t', '\n', '\r', 11, 12,  0x0085,
+		0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005,
+		0x2006, 0x2008, 0x2009, 0x200a,
+		0x2028, 0x2029, 0x205f, 0x3000, 0
+	};
+	return wc && wcschr(spaces, wc);
+}
+#endif
+
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+static const int OUTPUT_SIZE = 256;
+int32 TestGetVarArgs(WIDECHAR* OutputString, const WIDECHAR* Format, ...)
+{
+    va_list ArgPtr;
+    va_start( ArgPtr, Format );
+    
+    return FGenericWidePlatformString::GetVarArgs(OutputString, OUTPUT_SIZE, OUTPUT_SIZE - 1, Format, ArgPtr);
+}
+
+void RunGetVarArgsTests()
+{
+    WIDECHAR OutputString[OUTPUT_SIZE];
+
+    TestGetVarArgs(OutputString, TEXT("Test A|%-20s|%20s|%10.2f|%-10.2f|"), TEXT("LEFT"), TEXT("RIGHT"), 33.333333, 66.666666);
+    check(FString(OutputString) == FString(TEXT("Test A|LEFT                |               RIGHT|     33.33|66.67     |")));
+    
+    TestGetVarArgs(OutputString, TEXT("Test B|Percents:%%%%%%%d|"), 3);
+    check(FString(OutputString) == FString(TEXT("Test B|Percents:%%%3|")));
+    
+    TestGetVarArgs(OutputString, TEXT("Test C|%d|%i|%X|%x|%u|"), 12345, 54321, 0x123AbC, 15, 99);
+    check(FString(OutputString) == FString(TEXT("Test C|12345|54321|123ABC|f|99|")));
+    
+    TestGetVarArgs(OutputString, TEXT("Test D|%p|"), 0x12345);
+    check(FString(OutputString) == FString(TEXT("Test D|0x12345|")));
+
+    TestGetVarArgs(OutputString, TEXT("Test E|%lld|"), 12345678912345);
+    check(FString(OutputString) == FString(TEXT("Test E|12345678912345|")));
+
+    TestGetVarArgs(OutputString, TEXT("Test F|%f|%e|%g|"), 123.456, 123.456, 123.456);
+    check(FString(OutputString) == FString(TEXT("Test F|123.456000|1.234560e+02|123.456|")));
+}
+#endif
+
+int32 FGenericWidePlatformString::GetVarArgs( WIDECHAR* Dest, SIZE_T DestSize, int32 Count, const WIDECHAR*& Fmt, va_list ArgPtr )
+{
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+    static bool bTested = false;
+    if(!bTested)
+    {
+        bTested = true;
+        RunGetVarArgsTests();
+    }
+#endif
+
+	if (Fmt == nullptr)
+	{
+		if ((DestSize > 0) && (Dest != nullptr))
+        {
+			*Dest = 0;
+        }
+		return 0;
+	}
+	
+	int FmtLen = FPlatformMath::Min(Count, Strlen(Fmt));
+    const TCHAR *Src = Fmt;
+	
+	TCHAR *Dst = Dest;
+	TCHAR *EndDst = Dst + (DestSize - 1);
+	
+	while ((*Src) && (Dst < EndDst))
+	{
+		if (*Src != '%')
+		{
+			*Dst = *Src;
+			Dst++;
+			Src++;
+			continue;
+		}
+		
+		const TCHAR *Percent = Src;
+		int FieldLen = 0;
+		int PrecisionLen = -1;
+		
+		Src++; // skip the '%' char...
+		
+		while (*Src == ' ')
+		{
+			*Dst = ' ';
+			Dst++;
+			Src++;
+		}
+		
+		// Skip modifier flags that don't need additional processing;
+		// they still get passed to snprintf() below based on the conversion.
+		if (*Src == '+')
+		{
+			Src++;
+		}
+		
+		// check for field width requests...
+		if ((*Src == '-') || ((*Src >= '0') && (*Src <= '9')))
+		{
+			const TCHAR *Cur = Src + 1;
+			while ((*Cur >= '0') && (*Cur <= '9'))
+            {
+				Cur++;
+            }
+			
+			FieldLen = Atoi(Src);			
+			Src = Cur;
+		}
+		
+		if (*Src == '.')
+		{
+			const TCHAR *Cur = Src + 1;
+			while ((*Cur >= '0') && (*Cur <= '9'))
+            {
+				Cur++;
+            }
+			
+			PrecisionLen = Atoi(Src + 1);
+			Src = Cur;
+		}
+		
+		// Check for 'ls' field, change to 's'
+		if ((Src[0] == 'l' && Src[1] == 's'))
+		{
+			Src++;
+		}
+		
+		switch (*Src)
+		{
+			case '%':
+			{
+				Src++;
+				*Dst = '%';
+				Dst++;
+                break;
+			}
+				
+			case 'c':
+			{
+				TCHAR Val = (TCHAR) va_arg(ArgPtr, int);
+				Src++;
+				*Dst = Val;
+				Dst++;
+                break;
+			}
+				
+			case 'd':
+			case 'i':
+			case 'X':
+			case 'x':
+			case 'u':
+			{
+				Src++;
+				int Val = va_arg(ArgPtr, int);
+				ANSICHAR AnsiNum[30];
+				ANSICHAR FmtBuf[30];
+				
+				// Yes, this is lame.
+				int CpyIdx = 0;
+				while (Percent < Src)
+				{
+					FmtBuf[CpyIdx] = (ANSICHAR)*Percent;
+					Percent++;
+					CpyIdx++;
+				}
+				FmtBuf[CpyIdx] = 0;
+				
+				int RetCnt = snprintf(AnsiNum, sizeof(AnsiNum), FmtBuf, Val);
+				if ((Dst + RetCnt) > EndDst)
+                {
+					return -1;	// Fail - the app needs to create a larger buffer and try again
+                }
+				for (int i = 0; i < RetCnt; i++)
+				{
+					*Dst = (TCHAR)AnsiNum[i];
+					Dst++;
+				}
+                break;
+			}
+				
+			case 'p':
+			{
+				Src++;
+				void* Val = va_arg(ArgPtr, void*);
+				ANSICHAR AnsiNum[30];
+				ANSICHAR FmtBuf[30];
+				
+				// Yes, this is lame.
+				int CpyIdx = 0;
+				while (Percent < Src)
+				{
+					FmtBuf[CpyIdx] = (ANSICHAR) *Percent;
+					Percent++;
+					CpyIdx++;
+				}
+				FmtBuf[CpyIdx] = 0;
+				
+				int RetCnt = snprintf(AnsiNum, sizeof (AnsiNum), FmtBuf, Val);
+				if ((Dst + RetCnt) > EndDst)
+                {
+					return -1;	// Fail - the app needs to create a larger buffer and try again
+                }
+				for (int i = 0; i < RetCnt; i++)
+				{
+					*Dst = (TCHAR) AnsiNum[i];
+					Dst++;
+				}
+                break;
+			}
+				
+			case 'l':
+			case 'I':
+			{
+				// treat %ld as %d
+				if (Src[0] == 'l' && Src[1] == 'd')
+				{
+					Src+=2;
+					int Val = va_arg(ArgPtr, int);
+					ANSICHAR AnsiNum[30];
+					ANSICHAR FmtBuf[30];
+					
+					// Yes, this is lame.
+					int CpyIdx = 0;
+					while (Percent < Src)
+					{
+						FmtBuf[CpyIdx] = (ANSICHAR)*Percent;
+						Percent++;
+						CpyIdx++;
+					}
+					FmtBuf[CpyIdx] = 0;
+					
+					int RetCnt = snprintf(AnsiNum, sizeof(AnsiNum), FmtBuf, Val);
+					if ((Dst + RetCnt) > EndDst)
+                    {
+						return -1;	// Fail - the app needs to create a larger buffer and try again
+                    }
+					for (int i = 0; i < RetCnt; i++)
+					{
+						*Dst = (TCHAR)AnsiNum[i];
+						Dst++;
+					}
+					break;
+				}
+				
+				
+				if ((Src[0] == 'l' && Src[1] != 'l') ||
+					(Src[0] == 'I' && (Src[1] != '6' || Src[2] != '4')))
+				{
+					printf("Unknown percent [%lc%lc%lc] in FGenericWidePlatformString::GetVarArgs() [%s]\n.", Src[0], Src[1], Src[2], TCHAR_TO_ANSI(Fmt));
+					Src++;  // skip it, I guess.
+					break;
+				}
+				
+				// Yes, this is lame.
+				int CpyIdx = 0;
+				unsigned long long Val = va_arg(ArgPtr, unsigned long long);
+				ANSICHAR AnsiNum[60];
+				ANSICHAR FmtBuf[30];
+				if (Src[0] == 'l')
+				{
+					Src += 3;
+				}
+				else
+				{
+					Src += 4;
+					strcpy(FmtBuf, "%L");
+					Percent += 4;
+					CpyIdx = 2;
+				}
+				
+				while (Percent < Src)
+				{
+					FmtBuf[CpyIdx] = (ANSICHAR) *Percent;
+					Percent++;
+					CpyIdx++;
+				}
+				FmtBuf[CpyIdx] = 0;
+				
+				int RetCnt = snprintf(AnsiNum, sizeof (AnsiNum), FmtBuf, Val);
+				if ((Dst + RetCnt) > EndDst)
+                {
+					return -1;	// Fail - the app needs to create a larger buffer and try again
+                }
+				for (int i = 0; i < RetCnt; i++)
+				{
+					*Dst = (TCHAR) AnsiNum[i];
+					Dst++;
+				}
+                break;
+			}
+				
+			case 'f':
+			case 'e':
+			case 'g':
+			{
+				Src++;
+				double Val = va_arg(ArgPtr, double);
+				ANSICHAR AnsiNum[30];
+				ANSICHAR FmtBuf[30];
+				
+				// Yes, this is lame.
+				int CpyIdx = 0;
+				while (Percent < Src)
+				{
+					FmtBuf[CpyIdx] = (ANSICHAR) *Percent;
+					Percent++;
+					CpyIdx++;
+				}
+				FmtBuf[CpyIdx] = 0;
+				
+				int RetCnt = snprintf(AnsiNum, sizeof (AnsiNum), FmtBuf, Val);
+				if ((Dst + RetCnt) > EndDst)
+                {
+					return -1;	// Fail - the app needs to create a larger buffer and try again
+                }
+				for (int i = 0; i < RetCnt; i++)
+				{
+					*Dst = (TCHAR) AnsiNum[i];
+					Dst++;
+				}
+                break;
+			}
+				
+			case 's':
+			{
+				Src++;
+				static const TCHAR* Null = TEXT("(null)");
+				const TCHAR *Val = va_arg(ArgPtr, TCHAR *);
+				if (Val == nullptr)
+                {
+					Val = Null;
+                }
+				
+				int RetCnt = Strlen(Val);
+				int Spaces = FPlatformMath::Max(FPlatformMath::Abs(FieldLen) - RetCnt, 0);
+				if ((Dst + RetCnt + Spaces) > EndDst)
+                {
+					return -1;	// Fail - the app needs to create a larger buffer and try again
+                }
+				if (Spaces > 0 && FieldLen > 0)
+				{
+					for (int i = 0; i < Spaces; i++)
+					{
+						*Dst = TEXT(' ');
+						Dst++;
+					}
+				}
+				for (int i = 0; i < RetCnt; i++)
+				{
+					*Dst = *Val;
+					Dst++;
+					Val++;
+				}
+				if (Spaces > 0 && FieldLen < 0)
+				{
+					for (int i = 0; i < Spaces; i++)
+					{
+						*Dst = TEXT(' ');
+						Dst++;
+					}
+				}
+                break;
+			}
+				
+			default:
+				printf("Unknown percent [%%%c] in FGenericWidePlatformString::GetVarArgs().\n", *Src);
+				Src++;  // skip char, I guess.
+				break;
+		}
+	}
+	
+	// Check if we were able to finish the entire format string
+	// If not, the app needs to create a larger buffer and try again
+	if (*Src)
+    {
+		return -1;
+    }
+	
+	*Dst = 0;  // null terminate the new string.
+	return Dst - Dest;
+}
+
+#endif
+
diff --git a/Engine/Source/Runtime/Core/Private/GenericPlatform/StandardPlatformString.cpp b/Engine/Source/Runtime/Core/Private/GenericPlatform/StandardPlatformString.cpp
index ae6b394e7f8c..44209e07b0b8 100644
--- a/Engine/Source/Runtime/Core/Private/GenericPlatform/StandardPlatformString.cpp
+++ b/Engine/Source/Runtime/Core/Private/GenericPlatform/StandardPlatformString.cpp
@@ -2,7 +2,8 @@
 
 #include "GenericPlatform/StandardPlatformString.h"
 
-#if !PLATFORM_USE_SYSTEM_VSWPRINTF
+// only IOS and Mac were using this file before, but that has all moved over to the FullReplacementPlatformString
+#if !PLATFORM_USE_SYSTEM_VSWPRINTF && !PLATFORM_TCHAR_IS_CHAR16
 
 #include "GenericPlatform/StandardPlatformString.h"
 #include "HAL/UnrealMemory.h"
diff --git a/Engine/Source/Runtime/Core/Private/HAL/ConsoleManager.cpp b/Engine/Source/Runtime/Core/Private/HAL/ConsoleManager.cpp
index 5e66350492e1..abd34701c7f6 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/ConsoleManager.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/ConsoleManager.cpp
@@ -2274,17 +2274,59 @@ static TAutoConsoleVariable<float> CVarViewDistanceScale(
 	1.0f,
 	TEXT("Controls the view distance scale. A primitive's MaxDrawDistance is scaled by this value.\n")
 	TEXT("Higher values will increase view distance but at a performance cost.\n")
-	TEXT("Default = 1. Value should be in the range [0.0f, 1.0f]."),
+	TEXT("Default = 1."),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
-static TAutoConsoleVariable<float> CVarViewDistanceScale_NoScalability(
-	TEXT("r.ViewDistanceScaleNoScalability"),
-	1.0f,
-	TEXT("An additional multiplier to r.ViewDistanceScale, but not affected by scalability settings.\n")
-	TEXT("Higher values will increase view distance but at a performance cost.\n")
-	TEXT("Default = 1. Value should be in the range [0.0f, 1.0f]."),
+static TAutoConsoleVariable<int32> CVarViewDistanceScaleApplySecondaryScale(
+	TEXT("r.ViewDistanceScale.ApplySecondaryScale"),
+	0,
+	TEXT("If true applies the secondary view distance scale to primitive draw distances.\n")
+	TEXT("Default = 0."),
 	ECVF_RenderThreadSafe);
 
+static TAutoConsoleVariable<float> CVarViewDistanceScaleSecondaryScale(
+	TEXT("r.ViewDistanceScale.SecondaryScale"),
+	1.0f,
+	TEXT("Controls the secondary view distance scale, Default = 1.0.\n")
+	TEXT("This is an optional scale intended to allow some features or gamemodes to opt-in.\n"),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<float> CVarViewDistanceScale_FieldOfViewMinAngle(
+	TEXT("r.ViewDistanceScale.FieldOfViewMinAngle"),
+	45.0f,
+	TEXT("Scales the scene view distance scale with camera field of view.\n")
+	TEXT("Minimum angle of the blend range.\n")
+	TEXT("Applies the minimum scale when the camera is at or below this angle."),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<float> CVarViewDistanceScale_FieldOfViewMinAngleScale(
+	TEXT("r.ViewDistanceScale.FieldOfViewMinAngleScale"),
+	1.0f,
+	TEXT("Scales the scene view distance scale with camera field of view.\n")
+	TEXT("This value is applied when the camera is at or below the minimum angle."),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<float> CVarViewDistanceScale_FieldOfViewMaxAngle(
+	TEXT("r.ViewDistanceScale.FieldOfViewMaxAngle"),
+	90.0f,
+	TEXT("Scales the scene view distance scale with camera field of view.\n")
+	TEXT("Maximum angle of the blend range.\n")
+	TEXT("Applies the maximum scale when the camera is at or above this angle."),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<float> CVarViewDistanceScale_FieldOfViewMaxAngleScale(
+	TEXT("r.ViewDistanceScale.FieldOfViewMaxAngleScale"),
+	1.0f,
+	TEXT("Scales the scene view distance scale with camera field of view.\n")
+	TEXT("This value is applied when the camera is at or above the maximum angle."),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<int32> CVarViewDistanceScale_FieldOfViewAffectsHLOD(
+	TEXT("r.ViewDistanceScale.FieldOfViewAffectsHLOD"),
+	0,
+	TEXT("If enabled, applies the field of view scaling to HLOD draw distances as well as non-HLODs."),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
 static TAutoConsoleVariable<int32> CVarLightFunctionQuality(
 	TEXT("r.LightFunctionQuality"),
 	2,
@@ -2439,6 +2481,14 @@ static TAutoConsoleVariable<int32> CVarDisableOpenGLES31Support(
 	TEXT("  1 = OpenGLES 3.1 will be disabled, OpenGL ES2 fall back will be used."),
 	ECVF_ReadOnly);
 
+static TAutoConsoleVariable<int32> CVarDisableAndroidGLASTCSupport(
+	TEXT("r.Android.DisableASTCSupport"),
+	0,
+	TEXT("Disable support for ASTC Texture compression if OpenGL driver supports it. (Android Only)\n")
+	TEXT("  0 = ASTC texture compression will be used if driver supports it [default]\n")
+	TEXT("  1 = ASTC texture compression will not be used."),
+	ECVF_ReadOnly);
+
 static TAutoConsoleVariable<int32> CVarDisableOpenGLTextureStreamingSupport(
 	TEXT("r.OpenGL.DisableTextureStreamingSupport"),
 	0,
@@ -2475,6 +2525,14 @@ static TAutoConsoleVariable<int32> GLSLCvar(
 	TEXT("2 to use ES GLSL\n1 to use GLSL\n0 to use SPIRV")
 );
 
+static TAutoConsoleVariable<FString> CVarCustomUnsafeZones(
+	TEXT("r.CustomUnsafeZones"),
+	TEXT(""),
+	TEXT("Allows you to set custom unsafe zones. Define them based on Portrait (P) or Landscape (L) for a device oriented 'upright'.")
+	TEXT("Unsafe zones may be either fixed or free, depending on if they move along with the rotation of the device.")
+	TEXT("Format is (P:fixed[x1, y1][width, height]), semicolon-separated for each custom unsafe zone. +Values add from 0, -Values subtract from Height or Width"),
+	ECVF_Default);
+
 static TAutoConsoleVariable<int32> CVarSkyLightingQuality(
 	TEXT("r.SkyLightingQuality"),
 	1,
diff --git a/Engine/Source/Runtime/Core/Private/HAL/FileManagerGeneric.cpp b/Engine/Source/Runtime/Core/Private/HAL/FileManagerGeneric.cpp
index deaf1bde4de6..7f5e3c5acf4f 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/FileManagerGeneric.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/FileManagerGeneric.cpp
@@ -66,7 +66,8 @@ public:
 	FArchiveFileWriterDummy()
 		:	Pos( 0 )
 	{
-		ArIsSaving = ArIsPersistent = true;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 	}
 	virtual ~FArchiveFileWriterDummy()
 	{
@@ -613,7 +614,8 @@ FArchiveFileReaderGeneric::FArchiveFileReaderGeneric( IFileHandle* InHandle, con
 	, BufferCount( 0 )
 	, Handle( InHandle )
 {
-	ArIsLoading = ArIsPersistent = true;
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
 }
 
 
@@ -759,7 +761,8 @@ FArchiveFileWriterGeneric::FArchiveFileWriterGeneric( IFileHandle* InHandle, con
 	, Handle( InHandle )
 	, bLoggingError( false )
 {
-	ArIsSaving = ArIsPersistent = true;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 }
 
 FArchiveFileWriterGeneric::~FArchiveFileWriterGeneric()
diff --git a/Engine/Source/Runtime/Core/Private/HAL/IPlatformFileProfilerWrapper.cpp b/Engine/Source/Runtime/Core/Private/HAL/IPlatformFileProfilerWrapper.cpp
index 6bf8de8896ac..66a567f3c965 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/IPlatformFileProfilerWrapper.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/IPlatformFileProfilerWrapper.cpp
@@ -35,6 +35,8 @@ bool FPlatformFileReadStatsHandle::Read( uint8* Destination, int64 BytesToRead )
 
 bool FPlatformFileReadStats::Tick( float Delta )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FPlatformFileReadStats_Tick);
+
 	float RealDelta = (float)(FPlatformTime::Seconds()-Timer);
 	uint32 BytesPerSec = FPlatformAtomics::InterlockedExchange(&BytePerSecThisTick, 0);
 	uint32 BytesReadTick = FPlatformAtomics::InterlockedExchange(&BytesReadThisTick, 0);
diff --git a/Engine/Source/Runtime/Core/Private/HAL/MallocBinned.cpp b/Engine/Source/Runtime/Core/Private/HAL/MallocBinned.cpp
index 81d6726c6d2e..c3ddaae6038e 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/MallocBinned.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/MallocBinned.cpp
@@ -511,7 +511,7 @@ struct FMallocBinned::Private
 		Allocator.PendingFreeList->Push(Ptr);
 #else
 #ifdef USE_COARSE_GRAIN_LOCKS
-		FScopeLock ScopedLock(&AccessGuard);
+		FScopeLock ScopedLock(&Allocator.AccessGuard);
 #endif
 		FreeInternal(Allocator, Ptr);
 #endif
diff --git a/Engine/Source/Runtime/Core/Private/HAL/MallocLeakDetection.cpp b/Engine/Source/Runtime/Core/Private/HAL/MallocLeakDetection.cpp
index b77c2b492891..65edfa48e180 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/MallocLeakDetection.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/MallocLeakDetection.cpp
@@ -380,7 +380,7 @@ int32 FMallocLeakDetection::DumpOpenCallstacks(const TCHAR* FileName, const FMal
 
 		TArray<FString> SortedContexts;
 
-		for (const auto& Pair : OpenPointers)
+		for (const TPair<void*, FCallstackTrack>& Pair : CopyTemp(OpenPointers))
 		{
 			if (Pair.Value.CachedHash == Key)
 			{
diff --git a/Engine/Source/Runtime/Core/Private/HAL/ThreadHeartBeat.cpp b/Engine/Source/Runtime/Core/Private/HAL/ThreadHeartBeat.cpp
index 97f44a7efe1e..2b24be41ba10 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/ThreadHeartBeat.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/ThreadHeartBeat.cpp
@@ -11,7 +11,14 @@
 #include "Misc/OutputDeviceRedirector.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/CommandLine.h"
+#include "Misc/CoreDelegates.h"
 #include "HAL/ExceptionHandling.h"
+#include "Stats/Stats.h"
+#include "Async/TaskGraphInterfaces.h"
+
+// When enabled, the heart beat thread will call abort() when a hang
+// is detected, rather than performing stack back-traces and logging.
+#define MINIMAL_FATAL_HANG_DETECTION	((PLATFORM_PS4 || PLATFORM_XBOXONE) && 1)
 
 // When enabled, the heart beat thread will call abort() when a hang
 // is detected, rather than performing stack back-traces and logging.
@@ -43,6 +50,9 @@ FThreadHeartBeat::FThreadHeartBeat()
 	if (bAllowThreadHeartBeat && FPlatformProcess::SupportsMultithreading())
 	{
 		Thread = FRunnableThread::Create(this, TEXT("FHeartBeatThread"), 0, TPri_AboveNormal);
+
+		FCoreDelegates::ApplicationWillEnterBackgroundDelegate.AddRaw(this, &FThreadHeartBeat::OnApplicationWillEnterBackground);
+		FCoreDelegates::ApplicationHasEnteredForegroundDelegate.AddRaw(this, &FThreadHeartBeat::OnApplicationEnteredForeground);
 	}
 #endif
 
@@ -55,6 +65,13 @@ FThreadHeartBeat::FThreadHeartBeat()
 
 FThreadHeartBeat::~FThreadHeartBeat()
 {
+#if USE_HANG_DETECTION
+	// Intentionally not unbinding these delegates because this object is a static singleton and the delegates may be destructed before this object is
+	// This is fine, since both the delegate and this object are both destroyed at static destruction time, so there is no need to unregister
+	//FCoreDelegates::ApplicationHasEnteredForegroundDelegate.RemoveAll(this);
+	//FCoreDelegates::ApplicationWillEnterBackgroundDelegate.RemoveAll(this);
+#endif
+
 	delete Thread;
 	Thread = nullptr;
 }
@@ -231,6 +248,36 @@ void FThreadHeartBeat::InitSettings()
 	CurrentHangDuration = ConfigHangDuration * HangDurationMultiplier;
 }
 
+void FThreadHeartBeat::OnApplicationWillEnterBackground()
+{
+	// Suspend all threads
+#if USE_HANG_DETECTION
+	FScopeLock HeartBeatLock(&HeartBeatCritical);
+	for (TPair<uint32, FHeartBeatInfo>& LastHeartBeat : ThreadHeartBeat)
+	{
+		FHeartBeatInfo& HeartBeatInfo = LastHeartBeat.Value;
+		HeartBeatInfo.SuspendedCount++;
+	}
+#endif
+}
+
+void FThreadHeartBeat::OnApplicationEnteredForeground()
+{
+	// Resume all threads
+#if USE_HANG_DETECTION
+	FScopeLock HeartBeatLock(&HeartBeatCritical);
+	for (TPair<uint32, FHeartBeatInfo>& LastHeartBeat : ThreadHeartBeat)
+	{
+		FHeartBeatInfo& HeartBeatInfo = LastHeartBeat.Value;
+		check(HeartBeatInfo.SuspendedCount > 0);
+		if (--HeartBeatInfo.SuspendedCount == 0)
+		{
+			HeartBeatInfo.LastHeartBeatTime = FPlatformTime::Seconds();
+		}
+	}
+#endif
+}
+
 void FThreadHeartBeat::HeartBeat(bool bReadConfig)
 {
 #if USE_HANG_DETECTION
@@ -374,15 +421,26 @@ FGameThreadHitchHeartBeat::FGameThreadHitchHeartBeat()
 	, FirstStartTime(0.0)
 	, FrameStartTime(0.0)
 	, LastReportTime(0.0)
+	, SuspendedCount(0)
 {
 	// We don't care about programs for now so no point in spawning the extra thread
 #if USE_HITCH_DETECTION
 	InitSettings();
+
+	FCoreDelegates::ApplicationWillEnterBackgroundDelegate.AddRaw(this, &FGameThreadHitchHeartBeat::OnApplicationWillEnterBackground);
+	FCoreDelegates::ApplicationHasEnteredForegroundDelegate.AddRaw(this, &FGameThreadHitchHeartBeat::OnApplicationEnteredForeground);
 #endif
 }
 
 FGameThreadHitchHeartBeat::~FGameThreadHitchHeartBeat()
 {
+#if USE_HITCH_DETECTION
+	// Intentionally not unbinding these delegates because this object is a static singleton and the delegates may be destructed before this object is
+	// This is fine, since both the delegate and this object are both destroyed at static destruction time, so there is no need to unregister
+	//FCoreDelegates::ApplicationHasEnteredForegroundDelegate.RemoveAll(this);
+	//FCoreDelegates::ApplicationWillEnterBackgroundDelegate.RemoveAll(this);
+#endif
+
 	delete Thread;
 	Thread = nullptr;
 }
@@ -454,6 +512,16 @@ void FGameThreadHitchHeartBeat::InitSettings()
 #endif
 }
 
+void FGameThreadHitchHeartBeat::OnApplicationWillEnterBackground()
+{
+	SuspendHeartBeat();
+}
+
+void FGameThreadHitchHeartBeat::OnApplicationEnteredForeground()
+{
+	ResumeHeartBeat();
+}
+
 uint32 FGameThreadHitchHeartBeat::Run()
 {
 #if USE_HITCH_DETECTION
@@ -481,7 +549,7 @@ uint32 FGameThreadHitchHeartBeat::Run()
 				LocalFrameStartTime = FrameStartTime;
 				LocalHangDuration = HangDuration;
 			}
-			if (LocalFrameStartTime > 0.0 && LocalHangDuration > 0.0f)
+			if (LocalFrameStartTime > 0.0 && LocalHangDuration > 0.0f && SuspendedCount == 0)
 			{
 				const double CurrentTime = FPlatformTime::Seconds();
 				if (CurrentTime - LastReportTime > 60.0 && float(CurrentTime - LocalFrameStartTime) > LocalHangDuration)
@@ -570,12 +638,41 @@ void FGameThreadHitchHeartBeat::FrameStart(bool bSkipThisFrame)
 	{
 		FrameStartTime = bSkipThisFrame ? 0.0 : Now;
 	}
+#if !ENABLE_STATNAMEDEVENTS && defined(USE_LIGHTWEIGHT_STATS_FOR_HITCH_DETECTION) && USE_LIGHTWEIGHT_STATS_FOR_HITCH_DETECTION && USE_HITCH_DETECTION
+	if (GHitchDetected)
+	{
+		TFunction<void(ENamedThreads::Type CurrentThread)> Broadcast =
+			[this](ENamedThreads::Type MyThread)
+		{
+			FString ThreadString(FPlatformTLS::GetCurrentThreadId() == GGameThreadId ? TEXT("GameThread") : FThreadManager::Get().GetThreadName(FPlatformTLS::GetCurrentThreadId()));
+			UE_LOG(LogCore, Error, TEXT("FGameThreadHitchHeartBeat Flushed Thread [%s]"), *ThreadString);
+		};
+		// Skip task threads we will catch the wait for them
+		FTaskGraphInterface::BroadcastSlow_OnlyUseForSpecialPurposes(false, false, Broadcast);
+	}
+#endif
 	GHitchDetected = false;
 #endif
 }
 
+void FGameThreadHitchHeartBeat::SuspendHeartBeat()
+{
+#if USE_HITCH_DETECTION
+	FPlatformAtomics::InterlockedIncrement(&SuspendedCount);
+#endif
+}
+void FGameThreadHitchHeartBeat::ResumeHeartBeat()
+{
+#if USE_HITCH_DETECTION
+	check(SuspendedCount > 0);
+	if (FPlatformAtomics::InterlockedDecrement(&SuspendedCount) == 0)
+	{
+		FrameStart(true);
+	}
+#endif
+}
+
 double FGameThreadHitchHeartBeat::GetFrameStartTime()
 {
-	check(IsInGameThread());
 	return FrameStartTime;
-}
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Private/HAL/UnrealMemory.cpp b/Engine/Source/Runtime/Core/Private/HAL/UnrealMemory.cpp
index e038a699de2d..b7c379a8e445 100644
--- a/Engine/Source/Runtime/Core/Private/HAL/UnrealMemory.cpp
+++ b/Engine/Source/Runtime/Core/Private/HAL/UnrealMemory.cpp
@@ -319,6 +319,11 @@ FConsoleCommandDelegate::CreateStatic(&FMemory::EnablePoisonTests)
 /** Helper function called on first allocation to create and initialize GMalloc */
 int FMemory_GCreateMalloc_ThreadUnsafe()
 {
+#if !PLATFORM_MAC
+	FPlatformMemoryStats Stats = FPlatformMemory::GetStats();
+	uint64 ProgramSize = Stats.UsedPhysical;
+#endif
+
 	GMalloc = FPlatformMemory::BaseAllocator();
 	// Setup malloc crash as soon as possible.
 	FPlatformMallocCrash::Get( GMalloc );
@@ -371,6 +376,15 @@ int FMemory_GCreateMalloc_ThreadUnsafe()
 #endif
 
 #endif
+
+// On Mac it's too early to log here in some cases. For example GMalloc may be created during initialization of a third party dylib on load, before CoreFoundation is initialized
+#if !PLATFORM_MAC
+	// by this point, we assume we can log
+	double SizeInMb = ProgramSize / (1024.0 * 1024.0);
+	FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Used memory before allocating anything was %.2fMB\n"), SizeInMb);
+	UE_LOG(LogMemory, Display, TEXT("Used memory before allocating anything was %.2fMB"), SizeInMb);
+#endif
+	
 	return 0;
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformFile.cpp b/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformFile.cpp
index c0f721a02d01..776c723cf852 100644
--- a/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformFile.cpp
+++ b/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformFile.cpp
@@ -482,6 +482,10 @@ bool FIOSPlatformFile::MoveFile(const TCHAR* To, const TCHAR* From)
 	// move to the write path
 	FString ToIOSFilename = ConvertToIOSPath(NormalizeFilename(To), true);
 	FString FromIOSFilename = ConvertToIOSPath(NormalizeFilename(From), false);
+	if (!FileExists(*FromIOSFilename))
+	{
+		FromIOSFilename = ConvertToIOSPath(NormalizeFilename(From), true);
+	}
 	return rename(TCHAR_TO_UTF8(*FromIOSFilename), TCHAR_TO_UTF8(*ToIOSFilename)) != -1;
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformMisc.cpp b/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformMisc.cpp
index fec1767d7e90..9fc8658bcaa6 100644
--- a/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/IOS/IOSPlatformMisc.cpp
@@ -9,6 +9,7 @@
 #include "HAL/ExceptionHandling.h"
 #include "Misc/SecureHash.h"
 #include "Misc/EngineVersion.h"
+#include "Templates/Function.h"
 #include "IOS/IOSMallocZone.h"
 #include "IOS/IOSApplication.h"
 #include "IOS/IOSAppDelegate.h"
@@ -16,6 +17,7 @@
 #include "IOSChunkInstaller.h"
 #include "Misc/CommandLine.h"
 #include "Misc/ConfigCacheIni.h"
+#include "Misc/CoreDelegates.h"
 #include "Apple/ApplePlatformCrashContext.h"
 #include "IOS/IOSPlatformCrashContext.h"
 #if !PLATFORM_TVOS
@@ -38,9 +40,13 @@
 #include <AdSupport/ASIdentifierManager.h> 
 #endif
 
+#include "Async/TaskGraphInterfaces.h"
 #include <SystemConfiguration/SystemConfiguration.h>
 #include <netinet/in.h>
 
+#import <StoreKit/StoreKit.h>
+#import <DeviceCheck/DeviceCheck.h>
+
 //#include <libproc.h>
 // @pjs commented out to resolve issue with PLATFORM_TVOS being defined by mach-o loader
 //#include <mach-o/dyld.h>
@@ -55,6 +61,7 @@ void (* GMemoryWarningHandler)(const FGenericMemoryWarningContext& Context) = NU
 
 /** global for showing the splash screen */
 bool GShowSplashScreen = true;
+float GOriginalBrightness = 1.0f;
 
 static int32 GetFreeMemoryMB()
 {
@@ -72,6 +79,8 @@ static int32 GetFreeMemoryMB()
 void FIOSPlatformMisc::PlatformInit()
 {
 	FAppEntry::PlatformInit();
+    
+    GOriginalBrightness = FIOSPlatformMisc::GetBrightness();
 
 	// Increase the maximum number of simultaneously open files
 	struct rlimit Limit;
@@ -96,7 +105,14 @@ void FIOSPlatformMisc::PlatformInit()
 
 void FIOSPlatformMisc::PlatformHandleSplashScreen(bool ShowSplashScreen)
 {
-    GShowSplashScreen = ShowSplashScreen;
+    if (GShowSplashScreen != ShowSplashScreen)
+    {
+        // put a render thread job to turn off the splash screen after the first render flip
+        FGraphEventRef SplashTask = FFunctionGraphTask::CreateAndDispatchWhenReady([ShowSplashScreen]()
+        {
+            GShowSplashScreen = ShowSplashScreen;
+        }, TStatId(), NULL, ENamedThreads::ActualRenderingThread);
+    }
 }
 
 const TCHAR* FIOSPlatformMisc::GamePersistentDownloadDir()
@@ -157,11 +173,50 @@ int FIOSPlatformMisc::GetBatteryLevel()
 	return [[IOSAppDelegate GetDelegate] GetBatteryLevel];
 }
 
+float FIOSPlatformMisc::GetBrightness()
+{
+#if !PLATFORM_TVOS
+	return [UIScreen mainScreen].brightness;
+#else
+	return 1.0f;
+#endif // !PLATFORM_TVOS
+}
+
+void FIOSPlatformMisc::SetBrightness(float Brightness)
+{
+#if !PLATFORM_TVOS
+	[UIScreen mainScreen].brightness = Brightness;
+#endif // !PLATFORM_TVOS
+}
+
+void FIOSPlatformMisc::ResetBrightness()
+{
+    SetBrightness(GOriginalBrightness);
+}
+
 bool FIOSPlatformMisc::IsRunningOnBattery()
 {
 	return [[IOSAppDelegate GetDelegate] IsRunningOnBattery];
 }
 
+float FIOSPlatformMisc::GetDeviceTemperatureLevel()
+{
+#if !PLATFORM_TVOS
+	if (@available(iOS 11, *))
+	{
+		switch ([[NSProcessInfo processInfo] thermalState])
+		{
+		case NSProcessInfoThermalStateNominal:	return (float)FCoreDelegates::ETemperatureSeverity::Good; break;
+		case NSProcessInfoThermalStateFair:		return (float)FCoreDelegates::ETemperatureSeverity::Bad; break;
+		case NSProcessInfoThermalStateSerious:	return (float)FCoreDelegates::ETemperatureSeverity::Serious; break;
+		case NSProcessInfoThermalStateCritical:	return (float)FCoreDelegates::ETemperatureSeverity::Critical; break;
+		}
+	}
+#endif
+	return -1.0f;
+}
+
+
 #if !PLATFORM_TVOS
 EDeviceScreenOrientation ConvertFromUIDeviceOrientation(UIDeviceOrientation Orientation)
 {
@@ -581,6 +636,15 @@ bool FIOSPlatformMisc::GetDiskTotalAndFreeSpace(const FString& InPath, uint64& T
 	return false;
 }
 
+void FIOSPlatformMisc::RequestStoreReview()
+{
+#if !PLATFORM_TVOS
+	if (@available(iOS 10, *))
+	{
+		[SKStoreReviewController requestReview];
+	}
+#endif
+}
 
 /**
 * Returns a unique string for advertising identification
@@ -640,8 +704,168 @@ class IPlatformChunkInstall* FIOSPlatformMisc::GetPlatformChunkInstall()
 	return ChunkInstall;
 }
 
+#if !PLATFORM_TVOS
+static UIFeedbackGenerator* GFeedbackGenerator = nullptr;
+#endif // !PLATFORM_TVOS
+static EMobileHapticsType GHapticsType;
+void FIOSPlatformMisc::PrepareMobileHaptics(EMobileHapticsType Type)
+{
+	// these functions must run on the main IOS thread
+	dispatch_async(dispatch_get_main_queue(), ^
+	{
+#if !PLATFORM_TVOS
+		if (GFeedbackGenerator != nullptr)
+		{
+            UE_LOG(LogIOS, Warning, TEXT("Multiple haptics were prepared at once! Implement a stack of haptics types, or a wrapper object that is returned, with state"));
+			[GFeedbackGenerator release];
+		}
+
+		GHapticsType = Type;
+		switch (GHapticsType)
+		{
+			case EMobileHapticsType::FeedbackSuccess:
+			case EMobileHapticsType::FeedbackWarning:
+			case EMobileHapticsType::FeedbackError:
+				GFeedbackGenerator = [[UINotificationFeedbackGenerator alloc] init];
+				break;
+
+			case EMobileHapticsType::SelectionChanged:
+				GFeedbackGenerator = [[UISelectionFeedbackGenerator alloc] init];
+				break;
+
+			default:
+				GHapticsType = EMobileHapticsType::ImpactLight;
+				// fall-through, and treat like Impact
+
+			case EMobileHapticsType::ImpactLight:
+				GFeedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleLight];
+				break;
+
+			case EMobileHapticsType::ImpactMedium:
+				GFeedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
+				break;
+
+			case EMobileHapticsType::ImpactHeavy:
+				GFeedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleHeavy];
+				break;
+		}
+
+		// prepare the generator object so Trigger won't delay
+		[GFeedbackGenerator prepare];
+#endif // !PLATFORM_TVOS
+	});
+}
+
+void FIOSPlatformMisc::TriggerMobileHaptics()
+{
+	dispatch_async(dispatch_get_main_queue(), ^
+	{
+#if !PLATFORM_TVOS
+		if (GFeedbackGenerator == nullptr)
+		{
+			return;
+		}
+
+		switch (GHapticsType)
+		{
+			case EMobileHapticsType::FeedbackSuccess:
+				[(UINotificationFeedbackGenerator*)GFeedbackGenerator notificationOccurred:UINotificationFeedbackTypeSuccess];
+				break;
+
+			case EMobileHapticsType::FeedbackWarning:
+				[(UINotificationFeedbackGenerator*)GFeedbackGenerator notificationOccurred:UINotificationFeedbackTypeWarning];
+				break;
+
+			case EMobileHapticsType::FeedbackError:
+				[(UINotificationFeedbackGenerator*)GFeedbackGenerator notificationOccurred:UINotificationFeedbackTypeError];
+				break;
+
+			case EMobileHapticsType::SelectionChanged:
+				[(UISelectionFeedbackGenerator*)GFeedbackGenerator selectionChanged];
+				break;
+
+			case EMobileHapticsType::ImpactLight:
+			case EMobileHapticsType::ImpactMedium:
+			case EMobileHapticsType::ImpactHeavy:
+				[(UIImpactFeedbackGenerator*)GFeedbackGenerator impactOccurred];
+				break;
+		}
+#endif // !PLATFORM_TVOS
+	});
+}
+
+void FIOSPlatformMisc::ReleaseMobileHaptics()
+{
+	dispatch_async(dispatch_get_main_queue(), ^
+	{
+#if !PLATFORM_TVOS
+		if (GFeedbackGenerator == nullptr)
+		{
+			return;
+		}
+
+		[GFeedbackGenerator release];
+		GFeedbackGenerator = nullptr;
+#endif // !PLATFORM_TVOS
+	});
+}
+
+void FIOSPlatformMisc::ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY)
+{
+	NSString* SharedString = [NSString stringWithFString:Description.ToString()];
+	NSURL* SharedURL = [NSURL URLWithString:[NSString stringWithFString:URL]];
+	CGRect PopoverLocation = CGRectMake(LocationHintX, LocationHintY, 1, 1);
+
+	dispatch_async(dispatch_get_main_queue(),^ {
+		NSArray* ObjectsToShare = @[SharedString, SharedURL];
+#if !PLATFORM_TVOS
+		// create the share sheet view
+		UIActivityViewController* ActivityVC = [[UIActivityViewController alloc] initWithActivityItems:ObjectsToShare applicationActivities:nil];
+		[ActivityVC autorelease];
+	
+		// skip over some things that don't make sense
+		ActivityVC.excludedActivityTypes = @[UIActivityTypePrint,
+											 UIActivityTypeAssignToContact,
+											 UIActivityTypeSaveToCameraRoll,
+											 UIActivityTypePostToFlickr,
+											 UIActivityTypePostToVimeo];
+		
+		if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
+		{
+			[[IOSAppDelegate GetDelegate].IOSController presentViewController:ActivityVC animated:YES completion:nil];
+		}
+		else
+		{
+			// Present the view controller using the popover style.
+			ActivityVC.modalPresentationStyle = UIModalPresentationPopover;
+			[[IOSAppDelegate GetDelegate].IOSController presentViewController:ActivityVC
+							   animated:YES
+							 completion:nil];
+			
+			// Get the popover presentation controller and configure it.
+			UIPopoverPresentationController* PresentationController = [ActivityVC popoverPresentationController];
+			PresentationController.sourceView = [IOSAppDelegate GetDelegate].IOSView;
+			PresentationController.sourceRect = PopoverLocation;
+			
+		}
+#endif // !PLATFORM_TVOS
+	});
+}
+
+
+void FIOSPlatformMisc::EnableVoiceChat(bool bEnable)
+{
+	return [[IOSAppDelegate GetDelegate] EnableVoiceChat:bEnable];
+}
+
+bool FIOSPlatformMisc::IsVoiceChatEnabled()
+{
+	return [[IOSAppDelegate GetDelegate] IsVoiceChatEnabled];
+}
+
 void FIOSPlatformMisc::RegisterForRemoteNotifications()
 {
+    dispatch_async(dispatch_get_main_queue(), ^{
 #if !PLATFORM_TVOS && NOTIFICATIONS_ENABLED
 	UIApplication* application = [UIApplication sharedApplication];
 	if ([application respondsToSelector : @selector(registerUserNotificationSettings:)])
@@ -662,6 +886,7 @@ void FIOSPlatformMisc::RegisterForRemoteNotifications()
 #endif
 	}
 #endif
+    });
 }
 
 bool FIOSPlatformMisc::IsRegisteredForRemoteNotifications()
@@ -684,7 +909,7 @@ void FIOSPlatformMisc::GetValidTargetPlatforms(TArray<FString>& TargetPlatformNa
 #endif
 }
 
-bool FIOSPlatformMisc::HasActiveWiFiConnection()
+ENetworkConnectionType FIOSPlatformMisc::GetNetworkConnectionType()
 {
 	struct sockaddr_in ZeroAddress;
 	FMemory::Memzero(&ZeroAddress, sizeof(ZeroAddress));
@@ -697,6 +922,8 @@ bool FIOSPlatformMisc::HasActiveWiFiConnection()
 	CFRelease(ReachabilityRef);
 	
 	bool bHasActiveWiFiConnection = false;
+    bool bHasActiveCellConnection = false;
+    bool bInAirplaneMode = false;
 	if (bFlagsAvailable)
 	{
 		bool bReachable =	(ReachabilityFlags & kSCNetworkReachabilityFlagsReachable) != 0 &&
@@ -705,9 +932,28 @@ bool FIOSPlatformMisc::HasActiveWiFiConnection()
 		(ReachabilityFlags & kSCNetworkReachabilityFlagsInterventionRequired) == 0;
 		
 		bHasActiveWiFiConnection = bReachable && (ReachabilityFlags & kSCNetworkReachabilityFlagsIsWWAN) == 0;
+        bHasActiveCellConnection = bReachable && (ReachabilityFlags & kSCNetworkReachabilityFlagsIsWWAN) != 0;
+        bInAirplaneMode = ReachabilityFlags == 0;
 	}
 	
-	return bHasActiveWiFiConnection;
+    if (bHasActiveWiFiConnection)
+    {
+        return ENetworkConnectionType::WiFi;
+    }
+    else if (bHasActiveCellConnection)
+    {
+        return ENetworkConnectionType::Cell;
+    }
+    else if (bInAirplaneMode)
+    {
+        return ENetworkConnectionType::AirplaneMode;
+    }
+    return ENetworkConnectionType::None;
+}
+
+bool FIOSPlatformMisc::HasActiveWiFiConnection()
+{
+    return GetNetworkConnectionType() == ENetworkConnectionType::WiFi;
 }
 
 FString FIOSPlatformMisc::GetCPUVendor()
@@ -754,6 +1000,24 @@ int32 FIOSPlatformMisc::IOSVersionCompare(uint8 Major, uint8 Minor, uint8 Revisi
 	return 0;
 }
 
+void FIOSPlatformMisc::RequestDeviceCheckToken(TFunction<void(const TArray<uint8>&)> QueryCompleteFunc)
+{
+	DCDevice* DeviceCheckDevice = [DCDevice currentDevice];
+	if ([DeviceCheckDevice isSupported])
+	{
+		[DeviceCheckDevice generateTokenWithCompletionHandler : ^ (NSData * _Nullable token, NSError * _Nullable error)
+		{
+			bool bSuccess = (error == NULL);
+			if (bSuccess)
+			{
+				TArray<uint8> DeviceToken((uint8*)[token bytes], [token length]);
+
+				QueryCompleteFunc(DeviceToken);
+			}
+		}];
+	}
+}
+
 /*------------------------------------------------------------------------------
  FIOSApplicationInfo - class to contain all state for crash reporting that is unsafe to acquire in a signal.
  ------------------------------------------------------------------------------*/
@@ -1092,7 +1356,7 @@ void FIOSPlatformMisc::EndNamedEvent()
 
 void FIOSPlatformMisc::CustomNamedStat(const TCHAR* Text, float Value, const TCHAR* Graph, const TCHAR* Unit)
 {
-	FRAMEPRO_DYNAMIC_CUSTOM_STAT(Text, Value, Graph, Unit);
+	FRAMEPRO_DYNAMIC_CUSTOM_STAT(TCHAR_TO_WCHAR(Text), Value, TCHAR_TO_WCHAR(Graph), TCHAR_TO_WCHAR(Unit));
 }
 
 void FIOSPlatformMisc::CustomNamedStat(const ANSICHAR* Text, float Value, const ANSICHAR* Graph, const ANSICHAR* Unit)
@@ -1427,4 +1691,4 @@ void NewReportEnsure( const TCHAR* ErrorMessage )
     
     bReentranceGuard = false;
     EnsureLock.Unlock();
-}
\ No newline at end of file
+}
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/ICUBreakIterator.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/ICUBreakIterator.cpp
index 8cd08e25849b..bd83295a17ef 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/ICUBreakIterator.cpp
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/ICUBreakIterator.cpp
@@ -36,9 +36,9 @@ FICUBreakIteratorManager& FICUBreakIteratorManager::Get()
 
 TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateCharacterBoundaryIterator()
 {
+    FScopeLock ScopeLock(&AllocatedIteratorsCS);
 	TSharedRef<icu::BreakIterator> Iterator = MakeShareable( FInternationalization::Get().GetDefaultCulture()->Implementation->GetBreakIterator(EBreakIteratorType::Grapheme)->clone() );
 	{
-		FScopeLock ScopeLock(&AllocatedIteratorsCS);
 		AllocatedIterators.Add(Iterator);
 	}
 	return Iterator;
@@ -46,9 +46,9 @@ TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateCharacterBoundaryIt
 
 TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateWordBreakIterator()
 {
+    FScopeLock ScopeLock(&AllocatedIteratorsCS);
 	TSharedRef<icu::BreakIterator> Iterator = MakeShareable( FInternationalization::Get().GetDefaultCulture()->Implementation->GetBreakIterator(EBreakIteratorType::Word)->clone() );
 	{
-		FScopeLock ScopeLock(&AllocatedIteratorsCS);
 		AllocatedIterators.Add(Iterator);
 	}
 	return Iterator;
@@ -56,9 +56,9 @@ TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateWordBreakIterator()
 
 TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateLineBreakIterator()
 {
+    FScopeLock ScopeLock(&AllocatedIteratorsCS);
 	TSharedRef<icu::BreakIterator> Iterator = MakeShareable( FInternationalization::Get().GetDefaultCulture()->Implementation->GetBreakIterator(EBreakIteratorType::Line)->clone() );
 	{
-		FScopeLock ScopeLock(&AllocatedIteratorsCS);
 		AllocatedIterators.Add(Iterator);
 	}
 	return Iterator;
@@ -66,10 +66,10 @@ TWeakPtr<icu::BreakIterator> FICUBreakIteratorManager::CreateLineBreakIterator()
 
 void FICUBreakIteratorManager::DestroyIterator(TWeakPtr<icu::BreakIterator>& InIterator)
 {
+    FScopeLock ScopeLock(&AllocatedIteratorsCS);
 	TSharedPtr<icu::BreakIterator> Iterator = InIterator.Pin();
 	if(Iterator.IsValid())
 	{
-		FScopeLock ScopeLock(&AllocatedIteratorsCS);
 		AllocatedIterators.Remove(Iterator);
 	}
 	InIterator.Reset();
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.cpp
index 39ab178ed33e..fc6a924f4f8c 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.cpp
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.cpp
@@ -137,6 +137,7 @@ bool FICUInternationalization::Initialize()
 
 	u_setDataFileFunctions(nullptr, &FICUInternationalization::OpenDataFile, &FICUInternationalization::CloseDataFile, &(ICUStatus));
 	u_init(&(ICUStatus));
+	checkf(U_SUCCESS(ICUStatus), TEXT("Failed to open ICUInternationalization data file, missing or corrupt?"));
 
 	FICURegexManager::Create();
 	FICUBreakIteratorManager::Create();
@@ -174,6 +175,13 @@ void FICUInternationalization::Terminate()
 	CachedCultures.Empty();
 
 	u_cleanup();
+
+	for (auto& PathToCachedFileDataPair : PathToCachedFileDataMap)
+	{
+		UE_LOG(LogICUInternationalization, Warning, TEXT("ICU data file '%s' (ref count %d) was still referenced after ICU shutdown. This will likely lead to a crash."), *PathToCachedFileDataPair.Key, PathToCachedFileDataPair.Value.ReferenceCount);
+	}
+	PathToCachedFileDataMap.Empty();
+
 #if NEEDS_ICU_DLLS
 	UnloadDLLs();
 #endif //IS_PROGRAM || !IS_MONOLITHIC
@@ -836,20 +844,15 @@ void FICUInternationalization::CloseDataFile(const void* context, void* const fi
 
 FICUInternationalization::FICUCachedFileData::FICUCachedFileData(const int64 FileSize)
 	: ReferenceCount(0)
-	, Buffer( FICUOverrides::Malloc(nullptr, FileSize) )
+	, Buffer(FICUOverrides::Malloc(nullptr, FileSize))
 {
 }
 
-FICUInternationalization::FICUCachedFileData::FICUCachedFileData(const FICUCachedFileData& Source)
-{
-	checkf(false, TEXT("Cached file data for ICU may not be copy constructed. Something is trying to copy construct FICUCachedFileData."));
-}
-
 FICUInternationalization::FICUCachedFileData::FICUCachedFileData(FICUCachedFileData&& Source)
 	: ReferenceCount(Source.ReferenceCount)
-	, Buffer( Source.Buffer )
+	, Buffer(Source.Buffer)
 {
-	// Make sure the moved source object doesn't retain the pointer and free the memory we now point to.
+	Source.ReferenceCount = 0;
 	Source.Buffer = nullptr;
 }
 
@@ -857,7 +860,9 @@ FICUInternationalization::FICUCachedFileData::~FICUCachedFileData()
 {
 	if (Buffer)
 	{
-		check(ReferenceCount == 0);
+		// Removing this check as the actual crash when the lingering ICU resource is 
+		// deleted is much more useful at tracking down where the leak is coming from
+		//check(ReferenceCount == 0);
 		FICUOverrides::Free(nullptr, Buffer);
 	}
 }
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.h b/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.h
index e45a612f9275..80e2f59ae300 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.h
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/ICUInternationalization.h
@@ -107,10 +107,12 @@ private:
 	struct FICUCachedFileData
 	{
 		FICUCachedFileData(const int64 FileSize);
-		FICUCachedFileData(const FICUCachedFileData& Source);
 		FICUCachedFileData(FICUCachedFileData&& Source);
 		~FICUCachedFileData();
 
+		FICUCachedFileData(const FICUCachedFileData&) = delete;
+		FICUCachedFileData& operator=(const FICUCachedFileData&) = delete;
+
 		uint32 ReferenceCount;
 		void* Buffer;
 	};
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/ICUUtilities.h b/Engine/Source/Runtime/Core/Private/Internationalization/ICUUtilities.h
index cf7b6f89bcb0..d3db2a08cd23 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/ICUUtilities.h
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/ICUUtilities.h
@@ -46,7 +46,7 @@ namespace ICUUtilities
 	template <> struct FStringConverterImpl_PlatformSpecific<true, 2> { typedef FStringConverterImpl_NativeUTF16 Type; }; // A unicode encoding with a wchar_t size of 2 bytes is assumed to be UTF-16
 	typedef FStringConverterImpl_PlatformSpecific<FPlatformString::IsUnicodeEncoded, sizeof(TCHAR)>::Type FStringConverterImpl;
 
-	/** 
+	/**
 	 * An object that can convert between FString and icu::UnicodeString
 	 * Note: This object is not thread-safe.
 	 */
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/Internationalization.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/Internationalization.cpp
index c4ad5d994516..4737ec8b4fa1 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/Internationalization.cpp
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/Internationalization.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Internationalization/Internationalization.h"
+#include "Internationalization/TextLocalizationResource.h"
 #include "GenericPlatform/GenericPlatformFile.h"
 #include "HAL/FileManager.h"
 #include "Misc/Paths.h"
@@ -403,6 +404,16 @@ void FInternationalization::LoadAllCultureData()
 	Implementation->LoadAllCultureData();
 }
 
+bool FInternationalization::IsCultureRemapped(const FString& Name, FString* OutMappedCulture)
+{
+	return Implementation->IsCultureRemapped(Name, OutMappedCulture);
+}
+
+bool FInternationalization::IsCultureAllowed(const FString& Name)
+{
+	return Implementation->IsCultureAllowed(Name);
+}
+
 void FInternationalization::GetCultureNames(TArray<FString>& CultureNames) const
 {
 	Implementation->GetCultureNames(CultureNames);
@@ -413,61 +424,32 @@ TArray<FString> FInternationalization::GetPrioritizedCultureNames(const FString&
 	return Implementation->GetPrioritizedCultureNames(Name);
 }
 
-void FInternationalization::GetCulturesWithAvailableLocalization(const TArray<FString>& InLocalizationPaths, TArray< FCultureRef >& OutAvailableCultures, const bool bIncludeDerivedCultures)
+void FInternationalization::GetCulturesWithAvailableLocalization(const TArray<FString>& InLocalizationPaths, TArray<FCultureRef>& OutAvailableCultures, const bool bIncludeDerivedCultures)
 {
-	OutAvailableCultures.Reset();
+	const TArray<FString> LocalizedCultureNames = TextLocalizationResourceUtil::GetLocalizedCultureNames(InLocalizationPaths);
+	OutAvailableCultures = GetAvailableCultures(LocalizedCultureNames, bIncludeDerivedCultures);
+}
 
-	TArray<FString> AllLocalizationFolders;
-	IFileManager& FileManager = IFileManager::Get();
-	for(const auto& LocalizationPath : InLocalizationPaths)
-	{
-		/* Visitor class used to enumerate directories of culture */
-		class FCultureEnumeratorVistor : public IPlatformFile::FDirectoryVisitor
-		{
-		public:
-			FCultureEnumeratorVistor( TArray<FString>& OutLocalizationFolders )
-				: LocalizationFolders(OutLocalizationFolders)
-			{
-			}
-
-			virtual bool Visit(const TCHAR* FilenameOrDirectory, bool bIsDirectory) override
-			{
-				if(bIsDirectory)
-				{
-					// UE localization resource folders use "en-US" style while ICU uses "en_US"
-					const FString LocalizationFolder = FPaths::GetCleanFilename(FilenameOrDirectory);
-					const FString CanonicalName = FCulture::GetCanonicalName(LocalizationFolder);
-					LocalizationFolders.AddUnique(CanonicalName);
-				}
-
-				return true;
-			}
-
-			/** Array to fill with the names of the UE localization folders available at the given path */
-			TArray<FString>& LocalizationFolders;
-		};
-
-		FCultureEnumeratorVistor CultureEnumeratorVistor(AllLocalizationFolders);
-		FileManager.IterateDirectory(*LocalizationPath, CultureEnumeratorVistor);
-	}
+TArray<FCultureRef> FInternationalization::GetAvailableCultures(const TArray<FString>& InCultureNames, const bool bIncludeDerivedCultures)
+{
+	TArray<FCultureRef> AvailableCultures;
 
 	// Find any cultures that are a partial match for those we have translations for.
-	if(bIncludeDerivedCultures)
+	if (bIncludeDerivedCultures)
 	{
 		TArray<FString> CultureNames;
 		GetCultureNames(CultureNames);
-		for(const FString& CultureName : CultureNames)
+		for (const FString& CultureName : CultureNames)
 		{
 			FCulturePtr Culture = GetCulture(CultureName);
 			if (Culture.IsValid())
 			{
-				TArray<FString> PrioritizedParentCultureNames = Culture->GetPrioritizedParentCultureNames();
-
+				const TArray<FString> PrioritizedParentCultureNames = Culture->GetPrioritizedParentCultureNames();
 				for (const FString& PrioritizedParentCultureName : PrioritizedParentCultureNames)
 				{
-					if(AllLocalizationFolders.Contains(PrioritizedParentCultureName))
+					if (InCultureNames.Contains(PrioritizedParentCultureName) && Implementation->IsCultureAllowed(Culture->GetName()))
 					{
-						OutAvailableCultures.AddUnique(Culture.ToSharedRef());
+						AvailableCultures.AddUnique(Culture.ToSharedRef());
 						break;
 					}
 				}
@@ -477,21 +459,17 @@ void FInternationalization::GetCulturesWithAvailableLocalization(const TArray<FS
 	// Find any cultures that are a complete match for those we have translations for.
 	else
 	{
-		for(const FString& LocalizationFolder : AllLocalizationFolders)
+		for (const FString& CultureNames : InCultureNames)
 		{
-			FCulturePtr Culture = GetCulture(LocalizationFolder);
-			if(Culture.IsValid())
+			FCulturePtr Culture = GetCulture(CultureNames);
+			if (Culture.IsValid())
 			{
-				OutAvailableCultures.AddUnique(Culture.ToSharedRef());
+				AvailableCultures.AddUnique(Culture.ToSharedRef());
 			}
 		}
 	}
 
-	// Remove any cultures that were explicitly disallowed
-	OutAvailableCultures.RemoveAll([&](const FCultureRef& InCulture) -> bool
-	{
-		return !Implementation->IsCultureAllowed(InCulture->GetName());
-	});
+	return AvailableCultures;
 }
 
 FInternationalization::FInternationalization()
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.cpp
new file mode 100644
index 000000000000..d379300e4040
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.cpp
@@ -0,0 +1,167 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Internationalization/LocalizationResourceTextSource.h"
+#include "Internationalization/TextLocalizationResource.h"
+#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+#include "Misc/CoreDelegates.h"
+#include "Misc/ConfigCacheIni.h"
+
+bool FLocalizationResourceTextSource::GetNativeCultureName(const ELocalizedTextSourceCategory InCategory, FString& OutNativeCultureName)
+{
+	FString NativeCultureName = TextLocalizationResourceUtil::GetNativeCultureName(InCategory);
+	if (!NativeCultureName.IsEmpty())
+	{
+		OutNativeCultureName = MoveTemp(NativeCultureName);
+		return true;
+	}
+	return false;
+}
+
+void FLocalizationResourceTextSource::GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags, TSet<FString>& OutLocalizedCultureNames)
+{
+	TArray<FString> LocalizationPaths;
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Editor))
+	{
+		LocalizationPaths += FPaths::GetEditorLocalizationPaths();
+	}
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Game))
+	{
+		LocalizationPaths += FPaths::GetGameLocalizationPaths();
+	}
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Engine))
+	{
+		LocalizationPaths += FPaths::GetEngineLocalizationPaths();
+	}
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Additional))
+	{
+		FCoreDelegates::GatherAdditionalLocResPathsCallback.Broadcast(LocalizationPaths);
+	}
+
+	TArray<FString> LocalizedCultureNames = TextLocalizationResourceUtil::GetLocalizedCultureNames(LocalizationPaths);
+	OutLocalizedCultureNames.Append(LocalizedCultureNames);
+}
+
+void FLocalizationResourceTextSource::LoadLocalizedResources(const ELocalizationLoadFlags InLoadFlags, TArrayView<const FString> InPrioritizedCultures, FTextLocalizationResource& InOutNativeResource, FTextLocalizationResources& InOutLocalizedResources)
+{
+	// Collect the localization paths to load from.
+	TArray<FString> GameLocalizationPaths;
+	if (ShouldLoadGame(InLoadFlags))
+	{
+		GameLocalizationPaths += FPaths::GetGameLocalizationPaths();
+	}
+
+	TArray<FString> EditorNativePaths;
+	TArray<FString> EditorLocalizationPaths;
+	if (ShouldLoadEditor(InLoadFlags))
+	{
+		EditorLocalizationPaths += FPaths::GetEditorLocalizationPaths();
+		EditorLocalizationPaths += FPaths::GetToolTipLocalizationPaths();
+
+		bool bShouldUseLocalizedPropertyNames = false;
+		if (!GConfig->GetBool(TEXT("Internationalization"), TEXT("ShouldUseLocalizedPropertyNames"), bShouldUseLocalizedPropertyNames, GEditorSettingsIni))
+		{
+			GConfig->GetBool(TEXT("Internationalization"), TEXT("ShouldUseLocalizedPropertyNames"), bShouldUseLocalizedPropertyNames, GEngineIni);
+		}
+
+		if (bShouldUseLocalizedPropertyNames)
+		{
+			EditorLocalizationPaths += FPaths::GetPropertyNameLocalizationPaths();
+		}
+		else
+		{
+			EditorNativePaths += FPaths::GetPropertyNameLocalizationPaths();
+		}
+	}
+
+	TArray<FString> EngineLocalizationPaths;
+	if (ShouldLoadEngine(InLoadFlags))
+	{
+		EngineLocalizationPaths += FPaths::GetEngineLocalizationPaths();
+	}
+
+	// Gather any additional paths that are unknown to the UE4 core (such as plugins)
+	TArray<FString> AdditionalLocalizationPaths;
+	if (ShouldLoadAdditional(InLoadFlags))
+	{
+		FCoreDelegates::GatherAdditionalLocResPathsCallback.Broadcast(AdditionalLocalizationPaths);
+	}
+
+	TArray<FString> PrioritizedLocalizationPaths;
+	if (ShouldLoadLocalizedGameData(InLoadFlags))
+	{
+		PrioritizedLocalizationPaths += GameLocalizationPaths;
+	}
+	PrioritizedLocalizationPaths += EditorLocalizationPaths;
+	PrioritizedLocalizationPaths += EngineLocalizationPaths;
+	PrioritizedLocalizationPaths += AdditionalLocalizationPaths;
+
+	TArray<FString> PrioritizedNativePaths;
+	if (ShouldLoadNative(InLoadFlags))
+	{
+		PrioritizedNativePaths = PrioritizedLocalizationPaths;
+
+		if (EditorNativePaths.Num() > 0)
+		{
+			for (const FString& LocalizationPath : EditorNativePaths)
+			{
+				PrioritizedNativePaths.AddUnique(LocalizationPath);
+			}
+		}
+	}
+
+	// Load the native texts first to ensure we always apply translations to a consistent base
+	if (PrioritizedNativePaths.Num() > 0)
+	{
+		for (const FString& LocalizationPath : PrioritizedNativePaths)
+		{
+			TArray<FString> LocMetaFilenames;
+			IFileManager::Get().FindFiles(LocMetaFilenames, *(LocalizationPath / TEXT("*.locmeta")), true, false);
+
+			// There should only be zero or one LocMeta file
+			check(LocMetaFilenames.Num() <= 1);
+
+			if (LocMetaFilenames.Num() == 1)
+			{
+				FTextLocalizationMetaDataResource LocMetaResource;
+				if (LocMetaResource.LoadFromFile(LocalizationPath / LocMetaFilenames[0]))
+				{
+					// We skip loading the native text if we're transitioning to the native culture as there's no extra work that needs to be done
+					if (!InPrioritizedCultures.Contains(LocMetaResource.NativeCulture))
+					{
+						InOutNativeResource.LoadFromFile(LocalizationPath / LocMetaResource.NativeLocRes);
+					}
+				}
+			}
+		}
+	}
+
+	// The editor cheats and loads the native language's localizations.
+	if (!ShouldLoadLocalizedGameData(InLoadFlags))
+	{
+		const FString NativeGameCulture = TextLocalizationResourceUtil::GetNativeProjectCultureName();
+		if (!NativeGameCulture.IsEmpty() && GameLocalizationPaths.Num() > 0)
+		{
+			TSharedRef<FTextLocalizationResource> TextLocalizationResource = InOutLocalizedResources.EnsureResource(InPrioritizedCultures[0]);
+			for (const FString& LocalizationPath : GameLocalizationPaths)
+			{
+				const FString CulturePath = LocalizationPath / NativeGameCulture;
+				TextLocalizationResource->LoadFromDirectory(CulturePath);
+			}
+		}
+	}
+
+	// Read culture localization resources.
+	for (const FString& PrioritizedCultureName : InPrioritizedCultures)
+	{
+		if (PrioritizedLocalizationPaths.Num() > 0)
+		{
+			TSharedRef<FTextLocalizationResource> TextLocalizationResource = InOutLocalizedResources.EnsureResource(PrioritizedCultureName);
+			for (const FString& LocalizationPath : PrioritizedLocalizationPaths)
+			{
+				const FString CulturePath = LocalizationPath / PrioritizedCultureName;
+				TextLocalizationResource->LoadFromDirectory(CulturePath);
+			}
+		}
+	}
+}
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.h b/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.h
new file mode 100644
index 000000000000..47c85e35f4ed
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/LocalizationResourceTextSource.h
@@ -0,0 +1,18 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Internationalization/ILocalizedTextSource.h"
+
+/**
+ * Implementation of a localized text source that loads data from Localization Resource (LocRes) files.
+ */
+class FLocalizationResourceTextSource : public ILocalizedTextSource
+{
+public:
+	//~ ILocalizedTextSource interface
+	virtual bool GetNativeCultureName(const ELocalizedTextSourceCategory InCategory, FString& OutNativeCultureName) override;
+	virtual void GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags, TSet<FString>& OutLocalizedCultureNames) override;
+	virtual void LoadLocalizedResources(const ELocalizationLoadFlags InLoadFlags, TArrayView<const FString> InPrioritizedCultures, FTextLocalizationResource& InOutNativeResource, FTextLocalizationResources& InOutLocalizedResources) override;
+};
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextData.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextData.cpp
new file mode 100644
index 000000000000..8bf035c10f2e
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextData.cpp
@@ -0,0 +1,189 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Internationalization/PolyglotTextData.h"
+#include "Internationalization/TextLocalizationManager.h"
+#include "Internationalization/TextLocalizationResource.h"
+
+#define LOCTEXT_NAMESPACE "PolyglotTextData"
+
+FPolyglotTextData::FPolyglotTextData(const ELocalizedTextSourceCategory& InCategory, const FString& InNamespace, const FString& InKey, const FString& InNativeString, const FString& InNativeCulture)
+	: Category(InCategory)
+	, NativeCulture(InNativeCulture)
+	, Namespace(InNamespace)
+	, Key(InKey)
+	, NativeString(InNativeString)
+{
+	checkf(!Key.IsEmpty(), TEXT("Polyglot data cannot have an empty key!"));
+	checkf(!NativeString.IsEmpty(), TEXT("Polyglot data cannot have an empty native string!"));
+}
+
+bool FPolyglotTextData::IsValid(FText* OutFailureReason) const
+{
+	if (Key.IsEmpty())
+	{
+		if (OutFailureReason)
+		{
+			*OutFailureReason = LOCTEXT("ValidationError_NoKey", "Polyglot data has no key set");
+		}
+		return false;
+	}
+
+	if (NativeString.IsEmpty())
+	{
+		if (OutFailureReason)
+		{
+			*OutFailureReason = LOCTEXT("ValidationError_NoNativeString", "Polyglot data has no native string set");
+		}
+		return false;
+	}
+
+	return true;
+}
+
+void FPolyglotTextData::SetCategory(const ELocalizedTextSourceCategory InCategory)
+{
+	ClearCache();
+	Category = InCategory;
+}
+
+ELocalizedTextSourceCategory FPolyglotTextData::GetCategory() const
+{
+	return Category;
+}
+
+void FPolyglotTextData::SetNativeCulture(const FString& InNativeCulture)
+{
+	ClearCache();
+	NativeCulture = InNativeCulture;
+}
+
+const FString& FPolyglotTextData::GetNativeCulture() const
+{
+	return NativeCulture;
+}
+
+FString FPolyglotTextData::ResolveNativeCulture() const
+{
+	if (!NativeCulture.IsEmpty())
+	{
+		return NativeCulture;
+	}
+
+	FString ResolvedNativeCulture = TextLocalizationResourceUtil::GetNativeCultureName(Category);
+	if (ResolvedNativeCulture.IsEmpty())
+	{
+		ResolvedNativeCulture = TEXT("en");
+	}
+
+	return ResolvedNativeCulture;
+}
+
+TArray<FString> FPolyglotTextData::GetLocalizedCultures() const
+{
+	TArray<FString> LocalizedCultureNames;
+	LocalizedStrings.GenerateKeyArray(LocalizedCultureNames);
+	LocalizedCultureNames.Sort();
+	return LocalizedCultureNames;
+}
+
+void FPolyglotTextData::SetIdentity(const FString& InNamespace, const FString& InKey)
+{
+	checkf(!InKey.IsEmpty(), TEXT("Polyglot data cannot have an empty key!"));
+
+	ClearCache();
+	Namespace = InNamespace;
+	Key = InKey;
+}
+
+void FPolyglotTextData::GetIdentity(FString& OutNamespace, FString& OutKey) const
+{
+	OutNamespace = Namespace;
+	OutKey = Key;
+}
+
+const FString& FPolyglotTextData::GetNamespace() const
+{
+	return Namespace;
+}
+
+const FString& FPolyglotTextData::GetKey() const
+{
+	return Key;
+}
+
+void FPolyglotTextData::SetNativeString(const FString& InNativeString)
+{
+	checkf(!InNativeString.IsEmpty(), TEXT("Polyglot data cannot have an empty native string!"));
+
+	ClearCache();
+	NativeString = InNativeString;
+}
+
+const FString& FPolyglotTextData::GetNativeString() const
+{
+	return NativeString;
+}
+
+void FPolyglotTextData::AddLocalizedString(const FString& InCulture, const FString& InLocalizedString)
+{
+	checkf(!InCulture.IsEmpty(), TEXT("Culture name cannot be empty!"));
+
+	LocalizedStrings.Add(InCulture, InLocalizedString);
+}
+
+void FPolyglotTextData::RemoveLocalizedString(const FString& InCulture)
+{
+	checkf(!InCulture.IsEmpty(), TEXT("Culture name cannot be empty!"));
+
+	LocalizedStrings.Remove(InCulture);
+}
+
+bool FPolyglotTextData::GetLocalizedString(const FString& InCulture, FString& OutLocalizedString) const
+{
+	checkf(!InCulture.IsEmpty(), TEXT("Culture name cannot be empty!"));
+
+	if (const FString* FoundLocalizedString = LocalizedStrings.Find(InCulture))
+	{
+		OutLocalizedString = *FoundLocalizedString;
+		return true;
+	}
+
+	return false;
+}
+
+void FPolyglotTextData::ClearLocalizedStrings()
+{
+	LocalizedStrings.Reset();
+}
+
+FText FPolyglotTextData::GetText() const
+{
+	if (CachedText.IsEmpty())
+	{
+		const_cast<FPolyglotTextData*>(this)->CacheText();
+	}
+	return CachedText;
+}
+
+void FPolyglotTextData::CacheText(FText* OutFailureReason)
+{
+	if (IsValid(OutFailureReason))
+	{
+		FTextLocalizationManager::Get().RegisterPolyglotTextData(*this);
+		if (!FText::FindText(Namespace, Key, CachedText, &NativeString))
+		{
+			ClearCache();
+		}
+	}
+	else
+	{
+		ClearCache();
+	}
+}
+
+void FPolyglotTextData::ClearCache()
+{
+	CachedText = FText::GetEmpty();
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.cpp
new file mode 100644
index 000000000000..c7acc8a84e2c
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.cpp
@@ -0,0 +1,205 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Internationalization/PolyglotTextSource.h"
+#include "Internationalization/TextLocalizationResource.h"
+
+bool FPolyglotTextSource::GetNativeCultureName(const ELocalizedTextSourceCategory InCategory, FString& OutNativeCultureName)
+{
+	if (FCultureInfo* CultureInfo = AvailableCultureInfo.Find(InCategory))
+	{
+		for (const auto& NativeCulturePair : CultureInfo->NativeCultures)
+		{
+			OutNativeCultureName = NativeCulturePair.Key;
+			return true;
+		}
+	}
+	return false;
+}
+
+void FPolyglotTextSource::GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags, TSet<FString>& OutLocalizedCultureNames)
+{
+	auto AppendCulturesForCategory = [this, &OutLocalizedCultureNames](const ELocalizedTextSourceCategory InCategory)
+	{
+		auto AppendCulturesForMap = [&OutLocalizedCultureNames](const TMap<FString, int32>& CulturesMap)
+		{
+			TArray<FString> Cultures;
+			CulturesMap.GenerateKeyArray(Cultures);
+			OutLocalizedCultureNames.Append(Cultures);
+		};
+
+		if (FCultureInfo* CultureInfo = AvailableCultureInfo.Find(InCategory))
+		{
+			AppendCulturesForMap(CultureInfo->NativeCultures);
+			AppendCulturesForMap(CultureInfo->LocalizedCultures);
+		}
+	};
+
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Editor))
+	{
+		AppendCulturesForCategory(ELocalizedTextSourceCategory::Editor);
+	}
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Game))
+	{
+		AppendCulturesForCategory(ELocalizedTextSourceCategory::Game);
+	}
+	if (EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Engine))
+	{
+		AppendCulturesForCategory(ELocalizedTextSourceCategory::Engine);
+	}
+}
+
+void FPolyglotTextSource::LoadLocalizedResources(const ELocalizationLoadFlags InLoadFlags, TArrayView<const FString> InPrioritizedCultures, FTextLocalizationResource& InOutNativeResource, FTextLocalizationResources& InOutLocalizedResources)
+{
+	auto ShouldLoadLocalizedText = [InLoadFlags](const FPolyglotTextData& InPolyglotTextData) -> bool
+	{
+		switch (InPolyglotTextData.GetCategory())
+		{
+		case ELocalizedTextSourceCategory::Game:
+			return ShouldLoadGame(InLoadFlags);
+		case ELocalizedTextSourceCategory::Engine:
+			return ShouldLoadEngine(InLoadFlags);
+		case ELocalizedTextSourceCategory::Editor:
+			return ShouldLoadEditor(InLoadFlags);
+		default:
+			checkf(false, TEXT("Unknown ELocalizedTextSourceCategory!"));
+			break;
+		}
+		return false;
+	};
+
+	auto GetLocalizedStringForPolyglotData = [](const FPolyglotTextData& InPolyglotTextData, TArrayView<const FString> InCulturesToCheck, FString* OutLocalizedCulture = nullptr) -> FString
+	{
+		for (const FString& CultureName : InCulturesToCheck)
+		{
+			FString LocalizedString;
+			if (InPolyglotTextData.GetLocalizedString(CultureName, LocalizedString))
+			{
+				if (OutLocalizedCulture)
+				{
+					*OutLocalizedCulture = CultureName;
+				}
+				return LocalizedString;
+			}
+		}
+
+		if (OutLocalizedCulture)
+		{
+			*OutLocalizedCulture = InPolyglotTextData.ResolveNativeCulture();
+		}
+		return InPolyglotTextData.GetNativeString();
+	};
+
+	for (const auto& PolyglotTextDataPair : PolyglotTextDataMap)
+	{
+		const FPolyglotTextData& PolyglotTextData = PolyglotTextDataPair.Value;
+		const FString NativeCulture = PolyglotTextData.ResolveNativeCulture();
+
+		// We skip loading the native text if we're transitioning to the native culture as there's no extra work that needs to be done
+		if (ShouldLoadNative(InLoadFlags) && !InPrioritizedCultures.Contains(NativeCulture))
+		{
+			InOutNativeResource.AddEntry(
+				PolyglotTextData.GetNamespace(),
+				PolyglotTextData.GetKey(),
+				PolyglotTextData.GetNativeString(),
+				GetLocalizedStringForPolyglotData(PolyglotTextData, TArrayView<const FString>(&NativeCulture, 1))
+				);
+		}
+
+		if (ShouldLoadLocalizedText(PolyglotTextData))
+		{
+			if (PolyglotTextData.GetCategory() == ELocalizedTextSourceCategory::Game && !ShouldLoadLocalizedGameData(InLoadFlags))
+			{
+				// The editor cheats and loads the native language's localizations for game data.
+				TSharedRef<FTextLocalizationResource> TextLocalizationResource = InOutLocalizedResources.EnsureResource(InPrioritizedCultures[0]);
+				TextLocalizationResource->AddEntry(
+					PolyglotTextData.GetNamespace(),
+					PolyglotTextData.GetKey(),
+					PolyglotTextData.GetNativeString(),
+					GetLocalizedStringForPolyglotData(PolyglotTextData, TArrayView<const FString>(&NativeCulture, 1))
+					);
+			}
+			else
+			{
+				// Find culture localization resource.
+				FString LocalizedCulture;
+				const FString LocalizedString = GetLocalizedStringForPolyglotData(PolyglotTextData, InPrioritizedCultures, &LocalizedCulture);
+				TSharedRef<FTextLocalizationResource> TextLocalizationResource = InOutLocalizedResources.EnsureResource(LocalizedCulture);
+				TextLocalizationResource->AddEntry(
+					PolyglotTextData.GetNamespace(),
+					PolyglotTextData.GetKey(),
+					PolyglotTextData.GetNativeString(),
+					LocalizedString
+					);
+			}
+		}
+	}
+}
+
+void FPolyglotTextSource::RegisterPolyglotTextData(const FPolyglotTextData& InPolyglotTextData)
+{
+	check(InPolyglotTextData.IsValid());
+
+	const FLocKey Identity = FString::Printf(TEXT("%s::%s"), *InPolyglotTextData.GetNamespace(), *InPolyglotTextData.GetKey());
+	if (FPolyglotTextData* CurrentPolyglotData = PolyglotTextDataMap.Find(Identity))
+	{
+		UnregisterCultureNames(*CurrentPolyglotData);
+		*CurrentPolyglotData = InPolyglotTextData;
+		RegisterCultureNames(*CurrentPolyglotData);
+	}
+	else
+	{
+		PolyglotTextDataMap.Add(Identity, InPolyglotTextData);
+		RegisterCultureNames(InPolyglotTextData);
+	}
+}
+
+void FPolyglotTextSource::RegisterCultureNames(const FPolyglotTextData& InPolyglotTextData)
+{
+	auto IncrementCultureCount = [](TMap<FString, int32>& CulturesMap, const FString& CultureName)
+	{
+		if (!CultureName.IsEmpty())
+		{
+			int32& CultureCount = CulturesMap.FindOrAdd(CultureName);
+			++CultureCount;
+		}
+	};
+
+	FCultureInfo& CultureInfo = AvailableCultureInfo.FindOrAdd(InPolyglotTextData.GetCategory());
+
+	const FString& NativeCulture = InPolyglotTextData.GetNativeCulture();
+	IncrementCultureCount(CultureInfo.NativeCultures, NativeCulture);
+
+	const TArray<FString> LocalizedCultures = InPolyglotTextData.GetLocalizedCultures();
+	for (const FString& LocalizedCulture : LocalizedCultures)
+	{
+		IncrementCultureCount(CultureInfo.LocalizedCultures, LocalizedCulture);
+	}
+}
+
+void FPolyglotTextSource::UnregisterCultureNames(const FPolyglotTextData& InPolyglotTextData)
+{
+	auto DecrementCultureCount = [](TMap<FString, int32>& CulturesMap, const FString& CultureName)
+	{
+		if (!CultureName.IsEmpty())
+		{
+			int32& CultureCount = CulturesMap.FindOrAdd(CultureName);
+			--CultureCount;
+			check(CultureCount >= 0);
+			if (CultureCount == 0)
+			{
+				CulturesMap.Remove(CultureName);
+			}
+		}
+	};
+
+	FCultureInfo& CultureInfo = AvailableCultureInfo.FindOrAdd(InPolyglotTextData.GetCategory());
+
+	const FString& NativeCulture = InPolyglotTextData.GetNativeCulture();
+	DecrementCultureCount(CultureInfo.NativeCultures, NativeCulture);
+
+	const TArray<FString> LocalizedCultures = InPolyglotTextData.GetLocalizedCultures();
+	for (const FString& LocalizedCulture : LocalizedCultures)
+	{
+		DecrementCultureCount(CultureInfo.LocalizedCultures, LocalizedCulture);
+	}
+}
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.h b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.h
new file mode 100644
index 000000000000..6bd7aa0d10dd
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/PolyglotTextSource.h
@@ -0,0 +1,53 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Internationalization/ILocalizedTextSource.h"
+#include "Internationalization/PolyglotTextData.h"
+#include "Internationalization/LocKeyFuncs.h"
+
+/**
+ * Implementation of a localized text source that stores literal polyglot data registered at runtime.
+ */
+class FPolyglotTextSource : public ILocalizedTextSource
+{
+public:
+	//~ ILocalizedTextSource interface
+	virtual int32 GetPriority() const override { return ELocalizedTextSourcePriority::Highest; }
+	virtual bool GetNativeCultureName(const ELocalizedTextSourceCategory InCategory, FString& OutNativeCultureName) override;
+	virtual void GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags, TSet<FString>& OutLocalizedCultureNames) override;
+	virtual void LoadLocalizedResources(const ELocalizationLoadFlags InLoadFlags, TArrayView<const FString> InPrioritizedCultures, FTextLocalizationResource& InOutNativeResource, FTextLocalizationResources& InOutLocalizedResources) override;
+
+	/**
+	 * Register a polyglot text data with this localized text source.
+	 */
+	void RegisterPolyglotTextData(const FPolyglotTextData& InPolyglotTextData);
+
+private:
+	/**
+	 * Register the culture names associated with the given polyglot data (called as it is added to the map).
+	 */
+	void RegisterCultureNames(const FPolyglotTextData& InPolyglotTextData);
+
+	/**
+	 * Unregister the culture names associated with the given polyglot data (called as it is removed from the map).
+	 */
+	void UnregisterCultureNames(const FPolyglotTextData& InPolyglotTextData);
+
+	struct FCultureInfo
+	{
+		TMap<FString, int32> NativeCultures;
+		TMap<FString, int32> LocalizedCultures;
+	};
+
+	/**
+	 * Mapping from a localization category to the currently available culture information.
+	 */
+	TMap<ELocalizedTextSourceCategory, FCultureInfo> AvailableCultureInfo;
+
+	/**
+	 * Mapping from a "{Namespace}::{Key}" string to a polyglot text data instance.
+	 */
+	TMap<FLocKey, FPolyglotTextData> PolyglotTextDataMap;
+};
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationManager.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationManager.cpp
index adda48e1c307..95935f442645 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationManager.cpp
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationManager.cpp
@@ -2,6 +2,9 @@
 
 #include "Internationalization/TextLocalizationManager.h"
 #include "Internationalization/TextLocalizationResource.h"
+#include "Internationalization/ILocalizedTextSource.h"
+#include "Internationalization/LocalizationResourceTextSource.h"
+#include "Internationalization/PolyglotTextSource.h"
 #include "GenericPlatform/GenericPlatformFile.h"
 #include "HAL/FileManager.h"
 #include "HAL/LowLevelMemTracker.h"
@@ -9,7 +12,6 @@
 #include "Templates/ScopedPointer.h"
 #include "Misc/ScopeLock.h"
 #include "Misc/CommandLine.h"
-#include "Misc/Paths.h"
 #include "Internationalization/Culture.h"
 #include "Internationalization/Internationalization.h"
 #include "Internationalization/StringTableCore.h"
@@ -33,57 +35,19 @@ bool IsLocalizationLockedByConfig()
 	return bIsLocalizationLocked;
 }
 
-FString GetNativeGameCulture()
+void ApplyDefaultCultureSettings(const ELocalizationLoadFlags LocLoadFlags)
 {
-	// Use the native culture of any of the game targets (it is assumed that the game targets have the same native culture)
-	const TArray<FString> GameLocalizationPaths = FPaths::GetGameLocalizationPaths();
-	for (const FString& LocalizationPath : GameLocalizationPaths)
-	{
-		TArray<FString> LocMetaFilenames;
-		IFileManager::Get().FindFiles(LocMetaFilenames, *(LocalizationPath / TEXT("*.locmeta")), true, false);
-
-		// There should only be zero or one LocMeta file
-		check(LocMetaFilenames.Num() <= 1);
-
-		if (LocMetaFilenames.Num() == 1)
-		{
-			FTextLocalizationMetaDataResource LocMetaResource;
-			if (LocMetaResource.LoadFromFile(LocalizationPath / LocMetaFilenames[0]))
-			{
-				return LocMetaResource.NativeCulture;
-			}
-		}
-	}
-
-	return FString();
-}
-
-void BeginInitTextLocalization()
-{
-	// Initialize FInternationalization before we bind to OnCultureChanged, otherwise we can accidentally initialize
-	// twice since FInternationalization::Initialize sets the culture.
-	FInternationalization::Get();
-
-	FInternationalization::Get().OnCultureChanged().AddRaw( &(FTextLocalizationManager::Get()), &FTextLocalizationManager::OnCultureChanged );
-}
-
-void EndInitTextLocalization()
-{
-	double StartTime = FPlatformTime::Seconds();
-
-	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("EndInitTextLocalization"), STAT_EndInitTextLocalization, STATGROUP_LoadTime);
-
-	FStringTableRedirects::InitStringTableRedirects();
-
-	const bool ShouldLoadEditor = WITH_EDITOR;
-	const bool ShouldLoadGame = FApp::IsGame();
-	const bool ShouldLoadNative = false; // Skip loading the native texts during init as things are already in a good state
+	const bool ShouldLoadNative = EnumHasAllFlags( LocLoadFlags, ELocalizationLoadFlags::Native);
+	const bool ShouldLoadEditor = EnumHasAllFlags(LocLoadFlags, ELocalizationLoadFlags::Editor);
+	const bool ShouldLoadGame = EnumHasAllFlags(LocLoadFlags, ELocalizationLoadFlags::Game);
+	const bool ShouldLoadEngine = EnumHasAllFlags(LocLoadFlags, ELocalizationLoadFlags::Engine);
+	const bool ShouldLoadAdditional = EnumHasAllFlags(LocLoadFlags, ELocalizationLoadFlags::Additional);
 
 	FInternationalization& I18N = FInternationalization::Get();
 
 	// Set culture according to configuration now that configs are available.
 #if ENABLE_LOC_TESTING
-	if( FCommandLine::IsInitialized() && FParse::Param(FCommandLine::Get(), TEXT("LEET")) )
+	if (FCommandLine::IsInitialized() && FParse::Param(FCommandLine::Get(), TEXT("LEET")))
 	{
 		I18N.SetCurrentCulture(TEXT("LEET"));
 	}
@@ -219,7 +183,7 @@ void EndInitTextLocalization()
 		// Read defaults
 		ReadSettingsFromDefaults();
 
-		auto ValidateRequestedCulture = [ShouldLoadEditor, ShouldLoadGame, &I18N](const FString& InRequestedCulture, const FString& InFallbackCulture, const TCHAR* InLogDesc, const bool bWarnIfNotExactMatch) -> FString
+		auto ValidateRequestedCulture = [ShouldLoadEditor, ShouldLoadGame, ShouldLoadEngine, ShouldLoadAdditional, &I18N](const FString& InRequestedCulture, const FString& InFallbackCulture, const TCHAR* InLogDesc, const bool bWarnIfNotExactMatch) -> FString
 		{
 			FString TargetCultureName = InRequestedCulture;
 
@@ -227,35 +191,37 @@ void EndInitTextLocalization()
 			if (TargetCultureName != TEXT("LEET"))
 #endif
 			{
-				TArray<FString> LocalizationPaths;
+				ELocalizationLoadFlags ValidationFlags = ELocalizationLoadFlags::None;
 				if (ShouldLoadGame)
 				{
-					LocalizationPaths += FPaths::GetGameLocalizationPaths();
+					ValidationFlags |= ELocalizationLoadFlags::Game;
 				}
 				else
 				{
 					if (ShouldLoadEditor)
 					{
-						LocalizationPaths += FPaths::GetEditorLocalizationPaths();
-					}	
-					LocalizationPaths += FPaths::GetEngineLocalizationPaths();
+						ValidationFlags |= ELocalizationLoadFlags::Editor;
+					}
+					if ( ShouldLoadEngine )
+					{
+						ValidationFlags |= ELocalizationLoadFlags::Engine;
+					}
+				}
+				// before the game has initialized we may have initialized a plugin (specifically common for use of loading screens)
+				// these can support more languages then the engine
+				if (ShouldLoadAdditional)
+				{
+					ValidationFlags |= ELocalizationLoadFlags::Additional;
 				}
 
 				// Validate the locale has data or fallback to one that does.
-				TArray< FCultureRef > AvailableCultures;
-				I18N.GetCulturesWithAvailableLocalization(LocalizationPaths, AvailableCultures, false);
-
-				auto ValidateCultureName = [&AvailableCultures, &I18N](const FString& InCultureToValidate) -> FString
+				const TArray<FString> AvailableCultureNames = FTextLocalizationManager::Get().GetLocalizedCultureNames(ValidationFlags);
+				auto ValidateCultureName = [&AvailableCultureNames, &I18N](const FString& InCultureToValidate) -> FString
 				{
 					const TArray<FString> PrioritizedCultureNames = I18N.GetPrioritizedCultureNames(InCultureToValidate);
 					for (const FString& CultureName : PrioritizedCultureNames)
 					{
-						const bool bIsValidCulture = AvailableCultures.ContainsByPredicate([&](const FCultureRef& PotentialCulture) -> bool
-						{
-							return PotentialCulture->GetName() == CultureName;
-						});
-
-						if (bIsValidCulture)
+						if (AvailableCultureNames.Contains(CultureName))
 						{
 							return CultureName;
 						}
@@ -281,7 +247,7 @@ void EndInitTextLocalization()
 				}
 				else
 				{
-					TargetCultureName = AvailableCultures.Num() > 0 ? AvailableCultures[0]->GetName() : InFallbackCulture;
+					TargetCultureName = AvailableCultureNames.Num() > 0 ? AvailableCultureNames[0] : InFallbackCulture;
 					UE_LOG(LogTextLocalizationManager, Log, TEXT("No localization for '%s' exists, so '%s' will be used for the %s."), *InRequestedCulture, *TargetCultureName, InLogDesc);
 				}
 			}
@@ -293,7 +259,7 @@ void EndInitTextLocalization()
 		if (ShouldLoadGame)
 		{
 			// If this is a game, use the native culture of the game as the fallback
-			FString NativeGameCulture = GetNativeGameCulture();
+			FString NativeGameCulture = FTextLocalizationManager::Get().GetNativeCultureName(ELocalizedTextSourceCategory::Game);
 			if (!NativeGameCulture.IsEmpty())
 			{
 				FallbackLanguage = MoveTemp(NativeGameCulture);
@@ -323,6 +289,34 @@ void EndInitTextLocalization()
 			}
 		}
 	}
+}
+
+void BeginInitTextLocalization()
+{
+	// Initialize FInternationalization before we bind to OnCultureChanged, otherwise we can accidentally initialize
+	// twice since FInternationalization::Initialize sets the culture.
+	FInternationalization::Get();
+
+	FInternationalization::Get().OnCultureChanged().AddRaw(&(FTextLocalizationManager::Get()), &FTextLocalizationManager::OnCultureChanged);
+}
+
+void InitEngineTextLocalization()
+{
+	double StartTime = FPlatformTime::Seconds();
+
+	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("EndInitEngineTextLocalization"), STAT_EndInitTextLocalization, STATGROUP_LoadTime);
+
+	FStringTableRedirects::InitStringTableRedirects();
+
+	ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::None;
+	LocLoadFlags |= (WITH_EDITOR ? ELocalizationLoadFlags::Editor : ELocalizationLoadFlags::None);
+	LocLoadFlags |= ELocalizationLoadFlags::Engine;
+	LocLoadFlags |= ELocalizationLoadFlags::Additional;
+	
+	ELocalizationLoadFlags ApplyLocLoadFlags = LocLoadFlags;
+	ApplyLocLoadFlags |= FApp::IsGame() ? ELocalizationLoadFlags::Game : ELocalizationLoadFlags::None;
+
+	ApplyDefaultCultureSettings(ApplyLocLoadFlags);
 
 #if WITH_EDITOR
 	FTextLocalizationManager::Get().GameLocalizationPreviewAutoEnableCount = 0;
@@ -330,11 +324,53 @@ void EndInitTextLocalization()
 	FTextLocalizationManager::Get().bIsLocalizationLocked = IsLocalizationLockedByConfig();
 #endif
 
-	FTextLocalizationManager::Get().LoadLocalizationResourcesForCulture(I18N.GetCurrentLanguage()->GetName(), ShouldLoadEditor, ShouldLoadGame, ShouldLoadNative);
+	FInternationalization& I18N = FInternationalization::Get();
+
+	// (re)cache the native cultures for the engine and editor
+	{
+		const bool bSkipCache = true;
+		TextLocalizationResourceUtil::GetNativeEngineCultureName(bSkipCache);
+#if WITH_EDITOR
+		TextLocalizationResourceUtil::GetNativeEditorCultureName(bSkipCache);
+#endif
+	}
+
+	FTextLocalizationManager::Get().LoadLocalizationResourcesForCulture(I18N.GetCurrentLanguage()->GetName(), LocLoadFlags);
 	FTextLocalizationManager::Get().bIsInitialized = true;
-	UE_CLOG(!IS_PROGRAM, LogStreaming, Display, TEXT("Took %6.3fs to EndInitTextLocalization."), FPlatformTime::Seconds() - StartTime);
+	UE_CLOG(!IS_PROGRAM, LogStreaming, Display, TEXT("Took %6.3fs to InitEngineTextLocalization."), FPlatformTime::Seconds() - StartTime);
 }
 
+void InitGameTextLocalization()
+{
+	if ( !FApp::IsGame() )
+	{
+		// early out because we are not a game ;)
+		return;
+	}
+
+	double StartTime = FPlatformTime::Seconds();
+
+	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("InitGameTextLocalization"), STAT_EndInitTextLocalization, STATGROUP_LoadTime);
+
+	ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::None;
+	LocLoadFlags |= (FApp::IsGame() ? ELocalizationLoadFlags::Game : ELocalizationLoadFlags::None);
+
+	ApplyDefaultCultureSettings(LocLoadFlags);
+
+	FInternationalization& I18N = FInternationalization::Get();
+
+	// (re)cache the native cultures for the game
+	{
+		const bool bSkipCache = true;
+		TextLocalizationResourceUtil::GetNativeProjectCultureName(bSkipCache);
+	}
+
+	FTextLocalizationManager::Get().LoadLocalizationResourcesForCulture(I18N.GetCurrentLanguage()->GetName(), LocLoadFlags);
+	FTextLocalizationManager::Get().bIsInitialized = true;
+	UE_CLOG(!IS_PROGRAM, LogStreaming, Display, TEXT("Took %6.3fs to InitGameTextLocalization."), FPlatformTime::Seconds() - StartTime);
+}
+
+
 void FTextLocalizationManager::FDisplayStringLookupTable::Find(const FString& InNamespace, FKeysTable*& OutKeysTableForNamespace, const FString& InKey, FDisplayStringEntry*& OutDisplayStringEntry)
 {
 	// Find namespace's key table.
@@ -358,12 +394,115 @@ FTextLocalizationManager& FTextLocalizationManager::Get()
 	static FTextLocalizationManager* GTextLocalizationManager = nullptr;
 	if( !GTextLocalizationManager )
 	{
-		GTextLocalizationManager = new FTextLocalizationManager;
+		GTextLocalizationManager = new FTextLocalizationManager();
 	}
 
 	return *GTextLocalizationManager;
 }
 
+FTextLocalizationManager::FTextLocalizationManager()
+	: bIsInitialized(false)
+	, SynchronizationObject()
+	, TextRevisionCounter(0)
+	, PolyglotTextSource(MakeShared<FPolyglotTextSource>())
+{
+	const bool bRefreshResources = false;
+	RegisterTextSource(MakeShared<FLocalizationResourceTextSource>(), bRefreshResources);
+	RegisterTextSource(PolyglotTextSource.ToSharedRef(), bRefreshResources);
+}
+
+FString FTextLocalizationManager::GetNativeCultureName(const ELocalizedTextSourceCategory InCategory) const
+{
+	FString NativeCultureName;
+	for (const TSharedPtr<ILocalizedTextSource>& LocalizedTextSource : LocalizedTextSources)
+	{
+		if (LocalizedTextSource->GetNativeCultureName(InCategory, NativeCultureName))
+		{
+			break;
+		}
+	}
+	return NativeCultureName;
+}
+
+TArray<FString> FTextLocalizationManager::GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags) const
+{
+	TSet<FString> LocalizedCultureNameSet;
+	for (const TSharedPtr<ILocalizedTextSource>& LocalizedTextSource : LocalizedTextSources)
+	{
+		LocalizedTextSource->GetLocalizedCultureNames(InLoadFlags, LocalizedCultureNameSet);
+	}
+
+	TArray<FString> LocalizedCultureNames = LocalizedCultureNameSet.Array();
+	LocalizedCultureNames.Sort();
+	return LocalizedCultureNames;
+}
+
+void FTextLocalizationManager::RegisterTextSource(const TSharedRef<ILocalizedTextSource>& InLocalizedTextSource, const bool InRefreshResources)
+{
+	LocalizedTextSources.Add(InLocalizedTextSource);
+	LocalizedTextSources.StableSort([](const TSharedPtr<ILocalizedTextSource>& InLocalizedTextSourceOne, const TSharedPtr<ILocalizedTextSource>& InLocalizedTextSourceTwo)
+	{
+		return InLocalizedTextSourceOne->GetPriority() > InLocalizedTextSourceTwo->GetPriority();
+	});
+
+	if (InRefreshResources)
+	{
+		RefreshResources();
+	}
+}
+
+void FTextLocalizationManager::RegisterPolyglotTextData(const FPolyglotTextData& InPolyglotTextData, const bool InAddDisplayString)
+{
+	check(PolyglotTextSource.IsValid());
+
+	PolyglotTextSource->RegisterPolyglotTextData(InPolyglotTextData);
+
+	if (InAddDisplayString)
+	{
+		auto GetLocalizedStringForPolyglotData = [this, &InPolyglotTextData]() -> FString
+		{
+			// Work out which culture to use - this is typically the current language unless we're in the 
+			// editor where the game localization preview affects the language we use for game text
+			FString CultureName;
+			if (InPolyglotTextData.GetCategory() != ELocalizedTextSourceCategory::Game || !GIsEditor)
+			{
+				CultureName = FInternationalization::Get().GetCurrentLanguage()->GetName();;
+			}
+#if WITH_EDITOR
+			else if (bIsGameLocalizationPreviewEnabled)
+			{
+				CultureName = GetConfiguredGameLocalizationPreviewLanguage();
+			}
+#endif
+
+			if (!CultureName.IsEmpty())
+			{
+				const TArray<FString> PrioritizedCultureNames = FInternationalization::Get().GetPrioritizedCultureNames(CultureName);
+				for (const FString& PrioritizedCultureName : PrioritizedCultureNames)
+				{
+					FString LocalizedString;
+					if (InPolyglotTextData.GetLocalizedString(PrioritizedCultureName, LocalizedString))
+					{
+						return LocalizedString;
+					}
+				}
+			}
+
+			return InPolyglotTextData.GetNativeString();
+		};
+
+		TSharedPtr<FTextLocalizationResource> TextLocalizationResource = MakeShared<FTextLocalizationResource>();
+		TextLocalizationResource->AddEntry(
+			InPolyglotTextData.GetNamespace(),
+			InPolyglotTextData.GetKey(),
+			InPolyglotTextData.GetNativeString(),
+			GetLocalizedStringForPolyglotData()
+			);
+
+		UpdateFromLocalizations(TArrayView<const TSharedPtr<FTextLocalizationResource>>(&TextLocalizationResource, 1));
+	}
+}
+
 FTextDisplayStringPtr FTextLocalizationManager::FindDisplayString( const FString& Namespace, const FString& Key, const FString* const SourceString )
 {
 	FScopeLock ScopeLock( &SynchronizationObject );
@@ -373,7 +512,7 @@ FTextDisplayStringPtr FTextLocalizationManager::FindDisplayString( const FString
 
 	DisplayStringLookupTable.Find(Namespace, LiveKeyTable, Key, LiveEntry);
 
-	if ( LiveEntry != nullptr && ( !SourceString || LiveEntry->SourceStringHash == FCrc::StrCrc32(**SourceString) ) )
+	if ( LiveEntry != nullptr && ( !SourceString || LiveEntry->SourceStringHash == FTextLocalizationResource::HashString(*SourceString) ) )
 	{
 		return LiveEntry->DisplayString;
 	}
@@ -406,7 +545,7 @@ FTextDisplayStringRef FTextLocalizationManager::GetDisplayString(const FString&
 	}
 #endif
 
-	const uint32 SourceStringHash = SourceString ? FCrc::StrCrc32(**SourceString) : 0;
+	const uint32 SourceStringHash = SourceString ? FTextLocalizationResource::HashString(*SourceString) : 0;
 
 	FDisplayStringLookupTable::FKeysTable* LiveKeyTable = nullptr;
 	FDisplayStringLookupTable::FDisplayStringEntry* LiveEntry = nullptr;
@@ -495,13 +634,13 @@ FTextDisplayStringRef FTextLocalizationManager::GetDisplayString(const FString&
 		// Make entries so that they can be updated when system is initialized or a culture swap occurs.
 		FDisplayStringLookupTable::FDisplayStringEntry NewEntry(
 #if ENABLE_LOC_TESTING
-			bShouldLEETIFYAll		/*bIsLocalized*/
+			bShouldLEETIFYAll					/*bIsLocalized*/
 #else
-			false					/*bIsLocalized*/
+			false								/*bIsLocalized*/
 #endif
-			, FString()
-			, SourceStringHash		/*SourceStringHash*/
-			, UnlocalizedString		/*String*/
+			, FTextLocalizationResourceId()		/*LocResID*/
+			, SourceStringHash					/*SourceStringHash*/
+			, UnlocalizedString					/*String*/
 		);
 
 		if (!LiveKeyTable)
@@ -527,7 +666,7 @@ bool FTextLocalizationManager::GetLocResID(const FString& Namespace, const FStri
 
 	if (LiveEntry != nullptr && !LiveEntry->LocResID.IsEmpty())
 	{
-		OutLocResId = LiveEntry->LocResID;
+		OutLocResId = LiveEntry->LocResID.GetString();
 		return true;
 	}
 
@@ -576,7 +715,7 @@ bool FTextLocalizationManager::AddDisplayString(const FTextDisplayStringRef& Dis
 
 	// Add the necessary associations in both directions.
 	FDisplayStringLookupTable::FKeysTable& KeysTableForNamespace = DisplayStringLookupTable.NamespacesTable.FindOrAdd(Namespace);
-	KeysTableForNamespace.Add(Key, FDisplayStringLookupTable::FDisplayStringEntry(false, FString(), FCrc::StrCrc32(**DisplayString), DisplayString));
+	KeysTableForNamespace.Add(Key, FDisplayStringLookupTable::FDisplayStringEntry(false, FTextLocalizationResourceId(), FTextLocalizationResource::HashString(*DisplayString), DisplayString));
 	NamespaceKeyLookupTable.Add(DisplayString, FNamespaceKeyEntry(Namespace, Key));
 
 	return true;
@@ -635,26 +774,28 @@ bool FTextLocalizationManager::UpdateDisplayString(const FTextDisplayStringRef&
 
 void FTextLocalizationManager::UpdateFromLocalizationResource(const FString& LocalizationResourceFilePath)
 {
-	TArray<FTextLocalizationResource> TextLocalizationResources;
+	TSharedPtr<FTextLocalizationResource> TextLocalizationResource = MakeShared<FTextLocalizationResource>();
+	TextLocalizationResource->LoadFromFile(LocalizationResourceFilePath);
+	TextLocalizationResource->DetectAndLogConflicts();
 
-	FTextLocalizationResource& TextLocalizationResource = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-	TextLocalizationResource.LoadFromFile(LocalizationResourceFilePath);
-	TextLocalizationResource.DetectAndLogConflicts();
-
-	UpdateFromLocalizations(TextLocalizationResources);
+	UpdateFromLocalizations(TArrayView<const TSharedPtr<FTextLocalizationResource>>(&TextLocalizationResource, 1));
 }
 
-void FTextLocalizationManager::UpdateFromLocalizationResources(const TArray<FTextLocalizationResource>& TextLocalizationResources)
+void FTextLocalizationManager::UpdateFromLocalizationResources(TArrayView<const TSharedPtr<FTextLocalizationResource>> TextLocalizationResources)
 {
 	UpdateFromLocalizations(TextLocalizationResources);
 }
 
 void FTextLocalizationManager::RefreshResources()
 {
-	const bool ShouldLoadEditor = WITH_EDITOR;
-	const bool ShouldLoadGame = FApp::IsGame();
-	const bool ShouldLoadNative = true;
-	LoadLocalizationResourcesForCulture(FInternationalization::Get().GetCurrentLanguage()->GetName(), ShouldLoadEditor, ShouldLoadGame, ShouldLoadNative);
+	ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::None;
+	LocLoadFlags |= (WITH_EDITOR ? ELocalizationLoadFlags::Editor : ELocalizationLoadFlags::None);
+	LocLoadFlags |= (FApp::IsGame() ? ELocalizationLoadFlags::Game : ELocalizationLoadFlags::None);
+	LocLoadFlags |= ELocalizationLoadFlags::Engine;
+	LocLoadFlags |= ELocalizationLoadFlags::Native;
+	LocLoadFlags |= ELocalizationLoadFlags::Additional;
+
+	LoadLocalizationResourcesForCulture(FInternationalization::Get().GetCurrentLanguage()->GetName(), LocLoadFlags);
 }
 
 void FTextLocalizationManager::OnCultureChanged()
@@ -666,126 +807,62 @@ void FTextLocalizationManager::OnCultureChanged()
 		return;
 	}
 
-	const bool ShouldLoadEditor = bIsInitialized && WITH_EDITOR;
-	const bool ShouldLoadGame = bIsInitialized && FApp::IsGame();
-	const bool ShouldLoadNative = true;
-	LoadLocalizationResourcesForCulture(FInternationalization::Get().GetCurrentLanguage()->GetName(), ShouldLoadEditor, ShouldLoadGame, ShouldLoadNative);
+	ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::None;
+	LocLoadFlags |= (WITH_EDITOR ? ELocalizationLoadFlags::Editor : ELocalizationLoadFlags::None);
+	LocLoadFlags |= (FApp::IsGame() ? ELocalizationLoadFlags::Game : ELocalizationLoadFlags::None);
+	LocLoadFlags |= ELocalizationLoadFlags::Engine;
+	LocLoadFlags |= ELocalizationLoadFlags::Native;
+	LocLoadFlags |= ELocalizationLoadFlags::Additional;
+
+	LoadLocalizationResourcesForCulture(FInternationalization::Get().GetCurrentLanguage()->GetName(), LocLoadFlags);
 }
 
-void FTextLocalizationManager::LoadLocalizationResourcesForCulture(const FString& CultureName, const bool ShouldLoadEditor, const bool ShouldLoadGame, const bool ShouldLoadNative)
+void FTextLocalizationManager::LoadLocalizationResourcesForCulture(const FString& CultureName, const ELocalizationLoadFlags LocLoadFlags)
 {
     LLM_SCOPE(ELLMTag::Localization);
-    
-	const FCulturePtr Culture = FInternationalization::Get().GetCulture(CultureName);
 
 	// Can't load localization resources for a culture that doesn't exist, early-out.
+	const FCulturePtr Culture = FInternationalization::Get().GetCulture(CultureName);
 	if (!Culture.IsValid())
 	{
 		return;
 	}
 
-	const TArray<FString> PrioritizedCultureNames = FInternationalization::Get().GetPrioritizedCultureNames(CultureName);
+	LoadLocalizationResourcesForPrioritizedCultures(FInternationalization::Get().GetPrioritizedCultureNames(CultureName), LocLoadFlags);
+}
 
-	// Collect the localization paths to load from.
-	TArray<FString> GameLocalizationPaths;
-	if (ShouldLoadGame || GIsEditor)
+void FTextLocalizationManager::LoadLocalizationResourcesForPrioritizedCultures(TArrayView<const FString> PrioritizedCultureNames, const ELocalizationLoadFlags LocLoadFlags)
+{
+	LLM_SCOPE(ELLMTag::Localization);
+
+	// Nothing to do?
+	if (PrioritizedCultureNames.Num() == 0)
 	{
-		GameLocalizationPaths += FPaths::GetGameLocalizationPaths();
+		return;
 	}
 
-	TArray<FString> EditorNativePaths;
-	TArray<FString> EditorLocalizationPaths;
-	if (ShouldLoadEditor)
+	// Load the resources from each text source
+	FTextLocalizationResource NativeResource;
+	FTextLocalizationResources LocalizedResources;
+	for (const TSharedPtr<ILocalizedTextSource>& LocalizedTextSource : LocalizedTextSources)
 	{
-		EditorLocalizationPaths += FPaths::GetEditorLocalizationPaths();
-		EditorLocalizationPaths += FPaths::GetToolTipLocalizationPaths();
-
-		bool bShouldUseLocalizedPropertyNames = false;
-		if (!GConfig->GetBool(TEXT("Internationalization"), TEXT("ShouldUseLocalizedPropertyNames"), bShouldUseLocalizedPropertyNames, GEditorSettingsIni))
-		{
-			GConfig->GetBool(TEXT("Internationalization"), TEXT("ShouldUseLocalizedPropertyNames"), bShouldUseLocalizedPropertyNames, GEngineIni);
-		}
-
-		if (bShouldUseLocalizedPropertyNames)
-		{
-			EditorLocalizationPaths += FPaths::GetPropertyNameLocalizationPaths();
-		}
-		else
-		{
-			EditorNativePaths += FPaths::GetPropertyNameLocalizationPaths();
-		}
+		LocalizedTextSource->LoadLocalizedResources(LocLoadFlags, PrioritizedCultureNames, NativeResource, LocalizedResources);
 	}
 
-	TArray<FString> EngineLocalizationPaths;
-	EngineLocalizationPaths += FPaths::GetEngineLocalizationPaths();
-
-	// Gather any additional paths that are unknown to the UE4 core (such as plugins)
-	TArray<FString> AdditionalLocalizationPaths;
-	GatherAdditionalLocResPathsCallback.Broadcast(AdditionalLocalizationPaths);
-
-	TArray<FString> PrioritizedLocalizationPaths;
-	if (!GIsEditor)
-	{
-		PrioritizedLocalizationPaths += GameLocalizationPaths;
-	}
-	PrioritizedLocalizationPaths += EditorLocalizationPaths;
-	PrioritizedLocalizationPaths += EngineLocalizationPaths;
-	PrioritizedLocalizationPaths += AdditionalLocalizationPaths;
-
-	TArray<FString> PrioritizedNativePaths;
-	if (ShouldLoadNative)
-	{
-		PrioritizedNativePaths = PrioritizedLocalizationPaths;
-
-		if (EditorNativePaths.Num() > 0)
-		{
-			for (const FString& LocalizationPath : EditorNativePaths)
-			{
-				PrioritizedNativePaths.AddUnique(LocalizationPath);
-			}
-		}
-	}
-
-	// Load the native texts first to ensure we always apply translations to a consistent base
-	if (PrioritizedNativePaths.Num() > 0)
-	{
-		TArray<FTextLocalizationResource> TextLocalizationResources;
-
-		for (const FString& LocalizationPath : PrioritizedNativePaths)
-		{
-			TArray<FString> LocMetaFilenames;
-			IFileManager::Get().FindFiles(LocMetaFilenames, *(LocalizationPath / TEXT("*.locmeta")), true, false);
-
-			// There should only be zero or one LocMeta file
-			check(LocMetaFilenames.Num() <= 1);
-
-			if (LocMetaFilenames.Num() == 1)
-			{
-				FTextLocalizationMetaDataResource LocMetaResource;
-				if (LocMetaResource.LoadFromFile(LocalizationPath / LocMetaFilenames[0]))
-				{
-					// We skip loading the native text if we're transitioning to the native culture as there's no extra work that needs to be done
-					if (!PrioritizedCultureNames.Contains(LocMetaResource.NativeCulture))
-					{
-						FTextLocalizationResource& TextLocalizationResource = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-						TextLocalizationResource.LoadFromFile(LocalizationPath / LocMetaResource.NativeLocRes);
-					}
-				}
-			}
-		}
-
-		// When loc testing is enabled, UpdateFromNative also takes care of restoring non-localized text which is why the condition below is gated
+	// When loc testing is enabled, UpdateFromNative also takes care of restoring non-localized text which is why the condition below is gated
 #if !ENABLE_LOC_TESTING
-		if (TextLocalizationResources.Num() > 0)
+	if (!NativeResource.IsEmpty())
 #endif
-		{
-			UpdateFromNative(TextLocalizationResources);
-		}
+	{
+#if !UE_BUILD_SHIPPING
+		NativeResource.DetectAndLogConflicts();
+#endif
+		UpdateFromNative(NativeResource);
 	}
 
 #if ENABLE_LOC_TESTING
 	// The leet culture is fake. Just leet-ify existing strings.
-	if (CultureName == TEXT("LEET"))
+	if (PrioritizedCultureNames[0] == TEXT("LEET"))
 	{
 		for (auto NamespaceIterator = DisplayStringLookupTable.NamespacesTable.CreateIterator(); NamespaceIterator; ++NamespaceIterator)
 		{
@@ -807,49 +884,29 @@ void FTextLocalizationManager::LoadLocalizationResourcesForCulture(const FString
 	else
 #endif
 	{
-		// Prioritized array of localization resources.
-		TArray<FTextLocalizationResource> TextLocalizationResources;
-
-		// The editor cheats and loads the native language's localizations.
-		if (GIsEditor)
-		{
-			const FString NativeGameCulture = GetNativeGameCulture();
-			if (!NativeGameCulture.IsEmpty() && GameLocalizationPaths.Num() > 0)
-			{
-				FTextLocalizationResource& TextLocalizationResource = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-				for (const FString& LocalizationPath : GameLocalizationPaths)
-				{
-					const FString CulturePath = LocalizationPath / NativeGameCulture;
-					TextLocalizationResource.LoadFromDirectory(CulturePath);
-				}
-				TextLocalizationResource.DetectAndLogConflicts();
-			}
-		}
-
-		// Read culture localization resources.
+		// Apply any localized resources in the prioritized culture order
+		TArray<TSharedPtr<FTextLocalizationResource>, TInlineAllocator<4>> LocalizedResourcesToApply;
 		for (const FString& PrioritizedCultureName : PrioritizedCultureNames)
 		{
-			if (PrioritizedLocalizationPaths.Num() > 0)
+			TSharedPtr<FTextLocalizationResource> LocalizedResource = LocalizedResources.FindResource(PrioritizedCultureName);
+			if (LocalizedResource.IsValid() && !LocalizedResource->IsEmpty())
 			{
-				FTextLocalizationResource& TextLocalizationResource = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-				for (const FString& LocalizationPath : PrioritizedLocalizationPaths)
-				{
-					const FString CulturePath = LocalizationPath / PrioritizedCultureName;
-					TextLocalizationResource.LoadFromDirectory(CulturePath);
-				}
-				TextLocalizationResource.DetectAndLogConflicts();
+#if !UE_BUILD_SHIPPING
+				LocalizedResource->DetectAndLogConflicts();
+#endif
+				LocalizedResourcesToApply.Add(LocalizedResource);
 			}
 		}
 
-		if (TextLocalizationResources.Num() > 0)
+		if (LocalizedResourcesToApply.Num() > 0)
 		{
 			// Replace localizations with those of the loaded localization resources.
-			UpdateFromLocalizations(TextLocalizationResources);
+			UpdateFromLocalizations(LocalizedResourcesToApply);
 		}
 	}
 }
 
-void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationResource>& TextLocalizationResources)
+void FTextLocalizationManager::UpdateFromNative(const FTextLocalizationResource& TextLocalizationResource)
 {
 	// Note: This code doesn't handle "leet-ification" itself as it is resetting everything to a known "good" state ("leet-ification" happens later on the "good" native text)
 
@@ -878,7 +935,6 @@ void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationRe
 			const FTextLocalizationResource::FEntry* SourceEntryForUpdate = nullptr;
 
 			// Attempt to use resources in prioritized order until we find an entry.
-			for (const FTextLocalizationResource& TextLocalizationResource : TextLocalizationResources)
 			{
 				const FTextLocalizationResource::FKeysTable* const UpdateKeyTable = TextLocalizationResource.Namespaces.Find(*NamespaceNamePtr);
 				const FTextLocalizationResource::FEntryArray* const UpdateEntryArray = UpdateKeyTable ? UpdateKeyTable->Find(KeyName) : nullptr;
@@ -886,7 +942,6 @@ void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationRe
 				if (Entry)
 				{
 					SourceEntryForUpdate = Entry;
-					break;
 				}
 			}
 
@@ -911,7 +966,7 @@ void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationRe
 #endif
 			}
 
-			LiveStringEntry.LocResID = FString();
+			LiveStringEntry.LocResID = FTextLocalizationResourceId();
 			LiveStringEntry.bIsLocalized = false;
 
 #if ENABLE_LOC_TESTING
@@ -921,26 +976,25 @@ void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationRe
 	}
 
 	// Add new entries
-	for (const FTextLocalizationResource& TextLocalizationResource : TextLocalizationResources)
 	{
 		for (const auto& Namespace : TextLocalizationResource.Namespaces)
 		{
 			const FString& NamespaceName = Namespace.Key;
 			const FTextLocalizationResource::FKeysTable& NewKeyTable = Namespace.Value;
+			FDisplayStringLookupTable::FKeysTable& LiveKeyTable = DisplayStringLookupTable.NamespacesTable.FindOrAdd(NamespaceName);
 			for (const auto& Key : NewKeyTable)
 			{
 				const FString& KeyName = Key.Key;
 				const FTextLocalizationResource::FEntryArray& NewEntryArray = Key.Value;
 				const FTextLocalizationResource::FEntry& NewEntry = NewEntryArray[0];
 
-				FDisplayStringLookupTable::FKeysTable& LiveKeyTable = DisplayStringLookupTable.NamespacesTable.FindOrAdd(NamespaceName);
 				FDisplayStringLookupTable::FDisplayStringEntry* const LiveStringEntry = LiveKeyTable.Find(KeyName);
 				// Note: Anything we find in the table has already been updated above.
 				if (!LiveStringEntry)
 				{
 					FDisplayStringLookupTable::FDisplayStringEntry NewLiveEntry(
 						false,																/*bIsLocalized*/
-						FString(),															/*LocResID*/
+						FTextLocalizationResourceId(),										/*LocResID*/
 						NewEntry.SourceStringHash,											/*SourceStringHash*/
 						MakeShared<FString, ESPMode::ThreadSafe>(NewEntry.LocalizedString)	/*String*/
 						);
@@ -955,7 +1009,7 @@ void FTextLocalizationManager::UpdateFromNative(const TArray<FTextLocalizationRe
 	DirtyTextRevision();
 }
 
-void FTextLocalizationManager::UpdateFromLocalizations(const TArray<FTextLocalizationResource>& TextLocalizationResources)
+void FTextLocalizationManager::UpdateFromLocalizations(TArrayView<const TSharedPtr<FTextLocalizationResource>> TextLocalizationResources)
 {
 	// Update existing localized entries/flag existing newly-unlocalized entries.
 	for (auto& Namespace : DisplayStringLookupTable.NamespacesTable)
@@ -982,9 +1036,11 @@ void FTextLocalizationManager::UpdateFromLocalizations(const TArray<FTextLocaliz
 			const FTextLocalizationResource::FEntry* SourceEntryForUpdate = nullptr;
 
 			// Attempt to use resources in prioritized order until we find an entry.
-			for(const FTextLocalizationResource& TextLocalizationResource : TextLocalizationResources)
+			for(const TSharedPtr<FTextLocalizationResource>& TextLocalizationResource : TextLocalizationResources)
 			{
-				const FTextLocalizationResource::FKeysTable* const UpdateKeyTable = TextLocalizationResource.Namespaces.Find(*NamespaceNamePtr);
+				check(TextLocalizationResource.IsValid());
+
+				const FTextLocalizationResource::FKeysTable* const UpdateKeyTable = TextLocalizationResource->Namespaces.Find(*NamespaceNamePtr);
 				const FTextLocalizationResource::FEntryArray* const UpdateEntryArray = UpdateKeyTable ? UpdateKeyTable->Find(KeyName) : nullptr;
 				const FTextLocalizationResource::FEntry* Entry = UpdateEntryArray && UpdateEntryArray->Num() ? &((*UpdateEntryArray)[0]) : nullptr;
 				if(Entry)
@@ -1010,7 +1066,7 @@ void FTextLocalizationManager::UpdateFromLocalizations(const TArray<FTextLocaliz
 				}
 
 				LiveStringEntry.bIsLocalized = false;
-				LiveStringEntry.LocResID = FString();
+				LiveStringEntry.LocResID = FTextLocalizationResourceId();
 
 #if ENABLE_LOC_TESTING
 				const bool bShouldLEETIFYUnlocalizedString = FParse::Param(FCommandLine::Get(), TEXT("LEETIFYUnlocalized"));
@@ -1024,19 +1080,21 @@ void FTextLocalizationManager::UpdateFromLocalizations(const TArray<FTextLocaliz
 	}
 
 	// Add new entries. 
-	for(const FTextLocalizationResource& TextLocalizationResource : TextLocalizationResources)
+	for(const TSharedPtr<FTextLocalizationResource>& TextLocalizationResource : TextLocalizationResources)
 	{
-		for(const auto& Namespace : TextLocalizationResource.Namespaces)
+		check(TextLocalizationResource.IsValid());
+
+		for(const auto& Namespace : TextLocalizationResource->Namespaces)
 		{
 			const FString& NamespaceName = Namespace.Key;
 			const FTextLocalizationResource::FKeysTable& NewKeyTable = Namespace.Value;
+			FDisplayStringLookupTable::FKeysTable& LiveKeyTable = DisplayStringLookupTable.NamespacesTable.FindOrAdd(NamespaceName);
 			for(const auto& Key : NewKeyTable)
 			{
 				const FString& KeyName = Key.Key;
 				const FTextLocalizationResource::FEntryArray& NewEntryArray = Key.Value;
 				const FTextLocalizationResource::FEntry& NewEntry = NewEntryArray[0];
 
-				FDisplayStringLookupTable::FKeysTable& LiveKeyTable = DisplayStringLookupTable.NamespacesTable.FindOrAdd(NamespaceName);
 				FDisplayStringLookupTable::FDisplayStringEntry* const LiveStringEntry = LiveKeyTable.Find(KeyName);
 				// Note: Anything we find in the table has already been updated above.
 				if( !LiveStringEntry )
@@ -1093,13 +1151,12 @@ void FTextLocalizationManager::EnableGameLocalizationPreview(const FString& Cult
 	}
 
 	// We need the native game culture to be available for this preview to work correctly
-	const FString NativeGameCulture = GetNativeGameCulture();
+	const FString NativeGameCulture = GetNativeCultureName(ELocalizedTextSourceCategory::Game);
 	if (NativeGameCulture.IsEmpty())
 	{
 		return;
 	}
 
-	const TArray<FString> GameLocalizationPaths = FPaths::GetGameLocalizationPaths();
 	const FString PreviewCulture = CultureName.IsEmpty() ? NativeGameCulture : CultureName;
 	bIsGameLocalizationPreviewEnabled = PreviewCulture != NativeGameCulture;
 	bIsLocalizationLocked = IsLocalizationLockedByConfig() || bIsGameLocalizationPreviewEnabled;
@@ -1108,63 +1165,21 @@ void FTextLocalizationManager::EnableGameLocalizationPreview(const FString& Cult
 	if (bIsGameLocalizationPreviewEnabled)
 	{
 		PrioritizedCultureNames = FInternationalization::Get().GetPrioritizedCultureNames(PreviewCulture);
-
-		// Load the native texts first to ensure we always apply translations to a consistent base
-		TArray<FTextLocalizationResource> NativeTextLocalizationResources;
-		for (const FString& LocalizationPath : GameLocalizationPaths)
-		{
-			TArray<FString> LocMetaFilenames;
-			IFileManager::Get().FindFiles(LocMetaFilenames, *(LocalizationPath / TEXT("*.locmeta")), true, false);
-
-			// There should only be zero or one LocMeta file
-			check(LocMetaFilenames.Num() <= 1);
-
-			if (LocMetaFilenames.Num() == 1)
-			{
-				FTextLocalizationMetaDataResource LocMetaResource;
-				if (LocMetaResource.LoadFromFile(LocalizationPath / LocMetaFilenames[0]))
-				{
-					// We skip loading the native text if we're transitioning to the native culture as there's no extra work that needs to be done
-					if (!PrioritizedCultureNames.Contains(LocMetaResource.NativeCulture))
-					{
-						FTextLocalizationResource& NativeTextLocalizationResource = NativeTextLocalizationResources[NativeTextLocalizationResources.AddDefaulted()];
-						NativeTextLocalizationResource.LoadFromFile(LocalizationPath / LocMetaResource.NativeLocRes);
-					}
-				}
-			}
-		}
-		UpdateFromNative(NativeTextLocalizationResources);
 	}
 	else
 	{
 		PrioritizedCultureNames.Add(PreviewCulture);
 	}
 
-	TArray<FTextLocalizationResource> TextLocalizationResources;
-	for (const FString& PrioritizedCultureName : PrioritizedCultureNames)
-	{
-		if (GameLocalizationPaths.Num() > 0)
-		{
-			FTextLocalizationResource& TextLocalizationResource = TextLocalizationResources[TextLocalizationResources.AddDefaulted()];
-			for (const FString& LocalizationPath : GameLocalizationPaths)
-			{
-				const FString CulturePath = LocalizationPath / PrioritizedCultureName;
-				TextLocalizationResource.LoadFromDirectory(CulturePath);
-			}
-			TextLocalizationResource.DetectAndLogConflicts();
-		}
-	}
+	ELocalizationLoadFlags LocLoadFlags = ELocalizationLoadFlags::Game | ELocalizationLoadFlags::ForceLocalizedGame;
+	LocLoadFlags |= (bIsGameLocalizationPreviewEnabled ? ELocalizationLoadFlags::Native : ELocalizationLoadFlags::None);
 
-	if (TextLocalizationResources.Num() > 0)
-	{
-		// Replace localizations with those of the loaded localization resources.
-		UpdateFromLocalizations(TextLocalizationResources);
-	}
+	LoadLocalizationResourcesForPrioritizedCultures(PrioritizedCultureNames, LocLoadFlags);
 }
 
 void FTextLocalizationManager::DisableGameLocalizationPreview()
 {
-	EnableGameLocalizationPreview(GetNativeGameCulture());
+	EnableGameLocalizationPreview(GetNativeCultureName(ELocalizedTextSourceCategory::Game));
 }
 
 bool FTextLocalizationManager::IsGameLocalizationPreviewEnabled() const
diff --git a/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationResource.cpp b/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationResource.cpp
index 3526e1128b70..3766bf4d70a1 100644
--- a/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationResource.cpp
+++ b/Engine/Source/Runtime/Core/Private/Internationalization/TextLocalizationResource.cpp
@@ -2,8 +2,10 @@
 
 #include "Internationalization/TextLocalizationResource.h"
 #include "Internationalization/TextLocalizationResourceVersion.h"
+#include "Internationalization/Culture.h"
 #include "HAL/FileManager.h"
 #include "Misc/Paths.h"
+#include "Misc/Optional.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogTextLocalizationResource, Log, All);
 
@@ -90,6 +92,27 @@ bool FTextLocalizationMetaDataResource::SaveToArchive(FArchive& Archive, const F
 }
 
 
+void FTextLocalizationResource::AddEntry(const FString& InNamespace, const FString& InKey, const FString& InSourceString, const FString& InLocalizedString, const FTextLocalizationResourceId& InLocResID)
+{
+	AddEntry(InNamespace, InKey, HashString(InSourceString), InLocalizedString, InLocResID);
+}
+
+void FTextLocalizationResource::AddEntry(const FString& InNamespace, const FString& InKey, const uint32 InSourceStringHash, const FString& InLocalizedString, const FTextLocalizationResourceId& InLocResID)
+{
+	FKeysTable& KeyTable = Namespaces.FindOrAdd(InNamespace);
+	FEntryArray& EntryArray = KeyTable.FindOrAdd(InKey);
+
+	FEntry& NewEntry = EntryArray.AddDefaulted_GetRef();
+	NewEntry.LocResID = InLocResID;
+	NewEntry.SourceStringHash = InSourceStringHash;
+	NewEntry.LocalizedString = InLocalizedString;
+}
+
+bool FTextLocalizationResource::IsEmpty() const
+{
+	return Namespaces.Num() == 0;
+}
+
 void FTextLocalizationResource::LoadFromDirectory(const FString& DirectoryPath)
 {
 	// Find resources in the specified folder.
@@ -111,12 +134,12 @@ bool FTextLocalizationResource::LoadFromFile(const FString& FilePath)
 		return false;
 	}
 
-	bool Success = LoadFromArchive(*Reader, FilePath);
+	bool Success = LoadFromArchive(*Reader, FTextLocalizationResourceId(FilePath));
 	Success &= Reader->Close();
 	return Success;
 }
 
-bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FString& LocalizationResourceIdentifier)
+bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FTextLocalizationResourceId& LocResID)
 {
 	Archive.SetForceUnicode(true);
 
@@ -137,14 +160,14 @@ bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FString
 	{
 		// Legacy LocRes files lack the magic number, assume that's what we're dealing with, and seek back to the start of the file
 		Archive.Seek(0);
-		//UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s' failed the magic number check! Assuming this is a legacy resource (please re-generate your localization resources!)"), *LocalizationResourceIdentifier);
-		UE_LOG(LogTextLocalizationResource, Log, TEXT("LocRes '%s' failed the magic number check! Assuming this is a legacy resource (please re-generate your localization resources!)"), *LocalizationResourceIdentifier);
+		//UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s' failed the magic number check! Assuming this is a legacy resource (please re-generate your localization resources!)"), *LocResID.GetString());
+		UE_LOG(LogTextLocalizationResource, Log, TEXT("LocRes '%s' failed the magic number check! Assuming this is a legacy resource (please re-generate your localization resources!)"), *LocResID.GetString());
 	}
 
 	// Is this LocRes file too new to load?
 	if (VersionNumber > FTextLocalizationResourceVersion::ELocResVersion::Latest)
 	{
-		UE_LOG(LogTextLocalizationResource, Error, TEXT("LocRes '%s' is too new to be loaded (File Version: %d, Loader Version: %d)"), *LocalizationResourceIdentifier, (int32)VersionNumber, (int32)FTextLocalizationResourceVersion::ELocResVersion::Latest);
+		UE_LOG(LogTextLocalizationResource, Error, TEXT("LocRes '%s' is too new to be loaded (File Version: %d, Loader Version: %d)"), *LocResID.GetString(), (int32)VersionNumber, (int32)FTextLocalizationResourceVersion::ELocResVersion::Latest);
 		return false;
 	}
 
@@ -178,7 +201,7 @@ bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FString
 		uint32 KeyCount;
 		Archive << KeyCount;
 
-		FKeysTable& KeyTable = Namespaces.FindOrAdd(*Namespace);
+		FKeysTable& KeyTable = Namespaces.FindOrAdd(Namespace);
 
 		for (uint32 j = 0; j < KeyCount; ++j)
 		{
@@ -186,10 +209,10 @@ bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FString
 			FString Key;
 			Archive << Key;
 
-			FEntryArray& EntryArray = KeyTable.FindOrAdd(*Key);
+			FEntryArray& EntryArray = KeyTable.FindOrAdd(Key);
 
-			FEntry NewEntry;
-			NewEntry.LocResID = LocalizationResourceIdentifier;
+			FEntry& NewEntry = EntryArray.AddDefaulted_GetRef();
+			NewEntry.LocResID = LocResID;
 
 			// Read string entry.
 			Archive << NewEntry.SourceStringHash;
@@ -205,15 +228,13 @@ bool FTextLocalizationResource::LoadFromArchive(FArchive& Archive, const FString
 				}
 				else
 				{
-					UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s' has an invalid localized string index for namespace '%s' and key '%s'. This entry will have no translation."), *LocalizationResourceIdentifier, *Namespace, *Key);
+					UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s' has an invalid localized string index for namespace '%s' and key '%s'. This entry will have no translation."), *LocResID.GetString(), *Namespace, *Key);
 				}
 			}
 			else
 			{
 				Archive << NewEntry.LocalizedString;
 			}
-
-			EntryArray.Add(NewEntry);
 		}
 	}
 
@@ -229,12 +250,12 @@ bool FTextLocalizationResource::SaveToFile(const FString& FilePath)
 		return false;
 	}
 
-	bool bSaved = SaveToArchive(*Writer, FilePath);
+	bool bSaved = SaveToArchive(*Writer, FTextLocalizationResourceId(FilePath));
 	bSaved &= Writer->Close();
 	return bSaved;
 }
 
-bool FTextLocalizationResource::SaveToArchive(FArchive& Archive, const FString& LocResID)
+bool FTextLocalizationResource::SaveToArchive(FArchive& Archive, const FTextLocalizationResourceId& LocResID)
 {
 	Archive.SetForceUnicode(true);
 
@@ -298,7 +319,7 @@ bool FTextLocalizationResource::SaveToArchive(FArchive& Archive, const FString&
 			// Skip this key if there are no entries.
 			if (EntryArray.Num() == 0)
 			{
-				UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s': Archives contained no entries for key (%s)"), *LocResID, *Key);
+				UE_LOG(LogTextLocalizationResource, Warning, TEXT("LocRes '%s': Archives contained no entries for key (%s)"), *LocResID.GetString(), *Key);
 				continue;
 			}
 
@@ -316,7 +337,7 @@ bool FTextLocalizationResource::SaveToArchive(FArchive& Archive, const FString&
 			// Skip this key if there is no valid entry.
 			if (!Value)
 			{
-				UE_LOG(LogTextLocalizationResource, Verbose, TEXT("LocRes '%s': Archives contained only blank entries for key (%s)"), *LocResID, *Key);
+				UE_LOG(LogTextLocalizationResource, Verbose, TEXT("LocRes '%s': Archives contained only blank entries for key (%s)"), *LocResID.GetString(), *Key);
 				continue;
 			}
 
@@ -389,7 +410,7 @@ void FTextLocalizationResource::DetectAndLogConflicts() const
 						CollidingEntryListString += TEXT('\n');
 					}
 
-					CollidingEntryListString += FString::Printf(TEXT("    Localization Resource: (%s) Source String Hash: (%d) Localized String: (%s)"), *(Entry.LocResID), Entry.SourceStringHash, *(Entry.LocalizedString));
+					CollidingEntryListString += FString::Printf(TEXT("    Localization Resource: (%s) Source String Hash: (%d) Localized String: (%s)"), *(Entry.LocResID.GetString()), Entry.SourceStringHash, *(Entry.LocalizedString));
 				}
 
 				UE_LOG(LogTextLocalizationResource, Warning, TEXT("Loaded localization resources contain conflicting entries for (Namespace:%s, Key:%s):\n%s"), *NamespaceName, *KeyName, *CollidingEntryListString);
@@ -397,3 +418,126 @@ void FTextLocalizationResource::DetectAndLogConflicts() const
 		}
 	}
 }
+
+
+FString TextLocalizationResourceUtil::GetNativeCultureName(const TArray<FString>& InLocalizationPaths)
+{
+	// Use the native culture of any of the targets on the given paths (it is assumed that all targets for a particular product have the same native culture)
+	for (const FString& LocalizationPath : InLocalizationPaths)
+	{
+		TArray<FString> LocMetaFilenames;
+		IFileManager::Get().FindFiles(LocMetaFilenames, *(LocalizationPath / TEXT("*.locmeta")), true, false);
+
+		// There should only be zero or one LocMeta file
+		check(LocMetaFilenames.Num() <= 1);
+
+		if (LocMetaFilenames.Num() == 1)
+		{
+			FTextLocalizationMetaDataResource LocMetaResource;
+			if (LocMetaResource.LoadFromFile(LocalizationPath / LocMetaFilenames[0]))
+			{
+				return LocMetaResource.NativeCulture;
+			}
+		}
+	}
+
+	return FString();
+}
+
+FString TextLocalizationResourceUtil::GetNativeCultureName(const ELocalizedTextSourceCategory InCategory)
+{
+	switch (InCategory)
+	{
+	case ELocalizedTextSourceCategory::Game:
+		return GetNativeProjectCultureName();
+	case ELocalizedTextSourceCategory::Engine:
+		return GetNativeEngineCultureName();
+	case ELocalizedTextSourceCategory::Editor:
+#if WITH_EDITOR
+		return GetNativeEditorCultureName();
+#else
+		break;
+#endif
+	default:
+		checkf(false, TEXT("Unknown ELocalizedTextSourceCategory!"));
+		break;
+	}
+	return FString();
+}
+
+FString TextLocalizationResourceUtil::GetNativeProjectCultureName(const bool bSkipCache)
+{
+	static TOptional<FString> NativeProjectCultureName;
+	if (!NativeProjectCultureName.IsSet() || bSkipCache)
+	{
+		NativeProjectCultureName = TextLocalizationResourceUtil::GetNativeCultureName(FPaths::GetGameLocalizationPaths());
+	}
+	return NativeProjectCultureName.GetValue();
+}
+
+FString TextLocalizationResourceUtil::GetNativeEngineCultureName(const bool bSkipCache)
+{
+	static TOptional<FString> NativeEngineCultureName;
+	if (!NativeEngineCultureName.IsSet() || bSkipCache)
+	{
+		NativeEngineCultureName = TextLocalizationResourceUtil::GetNativeCultureName(FPaths::GetEngineLocalizationPaths());
+	}
+	return NativeEngineCultureName.GetValue();
+}
+
+#if WITH_EDITOR
+FString TextLocalizationResourceUtil::GetNativeEditorCultureName(const bool bSkipCache)
+{
+	static TOptional<FString> NativeEditorCultureName;
+	if (!NativeEditorCultureName.IsSet() || bSkipCache)
+	{
+		NativeEditorCultureName = TextLocalizationResourceUtil::GetNativeCultureName(FPaths::GetEditorLocalizationPaths());
+	}
+	return NativeEditorCultureName.GetValue();
+}
+#endif	// WITH_EDITOR
+
+TArray<FString> TextLocalizationResourceUtil::GetLocalizedCultureNames(const TArray<FString>& InLocalizationPaths)
+{
+	TArray<FString> CultureNames;
+
+	// Find all unique culture folders that exist in the given paths
+	for (const FString& LocalizationPath : InLocalizationPaths)
+	{
+		/* Visitor class used to enumerate directories of culture */
+		class FCultureEnumeratorVistor : public IPlatformFile::FDirectoryVisitor
+		{
+		public:
+			FCultureEnumeratorVistor(TArray<FString>& OutCultureNames)
+				: CultureNamesRef(OutCultureNames)
+			{
+			}
+
+			virtual bool Visit(const TCHAR* FilenameOrDirectory, bool bIsDirectory) override
+			{
+				if (bIsDirectory)
+				{
+					// UE localization resource folders use "en-US" style while ICU uses "en_US"
+					const FString LocalizationFolder = FPaths::GetCleanFilename(FilenameOrDirectory);
+					const FString CanonicalName = FCulture::GetCanonicalName(LocalizationFolder);
+					CultureNamesRef.AddUnique(CanonicalName);
+				}
+				return true;
+			}
+
+			TArray<FString>& CultureNamesRef;
+		};
+
+		FCultureEnumeratorVistor CultureEnumeratorVistor(CultureNames);
+		IFileManager::Get().IterateDirectory(*LocalizationPath, CultureEnumeratorVistor);
+	}
+
+	// Remove any cultures that were explicitly disallowed
+	FInternationalization& I18N = FInternationalization::Get();
+	CultureNames.RemoveAll([&](const FString& InCultureName) -> bool
+	{
+		return !I18N.IsCultureAllowed(InCultureName);
+	});
+
+	return CultureNames;
+}
diff --git a/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMemory.cpp b/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMemory.cpp
index 2c91edfc57f2..a06a26bb7907 100644
--- a/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMemory.cpp
+++ b/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMemory.cpp
@@ -196,6 +196,7 @@ const FPlatformMemoryConstants& FMacPlatformMemory::GetConstants()
 		MemoryConstants.BinnedPageSize = FMath::Max((SIZE_T)65536, (SIZE_T)PageSize);
 
 		MemoryConstants.TotalPhysicalGB = (MemoryConstants.TotalPhysical + 1024 * 1024 * 1024 - 1) / 1024 / 1024 / 1024;
+		MemoryConstants.AddressLimit = FPlatformMath::RoundUpToPowerOfTwo64(MemoryConstants.TotalPhysical);
 	}
 
 	return MemoryConstants;	
diff --git a/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMisc.cpp b/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMisc.cpp
index da33938eba62..a6fee0cb354f 100644
--- a/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/Mac/MacPlatformMisc.cpp
@@ -1434,8 +1434,8 @@ void FMacPlatformMisc::SetCrashHandler(void (* CrashHandler)(const FGenericCrash
 	SCOPED_AUTORELEASE_POOL;
 	
 	GCrashHandlerPointer = CrashHandler;
-	
-	if(!FMacApplicationInfo::CrashReporter && !GCrashMalloc)
+
+	if(!FMacApplicationInfo::CrashReporter && !GCrashMalloc && !CrashHandler)
 	{
 		// Configure the crash handler malloc zone to reserve some VM space for itself
 		GCrashMalloc = new FMacMallocCrashHandler( 128 * 1024 * 1024 );
diff --git a/Engine/Source/Runtime/Core/Private/Math/UnrealMath.cpp b/Engine/Source/Runtime/Core/Private/Math/UnrealMath.cpp
index eb56304e5835..6565908f0c7b 100644
--- a/Engine/Source/Runtime/Core/Private/Math/UnrealMath.cpp
+++ b/Engine/Source/Runtime/Core/Private/Math/UnrealMath.cpp
@@ -579,14 +579,14 @@ FRotator FQuat::Rotator() const
 	if (SingularityTest < -SINGULARITY_THRESHOLD)
 	{
 		RotatorFromQuat.Pitch = -90.f;
-		RotatorFromQuat.Yaw = -2.0f * FMath::Atan2(X, W) * RAD_TO_DEG;
-		RotatorFromQuat.Roll = 0.0f;
+		RotatorFromQuat.Yaw = FMath::Atan2(YawY, YawX) * RAD_TO_DEG;
+		RotatorFromQuat.Roll = FRotator::NormalizeAxis(-RotatorFromQuat.Yaw - (2.f * FMath::Atan2(X, W) * RAD_TO_DEG));
 	}
 	else if (SingularityTest > SINGULARITY_THRESHOLD)
 	{
 		RotatorFromQuat.Pitch = 90.f;
-		RotatorFromQuat.Yaw = 2.0f * FMath::Atan2(X, W) * RAD_TO_DEG;
-		RotatorFromQuat.Roll = 0.0f;
+		RotatorFromQuat.Yaw = FMath::Atan2(YawY, YawX) * RAD_TO_DEG;
+		RotatorFromQuat.Roll = FRotator::NormalizeAxis(RotatorFromQuat.Yaw - (2.f * FMath::Atan2(X, W) * RAD_TO_DEG));
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/Core/Private/Misc/App.cpp b/Engine/Source/Runtime/Core/Private/Misc/App.cpp
index 03cc78762f69..1d6b373d1600 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/App.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/App.cpp
@@ -260,9 +260,10 @@ bool FApp::ShouldUseThreadingForPerformance()
 {
 	static bool OnlyOneThread = 
 		FParse::Param(FCommandLine::Get(), TEXT("ONETHREAD")) ||
+		FParse::Param(FCommandLine::Get(), TEXT("noperfthreads")) ||
 		IsRunningDedicatedServer() ||
 		!FPlatformProcess::SupportsMultithreading() ||
-		FPlatformMisc::NumberOfCores() < 2;
+		FPlatformMisc::NumberOfCoresIncludingHyperthreads() < 4;
 	return !OnlyOneThread;
 }
 #endif // HAVE_RUNTIME_THREADING_SWITCHES
@@ -282,6 +283,7 @@ float FApp::GetUnfocusedVolumeMultiplier()
 void FApp::SetUnfocusedVolumeMultiplier(float InVolumeMultiplier)
 {
 	UnfocusedVolumeMultiplier = InVolumeMultiplier;
+	GConfig->SetFloat(TEXT("Audio"), TEXT("UnfocusedVolumeMultiplier"), UnfocusedVolumeMultiplier, GEngineIni);
 	GUnfocusedVolumeMultiplierInitialised = true;
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/Misc/AssertionMacros.cpp b/Engine/Source/Runtime/Core/Private/Misc/AssertionMacros.cpp
index da9a3688c9df..99b773f45f63 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/AssertionMacros.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/AssertionMacros.cpp
@@ -118,6 +118,7 @@ void StaticFailDebug( const TCHAR* Error, const ANSICHAR* File, int32 Line, cons
 	}
 
 	FScopeLock Lock( &FailDebugCriticalSection );
+	FPlatformMisc::LowLevelOutputDebugStringf(TEXT("%s") FILE_LINE_DESC TEXT("\n%s\n"), Error, ANSI_TO_TCHAR(File), Line, Description);
 
 	// Copy the detailed error into the error message.
 	FCString::Snprintf( GErrorMessage, ARRAY_COUNT( GErrorMessage ), TEXT( "%s" ) FILE_LINE_DESC TEXT( "\n%s\n" ), Error, ANSI_TO_TCHAR( File ), Line, DescriptionAndTrace);
@@ -290,7 +291,10 @@ void FDebug::EnsureFailed(const ANSICHAR* Expr, const ANSICHAR* File, int32 Line
 			// The reason why we don't call HeartBeat() at the end of this function is that maybe this thread
 			// Never had a heartbeat checked and may not be sending heartbeats at all which would later lead to a false positives when detecting hangs.
 			FThreadHeartBeat::Get().KillHeartBeat();
-			FGameThreadHitchHeartBeat::Get().FrameStart(true);
+			if (IsInGameThread())
+			{
+				FGameThreadHitchHeartBeat::Get().FrameStart(true);
+			}
 
 			{
 #if STATS
diff --git a/Engine/Source/Runtime/Core/Private/Misc/AutomationTest.cpp b/Engine/Source/Runtime/Core/Private/Misc/AutomationTest.cpp
index ad9d606b70c9..cff2fba38947 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/AutomationTest.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/AutomationTest.cpp
@@ -18,7 +18,7 @@ DEFINE_LOG_CATEGORY_STATIC(LogAutomationTest, Warning, All);
 
 void FAutomationTestFramework::FAutomationTestFeedbackContext::Serialize( const TCHAR* V, ELogVerbosity::Type Verbosity, const class FName& Category )
 {
-	const int32 STACK_OFFSET = 7;
+	const int32 STACK_OFFSET = 5;//FMsg::Logf_InternalImpl
 	// TODO would be nice to search for the first stack frame that isn't in outputdevice or other logging files, would be more robust.
 
 	if (!IsRunningCommandlet() && (Verbosity == ELogVerbosity::SetColor))
@@ -442,10 +442,22 @@ void FAutomationTestFramework::GetValidTestNames( TArray<FAutomationTestInfo>& T
 
 		const bool bEnabled = (CurTestFlags & EAutomationTestFlags::Disabled) == 0;
 
+		const double GenerateTestNamesStartTime = FPlatformTime::Seconds();
+		
 		if (bEnabled && bPassesApplicationRequirements && bPassesFeatureRequirements && bPassesFilterRequirement)
 		{
 			CurTest->GenerateTestNames(TestInfo);
 		}
+
+		// Make sure people are not writing complex tests that take forever to return the names of the tests
+		// otherwise the session frontend locks up when looking at your local tests.
+		const double GenerateTestNamesEndTime = FPlatformTime::Seconds();
+		const double TimeForGetTests = static_cast<float>(GenerateTestNamesEndTime - GenerateTestNamesStartTime);
+		if (TimeForGetTests > 10.0f)
+		{
+			//force a failure if a smoke test takes too long
+			UE_LOG(LogAutomationTest, Warning, TEXT("Automation Test '%s' took > 10 seconds to return from GetTests(...): %.2fs"), *CurTest->GetTestName(), (float)TimeForGetTests);
+		}
 	}
 }
 
@@ -540,18 +552,18 @@ void FAutomationTestFramework::DumpAutomationTestExecutionInfo( const TMap<FStri
 
 		UE_LOG(LogAutomationTest, Log, TEXT("%s: %s"), *CurTestName, CurExecutionInfo.bSuccessful ? *SuccessMessage : *FailMessage);
 
-		for ( const FAutomationEvent& Event : CurExecutionInfo.GetEvents() )
+		for ( const FAutomationExecutionEntry& Entry : CurExecutionInfo.GetEntries() )
 		{
-			switch ( Event.Type )
+			switch (Entry.Event.Type )
 			{
 				case EAutomationEventType::Info:
-					UE_LOG(LogAutomationTest, Display, TEXT("%s"), *Event.Message);
+					UE_LOG(LogAutomationTest, Display, TEXT("%s"), *Entry.Event.Message);
 					break;
 				case EAutomationEventType::Warning:
-					UE_LOG(LogAutomationTest, Warning, TEXT("%s"), *Event.Message);
+					UE_LOG(LogAutomationTest, Warning, TEXT("%s"), *Entry.Event.Message);
 					break;
 				case EAutomationEventType::Error:
-					UE_LOG(LogAutomationTest, Error, TEXT("%s"), *Event.Message);
+					UE_LOG(LogAutomationTest, Error, TEXT("%s"), *Entry.Event.Message);
 					break;
 			}
 		}
@@ -657,9 +669,9 @@ void FAutomationTestFramework::SetTreatWarningsAsErrors(TOptional<bool> bTreatWa
 	AutomationTestFeedbackContext.TreatWarningsAsErrors = bTreatWarningsAsErrors.IsSet() ? bTreatWarningsAsErrors.GetValue() : GWarn->TreatWarningsAsErrors;
 }
 
-void FAutomationTestFramework::NotifyScreenshotComparisonComplete(bool bWasNew, bool bWasSimilar, double MaxLocalDifference, double GlobalDifference, FString ErrorMessage)
+void FAutomationTestFramework::NotifyScreenshotComparisonComplete(const FAutomationScreenshotCompareResults& CompareResults)
 {
-	OnScreenshotCompared.Broadcast(bWasNew, bWasSimilar, MaxLocalDifference, GlobalDifference, ErrorMessage);
+	OnScreenshotCompared.Broadcast(CompareResults);
 }
 
 void FAutomationTestFramework::NotifyTestDataRetrieved(bool bWasNew, const FString& JsonData)
@@ -694,7 +706,7 @@ FAutomationTestFramework::~FAutomationTestFramework()
 	AutomationTestClassNameToInstanceMap.Empty();
 }
 
-FString FAutomationEvent::ToString() const
+FString FAutomationExecutionEntry::ToString() const
 {
 	FString ComplexString;
 
@@ -706,14 +718,14 @@ FString FAutomationEvent::ToString() const
 		ComplexString += TEXT("): ");
 	}
 
-	if ( !Context.IsEmpty() )
+	if ( !Event.Context.IsEmpty() )
 	{
 		ComplexString += TEXT("[");
-		ComplexString += Context;
+		ComplexString += Event.Context;
 		ComplexString += TEXT("] ");
 	}
 
-	ComplexString += Message;
+	ComplexString += Event.Message;
 
 	return ComplexString;
 }
@@ -724,7 +736,7 @@ void FAutomationTestExecutionInfo::Clear()
 {
 	ContextStack.Reset();
 
-	Events.Empty();
+	Entries.Empty();
 	AnalyticsItems.Empty();
 
 	Errors = 0;
@@ -740,10 +752,10 @@ int32 FAutomationTestExecutionInfo::RemoveAllEvents(EAutomationEventType EventTy
 
 int32 FAutomationTestExecutionInfo::RemoveAllEvents(TFunctionRef<bool(FAutomationEvent&)> FilterPredicate)
 {
-	int32 TotalRemoved = Events.RemoveAll([&](FAutomationEvent& Event) {
-		if ( FilterPredicate(Event) )
+	int32 TotalRemoved = Entries.RemoveAll([this, &FilterPredicate](FAutomationExecutionEntry& Entry) {
+		if (FilterPredicate(Entry.Event))
 		{
-			switch ( Event.Type )
+			switch (Entry.Event.Type)
 			{
 			case EAutomationEventType::Warning:
 				Warnings--;
@@ -761,9 +773,9 @@ int32 FAutomationTestExecutionInfo::RemoveAllEvents(TFunctionRef<bool(FAutomatio
 	return TotalRemoved;
 }
 
-void FAutomationTestExecutionInfo::AddEvent(const FAutomationEvent& Event)
+void FAutomationTestExecutionInfo::AddEvent(const FAutomationEvent& Event, int StackOffset)
 {
-	switch ( Event.Type )
+	switch (Event.Type)
 	{
 	case EAutomationEventType::Warning:
 		Warnings++;
@@ -773,12 +785,22 @@ void FAutomationTestExecutionInfo::AddEvent(const FAutomationEvent& Event)
 		break;
 	}
 
-	const int32 Index = Events.Add(Event);
-	FAutomationEvent& NewEvent = Events[Index];
-
-	if ( NewEvent.Context.IsEmpty() )
+	int32 EntryIndex = 0;
+	if (FAutomationTestFramework::Get().GetCaptureStack())
 	{
-		NewEvent.Context = GetContext();
+		TArray<FProgramCounterSymbolInfo> Stack = FPlatformStackWalk::GetStack(StackOffset + 1, 1);
+		EntryIndex = Entries.Add(FAutomationExecutionEntry(Event, Stack[0].Filename, Stack[0].LineNumber));
+	}
+	else
+	{
+		EntryIndex = Entries.Add(FAutomationExecutionEntry(Event));
+	}
+
+	FAutomationExecutionEntry& NewEntry = Entries[EntryIndex];
+
+	if (NewEntry.Event.Context.IsEmpty())
+	{
+		NewEntry.Event.Context = GetContext();
 	}
 }
 
@@ -794,6 +816,45 @@ void FAutomationTestExecutionInfo::AddError(const FString& ErrorMessage)
 
 //------------------------------------------------------------------------------
 
+FAutomationEvent FAutomationScreenshotCompareResults::ToAutomationEvent(const FString& ScreenhotName) const
+{
+	FAutomationEvent Event(EAutomationEventType::Info, TEXT(""));
+
+	if (bWasNew)
+	{
+		Event.Type = EAutomationEventType::Warning;
+		Event.Message = FString::Printf(TEXT("New Screenshot '%s' was discovered!  Please add a ground truth version of it."), *ScreenhotName);
+	}
+	else
+	{
+		if (bWasSimilar)
+		{
+			Event.Type = EAutomationEventType::Info;
+			Event.Message = FString::Printf(TEXT("Screenshot '%s' was similar!  Global Difference = %f, Max Local Difference = %f"),
+				*ScreenhotName, GlobalDifference, MaxLocalDifference);
+		}
+		else
+		{
+			Event.Type = EAutomationEventType::Error;
+
+			if (ErrorMessage.IsEmpty())
+			{
+				Event.Message = FString::Printf(TEXT("Screenshot '%s' test failed, Screnshots were different!  Global Difference = %f, Max Local Difference = %f"),
+					*ScreenhotName, GlobalDifference, MaxLocalDifference);
+			}
+			else
+			{
+				Event.Message = FString::Printf(TEXT("Screenshot '%s' test failed; Error = %s"), *ScreenhotName, *ErrorMessage);
+			}
+		}
+	}
+
+	Event.Artifact = UniqueId;
+	return Event;
+}
+
+//------------------------------------------------------------------------------
+
 void FAutomationTestBase::ClearExecutionInfo()
 {
 	ExecutionInfo.Clear();
@@ -803,31 +864,23 @@ void FAutomationTestBase::AddError(const FString& InError, int32 StackOffset)
 {
 	if( !bSuppressLogs && !IsExpectedError(InError))
 	{
-		if ( FAutomationTestFramework::Get().GetCaptureStack() )
-		{
-			TArray<FProgramCounterSymbolInfo> Stack = FPlatformStackWalk::GetStack(StackOffset + 1, 1);
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Error, InError, ExecutionInfo.GetContext(), Stack[0].Filename, Stack[0].LineNumber));
-		}
-		else
-		{
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Error, InError, ExecutionInfo.GetContext()));
-		}
+		ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Error, InError), StackOffset + 1);
 	}
 }
 
-void FAutomationTestBase::AddError(const FString& InError, const FString& InFilename, int32 InLineNumber)
+void FAutomationTestBase::AddErrorS(const FString& InError, const FString& InFilename, int32 InLineNumber)
 {
 	if ( !bSuppressLogs && !IsExpectedError(InError))
 	{
-		ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Error, InError, ExecutionInfo.GetContext(), InFilename, InLineNumber));
+		//ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Error, InError, ExecutionInfo.GetContext(), InFilename, InLineNumber));
 	}
 }
 
-void FAutomationTestBase::AddWarning(const FString& InWarning, const FString& InFilename, int32 InLineNumber)
+void FAutomationTestBase::AddWarningS(const FString& InWarning, const FString& InFilename, int32 InLineNumber)
 {
 	if ( !bSuppressLogs && !IsExpectedError(InWarning))
 	{
-		ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Warning, InWarning, ExecutionInfo.GetContext(), InFilename, InLineNumber));
+		//ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Warning, InWarning, ExecutionInfo.GetContext(), InFilename, InLineNumber));
 	}
 }
 
@@ -835,15 +888,7 @@ void FAutomationTestBase::AddWarning( const FString& InWarning, int32 StackOffse
 {
 	if ( !bSuppressLogs && !IsExpectedError(InWarning))
 	{
-		if ( FAutomationTestFramework::Get().GetCaptureStack() )
-		{
-			TArray<FProgramCounterSymbolInfo> Stack = FPlatformStackWalk::GetStack(StackOffset + 1, 1);
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Warning, InWarning, ExecutionInfo.GetContext(), Stack[0].Filename, Stack[0].LineNumber));
-		}
-		else
-		{
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Warning, InWarning, ExecutionInfo.GetContext()));
-		}
+		ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Warning, InWarning), StackOffset + 1);
 	}
 }
 
@@ -851,15 +896,7 @@ void FAutomationTestBase::AddInfo( const FString& InLogItem, int32 StackOffset )
 {
 	if ( !bSuppressLogs )
 	{
-		if ( FAutomationTestFramework::Get().GetCaptureStack() )
-		{
-			TArray<FProgramCounterSymbolInfo> Stack = FPlatformStackWalk::GetStack(StackOffset + 1, 1);
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Info, InLogItem, ExecutionInfo.GetContext(), Stack[0].Filename, Stack[0].LineNumber));
-		}
-		else
-		{
-			ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Info, InLogItem, ExecutionInfo.GetContext()));
-		}
+		ExecutionInfo.AddEvent(FAutomationEvent(EAutomationEventType::Info, InLogItem), StackOffset + 1);
 	}
 }
 
@@ -868,6 +905,14 @@ void FAutomationTestBase::AddAnalyticsItem(const FString& InAnalyticsItem)
 	ExecutionInfo.AnalyticsItems.Add(InAnalyticsItem);
 }
 
+void FAutomationTestBase::AddEvent(const FAutomationEvent& InEvent, int32 StackOffset)
+{
+	if (!bSuppressLogs)
+	{
+		ExecutionInfo.AddEvent(InEvent, StackOffset + 1);
+	}
+}
+
 bool FAutomationTestBase::HasAnyErrors() const
 {
 	return ExecutionInfo.GetErrorTotal() > 0;
@@ -915,8 +960,6 @@ bool FAutomationTestBase::HasMetExpectedErrors()
 	return HasMetAllExpectedErrors;
 }
 
-
-
 void FAutomationTestBase::SetSuccessState( bool bSuccessful )
 {
 	ExecutionInfo.bSuccessful = bSuccessful;
diff --git a/Engine/Source/Runtime/Core/Private/Misc/CString.cpp b/Engine/Source/Runtime/Core/Private/Misc/CString.cpp
index 87fc90a8bfdf..cbbb3729dc1e 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/CString.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/CString.cpp
@@ -14,10 +14,10 @@ CORE_API const ANSICHAR TCStringSpcHelper<ANSICHAR>::SpcArray[MAX_SPACES + 1] =
 
 template <>
 CORE_API const WIDECHAR TCStringSpcHelper<WIDECHAR>::SpcArray[MAX_SPACES + 1] =
-	L"                                                                "
-	L"                                                                "
-	L"                                                                "
-	L"                                                               ";
+	TEXT("                                                                ")
+	TEXT("                                                                ")
+	TEXT("                                                                ")
+	TEXT("                                                               ");
 
 template <>
 CORE_API const ANSICHAR TCStringSpcHelper<ANSICHAR>::TabArray[MAX_TABS + 1] = 
@@ -28,10 +28,10 @@ CORE_API const ANSICHAR TCStringSpcHelper<ANSICHAR>::TabArray[MAX_TABS + 1] =
 
 template <>
 CORE_API const WIDECHAR TCStringSpcHelper<WIDECHAR>::TabArray[MAX_TABS + 1] = 
-	L"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
-	L"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
-	L"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
-	L"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+	TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")
+	TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")
+	TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t")
+	TEXT("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t");
 
 bool FToBoolHelper::FromCStringAnsi( const ANSICHAR* String )
 {
@@ -41,18 +41,18 @@ bool FToBoolHelper::FromCStringAnsi( const ANSICHAR* String )
 bool FToBoolHelper::FromCStringWide( const WIDECHAR* String )
 {
 	if (
-			FCStringWide::Stricmp(String, (L"True") )==0 
-		||	FCStringWide::Stricmp(String, (L"Yes"))==0
-		||	FCStringWide::Stricmp(String, (L"On"))==0
+			FCStringWide::Stricmp(String, TEXT("True"))==0
+		||	FCStringWide::Stricmp(String, TEXT("Yes"))==0
+		||	FCStringWide::Stricmp(String, TEXT("On"))==0
 		||	FCStringWide::Stricmp(String, *(GTrue.ToString()))==0
 		||	FCStringWide::Stricmp(String, *(GYes.ToString()))==0)
 	{
 		return true;
 	}
 	else if(
-			FCStringWide::Stricmp(String, (L"False"))==0
-		||	FCStringWide::Stricmp(String, (L"No"))==0
-		||	FCStringWide::Stricmp(String, (L"Off"))==0
+			FCStringWide::Stricmp(String, TEXT("False"))==0
+		||	FCStringWide::Stricmp(String, TEXT("No"))==0
+		||	FCStringWide::Stricmp(String, TEXT("Off"))==0
 		||	FCStringWide::Stricmp(String, *(GFalse.ToString()))==0
 		||	FCStringWide::Stricmp(String, *(GNo.ToString()))==0)
 	{
diff --git a/Engine/Source/Runtime/Core/Private/Misc/ConfigCacheIni.cpp b/Engine/Source/Runtime/Core/Private/Misc/ConfigCacheIni.cpp
index 4e021af75dbc..14873c1966cb 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/ConfigCacheIni.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/ConfigCacheIni.cpp
@@ -319,6 +319,62 @@ static void FixupArrayOfStructKeysForSection(FConfigSection* Section, const FStr
 	}
 }
 
+
+/**
+ * Check if an ini file exists, allowing a delegate to determine if it will handle loading it
+ */
+static bool DoesConfigFileExistWrapper(const TCHAR* IniFile)
+{
+	// will any delegates return contents via PreLoadConfigFileDelegate()?
+	int32 ResponderCount = 0;
+	FCoreDelegates::CountPreLoadConfigFileRespondersDelegate.Broadcast(IniFile, ResponderCount);
+
+	if (ResponderCount > 0)
+	{
+		return true;
+	}
+
+	// otherwise just look for the normal file to exist
+	return IFileManager::Get().FileSize(IniFile) >= 0;
+}
+
+/**
+ * Load ini file, but allowing a delegate to handle the loading instead of the standard file load
+ */
+static bool LoadConfigFileWrapper(const TCHAR* IniFile, FString& Contents)
+{
+	// let other systems load the file instead of the standard load below
+	FCoreDelegates::PreLoadConfigFileDelegate.Broadcast(IniFile, Contents);
+
+	// if this loaded any text, we are done, and we won't override the contents with standard ini file data
+	if (Contents.Len())
+	{
+		return true;
+	}
+
+	// note: we don't check if FileOperations are disabled because downloadable content calls this directly (which
+	// needs file ops), and the other caller of this is already checking for disabled file ops
+	// and don't read from the file, if the delegate got anything loaded
+	return FFileHelper::LoadFileToString(Contents, IniFile);
+}
+
+/**
+ * Save an ini file, with delegates also saving the file (its safe to allow both to happen, even tho loading doesn't behave this way)
+ */
+static bool SaveConfigFileWrapper(const TCHAR* IniFile, const FString& Contents)
+{
+	// let anyone that needs to save it, do so (counting how many did)
+	int32 SavedCount = 0;
+	FCoreDelegates::PreSaveConfigFileDelegate.Broadcast(IniFile, Contents, SavedCount);
+
+	// save it even if a delegate did as well
+	bool bLocalWriteSucceeded = FFileHelper::SaveStringToFile(Contents, IniFile);
+
+	// success is based on a delegate or file write working (or both)
+	return SavedCount > 0 || bLocalWriteSucceeded;
+}
+
+
 /*-----------------------------------------------------------------------------
 	FConfigFile
 -----------------------------------------------------------------------------*/
@@ -384,9 +440,8 @@ FConfigSection* FConfigFile::FindOrAddSection(const FString& SectionName)
 bool FConfigFile::Combine(const FString& Filename)
 {
 	FString Text;
-	// note: we don't check if FileOperations are disabled because downloadable content calls this directly (which
-	// needs file ops), and the other caller of this is already checking for disabled file ops
-	if( FFileHelper::LoadFileToString( Text, *Filename ) )
+
+	if (LoadConfigFileWrapper(*Filename, Text))
 	{
 		if (Text.StartsWith("#!"))
 		{
@@ -728,7 +783,7 @@ void FConfigFile::Read( const FString& Filename )
 		Empty();
 		FString Text;
 
-		if( FFileHelper::LoadFileToString( Text, *Filename ) )
+		if (LoadConfigFileWrapper(*Filename, Text))
 		{
 			// process the contents of the string
 			ProcessInputFileContents(Text);
@@ -902,7 +957,7 @@ static bool LoadIniFileHierarchy(const FConfigFileHierarchy& HierarchyToLoad, FC
 		{
 			const FIniFilename& IniToLoad = HierarchyIt.Value;
 			if (IniToLoad.bRequired == false &&
-				 (!IsUsingLocalIniFile(*IniToLoad.Filename, nullptr) || IFileManager::Get().FileSize(*IniToLoad.Filename) >= 0))
+				 (!IsUsingLocalIniFile(*IniToLoad.Filename, nullptr) || DoesConfigFileExistWrapper(*IniToLoad.Filename)))
 			{
 				NumExistingOptionalInis++;
 			}
@@ -960,7 +1015,7 @@ static bool LoadIniFileHierarchy(const FConfigFileHierarchy& HierarchyToLoad, FC
 			if (bDoProcess)
 			{
 				// Spit out friendly error if there was a problem locating .inis (e.g. bad command line parameter or missing folder, ...).
-				if (IsUsingLocalIniFile(*IniFileName, nullptr) && (IFileManager::Get().FileSize(*IniFileName) < 0))
+				if (IsUsingLocalIniFile(*IniFileName, nullptr) && !DoesConfigFileExistWrapper(*IniFileName))
 				{
 					if (IniToLoad.bRequired)
 					{
@@ -1238,7 +1293,8 @@ bool FConfigFile::Write( const FString& Filename, bool bDoRemoteWrite/* = true*/
 		// Write out the remote version (assuming it was loaded)
 		FRemoteConfig::Get()->Write(*Filename, Text);
 	}
-	bool bResult = FFileHelper::SaveStringToFile( Text, *Filename );
+
+	bool bResult = SaveConfigFileWrapper(*Filename, Text);
 
 #if INI_CACHE
 	// if we wrote the config successfully
@@ -1502,7 +1558,7 @@ void FConfigFile::SaveSourceToBackupFile()
 		Text += LINE_TERMINATOR;
 	}
 
-	if(!FFileHelper::SaveStringToFile( Text, *Filename ))
+	if(!SaveConfigFileWrapper(*Filename, Text))
 	{
 		UE_LOG(LogConfig, Warning, TEXT("Failed to saved backup for config[%s]"), *Name.ToString());
 	}
@@ -1628,7 +1684,7 @@ FConfigFile* FConfigCacheIni::Find( const FString& Filename, bool CreateIfNotFou
 	// Get file.
 	FConfigFile* Result = TMap<FString,FConfigFile>::Find( Filename );
 	// this is || filesize so we load up .int files if file IO is allowed
-	if( !Result && !bAreFileOperationsDisabled && (CreateIfNotFound || ( IFileManager::Get().FileSize(*Filename) >= 0 ) ) )
+	if( !Result && !bAreFileOperationsDisabled && (CreateIfNotFound || DoesConfigFileExistWrapper(*Filename) ) )
 	{
 		Result = &Add( Filename, FConfigFile() );
 		Result->Read( Filename );
@@ -1843,7 +1899,7 @@ void FConfigCacheIni::Parse1ToNSectionOfStrings(const TCHAR* Section, const TCHA
 void FConfigCacheIni::LoadFile( const FString& Filename, const FConfigFile* Fallback, const TCHAR* PlatformString )
 {
 	// if the file has some data in it, read it in
-	if( !IsUsingLocalIniFile(*Filename, nullptr) || (IFileManager::Get().FileSize(*Filename) >= 0) )
+	if( !IsUsingLocalIniFile(*Filename, nullptr) || DoesConfigFileExistWrapper(*Filename) )
 	{
 		FConfigFile* Result = &Add(Filename, FConfigFile());
 		bool bDoEmptyConfig = false;
@@ -2811,7 +2867,7 @@ bool FConfigCacheIni::ForEachEntry(const FKeyValueSink& Visitor, const TCHAR* Se
  **/
 static void LoadAnIniFile(const FString& FilenameToLoad, FConfigFile& ConfigFile)
 {
-	if( !IsUsingLocalIniFile(*FilenameToLoad, nullptr) || (IFileManager::Get().FileSize( *FilenameToLoad ) >= 0) )
+	if( !IsUsingLocalIniFile(*FilenameToLoad, nullptr) || DoesConfigFileExistWrapper(*FilenameToLoad) )
 	{
 		ProcessIniContents(*FilenameToLoad, *FilenameToLoad, &ConfigFile, false, false);
 	}
@@ -3199,7 +3255,11 @@ void FConfigCacheIni::InitializeConfigSystem()
 	FConfigCacheIni::LoadGlobalIniFile(GHardwareIni, TEXT("Hardware"));
 	
 	// Load user game settings .ini, allowing merging. This also updates the user .ini if necessary.
+#if PLATFORM_PS4
+	FConfigCacheIni::LoadGlobalIniFile(GGameUserSettingsIni, TEXT("GameUserSettings"), nullptr, false, false, true, *GetGameUserSettingsDir());
+#else
 	FConfigCacheIni::LoadGlobalIniFile(GGameUserSettingsIni, TEXT("GameUserSettings"));
+#endif
 
 	// now we can make use of GConfig
 	GConfig->bIsReadyForUse = true;
@@ -3315,6 +3375,8 @@ bool FConfigCacheIni::LoadExternalIniFile(FConfigFile& ConfigFile, const TCHAR*
 
 		// now generate and make sure it's up to date (using IniName as a Base for an ini filename)
 		const bool bAllowGeneratedINIs = true;
+		// @todo This bNeedsWrite afaict is always true even if it loaded a completely valid generated/final .ini, and the write below will
+		// just write out the exact same thing it read in!
 		bool bNeedsWrite = GenerateDestIniFile(ConfigFile, DestIniFilename, ConfigFile.SourceIniHierarchy, bAllowGeneratedIniWhenCooked, true);
 
 		ConfigFile.Name = IniName;
@@ -3356,13 +3418,30 @@ void FConfigCacheIni::LoadConsoleVariablesFromINI()
 	IConsoleManager::Get().CallAllConsoleVariableSinks();
 }
 
+FString FConfigCacheIni::GetGameUserSettingsDir()
+{
+	// Default value from LoadGlobalIniFile
+	FString ConfigDir = FPaths::GeneratedConfigDir();
+
+#if PLATFORM_PS4
+	bool bUsesDownloadZero = false;
+	if (GConfig->GetBool(TEXT("/Script/PS4PlatformEditor.PS4TargetSettings"), TEXT("bUsesDownloadZero"), bUsesDownloadZero, GEngineIni) && bUsesDownloadZero)
+	{
+		// Allow loading/saving via /download0/
+		ConfigDir = FPlatformProcess::UserSettingsDir();
+	}
+#endif
+
+	return ConfigDir;
+}
+
 void FConfigFile::UpdateSections(const TCHAR* DiskFilename, const TCHAR* IniRootName/*=nullptr*/, const TCHAR* OverridePlatform/*=nullptr*/)
 {
 	// since we don't want any modifications to other sections, we manually process the file, not read into sections, etc
 	FString DiskFile;
 	FString NewFile;
 	bool bIsLastLineEmtpy = false;
-	if (FFileHelper::LoadFileToString(DiskFile, DiskFilename))
+	if (LoadConfigFileWrapper(DiskFilename, DiskFile))
 	{
 		// walk each line
 		const TCHAR* Ptr = DiskFile.Len() > 0 ? *DiskFile : nullptr;
@@ -3477,7 +3556,7 @@ public:
 		UpdatePropertyInSection();
 		// Rebuild the file with the updated section.
 		const FString NewFile = IniFileMakeup.BeforeSection + IniFileMakeup.Section + IniFileMakeup.AfterSection;
-		return FFileHelper::SaveStringToFile(NewFile, *IniFilename);
+		return SaveConfigFileWrapper(*IniFilename, NewFile);
 	}
 
 
@@ -3554,7 +3633,7 @@ private:
 	void PopulateFileContentHelper()
 	{
 		FString UnprocessedFileContents;
-		if (FFileHelper::LoadFileToString(UnprocessedFileContents, *IniFilename))
+		if (LoadConfigFileWrapper(*IniFilename, UnprocessedFileContents))
 		{
 			// Find the section in the file text.
 			const FString DecoratedSectionName = FString::Printf(TEXT("[%s]"), *SectionName);
@@ -3652,6 +3731,28 @@ bool FConfigFile::UpdateSinglePropertyInSection(const TCHAR* DiskFilename, const
 	return bSuccessfullyUpdatedFile;
 }
 
+const TCHAR* ConvertValueFromHumanFriendlyValue( const TCHAR* Value )
+{
+	static const TCHAR* OnValue = TEXT("1");
+	static const TCHAR* OffValue = TEXT("0");
+
+	// allow human friendly names
+	if (FCString::Stricmp(Value, TEXT("True")) == 0
+		|| FCString::Stricmp(Value, TEXT("Yes")) == 0
+		|| FCString::Stricmp(Value, TEXT("On")) == 0)
+	{
+		return OnValue;
+	}
+	else if (FCString::Stricmp(Value, TEXT("False")) == 0
+		|| FCString::Stricmp(Value, TEXT("No")) == 0
+		|| FCString::Stricmp(Value, TEXT("Off")) == 0)
+	{
+		return OffValue;
+	}
+	return Value;
+}
+
+
 // @param IniFile for error reporting
 // to have one single function to set a cvar from ini (handing friendly names, cheats for shipping and message about cheats in non shipping)
 CORE_API void OnSetCVarFromIniEntry(const TCHAR *IniFile, const TCHAR *Key, const TCHAR* Value, uint32 SetBy, bool bAllowCheating)
@@ -3659,19 +3760,8 @@ CORE_API void OnSetCVarFromIniEntry(const TCHAR *IniFile, const TCHAR *Key, cons
 	check(IniFile && Key && Value);
 	check((SetBy & ~ECVF_SetByMask) == 0);
 
-	// allow human friendly names
-	if (FCString::Stricmp(Value, TEXT("True")) == 0
-	|| FCString::Stricmp(Value, TEXT("Yes")) == 0
-	|| FCString::Stricmp(Value, TEXT("On")) == 0)
-	{
-		Value = TEXT("1");
-	}
-	else if(FCString::Stricmp(Value, TEXT("False")) == 0
-	|| FCString::Stricmp(Value, TEXT("No")) == 0
-	|| FCString::Stricmp(Value, TEXT("Off")) == 0)
-	{
-		Value = TEXT("0");
-	}
+
+	Value = ConvertValueFromHumanFriendlyValue(Value);
 
 	IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(Key); 
 
@@ -3718,8 +3808,11 @@ CORE_API void OnSetCVarFromIniEntry(const TCHAR *IniFile, const TCHAR *Key, cons
 	}
 }
 
+
 void ApplyCVarSettingsFromIni(const TCHAR* InSectionName, const TCHAR* InIniFilename, uint32 SetBy, bool bAllowCheating)
 {
+	FCoreDelegates::OnApplyCVarFromIni.Broadcast(InSectionName, InIniFilename, SetBy, bAllowCheating);
+
 	if(FConfigSection* Section = GConfig->GetSectionPrivate(InSectionName, false, true, InIniFilename))
 	{
 		for(FConfigSectionMap::TConstIterator It(*Section); It; ++It)
@@ -3745,3 +3838,158 @@ void ApplyCVarSettingsGroupFromIni(const TCHAR* InSectionBaseName, const TCHAR*
 	FString SectionName = FString::Printf(TEXT("%s@%s"), InSectionBaseName, InSectionTag);
 	ApplyCVarSettingsFromIni(*SectionName, InIniFilename, SetBy);
 }
+
+
+
+
+
+class FCVarIniHistoryHelper
+{
+private:
+	struct FCVarIniHistory
+	{
+		FCVarIniHistory(const FString& InSectionName, const FString& InIniName, uint32 InSetBy, bool InbAllowCheating) :
+			SectionName(InSectionName), FileName(InIniName), SetBy(InSetBy), bAllowCheating(InbAllowCheating)
+		{}
+
+		FString SectionName;
+		FString FileName;
+		uint32 SetBy;
+		bool bAllowCheating;
+	};
+	TArray<FCVarIniHistory> CVarIniHistory;
+	bool bRecurseCheck;
+
+	void OnApplyCVarFromIniCallback(const TCHAR* SectionName, const TCHAR* IniFilename, uint32 SetBy, bool bAllowCheating)
+	{
+		if ( bRecurseCheck == true )
+		{
+			return;
+		}
+		CVarIniHistory.Add(FCVarIniHistory(SectionName, IniFilename, SetBy, bAllowCheating));
+	}
+
+
+public:
+	FCVarIniHistoryHelper() : bRecurseCheck( false )
+	{
+		
+		FCoreDelegates::OnApplyCVarFromIni.AddRaw(this, &FCVarIniHistoryHelper::OnApplyCVarFromIniCallback);
+	}
+
+	~FCVarIniHistoryHelper()
+	{
+		FCoreDelegates::OnApplyCVarFromIni.RemoveAll(this);
+	}
+
+
+
+	void ReapplyIniHistory()
+	{
+		for (const FCVarIniHistory& IniHistory : CVarIniHistory)
+		{
+			const FString& SectionName = IniHistory.SectionName;
+			const FString& IniFilename = IniHistory.FileName;
+			const uint32& SetBy = IniHistory.SetBy;
+			if (FConfigSection* Section = GConfig->GetSectionPrivate(*SectionName, false, true, *IniFilename))
+			{
+				for (FConfigSectionMap::TConstIterator It(*Section); It; ++It)
+				{
+					const FString& KeyString = It.Key().GetPlainNameString();
+					const FString& ValueString = It.Value().GetValue();
+
+
+					IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(*KeyString);
+
+					if ( !CVar )
+					{
+						continue;
+					}
+
+					// if this cvar was last set by this config setting 
+					// then we want to reapply any new changes
+					if (!CVar->TestFlags((EConsoleVariableFlags)SetBy))
+					{
+						continue;
+					}
+
+					// convert to human friendly string
+					const TCHAR* HumanFriendlyValue = ConvertValueFromHumanFriendlyValue(*ValueString);
+					const FString CurrentValue = CVar->GetString();
+					if (CurrentValue.Compare(HumanFriendlyValue, ESearchCase::CaseSensitive) == 0)
+					{
+						continue;
+					}
+					else
+					{
+						// this is more expensive then a CaseSensitive version and much less likely
+						if (CurrentValue.Compare(HumanFriendlyValue, ESearchCase::IgnoreCase) == 0)
+						{
+							continue;
+						}
+					}
+
+					if (CVar->TestFlags(EConsoleVariableFlags::ECVF_ReadOnly) )
+					{
+						UE_LOG(LogConfig, Warning, TEXT("Failed to change Readonly CVAR value %s %s -> %s Config %s %s"),
+							*KeyString, *CurrentValue, HumanFriendlyValue, *IniFilename, *SectionName);
+
+						continue;
+					}
+
+					UE_LOG(LogConfig, Display, TEXT("Applied changed CVAR value %s %s -> %s Config %s %s"), 
+						*KeyString, *CurrentValue, HumanFriendlyValue, *IniFilename, *SectionName);
+
+					OnSetCVarFromIniEntry(*IniFilename, *KeyString, *ValueString, SetBy, IniHistory.bAllowCheating);
+				}
+			}
+		}
+		bRecurseCheck=false;
+	}
+};
+
+FCVarIniHistoryHelper *IniHistoryHelper = nullptr;
+
+
+
+
+void RecordApplyCVarSettingsFromIni()
+{
+	IniHistoryHelper = new FCVarIniHistoryHelper();
+}
+
+void ReapplyRecordedCVarSettingsFromIni()
+{
+	// first we need to reload the inis 
+	struct FIniToReload
+	{
+		FIniToReload(const FString& InGlobalName, const FString& InIniBaseName) : IniBaseName(InIniBaseName), IniGlobalName(InGlobalName) { }
+		FString IniBaseName;
+		FString IniGlobalName;
+	};
+	TArray<FIniToReload> InisToReloadList;
+	InisToReloadList.Empty(GConfig->Num());
+	for (const auto& GlobalIni : *GConfig)
+	{
+		InisToReloadList.Add(FIniToReload(GlobalIni.Key, GlobalIni.Value.Name.ToString()));
+	}
+
+	for (const FIniToReload& IniToReload : InisToReloadList)
+	{
+		FString TempGlobalName = IniToReload.IniGlobalName;
+		GConfig->LoadGlobalIniFile(TempGlobalName, *IniToReload.IniBaseName, NULL, true);
+		if (TempGlobalName.Compare( IniToReload.IniGlobalName,  ESearchCase::IgnoreCase) != 0 )
+		{
+			UE_LOG(LogConfig, Warning, TEXT("Tried to reload ini %s final name was %s"), *IniToReload.IniGlobalName, *TempGlobalName );
+		}
+	}
+
+	check(IniHistoryHelper != nullptr);
+	IniHistoryHelper->ReapplyIniHistory();
+}
+
+void DeleteRecordedCVarSettingsFromIni()
+{
+	check(IniHistoryHelper != nullptr);
+	delete IniHistoryHelper;
+}
diff --git a/Engine/Source/Runtime/Core/Private/Misc/CoreDelegates.cpp b/Engine/Source/Runtime/Core/Private/Misc/CoreDelegates.cpp
index 96d998bbd660..2354e33e22d1 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/CoreDelegates.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/CoreDelegates.cpp
@@ -26,8 +26,10 @@ FCoreDelegates::FOnPreMainInit& FCoreDelegates::GetPreMainInitDelegate()
 	return StaticDelegate;
 }
 
+FCoreDelegates::FOnMountAllPakFiles FCoreDelegates::OnMountAllPakFiles;
 FCoreDelegates::FOnMountPak FCoreDelegates::OnMountPak;
 FCoreDelegates::FOnUnmountPak FCoreDelegates::OnUnmountPak;
+FCoreDelegates::FPakFileMountedDelegate FCoreDelegates::PakFileMountedCallback;
 FCoreDelegates::FOnUserLoginChangedEvent FCoreDelegates::OnUserLoginChangedEvent; 
 FCoreDelegates::FOnUserControllerConnectionChange FCoreDelegates::OnControllerConnectionChange;
 FCoreDelegates::FOnUserControllerPairingChange FCoreDelegates::OnControllerPairingChange;
@@ -60,6 +62,7 @@ FSimpleMulticastDelegate FCoreDelegates::OnPostEngineInit;
 FSimpleMulticastDelegate FCoreDelegates::OnFEngineLoopInitComplete;
 FSimpleMulticastDelegate FCoreDelegates::OnExit;
 FSimpleMulticastDelegate FCoreDelegates::OnPreExit;
+FCoreDelegates::FGatherAdditionalLocResPathsDelegate FCoreDelegates::GatherAdditionalLocResPathsCallback;
 FSimpleMulticastDelegate FCoreDelegates::ColorPickerChanged;
 FSimpleMulticastDelegate FCoreDelegates::OnBeginFrame;
 FSimpleMulticastDelegate FCoreDelegates::OnEndFrame;
@@ -71,6 +74,7 @@ FCoreDelegates::FWorldOriginOffset FCoreDelegates::PreWorldOriginOffset;
 FCoreDelegates::FWorldOriginOffset FCoreDelegates::PostWorldOriginOffset;
 FCoreDelegates::FStarvedGameLoop FCoreDelegates::StarvedGameLoop;
 FCoreDelegates::FOnTemperatureChange FCoreDelegates::OnTemperatureChange;
+FCoreDelegates::FOnLowPowerMode FCoreDelegates::OnLowPowerMode;
 
 FCoreDelegates::FApplicationLifetimeDelegate FCoreDelegates::ApplicationWillDeactivateDelegate;
 FCoreDelegates::FApplicationLifetimeDelegate FCoreDelegates::ApplicationHasReactivatedDelegate;
@@ -81,14 +85,21 @@ FCoreDelegates::FApplicationLifetimeDelegate FCoreDelegates::ApplicationShouldUn
 
 FCoreDelegates::FApplicationStartupArgumentsDelegate FCoreDelegates::ApplicationReceivedStartupArgumentsDelegate;
 
+FCoreDelegates::FUserMusicInterruptDelegate FCoreDelegates::UserMusicInterruptDelegate;
+
 FCoreDelegates::FApplicationRegisteredForRemoteNotificationsDelegate FCoreDelegates::ApplicationRegisteredForRemoteNotificationsDelegate;
 FCoreDelegates::FApplicationRegisteredForUserNotificationsDelegate FCoreDelegates::ApplicationRegisteredForUserNotificationsDelegate;
 FCoreDelegates::FApplicationFailedToRegisterForRemoteNotificationsDelegate FCoreDelegates::ApplicationFailedToRegisterForRemoteNotificationsDelegate;
 FCoreDelegates::FApplicationReceivedRemoteNotificationDelegate FCoreDelegates::ApplicationReceivedRemoteNotificationDelegate;
 FCoreDelegates::FApplicationReceivedLocalNotificationDelegate FCoreDelegates::ApplicationReceivedLocalNotificationDelegate;
 
+FCoreDelegates::FCountPreLoadConfigFileRespondersDelegate FCoreDelegates::CountPreLoadConfigFileRespondersDelegate;
+FCoreDelegates::FPreLoadConfigFileDelegate FCoreDelegates::PreLoadConfigFileDelegate;
+FCoreDelegates::FPreSaveConfigFileDelegate FCoreDelegates::PreSaveConfigFileDelegate;
 FCoreDelegates::FOnFConfigFileCreated FCoreDelegates::OnFConfigCreated;
 FCoreDelegates::FOnFConfigFileCreated FCoreDelegates::OnFConfigDeleted;
+FCoreDelegates::FOnApplyCVarFromIni FCoreDelegates::OnApplyCVarFromIni;
+FCoreDelegates::FOnSystemResolutionChanged FCoreDelegates::OnSystemResolutionChanged;
 
 #if WITH_EDITOR
 FCoreDelegates::FOnTargetPlatformChangedSupportedFormats FCoreDelegates::OnTargetPlatformChangedSupportedFormats;
diff --git a/Engine/Source/Runtime/Core/Private/Misc/CoreGlobals.cpp b/Engine/Source/Runtime/Core/Private/Misc/CoreGlobals.cpp
index 082dd13749a0..38d89d9a0d84 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/CoreGlobals.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/CoreGlobals.cpp
@@ -212,6 +212,7 @@ static bool IsAsyncLoadingCoreInternal()
 bool (*IsAsyncLoading)() = &IsAsyncLoadingCoreInternal;
 void (*SuspendAsyncLoading)() = &appNoop;
 void (*ResumeAsyncLoading)() = &appNoop;
+bool (*IsAsyncLoadingSuspended)() = &IsAsyncLoadingCoreInternal;
 bool (*IsAsyncLoadingMultithreaded)() = &IsAsyncLoadingCoreInternal;
 void (*SuspendTextureStreamingRenderTasks)() = &appNoop;
 void (*ResumeTextureStreamingRenderTasks)() = &appNoop;
@@ -277,7 +278,8 @@ FName					GCurrentTraceName				= NAME_None;
 ELogTimes::Type			GPrintLogTimes					= ELogTimes::None;
 /** How to print the category in log output. */
 bool					GPrintLogCategory = true;
-
+/** How to print the verbosity in log output. */
+bool					GPrintLogVerbosity = true;
 
 #if USE_HITCH_DETECTION
 bool				GHitchDetected = false;
diff --git a/Engine/Source/Runtime/Core/Private/Misc/DateTime.cpp b/Engine/Source/Runtime/Core/Private/Misc/DateTime.cpp
index e10f3f2711bf..440a63ddf8c0 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/DateTime.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/DateTime.cpp
@@ -1,11 +1,12 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
 #include "Misc/DateTime.h"
+#include "CoreGlobals.h"
 #include "HAL/PlatformTime.h"
 #include "Templates/TypeHash.h"
 #include "UObject/PropertyPortFlags.h"
 
 
+
 /* FDateTime constants
  *****************************************************************************/
 
@@ -18,7 +19,11 @@ const int32 FDateTime::DaysToMonth[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243,
 
 FDateTime::FDateTime(int32 Year, int32 Month, int32 Day, int32 Hour, int32 Minute, int32 Second, int32 Millisecond)
 {
-	check(Validate(Year, Month, Day, Hour, Minute, Second, Millisecond));
+	if (!Validate(Year, Month, Day, Hour, Minute, Second, Millisecond))
+	{
+		UE_LOG(LogCore, Fatal, TEXT("Invalid Date values. Y:%d, M:%d, D:%d, H:%d, M:%d, S:%d, Ms:%d"),
+			Year, Month, Day, Hour, Minute, Second, Millisecond);
+	}
 
 	int32 TotalDays = 0;
 
diff --git a/Engine/Source/Runtime/Core/Private/Misc/Guid.cpp b/Engine/Source/Runtime/Core/Private/Misc/Guid.cpp
index 517aea828308..06713de9d557 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/Guid.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/Guid.cpp
@@ -274,11 +274,11 @@ void operator<<(FStructuredArchive::FSlot Slot, FGuid& G)
 		{
 			FString AsString;
 			Slot << AsString;
-			Lex::FromString(G, *AsString);
+			LexFromString(G, *AsString);
 		}
 		else
 		{
-			FString AsString = Lex::ToString(G);
+			FString AsString = LexToString(G);
 			Slot << AsString;
 		}
 	}
diff --git a/Engine/Source/Runtime/Core/Private/Misc/GuidGenerator.cpp b/Engine/Source/Runtime/Core/Private/Misc/GuidGenerator.cpp
index d0796f3ba00b..4e5a2b2fe35f 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/GuidGenerator.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/GuidGenerator.cpp
@@ -19,6 +19,8 @@
 ** this software for any purpose.
 */
 
+#include "CoreTypes.h"
+
 #ifdef __GNUC__
 
 #include <sys/types.h>
diff --git a/Engine/Source/Runtime/Core/Private/Misc/NetworkVersion.cpp b/Engine/Source/Runtime/Core/Private/Misc/NetworkVersion.cpp
index f7e71f19c9c9..27a11865f50f 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/NetworkVersion.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/NetworkVersion.cpp
@@ -13,17 +13,44 @@ DEFINE_LOG_CATEGORY( LogNetVersion );
 FNetworkVersion::FGetLocalNetworkVersionOverride FNetworkVersion::GetLocalNetworkVersionOverride;
 FNetworkVersion::FIsNetworkCompatibleOverride FNetworkVersion::IsNetworkCompatibleOverride;
 
-FString FNetworkVersion::ProjectVersion;
+FString FNetworkVersion::ProjectVersion = TEXT("1.0.0");
 
 bool FNetworkVersion::bHasCachedNetworkChecksum			= false;
 uint32 FNetworkVersion::CachedNetworkChecksum			= 0;
 
-uint32 FNetworkVersion::EngineNetworkProtocolVersion	= HISTORY_REPCMD_CHECKSUM_REMOVE_PRINTF;
+uint32 FNetworkVersion::EngineNetworkProtocolVersion	= HISTORY_NEW_ACTOR_OVERRIDE_LEVEL;
 uint32 FNetworkVersion::GameNetworkProtocolVersion		= 0;
 
 uint32 FNetworkVersion::EngineCompatibleNetworkProtocolVersion		= HISTORY_REPLAY_BACKWARDS_COMPAT;
 uint32 FNetworkVersion::GameCompatibleNetworkProtocolVersion		= 0;
 
+void FNetworkVersion::SetProjectVersion(const TCHAR* InVersion)
+{
+	if (ensureMsgf(InVersion != nullptr && FCString::Strlen(InVersion), TEXT("ProjectVersion used for network version must be a valid string!")))
+	{
+		ProjectVersion = InVersion;
+		bHasCachedNetworkChecksum = false;
+
+		UE_LOG(LogNetVersion, Log, TEXT("Set ProjectVersion to %s. Version Checksum will be recalculated on next use."), *ProjectVersion);
+	}	
+}
+
+void FNetworkVersion::SetGameNetworkProtocolVersion(const uint32 InGameNetworkProtocolVersion)
+{
+	GameNetworkProtocolVersion = InGameNetworkProtocolVersion;
+	bHasCachedNetworkChecksum = false;
+
+	UE_LOG(LogNetVersion, Log, TEXT("Set GameNetworkProtocolVersion to %ud. Version Checksum will be recalculated on next use."), GameNetworkProtocolVersion);
+}
+
+void FNetworkVersion::SetGameCompatibleNetworkProtocolVersion(const uint32 InGameCompatibleNetworkProtocolVersion)
+{
+	GameCompatibleNetworkProtocolVersion = InGameCompatibleNetworkProtocolVersion;
+	bHasCachedNetworkChecksum = false;
+
+	UE_LOG(LogNetVersion, Log, TEXT("Set GameCompatibleNetworkProtocolVersion to %ud. Version Checksum will be recalculated on next use."), GameCompatibleNetworkProtocolVersion);
+}
+
 uint32 FNetworkVersion::GetNetworkCompatibleChangelist()
 {
 	static int32 ReturnedVersion = ENGINE_NET_VERSION;
@@ -52,7 +79,7 @@ uint32 FNetworkVersion::GetNetworkCompatibleChangelist()
 
 uint32 FNetworkVersion::GetReplayCompatibleChangelist()
 {
-	return BuildSettings::GetCurrentChangelist();
+	return FEngineVersion::CompatibleWith().GetChangelist();
 }
 
 uint32 FNetworkVersion::GetEngineNetworkProtocolVersion()
@@ -95,7 +122,7 @@ uint32 FNetworkVersion::GetLocalNetworkVersion( bool AllowOverrideDelegate /*=tr
 
 	FString VersionString = FString::Printf(TEXT("%s %s, NetCL: %d, EngineNetVer: %d, GameNetVer: %d"),
 		FApp::GetProjectName(),
-		*ProjectVersion,
+		*FNetworkVersion::GetProjectVersion(),
 		GetNetworkCompatibleChangelist(),
 		FNetworkVersion::GetEngineNetworkProtocolVersion(),
 		FNetworkVersion::GetGameNetworkProtocolVersion());
diff --git a/Engine/Source/Runtime/Core/Private/Misc/OutputDeviceHelper.cpp b/Engine/Source/Runtime/Core/Private/Misc/OutputDeviceHelper.cpp
index 4181e4a9d851..7a5e2b4c3abe 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/OutputDeviceHelper.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/OutputDeviceHelper.cpp
@@ -61,21 +61,18 @@ FString FOutputDeviceHelper::FormatLogLine( ELogVerbosity::Type Verbosity, const
 		Format += Category.ToString();
 		Format += TEXT(": ");
 
-		if (Verbosity != ELogVerbosity::Log)
+		if (GPrintLogVerbosity && Verbosity != ELogVerbosity::Log)
 		{
 			Format += VerbosityToString(Verbosity);
 			Format += TEXT(": ");
 		}
 	}
-	else
+	else if (GPrintLogVerbosity && Verbosity != ELogVerbosity::Log)
 	{
-		if (Verbosity != ELogVerbosity::Log)
-		{
 #if !HACK_HEADER_GENERATOR
-			Format += VerbosityToString(Verbosity);
-			Format += TEXT(": ");
+		Format += VerbosityToString(Verbosity);
+		Format += TEXT(": ");
 #endif
-		}
 	}
 
 	if (Message)
diff --git a/Engine/Source/Runtime/Core/Private/Misc/Paths.cpp b/Engine/Source/Runtime/Core/Private/Misc/Paths.cpp
index 457e0f6818b8..92f4384b647e 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/Paths.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/Paths.cpp
@@ -5,6 +5,7 @@
 #include "UObject/NameTypes.h"
 #include "Logging/LogMacros.h"
 #include "HAL/FileManager.h"
+#include "HAL/PlatformFile.h"
 #include "Misc/Parse.h"
 #include "Misc/ScopeLock.h"
 #include "Misc/CommandLine.h"
@@ -83,11 +84,76 @@ namespace UE4Paths_Private
 
 		return FullyPathed;
 	}
+
+	// Returns, if any, the value of the -userdir command line argument. This can be used to sandbox artifacts to a desired location
+	const FString& CustomUserDirArgument()
+	{
+		static bool bCheckedArgs = false;
+		static FString UserDirArg;
+		
+		if (!bCheckedArgs)
+		{
+			// Check for a -userdir arg. If set this overrides the platform preference for using the UserDir and
+			// the default. The caller is responsible for ensuring that this is a valid path for the current platform!
+			FParse::Value(FCommandLine::Get(), TEXT("UserDir="), UserDirArg);
+			bCheckedArgs = true;
+			
+			if (UserDirArg.IsEmpty() == false)
+			{
+				if (FPaths::IsRelative(UserDirArg))
+				{
+					UserDirArg = FPaths::Combine(*FPaths::ProjectDir(), *UserDirArg) + TEXT("/");
+				}
+				else
+				{
+					FPaths::NormalizeDirectoryName(UserDirArg);
+					UserDirArg = UserDirArg + TEXT("/");
+				}
+			}
+		}
+
+		return UserDirArg;
+	}
+
+	// Returns, if any, the value of the -shaderworkingdir command line argument. This can be used to sandbox shader working files to a desired location
+	const FString& CustomShaderDirArgument()
+	{
+		static bool bCheckedArgs = false;
+		static FString ShaderDir;
+
+		if (!bCheckedArgs)
+		{
+			// Check for a -userdir arg. If set this overrides the platform preference for using the UserDir and
+			// the default. The caller is responsible for ensuring that this is a valid path for the current platform!
+			FParse::Value(FCommandLine::Get(), TEXT("ShaderWorkingDir="), ShaderDir);
+			bCheckedArgs = true;
+
+			if (ShaderDir.IsEmpty() == false)
+			{
+				if (FPaths::IsRelative(ShaderDir))
+				{
+					ShaderDir = FPaths::Combine(*FPaths::ProjectDir(), *ShaderDir) + TEXT("/");
+				}
+				else
+				{
+					FPaths::NormalizeDirectoryName(ShaderDir);
+					ShaderDir = ShaderDir + TEXT("/");
+				}
+			}
+		}
+
+		return ShaderDir;
+	}
 }
 
 bool FPaths::ShouldSaveToUserDir()
 {
-	static bool bShouldSaveToUserDir = FApp::IsInstalled() || FParse::Param(FCommandLine::Get(), TEXT("SaveToUserDir")) || FPlatformProcess::ShouldSaveToUserDir();
+	static bool bShouldSaveToUserDir =
+		FApp::IsInstalled()
+		|| FParse::Param(FCommandLine::Get(), TEXT("SaveToUserDir"))
+		|| FPlatformProcess::ShouldSaveToUserDir()
+		|| !UE4Paths_Private::CustomUserDirArgument().IsEmpty();
+		
 	return bShouldSaveToUserDir;
 }
 
@@ -177,23 +243,19 @@ FString FPaths::ProjectDir()
 
 FString FPaths::ProjectUserDir()
 {
+	const FString& UserDirArg = UE4Paths_Private::CustomUserDirArgument();
+	
+	if (!UserDirArg.IsEmpty())
+	{
+		return UserDirArg;
+	}
+
 	if (ShouldSaveToUserDir())
 	{
 		return FPaths::Combine(FPlatformProcess::UserSettingsDir(), FApp::GetProjectName()) + TEXT("/");
 	}
 	else
 	{
-		FString UserDir;
-		if (FParse::Value(FCommandLine::Get(), TEXT("UserDir="), UserDir))
-		{
-			if (FPaths::IsRelative(UserDir))
-			{
-				return FPaths::Combine(*FPaths::ProjectDir(), *UserDir) + TEXT("/");
-			}
-			FPaths::NormalizeDirectoryName(UserDir);
-			return UserDir + TEXT("/");
-		}
-
 		return FPaths::ProjectDir();
 	}
 }
@@ -219,6 +281,18 @@ FString FPaths::ProjectIntermediateDir()
 	return ProjectUserDir() + TEXT("Intermediate/");
 }
 
+FString FPaths::ShaderWorkingDir()
+{
+	const FString& ShaderDirArg = UE4Paths_Private::CustomShaderDirArgument();
+
+	if (!ShaderDirArg.IsEmpty())
+	{
+		return ShaderDirArg;
+	}
+
+	return FPlatformProcess::ShaderWorkingDir();
+}
+
 FString FPaths::ProjectPluginsDir()
 {
 	return FPaths::ProjectDir() + TEXT("Plugins/");
@@ -275,11 +349,24 @@ FString FPaths::VideoCaptureDir()
 
 FString FPaths::ProjectLogDir()
 {
-#if PLATFORM_MAC || PLATFORM_XBOXONE
-	return FPlatformProcess::UserLogsDir();
-#else
-	return FPaths::ProjectSavedDir() + TEXT("Logs/");
+#if PLATFORM_PS4
+
+	const FString* OverrideDir = FPS4PlatformFile::GetOverrideLogDirectory();
+	if (OverrideDir != nullptr)
+	{
+		return *OverrideDir;
+	}
+
 #endif
+
+#if PLATFORM_MAC || PLATFORM_XBOXONE
+	if (UE4Paths_Private::CustomUserDirArgument().IsEmpty())
+	{
+		return FPlatformProcess::UserLogsDir();
+	}
+#endif
+
+	return FPaths::ProjectSavedDir() + TEXT("Logs/");
 }
 
 FString FPaths::AutomationDir()
@@ -746,12 +833,12 @@ bool FPaths::IsDrive(const FString& InPath)
 	return false;
 }
 
-#if WITH_EDITOR
-FString FPaths::RootPrefix = TEXT("root:/");
-#endif // WITH_EDITOR
-
 bool FPaths::IsRelative(const FString& InPath)
 {
+#if WITH_EDITOR
+	static FString RootPrefix = TEXT("root:/");
+#endif // WITH_EDITOR
+
 	// The previous implementation of this function seemed to handle normalized and unnormalized paths, so this one does too for legacy reasons.
 	const uint32 PathLen = InPath.Len();
 	const bool IsRooted = PathLen &&
@@ -1023,13 +1110,82 @@ FString FPaths::CreateTempFilename( const TCHAR* Path, const TCHAR* Prefix, cons
 	return UniqueFilename;
 }
 
-bool FPaths::ValidatePath( const FString& InPath, FText* OutReason )
+const FString& FPaths::GetInvalidFileSystemChars()
 {
 	// Windows has the most restricted file system, and since we're cross platform, we have to respect the limitations of the lowest common denominator
 	// # isn't legal. Used for revision specifiers in P4/SVN, and also not allowed on Windows anyway
 	// @ isn't legal. Used for revision/label specifiers in P4/SVN
-	// ^ isn't legal. While the file-system won't complain about this character, Visual Studio will				
+	// ^ isn't legal. While the file-system won't complain about this character, Visual Studio will			
 	static const FString RestrictedChars = "/?:&\\*\"<>|%#@^";
+	return RestrictedChars;
+}
+
+FString FPaths::MakeValidFileName(const FString& InString, const TCHAR InReplacementChar /*= 0*/)
+{
+	const FString RestrictedChars = GetInvalidFileSystemChars();
+
+	const int InLen = InString.Len();
+
+	TArray<TCHAR> Output;
+	Output.AddUninitialized(InLen + 1);
+
+	// first remove all invalid chars
+	for (int i = 0; i < InLen; i++)
+	{
+		int32 Unused = 0;
+		if (RestrictedChars.FindChar(InString[i], Unused))
+		{
+			Output[i] = InReplacementChar;
+		}
+		else
+		{
+			Output[i] = InString[i];
+		}
+	}
+
+	Output[InLen] = 0;
+
+	if (InReplacementChar == 0)
+	{
+		int CurrentChar = 0;
+
+		// compact the string by replacing any null entries with the next non-null entry
+		int iFill = 0;
+		for (int iChar = 0; iChar < InLen; iChar++)
+		{
+			if (Output[iChar] == 0)
+			{
+				// adjust our fill index if we passed it
+				if (iFill < iChar)
+				{
+					iFill = iChar;
+				}
+
+				// scan forward
+				while (++iFill < InLen)
+				{
+					if (Output[iFill] != 0)
+					{
+						break;
+					}
+				}
+
+				if (iFill < InLen)
+				{
+					// take this char and null it out
+					Output[iChar] = Output[iFill];
+					Output[iFill] = 0;
+				}
+			}
+		}
+	}
+	
+	return FString(Output.GetData());
+}
+
+bool FPaths::ValidatePath( const FString& InPath, FText* OutReason )
+{
+	const FString RestrictedChars = GetInvalidFileSystemChars();
 	static const FString RestrictedNames[] = {	"CON", "PRN", "AUX", "CLOCK$", "NUL", 
 												"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", 
 												"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
diff --git a/Engine/Source/Runtime/Core/Private/Misc/SecureHash.cpp b/Engine/Source/Runtime/Core/Private/Misc/SecureHash.cpp
index c01a40b52905..021f95525cd2 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/SecureHash.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/SecureHash.cpp
@@ -460,72 +460,69 @@ void FMD5::Decode( uint32* output, const uint8* input, int32 len )
 // }
 /// @endcond
 
-namespace Lex
+FString LexToString(const FMD5Hash& Hash)
 {
-	FString ToString(const FMD5Hash& Hash)
+	if (!Hash.bIsValid)
 	{
-		if (!Hash.bIsValid)
-		{
-			return FString();
-		}
-
-		return FString::Printf(TEXT("%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"),
-			Hash.Bytes[0], Hash.Bytes[1], Hash.Bytes[2], Hash.Bytes[3], Hash.Bytes[4], Hash.Bytes[5], Hash.Bytes[6], Hash.Bytes[7],
-			Hash.Bytes[8], Hash.Bytes[9], Hash.Bytes[10], Hash.Bytes[11], Hash.Bytes[12], Hash.Bytes[13], Hash.Bytes[14], Hash.Bytes[15]);
+		return FString();
 	}
 
-	void FromString(FMD5Hash& Hash, const TCHAR* Buffer)
+	return FString::Printf(TEXT("%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"),
+		Hash.Bytes[0], Hash.Bytes[1], Hash.Bytes[2], Hash.Bytes[3], Hash.Bytes[4], Hash.Bytes[5], Hash.Bytes[6], Hash.Bytes[7],
+		Hash.Bytes[8], Hash.Bytes[9], Hash.Bytes[10], Hash.Bytes[11], Hash.Bytes[12], Hash.Bytes[13], Hash.Bytes[14], Hash.Bytes[15]);
+}
+
+void LexFromString(FMD5Hash& Hash, const TCHAR* Buffer)
+{
+	auto HexCharacterToDecimalValue = [](const TCHAR InHexChar, uint8& OutDecValue) -> bool
 	{
-		auto HexCharacterToDecimalValue = [](const TCHAR InHexChar, uint8& OutDecValue) -> bool
+		TCHAR Base = 0;
+		if (InHexChar >= '0' && InHexChar <= '9')
 		{
-			TCHAR Base = 0;
-			if (InHexChar >= '0' && InHexChar <= '9')
-			{
-				OutDecValue = InHexChar - '0';
-			}
-			else if (InHexChar >= 'A' && InHexChar <= 'F')
-			{
-				OutDecValue = (InHexChar - 'A') + 10;
-			}
-			else if (InHexChar >= 'a' && InHexChar <= 'f')
-			{
-				OutDecValue = (InHexChar - 'a') + 10;
-			}
-			else
-			{
-				return false;
-			}
-
-			return true;
-		};
-
-		uint8 Bytes[16];
-		for (int32 ByteIndex = 0, BufferIndex = 0; ByteIndex < 16; ++ByteIndex)
+			OutDecValue = InHexChar - '0';
+		}
+		else if (InHexChar >= 'A' && InHexChar <= 'F')
 		{
-			const TCHAR FirstChar = Buffer[BufferIndex++];
-			if (FirstChar == '\0')
-			{
-				return;
-			}
-
-			const TCHAR SecondChar = Buffer[BufferIndex++];
-			if (SecondChar == '\0')
-			{
-				return;
-			}
-
-			uint8 FirstCharVal, SecondCharVal;
-			if (!HexCharacterToDecimalValue(FirstChar, FirstCharVal) || !HexCharacterToDecimalValue(SecondChar, SecondCharVal))
-			{
-				return;
-			}
-
-			Bytes[ByteIndex] = (FirstCharVal << 4) + SecondCharVal;
+			OutDecValue = (InHexChar - 'A') + 10;
+		}
+		else if (InHexChar >= 'a' && InHexChar <= 'f')
+		{
+			OutDecValue = (InHexChar - 'a') + 10;
+		}
+		else
+		{
+			return false;
 		}
 
-		FMemory::Memcpy(Hash.Bytes, Bytes, 16);
-		Hash.bIsValid = true;
+		return true;
+	};
+
+	uint8 Bytes[16];
+	for (int32 ByteIndex = 0, BufferIndex = 0; ByteIndex < 16; ++ByteIndex)
+	{
+		const TCHAR FirstChar = Buffer[BufferIndex++];
+		if (FirstChar == '\0')
+		{
+			return;
+		}
+
+		const TCHAR SecondChar = Buffer[BufferIndex++];
+		if (SecondChar == '\0')
+		{
+			return;
+		}
+
+		uint8 FirstCharVal, SecondCharVal;
+		if (!HexCharacterToDecimalValue(FirstChar, FirstCharVal) || !HexCharacterToDecimalValue(SecondChar, SecondCharVal))
+		{
+			return;
+		}
+
+		Bytes[ByteIndex] = (FirstCharVal << 4) + SecondCharVal;
 	}
+
+	FMemory::Memcpy(Hash.Bytes, Bytes, 16);
+	Hash.bIsValid = true;
 }
 
 FMD5Hash FMD5Hash::HashFile(const TCHAR* InFilename, TArray<uint8>* Buffer)
diff --git a/Engine/Source/Runtime/Core/Private/Misc/StringFormatter.cpp b/Engine/Source/Runtime/Core/Private/Misc/StringFormatter.cpp
index 825bb8678cc4..a25acd469fff 100644
--- a/Engine/Source/Runtime/Core/Private/Misc/StringFormatter.cpp
+++ b/Engine/Source/Runtime/Core/Private/Misc/StringFormatter.cpp
@@ -31,9 +31,9 @@ void AppendToString(const FStringFormatArg& Arg, FString& StringToAppendTo)
 {
 	switch(Arg.Type)
 	{
-		case FStringFormatArg::Int: 			StringToAppendTo.Append(Lex::ToString(Arg.IntValue)); break;
-		case FStringFormatArg::UInt: 			StringToAppendTo.Append(Lex::ToString(Arg.UIntValue)); break;
-		case FStringFormatArg::Double: 			StringToAppendTo.Append(Lex::ToString(Arg.DoubleValue)); break;
+		case FStringFormatArg::Int: 			StringToAppendTo.Append(LexToString(Arg.IntValue)); break;
+		case FStringFormatArg::UInt: 			StringToAppendTo.Append(LexToString(Arg.UIntValue)); break;
+		case FStringFormatArg::Double: 			StringToAppendTo.Append(LexToString(Arg.DoubleValue)); break;
 		case FStringFormatArg::String: 			StringToAppendTo.AppendChars(*Arg.StringValue, Arg.StringValue.Len()); break;
 		case FStringFormatArg::StringLiteral: 	StringToAppendTo += Arg.StringLiteralValue; break;
 	}
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Apple/InstrumentsExternalProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Apple/InstrumentsExternalProfiler.cpp
index 7eb13c374ba3..8e44257afd19 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Apple/InstrumentsExternalProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Apple/InstrumentsExternalProfiler.cpp
@@ -12,7 +12,7 @@
 #include "Misc/Paths.h"
 #include "HAL/FileManager.h"
 
-#if APPLE_PROFILING_ENABLED
+#if APPLE_PROFILING_ENABLED && UE_EXTERNAL_PROFILING_ENABLED
 
 /**
  * Instruments implementation of FExternalProfiler
@@ -113,4 +113,4 @@ namespace InstrumentsProfiler
 	static FAtModuleInit AtModuleInit;
 }
 
-#endif
+#endif	// APPLE_PROFILING_ENABLED && UE_EXTERNAL_PROFILING_ENABLED
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/CsvProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/CsvProfiler.cpp
index 090416054a35..e7cf94eeedc9 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/CsvProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/CsvProfiler.cpp
@@ -21,6 +21,7 @@
 #include "Misc/CoreDelegates.h"
 #include "Misc/App.h"
 #include "HAL/Runnable.h"
+#include "Misc/EngineVersion.h"
 
 #if CSV_PROFILER
 
@@ -44,7 +45,7 @@ CSV_DEFINE_STAT_GLOBAL(FrameTime);
 
 DEFINE_LOG_CATEGORY_STATIC(LogCsvProfiler, Log, All);
 
-FCsvProfiler* FCsvProfiler::Instance = nullptr;
+TUniquePtr<FCsvProfiler> FCsvProfiler::Instance;
 
 static bool GCsvTestingGT = false;
 static bool GCsvTestingRT = false;
@@ -216,7 +217,7 @@ static FAutoConsoleCommand HandleCSVProfileCmd(
 );
 
 void CSVTest();
- 
+
 //-----------------------------------------------------------------------------
 //	TSingleProducerSingleConsumerList : fast lock-free single producer/single 
 //  consumer list implementation. 
@@ -242,7 +243,7 @@ class TSingleProducerSingleConsumerList
 
 	struct FCacheLineAlignedCounter
 	{
-		#define NUM_PADDING_WORDS ( PLATFORM_CACHE_LINE_SIZE/4 - 2 )
+#define NUM_PADDING_WORDS ( PLATFORM_CACHE_LINE_SIZE/4 - 2 )
 		uint32 Pad[NUM_PADDING_WORDS];
 
 		volatile uint64 Value;
@@ -292,7 +293,7 @@ public:
 		bElementReserved = false;
 #endif
 		FPlatformMisc::MemoryBarrier();
-		
+
 		// Keep track of the count of all the elements we ever committed. This value is never reset, even on a PopAll
 		Counter.Value++;
 	}
@@ -317,7 +318,7 @@ public:
 			Offset = ElementsOut.Num();
 		}
 
-		uint32 ElementCount = uint32( CurrentCounterValue - ConsumerThreadLastReadIndex );
+		uint32 ElementCount = uint32(CurrentCounterValue - ConsumerThreadLastReadIndex);
 		ElementsOut.AddDefaulted(ElementCount);
 
 		uint32 IndexInBlock = ConsumerThreadLastReadIndex % BlockSize;
@@ -442,7 +443,7 @@ public:
 
 		const TArray<uint64>& ThreadTimestamps = FrameBoundaryTimestamps[Timeline];
 		if (ThreadTimestamps.Num() == 0 || Timestamp < ThreadTimestamps[0])
-{
+		{
 			// This timestamp is before the first frame, or there are no valid timestamps
 			CurrentReadFrameIndex = 0;
 			return -1;
@@ -456,15 +457,15 @@ public:
 
 		// Check if we need to rewind
 		if (CurrentReadFrameIndex > 0 && ThreadTimestamps[CurrentReadFrameIndex - 1] > Timestamp)
-{
+		{
 			// Binary search to < 4 and then resume linear searching
 			int32 StartPos = 0;
 			int32 EndPos = CurrentReadFrameIndex;
 			while (true)
-	{
+			{
 				int32 Diff = (EndPos - StartPos);
 				if (Diff <= 4)
-		{
+				{
 					CurrentReadFrameIndex = StartPos;
 					break;
 				}
@@ -472,13 +473,13 @@ public:
 				if (ThreadTimestamps[MidPos] > Timestamp)
 				{
 					EndPos = MidPos;
-		}
-		else
-		{
+				}
+				else
+				{
 					StartPos = MidPos;
 				}
+			}
 		}
-	}
 
 		for (; CurrentReadFrameIndex < ThreadTimestamps.Num(); CurrentReadFrameIndex++)
 		{
@@ -543,18 +544,18 @@ static TArray<FString> UniqueNonFNameStatIDIndices;
 struct FAnsiStringRegister
 {
 	static uint32 GetUniqueStringIndex(const ANSICHAR* AnsiStr)
-{
+	{
 		uint32* IndexPtr = CharPtrToStringIndex.Find(AnsiStr);
 		if (IndexPtr)
-	{
+		{
 			return *IndexPtr;
-	}
+		}
 
 		// If we haven't seen this pointer before, check the string register (this is slow!)
 		FString Str = FString(StringCast<TCHAR>(AnsiStr).Get());
 		uint32* Value = UniqueNonFNameStatIDStrings.Find(Str);
 		if (Value)
-	{
+		{
 			// Cache in the index register
 			CharPtrToStringIndex.Add(AnsiStr, *Value);
 			return *Value;
@@ -578,7 +579,7 @@ struct FAnsiStringRegister
 * Key functions classes to allow SceNpOnlineId to be used as the key in TSet and TMap.
 */
 struct FCsvStatID
-	{
+{
 	static const uint64 FNameOrIndexMask = 0x000fffffffffffffull; // Lower 52 bits for fname or index
 
 	FCsvStatID(uint64 InStatIDRaw, int32 InCategoryIndex, bool bInIsFName)
@@ -590,9 +591,9 @@ struct FCsvStatID
 			check((InStatIDRaw & FNameOrIndexMask) == InStatIDRaw);
 			UniqueID.Fields.IsFName = 1;
 			UniqueID.Fields.FNameOrIndex = InStatIDRaw;
-	}
+		}
 		else
-	{
+		{
 			UniqueID.Fields.IsFName = 0;
 			UniqueID.Fields.FNameOrIndex = FAnsiStringRegister::GetUniqueStringIndex((ANSICHAR*)InStatIDRaw);
 		}
@@ -605,9 +606,9 @@ struct FCsvStatID
 		{
 			const FNameEntry* NameEntry = FName::GetEntry(UniqueID.Fields.FNameOrIndex);
 			return NameEntry->GetPlainNameString().RightChop(GCsvNamePrefix.Len());
-	}
+		}
 		else
-	{
+		{
 			return FAnsiStringRegister::GetString(UniqueID.Fields.FNameOrIndex);
 		}
 	}
@@ -720,10 +721,10 @@ struct FCsvCustomStat : public FCsvStatBase
 	bool IsInteger() const
 	{
 		return !!(Flags & FCsvStatBase::FFlags::IsInteger);
-}
+	}
 
 	double GetValueAsDouble() const
-{
+	{
 		return IsInteger() ? double(Value.AsInt) : double(Value.AsFloat);
 	}
 
@@ -739,7 +740,7 @@ struct FCsvEvent
 	uint64 GetAllocatedSize() const
 	{
 		return (uint64)EventText.GetAllocatedSize() + sizeof(*this);
-}
+	}
 
 	FString EventText;
 	uint64 Timestamp;
@@ -770,7 +771,7 @@ struct FCsvStatSeries
 		int32 StartValueIndex;
 	};
 	enum class EType : uint8
-{
+	{
 		TimerData,
 		CustomStatInt,
 		CustomStatFloat
@@ -813,7 +814,7 @@ struct FCsvStatSeries
 		{
 			// If we're done with the previous frame, commit it
 			if (CurrentWriteFrameNumber != -1)
-	{
+			{
 				FCsvStatSeriesValue SeriesValue;
 				SeriesValue.Value.AsInt = CurrentValue.AsIntValue;
 				CommitFrameData(SeriesValue);
@@ -822,7 +823,7 @@ struct FCsvStatSeries
 			// The first op in a frame is always a set. Otherwise min/max don't work
 			Op = ECsvCustomStatOp::Set;
 			CurrentWriteFrameNumber = DataFrameNumber;
-	}
+		}
 
 		switch (Op)
 		{
@@ -841,7 +842,7 @@ struct FCsvStatSeries
 			CurrentValue.AsIntValue += Value;
 			break;
 		}
-}
+	}
 
 	void SetCustomStatValue_Float(uint32 DataFrameNumber, ECsvCustomStatOp Op, float Value)
 	{
@@ -853,7 +854,7 @@ struct FCsvStatSeries
 		{
 			// If we're done with the previous frame, commit it
 			if (CurrentWriteFrameNumber != -1)
-{
+			{
 				FCsvStatSeriesValue SeriesValue;
 				SeriesValue.Value.AsFloat = CurrentValue.AsFloatValue;
 				CommitFrameData(SeriesValue);
@@ -894,10 +895,10 @@ struct FCsvStatSeries
 			// Is this frame contiguous? If so, just add to the current span
 			FFrameIndexSpan& LastFrameSpan = FrameSpans.Last();
 			if (CurrentWriteFrameNumber == LastFrameSpan.StartFrameIndex + LastFrameSpan.FrameCount)
-	{
+			{
 				LastFrameSpan.FrameCount++;
-		return;
-	}
+				return;
+			}
 		}
 
 		// Frame is not contiguous. Add a new span
@@ -913,28 +914,28 @@ struct FCsvStatSeries
 		check(IsInGameThread());
 
 		if (FrameNumber >= (int32)GetFrameCount())
-	{
+		{
 			return DefaultValue;
-	}
+		}
 
 		// Check if we need to rewind (if the current framespan is ahead)
 		if (CurrentReadFrameSpanIndex == FrameSpans.Num() || (CurrentReadFrameSpanIndex > 0 && FrameSpans[CurrentReadFrameSpanIndex].StartFrameIndex > FrameNumber))
-	{
+		{
 			CurrentReadFrameSpanIndex = 0;
-	}
+		}
 
 		for (; CurrentReadFrameSpanIndex < FrameSpans.Num(); CurrentReadFrameSpanIndex++)
 		{
 			FFrameIndexSpan& FrameSpan = FrameSpans[CurrentReadFrameSpanIndex];
 			int32 FrameSpanOffset = FrameNumber - FrameSpan.StartFrameIndex;
 			if (FrameSpanOffset < 0)
-	{
+			{
 				// We have no data for this framespan
 				if (CurrentReadFrameSpanIndex > 0)
-		{
+				{
 					// Spin back to avoid an unnecessary rewind on the next read
 					CurrentReadFrameSpanIndex--;
-		}
+				}
 				return DefaultValue;
 			}
 			if (FrameSpanOffset < FrameSpan.FrameCount)
@@ -952,16 +953,16 @@ struct FCsvStatSeries
 	uint32 GetFrameCount() const
 	{
 		if (FrameSpans.Num() == 0)
-	{
+		{
 			return 0;
 		}
 		return FrameSpans.Last().StartFrameIndex + FrameSpans.Last().FrameCount;
 	}
 
 	bool IsCustomStat() const
-		{
+	{
 		return (SeriesType == EType::CustomStatFloat || SeriesType == EType::CustomStatInt);
-		}
+	}
 
 	uint64 GetAllocatedSize() const
 	{
@@ -1031,13 +1032,13 @@ struct FCsvProcessedThreadData
 				{
 					// Add a /<Threadname> prefix
 					Name = ThreadName + TEXT("/") + Name;
-	}
+				}
 
 				if (Series->StatID.GetCategoryIndex() > 0)
 				{
 					// Categorised stats are prefixed with <CATEGORY>/
 					Name = Series->StatID.GetCategoryString() + TEXT("/") + Name;
-}
+				}
 
 				OutStatNames.Add(Name);
 			}
@@ -1048,14 +1049,14 @@ struct FCsvProcessedThreadData
 	{
 		check(IsInGameThread());
 		for (int i = 0; i < StatSeriesArray.Num(); i++)
-{
+		{
 			FCsvStatSeries* Series = StatSeriesArray[i];
 			if (Series->StatID.GetCategoryIndex() == CategoryIndex || CategoryIndex == -1)
-	{
+			{
 				OutValues.Add(Series->ReadValueForFrame(FrameIndex, 0.0));
 			}
+		}
 	}
-}
 
 	void ReadEventDataForFrame(uint32 FrameIndex, TArray<FString>& OutEvents) const
 	{
@@ -1075,14 +1076,14 @@ struct FCsvProcessedThreadData
 			else if (Event.FrameNumber > FrameIndex)
 			{
 				if (CurrentProcessedEventReadIndex > 0)
-{
+				{
 					// Spin back to avoid an unnecessary rewind on the next read
 					CurrentProcessedEventReadIndex--;
 				}
 				return;
 			}
 		}
-}
+	}
 
 	uint32 GetProcessedEventCount() const
 	{
@@ -1096,7 +1097,7 @@ struct FCsvProcessedThreadData
 		for (int i = 0; i < StatSeriesArray.Num(); i++)
 		{
 			if (StatSeriesArray[i])
-{
+			{
 				delete StatSeriesArray[i];
 			}
 		}
@@ -1120,12 +1121,12 @@ struct FCsvProcessedThreadData
 			TotalSize += sizeof(FCsvProcessedEvent) + ProcessedEvents[i].EventText.GetAllocatedSize();
 		}
 		return TotalSize;
-}
+	}
 
 	void SetThreadName(const FString& InThreadName)
-{
+	{
 		ThreadName = InThreadName;
-}
+	}
 
 private:
 	FCsvStatSeries* FindOrCreateStatSeries(const FCsvStatID& StatID, FCsvStatSeries::EType SeriesType)
@@ -1133,7 +1134,7 @@ private:
 		check(IsInCsvProcessingThread());
 		FCsvStatSeries** Series = StatIDToSeries.Find(StatID.UniqueID.Hash);
 		if (Series)
-{
+		{
 #if DO_CHECK
 			FString StatName = StatID.GetNameString();
 			checkf(SeriesType == (*Series)->SeriesType, TEXT("Stat named %s was used in multiple stat types. Can't use same identifier for different stat types. Stat types are: Custom(Int), Custom(Float) and Timing"), *StatName);
@@ -1145,7 +1146,7 @@ private:
 		StatSeriesArray.Add(NewSeries);
 		StatIDToSeries.Add(StatID.UniqueID.Hash, NewSeries);
 		return NewSeries;
-}
+	}
 
 	TMap<uint64, FCsvStatSeries*> StatIDToSeries;
 	TArray<FCsvStatSeries*> StatSeriesArray;
@@ -1165,10 +1166,10 @@ public:
 		, LastProcessedTimestamp(0)
 	{
 		CurrentCaptureStartCycles = FPlatformTime::Cycles64();
-	
+
 		// Determine the thread name
 		if (ThreadId == GGameThreadId)
-	{
+		{
 			ThreadName = TEXT("GameThread");
 		}
 		else if (ThreadId == GRenderThreadId)
@@ -1202,17 +1203,17 @@ public:
 		AddTimestampInternal(GetStatID(StatName), CategoryIndex, bBegin, true);
 	}
 	void AddCustomStat(const char* StatName, const int32 CategoryIndex, const float Value, const ECsvCustomStatOp CustomStatOp)
-		{
+	{
 		AddCustomStatInternal(GetStatID(StatName), CategoryIndex, Value, CustomStatOp, false);
 	}
 	void AddCustomStat(const FName& StatName, const int32 CategoryIndex, const float Value, const ECsvCustomStatOp CustomStatOp)
-			{
+	{
 		AddCustomStatInternal(GetStatID(StatName), CategoryIndex, Value, CustomStatOp, true);
-			}
+	}
 	void AddCustomStat(const char* StatName, const int32 CategoryIndex, const int32 Value, const ECsvCustomStatOp CustomStatOp)
 	{
 		AddCustomStatInternal(GetStatID(StatName), CategoryIndex, Value, CustomStatOp, false);
-		}
+	}
 	void AddCustomStat(const FName& StatName, const int32 CategoryIndex, const int32 Value, const ECsvCustomStatOp CustomStatOp)
 	{
 		AddCustomStatInternal(GetStatID(StatName), CategoryIndex, Value, CustomStatOp, true);
@@ -1228,7 +1229,7 @@ public:
 	}
 
 	uint64 GetAllocatedSize() const
-{
+	{
 		uint64 TotalSize = RawThreadData.TimingMarkers.GetAllocatedSize() + RawThreadData.CustomStats.GetAllocatedSize() + RawThreadData.Events.GetAllocatedSize() + sizeof(*this);
 		TotalSize += ProcessedData.GetAllocatedSize();
 		return TotalSize;
@@ -1248,12 +1249,12 @@ public:
 
 
 	const FCsvProcessedThreadData* GetProcessedData()
-		{
+	{
 		check(IsInGameThread());
 		// Do a final process the thread data before returning it
 		ProcessThreadData();
 		return &ProcessedData;
-		}
+	}
 
 	void ClearProcessedData()
 	{
@@ -1275,7 +1276,7 @@ private:
 	}
 
 	void AddCustomStatInternal(uint64 StatID, int32 CategoryIndex, const float Value, const ECsvCustomStatOp CustomStatOp, const bool bFNameStat)
-		{
+	{
 		FCsvCustomStat* CustomStat = RawThreadData.CustomStats.ReserveElement();
 
 		uint64 Flags = FCsvStatBase::FFlags::IsCustomStat;
@@ -1283,10 +1284,10 @@ private:
 		CustomStat->Init(StatID, CategoryIndex, Flags, FPlatformTime::Cycles64(), uint8(CustomStatOp));
 		CustomStat->Value.AsFloat = Value;
 		RawThreadData.CustomStats.CommitElement();
-		}
+	}
 
 	void AddCustomStatInternal(uint64 StatID, int32 CategoryIndex, const int32 Value, const ECsvCustomStatOp CustomStatOp, const bool bFNameStat)
-		{
+	{
 		FCsvCustomStat* CustomStat = RawThreadData.CustomStats.ReserveElement();
 
 		uint64 Flags = FCsvStatBase::FFlags::IsCustomStat | FCsvStatBase::FFlags::IsInteger;
@@ -1294,8 +1295,8 @@ private:
 		CustomStat->Init(StatID, CategoryIndex, Flags, FPlatformTime::Cycles64(), uint8(CustomStatOp));
 		CustomStat->Value.AsInt = Value;
 		RawThreadData.CustomStats.CommitElement();
-		}
-		
+	}
+
 	void AddTimestampInternal(uint64 StatID, int32 CategoryIndex, const bool bBegin, const bool bFNameStat)
 	{
 		FCsvTimingMarker* Marker = RawThreadData.TimingMarkers.ReserveElement();
@@ -1334,17 +1335,24 @@ private:
 //  profiling data
 //-----------------------------------------------------------------------------
 class FCsvProfilerProcessingThread : public FRunnable
-	{
+{
+	FThreadSafeCounter StopCounter;
 public:
 	FCsvProfilerProcessingThread(FCsvProfiler* InCsvProfiler)
 		: CsvProfiler(InCsvProfiler)
-		{
+	{
 		Thread = FRunnableThread::Create(this, TEXT("CSVProfiler"), 0, TPri_Lowest, FPlatformAffinity::GetTaskGraphBackgroundTaskMask());
-		}
+	}
 
-	~FCsvProfilerProcessingThread()
+	virtual ~FCsvProfilerProcessingThread()
+	{
+		if (Thread)
 		{
+			Thread->Kill(true);
+			delete Thread;
+			Thread = nullptr;
 		}
+	}
 
 	// FRunnable interface
 	virtual bool Init() override
@@ -1358,7 +1366,7 @@ public:
 		GCsvProcessingThreadId = FPlatformTLS::GetCurrentThreadId();
 		GGameThreadIsCsvProcessingThread = false;
 
-		while (true)
+		while (StopCounter.GetValue() == 0)
 		{
 			check(CsvProfiler);
 			GCsvProcessingLock.Lock();
@@ -1367,11 +1375,14 @@ public:
 			float SleepTimeSeconds = FMath::Max(TimeBetweenUpdatesMS - ElapsedMS, 0.0f) / 1000.0f;
 			FPlatformProcess::Sleep(SleepTimeSeconds);
 		}
-		}
+
+		return 0;
+	}
 
 	virtual void Stop() override
-		{
-		}
+	{
+		StopCounter.Increment();
+	}
 
 	virtual void Exit() override { }
 
@@ -1441,15 +1452,15 @@ void FCsvProfilerThreadData::ProcessThreadData()
 		FCsvCustomStat& CustomStat = CustomStats[i];
 		int32 FrameNumber = GFrameBoundaries.GetFrameNumberForTimestamp(Timeline, CustomStat.GetTimestamp());
 		if (FrameNumber >= 0)
-	{
+		{
 			bool bIsInteger = CustomStat.IsInteger();
 			FCsvStatSeries* Series = ProcessedData.FindOrCreateStatSeries(CustomStat.GetStatID(), bIsInteger ? FCsvStatSeries::EType::CustomStatInt : FCsvStatSeries::EType::CustomStatFloat);
 			if (bIsInteger)
-		{
+			{
 				Series->SetCustomStatValue_Int(FrameNumber, CustomStat.GetCustomStatOp(), CustomStat.Value.AsInt);
-		}
+			}
 			else
-		{
+			{
 				Series->SetCustomStatValue_Float(FrameNumber, CustomStat.GetCustomStatOp(), CustomStat.Value.AsFloat);
 			}
 		}
@@ -1468,18 +1479,18 @@ void FCsvProfilerThreadData::ProcessThreadData()
 			ProcessedEvent.CategoryIndex = Event.CategoryIndex;
 			ProcessedData.ProcessedEvents.Add(ProcessedEvent);
 		}
-		}
 	}
+}
 
 
 FCsvProfiler* FCsvProfiler::Get()
+{
+	if (!Instance.IsValid())
 	{
-	if (Instance == nullptr)
-		{
-		Instance = new FCsvProfiler;
+		Instance = MakeUnique<FCsvProfiler>();
 	}
-	return Instance;
-		}
+	return Instance.Get();
+}
 
 FCsvProfiler::FCsvProfiler()
 	: NumFramesToCapture(-1)
@@ -1490,7 +1501,7 @@ FCsvProfiler::FCsvProfiler()
 	, LastEndFrameTimestamp(0)
 	, CaptureEndFrameCount(0)
 	, ProcessingThread(nullptr)
-		{
+{
 	check(IsInGameThread());
 	GetTlsProfilerThreadData();
 
@@ -1498,8 +1509,17 @@ FCsvProfiler::FCsvProfiler()
 	FCoreDelegates::OnEndFrame.AddStatic(CsvProfilerEndFrame);
 	FCoreDelegates::OnBeginFrameRT.AddStatic(CsvProfilerBeginFrameRT);
 	FCoreDelegates::OnEndFrameRT.AddStatic(CsvProfilerEndFrameRT);
-		}
+}
 
+FCsvProfiler::~FCsvProfiler()
+{
+	IsShuttingDown.Increment();
+	if (ProcessingThread)
+	{
+		delete ProcessingThread;
+		ProcessingThread = nullptr;
+	}
+}
 /** Per-frame update */
 void FCsvProfiler::BeginFrame()
 {
@@ -1527,7 +1547,12 @@ void FCsvProfiler::BeginFrame()
 			NumFramesToCapture = CurrentCommand.Value;
 			CaptureFrameNumber = 0;
 			LastEndFrameTimestamp = FPlatformTime::Cycles64();
-			DestinationFolder = CurrentCommand.DestinationFolder.IsEmpty() ? FPaths::ProfilingDir() + TEXT("CSV/") : CurrentCommand.DestinationFolder;
+
+			// Determine the output path and filename based on override params
+			FString DestinationFolder = CurrentCommand.DestinationFolder.IsEmpty() ? FPaths::ProfilingDir() + TEXT("CSV/") : CurrentCommand.DestinationFolder + TEXT("/");
+			FString Filename = CurrentCommand.Filename.IsEmpty() ? FString::Printf(TEXT("Profile(%s).csv"), *FDateTime::Now().ToString(TEXT("%Y%m%d_%H%M%S"))) : CurrentCommand.Filename;
+			OutputFilename = DestinationFolder + Filename;
+
 			bWriteCompletionFile = CurrentCommand.bWriteCompletionFile;
 			if (GCsvUseProcessingThread && ProcessingThread == nullptr)
 			{
@@ -1541,26 +1566,26 @@ void FCsvProfiler::BeginFrame()
 	{
 		GFrameBoundaries.AddBeginFrameTimestamp(ECsvTimeline::Gamethread);
 	}
-			
+
 	if (GCsvTestingGT)
-			{
+	{
 		CSVTest();
-			}
-		}
+	}
+}
 
 void FCsvProfiler::EndFrame()
 {
 	check(IsInGameThread());
 	if (bCapturing)
-		{
+	{
 		if (NumFramesToCapture >= 0)
-			{
+		{
 			NumFramesToCapture--;
 			if (NumFramesToCapture == 0)
-				{
+			{
 				EndCapture();
-				}
 			}
+		}
 
 		// Record the frametime (measured since the last EndFrame)
 		uint64 CurrentTimeStamp = FPlatformTime::Cycles64();
@@ -1570,7 +1595,11 @@ void FCsvProfiler::EndFrame()
 
 		FPlatformMemoryStats MemoryStats = FPlatformMemory::GetStats();
 		float PhysicalMBFree = float(MemoryStats.AvailablePhysical / 1024) / 1024.0f;
+		float PhysicalMBUsed = float(MemoryStats.UsedPhysical / 1024) / 1024.0f;
+		float VirtuallMBUsed = float(MemoryStats.UsedVirtual / 1024) / 1024.0f;
 		CSV_CUSTOM_STAT_GLOBAL(MemoryFreeMB, PhysicalMBFree, ECsvCustomStatOp::Set);
+		CSV_CUSTOM_STAT_GLOBAL(PhysicalUsedMB, PhysicalMBUsed, ECsvCustomStatOp::Set);
+		CSV_CUSTOM_STAT_GLOBAL(VirtualUsedMB, VirtuallMBUsed, ECsvCustomStatOp::Set);
 
 		// If we're single-threaded, process the stat data here
 		if (ProcessingThread == nullptr)
@@ -1601,7 +1630,7 @@ void FCsvProfiler::EndFrame()
 				WriteCaptureToFile();
 			}
 			else
-{
+			{
 				UE_LOG(LogCsvProfiler, Warning, TEXT("Capture Stop requested, but no capture was running!"));
 			}
 		}
@@ -1613,7 +1642,7 @@ void FCsvProfiler::EndFrame()
 
 /** Per-frame update */
 void FCsvProfiler::BeginFrameRT()
-	{
+{
 	check(IsInRenderingThread());
 	if (bCapturing)
 	{
@@ -1623,15 +1652,15 @@ void FCsvProfiler::BeginFrameRT()
 	bCapturingRT = bCapturing;
 
 	if (GCsvTestingRT)
-		{
+	{
 		CSVTest();
 	}
-		}
+}
 
 void FCsvProfiler::EndFrameRT()
-		{
+{
 	check(IsInRenderingThread());
-		}
+}
 
 
 /** Final cleanup */
@@ -1640,10 +1669,13 @@ void FCsvProfiler::Release()
 
 }
 
-void FCsvProfiler::BeginCapture(int InNumFramesToCapture /* = -1*/, const FString& InDestinationFolder /*= FString()*/, bool bInWriteCompletionFile /* = false*/)
+void FCsvProfiler::BeginCapture(int InNumFramesToCapture, 
+	const FString& InDestinationFolder, 
+	const FString& InFilename,
+	bool bInWriteCompletionFile )
 {
 	check(IsInGameThread());
-	CommandQueue.Enqueue(FCsvCaptureCommand(ECsvCommandType::Start, GCsvProfilerFrameNumber, InNumFramesToCapture, InDestinationFolder, bInWriteCompletionFile));
+	CommandQueue.Enqueue(FCsvCaptureCommand(ECsvCommandType::Start, GCsvProfilerFrameNumber, InNumFramesToCapture, InDestinationFolder, InFilename, bInWriteCompletionFile));
 }
 
 void FCsvProfiler::EndCapture()
@@ -1655,7 +1687,7 @@ void FCsvProfiler::EndCapture()
 
 
 class FCsvWriterHelper
-		{
+{
 public:
 	FCsvWriterHelper(FArchive* InOutputFile) : OutputFile(InOutputFile), bIsLineStart(true)
 	{}
@@ -1663,21 +1695,21 @@ public:
 	void WriteStringList(const TArray<FString>& Strings, FString Prefix)
 	{
 		for (int i = 0; i < Strings.Num(); i++)
-			{
+		{
 			WriteString(Prefix);
 			WriteStringInternal(Strings[i]);
-			}
+		}
 	}
 	void WriteValues(const TArray<double>& Values)
-			{
+	{
 		for (int i = 0; i < Values.Num(); i++)
-				{
+		{
 			WriteValue(Values[i]);
-				}
-			}
+		}
+	}
 
 	void WriteSemicolonSeparatedStringList(const TArray<FString>& Strings)
-			{
+	{
 		WriteString(TEXT(""));
 		for (int i = 0; i < Strings.Num(); i++)
 		{
@@ -1688,60 +1720,60 @@ public:
 				WriteChar(';');
 			}
 			WriteStringInternal(SanitizedText);
-			}
 		}
+	}
 
 	void NewLine()
-		{
+	{
 		WriteChar('\n');
 		bIsLineStart = true;
 	}
 
 	void WriteString(const FString& Str)
-			{
+	{
 		if (!bIsLineStart)
-				{
+		{
 			WriteChar(',');
 		}
 		bIsLineStart = false;
 		WriteStringInternal(Str);
-				}
+	}
 
 	void WriteValue(double Value)
-				{
+	{
 		if (!bIsLineStart)
-					{
+		{
 			WriteChar(',');
 		}
 		bIsLineStart = false;
 
 		ANSICHAR StringBuffer[256];
 		if (FMath::Frac(Value) == 0.0)
-						{
+		{
 			FCStringAnsi::Snprintf(StringBuffer, 256, "%d", int(Value));
-						}
+		}
 		else if (FMath::Abs(Value) < 0.1)
 		{
 			FCStringAnsi::Snprintf(StringBuffer, 256, "%.6f", Value);
-					}
+		}
 		else
 		{
 			FCStringAnsi::Snprintf(StringBuffer, 256, "%.4f", Value);
 		}
 		OutputFile->Serialize((void*)StringBuffer, sizeof(ANSICHAR)*FCStringAnsi::Strlen(StringBuffer));
-				}
+	}
 
 private:
 	void WriteStringInternal(const FString& Str)
-				{
+	{
 		auto AnsiStr = StringCast<ANSICHAR>(*Str);
 		OutputFile->Serialize((void*)AnsiStr.Get(), AnsiStr.Length());
-				}
+	}
 
 	void WriteChar(ANSICHAR Char)
-				{
+	{
 		OutputFile->Serialize((void*)&Char, sizeof(ANSICHAR));
-				}
+	}
 
 	FArchive* OutputFile;
 	bool bIsLineStart;
@@ -1753,26 +1785,21 @@ void FCsvProfiler::WriteCaptureToFile()
 	check(IsInGameThread());
 	FScopeLock Lock(&GCsvProcessingLock);
 	if (ProcessingThread)
-				{
+	{
 		GGameThreadIsCsvProcessingThread = true;
-				}
+	}
 
 	// Do a final process of the stat data
 	ProcessStatData();
 
-	// Write the results out to a file
-	FString Filename = FString::Printf(TEXT("Profile(%s)"), *FDateTime::Now().ToString(TEXT("%Y%m%d_%H%M%S")));
-	FString CSVRootPath = DestinationFolder;
-	FString OutputFilename = CSVRootPath + Filename + TEXT(".csv");
-
 	// Read back the processed data for each thread
 	TArray<const FCsvProcessedThreadData*> ProcessedThreadDataArray;
 	TArray<FCsvProfilerThreadData*> ProfilerThreadData;
 	GetProfilerThreadDataArray(ProfilerThreadData);
 	for (int t = 0; t < ProfilerThreadData.Num(); t++)
-				{
+	{
 		ProcessedThreadDataArray.Add(ProfilerThreadData[t]->GetProcessedData());
-				}
+	}
 
 #if ALLOW_DEBUG_FILES
 	FArchive* OutputFile = IFileManager::Get().CreateDebugFileWriter(*OutputFilename);
@@ -1780,62 +1807,89 @@ void FCsvProfiler::WriteCaptureToFile()
 	FArchive* OutputFile = IFileManager::Get().CreateFileWriter(*OutputFilename);
 #endif
 
-	FCsvWriterHelper CsvWriter(OutputFile);
+	check(OutputFile != nullptr);
+	if (!OutputFile)
+	{
+		UE_LOG(LogCsvProfiler, Warning, TEXT("Error writing CSV file : %s"), *OutputFilename);
+	}
+	else
+	{
+		FCsvWriterHelper CsvWriter(OutputFile);
 
-	// Write the first row (ie the header)
-	bool bHasEvents = false;
-	for (int32 CategoryIndex = 0; CategoryIndex < FCsvCategoryData::Get()->GetCategoryCount(); CategoryIndex++)
-				{
-		for (int32 t = 0; t < ProcessedThreadDataArray.Num(); t++)
-				{
-			const FCsvProcessedThreadData* ProcessedData = ProcessedThreadDataArray[t];
-			TArray<FString> StatNames;
+		// Write the first row (ie the header)
+		bool bHasEvents = false;
+		for (int32 CategoryIndex = 0; CategoryIndex < FCsvCategoryData::Get()->GetCategoryCount(); CategoryIndex++)
+		{
+			for (int32 t = 0; t < ProcessedThreadDataArray.Num(); t++)
+			{
+				const FCsvProcessedThreadData* ProcessedData = ProcessedThreadDataArray[t];
+				TArray<FString> StatNames;
 
-			// Read Custom stat names, write out with no prefix
-			ProcessedData->ReadStatNames(StatNames, CategoryIndex);
-			CsvWriter.WriteStringList(StatNames, TEXT(""));
-			StatNames.Empty();
-			if (ProcessedData->GetProcessedEventCount() > 0)
-					{
-				bHasEvents = true;
+				// Read Custom stat names, write out with no prefix
+				ProcessedData->ReadStatNames(StatNames, CategoryIndex);
+				CsvWriter.WriteStringList(StatNames, TEXT(""));
+				StatNames.Empty();
+				if (ProcessedData->GetProcessedEventCount() > 0)
+				{
+					bHasEvents = true;
+				}
 			}
 		}
-	}
-	if (bHasEvents)
-						{
-		CsvWriter.WriteString(TEXT("EVENTS"));
-						}
-	CsvWriter.NewLine();
-
-	// Write out the values
-	for (int32 i = 0; i < (int32)CaptureEndFrameCount; i++)
-						{
-		for (int32 CategoryIndex = 0; CategoryIndex < FCsvCategoryData::Get()->GetCategoryCount(); CategoryIndex++)
-							{
-			TArray<FString> RowEvents;
-			for (int t = 0; t < ProcessedThreadDataArray.Num(); t++)
-								{
-				const FCsvProcessedThreadData* ProcessedData = ProcessedThreadDataArray[t];
-				TArray<double> ThreadValues;
-
-				// Write stat values for this frame/category
-				ProcessedData->ReadStatDataForFrame(i, CategoryIndex, ThreadValues);
-				CsvWriter.WriteValues(ThreadValues);
-								}
-							}
 		if (bHasEvents)
 		{
-			TArray<FString> RowEvents;
-			for (int t = 0; t < ProcessedThreadDataArray.Num(); t++)
-			{
-				ProcessedThreadDataArray[t]->ReadEventDataForFrame(i, RowEvents);
-						}
-			CsvWriter.WriteSemicolonSeparatedStringList(RowEvents);
-					}
+			CsvWriter.WriteString(TEXT("EVENTS"));
+		}
 		CsvWriter.NewLine();
-				}
 
-	OutputFile->Close();
+		// Write out the values
+		for (int32 i = 0; i < (int32)CaptureEndFrameCount; i++)
+		{
+			for (int32 CategoryIndex = 0; CategoryIndex < FCsvCategoryData::Get()->GetCategoryCount(); CategoryIndex++)
+			{
+				TArray<FString> RowEvents;
+				for (int t = 0; t < ProcessedThreadDataArray.Num(); t++)
+				{
+					const FCsvProcessedThreadData* ProcessedData = ProcessedThreadDataArray[t];
+					TArray<double> ThreadValues;
+
+					// Write stat values for this frame/category
+					ProcessedData->ReadStatDataForFrame(i, CategoryIndex, ThreadValues);
+					CsvWriter.WriteValues(ThreadValues);
+				}
+			}
+			if (bHasEvents)
+			{
+				TArray<FString> RowEvents;
+				for (int t = 0; t < ProcessedThreadDataArray.Num(); t++)
+				{
+					ProcessedThreadDataArray[t]->ReadEventDataForFrame(i, RowEvents);
+				}
+				CsvWriter.WriteSemicolonSeparatedStringList(RowEvents);
+			}
+			CsvWriter.NewLine();
+		}
+
+		// Add metadata
+		FString PlatformStr = FString::Printf(TEXT("%s"), ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()));
+		FString BuildConfigurationStr = EBuildConfigurations::ToString(FApp::GetBuildConfiguration());
+		FString CommandlineStr = FString("\"") + FCommandLine::Get() + FString("\"");
+		FString BuildVersionString = FApp::GetBuildVersion();
+		FString EngineVersionString = FEngineVersion::Current().ToString();
+
+		CsvWriter.WriteString(TEXT("[Platform]"));
+		CsvWriter.WriteString(PlatformStr);
+		CsvWriter.WriteString(TEXT("[Config]"));
+		CsvWriter.WriteString(BuildConfigurationStr);
+		CsvWriter.WriteString(TEXT("[DeviceProfile]"));
+		CsvWriter.WriteString(DeviceProfileName);
+		CsvWriter.WriteString(TEXT("[BuildVersion]"));
+		CsvWriter.WriteString(BuildVersionString);
+		CsvWriter.WriteString(TEXT("[EngineVersion]"));
+		CsvWriter.WriteString(EngineVersionString);
+		CsvWriter.WriteString(TEXT("[Commandline]"));
+		CsvWriter.WriteString(CommandlineStr);
+		OutputFile->Close();
+	}
 
 	// Clear the processed data now we're done with it
 	uint64 PeakMemoryBytes = 0;
@@ -1844,12 +1898,10 @@ void FCsvProfiler::WriteCaptureToFile()
 	{
 		PeakMemoryBytes += ProfilerThreadData[t]->GetAllocatedSize();
 		ProfilerThreadData[t]->ClearProcessedData();
-		}
+	}
 
 	GFrameBoundaries.Clear();
-	FString NewFilename = CSVRootPath + Filename + TEXT(".csv");
-
-	UE_LOG(LogCsvProfiler, Display, TEXT("Capture Ended. Writing CSV to file : %s"), *NewFilename);
+	UE_LOG(LogCsvProfiler, Display, TEXT("Capture Ended. Writing CSV to file : %s"), *OutputFilename);
 	UE_LOG(LogCsvProfiler, Display, TEXT("  Frames : %d"), CaptureEndFrameCount);
 	UE_LOG(LogCsvProfiler, Display, TEXT("  Peak memory usage  : %.2fMB"), float(PeakMemoryBytes) / 1024.0f / 1024.0f);
 
@@ -1869,6 +1921,10 @@ void FCsvProfiler::WriteCaptureToFile()
 	}
 }
 
+void FCsvProfiler::SetDeviceProfileName(FString InDeviceProfileName)
+{
+	DeviceProfileName = InDeviceProfileName;
+}
 
 // Create the TLS profiler thread lazily
 FCsvProfilerThreadData* FCsvProfiler::GetTlsProfilerThreadData()
@@ -1992,14 +2048,14 @@ void FCsvProfiler::RecordCustomStat(const char * StatName, uint32 CategoryIndex,
 void FCsvProfiler::RecordCustomStat(const FName& StatName, uint32 CategoryIndex, int32 Value, const ECsvCustomStatOp CustomStatOp)
 {
 	if (!bCapturing)
-{
+	{
 		return;
 	}
 	if (GCsvCategoriesEnabled[CategoryIndex])
 	{
 		GetTlsProfilerThreadData()->AddCustomStat(StatName, CategoryIndex, Value, CustomStatOp);
 	}
-	}
+}
 
 void FCsvProfiler::Init()
 {
@@ -2007,10 +2063,10 @@ void FCsvProfiler::Init()
 	if (FParse::Param(FCommandLine::Get(), TEXT("csvGpuStats")))
 	{
 		IConsoleVariable* CVarGPUCsvStatsEnabled = IConsoleManager::Get().FindConsoleVariable(TEXT("r.GPUCsvStatsEnabled"));
-		if ( CVarGPUCsvStatsEnabled )
+		if (CVarGPUCsvStatsEnabled)
 		{
 			CVarGPUCsvStatsEnabled->Set(1);
-		}	
+		}
 	}
 	if (FParse::Param(FCommandLine::Get(), TEXT("csvTest")))
 	{
@@ -2060,7 +2116,7 @@ void FCsvProfiler::Init()
 }
 
 bool FCsvProfiler::IsCapturing()
-{ 
+{
 	check(IsInGameThread());
 	return bCapturing;
 }
@@ -2091,7 +2147,11 @@ float FCsvProfiler::ProcessStatData()
 {
 	check(IsInCsvProcessingThread());
 
+	float ElapsedMS = 0.0f;
+	if (!IsShuttingDown.GetValue())
+	{
 	double StartTime = FPlatformTime::Seconds();
+
 	TArray<FCsvProfilerThreadData*> ProfilerThreadData;
 	GetProfilerThreadDataArray(ProfilerThreadData);
 
@@ -2099,8 +2159,9 @@ float FCsvProfiler::ProcessStatData()
 	{
 		ProfilerThreadData[t]->ProcessThreadData();
 	}
-	float ElapsedMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
+		ElapsedMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
 	CSV_CUSTOM_STAT(CsvProfiler, ProcessCSVStats, ElapsedMS, ECsvCustomStatOp::Accumulate);
+	}
 	return ElapsedMS;
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/ExternalProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/ExternalProfiler.cpp
index 64676e4a16e5..0d3864bbe79e 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/ExternalProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/ExternalProfiler.cpp
@@ -7,8 +7,9 @@
 #include "Features/IModularFeatures.h"
 
 
-DEFINE_LOG_CATEGORY_STATIC( LogExternalProfiler, Log, All );
+#if UE_EXTERNAL_PROFILING_ENABLED
 
+DEFINE_LOG_CATEGORY_STATIC( LogExternalProfiler, Log, All );
 
 
 FExternalProfiler::FExternalProfiler()
@@ -148,4 +149,4 @@ void FScopedExternalProfilerBase::StopScopedTimer()
 	}
 }
 
-
+#endif	// UE_EXTERNAL_PROFILING_ENABLED
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/MallocProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/MallocProfiler.cpp
index 93ae9394548c..499c66fde23b 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/MallocProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/MallocProfiler.cpp
@@ -1257,8 +1257,8 @@ void FMallocProfiler::GetTexturePoolSize( FGenericMemoryStats& out_Stats )
 FMallocProfilerBufferedFileWriter::FMallocProfilerBufferedFileWriter()
 :	FileWriter( NULL )
 {
-	ArIsSaving		= true;
-	ArIsPersistent	= true;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 	BaseFilePath = TEXT("");
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/AQtimeExternalProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/AQtimeExternalProfiler.cpp
index f7e42df3b184..5523274c70a8 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/AQtimeExternalProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/AQtimeExternalProfiler.cpp
@@ -8,6 +8,7 @@
 #include "Windows/WindowsPlatformProcess.h"
 #include "Templates/UniquePtr.h"
 
+#if UE_EXTERNAL_PROFILING_ENABLED
 
 /**
  * AQtime implementation of FExternalProfiler
@@ -125,5 +126,4 @@ namespace AQtimeProfiler
 	static FAtModuleInit AtModuleInit;
 }
 
-
-
+#endif	// UE_EXTERNAL_PROFILING_ENABLED
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VSPerfExternalProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VSPerfExternalProfiler.cpp
index 529e6664567e..de1938dcc3fa 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VSPerfExternalProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VSPerfExternalProfiler.cpp
@@ -9,7 +9,7 @@
 #include "Templates/UniquePtr.h"
 
 // Not all versions of Visual Studio include the profiler SDK headers
-#if WITH_VS_PERF_PROFILER
+#if WITH_VS_PERF_PROFILER && UE_EXTERNAL_PROFILING_ENABLED
 
 #define VSPERF_NO_DEFAULT_LIB	// Don't use #pragma lib to import the library, we'll handle this stuff ourselves
 #define PROFILERAPI				// We won't be statically importing anything (we're dynamically binding), so define PROFILERAPI to a empty value
@@ -162,5 +162,4 @@ namespace VSPerfProfiler
 }
 
 
-
-#endif	// WITH_VS_PERF_PROFILER
+#endif	// WITH_VS_PERF_PROFILER && UE_EXTERNAL_PROFILING_ENABLED
diff --git a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VTuneExternalProfiler.cpp b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VTuneExternalProfiler.cpp
index b149f17f6949..8210a28f9b72 100644
--- a/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VTuneExternalProfiler.cpp
+++ b/Engine/Source/Runtime/Core/Private/ProfilingDebugging/Windows/VTuneExternalProfiler.cpp
@@ -13,6 +13,9 @@
 // VTune header for ITT event tracing
 #include "ittnotify.h"
 
+#if UE_EXTERNAL_PROFILING_ENABLED
+
+
 /** Per thread TMap for all ITT String Handles */
 struct FVTunePerThreadHandleMap : public TThreadSingleton<FVTunePerThreadHandleMap>
 {
@@ -197,3 +200,4 @@ namespace VTuneProfiler
 }
 
 
+#endif	// UE_EXTERNAL_PROFILING_ENABLED
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/Archive.cpp b/Engine/Source/Runtime/Core/Private/Serialization/Archive.cpp
index 4542ca5042b5..cee928e54b81 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/Archive.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/Archive.cpp
@@ -119,7 +119,8 @@ FArchive::~FArchive()
 #endif // USE_STABLE_LOCALIZATION_KEYS
 }
 
-// Resets all of the base archive members
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
 void FArchive::Reset()
 {
 #if DEVIRTUALIZE_FLinkerLoad_Serialize
@@ -184,8 +185,8 @@ void FArchive::CopyTrivialFArchiveStatusMembers(const FArchive& ArchiveToCopy)
 	ArUE4Ver                             = ArchiveToCopy.ArUE4Ver;
 	ArLicenseeUE4Ver                     = ArchiveToCopy.ArLicenseeUE4Ver;
 	ArEngineVer                          = ArchiveToCopy.ArEngineVer;
-	ArEngineNetVer						 = ArchiveToCopy.ArEngineNetVer;
-	ArGameNetVer						 = ArchiveToCopy.ArGameNetVer;
+	ArEngineNetVer                       = ArchiveToCopy.ArEngineNetVer;
+	ArGameNetVer                         = ArchiveToCopy.ArGameNetVer;
 	ArIsLoading                          = ArchiveToCopy.ArIsLoading;
 	ArIsSaving                           = ArchiveToCopy.ArIsSaving;
 	ArIsTransacting                      = ArchiveToCopy.ArIsTransacting;
@@ -197,13 +198,13 @@ void FArchive::CopyTrivialFArchiveStatusMembers(const FArchive& ArchiveToCopy)
 	ArIsCriticalError                    = ArchiveToCopy.ArIsCriticalError;
 	ArContainsCode                       = ArchiveToCopy.ArContainsCode;
 	ArContainsMap                        = ArchiveToCopy.ArContainsMap;
-	ArRequiresLocalizationGather		 = ArchiveToCopy.ArRequiresLocalizationGather;
+	ArRequiresLocalizationGather         = ArchiveToCopy.ArRequiresLocalizationGather;
 	ArForceByteSwapping                  = ArchiveToCopy.ArForceByteSwapping;
 	ArSerializingDefaults                = ArchiveToCopy.ArSerializingDefaults;
 	ArIgnoreArchetypeRef                 = ArchiveToCopy.ArIgnoreArchetypeRef;
 	ArNoDelta                            = ArchiveToCopy.ArNoDelta;
 	ArIgnoreOuterRef                     = ArchiveToCopy.ArIgnoreOuterRef;
-	ArIgnoreClassGeneratedByRef			 = ArchiveToCopy.ArIgnoreClassGeneratedByRef;
+	ArIgnoreClassGeneratedByRef          = ArchiveToCopy.ArIgnoreClassGeneratedByRef;
 	ArIgnoreClassRef                     = ArchiveToCopy.ArIgnoreClassRef;
 	ArAllowLazyLoading                   = ArchiveToCopy.ArAllowLazyLoading;
 	ArIsObjectReferenceCollector         = ArchiveToCopy.ArIsObjectReferenceCollector;
@@ -215,14 +216,15 @@ void FArchive::CopyTrivialFArchiveStatusMembers(const FArchive& ArchiveToCopy)
 	ArIsFilterEditorOnly                 = ArchiveToCopy.ArIsFilterEditorOnly;
 	ArIsSaveGame                         = ArchiveToCopy.ArIsSaveGame;
 	ArIsNetArchive                       = ArchiveToCopy.ArIsNetArchive;
-	ArCustomPropertyList				 = ArchiveToCopy.ArCustomPropertyList;
-	ArUseCustomPropertyList				 = ArchiveToCopy.ArUseCustomPropertyList;
+	ArCustomPropertyList                 = ArchiveToCopy.ArCustomPropertyList;
+	ArUseCustomPropertyList              = ArchiveToCopy.ArUseCustomPropertyList;
 	CookingTargetPlatform                = ArchiveToCopy.CookingTargetPlatform;
 	SerializedProperty					 = ArchiveToCopy.SerializedProperty;
 #if USE_STABLE_LOCALIZATION_KEYS
 	SetBaseLocalizationNamespace(ArchiveToCopy.GetBaseLocalizationNamespace());
 #endif // USE_STABLE_LOCALIZATION_KEYS
 }
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 /**
  * Returns the name of the Archive.  Useful for getting the name of the package a struct or object
@@ -423,7 +425,7 @@ void FArchive::SerializeBool( bool& D )
 	}
 	if (OldUBoolValue > 1)
 	{
-		UE_LOG( LogSerialization, Error, TEXT("Invalid boolean encountered while reading archive - stream is most likely corrupted."));
+		UE_LOG(LogSerialization, Error, TEXT("Invalid boolean encountered while reading archive %s - stream is most likely corrupted."), *GetArchiveName());
 
 		this->ArIsError = true;
 	}
@@ -444,7 +446,7 @@ const FCustomVersionContainer& FArchive::GetCustomVersions() const
 
 		// If the archive is for reading then we want to use currently registered custom versions, otherwise we expect
 		// serialization code to use UsingCustomVersion to populate the container.
-		if (ArIsLoading)
+		if (this->IsLoading())
 		{
 			*CustomVersionContainer = FCustomVersionContainer::GetRegistered();
 		}
@@ -1113,3 +1115,65 @@ void FArchive::LogfImpl(const TCHAR* Fmt, ...)
 	// Free temporary buffers.
 	FMemory::SystemFree( Buffer );
 }
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+void FArchive::SetUE4Ver(int32 InVer)
+{
+	ArUE4Ver = InVer;
+}
+
+void FArchive::SetLicenseeUE4Ver(int32 InVer)
+{
+	ArLicenseeUE4Ver = InVer;
+}
+
+void FArchive::SetEngineVer(const FEngineVersionBase& InVer)
+{
+	ArEngineVer = InVer;
+}
+
+void FArchive::SetEngineNetVer(const uint32 InEngineNetVer)
+{
+	ArEngineNetVer = InEngineNetVer;
+}
+
+void FArchive::SetGameNetVer(const uint32 InGameNetVer)
+{
+	ArGameNetVer = InGameNetVer;
+}
+
+void FArchive::SetIsLoading(bool bInIsLoading)
+{
+	ArIsLoading = bInIsLoading;
+}
+
+void FArchive::SetIsSaving(bool bInIsSaving)
+{
+	ArIsSaving = bInIsSaving;
+}
+
+void FArchive::SetIsTransacting(bool bInIsTransacting)
+{
+	ArIsTransacting = bInIsTransacting;
+}
+
+void FArchive::SetIsTextFormat(bool bInIsTextFormat)
+{
+	ArIsTextFormat = bInIsTextFormat;
+}
+
+void FArchive::SetWantBinaryPropertySerialization(bool bInWantBinaryPropertySerialization)
+{
+	ArWantBinaryPropertySerialization = bInWantBinaryPropertySerialization;
+}
+
+void FArchive::SetForceUnicode(bool bInForceUnicode)
+{
+	ArForceUnicode = bInForceUnicode;
+}
+
+void FArchive::SetIsPersistent(bool bInIsPersistent)
+{
+	ArIsPersistent = bInIsPersistent;
+}
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/ArchiveLoadCompressedProxy.cpp b/Engine/Source/Runtime/Core/Private/Serialization/ArchiveLoadCompressedProxy.cpp
index c7dc03ee0ebd..045467be37e7 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/ArchiveLoadCompressedProxy.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/ArchiveLoadCompressedProxy.cpp
@@ -19,9 +19,9 @@ FArchiveLoadCompressedProxy::FArchiveLoadCompressedProxy( const TArray<uint8>& I
 :	CompressedData(InCompressedData)
 ,	CompressionFlags(InCompressionFlags)
 {
-	ArIsLoading							= true;
-	ArIsPersistent						= true;
-	ArWantBinaryPropertySerialization	= true;
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
+	this->SetWantBinaryPropertySerialization(true);
 	bShouldSerializeFromArray			= false;
 	RawBytesSerialized					= 0;
 	CurrentIndex						= 0;
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/ArchiveSaveCompressedProxy.cpp b/Engine/Source/Runtime/Core/Private/Serialization/ArchiveSaveCompressedProxy.cpp
index 6b6025634cb0..7a75a995a0b0 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/ArchiveSaveCompressedProxy.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/ArchiveSaveCompressedProxy.cpp
@@ -20,9 +20,9 @@ FArchiveSaveCompressedProxy::FArchiveSaveCompressedProxy( TArray<uint8>& InCompr
 :	CompressedData(InCompressedData)
 ,	CompressionFlags(InCompressionFlags)
 {
-	ArIsSaving							= true;
-	ArIsPersistent						= true;
-	ArWantBinaryPropertySerialization	= true;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
+	this->SetWantBinaryPropertySerialization(true);
 	bShouldSerializeToArray				= false;
 	RawBytesSerialized					= 0;
 	CurrentIndex						= 0;
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/BitReader.cpp b/Engine/Source/Runtime/Core/Private/Serialization/BitReader.cpp
index df5e93e88bbd..58481a07447c 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/BitReader.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/BitReader.cpp
@@ -121,7 +121,8 @@ FBitReader::FBitReader(uint8* Src, int64 CountBits)
 {
 	Buffer.AddUninitialized((CountBits + 7) >> 3);
 
-	ArIsPersistent = ArIsLoading = 1;
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
 
 	// This class is exclusively used by the netcode
 	ArIsNetArchive = true;
@@ -144,8 +145,8 @@ void FBitReader::SetData( FBitReader& Src, int64 CountBits )
 	ArIsError	= 0;
 
 	// Setup network version
-	ArEngineNetVer	= Src.ArEngineNetVer;
-	ArGameNetVer	= Src.ArGameNetVer;
+	this->SetEngineNetVer(Src.EngineNetVer());
+	this->SetGameNetVer(Src.GameNetVer());
 
 	Buffer.Empty();
 	Buffer.AddUninitialized( (CountBits+7)>>3 );
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/BitWriter.cpp b/Engine/Source/Runtime/Core/Private/Serialization/BitWriter.cpp
index b3a09d79aa7f..f199ca2cd21a 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/BitWriter.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/BitWriter.cpp
@@ -29,7 +29,8 @@ FBitWriter::FBitWriter( int64 InMaxBits, bool InAllowResize /*=false*/ )
 
 	AllowResize = InAllowResize;
 	FMemory::Memzero(Buffer.GetData(), Buffer.Num());
-	ArIsPersistent = ArIsSaving = 1;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 
 	// This class is exclusively used by the netcode
 	ArIsNetArchive = true;
@@ -44,7 +45,8 @@ FBitWriter::FBitWriter(void)
 	, AllowResize(false)
 	, bAllowOverflow(false)
 {
-	ArIsPersistent = ArIsSaving = 1;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 
 	// This class is exclusively used by the netcode
 	ArIsNetArchive = true;
@@ -58,7 +60,8 @@ void FBitWriter::Reset(void)
 	FArchive::Reset();
 	Num = 0;
 	FMemory::Memzero(Buffer.GetData(), Buffer.Num());
-	ArIsPersistent = ArIsSaving = 1;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 
 	// This class is exclusively used by the netcode
 	ArIsNetArchive = true;
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryReader.cpp b/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryReader.cpp
index 2d4b80560c19..ac4388fb72f3 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryReader.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryReader.cpp
@@ -16,8 +16,8 @@ FLargeMemoryReader::FLargeMemoryReader(const uint8* InData, const int64 Num, ELa
 	, ArchiveName(InArchiveName)
 {
 	UE_CLOG(!(InData && Num > 0), LogSerialization, Fatal, TEXT("Tried to initialize an FLargeMemoryReader with a null or empty buffer. Archive name: %s."), *ArchiveName.ToString());
-	ArIsLoading = true;
-	ArIsPersistent = (InFlags & ELargeMemoryReaderFlags::Persistent) != ELargeMemoryReaderFlags::None;
+	this->SetIsLoading(true);
+	this->SetIsPersistent((InFlags & ELargeMemoryReaderFlags::Persistent) != ELargeMemoryReaderFlags::None);
 }
 
 void FLargeMemoryReader::Serialize(void* OutData, int64 Num)
diff --git a/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryWriter.cpp b/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryWriter.cpp
index 2159e8b379ea..8c09a06c6d20 100644
--- a/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryWriter.cpp
+++ b/Engine/Source/Runtime/Core/Private/Serialization/LargeMemoryWriter.cpp
@@ -15,8 +15,8 @@ FLargeMemoryWriter::FLargeMemoryWriter(const int64 PreAllocateBytes, bool bIsPer
 	, MaxBytes(0)
 	, ArchiveName(InFilename ? InFilename : TEXT("FLargeMemoryWriter"))
 {
-	ArIsSaving = true;
-	ArIsPersistent = bIsPersistent;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(bIsPersistent);
 	GrowBuffer(PreAllocateBytes);
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/Stats/StatsCommand.cpp b/Engine/Source/Runtime/Core/Private/Stats/StatsCommand.cpp
index 3c6663eeaceb..c98295abe01c 100644
--- a/Engine/Source/Runtime/Core/Private/Stats/StatsCommand.cpp
+++ b/Engine/Source/Runtime/Core/Private/Stats/StatsCommand.cpp
@@ -51,7 +51,7 @@ static TAutoConsoleVariable<int32> GCVarDumpHitchesAllThreads(
 	ECVF_RenderThreadSafe
 );
 
-void FromString( EStatCompareBy::Type& OutValue, const TCHAR* Buffer )
+void LexFromString( EStatCompareBy::Type& OutValue, const TCHAR* Buffer )
 {
 	OutValue = EStatCompareBy::Sum;
 
diff --git a/Engine/Source/Runtime/Core/Private/Stats/StatsMisc.cpp b/Engine/Source/Runtime/Core/Private/Stats/StatsMisc.cpp
index c1f52e817ef2..e2e9c00aa93b 100644
--- a/Engine/Source/Runtime/Core/Private/Stats/StatsMisc.cpp
+++ b/Engine/Source/Runtime/Core/Private/Stats/StatsMisc.cpp
@@ -9,13 +9,15 @@
 #if !ENABLE_STATNAMEDEVENTS && defined(USE_LIGHTWEIGHT_STATS_FOR_HITCH_DETECTION) && USE_LIGHTWEIGHT_STATS_FOR_HITCH_DETECTION && USE_HITCH_DETECTION
 
 #include "HAL/ThreadHeartBeat.h"
+#include "HAL/ThreadManager.h"
 
 void FLightweightStatScope::ReportHitch()
 {
 	if (StatString)
 	{
 		float Delta = float(FPlatformTime::Seconds() - FGameThreadHitchHeartBeat::Get().GetFrameStartTime()) * 1000.0f;
-		UE_LOG(LogCore, Error, TEXT("Leaving stat scope on hitch (+%8.2fms) %s"), Delta, StatString);
+		FString ThreadString(FPlatformTLS::GetCurrentThreadId() == GGameThreadId ? TEXT("GameThread") : FThreadManager::Get().GetThreadName(FPlatformTLS::GetCurrentThreadId()));
+		UE_LOG(LogCore, Error, TEXT("Leaving stat scope on hitch (+%8.2fms) [%s] %s"), Delta, *ThreadString, StatString);
 	}
 }
 
diff --git a/Engine/Source/Runtime/Core/Private/Tests/Math/UnrealMathTest.cpp b/Engine/Source/Runtime/Core/Private/Tests/Math/UnrealMathTest.cpp
index 0a7971743bb4..f7d1b0ae8e5a 100644
--- a/Engine/Source/Runtime/Core/Private/Tests/Math/UnrealMathTest.cpp
+++ b/Engine/Source/Runtime/Core/Private/Tests/Math/UnrealMathTest.cpp
@@ -443,15 +443,15 @@ FORCENOINLINE FRotator TestQuaternionToRotator(const FQuat& Quat)
 	// and we don't want fast approximations to be used here.
 	if (SingularityTest < -SINGULARITY_THRESHOLD)
 	{
-		RotatorFromQuat.Pitch = -90.f;
-		RotatorFromQuat.Yaw = -2.0f * FMath::Atan2(X, W) * RAD_TO_DEG;
-		RotatorFromQuat.Roll = 0.0f;
+		RotatorFromQuat.Pitch = 270.f;
+		RotatorFromQuat.Yaw = atan2f(YawY, YawX) * RAD_TO_DEG;
+		RotatorFromQuat.Roll = -RotatorFromQuat.Yaw - (2.f * atan2f(X, W) * RAD_TO_DEG);
 	}
 	else if (SingularityTest > SINGULARITY_THRESHOLD)
 	{
 		RotatorFromQuat.Pitch = 90.f;
-		RotatorFromQuat.Yaw = 2.0f * FMath::Atan2(X, W) * RAD_TO_DEG;
-		RotatorFromQuat.Roll = 0.0f;
+		RotatorFromQuat.Yaw = atan2f(YawY, YawX) * RAD_TO_DEG;
+		RotatorFromQuat.Roll = RotatorFromQuat.Yaw - (2.f * atan2f(X, W) * RAD_TO_DEG);
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/Core/Private/UObject/UnrealNames.cpp b/Engine/Source/Runtime/Core/Private/UObject/UnrealNames.cpp
index cd62f0b47915..6256c31234d7 100644
--- a/Engine/Source/Runtime/Core/Private/UObject/UnrealNames.cpp
+++ b/Engine/Source/Runtime/Core/Private/UObject/UnrealNames.cpp
@@ -306,6 +306,9 @@ FString FName::NameToDisplayString( const FString& InDisplayName, const bool bIs
 	bool bInARun = false;
 	bool bWasSpace = false;
 	bool bWasOpenParen = false;
+	bool bWasNumber = false;
+	bool bWasMinusSign = false;
+
 	FString OutDisplayName;
 	OutDisplayName.GetCharArray().Reserve(Chars.Num());
 	for( int32 CharIndex = 0 ; CharIndex < Chars.Num() ; ++CharIndex )
@@ -328,7 +331,8 @@ FString FName::NameToDisplayString( const FString& InDisplayName, const bool bIs
 		}
 
 		// If the current character is upper case or a digit, and the previous character wasn't, then we need to insert a space if there wasn't one previously
-		if( (bUpperCase || bIsDigit) && !bInARun && !bWasOpenParen)
+		// We don't do this for numerical expressions, for example "-1.2" should not be formatted as "- 1. 2"
+		if( (bUpperCase || (bIsDigit && !bWasMinusSign)) && !bInARun && !bWasOpenParen && !bWasNumber)
 		{
 			if( !bWasSpace && OutDisplayName.Len() > 0 )
 			{
@@ -356,7 +360,7 @@ FString FName::NameToDisplayString( const FString& InDisplayName, const bool bIs
 		{
 			ch = FChar::ToUpper( ch );
 		}
-		else if( bWasSpace || bWasOpenParen)	// If this is first character after a space, then make sure it is case-correct
+		else if( !bIsDigit && (bWasSpace || bWasOpenParen))	// If this is first character after a space, then make sure it is case-correct
 		{
 			// Some words are always forced lowercase
 			const TCHAR* Articles[] =
@@ -409,6 +413,12 @@ FString FName::NameToDisplayString( const FString& InDisplayName, const bool bIs
 		bWasSpace = ( ch == TEXT( ' ' ) ? true : false );
 		bWasOpenParen = ( ch == TEXT( '(' ) ? true : false );
 
+		// What could be included as part of a numerical representation.
+		// For example -1.2
+		bWasMinusSign = (ch == TEXT('-'));
+		const bool bPotentialNumericalChar = bWasMinusSign || (ch == TEXT('.'));
+		bWasNumber = bIsDigit || (bWasNumber && bPotentialNumericalChar);
+
 		OutDisplayName += ch;
 	}
 
diff --git a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformCrashContext.cpp b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformCrashContext.cpp
index 90a6b0335569..d88216ea7bf7 100644
--- a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformCrashContext.cpp
+++ b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformCrashContext.cpp
@@ -12,6 +12,7 @@
 #include "Misc/Parse.h"
 #include "Misc/CommandLine.h"
 #include "Misc/Paths.h"
+#include "Misc/FileHelper.h"
 #include "Delegates/IDelegateInstance.h"
 #include "Misc/Guid.h"
 #include "Misc/OutputDeviceRedirector.h"
@@ -276,8 +277,12 @@ void FUnixCrashContext::CaptureStackTrace()
 		const SIZE_T StackTraceSize = 65535;
 		ANSICHAR* StackTrace = (ANSICHAR*) FMemory::Malloc( StackTraceSize );
 		StackTrace[0] = 0;
+
+		int32 IgnoreCount = 0;
+		FGenericCrashContext::GeneratePortableCallStack(IgnoreCount, StackTraceSize, this);
+
 		// Walk the stack and dump it to the allocated memory (do not ignore any stack frames to be consistent with check()/ensure() handling)
-		FPlatformStackWalk::StackWalkAndDump( StackTrace, StackTraceSize, 0, this);
+		FPlatformStackWalk::StackWalkAndDump( StackTrace, StackTraceSize, IgnoreCount, this);
 
 #if !PLATFORM_LINUX
 		printf("StackTrace:\n%s\n", StackTrace);
@@ -298,6 +303,8 @@ namespace UnixCrashReporterTracker
 
 	bool Tick(float DeltaTime)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_UnixCrashReporterTracker_Tick);
+
 		if (!FPlatformProcess::IsProcRunning(CurrentlyRunningCrashReporter))
 		{
 			FPlatformProcess::CloseProc(CurrentlyRunningCrashReporter);
@@ -343,6 +350,16 @@ namespace UnixCrashReporterTracker
 
 		return true;
 	}
+
+	void RemoveValidCrashReportTickerForChildProcess()
+	{
+		if (CurrentTicker.IsValid())
+		{
+			FTicker::GetCoreTicker().RemoveTicker(CurrentTicker);
+			CurrentTicker.Reset();
+			CurrentlyRunningCrashReporter = FProcHandle();
+		}
+	}
 }
 
 
@@ -390,32 +407,65 @@ void FUnixCrashContext::GenerateCrashInfoAndLaunchReporter(bool bReportingNonCra
 		bool bMemoryOnly = FPlatformOutputDevices::GetLog()->IsMemoryOnly();
 		bool bBacklogEnabled = FOutputDeviceRedirector::Get()->IsBacklogEnabled();
 
-		if (bMemoryOnly || bBacklogEnabled)
+		// The minimum free space on drive for saving a crash log
+		const uint64 MinDriveSpaceForCrashLog = 250 * 1024 * 1024;
+		// Max log file size to copy to report folder as will be filtered before submission to crash reporting backend
+		const uint64 MaxFileSizeForCrashLog = 100 * 1024 * 1024;
+
+		// Check whether server has low disk space available
+		uint64 TotalDiskSpace = 0;
+		uint64 TotalDiskFreeSpace = 0;
+		bool bLowDriveSpace = false;
+		if (FPlatformMisc::GetDiskTotalAndFreeSpace(*LogDstAbsolute, TotalDiskSpace, TotalDiskFreeSpace))
 		{
-			FArchive* LogFile = IFileManager::Get().CreateFileWriter(*LogDstAbsolute, FILEWRITE_AllowRead);
-			if (LogFile)
+			if (TotalDiskFreeSpace < MinDriveSpaceForCrashLog)
 			{
-				if (bMemoryOnly)
+				bLowDriveSpace = true;
+			}
+		}
+
+		if (!bLowDriveSpace)
+		{
+			if (bMemoryOnly || bBacklogEnabled)
+			{
+				FArchive* LogFile = IFileManager::Get().CreateFileWriter(*LogDstAbsolute, FILEWRITE_AllowRead);
+				if (LogFile)
 				{
-					FPlatformOutputDevices::GetLog()->Dump(*LogFile);
+					if (bMemoryOnly)
+					{
+						FPlatformOutputDevices::GetLog()->Dump(*LogFile);
+					}
+					else
+					{
+						FOutputDeviceArchiveWrapper Wrapper(LogFile);
+						GLog->SerializeBacklog(&Wrapper);
+					}
+
+					LogFile->Flush();
+					delete LogFile;
+				}
+			}
+			else
+			{
+				const bool bReplace = true;
+				const bool bEvenIfReadOnly = false;
+				const bool bAttributes = false;
+				FCopyProgress* const CopyProgress = nullptr;
+
+				// Only copy the log file if it is MaxLogFileSizeForCrashReport or less (note it will be zlib compressed for submission to data router)				
+				if (IFileManager::Get().FileExists(*LogSrcAbsolute) && IFileManager::Get().FileSize(*LogSrcAbsolute) <= MaxFileSizeForCrashLog)
+				{
+					static_cast<void>(IFileManager::Get().Copy(*LogDstAbsolute, *LogSrcAbsolute, bReplace, bEvenIfReadOnly, bAttributes, CopyProgress, FILEREAD_AllowWrite, FILEWRITE_AllowRead));	// best effort, so don't care about result: couldn't copy -> tough, no log
 				}
 				else
 				{
-					FOutputDeviceArchiveWrapper Wrapper(LogFile);
-					GLog->SerializeBacklog(&Wrapper);
+					FFileHelper::SaveStringToFile(FString(TEXT("Log not available, too large for submission to crash reporting backend")), *LogDstAbsolute);
 				}
-
-				LogFile->Flush();
-				delete LogFile;
 			}
 		}
-		else
+		else if (TotalDiskFreeSpace >= MaxFileSizeForCrashLog)
 		{
-			const bool bReplace = true;
-			const bool bEvenIfReadOnly = false;
-			const bool bAttributes = false;
-			FCopyProgress* const CopyProgress = nullptr;
-			static_cast<void>(IFileManager::Get().Copy(*LogDstAbsolute, *LogSrcAbsolute, bReplace, bEvenIfReadOnly, bAttributes, CopyProgress, FILEREAD_AllowWrite, FILEWRITE_AllowRead));	// best effort, so don't care about result: couldn't copy -> tough, no log
+			FFileHelper::SaveStringToFile(FString(TEXT("Log not available, server has low available disk space")), *LogDstAbsolute);
 		}
 #endif // !NO_LOGGING
 
@@ -448,13 +498,19 @@ void FUnixCrashContext::GenerateCrashInfoAndLaunchReporter(bool bReportingNonCra
 			CrashReportClientArguments += TEXT(" -Unattended ");
 		}
 
+		// Whether to clean up crash reports after send
+		if (IsRunningDedicatedServer() && FParse::Param(FCommandLine::Get(), TEXT("CleanCrashReports")))
+		{
+			CrashReportClientArguments += TEXT(" -CleanCrashReports ");
+		}
+
 		CrashReportClientArguments += CrashInfoAbsolute + TEXT("/");
 
 		if (bReportingNonCrash)
 		{
 			// If we're reporting non-crash, try to avoid spinning here and instead do that in the tick.
 			// However, if there was already a crash reporter running (i.e. we hit ensure() too quickly), take a hitch here
-			if (FPlatformProcess::IsProcRunning(UnixCrashReporterTracker::CurrentlyRunningCrashReporter))
+			if (UnixCrashReporterTracker::CurrentTicker.IsValid())
 			{
 				// do not wait indefinitely, allow 45 second hitch (anticipating callstack parsing)
 				const double kEnsureTimeOut = 45.0;
diff --git a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformProcess.cpp b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformProcess.cpp
index 66bfa5489dd1..5976980cf421 100644
--- a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformProcess.cpp
+++ b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformProcess.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Unix/UnixPlatformProcess.h"
+#include "Unix/UnixPlatformCrashContext.h"
 #include "GenericPlatform/GenericPlatformFile.h"
 #include "Containers/StringConv.h"
 #include "Logging/LogMacros.h"
@@ -365,7 +366,7 @@ const TCHAR* FUnixPlatformProcess::ExecutableName(bool bRemoveExtension)
 
 FString FUnixPlatformProcess::GenerateApplicationPath( const FString& AppName, EBuildConfigurations::Type BuildConfiguration)
 {
-	FString PlatformName = GetBinariesSubdirectory();
+	FString PlatformName = FPlatformProcess::GetBinariesSubdirectory();
 	FString ExecutablePath = FString::Printf(TEXT("../../../Engine/Binaries/%s/%s"), *PlatformName, *AppName);
 	
 	if (BuildConfiguration != EBuildConfigurations::Development && BuildConfiguration != EBuildConfigurations::DebugGame)
@@ -1329,6 +1330,9 @@ FGenericPlatformProcess::EWaitAndForkResult FUnixPlatformProcess::WaitAndFork()
 					}
 				}
 
+				// Need to remove the child process from the responsibility of keeping track of a valid sibling process.
+				UnixCrashReporterTracker::RemoveValidCrashReportTickerForChildProcess();
+
 				// If requested, now wait for a SIGRTMIN+2 signal before continuing execution.
 				if (bRequireResponseSignal && NumForksToNotRequireResponse <= 0)
 				{
diff --git a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformStackWalk.cpp b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformStackWalk.cpp
index 06858e0cc3a6..2c64d5dfd1d8 100644
--- a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformStackWalk.cpp
+++ b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformStackWalk.cpp
@@ -1149,6 +1149,30 @@ void FUnixPlatformStackWalk::ProgramCounterToSymbolInfo( uint64 ProgramCounter,
 				sprintf(out_SymbolInfo.FunctionName, "0x%016llx", ProgramCounter);
 			}
 		}
+		// Temp fix to get modules names for portable callstack. Once we have the new way to symbolicate crashes we can remove this
+		else
+		{
+			Dl_info info;
+			if (dladdr(reinterpret_cast<void*>(ProgramCounter), &info) != 0)
+			{
+				// Only need the Module name for the portable bits
+				if (LIKELY(info.dli_fname != nullptr))
+				{
+					const ANSICHAR* SOPath = info.dli_fname;
+					const ANSICHAR* SOName = FCStringAnsi::Strrchr(SOPath, '/');
+					if (SOName)
+					{
+						SOName += 1;
+					}
+					else
+					{
+						SOName = SOPath;
+					}
+
+					FCStringAnsi::Strcpy(out_SymbolInfo.ModuleName, SOName);
+				}
+			}
+		}
 	}
 }
 
@@ -1459,7 +1483,11 @@ int32 FUnixPlatformStackWalk::GetProcessModuleCount()
 	int Size = 0;
 	dl_iterate_phdr(NumberOfDynamicLibrariesCallback, &Size);
 
-	return Size;
+	return 0;
+
+	// This will disable portable callstacks for Linux. Need to wait for the new symbolicator to enable
+	// otherwise we end up loading dwarf in while an ensure happens causing huge hitches/slowdowns
+	/* return Size; */
 }
 
 namespace
@@ -1524,7 +1552,11 @@ int32 FUnixPlatformStackWalk::GetProcessModuleSignatures(FStackWalkModuleInfo *M
 	ProcessModuleSignatures Signatures{ModuleSignatures, ModuleSignaturesSize, 0};
 	dl_iterate_phdr(CollectModuleSignatures, &Signatures);
 
-	return Signatures.Index;
+	return 0;
+
+	// This will disable portable callstacks for Linux. Need to wait for the new symbolicator to enable
+	// otherwise we end up loading dwarf in while an ensure happens causing huge hitches/slowdowns
+	/* return Signatures.Index; */
 }
 
 static FCriticalSection EnsureLock;
diff --git a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformTime.cpp b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformTime.cpp
index 893937da6be8..c17e2acf50b8 100644
--- a/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformTime.cpp
+++ b/Engine/Source/Runtime/Core/Private/Unix/UnixPlatformTime.cpp
@@ -30,6 +30,7 @@ double FUnixTime::InitTiming()
 {
 	if (ClockSource == -1)
 	{
+		// Only ever set this ClockSource once
 		ClockSource = FUnixTime::CalibrateAndSelectClock();
 	}
 
diff --git a/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformCrashContext.cpp b/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformCrashContext.cpp
index f05ca2e2b703..9691bae65f95 100644
--- a/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformCrashContext.cpp
+++ b/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformCrashContext.cpp
@@ -242,8 +242,37 @@ int32 ReportCrashUsingCrashReportClient(FWindowsPlatformCrashContext& InContext,
 				CrashReportClientArguments += FString(TEXT(" -DebugSymbols=")) + DownstreamStorage;
 			}
 
+			// CrashReportClient.exe should run without dragging in binaries from an inherited dll directory
+			// So, get the current dll directory for restore and clear before creating process
+			TCHAR* CurrentDllDirectory = nullptr;
+			DWORD BufferSize = (GetDllDirectory(0, nullptr) + 1) * sizeof(TCHAR);
+			
+			if (BufferSize > 0)
+			{
+				CurrentDllDirectory = (TCHAR*) FMemory::Malloc(BufferSize);
+				if (CurrentDllDirectory)
+				{
+					FMemory::Memset(CurrentDllDirectory, BufferSize, 0);
+					GetDllDirectory(BufferSize, CurrentDllDirectory);
+					SetDllDirectory(nullptr);
+				}
+			}
+
+			FString AbsCrashReportClientLog;
+			if (FParse::Value(FCommandLine::Get(), TEXT("AbsCrashReportClientLog="), AbsCrashReportClientLog))
+			{
+				CrashReportClientArguments += FString::Format(TEXT(" -abslog=\"{0}\""), { AbsCrashReportClientLog });
+			}
+
 			FString CrashClientPath = FPaths::Combine(*FPaths::EngineDir(), TEXT("Binaries"), FPlatformProcess::GetBinariesSubdirectory(), CrashReportClientExeName);
 			bCrashReporterRan = FPlatformProcess::CreateProc(*CrashClientPath, *CrashReportClientArguments, true, false, false, NULL, 0, NULL, NULL).IsValid();
+
+			// Restore the dll directory
+			if (CurrentDllDirectory)
+			{
+				SetDllDirectory(CurrentDllDirectory);
+				FMemory::Free(CurrentDllDirectory);
+			}
 		}
 
 		if (!bCrashReporterRan && !bNoDialog)
@@ -308,7 +337,10 @@ void NewReportEnsure( const TCHAR* ErrorMessage )
 	// The reason why we don't call HeartBeat() at the end of this function is that maybe this thread
 	// Never had a heartbeat checked and may not be sending heartbeats at all which would later lead to a false positives when detecting hangs.
 	FThreadHeartBeat::Get().KillHeartBeat();
-	FGameThreadHitchHeartBeat::Get().FrameStart(true);
+	if (IsInGameThread())
+	{
+		FGameThreadHitchHeartBeat::Get().FrameStart(true);
+	}
 
 	bReentranceGuard = true;
 
diff --git a/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformTime.cpp b/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformTime.cpp
index 393bea01076a..d121f6105aae 100644
--- a/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformTime.cpp
+++ b/Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformTime.cpp
@@ -4,6 +4,7 @@
 #include "Misc/AssertionMacros.h"
 #include "Containers/Ticker.h"
 #include "Windows/WindowsHWrapper.h"
+#include "Stats/Stats.h"
 
 float FWindowsPlatformTime::CPUTimePctRelative = 0.0f;
 
@@ -82,6 +83,8 @@ struct FFiletimeMisc
 
 bool FWindowsPlatformTime::UpdateCPUTime( float /*DeltaTime*/ )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FWindowsPlatformTime_UpdateCPUTime);
+
 	static double LastTotalProcessTime = 0.0f;
 	static double LastTotalUserAndKernelTime = 0.0f;
 
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidAffinity.h b/Engine/Source/Runtime/Core/Public/Android/AndroidAffinity.h
index 4792219894c3..9ebee216996c 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidAffinity.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidAffinity.h
@@ -20,6 +20,15 @@ public:
 	{
 		return RenderingThreadMask;
 	}
+	static EThreadPriority GetRenderingThreadPriority()
+	{
+		return TPri_SlightlyBelowNormal;
+	}
+
+	static EThreadPriority GetRHIThreadPriority()
+	{
+		return TPri_Normal;
+	}
 
 public:
 	static int64 GameThreadMask;
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidMemory.h b/Engine/Source/Runtime/Core/Public/Android/AndroidMemory.h
index 01075796a54f..aa7d8d462001 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidMemory.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidMemory.h
@@ -22,6 +22,7 @@ struct CORE_API FAndroidPlatformMemory : public FGenericPlatformMemory
 	//~ Begin FGenericPlatformMemory Interface
 	static void Init();
 	static FPlatformMemoryStats GetStats();
+	static uint64 GetMemoryUsedFast();
 	static const FPlatformMemoryConstants& GetConstants();
 	static EPlatformMemorySizeBucket GetMemorySizeBucket();
 	static FMalloc* BaseAllocator();
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidMisc.h b/Engine/Source/Runtime/Core/Public/Android/AndroidMisc.h
index 8b873f17fec2..e63569e7b979 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidMisc.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidMisc.h
@@ -35,7 +35,7 @@ struct CORE_API FAndroidMisc : public FGenericPlatformMisc
 	static void GetEnvironmentVariable(const TCHAR* VariableName, TCHAR* Result, int32 ResultLength);
 	static const TCHAR* GetSystemErrorMessage(TCHAR* OutBuffer, int32 BufferCount, int32 Error);
 	static EAppReturnType::Type MessageBoxExt( EAppMsgType::Type MsgType, const TCHAR* Text, const TCHAR* Caption );
-	static bool AllowRenderThread();
+	static bool UseRenderThread();
 	static bool HasPlatformFeature(const TCHAR* FeatureName);
 	static bool ShouldDisablePluginAtRuntime(const FString& PluginName);
 	static void SetThreadName(const char* name);
@@ -120,7 +120,9 @@ public:
 	static FBatteryState GetBatteryState();
 	static int GetBatteryLevel();
 	static bool IsRunningOnBattery();
+	static float GetDeviceTemperatureLevel();
 	static bool AreHeadPhonesPluggedIn();
+	static ENetworkConnectionType GetNetworkConnectionType();
 #if USE_ANDROID_JNI
 	static bool HasActiveWiFiConnection();
 #endif
@@ -133,6 +135,11 @@ public:
 
 	static IPlatformChunkInstall* GetPlatformChunkInstall();
 
+	static void PrepareMobileHaptics(EMobileHapticsType Type);
+	static void TriggerMobileHaptics();
+	static void ReleaseMobileHaptics();
+	static void ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY);
+
 	// ANDROID ONLY:
 	static void SetVersionInfo( FString AndroidVersion, FString DeviceMake, FString DeviceModel, FString OSLanguage );
 	static const FString GetAndroidVersion();
@@ -148,6 +155,21 @@ public:
 #if USE_ANDROID_JNI
 	static int GetAndroidBuildVersion();
 #endif
+
+	/* HasVulkanDriverSupport
+	 * @return true if this Android device supports a Vulkan API Unreal could use
+	 */
+	static bool HasVulkanDriverSupport();
+
+	/* IsVulkanAvailable
+	 * @return	true if there is driver support, we have an RHI, we are packaged with Vulkan support,
+	 *			and not we are not forcing GLES with a command line switch
+	 */
+	static bool IsVulkanAvailable();
+
+	/* ShouldUseVulkan
+	 * @return true if Vulkan is available, and not disabled by device profile cvar
+	 */
 	static bool ShouldUseVulkan();
 	static bool ShouldUseDesktopVulkan();
 	static FString GetVulkanVersion();
@@ -165,7 +187,13 @@ public:
 	{
 		if( IsDebuggerPresent() )
 		{
-			__builtin_trap();
+#if PLATFORM_ANDROID_ARM64
+			__asm__(".inst 0xd4200000");
+#elif PLATFORM_ANDROID_ARM
+			__asm__("trap");
+#else
+			__asm__("int $3");
+#endif
 		}
 	}
 
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatform.h b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatform.h
index 68334bb5cdbe..727848fbffd9 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatform.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatform.h
@@ -54,7 +54,13 @@ typedef FAndroidTypes FPlatformTypes;
 #define PLATFORM_UI_HAS_MOBILE_SCROLLBARS			1
 #define PLATFORM_UI_NEEDS_TOOLTIPS					0
 #define PLATFORM_UI_NEEDS_FOCUS_OUTLINES			0
-#define PLATFORM_RHITHREAD_DEFAULT_BYPASS			1
+#define PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK		1 // movies will start before engine is initalized
+
+#if defined(EXPERIMENTAL_OPENGL_RHITHREAD) && EXPERIMENTAL_OPENGL_RHITHREAD
+	#define PLATFORM_RHITHREAD_DEFAULT_BYPASS			0
+#else
+	#define PLATFORM_RHITHREAD_DEFAULT_BYPASS			1
+#endif
 
 // Conditionally set in AndroidToolChain.cs
 // always set to 1 for ARM64 builds
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformCompilerPreSetup.h b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformCompilerPreSetup.h
index 6c68cb981e1e..e40ec5e89356 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformCompilerPreSetup.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformCompilerPreSetup.h
@@ -9,11 +9,13 @@
 	#define THIRD_PARTY_INCLUDES_START \
 		PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS \
 		PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
-		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS
+		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
 #endif
 
 #ifndef THIRD_PARTY_INCLUDES_END
 	#define THIRD_PARTY_INCLUDES_END \
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 		PRAGMA_ENABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
 		PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 		PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformStackWalk.h b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformStackWalk.h
index 0b766b6d1d17..787bccae08ee 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformStackWalk.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidPlatformStackWalk.h
@@ -17,6 +17,7 @@ struct CORE_API FAndroidPlatformStackWalk : public FGenericPlatformStackWalk
 
 	static void ProgramCounterToSymbolInfo(uint64 ProgramCounter, FProgramCounterSymbolInfo& out_SymbolInfo);
 	static uint32 CaptureStackBackTrace(uint64* BackTrace, uint32 MaxDepth, void* Context = nullptr);
+	static bool SymbolInfoToHumanReadableString(const FProgramCounterSymbolInfo& SymbolInfo, ANSICHAR* HumanReadableString, SIZE_T HumanReadableStringSize);
 };
 
 typedef FAndroidPlatformStackWalk FPlatformStackWalk;
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidString.h b/Engine/Source/Runtime/Core/Public/Android/AndroidString.h
index 5bbefd99198d..29819d05c286 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidString.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidString.h
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 
 /*=============================================================================================
@@ -580,13 +580,6 @@ struct FAndroidPlatformString : public FGenericPlatformString
 
 		return Result;
 	}
-
-	static const ANSICHAR* GetEncodingName()
-	{
-		return "UTF-32LE";
-	}
-
-	static const bool IsUnicodeEncoded = true;
 };
 
 
diff --git a/Engine/Source/Runtime/Core/Public/Android/AndroidTime.h b/Engine/Source/Runtime/Core/Public/Android/AndroidTime.h
index b7c6f31bae7a..4507ac6468a6 100644
--- a/Engine/Source/Runtime/Core/Public/Android/AndroidTime.h
+++ b/Engine/Source/Runtime/Core/Public/Android/AndroidTime.h
@@ -7,6 +7,8 @@
 
 #pragma once
 #include "GenericPlatform/GenericPlatformTime.h"
+#include <sys/time.h>
+
 //@todo android: this entire file
 
 /**
@@ -15,6 +17,26 @@
 struct CORE_API FAndroidTime : public FGenericPlatformTime
 {
 	// android uses BSD time code from GenericPlatformTime
+	static FORCEINLINE double Seconds()
+	{
+		struct timespec ts;
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		return ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+	}
+
+	static FORCEINLINE uint32 Cycles()
+	{
+		struct timespec ts;
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		return (uint32) ((((uint64)ts.tv_sec) * 1000000ULL) + (((uint64)ts.tv_nsec) / 1000ULL));
+	}
+
+	static FORCEINLINE uint64 Cycles64()
+	{
+		struct timespec ts;
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		return ((((uint64)ts.tv_sec) * 1000000ULL) + (((uint64)ts.tv_nsec) / 1000ULL));
+	}
 };
 
 typedef FAndroidTime FPlatformTime;
diff --git a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformCompilerPreSetup.h b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformCompilerPreSetup.h
index c7b36f1661ea..c92bb6da5375 100644
--- a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformCompilerPreSetup.h
+++ b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformCompilerPreSetup.h
@@ -9,11 +9,13 @@
 	#define THIRD_PARTY_INCLUDES_START \
 		PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS \
 		PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
-		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS
+		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
 #endif
 
 #ifndef THIRD_PARTY_INCLUDES_END
 	#define THIRD_PARTY_INCLUDES_END \
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 		PRAGMA_ENABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
 		PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 		PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
diff --git a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformMemory.h b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformMemory.h
index 512fdbe22e66..b414c34f8a7f 100644
--- a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformMemory.h
+++ b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformMemory.h
@@ -63,6 +63,7 @@ struct CORE_API FApplePlatformMemory : public FGenericPlatformMemory
 	//~ Begin FGenericPlatformMemory Interface
 	static void Init();
 	static FPlatformMemoryStats GetStats();
+	static uint64 GetMemoryUsedFast();
 	static const FPlatformMemoryConstants& GetConstants();
 	static FMalloc* BaseAllocator();
 	static bool PageProtect(void* const Ptr, const SIZE_T Size, const bool bCanRead, const bool bCanWrite);
diff --git a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformString.h b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformString.h
index 0d031667259b..077ad4d668f2 100644
--- a/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformString.h
+++ b/Engine/Source/Runtime/Core/Public/Apple/ApplePlatformString.h
@@ -6,10 +6,14 @@
 
 #pragma once
 
+#include "CoreTypes.h"
+#if PLATFORM_TCHAR_IS_CHAR16
+#include "GenericPlatform/GenericWidePlatformString.h"
+#else
 #include "GenericPlatform/StandardPlatformString.h"
+#endif
 #include "Misc/AssertionMacros.h"
 #include "Misc/OutputDevice.h"
-#include "CoreTypes.h"
 
 #if PLATFORM_MAC
 #include "Mac/MacSystemIncludes.h"
@@ -39,9 +43,14 @@ class FString;
 
 
 /**
-* Mac string implementation
+* 2-byte replacement s string implementation
 **/
-struct FApplePlatformString : public FStandardPlatformString
+struct FApplePlatformString
+#if PLATFORM_TCHAR_IS_CHAR16
+	: public FGenericWidePlatformString
+#else
+	: public FStandardPlatformString
+#endif
 {
 	// These should be replaced with equivalent Convert and ConvertedLength functions when we properly support variable-length encodings.
 /*	static void WideCharToMultiByte(const TCHAR *Source, uint32 LengthWM1, ANSICHAR *Dest, uint32 LengthA)
@@ -77,24 +86,17 @@ struct FApplePlatformString : public FStandardPlatformString
 	{
 		const SIZE_T Length = CFStringGetLength( CFStr );
 		CFRange Range = CFRangeMake( 0, Length );
-		CFStringGetBytes( CFStr, Range, kCFStringEncodingUTF32LE, '?', false, ( uint8 *)TChar, Length * sizeof( TCHAR ) + 1, NULL );
+		CFStringGetBytes( CFStr, Range, sizeof( TCHAR ) == 4 ? kCFStringEncodingUTF32LE : kCFStringEncodingUnicode, '?', false, ( uint8 *)TChar, Length * sizeof( TCHAR ) + 1, NULL );
 		TChar[Length] = 0;
 	}
 	static CFStringRef TCHARToCFString( const TCHAR *TChar )
 	{
-		const SIZE_T Length = wcslen( TChar );
-		CFStringRef String = CFStringCreateWithBytes( kCFAllocatorDefault, ( const uint8 *)TChar, Length * sizeof( TCHAR ), kCFStringEncodingUTF32LE, false );
+		const SIZE_T Length = Strlen( TChar );
+		CFStringRef String = CFStringCreateWithBytes( kCFAllocatorDefault, ( const uint8 *)TChar, Length * sizeof( TCHAR ), sizeof( TCHAR ) == 4 ? kCFStringEncodingUTF32LE : kCFStringEncodingUnicode, false );
 		// we are getting some crashes on strings that aren't converting - so, instead of crashing, print them out instead
 		ensureMsgf(String, TEXT("Failed to allocated CFString for '%s' -- Length id %d"), TChar ? TChar : TEXT("nullptr"), Length);
 		return String;
 	}
-
-	static const ANSICHAR* GetEncodingName()
-	{
-		return "UTF-32LE";
-	}
-
-	static const bool IsUnicodeEncoded = true;
 };
 
 typedef FApplePlatformString FPlatformString;
diff --git a/Engine/Source/Runtime/Core/Public/Containers/Array.h b/Engine/Source/Runtime/Core/Public/Containers/Array.h
index c8fef36ef76d..83364824564b 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/Array.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/Array.h
@@ -1132,7 +1132,7 @@ public:
 	 *   - sizeof(ElementType) must be equal to the sum of sizes of it's member variables.
 	 *        - e.g. use pragma pack (push,1)/ (pop) to ensure alignment
 	 *        - match up uint8/ WORDs so everything always end up being properly aligned
-	 *   - Code can not rely on serialization of T if neither ArIsLoading nor ArIsSaving is true.
+	 *   - Code can not rely on serialization of T if neither IsLoading() nor IsSaving() is true.
 	 *   - Can only be called platforms that either have the same endianness as the one the content was saved with
 	 *     or had the endian conversion occur in a cooking process like e.g. for consoles.
 	 *
diff --git a/Engine/Source/Runtime/Core/Public/Containers/BitArray.h b/Engine/Source/Runtime/Core/Public/Containers/BitArray.h
index d5435c8cf861..ccda34bda9e8 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/BitArray.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/BitArray.h
@@ -334,10 +334,10 @@ public:
 	}
 
 	/**
-	 * Adds a bit to the array with the given value.
-	 * @return The index of the added bit.
+	 * Adds bits to the array with the given value.
+	 * @return The index of the first added bit.
 	 */
-	int32 Add(const bool Value)
+	int32 Add(const bool Value, const int32 Count = 1)
 	{
 		const int32 Index = NumBits;
 
@@ -447,12 +447,12 @@ public:
 		}
 
 		// Work out which uint32 index to set from, and how many
-		uint32 StartIndex = Index / 32;
-		uint32 Count      = (Index + Num + 31) / 32 - StartIndex;
+		uint32 StartIndex = Index / NumBitsPerDWORD;
+		uint32 Count      = (Index + Num + (NumBitsPerDWORD - 1)) / NumBitsPerDWORD - StartIndex;
 
 		// Work out masks for the start/end of the sequence
-		uint32 StartMask  = 0xFFFFFFFFu << (Index % 32);
-		uint32 EndMask    = 0xFFFFFFFFu >> (32 - (Index + Num) % 32) % 32;
+		uint32 StartMask  = 0xFFFFFFFFu << (Index % NumBitsPerDWORD);
+		uint32 EndMask    = 0xFFFFFFFFu >> (NumBitsPerDWORD - (Index + Num) % NumBitsPerDWORD) % NumBitsPerDWORD;
 
 		uint32* Data = GetData() + StartIndex;
 		if (Value)
diff --git a/Engine/Source/Runtime/Core/Public/Containers/DynamicRHIResourceArray.h b/Engine/Source/Runtime/Core/Public/Containers/DynamicRHIResourceArray.h
index 01a828ae63b7..2b84586e8c31 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/DynamicRHIResourceArray.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/DynamicRHIResourceArray.h
@@ -72,8 +72,8 @@ public:
 	* Non-clients can't discard the data because they may need to serialize it.
 	*/
 	virtual void Discard()
-	{		
-		if(!bNeedsCPUAccess && !GIsEditor && !IsRunningCommandlet())
+	{
+		if(!bNeedsCPUAccess && FPlatformProperties::RequiresCookedData() && !IsRunningCommandlet())
 		{
 			this->Empty();
 		}
diff --git a/Engine/Source/Runtime/Core/Public/Containers/Map.h b/Engine/Source/Runtime/Core/Public/Containers/Map.h
index 3f02856b763d..54a75e809fb5 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/Map.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/Map.h
@@ -546,8 +546,7 @@ public:
 				for (int32 Index = 0; Index < Num; ++Index)
 				{
 					FStructuredArchive::FSlot ValueSlot = Map.EnterElement(KeyString);
-					using namespace Lex;
-					FromString(Key, *KeyString);
+					LexFromString(Key, *KeyString);
 					ValueSlot << InMap.Add(Key);
 				}
 			}
@@ -556,8 +555,7 @@ public:
 				FString StringK;
 				for (TMapBase::TIterator It(InMap); It; ++It)
 				{
-					using namespace Lex;
-					StringK = ToString(It->Key);
+					StringK = LexToString(It->Key);
 					FStructuredArchive::FSlot ValueSlot = Map.EnterElement(StringK);
 					ValueSlot << It->Value;
 				}
diff --git a/Engine/Source/Runtime/Core/Public/Containers/StringConv.h b/Engine/Source/Runtime/Core/Public/Containers/StringConv.h
index 4cb4467509d6..945d5e89196e 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/StringConv.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/StringConv.h
@@ -716,6 +716,13 @@ typedef TStringConversion<FUTF8ToTCHAR_Convert> FUTF8ToTCHAR;
 #define TCHAR_TO_UTF8(str) (ANSICHAR*)FTCHARToUTF8((const TCHAR*)str).Get()
 #define UTF8_TO_TCHAR(str) (TCHAR*)FUTF8ToTCHAR((const ANSICHAR*)str).Get()
 
+// special needs handling for going from char16_t to wchar_t for third party libraries that need wchar_t
+#if PLATFORM_TCHAR_IS_CHAR16
+#define TCHAR_TO_WCHAR(str) (wchar_t*)StringCast<wchar_t>(static_cast<const TCHAR*>(str)).Get()
+#else
+#define TCHAR_TO_WCHAR(str) str
+#endif
+
 // This seemingly-pointless class is intended to be API-compatible with TStringConversion
 // and is returned by StringCast when no string conversion is necessary.
 template <typename T>
diff --git a/Engine/Source/Runtime/Core/Public/Containers/UnrealString.h b/Engine/Source/Runtime/Core/Public/Containers/UnrealString.h
index 0316f61f676d..00c20ce33fb4 100644
--- a/Engine/Source/Runtime/Core/Public/Containers/UnrealString.h
+++ b/Engine/Source/Runtime/Core/Public/Containers/UnrealString.h
@@ -1991,104 +1991,148 @@ inline int32 HexToBytes( const FString& HexString, uint8* OutBytes )
 	return NumBytes;
 }
 
-/** Namespace that houses lexical conversion for various types. User defined conversions can be implemented externally */
+/**
+ * Generalized API to convert something to a string. Function named after the (deprecated) Lex namespace, which
+ * was deprecated because introducing customization points in a nested namespace didn't work in generic code because
+ * it foiled 2-phase template instantiating compilers, which would bind to the qualified name (LexToString) in the first phase,
+ * preventing future overloads defined in later headers to be considered for binding.
+ */
+ /**
+ *	Expected functions in this namespace are as follows:
+ *		bool								LexTryParseString(T& OutValue, const TCHAR* Buffer);
+ *		void 								LexFromString(T& OutValue, const TCHAR* Buffer);
+ *		<implicitly convertible to string>	LexToString(T);
+ *		                    ^-- Generally this means it can return either FString or const TCHAR* 
+ *		                        Generic code that uses ToString should assign to an FString or forward along to other functions
+ *		                        that accept types that are also implicitly convertible to FString 
+ *
+ *	Implement custom functionality externally.
+ */
+
+ /** Covert a string buffer to intrinsic types */
+inline void LexFromString(int8& OutValue, 		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
+inline void LexFromString(int16& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
+inline void LexFromString(int32& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
+inline void LexFromString(int64& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi64(Buffer);	}
+inline void LexFromString(uint8& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
+inline void LexFromString(uint16& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
+inline void LexFromString(uint32& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atoi64(Buffer);	}	//64 because this unsigned and so Atoi might overflow
+inline void LexFromString(uint64& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Strtoui64(Buffer, nullptr, 0); }
+inline void LexFromString(float& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atof(Buffer);		}
+inline void LexFromString(double& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atod(Buffer);		}
+inline void LexFromString(bool& OutValue, 		const TCHAR* Buffer)	{	OutValue = FCString::ToBool(Buffer);	}
+inline void LexFromString(FString& OutValue, 	const TCHAR* Buffer)	{	OutValue = Buffer;						}
+
+ /** Convert numeric types to a string */
+template<typename T>
+typename TEnableIf<TIsArithmetic<T>::Value, FString>::Type
+LexToString(const T& Value)
+{
+	return FString::Printf( TFormatSpecifier<T>::GetFormatSpecifier(), Value );
+}
+
+template<typename CharType>
+typename TEnableIf<TIsCharType<CharType>::Value, FString>::Type
+LexToString(const CharType* Ptr)
+{
+	return FString(Ptr);
+}
+
+inline FString LexToString(bool Value)
+{
+	return Value ? TEXT("true") : TEXT("false");
+}
+
+FORCEINLINE FString LexToString(FString&& Str)
+{
+	return MoveTemp(Str);
+}
+
+FORCEINLINE FString LexToString(const FString& Str)
+{
+	return Str;
+}
+
+/** Helper template to convert to sanitized strings */
+template<typename T>
+FString LexToSanitizedString(const T& Value)
+{
+	return LexToString(Value);
+}
+
+/** Overloaded for floats */
+inline FString LexToSanitizedString(float Value)
+{
+	return FString::SanitizeFloat(Value);
+}
+
+/** Overloaded for doubles */
+inline FString LexToSanitizedString(double Value)
+{
+	return FString::SanitizeFloat(Value);
+}
+
+
+/** Parse a string into this type, returning whether it was successful */
+/** Specialization for arithmetic types */
+template<typename T>
+static typename TEnableIf<TIsArithmetic<T>::Value, bool>::Type
+LexTryParseString(T& OutValue, const TCHAR* Buffer)
+{
+	if (FCString::IsNumeric(Buffer))
+	{
+		LexFromString(OutValue, Buffer);
+		return true;
+	}
+	return false;
+}
+
+/** Try and parse a bool - always returns true */
+static bool LexTryParseString(bool& OutValue, const TCHAR* Buffer)
+{
+	LexFromString(OutValue, Buffer);
+	return true;
+}
+
+
+/** Deprecated Lex namespace. Forwards on to Lex prefixed equivalents for backwards compatibility. See Lex-prefixed functions above. */
 namespace Lex
 {
-	/**
-	 *	Expected functions in this namespace are as follows:
-	 *		bool								TryParseString(T& OutValue, const TCHAR* Buffer);
-	 *		void 								FromString(T& OutValue, const TCHAR* Buffer);
-	 *		<implicitly convertible to string>	ToString(T);
-	 *		                    ^-- Generally this means it can return either FString or const TCHAR* 
-	 *		                        Generic code that uses ToString should assign to an FString or forward along to other functions
-	 *		                        that accept types that are also implicitly convertible to FString 
-	 *
-	 *	Implement custom functionality externally.
-	 */
-
-	/** Covert a string buffer to intrinsic types */
-	inline void FromString(int8& OutValue, 		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
-	inline void FromString(int16& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
-	inline void FromString(int32& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
-	inline void FromString(int64& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi64(Buffer);	}
-	inline void FromString(uint8& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
-	inline void FromString(uint16& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atoi(Buffer);		}
-	inline void FromString(uint32& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atoi64(Buffer);	}	//64 because this unsigned and so Atoi might overflow
-	inline void FromString(uint64& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Strtoui64(Buffer, nullptr, 0); }
-	inline void FromString(float& OutValue,		const TCHAR* Buffer)	{	OutValue = FCString::Atof(Buffer);		}
-	inline void FromString(double& OutValue, 	const TCHAR* Buffer)	{	OutValue = FCString::Atod(Buffer);		}
-	inline void FromString(bool& OutValue, 		const TCHAR* Buffer)	{	OutValue = FCString::ToBool(Buffer);	}
-	inline void FromString(FString& OutValue, 	const TCHAR* Buffer)	{	OutValue = Buffer;						}
-
-	/** Convert numeric types to a string */
-	template<typename T>
-	typename TEnableIf<TIsArithmetic<T>::Value, FString>::Type
-		ToString(const T& Value)
-	{
-		return FString::Printf( TFormatSpecifier<T>::GetFormatSpecifier(), Value );
-	}
-
-	template<typename CharType>
-	typename TEnableIf<TIsCharType<CharType>::Value, FString>::Type
-		ToString(const CharType* Ptr)
-	{
-		return FString(Ptr);
-	}
-
-	inline FString ToString(bool Value)
-	{
-		return Value ? TEXT("true") : TEXT("false");
-	}
-
-	FORCEINLINE FString ToString(FString&& Str)
-	{
-		return MoveTemp(Str);
-	}
-
-	FORCEINLINE FString ToString(const FString& Str)
-	{
-		return Str;
-	}
-
-	/** Helper template to convert to sanitized strings */
-	template<typename T>
-	FString ToSanitizedString(const T& Value)
-	{
-		return ToString(Value);
-	}
-
-	/** Overloaded for floats */
-	inline FString ToSanitizedString(float Value)
-	{
-		return FString::SanitizeFloat(Value);
-	}
-
-	/** Overloaded for doubles */
-	inline FString ToSanitizedString(double Value)
-	{
-		return FString::SanitizeFloat(Value);
-	}
-
-
-	/** Parse a string into this type, returning whether it was successful */
-	/** Specialization for arithmetic types */
-	template<typename T>
-	static typename TEnableIf<TIsArithmetic<T>::Value, bool>::Type
-		TryParseString(T& OutValue, const TCHAR* Buffer)
-	{
-		if (FCString::IsNumeric(Buffer))
-		{
-			FromString(OutValue, Buffer);
-			return true;
-		}
-		return false;
-	}
 	
-	/** Try and parse a bool - always returns true */
-	static bool TryParseString(bool& OutValue, const TCHAR* Buffer)
+	template<typename T> 
+	DEPRECATED(4.20, "Lex::FromString has been deprecated. Please use LexFromString instead.")
+	void FromString(T& OutValue, const TCHAR* Buffer) 
+	{ 
+		LexFromString(OutValue, Buffer); 
+	}
+
+	template<typename T> 
+	DEPRECATED(4.20, "Lex::ToString has been deprecated. Please use LexToString instead.")
+#if PLATFORM_COMPILER_HAS_DECLTYPE_AUTO
+	decltype(auto) ToString(T&& Value)
+#else
+	auto ToString(T&& Value) -> decltype(LexToString(Forward<T>(Value)))
+#endif
 	{
-		FromString(OutValue, Buffer);
-		return true;
+		return LexToString(Forward<T>(Value)); 
+	}
+
+	template<typename T>
+	DEPRECATED(4.20, "Lex::ToSanitizedString has been deprecated. Please use LexToSanitizedString instead.")
+#if PLATFORM_COMPILER_HAS_DECLTYPE_AUTO
+	decltype(auto) ToSanitizedString(T&& Value)
+#else
+	auto ToSanitizedString(T&& Value) -> decltype(LexToSanitizedString(Forward<T>(Value)))
+#endif
+	{
+		return LexToSanitizedString(Forward<T>(Value)); 
+	}
+
+	template<typename T>
+	DEPRECATED(4.20, "Lex::TryParseString has been deprecated. Please use LexTryParseString instead.")
+	bool TryParseString(T& OutValue, const TCHAR* Buffer) 
+	{ 
+		return LexTryParseString(OutValue, Buffer); 
 	}
 }
 
@@ -2100,13 +2144,13 @@ namespace LexicalConversion = Lex;
 template<typename T>
 struct TTypeToString
 {
-	static FString ToString(const T& Value)				{ return Lex::ToString(Value); }
-	static FString ToSanitizedString(const T& Value)	{ return Lex::ToSanitizedString(Value); }
+	static FString ToString(const T& Value)				{ return LexToString(Value); }
+	static FString ToSanitizedString(const T& Value)	{ return LexToSanitizedString(Value); }
 };
 template<typename T>
 struct TTypeFromString
 {
-	static void FromString(T& Value, const TCHAR* Buffer) { return Lex::FromString(Value, Buffer); }
+	static void FromString(T& Value, const TCHAR* Buffer) { return LexFromString(Value, Buffer); }
 };
 
 /**
@@ -2269,6 +2313,6 @@ CORE_API int32 FindMatchingClosingParenthesis(const FString& TargetString, const
 *
 * @return	The slugged string
 */
-CORE_API FString SlugStringForValidName(const FString& DisplayString);
+CORE_API FString SlugStringForValidName(const FString& DisplayString, const TCHAR* ReplaceWith = TEXT(""));
 
 #include "Misc/StringFormatArg.h"
diff --git a/Engine/Source/Runtime/Core/Public/CoreGlobals.h b/Engine/Source/Runtime/Core/Public/CoreGlobals.h
index 94cf32323eab..f65ecc10384d 100644
--- a/Engine/Source/Runtime/Core/Public/CoreGlobals.h
+++ b/Engine/Source/Runtime/Core/Public/CoreGlobals.h
@@ -257,6 +257,9 @@ extern CORE_API void (*SuspendAsyncLoading)();
 /** Resumes async package loading. */
 extern CORE_API void (*ResumeAsyncLoading)();
 
+/** Suspends async package loading. */
+extern CORE_API bool (*IsAsyncLoadingSuspended)();
+
 /** Returns true if async loading is using the async loading thread */
 extern CORE_API bool(*IsAsyncLoadingMultithreaded)();
 
@@ -354,6 +357,9 @@ extern CORE_API ELogTimes::Type GPrintLogTimes;
 /** How to print the category in log output. */
 extern CORE_API bool GPrintLogCategory;
 
+/** How to print the verbosity in log output. */
+extern CORE_API bool GPrintLogVerbosity;
+
 #if USE_HITCH_DETECTION
 /** Used by the lightweight stats and FGameThreadHitchHeartBeat to print a stat stack for hitches in shipping builds. */
 extern CORE_API bool GHitchDetected;
diff --git a/Engine/Source/Runtime/Core/Public/Delegates/DelegateBase.h b/Engine/Source/Runtime/Core/Public/Delegates/DelegateBase.h
index 1973b13760e7..716fa8997537 100644
--- a/Engine/Source/Runtime/Core/Public/Delegates/DelegateBase.h
+++ b/Engine/Source/Runtime/Core/Public/Delegates/DelegateBase.h
@@ -13,13 +13,17 @@ struct FWeakObjectPtr;
 
 #if !defined(_WIN32) || defined(_WIN64)
 	// Let delegates store up to 32 bytes which are 16-byte aligned before we heap allocate
-	typedef TAlignedBytes<16, 16> AlignedInlineDelegateType;
-	typedef TInlineAllocator<2> DelegateAllocatorType;
+	typedef TAlignedBytes<16, 16> FAlignedInlineDelegateType;
+	#if USE_SMALL_DELEGATES
+		typedef FHeapAllocator FDelegateAllocatorType;
+	#else
+		typedef TInlineAllocator<2> FDelegateAllocatorType;
+	#endif
 #else
 	// ... except on Win32, because we can't pass 16-byte aligned types by value, as some delegates are
 	// so we'll just keep it heap-allocated, which are always sufficiently aligned.
-	typedef TAlignedBytes<16, 8> AlignedInlineDelegateType;
-	typedef FHeapAllocator DelegateAllocatorType;
+	typedef TAlignedBytes<16, 8> FAlignedInlineDelegateType;
+	typedef FHeapAllocator FDelegateAllocatorType;
 #endif
 
 
@@ -101,7 +105,7 @@ public:
 	 *
 	 * @return The object associated with this delegate if there is one.
 	 */
-	inline class UObject* GetUObject( ) const
+	FORCEINLINE class UObject* GetUObject( ) const
 	{
 		if (IDelegateInstance* Ptr = GetDelegateInstanceProtected())
 		{
@@ -116,7 +120,7 @@ public:
 	 *
 	 * @return True if the user object is still valid and it's safe to execute the function call.
 	 */
-	inline bool IsBound( ) const
+	FORCEINLINE bool IsBound( ) const
 	{
 		IDelegateInstance* Ptr = GetDelegateInstanceProtected();
 
@@ -128,7 +132,7 @@ public:
 	 *
 	 * @return True if this delegate is bound to InUserObject, false otherwise.
 	 */
-	inline bool IsBoundToObject( void const* InUserObject ) const
+	FORCEINLINE bool IsBoundToObject( void const* InUserObject ) const
 	{
 		if (!InUserObject)
 		{
@@ -143,12 +147,12 @@ public:
 	/**
 	 * Unbinds this delegate
 	 */
-	inline void Unbind( )
+	FORCEINLINE void Unbind( )
 	{
 		if (IDelegateInstance* Ptr = GetDelegateInstanceProtected())
 		{
 			Ptr->~IDelegateInstance();
-			DelegateAllocator.ResizeAllocation(0, 0, sizeof(AlignedInlineDelegateType));
+			DelegateAllocator.ResizeAllocation(0, 0, sizeof(FAlignedInlineDelegateType));
 			DelegateSize = 0;
 		}
 	}
@@ -163,14 +167,14 @@ public:
 	FORCEINLINE IDelegateInstance* GetDelegateInstance( ) const
 	{
 		return GetDelegateInstanceProtected();
-	}
+	} 
 
 	/**
 	 * Gets a handle to the delegate.
 	 *
 	 * @return The delegate instance.
 	 */
-	inline FDelegateHandle GetHandle() const
+	FORCEINLINE FDelegateHandle GetHandle() const
 	{
 		FDelegateHandle Result;
 		if (IDelegateInstance* Ptr = GetDelegateInstanceProtected())
@@ -203,10 +207,10 @@ private:
 			CurrentInstance->~IDelegateInstance();
 		}
 
-		int32 NewDelegateSize = FMath::DivideAndRoundUp(Size, (int32)sizeof(AlignedInlineDelegateType));
+		int32 NewDelegateSize = FMath::DivideAndRoundUp(Size, (int32)sizeof(FAlignedInlineDelegateType));
 		if (DelegateSize != NewDelegateSize)
 		{
-			DelegateAllocator.ResizeAllocation(0, NewDelegateSize, sizeof(AlignedInlineDelegateType));
+			DelegateAllocator.ResizeAllocation(0, NewDelegateSize, sizeof(FAlignedInlineDelegateType));
 			DelegateSize = NewDelegateSize;
 		}
 
@@ -214,7 +218,7 @@ private:
 	}
 
 private:
-	DelegateAllocatorType::ForElementType<AlignedInlineDelegateType> DelegateAllocator;
+	FDelegateAllocatorType::ForElementType<FAlignedInlineDelegateType> DelegateAllocator;
 	int32 DelegateSize;
 };
 
diff --git a/Engine/Source/Runtime/Core/Public/Delegates/MulticastDelegateBase.h b/Engine/Source/Runtime/Core/Public/Delegates/MulticastDelegateBase.h
index 0faff223a30d..1b980a7e5c52 100644
--- a/Engine/Source/Runtime/Core/Public/Delegates/MulticastDelegateBase.h
+++ b/Engine/Source/Runtime/Core/Public/Delegates/MulticastDelegateBase.h
@@ -9,11 +9,17 @@
 #include "Delegates/IDelegateInstance.h"
 #include "Delegates/DelegateBase.h"
 
+#if USE_SMALL_MULTICAST_DELEGATES
+	typedef FHeapAllocator FMulticastInvocationListAllocatorType;
+#else
+	typedef TInlineAllocator<1> FMulticastInvocationListAllocatorType;
+#endif
+
+typedef TArray<FDelegateBase, FMulticastInvocationListAllocatorType> TInvocationList;
+
 /**
  * Abstract base class for multicast delegates.
  */
-typedef TArray<FDelegateBase, TInlineAllocator<1> > TInvocationList;
-
 template<typename ObjectPtrType>
 class FMulticastDelegateBase
 {
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformChunkInstall.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformChunkInstall.h
index ebe6aee1efeb..2913b99a0f74 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformChunkInstall.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformChunkInstall.h
@@ -78,6 +78,16 @@ DECLARE_DELEGATE_OneParam(FPlatformChunkInstallCompleteDelegate, uint32);
 DECLARE_DELEGATE_TwoParams(FPlatformChunkInstallDelegate, uint32, bool);
 DECLARE_MULTICAST_DELEGATE_TwoParams(FPlatformChunkInstallMultiDelegate, uint32, bool);
 
+struct FChunkTagID
+{
+	FString ChunkTag;
+	uint32	ChunkID;
+
+	FChunkTagID(FString InTag, uint32 InID) :
+		ChunkTag(InTag), ChunkID(InID)
+	{}
+};
+
 /**
 * Interface for platform specific chunk based install
 **/
@@ -155,6 +165,30 @@ public:
 
 	DEPRECATED(4.18, "Call RemoveChunkInstallDelegate instead")
 	virtual void RemoveChunkInstallDelgate( uint32 ChunkID, FDelegateHandle Delegate ) = 0;
+
+	/**
+	* Check whether current platform supports intelligent chunk installation
+	* @return				whether Intelligent Install is supported
+	*/
+	virtual bool SupportsIntelligentInstall() = 0;
+
+	/**
+	* Check whether installation of chunks are pending
+	* @return				whether installation task has been kicked
+	*/
+	virtual bool IsChunkInstallationPending(const TArray<FChunkTagID> ChunkTagsID) = 0;
+
+	/**
+	* Install chunks with Intelligent Delivery API
+	* @return				whether installation task has been kicked
+	*/
+	virtual bool InstallChunks(const TArray<FChunkTagID> ChunkTagsID) = 0;
+
+	/**
+	* Uninstall chunks with Intelligent Delivery API
+	* @return				whether uninstallation task has been kicked
+	*/
+	virtual bool UninstallChunks(const TArray<FChunkTagID> ChunkTagsID) = 0;
 };
 
 PRAGMA_DISABLE_DEPRECATION_WARNINGS
@@ -228,6 +262,26 @@ public:
 		return;
 	}
 
+	virtual bool SupportsIntelligentInstall() override
+	{
+		return false;
+	}
+
+	virtual bool IsChunkInstallationPending(const TArray<FChunkTagID> ChunkTags) override
+	{
+		return false;
+	}
+
+	virtual bool InstallChunks(const TArray<FChunkTagID> ChunkTagIDs) override
+	{
+		return false;
+	}
+
+	virtual bool UninstallChunks(const TArray<FChunkTagID> ChunkTagsID) override
+	{
+		return false;
+	}
+
 protected:
 
 	/** Delegate called when installation succeeds or fails */
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMemory.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMemory.h
index 68e8db20d8f0..231eb7522d1b 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMemory.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMemory.h
@@ -31,6 +31,7 @@ enum class EPlatformMemorySizeBucket
 	Default,
 	Smaller,
 	Smallest,
+    Tiniest
 };
 
 
@@ -274,6 +275,14 @@ struct CORE_API FGenericPlatformMemory
 	 */
 	static FPlatformMemoryStats GetStats();
 
+	/**
+	* @return memory used for platforms that can do it quickly (without affecting stat unit much)
+	*/
+	static uint64 GetMemoryUsedFast()
+	{
+		return 0;
+	}
+
 	/**
 	 * Writes all platform specific current memory statistics in the format usable by the malloc profiler.
 	 */
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h
index 8f09fd3d2aef..a90668c0807a 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h
@@ -12,6 +12,10 @@ class IPlatformChunkInstall;
 class IPlatformCompression;
 struct FGenericCrashContext;
 struct FGenericMemoryWarningContext;
+struct FChunkTagID;
+
+template <typename FuncType>
+class TFunction;
 
 namespace EBuildConfigurations
 {
@@ -211,6 +215,41 @@ struct CORE_API FSHA256Signature
 	FString ToString() const;
 };
 
+enum class EMobileHapticsType : uint8
+{
+	// these are IOS UIFeedbackGenerator types
+	FeedbackSuccess,
+	FeedbackWarning,
+	FeedbackError,
+	SelectionChanged,
+	ImpactLight,
+	ImpactMedium,
+	ImpactHeavy,
+};
+
+enum class ENetworkConnectionType : uint8
+{
+    /**
+     * Enumerates the network connection types
+     */
+    Unknown,
+    None,
+    AirplaneMode,
+    Cell,
+    WiFi,
+	WiMAX,
+	Bluetooth,
+	Ethernet,
+};
+
+/**
+ * Returns the string representation of the specified ENetworkConnection value.
+ *
+ * @param Target The value to get the string for.
+ * @return The string representation.
+ */
+CORE_API const TCHAR* LexToString( ENetworkConnectionType Target );
+
 /**
 * Generic implementation for most platforms
 **/
@@ -639,15 +678,11 @@ public:
 	static const TCHAR* GetDefaultPathSeparator();
 
 	/**
-	 * Checks if platform wants to allow a rendering thread on current device (note: does not imply it will, only if okay given other criteria met)
+	 * Checks if platform wants to use a rendering thread on current device
 	 *
 	 * @return true if allowed, false if shouldn't use a separate rendering thread
 	 */
-	static bool AllowRenderThread()
-	{
-		// allow if not overridden
-		return true;
-	}
+	static bool UseRenderThread();
 
 	/**
 	* Checks if platform wants to allow an audio thread on current device (note: does not imply it will, only if okay given other criteria met)
@@ -879,6 +914,18 @@ public:
 		return -1;
 	}
 
+	FORCEINLINE static void SetBrightness(float bBright) { } 
+	FORCEINLINE static float GetBrightness() { return 1.0f; }
+    FORCEINLINE static void ResetBrightness() { } // resets brightness to brightness application started with
+    FORCEINLINE static bool SupportsBrightness() { return false; }
+
+	/**
+	 * Returns the current device temperature level.
+	 * Level is a relative value that is platform dependent. Lower is cooler, higher is warmer.
+	 * Level of -1 means Unimplemented.
+	 */
+	static float GetDeviceTemperatureLevel();
+
 	/** 
 	 * Allows a game/program/etc to control the game directory in a special place (for instance, monolithic programs that don't have .uprojects)
 	 */
@@ -942,6 +989,14 @@ public:
 		return false;
 	}
 
+    /**
+     * Returns whether WiFi connection is currently active
+     */
+    static ENetworkConnectionType GetNetworkConnectionType()
+    {
+        return ENetworkConnectionType::Unknown;
+    }
+    
 	/**
 	 * Returns whether the platform has variable hardware (configurable/upgradeable system).
 	 */
@@ -1070,16 +1125,46 @@ public:
 	 * looks on disk the first time for special files, so it is non-instant.
 	 */
 	static const TArray<FString>& GetConfidentialPlatforms();
-
 	
 	/**
-	 * Returns true if the platform allows network traffic for anonymous end user usage data
+	 * For mobile devices, this will crank up a haptic engine for the specified type to be played later with TriggerMobileHaptics
+	 * If this is called again before Release, it will switch to this type
 	 */
-	static bool AllowSendAnonymousGameUsageDataToEpic()
+	static void PrepareMobileHaptics(EMobileHapticsType Type)
 	{
-		return true;
 	}
 
+	/**
+	 * For mobile devices, this will kick the haptic type that was set in PrepareMobileHaptics. It can be called multiple times
+	 * with only a single call to Prepare
+	 */
+	static void TriggerMobileHaptics()
+	{
+	}
+
+	/**
+	 * For mobile devices, this will shutdown the haptics, allowing system to put it to reset as needed
+	 */
+	static void ReleaseMobileHaptics()
+	{
+	}
+
+	/**
+	 * Perform a mobile-style sharing of a URL. Will use native UI to display sharing target
+	 */
+	static void ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY)
+	{
+	}
+
+	static bool SupportsDeviceCheckToken()
+	{
+		return false;
+	}
+
+	static void RequestDeviceCheckToken(TFunction<void(const TArray<uint8>&)> QueryCompleteFunc);
+
+	static TArray<FChunkTagID> GetOnDemandChunkTagIDs();
+	
 #if !UE_BUILD_SHIPPING
 	/** 
 	 * Returns any platform specific warning messages we want printed on screen
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformString.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformString.h
index eea302efd964..f3b5501870a9 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformString.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformString.h
@@ -45,10 +45,19 @@ struct FGenericPlatformString
 	template <typename Encoding>
 	static const TCHAR* GetEncodingTypeName();
 
+	static const ANSICHAR* GetEncodingName()
+	{
+#if PLATFORM_TCHAR_IS_4_BYTES
+		return "UTF-32LE";
+#else
+		return "UTF-16LE";
+#endif
+	}
+
 	/**
 	 * True if the encoding type of the string is some form of unicode
 	 */
-	static const bool IsUnicodeEncoded = false;
+	static const bool IsUnicodeEncoded = true;
 
 
 	/**
@@ -67,6 +76,9 @@ struct FGenericPlatformString
 	template <bool Dummy> struct TIsFixedWidthEncoding_Helper<Dummy, ANSICHAR> { enum { Value = true }; };
 	template <bool Dummy> struct TIsFixedWidthEncoding_Helper<Dummy, WIDECHAR> { enum { Value = true }; };
 	template <bool Dummy> struct TIsFixedWidthEncoding_Helper<Dummy, UCS2CHAR> { enum { Value = true }; };
+#if PLATFORM_TCHAR_IS_CHAR16
+	template <bool Dummy> struct TIsFixedWidthEncoding_Helper<Dummy, wchar_t> { enum { Value = true }; };
+#endif
 
 	template <typename T>
 	struct TIsFixedWidthEncoding : TIsFixedWidthEncoding_Helper<false, T>
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericWidePlatformString.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericWidePlatformString.h
new file mode 100644
index 000000000000..4fd6cb53357a
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericWidePlatformString.h
@@ -0,0 +1,302 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreTypes.h"
+#include "Misc/Char.h"
+#include "GenericPlatform/GenericPlatformStricmp.h"
+#include "GenericPlatform/GenericPlatformString.h"
+
+#if PLATFORM_APPLE || PLATFORM_LINUX || PLATFORM_HTML5 || PLATFORM_PS4 || PLATFORM_SWITCH
+
+/**
+* Standard implementation
+**/
+struct FGenericWidePlatformString : public FGenericPlatformString
+{
+	template <typename CharType>
+	static inline CharType* Strupr(CharType* Dest, SIZE_T DestCount)
+	{
+		for (CharType* Char = Dest; *Char && DestCount > 0; Char++, DestCount--)
+		{
+			*Char = TChar<CharType>::ToUpper(*Char);
+		}
+		return Dest;
+	}
+
+public:
+	/**
+	 * Compares two strings case-insensitive.
+	 *
+	 * @param String1 First string to compare.
+	 * @param String2 Second string to compare.
+	 *
+	 * @returns Zero if both strings are equal. Greater than zero if first
+	 *          string is greater than the second one. Less than zero
+	 *          otherwise.
+	 */
+	template <typename CharType1, typename CharType2>
+	static inline int32 Stricmp(const CharType1* String1, const CharType2* String2)
+	{
+		return FGenericPlatformStricmp::Stricmp(String1, String2);
+	}
+
+	template <typename CharType>
+	static inline int32 Strnicmp( const CharType* String1, const CharType* String2, SIZE_T Count )
+	{
+		// walk the strings, comparing them case insensitively, up to a max size
+		for (; (*String1 || *String2) && Count > 0; String1++, String2++, Count--)
+		{
+			if(*String1 != *String2)
+			{
+				CharType Char1 = TChar<CharType>::ToUpper(*String1), Char2 = TChar<CharType>::ToUpper(*String2);
+				if (Char1 != Char2)
+				{
+					return Char1 - Char2;
+				}
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 * Unicode implementation
+	 **/
+	static WIDECHAR* Strcpy(WIDECHAR* Dest, SIZE_T DestCount, const WIDECHAR* Src);
+	static WIDECHAR* Strncpy(WIDECHAR* Dest, const WIDECHAR* Src, SIZE_T MaxLen);
+	static WIDECHAR* Strcat(WIDECHAR* Dest, SIZE_T DestCount, const WIDECHAR* Src);
+
+	static int32 Strcmp( const WIDECHAR* String1, const WIDECHAR* String2 )
+	{
+		// walk the strings, comparing them case sensitively
+		for (; *String1 || *String2; String1++, String2++)
+		{
+			WIDECHAR A = *String1, B = *String2;
+			if (A != B)
+			{
+				return A - B;
+			}
+		}
+		return 0;
+	}
+
+	static int32 Strncmp( const WIDECHAR* String1, const WIDECHAR* String2, SIZE_T Count )
+	{
+		// walk the strings, comparing them case sensitively, up to a max size
+		for (; (*String1 || *String2) && Count; String1++, String2++, Count--)
+		{
+			TCHAR A = *String1, B = *String2;
+			if (A != B)
+			{
+				return A - B;
+			}
+		}
+		return 0;
+	}
+
+	static int32 Strlen( const WIDECHAR* String )
+	{
+		int32 Length = -1;
+		
+		do
+		{
+			Length++;
+		}
+		while (*String++);
+		
+		return Length;
+	}
+
+	static const WIDECHAR* Strstr( const WIDECHAR* String, const WIDECHAR* Find)
+	{
+		WIDECHAR Char1, Char2;
+		if ((Char1 = *Find++) != 0)
+		{
+			size_t Length = Strlen(Find);
+			
+			do
+			{
+				do
+				{
+					if ((Char2 = *String++) == 0)
+					{
+						return nullptr;
+					}
+				}
+				while (Char1 != Char2);
+			}
+			while (Strncmp(String, Find, Length) != 0);
+			
+			String--;
+		}
+		
+		return String;
+	}
+
+	static const WIDECHAR* Strchr( const WIDECHAR* String, WIDECHAR C)
+	{
+		while (*String != C && *String != 0)
+		{
+			String++;
+		}
+		
+		return (*String == C) ? (TCHAR *)String : nullptr;
+	}
+
+	static const WIDECHAR* Strrchr( const WIDECHAR* String, WIDECHAR C)
+	{
+		const WIDECHAR *Last = nullptr;
+		
+		while (true)
+		{
+			if (*String == C)
+			{
+				Last = String;
+			}
+			
+			if (*String == 0)
+			{
+				break;
+			}
+			
+			String++;
+		}
+		
+		return Last;
+	}
+
+	static int32 Strtoi( const WIDECHAR* Start, WIDECHAR** End, int32 Base );
+	static int64 Strtoi64( const WIDECHAR* Start, WIDECHAR** End, int32 Base );
+	static uint64 Strtoui64( const WIDECHAR* Start, WIDECHAR** End, int32 Base );
+	static float Atof(const WIDECHAR* String);
+	static double Atod(const WIDECHAR* String);
+
+	static FORCEINLINE int32 Atoi(const WIDECHAR* String)
+	{
+		return Strtoi( String, NULL, 10 );
+	}
+	
+	static FORCEINLINE int64 Atoi64(const WIDECHAR* String)
+	{
+		return Strtoi64( String, NULL, 10 );
+	}
+
+	
+	
+	static WIDECHAR* Strtok( WIDECHAR* StrToken, const WIDECHAR* Delim, WIDECHAR** Context );
+	static int32 GetVarArgs( WIDECHAR* Dest, SIZE_T DestSize, int32 Count, const WIDECHAR*& Fmt, va_list ArgPtr );
+
+	/**
+	 * Ansi implementation
+	 **/
+	static FORCEINLINE ANSICHAR* Strcpy(ANSICHAR* Dest, SIZE_T DestCount, const ANSICHAR* Src)
+	{
+		return strcpy( Dest, Src );
+	}
+
+	static FORCEINLINE ANSICHAR* Strncpy(ANSICHAR* Dest, const ANSICHAR* Src, int32 MaxLen)
+	{
+		::strncpy(Dest, Src, MaxLen);
+		Dest[MaxLen-1]=0;
+		return Dest;
+	}
+
+	static FORCEINLINE ANSICHAR* Strcat(ANSICHAR* Dest, SIZE_T DestCount, const ANSICHAR* Src)
+	{
+		return strcat( Dest, Src );
+	}
+
+	static FORCEINLINE int32 Strcmp( const ANSICHAR* String1, const ANSICHAR* String2 )
+	{
+		return strcmp(String1, String2);
+	}
+
+	static FORCEINLINE int32 Strncmp( const ANSICHAR* String1, const ANSICHAR* String2, SIZE_T Count )
+	{
+		return strncmp( String1, String2, Count );
+	}
+
+	static FORCEINLINE int32 Strlen( const ANSICHAR* String )
+	{
+		return strlen( String );
+	}
+
+	static FORCEINLINE const ANSICHAR* Strstr( const ANSICHAR* String, const ANSICHAR* Find)
+	{
+		return strstr(String, Find);
+	}
+
+	static FORCEINLINE const ANSICHAR* Strchr( const ANSICHAR* String, ANSICHAR C)
+	{
+		return strchr(String, C);
+	}
+
+	static FORCEINLINE const ANSICHAR* Strrchr( const ANSICHAR* String, ANSICHAR C)
+	{
+		return strrchr(String, C);
+	}
+
+	static FORCEINLINE int32 Atoi(const ANSICHAR* String)
+	{
+		return atoi( String );
+	}
+
+	static FORCEINLINE int64 Atoi64(const ANSICHAR* String)
+	{
+		return strtoll( String, NULL, 10 );
+	}
+
+	static FORCEINLINE float Atof(const ANSICHAR* String)
+	{
+		return (float)atof( String );
+	}
+
+	static FORCEINLINE double Atod(const ANSICHAR* String)
+	{
+		return atof( String );
+	}
+
+	static FORCEINLINE int32 Strtoi( const ANSICHAR* Start, ANSICHAR** End, int32 Base )
+	{
+		return strtol( Start, End, Base );
+	}
+
+	static FORCEINLINE int64 Strtoi64( const ANSICHAR* Start, ANSICHAR** End, int32 Base )
+	{
+		return strtoll(Start, End, Base);
+	}
+
+	static FORCEINLINE uint64 Strtoui64( const ANSICHAR* Start, ANSICHAR** End, int32 Base )
+	{
+		return strtoull(Start, End, Base);
+	}
+
+	static FORCEINLINE ANSICHAR* Strtok(ANSICHAR* StrToken, const ANSICHAR* Delim, ANSICHAR** Context)
+	{
+		return strtok(StrToken, Delim);
+	}
+
+	static int32 GetVarArgs( ANSICHAR* Dest, SIZE_T DestSize, int32 Count, const ANSICHAR*& Fmt, va_list ArgPtr )
+	{
+		int32 Result = vsnprintf(Dest,Count,Fmt,ArgPtr);
+		va_end( ArgPtr );
+		return Result;
+	}
+
+	/**
+	 * UCS2 implementation
+	 **/
+
+	static FORCEINLINE int32 Strlen( const UCS2CHAR* String )
+	{
+		int32 Result = 0;
+		while (*String++)
+		{
+			++Result;
+		}
+
+		return Result;
+	}
+};
+
+#endif
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/MicrosoftPlatformString.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/MicrosoftPlatformString.h
index 4c0a4968b0c9..630f1243a34b 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/MicrosoftPlatformString.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/MicrosoftPlatformString.h
@@ -318,13 +318,6 @@ struct FMicrosoftPlatformString : public FGenericPlatformString
 	{
 		return _tcslen( (const WIDECHAR*)String );
 	}
-
-	static const ANSICHAR* GetEncodingName()
-	{
-		return "UTF-16LE";
-	}
-
-	static const bool IsUnicodeEncoded = true;
 };
 
 #if !USE_SECURE_CRT
diff --git a/Engine/Source/Runtime/Core/Public/GenericPlatform/StandardPlatformString.h b/Engine/Source/Runtime/Core/Public/GenericPlatform/StandardPlatformString.h
index dd88c2eaadb0..5b425a3f7bc1 100644
--- a/Engine/Source/Runtime/Core/Public/GenericPlatform/StandardPlatformString.h
+++ b/Engine/Source/Runtime/Core/Public/GenericPlatform/StandardPlatformString.h
@@ -8,7 +8,7 @@
 #include "GenericPlatform/GenericPlatformString.h"
 #include <wchar.h>
 
-#if PLATFORM_APPLE || PLATFORM_UNIX || PLATFORM_HTML5 || PLATFORM_PS4 || PLATFORM_SWITCH
+#if (PLATFORM_APPLE || PLATFORM_UNIX || PLATFORM_HTML5 || PLATFORM_PS4 || PLATFORM_SWITCH) && !PLATFORM_TCHAR_IS_CHAR16
 
 /**
 * Standard implementation
diff --git a/Engine/Source/Runtime/Core/Public/HAL/FeedbackContextAnsi.h b/Engine/Source/Runtime/Core/Public/HAL/FeedbackContextAnsi.h
index 843fe966e45e..1f987451f8df 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/FeedbackContextAnsi.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/FeedbackContextAnsi.h
@@ -31,8 +31,8 @@ public:
 	void LocalPrint( const TCHAR* Str )
 	{
 #if PLATFORM_APPLE || PLATFORM_UNIX
-		printf("%s", TCHAR_TO_ANSI(Str));
-#elif PLATFORM_WINDOWS
+		printf("%s", TCHAR_TO_UTF8(Str));
+#elif PLATFORM_WINDOWS || PLATFORM_XBOXONE
 		wprintf(TEXT("%ls"), Str);
 #else
 		// If this function ever gets more complicated, we could make a PlatformMisc::Printf, and each platform can then 
diff --git a/Engine/Source/Runtime/Core/Public/HAL/IConsoleManager.h b/Engine/Source/Runtime/Core/Public/HAL/IConsoleManager.h
index 3b16cdaf9016..5adf783f3cf3 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/IConsoleManager.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/IConsoleManager.h
@@ -13,6 +13,12 @@
 
 #define TRACK_CONSOLE_FIND_COUNT !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 
+#if DO_CHECK && (!UE_BUILD_SHIPPING) // Disable even if checks in shipping are enabled.
+	#define cvarCheckCode( Code )		checkCode( Code )
+#else
+	#define cvarCheckCode(...)
+#endif
+
 template <class T> class TConsoleVariableData;
 
 /**
@@ -434,6 +440,11 @@ public:
 	 * True if we allow the console to create multi-line commands.
 	 */
 	virtual bool AllowMultiLine() const = 0;
+
+	/**
+	* Returns the hotkey for this executor
+	*/
+	virtual struct FInputChord GetHotKey() const = 0;
 };
 
 
@@ -895,7 +906,7 @@ public:
 	T GetValueOnGameThread() const
 	{
 		// compiled out in shipping for performance (we can change in development later), if this get triggered you need to call GetValueOnRenderThread() or GetValueOnAnyThread(), the last one is a bit slower
-		checkCode(ensure(GetShadowIndex() == 0));	// ensure to not block content creators, #if to optimize in shipping
+		cvarCheckCode(ensure(GetShadowIndex() == 0));	// ensure to not block content creators, #if to optimize in shipping
 		return ShadowedValue[0];
 	}
 
@@ -904,7 +915,7 @@ public:
 	{
 #if !defined(__clang__) // @todo Mac: figure out how to make this compile
 		// compiled out in shipping for performance (we can change in development later), if this get triggered you need to call GetValueOnGameThread() or GetValueOnAnyThread(), the last one is a bit slower
-		checkCode(ensure(IsInParallelRenderingThread()));	// ensure to not block content creators, #if to optimize in shipping
+		cvarCheckCode(ensure(IsInParallelRenderingThread()));	// ensure to not block content creators, #if to optimize in shipping
 #endif
 		return ShadowedValue[1];
 	}
@@ -925,7 +936,7 @@ private: // ----------------------------------------------------
 	{	
 		if (bForceGameThread)
 		{
-			checkCode(ensure(!IsInActualRenderingThread()));
+			cvarCheckCode(ensure(!IsInActualRenderingThread()));
 			return 0;
 		}
 		return IsInGameThread() ? 0 : 1;
diff --git a/Engine/Source/Runtime/Core/Public/HAL/LowLevelMemTracker.h b/Engine/Source/Runtime/Core/Public/HAL/LowLevelMemTracker.h
index 6836d2268f94..4f3d472b07c2 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/LowLevelMemTracker.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/LowLevelMemTracker.h
@@ -19,9 +19,13 @@
 
 	#define LLM_SUPPORTED_PLATFORM (PLATFORM_XBOXONE || PLATFORM_PS4 || PLATFORM_WINDOWS || PLATFORM_IOS || PLATFORM_MAC || PLATFORM_ANDROID || PLATFORM_SWITCH || PLATFORM_UNIX)
 
+#ifndef ALLOW_LOW_LEVEL_MEM_TRACKER_IN_TEST
+	#define ALLOW_LOW_LEVEL_MEM_TRACKER_IN_TEST 0
+#endif
+
 	// *** enable/disable LLM here ***
 #ifndef ENABLE_LOW_LEVEL_MEM_TRACKER
-	#define ENABLE_LOW_LEVEL_MEM_TRACKER (!UE_BUILD_SHIPPING && LLM_SUPPORTED_PLATFORM && WITH_ENGINE && 1)
+	#define ENABLE_LOW_LEVEL_MEM_TRACKER (!UE_BUILD_SHIPPING && (!UE_BUILD_TEST || ALLOW_LOW_LEVEL_MEM_TRACKER_IN_TEST) && LLM_SUPPORTED_PLATFORM && WITH_ENGINE && 1)
 #endif
 
 	// using asset tagging requires a significantly higher number of per-thread tags, so make it optional
@@ -200,7 +204,7 @@ extern const TCHAR* LLMGetTagName(ELLMTag Tag);
 extern FName LLMGetTagStatGroup(ELLMTag Tag);
 extern FName LLMGetTagStat(ELLMTag Tag);
 
-/**
+/*
  * LLM utility macros
  */
 #define LLM(x) x
diff --git a/Engine/Source/Runtime/Core/Public/HAL/MallocBinned.h b/Engine/Source/Runtime/Core/Public/HAL/MallocBinned.h
index c08517a52f6d..ad99713f9633 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/MallocBinned.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/MallocBinned.h
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef USE_INTERNAL_LOCKS
-//#	define USE_COARSE_GRAIN_LOCKS
+//#   define USE_COARSE_GRAIN_LOCKS
 #endif
 
 #if defined USE_LOCKFREE_DELETE
diff --git a/Engine/Source/Runtime/Core/Public/HAL/Platform.h b/Engine/Source/Runtime/Core/Public/HAL/Platform.h
index 2fe0dad6f754..ed8a50d24bbf 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/Platform.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/Platform.h
@@ -261,6 +261,9 @@
 #ifndef PLATFORM_TCHAR_IS_4_BYTES
 	#define PLATFORM_TCHAR_IS_4_BYTES			0
 #endif
+#ifndef PLATFORM_TCHAR_IS_CHAR16
+	#define PLATFORM_TCHAR_IS_CHAR16			0
+#endif
 #ifndef PLATFORM_HAS_BSD_TIME
 	#define PLATFORM_HAS_BSD_TIME				1
 #endif
@@ -873,6 +876,10 @@ namespace TypeTests
 
 // If we don't have a platform-specific define for the TEXT macro, define it now.
 #if !defined(TEXT) && !UE_BUILD_DOCS
+	#if PLATFORM_TCHAR_IS_CHAR16
+		#define TEXT_PASTE(x) u ## x
+	#else
 		#define TEXT_PASTE(x) L ## x
+	#endif
 		#define TEXT(x) TEXT_PASTE(x)
 #endif
diff --git a/Engine/Source/Runtime/Core/Public/HAL/PlatformMisc.h b/Engine/Source/Runtime/Core/Public/HAL/PlatformMisc.h
index 4a4adb934c7e..c6833ddc61d0 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/PlatformMisc.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/PlatformMisc.h
@@ -77,6 +77,20 @@ public:
 
 #else
 
+class CORE_API FScopedNamedEvent
+{
+public:
+	DEPRECATED(4.19, "FScopedNamedEvent is compiled out in shipping builds, use SCOPED_NAMED_EVENT or variant instead to compile correctly for all targets.")
+	FScopedNamedEvent(const struct FColor& Color, const TCHAR* Text)
+	{
+	}
+
+	DEPRECATED(4.19, "FScopedNamedEvent is compiled out in shipping builds, use SCOPED_NAMED_EVENT or variant instead to compile correctly for all targets.")
+	FScopedNamedEvent(const struct FColor& Color, const ANSICHAR* Text)
+	{
+	}
+};
+
 #define SCOPED_NAMED_EVENT(...)
 #define SCOPED_NAMED_EVENT_FSTRING(...)
 #define SCOPED_NAMED_EVENT_TEXT(...)
diff --git a/Engine/Source/Runtime/Core/Public/HAL/ThreadHeartBeat.h b/Engine/Source/Runtime/Core/Public/HAL/ThreadHeartBeat.h
index 59152196e484..c24d50e801e3 100644
--- a/Engine/Source/Runtime/Core/Public/HAL/ThreadHeartBeat.h
+++ b/Engine/Source/Runtime/Core/Public/HAL/ThreadHeartBeat.h
@@ -57,6 +57,9 @@ class CORE_API FThreadHeartBeat : public FRunnable
 
 	void InitSettings();
 
+	void OnApplicationWillEnterBackground();
+	void OnApplicationEnteredForeground();
+
 public:
 
 	enum EConstants
@@ -146,6 +149,8 @@ class CORE_API FGameThreadHitchHeartBeat : public FRunnable
 	double FrameStartTime;
 	double LastReportTime;
 
+	int32 SuspendedCount;
+
 #if LOOKUP_SYMBOLS_IN_HITCH_STACK_WALK
 	static const SIZE_T StackTraceSize = 65535;
 	ANSICHAR StackTrace[StackTraceSize];
@@ -156,6 +161,9 @@ class CORE_API FGameThreadHitchHeartBeat : public FRunnable
 
 	void InitSettings();
 
+	void OnApplicationWillEnterBackground();
+	void OnApplicationEnteredForeground();
+
 	FGameThreadHitchHeartBeat();
 	virtual ~FGameThreadHitchHeartBeat();
 
@@ -177,9 +185,32 @@ public:
 
 	double GetFrameStartTime();
 
+	/**
+	* Suspend heartbeat hitch detection. Must call ResumeHeartBeat later to resume.
+	*/
+	void SuspendHeartBeat();
+
+	/**
+	* Resume heartbeat hitch detection. Call only after first calling SuspendHeartBeat.
+	*/
+	void ResumeHeartBeat();
+
 	//~ Begin FRunnable Interface.
 	virtual bool Init();
 	virtual uint32 Run();
 	virtual void Stop();
 	//~ End FRunnable Interface
+};
+
+/** Suspends hitch detection in the current scope */
+struct FDisableHitchDetectorScope
+{
+	FORCEINLINE FDisableHitchDetectorScope()
+	{
+		FGameThreadHitchHeartBeat::Get().SuspendHeartBeat();
+	}
+	FORCEINLINE ~FDisableHitchDetectorScope()
+	{
+		FGameThreadHitchHeartBeat::Get().ResumeHeartBeat();
+	}
 };
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Public/HTML5/HTML5PlatformCompilerPreSetup.h b/Engine/Source/Runtime/Core/Public/HTML5/HTML5PlatformCompilerPreSetup.h
index 99a59166f8df..db8cc6820e68 100644
--- a/Engine/Source/Runtime/Core/Public/HTML5/HTML5PlatformCompilerPreSetup.h
+++ b/Engine/Source/Runtime/Core/Public/HTML5/HTML5PlatformCompilerPreSetup.h
@@ -9,11 +9,13 @@
 	#define THIRD_PARTY_INCLUDES_START \
 		PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS \
 		PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
-		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS
+		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
 #endif
 
 #ifndef THIRD_PARTY_INCLUDES_END
 	#define THIRD_PARTY_INCLUDES_END \
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 		PRAGMA_ENABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
 		PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 		PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
diff --git a/Engine/Source/Runtime/Core/Public/IOS/IOSPlatform.h b/Engine/Source/Runtime/Core/Public/IOS/IOSPlatform.h
index 406c8ecbd3e1..7ce2cdb39668 100644
--- a/Engine/Source/Runtime/Core/Public/IOS/IOSPlatform.h
+++ b/Engine/Source/Runtime/Core/Public/IOS/IOSPlatform.h
@@ -13,7 +13,8 @@ struct FIOSPlatformTypes : public FGenericPlatformTypes
 {
 	typedef size_t				SIZE_T;
 	typedef decltype(NULL)		TYPE_OF_NULL;
-	typedef char16_t			CHAR16;
+	typedef char16_t			WIDECHAR;
+	typedef WIDECHAR			TCHAR;
 };
 
 typedef FIOSPlatformTypes FPlatformTypes;
@@ -34,7 +35,7 @@ typedef FIOSPlatformTypes FPlatformTypes;
 #define PLATFORM_LITTLE_ENDIAN							1
 #define PLATFORM_SUPPORTS_PRAGMA_PACK					1
 #define PLATFORM_COMPILER_DISTINGUISHES_INT_AND_LONG	1
-#define PLATFORM_TCHAR_IS_4_BYTES						1
+#define PLATFORM_TCHAR_IS_CHAR16						1
 #define PLATFORM_USE_SYSTEM_VSWPRINTF					0
 #define PLATFORM_HAS_BSD_TIME							1
 #define PLATFORM_HAS_BSD_IPV6_SOCKETS					1
@@ -46,6 +47,7 @@ typedef FIOSPlatformTypes FPlatformTypes;
 #define PLATFORM_ALLOW_NULL_RHI							1
 #define PLATFORM_ENABLE_VECTORINTRINSICS_NEON			PLATFORM_64BITS // disable vector intrinsics to make it compatible with 32-bit in Xcode 8.3
 #define PLATFORM_SUPPORTS_STACK_SYMBOLS					1
+#define PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK			1 // movies will start before engine is initalized
 
 // on iOS we now perform offline symbolication as it's significantly faster. Requires bGenerateCrashReportSymbols=true in the ini file.
 #define	PLATFORM_RUNTIME_MALLOCPROFILER_SYMBOLICATION	0	
diff --git a/Engine/Source/Runtime/Core/Public/IOS/IOSPlatformMisc.h b/Engine/Source/Runtime/Core/Public/IOS/IOSPlatformMisc.h
index 2c5cda6a087a..0c7adfab8fbc 100644
--- a/Engine/Source/Runtime/Core/Public/IOS/IOSPlatformMisc.h
+++ b/Engine/Source/Runtime/Core/Public/IOS/IOSPlatformMisc.h
@@ -9,6 +9,9 @@
 #include "IOS/IOSSystemIncludes.h"
 #include "Apple/ApplePlatformMisc.h"
 
+template <typename FuncType>
+class TFunction;
+
 /**
 * iOS implementation of the misc OS functions
 **/
@@ -30,21 +33,36 @@ struct CORE_API FIOSPlatformMisc : public FApplePlatformMisc
 	static bool GetStoredValue(const FString& InStoreId, const FString& InSectionName, const FString& InKeyName, FString& OutValue);
 	static bool DeleteStoredValue(const FString& InStoreId, const FString& InSectionName, const FString& InKeyName);
 	static void GetValidTargetPlatforms(class TArray<class FString>& TargetPlatformNames);
+	static ENetworkConnectionType GetNetworkConnectionType();
 	static bool HasActiveWiFiConnection();
-    static const TCHAR* GamePersistentDownloadDir();
+	static const TCHAR* GamePersistentDownloadDir();
 
 	static int GetAudioVolume();
 	static bool AreHeadphonesPluggedIn();
 	static int GetBatteryLevel();
 	static bool IsRunningOnBattery();
+	static float GetDeviceTemperatureLevel();
 	static EDeviceScreenOrientation GetDeviceOrientation();
+	static void SetBrightness(float Brightness);
+	static float GetBrightness();
+	static void ResetBrightness(); //reset brightness to original value the application started with
+	static bool SupportsBrightness() { return true; }
 
 	static void RegisterForRemoteNotifications();
 	static bool IsRegisteredForRemoteNotifications();
 	static void UnregisterForRemoteNotifications();
 
 	static class IPlatformChunkInstall* GetPlatformChunkInstall();
-	
+
+	static void PrepareMobileHaptics(EMobileHapticsType Type);
+	static void TriggerMobileHaptics();
+	static void ReleaseMobileHaptics();
+
+	static void ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY);
+    
+	static void EnableVoiceChat(bool bEnable);
+	static bool IsVoiceChatEnabled();
+
 	//////// Platform specific
 	static int GetDefaultStackSize();
 	static void HandleLowMemoryWarning();
@@ -59,6 +77,8 @@ struct CORE_API FIOSPlatformMisc : public FApplePlatformMisc
 	static FString GetOSVersion();
 	static FString GetUniqueAdvertisingId();
 	static bool GetDiskTotalAndFreeSpace(const FString& InPath, uint64& TotalNumberOfBytes, uint64& NumberOfFreeBytes);
+	
+	static void RequestStoreReview();
 
 	// Possible iOS devices
 	enum EIOSDevice
@@ -105,39 +125,39 @@ struct CORE_API FIOSPlatformMisc : public FApplePlatformMisc
 	{
 		static const TCHAR* IOSDeviceNames[] = 
 		{
-			L"IPhone4",
-			L"IPhone4S",
-			L"IPhone5",
-			L"IPhone5S",
-			L"IPodTouch5",
-			L"IPodTouch6",
-			L"IPad2",
-			L"IPad3",
-			L"IPad4",
-			L"IPadMini",
-			L"IPadMini2",
-			L"IPadMini4",
-			L"IPadAir",
-			L"IPadAir2",
-			L"IPhone6",
-			L"IPhone6Plus",
-			L"IPhone6S",
-			L"IPhone6SPlus",
-            L"IPhone7",
-            L"IPhone7Plus",
-			L"IPhone8",
-			L"IPhone8Plus",
-			L"IPhoneX",
-			L"IPadPro",
-			L"AppleTV",
-			L"AppleTV4K",
-			L"IPhoneSE",
-			L"IPadPro129",
-			L"IPadPro97",
-			L"IPadPro105",
-			L"IPadPro2_129",
-			L"IPad5",
-			L"Unknown",
+			TEXT("IPhone4"),
+			TEXT("IPhone4S"),
+			TEXT("IPhone5"),
+			TEXT("IPhone5S"),
+			TEXT("IPodTouch5"),
+			TEXT("IPodTouch6"),
+			TEXT("IPad2"),
+			TEXT("IPad3"),
+			TEXT("IPad4"),
+			TEXT("IPadMini"),
+			TEXT("IPadMini2"),
+			TEXT("IPadMini4"),
+			TEXT("IPadAir"),
+			TEXT("IPadAir2"),
+			TEXT("IPhone6"),
+			TEXT("IPhone6Plus"),
+			TEXT("IPhone6S"),
+			TEXT("IPhone6SPlus"),
+			TEXT("IPhone7"),
+			TEXT("IPhone7Plus"),
+			TEXT("IPhone8"),
+			TEXT("IPhone8Plus"),
+			TEXT("IPhoneX"),
+			TEXT("IPadPro"),
+			TEXT("AppleTV"),
+			TEXT("AppleTV4K"),
+			TEXT("IPhoneSE"),
+			TEXT("IPadPro129"),
+			TEXT("IPadPro97"),
+			TEXT("IPadPro105"),
+			TEXT("IPadPro2_129"),
+			TEXT("IPad5"),
+			TEXT("Unknown"),
 		};
 		static_assert((sizeof(IOSDeviceNames) / sizeof(IOSDeviceNames[0])) == ((int32)IOS_Unknown + 1), "Mismatched IOSDeviceNames and EIOSDevice.");
 		
@@ -150,8 +170,8 @@ struct CORE_API FIOSPlatformMisc : public FApplePlatformMisc
 	static void GetOSVersions(FString& out_OSVersionLabel, FString& out_OSSubVersionLabel);
 	static int32 IOSVersionCompare(uint8 Major, uint8 Minor, uint8 Revision);
 	
-    static void SetGracefulTerminationHandler();
-    static void SetCrashHandler(void(*CrashHandler)(const FGenericCrashContext& Context));
+	static void SetGracefulTerminationHandler();
+	static void SetCrashHandler(void(*CrashHandler)(const FGenericCrashContext& Context));
 
 #if STATS || ENABLE_STATNAMEDEVENTS
 	static void BeginNamedEventFrame();
@@ -161,6 +181,13 @@ struct CORE_API FIOSPlatformMisc : public FApplePlatformMisc
 	static void CustomNamedStat(const TCHAR* Text, float Value, const TCHAR* Graph, const TCHAR* Unit);
 	static void CustomNamedStat(const ANSICHAR* Text, float Value, const ANSICHAR* Graph, const ANSICHAR* Unit);
 #endif
+	
+	static bool SupportsDeviceCheckToken()
+	{
+		return true;
+	}
+
+	static void RequestDeviceCheckToken(TFunction<void(const TArray<uint8>&)> QueryCompleteFunc);
 };
 
 typedef FIOSPlatformMisc FPlatformMisc;
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/ILocalizedTextSource.h b/Engine/Source/Runtime/Core/Public/Internationalization/ILocalizedTextSource.h
new file mode 100644
index 000000000000..8d33d4d7fac4
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/ILocalizedTextSource.h
@@ -0,0 +1,80 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Containers/ArrayView.h"
+#include "Internationalization/LocalizedTextSourceTypes.h"
+
+class FTextLocalizationResource;
+class FTextLocalizationResources;
+
+/**
+ * Interface for a localized text source.
+ * These can be registered with the text localization manager, and provide an extensible way to inject localized text to UE4.
+ */
+class ILocalizedTextSource
+{
+public:
+	virtual ~ILocalizedTextSource() = default;
+
+	/**
+	 * Get the priority of this source when building the complete list of translations to apply (higher numbers have a higher priority).
+	 */
+	virtual int32 GetPriority() const
+	{
+		return ELocalizedTextSourcePriority::Normal;
+	}
+
+	/**
+	 * Given a localization category, get the native culture for the category (if known).
+	 * @return True if the native culture was populated, or false if the native culture is unknown.
+	 */
+	virtual bool GetNativeCultureName(const ELocalizedTextSourceCategory InCategory, FString& OutNativeCultureName) = 0;
+
+	/**
+	 * Populate a list of culture names that this localized text source has resource data for (ELocalizationLoadFlags controls which resources should be checked).
+	 */
+	virtual void GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags, TSet<FString>& OutLocalizedCultureNames) = 0;
+
+	/**
+	 * Load the localized resources from this localized text source for the given cultures into the given maps (ELocalizationLoadFlags controls which resources should be loaded).
+	 */
+	virtual void LoadLocalizedResources(const ELocalizationLoadFlags InLoadFlags, TArrayView<const FString> InPrioritizedCultures, FTextLocalizationResource& InOutNativeResource, FTextLocalizationResources& InOutLocalizedResources) = 0;
+
+	/** Should we load native data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadNative(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Native);
+	}
+
+	/** Should we load editor data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadEditor(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Editor);
+	}
+
+	/** Should we load game data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadGame(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Game | ELocalizationLoadFlags::ForceLocalizedGame);
+	}
+
+	/** Should we load engine data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadEngine(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Engine);
+	}
+
+	/** Should we load additional (eg, plugin) data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadAdditional(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::Additional);
+	}
+
+	/** Should we load localized game data based on the given load flags and environment? */
+	static FORCEINLINE bool ShouldLoadLocalizedGameData(const ELocalizationLoadFlags InLoadFlags)
+	{
+		return !GIsEditor || EnumHasAnyFlags(InLoadFlags, ELocalizationLoadFlags::ForceLocalizedGame);
+	}
+};
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/Internationalization.h b/Engine/Source/Runtime/Core/Public/Internationalization/Internationalization.h
index ac0095f9658b..78a9a72c7890 100644
--- a/Engine/Source/Runtime/Core/Public/Internationalization/Internationalization.h
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/Internationalization.h
@@ -158,9 +158,15 @@ public:
 
 	CORE_API bool IsInitialized() const {return bIsInitialized;}
 
-	// Load and cache the data needed for every culture we know about (this is usually done per-culture as required)
+	/** Load and cache the data needed for every culture we know about (this is usually done per-culture as required) */
 	CORE_API void LoadAllCultureData();
 
+	/** Has the given culture been remapped in this build? */
+	CORE_API bool IsCultureRemapped(const FString& Name, FString* OutMappedCulture);
+
+	/** Is the given culture enabled or disabled in this build? */
+	CORE_API bool IsCultureAllowed(const FString& Name);
+
 #if ENABLE_LOC_TESTING
 	static CORE_API FString& Leetify(FString& SourceString);
 #endif
@@ -169,8 +175,16 @@ public:
 
 	CORE_API TArray<FString> GetPrioritizedCultureNames(const FString& Name);
 
-	// Given some paths to look at, populate a list of cultures that we have available localization information for. If bIncludeDerivedCultures, include cultures that are derived from those we have localization data for.
-	CORE_API void GetCulturesWithAvailableLocalization(const TArray<FString>& InLocalizationPaths, TArray< FCultureRef >& OutAvailableCultures, const bool bIncludeDerivedCultures);
+	/**
+	 * Given some paths to look at, populate a list of cultures that we have available localization information for. If bIncludeDerivedCultures, include cultures that are derived from those we have localization data for.
+	 * @note This function was deprecated as it only provides cultures that use localization resources.
+	 *		 FTextLocalizationManager::GetLocalizedCultureNames provides a more complete list when using alternate sources, and FInternationalization::GetAvailableCultures can be used to build a culture array from that list.
+	 */
+	DEPRECATED(4.20, "FInternationalization::GetCulturesWithAvailableLocalization is deprecated in favor of calling FTextLocalizationManager::GetLocalizedCultureNames, potentially followed by FInternationalization::GetAvailableCultures")
+	CORE_API void GetCulturesWithAvailableLocalization(const TArray<FString>& InLocalizationPaths, TArray<FCultureRef>& OutAvailableCultures, const bool bIncludeDerivedCultures);
+
+	/** Given some culture names, populate a list of cultures that are available to be used. If bIncludeDerivedCultures, include cultures that are derived from those we passed. */
+	CORE_API TArray<FCultureRef> GetAvailableCultures(const TArray<FString>& InCultureNames, const bool bIncludeDerivedCultures);
 
 	/** Broadcasts whenever the current culture changes */
 	DECLARE_EVENT(FInternationalization, FCultureChangedEvent)
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/LocalizedTextSourceTypes.h b/Engine/Source/Runtime/Core/Public/Internationalization/LocalizedTextSourceTypes.h
new file mode 100644
index 000000000000..f027daca57ce
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/LocalizedTextSourceTypes.h
@@ -0,0 +1,60 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreTypes.h"
+#include "Misc/EnumClassFlags.h"
+
+/**
+ * Categories of localized text.
+ * @note This enum is mirrored in NoExportTypes.h for UHT.
+ */
+enum class ELocalizedTextSourceCategory : uint8
+{
+	Game,
+	Engine,
+	Editor,
+};
+
+/**
+ * Load flags used in localization initialization.
+ */
+enum class ELocalizationLoadFlags : uint8
+{
+	/** Load no data */
+	None = 0,
+
+	/** Load native data */
+	Native = 1<<0,
+
+	/** Load editor localization data */
+	Editor = 1<<1,
+
+	/** Load game localization data */
+	Game = 1<<2,
+
+	/** Load engine localization data */
+	Engine = 1<<3,
+
+	/** Load additional (eg, plugin) localization data */
+	Additional = 1<<4,
+
+	/** Force localized game data to be loaded, even when running in the editor */
+	ForceLocalizedGame = 1<<5,
+};
+ENUM_CLASS_FLAGS(ELocalizationLoadFlags);
+
+/**
+ * Pre-defined priorities for ILocalizedTextSource.
+ */
+struct ELocalizedTextSourcePriority
+{
+	enum Enum
+	{
+		Lowest = -1000,
+		Low = -100,
+		Normal = 0,
+		High = 100,
+		Highest = 1000,
+	};
+};
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/PolyglotTextData.h b/Engine/Source/Runtime/Core/Public/Internationalization/PolyglotTextData.h
new file mode 100644
index 000000000000..504ef90499d2
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/PolyglotTextData.h
@@ -0,0 +1,174 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Internationalization/LocalizedTextSourceTypes.h"
+
+/**
+ * Polyglot data that may be registered to the text localization manager at runtime.
+ * @note This struct is mirrored in NoExportTypes.h for UHT.
+ */
+struct CORE_API FPolyglotTextData
+{
+	/** Needed to avoid member access issues in UHT generated code */
+	friend struct Z_Construct_UScriptStruct_FPolyglotTextData_Statics;
+
+public:
+	/**
+	 * Default constructor
+	 */
+	FPolyglotTextData() = default;
+
+	/**
+	 * Construct this polyglot data with an identity, optionally immediately providing the source text and native culture.
+	 */
+	FPolyglotTextData(const ELocalizedTextSourceCategory& InCategory, const FString& InNamespace, const FString& InKey, const FString& InNativeString, const FString& InNativeCulture = FString());
+
+	/**
+	 * Is this polyglot data valid and can be registered with the text localization manager?
+	 */
+	bool IsValid(FText* OutFailureReason = nullptr) const;
+
+	/**
+	 * Set the category of this polyglot data.
+	 * @note This affects when and how the data is loaded into the text localization manager.
+	 */
+	void SetCategory(const ELocalizedTextSourceCategory InCategory);
+
+	/**
+	 * Get the category of this polyglot data.
+	 */
+	ELocalizedTextSourceCategory GetCategory() const;
+
+	/**
+	 * Set the native culture of this polyglot data.
+	 * @note This may be empty, and if empty, will be inferred from the native culture of the text category.
+	 */
+	void SetNativeCulture(const FString& InNativeCulture);
+
+	/**
+	 * Get the native culture of this polyglot data.
+	 */
+	const FString& GetNativeCulture() const;
+
+	/**
+	 * Resolve the native culture of this polyglot data, either using the native culture if specified, or inferring it from the category.
+	 */
+	FString ResolveNativeCulture() const;
+
+	/**
+	 * Get the localized cultures of this polyglot data.
+	 */
+	TArray<FString> GetLocalizedCultures() const;
+
+	/**
+	 * Set the identity of the text created from this polyglot data.
+	 * @note The key must not be empty.
+	 */
+	void SetIdentity(const FString& InNamespace, const FString& InKey);
+
+	/**
+	 * Get the identity of the text created from this polyglot data.
+	 */
+	void GetIdentity(FString& OutNamespace, FString& OutKey) const;
+
+	/**
+	 * Get the namespace of the text created from this polyglot data.
+	 */
+	const FString& GetNamespace() const;
+
+	/**
+	 * Get the key of the text created from this polyglot data.
+	 */
+	const FString& GetKey() const;
+
+	/**
+	 * Set the native string of this polyglot data.
+	 * @note The native string must not be empty.
+	 */
+	void SetNativeString(const FString& InNativeString);
+
+	/**
+	 * Get the native string of this polyglot data.
+	 */
+	const FString& GetNativeString() const;
+	
+	/**
+	 * Add a localized string to this polyglot data.
+	 * @note The native culture may also have a translation added via this function.
+	 */
+	void AddLocalizedString(const FString& InCulture, const FString& InLocalizedString);
+
+	/**
+	 * Remove a localized string from this polyglot data.
+	 */
+	void RemoveLocalizedString(const FString& InCulture);
+
+	/**
+	 * Get a localized string from this polyglot data.
+	 */
+	bool GetLocalizedString(const FString& InCulture, FString& OutLocalizedString) const;
+
+	/**
+	 * Clear the localized strings from this polyglot data.
+	 */
+	void ClearLocalizedStrings();
+
+	/**
+	 * Get the text instance created from this polyglot data.
+	 */
+	FText GetText() const;
+
+private:
+	/**
+	 * Cache the text instance created from this polyglot data.
+	 */
+	void CacheText(FText* OutFailureReason = nullptr);
+
+	/**
+	 * Clear the cache of the text instance created from this polyglot data.
+	 */
+	void ClearCache();
+
+	/**
+	 * The category of this polyglot data.
+	 * @note This affects when and how the data is loaded into the text localization manager.
+	 */
+	ELocalizedTextSourceCategory Category;
+
+	/**
+	 * The native culture of this polyglot data.
+	 * @note This may be empty, and if empty, will be inferred from the native culture of the text category.
+	 */
+	FString NativeCulture;
+
+	/**
+	 * The namespace of the text created from this polyglot data.
+	 * @note This may be empty.
+	 */
+	FString Namespace;
+
+	/**
+	 * The key of the text created from this polyglot data.
+	 * @note This must not be empty.
+	 */
+	FString Key;
+
+	/**
+	 * The native string for this polyglot data.
+	 * @note This must not be empty.
+	 */
+	FString NativeString;
+
+	/**
+	 * Mapping between a culture code and its localized string.
+	 * @note The native culture may also have a translation in this map.
+	 */
+	TMap<FString, FString> LocalizedStrings;
+
+	/**
+	 * Transient cached text instance from registering this polyglot data with the text localization manager.
+	 */
+	FText CachedText;
+};
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManager.h b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManager.h
index fe967a02687e..584e78eb9abd 100644
--- a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManager.h
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManager.h
@@ -5,6 +5,7 @@
 #include "CoreTypes.h"
 #include "Containers/ContainerAllocationPolicies.h"
 #include "Containers/Array.h"
+#include "Containers/ArrayView.h"
 #include "Misc/Crc.h"
 #include "Containers/UnrealString.h"
 #include "Containers/Set.h"
@@ -13,7 +14,11 @@
 #include "Delegates/Delegate.h"
 #include "Internationalization/LocTesting.h"
 #include "Internationalization/LocKeyFuncs.h"
+#include "Internationalization/LocalizedTextSourceTypes.h"
+#include "Internationalization/TextLocalizationResourceId.h"
 
+struct FPolyglotTextData;
+class ILocalizedTextSource;
 class FTextLocalizationResource;
 
 typedef TSharedRef<FString, ESPMode::ThreadSafe> FTextDisplayStringRef;
@@ -23,7 +28,8 @@ typedef TSharedPtr<FString, ESPMode::ThreadSafe> FTextDisplayStringPtr;
 class CORE_API FTextLocalizationManager
 {
 	friend CORE_API void BeginInitTextLocalization();
-	friend CORE_API void EndInitTextLocalization();
+	friend CORE_API void InitEngineTextLocalization();
+	friend CORE_API void InitGameTextLocalization();
 
 private:
 	/** Utility class for managing the currently loaded or registered text localizations. */
@@ -34,14 +40,14 @@ private:
 		struct FDisplayStringEntry
 		{
 			bool bIsLocalized;
-			FString LocResID;
+			FTextLocalizationResourceId LocResID;
 			uint32 SourceStringHash;
 			FTextDisplayStringRef DisplayString;
 #if ENABLE_LOC_TESTING
 			FString NativeStringBackup;
 #endif
 
-			FDisplayStringEntry(const bool InIsLocalized, const FString& InLocResID, const uint32 InSourceStringHash, const FTextDisplayStringRef& InDisplayString)
+			FDisplayStringEntry(const bool InIsLocalized, const FTextLocalizationResourceId& InLocResID, const uint32 InSourceStringHash, const FTextDisplayStringRef& InDisplayString)
 				: bIsLocalized(InIsLocalized)
 				, LocResID(InLocResID)
 				, SourceStringHash(InSourceStringHash)
@@ -91,16 +97,34 @@ private:
 #endif
 
 private:
-	FTextLocalizationManager() 
-		: bIsInitialized(false)
-		, SynchronizationObject()
-		, TextRevisionCounter(0)
-	{}
+	FTextLocalizationManager();
 
 public:
+
 	/** Singleton accessor */
 	static FTextLocalizationManager& Get();
 
+	/**
+	 * Given a localization category, get the native culture for the category (if known).
+	 * @return The native culture for the given localization category, or an empty string if the native culture is unknown.
+	 */
+	FString GetNativeCultureName(const ELocalizedTextSourceCategory InCategory) const;
+
+	/**
+	 * Get a list of culture names that we have localized resource data for (ELocalizationLoadFlags controls which resources should be checked).
+	 */
+	TArray<FString> GetLocalizedCultureNames(const ELocalizationLoadFlags InLoadFlags) const;
+
+	/**
+	 * Register a localized text source with the text localization manager.
+	 */
+	void RegisterTextSource(const TSharedRef<ILocalizedTextSource>& InLocalizedTextSource, const bool InRefreshResources = true);
+
+	/**
+	 * Register a polyglot text data with the text localization manager.
+	 */
+	void RegisterPolyglotTextData(const FPolyglotTextData& InPolyglotTextData, const bool InAddDisplayString = true);
+
 	/**	Finds and returns the display string with the given namespace and key, if it exists.
 	 *	Additionally, if a source string is specified and the found localized display string was not localized from that source string, null will be returned. */
 	FTextDisplayStringPtr FindDisplayString(const FString& Namespace, const FString& Key, const FString* const SourceString = nullptr);
@@ -144,7 +168,7 @@ public:
 	void UpdateFromLocalizationResource(const FString& LocalizationResourceFilePath);
 
 	/** Updates display string entries and adds new display string entries based on localizations found in the specified localization resources. */
-	void UpdateFromLocalizationResources(const TArray<FTextLocalizationResource>& TextLocalizationResources);
+	void UpdateFromLocalizationResources(TArrayView<const TSharedPtr<FTextLocalizationResource>> TextLocalizationResources);
 
 	/** Reloads resources for the current culture. */
 	void RefreshResources();
@@ -216,26 +240,31 @@ public:
 	DECLARE_EVENT(FTextLocalizationManager, FTextRevisionChangedEvent)
 	FTextRevisionChangedEvent OnTextRevisionChangedEvent;
 
-	/** Delegate for gathering up additional localization paths that are unknown to the UE4 core (such as plugins) */
-	DECLARE_MULTICAST_DELEGATE_OneParam(FGatherAdditionalLocResPathsDelegate, TArray<FString>&);
-	FGatherAdditionalLocResPathsDelegate GatherAdditionalLocResPathsCallback;
-
 private:
 	/** Callback for changes in culture. Loads the new culture's localization resources. */
 	void OnCultureChanged();
 
 	/** Loads localization resources for the specified culture, optionally loading localization resources that are editor-specific or game-specific. */
-	void LoadLocalizationResourcesForCulture(const FString& CultureName, const bool ShouldLoadEditor, const bool ShouldLoadGame, const bool ShouldLoadNative);
+	void LoadLocalizationResourcesForCulture(const FString& CultureName, const ELocalizationLoadFlags LocLoadFlags);
+
+	/** Loads localization resources for the specified prioritized cultures, optionally loading localization resources that are editor-specific or game-specific. */
+	void LoadLocalizationResourcesForPrioritizedCultures(TArrayView<const FString> PrioritizedCultureNames, const ELocalizationLoadFlags LocLoadFlags);
 
 	/** Updates display string entries and adds new display string entries based on provided native text. */
-	void UpdateFromNative(const TArray<FTextLocalizationResource>& TextLocalizationResources);
+	void UpdateFromNative(const FTextLocalizationResource& TextLocalizationResource);
 
 	/** Updates display string entries and adds new display string entries based on provided localizations. */
-	void UpdateFromLocalizations(const TArray<FTextLocalizationResource>& TextLocalizationResources);
+	void UpdateFromLocalizations(TArrayView<const TSharedPtr<FTextLocalizationResource>> TextLocalizationResources);
 
 	/** Dirties the local revision counter for the given display string by incrementing it (or adding it) */
 	void DirtyLocalRevisionForDisplayString(const FTextDisplayStringRef& InDisplayString);
 
 	/** Dirties the text revision counter by incrementing it, causing a revision mismatch for any information cached before this happens.  */
 	void DirtyTextRevision();
+
+	/** Array of registered localized text sources, sorted by priority (@see RegisterTextSource) */
+	TArray<TSharedPtr<ILocalizedTextSource>> LocalizedTextSources;
+
+	/** The polyglot text source (this is also added to LocalizedTextSources, but we keep a pointer to it directly so we can add new polyglot data to it at runtime) */
+	TSharedPtr<class FPolyglotTextSource> PolyglotTextSource;
 };
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManagerGlobals.h b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManagerGlobals.h
index ada449ab5f01..8162b262e6b8 100644
--- a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManagerGlobals.h
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationManagerGlobals.h
@@ -5,4 +5,5 @@
 #include "CoreTypes.h"
 
 CORE_API void BeginInitTextLocalization();
-CORE_API void EndInitTextLocalization();
+CORE_API void InitEngineTextLocalization();
+CORE_API void InitGameTextLocalization();
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResource.h b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResource.h
index e0bd08c60354..41ae0f5df4e7 100644
--- a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResource.h
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResource.h
@@ -3,7 +3,10 @@
 #pragma once 
 
 #include "CoreMinimal.h"
+#include "Containers/SortedMap.h"
 #include "Internationalization/LocKeyFuncs.h"
+#include "Internationalization/LocalizedTextSourceTypes.h"
+#include "Internationalization/TextLocalizationResourceId.h"
 
 /** Utility class for working with Localization MetaData Resource (LocMeta) files. */
 class CORE_API FTextLocalizationMetaDataResource
@@ -32,7 +35,7 @@ public:
 	/** Data struct for tracking a localization entry from a localization resource. */
 	struct FEntry
 	{
-		FString LocResID;
+		FTextLocalizationResourceId LocResID;
 		uint32 SourceStringHash;
 		FString LocalizedString;
 	};
@@ -43,6 +46,25 @@ public:
 
 	FNamespacesTable Namespaces;
 
+	/** Utility to produce a hash for a string (as used by SourceStringHash) */
+	static FORCEINLINE uint32 HashString(const TCHAR* InStr, const uint32 InBaseHash = 0)
+	{
+		return FCrc::StrCrc32<TCHAR>(InStr, InBaseHash);
+	}
+
+	/** Utility to produce a hash for a string (as used by SourceStringHash) */
+	static FORCEINLINE uint32 HashString(const FString& InStr, const uint32 InBaseHash = 0)
+	{
+		return FCrc::StrCrc32<TCHAR>(*InStr, InBaseHash);
+	}
+
+	/** Add a single entry to this resource. */
+	void AddEntry(const FString& InNamespace, const FString& InKey, const FString& InSourceString, const FString& InLocalizedString, const FTextLocalizationResourceId& InLocResID = FTextLocalizationResourceId());
+	void AddEntry(const FString& InNamespace, const FString& InKey, const uint32 InSourceStringHash, const FString& InLocalizedString, const FTextLocalizationResourceId& InLocResID = FTextLocalizationResourceId());
+
+	/** Is this resource empty? */
+	bool IsEmpty() const;
+
 	/** Load all LocRes files in the specified directory into this resource. */
 	void LoadFromDirectory(const FString& DirectoryPath);
 
@@ -50,14 +72,80 @@ public:
 	bool LoadFromFile(const FString& FilePath);
 
 	/** Load the given LocRes archive into this resource. */
-	bool LoadFromArchive(FArchive& Archive, const FString& LocResID);
+	bool LoadFromArchive(FArchive& Archive, const FTextLocalizationResourceId& LocResID);
 
 	/** Save this resource to the given LocRes file. */
 	bool SaveToFile(const FString& FilePath);
 
 	/** Save this resource to the given LocRes archive. */
-	bool SaveToArchive(FArchive& Archive, const FString& LocResID);
+	bool SaveToArchive(FArchive& Archive, const FTextLocalizationResourceId& LocResID);
 
 	/** Detect conflicts between loaded localization resources and log them as warnings. */
 	void DetectAndLogConflicts() const;
 };
+
+/** Utility class for working with set of Localization Resource (LocRes) files. */
+class CORE_API FTextLocalizationResources
+{
+public:
+	TSharedRef<FTextLocalizationResource> EnsureResource(const FString& InCulture)
+	{
+		TSharedPtr<FTextLocalizationResource> Resource = TextLocalizationResourceMap.FindRef(InCulture);
+		if (!Resource.IsValid())
+		{
+			Resource = MakeShared<FTextLocalizationResource>();
+			TextLocalizationResourceMap.Add(InCulture, Resource);
+		}
+		return Resource.ToSharedRef();
+	}
+
+	TSharedPtr<FTextLocalizationResource> FindResource(const FString& InCulture) const
+	{
+		return TextLocalizationResourceMap.FindRef(InCulture);
+	}
+
+private:
+	TSortedMap<FString, TSharedPtr<FTextLocalizationResource>> TextLocalizationResourceMap;
+};
+
+namespace TextLocalizationResourceUtil
+{
+
+/**
+ * Given some paths to look at, get the native culture for the targets within those paths (if known).
+ * @return The native culture for the targets within the given paths based on the data in the first LocMeta file, or an empty string if the native culture is unknown.
+ */
+CORE_API FString GetNativeCultureName(const TArray<FString>& InLocalizationPaths);
+
+/**
+ * Given a localization category, get the native culture for the targets for that category (if known).
+ * @return The native culture for the given localization category, or an empty string if the native culture is unknown.
+ */
+CORE_API FString GetNativeCultureName(const ELocalizedTextSourceCategory InCategory);
+
+/**
+ * Get the native culture for the current project (if known).
+ * @return The native culture for the current project based on the data in the game LocMeta files, or an empty string if the native culture is unknown.
+ */
+CORE_API FString GetNativeProjectCultureName(const bool bSkipCache = false);
+
+/**
+ * Get the native culture for the engine.
+ * @return The native culture for the engine based on the data in the engine LocMeta files.
+ */
+CORE_API FString GetNativeEngineCultureName(const bool bSkipCache = false);
+
+#if WITH_EDITOR
+/**
+ * Get the native culture for the editor.
+ * @return The native culture for the editor based on the data in the editor LocMeta files.
+ */
+CORE_API FString GetNativeEditorCultureName(const bool bSkipCache = false);
+#endif	// WITH_EDITOR
+
+/**
+ * Given some paths to look at, populate a list of culture names that we have available localization resource information for.
+ */
+CORE_API TArray<FString> GetLocalizedCultureNames(const TArray<FString>& InLocalizationPaths);
+
+}
diff --git a/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResourceId.h b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResourceId.h
new file mode 100644
index 000000000000..8fbb12e3d217
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/Internationalization/TextLocalizationResourceId.h
@@ -0,0 +1,59 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once 
+
+#include "CoreTypes.h"
+#include "Containers/UnrealString.h"
+#include "Templates/SharedPointer.h"
+
+/** Utility class for storing a shared localization resource ID */
+class FTextLocalizationResourceId
+{
+public:
+	FTextLocalizationResourceId() = default;
+
+	explicit FTextLocalizationResourceId(const FString& InId)
+		: SharedId(MakeShared<FString, ESPMode::ThreadSafe>(InId))
+	{
+	}
+
+	explicit FTextLocalizationResourceId(FString&& InId)
+		: SharedId(MakeShared<FString, ESPMode::ThreadSafe>(MoveTemp(InId)))
+	{
+	}
+
+	FORCEINLINE bool operator==(const FTextLocalizationResourceId& Other) const
+	{
+		return Compare(Other) == 0;
+	}
+
+	FORCEINLINE bool operator!=(const FTextLocalizationResourceId& Other) const
+	{
+		return Compare(Other) != 0;
+	}
+
+	FORCEINLINE bool IsEmpty() const
+	{
+		return GetString().IsEmpty();
+	}
+
+	FORCEINLINE bool Equals(const FTextLocalizationResourceId& Other) const
+	{
+		return *this == Other;
+	}
+
+	FORCEINLINE int32 Compare(const FTextLocalizationResourceId& Other) const
+	{
+		return FCString::Strcmp(*GetString(), *Other.GetString());
+	}
+
+	FORCEINLINE const FString& GetString() const
+	{
+		static const FString EmptyId = FString();
+		return SharedId.IsValid() ? *SharedId : EmptyId;
+	}
+
+private:
+	/** Shared localization resource ID */
+	TSharedPtr<const FString, ESPMode::ThreadSafe> SharedId;
+};
diff --git a/Engine/Source/Runtime/Core/Public/Lumin/LuminPlatformMisc.h b/Engine/Source/Runtime/Core/Public/Lumin/LuminPlatformMisc.h
index b0843608e4c7..9100a484eb03 100644
--- a/Engine/Source/Runtime/Core/Public/Lumin/LuminPlatformMisc.h
+++ b/Engine/Source/Runtime/Core/Public/Lumin/LuminPlatformMisc.h
@@ -77,12 +77,6 @@ struct CORE_API FLuminPlatformMisc : public FAndroidMisc
 	static const FString& GetApplicationApplicationPackageName();
 	static const FString& GetApplicationComponentName();
 
-	// Disable anonymous usage data network traffic on Lumin
-	static bool AllowSendAnonymousGameUsageDataToEpic()
-	{
-		return false;
-	}
-
 private:
 	static void InitApplicationPaths();
 
diff --git a/Engine/Source/Runtime/Core/Public/Math/Box2D.h b/Engine/Source/Runtime/Core/Public/Math/Box2D.h
index c491ee1543e5..496902cd186d 100644
--- a/Engine/Source/Runtime/Core/Public/Math/Box2D.h
+++ b/Engine/Source/Runtime/Core/Public/Math/Box2D.h
@@ -91,6 +91,17 @@ public:
 		return (Min == Other.Min) && (Max == Other.Max);
 	}
 
+	/**
+	* Compares two boxes for inequality.
+	*
+	* @param Other The other box to compare with.
+	* @return true if the boxes are not equal, false otherwise.
+	*/
+	bool operator!=(const FBox2D& Other) const
+	{
+		return !(*this == Other);
+	}
+
 	/**
 	 * Adds to this bounding box to include a given point.
 	 *
diff --git a/Engine/Source/Runtime/Core/Public/Math/RandomStream.h b/Engine/Source/Runtime/Core/Public/Math/RandomStream.h
index aed75177b8c0..5fcb83291f7d 100644
--- a/Engine/Source/Runtime/Core/Public/Math/RandomStream.h
+++ b/Engine/Source/Runtime/Core/Public/Math/RandomStream.h
@@ -16,11 +16,7 @@
  */
 struct FRandomStream
 {
-#ifdef COREUOBJECT_API
-	friend COREUOBJECT_API class UScriptStruct* Z_Construct_UScriptStruct_FRandomStream();
-#else
-	friend class UScriptStruct* Z_Construct_UScriptStruct_FRandomStream();
-#endif
+	friend struct Z_Construct_UScriptStruct_FRandomStream_Statics;
 	
 public:
 
diff --git a/Engine/Source/Runtime/Core/Public/Math/TransformNonVectorized.h b/Engine/Source/Runtime/Core/Public/Math/TransformNonVectorized.h
index ef52ef2b6991..e78763432156 100644
--- a/Engine/Source/Runtime/Core/Public/Math/TransformNonVectorized.h
+++ b/Engine/Source/Runtime/Core/Public/Math/TransformNonVectorized.h
@@ -27,11 +27,7 @@
 */
 struct FTransform
 {
-#ifdef COREUOBJECT_API
-	friend COREUOBJECT_API class UScriptStruct* Z_Construct_UScriptStruct_FTransform();
-#else
-	friend class UScriptStruct* Z_Construct_UScriptStruct_FTransform();
-#endif
+	friend struct Z_Construct_UScriptStruct_FTransform_Statics;
 
 protected:
 	/** Rotation of this transformation, as a quaternion. */
diff --git a/Engine/Source/Runtime/Core/Public/Math/TransformVectorized.h b/Engine/Source/Runtime/Core/Public/Math/TransformVectorized.h
index b9bea99341a4..86e0b76c0690 100644
--- a/Engine/Source/Runtime/Core/Public/Math/TransformVectorized.h
+++ b/Engine/Source/Runtime/Core/Public/Math/TransformVectorized.h
@@ -35,11 +35,7 @@
 
 MS_ALIGN(16) struct FTransform
 {
-#ifdef COREUOBJECT_API
-	friend COREUOBJECT_API class UScriptStruct* Z_Construct_UScriptStruct_FTransform();
-#else
-	friend class UScriptStruct* Z_Construct_UScriptStruct_FTransform();
-#endif
+	friend struct Z_Construct_UScriptStruct_FTransform_Statics;
 
 protected:
 	/** Rotation of this transformation, as a quaternion */
diff --git a/Engine/Source/Runtime/Core/Public/Math/UnitConversion.h b/Engine/Source/Runtime/Core/Public/Math/UnitConversion.h
index 7ab3441d58fe..fd6745e8feb9 100644
--- a/Engine/Source/Runtime/Core/Public/Math/UnitConversion.h
+++ b/Engine/Source/Runtime/Core/Public/Math/UnitConversion.h
@@ -196,20 +196,17 @@ bool operator==(const FNumericUnit<NumericType>& LHS, const FNumericUnit<OtherTy
 template<typename NumericType, typename OtherType>
 bool operator!=(const FNumericUnit<NumericType>& LHS, const FNumericUnit<OtherType>& RHS);
 
-namespace Lex
-{
-	template<typename T>
-	FString ToString(const FNumericUnit<T>& NumericUnit);
+template<typename T>
+FString LexToString(const FNumericUnit<T>& NumericUnit);
 
-	template<typename T>
-	FString ToSanitizedString(const FNumericUnit<T>& NumericUnit);
+template<typename T>
+FString LexToSanitizedString(const FNumericUnit<T>& NumericUnit);
 
-	template<typename T>
-	void FromString(FNumericUnit<T>& OutValue, const TCHAR* String);
+template<typename T>
+void LexFromString(FNumericUnit<T>& OutValue, const TCHAR* String);
 	
-	template<typename T>
-	bool TryParseString(FNumericUnit<T>& OutValue, const TCHAR* String);
-}
+template<typename T>
+bool LexTryParseString(FNumericUnit<T>& OutValue, const TCHAR* String);
 
 
 // Include template definitions
diff --git a/Engine/Source/Runtime/Core/Public/Math/UnitConversion.inl b/Engine/Source/Runtime/Core/Public/Math/UnitConversion.inl
index 2f55b89dfbec..fc9a53565e50 100644
--- a/Engine/Source/Runtime/Core/Public/Math/UnitConversion.inl
+++ b/Engine/Source/Runtime/Core/Public/Math/UnitConversion.inl
@@ -295,7 +295,7 @@ TOptional<FNumericUnit<NumericType>> FNumericUnit<NumericType>::TryParseString(c
 	}
 
 	NumericType NewValue;
-	Lex::FromString(NewValue, InSource);
+	LexFromString(NewValue, InSource);
 
 	// Now parse the units
 	while(FChar::IsWhitespace(*NumberEnd)) ++NumberEnd;
@@ -415,48 +415,45 @@ template <typename NumericType>
 struct TNumericLimits<FNumericUnit<NumericType>> : public TNumericLimits<NumericType>
 { };
 
-namespace Lex
+template<typename T>
+FString LexToString(const FNumericUnit<T>& NumericUnit)
 {
-	template<typename T>
-	FString ToString(const FNumericUnit<T>& NumericUnit)
+	FString String = LexToString(NumericUnit.Value);
+	String += TEXT(" ");
+	String += FUnitConversion::GetUnitDisplayString(NumericUnit.Units);
+
+	return String;
+}
+
+template<typename T>
+FString LexToSanitizedString(const FNumericUnit<T>& NumericUnit)
+{
+	FString String = LexToSanitizedString(NumericUnit.Value);
+	String += TEXT(" ");
+	String += FUnitConversion::GetUnitDisplayString(NumericUnit.Units);
+
+	return String;
+}
+
+template<typename T>
+void LexFromString(FNumericUnit<T>& OutValue, const TCHAR* String)
+{
+	auto Parsed = FNumericUnit<T>::TryParseString(String);
+	if (Parsed)
 	{
-		FString String = ToString(NumericUnit.Value);
-		String += TEXT(" ");
-		String += FUnitConversion::GetUnitDisplayString(NumericUnit.Units);
-
-		return String;
-	}
-
-	template<typename T>
-	FString ToSanitizedString(const FNumericUnit<T>& NumericUnit)
-	{
-		FString String = ToSanitizedString(NumericUnit.Value);
-		String += TEXT(" ");
-		String += FUnitConversion::GetUnitDisplayString(NumericUnit.Units);
-
-		return String;
-	}
-
-	template<typename T>
-	void FromString(FNumericUnit<T>& OutValue, const TCHAR* String)
-	{
-		auto Parsed = FNumericUnit<T>::TryParseString(String);
-		if (Parsed)
-		{
-			OutValue = Parsed.GetValue();
-		}
-	}
-	
-	template<typename T>
-	bool TryParseString(FNumericUnit<T>& OutValue, const TCHAR* String)
-	{
-		auto Parsed = FNumericUnit<T>::TryParseString(String);
-		if (Parsed)
-		{
-			OutValue = Parsed.GetValue();
-			return true;
-		}
-
-		return false;
+		OutValue = Parsed.GetValue();
 	}
 }
+	
+template<typename T>
+bool LexTryParseString(FNumericUnit<T>& OutValue, const TCHAR* String)
+{
+	auto Parsed = FNumericUnit<T>::TryParseString(String);
+	if (Parsed)
+	{
+		OutValue = Parsed.GetValue();
+		return true;
+	}
+
+	return false;
+}
diff --git a/Engine/Source/Runtime/Core/Public/Math/UnrealMathUtility.h b/Engine/Source/Runtime/Core/Public/Math/UnrealMathUtility.h
index ac1a4f0e27ca..d1f5fc3c9fe2 100644
--- a/Engine/Source/Runtime/Core/Public/Math/UnrealMathUtility.h
+++ b/Engine/Source/Runtime/Core/Public/Math/UnrealMathUtility.h
@@ -11,7 +11,11 @@
 
 // Assert on non finite numbers. Used to track NaNs.
 #ifndef ENABLE_NAN_DIAGNOSTIC
-	#define ENABLE_NAN_DIAGNOSTIC 0
+	#if UE_BUILD_DEBUG
+		#define ENABLE_NAN_DIAGNOSTIC 1
+	#else
+		#define ENABLE_NAN_DIAGNOSTIC 0
+	#endif
 #endif
 
 /*-----------------------------------------------------------------------------
@@ -595,7 +599,15 @@ struct FMath : public FPlatformMath
 	/** Calculates the percentage along a line from MinValue to MaxValue that Value is. */
 	static FORCEINLINE float GetRangePct(float MinValue, float MaxValue, float Value)
 	{
-		return (Value - MinValue) / (MaxValue - MinValue);
+		// Avoid Divide by Zero.
+		// But also if our range is a point, output whether Value is before or after.
+		const float Divisor = MaxValue - MinValue;
+		if (FMath::IsNearlyZero(Divisor))
+		{
+			return (Value >= MaxValue) ? 1.f : 0.f;
+		}
+
+		return (Value - MinValue) / Divisor;
 	}
 
 	/** Same as above, but taking a 2d vector as the range. */
diff --git a/Engine/Source/Runtime/Core/Public/Math/Vector.h b/Engine/Source/Runtime/Core/Public/Math/Vector.h
index 12402795a99d..7f56d71a9b69 100644
--- a/Engine/Source/Runtime/Core/Public/Math/Vector.h
+++ b/Engine/Source/Runtime/Core/Public/Math/Vector.h
@@ -543,6 +543,9 @@ public:
 	 */
 	FVector BoundToCube(float Radius) const;
 
+	/** Get a copy of this vector, clamped inside of a cube. */
+	FVector BoundToBox(const FVector& Min, const FVector Max) const;
+
 	/** Create a copy of this vector, with its magnitude clamped between Min and Max. */
 	FVector GetClampedToSize(float Min, float Max) const;
 
@@ -1598,6 +1601,17 @@ FORCEINLINE FVector FVector::BoundToCube(float Radius) const
 		);
 }
 
+FORCEINLINE FVector FVector::BoundToBox(const FVector& Min, const FVector Max) const
+{
+	return FVector
+	(
+		FMath::Clamp(X, Min.X, Max.X),
+		FMath::Clamp(Y, Min.Y, Max.Y),
+		FMath::Clamp(Z, Min.Z, Max.Z)
+	);
+}
+
+
 FORCEINLINE FVector FVector::GetClampedToSize(float Min, float Max) const
 {
 	float VecSize = Size();
diff --git a/Engine/Source/Runtime/Core/Public/Math/Vector2D.h b/Engine/Source/Runtime/Core/Public/Math/Vector2D.h
index 4043f4f1de50..ff5b62e77d13 100644
--- a/Engine/Source/Runtime/Core/Public/Math/Vector2D.h
+++ b/Engine/Source/Runtime/Core/Public/Math/Vector2D.h
@@ -57,6 +57,13 @@ public:
 	 */
 	explicit FORCEINLINE FVector2D(EForceInit);
 
+	/**
+	 * Constructor that does not initialize.  More explicit than the default constructor.
+	 *
+	 * @param ENoInit Don't init
+	 */
+	explicit FORCEINLINE FVector2D(ENoInit) { }
+
 	/**
 	 * Constructs a vector from an FVector.
 	 * Copies the X and Y components from the FVector.
@@ -943,7 +950,7 @@ FORCEINLINE bool FVector2D::InitFromString(const FString& InSourceString)
 
 FORCEINLINE float FMath::GetRangePct(FVector2D const& Range, float Value)
 {
-	return (Range.X != Range.Y) ? (Value - Range.X) / (Range.Y - Range.X) : Range.X;
+	return GetRangePct(Range.X, Range.Y, Value);
 }
 
 FORCEINLINE float FMath::GetRangeValue(FVector2D const& Range, float Pct)
diff --git a/Engine/Source/Runtime/Core/Public/Misc/Attribute.h b/Engine/Source/Runtime/Core/Public/Misc/Attribute.h
index 4ffb5b2c8805..a65da0433267 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/Attribute.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/Attribute.h
@@ -310,7 +310,7 @@ public:
 			}
 			else
 			{
-				return Value == InOther.Value;
+				return IsSet() == InOther.IsSet() && Value == InOther.Value;
 			}
 		}
 
diff --git a/Engine/Source/Runtime/Core/Public/Misc/AutomationEvent.h b/Engine/Source/Runtime/Core/Public/Misc/AutomationEvent.h
index 2aef50e03fe2..e24457fd7fd0 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/AutomationEvent.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/AutomationEvent.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreTypes.h"
+#include "Misc/Guid.h"
 
 enum class EAutomationEventType : uint8
 {
@@ -13,20 +14,11 @@ enum class EAutomationEventType : uint8
 
 struct CORE_API FAutomationEvent
 {
-	EAutomationEventType Type;
-	FString Message;
-	FString Context;
-	FString Filename;
-	int32 LineNumber;
-	FDateTime Timestamp;
-
+public:
 	FAutomationEvent(EAutomationEventType InType, FString InMessage)
 		: Type(InType)
 		, Message(InMessage)
 		, Context()
-		, Filename()
-		, LineNumber(-1)
-		, Timestamp(FDateTime::UtcNow())
 	{
 	}
 
@@ -34,16 +26,34 @@ struct CORE_API FAutomationEvent
 		: Type(InType)
 		, Message(InMessage)
 		, Context(InContext)
+	{
+	}
+
+public:
+
+	EAutomationEventType Type;
+	FString Message;
+	FString Context;
+	FGuid Artifact;
+};
+
+struct CORE_API FAutomationExecutionEntry
+{
+	FAutomationEvent Event;
+	FString Filename;
+	int32 LineNumber;
+	FDateTime Timestamp;
+
+	FAutomationExecutionEntry(FAutomationEvent InEvent)
+		: Event(InEvent)
 		, Filename()
 		, LineNumber(-1)
 		, Timestamp(FDateTime::UtcNow())
 	{
 	}
 
-	FAutomationEvent(EAutomationEventType InType, FString InMessage, FString InContext, FString InFilename, int32 InLineNumber)
-		: Type(InType)
-		, Message(InMessage)
-		, Context(InContext)
+	FAutomationExecutionEntry(FAutomationEvent InEvent, FString InFilename, int32 InLineNumber)
+		: Event(InEvent)
 		, Filename(InFilename)
 		, LineNumber(InLineNumber)
 		, Timestamp(FDateTime::UtcNow())
diff --git a/Engine/Source/Runtime/Core/Public/Misc/AutomationTest.h b/Engine/Source/Runtime/Core/Public/Misc/AutomationTest.h
index 3c29789f0411..f46a59be5a11 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/AutomationTest.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/AutomationTest.h
@@ -137,9 +137,9 @@ public:
 	int32 RemoveAllEvents(TFunctionRef<bool(FAutomationEvent&)> FilterPredicate);
 
 	/** Any errors that occurred during execution */
-	const TArray<FAutomationEvent>& GetEvents() const { return Events; }
+	const TArray<FAutomationExecutionEntry>& GetEntries() const { return Entries; }
 
-	void AddEvent(const FAutomationEvent& Event);
+	void AddEvent(const FAutomationEvent& Event, int StackOffset = 0);
 
 	void AddWarning(const FString& WarningMessage);
 	void AddError(const FString& ErrorMessage);
@@ -179,7 +179,7 @@ public:
 
 private:
 	/** Any errors that occurred during execution */
-	TArray<FAutomationEvent> Events;
+	TArray<FAutomationExecutionEntry> Entries;
 
 	int32 Errors;
 	int32 Warnings;
@@ -549,6 +549,7 @@ struct FAutomationScreenshotData
 {
 	FString Name;
 	FString Context;
+	FString Notes;
 
 	FGuid Id;
 	FString Commit;
@@ -623,6 +624,27 @@ struct FAutomationScreenshotData
 	}
 };
 
+struct CORE_API FAutomationScreenshotCompareResults
+{
+	FAutomationScreenshotCompareResults()
+		: UniqueId()
+		, bWasNew(false)
+		, bWasSimilar(false)
+		, MaxLocalDifference(0)
+		, GlobalDifference(0)
+		, ErrorMessage()
+	{
+	}
+
+	FGuid UniqueId;
+	bool bWasNew;
+	bool bWasSimilar;
+	double MaxLocalDifference;
+	double GlobalDifference;
+	FString ErrorMessage;
+
+	FAutomationEvent ToAutomationEvent(const FString& ScreenhotName) const;
+};
 
 
 /**
@@ -633,7 +655,7 @@ struct FAutomationScreenshotData
  */
 DECLARE_DELEGATE_TwoParams(FOnTestScreenshotCaptured, const TArray<FColor>&, const FAutomationScreenshotData&);
 
-DECLARE_MULTICAST_DELEGATE_FiveParams(FOnTestScreenshotComparisonComplete, bool /*bWasNew*/, bool /*bWasSimilar*/, double /*MaxLocalDifference*/, double /*GlobalDifference*/, FString /*ErrorMessage*/);
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnTestScreenshotComparisonComplete, const FAutomationScreenshotCompareResults& /*CompareResults*/);
 
 DECLARE_MULTICAST_DELEGATE_TwoParams(FOnTestDataRetrieved, bool /*bWasNew*/, const FString& /*JsonData*/);
 
@@ -832,7 +854,7 @@ public:
 	bool GetTreatWarningsAsErrors() const;
 	void SetTreatWarningsAsErrors(TOptional<bool> bTreatWarningsAsErrors);
 
-	void NotifyScreenshotComparisonComplete(bool bWasNew, bool bWasSimilar, double MaxLocalDifference, double GlobalDifference, FString ErrorMessage);
+	void NotifyScreenshotComparisonComplete(const FAutomationScreenshotCompareResults& CompareResults);
 	void NotifyTestDataRetrieved(bool bWasNew, const FString& JsonData);
 	void NotifyPerformanceDataRetrieved(bool bSuccess, const FString& ErrorMessage);
 
@@ -997,6 +1019,9 @@ public:
 	 */
 	virtual uint32 GetTestFlags() const = 0;
 
+	/** Gets the C++ name of the test. */
+	FString GetTestName() const { return TestName; }
+
 	/**
 	 * Pure virtual method; returns the number of participants for this test
 	 *
@@ -1021,7 +1046,7 @@ public:
 	 * @param	InFilename	The filename the error originated in
 	 * @param	InLineNumber	The line number in the file this error originated in
 	 */
-	virtual void AddError(const FString& InError, const FString& InFilename, int32 InLineNumber);
+	virtual void AddErrorS(const FString& InError, const FString& InFilename, int32 InLineNumber);
 
 	/**
 	 * Adds an warning message to this test
@@ -1030,7 +1055,7 @@ public:
 	 * @param	InFilename	The filename the error originated in
 	 * @param	InLineNumber	The line number in the file this error originated in
 	 */
-	virtual void AddWarning(const FString& InWarning, const FString& InFilename, int32 InLineNumber);
+	virtual void AddWarningS(const FString& InWarning, const FString& InFilename, int32 InLineNumber);
 
 	/**
 	 * Adds a warning to this test
@@ -1052,6 +1077,13 @@ public:
 	 */
 	virtual void AddInfo( const FString& InLogItem, int32 StackOffset = 0);
 
+	/**
+	 * Adds an automation event directly into the execution log.
+	 *
+	 * @param	InLogItem	Log item to add to this test
+	 */
+	virtual void AddEvent(const FAutomationEvent& InEvent, int32 StackOffset = 0);
+
 	/**
 	 * Adds a analytics string to parse later
 	 *
diff --git a/Engine/Source/Runtime/Core/Public/Misc/Build.h b/Engine/Source/Runtime/Core/Public/Misc/Build.h
index 526d16152d38..fd745a5b3822 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/Build.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/Build.h
@@ -293,9 +293,16 @@
 #define USE_DEFERRED_DEPENDENCY_CHECK_VERIFICATION_TESTS (USE_CIRCULAR_DEPENDENCY_LOAD_DEFERRING && 0)
 
 // 0 (default), set this to 1 to get draw events with "TOGGLEDRAWEVENTS" "r.ShowMaterialDrawEvents" and the "ProfileGPU" command working in test
-#define ALLOW_PROFILEGPU_IN_TEST 0
+#ifndef ALLOW_PROFILEGPU_IN_TEST
+	#define ALLOW_PROFILEGPU_IN_TEST 0
+#endif
+
+#ifndef ALLOW_PROFILEGPU_IN_SHIPPING
+	#define ALLOW_PROFILEGPU_IN_SHIPPING 0
+#endif
+
 // draw events with "TOGGLEDRAWEVENTS" "r.ShowMaterialDrawEvents" (for ProfileGPU, Pix, Razor, RenderDoc, ...) and the "ProfileGPU" command are normally compiled out for TEST and SHIPPING
-#define WITH_PROFILEGPU (!(UE_BUILD_SHIPPING || UE_BUILD_TEST) || (UE_BUILD_TEST && ALLOW_PROFILEGPU_IN_TEST))
+#define WITH_PROFILEGPU (!(UE_BUILD_SHIPPING || UE_BUILD_TEST) || (UE_BUILD_TEST && ALLOW_PROFILEGPU_IN_TEST) || (UE_BUILD_SHIPPING && ALLOW_PROFILEGPU_IN_SHIPPING))
 
 #ifndef ALLOW_CHEAT_CVARS_IN_TEST
 	#define ALLOW_CHEAT_CVARS_IN_TEST 1
@@ -315,3 +322,9 @@
 #endif
 
 #define USE_HITCH_DETECTION (ALLOW_HITCH_DETECTION && !WITH_EDITORONLY_DATA && !IS_PROGRAM && !UE_BUILD_DEBUG)
+
+// Controls whether shipping builds create backups of the most recent log file.
+// All other configurations always create backups.
+#ifndef PRESERVE_LOG_BACKUPS_IN_SHIPPING
+	#define PRESERVE_LOG_BACKUPS_IN_SHIPPING 1
+#endif
diff --git a/Engine/Source/Runtime/Core/Public/Misc/ConfigCacheIni.h b/Engine/Source/Runtime/Core/Public/Misc/ConfigCacheIni.h
index 4e8c547bffcf..28c1de9c75f7 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/ConfigCacheIni.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/ConfigCacheIni.h
@@ -24,7 +24,7 @@ CORE_API DECLARE_LOG_CATEGORY_EXTERN(LogConfig, Warning, All);
 
 // Server builds should be tweakable even in Shipping
 #define ALLOW_INI_OVERRIDE_FROM_COMMANDLINE			(UE_SERVER || !(UE_BUILD_SHIPPING))
-
+#define CONFIG_REMEMBER_ACCESS_PATTERN (WITH_EDITOR || 0)
 struct FConfigValue
 {
 public:
@@ -32,7 +32,7 @@ public:
 
 	FConfigValue(const TCHAR* InValue)
 		: SavedValue(InValue)
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 		, bRead(false)
 #endif
 	{
@@ -41,7 +41,7 @@ public:
 
 	FConfigValue(FString InValue)
 		: SavedValue(MoveTemp(InValue))
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 		, bRead(false)
 #endif
 	{
@@ -51,7 +51,7 @@ public:
 	FConfigValue( const FConfigValue& InConfigValue ) 
 		: SavedValue( InConfigValue.SavedValue )
 		, ExpandedValue( InConfigValue.ExpandedValue )
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 		, bRead( InConfigValue.bRead )
 #endif
 	{
@@ -61,7 +61,7 @@ public:
 	// Returns the ini setting with any macros expanded out
 	const FString& GetValue() const 
 	{ 
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 		bRead = true; 
 #endif
 		return (ExpandedValue.Len() > 0 ? ExpandedValue : SavedValue); 
@@ -70,12 +70,12 @@ public:
 	// Returns the original ini setting without macro expansion
 	const FString& GetSavedValue() const 
 	{ 
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 		bRead = true; 
 #endif
 		return SavedValue; 
 	}
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 	inline const bool HasBeenRead() const
 	{
 		return bRead;
@@ -107,6 +107,9 @@ public:
 		if (Slot.GetUnderlyingArchive().IsLoading())
 		{
 			ConfigSection.ExpandValueInternal();
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
+			ConfigSection.bRead = false;
+#endif
 		}
 	}
 
@@ -160,7 +163,7 @@ private:
 
 	FString SavedValue;
 	FString ExpandedValue;
-#if WITH_EDITOR
+#if CONFIG_REMEMBER_ACCESS_PATTERN 
 	mutable bool bRead; // has this value been read since the config system started
 #endif
 };
@@ -835,6 +838,11 @@ public:
 	 * Works even if the variable is registered after the ini file was loaded.
 	 */
 	static void LoadConsoleVariablesFromINI();
+	
+	/**
+	 * Less than ideal solution for allowing user settings to be saved on all platforms
+	 */
+	static FString GetGameUserSettingsDir();
 
 private:
 	/** true if file operations should not be performed */
@@ -872,3 +880,25 @@ CORE_API void ApplyCVarSettingsGroupFromIni(const TCHAR* InSectionBaseName, cons
  * @param SetBy anything in ECVF_LastSetMask e.g. ECVF_SetByScalability
  */
 CORE_API void ApplyCVarSettingsFromIni(const TCHAR* InSectionBaseName, const TCHAR* InIniFilename, uint32 SetBy, bool bAllowCheating = false);
+
+
+
+/**
+ * CVAR Ini history records all calls to ApplyCVarSettingsFromIni and can re run them 
+ */
+
+/**
+ * Helper function to start recording ApplyCVarSettings function calls 
+ * uses these to generate a history of applied ini settings sections
+ */
+CORE_API void RecordApplyCVarSettingsFromIni();
+
+/**
+ * Helper function to reapply inis which have been applied after RecordCVarIniHistory was called
+ */
+CORE_API void ReapplyRecordedCVarSettingsFromIni();
+
+/**
+ * Helper function to clean up ini history
+ */
+CORE_API void DeleteRecordedCVarSettingsFromIni();
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Public/Misc/CoreDefines.h b/Engine/Source/Runtime/Core/Public/Misc/CoreDefines.h
index 6f0830f9aaae..0e4467639ec0 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/CoreDefines.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/CoreDefines.h
@@ -28,3 +28,21 @@ Seek-free defines.
 -----------------------------------------------------------------------------*/
 
 #define STANDALONE_SEEKFREE_SUFFIX	TEXT("_SF")
+
+
+/*-----------------------------------------------------------------------------
+Macros for enabling heap storage instead of inline storage on delegate types.
+Can be overridden by setting to 1 or 0 in the project's .Target.cs files.
+-----------------------------------------------------------------------------*/
+
+#ifndef USE_SMALL_DELEGATES
+	#define USE_SMALL_DELEGATES 1
+#endif
+
+#ifndef USE_SMALL_MULTICAST_DELEGATES
+	#define USE_SMALL_MULTICAST_DELEGATES 1
+#endif
+
+#ifndef USE_SMALL_TFUNCTIONS
+	#define USE_SMALL_TFUNCTIONS 0
+#endif
diff --git a/Engine/Source/Runtime/Core/Public/Misc/CoreDelegates.h b/Engine/Source/Runtime/Core/Public/Misc/CoreDelegates.h
index 95b7c521e434..b8c7913432d2 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/CoreDelegates.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/CoreDelegates.h
@@ -51,12 +51,18 @@ public:
 	// Callback for object property modifications
 	DECLARE_MULTICAST_DELEGATE_OneParam(FOnActorLabelChanged, AActor*);
 
+	// delegate type for prompting the pak system to mount all pak files, which haven't already been mounted, from all default locations
+	DECLARE_DELEGATE_RetVal_OneParam(int32, FOnMountAllPakFiles, const TArray<FString>&);
+
 	// delegate type for prompting the pak system to mount a new pak
 	DECLARE_DELEGATE_RetVal_ThreeParams(bool, FOnMountPak, const FString&, uint32, IPlatformFile::FDirectoryVisitor*);
 
 	// delegate type for prompting the pak system to mount a new pak
 	DECLARE_DELEGATE_RetVal_OneParam(bool, FOnUnmountPak, const FString&);
 
+	// delegate for handling when a new pak file is successfully mounted passes in the name of the mounted pak file
+	DECLARE_MULTICAST_DELEGATE_OneParam(FPakFileMountedDelegate, const TCHAR*);
+
 	/** delegate type for opening a modal message box ( Params: EAppMsgType::Type MessageType, const FText& Text, const FText& Title ) */
 	DECLARE_DELEGATE_RetVal_ThreeParams(EAppReturnType::Type, FOnModalMessageBox, EAppMsgType::Type, const FText&, const FText&);
 
@@ -121,12 +127,18 @@ public:
 	// Callback when a user changes the safe frame size
 	static FOnSafeFrameChangedEvent OnSafeFrameChangedEvent;
 
+	// Callback for mounting all the pak files in default locations
+	static FOnMountAllPakFiles OnMountAllPakFiles;
+
 	// Callback for mounting a new pak file.
 	static FOnMountPak OnMountPak;
 
 	// Callback for unmounting a pak file.
 	static FOnUnmountPak OnUnmountPak;
 
+	// After a pakfile is mounted this callback is called for each new file
+	static FPakFileMountedDelegate PakFileMountedCallback;
+
 	// Callback when an ensure has occurred
 	static FOnHandleSystemEnsure OnHandleSystemEnsure;
 	// Callback when an error (crash) has occurred
@@ -138,6 +150,8 @@ public:
 	static FPakEncryptionKeyDelegate& GetPakEncryptionKeyDelegate();
 	static FPakSigningKeysDelegate& GetPakSigningKeysDelegate();
 
+	
+
 #if WITH_EDITOR
 	// Called before the editor displays a modal window, allowing other windows the opportunity to disable themselves to avoid reentrant calls
 	static FSimpleMulticastDelegate PreModal;
@@ -171,6 +185,10 @@ public:
 	// Called when before the application is exiting.
 	static FSimpleMulticastDelegate OnPreExit;
 
+	/** Delegate for gathering up additional localization paths that are unknown to the UE4 core (such as plugins) */
+	DECLARE_MULTICAST_DELEGATE_OneParam(FGatherAdditionalLocResPathsDelegate, TArray<FString>&);
+	static FGatherAdditionalLocResPathsDelegate GatherAdditionalLocResPathsCallback;
+
 	/** Color picker color has changed, please refresh as needed*/
 	static FSimpleMulticastDelegate ColorPickerChanged;
 
@@ -207,6 +225,7 @@ public:
 	// There is a parellel enum in ApplicationLifecycleComponent
 	enum class ETemperatureSeverity : uint8
 	{
+		Unknown,
 		Good,
 		Bad,
 		Serious,
@@ -217,13 +236,43 @@ public:
 	DECLARE_MULTICAST_DELEGATE_OneParam(FOnTemperatureChange, ETemperatureSeverity);
 	static FOnTemperatureChange OnTemperatureChange;
 
+	/** Called when the OS goes into low power mode */
+	DECLARE_MULTICAST_DELEGATE_OneParam(FOnLowPowerMode, bool);
+	static FOnLowPowerMode OnLowPowerMode;
+
+
+
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FCountPreLoadConfigFileRespondersDelegate, const TCHAR* /*IniFilename*/, int32& /*ResponderCount*/);
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FPreLoadConfigFileDelegate, const TCHAR* /*IniFilename*/, FString& /*LoadedContents*/);
+	DECLARE_MULTICAST_DELEGATE_ThreeParams(FPreSaveConfigFileDelegate, const TCHAR* /*IniFilename*/, const FString& /*ContentsToSave*/, int32& /*SavedCount*/);
+	static FCountPreLoadConfigFileRespondersDelegate CountPreLoadConfigFileRespondersDelegate;
+	static FPreLoadConfigFileDelegate PreLoadConfigFileDelegate;
+	static FPreSaveConfigFileDelegate PreSaveConfigFileDelegate;
+
+	DECLARE_MULTICAST_DELEGATE_OneParam(FOnFConfigFileCreated, const FConfigFile *);
+	DECLARE_MULTICAST_DELEGATE_OneParam(FOnFConfigFileDeleted, const FConfigFile *);
+	static FOnFConfigFileCreated OnFConfigCreated;
+	static FOnFConfigFileDeleted OnFConfigDeleted;
+
+	DECLARE_MULTICAST_DELEGATE_FourParams(FOnApplyCVarFromIni, const TCHAR* /*SectionName*/, const TCHAR* /*IniFilename*/, uint32 /*SetBy*/, bool /*bAllowCheating*/);
+	static FOnApplyCVarFromIni OnApplyCVarFromIni;
+
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnSystemResolutionChanged, uint32 /*ResX*/, uint32 /*ResY*/);
+	static FOnSystemResolutionChanged OnSystemResolutionChanged;
+
+#if WITH_EDITOR
+	// called when a target platform changes it's return value of supported formats.  This is so anything caching those results can reset (like cached shaders for cooking)
+	DECLARE_MULTICAST_DELEGATE_OneParam(FOnTargetPlatformChangedSupportedFormats, const ITargetPlatform*); 
+	static FOnTargetPlatformChangedSupportedFormats OnTargetPlatformChangedSupportedFormats;
+#endif
+
 	/** IOS-style application lifecycle delegates */
 	DECLARE_MULTICAST_DELEGATE(FApplicationLifetimeDelegate);
 
 	// This is called when the application is about to be deactivated (e.g., due to a phone call or SMS or the sleep button).
 	// The game should be paused if possible, etc...
 	static FApplicationLifetimeDelegate ApplicationWillDeactivateDelegate;
-	
+
 	// Called when the application has been reactivated (reverse any processing done in the Deactivate delegate)
 	static FApplicationLifetimeDelegate ApplicationHasReactivatedDelegate;
 
@@ -233,7 +282,7 @@ public:
 	// terminated from the background state without any further warning.
 	static FApplicationLifetimeDelegate ApplicationWillEnterBackgroundDelegate; // for instance, hitting the home button
 
-	// Called when the application is returning to the foreground (reverse any processing done in the EnterBackground delegate)
+																				// Called when the application is returning to the foreground (reverse any processing done in the EnterBackground delegate)
 	static FApplicationLifetimeDelegate ApplicationHasEnteredForegroundDelegate;
 
 	// This *may* be called when the application is getting terminated by the OS.
@@ -241,6 +290,10 @@ public:
 	// save state when ApplicationWillEnterBackgroundDelegate is called instead.
 	static FApplicationLifetimeDelegate ApplicationWillTerminateDelegate;
 
+	//
+	DECLARE_MULTICAST_DELEGATE_OneParam(FUserMusicInterruptDelegate, bool);
+	static FUserMusicInterruptDelegate UserMusicInterruptDelegate;
+	
 	// Called when the OS is running low on resources and asks the application to free up any cached resources, drop graphics quality etc.
 	static FApplicationLifetimeDelegate ApplicationShouldUnloadResourcesDelegate;
 
@@ -256,17 +309,6 @@ public:
 	DECLARE_MULTICAST_DELEGATE_TwoParams(FApplicationReceivedRemoteNotificationDelegate, FString, int);
 	DECLARE_MULTICAST_DELEGATE_ThreeParams(FApplicationReceivedLocalNotificationDelegate, FString, int, int);
 
-
-
-	DECLARE_MULTICAST_DELEGATE_OneParam(FOnFConfigFileCreated, const FConfigFile *);
-	DECLARE_MULTICAST_DELEGATE_OneParam(FOnFConfigFileDeleted, const FConfigFile *);
-	static FOnFConfigFileCreated OnFConfigCreated;
-	static FOnFConfigFileDeleted OnFConfigDeleted;
-#if WITH_EDITOR
-	// called when a target platform changes it's return value of supported formats.  This is so anything caching those results can reset (like cached shaders for cooking)
-	DECLARE_MULTICAST_DELEGATE_OneParam(FOnTargetPlatformChangedSupportedFormats, const ITargetPlatform*); 
-	static FOnTargetPlatformChangedSupportedFormats OnTargetPlatformChangedSupportedFormats;
-#endif
 	// called when the user grants permission to register for remote notifications
 	static FApplicationRegisteredForRemoteNotificationsDelegate ApplicationRegisteredForRemoteNotificationsDelegate;
 
diff --git a/Engine/Source/Runtime/Core/Public/Misc/DateTime.h b/Engine/Source/Runtime/Core/Public/Misc/DateTime.h
index fc963c7a4071..af9aaf7bc93c 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/DateTime.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/DateTime.h
@@ -737,11 +737,7 @@ protected:
 	static const int32 DaysToMonth[];
 
 private:
-#ifdef COREUOBJECT_API
-	friend COREUOBJECT_API class UScriptStruct* Z_Construct_UScriptStruct_FDateTime();
-#else
-	friend class UScriptStruct* Z_Construct_UScriptStruct_FDateTime();
-#endif
+	friend struct Z_Construct_UScriptStruct_FDateTime_Statics;
 
 private:
 
diff --git a/Engine/Source/Runtime/Core/Public/Misc/Guid.h b/Engine/Source/Runtime/Core/Public/Misc/Guid.h
index 6b1721de1346..35b381f075b4 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/Guid.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/Guid.h
@@ -196,6 +196,19 @@ public:
 		return true;
 	}
 
+	/**
+	* Guid default string conversion.
+	*/
+	friend FString LexToString(const FGuid& Value)
+	{
+		return Value.ToString();
+	}
+
+	friend void LexFromString(FGuid& Result, const TCHAR* String)
+	{
+		FGuid::Parse(String, Result);
+	}
+
 	bool Serialize(FStructuredArchive::FSlot Slot)
 	{
 		Slot << *this;
@@ -331,19 +344,3 @@ public:
 
 
 template <> struct TIsPODType<FGuid> { enum { Value = true }; };
-
-namespace Lex
-{
-	/**
-	 * Guid default string conversion.
-	 */
-	inline FString ToString(const FGuid& Value)
-	{
-		return Value.ToString();
-	}
-
-	inline void FromString(FGuid& Result, const TCHAR* String)
-	{
-		FGuid::Parse(String, Result);
-	}
-}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Public/Misc/NetworkVersion.h b/Engine/Source/Runtime/Core/Public/Misc/NetworkVersion.h
index d2afe4010f95..4a81e0137cc0 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/NetworkVersion.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/NetworkVersion.h
@@ -35,7 +35,8 @@ enum EEngineNetworkVersionHistory
 	HISTORY_INITIAL = 1,
 	HISTORY_REPLAY_BACKWARDS_COMPAT = 2,			// Bump version to get rid of older replays before backwards compat was turned on officially
 	HISTORY_MAX_ACTOR_CHANNELS_CUSTOMIZATION = 3,	// Bump version because serialization of the actor channels changed
-	HISTORY_REPCMD_CHECKSUM_REMOVE_PRINTF = 4		// Bump version since the way FRepLayoutCmd::CompatibleChecksum was calculated changed due to an optimization
+	HISTORY_REPCMD_CHECKSUM_REMOVE_PRINTF = 4,		// Bump version since the way FRepLayoutCmd::CompatibleChecksum was calculated changed due to an optimization
+	HISTORY_NEW_ACTOR_OVERRIDE_LEVEL = 5			// Bump version since a level reference was added to the new actor information
 };
 
 struct CORE_API FNetworkVersion
@@ -78,6 +79,39 @@ struct CORE_API FNetworkVersion
 	*/
 	static FNetworkReplayVersion GetReplayVersion();
 
+	/**
+	* Sets the project version used for networking. Needs to be a function to verify
+	* string and correctly invalidate cached values
+	* 
+	* @param  InVersion
+	* @return void
+	*/
+	static void SetProjectVersion(const TCHAR* InVersion);
+
+	/**
+	* Sets the game network protocol version used for networking and invalidate cached values
+	*/
+	static void SetGameNetworkProtocolVersion(uint32 GameNetworkProtocolVersion);
+
+	/**
+	* Sets the game compatible network protocol version used for networking and invalidate cached values
+	*/
+	static void SetGameCompatibleNetworkProtocolVersion(uint32 GameCompatibleNetworkProtocolVersion);
+
+	/**
+	* Returns the project version used by networking
+	* 
+	* @return FString
+	*/
+	static const FString& GetProjectVersion() { return ProjectVersion; }
+
+	/**
+	* Invalidates any cached network checksum and forces it to be recalculated on next request
+	*/
+	static void InvalidateNetworkChecksum() { bHasCachedNetworkChecksum = false; }
+
+protected:
+
 	/**
 	* Used to allow BP only projects to override network versions
 	*/
diff --git a/Engine/Source/Runtime/Core/Public/Misc/Paths.h b/Engine/Source/Runtime/Core/Public/Misc/Paths.h
index 21837704fc57..6f0390271bf4 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/Paths.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/Paths.h
@@ -170,6 +170,8 @@ public:
 	 */
 	static FString ProjectIntermediateDir();
 
+	static FString ShaderWorkingDir();
+
 	DEPRECATED(4.18, "FPaths::GameIntermediateDir() has been superseded by FPaths::ProjectIntermediateDir().")
 	static FORCEINLINE FString GameIntermediateDir() { return ProjectIntermediateDir(); }
 
@@ -515,6 +517,22 @@ public:
 	 */
 	static FString CreateTempFilename( const TCHAR* Path, const TCHAR* Prefix = TEXT(""), const TCHAR* Extension = TEXT(".tmp") );
 
+	/**
+	* Returns a string containing all invalid characters as dictated by the operating system
+	* 
+	* @return FString
+	*/
+	static const FString& GetInvalidFileSystemChars();
+
+	/**
+	*	Returns a string that is safe to use as a filename because all items in
+	*	GetInvalidFileSystemChars() are removed
+	* 
+	* @param  InPath
+	* @return FString
+	*/
+	static FString MakeValidFileName(const FString& InString, const TCHAR InReplacementChar=0);
+
 	/** 
 	 * Validates that the parts that make up the path contain no invalid characters as dictated by the operating system
 	 * Note that this is a different set of restrictions to those imposed by FPackageName
@@ -570,9 +588,4 @@ private:
 		static FCriticalSection Lock;
 		return &Lock; 
 	}
-
-#if WITH_EDITOR
-	/** RootPrefix used by IsRelative(). Static to minimise string allocations. */
-	static FString RootPrefix;
-#endif // WITH_EDITOR
 };
diff --git a/Engine/Source/Runtime/Core/Public/Misc/SecureHash.h b/Engine/Source/Runtime/Core/Public/Misc/SecureHash.h
index 31a76718e44f..b172e29005c7 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/SecureHash.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/SecureHash.h
@@ -99,12 +99,6 @@ private:
 
 struct FMD5Hash;
 
-namespace Lex
-{
-	CORE_API FString ToString(const FMD5Hash& Hash);
-	CORE_API void FromString(FMD5Hash& Hash, const TCHAR* Buffer);
-}
-
 /** Simple helper struct to ease the caching of MD5 hashes */
 struct FMD5Hash
 {
@@ -159,8 +153,8 @@ private:
 	/** The bytes this hash comprises */
 	uint8 Bytes[16];
 
-	friend FString Lex::ToString(const FMD5Hash&);
-	friend void Lex::FromString(FMD5Hash& Hash, const TCHAR*);
+	friend CORE_API FString LexToString(const FMD5Hash&);
+	friend CORE_API void LexFromString(FMD5Hash& Hash, const TCHAR*);
 };
 
 /*-----------------------------------------------------------------------------
@@ -199,6 +193,11 @@ public:
 	{
 		return BytesToHex((const uint8*)Hash, sizeof(Hash));
 	}
+	void FromString(const FString& Src)
+	{
+		check(Src.Len() == 40);
+		HexToBytes(Src, Hash);
+	}
 
 	friend bool operator==(const FSHAHash& X, const FSHAHash& Y)
 	{
@@ -410,7 +409,7 @@ public:
 	 * @param Size Size of Data
 	 * @param bInFreeOnClose If true, Data will be FMemory::Free'd when this archive is closed
 	 * @param SHASourcePathname Path to the file to use to lookup the SHA hash value
-	 * @param bIsPersistent Uses this value for ArIsPersistent
+	 * @param bIsPersistent Uses this value for SetIsPersistent()
 	 * @param bInIsUnfoundHashAnError true if failing to lookup the hash should trigger an error (only in ShippingPC)
 	 */
 	FBufferReaderWithSHA( 
diff --git a/Engine/Source/Runtime/Core/Public/Misc/Timespan.h b/Engine/Source/Runtime/Core/Public/Misc/Timespan.h
index ef540112f4ab..16c610705c15 100644
--- a/Engine/Source/Runtime/Core/Public/Misc/Timespan.h
+++ b/Engine/Source/Runtime/Core/Public/Misc/Timespan.h
@@ -773,12 +773,7 @@ protected:
 	void CORE_API Assign(int32 Days, int32 Hours, int32 Minutes, int32 Seconds, int32 FractionNano);
 
 private:
-
-#ifdef COREUOBJECT_API
-	friend COREUOBJECT_API class UScriptStruct* Z_Construct_UScriptStruct_FTimespan();
-#else
-	friend class UScriptStruct* Z_Construct_UScriptStruct_FTimespan();
-#endif
+	friend struct Z_Construct_UScriptStruct_FTimespan_Statics;
 
 private:
 
diff --git a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CookStats.h b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CookStats.h
index 2817ea3dcbde..d170d31114e1 100644
--- a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CookStats.h
+++ b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CookStats.h
@@ -127,19 +127,19 @@ private:
 	template <typename KeyType>
 	static void ImplCreateKeyValueArray(TArray<FCookStatsManager::StringKeyValue>& Attrs, KeyType&& Key)
 	{
-		Attrs.Emplace(Lex::ToString(Forward<KeyType>(Key)), TEXT(""));
+		Attrs.Emplace(LexToString(Forward<KeyType>(Key)), TEXT(""));
 	}
 
 	template <typename KeyType, typename ValueType>
 	static void ImplCreateKeyValueArray(TArray<FCookStatsManager::StringKeyValue>& Attrs, KeyType&& Key, ValueType&& Value)
 	{
-		Attrs.Emplace(Lex::ToString(Forward<KeyType>(Key)), Lex::ToString(Forward<ValueType>(Value)));
+		Attrs.Emplace(LexToString(Forward<KeyType>(Key)), LexToString(Forward<ValueType>(Value)));
 	}
 
 	template <typename KeyType, typename ValueType, typename...ArgTypes>
 	static void ImplCreateKeyValueArray(TArray<FCookStatsManager::StringKeyValue>& Attrs, KeyType&& Key, ValueType&& Value, ArgTypes&&...Args)
 	{
-		Attrs.Emplace(Lex::ToString(Forward<KeyType>(Key)), Lex::ToString(Forward<ValueType>(Value)));
+		Attrs.Emplace(LexToString(Forward<KeyType>(Key)), LexToString(Forward<ValueType>(Value)));
 		ImplCreateKeyValueArray(Attrs, Forward<ArgTypes>(Args)...);
 	}
 
diff --git a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CsvProfiler.h b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CsvProfiler.h
index 50dcec999765..00cb289d3405 100644
--- a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CsvProfiler.h
+++ b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/CsvProfiler.h
@@ -114,11 +114,12 @@ struct FCsvCaptureCommand
 		, Value(-1)
 	{}
 
-	FCsvCaptureCommand(ECsvCommandType InCommandType, uint32 InFrameRequested, uint32 InValue = -1, const FString& InDestinationFolder = FString(), bool InbWriteCompletionFile = false)
+	FCsvCaptureCommand(ECsvCommandType InCommandType, uint32 InFrameRequested, uint32 InValue = -1, const FString& InDestinationFolder = FString(), const FString& InFilename = FString(), bool InbWriteCompletionFile = false)
 		: CommandType(InCommandType)
 		, FrameRequested(InFrameRequested)
 		, Value(InValue)
 		, DestinationFolder(InDestinationFolder)
+		, Filename(InFilename)
 		, bWriteCompletionFile(InbWriteCompletionFile)
 	{}
 
@@ -126,6 +127,7 @@ struct FCsvCaptureCommand
 	uint32 FrameRequested;
 	uint32 Value;
 	FString DestinationFolder;
+	FString Filename;
 	bool bWriteCompletionFile;
 };
 
@@ -138,9 +140,10 @@ class FCsvProfiler
 	friend class FCsvProfilerThreadData;
 	friend struct FCsvCategory;
 private:
-	static FCsvProfiler* Instance;
-	FCsvProfiler();
+	static TUniquePtr<FCsvProfiler> Instance;		
 public:
+	FCsvProfiler();
+	~FCsvProfiler();
 	static CORE_API FCsvProfiler* Get();
 
 	CORE_API void Init();
@@ -180,8 +183,9 @@ public:
 	CORE_API void EndFrame();
 
 	/** Begin/End Capture */
-	CORE_API void BeginCapture(int InNumFramesToCapture = -1,
+	CORE_API void BeginCapture( int InNumFramesToCapture = -1,
 		const FString& InDestinationFolder = FString(),
+		const FString& InFilename = FString(),
 		bool bInWriteCompletionFile = false);
 
 	CORE_API void EndCapture();
@@ -193,6 +197,8 @@ public:
 	CORE_API void BeginFrameRT();
 	CORE_API void EndFrameRT();
 
+	CORE_API void SetDeviceProfileName(FString InDeviceProfileName);
+
 private:
 	CORE_API void VARARGS RecordEventfInternal(int32 CategoryIndex, const TCHAR* Fmt, ...);
 
@@ -209,10 +215,11 @@ private:
 
 	int32 NumFramesToCapture;
 	int32 CaptureFrameNumber;
+
 	volatile bool bCapturing;
 	volatile bool bCapturingRT; // Renderthread version of the above
-
 	bool bInsertEndFrameAtFrameStart;
+	bool bWriteCompletionFile;
 
 	uint64 LastEndFrameTimestamp;
 	uint32 CaptureEndFrameCount;
@@ -221,10 +228,13 @@ private:
 	TArray<FCsvProfilerThreadData*> ProfilerThreadDataArray;
 	FCriticalSection ProfilerThreadDataArrayLock;
 
-	bool bWriteCompletionFile;
-	FString DestinationFolder;
+	FString OutputFilename;
 	TQueue<FCsvCaptureCommand> CommandQueue;
 	FCsvProfilerProcessingThread* ProcessingThread;
+
+	FString DeviceProfileName;
+
+	FThreadSafeCounter IsShuttingDown;
 };
 
 class FScopedCsvStat
diff --git a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/ExternalProfiler.h b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/ExternalProfiler.h
index 8e32dc859c80..20b57b2831e1 100644
--- a/Engine/Source/Runtime/Core/Public/ProfilingDebugging/ExternalProfiler.h
+++ b/Engine/Source/Runtime/Core/Public/ProfilingDebugging/ExternalProfiler.h
@@ -6,6 +6,11 @@
 #include "UObject/NameTypes.h"
 #include "Features/IModularFeature.h"
 
+#ifndef UE_EXTERNAL_PROFILING_ENABLED
+#define UE_EXTERNAL_PROFILING_ENABLED (!UE_BUILD_SHIPPING)
+#endif
+
+#if UE_EXTERNAL_PROFILING_ENABLED
 
 /**
  * FExternalProfiler
@@ -159,3 +164,10 @@ public:
 
 #define SCOPE_PROFILER_INCLUDER(X) FExternalProfilerIncluder ExternalProfilerIncluder_##X;
 #define SCOPE_PROFILER_EXCLUDER(X) FExternalProfilerExcluder ExternalProfilerExcluder_##X;
+
+#else	// UE_EXTERNAL_PROFILING_ENABLED
+
+#define SCOPE_PROFILER_INCLUDER(X)
+#define SCOPE_PROFILER_EXCLUDER(X)
+
+#endif	// !UE_EXTERNAL_PROFILING_ENABLED
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/Archive.h b/Engine/Source/Runtime/Core/Public/Serialization/Archive.h
index 2e033eb539de..f34bd66ee743 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/Archive.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/Archive.h
@@ -17,7 +17,13 @@
 #include "Templates/IsArrayOrRefOfType.h"
 
 class FCustomVersionContainer;
+class FLinker;
+class FName;
+class FString;
+class FText;
 class ITargetPlatform;
+class UObject;
+class UProperty;
 struct FUntypedBulkData;
 struct FArchiveSerializedPropertyChain;
 template<class TEnum> class TEnumAsByte;
@@ -114,7 +120,7 @@ public:
 		return bError;
 	}
 
-protected:
+private:
 	/** The object pointer */
 	T* Object;
 
@@ -157,7 +163,7 @@ public:
 	 * @param Value The value to serialize.
 	 * @return This instance.
 	 */
-	virtual FArchive& operator<<(class FName& Value)
+	virtual FArchive& operator<<(FName& Value)
 	{
 		return *this;
 	}
@@ -168,7 +174,7 @@ public:
 	 * @param Ar The archive to serialize from or to.
 	 * @param Value The value to serialize.
 	 */
-	virtual FArchive& operator<<(class FText& Value);
+	virtual FArchive& operator<<(FText& Value);
 
 	/**
 	 * Serializes an UObject value from or into this archive.
@@ -178,7 +184,7 @@ public:
 	 * @param Value The value to serialize.
 	 * @return This instance.
 	 */
-	virtual FArchive& operator<<(class UObject*& Value)
+	virtual FArchive& operator<<(UObject*& Value)
 	{
 		return *this;
 	}
@@ -624,7 +630,7 @@ public:
 	 *
 	 * @return The linker, or nullptr if the archive is not a linker.
 	 */
-	virtual class FLinker* GetLinker()
+	virtual FLinker* GetLinker()
 	{
 		return nullptr;
 	}
@@ -753,7 +759,7 @@ public:
 #if PLATFORM_LITTLE_ENDIAN
 		bool SwapBytes = ArForceByteSwapping;
 #else
-		bool SwapBytes = ArIsPersistent;
+		bool SwapBytes = this->IsPersistent();
 #endif
 		return SwapBytes;
 	}
@@ -825,8 +831,6 @@ public:
 		return nullptr;
 	}
 
-	virtual void IndicateSerializationMismatch() { }
-
 private:
 	void VARARGS LogfImpl(const TCHAR* Fmt, ...);
 
@@ -893,6 +897,7 @@ public:
 		return this;
 	}
 
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
 	FORCEINLINE bool IsLoading() const
 	{
 		return ArIsLoading;
@@ -934,6 +939,7 @@ public:
 	{
 		return ArIsPersistent;
 	}
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 	FORCEINLINE bool IsError() const
 	{
@@ -1049,55 +1055,6 @@ public:
 		return ArMaxSerializeSize;
 	}
 
-	/**
-	 * Sets the archive version number. Used by the code that makes sure that FLinkerLoad's 
-	 * internal archive versions match the file reader it creates.
-	 *
-	 * @param UE4Ver	new version number
-	 */
-	void SetUE4Ver(int32 InVer)
-	{
-		ArUE4Ver = InVer;
-	}
-
-	/**
-	 * Sets the archive licensee version number. Used by the code that makes sure that FLinkerLoad's 
-	 * internal archive versions match the file reader it creates.
-	 *
-	 * @param Ver	new version number
-	 */
-	void SetLicenseeUE4Ver(int32 InVer)
-	{
-		ArLicenseeUE4Ver = InVer;
-	}
-
-	/**
-	* Sets the archive engine version. Used by the code that makes sure that FLinkerLoad's
-	* internal archive versions match the file reader it creates.
-	*
-	* @param InVer	new version number
-	*/
-	void SetEngineVer(const FEngineVersionBase& InVer)
-	{
-		ArEngineVer = InVer;
-	}
-
-	/**
-	* Sets the archive engine network version.
-	*/
-	void SetEngineNetVer(const uint32 InEngineNetVer)
-	{
-		ArEngineNetVer = InEngineNetVer;
-	}
-
-	/**
-	* Sets the archive game network version.
-	*/
-	void SetGameNetVer(const uint32 InGameNetVer)
-	{
-		ArGameNetVer = InGameNetVer;
-	}
-
 	/**
 	 * Gets the custom version numbers for this archive.
 	 *
@@ -1124,16 +1081,6 @@ public:
 	 */
 	void SetCustomVersion(const struct FGuid& Key, int32 Version, FName FriendlyName);
 
-	/**
-	 * Toggle saving as Unicode. This is needed when we need to make sure ANSI strings are saved as Unicode
-	 *
-	 * @param Enabled	set to true to force saving as Unicode
-	 */
-	void SetForceUnicode(bool Enabled)
-	{
-		ArForceUnicode = Enabled;
-	}
-
 	/**
 	 * Toggle byte order swapping. This is needed in rare cases when we already know that the data
 	 * swapping has already occurred or if we know that it will be handled later.
@@ -1167,25 +1114,12 @@ public:
 #endif
 	}
 
-	/**
-	 * Returns if an async close operation has finished or not, as well as if there was an error.
-	 *
-	 * @param bHasError true if there was an error.
-	 * @return true if the close operation is complete (or if Close is not an async operation).
-	 */
-	virtual bool IsCloseComplete(bool& bHasError)
-	{
-		bHasError = false;
-		
-		return true;
-	}
-
 	/**
 	 * Indicates whether this archive is filtering editor-only on save or contains data that had editor-only content stripped.
 	 *
 	 * @return true if the archive filters editor-only content, false otherwise.
 	 */
-	virtual bool IsFilterEditorOnly()
+	bool IsFilterEditorOnly()
 	{
 		return ArIsFilterEditorOnly;
 	}
@@ -1205,7 +1139,7 @@ public:
 	 *
 	 * @return true if the archive is dealing with save games, false otherwise.
 	 */
-	virtual bool IsSaveGame()
+	bool IsSaveGame()
 	{
 		return ArIsSaveGame;
 	}
@@ -1235,7 +1169,7 @@ public:
 	 *
 	 * @return Target platform.
 	 */
-	FORCEINLINE const class ITargetPlatform* CookingTarget() const 
+	FORCEINLINE const ITargetPlatform* CookingTarget() const 
 	{
 		return CookingTargetPlatform;
 	}
@@ -1245,7 +1179,7 @@ public:
 	 *
 	 * @param InCookingTarget The target platform to set.
 	 */
-	FORCEINLINE void SetCookingTarget(const class ITargetPlatform* InCookingTarget) 
+	FORCEINLINE void SetCookingTarget(const ITargetPlatform* InCookingTarget) 
 	{
 		CookingTargetPlatform = InCookingTarget;
 	}
@@ -1264,7 +1198,7 @@ public:
 	/**
 	 * Checks whether the archive wants to skip the property independent of the other flags
 	 */
-	virtual bool ShouldSkipProperty(const class UProperty* InProperty) const
+	virtual bool ShouldSkipProperty(const UProperty* InProperty) const
 	{
 		return false;
 	}
@@ -1275,7 +1209,7 @@ public:
 	 * 
 	 * @param InProperty Pointer to the property that is currently being serialized
 	 */
-	FORCEINLINE void SetSerializedProperty(class UProperty* InProperty)
+	FORCEINLINE void SetSerializedProperty(UProperty* InProperty)
 	{
 		SerializedProperty = InProperty;
 	}
@@ -1352,11 +1286,11 @@ public:
 	virtual FString GetLocalizationNamespace() const;
 #endif // USE_STABLE_LOCALIZATION_KEYS
 
-protected:
-
 	/** Resets all of the base archive members. */
-	void Reset();
+	virtual void Reset();
+
 #if DEVIRTUALIZE_FLinkerLoad_Serialize
+private:
 	template<SIZE_T Size>
 	FORCEINLINE bool FastPathLoad(void* InDest)
 	{
@@ -1393,6 +1327,7 @@ protected:
 		}
 		return false;
 	}
+
 public:
 	/* These are used for fastpath inline serializers  */
 	struct FFastPathLoadBuffer
@@ -1415,9 +1350,6 @@ public:
 	FFastPathLoadBuffer* ActiveFPLB;
 	FFastPathLoadBuffer InlineFPLB;
 
-
-
-
 #else
 	template<SIZE_T Size>
 	FORCEINLINE bool FastPathLoad(void* InDest)
@@ -1426,33 +1358,37 @@ public:
 	}
 #endif
 
-
 private:
-
 	/** Copies all of the members except CustomVersionContainer */
 	void CopyTrivialFArchiveStatusMembers(const FArchive& ArchiveStatusToCopy);
 
 public:
-
 	/** Whether this archive is for loading data. */
+	DEPRECATED(4.20, "Direct access to ArIsLoading has been deprecated - please use IsLoading() and SetIsLoading() instead.")
 	uint8 ArIsLoading : 1;
 
 	/** Whether this archive is for saving data. */
+	DEPRECATED(4.20, "Direct access to ArIsSaving has been deprecated - please use IsSaving() and SetIsSaving() instead.")
 	uint8 ArIsSaving : 1;
 
 	/** Whether archive is transacting. */
+	DEPRECATED(4.20, "Direct access to ArIsTransacting has been deprecated - please use IsTransacting() and SetIsTransacting() instead.")
 	uint8 ArIsTransacting : 1;
 
 	/** Whether this archive serializes to a text format. Text format archives should use high level constructs from FStructuredArchive for delimiting data rather than manually seeking through the file. */
+	DEPRECATED(4.20, "Direct access to ArIsTextFormat has been deprecated - please use IsTextFormat() and SetIsTextFormat() instead.")
 	uint8 ArIsTextFormat : 1;
 
 	/** Whether this archive wants properties to be serialized in binary form instead of tagged. */
+	DEPRECATED(4.20, "Direct access to ArWantBinaryPropertySerialization has been deprecated - please use WantBinaryPropertySerialization() and SetWantBinaryPropertySerialization() instead.")
 	uint8 ArWantBinaryPropertySerialization : 1;
 
 	/** Whether this archive wants to always save strings in unicode format */
+	DEPRECATED(4.20, "Direct access to ArForceUnicode has been deprecated - please use ForceUnicode() and SetForceUnicode() instead.")
 	uint8 ArForceUnicode : 1;
 
 	/** Whether this archive saves to persistent storage. */
+	DEPRECATED(4.20, "Direct access to ArIsPersistent has been deprecated - please use IsPersistent() and SetIsPersistent() instead.")
 	uint8 ArIsPersistent : 1;
 
 	/** Whether this archive contains errors. */
@@ -1524,8 +1460,91 @@ public:
 	/** Max size of data that this archive is allowed to serialize. */
 	int64 ArMaxSerializeSize;
 
-protected:
+	/**
+	 * Sets whether this archive is for loading data.
+	 *
+	 * @param bInIsLoading  true if this archive is for loading, false otherwise.
+	 */
+	virtual void SetIsLoading(bool bInIsLoading);
 
+	/**
+	 * Sets whether this archive is for saving data.
+	 *
+	 * @param bInIsSaving  true if this archive is for saving, false otherwise.
+	 */
+	virtual void SetIsSaving(bool bInIsSaving);
+
+	/**
+	 * Sets whether this archive is for transacting.
+	 *
+	 * @param bInIsTransacting  true if this archive is for transacting, false otherwise.
+	 */
+	virtual void SetIsTransacting(bool bInIsTransacting);
+
+	/**
+	 * Sets whether this archive is in text format.
+	 *
+	 * @param bInIsTextFormat  true if this archive is in text format, false otherwise.
+	 */
+	virtual void SetIsTextFormat(bool bInIsTextFormat);
+
+	/**
+	 * Sets whether this archive wants binary property serialization.
+	 *
+	 * @param bInWantBinaryPropertySerialization  true if this archive wants binary serialization, false otherwise.
+	 */
+	virtual void SetWantBinaryPropertySerialization(bool bInWantBinaryPropertySerialization);
+
+	/**
+	 * Sets whether this archive wants to force saving as Unicode.
+	 * This is needed when we need to make sure ANSI strings are saved as Unicode.
+	 *
+	 * @param bInForceUnicode  true if this archive wants to force saving as Unicode, false otherwise.
+	 */
+	virtual void SetForceUnicode(bool bInForceUnicode);
+
+	/**
+	 * Sets whether this archive is to persistent storage.
+	 *
+	 * @param bInIsPersistent  true if this archive is to persistent storage, false otherwise.
+	 */
+	virtual void SetIsPersistent(bool bInIsPersistent);
+
+	/**
+	 * Sets the archive version number. Used by the code that makes sure that FLinkerLoad's 
+	 * internal archive versions match the file reader it creates.
+	 *
+	 * @param UE4Ver	new version number
+	 */
+	virtual void SetUE4Ver(int32 InVer);
+
+	/**
+	 * Sets the archive licensee version number. Used by the code that makes sure that FLinkerLoad's 
+	 * internal archive versions match the file reader it creates.
+	 *
+	 * @param Ver	new version number
+	 */
+	virtual void SetLicenseeUE4Ver(int32 InVer);
+
+	/**
+	 * Sets the archive engine version. Used by the code that makes sure that FLinkerLoad's
+	 * internal archive versions match the file reader it creates.
+	 *
+	 * @param InVer	new version number
+	 */
+	virtual void SetEngineVer(const FEngineVersionBase& InVer);
+
+	/**
+	 * Sets the archive engine network version.
+	 */
+	virtual void SetEngineNetVer(const uint32 InEngineNetVer);
+
+	/**
+	 * Sets the archive game network version.
+	 */
+	virtual void SetGameNetVer(const uint32 InGameNetVer);
+
+private:
 	/** Holds the archive version. */
 	int32 ArUE4Ver;
 
@@ -1541,8 +1560,6 @@ protected:
 	/** Holds the game network protocol version. */
 	uint32 ArGameNetVer;
 
-private:
-
 	/**
 	* All the custom versions stored in the archive.
 	* Stored as a pointer to a heap-allocated object because of a 3-way dependency between TArray, FCustomVersionContainer and FArchive, which is too much work to change right now.
@@ -1551,7 +1568,6 @@ private:
 	mutable FCustomVersionContainer* CustomVersionContainer;
 
 public:
-
 	/** Custom property list attribute. If the flag below is set, only these properties will be iterated during serialization. If NULL, then no properties will be iterated. */
 	const struct FCustomPropertyListNode* ArCustomPropertyList;
 
@@ -1624,7 +1640,7 @@ private:
 	const ITargetPlatform* CookingTargetPlatform;
 
 	/** Holds the pointer to the property that is currently being serialized */
-	class UProperty* SerializedProperty;
+	UProperty* SerializedProperty;
 
 	/** Holds the chain of properties that are currently being serialized */
 	FArchiveSerializedPropertyChain* SerializedPropertyChain;
@@ -1635,7 +1651,7 @@ private:
 	 * This is typically the namespace used by the package being serialized (if serializing a package, or an object within a package).
 	 * Stored as a pointer to a heap-allocated string because of a dependency between TArray (thus FString) and FArchive; null should be treated as an empty string.
 	 */
-	class FString* LocalizationNamespacePtr;
+	FString* LocalizationNamespacePtr;
 
 	/** See SetLocalizationNamespace */
 	void SetBaseLocalizationNamespace(const FString& InLocalizationNamespace);
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/ArchiveProxy.h b/Engine/Source/Runtime/Core/Public/Serialization/ArchiveProxy.h
index b574a7d5fa1f..a4be77fcc0e7 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/ArchiveProxy.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/ArchiveProxy.h
@@ -7,8 +7,6 @@
 #include "Serialization/Archive.h"
 #include "Containers/UnrealString.h"
 
-struct FUntypedBulkData;
-
 /**
  * Base class for archive proxies.
  *
@@ -24,25 +22,43 @@ public:
 	 */
 	CORE_API FArchiveProxy(FArchive& InInnerArchive);
 
-	virtual FArchive& operator<<(class FName& Value) override
+	virtual FArchive& operator<<(FName& Value) override
 	{
 		InnerArchive << Value;
 		return *this;
 	}
 
-	virtual FArchive& operator<<(class FText& Value) override
+	virtual FArchive& operator<<(FText& Value) override
 	{
 		InnerArchive << Value;
 		return *this;
 	}
 
-	virtual FArchive& operator<<(class UObject*& Value) override
+	virtual FArchive& operator<<(UObject*& Value) override
 	{
 		InnerArchive << Value;
 		return *this;
 	}
 
-	virtual FArchive& operator<<(struct FSoftObjectPath& Value) override
+	virtual FArchive& operator<<(FLazyObjectPtr& Value) override
+	{
+		InnerArchive << Value;
+		return *this;
+	}
+
+	virtual FArchive& operator<<(FSoftObjectPath& Value) override
+	{
+		InnerArchive << Value;
+		return *this;
+	}
+
+	virtual FArchive& operator<<(FSoftObjectPtr& Value) override
+	{
+		InnerArchive << Value;
+		return *this;
+	}
+
+	virtual FArchive& operator<<(FWeakObjectPtr& Value) override
 	{
 		InnerArchive << Value;
 		return *this;
@@ -63,6 +79,11 @@ public:
 		InnerArchive.SerializeInt(Value, Max);
 	}
 
+	virtual void SerializeIntPacked(uint32& Value) override
+	{
+		InnerArchive.SerializeIntPacked(Value);
+	}
+
 	virtual void Preload(UObject* Object) override
 	{
 		InnerArchive.Preload(Object);
@@ -75,7 +96,7 @@ public:
 
 	CORE_API virtual FString GetArchiveName() const override;
 
-	virtual class FLinker* GetLinker() override
+	virtual FLinker* GetLinker() override
 	{
 		return InnerArchive.GetLinker();
 	}
@@ -120,7 +141,7 @@ public:
 		return InnerArchive.Precache(PrecacheOffset, PrecacheSize);
 	}
 
-	virtual bool SetCompressionMap(TArray<struct FCompressedChunk>* CompressedChunks, ECompressionFlags CompressionFlags) override
+	virtual bool SetCompressionMap(TArray<FCompressedChunk>* CompressedChunks, ECompressionFlags CompressionFlags) override
 	{
 		return InnerArchive.SetCompressionMap(CompressedChunks, CompressionFlags);
 	}
@@ -150,11 +171,6 @@ public:
 		InnerArchive.MarkScriptSerializationEnd(Obj);
 	}
 
-	virtual bool IsCloseComplete(bool& bHasError) override
-	{
-		return InnerArchive.IsCloseComplete(bHasError);
-	}
-
 	virtual const FCustomVersionContainer& GetCustomVersions() const override
 	{
 		return InnerArchive.GetCustomVersions();
@@ -170,6 +186,46 @@ public:
 		InnerArchive.ResetCustomVersions();
 	}
 
+	virtual void MarkSearchableName(const UObject* TypeObject, const FName& ValueName) const override
+	{
+		InnerArchive.MarkSearchableName(TypeObject, ValueName);
+	}
+
+	virtual UObject* GetArchetypeFromLoader(const UObject* Obj) override
+	{
+		return InnerArchive.GetArchetypeFromLoader(Obj);
+	}
+
+	virtual bool AttachExternalReadDependency(FExternalReadCallback& ReadCallback) override
+	{
+		return InnerArchive.AttachExternalReadDependency(ReadCallback);
+	}
+
+	virtual bool ShouldSkipProperty(const UProperty* InProperty) const override
+	{
+		return InnerArchive.ShouldSkipProperty(InProperty);
+	}
+
+	virtual bool UseToResolveEnumerators() const override
+	{
+		return InnerArchive.UseToResolveEnumerators();
+	}
+
+	virtual void FlushCache() override
+	{
+		InnerArchive.FlushCache();
+	}
+
+	virtual void ForceBlueprintFinalization() override
+	{
+		InnerArchive.ForceBlueprintFinalization();
+	}
+
+	virtual void SetFilterEditorOnly(bool InFilterEditorOnly) override
+	{
+		InnerArchive.SetFilterEditorOnly(InFilterEditorOnly);
+	}
+
 #if WITH_EDITOR
 	virtual void PushDebugDataString(const FName& DebugData) override
 	{
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/ArrayReader.h b/Engine/Source/Runtime/Core/Public/Serialization/ArrayReader.h
index c5107f9d0f68..a0cd79659527 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/ArrayReader.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/ArrayReader.h
@@ -13,8 +13,8 @@ class FArrayReader final : public FMemoryArchive, public TArray<uint8>
 public:
 	FArrayReader( bool bIsPersistent=false )
 	{
-		ArIsLoading = true;
-		ArIsPersistent = bIsPersistent;
+		this->SetIsLoading(true);
+		this->SetIsPersistent(bIsPersistent);
 	}
 
 	/**
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/BitReader.h b/Engine/Source/Runtime/Core/Public/Serialization/BitReader.h
index 1177c3fce58d..7ce527f16c08 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/BitReader.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/BitReader.h
@@ -128,7 +128,12 @@ public:
 		return Buffer.GetData();
 	}
 
-	FORCEINLINE_DEBUGGABLE const TArray<uint8>& GetBuffer()
+	FORCEINLINE_DEBUGGABLE const uint8* GetData() const
+	{
+		return Buffer.GetData();
+	}
+
+	FORCEINLINE_DEBUGGABLE const TArray<uint8>& GetBuffer() const
 	{
 		return Buffer;
 	}
@@ -139,11 +144,11 @@ public:
 		return &Buffer[Pos >> 3];
 	}
 
-	FORCEINLINE_DEBUGGABLE uint32 GetBytesLeft()
+	FORCEINLINE_DEBUGGABLE uint32 GetBytesLeft() const
 	{
 		return ((Num - Pos) + 7) >> 3;
 	}
-	FORCEINLINE_DEBUGGABLE uint32 GetBitsLeft()
+	FORCEINLINE_DEBUGGABLE uint32 GetBitsLeft() const
 	{
 		return (Num - Pos);
 	}
@@ -151,15 +156,15 @@ public:
 	{
 		return ArIsError || Pos>=Num;
 	}
-	FORCEINLINE_DEBUGGABLE int64 GetNumBytes()
+	FORCEINLINE_DEBUGGABLE int64 GetNumBytes() const
 	{
 		return (Num+7)>>3;
 	}
-	FORCEINLINE_DEBUGGABLE int64 GetNumBits()
+	FORCEINLINE_DEBUGGABLE int64 GetNumBits() const
 	{
 		return Num;
 	}
-	FORCEINLINE_DEBUGGABLE int64 GetPosBits()
+	FORCEINLINE_DEBUGGABLE int64 GetPosBits() const
 	{
 		return Pos;
 	}
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/BitWriter.h b/Engine/Source/Runtime/Core/Public/Serialization/BitWriter.h
index 6839a7149b70..72d83da7d5e3 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/BitWriter.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/BitWriter.h
@@ -157,7 +157,7 @@ public:
 	/**
 	 * Resets the bit writer back to its initial state
 	 */
-	void Reset(void);
+	void Reset() override;
 
 	FORCEINLINE void WriteAlign()
 	{
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/BufferReader.h b/Engine/Source/Runtime/Core/Public/Serialization/BufferReader.h
index 8d38746698ef..07c43be8909e 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/BufferReader.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/BufferReader.h
@@ -21,7 +21,7 @@ public:
 	* @param Data Buffer to use as the source data to read from
 	* @param Size Size of Data
 	* @param bInFreeOnClose If true, Data will be FMemory::Free'd when this archive is closed
-	* @param bIsPersistent Uses this value for ArIsPersistent
+	* @param bIsPersistent Uses this value for SetIsPersistent()
 	* @param bInSHAVerifyOnClose It true, an async SHA verification will be done on the Data buffer (bInFreeOnClose will be passed on to the async task)
 	*/
 	FBufferReaderBase(void* Data, int64 Size, bool bInFreeOnClose, bool bIsPersistent = false)
@@ -30,8 +30,8 @@ public:
 		, ReaderSize(Size)
 		, bFreeOnClose(bInFreeOnClose)
 	{
-		ArIsLoading = true;
-		ArIsPersistent = bIsPersistent;
+		this->SetIsLoading(true);
+		this->SetIsPersistent(bIsPersistent);
 	}
 
 	~FBufferReaderBase()
@@ -99,7 +99,7 @@ public:
 	 * @param Data Buffer to use as the source data to read from
 	 * @param Size Size of Data
 	 * @param bInFreeOnClose If true, Data will be FMemory::Free'd when this archive is closed
-	 * @param bIsPersistent Uses this value for ArIsPersistent
+	 * @param bIsPersistent Uses this value for SetIsPersistent()
 	 * @param bInSHAVerifyOnClose It true, an async SHA verification will be done on the Data buffer (bInFreeOnClose will be passed on to the async task)
 	 */
 	FBufferReader( void* Data, int64 Size, bool bInFreeOnClose, bool bIsPersistent = false )
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/BufferWriter.h b/Engine/Source/Runtime/Core/Public/Serialization/BufferWriter.h
index 48e942cdcb31..25c639db2a1d 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/BufferWriter.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/BufferWriter.h
@@ -42,7 +42,7 @@ public:
 		, bFreeOnClose((InFlags & EBufferWriterFlags::TakeOwnership) != EBufferWriterFlags::None)
 		, bAllowResize((InFlags & EBufferWriterFlags::AllowResize) != EBufferWriterFlags::None)
 	{
-		ArIsSaving = true;
+		this->SetIsSaving(true);
 	}
 
 	~FBufferWriter()
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/MemoryReader.h b/Engine/Source/Runtime/Core/Public/Serialization/MemoryReader.h
index c29963822b30..766e691b006e 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/MemoryReader.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/MemoryReader.h
@@ -20,9 +20,12 @@ public:
 	 *
 	 * This is overridden for the specific Archive Types
 	 **/
-	virtual FString GetArchiveName() const { return TEXT("FMemoryReader"); }
+	virtual FString GetArchiveName() const override
+	{
+		return TEXT("FMemoryReader");
+	}
 
-	int64 TotalSize()
+	virtual int64 TotalSize() override
 	{
 		return FMath::Min((int64)Bytes.Num(), LimitSize);
 	}
@@ -44,13 +47,12 @@ public:
 		}
 	}
 
-	FMemoryReader( const TArray<uint8>& InBytes, bool bIsPersistent = false )
-	: FMemoryArchive()
-	, Bytes(InBytes)
-	, LimitSize(INT64_MAX)
+	explicit FMemoryReader( const TArray<uint8>& InBytes, bool bIsPersistent = false )
+		: Bytes    (InBytes)
+		, LimitSize(INT64_MAX)
 	{
-		ArIsLoading		= true;
-		ArIsPersistent	= bIsPersistent;
+		this->SetIsLoading(true);
+		this->SetIsPersistent(bIsPersistent);
 	}
 
 	/** With this method it's possible to attach data behind some serialized data. */
@@ -59,9 +61,8 @@ public:
 		LimitSize = NewLimitSize;
 	}
 
-protected:
-
+private:
 	const TArray<uint8>& Bytes;
-	int64 LimitSize;
+	int64                LimitSize;
 };
 
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/MemoryWriter.h b/Engine/Source/Runtime/Core/Public/Serialization/MemoryWriter.h
index d14847c3ce0f..21cd78ca8ec0 100644
--- a/Engine/Source/Runtime/Core/Public/Serialization/MemoryWriter.h
+++ b/Engine/Source/Runtime/Core/Public/Serialization/MemoryWriter.h
@@ -23,8 +23,8 @@ public:
 	, Bytes(InBytes)
 	, ArchiveName(InArchiveName)
 	{
-		ArIsSaving		= true;
-		ArIsPersistent	= bIsPersistent;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(bIsPersistent);
 		if (bSetOffset)
 		{
 			Offset = InBytes.Num();
diff --git a/Engine/Source/Runtime/Core/Public/Serialization/StaticMemoryReader.h b/Engine/Source/Runtime/Core/Public/Serialization/StaticMemoryReader.h
new file mode 100644
index 000000000000..c7a50b9f18f9
--- /dev/null
+++ b/Engine/Source/Runtime/Core/Public/Serialization/StaticMemoryReader.h
@@ -0,0 +1,60 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreTypes.h"
+#include "HAL/UnrealMemory.h"
+#include "Math/UnrealMathUtility.h"
+#include "Containers/UnrealString.h"
+#include "Serialization/MemoryArchive.h"
+
+/**
+ * Archive for reading arbitrary data from the specified memory location
+ */
+class FStaticMemoryReader final : public FMemoryArchive
+{
+public:
+	/**
+  	 * Returns the name of the Archive.  Useful for getting the name of the package a struct or object
+	 * is in when a loading error occurs.
+	 *
+	 * This is overridden for the specific Archive Types
+	 **/
+	virtual FString GetArchiveName() const override
+	{
+		return TEXT("FStaticMemoryReader");
+	}
+
+	virtual int64 TotalSize() override
+	{
+		return NumBytes;
+	}
+
+	void Serialize( void* Data, int64 Num )
+	{
+		if (Num && !ArIsError)
+		{
+			// Only serialize if we have the requested amount of data
+			if (Offset + Num <= TotalSize())
+			{
+				FMemory::Memcpy( Data, &Bytes[Offset], Num );
+				Offset += Num;
+			}
+			else
+			{
+				ArIsError = true;
+			}
+		}
+	}
+
+	explicit FStaticMemoryReader(const uint8* InBytes, int64 InNumBytes)
+		: Bytes   (InBytes)
+		, NumBytes(InNumBytes)
+	{
+		this->SetIsLoading(true);
+	}
+
+private:
+	const uint8* Bytes;
+	int64        NumBytes;
+};
diff --git a/Engine/Source/Runtime/Core/Public/Stats/Stats.h b/Engine/Source/Runtime/Core/Public/Stats/Stats.h
index b536c42d2ecb..29ea800e160e 100644
--- a/Engine/Source/Runtime/Core/Public/Stats/Stats.h
+++ b/Engine/Source/Runtime/Core/Public/Stats/Stats.h
@@ -486,7 +486,7 @@ public:
 
 	FORCEINLINE ~FLightweightStatScope()
 	{
-		if (GHitchDetected && StatString && IsInGameThread())
+		if (GHitchDetected && StatString)
 		{
 			ReportHitch();
 		}
diff --git a/Engine/Source/Runtime/Core/Public/Stats/Stats2.h b/Engine/Source/Runtime/Core/Public/Stats/Stats2.h
index 5f6cc7e45f1b..0823369645ea 100644
--- a/Engine/Source/Runtime/Core/Public/Stats/Stats2.h
+++ b/Engine/Source/Runtime/Core/Public/Stats/Stats2.h
@@ -1093,7 +1093,11 @@ struct EStatMessagesArrayConstants
 {
 	enum
 	{
+#if WITH_EDITOR
+		MESSAGES_CHUNK_SIZE = 4*1024, // Smaller chunks prevent malloc deadlocks when running in the editor with TBB allocator
+#else
 		MESSAGES_CHUNK_SIZE = 64*1024,
+#endif
 	};
 };
 typedef TChunkedArray<FStatMessage,(uint32)EStatMessagesArrayConstants::MESSAGES_CHUNK_SIZE> FStatMessagesArray;
diff --git a/Engine/Source/Runtime/Core/Public/Stats/StatsData.h b/Engine/Source/Runtime/Core/Public/Stats/StatsData.h
index 5ec824906f84..751cf9ea7cb2 100644
--- a/Engine/Source/Runtime/Core/Public/Stats/StatsData.h
+++ b/Engine/Source/Runtime/Core/Public/Stats/StatsData.h
@@ -78,8 +78,7 @@ void ParseTypedValue( const TCHAR* Stream, const TCHAR* Match, T& Out )
 	TCHAR Temp[64] = TEXT( "" );
 	if( FParse::Value( Stream, Match, Temp, ARRAY_COUNT( Temp ) ) )
 	{
-		using namespace Lex;
-		FromString( Out, Temp );
+		LexFromString( Out, Temp );
 	}
 }
 
diff --git a/Engine/Source/Runtime/Core/Public/Templates/Atomic.h b/Engine/Source/Runtime/Core/Public/Templates/Atomic.h
index 817cbe1740ad..c4bafdc8bdb6 100644
--- a/Engine/Source/Runtime/Core/Public/Templates/Atomic.h
+++ b/Engine/Source/Runtime/Core/Public/Templates/Atomic.h
@@ -411,7 +411,7 @@ public:
 	/**
 	 * Initializes the element type with the given argument types.
 	 *
-	 * @param  Value  The value to initialize the element counter to
+	 * @param  Arg  The value to initialize the element counter to
 	 *
 	 * @note  This constructor is not atomic.
 	 */
diff --git a/Engine/Source/Runtime/Core/Public/Templates/Function.h b/Engine/Source/Runtime/Core/Public/Templates/Function.h
index 407c365be3c7..e55bbbb9bf8c 100644
--- a/Engine/Source/Runtime/Core/Public/Templates/Function.h
+++ b/Engine/Source/Runtime/Core/Public/Templates/Function.h
@@ -157,18 +157,18 @@ namespace UE4Function_Private
 	{
 		/**
 		 * Constructor which creates its T by moving.
-		 */
+	 */
 		explicit TFunction_UniqueOwnedObject(T&& InObj)
 			: Obj(MoveTemp(InObj))
 		{
 		}
 
 		IFunction_OwnedObject* CopyToEmptyStorage(FUniqueFunctionStorage& Storage) const override
-		{
+	{
 			// Should never get here - copy functions are deleted for TUniqueFunction
 			check(false);
 			return nullptr;
-		}
+	}
 
 		virtual void* GetAddress() override
 		{
@@ -180,13 +180,17 @@ namespace UE4Function_Private
 
 	#if !defined(_WIN32) || defined(_WIN64)
 		// Let TFunction store up to 32 bytes which are 16-byte aligned before we heap allocate
-		typedef TAlignedBytes<16, 16> AlignedInlineFunctionType;
-		typedef TInlineAllocator<2> FunctionAllocatorType;
+		typedef TAlignedBytes<16, 16> FAlignedInlineFunctionType;
+		#if USE_SMALL_TFUNCTIONS
+			typedef FHeapAllocator FFunctionAllocatorType;
+		#else
+			typedef TInlineAllocator<2> FFunctionAllocatorType;
+		#endif
 	#else
 		// ... except on Win32, because we can't pass 16-byte aligned types by value, as some TFunctions are.
 		// So we'll just keep it heap-allocated, which is always sufficiently aligned.
-		typedef TAlignedBytes<16, 8> AlignedInlineFunctionType;
-		typedef FHeapAllocator FunctionAllocatorType;
+		typedef TAlignedBytes<16, 8> FAlignedInlineFunctionType;
+		typedef FHeapAllocator FFunctionAllocatorType;
 	#endif
 
 	template <typename T>
@@ -201,23 +205,23 @@ namespace UE4Function_Private
 
 	template <typename T>
 	FORCEINLINE typename TEnableIf<TIsNullableBinding<T>::Value, bool>::Type IsBound(const T& Func)
-	{
+		{
 		// Function pointers, data member pointers, member function pointers and TFunctions
 		// can all be null/unbound, so test them using their boolean state.
 		return !!Func;
-	}
+		}
 
 	template <typename T>
 	FORCEINLINE typename TEnableIf<!TIsNullableBinding<T>::Value, bool>::Type IsBound(const T& Func)
-	{
+		{
 		// We can't tell if any other generic callable can be invoked, so just assume they can be.
 		return true;
-	}
+		}
 
 	struct FFunctionStorage;
 
 	struct FUniqueFunctionStorage
-	{
+		{
 		FUniqueFunctionStorage() = default;
 
 		FUniqueFunctionStorage(FUniqueFunctionStorage&& Other)
@@ -252,9 +256,9 @@ namespace UE4Function_Private
 			return (IFunction_OwnedObject*)Allocator.GetAllocation();
 		}
 
-		/**
+	/**
 		 * Returns a pointer to the callable object - needed by TFunctionRefBase.
-		 */
+	 */
 		void* GetPtr() const
 		{
 			return GetBoundObject()->GetAddress();
@@ -284,9 +288,9 @@ namespace UE4Function_Private
 		typename TDecay<FunctorType>::Type* Bind(FunctorType&& InFunc)
 		{
 			if (!IsBound(InFunc))
-			{
+		{
 				return nullptr;
-			}
+		}
 
 			using OwnedType = TFunction_CopyableOwnedObject<typename TDecay<FunctorType>::Type>;
 
@@ -387,9 +391,9 @@ namespace UE4Function_Private
 		TFunctionRefBase(TFunctionRefBase&& Other)
 			: Callable(Other.Callable)
 			, Storage (MoveTemp(Other.Storage))
-		{
+	{
 			if (Callable)
-			{
+		{
 				#if ENABLE_TFUNCTIONREF_VISUALIZATION
 					// Use Memcpy to copy the other DebugPtrStorage, including vptr (because we don't know the bound type
 					// here), and then reseat the underlying pointer.  Possibly even more evil than the Set code.
@@ -405,9 +409,9 @@ namespace UE4Function_Private
 		TFunctionRefBase(TFunctionRefBase<OtherStorage, Ret (ParamTypes...)>&& Other)
 			: Callable(Other.Callable)
 			, Storage (MoveTemp(Other.Storage))
-		{
+	{
 			if (Callable)
-			{
+		{
 				#if ENABLE_TFUNCTIONREF_VISUALIZATION
 					// Use Memcpy to copy the other DebugPtrStorage, including vptr (because we don't know the bound type
 					// here), and then reseat the underlying pointer.  Possibly even more evil than the Set code.
@@ -422,9 +426,9 @@ namespace UE4Function_Private
 		template <typename OtherStorage>
 		TFunctionRefBase(const TFunctionRefBase<OtherStorage, Ret (ParamTypes...)>& Other)
 			: Callable(Other.Callable)
-		{
+	{
 			if (Callable)
-			{
+		{
 				void* NewPtr = Storage.BindCopy(Other.Storage);
 
 				#if ENABLE_TFUNCTIONREF_VISUALIZATION
@@ -440,7 +444,7 @@ namespace UE4Function_Private
 			: Callable(Other.Callable)
 		{
 			if (Callable)
-			{
+		{
 				void* NewPtr = Storage.BindCopy(Other.Storage);
 
 				#if ENABLE_TFUNCTIONREF_VISUALIZATION
@@ -463,20 +467,20 @@ namespace UE4Function_Private
 		TFunctionRefBase(FunctorType&& InFunc)
 		{
 			if (auto* Binding = Storage.Bind(Forward<FunctorType>(InFunc)))
-			{
+		{
 				using DecayedFunctorType = typename TRemovePointer<decltype(Binding)>::Type;
 
 				Callable = &TFunctionRefCaller<DecayedFunctorType, Ret (ParamTypes...)>::Call;
 
-				#if ENABLE_TFUNCTIONREF_VISUALIZATION
-					// We placement new over the top of the same object each time.  This is illegal,
-					// but it ensures that the vptr is set correctly for the bound type, and so is
-					// visualizable.  We never depend on the state of this object at runtime, so it's
-					// ok.
+			#if ENABLE_TFUNCTIONREF_VISUALIZATION
+				// We placement new over the top of the same object each time.  This is illegal,
+				// but it ensures that the vptr is set correctly for the bound type, and so is
+				// visualizable.  We never depend on the state of this object at runtime, so it's
+				// ok.
 					new ((void*)&DebugPtrStorage) TDebugHelper<DecayedFunctorType>;
 					DebugPtrStorage.Ptr = (void*)Binding;
-				#endif
-			}
+			#endif
+		}
 		}
 
 		TFunctionRefBase& operator=(TFunctionRefBase&&) = delete;
@@ -677,7 +681,7 @@ public:
 		// This constructor is disabled for TFunctionRef types so it isn't incorrectly selected as copy/move constructors.
 	}
 
-	TFunctionRef(const TFunctionRef&) = default;
+		TFunctionRef(const TFunctionRef&) = default;
 
 	// We delete the assignment operators because we don't want it to be confused with being related to
 	// regular C++ reference assignment - i.e. calling the assignment operator of whatever the reference
@@ -775,13 +779,13 @@ public:
 	{
 		Swap(*this, Other);
 		return *this;
-	}
+		}
 
 	/**
 	 * Copy assignment operator.
 	 */
 	TFunction& operator=(const TFunction& Other)
-	{
+		{
 		TFunction Temp = Other;
 		Swap(*this, Temp);
 		return *this;
@@ -791,9 +795,9 @@ public:
 	 * Tests if the TFunction is callable.
 	 */
 	FORCEINLINE explicit operator bool() const
-	{
+		{
 		return Super::IsSet();
-	}
+		}
 };
 
 /**
@@ -814,7 +818,7 @@ public:
  */
 template <typename FuncType>
 class TUniqueFunction final : public UE4Function_Private::TFunctionRefBase<UE4Function_Private::FUniqueFunctionStorage, FuncType>
-{
+		{
 	using Super = UE4Function_Private::TFunctionRefBase<UE4Function_Private::FUniqueFunctionStorage, FuncType>;
 
 public:
@@ -866,7 +870,7 @@ public:
 	 */
 	TUniqueFunction(const TFunction<FuncType>& Other)
 		: Super(*(const UE4Function_Private::TFunctionRefBase<UE4Function_Private::FFunctionStorage, FuncType>*)&Other)
-	{
+		{
 	}
 
 	/**
diff --git a/Engine/Source/Runtime/Core/Public/UObject/AthenaObjectVersion.h b/Engine/Source/Runtime/Core/Public/UObject/AthenaObjectVersion.h
index af721f3261a0..9ad9af0688a8 100644
--- a/Engine/Source/Runtime/Core/Public/UObject/AthenaObjectVersion.h
+++ b/Engine/Source/Runtime/Core/Public/UObject/AthenaObjectVersion.h
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
 #include "CoreTypes.h"
@@ -26,6 +26,24 @@ struct CORE_API FAthenaObjectVersion
 		// Support to remove morphtarget generated by bRemapMorphtarget
 		SaveGeneratedMorphTargetByEngine,
 
+		// Convert reduction setting options
+		ConvertReductionSettingOptions,
+
+		// Serialize the type of blending used for landscape layer weight static params
+		StaticParameterTerrainLayerWeightBlendType,
+	
+		// Fix up None Named animation curve names, 
+		FixUpNoneNameAnimationCurves, 
+
+		// Ensure ActiveBoneIndices to have parents even not skinned for old assets
+		EnsureActiveBoneIndicesToContainParents,
+
+		// Serialize the instanced static mesh render data, to avoid building it at runtime
+		SerializeInstancedStaticMeshRenderData,
+
+		// Cache material quality node usage
+		CachedMaterialQualityNodeUsage,
+
 		// -----<new versions can be added above this line>-------------------------------------------------
 		VersionPlusOne,
 		LatestVersion = VersionPlusOne - 1
diff --git a/Engine/Source/Runtime/Core/Public/UObject/NameTypes.h b/Engine/Source/Runtime/Core/Public/UObject/NameTypes.h
index 950ac2f655c9..7518675bfd13 100644
--- a/Engine/Source/Runtime/Core/Public/UObject/NameTypes.h
+++ b/Engine/Source/Runtime/Core/Public/UObject/NameTypes.h
@@ -636,7 +636,7 @@ public:
 			return CurEntry->GetWideName();
 		}
 
-		return L"*INVALID*";
+		return TEXT("*INVALID*");
 	}
 
 	const FNameEntry* GetComparisonNameEntry() const;
@@ -1219,17 +1219,14 @@ inline uint32 GetTypeHash( const FName N )
 	return N.GetComparisonIndex() + N.GetNumber();
 }
 
-namespace Lex
+FORCEINLINE FString LexToString(const FName& Name)
 {
-	FORCEINLINE FString ToString(const FName& Name)
-	{
-		return Name.ToString();
-	}
+	return Name.ToString();
+}
 
-	FORCEINLINE void FromString(FName& Name, const TCHAR* Str)
-	{
-		Name = FName(Str);
-	}
+FORCEINLINE void LexFromString(FName& Name, const TCHAR* Str)
+{
+	Name = FName(Str);
 }
 
 FORCEINLINE FMinimalName NameToMinimalName(const FName& InName)
@@ -1291,4 +1288,4 @@ struct FNameSortIndexes
 	{
 		return A.CompareIndexes(B) < 0;
 	}
-};
\ No newline at end of file
+};
diff --git a/Engine/Source/Runtime/Core/Public/UObject/UnrealNames.inl b/Engine/Source/Runtime/Core/Public/UObject/UnrealNames.inl
index 3c1a4a26c096..2315f105807b 100644
--- a/Engine/Source/Runtime/Core/Public/UObject/UnrealNames.inl
+++ b/Engine/Source/Runtime/Core/Public/UObject/UnrealNames.inl
@@ -190,3 +190,4 @@ REGISTER_NAME(500,PerformanceCapture)
 // Special config names - not required to be consistent for network replication
 REGISTER_NAME(600,EditorLayout)
 REGISTER_NAME(601,EditorKeyBindings)
+REGISTER_NAME(602,GameUserSettings)
diff --git a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatform.h b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatform.h
index f7f80d341064..691c9ac0f797 100644
--- a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatform.h
+++ b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatform.h
@@ -56,9 +56,9 @@ typedef FUnixPlatformTypes FPlatformTypes;
 #define PLATFORM_ENABLE_POPCNT_INTRINSIC 1
 
 #if __has_feature(cxx_decltype_auto)
-#define PLATFORM_COMPILER_HAS_DECLTYPE_AUTO 1
+	#define PLATFORM_COMPILER_HAS_DECLTYPE_AUTO 1
 #else
-#define PLATFORM_COMPILER_HAS_DECLTYPE_AUTO 0
+	#define PLATFORM_COMPILER_HAS_DECLTYPE_AUTO 0
 #endif
 
 // SOCK_CLOEXEC is available on Unix since 2.6.27
diff --git a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCompilerPreSetup.h b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCompilerPreSetup.h
index c136ab5e69d9..871a6287a65c 100644
--- a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCompilerPreSetup.h
+++ b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCompilerPreSetup.h
@@ -38,11 +38,13 @@
 		PRAGMA_DISABLE_NULL_DEREFERENCE_WARNINGS \
 		PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 		PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
-		PRAGMA_DISABLE_DEPRECATED_REGISTER_WARNINGS
+		PRAGMA_DISABLE_DEPRECATED_REGISTER_WARNINGS \
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
 #endif
 
 #ifndef THIRD_PARTY_INCLUDES_END
 	#define THIRD_PARTY_INCLUDES_END \
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 		PRAGMA_ENABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
 		PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 		PRAGMA_ENABLE_NULL_DEREFERENCE_WARNINGS \
diff --git a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCrashContext.h b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCrashContext.h
index d1599eb5997a..9af8e3e09c7e 100644
--- a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCrashContext.h
+++ b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformCrashContext.h
@@ -114,3 +114,13 @@ protected:
 };
 
 typedef FUnixCrashContext FPlatformCrashContext;
+
+namespace UnixCrashReporterTracker
+{
+	/**
+	 * Only call this function from a forked child process. The child process cannot be responsible for a sibling process.
+	 *
+	 * This removes a valid Crash Reporter tracker from the calling process.
+	 */
+	void RemoveValidCrashReportTickerForChildProcess();
+}
diff --git a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformString.h b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformString.h
index f2b726128f2a..b46b5df7eeb5 100644
--- a/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformString.h
+++ b/Engine/Source/Runtime/Core/Public/Unix/UnixPlatformString.h
@@ -23,13 +23,6 @@ struct FLinuxPlatformString : public FStandardPlatformString
 		int ret = mbstowcs(Dest, Source, LengthM1);
 		if(ret == LengthM1) Dest[LengthM1] = '\0';
 	}
-
-	static const ANSICHAR* GetEncodingName()
-	{
-		return "UTF-32LE";
-	}
-
-	static const bool IsUnicodeEncoded = true;
 };
 
 typedef FLinuxPlatformString FPlatformString;
diff --git a/Engine/Source/Runtime/Core/Public/Windows/WIndowsPlatform.h b/Engine/Source/Runtime/Core/Public/Windows/WIndowsPlatform.h
index 8f09752b591c..657304ddc93f 100644
--- a/Engine/Source/Runtime/Core/Public/Windows/WIndowsPlatform.h
+++ b/Engine/Source/Runtime/Core/Public/Windows/WIndowsPlatform.h
@@ -62,7 +62,7 @@ typedef FWindowsPlatformTypes FPlatformTypes;
 #define PLATFORM_SUPPORTS_TBB								1
 #define PLATFORM_SUPPORTS_NAMED_PIPES						1
 #define PLATFORM_COMPILER_HAS_TCHAR_WMAIN					1
-
+#define PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK				(!WITH_EDITOR) // movies will start before engine is initalized
 #define PLATFORM_RHITHREAD_DEFAULT_BYPASS					WITH_EDITOR
 
 #define PLATFORM_SUPPORTS_STACK_SYMBOLS						1
diff --git a/Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformCompilerPreSetup.h b/Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformCompilerPreSetup.h
index ad183de94d82..cdd4708a041e 100644
--- a/Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformCompilerPreSetup.h
+++ b/Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformCompilerPreSetup.h
@@ -25,11 +25,13 @@
 	#ifndef THIRD_PARTY_INCLUDES_START
 		#define THIRD_PARTY_INCLUDES_START \
 			PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS \
-			PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS
+			PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
+			PRAGMA_DISABLE_DEPRECATION_WARNINGS
 	#endif
 
 	#ifndef THIRD_PARTY_INCLUDES_END
 		#define THIRD_PARTY_INCLUDES_END \
+			PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 			PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 			PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
 	#endif
@@ -105,11 +107,13 @@
 			__pragma(warning(disable: 28301)) /* No annotations for first declaration of '<func>'. */ \
 			PRAGMA_DISABLE_UNDEFINED_IDENTIFIER_WARNINGS \
 			PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS \
-			PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS
+			PRAGMA_DISABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
+			PRAGMA_DISABLE_DEPRECATION_WARNINGS
 	#endif
 
 	#ifndef THIRD_PARTY_INCLUDES_END
 		#define THIRD_PARTY_INCLUDES_END \
+			PRAGMA_ENABLE_DEPRECATION_WARNINGS \
 			PRAGMA_ENABLE_MISSING_VIRTUAL_DESTRUCTOR_WARNINGS \
 			PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS \
 			PRAGMA_ENABLE_UNDEFINED_IDENTIFIER_WARNINGS \
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Blueprint/BlueprintSupport.cpp b/Engine/Source/Runtime/CoreUObject/Private/Blueprint/BlueprintSupport.cpp
index c153dae8c2f4..86bc2cbf6538 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Blueprint/BlueprintSupport.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Blueprint/BlueprintSupport.cpp
@@ -1195,7 +1195,7 @@ int32 FLinkerLoad::FindCDOExportIndex(UClass* LoadClass)
 	return INDEX_NONE;
 }
 
-UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FLinkerLoad* ImportLinker);
+UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FLinkerLoad* ImportLinker, FArchive* InReaderOverride);
 
 void FLinkerLoad::ResolveDeferredDependencies(UStruct* LoadStruct)
 {
@@ -1315,7 +1315,7 @@ void FLinkerLoad::ResolveDeferredDependencies(UStruct* LoadStruct)
 			{
 				uint32 InternalLoadFlags = LoadFlags & (LOAD_NoVerify | LOAD_NoWarn | LOAD_Quiet);
 				// make sure LoadAllObjects() is called for this package
-				LoadPackageInternal(/*Outer =*/nullptr, *SourceLinker->Filename, InternalLoadFlags, this); //-V595
+				LoadPackageInternal(/*Outer =*/nullptr, *SourceLinker->Filename, InternalLoadFlags, this, nullptr); //-V595
 			}
 
 			DEFERRED_DEPENDENCY_CHECK(ResolvingPlaceholderStack.Num() == 0);
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Misc/GCObjectReferencer.cpp b/Engine/Source/Runtime/CoreUObject/Private/Misc/GCObjectReferencer.cpp
index 53f78e259cb6..c4ad791eecdd 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Misc/GCObjectReferencer.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Misc/GCObjectReferencer.cpp
@@ -46,6 +46,28 @@ void UGCObjectReferencer::RemoveObject(FGCObject* Object)
 	check(NumRemoved == 1);
 }
 
+bool UGCObjectReferencer::GetReferencerName(UObject* Object, FString& OutName) const
+{
+	// Let each registered object handle its AddReferencedObjects call
+	for (int32 i = 0; i < ReferencedObjects.Num(); i++)
+	{
+		TArray<UObject*> ObjectArray;
+		FReferenceFinder Collector(ObjectArray);
+
+		FGCObject* GCReporter = ReferencedObjects[i];
+		check(GCReporter);
+		GCReporter->AddReferencedObjects(Collector);
+
+		if (ObjectArray.Contains(Object))
+		{
+			OutName = GCReporter->GetReferencerName();
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void UGCObjectReferencer::FinishDestroy()
 {
 	if ( !HasAnyFlags(RF_ClassDefaultObject) )
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveFindCulprit.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveFindCulprit.cpp
index 73ec982eed9b..07d954b4b481 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveFindCulprit.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveFindCulprit.cpp
@@ -25,8 +25,8 @@ FArchiveFindCulprit::FArchiveFindCulprit( UObject* InFind, UObject* Src, bool In
 
 	if( PretendSaving )
 	{
-		ArIsSaving		= true;
-		ArIsPersistent	= true;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 	}
 
 	Src->Serialize( *this );
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveObjectCrc32.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveObjectCrc32.cpp
index 5e9e77d7879a..b37537401fb2 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveObjectCrc32.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveObjectCrc32.cpp
@@ -17,6 +17,12 @@ FArchiveObjectCrc32::FArchiveObjectCrc32()
 	, RootObject(NULL)
 {
 	ArIgnoreOuterRef = true;
+
+	// Set FArchiveObjectCrc32 to be a saving archive instead of a reference collector.
+	// Reference collection causes FSoftObjectPtrs to be serialized by their weak pointer,
+	// which doesn't give a stable CRC.  Serializing these to a saving archive will
+	// use a string reference instead, which is a more meaningful CRC'able state.
+	SetIsSaving(true);
 }
 
 void FArchiveObjectCrc32::Serialize(void* Data, int64 Length)
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveStackTrace.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveStackTrace.cpp
index 273a6b3de836..ed575f0b0793 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveStackTrace.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/ArchiveStackTrace.cpp
@@ -12,9 +12,36 @@
 #include "HAL/FileManager.h"
 #include "Misc/FileHelper.h"
 #include "Misc/OutputDeviceHelper.h"
+#include "Serialization/StaticMemoryReader.h"
+#include "UObject/PropertyTempVal.h"
+#include "UObject/LinkerLoad.h"
+#include "Serialization/LargeMemoryReader.h"
+#include "UObject/LinkerManager.h"
+#include "Misc/PackageName.h"
+#include "Templates/UniquePtr.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogArchiveDiff, Log, All);
 
+#if !NO_LOGGING
+/** Helper class that holds runtime generated constants for log output formatting */
+struct FDiffFormatHelper
+{
+public:
+	const TCHAR* const Indent;
+	const TCHAR* const LineTerminator;
+
+	FDiffFormatHelper()
+		: Indent(FCString::Spc(FOutputDeviceHelper::FormatLogLine(ELogVerbosity::Warning, LogArchiveDiff.GetCategoryName(), TEXT(""), GPrintLogTimes).Len()))
+		, LineTerminator(TEXT("\n")) // because LINE_TERMINATOR doesn't work well wit EC
+	{}
+	static FDiffFormatHelper& Get()
+	{
+		static FDiffFormatHelper Instance;
+		return Instance;
+	}
+};
+#endif // !NO_LOGGING
+
 class FIgnoreDiffManager
 {
 	int32 IgnoreCount;
@@ -40,6 +67,8 @@ public:
 
 static FIgnoreDiffManager GIgnoreDiffManager;
 
+static const ANSICHAR* DebugDataStackMarker = "\r\nDebugDataStack:\r\n";
+
 FArchiveStackTraceIgnoreScope::FArchiveStackTraceIgnoreScope(bool bInIgnore /* = true */)
 	: bIgnore(bInIgnore)
 {
@@ -56,12 +85,34 @@ FArchiveStackTraceIgnoreScope::~FArchiveStackTraceIgnoreScope()
 	}
 }
 
-FString FArchiveStackTrace::FCallstackData::ToString(const TCHAR* CallstackCutoffText, int32 Indent) const
+FArchiveStackTrace::FCallstackData::FCallstackData()
+	: Callstack(nullptr)
+	, SerializedProp(nullptr)
 {
-	const TCHAR* CALLSTACK_LINE_TERMINATOR = TEXT("\n"); // because LINE_TERMINATOR doesn't work well wit EC
-	const TCHAR* INDENT = FCString::Spc(Indent);
+}
 
+FArchiveStackTrace::FCallstackData::FCallstackData(ANSICHAR* InCallstack, UObject* InSerializedObject, UProperty* InSerializedProperty)
+	: Callstack(InCallstack)
+	, SerializedProp(InSerializedProperty)
+{
+	if (InSerializedObject)
+	{
+		SerializedObjectName = InSerializedObject->GetFullName();
+	}
+	if (InSerializedProperty)
+	{
+		SerializedPropertyName = InSerializedProperty->GetFullName();
+	}
+}
+
+FString FArchiveStackTrace::FCallstackData::ToString(const TCHAR* CallstackCutoffText) const
+{
 	FString HumanReadableString;
+
+#if !NO_LOGGING
+	const TCHAR* const LineTerminator = FDiffFormatHelper::Get().LineTerminator;
+	const TCHAR* const Indent = FDiffFormatHelper::Get().Indent;
+	
 	FString StackTraceText = Callstack;
 	if (CallstackCutoffText != nullptr)
 	{
@@ -89,35 +140,38 @@ FString FArchiveStackTrace::FCallstackData::ToString(const TCHAR* CallstackCutof
 				StackLine = StackLine.Mid(CutoffIndex + 1);
 			}
 		}
-		HumanReadableString += INDENT;
+		HumanReadableString += Indent;
 		HumanReadableString += StackLine;
-		HumanReadableString += CALLSTACK_LINE_TERMINATOR;
+		HumanReadableString += LineTerminator;
 	}
 
-	if (!SerializedObject.IsEmpty())
+	if (!SerializedObjectName.IsEmpty())
 	{
-		HumanReadableString += CALLSTACK_LINE_TERMINATOR;
-		HumanReadableString += INDENT;
+		HumanReadableString += LineTerminator;
+		HumanReadableString += Indent;
 		HumanReadableString += TEXT("Serialized Object: ");
-		HumanReadableString += SerializedObject;
-		HumanReadableString += CALLSTACK_LINE_TERMINATOR;
+		HumanReadableString += SerializedObjectName;
+		HumanReadableString += LineTerminator;
 	}
-	if (!SerializedProperty.IsEmpty())
+	if (!SerializedPropertyName.IsEmpty())
 	{
-		if (SerializedObject.IsEmpty())
+		if (SerializedObjectName.IsEmpty())
 		{
-			HumanReadableString += CALLSTACK_LINE_TERMINATOR;
+			HumanReadableString += LineTerminator;
 		}
-		HumanReadableString += INDENT;
+		HumanReadableString += Indent;
 		HumanReadableString += TEXT("Serialized Property: ");
-		HumanReadableString += SerializedProperty;
-		HumanReadableString += CALLSTACK_LINE_TERMINATOR;
+		HumanReadableString += SerializedPropertyName;
+		HumanReadableString += LineTerminator;
 	}
+#endif // !NO_LOGGING
 	return HumanReadableString;
 }
 
-FArchiveStackTrace::FArchiveStackTrace(const TCHAR* InFilename, bool bInCollectCallstacks, const FArchiveDiffMap* InDiffMap)
+FArchiveStackTrace::FArchiveStackTrace(UObject* InAsset, const TCHAR* InFilename, bool bInCollectCallstacks, const FArchiveDiffMap* InDiffMap)
 	: FLargeMemoryWriter(0, false, InFilename)
+	, Asset(InAsset)
+	, AssetClass(InAsset ? InAsset->GetClass()->GetFName() : NAME_None)
 	, DiffMap(InDiffMap)
 	, bCollectCallstacks(bInCollectCallstacks)
 	, bCallstacksDirty(true)
@@ -125,7 +179,7 @@ FArchiveStackTrace::FArchiveStackTrace(const TCHAR* InFilename, bool bInCollectC
 	, LastSerializeCallstack(nullptr)
 	, ThreadContext(FUObjectThreadContext::Get())
 {
-	ArIsSaving = true;
+	this->SetIsSaving(true);
 
 	StackTrace = (ANSICHAR*)FMemory::Malloc(StackTraceSize);
 	StackTrace[0] = 0;
@@ -141,7 +195,7 @@ FArchiveStackTrace::~FArchiveStackTrace()
 	}
 }
 
-ANSICHAR* FArchiveStackTrace::AddUniqueCallstack(const ANSICHAR* InCallstack, UObject* InSerializedObject, UProperty* InSerializedProperty, uint32& OutCallstackCRC)
+ANSICHAR* FArchiveStackTrace::AddUniqueCallstack(UObject* InSerializedObject, UProperty* InSerializedProperty, uint32& OutCallstackCRC)
 {
 	ANSICHAR* Callstack = nullptr;
 	if (bCollectCallstacks)
@@ -154,12 +208,12 @@ ANSICHAR* FArchiveStackTrace::AddUniqueCallstack(const ANSICHAR* InCallstack, UO
 		}
 		else
 		{
-			int32 CallstackSize = FCStringAnsi::Strlen(InCallstack) + 1;
+			int32 CallstackSize = FCStringAnsi::Strlen(StackTrace) + 1;
 			Callstack = (ANSICHAR*)FMemory::Malloc(CallstackSize);
-			FCStringAnsi::Strcpy(Callstack, CallstackSize, InCallstack);
+			FCStringAnsi::Strcpy(Callstack, CallstackSize, StackTrace);
 			UniqueCallstacks.Add(OutCallstackCRC, FCallstackData(Callstack,
-				InSerializedObject ? *InSerializedObject->GetFullName() : nullptr,
-				InSerializedProperty ? *InSerializedProperty->GetFullName() : nullptr));
+				InSerializedObject,
+				InSerializedProperty));
 		}
 	}
 	else
@@ -179,25 +233,94 @@ void FArchiveStackTrace::Serialize(void* InData, int64 Num)
 		const int32 StackIgnoreCount = 4;
 #endif
 
+		static struct FBreakAtOffsetSettings
+		{
+			FString PackageToBreakOn;
+			int64 OffsetToBreakOn;
+
+			FBreakAtOffsetSettings()
+				: OffsetToBreakOn(-1)
+			{
+				if (!FParse::Param(FCommandLine::Get(), TEXT("cooksinglepackage")))
+				{
+					return;
+				}
+
+				FString Package;
+				if (!FParse::Value(FCommandLine::Get(), TEXT("map="), Package))
+				{
+					return;
+				}
+
+				int64 Offset;
+				if (!FParse::Value(FCommandLine::Get(), TEXT("diffonlybreakoffset="), Offset) || Offset <= 0)
+				{
+					return;
+				}
+
+				OffsetToBreakOn = Offset;
+				PackageToBreakOn = TEXT("/") + FPackageName::GetShortName(Package);
+			}
+		} BreakAtOffsetSettings;
+
 		int64 CurrentOffset = Tell();
 
+		if (BreakAtOffsetSettings.OffsetToBreakOn >= 0 && BreakAtOffsetSettings.OffsetToBreakOn >= CurrentOffset && BreakAtOffsetSettings.OffsetToBreakOn < CurrentOffset + Num)
+		{
+			FString ArcName = GetArchiveName();
+			int32 SubnameIndex = ArcName.Find(BreakAtOffsetSettings.PackageToBreakOn, ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+			if (SubnameIndex >= 0)
+			{
+				int32 SubnameEndIndex = SubnameIndex + BreakAtOffsetSettings.PackageToBreakOn.Len();
+				if (SubnameEndIndex == ArcName.Len() || ArcName[SubnameEndIndex] == TEXT('.'))
+				{
+					UE_DEBUG_BREAK();
+				}
+			}
+		}
+
 		// Walk the stack and dump it to the allocated memory.
 		bool bShouldCollectCallstack = bCollectCallstacks && (DiffMap == nullptr || IsInDiffMap(CurrentOffset)) && !GIgnoreDiffManager.ShouldIgnoreDiff();
 		if (bShouldCollectCallstack)
 		{
 			StackTrace[0] = '\0';
 			FPlatformStackWalk::StackWalkAndDump(StackTrace, StackTraceSize, StackIgnoreCount);
+#if WITH_EDITOR
+			//if we have a debug name stack, plaster it onto the end of the current stack buffer so that it's a part of the unique stack entry.
+			if (DebugDataStack.Num() > 0)
+			{
+				FCStringAnsi::Strcat(StackTrace, StackTraceSize, DebugDataStackMarker);
+
+				const FString SubIndent = FString(FDiffFormatHelper::Get().Indent) + FString(TEXT("    "));
+
+				bool bIsIndenting = true;
+				for (const auto& DebugData : DebugDataStack)
+				{
+					if (bIsIndenting)
+					{
+						FCStringAnsi::Strcat(StackTrace, StackTraceSize, TCHAR_TO_ANSI(*SubIndent));
+					}
+					FCStringAnsi::Strcat(StackTrace, StackTraceSize, DebugData.GetPlainANSIString());
+
+					//these are special-cased, as we assume they'll be followed by object/property names and want the names on the same line for readability's sake.
+					const bool bIsPropertyLabel = (DebugData == TEXT("SerializeScriptProperties") || DebugData == TEXT("PropertySerialize") || DebugData == TEXT("SerializeTaggedProperty"));
+					const ANSICHAR* const LineEnd = bIsPropertyLabel ? ": " : "\r\n";
+					FCStringAnsi::Strcat(StackTrace, StackTraceSize, LineEnd);
+					bIsIndenting = !bIsPropertyLabel;
+				}
+			}
+#endif
 			// Make sure we compare the new stack trace with the last one in the next if statement
 			bCallstacksDirty = true;
 		}
-		
+
 		if (LastSerializeCallstack == nullptr || (bCallstacksDirty && FCStringAnsi::Strcmp(LastSerializeCallstack, StackTrace) != 0))
-		{			
+		{
 			uint32 CallstackCRC = 0;
 			if (CallstackAtOffsetMap.Num() == 0 || CurrentOffset > CallstackAtOffsetMap.Last().Offset)
 			{
 				// New data serialized at the end of archive buffer
-				LastSerializeCallstack = AddUniqueCallstack(StackTrace, ThreadContext.SerializedObject, GetSerializedProperty(), CallstackCRC);
+				LastSerializeCallstack = AddUniqueCallstack(ThreadContext.SerializedObject, GetSerializedProperty(), CallstackCRC);
 				CallstackAtOffsetMap.Add(FCallstactAtOffset(CurrentOffset, CallstackCRC, GIgnoreDiffManager.ShouldIgnoreDiff()));
 			}
 			else
@@ -206,9 +329,9 @@ void FArchiveStackTrace::Serialize(void* InData, int64 Num)
 				int32 CallstackToUpdateIndex = GetCallstackAtOffset(CurrentOffset, 0);
 				check(CallstackToUpdateIndex != -1);
 				FCallstactAtOffset& CallstackToUpdate = CallstackAtOffsetMap[CallstackToUpdateIndex];
-				LastSerializeCallstack = AddUniqueCallstack(StackTrace, ThreadContext.SerializedObject, GetSerializedProperty(), CallstackCRC);
+				LastSerializeCallstack = AddUniqueCallstack(ThreadContext.SerializedObject, GetSerializedProperty(), CallstackCRC);
 				if (CallstackToUpdate.Offset == CurrentOffset)
-				{					
+				{
 					CallstackToUpdate.Callstack = CallstackCRC;
 				}
 				else
@@ -216,7 +339,7 @@ void FArchiveStackTrace::Serialize(void* InData, int64 Num)
 					// Insert a new callstack
 					check(CallstackToUpdate.Offset < CurrentOffset);
 					CallstackAtOffsetMap.Insert(FCallstactAtOffset(CurrentOffset, CallstackCRC, GIgnoreDiffManager.ShouldIgnoreDiff()), CallstackToUpdateIndex + 1);
-				}			
+				}
 			}
 			check(CallstackCRC != 0 || !bShouldCollectCallstack);
 		}
@@ -324,11 +447,51 @@ bool FArchiveStackTrace::LoadPackageIntoMemory(const TCHAR* InFilename, FPackage
 	return true;
 }
 
-void FArchiveStackTrace::CompareWithInternal(const FPackageData& SourcePackage, const FPackageData& DestPackage, const TCHAR* AssetFilename, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, int32& InOutDiffsLogged, FArchiveDiffStats& OutStats)
+namespace
+{
+	bool ShouldDumpPropertyValueState(UProperty* Prop)
+	{
+		if (Prop->IsA<UNumericProperty>()
+			|| Prop->IsA<UStrProperty>()
+			|| Prop->IsA<UBoolProperty>()
+			|| Prop->IsA<UNameProperty>())
+		{
+			return true;
+		}
+
+		if (UArrayProperty* ArrayProp = Cast<UArrayProperty>(Prop))
+		{
+			return ShouldDumpPropertyValueState(ArrayProp->Inner);
+		}
+
+		if (UMapProperty* MapProp = Cast<UMapProperty>(Prop))
+		{
+			return ShouldDumpPropertyValueState(MapProp->KeyProp) && ShouldDumpPropertyValueState(MapProp->ValueProp);
+		}
+
+		if (USetProperty* SetProp = Cast<USetProperty>(Prop))
+		{
+			return ShouldDumpPropertyValueState(SetProp->ElementProp);
+		}
+
+		if (UStructProperty* StructProp = Cast<UStructProperty>(Prop))
+		{
+			if (StructProp->Struct == TBaseStructure<FVector>::Get()
+				|| StructProp->Struct == TBaseStructure<FGuid>::Get())
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
+
+void FArchiveStackTrace::CompareWithInternal(const FPackageData& SourcePackage, const FPackageData& DestPackage, const TCHAR* AssetFilename, const TCHAR* CallstackCutoffText, const int64 MaxDiffsToLog, int32& InOutDiffsLogged, TMap<FName, FArchiveDiffStats>& OutStats)
 {
 #if !NO_LOGGING
-	const int32 Indent = FOutputDeviceHelper::FormatLogLine(ELogVerbosity::Warning, LogArchiveDiff.GetCategoryName(), TEXT(""), GPrintLogTimes).Len();
-	const TCHAR* CALLSTACK_LINE_TERMINATOR = TEXT("\n"); // because LINE_TERMINATOR doesn't work well wit EC
+	const TCHAR* const Indent = FDiffFormatHelper::Get().Indent;
+	const TCHAR* const LineTerminator = FDiffFormatHelper::Get().LineTerminator;
 	const int64 SourceSize = SourcePackage.Size - SourcePackage.StartOffset;
 	const int64 DestSize = DestPackage.Size - DestPackage.StartOffset;
 	const int64 SizeToCompare = FMath::Min(SourceSize, DestSize);
@@ -336,13 +499,15 @@ void FArchiveStackTrace::CompareWithInternal(const FPackageData& SourcePackage,
 	if (SourceSize != DestSize)
 	{
 		UE_LOG(LogArchiveDiff, Warning, TEXT("%s: Size mismatch: on disk: %lld vs memory: %lld"), AssetFilename, SourceSize, DestSize);
-		OutStats.DiffSize += DestPackage.Size - SourcePackage.Size;
+		int64 SizeDiff = DestPackage.Size - SourcePackage.Size;
+		OutStats.FindOrAdd(AssetClass).DiffSize += SizeDiff;
 	}
 
 	FString LastDifferenceCallstackDataText;
 	int32 LastDifferenceCallstackOffsetIndex = -1;
-	int32 NumDiffsLocal = 0;
-	int32 NumDiffsLoggedLocal = 0;
+	int64 NumDiffsLocal = 0;
+	int64 NumDiffsLoggedLocal = 0;
+	int64 FirstUnreportedDiffIndex = -1;
 
 	for (int64 LocalOffset = 0; LocalOffset < SizeToCompare; ++LocalOffset)
 	{
@@ -358,52 +523,135 @@ void FArchiveStackTrace::CompareWithInternal(const FPackageData& SourcePackage,
 				{
 					const FCallstactAtOffset& CallstackAtOffset = CallstackAtOffsetMap[DifferenceCallstackoffsetIndex];
 					const FCallstackData& DifferenceCallstackData = UniqueCallstacks[CallstackAtOffset.Callstack];
-					FString DifferenceCallstackDataText = DifferenceCallstackData.ToString(CallstackCutoffText, Indent);
+					FString DifferenceCallstackDataText = DifferenceCallstackData.ToString(CallstackCutoffText);
 					if (LastDifferenceCallstackDataText.Compare(DifferenceCallstackDataText, ESearchCase::CaseSensitive) != 0)
 					{
-						if (CallstackAtOffset.bIgnore == false && (MaxDiffsToLog < 0 || InOutDiffsLogged < MaxDiffsToLog))
+						if (!CallstackAtOffset.bIgnore && (MaxDiffsToLog < 0 || InOutDiffsLogged < MaxDiffsToLog))
 						{
-							UE_LOG(LogArchiveDiff, Warning, TEXT("%s: Difference at offset %lld%s, callstack:%s%s%s"),
+							FString BeforePropertyVal;
+							FString AfterPropertyVal;
+							if (UProperty* SerProp = DifferenceCallstackData.SerializedProp)
+							{
+								if (SourceSize == DestSize && ShouldDumpPropertyValueState(SerProp))
+								{
+									// Walk backwards until we find a callstack which wasn't from the given property
+									int32 OffsetX = DestAbsoluteOffset;
+									for (;;)
+									{
+										if (OffsetX == 0)
+										{
+											break;
+										}
+
+										int32 CallstackIndex = GetCallstackAtOffset(OffsetX - 1, 0);
+
+										const FCallstactAtOffset& PreviousCallstack = CallstackAtOffsetMap[CallstackIndex];
+										if (UniqueCallstacks[PreviousCallstack.Callstack].SerializedProp != SerProp)
+										{
+											break;
+										}
+
+										--OffsetX;
+									}
+
+									FPropertyTempVal SourceVal(SerProp);
+									FPropertyTempVal DestVal  (SerProp);
+
+									FStaticMemoryReader SourceReader(&SourcePackage.Data[SourceAbsoluteOffset - (DestAbsoluteOffset - OffsetX)], SourcePackage.Size - SourceAbsoluteOffset);
+									FStaticMemoryReader DestReader(&DestPackage.Data[OffsetX], DestPackage.Size - DestAbsoluteOffset);
+
+									SourceVal.Serialize(SourceReader);
+									DestVal  .Serialize(DestReader);
+
+									if (!SourceReader.ArIsError && !DestReader.ArIsError)
+									{
+										SourceVal.ExportText(BeforePropertyVal);
+										DestVal  .ExportText(AfterPropertyVal);
+									}
+								}
+							}
+
+							FString DiffValues;
+							if (BeforePropertyVal != AfterPropertyVal)
+							{
+								DiffValues = FString::Printf(TEXT("\r\n%sBefore: %s\r\n%sAfter:  %s"), Indent, *BeforePropertyVal, Indent, *AfterPropertyVal);
+							}
+
+							FString DebugDataStackText;
+#if WITH_EDITOR
+							//check for a debug data stack as part of the unique stack entry, and log it out if we find it.
+							FString FullStackText = DifferenceCallstackData.Callstack;
+							int32 DebugDataIndex = FullStackText.Find(ANSI_TO_TCHAR(DebugDataStackMarker), ESearchCase::CaseSensitive);
+							if (DebugDataIndex > 0)
+							{
+								DebugDataStackText = FString::Printf(TEXT("\r\n%s"), FDiffFormatHelper::Get().Indent) + FullStackText.RightChop(DebugDataIndex + 2);
+							}
+#endif
+							UE_LOG(
+								LogArchiveDiff,
+								Warning,
+								TEXT("%s: Difference at offset %lld%s (absolute offset: %lld), callstack:%s%s%s%s%s"),
 								AssetFilename,
 								CallstackAtOffset.Offset - DestPackage.StartOffset,
 								DestAbsoluteOffset > CallstackAtOffset.Offset ? *FString::Printf(TEXT("(+%lld)"), DestAbsoluteOffset - CallstackAtOffset.Offset) : TEXT(""),
-								CALLSTACK_LINE_TERMINATOR, CALLSTACK_LINE_TERMINATOR, *DifferenceCallstackDataText);
+								DestAbsoluteOffset,
+								LineTerminator,
+								LineTerminator,
+								*DifferenceCallstackDataText,
+								*DiffValues,
+								*DebugDataStackText
+							);
 							InOutDiffsLogged++;
 							NumDiffsLoggedLocal++;
 						}
+						else if (FirstUnreportedDiffIndex == -1)
+						{
+							FirstUnreportedDiffIndex = DestAbsoluteOffset;
+						}
 						LastDifferenceCallstackDataText = MoveTemp(DifferenceCallstackDataText);
-						OutStats.NumDiffs++;
+						OutStats.FindOrAdd(AssetClass).NumDiffs++;
 						NumDiffsLocal++;
 					}
 				}
 				else if (DifferenceCallstackoffsetIndex < 0)
 				{
-					UE_LOG(LogArchiveDiff, Warning, TEXT("%s: Difference at offset %lld, unknown callstack"), AssetFilename, LocalOffset);
+					UE_LOG(LogArchiveDiff, Warning, TEXT("%s: Difference at offset %lld (absolute offset: %lld), unknown callstack"), AssetFilename, LocalOffset, DestAbsoluteOffset);
 				}
 				LastDifferenceCallstackOffsetIndex = DifferenceCallstackoffsetIndex;
 			}
 			else
 			{
 				// Each byte will count as a difference but without callstack data there's no way around it
-				OutStats.NumDiffs++;
+				OutStats.FindOrAdd(AssetClass).NumDiffs++;
 				NumDiffsLocal++;
+				if (FirstUnreportedDiffIndex == -1)
+				{
+					FirstUnreportedDiffIndex = DestAbsoluteOffset;
+				}
 			}
-			OutStats.DiffSize++;
+			OutStats.FindOrAdd(AssetClass).DiffSize++;
 		}
 	}
 
 	if (MaxDiffsToLog >= 0 && NumDiffsLocal > NumDiffsLoggedLocal)
 	{
-		UE_LOG(LogArchiveDiff, Warning, TEXT("%s: %lld difference(s) not logged."), AssetFilename, NumDiffsLocal - NumDiffsLoggedLocal);
+		if (FirstUnreportedDiffIndex != -1)
+		{
+			UE_LOG(LogArchiveDiff, Warning, TEXT("%s: %lld difference(s) not logged (first at absolute offset: %lld)."), AssetFilename, NumDiffsLocal - NumDiffsLoggedLocal, FirstUnreportedDiffIndex);
+		}
+		else
+		{
+			UE_LOG(LogArchiveDiff, Warning, TEXT("%s: %lld difference(s) not logged."), AssetFilename, NumDiffsLocal - NumDiffsLoggedLocal);
+		}
 	}
 #endif
 }
 
-void FArchiveStackTrace::CompareWith(const TCHAR* InFilename, const int64 TotalHeaderSize, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, FArchiveDiffStats& OutStats)
+void FArchiveStackTrace::CompareWith(const TCHAR* InFilename, const int64 TotalHeaderSize, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, TMap<FName, FArchiveDiffStats>& OutStats)
 {
 	FPackageData SourcePackage;
 
-	OutStats.NewFileTotalSize = TotalSize();
+	OutStats.FindOrAdd(AssetClass).NewFileTotalSize = TotalSize();
 
 	if (LoadPackageIntoMemory(InFilename, SourcePackage))
 	{	
@@ -417,48 +665,108 @@ void FArchiveStackTrace::CompareWith(const TCHAR* InFilename, const int64 TotalH
 
 		int32 NumLoggedDiffs = 0;
 
+		FPackageData SourcePackageHeader = SourcePackage;
+		SourcePackageHeader.Size = SourcePackageHeader.HeaderSize;
+		SourcePackageHeader.HeaderSize = 0;
+		SourcePackageHeader.StartOffset = 0;
+
+		FPackageData DestPackageHeader = DestPackage;
+		DestPackageHeader.Size = TotalHeaderSize;
+		DestPackageHeader.HeaderSize = 0;
+		DestPackageHeader.StartOffset = 0;
+
+		CompareWithInternal(SourcePackageHeader, DestPackageHeader, InFilename, CallstackCutoffText, MaxDiffsToLog, NumLoggedDiffs, OutStats);
+
+		if (TotalHeaderSize > 0 && OutStats.FindOrAdd(AssetClass).NumDiffs > 0)
 		{
-			FPackageData SourcePackageHeader = SourcePackage;
-			SourcePackageHeader.Size = SourcePackageHeader.HeaderSize;
-			SourcePackageHeader.HeaderSize = 0;
-			SourcePackageHeader.StartOffset = 0;
-
-			FPackageData DestPackageHeader = DestPackage;
-			DestPackageHeader.Size = TotalHeaderSize;
-			DestPackageHeader.HeaderSize = 0;
-			DestPackageHeader.StartOffset = 0;
-
-			CompareWithInternal(SourcePackageHeader, DestPackageHeader, InFilename, CallstackCutoffText, MaxDiffsToLog, NumLoggedDiffs, OutStats);
+			DumpPackageHeaderDiffs(SourcePackage, DestPackage, InFilename, MaxDiffsToLog);
 		}
 
+		FPackageData SourcePackageExports = SourcePackage;
+		SourcePackageExports.HeaderSize = 0;
+		SourcePackageExports.StartOffset = SourcePackage.HeaderSize;
+
+		FPackageData DestPackageExports = DestPackage;
+		DestPackageExports.HeaderSize = 0;
+		DestPackageExports.StartOffset = TotalHeaderSize;
+
+		FString AssetName;
+		if (DestPackage.HeaderSize > 0)
 		{
-			FPackageData SourcePackageExports = SourcePackage;
-			SourcePackageExports.HeaderSize = 0;
-			SourcePackageExports.StartOffset = SourcePackage.HeaderSize;
-
-			FPackageData DestPackageExports = DestPackage;
-			DestPackageExports.HeaderSize = 0;
-			DestPackageExports.StartOffset = TotalHeaderSize;
-
-			FString AssetName;
-			if (DestPackage.HeaderSize > 0)
-			{
-				AssetName = FPaths::ChangeExtension(InFilename, TEXT("uexp"));
-			}
-			else
-			{
-				AssetName = InFilename;
-			}
-
-			CompareWithInternal(SourcePackageExports, DestPackageExports, *AssetName, CallstackCutoffText, MaxDiffsToLog, NumLoggedDiffs, OutStats);
+			AssetName = FPaths::ChangeExtension(InFilename, TEXT("uexp"));
 		}
-		
+		else
+		{
+			AssetName = InFilename;
+		}
+
+		CompareWithInternal(SourcePackageExports, DestPackageExports, *AssetName, CallstackCutoffText, MaxDiffsToLog, NumLoggedDiffs, OutStats);
+
+		// Optionally save out any differences we detected.
+		const FArchiveDiffStats& Stats = OutStats.FindOrAdd(AssetClass);
+		if (Stats.NumDiffs > 0)
+		{
+			static struct FDiffOutputSettings
+			{
+				FString DiffOutputDir;
+
+				FDiffOutputSettings()
+				{
+					FString Dir;
+					if (!FParse::Value(FCommandLine::Get(), TEXT("diffoutputdir="), Dir))
+					{
+						return;
+					}
+
+					FPaths::NormalizeDirectoryName(Dir);
+					DiffOutputDir = MoveTemp(Dir) + TEXT("/");
+				}
+			} DiffOutputSettings;
+
+			// Only save out the differences if we have a -diffoutputdir set.
+			if (!DiffOutputSettings.DiffOutputDir.IsEmpty())
+			{
+				FString OutputFilename = FPaths::ConvertRelativePathToFull(InFilename);
+				FString SavedDir       = FPaths::ConvertRelativePathToFull(FPaths::ProjectSavedDir());
+				if (OutputFilename.StartsWith(SavedDir))
+				{
+					OutputFilename.ReplaceInline(*SavedDir, *DiffOutputSettings.DiffOutputDir);
+
+					IFileManager& FileManager = IFileManager::Get();
+
+					// Copy the original asset as '.before.uasset'.
+					{
+						TUniquePtr<FArchive> DiffUAssetArchive(FileManager.CreateFileWriter(*FPaths::SetExtension(OutputFilename, TEXT(".before.") + FPaths::GetExtension(InFilename))));
+						DiffUAssetArchive->Serialize(SourcePackageHeader.Data + SourcePackageHeader.StartOffset, SourcePackageHeader.Size - SourcePackageHeader.StartOffset);
+					}
+					{
+						TUniquePtr<FArchive> DiffUExpArchive(FileManager.CreateFileWriter(*FPaths::SetExtension(OutputFilename, TEXT(".before.uexp"))));
+						DiffUExpArchive->Serialize(SourcePackageExports.Data + SourcePackageExports.StartOffset, SourcePackageExports.Size - SourcePackageExports.StartOffset);
+					}
+
+					// Save out the in-memory data as '.after.uasset'.
+					{
+						TUniquePtr<FArchive> DiffUAssetArchive(FileManager.CreateFileWriter(*FPaths::SetExtension(OutputFilename, TEXT(".after.") + FPaths::GetExtension(InFilename))));
+						DiffUAssetArchive->Serialize(DestPackageHeader.Data + DestPackageHeader.StartOffset, DestPackageHeader.Size - DestPackageHeader.StartOffset);
+					}
+					{
+						TUniquePtr<FArchive> DiffUExpArchive(FileManager.CreateFileWriter(*FPaths::SetExtension(OutputFilename, TEXT(".after.uexp"))));
+						DiffUExpArchive->Serialize(DestPackageExports.Data + DestPackageExports.StartOffset, DestPackageExports.Size - DestPackageExports.StartOffset);
+					}
+				}
+				else
+				{
+					UE_LOG(LogArchiveDiff, Warning, TEXT("Package '%s' doesn't seem to be writing to the Saved directory - skipping writing diff"), *OutputFilename);
+				}
+			}
+		}
+
 		FMemory::Free(SourcePackage.Data);
 	}
 	else
 	{		
 		UE_LOG(LogArchiveDiff, Warning, TEXT("New package: %s"), *GetArchiveName());
-		OutStats.DiffSize = OutStats.NewFileTotalSize;
+		OutStats.FindOrAdd(AssetClass).DiffSize = OutStats.FindOrAdd(AssetClass).NewFileTotalSize;
 	}
 }
 
@@ -603,3 +911,464 @@ bool FArchiveStackTrace::IsIdentical(const TCHAR* InFilename, int64 BufferSize,
 	return bIdentical;
 }
 
+FLinkerLoad* FArchiveStackTrace::CreateLinkerForPackage(const FString& InPackageName, const FString& InFilename, const FPackageData& PackageData)
+{
+	// First create a temp package to associate the linker with
+	UPackage* Package = FindObjectFast<UPackage>(nullptr, *InPackageName);
+	if (!Package)
+	{
+		Package = CreatePackage(nullptr, *InPackageName);
+	}
+	// Create an archive for the linker. The linker will take ownership of it.
+	FLargeMemoryReader* PackageReader = new FLargeMemoryReader(PackageData.Data, PackageData.Size, ELargeMemoryReaderFlags::None, *InPackageName);	
+	FLinkerLoad* Linker = FLinkerLoad::CreateLinker(Package, *InFilename, LOAD_NoVerify, PackageReader);
+
+	if (Linker && Package)
+	{
+		Package->SetPackageFlags(PKG_ForDiffing);
+	}
+
+	return Linker;
+}
+
+bool ComparePackageIndices(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const FPackageIndex& SourceIndex, const FPackageIndex& DestIndex, bool bMoveOnly);
+
+template <typename T>
+bool CompareTableItem(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const T& SourceItem, const T& DestItem, bool bMoveOnly)
+{
+	check(false);
+	return false;
+}
+
+template <typename T>
+FString ConvertItemToText(const T& Item, FLinkerLoad* Linker)
+{
+	check(false);
+	return TEXT("");
+}
+
+template<>
+bool CompareTableItem(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const FName& SourceName, const FName& DestName, bool bMoveOnly)
+{
+	return SourceName == DestName;
+}
+
+template<>
+FString ConvertItemToText(const FName& Name, FLinkerLoad* Linker)
+{
+	return Name.ToString();
+}
+
+template<>
+bool CompareTableItem(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const FObjectImport& SourceImport, const FObjectImport& DestImport, bool bMoveOnly)
+{
+	if (SourceImport.ObjectName != DestImport.ObjectName ||
+		SourceImport.ClassName != DestImport.ClassName ||
+		SourceImport.ClassPackage != DestImport.ClassPackage ||
+		!ComparePackageIndices(SourceLinker, DestLinker, SourceImport.OuterIndex, DestImport.OuterIndex, bMoveOnly))
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+static uint32 GetTypeHash(const FObjectImport& Import)
+{
+	return HashCombine(GetTypeHash(Import.ObjectName), HashCombine(GetTypeHash(Import.OuterIndex), GetTypeHash(Import.ClassName)));
+}
+
+static bool IsImportMapIdentical(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker)
+{
+	bool bIdentical = (SourceLinker->ImportMap.Num() == DestLinker->ImportMap.Num());
+	if (bIdentical)
+	{
+		for (int32 ImportIndex = 0; ImportIndex < SourceLinker->ImportMap.Num(); ++ImportIndex)
+		{
+			if (!CompareTableItem<FObjectImport>(SourceLinker, DestLinker, SourceLinker->ImportMap[ImportIndex], DestLinker->ImportMap[ImportIndex], false))
+			{
+				bIdentical = false;
+				break;
+			}
+		}
+	}
+	return bIdentical;
+}
+
+template <>
+FString ConvertItemToText(const FObjectImport& Import, FLinkerLoad* Linker)
+{
+	return FString::Printf(TEXT("%s %s.%s"),
+		*Import.ClassName.ToString(),
+		!Import.OuterIndex.IsNull() ? *Linker->ImpExp(Import.OuterIndex).ObjectName.ToString() : TEXT("NULL"),
+		*Import.ObjectName.ToString());
+}
+
+template <>
+bool CompareTableItem(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const FObjectExport& SourceExport, const FObjectExport& DestExport, bool bMoveOnly)
+{
+	if (SourceExport.ObjectName != DestExport.ObjectName ||
+		SourceExport.TemplateIndex != DestExport.TemplateIndex ||
+		SourceExport.PackageGuid != DestExport.PackageGuid ||
+		SourceExport.PackageFlags != DestExport.PackageFlags ||
+		SourceExport.ObjectFlags != DestExport.ObjectFlags ||
+		SourceExport.SerialSize != DestExport.SerialSize ||
+		(!bMoveOnly && SourceExport.SerialOffset != DestExport.SerialOffset) || // Offset will be different when two otherwise identical exports are re-arranged
+		SourceExport.bForcedExport != DestExport.bForcedExport ||
+		SourceExport.bNotForClient != DestExport.bNotForClient ||
+		SourceExport.bNotForServer != DestExport.bNotForServer ||
+		SourceExport.bNotAlwaysLoadedForEditorGame != DestExport.bNotAlwaysLoadedForEditorGame ||
+		SourceExport.bIsAsset != DestExport.bIsAsset ||
+		SourceExport.FirstExportDependency != DestExport.FirstExportDependency ||
+		SourceExport.SerializationBeforeSerializationDependencies != DestExport.SerializationBeforeSerializationDependencies ||
+		SourceExport.CreateBeforeSerializationDependencies != DestExport.CreateBeforeSerializationDependencies ||
+		SourceExport.SerializationBeforeCreateDependencies != DestExport.SerializationBeforeCreateDependencies ||
+		SourceExport.CreateBeforeCreateDependencies != DestExport.CreateBeforeCreateDependencies ||
+		!ComparePackageIndices(SourceLinker, DestLinker, SourceExport.OuterIndex, DestExport.OuterIndex, bMoveOnly) ||
+		!ComparePackageIndices(SourceLinker, DestLinker, SourceExport.ClassIndex, DestExport.ClassIndex, bMoveOnly) ||
+		!ComparePackageIndices(SourceLinker, DestLinker, SourceExport.SuperIndex, DestExport.SuperIndex, bMoveOnly))
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+bool ComparePackageIndices(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker, const FPackageIndex& SourceIndex, const FPackageIndex& DestIndex, bool bMoveOnly)
+{
+	if (SourceIndex.IsNull() && DestIndex.IsNull())
+	{
+		return true;
+	}
+
+	if (SourceIndex.IsExport() && DestIndex.IsExport())
+	{
+		int32 SourceArrayIndex = SourceIndex.ToExport();
+		int32 DestArrayIndex   = DestIndex  .ToExport();
+
+		if (!SourceLinker->ExportMap.IsValidIndex(SourceArrayIndex) || !DestLinker->ExportMap.IsValidIndex(DestArrayIndex))
+		{
+			UE_LOG(LogArchiveDiff, Warning, TEXT("Invalid export indices found, source: %d (of %d), dest: %d (of %d)"), SourceArrayIndex, SourceLinker->ExportMap.Num(), DestArrayIndex, DestLinker->ExportMap.Num());
+			return false;
+		}
+
+		const FObjectExport& SourceOuterExport = SourceLinker->Exp(SourceIndex);
+		const FObjectExport& DestOuterExport   = DestLinker  ->Exp(DestIndex);
+
+		return CompareTableItem(SourceLinker, DestLinker, SourceOuterExport, DestOuterExport, bMoveOnly);
+	}
+
+	if (SourceIndex.IsImport() && DestIndex.IsImport())
+	{
+		int32 SourceArrayIndex = SourceIndex.ToImport();
+		int32 DestArrayIndex   = DestIndex  .ToImport();
+
+		if (!SourceLinker->ImportMap.IsValidIndex(SourceArrayIndex) || !DestLinker->ImportMap.IsValidIndex(DestArrayIndex))
+		{
+			UE_LOG(LogArchiveDiff, Warning, TEXT("Invalid import indices found, source: %d (of %d), dest: %d (of %d)"), SourceArrayIndex, SourceLinker->ExportMap.Num(), DestArrayIndex, DestLinker->ExportMap.Num());
+			return false;
+		}
+
+		const FObjectImport& SourceOuterImport = SourceLinker->Imp(SourceIndex);
+		const FObjectImport& DestOuterImport   = DestLinker  ->Imp(DestIndex);
+
+		return CompareTableItem(SourceLinker, DestLinker, SourceOuterImport, DestOuterImport, bMoveOnly);
+	}
+
+	return false;
+}
+
+static uint32 GetTypeHash(const FObjectExport& Export)
+{
+	return HashCombine(GetTypeHash(Export.ObjectName), 
+		HashCombine(GetTypeHash(Export.OuterIndex), 
+			HashCombine(GetTypeHash(Export.ClassIndex), GetTypeHash(Export.SuperIndex))));
+}
+
+template <>
+FString ConvertItemToText(const FObjectExport& Export, FLinkerLoad* Linker)
+{
+	FName ClassName = Export.ClassIndex.IsNull() ? FName(NAME_Class) : Linker->ImpExp(Export.ClassIndex).ObjectName;
+	return FString::Printf(TEXT("%s %s.%s Super: %d, Template: %d, Flags: %d, Size: %lld, Offset: %lld"),
+		*ClassName.ToString(),
+		!Export.OuterIndex.IsNull() ? *Linker->ImpExp(Export.OuterIndex).ObjectName.ToString() : *FPackageName::GetShortName(Linker->LinkerRoot),
+		*Export.ObjectName.ToString(),
+		Export.SuperIndex.ForDebugging(),
+		Export.TemplateIndex.ForDebugging(),
+		(int32)Export.ObjectFlags,
+		Export.SerialSize,
+		Export.SerialOffset);
+}
+
+static bool IsExportMapIdentical(FLinkerLoad* SourceLinker, FLinkerLoad* DestLinker)
+{
+	bool bIdentical = (SourceLinker->ExportMap.Num() == DestLinker->ExportMap.Num());
+	if (bIdentical)
+	{
+		for (int32 ExportIndex = 0; ExportIndex < SourceLinker->ExportMap.Num(); ++ExportIndex)
+		{
+			if (CompareTableItem<FObjectExport>(SourceLinker, DestLinker, SourceLinker->ExportMap[ExportIndex], DestLinker->ExportMap[ExportIndex], false))
+			{
+				bIdentical = false;
+				break;
+			}
+		}
+	}
+	return bIdentical;
+}
+
+static void ForceKillPackageAndLinker(FLinkerLoad* Linker)
+{
+	UPackage* Package = Linker->LinkerRoot;
+	Linker->Detach();
+	FLinkerManager::Get().RemoveLinker(Linker);
+	if (Package)
+	{
+		Package->ClearPackageFlags(PKG_ContainsMapData | PKG_ContainsMap);
+		Package->SetInternalFlags(EInternalObjectFlags::PendingKill);
+	}
+}
+
+// This is sad, but we can't pass data to the keyfuncs
+namespace
+{
+	FLinkerLoad* GSourceLinker = nullptr;
+	FLinkerLoad* GDestLinker   = nullptr;
+}
+
+/** Structure that holds an item from the NameMap/ImportMap/ExportMap in a TSet for diffing */
+template <typename T>
+struct TTableItem
+{
+	/** Pointer to the original item */
+	const T* Item;
+	/** Index in the original *Map (table). Only for information purposes. */
+	int32 Index;
+
+	TTableItem(const T* InItem, int32 InIndex)
+		: Item(InItem)
+		, Index(InIndex)
+	{}
+	TTableItem()
+		: Item(nullptr)
+		, Index(-1)
+	{}
+
+	FORCENOINLINE friend uint32 GetTypeHash(const TTableItem& TableItem)
+	{
+		// Only get the item hash, ignore Index completely
+		return GetTypeHash(*TableItem.Item);
+	}
+	FORCENOINLINE bool operator == (const TTableItem& Other) const
+	{
+		// Only compare the item, ignore Index completely
+		return CompareTableItem(GSourceLinker, GDestLinker, *Item, *Other.Item, false);
+	}
+};
+
+/** Dumps differences between Linker tables */
+template <typename T>
+static void DumpTableDifferences(
+	FLinkerLoad* SourceLinker, 
+	FLinkerLoad* DestLinker, 
+	TArray<T>& SourceTable, 
+	TArray<T>& DestTable,
+	const TCHAR* AssetFilename,
+	const TCHAR* ItemName,
+	const int32 MaxDiffsToLog
+)
+{
+#if !NO_LOGGING
+	const TCHAR* const LineTerminator = FDiffFormatHelper::Get().LineTerminator;
+	const TCHAR* const Indent = FDiffFormatHelper::Get().Indent;
+
+	FString HumanReadableString;
+	int32 LoggedDiffs = 0;
+	int32 NumDiffs = 0;
+
+	TGuardValue<FLinkerLoad*> SourceLinkerGuard(GSourceLinker, SourceLinker);
+	TGuardValue<FLinkerLoad*> DestLinkerGuard  (GDestLinker,   DestLinker);
+
+	TSet<TTableItem<T>> SourceSet;
+	TSet<TTableItem<T>> DestSet;
+
+	SourceSet.Reserve(SourceTable.Num());
+	DestSet.Reserve(DestTable.Num());
+
+	for (int32 Index = 0; Index < SourceTable.Num(); ++Index)
+	{
+		SourceSet.Add(TTableItem<T>(&SourceTable[Index], Index));
+	}
+	for (int32 Index = 0; Index < DestTable.Num(); ++Index)
+	{
+		DestSet.Add(TTableItem<T>(&DestTable[Index], Index));
+	}
+
+	// Determine the list of items removed from the source package and added to the dest package
+	TArray<TTableItem<T>> RemovedItems = SourceSet.Difference(DestSet).Array();
+	TArray<TTableItem<T>> AddedItems = DestSet.Difference(SourceSet).Array();
+
+	// Now find all items from the above lists that were simply moved to a different index
+	TArray<TKeyValuePair<int32, TTableItem<T>>> MovedItems;
+	MovedItems.Reserve(FMath::Max(RemovedItems.Num(), AddedItems.Num()));
+	for (int32 RemovedItemIndex = RemovedItems.Num() - 1; RemovedItemIndex >= 0; --RemovedItemIndex)
+	{
+		const TTableItem<T>& RemovedItem = RemovedItems[RemovedItemIndex];
+		for (int32 AddedItemIndex = AddedItems.Num() - 1; AddedItemIndex >= 0; --AddedItemIndex)
+		{
+			const TTableItem<T>& AddedItem = AddedItems[AddedItemIndex];
+			// Special compare case here since we don't want to compare item properties that we know change when the item is moved
+			if (CompareTableItem(SourceLinker, DestLinker, *RemovedItem.Item, *AddedItem.Item, true))
+			{
+				MovedItems.Add(TKeyValuePair<int32, TTableItem<T>>(RemovedItem.Index, AddedItem));
+				RemovedItems.RemoveAt(RemovedItemIndex);
+				AddedItems.RemoveAt(AddedItemIndex);
+				break;
+			}
+		}
+	}
+
+	// Dump all changes
+	for (const TTableItem<T>& RemovedItem : RemovedItems)
+	{
+		HumanReadableString += Indent;
+		HumanReadableString += FString::Printf(TEXT("-[%d] %s"), RemovedItem.Index, *ConvertItemToText<T>(*RemovedItem.Item, SourceLinker));
+		HumanReadableString += LineTerminator;
+	}
+	for (const TTableItem<T>& AddedItem : AddedItems)
+	{
+		HumanReadableString += Indent;
+		HumanReadableString += FString::Printf(TEXT("+[%d] %s"), AddedItem.Index, *ConvertItemToText<T>(*AddedItem.Item, DestLinker));
+		HumanReadableString += LineTerminator;
+	}
+// This generates a lot of noise about different offsets/indices, which doesn't help us find what we're looking for  - removed for now
+#if 0
+	for (int32 MovedItemIndex = MovedItems.Num() - 1; MovedItemIndex >= 0; --MovedItemIndex)
+	{
+		TKeyValuePair<int32, TTableItem<T>>& MovedItem = MovedItems[MovedItemIndex];
+		HumanReadableString += Indent;
+		HumanReadableString += FString::Printf(TEXT(" [%d] -> [%d] %s"), MovedItem.Key, MovedItem.Value.Index, *ConvertItemToText<T>(*MovedItem.Value.Item, SourceLinker));
+		HumanReadableString += LineTerminator;
+	}
+#endif
+
+	// For now just log everything out. When this becomes too spammy, respect the MaxDiffsToLog parameter
+	NumDiffs = RemovedItems.Num() + AddedItems.Num();
+	LoggedDiffs = NumDiffs;
+
+	if (NumDiffs > LoggedDiffs)
+	{
+		HumanReadableString += Indent;
+		HumanReadableString += FString::Printf(TEXT("+ %d differences not logged."), (NumDiffs - LoggedDiffs));
+		HumanReadableString += LineTerminator;
+	}
+
+	UE_LOG(
+		LogArchiveDiff,
+		Warning,
+		TEXT("%s: %sMap is different (%d %ss in source package vs %d %ss in dest package):%s%s"),		
+		AssetFilename,
+		ItemName,
+		SourceTable.Num(),
+		ItemName,
+		DestTable.Num(),
+		ItemName,
+		LineTerminator,
+		*HumanReadableString);
+#endif // !NO_LOGGING
+}
+
+
+void FArchiveStackTrace::DumpPackageHeaderDiffs(const FPackageData& SourcePackage, const FPackageData& DestPackage, const FString& AssetFilename, const int32 MaxDiffsToLog)
+{
+#if !NO_LOGGING
+	FString AssetPathName = FPaths::Combine(*FPaths::GetPath(AssetFilename.Mid(AssetFilename.Find(TEXT(":"), ESearchCase::CaseSensitive) + 1)), *FPaths::GetBaseFilename(AssetFilename));
+	FString SourceAssetPackageName = FPaths::Combine(TEXT("/Memory"), TEXT("/SourceForDiff"), *AssetPathName);
+	FString DestAssetPackageName = FPaths::Combine(TEXT("/Memory"), TEXT("/DestForDiff"), *AssetPathName);
+
+	TGuardValue<bool> GuardIsSavingPackage(GIsSavingPackage, false);
+	TGuardValue<bool> GuardAllowUnversionedContentInEditor(GAllowUnversionedContentInEditor, true);
+
+	// Create linkers. Note there's no need to clean them up here since they will be removed by the package associated with them
+	BeginLoad();
+	FLinkerLoad* SourceLinker = CreateLinkerForPackage(SourceAssetPackageName, AssetFilename, SourcePackage);
+	EndLoad();
+
+	BeginLoad();
+	FLinkerLoad* DestLinker = CreateLinkerForPackage(DestAssetPackageName, AssetFilename, DestPackage);
+	EndLoad();
+
+	if (SourceLinker && DestLinker)
+	{
+		if (SourceLinker->NameMap != DestLinker->NameMap)
+		{
+			DumpTableDifferences<FName>(SourceLinker, DestLinker, SourceLinker->NameMap, DestLinker->NameMap, *AssetFilename, TEXT("Name"), MaxDiffsToLog);
+		}
+
+		if (!IsImportMapIdentical(SourceLinker, DestLinker))
+		{
+			DumpTableDifferences<FObjectImport>(SourceLinker, DestLinker, SourceLinker->ImportMap, DestLinker->ImportMap, *AssetFilename, TEXT("Import"), MaxDiffsToLog);
+		}
+
+		if (!IsExportMapIdentical(SourceLinker, DestLinker))
+		{
+			DumpTableDifferences<FObjectExport>(SourceLinker, DestLinker, SourceLinker->ExportMap, DestLinker->ExportMap, *AssetFilename, TEXT("Export"), MaxDiffsToLog);
+		}
+	}
+
+	if (SourceLinker)
+	{
+		ForceKillPackageAndLinker(SourceLinker);
+	}
+	if (DestLinker)
+	{
+		ForceKillPackageAndLinker(DestLinker);
+	}
+#endif // !NO_LOGGING
+}
+
+FArchiveStackTraceReader::FArchiveStackTraceReader(const TCHAR* InFilename, const uint8* InData, const int64 Num)
+	: FLargeMemoryReader(InData, Num, ELargeMemoryReaderFlags::TakeOwnership, InFilename)
+	, ThreadContext(FUObjectThreadContext::Get())
+{
+
+}
+
+void FArchiveStackTraceReader::Serialize(void* OutData, int64 Num)
+{
+	bool bAddData = true;
+	FSerializeData NewData(Tell(), Num, ThreadContext.SerializedObject, GetSerializedProperty());
+	if (SerializeTrace.Num())
+	{
+		FSerializeData& Last = SerializeTrace.Last();
+		if (Last != NewData)
+		{
+			SerializeTrace.Add(NewData);
+		}
+		else
+		{
+			Last.Size += Num;
+			Last.Count++;
+		}
+	}
+	else
+	{		
+		SerializeTrace.Add(NewData);
+	} 
+	FLargeMemoryReader::Serialize(OutData, Num);
+}
+
+FArchiveStackTraceReader* FArchiveStackTraceReader::CreateFromFile(const TCHAR* InFilename)
+{
+	FArchiveStackTraceReader* Reader = nullptr;
+	FArchiveStackTrace::FPackageData PackageData;
+	if (FArchiveStackTrace::LoadPackageIntoMemory(InFilename, PackageData))
+	{
+		Reader = new FArchiveStackTraceReader(InFilename, PackageData.Data, PackageData.Size);
+	}
+	return Reader;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoading.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoading.cpp
index 96029dcf5f8e..f137641e380b 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoading.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoading.cpp
@@ -82,6 +82,7 @@ DECLARE_STATS_GROUP(TEXT("Async Load Game Thread"), STATGROUP_AsyncLoadGameThrea
 DECLARE_CYCLE_STAT(TEXT("PostLoadObjects GT"), STAT_FAsyncPackage_PostLoadObjectsGameThread, STATGROUP_AsyncLoadGameThread);
 DECLARE_CYCLE_STAT(TEXT("TickAsyncLoading GT"), STAT_FAsyncPackage_TickAsyncLoadingGameThread, STATGROUP_AsyncLoadGameThread);
 DECLARE_CYCLE_STAT(TEXT("Flush Async Loading GT"), STAT_FAsyncPackage_FlushAsyncLoadingGameThread, STATGROUP_AsyncLoadGameThread);
+DECLARE_FLOAT_ACCUMULATOR_STAT(TEXT("Total PostLoadObjects time GT"), STAT_FAsyncPackage_TotalPostLoadGameThread, STATGROUP_AsyncLoadGameThread);
 
 DECLARE_FLOAT_ACCUMULATOR_STAT( TEXT( "Async loading block time" ), STAT_AsyncIO_AsyncLoadingBlockingTime, STATGROUP_AsyncIO );
 DECLARE_FLOAT_ACCUMULATOR_STAT( TEXT( "Async package precache wait time" ), STAT_AsyncIO_AsyncPackagePrecacheWaitTime, STATGROUP_AsyncIO );
@@ -1707,6 +1708,15 @@ FORCEINLINE static bool FileOpenLogActive()
 #endif
 }
 
+FORCEINLINE static bool CanAddWaitingPackages()
+{
+	//for now, we're only capping off WaitingPackages with -fileopenlog, as per FORT-78563. however, problems are bound to manifest here in any case
+	//marked by pathological load time performance, and this does not cover the "excessive load times when loading deployed, uncompressed data" case.
+	//applying a sane cap in all circumstances would not be a terrible idea.
+	const int32 MaxWaitingPackageCount = 1024;
+	return !FileOpenLogActive() || GPrecacheCallbackHandler.WaitingPackages.Num() < MaxWaitingPackageCount;
+}
+
 void FAsyncLoadingThread::QueueEvent_CreateLinker(FAsyncPackage* Package, int32 EventSystemPriority)
 {
 	FileOpenLogActive();  // make sure GRandomizeLoadOrder is set up
@@ -3749,7 +3759,7 @@ EAsyncPackageState::Type FAsyncPackage::ProcessImportsAndExports_Event()
 			break; // requeue this to give other packages a chance to start IO
 		}
 		bDidSomething = false;
-		if (PrecacheRequests.Num() < 2 && ExportsThatCanHaveIOStarted.Num())
+		if (PrecacheRequests.Num() < 2 && ExportsThatCanHaveIOStarted.Num() && CanAddWaitingPackages())
 		{
 			bDidSomething = true;
 			StartPrecacheRequest();
@@ -3811,7 +3821,7 @@ EAsyncPackageState::Type FAsyncPackage::ProcessImportsAndExports_Event()
 		{
 			continue; // check time limit, and lets do the creates before the serialize checks
 		}
-		if (ExportsThatCanHaveIOStarted.Num())
+		if (ExportsThatCanHaveIOStarted.Num() && CanAddWaitingPackages())
 		{
 			bDidSomething = true;
 			StartPrecacheRequest();
@@ -4773,7 +4783,7 @@ EAsyncPackageState::Type FAsyncLoadingThread::TickAsyncLoading(bool bUseTimeLimi
 		{
 			Result = ProcessLoadedPackages(bUseTimeLimit, bUseFullTimeLimit, TimeLimit, bDidSomething, FlushTree);
 			TimeLimitUsedForProcessLoaded = FPlatformTime::Seconds() - TickStartTime;
-			UE_CLOG(bUseTimeLimit && TimeLimitUsedForProcessLoaded > .1f, LogStreaming, Warning, TEXT("Took %6.2fms to ProcessLoadedPackages"), float(TimeLimitUsedForProcessLoaded) * 1000.0f);
+			UE_CLOG(!GIsEditor && bUseTimeLimit && TimeLimitUsedForProcessLoaded > .1f, LogStreaming, Warning, TEXT("Took %6.2fms to ProcessLoadedPackages"), float(TimeLimitUsedForProcessLoaded) * 1000.0f);
 		}
 
 		if (!bIsMultithreaded && Result != EAsyncPackageState::TimeOut && !IsTimeLimitExceeded(TickStartTime, bUseTimeLimit, TimeLimit, TEXT("ProcessLoadedPackages")))
@@ -4884,16 +4894,17 @@ FAsyncLoadingThread::FAsyncLoadingThread()
 	CancelLoadingEvent = FPlatformProcess::GetSynchEventFromPool();
 	ThreadSuspendedEvent = FPlatformProcess::GetSynchEventFromPool();
 	ThreadResumedEvent = FPlatformProcess::GetSynchEventFromPool();
-	if ((!GEventDrivenLoaderEnabled || !USE_EVENT_DRIVEN_ASYNC_LOAD_AT_BOOT_TIME) && FAsyncLoadingThread::ShouldBeMultithreaded())
+	if ((!GEventDrivenLoaderEnabled || !USE_EVENT_DRIVEN_ASYNC_LOAD_AT_BOOT_TIME) && FAsyncLoadingThread::GetAsyncLoadingThreadSettings().bAsyncLoadingThreadEnabled)
 	{
 		StartThread();
 	}
 	AsyncLoadingTickCounter = 0;
 
 #if !IS_PROGRAM && !WITH_EDITORONLY_DATA
-	UE_LOG(LogStreaming, Display, TEXT("Async Loading initialized: Event Driven Loader: %s, Async Loading Thread: %s"),
+	UE_LOG(LogStreaming, Display, TEXT("Async Loading initialized: Event Driven Loader: %s, Async Loading Thread: %s, Async Post Load: %s"),
 		GEventDrivenLoaderEnabled ? TEXT("true") : TEXT("false"),
-		FAsyncLoadingThread::ShouldBeMultithreaded() ? TEXT("true") : TEXT("false"));
+		FAsyncLoadingThread::GetAsyncLoadingThreadSettings().bAsyncLoadingThreadEnabled ? TEXT("true") : TEXT("false"),
+		FAsyncLoadingThread::GetAsyncLoadingThreadSettings().bAsyncPostLoadEnabled ? TEXT("true") : TEXT("false"));
 #endif
 }
 
@@ -4921,36 +4932,42 @@ FAsyncLoadingThread::~FAsyncLoadingThread()
 	ThreadResumedEvent = nullptr;	
 }
 
-bool FAsyncLoadingThread::ShouldBeMultithreaded()
+FAsyncLoadingThread::FAsyncLoadingThreadSettings::FAsyncLoadingThreadSettings()
 {
-	static struct FAsyncLoadingThreadEnabled
-	{
-		bool Value;
-		FORCENOINLINE FAsyncLoadingThreadEnabled()
-		{
 #if THREADSAFE_UOBJECTS
-			if (FPlatformProperties::RequiresCookedData())
-			{
-				check(GConfig);
-				bool bConfigValue = true;
-				GConfig->GetBool(TEXT("/Script/Engine.StreamingSettings"), TEXT("s.AsyncLoadingThreadEnabled"), bConfigValue, GEngineIni);
-				bool bCommandLineNoAsyncThread = FParse::Param(FCommandLine::Get(), TEXT("NoAsyncLoadingThread"));
-				bool bCommandLineAsyncThread = FParse::Param(FCommandLine::Get(), TEXT("AsyncLoadingThread"));
-				Value = bCommandLineAsyncThread || (bConfigValue && FApp::ShouldUseThreadingForPerformance() && !bCommandLineNoAsyncThread);
-			}
-			else
+	if (FPlatformProperties::RequiresCookedData())
+	{
+		check(GConfig);
+
+		bool bConfigValue = true;
+		GConfig->GetBool(TEXT("/Script/Engine.StreamingSettings"), TEXT("s.AsyncLoadingThreadEnabled"), bConfigValue, GEngineIni);
+		bool bCommandLineDisable = FParse::Param(FCommandLine::Get(), TEXT("NoAsyncLoadingThread"));
+		bool bCommandLineEnable = FParse::Param(FCommandLine::Get(), TEXT("AsyncLoadingThread"));
+		bAsyncLoadingThreadEnabled = bCommandLineEnable || (bConfigValue && FApp::ShouldUseThreadingForPerformance() && !bCommandLineDisable);
+
+		bConfigValue = true;
+		GConfig->GetBool(TEXT("/Script/Engine.StreamingSettings"), TEXT("s.AsyncPostLoadEnabled"), bConfigValue, GEngineIni);
+		bCommandLineDisable = FParse::Param(FCommandLine::Get(), TEXT("NoAsyncPostLoad"));
+		bCommandLineEnable = FParse::Param(FCommandLine::Get(), TEXT("AsyncPostLoad"));
+		bAsyncPostLoadEnabled = bCommandLineEnable || (bConfigValue && FApp::ShouldUseThreadingForPerformance() && !bCommandLineDisable);
+	}
+	else
 #endif
-			{
-				Value = false;
-			}
-		}
-	} AsyncLoadingThreadEnabled;
-	return AsyncLoadingThreadEnabled.Value;
+	{
+		bAsyncLoadingThreadEnabled = false;
+		bAsyncPostLoadEnabled = false;
+	}
+}
+
+FAsyncLoadingThread::FAsyncLoadingThreadSettings& FAsyncLoadingThread::GetAsyncLoadingThreadSettings()
+{
+	static FAsyncLoadingThreadSettings Settings;
+	return Settings;
 }
 
 void FAsyncLoadingThread::StartThread()
 {
-	if (!Thread && FAsyncLoadingThread::ShouldBeMultithreaded())
+	if (!Thread && FAsyncLoadingThread::GetAsyncLoadingThreadSettings().bAsyncLoadingThreadEnabled)
 	{
 		UE_LOG(LogStreaming, Log, TEXT("Starting Async Loading Thread."));
 		bThreadStarted = true;
@@ -5604,14 +5621,14 @@ EAsyncPackageState::Type FAsyncPackage::TickAsyncPackage(bool InbUseTimeLimit, b
 			{
 				SCOPED_LOADTIMER(Package_PreLoadObjects);
 				LoadingState = PreLoadObjects();
-				}
+			}
 		} // !GEventDrivenLoaderEnabled
 
 		if (LoadingState == EAsyncPackageState::Complete && !bLoadHasFailed)
-				{
+		{
 			SCOPED_LOADTIMER(Package_ExternalReadDependencies);
 			LoadingState = FinishExternalReadDependencies();
-			}
+		}
 
 		// Call PostLoad on objects, this could cause new objects to be loaded that require
 		// another iteration of the PreLoad loop.
@@ -6327,6 +6344,22 @@ EAsyncPackageState::Type FAsyncPackage::FinishExternalReadDependencies()
 	return EAsyncPackageState::Complete;
 }
 
+/** Checks if the object can have PostLoad called on the Async Loading Thread */
+static bool CanPostLoadOnAsyncLoadingThread(UObject* Object)
+{
+	if (Object->IsPostLoadThreadSafe())
+	{
+		bool bCanPostLoad = true;
+		// All outers should also be safe to call PostLoad on ALT
+		for (UObject* Outer = Object->GetOuter(); Outer && bCanPostLoad; Outer = Outer->GetOuter())
+		{
+			bCanPostLoad = !Outer->HasAnyFlags(RF_NeedPostLoad) || Outer->IsPostLoadThreadSafe();
+		}
+		return bCanPostLoad;
+	}
+	return false;
+}
+
 /**
  * Route PostLoad to all loaded objects. This might load further objects!
  *
@@ -6359,13 +6392,16 @@ EAsyncPackageState::Type FAsyncPackage::PostLoadObjects()
 		PreLoadIndex = PackageObjLoaded.Num(); // we did preloading in a different way and never incremented this
 	}
 
+	const bool bAsyncPostLoadEnabled = FAsyncLoadingThread::GetAsyncLoadingThreadSettings().bAsyncPostLoadEnabled;
+	const bool bIsMultithreaded = AsyncLoadingThread.IsMultithreaded();
+
 	// PostLoad objects.
 	while (PostLoadIndex < PackageObjLoaded.Num() && PostLoadIndex < PreLoadIndex && !IsTimeLimitExceeded())
 	{
 		UObject* Object = PackageObjLoaded[PostLoadIndex++];
 		if (Object)
 		{
-			if (!FAsyncLoadingThread::Get().IsMultithreaded() || Object->IsPostLoadThreadSafe())
+			if (!bIsMultithreaded || (bAsyncPostLoadEnabled && CanPostLoadOnAsyncLoadingThread(Object)))
 			{
 				SCOPED_ACCUM_LOADTIME(PostLoad, StaticGetNativeClassName(Object->GetClass()));
 
@@ -6423,6 +6459,8 @@ EAsyncPackageState::Type FAsyncPackage::PostLoadDeferredObjects(double InTickSta
 	TArray<UObject*>& ObjLoadedInPostLoad = PackageScope.ThreadContext.ObjLoaded;
 	TArray<UObject*> ObjLoadedInPostLoadLocal;
 
+	STAT(double PostLoadStartTime = FPlatformTime::Seconds());
+
 	while (DeferredPostLoadIndex < DeferredPostLoadObjects.Num() && 
 		!AsyncLoadingThread.IsAsyncLoadingSuspended() &&
 		!::IsTimeLimitExceeded(InTickStartTime, bInUseTimeLimit, InOutTimeLimit, LastTypeOfWorkPerformed, LastObjectWorkWasPerformedOn))
@@ -6472,6 +6510,8 @@ EAsyncPackageState::Type FAsyncPackage::PostLoadDeferredObjects(double InTickSta
 		UpdateLoadPercentage();
 	}
 
+	INC_FLOAT_STAT_BY(STAT_FAsyncPackage_TotalPostLoadGameThread, (float)(FPlatformTime::Seconds() - PostLoadStartTime));
+
 	// New objects might have been loaded during PostLoad.
 	Result = (DeferredPostLoadIndex == DeferredPostLoadObjects.Num()) ? EAsyncPackageState::Complete : EAsyncPackageState::TimeOut;
 	if (Result == EAsyncPackageState::Complete)
@@ -7074,6 +7114,11 @@ void ResumeAsyncLoadingInternal()
 	FAsyncLoadingThread::Get().ResumeLoading();
 }
 
+bool IsAsyncLoadingSuspendedInternal()
+{
+	return FAsyncLoadingThread::Get().IsAsyncLoadingSuspended();
+}
+
 bool IsEventDrivenLoaderEnabledInCookedBuilds()
 {
 	static struct FEventDrivenLoaderEnabledInCookedBuildsInit
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoadingThread.h b/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoadingThread.h
index 1d278c880ee9..31fa9edbd923 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoadingThread.h
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/AsyncLoadingThread.h
@@ -142,6 +142,15 @@ struct FMaxPackageSummarySize
  */
 class FAsyncLoadingThread : public FRunnable
 {
+	/** Structure that holds the async loading thread ini settings */
+	struct FAsyncLoadingThreadSettings
+	{
+		bool bAsyncLoadingThreadEnabled;
+		bool bAsyncPostLoadEnabled;
+
+		FAsyncLoadingThreadSettings();
+	};
+
 	/** Thread to run the worker FRunnable on */
 	FRunnableThread* Thread;
 	/** Stops this thread */
@@ -286,8 +295,9 @@ public:
 	/** [EDL] Queues StartPostLoad event */
 	void QueueEvent_StartPostLoad(FAsyncPackage* Pkg, int32 EventSystemPriority = 0);
 
-	/** True if multithreaded async loading should be used. */
-	static bool ShouldBeMultithreaded();
+	/** Gets the ALT settigns from ini (or command line). */
+	static FAsyncLoadingThreadSettings& GetAsyncLoadingThreadSettings();
+
 	/** True if multithreaded async loading is currently being used. */
 	static FORCEINLINE bool IsMultithreaded()
 	{
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/BulkData.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/BulkData.cpp
index 454fdf72a4f0..f86c055cd2c8 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/BulkData.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/BulkData.cpp
@@ -905,10 +905,15 @@ void FUntypedBulkData::Serialize( FArchive& Ar, UObject* Owner, int32 Idx )
 						SerializeBulkData(Ar, BulkData.Get());
 					}
 				}
+				else if (BulkDataFlags & BULKDATA_OptionalPayload)
+				{
+					Filename = FPaths::ChangeExtension(Filename, TEXT(".uptnl"));
+				}
 				else if (BulkDataFlags & BULKDATA_PayloadInSeperateFile)
 				{
 					Filename = FPaths::ChangeExtension(Filename, TEXT(".ubulk"));
 				}
+				
 			}
 			// Serialize the bulk data right away.
 			else
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataReader.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataReader.cpp
index 033b9be7b4c2..759c9ccd257c 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataReader.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataReader.cpp
@@ -25,8 +25,8 @@ FDuplicateDataReader::FDuplicateDataReader( class FUObjectAnnotationSparse<FDupl
 	, ObjectData(InObjectData)
 	, Offset(0)
 {
-	ArIsLoading			= true;
-	ArIsPersistent		= true;
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
 	ArPortFlags |= PPF_Duplicate | InPortFlags;
 
 #if USE_STABLE_LOCALIZATION_KEYS
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataWriter.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataWriter.cpp
index b2766c3b9706..795902b4806d 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataWriter.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/DuplicateDataWriter.cpp
@@ -31,8 +31,8 @@ FDuplicateDataWriter::FDuplicateDataWriter( FUObjectAnnotationSparse<FDuplicated
 , ApplyInternalFlags(InApplyInternalFlags)
 , InstanceGraph(InInstanceGraph)
 {
-	ArIsSaving			= true;
-	ArIsPersistent		= true;
+	this->SetIsSaving(true);
+	this->SetIsPersistent(true);
 	ArAllowLazyLoading	= false;
 	ArPortFlags |= PPF_Duplicate | InPortFlags;
 
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveInputFormatter.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveInputFormatter.cpp
index dadac7b2d3ec..3f7ec9ad01b6 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveInputFormatter.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveInputFormatter.cpp
@@ -17,7 +17,7 @@ FJsonArchiveInputFormatter::FJsonArchiveInputFormatter(FArchive& InInner, TFunct
 	: Inner(InInner)
 	, ResolveObjectName(InResolveObjectName)
 {
-	Inner.ArIsTextFormat = true;
+	Inner.SetIsTextFormat(true);
 	Inner.ArAllowLazyLoading = false;
 
 	TSharedPtr< FJsonObject > RootObject;
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveOutputFormatter.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveOutputFormatter.cpp
index 3972634750df..5866cd6f0074 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveOutputFormatter.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/JsonArchiveOutputFormatter.cpp
@@ -16,7 +16,7 @@ FJsonArchiveOutputFormatter::FJsonArchiveOutputFormatter(FArchive& InInner)
 	: Inner(InInner)
 	, Newline(LINE_TERMINATOR_ANSI, ARRAY_COUNT(LINE_TERMINATOR_ANSI) - 1)
 {
-	Inner.ArIsTextFormat = true;
+	Inner.SetIsTextFormat(true);
 
 	bNeedsComma = false;
 	bNeedsNewline = false;
@@ -143,49 +143,49 @@ void FJsonArchiveOutputFormatter::LeaveMapElement()
 
 void FJsonArchiveOutputFormatter::Serialize(uint8& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(uint16& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(uint32& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(uint64& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(int8& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(int16& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(int32& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(int64& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(float& Value)
 {
 	if((float)(int)Value == Value)
 	{
-		WriteValue(Lex::ToString((int)Value));
+		WriteValue(LexToString((int)Value));
 	}
 	else
 	{
@@ -203,7 +203,7 @@ void FJsonArchiveOutputFormatter::Serialize(double& Value)
 {
 	if((double)(int)Value == Value)
 	{
-		WriteValue(Lex::ToString((int)Value));
+		WriteValue(LexToString((int)Value));
 	}
 	else
 	{
@@ -219,7 +219,7 @@ void FJsonArchiveOutputFormatter::Serialize(double& Value)
 
 void FJsonArchiveOutputFormatter::Serialize(bool& Value)
 {
-	WriteValue(Lex::ToString(Value));
+	WriteValue(LexToString(Value));
 }
 
 void FJsonArchiveOutputFormatter::Serialize(FString& Value)
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveInputFormatter.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveInputFormatter.cpp
index 0ef47612480a..a5e082d4f6f1 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveInputFormatter.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveInputFormatter.cpp
@@ -10,7 +10,7 @@ FTaggedBinaryArchiveInputFormatter::FTaggedBinaryArchiveInputFormatter(FArchive&
 	, NextRecordIdx(0)
 	, CurrentType(EArchiveValueType::None)
 {
-	Inner.ArIsTextFormat = true;
+	Inner.SetIsTextFormat(true);
 
 	int64 StartOffset = Inner.Tell();
 
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveOutputFormatter.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveOutputFormatter.cpp
index 4429cb27a1ed..4dc640818a3b 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveOutputFormatter.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/Formatters/TaggedBinaryArchiveOutputFormatter.cpp
@@ -10,7 +10,7 @@ FTaggedBinaryArchiveOutputFormatter::FTaggedBinaryArchiveOutputFormatter(FArchiv
 	, StartOffset(Inner.Tell())
 	, NextRecordIdx(0)
 {
-	Inner.ArIsTextFormat = true;
+	Inner.SetIsTextFormat(true);
 
 	int64 NamesOffset = 0;
 	Inner << NamesOffset;
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/PropertyLocalizationDataGathering.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/PropertyLocalizationDataGathering.cpp
index ca5651b873aa..7edc3eaaa918 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/PropertyLocalizationDataGathering.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/PropertyLocalizationDataGathering.cpp
@@ -16,6 +16,9 @@
 FPropertyLocalizationDataGatherer::FPropertyLocalizationDataGatherer(TArray<FGatherableTextData>& InOutGatherableTextDataArray, const UPackage* const InPackage, EPropertyLocalizationGathererResultFlags& OutResultFlags)
 	: GatherableTextDataArray(InOutGatherableTextDataArray)
 	, Package(InPackage)
+#if USE_STABLE_LOCALIZATION_KEYS
+	, PackageNamespace(TextNamespaceUtil::GetPackageNamespace(InPackage))
+#endif	// USE_STABLE_LOCALIZATION_KEYS
 	, ResultFlags(OutResultFlags)
 	, AllObjectsInPackage()
 {
@@ -363,6 +366,17 @@ void FPropertyLocalizationDataGatherer::GatherTextInstance(const FText& Text, co
 	// Always include the text without its package localization ID
 	const FString CleanNamespace = TextNamespaceUtil::StripPackageNamespace(Namespace);
 	AddGatheredText(CleanNamespace, Key, SourceData, bIsEditorOnly);
+
+#if USE_STABLE_LOCALIZATION_KEYS
+	// Sanity check that the text we gathered has the expected package localization ID
+	{
+		const FString TextPackageNamespace = TextNamespaceUtil::ExtractPackageNamespace(Namespace);
+		if (!TextPackageNamespace.IsEmpty() && !TextPackageNamespace.Equals(PackageNamespace, ESearchCase::CaseSensitive))
+		{
+			ResultFlags |= EPropertyLocalizationGathererResultFlags::HasTextWithInvalidPackageLocalizationID;
+		}
+	}
+#endif // USE_STABLE_LOCALIZATION_KEYS
 }
 
 struct FGatherTextFromScriptBytecode
diff --git a/Engine/Source/Runtime/CoreUObject/Private/Serialization/TextReferenceCollector.cpp b/Engine/Source/Runtime/CoreUObject/Private/Serialization/TextReferenceCollector.cpp
index 930756ff36b7..8e9840cf39cf 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/Serialization/TextReferenceCollector.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/Serialization/TextReferenceCollector.cpp
@@ -17,8 +17,8 @@ public:
 		, SourceToMatch(&InTextSource)
 		, Count(&OutCount)
 	{
-		ArIsSaving = true;
-		ArIsPersistent = true; // Skips transient properties
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true); // Skips transient properties
 		ArShouldSkipBulkData = true; // Skips bulk data as we can't handle saving that!
 
 		// Build up the list of objects that are within our package - we won't follow object references to things outside of our package
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/Class.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/Class.cpp
index c4a410556e98..af1bd34eb72f 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/Class.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/Class.cpp
@@ -34,9 +34,11 @@
 #include "UObject/StructScriptLoader.h"
 #include "UObject/PropertyHelper.h"
 #include "UObject/CoreRedirects.h"
+#include "Internationalization/PolyglotTextData.h"
 #include "Serialization/ArchiveScriptReferenceCollector.h"
 #include "Serialization/ArchiveUObjectFromStructuredArchive.h"
 #include "UObject/FrameworkObjectVersion.h"
+#include "UObject/GarbageCollection.h"
 
 // This flag enables some expensive class tree validation that is meant to catch mutations of 
 // the class tree outside of SetSuperStruct. It has been disabled because loading blueprints 
@@ -2588,6 +2590,153 @@ FString UScriptStruct::GetStructCPPName() const
 	return FString::Printf(TEXT("F%s"), *GetName());
 }
 
+#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+
+struct FScriptStructTestWrapper
+{
+public:
+	FScriptStructTestWrapper(UScriptStruct* InStruct, uint8 InitValue = 0xFD)
+		: ScriptStruct(InStruct)
+		, TempBuffer(nullptr)
+	{
+		if (ScriptStruct->IsNative())
+		{
+			UScriptStruct::ICppStructOps* StructOps = ScriptStruct->GetCppStructOps();
+
+			// Make one
+			if ((StructOps != nullptr) && StructOps->HasZeroConstructor())
+			{
+				// These structs have basically promised to be used safely, not going to audit them
+			}
+			else
+			{
+				// Allocate space for the struct
+				const int32 RequiredAllocSize = ScriptStruct->GetStructureSize();
+				TempBuffer = (uint8*)FMemory::Malloc(RequiredAllocSize, ScriptStruct->GetMinAlignment());
+
+				// The following section is a partial duplication of ScriptStruct->InitializeStruct, except we initialize with 0xFD instead of 0x00
+				FMemory::Memset(TempBuffer, InitValue, RequiredAllocSize);
+
+				int32 InitializedSize = 0;
+				if (StructOps != nullptr)
+				{
+					StructOps->Construct(TempBuffer);
+					InitializedSize = StructOps->GetSize();
+				}
+
+				if (ScriptStruct->PropertiesSize > InitializedSize)
+				{
+					bool bHitBase = false;
+					for (UProperty* Property = ScriptStruct->PropertyLink; Property && !bHitBase; Property = Property->PropertyLinkNext)
+					{
+						if (!Property->IsInContainer(InitializedSize))
+						{
+							Property->InitializeValue_InContainer(TempBuffer);
+						}
+						else
+						{
+							bHitBase = true;
+						}
+					}
+				}
+
+				if (ScriptStruct->StructFlags & STRUCT_PostScriptConstruct)
+				{
+					check(StructOps);
+					StructOps->PostScriptConstruct(TempBuffer);
+				}
+			}
+		}
+	}
+
+	~FScriptStructTestWrapper()
+	{
+		if (TempBuffer != nullptr)
+		{
+			// Destroy it
+			ScriptStruct->DestroyStruct(TempBuffer);
+			FMemory::Free(TempBuffer);
+		}
+	}
+
+	static bool CanRunTests(UScriptStruct* Struct)
+	{
+		return (Struct != nullptr) && Struct->IsNative() && (!Struct->GetCppStructOps() || !Struct->GetCppStructOps()->HasZeroConstructor());
+	}
+
+	uint8* GetData() { return TempBuffer; }
+private:
+	UScriptStruct* ScriptStruct;
+	uint8* TempBuffer;
+};
+
+void AttemptToFindUninitializedScriptStructPointers()
+{
+	for (TObjectIterator<UScriptStruct> ScriptIt; ScriptIt; ++ScriptIt)
+	{
+		UScriptStruct* ScriptStruct = *ScriptIt;
+		if (FScriptStructTestWrapper::CanRunTests(ScriptStruct))
+		{
+			FScriptStructTestWrapper WrapperFF(ScriptStruct, 0xFF);
+			FScriptStructTestWrapper Wrapper00(ScriptStruct, 0x00);
+			FScriptStructTestWrapper WrapperAA(ScriptStruct, 0xAA);
+			FScriptStructTestWrapper Wrapper55(ScriptStruct, 0x55);
+
+			const void* BadPointer = (void*)0xFFFFFFFFFFFFFFFFull;
+			
+			for (const UProperty* Property : TFieldRange<UProperty>(ScriptStruct, EFieldIteratorFlags::ExcludeSuper))
+			{
+				if (const UObjectPropertyBase* ObjectProperty = Cast<const UObjectPropertyBase>(Property))
+				{
+					// Check any reflected pointer properties to make sure they got initialized
+					const UObject* PropValue = ObjectProperty->GetObjectPropertyValue_InContainer(WrapperFF.GetData());
+					if (PropValue == BadPointer)
+					{
+						UE_LOG(LogClass, Warning, TEXT("%s%s::%s is not initialized properly"), ScriptStruct->GetPrefixCPP(), *ScriptStruct->GetName(), *Property->GetNameCPP());
+					}
+				}
+				else if (const UBoolProperty* BoolProperty = Cast<const UBoolProperty>(Property))
+				{
+					// Check for uninitialized boolean properties (done separately to deal with byte-wide booleans that would evaluate to true with either 0x55 or 0xAA)
+					const bool Value0 = BoolProperty->GetPropertyValue_InContainer(Wrapper00.GetData());
+					const bool Value1 = BoolProperty->GetPropertyValue_InContainer(WrapperFF.GetData());
+
+					if (Value0 != Value1)
+					{
+						UE_LOG(LogClass, Warning, TEXT("%s%s::%s is not initialized properly"), ScriptStruct->GetPrefixCPP(), *ScriptStruct->GetName(), *Property->GetNameCPP());
+					}
+				}
+				else if (Property->IsA(UNameProperty::StaticClass()))
+				{
+					// Skip some other types that will crash in equality with garbage data
+					//@TODO: Shouldn't need to skip FName, it's got a default ctor that initializes correctly...
+				}
+				else
+				{
+					// Catch all remaining properties
+					if (!Property->Identical_InContainer(WrapperAA.GetData(), Wrapper55.GetData()))
+					{
+						UE_LOG(LogClass, Warning, TEXT("%s%s::%s is not initialized properly"), ScriptStruct->GetPrefixCPP(), *ScriptStruct->GetName(), *Property->GetNameCPP());
+					}
+				}
+			}
+		}
+	}
+}
+
+#include "HAL/IConsoleManager.h"
+
+FAutoConsoleCommandWithWorldAndArgs GCmdListBadScriptStructs(
+	TEXT("CoreUObject.AttemptToFindUninitializedScriptStructMembers"),
+	TEXT("Finds USTRUCT() structs that fail to initialize reflected member variables"),
+	FConsoleCommandWithWorldAndArgsDelegate::CreateStatic(
+		[](const TArray<FString>& Params, UWorld* World)
+{
+	AttemptToFindUninitializedScriptStructPointers();
+}));
+
+#endif
+
 IMPLEMENT_CORE_INTRINSIC_CLASS(UScriptStruct, UStruct,
 	{
 	}
@@ -3094,6 +3243,7 @@ void UClass::PostLoad()
 
 	if (!HasAnyClassFlags(CLASS_Native))
 	{
+		ClassFlags &= ~CLASS_ReplicationDataIsSetUp;
 		SetUpRuntimeReplicationData();
 	}
 }
@@ -3137,11 +3287,12 @@ void UClass::Link(FArchive& Ar, bool bRelinkExistingProperties)
 
 void UClass::SetUpRuntimeReplicationData()
 {
-	if (PropertyLink != NULL)
+	if (!HasAnyClassFlags(CLASS_ReplicationDataIsSetUp) && PropertyLink != NULL)
 	{
 		NetFields.Empty();
 		if (UClass* SuperClass = GetSuperClass())
 		{
+			SuperClass->SetUpRuntimeReplicationData();
 			ClassReps = SuperClass->ClassReps;
 		}
 		else
@@ -3215,6 +3366,8 @@ void UClass::SetUpRuntimeReplicationData()
 			}
 		};
 		Sort(NetFields.GetData(), NetFields.Num(), FCompareUFieldNames());
+
+		ClassFlags |= CLASS_ReplicationDataIsSetUp;
 	}
 }
 
@@ -4347,6 +4500,10 @@ const FString UClass::GetConfigName() const
 		UE_LOG(LogClass, Fatal,TEXT("UObject::GetConfigName() called on class with config name 'None'. Class flags = 0x%08X"), (uint32)ClassFlags );
 		return TEXT("");
 	}
+	else if (ClassConfigName == NAME_GameUserSettings)
+	{
+		return GGameUserSettingsIni;
+	}
 	else
 	{
 		// generate the class ini name, and make sure it's up to date
@@ -4447,7 +4604,7 @@ void UClass::PrependStreamWithSuperClass(UClass& SuperClass)
 {
 	ReferenceTokenStream.PrependStream(SuperClass.ReferenceTokenStream);
 
-#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+#if ENABLE_GC_OBJECT_CHECKS
 	DebugTokenMap.PrependWithSuperClass(SuperClass);
 #endif
 }
@@ -4693,6 +4850,17 @@ void UFunction::Serialize( FArchive& Ar )
 	}
 }
 
+void UFunction::PostLoad()
+{
+	Super::PostLoad();
+
+	UClass* const OwningClass = GetOuterUClass();
+	if (OwningClass && HasAnyFunctionFlags(FUNC_Net))
+	{
+		OwningClass->ClassFlags &= ~CLASS_ReplicationDataIsSetUp;
+	}
+}
+
 UProperty* UFunction::GetReturnProperty() const
 {
 	for( TFieldIterator<UProperty> It(this); It && (It->PropertyFlags & CPF_Parm); ++It )
@@ -4874,10 +5042,19 @@ bool UFunction::IsSignatureCompatibleWith(const UFunction* OtherFunction, uint64
 	return !(IteratorB && (IteratorB->PropertyFlags & CPF_Parm));
 }
 
-static UScriptStruct* StaticGetBaseStructureInternal(const TCHAR* Name)
+static UScriptStruct* StaticGetBaseStructureInternal(FName Name)
 {
-	static auto* CoreUObjectPkg = FindObjectChecked<UPackage>(nullptr, TEXT("/Script/CoreUObject"));
-	return FindObjectChecked<UScriptStruct>(CoreUObjectPkg, Name);
+	static UPackage* CoreUObjectPkg = FindObjectChecked<UPackage>(nullptr, TEXT("/Script/CoreUObject"));
+
+	UScriptStruct* Result = (UScriptStruct*)StaticFindObjectFastInternal(UScriptStruct::StaticClass(), CoreUObjectPkg, Name, false, false, RF_NoFlags, EInternalObjectFlags::None);
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	if (!Result)
+	{
+		UE_LOG(LogClass, Fatal, TEXT("Failed to find native struct '%s.%s'"), *CoreUObjectPkg->GetName(), *Name.ToString());
+	}
+#endif
+	return Result;
 }
 
 UScriptStruct* TBaseStructure<FRotator>::Get()
@@ -5018,6 +5195,12 @@ UScriptStruct* TBaseStructure<FPrimaryAssetId>::Get()
 	return ScriptStruct;
 }
 
+UScriptStruct* TBaseStructure<FPolyglotTextData>::Get()
+{
+	static auto ScriptStruct = StaticGetBaseStructureInternal(TEXT("PolyglotTextData"));
+	return ScriptStruct;
+}
+
 UScriptStruct* TBaseStructure<FDateTime>::Get()
 {
 	static auto ScriptStruct = StaticGetBaseStructureInternal(TEXT("DateTime"));
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNative.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNative.cpp
index 352d0a2d83f9..877331d275ea 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNative.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNative.cpp
@@ -14,6 +14,7 @@ bool IsInAsyncLoadingThreadCoreUObjectInternal();
 bool IsAsyncLoadingCoreUObjectInternal();
 void SuspendAsyncLoadingInternal();
 void ResumeAsyncLoadingInternal();
+bool IsAsyncLoadingSuspendedInternal();
 bool IsAsyncLoadingMultithreadedCoreUObjectInternal();
 
 // CoreUObject module. Handles UObject system pre-init (registers init function with Core callbacks).
@@ -42,6 +43,7 @@ public:
 		IsAsyncLoading = &IsAsyncLoadingCoreUObjectInternal;
 		SuspendAsyncLoading = &SuspendAsyncLoadingInternal;
 		ResumeAsyncLoading = &ResumeAsyncLoadingInternal;
+		IsAsyncLoadingSuspended = &IsAsyncLoadingSuspendedInternal;
 		IsAsyncLoadingMultithreaded = &IsAsyncLoadingMultithreadedCoreUObjectInternal;
 
 		// Register the script callstack callback to the runtime error logging
@@ -50,7 +52,11 @@ public:
 #endif
 
 		// Make sure that additional content mount points can be registered after CoreUObject loads
-		FPackageName::EnsureContentPathsAreRegistered();		
+		FPackageName::EnsureContentPathsAreRegistered();
+
+#if DO_BLUEPRINT_GUARD
+		FFrame::InitPrintScriptCallstack();
+#endif
 	}
 };
 IMPLEMENT_MODULE( FCoreUObjectModule, CoreUObject );
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNet.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNet.cpp
index bc8ad729e390..25a13559852b 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNet.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/CoreNet.cpp
@@ -161,13 +161,13 @@ uint32 FClassNetCacheMgr::GetFieldChecksum( const UField* Field, uint32 Checksum
 	return Checksum;
 }
 
-const FClassNetCache* FClassNetCacheMgr::GetClassNetCache( const UClass* Class )
+const FClassNetCache* FClassNetCacheMgr::GetClassNetCache( UClass* Class )
 {
 	FClassNetCache* Result = ClassFieldIndices.FindRef( Class );
 
 	if ( !Result )
 	{
-		ensureMsgf(!Class->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("FClassNetCacheMgr::GetClassNetCache: %s has flag RF_NeedPostLoad. NetFields and ClassReps will be incorrect!"), *GetFullNameSafe(Class));
+		Class->SetUpRuntimeReplicationData();
 
 		Result					= ClassFieldIndices.Add( Class, new FClassNetCache( Class ) );
 		Result->Super			= NULL;
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/EnumProperty.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/EnumProperty.cpp
index 6bb90f025075..a6ff7440342f 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/EnumProperty.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/EnumProperty.cpp
@@ -25,7 +25,7 @@ namespace UE4EnumProperty_Private
 				LogClass,
 				Warning,
 				TEXT("Failed to find valid enum value '%s' for enum type '%s' when converting property '%s' during property loading - setting to '%s'"),
-				*Lex::ToString(OldValue),
+				*LexToString(OldValue),
 				*Enum->GetName(),
 				*EnumProp->GetName(),
 				*Enum->GetNameByValue(Enum->GetMaxEnumValue()).ToString()
@@ -266,7 +266,7 @@ const TCHAR* UEnumProperty::ImportText_Internal(const TCHAR* InBuffer, void* Dat
 			if (EnumIndex == INDEX_NONE && (Temp.IsNumeric() && !Algo::Find(Temp, TEXT('.'))))
 			{
 				int64 EnumValue = INDEX_NONE;
-				Lex::FromString(EnumValue, *Temp);
+				LexFromString(EnumValue, *Temp);
 				EnumIndex = Enum->GetIndexByValue(EnumValue);
 			}
 			if (EnumIndex != INDEX_NONE)
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollection.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollection.cpp
index 34285d128763..cb495ddea789 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollection.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollection.cpp
@@ -1152,6 +1152,7 @@ void IncrementalPurgeGarbage( bool bUseTimeLimit, float TimeLimit )
 		{
 			// We've finished iterating over all unreachable objects, but we need still need to handle
 			// objects that were deferred.
+			int32 LastLoopObjectsPendingDestructionCount = GGCObjectsPendingDestructionCount;
 			while( GGCObjectsPendingDestructionCount > 0 )
 			{
 				int32 CurPendingObjIndex = 0;
@@ -1212,9 +1213,46 @@ void IncrementalPurgeGarbage( bool bUseTimeLimit, float TimeLimit )
 				}
 				else if( GGCObjectsPendingDestructionCount > 0 )
 				{
+					if (FPlatformProperties::RequiresCookedData())
+					{
+						const bool bPollTimeLimit = ((TimePollCounter++) % TimeLimitEnforcementGranularityForDestroy == 0);
+						const double MaxTimeForFinishDestroy = 10.0;
+						// Check if we spent too much time on waiting for FinishDestroy without making any progress
+						if (LastLoopObjectsPendingDestructionCount == GGCObjectsPendingDestructionCount && bPollTimeLimit &&
+							((FPlatformTime::Seconds() - StartTime) > MaxTimeForFinishDestroy))
+						{
+							UE_LOG(LogGarbage, Warning, TEXT("Spent more than %.2fs on routing FinishDestroy to objects (objects in queue: %d)"), MaxTimeForFinishDestroy, GGCObjectsPendingDestructionCount);
+							UObject* LastObjectNotReadyForFinishDestroy = nullptr;
+							for (int32 ObjectIndex = 0; ObjectIndex < GGCObjectsPendingDestructionCount; ++ObjectIndex)
+							{
+								UObject* Obj = GGCObjectsPendingDestruction[ObjectIndex];
+								bool bReady = Obj->IsReadyForFinishDestroy();
+								UE_LOG(LogGarbage, Warning, TEXT("  [%d]: %s, IsReadyForFinishDestroy: %s"),
+									ObjectIndex,
+									*GetFullNameSafe(Obj),
+									bReady ? TEXT("true") : TEXT("false"));
+								if (!bReady)
+								{
+									LastObjectNotReadyForFinishDestroy = Obj;
+								}
+							}
+
+#if PLATFORM_DESKTOP
+							ensureMsgf(0, TEXT("Spent to much time waiting for FinishDestroy for %d object(s) (last object: %s), check log for details"),
+								GGCObjectsPendingDestructionCount,
+								*GetFullNameSafe(LastObjectNotReadyForFinishDestroy));
+#else
+							UE_LOG(LogGarbage, Fatal, TEXT("Spent to much time waiting for FinishDestroy for %d object(s) (last object: %s), check log for details"),
+								GGCObjectsPendingDestructionCount,
+								*GetFullNameSafe(LastObjectNotReadyForFinishDestroy));
+#endif
+						}
+					}
 					// Sleep before the next pass to give the render thread some time to release fences.
 					FPlatformProcess::Sleep( 0 );
 				}
+
+				LastLoopObjectsPendingDestructionCount = GGCObjectsPendingDestructionCount;
 			}
 
 			// Have all objects been destroyed now?
@@ -1309,11 +1347,7 @@ bool IsIncrementalPurgePending()
 }
 
 // Allow parallel GC to be overridden to single threaded via console command.
-#if !PLATFORM_MAC || !WITH_EDITORONLY_DATA
 static int32 GAllowParallelGC = 1;
-#else
-	static int32 GAllowParallelGC = 0;
-#endif
 
 static FAutoConsoleVariableRef CVarAllowParallelGC(
 	TEXT("gc.AllowParallelGC"),
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollectionVerification.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollectionVerification.cpp
index 210374021ee0..dffb9f2db021 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollectionVerification.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/GarbageCollectionVerification.cpp
@@ -51,7 +51,7 @@ public:
 	{
 		return NumErrors.GetValue();
 	}
-	FORCENOINLINE void HandleTokenStreamObjectReference(TArray<UObject*>& ObjectsToSerialize, UObject* ReferencingObject, UObject*& Object, const int32 TokenIndex, bool bAllowReferenceElimination)
+	FORCEINLINE_DEBUGGABLE void HandleTokenStreamObjectReference(TArray<UObject*>& ObjectsToSerialize, UObject* ReferencingObject, UObject*& Object, const int32 TokenIndex, bool bAllowReferenceElimination)
 	{
 		if (Object)
 		{
@@ -171,7 +171,7 @@ public:
 	* @param TokenIndex Index to the token stream where the reference was found.
 	* @param bAllowReferenceElimination True if reference elimination is allowed (ignored when constructing clusters).
 	*/
-	FORCENOINLINE void HandleTokenStreamObjectReference(TArray<UObject*>& ObjectsToSerialize, UObject* ReferencingObject, UObject*& Object, const int32 TokenIndex, bool bAllowReferenceElimination)
+	FORCEINLINE_DEBUGGABLE void HandleTokenStreamObjectReference(TArray<UObject*>& ObjectsToSerialize, UObject* ReferencingObject, UObject*& Object, const int32 TokenIndex, bool bAllowReferenceElimination)
 	{
 		if (Object)
 		{
@@ -324,7 +324,6 @@ void VerifyClustersAssumptions()
 }
 
 #endif // VERIFY_DISREGARD_GC_ASSUMPTIONS
-
 #if PROFILE_GCConditionalBeginDestroy
 
 TMap<FName, FCBDTime> CBDTimings;
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/LazyObjectPtr.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/LazyObjectPtr.cpp
index 458fed76f6f0..15dd645e814a 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/LazyObjectPtr.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/LazyObjectPtr.cpp
@@ -76,6 +76,12 @@ FUniqueObjectGuid FUniqueObjectGuid::GetOrCreateIDForObject(const class UObject
 	FUniqueObjectGuid ObjectGuid(Object);
 	if (!ObjectGuid.IsValid())
 	{
+#if WITH_EDITOR
+		if (GIsCookerLoadingPackage)
+		{
+			UE_ASSET_LOG(LogUObjectGlobals, Warning, Object, TEXT("Creating a new object GUID for object '%s' during cooking - this asset should be resaved"), *Object->GetFullName());
+		}
+#endif
 		ObjectGuid.Guid = FGuid::NewGuid();
 		GuidAnnotation.AddAnnotation(Object, ObjectGuid);
 		Object->MarkPackageDirty();
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/Linker.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/Linker.cpp
index ec8f6aafadf7..6e8e3859dd35 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/Linker.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/Linker.cpp
@@ -417,11 +417,11 @@ static void LogGetPackageLinkerError(FArchive* LinkerArchive, const TCHAR* InFil
 
 	// Display log error regardless LoadFlag settings
 	SET_WARN_COLOR(COLOR_RED);
-	if (LoadFlags & LOAD_NoWarn)
+	if (LoadFlags & (LOAD_NoWarn | LOAD_Quiet))
 	{
 		UE_LOG(LogLinker, Log, TEXT("%s"), *InFullErrorMessage.ToString());
 	}
-	else 
+	else
 	{
 		UE_LOG(LogLinker, Warning, TEXT("%s"), *InFullErrorMessage.ToString());
 	}
@@ -429,7 +429,7 @@ static void LogGetPackageLinkerError(FArchive* LinkerArchive, const TCHAR* InFil
 	if( GIsEditor && !IsRunningCommandlet() )
 	{
 		// if we don't want to be warned, skip the load warning
-		if (!(LoadFlags & LOAD_NoWarn))
+		if (!(LoadFlags & (LOAD_NoWarn | LOAD_Quiet)))
 		{
 			// we only want to output errors that content creators will be able to make sense of,
 			// so any errors we cant get links out of we will just let be output to the output log (above)
@@ -460,7 +460,7 @@ static void LogGetPackageLinkerError(FArchive* LinkerArchive, const TCHAR* InFil
 	}
 	else
 	{
-		if (!(LoadFlags & LOAD_NoWarn))
+		if (!(LoadFlags & (LOAD_NoWarn | LOAD_Quiet)))
 		{
 			Local::OutputErrorDetail(LinkerArchive, NAME_LoadErrors);
 		}
@@ -536,7 +536,8 @@ FLinkerLoad* GetPackageLinker
 	const TCHAR*	InLongPackageName,
 	uint32			LoadFlags,
 	UPackageMap*	Sandbox,
-	FGuid*			CompatibleGuid
+	FGuid*			CompatibleGuid,
+	FArchive*		InReaderOverride
 )
 {
 	// See if there is already a linker for this package.
@@ -712,7 +713,7 @@ FLinkerLoad* GetPackageLinker
 		// we will already have found the filename above
 		check(NewFilename.Len() > 0);
 
-		Result = FLinkerLoad::CreateLinker( InOuter, *NewFilename, LoadFlags );
+		Result = FLinkerLoad::CreateLinker( InOuter, *NewFilename, LoadFlags, InReaderOverride);
 	}
 
 	if ( !Result && CreatedPackage )
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerLoad.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerLoad.cpp
index de420923ac6f..53863b6b69c6 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerLoad.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerLoad.cpp
@@ -408,7 +408,7 @@ void FLinkerLoad::StaticInit(UClass* InUTexture2DStaticClass)
  *
  * @return	new FLinkerLoad object for Parent/ Filename
  */
-FLinkerLoad* FLinkerLoad::CreateLinker(UPackage* Parent, const TCHAR* Filename, uint32 LoadFlags)
+FLinkerLoad* FLinkerLoad::CreateLinker(UPackage* Parent, const TCHAR* Filename, uint32 LoadFlags, FArchive* InLoader /*= nullptr*/)
 {
 #if USE_CIRCULAR_DEPENDENCY_LOAD_DEFERRING
 	// we don't want the linker permanently created with the 
@@ -437,12 +437,21 @@ FLinkerLoad* FLinkerLoad::CreateLinker(UPackage* Parent, const TCHAR* Filename,
 		// FinalizeCreation() could invoke further dependency loads
 		TGuardValue<uint32> LinkerLoadFlagGuard(Linker->LoadFlags, Linker->LoadFlags | DeferredLoadFlag);
 #endif // USE_CIRCULAR_DEPENDENCY_LOAD_DEFERRING
+		
+		if (InLoader)
+		{
+			// The linker can't have an associated loader here if we have a loader override
+			check(!Linker->Loader);
+			Linker->Loader = InLoader;
+			// Set the basic archive flags on the linker
+			Linker->ResetStatusInfo();
+		}
 
 		FSerializedPackageLinkerGuard Guard;
 		FUObjectThreadContext::Get().SerializedPackageLinker = Linker;
 		if (Linker->Tick(0.f, false, false) == LINKER_Failed)
 		{
-			return NULL;
+			return nullptr;
 		}
 	}
 	FCoreUObjectDelegates::PackageCreatedForLoad.Broadcast(Parent);
@@ -588,11 +597,11 @@ FLinkerLoad* FLinkerLoad::CreateLinkerAsync( UPackage* Parent, const TCHAR* File
 	{
 		if (GEventDrivenLoaderEnabled)
 		{
-		UE_LOG(LogStreaming, Fatal, TEXT("FLinkerLoad::CreateLinkerAsync: Found existing linker for '%s'"), *Parent->GetName());
+			UE_LOG(LogStreaming, Fatal, TEXT("FLinkerLoad::CreateLinkerAsync: Found existing linker for '%s'"), *Parent->GetName());
 		}
 		else
 		{
-		UE_LOG(LogStreaming, Log, TEXT("FLinkerLoad::CreateLinkerAsync: Found existing linker for '%s'"), *Parent->GetName());
+			UE_LOG(LogStreaming, Log, TEXT("FLinkerLoad::CreateLinkerAsync: Found existing linker for '%s'"), *Parent->GetName());
 		}		
 	}
 
@@ -872,6 +881,19 @@ bool FLinkerLoad::IsTimeLimitExceeded( const TCHAR* CurrentTask, int32 Granulari
 	return bTimeLimitExceeded;
 }
 
+void FLinkerLoad::ResetStatusInfo()
+{
+	// Set status info.
+	this->SetUE4Ver(GPackageFileUE4Version);
+	this->SetLicenseeUE4Ver(GPackageFileLicenseeUE4Version);
+	this->SetEngineVer(FEngineVersion::Current());
+	this->SetIsLoading(true);
+	this->SetIsPersistent(true);
+
+	// Reset all custom versions
+	ResetCustomVersions();
+}
+
 /**
  * Creates loader used to serialize content.
  */
@@ -1014,16 +1036,8 @@ FLinkerLoad::ELinkerStatus FLinkerLoad::CreateLoader(
 		//	UE_LOG(LogLinker, Warning, TEXT("Linker for '%s' already exists"), *LinkerRoot->GetName() );
 		//	return LINKER_Failed;
 		//}
-
-		// Set status info.
-		ArUE4Ver = GPackageFileUE4Version;
-		ArLicenseeUE4Ver = GPackageFileLicenseeUE4Version;
-		ArEngineVer = FEngineVersion::Current();
-		ArIsLoading = true;
-		ArIsPersistent = true;
-
-		// Reset all custom versions
-		ResetCustomVersions();
+		
+		ResetStatusInfo();
 	}
 	else if (GEventDrivenLoaderEnabled)
 	{
@@ -1252,9 +1266,9 @@ FLinkerLoad::ELinkerStatus FLinkerLoad::SerializePackageFileSummary()
 		Loader->SetLicenseeUE4Ver(Summary.GetFileVersionLicenseeUE4());
 		Loader->SetEngineVer(Summary.SavedByEngineVersion);
 
-		ArUE4Ver = Summary.GetFileVersionUE4();
-		ArLicenseeUE4Ver = Summary.GetFileVersionLicenseeUE4();
-		ArEngineVer = Summary.SavedByEngineVersion;
+		this->SetUE4Ver(Summary.GetFileVersionUE4());
+		this->SetLicenseeUE4Ver(Summary.GetFileVersionLicenseeUE4());
+		this->SetEngineVer(Summary.SavedByEngineVersion);
 
 		const FCustomVersionContainer& SummaryVersions = Summary.GetCustomVersionContainer();
 		Loader->SetCustomVersions(SummaryVersions);
@@ -1290,8 +1304,8 @@ FLinkerLoad::ELinkerStatus FLinkerLoad::SerializePackageFileSummary()
 			LinkerRootPackage->SetGuid( Summary.Guid );
 
 			// Remember the linker versions
-			LinkerRootPackage->LinkerPackageVersion = ArUE4Ver;
-			LinkerRootPackage->LinkerLicenseeVersion = ArLicenseeUE4Ver;
+			LinkerRootPackage->LinkerPackageVersion = this->UE4Ver();
+			LinkerRootPackage->LinkerLicenseeVersion = this->LicenseeUE4Ver();
 
 			// Only set the custom version if it is not already latest.
 			// If it is latest, we will compare against latest in GetLinkerCustomVersion
@@ -2518,7 +2532,7 @@ FLinkerLoad::EVerifyResult FLinkerLoad::VerifyImport(int32 ImportIndex)
 }
 
 // Internal Load package call so that we can pass the linker that requested this package as an import dependency
-UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FLinkerLoad* ImportLinker);
+UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FLinkerLoad* ImportLinker, FArchive* InReaderOverride);
 
 /**
  * Safely verify that an import in the ImportMap points to a good object. This decides whether or not
@@ -2599,7 +2613,7 @@ bool FLinkerLoad::VerifyImportInner(const int32 ImportIndex, FString& WarningSuf
 
 			// we now fully load the package that we need a single export from - however, we still use CreatePackage below as it handles all cases when the package
 			// didn't exist (native only), etc		
-			TmpPkg = LoadPackageInternal(NULL, *Import.ObjectName.ToString(), InternalLoadFlags | LOAD_IsVerifying, this);
+			TmpPkg = LoadPackageInternal(NULL, *Import.ObjectName.ToString(), InternalLoadFlags | LOAD_IsVerifying, this, nullptr);
 		}
 
 #if WITH_EDITOR
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerSave.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerSave.cpp
index de625a479c2c..8b5c87afb9c3 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerSave.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/LinkerSave.cpp
@@ -57,8 +57,8 @@ FLinkerSave::FLinkerSave(UPackage* InParent, const TCHAR* InFilename, bool bForc
 		}
 
 		// Set status info.
-		ArIsSaving				= 1;
-		ArIsPersistent			= 1;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		ArForceByteSwapping		= bForceByteSwapping;
 
 #if USE_STABLE_LOCALIZATION_KEYS
@@ -110,8 +110,8 @@ FLinkerSave::FLinkerSave(UPackage* InParent, FArchive *InSaver, bool bForceByteS
 		}
 
 		// Set status info.
-		ArIsSaving = 1;
-		ArIsPersistent = 1;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		ArForceByteSwapping = bForceByteSwapping;
 
 #if USE_STABLE_LOCALIZATION_KEYS
@@ -158,8 +158,8 @@ FLinkerSave::FLinkerSave(UPackage* InParent, bool bForceByteSwapping, bool bInSa
 		}
 
 		// Set status info.
-		ArIsSaving				= 1;
-		ArIsPersistent			= 1;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		ArForceByteSwapping		= bForceByteSwapping;
 
 #if USE_STABLE_LOCALIZATION_KEYS
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/Obj.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/Obj.cpp
index 563e8fc63214..078e46611a7e 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/Obj.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/Obj.cpp
@@ -1886,6 +1886,17 @@ void UObject::LoadConfig( UClass* ConfigClass/*=NULL*/, const TCHAR* InFilename/
 		return;
 	}
 
+#if !IS_PROGRAM
+	// Do we have properties that don't exist yet?
+	// If this happens then we're trying to load the config for an object that doesn't
+	// know what its layout is. Usually a call to GetDefaultObject that occurs too early
+	// because ProcessNewlyLoadedUObjects hasn't happened yet
+	checkf(ConfigClass->PropertyLink != nullptr
+		|| (ConfigClass->GetSuperStruct() && ConfigClass->PropertiesSize == ConfigClass->GetSuperStruct()->PropertiesSize)
+		|| ConfigClass->PropertiesSize == 0,
+		TEXT("class %s has uninitialized properties. Accessed too early?"), *ConfigClass->GetName());
+#endif
+
 	UClass* ParentClass = ConfigClass->GetSuperClass();
 	if ( ParentClass != NULL )
 	{
@@ -2857,7 +2868,7 @@ static void PrivateRecursiveDumpFlags(UStruct* Struct, void* Data, FOutputDevice
 	check(Data != NULL);
 	for( TFieldIterator<UProperty> It(Struct); It; ++It )
 	{
-		if ( It->GetOwnerClass()->GetPropertiesSize() != sizeof(UObject) )
+		if (It->GetOwnerClass() && It->GetOwnerClass()->GetPropertiesSize() != sizeof(UObject) )
 		{
 			for( int32 i=0; i<It->ArrayDim; i++ )
 			{
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/ObjectResource.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/ObjectResource.cpp
index 687b0b976b84..963f181f73e0 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/ObjectResource.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/ObjectResource.cpp
@@ -14,20 +14,6 @@ namespace
 	}
 }
 
-/*-----------------------------------------------------------------------------
-FPackageIndex Lex functions
------------------------------------------------------------------------------*/
-
-FString ToString(const FPackageIndex& Value)
-{
-	return FString::FromInt(Value.Index);
-}
-
-void FromString(FPackageIndex& Value, const TCHAR* String)
-{
-	Value.Index = FCString::Atoi(String);
-}
-
 /*-----------------------------------------------------------------------------
 	FObjectResource
 -----------------------------------------------------------------------------*/
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/Package.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/Package.cpp
index f10c572e204c..8d239b10e472 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/Package.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/Package.cpp
@@ -230,6 +230,11 @@ void UPackage::BeginDestroy()
 	Super::BeginDestroy();
 }
 
+bool UPackage::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 // UE-21181 - Tracking where the loaded editor level's package gets flagged as a PIE object
 #if WITH_EDITOR
 UPackage* UPackage::EditorPackage = nullptr;
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/PackageFileSummary.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/PackageFileSummary.cpp
index 3411b29097b2..fcdf49277ea9 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/PackageFileSummary.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/PackageFileSummary.cpp
@@ -3,6 +3,7 @@
 #include "UObject/PackageFileSummary.h"
 #include "UObject/Linker.h"
 #include "Serialization/ArchiveFromStructuredArchive.h"
+#include "UObject/UObjectGlobals.h"
 
 FPackageFileSummary::FPackageFileSummary()
 {
@@ -116,16 +117,18 @@ void operator<<(FStructuredArchive::FSlot Slot, FPackageFileSummary& Sum)
 				if (!Sum.FileVersionUE4 && !Sum.FileVersionLicenseeUE4)
 				{
 #if WITH_EDITOR
-					// the editor cannot safely load unversioned content
-					UE_LOG(LogLinker, Warning, TEXT("Failed to read package file summary, the file \"%s\" is unversioned and we cannot safely load unversioned files in the editor."), *BaseArchive.GetArchiveName());
-					return;
-#else
+					if (!GAllowUnversionedContentInEditor)
+					{
+						// the editor cannot safely load unversioned content
+						UE_LOG(LogLinker, Warning, TEXT("Failed to read package file summary, the file \"%s\" is unversioned and we cannot safely load unversioned files in the editor."), *BaseArchive.GetArchiveName());
+						return;
+					}
+#endif
 					// this file is unversioned, remember that, then use current versions
 					Sum.bUnversioned = true;
 					Sum.FileVersionUE4 = GPackageFileUE4Version;
 					Sum.FileVersionLicenseeUE4 = GPackageFileLicenseeUE4Version;
 					Sum.CustomVersionContainer = FCustomVersionContainer::GetRegistered();
-#endif
 				}
 			}
 			else
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/Property.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/Property.cpp
index 736fe45e546c..f676086346f4 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/Property.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/Property.cpp
@@ -712,6 +712,11 @@ bool UProperty::ExportText_Direct
 	return false;
 }
 
+bool UProperty::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 bool UProperty::ShouldSerializeValue( FArchive& Ar ) const
 {
 	if (Ar.ShouldSkipProperty(this))
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyByte.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyByte.cpp
index 68d7191ccf6d..cf017aef953b 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyByte.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyByte.cpp
@@ -362,7 +362,7 @@ const TCHAR* UByteProperty::ImportText_Internal( const TCHAR* InBuffer, void* Da
 			if (EnumIndex == INDEX_NONE && (Temp.IsNumeric() && !Algo::Find(Temp, TEXT('.'))))
 			{
 				int64 EnumValue = INDEX_NONE;
-				Lex::FromString(EnumValue, *Temp);
+				LexFromString(EnumValue, *Temp);
 				EnumIndex = Enum->GetIndexByValue(EnumValue);
 			}
 			if (EnumIndex != INDEX_NONE)
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyTempVal.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyTempVal.cpp
new file mode 100644
index 000000000000..5691b2c4e088
--- /dev/null
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/PropertyTempVal.cpp
@@ -0,0 +1,33 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "UObject/PropertyTempVal.h"
+
+FPropertyTempVal::FPropertyTempVal(UProperty* InProp)
+{
+	// Allocate space for the owned object and construct it
+	void* LocalValue = FMemory::Malloc(InProp->GetSize(), InProp->GetMinAlignment());
+	InProp->InitializeValue(LocalValue);
+
+	// Store fields
+	Prop  = InProp;
+	Value = LocalValue;
+}
+
+FPropertyTempVal::~FPropertyTempVal()
+{
+	void* LocalValue = Value;
+
+	// Destroy the object and free the memory
+	Prop->DestroyValue(LocalValue);
+	FMemory::Free(LocalValue);
+}
+
+void FPropertyTempVal::Serialize(FArchive& Ar, const void* Defaults)
+{
+	Prop->SerializeItem(Ar, Value, Defaults);
+}
+
+void FPropertyTempVal::ExportText(FString& ValueStr, const void* Defaults, UObject* Parent, int32 PortFlags, UObject* ExportRootScope)
+{
+	Prop->ExportTextItem(ValueStr, Value, Defaults, Parent, PortFlags, ExportRootScope);
+}
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage.cpp
index bab506643efd..8f24a6287824 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/SavePackage.cpp
@@ -53,6 +53,8 @@
 #include "Blueprint/BlueprintSupport.h"
 #include "HAL/IConsoleManager.h"
 #include "Serialization/ArchiveStackTrace.h"
+#include "UObject/CoreRedirects.h"
+#include "Serialization/ArchiveObjectCrc32.h"
 #include "Serialization/Formatters/BinaryArchiveFormatter.h"
 #include "Serialization/Formatters/JsonArchiveOutputFormatter.h"
 #include "Serialization/ArchiveUObjectFromStructuredArchive.h"
@@ -92,10 +94,8 @@ namespace SavePackageStats
 	static double SerializeBulkDataTimeSec = 0.0;
 	static double AsyncWriteTimeSec = 0.0;
 	static double MBWritten = 0.0;
+	TMap<FName, FArchiveDiffStats> PackageDiffStats;
 	static int32 NumberOfDifferentPackages = 0;
-	static double DifferentPackagesSizeMB = 0.0;
-	static int32 NumberOfDifferencesInPackages = 0;
-	static double PackageDifferencesSizeMB = 0.0;
 	static TMap<FName, FCookStatsManager::TKeyValuePair<double, uint32>> PackageClassSerializeTimes;
 	static TMap<FName, FCookStatsManager::TKeyValuePair<double, uint32>> TagExportSerializeTimes;
 	static TMap<FName, FCookStatsManager::TKeyValuePair<double, uint32>> ClassPreSaveTimes;
@@ -104,7 +104,7 @@ namespace SavePackageStats
 		// Don't use FCookStatsManager::CreateKeyValueArray because there's just too many arguments. Don't need to overburden the compiler here.
 		TArray<FCookStatsManager::StringKeyValue> StatsList;
 		StatsList.Empty(15);
-		#define ADD_COOK_STAT(Name) StatsList.Emplace(TEXT(#Name), Lex::ToString(Name))
+		#define ADD_COOK_STAT(Name) StatsList.Emplace(TEXT(#Name), LexToString(Name))
 		ADD_COOK_STAT(NumPackagesSaved);
 		ADD_COOK_STAT(SavePackageTimeSec);
 		ADD_COOK_STAT(TagPackageExportsPresaveTimeSec);
@@ -121,13 +121,63 @@ namespace SavePackageStats
 
 		AddStat(TEXT("Package.Save"), StatsList);
 
+		{
+			PackageDiffStats.ValueSort([](const FArchiveDiffStats& Lhs, const FArchiveDiffStats& Rhs){ return Lhs.NewFileTotalSize > Rhs.NewFileTotalSize; });
+
+			StatsList.Empty(15);
+			for (const TPair<FName, FArchiveDiffStats>& Stat : PackageDiffStats)
+			{
+				StatsList.Emplace(Stat.Key.ToString(), LexToString((double)Stat.Value.NewFileTotalSize / 1024.0 / 1024.0));
+			}
+
+			AddStat(TEXT("Package.DifferentPackagesSizeMBPerAsset"), StatsList);
+		}
+
+		{
+			PackageDiffStats.ValueSort([](const FArchiveDiffStats& Lhs, const FArchiveDiffStats& Rhs){ return Lhs.NumDiffs > Rhs.NumDiffs; });
+
+			StatsList.Empty(15);
+			for (const TPair<FName, FArchiveDiffStats>& Stat : PackageDiffStats)
+			{
+				StatsList.Emplace(Stat.Key.ToString(), LexToString(Stat.Value.NumDiffs));
+			}
+
+			AddStat(TEXT("Package.NumberOfDifferencesInPackagesPerAsset"), StatsList);
+		}
+
+		{
+			PackageDiffStats.ValueSort([](const FArchiveDiffStats& Lhs, const FArchiveDiffStats& Rhs){ return Lhs.DiffSize > Rhs.DiffSize; });
+
+			StatsList.Empty(15);
+			for (const TPair<FName, FArchiveDiffStats>& Stat : PackageDiffStats)
+			{
+				StatsList.Emplace(Stat.Key.ToString(), LexToString((double)Stat.Value.DiffSize / 1024.0 / 1024.0));
+			}
+
+			AddStat(TEXT("Package.PackageDifferencesSizeMBPerAsset"), StatsList);
+		}
+
+		int64 NewFileTotalSize = 0;
+		int64 NumDiffs         = 0;
+		int64 DiffSize         = 0;
+		for (const TPair<FName, FArchiveDiffStats>& PackageStat : PackageDiffStats)
+		{
+			NewFileTotalSize += PackageStat.Value.NewFileTotalSize;
+			NumDiffs         += PackageStat.Value.NumDiffs;
+			DiffSize         += PackageStat.Value.DiffSize;
+		}
+
+		double DifferentPackagesSizeMB       = (double)NewFileTotalSize / 1024.0 / 1024.0;
+		int32  NumberOfDifferencesInPackages = NumDiffs;
+		double PackageDifferencesSizeMB      = (double)DiffSize / 1024.0 / 1024.0;
+
 		StatsList.Empty(15);
 		ADD_COOK_STAT(NumberOfDifferentPackages);
 		ADD_COOK_STAT(DifferentPackagesSizeMB);
 		ADD_COOK_STAT(NumberOfDifferencesInPackages);
 		ADD_COOK_STAT(PackageDifferencesSizeMB);
 
-		AddStat(TEXT("Package.Diff"), StatsList);
+		AddStat(TEXT("Package.DiffTotal"), StatsList);
 
 		#undef ADD_COOK_STAT		
 		
@@ -136,21 +186,21 @@ namespace SavePackageStats
 		if (PackageClassSerializeTimes.Num() > 0)
 		{
 			// Sort the class serialize times in reverse order.
-			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> ClassSerializeTimeData;
-			TArray<ClassSerializeTimeData> SerializeTimesArray;
+			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> FClassSerializeTimeData;
+			TArray<FClassSerializeTimeData> SerializeTimesArray;
 			SerializeTimesArray.Empty(PackageClassSerializeTimes.Num());
-			for (const auto& KV : PackageClassSerializeTimes)
+			for (const TPair<FName, FCookStatsManager::TKeyValuePair<double, uint32>>& KV : PackageClassSerializeTimes)
 			{
 				SerializeTimesArray.Emplace(FCookStatsManager::MakePair(KV.Key, FCookStatsManager::MakePair(KV.Value.Key, KV.Value.Value)));
 			}
-			SerializeTimesArray.Sort([](const ClassSerializeTimeData& LHS, const ClassSerializeTimeData& RHS)
+			SerializeTimesArray.Sort([](const FClassSerializeTimeData& LHS, const FClassSerializeTimeData& RHS)
 			{
 				return LHS.Value.Key > RHS.Value.Key;
 			});
 
 			// always print at least the top n, but not anything < 0.1% of total save time.
 			int ClassesLogged = 0;
-			for (const auto& KV : SerializeTimesArray)
+			for (const FClassSerializeTimeData& KV : SerializeTimesArray)
 			{
 				// since we're sorted on size already. Just find the first one below the threshold and stop there
 				if (ClassesLogged >= 10 && KV.Value.Key < 0.001 * SavePackageTimeSec)
@@ -169,14 +219,14 @@ namespace SavePackageStats
 		if (TagExportSerializeTimes.Num() > 0)
 		{
 			// Sort the class serialize times in reverse order.
-			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> ClassSerializeTimeData;
-			TArray<ClassSerializeTimeData> SerializeTimesArray;
+			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> FClassSerializeTimeData;
+			TArray<FClassSerializeTimeData> SerializeTimesArray;
 			SerializeTimesArray.Empty(TagExportSerializeTimes.Num());
-			for (const auto& KV : TagExportSerializeTimes)
+			for (const TPair<FName, FCookStatsManager::TKeyValuePair<double, uint32>>& KV : TagExportSerializeTimes)
 			{
 				SerializeTimesArray.Emplace(FCookStatsManager::MakePair(KV.Key, FCookStatsManager::MakePair(KV.Value.Key, KV.Value.Value)));
 			}
-			SerializeTimesArray.Sort([](const ClassSerializeTimeData& LHS, const ClassSerializeTimeData& RHS)
+			SerializeTimesArray.Sort([](const FClassSerializeTimeData& LHS, const FClassSerializeTimeData& RHS)
 			{
 				return LHS.Value.Key > RHS.Value.Key;
 			});
@@ -186,7 +236,7 @@ namespace SavePackageStats
 
 			// always print at least the top n, but not anything < 0.1% of total save time.
 			int ClassesLogged = 0;
-			for (const auto& KV : SerializeTimesArray)
+			for (const FClassSerializeTimeData& KV : SerializeTimesArray)
 			{
 				TotalSerializeTime += KV.Value.Key;
 				TotalSerializeCalls += KV.Value.Value;
@@ -213,14 +263,14 @@ namespace SavePackageStats
 		if (ClassPreSaveTimes.Num() > 0)
 		{
 			// Sort the class serialize times in reverse order.
-			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> ClassSerializeTimeData;
-			TArray<ClassSerializeTimeData> SerializeTimesArray;
+			typedef FCookStatsManager::TKeyValuePair<FName, FCookStatsManager::TKeyValuePair<double, uint32>> FClassSerializeTimeData;
+			TArray<FClassSerializeTimeData> SerializeTimesArray;
 			SerializeTimesArray.Empty(ClassPreSaveTimes.Num());
-			for (const auto& KV : ClassPreSaveTimes)
+			for (const TPair<FName, FCookStatsManager::TKeyValuePair<double, uint32>>& KV : ClassPreSaveTimes)
 			{
 				SerializeTimesArray.Emplace(FCookStatsManager::MakePair(KV.Key, FCookStatsManager::MakePair(KV.Value.Key, KV.Value.Value)));
 			}
-			SerializeTimesArray.Sort([](const ClassSerializeTimeData& LHS, const ClassSerializeTimeData& RHS)
+			SerializeTimesArray.Sort([](const FClassSerializeTimeData& LHS, const FClassSerializeTimeData& RHS)
 			{
 				return LHS.Value.Key > RHS.Value.Key;
 			});
@@ -230,7 +280,7 @@ namespace SavePackageStats
 			double TotalPreSaveTime = 0.0;
 			int TotalPreSaveCalls = 0;
 			int ClassesLogged = 0;
-			for (const auto& KV : SerializeTimesArray)
+			for (const FClassSerializeTimeData& KV : SerializeTimesArray)
 			{
 				TotalPreSaveTime += KV.Value.Key;
 				TotalPreSaveCalls += KV.Value.Value;
@@ -846,7 +896,7 @@ static void ConditionallyExcludeObjectForTarget(UObject* Obj, EObjectMark Exclud
 			NewMarks = (EObjectMark)(NewMarks | OBJECTMARK_NotForServer);
 		}
 
-		if (!(NewMarks & OBJECTMARK_NotForServer) && !(NewMarks & OBJECTMARK_NotForClient) && TargetPlatform && !Obj->NeedsLoadForTargetPlatform(TargetPlatform))
+		if ((!(NewMarks & OBJECTMARK_NotForServer) || !(NewMarks & OBJECTMARK_NotForClient)) && TargetPlatform && !Obj->NeedsLoadForTargetPlatform(TargetPlatform))
 		{
 			NewMarks = (EObjectMark)(NewMarks | OBJECTMARK_NotForClient | OBJECTMARK_NotForServer);
 		}
@@ -907,8 +957,8 @@ public:
 	FArchiveSaveTagExports( UPackage* InOuter )
 	: Outer(InOuter)
 	{
-		ArIsSaving				= true;
-		ArIsPersistent			= true;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		ArIsObjectReferenceCollector = true;
 		ArShouldSkipBulkData	= true;
 	}
@@ -1124,8 +1174,8 @@ public:
 	{
 		check(Linker);
 
-		ArIsSaving				= true;
-		ArIsPersistent			= true;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		ArIsObjectReferenceCollector = true;
 		ArShouldSkipBulkData	= true;
 
@@ -1175,9 +1225,10 @@ FArchive& FArchiveSaveTagImports::operator<<( UObject*& Obj )
 
 	const EObjectMark ExcludedObjectMarks = UPackage::GetExcludedObjectMarksForTargetPlatform( CookingTarget(), IsCooking() );
 	ConditionallyExcludeObjectForTarget(Obj, ExcludedObjectMarks, CookingTarget(), IsCooking());
-	
+	bool bExcludePackageFromCook = Obj && FCoreUObjectDelegates::ShouldCookPackageForPlatform.IsBound() ? !FCoreUObjectDelegates::ShouldCookPackageForPlatform.Execute(Obj->GetOutermost(), CookingTarget()) : false;
+
 	// Skip PendingKill objects and objects that don't pass the platform mark filter
-	if (Obj && (ExcludedObjectMarks == OBJECTMARK_NOMARKS || !Obj->HasAnyMarks(ExcludedObjectMarks)))
+	if (Obj && (ExcludedObjectMarks == OBJECTMARK_NOMARKS || !Obj->HasAnyMarks(ExcludedObjectMarks)) && !bExcludePackageFromCook)
 	{
 		bool bIsNative = Obj->IsNative();
 		if( !Obj->HasAnyFlags(RF_Transient) || bIsNative)
@@ -2162,8 +2213,8 @@ public:
 		: FArchiveUObject(), CurrentInsertIndex(INDEX_NONE), CoreReferencesOffset(INDEX_NONE), bIgnoreFieldReferences(false), CurrentClass(nullptr)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = true;
-		ArIsSaving = true;
+		this->SetIsPersistent(true);
+		this->SetIsSaving(true);
 
 		InitializeCoreClasses();
 	}
@@ -2782,6 +2833,8 @@ struct FPackageExportTagger
 
 	void TagPackageExports( FArchiveSaveTagExports& ExportTagger, bool bRoutePresave )
 	{
+		const bool bIsCooking = !!TargetPlatform;
+
 		// Route PreSave on Base and serialize it for export tagging.
 		if( Base )
 		{
@@ -2792,27 +2845,50 @@ struct FPackageExportTagger
 				TimingInfo.Value++;
 				FScopedDurationTimer SerializeTimer(TimingInfo.Key);
 #endif
-				Base->PreSave(TargetPlatform);
+				if (bIsCooking && Base->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
+				{
+					FArchiveObjectCrc32 CrcArchive;
+
+					int32 Before = CrcArchive.Crc32(Base);
+					Base->PreSave(TargetPlatform);
+					int32 After = CrcArchive.Crc32(Base);
+
+					if (Before != After)
+					{
+						UE_ASSET_LOG(
+							LogSavePackage,
+							Warning,
+							Base,
+							TEXT("Non-deterministic cook warning - PreSave() has modified %s '%s' - a resave may be required"),
+							Base->HasAnyFlags(RF_ClassDefaultObject) ? TEXT("CDO") : TEXT("archetype"),
+							*Base->GetName()
+						);
+					}
+				}
+				else
+				{
+					Base->PreSave(TargetPlatform);
+				}
 			}
 
 			ExportTagger.ProcessBaseObject(Base);
 		}
 		if (TopLevelFlags != RF_NoFlags)
 		{
-		TArray<UObject *> ObjectsInOuter;
-		{
-			COOK_STAT(FScopedDurationTimer SerializeTimer(SavePackageStats::TagPackageExportsGetObjectsWithOuter));
-			GetObjectsWithOuter(Outer, ObjectsInOuter);
-		}
-		// Serialize objects to tag them as OBJECTMARK_TagExp.
-		for( int32 Index = 0; Index < ObjectsInOuter.Num(); Index++ )
-		{
-			UObject* Obj = ObjectsInOuter[Index];
-				if( Obj->HasAnyFlags(TopLevelFlags) )
+			TArray<UObject *> ObjectsInOuter;
 			{
-				ExportTagger.ProcessBaseObject(Obj);
+				COOK_STAT(FScopedDurationTimer SerializeTimer(SavePackageStats::TagPackageExportsGetObjectsWithOuter));
+				GetObjectsWithOuter(Outer, ObjectsInOuter);
+			}
+			// Serialize objects to tag them as OBJECTMARK_TagExp.
+			for( int32 Index = 0; Index < ObjectsInOuter.Num(); Index++ )
+			{
+				UObject* Obj = ObjectsInOuter[Index];
+				if( Obj->HasAnyFlags(TopLevelFlags) )
+				{
+					ExportTagger.ProcessBaseObject(Obj);
+				}
 			}
-		}
 		}
 		if ( bRoutePresave )
 		{
@@ -2833,7 +2909,30 @@ struct FPackageExportTagger
 #endif
 					check(Obj->HasAnyMarks(OBJECTMARK_TagExp));
 					//@warning: Objects created from within PreSave will NOT have PreSave called on them!!!
-					Obj->PreSave(TargetPlatform);
+					if (bIsCooking && Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
+					{
+						FArchiveObjectCrc32 CrcArchive;
+
+						int32 Before = CrcArchive.Crc32(Obj);
+						Obj->PreSave(TargetPlatform);
+						int32 After = CrcArchive.Crc32(Obj);
+
+						if (Before != After)
+						{
+							UE_ASSET_LOG(
+								LogSavePackage,
+								Warning,
+								Obj,
+								TEXT("Non-deterministic cook warning - PreSave() has modified %s '%s' - a resave may be required"),
+								Obj->HasAnyFlags(RF_ClassDefaultObject) ? TEXT("CDO") : TEXT("archetype"),
+								*Obj->GetName()
+							);
+						}
+					}
+					else
+					{
+						Obj->PreSave(TargetPlatform);
+					}
 				}
 			}
 		}
@@ -3408,9 +3507,11 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 		{
 			int32 MaxDiffsToLog;
 			bool bIgnoreHeaderDiffs;
+			bool bSaveForDiff;
 			FDiffSettings(bool bDiffing)
 				: MaxDiffsToLog(5)
 				, bIgnoreHeaderDiffs(false)
+				, bSaveForDiff(false)
 			{
 				if (bDiffing)
 				{
@@ -3428,6 +3529,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					{
 						bIgnoreHeaderDiffs = FParse::Param(FCommandLine::Get(), TEXT("IgnoreHeaderDiffs"));
 					}
+					bSaveForDiff = FParse::Param(FCommandLine::Get(), TEXT("SaveForDiff"));
 				}
 			}
 		} DiffSettings((SaveFlags & (SAVE_DiffCallstack | SAVE_DiffOnly)) != 0);
@@ -3744,7 +3846,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				bool bSaveUnversioned = !!(SaveFlags & SAVE_Unversioned);
 
-				FLinkerSave* Linker = nullptr;
+				TUniquePtr<FLinkerSave> Linker = nullptr;
 				FArchiveFormatterType* Formatter = nullptr;
 				FArchive* TextFormatArchive = nullptr;
 				bool bTextFormat = FString(Filename).EndsWith(FPackageName::GetTextAssetPackageExtension()) || FString(Filename).EndsWith(FPackageName::GetTextMapPackageExtension());
@@ -3753,18 +3855,32 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				FString DiffCookedPackagesPath;
 				// if we are cooking and we have diff cooked packages on the commandline then do some special stuff
 
+				// Finds the asset object within a package
+				auto FindAssetInPackage = [](UPackage* Package) -> UObject*
+				{
+					for (UObject* Object : TObjectRange<UObject>())
+					{
+						if (Object->GetOuter() == Package && Object->IsAsset())
+						{
+							return Object;
+						}
+					}
+
+					return nullptr;
+				};
+
 				if (TargetPlatform != nullptr && (SaveFlags & SAVE_DiffCallstack))
 				{
 					// The entire package will be serialized to memory and then compared against package on disk.
 					// Each difference will be log with its Serialize call stack trace
-					FArchive* Saver = new FArchiveStackTrace(*InOuter->FileName.ToString(), true, InOutDiffMap);
-					Linker = new FLinkerSave(InOuter, Saver, bForceByteSwapping, bSaveUnversioned);
+					FArchive* Saver = new FArchiveStackTrace(FindAssetInPackage(InOuter), *InOuter->FileName.ToString(), true, InOutDiffMap);
+					Linker = TUniquePtr<FLinkerSave>(new FLinkerSave(InOuter, Saver, bForceByteSwapping, bSaveUnversioned));
 				}
 				else if (TargetPlatform != nullptr && (SaveFlags & SAVE_DiffOnly))
 				{
 					// The entire package will be serialized to memory and then compared against package on disk
-					FArchive* Saver = new FArchiveStackTrace(*InOuter->FileName.ToString(), false);
-					Linker = new FLinkerSave(InOuter, Saver, bForceByteSwapping, bSaveUnversioned);
+					FArchive* Saver = new FArchiveStackTrace(FindAssetInPackage(InOuter), *InOuter->FileName.ToString(), false);
+					Linker = TUniquePtr<FLinkerSave>(new FLinkerSave(InOuter, Saver, bForceByteSwapping, bSaveUnversioned));
 				}
 				else if ((!!TargetPlatform) && FParse::Value(FCommandLine::Get(), TEXT("DiffCookedPackages="), DiffCookedPackagesPath))
 				{
@@ -3777,19 +3893,19 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					
 					FArchive* TestArchive = IFileManager::Get().CreateFileReader(*TestArchiveFilename); 
 					FArchive* Saver = new FDiffSerializeArchive(*InOuter->FileName.ToString(), TestArchive);
-					Linker = new FLinkerSave(InOuter, Saver, bForceByteSwapping);
+					Linker = TUniquePtr<FLinkerSave>(new FLinkerSave(InOuter, Saver, bForceByteSwapping));
 				}
 				else 
 #endif
 				if (bSaveAsync)
 				{
 					// Allocate the linker with a memory writer, forcing byte swapping if wanted.
-					Linker = new FLinkerSave(InOuter, bForceByteSwapping, bSaveUnversioned);
+					Linker = TUniquePtr<FLinkerSave>(new FLinkerSave(InOuter, bForceByteSwapping, bSaveUnversioned));
 				}
 				else
 				{
 					// Allocate the linker, forcing byte swapping if wanted.
-					Linker = new FLinkerSave(InOuter, *TempFilename, bForceByteSwapping, bSaveUnversioned);
+					Linker = TUniquePtr<FLinkerSave>(new FLinkerSave(InOuter, *TempFilename, bForceByteSwapping, bSaveUnversioned));
 				}
 
 #if WITH_EDITOR
@@ -3801,7 +3917,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				else
 #endif
 				{
-					Formatter = new FBinaryArchiveFormatter(*(FArchive*)Linker);
+					Formatter = new FBinaryArchiveFormatter(*(FArchive*)Linker.Get());
 				}
 
 				FStructuredArchive* StructuredArchive = new FStructuredArchive(*Formatter);
@@ -3825,7 +3941,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				InOuter->LinkerLicenseeVersion = Linker->LicenseeUE4Ver();
 				InOuter->LinkerCustomVersion = Linker->GetCustomVersions();
 
-				if (EndSavingIfCancelled(Linker, TempFilename)) 
+				if (EndSavingIfCancelled(Linker.Get(), TempFilename))
 				{ 
 					return ESavePackageResult::Canceled; 
 				}
@@ -3907,7 +4023,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 						check(Obj->HasAnyMarks(OBJECTMARK_TagExp));
 
 						// Build list.
-						FArchiveSaveTagImports ImportTagger(Linker, SavePackageState);
+						FArchiveSaveTagImports ImportTagger(Linker.Get(), SavePackageState);
 						ImportTagger.SetPortFlags(ComparisonFlags);
 						ImportTagger.SetFilterEditorOnly(FilterEditorOnly);
 
@@ -4008,24 +4124,13 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				TMap<UObject*, UObject*> DuplicateRedirects = UnmarkExportTagFromDuplicates();
 #endif // WITH_EDITOR
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
 				SlowTask.EnterProgressFrame();
 
-				bool bCanCacheGatheredText = false;
-				if ( !(Linker->Summary.PackageFlags & PKG_FilterEditorOnly) )
-				{
-					// Gathers from the given package
-					EPropertyLocalizationGathererResultFlags GatherableTextResultFlags = EPropertyLocalizationGathererResultFlags::Empty;
-					FPropertyLocalizationDataGatherer(Linker->GatherableTextDataMap, InOuter, GatherableTextResultFlags);
-
-					// We can only cache packages that don't contain script data, as script data is very volatile and can only be safely gathered after it's been compiled (which happens automatically on asset load)
-					bCanCacheGatheredText = !(GatherableTextResultFlags & EPropertyLocalizationGathererResultFlags::HasScript);
-				}
-
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4118,7 +4223,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					}
 				}
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4285,7 +4390,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 				int32 OffsetAfterPackageFileSummary = Linker->Tell();
 		
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4294,7 +4399,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				// Build NameMap.
 				Linker->Summary.NameOffset = Linker->Tell();
-				SavePackageState.UpdateLinkerWithMarkedNames(Linker);
+				SavePackageState.UpdateLinkerWithMarkedNames(Linker.Get());
 
 #if WITH_EDITOR
 				if ( GOutputCookingWarnings )
@@ -4316,7 +4421,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 #endif
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4324,9 +4429,9 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				// Sort names.
 				FObjectNameSortHelper NameSortHelper;
-				NameSortHelper.SortNames( Linker, Conform, SavePackageState );
+				NameSortHelper.SortNames( Linker.Get(), Conform, SavePackageState );
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4346,7 +4451,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 						Linker->NameIndices.Add(Linker->NameMap[i], i);
 					}
 				}
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4355,22 +4460,36 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				FStructuredArchive::FStream Stream = StructuredArchiveRoot.EnterStream(FIELD_NAME_TEXT("GatherableTextData"));
 				Linker->Summary.GatherableTextDataOffset = 0;
 				Linker->Summary.GatherableTextDataCount = 0;
-				if ( !(Linker->Summary.PackageFlags & PKG_FilterEditorOnly) && bCanCacheGatheredText )
+				if (!(Linker->Summary.PackageFlags & PKG_FilterEditorOnly))
 				{
 					// The Editor version is used as part of the check to see if a package is too old to use the gather cache, so we always have to add it if we have gathered loc for this asset
 					Linker->UsingCustomVersion(FEditorObjectVersion::GUID);
 
-					Linker->Summary.GatherableTextDataOffset = Linker->Tell();
+					bool bCanCacheGatheredText = false;
+					
+					// Gathers from the given package
+					EPropertyLocalizationGathererResultFlags GatherableTextResultFlags = EPropertyLocalizationGathererResultFlags::Empty;
+					FPropertyLocalizationDataGatherer(Linker->GatherableTextDataMap, InOuter, GatherableTextResultFlags);
 
-					// Save gatherable text data.
-					Linker->Summary.GatherableTextDataCount = Linker->GatherableTextDataMap.Num();
-					for (FGatherableTextData& GatherableTextData : Linker->GatherableTextDataMap)
+					// We can only cache packages that:
+					//	1) Don't contain script data, as script data is very volatile and can only be safely gathered after it's been compiled (which happens automatically on asset load).
+					//	2) Don't contain text keyed with an incorrect package localization ID, as these keys will be changed later during save.
+					bCanCacheGatheredText = !EnumHasAnyFlags(GatherableTextResultFlags, EPropertyLocalizationGathererResultFlags::HasScript | EPropertyLocalizationGathererResultFlags::HasTextWithInvalidPackageLocalizationID);
+
+					if (bCanCacheGatheredText)
 					{
-						Stream.EnterElement() << GatherableTextData;
+						Linker->Summary.GatherableTextDataOffset = Linker->Tell();
+
+						// Save gatherable text data.
+						Linker->Summary.GatherableTextDataCount = Linker->GatherableTextDataMap.Num();
+						for (FGatherableTextData& GatherableTextData : Linker->GatherableTextDataMap)
+						{
+							Stream.EnterElement() << GatherableTextData;
+						}
 					}
 				}
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4418,7 +4537,12 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 								}
 							}
 						}
-					
+
+						bool bExcludePackageFromCook = FCoreUObjectDelegates::ShouldCookPackageForPlatform.IsBound() ? !FCoreUObjectDelegates::ShouldCookPackageForPlatform.Execute(Obj->GetOutermost(), TargetPlatform) : false;			
+						if (bExcludePackageFromCook)
+						{
+							continue;
+						}
 #endif //WITH_EDITOR
 						FObjectImport* LocObjectImport = new(Linker->ImportMap)FObjectImport(Obj, ObjClass);
 
@@ -4436,7 +4560,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4444,10 +4568,10 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				// sort and conform imports
 				FObjectImportSortHelper ImportSortHelper;
-				ImportSortHelper.SortImports( Linker, Conform );
+				ImportSortHelper.SortImports( Linker.Get(), Conform );
 				Linker->Summary.ImportCount = Linker->ImportMap.Num();
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4484,7 +4608,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 #endif
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4492,18 +4616,18 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				// Sort exports alphabetically and conform the export table (if necessary)
 				FObjectExportSortHelper ExportSortHelper;
-				ExportSortHelper.SortExports( Linker, Conform );
+				ExportSortHelper.SortExports( Linker.Get(), Conform );
 				
 				// Sort exports for seek-free loading.
 				{
 					COOK_STAT(FScopedDurationTimer SaveTimer(SavePackageStats::SortExportsSeekfreeInnerTimeSec));
 					FObjectExportSeekFreeSorter SeekFreeSorter;
-					SeekFreeSorter.SortExports( Linker, Conform );
+					SeekFreeSorter.SortExports( Linker.Get(), Conform );
 				}
 
 				Linker->Summary.ExportCount = Linker->ExportMap.Num();
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4587,7 +4711,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4614,7 +4738,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					}
 				}
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4651,7 +4775,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4704,7 +4828,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				// Find components referenced by exports.
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4726,8 +4850,8 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				int32 OffsetAfterImportMap = Linker->Tell();
 
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
-				{ 
+				if (EndSavingIfCancelled(Linker.Get(), TempFilename))
+				{
 					return ESavePackageResult::Canceled;
 				}
 				SlowTask.EnterProgressFrame();
@@ -4748,8 +4872,8 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				int32 OffsetAfterExportMap = Linker->Tell();
 
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
-				{ 
+				if (EndSavingIfCancelled(Linker.Get(), TempFilename))
+				{
 					return ESavePackageResult::Canceled;
 				}
 				SlowTask.EnterProgressFrame();
@@ -4781,7 +4905,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 
 
-				if (EndSavingIfCancelled(Linker, TempFilename)) 
+				if (EndSavingIfCancelled(Linker.Get(), TempFilename))
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -4821,13 +4945,13 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 #endif // WITH_EDITOR
 
 					// Save thumbnails
-					UPackage::SaveThumbnails(InOuter, Linker, StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("Thumbnails")));
+					UPackage::SaveThumbnails(InOuter, Linker.Get(), StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("Thumbnails")));
 
 					// Save asset registry data so the editor can search for information about assets in this package
-					UPackage::SaveAssetRegistryData(InOuter, Linker, StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("AssetRegistry")));
+					UPackage::SaveAssetRegistryData(InOuter, Linker.Get(), StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("AssetRegistry")));
 
 					// Save level information used by World browser
-					UPackage::SaveWorldLevelInfo(InOuter, Linker, StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("WorldLevelInfo")));
+					UPackage::SaveWorldLevelInfo(InOuter, Linker.Get(), StructuredArchiveRoot.EnterField(FIELD_NAME_TEXT("WorldLevelInfo")));
 				}
 
 
@@ -4924,7 +5048,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					const EObjectMark ExcludedObjectMarks = UPackage::GetExcludedObjectMarksForTargetPlatform(Linker->CookingTarget(), Linker->IsCooking());
 					Linker->Summary.PreloadDependencyCount = 0;
 
-					auto IncludeObjectAsDependency = [Linker, ExcludedObjectMarks](int32 CallSite, TSet<FPackageIndex>& AddTo, UObject* ToTest, UObject* ForObj, bool bMandatory, bool bOnlyIfInLinkerTable)
+					auto IncludeObjectAsDependency = [&Linker, ExcludedObjectMarks](int32 CallSite, TSet<FPackageIndex>& AddTo, UObject* ToTest, UObject* ForObj, bool bMandatory, bool bOnlyIfInLinkerTable)
 					{
 						// Skip transient, editor only, and excluded client/server objects
 						if (ToTest)
@@ -4971,7 +5095,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 						}
 					};
 
-					auto IncludeIndexAsDependency = [Linker](TSet<FPackageIndex>& AddTo, FPackageIndex Dep)
+					auto IncludeIndexAsDependency = [&Linker](TSet<FPackageIndex>& AddTo, FPackageIndex Dep)
 					{
 						if (!Dep.IsNull())
 						{
@@ -5103,7 +5227,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 								IncludeIndexAsDependency(CreateBeforeCreateDependencies, Export.SuperIndex);
 							}
 
-							auto AddArcForDepChecking = [Linker, &Export, &EDLCookChecker](bool bExportIsSerialize, FPackageIndex Dep, bool bDepIsSerialize)
+							auto AddArcForDepChecking = [&Linker, &Export, &EDLCookChecker](bool bExportIsSerialize, FPackageIndex Dep, bool bDepIsSerialize)
 							{
 								check(Export.Object);
 								check(!Dep.IsNull());
@@ -5187,7 +5311,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				
 				Linker->Summary.TotalHeaderSize	= Linker->Tell();
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -5213,7 +5337,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 					int32 LastExportSaveStep = 0;
 					for( int32 i=0; i<Linker->ExportMap.Num(); i++ )
 					{
-						if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+						if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 						{ 
 							return ESavePackageResult::Canceled;
 						}
@@ -5297,7 +5421,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				}
 
 				
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -5316,8 +5440,8 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 					FScopedSlowTask BulkDataFeedback(Linker->BulkDataToAppend.Num());
 
-					FArchive* TargetArchive = Linker;
 					FArchive* BulkArchive = nullptr;
+					FArchive* OptionalBulkArchive = nullptr;
 					uint32 ExtraBulkDataFlags = 0;
 
 					static struct FUseSeperateBulkDataFiles
@@ -5341,16 +5465,23 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 					const FString BulkFilename = FPaths::ChangeExtension(Filename, TEXT(".ubulk"));
 
+					const static TCHAR* OptionalBulkFileExtension = TEXT("uptnl");
+
+					const FString OptionalBulkFilename = FPaths::ChangeExtension(Filename, OptionalBulkFileExtension);
+
 					if (bShouldUseSeparateBulkFile)
 					{
 						ExtraBulkDataFlags = BULKDATA_PayloadInSeperateFile;
 						if ( bSaveAsync )
 						{
-							TargetArchive = BulkArchive = new FBufferArchive(true);
+							BulkArchive = new FBufferArchive(true);
+							OptionalBulkArchive = new FBufferArchive(true);
+
 						}
 						else
 						{
-							TargetArchive = BulkArchive = IFileManager::Get().CreateFileWriter(*BulkFilename);
+							BulkArchive = IFileManager::Get().CreateFileWriter(*BulkFilename);
+							OptionalBulkArchive = IFileManager::Get().CreateFileWriter(*OptionalBulkFilename);
 						}
 					}
 
@@ -5363,8 +5494,16 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 						// Set bulk data flags to what they were during initial serialization (they might have changed after that)
 						const uint32 OldBulkDataFlags = BulkDataStorageInfo.BulkData->GetBulkDataFlags();
 						uint32 ModifiedBulkDataFlags = BulkDataStorageInfo.BulkDataFlags | ExtraBulkDataFlags;
+						BulkDataStorageInfo.BulkData->ClearBulkDataFlags(0xFFFFFFFF);
 						BulkDataStorageInfo.BulkData->SetBulkDataFlags(ModifiedBulkDataFlags);
 
+						FArchive* TargetArchive = Linker.Get();
+						if ( bShouldUseSeparateBulkFile )
+						{
+							check( OptionalBulkArchive && BulkArchive );
+							TargetArchive = ModifiedBulkDataFlags & BULKDATA_OptionalPayload ? OptionalBulkArchive : BulkArchive;
+						}
+
 						int64 BulkStartOffset = TargetArchive->Tell();
 						int64 StoredBulkStartOffset = BulkStartOffset - StartOfBulkDataArea;
 
@@ -5394,27 +5533,36 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 					if (BulkArchive)
 					{
-						TotalPackageSizeUncompressed += BulkArchive->TotalSize();
-						BulkArchive->Close();
+						check( OptionalBulkArchive);
+						auto FinalizeBulkDataFile = [&bSaveAsync,&TotalPackageSizeUncompressed](FArchive* Archive, const FString& ArchiveFilename)
+							{
+								TotalPackageSizeUncompressed += Archive->TotalSize();
+								Archive->Close();
 						if ( bSaveAsync )
 						{
-							FBufferArchive* BulkBuffer = (FBufferArchive*)(BulkArchive);
+									FBufferArchive* Buffer = (FBufferArchive*)(Archive);
 
-							int64 DataSize = BulkBuffer->TotalSize();
+									if ( Buffer->TotalSize() > 0 )
+									{
+										int64 DataSize = Buffer->TotalSize();
 
 							// TODO - update the BulkBuffer code to write into a FLargeMemoryWriter so we can 
 							// take ownership of the data
 							uint8* Data = new uint8[DataSize];
-							FMemory::Memcpy(Data, BulkBuffer->GetData(), DataSize);							
+										FMemory::Memcpy(Data, Buffer->GetData(), DataSize);
 
 							FLargeMemoryPtr DataPtr = FLargeMemoryPtr(Data);
 		
-							if ( BulkBuffer->Num() > 0 )
-							{
-								AsyncWriteFile(MoveTemp(DataPtr), DataSize, *BulkFilename, FDateTime::MinValue(), false);
+										AsyncWriteFile(MoveTemp(DataPtr), DataSize, *ArchiveFilename, FDateTime::MinValue(), false);
 							}
 						}
-						delete BulkArchive;
+								delete Archive;
+							};
+
+						FinalizeBulkDataFile(BulkArchive, BulkFilename);
+						FinalizeBulkDataFile(OptionalBulkArchive, OptionalBulkFilename);
+
+						
 					}
 				}
 
@@ -5522,10 +5670,10 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 
 				if (!bTextFormat)
 				{
-				check( Linker->Tell() == OffsetAfterExportMap );
+					check( Linker->Tell() == OffsetAfterExportMap );
 				}
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if (EndSavingIfCancelled(Linker.Get(), TempFilename))
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -5568,7 +5716,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				check( Linker->Tell() == OffsetAfterPackageFileSummary );
 				}
 
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -5586,7 +5734,7 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				UNCLOCK_CYCLES(Time);
 				UE_CLOG(!(SaveFlags & (SAVE_DiffCallstack | SAVE_DiffOnly)), LogSavePackage, Verbose,  TEXT("Save=%.2fms"), FPlatformTime::ToMilliseconds(Time) );
 		
-				if ( EndSavingIfCancelled( Linker, TempFilename ) ) 
+				if ( EndSavingIfCancelled( Linker.Get(), TempFilename ) )
 				{ 
 					return ESavePackageResult::Canceled;
 				}
@@ -5596,21 +5744,35 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 				{
 					// Compress the temporarily file to destination.
 					if (bSaveAsync)
-					{
-						UE_CLOG(!(SaveFlags & (SAVE_DiffCallstack | SAVE_DiffOnly)), LogSavePackage, Verbose, TEXT("Async saving from memory to '%s'"), *NewPath);
-
+					{						
+						FString NewPathToSave = NewPath;
 #if WITH_EDITOR
+
 						if (SaveFlags & SAVE_DiffCallstack)
 						{
 							const TCHAR* CutoffString = TEXT("UEditorEngine::Save()");
 							FArchiveStackTrace* Writer = (FArchiveStackTrace*)(Linker->Saver);
-							FArchiveDiffStats PackageDiffStats;
+							TMap<FName, FArchiveDiffStats> PackageDiffStats;
 							Writer->CompareWith(*NewPath, IsEventDrivenLoaderEnabledInCookedBuilds() ? Linker->Summary.TotalHeaderSize : 0, CutoffString, DiffSettings.MaxDiffsToLog, PackageDiffStats);
 							TotalPackageSizeUncompressed = Writer->TotalSize();
+
+							auto MergeStats = [](TMap<FName, FArchiveDiffStats>& InOut, const TMap<FName, FArchiveDiffStats>& ToMerge)
+							{
+								for (const TPair<FName, FArchiveDiffStats>& Stat : ToMerge)
+								{
+									InOut.FindOrAdd(Stat.Key).DiffSize         += Stat.Value.DiffSize;
+									InOut.FindOrAdd(Stat.Key).NewFileTotalSize += Stat.Value.NewFileTotalSize;
+									InOut.FindOrAdd(Stat.Key).NumDiffs         += Stat.Value.NumDiffs;
+								}
+							};
+
 							COOK_STAT(SavePackageStats::NumberOfDifferentPackages++);
-							COOK_STAT(SavePackageStats::DifferentPackagesSizeMB += ((double)(PackageDiffStats.NewFileTotalSize) / 1024.0 / 1024.0));
-							COOK_STAT(SavePackageStats::NumberOfDifferencesInPackages += PackageDiffStats.NumDiffs);
-							COOK_STAT(SavePackageStats::PackageDifferencesSizeMB += ((double)(PackageDiffStats.DiffSize) / 1024.0 / 1024.0));
+							COOK_STAT(MergeStats(SavePackageStats::PackageDiffStats, PackageDiffStats));
+
+							if (DiffSettings.bSaveForDiff)
+							{
+								NewPathToSave = FPaths::Combine(FPaths::GetPath(NewPath), FPaths::GetBaseFilename(NewPath) + TEXT("_ForDiff") + FPaths::GetExtension(NewPath, true));
+							}
 						}
 						else if (SaveFlags & SAVE_DiffOnly)
 						{
@@ -5623,9 +5785,12 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 								*InOutDiffMap = MoveTemp(OutDiffMap);
 							}
 						}
-						else
+						
+						if (!(SaveFlags & SAVE_DiffOnly) && (!(SaveFlags & SAVE_DiffCallstack) || DiffSettings.bSaveForDiff))
 #endif // WITH_EDITOR
 						{
+							UE_LOG(LogSavePackage, Verbose, TEXT("Async saving from memory to '%s'"), *NewPathToSave);
+
 							// Detach archive used for memory saving.
 							FLargeMemoryWriter* Writer = (FLargeMemoryWriter*)(Linker->Saver);
 							int64 DataSize = Writer->TotalSize();
@@ -5637,11 +5802,11 @@ FSavePackageResultStruct UPackage::Save(UPackage* InOuter, UObject* Base, EObjec
 							Writer->ReleaseOwnership();
 							if (IsEventDrivenLoaderEnabledInCookedBuilds() && Linker->IsCooking())
 							{
-								AsyncWriteFileWithSplitExports(MoveTemp(DataPtr), DataSize, Linker->Summary.TotalHeaderSize, *NewPath, FinalTimeStamp);
+								AsyncWriteFileWithSplitExports(MoveTemp(DataPtr), DataSize, Linker->Summary.TotalHeaderSize, *NewPathToSave, FinalTimeStamp);
 							}
 							else
 							{
-								AsyncWriteFile(MoveTemp(DataPtr), DataSize, *NewPath, FinalTimeStamp);
+								AsyncWriteFile(MoveTemp(DataPtr), DataSize, *NewPathToSave, FinalTimeStamp);
 							}
 						}
 						Linker->Detach();
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/ScriptCore.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/ScriptCore.cpp
index 67d8587cc520..6d2cc34f06c9 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/ScriptCore.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/ScriptCore.cpp
@@ -184,12 +184,13 @@ void FBlueprintCoreDelegates::SetScriptMaximumLoopIterations( const int32 Maximu
 	}
 }
 
+#if DO_BLUEPRINT_GUARD
+
 // This is meant to be called from the immediate mode, and for confusing reasons the optimized code isn't always safe in that case
 PRAGMA_DISABLE_OPTIMIZATION
 
 void PrintScriptCallStackImpl()
 {
-#if DO_BLUEPRINT_GUARD
 	FBlueprintExceptionTracker& BlueprintExceptionTracker = FBlueprintExceptionTracker::Get();
 	if( BlueprintExceptionTracker.ScriptStack.Num() > 0 )
 	{
@@ -201,12 +202,12 @@ void PrintScriptCallStackImpl()
 
 		UE_LOG( LogOutputDevice, Warning, TEXT( "%s" ), *ScriptStack );
 	}
-#endif
 }
 
 PRAGMA_ENABLE_OPTIMIZATION
 
 extern CORE_API void (*GPrintScriptCallStackFn)();
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 // FEditorScriptExecutionGuard
@@ -218,8 +219,6 @@ FEditorScriptExecutionGuard::FEditorScriptExecutionGuard()
 	if( GIsEditor && !FApp::IsGame() )
 	{
 		GInitRunaway();
-		
-		GPrintScriptCallStackFn = &PrintScriptCallStackImpl;
 	}
 }
 
@@ -397,6 +396,13 @@ FString FFrame::GetStackDescription() const
 	return Node->GetOuter()->GetName() + TEXT(".") + Node->GetName();
 }
 
+#if DO_BLUEPRINT_GUARD
+void FFrame::InitPrintScriptCallstack()
+{
+	GPrintScriptCallStackFn = &PrintScriptCallStackImpl;
+}
+#endif
+
 //
 // Error or warning handler.
 //
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/SoftObjectPath.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/SoftObjectPath.cpp
index 58a52f1457e6..9efe4536cf7d 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/SoftObjectPath.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/SoftObjectPath.cpp
@@ -186,10 +186,10 @@ bool FSoftObjectPath::operator==(FSoftObjectPath const& Other) const
 	return AssetPathName == Other.AssetPathName && SubPathString == Other.SubPathString;
 }
 
-FSoftObjectPath& FSoftObjectPath::operator=(FSoftObjectPath const& Other)
+FSoftObjectPath& FSoftObjectPath::operator=(FSoftObjectPath Other)
 {
 	AssetPathName = Other.AssetPathName;
-	SubPathString = Other.SubPathString;
+	SubPathString = MoveTemp(Other.SubPathString);
 	return *this;
 }
 
@@ -217,7 +217,7 @@ bool FSoftObjectPath::ExportTextItem(FString& ValueStr, FSoftObjectPath const& D
 
 bool FSoftObjectPath::ImportTextItem(const TCHAR*& Buffer, int32 PortFlags, UObject* Parent, FOutputDevice* ErrorText)
 {
-	FString ImportedPath = TEXT("");
+	FString ImportedPath;
 	const TCHAR* NewBuffer = UPropertyHelpers::ReadToken(Buffer, ImportedPath, 1);
 	if (!NewBuffer)
 	{
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectArray.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectArray.cpp
index da8a6e75f4cd..a7f8cc9c7ffd 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectArray.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectArray.cpp
@@ -65,6 +65,9 @@ void FUObjectArray::CloseDisregardForGC()
 
 	check(OpenForDisregardForGC);
 
+	// Make sure all classes that have been loaded/created so far are properly initialized
+	ProcessNewlyLoadedUObjects();
+
 	UClass::AssembleReferenceTokenStreams();
 
 	if (GIsInitialLoad)
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectClusters.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectClusters.cpp
index 3c975523d15f..677d6072ca3b 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectClusters.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectClusters.cpp
@@ -469,7 +469,7 @@ public:
 	void AddObjectToCluster(int32 ObjectIndex, FUObjectItem* ObjectItem, UObject* Obj, TArray<UObject*>& ObjectsToSerialize, bool bOuterAndClass)
 	{
 		// If we haven't finished loading, we can't be sure we know all the references
-		checkf(!Obj->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("%s hasn't been loaded (%s) but is being added to cluster %s"), 
+		checkf(!Obj->HasAnyFlags(RF_NeedLoad), TEXT("%s hasn't been loaded (%s) but is being added to cluster %s"), 
 			*Obj->GetFullName(), 
 			*LoadFlagsToString(Obj),
 			*GetClusterRoot()->GetFullName());
@@ -555,9 +555,9 @@ public:
 	{
 		if (Object)
 		{
-			// If we haven't finished loading, we can't be sure we know all the references
-			checkf(!Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("%s hasn't been loaded (%s) but is being added to cluster %s"),
-				*Object->GetFullName(), 
+			// If we haven't finished loading, we can't be sure we know all the references so the object will be added as mutable reference
+			UE_CLOG(Object->HasAnyFlags(RF_NeedLoad), LogObj, Log, TEXT("%s hasn't been loaded (%s) but is being added to cluster %s"),
+				*Object->GetFullName(),
 				*LoadFlagsToString(Object),
 				*GetClusterRoot()->GetFullName());
 
@@ -601,17 +601,13 @@ public:
 					check(ObjectItem->GetOwnerIndex() == 0);
 
 					// New object, add it to the cluster.
-					if (Object->CanBeInCluster() && !Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad))
+					if (Object->CanBeInCluster() && !Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad) && !Object->IsRooted())
 					{
 						AddObjectToCluster(GUObjectArray.ObjectToIndex(Object), ObjectItem, Object, ObjectsToSerialize, true);
 					}
 					else
 					{
-						checkf(!Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("%s hasn't been loaded (%s) but is being added to cluster %s"),
-							*Object->GetFullName(), 
-							*LoadFlagsToString(Object),
-							*GetClusterRoot()->GetFullName());
-
+						// If the object can't be in a cluster or is being loaded, adding to the mutable objects list (and we won't be processing it further)
 						Cluster.MutableObjects.AddUnique(GUObjectArray.ObjectToIndex(Object));
 					}
 				}
@@ -703,7 +699,7 @@ void UObjectBaseUtility::CreateCluster()
 	}
 
 	// If we haven't finished loading, we can't be sure we know all the references
-	check(!HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad));
+	check(!HasAnyFlags(RF_NeedLoad));
 
 	// Create a new cluster, reserve an arbitrary amount of memory for it.
 	const int32 ClusterIndex = GUObjectClusters.AllocateCluster(InternalIndex);
diff --git a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectGlobals.cpp b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectGlobals.cpp
index 21bf3c04d1f1..8c07c8c42b68 100644
--- a/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectGlobals.cpp
+++ b/Engine/Source/Runtime/CoreUObject/Private/UObject/UObjectGlobals.cpp
@@ -59,7 +59,8 @@ DEFINE_LOG_CATEGORY(LogUObjectGlobals);
 #include "ProfilingDebugging/MallocProfiler.h"
 #endif
 
-bool						GIsSavingPackage = false;
+bool GIsSavingPackage = false;
+bool GAllowUnversionedContentInEditor = false;
 
 /** Object annotation used by the engine to keep track of which objects are selected */
 FUObjectAnnotationSparseBool GSelectedObjectAnnotation;
@@ -142,6 +143,7 @@ FCoreUObjectDelegates::FOnRedirectorFollowed FCoreUObjectDelegates::RedirectorFo
 PRAGMA_ENABLE_DEPRECATION_WARNINGS
 FSimpleMulticastDelegate FCoreUObjectDelegates::PostDemoPlay;
 FCoreUObjectDelegates::FOnLoadObjectsOnTop FCoreUObjectDelegates::ShouldLoadOnTop;
+FCoreUObjectDelegates::FShouldCookPackageForPlatform FCoreUObjectDelegates::ShouldCookPackageForPlatform;
 
 FCoreUObjectDelegates::FPackageCreatedForLoad FCoreUObjectDelegates::PackageCreatedForLoad;
 FCoreUObjectDelegates::FGetPrimaryAssetIdForObject FCoreUObjectDelegates::GetPrimaryAssetIdForObject;
@@ -230,6 +232,36 @@ namespace
 	}
 }
 
+/** Object annotation used to keep track of the number suffixes  */
+struct FPerClassNumberSuffixAnnotation
+{
+	// The annotation container uses this to trim annotations that return to
+	// the default state - this never happens for this annotation type.
+	FORCEINLINE bool IsDefault()
+	{
+		return false;
+	}
+
+	TMap<UClass*, int32> Suffixes;
+};
+
+/**
+ * Updates the suffix to be given to the next newly-created unnamed object.
+ *
+ * Updating is done via a callback because a lock needs to be maintained while this happens.
+ */
+int32 UpdateSuffixForNextNewObject(UObject* Parent, UClass* Class, TFunctionRef<void(int32&)> IndexMutator)
+{
+	static FCriticalSection PerClassNumberSuffixAnnotationMutex;
+	static FUObjectAnnotationDense<FPerClassNumberSuffixAnnotation, true> PerClassNumberSuffixAnnotation;
+
+	FPerClassNumberSuffixAnnotation& Annotation = PerClassNumberSuffixAnnotation.GetAnnotationRef(Parent);
+	FScopeLock Lock(&PerClassNumberSuffixAnnotationMutex);
+	int32& Result = Annotation.Suffixes.FindOrAdd(Class);
+	IndexMutator(Result);
+	return Result;
+}
+
 /**
  * Fast version of StaticFindObject that relies on the passed in FName being the object name
  * without any group/ package qualifiers.
@@ -341,7 +373,7 @@ UObject* StaticFindObjectChecked( UClass* ObjectClass, UObject* ObjectParent, co
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	if( !Result )
 	{
-		UE_LOG(LogUObjectGlobals, Fatal, TEXT("%s"), *FString::Printf( TEXT("Failed to find object '%s %s.%s'"), *ObjectClass->GetName(), ObjectParent==ANY_PACKAGE ? TEXT("Any") : ObjectParent ? *ObjectParent->GetName() : TEXT("None"), InName));
+		UE_LOG(LogUObjectGlobals, Fatal, TEXT("Failed to find object '%s %s.%s'"), *ObjectClass->GetName(), ObjectParent==ANY_PACKAGE ? TEXT("Any") : ObjectParent ? *ObjectParent->GetName() : TEXT("None"), InName);
 	}
 #endif
 	return Result;
@@ -1111,7 +1143,7 @@ public:
 * @param	ImportLinker	Linker that requests this package through one of its imports
 * @return	Loaded package if successful, NULL otherwise
 */
-UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageNameOrFilename, uint32 LoadFlags, FLinkerLoad* ImportLinker)
+UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageNameOrFilename, uint32 LoadFlags, FLinkerLoad* ImportLinker, FArchive* InReaderOverride)
 {
 	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("LoadPackageInternal"), STAT_LoadPackageInternal, STATGROUP_ObjectVerbose);
 
@@ -1241,7 +1273,7 @@ UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageNameO
 		}
 #endif
 
-		Linker = GetPackageLinker(InOuter, *FileToLoad, LoadFlags, nullptr, nullptr);
+		Linker = GetPackageLinker(InOuter, *FileToLoad, LoadFlags, nullptr, nullptr, InReaderOverride);
 		
 		if (!Linker)
 		{
@@ -1421,7 +1453,7 @@ UPackage* LoadPackageInternal(UPackage* InOuter, const TCHAR* InLongPackageNameO
 	return Result;
 }
 
-UPackage* LoadPackage(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags)
+UPackage* LoadPackage(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FArchive* InReaderOverride)
 {
 	COOK_STAT(LoadPackageStats::NumPackagesLoaded++);
 	COOK_STAT(FScopedDurationTimer LoadTimer(LoadPackageStats::LoadPackageTimeSec));
@@ -1436,7 +1468,7 @@ UPackage* LoadPackage(UPackage* InOuter, const TCHAR* InLongPackageName, uint32
 	// since we are faking the object name, this is basically a duplicate of LLM_SCOPED_TAG_WITH_OBJECT_IN_SET
 	FString FakePackageName = FString(TEXT("Package ")) + InLongPackageName;
 	LLM_SCOPED_TAG_WITH_STAT_NAME_IN_SET(FLowLevelMemTracker::Get().IsTagSetActive(ELLMTagSet::Assets) ? FDynamicStats::CreateMemoryStatId<FStatGroup_STATGROUP_LLMAssets>(FName(*FakePackageName)).GetName() : NAME_None, ELLMTagSet::Assets, ELLMTracker::Default);
-	return LoadPackageInternal(InOuter, InLongPackageName, LoadFlags, /*ImportLinker =*/ nullptr);
+	return LoadPackageInternal(InOuter, InLongPackageName, LoadFlags, /*ImportLinker =*/ nullptr, InReaderOverride);
 }
 
 /**
@@ -1806,11 +1838,9 @@ FName MakeUniqueObjectName( UObject* Parent, UClass* Class, FName InBaseName/*=N
 				else
 				{
 					int32 NameNumber = 0;
-					if (Parent && (Parent != ANY_PACKAGE) )
+					if (Parent && (Parent != ANY_PACKAGE))
 					{
-						UPackage* ParentPackage = Parent->GetOutermost();
-						int32& ClassUnique = ParentPackage->GetClassUniqueNameIndexMap().FindOrAdd(Class->GetFName());
-						NameNumber = ++ClassUnique;
+						NameNumber = UpdateSuffixForNextNewObject(Parent, Class, [](int32& Index) { ++Index; });
 					}
 					else
 					{
@@ -3252,7 +3282,7 @@ public:
 		: FReferenceCollectorArchive(InSerializingObject, InCollector)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = InCollector.IsIgnoringTransient();
+		this->SetIsPersistent(InCollector.IsIgnoringTransient());
 		ArIgnoreArchetypeRef = InCollector.IsIgnoringArchetypeRef();
 	}
 
@@ -4476,7 +4506,7 @@ namespace UE4CodeGen_Private
 		{
 			check((NewClass->ClassFlags & CLASS_TokenStreamAssembled) != CLASS_TokenStreamAssembled);
 			NewClass->ReferenceTokenStream.Empty();
-#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+#if ENABLE_GC_OBJECT_CHECKS
 			NewClass->DebugTokenMap.Empty();
 #endif
 		}
diff --git a/Engine/Source/Runtime/CoreUObject/Public/CoreUObject.h b/Engine/Source/Runtime/CoreUObject/Public/CoreUObject.h
index 4754ab61dcf3..2057c8ce521f 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/CoreUObject.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/CoreUObject.h
@@ -84,8 +84,6 @@ MONOLITHIC_HEADER_BOILERPLATE()
 #include "UObject/LinkerLoad.h"
 #include "UObject/LinkerSave.h"
 #include "UObject/GCObject.h"
-#include "Serialization/AsyncPackage.h"
-#include "Serialization/AsyncLoading.h"
 #include "Misc/NotifyHook.h"
 #include "Misc/RedirectCollector.h"
 #include "UObject/ScriptStackTracker.h"
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveScriptReferenceCollector.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveScriptReferenceCollector.h
index 6e1fc7805592..7b894cf8e640 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveScriptReferenceCollector.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveScriptReferenceCollector.h
@@ -22,7 +22,7 @@ public:
 		: ObjectArray(InObjectArray)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = false;
+		this->SetIsPersistent(false);
 		ArIgnoreArchetypeRef = false;
 	}
 protected:
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveStackTrace.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveStackTrace.h
index 30019eb70ce4..fbe2e4aa07d9 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveStackTrace.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ArchiveStackTrace.h
@@ -4,8 +4,12 @@
 
 #include "CoreMinimal.h"
 #include "Serialization/LargeMemoryWriter.h"
+#include "Serialization/LargeMemoryReader.h"
 
 class FUObjectThreadContext;
+class FLinkerLoad;
+struct FObjectImport;
+struct FObjectExport;
 
 /** Structure that holds stats from comparing two packages */
 struct COREUOBJECT_API FArchiveDiffStats
@@ -106,30 +110,24 @@ class COREUOBJECT_API FArchiveStackTrace : public FLargeMemoryWriter
 		/** Full callstack */
 		ANSICHAR* Callstack;
 		/** Full name of the currently serialized object */
-		FString SerializedObject;
+		FString SerializedObjectName;
+		/** The currently serialized property */
+		UProperty* SerializedProp;
 		/** Name of the currently serialized property */
-		FString SerializedProperty;
+		FString SerializedPropertyName;
 
-		FCallstackData()
-			: Callstack(nullptr)
-		{}
-		FCallstackData(ANSICHAR* InCallstack, const TCHAR* InSerializedObject, const TCHAR* InSerializedProperty)
-			: Callstack(InCallstack)
-		{
-			if (InSerializedObject)
-			{
-				SerializedObject = InSerializedObject;
-			}
-			if (InSerializedProperty)
-			{
-				SerializedProperty = InSerializedProperty;
-			}
-		}
+		FCallstackData();
+		FCallstackData(ANSICHAR* InCallstack, UObject* InSerializedObject, UProperty* InSerializedProperty);
 
 		/** Converts the callstack and associated data to human readable string */
-		FString ToString(const TCHAR* CallstackCutoffText, int32 Indent) const;
+		FString ToString(const TCHAR* CallstackCutoffText) const;
 	};
 
+	/** The asset being serialized */
+	UObject* Asset;
+	/** The class of asset being serialized */
+	FName AssetClass;
+
 	/** List of offsets and their respective callstacks */
 	TArray<FCallstactAtOffset> CallstackAtOffsetMap;
 	/** Contains all unique callstacks for all Serialize calls */
@@ -150,8 +148,13 @@ class COREUOBJECT_API FArchiveStackTrace : public FLargeMemoryWriter
 	/** Cached thread context */
 	FUObjectThreadContext& ThreadContext;
 
+#if WITH_EDITOR
+	/** Current debug name stack */
+	TArray<FName> DebugDataStack;
+#endif
+
 	/** Adds a unique callstack to UniqueCallstacks map */
-	ANSICHAR* AddUniqueCallstack(const ANSICHAR* InCallstack, UObject* InSerializedObject, UProperty* InSerializedProperty, uint32& OutCallstackCRC);
+	ANSICHAR* AddUniqueCallstack(UObject* InSerializedObject, UProperty* InSerializedProperty, uint32& OutCallstackCRC);
 
 	/** Finds a callstack associated with data at the specified offset */
 	int32 GetCallstackAtOffset(int64 InOffset, int32 MinOffsetIndex);
@@ -180,6 +183,8 @@ class COREUOBJECT_API FArchiveStackTrace : public FLargeMemoryWriter
 		return false;
 	}
 
+public:
+
 	struct FPackageData
 	{
 		uint8* Data;
@@ -195,27 +200,95 @@ class COREUOBJECT_API FArchiveStackTrace : public FLargeMemoryWriter
 		{}
 	};
 
-	/** Helper function to load package contents into memory. Supports EDL packages. */
-	static bool LoadPackageIntoMemory(const TCHAR* InFilename, FPackageData& OutPackageData);
+private:
 
-	void CompareWithInternal(const FPackageData& SourcePackage, const FPackageData& DestPackage, const TCHAR* AssetFilename, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, int32& InOutDiffsLogged, FArchiveDiffStats& OutStats);
+	void CompareWithInternal(const FPackageData& SourcePackage, const FPackageData& DestPackage, const TCHAR* AssetFilename, const TCHAR* CallstackCutoffText, const int64 MaxDiffsToLog, int32& InOutDiffsLogged, TMap<FName, FArchiveDiffStats>& OutStats);
 	bool GenerateDiffMapInternal(const FPackageData& SourcePackage, const FPackageData& DestPackage, int32 MaxDiffsToFind, FArchiveDiffMap& OutDiffMap);
+	void DumpPackageHeaderDiffs(const FPackageData& SourcePackage, const FPackageData& DestPackage, const FString& AssetFilename, const int32 MaxDiffsToLog);
+	static FLinkerLoad* CreateLinkerForPackage(const FString& InPackageName, const FString& InFilename, const FPackageData& PackageData);
 
 public:
 
-	FArchiveStackTrace(const TCHAR* InFilename, bool bInCollectCallstacks = true, const FArchiveDiffMap* InDiffMap = nullptr);
+	FArchiveStackTrace(UObject* InAsset, const TCHAR* InFilename, bool bInCollectCallstacks = true, const FArchiveDiffMap* InDiffMap = nullptr);
 	virtual ~FArchiveStackTrace();
 
 	//~ Begin FArchive Interface
 	virtual void Serialize(void* Data, int64 Num) override;
+#if WITH_EDITOR
+	virtual void PushDebugDataString(const FName& DebugData) override
+	{
+		DebugDataStack.Add(DebugData);
+	}
+	virtual void PopDebugDataString() override
+	{
+		DebugDataStack.Pop();
+	}
+#endif
 	//~ End FArchive Interface		
 
 	/** Compares the contents of this archive with the package on disk. Dumps all differences to log. */
-	void CompareWith(const TCHAR* InFilename, const int64 TotalHeaderSize, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, FArchiveDiffStats& OutStats);
+	void CompareWith(const TCHAR* InFilename, const int64 TotalHeaderSize, const TCHAR* CallstackCutoffText, const int32 MaxDiffsToLog, TMap<FName, FArchiveDiffStats>& OutStats);
 
 	/** Generates a map of all differences between the package on disk and this file. */
-	bool GenerateDiffMap(const TCHAR* InFilename, int64 TotalHeaderSize, int32 MaxDiffsToFind, FArchiveDiffMap& OutDiffMap);
+	bool GenerateDiffMap(const TCHAR* InFilename, int64 TotalHeaderSize, int32 MaxDiffsToFind, FArchiveDiffMap& OutDiffMap);	
 
 	/** Compares the specified file on disk with the provided buffer */
 	static bool IsIdentical(const TCHAR* InFilename, int64 BufferSize, const uint8* BufferData);
+
+	/** Helper function to load package contents into memory. Supports EDL packages. */
+	static bool LoadPackageIntoMemory(const TCHAR* InFilename, FPackageData& OutPackageData);
 };
+
+class COREUOBJECT_API FArchiveStackTraceReader : public FLargeMemoryReader
+{
+public:
+	struct FSerializeData
+	{
+		FSerializeData()
+			: Offset(0)
+			, Size(0)
+			, Count(0)
+			, Object(nullptr)
+			, Property(nullptr)
+		{}
+		FSerializeData(int64 InOffset, int64 InSize, UObject* InObject, UProperty* InProperty)
+			: Offset(InOffset)
+			, Size(InSize)
+			, Count(1)
+			, Object(InObject)
+			, Property(InProperty)
+		{}
+		int64 Offset;
+		int64 Size;
+		int64 Count;
+		UObject* Object;
+		UProperty* Property;
+		bool IsIdentical(const FSerializeData& Other) const
+		{
+			return Object == Other.Object && Property == Other.Property &&
+				(Offset == Other.Offset || (Offset + Size) == Other.Offset); // This is to merge contiguous blocks
+		}
+		bool operator==(const FSerializeData& Other) const
+		{
+			return IsIdentical(Other);
+		}
+		bool operator!=(const FSerializeData& Other) const
+		{
+			return !IsIdentical(Other);
+		}
+	};
+private:
+	TArray<FSerializeData> SerializeTrace;
+	/** Cached thread context */
+	FUObjectThreadContext& ThreadContext;
+public:
+
+	FArchiveStackTraceReader(const TCHAR* InFilename, const uint8* InData, const int64 Num);
+
+	virtual void Serialize(void* OutData, int64 Num) override;
+	const TArray<FSerializeData>& GetSerializeTrace() const
+	{
+		return SerializeTrace;
+	}
+	static FArchiveStackTraceReader* CreateFromFile(const TCHAR* InFilename);
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/AsyncLoading.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/AsyncLoading.h
index 4ec33759ef60..731a3d0845d0 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/AsyncLoading.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/AsyncLoading.h
@@ -334,7 +334,7 @@ public:
 * FLinkerLoad.
 */
 
-struct FAsyncPackage : FGCObject
+struct FAsyncPackage : public FGCObject
 {
 	friend struct FScopedAsyncPackageEvent;
 	/**
@@ -477,6 +477,10 @@ struct FAsyncPackage : FGCObject
 
 	/** FGCObject Interface */
 	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+	virtual FString GetReferencerName() const override
+	{ 
+		return FString::Printf(TEXT("FAsyncPackage %s"), *GetPackageName().ToString()); 
+	}
 
 	/** Adds a new object referenced by this package */
 	void AddObjectReference(UObject* InObject);
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/BulkData.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/BulkData.h
index 86ba06a56f52..c258e20bac4c 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/BulkData.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/BulkData.h
@@ -35,7 +35,9 @@ enum EBulkDataFlags
 	/** If set, payload is compressed using platform specific bit window			*/
 	BULKDATA_SerializeCompressedBitWindow		= 1<<9,
 	/** There is a new default to inline unless you opt out */
-	BULKDATA_Force_NOT_InlinePayload = 1 << 10,
+	BULKDATA_Force_NOT_InlinePayload			= 1 << 10,
+	/** This payload is optional and may not be on device */
+	BULKDATA_OptionalPayload					= 1 << 11,
 };
 
 /**
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ObjectReader.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ObjectReader.h
index b6fd95737e27..8a283197a510 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/ObjectReader.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/ObjectReader.h
@@ -22,8 +22,8 @@ public:
 	FObjectReader(UObject* Obj, TArray<uint8>& InBytes, bool bIgnoreClassRef = false, bool bIgnoreArchetypeRef = false)
 		: Bytes(InBytes)
 	{
-		ArIsLoading = true;
-		ArIsPersistent = false;
+		this->SetIsLoading(true);
+		this->SetIsPersistent(false);
 		ArIgnoreClassRef = bIgnoreClassRef;
 		ArIgnoreArchetypeRef = bIgnoreArchetypeRef;
 
@@ -76,8 +76,8 @@ protected:
 	FObjectReader(TArray<uint8>& InBytes)
 		: Bytes(InBytes)
 	{
-		ArIsLoading = true;
-		ArIsPersistent = false;
+		this->SetIsLoading(true);
+		this->SetIsPersistent(false);
 		ArIgnoreClassRef = false;
 		ArIgnoreArchetypeRef = false;
 	}
diff --git a/Engine/Source/Runtime/CoreUObject/Public/Serialization/PropertyLocalizationDataGathering.h b/Engine/Source/Runtime/CoreUObject/Public/Serialization/PropertyLocalizationDataGathering.h
index c64a36a059f0..4c9476cbe4fa 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/Serialization/PropertyLocalizationDataGathering.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/Serialization/PropertyLocalizationDataGathering.h
@@ -57,6 +57,11 @@ enum class EPropertyLocalizationGathererResultFlags : uint8
 	 * The call resulted in script data being added to the array.
 	 */
 	HasScript = 1<<1,
+
+	/**
+	 * The call resulted in text with an invalid package localization ID being added to the array.
+	 */
+	HasTextWithInvalidPackageLocalizationID = 1<<2,
 };
 ENUM_CLASS_FLAGS(EPropertyLocalizationGathererResultFlags);
 
@@ -127,6 +132,7 @@ private:
 
 	TArray<FGatherableTextData>& GatherableTextDataArray;
 	const UPackage* Package;
+	FString PackageNamespace;
 	EPropertyLocalizationGathererResultFlags& ResultFlags;
 	TSet<const UObject*> AllObjectsInPackage;
 	TSet<FObjectAndGatherFlags> ProcessedObjects;
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/Class.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/Class.h
index 5e80247c08b4..a3fec33dfbf7 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/Class.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/Class.h
@@ -221,7 +221,7 @@ class COREUOBJECT_API UStruct : public UField
 
 	// Variables.
 protected:
-	friend COREUOBJECT_API UClass* Z_Construct_UClass_UStruct();
+	friend struct Z_Construct_UClass_UStruct_Statics;
 private:
 	/** Struct this inherits from, may be null */
 	UStruct* SuperStruct;
@@ -1418,6 +1418,7 @@ public:
 
 	// UObject interface.
 	virtual void Serialize( FArchive& Ar ) override;
+	virtual void PostLoad() override;
 
 	// UField interface.
 	virtual void Bind() override;
@@ -2674,9 +2675,11 @@ public:
 
 	/**
 	 * Initializes the ClassReps and NetFields arrays used by replication.
-	 * For classes that are loaded, this needs to happen in PostLoad to
-	 * ensure all replicated UFunctions have been serialized. For native classes,
-	 * this should happen in Link. Also needs to happen after blueprint compiliation.
+	 * This happens lazily based on the CLASS_ReplicationDataIsSetUp flag,
+	 * and will generally occur in Link or PostLoad. It's possible that replicated UFunctions
+	 * will load after their owning class, so UFunction::PostLoad will clear the flag on its owning class
+	 * to force lazy initialization next time the data is needed.
+	 * Also happens after blueprint compiliation.
 	 */
 	void SetUpRuntimeReplicationData();
 
@@ -3253,3 +3256,9 @@ template<> struct TBaseStructure<FDateTime>
 {
 	COREUOBJECT_API static UScriptStruct* Get();
 };
+
+struct FPolyglotTextData;
+template<> struct TBaseStructure<FPolyglotTextData>
+{
+	COREUOBJECT_API static UScriptStruct* Get();
+};
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreNet.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreNet.h
index 791d0fba8491..30c6537b5461 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreNet.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreNet.h
@@ -116,7 +116,7 @@ public:
 	~FClassNetCacheMgr() { ClearClassNetCache(); }
 
 	/** get the cached field to index mappings for the given class */
-	const FClassNetCache*	GetClassNetCache( const UClass* Class );
+	const FClassNetCache*	GetClassNetCache( UClass* Class );
 	void					ClearClassNetCache();
 
 	void				SortProperties( TArray< UProperty* >& Properties ) const;
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreOnline.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreOnline.h
index cec211f6d8e3..c0d2b3e02c2f 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreOnline.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/CoreOnline.h
@@ -75,6 +75,22 @@ struct FJoinabilitySettings
 		MaxPartySize(0)
 	{
 	}
+
+	bool operator==(const FJoinabilitySettings& Other) const
+	{
+		return SessionName == Other.SessionName &&
+			bPublicSearchable == Other.bPublicSearchable &&
+			bAllowInvites == Other.bAllowInvites &&
+			bJoinViaPresence == Other.bJoinViaPresence &&
+			bJoinViaPresenceFriendsOnly == Other.bJoinViaPresenceFriendsOnly &&
+			MaxPlayers == Other.MaxPlayers &&
+			MaxPartySize == Other.MaxPartySize;
+	}
+
+	bool operator!=(const FJoinabilitySettings& Other) const
+	{
+		return !(FJoinabilitySettings::operator==(Other));
+	}
 };
 
 /**
@@ -122,6 +138,14 @@ public:
 		return !(FUniqueNetId::operator==(Other));
 	}
 
+	/**
+	 * Get the type token for this opaque data
+	 * This is useful for inferring UniqueId subclasses and knowing which OSS it "goes with"
+	 *
+	 * @return FName representing the Type
+	 */
+	virtual FName GetType() const { return NAME_None; /* This should be pure virtual, however, older versions of the OSS plugins cannot handle that */ };
+
 	/** 
 	 * Get the raw byte representation of this opaque data
 	 * This data is platform dependent and shouldn't be manipulated directly
@@ -203,6 +227,11 @@ public:
 	{
 	}
 
+	FUniqueNetIdWrapper(const FUniqueNetId& InUniqueNetId)
+		: UniqueNetId(InUniqueNetId.AsShared())
+	{
+	}
+
 	FUniqueNetIdWrapper(const TSharedRef<const FUniqueNetId>& InUniqueNetId)
 		: UniqueNetId(InUniqueNetId)
 	{
@@ -241,11 +270,26 @@ public:
 		return (bBothInvalid || (bBothValid && (*UniqueNetId == *Other.UniqueNetId)));
 	}
 
+	bool operator==(TSharedPtr<const FUniqueNetId> const& Other) const
+	{
+		return Other == (*this);
+	}
+
+	bool operator==(TSharedRef<const FUniqueNetId> const& Other) const
+	{
+		return Other == (*this);
+	}
+
 	/** Comparison operator */
 	bool operator!=(FUniqueNetIdWrapper const& Other) const
 	{
 		return !(*this == Other);
 	}
+
+	FName GetType() const
+	{
+		return IsValid() ? UniqueNetId->GetType() : NAME_None;
+	}
 	
 	/** Convert this value to a string */
 	FString ToString() const
@@ -256,7 +300,7 @@ public:
 	/** Convert this value to a string with additional information */
 	FString ToDebugString() const
 	{
-		return IsValid() ? UniqueNetId->ToDebugString() : TEXT("INVALID");
+		return IsValid() ? FString::Printf(TEXT("%s:%s"), *UniqueNetId->GetType().ToString(), *UniqueNetId->ToDebugString()) : TEXT("INVALID");
 	}
 
 	/** Is the FUniqueNetId wrapped in this object valid */
@@ -311,7 +355,38 @@ public:
 			// If we hit this, something went wrong and we have received an unhashable wrapper.
 			return INDEX_NONE;
 		}
+	}
 
+	static FUniqueNetIdWrapper Invalid()
+	{
+		static FUniqueNetIdWrapper InvalidId(nullptr);
+		return InvalidId;
+	}
+
+	bool friend operator==(TSharedPtr<const FUniqueNetId> const& LHS, FUniqueNetIdWrapper const& RHS)
+	{
+		// Both invalid structs or both valid and deep comparison equality
+		bool bBothValid = RHS.IsValid() && LHS.IsValid() && LHS->IsValid();
+		bool bBothInvalid = !RHS.IsValid() && (!LHS.IsValid() || !LHS->IsValid());
+		return (bBothInvalid || (bBothValid && (*LHS == *RHS)));
+	}
+
+	bool friend operator==(TSharedRef<const FUniqueNetId> const& LHS, FUniqueNetIdWrapper const& RHS)
+	{
+		// Both invalid structs or both valid and deep comparison equality
+		bool bBothValid = RHS.IsValid() && LHS->IsValid();
+		bool bBothInvalid = !RHS.IsValid() && !LHS->IsValid();
+		return (bBothInvalid || (bBothValid && (*LHS == *RHS)));
+	}
+
+	bool friend operator!=(TSharedPtr<const FUniqueNetId> const& LHS, FUniqueNetIdWrapper const& RHS)
+	{
+		return !(LHS == RHS);
+	}
+
+	bool friend operator!=(TSharedRef<const FUniqueNetId> const& LHS, FUniqueNetIdWrapper const& RHS)
+	{
+		return !(LHS == RHS);
 	}
 
 protected:
@@ -321,7 +396,7 @@ protected:
 };
 
 template <typename ValueType>
-struct FUniqueNetIdKeyFuncs : public TDefaultMapKeyFuncs<TSharedRef<const FUniqueNetId>, ValueType, false>
+struct TUniqueNetIdMapKeyFuncs : public TDefaultMapKeyFuncs<TSharedRef<const FUniqueNetId>, ValueType, false>
 {
 	static FORCEINLINE TSharedRef<const FUniqueNetId>	GetSetKey(TPair<TSharedRef<const FUniqueNetId>, ValueType> const& Element) { return Element.Key; }
 	static FORCEINLINE uint32							GetKeyHash(TSharedRef<const FUniqueNetId> const& Key) {	return GetTypeHash(*Key); }
@@ -329,4 +404,13 @@ struct FUniqueNetIdKeyFuncs : public TDefaultMapKeyFuncs<TSharedRef<const FUniqu
 };
 
 template <typename ValueType>
-using TUniqueNetIdMap = TMap<TSharedRef<const FUniqueNetId>, ValueType, FDefaultSetAllocator, FUniqueNetIdKeyFuncs<ValueType>>;
+using TUniqueNetIdMap = TMap<TSharedRef<const FUniqueNetId>, ValueType, FDefaultSetAllocator, TUniqueNetIdMapKeyFuncs<ValueType>>;
+
+struct FUniqueNetIdKeyFuncs : public DefaultKeyFuncs<TSharedRef<const FUniqueNetId>>
+{
+	static FORCEINLINE TSharedRef<const FUniqueNetId>	GetSetKey(TSharedRef<const FUniqueNetId> const& Element) { return Element; }
+	static FORCEINLINE uint32							GetKeyHash(TSharedRef<const FUniqueNetId> const& Key) { return GetTypeHash(*Key); }
+	static FORCEINLINE bool								Matches(TSharedRef<const FUniqueNetId> const& A, TSharedRef<const FUniqueNetId> const& B) { return (A == B) || (*A == *B); }
+};
+
+using FUniqueNetIdSet = TSet<TSharedRef<const FUniqueNetId>, FUniqueNetIdKeyFuncs>;
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/GCObject.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/GCObject.h
index 11c51a6a32f2..16580d25d09b 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/GCObject.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/GCObject.h
@@ -41,12 +41,21 @@ public:
 	void AddObject(FGCObject* Object);
 
 	/**
-	 * Removes a window from the list so it won't receive serialization events
+	 * Removes an object from the referencer list
 	 *
 	 * @param Object The object to remove from the list
 	 */
 	void RemoveObject(FGCObject* Object);
 
+	/**
+	 * Get the name of the first FGCObject that owns this object.
+	 *
+	 * @param Object The object that we're looking for.
+	 * @param OutName the name of the FGCObject that reports this object.
+	 * @return true if the object was found.
+	 */
+	bool GetReferencerName(UObject* Object, FString& OutName) const;
+
 	/**
 	 * Forwards this call to all registered objects so they can reference
 	 * any UObjects they depend upon
@@ -147,5 +156,13 @@ public:
 	 * @param Collector The collector of referenced objects.
 	 */
 	virtual void AddReferencedObjects( FReferenceCollector& Collector ) = 0;
+
+	/**
+	 * Use this method to report a name for your referencer.
+	 */
+	virtual FString GetReferencerName() const
+	{
+		return "Unknown FGCObject";
+	}
 };
 
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/Linker.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/Linker.h
index ca672eb7ce94..8e93b63d78ce 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/Linker.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/Linker.h
@@ -564,7 +564,7 @@ COREUOBJECT_API void DeleteLoaders();
 /** Queues linker for deletion */
 COREUOBJECT_API void DeleteLoader(FLinkerLoad* Loader);
 
-COREUOBJECT_API FLinkerLoad* GetPackageLinker(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, UPackageMap* Sandbox, FGuid* CompatibleGuid);
+COREUOBJECT_API FLinkerLoad* GetPackageLinker(UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, UPackageMap* Sandbox, FGuid* CompatibleGuid, FArchive* InReaderOverride = nullptr);
 COREUOBJECT_API FString GetPrestreamPackageLinkerName(const TCHAR* InLongPackageName, bool bExistSkip = true);
 
 
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/LinkerLoad.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/LinkerLoad.h
index 1c7ccd8ce7bd..1c74a8a055ea 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/LinkerLoad.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/LinkerLoad.h
@@ -437,10 +437,11 @@ public:
 	 * @param	Parent		Parent object to load into, can be NULL (most likely case)
 	 * @param	Filename	Name of file on disk to load
 	 * @param	LoadFlags	Load flags determining behavior
+	 * @param InLoader	Loader archive override
 	 *
 	 * @return	new FLinkerLoad object for Parent/ Filename
 	 */
-	COREUOBJECT_API static FLinkerLoad* CreateLinker( UPackage* Parent, const TCHAR* Filename, uint32 LoadFlags);
+	COREUOBJECT_API static FLinkerLoad* CreateLinker(UPackage* Parent, const TCHAR* Filename, uint32 LoadFlags, FArchive* InLoader = nullptr);
 
 	void Verify();
 
@@ -773,6 +774,9 @@ private:
 	FORCEINLINE virtual void Serialize(void* V, int64 Length) override
 	{
 		checkSlow(FPlatformTLS::GetCurrentThreadId() == OwnerThread);
+#if WITH_EDITOR
+		Loader->SetSerializedProperty(GetSerializedProperty());
+#endif
 		Loader->Serialize(V, Length);
 	}
 	using FArchiveUObject::operator<<; // For visibility of the overloads we don't override
@@ -921,6 +925,9 @@ private:
 
 	ELinkerStatus SerializePreloadDependencies();
 
+	/** Sets the basic linker archive info */
+	void ResetStatusInfo();
+
 public:
 	/**
 	 * Serializes the gatherable text data container.
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/NoExportTypes.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/NoExportTypes.h
index 5614dba20539..7faeb3c679d1 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/NoExportTypes.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/NoExportTypes.h
@@ -20,6 +20,7 @@
 #include "Misc/Guid.h"
 #include "Misc/DateTime.h"
 #include "Misc/Timespan.h"
+
 #include "UObject/SoftObjectPath.h"
 
 #include "Math/InterpCurvePoint.h"
@@ -44,6 +45,8 @@
 #include "Math/RangeBound.h"
 #include "Math/Interval.h"
 
+#include "Internationalization/PolyglotTextData.h"
+
 #include "GenericPlatform/ICursor.h"
 
 #endif
@@ -1166,6 +1169,41 @@ struct FInt32Interval
 	int32 Max;
 };
 
+// Localization
+
+UENUM(BlueprintType)
+enum class ELocalizedTextSourceCategory : uint8
+{
+	Game,
+	Engine,
+	Editor,
+};
+
+USTRUCT(noexport, BlueprintType)
+struct FPolyglotTextData
+{
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	ELocalizedTextSourceCategory Category;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	FString NativeCulture;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	FString Namespace;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	FString Key;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	FString NativeString;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=PolyglotData)
+	TMap<FString, FString> LocalizedStrings;
+
+	UPROPERTY(Transient)
+	FText CachedText;
+};
+
 // Automation
 
 UENUM()
@@ -1188,6 +1226,16 @@ struct FAutomationEvent
 	UPROPERTY()
 	FString Context;
 
+	UPROPERTY()
+	FGuid Artifact;
+};
+
+USTRUCT(noexport)
+struct FAutomationExecutionEntry
+{
+	UPROPERTY()
+	FAutomationEvent Event;
+
 	UPROPERTY()
 	FString Filename;
 
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectMacros.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectMacros.h
index 9eb83a4cf686..15aac1c08396 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectMacros.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectMacros.h
@@ -198,8 +198,8 @@ enum EClassFlags
 	/** Handle object configuration on a per-object basis, rather than per-class. */
 	CLASS_PerObjectConfig     = 0x00000400u,
 	
-	/** */
-	//CLASS_ = 0x00000800u,
+	/** Whether SetUpRuntimeReplicationData still needs to be called for this class */
+	CLASS_ReplicationDataIsSetUp = 0x00000800u,
 	
 	/** Class can be constructed from editinline New button. */
 	CLASS_EditInlineNew		  = 0x00001000u,
@@ -1573,18 +1573,26 @@ public: \
 #define IMPLEMENT_INTRINSIC_CLASS(TClass, TRequiredAPI, TSuperClass, TSuperRequiredAPI, TPackage, InitCode) \
 	IMPLEMENT_CLASS(TClass, 0) \
 	TRequiredAPI UClass* Z_Construct_UClass_##TClass(); \
+	struct Z_Construct_UClass_##TClass##_Statics \
+	{ \
+		static UClass* Construct() \
+		{ \
+			extern TSuperRequiredAPI UClass* Z_Construct_UClass_##TSuperClass(); \
+			UClass* SuperClass = Z_Construct_UClass_##TSuperClass(); \
+			UClass* Class = TClass::StaticClass(); \
+			UObjectForceRegistration(Class); \
+			check(Class->GetSuperClass() == SuperClass); \
+			InitCode \
+			Class->StaticLink(); \
+			return Class; \
+		} \
+	}; \
 	UClass* Z_Construct_UClass_##TClass() \
 	{ \
 		static UClass* Class = NULL; \
 		if (!Class) \
 		{ \
-			extern TSuperRequiredAPI UClass* Z_Construct_UClass_##TSuperClass(); \
-			UClass* SuperClass = Z_Construct_UClass_##TSuperClass(); \
-			Class = TClass::StaticClass(); \
-			UObjectForceRegistration(Class); \
-			check(Class->GetSuperClass() == SuperClass); \
-			InitCode \
-			Class->StaticLink(); \
+			Class = Z_Construct_UClass_##TClass##_Statics::Construct();\
 		} \
 		check(Class->GetClass()); \
 		return Class; \
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectResource.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectResource.h
index 9d5673bf383e..f65c3f573892 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectResource.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/ObjectResource.h
@@ -145,8 +145,18 @@ public:
 	/**
 	Friend declarations for Lex functions
 	*/
-	friend FString ToString(const FPackageIndex& Value);
-	friend void FromString(FPackageIndex& Value, const TCHAR* String);
+	/**
+	Lex functions
+	*/
+	friend FString LexToString(const FPackageIndex& Value)
+	{
+		return FString::FromInt(Value.Index);
+	}
+
+	friend void LexFromString(FPackageIndex& Value, const TCHAR* String)
+	{
+		Value.Index = FCString::Atoi(String);
+	}
 };
 
 /**
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/Package.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/Package.h
index d77c971eed91..1f39dbd87464 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/Package.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/Package.h
@@ -154,6 +154,7 @@ public:
 	virtual bool IsNameStableForNetworking() const override { return true; }		// For now, assume all packages have stable net names
 	virtual bool NeedsLoadForClient() const override { return true; }				// To avoid calling the expensive generic version, which only makes sure that the UPackage static class isn't excluded
 	virtual bool NeedsLoadForServer() const override { return true; }
+	virtual bool IsPostLoadThreadSafe() const override;
 
 #if WITH_EDITORONLY_DATA
 																					/** Sets the bLoadedByEditorPropertiesOnly flag */
@@ -200,20 +201,6 @@ public:
 	// World browser information
 	TUniquePtr< FWorldTileInfo > WorldTileInfo;
 
-private:
-	mutable TUniquePtr<TMap<FName, int32>> ClassUniqueNameIndexMap;
-
-public:
-
-	TMap<FName, int32>& GetClassUniqueNameIndexMap() const
-	{
-		if (ClassUniqueNameIndexMap == nullptr)
-		{
-			ClassUniqueNameIndexMap.Reset(new TMap<FName, int32>());
-		}
-		return *ClassUniqueNameIndexMap;
-	}
-
 	/**
 	* Called after the C++ constructor and after the properties have been initialized, but before the config has been loaded, etc.
 	* mainly this is to emulate some behavior of when the constructor was called after the properties were initialized.
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/PrimaryAssetId.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/PrimaryAssetId.h
index 71b605af5b1b..374a303d4fe1 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/PrimaryAssetId.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/PrimaryAssetId.h
@@ -66,7 +66,7 @@ struct FPrimaryAssetType
 	}
 
 private:
-	friend COREUOBJECT_API UScriptStruct* Z_Construct_UScriptStruct_FPrimaryAssetType();
+	friend struct Z_Construct_UScriptStruct_FPrimaryAssetType_Statics;
 
 	/** The FName representing this type */
 	FName Name;
@@ -164,5 +164,5 @@ struct FPrimaryAssetId
 		return Hash;
 	}
 
-	friend COREUOBJECT_API UScriptStruct* Z_Construct_UScriptStruct_FPrimaryAssetId();
+	friend struct Z_Construct_UScriptStruct_FPrimaryAssetId_Statics;
 };
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/PropertyTempVal.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/PropertyTempVal.h
new file mode 100644
index 000000000000..da3700754ddb
--- /dev/null
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/PropertyTempVal.h
@@ -0,0 +1,43 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/UnrealType.h"
+
+// A helper struct which owns a single instance of the type pointed to by a property.
+// The instance is properly constructed, destructed and can be serialized and have other
+// functions called on it.
+struct COREUOBJECT_API FPropertyTempVal
+{
+	explicit FPropertyTempVal(UProperty* InProp);
+	~FPropertyTempVal();
+
+	// Uncopyable
+	FPropertyTempVal(const FPropertyTempVal&) = delete;
+	FPropertyTempVal& operator=(const FPropertyTempVal&) = delete;
+
+	// Serializes the instance
+	void Serialize(FArchive& Ar, const void* Defaults = nullptr);
+
+	// Exports the text of the instance
+	void ExportText(FString& ValueStr, const void* Defaults = nullptr, UObject* Parent = nullptr, int32 PortFlags = 0, UObject* ExportRootScope = nullptr);
+
+	// Returns a pointer to the internal instance
+	FORCEINLINE void* Get()
+	{
+		return Value;
+	}
+
+	// Returns a pointer to the internal instance
+	FORCEINLINE const void* Get() const
+	{
+		return Value;
+	}
+
+private:
+	// The property which is used to manage to underlying instance.
+	UProperty* Prop;
+
+	// The memory of 
+	void* Value;
+};
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/ReferenceChainSearch.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/ReferenceChainSearch.h
index 004c65775011..788ad3f53a78 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/ReferenceChainSearch.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/ReferenceChainSearch.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "UObject/UObjectGlobals.h"
 #include "UObject/Class.h"
+#include "UObject/GarbageCollection.h"
 
 /** Search mode flags */
 enum class EReferenceChainSearchMode
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPath.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPath.h
index 811fff748b70..15783df6b573 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPath.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPath.h
@@ -24,6 +24,13 @@ struct COREUOBJECT_API FSoftObjectPath
 	{
 	}
 
+	/** Construct from a moveable soft object path */
+	FSoftObjectPath(FSoftObjectPath&& Other)
+		: AssetPathName(Other.AssetPathName)
+		, SubPathString(MoveTemp(Other.SubPathString))
+	{
+	}
+
 	/** Construct from a path string */
 	FSoftObjectPath(FString PathString)
 	{
@@ -33,7 +40,7 @@ struct COREUOBJECT_API FSoftObjectPath
 	/** Construct from an asset FName and subobject pair */
 	FSoftObjectPath(FName InAssetPathName, FString InSubPathString)
 		: AssetPathName(InAssetPathName)
-		, SubPathString(InSubPathString)
+		, SubPathString(MoveTemp(InSubPathString))
 	{}
 	
 	/** Construct from an existing object in memory */
@@ -62,7 +69,7 @@ struct COREUOBJECT_API FSoftObjectPath
 	}
 
 	/** Returns the sub path, which is often empty */
-	FORCEINLINE FString GetSubPathString() const
+	FORCEINLINE const FString& GetSubPathString() const
 	{
 		return SubPathString;
 	}
@@ -139,7 +146,7 @@ struct COREUOBJECT_API FSoftObjectPath
 	{
 		return !(*this == Other);
 	}
-	FSoftObjectPath& operator=(FSoftObjectPath const& Other);
+	FSoftObjectPath& operator=(FSoftObjectPath Other);
 	bool ExportTextItem(FString& ValueStr, FSoftObjectPath const& DefaultValue, UObject* Parent, int32 PortFlags, UObject* ExportRootScope) const;
 	bool ImportTextItem( const TCHAR*& Buffer, int32 PortFlags, UObject* Parent, FOutputDevice* ErrorText );
 	bool SerializeFromMismatchedTag(struct FPropertyTag const& Tag, FStructuredArchive::FSlot Slot);
@@ -198,7 +205,7 @@ private:
 	/** Package names currently being duplicated, needed by FixupForPIE */
 	static TSet<FName> PIEPackageNames;
 
-	friend COREUOBJECT_API UScriptStruct* Z_Construct_UScriptStruct_FSoftObjectPath();
+	friend struct Z_Construct_UScriptStruct_FSoftObjectPath_Statics;
 };
 
 /**
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPtr.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPtr.h
index 026dc730c873..6eb842f4d516 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPtr.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/SoftObjectPtr.h
@@ -131,6 +131,13 @@ public:
 	{
 	}
 
+	/** Construct from a moveable soft pointer */
+	template <class U, class = typename TEnableIf<TPointerIsConvertibleFromTo<U, T>::Value>::Type>
+	FORCEINLINE TSoftObjectPtr(TSoftObjectPtr<U>&& Other)
+		: SoftObjectPtr(MoveTemp(Other.SoftObjectPtr))
+	{
+	}
+
 	/** Construct from an object already in memory */
 	template <typename U>
 	FORCEINLINE TSoftObjectPtr(const U* Object)
@@ -145,8 +152,8 @@ public:
 	}
 
 	/** Construct from a soft object path */
-	explicit FORCEINLINE TSoftObjectPtr(const FSoftObjectPath& ObjectPath)
-		: SoftObjectPtr(ObjectPath)
+	explicit FORCEINLINE TSoftObjectPtr(FSoftObjectPath ObjectPath)
+		: SoftObjectPtr(MoveTemp(ObjectPath))
 	{
 	}
 
@@ -178,9 +185,9 @@ public:
 	}
 
 	/** Copy from a soft object path */
-	FORCEINLINE TSoftObjectPtr& operator=(const FSoftObjectPath& ObjectPath)
+	FORCEINLINE TSoftObjectPtr& operator=(FSoftObjectPath ObjectPath)
 	{
-		SoftObjectPtr = ObjectPath;
+		SoftObjectPtr = MoveTemp(ObjectPath);
 		return *this;
 	}
 
@@ -194,9 +201,9 @@ public:
 
 	/** Copy from another soft pointer */
 	template <class U, class = typename TEnableIf<TPointerIsConvertibleFromTo<U, T>::Value>::Type>
-	FORCEINLINE TSoftObjectPtr& operator=(const TSoftObjectPtr<U>& Other)
+	FORCEINLINE TSoftObjectPtr& operator=(TSoftObjectPtr<U> Other)
 	{
-		SoftObjectPtr = Other.SoftObjectPtr;
+		SoftObjectPtr = MoveTemp(Other.SoftObjectPtr);
 		return *this;
 	}
 
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h
index 1e21f7c7f414..934d2501ba2b 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/Stack.h
@@ -191,6 +191,10 @@ public:
 	 * This will return a string of the form "ScopeName.FunctionName" associated with this stack frame:
 	 */
 	COREUOBJECT_API FString GetStackDescription() const;
+
+#if DO_BLUEPRINT_GUARD
+	static void InitPrintScriptCallstack();
+#endif
 };
 
 
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectAnnotation.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectAnnotation.h
index e39a6f249b62..f08c46929d9f 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectAnnotation.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectAnnotation.h
@@ -516,16 +516,22 @@ public:
 	 * @param Index			Index of object to annotate.
 	 * @param Annotation	Annotation to associate with Object.
 	 */
-	void AddAnnotation(int32 Index,TAnnotation Annotation)
+	void AddAnnotation(int32 Index, TAnnotation Annotation)
+	{
+		FRWScopeLock AnnotationArrayLock(AnnotationArrayCritical, SLT_Write);
+		AddAnnotationInternal(Index, Annotation);
+	}
+
+private:
+	void AddAnnotationInternal(int32 Index,TAnnotation Annotation)
 	{
 		check(Index >= 0);
 		if (Annotation.IsDefault())
 		{
-			RemoveAnnotation(Index); // adding the default annotation is the same as removing an annotation
+			RemoveAnnotationInternal(Index); // adding the default annotation is the same as removing an annotation
 		}
 		else
 		{
-			FRWScopeLock AnnotationArrayLock(AnnotationArrayCritical, SLT_Write);
 			if (AnnotationArray.Num() == 0)
 			{
 				// we are adding the first one, so if we are auto removing or verifying removal, register now
@@ -548,6 +554,8 @@ public:
 			AnnotationArray[Index] = Annotation;
 		}
 	}
+
+public:
 	/**
 	 * Removes an annotation from the annotation list. 
 	 *
@@ -565,13 +573,21 @@ public:
 	 */
 	void RemoveAnnotation(int32 Index)
 	{
-		check(Index >= 0);
 		FRWScopeLock AnnotationArrayLock(AnnotationArrayCritical, SLT_Write);
+		RemoveAnnotationInternal(Index);
+	}
+
+private:
+	void RemoveAnnotationInternal(int32 Index)
+	{
+		check(Index >= 0);
 		if (Index <  AnnotationArray.Num())
 		{
 			AnnotationArray[Index] = TAnnotation();
 		}
 	}
+
+public:
 	/**
 	 * Removes all annotation from the annotation list. 
 	 *
@@ -644,7 +660,7 @@ public:
 		FRWScopeLock AnnotationArrayLock(AnnotationArrayCritical, SLT_Write);
 		if (Index >= AnnotationArray.Num())
 		{
-			AddAnnotation(Index, TAnnotation());
+			AddAnnotationInternal(Index, TAnnotation());
 		}
 		return AnnotationArray[Index];
 	}
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectBase.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectBase.h
index 5b8fd9bfdf4b..93e71665a0e1 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectBase.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectBase.h
@@ -17,7 +17,7 @@ DECLARE_DWORD_COUNTER_STAT_EXTERN(TEXT("STAT_UObjectsStatGroupTester"), STAT_UOb
 class COREUOBJECT_API UObjectBase
 {
 	friend class UObjectBaseUtility;
-	friend COREUOBJECT_API class UClass* Z_Construct_UClass_UObject();
+	friend struct Z_Construct_UClass_UObject_Statics;
 	friend class FUObjectArray; // for access to InternalIndex without revealing it to anyone else
 	friend class FUObjectAllocator; // for access to destructor without revealing it to anyone else
 	friend COREUOBJECT_API void UObjectForceRegistration(UObjectBase* Object);
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectGlobals.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectGlobals.h
index aaef54a4b54b..6138c23a3b59 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectGlobals.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/UObjectGlobals.h
@@ -11,6 +11,7 @@
 #include "UObject/ObjectMacros.h"
 #include "Misc/OutputDeviceRedirector.h"
 #include "UObject/PrimaryAssetId.h"
+#include "Templates/Function.h"
 #include "Templates/IsArrayOrRefOfType.h"
 #include "Serialization/ArchiveUObject.h"
 
@@ -51,6 +52,8 @@ DECLARE_CYCLE_STAT_EXTERN(TEXT("NetSerializeFast Array BuildMap"),STAT_NetSerial
 
 /** set while in SavePackage() to detect certain operations that are illegal while saving */
 extern COREUOBJECT_API bool					GIsSavingPackage;
+/** This allows loading unversioned cooked content in the editor */
+extern COREUOBJECT_API bool					GAllowUnversionedContentInEditor;
 
 namespace EDuplicateMode
 {
@@ -174,6 +177,8 @@ COREUOBJECT_API FString ResolveIniObjectsReference(const FString& ObjectReferenc
 COREUOBJECT_API bool ResolveName(UObject*& Outer, FString& ObjectsReferenceString, bool Create, bool Throw, uint32 LoadFlags = LOAD_None);
 COREUOBJECT_API void SafeLoadError( UObject* Outer, uint32 LoadFlags, const TCHAR* ErrorMessage);
 
+COREUOBJECT_API int32 UpdateSuffixForNextNewObject(UObject* Parent, UClass* Class, TFunctionRef<void(int32&)> IndexMutator);
+
 /**
  * Fast version of StaticFindObject that relies on the passed in FName being the object name
  * without any group/ package qualifiers.
@@ -278,7 +283,7 @@ COREUOBJECT_API void StaticTick( float DeltaTime, bool bUseFullTimeLimit = true,
  * @param	LoadFlags	Flags controlling loading behavior
  * @return	Loaded package if successful, NULL otherwise
  */
-COREUOBJECT_API UPackage* LoadPackage( UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags );
+COREUOBJECT_API UPackage* LoadPackage( UPackage* InOuter, const TCHAR* InLongPackageName, uint32 LoadFlags, FArchive* InReaderOverride = nullptr );
 
 /* Async package loading result */
 namespace EAsyncLoadingResult
@@ -1278,6 +1283,13 @@ inline T* GetMutableDefault()
 template< class T > 
 inline T* GetMutableDefault(UClass *Class);
 
+// Returns true if a class has been loaded (e.g. it has a CDO)
+template< class T >
+inline bool IsClassLoaded()
+{
+	return T::StaticClass()->GetDefaultObject(false) != nullptr;
+}
+
 /**
  * Looks for delegate signature with given name.
  */
@@ -1973,6 +1985,9 @@ struct COREUOBJECT_API FCoreUObjectDelegates
 	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnRedirectorFollowed, const FString&, UObject*);
 	DEPRECATED(4.17, "RedirectorFollowed is deprecated, FixeupRedirects was replaced with ResavePackages -FixupRedirect")
 	static FOnRedirectorFollowed RedirectorFollowed;
+
+	DECLARE_DELEGATE_RetVal_TwoParams(bool, FShouldCookPackageForPlatform, const UPackage*, const ITargetPlatform*);
+	static FShouldCookPackageForPlatform ShouldCookPackageForPlatform;
 };
 
 /** Allows release builds to override not verifying GC assumptions. Useful for profiling as it's hitchy. */
@@ -2120,29 +2135,6 @@ namespace UE4CodeGen_Private
 		Native
 	};
 
-	// These templates exist to help generate better code for pointers to lambdas in Clang.
-	// They simply provide a static function which, when called, will call the lambda, and we can take the
-	// address of this function.  Using lambdas' implicit conversion to function type will generate runtime code bloat.
-	template <typename LambdaType>
-	struct TBoolSetBitWrapper
-	{
-		static void SetBit(void* Ptr)
-		{
-			TBoolSetBitWrapper Empty;
-			(*(LambdaType*)&Empty)(Ptr);
-		}
-	};
-
-	template <typename LambdaType>
-	struct TNewCppStructOpsWrapper
-	{
-		static void* NewCppStructOps()
-		{
-			TNewCppStructOpsWrapper Empty;
-			return (*(LambdaType*)&Empty)();
-		}
-	};
-
 #if WITH_METADATA
 	struct FMetaDataPairParam
 	{
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/UnrealType.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/UnrealType.h
index 93b779c6c651..09d39f3e153d 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/UnrealType.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/UnrealType.h
@@ -305,6 +305,7 @@ public:
 		}
 	}
 
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual void SerializeItem(FStructuredArchive::FSlot Slot, void* Value, void const* Defaults = NULL) const PURE_VIRTUAL(UProperty::SerializeItem, );
 	virtual bool NetSerializeItem( FArchive& Ar, UPackageMap* Map, void* Data, TArray<uint8> * MetaData = NULL ) const;
 	virtual bool SupportsNetSharedSerialization() const;
@@ -1292,8 +1293,8 @@ protected:
 			TEXT("Potential data loss during conversion of integer property %s of %s - was (%s) now (%s) - for package: %s"),
 			*this->GetName(),
 			*Slot.GetUnderlyingArchive().GetArchiveName(),
-			*Lex::ToString(OldValue),
-			*Lex::ToString(NewValue),
+			*LexToString(OldValue),
+			*LexToString(NewValue),
 			*Slot.GetUnderlyingArchive().GetArchiveName()
 			);
 	}
@@ -1390,11 +1391,11 @@ public:
 	}
 	virtual void SetNumericPropertyValueFromString(void* Data, TCHAR const* Value) const override
 	{
-		Lex::FromString(*TTypeFundamentals::GetPropertyValuePtr(Data), Value);
+		LexFromString(*TTypeFundamentals::GetPropertyValuePtr(Data), Value);
 	}
 	virtual FString GetNumericPropertyValueToString(void const* Data) const override
 	{
-		return Lex::ToString(TTypeFundamentals::GetPropertyValue(Data));
+		return LexToString(TTypeFundamentals::GetPropertyValue(Data));
 	}
 	virtual int64 GetSignedIntPropertyValue(void const* Data) const override
 	{
@@ -3293,14 +3294,13 @@ public:
 	{
 		UProperty* LocalKeyPropForCapture = KeyProp;
 		UProperty* LocalValuePropForCapture = ValueProp;
-		FScriptMapLayout& LocalMapLayoutForCapture = MapLayout;
 		Map->Add(
 			KeyPtr,
 			ValuePtr,
 			MapLayout,
 			[LocalKeyPropForCapture](const void* ElementKey) { return LocalKeyPropForCapture->GetValueTypeHash(ElementKey); },
 			[LocalKeyPropForCapture](const void* A, const void* B) { return LocalKeyPropForCapture->Identical(A, B); },
-			[LocalKeyPropForCapture, KeyPtr, LocalMapLayoutForCapture](void* NewElementKey)
+			[LocalKeyPropForCapture, KeyPtr](void* NewElementKey)
 			{
 				if (LocalKeyPropForCapture->PropertyFlags & CPF_ZeroConstructor)
 				{
@@ -3313,7 +3313,7 @@ public:
 
 				LocalKeyPropForCapture->CopySingleValueToScriptVM(NewElementKey, KeyPtr);
 			},
-			[LocalValuePropForCapture, ValuePtr, LocalMapLayoutForCapture](void* NewElementValue)
+			[LocalValuePropForCapture, ValuePtr](void* NewElementValue)
 			{
 				if (LocalValuePropForCapture->PropertyFlags & CPF_ZeroConstructor)
 				{
diff --git a/Engine/Source/Runtime/CoreUObject/Public/UObject/WeakObjectPtr.h b/Engine/Source/Runtime/CoreUObject/Public/UObject/WeakObjectPtr.h
index 5bf6f556d7d8..de8f7cda139b 100644
--- a/Engine/Source/Runtime/CoreUObject/Public/UObject/WeakObjectPtr.h
+++ b/Engine/Source/Runtime/CoreUObject/Public/UObject/WeakObjectPtr.h
@@ -181,48 +181,48 @@ private:
 		return ActualSerialNumber == ObjectSerialNumber;
 	}
 
-	/** Private (inlined) version for internal use only. */
-	FORCEINLINE_DEBUGGABLE bool Internal_IsValid(bool bEvenIfPendingKill, bool bThreadsafeTest) const
+	FORCEINLINE FUObjectItem* Internal_GetObjectItem() const
 	{
 		if (ObjectSerialNumber == 0)
 		{
 			checkSlow(ObjectIndex == 0 || ObjectIndex == -1); // otherwise this is a corrupted weak pointer
-			return false;
+			return nullptr;
 		}
 		if (ObjectIndex < 0)
 		{
-			return false;
+			return nullptr;
 		}
-		FUObjectItem* ObjectItem = GUObjectArray.IndexToObject(ObjectIndex);
+		FUObjectItem* const ObjectItem = GUObjectArray.IndexToObject(ObjectIndex);
 		if (!ObjectItem)
 		{
-			return false;
+			return nullptr;
 		}
 		if (!SerialNumbersMatch(ObjectItem))
 		{
-			return false;
+			return nullptr;
 		}
+		return ObjectItem;
+	}
+
+	/** Private (inlined) version for internal use only. */
+	FORCEINLINE_DEBUGGABLE bool Internal_IsValid(bool bEvenIfPendingKill, bool bThreadsafeTest) const
+	{
+		FUObjectItem* const ObjectItem = Internal_GetObjectItem();
 		if (bThreadsafeTest)
 		{
-			return true;
+			return (ObjectItem != nullptr);
+		}
+		else
+		{
+			return (ObjectItem != nullptr) && GUObjectArray.IsValid(ObjectItem, bEvenIfPendingKill);
 		}
-		return GUObjectArray.IsValid(ObjectItem, bEvenIfPendingKill);
 	}
 
 	/** Private (inlined) version for internal use only. */
 	FORCEINLINE_DEBUGGABLE UObject* Internal_Get(bool bEvenIfPendingKill) const
 	{
-		UObject* Result = nullptr;
-
-		if (Internal_IsValid(true, true))
-		{
-			FUObjectItem* ObjectItem = GUObjectArray.IndexToValidObject(GetObjectIndex(), bEvenIfPendingKill);
-			if (ObjectItem)
-			{
-				Result = (UObject*)ObjectItem->Object;
-			}
-		}
-		return Result;
+		FUObjectItem* const ObjectItem = Internal_GetObjectItem();
+		return ((ObjectItem != nullptr) && GUObjectArray.IsValid(ObjectItem, bEvenIfPendingKill)) ? (UObject*)ObjectItem->Object : nullptr;
 	}
 
 	int32		ObjectIndex;
diff --git a/Engine/Source/Runtime/D3D12RHI/Private/D3D12Commands.cpp b/Engine/Source/Runtime/D3D12RHI/Private/D3D12Commands.cpp
index a9dcbf374c87..18b49f7da08c 100644
--- a/Engine/Source/Runtime/D3D12RHI/Private/D3D12Commands.cpp
+++ b/Engine/Source/Runtime/D3D12RHI/Private/D3D12Commands.cpp
@@ -1090,11 +1090,6 @@ void FD3D12CommandContext::RHISetRenderTargets(
 	}
 }
 
-void FD3D12DynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
-{
-	// Could support in DX12 via ID3D12CommandList::DiscardResource function.
-}
-
 void FD3D12CommandContext::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo)
 {
 	FUnorderedAccessViewRHIParamRef UAVs[MaxSimultaneousUAVs] = {};
diff --git a/Engine/Source/Runtime/D3D12RHI/Private/D3D12RHIPrivate.h b/Engine/Source/Runtime/D3D12RHI/Private/D3D12RHIPrivate.h
index 4bc6ae01a38c..5edb2b267334 100644
--- a/Engine/Source/Runtime/D3D12RHI/Private/D3D12RHIPrivate.h
+++ b/Engine/Source/Runtime/D3D12RHI/Private/D3D12RHIPrivate.h
@@ -308,7 +308,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef ViewportRHI, uint32 SizeX, uint32 SizeY, bool bIsFullscreen, EPixelFormat PreferredPixelFormat) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets, const FVertexBufferRHIParamRef* VertexBuffers, const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask) final override;
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual void RHISubmitCommandsAndFlushGPU() final override;
 	virtual bool RHIGetAvailableResolutions(FScreenResolutionArray& Resolutions, bool bIgnoreRefreshRate) final override;
diff --git a/Engine/Source/Runtime/D3D12RHI/Private/D3D12Texture.cpp b/Engine/Source/Runtime/D3D12RHI/Private/D3D12Texture.cpp
index 86c2556237fc..82911edd5336 100644
--- a/Engine/Source/Runtime/D3D12RHI/Private/D3D12Texture.cpp
+++ b/Engine/Source/Runtime/D3D12RHI/Private/D3D12Texture.cpp
@@ -2122,7 +2122,7 @@ void FD3D12DynamicRHI::RHIBindDebugLabelName(FTextureRHIParamRef TextureRHI, con
 
 			TArray<FStringFormatArg> Args;
 			Args.Add(Name);
-			Args.Add(LexicalConversion::ToString(BaseTexture->GetParentDevice()->GetGPUIndex()));
+			Args.Add(LexToString(BaseTexture->GetParentDevice()->GetGPUIndex()));
 
 			FString DebugName = FString::Format(TEXT("{0} (GPU {1})"), Args);
 			SetName(Resource, DebugName.GetCharArray().GetData());
diff --git a/Engine/Source/Runtime/D3D12RHI/Private/D3D12VertexDeclaration.cpp b/Engine/Source/Runtime/D3D12RHI/Private/D3D12VertexDeclaration.cpp
index 0784d0c14a94..711facc00ed3 100644
--- a/Engine/Source/Runtime/D3D12RHI/Private/D3D12VertexDeclaration.cpp
+++ b/Engine/Source/Runtime/D3D12RHI/Private/D3D12VertexDeclaration.cpp
@@ -98,7 +98,8 @@ uint32 GetTypeHash(const FD3D12VertexDeclarationKey& Key)
 /** Compare two vertex declaration keys. */
 bool operator==(const FD3D12VertexDeclarationKey& A, const FD3D12VertexDeclarationKey& B)
 {
-	return A.VertexElements == B.VertexElements;
+	return A.VertexElements == B.VertexElements
+		&& !FMemory::Memcmp(A.StreamStrides, B.StreamStrides, sizeof(A.StreamStrides));
 }
 
 /** Global cache of vertex declarations. */
diff --git a/Engine/Source/Runtime/EmptyRHI/Private/EmptyCommands.cpp b/Engine/Source/Runtime/EmptyRHI/Private/EmptyCommands.cpp
index 4a2c543b3bbd..ba8c67ed44f5 100644
--- a/Engine/Source/Runtime/EmptyRHI/Private/EmptyCommands.cpp
+++ b/Engine/Source/Runtime/EmptyRHI/Private/EmptyCommands.cpp
@@ -257,10 +257,6 @@ void FEmptyDynamicRHI::RHISetRenderTargets(uint32 NumSimultaneousRenderTargets,
 
 }
 
-void FEmptyDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
-{
-}
-
 void FEmptyDynamicRHI::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo)
 {
 }
diff --git a/Engine/Source/Runtime/EmptyRHI/Public/EmptyRHI.h b/Engine/Source/Runtime/EmptyRHI/Public/EmptyRHI.h
index 87099946cd3b..4003ebfa54d5 100644
--- a/Engine/Source/Runtime/EmptyRHI/Public/EmptyRHI.h
+++ b/Engine/Source/Runtime/EmptyRHI/Public/EmptyRHI.h
@@ -118,7 +118,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef Viewport, uint32 SizeX, uint32 SizeY, bool bIsFullscreen) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets,const FVertexBufferRHIParamRef* VertexBuffers,const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override;
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual bool RHIGetAvailableResolutions(FScreenResolutionArray& Resolutions, bool bIgnoreRefreshRate) final override;
 	virtual void RHIGetSupportedResolution(uint32& Width, uint32& Height) final override;
diff --git a/Engine/Source/Runtime/Engine/Classes/AI/Navigation/NavigationTypes.h b/Engine/Source/Runtime/Engine/Classes/AI/Navigation/NavigationTypes.h
index 41dbcb83367e..157e9e4c19b2 100644
--- a/Engine/Source/Runtime/Engine/Classes/AI/Navigation/NavigationTypes.h
+++ b/Engine/Source/Runtime/Engine/Classes/AI/Navigation/NavigationTypes.h
@@ -488,8 +488,8 @@ struct ENGINE_API FNavAgentProperties : public FMovementProperties
 	{
 		return FGenericPlatformMath::Abs(AgentRadius - Other.AgentRadius) < Precision
 			&& FGenericPlatformMath::Abs(AgentHeight - Other.AgentHeight) < Precision
-			&& ((HasStepHeightOverride() == false) 
-				|| (Other.HasStepHeightOverride() == false) 
+			&& ((HasStepHeightOverride() == false)
+				|| (Other.HasStepHeightOverride() == false)
 				|| FGenericPlatformMath::Abs(AgentStepHeight - Other.AgentStepHeight) < Precision)
 			&& IsNavDataMatching(Other);
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/AI/NavigationSystemConfig.h b/Engine/Source/Runtime/Engine/Classes/AI/NavigationSystemConfig.h
index 7b970a8bce1b..653e6fbf6c07 100644
--- a/Engine/Source/Runtime/Engine/Classes/AI/NavigationSystemConfig.h
+++ b/Engine/Source/Runtime/Engine/Classes/AI/NavigationSystemConfig.h
@@ -30,7 +30,7 @@ public:
 public:
 	UNavigationSystemConfig(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());
 
-	UNavigationSystemBase* CreateAndConfigureNavigationSystem(UWorld& World) const;
+	virtual UNavigationSystemBase* CreateAndConfigureNavigationSystem(UWorld& World) const;
 
 #if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimInstance.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimInstance.h
index 304915372edd..d10515e97bcf 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimInstance.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimInstance.h
@@ -181,6 +181,8 @@ struct FSlotEvaluationPose
 	FBlendedCurve Curve;
 
 	FSlotEvaluationPose()
+		: AdditiveType(AAT_None)
+		, Weight(0.0f)
 	{
 	}
 
@@ -354,10 +356,6 @@ class ENGINE_API UAnimInstance : public UObject
 	~UAnimInstance() {}
 	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
-	/** DeltaTime **/
-	UPROPERTY()
-	float DeltaTime_DEPRECATED;
-
 	/** This is used to extract animation. If Mesh exists, this will be overwritten by Mesh->Skeleton */
 	UPROPERTY(transient)
 	USkeleton* CurrentSkeleton;
@@ -366,6 +364,11 @@ class ENGINE_API UAnimInstance : public UObject
 	UPROPERTY(Category = RootMotion, EditDefaultsOnly)
 	TEnumAsByte<ERootMotionMode::Type> RootMotionMode;
 
+#if WITH_EDITORONLY_DATA
+	/** DeltaTime **/
+	UPROPERTY()
+	float DeltaTime_DEPRECATED;
+
 	/** 
 	 * DEPRECATED: No longer used.
 	 * Allows this anim instance to update its native update, blend tree, montages and asset players on
@@ -375,7 +378,7 @@ class ENGINE_API UAnimInstance : public UObject
 	 */
 	DEPRECATED(4.15, "This variable is no longer used. Use bUseMultiThreadedAnimationUpdate on the UAnimBlueprint to control this.")
 	UPROPERTY()
-	bool bRunUpdatesInWorkerThreads_DEPRECATED;
+	uint8 bRunUpdatesInWorkerThreads_DEPRECATED : 1;
 
 	/** 
 	 * DEPRECATED: No longer used.
@@ -386,7 +389,17 @@ class ENGINE_API UAnimInstance : public UObject
 	 */
 	DEPRECATED(4.15, "This variable is no longer used. Use bUseMultiThreadedAnimationUpdate on the UAnimBlueprint to control this.")
 	UPROPERTY()
-	bool bCanUseParallelUpdateAnimation_DEPRECATED;
+	uint8 bCanUseParallelUpdateAnimation_DEPRECATED : 1;
+
+
+	/**
+	 * Selecting this option will cause the compiler to emit warnings whenever a call into Blueprint
+	 * is made from the animation graph. This can help track down optimizations that need to be made.
+	 */
+	DEPRECATED(4.15, "This variable is no longer used. Use bWarnAboutBlueprintUsage on the UAnimBlueprint to control this.")
+	UPROPERTY()
+	uint8 bWarnAboutBlueprintUsage_DEPRECATED : 1;
+#endif
 
 	/**
 	 * Allows this anim instance to update its native update, blend tree, montages and asset players on
@@ -396,18 +409,28 @@ class ENGINE_API UAnimInstance : public UObject
 	 * Animation Update" should be set.
 	 */
 	UPROPERTY(meta=(BlueprintCompilerGeneratedDefaults))
-	bool bUseMultiThreadedAnimationUpdate;
+	uint8 bUseMultiThreadedAnimationUpdate : 1;
 
-	/**
-	 * Selecting this option will cause the compiler to emit warnings whenever a call into Blueprint
-	 * is made from the animation graph. This can help track down optimizations that need to be made.
-	 */
-	DEPRECATED(4.15, "This variable is no longer used. Use bWarnAboutBlueprintUsage on the UAnimBlueprint to control this.")
-	UPROPERTY()
-	bool bWarnAboutBlueprintUsage_DEPRECATED;
+	/** If this AnimInstance has nodes using 'CopyPoseFromMesh' this will be true. */
+	UPROPERTY(meta = (BlueprintCompilerGeneratedDefaults))
+	uint8 bUsingCopyPoseFromMesh : 1;
 
 	/** Flag to check back on the game thread that indicates we need to run PostUpdateAnimation() in the post-eval call */
-	bool bNeedsUpdate;
+	uint8 bNeedsUpdate : 1;
+
+private:
+	/** True when Montages are being ticked, and Montage Events should be queued. 
+	 * When Montage are being ticked, we queue AnimNotifies and Events. We trigger notifies first, then Montage events. */
+	UPROPERTY(Transient)
+	uint8 bQueueMontageEvents : 1;
+
+#if DO_CHECK
+	/** Used to guard against recursive calls to UpdateAnimation */
+	bool bPostUpdatingAnimation;
+
+	/** Used to guard against recursive calls to UpdateAnimation */
+	bool bUpdatingAnimation;
+#endif
 
 public:
 
@@ -660,6 +683,9 @@ public:
 	/** Get the FAnimMontageInstance currently running that matches this ID.  Will return NULL if no instance is found. */
 	FAnimMontageInstance* GetMontageInstanceForID(int32 MontageInstanceID);
 
+	/** Stop all montages that are active **/
+	void StopAllMontages(float BlendOut);
+
 	/** AnimMontage instances that are running currently
 	* - only one is primarily active per group, and the other ones are blending out
 	*/
@@ -674,9 +700,6 @@ protected:
 	/** Map between Active Montages and their FAnimMontageInstance */
 	TMap<class UAnimMontage*, struct FAnimMontageInstance*> ActiveMontagesMap;
 
-	/** Stop all montages that are active **/
-	void StopAllMontages(float BlendOut);
-
 	/** Stop all active montages belonging to 'InGroupName' */
 	void StopAllMontagesByGroupName(FName InGroupName, const FAlphaBlend& BlendOut);
 
@@ -693,11 +716,6 @@ public:
 	void QueueMontageEndedEvent(const FQueuedMontageEndedEvent& MontageEndedEvent);
 
 private:
-	/** True when Montages are being ticked, and Montage Events should be queued. 
-	 * When Montage are being ticked, we queue AnimNotifies and Events. We trigger notifies first, then Montage events. */
-	UPROPERTY(Transient)
-	bool bQueueMontageEvents;
-
 	/** Trigger queued Montage events. */
 	void TriggerQueuedMontageEvents();
 
@@ -713,16 +731,12 @@ private:
 	/** Trigger a Montage Ended event */
 	void TriggerMontageEndedEvent(const FQueuedMontageEndedEvent& MontageEndedEvent);
 
-	/** Used to guard against recursive calls to UpdateAnimation */
-	bool bUpdatingAnimation;
-
-	/** Used to guard against recursive calls to UpdateAnimation */
-	bool bPostUpdatingAnimation;
-
 public:
 
+#if DO_CHECK
 	/** Is this animation currently running post update */
 	bool IsPostUpdatingAnimation() const { return bPostUpdatingAnimation; }
+#endif
 
 	/** Set RootMotionMode */
 	UFUNCTION(BlueprintCallable, Category = "Animation")
@@ -1003,8 +1017,18 @@ public:
 
 	/** Reset any dynamics running simulation-style updates (e.g. on teleport, time skip etc.) */
 	UFUNCTION(BlueprintCallable, Category = "Animation", meta = (NotBlueprintThreadSafe))
+	void ResetDynamics(ETeleportType InTeleportType);
+
+	DEPRECATED(4.20, "Please use ResetDynamics with a ETeleportType argument")
 	void ResetDynamics();
 
+	/** 
+	 * Get the 'animation' LOD level, which by default is the PredictedLODLevel of this anim instance's skeletal mesh component.
+	 * This function is used by the anim graph to determine the LOD level at which to run.
+	 * @return the current LOD level
+	 */
+	virtual int32 GetLODLevel() const;
+
 public:
 	/** Access a read only version of the Updater Counter from the AnimInstanceProxy on the GameThread. */
 	const FGraphTraversalCounter& GetUpdateCounter() const; 
@@ -1012,6 +1036,7 @@ public:
 	/** Access the required bones array */
 	FBoneContainer& GetRequiredBones();
 	const FBoneContainer& GetRequiredBones() const;
+	const FBoneContainer& GetRequiredBonesOnAnyThread() const;
 
 	/** Animation Notifies that has been triggered in the latest tick **/
 	UPROPERTY(transient)
@@ -1046,6 +1071,9 @@ public:
 	/** Check whether we have active morph target curves */
 	bool HasMorphTargetCurves() const;
 
+	/** Check whether we have any active curves */
+	bool HasActiveCurves() const;
+
 	/** 
 	 * Append the type of curve to the OutCurveList specified by Curve Flags
 	 */
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimMontage.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimMontage.h
index 34758efc119b..1789a1b1fa3a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimMontage.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimMontage.h
@@ -57,6 +57,7 @@ public:
 	FCompositeSection()
 		: FAnimLinkableElement()
 		, SectionName(NAME_None)
+		, StartTime_DEPRECATED(0.0f)
 		, NextSectionName(NAME_None)
 	{
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNodeBase.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNodeBase.h
index 6aa48a0f1eb4..78c483f8f86f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNodeBase.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNodeBase.h
@@ -689,8 +689,8 @@ struct ENGINE_API FAnimNode_Base
 	 */
 	virtual bool NeedsDynamicReset() const { return false; }
 
-	/** Override this to perform game-thread work prior to non-game thread Update() being called */
-	virtual void ResetDynamics() {}
+	/** Called to help dynamics-based updates to recover correctly from large movements/teleports */
+	virtual void ResetDynamics(ETeleportType InTeleportType);
 
 	/** Called after compilation */
 	virtual void PostCompile(const class USkeleton* InSkeleton) {}
@@ -708,10 +708,12 @@ struct ENGINE_API FAnimNode_Base
 	virtual void Evaluate(FPoseContext& Output) { check(false); }
 	DEPRECATED(4.17, "Please use EvaluateComponentSpace_AnyThread instead")
 	virtual void EvaluateComponentSpace(FComponentSpacePoseContext& Output) { check(false); }
-
+	DEPRECATED(4.20, "Please use ResetDynamics with an ETeleportPhysics flag instead")
+	virtual void ResetDynamics() {}
 protected:
 	/** return true if enabled, otherwise, return false. This is utility function that can be used per node level */
-	bool IsLODEnabled(FAnimInstanceProxy* AnimInstanceProxy, int32 InLODThreshold);
+	bool IsLODEnabled(FAnimInstanceProxy* AnimInstanceProxy);
+	virtual int32 GetLODThreshold() const { return INDEX_NONE; }
 
 	/** Deprecated function */
 	DEPRECATED(4.17, "Please use OnInitializeAnimInstance instead")
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_ApplyMeshSpaceAdditive.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_ApplyMeshSpaceAdditive.h
index b7626f5b6bfd..1b1a54e1cf62 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_ApplyMeshSpaceAdditive.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_ApplyMeshSpaceAdditive.h
@@ -34,6 +34,8 @@ struct ENGINE_API FAnimNode_ApplyMeshSpaceAdditive : public FAnimNode_Base
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Performance, meta = (DisplayName = "LOD Threshold"))
 	int32 LODThreshold;
 
+	virtual int32 GetLODThreshold() const override { return LODThreshold; }
+
 	UPROPERTY(Transient)
 	float ActualAlpha;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_SequencePlayer.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_SequencePlayer.h
index b4a40a4c4755..9a5ad44f3842 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_SequencePlayer.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_SequencePlayer.h
@@ -24,14 +24,14 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinHiddenByDefault))
 	mutable bool bLoopAnimation;
 
-	// The play rate multiplier. Can be negative, which will cause the animation to play in reverse.
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinHiddenByDefault))
-	mutable float PlayRate;
-
 	// The Basis in which the PlayRate is expressed in. This is used to rescale PlayRate inputs.
 	// For example a Basis of 100 means that the PlayRate input will be divided by 100.
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinHiddenByDefault))
 	mutable float PlayRateBasis;
+
+	// The play rate multiplier. Can be negative, which will cause the animation to play in reverse.
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (PinHiddenByDefault))
+	mutable float PlayRate;
 	
 	// Additional scaling, offsetting and clamping of PlayRate input.
 	// Performed after PlayRateBasis.
@@ -47,8 +47,8 @@ public:
 	FAnimNode_SequencePlayer()
 		: Sequence(NULL)
 		, bLoopAnimation(true)
-		, PlayRate(1.0f)
 		, PlayRateBasis(1.0f)
+		, PlayRate(1.0f)
 		, StartPosition(0.f)
 	{
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_StateMachine.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_StateMachine.h
index a6ad0ceb718e..2c5edb396feb 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_StateMachine.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimNode_StateMachine.h
@@ -196,11 +196,13 @@ private:
 
 public:
 	FAnimNode_StateMachine()
-		: MaxTransitionsPerFrame(3)
+		: StateMachineIndexInClass(0)
+		, MaxTransitionsPerFrame(3)
 		, bSkipFirstUpdateTransition(true)
 		, bReinitializeOnBecomingRelevant(true)
 		, PRIVATE_MachineDescription(NULL)
 		, CurrentState(INDEX_NONE)
+		, ElapsedTime(0.0f)
 		, bFirstUpdate(true)
 	{
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimSequence.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimSequence.h
index 4a65d34d9411..1d5230e39ae8 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimSequence.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimSequence.h
@@ -330,9 +330,9 @@ public:
 		for (const Entry& E : Entries)
 		{
 			TArray<FStringFormatArg> Args;
-			Args.Add(LexicalConversion::ToString(E.Tag));
-			Args.Add(LexicalConversion::ToString(E.RawDataCount));
-			Args.Add(LexicalConversion::ToString(E.SourceDataCount));
+			Args.Add(LexToString(E.Tag));
+			Args.Add(LexToString(E.RawDataCount));
+			Args.Add(LexToString(E.SourceDataCount));
 			Ret += FString::Format(TEXT("\t{0}: Raw:{1} Source:{2}\n"), Args);
 		}
 		return Ret;
@@ -568,6 +568,7 @@ public:
 	virtual void Serialize(FArchive& Ar) override;
 	virtual void PostInitProperties() override;
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
 #if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimStateMachineTypes.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimStateMachineTypes.h
index b51639257a8c..6580cf6dc39e 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimStateMachineTypes.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimStateMachineTypes.h
@@ -157,6 +157,7 @@ struct FAnimationTransitionBetweenStates : public FAnimationStateBase
 		: FAnimationStateBase()
 		, PreviousState(INDEX_NONE)
 		, NextState(INDEX_NONE)
+		, CrossfadeDuration(0.0f)
 		, StartNotify(INDEX_NONE)
 		, EndNotify(INDEX_NONE)
 		, InterruptNotify(INDEX_NONE)
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/AnimationAsset.h b/Engine/Source/Runtime/Engine/Classes/Animation/AnimationAsset.h
index c2c8e033cded..d7c73196364a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/AnimationAsset.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/AnimationAsset.h
@@ -86,9 +86,11 @@ struct FBlendSampleData
 
 	FBlendSampleData()
 		:	SampleDataIndex(0)
+		,	Animation(nullptr)
 		,	TotalWeight(0.f)
 		,	Time(0.f)
 		,	PreviousTime(0.f)
+		,	SamplePlayRate(0.0f)
 	{}
 	FBlendSampleData(int32 Index)
 		:	SampleDataIndex(Index)
@@ -96,6 +98,7 @@ struct FBlendSampleData
 		,	TotalWeight(0.f)
 		,	Time(0.f)
 		,	PreviousTime(0.f)
+		,	SamplePlayRate(0.0f)
 	{}
 	bool operator==( const FBlendSampleData& Other ) const 
 	{
@@ -200,6 +203,7 @@ struct FMarkerSyncAnimPosition
 	bool IsValid() const { return (PreviousMarkerName != NAME_None && NextMarkerName != NAME_None); }
 
 	FMarkerSyncAnimPosition()
+		: PositionBetweenMarkers(0.0f)
 	{}
 
 	FMarkerSyncAnimPosition(const FName& InPrevMarkerName, const FName& InNextMarkerName, const float& InAlpha)
@@ -269,7 +273,8 @@ struct FAnimTickRecord
 
 public:
 	FAnimTickRecord()
-		: TimeAccumulator(nullptr)
+		: SourceAsset(nullptr)
+		, TimeAccumulator(nullptr)
 		, PlayRateMultiplier(1.f)
 		, EffectiveBlendWeight(0.f)
 		, RootMotionWeightModifier(1.f)
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/InputScaleBias.h b/Engine/Source/Runtime/Engine/Classes/Animation/InputScaleBias.h
index 73a70e42a6f2..0b685beffe79 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/InputScaleBias.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/InputScaleBias.h
@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "UObject/ObjectMacros.h"
+#include "AlphaBlend.h"
 #include "InputScaleBias.generated.h"
 
 // Input scaling struct
@@ -27,6 +28,29 @@ public:
 
 	// Apply scale and bias to value
 	float ApplyTo(float Value) const;
+
+	FText GetFriendlyName(FText InFriendlyName) const;
+};
+
+USTRUCT(BlueprintType)
+struct ENGINE_API FInputRange
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	float Min;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	float Max;
+
+public:
+	FInputRange()
+		: Min(0.0f)
+		, Max(1.0f)
+	{
+	}
+
+	FVector2D ToVector2D() const { return FVector2D(Min, Max); } 
 };
 
 USTRUCT(BlueprintType)
@@ -34,6 +58,15 @@ struct ENGINE_API FInputScaleBiasClamp
 {
 	GENERATED_USTRUCT_BODY()
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	bool bMapRange;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bMapRange"))
+	FInputRange InRange;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bMapRange"))
+	FInputRange OutRange;
+
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
 	float Scale;
 
@@ -43,12 +76,27 @@ struct ENGINE_API FInputScaleBiasClamp
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
 	bool bClampResult;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bClampResult"))
 	float ClampMin;
 
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bClampResult"))
 	float ClampMax;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	bool bInterpResult;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bInterpResult"))
+	float InterpSpeedIncreasing;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings, meta = (EditCondition = "bInterpResult"))
+	float InterpSpeedDecreasing;
+
+	UPROPERTY(Transient)
+	mutable float InterpolatedResult;
+
+	UPROPERTY(Transient)
+	mutable bool bInitialized;
+
 public:
 	FInputScaleBiasClamp()
 		: Scale(1.0f)
@@ -56,9 +104,60 @@ public:
 		, bClampResult(false)
 		, ClampMin(0.f)
 		, ClampMax(1.f)
+		, bInterpResult(false)
+		, InterpSpeedIncreasing(10.f)
+		, InterpSpeedDecreasing(10.f)
+		, InterpolatedResult(0.f)
+		, bInitialized(false)
 	{
 	}
 
 	// Apply scale, bias, and clamp to value
-	float ApplyTo(float Value) const;
+	float ApplyTo(float Value, float InDeltaTime) const;
+	void Reinitialize() { bInitialized = false; }
+	FText GetFriendlyName(FText InFriendlyName) const;
 };
+
+// AnimNodes using an Alpha can choose how it is driven.
+UENUM()
+enum class EAnimAlphaInputType : uint8
+{
+	Float	UMETA(DisplayName = "Float Value"),
+	Bool	UMETA(DisplayName = "Bool Value"),
+	Curve	UMETA(DisplayName = "Anim Curve Value")
+};
+
+USTRUCT(BlueprintType)
+struct ENGINE_API FInputAlphaBoolBlend
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	float BlendInTime;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	float BlendOutTime;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	EAlphaBlendOption BlendOption;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Settings)
+	UCurveFloat* CustomCurve;
+
+	UPROPERTY(Transient)
+	FAlphaBlend AlphaBlend;
+
+	UPROPERTY(Transient)
+	bool bInitialized;
+
+	FInputAlphaBoolBlend()
+		: BlendInTime(0.0f)
+		, BlendOutTime(0.0f)
+		, BlendOption(EAlphaBlendOption::Linear)
+		, CustomCurve(nullptr)
+		, bInitialized(false)
+	{}
+
+	float ApplyTo(bool bEnabled, float InDeltaTime);
+	void Reinitialize() { bInitialized = false; }
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/Skeleton.h b/Engine/Source/Runtime/Engine/Classes/Animation/Skeleton.h
index 8028f418cb8a..351a34a32d71 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/Skeleton.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/Skeleton.h
@@ -63,9 +63,14 @@ namespace EBoneTranslationRetargetingMode
 		AnimationScaled,
 		/** Use Translation from animation, but also play the difference from retargeting pose as an additive. */
 		AnimationRelative,
+		/** Apply delta orientation and scale from ref pose */
+		OrientAndScale,
 	};
 }
 
+/** Max error allowed when considering bone translations for 'Orient And Scale' retargeting. */
+#define BONE_TRANS_RT_ORIENT_AND_SCALE_PRECISION (0.001f) 
+
 /** Each Bone node in BoneTree */
 USTRUCT()
 struct FBoneNode
@@ -360,7 +365,7 @@ public:
 
 	// return version of AnimCurveUidVersion
 	uint16 GetAnimCurveUidVersion() const { return AnimCurveUidVersion;  }
-	const TArray<AnimCurveUID>& GetDefaultCurveUIDList() const { return DefaultCurveUIDList; }
+	const TArray<uint16>& GetDefaultCurveUIDList() const { return DefaultCurveUIDList; }
 protected:
 	// Container for smart name mappings
 	UPROPERTY()
@@ -369,7 +374,7 @@ protected:
 	// this is default curve uid list used like ref pose, as default value
 	// don't use this unless you want all curves from the skeleton
 	// FBoneContainer contains only list that is used by current LOD
-	TArray<AnimCurveUID> DefaultCurveUIDList;
+	TArray<uint16> DefaultCurveUIDList;
 
 private:
 	/** Increase the AnimCurveUidVersion so that instances can get the latest information */
@@ -724,6 +729,7 @@ public:
 
 	ENGINE_API void SetBoneTranslationRetargetingMode(const int32 BoneIndex, EBoneTranslationRetargetingMode::Type NewRetargetingMode, bool bChildrenToo=false);
 
+	virtual bool IsPostLoadThreadSafe() const override;
 	ENGINE_API virtual void PostLoad() override;
 	ENGINE_API virtual void PostDuplicate(bool bDuplicateForPIE) override;
 	ENGINE_API virtual void PostInitProperties() override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/SmartName.h b/Engine/Source/Runtime/Engine/Classes/Animation/SmartName.h
index 1bab047ca1b2..5128ece37c24 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/SmartName.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/SmartName.h
@@ -156,6 +156,10 @@ struct ENGINE_API FSmartNameMapping
 
 	/* initialize curve meta data for the container */
 	void InitializeCurveMetaData(class USkeleton* Skeleton);
+
+	/** Get the maximum in use UID */
+	SmartName::UID_Type GetMaxUID() const { return CurveNameList.Num() - 1; }
+
 private:
 	
 	TArray<FName> CurveNameList; // List of curve names, order gives UID
diff --git a/Engine/Source/Runtime/Engine/Classes/Animation/TimeStretchCurve.h b/Engine/Source/Runtime/Engine/Classes/Animation/TimeStretchCurve.h
index 06f227e14249..68db120083e6 100644
--- a/Engine/Source/Runtime/Engine/Classes/Animation/TimeStretchCurve.h
+++ b/Engine/Source/Runtime/Engine/Classes/Animation/TimeStretchCurve.h
@@ -30,12 +30,18 @@ struct FTimeStretchCurveMarker
 
 	FTimeStretchCurveMarker()
 		: Alpha(0.f)
-	{}
+	{
+		Time[(uint8)ETimeStretchCurveMapping::T_Original] = 0.0f;
+		Time[(uint8)ETimeStretchCurveMapping::T_TargetMin] = 0.0f;
+		Time[(uint8)ETimeStretchCurveMapping::T_TargetMax] = 0.0f;
+	}
 
 	FTimeStretchCurveMarker(float InT_Original, float InAlpha)
 		: Alpha(InAlpha)
 	{
 		Time[(uint8)ETimeStretchCurveMapping::T_Original] = InT_Original;
+		Time[(uint8)ETimeStretchCurveMapping::T_TargetMin] = 0.0f;
+		Time[(uint8)ETimeStretchCurveMapping::T_TargetMax] = 0.0f;
 	}
 }; 
 
@@ -197,7 +203,11 @@ public:
 	FTimeStretchCurve()
 		: SamplingRate(60.f)
 		, CurveValueMinPrecision(0.01f)
-	{}
+	{
+		Sum_dT_i_by_C_i[(uint8)ETimeStretchCurveMapping::T_Original] = 0.0f;
+		Sum_dT_i_by_C_i[(uint8)ETimeStretchCurveMapping::T_TargetMin] = 0.0f;
+		Sum_dT_i_by_C_i[(uint8)ETimeStretchCurveMapping::T_TargetMax] = 0.0f;
+	}
 
 	bool IsValid() const;
 	void Reset();
@@ -236,6 +246,7 @@ struct ENGINE_API FTimeStretchCurveInstance
 
 public:
 	FTimeStretchCurveInstance()
+		: bHasValidData(false)
 	{}
 
 	void InitializeFromPlayRate(float InPlayRate, const FTimeStretchCurve& TimeStretchCurve);
diff --git a/Engine/Source/Runtime/Engine/Classes/Atmosphere/AtmosphericFogComponent.h b/Engine/Source/Runtime/Engine/Classes/Atmosphere/AtmosphericFogComponent.h
index 3a8cb01a240c..132c0b7769ba 100644
--- a/Engine/Source/Runtime/Engine/Classes/Atmosphere/AtmosphericFogComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Atmosphere/AtmosphericFogComponent.h
@@ -254,6 +254,7 @@ public:
 	
 	//~ Begin UObject Interface. 
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual void BeginDestroy() override;
 
 #if WITH_EDITOR
diff --git a/Engine/Source/Runtime/Engine/Classes/Camera/CameraShake.h b/Engine/Source/Runtime/Engine/Classes/Camera/CameraShake.h
index 8fb57b597e45..cfbd1234fd8a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Camera/CameraShake.h
+++ b/Engine/Source/Runtime/Engine/Classes/Camera/CameraShake.h
@@ -27,17 +27,17 @@ enum EInitialOscillatorOffset
 };
 
 /** Defines oscillation of a single number. */
-USTRUCT()
+USTRUCT(BlueprintType)
 struct ENGINE_API FFOscillator
 {
 	GENERATED_USTRUCT_BODY()
 
 	/** Amplitude of the sinusoidal oscillation. */
-	UPROPERTY(EditAnywhere, Category=FOscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=FOscillator)
 	float Amplitude;
 
 	/** Frequency of the sinusoidal oscillation. */
-	UPROPERTY(EditAnywhere, Category = FOscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FOscillator)
 	float Frequency;
 
 	/** Defines how to begin (either at zero, or at a randomized value. */
@@ -61,41 +61,41 @@ struct ENGINE_API FFOscillator
 };
 
 /** Defines FRotator oscillation. */
-USTRUCT()
+USTRUCT(BlueprintType)
 struct FROscillator
 {
 	GENERATED_USTRUCT_BODY()
 
 	/** Pitch oscillation. */
-	UPROPERTY(EditAnywhere, Category=ROscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=ROscillator)
 	struct FFOscillator Pitch;
 
 	/** Yaw oscillation. */
-	UPROPERTY(EditAnywhere, Category = ROscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ROscillator)
 	struct FFOscillator Yaw;
 
 	/** Roll oscillation. */
-	UPROPERTY(EditAnywhere, Category = ROscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ROscillator)
 	struct FFOscillator Roll;
 
 };
 
 /** Defines FVector oscillation. */
-USTRUCT()
+USTRUCT(BlueprintType)
 struct FVOscillator
 {
 	GENERATED_USTRUCT_BODY()
 
 	/** Oscillation in the X axis. */
-	UPROPERTY(EditAnywhere, Category = VOscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VOscillator)
 	struct FFOscillator X;
 
 	/** Oscillation in the Y axis. */
-	UPROPERTY(EditAnywhere, Category = VOscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VOscillator)
 	struct FFOscillator Y;
 
 	/** Oscillation in the Z axis. */
-	UPROPERTY(EditAnywhere, Category = VOscillator)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VOscillator)
 	struct FFOscillator Z;
 
 };
@@ -121,6 +121,7 @@ class ENGINE_API UCameraShake : public UObject
 {
 	GENERATED_UCLASS_BODY()
 
+public:
 	/** 
 	 *  If true to only allow a single instance of this shake class to play at any given time.
 	 *  Subsequent attempts to play this shake will simply restart the timer.
@@ -141,15 +142,15 @@ class ENGINE_API UCameraShake : public UObject
 	float OscillationBlendOutTime;
 
 	/** Rotational oscillation */
-	UPROPERTY(EditAnywhere, Category=Oscillation)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Oscillation)
 	struct FROscillator RotOscillation;
 
 	/** Positional oscillation */
-	UPROPERTY(EditAnywhere, Category=Oscillation)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Oscillation)
 	struct FVOscillator LocOscillation;
 
 	/** FOV oscillation */
-	UPROPERTY(EditAnywhere, Category=Oscillation)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Oscillation)
 	struct FFOscillator FOVOscillation;
 
 	/************************************************************
diff --git a/Engine/Source/Runtime/Engine/Classes/Camera/CameraTypes.h b/Engine/Source/Runtime/Engine/Classes/Camera/CameraTypes.h
index eca8e4a54923..1f99be23b06c 100644
--- a/Engine/Source/Runtime/Engine/Classes/Camera/CameraTypes.h
+++ b/Engine/Source/Runtime/Engine/Classes/Camera/CameraTypes.h
@@ -51,6 +51,10 @@ struct FMinimalViewInfo
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Camera)
 	float FOV;
 
+	/** This is the originally desired field of view before any adjustments to account for different aspect ratios */
+	UPROPERTY(Transient)
+	float DesiredFOV;
+
 	/** The desired width (in world units) of the orthographic view (ignored in Perspective mode) */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Camera)
 	float OrthoWidth;
@@ -95,6 +99,7 @@ struct FMinimalViewInfo
 		: Location(ForceInit)
 		, Rotation(ForceInit)
 		, FOV(90.0f)
+		, DesiredFOV(90.0f)
 		, OrthoWidth(512.0f)
 		, OrthoNearClipPlane(0.0f)
 		, OrthoFarClipPlane(WORLD_MAX)
diff --git a/Engine/Source/Runtime/Engine/Classes/Commandlets/Commandlet.h b/Engine/Source/Runtime/Engine/Classes/Commandlets/Commandlet.h
index 9b18a3a22243..931549c552eb 100644
--- a/Engine/Source/Runtime/Engine/Classes/Commandlets/Commandlet.h
+++ b/Engine/Source/Runtime/Engine/Classes/Commandlets/Commandlet.h
@@ -80,6 +80,10 @@ class UCommandlet : public UObject
 	UPROPERTY()
 	uint32 ShowErrorCount:1;
 
+	/** Whether to show cooking progress on tick */
+	UPROPERTY()
+	uint32 ShowProgress:1;
+
 
 	/**
 	 * Entry point for your commandlet
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/ApplicationLifecycleComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/ApplicationLifecycleComponent.h
index aafe8e55eb49..7443842b50f3 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/ApplicationLifecycleComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/ApplicationLifecycleComponent.h
@@ -14,6 +14,7 @@
 UENUM(BlueprintType)
 enum class ETemperatureSeverityType : uint8
 {
+	Unknown,
 	Good,
 	Bad,
 	Serious,
@@ -31,6 +32,7 @@ class ENGINE_API UApplicationLifecycleComponent : public UActorComponent
 
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE(FApplicationLifetimeDelegate);
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnTemperatureChangeDelegate , ETemperatureSeverityType, Severity);
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnLowPowerModeDelegate, bool, bInLowPowerMode);
 
 	// This is called when the application is about to be deactivated (e.g., due to a phone call or SMS or the sleep button). 
 	// The game should be paused if possible, etc... 
@@ -72,6 +74,10 @@ class ENGINE_API UApplicationLifecycleComponent : public UActorComponent
 	UPROPERTY(BlueprintAssignable)
 	FOnTemperatureChangeDelegate OnTemperatureChangeDelegate;
 
+	// Called when we are in low power mode
+	UPROPERTY(BlueprintAssignable)
+	FOnLowPowerModeDelegate OnLowPowerModeDelegate;
+
 public:
 	void OnRegister() override;
 	void OnUnregister() override;
@@ -86,6 +92,7 @@ private:
 	void ApplicationShouldUnloadResourcesDelegate_Handler() { ApplicationShouldUnloadResourcesDelegate.Broadcast(); }
 	void ApplicationReceivedStartupArgumentsDelegate_Handler(const TArray<FString>& StartupArguments) { ApplicationReceivedStartupArgumentsDelegate.Broadcast(StartupArguments); }
 	void OnTemperatureChangeDelegate_Handler(FCoreDelegates::ETemperatureSeverity Severity) { OnTemperatureChangeDelegate.Broadcast((ETemperatureSeverityType)Severity); }
+	void OnLowPowerModeDelegate_Handler(bool bInLowerPowerMode) { OnLowPowerModeDelegate.Broadcast(bInLowerPowerMode); }
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/AudioComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/AudioComponent.h
index 788f7904d10f..6faa1607d8af 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/AudioComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/AudioComponent.h
@@ -143,7 +143,7 @@ class ENGINE_API UAudioComponent : public USceneComponent
 
 	/** Whether or not to override the sound's subtitle priority. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sound)
-	uint32 bOverrideSubtitlePriority:1;
+	uint8 bOverrideSubtitlePriority:1;
 
 	/** Whether or not this sound plays when the game is paused in the UI */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sound)
@@ -187,6 +187,22 @@ class ENGINE_API UAudioComponent : public USceneComponent
 	/** Whether or not this audio component has been paused */
 	uint8 bIsPaused:1;
 
+	/**
+	* True if we should automatically attach to AutoAttachParent when Played, and detach from our parent when playback is completed.
+	* This overrides any current attachment that may be present at the time of activation (deferring initial attachment until activation, if AutoAttachParent is null).
+	* If enabled, this AudioComponent's WorldLocation will no longer be reliable when not currently playing audio, and any attach children will also be detached/attached along with it.
+	* When enabled, detachment occurs regardless of whether AutoAttachParent is assigned, and the relative transform from the time of activation is restored.
+	* This also disables attachment on dedicated servers, where we don't actually activate even if bAutoActivate is true.
+	* @see AutoAttachParent, AutoAttachSocketName, AutoAttachLocationType
+	*/
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Attachment)
+	uint8 bAutoManageAttachment:1;
+
+private:
+	/** Did we auto attach during activation? Used to determine if we should restore the relative transform during detachment. */
+	uint8 bDidAutoAttach : 1;
+
+public:
 	/** The specific audio device to play this component on */
 	uint32 AudioDeviceHandle;
 
@@ -230,20 +246,25 @@ class ENGINE_API UAudioComponent : public USceneComponent
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sound, meta = (ClampMin = "0.0", UIMin = "0.0", EditCondition = "bOverrideSubtitlePriority"))
 	float SubtitlePriority;
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	float VolumeWeightedPriorityScale_DEPRECATED;
 
+	UPROPERTY()
+	float HighFrequencyGainMultiplier_DEPRECATED;
+#endif
+
 	/** A pitch multiplier to apply to sounds generated by this component */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Sound)
 	float PitchMultiplier;
 
-	UPROPERTY()
-	float HighFrequencyGainMultiplier_DEPRECATED;
-
 	/** The frequency of the lowpass filter (in hertz) to apply to this voice. A frequency of 0.0 is the device sample rate and will bypass the filter. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Filter, meta = (ClampMin = "0.0", UIMin = "0.0", EditCondition = "bEnableLowPassFilter"))
 	float LowPassFilterFrequency;
 
+	/** A count of how many times we've started playing */
+	int32 ActiveCount;
+
 	/** If bOverrideSettings is false, the asset to use to determine attenuation properties for sounds generated by this component */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Attenuation, meta=(EditCondition="!bOverrideAttenuation"))
 	class USoundAttenuation* AttenuationSettings;
@@ -259,6 +280,27 @@ class ENGINE_API UAudioComponent : public USceneComponent
 	/** while playing, this component will check for occlusion from its closest listener every this many seconds */
 	float OcclusionCheckInterval;
 
+	/**
+	 * Options for how we handle our location when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
+	 * @see bAutoManageAttachment, EAttachmentRule
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
+	EAttachmentRule AutoAttachLocationRule;
+
+	/**
+	 * Options for how we handle our rotation when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
+	 * @see bAutoManageAttachment, EAttachmentRule
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
+	EAttachmentRule AutoAttachRotationRule;
+
+	/**
+	 * Options for how we handle our scale when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
+	 * @see bAutoManageAttachment, EAttachmentRule
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
+	EAttachmentRule AutoAttachScaleRule;
+
 	/** called when we finish playing audio, either because it played to completion or because a Stop() call turned it off early */
 	UPROPERTY(BlueprintAssignable)
 	FOnAudioFinished OnAudioFinished;
@@ -441,17 +483,6 @@ public:
 
 public:
 
-	/**
-	 * True if we should automatically attach to AutoAttachParent when Played, and detach from our parent when playback is completed.
-	 * This overrides any current attachment that may be present at the time of activation (deferring initial attachment until activation, if AutoAttachParent is null).
-	 * If enabled, this AudioComponent's WorldLocation will no longer be reliable when not currently playing audio, and any attach children will also be detached/attached along with it.
-	 * When enabled, detachment occurs regardless of whether AutoAttachParent is assigned, and the relative transform from the time of activation is restored.
-	 * This also disables attachment on dedicated servers, where we don't actually activate even if bAutoActivate is true.
-	 * @see AutoAttachParent, AutoAttachSocketName, AutoAttachLocationType
-	 */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Attachment)
-	uint8 bAutoManageAttachment:1;
-
 	/**
 	 * Component we automatically attach to when activated, if bAutoManageAttachment is true.
 	 * If null during registration, we assign the existing AttachParent and defer attachment until we activate.
@@ -467,37 +498,15 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Attachment, meta=(EditCondition="bAutoManageAttachment"))
 	FName AutoAttachSocketName;
 
-	/**
-	 * Options for how we handle our location when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
-	 * @see bAutoManageAttachment, EAttachmentRule
-	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
-	EAttachmentRule AutoAttachLocationRule;
-
-	/**
-	 * Options for how we handle our rotation when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
-	 * @see bAutoManageAttachment, EAttachmentRule
-	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
-	EAttachmentRule AutoAttachRotationRule;
-
-	/**
-	 * Options for how we handle our scale when we attach to the AutoAttachParent, if bAutoManageAttachment is true.
-	 * @see bAutoManageAttachment, EAttachmentRule
-	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Attachment, meta = (EditCondition = "bAutoManageAttachment"))
-	EAttachmentRule AutoAttachScaleRule;
-
 private:
 
+	uint64 AudioComponentID;
+
 	/** Saved relative transform before auto attachement. Used during detachment to restore the transform if we had automatically attached. */
 	FVector SavedAutoAttachRelativeLocation;
 	FRotator SavedAutoAttachRelativeRotation;
 	FVector SavedAutoAttachRelativeScale3D;
 
-	/** Did we auto attach during activation? Used to determine if we should restore the relative transform during detachment. */
-	uint8 bDidAutoAttach : 1;
-
 	/** Restore relative transform from auto attachment and optionally detach from parent (regardless of whether it was an auto attachment). */
 	void CancelAutoAttachment(bool bDetachFromParent);
 
@@ -512,14 +521,9 @@ private:
 	void UpdateSpriteTexture();
 #endif
 
-	/** A count of how many times we've started playing */
-	int32 ActiveCount;
-
 	static uint64 AudioComponentIDCounter;
 	static TMap<uint64, UAudioComponent*> AudioIDToComponentMap;
-
-	uint64 AudioComponentID;
-
+	static FCriticalSection AudioIDToComponentMapLock;
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/DecalComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/DecalComponent.h
index a06b4501f280..84aae4bf0ff1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/DecalComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/DecalComponent.h
@@ -153,8 +153,11 @@ public:
 	virtual void SendRenderTransform_Concurrent() override;
 	virtual const UObject* AdditionalStatObject() const override;
 	//~ End UActorComponent Interface
-
+	
+	//~ Begin UObject Interface. 
 	virtual void Serialize(FArchive& Ar) override;
+	virtual bool IsPostLoadThreadSafe() const override;
+	//~ End UObject Interface
 
 	//~ Begin USceneComponent Interface
 	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/HierarchicalInstancedStaticMeshComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/HierarchicalInstancedStaticMeshComponent.h
index 3b194f3062bd..036dfcaa9ae3 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/HierarchicalInstancedStaticMeshComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/HierarchicalInstancedStaticMeshComponent.h
@@ -88,10 +88,6 @@ class ENGINE_API UHierarchicalInstancedStaticMeshComponent : public UInstancedSt
 	UPROPERTY()
 	TArray<FBox> UnbuiltInstanceBoundsList;
 
-	// Instance Index of each individual unbuilt instance, used in unbuilt rendering during a wait for the build
-	UPROPERTY()
-	TArray<int32> UnbuiltInstanceIndexList;
-
 	// Enable for detail meshes that don't really affect the game. Disable for anything important.
 	// Typically, this will be enabled for small meshes without collision (e.g. grass) and disabled for large meshes with collision (e.g. trees)
 	UPROPERTY()
@@ -115,12 +111,16 @@ class ENGINE_API UHierarchicalInstancedStaticMeshComponent : public UInstancedSt
 
 	bool bIsAsyncBuilding;
 	bool bDiscardAsyncBuildResults;
-	bool bConcurrentRemoval;
+	bool bConcurrentChanges;
 	bool bAutoRebuildTreeOnInstanceChanges;
 
 	UPROPERTY()
 	bool bDisableCollision;
 
+	// Instances to render (including removed one until the build is complete)
+	UPROPERTY()
+	int32 InstanceCountToRender;
+
 	// Apply the results of the async build
 	void ApplyBuildTreeAsync(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent, TSharedRef<FClusterBuilder, ESPMode::ThreadSafe> Builder, double StartTime);
 
@@ -144,6 +144,7 @@ public:
 	virtual void ClearInstances() override;
 	virtual TArray<int32> GetInstancesOverlappingSphere(const FVector& Center, float Radius, bool bSphereInWorldSpace = true) const override;
 	virtual TArray<int32> GetInstancesOverlappingBox(const FBox& Box, bool bBoxInWorldSpace = true) const override;
+	virtual void PreAllocateInstancesMemory(int32 AddedInstanceCount) override;
 
 	/** Removes all the instances with indices specified in the InstancesToRemove array. Returns true on success. */
 	UFUNCTION(BlueprintCallable, Category = "Components|InstancedStaticMesh")
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/InstancedStaticMeshComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/InstancedStaticMeshComponent.h
index b5660e6d5372..ba65b611b742 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/InstancedStaticMeshComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/InstancedStaticMeshComponent.h
@@ -53,8 +53,8 @@ struct FInstanceUpdateCmdBuffer
 	
 	// Commands that can modify render data in place
 	void HideInstance(int32 RenderIndex);
-	void AddInstance(int32 RenderIndex, const FMatrix& InXForm);
-	void UpdateInstance(int32 RenderIndex, const FMatrix& InXForm);
+	void AddInstance(const FMatrix& InTransform);
+	void UpdateInstance(int32 RenderIndex, const FMatrix& InTransform);
 	void SetEditorData(int32 RenderIndex, const FColor& Color, bool bSelected);
 	void ResetInlineCommands();
 	int32 NumInlineCommands() const { return Cmds.Num(); }
@@ -152,6 +152,9 @@ class ENGINE_API UInstancedStaticMeshComponent : public UStaticMeshComponent
 	UFUNCTION(BlueprintCallable, Category = "Components|InstancedStaticMesh")
 	int32 AddInstanceWorldSpace(const FTransform& WorldTransform);
 
+	/** Preallocated memory to include the new added instances count, to prevent reallloc during the add operation. */
+	virtual void PreAllocateInstancesMemory(int32 AddedInstanceCount);
+
 	/** Get the transform for the instance specified. Instance is returned in local space of this component unless bWorldSpace is set.  Returns True on success. */
 	UFUNCTION(BlueprintCallable, Category = "Components|InstancedStaticMesh")
 	bool GetInstanceTransform(int32 InstanceIndex, FTransform& OutInstanceTransform, bool bWorldSpace = false) const;
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/PrimitiveComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/PrimitiveComponent.h
index 3f13aa22d4a2..42e2739e724a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/PrimitiveComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/PrimitiveComponent.h
@@ -965,7 +965,7 @@ public:
 	 * @param ElementIndex - The index of the skin to replace the material for.  If invalid, the material is unchanged and NULL is returned.
 	 */
 	UFUNCTION(BlueprintCallable, Category="Rendering|Material")
-	virtual class UMaterialInstanceDynamic* CreateDynamicMaterialInstance(int32 ElementIndex, class UMaterialInterface* SourceMaterial = NULL);
+	virtual class UMaterialInstanceDynamic* CreateDynamicMaterialInstance(int32 ElementIndex, class UMaterialInterface* SourceMaterial = NULL, FName OptionalName = NAME_None);
 
 	/** 
 	 * Try and retrieve the material applied to a particular collision face of mesh. Used with face index returned from collision trace. 
@@ -1816,6 +1816,7 @@ public:
 	virtual bool CanEditChange(const UProperty* InProperty) const override;
 	virtual void UpdateCollisionProfile();
 #endif // WITH_EDITOR
+	virtual void PostInitProperties() override;
 	virtual void PostLoad() override;
 	virtual void PostDuplicate(bool bDuplicateForPIE) override;
 	virtual void GetResourceSizeEx(FResourceSizeEx& CumulativeResourceSize) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/SceneComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/SceneComponent.h
index 4e004e4136be..135d256ce60b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/SceneComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/SceneComponent.h
@@ -915,6 +915,7 @@ public:
 	//~ Begin UObject Interface
 	virtual void PostInterpChange(UProperty* PropertyThatChanged) override;
 	virtual void BeginDestroy() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 #if WITH_EDITORONLY_DATA
 	virtual void Serialize(FArchive& Ar) override;
 	static void AddReferencedObjects(UObject* InThis, FReferenceCollector& Collector);
@@ -1557,7 +1558,7 @@ public:
 	void ForceOverlapUpdate();
 
 	/** Registers that this move is a teleport */
-	void SetHasTeleported();
+	void SetHasTeleported(ETeleportType InTeleportType);
 
 	//--------------------------------------------------------------------------------------------------------//
 
@@ -1584,11 +1585,9 @@ protected:
 
 	USceneComponent* Owner;
 	FScopedMovementUpdate* OuterDeferredScope;
-	uint32 bDeferUpdates:1;
-	uint32 bHasMoved:1;
-	uint32 bHasTeleported:1;
-	uint32 bRequireOverlapsEventFlag:1;
+
 	EOverlapState CurrentOverlapState;
+	ETeleportType TeleportType;
 
 	FTransform InitialTransform;
 	FVector InitialRelativeLocation;
@@ -1599,6 +1598,10 @@ protected:
 	TArray<FOverlapInfo> PendingOverlaps;	// All overlaps encountered during the scope of moves.
 	TBlockingHitArray BlockingHits;			// All blocking hits encountered during the scope of moves.
 
+	uint8 bDeferUpdates:1;
+	uint8 bHasMoved:1;
+	uint8 bRequireOverlapsEventFlag:1;
+
 	friend class USceneComponent;
 };
 
@@ -1665,9 +1668,10 @@ FORCEINLINE_DEBUGGABLE void FScopedMovementUpdate::ForceOverlapUpdate()
 	FinalOverlapCandidatesIndex = INDEX_NONE;
 }
 
-FORCEINLINE_DEBUGGABLE void FScopedMovementUpdate::SetHasTeleported()
+FORCEINLINE_DEBUGGABLE void FScopedMovementUpdate::SetHasTeleported(ETeleportType InTeleportType)
 {
-	bHasTeleported = true;
+	// Request an initialization. Teleport type can only go higher - i.e. if we have requested a reset, then a teleport will still reset fully
+	TeleportType = ((InTeleportType > TeleportType) ? InTeleportType : TeleportType); 
 }
 
 FORCEINLINE_DEBUGGABLE class FScopedMovementUpdate* USceneComponent::GetCurrentScopedMovement() const
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/SkeletalMeshComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/SkeletalMeshComponent.h
index 21db587a902c..f2d4dad8486d 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/SkeletalMeshComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/SkeletalMeshComponent.h
@@ -23,6 +23,7 @@
 #include "ClothingSystemRuntimeTypes.h"
 #include "ClothingSimulationInterface.h"
 #include "ClothingSimulationFactoryInterface.h"
+#include "PhysicsEngine/PhysicsAsset.h"
 
 #include "SkeletalMeshComponent.generated.h"
 
@@ -32,7 +33,6 @@ class FPhysScene;
 class FPrimitiveDrawInterface;
 class UAnimInstance;
 class UPhysicalMaterial;
-class UPhysicsAsset;
 class USkeletalMeshComponent;
 struct FConstraintInstance;
 struct FNavigableGeometryExport;
@@ -669,12 +669,19 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "Components|SkeletalMesh", meta = (Keywords = "AnimBlueprint"))
 	UAnimInstance* GetPostProcessInstance() const;
 
+	/** 
+	 * Returns whether there are any valid instances to run, currently this means whether we have
+	 * have an animation instance or a post process instance available to process.
+	 */
+	UFUNCTION(BlueprintCallable, Category = "Components|SkeletalMesh", meta = (Keywords = "AnimBlueprint"))
+	bool HasValidAnimationInstance() const;
+
 	/**
 	 * Informs any active anim instances (main instance, sub instances, post instance) that a dynamics reset is required
 	 * for example if a teleport occurs.
 	 */
 	UFUNCTION(BlueprintCallable, Category = "Components|SkeletalMesh", meta = (Keywords = "Dynamics,Physics", UnsafeDuringActorConstruction = "true"))
-	void ResetAnimInstanceDynamics();
+	void ResetAnimInstanceDynamics(ETeleportType InTeleportType = ETeleportType::ResetPhysics);
 
 	/** Below are the interface to control animation when animation mode, not blueprint mode **/
 	UFUNCTION(BlueprintCallable, Category = "Components|Animation", meta = (Keywords = "Animation"))
@@ -1084,6 +1091,37 @@ private:
 	UPROPERTY(Transient)
 	UClothingSimulationInteractor* ClothingInteractor;
 
+	/** Helper struct used to store info about a cloth collision source */
+	struct FClothCollisionSource
+	{
+		FClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset)
+			: SourceComponent(InSourceComponent)
+			, SourcePhysicsAsset(InSourcePhysicsAsset)
+			, bCached(false)
+		{}
+
+		/** Component that collision data will be copied from */
+		TWeakObjectPtr<USkeletalMeshComponent> SourceComponent;
+
+		/** Physics asset to use to generate collision against the source component */
+		TWeakObjectPtr<UPhysicsAsset> SourcePhysicsAsset;
+
+		/** Cached skeletal mesh used to invalidate the cache if the skeletal mesh has changed */
+		TWeakObjectPtr<USkeletalMesh> CachedSkeletalMesh;
+
+		/** Cached spheres from physics asset */
+		TArray<FClothCollisionPrim_Sphere> CachedSpheres;
+
+		/** Cached sphere connections from physics asset */
+		TArray<FClothCollisionPrim_SphereConnection> CachedSphereConnections;
+
+		/** Flag whether the cache is valid */
+		bool bCached;
+	};
+
+	/** Array of sources for cloth collision */
+	TArray<FClothCollisionSource> ClothCollisionSources;
+
 	/** Ref for the clothing parallel task, so we can detect whether or not a sim is running */
 	FGraphEventRef ParallelClothTask;
 
@@ -1408,6 +1446,7 @@ protected:
 public:
 	//~ Begin USkinnedMeshComponent Interface
 	virtual bool UpdateLODStatus() override;
+	virtual void UpdateVisualizeLODString(FString& DebugString) override;
 	virtual void RefreshBoneTransforms( FActorComponentTickFunction* TickFunction = NULL ) override;
 protected:
 	virtual void DispatchParallelTickPose( FActorComponentTickFunction* TickFunction ) override;
@@ -1496,6 +1535,9 @@ public:
 	/** Instantiates bodies given a physics asset. Typically you should call InitArticulated unless you are planning to do something special with the bodies. The Created bodies and constraints are owned by the calling code and must be freed when necessary.*/
 	void InstantiatePhysicsAsset(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, FPhysScene* PhysScene = nullptr, USkeletalMeshComponent* OwningComponent = nullptr, int32 UseRootBodyIndex = INDEX_NONE, physx::PxAggregate* UseAggregate = nullptr) const;
 
+	/** Instantiates bodies given a physics asset like InstantiatePhysicsAsset but instead of reading the current component state, this reads the ref-pose from the reference skeleton of the mesh. Useful if trying to create bodies to be used during any evaluation work */
+	void InstantiatePhysicsAssetRefPose(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, FPhysScene* PhysScene = nullptr, USkeletalMeshComponent* OwningComponent = nullptr, int32 UseRootBodyIndex = INDEX_NONE, physx::PxAggregate* UseAggregate = nullptr) const;
+
 	/** Turn off all physics and remove the instance. */
 	void TermArticulated();
 
@@ -1713,17 +1755,47 @@ public:
 
 #if WITH_CLOTH_COLLISION_DETECTION
 
+	/**
+	 * Add a collision source for the cloth on this component.
+	 * Each cloth tick, the collision defined by the physics asset, transformed by the bones in the source
+	 * component, will be applied to cloth.
+	 * @param	InSourceComponent		The component to extract collision transforms from
+	 * @param	InSourcePhysicsAsset	The physics asset that defines the collision primitives (that will be transformed by InSourceComponent's bones)
+	 */
+	void AddClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset);
+
+	/** Remove a cloth collision source defined by a component */
+	void RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent);
+
+	/** Remove a cloth collision source defined by both a component and a physics asset */
+	void RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset);
+
+protected:
+	/** copy cloth collision sources to this, where parent means components above it in the hierarchy */
+	void CopyClothCollisionSources();
+
 	void ProcessClothCollisionWithEnvironment();
+
 	/** copy parent's cloth collisions to attached children, where parent means this component */
 	void CopyClothCollisionsToChildren();
+
 	/** copy children's cloth collisions to parent, where parent means this component */
 	void CopyChildrenClothCollisionsToParent();
 
 	/** find if this component has collisions for clothing and return the results calculated by bone transforms */
 	void FindClothCollisions(FClothCollisionData& OutCollisions);
 
-#endif // WITH_CLOTH_COLLISION_DETECTION
+#else
 
+public:
+	/** Stub out these public functions if cloth collision is disabled */
+	void AddClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset) {}
+	void RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent) {}
+	void RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset) {}
+
+#endif
+
+public:
 	bool IsAnimBlueprintInstanced() const;
 
 protected:
@@ -1732,6 +1804,9 @@ protected:
 
 	bool ShouldBlendPhysicsBones() const;
 
+	/** Extract collisions for cloth from this component (given a component we want to apply the data to) */
+	static void ExtractCollisionsForCloth(USkeletalMeshComponent* SourceComponent,  UPhysicsAsset* PhysicsAsset, USkeletalMeshComponent* DestClothComponent, FClothCollisionData& OutCollisions, FClothCollisionSource& ClothCollisionSource);
+
 private:
 
 	FSkeletalMeshComponentEndPhysicsTickFunction EndPhysicsTickFunction;
@@ -1759,7 +1834,9 @@ private:
 	virtual void RefreshMorphTargets() override;
 
 	void GetWindForCloth_GameThread(FVector& WindVector, float& WindAdaption) const;
-	
+
+	void InstantiatePhysicsAsset_Internal(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, TFunctionRef<FTransform(int32)> BoneTransformGetter, FPhysScene* PhysScene = nullptr, USkeletalMeshComponent* OwningComponent = nullptr, int32 UseRootBodyIndex = INDEX_NONE, physx::PxAggregate* UseAggregate = nullptr) const;
+
 	// Reference to our current parallel animation evaluation task (if there is one)
 	FGraphEventRef				ParallelAnimationEvaluationTask;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/SkinnedMeshComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/SkinnedMeshComponent.h
index 3816dd414a4c..482cae7c246f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/SkinnedMeshComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/SkinnedMeshComponent.h
@@ -249,12 +249,19 @@ protected:
 	/** Incremented every time the master bone map changes. Used to keep in sync with any duplicate data needed by other threads */
 	int32 MasterBoneMapCacheCount;
 
+	/**
+	*	Mapping for socket overrides, key is the Source socket name and the value is the override socket name
+	*/
+	TMap<FName, FName> SocketOverrideLookup;
+
 public:
+#if WITH_EDITORONLY_DATA
 	/**
 	 * Wireframe color
 	 */
-	UPROPERTY(EditAnywhere, AdvancedDisplay, BlueprintReadOnly, Category=SkeletalMesh)
-	FColor WireframeColor;
+	UPROPERTY()
+	FColor WireframeColor_DEPRECATED;
+#endif
 
 protected:
 	/** Information for current ref pose override, if present */
@@ -806,6 +813,7 @@ public:
 	 * @return true if LOD has been changed. false otherwise.
 	 */
 	virtual bool UpdateLODStatus();
+	virtual void UpdateVisualizeLODString(FString& DebugString) {}
 
 	/**
 	 * Finalize bone transform of this current tick
@@ -950,6 +958,9 @@ public:
 	 */
 	class USkeletalMeshSocket const* GetSocketByName( FName InSocketName ) const;
 
+	void AddSocketOverride(FName SourceSocketName, FName OverrideSocketName, bool bWarnHasOverrided = true);
+	void RemoveSocketOverrides(FName SourceSocketName);
+	void RemoveAllSocketOverrides();
 
 	/** 
 	 * Get Bone Matrix from index
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/StaticMeshComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/StaticMeshComponent.h
index d898d11dfbf7..6874aa1f7749 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/StaticMeshComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/StaticMeshComponent.h
@@ -91,6 +91,11 @@ struct FStaticMeshComponentLODInfo
 	/** Uniquely identifies this LOD's built map data. */
 	FGuid MapBuildDataId;
 
+#if WITH_EDITOR
+	/** Check to see if MapBuildDataId was loaded - otherwise we need to display a warning on cook */
+	bool bMapBuildDataIdLoaded;
+#endif
+
 	/** Used during deserialization to temporarily store legacy lightmap data. */
 	FMeshMapBuildData* LegacyMapBuildData;
 
@@ -405,6 +410,7 @@ public:
 #endif // WITH_EDITOR
 	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual bool AreNativePropertiesIdenticalTo( UObject* Other ) const override;
 	virtual FString GetDetailedInfoInternal() const override;
 	static void AddReferencedObjects(UObject* InThis, FReferenceCollector& Collector);
diff --git a/Engine/Source/Runtime/Engine/Classes/Components/TimelineComponent.h b/Engine/Source/Runtime/Engine/Classes/Components/TimelineComponent.h
index 001d7d818ed8..49a75f4952c6 100644
--- a/Engine/Source/Runtime/Engine/Classes/Components/TimelineComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Components/TimelineComponent.h
@@ -504,6 +504,10 @@ public:
 	virtual bool IsReadyForOwnerToAutoDestroy() const override;
 	//~ End ActorComponent Interface.
 
+	//~ Begin UObject Interface. 
+	virtual bool IsPostLoadThreadSafe() const override;
+	//~ End UObject Interface
+
 	/** Get the signature function for Timeline event functions */
 	ENGINE_API static UFunction* GetTimelineEventSignature();
 	/** Get the signature function for Timeline float functions */
diff --git a/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColor.h b/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColor.h
index 230bd7715217..6c48e9b67a31 100644
--- a/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColor.h
+++ b/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColor.h
@@ -8,6 +8,9 @@
 #include "Curves/CurveBase.h"
 #include "CurveLinearColor.generated.h"
 
+class UCurveLinearColor;
+// Delegate called right before rendering each slot. This allows the gradient to be modified dynamically per slot.
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnUpdateGradient, UCurveLinearColor* /*GradientAtlas*/);
 
 USTRUCT()
 struct ENGINE_API FRuntimeCurveLinearColor
@@ -23,7 +26,7 @@ public:
 	FLinearColor GetLinearColorValue(float InTime) const;
 };
 
-UCLASS(BlueprintType)
+UCLASS(BlueprintType, collapsecategories, hidecategories = (FilePath))
 class ENGINE_API UCurveLinearColor : public UCurveBase
 {
 	GENERATED_UCLASS_BODY()
@@ -40,6 +43,8 @@ class ENGINE_API UCurveLinearColor : public UCurveBase
 	UFUNCTION(BlueprintCallable, Category="Math|Curves")
 	virtual FLinearColor GetLinearColorValue(float InTime) const override;
 
+	FLinearColor GetUnadjustedLinearColorValue(float InTime) const;
+
 	bool HasAnyAlphaKeys() const override { return FloatCurves[3].GetNumKeys() > 0; }
 
 	virtual bool IsValidCurve( FRichCurveEditInfo CurveInfo ) override;
@@ -47,5 +52,45 @@ class ENGINE_API UCurveLinearColor : public UCurveBase
 
 	/** Determine if Curve is the same */
 	bool operator == (const UCurveLinearColor& Curve) const;
+
+public:
+#if WITH_EDITOR
+
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
+
+	void DrawThumbnail(class FCanvas* Canvas, FVector2D StartXY, FVector2D SizeXY);
+
+	void PushToSourceData(TArray<FColor> &SrcData, int32 StartXY, FVector2D SizeXY);
+
+	virtual void OnCurveChanged(const TArray<FRichCurveEditInfo>& ChangedCurveEditInfos) override;
+#endif
+public:
+	// Properties for adjusting the color of the gradient
+	UPROPERTY(EditAnywhere, Category="Color", meta = (ClampMin = "0.0", ClampMax = "359.0"))
+	float AdjustHue;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustSaturation;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustBrightness;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustBrightnessCurve;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustVibrance;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustMinAlpha;
+
+	UPROPERTY(EditAnywhere, Category = "Color", meta = (ClampMin = "0.0", ClampMax = "1.0"))
+	float AdjustMaxAlpha;
+
+#if WITH_EDITORONLY_DATA
+	FOnUpdateGradient OnUpdateGradient;
+#endif
+protected:
+	void WritePixel(uint8* Pixel, const FLinearColor& Color);
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColorAtlas.h b/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColorAtlas.h
new file mode 100644
index 000000000000..2cefc903ea7d
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Classes/Curves/CurveLinearColorAtlas.h
@@ -0,0 +1,76 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Object.h"
+#include "Engine/EngineTypes.h"
+#include "Engine/Texture.h"
+#include "Engine/World.h"
+#include "Engine/Texture2D.h"
+#include "CurveLinearColorAtlas.generated.h"
+
+
+static FName NAME_GradientTexture = FName(TEXT("GradientTexture"));
+static FName NAME_GradientBias = FName(TEXT("GradientBias"));
+static FName NAME_GradientScale = FName(TEXT("GradientScale"));
+static FName NAME_GradientCount = FName(TEXT("GradientCount"));
+
+class UCurveLinearColor;
+
+
+
+/**
+*  Manages gradient LUT textures for registered actors and assigns them to the corresponding materials on the actor
+*/
+UCLASS()
+class ENGINE_API UCurveLinearColorAtlas : public UTexture2D
+{
+	GENERATED_UCLASS_BODY()
+
+#if WITH_EDITOR
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
+
+	virtual void PostLoad() override;
+	// How many slots are available per texture
+	FORCEINLINE uint32 MaxSlotsPerTexture()
+	{
+		return TextureSize / GradientPixelSize;
+	}
+
+	// Immediately render a new material to the specified slot index(SlotIndex must be within this section's range)
+	void UpdateGradientSlot(UCurveLinearColor* Gradient);
+
+	// Re-render all texture groups
+	void UpdateTextures();
+#endif
+
+	UFUNCTION(BlueprintCallable, Category = "Math|Curves")
+	bool GetCurveIndex(UCurveLinearColor* InCurve, int32& Index);
+
+	UFUNCTION(BlueprintCallable, Category = "Math|Curves")
+	bool GetCurvePosition(UCurveLinearColor* InCurve, float& Position);
+
+#if WITH_EDITORONLY_DATA
+	UPROPERTY()
+	uint32 bIsDirty : 1;
+
+	uint32	bHasAnyDirtyTextures : 1;
+	uint32	bShowDebugColorsForNullGradients : 1;	// Renders alternate blue/yellow lines for empty gradients. Good for debugging, but turns off optimization for selective updates to gradients.
+
+	TArray<FColor> SrcData;
+#endif
+	UPROPERTY(EditAnywhere, Category = "Curves")
+	uint32	TextureSize;						// Size of the lookup textures
+
+	UPROPERTY(VisibleAnywhere, Category = "Curves")
+	uint32	GradientPixelSize;					// How many pixels tall is any gradient slot
+
+	UPROPERTY(EditAnywhere, Category = "Curves")
+	TArray<UCurveLinearColor*> GradientCurves;
+
+protected:
+#if WITH_EDITORONLY_DATA
+	FVector2D SizeXY;
+#endif
+};
diff --git a/Engine/Source/Runtime/Engine/Classes/Distributions/Distribution.h b/Engine/Source/Runtime/Engine/Classes/Distributions/Distribution.h
index dfd575c7445d..d7599b90f7f2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Distributions/Distribution.h
+++ b/Engine/Source/Runtime/Engine/Classes/Distributions/Distribution.h
@@ -69,5 +69,8 @@ class UDistribution : public UObject, public FCurveEdInterface
 	/** Default value for initializing and checking correct values on UDistributions. */
 	static const float DefaultValue;
 
+	//~ Begin UObject Interface. 
+	virtual bool IsPostLoadThreadSafe() const override;
+	//~ End UObject Interface
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/EditorFramework/AssetImportData.h b/Engine/Source/Runtime/Engine/Classes/EditorFramework/AssetImportData.h
index 7757c0aa3a73..6b8efa1cb3a6 100644
--- a/Engine/Source/Runtime/Engine/Classes/EditorFramework/AssetImportData.h
+++ b/Engine/Source/Runtime/Engine/Classes/EditorFramework/AssetImportData.h
@@ -123,6 +123,9 @@ public:
 	/** Resolve a filename that is relative to either the specified package, BaseDir() or absolute */
 	static FString ResolveImportFilename(const FString& InRelativePath, const UPackage* Outermost);
 
+	/** Convert an absolute import path so that it's relative to either this object's package, BaseDir() or leave it absolute */
+	static FString SanitizeImportFilename(const FString& InPath, const UPackage* Outermost);
+
 	virtual void PostLoad() override;
 
 protected:
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/ActorChannel.h b/Engine/Source/Runtime/Engine/Classes/Engine/ActorChannel.h
index bf464d4f57a8..20177cbdf7ce 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/ActorChannel.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/ActorChannel.h
@@ -183,7 +183,7 @@ public:
 	bool ReadFieldHeaderAndPayload( UObject* Object, const FClassNetCache* ClassCache, FNetFieldExportGroup* NetFieldExportGroup, FNetBitReader& Bunch, const FFieldNetCache** OutField, FNetBitReader& OutPayload ) const;
 
 	/** Finds the net field export group for a class net cache, if not found, creates one */
-	FNetFieldExportGroup* GetNetFieldExportGroupForClassNetCache( const UClass* ObjectClass );
+	FNetFieldExportGroup* GetNetFieldExportGroupForClassNetCache( UClass* ObjectClass );
 		
 	/** Finds (or creates) the net field export group for a class net cache, if not found, creates one */
 	FNetFieldExportGroup* GetOrCreateNetFieldExportGroupForClassNetCache( const UObject* Object );
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/AssetManager.h b/Engine/Source/Runtime/Engine/Classes/Engine/AssetManager.h
index 11cd30c2c5f1..c27e88c5da4f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/AssetManager.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/AssetManager.h
@@ -388,6 +388,9 @@ public:
 	/** Gets package names to add to the cook, and packages to never cook even if in startup set memory or referenced */
 	virtual void ModifyCook(TArray<FName>& PackagesToCook, TArray<FName>& PackagesToNeverCook);
 
+	/** Returns whether or not a specific UPackage should be cooked for the provied TargetPlatform */
+	virtual bool ShouldCookForPlatform(const UPackage* Package, const ITargetPlatform* TargetPlatform);
+
 	/** Returns cook rule for a package name using Management rules, games should override this to take into account their individual workflows */
 	virtual EPrimaryAssetCookRule GetPackageCookRule(FName PackageName) const;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Attenuation.h b/Engine/Source/Runtime/Engine/Classes/Engine/Attenuation.h
index a50352daa038..30c9fd18b5b3 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Attenuation.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Attenuation.h
@@ -49,10 +49,6 @@ struct ENGINE_API FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= AttenuationDistance, meta = (DisplayName = "Attenuation Function"))
 	EAttenuationDistanceModel DistanceAlgorithm;
 
-	/* The custom volume attenuation curve to use. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= AttenuationDistance)
-	FRuntimeFloatCurve CustomAttenuationCurve;
-
 	/* The shape of the non-custom attenuation method. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= AttenuationDistance)
 	TEnumAsByte<enum EAttenuationShape::Type> AttenuationShape;
@@ -78,6 +74,10 @@ struct ENGINE_API FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= AttenuationDistance, meta=(ClampMin = "0"))
 	float FalloffDistance;
 
+	/* The custom volume attenuation curve to use. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= AttenuationDistance)
+	FRuntimeFloatCurve CustomAttenuationCurve;
+
 	FBaseAttenuationSettings()
 		: DistanceAlgorithm(EAttenuationDistanceModel::Linear)
 		, AttenuationShape(EAttenuationShape::Sphere)
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Blueprint.h b/Engine/Source/Runtime/Engine/Classes/Engine/Blueprint.h
index 66035a11350b..ae11862c6bc5 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Blueprint.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Blueprint.h
@@ -255,6 +255,7 @@ struct FBPVariableDescription
 
 	FBPVariableDescription()
 		: PropertyFlags(CPF_Edit)
+		, ReplicationCondition(ELifetimeCondition::COND_None)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Channel.h b/Engine/Source/Runtime/Engine/Classes/Engine/Channel.h
index 12026fa2146a..4ff5d70fcbf5 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Channel.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Channel.h
@@ -58,6 +58,7 @@ class ENGINE_API UChannel
 	uint32				bTornOff:1;			// Actor associated with this channel was torn off
 	uint32				bPendingDormancy:1;	// Channel wants to go dormant (it will check during tick if it can go dormant)
 	uint32				bPausedUntilReliableACK:1; // Unreliable property replication is paused until all reliables are ack'd.
+	uint32				SentClosingBunch:1;	// Set when sending closing bunch to avoid recursion in send-failure-close case.
 	int32				ChIndex;			// Index of this channel.
 	int32				OpenedLocally;		// Whether channel was opened locally or by remote.
 	FPacketIdRange		OpenPacketId;		// If OpenedLocally is true, this is the packet we sent the bOpen bunch on. Otherwise, it's the packet we received the bOpen bunch on.
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/CollisionProfile.h b/Engine/Source/Runtime/Engine/Classes/Engine/CollisionProfile.h
index 2a7b7632eb29..060bdd6dd61f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/CollisionProfile.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/CollisionProfile.h
@@ -112,7 +112,8 @@ struct FCustomChannelSetup
 	bool bStaticObject;	
 
 	FCustomChannelSetup()
-		: DefaultResponse(ECR_Block)
+		: Channel(ECC_WorldStatic)
+		, DefaultResponse(ECR_Block)
 		, bTraceType(false)
 		, bStaticObject(false)
 	{ }
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Console.h b/Engine/Source/Runtime/Engine/Classes/Engine/Console.h
index 33df861cffe4..ae7298cd1691 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Console.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Console.h
@@ -241,7 +241,7 @@ class ENGINE_API UConsole
 	virtual bool InputChar(int32 ControllerId, const FString& Unicode);
 	virtual bool InputKey(int32 ControllerId, FKey Key, EInputEvent Event, float AmountDepressed=1.f, bool bGamepad=false);
 	virtual bool InputAxis(int32 ControllerId, FKey Key, float Delta, float DeltaTime, int32 NumSamples=1, bool bGamepad=false) { return false; };
-	virtual bool InputTouch(int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { return false; }
+	virtual bool InputTouch(int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { return false; }
 
 	/** render to the canvas based on the console state */
 	virtual void PostRender_Console(class UCanvas* Canvas);
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/DataTable.h b/Engine/Source/Runtime/Engine/Classes/Engine/DataTable.h
index 4589f5c8f02d..e6d09c8949e2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/DataTable.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/DataTable.h
@@ -109,15 +109,15 @@ public:
 
 	/** Get all of the rows in the table, regardless of name */
 	template <class T>
-	void GetAllRows(const FString& ContextString, OUT TArray<T*>& OutRowArray) const
+	void GetAllRows(const TCHAR* ContextString, OUT TArray<T*>& OutRowArray) const
 	{
 		if (RowStruct == nullptr)
 		{
-			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : DataTable '%s' has no RowStruct specified (%s)."), *GetPathName(), *ContextString);
+			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : DataTable '%s' has no RowStruct specified (%s)."), *GetPathName(), ContextString);
 		}
 		else if (!RowStruct->IsChildOf(T::StaticStruct()))
 		{
-			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : Incorrect type specified for DataTable '%s' (%s)."), *GetPathName(), *ContextString);
+			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : Incorrect type specified for DataTable '%s' (%s)."), *GetPathName(), ContextString);
 		}
 		else
 		{
@@ -128,25 +128,31 @@ public:
 		}	
 	}
 
+	template <class T>
+	void GetAllRows(const FString& ContextString, OUT TArray<T*>& OutRowArray) const
+	{
+		GetAllRows<T>(*ContextString, OutRowArray);
+	}
+
 	/** Function to find the row of a table given its name. */
 	template <class T>
-	T* FindRow(FName RowName, const FString& ContextString, bool bWarnIfRowMissing = true) const
+	T* FindRow(FName RowName, const TCHAR* ContextString, bool bWarnIfRowMissing = true) const
 	{
 		if(RowStruct == nullptr)
 		{
-			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : '%s' specified no row for DataTable '%s'."), *ContextString, *GetPathName());
+			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : '%s' specified no row for DataTable '%s'."), ContextString, *GetPathName());
 			return nullptr;
 		}
 
 		if(!RowStruct->IsChildOf(T::StaticStruct()))
 		{
-			UE_CLOG(bWarnIfRowMissing, LogDataTable, Error, TEXT("UDataTable::FindRow : '%s' specified incorrect type for DataTable '%s'."), *ContextString, *GetPathName());
+			UE_CLOG(bWarnIfRowMissing, LogDataTable, Error, TEXT("UDataTable::FindRow : '%s' specified incorrect type for DataTable '%s'."), ContextString, *GetPathName());
 			return nullptr;
 		}
 
 		if(RowName == NAME_None)
 		{
-			UE_CLOG(bWarnIfRowMissing, LogDataTable, Warning, TEXT("UDataTable::FindRow : '%s' requested invalid row 'None' from DataTable '%s'."), *ContextString, *GetPathName());
+			UE_CLOG(bWarnIfRowMissing, LogDataTable, Warning, TEXT("UDataTable::FindRow : '%s' requested invalid row 'None' from DataTable '%s'."), ContextString, *GetPathName());
 			return nullptr;
 		}
 
@@ -155,7 +161,7 @@ public:
 		{
 			if (bWarnIfRowMissing)
 			{
-				UE_LOG(LogDataTable, Warning, TEXT("UDataTable::FindRow : '%s' requested row '%s' not in DataTable '%s'."), *ContextString, *RowName.ToString(), *GetPathName());
+				UE_LOG(LogDataTable, Warning, TEXT("UDataTable::FindRow : '%s' requested row '%s' not in DataTable '%s'."), ContextString, *RowName.ToString(), *GetPathName());
 			}
 			return nullptr;
 		}
@@ -166,17 +172,23 @@ public:
 		return reinterpret_cast<T*>(RowData);
 	}
 
+	template <class T>
+	T* FindRow(FName RowName, const FString& ContextString, bool bWarnIfRowMissing = true) const
+	{
+		return FindRow<T>(RowName, *ContextString, bWarnIfRowMissing);
+	}
+
 	/** Perform some operation for every row. */
 	template <class T>
-	void ForeachRow(const FString& ContextString, TFunctionRef<void (const FName& Key, const T& Value)> Predicate) const
+	void ForeachRow(const TCHAR* ContextString, TFunctionRef<void (const FName& Key, const T& Value)> Predicate) const
 	{
 		if (RowStruct == nullptr)
 		{
-			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : DataTable '%s' has no RowStruct specified (%s)."), *GetPathName(), *ContextString);
+			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : DataTable '%s' has no RowStruct specified (%s)."), *GetPathName(), ContextString);
 		}
 		else if (!RowStruct->IsChildOf(T::StaticStruct()))
 		{
-			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : Incorrect type specified for DataTable '%s' (%s)."), *GetPathName(), *ContextString);
+			UE_LOG(LogDataTable, Error, TEXT("UDataTable::FindRow : Incorrect type specified for DataTable '%s' (%s)."), *GetPathName(), ContextString);
 		}
 		else
 		{
@@ -188,6 +200,12 @@ public:
 		}
 	}
 
+	template <class T>
+	void ForeachRow(const FString& ContextString, TFunctionRef<void (const FName& Key, const T& Value)> Predicate) const
+	{
+		ForeachRow<T>(*ContextString, Predicate);
+	}
+
 	/** Returns the column property where PropertyName matches the name of the column property. Returns nullptr if no match is found or the match is not a supported table property */
 	ENGINE_API UProperty* FindTableProperty(const FName& PropertyName) const;
 
@@ -332,13 +350,13 @@ struct ENGINE_API FDataTableRowHandle
 
 	/** Get the row straight from the row handle */
 	template <class T>
-	T* GetRow(const FString& ContextString) const
+	T* GetRow(const TCHAR* ContextString) const
 	{
 		if(DataTable == nullptr)
 		{
 			if (RowName != NAME_None)
 			{
-				UE_LOG(LogDataTable, Warning, TEXT("FDataTableRowHandle::FindRow : No DataTable for row %s (%s)."), *RowName.ToString(), *ContextString);
+				UE_LOG(LogDataTable, Warning, TEXT("FDataTableRowHandle::FindRow : No DataTable for row %s (%s)."), *RowName.ToString(), ContextString);
 			}
 			return nullptr;
 		}
@@ -346,6 +364,12 @@ struct ENGINE_API FDataTableRowHandle
 		return DataTable->FindRow<T>(RowName, ContextString);
 	}
 
+	template <class T>
+	T* GetRow(const FString& ContextString) const
+	{
+		return GetRow<T>(*ContextString);
+	}
+
 	FString ToDebugString(bool bUseFullPath = false) const
 	{
 		if (DataTable == nullptr)
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetConnection.h b/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetConnection.h
index b25e93dfae63..d754c2a8f328 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetConnection.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetConnection.h
@@ -57,8 +57,6 @@ public:
 	virtual bool ClientHasInitializedLevelFor( const AActor* TestActor ) const override;
 	virtual TSharedPtr<FObjectReplicator> CreateReplicatorForNewActorChannel(UObject* Object);
 
-	virtual void FlushDormancy( class AActor* Actor ) override;
-
 public:
 
 	/** @return The DemoRecording driver object */
@@ -76,6 +74,11 @@ public:
 	TArray<FQueuedDemoPacket> QueuedDemoPackets;
 	TArray<FQueuedDemoPacket> QueuedCheckpointPackets;
 
+protected:
+	virtual void DestroyIgnoredActor(AActor* Actor) override;
+
+	void QueueInitialDormantStartupActorForRewind(AActor* Actor);
+
 private:
 	void TrackSendForProfiler(const void* Data, int32 NumBytes);
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetDriver.h b/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetDriver.h
index 69def1b91632..2166c00ac61a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetDriver.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/DemoNetDriver.h
@@ -31,7 +31,12 @@ DECLARE_DELEGATE_OneParam(FOnGotoTimeDelegate, const bool /* bWasSuccessful */);
 
 DECLARE_MULTICAST_DELEGATE(FOnDemoFinishPlaybackDelegate);
 
-class FQueuedReplayTask
+class UDemoNetDriver;
+class UDemoNetConnection;
+
+DECLARE_MULTICAST_DELEGATE(FOnDemoFinishRecordingDelegate);
+
+class FQueuedReplayTask : public TSharedFromThis<FQueuedReplayTask>
 {
 public:
 	FQueuedReplayTask( UDemoNetDriver* InDriver ) : Driver( InDriver )
@@ -46,7 +51,7 @@ public:
 	virtual bool	Tick() = 0;
 	virtual FName	GetName() const = 0;
 
-	UDemoNetDriver* Driver;
+	TWeakObjectPtr<UDemoNetDriver> Driver;
 };
 
 class FReplayExternalData
@@ -87,6 +92,7 @@ enum ENetworkVersionHistory
 	HISTORY_DELETED_STARTUP_ACTORS			= 8,			// Save DeletedNetStartupActors inside checkpoints
 	HISTORY_HEADER_FLAGS					= 9,			// Save out enum flags with demo header
 	HISTORY_LEVEL_STREAMING_FIXES			= 10,			// Optional level streaming fixes.
+	HISTORY_SAVE_FULL_ENGINE_VERSION		= 11,			// Now saving the entire FEngineVersion including branch name
 	
 	// -----<new versions can be added before this line>-------------------------------------------------
 	HISTORY_PLUS_ONE,
@@ -146,7 +152,11 @@ struct FNetworkDemoHeader
 	uint32	NetworkChecksum;						// Network checksum
 	uint32	EngineNetworkProtocolVersion;			// Version of the engine internal network format
 	uint32	GameNetworkProtocolVersion;				// Version of the game internal network format
+
+	DEPRECATED(4.20, "Changelist is deprecated, use EngineVersion.GetChangelist() instead.")
 	uint32	Changelist;								// Engine changelist built from
+
+	FEngineVersion EngineVersion;					// Full engine version on which the replay was recorded
 	EReplayHeaderFlags HeaderFlags;					// Replay flags
 	TArray<FLevelNameAndTime> LevelNamesAndTimes;	// Name and time changes of levels loaded for demo
 	TArray<FString> GameSpecificData;				// Area for subclasses to write stuff
@@ -157,11 +167,22 @@ struct FNetworkDemoHeader
 		NetworkChecksum( FNetworkVersion::GetLocalNetworkVersion() ),
 		EngineNetworkProtocolVersion( FNetworkVersion::GetEngineNetworkProtocolVersion() ),
 		GameNetworkProtocolVersion( FNetworkVersion::GetGameNetworkProtocolVersion() ),
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
 		Changelist( FEngineVersion::Current().GetChangelist() ),
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+		EngineVersion( FEngineVersion::Current() ),
 		HeaderFlags( EReplayHeaderFlags::None )
 	{
 	}
 
+	PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	FNetworkDemoHeader(const FNetworkDemoHeader& Other) = default;
+	FNetworkDemoHeader(FNetworkDemoHeader&& Other) = default;
+	FNetworkDemoHeader& operator=(const FNetworkDemoHeader& Other) = default;
+	FNetworkDemoHeader& operator=(FNetworkDemoHeader&& Other) = default;
+	~FNetworkDemoHeader() = default;
+	PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
 	friend FArchive& operator << ( FArchive& Ar, FNetworkDemoHeader& Header )
 	{
 		Ar << Header.Magic;
@@ -187,7 +208,24 @@ struct FNetworkDemoHeader
 		Ar << Header.NetworkChecksum;
 		Ar << Header.EngineNetworkProtocolVersion;
 		Ar << Header.GameNetworkProtocolVersion;
-		Ar << Header.Changelist;
+
+		if (Header.Version >= HISTORY_SAVE_FULL_ENGINE_VERSION)
+		{
+			Ar << Header.EngineVersion;
+		}
+		else
+		{
+			// Previous versions only stored the changelist
+			PRAGMA_DISABLE_DEPRECATION_WARNINGS
+			Ar << Header.Changelist;
+			
+			if (Ar.IsLoading())
+			{
+				// We don't have any valid information except the changelist.
+				Header.EngineVersion.Set(0, 0, 0, Header.Changelist, FString());
+			}
+			PRAGMA_ENABLE_DEPRECATION_WARNINGS
+		}
 
 		if (Header.Version < HISTORY_MULTIPLE_LEVELS)
 		{
@@ -236,6 +274,8 @@ struct FRollbackNetStartupActorInfo
 	ULevel*		Level;
 
 	TSharedPtr<FRepState> RepState;
+	TMap<FString, TSharedPtr<FRepState>> SubObjRepState;
+
 	UPROPERTY()
 	TArray<UObject*> ObjReferences;
 };
@@ -314,7 +354,7 @@ class ENGINE_API UDemoNetDriver : public UNetDriver
 	int32				TotalCheckpointSaveFrames;			// Total number of frames used to save a checkpoint
 	double				LastCheckpointTime;					// Last time a checkpoint was saved
 
-	void		RespawnNecessaryNetStartupActors();
+	void		RespawnNecessaryNetStartupActors(TArray<AActor*>& SpawnedActors, ULevel* Level = nullptr);
 
 	virtual bool ShouldSaveCheckpoint();
 
@@ -334,6 +374,9 @@ class ENGINE_API UDemoNetDriver : public UNetDriver
 	/** Delegate for external systems to be notified when demo playback ends */
 	FOnDemoFinishPlaybackDelegate OnDemoFinishPlaybackDelegate;
 
+	/** Public Delegate for external systems to be notified when replay recording is about to finish. */
+	FOnDemoFinishRecordingDelegate OnDemoFinishRecordingDelegate;
+
 	bool		IsLoadingCheckpoint() const { return bIsLoadingCheckpoint; }
 	
 	bool		IsPlayingClientReplay() const;
@@ -420,6 +463,9 @@ private:
 	/** Returns either CheckpointSaveMaxMSPerFrame or the value of demo.CheckpointSaveMaxMSPerFrameOverride if it's >= 0. */
 	float GetCheckpointSaveMaxMSPerFrame() const;
 
+	/** Returns the last checkpoint time in integer milliseconds. */
+	uint32 GetLastCheckpointTimeInMS() const { return (uint32)( (double)LastCheckpointTime * 1000 ); }
+
 	/** Adds a new level to the level list */
 	void AddNewLevel(const FString& NewLevelName);
 
@@ -446,6 +492,8 @@ public:
 	virtual FNetworkGUID GetGUIDForActor(const AActor* InActor) const override;
 	virtual AActor* GetActorForGUID(FNetworkGUID InGUID) const override;
 	virtual bool ShouldReceiveRepNotifiesForObject(UObject* Object) const override;
+	virtual void ForceNetUpdate(AActor* Actor) override;
+	virtual bool IsServer() const override;
 
 	/** Called when we are already recording but have traveled to a new map to start recording again */
 	bool ContinueListen(FURL& ListenURL);
@@ -461,7 +509,7 @@ public:
 	bool IsRecording() const;
 	bool IsPlaying() const;
 
-	FString GetDemoURL() { return DemoURL.ToString(); }
+	FString GetDemoURL() const { return DemoURL.ToString(); }
 
 	/** Sets the desired maximum recording time in milliseconds. */
 	void SetMaxDesiredRecordTimeMS(const float InMaxDesiredRecordTimeMS) { MaxDesiredRecordTimeMS = InMaxDesiredRecordTimeMS; }
@@ -523,17 +571,37 @@ public:
 		return Result;
 	}
 
-	void WriteDemoFrameFromQueuedDemoPackets( FArchive& Ar, TArray<FQueuedDemoPacket>& QueuedPackets );
+	void WriteDemoFrameFromQueuedDemoPackets( FArchive& Ar, TArray<FQueuedDemoPacket>& QueuedPackets, float FrameTime );
 	void WritePacket( FArchive& Ar, uint8* Data, int32 Count );
 
 	void TickDemoPlayback( float DeltaSeconds );
-	void FinalizeFastForward( const float StartTime );
+	
+	DEPRECATED(4.20, "Please use the FinalizeFastForward that takes a double.")
+	void FinalizeFastForward( const float StartTime ) { FinalizeFastForward(static_cast<double>(StartTime)); }
+	void FinalizeFastForward( const double StartTime );
+	
 	void SpawnDemoRecSpectator( UNetConnection* Connection, const FURL& ListenURL );
 	void ResetDemoState();
 	void JumpToEndOfLiveReplay();
 	void AddEvent(const FString& Group, const FString& Meta, const TArray<uint8>& Data);
-	void EnumerateEvents(const FString& Group, FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate);
-	void RequestEventData(const FString& EventID, FOnRequestEventDataComplete& RequestEventDataCompleteDelegate);
+	void AddOrUpdateEvent(const FString& EventName, const FString& Group, const FString& Meta, const TArray<uint8>& Data);
+
+	DEPRECATED(4.20, "Please use a version of EnumerateEvents that accepts a FEnumerateEventsCallback delegate.")
+	void EnumerateEvents(const FString& Group, FEnumerateEventsCompleteDelegate& Delegate) { EnumerateEvents(Group, UpgradeEnumerateEventsDelegate(Delegate)); }
+	void EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate);
+
+	// In most cases, this is desirable over EnumerateEvents because it will explicitly use ActiveReplayName
+	// instead of letting the streamer decide.
+	void EnumerateEventsForActiveReplay(const FString& Group, const FEnumerateEventsCallback& Delegate);
+
+	DEPRECATED(4.20, "Please use a version of RequestEventData that accepts a FRequestEventDataCallback delegate.")
+	void RequestEventData(const FString& EventID, FOnRequestEventDataComplete& Delegate) { RequestEventData(EventID, UpgradeRequestEventDelegate(Delegate)); }
+	void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate);
+
+	// In most cases, this is desirable over EnumerateEvents because it will explicitly use ActiveReplayName
+	// instead of letting the streamer decide.
+	void RequestEventDataForActiveReplay(const FString& EventID, const FRequestEventDataCallback& Delegate);
+
 	bool IsFastForwarding() const { return bIsFastForwarding; }
 
 	FReplayExternalDataArray* GetExternalDataArrayForObject( UObject* Object );
@@ -550,7 +618,19 @@ public:
 
 	void StopDemo();
 
-	void ReplayStreamingReady( bool bSuccess, bool bRecord );
+	DEPRECATED(4.20, "Please use the version of ReplayStreamingReady that accepts a FStartStreamingResult.")
+	void ReplayStreamingReady(bool bSuccess, bool bRecord)
+	{
+		FStartStreamingResult Result;
+		if (bSuccess)
+		{
+			Result.Result = EStreamingOperationResult::Success;
+		}
+
+		Result.bRecording = bRecord;
+		ReplayStreamingReady(Result);
+	}
+	void ReplayStreamingReady(const FStartStreamingResult& Result);
 
 	void AddReplayTask( FQueuedReplayTask* NewTask );
 	bool IsAnyTaskPending() const;
@@ -574,6 +654,7 @@ public:
 	
 	virtual void NotifyActorDestroyed( AActor* ThisActor, bool IsSeamlessTravel=false ) override;
 	virtual void NotifyActorLevelUnloaded( AActor* Actor ) override;
+	virtual void NotifyStreamingLevelUnload( ULevel* InLevel ) override;
 
 	/** Call this function during playback to track net startup actors that need a hard reset when scrubbing, which is done by destroying and then re-spawning */
 	virtual void QueueNetStartupActorForRollbackViaDeletion( AActor* Actor );
@@ -583,8 +664,10 @@ public:
 	/** @return the unique identifier for the lifetime of this object. */
 	const FString& GetDemoSessionID() const { return DemoSessionID; }
 
-	/** Called when the downloading header request from the replay streamer completes. */
-	void OnDownloadHeaderComplete(const bool bWasSuccessful, int32 LevelIndex);
+	DEPRECATED(4.20, "OnDownloadHeaderComplete will be made private. Please remove any calls to it.")
+	void OnDownloadHeaderComplete(const FDownloadHeaderResult& Result, int32 LevelIndex)
+	{
+	}
 
 	/** Returns true if TickFlush can be called in parallel with the Slate tick. */
 	bool ShouldTickFlushAsyncEndOfFrame() const;
@@ -603,8 +686,20 @@ public:
 	 */
 	void PreNotifyActorChannelOpen(UActorChannel* Channel, AActor* Actor);
 
+	/**
+	 * Gets the actively recording or playback replay (stream) name.
+	 * Note, this will be empty when not recording or playing back.
+	 */
+	const FString& GetActiveReplayName() const
+	{
+		return ActiveReplayName;
+	}
+
 private:
 
+	/** Called when the downloading header request from the replay streamer completes. */
+	void OnDownloadHeaderCompletePrivate(const FDownloadHeaderResult& Result, int32 LevelIndex);
+
 	void CleanupOutstandingRewindActors();
 
 	// Tracks actors that will need to be rewound during scrubbing.
@@ -682,6 +777,9 @@ private:
 	// Only used during recording.
 	uint32 NumLevelsAddedThisFrame;
 
+	// Index into PlaybackPackets array. Used so we can process many packets in one frame and avoid removing them individually.
+	int32 PlaybackPacketIndex;
+
 	FLevelStatus& FindOrAddLevelStatus(const FString& LevelPackageName)
 	{
 		if (int32* LevelStatusIndex = LevelStatusesByName.Find(LevelPackageName))
@@ -734,7 +832,7 @@ private:
 	 */
 	bool ReplicatePrioritizedActors(const TArray<FActorPriority>& ToReplicate, const class FRepActorsParams& Params);
 	bool ReplicatePrioritizedActors(const TArray<FActorPriority*>& ToReplicate, const class FRepActorsParams& Params);
-	bool ReplicatePrioritizedActor(TArray<AActor*>& ActorsToGoDormant, const FActorPriority& ActorPriority, const class FRepActorsParams& Params);
+	bool ReplicatePrioritizedActor(const FActorPriority& ActorPriority, const class FRepActorsParams& Params);
 
 	/**
 	* Replicates the given prioritized actors, so their packets can be captured for recording.
@@ -765,6 +863,8 @@ private:
 	TUniquePtr<class FScopedPacketManager> ConditionallyCreatePacketManager(ULevel& Level);
 	TUniquePtr<class FScopedPacketManager> ConditionallyCreatePacketManager(int32 LevelIndex);
 
+	FString GetLevelPackageName(const ULevel& InLevel);
+
 protected:
 	/** allows subclasses to write game specific data to demo header which is then handled by ProcessGameSpecificDemoHeader */
 	virtual void WriteGameSpecificDemoHeader(TArray<FString>& GameSpecificData)
@@ -787,8 +887,16 @@ protected:
 
 	bool DemoReplicateActor(AActor* Actor, UNetConnection* Connection, bool bMustReplicate);
 
+	void SerializeGuidCache(TSharedPtr<class FNetGUIDCache> GuidCache, FArchive* CheckpointArchive);
+
+	void NotifyDemoPlaybackFailure(EDemoPlayFailure::Type FailureType);
+
 	TArray<FQueuedDemoPacket> QueuedPacketsBeforeTravel;
 
 	bool bIsWaitingForHeaderDownload;
+	bool bIsWaitingForStream;
 
+private:
+
+	FString ActiveReplayName;
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/EndUserSettings.h b/Engine/Source/Runtime/Engine/Classes/Engine/EndUserSettings.h
deleted file mode 100644
index e58e2597dd99..000000000000
--- a/Engine/Source/Runtime/Engine/Classes/Engine/EndUserSettings.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-//=============================================================================
-// EndUserSettings.h
-//
-// A configuration class that holds information for the end-user of a game.
-// You may want to expose these values in your game's UI.
-// Supplied so that the engine 'remembers' the last setup the user had.
-//=============================================================================
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "UObject/Object.h"
-#include "Engine/ImportantToggleSettingInterface.h"
-#include "EndUserSettings.generated.h"
-
-UCLASS(MinimalAPI, hidecategories=Object, config=Engine, defaultconfig)
-class UEndUserSettings : public UObject, public IImportantToggleSettingInterface
-{
-	GENERATED_UCLASS_BODY()
-
-	/** Determines whether the engine sends anonymous usage information about game sessions to Epic Games in order to improve Unreal Engine. Information will never be shared with 3rd parties. */
-	UPROPERTY(EditAnywhere, config, Category=Privacy)
-	bool bSendAnonymousUsageDataToEpic;
-
-	/** Determines whether the engine sends anonymous crash/abnormal-shutdown data about game sessions to Epic Games in order to improve Unreal Engine. Information will never be shared with 3rd parties. */
-	UPROPERTY(EditAnywhere, config, Category=PrivacyDetails)
-	bool bSendMeanTimeBetweenFailureDataToEpic;
-
-	/** If enabled, adds user identifying data to the otherwise anonymous reports sent to Epic Games. */
-	UPROPERTY(EditAnywhere, config, Category = PrivacyDetails)
-	bool bAllowUserIdInUsageData;
-
-public:
-	/** Sets bSendAnonymousUsageDataToEpic. It MUST be set this way when the end user changes the value to trigger the correct state change in the analytics system. */
-	void SetSendAnonymousUsageDataToEpic(bool bEnable);
-
-	// BEGIN IImportantToggleSettingInterface
-	virtual void GetToogleCategoryAndPropertyNames(FName& OutCategory, FName& OutProperty) const override;
-	virtual FText GetFalseStateLabel() const override;
-	virtual FText GetFalseStateTooltip() const override;
-	virtual FText GetFalseStateDescription() const override;
-	virtual FText GetTrueStateLabel() const override;
-	virtual FText GetTrueStateTooltip() const override;
-	virtual FText GetTrueStateDescription() const override;
-	virtual FString GetAdditionalInfoUrl() const override;
-	virtual FText GetAdditionalInfoUrlLabel() const override;
-	// END IImportantToggleSettingInterface
-
-private:
-	void OnSendAnonymousUsageDataToEpicChanged();
-};
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Engine.h b/Engine/Source/Runtime/Engine/Classes/Engine/Engine.h
index fa46561f7667..e8cc2bf40668 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Engine.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Engine.h
@@ -16,6 +16,8 @@
 #include "Misc/FrameRate.h"
 #include "Engine.generated.h"
 
+#define WITH_DYNAMIC_RESOLUTION (!UE_SERVER)
+
 class AMatineeActor;
 class APlayerController;
 class Error;
@@ -108,6 +110,9 @@ enum EConsoleType
 /** Status of dynamic resolution that depends on project setting cvar, game user settings, and pause */
 enum class EDynamicResolutionStatus
 {
+	// Dynamic resolution is not supported by this platform.
+	Unsupported,
+
 	// Dynamic resolution is disabled by project setting cvar r.DynamicRes.OperationMode=0 or disabled by game user
 	// settings with r.DynamicRes.OperationMode=1.
 	Disabled,
@@ -116,7 +121,24 @@ enum class EDynamicResolutionStatus
 	Paused,
 
 	// Dynamic resolution is currently enabled.
-	Enabled
+	Enabled,
+
+	// Forced enabled at static resolution fraction for profiling purpose with r.DynamicRes.TestScreenPercentage.
+	DebugForceEnabled,
+};
+
+/** Information about the state of dynamic resolution. */
+struct FDynamicResolutionStateInfos
+{
+	// Status of dynamic resolution.
+	EDynamicResolutionStatus Status;
+
+	// Approximation of the resolution fraction being applied. This is only an approximation because
+	// of non (and unecessary) thread safety of this value between game thread, and render thread.
+	float ResolutionFractionApproximation;
+
+	// Maximum resolution fraction set, always MaxResolutionFraction >= ResolutionFractionApproximation.
+	float ResolutionFractionUpperBound;
 };
 
 
@@ -1070,6 +1092,9 @@ public:
 	UPROPERTY(globalconfig)
 	float MaxES2PixelShaderAdditiveComplexityCount;
 
+	UPROPERTY(globalconfig)
+	float MaxES3PixelShaderAdditiveComplexityCount;
+
 	/** Range for the lightmap density view mode. */
 	/** Minimum lightmap density value for coloring. */
 	UPROPERTY(globalconfig)
@@ -1605,8 +1630,8 @@ public:
 	 */
 	void RestoreSelectedMaterialColor();
 
-	/** Returns the current status of dynamic resolution. */
-	EDynamicResolutionStatus GetDynamicResolutionStatus() const;
+	/** Queries informations about the current state dynamic resolution. */
+	void GetDynamicResolutionCurrentStateInfos(FDynamicResolutionStateInfos& OutInfos) const;
 
 	/** Pause dynamic resolution for this frame. */
 	void PauseDynamicResolution();
@@ -1614,7 +1639,7 @@ public:
 	/** Resume dynamic resolution for this frame. */
 	FORCEINLINE void ResumeDynamicResolution()
 	{
-		#if !UE_SERVER
+		#if WITH_DYNAMIC_RESOLUTION
 			bIsDynamicResolutionPaused = false;
 			UpdateDynamicResolutionStatus();
 		#endif // !UE_SERVER
@@ -1626,7 +1651,7 @@ public:
 	/** Get's global dynamic resolution state */
 	FORCEINLINE class IDynamicResolutionState* GetDynamicResolutionState()
 	{
-		#if UE_SERVER
+		#if !WITH_DYNAMIC_RESOLUTION
 			return nullptr;
 		#else
 			// Returns next's frame dynamic resolution state to keep game thread consistency after a ChangeDynamicResolutionStateAtNextFrame().
@@ -1643,7 +1668,7 @@ public:
 	/** Get the user setting for dynamic resolution. */
 	FORCEINLINE bool GetDynamicResolutionUserSetting() const
 	{
-		#if UE_SERVER
+		#if !WITH_DYNAMIC_RESOLUTION
 			return false;
 		#else
 			return bDynamicResolutionEnableUserSetting;
@@ -1653,7 +1678,7 @@ public:
 	/** Set the user setting for dynamic resolution. */
 	FORCEINLINE void SetDynamicResolutionUserSetting(bool Enable)
 	{
-		#if !UE_SERVER
+		#if WITH_DYNAMIC_RESOLUTION
 			bDynamicResolutionEnableUserSetting = Enable;
 			UpdateDynamicResolutionStatus();
 		#endif
@@ -1661,7 +1686,7 @@ public:
 
 
 private:
-	#if !UE_SERVER
+	#if WITH_DYNAMIC_RESOLUTION
 		/** Last dynamic resolution event. */
 		EDynamicResolutionStateEvent LastDynamicResolutionEvent;
 
@@ -1926,6 +1951,7 @@ public:
 	bool HandleListTexturesCommand( const TCHAR* Cmd, FOutputDevice& Ar );
 	bool HandleListStaticMeshesCommand(const TCHAR* Cmd, FOutputDevice& Ar);
 	bool HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& Ar);
+	bool HandleListAnimsCommand(const TCHAR* Cmd, FOutputDevice& Ar);
 	bool HandleRemoteTextureStatsCommand( const TCHAR* Cmd, FOutputDevice& Ar );
 	bool HandleListParticleSystemsCommand( const TCHAR* Cmd, FOutputDevice& Ar );
 	bool HandleListSpawnedActorsCommand( const TCHAR* Cmd, FOutputDevice& Ar, UWorld* InWorld );
@@ -2019,7 +2045,7 @@ public:
 	/**
 	 * Updates the values used to calculate the average game/render/gpu/total time
 	 */
-	void SetAverageUnitTimes(float FrameTime, float RenderThreadTime, float GameThreadTime, float GPUFrameTime);
+	void SetAverageUnitTimes(float FrameTime, float RenderThreadTime, float GameThreadTime, float GPUFrameTime, float RHITFrameTime);
 
 	/**
 	 * Returns the display color for a given frame time (based on t.TargetFrameTimeThreshold and t.UnacceptableFrameTimeThreshold)
@@ -2903,12 +2929,6 @@ public:
 
 	/** @return true if editor analytics are enabled */
 	virtual bool AreEditorAnalyticsEnabled() const { return false; }
-	/** @return true if in-game analytics are enabled */
-	bool AreGameAnalyticsEnabled() const;
-	/** @return true if in-game analytics are sent with an anonymous GUID rather than real account and machine ids */
-	bool AreGameAnalyticsAnonymous() const;
-	/** @return true if in-game MTBF analytics are enabled */
-	bool AreGameMTBFEventsEnabled() const;
 	virtual void CreateStartupAnalyticsAttributes( TArray<struct FAnalyticsEventAttribute>& StartSessionAttributes ) const {}
 	
 	/** @return true if the engine is autosaving a package */
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/EngineTypes.h b/Engine/Source/Runtime/Engine/Classes/Engine/EngineTypes.h
index d94ba63c579b..5e6866c13b36 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/EngineTypes.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/EngineTypes.h
@@ -1191,42 +1191,73 @@ struct FRigidBodyErrorCorrection
 {
 	GENERATED_USTRUCT_BODY()
 
-	/** max squared position difference to perform velocity adjustment */
-	UPROPERTY(EditAnywhere, Category="Replication")
-	float LinearDeltaThresholdSq;
-
-	/** strength of snapping to desired linear velocity */
+	/** Value between 0 and 1 which indicates how much velocity
+		and ping based correction to use */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float LinearInterpAlpha;
+	float PingExtrapolation;
 
-	/** inverted duration after which linear velocity adjustment will fix error */
+	/** Error per centimeter */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float LinearRecipFixTime;
+	float ErrorPerLinearDifference;
 
-	/** max squared angle difference (in radians) to perform velocity adjustment */
+	/** Error per degree */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float AngularDeltaThreshold;
+	float ErrorPerAngularDifference;
 
-	/** strength of snapping to desired angular velocity */
+	/** Maximum allowable error for a state to be considered "resolved" */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float AngularInterpAlpha;
+	float MaxRestoredStateError;
 
-	/** inverted duration after which angular velocity adjustment will fix error */
+	/** How much to directly lerp to the correct position. Generally
+		this should be very low, if not zero. A higher value will
+		increase precision along with jerkiness. */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float AngularRecipFixTime;
+	float PositionLerp;
 
-	/** min squared body speed to perform velocity adjustment */
+	/** How much to directly lerp to the correct angle. */
 	UPROPERTY(EditAnywhere, Category = "Replication")
-	float BodySpeedThresholdSq;
+	float AngleLerp;
+
+	/** This is the coefficient `k` in the differential equation:
+		dx/dt = k ( x_target(t) - x(t) ), which is used to update
+		the velocity in a replication step. */
+	UPROPERTY(EditAnywhere, Category = "Replication")
+	float LinearVelocityCoefficient;
+
+	/** This is the angular analog to LinearVelocityCoefficient. */
+	UPROPERTY(EditAnywhere, Category = "Replication")
+	float AngularVelocityCoefficient;
+
+	/** Number of seconds to remain in a heuristically
+		unresolveable state before hard snapping. */
+	UPROPERTY(EditAnywhere, Category = "Replication")
+	float ErrorAccumulationSeconds;
+
+	/** If the body has moved less than the square root of
+		this amount towards a resolved state in the previous
+		frame, then error may accumulate towards a hard snap. */
+	UPROPERTY(EditAnywhere, Category = "Replication")
+	float ErrorAccumulationDistanceSq;
+
+	/** If the previous error projected onto the current error
+		is greater than this value (indicating "similarity"
+		between states), then error may accumulate towards a
+		hard snap. */
+	UPROPERTY(EditAnywhere, Category = "Replication")
+	float ErrorAccumulationSimilarity;
 
 	FRigidBodyErrorCorrection()
-		: LinearDeltaThresholdSq(5.0f)
-		, LinearInterpAlpha(0.2f)
-		, LinearRecipFixTime(1.0f)
-		, AngularDeltaThreshold(0.2f * PI)
-		, AngularInterpAlpha(0.1f)
-		, AngularRecipFixTime(1.0f)
-		, BodySpeedThresholdSq(0.2f)
+		: PingExtrapolation(0.1f)
+		, ErrorPerLinearDifference(1.0f)
+		, ErrorPerAngularDifference(1.0f)
+		, MaxRestoredStateError(1.0f)
+		, PositionLerp(0.0f)
+		, AngleLerp(0.4f)
+		, LinearVelocityCoefficient(100.0f)
+		, AngularVelocityCoefficient(10.0f)
+		, ErrorAccumulationSeconds(0.5f)
+		, ErrorAccumulationDistanceSq(15.0f)
+		, ErrorAccumulationSimilarity(100.0f)
 	{ }
 };
 
@@ -1774,6 +1805,7 @@ struct FSwarmDebugOptions
 	FSwarmDebugOptions()
 		: bDistributionEnabled(true)
 		, bForceContentExport(false)
+		, bInitialized(false)
 	{
 	}
 
@@ -2097,12 +2129,17 @@ struct TStructOpsTypeTraits<FHitResult> : public TStructOpsTypeTraitsBase2<FHitR
 
 
 /** Whether to teleport physics body or not */
+UENUM()
 enum class ETeleportType : uint8
 {
 	/** Do not teleport physics body. This means velocity will reflect the movement between initial and final position, and collisions along the way will occur */
 	None,
+
 	/** Teleport physics body so that velocity remains the same and no collision occurs */
-	TeleportPhysics
+	TeleportPhysics,
+
+	/** Teleport physics body and reset physics state completely */
+	ResetPhysics,
 };
 
 FORCEINLINE ETeleportType TeleportFlagToEnum(bool bTeleport) { return bTeleport ? ETeleportType::TeleportPhysics : ETeleportType::None; }
@@ -2633,7 +2670,7 @@ struct ENGINE_API FPointDamageEvent : public FDamageEvent
 	UPROPERTY()
 	struct FHitResult HitInfo;
 
-	FPointDamageEvent() : HitInfo() {}
+	FPointDamageEvent() : Damage(0.0f), HitInfo() {}
 	FPointDamageEvent(float InDamage, struct FHitResult const& InHitInfo, FVector const& InShotDirection, TSubclassOf<class UDamageType> InDamageTypeClass)
 		: FDamageEvent(InDamageTypeClass), Damage(InDamage), ShotDirection(InShotDirection), HitInfo(InHitInfo)
 	{}
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/GameEngine.h b/Engine/Source/Runtime/Engine/Classes/Engine/GameEngine.h
index 8add360eec9a..7fccd12c53b7 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/GameEngine.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/GameEngine.h
@@ -82,8 +82,9 @@ public:
 	 * @param ResolutionX	[in/out] Width of the game window, in pixels
 	 * @param ResolutionY	[in/out] Height of the game window, in pixels
 	 * @param WindowMode	[in/out] What window mode the game should be in
+	 * @param bUseWorkArea	[in] Should we find a resolution that fits within the desktop work area for the windowed mode instead of monitor's full resolution
 	 */
-	static void DetermineGameWindowResolution( int32& ResolutionX, int32& ResolutionY, EWindowMode::Type& WindowMode );
+	static void DetermineGameWindowResolution( int32& ResolutionX, int32& ResolutionY, EWindowMode::Type& WindowMode, bool bUseWorkAreaForWindowed = false );
 
 	/**
 	 * Changes the game window to use the game viewport instead of any loading screen
@@ -107,6 +108,8 @@ public:
 	 */
 	virtual void RedrawViewports( bool bShouldPresent = true ) override;
 
+	void OnViewportResized(FViewport* Viewport, uint32 Unused);
+
 public:
 
 	// UObject interface
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/GameViewportClient.h b/Engine/Source/Runtime/Engine/Classes/Engine/GameViewportClient.h
index bb44921932db..2821ab885eb2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/GameViewportClient.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/GameViewportClient.h
@@ -150,7 +150,7 @@ public:
 	virtual bool InputKey(FViewport* Viewport, int32 ControllerId, FKey Key, EInputEvent EventType, float AmountDepressed=1.f, bool bGamepad=false) override;
 	virtual bool InputAxis(FViewport* Viewport, int32 ControllerId, FKey Key, float Delta, float DeltaTime, int32 NumSamples=1, bool bGamepad=false) override;
 	virtual bool InputChar(FViewport* Viewport,int32 ControllerId, TCHAR Character) override;
-	virtual bool InputTouch(FViewport* Viewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex) override;
+	virtual bool InputTouch(FViewport* Viewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) override;
 	virtual bool InputMotion(FViewport* Viewport, int32 ControllerId, const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration) override;
 	virtual EMouseCursor::Type GetCursor(FViewport* Viewport, int32 X, int32 Y ) override;
 	virtual TOptional<TSharedRef<SWidget>> MapCursor(FViewport* Viewport, const FCursorReply& CursorReply) override;
@@ -181,6 +181,11 @@ public:
 	virtual bool Exec( UWorld* InWorld, const TCHAR* Cmd,FOutputDevice& Ar) override;
 	//~ End FExec Interface.
 
+	/**
+	 * Gives the game's custom viewport client a way to handle F11 or Alt+Enter before processing the input
+	 */
+	bool TryToggleFullscreenOnInputKey(FKey Key, EInputEvent EventType);
+
 	/**
 	 * Exec command handlers
 	 */
@@ -401,7 +406,7 @@ public:
 	void GetPixelSizeOfScreen( float& Width, float& Height, UCanvas* Canvas, int32 LocalPlayerIndex );
 
 	/** Calculate the amount of safezone needed for a single side for both vertical and horizontal dimensions*/
-	void CalculateSafeZoneValues( float& Horizontal, float& Vertical, UCanvas* Canvas, int32 LocalPlayerIndex, bool bUseMaxPercent );
+	void CalculateSafeZoneValues( FMargin& SafeZone, UCanvas* Canvas, int32 LocalPlayerIndex, bool bUseMaxPercent );
 
 	/**
 	* pixel size of the deadzone for all sides (right/left/top/bottom) based on which local player it is
@@ -559,6 +564,15 @@ public:
 
 	/** FViewport interface */
 	virtual bool ShouldDPIScaleSceneCanvas() const override { return false; }
+
+#if WITH_EDITOR
+	void SetPlayInEditorUseMouseForTouch(bool bUseMouseForTouch);
+#endif
+
+protected:
+
+	bool GetUseMouseForTouch() const;
+
 protected:
 	/** FCommonViewportClient interface */
 	virtual float UpdateViewportClientWindowDPIScale() const override;
@@ -930,4 +944,9 @@ private:
 
 	/** Is the mouse currently over the viewport client */
 	bool bIsMouseOverClient;
+
+#if WITH_EDITOR
+	/** Should the mouse send touch events. */
+	bool bUseMouseForTouchInEditor;
+#endif
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/HLODProxy.h b/Engine/Source/Runtime/Engine/Classes/Engine/HLODProxy.h
new file mode 100644
index 000000000000..3b68f3e7c156
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/HLODProxy.h
@@ -0,0 +1,112 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "LODActor.h"
+#include "HLODProxy.generated.h"
+
+class UStaticMesh;
+
+/** A mesh proxy entry */
+USTRUCT()
+struct FHLODProxyMesh
+{
+	GENERATED_BODY()
+
+	FHLODProxyMesh()
+		: StaticMesh(nullptr)
+	{
+	}
+
+#if WITH_EDITOR
+	FHLODProxyMesh(ALODActor* InLODActor, UStaticMesh* InStaticMesh, const FName& InKey)
+		: LODActor(InLODActor)
+		, StaticMesh(InStaticMesh)
+		, Key(InKey)
+
+	{
+	}
+
+	bool operator==(const FHLODProxyMesh& InHLODProxyMesh) const
+	{
+		return LODActor == InHLODProxyMesh.LODActor &&
+			   StaticMesh == InHLODProxyMesh.StaticMesh &&
+			   Key == InHLODProxyMesh.Key;
+	}
+#endif
+
+	/** Get the mesh for this proxy mesh */
+	const UStaticMesh* GetStaticMesh() const { return StaticMesh; }
+
+	/** Get the actor for this proxy mesh */
+	const TLazyObjectPtr<ALODActor>& GetLODActor() const { return LODActor; }
+
+	/** Get the key for this proxy mesh */
+	const FName& GetKey() const { return Key; }
+
+private:
+	/** The ALODActor that we were generated from */
+	UPROPERTY(VisibleAnywhere, Category = "Proxy Mesh")
+	TLazyObjectPtr<ALODActor> LODActor;
+
+	/** The mesh used to display this proxy */
+	UPROPERTY(VisibleAnywhere, Category = "Proxy Mesh")
+	UStaticMesh* StaticMesh;
+
+	/** The key generated from an ALODActor. If this differs from that generated from the ALODActor, then the mesh needs regenerating. */
+	UPROPERTY(VisibleAnywhere, Category = "Proxy Mesh")
+	FName Key;
+};
+
+/** This asset acts as a proxy to a static mesh for ALODActors to display */
+UCLASS()
+class ENGINE_API UHLODProxy : public UObject
+{
+	GENERATED_BODY()
+
+public:
+#if WITH_EDITOR
+	/** Setup the map - only called at initial construction */
+	void SetMap(const UWorld* InMap);
+
+	/** Adds a static mesh and the key used to generate it */
+	void AddMesh(ALODActor* InLODActor, UStaticMesh* InStaticMesh, const FName& InKey);
+
+	/** Clean out invalid proxy mesh entries */
+	void Clean();
+
+	/** Helper for recursive traversing LODActors to retrieve a semi deterministic first AActor for resulting asset naming */
+	static const AActor* FindFirstActor(const ALODActor* LODActor);
+
+	/**
+	 * Recursively retrieves StaticMeshComponents from a LODActor and its child LODActors
+	 *
+	 * @param Actor - LODActor instance
+	 * @param InOutComponents - Will hold the StaticMeshComponents
+	 */
+	static void ExtractStaticMeshComponentsFromLODActor(const ALODActor* LODActor, TArray<UStaticMeshComponent*>& InOutComponents);
+
+	/** Extract components that we would use for LOD generation. Used to generate keys for LOD actors. */
+	static void ExtractComponents(const ALODActor* LODActor, TArray<UPrimitiveComponent*>& InOutComponents);
+
+	/** Build a unique key for the LOD actor, used to determine if the actor needs rebuilding */
+	static FName GenerateKeyForActor(const ALODActor* LODActor);
+#endif
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	/** Check if we contain data for the specified actor */
+	bool ContainsDataForActor(const ALODActor* InLODActor) const;
+#endif
+
+private:
+#if WITH_EDITORONLY_DATA
+	/** Keep hold of the level in the editor to allow for package cleaning etc. */
+	UPROPERTY(VisibleAnywhere, Category = "Proxy Mesh")
+	TSoftObjectPtr<UWorld> OwningMap;
+#endif
+
+	/** All the mesh proxies we contain */
+	UPROPERTY(VisibleAnywhere, Category = "Proxy Mesh")
+	TArray<FHLODProxyMesh> ProxyMeshes;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/LODActor.h b/Engine/Source/Runtime/Engine/Classes/Engine/LODActor.h
index 5d04d4f6a1a5..f4ba7aa88ac0 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/LODActor.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/LODActor.h
@@ -11,8 +11,8 @@
 #include "LODActor.generated.h"
 
 class UStaticMesh;
+class UHLODProxy;
 
-extern ENGINE_API TAutoConsoleVariable<float> CVarHLODDistanceScale;
 extern ENGINE_API TAutoConsoleVariable<FString> CVarHLODDistanceOverride;
 
 /**
@@ -26,13 +26,28 @@ extern ENGINE_API TAutoConsoleVariable<FString> CVarHLODDistanceOverride;
 UCLASS(notplaceable, hidecategories = (Object, Collision, Display, Input, Blueprint, Transform, Physics))
 class ENGINE_API ALODActor : public AActor
 {
-GENERATED_UCLASS_BODY()
+	GENERATED_UCLASS_BODY()
+
+	friend class UHLODProxy;
+
+	// Disable compiler-generated deprecation warnings by implementing our own destructor
+	PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	~ALODActor() {}
+	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 private:
 	// disable display of this component
 	UPROPERTY(Category=LODActor, VisibleAnywhere)
 	UStaticMeshComponent* StaticMeshComponent;
 
+	/** The mesh proxy used to display this LOD */
+	UPROPERTY(Category=LODActor, VisibleAnywhere)
+	UHLODProxy* Proxy;
+
+	/** The key used to validate this actor against the proxy */
+	UPROPERTY(Category=LODActor, VisibleAnywhere)
+	FName Key;
+
 	/** what distance do you want this to show up instead of SubActors */
 	UPROPERTY(Category = LODActor, VisibleAnywhere)
 	float LODDrawDistance;
@@ -45,16 +60,14 @@ public:
 	UPROPERTY(Category=LODActor, VisibleAnywhere)
 	int32 LODLevel;
 
-	/** assets that were created for this, so that we can delete them */
-	UPROPERTY(Category=LODActor, VisibleAnywhere)
+	DEPRECATED(4.20, "This member is no longer used")
 	TArray<UObject*> SubObjects;
 
 	UPROPERTY()
 	uint8 CachedNumHLODLevels;
 
 #if WITH_EDITORONLY_DATA
-	/** Assets which have become stale and might get deleted (depends on undo/redo behaviour) */
-	UPROPERTY(transient)
+	DEPRECATED(4.20, "This member is no longer used")
 	TArray<UObject*> PreviousSubObjects;
 #endif // WITH_EDITORONLY_DATA
 
@@ -83,11 +96,25 @@ public:
 	/** Sets the LOD draw distance and updates the Static Mesh Component's min drawing distance */
 	void SetDrawDistance(float InDistance);
 
+	/** Gets the LOD draw distance */
+	float GetDrawDistance() const { return LODDrawDistance; }
 	float GetLODDrawDistance() const { return LODDrawDistance; }
 
-	const bool IsBuilt() { return StaticMeshComponent->GetStaticMesh() != nullptr;  }
+	/** Get the key that we use to check if we need to (re)build */
+	const FName& GetKey() const { return Key; }
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	/** 
+	 * Check to see if this mesh is built 
+	 * @param	bInForce	Whether to force the recalculation of this actor's build flag. If this is false then the cached flag is used an only recalculated every so often.
+	 */
+	const bool IsBuilt(bool bInForce = false) const;
+#endif
 
 #if WITH_EDITOR
+	/** Force this actor to appear unbuilt (zeros-out key) */
+	void ForceUnbuilt();
+
 	/**
 	* Adds InAcor to the SubActors array and set its LODParent to this
 	* @param InActor - Actor to add
@@ -100,17 +127,11 @@ public:
 	*/
 	const bool RemoveSubActor(AActor* InActor);
 
-	/**
-	* Returns whether or not this LODActor is dirty
-	* @return const bool
-	*/
-	const bool IsDirty() const { return bDirty; }
+	DEPRECATED(4.20, "Please use IsBuilt() instead")
+	const bool IsDirty() const { return IsBuilt(); }
 
-	/**
-	* Sets whether or not this LODActor is dirty and should have its LODMesh (re)build
-	* @param bNewState - New dirty state
-	*/
-	void SetIsDirty(const bool bNewState);
+	DEPRECATED(4.20, "Please use ForceUnbuilt() instead")
+	void SetIsDirty(const bool bNewState) { if(!bNewState) { ForceUnbuilt(); } }
 	
 	/**
 	 * Determines whether or not this LODActor has valid SubActors and can be built
@@ -142,14 +163,20 @@ public:
 	/** Updates the LODParents for the SubActors (and the drawing distance)*/
 	void UpdateSubActorLODParents();
 
+	// This will determine the shadowing flags for the static mesh component according to all sub actors
+	void DetermineShadowingFlags();
+
 	/** Cleans the SubActor array (removes all NULL entries) */
 	void CleanSubActorArray();
 
-	/** Cleans the SubObject array (removes all NULL entries) */
-	void CleanSubObjectsArray();
+	DEPRECATED(4.20, "This function is no longer used")
+	void CleanSubObjectsArray() {}
 
 	/** Recalculates the drawing distance according to a fixed FOV of 90 and the transition screen size*/
 	void RecalculateDrawingDistance(const float TransitionScreenSize);
+
+	/** Get the proxy mesh we use to render */
+	UHLODProxy* GetProxy() const { return Proxy; }
 #endif // WITH_EDITOR
 
 	//~ Begin UObject Interface.
@@ -161,15 +188,8 @@ public:
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 
 	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
-	virtual void BeginDestroy() override;
 #endif // WITH_EDITOR	
 	//~ End UObject Interface.	
-protected:
-#if WITH_EDITORONLY_DATA
-	/** Whether or not this LODActor is not build or needs rebuilding */
-	UPROPERTY()
-	bool bDirty;
-#endif // WITH_EDITORONLY_DATA
 public:
 #if WITH_EDITORONLY_DATA
 	/** Cached number of triangles contained in the SubActors*/
@@ -225,13 +245,13 @@ private:
 	// Called to make sure autoregistration/manual registration state matches based on the LOD override cvar and this actor's lod level
 	void UpdateRegistrationToMatchMaximumLODLevel();
 
-	// This will determine the shadowing flags for the static mesh component according to all sub actors
-	void DetermineShadowingFlags();
-
 private:
  	// Have we already tried to register components? (a cache to avoid having to query the owning world when the global HLOD max level setting is changed)
  	uint8 bHasActorTriedToRegisterComponents : 1;
 
+	// Flag whether or not the SubActors have been moved to a Parent LODActor
+	uint8 bHasPatchedUpParent : 1;
+
 	/**
 	 * If true on post load we need to calculate resolution independent Display Factors from the
 	 * loaded LOD screen sizes.
@@ -240,6 +260,15 @@ private:
 
 	/** Flags for forcing a dithering transition */
 	uint8 bNeedsDrawDistanceReset : 1;
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	/** Cached flag we use to avoid checking the built status of this actor every frame */
+	mutable uint8 bCachedIsBuilt : 1;
+
+	/** Timer we use to avoid checking the built status of this actor every frame */
+	mutable double LastIsBuiltTime;
+#endif
+
 	float ResetDrawDistanceTime;	
 
 	// Sink for when CVars are changed to check to see if the maximum HLOD level value has changed
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/LatentActionManager.h b/Engine/Source/Runtime/Engine/Classes/Engine/LatentActionManager.h
index fb4b25a05581..f81caba1bdda 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/LatentActionManager.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/LatentActionManager.h
@@ -48,6 +48,16 @@ struct ENGINE_API FLatentActionInfo
 	}
 };
 
+enum class ELatentActionChangeType : uint8
+{
+	/** Latent actions were removed */
+	ActionsRemoved,
+
+	/** Latent actions were added */
+	ActionsAdded,
+};
+
+DECLARE_MULTICAST_DELEGATE_TwoParams(FOnLatentActionsChanged, UObject*, ELatentActionChangeType)
 
 // The latent action manager handles all pending latent actions for a single world
 USTRUCT()
@@ -61,6 +71,10 @@ struct ENGINE_API FLatentActionManager
 	/** Map to convert from object to FActionList. */
 	typedef TMap< TWeakObjectPtr<UObject>, TSharedPtr<FActionList> > FObjectToActionListMap;
 	FObjectToActionListMap ObjectToActionListMap;
+
+	/** @return A delegate that will be broadcast when a latent action is added or removed from the manager */
+	static FOnLatentActionsChanged& OnLatentActionsChanged() { return LatentActionsChangedDelegate; }
+
 public:
 	/** 
 	 * Advance pending latent actions by DeltaTime.
@@ -205,5 +219,8 @@ protected:
 	typedef TPair<int32, class FPendingLatentAction*> FUuidAndAction;
 	typedef TMap< TWeakObjectPtr<UObject>, TSharedPtr<TArray<FUuidAndAction>>> FActionsForObject;
 	FActionsForObject ActionsToRemoveMap;
+
+	/** Delegate called when a latent action is added or removed */
+	static FOnLatentActionsChanged LatentActionsChangedDelegate;
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/LocalPlayer.h b/Engine/Source/Runtime/Engine/Classes/Engine/LocalPlayer.h
index 4582a4ec610b..8b3a932135eb 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/LocalPlayer.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/LocalPlayer.h
@@ -15,6 +15,7 @@
 #include "UObject/CoreOnline.h"
 #include "SceneTypes.h"
 #include "Engine/Player.h"
+#include "GameFramework/OnlineReplStructs.h"
 #include "LocalPlayer.generated.h"
 
 
@@ -159,11 +160,13 @@ class ENGINE_API ULocalPlayer : public UPlayer
 {
 	GENERATED_UCLASS_BODY()
 
+public:
+
 	/** DO NOT USE. This constructor is for internal usage only for hot-reload purposes. */
 	ULocalPlayer(FVTableHelper& Helper) : Super(Helper), SlateOperations(FReply::Unhandled()) {}
 
 	/** The FUniqueNetId which this player is associated with. */
-	TSharedPtr<const FUniqueNetId> CachedUniqueNetId;
+	FUniqueNetIdRepl CachedUniqueNetId;
 
 	/** The master viewport containing this player's view. */
 	UPROPERTY()
@@ -365,14 +368,14 @@ public:
 	 *
 	 * @return unique Id associated with this player
 	 */
-	TSharedPtr<const FUniqueNetId> GetUniqueNetIdFromCachedControllerId() const;
+	FUniqueNetIdRepl GetUniqueNetIdFromCachedControllerId() const;
 
 	/** 
 	 * Retrieves this player's unique net ID that was previously cached
 	 *
 	 * @return unique Id associated with this player
 	 */
-	TSharedPtr<const FUniqueNetId> GetCachedUniqueNetId() const;
+	FUniqueNetIdRepl GetCachedUniqueNetId() const;
 
 	/** Sets the players current cached unique net id */
 	void SetCachedUniqueNetId(TSharedPtr<const FUniqueNetId> NewUniqueNetId);
@@ -382,7 +385,7 @@ public:
 	 *
 	 * @return unique Id associated with this player
 	 */
-	TSharedPtr<const FUniqueNetId> GetPreferredUniqueNetId() const;
+	FUniqueNetIdRepl GetPreferredUniqueNetId() const;
 
 	/** Returns true if the cached unique net id, is the one assigned to the controller id from the OSS */
 	bool IsCachedUniqueNetIdPairedWithControllerId() const;
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/MemberReference.h b/Engine/Source/Runtime/Engine/Classes/Engine/MemberReference.h
index f3db8d455149..f46a10eec4e5 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/MemberReference.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/MemberReference.h
@@ -98,6 +98,7 @@ public:
 		: MemberParent(nullptr)
 		, MemberName(NAME_None)
 		, bSelfContext(false)
+		, bWasDeprecated(false)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/MeshMerging.h b/Engine/Source/Runtime/Engine/Classes/Engine/MeshMerging.h
index 910a04a587b4..bfd5176e42ab 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/MeshMerging.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/MeshMerging.h
@@ -167,6 +167,18 @@ namespace ELandscapeCullingPrecision
 	};
 }
 
+UENUM()
+namespace EProxyNormalComputationMethod
+{
+	enum Type
+	{
+		AngleWeighted = 0 UMETA(DisplayName = "Angle Weighted"),
+		AreaWeighted = 1 UMETA(DisplayName = "Area  Weighted"),
+		EqualWeighted = 2 UMETA(DisplayName = "Equal Weighted")
+	};
+}
+
+
 USTRUCT()
 struct FMeshProxySettings
 {
@@ -209,14 +221,34 @@ struct FMeshProxySettings
 	UPROPERTY(EditAnywhere, Category = ProxySettings)
 	bool bCalculateCorrectLODModel;
 
-	/** Distance at which meshes should be merged together */
+	/** Distance at which meshes should be merged together, this can close gaps like doors and windows in distant geometry */
 	UPROPERTY(EditAnywhere, Category = ProxySettings)
 	float MergeDistance;
-	
+
+	/** Base color assigned to LOD geometry that can't be associated with the source geometry: e.g. doors and windows that have been closed by the Merge Distance */
+	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (DisplayName = "Unresolved Geometry Color"))
+	FColor UnresolvedGeometryColor;
+
+	/** Enable an override for material transfer distance */
+	UPROPERTY(EditAnywhere, Category = MaxRayCastDist, meta = (InlineEditConditionToggle))
+	bool bOverrideTransferDistance;
+
+	/** Override search distance used when discovering texture values for simplified geometry.  Useful when non-zero Merge Distance setting generates new geometry in concave corners.*/
+	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (EditCondition = "bOverrideTransferDistance", DisplayName = "Transfer Distance Override", ClampMin = 0))
+	float MaxRayCastDist;
+
+	/** Enable the use of hard angle based vertex splitting */
+	UPROPERTY(EditAnywhere, Category = HardAngleThreshold, meta = (InlineEditConditionToggle))
+	bool bUseHardAngleThreshold;
+
 	/** Angle at which a hard edge is introduced between faces */
-	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (DisplayName = "Hard Edge Angle"))
+	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (EditCondition = "bUseHardAngleThreshold", DisplayName = "Hard Edge Angle", ClampMin = 0, ClampMax = 180))
 	float HardAngleThreshold;
 
+	/** Controls the method used to calculate the normal for the simplified geometry */
+	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (DisplayName = "Normal Calculation Method"))
+	TEnumAsByte<EProxyNormalComputationMethod::Type> NormalCalculationMethod;
+
 	/** Lightmap resolution */
 	UPROPERTY(EditAnywhere, Category = ProxySettings, meta = (ClampMin = 32, ClampMax = 4096, EditCondition = "!bComputeLightMapResolution"))
 	int32 LightMapResolution;
@@ -275,10 +307,18 @@ struct FMeshProxySettings
 		, bExportMetallicMap_DEPRECATED(false)
 		, bExportRoughnessMap_DEPRECATED(false)
 		, bExportSpecularMap_DEPRECATED(false)
-		, MergeDistance(4)
-		, HardAngleThreshold(80.0f)
+		, bCalculateCorrectLODModel(false)
+		, MergeDistance(0)
+		, UnresolvedGeometryColor(FColor::Black)
+		, bOverrideTransferDistance(false)
+		, MaxRayCastDist(20)
+		, bUseHardAngleThreshold(false)
+		, HardAngleThreshold(130.f)
+		, NormalCalculationMethod(EProxyNormalComputationMethod::AngleWeighted)
 		, LightMapResolution(256)
+		, bComputeLightMapResolution(false)
 		, bRecalculateNormals(true)
+		, bBakeVertexData_DEPRECATED(false)
 		, bUseLandscapeCulling(false)
 		, LandscapeCullingPrecision(ELandscapeCullingPrecision::Medium)
 		, bAllowAdjacency(false)
@@ -297,8 +337,13 @@ struct FMeshProxySettings
 		return ScreenSize == Other.ScreenSize
 			&& MaterialSettings == Other.MaterialSettings
 			&& bRecalculateNormals == Other.bRecalculateNormals
+			&& bOverrideTransferDistance == Other.bOverrideTransferDistance
+			&& MaxRayCastDist == Other.MaxRayCastDist
+			&& bUseHardAngleThreshold == Other.bUseHardAngleThreshold
 			&& HardAngleThreshold == Other.HardAngleThreshold
+			&& NormalCalculationMethod == Other.NormalCalculationMethod
 			&& MergeDistance == Other.MergeDistance
+			&& UnresolvedGeometryColor == Other.UnresolvedGeometryColor
 			&& bOverrideVoxelSize == Other.bOverrideVoxelSize
 			&& VoxelSize == Other.VoxelSize;
 	}
@@ -430,6 +475,10 @@ struct FMeshMergingSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = MeshSettings)
 	bool bIncludeImposters;
 
+	/** Whether to allow distance field to be computed for this mesh.  Disable this to save memory if you mesh will only rendered in the distance. */
+	UPROPERTY(EditAnywhere, Category = MeshSettings)
+	bool bAllowDistanceField;
+
 	/** Whether to export normal maps for material merging */
 	UPROPERTY()
 	bool bExportNormalMap_DEPRECATED;
@@ -452,6 +501,7 @@ struct FMeshMergingSettings
 	FMeshMergingSettings()
 		: bGenerateLightMapUV(true)
 		, TargetLightMapResolution(256)
+		, bComputedLightMapResolution(false)
 		, bImportVertexColors_DEPRECATED(false)
 		, bPivotPointAtZero(false)
 		, bMergePhysicsData(false)
@@ -468,6 +518,7 @@ struct FMeshMergingSettings
 		, SpecificLOD(0)
 		, bUseLandscapeCulling(false)
 		, bIncludeImposters(true)
+		, bAllowDistanceField(false)
 		, bExportNormalMap_DEPRECATED(true)
 		, bExportMetallicMap_DEPRECATED(false)
 		, bExportRoughnessMap_DEPRECATED(false)
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/NetConnection.h b/Engine/Source/Runtime/Engine/Classes/Engine/NetConnection.h
index 083823536117..c671ca9991cc 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/NetConnection.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/NetConnection.h
@@ -333,7 +333,7 @@ public:
 	float			BestLag,   AvgLag;		// Lag.
 
 	// Stat accumulators.
-	float			LagAcc, BestLagAcc;		// Previous msec lag.
+	double			LagAcc, BestLagAcc;		// Previous msec lag.
 	int32			LagCount;				// Counter for lag measurement.
 	double			LastTime, FrameTime;	// Monitors frame time.
 	/** @todo document */
@@ -342,6 +342,8 @@ public:
 	int32			CountedFrames;
 	/** bytes sent/received on this connection (accumulated during a StatPeriod) */
 	int32 InBytes, OutBytes;
+	/** total bytes sent/received on this connection */
+	int32 InTotalBytes, OutTotalBytes;
 	/** packets sent/received on this connection (accumulated during a StatPeriod) */
 	int32 InPackets, OutPackets;
 	/** total packets sent/received on this connection */
@@ -421,6 +423,11 @@ public:
 		return ActorChannels.Find(Actor);
 	}
 
+	bool ContainsActorChannel(const TWeakObjectPtr<AActor>& Actor)
+	{
+		return ActorChannels.Contains(Actor);
+	}
+
 	int32 ActorChannelsNum() const
 	{
 		return ActorChannels.Num();
@@ -771,6 +778,11 @@ public:
 	 */
 	ENGINE_API void EnableEncryption();
 
+	/**
+	 * Returns true if encryption is enabled for this connection.
+	 */
+	ENGINE_API bool IsEncryptionEnabled() const;
+
 	/** 
 	* Gets a unique ID for the connection, this ID depends on the underlying connection
 	* For IP connections this is an IP Address and port, for steam this is a SteamID
@@ -835,6 +847,7 @@ public:
 
 	/** @return The driver object */
 	UNetDriver* GetDriver() {return Driver;}
+	const UNetDriver* GetDriver() const { return Driver; }
 
 	/** @todo document */
 	class UControlChannel* GetControlChannel();
@@ -925,7 +938,7 @@ public:
 
 	/** Returns the online platform name for the player on this connection. Only valid for client connections on servers. */
 	ENGINE_API FName GetPlayerOnlinePlatformName() const { return PlayerOnlinePlatformName; }
-
+	
 	/**
 	 * Sets whether or not we should ignore bunches that would attempt to open channels that are already open.
 	 * Should only be used with InternalAck.
@@ -936,6 +949,9 @@ protected:
 
 	void CleanupDormantActorState();
 
+	/** Called internally to destroy an actor during replay fast-forward when the actor channel index will be recycled */
+	ENGINE_API virtual void DestroyIgnoredActor(AActor* Actor);
+
 private:
 	/**
 	 * The channels that need ticking. This will be a subset of OpenChannels, only including
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/NetDriver.h b/Engine/Source/Runtime/Engine/Classes/Engine/NetDriver.h
index 4c9713330c53..b923a50b0663 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/NetDriver.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/NetDriver.h
@@ -377,6 +377,10 @@ public:
 	/** todo document */
 	uint32						OutBunches;
 	/** todo document */
+	uint32						InTotalBunches;
+	/** todo document */
+	uint32						OutTotalBunches;
+	/** todo document */
 	uint32						InPacketsLost;
 	/** todo document */
 	uint32						OutPacketsLost;
@@ -715,7 +719,7 @@ public:
 	//	Game code API for updating server Actor Replication State
 	// ---------------------------------------------------------------
 
-	ENGINE_API void ForceNetUpdate(AActor* Actor);
+	ENGINE_API virtual void ForceNetUpdate(AActor* Actor);
 
 	/** Flushes actor from NetDriver's dormancy list, but does not change any state on the Actor itself */
 	ENGINE_API void FlushActorDormancy(AActor *Actor, bool bWasDormInitial=false);
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/NetSerialization.h b/Engine/Source/Runtime/Engine/Classes/Engine/NetSerialization.h
index c2b3db779313..1ccd8a53288a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/NetSerialization.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/NetSerialization.h
@@ -891,8 +891,6 @@ bool FFastArraySerializer::FastArrayDeltaSerialize( TArray<Type> &Items, FNetDel
 				int32 ElementID;
 				Reader << ElementID;
 
-				ArraySerializer.GuidReferencesMap.Remove( ElementID );
-
 				int32* ElementIndexPtr = ArraySerializer.ItemMap.Find(ElementID);
 				if (ElementIndexPtr)
 				{
@@ -1047,6 +1045,12 @@ bool FFastArraySerializer::FastArrayDeltaSerialize( TArray<Type> &Items, FNetDel
 		{
 			if (Items.IsValidIndex(idx))
 			{
+				// Remove the deleted element's tracked GUID references
+				if (ArraySerializer.GuidReferencesMap.Remove(Items[idx].ReplicationID) > 0)
+				{
+					Parms.bGuidListsChanged = true;
+				}
+
 				// Call the delete callbacks now, actually remove them at the end
 				Items[idx].PreReplicatedRemove(ArraySerializer);
 			}
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/NetworkDelegates.h b/Engine/Source/Runtime/Engine/Classes/Engine/NetworkDelegates.h
index 05752da01c43..4f9b53cc16b6 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/NetworkDelegates.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/NetworkDelegates.h
@@ -100,31 +100,28 @@ enum class EEncryptionResponse : uint8
 	InvalidParams
 };
 
-namespace Lex
+inline const TCHAR* const LexToString(const EEncryptionResponse Response)
 {
-	inline const TCHAR* const ToString(const EEncryptionResponse Response)
+	switch (Response)
 	{
-		switch (Response)
-		{
-			case EEncryptionResponse::Failure:
-				return TEXT("Failure");
-			case EEncryptionResponse::Success:
-				return TEXT("Success");
-			case EEncryptionResponse::InvalidToken:
-				return TEXT("InvalidToken");
-			case EEncryptionResponse::NoKey:
-				return TEXT("NoKey");
-			case EEncryptionResponse::SessionIdMismatch:
-				return TEXT("SessionIdMismatch");
-			case EEncryptionResponse::InvalidParams:
-				return TEXT("InvalidParams");
-			default:
-				break;
-		}
-
-		checkf(false, TEXT("Missing EncryptionResponse Type: %d"), static_cast<const int32>(Response));
-		return TEXT("");
+		case EEncryptionResponse::Failure:
+			return TEXT("Failure");
+		case EEncryptionResponse::Success:
+			return TEXT("Success");
+		case EEncryptionResponse::InvalidToken:
+			return TEXT("InvalidToken");
+		case EEncryptionResponse::NoKey:
+			return TEXT("NoKey");
+		case EEncryptionResponse::SessionIdMismatch:
+			return TEXT("SessionIdMismatch");
+		case EEncryptionResponse::InvalidParams:
+			return TEXT("InvalidParams");
+		default:
+			break;
 	}
+
+	checkf(false, TEXT("Missing EncryptionResponse Type: %d"), static_cast<const int32>(Response));
+	return TEXT("");
 }
 
 struct FEncryptionKeyResponse
@@ -161,27 +158,24 @@ enum class ECheatPunishType : uint8
 	PunishInfo
 };
 
-namespace Lex
+inline const TCHAR* const LexToString(const ECheatPunishType Response)
 {
-	inline const TCHAR* const ToString(const ECheatPunishType Response)
+	switch (Response)
 	{
-		switch (Response)
-		{
-			case ECheatPunishType::Unknown:
-				return TEXT("Unknown");
-			case ECheatPunishType::KickClient:
-				return TEXT("KickClient");
-			case ECheatPunishType::KickMatch:
-				return TEXT("KickMatch");
-			case ECheatPunishType::PunishInfo:
-				return TEXT("PunishInfo");
-			default:
-				break;
-		}
-
-		checkf(false, TEXT("Missing ECheatPunishType Type: %d"), static_cast<const int32>(Response));
-		return TEXT("");
+		case ECheatPunishType::Unknown:
+			return TEXT("Unknown");
+		case ECheatPunishType::KickClient:
+			return TEXT("KickClient");
+		case ECheatPunishType::KickMatch:
+			return TEXT("KickMatch");
+		case ECheatPunishType::PunishInfo:
+			return TEXT("PunishInfo");
+		default:
+			break;
 	}
+
+	checkf(false, TEXT("Missing ECheatPunishType Type: %d"), static_cast<const int32>(Response));
+	return TEXT("");
 }
 
 /** 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/PackageMapClient.h b/Engine/Source/Runtime/Engine/Classes/Engine/PackageMapClient.h
index 4ac257cbbb38..e8b682cd7bee 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/PackageMapClient.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/PackageMapClient.h
@@ -169,13 +169,13 @@ public:
 	bool			SupportsObject( const UObject* Object, const TWeakObjectPtr<UObject>* WeakObjectPtr=nullptr /** Optional: pass in existing weakptr to prevent this function from constructing one internally */ ) const;
 	bool			IsDynamicObject( const UObject* Object );
 	bool			IsNetGUIDAuthority() const;
-	FNetworkGUID	GetOrAssignNetGUID( const UObject* Object, const TWeakObjectPtr<UObject>* WeakObjectPtr=nullptr /** Optional: pass in existing weakptr to prevent this function from constructing one internally */ );
+	FNetworkGUID	GetOrAssignNetGUID( UObject* Object, const TWeakObjectPtr<UObject>* WeakObjectPtr=nullptr /** Optional: pass in existing weakptr to prevent this function from constructing one internally */ );
 	FNetworkGUID	GetNetGUID( const UObject* Object ) const;
 	FNetworkGUID	GetOuterNetGUID( const FNetworkGUID& NetGUID ) const;
-	FNetworkGUID	AssignNewNetGUID_Server( const UObject* Object );
-	FNetworkGUID	AssignNewNetGUIDFromPath_Server( const FString& PathName, const UObject* ObjOuter, const UClass* ObjClass );
+	FNetworkGUID	AssignNewNetGUID_Server( UObject* Object );
+	FNetworkGUID	AssignNewNetGUIDFromPath_Server( const FString& PathName, UObject* ObjOuter, UClass* ObjClass );
 	void			RegisterNetGUID_Internal( const FNetworkGUID& NetGUID, const FNetGuidCacheObject& CacheObject );
-	void			RegisterNetGUID_Server( const FNetworkGUID& NetGUID, const UObject* Object );
+	void			RegisterNetGUID_Server( const FNetworkGUID& NetGUID, UObject* Object );
 	void			RegisterNetGUID_Client( const FNetworkGUID& NetGUID, const UObject* Object );
 	void			RegisterNetGUIDFromPath_Client( const FNetworkGUID& NetGUID, const FString& PathName, const FNetworkGUID& OuterGUID, const uint32 NetworkChecksum, const bool bNoLoad, const bool bIgnoreWhenMissing );
 	void			RegisterNetGUIDFromPath_Server( const FNetworkGUID& NetGUID, const FString& PathName, const FNetworkGUID& OuterGUID, const uint32 NetworkChecksum, const bool bNoLoad, const bool bIgnoreWhenMissing );
@@ -189,8 +189,8 @@ public:
 	FString			FullNetGUIDPath( const FNetworkGUID& NetGUID ) const;
 	void			GenerateFullNetGUIDPath_r( const FNetworkGUID& NetGUID, FString& FullPath ) const;
 	bool			ShouldIgnorePackageMismatch() const;
-	uint32			GetClassNetworkChecksum( const UClass* Class );
-	uint32			GetNetworkChecksum( const UObject* Obj );
+	uint32			GetClassNetworkChecksum( UClass* Class );
+	uint32			GetNetworkChecksum( UObject* Obj );
 	void			SetNetworkChecksumMode( const ENetworkChecksumMode NewMode );
 	void			SetAsyncLoadMode( const EAsyncLoadMode NewMode );
 	bool			ShouldAsyncLoad() const;
@@ -296,7 +296,7 @@ public:
 
 	TMap<FNetworkGUID, int32>	NetGUIDExportCountMap;	// How many times we've exported each NetGUID on this connection. Public for ListNetGUIDExports 
 
-	void HandleUnAssignedObject( const UObject* Obj );
+	void HandleUnAssignedObject( UObject* Obj );
 
 	static void	AddReferencedObjects(UObject* InThis, FReferenceCollector& Collector);
 
@@ -346,11 +346,11 @@ protected:
 	void AppendNetExportGUIDs(FArchive& Archive);
 	void ReceiveNetExportGUIDs(FArchive& Archive);
 
-	bool	ExportNetGUIDForReplay( FNetworkGUID&, const UObject* Object, FString& PathName, UObject* ObjOuter );
-	bool	ExportNetGUID( FNetworkGUID NetGUID, const UObject* Object, FString PathName, UObject* ObjOuter );
+	bool	ExportNetGUIDForReplay( FNetworkGUID&, UObject* Object, FString& PathName, UObject* ObjOuter );
+	bool	ExportNetGUID( FNetworkGUID NetGUID, UObject* Object, FString PathName, UObject* ObjOuter );
 	void	ExportNetGUIDHeader();
 
-	void			InternalWriteObject( FArchive& Ar, FNetworkGUID NetGUID, const UObject* Object, FString ObjectPathName, UObject* ObjectOuter );	
+	void			InternalWriteObject( FArchive& Ar, FNetworkGUID NetGUID, UObject* Object, FString ObjectPathName, UObject* ObjectOuter );	
 	FNetworkGUID	InternalLoadObject( FArchive & Ar, UObject *& Object, int InternalLoadObjectRecursionCount );
 
 	virtual UObject* ResolvePathAndAssignNetGUID( const FNetworkGUID& NetGUID, const FString& PathName ) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/RendererSettings.h b/Engine/Source/Runtime/Engine/Classes/Engine/RendererSettings.h
index bd6cad586580..924d205cf2ed 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/RendererSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/RendererSettings.h
@@ -191,6 +191,12 @@ class ENGINE_API URendererSettings : public UDeveloperSettings
 		ToolTip = "Multi-sample anti-aliasing setting to use on mobile. MSAA is currently supported using Metal on iOS, and on Android devices with the required support using ES 2 or ES 3.1.\nIf MSAA is not available, the current default AA method will be used."))
 	TEnumAsByte<EMobileMSAASampleCount::Type> MobileMSAASampleCount;
 
+	UPROPERTY(config, EditAnywhere, Category = Mobile, meta = (
+		ConsoleVariable = "r.Mobile.UseLegacyShadingModel", DisplayName = "Use legacy shading model",
+		ToolTip = "If true then mobile shaders will use the cheaper but lower quality specular calculation found in versions prior to 4.20.",
+		ConfigRestartRequired = true))
+		uint32 bMobileUseLegacyShadingModel : 1;
+
 	UPROPERTY(config, EditAnywhere, Category = Materials, meta = (
 		ConsoleVariable = "r.DiscardUnusedQuality", DisplayName = "Game Discards Unused Material Quality Levels",
 		ToolTip = "When running in game mode, whether to keep shaders for all quality levels in memory or only those needed for the current quality level.\nUnchecked: Keep all quality levels in memory allowing a runtime quality level change. (default)\nChecked: Discard unused quality levels when loading content for the game, saving some memory."))
@@ -463,6 +469,20 @@ class ENGINE_API URendererSettings : public UDeveloperSettings
 		ToolTip = "When enabled, after changing the material on a Required particle module a Particle Cutout texture will be chosen automatically from the Opacity Mask texture if it exists, if not the Opacity Texture will be used if it exists."))
 	uint32 bDefaultParticleCutouts : 1;
 
+	UPROPERTY(config, EditAnywhere, Category = Optimizations, meta = (
+		ConsoleVariable = "fx.GPUSimulationTextureSizeX",
+		DisplayName = "GPU Particle simulation texture size - X",
+		ToolTip = "The X size of the GPU simulation texture size. SizeX*SizeY determines the maximum number of GPU simulated particles in an emitter. Potentially overridden by CVar settings in BaseDeviceProfile.ini.",
+		ConfigRestartRequired = true))
+	int32 GPUSimulationTextureSizeX;
+	
+	UPROPERTY(config, EditAnywhere, Category = Optimizations, meta = (
+		ConsoleVariable = "fx.GPUSimulationTextureSizeY",
+		DisplayName = "GPU Particle simulation texture size - Y",
+		ToolTip = "The Y size of the GPU simulation texture size. SizeX*SizeY determines the maximum number of GPU simulated particles in an emitter. Potentially overridden by CVar settings in BaseDeviceProfile.ini.",
+		ConfigRestartRequired = true))
+	int32 GPUSimulationTextureSizeY;
+
 	UPROPERTY(config, EditAnywhere, Category = Lighting, meta = (
 		ConsoleVariable = "r.AllowGlobalClipPlane", DisplayName = "Support global clip plane for Planar Reflections",
 		ToolTip = "Whether to support the global clip plane needed for planar reflections.  Enabling this increases BasePass triangle cost by ~15% regardless of whether planar reflections are active. Changing this setting requires restarting the editor.",
@@ -634,8 +654,8 @@ class ENGINE_API URendererSettings : public UDeveloperSettings
 		ConfigRestartRequired = true))
 		uint32 bSupportReversedIndexBuffers : 1;
 
-	UPROPERTY(config, EditAnywhere, Category = Optimizations, meta = (
-		ConsoleVariable = "r.SupportMaterialLayers", DisplayName = "Support new material layering. This also requires the experimental feature 'MaterialLayeringEnabled' to be turned on",
+	UPROPERTY(config, EditAnywhere, Category = Experimental, meta = (
+		ConsoleVariable = "r.SupportMaterialLayers", Tooltip = "Support new material layering system. Disabling it reduces some overhead in place to support the experimental feature",
 		ConfigRestartRequired = true))
 		uint32 bSupportMaterialLayers : 1;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMesh.h b/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMesh.h
index 313f645df6b1..470b4b62334b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMesh.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMesh.h
@@ -152,10 +152,10 @@ struct FSkeletalMeshLODInfo
 	 * sphere of the model. i.e. 0.5 means half the screen's maximum dimension.
 	 */
 	UPROPERTY(EditAnywhere, Category=SkeletalMeshLODInfo)
-	float ScreenSize;
+	FPerPlatformFloat ScreenSize;
 
 	/**	Used to avoid 'flickering' when on LOD boundary. Only taken into account when moving from complex->simple. */
-	UPROPERTY(EditAnywhere, Category=SkeletalMeshLODInfo)
+	UPROPERTY(EditAnywhere, Category=SkeletalMeshLODInfo, meta=(DisplayName="LOD Hysteresis"))
 	float LODHysteresis;
 
 	/** Mapping table from this LOD's materials to the USkeletalMesh materials array. */
@@ -205,6 +205,14 @@ struct FSkeletalMeshLODInfo
 	UPROPERTY(EditAnywhere, AdvancedDisplay, Category = SkeletalMeshLODInfo, meta=(EditCondition="bAllowCPUAccess"))
 	uint32 bSupportUniformlyDistributedSampling : 1;
 
+#if WITH_EDITORONLY_DATA
+	/*
+	 * This boolean specify if the LOD was imported with the base mesh or not.
+	 */
+	UPROPERTY()
+	bool bImportWithBaseMesh;
+#endif
+
 	FSkeletalMeshLODInfo()
 		: ScreenSize(1.0)
 		, LODHysteresis(0.0f)
@@ -213,6 +221,9 @@ struct FSkeletalMeshLODInfo
 		, bHasPerLODVertexColors(false)
 		, bAllowCPUAccess(false)
 		, bSupportUniformlyDistributedSampling(false)
+#if WITH_EDITORONLY_DATA
+		, bImportWithBaseMesh(false)
+#endif
 	{
 	}
 
@@ -287,7 +298,7 @@ struct FClothingAssetData_Legacy
 #if WITH_APEX_CLOTHING
 	nvidia::apex::ClothingAsset* ApexClothingAsset;
 	FClothingAssetData_Legacy()
-		:ApexClothingAsset(NULL)
+		: bClothPropertiesChanged(false), ApexClothingAsset(nullptr)
 	{
 	}
 #endif// #if WITH_APEX_CLOTHING
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMeshLODSettings.h b/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMeshLODSettings.h
index c1628dc8b989..f9e3ef66603a 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMeshLODSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/SkeletalMeshLODSettings.h
@@ -53,8 +53,9 @@ struct FSkeletalMeshLODGroupSettings
 	GENERATED_USTRUCT_BODY()
 
 	FSkeletalMeshLODGroupSettings()
-		: ScreenSize(0.3f),
-		BoneFilterActionOption(EBoneFilterActionOption::Remove) 
+		: ScreenSize(0.3f)
+		, LODHysteresis(0.0f)
+		, BoneFilterActionOption(EBoneFilterActionOption::Remove) 
 	{}
 	
 	/** Get Skeletal mesh optimizations setting structure for the given LOD level */
@@ -75,7 +76,7 @@ struct FSkeletalMeshLODGroupSettings
 
 	/** The screen sizes to use for the respective LOD level */
 	UPROPERTY(EditAnywhere, Category = LODSetting)
-	float ScreenSize;
+	FPerPlatformFloat ScreenSize;
 
 	/**	Used to avoid 'flickering' when on LOD boundary. Only taken into account when moving from complex->simple. */
 	UPROPERTY(EditAnywhere, Category = LODSetting)
@@ -136,10 +137,11 @@ public:
 	* return # of settings that are set. Return N for 0-(N-1).
 	*/
 	ENGINE_API int32 SetLODSettingsFromMesh(USkeletalMesh* InMesh);
-
-#if WITH_EDITOR
+	
 	// BEGIN UObject interface
+#if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
-	// END UObject interface
 #endif// WITH_EDITOR
+	virtual void Serialize(FArchive& Ar) override;
+	// END UObject interface
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/StaticMesh.h b/Engine/Source/Runtime/Engine/Classes/Engine/StaticMesh.h
index 63ceff0dd389..bc370351f33f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/StaticMesh.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/StaticMesh.h
@@ -200,6 +200,16 @@ struct FStaticMeshSourceModel
 	UPROPERTY(EditAnywhere, Category=ReductionSettings)
 	FPerPlatformFloat ScreenSize;
 
+	/** The file path that was used to import this LOD. */
+	UPROPERTY(VisibleAnywhere, Category = StaticMeshSourceModel, AdvancedDisplay)
+	FString SourceImportFilename;
+
+#if WITH_EDITORONLY_DATA
+	/** Weather this LOD was imported in the same file as the base mesh. */
+	UPROPERTY()
+	bool bImportWithBaseMesh;
+#endif
+
 	/** Default constructor. */
 	ENGINE_API FStaticMeshSourceModel();
 
@@ -732,6 +742,7 @@ public:
 	ENGINE_API virtual void Serialize(FArchive& Ar) override;
 	ENGINE_API virtual void PostInitProperties() override;
 	ENGINE_API virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	ENGINE_API virtual void BeginDestroy() override;
 	ENGINE_API virtual bool IsReadyForFinishDestroy() override;
 	ENGINE_API virtual void GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) const override;
@@ -796,7 +807,7 @@ public:
 	/**
 	 * Returns true if the mesh has data that can be rendered.
 	 */
-	ENGINE_API bool HasValidRenderData() const;
+	ENGINE_API bool HasValidRenderData(bool bCheckLODForVerts = true, int32 LODIndex = INDEX_NONE) const;
 
 	/**
 	 * Returns the number of bounds of the mesh.
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/StreamableManager.h b/Engine/Source/Runtime/Engine/Classes/Engine/StreamableManager.h
index e92878fb1946..c18c0a461fe1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/StreamableManager.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/StreamableManager.h
@@ -328,6 +328,7 @@ private:
 	void RemoveReferencedAsset(const FSoftObjectPath& Target, TSharedRef<FStreamableHandle> Handle);
 	void StartHandleRequests(TSharedRef<FStreamableHandle> Handle);
 	void FindInMemory(FSoftObjectPath& InOutTarget, struct FStreamable* Existing);
+	FSoftObjectPath HandleLoadedRedirector(UObjectRedirector* LoadedRedirector, FSoftObjectPath RequestedPath, struct FStreamable* RequestedStreamable);
 	struct FStreamable* FindStreamable(const FSoftObjectPath& Target) const;
 	struct FStreamable* StreamInternal(const FSoftObjectPath& Target, TAsyncLoadPriority Priority, TSharedRef<FStreamableHandle> Handle);
 	UObject* GetStreamed(const FSoftObjectPath& Target) const;
@@ -350,6 +351,7 @@ private:
 		UObjectRedirector* LoadedRedirector;
 
 		FRedirectedPath() : LoadedRedirector(nullptr) {}
+		FRedirectedPath(const FSoftObjectPath& InNewPath, UObjectRedirector* InLoadedRedirector) : NewPath(InNewPath),LoadedRedirector(InLoadedRedirector) {}
 	};
 	typedef TMap<FSoftObjectPath, FRedirectedPath> TStreamableRedirects;
 	TStreamableRedirects StreamableRedirects;
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Texture.h b/Engine/Source/Runtime/Engine/Classes/Engine/Texture.h
index 6e2ecf925c39..c765f3b3a09c 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Texture.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Texture.h
@@ -757,7 +757,7 @@ public:
 #if WITH_EDITORONLY_DATA
 	ENGINE_API virtual void GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) const override;
 #endif
-	ENGINE_API virtual bool IsPostLoadThreadSafe() const override{ return false; }
+	ENGINE_API virtual bool IsPostLoadThreadSafe() const override;
 	//~ End UObject Interface.
 
 	/**
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Texture2D.h b/Engine/Source/Runtime/Engine/Classes/Engine/Texture2D.h
index 59c1c2be7be1..eec25fa94a07 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Texture2D.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Texture2D.h
@@ -195,6 +195,22 @@ public:
 		}
 		return 0;
 	}
+
+	int32 CalcNumOptionalMips() const;
+
+	FORCEINLINE bool GetMipDataFilename(const int32 MipIndex, const FString*& BulkDataFilename)
+	{
+		if (PlatformData)
+		{
+			if ( MipIndex < PlatformData->Mips.Num() && MipIndex >= 0)
+			{
+				BulkDataFilename = &PlatformData->Mips[MipIndex].BulkData.GetFilename();
+				return true;
+			}
+		}
+		return false;
+	}
+
 	FORCEINLINE EPixelFormat GetPixelFormat() const
 	{
 		if (PlatformData)
@@ -324,7 +340,11 @@ public:
 	 *
 	 * @return true if initialized and ready for streaming, false otherwise
 	 */
-	ENGINE_API bool IsReadyForStreaming() const;
+	bool FORCEINLINE IsReadyForStreaming() const
+	{
+		FTexture2DResource* Texture2DResource = (FTexture2DResource*)Resource;
+		return Texture2DResource && Texture2DResource->bReadyForStreaming;
+	}
 
 	/**
 	 * Waits until all streaming requests for this texture has been fully processed.
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/Texture2DDynamic.h b/Engine/Source/Runtime/Engine/Classes/Engine/Texture2DDynamic.h
index 3fbacac03eb8..630de9e40c6b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/Texture2DDynamic.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/Texture2DDynamic.h
@@ -10,6 +10,24 @@
 
 class FTextureResource;
 
+// Helper to set properties on the UTexture2DDynamic so it doesn't need to be reinitialized.
+struct FTexture2DDynamicCreateInfo
+{
+	FTexture2DDynamicCreateInfo(EPixelFormat InFormat = PF_B8G8R8A8, bool InIsResolveTarget = false, bool InSRGB = true, TextureFilter InFilter = TF_Default, ESamplerAddressMode InSamplerAddressMode = AM_Wrap)
+	:	Format(InFormat)
+	,	bIsResolveTarget(InIsResolveTarget)
+	,	bSRGB(InSRGB)
+	,	Filter(InFilter)
+	,	SamplerAddressMode(InSamplerAddressMode)
+	{}
+
+	EPixelFormat Format;
+	bool bIsResolveTarget;
+	bool bSRGB;
+	TextureFilter Filter;
+	ESamplerAddressMode SamplerAddressMode;
+};
+
 UCLASS(hidecategories=Object, MinimalAPI)
 class UTexture2DDynamic : public UTexture
 {
@@ -31,8 +49,9 @@ class UTexture2DDynamic : public UTexture
 	/** The number of mip-maps in the texture. */
 	int32 NumMips;
 
-
-
+	/** The sampler default address mode for this texture. */
+	ESamplerAddressMode SamplerAddressMode;
+	
 public:
 	//~ Begin UTexture Interface.
 	ENGINE_API virtual FTextureResource* CreateResource() override;
@@ -50,7 +69,13 @@ public:
 	 * @param InIsResolveTarget	- Whether the texture can be used as a resolve target
 	 */
 	ENGINE_API void Init(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat = PF_B8G8R8A8, bool InIsResolveTarget = false);
-	
+
+	DEPRECATED(4.20, "Please use UTexture2DDynamic::Create() with FTexture2DDynamicCreateInfo initialization")
+	ENGINE_API static UTexture2DDynamic* Create(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat);
+
+	DEPRECATED(4.20, "Please use UTexture2DDynamic::Create() with FTexture2DDynamicCreateInfo initialization")
+	ENGINE_API static UTexture2DDynamic* Create(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat, bool InIsResolveTarget);
+
 	/** Creates and initializes a new Texture2DDynamic with the requested settings */
-	ENGINE_API static UTexture2DDynamic* Create(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat = PF_B8G8R8A8, bool InIsResolveTarget = false);
+	ENGINE_API static UTexture2DDynamic* Create(int32 InSizeX, int32 InSizeY, const FTexture2DDynamicCreateInfo& InCreateInfo = FTexture2DDynamicCreateInfo());
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/TextureLODSettings.h b/Engine/Source/Runtime/Engine/Classes/Engine/TextureLODSettings.h
index c74b8a53c22a..af9432718ad2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/TextureLODSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/TextureLODSettings.h
@@ -17,7 +17,8 @@ struct ENGINE_API FTextureLODGroup
 	GENERATED_USTRUCT_BODY()
 
 	FTextureLODGroup()
-		: MinLODMipCount(0)
+		: Group(TEXTUREGROUP_World)
+		, MinLODMipCount(0)
 		, MaxLODMipCount(12)
 		, LODBias(0)
 		, LODBias_Smaller(-1)
@@ -28,6 +29,9 @@ struct ENGINE_API FTextureLODGroup
 		, MaxLODSize(4096)
 		, MaxLODSize_Smaller(-1)
 		, MaxLODSize_Smallest(-1)
+		, OptionalLODBias(0)
+		, OptionalMaxLODSize(4096)
+		, OptionalMaxLODMipCount(12)
 		, MinMagFilter(NAME_Aniso)
 		, MipFilter(NAME_Point)
 	{
@@ -77,6 +81,16 @@ struct ENGINE_API FTextureLODGroup
 	UPROPERTY()
 	int32 MaxLODSize_Smallest;
 
+	/** If this is greater then 0 will put that number of mips into an optional bulkdata package */
+	UPROPERTY()
+	int32 OptionalLODBias;
+
+	/** Put all the mips which have a width / height larger then OptionalLODSize into an optional bulkdata package */
+	UPROPERTY()
+	int32 OptionalMaxLODSize;
+
+	int32 OptionalMaxLODMipCount;
+
 	UPROPERTY()
 	FName MinMagFilter;
 
@@ -120,6 +134,14 @@ public:
 	 */
 	int32 CalculateLODBias( int32 Width, int32 Height, int32 MaxSize, int32 LODGroup, int32 LODBias, int32 NumCinematicMipLevels, TextureMipGenSettings MipGenSetting ) const;
 
+	/**
+	 * Calculate num optional mips
+	 *
+	 * @param	LODGroup					Which LOD group the texture belongs to
+	 * @param	MipGenSetting				Mip generation setting
+	 * @return	Num optional mips counted from higest mip
+	 */
+	int32 CalculateNumOptionalMips(int32 LODGroup, const int32 Width, const int32 Height, const int32 NumMips, const int32 MinMipToInline, TextureMipGenSettings InMipGenSetting) const;
 
 #if WITH_EDITORONLY_DATA
 	void GetMipGenSettings( const UTexture& Texture, TextureMipGenSettings& OutMipGenSettings, float& OutSharpen, uint32& OutKernelSize, bool& bOutDownsampleWithAverage, bool& bOutSharpenWithoutColorShift, bool &bOutBorderColorBlack ) const;
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/TextureRenderTarget2D.h b/Engine/Source/Runtime/Engine/Classes/Engine/TextureRenderTarget2D.h
index 09ed142de994..b5403ef6c6c2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/TextureRenderTarget2D.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/TextureRenderTarget2D.h
@@ -134,6 +134,9 @@ class UTextureRenderTarget2D : public UTextureRenderTarget
 	/** Initializes the render target, the format will be derived from the value of bHDR. */
 	ENGINE_API void InitAutoFormat(uint32 InSizeX, uint32 InSizeY);
 
+	/** Resizes the render target without recreating the FTextureResource.  Will not flush commands unless the render target resource doesnt exist */
+	ENGINE_API void ResizeTarget(uint32 InSizeX, uint32 InSizeY);
+
 	/**
 	 * Utility for creating a new UTexture2D from a TextureRenderTarget2D
 	 * TextureRenderTarget2D must be square and a power of two size.
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/TextureStreamingTypes.h b/Engine/Source/Runtime/Engine/Classes/Engine/TextureStreamingTypes.h
index 8c12c6e4b125..510e5e48efd4 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/TextureStreamingTypes.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/TextureStreamingTypes.h
@@ -260,6 +260,7 @@ ENGINE_API uint32 PackRelativeBox(const FBox& RefBox, const FBox& Box);
 ENGINE_API void UnpackRelativeBox(const FBoxSphereBounds& InRefBounds, uint32 InPackedRelBox, FBoxSphereBounds& OutBounds);
 
 extern ENGINE_API TAutoConsoleVariable<int32> CVarStreamingUseNewMetrics;
+extern ENGINE_API TAutoConsoleVariable<int32> CVarFramesForFullUpdate;
 
 /** Reset the history of the value returned by GetAverageRequiredTexturePoolSize() */
 ENGINE_API void ResetAverageRequiredTexturePoolSize();
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/UserInterfaceSettings.h b/Engine/Source/Runtime/Engine/Classes/Engine/UserInterfaceSettings.h
index d22ec832729d..82299d127ac1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/UserInterfaceSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/UserInterfaceSettings.h
@@ -189,7 +189,13 @@ public:
 	/** Gets the current scale of the UI based on the size of a viewport */
 	float GetDPIScaleBasedOnSize(FIntPoint Size) const;
 
+#if WITH_EDITOR
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
+#endif
+
 private:
+	float CalculateScale(FIntPoint Size, bool& bError) const;
+
 	UPROPERTY(Transient)
 	TArray<UObject*> CursorClasses;
 
@@ -198,4 +204,7 @@ private:
 
 	UPROPERTY(Transient)
 	mutable UDPICustomScalingRule* CustomScalingRule;
+
+	mutable TOptional<FIntPoint> LastViewportSize;
+	mutable float CalculatedScale;
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Engine/World.h b/Engine/Source/Runtime/Engine/Classes/Engine/World.h
index 2f47419bd224..a52386d40bc1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Engine/World.h
+++ b/Engine/Source/Runtime/Engine/Classes/Engine/World.h
@@ -23,6 +23,7 @@
 #include "Engine/PendingNetGame.h"
 #include "Engine/LatentActionManager.h"
 #include "Engine/GameInstance.h"
+#include "Particles/WorldPSCPool.h"
 
 #include "World.generated.h"
 
@@ -74,7 +75,7 @@ typedef TArray<TWeakObjectPtr<APhysicsVolume> >::TConstIterator FConstPhysicsVol
 DECLARE_LOG_CATEGORY_EXTERN(LogSpawn, Warning, All);
 
 DECLARE_MULTICAST_DELEGATE_OneParam(FOnActorSpawned, AActor*);
-
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnFeatureLevelChanged, ERHIFeatureLevel::Type);
 
 /** Proxy class that allows verification on GWorld accesses. */
 class UWorldProxy
@@ -858,16 +859,16 @@ public:
 	FString										StreamingLevelsPrefix;
 
 private:
-	/** Pointer to the current level in the queue to be made visible, NULL if none are pending.					*/
+	/** Pointer to the current level in the queue to be made visible, NULL if none are pending. */
 	UPROPERTY(Transient)
 	class ULevel*								CurrentLevelPendingVisibility;
 
-	/** Pointer to the current level in the queue to be made invisible, NULL if none are pending.					*/
+	/** Pointer to the current level in the queue to be made invisible, NULL if none are pending. */
 	UPROPERTY(Transient)
 	class ULevel*								CurrentLevelPendingInvisibility;
 
 public:
-	/** Fake NetDriver for capturing network traffic to record demos															*/
+	/** Fake NetDriver for capturing network traffic to record demos */
 	UPROPERTY()
 	class UDemoNetDriver*						DemoNetDriver;
 
@@ -937,6 +938,10 @@ public:
 	struct FHierarchicalLODBuilder*						HierarchicalLODBuilder;
 #endif // WITH_EDITOR
 
+	/** Called from DemoNetDriver when playing back a replay and the timeline is successfully scrubbed */
+	UFUNCTION()
+	void HandleTimelineScrubbed();
+
 private:
 
 	/** Pointer to the current level being edited. Level has to be in the Levels array and == PersistentLevel in the game.		*/
@@ -1135,6 +1140,10 @@ private:
 
 	/** Disables the broadcasting of level selection change. Internal use only. */
 	uint32 bBroadcastSelectionChange:1;
+
+	/** a delegate that broadcasts a notification whenever the current feautre level is changed */
+	FOnFeatureLevelChanged OnFeatureLevelChanged;
+
 #endif //WITH_EDITORONLY_DATA
 public:
 	/** The URL that was used when loading this World.																			*/
@@ -1947,7 +1956,7 @@ public:
 	FORCEINLINE UAISystemBase* GetAISystem() { return AISystem; }
 	/** AISystem const getter */
 	FORCEINLINE const UAISystemBase* GetAISystem() const { return AISystem; }
-
+	
 	/** Avoidance manager getter */
 	FORCEINLINE class UAvoidanceManager* GetAvoidanceManager() { return AvoidanceManager; }
 	/** Avoidance manager getter */
@@ -2584,6 +2593,12 @@ public:
 
 	/** Shrink level elements to their minimum size. */
 	void ShrinkLevel();
+
+	/** Add a listener for OnFeatureLevelChanged events */
+	FDelegateHandle AddOnFeatureLevelChangedHandler(const FOnFeatureLevelChanged::FDelegate& InHandler);
+
+	/** Remove a listener for OnFeatureLevelChanged events */
+	void RemoveOnFeatureLevelChangedHandler(FDelegateHandle InHandle);
 #endif // WITH_EDITOR
 	
 	/**
@@ -2912,10 +2927,10 @@ public:
 	APlayerController* SpawnPlayActor(class UPlayer* Player, ENetRole RemoteRole, const FURL& InURL, const FUniqueNetIdRepl& UniqueId, FString& Error, uint8 InNetPlayerIndex = 0);
 	
 	/** Try to find an acceptable position to place TestActor as close to possible to PlaceLocation.  Expects PlaceLocation to be a valid location inside the level. */
-	bool FindTeleportSpot( AActor* TestActor, FVector& PlaceLocation, FRotator PlaceRotation );
+	bool FindTeleportSpot( const AActor* TestActor, FVector& PlaceLocation, FRotator PlaceRotation );
 
 	/** @Return true if Actor would encroach at TestLocation on something that blocks it.  Returns a ProposedAdjustment that might result in an unblocked TestLocation. */
-	bool EncroachingBlockingGeometry( AActor* TestActor, FVector TestLocation, FRotator TestRotation, FVector* ProposedAdjustment = NULL );
+	bool EncroachingBlockingGeometry( const AActor* TestActor, FVector TestLocation, FRotator TestRotation, FVector* ProposedAdjustment = NULL );
 
 	/** Begin physics simulation */ 
 	void StartPhysicsSim();
@@ -3294,6 +3309,15 @@ public:
 
 	/** If the specified package contains a redirector to a UWorld, that UWorld is returned. Otherwise, nullptr is returned. */
 	static UWorld* FollowWorldRedirectorInPackage(UPackage* Package, UObjectRedirector** OptionalOutRedirector = nullptr);
+
+	FORCEINLINE FWorldPSCPool& GetPSCPool() { return PSCPool; }
+
+	private:
+
+	UPROPERTY()
+	FWorldPSCPool PSCPool;
+
+	//PSC Pooling END
 };
 
 /** Global UWorld pointer. Use of this pointer should be avoided whenever possible. */
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/Actor.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/Actor.h
index ac74234e289e..ba206a443cd4 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/Actor.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/Actor.h
@@ -281,6 +281,9 @@ protected:
 	UPROPERTY()
 	uint8 bAllowReceiveTickEventOnDedicatedServer:1;
 
+	/** Flag indicating we have checked initial simulating physics state to sync networked proxies to the server. */
+	uint8 bNetCheckedInitialPhysicsState : 1;
+
 private:
 	/** Whether FinishSpawning has been called for this Actor.  If it has not, the Actor is in a malformed state */
 	uint8 bHasFinishedSpawning:1;
@@ -335,10 +338,6 @@ private:
 
 public:
 
-	// ORION TODO - was moved to private. Add accessor?
-	/** Flag indicating we have checked initial simulating physics state to sync networked proxies to the server. */
-	uint8 bNetCheckedInitialPhysicsState : 1;
-
 	/**
 	 * Set whether this actor replicates to network clients. When this actor is spawned on the server it will be sent to clients as well.
 	 * Properties flagged for replication will update on clients if they change on the server.
@@ -362,6 +361,10 @@ public:
 	/** Copies RemoteRole from another Actor and adds this actor to the list of network actors if necessary. */
 	void CopyRemoteRoleFrom(const AActor* CopyFromActor);
 
+	/** Returns how much control the local machine has over this actor. */
+	UFUNCTION(BlueprintCallable, Category=Replication)
+	ENetRole GetLocalRole() const;
+
 	/** Returns how much control the remote machine has over this actor. */
 	UFUNCTION(BlueprintCallable, Category=Replication)
 	ENetRole GetRemoteRole() const;
@@ -1655,6 +1658,9 @@ public:
 	 */
 	virtual bool IsLevelBoundsRelevant() const { return true; }
 
+	/** Set LOD Parent Primitive*/
+	void SetLODParent(class UPrimitiveComponent* InLODParent, float InParentDrawDistance);
+
 #if WITH_EDITOR
 	// Editor specific
 
@@ -1680,10 +1686,7 @@ public:
 	virtual void EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown);
 
 	/** Called by MirrorActors to perform a mirroring operation on the actor */
-	virtual void EditorApplyMirror(const FVector& MirrorScale, const FVector& PivotLocation);
-
-	/** Set LOD Parent Primitive*/
-	void SetLODParent(class UPrimitiveComponent* InLODParent, float InParentDrawDistance);
+	virtual void EditorApplyMirror(const FVector& MirrorScale, const FVector& PivotLocation);	
 
 	/**
 	 * Simple accessor to check if the actor is hidden upon editor startup
@@ -3173,6 +3176,11 @@ FORCEINLINE_DEBUGGABLE const AActor* AActor::GetNetOwner() const
 	return Owner;
 }
 
+FORCEINLINE_DEBUGGABLE ENetRole AActor::GetLocalRole() const
+{
+	return Role;
+}
+
 FORCEINLINE_DEBUGGABLE ENetRole AActor::GetRemoteRole() const
 {
 	return RemoteRole;
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/Character.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/Character.h
index 6f4f91f14d9b..f587eaf5c8bf 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/Character.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/Character.h
@@ -426,6 +426,10 @@ public:
 	UPROPERTY(BlueprintReadOnly, replicatedUsing=OnRep_IsCrouched, Category=Character)
 	uint32 bIsCrouched:1;
 
+	/** Set to indicate that this Character is currently under the force of a jump (if JumpMaxHoldTime is non-zero). IsJumpProvidingForce() handles this as well. */
+	UPROPERTY(Transient, Replicated)
+	uint32 bProxyIsJumpForceApplied : 1;
+
 	/** Handle Crouching replicated from server */
 	UFUNCTION()
 	virtual void OnRep_IsCrouched();
@@ -472,6 +476,16 @@ public:
 	UPROPERTY(Transient, BlueprintReadOnly, VisibleInstanceOnly, Category=Character)
 	float JumpKeyHoldTime;
 
+	/**
+	 * Amount of jump force time remaining, if JumpMaxHoldTime > 0.
+	 */
+	UPROPERTY(Transient, BlueprintReadOnly, VisibleInstanceOnly, Category=Character)
+	float JumpForceTimeRemaining;
+
+	/** Track last time a jump force started for a proxy. */
+	UPROPERTY(Transient, BlueprintReadOnly, VisibleInstanceOnly, Category=Character)
+	float ProxyJumpForceStartedTime;
+
 	/** 
 	 * The max time the jump key can be held.
 	 * Note that if StopJumping() is not called before the max jump hold time is reached,
@@ -794,8 +808,8 @@ public:
 	/** Trigger jump if jump button has been pressed. */
 	virtual void CheckJumpInput(float DeltaTime);
 
-	/** Reset jump input state after having checked input. */
-	virtual void ClearJumpInput();
+	/** Update jump input state after having checked input. */
+	virtual void ClearJumpInput(float DeltaTime);
 
 	/**
 	 * Get the maximum jump time for the character.
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/CharacterMovementComponent.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/CharacterMovementComponent.h
index 04d1eb167da4..4a9ad9a9753b 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/CharacterMovementComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/CharacterMovementComponent.h
@@ -1418,10 +1418,10 @@ public:
 	virtual void ClearAccumulatedForces();
 
 	/** Update the character state in PerformMovement right before doing the actual position change */
-	virtual void UpdateCharacterStateBeforeMovement();
+	virtual void UpdateCharacterStateBeforeMovement(float DeltaSeconds);
 
 	/** Update the character state in PerformMovement after the position change. Some rotation updates happen after this. */
-	virtual void UpdateCharacterStateAfterMovement();
+	virtual void UpdateCharacterStateAfterMovement(float DeltaSeconds);
 
 	/** 
 	 * Handle start swimming functionality
@@ -2352,6 +2352,12 @@ public:
 
 	virtual void FlushServerMoves();
 
+	/** 
+	 * When moving the character, we should inform physics as to whether we are teleporting.
+	 * This allows physics to avoid injecting forces into simulations from client corrections (etc.)
+	 */
+	ETeleportType GetTeleportType() const;
+
 protected:
 
 	/** called in Tick to update data in RVO avoidance manager */
@@ -2421,6 +2427,8 @@ public:
 	FSavedMove_Character();
 	virtual ~FSavedMove_Character();
 
+	ACharacter* CharacterOwner;
+
 	uint32 bPressedJump:1;
 	uint32 bWantsToCrouch:1;
 	uint32 bForceMaxAccel:1;
@@ -2431,15 +2439,21 @@ public:
 	/** If true this move is using an old TimeStamp, before a reset occurred. */
 	uint32 bOldTimeStampBeforeReset:1;
 
+	uint32 bWasJumping:1;
+
 	float TimeStamp;    // Time of this move.
 	float DeltaTime;    // amount of time for this move
 	float CustomTimeDilation;
 	float JumpKeyHoldTime;
+	float JumpForceTimeRemaining;
 	int32 JumpMaxCount;
 	int32 JumpCurrentCount;
-	uint8 MovementMode;	// packed movement mode
+	
+	DEPRECATED_FORGAME(4.20, "This property is deprecated, use StartPackedMovementMode or EndPackedMovementMode instead.")
+	uint8 MovementMode;
 
 	// Information at the start of the move
+	uint8 StartPackedMovementMode;
 	FVector StartLocation;
 	FVector StartRelativeLocation;
 	FVector StartVelocity;
@@ -2455,6 +2469,7 @@ public:
 	uint32 StartComponentOverlapCounter;
 
 	// Information after the move has been performed
+	uint8 EndPackedMovementMode;
 	FVector SavedLocation;
 	FRotator SavedRotation;
 	FVector SavedVelocity;
@@ -2466,6 +2481,7 @@ public:
 	uint32 EndComponentOverlapCounter;
 
 	FVector Acceleration;
+	float MaxSpeed;
 
 	// Cached to speed up iteration over IsImportantMove().
 	FVector AccelNormal;
@@ -2483,6 +2499,8 @@ public:
 	float AccelMagThreshold;	
 	/** Threshold for deciding if we can combine two moves, true if cosine of angle between them is <= this. */
 	float AccelDotThresholdCombine;
+	/** Client saved moves will not combine if the result of GetMaxSpeed() differs by this much between moves. */
+	float MaxSpeedThresholdCombine;
 	
 	/** Clear saved move properties, so it can be re-used. */
 	virtual void Clear();
@@ -2509,7 +2527,10 @@ public:
 	virtual void PostUpdate(ACharacter* C, EPostUpdateMode PostUpdateMode);
 	
 	/** @Return true if this move can be combined with NewMove for replication without changing any behavior */
-	virtual bool CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* InPawn, float MaxDelta) const;
+	virtual bool CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* InCharacter, float MaxDelta) const;
+
+	/** Combine this move with an older move and update relevant state. */
+	virtual void CombineWith(const FSavedMove_Character* OldMove, ACharacter* InCharacter, APlayerController* PC, const FVector& OldStartLocation);
 	
 	/** Called before ClientUpdatePosition uses this SavedMove to make a predictive correction	 */
 	virtual void PrepMoveFor(ACharacter* C);
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/DefaultPawn.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/DefaultPawn.h
index b47893247d85..1ad3b7f087fe 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/DefaultPawn.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/DefaultPawn.h
@@ -61,14 +61,14 @@ class ENGINE_API ADefaultPawn : public APawn
 	 * @param Rate	This is a normalized rate, i.e. 1.0 means 100% of desired turn rate
 	 */
 	UFUNCTION(BlueprintCallable, Category="Pawn")
-	void TurnAtRate(float Rate);
+	virtual void TurnAtRate(float Rate);
 
 	/**
 	* Called via input to look up at a given rate (or down if Rate is negative).
 	* @param Rate	This is a normalized rate, i.e. 1.0 means 100% of desired turn rate
 	*/
 	UFUNCTION(BlueprintCallable, Category="Pawn")
-	void LookUpAtRate(float Rate);
+	virtual void LookUpAtRate(float Rate);
 	
 	/** Base turn rate, in deg/sec. Other scaling may affect final turn rate. */
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Pawn")
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/GameStateBase.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/GameStateBase.h
index 4898b50c0704..be479c6f2464 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/GameStateBase.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/GameStateBase.h
@@ -30,6 +30,8 @@ class ENGINE_API AGameStateBase : public AInfo
 {
 	GENERATED_UCLASS_BODY()
 
+public:
+
 	//~=============================================================================
 	// General accessors and variables
 
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/GameUserSettings.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/GameUserSettings.h
index c6230f36d5a2..6c83af8d3e92 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/GameUserSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/GameUserSettings.h
@@ -41,6 +41,9 @@ class ENGINE_API UGameUserSettings : public UObject
 
 public:
 
+	/** @return the location where GGameUserSettingsIni will be found */
+	static FString GetConfigDir();
+
 	/** Applies all current user settings to the game and saves to permanent storage (e.g. file), optionally checking for command line overrides. */
 	UFUNCTION(BlueprintCallable, Category=Settings, meta=(bCheckForCommandLineOverrides=true))
 	virtual void ApplySettings(bool bCheckForCommandLineOverrides);
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/InputSettings.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/InputSettings.h
index 37dc91ed176e..bd8addf063e7 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/InputSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/InputSettings.h
@@ -33,7 +33,7 @@ class ENGINE_API UInputSettings
 	uint8 bF11TogglesFullscreen : 1;
 
 	// Allow mouse to be used for touch
-	UPROPERTY(config, EditAnywhere, Category="MouseProperties")
+	UPROPERTY(config, EditAnywhere, Category="MouseProperties", AdvancedDisplay)
 	uint8 bUseMouseForTouch:1;
 
 	// Mouse smoothing control
@@ -64,6 +64,29 @@ class ENGINE_API UInputSettings
 	UPROPERTY(config, EditAnywhere, Category = "Mobile")
 	uint8 bEnableGestureRecognizer:1;
 
+	/** If enabled, virtual keyboards will have autocorrect enabled. Currently only supported on mobile devices. */
+	UPROPERTY(config, EditAnywhere, Category = "Virtual Keyboard (Mobile)")
+	bool bUseAutocorrect;
+
+	/** 
+	 * Disables autocorrect for these operating systems, even if autocorrect is enabled. Use the format "[platform] [osversion]"
+	 * (e.g., "iOS 11.2" or "Android 6"). More specific versions will disable autocorrect for fewer devices ("iOS 11" will disable
+	 * autocorrect for all devices running iOS 11, but "iOS 11.2.2" will not disable autocorrect for devices running 11.2.1).
+	 */
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = "Virtual Keyboard (Mobile)")
+	TArray<FString> ExcludedAutocorrectOS;
+
+	/** Disables autocorrect for these cultures, even if autocorrect is turned on. These should be ISO-compliant language and country codes, such as "en" or "en-US". */
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = "Virtual Keyboard (Mobile)")
+	TArray<FString> ExcludedAutocorrectCultures;
+
+	/** 
+	 * Disables autocorrect for these device models, even if autocorrect is turned in. Model IDs listed here will match against the start of the device's
+	 * model (e.g., "SM-" will match all device model IDs that start with "SM-"). This is currently only supported on Android devices.
+	 */
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = "Virtual Keyboard (Mobile)")
+	TArray<FString> ExcludedAutocorrectDeviceModels;
+
 	/** The default mouse capture mode for the game viewport */
 	UPROPERTY(config, EditAnywhere, Category = "ViewportProperties")
 	EMouseCaptureMode DefaultViewportMouseCaptureMode;
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/OnlineReplStructs.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/OnlineReplStructs.h
index aa17c88ddd3e..1ecf3db1b3fb 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/OnlineReplStructs.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/OnlineReplStructs.h
@@ -39,6 +39,11 @@ struct FUniqueNetIdRepl : public FUniqueNetIdWrapper
 	{
 	}
 
+	FUniqueNetIdRepl(const FUniqueNetId& InUniqueNetId)
+		: FUniqueNetIdWrapper(InUniqueNetId)
+	{
+	}
+
 	FUniqueNetIdRepl(const TSharedRef<const FUniqueNetId>& InUniqueNetId)
 		: FUniqueNetIdWrapper(InUniqueNetId)
 	{
@@ -73,13 +78,13 @@ struct FUniqueNetIdRepl : public FUniqueNetIdWrapper
 	bool Serialize(FArchive& Ar);
 	
 	/** Convert this unique id to a json value */
-	TSharedRef<FJsonValue> ToJson() const;
+	ENGINE_API TSharedRef<FJsonValue> ToJson() const;
 	/** Create a unique id from a json string */
 	ENGINE_API void FromJson(const FString& InValue);
 
 	/**
-	* For FUniqueNetIdRepl objects, we use the same hashing function as any other wrapper.
-	*/
+	 * For FUniqueNetIdRepl objects, we use the same hashing function as any other wrapper.
+	 */
 	friend inline uint32 GetTypeHash(FUniqueNetIdRepl const& Value)
 	{
 		if (Value.IsValid())
@@ -95,8 +100,8 @@ struct FUniqueNetIdRepl : public FUniqueNetIdWrapper
 
 protected:
 
-	/** Helper to create an FUniqueNetId from a string */
-	void UniqueIdFromString(const FString& Contents);
+	/** Helper to create an FUniqueNetId from a string and its type */
+	void UniqueIdFromString(FName Type, const FString& Contents);
 	/** Helper to make network serializable representation */
 	void MakeReplicationData();
 	/** Network serialized data cache */
@@ -104,8 +109,6 @@ protected:
 	TArray<uint8> ReplicationBytes;
 };
 
-//static ENGINE_API uint32 GetTypeHash(FUniqueNetIdRepl const& Value);
-
 /** Specify type trait support for various low level UPROPERTY overrides */
 template<>
 struct TStructOpsTypeTraits<FUniqueNetIdRepl> : public TStructOpsTypeTraitsBase2<FUniqueNetIdRepl>
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/Pawn.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/Pawn.h
index 0f5c05c6c14f..1df4516f22bb 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/Pawn.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/Pawn.h
@@ -129,6 +129,9 @@ public:
 	UPROPERTY(replicated)
 	uint8 RemoteViewPitch;
 
+	/** Playback of replays writes blended pitch to this, rather than the RemoteViewPitch. This is to avoid having to compress and interpolated value. */
+	float BlendedReplayViewPitch;
+
 	/** Controller of the last Actor that caused us damage. */
 	UPROPERTY(BlueprintReadOnly, transient, Category="Pawn")
 	AController* LastHitBy;
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerController.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerController.h
index 29546cb45adc..a60a415c3190 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerController.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerController.h
@@ -1450,7 +1450,13 @@ public:
 	virtual bool InputKey(FKey Key, EInputEvent EventType, float AmountDepressed, bool bGamepad);
 
 	/** Handles a touch screen action */
-	virtual bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex);
+	virtual bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex);
+
+	DEPRECATED(4.20, "InputTouch now takes a Force")
+	bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
+	{
+		return InputTouch(Handle, Type, TouchLocation, 1.0f, DeviceTimestamp, TouchpadIndex);
+	}
 
 	/** Handles a controller axis input */
 	virtual bool InputAxis(FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad);
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerInput.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerInput.h
index 3ce5b24f6391..a117b76d6622 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerInput.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/PlayerInput.h
@@ -75,6 +75,15 @@ struct FKeyBind
 	uint8 bDisabled : 1;
 
 	FKeyBind()
+		: Control(false)
+		, Shift(false)
+		, Alt(false)
+		, Cmd(false)
+		, bIgnoreCtrl(false)
+		, bIgnoreShift(false)
+		, bIgnoreAlt(false)
+		, bIgnoreCmd(false)
+		, bDisabled(false)
 	{
 	}
 };
@@ -421,7 +430,13 @@ public:
 	bool InputAxis(FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad);
 
 	/** Handles a touch input event.  Returns true. */
-	bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex);
+	bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex);
+
+	DEPRECATED(4.20, "InputTouch now takes a Force")
+	bool InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
+	{
+		return InputTouch(Handle, Type, TouchLocation, 1.0f, DeviceTimestamp, TouchpadIndex);
+	}
 
 	/** Handles a motion input event.  Returns true. */
 	bool InputMotion(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration);
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/ProjectileMovementComponent.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/ProjectileMovementComponent.h
index e2882865d217..c5d652fcb015 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/ProjectileMovementComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/ProjectileMovementComponent.h
@@ -202,7 +202,7 @@ class ENGINE_API UProjectileMovementComponent : public UMovementComponent
 
 	/**
 	 * Max time delta for each discrete simulation step.
-	 * Lowering this value can address issues with fast-moving objects or complex collision scenarios, at the cost of performance.
+	 * Lowering this value can address precision issues with fast-moving objects or complex collision scenarios, at the cost of performance.
 	 *
 	 * WARNING: if (MaxSimulationTimeStep * MaxSimulationIterations) is too low for the min framerate, the last simulation step may exceed MaxSimulationTimeStep to complete the simulation.
 	 * @see MaxSimulationIterations, bForceSubStepping
@@ -212,7 +212,7 @@ class ENGINE_API UProjectileMovementComponent : public UMovementComponent
 
 	/**
 	 * Max number of iterations used for each discrete simulation step.
-	 * Increasing this value can address issues with fast-moving objects or complex collision scenarios, at the cost of performance.
+	 * Increasing this value can address precision issues with fast-moving objects or complex collision scenarios, at the cost of performance.
 	 *
 	 * WARNING: if (MaxSimulationTimeStep * MaxSimulationIterations) is too low for the min framerate, the last simulation step may exceed MaxSimulationTimeStep to complete the simulation.
 	 * @see MaxSimulationTimeStep, bForceSubStepping
@@ -220,6 +220,12 @@ class ENGINE_API UProjectileMovementComponent : public UMovementComponent
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta=(ClampMin="1", ClampMax="25", UIMin="1", UIMax="25"), Category=ProjectileSimulation)
 	int32 MaxSimulationIterations;
 
+	/**
+	 * On the first few bounces (up to this amount), allow extra iterations over MaxSimulationIterations if necessary.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta=(ClampMin="0", ClampMax="4", UIMin="0", UIMax="4"), Category=ProjectileSimulation)
+	int32 BounceAdditionalIterations;
+
 protected:
 
 	// Enum indicating how simulation should proceed after HandleBlockingHit() is called.
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/TouchInterface.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/TouchInterface.h
index 6996f651b535..360505ee9a22 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/TouchInterface.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/TouchInterface.h
@@ -37,7 +37,9 @@ struct FTouchInputControl
 	FKey AltInputKey;
 
 	FTouchInputControl()
-		: InputScale(1.f, 1.f)
+		: Image1(nullptr)
+		, Image2(nullptr)
+		, InputScale(1.f, 1.f)
 	{
 	}
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/Volume.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/Volume.h
index b5fcb830da2e..2bf2cca4798e 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/Volume.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/Volume.h
@@ -50,6 +50,9 @@ public:
 	/** @returns true if a sphere/point (with optional radius CheckRadius) overlaps this volume */
 	bool EncompassesPoint(FVector Point, float SphereRadius=0.f, float* OutDistanceToPoint = 0) const;
 
+	/** @returns the coarse bounds of this volume */
+	FBoxSphereBounds GetBounds() const;
+
 	//Begin UObject Interface
 #if WITH_EDITOR
 	virtual void PostEditImport() override;
diff --git a/Engine/Source/Runtime/Engine/Classes/GameFramework/WorldSettings.h b/Engine/Source/Runtime/Engine/Classes/GameFramework/WorldSettings.h
index 61f6e0806e30..da59b6ff4eb3 100644
--- a/Engine/Source/Runtime/Engine/Classes/GameFramework/WorldSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/GameFramework/WorldSettings.h
@@ -302,21 +302,25 @@ struct ENGINE_API FHierarchicalSimplification
 	FMeshMergingSettings MergeSetting;
 
 	/** Desired Bounding Radius for clustering - this is not guaranteed but used to calculate filling factor for auto clustering */
-	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(UIMin=10.f, ClampMin=10.f))
+	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(UIMin=10.f, ClampMin=10.f, editcondition = "!bReusePreviousLevelClusters"))
 	float DesiredBoundRadius;
 
 	/** Desired Filling Percentage for clustering - this is not guaranteed but used to calculate filling factor  for auto clustering */
-	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100"))
+	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100", editcondition = "!bReusePreviousLevelClusters"))
 	float DesiredFillingPercentage;
 
 	/** Min number of actors to build LODActor */
-	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(ClampMin = "1", UIMin = "1"))
+	UPROPERTY(EditAnywhere, Category=FHierarchicalSimplification, AdvancedDisplay, meta=(ClampMin = "1", UIMin = "1", editcondition = "!bReusePreviousLevelClusters"))
 	int32 MinNumberOfActorsToBuild;	
 
 	/** Min number of actors to build LODActor */
-	UPROPERTY(EditAnywhere, Category = FHierarchicalSimplification, AdvancedDisplay)
+	UPROPERTY(EditAnywhere, Category = FHierarchicalSimplification, AdvancedDisplay, meta = (editcondition = "!bReusePreviousLevelClusters"))
 	bool bOnlyGenerateClustersForVolumes;
 
+	/** Will reuse the clusters generated for the previous (lower) HLOD level */
+	UPROPERTY(EditAnywhere, Category = FHierarchicalSimplification, AdvancedDisplay)
+	bool bReusePreviousLevelClusters;
+
 	FHierarchicalSimplification()
 		: TransitionScreenSize(0.315f)
 		, OverrideDrawDistance(10000)
@@ -327,6 +331,7 @@ struct ENGINE_API FHierarchicalSimplification
 		, DesiredFillingPercentage(50)
 		, MinNumberOfActorsToBuild(2)
 		, bOnlyGenerateClustersForVolumes(false)
+		, bReusePreviousLevelClusters(false)
 	{
 		MergeSetting.bMergeMaterials = true;
 		MergeSetting.bGenerateLightMapUV = true;
@@ -398,7 +403,7 @@ protected:
 
 public:
 	/** if set to false AI system will not get created. Use it to disable all AI-related activity on a map */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, config, Category = World, AdvancedDisplay)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, config, Category=AI, AdvancedDisplay)
 	uint32 bEnableAISystem:1;
 
 	/** 
@@ -749,5 +754,8 @@ private:
 	HIDE_ACTOR_TRANSFORM_FUNCTIONS();
 
 	virtual void Serialize( FArchive& Ar ) override;
+
+public:
+	virtual FSoftClassPath GetAISystemClassName() const;
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Haptics/HapticFeedbackEffect_Base.h b/Engine/Source/Runtime/Engine/Classes/Haptics/HapticFeedbackEffect_Base.h
index 6e79b957ae7a..3f2ad0970e7e 100644
--- a/Engine/Source/Runtime/Engine/Classes/Haptics/HapticFeedbackEffect_Base.h
+++ b/Engine/Source/Runtime/Engine/Classes/Haptics/HapticFeedbackEffect_Base.h
@@ -31,7 +31,8 @@ struct ENGINE_API FActiveHapticFeedbackEffect
 	class UHapticFeedbackEffect_Base* HapticEffect;
 
 	FActiveHapticFeedbackEffect()
-		: PlayTime(0.f)
+		: HapticEffect(nullptr)
+		, PlayTime(0.f)
 		, Scale(1.f)
 	{
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/GameplayStatics.h b/Engine/Source/Runtime/Engine/Classes/Kismet/GameplayStatics.h
index 766d13554a18..88de33a5d0d1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/GameplayStatics.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/GameplayStatics.h
@@ -16,6 +16,7 @@
 #include "Kismet/KismetSystemLibrary.h"
 #include "Sound/DialogueTypes.h"
 #include "GameplayStaticsTypes.h"
+#include "Particles/WorldPSCPool.h"
 #include "GameplayStatics.generated.h"
 
 class UAudioComponent;
@@ -314,23 +315,25 @@ class ENGINE_API UGameplayStatics : public UBlueprintFunctionLibrary
 	 * @param Rotation - rotation to place the effect in world space	
 	 * @param Scale - scale to create the effect at
 	 * @param bAutoDestroy - Whether the component will automatically be destroyed when the particle system completes playing or whether it can be reactivated
+	 * @param PoolingMethod - Method used for pooling this component. Defaults to none.
 	 */
 	UFUNCTION(BlueprintCallable, Category="Effects|Components|ParticleSystem", meta=(Keywords = "particle system", WorldContext="WorldContextObject", UnsafeDuringActorConstruction = "true"))
-	static UParticleSystemComponent* SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation = FRotator::ZeroRotator, FVector Scale = FVector(1.f), bool bAutoDestroy = true);
+	static UParticleSystemComponent* SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation = FRotator::ZeroRotator, FVector Scale = FVector(1.f), bool bAutoDestroy = true, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 	// Backwards compatible version of SpawnEmitterAttached for C++ without Scale
-	static UParticleSystemComponent* SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation, bool bAutoDestroy);
+	static UParticleSystemComponent* SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation, bool bAutoDestroy, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 	/** Plays the specified effect at the given location and rotation, fire and forget. The system will go away when the effect is complete. Does not replicate.
 	 * @param World - The World to spawn in
 	 * @param EmitterTemplate - particle system to create
 	 * @param SpawnTransform - transform with which to place the effect in world space
 	 * @param bAutoDestroy - Whether the component will automatically be destroyed when the particle system completes playing or whether it can be reactivated
+	 * @param PoolingMethod - Method used for pooling this component. Defaults to none.
 	 */
-	static UParticleSystemComponent* SpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, const FTransform& SpawnTransform, bool bAutoDestroy = true);
+	static UParticleSystemComponent* SpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, const FTransform& SpawnTransform, bool bAutoDestroy = true, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 private:
-	static UParticleSystemComponent* InternalSpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation, FVector Scale, bool bAutoDestroy);
+	static UParticleSystemComponent* InternalSpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, FVector Location, FRotator Rotation, FVector Scale, bool bAutoDestroy, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 public:
 
@@ -343,12 +346,13 @@ public:
 	 * @param Scale - Depending on the value of LocationType this is either a relative scale from the attach component or an absolute world scale that will be translated to a relative scale (if LocationType is KeepWorldPosition).
 	 * @param LocationType - Specifies whether Location is a relative offset or an absolute world position
 	 * @param bAutoDestroy - Whether the component will automatically be destroyed when the particle system completes playing or whether it can be reactivated
+	 * @param PoolingMethod - Method used for pooling this component. Defaults to none.
 	 */
 	UFUNCTION(BlueprintCallable, Category="Effects|Components|ParticleSystem", meta=(Keywords = "particle system", UnsafeDuringActorConstruction = "true"))
-	static UParticleSystemComponent* SpawnEmitterAttached(class UParticleSystem* EmitterTemplate, class USceneComponent* AttachToComponent, FName AttachPointName = NAME_None, FVector Location = FVector(ForceInit), FRotator Rotation = FRotator::ZeroRotator, FVector Scale = FVector(1.f), EAttachLocation::Type LocationType = EAttachLocation::KeepRelativeOffset, bool bAutoDestroy = true);
+	static UParticleSystemComponent* SpawnEmitterAttached(class UParticleSystem* EmitterTemplate, class USceneComponent* AttachToComponent, FName AttachPointName = NAME_None, FVector Location = FVector(ForceInit), FRotator Rotation = FRotator::ZeroRotator, FVector Scale = FVector(1.f), EAttachLocation::Type LocationType = EAttachLocation::KeepRelativeOffset, bool bAutoDestroy = true, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 	// Backwards compatible version of SpawnEmitterAttached for C++ without Scale
-	static UParticleSystemComponent* SpawnEmitterAttached(class UParticleSystem* EmitterTemplate, class USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, EAttachLocation::Type LocationType, bool bAutoDestroy = true);
+	static UParticleSystemComponent* SpawnEmitterAttached(class UParticleSystem* EmitterTemplate, class USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, EAttachLocation::Type LocationType, bool bAutoDestroy = true, EPSCPoolMethod PoolingMethod = EPSCPoolMethod::None);
 
 	// --- Sound functions ------------------------------
 	
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/ImportanceSamplingLibrary.h b/Engine/Source/Runtime/Engine/Classes/Kismet/ImportanceSamplingLibrary.h
index 64618d2d98c9..4be7ee1cc068 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/ImportanceSamplingLibrary.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/ImportanceSamplingLibrary.h
@@ -72,7 +72,7 @@ struct FImportanceTexture
 
 public:
 	/* Default constructor, must Initialize before use */
-	FImportanceTexture() : Texture(0) {}
+	FImportanceTexture() : NumMips(0), Texture(0), Weighting(EImportanceWeight::Luminance) {}
 
 	/* Constructor with initialization */
 	FImportanceTexture(UTexture2D *SourceTexture, TEnumAsByte<EImportanceWeight::Type> WeightingFunc)
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetInputLibrary.h b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetInputLibrary.h
index 5f0441b6015a..a3067a678f61 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetInputLibrary.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetInputLibrary.h
@@ -84,6 +84,12 @@ class ENGINE_API UKismetInputLibrary : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "Is Vector Axis"), Category="Utilities|Key")
 	static bool Key_IsVectorAxis(const FKey& Key);
 	
+	/**
+	 * @returns True if this is a valid key.
+	 */
+	UFUNCTION(BlueprintPure, meta = (DisplayName = "Is Valid"), Category = "Utilities|Key")
+	static bool Key_IsValid(const FKey& Key);
+
 	/**
 	 * @returns The display name of the key.
 	 */
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMaterialLibrary.h b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMaterialLibrary.h
index 4a085ba2d96e..f74a7edaf027 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMaterialLibrary.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMaterialLibrary.h
@@ -32,5 +32,5 @@ class UKismetMaterialLibrary : public UBlueprintFunctionLibrary
 
 	/** Creates a Dynamic Material Instance which you can modify during gameplay. */
 	UFUNCTION(BlueprintCallable, Category="Rendering|Material", meta=(WorldContext="WorldContextObject", MaterialParameterCollectionFunction = "true"))
-	static ENGINE_API class UMaterialInstanceDynamic* CreateDynamicMaterialInstance(UObject* WorldContextObject, class UMaterialInterface* Parent);
+	static ENGINE_API class UMaterialInstanceDynamic* CreateDynamicMaterialInstance(UObject* WorldContextObject, class UMaterialInterface* Parent, FName OptionalName = NAME_None);
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMathLibrary.h b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMathLibrary.h
index dfe5f2be3443..5cf4d2a33512 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMathLibrary.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetMathLibrary.h
@@ -2152,6 +2152,18 @@ class ENGINE_API UKismetMathLibrary : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintPure, Category = "Math|Geometry")
 	static bool IsPointInBoxWithTransform(FVector Point, const FTransform& BoxWorldTransform, FVector BoxExtent);
 
+	/**
+	* Returns Slope Pitch and Roll angles in degrees based on the following information: 
+	*
+	* @param	MyRightYAxis				Right (Y) direction unit vector of Actor standing on Slope.
+	* @param	FloorNormal					Floor Normal (unit) vector.
+	* @param	UpVector					UpVector of reference frame.
+	* @outparam OutSlopePitchDegreeAngle	Slope Pitch angle (degrees)
+	* @outparam OutSlopeRollDegreeAngle		Slope Roll angle (degrees)
+	*/
+	UFUNCTION(BlueprintPure, Category = "Math|Geometry")
+	static void GetSlopeDegreeAngles(const FVector& MyRightYAxis, const FVector& FloorNormal, const FVector& UpVector, float& OutSlopePitchDegreeAngle, float& OutSlopeRollDegreeAngle);
+
 	//
 	// Intersection
 	//
diff --git a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetTextLibrary.h b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetTextLibrary.h
index f6de5f6c65d5..4ea1033f47a3 100644
--- a/Engine/Source/Runtime/Engine/Classes/Kismet/KismetTextLibrary.h
+++ b/Engine/Source/Runtime/Engine/Classes/Kismet/KismetTextLibrary.h
@@ -6,6 +6,7 @@
 #include "UObject/ObjectMacros.h"
 #include "UObject/TextProperty.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
+#include "Internationalization/PolyglotTextData.h"
 #include "KismetTextLibrary.generated.h"
 
 #if !CPP
@@ -275,4 +276,18 @@ class ENGINE_API UKismetTextLibrary : public UBlueprintFunctionLibrary
 	 */
 	UFUNCTION(BlueprintPure, Category="Utilities|Text", meta=(DisplayName="Find String Table ID and Key from Text"))
 	static bool StringTableIdAndKeyFromText(FText Text, FName& OutTableId, FString& OutKey);
+
+	/**
+	 * Check whether the given polyglot data is valid.
+	 * @return True if the polyglot data is valid, false otherwise. ErrorMessage will be filled in if the the data is invalid.
+	 */
+	UFUNCTION(BlueprintPure, Category="Utilities|Text")
+	static void IsPolyglotDataValid(const FPolyglotTextData& PolyglotData, bool& IsValid, FText& ErrorMessage);
+
+	/**
+	 * Get the text instance created from this polyglot data.
+	 * @return The text instance, or an empty text if the data is invalid.
+	 */
+	UFUNCTION(BlueprintPure, Category="Utilities|Text")
+	static FText PolyglotDataToText(const FPolyglotTextData& PolyglotData);
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/Material.h b/Engine/Source/Runtime/Engine/Classes/Materials/Material.h
index 543996246ebe..3bef708bafaa 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/Material.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/Material.h
@@ -69,7 +69,6 @@ enum EDecalBlendMode
 	DBM_Normal UMETA(DisplayName="Normal"),
 	/** Additive emissive only. */
 	DBM_Emissive UMETA(DisplayName="Emissive"),
-
 	/** Non metal, put into DBuffer to work for baked lighting as well (becomes DBM_TranslucentNormal if normal is not hooked up). */
 	DBM_DBuffer_ColorNormalRoughness UMETA(DisplayName="DBuffer Translucent Color,Normal,Roughness"),
 	/** Non metal, put into DBuffer to work for baked lighting as well. */
@@ -87,6 +86,9 @@ enum EDecalBlendMode
 
 	/** Output signed distance in Opacity depending on LightVector. Note: Can be costly, no shadow casting but receiving, no per pixel normal yet, no quality settings yet */
 	DBM_Volumetric_DistanceFunction UMETA(DisplayName="Volumetric Distance Function (experimental)"),
+	
+	/** Blend with existing scene color. Decal color is already pre-multiplied by alpha. */
+	DBM_AlphaComposite UMETA(DisplayName ="AlphaComposite (Premultiplied Alpha)"),
 
 	/** Ambient occlusion. */
 	DBM_AmbientOcclusion UMETA(DisplayName = "Ambient Occlusion"),
@@ -848,15 +850,18 @@ public:
 	 */
 	class FDefaultMaterialInstance* DefaultMaterialInstances[3];
 
+#if WITH_EDITORONLY_DATA
 	/** Used to detect duplicate parameters.  Does not contain parameters in referenced functions! */
 	TMap<FName, TArray<UMaterialExpression*> > EditorParameters;
 
-#if WITH_EDITORONLY_DATA
 	/** EdGraph based representation of the Material */
 	class UMaterialGraph*	MaterialGraph;
 #endif //WITH_EDITORONLY_DATA
 
 private:
+	/** Caches the used quality levels of the material to save runtime graph traversal. */
+	UPROPERTY()
+	TArray<bool> CachedQualityLevelsUsed;
 
 	/** Inline material resources serialized from disk. To be processed on game thread in PostLoad. */
 	TArray<FMaterialResource> LoadedMaterialResources;
@@ -894,6 +899,7 @@ public:
 	ENGINE_API virtual const UMaterial* GetMaterial() const override;
 	ENGINE_API virtual const UMaterial* GetMaterial_Concurrent(TMicRecursionGuard& RecursionGuard) const override;
 	ENGINE_API virtual bool GetScalarParameterValue(const FMaterialParameterInfo& ParameterInfo,float& OutValue, bool bOveriddenOnly = false) const override;
+	ENGINE_API virtual bool IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<class UCurveLinearColor>& Curve, TSoftObjectPtr<class UCurveLinearColorAtlas>& Atlas) const override;
 	ENGINE_API virtual bool GetScalarParameterSliderMinMax(const FMaterialParameterInfo& ParameterInfo, float& OutMinSlider, float& OutMaxSlider) const override;
 	ENGINE_API virtual bool GetVectorParameterValue(const FMaterialParameterInfo& ParameterInfo,FLinearColor& OutValue, bool bOveriddenOnly = false) const override;
 	ENGINE_API virtual bool IsVectorParameterUsedAsChannelMask(const FMaterialParameterInfo& ParameterInfo, bool& OutValue) const override;
@@ -923,7 +929,8 @@ public:
 	ENGINE_API virtual bool GetParameterSortPriority(const FMaterialParameterInfo& ParameterInfo, int32& OutSortPriority, const TArray<struct FStaticMaterialLayersParameter>* MaterialLayersParameters = nullptr) const override;
 	ENGINE_API virtual bool GetGroupSortPriority(const FString& InGroupName, int32& OutSortPriority) const override;
 	ENGINE_API virtual bool GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures, 
-		TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet) override;
+		TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality) override;
 #endif
 	ENGINE_API virtual void RecacheUniformExpressions() const override;
 
@@ -1354,7 +1361,7 @@ public:
 	void CacheExpressionTextureReferences();
 
 	/** Rebuild ExpressionTextureReferences with all textures referenced by expressions in this material. */
-	void RebuildExpressionTextureReferences();
+	ENGINE_API void RebuildExpressionTextureReferences();
 
 	/** Attempts to add a new group name to the Group Data struct. True if new name was added. */
 	ENGINE_API bool AttemptInsertNewGroupName(const FString& InNewName);
@@ -1437,6 +1444,7 @@ public:
 		EShaderPlatform ShaderPlatform, 
 		TMap<FString, TArray<TRefCountPtr<class FMaterialShaderMap> > >& OutShaderMaps);
 
+#if WITH_EDITOR
 	/**
 	 * Add an expression node that represents a parameter to the list of material parameters.
 	 * @param	Expression	Pointer to the node that is going to be inserted if it's a parameter type.
@@ -1478,6 +1486,7 @@ public:
 	 * @param	Expression	The expression dynamic parameter to check for duplicates.
 	 */
 	ENGINE_API virtual bool HasDuplicateDynamicParameters(const UMaterialExpression* Expression);
+#endif // WITH_EDITOR
 
 	/**
 	 * Iterate through all of the expression nodes and fix up changed properties on
@@ -1552,10 +1561,14 @@ public:
 	 *
 	 *	@param	OutExpressions			The array to fill in all of the expressions.
 	 *	@param	InStaticParameterSet	Optional static parameter set - if supplied only walk the StaticSwitch branches according to it.
+	 *	@Param	InFeatureLevel			Optional feature level - if supplied, only walk FeatureLevelSwitch branches according to it.
+	 *	@Param	InQuality				Optional quality switch - if supplied, only walk QualitySwitch branches according to it.
 	 *
 	 *	@return	bool					true if successful, false if not.
 	 */
-	ENGINE_API virtual bool GetAllReferencedExpressions(TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet);
+	ENGINE_API virtual bool GetAllReferencedExpressions(TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel = ERHIFeatureLevel::Num, EMaterialQualityLevel::Type InQuality = EMaterialQualityLevel::Num);
+
 
 	/**
 	 *	Get the expression chain for the given property (ie fill in the given array with all expressions in the chain).
@@ -1563,11 +1576,14 @@ public:
 	 *	@param	InProperty				The material property chain to inspect, such as MP_BaseColor.
 	 *	@param	OutExpressions			The array to fill in all of the expressions.
 	 *	@param	InStaticParameterSet	Optional static parameter set - if supplied only walk the StaticSwitch branches according to it.
+	 *	@Param	InFeatureLevel			Optional feature level - if supplied, only walk FeatureLevelSwitch branches according to it.
+	 *	@Param	InQuality				Optional quality switch - if supplied, only walk QualitySwitch branches according to it.
 	 *
 	 *	@return	bool					true if successful, false if not.
 	 */
 	ENGINE_API virtual bool GetExpressionsInPropertyChain(EMaterialProperty InProperty, 
-		TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet);
+		TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel = ERHIFeatureLevel::Num, EMaterialQualityLevel::Type InQuality = EMaterialQualityLevel::Num);
 #endif
 
 	/** Appends textures referenced by expressions, including nested functions. */
@@ -1583,11 +1599,14 @@ protected:
 	 *	@param	InOutProcessedInputs	An array of processed expression inputs. (To avoid circular loops causing infinite recursion)
 	 *	@param	OutExpressions			The array to fill in all of the expressions.
 	 *	@param	InStaticParameterSet	Optional static parameter set - if supplied only walk the StaticSwitch branches according to it.
+	 *	@Param	InFeatureLevel			Optional feature level - if supplied, only walk FeatureLevelSwitch branches according to it.
+	 *	@Param	InQuality				Optional quality switch - if supplied, only walk QualitySwitch branches according to it.
 	 *
 	 *	@return	bool					true if successful, false if not.
 	 */
 	ENGINE_API virtual bool RecursiveGetExpressionChain(UMaterialExpression* InExpression, TArray<FExpressionInput*>& InOutProcessedInputs, 
-		TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet);
+		TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel = ERHIFeatureLevel::Num, EMaterialQualityLevel::Type InQuality = EMaterialQualityLevel::Num);
 
 	/**
 	*	Recursively update the bRealtimePreview for each expression based on whether it is connected to something that is time-varying.
@@ -1601,6 +1620,10 @@ protected:
 #endif
 
 public:
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(const class ITargetPlatform* TP);
+	ENGINE_API virtual void SaveShaderStableKeysInner(const class ITargetPlatform* TP, const struct FStableShaderKeyAndValue& SaveKeyVal) override;
+
 	bool HasNormalConnected() const { return Normal.IsConnected(); }
 
 	static void NotifyCompilationFinished(UMaterialInterface* Material);
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpression.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpression.h
index b97cf123e809..9785e564a64b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpression.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpression.h
@@ -236,6 +236,8 @@ class ENGINE_API UMaterialExpression : public UObject
 		return NULL;
 	}
 
+	virtual bool CanReferenceTexture() const { return false; }
+
 #if WITH_EDITOR
 	/**
 	 *	Get the outputs supported by this expression.
@@ -313,7 +315,12 @@ class ENGINE_API UMaterialExpression : public UObject
 	/**
 	 * Marks certain expression types as outputting material attributes. Allows the material editor preview material to know if it should use its material attributes pin.
 	 */
-	virtual bool IsResultMaterialAttributes(int32 OutputIndex){return false;}
+	virtual bool IsResultMaterialAttributes(int32 OutputIndex) { return false; }
+
+	/**
+	 * If true, discards the output index when caching this expression which allows more cases to re-use the output instead of adding a separate instruction
+	 */
+	virtual bool CanIgnoreOutputIndex() { return false; }
 
 	/**
 	 * Connects the specified output to the passed material for previewing. 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionCurveAtlasRowParameter.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionCurveAtlasRowParameter.h
new file mode 100644
index 000000000000..d9bb99d3be7f
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionCurveAtlasRowParameter.h
@@ -0,0 +1,53 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Materials/MaterialExpressionScalarParameter.h"
+#include "MaterialExpressionCurveAtlasRowParameter.generated.h"
+
+
+
+UCLASS(collapsecategories, hidecategories=(Object, MaterialExpressionScalarParameter), MinimalAPI)
+class UMaterialExpressionCurveAtlasRowParameter : public UMaterialExpressionScalarParameter
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, Category=MaterialExpressionCurveAtlasRowParameter)
+	class UCurveLinearColor* Curve;
+
+	UPROPERTY(EditAnywhere, Category = MaterialExpressionCurveAtlasRowParameter)
+	class UCurveLinearColorAtlas* Atlas;
+
+	UPROPERTY()
+	FExpressionInput InputTime;
+
+	virtual bool IsUsedAsAtlasPosition() override { return true; }
+	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const { return true; }
+
+#if WITH_EDITOR
+	virtual uint32 GetInputType(int32 InputIndex) override 
+	{
+		return MCT_Float;
+	}
+
+	virtual bool IsInputConnectionRequired(int32 InputIndex) const override { return true; }
+	virtual int32 Compile(class FMaterialCompiler* Compiler, int32 OutputIndex) override;
+	virtual void GetTexturesForceMaterialRecompile(TArray<UTexture *> &Textures) const override;
+	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void GetCaption(TArray<FString>& OutCaptions) const override 
+	{
+		OutCaptions.Empty();
+		OutCaptions.Add(TEXT(""));
+	};
+//~ Begin UMaterialExpression Interface
+	virtual FName GetInputName(int32 InputIndex) const override
+	{
+		return TEXT("CurveTime");
+	}
+
+#endif
+};
+
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionFontSample.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionFontSample.h
index cd1646660d33..27d6e0858b62 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionFontSample.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionFontSample.h
@@ -39,6 +39,8 @@ class UMaterialExpressionFontSample : public UMaterialExpression
 	 * Any UMaterialExpression whose compilation creates a texture uniform expression (eg Compiler->Texture, Compiler->TextureParameter) must implement this.
 	 */
 	virtual UTexture* GetReferencedTexture() override;
+
+	virtual bool CanReferenceTexture() const override { return true; }
 	//~ End UMaterialExpression Interface
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialAttributeLayers.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialAttributeLayers.h
index 8df30c703398..ac8645ee55d2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialAttributeLayers.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialAttributeLayers.h
@@ -69,9 +69,15 @@ class UMaterialExpressionMaterialAttributeLayers : public UMaterialExpression
 	UPROPERTY(Transient)
 	TArray<UMaterialExpressionMaterialFunctionCall*> LayerCallers;
 
+	UPROPERTY(Transient)
+	int32 NumActiveLayerCallers;
+
 	UPROPERTY(Transient)
 	TArray<UMaterialExpressionMaterialFunctionCall*> BlendCallers;
 
+	UPROPERTY(Transient)
+	int32 NumActiveBlendCallers;
+
 	UPROPERTY(Transient)
 	bool bIsLayerGraphBuilt;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialFunctionCall.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialFunctionCall.h
index d5718448f8b7..f29ce6fc8552 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialFunctionCall.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionMaterialFunctionCall.h
@@ -152,8 +152,13 @@ class UMaterialExpressionMaterialFunctionCall : public UMaterialExpression
 	 */
 	ENGINE_API void UpdateFromFunctionResource(bool bRecreateAndLinkNode = true);
 
-private:
-	
+	/** Temporary compilation state shared between function calls */
+	void SetSharedCompileState(FMaterialFunctionCompileState* SharedState)
+	{
+		SharedCompileState = SharedState;
+	}
+
+private:	
 	/** Helper that fixes up expression links where possible. */
 	void FixupReferencingExpressions(
 		const TArray<FFunctionExpressionOutput>& NewOutputs,
@@ -161,6 +166,9 @@ private:
 		TArray<UMaterialExpression*>& Expressions, 
 		TArray<FExpressionInput*>& MaterialInputs,
 		bool bMatchByName);
+
+	/** Temporary compilation state shared between function calls */
+	FMaterialFunctionCompileState* SharedCompileState;
 #endif // WITH_EDITOR
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionScalarParameter.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionScalarParameter.h
index 472e48af79a5..a70a6ae616ee 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionScalarParameter.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionScalarParameter.h
@@ -46,6 +46,8 @@ class UMaterialExpressionScalarParameter : public UMaterialExpressionParameter
 
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 #endif
+
+	virtual bool IsUsedAsAtlasPosition() { return false; }
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureBase.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureBase.h
index 2eb8e35fdb80..c12e30863140 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureBase.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureBase.h
@@ -52,6 +52,8 @@ class ENGINE_API UMaterialExpressionTextureBase : public UMaterialExpression
 		return Texture;
 	}
 
+	virtual bool CanReferenceTexture() const override { return true; }
+
 	/**
 	 * Automatically determines and set the sampler type for the current texture.
 	 */
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureSample.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureSample.h
index 112389fcf1e8..d5b52c5f8737 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureSample.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialExpressionTextureSample.h
@@ -46,7 +46,7 @@ class ENGINE_API UMaterialExpressionTextureSample : public UMaterialExpressionTe
 	FExpressionInput TextureObject;
 
 	/** Meaning depends on MipValueMode, a single unit is one mip level  */
-	UPROPERTY(meta = (RequiredInput = "false", ToolTip = "Defaults to 'ConstMipValue' if not specified"))
+	UPROPERTY(meta = (RequiredInput = "false", ToolTip = "Defaults to 'AutomaticViewMipBias' if not specified"))
 	FExpressionInput MipValue;
 	
 	/** Enabled only if MipValueMode == TMVM_Derivative */
@@ -57,6 +57,9 @@ class ENGINE_API UMaterialExpressionTextureSample : public UMaterialExpressionTe
 	UPROPERTY(meta = (RequiredInput = "true", ToolTip = "Coordinates derivative over the Y axis"))
 	FExpressionInput CoordinatesDY;
 
+	UPROPERTY(meta = (RequiredInput = "false", ToolTip = "Ignored if not specified"))
+	FExpressionInput AutomaticViewMipBiasValue;
+
 	/** Defines how the MipValue property is applied to the texture lookup */
 	UPROPERTY(EditAnywhere, Category=MaterialExpressionTextureSample, meta=(DisplayName = "MipValueMode"))
 	TEnumAsByte<enum ETextureMipValueMode> MipValueMode;
@@ -101,6 +104,7 @@ class ENGINE_API UMaterialExpressionTextureSample : public UMaterialExpressionTe
 	virtual void GetCaption(TArray<FString>& OutCaptions) const override;
 	virtual bool MatchesSearchQuery( const TCHAR* SearchQuery ) override;
 	virtual uint32 GetInputType(int32 InputIndex) override;
+	virtual bool CanIgnoreOutputIndex() { return true; }
 #endif // WITH_EDITOR
 	//~ End UMaterialExpression Interface
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInstance.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInstance.h
index 795722759df6..90218cc2a3bd 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInstance.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInstance.h
@@ -33,8 +33,10 @@ struct FScalarParameterValue
 {
 	GENERATED_USTRUCT_BODY()
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	FName ParameterName_DEPRECATED;
+#endif
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=ScalarParameterValue)
 	FMaterialParameterInfo ParameterInfo;
@@ -72,8 +74,10 @@ struct FVectorParameterValue
 {
 	GENERATED_USTRUCT_BODY()
 		
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	FName ParameterName_DEPRECATED;
+#endif
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=VectorParameterValue)
 	FMaterialParameterInfo ParameterInfo;
@@ -111,8 +115,10 @@ struct FTextureParameterValue
 {
 	GENERATED_USTRUCT_BODY()
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	FName ParameterName_DEPRECATED;
+#endif
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=TextureParameterValue)
 	FMaterialParameterInfo ParameterInfo;
@@ -150,8 +156,10 @@ struct FFontParameterValue
 {
 	GENERATED_USTRUCT_BODY()
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	FName ParameterName_DEPRECATED;
+#endif
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=FontParameterValue)
 	FMaterialParameterInfo ParameterInfo;
@@ -363,6 +371,7 @@ public:
 	virtual ENGINE_API const FMaterialResource* GetMaterialResource(ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type QualityLevel = EMaterialQualityLevel::Num) const override;
 	virtual ENGINE_API bool GetScalarParameterSliderMinMax(const FMaterialParameterInfo& ParameterInfo, float& OutSliderMin, float& OutSliderMax) const override;
 	virtual ENGINE_API bool GetScalarParameterValue(const FMaterialParameterInfo& ParameterInfo, float& OutValue, bool bOveriddenOnly = false) const override;
+	virtual ENGINE_API bool IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<class UCurveLinearColor>& Curve, TSoftObjectPtr<class UCurveLinearColorAtlas>& Atlas) const override;
 	virtual ENGINE_API bool GetVectorParameterValue(const FMaterialParameterInfo& ParameterInfo, FLinearColor& OutValue, bool bOveriddenOnly = false) const override;
 	virtual ENGINE_API bool IsVectorParameterUsedAsChannelMask(const FMaterialParameterInfo& ParameterInfo, bool& OutValue) const override;
 	virtual ENGINE_API bool GetTextureParameterValue(const FMaterialParameterInfo& ParameterInfo, class UTexture*& OutValue, bool bOveriddenOnly = false) const override;
@@ -392,8 +401,9 @@ public:
 	virtual ENGINE_API bool GetParameterSortPriority(const FMaterialParameterInfo& ParameterInfo, int32& OutSortPriority, const TArray<struct FStaticMaterialLayersParameter>* MaterialLayersParameters = nullptr) const override;
 	virtual ENGINE_API bool GetGroupSortPriority(const FString& InGroupName, int32& OutSortPriority) const override;
 	virtual ENGINE_API bool GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,
-		TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet) override;
-#endif // WITH_EDITOR
+		TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality) override;
+#endif
 	virtual ENGINE_API void RecacheUniformExpressions() const override;
 	virtual ENGINE_API bool GetRefractionSettings(float& OutBiasValue) const override;
 	ENGINE_API virtual void ForceRecompileForRendering() override;
@@ -545,6 +555,11 @@ public:
 	 */
 	ENGINE_API virtual void GetLightingGuidChain(bool bIncludeTextures, TArray<FGuid>& OutGuids) const override;
 
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(const class ITargetPlatform* TP);
+	ENGINE_API virtual void SaveShaderStableKeysInner(const class ITargetPlatform* TP, const struct FStableShaderKeyAndValue& SaveKeyVal) override;
+
+
 protected:
 	/**
 	 * Updates parameter names on the material instance, returns true if parameters have changed.
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInterface.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInterface.h
index 1cf196f565f8..1610ef686b5d 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInterface.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialInterface.h
@@ -498,6 +498,9 @@ public:
 	virtual void AppendReferencedTextures(TArray<UTexture*>& InOutTextures) const
 		PURE_VIRTUAL(UMaterialInterface::AppendReferencedTextures,);
 
+	virtual void SaveShaderStableKeysInner(const class ITargetPlatform* TP, const struct FStableShaderKeyAndValue& SaveKeyVal)
+		PURE_VIRTUAL(UMaterialInterface::SaveShaderStableKeysInner, );
+
 	/** @return The material's relevance. */
 	ENGINE_API FMaterialRelevance GetRelevance(ERHIFeatureLevel::Type InFeatureLevel) const;
 	/** @return The material's relevance, from concurrent render thread updates. */
@@ -666,13 +669,15 @@ public:
 	 *
 	 *	@return	bool			true if successful, false if not.
 	 */
-	virtual bool GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,  TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet)
+	virtual bool GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,  TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet,
+		ERHIFeatureLevel::Type InFeatureLevel = ERHIFeatureLevel::Num, EMaterialQualityLevel::Type InQuality = EMaterialQualityLevel::Num)
 		PURE_VIRTUAL(UMaterialInterface::GetTexturesInPropertyChain,return false;);
 
 	ENGINE_API virtual bool GetParameterDesc(const FMaterialParameterInfo& ParameterInfo, FString& OutDesc, const TArray<struct FStaticMaterialLayersParameter>* MaterialLayersParameters = nullptr) const;	
 #endif // WITH_EDITOR
 	ENGINE_API virtual bool GetScalarParameterSliderMinMax(const FMaterialParameterInfo& ParameterInfo, float& OutSliderMin, float& OutSliderMax) const;
 	ENGINE_API virtual bool GetScalarParameterValue(const FMaterialParameterInfo& ParameterInfo, float& OutValue, bool bOveriddenOnly = false) const;
+	ENGINE_API virtual bool IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<class UCurveLinearColor>& Curve, TSoftObjectPtr<class UCurveLinearColorAtlas>&  Atlas) const;
 	ENGINE_API virtual bool GetScalarCurveParameterValue(const FMaterialParameterInfo& ParameterInfo, FInterpCurveFloat& OutValue) const;
 	ENGINE_API virtual bool GetVectorParameterValue(const FMaterialParameterInfo& ParameterInfo, FLinearColor& OutValue, bool bOveriddenOnly = false) const;
 	ENGINE_API virtual bool IsVectorParameterUsedAsChannelMask(const FMaterialParameterInfo& ParameterInfo, bool& OutValue) const;
@@ -843,6 +848,9 @@ private:
 #endif
 };
 
+// Used to set up some compact FName paths for the FCompactFullName
+ENGINE_API void SetCompactFullNameFromObject(struct FCompactFullName &Dest, UObject* InDepObject);
+
 /** Helper function to serialize inline shader maps for the given material resources. */
 extern void SerializeInlineShaderMaps(const TMap<const class ITargetPlatform*, TArray<FMaterialResource*>>* PlatformMaterialResourcesToSave, FArchive& Ar, TArray<FMaterialResource>& OutLoadedResources);
 /** Helper function to process (register) serialized inline shader maps for the given material resources. */
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialLayersFunctions.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialLayersFunctions.h
index 47e0c6fb58ae..b1c27e2f2dda 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialLayersFunctions.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialLayersFunctions.h
@@ -95,17 +95,17 @@ struct ENGINE_API FMaterialLayersFunctions
 	TArray<class UMaterialFunctionInterface*> Blends;
 
 #if WITH_EDITORONLY_DATA
-	UPROPERTY()
+	UPROPERTY(EditAnywhere, Category = MaterialLayers)
 	TArray<FText> LayerNames;
 
-	UPROPERTY()
+	UPROPERTY(EditAnywhere, Category = MaterialLayers)
 	TArray<bool> RestrictToLayerRelatives;
 
-	UPROPERTY()
+	UPROPERTY(EditAnywhere, Category = MaterialLayers)
 	TArray<bool> RestrictToBlendRelatives;
 #endif
 
-	UPROPERTY()
+	UPROPERTY(EditAnywhere, Category = MaterialLayers)
 	TArray<bool> LayerStates;
 
 
@@ -147,6 +147,13 @@ struct ENGINE_API FMaterialLayersFunctions
 		KeyString = GetStaticPermutationString();
 	}
 
+	void SetBlendedLayerVisibility(int32 Index, bool InNewVisibility)
+	{
+		check(LayerStates.IsValidIndex(Index));
+		LayerStates[Index] = InNewVisibility;
+		KeyString = GetStaticPermutationString();
+	}
+
 	bool GetLayerVisibility(int32 Index)
 	{
 		check(LayerStates.IsValidIndex(Index));
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollection.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollection.h
index ca14a9add5f2..0debb3614ae7 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollection.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollection.h
@@ -44,6 +44,7 @@ struct FCollectionScalarParameter : public FCollectionParameterBase
 	GENERATED_USTRUCT_BODY()
 
 	FCollectionScalarParameter()
+		: DefaultValue(0.0f)
 	{
 		ParameterName = FName(TEXT("Scalar"));
 	}
diff --git a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollectionInstance.h b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollectionInstance.h
index f9f5887eaeff..876d4ec85bb4 100644
--- a/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollectionInstance.h
+++ b/Engine/Source/Runtime/Engine/Classes/Materials/MaterialParameterCollectionInstance.h
@@ -51,6 +51,8 @@ class ENGINE_API UMaterialParameterCollectionInstance : public UObject
 
 	void UpdateRenderState();
 
+	void DeferredUpdateRenderState();
+
 	/** Tracks whether this instance has ever issued a missing parameter warning, to reduce log spam. */
 	bool bLoggedMissingParameterWarning;
 
@@ -75,6 +77,9 @@ protected:
 
 	/** Boils down the instance overrides and default values into data to be set on the uniform buffer. */
 	void GetParameterData(TArray<FVector4>& ParameterData) const;
+	
+	/** Tracks whether this instance needs to update the render state from the game thread */
+	bool bNeedsRenderStateUpdate;
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/Event/ParticleModuleEventGenerator.h b/Engine/Source/Runtime/Engine/Classes/Particles/Event/ParticleModuleEventGenerator.h
index 127300de4552..6d1477616c26 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/Event/ParticleModuleEventGenerator.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/Event/ParticleModuleEventGenerator.h
@@ -58,9 +58,11 @@ struct FParticleEvent_GenerateInfo
 	FParticleEvent_GenerateInfo()
 	: Type(0)
 	, Frequency(0)
+	, ParticleFrequency(0)
 	, FirstTimeOnly(false)
 	, LastTimeOnly(false)
 	, UseReflectedImpactVector(false)
+	, bUseOrbitOffset(false)
 	{
 	}
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationBoneSocket.h b/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationBoneSocket.h
index 0bc3d2dfd36a..89aa5ca44385 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationBoneSocket.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationBoneSocket.h
@@ -159,7 +159,7 @@ class ENGINE_API UParticleModuleLocationBoneSocket : public UParticleModuleLocat
 	 *
 	 *	@return	USkeletalMeshComponent*		The skeletal mesh component to use as the source
 	 */
-	USkeletalMeshComponent* GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner);
+	void GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner, FModuleLocationBoneSocketInstancePayload* InstancePayload);
 
 	/**
 	 *	Retrieve the position for the given socket index.
@@ -195,6 +195,8 @@ struct FModuleLocationBoneSocketInstancePayload
 {
 	/** The skeletal mesh component used as the source of the sockets */
 	TWeakObjectPtr<USkeletalMeshComponent> SourceComponent;
+	/** Actor pointer we took the skel mesh comp from. */
+	TWeakObjectPtr<AActor> CachedActor;
 	/** The last selected index into the socket array */
 	int32 LastSelectedIndex;
 	/** The position of each bone/socket from the previous tick. Used to calculate the inherited bone velocity when spawning particles. */
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationSkelVertSurface.h b/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationSkelVertSurface.h
index 96791d5c3154..f275662dcafd 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationSkelVertSurface.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/Location/ParticleModuleLocationSkelVertSurface.h
@@ -142,10 +142,10 @@ class ENGINE_API UParticleModuleLocationSkelVertSurface : public UParticleModule
 	 *	Retrieve the skeletal mesh component source to use for the current emitter instance.
 	 *
 	 *	@param	Owner						The particle emitter instance that is being setup
+	 *	@param	Owner						The payload data that is being setup.
 	 *
-	 *	@return	USkeletalMeshComponent*		The skeletal mesh component to use as the source
 	 */
-	USkeletalMeshComponent* GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner);
+	void GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner, FModuleLocationVertSurfaceInstancePayload* InstancePayload);
 
 	/**
 	 *	Retrieve the position for the given socket index.
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleEmitter.h b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleEmitter.h
index 6f89833c2561..c90856eb5f6b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleEmitter.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleEmitter.h
@@ -203,6 +203,10 @@ class UParticleEmitter : public UObject
 	UPROPERTY(EditAnywhere, Category = Significance)
 	EParticleSignificanceLevel SignificanceLevel;
 
+	/** If true, maintains some legacy spawning behavior. */
+	UPROPERTY(EditAnywhere, Category = Particle, AdvancedDisplay)
+	uint32 bUseLegacySpawningBehavior : 1;
+
 	//////////////////////////////////////////////////////////////////////////
 	// Below is information udpated by calling CacheEmitterModuleInfo
 
@@ -259,7 +263,9 @@ class UParticleEmitter : public UObject
 		DetailModeDisplay += DetailModeBitmask & (1 << EParticleDetailMode::PDM_High) ? "High" : "";
 	}
 #endif // WITH_EDITORONLY_DATA
+	virtual void Serialize(FArchive& Ar)override;
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	//~ End UObject Interface
 
 	// @todo document
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleLODLevel.h b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleLODLevel.h
index 0408005896a6..72719c37a2e6 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleLODLevel.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleLODLevel.h
@@ -80,6 +80,7 @@ class UParticleLODLevel : public UObject
 
 	//~ Begin UObject Interface
 	virtual void	PostLoad() override;
+	virtual bool	IsPostLoadThreadSafe() const override;
 	//~ End UObject Interface
 
 	// @todo document
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleModule.h b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleModule.h
index e0590523f22f..0cbc936cc77d 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleModule.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleModule.h
@@ -221,9 +221,10 @@ class ENGINE_API UParticleModule : public UObject
 #endif // WITH_EDITORONLY_DATA
 
 	//~ Begin UObject Interface
+	virtual bool IsPostLoadThreadSafe() const override;
 #if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
-#endif // WITH_EDITOR
+#endif // WITH_EDITOR	
 	//~ End UObject Interface
 
 	/**
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystem.h b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystem.h
index 660e9c4118fe..cd99f3ae46ba 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystem.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystem.h
@@ -327,6 +327,11 @@ public:
 	UPROPERTY(EditAnywhere, Category = Performance)
 	EParticleSignificanceLevel MaxSignificanceLevel;
 
+	/** Max number of components of this system to keep resident in the world PSC pool. */
+	UPROPERTY(EditAnywhere, Category = Performance)
+	uint32 MaxPoolSize;
+	//TODO: Allow pool size overriding per world and possibly implement some preallocation too.
+
 	/** Local space position that UVs generated with the ParticleMacroUV material node will be centered on. */
 	UPROPERTY(EditAnywhere, Category=MacroUV)
 	FVector MacroUVPosition;
@@ -364,11 +369,15 @@ public:
 #endif // WITH_EDITOR
 	virtual void PreSave(const class ITargetPlatform* TargetPlatform) override;
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual void GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) const override;
 	bool UsesCPUCollision() const;
 	virtual bool CanBeClusterRoot() const override;
+	virtual void Serialize(FArchive& Ar);
+
 	//~ End UObject Interface.
 
+	bool CanBePooled()const;
 
 	// @todo document
 	void UpdateColorModuleClampAlpha(class UParticleModuleColorBase* ColorModule);
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystemComponent.h b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystemComponent.h
index 840884b88058..c583cff0c2b0 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystemComponent.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/ParticleSystemComponent.h
@@ -12,6 +12,7 @@
 #include "Particles/ParticleSystem.h"
 #include "Particles/Emitter.h"
 #include "Runtime/Launch/Resources/Version.h"
+#include "Particles/WorldPSCPool.h"
 #include "ParticleSystemComponent.generated.h"
 
 class FParticleDynamicData;
@@ -438,12 +439,15 @@ private:
 	uint8 bNeedsFinalize:1;
 	/** If true, it means the Async work is in process and not yet completed */
 	uint8 bAsyncWorkOutstanding:1;
-
+	
 	/** Restore relative transform from auto attachment and optionally detach from parent (regardless of whether it was an auto attachment). */
 	void CancelAutoAttachment(bool bDetachFromParent);
 
 public:
 
+	/** If this PSC is pooling. */
+	EPSCPoolMethod PoolingMethod;
+
 	/** The method of LOD level determination to utilize for this particle system */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=LOD)
 	TEnumAsByte<enum ParticleSystemLODMethod> LODMethod;
@@ -698,7 +702,7 @@ public:
 	bool CanBeOccluded()const;
 
 	void Complete();
-
+	
 	FORCEINLINE const FTransform& GetAsyncComponentToWorld()
 	{
 		if (!bParallelRenderThreadUpdate && !IsInGameThread())
@@ -1072,6 +1076,14 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "Effects|Particles|Trails")
 	void SetTrailSourceData(FName InFirstSocketName, FName InSecondSocketName, ETrailWidthMode InWidthMode, float InWidth);
 
+	/** 
+	 * Deactivates this system and releases it to the pool on completion.
+	 * Usage of this PSC reference after this call is unsafe. 
+	 * You should clear out your references to it.
+	 */
+	UFUNCTION(BlueprintCallable, Category = "Effects|Components|ParticleSystem")
+	void ReleaseToPool();
+
 public:
 	/** Command fence used to shut down properly */
 	class FRenderCommandFence* ReleaseResourcesFence;
@@ -1223,6 +1235,9 @@ public:
 	/** Returns the index into the EmitterMaterials array for this named. If there are no named material slots or this material is not found, INDEX_NONE is returned. */
 	virtual int32 GetNamedMaterialIndex(FName InName) const;
 
+	/** Returns an approximate memory usage value for this component. */
+	uint32 GetApproxMemoryUsage()const;
+
 protected:
 
 	// @todo document
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/SubUV/ParticleModuleSubUV.h b/Engine/Source/Runtime/Engine/Classes/Particles/SubUV/ParticleModuleSubUV.h
index 1191ed5e43bf..7e8e9456dc6b 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/SubUV/ParticleModuleSubUV.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/SubUV/ParticleModuleSubUV.h
@@ -48,6 +48,7 @@ class UParticleModuleSubUV : public UParticleModuleSubUVBase
 #if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 #endif // WITH_EDITOR
+	virtual bool IsPostLoadThreadSafe() const override;
 	virtual void PostLoad() override;
 	virtual void PostInitProperties() override;
 	//End UObject Interface
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/TypeData/ParticleModuleTypeDataMesh.h b/Engine/Source/Runtime/Engine/Classes/Particles/TypeData/ParticleModuleTypeDataMesh.h
index 954aeaae86bb..1a28c8806d27 100644
--- a/Engine/Source/Runtime/Engine/Classes/Particles/TypeData/ParticleModuleTypeDataMesh.h
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/TypeData/ParticleModuleTypeDataMesh.h
@@ -211,6 +211,7 @@ class UParticleModuleTypeDataMesh : public UParticleModuleTypeDataBase
 	virtual void PostLoad();
 
 	//~ Begin UObject Interface
+	virtual bool IsPostLoadThreadSafe() const override;
 #if WITH_EDITOR
 	virtual void	PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 #endif // WITH_EDITOR
diff --git a/Engine/Source/Runtime/Engine/Classes/Particles/WorldPSCPool.h b/Engine/Source/Runtime/Engine/Classes/Particles/WorldPSCPool.h
new file mode 100644
index 000000000000..efe5a9f291b8
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Classes/Particles/WorldPSCPool.h
@@ -0,0 +1,133 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "WorldPSCPool.generated.h"
+
+class UParticleSystemComponent;
+class UParticleSystem;
+
+#define ENABLE_PSC_POOL_DEBUGGING (!UE_BUILD_SHIPPING)
+
+UENUM()
+enum class EPSCPoolMethod : uint8
+{
+	/**
+	* PSC is will be created fresh and not allocated from the pool.
+	*/
+	None,
+
+	/**
+	* PSC is allocated from the pool and will be automatically released back to it.
+	* User need not handle this any more that other PSCs but interaction with the PSC after the tick it's spawned in are unsafe.
+	* This method is useful for one-shot fx that you don't need to keep a reference to and can fire and forget.
+	*/
+	AutoRelease,
+
+	/**
+	* PSC is allocated from the pool but will NOT be automatically released back to it. User has ownership of the PSC and must call ReleaseToPool when finished with it otherwise the PSC will leak.
+	* Interaction with the PSC after it has been released are unsafe.
+	* This method is useful for persistent FX that you need to modify parameters upon etc over it's lifetime.
+	*/
+	ManualRelease,
+
+
+	/** 
+	Special entry allowing manual release PSCs to be manually released but wait until completion to be returned to the pool.
+	*/
+	ManualRelease_OnComplete UMETA(Hidden),
+};
+
+USTRUCT()
+struct FPSCPoolElem
+{
+	GENERATED_BODY()
+
+	UPROPERTY(transient)
+	UParticleSystemComponent* PSC;
+
+	float LastUsedTime;
+
+	FPSCPoolElem()
+		: PSC(nullptr), LastUsedTime(0.0f)
+	{
+
+	}
+	FPSCPoolElem(UParticleSystemComponent* InPSC, float InLastUsedTime)
+		: PSC(InPSC), LastUsedTime(InLastUsedTime)
+	{
+
+	}
+};
+
+
+USTRUCT()
+struct FPSCPool
+{
+	GENERATED_BODY()
+
+	//Collection of all currently allocated, free items ready to be grabbed for use.
+	//TODO: Change this to a FIFO queue to get better usage. May need to make this whole class behave similar to TCircularQueue.
+	UPROPERTY(transient)
+	TArray<FPSCPoolElem> FreeElements;
+
+	//Array of currently in flight components that will auto release.
+	UPROPERTY(transient)
+	TArray<UParticleSystemComponent*> InUseComponents_Auto;
+
+	//Array of currently in flight components that need manual release.
+	UPROPERTY(transient)
+	TArray<UParticleSystemComponent*> InUseComponents_Manual;
+	
+	/** Keeping track of max in flight systems to help inform any future pre-population we do. */
+	int32 MaxUsed;
+
+public:
+
+	FPSCPool();
+	void Cleanup();
+
+	/** Gets a PSC from the pool ready for use. */
+	UParticleSystemComponent* Acquire(UWorld* World, UParticleSystem* Template, EPSCPoolMethod PoolingMethod);
+	/** Returns a PSC to the pool. */
+	void Reclaim(UParticleSystemComponent* PSC, const float CurrentTimeSeconds);
+
+	/** Kills any components that have not been used since the passed KillTime. */
+	void KillUnusedComponents(float KillTime, UParticleSystem* Template);
+
+	int32 NumComponents() { return FreeElements.Num(); }
+};
+
+USTRUCT()
+struct FWorldPSCPool
+{
+	GENERATED_BODY()
+
+private:
+	UPROPERTY()
+	TMap<UParticleSystem*, FPSCPool> WorldParticleSystemPools;
+
+	float LastParticleSytemPoolCleanTime;
+
+	/** Cached world time last tick just to avoid us needing the world when reclaiming systems. */
+	float CachedWorldTime;
+public:
+
+	FWorldPSCPool();
+	~FWorldPSCPool();
+
+	void Cleanup();
+
+	UParticleSystemComponent* CreateWorldParticleSystem(UParticleSystem* Template, UWorld* World, EPSCPoolMethod PoolingMethod);
+
+	/** Called when an in-use particle component is finished and wishes to be returned to the pool. */
+	void ReclaimWorldParticleSystem(UParticleSystemComponent* PSC);
+
+	/** Call if you want to halt & reclaim all active particle systems and return them to their respective pools. */
+	void ReclaimActiveParticleSystems();
+	
+	/** Dumps the current state of the pool to the log. */
+	void Dump();
+};
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/AggregateGeom.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/AggregateGeom.h
index 0674627c78c6..f0c229dbc953 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/AggregateGeom.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/AggregateGeom.h
@@ -28,7 +28,7 @@ struct ENGINE_API FKAggregateGeom
 	UPROPERTY(EditAnywhere, editfixedsize, Category = "Aggregate Geometry", meta = (DisplayName = "Capsules"))
 	TArray<FKSphylElem> SphylElems;
 
-	UPROPERTY(VisibleAnywhere, editfixedsize, Category = "Aggregate Geometry", meta = (DisplayName = "Convex Elements"))
+	UPROPERTY(EditAnywhere, editfixedsize, Category = "Aggregate Geometry", meta = (DisplayName = "Convex Elements"))
 	TArray<FKConvexElem> ConvexElems;
 
 	UPROPERTY(EditAnywhere, editfixedsize, Category = "Aggregate Geometry", meta = (DisplayName = "Tapered Capsules"))
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodyInstance.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodyInstance.h
index 4a91933f3a38..f914c5913331 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodyInstance.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodyInstance.h
@@ -202,28 +202,6 @@ private:
 	UPROPERTY(EditAnywhere, Category=Custom)
 	TEnumAsByte<enum ECollisionChannel> ObjectType;
 
-public:
-	/** Current scale of physics - used to know when and how physics must be rescaled to match current transform of OwnerComponent. */
-	FVector Scale3D;
-
-	/////////
-	// COLLISION SETTINGS
-
-#if WITH_EDITORONLY_DATA
-	/** Types of objects that this physics objects will collide with. */
-	UPROPERTY() 
-	struct FCollisionResponseContainer ResponseToChannels_DEPRECATED;
-#endif // WITH_EDITORONLY_DATA
-
-private:
-
-	/** Collision Profile Name **/
-	UPROPERTY(EditAnywhere, Category=Custom)
-	FName CollisionProfileName;
-
-	/** Custom Channels for Responses*/
-	UPROPERTY(EditAnywhere, Category = Custom)
-	struct FCollisionResponse CollisionResponses;
 
 	/** Extra mask for filtering. Look at declaration for logic */
 	FMaskFilter MaskFilter;
@@ -261,6 +239,9 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Collision, meta = (DisplayName = "Simulation Generates Hit Events"))
 	uint8 bNotifyRigidBodyCollision : 1;
 
+	/**	Enable contact modification. Assumes custom contact modification has been provided (see FPhysXContactModifyCallback) */
+	uint8 bContactModification : 1;
+
 	/////////
 	// SIM SETTINGS
 
@@ -360,8 +341,44 @@ protected:
 	UPROPERTY(EditAnywhere, Category = Physics, meta = (InlineEditConditionToggle))
 	uint8 bOverrideWalkableSlopeOnInstance : 1;
 
+	/** 
+	 * Internal flag to allow us to quickly check whether we should interpolate when substepping 
+	 * e.g. kinematic bodies that are QueryOnly do not need to interpolate as we will not be querying them
+	 * at a sub-position.
+	 * This is complicated by welding, where multiple the CollisionEnabled flag of the root must be considered.
+	 */
+	UPROPERTY()
+	uint8 bInterpolateWhenSubStepping : 1;
+
+	/** Whether we are pending a collision profile setup */
+	uint8 bPendingCollisionProfileSetup : 1;
+
 	uint8 bHasSharedShapes : 1;
 
+public:
+	/** Current scale of physics - used to know when and how physics must be rescaled to match current transform of OwnerComponent. */
+	FVector Scale3D;
+
+	/////////
+	// COLLISION SETTINGS
+
+#if WITH_EDITORONLY_DATA
+	/** Types of objects that this physics objects will collide with. */
+	UPROPERTY() 
+	struct FCollisionResponseContainer ResponseToChannels_DEPRECATED;
+#endif // WITH_EDITORONLY_DATA
+
+private:
+
+	/** Collision Profile Name **/
+	UPROPERTY(EditAnywhere, Category=Custom)
+	FName CollisionProfileName;
+
+	/** Custom Channels for Responses*/
+	UPROPERTY(EditAnywhere, Category = Custom)
+	struct FCollisionResponse CollisionResponses;
+
+protected:
 	/** The maximum velocity used to depenetrate this object*/
 	UPROPERTY(EditAnywhere, AdvancedDisplay, BlueprintReadOnly, Category = Physics, meta = (editcondition = "bOverrideMaxDepenetrationVelocity", ClampMin = "0.0", UIMin = "0.0"))
 	float MaxDepenetrationVelocity;
@@ -374,8 +391,14 @@ protected:
 	/** The body setup holding the default body instance and its collision profile. */
 	TWeakObjectPtr<UBodySetup> ExternalCollisionProfileBodySetup;
 
+	/** Update the substepping interpolation flag */
+	void UpdateInterpolateWhenSubStepping();
+
 public:
 
+	/** Whether we should interpolate when substepping. @see bInterpolateWhenSubStepping */
+	bool ShouldInterpolateWhenSubStepping() const { return bInterpolateWhenSubStepping; }
+
 	/** Returns the mass override. See MassInKgOverride for documentation */
 	float GetMassOverride() const { return MassInKgOverride; }
 
@@ -470,6 +493,10 @@ public:
 	UPROPERTY(EditAnywhere, AdvancedDisplay, BlueprintReadOnly, Category=Physics)
 	int32 PositionSolverIterationCount;
 
+	/** This physics body's solver iteration count for velocity. Increasing this will be more CPU intensive, but better stabilized. */
+	UPROPERTY(EditAnywhere, AdvancedDisplay, BlueprintReadOnly, Category = Physics)
+	int32 VelocitySolverIterationCount;
+
 public:
 
 #if WITH_PHYSX
@@ -485,10 +512,6 @@ public:
 	TSharedPtr<TArray<ANSICHAR>> CharDebugName;
 #endif	//WITH_PHYSX
 
-	/** This physics body's solver iteration count for velocity. Increasing this will be more CPU intensive, but better stabilized. */
-	UPROPERTY(EditAnywhere, AdvancedDisplay, BlueprintReadOnly, Category = Physics)
-	int32 VelocitySolverIterationCount;
-
 	/** PrimitiveComponent containing this body.   */
 	TWeakObjectPtr<class UPrimitiveComponent> OwnerComponent;
 
@@ -776,6 +799,8 @@ public:
 	void SetInstanceNotifyRBCollision(bool bNewNotifyCollision);
 	/** Enables/disables whether this body is affected by gravity. */
 	void SetEnableGravity(bool bGravityEnabled);
+	/** Enables/disables contact modification */
+	void SetContactModification(bool bNewContactModification);
 
 	/** Enable/disable Continuous Collidion Detection feature */
 	void SetUseCCD(bool bInUseCCD);
@@ -856,8 +881,17 @@ public:
 	ECollisionEnabled::Type GetCollisionEnabled() const;
 
 	/**  
-	 * Set Collision Profile Name
+	 * Set Collision Profile Name (deferred)
 	 * This function is called by constructors when they set ProfileName
+	 * This will change current CollisionProfileName, but collision data will not be set up until the physics state is created
+	 * or the collision profile is accessed.
+	 * @param InCollisionProfileName : New Profile Name
+	 */
+	void SetCollisionProfileNameDeferred(FName InCollisionProfileName);
+
+	/**  
+	 * Set Collision Profile Name
+	 * This function should be called outside of constructors to set profile name.
 	 * This will change current CollisionProfileName to be this, and overwrite Collision Setting
 	 * 
 	 * @param InCollisionProfileName : New Profile Name
@@ -1043,6 +1077,9 @@ public:
 
 	const FCollisionResponse& GetCollisionResponse() const { return CollisionResponses; }
 
+	/** Applies a deferred collision profile */
+	void ApplyDeferredCollisionProfileName();
+
 #if WITH_PHYSX
 public:
 	FPhysxUserData PhysxUserData;
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetup.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetup.h
index 50aa53c9dfc9..ec7588a7b507 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetup.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetup.h
@@ -186,6 +186,9 @@ class UBodySetup : public UObject
 	/** Flag used to know if we have created the physics convex and tri meshes from the cooked data yet */
 	uint8 bCreatedPhysicsMeshes:1;
 
+	/** Flag used to know if we have failed to create physics meshes. Note that this is not the inverse of bCreatedPhysicsMeshes which is true even on failure */
+	uint8 bFailedToCreatePhysicsMeshes:1;
+
 	/** Indicates whether this setup has any cooked collision data. */
 	uint8 bHasCookedCollisionData:1;
 
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetupEnums.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetupEnums.h
index 38ae7b2a7361..a70789005a74 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetupEnums.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/BodySetupEnums.h
@@ -44,9 +44,6 @@ namespace EBodyCollisionResponse
 
 
 /** Helpers to convert enum to string */
-namespace Lex
-{
-	ENGINE_API const TCHAR* ToString(ECollisionTraceFlag Enum);
-	ENGINE_API const TCHAR* ToString(EPhysicsType Enum);
-	ENGINE_API const TCHAR* ToString(EBodyCollisionResponse::Type Enum);
-}
+ENGINE_API const TCHAR* LexToString(ECollisionTraceFlag Enum);
+ENGINE_API const TCHAR* LexToString(EPhysicsType Enum);
+ENGINE_API const TCHAR* LexToString(EBodyCollisionResponse::Type Enum);
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/PhysicsSettings.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/PhysicsSettings.h
index ea432a07d650..b61212e558c5 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/PhysicsSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/PhysicsSettings.h
@@ -72,6 +72,32 @@ namespace ESettingsLockedAxis
 	};
 }
 
+/** Settings pertaining to which PhysX broadphase to use, and settings for MBP if that is the chosen broadphase type */
+USTRUCT()
+struct FBroadphaseSettings
+{
+	GENERATED_BODY();
+
+	FBroadphaseSettings()
+		: bUseMBP(false)
+		, MBPBounds(EForceInit::ForceInitToZero)
+		, MBPNumSubdivs(2)
+	{
+
+	}
+
+	/** Whether to use MBP (Multi Broadphase Pruning */
+	UPROPERTY(EditAnywhere, Category = Broadphase)
+	bool bUseMBP;
+
+	/** Total bounds for MBP, must cover the game world or collisions are disabled for out of bounds actors */
+	UPROPERTY(EditAnywhere, Category = Broadphase, meta = (EditCondition = bUseMBP))
+	FBox MBPBounds;
+
+	/** Number of times to subdivide the MBP bounds, final number of regions is MBPNumSubdivs^2 */
+	UPROPERTY(EditAnywhere, Category = Broadphase, meta = (EditCondition = bUseMBP, ClampMin=1, ClampMax=16))
+	uint32 MBPNumSubdivs;
+};
 
 /**
  * Default physics settings.
@@ -203,6 +229,14 @@ class ENGINE_API UPhysicsSettings : public UDeveloperSettings
 	UPROPERTY(config, EditAnywhere, Category = Optimization)
 	bool bDisableActiveActors;
 
+	/** Whether to disable generating KS pairs, enabling this makes switching between dynamic and static slower for actors - but speeds up contact generation by early rejecting these pairs*/
+	UPROPERTY(config, EditAnywhere, Category = Optimization)
+	bool bDisableKinematicStaticPairs;
+
+	/** Whether to disable generating KK pairs, enabling this speeds up contact generation, however it is required when using APEX destruction. */
+	UPROPERTY(config, EditAnywhere, Category = Optimization)
+	bool bDisableKinematicKinematicPairs;
+
 	/**
 	*  If true CCD will be ignored. This is an optimization when CCD is never used which removes the need for physx to check it internally. */
 	UPROPERTY(config, EditAnywhere, Category = Simulation)
@@ -252,6 +286,12 @@ class ENGINE_API UPhysicsSettings : public UDeveloperSettings
 	UPROPERTY(config, EditAnywhere, Category=PhysicalSurfaces)
 	TArray<FPhysicalSurfaceName> PhysicalSurfaces;
 
+	UPROPERTY(config, EditAnywhere, Category = Broadphase)
+	FBroadphaseSettings ClientBroadphaseSettings;
+
+	UPROPERTY(config, EditAnywhere, Category = Broadphase)
+	FBroadphaseSettings ServerBroadphaseSettings;
+
 public:
 
 	static UPhysicsSettings* Get() { return CastChecked<UPhysicsSettings>(UPhysicsSettings::StaticClass()->GetDefaultObject()); }
diff --git a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/ShapeElem.h b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/ShapeElem.h
index 7d13295e0c9a..c7cfea38026f 100644
--- a/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/ShapeElem.h
+++ b/Engine/Source/Runtime/Engine/Classes/PhysicsEngine/ShapeElem.h
@@ -31,6 +31,7 @@ struct FKShapeElem
 	FKShapeElem()
 	: RestOffset(0.f)
 	, ShapeType(EAggCollisionShape::Unknown)
+	, bContributeToMass(true)
 #if WITH_PHYSX
 	, UserData(this)
 #endif
@@ -39,6 +40,7 @@ struct FKShapeElem
 	FKShapeElem(EAggCollisionShape::Type InShapeType)
 	: RestOffset(0.f)
 	, ShapeType(InShapeType)
+	, bContributeToMass(true)
 #if WITH_PHYSX
 	, UserData(this)
 #endif
@@ -46,7 +48,9 @@ struct FKShapeElem
 
 	FKShapeElem(const FKShapeElem& Copy)
 	: RestOffset(Copy.RestOffset)
+	, Name(Copy.Name)
 	, ShapeType(Copy.ShapeType)
+	, bContributeToMass(Copy.bContributeToMass)
 #if WITH_PHYSX
 	, UserData(this)
 #endif
@@ -74,15 +78,21 @@ struct FKShapeElem
 
 	ENGINE_API static EAggCollisionShape::Type StaticShapeType;
 
-#if WITH_EDITORONLY_DATA
 	/** Get the user-defined name for this shape */
-	ENGINE_API const FString& GetName() { return Name; }
+	ENGINE_API const FName& GetName() const { return Name; }
 
 	/** Set the user-defined name for this shape */
-	ENGINE_API void SetName(const FString& InName) { Name = InName; }
-#endif
+	ENGINE_API void SetName(const FName& InName) { Name = InName; }
 
-	/** Offset used when generating contact points. This allows you to smooth out the minkowski sum by radius R. Useful for making objects slide smoothly on top of iregularities  */
+	/** Get whether this shape contributes to the mass of the body */
+	ENGINE_API bool GetContributeToMass() const { return bContributeToMass; }
+
+	/** Set whether this shape will contribute to the mass of the body */
+	ENGINE_API void SetContributeToMass(bool bInContributeToMass) { bContributeToMass = bInContributeToMass; }
+
+	/** Offset used when generating contact points. This allows you to smooth out
+		the Minkowski sum by radius R. Useful for making objects slide smoothly
+		on top of irregularities  */
 	UPROPERTY(Category = Shape, EditAnywhere)
 	float RestOffset;
 
@@ -91,17 +101,23 @@ protected:
 	void CloneElem(const FKShapeElem& Other)
 	{
 		ShapeType = Other.ShapeType;
+		Name = Other.Name;
+		bContributeToMass = Other.bContributeToMass;
 	}
 
 private:
-#if WITH_EDITORONLY_DATA
 	/** User-defined name for this shape */
 	UPROPERTY(Category=Shape, EditAnywhere)
-	FString Name;
-#endif
+	FName Name;
 
 	EAggCollisionShape::Type ShapeType;
 
+	/** True if this shape should contribute to the overall mass of the body it
+		belongs to. This lets you create extra collision volumes which do not affect
+		the mass properties of an object. */
+	UPROPERTY(Category=Shape, EditAnywhere)
+	uint8 bContributeToMass : 1;
+
 #if WITH_PHYSX
 	FPhysxUserData UserData;
 #endif // WITH_PHYSX
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/AudioSettings.h b/Engine/Source/Runtime/Engine/Classes/Sound/AudioSettings.h
index 3b7431529502..2b979daa0941 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/AudioSettings.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/AudioSettings.h
@@ -126,14 +126,20 @@ class ENGINE_API UAudioSettings : public UDeveloperSettings
 	UPROPERTY(config, EditAnywhere, Category = "Quality", AdvancedDisplay)
 	uint32 bDisableMasterEQ : 1;
 
-
 	/** Enables the surround sound spatialization calculations to include the center channel. */
 	UPROPERTY(config, EditAnywhere, Category = "Quality", AdvancedDisplay)
 	uint32 bAllowCenterChannel3DPanning : 1;
 
 	/** The max number of active sounds allowed. Used to cull numbers of active sounds, which reduces CPU cost of audio thread. */
 	UPROPERTY(config, EditAnywhere, Category = "Quality", AdvancedDisplay)
-	uint32 MaxOneShotActiveSoundCount;
+	uint32 MaxWaveInstances;
+
+	/** 
+	 * The max number of sources to reserve for "stopping" sounds. A "stopping" sound applies a fast fade in the DSP
+	 * render to prevent discontinuities when stopping sources.  
+	 */
+	UPROPERTY(config, EditAnywhere, Category = "Quality", AdvancedDisplay)
+	uint32 NumStoppingSources;
 
 	/**
 	 * The format string to use when generating the filename for contexts within dialogue waves. This must generate unique names for your project.
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/AudioVolume.h b/Engine/Source/Runtime/Engine/Classes/Sound/AudioVolume.h
index b05e4ad5bfac..7b386046168f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/AudioVolume.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/AudioVolume.h
@@ -86,6 +86,7 @@ struct FReverbSettings
 		: bApplyReverb(true)
 		, ReverbType_DEPRECATED(REVERB_Default)
 		, ReverbEffect(nullptr)
+		, ReverbPluginEffect(nullptr)
 		, Volume(0.5f)
 		, FadeTime(2.0f)
 	{
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/DialogueSoundWaveProxy.h b/Engine/Source/Runtime/Engine/Classes/Sound/DialogueSoundWaveProxy.h
index 781d04b6da3e..668f1d82993f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/DialogueSoundWaveProxy.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/DialogueSoundWaveProxy.h
@@ -37,7 +37,7 @@ public:
 	/** 
 	 * Returns the length of the sound
 	 */
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 
 	virtual float GetVolumeMultiplier() override;
 	virtual float GetPitchMultiplier() override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundAttenuation.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundAttenuation.h
index 5ae0e400de06..7062caf4d6a2 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundAttenuation.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundAttenuation.h
@@ -80,46 +80,64 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 
 	/* Allows distance-based volume attenuation. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationDistance, meta = (DisplayName = "Enable Volume Attenuation"))
-	uint32 bAttenuate : 1;
+	uint8 bAttenuate : 1;
 
 	/* Allows the source to be 3D spatialized. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta = (DisplayName = "Enable Spatialization"))
-	uint32 bSpatialize : 1;
+	uint8 bSpatialize : 1;
 
 	/** Allows simulation of air absorption by applying a filter with a cutoff frequency as a function of distance. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption, meta = (DisplayName = "Enable Air Absorption"))
-	uint32 bAttenuateWithLPF : 1;
+	uint8 bAttenuateWithLPF : 1;
 
 	/** Enable listener focus-based adjustments. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationListenerFocus)
-	uint32 bEnableListenerFocus : 1;
+	uint8 bEnableListenerFocus : 1;
 
 	/** Enables focus interpolation to smooth transition in and and of focus. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationListenerFocus)
-	uint32 bEnableFocusInterpolation : 1;
+	uint8 bEnableFocusInterpolation : 1;
 
 	/** Enables realtime occlusion tracing. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion)
-	uint32 bEnableOcclusion : 1;
+	uint8 bEnableOcclusion : 1;
 
 	/** Enables tracing against complex collision when doing occlusion traces. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion)
-	uint32 bUseComplexCollisionForOcclusion : 1;
+	uint8 bUseComplexCollisionForOcclusion : 1;
 
 	/** Enables adjusting reverb sends based on distance. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend, meta = (DisplayName = "Enable Reverb Send"))
-	uint32 bEnableReverbSend : 1;
+	uint8 bEnableReverbSend : 1;
 
 	/** Enables applying a -6 dB attenuation to stereo assets which are 3d spatialized. Avoids clipping when assets have spread of 0.0 due to channel summing. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta = (DisplayName = "Normalize 3D Stereo Sounds"))
-	uint32 bApplyNormalizationToStereoSounds : 1;
+	uint8 bApplyNormalizationToStereoSounds : 1;
 
 	/** Enables applying a log scale to frequency values (so frequency sweeping is perceptually linear). */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption, meta = (DisplayName = "Enable Log Frequency Scaling"))
-	uint32 bEnableLogFrequencyScaling : 1;
+	uint8 bEnableLogFrequencyScaling : 1;
 
+	/** What method we use to spatialize the sound. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta = (ClampMin = "0", EditCondition = "bSpatialize", DisplayName = "Spatialization Method"))
+	TEnumAsByte<enum ESoundSpatializationAlgorithm> SpatializationAlgorithm;
+
+	/** What method to use to map distance values to frequency absorption values. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption)
+	EAirAbsorptionMethod AbsorptionMethod;
+
+	/* Which trace channel to use for audio occlusion checks. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion)
+	TEnumAsByte<enum ECollisionChannel> OcclusionTraceChannel;
+
+	/** What method to use to control master reverb sends */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend)
+	EReverbSendMethod ReverbSendMethod;
+
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	TEnumAsByte<enum ESoundDistanceCalc> DistanceType_DEPRECATED;
+#endif
 
 	/** The distance below which a sound is non-spatialized (2D). This prevents near-field audio from flipping as audio crosses the listener's position. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta=(ClampMin = "0", EditCondition="bSpatialize", DisplayName="Non-Spatialized Radius"))
@@ -129,10 +147,7 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta = (ClampMin = "0", EditCondition = "bSpatialize", DisplayName = "3D Stereo Spread"))
 	float StereoSpread;
 
-	/** What method we use to spatialize the sound. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationSpatialization, meta = (ClampMin = "0", EditCondition = "bSpatialize", DisplayName = "Spatialization Method"))
-	TEnumAsByte<enum ESoundSpatializationAlgorithm> SpatializationAlgorithm;
-
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	USpatializationPluginSourceSettingsBase* SpatializationPluginSettings_DEPRECATED;
 
@@ -141,6 +156,7 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 
 	UPROPERTY()
 	float RadiusMax_DEPRECATED;
+#endif
 
 	/* The distance min range at which to apply an absorption LPF filter. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption, meta = (DisplayName = "Min Distance Range"))
@@ -150,10 +166,6 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption, meta = (DisplayName = "Max Distance Range"))
 	float LPFRadiusMax;
 
-	/** What method to use to map distance values to frequency absorption values. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption)
-	EAirAbsorptionMethod AbsorptionMethod;
-
 	/* The normalized custom curve to use for the air absorption lowpass frequency values. Does a mapping from defined distance values (x-axis) and defined frequency values (y-axis) */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationAirAbsorption)
 	FRuntimeFloatCurve CustomLowpassAirAbsorptionCurve;
@@ -218,10 +230,6 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationListenerFocus, meta = (ClampMin = "0.0", UIMin = "0.0", EditCondition = "bEnableFocusInterpolation"))
 	float FocusReleaseInterpSpeed;
 
-	/* Which trace channel to use for audio occlusion checks. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion)
-	TEnumAsByte<enum ECollisionChannel> OcclusionTraceChannel;
-
 	/** The low pass filter frequency (in hertz) to apply if the sound playing in this audio component is occluded. This will override the frequency set in LowPassFilterFrequency. A frequency of 0.0 is the device sample rate and will bypass the filter. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion, meta = (ClampMin = "0.0", UIMin = "0.0", EditCondition = "bEnableOcclusion"))
 	float OcclusionLowPassFilterFrequency;
@@ -234,15 +242,13 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationOcclusion, meta = (ClampMin = "0", UIMin = "0.0", EditCondition = "bEnableOcclusion"))
 	float OcclusionInterpolationTime;
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY()
 	UOcclusionPluginSourceSettingsBase* OcclusionPluginSettings_DEPRECATED;
 
-	/** What method to use to control master reverb sends */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend)
-	EReverbSendMethod ReverbSendMethod;
-
 	UPROPERTY()
 	UReverbPluginSourceSettingsBase* ReverbPluginSettings_DEPRECATED;
+#endif
 
 	/** The amount to send to master reverb when sound is located at a distance equal to value specified in the reverb min send distance. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend, meta = (DisplayName = "Reverb Min Send Level"))
@@ -260,14 +266,14 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend, meta = (DisplayName = "Reverb Max Send Distance"))
 	float ReverbDistanceMax;
 
-	/* The custom reverb send curve to use for distance-based send level. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend)
-	FRuntimeFloatCurve CustomReverbSendCurve;
-
 	/* The manual master reverb send level to use. Doesn't change as a function of distance. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend)
 	float ManualReverbSendLevel;
 
+	/* The custom reverb send curve to use for distance-based send level. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationReverbSend)
+	FRuntimeFloatCurve CustomReverbSendCurve;
+
 	/** Sound attenuation plugin settings to use with sounds that play with this attenuation setting. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AttenuationPluginSettings, meta = (ShowOnlyInnerProperties))
 	FSoundAttenuationPluginSettings PluginSettings;
@@ -283,16 +289,22 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 		, bEnableReverbSend(true)
 		, bApplyNormalizationToStereoSounds(false)
 		, bEnableLogFrequencyScaling(false)
+		, SpatializationAlgorithm(ESoundSpatializationAlgorithm::SPATIALIZATION_Default)
+		, AbsorptionMethod(EAirAbsorptionMethod::Linear)
+		, OcclusionTraceChannel(ECC_Visibility)
+		, ReverbSendMethod(EReverbSendMethod::Linear)
+#if WITH_EDITORONLY_DATA
 		, DistanceType_DEPRECATED(SOUNDDISTANCE_Normal)
+#endif
 		, OmniRadius(0.0f)
 		, StereoSpread(200.0f)
-		, SpatializationAlgorithm(ESoundSpatializationAlgorithm::SPATIALIZATION_Default)
+#if WITH_EDITORONLY_DATA
 		, SpatializationPluginSettings_DEPRECATED(nullptr)
 		, RadiusMin_DEPRECATED(400.f)
 		, RadiusMax_DEPRECATED(4000.f)
+#endif
 		, LPFRadiusMin(3000.f)
 		, LPFRadiusMax(6000.f)
-		, AbsorptionMethod(EAirAbsorptionMethod::Linear)
 		, LPFFrequencyAtMin(20000.f)
 		, LPFFrequencyAtMax(20000.f)
 		, HPFFrequencyAtMin(0.0f)
@@ -307,13 +319,13 @@ struct ENGINE_API FSoundAttenuationSettings : public FBaseAttenuationSettings
 		, NonFocusVolumeAttenuation(1.0f)
 		, FocusAttackInterpSpeed(1.0f)
 		, FocusReleaseInterpSpeed(1.0f)
-		, OcclusionTraceChannel(ECC_Visibility)
 		, OcclusionLowPassFilterFrequency(20000.f)
 		, OcclusionVolumeAttenuation(1.0f)
 		, OcclusionInterpolationTime(0.1f)
+#if WITH_EDITORONLY_DATA
 		, OcclusionPluginSettings_DEPRECATED(nullptr)
-		, ReverbSendMethod(EReverbSendMethod::Linear)
 		, ReverbPluginSettings_DEPRECATED(nullptr)
+#endif
 		, ReverbWetLevelMin(0.3f)
 		, ReverbWetLevelMax(0.95f)
 		, ReverbDistanceMin(AttenuationShapeExtents.X)
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundBase.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundBase.h
index 988f1a4c11a6..81da09ae7827 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundBase.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundBase.h
@@ -43,35 +43,43 @@ public:
 
 	/** When "stat sounds -debug" has been specified, draw this sound's attenuation shape when the sound is audible. For debugging purpose only. */
 	UPROPERTY(EditAnywhere, Category = Debug)
-	uint32 bDebug:1;
+	uint8 bDebug:1;
 
 	/** Whether or not to override the sound concurrency object with local concurrency settings. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Concurrency)
-	uint32 bOverrideConcurrency:1;
+	uint8 bOverrideConcurrency:1;
 
 	/** Whether or not to only send this audio's output to a bus. If true, will not be this sound won't be audible except through bus sends. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Effects)
-	uint32 bOutputToBusOnly : 1;
+	uint8 bOutputToBusOnly : 1;
 
 	UPROPERTY()
-	uint32 bIgnoreFocus_DEPRECATED:1;
+	uint8 bIgnoreFocus_DEPRECATED:1;
 
 	/** Whether or not to only send this audio's output to a bus. If true, will not be this sound won't be audible except through bus sends. */
 	UPROPERTY()
-	uint32 bHasDelayNode : 1;
+	uint8 bHasDelayNode : 1;
 
 	/** Whether or not this sound has a concatenator node. If it does, we have to allow the sound to persist even though it may not have generate audible audio in a given audio thread frame. */
 	UPROPERTY()
-	uint32 bHasConcatenatorNode : 1;
+	uint8 bHasConcatenatorNode : 1;
 
 	/** Whether a sound has virtualize when silent enabled (i.e. for a sound cue, if any sound wave player has it enabled). */
 	UPROPERTY()
-	uint32 bHasVirtualizeWhenSilent:1;
+	uint8 bHasVirtualizeWhenSilent:1;
 
 	/** Allows this sound to bypass volume-weighting for the max channel resolution. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Concurrency)
 	uint8 bBypassVolumeScaleForPriority : 1;
 
+#if WITH_EDITORONLY_DATA
+	UPROPERTY()
+	TEnumAsByte<enum EMaxConcurrentResolutionRule::Type> MaxConcurrentResolutionRule_DEPRECATED;
+#endif
+
+	/** Number of times this cue is currently being played. */
+	int32 CurrentPlayCount;
+
 	/** If Override Concurrency is false, the sound concurrency settings to use for this sound. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Concurrency, meta = (EditCondition = "!bOverrideConcurrency"))
 	class USoundConcurrency* SoundConcurrencySettings;
@@ -80,12 +88,11 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Concurrency, meta = (EditCondition = "bOverrideConcurrency"))
 	struct FSoundConcurrencySettings ConcurrencyOverrides;
 
-	UPROPERTY()
-	TEnumAsByte<enum EMaxConcurrentResolutionRule::Type> MaxConcurrentResolutionRule_DEPRECATED;
-
+#if WITH_EDITORONLY_DATA
 	/** Maximum number of times this sound can be played concurrently. */
 	UPROPERTY()
 	int32 MaxConcurrentPlayCount_DEPRECATED;
+#endif
 
 	/** Duration of sound in seconds. */
 	UPROPERTY(Category=Info, AssetRegistrySearchable, VisibleAnywhere, BlueprintReadOnly)
@@ -99,14 +106,14 @@ public:
 	UPROPERTY(Category = Info, AssetRegistrySearchable, VisibleAnywhere, BlueprintReadOnly)
 	float TotalSamples;
 
-	/** Attenuation settings package for the sound */
-	UPROPERTY(EditAnywhere, Category=Attenuation)
-	USoundAttenuation* AttenuationSettings;
-
 	/** Sound priority (higher value is higher priority) used for concurrency resolution. This priority value is weighted against the final volume of the sound. */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Concurrency, meta = (ClampMin = "0.0", UIMin = "0.0", ClampMax = "100.0", UIMax = "100.0") )
 	float Priority;
 
+	/** Attenuation settings package for the sound */
+	UPROPERTY(EditAnywhere, Category=Attenuation)
+	USoundAttenuation* AttenuationSettings;
+
 	/** Sound submix this sound belongs to. 
 	  * Audio will play here and traverse through the submix graph. 
 	  * A null entry will make the sound obey the default master effects graph.
@@ -131,8 +138,6 @@ public:
 	TArray<FSoundSourceBusSendInfo> PreEffectBusSends;
 
 public:	
-	/** Number of times this cue is currently being played. */
-	int32 CurrentPlayCount;
 
 	//~ Begin UObject Interface.
 	virtual void PostInitProperties() override;
@@ -159,7 +164,7 @@ public:
 	/** 
 	 * Returns the length of the sound
 	 */
-	virtual float GetDuration() const;
+	virtual float GetDuration();
 
 	/** Returns whether or not this sound has a delay node, which means it's possible for the sound to not generate audio for a while. */
 	bool HasDelayNode() const;
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundCue.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundCue.h
index 4839e085e90b..4b613d1a2739 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundCue.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundCue.h
@@ -82,6 +82,10 @@ class USoundCue : public USoundBase
 	UPROPERTY(EditAnywhere, Category=Attenuation)
 	uint32 bOverrideAttenuation:1;
 
+	/* Makes this sound cue ignore per-platform random node culling for memory purposes */
+	UPROPERTY(EditAnywhere, Category=Culling)
+	uint32 bExcludeFromRandomNodeBranchCulling:1;
+
 	UPROPERTY()
 	class USoundNode* FirstNode;
 
@@ -140,7 +144,7 @@ public:
 	virtual float GetVolumeMultiplier() override;
 	virtual float GetPitchMultiplier() override;
 	virtual float GetMaxDistance() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual const FSoundAttenuationSettings* GetAttenuationSettingsToApply() const override;
 	virtual float GetSubtitlePriority() const override;
 	//~ End USoundBase Interface.
@@ -211,6 +215,7 @@ private:
 	void OnPostEngineInit();
 	void EvaluateNodes(bool bAddToRoot);
 
+
 	FDelegateHandle OnPostEngineInitHandle;
 	static int32 CachedQualityLevel;
 
@@ -248,9 +253,11 @@ public:
 
 private:
 
+	/** Recursively sets the branch culling exclusion on random nodes in this sound cue. */
+	void RecursivelySetExcludeBranchCulling(USoundNode* CurrentNode);
+
 	/** Ptr to interface to sound cue editor operations. */
 	static ENGINE_API TSharedPtr<ISoundCueAudioEditor> SoundCueAudioEditor;
-
 #endif
 };
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNode.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNode.h
index c7163564a4c1..d6b4153ffd25 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNode.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNode.h
@@ -109,7 +109,7 @@ public:
 	 *
 	 * @return	float of number of seconds this sound will play for. INDEFINITELY_LOOPING_DURATION means its looping.
 	 */
-	virtual float GetDuration() const;
+	virtual float GetDuration();
 
 	/** Returns whether the sound cue has a delay node. */
 	virtual bool HasDelayNode() const;
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeConcatenator.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeConcatenator.h
index 65890e8b32fd..987c2eabb5fd 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeConcatenator.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeConcatenator.h
@@ -33,7 +33,7 @@ class USoundNodeConcatenator : public USoundNode
 public:	
 	//~ Begin USoundNode Interface. 
 	virtual bool NotifyWaveInstanceFinished( struct FWaveInstance* WaveInstance ) override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual bool HasConcatenatorNode() const override { return true; }
 	virtual int32 GetNumSounds(const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound) const;
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDelay.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDelay.h
index ed6504c6ee3d..34f4c65bd0a1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDelay.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDelay.h
@@ -31,7 +31,7 @@ class USoundNodeDelay : public USoundNode
 public:
 	//~ Begin USoundNode Interface. 
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual bool HasDelayNode() const override { return true; }
 	//~ End USoundNode Interface. 
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDialoguePlayer.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDialoguePlayer.h
index c8ca42619b8d..f22b6925fde1 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDialoguePlayer.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeDialoguePlayer.h
@@ -35,7 +35,7 @@ public:
 
 	//~ Begin USoundNode Interface
 	virtual int32 GetMaxChildNodes() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration();
 	virtual int32 GetNumSounds(const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound) const { return 1; }
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
 #if WITH_EDITOR
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeEnveloper.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeEnveloper.h
index a6a1dba0dc68..1083797b3a5f 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeEnveloper.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeEnveloper.h
@@ -88,7 +88,7 @@ public:
 
 	//~ Begin USoundNode Interface. 
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	//~ End USoundNode Interface. 
 
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeLooping.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeLooping.h
index 39088b00c833..05dfb3312bc8 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeLooping.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeLooping.h
@@ -36,7 +36,7 @@ class USoundNodeLooping : public USoundNode
 public:	
 	//~ Begin USoundNode interface. 
 	virtual bool NotifyWaveInstanceFinished( struct FWaveInstance* WaveInstance ) override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
 	virtual int32 GetNumSounds(const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound) const;
 	//~ End USoundNode interface. 
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeRandom.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeRandom.h
index d21acc61f0a4..0873dc3a2197 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeRandom.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeRandom.h
@@ -37,6 +37,10 @@ class USoundNodeRandom : public USoundNode
 	UPROPERTY(EditAnywhere, Category = Random)
 	uint8 bShouldExcludeFromBranchCulling : 1;
 
+	/** Exclusion for branch culling set by the sound cue. */
+	UPROPERTY()
+	uint8 bSoundCueExcludedFromBranchCulling : 1;
+
 	/** 
 	 * Determines whether or not this SoundNodeRandom should randomize with or without
 	 * replacement.  
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWaveParam.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWaveParam.h
index b27ede50de1f..2e60b5e5a4c4 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWaveParam.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWaveParam.h
@@ -27,7 +27,7 @@ class USoundNodeWaveParam : public USoundNode
 
 public:	
 	//~ Begin USoundNode Interface
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual void ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
 	//~ End USoundNode Interface
 };
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWavePlayer.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWavePlayer.h
index 084e0c50ec35..d878fe736e71 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWavePlayer.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundNodeWavePlayer.h
@@ -51,7 +51,7 @@ public:
 
 	//~ Begin USoundNode Interface
 	virtual int32 GetMaxChildNodes() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual bool IsVirtualizeWhenSilent() const override;
 	virtual int32 GetNumSounds(const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound) const { return 1; }
 	virtual void ParseNodes(FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances) override;
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundSourceBus.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundSourceBus.h
index 985df9bb37aa..e14be7e45822 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundSourceBus.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundSourceBus.h
@@ -50,7 +50,7 @@ public:
 
 	//~ Begin USoundBase Interface.
 	virtual bool IsPlayable() const override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	//~ End USoundBase Interface.
 
 protected:
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundWave.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundWave.h
index 4bf3d5df7316..b68ff6b626b9 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundWave.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundWave.h
@@ -37,6 +37,14 @@ enum EDecompressionType
 	DTYPE_MAX,
 };
 
+/** Precache states */
+enum class ESoundWavePrecacheState
+{
+	NotStarted,
+	InProgress,
+	Done
+};
+
 /**
  * A chunk of streamed audio.
  */
@@ -130,60 +138,92 @@ class ENGINE_API USoundWave : public USoundBase
 	UPROPERTY(EditAnywhere, Category=Compression, meta=(ClampMin = "1", ClampMax = "100"), AssetRegistrySearchable)
 	int32 CompressionQuality;
 
-	/** Quality of sample rate conversion for platforms that opt into resampling during cook. */
-	UPROPERTY(EditAnywhere, Category = Quality)
-	ESoundwaveSampleRateSettings SampleRateQuality;
-
-	/** If set, when played directly (not through a sound cue) the wave will be played looping. */
-	UPROPERTY(EditAnywhere, Category=SoundWave, AssetRegistrySearchable)
-	uint32 bLooping:1;
-
-	/** Whether this sound can be streamed to avoid increased memory usage */
-	UPROPERTY(EditAnywhere, Category=Streaming)
-	uint32 bStreaming:1;
-
 	/** Priority of this sound when streaming (lower priority streams may not always play) */
 	UPROPERTY(EditAnywhere, Category=Streaming, meta=(ClampMin=0))
 	int32 StreamingPriority;
 
-	/** Set to true for programmatically-generated, streamed audio. */
-	uint32 bProcedural:1;
+	/** Quality of sample rate conversion for platforms that opt into resampling during cook. */
+	UPROPERTY(EditAnywhere, Category = Quality)
+	ESoundwaveSampleRateSettings SampleRateQuality;
 
-	/** Set to true of this is a bus sound source. This will result in the sound wave not generating audio for itself, but generate audio through instances. Used only in audio mixer. */
-	uint32 bIsBus:1;
-
-	/** Set to true for procedural waves that can be processed asynchronously. */
-	uint32 bCanProcessAsync:1;
-
-	/** Whether to free the resource data after it has been uploaded to the hardware */
-	uint32 bDynamicResource:1;
-
-	/** If set to true if this sound is considered to contain mature/adult content. */
-	UPROPERTY(EditAnywhere, Category=Subtitles, AssetRegistrySearchable)
-	uint32 bMature:1;
-
-	/** If set to true will disable automatic generation of line breaks - use if the subtitles have been split manually. */
-	UPROPERTY(EditAnywhere, Category=Subtitles )
-	uint32 bManualWordWrap:1;
-
-	/** If set to true the subtitles display as a sequence of single lines as opposed to multiline. */
-	UPROPERTY(EditAnywhere, Category=Subtitles )
-	uint32 bSingleLine:1;
-
-	/** Allows sound to play at 0 volume, otherwise will stop the sound when the sound is silent. */
-	UPROPERTY(EditAnywhere, Category=Sound)
-	uint32 bVirtualizeWhenSilent:1;
-
-	/** Whether or not this source is ambisonics file format. */
-	UPROPERTY(EditAnywhere, Category = Sound)
-	uint32 bIsAmbisonics : 1;
-
-	/** Whether this SoundWave was decompressed from OGG. */
-	uint32 bDecompressedFromOgg:1;
+	/** Type of buffer this wave uses. Set once on load */
+	TEnumAsByte<enum EDecompressionType> DecompressionType;
 
 	UPROPERTY(EditAnywhere, Category=Sound)
 	TEnumAsByte<ESoundGroup> SoundGroup;
 
+	/** If set, when played directly (not through a sound cue) the wave will be played looping. */
+	UPROPERTY(EditAnywhere, Category=SoundWave, AssetRegistrySearchable)
+	uint8 bLooping:1;
+
+	/** Whether this sound can be streamed to avoid increased memory usage */
+	UPROPERTY(EditAnywhere, Category=Streaming)
+	uint8 bStreaming:1;
+
+	/** Set to true for programmatically-generated, streamed audio. */
+	uint8 bProcedural:1;
+
+	/** Set to true of this is a bus sound source. This will result in the sound wave not generating audio for itself, but generate audio through instances. Used only in audio mixer. */
+	uint8 bIsBus:1;
+
+	/** Set to true for procedural waves that can be processed asynchronously. */
+	uint8 bCanProcessAsync:1;
+
+	/** Whether to free the resource data after it has been uploaded to the hardware */
+	uint8 bDynamicResource:1;
+
+	/** If set to true if this sound is considered to contain mature/adult content. */
+	UPROPERTY(EditAnywhere, Category=Subtitles, AssetRegistrySearchable)
+	uint8 bMature:1;
+
+	/** If set to true will disable automatic generation of line breaks - use if the subtitles have been split manually. */
+	UPROPERTY(EditAnywhere, Category=Subtitles )
+	uint8 bManualWordWrap:1;
+
+	/** If set to true the subtitles display as a sequence of single lines as opposed to multiline. */
+	UPROPERTY(EditAnywhere, Category=Subtitles )
+	uint8 bSingleLine:1;
+
+	/** Allows sound to play at 0 volume, otherwise will stop the sound when the sound is silent. */
+	UPROPERTY(EditAnywhere, Category=Sound)
+	uint8 bVirtualizeWhenSilent:1;
+
+	/** Whether or not this source is ambisonics file format. */
+	UPROPERTY(EditAnywhere, Category = Sound)
+	uint8 bIsAmbisonics : 1;
+
+	/** Whether this SoundWave was decompressed from OGG. */
+	uint8 bDecompressedFromOgg:1;
+
+private:
+
+#if !WITH_EDITOR
+	// This is set to false on initialization, then set to true on non-editor platforms when we cache appropriate sample rate.
+	uint8 bCachedSampleRateFromPlatformSettings : 1;
+
+	// This is set when SetSampleRate is called to invalidate our cached sample rate while not re-parsing project settings.
+	uint8 bSampleRateManuallyReset : 1;
+#endif
+
+	enum class ESoundWaveResourceState : uint8
+	{
+		NeedsFree,
+		Freeing,
+		Freed
+	};
+
+	ESoundWaveResourceState ResourceState;
+
+	/** What state the precache decompressor is in. */
+	FThreadSafeCounter PrecacheState;
+
+#if !WITH_EDITOR
+	// This is the sample rate gotten from platform settings.
+	float CachedSampleRateOverride;
+#endif // !WITH_EDITOR
+
+public:
+
 	/** A localized version of the text that is actually spoken phonetically in the audio. */
 	UPROPERTY(EditAnywhere, Category=Subtitles )
 	FString SpokenText;
@@ -215,6 +255,13 @@ class ENGINE_API USoundWave : public USoundBase
 
 #endif // WITH_EDITORONLY_DATA
 
+protected:
+
+	/** Cached sample rate for displaying in the tools */
+	UPROPERTY(Category = Info, AssetRegistrySearchable, VisibleAnywhere)
+	int32 SampleRate;
+
+public:
 	/**
 	 * Subtitle cues.  If empty, use SpokenText as the subtitle.  Will often be empty,
 	 * as the contents of the subtitle is commonly identical to what is spoken.
@@ -256,12 +303,6 @@ protected:
 	UPROPERTY()
 	class UCurveTable* InternalCurves;
 
-protected:
-
-	/** Cached sample rate for displaying in the tools */
-	UPROPERTY(Category = Info, AssetRegistrySearchable, VisibleAnywhere)
-	int32 SampleRate;
-
 private:
 
 	/**
@@ -274,9 +315,6 @@ public:
 	typedef FAsyncTask< class FAsyncAudioDecompressWorker > FAsyncAudioDecompress;	// Forward declare typedef
 	FAsyncAudioDecompress*		AudioDecompressor;
 
-	/** Whether or not the the precache task has finished. */
-	FThreadSafeBool				bIsPrecacheDone;
-
 	/** Pointer to 16 bit PCM data - used to avoid synchronous operation to obtain first block of the realtime decompressed buffer */
 	uint8*						CachedRealtimeFirstBuffer;
 
@@ -297,9 +335,6 @@ public:
 
 	FFormatContainer			CompressedFormatData;
 
-	/** Type of buffer this wave uses. Set once on load */
-	TEnumAsByte<enum EDecompressionType> DecompressionType;
-
 	/** Resource index to cross reference with buffers */
 	int32 ResourceID;
 
@@ -310,10 +345,10 @@ public:
 	int32 TrackedMemoryUsage;
 
 	/** The streaming derived data for this sound on this platform. */
-	FStreamedAudioPlatformData *RunningPlatformData;
+	FStreamedAudioPlatformData* RunningPlatformData;
 
 	/** cooked streaming platform data for this sound */
-	TMap<FString, FStreamedAudioPlatformData*> CookedPlatformData;
+	TSortedMap<FString, FStreamedAudioPlatformData*> CookedPlatformData;
 
 	//~ Begin UObject Interface. 
 	virtual void Serialize( FArchive& Ar ) override;
@@ -333,7 +368,7 @@ public:
 	//~ Begin USoundBase Interface.
 	virtual bool IsPlayable() const override;
 	virtual void Parse( class FAudioDevice* AudioDevice, const UPTRINT NodeWaveInstanceHash, FActiveSound& ActiveSound, const FSoundParseParameters& ParseParams, TArray<FWaveInstance*>& WaveInstances ) override;
-	virtual float GetDuration() const override;
+	virtual float GetDuration() override;
 	virtual float GetSubtitlePriority() const override;
 	virtual bool IsAllowedVirtual() const override;
 	//~ End USoundBase Interface.
@@ -364,6 +399,9 @@ public:
 	 */
 	void FreeResources();
 
+	/** Will clean up the decompressor task if the task has finished or force it finish. Returns true if the decompressor is cleaned up. */
+	bool CleanupDecompressor(bool bForceCleanup = false);
+
 	/** 
 	 * Copy the compressed audio data from the bulk data
 	 */
@@ -549,27 +587,15 @@ public:
 	 */
 	bool GetChunkData(int32 ChunkIndex, uint8** OutChunkData);
 
-private:
-
-	enum class ESoundWaveResourceState
+	void SetPrecacheState(ESoundWavePrecacheState InState)
 	{
-		NeedsFree,
-		Freeing,
-		Freed
-	};
+		PrecacheState.Set((int32)InState);
+	}
 
-	ESoundWaveResourceState ResourceState;
-
-#if !WITH_EDITOR
-	// This is set to false on initialization, then set to true on non-editor platforms when we cache appropriate sample rate.
-	bool bCachedSampleRateFromPlatformSettings;
-
-	// This is set when SetSampleRate is called to invalidate our cached sample rate while not re-parsing project settings.
-	bool bSampleRateManuallyReset;
-
-	// This is the sample rate gotten from platform settings.
-	float CachedSampleRateOverride;
-#endif // !WITH_EDITOR
+	ESoundWavePrecacheState GetPrecacheState() const
+	{
+		return (ESoundWavePrecacheState)PrecacheState.GetValue();
+	}
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Classes/Sound/SoundWaveProcedural.h b/Engine/Source/Runtime/Engine/Classes/Sound/SoundWaveProcedural.h
index ec2a68b500a6..67d1e3de55de 100644
--- a/Engine/Source/Runtime/Engine/Classes/Sound/SoundWaveProcedural.h
+++ b/Engine/Source/Runtime/Engine/Classes/Sound/SoundWaveProcedural.h
@@ -93,5 +93,5 @@ public:
 	int32 SampleByteSize;
 
 	/** Whether or not this object is ready to be destroyed. Allows procedural sound wave generation to occur in async tasks without garbage collection deleting it from underneath. */
-	bool bIsReadyForDestroy;
+	FThreadSafeBool bIsReadyForDestroy;
 };
diff --git a/Engine/Source/Runtime/Engine/Engine.Build.cs b/Engine/Source/Runtime/Engine/Engine.Build.cs
index 0cd7649557cb..e1375f9c24a4 100644
--- a/Engine/Source/Runtime/Engine/Engine.Build.cs
+++ b/Engine/Source/Runtime/Engine/Engine.Build.cs
@@ -408,7 +408,12 @@ public class Engine : ModuleRules
             PrivateDependencyModuleNames.Add("IOSRuntimeSettings");
         }
 
-		if (Target.IsInPlatformGroup(UnrealPlatformGroup.Unix))
+        if (Target.Platform == UnrealTargetPlatform.Switch)
+        {
+            PrivateDependencyModuleNames.Add("SwitchRuntimeSettings");
+        }
+
+        if (Target.IsInPlatformGroup(UnrealPlatformGroup.Unix))
 		{
 			AddEngineThirdPartyPrivateStaticDependencies(Target,
 				"UEOgg",
diff --git a/Engine/Source/Runtime/Engine/Private/ActiveSound.cpp b/Engine/Source/Runtime/Engine/Private/ActiveSound.cpp
index 8c60b25d1927..01ebfff335a2 100644
--- a/Engine/Source/Runtime/Engine/Private/ActiveSound.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ActiveSound.cpp
@@ -57,6 +57,7 @@ FActiveSound::FActiveSound()
 	, bUpdateSingleEnvelopeValue(false)
 	, bUpdateMultiEnvelopeValue(false)
 	, bIsPlayingAudio(false)
+	, bIsStopping(false)
 	, UserIndex(0)
 	, bIsOccluded(false)
 	, bAsyncOcclusionPending(false)
@@ -571,11 +572,13 @@ void FActiveSound::UpdateWaveInstances( TArray<FWaveInstance*> &InWaveInstances,
 	InWaveInstances.Append(ThisSoundsWaveInstances);
 }
 
-void FActiveSound::Stop()
+void FActiveSound::Stop(bool bStopNow)
 {
 	check(AudioDevice);
 
-	if (Sound)
+	bool bWasStopping = bIsStopping;
+
+	if (Sound && !bIsStopping)
 	{
 		Sound->CurrentPlayCount = FMath::Max( Sound->CurrentPlayCount - 1, 0 );
 	}
@@ -586,27 +589,137 @@ void FActiveSound::Stop()
 
 		// Stop the owning sound source
 		FSoundSource* Source = AudioDevice->GetSoundSource(WaveInstance);
-		if( Source )
+		if (Source)
 		{
-			Source->Stop();
+			bool bStopped = false;
+			if (AudioDevice->IsAudioMixerEnabled())
+			{
+				if (bStopNow || !AudioDevice->GetNumFreeSources() || AudioDevice->CurrentStoppingVoiceCount == AudioDevice->NumStoppingVoices)
+				{
+					Source->StopNow();
+					bStopped = true;
+				}
+			}
+
+			if (!bStopped)
+			{
+				Source->Stop();
+			}
 		}
 
-		// Dequeue subtitles for this sounds on the game thread
-		DECLARE_CYCLE_STAT(TEXT("FGameThreadAudioTask.KillSubtitles"), STAT_AudioKillSubtitles, STATGROUP_TaskGraphTasks);
-		const PTRINT WaveInstanceID = (PTRINT)WaveInstance;
-		FAudioThread::RunCommandOnGameThread([WaveInstanceID]()
+		if (!bIsStopping)
 		{
-			FSubtitleManager::GetSubtitleManager()->KillSubtitles(WaveInstanceID);
-		}, GET_STATID(STAT_AudioKillSubtitles));
+			// Dequeue subtitles for this sounds on the game thread
+			DECLARE_CYCLE_STAT(TEXT("FGameThreadAudioTask.KillSubtitles"), STAT_AudioKillSubtitles, STATGROUP_TaskGraphTasks);
+			const PTRINT WaveInstanceID = (PTRINT)WaveInstance;
+			FAudioThread::RunCommandOnGameThread([WaveInstanceID]()
+			{
+				FSubtitleManager::GetSubtitleManager()->KillSubtitles(WaveInstanceID);
+			}, GET_STATID(STAT_AudioKillSubtitles));
+		}
 
-		delete WaveInstance;
+		if (Source)
+		{
+			if (!Source->IsStopping())
+			{
+				delete WaveInstance;
+				WaveInstance = nullptr;
+			}
+			else
+			{
+				// Increment the stopping voice count
+				AudioDevice->CurrentStoppingVoiceCount++;
+				check(AudioDevice->CurrentStoppingVoiceCount <= AudioDevice->NumStoppingVoices);
 
-		// Null the entry out temporarily as later Stop calls could try to access this structure
-		WaveInstance = nullptr;
+				// This source is doing a fade out, so stopping. Can't remove the wave instance yet.
+				bIsStopping = true;
+			}
+		}
+		else
+		{
+			// Have a wave instance but no source.
+			delete WaveInstance;
+			WaveInstance = nullptr;
+		}
 	}
-	WaveInstances.Empty();
 
-	AudioDevice->RemoveActiveSound(this);
+	if (bStopNow)
+	{
+		bIsStopping = false;
+	}
+
+	if (!bIsStopping)
+	{
+		WaveInstances.Empty();
+	}
+
+	if (!bWasStopping)
+	{
+		AudioDevice->RemoveActiveSound(this);
+	}
+}
+
+bool FActiveSound::UpdateStoppingSources(uint64 CurrentTick, bool bEnsureStopped)
+{
+	// If we're not stopping, then just return true (we can be cleaned up)
+	if (!bIsStopping)
+	{
+		return true;
+	}
+
+	for (auto WaveInstanceIt(WaveInstances.CreateIterator()); WaveInstanceIt; ++WaveInstanceIt)
+	{
+		FWaveInstance*& WaveInstance = WaveInstanceIt.Value();
+
+		// Some wave instances in the list here may be nullptr if some sounds have already stopped or didn't need to do a stop
+		if (WaveInstance)
+		{
+			// Stop the owning sound source
+			FSoundSource* Source = AudioDevice->GetSoundSource(WaveInstance);
+			if (Source)
+			{
+				// We should have a stopping source here
+				check(Source->IsStopping());
+
+				// Wait until the source has finished stopping
+				if (bEnsureStopped)
+				{
+					Source->EnsureStopped();
+				}
+
+				// The source has finished (totally faded out)
+				if (Source->IsFinished() || bEnsureStopped)
+				{
+					// Release source resources now safely
+					Source->ReleaseStoppedSound();
+
+					// Delete the wave instance
+					delete WaveInstance;
+					WaveInstance = nullptr;
+					AudioDevice->CurrentStoppingVoiceCount--;
+					check(AudioDevice->CurrentStoppingVoiceCount >= 0);
+				}
+				else
+				{
+					Source->LastUpdate = CurrentTick;
+					Source->LastHeardUpdate = CurrentTick;
+					// One of sources has not finished fading out, just return false now
+					return false;
+				}
+			}
+			else
+			{
+				// We have a wave instance but no source for it, so just delete it. 
+				delete WaveInstance;
+				WaveInstance = nullptr;
+			}
+		}
+	}
+
+	// Return true to indicate this active sound can be cleaned up
+	// If we've reached this point, all sound waves have stopped so we can clear this wave instance out.
+	WaveInstances.Reset();
+	return true;
 }
 
 FWaveInstance* FActiveSound::FindWaveInstance( const UPTRINT WaveInstanceHash )
@@ -669,6 +782,8 @@ void FActiveSound::OcclusionTraceDone(const FTraceHandle& TraceHandle, FTraceDat
 			{
 				FActiveSound* ActiveSound = TraceDetails.ActiveSound;
 
+				DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.OcclusionTraceDone"), STAT_OcclusionTraceDone, STATGROUP_AudioThreadCommands);
+
 				FAudioThread::RunCommandOnAudioThread([AudioDevice, ActiveSound, bFoundBlockingHit]()
 				{
 					if (AudioDevice->GetActiveSounds().Contains(ActiveSound))
@@ -676,7 +791,7 @@ void FActiveSound::OcclusionTraceDone(const FTraceHandle& TraceHandle, FTraceDat
 						ActiveSound->bIsOccluded = bFoundBlockingHit;
 						ActiveSound->bAsyncOcclusionPending = false;
 					}
-				});
+				}, GET_STATID(STAT_OcclusionTraceDone));
 			}
 		}
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/Actor.cpp b/Engine/Source/Runtime/Engine/Private/Actor.cpp
index dad45cf51ba1..ee2769dab99b 100644
--- a/Engine/Source/Runtime/Engine/Private/Actor.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Actor.cpp
@@ -976,10 +976,7 @@ void AActor::PreReplication( IRepChangedPropertyTracker & ChangedPropertyTracker
 	// Attachment replication gets filled in by GatherCurrentMovement(), but in the case of a detached root we need to trigger remote detachment.
 	AttachmentReplication.AttachParent = nullptr;
 
-	if ( bReplicateMovement || (RootComponent && RootComponent->GetAttachParent()) )
-	{
-		GatherCurrentMovement();
-	}
+	GatherCurrentMovement();
 
 	DOREPLIFETIME_ACTIVE_OVERRIDE( AActor, ReplicatedMovement, bReplicateMovement );
 
@@ -1028,6 +1025,7 @@ void AActor::CallPreReplication(UNetDriver* NetDriver)
 
 void AActor::PreReplicationForReplay(IRepChangedPropertyTracker & ChangedPropertyTracker)
 {
+	GatherCurrentMovement();
 }
 
 void AActor::RewindForReplay()
@@ -1476,8 +1474,13 @@ static void MarkOwnerRelevantComponentsDirty(AActor* TheActor)
 
 bool AActor::WasRecentlyRendered(float Tolerance) const
 {
-	UWorld* World = GetWorld();
-	return (World) ? (World->GetTimeSeconds() - GetLastRenderTime() <= Tolerance) : false;
+	if (const UWorld* const World = GetWorld())
+	{
+		// Adjust tolerance, so visibility is not affected by bad frame rate / hitches.
+		const float RenderTimeThreshold = FMath::Max(Tolerance, World->DeltaTimeSeconds + KINDA_SMALL_NUMBER);
+		return World->TimeSince(GetLastRenderTime()) <= RenderTimeThreshold;
+	}
+	return false;
 }
 
 float AActor::GetLastRenderTime() const
@@ -1835,6 +1838,12 @@ void AActor::ForceNetUpdate()
 	{
 		NetDriver->ForceNetUpdate(this);
 
+		UWorld* MyWorld = GetWorld();
+		if (MyWorld && MyWorld->DemoNetDriver && MyWorld->DemoNetDriver != NetDriver)
+		{
+			MyWorld->DemoNetDriver->ForceNetUpdate(this);
+		}
+
 		if (NetDormancy > DORM_Awake)
 		{
 			FlushNetDormancy(); 
@@ -3092,16 +3101,20 @@ void AActor::SetReplicates(bool bInReplicates)
 { 
 	if (Role == ROLE_Authority)
 	{
-		if (bReplicates == false && bInReplicates == true)
+		const bool ChangedReplicates = (bReplicates == false && bInReplicates == true);
+
+		// Update our settings before calling into net driver
+		RemoteRole = (bInReplicates ? ROLE_SimulatedProxy : ROLE_None);
+		bReplicates = bInReplicates;
+
+		// Only call into net driver if we actually changed
+		if (ChangedReplicates)
 		{
 			if (UWorld* MyWorld = GetWorld())		// GetWorld will return nullptr on CDO, FYI
 			{
 				MyWorld->AddNetworkActor(this);
 			}
 		}
-
-		RemoteRole = (bInReplicates ? ROLE_SimulatedProxy : ROLE_None);
-		bReplicates = bInReplicates;
 	}
 	else
 	{
@@ -4699,4 +4712,22 @@ void AActor::PostRename(UObject* OldOuter, const FName OldName)
 	}
 }
 
+void AActor::SetLODParent(UPrimitiveComponent* InLODParent, float InParentDrawDistance)
+{
+	if (InLODParent)
+	{
+		InLODParent->MinDrawDistance = InParentDrawDistance;
+		InLODParent->MarkRenderStateDirty();
+	}
+
+	TArray<UPrimitiveComponent*> ComponentsToBeReplaced;
+	GetComponents(ComponentsToBeReplaced);
+
+	for (UPrimitiveComponent* Component : ComponentsToBeReplaced)
+	{
+		// parent primitive will be null if no LOD parent is selected
+		Component->SetLODParentPrimitive(InLODParent);
+	}
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/ActorConstruction.cpp b/Engine/Source/Runtime/Engine/Private/ActorConstruction.cpp
index 3f81366f5a2e..ba2043def832 100644
--- a/Engine/Source/Runtime/Engine/Private/ActorConstruction.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ActorConstruction.cpp
@@ -978,7 +978,7 @@ UActorComponent* AActor::CreateComponentFromTemplateData(const FBlueprintCookedC
 		{
 			ArCustomPropertyList = InPropertyList;
 			ArUseCustomPropertyList = true;
-			ArWantBinaryPropertySerialization = true;
+			this->SetWantBinaryPropertySerialization(true);
 
 			// Set this flag to emulate things that would happen in the SDO case when this flag is set (e.g. - not setting 'bHasBeenCreated').
 			ArPortFlags |= PPF_Duplicate;
diff --git a/Engine/Source/Runtime/Engine/Private/ActorEditor.cpp b/Engine/Source/Runtime/Engine/Private/ActorEditor.cpp
index fb4abf6e309c..cbbb7937df2b 100644
--- a/Engine/Source/Runtime/Engine/Private/ActorEditor.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ActorEditor.cpp
@@ -841,24 +841,6 @@ bool AActor::GetReferencedContentObjects( TArray<UObject*>& Objects ) const
 	return true;
 }
 
-void AActor::SetLODParent(UPrimitiveComponent* InLODParent, float InParentDrawDistance)
-{
-	if(InLODParent)
-	{
-		InLODParent->MinDrawDistance = InParentDrawDistance;
-		InLODParent->MarkRenderStateDirty();
-	}
-
-	TArray<UPrimitiveComponent*> ComponentsToBeReplaced;
-	GetComponents(ComponentsToBeReplaced);
-
-	for(UPrimitiveComponent* Component : ComponentsToBeReplaced)
-	{
-		// parent primitive will be null if no LOD parent is selected
-		Component->SetLODParentPrimitive(InLODParent);
-	}
-}
-
 EDataValidationResult AActor::IsDataValid(TArray<FText>& ValidationErrors)
 {
 	bool bSuccess = CheckDefaultSubobjectsInternal();
diff --git a/Engine/Source/Runtime/Engine/Private/ActorReplication.cpp b/Engine/Source/Runtime/Engine/Private/ActorReplication.cpp
index 82a174da9959..4d4e9705d696 100644
--- a/Engine/Source/Runtime/Engine/Private/ActorReplication.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ActorReplication.cpp
@@ -15,6 +15,8 @@
 #include "Engine/ActorChannel.h"
 #include "GameFramework/GameNetworkManager.h"
 #include "NetworkingDistanceConstants.h"
+#include "PhysicsReplication.h"
+#include "PhysicsPublic.h"
 
 /*-----------------------------------------------------------------------------
 	AActor networking implementation.
@@ -231,6 +233,20 @@ void AActor::SyncReplicatedPhysicsSimulation()
 		if (RootPrimComp)
 		{
 			RootPrimComp->SetSimulatePhysics(ReplicatedMovement.bRepPhysics);
+
+			if(!ReplicatedMovement.bRepPhysics)
+			{
+				if (UWorld* World = GetWorld())
+				{
+					if (FPhysScene* PhysScene = World->GetPhysicsScene())
+					{
+						if (FPhysicsReplication* PhysicsReplication = PhysScene->GetPhysicsReplication())
+						{
+							PhysicsReplication->RemoveReplicatedTarget(RootPrimComp);
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -280,45 +296,48 @@ bool AActor::IsReplayRelevantFor(const AActor* RealViewer, const AActor* ViewTar
 
 void AActor::GatherCurrentMovement()
 {
-	AttachmentReplication.AttachParent = nullptr;
-
-	UPrimitiveComponent* RootPrimComp = Cast<UPrimitiveComponent>(GetRootComponent());
-	if (RootPrimComp && RootPrimComp->IsSimulatingPhysics())
+	if (bReplicateMovement || (RootComponent && RootComponent->GetAttachParent()))
 	{
-		FRigidBodyState RBState;
-		RootPrimComp->GetRigidBodyState(RBState);
+		AttachmentReplication.AttachParent = nullptr;
 
-		ReplicatedMovement.FillFrom(RBState, this);
-		// Don't replicate movement if we're welded to another parent actor.
-		// Their replication will affect our position indirectly since we are attached.
-		ReplicatedMovement.bRepPhysics = !RootPrimComp->IsWelded();
-	}
-	else if (RootComponent != nullptr)
-	{
-		// If we are attached, don't replicate absolute position, use AttachmentReplication instead.
-		if (RootComponent->GetAttachParent() != nullptr)
+		UPrimitiveComponent* RootPrimComp = Cast<UPrimitiveComponent>(GetRootComponent());
+		if (RootPrimComp && RootPrimComp->IsSimulatingPhysics())
 		{
-			// Networking for attachments assumes the RootComponent of the AttachParent actor. 
-			// If that's not the case, we can't update this, as the client wouldn't be able to resolve the Component and would detach as a result.
-			AttachmentReplication.AttachParent = RootComponent->GetAttachParent()->GetAttachmentRootActor();
-			if (AttachmentReplication.AttachParent != nullptr)
+			FRigidBodyState RBState;
+			RootPrimComp->GetRigidBodyState(RBState);
+
+			ReplicatedMovement.FillFrom(RBState, this);
+			// Don't replicate movement if we're welded to another parent actor.
+			// Their replication will affect our position indirectly since we are attached.
+			ReplicatedMovement.bRepPhysics = !RootPrimComp->IsWelded();
+		}
+		else if (RootComponent != nullptr)
+		{
+			// If we are attached, don't replicate absolute position, use AttachmentReplication instead.
+			if (RootComponent->GetAttachParent() != nullptr)
 			{
-				AttachmentReplication.LocationOffset = RootComponent->RelativeLocation;
-				AttachmentReplication.RotationOffset = RootComponent->RelativeRotation;
-				AttachmentReplication.RelativeScale3D = RootComponent->RelativeScale3D;
-				AttachmentReplication.AttachComponent = RootComponent->GetAttachParent();
-				AttachmentReplication.AttachSocket = RootComponent->GetAttachSocketName();
+				// Networking for attachments assumes the RootComponent of the AttachParent actor. 
+				// If that's not the case, we can't update this, as the client wouldn't be able to resolve the Component and would detach as a result.
+				AttachmentReplication.AttachParent = RootComponent->GetAttachParent()->GetAttachmentRootActor();
+				if (AttachmentReplication.AttachParent != nullptr)
+				{
+					AttachmentReplication.LocationOffset = RootComponent->RelativeLocation;
+					AttachmentReplication.RotationOffset = RootComponent->RelativeRotation;
+					AttachmentReplication.RelativeScale3D = RootComponent->RelativeScale3D;
+					AttachmentReplication.AttachComponent = RootComponent->GetAttachParent();
+					AttachmentReplication.AttachSocket = RootComponent->GetAttachSocketName();
+				}
+			}
+			else
+			{
+				ReplicatedMovement.Location = FRepMovement::RebaseOntoZeroOrigin(RootComponent->GetComponentLocation(), this);
+				ReplicatedMovement.Rotation = RootComponent->GetComponentRotation();
+				ReplicatedMovement.LinearVelocity = GetVelocity();
+				ReplicatedMovement.AngularVelocity = FVector::ZeroVector;
 			}
-		}
-		else
-		{
-			ReplicatedMovement.Location = FRepMovement::RebaseOntoZeroOrigin(RootComponent->GetComponentLocation(), this);
-			ReplicatedMovement.Rotation = RootComponent->GetComponentRotation();
-			ReplicatedMovement.LinearVelocity = GetVelocity();
-			ReplicatedMovement.AngularVelocity = FVector::ZeroVector;
-		}
 
-		ReplicatedMovement.bRepPhysics = false;
+			ReplicatedMovement.bRepPhysics = false;
+		}
 	}
 }
 
@@ -341,11 +360,11 @@ void AActor::GetLifetimeReplicatedProps( TArray< FLifetimeProperty > & OutLifeti
 	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 	DOREPLIFETIME( AActor, bCanBeDamaged );
-	DOREPLIFETIME_CONDITION( AActor, AttachmentReplication, COND_Custom );
+	DOREPLIFETIME_CONDITION_NOTIFY( AActor, AttachmentReplication, COND_Custom, REPNOTIFY_Always );
 
 	DOREPLIFETIME( AActor, Instigator );
 
-	DOREPLIFETIME_CONDITION( AActor, ReplicatedMovement, COND_SimulatedOrPhysics );
+	DOREPLIFETIME_CONDITION_NOTIFY( AActor, ReplicatedMovement, COND_SimulatedOrPhysics, REPNOTIFY_Always );
 }
 
 bool AActor::ReplicateSubobjects(UActorChannel *Channel, FOutBunch *Bunch, FReplicationFlags *RepFlags)
diff --git a/Engine/Source/Runtime/Engine/Private/AlphaBlend.cpp b/Engine/Source/Runtime/Engine/Private/AlphaBlend.cpp
index fd8cd1523d7d..2fcae42d5079 100644
--- a/Engine/Source/Runtime/Engine/Private/AlphaBlend.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AlphaBlend.cpp
@@ -79,7 +79,7 @@ void FAlphaBlend::Reset()
 		BlendTimeRemaining = BlendTime * FMath::Abs(1.f - AlphaLerp);
 	}
 
-	RecacheDesiredBlendedValue();
+	bNeedsToResetCachedDesiredBlendedValue = true;
 	bNeedsToResetAlpha = false;
 	bNeedsToResetBlendTime = false;
 }
@@ -170,7 +170,7 @@ void FAlphaBlend::SetValueRange(float Begin, float Desired)
 	DesiredValue = Desired;
 
 	bNeedsToResetAlpha = true;
-	RecacheDesiredBlendedValue();
+	bNeedsToResetCachedDesiredBlendedValue = true;
 }
 
 /** Sets the final desired value for the blended value */
@@ -187,11 +187,6 @@ void FAlphaBlend::SetAlpha(float InAlpha)
 	BlendedValue = BeginValue + (DesiredValue - BeginValue) * AlphaBlend;
 }
 
-void FAlphaBlend::RecacheDesiredBlendedValue()
-{
-	CachedDesiredBlendedValue = BeginValue + (DesiredValue - BeginValue) * AlphaToBlendOption(1.f, BlendOption, CustomCurve);
-}
-
 void FAlphaBlend::SetBlendTime(float InBlendTime)
 {
 	BlendTime = FMath::Max(InBlendTime, 0.f);
@@ -202,17 +197,23 @@ void FAlphaBlend::SetBlendTime(float InBlendTime)
 void FAlphaBlend::SetBlendOption(EAlphaBlendOption InBlendOption)
 {
 	BlendOption = InBlendOption;
-	RecacheDesiredBlendedValue();
+	bNeedsToResetCachedDesiredBlendedValue = true;
 }
 
 void FAlphaBlend::SetCustomCurve(UCurveFloat* InCustomCurve)
 {
 	CustomCurve = InCustomCurve;
-	RecacheDesiredBlendedValue();
+	bNeedsToResetCachedDesiredBlendedValue = true;
 }
 
-bool FAlphaBlend::IsComplete() const
+bool FAlphaBlend::IsComplete() const 
 {
-	return CachedDesiredBlendedValue == BlendedValue;
+	if (bNeedsToResetCachedDesiredBlendedValue)
+	{
+		CachedDesiredBlendedValue = BeginValue + (DesiredValue - BeginValue) * AlphaToBlendOption(1.f, BlendOption, CustomCurve);
+		bNeedsToResetCachedDesiredBlendedValue = false;
+	}
+
+	return (CachedDesiredBlendedValue == BlendedValue);
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimBlueprintGeneratedClass.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimBlueprintGeneratedClass.cpp
index bb40f9d0ba77..dc6c9a06a5dd 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimBlueprintGeneratedClass.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimBlueprintGeneratedClass.cpp
@@ -189,7 +189,7 @@ public:
 	FBinaryObjectWriter(UObject* Obj, TArray<uint8>& InBytes)
 		: FObjectWriter(InBytes)
 	{
-		ArWantBinaryPropertySerialization = true;
+		this->SetWantBinaryPropertySerialization(true);
 		Obj->Serialize(*this);
 	}
 };
@@ -203,7 +203,7 @@ public:
 	FBinaryObjectReader(UObject* Obj, TArray<uint8>& InBytes)
 		: FObjectReader(InBytes)
 	{
-		ArWantBinaryPropertySerialization = true;
+		this->SetWantBinaryPropertySerialization(true);
 		Obj->Serialize(*this);
 	}
 };
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimCurveTypes.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimCurveTypes.cpp
index 36cd3c308dd6..056f64561242 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimCurveTypes.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimCurveTypes.cpp
@@ -294,11 +294,17 @@ void FTransformCurve::Resize(float NewLength, bool bInsert/* whether insert or r
 void FRawCurveTracks::EvaluateCurveData( FBlendedCurve& Curves, float CurrentTime ) const
 {
 	SCOPE_CYCLE_COUNTER(STAT_AnimSeq_EvalCurveData);
-	// evaluate the curve data at the CurrentTime and add to Instance
-	for(auto CurveIter = FloatCurves.CreateConstIterator(); CurveIter; ++CurveIter)
+	if (Curves.NumValidCurveCount > 0)
 	{
-		const FFloatCurve& Curve = *CurveIter;
-		Curves.Set(Curve.Name.UID, Curve.Evaluate(CurrentTime));
+		// evaluate the curve data at the CurrentTime and add to Instance
+		for (auto CurveIter = FloatCurves.CreateConstIterator(); CurveIter; ++CurveIter)
+		{
+			const FFloatCurve& Curve = *CurveIter;
+			if (Curves.IsEnabled(Curve.Name.UID))
+			{
+				Curves.Set(Curve.Name.UID, Curve.Evaluate(CurrentTime));
+			}
+		}
 	}
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimInstance.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimInstance.cpp
index 95dca2d21571..bbd120d004fc 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimInstance.cpp
@@ -89,8 +89,10 @@ static FAutoConsoleVariableRef CVarRK4SpringInterpolatorMaxIter(TEXT("p.RK4Sprin
 
 UAnimInstance::UAnimInstance(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
-	, bUpdatingAnimation(false)
+#if DO_CHECK
 	, bPostUpdatingAnimation(false)
+	, bUpdatingAnimation(false)
+#endif
 {
 	RootMotionMode = ERootMotionMode::RootMotionFromMontagesOnly;
 	bNeedsUpdate = false;
@@ -1052,9 +1054,23 @@ void UAnimInstance::DisplayDebug(class UCanvas* Canvas, const FDebugDisplayInfo&
 #endif // ENABLE_DRAW_DEBUG
 }
 
+void UAnimInstance::ResetDynamics(ETeleportType InTeleportType)
+{
+	GetProxyOnGameThread<FAnimInstanceProxy>().ResetDynamics(InTeleportType);
+}
+
 void UAnimInstance::ResetDynamics()
 {
-	GetProxyOnGameThread<FAnimInstanceProxy>().ResetDynamics();
+	ResetDynamics(ETeleportType::ResetPhysics);
+}
+
+
+int32 UAnimInstance::GetLODLevel() const
+{
+	USkeletalMeshComponent* SkelMeshComp = GetSkelMeshComponent();
+	check(SkelMeshComp)
+
+	return SkelMeshComp->PredictedLODLevel;
 }
 
 void UAnimInstance::RecalcRequiredBones()
@@ -1265,16 +1281,17 @@ void UAnimInstance::UpdateCurves(const FBlendedHeapCurve& InCurve)
 
 	ResetAnimationCurves();
 
-	if (InCurve.UIDList != nullptr)
+	if (InCurve.UIDToArrayIndexLUT != nullptr)
 	{
-		const TArray<SmartName::UID_Type>& UIDList = *InCurve.UIDList;
-		for (int32 CurveId = 0; CurveId < InCurve.UIDList->Num(); ++CurveId)
+		for (int32 CurveUID = 0; CurveUID < InCurve.UIDToArrayIndexLUT->Num(); ++CurveUID)
 		{
-			if (ensureAlwaysMsgf(InCurve.Elements.IsValidIndex(CurveId), TEXT("%s Animation Instance contains out of bound UIDList."), *GetClass()->GetName())
-				&& InCurve.Elements[CurveId].IsValid())
+			int32 ArrayIndex = InCurve.GetArrayIndexByUID(CurveUID);
+
+			if (ArrayIndex != INDEX_NONE && ensureAlwaysMsgf(InCurve.Elements.IsValidIndex(ArrayIndex), TEXT("%s Animation Instance contains out of bound UIDList."), *GetClass()->GetName())
+				&& InCurve.Elements[ArrayIndex].IsValid())
 			{
 				// had to add to another data type
-				AddCurveValue(UIDList[CurveId], InCurve.Elements[CurveId].Value);
+				AddCurveValue(CurveUID, InCurve.Elements[ArrayIndex].Value);
 			}
 		}
 	}	
@@ -1300,6 +1317,18 @@ bool UAnimInstance::HasMorphTargetCurves() const
 	return AnimationCurves[(uint8)EAnimCurveType::MorphTargetCurve].Num() > 0;
 }
 
+bool UAnimInstance::HasActiveCurves() const
+{
+	for(const TMap<FName, float>& AnimationCurveMap : AnimationCurves)
+	{
+		if(AnimationCurveMap.Num() > 0)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 void UAnimInstance::TriggerAnimNotifies(float DeltaSeconds)
 {
 	SCOPE_CYCLE_COUNTER(STAT_AnimTriggerAnimNotifies);
@@ -2767,6 +2796,11 @@ const FBoneContainer& UAnimInstance::GetRequiredBones() const
 	return GetProxyOnGameThread<FAnimInstanceProxy>().GetRequiredBones();
 }
 
+const FBoneContainer& UAnimInstance::GetRequiredBonesOnAnyThread() const
+{
+	return GetProxyOnAnyThread<FAnimInstanceProxy>().GetRequiredBones();
+}
+
 void UAnimInstance::QueueRootMotionBlend(const FTransform& RootTransform, const FName& SlotName, float Weight)
 {
 	RootMotionBlendQueue.Add(FQueuedRootMotionBlend(RootTransform, SlotName, Weight));
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimInstanceProxy.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimInstanceProxy.cpp
index 43652e3f6d77..327ae8c8dff3 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimInstanceProxy.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimInstanceProxy.cpp
@@ -14,6 +14,7 @@
 #include "Animation/AnimNode_SubInput.h"
 #include "Engine/Engine.h"
 #include "DrawDebugHelpers.h"
+#include "GameFramework/WorldSettings.h"
 
 #define DO_ANIMSTAT_PROCESSING(StatName) DEFINE_STAT(STAT_ ## StatName)
 #include "Animation/AnimMTStats.h"
@@ -161,6 +162,7 @@ void FAnimInstanceProxy::InitializeRootNode()
 {
 	if (RootNode != nullptr)
 	{
+		LODDisabledGameThreadPreUpdateNodes.Reset();
 		GameThreadPreUpdateNodes.Reset();
 		DynamicResetNodes.Reset();
 
@@ -251,6 +253,7 @@ FGuid MakeGuidForMessage(const FText& Message)
 
 void FAnimInstanceProxy::LogMessage(FName InLogType, EMessageSeverity::Type InSeverity, const FText& InMessage)
 {
+#if !NO_LOGGING
 	FGuid CurrentMessageGuid = MakeGuidForMessage(InMessage);
 	if(!PreviouslyLoggedMessages.Contains(CurrentMessageGuid))
 	{
@@ -260,6 +263,7 @@ void FAnimInstanceProxy::LogMessage(FName InLogType, EMessageSeverity::Type InSe
 			LoggedMessages->Emplace(InSeverity, InMessage);
 		}
 	}
+#endif
 }
 
 void FAnimInstanceProxy::Uninitialize(UAnimInstance* InAnimInstance)
@@ -270,16 +274,25 @@ void FAnimInstanceProxy::Uninitialize(UAnimInstance* InAnimInstance)
 
 void FAnimInstanceProxy::PreUpdate(UAnimInstance* InAnimInstance, float DeltaSeconds)
 {
+	USkeletalMeshComponent* SkelMeshComp = InAnimInstance->GetSkelMeshComponent();
+	UWorld* World = SkelMeshComp ? SkelMeshComp->GetWorld() : nullptr;
+
 	CurrentDeltaSeconds = DeltaSeconds;
+	CurrentTimeDilation = World ? World->GetWorldSettings()->GetEffectiveTimeDilation() : 1.0f;
 	RootMotionMode = InAnimInstance->RootMotionMode;
 	bShouldExtractRootMotion = InAnimInstance->ShouldExtractRootMotion();
 
 	InitializeObjects(InAnimInstance);
 
-	if (USkeletalMeshComponent* SkelMeshComp = InAnimInstance->GetSkelMeshComponent())
+	if (SkelMeshComp)
 	{
 		// Save off LOD level that we're currently using.
-		LODLevel = SkelMeshComp->PredictedLODLevel;
+		const int32 PreviousLODLevel = LODLevel;
+		LODLevel = InAnimInstance->GetLODLevel();
+		if (LODLevel != PreviousLODLevel)
+		{
+			OnPreUpdateLODChanged(PreviousLODLevel, LODLevel);
+		}
 
 		// Cache these transforms, so nodes don't have to pull it off the gamethread manually.
 		SkelMeshCompLocalToWorld = SkelMeshComp->GetComponentTransform();
@@ -295,8 +308,10 @@ void FAnimInstanceProxy::PreUpdate(UAnimInstance* InAnimInstance, float DeltaSec
 	QueuedDrawDebugItems.Reset();
 #endif
 
+#if !NO_LOGGING
 	//Reset logged update messages
 	LoggedMessagesMap.FindOrAdd("Update").Reset();
+#endif
 
 	ClearSlotNodeWeights();
 
@@ -341,6 +356,46 @@ void FAnimInstanceProxy::PreUpdate(UAnimInstance* InAnimInstance, float DeltaSec
 	}
 }
 
+void FAnimInstanceProxy::OnPreUpdateLODChanged(const int32 PreviousLODIndex, const int32 NewLODIndex)
+{
+	// Decrease detail, see which nodes need to be disabled.
+	if (NewLODIndex > PreviousLODIndex)
+	{
+		// Calling PreUpdate on GameThreadPreUpdateNodes is expensive, it triggers a cache miss.
+		// So remove nodes from this array if they're going to get culled by LOD.
+		for (int32 NodeIndex = 0; NodeIndex < GameThreadPreUpdateNodes.Num(); NodeIndex++)
+		{
+			FAnimNode_Base* AnimNodePtr = static_cast<FAnimNode_Base*>(GameThreadPreUpdateNodes[NodeIndex]);
+			if (AnimNodePtr)
+			{
+				if (!AnimNodePtr->IsLODEnabled(this))
+				{
+					LODDisabledGameThreadPreUpdateNodes.Add(AnimNodePtr);
+					GameThreadPreUpdateNodes.RemoveAt(NodeIndex, 1, false);
+					NodeIndex--;
+				}
+			}
+		}
+	}
+	// Increase detail, see which nodes need to be enabled.
+	else
+	{
+		for (int32 NodeIndex = 0; NodeIndex < LODDisabledGameThreadPreUpdateNodes.Num(); NodeIndex++)
+		{
+			FAnimNode_Base* AnimNodePtr = static_cast<FAnimNode_Base*>(LODDisabledGameThreadPreUpdateNodes[NodeIndex]);
+			if (AnimNodePtr)
+			{
+				if (AnimNodePtr->IsLODEnabled(this))
+				{
+					GameThreadPreUpdateNodes.Add(AnimNodePtr);
+					LODDisabledGameThreadPreUpdateNodes.RemoveAt(NodeIndex, 1, false);
+					NodeIndex--;
+				}
+			}
+		}
+	}
+}
+
 void FAnimInstanceProxy::SavePoseSnapshot(USkeletalMeshComponent* InSkeletalMeshComponent, FName SnapshotName)
 {
 	FPoseSnapshot* PoseSnapshot = PoseSnapshots.FindByPredicate([SnapshotName](const FPoseSnapshot& PoseData) { return PoseData.SnapshotName == SnapshotName; });
@@ -383,6 +438,7 @@ void FAnimInstanceProxy::PostUpdate(UAnimInstance* InAnimInstance) const
 	}
 #endif
 
+#if !NO_LOGGING
 	FMessageLog MessageLog("AnimBlueprintLog");
 	const TArray<FLogMessageEntry>* Messages = LoggedMessagesMap.Find("Update");
 	if (ensureMsgf(Messages, TEXT("PreUpdate isn't called. This could potentially cause other issues.")))
@@ -392,12 +448,14 @@ void FAnimInstanceProxy::PostUpdate(UAnimInstance* InAnimInstance) const
 			MessageLog.Message(Message.Key, Message.Value);
 		}
 	}
+#endif
 }
 
 void FAnimInstanceProxy::PostEvaluate(UAnimInstance* InAnimInstance)
 {
 	ClearObjects();
 
+#if !NO_LOGGING
 	FMessageLog MessageLog("AnimBlueprintLog");
 	if(const TArray<FLogMessageEntry>* Messages = LoggedMessagesMap.Find("Evaluate"))
 	{
@@ -406,6 +464,7 @@ void FAnimInstanceProxy::PostEvaluate(UAnimInstance* InAnimInstance)
 			MessageLog.Message(Message.Key, Message.Value);
 		}
 	}
+#endif
 }
 
 void FAnimInstanceProxy::InitializeObjects(UAnimInstance* InAnimInstance)
@@ -1016,6 +1075,7 @@ void FAnimInstanceProxy::RecalcRequiredBones(USkeletalMeshComponent* Component,
 void FAnimInstanceProxy::RecalcRequiredCurves(const FCurveEvaluationOption& CurveEvalOption)
 {
 	RequiredBones.CacheRequiredAnimCurveUids(CurveEvalOption);
+	bBoneCachesInvalidated = true;
 }
 
 void FAnimInstanceProxy::UpdateAnimation()
@@ -1039,7 +1099,9 @@ void FAnimInstanceProxy::UpdateAnimation()
 void FAnimInstanceProxy::PreEvaluateAnimation(UAnimInstance* InAnimInstance)
 {
 	InitializeObjects(InAnimInstance);
+#if !NO_LOGGING
 	LoggedMessagesMap.FindOrAdd("Evaluate").Reset();
+#endif
 }
 
 void FAnimInstanceProxy::EvaluateAnimation(FPoseContext& Output)
@@ -2032,14 +2094,19 @@ void FAnimInstanceProxy::RecordStateWeight(const int32 InMachineClassIndex, cons
 	}
 }
 
-void FAnimInstanceProxy::ResetDynamics()
+void FAnimInstanceProxy::ResetDynamics(ETeleportType InTeleportType)
 {
 	for(FAnimNode_Base* Node : DynamicResetNodes)
 	{
-		Node->ResetDynamics();
+		Node->ResetDynamics(InTeleportType);
 	}
 }
 
+void FAnimInstanceProxy::ResetDynamics()
+{
+	ResetDynamics(ETeleportType::ResetPhysics);
+}
+
 #if WITH_EDITOR
 void FAnimInstanceProxy::RegisterWatchedPose(const FCompactPose& Pose, int32 LinkID)
 {
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp
index 3bac8c2f4ed7..95507a47c111 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimMontage.cpp
@@ -426,7 +426,8 @@ void UAnimMontage::PostLoad()
 	}
 #endif // WITH_EDITORONLY_DATA
 
-	// Register Slots w/ Skeleton
+	// Register Slots w/ Skeleton - to aid deterministic cooking do not do this during cook! 
+	if(!GIsCookerLoadingPackage)
 	{
 		USkeleton* MySkeleton = GetSkeleton();
 		if (MySkeleton)
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNodeBase.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNodeBase.cpp
index 64e28c48eb5a..acd1cb36b7f6 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNodeBase.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNodeBase.cpp
@@ -105,9 +105,10 @@ void FAnimNode_Base::EvaluateComponentSpace_AnyThread(FComponentSpacePoseContext
 	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 }
 
-bool FAnimNode_Base::IsLODEnabled(FAnimInstanceProxy* AnimInstanceProxy, int32 InLODThreshold)
+bool FAnimNode_Base::IsLODEnabled(FAnimInstanceProxy* AnimInstanceProxy)
 {
-	return ((InLODThreshold == INDEX_NONE) || (AnimInstanceProxy->GetLODLevel() <= InLODThreshold));
+	const int32 NodeLODThreshold = GetLODThreshold();
+	return ((NodeLODThreshold == INDEX_NONE) || (AnimInstanceProxy->GetLODLevel() <= NodeLODThreshold));
 }
 
 void FAnimNode_Base::OnInitializeAnimInstance(const FAnimInstanceProxy* InProxy, const UAnimInstance* InAnimInstance)
@@ -118,6 +119,15 @@ void FAnimNode_Base::OnInitializeAnimInstance(const FAnimInstanceProxy* InProxy,
 	PRAGMA_ENABLE_DEPRECATION_WARNINGS
 }
 
+void FAnimNode_Base::ResetDynamics(ETeleportType InTeleportType)
+{
+	// Call legacy implementation for backwards compatibility
+	PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	ResetDynamics();
+	PRAGMA_ENABLE_DEPRECATION_WARNINGS
+}
+
+
 /////////////////////////////////////////////////////
 // FPoseLinkBase
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_ApplyMeshSpaceAdditive.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_ApplyMeshSpaceAdditive.cpp
index 93cce2405741..5ba3df10c7db 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_ApplyMeshSpaceAdditive.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_ApplyMeshSpaceAdditive.cpp
@@ -25,7 +25,7 @@ void FAnimNode_ApplyMeshSpaceAdditive::Update_AnyThread(const FAnimationUpdateCo
 	Base.Update(Context);
 
 	ActualAlpha = 0.f;
-	if (IsLODEnabled(Context.AnimInstanceProxy, LODThreshold))
+	if (IsLODEnabled(Context.AnimInstanceProxy))
 	{
 		// @note: If you derive this class, and if you have input that you rely on for base
 		// this is not going to work	
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_AssetPlayerBase.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_AssetPlayerBase.cpp
index 8646dc8eb795..da79f90819e3 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_AssetPlayerBase.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_AssetPlayerBase.cpp
@@ -6,6 +6,7 @@
 FAnimNode_AssetPlayerBase::FAnimNode_AssetPlayerBase()
 	: bIgnoreForRelevancyTest(false)
 	, GroupIndex(INDEX_NONE)
+	, GroupRole(EAnimGroupRole::CanBeLeader)
 	, BlendWeight(0.0f)
 	, InternalTimeAccumulator(0.0f)
 	, bHasBeenFullWeight(false)
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SaveCachedPose.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SaveCachedPose.cpp
index ea64ee57ff76..8a87ec54981d 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SaveCachedPose.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SaveCachedPose.cpp
@@ -7,6 +7,7 @@
 // FAnimNode_SaveCachedPose
 
 FAnimNode_SaveCachedPose::FAnimNode_SaveCachedPose()
+	: GlobalWeight(0.0f)
 {
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SequencePlayer.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SequencePlayer.cpp
index 47652fc04655..4e411a2bbf35 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SequencePlayer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SequencePlayer.cpp
@@ -16,7 +16,7 @@ float FAnimNode_SequencePlayer::GetCurrentAssetTime()
 float FAnimNode_SequencePlayer::GetCurrentAssetTimePlayRateAdjusted()
 {
 	const float SequencePlayRate = (Sequence ? Sequence->RateScale : 1.f);
-	const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis));
+	const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis), 0.f);
 	const float EffectivePlayrate = SequencePlayRate * AdjustedPlayRate;
 	return (EffectivePlayrate < 0.0f) ? GetCurrentAssetLength() - InternalTimeAccumulator : InternalTimeAccumulator;
 }
@@ -32,10 +32,12 @@ void FAnimNode_SequencePlayer::Initialize_AnyThread(const FAnimationInitializeCo
 
 	EvaluateGraphExposedInputs.Execute(Context);
 	InternalTimeAccumulator = StartPosition;
+	PlayRateScaleBiasClamp.Reinitialize();
+
 	if (Sequence != nullptr)
 	{
 		InternalTimeAccumulator = FMath::Clamp(StartPosition, 0.f, Sequence->SequenceLength);
-		const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis));
+		const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis), 0.f);
 		const float EffectivePlayrate = Sequence->RateScale * AdjustedPlayRate;
 		if ((StartPosition == 0.f) && (EffectivePlayrate < 0.f))
 		{
@@ -55,7 +57,7 @@ void FAnimNode_SequencePlayer::UpdateAssetPlayer(const FAnimationUpdateContext&
 	if ((Sequence != nullptr) && (Context.AnimInstanceProxy->IsSkeletonCompatible(Sequence->GetSkeleton())))
 	{
 		InternalTimeAccumulator = FMath::Clamp(InternalTimeAccumulator, 0.f, Sequence->SequenceLength);
-		const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis));
+		const float AdjustedPlayRate = PlayRateScaleBiasClamp.ApplyTo(FMath::IsNearlyZero(PlayRateBasis) ? 0.f : (PlayRate / PlayRateBasis), Context.GetDeltaTime());
 		CreateTickRecordForNode(Context, Sequence, bLoopAnimation, AdjustedPlayRate);
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_StateMachine.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_StateMachine.cpp
index 045987d97bb4..bdd8d35fbfc0 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_StateMachine.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_StateMachine.cpp
@@ -998,7 +998,7 @@ const FPoseContext& FAnimNode_StateMachine::EvaluateState(int32 StateIndex, cons
 	FPoseContext* CachePosePtr = StateCachedPoses[StateIndex];
 	if (CachePosePtr == nullptr)
 	{
-		CachePosePtr = new FPoseContext(Context.AnimInstanceProxy);
+		CachePosePtr = new FPoseContext(Context);
 		check(CachePosePtr);
 		StateCachedPoses[StateIndex] = CachePosePtr;
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SubInput.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SubInput.cpp
index b6403e54d274..cd901fadaddc 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SubInput.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_SubInput.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Animation/AnimNode_SubInput.h"
+#include "Animation/AnimInstanceProxy.h"
 
 void FAnimNode_SubInput::Initialize_AnyThread(const FAnimationInitializeContext& Context)
 {
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_TransitionResult.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_TransitionResult.cpp
index a6734215d8ca..e4725e5322b4 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_TransitionResult.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNode_TransitionResult.cpp
@@ -6,6 +6,7 @@
 // FAnimNode_TransitionResult
 
 FAnimNode_TransitionResult::FAnimNode_TransitionResult()
+	: bCanEnterTransition(false)
 {
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimNotifyState_TimedParticleEffect.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimNotifyState_TimedParticleEffect.cpp
index 6c93889d4b3b..12da1a763a37 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimNotifyState_TimedParticleEffect.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimNotifyState_TimedParticleEffect.cpp
@@ -18,7 +18,7 @@ void UAnimNotifyState_TimedParticleEffect::NotifyBegin(USkeletalMeshComponent *
 	// Only spawn if we've got valid params
 	if(ValidateParameters(MeshComp))
 	{
-		UParticleSystemComponent* NewComponent = UGameplayStatics::SpawnEmitterAttached(PSTemplate, MeshComp, SocketName, LocationOffset, RotationOffset);
+		UParticleSystemComponent* NewComponent = UGameplayStatics::SpawnEmitterAttached(PSTemplate, MeshComp, SocketName, LocationOffset, RotationOffset, EAttachLocation::KeepRelativeOffset, !bDestroyAtEnd);
 	}
 
 	Received_NotifyBegin(MeshComp, Animation, TotalDuration);
@@ -58,7 +58,6 @@ void UAnimNotifyState_TimedParticleEffect::NotifyEnd(USkeletalMeshComponent * Me
 				}
 				else
 				{
-					ParticleComponent->bAutoDestroy = true;
 					ParticleComponent->DeactivateSystem();
 				}
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimSequence.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimSequence.cpp
index b17fb3296356..8686c8cecd93 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimSequence.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimSequence.cpp
@@ -380,6 +380,11 @@ void UAnimSequence::PreSave(const class ITargetPlatform* TargetPlatform)
 	Super::PreSave(TargetPlatform);
 }
 
+bool UAnimSequence::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UAnimSequence::PostLoad()
 {
 	AddAnimLoadingDebugEntry(TEXT("PostLoadStart"));
@@ -501,20 +506,6 @@ void UAnimSequence::PostLoad()
 	bWasCompressedWithoutTranslations = false; //@todoanim: @fixmelh : AnimRotationOnly - GetAnimSet()->bAnimRotationOnly;
 #endif // WITH_EDITORONLY_DATA
 
-	{
-		LOG_SCOPE_VERBOSITY_OVERRIDE(LogAnimation, ELogVerbosity::Warning);
- 		// convert animnotifies
- 		for (int32 I=0; I<Notifies.Num(); ++I)
- 		{
- 			if (Notifies[I].Notify!=NULL)
- 			{
-				FString Label = Notifies[I].Notify->GetClass()->GetName();
-				Label = Label.Replace(TEXT("AnimNotify_"), TEXT(""), ESearchCase::CaseSensitive);
-				Notifies[I].NotifyName = FName(*Label);
- 			}
- 		}
-	}
-
 	for(FAnimNotifyEvent& Notify : Notifies)
 	{
 		if(Notify.DisplayTime_DEPRECATED != 0.0f)
@@ -1122,6 +1113,7 @@ struct FGetBonePoseScratchArea : public TThreadSingleton<FGetBonePoseScratchArea
 	BoneTrackArray TranslationPairs;
 	BoneTrackArray AnimScaleRetargetingPairs;
 	BoneTrackArray AnimRelativeRetargetingPairs;
+	BoneTrackArray OrientAndScaleRetargetingPairs;
 	TArray<FRetargetTracking> RetargetTracking;
 	TArray<FVirtualBoneCompactPoseData> VirtualBoneCompactPoseData;
 };
@@ -1370,12 +1362,14 @@ void UAnimSequence::GetBonePose(FCompactPose& OutPose, FBlendedCurve& OutCurve,
 	BoneTrackArray& TranslationPairs = FGetBonePoseScratchArea::Get().TranslationPairs;
 	BoneTrackArray& AnimScaleRetargetingPairs = FGetBonePoseScratchArea::Get().AnimScaleRetargetingPairs;
 	BoneTrackArray& AnimRelativeRetargetingPairs = FGetBonePoseScratchArea::Get().AnimRelativeRetargetingPairs;
+	BoneTrackArray& OrientAndScaleRetargetingPairs = FGetBonePoseScratchArea::Get().OrientAndScaleRetargetingPairs;
 
 	// build a list of desired bones
 	RotationScalePairs.Reset();
 	TranslationPairs.Reset();
 	AnimScaleRetargetingPairs.Reset();
 	AnimRelativeRetargetingPairs.Reset();
+	OrientAndScaleRetargetingPairs.Reset();
 
 	// Optimization: assuming first index is root bone. That should always be the case in Skeletons.
 	checkSlow((SkeletonToPoseBoneIndexArray[0] == 0));
@@ -1419,6 +1413,15 @@ void UAnimSequence::GetBonePose(FCompactPose& OutPose, FBlendedCurve& OutCurve,
 							AnimRelativeRetargetingPairs.Add(BoneTrackPair(CompactPoseBoneIndex, SkeletonBoneIndex));
 						}
 						break;
+					case EBoneTranslationRetargetingMode::OrientAndScale:
+						TranslationPairs.Add(BoneTrackPair(CompactPoseBoneIndex, TrackIndex));
+
+						// Additives remain additives, they're not retargeted.
+						if (!bIsBakedAdditive)
+						{
+							OrientAndScaleRetargetingPairs.Add(BoneTrackPair(CompactPoseBoneIndex, SkeletonBoneIndex));
+						}
+						break;
 					}
 				}
 			}
@@ -1511,6 +1514,39 @@ void UAnimSequence::GetBonePose(FCompactPose& OutPose, FBlendedCurve& OutCurve,
 			OutPose[BoneIndex].NormalizeRotation();
 		}
 	}
+
+	// Translation 'Orient and Scale' Translation Retargeting
+	const int32 NumBonesToOrientAndScaleRetarget = OrientAndScaleRetargetingPairs.Num();
+	if (NumBonesToOrientAndScaleRetarget > 0)
+	{
+		const FRetargetSourceCachedData& RetargetSourceCachedData = RequiredBones.GetRetargetSourceCachedData(RetargetSource);
+		const TArray<FOrientAndScaleRetargetingCachedData>& OrientAndScaleDataArray = RetargetSourceCachedData.OrientAndScaleData;
+		const TArray<int32>& CompactPoseIndexToOrientAndScaleIndex = RetargetSourceCachedData.CompactPoseIndexToOrientAndScaleIndex;
+
+		// If we have any cached retargeting data.
+		if ((OrientAndScaleDataArray.Num() > 0) && (CompactPoseIndexToOrientAndScaleIndex.Num() == RequiredBones.GetCompactPoseNumBones()))
+		{
+			for (int32 Index = 0; Index < NumBonesToOrientAndScaleRetarget; Index++)
+			{
+				const BoneTrackPair& BonePair = OrientAndScaleRetargetingPairs[Index];
+				const FCompactPoseBoneIndex CompactPoseBoneIndex(BonePair.AtomIndex);
+				const int32 OrientAndScaleIndex = CompactPoseIndexToOrientAndScaleIndex[CompactPoseBoneIndex.GetInt()];
+				if (OrientAndScaleIndex != INDEX_NONE)
+				{
+					const FOrientAndScaleRetargetingCachedData& OrientAndScaleData = OrientAndScaleDataArray[OrientAndScaleIndex];
+					FTransform& BoneTransform = OutPose[CompactPoseBoneIndex];
+					const FVector AnimatedTranslation = BoneTransform.GetTranslation();
+
+					// If Translation is not animated, we can just copy the TargetTranslation. No retargeting needs to be done.
+					const FVector NewTranslation = (AnimatedTranslation - OrientAndScaleData.SourceTranslation).IsNearlyZero(BONE_TRANS_RT_ORIENT_AND_SCALE_PRECISION) ?
+						OrientAndScaleData.TargetTranslation :
+						OrientAndScaleData.TranslationDeltaOrient.RotateVector(AnimatedTranslation) * OrientAndScaleData.TranslationScale;
+
+					BoneTransform.SetTranslation(NewTranslation);
+				}
+			}
+		}
+	}
 }
 
 #if WITH_EDITORONLY_DATA
@@ -2650,39 +2686,42 @@ void UAnimSequence::BakeOutAdditiveIntoRawData()
 		}
 
 		//Write out curve data for this frame
-		const TArray<SmartName::UID_Type>& UIDList = *Curve.UIDList;
-		for (int32 CurveIndex = 0; CurveIndex < UIDList.Num(); ++CurveIndex)
+		for (int32 CurveIndex = 0; CurveIndex < Curve.UIDToArrayIndexLUT->Num(); ++CurveIndex)
 		{
-			SmartName::UID_Type CurveUID = UIDList[CurveIndex];
-			FCurveElement& CurveEL = Curve.Elements[CurveIndex];
-			FFloatCurve* RawCurve = GetFloatCurve(NewCurveTracks, CurveUID);
-			if (!RawCurve && CurveEL.Value > 0.f) //Only make a new curve if we are going to give it data
+			USkeleton::AnimCurveUID CurveUID = (USkeleton::AnimCurveUID) CurveIndex;
+			int32 ArrayIndex = Curve.GetArrayIndexByUID(CurveUID);
+			if (ArrayIndex != INDEX_NONE)
 			{
-				FSmartName NewCurveName;
-				// if we don't have name, there is something wrong here. 
-				ensureAlways(MySkeleton->GetSmartNameByUID(USkeleton::AnimCurveMappingName, CurveUID, NewCurveName));
-				// curve flags don't matter much for compressed curves
-				NewCurveTracks.AddCurveData(NewCurveName, 0, ERawCurveTrackTypes::RCT_Float);
-				RawCurve = GetFloatCurve(NewCurveTracks, CurveUID);
-			}
-
-			if (RawCurve)
-			{
-				const bool bHasKeys = RawCurve->FloatCurve.GetNumKeys() > 0;
-				if (!bHasKeys)
+				FCurveElement& CurveEL = Curve.Elements[ArrayIndex];
+				FFloatCurve* RawCurve = GetFloatCurve(NewCurveTracks, CurveUID);
+				if (!RawCurve && CurveEL.Value > 0.f) //Only make a new curve if we are going to give it data
 				{
-					//Add pre key of 0
-					if (Frame > 0)
-					{
-						const float PreKeyTime = (Frame - 1)*EvalContext.IntervalTime;
-						RawCurve->UpdateOrAddKey(0.f, PreKeyTime);
-					}
-
+					FSmartName NewCurveName;
+					// if we don't have name, there is something wrong here. 
+					ensureAlways(MySkeleton->GetSmartNameByUID(USkeleton::AnimCurveMappingName, CurveUID, NewCurveName));
+					// curve flags don't matter much for compressed curves
+					NewCurveTracks.AddCurveData(NewCurveName, 0, ERawCurveTrackTypes::RCT_Float);
+					RawCurve = GetFloatCurve(NewCurveTracks, CurveUID);
 				}
 
-				if (!bHasKeys || IsNewKeyDifferent(RawCurve->FloatCurve.GetLastKey(), CurveEL.Value))
+				if (RawCurve)
 				{
-					RawCurve->UpdateOrAddKey(CurveEL.Value, CurrentFrameTime);
+					const bool bHasKeys = RawCurve->FloatCurve.GetNumKeys() > 0;
+					if (!bHasKeys)
+					{
+						//Add pre key of 0
+						if (Frame > 0)
+						{
+							const float PreKeyTime = (Frame - 1)*EvalContext.IntervalTime;
+							RawCurve->UpdateOrAddKey(0.f, PreKeyTime);
+						}
+
+					}
+
+					if (!bHasKeys || IsNewKeyDifferent(RawCurve->FloatCurve.GetLastKey(), CurveEL.Value))
+					{
+						RawCurve->UpdateOrAddKey(CurveEL.Value, CurrentFrameTime);
+					}
 				}
 			}
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimSequenceBase.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimSequenceBase.cpp
index b7310a5ce66d..5f91e5286c68 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimSequenceBase.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimSequenceBase.cpp
@@ -9,6 +9,7 @@
 #include "Logging/TokenizedMessage.h"
 #include "Logging/MessageLog.h"
 #include "UObject/FrameworkObjectVersion.h"
+#include "UObject/AthenaObjectVersion.h"
 
 DEFINE_LOG_CATEGORY(LogAnimMarkerSync);
 
@@ -48,6 +49,31 @@ void UAnimSequenceBase::PostLoad()
 
 	if(USkeleton* MySkeleton = GetSkeleton())
 	{
+#if WITH_EDITOR
+		if (GetLinkerCustomVersion(FAthenaObjectVersion::GUID) < FAthenaObjectVersion::FixUpNoneNameAnimationCurves)
+		{
+			for (int32 Index = 0; Index < RawCurveData.FloatCurves.Num(); ++Index)
+			{
+				FFloatCurve& Curve = RawCurveData.FloatCurves[Index];
+				if (Curve.Name.DisplayName == NAME_None)
+				{
+					// give unique name
+					Curve.Name.DisplayName = FName(*FString(GetName() + TEXT("_CurveNameFix_") + FString::FromInt(Index)));
+					UE_LOG(LogAnimation, Warning, TEXT("[AnimSequence %s] contains invalid curve name \'None\'. Renaming this to %s. Please fix this curve in the editor. "), *GetFullName(), *Curve.Name.DisplayName.ToString());
+				}
+			}
+		}
+		else
+		{
+			for (int32 Index = 0; Index < RawCurveData.FloatCurves.Num(); ++Index)
+			{
+				const FFloatCurve& Curve = RawCurveData.FloatCurves[Index];
+				ensureMsgf(Curve.Name.DisplayName != NAME_None, TEXT("[AnimSequencer %s] has invalid curve name."), *GetFullName());
+			}
+		}
+#endif // WITH_EDITOR
+
+
 		VerifyCurveNames<FFloatCurve>(*MySkeleton, USkeleton::AnimCurveMappingName, RawCurveData.FloatCurves);
 
 #if WITH_EDITOR
@@ -691,6 +717,7 @@ void UAnimSequenceBase::EvaluateCurveData(FBlendedCurve& OutCurve, float Current
 void UAnimSequenceBase::Serialize(FArchive& Ar)
 {
 	Ar.UsingCustomVersion(FFrameworkObjectVersion::GUID);
+	Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
 
 	Super::Serialize(Ar);
 
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/AnimationRuntime.cpp b/Engine/Source/Runtime/Engine/Private/Animation/AnimationRuntime.cpp
index 207c71afe0cb..a1042910b909 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/AnimationRuntime.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/AnimationRuntime.cpp
@@ -1726,45 +1726,73 @@ void FAnimationRuntime::RetargetBoneTransform(const USkeleton* MySkeleton, const
 	{
 		switch (MySkeleton->GetBoneTranslationRetargetingMode(SkeletonBoneIndex))
 		{
-		case EBoneTranslationRetargetingMode::AnimationScaled:
-		{
-			// @todo - precache that in FBoneContainer when we have SkeletonIndex->TrackIndex mapping. So we can just apply scale right away.
-			const TArray<FTransform>& SkeletonRefPoseArray = MySkeleton->GetRefLocalPoses(RetargetSource);
-			const float SourceTranslationLength = SkeletonRefPoseArray[SkeletonBoneIndex].GetTranslation().Size();
-			if (SourceTranslationLength > KINDA_SMALL_NUMBER)
+			case EBoneTranslationRetargetingMode::AnimationScaled:
 			{
-				const float TargetTranslationLength = RequiredBones.GetRefPoseTransform(BoneIndex).GetTranslation().Size();
-				BoneTransform.ScaleTranslation(TargetTranslationLength / SourceTranslationLength);
+				// @todo - precache that in FBoneContainer when we have SkeletonIndex->TrackIndex mapping. So we can just apply scale right away.
+				const TArray<FTransform>& SkeletonRefPoseArray = MySkeleton->GetRefLocalPoses(RetargetSource);
+				const float SourceTranslationLength = SkeletonRefPoseArray[SkeletonBoneIndex].GetTranslation().Size();
+				if (SourceTranslationLength > KINDA_SMALL_NUMBER)
+				{
+					const float TargetTranslationLength = RequiredBones.GetRefPoseTransform(BoneIndex).GetTranslation().Size();
+					BoneTransform.ScaleTranslation(TargetTranslationLength / SourceTranslationLength);
+				}
+				break;
 			}
-			break;
-		}
 
-		case EBoneTranslationRetargetingMode::Skeleton:
-		{
-			BoneTransform.SetTranslation(bIsBakedAdditive ? FVector::ZeroVector : RequiredBones.GetRefPoseTransform(BoneIndex).GetTranslation());
-			break;
-		}
-
-
-		case EBoneTranslationRetargetingMode::AnimationRelative:
-		{
-			// With baked additive animations, Animation Relative delta gets canceled out, so we can skip it.
-			// (A1 + Rel) - (A2 + Rel) = A1 - A2.
-			if (!bIsBakedAdditive)
+			case EBoneTranslationRetargetingMode::Skeleton:
 			{
-				const TArray<FTransform>& AuthoredOnRefSkeleton = MySkeleton->GetRefLocalPoses(RetargetSource);
-				const TArray<FTransform>& PlayingOnRefSkeleton = RequiredBones.GetRefPoseArray();
-
-				const FTransform& RefPoseTransform = RequiredBones.GetRefPoseTransform(BoneIndex);
-
-				// Apply the retargeting as if it were an additive difference between the current skeleton and the retarget skeleton. 
-				BoneTransform.SetRotation(BoneTransform.GetRotation() * AuthoredOnRefSkeleton[SkeletonBoneIndex].GetRotation().Inverse() * RefPoseTransform.GetRotation());
-				BoneTransform.SetTranslation(BoneTransform.GetTranslation() + (RefPoseTransform.GetTranslation() - AuthoredOnRefSkeleton[SkeletonBoneIndex].GetTranslation()));
-				BoneTransform.SetScale3D(BoneTransform.GetScale3D() * (RefPoseTransform.GetScale3D() * AuthoredOnRefSkeleton[SkeletonBoneIndex].GetSafeScaleReciprocal(AuthoredOnRefSkeleton[SkeletonBoneIndex].GetScale3D())));
-				BoneTransform.NormalizeRotation();
+				BoneTransform.SetTranslation(bIsBakedAdditive ? FVector::ZeroVector : RequiredBones.GetRefPoseTransform(BoneIndex).GetTranslation());
+				break;
+			}
+
+			case EBoneTranslationRetargetingMode::AnimationRelative:
+			{
+				// With baked additive animations, Animation Relative delta gets canceled out, so we can skip it.
+				// (A1 + Rel) - (A2 + Rel) = A1 - A2.
+				if (!bIsBakedAdditive)
+				{
+					const TArray<FTransform>& AuthoredOnRefSkeleton = MySkeleton->GetRefLocalPoses(RetargetSource);
+					const TArray<FTransform>& PlayingOnRefSkeleton = RequiredBones.GetRefPoseCompactArray();
+
+					const FTransform& RefPoseTransform = RequiredBones.GetRefPoseTransform(BoneIndex);
+
+					// Apply the retargeting as if it were an additive difference between the current skeleton and the retarget skeleton. 
+					BoneTransform.SetRotation(BoneTransform.GetRotation() * AuthoredOnRefSkeleton[SkeletonBoneIndex].GetRotation().Inverse() * RefPoseTransform.GetRotation());
+					BoneTransform.SetTranslation(BoneTransform.GetTranslation() + (RefPoseTransform.GetTranslation() - AuthoredOnRefSkeleton[SkeletonBoneIndex].GetTranslation()));
+					BoneTransform.SetScale3D(BoneTransform.GetScale3D() * (RefPoseTransform.GetScale3D() * AuthoredOnRefSkeleton[SkeletonBoneIndex].GetSafeScaleReciprocal(AuthoredOnRefSkeleton[SkeletonBoneIndex].GetScale3D())));
+					BoneTransform.NormalizeRotation();
+				}
+				break;
+			}
+
+			case EBoneTranslationRetargetingMode::OrientAndScale:
+			{
+				if (!bIsBakedAdditive)
+				{
+					const FRetargetSourceCachedData& RetargetSourceCachedData = RequiredBones.GetRetargetSourceCachedData(RetargetSource);
+					const TArray<FOrientAndScaleRetargetingCachedData>& OrientAndScaleDataArray = RetargetSourceCachedData.OrientAndScaleData;
+					const TArray<int32>& CompactPoseIndexToOrientAndScaleIndex = RetargetSourceCachedData.CompactPoseIndexToOrientAndScaleIndex;
+
+					// If we have any cached retargeting data.
+					if ((OrientAndScaleDataArray.Num() > 0) && (CompactPoseIndexToOrientAndScaleIndex.Num() == RequiredBones.GetCompactPoseNumBones()))
+					{
+						const int32 OrientAndScaleIndex = CompactPoseIndexToOrientAndScaleIndex[BoneIndex.GetInt()];
+						if (OrientAndScaleIndex != INDEX_NONE)
+						{
+							const FOrientAndScaleRetargetingCachedData& OrientAndScaleData = OrientAndScaleDataArray[OrientAndScaleIndex];
+							const FVector AnimatedTranslation = BoneTransform.GetTranslation();
+
+							// If Translation is not animated, we can just copy the TargetTranslation. No retargeting needs to be done.
+							const FVector NewTranslation = (AnimatedTranslation - OrientAndScaleData.SourceTranslation).IsNearlyZero(BONE_TRANS_RT_ORIENT_AND_SCALE_PRECISION) ?
+								OrientAndScaleData.TargetTranslation :
+								OrientAndScaleData.TranslationDeltaOrient.RotateVector(AnimatedTranslation) * OrientAndScaleData.TranslationScale;
+
+							BoneTransform.SetTranslation(NewTranslation);
+						}
+					}
+				}
+				break;
 			}
-			break;
-		}
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/InputScaleBias.cpp b/Engine/Source/Runtime/Engine/Private/Animation/InputScaleBias.cpp
index b4ed208cc7b3..63e1107f70e4 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/InputScaleBias.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/InputScaleBias.cpp
@@ -2,6 +2,8 @@
 
 #include "Animation/InputScaleBias.h"
 
+#define LOCTEXT_NAMESPACE "FInputScaleBias"
+
 /////////////////////////////////////////////////////
 // FInputScaleBias
 
@@ -10,11 +12,188 @@ float FInputScaleBias::ApplyTo(float Value) const
 	return FMath::Clamp<float>( Value * Scale + Bias, 0.0f, 1.0f );
 }
 
+FText FInputScaleBias::GetFriendlyName(FText InFriendlyName) const
+{
+	FText OutFriendlyName = InFriendlyName;
+
+	if (Scale != 1.f)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("Scale"), FText::AsNumber(Scale));
+
+		if (Scale == -1.f)
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Scale", "- {PinFriendlyName}"), Args);
+		}
+		else
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Scale", "{Scale} * {PinFriendlyName}"), Args);
+		}
+	}
+
+	if (Bias != 0.f)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("Bias"), FText::AsNumber(Bias));
+
+		// '-' Sign already included in Scale above.
+		if (Scale < 0.f)
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Bias", "{Bias} {PinFriendlyName}"), Args);
+		}
+		else
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Bias", "{Bias} + {PinFriendlyName}"), Args);
+		}
+	}
+
+	return OutFriendlyName;
+}
+
 /////////////////////////////////////////////////////
 // FInputScaleBiasClamp
 
-float FInputScaleBiasClamp::ApplyTo(float Value) const
+float FInputScaleBiasClamp::ApplyTo(float Value, float InDeltaTime) const
 {
-	const float UnClampedResult = Value * Scale + Bias;
-	return bClampResult ? FMath::Clamp<float>(UnClampedResult, ClampMin, ClampMax) : UnClampedResult;
-}
\ No newline at end of file
+	float Result = Value;
+
+	if (bMapRange)
+	{
+		Result = FMath::GetMappedRangeValueUnclamped(InRange.ToVector2D(), OutRange.ToVector2D(), Result);
+	}
+
+	Result = Result * Scale + Bias;
+
+	if (bClampResult)
+	{
+		Result = FMath::Clamp<float>(Result, ClampMin, ClampMax);
+	}
+
+	if (bInterpResult)
+	{
+		if (bInitialized)
+		{
+			const float InterpSpeed = (Result >= InterpolatedResult) ? InterpSpeedIncreasing : InterpSpeedDecreasing;
+			Result = FMath::FInterpTo(InterpolatedResult, Result, InDeltaTime, InterpSpeed);
+		}
+
+		InterpolatedResult = Result;
+	}
+
+	bInitialized = true;
+	return Result;
+}
+
+FText FInputScaleBiasClamp::GetFriendlyName(FText InFriendlyName) const
+{
+	FText OutFriendlyName = InFriendlyName;
+
+	// MapRange
+	if (bMapRange)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("InRangeMin"), InRange.Min);
+		Args.Add(TEXT("InRangeMax"), InRange.Max);
+		Args.Add(TEXT("OutRangeMin"), OutRange.Min);
+		Args.Add(TEXT("OutRangeMax"), OutRange.Max);
+		OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_MapRange", "MapRange({PinFriendlyName}, In({InRangeMin}:{InRangeMax}), Out({OutRangeMin}:{OutRangeMax}))"), Args);
+	}
+
+	if (Scale != 1.f)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("Scale"), FText::AsNumber(Scale));
+
+		if (Scale == -1.f)
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Scale", "- {PinFriendlyName}"), Args);
+		}
+		else 
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Scale", "{Scale} * {PinFriendlyName}"), Args);
+		}
+	}
+
+	if (Bias != 0.f)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("Bias"), FText::AsNumber(Bias));
+
+		// '-' Sign already included in Scale above.
+		if (Scale < 0.f)
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Bias", "{Bias} {PinFriendlyName}"), Args);
+		}
+		else
+		{
+			OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Bias", "{Bias} + {PinFriendlyName}"), Args);
+		}
+	}
+
+	// Clamp
+	if (bClampResult)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("ClampMin"), ClampMin);
+		Args.Add(TEXT("ClampMax"), ClampMax);
+		OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Clamp", "Clamp({PinFriendlyName}, {ClampMin}, {ClampMax})"), Args);
+	}
+
+	// Interp
+	if (bInterpResult)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("PinFriendlyName"), OutFriendlyName);
+		Args.Add(TEXT("InterpSpeedIncreasing"), InterpSpeedIncreasing);
+		Args.Add(TEXT("InterpSpeedDecreasing"), InterpSpeedDecreasing);
+		OutFriendlyName = FText::Format(LOCTEXT("FInputScaleBias_Interp", "FInterp({PinFriendlyName}, ({InterpSpeedIncreasing}:{InterpSpeedDecreasing}))"), Args);
+	}
+
+	return OutFriendlyName;
+}
+
+
+/////////////////////////////////////////////////////
+// FInputAlphaBool
+
+float FInputAlphaBoolBlend::ApplyTo(bool bEnabled, float InDeltaTime)
+{
+	const float TargetValue = bEnabled ? 1.f : 0.f;
+
+	if (!bInitialized)
+	{
+		if (CustomCurve != AlphaBlend.GetCustomCurve())
+		{
+			AlphaBlend.SetCustomCurve(CustomCurve);
+		}
+
+		if (BlendOption != AlphaBlend.GetBlendOption())
+		{
+			AlphaBlend.SetBlendOption(BlendOption);
+		}
+
+		AlphaBlend.SetDesiredValue(TargetValue);
+		AlphaBlend.SetBlendTime(0.f);
+		AlphaBlend.Reset();
+		bInitialized = true;
+	}
+	else
+	{
+		if (AlphaBlend.GetDesiredValue() != TargetValue)
+		{
+			AlphaBlend.SetDesiredValue(TargetValue);
+			AlphaBlend.SetBlendTime(bEnabled ? BlendInTime : BlendOutTime);
+		}
+	}
+
+	AlphaBlend.Update(InDeltaTime);
+	return AlphaBlend.GetBlendedValue();
+}
+
+#undef LOCTEXT_NAMESPACE 
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/Animation/Skeleton.cpp b/Engine/Source/Runtime/Engine/Private/Animation/Skeleton.cpp
index fbf5e954bff4..b332ac446d2f 100644
--- a/Engine/Source/Runtime/Engine/Private/Animation/Skeleton.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Animation/Skeleton.cpp
@@ -111,6 +111,11 @@ void USkeleton::PostInitProperties()
 	}
 }
 
+bool USkeleton::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void USkeleton::PostLoad()
 {
 	Super::PostLoad();
@@ -1183,30 +1188,38 @@ void USkeleton::RenameSlotName(const FName& OldName, const FName& NewName)
 
 bool USkeleton::AddSmartNameAndModify(FName ContainerName, FName NewDisplayName, FSmartName& NewName)
 {
-	NewName.DisplayName = NewDisplayName;
-	const bool bAdded = VerifySmartNameInternal(ContainerName, NewName);
-
-	if(bAdded)
+	if (NewDisplayName != NAME_None)
 	{
-		IncreaseAnimCurveUidVersion();
+		NewName.DisplayName = NewDisplayName;
+		const bool bAdded = VerifySmartNameInternal(ContainerName, NewName);
+
+		if (bAdded)
+		{
+			IncreaseAnimCurveUidVersion();
+		}
+
+		return bAdded;
 	}
 
-	return bAdded;
+	return false;
 }
 
 bool USkeleton::RenameSmartnameAndModify(FName ContainerName, SmartName::UID_Type Uid, FName NewName)
 {
 	bool Successful = false;
-	FSmartNameMapping* RequestedMapping = SmartNames.GetContainerInternal(ContainerName);
-	if (RequestedMapping)
+	if (NewName != NAME_None)
 	{
-		FName CurrentName;
-		RequestedMapping->GetName(Uid, CurrentName);
-		if (CurrentName != NewName)
+		FSmartNameMapping* RequestedMapping = SmartNames.GetContainerInternal(ContainerName);
+		if (RequestedMapping)
 		{
-			Modify();
-			Successful = RequestedMapping->Rename(Uid, NewName);
-			IncreaseAnimCurveUidVersion();
+			FName CurrentName;
+			RequestedMapping->GetName(Uid, CurrentName);
+			if (CurrentName != NewName)
+			{
+				Modify();
+				Successful = RequestedMapping->Rename(Uid, NewName);
+				IncreaseAnimCurveUidVersion();
+			}
 		}
 	}
 	return Successful;
@@ -1387,6 +1400,7 @@ void USkeleton::IncreaseAnimCurveUidVersion()
 	if (Mapping != nullptr)
 	{
 		DefaultCurveUIDList.Reset();
+		// this should exactly work with what current index is
 		Mapping->FillUidArray(DefaultCurveUIDList);
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/AssetManager.cpp b/Engine/Source/Runtime/Engine/Private/AssetManager.cpp
index 4c575a1e3b2e..2bc9d1ce32d7 100644
--- a/Engine/Source/Runtime/Engine/Private/AssetManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AssetManager.cpp
@@ -1483,7 +1483,7 @@ TSharedPtr<FStreamableHandle> UAssetManager::LoadAssetList(const TArray<FSoftObj
 	}
 
 	// SynchronousLoad doesn't make sense if chunks are missing
-	if (bShouldUseSynchronousLoad && MissingChunks.Num() > 0)
+	if (bShouldUseSynchronousLoad && MissingChunks.Num() == 0)
 	{
 		NewHandle = StreamableManager.RequestSyncLoad(AssetList, false, DebugName);
 	}
@@ -2848,7 +2848,7 @@ void UAssetManager::ModifyCook(TArray<FName>& PackagesToCook, TArray<FName>& Pac
 			// Treat DevAlwaysCook as AlwaysCook, may get excluded in VerifyCanCookPackage
 			bool bAlwaysCook = (CookRule == EPrimaryAssetCookRule::AlwaysCook || CookRule == EPrimaryAssetCookRule::DevelopmentAlwaysCook);
 			bool bCanCook = VerifyCanCookPackage(AssetData.PackageName, false);
-			
+
 			if (bAlwaysCook && bCanCook && !TypeInfo.bIsEditorOnly)
 			{
 				// If this is always cook, not excluded, and not editor only, cook it
@@ -2863,6 +2863,11 @@ void UAssetManager::ModifyCook(TArray<FName>& PackagesToCook, TArray<FName>& Pac
 	}
 }
 
+bool UAssetManager::ShouldCookForPlatform(const UPackage* Package, const ITargetPlatform* TargetPlatform)
+{
+	return true;
+}
+
 EPrimaryAssetCookRule UAssetManager::GetPackageCookRule(FName PackageName) const
 {
 	FPrimaryAssetRules BestRules;
@@ -3293,6 +3298,17 @@ void UAssetManager::InitializeAssetBundlesFromMetadata(const UStruct* Struct, co
 				It.SkipRecursiveProperty();
 			}
 		}
+		else if (const UObjectProperty* ObjectProperty = Cast<UObjectProperty>(Property))
+		{
+			if (ObjectProperty->PropertyFlags & CPF_InstancedReference)
+			{
+				UObject* const* ObjectPtr = reinterpret_cast<UObject* const*>(PropertyValue);
+				if (ObjectPtr && *ObjectPtr)
+				{
+					UAssetManager::Get().InitializeAssetBundlesFromMetadata(*ObjectPtr, AssetBundle);
+				}
+			}
+		}
 
 		if (!FoundRef.IsNull())
 		{
diff --git a/Engine/Source/Runtime/Engine/Private/Atmosphere/Atmosphere.cpp b/Engine/Source/Runtime/Engine/Private/Atmosphere/Atmosphere.cpp
index 27b5531718ce..633758677bfe 100644
--- a/Engine/Source/Runtime/Engine/Private/Atmosphere/Atmosphere.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Atmosphere/Atmosphere.cpp
@@ -113,6 +113,11 @@ UAtmosphericFogComponent::UAtmosphericFogComponent(const FObjectInitializer& Obj
 	bDisableGroundScattering = false;
 }
 
+bool UAtmosphericFogComponent::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UAtmosphericFogComponent::PostLoad()
 {
 	Super::PostLoad();
diff --git a/Engine/Source/Runtime/Engine/Private/AudioCompressionSettingsUtils.cpp b/Engine/Source/Runtime/Engine/Private/AudioCompressionSettingsUtils.cpp
index 8db23204c887..f3dae95e6c4a 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioCompressionSettingsUtils.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioCompressionSettingsUtils.cpp
@@ -12,6 +12,11 @@
 #if PLATFORM_IOS && ENABLE_PLATFORM_COMPRESSION_OVERRIDES
 #include "IOSRuntimeSettings.h"
 #endif
+
+#if PLATFORM_SWITCH && ENABLE_PLATFORM_COMPRESSION_OVERRIDES
+#include "SwitchRuntimeSettings.h"
+#endif
+
 #include "Misc/ConfigCacheIni.h"
 
 const FPlatformRuntimeAudioCompressionOverrides* FPlatformCompressionUtilities::GetRuntimeCompressionOverridesForCurrentPlatform()
@@ -30,6 +35,15 @@ const FPlatformRuntimeAudioCompressionOverrides* FPlatformCompressionUtilities::
 	{
 		return &(Settings->CompressionOverrides);
 	}
+
+#elif PLATFORM_SWITCH && ENABLE_PLATFORM_COMPRESSION_OVERRIDES
+	static const USwitchRuntimeSettings* Settings = GetDefault<USwitchRuntimeSettings>();
+
+	if (Settings)
+	{
+		return &(Settings->CompressionOverrides);
+	}
+
 #endif // PLATFORM_ANDROID
 	return nullptr;
 }
@@ -40,6 +54,8 @@ void CacheCurrentPlatformAudioCookOverrides(FPlatformAudioCookOverrides& OutOver
 	const TCHAR* CategoryName = TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings");
 #elif PLATFORM_IOS
 	const TCHAR* CategoryName = TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings");
+#elif PLATFORM_SWITCH
+	const TCHAR* CategoryName = TEXT("/Script/SwitchRuntimeSettings.SwitchRuntimeSettings");
 #else
 	const TCHAR* CategoryName = TEXT("");
 #endif
@@ -77,14 +93,14 @@ void CacheCurrentPlatformAudioCookOverrides(FPlatformAudioCookOverrides& OutOver
 	OutOverrides.PlatformSampleRates.Add(ESoundwaveSampleRateSettings::Min, RetrievedSampleRate);
 }
 
-#if PLATFORM_ANDROID || PLATFORM_IOS
+#if PLATFORM_ANDROID || PLATFORM_IOS || PLATFORM_SWITCH
 static FPlatformAudioCookOverrides OutOverrides = FPlatformAudioCookOverrides();
 #endif
 
 
 const FPlatformAudioCookOverrides* FPlatformCompressionUtilities::GetCookOverridesForCurrentPlatform()
 {
-#if PLATFORM_ANDROID || PLATFORM_IOS
+#if PLATFORM_ANDROID || PLATFORM_IOS || PLATFORM_SWITCH
 	static bool bCachedCookOverrides = false;
 	if (!bCachedCookOverrides)
 	{
@@ -124,7 +140,7 @@ float FPlatformCompressionUtilities::GetTargetSampleRateForPlatform(ESoundwaveSa
 		}
 		else
 		{
-			UE_LOG(LogTemp, Warning, TEXT("Warning: Could not find a matching sample rate for this platform. Check your project settings."))
+			ensureMsgf(false, TEXT("Warning: Could not find a matching sample rate for this platform. Check your project settings."));
 		}
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/AudioDecompress.cpp b/Engine/Source/Runtime/Engine/Private/AudioDecompress.cpp
index 19c75f0edd26..8f42a10e9980 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioDecompress.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioDecompress.cpp
@@ -642,11 +642,6 @@ void FAsyncAudioDecompressWorker::DoWork()
 				AudioInfo->EnableHalfRate(true);
 			}
 #endif
-			// Update the sound wave's properties based on metadata read from the compressed audio asset's header:
-			if (Wave->GetSampleRateForCurrentPlatform() != QualityInfo.SampleRate)
-			{
-				UE_LOG(LogAudio, Warning, TEXT("Warning: Found sample rate mismatch."));
-			}
 
 			Wave->SetSampleRate(QualityInfo.SampleRate);
 			Wave->NumChannels = QualityInfo.NumChannels;
@@ -664,16 +659,9 @@ void FAsyncAudioDecompressWorker::DoWork()
 					Wave->CachedRealtimeFirstBuffer = (uint8*)FMemory::Malloc(PCMBufferSize);
 					AudioInfo->ReadCompressedData(Wave->CachedRealtimeFirstBuffer, Wave->bLooping, PCMBufferSize);
 				}
-				else
+				else if (Wave->GetPrecacheState() == ESoundWavePrecacheState::Done)
 				{
-					if (Wave->bIsPrecacheDone)
-					{
-						UE_LOG(LogAudio, Warning, TEXT("Attempted to precache decoded audio multiple times."));
-					}
-					else
-					{
-						UE_LOG(LogAudio, Warning, TEXT("CachedRealtimeFirstBuffer potentially contains invalid data."));
-					}
+					UE_LOG(LogAudio, Warning, TEXT("Attempted to precache decoded audio multiple times."));
 				}
 #endif
 			}
@@ -710,9 +698,6 @@ void FAsyncAudioDecompressWorker::DoWork()
 		}
 
 		delete AudioInfo;
-
-		// Flag that we've finished this precache decompress task.
-		Wave->bIsPrecacheDone = true;
 	}
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/AudioDerivedData.cpp b/Engine/Source/Runtime/Engine/Private/AudioDerivedData.cpp
index 730f94349da3..a92f15363cea 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioDerivedData.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioDerivedData.cpp
@@ -839,6 +839,8 @@ static void CookSimpleWave(USoundWave* SoundWave, FName FormatName, const IAudio
 
 	bool bWasLocked = false;
 
+	int32 WaveSampleRate = 0;
+
 	// check if there is any raw sound data
 	if( SoundWave->RawData.GetBulkDataSize() > 0 )
 	{
@@ -870,18 +872,20 @@ static void CookSimpleWave(USoundWave* SoundWave, FName FormatName, const IAudio
 	}
 	else
 	{
+		WaveSampleRate = *WaveInfo.pSamplesPerSec;
+
 		float SampleRateOverride = -1.0f;
 
 		if (CompressionOverrides && CompressionOverrides->bResampleForDevice)
 		{
 			SampleRateOverride = SoundWave->GetSampleRateForCompressionOverrides(CompressionOverrides);
 			// Check for a platform resample override here and resample if neccesary:
-			if (SampleRateOverride > 0 && SampleRateOverride != (float)*WaveInfo.pSamplesPerSec)
+			if (SampleRateOverride > 0 && SampleRateOverride != (float)WaveSampleRate)
 			{
 				size_t TotalDataSize = WaveInfo.SampleDataSize;
 				
-				ResampleWaveData(Input, TotalDataSize, *WaveInfo.pChannels, *WaveInfo.pSamplesPerSec, SampleRateOverride);
-				*WaveInfo.pSamplesPerSec = SampleRateOverride;
+				ResampleWaveData(Input, TotalDataSize, *WaveInfo.pChannels, WaveSampleRate, SampleRateOverride);
+				WaveSampleRate = SampleRateOverride;
 				WaveInfo.SampleDataSize = TotalDataSize;
 			}
 		}
@@ -910,7 +914,7 @@ static void CookSimpleWave(USoundWave* SoundWave, FName FormatName, const IAudio
 		}
 		
 		QualityInfo.NumChannels = *WaveInfo.pChannels;
-		QualityInfo.SampleRate = *WaveInfo.pSamplesPerSec;
+		QualityInfo.SampleRate = WaveSampleRate;
 		QualityInfo.SampleDataSize = Input.Num();
 		QualityInfo.DebugName = SoundWave->GetFullName();
 
@@ -1053,6 +1057,8 @@ static void CookSurroundWave( USoundWave* SoundWave, FName FormatName, const IAu
 		// Only allow the formats that can be played back through
 		if( ChannelCount == 4 || ChannelCount == 6 || ChannelCount == 7 || ChannelCount == 8 )
 		{
+			int32 WaveSampleRate = *WaveInfo.pSamplesPerSec;
+
 			// Check for a platform resample override here and resample if neccesary:
 			float SampleRateOverride = -1.0f;
 			if (CompressionOverrides && CompressionOverrides->bResampleForDevice)
@@ -1060,14 +1066,14 @@ static void CookSurroundWave( USoundWave* SoundWave, FName FormatName, const IAu
 				SampleRateOverride = SoundWave->GetSampleRateForCompressionOverrides(CompressionOverrides);
 			}
 
-			if (SampleRateOverride > 0 && SampleRateOverride != (float)*WaveInfo.pSamplesPerSec)
+			if (SampleRateOverride > 0 && SampleRateOverride != (float)WaveSampleRate)
 			{
 				for (int ChannelIndex = 1; ChannelIndex < ChannelCount; ChannelIndex++)
 				{
-					ResampleWaveData(SourceBuffers[ChannelIndex], SampleDataSize, 1, *WaveInfo.pSamplesPerSec, SampleRateOverride);
+					ResampleWaveData(SourceBuffers[ChannelIndex], SampleDataSize, 1, WaveSampleRate, SampleRateOverride);
 				}	
 
-				*WaveInfo.pSamplesPerSec = SampleRateOverride;
+				WaveSampleRate = SampleRateOverride;
 			}
 
 			UE_LOG(LogAudioDerivedData, Log,  TEXT( "Cooking %d channels for: %s" ), ChannelCount, *SoundWave->GetFullName() );
@@ -1090,7 +1096,7 @@ static void CookSurroundWave( USoundWave* SoundWave, FName FormatName, const IAu
 			}
 
 			QualityInfo.NumChannels = ChannelCount;
-			QualityInfo.SampleRate = *WaveInfo.pSamplesPerSec;
+			QualityInfo.SampleRate = WaveSampleRate;
 			QualityInfo.SampleDataSize = SampleDataSize;
 			QualityInfo.DebugName = SoundWave->GetFullName();
 			//@todo tighten up the checking for empty results here
diff --git a/Engine/Source/Runtime/Engine/Private/AudioDevice.cpp b/Engine/Source/Runtime/Engine/Private/AudioDevice.cpp
index 2fd3af9033e4..8f2beacab5c2 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioDevice.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioDevice.cpp
@@ -31,6 +31,7 @@
 #include "GeneralProjectSettings.h"
 #include "HAL/LowLevelMemTracker.h"
 #include "AudioCompressionSettingsUtils.h"
+#include "DrawDebugHelpers.h"
 
 #if WITH_EDITOR
 #include "AssetRegistryModule.h"
@@ -109,7 +110,13 @@ void FDynamicParameter::Update(float DeltaTime)
 -----------------------------------------------------------------------------*/
 
 FAudioDevice::FAudioDevice()
-	: CommonAudioPool(nullptr)
+	: MaxChannels(0)
+	, NumStoppingVoices(32)
+	, CurrentStoppingVoiceCount(0)
+	, MaxWaveInstances(0)
+	, SampleRate(0)
+	, CommonAudioPoolSize(0)
+	, CommonAudioPool(nullptr)
 	, CommonAudioPoolFreeBytes(0)
 	, DeviceHandle(INDEX_NONE)
 	, SpatializationPluginInterface(nullptr)
@@ -157,7 +164,6 @@ FAudioDevice::FAudioDevice()
 	, DeviceDeltaTime(0.0f)
 	, ConcurrencyManager(this)
 	, OneShotCount(0)
-	, MaxOneShotActiveSounds(INDEX_NONE)
 	, OneShotPriorityCullThreshold(-1.0f)
 {
 }
@@ -214,8 +220,7 @@ bool FAudioDevice::Init(int32 InMaxChannels)
 	bAllowCenterChannel3DPanning = AudioSettings->bAllowCenterChannel3DPanning;
 	bAllowVirtualizedSounds = AudioSettings->bAllowVirtualizedSounds;
 	DefaultReverbSendLevel = AudioSettings->DefaultReverbSendLevel;
-
-	MaxOneShotActiveSounds = AudioSettings->MaxOneShotActiveSoundCount;
+	MaxWaveInstances = AudioSettings->MaxWaveInstances;
 
 	const FSoftObjectPath DefaultBaseSoundMixName = GetDefault<UAudioSettings>()->DefaultBaseSoundMix;
 	if (DefaultBaseSoundMixName.IsValid())
@@ -234,6 +239,13 @@ bool FAudioDevice::Init(int32 InMaxChannels)
 	{
 		// create a platform specific effects manager
 		Effects = CreateEffectsManager();
+
+		NumStoppingVoices = GetDefault<UAudioSettings>()->NumStoppingSources;
+	}
+	else
+	{
+		// In old audio engine, there are no stopping voices
+		NumStoppingVoices = 0;
 	}
 
 	// Cache any plugin settings objects we have loaded
@@ -352,23 +364,23 @@ void FAudioDevice::PrecacheStartupSounds()
 
 void FAudioDevice::SetMaxChannels(int32 InMaxChannels)
 {
-	if (InMaxChannels > Sources.Num())
+	if (InMaxChannels + NumStoppingVoices > Sources.Num())
 	{
 		UE_LOG(LogAudio, Warning, TEXT("Can't increase channels past starting number!"));
 		return;
 	}
 
-	MaxChannels = InMaxChannels;
+	MaxChannels = InMaxChannels + NumStoppingVoices;
 }
 
 int32 FAudioDevice::GetMaxChannels() const
 {
 	if (AudioChannelCountCVar > 0 && AudioChannelCountCVar < Sources.Num())
 	{
-		return AudioChannelCountCVar;
+		return AudioChannelCountCVar + NumStoppingVoices;
 	}
 
-	return MaxChannels;
+	return MaxChannels + NumStoppingVoices;
 }
 
 void FAudioDevice::Teardown()
@@ -400,11 +412,16 @@ void FAudioDevice::Teardown()
 	// Note: we don't free audio buffers at this stage since they are managed in the audio device manager
 
 	// Must be after FreeBufferResource as that potentially stops sources
-	for (int32 Index = 0; Index < Sources.Num(); Index++)
+	if (IsAudioMixerEnabled())
 	{
-		Sources[Index]->Stop();
-		delete Sources[Index];
+		for (int32 Index = 0; Index < Sources.Num(); Index++)
+		{
+			// Make the sound stop instantly
+			Sources[Index]->StopNow();
+			delete Sources[Index];
+		}
 	}
+
 	Sources.Reset();
 	FreeSources.Reset();
 
@@ -480,12 +497,12 @@ void FAudioDevice::AddReferencedObjects(FReferenceCollector& Collector)
 	{
 		ActiveSound->AddReferencedObjects(Collector);
 	}
-	
+
+	// Make sure we don't try to delete any sound waves which may have in-flight decodes
+	Collector.AddReferencedObjects(ReferencedSoundWaves); 
+
 	// Loop through the cached plugin settings objects and add to the collector
-	for (UObject* PluginSettingsObject : PluginSettingsObjects)
-	{
-		Collector.AddReferencedObject(PluginSettingsObject);
-	}
+	Collector.AddReferencedObjects(PluginSettingsObjects);
 }
 
 void FAudioDevice::ResetInterpolation()
@@ -1091,6 +1108,16 @@ bool FAudioDevice::HandleAudioMixerDebugSound(const TCHAR* Cmd, FOutputDevice& A
 	return true;
 }
 
+bool FAudioDevice::HandleAudioDebugSound(const TCHAR* Cmd, FOutputDevice& Ar)
+{
+	FAudioDeviceManager* DeviceManager = GEngine->GetAudioDeviceManager();
+	if (DeviceManager)
+	{
+		DeviceManager->SetAudioDebugSound(Cmd);
+	}
+	return true;
+}
+
 bool FAudioDevice::HandleSoundClassFixup(const TCHAR* Cmd, FOutputDevice& Ar)
 {
 #if WITH_EDITOR
@@ -1537,6 +1564,10 @@ bool FAudioDevice::Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar)
 	{
 		return HandleAudioMixerDebugSound(Cmd, Ar);
 	}
+	else if (FParse::Command(&Cmd, TEXT("AudioDebugSound")))
+	{
+		return HandleAudioDebugSound(Cmd, Ar);
+	}
 	else if (FParse::Command(&Cmd, TEXT("SoundClassFixup")))
 	{
 		return HandleSoundClassFixup(Cmd, Ar);
@@ -2254,6 +2285,10 @@ void FAudioDevice::UpdateSoundClassProperties(float DeltaTime)
 
 		ApplyClassAdjusters(It.Key(), SoundMixState->InterpValue, DeltaTime);
 
+		if (SoundMixState->CurrentState == ESoundMixState::AwaitingRemoval && SoundMixState->PassiveRefCount == 0)
+		{
+			ClearSoundMix(It.Key());
+		}
 	}
 }
 
@@ -2313,24 +2348,6 @@ void FAudioDevice::SetListener(UWorld* World, const int32 InViewportIndex, const
 {
 	check(IsInGameThread());
 
-	// The copy is done because FTransform doesn't work to pass by value on Win32
-	FTransform ListenerTransformCopy = ListenerTransform;
-
-	if (!ensureMsgf(ListenerTransformCopy.IsValid(), TEXT("Invalid listener transform provided to AudioDevice")))
-	{
-		// If we have a bad transform give it something functional if totally wrong
-		ListenerTransformCopy = FTransform::Identity;
-	}
-
-	if (InViewportIndex >= ListenerTransforms.Num())
-	{
-		ListenerTransforms.AddDefaulted(InViewportIndex - ListenerTransforms.Num() + 1);
-	}
-
-	ListenerTransforms[InViewportIndex] = ListenerTransformCopy;
-
-	DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetListener"), STAT_AudioSetListener, STATGROUP_AudioThreadCommands);
-
 	uint32 WorldID = INDEX_NONE;
 
 	if (World != nullptr)
@@ -2346,6 +2363,29 @@ void FAudioDevice::SetListener(UWorld* World, const int32 InViewportIndex, const
 		bPluginListenersInitialized = true;
 	}
 
+	// The copy is done because FTransform doesn't work to pass by value on Win32
+	FTransform ListenerTransformCopy = ListenerTransform;
+
+	if (!ensureMsgf(ListenerTransformCopy.IsValid(), TEXT("Invalid listener transform provided to AudioDevice")))
+	{
+		// If we have a bad transform give it something functional if totally wrong
+		ListenerTransformCopy = FTransform::Identity;
+	}
+
+	if (InViewportIndex >= ListenerTransforms.Num())
+	{
+		ListenerTransforms.AddDefaulted(InViewportIndex - ListenerTransforms.Num() + 1);
+	}
+	else if (ListenerTransforms[InViewportIndex].Equals(ListenerTransformCopy, KINDA_SMALL_NUMBER))
+	{
+		// Don't need tp update hte listener if we're very close to our current transform
+		return;
+	}
+
+	ListenerTransforms[InViewportIndex] = ListenerTransformCopy;
+
+	DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetListener"), STAT_AudioSetListener, STATGROUP_AudioThreadCommands);
+
 	if (World)
 	{
 		for (TAudioPluginListenerPtr PluginManager : PluginListeners)
@@ -2934,8 +2974,8 @@ int32 FAudioDevice::GetSortedActiveWaveInstances(TArray<FWaveInstance*>& WaveIns
 						const float Duration = ActiveSound->Sound->GetDuration();
 						if ((ActiveSound->Sound->HasDelayNode() || ActiveSound->Sound->HasConcatenatorNode()))
 						{
-							static const float TimeFudgeFactor = 0.1f;
-							if (ActiveSound->PlaybackTime > Duration + TimeFudgeFactor)
+							static const float TimeFudgeFactor = 1.0f;
+							if (Duration > TimeFudgeFactor && ActiveSound->PlaybackTime > Duration + TimeFudgeFactor)
 							{
 								bStopped = true;
 							}
@@ -2990,7 +3030,8 @@ int32 FAudioDevice::GetSortedActiveWaveInstances(TArray<FWaveInstance*>& WaveIns
 
 	int32 FirstActiveIndex = 0;
 
-	if (WaveInstances.Num() >= 0)
+	// Only need to do the wave instance sort if we have any waves and if our wave instances are greater than our max channels.
+	if (WaveInstances.Num() >= GetMaxChannels())
 	{
 		// Helper function for "Sort" (higher priority sorts last).
 		struct FCompareFWaveInstanceByPlayPriority
@@ -3007,15 +3048,6 @@ int32 FAudioDevice::GetSortedActiveWaveInstances(TArray<FWaveInstance*>& WaveIns
 		// Get the first index that will result in a active source voice
 		int32 CurrentMaxChannels = GetMaxChannels();
 		FirstActiveIndex = FMath::Max(WaveInstances.Num() - CurrentMaxChannels, 0);
-		int32 CullIndex = FirstActiveIndex - CurrentMaxChannels;
-		if (CullIndex > 0)
-		{
-			OneShotPriorityCullThreshold = WaveInstances[CullIndex]->WaveData->Priority;
-		}
-		else
-		{
-			OneShotPriorityCullThreshold = -1.0f;
-		}
 	}
 
 	return FirstActiveIndex;
@@ -3078,7 +3110,7 @@ void FAudioDevice::StopSources(TArray<FWaveInstance*>& WaveInstances, int32 Firs
 	{
 		FSoundSource* Source = Sources[SourceIndex];
 
-		if (Source->WaveInstance)
+		if (Source->WaveInstance && !Source->IsStopping())
 		{
 			// If we need to stop this sound due to max concurrency (i.e. it was quietest in a concurrency group)
 			if (Source->WaveInstance->ShouldStopDueToMaxConcurrency())
@@ -3097,6 +3129,7 @@ void FAudioDevice::StopSources(TArray<FWaveInstance*>& WaveInstances, int32 Firs
 
 				// Need to update the source still so that it gets any volume settings applied to
 				// otherwise the source may play at a very quiet volume and not actually set to 0.0
+				Source->NotifyPlaybackData();
 				Source->Update();
 			}
 		}
@@ -3138,7 +3171,8 @@ void FAudioDevice::StartSources(TArray<FWaveInstance*>& WaveInstances, int32 Fir
 		FWaveInstance* WaveInstance = WaveInstances[InstanceIndex];
 		
 		// Make sure we've finished precaching the wave instance's wave data before trying to create a source for it
-		if (!WaveInstance->WaveData->bIsPrecacheDone)
+		ESoundWavePrecacheState PrecacheState = WaveInstance->WaveData->GetPrecacheState();
+		if (PrecacheState == ESoundWavePrecacheState::InProgress)
 		{
 			continue;
 		}
@@ -3151,7 +3185,12 @@ void FAudioDevice::StartSources(TArray<FWaveInstance*>& WaveInstances, int32 Fir
 				(!WaveInstance->IsStreaming() ||
 				IStreamingManager::Get().GetAudioStreamingManager().CanCreateSoundSource(WaveInstance)))
 			{
-				check(FreeSources.Num());
+
+				if (!FreeSources.Num())
+				{
+					continue;
+				}
+
 				Source = FreeSources.Pop();
 				check(Source);
 
@@ -3204,23 +3243,21 @@ void FAudioDevice::StartSources(TArray<FWaveInstance*>& WaveInstances, int32 Fir
 			}
 			else if (Source)
 			{
-				// If we've already been initialized, then just update the voice
-				if (Source->IsInitialized())
-				{
-					Source->NotifyPlaybackData();
-					Source->Update();
-				}
-				// Otherwise, we need still need to initialize
-				else if (Source->IsPreparedToInit())
+				if (!Source->IsInitialized() && Source->IsPreparedToInit())
 				{
 					// Try to initialize the source. This may fail if something is wrong with the source.
 					if (Source->Init(WaveInstance))
 					{
+						Source->Update();
+
 						// Note: if we succeeded in starting to prepare to init, we already added the wave instance map to the source so don't need to add here.
 						check(Source->IsInitialized());
-						Source->Play();
 
-						Source->Update();
+						// If the source didn't get paused while initializing, then play it
+						if (!Source->IsPaused())
+						{
+						Source->Play();
+						}
 					}
 					else
 					{
@@ -3248,8 +3285,23 @@ void FAudioDevice::Update(bool bGameTicking)
 	LLM_SCOPE(ELLMTag::Audio);
 
 	SCOPED_NAMED_EVENT(FAudioDevice_Update, FColor::Blue);
+
 	if (!IsInAudioThread())
 	{
+		check(IsInGameThread());
+		
+		// On game thread, look through registered sound waves and remove if we finished precaching (and audio decompressor is cleaned up)
+		// ReferencedSoundWaves is used to make sure GC doesn't run on any sound waves that are actively pre-caching within an async task.
+		// Sounds may be loaded, kick off an async task to decompress, but never actually try to play, so GC can reclaim these while precaches are in-flight.
+		for (int32 i = ReferencedSoundWaves.Num() - 1; i >= 0; --i)
+		{
+			USoundWave* Wave = ReferencedSoundWaves[i];
+			if (Wave->GetPrecacheState() == ESoundWavePrecacheState::Done)
+			{
+				ReferencedSoundWaves.RemoveAtSwap(i, 1, false);
+			}
+		}
+	
 		FAudioDevice* AudioDevice = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, bGameTicking]()
 		{
@@ -3265,8 +3317,22 @@ void FAudioDevice::Update(bool bGameTicking)
 	DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.AudioUpdateTime"), STAT_AudioUpdateTime, STATGROUP_AudioThreadCommands);
 	FScopeCycleCounter AudioUpdateTimeCounter(GET_STATID(STAT_AudioUpdateTime));
 
+	// On audio thread, look through precaching sound waves and remove if we finished task and clean it up.
+	// Note we can only touch the precache async task from the audio thread so must clean it up here.
+	for (int32 i = PrecachingSoundWaves.Num() - 1; i >= 0; --i)
+	{
+		USoundWave* Wave = PrecachingSoundWaves[i];
+		if (Wave->CleanupDecompressor())
+		{
+			PrecachingSoundWaves.RemoveAtSwap(i, 1, false);
+		}
+	}
+
 	UpdateAudioPluginSettingsObjectCache();
 
+	// Updates hardware timing logic. Only implemented in audio mixer.
+	UpdateHardwareTiming();
+
 	// Updates the audio device delta time
 	UpdateDeviceDeltaTime();
 
@@ -3370,6 +3436,27 @@ void FAudioDevice::Update(bool bGameTicking)
 		// Check which sounds are active from these wave instances and update passive SoundMixes
 		UpdatePassiveSoundMixModifiers(ActiveWaveInstances, FirstActiveIndex);
 
+		// Update the min priority cull threshold. It will be based off the min priority of the lowest priority sound here.
+		if (ActiveWaveInstances.Num() > MaxWaveInstances)
+		{
+			// Helper function for "Sort" (higher priority sorts last).
+			struct FCompareFWaveInstanceByPriority
+			{
+				FORCEINLINE bool operator()(const FWaveInstance& A, const FWaveInstance& B) const
+				{
+					return A.Priority > B.Priority;
+				}
+			};
+
+			// Sort by priority (lowest priority first).
+			ActiveWaveInstances.Sort(FCompareFWaveInstanceByPriority());
+			OneShotPriorityCullThreshold = ActiveWaveInstances[MaxWaveInstances]->Priority;
+		}
+		else
+		{
+			OneShotPriorityCullThreshold = -1.0f;
+		}
+
 		// If not paused, update the playback time of the active sounds after we've processed passive mix modifiers 
 		// Note that for sounds which play while paused, this will result in longer active sound playback times, which will be ok. If we update the 
 		// active sound is updated while paused (for a long time), most sounds will be stopped when unpaused.
@@ -3601,6 +3688,23 @@ void FAudioDevice::AddNewActiveSound(const FActiveSound& NewActiveSound)
 		return;		
 	}
 
+	// Cull one-shot active sounds if we've reached our max limit of one shot active sounds before we attempt to evaluate concurrency
+	// Check for debug sound name
+#if !UE_BUILD_SHIPPING
+	FAudioDeviceManager* AudioDeviceManager = GEngine->GetAudioDeviceManager();
+	FString DebugSound;
+	if (AudioDeviceManager->GetAudioDebugSound(DebugSound))
+	{
+		// Reject the new sound if it doesn't have the debug sound name substring 
+		FString SoundName;
+		NewActiveSound.Sound->GetName(SoundName);
+		if (!SoundName.Contains(DebugSound))
+		{
+			return;
+		}
+	}
+#endif
+
 	// Cull one-shot active sounds if we've reached our max limit of one shot active sounds before we attempt to evaluate concurrency
 	USoundBase* Sound = NewActiveSound.GetSound();
 	check(Sound);
@@ -3685,11 +3789,44 @@ void FAudioDevice::ProcessingPendingActiveSoundStops(bool bForceDelete)
 	for (int32 i = PendingSoundsToDelete.Num() - 1; i >= 0; --i)
 	{
 		FActiveSound* ActiveSound = PendingSoundsToDelete[i];
-		if (ActiveSound && (bForceDelete || ActiveSound->CanDelete()))
+		if (ActiveSound)
 		{
-			ActiveSound->bAsyncOcclusionPending = false;
-			PendingSoundsToDelete.RemoveAtSwap(i, 1, false);
-			delete ActiveSound;
+			uint32 NumSourcesStopped = 0;
+
+			bool bDeleteActiveSound = false;
+			if (bForceDelete)
+			{
+				bDeleteActiveSound = true;
+				// If we're in the process of stopping, but now we're force-deleting, make sure we finish the sound stopping
+				if (ActiveSound->IsStopping())
+				{
+					// Make sure this sound finishes stopping if we're forcing all sounds to stop due to a flush, etc.
+					ActiveSound->UpdateStoppingSources(CurrentTick, true);
+				}
+			}
+			else if (ActiveSound->IsStopping())
+			{
+				// Update the stopping state. This will return true if we're ok to delete the active sound
+				bDeleteActiveSound = ActiveSound->UpdateStoppingSources(CurrentTick, false);
+
+				// If we are now deleting the active sound, then this is no longer stopping, so decrement the counter
+				if (bDeleteActiveSound)
+				{
+					// It's possible we still may not be able to delete this sound if the active sound as a pending async task
+					bDeleteActiveSound = ActiveSound->CanDelete();
+				}
+			}
+			else if (ActiveSound->CanDelete())
+			{
+				bDeleteActiveSound = true;
+			}
+						
+			if (bDeleteActiveSound)
+			{
+				ActiveSound->bAsyncOcclusionPending = false;
+				PendingSoundsToDelete.RemoveAtSwap(i, 1, false);
+				delete ActiveSound;
+			}
 		}
 	}
 
@@ -3697,7 +3834,8 @@ void FAudioDevice::ProcessingPendingActiveSoundStops(bool bForceDelete)
 	for (FActiveSound* ActiveSound : PendingSoundsToStop)
 	{
 		check(ActiveSound);
-		ActiveSound->Stop();
+
+		ActiveSound->Stop(bForceDelete);
 
 		USoundBase* Sound = ActiveSound->GetSound();
 
@@ -3707,8 +3845,10 @@ void FAudioDevice::ProcessingPendingActiveSoundStops(bool bForceDelete)
 			OneShotCount--;
 		}
 
+		const bool bIsStopping = ActiveSound->IsStopping();
+
 		// If we can delete the active sound now, then delete it
-		if (bForceDelete || ActiveSound->CanDelete())
+		if (bForceDelete || (ActiveSound->CanDelete() && !bIsStopping))
 		{
 			ActiveSound->bAsyncOcclusionPending = false;
 
@@ -3716,7 +3856,7 @@ void FAudioDevice::ProcessingPendingActiveSoundStops(bool bForceDelete)
 		}
 		else
 		{
-			// There was an async operation pending. We need to defer deleting this sound
+			// There was an async operation pending or we are stopping (not stopped) so we need to defer deleting this sound
 			PendingSoundsToDelete.AddUnique(ActiveSound);
 		}
 	}
@@ -3988,16 +4128,16 @@ void FAudioDevice::GetAttenuationListenerData(FAttenuationListenerData& OutListe
 		}
 
 		FVector ListenerToSound;
+		const FVector ListenerLocation = OutListenerData.ListenerTransform.GetTranslation();
+		ListenerToSound = SoundTransform.GetTranslation() - ListenerLocation;
+		ListenerToSound.ToDirectionAndLength(OutListenerData.ListenerToSoundDir, OutListenerData.ListenerToSoundDistance);
+
 		if (bUseListenerAttenuationOverride)
 		{
 			ListenerToSound = SoundTransform.GetTranslation() - ListenerAttenuationOverride;
+			FVector Temp;
+			ListenerToSound.ToDirectionAndLength(Temp, OutListenerData.ListenerToSoundDistance);
 		}
-		else
-		{
-			const FVector ListenerLocation = OutListenerData.ListenerTransform.GetTranslation();
-			ListenerToSound = SoundTransform.GetTranslation() - ListenerLocation;
-		}
-		ListenerToSound.ToDirectionAndLength(OutListenerData.ListenerToSoundDir, OutListenerData.ListenerToSoundDistance);
 
 		OutListenerData.AttenuationDistance = 0.0f;
 
@@ -4337,6 +4477,15 @@ void FAudioDevice::Flush(UWorld* WorldToFlush, bool bClearActivatedReverb)
 		return;
 	}
 
+	for (int32 i = PrecachingSoundWaves.Num() - 1; i >= 0; --i)
+	{
+		USoundWave* Wave = PrecachingSoundWaves[i];
+		if (Wave->CleanupDecompressor(true))
+		{
+			PrecachingSoundWaves.RemoveAtSwap(i, 1, false);
+		}
+	}
+
 	// Do fadeout when flushing the audio device.
 	if (WorldToFlush == nullptr || WorldToFlush->bIsTearingDown)
 	{
@@ -4435,6 +4584,37 @@ void FAudioDevice::Precache(USoundWave* SoundWave, bool bSynchronous, bool bTrac
 		return;
 	}
 
+
+	// We're already precaching this sound wave so no need to precache again
+	if (SoundWave->DecompressionType != DTYPE_Setup)
+	{
+		return; 
+	}
+
+	if (!bSynchronous && SoundWave->GetPrecacheState() == ESoundWavePrecacheState::NotStarted)
+	{
+		if (IsInGameThread())
+		{
+			// On the game thread, add this sound wave to the referenced sound wave nodes so that it doesn't get GC'd
+			SoundWave->SetPrecacheState(ESoundWavePrecacheState::InProgress);
+			ReferencedSoundWaves.Add(SoundWave);
+		}
+
+		// Precache is called from USoundWave::PostLoad, from the game thread, and thus function needs to be called from the audio thread
+		if (!IsInAudioThread())
+		{
+			DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.Precache"), STAT_AudioPrecache, STATGROUP_AudioThreadCommands);
+
+			FAudioDevice* AudioDevice = this;
+			FAudioThread::RunCommandOnAudioThread([AudioDevice, SoundWave, bSynchronous, bTrackMemory, bForceFullDecompression]()
+			{
+				AudioDevice->Precache(SoundWave, bSynchronous, bTrackMemory, bForceFullDecompression);
+			}, GET_STATID(STAT_AudioPrecache));
+
+			return;
+		}
+	}
+
 	// calculate the decompression type
 	// @todo audio: maybe move this into SoundWave?
 	if (SoundWave->NumChannels == 0)
@@ -4517,11 +4697,11 @@ void FAudioDevice::Precache(USoundWave* SoundWave, bool bSynchronous, bool bTrac
 			}
 			else
 			{
-				// This should only happen in the game thread.
-				ensure(IsInGameThread());
-				SoundWave->bIsPrecacheDone = false;
+				// This is the one case where precaching will not be done when this function exits
+				check(SoundWave->GetPrecacheState() == ESoundWavePrecacheState::InProgress);
 				SoundWave->AudioDecompressor = new FAsyncAudioDecompress(SoundWave);
 				SoundWave->AudioDecompressor->StartBackgroundTask();
+				PrecachingSoundWaves.Add(SoundWave);
 			}
 
 			static FName NAME_OGG(TEXT("OGG"));
@@ -4540,6 +4720,12 @@ void FAudioDevice::Precache(USoundWave* SoundWave, bool bSynchronous, bool bTrac
 		SoundWave->DecompressionType = DTYPE_Native;
 	}
 
+	// If we don't have an audio decompressor task, then we're fully precached
+	if (!SoundWave->AudioDecompressor)
+	{
+		SoundWave->SetPrecacheState(ESoundWavePrecacheState::Done);
+	}
+
 	if (bTrackMemory)
 	{
 		const int32 ResourceSize = SoundWave->GetResourceSizeBytes(EResourceSizeMode::Exclusive);
@@ -4759,12 +4945,14 @@ void FAudioDevice::SetDeviceMuted(const bool bMuted)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetDeviceMuted"), STAT_SetDeviceMuted, STATGROUP_AudioThreadCommands);
+
 		FAudioDevice* AudioDevice = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, bMuted]()
 		{
 			AudioDevice->SetDeviceMuted(bMuted);
 
-		});
+		}, GET_STATID(STAT_SetDeviceMuted));
 
 		return;
 	}
@@ -4836,11 +5024,13 @@ void FAudioDevice::SetTransientMasterVolume(const float InTransientMasterVolume)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetTransientMasterVolume"), STAT_SetTransientMasterVolume, STATGROUP_AudioThreadCommands);
+
 		FAudioDevice* AudioDevice = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, InTransientMasterVolume]()
 		{
 			AudioDevice->SetTransientMasterVolume(InTransientMasterVolume);
-		});
+		}, GET_STATID(STAT_SetTransientMasterVolume));
 
 		return;
 	}
@@ -4901,11 +5091,13 @@ void FAudioDevice::SetPlatformAudioHeadroom(const float InPlatformHeadRoom)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetPlatformAudioHeadroom"), STAT_SetPlatformAudioHeadroom, STATGROUP_AudioThreadCommands);
+
 		FAudioDevice* AudioDevice = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, InPlatformHeadRoom]()
 		{
 			AudioDevice->SetPlatformAudioHeadroom(InPlatformHeadRoom);
-		});
+		}, GET_STATID(STAT_SetPlatformAudioHeadroom));
 
 		return;
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/AudioDeviceManager.cpp b/Engine/Source/Runtime/Engine/Private/AudioDeviceManager.cpp
index f5338bf7ba08..c02b8c2a2935 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioDeviceManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioDeviceManager.cpp
@@ -5,6 +5,8 @@
 #include "Sound/SoundWave.h"
 #include "Sound/AudioSettings.h"
 #include "GameFramework/GameUserSettings.h"
+#include "Misc/CommandLine.h"
+
 
 // Private consts for helping with index/generation determination in audio device manager
 static const uint32 AUDIO_DEVICE_HANDLE_INDEX_BITS		= 24;
@@ -20,7 +22,7 @@ static const uint32 AUDIO_DEVICE_DEFAULT_ALLOWED_DEVICE_COUNT = 2;
 // The max number of audio devices allowed
 static const uint32 AUDIO_DEVICE_MAX_DEVICE_COUNT = 8;
 
-static int32 GCVarEnableAudioThreadWait = 0;
+static int32 GCVarEnableAudioThreadWait = 1;
 TAutoConsoleVariable<int32> CVarEnableAudioThreadWait(
 	TEXT("AudioThread.EnableAudioThreadWait"),
 	GCVarEnableAudioThreadWait,
@@ -50,6 +52,12 @@ FAudioDeviceManager::FAudioDeviceManager()
 	, bPlayAllDeviceAudio(false)
 	, bVisualize3dDebug(false)
 {
+	// Check for a command line debug sound argument.
+	FString DebugSound;
+	if (FParse::Value(FCommandLine::Get(), TEXT("DebugSound="), DebugSound))
+	{
+		SetAudioDebugSound(*DebugSound);
+	}
 }
 
 FAudioDeviceManager::~FAudioDeviceManager()
@@ -589,12 +597,14 @@ void FAudioDeviceManager::TogglePlayAllDeviceAudio()
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.TogglePlayAllDeviceAudio"), STAT_TogglePlayAllDeviceAudio, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager]()
 		{
 			AudioDeviceManager->TogglePlayAllDeviceAudio();
 
-		});
+		}, GET_STATID(STAT_TogglePlayAllDeviceAudio));
 
 		return;
 	}
@@ -606,12 +616,14 @@ void FAudioDeviceManager::ToggleVisualize3dDebug()
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.ToggleVisualize3dDebug"), STAT_ToggleVisualize3dDebug, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager]()
 		{
 			AudioDeviceManager->ToggleVisualize3dDebug();
 
-		});
+		}, GET_STATID(STAT_ToggleVisualize3dDebug));
 
 		return;
 	}
@@ -624,11 +636,13 @@ void FAudioDeviceManager::ToggleDebugStat(const uint8 StatBitMask)
 #if !UE_BUILD_SHIPPING
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.ToggleDebugStat"), STAT_ToggleDebugStat, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager, StatBitMask]()
 		{
 			AudioDeviceManager->ToggleDebugStat(StatBitMask);
-		});
+		}, GET_STATID(STAT_ToggleDebugStat));
 
 		return;
 	}
@@ -647,12 +661,14 @@ void FAudioDeviceManager::SetDebugSoloSoundClass(const TCHAR* SoundClassName)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetDebugSoloSoundClass"), STAT_SetDebugSoloSoundClass, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager, SoundClassName]()
 		{
 			AudioDeviceManager->SetDebugSoloSoundClass(SoundClassName);
 
-		});
+		}, GET_STATID(STAT_SetDebugSoloSoundClass));
 		return;
 	}
 
@@ -669,12 +685,14 @@ void FAudioDeviceManager::SetDebugSoloSoundWave(const TCHAR* SoundWave)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetDebugSoloSoundWave"), STAT_SetDebugSoloSoundWave, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager, SoundWave]()
 		{
 			AudioDeviceManager->SetDebugSoloSoundWave(SoundWave);
 
-		});
+		}, GET_STATID(STAT_SetDebugSoloSoundWave));
 		return;
 	}
 
@@ -690,12 +708,14 @@ void FAudioDeviceManager::SetDebugSoloSoundCue(const TCHAR* SoundCue)
 {
 	if (!IsInAudioThread())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetDebugSoloSoundCue"), STAT_SetDebugSoloSoundCue, STATGROUP_AudioThreadCommands);
+
 		FAudioDeviceManager* AudioDeviceManager = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDeviceManager, SoundCue]()
 		{
 			AudioDeviceManager->SetDebugSoloSoundCue(SoundCue);
 
-		});
+		}, GET_STATID(STAT_SetDebugSoloSoundCue));
 		return;
 	}
 
@@ -712,9 +732,24 @@ void FAudioDeviceManager::SetAudioMixerDebugSound(const TCHAR* SoundName)
 	DebugNames.DebugAudioMixerSoundName = SoundName;
 }
 
+void FAudioDeviceManager::SetAudioDebugSound(const TCHAR* SoundName)
+{
+	DebugNames.DebugSoundName = SoundName;
+	DebugNames.bDebugSoundName = DebugNames.DebugSoundName != TEXT("");
+}
+
 const FString& FAudioDeviceManager::GetAudioMixerDebugSoundName() const
 {
 	return DebugNames.DebugAudioMixerSoundName;
 }
 
+bool FAudioDeviceManager::GetAudioDebugSound(FString& OutDebugSound)
+{
+	if (DebugNames.bDebugSoundName)
+	{
+		OutDebugSound = DebugNames.DebugSoundName;
+		return true;
+	}
+	return false;
+}
 
diff --git a/Engine/Source/Runtime/Engine/Private/AudioSettings.cpp b/Engine/Source/Runtime/Engine/Private/AudioSettings.cpp
index 5f5ceaa9d78b..688ae44b5f6b 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioSettings.cpp
@@ -68,7 +68,8 @@ void UAudioSettings::AddDefaultSettings()
 	DefaultReverbSendLevel = 0.2f;
 	VoiPSampleRate = EVoiceSampleRate::Low16000Hz;
 	VoipBufferingDelay = 0.2f;
-	MaxOneShotActiveSoundCount = 85;
+	MaxWaveInstances = 100;
+	NumStoppingSources = 32;
 }
 
 #if WITH_EDITOR
diff --git a/Engine/Source/Runtime/Engine/Private/AudioThread.cpp b/Engine/Source/Runtime/Engine/Private/AudioThread.cpp
index 964e21f28c6d..b493bdb2a52b 100644
--- a/Engine/Source/Runtime/Engine/Private/AudioThread.cpp
+++ b/Engine/Source/Runtime/Engine/Private/AudioThread.cpp
@@ -23,6 +23,13 @@ TAutoConsoleVariable<int32> CVarSuspendAudioThread(TEXT("AudioThread.SuspendAudi
 int32 GCVarAboveNormalAudioThreadPri = 0;
 TAutoConsoleVariable<int32> CVarAboveNormalAudioThreadPri(TEXT("AudioThread.AboveNormalPriority"), GCVarAboveNormalAudioThreadPri, TEXT("0=Normal, 1=AboveNormal"), ECVF_Default);
 
+int32 GCVarEnableAudioCommandLogging = 0;
+TAutoConsoleVariable<int32> CVarEnableAudioCommandLogging(TEXT("AudioThread.EnableAudioCommandLogging"), GCVarEnableAudioCommandLogging, TEXT("0=Disbaled, 1=Enabled"), ECVF_Default);
+
+int32 GCVarAudioThreadWaitWarningThresholdMs = 33;
+TAutoConsoleVariable<int32> CVarAudioThreadWaitWarningThresholdMs(TEXT("AudioThread.WaitWarningThresholdMs"), GCVarAudioThreadWaitWarningThresholdMs, TEXT("Sets number of ms to wait before logging audio thread stall."), ECVF_Default);
+
+
 static int32 GCVarEnableBatchProcessing = 1;
 TAutoConsoleVariable<int32> CVarEnableBatchProcessing(
 	TEXT("AudioThread.EnableBatchProcessing"),
@@ -78,6 +85,10 @@ bool FAudioThread::bIsAudioThreadSuspended = false;
 bool FAudioThread::bUseThreadedAudio = false;
 uint32 FAudioThread::CachedAudioThreadId = 0;
 FRunnable* FAudioThread::AudioThreadRunnable = nullptr;
+FCriticalSection FAudioThread::CurrentAudioThreadStatIdCS;
+TStatId FAudioThread::CurrentAudioThreadStatId;
+TStatId FAudioThread::LongestAudioThreadStatId;
+double FAudioThread::LongestAudioThreadTimeMsec = 0.0;
 
 /** The audio thread main loop */
 void AudioThreadMain( FEvent* TaskGraphBoundSyncEvent )
@@ -247,7 +258,32 @@ void FAudioThread::RunCommandOnAudioThread(TFunction<void()> InFunction, const T
 	check(FPlatformTLS::GetCurrentThreadId() == GGameThreadId);
 	if (bIsAudioThreadRunning)
 	{
-		FFunctionGraphTask::CreateAndDispatchWhenReady(MoveTemp(InFunction), InStatId, GAudioAsyncBatcher.GetAsyncPrereq(), ENamedThreads::AudioThread);
+		if (GCVarEnableAudioCommandLogging == 1)
+		{
+			TFunction<void()> FuncWrapper = [InFunction, InStatId]()
+			{
+				FAudioThread::SetCurrentAudioThreadStatId(InStatId);
+
+				// Time the execution of the function
+				const double StartTime = FPlatformTime::Seconds();
+
+				// Execute the function
+				InFunction();
+
+				// Track the longest one
+				const double DeltaTime = (FPlatformTime::Seconds() - StartTime) * 1000.0f;
+				if (DeltaTime > GetCurrentLongestTime())
+				{
+					SetLongestTimeAndId(InStatId, DeltaTime);
+				}
+			};
+
+			FFunctionGraphTask::CreateAndDispatchWhenReady(MoveTemp(FuncWrapper), InStatId, GAudioAsyncBatcher.GetAsyncPrereq(), ENamedThreads::AudioThread);
+		}
+		else
+		{
+			FFunctionGraphTask::CreateAndDispatchWhenReady(MoveTemp(InFunction), InStatId, GAudioAsyncBatcher.GetAsyncPrereq(), ENamedThreads::AudioThread);
+		}
 	}
 	else
 	{
@@ -256,6 +292,47 @@ void FAudioThread::RunCommandOnAudioThread(TFunction<void()> InFunction, const T
 	}
 }
 
+void FAudioThread::SetCurrentAudioThreadStatId(TStatId InStatId)
+{
+	FScopeLock Lock(&CurrentAudioThreadStatIdCS);
+	CurrentAudioThreadStatId = InStatId;
+}
+
+FString FAudioThread::GetCurrentAudioThreadStatId()
+{
+	FScopeLock Lock(&CurrentAudioThreadStatIdCS);
+#if STATS
+	return FString(CurrentAudioThreadStatId.GetStatDescriptionANSI());
+#else
+	return FString(TEXT("NoStats"));
+#endif
+}
+
+void FAudioThread::ResetAudioThreadTimers()
+{
+	FScopeLock Lock(&CurrentAudioThreadStatIdCS);
+	LongestAudioThreadStatId = TStatId();
+	LongestAudioThreadTimeMsec = 0.0;
+}
+
+void FAudioThread::SetLongestTimeAndId(TStatId NewLongestId, double LongestTimeMsec)
+{
+	FScopeLock Lock(&CurrentAudioThreadStatIdCS);
+	LongestAudioThreadTimeMsec = LongestTimeMsec;
+	LongestAudioThreadStatId = NewLongestId;
+}
+
+void FAudioThread::GetLongestTaskInfo(FString& OutLongestTask, double& OutLongestTaskTimeMs)
+{
+	FScopeLock Lock(&CurrentAudioThreadStatIdCS);
+#if STATS
+	OutLongestTask = FString(LongestAudioThreadStatId.GetStatDescriptionANSI());
+#else
+	OutLongestTask = FString(TEXT("NoStats"));
+#endif
+	OutLongestTaskTimeMs = LongestAudioThreadTimeMsec;
+}
+
 void FAudioThread::ProcessAllCommands()
 {
 	if (bIsAudioThreadRunning)
@@ -358,7 +435,6 @@ void FAudioThread::StopAudioThread()
 
 void FAudioCommandFence::BeginFence()
 {
-	check(FPlatformTLS::GetCurrentThreadId() == GGameThreadId); // this could be relaxed, but for now, we are going to require all fences are set from the GT
 	if (FAudioThread::IsAudioThreadRunning())
 	{
 		DECLARE_CYCLE_STAT(TEXT("FNullGraphTask.FenceAudioCommand"),
@@ -378,7 +454,7 @@ void FAudioCommandFence::BeginFence()
 bool FAudioCommandFence::IsFenceComplete() const
 {
 	FAudioThread::ProcessAllCommands();
-	check(FPlatformTLS::GetCurrentThreadId() == GGameThreadId); // this could be relaxed, but for now, we are going to require all fences are set from the GT
+	
 	if (!CompletionEvent.GetReference() || CompletionEvent->IsComplete())
 	{
 		CompletionEvent = nullptr; // this frees the handle for other uses, the NULL state is considered completed
@@ -407,9 +483,27 @@ void FAudioCommandFence::Wait(bool bProcessGameThreadTasks) const
 		{
 			bDone = Event->Wait(WaitTime);
 			float ThisTime = FPlatformTime::Seconds() - StartTime;
-			UE_CLOG(ThisTime > .036f, LogAudio, Warning, TEXT("Waited %fms for audio thread."), ThisTime * 1000.0f);
+ 			if (ThisTime > .036f)
+			{
+				if (GCVarEnableAudioCommandLogging == 1)
+				{
+					FString CurrentTask = FAudioThread::GetCurrentAudioThreadStatId();
+
+					FString LongestTask;
+					double LongestTaskTimeMs;
+					FAudioThread::GetLongestTaskInfo(LongestTask, LongestTaskTimeMs);
+
+					UE_LOG(LogAudio, Warning, TEXT("Waited %.2f ms for audio thread. (Current Task: %s, Longest task: %s %.2f ms)"), ThisTime * 1000.0f, *CurrentTask, *LongestTask, LongestTaskTimeMs);
+				}
+				else
+				{
+					UE_LOG(LogAudio, Warning,  TEXT("Waited %fms for audio thread."), ThisTime * 1000.0f);
+				}
+			}
 		} while (!bDone);
 
+		FAudioThread::ResetAudioThreadTimers();
+
 		// Return the event to the pool and decrement the recursion counter.
 		FPlatformProcess::ReturnSynchEventToPool(Event);
 		Event = nullptr;
diff --git a/Engine/Source/Runtime/Engine/Private/Blueprint.cpp b/Engine/Source/Runtime/Engine/Private/Blueprint.cpp
index 4b02644392ad..206d98f0faed 100644
--- a/Engine/Source/Runtime/Engine/Private/Blueprint.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Blueprint.cpp
@@ -331,7 +331,7 @@ void UBlueprintCore::Serialize(FArchive& Ar)
 		}
 	}
 
-	if( Ar.ArIsLoading && !BlueprintGuid.IsValid() )
+	if( Ar.IsLoading() && !BlueprintGuid.IsValid() )
 	{
 		GenerateDeterministicGuid();
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/BlueprintGeneratedClass.cpp b/Engine/Source/Runtime/Engine/Private/BlueprintGeneratedClass.cpp
index 9c6f72262463..7d1e1fd5b922 100644
--- a/Engine/Source/Runtime/Engine/Private/BlueprintGeneratedClass.cpp
+++ b/Engine/Source/Runtime/Engine/Private/BlueprintGeneratedClass.cpp
@@ -1166,7 +1166,7 @@ void UBlueprintGeneratedClass::CheckAndApplyComponentTemplateOverrides(AActor* A
 										{
 											ArCustomPropertyList = InPropertyList;
 											ArUseCustomPropertyList = true;
-											ArWantBinaryPropertySerialization = true;
+											this->SetWantBinaryPropertySerialization(true);
 
 											// Set this flag to emulate things that would happen in the SDO case when this flag is set (e.g. - not setting 'bHasBeenCreated').
 											ArPortFlags |= PPF_Duplicate;
@@ -1620,7 +1620,7 @@ void FBlueprintCookedComponentInstancingData::LoadCachedPropertyDataForSerializa
 		{
 			ArCustomPropertyList = InPropertyList;
 			ArUseCustomPropertyList = true;
-			ArWantBinaryPropertySerialization = true;
+			this->SetWantBinaryPropertySerialization(true);
 
 			// Set this flag to emulate things that would normally happen in the SDO case when this flag is set. This is needed to ensure consistency with serialization during instancing.
 			ArPortFlags |= PPF_Duplicate;
diff --git a/Engine/Source/Runtime/Engine/Private/BoneContainer.cpp b/Engine/Source/Runtime/Engine/Private/BoneContainer.cpp
index 2f222e527351..802efeb0d8f5 100644
--- a/Engine/Source/Runtime/Engine/Private/BoneContainer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/BoneContainer.cpp
@@ -4,6 +4,7 @@
 #include "Animation/Skeleton.h"
 #include "Engine/SkeletalMesh.h"
 #include "EngineLogs.h"
+#include "Animation/AnimCurveTypes.h"
 
 DEFINE_LOG_CATEGORY(LogSkeletalControl);
 
@@ -11,10 +12,10 @@ DEFINE_LOG_CATEGORY(LogSkeletalControl);
 // FBoneContainer
 
 FBoneContainer::FBoneContainer()
-: Asset(NULL)
-, AssetSkeletalMesh(NULL)
-, AssetSkeleton(NULL)
-, RefSkeleton(NULL)
+: Asset(nullptr)
+, AssetSkeletalMesh(nullptr)
+, AssetSkeleton(nullptr)
+, RefSkeleton(nullptr)
 , bDisableRetargeting(false)
 , bUseRAWData(false)
 , bUseSourceData(false)
@@ -28,9 +29,9 @@ FBoneContainer::FBoneContainer()
 FBoneContainer::FBoneContainer(const TArray<FBoneIndexType>& InRequiredBoneIndexArray, const FCurveEvaluationOption& CurveEvalOption, UObject& InAsset)
 : BoneIndicesArray(InRequiredBoneIndexArray)
 , Asset(&InAsset)
-, AssetSkeletalMesh(NULL)
-, AssetSkeleton(NULL)
-, RefSkeleton(NULL)
+, AssetSkeletalMesh(nullptr)
+, AssetSkeleton(nullptr)
+, RefSkeleton(nullptr)
 , bDisableRetargeting(false)
 , bUseRAWData(false)
 , bUseSourceData(false)
@@ -53,7 +54,7 @@ struct FBoneContainerScratchArea : public TThreadSingleton<FBoneContainerScratch
 
 void FBoneContainer::Initialize(const FCurveEvaluationOption& CurveEvalOption)
 {
-	RefSkeleton = NULL;
+	RefSkeleton = nullptr;
 	UObject* AssetObj = Asset.Get();
 	USkeletalMesh* AssetSkeletalMeshObj = Cast<USkeletalMesh>(AssetObj);
 	USkeleton* AssetSkeletonObj = nullptr;
@@ -180,79 +181,165 @@ void FBoneContainer::Initialize(const FCurveEvaluationOption& CurveEvalOption)
 			VirtualBoneCompactPoseData.Add(FVirtualBoneCompactPoseData(FCompactPoseBoneIndex(VBInd), FCompactPoseBoneIndex(SourceInd), FCompactPoseBoneIndex(TargetInd)));
 		}
 	}
-
 	// cache required curve UID list according to new bone sets
 	CacheRequiredAnimCurveUids(CurveEvalOption);
+
+	// Reset retargeting cached data look up table.
+	RetargetSourceCachedDataLUT.Reset();
 }
 
 void FBoneContainer::CacheRequiredAnimCurveUids(const FCurveEvaluationOption& CurveEvalOption)
 {
-	if (CurveEvalOption.bAllowCurveEvaluation && AssetSkeleton.IsValid())
+	if (AssetSkeleton.IsValid())
 	{
 		// this is placeholder. In the future, this will change to work with linked joint of curve meta data
 		// anim curve name Uids; For now it adds all of them
 		const FSmartNameMapping* Mapping = AssetSkeleton->GetSmartNameContainer(USkeleton::AnimCurveMappingName);
 		if (Mapping != nullptr)
 		{
-			AnimCurveNameUids.Reset();
-			// fill name array
+			UIDToArrayIndexLUT.Reset();
+			
+			const SmartName::UID_Type MaxUID = Mapping->GetMaxUID();
+
+			if (MaxUID == SmartName::MaxUID)
+			{
+				// No smart names, nothing to do
+				return;
+			}
+
+			//Init UID LUT to everything unused
+			UIDToArrayIndexLUT.AddUninitialized(MaxUID+1);
+			for (SmartName::UID_Type& Item : UIDToArrayIndexLUT)
+			{
+				Item = SmartName::MaxUID;
+			}
+
+			// Get Current Names / UIDs
 			TArray<FName> CurveNames;
 			Mapping->FillNameArray(CurveNames);
-			Mapping->FillUidArray(AnimCurveNameUids);
+
+			// Get UID List
+			TArray<SmartName::UID_Type> UIDList;
+			Mapping->FillUidArray(UIDList);
 
 			// if the linked joints don't exists in RequiredBones, remove itself
 			if (CurveNames.Num() > 0)
 			{
+				int32 NumAvailableUIDs = 0;
 				for (int32 CurveNameIndex = CurveNames.Num() - 1; CurveNameIndex >=0 ; --CurveNameIndex)
 				{
 					const FName& CurveName = CurveNames[CurveNameIndex];
-					if (CurveEvalOption.DisallowedList && CurveEvalOption.DisallowedList->Contains(CurveName))
+					bool bBeingUsed = true;
+					if (!CurveEvalOption.bAllowCurveEvaluation)
 					{
-						//remove the UID
-						AnimCurveNameUids.RemoveAt(CurveNameIndex);
+						bBeingUsed = false;
 					}
 					else
 					{
-						const FCurveMetaData* CurveMetaData = Mapping->GetCurveMetaData(CurveNames[CurveNameIndex]);
-						if (CurveMetaData)
+						// CurveNameIndex shouyld match to UID
+						if (CurveEvalOption.DisallowedList && CurveEvalOption.DisallowedList->Contains(CurveName))
 						{
-							if (CurveMetaData->MaxLOD < CurveEvalOption.LODIndex)
+							//remove the UID
+							bBeingUsed = false;
+						}
+						else
+						{
+							const FCurveMetaData* CurveMetaData = Mapping->GetCurveMetaData(CurveNames[CurveNameIndex]);
+							if (CurveMetaData)
 							{
-								AnimCurveNameUids.RemoveAt(CurveNameIndex);
-							}
-							else if (CurveMetaData->LinkedBones.Num() > 0)
-							{
-								bool bRemove = true;
-								for (int32 LinkedBoneIndex = 0; LinkedBoneIndex < CurveMetaData->LinkedBones.Num(); ++LinkedBoneIndex)
+								if (CurveMetaData->MaxLOD < CurveEvalOption.LODIndex)
 								{
-									const FBoneReference& BoneReference = CurveMetaData->LinkedBones[LinkedBoneIndex];
-									// we want to make sure all the joints are removed from RequiredBones before removing this UID
-									if (BoneReference.GetCompactPoseIndex(*this) != INDEX_NONE)
-									{
-										// still has some joint that matters, do not remove
-										bRemove = false;
-										break;
-									}
+									bBeingUsed = false;
 								}
-
-								if (bRemove)
+								else if (CurveMetaData->LinkedBones.Num() > 0)
 								{
-									//remove the UID
-									AnimCurveNameUids.RemoveAt(CurveNameIndex);
+									bBeingUsed = false;
+									for (int32 LinkedBoneIndex = 0; LinkedBoneIndex < CurveMetaData->LinkedBones.Num(); ++LinkedBoneIndex)
+									{
+										const FBoneReference& BoneReference = CurveMetaData->LinkedBones[LinkedBoneIndex];
+										// we want to make sure all the joints are removed from RequiredBones before removing this UID
+										if (BoneReference.GetCompactPoseIndex(*this) != INDEX_NONE)
+										{
+											// still has some joint that matters, do not remove
+											bBeingUsed = true;
+											break;
+										}
+									}
 								}
 							}
 						}
 					}
+
+					if (bBeingUsed)
+					{
+						UIDToArrayIndexLUT[UIDList[CurveNameIndex]] = NumAvailableUIDs++;
+					}
 				}
 			}
 		}
 	}
 	else
 	{
-		AnimCurveNameUids.Reset();
+		UIDToArrayIndexLUT.Reset();
 	}
 }
 
+const FRetargetSourceCachedData& FBoneContainer::GetRetargetSourceCachedData(const FName& InRetargetSourceName) const
+{
+	FRetargetSourceCachedData* RetargetSourceCachedData = RetargetSourceCachedDataLUT.Find(InRetargetSourceName);
+	if (!RetargetSourceCachedData)
+	{
+		RetargetSourceCachedData = &RetargetSourceCachedDataLUT.Add(InRetargetSourceName);
+
+		// Build Cached Data for OrientAndScale retargeting.
+
+		const TArray<FTransform>& AuthoredOnRefSkeleton = AssetSkeleton->GetRefLocalPoses(InRetargetSourceName);
+		const TArray<FTransform>& PlayingOnRefSkeleton = GetRefPoseCompactArray();
+		const int32 CompactPoseNumBones = GetCompactPoseNumBones();
+
+		RetargetSourceCachedData->CompactPoseIndexToOrientAndScaleIndex.Reset();
+
+		for (int32 CompactBoneIndex = 0; CompactBoneIndex < CompactPoseNumBones; CompactBoneIndex++)
+		{
+			const int32& SkeletonBoneIndex = CompactPoseToSkeletonIndex[CompactBoneIndex];
+
+			if (AssetSkeleton->GetBoneTranslationRetargetingMode(SkeletonBoneIndex) == EBoneTranslationRetargetingMode::OrientAndScale)
+			{
+				const FVector SourceSkelTrans = AuthoredOnRefSkeleton[SkeletonBoneIndex].GetTranslation();
+				const FVector TargetSkelTrans = PlayingOnRefSkeleton[CompactBoneIndex].GetTranslation();
+
+				// If translations are identical, we don't need to do any retargeting
+				if (!SourceSkelTrans.Equals(TargetSkelTrans, BONE_TRANS_RT_ORIENT_AND_SCALE_PRECISION))
+				{
+					const float SourceSkelTransLength = SourceSkelTrans.Size();
+					const float TargetSkelTransLength = TargetSkelTrans.Size();
+
+					// this only works on non zero vectors.
+					if (!FMath::IsNearlyZero(SourceSkelTransLength * TargetSkelTransLength))
+					{
+						const FVector SourceSkelTransDir = SourceSkelTrans / SourceSkelTransLength;
+						const FVector TargetSkelTransDir = TargetSkelTrans / TargetSkelTransLength;
+
+						const FQuat DeltaRotation = FQuat::FindBetweenNormals(SourceSkelTransDir, TargetSkelTransDir);
+						const float Scale = TargetSkelTransLength / SourceSkelTransLength;
+						const int32 OrientAndScaleIndex = RetargetSourceCachedData->OrientAndScaleData.Add(FOrientAndScaleRetargetingCachedData(DeltaRotation, Scale, SourceSkelTrans, TargetSkelTrans));
+
+						// initialize CompactPoseBoneIndex to OrientAndScale Index LUT on demand
+						if (RetargetSourceCachedData->CompactPoseIndexToOrientAndScaleIndex.Num() == 0)
+						{
+							RetargetSourceCachedData->CompactPoseIndexToOrientAndScaleIndex.Init(INDEX_NONE, CompactPoseNumBones);
+						}
+
+						RetargetSourceCachedData->CompactPoseIndexToOrientAndScaleIndex[CompactBoneIndex] = OrientAndScaleIndex;
+					}
+				}
+			}
+		}
+	}
+
+	return *RetargetSourceCachedData;
+}
+
 int32 FBoneContainer::GetPoseBoneIndexForBoneName(const FName& BoneName) const
 {
 	checkSlow( IsValid() );
diff --git a/Engine/Source/Runtime/Engine/Private/Camera/CameraShake.cpp b/Engine/Source/Runtime/Engine/Private/Camera/CameraShake.cpp
index 06e16f12f5ac..8eaa4f016bb0 100644
--- a/Engine/Source/Runtime/Engine/Private/Camera/CameraShake.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Camera/CameraShake.cpp
@@ -71,7 +71,14 @@ void UCameraShake::StopShake(bool bImmediately)
 	else
 	{
 		// advance to the blend out time
-		OscillatorTimeRemaining = FMath::Min(OscillatorTimeRemaining, OscillationBlendOutTime);
+		if (OscillatorTimeRemaining > 0.0f)
+		{
+			OscillatorTimeRemaining = FMath::Min(OscillatorTimeRemaining, OscillationBlendOutTime);
+		}
+		else
+		{
+			OscillatorTimeRemaining = OscillationBlendOutTime;
+		}
 
 		if (AnimInst && !AnimInst->bFinished)
 		{
diff --git a/Engine/Source/Runtime/Engine/Private/Character.cpp b/Engine/Source/Runtime/Engine/Private/Character.cpp
index 9c1fdb76a371..c53f8d2b9716 100644
--- a/Engine/Source/Runtime/Engine/Private/Character.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Character.cpp
@@ -6,10 +6,12 @@
 
 #include "GameFramework/Character.h"
 #include "GameFramework/DamageType.h"
+#include "GameFramework/Controller.h"
 #include "Components/SkinnedMeshComponent.h"
 #include "Components/SkeletalMeshComponent.h"
 #include "Components/ArrowComponent.h"
 #include "Engine/CollisionProfile.h"
+#include "Engine/DemoNetDriver.h"
 #include "Components/CapsuleComponent.h"
 #include "GameFramework/CharacterMovementComponent.h"
 #include "Net/UnrealNetwork.h"
@@ -270,7 +272,7 @@ bool ACharacter::CanJumpInternal_Implementation() const
 	if (bCanJump)
 	{
 		// Ensure JumpHoldTime and JumpCount are valid.
-		if (GetJumpMaxHoldTime() <= 0.0f || !bWasJumping)
+		if (!bWasJumping || GetJumpMaxHoldTime() <= 0.0f)
 		{
 			if (JumpCurrentCount == 0 && CharacterMovement->IsFalling())
 			{
@@ -283,12 +285,12 @@ bool ACharacter::CanJumpInternal_Implementation() const
 		}
 		else
 		{
-			// Only consider IsJumpProviding force as long as:
+			// Only consider JumpKeyHoldTime as long as:
 			// A) The jump limit hasn't been met OR
 			// B) The jump limit has been met AND we were already jumping
-			bCanJump = (IsJumpProvidingForce()) &&
-						(JumpCurrentCount < JumpMaxCount ||
-						(bWasJumping && JumpCurrentCount == JumpMaxCount));
+			const bool bJumpKeyHeld = (bPressedJump && JumpKeyHoldTime < GetJumpMaxHoldTime());
+			bCanJump = bJumpKeyHeld &&
+						((JumpCurrentCount < JumpMaxCount) || (bWasJumping && JumpCurrentCount == JumpMaxCount));
 		}
 	}
 
@@ -297,8 +299,10 @@ bool ACharacter::CanJumpInternal_Implementation() const
 
 void ACharacter::ResetJumpState()
 {
+	bPressedJump = false;
 	bWasJumping = false;
 	JumpKeyHoldTime = 0.0f;
+	JumpForceTimeRemaining = 0.0f;
 
 	if (CharacterMovement && !CharacterMovement->IsFalling())
 	{
@@ -312,7 +316,16 @@ void ACharacter::OnJumped_Implementation()
 
 bool ACharacter::IsJumpProvidingForce() const
 {
-	return (bPressedJump && JumpKeyHoldTime < GetJumpMaxHoldTime());
+	if (JumpForceTimeRemaining > 0.0f)
+	{
+		return true;
+	}
+	else if (bProxyIsJumpForceApplied && (Role==ROLE_SimulatedProxy))
+	{
+		return GetWorld()->TimeSince(ProxyJumpForceStartedTime) <= GetJumpMaxHoldTime();
+	}
+
+	return false;
 }
 
 void ACharacter::RecalculateBaseEyeHeight()
@@ -932,9 +945,18 @@ void ACharacter::LaunchCharacter(FVector LaunchVelocity, bool bXYOverride, bool
 
 void ACharacter::OnMovementModeChanged(EMovementMode PrevMovementMode, uint8 PrevCustomMode)
 {
-	if (!bPressedJump)
+	if (!bPressedJump || !CharacterMovement->IsFalling())
 	{
+		// We reset jump state, but someone may have queued up a jump request we shouldn't disregard, so we restore the input flag.
+		const bool bSavedPressedJump = bPressedJump;
 		ResetJumpState();
+		bPressedJump = bSavedPressedJump;
+	}
+
+	// Recored jump force start time for proxies. Allows us to expire the jump even if not continually ticking down a timer.
+	if (bProxyIsJumpForceApplied && CharacterMovement->IsFalling())
+	{
+		ProxyJumpForceStartedTime = GetWorld()->GetTimeSeconds();
 	}
 
 	K2_OnMovementModeChanged(PrevMovementMode, CharacterMovement->MovementMode, PrevCustomMode, CharacterMovement->CustomMovementMode);
@@ -990,36 +1012,34 @@ void ACharacter::CheckJumpInput(float DeltaTime)
 				if (!bWasJumping)
 				{
 					JumpCurrentCount++;
+					JumpForceTimeRemaining = GetJumpMaxHoldTime();
 					OnJumped();
 				}
-				// Only increment the jump time if successfully jumped and it's
-				// the first jump. This prevents including the initial DeltaTime
-				// for the first frame of a jump.
-				if (!bFirstJump)
-				{
-					JumpKeyHoldTime += DeltaTime;
-				}
 			}
 
 			bWasJumping = bDidJump;
 		}
-
-		// If the jump key is no longer pressed and the character is no longer falling,
-		// but it still "looks" like the character was jumping, reset the counters.
-		else if (bWasJumping && !CharacterMovement->IsFalling())
-		{
-			ResetJumpState();
-		}
 	}
 }
 
 
-void ACharacter::ClearJumpInput()
+void ACharacter::ClearJumpInput(float DeltaTime)
 {
-	// Don't disable bPressedJump right away if it's still held
-	if (bPressedJump && (JumpKeyHoldTime >= GetJumpMaxHoldTime()))
+	if (bPressedJump)
 	{
-		bPressedJump = false;
+		JumpKeyHoldTime += DeltaTime;
+
+		// Don't disable bPressedJump right away if it's still held.
+		// Don't modify JumpForceTimeRemaining because a frame of update may be remaining.
+		if (JumpKeyHoldTime >= GetJumpMaxHoldTime())
+		{
+			bPressedJump = false;
+		}
+	}
+	else
+	{
+		JumpForceTimeRemaining = 0.0f;
+		bWasJumping = false;
 	}
 }
 
@@ -1391,6 +1411,7 @@ void ACharacter::PreReplication( IRepChangedPropertyTracker & ChangedPropertyTra
 		DOREPLIFETIME_ACTIVE_OVERRIDE( ACharacter, RepRootMotion, false );
 	}
 
+	bProxyIsJumpForceApplied = (JumpForceTimeRemaining > 0.0f);
 	ReplicatedServerLastTransformUpdateTimeStamp = CharacterMovement->GetServerLastTransformUpdateTimeStamp();
 	ReplicatedMovementMode = CharacterMovement->PackNetworkMovementMode();	
 	ReplicatedBasedMovement = BasedMovement;
@@ -1423,18 +1444,36 @@ void ACharacter::PreReplicationForReplay(IRepChangedPropertyTracker & ChangedPro
 	// We'll be able to look ahead in the replay to have these ahead of time for smoother playback
 	FCharacterReplaySample ReplaySample;
 
+	const UWorld* World = GetWorld();
+
 	// If this is a client-recorded replay, use the mesh location and rotation, since these will always
 	// be smoothed - unlike the actor position and rotation.
 	const USkeletalMeshComponent* const MeshComponent = GetMesh();
-	if (MeshComponent && GetWorld()->IsRecordingClientReplay())
+	if (MeshComponent && World && World->IsRecordingClientReplay())
 	{
-		// Remove the base transform from the mesh's transform, since on playback the base transform
-		// will be stored in the mesh's RelativeLocation and RelativeRotation.
-		const FTransform BaseTransform(GetBaseRotationOffset(), GetBaseTranslationOffset());
-		const FTransform MeshRootTransform = BaseTransform.Inverse() * MeshComponent->GetComponentTransform();
+		FNetworkPredictionData_Client_Character const* const ClientNetworkPredicationData = CharacterMovement->GetPredictionData_Client_Character();
+		if ((Role == ROLE_SimulatedProxy) && ClientNetworkPredicationData)
+		{
+			ReplaySample.Location = GetActorLocation() + ClientNetworkPredicationData->MeshRotationOffset.UnrotateVector(ClientNetworkPredicationData->MeshTranslationOffset);
+			ReplaySample.Rotation = GetActorRotation() + ClientNetworkPredicationData->MeshRotationOffset.Rotator();
+		}
+		else
+		{
+			// Remove the base transform from the mesh's transform, since on playback the base transform
+			// will be stored in the mesh's RelativeLocation and RelativeRotation.
+			const FTransform BaseTransform(GetBaseRotationOffset(), GetBaseTranslationOffset());
+			const FTransform MeshRootTransform = BaseTransform.Inverse() * MeshComponent->GetComponentTransform();
 
-		ReplaySample.Location = MeshRootTransform.GetLocation();
-		ReplaySample.Rotation = MeshRootTransform.GetRotation().Rotator();
+			ReplaySample.Location = MeshRootTransform.GetLocation();
+			ReplaySample.Rotation = MeshRootTransform.GetRotation().Rotator();
+		}
+
+		// On client replays, our view pitch will be set to 0 as by default we do not replicate
+		// pitch for owners, just for simulated. So instead push our rotation into the sampler
+		if (Controller != nullptr && Role == ROLE_AutonomousProxy && GetNetMode() == NM_Client)
+		{
+			SetRemoteViewPitch(Controller->GetControlRotation().Pitch);
+		}
 	}
 	else
 	{
@@ -1446,6 +1485,11 @@ void ACharacter::PreReplicationForReplay(IRepChangedPropertyTracker & ChangedPro
 	ReplaySample.Acceleration = CharacterMovement->GetCurrentAcceleration();
 	ReplaySample.RemoteViewPitch = RemoteViewPitch;
 
+	if (World && World->DemoNetDriver)
+	{
+		ReplaySample.Time = World->DemoNetDriver->DemoCurrentTime;
+	}
+	
 	FBitWriter Writer(0, true);
 	Writer << ReplaySample;
 
@@ -1462,6 +1506,7 @@ void ACharacter::GetLifetimeReplicatedProps( TArray< FLifetimeProperty > & OutLi
 	DOREPLIFETIME_CONDITION( ACharacter, ReplicatedServerLastTransformUpdateTimeStamp, COND_SimulatedOnlyNoReplay );
 	DOREPLIFETIME_CONDITION( ACharacter, ReplicatedMovementMode,			COND_SimulatedOnly );
 	DOREPLIFETIME_CONDITION( ACharacter, bIsCrouched,						COND_SimulatedOnly );
+	DOREPLIFETIME_CONDITION( ACharacter, bProxyIsJumpForceApplied,			COND_SimulatedOnly );
 	DOREPLIFETIME_CONDITION( ACharacter, AnimRootMotionTranslationScale,	COND_SimulatedOnly );
 
 	// Change the condition of the replicated movement property to not replicate in replays since we handle this specifically via saving this out in external replay data
diff --git a/Engine/Source/Runtime/Engine/Private/ChartCreation.cpp b/Engine/Source/Runtime/Engine/Private/ChartCreation.cpp
index b92da48212c8..86301af04665 100644
--- a/Engine/Source/Runtime/Engine/Private/ChartCreation.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ChartCreation.cpp
@@ -19,6 +19,7 @@
 #include "GameFramework/GameUserSettings.h"
 #include "Performance/EnginePerformanceTargets.h"
 #include "HAL/LowLevelMemTracker.h"
+#include "ProfilingDebugging/CsvProfiler.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogChartCreation, Log, All);
 
@@ -43,6 +44,12 @@ static TAutoConsoleVariable<int32> GFPSChartOpenFolderOnDump(
 	TEXT("Should we explore to the folder that contains the .log / etc... when a dump is finished?  This can be disabled for automated testing\n")
 	TEXT(" default: 1"));
 
+static TAutoConsoleVariable<int32> GFPSChartDoCsvProfile(
+	TEXT("t.FPSChart.DoCsvProfile"),
+	0,
+	TEXT("Whether to record a CSV profile when recording FPSChart data\n")
+	TEXT(" default: 0"));
+
 float GMaximumFrameTimeToConsiderForHitchesAndBinning = 1.0f;
 
 static FAutoConsoleVariableRef GMaximumFrameTimeToConsiderForHitchesAndBinningCVar(
@@ -64,6 +71,9 @@ static TAutoConsoleVariable<FString> GFPSChartInterestingFramerates(
 /** Array of interesting summary thresholds (e.g., 30 Hz, 60 Hz, 120 Hz) */
 TArray<int32> GTargetFrameRatesForSummary;
 
+/** Are we recording a CSV profile? */
+static bool GFPSChartCSVProfileActive = false;
+
 //////////////////////////////////////////////////////////////////////
 // FDumpFPSChartToEndpoint
 
@@ -117,6 +127,7 @@ void FDumpFPSChartToEndpoint::HandleHitchSummary(int32 TotalHitchCount, double T
 	const double ReciprocalNumHitches = (TotalHitchCount > 0) ? (1.0 / (double)TotalHitchCount) : 0.0;
 	PrintToEndpoint(FString::Printf(TEXT("Hitch frames bound by game thread:  %i  (%0.1f percent)"), Chart.TotalGameThreadBoundHitchCount, ReciprocalNumHitches * Chart.TotalGameThreadBoundHitchCount));
 	PrintToEndpoint(FString::Printf(TEXT("Hitch frames bound by render thread:  %i  (%0.1f percent)"), Chart.TotalRenderThreadBoundHitchCount, ReciprocalNumHitches * Chart.TotalRenderThreadBoundHitchCount));
+	PrintToEndpoint(FString::Printf(TEXT("Hitch frames bound by RHI thread:  %i  (%0.1f percent)"), Chart.TotalRHIThreadBoundHitchCount, ReciprocalNumHitches * Chart.TotalRHIThreadBoundHitchCount));
 	PrintToEndpoint(FString::Printf(TEXT("Hitch frames bound by GPU:  %i  (%0.1f percent)"), Chart.TotalGPUBoundHitchCount, ReciprocalNumHitches * Chart.TotalGPUBoundHitchCount));
 	PrintToEndpoint(FString::Printf(TEXT("Hitches / min:  %.2f"), Chart.GetAvgHitchesPerMinute()));
 	PrintToEndpoint(FString::Printf(TEXT("Time spent in hitch buckets:  %.2f s"), TotalTimeSpentInHitchBuckets));
@@ -130,6 +141,12 @@ void FDumpFPSChartToEndpoint::HandleFPSThreshold(int32 TargetFPS, int32 NumFrame
 	PrintToEndpoint(FString::Printf(TEXT("  Target %d FPS: %.2f %% syncs missed, %4.2f %% of time spent > %d FPS (%.2f %% of frames)"), TargetFPS, PctMissedFrames, PctTimeAbove, TargetFPS, PercentFramesAbove));
 }
 
+void FDumpFPSChartToEndpoint::HandleDynamicResThreshold(int32 TargetScreenPercentage, float PctTimeAbove)
+{ 
+	PrintToEndpoint(FString::Printf(TEXT("DynamicRes above %d%% : %.2f%% of frames"), TargetScreenPercentage, PctTimeAbove));
+}
+
+
 void FDumpFPSChartToEndpoint::HandleBasicStats()
 {
 	PrintToEndpoint(FString::Printf(TEXT("--- Begin : FPS chart dump for level '%s'"), *MapName));
@@ -162,6 +179,8 @@ void FDumpFPSChartToEndpoint::HandleBasicStats()
 		TimeDisregarded,
 		AvgFPS));
 	PrintToEndpoint(FString::Printf(TEXT("Average GPU frametime: %4.2f ms"), AvgGPUFrameTime));
+	PrintToEndpoint(FString::Printf(TEXT("Average RenderThread frametime: %4.2f ms"), AvgRenderThreadFrameTime));
+	PrintToEndpoint(FString::Printf(TEXT("Average GameThread frametime: %4.2f ms"), AvgGameThreadFrameTime));
 
 	PrintToEndpoint(FString::Printf(TEXT("Total time spent flushing async loading: %4.2f ms"), TotalFlushAsyncLoadingTimeInMS));
 	PrintToEndpoint(FString::Printf(TEXT("Total flushing async loading calls: %d"), TotalFlushAsyncLoadingCalls));
@@ -193,6 +212,8 @@ void FDumpFPSChartToEndpoint::DumpChart(double InWallClockTimeFromStartOfChartin
 	AvgFPS = NumFrames / TotalTime;
 	TimeDisregarded = FMath::Max<float>(0, WallClockTimeFromStartOfCharting - TotalTime);
 	AvgGPUFrameTime = float((Chart.TotalFrameTime_GPU / NumFrames)*1000.0);
+	AvgRenderThreadFrameTime = float((Chart.TotalFrameTime_RenderThread / NumFrames)*1000.0);
+	AvgGameThreadFrameTime = float((Chart.TotalFrameTime_GameThread / NumFrames)*1000.0);
 
 	TotalFlushAsyncLoadingTimeInMS = Chart.TotalFlushAsyncLoadingTime * 1000.0;
 	TotalFlushAsyncLoadingCalls = Chart.TotalFlushAsyncLoadingCalls;
@@ -272,6 +293,21 @@ void FDumpFPSChartToEndpoint::DumpChart(double InWallClockTimeFromStartOfChartin
 
 		PrintToEndpoint(TEXT("--- End"));
 	}
+
+	for (int32 NumBins = Chart.DynamicResHistogram.GetNumBins(), BinIndex = 0; BinIndex < NumBins; ++BinIndex)
+	{
+		// Get the sub of this and all subsequent bins data. This is O(N^2), but we only have 5 bins... 
+		int32 ChartEntryCount = 0;
+		for (int BinIndex2 = BinIndex; BinIndex2 < NumBins; BinIndex2++)
+		{
+			ChartEntryCount += Chart.DynamicResHistogram.GetBinObservationsCount(BinIndex2);
+		}
+		const double MinScreenPercentage = Chart.DynamicResHistogram.GetBinLowerBound(BinIndex);
+
+		float PctTimeAbove = 100.0f * float(ChartEntryCount) / float(Chart.DynamicResHistogram.GetNumMeasurements());
+
+		HandleDynamicResThreshold(MinScreenPercentage, PctTimeAbove);
+	}
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -373,6 +409,13 @@ protected:
 		}
 	}
 
+	virtual void HandleDynamicResThreshold(int32 TargetScreenPercentage, float PctTimeAbove) override
+	{
+		const FString ParamName = FString::Printf(TEXT("DynRes%dPlus"), TargetScreenPercentage);
+		const FString ParamValue = FString::Printf(TEXT("%4.2f"), PctTimeAbove);
+		ParamArray.Add(FAnalyticsEventAttribute(ParamName, ParamValue));
+	}
+
 	virtual void HandleBasicStats() override
 	{
 		// Add non-bucket params
@@ -380,7 +423,6 @@ protected:
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("BuildType"), EBuildConfigurations::ToString(FApp::GetBuildConfiguration())));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("DateStamp"), FDateTime::Now().ToString()));
 
-		ParamArray.Add(FAnalyticsEventAttribute(TEXT("Platform"), FString::Printf(TEXT("%s"), ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()))));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("OS"), FString::Printf(TEXT("%s %s"), *OSMajor, *OSMinor)));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("CPU"), FString::Printf(TEXT("%s %s"), *CPUVendor, *CPUBrand)));
 
@@ -401,7 +443,10 @@ protected:
 			ParamArray.Add(FAnalyticsEventAttribute(TEXT("AvgGPUTime"), FString::Printf(TEXT("%4.2f"), AvgGPUFrameTime)));
 		}
 
+		ParamArray.Add(FAnalyticsEventAttribute(TEXT("AvgRenderThreadTime"), FString::Printf(TEXT("%4.2f"), AvgRenderThreadFrameTime)));
+		ParamArray.Add(FAnalyticsEventAttribute(TEXT("AvgGameThreadTime"), FString::Printf(TEXT("%4.2f"), AvgGameThreadFrameTime)));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("AvgFPS"), FString::Printf(TEXT("%4.2f"), AvgFPS)));
+		ParamArray.Add(FAnalyticsEventAttribute(TEXT("AvgFrameTime"), FString::Printf(TEXT("%4.2f"), 1000.0f/AvgFPS)));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("TimeDisregarded"), FString::Printf(TEXT("%4.2f"), TimeDisregarded)));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("Time"), FString::Printf(TEXT("%4.2f"), WallClockTimeFromStartOfCharting)));
 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("FrameCount"), FString::Printf(TEXT("%i"), NumFrames)));
@@ -532,6 +577,13 @@ protected:
 		}
 	}
 
+	virtual void HandleDynamicResThreshold(int32 TargetScreenPercentage, float PctTimeAbove) override
+	{
+		const FString ParamName = FString::Printf(TEXT("TOKEN_DYNRES_%d_PLUS"), TargetScreenPercentage);
+		const FString ParamValue = FString::Printf(TEXT("%4.2f"), PctTimeAbove);
+		FPSChartRow = FPSChartRow.Replace(*ParamName, *ParamValue, ESearchCase::CaseSensitive);
+	}
+
 	virtual void HandleBasicStats() override
 	{
 		// Update non- bucket stats.
@@ -567,8 +619,8 @@ protected:
 		// 		ParamArray.Add(FAnalyticsEventAttribute(TEXT("Platform"), FString::Printf(TEXT("%s"), ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()))));
 
 		// Sum up FrameTimes and GameTimes
-		FPSChartRow = FPSChartRow.Replace(TEXT("TOKEN_AVG_RENDTIME"), *FString::Printf(TEXT("%4.2f ms"), float((Chart.TotalFrameTime_RenderThread / NumFrames)*1000.0)), ESearchCase::CaseSensitive);
-		FPSChartRow = FPSChartRow.Replace(TEXT("TOKEN_AVG_GAMETIME"), *FString::Printf(TEXT("%4.2f ms"), float((Chart.TotalFrameTime_GameThread / NumFrames)*1000.0)), ESearchCase::CaseSensitive);
+		FPSChartRow = FPSChartRow.Replace(TEXT("TOKEN_AVG_RENDTIME"), *FString::Printf(TEXT("%4.2f ms"), AvgRenderThreadFrameTime), ESearchCase::CaseSensitive);
+		FPSChartRow = FPSChartRow.Replace(TEXT("TOKEN_AVG_GAMETIME"), *FString::Printf(TEXT("%4.2f ms"), AvgGameThreadFrameTime), ESearchCase::CaseSensitive);
 	}
 };
 #endif
@@ -589,12 +641,15 @@ void FPerformanceTrackingChart::Reset(const FDateTime& InStartTime)
 
 	NumFramesBound_GameThread = 0;
 	NumFramesBound_RenderThread = 0;
+	NumFramesBound_RHIThread = 0;
 	NumFramesBound_GPU = 0;
 	TotalFramesBoundTime_GameThread = 0.0;
 	TotalFramesBoundTime_RenderThread = 0.0;
+	TotalFramesBoundTime_RHIThread = 0.0;
 	TotalFramesBoundTime_GPU = 0.0;
 	TotalFrameTime_GameThread = 0.0;
 	TotalFrameTime_RenderThread = 0.0;
+	TotalFrameTime_RHIThread = 0.0;
 	TotalFrameTime_GPU = 0.0;
 	TotalFlushAsyncLoadingTime = 0.0;
 	TotalFlushAsyncLoadingCalls = 0;
@@ -602,6 +657,7 @@ void FPerformanceTrackingChart::Reset(const FDateTime& InStartTime)
 	TotalSyncLoadCount = 0;
 	TotalGameThreadBoundHitchCount = 0;
 	TotalRenderThreadBoundHitchCount = 0;
+	TotalRHIThreadBoundHitchCount = 0;
 	TotalGPUBoundHitchCount = 0;
 	MaxDrawCalls = 0;
 	MinDrawCalls = INT_MAX;
@@ -631,18 +687,44 @@ void FPerformanceTrackingChart::Reset(const FDateTime& InStartTime)
 			Builder.AddBin(ThresholdMS * MSToSeconds);
 		}
 	}
+
+	{
+		FHistogramBuilder Builder(DynamicResHistogram, 60.0);
+		const double DynamicResMaxPercentages[] = { 70.0, 80.0, 90.0, 100.0 };
+
+		for (double MaxPercentage : DynamicResMaxPercentages)
+		{
+			Builder.AddBin(MaxPercentage);
+		}
+	}
+
+	StartTemperatureLevel = -1.0f;
+	StopTemperatureLevel = -1.0f;
+	MinTemperatureLevel = -1.0f;
+	MaxTemperatureLevel = -1.0f;
+
+	StartBatteryLevel = -1;
+	StopBatteryLevel = -1;
+	BatteryLevelHistogram.InitFromArray({-1.0, 0.0, 25.0, 50.0, 75.0});
+
 }
 
 void FPerformanceTrackingChart::StartCharting()
 {
+	MinTemperatureLevel = MaxTemperatureLevel = StartTemperatureLevel = FPlatformMisc::GetDeviceTemperatureLevel();
+	StartBatteryLevel = FPlatformMisc::GetBatteryLevel();
 }
 
 void FPerformanceTrackingChart::StopCharting()
 {
+	StopTemperatureLevel = FPlatformMisc::GetDeviceTemperatureLevel();
+	StopBatteryLevel = FPlatformMisc::GetBatteryLevel();
 }
 
 void FPerformanceTrackingChart::ProcessFrame(const FFrameData& FrameData)
 {
+	QUICK_SCOPE_CYCLE_COUNTER(STAT_FPerformanceTrackingChart_ProcessFrame);
+
 	AccumulatedChartTime += FrameData.TrueDeltaSeconds;
 
 	// Handle the frame time histogram
@@ -669,16 +751,29 @@ void FPerformanceTrackingChart::ProcessFrame(const FFrameData& FrameData)
 			TotalFramesBoundTime_RenderThread += FrameData.DeltaSeconds;
 		}
 
+		if (FrameData.bRHIThreadBound)
+		{
+			NumFramesBound_RHIThread++;
+			TotalFramesBoundTime_RHIThread += FrameData.DeltaSeconds;
+		}
+
 		if (FrameData.bGPUBound)
 		{
 			TotalFramesBoundTime_GPU += FrameData.DeltaSeconds;
 			NumFramesBound_GPU++;
 		}
+
+		float CurrentTemperatureLevel = FPlatformMisc::GetDeviceTemperatureLevel();
+		MinTemperatureLevel = FMath::Min(MinTemperatureLevel, CurrentTemperatureLevel);
+		MaxTemperatureLevel = FMath::Max(MaxTemperatureLevel, CurrentTemperatureLevel);
+
+		BatteryLevelHistogram.AddMeasurement((double)FPlatformMisc::GetBatteryLevel());
 	}
 
 	// Track per frame stats.
 	TotalFrameTime_GameThread += FrameData.GameThreadTimeSeconds;
 	TotalFrameTime_RenderThread += FrameData.RenderThreadTimeSeconds;
+	TotalFrameTime_RHIThread += FrameData.RHIThreadTimeSeconds;
 	TotalFrameTime_GPU += FrameData.GPUTimeSeconds;
 
 	// Async loading stats.
@@ -711,11 +806,15 @@ void FPerformanceTrackingChart::ProcessFrame(const FFrameData& FrameData)
 		case EFrameHitchType::RenderThread:
 			++TotalRenderThreadBoundHitchCount;
 			break;
+		case EFrameHitchType::RHIThread:
+			++TotalRHIThreadBoundHitchCount;
+			break;
 		case EFrameHitchType::GPU:
 			++TotalGPUBoundHitchCount;
 			break;
 		}
 	}
+	DynamicResHistogram.AddMeasurement(FrameData.DynamicResolutionScreenPercentage);
 }
 
 void FPerformanceTrackingChart::DumpFPSChart(const FString& InMapName)
@@ -879,6 +978,14 @@ void FPerformanceTrackingChart::DumpChartToAnalyticsParams(const FString& InMapN
 
 			const float FrameRateLimit = UserSettingsObj->GetFrameRateLimit();
 			InParamArray.Add(FAnalyticsEventAttribute(TEXT("FrameRateLimit"), FrameRateLimit));
+
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("StartTemp"), StartTemperatureLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("StopTemp"), StopTemperatureLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("MinTemp"), MinTemperatureLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("MaxTemp"), MaxTemperatureLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("StartBatteryLevel"), StartBatteryLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("StopBatteryLevel"), StopBatteryLevel));
+			InParamArray.Add(FAnalyticsEventAttribute(TEXT("BatteryLevelHistogram"), BatteryLevelHistogram.DumpToAnalyticsString()));
 		}
 	}
 }
@@ -986,35 +1093,38 @@ void FFineGrainedPerformanceTracker::ProcessFrame(const FFrameData& FrameData)
 	GPUFrameTimes.Add(FrameData.GPUTimeSeconds);
 	FrameTimes.Add(FrameData.DeltaSeconds);
 	ActiveModes.Add(CurrentModeContext);
+	DynamicResolutionScreenPercentages.Add(FrameData.DynamicResolutionScreenPercentage);
 }
 
 void FFineGrainedPerformanceTracker::DumpFrameTimesToStatsLog(const FString& FrameTimeFilename)
 {
 	if (FArchive* OutputFile = IFileManager::Get().CreateDebugFileWriter(*FrameTimeFilename))
 	{
-		OutputFile->Logf(TEXT("Percentile,Frame (ms), GT (ms), RT (ms), GPU (ms),Context"));
+		OutputFile->Logf(TEXT("Percentile,Frame (ms), GT (ms), RT (ms), GPU (ms),DynRes,Context"));
 		TArray<float> FrameTimesCopy = FrameTimes;
 		TArray<float> GameThreadFrameTimesCopy = GameThreadFrameTimes;
 		TArray<float> RenderThreadFrameTimesCopy = RenderThreadFrameTimes;
 		TArray<float> GPUFrameTimesCopy = GPUFrameTimes;
+		TArray<float> DynamicResolutionScreenPercentagesCopy = DynamicResolutionScreenPercentages;
 		// using selection a few times should still be faster than full sort once,
 		// since it's linear vs non-linear (O(n) vs O(n log n) for quickselect vs quicksort)
 		for (int32 Percentile = 25; Percentile <= 75; Percentile += 25)
 		{
-			OutputFile->Logf(TEXT("%d,%.2f,%.2f,%.2f,%.2f,%d"), Percentile,
+			OutputFile->Logf(TEXT("%d,%.2f,%.2f,%.2f,%.2f,%.2f,%d"), Percentile,
 				GetPercentileValue(FrameTimesCopy, Percentile) * 1000,
 				GetPercentileValue(GameThreadFrameTimesCopy, Percentile) * 1000,
 				GetPercentileValue(RenderThreadFrameTimesCopy, Percentile) * 1000,
 				GetPercentileValue(GPUFrameTimesCopy, Percentile) * 1000,
+				GetPercentileValue(DynamicResolutionScreenPercentagesCopy, Percentile),
 				0
 				);
 		}
 
-		OutputFile->Logf(TEXT("Time (sec),Frame (ms), GT (ms), RT (ms), GPU (ms),Context"));
+		OutputFile->Logf(TEXT("Time (sec),Frame (ms), GT (ms), RT (ms), GPU (ms),DynRes,Context"));
 		double ElapsedTime = 0.0;
 		for (int32 i = 0; i < FrameTimes.Num(); i++)
 		{
-			OutputFile->Logf(TEXT("%.2f,%.2f,%.2f,%.2f,%.2f,%d"), ElapsedTime, FrameTimes[i] * 1000, GameThreadFrameTimes[i] * 1000, RenderThreadFrameTimes[i] * 1000, GPUFrameTimes[i] * 1000, ActiveModes[i]);
+			OutputFile->Logf(TEXT("%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%d"), ElapsedTime, FrameTimes[i] * 1000, GameThreadFrameTimes[i] * 1000, RenderThreadFrameTimes[i] * 1000, GPUFrameTimes[i] * 1000, DynamicResolutionScreenPercentages[i], ActiveModes[i]);
 			ElapsedTime += FrameTimes[i];
 		}
 		delete OutputFile;
@@ -1064,6 +1174,7 @@ IPerformanceDataConsumer::FFrameData FPerformanceTrackingSystem::AnalyzeFrame(fl
 
 	// Copy these locally since the RT may update it between reads otherwise
 	const uint32 LocalRenderThreadTime = GRenderThreadTime;
+	const uint32 LocalRHIThreadTime = GRHIThreadTime;
 	const uint32 LocalGPUFrameTime = GGPUFrameTime;
 
 	const double CurrentTime = FPlatformTime::Seconds();
@@ -1119,6 +1230,7 @@ IPerformanceDataConsumer::FFrameData FPerformanceTrackingSystem::AnalyzeFrame(fl
 	FrameData.IdleSeconds = FApp::GetIdleTime();
 	FrameData.GameThreadTimeSeconds = FPlatformTime::ToSeconds(GGameThreadTime);
 	FrameData.RenderThreadTimeSeconds = FPlatformTime::ToSeconds(LocalRenderThreadTime);
+	FrameData.RHIThreadTimeSeconds = FPlatformTime::ToSeconds(LocalRHIThreadTime);
 	FrameData.GPUTimeSeconds = FPlatformTime::ToSeconds(LocalGPUFrameTime);
 
 	extern COREUOBJECT_API double GFlushAsyncLoadingTime;
@@ -1154,6 +1266,12 @@ IPerformanceDataConsumer::FFrameData FPerformanceTrackingSystem::AnalyzeFrame(fl
 				bAreWeGPUBoundIfInferred = false;
 			}
 
+			if (FrameData.RHIThreadTimeSeconds >= TargetThreadTimeSeconds)
+			{
+				FrameData.bRHIThreadBound = true;
+				bAreWeGPUBoundIfInferred = false;
+			}
+
 			// Consider this frame GPU bound if we have an actual measurement which is over the limit,
 			if (((LocalGPUFrameTime != 0) && (FrameData.GPUTimeSeconds >= TargetThreadTimeSeconds)) ||
 				// Or if we don't have a measurement but neither of the other threads were the slowest
@@ -1200,6 +1318,11 @@ IPerformanceDataConsumer::FFrameData FPerformanceTrackingSystem::AnalyzeFrame(fl
 						// Bound by render thread
 						FrameData.HitchStatus = EFrameHitchType::RenderThread;
 					}
+					else if (LocalRHIThreadTime >= (MaxThreadTimeValue - EpsilonCycles))
+					{
+						// Bound by RHI thread
+						FrameData.HitchStatus = EFrameHitchType::RHIThread;
+					}
 					else if (PossibleGPUTime == MaxThreadTimeValue)
 					{
 						// Bound by GPU
@@ -1223,6 +1346,19 @@ IPerformanceDataConsumer::FFrameData FPerformanceTrackingSystem::AnalyzeFrame(fl
 		LastDeltaSeconds = DeltaSeconds;
 	}
 
+	// Add dynamic resolution to the frame data. Default to 100 where dynamic resolution is disabled
+	{
+		FrameData.DynamicResolutionScreenPercentage = 100.0f;
+
+		FDynamicResolutionStateInfos DynamicResolutionStateInfos;
+		GEngine->GetDynamicResolutionCurrentStateInfos(/* out */ DynamicResolutionStateInfos);
+
+		if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Enabled || DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::DebugForceEnabled)
+		{
+			FrameData.DynamicResolutionScreenPercentage = DynamicResolutionStateInfos.ResolutionFractionApproximation * 100.0f;
+		}
+	}
+
 	return FrameData;
 }
 
@@ -1269,6 +1405,8 @@ void UEngine::TickPerformanceMonitoring(float DeltaSeconds)
 
 	if (ActivePerformanceDataConsumers.Num() > 0)
 	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_ProcessActivePerfDataConsumers);
+
 		const IPerformanceDataConsumer::FFrameData FrameData = GPerformanceTrackingSystem.AnalyzeFrame(DeltaSeconds);
 
 		// Route the frame data to all consumers
@@ -1334,6 +1472,20 @@ void UEngine::StartFPSChart(const FString& Label, bool bRecordPerFrameTimes)
 		}
 	}
 #endif
+
+#if CSV_PROFILER
+	if (GFPSChartDoCsvProfile.GetValueOnGameThread())
+	{
+		if (!FCsvProfiler::Get()->IsCapturing())
+		{
+			GFPSChartCSVProfileActive = true;
+			FString OutputDirectory = FPerformanceTrackingSystem::CreateOutputDirectory(CaptureStartTime);
+			const FString PlatformName = FPlatformProperties::PlatformName();
+			FString CsvProfileFilename = TEXT("CsvProfile-") + CaptureStartTime.ToString() + TEXT("-") + PlatformName + TEXT(".csv");
+			FCsvProfiler::Get()->BeginCapture(-1, OutputDirectory, CsvProfileFilename, false);
+		}
+	}
+#endif
 }
 
 void UEngine::StopFPSChart(const FString& InMapName)
@@ -1357,6 +1509,17 @@ void UEngine::StopFPSChart(const FString& InMapName)
 		ActiveFrameTimesChart.Reset();
 	}
 #endif
+
+#if CSV_PROFILER
+	if (GFPSChartCSVProfileActive)
+	{
+		GFPSChartCSVProfileActive = false;
+		if ( FCsvProfiler::Get()->IsCapturing() )
+		{
+			FCsvProfiler::Get()->EndCapture();
+		}
+	}
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1365,214 +1528,228 @@ void UEngine::StopFPSChart(const FString& InMapName)
 #if ALLOW_DEBUG_FILES
 
 const TCHAR* GFPSChartPreamble =
-L"<HTML>\n"
-L"   <HEAD>\n"
-L"    <TITLE>FPS Chart</TITLE>\n"
-L"\n"
-L"    <META HTTP-EQUIV=\"CONTENT-TYPE\" CONTENT=\"TEXT/HTML; CHARSET=UTF-8\">\n"
-L"    <LINK TITLE=\"default style\" REL=\"STYLESHEET\" HREF=\"../../Engine/Stats/ChartStyle.css\" TYPE=\"text/css\">\n"
-L"    <LINK TITLE=\"default style\" REL=\"STYLESHEET\" HREF=\"../../Engine/Stats/FPSStyle.css\" TYPE=\"text/css\">\n"
-L"\n"
-L"  </HEAD>\n"
-L"</HEAD>\n"
-L"<BODY>\n"
-L"\n"
-L"<DIV CLASS=\"ChartStyle\">\n"
-L"\n"
-L"<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\" BGCOLOR=\"#808080\">\n"
-L"<TR><TD>\n"
-L"<TABLE WIDTH=\"4000\" HEIGHT=\"100%\" BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"3\" BGCOLOR=\"#808080\">\n"
-L"\n"
-L"<TR CLASS=\"rowHeader\">\n"
-L"<TD CLASS=\"rowHeadermapname\"><DIV CLASS=\"rowHeaderValue\">mapname</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderChangelist\"><DIV CLASS=\"rowHeaderValue\">changelist</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderDateStamp\"><DIV CLASS=\"rowHeaderValue\">datestamp</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderOS\"><DIV CLASS=\"rowHeaderValue\">OS</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderCPU\"><DIV CLASS=\"rowHeaderValue\">CPU</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderGPU\"><DIV CLASS=\"rowHeaderValue\">GPU</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderBuildConfig\"><DIV CLASS=\"rowHeaderValue\">BuildConfig</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsRes\"><DIV CLASS=\"rowHeaderValue\">Res Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsVD\"><DIV CLASS=\"rowHeaderValue\">View Dist Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsAA\"><DIV CLASS=\"rowHeaderValue\">AA Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsShadow\"><DIV CLASS=\"rowHeaderValue\">Shadow Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsPP\"><DIV CLASS=\"rowHeaderValue\">PP Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsTex\"><DIV CLASS=\"rowHeaderValue\">Tex Qual</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSettingsFX\"><DIV CLASS=\"rowHeaderValue\">FX Qual</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>avg FPS</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% over 20 FPS</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% over 30 FPS</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% over 60 FPS</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% over 120 FPS</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>Hitches/Min</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 20</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 30</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 60</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 120</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>avg GPU time</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>avg RT time</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderSummary\"><DIV>avg GT time</DIV></TD>\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>Game Thread Bound By Percent</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>Render Thread Bound By Percent</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>GPU Bound By Percent</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0 - 5</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">5 - 10</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">10 - 15</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">15 - 20</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">20 - 25</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">25 - 30</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">30 - 40</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">40 - 50</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">50 - 60</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">60 - 70</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">70 - 80</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">80 - 90</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">90 - 100</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">100 - 110</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">110 - 120</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">120 - INF</DIV></TD>\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowHeaderTimes\"><DIV>time</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderTimes\"><DIV>frame count</DIV></TD>\n"
-L"<TD CLASS=\"rowHeaderTimes\"<DIV>time disregarded</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderTimes\">Total Hitches</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderTimes\">Game Thread Bound Hitch Frames</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderTimes\">Render Thread Bound Hitch Frames</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderTimes\">GPU Bound Hitch Frames</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">5.0 - INF</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">2.5 - 5.0</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">2.0 - 2.5</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">1.5 - 2.0</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">1.0 - 1.5</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.75 - 1.00</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.50 - 0.75</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.30 - 0.50</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.20 - 0.30</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.15 - 0.20</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.10 - 0.15</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.06 - 0.10</DIV></TD>\n"
-L"<TD><DIV CLASS=\"rowHeaderValue\">0.03 - 0.06</DIV></TD>\n"
-L"\n"
-L"</TR>\n"
-L"\n"
-L"<UE4></UE4>";
+TEXT("<HTML>\n")
+TEXT("   <HEAD>\n")
+TEXT("    <TITLE>FPS Chart</TITLE>\n")
+TEXT("\n")
+TEXT("    <META HTTP-EQUIV=\"CONTENT-TYPE\" CONTENT=\"TEXT/HTML; CHARSET=UTF-8\">\n")
+TEXT("    <LINK TITLE=\"default style\" REL=\"STYLESHEET\" HREF=\"../../Engine/Stats/ChartStyle.css\" TYPE=\"text/css\">\n")
+TEXT("    <LINK TITLE=\"default style\" REL=\"STYLESHEET\" HREF=\"../../Engine/Stats/FPSStyle.css\" TYPE=\"text/css\">\n")
+TEXT("\n")
+TEXT("  </HEAD>\n")
+TEXT("</HEAD>\n")
+TEXT("<BODY>\n")
+TEXT("\n")
+TEXT("<DIV CLASS=\"ChartStyle\">\n")
+TEXT("\n")
+TEXT("<TABLE BORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\" BGCOLOR=\"#808080\">\n")
+TEXT("<TR><TD>\n")
+TEXT("<TABLE WIDTH=\"4000\" HEIGHT=\"100%\" BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"3\" BGCOLOR=\"#808080\">\n")
+TEXT("\n")
+TEXT("<TR CLASS=\"rowHeader\">\n")
+TEXT("<TD CLASS=\"rowHeadermapname\"><DIV CLASS=\"rowHeaderValue\">mapname</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderChangelist\"><DIV CLASS=\"rowHeaderValue\">changelist</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderDateStamp\"><DIV CLASS=\"rowHeaderValue\">datestamp</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderOS\"><DIV CLASS=\"rowHeaderValue\">OS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderCPU\"><DIV CLASS=\"rowHeaderValue\">CPU</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderGPU\"><DIV CLASS=\"rowHeaderValue\">GPU</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderBuildConfig\"><DIV CLASS=\"rowHeaderValue\">BuildConfig</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsRes\"><DIV CLASS=\"rowHeaderValue\">Res Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsVD\"><DIV CLASS=\"rowHeaderValue\">View Dist Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsAA\"><DIV CLASS=\"rowHeaderValue\">AA Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsShadow\"><DIV CLASS=\"rowHeaderValue\">Shadow Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsPP\"><DIV CLASS=\"rowHeaderValue\">PP Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsTex\"><DIV CLASS=\"rowHeaderValue\">Tex Qual</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSettingsFX\"><DIV CLASS=\"rowHeaderValue\">FX Qual</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>avg FPS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% over 20 FPS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% over 30 FPS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% over 60 FPS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% over 120 FPS</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>Hitches/Min</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 20</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 30</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 60</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>% Missed VSync 120</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>avg GPU time</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>avg RT time</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderSummary\"><DIV>avg GT time</DIV></TD>\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>Game Thread Bound By Percent</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>Render Thread Bound By Percent</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>GPU Bound By Percent</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0 - 5</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">5 - 10</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">10 - 15</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">15 - 20</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">20 - 25</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">25 - 30</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">30 - 40</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">40 - 50</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">50 - 60</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">60 - 70</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">70 - 80</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">80 - 90</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">90 - 100</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">100 - 110</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">110 - 120</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">120 - INF</DIV></TD>\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowHeaderTimes\"><DIV>time</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderTimes\"><DIV>frame count</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowHeaderTimes\"<DIV>time disregarded</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderTimes\">Total Hitches</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderTimes\">Game Thread Bound Hitch Frames</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderTimes\">Render Thread Bound Hitch Frames</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderTimes\">GPU Bound Hitch Frames</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">5.0 - INF</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">2.5 - 5.0</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">2.0 - 2.5</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">1.5 - 2.0</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">1.0 - 1.5</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.75 - 1.00</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.50 - 0.75</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.30 - 0.50</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.20 - 0.30</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.15 - 0.20</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.10 - 0.15</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.06 - 0.10</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">0.03 - 0.06</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">DynRes 60%+</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">DynRes 70%+</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">DynRes 80%+</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">DynRes 90%+</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"rowHeaderValue\">DynRes 100%+</DIV></TD>\n")
+TEXT("\n")
+TEXT("</TR>\n")
+TEXT("\n")
+TEXT("<UE4></UE4>");
 
 const TCHAR* GFPSChartPostamble =
-L"</TABLE>\n"
-L"</TD></TR></TABLE>\n"
-L"\n"
-L"</DIV> <!-- <DIV CLASS=\"ChartStyle\"> -->\n"
-L"\n"
-L"</BODY>\n"
-L"</HTML>\n"
-L"";
+TEXT("</TABLE>\n")
+TEXT("</TD></TR></TABLE>\n")
+TEXT("\n")
+TEXT("</DIV> <!-- <DIV CLASS=\"ChartStyle\"> -->\n")
+TEXT("\n")
+TEXT("</BODY>\n")
+TEXT("</HTML>\n")
+TEXT("");
 
 const TCHAR* GFPSChartRow =
-L"<TR CLASS=\"dataRow\">\n"
-L"<TD CLASS=\"rowEntryMapName\"><DIV>TOKEN_MAPNAME</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryChangelist\"><DIV>TOKEN_CHANGELIST</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryDateStamp\"><DIV>TOKEN_DATESTAMP</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryOS\"><DIV>TOKEN_OS</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryCPU\"><DIV>TOKEN_CPU</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryGPU\"><DIV>TOKEN_GPU</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryBuildConfig\"><DIV>TOKEN_BUILDCONFIG</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsRes\"><DIV>TOKEN_SETTINGS_RES</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsVD\"><DIV>TOKEN_SETTINGS_VD</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsAA\"><DIV>TOKEN_SETTINGS_AA</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsShadow\"><DIV>TOKEN_SETTINGS_SHADOW</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsPP\"><DIV>TOKEN_SETTINGS_PP</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsTex\"><DIV>TOKEN_SETTINGS_TEX</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySettingsFX\"><DIV>TOKEN_SETTINGS_FX</DIV></TD>\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_FPS</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_20</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_30</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_60</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_120</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_HITCHES_PER_MIN</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_20</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_30</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_60</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_120</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_GPUTIME</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_RENDTIME</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_GAMETIME</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_GAME_THREAD_PERCENT</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_RENDER_THREAD_PERCENT</DIV></TD>\n"
-L"<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_GPU_PERCENT</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_0_5</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_5_10</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_10_15</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_15_20</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_20_25</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_25_30</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_30_40</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_40_50</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_50_60</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_60_70</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_70_80</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_80_90</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_90_100</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_100_110</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_110_120</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_120_999</DIV></TD>\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"\n"
-L"\n"
-L"<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_TIME</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_FRAMECOUNT</DIV></TD>\n"
-L"<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_TIME_DISREGARDED</DIV></TD>\n"
-L"\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_TOTAL</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_GAME_BOUND_COUNT</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_RENDER_BOUND_COUNT</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_GPU_BOUND_COUNT</DIV></TD>\n"
-L"\n"
-L"<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_5000_PLUS</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_2500_5000</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_2000_2500</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_1500_2000</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_1000_1500</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_750_1000</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_500_750</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_300_500</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_200_300</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_150_200</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_100_150</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_60_100</DIV></TD>\n"
-L"<TD><DIV CLASS=\"value\">TOKEN_HITCH_30_60</DIV></TD>\n"
-L"\n"
-L"</TR>";
+TEXT("<TR CLASS=\"dataRow\">\n")
+TEXT("<TD CLASS=\"rowEntryMapName\"><DIV>TOKEN_MAPNAME</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryChangelist\"><DIV>TOKEN_CHANGELIST</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryDateStamp\"><DIV>TOKEN_DATESTAMP</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryOS\"><DIV>TOKEN_OS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryCPU\"><DIV>TOKEN_CPU</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryGPU\"><DIV>TOKEN_GPU</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryBuildConfig\"><DIV>TOKEN_BUILDCONFIG</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsRes\"><DIV>TOKEN_SETTINGS_RES</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsVD\"><DIV>TOKEN_SETTINGS_VD</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsAA\"><DIV>TOKEN_SETTINGS_AA</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsShadow\"><DIV>TOKEN_SETTINGS_SHADOW</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsPP\"><DIV>TOKEN_SETTINGS_PP</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsTex\"><DIV>TOKEN_SETTINGS_TEX</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySettingsFX\"><DIV>TOKEN_SETTINGS_FX</DIV></TD>\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_FPS</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_20</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_30</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_60</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_PCT_ABOVE_120</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_HITCHES_PER_MIN</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_20</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_30</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_60</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_MVP_120</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_GPUTIME</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_RENDTIME</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_AVG_GAMETIME</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_GAME_THREAD_PERCENT</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_RENDER_THREAD_PERCENT</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntrySummary\"><DIV>TOKEN_BOUND_GPU_PERCENT</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_0_5</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_5_10</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_10_15</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_15_20</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_20_25</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_25_30</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_30_40</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_40_50</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_50_60</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_60_70</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_70_80</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_80_90</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_90_100</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_100_110</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_110_120</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_120_999</DIV></TD>\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_TIME</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_FRAMECOUNT</DIV></TD>\n")
+TEXT("<TD CLASS=\"rowEntryTimes\"><DIV>TOKEN_TIME_DISREGARDED</DIV></TD>\n")
+TEXT("\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_TOTAL</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_GAME_BOUND_COUNT</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_RENDER_BOUND_COUNT</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_GPU_BOUND_COUNT</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_5000_PLUS</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_2500_5000</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_2000_2500</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_1500_2000</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_1000_1500</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_750_1000</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_500_750</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_300_500</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_200_300</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_150_200</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_100_150</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_60_100</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_HITCH_30_60</DIV></TD>\n")
+TEXT("\n")
+TEXT("<TD CLASS=\"columnSeparator\"><DIV>&nbsp;</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_DYNRES_60_PLUS</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_DYNRES_70_PLUS</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_DYNRES_80_PLUS</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_DYNRES_90_PLUS</DIV></TD>\n")
+TEXT("<TD><DIV CLASS=\"value\">TOKEN_DYNRES_100_PLUS</DIV></TD>\n")
+TEXT("\n")
+TEXT("</TR>");
 
 void FPerformanceTrackingChart::DumpChartsToHTML(double WallClockElapsed, const TArray<const FPerformanceTrackingChart*>& Charts, const FString& InMapName, const FString& HTMLFilename)
 {
@@ -1621,4 +1798,4 @@ void FPerformanceTrackingChart::DumpChartsToHTML(double WallClockElapsed, const
 
 	UE_LOG(LogProfilingDebugging, Warning, TEXT( "FPS Chart (HTML) saved to %s" ), *IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*HTMLFilename));
 }
-#endif // ALLOW_DEBUG_FILES
\ No newline at end of file
+#endif // ALLOW_DEBUG_FILES
diff --git a/Engine/Source/Runtime/Engine/Private/Collision/Collision.cpp b/Engine/Source/Runtime/Engine/Private/Collision/Collision.cpp
index 8c9e6090cc31..7b8ea5b059cd 100644
--- a/Engine/Source/Runtime/Engine/Private/Collision/Collision.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Collision/Collision.cpp
@@ -243,6 +243,14 @@ void FCollisionQueryParams::AddIgnoredActors(const TArray<AActor*>& InIgnoreActo
 	}
 }
 
+void FCollisionQueryParams::AddIgnoredActors(const TArray<const AActor*>& InIgnoreActors)
+{
+	for (int32 Idx = 0; Idx < InIgnoreActors.Num(); ++Idx)
+	{
+		AddIgnoredActor(InIgnoreActors[Idx]);
+	}
+}
+
 void FCollisionQueryParams::AddIgnoredActors(const TArray<TWeakObjectPtr<AActor> >& InIgnoreActors)
 {
 	for (int32 Idx = 0; Idx < InIgnoreActors.Num(); ++Idx)
diff --git a/Engine/Source/Runtime/Engine/Private/Collision/WorldCollisionAsync.cpp b/Engine/Source/Runtime/Engine/Private/Collision/WorldCollisionAsync.cpp
index 474041aa51fb..641f71796deb 100644
--- a/Engine/Source/Runtime/Engine/Private/Collision/WorldCollisionAsync.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Collision/WorldCollisionAsync.cpp
@@ -31,7 +31,16 @@
  * @param UserData		UserData
  */
 
-#define RUN_ASYNC_TRACE 1
+namespace AsyncTraceCVars
+{
+	static int32 RunAsyncTraceOnWorkerThread = 1;
+	static FAutoConsoleVariableRef CVarRunAsyncTraceOnWorkerThread(
+		TEXT("RunAsyncTraceOnWorkerThread"),
+		RunAsyncTraceOnWorkerThread,
+		TEXT("Whether to use worker thread for async trace functionality. This works if FApp::ShouldUseThreadingForPerformance is true. Otherwise it will always use game thread. \n")
+		TEXT("0: Use game thread, 1: User worker thread"),
+		ECVF_Default);
+}
 
 namespace
 {
@@ -200,8 +209,6 @@ namespace
 		}
 	}
 
-	#if RUN_ASYNC_TRACE
-
 	FAutoConsoleTaskPriority CPrio_FAsyncTraceTask(
 		TEXT("TaskGraph.TaskPriorities.AsyncTraceTask"),
 		TEXT("Task and thread priority for async traces."),
@@ -274,7 +281,6 @@ namespace
 			}
 		}
 	};
-	#endif // RUN_ASYNC_TRACE
 
 	// This runs each chunk whenever filled up to GAsyncChunkSizeToIncrement OR when ExecuteAll is true
 	template <typename DatumType>
@@ -291,18 +297,22 @@ namespace
 			Next.Block = Next.Block - 1;
 			Next.Index = ASYNC_TRACE_BUFFER_SIZE;
 		}
-		// don't execute if we haven't been explicitly requested to OR there's nothing to run
+		// don't execute if we haven't been explicitly requested to OR there's nothing to runs
 		else if (!bExecuteAll || Next.Index == 0)
 		{
 			return;
 		}
 
 		auto* Datum      = GetTraceContainer<DatumType>(DataBuffer)[Next.Block]->Buffer;
-		#if RUN_ASYNC_TRACE
+		const bool bRunAsyncTraceOnWorkerThread = !!AsyncTraceCVars::RunAsyncTraceOnWorkerThread && FApp::ShouldUseThreadingForPerformance();
+		if (bRunAsyncTraceOnWorkerThread)
+		{
 			DataBuffer.AsyncTraceCompletionEvent.Emplace(TGraphTask<FAsyncTraceTask>::CreateTask(NULL, ENamedThreads::GameThread).ConstructAndDispatchWhenReady(Datum, Next.Index));
-		#else
+		}
+		else
+		{
 			RunTraceTask(Datum, Next.Index);
-		#endif
+		}
 	}
 
 	template <typename DatumType>
@@ -437,16 +447,18 @@ bool UWorld::QueryOverlapData(const FTraceHandle& Handle, FOverlapDatum& OutData
 
 void UWorld::WaitForAllAsyncTraceTasks()
 {
-#if RUN_ASYNC_TRACE
-	// if running thread, wait until all threads finishes, if we don't do this, there might be more thread running
-	AsyncTraceData& DataBufferExecuted = AsyncTraceState.GetBufferForPreviousFrame();
-	if (DataBufferExecuted.AsyncTraceCompletionEvent.Num() > 0)
+	const bool bRunAsyncTraceOnWorkerThread = !!AsyncTraceCVars::RunAsyncTraceOnWorkerThread && FApp::ShouldUseThreadingForPerformance();
+	if (bRunAsyncTraceOnWorkerThread)
 	{
-		QUICK_SCOPE_CYCLE_COUNTER(STAT_WaitForAllAsyncTraceTasks);
-		FTaskGraphInterface::Get().WaitUntilTasksComplete(DataBufferExecuted.AsyncTraceCompletionEvent,ENamedThreads::GameThread);
-		DataBufferExecuted.AsyncTraceCompletionEvent.Reset();
+		// if running thread, wait until all threads finishes, if we don't do this, there might be more thread running
+		AsyncTraceData& DataBufferExecuted = AsyncTraceState.GetBufferForPreviousFrame();
+		if (DataBufferExecuted.AsyncTraceCompletionEvent.Num() > 0)
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_WaitForAllAsyncTraceTasks);
+			FTaskGraphInterface::Get().WaitUntilTasksComplete(DataBufferExecuted.AsyncTraceCompletionEvent, ENamedThreads::GameThread);
+			DataBufferExecuted.AsyncTraceCompletionEvent.Reset();
+		}
 	}
-#endif // RUN_ASYNC_TRACE
 }
 
 void UWorld::ResetAsyncTrace()
diff --git a/Engine/Source/Runtime/Engine/Private/Commandlets/Commandlet.cpp b/Engine/Source/Runtime/Engine/Private/Commandlets/Commandlet.cpp
index 33eb184ffd7b..fcd0b38c06c9 100644
--- a/Engine/Source/Runtime/Engine/Private/Commandlets/Commandlet.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Commandlets/Commandlet.cpp
@@ -9,4 +9,5 @@ UCommandlet::UCommandlet(const FObjectInitializer& ObjectInitializer)
 	IsClient = true;
 	IsEditor = true;
 	ShowErrorCount = true;
+	ShowProgress = true;
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Components/ActorComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/ActorComponent.cpp
index 9ba9e7a0d876..2769b245f2d3 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/ActorComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/ActorComponent.cpp
@@ -1709,7 +1709,7 @@ void UActorComponent::DetermineUCSModifiedProperties()
 			FComponentPropertySkipper()
 				: FArchive()
 			{
-				ArIsSaving = true;
+				this->SetIsSaving(true);
 
 				// Include properties that would normally skip tagged serialization (e.g. bulk serialization of array properties).
 				ArPortFlags |= PPF_ForceTaggedSerialization;
diff --git a/Engine/Source/Runtime/Engine/Private/Components/ApplicationLifecycleComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/ApplicationLifecycleComponent.cpp
index ba9fb3a53050..fadf70f6df30 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/ApplicationLifecycleComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/ApplicationLifecycleComponent.cpp
@@ -22,6 +22,7 @@ void UApplicationLifecycleComponent::OnRegister()
 	FCoreDelegates::ApplicationReceivedStartupArgumentsDelegate.AddUObject(this, &UApplicationLifecycleComponent::ApplicationReceivedStartupArgumentsDelegate_Handler);
 
 	FCoreDelegates::OnTemperatureChange.AddUObject(this, &UApplicationLifecycleComponent::OnTemperatureChangeDelegate_Handler);
+	FCoreDelegates::OnLowPowerMode.AddUObject(this, &UApplicationLifecycleComponent::OnLowPowerModeDelegate_Handler);
 }
 
 void UApplicationLifecycleComponent::OnUnregister()
@@ -36,4 +37,5 @@ void UApplicationLifecycleComponent::OnUnregister()
  	FCoreDelegates::ApplicationShouldUnloadResourcesDelegate.RemoveAll(this);
  	FCoreDelegates::ApplicationReceivedStartupArgumentsDelegate.RemoveAll(this);
 	FCoreDelegates::OnTemperatureChange.RemoveAll(this);
+	FCoreDelegates::OnLowPowerMode.RemoveAll(this);
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Components/AudioComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/AudioComponent.cpp
index 9c2d1bdd7d6b..ce87be65cc02 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/AudioComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/AudioComponent.cpp
@@ -19,6 +19,7 @@ UAudioComponent implementation.
 -----------------------------------------------------------------------------*/
 uint64 UAudioComponent::AudioComponentIDCounter = 0;
 TMap<uint64, UAudioComponent*> UAudioComponent::AudioIDToComponentMap;
+FCriticalSection UAudioComponent::AudioIDToComponentMapLock;
 
 UAudioComponent::UAudioComponent(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
@@ -56,15 +57,19 @@ UAudioComponent::UAudioComponent(const FObjectInitializer& ObjectInitializer)
 	EnvelopeFollowerReleaseTime = 100;
 
 	AudioDeviceHandle = INDEX_NONE;
-	AudioComponentID = ++AudioComponentIDCounter;
+	AudioComponentID = FPlatformAtomics::InterlockedIncrement(reinterpret_cast<volatile int64*>(&AudioComponentIDCounter));
 
 	// TODO: Consider only putting played/active components in to the map
+	FScopeLock Lock(&AudioIDToComponentMapLock);
 	AudioIDToComponentMap.Add(AudioComponentID, this);
 }
 
 UAudioComponent* UAudioComponent::GetAudioComponentFromID(uint64 AudioComponentID)
 {
-	check(IsInGameThread());
+	//although we should be in the game thread when calling this function, async loading makes it possible/common for these
+	//components to be constructed outside of the game thread. this means we need a lock around anything that deals with the
+	//AudioIDToComponentMap.
+	FScopeLock Lock(&AudioIDToComponentMapLock);
 	return AudioIDToComponentMap.FindRef(AudioComponentID);
 }
 
@@ -78,6 +83,7 @@ void UAudioComponent::BeginDestroy()
 		Stop();
 	}
 
+	FScopeLock Lock(&AudioIDToComponentMapLock);
 	AudioIDToComponentMap.Remove(AudioComponentID);
 }
 
@@ -116,6 +122,7 @@ void UAudioComponent::Serialize(FArchive& Ar)
 
 void UAudioComponent::PostLoad()
 {
+#if WITH_EDITORONLY_DATA
 	const int32 LinkerUE4Version = GetLinkerUE4Version();
 
 	// Translate the old HighFrequencyGainMultiplier value to the new LowPassFilterFrequency value
@@ -134,6 +141,7 @@ void UAudioComponent::PostLoad()
 			LowPassFilterFrequency = FilterConstant * MAX_FILTER_FREQUENCY;
 		}
 	}
+#endif
 
 	Super::PostLoad();
 }
@@ -234,7 +242,7 @@ void UAudioComponent::OnUpdateTransform(EUpdateTransformFlags UpdateTransformFla
 	{
 		if (FAudioDevice* AudioDevice = GetAudioDevice())
 		{
-			DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.UpdateTransform"), STAT_AudioUpdateTransform, STATGROUP_AudioThreadCommands);
+			DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.UpdateAudioComponentTransform"), STAT_AudioUpdateComponentTransform, STATGROUP_AudioThreadCommands);
 
 			const uint64 MyAudioComponentID = AudioComponentID;
 			const FTransform& MyTransform = GetComponentTransform();
@@ -247,7 +255,7 @@ void UAudioComponent::OnUpdateTransform(EUpdateTransformFlags UpdateTransformFla
 					ActiveSound->Transform = MyTransform;
 
 				}
-			}, GET_STATID(STAT_AudioUpdateTransform));
+			}, GET_STATID(STAT_AudioUpdateComponentTransform));
 		}
 	}
 };
@@ -1049,6 +1057,8 @@ void UAudioComponent::SetSubmixSend(USoundSubmix* Submix, float SendLevel)
 {
 	if (FAudioDevice* AudioDevice = GetAudioDevice())
 	{
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.AudioSetSubmixSend"), STAT_SetSubmixSend, STATGROUP_AudioThreadCommands);
+
 		const uint64 MyAudioComponentID = AudioComponentID;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, MyAudioComponentID, Submix, SendLevel]()
 		{
@@ -1060,7 +1070,7 @@ void UAudioComponent::SetSubmixSend(USoundSubmix* Submix, float SendLevel)
 				SendInfo.SendLevel = SendLevel;
 				ActiveSound->SetSubmixSend(SendInfo);
 			}
-		});
+		}, GET_STATID(STAT_SetSubmixSend));
 	}
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Components/CharacterMovementComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/CharacterMovementComponent.cpp
index 0c4a0c2cdd17..fa1293b09f46 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/CharacterMovementComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/CharacterMovementComponent.cpp
@@ -29,7 +29,9 @@
 #include "Engine/NetworkObjectList.h"
 
 #include "Net/PerfCountersHelpers.h"
+#include "ProfilingDebugging/CsvProfiler.h"
 
+CSV_DEFINE_CATEGORY(CharacterMovement, true);
 
 DEFINE_LOG_CATEGORY_STATIC(LogCharacterMovement, Log, All);
 DEFINE_LOG_CATEGORY_STATIC(LogNavMeshMovement, Log, All);
@@ -44,6 +46,7 @@ DECLARE_CYCLE_STAT(TEXT("Char Simulated Time"), STAT_CharacterMovementSimulated,
 DECLARE_CYCLE_STAT(TEXT("Char PerformMovement"), STAT_CharacterMovementPerformMovement, STATGROUP_Character);
 DECLARE_CYCLE_STAT(TEXT("Char ReplicateMoveToServer"), STAT_CharacterMovementReplicateMoveToServer, STATGROUP_Character);
 DECLARE_CYCLE_STAT(TEXT("Char CallServerMove"), STAT_CharacterMovementCallServerMove, STATGROUP_Character);
+DECLARE_CYCLE_STAT(TEXT("Char ServerMove"), STAT_CharacterMovementServerMove, STATGROUP_Character);
 DECLARE_CYCLE_STAT(TEXT("Char ServerForcePositionUpdate"), STAT_CharacterMovementForcePositionUpdate, STATGROUP_Character);
 DECLARE_CYCLE_STAT(TEXT("Char RootMotionSource Calculate"), STAT_CharacterMovementRootMotionSourceCalculate, STATGROUP_Character);
 DECLARE_CYCLE_STAT(TEXT("Char RootMotionSource Apply"), STAT_CharacterMovementRootMotionSourceApply, STATGROUP_Character);
@@ -524,7 +527,7 @@ void UCharacterMovementComponent::OnRegister()
 
 	// Force linear smoothing for replays.
 	const UWorld* MyWorld = GetWorld();
-	const bool IsReplay = (MyWorld && MyWorld->DemoNetDriver && MyWorld->DemoNetDriver->ServerConnection);
+	const bool IsReplay = (MyWorld && MyWorld->IsPlayingReplay());
 	if (IsReplay)
 	{
 		if (CharacterMovementCVars::ReplayUseInterpolation == 1)
@@ -573,7 +576,7 @@ void UCharacterMovementComponent::Deactivate()
 		ClearAccumulatedForces();
 		if (CharacterOwner)
 		{
-			CharacterOwner->ClearJumpInput();
+			CharacterOwner->ResetJumpState();
 		}
 	}
 	bStopMovementAbortPaths = true;
@@ -654,7 +657,7 @@ void UCharacterMovementComponent::SetUpdatedComponent(USceneComponent* NewUpdate
 
 bool UCharacterMovementComponent::HasValidData() const
 {
-	bool bIsValid = UpdatedComponent && IsValid(CharacterOwner);
+	const bool bIsValid = UpdatedComponent && IsValid(CharacterOwner);
 #if ENABLE_NAN_DIAGNOSTIC
 	if (bIsValid)
 	{
@@ -735,7 +738,7 @@ bool UCharacterMovementComponent::DoJump(bool bReplayingMoves)
 		// Don't jump if we can't move up/down.
 		if (!bConstrainToPlane || FMath::Abs(PlaneConstraintNormal.Z) != 1.f)
 		{
-			Velocity.Z = JumpZVelocity;
+			Velocity.Z = FMath::Max(Velocity.Z, JumpZVelocity);
 			SetMovementMode(MOVE_Falling);
 			return true;
 		}
@@ -954,10 +957,10 @@ void UCharacterMovementComponent::OnMovementModeChanged(EMovementMode PreviousMo
 	// Update collision settings if needed
 	if (MovementMode == MOVE_NavWalking)
 	{
-		SetNavWalkingPhysics(true);
 		GroundMovementMode = MovementMode;
 		// Walking uses only XY velocity
 		Velocity.Z = 0.f;
+		SetNavWalkingPhysics(true);
 	}
 	else if (PreviousMovementMode == MOVE_NavWalking)
 	{
@@ -1005,7 +1008,7 @@ void UCharacterMovementComponent::OnMovementModeChanged(EMovementMode PreviousMo
 		{
 			// Kill velocity and clear queued up events
 			StopMovementKeepPathing();
-			CharacterOwner->ClearJumpInput();
+			CharacterOwner->ResetJumpState();
 			ClearAccumulatedForces();
 		}
 	}
@@ -1135,6 +1138,7 @@ void UCharacterMovementComponent::TickComponent(float DeltaTime, enum ELevelTick
 	SCOPED_NAMED_EVENT(UCharacterMovementComponent_TickComponent, FColor::Yellow);
 	SCOPE_CYCLE_COUNTER(STAT_CharacterMovement);
 	SCOPE_CYCLE_COUNTER(STAT_CharacterMovementTick);
+	CSV_SCOPED_TIMING_STAT(CharacterMovement, CharacterMovementTick);
 
 	const FVector InputVector = ConsumeInputVector();
 	if (!HasValidData() || ShouldSkipUpdate(DeltaTime))
@@ -1504,8 +1508,8 @@ void UCharacterMovementComponent::SimulateRootMotion(float DeltaSeconds, const F
 		// Update replicated movement mode.
 		if (bNetworkMovementModeChanged)
 		{
-			bNetworkMovementModeChanged = false;
 			ApplyNetworkMovementMode(CharacterOwner->GetReplicatedMovementMode());
+			bNetworkMovementModeChanged = false;
 		}
 
 		StartNewPhysics(DeltaSeconds, 0);
@@ -1603,16 +1607,20 @@ void UCharacterMovementComponent::SimulateMovement(float DeltaSeconds)
 				UE_LOG(LogCharacterMovement, Verbose, TEXT("Proxy %s received net update"), *GetNameSafe(CharacterOwner));
 				if (bNetworkMovementModeChanged)
 				{
-					bNetworkMovementModeChanged = false;
 					ApplyNetworkMovementMode(CharacterOwner->GetReplicatedMovementMode());
+					bNetworkMovementModeChanged = false;
 				}
-				else if (bJustTeleported)
+				else if (bJustTeleported || bForceNextFloorCheck)
 				{
 					// Make sure floor is current. We will continue using the replicated base, if there was one.
 					bJustTeleported = false;
 					UpdateFloorFromAdjustment();
 				}
 			}
+			else if (bForceNextFloorCheck)
+			{
+				UpdateFloorFromAdjustment();
+			}
 		}
 
 		if (MovementMode == MOVE_None)
@@ -1663,7 +1671,10 @@ void UCharacterMovementComponent::SimulateMovement(float DeltaSeconds)
 					if (!bSimGravityDisabled)
 					{
 						// No floor, must fall.
-						Velocity = NewFallVelocity(Velocity, FVector(0.f, 0.f, GetGravityZ()), DeltaSeconds);
+						if (Velocity.Z <= 0.f || bApplyGravityWhileJumping || !CharacterOwner->IsJumpProvidingForce())
+						{
+							Velocity = NewFallVelocity(Velocity, FVector(0.f, 0.f, GetGravityZ()), DeltaSeconds);
+						}
 					}
 					SetMovementMode(MOVE_Falling);
 				}
@@ -1971,7 +1982,8 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 {
 	SCOPE_CYCLE_COUNTER(STAT_CharacterMovementPerformMovement);
 
-	if (!HasValidData())
+	const UWorld* MyWorld = GetWorld();
+	if (!HasValidData() || MyWorld == nullptr)
 	{
 		return;
 	}
@@ -1979,7 +1991,7 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 	// no movement if we can't move, or if currently doing physical simulation on UpdatedComponent
 	if (MovementMode == MOVE_None || UpdatedComponent->Mobility != EComponentMobility::Movable || UpdatedComponent->IsSimulatingPhysics())
 	{
-		if (!CharacterOwner->bClientUpdating && CharacterOwner->IsPlayingRootMotion() && CharacterOwner->GetMesh() && !CharacterOwner->bServerMoveIgnoreRootMotion)
+		if (!CharacterOwner->bClientUpdating && !CharacterOwner->bServerMoveIgnoreRootMotion && CharacterOwner->IsPlayingRootMotion() && CharacterOwner->GetMesh())
 		{
 			// Consume root motion
 			TickCharacterPose(DeltaSeconds);
@@ -2054,7 +2066,7 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 		ApplyAccumulatedForces(DeltaSeconds);
 
 		// Update the character state before we do our movement
-		UpdateCharacterStateBeforeMovement();
+		UpdateCharacterStateBeforeMovement(DeltaSeconds);
 
 		if (MovementMode == MOVE_NavWalking && bWantsToLeaveNavWalking)
 		{
@@ -2199,7 +2211,7 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 		devCode(ensureMsgf(!Velocity.ContainsNaN(), TEXT("UCharacterMovementComponent::PerformMovement: Velocity contains NaN (%s)\n%s"), *GetPathNameSafe(this), *Velocity.ToString()));
 
 		// Clear jump input now, to allow movement events to trigger it for next update.
-		CharacterOwner->ClearJumpInput();
+		CharacterOwner->ClearJumpInput(DeltaSeconds);
 
 		// change position
 		StartNewPhysics(DeltaSeconds, 0);
@@ -2210,7 +2222,7 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 		}
 
 		// Update character state based on change from movement
-		UpdateCharacterStateAfterMovement();
+		UpdateCharacterStateAfterMovement(DeltaSeconds);
 
 		if ((bAllowPhysicsRotationDuringAnimRootMotion || !HasAnimRootMotion()) && !CharacterOwner->IsMatineeControlled())
 		{
@@ -2237,10 +2249,10 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 				const FRotator ResultingRotation = UpdatedComponent->GetComponentRotation();
 
 				// Show current position
-				DrawDebugCoordinateSystem(GetWorld(), CharacterOwner->GetMesh()->GetComponentLocation() + FVector(0,0,1), ResultingRotation, 50.f, false);
+				DrawDebugCoordinateSystem(MyWorld, CharacterOwner->GetMesh()->GetComponentLocation() + FVector(0,0,1), ResultingRotation, 50.f, false);
 
 				// Show resulting delta move.
-				DrawDebugLine(GetWorld(), OldLocation, ResultingLocation, FColor::Red, true, 10.f);
+				DrawDebugLine(MyWorld, OldLocation, ResultingLocation, FColor::Red, true, 10.f);
 
 				// Log details.
 				UE_LOG(LogRootMotion, Warning,  TEXT("PerformMovement Resulting DeltaMove Translation: %s, Rotation: %s, MovementBase: %s"), //-V595
@@ -2274,20 +2286,16 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 	// If we move we want to avoid a long delay before replication catches up to notice this change, especially if it's throttling our rate.
 	if (bHasAuthority && UNetDriver::IsAdaptiveNetUpdateFrequencyEnabled() && UpdatedComponent)
 	{
-		const UWorld* MyWorld = GetWorld();
-		if (MyWorld)
+		UNetDriver* NetDriver = MyWorld->GetNetDriver();
+		if (NetDriver && NetDriver->IsServer())
 		{
-			UNetDriver* NetDriver = MyWorld->GetNetDriver();
-			if (NetDriver && NetDriver->IsServer())
-			{
-				FNetworkObjectInfo* NetActor = NetDriver->FindOrAddNetworkObjectInfo(CharacterOwner);
+			FNetworkObjectInfo* NetActor = NetDriver->FindOrAddNetworkObjectInfo(CharacterOwner);
 				
-				if (NetActor && MyWorld->GetTimeSeconds() <= NetActor->NextUpdateTime && NetDriver->IsNetworkActorUpdateFrequencyThrottled(*NetActor))
+			if (NetActor && MyWorld->GetTimeSeconds() <= NetActor->NextUpdateTime && NetDriver->IsNetworkActorUpdateFrequencyThrottled(*NetActor))
+			{
+				if (ShouldCancelAdaptiveReplication())
 				{
-					if (ShouldCancelAdaptiveReplication())
-					{
-						NetDriver->CancelAdaptiveReplication(*NetActor);
-					}
+					NetDriver->CancelAdaptiveReplication(*NetActor);
 				}
 			}
 		}
@@ -2302,8 +2310,7 @@ void UCharacterMovementComponent::PerformMovement(float DeltaSeconds)
 		const bool bRotationChanged = (NewRotation != LastUpdateRotation);
 		if (bLocationChanged || bRotationChanged)
 		{
-			const UWorld* MyWorld = GetWorld();
-			ServerLastTransformUpdateTimeStamp = MyWorld ? MyWorld->GetTimeSeconds() : 0.f;
+			ServerLastTransformUpdateTimeStamp = MyWorld->GetTimeSeconds();
 		}
 	}
 
@@ -2625,7 +2632,7 @@ void UCharacterMovementComponent::UnCrouch(bool bClientSimulation)
 	}
 }
 
-void UCharacterMovementComponent::UpdateCharacterStateBeforeMovement()
+void UCharacterMovementComponent::UpdateCharacterStateBeforeMovement(float DeltaSeconds)
 {
 	// Check for a change in crouch state. Players toggle crouch by changing bWantsToCrouch.
 	const bool bIsCrouching = IsCrouching();
@@ -2639,7 +2646,7 @@ void UCharacterMovementComponent::UpdateCharacterStateBeforeMovement()
 	}
 }
 
-void UCharacterMovementComponent::UpdateCharacterStateAfterMovement()
+void UCharacterMovementComponent::UpdateCharacterStateAfterMovement(float DeltaSeconds)
 {
 	// Uncrouch if no longer allowed to be crouched
 	if (IsCrouching() && !CanCrouchInCurrentState())
@@ -2822,6 +2829,14 @@ void UCharacterMovementComponent::TwoWallAdjust(FVector& Delta, const FHitResult
 				const float Time = (1.f - Hit.Time);
 				const FVector ScaledDelta = Delta.GetSafeNormal() * InDelta.Size();
 				Delta = FVector(InDelta.X, InDelta.Y, ScaledDelta.Z / Hit.Normal.Z) * Time;
+
+				// Should never exceed MaxStepHeight in vertical component, so rescale if necessary.
+				// This should be rare (Hit.Normal.Z above would have been very small) but we'd rather lose horizontal velocity than go too high.
+				if (Delta.Z > MaxStepHeight)
+				{
+					const float Rescale = MaxStepHeight / Delta.Z;
+					Delta *= Rescale;
+				}
 			}
 			else
 			{
@@ -2891,18 +2906,20 @@ FVector UCharacterMovementComponent::NewFallVelocity(const FVector& InitialVeloc
 {
 	FVector Result = InitialVelocity;
 
-	if (!Gravity.IsZero() && (bApplyGravityWhileJumping || !(CharacterOwner && CharacterOwner->IsJumpProvidingForce())))
+	if (DeltaTime > 0.f)
 	{
 		// Apply gravity.
 		Result += Gravity * DeltaTime;
 
-		const FVector GravityDir = Gravity.GetSafeNormal();
-		const float TerminalLimit = FMath::Abs(GetPhysicsVolume()->TerminalVelocity);
-
 		// Don't exceed terminal velocity.
-		if ((Result | GravityDir) > TerminalLimit)
+		const float TerminalLimit = FMath::Abs(GetPhysicsVolume()->TerminalVelocity);
+		if (Result.SizeSquared() > FMath::Square(TerminalLimit))
 		{
-			Result = FVector::PointPlaneProject(Result, FVector::ZeroVector, GravityDir) + GravityDir * TerminalLimit;
+			const FVector GravityDir = Gravity.GetSafeNormal();
+			if ((Result | GravityDir) > TerminalLimit)
+			{
+				Result = FVector::PointPlaneProject(Result, FVector::ZeroVector, GravityDir) + GravityDir * TerminalLimit;
+			}
 		}
 	}
 
@@ -3984,13 +4001,30 @@ void UCharacterMovementComponent::PhysFalling(float deltaTime, int32 Iterations)
 
 		// Apply gravity
 		const FVector Gravity(0.f, 0.f, GetGravityZ());
-		Velocity = NewFallVelocity(Velocity, Gravity, timeTick);
-		VelocityNoAirControl = NewFallVelocity(VelocityNoAirControl, Gravity, timeTick);
+		float GravityTime = timeTick;
+
+		// If jump is providing force, gravity may be affected.
+		if (CharacterOwner->JumpForceTimeRemaining > 0.0f)
+		{
+			// Consume some of the force time. Only the remaining time (if any) is affected by gravity when bApplyGravityWhileJumping=false.
+			const float JumpForceTime = FMath::Min(CharacterOwner->JumpForceTimeRemaining, timeTick);
+			GravityTime = bApplyGravityWhileJumping ? timeTick : FMath::Max(0.0f, timeTick - JumpForceTime);
+			
+			// Update Character state
+			CharacterOwner->JumpForceTimeRemaining -= JumpForceTime;
+			if (CharacterOwner->JumpForceTimeRemaining <= 0.0f)
+			{
+				CharacterOwner->ResetJumpState();
+			}
+		}
+
+		Velocity = NewFallVelocity(Velocity, Gravity, GravityTime);
+		VelocityNoAirControl = bHasAirControl ? NewFallVelocity(VelocityNoAirControl, Gravity, GravityTime) : Velocity;
 		const FVector AirControlAccel = (Velocity - VelocityNoAirControl) / timeTick;
 
 		ApplyRootMotionToVelocity(timeTick);
 
-		if( bNotifyApex && CharacterOwner->Controller && (Velocity.Z <= 0.f) )
+		if( bNotifyApex && (Velocity.Z <= 0.f) )
 		{
 			// Just passed jump apex since now going down
 			bNotifyApex = false;
@@ -4316,7 +4350,7 @@ void UCharacterMovementComponent::StartFalling(int32 Iterations, float remaining
 void UCharacterMovementComponent::RevertMove(const FVector& OldLocation, UPrimitiveComponent* OldBase, const FVector& PreviousBaseLocation, const FFindFloorResult& OldFloor, bool bFailMove)
 {
 	//UE_LOG(LogCharacterMovement, Log, TEXT("RevertMove from %f %f %f to %f %f %f"), CharacterOwner->Location.X, CharacterOwner->Location.Y, CharacterOwner->Location.Z, OldLocation.X, OldLocation.Y, OldLocation.Z);
-	UpdatedComponent->SetWorldLocation(OldLocation, false);
+	UpdatedComponent->SetWorldLocation(OldLocation, false, nullptr, GetTeleportType());
 	
 	//UE_LOG(LogCharacterMovement, Log, TEXT("Now at %f %f %f"), CharacterOwner->Location.X, CharacterOwner->Location.Y, CharacterOwner->Location.Z);
 	bJustTeleported = false;
@@ -6594,7 +6628,7 @@ void UCharacterMovementComponent::VisualizeMovement() const
 		DrawDebugDirectionalArrow(GetWorld(), DebugLocation, DebugLocation + Velocity, 
 			100.f, DebugColor, false, -1.f, (uint8)'\000', 10.f);
 
-		FString DebugText = FString::Printf(TEXT("Velocity: %s (Speed: %.2f)"), *Velocity.ToCompactString(), Velocity.Size());
+		FString DebugText = FString::Printf(TEXT("Velocity: %s (Speed: %.2f) (Max: %.2f)"), *Velocity.ToCompactString(), Velocity.Size(), GetMaxSpeed());
 		DrawDebugString(GetWorld(), DebugLocation + FVector(0.f,0.f,5.f), DebugText, nullptr, DebugColor, 0.f, true);
 	}
 
@@ -6766,7 +6800,7 @@ void UCharacterMovementComponent::SmoothCorrection(const FVector& OldLocation, c
 	}
 	else if (NetworkSmoothingMode == ENetworkSmoothingMode::Disabled)
 	{
-		UpdatedComponent->SetWorldLocationAndRotation(NewLocation, NewRotation);
+		UpdatedComponent->SetWorldLocationAndRotation(NewLocation, NewRotation, false, nullptr, ETeleportType::TeleportPhysics);
 		bNetworkSmoothingComplete = true;
 	}
 	else if (FNetworkPredictionData_Client_Character* ClientData = GetPredictionData_Client_Character())
@@ -6812,7 +6846,7 @@ void UCharacterMovementComponent::SmoothCorrection(const FVector& OldLocation, c
 			// Move the capsule, but not the mesh.
 			// Note: we don't change rotation, we lerp towards it in SmoothClientPosition.
 			const FScopedPreventAttachedComponentMove PreventMeshMove(CharacterOwner->GetMesh());
-			UpdatedComponent->SetWorldLocation(NewLocation);
+			UpdatedComponent->SetWorldLocation(NewLocation, false, nullptr, GetTeleportType());
 		}
 		else
 		{
@@ -6822,7 +6856,7 @@ void UCharacterMovementComponent::SmoothCorrection(const FVector& OldLocation, c
 			ClientData->MeshRotationTarget = FQuat::Identity;
 
 			const FScopedPreventAttachedComponentMove PreventMeshMove(CharacterOwner->GetMesh());
-			UpdatedComponent->SetWorldLocationAndRotation(NewLocation, NewRotation);
+			UpdatedComponent->SetWorldLocationAndRotation(NewLocation, NewRotation, false, nullptr, GetTeleportType());
 		}
 	
 		//////////////////////////////////////////////////////////////////////////
@@ -6921,8 +6955,10 @@ FArchive& operator<<( FArchive& Ar, FCharacterReplaySample& V )
 	V.Rotation.SerializeCompressed( Ar );
 	Ar << V.RemoteViewPitch;
 
-	//V.Rotation.SerializeCompressedShort( Ar );
-	//Ar << V.Location << V.Velocity << V.Acceleration << V.Rotation;
+	if (Ar.IsSaving() || (!Ar.AtEnd() && !Ar.IsError()))
+	{
+		Ar << V.Time;
+	}
 
 	return Ar;
 }
@@ -7090,7 +7126,10 @@ void UCharacterMovementComponent::SmoothClientPosition_Interpolate(float DeltaSe
 
 					( *ExternalReplayData )[i].Reader << ReplaySample;
 
-					ReplaySample.Time = ( *ExternalReplayData )[i].TimeSeconds;
+					if (FMath::IsNearlyZero(ReplaySample.Time))
+					{
+						ReplaySample.Time = ( *ExternalReplayData )[i].TimeSeconds;
+					}
 
 					ClientData->ReplaySamples.Add( ReplaySample );
 				}
@@ -7138,7 +7177,7 @@ void UCharacterMovementComponent::SmoothClientPosition_Interpolate(float DeltaSe
 					const FRotator Rotator1( FRotator::DecompressAxisFromByte( ReplaySample1.RemoteViewPitch ), 0.0f, 0.0f );
 					const FRotator Rotator2( FRotator::DecompressAxisFromByte( ReplaySample2.RemoteViewPitch ), 0.0f, 0.0f );
 					const FRotator FinalPitch = FQuat::FastLerp( FQuat( Rotator1 ), FQuat( Rotator2 ), LerpPercent ).GetNormalized().Rotator();
-					CharacterOwner->RemoteViewPitch = FRotator::CompressAxisToByte( FinalPitch.Pitch );
+					CharacterOwner->BlendedReplayViewPitch = FinalPitch.Pitch;
 
 					UpdateComponentVelocity();
 
@@ -7163,7 +7202,7 @@ void UCharacterMovementComponent::SmoothClientPosition_Interpolate(float DeltaSe
 
 						const FVector DebugLocation = CharacterOwner->GetMesh()->GetComponentLocation() + FVector( 0.f, 0.f, 300.0f ) - CharacterOwner->GetBaseTranslationOffset();
 
-						FString DebugText = FString::Printf( TEXT( "Lerp: %2.2f, %i" ), LerpPercent, CharacterOwner->RemoteViewPitch );
+						FString DebugText = FString::Printf( TEXT( "Lerp: %2.2f, %2.2f" ), LerpPercent, CharacterOwner->BlendedReplayViewPitch);
 						DrawDebugString( GetWorld(), DebugLocation, DebugText, nullptr, DebugColor, 0.f, true );
 						DrawDebugBox( GetWorld(), DebugLocation, FVector( 45, 45, 45 ), CharacterOwner->GetMesh()->GetComponentQuat(), FColor( 0, 255, 0 ) );
 
@@ -7192,9 +7231,9 @@ void UCharacterMovementComponent::SmoothClientPosition_Interpolate(float DeltaSe
 
 				const FCharacterReplaySample& ReplaySample = ClientData->ReplaySamples[BestSample];
 
-				Velocity						= ReplaySample.Velocity;
-				Acceleration					= ReplaySample.Acceleration;
-				CharacterOwner->RemoteViewPitch = ReplaySample.RemoteViewPitch;
+				Velocity								= ReplaySample.Velocity;
+				Acceleration							= ReplaySample.Acceleration;
+				CharacterOwner->BlendedReplayViewPitch	= FRotator::DecompressAxisFromByte(ReplaySample.RemoteViewPitch);
 
 				UpdateComponentVelocity();
 
@@ -7337,12 +7376,12 @@ void UCharacterMovementComponent::SmoothClientPosition_UpdateVisuals()
 				if (UpdatedComponent->RelativeRotation == OldRotation)
 				{
 					Mesh->RelativeLocation = OldLocation;
-					Mesh->SetRelativeLocation(NewRelLocation);
+					Mesh->SetRelativeLocation(NewRelLocation, false, nullptr, GetTeleportType());
 				}
 			}
 			else
 			{
-				Mesh->SetRelativeLocation(NewRelLocation);
+				Mesh->SetRelativeLocation(NewRelLocation, false, nullptr, GetTeleportType());
 			}
 		}
 		else if (NetworkSmoothingMode == ENetworkSmoothingMode::Exponential)
@@ -7350,13 +7389,13 @@ void UCharacterMovementComponent::SmoothClientPosition_UpdateVisuals()
 			// Adjust mesh location and rotation
 			const FVector NewRelTranslation = UpdatedComponent->GetComponentToWorld().InverseTransformVectorNoScale(ClientData->MeshTranslationOffset) + CharacterOwner->GetBaseTranslationOffset();
 			const FQuat NewRelRotation = ClientData->MeshRotationOffset * CharacterOwner->GetBaseRotationOffset();
-			Mesh->SetRelativeLocationAndRotation(NewRelTranslation, NewRelRotation);
+			Mesh->SetRelativeLocationAndRotation(NewRelTranslation, NewRelRotation, false, nullptr, GetTeleportType());
 		}
 		else if ( NetworkSmoothingMode == ENetworkSmoothingMode::Replay )
 		{
 			if ( !UpdatedComponent->GetComponentQuat().Equals( ClientData->MeshRotationOffset, SCENECOMPONENT_QUAT_TOLERANCE ) || !UpdatedComponent->GetComponentLocation().Equals( ClientData->MeshTranslationOffset, KINDA_SMALL_NUMBER ) )
 			{
-				UpdatedComponent->SetWorldLocationAndRotation( ClientData->MeshTranslationOffset, ClientData->MeshRotationOffset );
+				UpdatedComponent->SetWorldLocationAndRotation( ClientData->MeshTranslationOffset, ClientData->MeshRotationOffset, false, nullptr, GetTeleportType());
 			}
 		}
 		else
@@ -7708,18 +7747,7 @@ void UCharacterMovementComponent::ReplicateMoveToServer(float DeltaTime, const F
 				FScopedMovementUpdate ScopedMovementUpdate(UpdatedComponent, EScopedUpdate::DeferredUpdates);
 				UE_LOG(LogNetPlayerMovement, VeryVerbose, TEXT("CombineMove: add delta %f + %f and revert from %f %f to %f %f"), DeltaTime, PendingMove->DeltaTime, UpdatedComponent->GetComponentLocation().X, UpdatedComponent->GetComponentLocation().Y, OldStartLocation.X, OldStartLocation.Y);
 
-				// to combine move, first revert pawn position to PendingMove start position, before playing combined move on client
-				const bool bNoCollisionCheck = true;
-				UpdatedComponent->SetWorldLocationAndRotation(OldStartLocation, PendingMove->StartRotation, false);
-				Velocity = PendingMove->StartVelocity;
-
-				SetBase(PendingMove->StartBase.Get(), PendingMove->StartBoneName);
-				CurrentFloor = PendingMove->StartFloor;
-
-				// Now that we have reverted to the old position, prepare a new move from that position,
-				// using our current velocity, acceleration, and rotation, but applied over the combined time from the old and new move.
-
-				NewMove->DeltaTime += PendingMove->DeltaTime;
+				NewMove->CombineWith(PendingMove, CharacterOwner, PC, OldStartLocation);
 
 				if (PC)
 				{
@@ -7743,9 +7771,13 @@ void UCharacterMovementComponent::ReplicateMoveToServer(float DeltaTime, const F
 			}
 			else
 			{
-				//UE_LOG(LogNet, Log, TEXT("Not combining move, would collide at start location"));
+				UE_LOG(LogNetPlayerMovement, Log, TEXT("Not combining move [would collide at start location]"));
 			}
 		}
+		else
+		{
+			UE_LOG(LogNetPlayerMovement, Log, TEXT("Not combining move [not allowed by CanCombineWith()]"));
+		}
 	}
 
 	// Acceleration should match what we send to the server, plus any other restrictions the server also enforces (see MoveAutonomous).
@@ -7847,7 +7879,7 @@ void UCharacterMovementComponent::CallServerMove
 				ClientYawPitchINT,
 				ClientMovementBase,
 				ClientBaseBone,
-				NewMove->MovementMode
+				NewMove->EndPackedMovementMode
 				);
 		}
 		else
@@ -7866,7 +7898,7 @@ void UCharacterMovementComponent::CallServerMove
 				ClientYawPitchINT,
 				ClientMovementBase,
 				ClientBaseBone,
-				NewMove->MovementMode
+				NewMove->EndPackedMovementMode
 				);
 		}
 	}
@@ -7881,7 +7913,7 @@ void UCharacterMovementComponent::CallServerMove
 			ClientYawPitchINT,
 			ClientMovementBase,
 			ClientBaseBone,
-			NewMove->MovementMode
+			NewMove->EndPackedMovementMode
 			);
 	}
 
@@ -7903,6 +7935,9 @@ void UCharacterMovementComponent::ServerMoveOld_Implementation
 	uint8 OldMoveFlags
 	)
 {
+	SCOPE_CYCLE_COUNTER(STAT_CharacterMovementServerMove);
+	CSV_SCOPED_TIMING_STAT(CharacterMovement, CharacterMovementServerMove);
+
 	if (!HasValidData() || !IsActive())
 	{
 		return;
@@ -7913,6 +7948,7 @@ void UCharacterMovementComponent::ServerMoveOld_Implementation
 
 	if( !VerifyClientTimeStamp(OldTimeStamp, *ServerData) )
 	{
+		UE_LOG(LogNetPlayerMovement, Verbose, TEXT("ServerMoveOld: TimeStamp expired. %f, CurrentTimeStamp: %f"), OldTimeStamp, ServerData->CurrentClientTimeStamp);
 		return;
 	}
 
@@ -7999,10 +8035,6 @@ bool UCharacterMovementComponent::VerifyClientTimeStamp(float TimeStamp, FNetwor
 		{
 			UE_LOG(LogNetPlayerMovement, Log, TEXT("TimeStamp expired. Before TimeStamp Reset. CurrentTimeStamp: %f, TimeStamp: %f"), ServerData.CurrentClientTimeStamp, TimeStamp);
 		}
-		else
-		{
-			UE_LOG(LogNetPlayerMovement, Log, TEXT("TimeStamp expired. %f, CurrentTimeStamp: %f"), TimeStamp, ServerData.CurrentClientTimeStamp);
-		}
 		return false;
 	}
 }
@@ -8277,6 +8309,9 @@ void UCharacterMovementComponent::ServerMove_Implementation(
 	FName ClientBaseBoneName,
 	uint8 ClientMovementMode)
 {
+	SCOPE_CYCLE_COUNTER(STAT_CharacterMovementServerMove);
+	CSV_SCOPED_TIMING_STAT(CharacterMovement, CharacterMovementServerMove);
+
 	if (!HasValidData() || !IsActive())
 	{
 		return;
@@ -8287,6 +8322,7 @@ void UCharacterMovementComponent::ServerMove_Implementation(
 
 	if( !VerifyClientTimeStamp(TimeStamp, *ServerData) )
 	{
+		UE_LOG(LogNetPlayerMovement, Log, TEXT("ServerMove: TimeStamp expired. %f, CurrentTimeStamp: %f"), TimeStamp, ServerData->CurrentClientTimeStamp);
 		return;
 	}
 
@@ -8837,7 +8873,7 @@ void UCharacterMovementComponent::ClientAdjustPosition_Implementation
 	OnClientCorrectionReceived(*ClientData, TimeStamp, NewLocation, NewVelocity, NewBase, NewBaseBoneName, bHasBase, bBaseRelativePosition, ServerMovementMode);
 
 	// Trust the server's positioning.
-	UpdatedComponent->SetWorldLocation(WorldShiftedNewLocation, false);
+	UpdatedComponent->SetWorldLocation(WorldShiftedNewLocation, false, nullptr, ETeleportType::TeleportPhysics);
 	Velocity = NewVelocity;
 
 	// Trust the server's movement mode
@@ -9116,7 +9152,7 @@ void UCharacterMovementComponent::ClientAckGoodMove_Implementation(float TimeSta
 	{
 		if( ClientData->LastAckedMove.IsValid() )
 		{
-			UE_LOG(LogNetPlayerMovement, Warning, TEXT("ClientAckGoodMove_Implementation could not find Move for TimeStamp: %f, LastAckedTimeStamp: %f, CurrentTimeStamp: %f"), TimeStamp, ClientData->LastAckedMove->TimeStamp, ClientData->CurrentTimeStamp);
+			UE_LOG(LogNetPlayerMovement, Log, TEXT("ClientAckGoodMove_Implementation could not find Move for TimeStamp: %f, LastAckedTimeStamp: %f, CurrentTimeStamp: %f"), TimeStamp, ClientData->LastAckedMove->TimeStamp, ClientData->CurrentTimeStamp);
 		}
 		return;
 	}
@@ -10004,6 +10040,7 @@ FSavedMove_Character::FSavedMove_Character()
 	AccelMagThreshold = 1.f;
 	AccelDotThreshold = 0.9f;
 	AccelDotThresholdCombine = 0.996f; // approx 5 degrees.
+	MaxSpeedThresholdCombine = 10.0f;
 }
 
 FSavedMove_Character::~FSavedMove_Character()
@@ -10017,15 +10054,18 @@ void FSavedMove_Character::Clear()
 	bForceMaxAccel = false;
 	bForceNoCombine = false;
 	bOldTimeStampBeforeReset = false;
+	bWasJumping = false;
 
 	TimeStamp = 0.f;
 	DeltaTime = 0.f;
 	CustomTimeDilation = 1.0f;
 	JumpKeyHoldTime = 0.0f;
+	JumpForceTimeRemaining = 0.0f;
 	JumpCurrentCount = 0;
 	JumpMaxCount = 1;
-	MovementMode = 0;
+	MovementMode = 0; // Deprecated, keep backwards compat until removed
 
+	StartPackedMovementMode = 0;
 	StartLocation = FVector::ZeroVector;
 	StartRelativeLocation = FVector::ZeroVector;
 	StartVelocity = FVector::ZeroVector;
@@ -10043,12 +10083,17 @@ void FSavedMove_Character::Clear()
 	SavedLocation = FVector::ZeroVector;
 	SavedRotation = FRotator::ZeroRotator;
 	SavedRelativeLocation = FVector::ZeroVector;
-	Acceleration = FVector::ZeroVector;
 	SavedControlRotation = FRotator::ZeroRotator;
+	Acceleration = FVector::ZeroVector;
+	MaxSpeed = 0.0f;
+	AccelMag = 0.0f;
+	AccelNormal = FVector::ZeroVector;
+
 	EndBase = NULL;
 	EndBoneName = NAME_None;
 	EndActorOverlapCounter = 0;
 	EndComponentOverlapCounter = 0;
+	EndPackedMovementMode = 0;
 
 	RootMotionMontage = NULL;
 	RootMotionTrackPosition = 0.f;
@@ -10060,6 +10105,7 @@ void FSavedMove_Character::Clear()
 
 void FSavedMove_Character::SetMoveFor(ACharacter* Character, float InDeltaTime, FVector const& NewAccel, class FNetworkPredictionData_Client_Character & ClientData)
 {
+	CharacterOwner = Character;
 	DeltaTime = InDeltaTime;
 	
 	SetInitialPosition(Character);
@@ -10070,18 +10116,17 @@ void FSavedMove_Character::SetMoveFor(ACharacter* Character, float InDeltaTime,
 	// Round value, so that client and server match exactly (and so we can send with less bandwidth). This rounded value is copied back to the client in ReplicateMoveToServer.
 	// This is done after the AccelMag and AccelNormal are computed above, because those are only used client-side for combining move logic and need to remain accurate.
 	Acceleration = Character->GetCharacterMovement()->RoundAcceleration(NewAccel);
-
-	bPressedJump = Character->bPressedJump;
-	JumpKeyHoldTime = Character->JumpKeyHoldTime;
-	JumpMaxCount = Character->JumpMaxCount;
 	
+	MaxSpeed = Character->GetCharacterMovement()->GetMaxSpeed();
+
 	// CheckJumpInput will increment JumpCurrentCount.
 	// Therefore, for replicated moves we want it to set it at 1 less to properly
 	// handle the change.
 	JumpCurrentCount = Character->JumpCurrentCount > 0 ? Character->JumpCurrentCount - 1 : 0;
 	bWantsToCrouch = Character->GetCharacterMovement()->bWantsToCrouch;
 	bForceMaxAccel = Character->GetCharacterMovement()->bForceMaxAccel;
-	MovementMode = Character->GetCharacterMovement()->PackNetworkMovementMode();
+	StartPackedMovementMode = Character->GetCharacterMovement()->PackNetworkMovementMode();
+	MovementMode = StartPackedMovementMode; // Deprecated, keep backwards compat until removed
 
 	// Root motion source-containing moves should never be combined
 	// Main discovered issue being a move without root motion combining with
@@ -10126,13 +10171,21 @@ void FSavedMove_Character::SetInitialPosition(ACharacter* Character)
 
 	StartControlRotation = Character->GetControlRotation().Clamp();
 	Character->GetCapsuleComponent()->GetScaledCapsuleSize(StartCapsuleRadius, StartCapsuleHalfHeight);
+
+	// Jump state
+	bPressedJump = Character->bPressedJump;
+	bWasJumping = Character->bWasJumping;
+	JumpKeyHoldTime = Character->JumpKeyHoldTime;
+	JumpForceTimeRemaining = Character->JumpForceTimeRemaining;
+	JumpMaxCount = Character->JumpMaxCount;
 }
 
 void FSavedMove_Character::PostUpdate(ACharacter* Character, FSavedMove_Character::EPostUpdateMode PostUpdateMode)
 {
 	// Common code for both recording and after a replay.
 	{
-		MovementMode = Character->GetCharacterMovement()->PackNetworkMovementMode();
+		EndPackedMovementMode = Character->GetCharacterMovement()->PackNetworkMovementMode();
+		MovementMode = EndPackedMovementMode; // Deprecated, keep backwards compat until removed
 		SavedLocation = Character->GetActorLocation();
 		SavedRotation = Character->GetActorRotation();
 		SavedVelocity = Character->GetVelocity();
@@ -10207,7 +10260,12 @@ bool FSavedMove_Character::IsImportantMove(const FSavedMovePtr& LastAckedMovePtr
 		return true;
 	}
 
-	if (MovementMode != LastAckedMove->MovementMode)
+	if (StartPackedMovementMode != LastAckedMove->EndPackedMovementMode)
+	{
+		return true;
+	}
+
+	if (EndPackedMovementMode != LastAckedMove->EndPackedMovementMode)
 	{
 		return true;
 	}
@@ -10237,8 +10295,16 @@ FVector FSavedMove_Character::GetRevertedLocation() const
 	return StartLocation;
 }
 
-bool UCharacterMovementComponent::CanDelaySendingMove(const FSavedMovePtr& NewMove)
+bool UCharacterMovementComponent::CanDelaySendingMove(const FSavedMovePtr& NewMovePtr)
 {
+	const FSavedMove_Character* NewMove = NewMovePtr.Get();
+
+	// Don't delay moves that change movement mode over the course of the move.
+	if (NewMove->StartPackedMovementMode != NewMove->EndPackedMovementMode)
+	{
+		return false;
+	}
+
 	return true;
 }
 
@@ -10302,7 +10368,7 @@ bool FSavedMove_Character::CanCombineWith(const FSavedMovePtr& NewMovePtr, AChar
 		{
 			return false;
 		}
-			
+
 		if (!FVector::Coincident(AccelNormal, NewMove->AccelNormal, AccelDotThresholdCombine))
 		{
 			return false;
@@ -10315,7 +10381,29 @@ bool FSavedMove_Character::CanCombineWith(const FSavedMovePtr& NewMovePtr, AChar
 		return false;
 	}
 
-	if (bPressedJump || NewMove->bPressedJump)
+	if (!FMath::IsNearlyEqual(MaxSpeed, NewMove->MaxSpeed, MaxSpeedThresholdCombine))
+	{
+		return false;
+	}
+
+	if ((MaxSpeed == 0.0f) != (NewMove->MaxSpeed == 0.0f))
+	{
+		return false;
+	}
+
+	// Don't combine on changes to/from zero JumpKeyHoldTime.
+	if ((JumpKeyHoldTime == 0.f) != (NewMove->JumpKeyHoldTime == 0.f))
+	{
+		return false;
+	}
+
+	if ((bWasJumping != NewMove->bWasJumping) || (JumpCurrentCount != NewMove->JumpCurrentCount) || (JumpMaxCount != NewMove->JumpMaxCount))
+	{
+		return false;
+	}
+	
+	// Don't combine on changes to/from zero.
+	if ((JumpForceTimeRemaining == 0.f) != (NewMove->JumpForceTimeRemaining == 0.f))
 	{
 		return false;
 	}
@@ -10336,7 +10424,7 @@ bool FSavedMove_Character::CanCombineWith(const FSavedMovePtr& NewMovePtr, AChar
 		return false;
 	}
 
-	if (MovementMode != NewMove->MovementMode)
+	if (EndPackedMovementMode != NewMove->StartPackedMovementMode)
 	{
 		return false;
 	}
@@ -10371,6 +10459,29 @@ bool FSavedMove_Character::CanCombineWith(const FSavedMovePtr& NewMovePtr, AChar
 	return true;
 }
 
+void FSavedMove_Character::CombineWith(const FSavedMove_Character* OldMove, ACharacter* InCharacter, APlayerController* PC, const FVector& OldStartLocation)
+{
+	UCharacterMovementComponent* CharMovement = InCharacter->GetCharacterMovement();
+
+	// to combine move, first revert pawn position to PendingMove start position, before playing combined move on client
+	CharMovement->UpdatedComponent->SetWorldLocationAndRotation(OldStartLocation, OldMove->StartRotation, false, nullptr, CharMovement->GetTeleportType());
+	CharMovement->Velocity = OldMove->StartVelocity;
+
+	CharMovement->SetBase(OldMove->StartBase.Get(), OldMove->StartBoneName);
+	CharMovement->CurrentFloor = OldMove->StartFloor;
+
+	// Now that we have reverted to the old position, prepare a new move from that position,
+	// using our current velocity, acceleration, and rotation, but applied over the combined time from the old and new move.
+
+	// Combine times for both moves
+	DeltaTime += OldMove->DeltaTime;
+
+	// Roll back jump force counters. SetInitialPosition() below will copy them to the saved move.
+	// Changes in certain counters like JumpCurrentCount don't allow move combining, so no need to roll those back (they are the same).
+	InCharacter->JumpForceTimeRemaining = OldMove->JumpForceTimeRemaining;
+	InCharacter->JumpKeyHoldTime = OldMove->JumpKeyHoldTime;
+}
+
 void FSavedMove_Character::PrepMoveFor(ACharacter* Character)
 {
 	if( RootMotionMontage != NULL )
@@ -10414,7 +10525,9 @@ void FSavedMove_Character::PrepMoveFor(ACharacter* Character)
 	}
 
 	Character->GetCharacterMovement()->bForceMaxAccel = bForceMaxAccel;
+	Character->bWasJumping = bWasJumping;
 	Character->JumpKeyHoldTime = JumpKeyHoldTime;
+	Character->JumpForceTimeRemaining = JumpForceTimeRemaining;
 	Character->JumpMaxCount = JumpMaxCount;
 	Character->JumpCurrentCount = JumpCurrentCount;
 }
@@ -10444,20 +10557,30 @@ void UCharacterMovementComponent::UpdateFromCompressedFlags(uint8 Flags)
 		return;
 	}
 
+	const bool bWasPressingJump = CharacterOwner->bPressedJump;
+
 	CharacterOwner->bPressedJump = ((Flags & FSavedMove_Character::FLAG_JumpPressed) != 0);
 	bWantsToCrouch = ((Flags & FSavedMove_Character::FLAG_WantsToCrouch) != 0);
 
-	// Reset JumpKeyHoldTime when player releases Jump key on server as well, similar to StopJumping().
-	if (!CharacterOwner->bPressedJump && CharacterOwner->Role == ROLE_Authority)
+	// Detect change in jump press on the server
+	if (CharacterOwner->Role == ROLE_Authority) 
 	{
-		CharacterOwner->ResetJumpState();
+		const bool bIsPressingJump = CharacterOwner->bPressedJump;
+		if (bIsPressingJump && !bWasPressingJump)
+		{
+			CharacterOwner->Jump();
+		}
+		else if (!bIsPressingJump)
+		{
+			CharacterOwner->StopJumping();
+		}
 	}
 }
 
 void UCharacterMovementComponent::FlushServerMoves()
 {
 	// Send pendingMove to server if this character is replicating movement
-	if (CharacterOwner && CharacterOwner->bReplicateMovement)
+	if (CharacterOwner && CharacterOwner->bReplicateMovement && (CharacterOwner->Role == ROLE_AutonomousProxy))
 	{
 		FNetworkPredictionData_Client_Character* ClientData = GetPredictionData_Client_Character();
 		if (!ClientData)
@@ -10465,16 +10588,24 @@ void UCharacterMovementComponent::FlushServerMoves()
 			return;
 		}
 
-		if (ClientData->PendingMove.IsValid() != false)
+		if (ClientData->PendingMove.IsValid())
 		{
 			const UWorld* MyWorld = GetWorld();
-
 			ClientData->ClientUpdateTime = MyWorld->TimeSeconds;
 
 			FSavedMovePtr NewMove = ClientData->PendingMove;
-
 			ClientData->PendingMove = nullptr;
+
+			UE_CLOG(CharacterOwner && UpdatedComponent, LogNetPlayerMovement, Verbose, TEXT("ClientMove (Flush) Time %f Acceleration %s Velocity %s Position %s DeltaTime %f Mode %s MovementBase %s.%s (Dynamic:%d) DualMove? %d"),
+				NewMove->TimeStamp, *NewMove->Acceleration.ToString(), *Velocity.ToString(), *UpdatedComponent->GetComponentLocation().ToString(), NewMove->DeltaTime, *GetMovementName(),
+				*GetNameSafe(NewMove->EndBase.Get()), *NewMove->EndBoneName.ToString(), MovementBaseUtility::IsDynamicBase(NewMove->EndBase.Get()) ? 1 : 0, ClientData->PendingMove.IsValid() ? 1 : 0);
+
 			CallServerMove(NewMove.Get(), nullptr);
 		}
 	}
 }
+
+ETeleportType UCharacterMovementComponent::GetTeleportType() const
+{ 
+	return bJustTeleported || bNetworkLargeClientCorrection ? ETeleportType::TeleportPhysics : ETeleportType::None;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/Components/ChildActorComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/ChildActorComponent.cpp
index ec8580e61b58..80575bc3240e 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/ChildActorComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/ChildActorComponent.cpp
@@ -452,6 +452,7 @@ void UChildActorComponent::SetChildActorClass(TSubclassOf<AActor> Class)
 	}
 	else if (IsRegistered())
 	{
+		ChildActorName = NAME_None;
 		DestroyChildActor();
 		CreateChildActor();
 	}
@@ -626,8 +627,7 @@ void UChildActorComponent::DestroyChildActor()
 
 				// We would like to make certain that our name is not going to accidentally get taken from us while we're destroyed
 				// so we increment ClassUnique beyond our index to be certain of it.  This is ... a bit hacky.
-				int32& ClassUnique = ChildActor->GetOutermost()->GetClassUniqueNameIndexMap().FindOrAdd(ChildClass->GetFName());
-				ClassUnique = FMath::Max(ClassUnique, ChildActor->GetFName().GetNumber());
+				UpdateSuffixForNextNewObject(ChildActor->GetOuter(), ChildClass, [this](int32& Index) { Index = FMath::Max(Index, ChildActor->GetFName().GetNumber()); });
 
 				// If we are getting here due to garbage collection we can't rename, so we'll have to abandon this child actor name and pick up a new one
 				if (!IsGarbageCollecting())
diff --git a/Engine/Source/Runtime/Engine/Private/Components/DecalComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/DecalComponent.cpp
index 50c1ac429e87..b49b159db3df 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/DecalComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/DecalComponent.cpp
@@ -119,6 +119,11 @@ void UDecalComponent::Serialize(FArchive& Ar)
 	}
 }
 
+bool UDecalComponent::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UDecalComponent::SetLifeSpan(const float LifeSpan)
 {
 	if (LifeSpan > 0.f)
diff --git a/Engine/Source/Runtime/Engine/Private/Components/MovementComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/MovementComponent.cpp
index 93aa2ce4490c..80a2c12d55db 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/MovementComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/MovementComponent.cpp
@@ -518,12 +518,12 @@ bool UMovementComponent::K2_MoveUpdatedComponent(FVector Delta, FRotator NewRota
 	return SafeMoveUpdatedComponent(Delta, NewRotation.Quaternion(), bSweep, OutHit, TeleportFlagToEnum(bTeleport));
 }
 
-
+namespace MovementComponentCVars
+{
 // Typically we want to depenetrate regardless of direction, so we can get all the way out of penetration quickly.
 // Our rules for "moving with depenetration normal" only get us so far out of the object. We'd prefer to pop out by the full MTD amount.
 // Depenetration moves (in ResolvePenetration) then ignore blocking overlaps to be able to move out by the MTD amount.
 static int32 MoveIgnoreFirstBlockingOverlap = 0;
-
 static FAutoConsoleVariableRef CVarMoveIgnoreFirstBlockingOverlap(
 	TEXT("p.MoveIgnoreFirstBlockingOverlap"),
 	MoveIgnoreFirstBlockingOverlap,
@@ -531,7 +531,7 @@ static FAutoConsoleVariableRef CVarMoveIgnoreFirstBlockingOverlap(
 	TEXT("The 'p.InitialOverlapTolerance' setting determines the 'move out' rules, but by default we always try to depenetrate first (not ignore the hit).\n")
 	TEXT("0: Disable (do not ignore), 1: Enable (ignore)"),
 	ECVF_Default);
-
+}
 
 bool UMovementComponent::SafeMoveUpdatedComponent(const FVector& Delta, const FQuat& NewRotation, bool bSweep, FHitResult& OutHit, ETeleportType Teleport)
 {
@@ -547,7 +547,7 @@ bool UMovementComponent::SafeMoveUpdatedComponent(const FVector& Delta, const FQ
 	{
 		// Conditionally ignore blocking overlaps (based on CVar)
 		const EMoveComponentFlags IncludeBlockingOverlapsWithoutEvents = (MOVECOMP_NeverIgnoreBlockingOverlaps | MOVECOMP_DisableBlockingOverlapDispatch);
-		TGuardValue<EMoveComponentFlags> ScopedFlagRestore(MoveComponentFlags, MoveIgnoreFirstBlockingOverlap ? MoveComponentFlags : (MoveComponentFlags | IncludeBlockingOverlapsWithoutEvents));
+		TGuardValue<EMoveComponentFlags> ScopedFlagRestore(MoveComponentFlags, MovementComponentCVars::MoveIgnoreFirstBlockingOverlap ? MoveComponentFlags : (MoveComponentFlags | IncludeBlockingOverlapsWithoutEvents));
 		bMoveResult = MoveUpdatedComponent(Delta, NewRotation, bSweep, &OutHit, Teleport);
 	}
 
@@ -565,17 +565,23 @@ bool UMovementComponent::SafeMoveUpdatedComponent(const FVector& Delta, const FQ
 	return bMoveResult;
 }
 
-static TAutoConsoleVariable<float> CVarPenetrationPullbackDistance(TEXT("p.PenetrationPullbackDistance"),
-	0.125f,
+
+namespace MovementComponentCVars
+{
+static float PenetrationPullbackDistance = 0.125f;
+static FAutoConsoleVariableRef CVarPenetrationPullbackDistance(TEXT("p.PenetrationPullbackDistance"),
+	PenetrationPullbackDistance,
 	TEXT("Pull out from penetration of an object by this extra distance.\n")
 	TEXT("Distance added to penetration fix-ups."),
 	ECVF_Default);
 
-static TAutoConsoleVariable<float> CVarPenetrationOverlapCheckInflation(TEXT("p.PenetrationOverlapCheckInflation"),
-	0.100,
+static float PenetrationOverlapCheckInflation = 0.100f;
+static FAutoConsoleVariableRef CVarPenetrationOverlapCheckInflation(TEXT("p.PenetrationOverlapCheckInflation"),
+	PenetrationOverlapCheckInflation,
 	TEXT("Inflation added to object when checking if a location is free of blocking collision.\n")
 	TEXT("Distance added to inflation in penetration overlap check."),
 	ECVF_Default);
+}
 
 FVector UMovementComponent::GetPenetrationAdjustment(const FHitResult& Hit) const
 {
@@ -585,7 +591,7 @@ FVector UMovementComponent::GetPenetrationAdjustment(const FHitResult& Hit) cons
 	}
 
 	FVector Result;
-	const float PullBackDistance = FMath::Abs(CVarPenetrationPullbackDistance.GetValueOnGameThread());
+	const float PullBackDistance = FMath::Abs(MovementComponentCVars::PenetrationPullbackDistance);
 	const float PenetrationDepth = (Hit.PenetrationDepth > 0.f ? Hit.PenetrationDepth : 0.125f);
 
 	Result = Hit.Normal * (PenetrationDepth + PullBackDistance);
@@ -599,6 +605,7 @@ bool UMovementComponent::ResolvePenetrationImpl(const FVector& ProposedAdjustmen
 	const FVector Adjustment = ConstrainDirectionToPlane(ProposedAdjustment);
 	if (!Adjustment.IsZero() && UpdatedPrimitive)
 	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_MovementComponent_ResolvePenetration);
 		// See if we can fit at the adjusted location without overlapping anything.
 		AActor* ActorOwner = UpdatedComponent->GetOwner();
 		if (!ActorOwner)
@@ -618,7 +625,7 @@ bool UMovementComponent::ResolvePenetrationImpl(const FVector& ProposedAdjustmen
 
 		// We really want to make sure that precision differences or differences between the overlap test and sweep tests don't put us into another overlap,
 		// so make the overlap test a bit more restrictive.
-		const float OverlapInflation = CVarPenetrationOverlapCheckInflation.GetValueOnGameThread();
+		const float OverlapInflation = MovementComponentCVars::PenetrationOverlapCheckInflation;
 		bool bEncroached = OverlapTest(Hit.TraceStart + Adjustment, NewRotationQuat, UpdatedPrimitive->GetCollisionObjectType(), UpdatedPrimitive->GetCollisionShape(OverlapInflation), ActorOwner);
 		if (!bEncroached)
 		{
diff --git a/Engine/Source/Runtime/Engine/Private/Components/PrimitiveComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/PrimitiveComponent.cpp
index 4831b492e394..54fc3450c3cb 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/PrimitiveComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/PrimitiveComponent.cpp
@@ -1090,6 +1090,14 @@ void UPrimitiveComponent::ReceiveComponentDamage(float DamageAmount, FDamageEven
 	}
 }
 
+void UPrimitiveComponent::PostInitProperties()
+{
+	Super::PostInitProperties();
+
+	// Apply any deferred collision profile name we have (set in the constructor).
+	BodyInstance.ApplyDeferredCollisionProfileName();
+}
+
 void UPrimitiveComponent::PostLoad()
 {
 	Super::PostLoad();
@@ -1292,7 +1300,7 @@ bool UPrimitiveComponent::ShouldCreatePhysicsState() const
 	if (!bShouldCreatePhysicsState)
 	{
 		UWorld* World = GetWorld();
-		if (World && World->bEnableTraceCollision)
+		if (World && World->bEnableTraceCollision && !GetComponentTransform().GetScale3D().IsNearlyZero())
 		{
 			bShouldCreatePhysicsState = true;
 		}
@@ -1543,7 +1551,7 @@ UMaterialInstanceDynamic* UPrimitiveComponent::CreateAndSetMaterialInstanceDynam
 	return NULL;
 }
 
-UMaterialInstanceDynamic* UPrimitiveComponent::CreateDynamicMaterialInstance(int32 ElementIndex, class UMaterialInterface* SourceMaterial)
+UMaterialInstanceDynamic* UPrimitiveComponent::CreateDynamicMaterialInstance(int32 ElementIndex, class UMaterialInterface* SourceMaterial, FName OptionalName)
 {
 	if (SourceMaterial)
 	{
@@ -1556,7 +1564,7 @@ UMaterialInstanceDynamic* UPrimitiveComponent::CreateDynamicMaterialInstance(int
 	if (MaterialInstance && !MID)
 	{
 		// Create and set the dynamic material instance.
-		MID = UMaterialInstanceDynamic::Create(MaterialInstance, this);
+		MID = UMaterialInstanceDynamic::Create(MaterialInstance, this, OptionalName);
 		SetMaterial(ElementIndex, MID);
 	}
 	else if (!MaterialInstance)
@@ -3456,7 +3464,7 @@ void UPrimitiveComponent::SetLODParentPrimitive(UPrimitiveComponent * InLODParen
 		return nullptr;
 	}();
 
-	if (ShouldGenerateAutoLOD(ParentLODActor ? ParentLODActor->LODLevel - 1 : INDEX_NONE))
+	if (!GIsEditor || ShouldGenerateAutoLOD(ParentLODActor ? ParentLODActor->LODLevel - 1 : INDEX_NONE))
 #endif
 	{
 		// @todo, what do we do with old parent. We can't just reset undo parent because the parent might be used by other primitive
diff --git a/Engine/Source/Runtime/Engine/Private/Components/ProjectileMovementComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/ProjectileMovementComponent.cpp
index c74ef6c09079..8628cf464755 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/ProjectileMovementComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/ProjectileMovementComponent.cpp
@@ -31,7 +31,8 @@ UProjectileMovementComponent::UProjectileMovementComponent(const FObjectInitiali
 	bWantsInitializeComponent = true;
 
 	MaxSimulationTimeStep = 0.05f;
-	MaxSimulationIterations = 8;
+	MaxSimulationIterations = 4;
+	BounceAdditionalIterations = 1;
 
 	bBounceAngleAffectsFriction = false;
 	bIsSliding = false;
@@ -120,22 +121,31 @@ void UProjectileMovementComponent::TickComponent(float DeltaTime, enum ELevelTic
 	}
 
 	float RemainingTime	= DeltaTime;
-	uint32 NumBounces = 0;
+	int32 NumImpacts = 0;
+	int32 NumBounces = 0;
+	int32 LoopCount = 0;
 	int32 Iterations = 0;
 	FHitResult Hit(1.f);
 	
 	while( RemainingTime >= MIN_TICK_TIME && (Iterations < MaxSimulationIterations) && !ActorOwner->IsPendingKill() && !HasStoppedSimulation() )
 	{
+		LoopCount++;
 		Iterations++;
 
 		// subdivide long ticks to more closely follow parabolic trajectory
+		const float InitialTimeRemaining = RemainingTime;
 		const float TimeTick = ShouldUseSubStepping() ? GetSimulationTimeStep(RemainingTime, Iterations) : RemainingTime;
 		RemainingTime -= TimeTick;
+		
+		// Logging
+		UE_LOG(LogProjectileMovement, Verbose, TEXT("Projectile %s: (Role: %d, Iteration %d, step %.3f, [%.3f / %.3f] cur/total) sim (Pos %s, Vel %s)"),
+			*GetNameSafe(ActorOwner), (int32)ActorOwner->Role, LoopCount, TimeTick, FMath::Max(0.f, DeltaTime - InitialTimeRemaining), DeltaTime,
+			*UpdatedComponent->GetComponentLocation().ToString(), *Velocity.ToString());
 
+		// Initial move state
 		Hit.Time = 1.f;
 		const FVector OldVelocity = Velocity;
 		const FVector MoveDelta = ComputeMoveDelta(OldVelocity, TimeTick);
-
 		const FQuat NewRotation = (bRotationFollowsVelocity && !OldVelocity.IsNearlyZero(0.01f)) ? OldVelocity.ToOrientationQuat() : UpdatedComponent->GetComponentQuat();
 
 		// Move the component
@@ -168,6 +178,10 @@ void UProjectileMovementComponent::TickComponent(float DeltaTime, enum ELevelTic
 			{
 				Velocity = ComputeVelocity(Velocity, TimeTick);				
 			}
+
+			// Logging
+			UE_LOG(LogProjectileMovement, VeryVerbose, TEXT("Projectile %s: (Role: %d, Iteration %d, step %.3f) no hit (Pos %s, Vel %s)"),
+				*GetNameSafe(ActorOwner), (int32)ActorOwner->Role, LoopCount, TimeTick, *UpdatedComponent->GetComponentLocation().ToString(), *Velocity.ToString());
 		}
 		else
 		{
@@ -178,7 +192,12 @@ void UProjectileMovementComponent::TickComponent(float DeltaTime, enum ELevelTic
 				Velocity = (Hit.Time > KINDA_SMALL_NUMBER) ? ComputeVelocity(OldVelocity, TimeTick * Hit.Time) : OldVelocity;
 			}
 
+			// Logging
+			UE_CLOG(UpdatedComponent != nullptr, LogProjectileMovement, VeryVerbose, TEXT("Projectile %s: (Role: %d, Iteration %d, step %.3f) new hit at t=%.3f: (Pos %s, Vel %s)"),
+				*GetNameSafe(ActorOwner), (int32)ActorOwner->Role, LoopCount, TimeTick, Hit.Time, *UpdatedComponent->GetComponentLocation().ToString(), *Velocity.ToString());
+
 			// Handle blocking hit
+			NumImpacts++;
 			float SubTickTimeRemaining = TimeTick * (1.f - Hit.Time);
 			const EHandleBlockingHitResult HandleBlockingResult = HandleBlockingHit(Hit, TimeTick, MoveDelta, SubTickTimeRemaining);
 			if (HandleBlockingResult == EHandleBlockingHitResult::Abort || HasStoppedSimulation())
@@ -203,12 +222,24 @@ void UProjectileMovementComponent::TickComponent(float DeltaTime, enum ELevelTic
 				checkNoEntry();
 			}
 			
+			// Logging
+			UE_CLOG(UpdatedComponent != nullptr, LogProjectileMovement, VeryVerbose, TEXT("Projectile %s: (Role: %d, Iteration %d, step %.3f) deflect at t=%.3f: (Pos %s, Vel %s)"),
+				*GetNameSafe(ActorOwner), (int32)ActorOwner->Role, Iterations, TimeTick, Hit.Time, *UpdatedComponent->GetComponentLocation().ToString(), *Velocity.ToString());
 			
-			// A few initial bounces should add more time and iterations to complete most of the simulation.
-			if (NumBounces <= 2 && SubTickTimeRemaining >= MIN_TICK_TIME)
+			// Add unprocessed time after impact
+			if (SubTickTimeRemaining >= MIN_TICK_TIME)
 			{
 				RemainingTime += SubTickTimeRemaining;
-				Iterations--;
+
+				// A few initial impacts should possibly allow more iterations to complete more of the simulation.
+				if (NumImpacts <= BounceAdditionalIterations)
+				{
+					Iterations--;
+
+					// Logging
+					UE_LOG(LogProjectileMovement, Verbose, TEXT("Projectile %s: (Role: %d, Iteration %d, step %.3f) allowing extra iteration after bounce %u (t=%.3f, adding %.3f secs)"),
+						*GetNameSafe(ActorOwner), (int32)ActorOwner->Role, LoopCount, TimeTick, NumBounces, Hit.Time, SubTickTimeRemaining);
+				}
 			}
 		}
 	}
@@ -428,6 +459,12 @@ UProjectileMovementComponent::EHandleBlockingHitResult UProjectileMovementCompon
 		return EHandleBlockingHitResult::Abort;
 	}
 
+	if (Hit.bStartPenetrating)
+	{
+		UE_LOG(LogProjectileMovement, Verbose, TEXT("Projectile %s is stuck inside %s.%s!"), *GetNameSafe(ActorOwner), *GetNameSafe(Hit.GetActor()), *GetNameSafe(Hit.GetComponent()));
+		return EHandleBlockingHitResult::Abort;
+	}
+
 	SubTickTimeRemaining = TimeTick * (1.f - Hit.Time);
 	return EHandleBlockingHitResult::Deflect;
 }
@@ -560,13 +597,20 @@ float UProjectileMovementComponent::GetSimulationTimeStep(float RemainingTime, i
 		}
 		else
 		{
-			// If this is the last iteration, just use all the remaining time. This is usually better than cutting things short, as the simulation won't move far enough otherwise.
+			// If this is the last iteration, just use all the remaining time. This is better than cutting things short, as the simulation won't move far enough otherwise.
 			// Print a throttled warning.
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-			static uint32 s_WarningCount = 0;
-			if ((s_WarningCount++ < 100) || (GFrameCounter & 15) == 0)
+			if (const UWorld* const World = GetWorld())
 			{
-				UE_LOG(LogProjectileMovement, Warning, TEXT("GetSimulationTimeStep() - Max iterations %d hit while remaining time %.6f > MaxSimulationTimeStep (%.3f) for '%s'"), MaxSimulationIterations, RemainingTime, MaxSimulationTimeStep, *GetPathNameSafe(UpdatedComponent));
+				// Don't report during long hitches, we're more concerned about normal behavior just to make sure we have reasonable simulation settings.
+				if (World->DeltaTimeSeconds < 0.20f)
+				{
+					static uint32 s_WarningCount = 0;
+					if ((s_WarningCount++ < 100) || (GFrameCounter & 15) == 0)
+					{
+						UE_LOG(LogProjectileMovement, Warning, TEXT("GetSimulationTimeStep() - Max iterations %d hit while remaining time %.6f > MaxSimulationTimeStep (%.3f) for '%s'"), MaxSimulationIterations, RemainingTime, MaxSimulationTimeStep, *GetPathNameSafe(UpdatedComponent));
+					}
+				}
 			}
 #endif
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/Components/SceneComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/SceneComponent.cpp
index c616ec33842d..8c674159924b 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/SceneComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/SceneComponent.cpp
@@ -617,7 +617,10 @@ void USceneComponent::UpdateComponentToWorldWithParent(USceneComponent* Parent,F
 		//QUICK_SCOPE_CYCLE_COUNTER(STAT_USceneComponent_UpdateComponentToWorldWithParent_HasChanged);
 		bHasChanged = !GetComponentTransform().Equals(NewTransform, SMALL_NUMBER);
 	}
-	if (bHasChanged)
+
+	// We propagate here based on more than just the transform changing, as other components may depend on the teleport flag
+	// to detect transforms out of the component direct hierarchy (such as the actor transform)
+	if (bHasChanged || Teleport != ETeleportType::None)
 	{
 		//QUICK_SCOPE_CYCLE_COUNTER(STAT_USceneComponent_UpdateComponentToWorldWithParent_Changed);
 		// Update transform
@@ -693,10 +696,10 @@ void USceneComponent::PropagateTransformUpdate(bool bTransformChanged, EUpdateTr
 	{
 		FScopedMovementUpdate* CurrentUpdate = GetCurrentScopedMovement();
 
-		if (CurrentUpdate && Teleport == ETeleportType::TeleportPhysics)
+		if (CurrentUpdate && Teleport != ETeleportType::None)
 		{
 			// Remember this was a teleport
-			CurrentUpdate->SetHasTeleported();
+			CurrentUpdate->SetHasTeleported(Teleport);
 		}
 
 		// We are deferring these updates until later.
@@ -805,7 +808,7 @@ void USceneComponent::EndScopedMovementUpdate(class FScopedMovementUpdate& Compl
 			if (bTransformChanged)
 			{
 				// Pass teleport flag if set
-				PropagateTransformUpdate(true, EUpdateTransformFlags::None, CurrentScopedUpdate->bHasTeleported ? ETeleportType::TeleportPhysics : ETeleportType::None);
+				PropagateTransformUpdate(true, EUpdateTransformFlags::None, CurrentScopedUpdate->TeleportType);
 			}
 
 			// We may have moved somewhere and then moved back to the start, we still need to update overlaps if we touched things along the way.
@@ -2634,6 +2637,11 @@ void USceneComponent::SetPhysicsVolume( APhysicsVolume * NewVolume,  bool bTrigg
 	}
 }
 
+bool USceneComponent::IsPostLoadThreadSafe() const
+{
+	return GetClass() == USceneComponent::StaticClass();
+}
+
 void USceneComponent::BeginDestroy()
 {
 	PhysicsVolumeChangedDelegate.Clear();
@@ -3289,12 +3297,12 @@ static uint32 s_ScopedWarningCount = 0;
 FScopedMovementUpdate::FScopedMovementUpdate( class USceneComponent* Component, EScopedUpdate::Type ScopeBehavior, bool bRequireOverlapsEventFlagToQueueOverlaps )
 : Owner(Component)
 , OuterDeferredScope(nullptr)
+, CurrentOverlapState(EOverlapState::eUseParent)
+, TeleportType(ETeleportType::None)
+, FinalOverlapCandidatesIndex(INDEX_NONE)
 , bDeferUpdates(ScopeBehavior == EScopedUpdate::DeferredUpdates)
 , bHasMoved(false)
-, bHasTeleported(false)
 , bRequireOverlapsEventFlag(bRequireOverlapsEventFlagToQueueOverlaps)
-, CurrentOverlapState(EOverlapState::eUseParent)
-, FinalOverlapCandidatesIndex(INDEX_NONE)
 {
 	if (IsValid(Component))
 	{
@@ -3378,6 +3386,7 @@ void FScopedMovementUpdate::RevertMove()
 	}
 	bHasMoved = false;
 	CurrentOverlapState = EOverlapState::eUseParent;
+	TeleportType = ETeleportType::None;
 }
 
 void FScopedMovementUpdate::AppendOverlapsAfterMove(const TArray<FOverlapInfo>& NewPendingOverlaps, bool bSweep, bool bIncludesOverlapsAtEnd)
@@ -3447,6 +3456,11 @@ void FScopedMovementUpdate::OnInnerScopeComplete(const FScopedMovementUpdate& In
 				PendingOverlaps.Append(InnerScope.GetPendingOverlaps());
 				checkSlow(FinalOverlapCandidatesIndex < PendingOverlaps.Num());
 			}
+
+			if (InnerScope.TeleportType > TeleportType)
+			{
+				SetHasTeleported(InnerScope.TeleportType);
+			}
 		}
 		else
 		{
diff --git a/Engine/Source/Runtime/Engine/Private/Components/ShapeComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/ShapeComponent.cpp
index f9a038be2a14..9af792bbdb0a 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/ShapeComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/ShapeComponent.cpp
@@ -18,14 +18,7 @@ UShapeComponent::UShapeComponent(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
 	static const FName CollisionProfileName(TEXT("OverlapAllDynamic"));
-	BodyInstance.SetCollisionProfileName(CollisionProfileName);
-#if WITH_EDITORONLY_DATA
-	// when we deprecated this variable, we switched on for the shapecomponent collision profile
-	// the problem with adding collision profile later, the instanced data will be wiped
-	// since shape component is so popular for BP and so on, I'm adding manual support for compatibility
-	// this only works since this variable is getting deprecated. 
-	BodyInstance.ResponseToChannels_DEPRECATED.SetAllChannels(ECR_Block);
-#endif // WITH_EDITORONLY_DATA
+	SetCollisionProfileName(CollisionProfileName);
 	BodyInstance.bAutoWeld = true;	//UShapeComponent by default has auto welding
 
 	bHiddenInGame = true;
diff --git a/Engine/Source/Runtime/Engine/Private/Components/SkeletalMeshComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/SkeletalMeshComponent.cpp
index 57c4e0e5f3ca..a1f5ba859194 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/SkeletalMeshComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/SkeletalMeshComponent.cpp
@@ -39,7 +39,8 @@
 #include "UObject/AnimPhysObjectVersion.h"
 #include "Misc/ScopeExit.h"
 #include "ContentStreaming.h"
-
+#include "SkeletalRenderPublic.h"
+#include "ContentStreaming.h"
 
 #define LOCTEXT_NAMESPACE "SkeletalMeshComponent"
 
@@ -1017,7 +1018,7 @@ void USkeletalMeshComponent::TickAnimation(float DeltaTime, bool bNeedsValidRoot
 
 bool USkeletalMeshComponent::UpdateLODStatus()
 {
-	if ( Super::UpdateLODStatus() )
+	if (Super::UpdateLODStatus())
 	{
 		bRequiredBonesUpToDate = false;
 		return true;
@@ -1026,6 +1027,26 @@ bool USkeletalMeshComponent::UpdateLODStatus()
 	return false;
 }
 
+void USkeletalMeshComponent::UpdateVisualizeLODString(FString& DebugString)
+{
+	Super::UpdateVisualizeLODString(DebugString);
+
+	uint32 NumVertices = 0;
+	if (SkeletalMesh)
+	{
+		if (FSkeletalMeshRenderData* RenderData = SkeletalMesh->GetResourceForRendering())
+		{
+			if (RenderData->LODRenderData.IsValidIndex(PredictedLODLevel))
+			{
+				NumVertices = RenderData->LODRenderData[PredictedLODLevel].GetNumVertices();
+			}
+		}
+	}
+
+	DebugString = DebugString + FString::Printf(TEXT("\nRequiredBones(%d) NumVerts(%d)"), 
+		RequiredBones.Num(), NumVertices);
+}
+
 bool USkeletalMeshComponent::ShouldUpdateTransform(bool bLODHasChanged) const
 {
 #if WITH_EDITOR	
@@ -1501,25 +1522,32 @@ void USkeletalMeshComponent::ComputeRequiredBones(TArray<FBoneIndexType>& OutReq
 	if (ShouldUpdateBoneVisibility())
 	{
 		check(BoneVisibilityStates.Num() == GetNumComponentSpaceTransforms());
+        
+        if (BoneVisibilityStates.Num() >= OutRequiredBones.Num())
+        {
+            int32 VisibleBoneWriteIndex = 0;
+            for (int32 i = 0; i < OutRequiredBones.Num(); ++i)
+            {
+                FBoneIndexType CurBoneIndex = OutRequiredBones[i];
 
-		int32 VisibleBoneWriteIndex = 0;
-		for (int32 i = 0; i < OutRequiredBones.Num(); ++i)
-		{
-			FBoneIndexType CurBoneIndex = OutRequiredBones[i];
+                // Current bone visible?
+                if (BoneVisibilityStates[CurBoneIndex] == BVS_Visible)
+                {
+                    OutRequiredBones[VisibleBoneWriteIndex++] = CurBoneIndex;
+                }
+            }
 
-			// Current bone visible?
-			if (BoneVisibilityStates[CurBoneIndex] == BVS_Visible)
-			{
-				OutRequiredBones[VisibleBoneWriteIndex++] = CurBoneIndex;
-			}
-		}
-
-		// Remove any trailing junk in the OutRequiredBones array
-		const int32 NumBonesHidden = OutRequiredBones.Num() - VisibleBoneWriteIndex;
-		if (NumBonesHidden > 0)
-		{
-			OutRequiredBones.RemoveAt(VisibleBoneWriteIndex, NumBonesHidden);
-		}
+            // Remove any trailing junk in the OutRequiredBones array
+            const int32 NumBonesHidden = OutRequiredBones.Num() - VisibleBoneWriteIndex;
+            if (NumBonesHidden > 0)
+            {
+                OutRequiredBones.RemoveAt(VisibleBoneWriteIndex, NumBonesHidden);
+            }
+        }
+        else
+        {
+            UE_LOG(LogAnimation, Warning, TEXT("Skeletal Mesh asset '%s' has no BoneVisibilityStates"), *SkeletalMesh->GetName());
+        }
 	}
 
 	// Add in any bones that may be required when mirroring.
@@ -1737,34 +1765,40 @@ void USkeletalMeshComponent::PerformAnimationProcessing(const USkeletalMesh* InS
 
 	if(bInDoEvaluation)
 	{
-	FMemMark Mark(FMemStack::Get());
-	FCompactPose EvaluatedPose;
+		FMemMark Mark(FMemStack::Get());
+		FCompactPose EvaluatedPose;
 
-	// evaluate pure animations, and fill up BoneSpaceTransforms
-	EvaluateAnimation(InSkeletalMesh, InAnimInstance, OutBoneSpaceTransforms, OutRootBoneTranslation, OutCurve, EvaluatedPose);
-	EvaluatePostProcessMeshInstance(OutBoneSpaceTransforms, EvaluatedPose, OutCurve, InSkeletalMesh, OutRootBoneTranslation);
+		// evaluate pure animations, and fill up BoneSpaceTransforms
+		EvaluateAnimation(InSkeletalMesh, InAnimInstance, OutBoneSpaceTransforms, OutRootBoneTranslation, OutCurve, EvaluatedPose);
+		EvaluatePostProcessMeshInstance(OutBoneSpaceTransforms, EvaluatedPose, OutCurve, InSkeletalMesh, OutRootBoneTranslation);
 
-	// Finalize the transforms from the evaluation
-	FinalizePoseEvaluationResult(InSkeletalMesh, OutBoneSpaceTransforms, OutRootBoneTranslation, EvaluatedPose);
+		// Finalize the transforms from the evaluation
+		FinalizePoseEvaluationResult(InSkeletalMesh, OutBoneSpaceTransforms, OutRootBoneTranslation, EvaluatedPose);
 
-	// Fill SpaceBases from LocalAtoms
-	FillComponentSpaceTransforms(InSkeletalMesh, OutBoneSpaceTransforms, OutSpaceBases);
-}
+		// Fill SpaceBases from LocalAtoms
+		FillComponentSpaceTransforms(InSkeletalMesh, OutBoneSpaceTransforms, OutSpaceBases);
+	}
 }
 
 
 void USkeletalMeshComponent::EvaluatePostProcessMeshInstance(TArray<FTransform>& OutBoneSpaceTransforms, FCompactPose& InOutPose, FBlendedHeapCurve& OutCurve, const USkeletalMesh* InSkeletalMesh, FVector& OutRootBoneTranslation) const
 {
-	if(ShouldEvaluatePostProcessInstance())
+	if (ShouldEvaluatePostProcessInstance())
 	{
-		if (InOutPose.IsValid())
+		// Push the previous pose to any input nodes required
+		if (FAnimNode_SubInput* InputNode = PostProcessAnimInstance->GetSubInputNode())
 		{
-			// Push the previous pose to any input nodes required
-			if (FAnimNode_SubInput* InputNode = PostProcessAnimInstance->GetSubInputNode())
+			if (InOutPose.IsValid())
 			{
 				InputNode->InputPose.CopyBonesFrom(InOutPose);
 				InputNode->InputCurve.CopyFrom(OutCurve);
 			}
+			else
+			{
+				const FBoneContainer& RequiredBone = PostProcessAnimInstance->GetRequiredBonesOnAnyThread();
+				InputNode->InputPose.ResetToRefPose(RequiredBone);
+				InputNode->InputCurve.InitFrom(RequiredBone);
+			}
 		}
 
 		EvaluateAnimation(InSkeletalMesh, PostProcessAnimInstance, OutBoneSpaceTransforms, OutRootBoneTranslation, OutCurve, InOutPose);
@@ -1805,6 +1839,10 @@ void USkeletalMeshComponent::UpdateClothSimulationContext(float InDeltaTime)
 		{
 			ClothTeleportMode = EClothingTeleportMode::Teleport;
 		}
+		else if(PendingTeleportType == ETeleportType::ResetPhysics)
+		{
+			ClothTeleportMode = EClothingTeleportMode::TeleportAndReset;
+		}
 
 		UpdateClothTransformImp();
 	}
@@ -1820,6 +1858,7 @@ void USkeletalMeshComponent::UpdateClothSimulationContext(float InDeltaTime)
 		}
 	}
 
+	PendingTeleportType = ETeleportType::None;
 	ClothTeleportMode = EClothingTeleportMode::None;
 }
 
@@ -1901,19 +1940,21 @@ void USkeletalMeshComponent::RefreshBoneTransforms(FActorComponentTickFunction*
 									 || (GetNumComponentSpaceTransforms() != CachedComponentSpaceTransforms.Num()));
 
 
-	TArray<SmartName::UID_Type> const* CurrentAnimCurveMappingNameUids = (AnimScriptInstance) ? &AnimScriptInstance->GetRequiredBones().GetAnimCurveNameUids() : nullptr;
-	const int32 CurrentCurveCount = (CurrentAnimCurveMappingNameUids) ? CurrentAnimCurveMappingNameUids->Num() : 0;
+	TArray<uint16> const* CurrentAnimCurveUIDFinder = (AnimScriptInstance) ? &AnimScriptInstance->GetRequiredBones().GetUIDToArrayLookupTable() : nullptr;
+	const int32 CurrentCurveCount = (CurrentAnimCurveUIDFinder) ? FBlendedCurve::GetValidElementCount(CurrentAnimCurveUIDFinder) : 0;
 
 	const bool bInvalidCachedCurve = bDoEvaluationRateOptimization && 
-									CurrentAnimCurveMappingNameUids != nullptr &&
-									(CachedCurve.UIDList != CurrentAnimCurveMappingNameUids || CachedCurve.Num() != CurrentCurveCount);
+									CurrentAnimCurveUIDFinder != nullptr &&
+									(CachedCurve.UIDToArrayIndexLUT != CurrentAnimCurveUIDFinder || CachedCurve.Num() != CurrentCurveCount);
 
 	const bool bShouldDoEvaluation = !bDoEvaluationRateOptimization || bInvalidCachedBones || bInvalidCachedCurve || !AnimUpdateRateParams->ShouldSkipEvaluation();
 
 	const bool bDoPAE = !!CVarUseParallelAnimationEvaluation.GetValueOnGameThread() && FApp::ShouldUseThreadingForPerformance();
 
-	const bool bDoParallelEvaluation = (AnimScriptInstance != nullptr) && AnimScriptInstance->CanRunParallelWork() && bDoPAE && bShouldDoEvaluation && TickFunction && (TickFunction->GetActualTickGroup() == TickFunction->TickGroup) && TickFunction->IsCompletionHandleValid();
-
+const bool bMainInstanceValidForParallelWork = AnimScriptInstance == nullptr || AnimScriptInstance->CanRunParallelWork();
+const bool bPostInstanceValidForParallelWork = PostProcessAnimInstance == nullptr || PostProcessAnimInstance->CanRunParallelWork();
+const bool bHasValidInstanceForParallelWork = HasValidAnimationInstance() && bMainInstanceValidForParallelWork && bPostInstanceValidForParallelWork;
+const bool bDoParallelEvaluation = bHasValidInstanceForParallelWork && bDoPAE && bShouldDoEvaluation && TickFunction && (TickFunction->GetActualTickGroup() == TickFunction->TickGroup) && TickFunction->IsCompletionHandleValid();
 	const bool bBlockOnTask = !bDoParallelEvaluation;  // If we aren't trying to do parallel evaluation then we
 															// will need to wait on an existing task.
 
@@ -1928,15 +1969,15 @@ void USkeletalMeshComponent::RefreshBoneTransforms(FActorComponentTickFunction*
 	AnimEvaluationContext.SkeletalMesh = SkeletalMesh;
 	AnimEvaluationContext.AnimInstance = AnimScriptInstance;
 
-	if (CurrentAnimCurveMappingNameUids)
+	if (CurrentAnimCurveUIDFinder)
 	{
-		if ((AnimEvaluationContext.Curve.Num() != CurrentCurveCount) || (AnimEvaluationContext.Curve.UIDList != CurrentAnimCurveMappingNameUids))
+		if ((AnimEvaluationContext.Curve.Num() != CurrentCurveCount) || (AnimEvaluationContext.Curve.UIDToArrayIndexLUT != CurrentAnimCurveUIDFinder))
 		{
-			AnimEvaluationContext.Curve.InitFrom(CurrentAnimCurveMappingNameUids);
+			AnimEvaluationContext.Curve.InitFrom(CurrentAnimCurveUIDFinder);
 		}
-		if (AnimCurves.UIDList != CurrentAnimCurveMappingNameUids || AnimCurves.Num() != CurrentCurveCount)
+		if (AnimCurves.UIDToArrayIndexLUT != CurrentAnimCurveUIDFinder || AnimCurves.Num() != CurrentCurveCount)
 		{
-			AnimCurves.InitFrom(CurrentAnimCurveMappingNameUids);
+			AnimCurves.InitFrom(CurrentAnimCurveUIDFinder);
 		}
 	}
 	else
@@ -1947,9 +1988,9 @@ void USkeletalMeshComponent::RefreshBoneTransforms(FActorComponentTickFunction*
 
 	AnimEvaluationContext.bDoEvaluation = bShouldDoEvaluation;
 	
-	AnimEvaluationContext.bDoInterpolation = bDoEvaluationRateOptimization && !bInvalidCachedBones && AnimUpdateRateParams->ShouldInterpolateSkippedFrames() && CurrentAnimCurveMappingNameUids != nullptr;
+	AnimEvaluationContext.bDoInterpolation = bDoEvaluationRateOptimization && !bInvalidCachedBones && AnimUpdateRateParams->ShouldInterpolateSkippedFrames() && CurrentAnimCurveUIDFinder != nullptr;
 	AnimEvaluationContext.bDuplicateToCacheBones = bInvalidCachedBones || (bDoEvaluationRateOptimization && AnimEvaluationContext.bDoEvaluation && !AnimEvaluationContext.bDoInterpolation);
-	AnimEvaluationContext.bDuplicateToCacheCurve = bInvalidCachedCurve || (bDoEvaluationRateOptimization && AnimEvaluationContext.bDoEvaluation && !AnimEvaluationContext.bDoInterpolation && CurrentAnimCurveMappingNameUids != nullptr);
+	AnimEvaluationContext.bDuplicateToCacheCurve = bInvalidCachedCurve || (bDoEvaluationRateOptimization && AnimEvaluationContext.bDoEvaluation && !AnimEvaluationContext.bDoInterpolation && CurrentAnimCurveUIDFinder != nullptr);
 	if (!bDoEvaluationRateOptimization)
 	{
 		//If we aren't optimizing clear the cached local atoms
@@ -2181,7 +2222,7 @@ void USkeletalMeshComponent::PostAnimEvaluation(FAnimationEvaluationContext& Eva
 	if (EvaluationContext.bDuplicateToCacheCurve)
 	{
 		ensureAlwaysMsgf(AnimCurves.IsValid(), TEXT("Animation Curve is invalid (%s). TotalCount(%d) "),
-			*GetNameSafe(SkeletalMesh), (AnimCurves.UIDList) ? AnimCurves.UIDList->Num() : -1);
+			*GetNameSafe(SkeletalMesh), AnimCurves.NumValidCurveCount);
 		CachedCurve.CopyFrom(AnimCurves);
 	}
 	
@@ -2531,21 +2572,26 @@ UAnimInstance* USkeletalMeshComponent::GetPostProcessInstance() const
 	return PostProcessAnimInstance;
 }
 
-void USkeletalMeshComponent::ResetAnimInstanceDynamics()
+bool USkeletalMeshComponent::HasValidAnimationInstance() const
+{
+	return AnimScriptInstance || PostProcessAnimInstance;
+}
+
+void USkeletalMeshComponent::ResetAnimInstanceDynamics(ETeleportType InTeleportType)
 {
 	if(AnimScriptInstance)
 	{
-		AnimScriptInstance->ResetDynamics();
+		AnimScriptInstance->ResetDynamics(InTeleportType);
 	}
 
 	for(UAnimInstance* SubInstanceIter : SubInstances)
 	{
-		SubInstanceIter->ResetDynamics();
+		SubInstanceIter->ResetDynamics(InTeleportType);
 	}
 
 	if(PostProcessAnimInstance)
 	{
-		PostProcessAnimInstance->ResetDynamics();
+		PostProcessAnimInstance->ResetDynamics(InTeleportType);
 	}
 }
 
@@ -3436,10 +3482,10 @@ bool USkeletalMeshComponent::MoveComponentImpl(const FVector& Delta, const FQuat
 #endif
 
 	bool bSuccess = Super::MoveComponentImpl(Delta, NewRotation, bSweep, OutHit, MoveFlags, Teleport);
-	if(bSuccess && Teleport == ETeleportType::TeleportPhysics)
+	if(bSuccess && Teleport != ETeleportType::None)
 	{
 		// If a skeletal mesh component recieves a teleport we should reset any other dynamic simulations
-		ResetAnimInstanceDynamics();
+		ResetAnimInstanceDynamics(Teleport);
 
 		OnSkelMeshPhysicsTeleported.Broadcast();
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/Components/SkinnedMeshComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/SkinnedMeshComponent.cpp
index 3aefebbf96d9..85df2c0ee47e 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/SkinnedMeshComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/SkinnedMeshComponent.cpp
@@ -47,6 +47,11 @@ static TAutoConsoleVariable<int32> CVarDrawAnimRateOptimization(
 
 static TAutoConsoleVariable<int32> CVarEnableMorphTargets(TEXT("r.EnableMorphTargets"), 1, TEXT("Enable Morph Targets"));
 
+static TAutoConsoleVariable<int32> CVarAnimVisualizeLODs(
+	TEXT("a.VisualizeLODs"),
+	0,
+	TEXT("Visualize SkelMesh LODs"));
+
 namespace FAnimUpdateRateManager
 {
 	static float TargetFrameTimeForUpdateRate = 1.f / 30.f; //Target frame rate for lookahead URO
@@ -318,7 +323,6 @@ USkinnedMeshComponent::USkinnedMeshComponent(const FObjectInitializer& ObjectIni
 	bAutoActivate = true;
 	PrimaryComponentTick.bCanEverTick = true;
 	PrimaryComponentTick.TickGroup = TG_PrePhysics;
-	WireframeColor = FColor(221, 221, 28, 255);
 
 	MeshComponentUpdateFlag = EMeshComponentUpdateFlag::AlwaysTickPoseAndRefreshBones;
 
@@ -703,6 +707,12 @@ void USkinnedMeshComponent::TickUpdateRate(float DeltaTime, bool bNeedsValidRoot
 			{
 				FColor DrawColor = AnimUpdateRateParams->GetUpdateRateDebugColor();
 				DrawDebugBox(GetWorld(), Bounds.Origin, Bounds.BoxExtent, FQuat::Identity, DrawColor, false);
+
+				FString DebugString = FString::Printf(TEXT("%s UpdateRate(%d) EvaluationRate(%d) Interp(%d) AdditionalTime(%f)"),
+					*GetNameSafe(SkeletalMesh), AnimUpdateRateParams->UpdateRate, AnimUpdateRateParams->EvaluationRate, 
+					AnimUpdateRateParams->ShouldInterpolateSkippedFrames(), AnimUpdateRateParams->ShouldSkipUpdate(), AnimUpdateRateParams->AdditionalTime);
+
+				GEngine->AddOnScreenDebugMessage(INDEX_NONE, 0.f, FColor::Red, DebugString, false);
 			}
 #endif // ENABLE_DRAW_DEBUG
 		}
@@ -1241,9 +1251,6 @@ void USkinnedMeshComponent::SetSkeletalMesh(USkeletalMesh* InSkelMesh, bool bRei
 		// UpdateLODStatus needs a valid MeshObject
 		UpdateLODStatus(); 
 	}
-	
-	// Update this component streaming data.
-	IStreamingManager::Get().NotifyPrimitiveUpdated(this);
 }
 
 FSkeletalMeshRenderData* USkinnedMeshComponent::GetSkeletalMeshRenderData() const
@@ -1324,6 +1331,12 @@ void USkinnedMeshComponent::SetPhysicsAsset(class UPhysicsAsset* InPhysicsAsset,
 
 void USkinnedMeshComponent::SetMasterPoseComponent(class USkinnedMeshComponent* NewMasterBoneComponent)
 {
+	// Early out if we're already setup.
+	if (NewMasterBoneComponent == MasterPoseComponent)
+	{
+		return;
+	}
+
 	USkinnedMeshComponent* OldMasterPoseComponent = MasterPoseComponent.Get();
 
 	MasterPoseComponent = NewMasterBoneComponent;
@@ -1359,7 +1372,7 @@ void USkinnedMeshComponent::SetMasterPoseComponent(class USkinnedMeshComponent*
 		PrimaryComponentTick.AddPrerequisite(MasterPoseComponent.Get(), MasterPoseComponent->PrimaryComponentTick);
 	}
 
-	if (OldMasterPoseComponent != nullptr)
+	if ((OldMasterPoseComponent != nullptr) && (OldMasterPoseComponent != NewMasterBoneComponent))
 	{
 		OldMasterPoseComponent->RemoveSlavePoseComponent(this);
 
@@ -1370,6 +1383,12 @@ void USkinnedMeshComponent::SetMasterPoseComponent(class USkinnedMeshComponent*
 	AllocateTransformData();
 	RecreatePhysicsState();
 	UpdateMasterBoneMap();
+
+	// Update Slave in case Master has already been ticked, and we won't get an update for another frame.
+	if (MasterPoseComponent != nullptr)
+	{
+		UpdateSlaveComponent();
+	}
 }
 
 void USkinnedMeshComponent::AddSlavePoseComponent(USkinnedMeshComponent* SkinnedMeshComponent)
@@ -1585,21 +1604,59 @@ FTransform USkinnedMeshComponent::GetSocketTransform(FName InSocketName, ERelati
 
 class USkeletalMeshSocket const* USkinnedMeshComponent::GetSocketByName(FName InSocketName) const
 {
+	const FName* OverrideSocket = SocketOverrideLookup.Find(InSocketName);
+	const FName OverrideSocketName = OverrideSocket ? *OverrideSocket : InSocketName;
+
 	USkeletalMeshSocket const* Socket = NULL;
 
 	if( SkeletalMesh )
 	{
-		Socket = SkeletalMesh->FindSocket( InSocketName );
+		Socket = SkeletalMesh->FindSocket(OverrideSocketName);
 	}
 	else
 	{
-		UE_LOG(LogSkinnedMeshComp, Warning, TEXT("GetSocketByName(%s): No SkeletalMesh for Component(%s) Actor(%s)"), 
-			*InSocketName.ToString(), *GetName(), *GetNameSafe(GetOuter()));
+		if (OverrideSocket)
+		{
+			UE_LOG(LogSkinnedMeshComp, Warning, TEXT("GetSocketByName(%s -> override To %s): No SkeletalMesh for Component(%s) Actor(%s)"),
+				*InSocketName.ToString(), *OverrideSocketName.ToString(), *GetName(), *GetNameSafe(GetOuter()));
+		}
+		else
+		{
+			UE_LOG(LogSkinnedMeshComp, Warning, TEXT("GetSocketByName(%s): No SkeletalMesh for Component(%s) Actor(%s)"),
+				*OverrideSocketName.ToString(), *GetName(), *GetNameSafe(GetOuter()));
+		}
 	}
 
 	return Socket;
 }
 
+void USkinnedMeshComponent::AddSocketOverride(FName SourceSocketName, FName OverrideSocketName, bool bWarnHasOverrided)
+{
+	if (FName* FoundName = SocketOverrideLookup.Find(SourceSocketName))
+	{
+		if (bWarnHasOverrided)
+		{
+			UE_LOG(LogSkinnedMeshComp, Warning, TEXT("AddSocketOverride(%s, %s): Component(%s) Actor(%s) has already defined an override for socket(%s), replacing %s as override"),
+				*SourceSocketName.ToString(), *OverrideSocketName.ToString(), *GetName(), *GetNameSafe(GetOuter()), *SourceSocketName.ToString(), *(FoundName->ToString()));
+		}
+		*FoundName = OverrideSocketName;
+	}
+	else
+	{
+		SocketOverrideLookup.Add(SourceSocketName, OverrideSocketName);
+	}
+}
+
+void USkinnedMeshComponent::RemoveSocketOverrides(FName SourceSocketName)
+{
+	SocketOverrideLookup.Remove(SourceSocketName);
+}
+
+void USkinnedMeshComponent::RemoveAllSocketOverrides()
+{
+	SocketOverrideLookup.Reset();
+}
+
 bool USkinnedMeshComponent::DoesSocketExist(FName InSocketName) const
 {
 	return (GetSocketBoneName(InSocketName) != NAME_None);
@@ -1612,17 +1669,20 @@ FName USkinnedMeshComponent::GetSocketBoneName(FName InSocketName) const
 		return NAME_None;
 	}
 
+	const FName* OverrideSocket = SocketOverrideLookup.Find(InSocketName);
+	const FName OverrideSocketName = OverrideSocket ? *OverrideSocket : InSocketName;
+
 	// First check for a socket
-	USkeletalMeshSocket const* TmpSocket = SkeletalMesh->FindSocket(InSocketName);
+	USkeletalMeshSocket const* TmpSocket = SkeletalMesh->FindSocket(OverrideSocketName);
 	if( TmpSocket )
 	{
 		return TmpSocket->BoneName;
 	}
 
 	// If socket is not found, maybe it was just a bone name.
-	if( GetBoneIndex(InSocketName) != INDEX_NONE )
+	if( GetBoneIndex(OverrideSocketName) != INDEX_NONE )
 	{
-		return InSocketName;
+		return OverrideSocketName;
 	}
 
 	// Doesn't exist.
@@ -2419,16 +2479,22 @@ bool USkinnedMeshComponent::UpdateLODStatus()
 
 	if (SkeletalMesh != nullptr)
 	{
-		int32 MinLodIndex = 0;
+#if WITH_EDITOR
+		const int32 LODBias = GetLODBias();
+#else
+		const int32 LODBias = GSkeletalMeshLODBias;
+#endif
+
+		int32 MinLodIndex = bOverrideMinLod ? MinLodModel : 0;
 		if(FSceneInterface* Scene = GetScene())
 		{
 			const ERHIFeatureLevel::Type SceneFeatureLevel = GetScene()->GetFeatureLevel();
-			MinLodIndex = bOverrideMinLod ? MinLodModel : SkeletalMesh->MinLod.GetValueForFeatureLevel(SceneFeatureLevel);
+			MinLodIndex = FMath::Max(MinLodIndex, SkeletalMesh->MinLod.GetValueForFeatureLevel(SceneFeatureLevel));
 		}
 		else
 		{
 			// No scene, can't reliably get per-platform Min LOD, get default
-			MinLodIndex = bOverrideMinLod ? MinLodModel : SkeletalMesh->MinLod.Default;
+			MinLodIndex = FMath::Max(MinLodIndex, SkeletalMesh->MinLod.Default);
 		}
 
 		int32 MaxLODIndex = 0;
@@ -2457,11 +2523,6 @@ bool USkinnedMeshComponent::UpdateLODStatus()
 			}
 			else if (MeshObject)
 			{
-#if WITH_EDITOR
-				const int32 LODBias = GetLODBias();
-#else
-				const int32 LODBias = GSkeletalMeshLODBias;
-#endif
 				PredictedLODLevel = FMath::Clamp(MeshObject->MinDesiredLODLevel + LODBias, 0, MaxLODIndex);
 			}
 			// If no MeshObject - just assume lowest LOD.
@@ -2483,6 +2544,39 @@ bool USkinnedMeshComponent::UpdateLODStatus()
 				}
 			}
 		}
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+		if (CVarAnimVisualizeLODs.GetValueOnAnyThread() != 0)
+		{
+			// Reduce to visible animated, non SyncAttachParentLOD to reduce clutter.
+			if (SkeletalMesh && MeshObject && bRecentlyRendered)
+			{
+				const bool bHasValidSyncAttachParent = bSyncAttachParentLOD && GetAttachParent() && GetAttachParent()->IsA(USkinnedMeshComponent::StaticClass());
+				if (!bHasValidSyncAttachParent)
+				{
+					const float ScreenSize = FMath::Sqrt(MeshObject->MaxDistanceFactor) * 2.f;
+					FString DebugString = FString::Printf(TEXT("PredictedLODLevel(%d)\nMinDesiredLODLevel(%d) ForcedLodModel(%d) MinLodIndex(%d) LODBias(%d)\nMaxDistanceFactor(%f) ScreenSize(%f)"),
+						PredictedLODLevel, MeshObject->MinDesiredLODLevel, ForcedLodModel, MinLodIndex, LODBias, MeshObject->MaxDistanceFactor, ScreenSize);
+
+					// See if Child classes want to add something.
+					UpdateVisualizeLODString(DebugString);
+
+					FColor DrawColor = FColor::White;
+					switch (PredictedLODLevel)
+					{
+					case 0: DrawColor = FColor::White; break;
+					case 1: DrawColor = FColor::Green; break;
+					case 2: DrawColor = FColor::Yellow; break;
+					case 3: DrawColor = FColor::Red; break;
+					default:
+						DrawColor = FColor::Purple; break;
+					}
+
+					DrawDebugString(GetWorld(), Bounds.Origin, DebugString, nullptr, DrawColor, 0.f, true, 1.2f);
+				}
+			}
+		}
+#endif
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/Components/StaticMeshComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/StaticMeshComponent.cpp
index aec7f895ccb5..040c3972c321 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/StaticMeshComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/StaticMeshComponent.cpp
@@ -37,6 +37,8 @@
 #include "ComponentRecreateRenderStateContext.h"
 #include "Engine/StaticMesh.h"
 #include "HAL/LowLevelMemTracker.h"
+#include "Algo/AllOf.h"
+#include "Algo/Transform.h"
 
 #define LOCTEXT_NAMESPACE "StaticMeshComponent"
 
@@ -90,6 +92,22 @@ public:
 		{
 			StaticMeshComponent->SetLODDataCount(VertexColorLODs.Num(), StaticMeshComponent->LODData.Num());
 
+			// Its possible that we have recreated LODs in SetLODDataCount that existed prior
+			// to reconstruction, but not *rebuilt* them because static lighting usage was clobbered
+			// by the construction script. In this case we should recover the GUIDs we had before
+			// so we dont end up creating new (non-deterministic) data
+			for(int32 LODIndex = 0; LODIndex < StaticMeshComponent->LODData.Num(); ++LODIndex)
+			{
+				FStaticMeshComponentLODInfo& LODInfo = StaticMeshComponent->LODData[LODIndex];
+				if(CachedStaticLighting.MapBuildDataIds.IsValidIndex(LODIndex))
+				{
+					LODInfo.MapBuildDataId = CachedStaticLighting.MapBuildDataIds[LODIndex];
+#if WITH_EDITOR
+					LODInfo.bMapBuildDataIdLoaded = true;
+#endif
+				}
+			}
+
 			for (int32 LODDataIndex = 0; LODDataIndex < VertexColorLODs.Num(); ++LODDataIndex)
 			{
 				const FVertexColorLODData& VertexColorLODData = VertexColorLODs[LODDataIndex];
@@ -295,8 +313,26 @@ void UStaticMeshComponent::Serialize(FArchive& Ar)
 
 	Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
 
+#if WITH_EDITOR
+	const bool bCheckBuildGuids = false;//Ar.IsCooking() && !GetOutermost()->HasAnyPackageFlags(PKG_CompiledIn);
+
+	TArray<FGuid> MapBuildGuids;
+	if (bCheckBuildGuids)
+	{
+		Algo::Transform(LODData, MapBuildGuids, &FStaticMeshComponentLODInfo::MapBuildDataId);
+	}
+#endif
+
 	Ar << LODData;
 
+#if WITH_EDITOR
+	if (bCheckBuildGuids)
+	{
+		// If we're cooking, display a deterministic cook warning if we didn't overwrite the generated GUIDs at load time
+		UE_CLOG(bCheckBuildGuids && !Algo::AllOf(LODData, &FStaticMeshComponentLODInfo::bMapBuildDataIdLoaded), LogStaticMesh, Warning, TEXT("%s contains a legacy UStaticMeshComponent and is being non-deterministically cooked - please resave the asset and recook."), *GetOutermost()->GetName());
+	}
+#endif
+
 	if (Ar.IsLoading())
 	{
 		for (int32 LODIndex = 0; LODIndex < LODData.Num(); LODIndex++)
@@ -966,21 +1002,50 @@ FTransform UStaticMeshComponent::GetSocketTransform(FName InSocketName, ERelativ
 
 bool UStaticMeshComponent::RequiresOverrideVertexColorsFixup()
 {
-	bool bFixupRequired = false;
-
 #if WITH_EDITORONLY_DATA
-	if ( GetStaticMesh() && GetStaticMesh()->RenderData
-		&& GetStaticMesh()->RenderData->DerivedDataKey != StaticMeshDerivedDataKey
-		&& LODData.Num() > 0
-		&& LODData[0].OverrideVertexColors
-		&& LODData[0].OverrideVertexColors->GetNumVertices() > 0
-		&& LODData[0].PaintedVertices.Num() > 0 )
+	UStaticMesh* Mesh = GetStaticMesh();
+	if (!Mesh)
 	{
-		bFixupRequired = true;
+		return false;
 	}
-#endif // WITH_EDITORONLY_DATA
 
-	return bFixupRequired;
+	if ( !Mesh->RenderData )
+	{
+		return false;
+	}
+
+	if (Mesh->RenderData->DerivedDataKey == StaticMeshDerivedDataKey)
+	{
+		return false;
+	}
+
+	if (LODData.Num() == 0)
+	{
+		return false;
+	}
+
+	FStaticMeshComponentLODInfo& LOD = LODData[0];
+	if (!LOD.OverrideVertexColors)
+	{
+		return false;
+	}
+
+	int32 NumOverrideVertices = LOD.OverrideVertexColors->GetNumVertices();
+	if (NumOverrideVertices == 0)
+	{
+		return false;
+	}
+
+	int32 NumPaintedVertices = LOD.PaintedVertices.Num();
+	if (NumPaintedVertices == 0)
+	{
+		return false;
+	}
+
+	return true;
+#else
+	return false;
+#endif // WITH_EDITORONLY_DATA
 }
 
 void UStaticMeshComponent::SetSectionPreview(int32 InSectionIndexPreview)
@@ -1704,6 +1769,11 @@ void UStaticMeshComponent::PostLoad()
 	InitResources();
 }
 
+bool UStaticMeshComponent::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
 bool UStaticMeshComponent::SetStaticMesh(UStaticMesh* NewMesh)
 {
 	// Do nothing if we are already using the supplied static mesh
@@ -2203,6 +2273,9 @@ void UStaticMeshComponent::ApplyComponentInstanceData(FStaticMeshComponentInstan
 			for (int32 i = 0; i < NumLODLightMaps; ++i)
 			{
 				LODData[i].MapBuildDataId = StaticMeshInstanceData->CachedStaticLighting.MapBuildDataIds[i];
+			#if WITH_EDITOR
+				LODData[i].bMapBuildDataIdLoaded = true;
+			#endif
 			}
 		}
 		else
@@ -2429,6 +2502,9 @@ FStaticMeshComponentLODInfo::FStaticMeshComponentLODInfo(UStaticMeshComponent* I
 	, OwningComponent(InOwningComponent)
 	{
 	MapBuildDataId = FGuid::NewGuid();
+#if WITH_EDITOR
+	bMapBuildDataIdLoaded = false;
+#endif
 }
 
 /** Destructor */
@@ -2590,6 +2666,9 @@ FArchive& operator<<(FArchive& Ar,FStaticMeshComponentLODInfo& I)
 		if (Ar.IsLoading() && Ar.CustomVer(FRenderingObjectVersion::GUID) < FRenderingObjectVersion::MapBuildDataSeparatePackage)
 		{
 			I.MapBuildDataId = FGuid::NewGuid();
+		#if WITH_EDITOR
+			I.bMapBuildDataIdLoaded = false;
+		#endif
 			I.LegacyMapBuildData = new FMeshMapBuildData();
 			Ar << I.LegacyMapBuildData->LightMap;
 			Ar << I.LegacyMapBuildData->ShadowMap;
@@ -2597,6 +2676,12 @@ FArchive& operator<<(FArchive& Ar,FStaticMeshComponentLODInfo& I)
 		else
 		{
 			Ar << I.MapBuildDataId;
+		#if WITH_EDITOR
+			if (Ar.IsLoading())
+			{
+				I.bMapBuildDataIdLoaded = true;
+			}
+		#endif
 		}
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/Components/TextRenderComponent.cpp b/Engine/Source/Runtime/Engine/Private/Components/TextRenderComponent.cpp
index 3587002e1535..3fb34e73c311 100644
--- a/Engine/Source/Runtime/Engine/Private/Components/TextRenderComponent.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Components/TextRenderComponent.cpp
@@ -509,6 +509,8 @@ private:
 
 	void PurgeUnreferencedMIDs()
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FTextRenderComponentMIDCache_PurgeUnreferencedMIDs);
+
 		checkfSlow(IsInGameThread(), TEXT("FTextRenderComponentMIDCache::PurgeUnreferencedMIDs is only expected to be called from the game thread!"));
 
 		TArray<FKey> MIDsToPurgeNow;
diff --git a/Engine/Source/Runtime/Engine/Private/ContentStreaming.cpp b/Engine/Source/Runtime/Engine/Private/ContentStreaming.cpp
index 39625cfef4c6..63771da00543 100644
--- a/Engine/Source/Runtime/Engine/Private/ContentStreaming.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ContentStreaming.cpp
@@ -559,7 +559,9 @@ void IStreamingManager::AddViewInformation( const FVector& ViewOrigin, float Scr
 	// Is this a reasonable location?
 	if ( FMath::Abs(ViewOrigin.X) < (1.0e+20f) && FMath::Abs(ViewOrigin.Y) < (1.0e+20f) && FMath::Abs(ViewOrigin.Z) < (1.0e+20f) )
 	{
-		BoostFactor *= CVarStreamingBoost.GetValueOnGameThread();
+		const float MinBoost = CVarStreamingMinBoost.GetValueOnGameThread();
+		const float BoostScale = FMath::Max(CVarStreamingBoost.GetValueOnGameThread(),MinBoost);
+		BoostFactor *= BoostScale;
 
 		if ( bPendingRemoveViews )
 		{
@@ -602,7 +604,9 @@ void IStreamingManager::AddViewInformation( const FVector& ViewOrigin, float Scr
  */
 void IStreamingManager::AddViewSlaveLocation( const FVector& SlaveLocation, float BoostFactor/*=1.0f*/, bool bOverrideLocation/*=false*/, float Duration/*=0.0f*/ )
 {
-	BoostFactor *= CVarStreamingBoost.GetValueOnGameThread();
+	const float MinBoost = CVarStreamingMinBoost.GetValueOnGameThread();
+	const float BoostScale = FMath::Max(CVarStreamingBoost.GetValueOnGameThread(),MinBoost);
+	BoostFactor *= BoostScale;
 
 	if ( bPendingRemoveViews )
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/CurveTable.cpp b/Engine/Source/Runtime/Engine/Private/CurveTable.cpp
index c83eee4d2e99..e17d6aee97f6 100644
--- a/Engine/Source/Runtime/Engine/Private/CurveTable.cpp
+++ b/Engine/Source/Runtime/Engine/Private/CurveTable.cpp
@@ -508,7 +508,7 @@ TArray<FString> UCurveTable::CreateTableFromJSONString(const FString& InString,
 
 			// Make sure we have a valid float key
 			float EntryKey = 0.0f;
-			if (!Lex::TryParseString(EntryKey, *ParsedTableRowEntry.Key))
+			if (!LexTryParseString(EntryKey, *ParsedTableRowEntry.Key))
 			{
 				OutProblems.Add(FString::Printf(TEXT("Key '%s' on row '%s' is not a float and cannot be parsed."), *ParsedTableRowEntry.Key, *RowName.ToString()));
 				continue;
diff --git a/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColor.cpp b/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColor.cpp
index 80a4bea08ae5..9f4043169e57 100644
--- a/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColor.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColor.cpp
@@ -5,34 +5,106 @@
 =============================================================================*/
 
 #include "Curves/CurveLinearColor.h"
+#include "CanvasItem.h"
 
 FLinearColor FRuntimeCurveLinearColor::GetLinearColorValue(float InTime) const
 {
-	FLinearColor Result;
-
-	Result.R = ColorCurves[0].Eval(InTime);
-	Result.G = ColorCurves[1].Eval(InTime);
-	Result.B = ColorCurves[2].Eval(InTime);
-
-	// No alpha keys means alpha should be 1
-	if (ColorCurves[3].GetNumKeys() == 0)
-	{
-		Result.A = 1.0f;
-	}
-	else
-	{
-		Result.A = ColorCurves[3].Eval(InTime);
-	}
-
-	return Result;
+	return ExternalCurve->GetLinearColorValue(InTime);
 }
 
 UCurveLinearColor::UCurveLinearColor(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
+	, AdjustHue(0.0f)
+	, AdjustSaturation(1.0f)
+	, AdjustBrightness(1.0f)
+	, AdjustBrightnessCurve(1.0f)
+	, AdjustVibrance(0.0f)
+	, AdjustMinAlpha(0.0f)
+	, AdjustMaxAlpha(1.0f)
 {
+#if WITH_EDITOR
+	// if the curve is empty
+	if (FloatCurves[0].GetNumKeys() == 0
+		&& FloatCurves[1].GetNumKeys() == 0
+		&& FloatCurves[2].GetNumKeys() == 0)
+	{
+		// Add a key for Black at 0...
+		FloatCurves[0].AddKey(0.f, 0.f);
+		FloatCurves[1].AddKey(0.f, 0.f);
+		FloatCurves[2].AddKey(0.f, 0.f);
+		FloatCurves[3].AddKey(0.f, 1.f);
+
+		//...and a key for White at 1
+		FloatCurves[0].AddKey(1.f, 1.f);
+		FloatCurves[1].AddKey(1.f, 1.f);
+		FloatCurves[2].AddKey(1.f, 1.f);
+		FloatCurves[3].AddKey(1.f, 1.f);
+	}
+#endif
 }
 
 FLinearColor UCurveLinearColor::GetLinearColorValue( float InTime ) const
+{
+	// Logic copied from .\Engine\Source\Developer\TextureCompressor\Private\TextureCompressorModule.cpp
+	const FLinearColor OriginalColor = GetUnadjustedLinearColorValue(InTime);
+
+	// Convert to HSV
+	FLinearColor HSVColor = OriginalColor.LinearRGBToHSV();
+	float& PixelHue = HSVColor.R;
+	float& PixelSaturation = HSVColor.G;
+	float& PixelValue = HSVColor.B;
+
+	// Apply brightness adjustment
+	PixelValue *= AdjustBrightness;
+
+	// Apply brightness power adjustment
+	if (!FMath::IsNearlyEqual(AdjustBrightnessCurve, 1.0f, (float)KINDA_SMALL_NUMBER) && AdjustBrightnessCurve != 0.0f)
+	{
+		// Raise HSV.V to the specified power
+		PixelValue = FMath::Pow(PixelValue, AdjustBrightnessCurve);
+	}
+
+	// Apply "vibrancy" adjustment
+	if (!FMath::IsNearlyZero(AdjustVibrance, (float)KINDA_SMALL_NUMBER))
+	{
+		const float SatRaisePow = 5.0f;
+		const float InvSatRaised = FMath::Pow(1.0f - PixelSaturation, SatRaisePow);
+
+		const float ClampedVibrance = FMath::Clamp(AdjustVibrance, 0.0f, 1.0f);
+		const float HalfVibrance = ClampedVibrance * 0.5f;
+
+		const float SatProduct = HalfVibrance * InvSatRaised;
+
+		PixelSaturation += SatProduct;
+	}
+
+	// Apply saturation adjustment
+	PixelSaturation *= AdjustSaturation;
+
+	// Apply hue adjustment
+	PixelHue += AdjustHue;
+
+	// Clamp HSV values
+	{
+		PixelHue = FMath::Fmod(PixelHue, 360.0f);
+		if (PixelHue < 0.0f)
+		{
+			// Keep the hue value positive as HSVToLinearRGB prefers that
+			PixelHue += 360.0f;
+		}
+		PixelSaturation = FMath::Clamp(PixelSaturation, 0.0f, 1.0f);
+		PixelValue = FMath::Clamp(PixelValue, 0.0f, 1.0f);
+	}
+
+	// Convert back to a linear color
+	FLinearColor LinearColor = HSVColor.HSVToLinearRGB();
+
+	// Remap the alpha channel
+	LinearColor.A = FMath::Lerp(AdjustMinAlpha, AdjustMaxAlpha, OriginalColor.A);
+	return LinearColor;
+}
+
+FLinearColor UCurveLinearColor::GetUnadjustedLinearColorValue(float InTime) const
 {
 	FLinearColor Result;
 
@@ -41,7 +113,7 @@ FLinearColor UCurveLinearColor::GetLinearColorValue( float InTime ) const
 	Result.B = FloatCurves[2].Eval(InTime);
 
 	// No alpha keys means alpha should be 1
-	if( FloatCurves[3].GetNumKeys() == 0 )
+	if (FloatCurves[3].GetNumKeys() == 0)
 	{
 		Result.A = 1.0f;
 	}
@@ -91,3 +163,61 @@ bool UCurveLinearColor::IsValidCurve( FRichCurveEditInfo CurveInfo )
 		CurveInfo.CurveToEdit == &FloatCurves[3];
 }
 
+#if WITH_EDITOR
+
+void UCurveLinearColor::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	if (PropertyChangedEvent.ChangeType != EPropertyChangeType::Interactive)
+	{
+		OnUpdateGradient.Broadcast(this);
+	}
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void UCurveLinearColor::DrawThumbnail(FCanvas* Canvas, FVector2D StartXY, FVector2D SizeXY)
+{
+	FCanvasTileItem DrawItem(StartXY, FVector2D(1.f, SizeXY.Y), FLinearColor::Black);
+
+	// Render the gradient
+	float Width = SizeXY.X;
+	for (float x = 0.f; x < Width; ++x)
+	{
+		DrawItem.Position.X = StartXY.X + x;
+
+		FLinearColor Color = GetLinearColorValue(x / Width);
+
+		DrawItem.SetColor(Color);
+		DrawItem.Draw(Canvas);
+	}
+}
+
+
+void UCurveLinearColor::PushToSourceData(TArray<FColor> &SrcData, int32 StartXY, FVector2D SizeXY)
+{
+	int32 Start = StartXY;
+	for (uint32 y = 0; y < SizeXY.Y; y++)
+	{
+		// Create base mip for the texture we created.
+		for (uint32 x = 0; x < SizeXY.X; x++)
+		{
+			FLinearColor Color = GetLinearColorValue(x / SizeXY.X);
+			FColor Src = Color.ToFColor(false);
+			SrcData[Start + x + y*SizeXY.X] = Src;
+		}
+	}
+}
+
+void UCurveLinearColor::OnCurveChanged(const TArray<FRichCurveEditInfo>& ChangedCurveEditInfos)
+{
+	FPropertyChangedEvent PropertyChangeStruct(nullptr, EPropertyChangeType::ValueSet);
+	PostEditChangeProperty(PropertyChangeStruct);
+}
+#endif
+
+void UCurveLinearColor::WritePixel(uint8* Pixel, const FLinearColor& Color)
+{
+	Pixel[0] = FMath::FloorToInt(Color.B * 255.999f);
+	Pixel[1] = FMath::FloorToInt(Color.G * 255.999f);
+	Pixel[2] = FMath::FloorToInt(Color.R * 255.999f);
+	Pixel[3] = FMath::FloorToInt(Color.A * 255.999f);
+}
diff --git a/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColorAtlas.cpp b/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColorAtlas.cpp
new file mode 100644
index 000000000000..c3cd31f0b3c5
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Private/Curves/CurveLinearColorAtlas.cpp
@@ -0,0 +1,203 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/*=============================================================================
+	UCurveLinearColorAtlas.cpp
+=============================================================================*/
+
+#include "Curves/CurveLinearColorAtlas.h"
+#include "Curves/CurveLinearColor.h"
+#include "Components/MeshComponent.h"
+#include "Materials/MaterialInstanceDynamic.h"
+
+
+UCurveLinearColorAtlas::UCurveLinearColorAtlas(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+#if WITH_EDITOR
+	TextureSize = 256;
+	GradientPixelSize = 1;
+	bHasAnyDirtyTextures = false;
+	bShowDebugColorsForNullGradients = false;
+	SizeXY = { (float)TextureSize, (float)GradientPixelSize };
+	MipGenSettings = TMGS_NoMipmaps;
+#endif
+	Filter = TextureFilter::TF_Bilinear;
+	SRGB = false;
+	AddressX = TA_Clamp;
+	AddressY = TA_Clamp;
+	CompressionSettings = TC_HDR;
+}
+#if WITH_EDITOR
+void UCurveLinearColorAtlas::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+	// Determine whether any property that requires recompression of the texture, or notification to Materials has changed.
+	bool bRequiresNotifyMaterials = false;
+
+	if (PropertyChangedEvent.Property != nullptr)
+	{
+		const FName PropertyName(PropertyChangedEvent.Property->GetFName());
+		// if Resizing
+		if (PropertyName == GET_MEMBER_NAME_CHECKED(UCurveLinearColorAtlas, TextureSize))
+		{
+			if ((uint32)GradientCurves.Num() > TextureSize)
+			{
+				int32 OldCurveCount = GradientCurves.Num();
+				GradientCurves.RemoveAt(TextureSize, OldCurveCount - TextureSize);
+			}
+
+			Source.Init2DWithMipChain(TextureSize, TextureSize, TSF_BGRA8);
+
+			SizeXY = { (float)TextureSize, (float)GradientPixelSize };
+			UpdateTextures();
+			bRequiresNotifyMaterials = true;
+		}
+		if (PropertyName == GET_MEMBER_NAME_CHECKED(UCurveLinearColorAtlas, GradientCurves))
+		{
+			if ((uint32)GradientCurves.Num() > TextureSize)
+			{
+				int32 OldCurveCount = GradientCurves.Num();
+				GradientCurves.RemoveAt(TextureSize, OldCurveCount - TextureSize);
+			}
+			else
+			{
+				for (int32 i = 0; i < GradientCurves.Num(); ++i)
+				{
+					if (GradientCurves[i] != nullptr)
+					{
+						GradientCurves[i]->OnUpdateGradient.AddUObject(this, &UCurveLinearColorAtlas::UpdateGradientSlot);
+					}
+				}
+				UpdateTextures();
+				bRequiresNotifyMaterials = true;
+			}
+		}	
+	}
+
+	// Notify any loaded material instances if changed our compression format
+	if (bRequiresNotifyMaterials)
+	{
+		NotifyMaterials();
+	}
+}
+void UCurveLinearColorAtlas::PostLoad()
+{
+	for (int32 i = 0; i < GradientCurves.Num(); ++i)
+	{
+		if (GradientCurves[i] != nullptr)
+		{
+			GradientCurves[i]->OnUpdateGradient.AddUObject(this, &UCurveLinearColorAtlas::UpdateGradientSlot);
+		}
+	}
+	UpdateTextures();
+	Super::PostLoad();
+}
+
+static void RenderGradient(TArray<FColor>& InSrcData, UObject* Gradient, int32 StartXY, FVector2D SizeXY)
+{
+	if (Gradient == nullptr)
+	{
+		int32 Start = StartXY;
+		for (uint32 y = 0; y < SizeXY.Y; y++)
+		{
+			// Create base mip for the texture we created.
+			for (uint32 x = 0; x < SizeXY.X; x++)
+			{
+				FColor Src = FLinearColor::White.ToFColor(false);
+				InSrcData[Start + x + y * SizeXY.X] = Src;
+			}
+		}
+	}
+	else if (Gradient->IsA(UCurveLinearColor::StaticClass()))
+	{
+		// Render a gradient
+		UCurveLinearColor* GradientCurve = CastChecked<UCurveLinearColor>(Gradient);
+		GradientCurve->PushToSourceData(InSrcData, StartXY, SizeXY);
+	}
+}
+
+// Immediately render a new material to the specified slot index (SlotIndex must be within this section's range)
+void UCurveLinearColorAtlas::UpdateGradientSlot(UCurveLinearColor* Gradient)
+{
+	check(Gradient);
+
+	int32 SlotIndex = GradientCurves.Find(Gradient);
+
+	if (SlotIndex != INDEX_NONE && (uint32)SlotIndex < MaxSlotsPerTexture())
+	{
+		// Determine the position of the gradient
+		int32 StartXY = SlotIndex * TextureSize * GradientPixelSize;
+
+		// Render the single gradient to the render target
+		RenderGradient(SrcData, Gradient, StartXY, SizeXY);
+
+		uint8* MipData = Source.LockMip(0);
+		FMemory::Memcpy(MipData, SrcData.GetData(), TextureSize*TextureSize*sizeof(FColor));
+		Source.UnlockMip(0);
+
+		// Immediately update the texture
+		UpdateResource();
+	}
+	
+}
+
+// Render any textures
+void UCurveLinearColorAtlas::UpdateTextures()
+{
+	// Save off the data needed to render each gradient.
+	// Callback into the section owner to get the Gradients array
+	SrcData.Empty();
+	SrcData.AddUninitialized(TextureSize*TextureSize);
+
+	int32 NumSlotsToRender = FMath::Min(GradientCurves.Num(), (int32)MaxSlotsPerTexture());
+	for (int32 i = 0; i < NumSlotsToRender; ++i)
+	{
+		if (GradientCurves[i] != nullptr)
+		{
+			int32 StartXY = i * TextureSize * GradientPixelSize;
+			RenderGradient(SrcData, GradientCurves[i], StartXY, SizeXY);
+		}
+
+	}
+
+	for (uint32 y = 0; y < TextureSize; y++)
+	{
+		// Create base mip for the texture we created.
+		FColor Src = FLinearColor::White.ToFColor(false);
+		for (uint32 x = GradientCurves.Num(); x < TextureSize; x++)
+		{
+			SrcData[x*TextureSize + y] = Src;
+		}
+	}
+
+	uint8* MipData = Source.LockMip(0);
+	FMemory::Memcpy(MipData, SrcData.GetData(), TextureSize*TextureSize*sizeof(FColor));
+	Source.UnlockMip(0);
+	UpdateResource();
+
+	bIsDirty = false;
+}
+
+#endif
+
+bool UCurveLinearColorAtlas::GetCurveIndex(UCurveLinearColor* InCurve, int32& Index)
+{
+	Index = GradientCurves.Find(InCurve);
+	if (Index != INDEX_NONE)
+	{
+		return true;
+	}
+	return false;
+}
+
+bool UCurveLinearColorAtlas::GetCurvePosition(UCurveLinearColor* InCurve, float& Position)
+{
+	int32 Index = GradientCurves.Find(InCurve);
+	Position = 0.0f;
+	if (Index != INDEX_NONE)
+	{
+		Position = ((float)Index * GradientPixelSize) / TextureSize + (0.5f * GradientPixelSize) / TextureSize;
+		return true;
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/DataBunch.cpp b/Engine/Source/Runtime/Engine/Private/DataBunch.cpp
index 854da6c30b31..0e89330c392c 100644
--- a/Engine/Source/Runtime/Engine/Private/DataBunch.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DataBunch.cpp
@@ -39,8 +39,8 @@ FInBunch::FInBunch( UNetConnection* InConnection, uint8* Src, int64 CountBits )
 	SetByteSwapping(Connection->bNeedsByteSwapping);
 
 	// Copy network version info
-	ArEngineNetVer = InConnection->EngineNetworkProtocolVersion;
-	ArGameNetVer = InConnection->GameNetworkProtocolVersion;
+	this->SetEngineNetVer(InConnection->EngineNetworkProtocolVersion);
+	this->SetGameNetVer(InConnection->GameNetworkProtocolVersion);
 
 	// Crash protection: the max string size serializable on this archive 
 	ArMaxSerializeSize = MAX_STRING_SERIALIZE_SIZE;
@@ -71,8 +71,8 @@ FInBunch::FInBunch( FInBunch &InBunch, bool CopyBuffer )
 	bIgnoreRPCs = InBunch.bIgnoreRPCs;
 
 	// Copy network version info
-	ArEngineNetVer = InBunch.ArEngineNetVer;
-	ArGameNetVer = InBunch.ArGameNetVer;
+	this->SetEngineNetVer(InBunch.EngineNetVer());
+	this->SetGameNetVer(InBunch.GameNetVer());
 
 	PackageMap = InBunch.PackageMap;
 	
diff --git a/Engine/Source/Runtime/Engine/Private/DataChannel.cpp b/Engine/Source/Runtime/Engine/Private/DataChannel.cpp
index 8719bc1dd304..3735f20ef66b 100644
--- a/Engine/Source/Runtime/Engine/Private/DataChannel.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DataChannel.cpp
@@ -34,6 +34,7 @@ DEFINE_LOG_CATEGORY_STATIC(LogNetPartialBunch, Warning, All);
 DECLARE_CYCLE_STAT(TEXT("ActorChan_CleanUp"), Stat_ActorChanCleanUp, STATGROUP_Net);
 DECLARE_CYCLE_STAT(TEXT("ActorChan_PostNetInit"), Stat_PostNetInit, STATGROUP_Net);
 DECLARE_CYCLE_STAT(TEXT("Channel ReceivedRawBunch"), Stat_ChannelReceivedRawBunch, STATGROUP_Net);
+DECLARE_CYCLE_STAT(TEXT("ActorChan_FindOrCreateRep"), Stat_ActorChanFindOrCreateRep, STATGROUP_Net);
 
 extern FAutoConsoleVariable CVarDoReplicationContextString;
 
@@ -88,6 +89,7 @@ void UChannel::Init( UNetConnection* InConnection, int32 InChIndex, bool InOpene
 	OpenedLocally	= InOpenedLocally;
 	OpenPacketId	= FPacketIdRange();
 	bPausedUntilReliableACK = 0;
+	SentClosingBunch = 0;
 }
 
 
@@ -104,7 +106,7 @@ int64 UChannel::Close()
 
 	int64 NumBits = 0;
 
-	if ( !Closing && ( Connection->State == USOCK_Open || Connection->State == USOCK_Pending ) )
+	if ( !Closing && ( Connection->State == USOCK_Open || Connection->State == USOCK_Pending ) && !SentClosingBunch)
 	{
 		if ( ChIndex == 0 )
 		{
@@ -120,6 +122,8 @@ int64 UChannel::Close()
 		{
 			FOutBunch CloseBunch( this, 1 );
 
+			SentClosingBunch = 1; //in case this send ends up failing and trying to reach back to close the connection, don't allow recursion.
+
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 			CloseBunch.DebugString = FString::Printf(TEXT("%.2f Close: %s"), Connection->Driver->Time, *Describe());
 #endif
@@ -447,6 +451,15 @@ void UChannel::ReceivedRawBunch( FInBunch & Bunch, bool & bOutSkipAck )
 	}
 }
 
+static void LogPartialBunch(const FString& Label, const FInBunch& UberBunch, const FInBunch& PartialBunch)
+{
+	// Don't want to call appMemcrc unless we need to
+	if (UE_LOG_ACTIVE(LogNetPartialBunch, Verbose)) 
+	{
+		UE_LOG(LogNetPartialBunch, Verbose, TEXT("%s Channel: %d ChSequence: %d. NumBits Total: %d. NumBytes Left: %d. Rel: %d CRC 0x%X"), *Label, PartialBunch.ChIndex, PartialBunch.ChSequence, PartialBunch.GetNumBits(), UberBunch.GetBytesLeft(), UberBunch.bReliable, FCrc::MemCrc_DEPRECATED(PartialBunch.GetData(), PartialBunch.GetNumBytes()));
+	}
+}
+
 bool UChannel::ReceivedNextBunch( FInBunch & Bunch, bool & bOutSkipAck )
 {
 	// We received the next bunch. Basically at this point:
@@ -497,11 +510,12 @@ bool UChannel::ReceivedNextBunch( FInBunch & Bunch, bool & bOutSkipAck )
 				check( Bunch.GetBitsLeft() % 8 == 0); // Starting partial bunches should always be byte aligned.
 
 				InPartialBunch->AppendDataFromChecked( Bunch.GetDataPosChecked(), Bunch.GetBitsLeft() );
-				UE_LOG(LogNetPartialBunch, Verbose, TEXT("Received New partial bunch. Channel: %d ChSequence: %d. NumBits Total: %d. NumBits LefT: %d.  Reliable: %d"), InPartialBunch->ChIndex, InPartialBunch->ChSequence, InPartialBunch->GetNumBits(),  Bunch.GetBytesLeft(), Bunch.bReliable);
+
+				LogPartialBunch(TEXT("Received new partial bunch."), Bunch, *InPartialBunch);
 			}
 			else
 			{
-				UE_LOG(LogNetPartialBunch, Verbose, TEXT("Received New partial bunch. It only contained NetGUIDs.  Channel: %d ChSequence: %d. Reliable: %d"), InPartialBunch->ChIndex, InPartialBunch->ChSequence, Bunch.bReliable);
+				LogPartialBunch(TEXT("Received New partial bunch. It only contained NetGUIDs."), Bunch, *InPartialBunch);
 			}
 		}
 		else
@@ -543,10 +557,7 @@ bool UChannel::ReceivedNextBunch( FInBunch & Bunch, bool & bOutSkipAck )
 
 				if (Bunch.bPartialFinal)
 				{
-					if (UE_LOG_ACTIVE(LogNetPartialBunch,Verbose)) // Don't want to call appMemcrc unless we need to
-					{
-						UE_LOG(LogNetPartialBunch, Verbose, TEXT("Completed Partial Bunch: Channel: %d ChSequence: %d. Num: %d Rel: %d CRC 0x%X"), InPartialBunch->ChIndex, InPartialBunch->ChSequence, InPartialBunch->GetNumBits(), Bunch.bReliable, FCrc::MemCrc_DEPRECATED(InPartialBunch->GetData(), InPartialBunch->GetNumBytes()));
-					}
+					LogPartialBunch(TEXT("Completed Partial Bunch."), Bunch, *InPartialBunch);
 
 					check( !Bunch.bHasPackageMapExports );		// Shouldn't have these, they only go in initial partial export bunches
 
@@ -560,10 +571,7 @@ bool UChannel::ReceivedNextBunch( FInBunch & Bunch, bool & bOutSkipAck )
 				}
 				else
 				{
-					if (UE_LOG_ACTIVE(LogNetPartialBunch,Verbose)) // Don't want to call appMemcrc unless we need to
-					{
-						UE_LOG(LogNetPartialBunch, Verbose, TEXT("Received Partial Bunch: Channel: %d ChSequence: %d. Num: %d Rel: %d CRC 0x%X"), InPartialBunch->ChIndex, InPartialBunch->ChSequence, InPartialBunch->GetNumBits(), Bunch.bReliable, FCrc::MemCrc_DEPRECATED(InPartialBunch->GetData(), InPartialBunch->GetNumBytes()));
-					}
+					LogPartialBunch(TEXT("Received Partial Bunch."), Bunch, *InPartialBunch);
 				}
 			}
 			else
@@ -586,7 +594,7 @@ bool UChannel::ReceivedNextBunch( FInBunch & Bunch, bool & bOutSkipAck )
 				{
 					if (InPartialBunch)
 					{
-						UE_LOG(LogNetPartialBunch, Verbose, TEXT("Received Partial Bunch Out of Sequence: Channel: %d ChSequence: %d/%d. Num: %d Rel: %d CRC 0x%X"), InPartialBunch->ChIndex, InPartialBunch->ChSequence, Bunch.ChSequence, InPartialBunch->GetNumBits(), Bunch.bReliable, FCrc::MemCrc_DEPRECATED(InPartialBunch->GetData(), InPartialBunch->GetNumBytes()));
+						LogPartialBunch(TEXT("Received Partial Bunch Out of Sequence."), Bunch, *InPartialBunch);
 					}
 					else
 					{
@@ -1393,8 +1401,7 @@ void UControlChannel::ReceivedBunch( FInBunch& Bunch )
 					// @PotentialDOSAttackDetection
 					check(!FNetControlMessageInfo::IsRegistered(MessageType));
 
-					UE_LOG(LogNet, Error, TEXT("Received unknown control channel message"));
-					ensureMsgf(false, TEXT("Failed to read control channel message %i"), int32(MessageType));
+					UE_LOG(LogNet, Log, TEXT("Received unknown control channel message %i. Closing connection."), int32(MessageType));
 					Connection->Close();
 					return;
 			}
@@ -1564,25 +1571,30 @@ int64 UActorChannel::Close()
 	{
 		bool bKeepReplicators = false;		// If we keep replicators around, we can use them to determine if the actor changed since it went dormant
 
-		if ( Dormant )
+		if (Connection)
 		{
-			if (Connection && Connection->Driver)
+			if (Dormant && !Connection->InternalAck) // Replay connections always keep dormant channels open and handle this logic elsewhere
 			{
-				if (!Connection->Driver->IsServer())
+				if (Connection->Driver)
 				{
-					Actor->NetDormancy = DORM_DormantAll;
+					if (!Connection->Driver->IsServer())
+					{
+						Actor->NetDormancy = DORM_DormantAll;
+					}
+
+					check( Actor->NetDormancy > DORM_Awake ); // Dormancy should have been canceled if game code changed NetDormancy
+					Connection->Driver->NotifyActorFullyDormantForConnection(Actor, Connection);
 				}
 
-				check( Actor->NetDormancy > DORM_Awake ); // Dormancy should have been canceled if game code changed NetDormancy
-				Connection->Driver->NotifyActorFullyDormantForConnection(Actor, Connection);
+				// Validation checking
+				static const auto ValidateCVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("net.DormancyValidate"));
+				if ( ValidateCVar && ValidateCVar->GetValueOnAnyThread() > 0 )
+				{
+					bKeepReplicators = true;		// We need to keep the replicators around so we can use
+				}
 			}
 
-			// Validation checking
-			static const auto ValidateCVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("net.DormancyValidate"));
-			if ( ValidateCVar && ValidateCVar->GetValueOnAnyThread() > 0 )
-			{
-				bKeepReplicators = true;		// We need to keep the replicators around so we can use
-			}
+			// SetClosingFlag() might have already done this, but we need to make sure as that won't get called if the connection itself has already been closed
 		}
 
 		// SetClosingFlag() might have already done this, but we need to make sure as that won't get called if the connection itself has already been closed
@@ -1974,6 +1986,7 @@ void UActorChannel::NotifyActorChannelOpen(AActor* InActor, FInBunch& InBunch)
 			if (World && World->IsRecordingClientReplay() && DemoNetDriver)
 			{
 				DemoNetDriver->GetNetworkObjectList().FindOrAdd(Actor, DemoNetDriver->NetDriverName);
+				DemoNetDriver->FlushActorDormancy(Actor);
 
 				UNetConnection* DemoClientConnection = (DemoNetDriver->ClientConnections.Num() > 0) ? DemoNetDriver->ClientConnections[0] : nullptr;
 				if (DemoClientConnection)
@@ -2050,6 +2063,11 @@ bool UActorChannel::ProcessQueuedBunches()
 		}
 	}
 
+	if (QueuedBunches.Num() == 0)
+	{
+		return true;
+	}
+
 	// Instant replays are played back in a duplicated level collection, so if this is instant replay
 	// playback, the driver's DuplicateLevelID will be something other than INDEX_NONE.
 	const int BunchTimeLimit = Connection->Driver->GetDuplicateLevelID() == INDEX_NONE ?
@@ -2059,12 +2077,11 @@ bool UActorChannel::ProcessQueuedBunches()
 	const bool bHasTimeToProcess = BunchTimeLimit == 0 || Connection->Driver->ProcessQueuedBunchesCurrentFrameMilliseconds < BunchTimeLimit;
 
 	// We can process all of the queued up bunches if ALL of these are true:
-	//	1. We have queued bunches to process
-	//	2. We no longer have any pending guids to load
-	//	3. We aren't still processing bunches on another channel that this actor was previously on
-	//	4. We haven't spent too much time yet this frame processing queued bunches
-	//	5. The driver isn't requesting queuing for this GUID
-	if ( QueuedBunches.Num() > 0 && PendingGuidResolves.Num() == 0 && ( ChIndex == -1 || !Connection->KeepProcessingActorChannelBunchesMap.Contains( ActorNetGUID ) ) &&
+	//	1. We no longer have any pending guids to load
+	//	2. We aren't still processing bunches on another channel that this actor was previously on
+	//	3. We haven't spent too much time yet this frame processing queued bunches
+	//	4. The driver isn't requesting queuing for this GUID
+	if ( PendingGuidResolves.Num() == 0 && ( ChIndex == -1 || !Connection->KeepProcessingActorChannelBunchesMap.Contains( ActorNetGUID ) ) &&
 		 bHasTimeToProcess && !Connection->Driver->ShouldQueueBunchesForActorGUID( ActorNetGUID ) )
 	{
 		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("ProcessQueuedBunches time"), STAT_ProcessQueuedBunchesTime, STATGROUP_Net);
@@ -2261,7 +2278,7 @@ void UActorChannel::ProcessBunch( FInBunch & Bunch )
 				UDemoNetDriver* DemoNetDriver = Cast<UDemoNetDriver>(Connection->Driver);
 				if (DemoNetDriver == nullptr)
 				{
-					UE_LOG(LogNet, Log, TEXT("UActorChannel::ProcessBunch: SerializeNewActor received close bunch for destroyed actor. Actor: %s, Channel: %i"), *GetFullNameSafe(NewChannelActor), ChIndex);
+					UE_LOG(LogNet, Verbose, TEXT("UActorChannel::ProcessBunch: SerializeNewActor received close bunch for destroyed actor. Actor: %s, Channel: %i"), *GetFullNameSafe(NewChannelActor), ChIndex);
 				}
 
 				SetChannelActor(nullptr);
@@ -2659,11 +2676,18 @@ int64 UActorChannel::ReplicateActor()
 		{
 			if (!RepComp.Key().IsValid())
 			{
-				// Write a deletion content header:
-				WriteContentBlockForSubObjectDelete(Bunch, RepComp.Value()->ObjectNetGUID);
+				if (RepComp.Value()->ObjectNetGUID.IsValid())
+				{
+					// Write a deletion content header:
+					WriteContentBlockForSubObjectDelete(Bunch, RepComp.Value()->ObjectNetGUID);
 
-				WroteSomethingImportant = true;
-				Bunch.bReliable = true;
+					WroteSomethingImportant = true;
+					Bunch.bReliable = true;
+				}
+				else
+				{
+					UE_LOG(LogNetTraffic, Error, TEXT("Unable to write subobject delete for (%s), object replicator has invalid NetGUID"), *GetPathNameSafe(Actor));
+				}
 
 				RepComp.Value()->CleanUp();
 				RepComp.RemoveCurrent();
@@ -2783,7 +2807,15 @@ void UActorChannel::BecomeDormant()
 	UE_LOG(LogNetDormancy, Verbose, TEXT("BecomeDormant: %s"), *Describe() );
 	bPendingDormancy = false;
 	Dormant = true;
-	Close();
+	// Replays do not close dormant channels currently, so just mark the channel dormant directly.
+	if (Connection && Connection->InternalAck)
+	{
+		Connection->Driver->NotifyActorFullyDormantForConnection(Actor, Connection);
+	}
+	else
+	{
+		Close();
+	}
 }
 
 bool UActorChannel::ReadyForDormancy(bool suppressLogs)
@@ -3016,14 +3048,13 @@ UObject* UActorChannel::ReadContentBlockHeader( FInBunch & Bunch, bool& bObjectD
 
 	if ( bStablyNamed )
 	{
-		// If this is a stably named sub-object, we shouldn't need to create it
+		// If this is a stably named sub-object, we shouldn't need to create it. Don't raise a bunch error though because this may happen while a level is streaming out.
 		if ( SubObj == NULL )
 		{
 			// (ignore though if this is for replays)
 			if ( !Connection->InternalAck )
 			{
-				UE_LOG( LogNetTraffic, Error, TEXT( "ReadContentBlockHeader: Stably named sub-object not found. Component: %s, Actor: %s" ), *Connection->Driver->GuidCache->FullNetGUIDPath( NetGUID ), *Actor->GetName() );
-				Bunch.SetError();
+				UE_LOG( LogNetTraffic, Log, TEXT( "ReadContentBlockHeader: Stably named sub-object not found. Its level may have streamed out. Component: %s, Actor: %s" ), *Connection->Driver->GuidCache->FullNetGUIDPath( NetGUID ), *Actor->GetName() );
 			}
 
 			return NULL;
@@ -3313,7 +3344,7 @@ FNetFieldExportGroup* UActorChannel::GetOrCreateNetFieldExportGroupForClassNetCa
 
 	check( Object );
 
-	const UClass* ObjectClass = Object->GetClass();
+	UClass* ObjectClass = Object->GetClass();
 
 	checkf( ObjectClass, TEXT( "ObjectClass is null. ObjectName: %s" ), *GetNameSafe( Object ) );
 	checkf( ObjectClass->IsValidLowLevelFast(), TEXT( "ObjectClass is invalid. ObjectName: %s" ), *GetNameSafe( Object ) );
@@ -3367,7 +3398,7 @@ FNetFieldExportGroup* UActorChannel::GetOrCreateNetFieldExportGroupForClassNetCa
 	return NetFieldExportGroup.Get();
 }
 
-FNetFieldExportGroup* UActorChannel::GetNetFieldExportGroupForClassNetCache( const UClass* ObjectClass )
+FNetFieldExportGroup* UActorChannel::GetNetFieldExportGroupForClassNetCache( UClass* ObjectClass )
 {
 	if ( !Connection->InternalAck )
 	{
@@ -3391,6 +3422,9 @@ FObjectReplicator & UActorChannel::GetActorReplicationData()
 
 TSharedRef< FObjectReplicator > & UActorChannel::FindOrCreateReplicator( const TWeakObjectPtr<UObject>& Obj )
 {
+	SCOPE_CYCLE_COUNTER(Stat_ActorChanFindOrCreateRep);
+	SCOPE_CYCLE_UOBJECT(ActorChannelFindOrCreateRep, Obj.Get());
+
 	// First, try to find it on the channel replication map
 	TSharedRef<FObjectReplicator>* ReplicatorRefPtr = ReplicationMap.Find( Obj );
 
diff --git a/Engine/Source/Runtime/Engine/Private/DataReplication.cpp b/Engine/Source/Runtime/Engine/Private/DataReplication.cpp
index 6079a7a0aff4..bc6c952f3596 100644
--- a/Engine/Source/Runtime/Engine/Private/DataReplication.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DataReplication.cpp
@@ -296,18 +296,33 @@ void FObjectReplicator::CleanUp()
 
 void FObjectReplicator::StartReplicating( class UActorChannel * InActorChannel )
 {
-	check( OwningChannel == NULL );
+	check( OwningChannel == nullptr );
 
-	if ( GetObject() == NULL )
+	UObject* const Object = GetObject();
+	if ( Object == nullptr )
 	{
-		UE_LOG(LogRep, Error, TEXT("StartReplicating: Object == NULL"));
+		UE_LOG(LogRep, Error, TEXT("StartReplicating: Object == nullptr"));
 		return;
 	}
 
+	if ( !ensureMsgf( ObjectClass != nullptr, TEXT( "StartReplicating: ObjectClass == nullptr. Object = %s. Channel actor = %s. %s" ), *GetFullNameSafe( Object ), *GetFullNameSafe( InActorChannel->GetActor() ), *InActorChannel->Connection->Describe() ) )
+	{
+		return;
+	}
+
+	if ( UClass* const ObjectPtrClass = Object->GetClass() )
+	{
+		// Something is overwriting a bit in the ObjectClass pointer so it's becoming invalid - fix up the pointer to prevent crashing later until the real cause can be identified.
+		if ( !ensureMsgf( ObjectClass == ObjectPtrClass, TEXT( "StartReplicating: ObjectClass and ObjectPtr's class are not equal and they should be. Object = %s. Channel actor = %s. %s" ), *GetFullNameSafe( Object ), *GetFullNameSafe( InActorChannel->GetActor() ), *InActorChannel->Connection->Describe() ) )
+		{
+			ObjectClass = ObjectPtrClass;
+		}
+	}
+
 	OwningChannel = InActorChannel;
 
 	// Cache off netGUID so if this object gets deleted we can close it
-	ObjectNetGUID = OwningChannel->Connection->Driver->GuidCache->GetOrAssignNetGUID( GetObject() );
+	ObjectNetGUID = OwningChannel->Connection->Driver->GuidCache->GetOrAssignNetGUID( Object );
 	check( !ObjectNetGUID.IsDefault() && ObjectNetGUID.IsValid() );
 
 	// Allocate retirement list.
@@ -315,7 +330,7 @@ void FObjectReplicator::StartReplicating( class UActorChannel * InActorChannel )
 	Retirement.SetNum( ObjectClass->ClassReps.Num() );
 
 	// figure out list of replicated object properties
-	for ( UProperty* Prop = ObjectClass->PropertyLink; Prop != NULL; Prop = Prop->PropertyLinkNext )
+	for ( const UProperty* Prop = ObjectClass->PropertyLink; Prop != nullptr; Prop = Prop->PropertyLinkNext )
 	{
 		if ( Prop->PropertyFlags & CPF_Net )
 		{
@@ -337,14 +352,15 @@ void FObjectReplicator::StartReplicating( class UActorChannel * InActorChannel )
 		}
 	}
 
+	const UWorld* const World = Connection->Driver->GetWorld();
 	// Prefer the changelist manager on the main net driver (so we share across net drivers if possible)
-	if ( Connection->Driver->GetWorld() && Connection->Driver->GetWorld()->NetDriver )
+	if ( World && World->NetDriver )
 	{
-		ChangelistMgr = Connection->Driver->GetWorld()->NetDriver->GetReplicationChangeListMgr( GetObject() );
+		ChangelistMgr = World->NetDriver->GetReplicationChangeListMgr( Object );
 	}
 	else
 	{
-		ChangelistMgr = Connection->Driver->GetReplicationChangeListMgr( GetObject() );
+		ChangelistMgr = Connection->Driver->GetReplicationChangeListMgr( Object );
 	}
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/DataTableCSV.cpp b/Engine/Source/Runtime/Engine/Private/DataTableCSV.cpp
index 22d094e4522e..32939beaec92 100644
--- a/Engine/Source/Runtime/Engine/Private/DataTableCSV.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DataTableCSV.cpp
@@ -116,10 +116,10 @@ bool FDataTableImporterCSV::ReadTable()
 	const FCsvParser Parser(CSVData);
 	const auto& Rows = Parser.GetRows();
 
-	// Must have at least 2 rows (column names + data)
-	if(Rows.Num() <= 1)
+	// Must have at least a header row (column names)
+	if(Rows.Num() < 1)
 	{
-		ImportProblems.Add(TEXT("Too few rows."));
+		ImportProblems.Add(TEXT("Too few rows (there must be at least a header row)."));
 		return false;
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/DebugViewModeHelpers.cpp b/Engine/Source/Runtime/Engine/Private/DebugViewModeHelpers.cpp
index f53ff199640a..a28fd99ece11 100644
--- a/Engine/Source/Runtime/Engine/Private/DebugViewModeHelpers.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DebugViewModeHelpers.cpp
@@ -10,6 +10,7 @@
 #include "Misc/FeedbackContext.h"
 #include "Engine/World.h"
 #include "Components/PrimitiveComponent.h"
+#include "ActorEditorUtils.h"
 
 #define LOCTEXT_NAMESPACE "LogDebugViewMode"
 
@@ -181,7 +182,7 @@ bool GetUsedMaterialsInWorld(UWorld* InWorld, OUT TSet<UMaterialInterface*>& Out
 			}
 
 			// Check the actor after incrementing the progress.
-			if (!Actor)
+			if (!Actor || FActorEditorUtils::IsABuilderBrush(Actor))
 			{
 				continue;
 			}
diff --git a/Engine/Source/Runtime/Engine/Private/DemoNetDriver.cpp b/Engine/Source/Runtime/Engine/Private/DemoNetDriver.cpp
index c0473b9cf7d8..358b7a314f16 100644
--- a/Engine/Source/Runtime/Engine/Private/DemoNetDriver.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DemoNetDriver.cpp
@@ -36,9 +36,12 @@
 #include "Kismet/GameplayStatics.h"
 #include "ProfilingDebugging/CsvProfiler.h"
 #include "Misc/EngineVersion.h"
+#include "Stats/Stats2.h"
 
 DEFINE_LOG_CATEGORY( LogDemo );
 
+CSV_DECLARE_CATEGORY_MODULE_EXTERN(CORE_API, Basic);
+
 static TAutoConsoleVariable<float> CVarDemoRecordHz( TEXT( "demo.RecordHz" ), 8, TEXT( "Maximum number of demo frames recorded per second" ) );
 static TAutoConsoleVariable<float> CVarDemoMinRecordHz(TEXT("demo.MinRecordHz"), 0, TEXT("Minimum number of demo frames recorded per second (use with care)"));
 static TAutoConsoleVariable<float> CVarDemoTimeDilation( TEXT( "demo.TimeDilation" ), -1.0f, TEXT( "Override time dilation during demo playback (-1 = don't override)" ) );
@@ -91,20 +94,23 @@ static void ConditionallyDisplayBurnInTime(uint32 RecordedCL, float CurrentDemoT
 	}
 }
 
-static FString GetLevelPackageName(const ULevel& InLevel)
-{
-	// TODO: Do we need to call NetworkRemapPath here?
-	//			If so, consider passing in a bool indicating if this is
-	//			for playback / recording, or maybe move it into DemoNetDriver.
-	return InLevel.GetOutermost()->GetFName().ToString();
-}
-
 static void FlushNetChecked(UNetConnection& NetConnection)
 {
 	NetConnection.FlushNet();
 	check(NetConnection.SendBuffer.GetNumBits() == 0);
 }
 
+static bool ShouldActorGoDormantForDemo(const AActor* Actor, const UActorChannel* Channel)
+{
+	if ( Actor->NetDormancy <= DORM_Awake || !Channel || Channel->bPendingDormancy || Channel->Dormant )
+{
+		// Either shouldn't go dormant, or is already dormant
+		return false;
+	}
+
+	return true;
+}
+
 // Helps manage packets, and any associations with streaming levels or exported GUIDs / fields.
 class FScopedPacketManager
 {
@@ -231,9 +237,12 @@ class FJumpToLiveReplayTask : public FQueuedReplayTask
 public:
 	FJumpToLiveReplayTask( UDemoNetDriver* InDriver ) : FQueuedReplayTask( InDriver )
 	{
+		if (Driver.IsValid())
+		{
 		InitialTotalDemoTime	= Driver->ReplayStreamer->GetTotalDemoTime();
 		TaskStartTime			= FPlatformTime::Seconds();
 	}
+	}
 
 	virtual void StartTask()
 	{
@@ -241,6 +250,11 @@ public:
 
 	virtual bool Tick() override
 	{
+		if (!Driver.IsValid())
+		{
+			return true;
+		}
+
 		if ( !Driver->ReplayStreamer->IsLive() )
 		{
 			// The replay is no longer live, so don't try to jump to end
@@ -287,6 +301,11 @@ public:
 
 	virtual void StartTask() override
 	{		
+		if (!Driver.IsValid())
+		{
+			return;
+		}
+
 		check( !Driver->IsFastForwarding() );
 
 		OldTimeInSeconds		= Driver->DemoCurrentTime;	// Rember current time, so we can restore on failure
@@ -296,7 +315,7 @@ public:
 		Driver->DemoCurrentTime = FMath::Clamp( Driver->DemoCurrentTime, 0.0f, Driver->DemoTotalTime - 0.01f );
 
 		// Tell the streamer to start going to this time
-		Driver->ReplayStreamer->GotoTimeInMS( Driver->DemoCurrentTime * 1000, FOnCheckpointReadyDelegate::CreateRaw( this, &FGotoTimeInSecondsTask::CheckpointReady ) );
+		Driver->ReplayStreamer->GotoTimeInMS(Driver->DemoCurrentTime * 1000, FGotoCallback::CreateSP(this, &FGotoTimeInSecondsTask::CheckpointReady));
 
 		// Pause channels while we wait (so the world is paused while we wait for the new stream location to load)
 		Driver->PauseChannels( true );
@@ -310,6 +329,11 @@ public:
 			return true;
 		}
 
+		if (!Driver.IsValid())
+		{
+			return true;
+		}
+
 		if ( GotoCheckpointArchive != nullptr )
 		{
 			if ( GotoCheckpointSkipExtraTimeInMS > 0 && !Driver->ReplayStreamer->IsDataAvailable() )
@@ -332,27 +356,35 @@ public:
 		return ReplayTaskNames::GotoTimeInSecondsTask;
 	}
 
-	void CheckpointReady( const bool bSuccess, const int64 SkipExtraTimeInMS )
+	void CheckpointReady( const FGotoResult& Result )
 	{
+		if (!Driver.IsValid())
+	{
+			return;
+		}
+
 		check( GotoCheckpointArchive == nullptr );
 		check( GotoCheckpointSkipExtraTimeInMS == -1 );
 
-		if ( !bSuccess )
+		if (!Result.WasSuccessful())
 		{
 			UE_LOG( LogDemo, Warning, TEXT( "FGotoTimeInSecondsTask::CheckpointReady: Failed to go to checkpoint." ) );
 
+			if (Driver.IsValid())
+			{
 			// Restore old demo time
 			Driver->DemoCurrentTime = OldTimeInSeconds;
 
 			// Call delegate if any
 			Driver->NotifyGotoTimeFinished(false);
+			}
 
 			GotoCheckpointSkipExtraTimeInMS = -2;	// So tick can detect failure case
 			return;
 		}
 
 		GotoCheckpointArchive			= Driver->ReplayStreamer->GetCheckpointArchive();
-		GotoCheckpointSkipExtraTimeInMS = SkipExtraTimeInMS;
+		GotoCheckpointSkipExtraTimeInMS = Result.ExtraTimeMS;
 	}
 
 	float				OldTimeInSeconds;		// So we can restore on failure
@@ -370,6 +402,11 @@ public:
 
 	virtual void StartTask() override
 	{
+		if (!Driver.IsValid())
+		{
+			return;
+		}
+
 		check( !Driver->IsFastForwarding() );
 
 		const uint32 TimeInMSToCheck = FMath::Clamp( Driver->GetDemoCurrentTimeInMS() + ( uint32 )( SecondsToSkip * 1000 ), ( uint32 )0, Driver->ReplayStreamer->GetTotalDemoTime() );
@@ -397,10 +434,15 @@ class FFastForwardLevelsTask : public FQueuedReplayTask
 {
 public:
 
-	FFastForwardLevelsTask( UDemoNetDriver* InDriver ) : FQueuedReplayTask( InDriver ), bSkipWork(false), CheckpointArchive(nullptr), CheckpointSkipExtraTimeInMS(-1) { }
+	FFastForwardLevelsTask( UDemoNetDriver* InDriver ) : FQueuedReplayTask( InDriver ), GotoTime(0), bSkipWork(false), CheckpointArchive(nullptr), CheckpointSkipExtraTimeInMS(-1) { }
 
 	virtual void StartTask() override
 	{
+		if (!Driver.IsValid())
+		{
+			return;
+		}
+
 		check(!Driver->IsFastForwarding());
 
 		// If there's a GotoTimeInSeconds task pending, we don't need to do any work.
@@ -412,12 +454,12 @@ public:
 		}
 		else
 		{
-			// Tell the streamer to start going to this time.
-			// This should force the streamer to get the correct checkpoint and set of packets.
-			CheckpointReadyDelegate = FOnCheckpointReadyDelegate::CreateRaw(this, &FFastForwardLevelsTask::CheckpointReady);
+			// Make sure we request all the data we need so we don't end up doing a "partial" fast forward which
+			// could cause the level to miss network updates.
+			const float LastProcessedPacketTime = FPendingTaskHelper::GetLastProcessedPacketTime(Driver.Get());
+			GotoTime = LastProcessedPacketTime * 1000;
 
-			const float LastProcessedPacketTime = FPendingTaskHelper::GetLastProcessedPacketTime(Driver);
-			const uint32 GotoTime = LastProcessedPacketTime * 1000;
+			CheckpointReadyDelegate = FGotoCallback::CreateSP(this, &FFastForwardLevelsTask::CheckpointReady);
 			Driver->ReplayStreamer->GotoTimeInMS(GotoTime, CheckpointReadyDelegate);
 
 			// Pause channels while we wait (so the world is paused while we wait for the new stream location to load)
@@ -427,31 +469,30 @@ public:
 
 	virtual bool Tick() override
 	{
-		if (CheckpointSkipExtraTimeInMS == -2)
+		if (bSkipWork)
+		{
+			return true;
+		}
+
+		else if (CheckpointSkipExtraTimeInMS == -2)
 		{
 			// Detect failure case
 			return true;
 		}
-
-		if (CheckpointArchive != nullptr)
+		else if (CheckpointArchive != nullptr)
 		{
-			// Skip loading anything, because there's a pending GotoTime.
-			// Note, we still needed to wait until the checkpoint was loaded so our delegates were
-			// properly cleared from the streamer.
-			if (bSkipWork)
+			if (!Driver.IsValid())
 			{
 				return true;
 			}
 		
-			if (CheckpointSkipExtraTimeInMS > 0 && !Driver->ReplayStreamer->IsDataAvailable())
+			// If not all data is available, we could end only partially fast forwarding the levels.
+			if (CheckpointSkipExtraTimeInMS > 0 && !Driver->ReplayStreamer->IsDataAvailableForTimeRange(GotoTime - CheckpointSkipExtraTimeInMS, GotoTime))
 			{
-				// Wait for rest of stream before loading checkpoint
-				// We do this so we can load the checkpoint and fastforward the stream all at once
-				// We do this so that the OnReps don't stay queued up outside of this frame
 				return false;
 			}
 
-			return FPendingTaskHelper::FastForwardLevels(Driver, CheckpointArchive, CheckpointSkipExtraTimeInMS);
+			return FPendingTaskHelper::FastForwardLevels(Driver.Get(), CheckpointArchive, CheckpointSkipExtraTimeInMS);
 		}
 
 		return false;
@@ -462,29 +503,30 @@ public:
 		return ReplayTaskNames::FastForwardLevelsTask;
 	}
 
-	void CheckpointReady( const bool bSuccess, const int64 SkipExtraTimeInMS )
+	void CheckpointReady( const FGotoResult& Result )
 	{
 		check( CheckpointArchive == nullptr );
 		check( CheckpointSkipExtraTimeInMS == -1 );
 
-		if ( !bSuccess )
+		if ( !Result.WasSuccessful() )
 		{
 			UE_LOG( LogDemo, Warning, TEXT( "FFastForwardLevelsTask::CheckpointReady: Faled to get checkpoint." ) );
 			CheckpointSkipExtraTimeInMS = -2;
 		}
-		else
+		else if (Driver.IsValid())
 		{
 			CheckpointArchive = Driver->ReplayStreamer->GetCheckpointArchive();
-			CheckpointSkipExtraTimeInMS = SkipExtraTimeInMS;
+			CheckpointSkipExtraTimeInMS = Result.ExtraTimeMS;
 		}
 	}
 
 private:
 
+	uint32			GotoTime;
 	bool						bSkipWork;
 	FArchive*					CheckpointArchive;				
 	int64						CheckpointSkipExtraTimeInMS;
-	FOnCheckpointReadyDelegate	CheckpointReadyDelegate;
+	FGotoCallback	CheckpointReadyDelegate;
 };
 
 /*-----------------------------------------------------------------------------
@@ -498,6 +540,13 @@ UDemoNetDriver::UDemoNetDriver(const FObjectInitializer& ObjectInitializer)
 	CurrentLevelIndex = 0;
 	bRecordMapChanges = false;
 	bIsWaitingForHeaderDownload = false;
+	bIsWaitingForStream = false;
+}
+
+FString UDemoNetDriver::GetLevelPackageName(const ULevel& InLevel)
+{
+	FString PathName = InLevel.GetOutermost()->GetFName().ToString();
+	return UWorld::RemovePIEPrefix(PathName);
 }
 
 void UDemoNetDriver::AddReplayTask( FQueuedReplayTask* NewTask )
@@ -570,7 +619,7 @@ bool UDemoNetDriver::IsNamedTaskInQueue( const FName& Name ) const
 
 	for ( int32 i = 0; i < QueuedReplayTasks.Num(); i++ )
 	{
-		if ( QueuedReplayTasks[0]->GetName() == Name )
+		if ( QueuedReplayTasks[i]->GetName() == Name )
 		{
 			return true;
 		}
@@ -602,6 +651,8 @@ bool UDemoNetDriver::InitBase( bool bInitAsClient, FNetworkNotify* InNotify, con
 		ViewerOverride					= nullptr;
 		bPrioritizeActors				= false;
 		bPauseRecording					= false;
+		PlaybackPacketIndex				= 0;
+		CheckpointSaveMaxMSPerFrame		= -1.0f;
 
 		if ( RelevantTimeout == 0.0f )
 		{
@@ -613,6 +664,12 @@ bool UDemoNetDriver::InitBase( bool bInitAsClient, FNetworkNotify* InNotify, con
 		const TCHAR* const StreamerOverride = URL.GetOption(TEXT("ReplayStreamerOverride="), nullptr);
 		ReplayStreamer = FNetworkReplayStreaming::Get().GetFactory(StreamerOverride).CreateReplayStreamer();
 
+		const TCHAR* const DemoPath = URL.GetOption(TEXT("ReplayStreamerDemoPath="), nullptr);
+		if (DemoPath != nullptr && ReplayStreamer.IsValid())
+		{
+			ReplayStreamer->SetDemoPath(DemoPath);
+		}
+
 		return true;
 	}
 
@@ -648,6 +705,14 @@ void UDemoNetDriver::ResetDemoState()
 	DemoTotalFrames			= 0;
 	LatestReadFrameTime		= 0.0f;
 	LastProcessedPacketTime	= 0.0f;
+	PlaybackPacketIndex		= 0;
+
+	bIsFastForwarding = false;
+	bIsFastForwardingForCheckpoint = false;
+	bWasStartStreamingSuccessful = false;
+	bIsLoadingCheckpoint = false;
+	bIsWaitingForHeaderDownload = false;
+	bIsWaitingForStream = false;
 
 	ExternalDataToObjectMap.Empty();
 	PlaybackPackets.Empty();
@@ -694,11 +759,11 @@ bool UDemoNetDriver::InitConnect( FNetworkNotify* InNotify, const FURL& ConnectU
 
 	if ( GetWorld()->GetGameInstance()->GetFirstGamePlayer() != nullptr )
 	{
-		TSharedPtr<const FUniqueNetId> ViewerId = GetWorld()->GetGameInstance()->GetFirstGamePlayer()->GetPreferredUniqueNetId();
+		FUniqueNetIdRepl ViewerId = GetWorld()->GetGameInstance()->GetFirstGamePlayer()->GetPreferredUniqueNetId();
 
 		if ( ViewerId.IsValid() )
 		{ 
-			UserNames.Add( ViewerId->ToString() );
+			UserNames.Add( ViewerId.ToString() );
 		}
 	}
 
@@ -727,19 +792,22 @@ bool UDemoNetDriver::InitConnect( FNetworkNotify* InNotify, const FURL& ConnectU
 		}
 	}
 
+	bIsWaitingForStream = true;
 	bWasStartStreamingSuccessful = true;
 
+	ActiveReplayName = DemoURL.Map;
 	ReplayStreamer->StartStreaming( 
 		DemoURL.Map, 
 		FString(),		// Friendly name isn't important for loading an existing replay.
 		UserNames, 
 		false, 
 		FNetworkVersion::GetReplayVersion(), 
-		FOnStreamReadyDelegate::CreateUObject( this, &UDemoNetDriver::ReplayStreamingReady ) );
+		FStartStreamingCallback::CreateUObject( this, &UDemoNetDriver::ReplayStreamingReady ) );
 
 	return bWasStartStreamingSuccessful;
 }
 
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
 bool UDemoNetDriver::ReadPlaybackDemoHeader(FString& Error)
 {
 	UGameInstance* GameInstance = GetWorld()->GetGameInstance();
@@ -782,6 +850,7 @@ bool UDemoNetDriver::ReadPlaybackDemoHeader(FString& Error)
 
 	return true;
 }
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 bool UDemoNetDriver::InitConnectInternal( FString& Error )
 {
@@ -908,13 +977,16 @@ bool UDemoNetDriver::InitListen( FNetworkNotify* InNotify, FURL& ListenURL, bool
 		}
 	}
 
+	bIsWaitingForStream = true;
+
+	ActiveReplayName = DemoURL.Map;
 	ReplayStreamer->StartStreaming(
 		DemoURL.Map,
 		FriendlyNameOption != nullptr ? FString(FriendlyNameOption) : World->GetMapName(),
 		UserNames,
 		true,
 		FNetworkVersion::GetReplayVersion(),
-		FOnStreamReadyDelegate::CreateUObject( this, &UDemoNetDriver::ReplayStreamingReady ) );
+		FStartStreamingCallback::CreateUObject( this, &UDemoNetDriver::ReplayStreamingReady ) );
 
 	AddNewLevel(World->GetOuter()->GetName());
 
@@ -967,7 +1039,14 @@ void UDemoNetDriver::OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld)
 			// Make sure we don't try to fast-forward this level later.
 			LevelsPendingFastForward.Remove(InLevel);
 			NewStreamingLevelsThisFrame.Remove(InLevel);
+		}
+	}
+}
 
+void UDemoNetDriver::NotifyStreamingLevelUnload( ULevel* InLevel )
+{
+	if (InLevel && !InLevel->bClientOnlyVisible && HasLevelStreamingFixes() && IsPlaying())
+	{
 			// We can't just iterate over the levels actors, because the ones in the queue will already have been destroyed.
 			for (TMap<FString, FRollbackNetStartupActorInfo>::TIterator It = RollbackNetStartupActors.CreateIterator(); It; ++It)
 			{
@@ -977,7 +1056,8 @@ void UDemoNetDriver::OnLevelRemovedFromWorld(ULevel* InLevel, UWorld* InWorld)
 				}
 			}
 		}
-	}
+
+	Super::NotifyStreamingLevelUnload(InLevel);
 }
 
 void UDemoNetDriver::OnPostLoadMapWithWorld(UWorld* InWorld)
@@ -1108,6 +1188,11 @@ bool UDemoNetDriver::IsPlaying() const
 	return IsLoadingCheckpoint() || (ServerConnection != nullptr && ServerConnection->State != USOCK_Closed);
 }
 
+bool UDemoNetDriver::IsServer() const
+{
+	return (ServerConnection == nullptr) || IsRecording();
+}
+
 bool UDemoNetDriver::ShouldTickFlushAsyncEndOfFrame() const
 {
 	return	GEngine && GEngine->ShouldDoAsyncEndOfFrameTasks() && CVarDemoClientRecordAsyncEndOfFrame.GetValueOnAnyThread() != 0 && World && World->IsRecordingClientReplay();
@@ -1147,7 +1232,7 @@ void UDemoNetDriver::TickFlushInternal( float DeltaSeconds )
 
 	Super::TickFlush( DeltaSeconds );
 
-	if (!IsRecording())
+	if (!IsRecording() || bIsWaitingForStream)
 	{
 		// Nothing to do
 		return;
@@ -1156,12 +1241,7 @@ void UDemoNetDriver::TickFlushInternal( float DeltaSeconds )
 	if ( ReplayStreamer->GetLastError() != ENetworkReplayError::None )
 	{
 		UE_LOG( LogDemo, Error, TEXT( "UDemoNetDriver::TickFlush: ReplayStreamer ERROR: %s" ), ENetworkReplayError::ToString( ReplayStreamer->GetLastError() ) );
-		const bool bIsPlaying = IsPlaying();
 		StopDemo();
-		if ( bIsPlaying )
-		{
-			World->GetGameInstance()->HandleDemoPlaybackFailure( EDemoPlayFailure::Generic, FString( EDemoPlayFailure::ToString( EDemoPlayFailure::Generic ) ) );
-		}
 		return;
 	}
 
@@ -1247,7 +1327,7 @@ void UDemoNetDriver::TickDispatch( float DeltaSeconds )
 
 	Super::TickDispatch( DeltaSeconds );
 
-	if ( !IsPlaying() )
+	if ( !IsPlaying() || bIsWaitingForStream )
 	{
 		// Nothing to do
 		return;
@@ -1256,12 +1336,7 @@ void UDemoNetDriver::TickDispatch( float DeltaSeconds )
 	if ( ReplayStreamer->GetLastError() != ENetworkReplayError::None )
 	{
 		UE_LOG( LogDemo, Error, TEXT( "UDemoNetDriver::TickDispatch: ReplayStreamer ERROR: %s" ), ENetworkReplayError::ToString( ReplayStreamer->GetLastError() ) );
-		const bool bIsPlaying = IsPlaying();
-		StopDemo();
-		if ( bIsPlaying )
-		{
-			World->GetGameInstance()->HandleDemoPlaybackFailure( EDemoPlayFailure::Generic, FString( EDemoPlayFailure::ToString( EDemoPlayFailure::Generic ) ) );
-		}
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return;
 	}
 
@@ -1270,7 +1345,7 @@ void UDemoNetDriver::TickDispatch( float DeltaSeconds )
 	if ( FileAr == nullptr )
 	{
 		UE_LOG( LogDemo, Error, TEXT( "UDemoNetDriver::TickDispatch: FileAr == nullptr" ) );
-		StopDemo();
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return;
 	}
 
@@ -1327,7 +1402,7 @@ void UDemoNetDriver::TickDispatch( float DeltaSeconds )
 	TickDemoPlayback( DeltaSeconds );
 
 	// Used LastProcessedPacketTime because it will correlate better with recorded frame time.
-	ConditionallyDisplayBurnInTime(PlaybackDemoHeader.Changelist, LastProcessedPacketTime);
+	ConditionallyDisplayBurnInTime(PlaybackDemoHeader.EngineVersion.GetChangelist(), LastProcessedPacketTime);
 }
 
 void UDemoNetDriver::ProcessRemoteFunction( class AActor* Actor, class UFunction* Function, void* Parameters, struct FOutParmRec* OutParms, struct FFrame* Stack, class UObject* SubObject )
@@ -1382,7 +1457,7 @@ void UDemoNetDriver::StopDemo()
 		UE_LOG( LogDemo, Log, TEXT( "StopDemo: No demo is playing" ) );
 		return;
 	}
-
+	OnDemoFinishRecordingDelegate.Broadcast();
 	UE_LOG( LogDemo, Log, TEXT( "StopDemo: Demo %s stopped at frame %d" ), *DemoURL.Map, DemoFrameNum );
 
 	if ( !ServerConnection )
@@ -1404,6 +1479,8 @@ void UDemoNetDriver::StopDemo()
 
 	ReplayStreamer->StopStreaming();
 	ClearReplayTasks();
+	ActiveReplayName = FString();
+	ResetDemoState();
 
 	check( !IsRecording() && !IsPlaying() );
 }
@@ -1469,11 +1546,11 @@ bool UDemoNetDriver::DemoReplicateActor(AActor* Actor, UNetConnection* Connectio
 	return bDidReplicateActor;
 }
 
-static void SerializeGuidCache( TSharedPtr< class FNetGUIDCache > GuidCache, FArchive* CheckpointArchive )
+void UDemoNetDriver::SerializeGuidCache(TSharedPtr<FNetGUIDCache> InGuidCache, FArchive* CheckpointArchive)
 {
 	int32 NumValues = 0;
 
-	for ( auto It = GuidCache->ObjectLookup.CreateIterator(); It; ++It )
+	for ( auto It = InGuidCache->ObjectLookup.CreateIterator(); It; ++It )
 	{
 		FNetGuidCacheObject& CacheObject = It.Value();
 
@@ -1489,7 +1566,7 @@ static void SerializeGuidCache( TSharedPtr< class FNetGUIDCache > GuidCache, FAr
 
 	UE_LOG( LogDemo, Verbose, TEXT( "Checkpoint. SerializeGuidCache: %i" ), NumValues );
 
-	for ( auto It = GuidCache->ObjectLookup.CreateIterator(); It; ++It )
+	for ( auto It = InGuidCache->ObjectLookup.CreateIterator(); It; ++It )
 	{
 		FNetworkGUID& NetworkGUID = It.Key();
 		FNetGuidCacheObject& CacheObject = It.Value();
@@ -1501,6 +1578,8 @@ static void SerializeGuidCache( TSharedPtr< class FNetGUIDCache > GuidCache, FAr
 
 		FString PathName = CacheObject.Object->GetName();
 
+		GEngine->NetworkRemapPath(this, PathName, false);
+
 		*CheckpointArchive << NetworkGUID;
 		*CheckpointArchive << CacheObject.OuterGUID;
 		*CheckpointArchive << PathName;
@@ -1610,11 +1689,16 @@ void UDemoNetDriver::SaveCheckpoint()
 	TotalCheckpointSaveTimeSeconds = 0;
 	TotalCheckpointSaveFrames = 0;
 
+	LastCheckpointTime = DemoCurrentTime;
+
 	UE_LOG( LogDemo, Log, TEXT( "Starting checkpoint. Actors: %i" ), GetNetworkObjectList().GetActiveObjects().Num() );
 
-	// Do the first checkpoint tick now
+	// Do the first checkpoint tick now if we're not amortizing
+	if (GetCheckpointSaveMaxMSPerFrame() <= 0.0f)
+	{
 	TickCheckpoint();
 }
+}
 
 class FRepActorsCheckpointParams
 {
@@ -1742,17 +1826,21 @@ void UDemoNetDriver::TickCheckpoint()
 		const uint32 GuidCacheSize = CheckpointArchive->TotalSize();
 
 		// This will cause the entire name list to be written out again.
-		NumLevelsAddedThisFrame = AllLevelStatuses.Num();
+		// Note, WriteDemoFrameFromQueuedDemoPackets will set this to 0 so we guard the value.
+		// This is because when checkpoint amortization is enabled, it's possible for new levels to stream
+		// in while recording a checkpoint, and we want to make sure those get written out to the normal
+		// streaming archive next frame.
+		TGuardValue<uint32> NumLevelsAddedThisFrameGuard(NumLevelsAddedThisFrame, AllLevelStatuses.Num());
 
 		// Write out all of the queued up packets generated while saving the checkpoint
-		WriteDemoFrameFromQueuedDemoPackets( *CheckpointArchive, ClientConnection->QueuedCheckpointPackets );
+		WriteDemoFrameFromQueuedDemoPackets( *CheckpointArchive, ClientConnection->QueuedCheckpointPackets, static_cast<float>(LastCheckpointTime) );
 
 		// Get the total checkpoint size
 		const int32 TotalCheckpointSize = CheckpointArchive->TotalSize();
 
 		if ( CheckpointArchive->TotalSize() > 0 )
 		{
-			ReplayStreamer->FlushCheckpoint( GetDemoCurrentTimeInMS() );
+			ReplayStreamer->FlushCheckpoint( GetLastCheckpointTimeInMS() );
 		}
 
 		const float TotalCheckpointTimeInMS = TotalCheckpointSaveTimeSeconds * 1000.0;
@@ -1810,6 +1898,8 @@ void UDemoNetDriver::SaveExternalData( FArchive& Ar )
 
 void UDemoNetDriver::LoadExternalData( FArchive& Ar, const float TimeSeconds )
 {
+	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Demo_LoadExternalData"), Demo_LoadExternalData, STATGROUP_Net);
+
 	while ( true )
 	{
 		uint8 ExternalDataBuffer[1024];
@@ -1844,28 +1934,49 @@ void UDemoNetDriver::LoadExternalData( FArchive& Ar, const float TimeSeconds )
 }
 
 void UDemoNetDriver::AddEvent(const FString& Group, const FString& Meta, const TArray<uint8>& Data)
+{
+	AddOrUpdateEvent(FString(), Group, Meta, Data);
+}
+
+void UDemoNetDriver::AddOrUpdateEvent(const FString& Name, const FString& Group, const FString& Meta, const TArray<uint8>& Data)
 {
 	uint32 SavedTimeMS = GetDemoCurrentTimeInMS();
 	if (ReplayStreamer.IsValid())
 	{
-		ReplayStreamer->AddEvent(SavedTimeMS, Group, Meta, Data);
+		ReplayStreamer->AddOrUpdateEvent(Name, SavedTimeMS, Group, Meta, Data);
 	}
-	UE_LOG(LogDemo, Verbose, TEXT("Custom Event %s. Total: %i, Time: %2.2f"), *Group, Data.Num(), SavedTimeMS);
+	UE_LOG(LogDemo, Verbose, TEXT("Custom Event %s.%s. Total: %i, Time: %2.2f"), *Group, *Name, Data.Num(), SavedTimeMS);
 }
 
-void UDemoNetDriver::EnumerateEvents(const FString& Group, FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate)
+void UDemoNetDriver::EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate)
 {
 	if (ReplayStreamer.IsValid())
 	{
-		ReplayStreamer->EnumerateEvents(Group, EnumerationCompleteDelegate);
+		ReplayStreamer->EnumerateEvents(Group, Delegate);
 	}
 }
 
-void UDemoNetDriver::RequestEventData(const FString& EventID, FOnRequestEventDataComplete& RequestEventDataCompleteDelegate)
+void UDemoNetDriver::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
 {
 	if (ReplayStreamer.IsValid())
 	{
-		ReplayStreamer->RequestEventData(EventID, RequestEventDataCompleteDelegate);
+		ReplayStreamer->RequestEventData(EventID, Delegate);
+	}
+}
+
+void UDemoNetDriver::EnumerateEventsForActiveReplay(const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	if (ReplayStreamer.IsValid())
+	{
+		ReplayStreamer->EnumerateEvents(ActiveReplayName, Group, Delegate);
+	}
+}
+
+void UDemoNetDriver::RequestEventDataForActiveReplay(const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	if (ReplayStreamer.IsValid())
+	{
+		ReplayStreamer->RequestEventData(ActiveReplayName, EventID, Delegate);
 	}
 }
 
@@ -1907,6 +2018,13 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 		return;
 	}
 
+	CSV_SCOPED_TIMING_STAT(Basic, DemoRecordTime);
+
+	// DeltaSeconds that is padded in, is unclampped and not time dilated
+	DemoCurrentTime += GetClampedDeltaSeconds( World, DeltaSeconds );
+
+	ReplayStreamer->UpdateTotalDemoTime( GetDemoCurrentTimeInMS() );
+
 	if ( PendingCheckpointActors.Num() )
 	{
 		// If we're in the middle of saving a checkpoint, then update that now and return
@@ -1921,6 +2039,8 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 		return;
 	}
 
+	const double RecordFrameStartTime = FPlatformTime::Seconds();
+
 	// Mark any new streaming levels, so that they are saved out this frame
 	if (!HasLevelStreamingFixes())
 	{
@@ -1941,11 +2061,6 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 		}
 	}
 
-	// DeltaSeconds that is padded in, is unclampped and not time dilated
-	DemoCurrentTime += GetClampedDeltaSeconds( World, DeltaSeconds );
-
-	ReplayStreamer->UpdateTotalDemoTime( GetDemoCurrentTimeInMS() );
-
 	// Save out a frame
 	DemoFrameNum++;
 	ReplicationFrame++;
@@ -2066,6 +2181,14 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 				}
 
 				UActorChannel* Channel = ClientConnection->FindActorChannelRef( Actor );
+
+				// Check dormancy
+				if (Channel && ShouldActorGoDormantForDemo(Actor, Channel))
+				{
+					// Either shouldn't go dormant, or is already dormant
+					Channel->StartBecomingDormant();
+				}
+
 				FActorPriority ActorPriority;
 				ActorPriority.ActorInfo = ActorInfo;
 				ActorPriority.Channel = Channel;
@@ -2111,7 +2234,7 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 		CVarDemoMinRecordHz.GetValueOnAnyThread(),
 		CVarDemoRecordHz.GetValueOnAnyThread(),
 		ServerTickTime,
-		FPlatformTime::Seconds()
+		RecordFrameStartTime
 	};
 
 	if (Params.MaxRecordHz < Params.MinRecordHz)
@@ -2166,7 +2289,7 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 
 	FlushNetChecked(*ClientConnection);
 
-	WriteDemoFrameFromQueuedDemoPackets(*FileAr, ClientConnection->QueuedDemoPackets);
+	WriteDemoFrameFromQueuedDemoPackets(*FileAr, ClientConnection->QueuedDemoPackets, DemoCurrentTime);
 
 	// Save a checkpoint if it's time
 	if ( CVarEnableCheckpoints.GetValueOnAnyThread() == 1 )
@@ -2176,12 +2299,11 @@ void UDemoNetDriver::TickDemoRecord( float DeltaSeconds )
 		if (ShouldSaveCheckpoint())
 		{
 			SaveCheckpoint();
-			LastCheckpointTime = DemoCurrentTime;
 		}
 	}
 }
 
-bool UDemoNetDriver::ReplicatePrioritizedActor(TArray<AActor*>& ActorsToGoDormant, const FActorPriority& ActorPriority, const class FRepActorsParams& Params)
+bool UDemoNetDriver::ReplicatePrioritizedActor(const FActorPriority& ActorPriority, const class FRepActorsParams& Params)
 {
 	FNetworkObjectInfo* ActorInfo = ActorPriority.ActorInfo;
 	FActorDestructionInfo* DestructionInfo = ActorPriority.DestructionInfo;
@@ -2253,12 +2375,6 @@ bool UDemoNetDriver::ReplicatePrioritizedActor(TArray<AActor*>& ActorsToGoDorman
 
 		const bool bDidReplicateActor = DemoReplicateActor(Actor, ClientConnections[0], false);
 
-		if (bDidReplicateActor && Actor->NetDormancy == DORM_DormantAll)
-		{
-			// If we've replicated this object at least once, and it wants to go dormant, make it dormant now
-			ActorsToGoDormant.Add(Actor);
-		}
-
 		TSharedPtr<FRepChangedPropertyTracker> PropertyTracker = FindOrCreateRepChangedPropertyTracker(Actor);
 
 		if (!GuidCache->NetGUIDLookup.Contains(Actor))
@@ -2308,45 +2424,33 @@ bool UDemoNetDriver::ReplicatePrioritizedActor(TArray<AActor*>& ActorsToGoDorman
 
 bool UDemoNetDriver::ReplicatePrioritizedActors(const TArray<FActorPriority>& ToReplicate, const class FRepActorsParams& Params)
 {
-	TArray<AActor*> ActorsToGoDormant;
 	bool bTimeRemaining = true;
 
 	for (const FActorPriority& ActorPriority : ToReplicate)
 	{
-		bTimeRemaining = ReplicatePrioritizedActor(ActorsToGoDormant, ActorPriority, Params);
+		bTimeRemaining = ReplicatePrioritizedActor(ActorPriority, Params);
 		if (!bTimeRemaining)
 		{
 			break;
 		}
 	}
 
-	for (int32 Idx = 0; Idx < ActorsToGoDormant.Num(); Idx++)
-	{
-		GetNetworkObjectList().MarkDormant(ActorsToGoDormant[Idx], ClientConnections[0], 1, NetDriverName);
-	}
-
 	return bTimeRemaining;
 }
 
 bool UDemoNetDriver::ReplicatePrioritizedActors(const TArray<FActorPriority*>& ToReplicate, const class FRepActorsParams& Params)
 {
-	TArray<AActor*> ActorsToGoDormant;
 	bool bTimeRemaining = true;
 
 	for (const FActorPriority* ActorPriority : ToReplicate)
 	{
-		bTimeRemaining = ReplicatePrioritizedActor(ActorsToGoDormant, *ActorPriority, Params);
+		bTimeRemaining = ReplicatePrioritizedActor(*ActorPriority, Params);
 		if (!bTimeRemaining)
 		{
 			break;
 		}
 	}
 
-	for (int32 Idx = 0; Idx < ActorsToGoDormant.Num(); Idx++)
-	{
-		GetNetworkObjectList().MarkDormant(ActorsToGoDormant[Idx], ClientConnections[0], 1, NetDriverName);
-	}
-
 	return bTimeRemaining;
 }
 
@@ -2405,11 +2509,14 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 {
 	SCOPED_NAMED_EVENT(UDemoNetDriver_ReadDemoFrameIntoPlaybackPackets, FColor::Purple);
 
+	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("ReadDemoFrameIntoPlaybackPackets"), ReadDemoFrameIntoPlaybackPackets, STATGROUP_Net);
+
 	check(!bForLevelFastForward || HasLevelStreamingFixes());
 
 	if ( Ar.IsError() )
 	{
-		StopDemo();
+		UE_LOG(LogDemo, Error, TEXT("UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: Archive Error"));
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return false;
 	}
 
@@ -2421,11 +2528,14 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 	if ( ReplayStreamer->GetLastError() != ENetworkReplayError::None )
 	{
 		UE_LOG( LogDemo, Error, TEXT( "UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: ReplayStreamer ERROR: %s" ), ENetworkReplayError::ToString( ReplayStreamer->GetLastError() ) );
-		StopDemo();
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return false;
 	}
 
-	if ( !ReplayStreamer->IsDataAvailable() )
+	// Above checks guarantee the Archive is in a valid state, but it's entirely possible that
+	// the ReplayStreamer doesn't have more stream data available (i.e., if we only have checkpoint data).
+	// Therefore, skip this if we know we're only reading in checkpoint data.
+	if ( !bIsLoadingCheckpoint && !ReplayStreamer->IsDataAvailable() )
 	{
 		return false;
 	}
@@ -2448,6 +2558,8 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 
 	if (PlaybackDemoHeader.Version >= HISTORY_LEVEL_STREAMING_FIXES)
 	{
+		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Demo_ReceiveExports"), Demo_ReceiveExports, STATGROUP_Net);
+
 		((UPackageMapClient*)ServerConnection->PackageMap)->ReceiveExportData(Ar);
 	}
 
@@ -2544,7 +2656,7 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 		if (DeltaTimeChecksum != ServerDeltaTimeCheksum)
 		{
 			UE_LOG(LogDemo, Error, TEXT("UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: DeltaTimeChecksum != ServerDeltaTimeCheksum"));
-			StopDemo();
+			NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 			return false;
 		}
 	}
@@ -2553,7 +2665,7 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 	if (Ar.IsError())
 	{
 		UE_LOG(LogDemo, Error, TEXT("UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: Failed to read demo ServerDeltaTime"));
-		StopDemo();
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return false;
 	}
 
@@ -2576,6 +2688,9 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 	// Buffer any packets in this frame
 	uint32 SeenLevelIndex = 0;
 
+	{
+		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Demo_ReadPackets"), Demo_ReadPackets, STATGROUP_Net);
+
 	while (true)
 	{
 		if (HasLevelStreamingFixes())
@@ -2589,14 +2704,7 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 		if (!ReadPacket(Ar, ReadBuffer, PacketBytes, sizeof(ReadBuffer)))
 		{
 			UE_LOG(LogDemo, Error, TEXT("UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: ReadPacket failed."));
-
-			StopDemo();
-
-			if (World != nullptr && World->GetGameInstance() != nullptr)
-			{
-				World->GetGameInstance()->HandleDemoPlaybackFailure(EDemoPlayFailure::Generic, FString(TEXT("UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets: PacketBytes > sizeof( ReadBuffer )")));
-			}
-
+				NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 			return false;
 		}
 
@@ -2616,6 +2724,7 @@ bool UDemoNetDriver::ReadDemoFrameIntoPlaybackPackets( FArchive& Ar, TArray<FPla
 		Packet.SeenLevelIndex = SeenLevelIndex;
 		FMemory::Memcpy(Packet.Data.GetData(), ReadBuffer, PacketBytes);
 	}
+	}
 
 	return true;
 }
@@ -2651,15 +2760,15 @@ void UDemoNetDriver::ProcessSeamlessTravel(int32 LevelIndex)
 		// If we're watching a live replay, it's probable that the header has been updated with the level added,
 		// so we need to download it again before proceeding.
 		bIsWaitingForHeaderDownload = true;
-		ReplayStreamer->DownloadHeader(FOnDownloadHeaderComplete::CreateUObject(this, &UDemoNetDriver::OnDownloadHeaderComplete, LevelIndex));
+		ReplayStreamer->DownloadHeader(FDownloadHeaderCallback::CreateUObject(this, &UDemoNetDriver::OnDownloadHeaderCompletePrivate, LevelIndex));
 	}
 }
 
-void UDemoNetDriver::OnDownloadHeaderComplete(const bool bWasSuccessful, int32 LevelIndex)
+void UDemoNetDriver::OnDownloadHeaderCompletePrivate(const FDownloadHeaderResult& Result, int32 LevelIndex)
 {
 	bIsWaitingForHeaderDownload = false;
 
-	if (bWasSuccessful)
+	if (Result.WasSuccessful())
 	{
 		FString Error;
 		if (ReadPlaybackDemoHeader(Error))
@@ -2771,13 +2880,13 @@ bool UDemoNetDriver::ShouldSkipPlaybackPacket(const FPlaybackPacket& Packet)
 
 bool UDemoNetDriver::ConditionallyProcessPlaybackPackets()
 {
-	if ( PlaybackPackets.Num() == 0 )
+	if ( !PlaybackPackets.IsValidIndex(PlaybackPacketIndex) )
 	{
 		PauseChannels( true );
 		return false;
 	}
 
-	const FPlaybackPacket& CurPacket = PlaybackPackets[0];
+	const FPlaybackPacket& CurPacket = PlaybackPackets[PlaybackPacketIndex];
 	if ( DemoCurrentTime < CurPacket.TimeSeconds )
 	{
 		// Not enough time has passed to read another frame
@@ -2793,7 +2902,7 @@ bool UDemoNetDriver::ConditionallyProcessPlaybackPackets()
 	}
 
 	const bool Result = ProcessPacket(CurPacket);
-	PlaybackPackets.RemoveAt( 0 );
+	++PlaybackPacketIndex;
 
 	return Result;
 }
@@ -2822,26 +2931,19 @@ bool UDemoNetDriver::ProcessPacket( const uint8* Data, int32 Count )
 	{
 		// Something we received resulted in the demo being stopped
 		UE_LOG( LogDemo, Error, TEXT( "UDemoNetDriver::ProcessPacket: ReceivedRawPacket closed connection" ) );
-
-		StopDemo();
-
-		if ( World != nullptr && World->GetGameInstance() != nullptr )
-		{
-			World->GetGameInstance()->HandleDemoPlaybackFailure( EDemoPlayFailure::Generic, FString( TEXT( "UDemoNetDriver::ProcessPacket: PacketBytes > sizeof( ReadBuffer )" ) ) );
-		}
-
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 		return false;
 	}
 
 	return true;
 }
 
-void UDemoNetDriver::WriteDemoFrameFromQueuedDemoPackets( FArchive& Ar, TArray<FQueuedDemoPacket>& QueuedPackets )
+void UDemoNetDriver::WriteDemoFrameFromQueuedDemoPackets( FArchive& Ar, TArray<FQueuedDemoPacket>& QueuedPackets, float FrameTime )
 {
 	Ar << CurrentLevelIndex;
 	
 	// Save total absolute demo time in seconds
-	Ar << DemoCurrentTime;
+	Ar << FrameTime;
 
 	((UPackageMapClient*)ClientConnections[0]->PackageMap)->AppendExportData(Ar);
 
@@ -2957,6 +3059,8 @@ void UDemoNetDriver::GotoTimeInSeconds(const float TimeInSeconds, const FOnGotoT
 		return;		// Don't allow scrubbing if we already are
 	}
 
+	UE_LOG(LogDemo, Log, TEXT("GotoTimeInSeconds: %2.2f"), TimeInSeconds);
+
 	AddReplayTask( new FGotoTimeInSecondsTask( this, TimeInSeconds ) );
 }
 
@@ -2992,6 +3096,7 @@ struct FCsvDemoSettings
 	bool bCaptureCsv;
 	int32 StartTime;
 	int32 EndTime;
+	int32 FrameCount;
 };
 
 static FCsvDemoSettings GetCsvDemoSettings()
@@ -3002,6 +3107,8 @@ static FCsvDemoSettings GetCsvDemoSettings()
 	{
 		if (!FParse::Value(FCommandLine::Get(), TEXT("-csvdemoendtime="), Settings.EndTime))
 			Settings.EndTime = -1.0;
+		if (!FParse::Value(FCommandLine::Get(), TEXT("-csvdemoframecount="), Settings.FrameCount))
+			Settings.FrameCount = -1;
 	}
 
 	return Settings;
@@ -3026,6 +3133,12 @@ void UDemoNetDriver::TickDemoPlayback( float DeltaSeconds )
 				&& DemoCurrentTime >= CsvDemoSettings.StartTime
 				&& ((DemoCurrentTime <= CsvDemoSettings.EndTime) || (CsvDemoSettings.EndTime < 0));
 
+			// Stop the capture when we reach the specified frame count
+			if (CsvDemoSettings.FrameCount>=0 && CsvProfiler->GetCaptureFrameNumber() >= CsvDemoSettings.FrameCount)
+			{
+				bDoCapture = false;
+			}
+
 			if (bDoCapture != CsvProfiler->IsCapturing())
 			{
 				if (bDoCapture)
@@ -3137,12 +3250,20 @@ void UDemoNetDriver::TickDemoPlayback( float DeltaSeconds )
 	{
 	}
 
+	{
+		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("TickDemoPlayback_ProcessPackets"), TickDemoPlayback_ProcessPackets, STATGROUP_Net);
+
 	// Process packets until we are caught up (this implicitly handles fast forward if DemoCurrentTime past many frames)
 	while ( ConditionallyProcessPlaybackPackets() )
 	{
 		DemoFrameNum++;
 	}
 
+		// Remove all packets that were processed
+		PlaybackPackets.RemoveAt(0, PlaybackPacketIndex);
+		PlaybackPacketIndex = 0;
+	}
+
 	// Finalize any fast forward stuff that needs to happen
 	if ( bIsFastForwarding )
 	{
@@ -3150,8 +3271,10 @@ void UDemoNetDriver::TickDemoPlayback( float DeltaSeconds )
 	}
 }
 
-void UDemoNetDriver::FinalizeFastForward( const float StartTime )
+void UDemoNetDriver::FinalizeFastForward( const double StartTime )
 {
+	DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Demo_FinalizeFastForward"), Demo_FinalizeFastForward, STATGROUP_Net);
+
 	// This must be set before we CallRepNotifies or they might be skipped again
 	bIsFastForwarding = false;
 
@@ -3225,7 +3348,7 @@ void UDemoNetDriver::FinalizeFastForward( const float StartTime )
 	// Reset the never-queue GUID list, we'll rebuild it
 	NonQueuedGUIDsForScrubbing.Reset();
 
-	const float FastForwardTotalSeconds = FPlatformTime::Seconds() - StartTime;
+	const double FastForwardTotalSeconds = FPlatformTime::Seconds() - StartTime;
 
 	NotifyGotoTimeFinished(true);
 
@@ -3313,30 +3436,34 @@ void UDemoNetDriver::SpawnDemoRecSpectator( UNetConnection* Connection, const FU
 	SpectatorController->SetPlayer( Connection );
 }
 
-void UDemoNetDriver::ReplayStreamingReady( bool bSuccess, bool bRecord )
+void UDemoNetDriver::ReplayStreamingReady( const FStartStreamingResult& Result )
 {
-	bWasStartStreamingSuccessful = bSuccess;
+	bIsWaitingForStream = false;
+	bWasStartStreamingSuccessful = Result.WasSuccessful();
 
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	if ( CVarDemoForceFailure.GetValueOnGameThread() == 1 )
 	{
-		bSuccess = false;
+		bWasStartStreamingSuccessful = false;
 	}
 #endif
 
-	if ( !bSuccess )
+	if ( !bWasStartStreamingSuccessful )
+	{
+		UE_LOG(LogDemo, Warning, TEXT("UDemoNetConnection::ReplayStreamingReady: Failed. %s"), Result.bRecording ? TEXT("") : EDemoPlayFailure::ToString(EDemoPlayFailure::DemoNotFound));
+
+		if (Result.bRecording)
 	{
 		StopDemo();
-
-		UE_LOG(LogDemo, Warning, TEXT("UDemoNetConnection::ReplayStreamingReady: Failed. %s"), bRecord ? TEXT("") : EDemoPlayFailure::ToString(EDemoPlayFailure::DemoNotFound));
-		if ( !bRecord )
+		}
+		else
 		{
-			GetWorld()->GetGameInstance()->HandleDemoPlaybackFailure( EDemoPlayFailure::DemoNotFound, FString( EDemoPlayFailure::ToString( EDemoPlayFailure::DemoNotFound ) ) );
+			NotifyDemoPlaybackFailure(EDemoPlayFailure::DemoNotFound);
 		}
 		return;
 	}
 
-	if ( !bRecord )
+	if ( !Result.bRecording )
 	{
 		FString Error;
 		
@@ -3371,6 +3498,8 @@ void UDemoNetDriver::ReplayStreamingReady( bool bSuccess, bool bRecord )
 				AddReplayTask( new FJumpToLiveReplayTask( this ) );
 			}
 		}
+
+		UE_LOG(LogDemo, Log, TEXT("ReplayStreamingReady: playing back replay %s, which was recorded on engine version %s"), *DemoURL.Map, *PlaybackDemoHeader.EngineVersion.ToString());
 	}
 }
 
@@ -3386,7 +3515,7 @@ FReplayExternalDataArray* UDemoNetDriver::GetExternalDataArrayForObject( UObject
 	return ExternalDataToObjectMap.Find( NetworkGUID );
 }
 
-void UDemoNetDriver::RespawnNecessaryNetStartupActors()
+void UDemoNetDriver::RespawnNecessaryNetStartupActors(TArray<AActor*>& SpawnedActors, ULevel* Level /* = nullptr */)
 {
 	for ( auto It = RollbackNetStartupActors.CreateIterator(); It; ++It )
 	{
@@ -3398,11 +3527,22 @@ void UDemoNetDriver::RespawnNecessaryNetStartupActors()
 
 		FRollbackNetStartupActorInfo& RollbackActor = It.Value();
 
+		// filter to a specific level
+		if ((Level != nullptr) && (RollbackActor.Level != Level))
+		{
+			continue;
+		}
+
+		// skip rollback actors in streamed out levels (pending gc)
+		if (!LevelStatusesByName.Contains(GetLevelPackageName(*RollbackActor.Level)))
+		{
+			continue;
+		}
+
 		AActor* ExistingActor = FindObjectFast<AActor>(RollbackActor.Level, RollbackActor.Name);
 		if (ExistingActor)
 		{
 			check(ExistingActor->IsPendingKillOrUnreachable());
-
 			ExistingActor->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors | REN_ForceNoResetLoaders);
 		}
 
@@ -3454,10 +3594,38 @@ void UDemoNetDriver::RespawnNecessaryNetStartupActors()
 				if (RollbackActor.RepState->RepNotifies.Num() > 0)
 				{
 					RepLayout->CallRepNotifies(RollbackActor.RepState.Get(), Actor);
+
+					Actor->PostRepNotifies();
+				}
+			}
+
+			for (UActorComponent* ActorComp : Actor->GetComponents())
+			{
+				if (ActorComp)
+				{
+					TSharedPtr<FRepLayout> SubObjLayout = GetObjectClassRepLayout(ActorComp->GetClass());
+					if (SubObjLayout.IsValid())
+					{
+						TSharedPtr<FRepState> RepState = RollbackActor.SubObjRepState.FindRef(ActorComp->GetFullName());
+
+						if (SubObjLayout.IsValid() && RepState.IsValid())
+						{
+							SubObjLayout->DiffStableProperties(&RepState->RepNotifies, nullptr, ActorComp, RepState->StaticBuffer.GetData());
+
+							if (RepState->RepNotifies.Num() > 0)
+							{
+								SubObjLayout->CallRepNotifies(RepState.Get(), ActorComp);
+
+								ActorComp->PostRepNotifies();
+							}
+						}
+					}
 				}
 			}
 
 			check( Actor->GetRemoteRole() == ROLE_Authority );
+
+			SpawnedActors.Add(Actor);
 		}
 
 		It.RemoveCurrent();
@@ -3503,9 +3671,24 @@ void UDemoNetDriver::PrepFastForwardLevels()
 				}
 				else
 				{
+					if (RollbackNetStartupActors.Contains(Actor->GetFullName()))
+					{
+						LocalWorld->DestroyActor(Actor, true);
+					}
+					else
+					{
 					LevelActors.Add(Actor);
 				}
 			}
+			}
+
+			TArray<AActor*> SpawnedActors;
+			RespawnNecessaryNetStartupActors(SpawnedActors, Level);
+
+			for(AActor* Actor : SpawnedActors)
+			{
+				LevelActors.Add(Actor);
+			}
 
 			if (LevelActors.Num() > 0)
 			{
@@ -3513,6 +3696,7 @@ void UDemoNetDriver::PrepFastForwardLevels()
 			}
 		}
 	}
+
 	NewStreamingLevelsThisFrame.Empty();
 
 	if (LevelsPendingFastForward.Num() == 0 ||
@@ -3579,65 +3763,96 @@ bool UDemoNetDriver::FastForwardLevels(FArchive* CheckpointArchive, int64 ExtraT
 		LocalLevels.Add(It.Key());
 		StartupActors.Append(MoveTemp(LevelStartupActors));
 	}
+
 	LevelsPendingFastForward.Reset();
 
-	// At this point, assume that we have all the data necessary to fast forward.
-	// Further, the archives should be at the appropriate positions to read.
-	FArchive* StreamingAr = ReplayStreamer->GetStreamingArchive();
-	FArchive* UsingAr = CheckpointArchive;
+	struct FLocalReadPacketsHelper
+	{
+		FLocalReadPacketsHelper(UDemoNetDriver& InDriver, const float InLastPacketTime):
+			Driver(InDriver),
+			LastPacketTime(InLastPacketTime)
+		{
+		}
 
-	// If there's no checkpoint data, then we'll just move straight into the streaming archive.
-	// This can happen if we haven't passed a checkpoint yet.
-	if (CheckpointArchive->TotalSize() == 0)
+		// @return True if another read can be attempted, false otherwise.
+		bool ReadPackets(FArchive& Ar)
+		{
+			// Grab the packets, and make sure the stream is OK.
+			PreFramePos = Ar.Tell();
+			NumPackets = Packets.Num();
+			if (!Driver.ReadDemoFrameIntoPlaybackPackets(Ar, Packets, true, &LastReadTime))
+			{
+				bErrorOccurred = true;
+				return false;
+			}
+
+			// In case the archive had more data than we needed, we'll try to leave it where we left off
+			// before the level fast forward.
+			else if (LastReadTime > LastPacketTime)
+			{
+				Ar.Seek(PreFramePos);
+				if (ensure(NumPackets != 0))
 	{
-		UsingAr = StreamingAr;
+					Packets.RemoveAt(NumPackets, Packets.Num() - NumPackets);
 	}
-	else
+				return false;
+			}
+
+			return true;
+		}
+
+		bool IsError() const
 	{
-		// Skip forward to the Packet data.
-		// ReadDemoFrameIntoPlaybackPackets will handle skipping passed any additional data
-		FArchivePos PacketOffset = 0;
-		*CheckpointArchive << PacketOffset;
-		CheckpointArchive->Seek(PacketOffset + CheckpointArchive->Tell());
+			return bErrorOccurred;
 	}
 
+		TArray<FPlaybackPacket> Packets;
+
+	private:
+
+		UDemoNetDriver& Driver;
+		const float LastPacketTime;
+
 	// We only want to process packets that are before anything we've currently processed.
 	// Further, we want to make sure that we leave the archive in a good state for later use.
 	int32 NumPackets = 0;
 	float LastReadTime = 0;
 	FArchivePos PreFramePos = 0;
 
-	// Load up all of our playback packets, from the demo and the stream.
-	TArray<FPlaybackPacket> LocalPlaybackPackets;
-	while (!UsingAr->AtEnd())
+		bool bErrorOccurred = false;
+
+	} ReadPacketsHelper(*this, LastProcessedPacketTime);
+
+	// First, read in the checkpoint data (if any is available);
+	if (CheckpointArchive->TotalSize() != 0)
 	{
-		// Grab the packets, and make sure the stream is OK.
-		PreFramePos = UsingAr->Tell();
-		NumPackets = LocalPlaybackPackets.Num();
-		if (!ReadDemoFrameIntoPlaybackPackets(*UsingAr, LocalPlaybackPackets, true, &LastReadTime))
+		TGuardValue<bool> LoadingCheckpointGuard(bIsLoadingCheckpoint, true);
+
+		FArchivePos PacketOffset = 0;
+		*CheckpointArchive << PacketOffset;
+		CheckpointArchive->Seek(PacketOffset + CheckpointArchive->Tell());
+
+		if (!ReadPacketsHelper.ReadPackets(*CheckpointArchive) && ReadPacketsHelper.IsError())
 		{
-			StopDemo();
+			UE_LOG(LogDemo, Warning, TEXT("UDemoNetDriver::FastForwardLevels: Failed to read packets from Checkpoint."));
+			NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
 			return false;
 		}
+	}
 
-		// In case the archive had more data than we needed, we'll try to leave it where we left off
-		// before the level fast forward.
-		if (LastReadTime > LastProcessedPacketTime)
+	// Next, read in streaming data (if any is available)
+	FArchive* StreamingAr = ReplayStreamer->GetStreamingArchive();
+	while (!StreamingAr->AtEnd() && ReplayStreamer->IsDataAvailable() && ReadPacketsHelper.ReadPackets(*StreamingAr));
+
+	if (ReadPacketsHelper.IsError())
 		{
-			UsingAr->Seek(PreFramePos);
-			if (ensure(NumPackets != 0))
-			{
-				LocalPlaybackPackets.RemoveAt(NumPackets, LocalPlaybackPackets.Num() - NumPackets);
-			}	
-			break;
-		}
-
-		// Switch to the streaming archive.
-		UsingAr = StreamingAr;
+		UE_LOG(LogDemo, Warning, TEXT("UDemoNetDriver::FastForwardLevels: Failed to read packets from Stream."));
+		NotifyDemoPlaybackFailure(EDemoPlayFailure::Generic);
+		return false;
 	}
 
 	// If we've gotten this far, it means we should have something to process.
-	check(LocalPlaybackPackets.Num() > 0);
+	check(ReadPacketsHelper.Packets.Num() > 0);
 
 	// It's possible that the level we're streaming in may spawn Dynamic Actors.
 	// In that case, we want to make sure we track them so we can process them below.
@@ -3702,7 +3917,7 @@ bool UDemoNetDriver::FastForwardLevels(FArchive* CheckpointArchive, int64 ExtraT
 		} ScopedIgnoreChannels(ServerConnection);
 
 		// Process all the packets we need.
-		for (FPlaybackPacket& Packet : LocalPlaybackPackets)
+		for (FPlaybackPacket& Packet : ReadPacketsHelper.Packets)
 		{
 			// Skip packets that aren't associated with levels.
 			if (Packet.SeenLevelIndex == 0)
@@ -3711,7 +3926,8 @@ bool UDemoNetDriver::FastForwardLevels(FArchive* CheckpointArchive, int64 ExtraT
 			}
 
 			// Don't attempt to go beyond the current demo time.
-			if (Packet.TimeSeconds > DemoCurrentTime)
+			// These packets should have been already been filtered out while reading.
+			if (!ensureMsgf(Packet.TimeSeconds <= DemoCurrentTime, TEXT("UDemoNetDriver::FastForwardLevels: Read packet beyond DemoCurrentTime DemoTime = %f PacketTime = %f"), DemoCurrentTime, Packet.TimeSeconds))
 			{
 				break;
 			}
@@ -3956,6 +4172,9 @@ bool UDemoNetDriver::LoadCheckpoint( FArchive* GotoCheckpointArchive, int64 Goto
 		GetWorld()->DestroyActor( *It, true );
 	}
 
+	// Destroy all particle FX attached to the WorldSettings (the WorldSettings actor persists but the particle FX spawned at runtime shouldn't)
+	GetWorld()->HandleTimelineScrubbed();
+
 	// Remove references to our KeepAlive actors so that cleaning up the channels won't destroy them.
 	for ( int32 i = ServerConnection->OpenChannels.Num() - 1; i >= 0; i-- )
 	{
@@ -4060,7 +4279,8 @@ bool UDemoNetDriver::LoadCheckpoint( FArchive* GotoCheckpointArchive, int64 Goto
 		DeletedNetStartupActors.Empty();
 
 		// Re-create all startup actors that were destroyed but should exist beyond this point
-		RespawnNecessaryNetStartupActors();
+		TArray<AActor*> SpawnedActors;
+		RespawnNecessaryNetStartupActors(SpawnedActors);
 
 		// This is the very first checkpoint, we'll read the stream from the very beginning in this case
 		DemoCurrentTime			= 0;
@@ -4112,7 +4332,8 @@ bool UDemoNetDriver::LoadCheckpoint( FArchive* GotoCheckpointArchive, int64 Goto
 	}
 
 	// Re-create all startup actors that were destroyed but should exist beyond this point
-	RespawnNecessaryNetStartupActors();
+	TArray<AActor*> SpawnedActors;
+	RespawnNecessaryNetStartupActors(SpawnedActors);
 
 	int32 NumValues = 0;
 	*GotoCheckpointArchive << NumValues;
@@ -4535,21 +4756,28 @@ TSharedPtr<FObjectReplicator> UDemoNetConnection::CreateReplicatorForNewActorCha
 		}
 	}
 
-	// Handle rewinding initially dormant startup actors that were changed on the client
-	const bool bIsInitialDormantStartupActor = NetDriver && NetDriver->IsPlayingClientReplay() && Actor && (Actor->NetDormancy == DORM_Initial) && Actor->IsNetStartupActor() && !Actor->bReplayRewindable;
-	if (bIsInitialDormantStartupActor)
-	{
-		NetDriver->QueueNetStartupActorForRollbackViaDeletion(Actor);
-	}
+	QueueInitialDormantStartupActorForRewind(Actor);
 
 	return NewReplicator;
 }
 
-void UDemoNetConnection::FlushDormancy( class AActor* Actor )
+void UDemoNetConnection::DestroyIgnoredActor(AActor* Actor)
+	{
+	QueueInitialDormantStartupActorForRewind(Actor);
+
+	Super::DestroyIgnoredActor(Actor);
+}
+
+void UDemoNetConnection::QueueInitialDormantStartupActorForRewind(AActor* Actor)
 {
 	UDemoNetDriver* NetDriver = GetDriver();
 
-	NetDriver->GetNetworkObjectList().MarkActive(Actor, this, NetDriver->NetDriverName);
+	// Handle rewinding initially dormant startup actors that were changed on the client
+	const bool bIsInitialDormantStartupActor = NetDriver && Actor && (Actor->NetDormancy == DORM_Initial) && Actor->IsNetStartupActor() && !Actor->bReplayRewindable;
+	if (bIsInitialDormantStartupActor)
+	{
+		NetDriver->QueueNetStartupActorForRollbackViaDeletion(Actor);
+	}
 }
 
 bool UDemoNetDriver::IsLevelInitializedForActor( const AActor* InActor, const UNetConnection* InConnection ) const
@@ -4749,7 +4977,7 @@ void UDemoNetDriver::QueueNetStartupActorForRollbackViaDeletion( AActor* Actor )
 		return;
 	}
 
-	FRollbackNetStartupActorInfo RollbackActor;
+	FRollbackNetStartupActorInfo& RollbackActor = RollbackNetStartupActors.Add(ActorFullName);
 
 	RollbackActor.Name		= Actor->GetFName();
 	RollbackActor.Archetype	= Actor->GetArchetype();
@@ -4772,9 +5000,62 @@ void UDemoNetDriver::QueueNetStartupActorForRollbackViaDeletion( AActor* Actor )
 				}
 			}
 		}
+
+		for (UActorComponent* ActorComp : Actor->GetComponents())
+		{
+			if (ActorComp)
+			{
+				TSharedPtr<FObjectReplicator> SubObjReplicator = MakeShared<FObjectReplicator>();
+				if (SubObjReplicator.IsValid())
+				{
+					SubObjReplicator->InitWithObject(ActorComp->GetArchetype(), ServerConnection, false);
+
+					if (SubObjReplicator->RepLayout.IsValid() && SubObjReplicator->RepState.IsValid())
+					{
+						if (SubObjReplicator->RepLayout->DiffStableProperties(nullptr, &RollbackActor.ObjReferences, SubObjReplicator->RepState->StaticBuffer.GetData(), ActorComp))
+						{
+							RollbackActor.SubObjRepState.Add(ActorComp->GetFullName(), SubObjReplicator->RepState);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void UDemoNetDriver::ForceNetUpdate(AActor* Actor)
+{
+	UReplicationDriver* RepDriver = GetReplicationDriver();
+	if (RepDriver)
+	{
+		RepDriver->ForceNetUpdate(Actor);
+	}
+	else
+	{
+		if ( FNetworkObjectInfo* NetActor = FindNetworkObjectInfo(Actor) )
+		{
+			// replays use update times relative to DemoCurrentTime and not World->TimeSeconds
+			NetActor->NextUpdateTime = DemoCurrentTime - 0.01f;
+		}
+	}
 	}
 
-	RollbackNetStartupActors.Add( ActorFullName, RollbackActor );
+void UDemoNetDriver::NotifyDemoPlaybackFailure(EDemoPlayFailure::Type FailureType)
+{
+	const bool bIsPlaying = IsPlaying();
+
+	StopDemo();
+
+	if (bIsPlaying)
+	{
+		if (UWorld* LocalWorld = GetWorld())
+		{
+			if (UGameInstance* GameInstance = World->GetGameInstance())
+			{
+				GameInstance->HandleDemoPlaybackFailure(FailureType, FString(EDemoPlayFailure::ToString(FailureType)));
+			}
+		}
+	}
 }
 
 /*-----------------------------------------------------------------------------
diff --git a/Engine/Source/Runtime/Engine/Private/DeviceProfiles/DeviceProfileManager.cpp b/Engine/Source/Runtime/Engine/Private/DeviceProfiles/DeviceProfileManager.cpp
index 9789f54f76ee..3f672d3ee449 100644
--- a/Engine/Source/Runtime/Engine/Private/DeviceProfiles/DeviceProfileManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DeviceProfiles/DeviceProfileManager.cpp
@@ -17,6 +17,7 @@
 #include "PlatformInfo.h"
 #include "PIEPreviewDeviceProfileSelectorModule.h"
 #endif
+#include "ProfilingDebugging/CsvProfiler.h"
 
 static TAutoConsoleVariable<FString> CVarDeviceProfileOverride(
 	TEXT("dp.Override"),
@@ -99,6 +100,30 @@ void UDeviceProfileManager::InitializeCVarsForActiveDeviceProfile(bool bPushSett
 		DeviceProfileManagerSingleton->PushedSettings.Empty();
 	}
 
+#if !UE_BUILD_SHIPPING
+	// pre-apply any -dpcvars= items, so that they override anything in the DPs
+	FString DPCVarString;
+	if (FParse::Value(FCommandLine::Get(), TEXT("DPCVars="), DPCVarString, false) || FParse::Value(FCommandLine::Get(), TEXT("DPCVar="), DPCVarString, false))
+	{
+		// look over a list of cvars
+		TArray<FString> DPCVars;
+		DPCVarString.ParseIntoArray(DPCVars, TEXT(","), true);
+		for (FString& DPCVar : DPCVars)
+		{
+			// split up each Key=Value pair
+			FString CVarKey, CVarValue;
+			if (DPCVar.Split(TEXT("="), &CVarKey, &CVarValue))
+			{
+				UE_LOG(LogInit, Log, TEXT("Setting CommandLine Device Profile CVar: [[%s:%s]]"), *CVarKey, *CVarValue);
+
+				// set it and remember it (no thanks, Ron Popeil)
+				OnSetCVarFromIniEntry(*DeviceProfileFileName, *CVarKey, *CVarValue, ECVF_SetByDeviceProfile);
+				CVarsAlreadySetList.Add(CVarKey, CVarValue);
+			}
+		}
+	}
+#endif
+	
 	// For each device profile, starting with the selected and working our way up the BaseProfileName tree,
 	// Find all CVars and set them 
 	FString BaseDeviceProfileName = ActiveProfileName;
@@ -118,6 +143,7 @@ void UDeviceProfileManager::InitializeCVarsForActiveDeviceProfile(bool bPushSett
 				TEXT("_Default"),
 				TEXT("_Smaller"),
 				TEXT("_Smallest"),
+                TEXT("_Tiniest"),
 			};
 
 			for (int Pass = 0; Pass < 2; Pass++)
@@ -553,6 +579,10 @@ const FString UDeviceProfileManager::GetActiveProfileName()
 void UDeviceProfileManager::SetActiveDeviceProfile( UDeviceProfile* DeviceProfile )
 {
 	ActiveDeviceProfile = DeviceProfile;
+
+#if CSV_PROFILER
+	FCsvProfiler::Get()->SetDeviceProfileName(ActiveDeviceProfile->GetName());
+#endif
 }
 
 
diff --git a/Engine/Source/Runtime/Engine/Private/DialogueTypes.cpp b/Engine/Source/Runtime/Engine/Private/DialogueTypes.cpp
index 759c8197da7c..040609bb2e35 100644
--- a/Engine/Source/Runtime/Engine/Private/DialogueTypes.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DialogueTypes.cpp
@@ -52,6 +52,7 @@ FString FDialogueContext::GetContextHash() const
 }
 
 FDialogueWaveParameter::FDialogueWaveParameter()
+	: DialogueWave(nullptr)
 {
 
 }
diff --git a/Engine/Source/Runtime/Engine/Private/DialogueWave.cpp b/Engine/Source/Runtime/Engine/Private/DialogueWave.cpp
index 687c71651b0f..9fca21a0ced4 100644
--- a/Engine/Source/Runtime/Engine/Private/DialogueWave.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DialogueWave.cpp
@@ -433,7 +433,7 @@ float UDialogueSoundWaveProxy::GetMaxDistance() const
 	return SoundWave->GetMaxDistance();
 }
 
-float UDialogueSoundWaveProxy::GetDuration() const
+float UDialogueSoundWaveProxy::GetDuration()
 {
 	return SoundWave->GetDuration();
 }
diff --git a/Engine/Source/Runtime/Engine/Private/DistanceFieldAtlas.cpp b/Engine/Source/Runtime/Engine/Private/DistanceFieldAtlas.cpp
index 0abb8b18f73f..613e48b236af 100644
--- a/Engine/Source/Runtime/Engine/Private/DistanceFieldAtlas.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DistanceFieldAtlas.cpp
@@ -789,7 +789,7 @@ void FDistanceFieldAsyncQueue::BlockUntilBuildComplete(UStaticMesh* StaticMesh,
 #endif
 		)
 	{
-		UE_LOG(LogStaticMesh, Warning, TEXT("Main thread blocked for %.3fs for async distance field build of %s to complete!  This can happen if the mesh is rebuilt excessively."),
+		UE_LOG(LogStaticMesh, Display, TEXT("Main thread blocked for %.3fs for async distance field build of %s to complete!  This can happen if the mesh is rebuilt excessively."),
 			(float)(FPlatformTime::Seconds() - StartTime), 
 			*StaticMesh->GetName());
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/Distributions.cpp b/Engine/Source/Runtime/Engine/Private/Distributions.cpp
index 8871421e8343..09795741f480 100644
--- a/Engine/Source/Runtime/Engine/Private/Distributions.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Distributions.cpp
@@ -50,6 +50,11 @@ UDistribution::UDistribution(const FObjectInitializer& ObjectInitializer)
 {
 }
 
+bool UDistribution::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 /*-----------------------------------------------------------------------------
 	Lookup table related functions.
 ------------------------------------------------------------------------------*/
diff --git a/Engine/Source/Runtime/Engine/Private/DrawDebugHelpers.cpp b/Engine/Source/Runtime/Engine/Private/DrawDebugHelpers.cpp
index fbfceb81f3ee..4a77de2d5928 100644
--- a/Engine/Source/Runtime/Engine/Private/DrawDebugHelpers.cpp
+++ b/Engine/Source/Runtime/Engine/Private/DrawDebugHelpers.cpp
@@ -53,7 +53,8 @@ void DrawDebugPoint(const UWorld* InWorld, FVector const& Position, float Size,
 		ULineBatchComponent* const LineBatcher = GetDebugLineBatcher( InWorld, bPersistentLines, LifeTime, (DepthPriority == SDPG_Foreground) );
 		if(LineBatcher != NULL)
 		{
-			LineBatcher->DrawPoint(Position, Color.ReinterpretAsLinear(), Size, DepthPriority, LifeTime);
+			const float PointLifeTime = (LifeTime > 0.f ? LifeTime : LineBatcher->DefaultLifeTime);
+			LineBatcher->DrawPoint(Position, Color.ReinterpretAsLinear(), Size, DepthPriority, PointLifeTime);
 		}
 	}
 }
@@ -309,9 +310,10 @@ void DrawDebugCoordinateSystem(const UWorld* InWorld, FVector const& AxisLoc, FR
 		ULineBatchComponent* const LineBatcher = GetDebugLineBatcher( InWorld, bPersistentLines, LifeTime, (DepthPriority == SDPG_Foreground) );
 		if(LineBatcher != NULL)
 		{
-			LineBatcher->DrawLine(AxisLoc, AxisLoc + X*Scale, FColor::Red, DepthPriority, Thickness, LifeTime );
-			LineBatcher->DrawLine(AxisLoc, AxisLoc + Y*Scale, FColor::Green, DepthPriority, Thickness, LifeTime );
-			LineBatcher->DrawLine(AxisLoc, AxisLoc + Z*Scale, FColor::Blue, DepthPriority, Thickness, LifeTime );
+			const float LineLifeTime = (LifeTime > 0.f ? LifeTime : LineBatcher->DefaultLifeTime);
+			LineBatcher->DrawLine(AxisLoc, AxisLoc + X*Scale, FColor::Red, DepthPriority, Thickness, LineLifeTime );
+			LineBatcher->DrawLine(AxisLoc, AxisLoc + Y*Scale, FColor::Green, DepthPriority, Thickness, LineLifeTime );
+			LineBatcher->DrawLine(AxisLoc, AxisLoc + Z*Scale, FColor::Blue, DepthPriority, Thickness, LineLifeTime );
 		}
 	}
 }
@@ -330,9 +332,10 @@ ENGINE_API void DrawDebugCrosshairs(const UWorld* InWorld, FVector const& AxisLo
 		ULineBatchComponent* const LineBatcher = GetDebugLineBatcher(InWorld, bPersistentLines, LifeTime, (DepthPriority == SDPG_Foreground));
 		if (LineBatcher != NULL)
 		{
-			LineBatcher->DrawLine(AxisLoc - X*Scale, AxisLoc + X*Scale, Color, DepthPriority);
-			LineBatcher->DrawLine(AxisLoc - Y*Scale, AxisLoc + Y*Scale, Color, DepthPriority);
-			LineBatcher->DrawLine(AxisLoc - Z*Scale, AxisLoc + Z*Scale, Color, DepthPriority);
+			const float LineLifeTime = (LifeTime > 0.f) ? LifeTime : LineBatcher->DefaultLifeTime;
+			LineBatcher->DrawLine(AxisLoc - X*Scale, AxisLoc + X*Scale, Color, DepthPriority, 0.f, LineLifeTime);
+			LineBatcher->DrawLine(AxisLoc - Y*Scale, AxisLoc + Y*Scale, Color, DepthPriority, 0.f, LineLifeTime);
+			LineBatcher->DrawLine(AxisLoc - Z*Scale, AxisLoc + Z*Scale, Color, DepthPriority, 0.f, LineLifeTime);
 		}
 	}
 }
@@ -715,7 +718,7 @@ void DrawDebugCone(const UWorld* InWorld, FVector const& Origin, FVector const&
 	}
 }
 
-void DrawDebugString(const UWorld* InWorld, FVector const& TextLocation, const FString& Text, class AActor* TestBaseActor, FColor const& TextColor, float Duration, bool bDrawShadow)
+void DrawDebugString(const UWorld* InWorld, FVector const& TextLocation, const FString& Text, class AActor* TestBaseActor, FColor const& TextColor, float Duration, bool bDrawShadow, float FontScale)
 {
 	// no debug line drawing on dedicated server
 	if (GEngine->GetNetMode(InWorld) != NM_DedicatedServer)
@@ -729,7 +732,7 @@ void DrawDebugString(const UWorld* InWorld, FVector const& TextLocation, const F
 			APlayerController* PlayerController = Iterator->Get();
 			if (PlayerController->MyHUD && PlayerController->Player)
 			{
-				PlayerController->MyHUD->AddDebugText(Text, BaseAct, Duration, TextLocation, TextLocation, TextColor, true, (TestBaseActor==NULL), false, nullptr, 1.0f, bDrawShadow);
+				PlayerController->MyHUD->AddDebugText(Text, BaseAct, Duration, TextLocation, TextLocation, TextColor, true, (TestBaseActor==NULL), false, nullptr, FontScale, bDrawShadow);
 			}
 		}
 	}
@@ -866,7 +869,7 @@ void DrawDebugCamera(const UWorld* InWorld, FVector const& Location, FRotator co
 	// no debug line drawing on dedicated server
 	if (GEngine->GetNetMode(InWorld) != NM_DedicatedServer)
 	{
-		DrawDebugCoordinateSystem(InWorld, Location, Rotation, BaseScale*Scale, bPersistentLines, DepthPriority);
+		DrawDebugCoordinateSystem(InWorld, Location, Rotation, BaseScale*Scale, bPersistentLines, LifeTime, DepthPriority);
 		FVector Extents = BaseProportions * BaseScale * Scale;
 		DrawDebugBox(InWorld, Location, Extents, Rotation.Quaternion(), Color, bPersistentLines, LifeTime, DepthPriority);		// lifetime
 
diff --git a/Engine/Source/Runtime/Engine/Private/EditorFramework/AssetImportData.cpp b/Engine/Source/Runtime/Engine/Private/EditorFramework/AssetImportData.cpp
index 97b559500ca7..b9e4b75285ee 100644
--- a/Engine/Source/Runtime/Engine/Private/EditorFramework/AssetImportData.cpp
+++ b/Engine/Source/Runtime/Engine/Private/EditorFramework/AssetImportData.cpp
@@ -35,7 +35,7 @@ FString FAssetImportInfo::ToJson() const
 		Json += FString::Printf(TEXT("{ \"RelativeFilename\" : \"%s\", \"Timestamp\" : \"%d\", \"FileMD5\" : \"%s\" }"),
 			*SourceFiles[Index].RelativeFilename,
 			SourceFiles[Index].Timestamp.ToUnixTimestamp(),
-			*Lex::ToString(SourceFiles[Index].FileHash)
+			*LexToString(SourceFiles[Index].FileHash)
 			);
 
 		if (Index != SourceFiles.Num() - 1)
@@ -80,10 +80,10 @@ TOptional<FAssetImportInfo> FAssetImportInfo::FromJson(FString InJsonString)
 		}
 
 		int64 UnixTimestamp = 0;
-		Lex::FromString(UnixTimestamp, *TimestampString);
+		LexFromString(UnixTimestamp, *TimestampString);
 
 		FMD5Hash FileHash;
-		Lex::FromString(FileHash, *MD5String);
+		LexFromString(FileHash, *MD5String);
 
 		Info.SourceFiles.Emplace(MoveTemp(RelativeFilename), FDateTime::FromUnixTimestamp(UnixTimestamp), FileHash);
 	}
@@ -181,11 +181,15 @@ TArray<FString> UAssetImportData::ExtractFilenames() const
 
 FString UAssetImportData::SanitizeImportFilename(const FString& InPath) const
 {
-	const UPackage* Package = GetOutermost();
-	if (Package)
+	return SanitizeImportFilename(InPath, GetOutermost());
+}
+
+FString UAssetImportData::SanitizeImportFilename(const FString& InPath, const UPackage* Outermost)
+{
+	if (Outermost)
 	{
 		const bool		bIncludeDot = true;
-		const FString	PackagePath	= Package->GetPathName();
+		const FString	PackagePath	= Outermost->GetPathName();
 		const FName		MountPoint	= FPackageName::GetPackageMountPoint(PackagePath);
 		const FString	PackageFilename = FPackageName::LongPackageNameToFilename(PackagePath, FPaths::GetExtension(InPath, bIncludeDot));
 		const FString	AbsolutePath = FPaths::ConvertRelativePathToFull(InPath);
diff --git a/Engine/Source/Runtime/Engine/Private/EndUserSettings.cpp b/Engine/Source/Runtime/Engine/Private/EndUserSettings.cpp
deleted file mode 100644
index 6bc665b778fe..000000000000
--- a/Engine/Source/Runtime/Engine/Private/EndUserSettings.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-#include "Engine/EndUserSettings.h"
-#include "Interfaces/IAnalyticsProvider.h"
-#include "EngineAnalytics.h"
-
-#define LOCTEXT_NAMESPACE "EndUserSettings"
-
-UEndUserSettings::UEndUserSettings(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, bSendAnonymousUsageDataToEpic(true)
-	, bSendMeanTimeBetweenFailureDataToEpic(false)
-	, bAllowUserIdInUsageData(false)
-{
-}
-
-void UEndUserSettings::GetToogleCategoryAndPropertyNames(FName& OutCategory, FName& OutProperty) const
-{
-	OutCategory = FName("Privacy");
-	OutProperty = FName("bSendAnonymousUsageDataToEpic");
-};
-
-FText UEndUserSettings::GetFalseStateLabel() const
-{
-	return LOCTEXT("FalseStateLabel", "End-users don't send");
-};
-
-FText UEndUserSettings::GetFalseStateTooltip() const
-{
-	return LOCTEXT("FalseStateTooltip", "By default, your end-users don't send anonymous usage data to Epic Games.");
-};
-
-FText UEndUserSettings::GetFalseStateDescription() const
-{
-	return LOCTEXT("FalseStateDescription", "You have defaulted your users' settings to not send anonymous usage data to Epic Games. You can allow users to opt-in by adding this setting to your game UI and calling UEndUserSettings::SetSendAnonymousUsageDataToEpic() with their choice. Please consider defaulting this to true or allowing users to switch it on to help improve Unreal Engine. Epic Games will never sell or trade individual usage data to / with third party organizations. When permitted, we collect information about your users' game sessions, the game they're playing and for how long they play. Their information would be encrypted and sent anonymously, and only when they run your product.");
-};
-
-FText UEndUserSettings::GetTrueStateLabel() const
-{
-	return LOCTEXT("TrueStateLabel", "End-users send to Epic");
-};
-
-FText UEndUserSettings::GetTrueStateTooltip() const
-{
-	return LOCTEXT("TrueStateTooltip", "By default, your end-users send anonymous usage data to Epic Games.");
-};
-
-FText UEndUserSettings::GetTrueStateDescription() const
-{
-	return LOCTEXT("TrueStateDescription", "You have defaulted your users' settings to send anonymous usage data to Epic Games. You can allow users to opt-out by adding this setting to your game UI and calling UEndUserSettings::SetSendAnonymousUsageDataToEpic() with their choice. Thank you for helping to improve Unreal Engine. Epic Games will never sell or trade individual usage data to / with third party organizations. We will collect information about your users' game sessions, the game they're playing and for how long they play. Their information is sent anonymously. Their information is only sent when they run your product, it is encrypted and sent to our servers.");
-};
-
-FString UEndUserSettings::GetAdditionalInfoUrl() const
-{
-	return FString(TEXT("http://epicgames.com/privacynotice"));
-};
-
-FText UEndUserSettings::GetAdditionalInfoUrlLabel() const
-{
-	return LOCTEXT("HyperlinkLabel", "Epic Games Privacy Notice");
-};
-
-void UEndUserSettings::SetSendAnonymousUsageDataToEpic(bool bEnable)
-{
-	if (bSendAnonymousUsageDataToEpic != bEnable)
-	{
-		bSendAnonymousUsageDataToEpic = bEnable;
-		OnSendAnonymousUsageDataToEpicChanged();
-	}
-}
-
-void UEndUserSettings::OnSendAnonymousUsageDataToEpicChanged()
-{
-	if (bSendAnonymousUsageDataToEpic)
-	{
-		// Attempt to initialize analytics and send opt-in event
-		if (!FEngineAnalytics::IsAvailable())
-		{
-			FEngineAnalytics::Initialize();
-			if (FEngineAnalytics::IsAvailable())
-			{
-				FEngineAnalytics::GetProvider().RecordEvent(FString("Engine.Privacy.EndUserOptIn"));
-			}
-		}
-	}
-	else
-	{
-		// Send opt-out event and shutdown analytics
-		if (FEngineAnalytics::IsAvailable())
-		{
-			FEngineAnalytics::GetProvider().RecordEvent(FString("Engine.Privacy.EndUserOptOut"));
-			const bool bIsEngineShutdown = false;
-			FEngineAnalytics::Shutdown(bIsEngineShutdown);
-		}
-	}
-}
-
-#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/EngineAnalytics.cpp b/Engine/Source/Runtime/Engine/Private/EngineAnalytics.cpp
index 0a23f96b76d8..6640bcd95dce 100644
--- a/Engine/Source/Runtime/Engine/Private/EngineAnalytics.cpp
+++ b/Engine/Source/Runtime/Engine/Private/EngineAnalytics.cpp
@@ -17,8 +17,6 @@
 #include "RHI.h"
 
 bool FEngineAnalytics::bIsInitialized;
-bool FEngineAnalytics::bIsEditorRun;
-bool FEngineAnalytics::bIsGameRun;
 TSharedPtr<IAnalyticsProviderET> FEngineAnalytics::Analytics;
 TSharedPtr<FEngineSessionManager> FEngineAnalytics::SessionManager;
 
@@ -58,24 +56,18 @@ void FEngineAnalytics::Initialize()
 	check(GEngine);
 
 #if WITH_EDITOR
-	// this will only be true for builds that have editor support (currently PC, Mac, Linux)
+	// this will only be true for builds that have editor support (desktop platforms)
 	// The idea here is to only send editor events for actual editor runs, not for things like -game runs of the editor.
-	bIsEditorRun = GIsEditor && !IsRunningCommandlet();
-	bIsGameRun = false;
+	bool bIsEditorRun = GIsEditor && !IsRunningCommandlet();
 #else
-	// We also want to identify a real run of a game, which is NOT necessarily the opposite of an editor run.
-	// Ideally we'd be able to tell explicitly, but with content-only games, it becomes difficult.
-	// So we ensure we are not an editor run, we don't have EDITOR stuff compiled in, we are not running a commandlet,
-	// we are not a generic, utility program, and we require cooked data.
-	bIsEditorRun = false;
-	bIsGameRun = !IsRunningCommandlet() && !FPlatformProperties::IsProgram() && FPlatformProperties::RequiresCookedData();
+	bool bIsEditorRun = false;
 #endif
 
 #if UE_BUILD_DEBUG
 	const bool bShouldInitAnalytics = false;
 #else
 	// Outside of the editor, the only engine analytics usage is the hardware survey
-	const bool bShouldInitAnalytics = (bIsEditorRun && GEngine->AreEditorAnalyticsEnabled()) || (bIsGameRun && GEngine->AreGameAnalyticsEnabled());
+	const bool bShouldInitAnalytics = bIsEditorRun && GEngine->AreEditorAnalyticsEnabled();
 #endif
 
 	if (bShouldInitAnalytics)
@@ -96,15 +88,7 @@ void FEngineAnalytics::Initialize()
 			FString UE4TypeOverride;
 			bool bHasOverride = GConfig->GetString(TEXT("Analytics"), TEXT("UE4TypeOverride"), UE4TypeOverride, GEngineIni);
 			const TCHAR* UE4TypeStr = bHasOverride ? *UE4TypeOverride : FEngineBuildSettings::IsPerforceBuild() ? TEXT("Perforce") : TEXT("UnrealEngine");
-			if (bIsEditorRun)
-			{
-				Config.APIKeyET = FString::Printf(TEXT("UEEditor.%s.%s"), UE4TypeStr, BuildTypeStr);
-			}
-			else
-			{
-				const UGeneralProjectSettings& ProjectSettings = *GetDefault<UGeneralProjectSettings>();
-				Config.APIKeyET = FString::Printf(TEXT("UEGame.%s.%s|%s|%s"), UE4TypeStr, BuildTypeStr, *ProjectSettings.ProjectID.ToString(), *ProjectSettings.ProjectName);
-			}
+			Config.APIKeyET = FString::Printf(TEXT("UEEditor.%s.%s"), UE4TypeStr, BuildTypeStr);
 		}
 		if (Config.APIServerET.IsEmpty())
 		{
@@ -125,23 +109,7 @@ void FEngineAnalytics::Initialize()
 
 		if (Analytics.IsValid())
 		{
-			// Use an anonymous user id in-game
-			if (bIsGameRun && GEngine->AreGameAnalyticsAnonymous())
-			{
-				FString AnonymousId;
-				if (!FPlatformMisc::GetStoredValue(TEXT("Epic Games"), TEXT("Unreal Engine/Privacy"), TEXT("AnonymousID"), AnonymousId) || AnonymousId.IsEmpty())
-				{
-					AnonymousId = FGuid::NewGuid().ToString(EGuidFormats::DigitsWithHyphensInBraces);
-					FPlatformMisc::SetStoredValue(TEXT("Epic Games"), TEXT("Unreal Engine/Privacy"), TEXT("AnonymousID"), AnonymousId);
-				}
-
-				// Place the anonymous user id into the first field of the UserID set, as it most closely matches the LoginID semantics.
-				Analytics->SetUserID(FString::Printf(TEXT("ANON-%s||"), *AnonymousId));
-			}
-			else
-			{
-				Analytics->SetUserID(FString::Printf(TEXT("%s|%s|%s"), *FPlatformMisc::GetLoginId(), *FPlatformMisc::GetEpicAccountId(), *FPlatformMisc::GetOperatingSystemId()));
-			}
+			Analytics->SetUserID(FString::Printf(TEXT("%s|%s|%s"), *FPlatformMisc::GetLoginId(), *FPlatformMisc::GetEpicAccountId(), *FPlatformMisc::GetOperatingSystemId()));
 
 			TArray<FAnalyticsEventAttribute> StartSessionAttributes;
 			GEngine->CreateStartupAnalyticsAttributes( StartSessionAttributes );
@@ -179,11 +147,8 @@ void FEngineAnalytics::Initialize()
 		// Create the session manager singleton
 		if (!SessionManager.IsValid())
 		{
-			if (bIsEditorRun || (bIsGameRun && GEngine->AreGameMTBFEventsEnabled()))
-			{
-				SessionManager = MakeShareable(new FEngineSessionManager(bIsEditorRun ? EEngineSessionManagerMode::Editor : EEngineSessionManagerMode::Game));
-				SessionManager->Initialize();
-			}
+			SessionManager = MakeShareable(new FEngineSessionManager(EEngineSessionManagerMode::Editor));
+			SessionManager->Initialize();
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/EngineSessionManager.cpp b/Engine/Source/Runtime/Engine/Private/EngineSessionManager.cpp
index 7eb8f34e1d5b..ac0379634402 100644
--- a/Engine/Source/Runtime/Engine/Private/EngineSessionManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/EngineSessionManager.cpp
@@ -75,13 +75,13 @@ namespace
 {
 	FString TimestampToString(FDateTime InTimestamp)
 	{
-		return Lex::ToString(InTimestamp.ToUnixTimestamp());
+		return LexToString(InTimestamp.ToUnixTimestamp());
 	}
 
 	FDateTime StringToTimestamp(FString InString)
 	{
 		int64 TimestampUnix;
-		if (Lex::TryParseString(TimestampUnix, *InString))
+		if (LexTryParseString(TimestampUnix, *InString))
 		{
 			return FDateTime::FromUnixTimestamp(TimestampUnix);
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/ErrorChecking.cpp b/Engine/Source/Runtime/Engine/Private/ErrorChecking.cpp
index 261b4ed08d17..7a586add4b27 100644
--- a/Engine/Source/Runtime/Engine/Private/ErrorChecking.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ErrorChecking.cpp
@@ -38,7 +38,7 @@ public:
 	: EditorContentPackages(inEditorContentPackages)
 	{
 		ArIsObjectReferenceCollector = true;
-		ArIsPersistent = true;
+		this->SetIsPersistent(true);
 		ArIgnoreClassRef = true;
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/GPUSkinVertexFactory.cpp b/Engine/Source/Runtime/Engine/Private/GPUSkinVertexFactory.cpp
index e440a5d0afc5..e0202d05219f 100644
--- a/Engine/Source/Runtime/Engine/Private/GPUSkinVertexFactory.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GPUSkinVertexFactory.cpp
@@ -227,7 +227,7 @@ bool FGPUBaseSkinVertexFactory::FShaderDataType::UpdateBoneData(FRHICommandListI
 
 	FVertexBufferAndSRV* CurrentBoneBuffer = 0;
 
-	if (InFeatureLevel >= ERHIFeatureLevel::ES3_1)
+	if (InFeatureLevel > ERHIFeatureLevel::ES3_1)
 	{
 		check(IsInRenderingThread());
 		
@@ -288,7 +288,7 @@ bool FGPUBaseSkinVertexFactory::FShaderDataType::UpdateBoneData(FRHICommandListI
 			RefToLocal.To3x4MatrixTranspose( (float*)BoneMat.M );
 		}
 	}
-	if (InFeatureLevel >= ERHIFeatureLevel::ES3_1)
+	if (InFeatureLevel > ERHIFeatureLevel::ES3_1)
 	{
 		if (NumBones)
 		{
@@ -515,7 +515,7 @@ public:
 
 			bool bLocalPerBoneMotionBlur = false;
 
-			if (FeatureLevel >= ERHIFeatureLevel::ES3_1)
+			if (FeatureLevel > ERHIFeatureLevel::ES3_1)
 			{
 				if(BoneMatrices.IsBound())
 				{
@@ -769,6 +769,7 @@ public:
 		ClothSimulVertsPositionsNormalsParameter.Bind(ParameterMap,TEXT("ClothSimulVertsPositionsNormals"));
 		PreviousClothSimulVertsPositionsNormalsParameter.Bind(ParameterMap,TEXT("PreviousClothSimulVertsPositionsNormals"));
 		ClothLocalToWorldParameter.Bind(ParameterMap, TEXT("ClothLocalToWorld"));
+		PreviousClothLocalToWorldParameter.Bind(ParameterMap, TEXT("PreviousClothLocalToWorld"));
 		ClothBlendWeightParameter.Bind(ParameterMap, TEXT("ClothBlendWeight"));
 		GPUSkinApexClothParameter.Bind(ParameterMap, TEXT("GPUSkinApexCloth"));
 		GPUSkinApexClothStartIndexOffsetParameter.Bind(ParameterMap, TEXT("GPUSkinApexClothStartIndexOffset"));
@@ -783,6 +784,7 @@ public:
 		Ar << ClothSimulVertsPositionsNormalsParameter;
 		Ar << PreviousClothSimulVertsPositionsNormalsParameter;
 		Ar << ClothLocalToWorldParameter;
+		Ar << PreviousClothLocalToWorldParameter;
 		Ar << ClothBlendWeightParameter;
 		Ar << GPUSkinApexClothParameter;
 		Ar << GPUSkinApexClothStartIndexOffsetParameter;
@@ -822,7 +824,14 @@ public:
 				RHICmdList,
 				VertexShader,
 				ClothLocalToWorldParameter,
-				ClothShaderData.ClothLocalToWorld
+				ClothShaderData.GetClothLocalToWorldForReading(false, FrameNumber)
+				);
+
+			SetShaderValue(
+				RHICmdList,
+				VertexShader,
+				PreviousClothLocalToWorldParameter,
+				ClothShaderData.GetClothLocalToWorldForReading(true, FrameNumber)
 				);
 
 			SetShaderValue(
@@ -854,6 +863,7 @@ protected:
 	FShaderResourceParameter ClothSimulVertsPositionsNormalsParameter;
 	FShaderResourceParameter PreviousClothSimulVertsPositionsNormalsParameter;
 	FShaderParameter ClothLocalToWorldParameter;
+	FShaderParameter PreviousClothLocalToWorldParameter;
 	FShaderParameter ClothBlendWeightParameter;
 	FShaderResourceParameter GPUSkinApexClothParameter;
 	FShaderParameter GPUSkinApexClothStartIndexOffsetParameter;
diff --git a/Engine/Source/Runtime/Engine/Private/GameEngine.cpp b/Engine/Source/Runtime/Engine/Private/GameEngine.cpp
index c70c86a25081..27efa2b0c066 100644
--- a/Engine/Source/Runtime/Engine/Private/GameEngine.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameEngine.cpp
@@ -32,6 +32,8 @@
 #include "Misc/PackageName.h"
 #include "HAL/PlatformApplicationMisc.h"
 
+#include "Misc/ConfigCacheIni.h"
+
 #include "Slate/SceneViewport.h"
 
 #include "IMovieSceneCapture.h"
@@ -248,6 +250,8 @@ void UGameEngine::CreateGameViewport( UGameViewportClient* GameViewportClient )
 	FViewportFrame* ViewportFrame = SceneViewport.Get();
 
 	GameViewport->SetViewportFrame(ViewportFrame);
+
+	FViewport::ViewportResizedEvent.AddUObject(this, &UGameEngine::OnViewportResized);
 }
 
 const FSceneViewport* UGameEngine::GetGameSceneViewport(UGameViewportClient* ViewportClient) const
@@ -284,7 +288,7 @@ void UGameEngine::ConditionallyOverrideSettings(int32& ResolutionX, int32& Resol
 	DetermineGameWindowResolution(ResolutionX, ResolutionY, WindowMode);
 }
 
-void UGameEngine::DetermineGameWindowResolution( int32& ResolutionX, int32& ResolutionY, EWindowMode::Type& WindowMode )
+void UGameEngine::DetermineGameWindowResolution( int32& ResolutionX, int32& ResolutionY, EWindowMode::Type& WindowMode, bool bUseWorkAreaForWindowed )
 {
 	//fullscreen is always supported, but don't allow windowed mode on platforms that dont' support it.
 	WindowMode = (!FPlatformProperties::SupportsWindowedMode() && (WindowMode == EWindowMode::Windowed || WindowMode == EWindowMode::WindowedFullscreen)) ? EWindowMode::Fullscreen : WindowMode;
@@ -305,8 +309,8 @@ void UGameEngine::DetermineGameWindowResolution( int32& ResolutionX, int32& Reso
 
 	// Find the maximum allowed resolution
 	// Use PrimaryDisplayWidth/Height in windowed mode
-	int32 MaxResolutionX = DisplayMetrics.PrimaryDisplayWidth;
-	int32 MaxResolutionY = DisplayMetrics.PrimaryDisplayHeight;
+	int32 MaxResolutionX = bUseWorkAreaForWindowed && WindowMode == EWindowMode::Windowed ? DisplayMetrics.PrimaryDisplayWorkAreaRect.Right - DisplayMetrics.PrimaryDisplayWorkAreaRect.Left : DisplayMetrics.PrimaryDisplayWidth;
+	int32 MaxResolutionY = bUseWorkAreaForWindowed && WindowMode == EWindowMode::Windowed ? DisplayMetrics.PrimaryDisplayWorkAreaRect.Bottom - DisplayMetrics.PrimaryDisplayWorkAreaRect.Top : DisplayMetrics.PrimaryDisplayHeight;
 	if (WindowMode == EWindowMode::Fullscreen && DisplayMetrics.MonitorInfo.Num() > 0)
 	{
 		// In fullscreen, PrimaryDisplayWidth/Height is equal to your current resolution, so we will use your max native resolution instead
@@ -405,13 +409,21 @@ TSharedRef<SWindow> UGameEngine::CreateGameWindow()
 		}
 	}
 
-	const FText WindowTitleOverride = GetDefault<UGeneralProjectSettings>()->ProjectDisplayedTitle;
+	// bool bHaveProjectSettings = IsClassLoaded<UGeneralProjectSettings>();
+
+	/*const FText WindowTitleOverride = bHaveProjectSettings ? GetDefault<UGeneralProjectSettings>()->ProjectDisplayedTitle : FText();
+	const FText WindowTitleComponent = WindowTitleOverride.IsEmpty() ? NSLOCTEXT("UnrealEd", "GameWindowTitle", "{GameName}") : WindowTitleOverride;*/
+
+	FText WindowTitleOverride = FText();
+	GConfig->GetText(TEXT("/Script/EngineSettings.GeneralProjectSettings"), TEXT("ProjectDisplayedTitle"), WindowTitleOverride, GGameIni);
 	const FText WindowTitleComponent = WindowTitleOverride.IsEmpty() ? NSLOCTEXT("UnrealEd", "GameWindowTitle", "{GameName}") : WindowTitleOverride;
 
-	FText WindowDebugInfoComponent;
+	FText WindowDebugInfoComponent = FText();
 #if !UE_BUILD_SHIPPING
-	const FText WindowDebugInfoOverride = GetDefault<UGeneralProjectSettings>()->ProjectDebugTitleInfo;
-	WindowDebugInfoComponent = WindowDebugInfoOverride.IsEmpty() ? NSLOCTEXT("UnrealEd", "GameWindowTitleDebugInfo", "({PlatformArchitecture}-bit, {RHIName})") : WindowDebugInfoOverride;
+	//const FText WindowDebugInfoOverride = bHaveProjectSettings ? GetDefault<UGeneralProjectSettings>()->ProjectDebugTitleInfo : FText();
+	FText WindowDebugInfoOverride = FText();
+	GConfig->GetText(TEXT("/Script/EngineSettings.GeneralProjectSettings"), TEXT("ProjectDebugTitleInfo"), WindowDebugInfoOverride, GGameIni);
+	WindowDebugInfoComponent = WindowDebugInfoOverride.IsEmpty() ? NSLOCTEXT("UnrealEd", "GameWindowTitleDebugInfo", "({PlatformArchitecture}-bit {BuildConfiguration} {RHIName})") : WindowDebugInfoOverride;
 #endif
 
 #if PLATFORM_64BITS
@@ -426,17 +438,27 @@ TSharedRef<SWindow> UGameEngine::CreateGameWindow()
 	Args.Add( TEXT("GameName"), FText::FromString( FApp::GetProjectName() ) );
 	Args.Add( TEXT("PlatformArchitecture"), PlatformBits );
 	Args.Add( TEXT("RHIName"), FText::FromName( LegacyShaderPlatformToShaderFormat( GMaxRHIShaderPlatform ) ) );
+	Args.Add( TEXT("BuildConfiguration"), FText::FromString(EBuildConfigurations::ToString(FApp::GetBuildConfiguration()) ) );
+
 	/************************************************************************/
 	/************************ Add device name to window title****************/
 	/************************************************************************/
 	const FText WindowTitleVar = FText::Format( FText::FromString(TEXT("{0} {1} {2}")), WindowTitleComponent, WindowDebugInfoComponent, FGlobalTabmanager::Get()->GetApplicationTitle() );
 	const FText WindowTitle = FText::Format(WindowTitleVar, Args);
-	const bool bShouldPreserveAspectRatio = GetDefault<UGeneralProjectSettings>()->bShouldWindowPreserveAspectRatio;
-	const bool bUseBorderlessWindow = GetDefault<UGeneralProjectSettings>()->bUseBorderlessWindow && PLATFORM_WINDOWS;
-	const bool bAllowWindowResize = GetDefault<UGeneralProjectSettings>()->bAllowWindowResize;
-	const bool bAllowClose = GetDefault<UGeneralProjectSettings>()->bAllowClose;
-	const bool bAllowMaximize = GetDefault<UGeneralProjectSettings>()->bAllowMaximize;
-	const bool bAllowMinimize = GetDefault<UGeneralProjectSettings>()->bAllowMinimize;
+
+	auto GetProjectSettingBool = [](const FString& ParamName, bool Default) -> bool
+		{
+			bool Temp = Default;
+			GConfig->GetBool(TEXT("/Script/EngineSettings.GeneralProjectSettings"), *ParamName, Temp, GGameIni);
+			return Temp;
+		};
+
+	const bool bShouldPreserveAspectRatio = GetProjectSettingBool(TEXT("bShouldWindowPreserveAspectRatio"), true);
+	const bool bUseBorderlessWindow = GetProjectSettingBool(TEXT("bUseBorderlessWindow"), false) && PLATFORM_WINDOWS;
+	const bool bAllowWindowResize = GetProjectSettingBool(TEXT("bAllowWindowResize"), true);
+	const bool bAllowClose = GetProjectSettingBool(TEXT("bAllowClose"), true);
+	const bool bAllowMaximize = GetProjectSettingBool(TEXT("bAllowMaximize"), true);
+	const bool bAllowMinimize = GetProjectSettingBool(TEXT("bAllowMinimize"), true);
 
 	// Allow optional winX/winY parameters to set initial window position
 	EAutoCenter AutoCenterType = EAutoCenter::PrimaryWorkArea;
@@ -483,6 +505,7 @@ TSharedRef<SWindow> UGameEngine::CreateGameWindow()
 	.Type(EWindowType::GameWindow)
 	.Style(bUseBorderlessWindow ? &BorderlessStyle : &FCoreStyle::Get().GetWidgetStyle<FWindowStyle>("Window"))
 	.ClientSize(FVector2D(ResX, ResY))
+	.AdjustInitialSizeAndPositionForDPIScale(false)
 	.Title(WindowTitle)
 	.AutoCenter(AutoCenterType)
 	.ScreenPosition(FVector2D(WinX, WinY))
@@ -591,6 +614,23 @@ void UGameEngine::RedrawViewports( bool bShouldPresent /*= true*/ )
 	}
 }
 
+void UGameEngine::OnViewportResized(FViewport* Viewport, uint32 Unused)
+{
+	if (Viewport && Viewport == SceneViewport.Get() && GameViewportWindow.IsValid() && GameViewportWindow.Pin()->GetWindowMode() == EWindowMode::Windowed)
+	{
+		const FIntPoint ViewportSize = Viewport->GetSizeXY();
+		if (ViewportSize.X > 0 && ViewportSize.Y > 0)
+		{
+			GSystemResolution.ResX = ViewportSize.X;
+			GSystemResolution.ResY = ViewportSize.Y;
+
+			UGameUserSettings* Settings = GetGameUserSettings();
+			Settings->SetScreenResolution(ViewportSize);
+			Settings->ConfirmVideoMode();
+		}
+	}
+}
+
 /*-----------------------------------------------------------------------------
 	Game init and exit.
 -----------------------------------------------------------------------------*/
@@ -762,6 +802,8 @@ void UGameEngine::Start()
 
 void UGameEngine::PreExit()
 {
+	GetGameUserSettings()->SaveSettings();
+
 	// Stop tracking, automatically flushes.
 	NETWORK_PROFILER(GNetworkProfiler.EnableTracking(false));
 
@@ -864,12 +906,15 @@ bool UGameEngine::NetworkRemapPath(UNetDriver* Driver, FString& Str, bool bReadi
 	FWorldContext& Context = GetWorldContextFromWorldChecked(World);
 	if (Context.PIEInstance == INDEX_NONE)
 	{
-		// If this is not a PIE instance but sender is PIE, we need to strip the PIE prefix
-		const FString Stripped = UWorld::RemovePIEPrefix(Str);
-		if (!Stripped.Equals(Str, ESearchCase::CaseSensitive))
+		if (WorldList.Num() > 1)
 		{
-			Str = Stripped;
-			return true;
+			// If this is not a PIE instance but sender is PIE, we need to strip the PIE prefix
+			const FString Stripped = UWorld::RemovePIEPrefix(Str);
+			if (!Stripped.Equals(Str, ESearchCase::CaseSensitive))
+			{
+				Str = Stripped;
+				return true;
+			}
 		}
 		return false;
 	}
@@ -1328,6 +1373,7 @@ void UGameEngine::Tick( float DeltaSeconds, bool bIdleMode )
 	// ----------------------------
 	{
 		SCOPE_TIME_GUARD(TEXT("UGameEngine::Tick - TickObjects"));
+		CSV_SCOPED_TIMING_STAT(Basic, GameEngineTickObjects);
 		FTickableGameObject::TickObjects(nullptr, LEVELTICK_All, false, DeltaSeconds);
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/GameFramework/RootMotionSource.cpp b/Engine/Source/Runtime/Engine/Private/GameFramework/RootMotionSource.cpp
index 828720477da3..16306643c5c1 100644
--- a/Engine/Source/Runtime/Engine/Private/GameFramework/RootMotionSource.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameFramework/RootMotionSource.cpp
@@ -156,6 +156,7 @@ FRootMotionSourceSettings& FRootMotionSourceSettings::operator+=(const FRootMoti
 FRootMotionSource::FRootMotionSource()
 	: Priority(0)
 	, LocalID((uint16)ERootMotionSourceID::Invalid)
+	, AccumulateMode(ERootMotionAccumulateMode::Override)
 	, StartTime(RootMotionSource_InvalidStartTime)
 	, CurrentTime(0.0f)
 	, PreviousTime(0.0f)
diff --git a/Engine/Source/Runtime/Engine/Private/GameFramework/TouchInterface.cpp b/Engine/Source/Runtime/Engine/Private/GameFramework/TouchInterface.cpp
index 87a37530e1cd..10db0779e10d 100644
--- a/Engine/Source/Runtime/Engine/Private/GameFramework/TouchInterface.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameFramework/TouchInterface.cpp
@@ -4,6 +4,7 @@
 #include "Engine/Texture2D.h"
 #include "Styling/CoreStyle.h"
 #include "Widgets/Input/SVirtualJoystick.h"
+#include "Slate/DeferredCleanupSlateBrush.h"
 
 UTouchInterface::UTouchInterface(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
@@ -33,8 +34,8 @@ void UTouchInterface::Activate(TSharedPtr<SVirtualJoystick> VirtualJoystick)
 			FTouchInputControl Control = Controls[ControlIndex];
 			SVirtualJoystick::FControlInfo* SlateControl = new(SlateControls)SVirtualJoystick::FControlInfo;
 
-			SlateControl->Image1 = (Control.Image1 ? FCoreStyle::GetDynamicImageBrush("Engine.Joystick.Image1", Control.Image1, Control.Image1->GetFName()) : nullptr);
-			SlateControl->Image2 = (Control.Image2 ? FCoreStyle::GetDynamicImageBrush("Engine.Joystick.Image2", Control.Image2, Control.Image2->GetFName()) : nullptr);
+			SlateControl->Image1 = Control.Image1 ? StaticCastSharedRef<ISlateBrushSource>(FDeferredCleanupSlateBrush::CreateBrush(Control.Image1)) : TSharedPtr<ISlateBrushSource>();
+			SlateControl->Image2 = Control.Image2 ? StaticCastSharedRef<ISlateBrushSource>(FDeferredCleanupSlateBrush::CreateBrush(Control.Image2)) : TSharedPtr<ISlateBrushSource>();
 			SlateControl->Center = Control.Center;
 			SlateControl->VisualSize = Control.VisualSize;
 			SlateControl->ThumbSize = Control.ThumbSize;
diff --git a/Engine/Source/Runtime/Engine/Private/GameInstance.cpp b/Engine/Source/Runtime/Engine/Private/GameInstance.cpp
index 5ee21cd41741..96e528673c4b 100644
--- a/Engine/Source/Runtime/Engine/Private/GameInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameInstance.cpp
@@ -778,13 +778,13 @@ TSharedPtr<const FUniqueNetId> UGameInstance::GetPrimaryPlayerUniqueId() const
 		}
 	}
 
-	TSharedPtr<const FUniqueNetId> LocalUserId = nullptr;
+	FUniqueNetIdRepl LocalUserId;
 	if (PrimaryLP)
 	{
 		LocalUserId = PrimaryLP->GetPreferredUniqueNetId();
 	}
 
-	return LocalUserId;
+	return LocalUserId.GetUniqueNetId();
 }
 
 ULocalPlayer* UGameInstance::FindLocalPlayerFromControllerId(const int32 ControllerId) const
@@ -804,19 +804,14 @@ ULocalPlayer* UGameInstance::FindLocalPlayerFromUniqueNetId(const FUniqueNetId&
 {
 	for (ULocalPlayer* Player : LocalPlayers)
 	{
-		if (Player == NULL)
+		if (Player == nullptr)
 		{
 			continue;
 		}
 
-		TSharedPtr<const FUniqueNetId> OtherUniqueNetId = Player->GetPreferredUniqueNetId();
-
-		if (!OtherUniqueNetId.IsValid())
-		{
-			continue;
-		}
-
-		if (*OtherUniqueNetId == UniqueNetId)
+		FUniqueNetIdRepl OtherUniqueNetId = Player->GetPreferredUniqueNetId();
+		if (OtherUniqueNetId.IsValid() &&
+			*OtherUniqueNetId == UniqueNetId)
 		{
 			// Match
 			return Player;
@@ -1018,6 +1013,7 @@ bool UGameInstance::PlayReplay(const FString& Name, UWorld* WorldOverride, const
 	{
 		UE_LOG(LogDemo, Warning, TEXT( "Demo playback failed: %s" ), *Error );
 		CurrentWorld->DestroyDemoNetDriver();
+		return false;
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/GameUserSettings.cpp b/Engine/Source/Runtime/Engine/Private/GameUserSettings.cpp
index 5a7802706d67..1e162789eea1 100644
--- a/Engine/Source/Runtime/Engine/Private/GameUserSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameUserSettings.cpp
@@ -115,21 +115,24 @@ EWindowMode::Type UGameUserSettings::GetLastConfirmedFullscreenMode() const
 
 void UGameUserSettings::SetFullscreenMode( EWindowMode::Type InFullscreenMode )
 {
-	switch ( InFullscreenMode )
+	if (FullscreenMode != InFullscreenMode)
 	{
-		case EWindowMode::Fullscreen:
-			FullscreenMode = 0;
-			break;
-		case EWindowMode::WindowedFullscreen:
-			FullscreenMode = 1;
-			break;
-		case EWindowMode::Windowed:
-		default:
-			FullscreenMode = 2;
-			break;
-	}
+		switch (InFullscreenMode)
+		{
+			case EWindowMode::Fullscreen:
+				FullscreenMode = 0;
+				break;
+			case EWindowMode::WindowedFullscreen:
+				FullscreenMode = 1;
+				break;
+			case EWindowMode::Windowed:
+			default:
+				FullscreenMode = 2;
+				break;
+		}
 
-	UpdateResolutionQuality();
+		UpdateResolutionQuality();
+	}
 }
 
 EWindowMode::Type UGameUserSettings::GetPreferredFullscreenMode() const
@@ -210,6 +213,8 @@ void UGameUserSettings::ConfirmVideoMode()
 	LastConfirmedFullscreenMode = FullscreenMode;
 	LastUserConfirmedResolutionSizeX = ResolutionSizeX;
 	LastUserConfirmedResolutionSizeY = ResolutionSizeY;
+
+	OnGameUserSettingsUINeedsUpdate.Broadcast();
 }
 
 void UGameUserSettings::RevertVideoMode()
@@ -280,8 +285,6 @@ void UGameUserSettings::UpdateResolutionQuality()
 	{
 		ScalabilityQuality.ResolutionQuality = FMath::Max(ScalabilityQuality.ResolutionQuality, MinResolutionScale);
 	}
-
-	OnGameUserSettingsUINeedsUpdate.Broadcast();
 }
 
 float UGameUserSettings::GetDefaultResolutionScale()
@@ -414,8 +417,8 @@ void UGameUserSettings::ValidateSettings()
 	const int32 ClampedWidth = (ScreenWidth > 0 && DesiredScreenWidth > ScreenWidth) ? ScreenWidth : DesiredScreenWidth;
 	const int32 ClampedHeight = (ScreenHeight > 0 && DesiredScreenHeight > ScreenHeight) ? ScreenHeight : DesiredScreenHeight;
 
-	LastUserConfirmedDesiredScreenWidth = ClampedWidth;
-	LastUserConfirmedDesiredScreenHeight = ClampedHeight;
+	LastUserConfirmedDesiredScreenWidth = DesiredScreenWidth;
+	LastUserConfirmedDesiredScreenHeight = DesiredScreenHeight;
 
 #if !PLATFORM_PS4 && !PLATFORM_XBOXONE
 	// We do not modify the user setting on console if HDR is not supported
@@ -512,17 +515,19 @@ void UGameUserSettings::ApplyResolutionSettings(bool bCheckForCommandLineOverrid
 	}
 
 	IConsoleManager::Get().CallAllConsoleVariableSinks();
+
+	OnGameUserSettingsUINeedsUpdate.Broadcast();
 }
 
 void UGameUserSettings::ApplySettings(bool bCheckForCommandLineOverrides)
 {
-	ApplyResolutionSettings(bCheckForCommandLineOverrides);
 	ApplyNonResolutionSettings();
+	ApplyResolutionSettings(bCheckForCommandLineOverrides);
 
 	SaveSettings();
 }
 
-void UGameUserSettings::LoadSettings( bool bForceReload/*=false*/ )
+void UGameUserSettings::LoadSettings(bool bForceReload/*=false*/)
 {
 	QUICK_SCOPE_CYCLE_COUNTER(GameUserSettings_LoadSettings);
 
@@ -569,7 +574,7 @@ void UGameUserSettings::SaveSettings()
 void UGameUserSettings::LoadConfigIni( bool bForceReload/*=false*/ )
 {
 	// Load .ini, allowing merging
-	FConfigCacheIni::LoadGlobalIniFile(GGameUserSettingsIni, TEXT("GameUserSettings"), NULL, bForceReload);
+	FConfigCacheIni::LoadGlobalIniFile(GGameUserSettingsIni, TEXT("GameUserSettings"), nullptr, bForceReload, false, true, *FConfigCacheIni::GetGameUserSettingsDir());
 }
 
 void UGameUserSettings::PreloadResolutionSettings()
@@ -649,7 +654,7 @@ FIntPoint UGameUserSettings::GetDefaultWindowPosition()
 
 EWindowMode::Type UGameUserSettings::GetDefaultWindowMode()
 {
-	// WindowedFullscreen should be the general default or games
+	// WindowedFullscreen should be the general default for games
 	return EWindowMode::WindowedFullscreen;
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/GameViewportClient.cpp b/Engine/Source/Runtime/Engine/Private/GameViewportClient.cpp
index 1397cc647b63..a57ae6469098 100644
--- a/Engine/Source/Runtime/Engine/Private/GameViewportClient.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameViewportClient.cpp
@@ -59,6 +59,11 @@
 #include "DynamicResolutionState.h"
 #include "ProfilingDebugging/CsvProfiler.h"
 
+#if WITH_EDITOR
+#include "Settings/LevelEditorPlaySettings.h"
+#endif
+#include "Math/UnrealMathUtility.h"
+
 #define LOCTEXT_NAMESPACE "GameViewport"
 
 /** This variable allows forcing full screen of the first player controller viewport, even if there are multiple controllers plugged in and no cinematic playing. */
@@ -113,7 +118,6 @@ static TAutoConsoleVariable<float> CVarSecondaryScreenPercentage( // TODO: make
 	TEXT(" 1: override secondary screen percentage."),
 	ECVF_Default);
 
-
 /**
  * Draw debug info on a game scene view.
  */
@@ -150,13 +154,11 @@ UGameViewportClient::UGameViewportClient(const FObjectInitializer& ObjectInitial
 	, AudioDeviceHandle(INDEX_NONE)
 	, bHasAudioFocus(false)
 	, bIsMouseOverClient(false)
+#if WITH_EDITOR
+	, bUseMouseForTouchInEditor(false)
+#endif
 {
 
-	TitleSafeZone.MaxPercentX = 0.9f;
-	TitleSafeZone.MaxPercentY = 0.9f;
-	TitleSafeZone.RecommendedPercentX = 0.8f;
-	TitleSafeZone.RecommendedPercentY = 0.8f;
-
 	bIsPlayInEditorViewport = false;
 	ViewModeIndex = VMI_Lit;
 
@@ -428,13 +430,8 @@ UGameInstance* UGameViewportClient::GetGameInstance() const
 	return GameInstance;
 }
 
-bool UGameViewportClient::InputKey(FViewport* InViewport, int32 ControllerId, FKey Key, EInputEvent EventType, float AmountDepressed, bool bGamepad)
+bool UGameViewportClient::TryToggleFullscreenOnInputKey(FKey Key, EInputEvent EventType)
 {
-	if (IgnoreInput())
-	{
-		return ViewportConsole ? ViewportConsole->InputKey(ControllerId, Key, EventType, AmountDepressed, bGamepad) : false;
-	}
-
 	if ((Key == EKeys::Enter && EventType == EInputEvent::IE_Pressed && FSlateApplication::Get().GetModifierKeys().IsAltDown() && GetDefault<UInputSettings>()->bAltEnterTogglesFullscreen)
 		|| (IsRunningGame() && Key == EKeys::F11 && EventType == EInputEvent::IE_Pressed && GetDefault<UInputSettings>()->bF11TogglesFullscreen))
 	{
@@ -442,6 +439,21 @@ bool UGameViewportClient::InputKey(FViewport* InViewport, int32 ControllerId, FK
 		return true;
 	}
 
+	return false;
+}
+
+bool UGameViewportClient::InputKey(FViewport* InViewport, int32 ControllerId, FKey Key, EInputEvent EventType, float AmountDepressed, bool bGamepad)
+{
+	if (TryToggleFullscreenOnInputKey(Key, EventType))
+	{
+		return true;
+	}
+
+	if (IgnoreInput())
+	{
+		return ViewportConsole ? ViewportConsole->InputKey(ControllerId, Key, EventType, AmountDepressed, bGamepad) : false;
+	}
+
 	const int32 NumLocalPlayers = World ? World->GetGameInstance()->GetNumLocalPlayers() : 0;
 
 	if (NumLocalPlayers > 1 && Key.IsGamepadKey() && GetDefault<UGameMapsSettings>()->bOffsetPlayerGamepadIds)
@@ -582,7 +594,7 @@ bool UGameViewportClient::InputChar(FViewport* InViewport, int32 ControllerId, T
 	return bResult;
 }
 
-bool UGameViewportClient::InputTouch(FViewport* InViewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
+bool UGameViewportClient::InputTouch(FViewport* InViewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
 {
 	if (IgnoreInput())
 	{
@@ -590,13 +602,13 @@ bool UGameViewportClient::InputTouch(FViewport* InViewport, int32 ControllerId,
 	}
 
 	// route to subsystems that care
-	bool bResult = (ViewportConsole ? ViewportConsole->InputTouch(ControllerId, Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex) : false);
+	bool bResult = (ViewportConsole ? ViewportConsole->InputTouch(ControllerId, Handle, Type, TouchLocation, Force, DeviceTimestamp, TouchpadIndex) : false);
 	if (!bResult)
 	{
 		ULocalPlayer* const TargetPlayer = GEngine->GetLocalPlayerFromControllerId(this, ControllerId);
 		if (TargetPlayer && TargetPlayer->PlayerController)
 		{
-			bResult = TargetPlayer->PlayerController->InputTouch(Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex);
+			bResult = TargetPlayer->PlayerController->InputTouch(Handle, Type, TouchLocation, Force, DeviceTimestamp, TouchpadIndex);
 		}
 	}
 
@@ -625,7 +637,7 @@ bool UGameViewportClient::InputMotion(FViewport* InViewport, int32 ControllerId,
 void UGameViewportClient::SetIsSimulateInEditorViewport(bool bInIsSimulateInEditorViewport)
 {
 #if PLATFORM_DESKTOP || PLATFORM_HTML5
-	if (GetDefault<UInputSettings>()->bUseMouseForTouch)
+	if (GetUseMouseForTouch())
 	{
 		FSlateApplication::Get().SetGameIsFakingTouchEvents(!bInIsSimulateInEditorViewport);
 	}
@@ -666,7 +678,7 @@ void UGameViewportClient::MouseEnter(FViewport* InViewport, int32 x, int32 y)
 	Super::MouseEnter(InViewport, x, y);
 
 #if PLATFORM_DESKTOP || PLATFORM_HTML5
-	if (InViewport && GetDefault<UInputSettings>()->bUseMouseForTouch && !GetGameViewport()->GetPlayInEditorIsSimulate())
+	if (InViewport && GetUseMouseForTouch() && !GetGameViewport()->GetPlayInEditorIsSimulate())
 	{
 		FSlateApplication::Get().SetGameIsFakingTouchEvents(true);
 	}
@@ -689,7 +701,7 @@ void UGameViewportClient::MouseLeave(FViewport* InViewport)
 {
 	Super::MouseLeave(InViewport);
 
-	if (InViewport && GetDefault<UInputSettings>()->bUseMouseForTouch)
+	if (InViewport && GetUseMouseForTouch())
 	{
 		// Only send the touch end event if we're not drag/dropping, as that will end the drag/drop operation.
 		if ( !FSlateApplication::Get().IsDragDropping() )
@@ -806,7 +818,7 @@ void UGameViewportClient::AddSoftwareCursor(EMouseCursor::Type Cursor, const FSo
 		UClass* Class = CursorClass.TryLoadClass<UUserWidget>();
 		if (Class)
 		{
-			UUserWidget* UserWidget = CreateWidget<UUserWidget>(GetGameInstance(), Class);
+			UUserWidget* UserWidget = CreateWidget(GetGameInstance(), Class);
 			AddCursorWidget(Cursor, UserWidget);
 		}
 		else
@@ -1312,29 +1324,38 @@ void UGameViewportClient::Draw(FViewport* InViewport, FCanvas* SceneCanvas)
 	checkf(ViewFamily.GetScreenPercentageInterface() == nullptr,
 		TEXT("Some code has tried to set up an alien screen percentage driver, that could be wrong if not supported very well by the RHI."));
 
-	float DynamicResolutionPercentage = 100.0f;
-
-	// Setup main view family with screen percentage interface by dynamic resolution if screen percentage is supported.
-	//
-	// Do not allow dynamic resolution to touch the view family if not supported to ensure there is no possibility to ruin
-	// game play experience on platforms that does not support it, but have it enabled by mistake.
-	if (ViewFamily.EngineShowFlags.ScreenPercentage && GEngine->GetDynamicResolutionState() && GEngine->GetDynamicResolutionState()->IsSupported())
+	// Setup main view family with screen percentage interface by dynamic resolution if screen percentage is enabled.
+	#if WITH_DYNAMIC_RESOLUTION
+	if (ViewFamily.EngineShowFlags.ScreenPercentage)
 	{
-		GEngine->EmitDynamicResolutionEvent(EDynamicResolutionStateEvent::BeginDynamicResolutionRendering);
-		GEngine->GetDynamicResolutionState()->SetupMainViewFamily(ViewFamily);
+		FDynamicResolutionStateInfos DynamicResolutionStateInfos;
+		GEngine->GetDynamicResolutionCurrentStateInfos(/* out */ DynamicResolutionStateInfos);
 
-		if (GEngine->GetDynamicResolutionStatus() == EDynamicResolutionStatus::Enabled)
+		// Do not allow dynamic resolution to touch the view family if not supported to ensure there is no possibility to ruin
+		// game play experience on platforms that does not support it, but have it enabled by mistake.
+		if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Enabled)
 		{
-			DynamicResolutionPercentage = GEngine->GetDynamicResolutionState()->GetResolutionFractionApproximation() * 100.0f;
+			GEngine->EmitDynamicResolutionEvent(EDynamicResolutionStateEvent::BeginDynamicResolutionRendering);
+			GEngine->GetDynamicResolutionState()->SetupMainViewFamily(ViewFamily);
+		}
+		else if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::DebugForceEnabled)
+		{
+			GEngine->EmitDynamicResolutionEvent(EDynamicResolutionStateEvent::BeginDynamicResolutionRendering);
+			ViewFamily.SetScreenPercentageInterface(new FLegacyScreenPercentageDriver(
+				ViewFamily,
+				DynamicResolutionStateInfos.ResolutionFractionApproximation,
+				/* AllowPostProcessSettingsScreenPercentage = */ false,
+				DynamicResolutionStateInfos.ResolutionFractionUpperBound));
 		}
-	}
 
-#if CSV_PROFILER
-	if (DynamicResolutionPercentage >= 0.0f)
-	{
-		CSV_CUSTOM_STAT_GLOBAL(DynamicResolutionPercentage, DynamicResolutionPercentage, ECsvCustomStatOp::Set);
+		#if CSV_PROFILER
+		if (DynamicResolutionStateInfos.ResolutionFractionApproximation >= 0.0f)
+		{
+			CSV_CUSTOM_STAT_GLOBAL(DynamicResolutionPercentage, DynamicResolutionStateInfos.ResolutionFractionApproximation * 100.0f, ECsvCustomStatOp::Set);
+		}
+		#endif
 	}
-#endif
+	#endif
 
 	// If a screen percentage interface was not set by dynamic resolution, then create one matching legacy behavior.
 	if (ViewFamily.GetScreenPercentageInterface() == nullptr)
@@ -1645,7 +1666,7 @@ void UGameViewportClient::ProcessScreenShots(FViewport* InViewport)
 		}
 
 		FScreenshotRequest::Reset();
-		FScreenshotRequest::OnScreenshotRequestProcessed().ExecuteIfBound();
+		FScreenshotRequest::OnScreenshotRequestProcessed().Broadcast();
 
 		// Reeanble screen messages - if we are NOT capturing a movie
 		GAreScreenMessagesEnabled = GScreenMessagesRestoreState;
@@ -1718,7 +1739,7 @@ void UGameViewportClient::LostFocus(FViewport* InViewport)
 void UGameViewportClient::ReceivedFocus(FViewport* InViewport)
 {
 #if PLATFORM_DESKTOP || PLATFORM_HTML5
-	if (GetDefault<UInputSettings>()->bUseMouseForTouch && GetGameViewport() && !GetGameViewport()->GetPlayInEditorIsSimulate())
+	if (GetUseMouseForTouch() && GetGameViewport() && !GetGameViewport()->GetPlayInEditorIsSimulate())
 	{
 		FSlateApplication::Get().SetGameIsFakingTouchEvents(true);
 	}
@@ -1779,7 +1800,9 @@ bool UGameViewportClient::IsOrtho() const
 
 void UGameViewportClient::PostRender(UCanvas* Canvas)
 {
-	if( bShowTitleSafeZone )
+#if !WITH_EDITOR
+	if( bShowTitleSafeZone)
+#endif
 	{
 		DrawTitleSafeArea(Canvas);
 	}
@@ -2107,23 +2130,20 @@ void UGameViewportClient::GetPixelSizeOfScreen( float& Width, float& Height, UCa
 	}
 }
 
-void UGameViewportClient::CalculateSafeZoneValues( float& Horizontal, float& Vertical, UCanvas* Canvas, int32 LocalPlayerIndex, bool bUseMaxPercent )
+void UGameViewportClient::CalculateSafeZoneValues( FMargin& InSafeZone, UCanvas* Canvas, int32 LocalPlayerIndex, bool bUseMaxPercent )
 {
-
-	float XSafeZoneToUse = bUseMaxPercent ? TitleSafeZone.MaxPercentX : TitleSafeZone.RecommendedPercentX;
-	float YSafeZoneToUse = bUseMaxPercent ? TitleSafeZone.MaxPercentY : TitleSafeZone.RecommendedPercentY;
-
 	float ScreenWidth, ScreenHeight;
-	GetPixelSizeOfScreen( ScreenWidth, ScreenHeight, Canvas, LocalPlayerIndex );
-	Horizontal = (ScreenWidth * (1 - XSafeZoneToUse) / 2.0f);
-	Vertical = (ScreenHeight * (1 - YSafeZoneToUse) / 2.0f);
+	GetPixelSizeOfScreen(ScreenWidth, ScreenHeight, Canvas, LocalPlayerIndex);
+
+	FVector2D ScreenSize(ScreenWidth, ScreenHeight);
+	FSlateApplication::Get().GetSafeZoneSize(InSafeZone, ScreenSize);
 }
 
 
 bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, UCanvas* Canvas, float& fTopSafeZone, float& fBottomSafeZone, float& fLeftSafeZone, float& fRightSafeZone, bool bUseMaxPercent )
 {
 	// save separate - if the split screen is in bottom right, then
-
+	FMargin SafeZone;
 	if ( LPlayer != NULL )
 	{
 		int32 LocalPlayerIndex = ConvertLocalPlayerToGamePlayerIndex( LPlayer );
@@ -2140,12 +2160,11 @@ bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, U
 			if ( bHasTopSafeZone || bHasBottomSafeZone || bHasLeftSafeZone || bHasRightSafeZone)
 			{
 				// calculate the safezones
-				float HorizSafeZoneValue, VertSafeZoneValue;
-				CalculateSafeZoneValues( HorizSafeZoneValue, VertSafeZoneValue, Canvas, LocalPlayerIndex, bUseMaxPercent );
+				CalculateSafeZoneValues(SafeZone, Canvas, LocalPlayerIndex, bUseMaxPercent );
 
 				if (bHasTopSafeZone)
 				{
-					fTopSafeZone = VertSafeZoneValue;
+					fTopSafeZone = SafeZone.Top;
 				}
 				else
 				{
@@ -2154,7 +2173,7 @@ bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, U
 
 				if (bHasBottomSafeZone)
 				{
-					fBottomSafeZone = VertSafeZoneValue;
+					fBottomSafeZone = SafeZone.Bottom;
 				}
 				else
 				{
@@ -2163,7 +2182,7 @@ bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, U
 
 				if (bHasLeftSafeZone)
 				{
-					fLeftSafeZone = HorizSafeZoneValue;
+					fLeftSafeZone = SafeZone.Left;
 				}
 				else
 				{
@@ -2172,7 +2191,7 @@ bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, U
 
 				if (bHasRightSafeZone)
 				{
-					fRightSafeZone = HorizSafeZoneValue;
+					fRightSafeZone = SafeZone.Right;
 				}
 				else
 				{
@@ -2188,20 +2207,52 @@ bool UGameViewportClient::CalculateDeadZoneForAllSides( ULocalPlayer* LPlayer, U
 
 void UGameViewportClient::DrawTitleSafeArea( UCanvas* Canvas )
 {	
-	// red colored max safe area box
-	Canvas->SetDrawColor(255,0,0,255);
-	float X = Canvas->ClipX * (1 - TitleSafeZone.MaxPercentX) / 2.0f;
-	float Y = Canvas->ClipY * (1 - TitleSafeZone.MaxPercentY) / 2.0f;
-	FCanvasBoxItem BoxItem( FVector2D( X, Y ), FVector2D( Canvas->ClipX * TitleSafeZone.MaxPercentX, Canvas->ClipY * TitleSafeZone.MaxPercentY ) );
-	BoxItem.SetColor( FLinearColor::Red );
-	Canvas->DrawItem( BoxItem );
-		
-	// yellow colored recommended safe area box
-	X = Canvas->ClipX * (1 - TitleSafeZone.RecommendedPercentX) / 2.0f;
-	Y = Canvas->ClipY * (1 - TitleSafeZone.RecommendedPercentY) / 2.0f;
-	BoxItem.SetColor( FLinearColor::Yellow );
-	BoxItem.Size = FVector2D( Canvas->ClipX * TitleSafeZone.RecommendedPercentX, Canvas->ClipY * TitleSafeZone.RecommendedPercentY );
-	Canvas->DrawItem( BoxItem, X, Y );
+#if WITH_EDITOR
+	FMargin SafeZone;
+	const ULevelEditorPlaySettings* PlayInSettings = GetDefault<ULevelEditorPlaySettings>();
+	
+	const float Width = Canvas->UnsafeSizeX;
+	const float Height = Canvas->UnsafeSizeY;
+	const FLinearColor UnsafeZoneColor(1.0f, 0.0f, 0.0f, 0.25f);
+	FCanvasTileItem TileItem(FVector2D::ZeroVector, GWhiteTexture, UnsafeZoneColor);
+	TileItem.BlendMode = SE_BLEND_Translucent;
+	if (PlayInSettings->DeviceToEmulate.IsEmpty())
+	{
+		CalculateSafeZoneValues(SafeZone, Canvas, 0, false);
+		const float HeightOfSides = Height - SafeZone.GetTotalSpaceAlong<Orient_Vertical>();
+		// Top bar
+		TileItem.Position = FVector2D::ZeroVector;
+		TileItem.Size = FVector2D(Width, SafeZone.Top);
+		Canvas->DrawItem(TileItem);
+
+		// Bottom bar
+		TileItem.Position = FVector2D(0.0f, Height - SafeZone.Bottom);
+		TileItem.Size = FVector2D(Width, SafeZone.Bottom);
+		Canvas->DrawItem(TileItem);
+
+		// Left bar
+		TileItem.Position = FVector2D(0.0f, SafeZone.Top);
+		TileItem.Size = FVector2D(SafeZone.Left, HeightOfSides);
+		Canvas->DrawItem(TileItem);
+
+		// Right bar
+		TileItem.Position = FVector2D(Width - SafeZone.Right, SafeZone.Top);
+		TileItem.Size = FVector2D(SafeZone.Right, HeightOfSides);
+		Canvas->DrawItem(TileItem);
+	}
+	else
+	{
+		ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+		PlaySettings->CalculateCustomUnsafeZones(PlaySettings->CustomUnsafeZoneStarts, PlaySettings->CustomUnsafeZoneDimensions, PlaySettings->DeviceToEmulate, FVector2D(Width, Height));
+
+		for (int ZoneIndex = 0; ZoneIndex < PlaySettings->CustomUnsafeZoneStarts.Num(); ZoneIndex++)
+		{
+			TileItem.Position = PlaySettings->CustomUnsafeZoneStarts[ZoneIndex];
+			TileItem.Size = PlaySettings->CustomUnsafeZoneDimensions[ZoneIndex];
+			Canvas->DrawItem(TileItem);
+		}
+	}
+#endif
 }
 
 void UGameViewportClient::DrawTransition(UCanvas* Canvas)
@@ -2980,6 +3031,7 @@ bool UGameViewportClient::HandleToggleFullscreenCommand()
 
 	int32 ResolutionX = GSystemResolution.ResX;
 	int32 ResolutionY = GSystemResolution.ResY;
+	bool bNewModeApplied = false;
 
 	// Make sure the user's settings are updated after pressing Alt+Enter to toggle fullscreen.  Note
 	// that we don't need to "apply" the setting change, as we already did that above directly.
@@ -2992,14 +3044,20 @@ bool UGameViewportClient::HandleToggleFullscreenCommand()
 			// Ensure that our desired screen size will fit on the display
 			ResolutionX = UserSettings->GetScreenResolution().X;
 			ResolutionY = UserSettings->GetScreenResolution().Y;
-			UGameEngine::DetermineGameWindowResolution(ResolutionX, ResolutionY, FullScreenMode);
+			UGameEngine::DetermineGameWindowResolution(ResolutionX, ResolutionY, FullScreenMode, true);
 
+			UserSettings->SetScreenResolution(FIntPoint(ResolutionX, ResolutionY));
 			UserSettings->SetFullscreenMode(FullScreenMode);
 			UserSettings->ConfirmVideoMode();
+			UserSettings->ApplySettings(false);
+			bNewModeApplied = true;
 		}
 	}
 
-	FSystemResolution::RequestResolutionChange(ResolutionX, ResolutionY, FullScreenMode);
+	if (!bNewModeApplied)
+	{
+		FSystemResolution::RequestResolutionChange(ResolutionX, ResolutionY, FullScreenMode);
+	}
 
 	ToggleFullscreenDelegate.Broadcast(FullScreenMode != EWindowMode::Windowed);
 
@@ -3475,4 +3533,20 @@ bool UGameViewportClient::IsSimulateInEditorViewport() const
 	return GameViewport ? GameViewport->GetPlayInEditorIsSimulate() : false;
 }
 
+#if WITH_EDITOR
+void UGameViewportClient::SetPlayInEditorUseMouseForTouch(bool bInUseMouseForTouch)
+{
+	bUseMouseForTouchInEditor = bInUseMouseForTouch;
+}
+#endif
+
+bool UGameViewportClient::GetUseMouseForTouch() const
+{
+#if WITH_EDITOR
+	return bUseMouseForTouchInEditor || GetDefault<UInputSettings>()->bUseMouseForTouch;
+#else
+	return GetDefault<UInputSettings>()->bUseMouseForTouch;
+#endif
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/GameplayStatics.cpp b/Engine/Source/Runtime/Engine/Private/GameplayStatics.cpp
index 1b4bf692e45b..eba0eefb7967 100644
--- a/Engine/Source/Runtime/Engine/Private/GameplayStatics.cpp
+++ b/Engine/Source/Runtime/Engine/Private/GameplayStatics.cpp
@@ -806,29 +806,40 @@ void UGameplayStatics::PlayWorldCameraShake(const UObject* WorldContextObject, T
 	}
 }
 
-UParticleSystemComponent* CreateParticleSystem(UParticleSystem* EmitterTemplate, UWorld* World, AActor* Actor, bool bAutoDestroy)
+UParticleSystemComponent* CreateParticleSystem(UParticleSystem* EmitterTemplate, UWorld* World, AActor* Actor, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
-	UParticleSystemComponent* PSC = NewObject<UParticleSystemComponent>((Actor ? Actor : (UObject*)World));
+	//Defaulting to creating systems from a pool. Can be disabled via fx.ParticleSystemPool.Enable 0
+	UParticleSystemComponent* PSC;
+
+	if (PoolingMethod != EPSCPoolMethod::None)
+	{
+		//If system is set to auto destroy the we should be safe to automatically allocate from a the world pool.
+		PSC = World->GetPSCPool().CreateWorldParticleSystem(EmitterTemplate, World, PoolingMethod);
+	}
+	else
+	{
+		PSC = NewObject<UParticleSystemComponent>((Actor ? Actor : (UObject*)World));
 	PSC->bAutoDestroy = bAutoDestroy;
 	PSC->bAllowAnyoneToDestroyMe = true;
 	PSC->SecondsBeforeInactive = 0.0f;
 	PSC->bAutoActivate = false;
 	PSC->SetTemplate(EmitterTemplate);
 	PSC->bOverrideLODMethod = false;
+	}
 
 	return PSC;
 }
 
-UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
-	return SpawnEmitterAtLocation(WorldContextObject, EmitterTemplate, SpawnLocation, SpawnRotation, FVector(1.f), bAutoDestroy);
+	return SpawnEmitterAtLocation(WorldContextObject, EmitterTemplate, SpawnLocation, SpawnRotation, FVector(1.f), bAutoDestroy, PoolingMethod);
 }
 
-UParticleSystemComponent* UGameplayStatics::InternalSpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, FVector SpawnScale, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::InternalSpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, FVector SpawnScale, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
 	check(World && EmitterTemplate);
 
-	UParticleSystemComponent* PSC = CreateParticleSystem(EmitterTemplate, World, World->GetWorldSettings(), bAutoDestroy);
+	UParticleSystemComponent* PSC = CreateParticleSystem(EmitterTemplate, World, World->GetWorldSettings(), bAutoDestroy, PoolingMethod);
 
 	PSC->bAbsoluteLocation = true;
 	PSC->bAbsoluteRotation = true;
@@ -840,6 +851,9 @@ UParticleSystemComponent* UGameplayStatics::InternalSpawnEmitterAtLocation(UWorl
 	PSC->RegisterComponentWithWorld(World);
 	PSC->ActivateSystem(true);
 
+	// Notify the texture streamer so that PSC gets managed as a dynamic component.
+	IStreamingManager::Get().NotifyPrimitiveUpdated(PSC);
+
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	if (PSC->Template && PSC->Template->IsImmortal())
 	{
@@ -852,35 +866,35 @@ UParticleSystemComponent* UGameplayStatics::InternalSpawnEmitterAtLocation(UWorl
 	return PSC;
 }
 
-UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, FVector SpawnScale, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(const UObject* WorldContextObject, UParticleSystem* EmitterTemplate, FVector SpawnLocation, FRotator SpawnRotation, FVector SpawnScale, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
 	UParticleSystemComponent* PSC = nullptr;
 	if (EmitterTemplate)
 	{
 		if (UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull))
 		{
-			PSC = InternalSpawnEmitterAtLocation(World, EmitterTemplate, SpawnLocation, SpawnRotation, SpawnScale, bAutoDestroy);
+			PSC = InternalSpawnEmitterAtLocation(World, EmitterTemplate, SpawnLocation, SpawnRotation, SpawnScale, bAutoDestroy, PoolingMethod);
 		}
 	}
 	return PSC;
 }
 
-UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, const FTransform& SpawnTransform, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::SpawnEmitterAtLocation(UWorld* World, UParticleSystem* EmitterTemplate, const FTransform& SpawnTransform, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
 	UParticleSystemComponent* PSC = nullptr;
 	if (World && EmitterTemplate)
 	{
-		PSC = InternalSpawnEmitterAtLocation(World, EmitterTemplate, SpawnTransform.GetLocation(), SpawnTransform.GetRotation().Rotator(), SpawnTransform.GetScale3D(), bAutoDestroy);
+		PSC = InternalSpawnEmitterAtLocation(World, EmitterTemplate, SpawnTransform.GetLocation(), SpawnTransform.GetRotation().Rotator(), SpawnTransform.GetScale3D(), bAutoDestroy, PoolingMethod);
 	}
 	return PSC;
 }
 
-UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem* EmitterTemplate, USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, EAttachLocation::Type LocationType, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem* EmitterTemplate, USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, EAttachLocation::Type LocationType, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
-	return SpawnEmitterAttached(EmitterTemplate, AttachToComponent, AttachPointName, Location, Rotation, FVector(1.f), LocationType, bAutoDestroy);
+	return SpawnEmitterAttached(EmitterTemplate, AttachToComponent, AttachPointName, Location, Rotation, FVector(1.f), LocationType, bAutoDestroy, PoolingMethod);
 }
 
-UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem* EmitterTemplate, USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, FVector Scale, EAttachLocation::Type LocationType, bool bAutoDestroy)
+UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem* EmitterTemplate, USceneComponent* AttachToComponent, FName AttachPointName, FVector Location, FRotator Rotation, FVector Scale, EAttachLocation::Type LocationType, bool bAutoDestroy, EPSCPoolMethod PoolingMethod)
 {
 	UParticleSystemComponent* PSC = nullptr;
 	if (EmitterTemplate)
@@ -894,7 +908,7 @@ UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem
 			UWorld* const World = AttachToComponent->GetWorld();
 			if (World && World->GetNetMode() != NM_DedicatedServer)
 			{
-				PSC = CreateParticleSystem(EmitterTemplate, World, AttachToComponent->GetOwner(), bAutoDestroy);
+				PSC = CreateParticleSystem(EmitterTemplate, World, AttachToComponent->GetOwner(), bAutoDestroy, PoolingMethod);
 				
 				PSC->SetupAttachment(AttachToComponent, AttachPointName);
 
@@ -928,6 +942,9 @@ UParticleSystemComponent* UGameplayStatics::SpawnEmitterAttached(UParticleSystem
 				PSC->RegisterComponentWithWorld(World);
 				PSC->ActivateSystem(true);
 				
+				// Notify the texture streamer so that PSC gets managed as a dynamic component.
+				IStreamingManager::Get().NotifyPrimitiveUpdated(PSC);
+
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 				if (PSC->Template && PSC->Template->IsImmortal())
 				{
diff --git a/Engine/Source/Runtime/Engine/Private/HLODProxy.cpp b/Engine/Source/Runtime/Engine/Private/HLODProxy.cpp
new file mode 100644
index 000000000000..dd62442644f8
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Private/HLODProxy.cpp
@@ -0,0 +1,391 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Engine/HLODProxy.h"
+#include "GameFramework/WorldSettings.h"
+
+#if WITH_EDITOR
+#include "Misc/ConfigCacheIni.h"
+#include "Serialization/ArchiveObjectCrc32.h"
+#endif
+#include "Interfaces/ITargetPlatformManagerModule.h"
+#include "Materials/MaterialInstance.h"
+#include "Materials/MaterialInstanceConstant.h"
+#include "Engine/Texture.h"
+#include "Engine/StaticMesh.h"
+#include "PhysicsEngine/BodySetup.h"
+
+#if WITH_EDITOR
+
+void UHLODProxy::SetMap(const UWorld* InMap)
+{
+	// Level should only be set once
+	check(OwningMap.IsNull());
+
+	OwningMap = InMap;
+}
+
+void UHLODProxy::AddMesh(ALODActor* InLODActor, UStaticMesh* InStaticMesh, const FName& InKey)
+{
+	InLODActor->Proxy = this;
+	FHLODProxyMesh NewProxyMesh(InLODActor, InStaticMesh, InKey);
+	ProxyMeshes.AddUnique(NewProxyMesh);
+}
+
+void UHLODProxy::Clean()
+{
+	// The level we reference must be loaded to clean this package
+	check(OwningMap.IsNull() || OwningMap.ToSoftObjectPath().ResolveObject() != nullptr);
+
+	// Remove all entries that have invalid actors
+	ProxyMeshes.RemoveAll([](const FHLODProxyMesh& InProxyMesh)
+	{ 
+		TLazyObjectPtr<ALODActor> LODActor = InProxyMesh.GetLODActor();
+
+		// Invalid actor means that it has been deleted so we shouldnt hold onto its data
+		if(!LODActor.IsValid())
+		{
+			return true;
+		}
+		else if(LODActor.Get()->Proxy == nullptr)
+		{
+			// No proxy means we are also invalid
+			return true;
+		}
+		else if(!LODActor.Get()->Proxy->ContainsDataForActor(LODActor.Get()))
+		{
+			// actor and proxy are valid, but key differs (unbuilt)
+			return true;
+		}
+
+		return false;
+	});
+}
+
+const AActor* UHLODProxy::FindFirstActor(const ALODActor* LODActor)
+{
+	auto RecursiveFindFirstActor = [&](const ALODActor* InLODActor)
+	{
+		const AActor* FirstActor = InLODActor->SubActors.IsValidIndex(0) ? InLODActor->SubActors[0] : nullptr;
+		while (FirstActor != nullptr && FirstActor->IsA<ALODActor>())
+		{
+			const ALODActor* SubLODActor = Cast<ALODActor>(FirstActor);
+			if (SubLODActor)
+			{
+				SubLODActor->SubActors.IsValidIndex(0) ? SubLODActor->SubActors[0] : nullptr;
+			}
+			else
+			{
+				// Unable to find a valid actor
+				FirstActor = nullptr;
+			}
+		}
+		return FirstActor;
+	};
+
+	// Retrieve first 'valid' AActor (non ALODActor)
+	const AActor* FirstValidActor = nullptr;
+
+	for (int32 Index = 0; Index < LODActor->SubActors.Num(); ++Index)
+	{
+		const AActor* SubActor = LODActor->SubActors[Index];
+
+		if (const ALODActor* SubLODActor = Cast<ALODActor>(SubActor))
+		{
+			SubActor = RecursiveFindFirstActor(SubLODActor);
+		}
+
+		if (SubActor != nullptr)
+		{
+			FirstValidActor = SubActor;
+			break;
+		}
+	}
+
+	return FirstValidActor;
+}
+
+void UHLODProxy::ExtractStaticMeshComponentsFromLODActor(const ALODActor* LODActor, TArray<UStaticMeshComponent*>& InOutComponents)
+{
+	check(LODActor);
+
+	for (const AActor* ChildActor : LODActor->SubActors)
+	{
+		if(ChildActor)
+		{
+			TArray<UStaticMeshComponent*> ChildComponents;
+			if (ChildActor->IsA<ALODActor>())
+			{
+				ExtractStaticMeshComponentsFromLODActor(Cast<ALODActor>(ChildActor), ChildComponents);
+			}
+			else
+			{
+				ChildActor->GetComponents<UStaticMeshComponent>(ChildComponents);
+			}
+
+			InOutComponents.Append(ChildComponents);
+		}
+	}
+}
+
+void UHLODProxy::ExtractComponents(const ALODActor* LODActor, TArray<UPrimitiveComponent*>& InOutComponents)
+{
+	check(LODActor);
+
+	for (const AActor* Actor : LODActor->SubActors)
+	{
+		if(Actor)
+		{
+			TArray<UStaticMeshComponent*> Components;
+
+			if (Actor->IsA<ALODActor>())
+			{
+				ExtractStaticMeshComponentsFromLODActor(Cast<ALODActor>(Actor), Components);
+			}
+			else
+			{
+				Actor->GetComponents<UStaticMeshComponent>(Components);
+			}
+
+			Components.RemoveAll([&](UStaticMeshComponent* Val)
+			{
+				return Val->GetStaticMesh() == nullptr || !Val->ShouldGenerateAutoLOD(LODActor->LODLevel - 1);
+			});
+
+			InOutComponents.Append(Components);
+		}
+	}
+}
+
+uint32 GetCRC(UMaterialInterface* InMaterialInterface, uint32 InCRC = 0)
+{
+	TArray<uint8> KeyBuffer;
+
+	UMaterialInterface* MaterialInterface = InMaterialInterface;
+	while(MaterialInterface)
+	{
+		// Walk material parent chain for instances with known states (we cant support MIDs directly as they are always changing)
+		if(UMaterialInstance* MI = Cast<UMaterialInstance>(MaterialInterface))
+		{
+			if(UMaterialInstanceConstant* MIC = Cast<UMaterialInstanceConstant>(MI))
+			{
+				KeyBuffer.Append((uint8*)&MIC->ParameterStateId, sizeof(FGuid));
+			}
+			MaterialInterface = MI->Parent;
+		}
+		else if(UMaterial* Material = Cast<UMaterial>(MaterialInterface))
+		{
+			KeyBuffer.Append((uint8*)&Material->StateId, sizeof(FGuid));
+			MaterialInterface = nullptr;
+		}
+	}
+
+	return FCrc::MemCrc32(KeyBuffer.GetData(), KeyBuffer.Num(), InCRC);
+}
+
+uint32 GetCRC(UTexture* InTexture, uint32 InCRC = 0)
+{
+	// Default to just the path name if we don't have render data
+	FTexturePlatformData* PlatformData = *InTexture->GetRunningPlatformData();
+	const FString DerivedDataKey = PlatformData ? PlatformData->DerivedDataKey : InTexture->GetPathName();
+	return FCrc::StrCrc32(*DerivedDataKey, InCRC);
+}
+
+uint32 GetCRC(UStaticMesh* InStaticMesh, uint32 InCRC = 0)
+{
+	TArray<uint8> KeyBuffer;
+
+	// Default to just the path name if we don't have render data
+	FString DerivedDataKey = InStaticMesh->RenderData.IsValid() ? InStaticMesh->RenderData->DerivedDataKey : InStaticMesh->GetPathName();
+	KeyBuffer.Append((uint8*)DerivedDataKey.GetCharArray().GetData(), DerivedDataKey.GetCharArray().Num() * DerivedDataKey.GetCharArray().GetTypeSize());
+	KeyBuffer.Append((uint8*)&InStaticMesh->LightMapCoordinateIndex, sizeof(int32));
+	if(InStaticMesh->BodySetup)
+	{
+		// Incorporate physics data
+		KeyBuffer.Append((uint8*)&InStaticMesh->BodySetup->BodySetupGuid, sizeof(FGuid));;
+	}
+	return FCrc::MemCrc32(KeyBuffer.GetData(), KeyBuffer.Num(), InCRC);
+}
+
+uint32 GetCRC(UStaticMeshComponent* InComponent, uint32 InCRC = 0)
+{
+	TArray<uint8> KeyBuffer;
+
+	// incorporate transform & other relevant properties
+	KeyBuffer.Append((uint8*)&InComponent->GetComponentTransform(), sizeof(FTransform));
+	KeyBuffer.Append((uint8*)&InComponent->ForcedLodModel, sizeof(int32));
+	bool bUseMaxLODAsImposter = InComponent->bUseMaxLODAsImposter;
+	KeyBuffer.Append((uint8*)&bUseMaxLODAsImposter, sizeof(bool));
+	bool bCastShadow = InComponent->CastShadow;
+	KeyBuffer.Append((uint8*)&bCastShadow, sizeof(bool));
+	bool bCastStaticShadow = InComponent->bCastStaticShadow;
+	KeyBuffer.Append((uint8*)&bCastStaticShadow, sizeof(bool));
+	bool bCastDynamicShadow = InComponent->bCastDynamicShadow;
+	KeyBuffer.Append((uint8*)&bCastDynamicShadow, sizeof(bool));
+	bool bCastFarShadow = InComponent->bCastFarShadow;
+	KeyBuffer.Append((uint8*)&bCastFarShadow, sizeof(bool));
+	int32 Width, Height;
+	InComponent->GetLightMapResolution(Width, Height);
+	KeyBuffer.Append((uint8*)&Width, sizeof(int32));
+	KeyBuffer.Append((uint8*)&Height, sizeof(int32));
+	
+	// incorporate vertex colors
+	for(FStaticMeshComponentLODInfo& LODInfo : InComponent->LODData)
+	{
+		if(LODInfo.OverrideVertexColors)
+		{
+			KeyBuffer.Append((uint8*)LODInfo.OverrideVertexColors->GetVertexData(), LODInfo.OverrideVertexColors->GetNumVertices() * LODInfo.OverrideVertexColors->GetStride());
+		}
+	}
+
+	return FCrc::MemCrc32(KeyBuffer.GetData(), KeyBuffer.Num(), InCRC);
+}
+
+// Key that forms the basis of the HLOD proxy key. Bump this key (i.e. generate a new GUID) when you want to force a rebuild of ALL HLOD proxies
+#define HLOD_PROXY_BASE_KEY		TEXT("76927B120C6645ACB9200E7FB8896AC3")
+
+FName UHLODProxy::GenerateKeyForActor(const ALODActor* LODActor)
+{
+	FString Key = HLOD_PROXY_BASE_KEY;
+
+	// Base us off the unique object ID
+	{
+		FUniqueObjectGuid ObjectID = FUniqueObjectGuid::GetOrCreateIDForObject(LODActor);
+		Key += TEXT("_");
+		Key += ObjectID.GetGuid().ToString(EGuidFormats::Digits);
+	}
+
+	// Accumulate a bunch of settings into a CRC
+	{
+		uint32 CRC = 0;
+
+		// Get the HLOD settings CRC
+		{
+			TArray<FHierarchicalSimplification>& BuildLODLevelSettings = LODActor->GetLevel()->GetWorldSettings()->GetHierarchicalLODSetup();
+			if(BuildLODLevelSettings.IsValidIndex(LODActor->LODLevel - 1))
+			{
+				FHierarchicalSimplification& BuildLODLevelSetting = BuildLODLevelSettings[LODActor->LODLevel - 1];
+				CRC = FCrc::MemCrc32(&BuildLODLevelSetting, sizeof(FHierarchicalSimplification), CRC);
+			}
+		}
+
+		// screen size + override
+		{
+			if(LODActor->bOverrideScreenSize)
+			{
+				CRC = FCrc::MemCrc32(&LODActor->ScreenSize, sizeof(float), CRC);
+			}
+		}
+
+		// material merge settings override
+		{
+			if (LODActor->bOverrideMaterialMergeSettings)
+			{
+				CRC = FCrc::MemCrc32(&LODActor->MaterialSettings, sizeof(FMaterialProxySettings), CRC);
+			}
+		}
+
+		Key += TEXT("_");
+		Key += BytesToHex((uint8*)&CRC, sizeof(uint32));
+	}
+
+	// get the base material CRC
+	{
+		UMaterialInterface* BaseMaterial = LODActor->GetLevel()->GetWorldSettings()->GetHierarchicalLODBaseMaterial();
+		uint32 CRC = GetCRC(BaseMaterial);
+		Key += TEXT("_");
+		Key += BytesToHex((uint8*)&CRC, sizeof(uint32));
+	}
+
+	// We get the CRC of the first actor name and various static mesh components
+	{
+		uint32 CRC = 0;
+		const AActor* FirstActor = FindFirstActor(LODActor);
+		if(FirstActor)
+		{
+			CRC = FCrc::StrCrc32(*FirstActor->GetName(), CRC);
+		}
+
+		TArray<UPrimitiveComponent*> Components;
+		ExtractComponents(LODActor, Components);
+
+		// We get the CRC of each component and combine them
+		for(UPrimitiveComponent* Component : Components)
+		{
+			if(UStaticMeshComponent* StaticMeshComponent = Cast<UStaticMeshComponent>(Component))
+			{
+				// CRC component
+				CRC = GetCRC(StaticMeshComponent, CRC);
+
+				if(UStaticMesh* StaticMesh = StaticMeshComponent->GetStaticMesh())
+				{
+					// CRC static mesh
+					CRC = GetCRC(StaticMesh, CRC);
+
+					// CRC materials
+					const int32 NumMaterials = StaticMeshComponent->GetNumMaterials();
+					for(int32 MaterialIndex = 0; MaterialIndex < NumMaterials; ++MaterialIndex)
+					{
+						UMaterialInterface* MaterialInterface = StaticMeshComponent->GetMaterial(MaterialIndex);
+						CRC = GetCRC(MaterialInterface, CRC);
+
+						TArray<UTexture*> Textures;
+						MaterialInterface->GetUsedTextures(Textures, EMaterialQualityLevel::High, true, ERHIFeatureLevel::SM5, true);
+						for(UTexture* Texture : Textures)
+						{
+							CRC = GetCRC(Texture, CRC);
+						}
+					}
+				}
+			}
+		}
+		Key += TEXT("_");
+		Key += BytesToHex((uint8*)&CRC, sizeof(uint32));
+	}
+
+	// Mesh reduction method
+	{
+		// NOTE: This mimics code in the editor only FMeshReductionManagerModule::StartupModule(). If that changes then this should too
+		FString HLODMeshReductionModuleName;
+		GConfig->GetString(TEXT("/Script/Engine.ProxyLODMeshSimplificationSettings"), TEXT("r.ProxyLODMeshReductionModule"), HLODMeshReductionModuleName, GEngineIni);
+		// If nothing was requested, default to simplygon for mesh merging reduction
+		if (HLODMeshReductionModuleName.IsEmpty())
+		{
+			HLODMeshReductionModuleName = TEXT("SimplygonMeshReduction");
+		}
+
+		Key += TEXT("_");
+		Key += HLODMeshReductionModuleName;
+	}
+
+	return FName(*Key);
+}
+
+#endif // #if WITH_EDITOR
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+
+bool UHLODProxy::ContainsDataForActor(const ALODActor* InLODActor) const
+{
+#if WITH_EDITOR
+	FName Key = GenerateKeyForActor(InLODActor);
+#else
+	FName Key = InLODActor->GetKey();
+#endif
+
+	if(Key == NAME_None)
+	{
+		return false;
+	}
+
+	for(const FHLODProxyMesh& ProxyMesh : ProxyMeshes)
+	{
+		if(ProxyMesh.GetKey() == Key)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+#endif
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/HUD.cpp b/Engine/Source/Runtime/Engine/Private/HUD.cpp
index ec5ce981f322..2f698b248869 100644
--- a/Engine/Source/Runtime/Engine/Private/HUD.cpp
+++ b/Engine/Source/Runtime/Engine/Private/HUD.cpp
@@ -263,26 +263,13 @@ void AHUD::DrawSafeZoneOverlay()
 
 	if ((DebugSafeZoneMode > 0) && (DebugCanvas != nullptr))
 	{
-		FDisplayMetrics Metrics;
-		FSlateApplication::Get().GetDisplayMetrics(Metrics);
-
-		const FMargin SafeMargin =
-#if PLATFORM_IOS
-			// FVector4(X,Y,Z,W) being used like FMargin(left, top, right, bottom)
-			(DebugSafeZoneMode == 1)
-			? FMargin(Metrics.TitleSafePaddingSize.X, Metrics.TitleSafePaddingSize.Y, Metrics.TitleSafePaddingSize.Z, Metrics.TitleSafePaddingSize.W)
-			: FMargin(Metrics.ActionSafePaddingSize.X, Metrics.ActionSafePaddingSize.Y, Metrics.ActionSafePaddingSize.Z, Metrics.ActionSafePaddingSize.W);
-#else
-			(DebugSafeZoneMode == 1) ?
-			FMargin(Metrics.TitleSafePaddingSize.X, Metrics.TitleSafePaddingSize.Y) :
-			FMargin(Metrics.ActionSafePaddingSize.X, Metrics.ActionSafePaddingSize.Y);
-#endif
-
-		const float UnsafeZoneAlpha = GSafeZoneVisualizationAlphaCVar.GetValueOnGameThread();
-		const FLinearColor UnsafeZoneColor(1.0f, 0.5f, 0.5f, UnsafeZoneAlpha);
 
 		const float Width = DebugCanvas->SizeX;
 		const float Height = DebugCanvas->SizeY;
+		FMargin SafeMargin;
+		FSlateApplication::Get().GetSafeZoneSize(SafeMargin, FVector2D(Width, Height));
+		const float UnsafeZoneAlpha = GSafeZoneVisualizationAlphaCVar.GetValueOnGameThread();
+		const FLinearColor UnsafeZoneColor(1.0f, 0.5f, 0.5f, UnsafeZoneAlpha);
 
 		const float HeightOfSides = Height - SafeMargin.GetTotalSpaceAlong<Orient_Vertical>();
 
diff --git a/Engine/Source/Runtime/Engine/Private/HierarchicalInstancedStaticMesh.cpp b/Engine/Source/Runtime/Engine/Private/HierarchicalInstancedStaticMesh.cpp
index feb5d158b55e..e0d46bdb4f55 100644
--- a/Engine/Source/Runtime/Engine/Private/HierarchicalInstancedStaticMesh.cpp
+++ b/Engine/Source/Runtime/Engine/Private/HierarchicalInstancedStaticMesh.cpp
@@ -118,6 +118,9 @@ DECLARE_CYCLE_STAT(TEXT("Build Time"), STAT_FoliageBuildTime, STATGROUP_Foliage)
 DECLARE_CYCLE_STAT(TEXT("Batch Time"),STAT_FoliageBatchTime,STATGROUP_Foliage);
 DECLARE_CYCLE_STAT(TEXT("Foliage Create Proxy"), STAT_FoliageCreateProxy, STATGROUP_Foliage);
 DECLARE_CYCLE_STAT(TEXT("Foliage Post Load"), STAT_FoliagePostLoad, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("HISMC_AddInstance"), STAT_HISMCAddInstance, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("HISMC_RemoveInstance"), STAT_HISMCRemoveInstance, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("HISMC_GetDynamicMeshElement"), STAT_HISMCGetDynamicMeshElement, STATGROUP_Foliage);
 
 DECLARE_DWORD_COUNTER_STAT(TEXT("Runs"), STAT_FoliageRuns, STATGROUP_Foliage);
 DECLARE_DWORD_COUNTER_STAT(TEXT("Mesh Batches"), STAT_FoliageMeshBatches, STATGROUP_Foliage);
@@ -157,14 +160,10 @@ static FAutoConsoleVariableSink CVarFoliageSink(FConsoleCommandDelegate::CreateS
 
 struct FClusterTree
 {
-	FClusterTree()
-		: OutOcclusionLayerNum(0)
-	{}
-
 	TArray<FClusterNode> Nodes;
 	TArray<int32> SortedInstances;
 	TArray<int32> InstanceReorderTable;
-	int32 OutOcclusionLayerNum;
+	int32 OutOcclusionLayerNum = 0;
 };
 
 class FClusterBuilder
@@ -308,7 +307,7 @@ protected:
 		
 		if (NumRenderInstances > 0)
 		{
-			BuiltInstanceData->AllocateInstances(NumRenderInstances, false);
+			BuiltInstanceData->AllocateInstances(NumRenderInstances, GIsEditor ? EResizeBufferFlags::AllowSlackOnGrow|EResizeBufferFlags::AllowSlackOnReduce : EResizeBufferFlags::None, false); // In Editor always permit overallocation, to prevent too much realloc
 
 			FVector2D LightmapUVBias = FVector2D(-1.0f, -1.0f);
 			FVector2D ShadowmapUVBias = FVector2D(-1.0f, -1.0f);
@@ -370,7 +369,7 @@ protected:
 	}
 
 public:
-	FClusterTree* Result;
+	TUniquePtr<FClusterTree> Result;
 	TUniquePtr<FStaticMeshInstanceData> BuiltInstanceData;
 
 	FClusterBuilder(TArray<FMatrix> InTransforms, const FBox& InInstBox, int32 InMaxInstancesPerLeaf, float InDensityScaling, int32 InInstancingRandomSeed)
@@ -384,11 +383,6 @@ public:
 	{
 	}
 	
-	~FClusterBuilder()
-	{
-		delete Result;
-	}	
-	
 	void BuildTreeAsync(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent)
 	{
 		BuildTree();
@@ -409,8 +403,7 @@ public:
 	{
 		Init();
 		
-		delete Result;
-		Result = new FClusterTree;
+		Result = MakeUnique<FClusterTree>();
 
 		if (Num == 0)
 		{
@@ -714,8 +707,6 @@ static void TestFoliage(const TArray<FString>& Args)
 	while(PrintLevel(*Builder.Result, 0, Level++, 0, -1))
 	{
 	}
-
-	delete Builder.Result;
 }
 
 static FAutoConsoleCommand TestFoliageCmd(
@@ -804,7 +795,7 @@ class FHierarchicalStaticMeshSceneProxy final : public FInstancedStaticMeshScene
 
 	TArray<FBox> UnbuiltBounds;
 	int32 FirstUnbuiltIndex;
-	int32 UnbuiltInstanceCount;
+	int32 InstanceCountToRender;
 
 	int32 FirstOcclusionNode;
 	int32 LastOcclusionNode;
@@ -835,7 +826,7 @@ public:
 		, ClusterTree(*InComponent->ClusterTreePtr)
 		, UnbuiltBounds(InComponent->UnbuiltInstanceBoundsList)
 		, FirstUnbuiltIndex(InComponent->NumBuiltRenderInstances)
-		, UnbuiltInstanceCount(InComponent->UnbuiltInstanceIndexList.Num())
+		, InstanceCountToRender(InComponent->InstanceCountToRender)
 		, bIsGrass(bInIsGrass)
 		, SceneProxyCreatedFrameNumberRenderThread(UINT32_MAX)
 		, bDitheredLODTransitions(InComponent->SupportsDitheredLODTransitions())
@@ -981,15 +972,23 @@ struct FFoliageRenderInstanceParams
 	{
 		if (bNeedsSingleLODRuns)
 		{
-			AddRun(SingleLODRuns[bOverestimate ? MaxLod : MinLod], FirstInstance, LastInstance);
-			TotalSingleLODInstances[bOverestimate ? MaxLod : MinLod] += 1 + LastInstance - FirstInstance;
+			int32 CurrentLOD = bOverestimate ? MaxLod : MinLod;
+
+			if (CurrentLOD < MAX_STATIC_MESH_LODS)
+			{
+				AddRun(SingleLODRuns[CurrentLOD], FirstInstance, LastInstance);
+				TotalSingleLODInstances[CurrentLOD] += 1 + LastInstance - FirstInstance;
+			}
 		}
 		if (bNeedsMultipleLODRuns)
 		{
 			for (int32 Lod = MinLod; Lod <= MaxLod; Lod++)
 			{
-				TotalMultipleLODInstances[Lod] += 1 + LastInstance - FirstInstance;
-				AddRun(MultipleLODRuns[Lod], FirstInstance, LastInstance);
+				if (Lod < MAX_STATIC_MESH_LODS)
+				{
+					TotalMultipleLODInstances[Lod] += 1 + LastInstance - FirstInstance;
+					AddRun(MultipleLODRuns[Lod], FirstInstance, LastInstance);
+				}
 			}
 		}
 	}
@@ -1392,6 +1391,7 @@ void FHierarchicalStaticMeshSceneProxy::GetDynamicMeshElements(const TArray<cons
 	}
 
 	QUICK_SCOPE_CYCLE_COUNTER(STAT_HierarchicalInstancedStaticMeshSceneProxy_GetMeshElements);
+	SCOPE_CYCLE_COUNTER(STAT_HISMCGetDynamicMeshElement);
 
 	bool bMultipleSections = ALLOW_DITHERED_LOD_FOR_INSTANCED_STATIC_MESHES && bDitheredLODTransitions && CVarDitheredLOD.GetValueOnRenderThread() > 0;
 	bool bSingleSections = !bMultipleSections;
@@ -1657,6 +1657,8 @@ void FHierarchicalStaticMeshSceneProxy::GetDynamicMeshElements(const TArray<cons
 				FillDynamicMeshElements(Collector, ElementParams, InstanceParams);
 			}
 
+			int32 UnbuiltInstanceCount = InstanceCountToRender - FirstUnbuiltIndex;
+
 			// Render unbuilt instances
 			if (UnbuiltInstanceCount > 0)
 			{
@@ -1665,7 +1667,7 @@ void FHierarchicalStaticMeshSceneProxy::GetDynamicMeshElements(const TArray<cons
 				// disable LOD blending for unbuilt instances as we haven't calculated the correct LOD.
 				ElementParams.bBlendLODs = false;
 
-				if (UnbuiltInstanceCount < 1000)
+				if (UnbuiltInstanceCount < 1000 && UnbuiltBounds.Num() >= UnbuiltInstanceCount)
 				{
 					const int32 NumLODs = RenderData->LODResources.Num();
 
@@ -1738,7 +1740,8 @@ void FHierarchicalStaticMeshSceneProxy::GetDynamicMeshElements(const TArray<cons
 				else
 				{
 					// more than 1000, render them all at lowest LOD (until we have an updated tree)
-					InstanceParams.AddRun(RenderData->LODResources.Num() - 1, RenderData->LODResources.Num() - 1, FirstUnbuiltIndex, FirstUnbuiltIndex + UnbuiltInstanceCount);
+					const int8 LowestLOD = (RenderData->LODResources.Num() - 1);
+					InstanceParams.AddRun(LowestLOD, LowestLOD, FirstUnbuiltIndex, FirstUnbuiltIndex + UnbuiltInstanceCount);
 				}
 				FillDynamicMeshElements(Collector, ElementParams, InstanceParams);
 			}
@@ -1818,8 +1821,9 @@ UHierarchicalInstancedStaticMeshComponent::UHierarchicalInstancedStaticMeshCompo
 	, OcclusionLayerNumNodes(0)
 	, bIsAsyncBuilding(false)
 	, bDiscardAsyncBuildResults(false)
-	, bConcurrentRemoval(false)
+	, bConcurrentChanges(false)
 	, bAutoRebuildTreeOnInstanceChanges(true)
+	, InstanceCountToRender(0)
 	, AccumulatedNavigationDirtyArea(ForceInit)
 {
 	bCanEverAffectNavigation = true;
@@ -1871,7 +1875,21 @@ void UHierarchicalInstancedStaticMeshComponent::Serialize(FArchive& Ar)
 	// Before serializing the content to cook, wait for the async task to be completed
 	if (bIsAsyncBuilding && Ar.IsSaving() && Ar.IsCooking())
 	{
-		FTaskGraphInterface::Get().WaitUntilTasksComplete(BuildTreeAsyncTasks);
+		int32 MaxLoopCount = 100;
+
+		// Since the build could need to be redone due to concurrent changes, wait until the array is empty so we wait for all the async build are triggered
+		while (BuildTreeAsyncTasks.Num() > 0)
+		{
+			FTaskGraphInterface::Get().WaitUntilTasksComplete(BuildTreeAsyncTasks);
+
+			// This is not normal that it take more than 100 wait to complete all the pending async task!
+			if (--MaxLoopCount == 0)
+			{
+				break;
+			}
+		}
+		
+		check(MaxLoopCount > 0);
 		check(!bIsAsyncBuilding);
 	}
 
@@ -1899,7 +1917,6 @@ void UHierarchicalInstancedStaticMeshComponent::GetResourceSizeEx(FResourceSizeE
 	}
 	CumulativeResourceSize.AddDedicatedSystemMemoryBytes(SortedInstances.GetAllocatedSize());
 	CumulativeResourceSize.AddDedicatedSystemMemoryBytes(UnbuiltInstanceBoundsList.GetAllocatedSize());
-	CumulativeResourceSize.AddDedicatedSystemMemoryBytes(UnbuiltInstanceIndexList.GetAllocatedSize());
 }
 
 void UHierarchicalInstancedStaticMeshComponent::PostDuplicate(bool bDuplicateForPIE)
@@ -1914,24 +1931,23 @@ void UHierarchicalInstancedStaticMeshComponent::PostDuplicate(bool bDuplicateFor
 
 void UHierarchicalInstancedStaticMeshComponent::RemoveInstancesInternal(const int32* InstanceIndices, int32 Num)
 {
-	TArray<int32> RemovedRenderIndices;
-	
+	if (IsAsyncBuilding() && Num > 0)
+	{
+		bConcurrentChanges = true;
+	}
+
 	for (int32 Index = 0; Index < Num; ++Index)
 	{
 		int32 InstanceIndex = InstanceIndices[Index];
 
 		PartialNavigationUpdate(InstanceIndex);
 
-		int32 RenderIndex = InstanceReorderTable[InstanceIndex];
-		if (RenderIndex != INDEX_NONE)
-		{
-			RemovedRenderIndices.Add(RenderIndex);
-		}
+		check(InstanceReorderTable.IsValidIndex(InstanceIndex) && InstanceReorderTable[InstanceIndex] != INDEX_NONE);
 
-		// Remove the instance
-		PerInstanceSMData.RemoveAtSwap(InstanceIndex);
-		InstanceReorderTable.RemoveAtSwap(InstanceIndex);
-		UnbuiltInstanceIndexList.RemoveSwap(InstanceIndex);
+		InstanceUpdateCmdBuffer.HideInstance(InstanceReorderTable[InstanceIndex]);
+
+		InstanceReorderTable.RemoveAtSwap(InstanceIndex, 1, false);
+		PerInstanceSMData.RemoveAtSwap(InstanceIndex, 1, false);
 
 	#if WITH_EDITOR
 		if (SelectedInstances.Num())
@@ -1977,11 +1993,8 @@ void UHierarchicalInstancedStaticMeshComponent::RemoveInstancesInternal(const in
 		}
 	}
 
-	// in place update of instance buffer, while tree is rebuilding
-	for (int32 Index = 0; Index < RemovedRenderIndices.Num(); ++Index)
-	{
-		InstanceUpdateCmdBuffer.HideInstance(RemovedRenderIndices[Index]);
-	}
+	PerInstanceSMData.Shrink();
+	// InstanceReorderTable is not shrink as the build tree will override it so we save the cost of the realloc
 }
 
 bool UHierarchicalInstancedStaticMeshComponent::RemoveInstances(const TArray<int32>& InstancesToRemove)
@@ -1993,6 +2006,8 @@ bool UHierarchicalInstancedStaticMeshComponent::RemoveInstances(const TArray<int
 		return true;
 	}
 
+	SCOPE_CYCLE_COUNTER(STAT_HISMCRemoveInstance);
+
 	TArray<int32> SortedInstancesToRemove = InstancesToRemove;
 
 	// Sort so RemoveAtSwaps don't alter the indices of items still to remove
@@ -2022,6 +2037,8 @@ bool UHierarchicalInstancedStaticMeshComponent::RemoveInstance(int32 InstanceInd
 		return false;
 	}
 
+	SCOPE_CYCLE_COUNTER(STAT_HISMCRemoveInstance);
+
 	RemoveInstancesInternal(&InstanceIndex, 1);
 
 	if (bAutoRebuildTreeOnInstanceChanges)
@@ -2044,10 +2061,10 @@ bool UHierarchicalInstancedStaticMeshComponent::UpdateInstanceTransform(int32 In
 	if (IsAsyncBuilding())
 	{
 		// invalidate the results of the current async build we need to modify the tree
-		bConcurrentRemoval = true;
+		bConcurrentChanges = true;
 	}
 
-	int32 RenderIndex = InstanceReorderTable[InstanceIndex];
+	int32 RenderIndex = InstanceReorderTable.IsValidIndex(InstanceIndex) ? InstanceReorderTable[InstanceIndex] : InstanceIndex;
 	const FMatrix OldTransform = PerInstanceSMData[InstanceIndex].Transform;
 	const FTransform NewLocalTransform = bWorldSpace ? NewInstanceTransform.GetRelativeTransform(GetComponentTransform()) : NewInstanceTransform;
 	const FVector NewLocalLocation = NewLocalTransform.GetTranslation();
@@ -2098,25 +2115,40 @@ void UHierarchicalInstancedStaticMeshComponent::ApplyComponentInstanceData(FInst
 	BuildTreeIfOutdated(false, false);
 }
 
+void UHierarchicalInstancedStaticMeshComponent::PreAllocateInstancesMemory(int32 AddedInstanceCount)
+{
+	Super::PreAllocateInstancesMemory(AddedInstanceCount);
+
+	InstanceReorderTable.Reserve(InstanceReorderTable.Num() + AddedInstanceCount);
+	UnbuiltInstanceBoundsList.Reserve(UnbuiltInstanceBoundsList.Num() + AddedInstanceCount);
+}
+
 int32 UHierarchicalInstancedStaticMeshComponent::AddInstance(const FTransform& InstanceTransform)
 {
+	SCOPE_CYCLE_COUNTER(STAT_HISMCAddInstance);
+
 	int32 InstanceIndex = UInstancedStaticMeshComponent::AddInstance(InstanceTransform);
 
 	if (InstanceIndex != INDEX_NONE)
 	{	
 		check(InstanceIndex == InstanceReorderTable.Num());
-		// added instance can't be updated or hidden until tree is rebuilt
-		int32 RenderIndex = INDEX_NONE;
-		InstanceReorderTable.Add(RenderIndex); 
-		InstanceUpdateCmdBuffer.AddInstance(RenderIndex, InstanceTransform.ToMatrixWithScale());
-				
+
+		if (IsAsyncBuilding())
+		{
+			bConcurrentChanges = true;
+		}
+
+		int32 InitialBufferOffset = InstanceCountToRender - InstanceReorderTable.Num(); // Until the build is done, we need to always add at the end of the buffer/reorder table
+		InstanceReorderTable.Add(InitialBufferOffset + InstanceIndex); // add to the end until the build is completed
+		++InstanceCountToRender;
+
+		InstanceUpdateCmdBuffer.AddInstance(InstanceTransform.ToMatrixWithScale());
+
 		if (GetStaticMesh())
 		{
 			const FBox NewInstanceBounds = GetStaticMesh()->GetBounds().GetBox().TransformBy(InstanceTransform);
 			UnbuiltInstanceBounds += NewInstanceBounds;
 			UnbuiltInstanceBoundsList.Add(NewInstanceBounds);
-
-			UnbuiltInstanceIndexList.Add(InstanceIndex);
 		}
 
 		if (bAutoRebuildTreeOnInstanceChanges)
@@ -2132,7 +2164,7 @@ void UHierarchicalInstancedStaticMeshComponent::ClearInstances()
 {
 	if (IsAsyncBuilding())
 	{
-		bConcurrentRemoval = true;
+		bConcurrentChanges = true;
 	}
 
 	ClusterTreePtr = MakeShareable(new TArray<FClusterNode>);
@@ -2141,7 +2173,6 @@ void UHierarchicalInstancedStaticMeshComponent::ClearInstances()
 	SortedInstances.Empty();
 	UnbuiltInstanceBounds.Init();
 	UnbuiltInstanceBoundsList.Empty();
-	UnbuiltInstanceIndexList.Empty();
 	
 	if (ProxySize)
 	{
@@ -2162,7 +2193,7 @@ bool UHierarchicalInstancedStaticMeshComponent::ShouldCreatePhysicsState() const
 
 int32 UHierarchicalInstancedStaticMeshComponent::GetVertsForLOD(int32 LODIndex)
 {
-	if (GetStaticMesh() && GetStaticMesh()->HasValidRenderData())
+	if (GetStaticMesh() && GetStaticMesh()->HasValidRenderData(true, LODIndex))
 	{
 		return GetStaticMesh()->GetNumVertices(LODIndex);
 	}
@@ -2266,7 +2297,6 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTree()
 		OcclusionLayerNumNodes = Builder.Result->OutOcclusionLayerNum;
 		UnbuiltInstanceBounds.Init();
 		UnbuiltInstanceBoundsList.Empty();
-		UnbuiltInstanceIndexList.Empty();
 		BuiltInstanceBounds = (Builder.Result->Nodes.Num() > 0 ? FBox(Builder.Result->Nodes[0].BoundMin, Builder.Result->Nodes[0].BoundMax) : FBox(ForceInit));
 
 		ClusterTreePtr = MakeShareable(new TArray<FClusterNode>(MoveTemp(Builder.Result->Nodes)));
@@ -2277,6 +2307,7 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTree()
 			
 		check(BuiltInstanceData.IsValid());
 		check(BuiltInstanceData->GetNumInstances() == NumBuiltRenderInstances);
+		InstanceCountToRender = BuiltInstanceData->GetNumInstances();
 		
 		// create per-instance hit-proxies if needed
 		TArray<TRefCountPtr<HHitProxy>> HitProxies;
@@ -2306,7 +2337,6 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTree()
 		SortedInstances.Empty();
 
 		UnbuiltInstanceBoundsList.Empty();
-		UnbuiltInstanceIndexList.Empty();
 		BuiltInstanceBounds.Init();
 		CacheMeshExtendedBounds = FBoxSphereBounds(EForceInit::ForceInitToZero);
 	}
@@ -2316,7 +2346,6 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTree()
 		// We did a sync build while async building. The sync build is newer so we will use that.
 		bDiscardAsyncBuildResults = true;
 	}
-
 }
 
 void UHierarchicalInstancedStaticMeshComponent::BuildTreeAnyThread(
@@ -2357,12 +2386,12 @@ void UHierarchicalInstancedStaticMeshComponent::AcceptPrebuiltTree(TArray<FClust
 	check(NumBuiltRenderInstances);
 	UnbuiltInstanceBounds.Init();
 	UnbuiltInstanceBoundsList.Empty();
-	UnbuiltInstanceIndexList.Empty();
 	ClusterTreePtr = MakeShareable(new TArray<FClusterNode>);
 	InstanceReorderTable.Empty();
 	SortedInstances.Empty();
 	OcclusionLayerNumNodes = InOcclusionLayerNumNodes;
 	BuiltInstanceBounds = (InClusterTree.Num() > 0 ? FBox(InClusterTree[0].BoundMin, InClusterTree[0].BoundMax) : FBox(ForceInit));
+	InstanceCountToRender = InNumBuiltRenderInstances;
 
 	// Verify that the mesh is valid before using it.
 	const bool bMeshIsValid = 
@@ -2388,91 +2417,75 @@ void UHierarchicalInstancedStaticMeshComponent::AcceptPrebuiltTree(TArray<FClust
 
 void UHierarchicalInstancedStaticMeshComponent::ApplyBuildTreeAsync(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent, TSharedRef<FClusterBuilder, ESPMode::ThreadSafe> Builder, double StartTime)
 {
-	checkSlow(IsInGameThread());
+	check(IsInGameThread());
 
 	bIsAsyncBuilding = false;
+	BuildTreeAsyncTasks.Empty();
 
+	// We did a sync build while async building. The sync build is newer so we will use that.
 	if (bDiscardAsyncBuildResults)
 	{
-		// We did a sync build while async building. The sync build is newer so we will use that.
 		bDiscardAsyncBuildResults = false;
+		return;
+	}
+
+	// We did some changes during an async build
+	if (bConcurrentChanges)
+	{
+		bConcurrentChanges = false;
+
+		UE_LOG(LogStaticMesh, Verbose, TEXT("Discarded foliage hierarchy of %d elements build due to concurrent removal (%.1fs)"), Builder->Result->InstanceReorderTable.Num(), (float)(FPlatformTime::Seconds() - StartTime));
+
+		// There were changes while we were building, it's too slow to fix up the result now, so build async again.
+		BuildTreeAsync();
+		return;
+	}
+
+	check(Builder->Result->InstanceReorderTable.Num() == PerInstanceSMData.Num());
+
+	NumBuiltInstances = Builder->Result->InstanceReorderTable.Num();
+	NumBuiltRenderInstances = Builder->Result->SortedInstances.Num();		
+
+	ClusterTreePtr = MakeShareable(new TArray<FClusterNode>(MoveTemp(Builder->Result->Nodes)));
+	const TArray<FClusterNode>& ClusterTree = *ClusterTreePtr;
+	InstanceReorderTable = MoveTemp(Builder->Result->InstanceReorderTable);
+	SortedInstances = MoveTemp(Builder->Result->SortedInstances);
+	CacheMeshExtendedBounds = GetStaticMesh()->GetBounds();
+	TUniquePtr<FStaticMeshInstanceData> BuiltInstanceData = MoveTemp(Builder->BuiltInstanceData);
+	OcclusionLayerNumNodes = Builder->Result->OutOcclusionLayerNum;
+	BuiltInstanceBounds = (ClusterTree.Num() > 0 ? FBox(ClusterTree[0].BoundMin, ClusterTree[0].BoundMax) : FBox(ForceInit));
+
+	UE_LOG(LogStaticMesh, Verbose, TEXT("Built a foliage hierarchy with %d of %d elements in %.1fs."), NumBuiltInstances, PerInstanceSMData.Num(), (float)(FPlatformTime::Seconds() - StartTime));
+
+	UnbuiltInstanceBounds.Init();
+	UnbuiltInstanceBoundsList.Empty();
+	FlushAccumulatedNavigationUpdates();
+
+	check(BuiltInstanceData.IsValid());
+	check(BuiltInstanceData->GetNumInstances() == NumBuiltRenderInstances);
+
+	InstanceCountToRender = BuiltInstanceData->GetNumInstances();
+	InstanceUpdateCmdBuffer.Reset();
+
+	check(InstanceReorderTable.Num() == PerInstanceSMData.Num());
+
+	// create per-instance hit-proxies if needed
+	TArray<TRefCountPtr<HHitProxy>> HitProxies;
+	CreateHitProxyData(HitProxies);
+	SetPerInstanceLightMapAndEditorData(*BuiltInstanceData, HitProxies);
+
+	if (PerInstanceRenderData.IsValid())
+	{
+		PerInstanceRenderData->UpdateFromPreallocatedData(*BuiltInstanceData);
 	}
 	else
 	{
-		if (bConcurrentRemoval)
-		{
-			bConcurrentRemoval = false;
-
-			UE_LOG(LogStaticMesh, Verbose, TEXT("Discarded foliage hierarchy of %d elements build due to concurrent removal (%.1fs)"), Builder->Result->InstanceReorderTable.Num(), (float)(FPlatformTime::Seconds() - StartTime));
-
-			// There were removes or updates while we were building, it's too slow to fix up the result now, so build async again.
-			BuildTreeAsync();
-		}
-		else
-		{
-			NumBuiltInstances = Builder->Result->InstanceReorderTable.Num();
-			NumBuiltRenderInstances = Builder->Result->SortedInstances.Num();
-
-			if (NumBuiltInstances < PerInstanceSMData.Num())
-			{
-				// Add remap entries for unbuilt instances
-				Builder->Result->InstanceReorderTable.AddUninitialized(PerInstanceSMData.Num() - NumBuiltInstances);
-				for (int32 Index = NumBuiltInstances; Index < PerInstanceSMData.Num(); Index++)
-				{
-					Builder->Result->InstanceReorderTable[Index] = Index;
-				}
-			}
-
-			ClusterTreePtr = MakeShareable(new TArray<FClusterNode>(MoveTemp(Builder->Result->Nodes)));
-			const TArray<FClusterNode>& ClusterTree = *ClusterTreePtr;
-			InstanceReorderTable = MoveTemp(Builder->Result->InstanceReorderTable);
-			SortedInstances = MoveTemp(Builder->Result->SortedInstances);
-			CacheMeshExtendedBounds = GetStaticMesh()->GetBounds();
-			TUniquePtr<FStaticMeshInstanceData> BuiltInstanceData = MoveTemp(Builder->BuiltInstanceData);
-			OcclusionLayerNumNodes = Builder->Result->OutOcclusionLayerNum;
-			BuiltInstanceBounds = (ClusterTree.Num() > 0 ? FBox(ClusterTree[0].BoundMin, ClusterTree[0].BoundMax) : FBox(ForceInit));
-
-			UE_LOG(LogStaticMesh, Verbose, TEXT("Built a foliage hierarchy with %d of %d elements in %.1fs."), NumBuiltInstances, PerInstanceSMData.Num(), (float)(FPlatformTime::Seconds() - StartTime));
-
-			if (NumBuiltInstances < PerInstanceSMData.Num())
-			{
-				// There are new outstanding instances, build again!
-				UnbuiltInstanceBoundsList.RemoveAt(0, UnbuiltInstanceBoundsList.Num() - (PerInstanceSMData.Num() - NumBuiltInstances));
-				UnbuiltInstanceIndexList.RemoveAt(0, UnbuiltInstanceIndexList.Num() - (PerInstanceSMData.Num() - NumBuiltInstances));
-				BuildTreeAsync();
-			}
-			else
-			{
-				UnbuiltInstanceBounds.Init();
-				UnbuiltInstanceBoundsList.Empty();
-				UnbuiltInstanceIndexList.Empty();
-				FlushAccumulatedNavigationUpdates();
-			}
-
-			check(BuiltInstanceData.IsValid());
-			check(BuiltInstanceData->GetNumInstances() == NumBuiltRenderInstances);
-
-			// create per-instance hit-proxies if needed
-			TArray<TRefCountPtr<HHitProxy>> HitProxies;
-			CreateHitProxyData(HitProxies);
-			SetPerInstanceLightMapAndEditorData(*BuiltInstanceData, HitProxies);
-
-			if (PerInstanceRenderData.IsValid())
-			{
-				PerInstanceRenderData->UpdateFromPreallocatedData(*BuiltInstanceData);
-			}
-			else
-			{
-				InitPerInstanceRenderData(false, BuiltInstanceData.Get());
-			}
-			PerInstanceRenderData->HitProxies = MoveTemp(HitProxies);
-						
-			MarkRenderStateDirty();
-			PostBuildStats();
-		}
+		InitPerInstanceRenderData(false, BuiltInstanceData.Get());
 	}
+	PerInstanceRenderData->HitProxies = MoveTemp(HitProxies);		
 
-	BuildTreeAsyncTasks.Empty();
+	MarkRenderStateDirty();
+	PostBuildStats();
 }
 
 bool UHierarchicalInstancedStaticMeshComponent::BuildTreeIfOutdated(bool Async, bool ForceUpdate)
@@ -2482,7 +2495,7 @@ bool UHierarchicalInstancedStaticMeshComponent::BuildTreeIfOutdated(bool Async,
 		|| InstanceReorderTable.Num() != PerInstanceSMData.Num()
 		|| NumBuiltInstances != PerInstanceSMData.Num() 
 		|| (GetStaticMesh() != nullptr && CacheMeshExtendedBounds != GetStaticMesh()->GetBounds())
-		|| UnbuiltInstanceBoundsList.Num() > 0 || UnbuiltInstanceIndexList.Num() > 0
+		|| UnbuiltInstanceBoundsList.Num() > 0
 		|| GetLinkerUE4Version() < VER_UE4_REBUILD_HIERARCHICAL_INSTANCE_TREES)
 	{
 		if (GetStaticMesh() != nullptr && !GetStaticMesh()->HasAnyFlags(RF_NeedLoad)) // we can build the tree if the static mesh is not even loaded, and we can't call PostLoad as the load is not even done
@@ -2494,7 +2507,7 @@ bool UHierarchicalInstancedStaticMeshComponent::BuildTreeIfOutdated(bool Async,
 				if (IsAsyncBuilding())
 				{
 					// invalidate the results of the current async build we need to modify the tree
-					bConcurrentRemoval = true;
+					bConcurrentChanges = true;
 					bDiscardAsyncBuildResults = false;
 				}
 				else
@@ -2516,12 +2529,20 @@ bool UHierarchicalInstancedStaticMeshComponent::BuildTreeIfOutdated(bool Async,
 
 void UHierarchicalInstancedStaticMeshComponent::BuildTreeAsync()
 {
-	checkSlow(IsInGameThread());
+	check(IsInGameThread());
 
 	// If we try to build the tree with the static mesh not fully loaded, we can end up in an inconsistent state which ends in a crash later
 	checkSlow(!GetStaticMesh() || !GetStaticMesh()->HasAnyFlags(RF_NeedPostLoad));
 
 	check(!bIsAsyncBuilding);
+	check(BuildTreeAsyncTasks.Num() == 0);
+
+	// upload instance edits to GPU, before validing if the mesh is valid, as it's possible that PerInstanceSMData.Num() == 0, so we have to hide everything before doing the build
+	if (GIsEditor && InstanceUpdateCmdBuffer.NumInlineCommands() > 0)
+	{
+		// this is allowed only in editor, at runtime upload will happen when buffer is built from component data
+		PerInstanceRenderData->UpdateFromCommandBuffer(InstanceUpdateCmdBuffer);
+	}
 
 	// Verify that the mesh is valid before using it.
 	const bool bMeshIsValid =
@@ -2545,15 +2566,6 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTreeAsync()
 			InstancingRandomSeed = FMath::Rand();
 		}
 
-		// upload instance edits to GPU, 
-		// to show something immediately while new tree is building
-		if (GIsEditor && InstanceUpdateCmdBuffer.NumInlineCommands() > 0 && PerInstanceRenderData.IsValid())
-		{
-			// this is allowed only in editor, at runtime upload will happen when buffer is built from component data
-			PerInstanceRenderData->UpdateFromCommandBuffer(InstanceUpdateCmdBuffer);
-		}
-		InstanceUpdateCmdBuffer.Reset();
-		
 		int32 Num = PerInstanceSMData.Num();
 		TArray<FMatrix> InstanceTransforms;
 		InstanceTransforms.SetNumUninitialized(Num);
@@ -2593,9 +2605,7 @@ void UHierarchicalInstancedStaticMeshComponent::BuildTreeAsync()
 		CacheMeshExtendedBounds = FBoxSphereBounds(EForceInit::ForceInitToZero);
 
 		UnbuiltInstanceBoundsList.Empty();
-		UnbuiltInstanceIndexList.Empty();
-		BuiltInstanceBounds.Init();
-		InstanceUpdateCmdBuffer.Reset();
+		BuiltInstanceBounds.Init();		
 	}
 }
 
@@ -2667,7 +2677,7 @@ FPrimitiveSceneProxy* UHierarchicalInstancedStaticMeshComponent::CreateSceneProx
 		(PerInstanceRenderData.IsValid()) &&
 		// make sure we have an actual staticmesh
 		GetStaticMesh() &&
-		GetStaticMesh()->HasValidRenderData() &&
+		GetStaticMesh()->HasValidRenderData(false) &&
 		// You really can't use hardware instancing on the consoles with multiple elements because they share the same index buffer. 
 		// @todo: Level error or something to let LDs know this
 		1;//GetStaticMesh()->LODModels(0).Elements.Num() == 1;
@@ -2676,17 +2686,13 @@ FPrimitiveSceneProxy* UHierarchicalInstancedStaticMeshComponent::CreateSceneProx
 	{
 		check(InstancingRandomSeed != 0);
 
-		// upload instance edits to GPU
-		if (InstanceUpdateCmdBuffer.NumInlineCommands() > 0)
+		// if instance data was modified, update GPU copy
+		// generally happens only in editor 
+		if (GIsEditor && InstanceUpdateCmdBuffer.NumInlineCommands() > 0)
 		{
-			if (GIsEditor)
-			{
-				// this is allowed only in editor, at runtime upload will happen when buffer is built from component data
-				PerInstanceRenderData->UpdateFromCommandBuffer(InstanceUpdateCmdBuffer);
-			}
-			InstanceUpdateCmdBuffer.ResetInlineCommands();
+			PerInstanceRenderData->UpdateFromCommandBuffer(InstanceUpdateCmdBuffer);
 		}
-		
+
 		ProxySize = PerInstanceRenderData->ResourceSize;
 		INC_DWORD_STAT_BY(STAT_FoliageInstanceBuffers, ProxySize);
 		
diff --git a/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.cpp b/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.cpp
index 7feba9c3f01d..803d666435ad 100644
--- a/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.cpp
+++ b/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.cpp
@@ -57,6 +57,8 @@ FInstanceUpdateCmdBuffer::FInstanceUpdateCmdBuffer()
 
 void FInstanceUpdateCmdBuffer::HideInstance(int32 RenderIndex)
 {
+	check(RenderIndex >= 0);
+
 	FInstanceUpdateCommand& Cmd = Cmds.AddDefaulted_GetRef();
 	Cmd.InstanceIndex = RenderIndex;
 	Cmd.Type = FInstanceUpdateCmdBuffer::Hide;
@@ -64,23 +66,23 @@ void FInstanceUpdateCmdBuffer::HideInstance(int32 RenderIndex)
 	Edit();
 }
 
-void FInstanceUpdateCmdBuffer::AddInstance(int32 RenderIndex, const FMatrix& InXForm)
+void FInstanceUpdateCmdBuffer::AddInstance(const FMatrix& InTransform)
 {
 	FInstanceUpdateCommand& Cmd = Cmds.AddDefaulted_GetRef();
-	Cmd.InstanceIndex = RenderIndex;
+	Cmd.InstanceIndex = INDEX_NONE;
 	Cmd.Type = FInstanceUpdateCmdBuffer::Add;
-	Cmd.XForm = InXForm;
+	Cmd.XForm = InTransform;
 
 	NumAdds++;
 	Edit();
 }
 
-void FInstanceUpdateCmdBuffer::UpdateInstance(int32 RenderIndex, const FMatrix& InXForm)
+void FInstanceUpdateCmdBuffer::UpdateInstance(int32 RenderIndex, const FMatrix& InTransform)
 {
 	FInstanceUpdateCommand& Cmd = Cmds.AddDefaulted_GetRef();
 	Cmd.InstanceIndex = RenderIndex;
 	Cmd.Type = FInstanceUpdateCmdBuffer::Update;
-	Cmd.XForm = InXForm;
+	Cmd.XForm = InTransform;
 
 	Edit();
 }
@@ -168,6 +170,7 @@ void FStaticMeshInstanceBuffer::UpdateFromCommandBuffer_Concurrent(FInstanceUpda
 	
 	// leave NumEdits unchanged in commandbuffer
 	CmdBuffer.NumEdits = NewCmdBuffer->NumEdits; 
+	CmdBuffer.ResetInlineCommands();
 		
 	ENQUEUE_RENDER_COMMAND(InstanceBuffer_UpdateFromPreallocatedData)(
 		[InstanceBuffer, NewCmdBuffer](FRHICommandListImmediate& RHICmdList)
@@ -189,7 +192,7 @@ void FStaticMeshInstanceBuffer::UpdateFromCommandBuffer_RenderThread(FInstanceUp
 	{
 		AddIndex = InstanceData->GetNumInstances();
 		int32 NewNumInstances = NumAdds + InstanceData->GetNumInstances();
-		InstanceData->AllocateInstances(NewNumInstances, false);
+		InstanceData->AllocateInstances(NewNumInstances, GIsEditor ? EResizeBufferFlags::AllowSlackOnGrow | EResizeBufferFlags::AllowSlackOnReduce : EResizeBufferFlags::None, false); // In Editor always permit overallocation, to prevent too much realloc
 	}
 
 	for (int32 i = 0; i < NumCommands; ++i)
@@ -997,7 +1000,7 @@ void UInstancedStaticMeshComponent::BuildRenderData(FStaticMeshInstanceData& Out
 		return;
 	}
 	
-	OutData.AllocateInstances(NumInstances, true);
+	OutData.AllocateInstances(NumInstances, GIsEditor ? EResizeBufferFlags::AllowSlackOnGrow | EResizeBufferFlags::AllowSlackOnReduce : EResizeBufferFlags::None, true); // In Editor always permit overallocation, to prevent too much realloc
 
 	const FMeshMapBuildData* MeshMapBuildData = nullptr;
 	if (LODData.Num() > 0)
@@ -1535,9 +1538,52 @@ void UInstancedStaticMeshComponent::SerializeRenderData(FArchive& Ar)
 			if (PerInstanceRenderData.IsValid())
 			{
 				FStaticMeshInstanceData* InstanceData = PerInstanceRenderData->InstanceBuffer.GetInstanceData();
+
 				if (InstanceData && InstanceData->GetNumInstances() > 0)
 				{
+					int32 NumInstances = InstanceData->GetNumInstances();
+
+					// Clear editor data for the cooked data
+					for (int32 Index = 0; Index < NumInstances; ++Index)
+					{
+						int32 RenderIndex = InstanceReorderTable.IsValidIndex(Index) ? InstanceReorderTable[Index] : Index;
+						if (RenderIndex == INDEX_NONE)
+						{
+							// could be skipped by density settings
+							continue;
+						}
+
+						InstanceData->ClearInstanceEditorData(RenderIndex);
+					}
+
 					InstanceData->Serialize(Ar);
+
+#if WITH_EDITOR
+					// Restore back the state we were in
+					TArray<TRefCountPtr<HHitProxy>> HitProxies;
+					CreateHitProxyData(HitProxies);
+
+					for (int32 Index = 0; Index < NumInstances; ++Index)
+					{
+						int32 RenderIndex = InstanceReorderTable.IsValidIndex(Index) ? InstanceReorderTable[Index] : Index;
+						if (RenderIndex == INDEX_NONE)
+						{
+							// could be skipped by density settings
+							continue;
+						}
+
+						// Record if the instance is selected
+						FColor HitProxyColor(ForceInit);
+						bool bSelected = SelectedInstances.IsValidIndex(Index) && SelectedInstances[Index];
+
+						if (HitProxies.IsValidIndex(Index))
+						{
+							HitProxyColor = HitProxies[Index]->Id.GetColor();
+						}
+
+						InstanceData->SetInstanceEditorData(RenderIndex, HitProxyColor, bSelected);
+					}
+#endif					
 				}
 			}
 
@@ -1556,10 +1602,11 @@ void UInstancedStaticMeshComponent::Serialize(FArchive& Ar)
 	Super::Serialize(Ar);
 
 	Ar.UsingCustomVersion(FMobileObjectVersion::GUID);
-	Ar.UsingCustomVersion(FEditorObjectVersion::GUID);
+	Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
+	Ar.UsingCustomVersion(FEditorObjectVersion::GUID);	
 	
 	bool bCooked = Ar.IsCooking();
-	if (Ar.CustomVer(FEditorObjectVersion::GUID) >= FEditorObjectVersion::SerializeInstancedStaticMeshRenderData)
+	if (Ar.CustomVer(FAthenaObjectVersion::GUID) >= FAthenaObjectVersion::SerializeInstancedStaticMeshRenderData || Ar.CustomVer(FEditorObjectVersion::GUID) >= FEditorObjectVersion::SerializeInstancedStaticMeshRenderData)
 	{
 		Ar << bCooked;
 	}
@@ -1580,7 +1627,7 @@ void UInstancedStaticMeshComponent::Serialize(FArchive& Ar)
 		PerInstanceSMData.BulkSerialize(Ar);
 	}
 
-	if (bCooked && Ar.CustomVer(FEditorObjectVersion::GUID) >= FEditorObjectVersion::SerializeInstancedStaticMeshRenderData)
+	if (bCooked && (Ar.CustomVer(FAthenaObjectVersion::GUID) >= FAthenaObjectVersion::SerializeInstancedStaticMeshRenderData || Ar.CustomVer(FEditorObjectVersion::GUID) >= FEditorObjectVersion::SerializeInstancedStaticMeshRenderData))
 	{
 		SerializeRenderData(Ar);
 	}
@@ -1593,6 +1640,11 @@ void UInstancedStaticMeshComponent::Serialize(FArchive& Ar)
 #endif
 }
 
+void UInstancedStaticMeshComponent::PreAllocateInstancesMemory(int32 AddedInstanceCount)
+{
+	PerInstanceSMData.Reserve(PerInstanceSMData.Num() + AddedInstanceCount);
+}
+
 int32 UInstancedStaticMeshComponent::AddInstanceInternal(int32 InstanceIndex, FInstancedStaticMeshInstanceData* InNewInstanceData, const FTransform& InstanceTransform)
 {
 	FInstancedStaticMeshInstanceData* NewInstanceData = InNewInstanceData;
@@ -2017,7 +2069,7 @@ void UInstancedStaticMeshComponent::OnComponentCreated()
 
 	if (FApp::CanEverRender() && !HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
 	{
-		InitPerInstanceRenderData(PerInstanceSMData.Num() > 0);
+		InitPerInstanceRenderData(false);
 	}
 }
 
@@ -2179,7 +2231,7 @@ void UInstancedStaticMeshComponent::PostEditChangeChainProperty(FPropertyChanged
 			{
 				ClearInstances();
 			}
-
+			
 			MarkRenderStateDirty();
 		}
 		else if (PropertyChangedEvent.Property->GetFName() == "Transform")
diff --git a/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.h b/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.h
index dda118530a60..4d89b6dc4920 100644
--- a/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.h
+++ b/Engine/Source/Runtime/Engine/Private/InstancedStaticMesh.h
@@ -19,8 +19,8 @@
 #include "LocalVertexFactory.h"
 #include "MaterialShared.h"
 #include "Materials/Material.h"
-#include "Components/InstancedStaticMeshComponent.h"
 #include "StaticMeshResources.h"
+#include "Components/InstancedStaticMeshComponent.h"
 #include "Engine/StaticMesh.h"
 
 #include "StaticMeshLight.h"
@@ -169,9 +169,9 @@ struct FInstancedStaticMeshDataType
 	/** The stream to read the Lightmap Bias and Random instance ID from. */
 	FVertexStreamComponent InstanceLightmapAndShadowMapUVBiasComponent;
 
-	FShaderResourceViewRHIParamRef InstanceOriginSRV;
-	FShaderResourceViewRHIParamRef InstanceTransformSRV;
-	FShaderResourceViewRHIParamRef InstanceLightmapSRV;
+	FShaderResourceViewRHIParamRef InstanceOriginSRV = nullptr;
+	FShaderResourceViewRHIParamRef InstanceTransformSRV = nullptr;
+	FShaderResourceViewRHIParamRef InstanceLightmapSRV = nullptr;
 };
 
 /**
diff --git a/Engine/Source/Runtime/Engine/Private/KismetInputLibrary.cpp b/Engine/Source/Runtime/Engine/Private/KismetInputLibrary.cpp
index e3a38cbc65f2..36ca6ee3860a 100644
--- a/Engine/Source/Runtime/Engine/Private/KismetInputLibrary.cpp
+++ b/Engine/Source/Runtime/Engine/Private/KismetInputLibrary.cpp
@@ -62,6 +62,11 @@ bool UKismetInputLibrary::Key_IsVectorAxis(const FKey& Key)
 	return Key.IsVectorAxis();
 }
 
+bool UKismetInputLibrary::Key_IsValid(const FKey& Key)
+{
+	return Key.IsValid();
+}
+
 FText UKismetInputLibrary::Key_GetDisplayName(const FKey& Key)
 {
 	return Key.GetDisplayName();
diff --git a/Engine/Source/Runtime/Engine/Private/KismetMaterialLibrary.cpp b/Engine/Source/Runtime/Engine/Private/KismetMaterialLibrary.cpp
index 74ad0b70dc1b..3468da28f14e 100644
--- a/Engine/Source/Runtime/Engine/Private/KismetMaterialLibrary.cpp
+++ b/Engine/Source/Runtime/Engine/Private/KismetMaterialLibrary.cpp
@@ -125,7 +125,7 @@ FLinearColor UKismetMaterialLibrary::GetVectorParameterValue(UObject* WorldConte
 	return ParameterValue;
 }
 
-class UMaterialInstanceDynamic* UKismetMaterialLibrary::CreateDynamicMaterialInstance(UObject* WorldContextObject, class UMaterialInterface* Parent)
+class UMaterialInstanceDynamic* UKismetMaterialLibrary::CreateDynamicMaterialInstance(UObject* WorldContextObject, class UMaterialInterface* Parent, FName OptionalName)
 {
 	UMaterialInstanceDynamic* NewMID = nullptr;
 
@@ -136,7 +136,7 @@ class UMaterialInstanceDynamic* UKismetMaterialLibrary::CreateDynamicMaterialIns
 		// If this MID is created at runtime then put it in the transient package
 		UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::ReturnNull);
 		UObject* MIDOuter = (World && (World->bIsRunningConstructionScript  || !World->IsGameWorld()) ? WorldContextObject : nullptr);
-		NewMID = UMaterialInstanceDynamic::Create(Parent, MIDOuter);
+		NewMID = UMaterialInstanceDynamic::Create(Parent, MIDOuter, OptionalName);
 		if (MIDOuter == nullptr)
 		{
 			NewMID->SetFlags(RF_Transient);
diff --git a/Engine/Source/Runtime/Engine/Private/KismetMathLibrary.cpp b/Engine/Source/Runtime/Engine/Private/KismetMathLibrary.cpp
index 51468d4d49d1..3fbeee028cd4 100644
--- a/Engine/Source/Runtime/Engine/Private/KismetMathLibrary.cpp
+++ b/Engine/Source/Runtime/Engine/Private/KismetMathLibrary.cpp
@@ -1006,6 +1006,16 @@ bool UKismetMathLibrary::IsPointInBoxWithTransform(FVector Point, const FTransfo
 	return Box.IsInsideOrOn(PointInComponentSpace);
 }
 
+void UKismetMathLibrary::GetSlopeDegreeAngles(const FVector& MyRightYAxis, const FVector& FloorNormal, const FVector& UpVector, float& OutSlopePitchDegreeAngle, float& OutSlopeRollDegreeAngle)
+{
+	const FVector FloorZAxis = FloorNormal;
+	const FVector FloorXAxis = MyRightYAxis ^ FloorZAxis;
+	const FVector FloorYAxis = FloorZAxis ^ FloorXAxis;
+
+	OutSlopePitchDegreeAngle = 90.f - FMath::RadiansToDegrees(FMath::Acos(FloorXAxis | UpVector));
+	OutSlopeRollDegreeAngle = 90.f - FMath::RadiansToDegrees(FMath::Acos(FloorYAxis | UpVector));
+}
+
 bool UKismetMathLibrary::LinePlaneIntersection(const FVector& LineStart, const FVector& LineEnd, const FPlane& APlane, float& T, FVector& Intersection)
 {
 	FVector RayDir = LineEnd - LineStart;
diff --git a/Engine/Source/Runtime/Engine/Private/KismetTextLibrary.cpp b/Engine/Source/Runtime/Engine/Private/KismetTextLibrary.cpp
index efad9bcc6587..067b0dd49896 100644
--- a/Engine/Source/Runtime/Engine/Private/KismetTextLibrary.cpp
+++ b/Engine/Source/Runtime/Engine/Private/KismetTextLibrary.cpp
@@ -298,4 +298,14 @@ bool UKismetTextLibrary::StringTableIdAndKeyFromText(FText Text, FName& OutTable
 	return FStringTableRegistry::Get().FindTableIdAndKey(Text, OutTableId, OutKey);
 }
 
+void UKismetTextLibrary::IsPolyglotDataValid(const FPolyglotTextData& PolyglotData, bool& IsValid, FText& ErrorMessage)
+{
+	IsValid = PolyglotData.IsValid(&ErrorMessage);
+}
+
+FText UKismetTextLibrary::PolyglotDataToText(const FPolyglotTextData& PolyglotData)
+{
+	return PolyglotData.GetText();
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/LODActor.cpp b/Engine/Source/Runtime/Engine/Private/LODActor.cpp
index 2677755db6cc..97486f54fb9b 100644
--- a/Engine/Source/Runtime/Engine/Private/LODActor.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LODActor.cpp
@@ -17,6 +17,7 @@
 #include "EngineUtils.h"
 #include "UObject/FrameworkObjectVersion.h"
 #include "UObject/AthenaObjectVersion.h"
+#include "Engine/HLODProxy.h"
 
 #if WITH_EDITOR
 #include "Editor.h"
@@ -25,6 +26,8 @@
 #include "HierarchicalLOD.h"
 #endif
 
+DEFINE_LOG_CATEGORY_STATIC(LogHLOD, Log, All);
+
 #define LOCTEXT_NAMESPACE "LODActor"
 
 int32 GMaximumAllowedHLODLevel = -1;
@@ -45,17 +48,11 @@ static TAutoConsoleVariable<float> CVarHLODDitherPauseTime(
 	TEXT("HLOD dither pause time in seconds\n"),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
-ENGINE_API TAutoConsoleVariable<float> CVarHLODDistanceScale(
-	TEXT("r.HLOD.DistanceScale"),
-	1.0f,
-	TEXT("Scale factor for the distance used in computing discrete HLOD for transition for static meshes. (defaults to 1)\n")
-	TEXT("(higher values make HLODs transition farther away, e.g., 2 is twice the distance)"),
-	ECVF_Scalability | ECVF_RenderThreadSafe);
-
 ENGINE_API TAutoConsoleVariable<FString> CVarHLODDistanceOverride(
 	TEXT("r.HLOD.DistanceOverride"),
 	"0.0",
-	TEXT("If non-zero, overrides the distance that HLOD transitions will take place for all objects at the HLOD level index, formatting is as follows:\n\tr.HLOD.DistanceOverride 5000, 10000, 20000 this would result in HLOD levels 0, 1 and 2 transitioning at respectively 5000, 1000 and 20000.\n"),
+	TEXT("If non-zero, overrides the distance that HLOD transitions will take place for all objects at the HLOD level index, formatting is as follows:\n")
+	TEXT("'r.HLOD.DistanceOverride 5000, 10000, 20000' would result in HLOD levels 0, 1 and 2 transitioning at 5000, 1000 and 20000 respectively."),
 	ECVF_Scalability);
 
 ENGINE_API TArray<float> ALODActor::HLODDistances;
@@ -140,6 +137,7 @@ static FAutoConsoleCommandWithWorldAndArgs GHLODCmd(
 
 static void ListUnbuiltHLODActors(const TArray<FString>& Args, UWorld* World)
 {
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	int32 NumUnbuilt = 0;
 	for (TActorIterator<ALODActor> HLODIt(World); HLODIt; ++HLODIt)
 	{
@@ -148,11 +146,12 @@ static void ListUnbuiltHLODActors(const TArray<FString>& Args, UWorld* World)
 		{
 			++NumUnbuilt;
 			FString ActorPathName = Actor->GetPathName(World);
-			UE_LOG(LogInit, Warning, TEXT("HLOD %s is unbuilt"), *ActorPathName);
+			UE_LOG(LogHLOD, Warning, TEXT("HLOD %s is unbuilt"), *ActorPathName);
 		}
 	}
 
-	UE_LOG(LogInit, Warning, TEXT("%d HLOD actor(s) were unbuilt"), NumUnbuilt);
+	UE_LOG(LogHLOD, Warning, TEXT("%d HLOD actor(s) were unbuilt"), NumUnbuilt);
+#endif	//  !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 }
 
 static FAutoConsoleCommandWithWorldAndArgs GHLODListUnbuiltCmd(
@@ -183,14 +182,12 @@ ALODActor::ALODActor(const FObjectInitializer& ObjectInitializer)
 	PrimaryActorTick.bCanEverTick = true;
 	PrimaryActorTick.bStartWithTickEnabled = false;
 	PrimaryActorTick.bAllowTickOnDedicatedServer = false;
+	PrimaryActorTick.bTickEvenWhenPaused = true;
 
 #if WITH_EDITORONLY_DATA
 	
 	bListedInSceneOutliner = false;
 
-	// Always dirty when created
-	bDirty = true;
-
 	NumTrianglesInSubActors = 0;
 	NumTrianglesInMergedMesh = 0;
 	
@@ -206,9 +203,15 @@ ALODActor::ALODActor(const FObjectInitializer& ObjectInitializer)
 	StaticMeshComponent->bAllowCullDistanceVolume = false;
 	StaticMeshComponent->bNeverDistanceCull = true;
 	bNeedsDrawDistanceReset = false;
+	bHasPatchedUpParent = false;
 	ResetDrawDistanceTime = 0.0f;
 	RootComponent = StaticMeshComponent;	
 	CachedNumHLODLevels = 1;
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	bCachedIsBuilt = false;
+	LastIsBuiltTime = 0.0;
+#endif
 }
 
 FString ALODActor::GetDetailedInfoInternal() const
@@ -249,23 +252,37 @@ void ALODActor::PostLoad()
 	}
 
 	CachedNumHLODLevels = GetLevel()->GetWorldSettings()->GetNumHierarchicalLODLevels();
-
-	if (bDirty)
-	{
-		// Temporarily disabling this warning while it is being worked on as it is spamming cook logs and happens even for minor changes.
-		/*
-		FFormatNamedArguments Arguments;
-		Arguments.Add(TEXT("ActorName"), FText::FromString(GetName()));
-		FMessageLog("MapCheck").Warning()
-			->AddToken(FUObjectToken::Create(this))
-			->AddToken(FTextToken::Create(FText::Format(LOCTEXT("ALODActor_PostRegisterAllComponents", "HLOD Cluster {ActorName} is out of date."), Arguments)));
-
-		// Show MapCheck window
-		FMessageLog("MapCheck").Open(EMessageSeverity::Warning);
-		*/
-	}
 #endif
 
+#if !WITH_EDITOR
+	// Invalid runtime LOD actor with null static mesh is invalid, look for a possible way to patch this up
+	if (GetStaticMeshComponent()->GetStaticMesh() == nullptr)
+	{
+		if (GetStaticMeshComponent() && GetStaticMeshComponent()->GetLODParentPrimitive())
+		{
+ 			if (ALODActor* ParentLODActor = Cast<ALODActor>(GetStaticMeshComponent()->GetLODParentPrimitive()->GetOwner()))
+			{
+				if ( ParentLODActor->GetStaticMeshComponent()->GetStaticMesh() != nullptr )
+				{				
+					// Make the parent HLOD 			
+					ParentLODActor->SubActors.Remove(this);
+					ParentLODActor->SubActors.Append(SubActors);			
+					for (AActor* Actor : SubActors)
+					{
+						if (Actor)
+						{
+							Actor->SetLODParent(ParentLODActor->GetStaticMeshComponent(), ParentLODActor->GetDrawDistance());
+						}
+					}
+  
+					SubActors.Empty();
+					bHasPatchedUpParent = true;
+				}
+			}
+		}
+	}
+#endif // !WITH_EDITOR
+
 	ParseOverrideDistancesCVar();
 	UpdateOverrideTransitionDistance();
 }
@@ -294,6 +311,7 @@ void ALODActor::UpdateOverrideTransitionDistance()
 	if (DistanceIndex != INDEX_NONE)
 	{
 		StaticMeshComponent->MinDrawDistance = (!HLODDistances.IsValidIndex(DistanceIndex) || FMath::IsNearlyZero(HLODDistances[DistanceIndex])) ? LODDrawDistance : ALODActor::HLODDistances[DistanceIndex];
+		StaticMeshComponent->MinDrawDistance = FMath::Max(0.0f, StaticMeshComponent->MinDrawDistance);
 		StaticMeshComponent->MarkRenderStateDirty();
 	}
 }
@@ -343,9 +361,8 @@ void ALODActor::Tick(float DeltaSeconds)
 			{
 				MinDrawDistance = HLODDistanceOverride;
 			}
-			const float AdjustedMinDrawDist = MinDrawDistance * CVarHLODDistanceScale.GetValueOnAnyThread();
 
-			StaticMeshComponent->MinDrawDistance = AdjustedMinDrawDist;
+			StaticMeshComponent->MinDrawDistance = FMath::Max(0.0f, MinDrawDistance);
 			StaticMeshComponent->MarkRenderStateDirty();
 			bNeedsDrawDistanceReset = false;
 			ResetDrawDistanceTime = 0.0f;
@@ -353,7 +370,8 @@ void ALODActor::Tick(float DeltaSeconds)
 		}
 		else
         {
-			ResetDrawDistanceTime += DeltaSeconds;
+			const float CurrentTimeDilation = FMath::Max(GetActorTimeDilation(), SMALL_NUMBER);
+			ResetDrawDistanceTime += DeltaSeconds / CurrentTimeDilation;
         }
 	}
 }
@@ -406,15 +424,18 @@ void ALODActor::PostRegisterAllComponents()
 
 	bHasActorTriedToRegisterComponents = true;
 
+	// In case we patched up the subactors to a parent LOD actor, we can unregister this component as it's not used anymore
+	if (bHasPatchedUpParent)
+	{
+		StaticMeshComponent->UnregisterComponent();
+	}
+
 #if WITH_EDITOR
 	if(!GetWorld()->IsPlayInEditor())
 	{
 		// Clean up sub actor if assets were delete manually
 		CleanSubActorArray();
 
-		// Clean up sub objects if assets were delete manually
-		CleanSubObjectsArray();
-
 		UpdateSubActorLODParents();
 	}
 #endif
@@ -426,23 +447,72 @@ void ALODActor::SetDrawDistance(float InDistance)
 	StaticMeshComponent->MinDrawDistance = LODDrawDistance;
 }
 
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+
+const bool ALODActor::IsBuilt(bool bInForce/*=false*/) const
+{
+	auto IsBuiltHelper = [this]()
+	{
+		// No static mesh
+		if(StaticMeshComponent->GetStaticMesh() == nullptr)
+		{
+			return false;
+		}
+
+		// No proxy mesh
+		if(Proxy == nullptr)
+		{
+			return false;
+		}
+
+		// Mismatched key
+		if(!Proxy->ContainsDataForActor(this))
+		{
+			return false;
+		}
+
+		// Unbuilt children
+		for(AActor* SubActor : SubActors)
+		{
+			if(ALODActor* SubLODActor = Cast<ALODActor>(SubActor))
+			{
+				if(!SubLODActor->IsBuilt(true))
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	};
+
+	const double CurrentTime = FPlatformTime::Seconds();
+	if(bInForce || (CurrentTime - LastIsBuiltTime > 0.5))
+	{
+		bCachedIsBuilt = IsBuiltHelper();
+		LastIsBuiltTime = CurrentTime;
+	}
+
+	return bCachedIsBuilt;
+}
+
+#endif
+
 #if WITH_EDITOR
 
+void ALODActor::ForceUnbuilt()
+{
+	Key = NAME_None;
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	bCachedIsBuilt = false;
+	LastIsBuiltTime = 0.0;
+#endif
+}
+
 void ALODActor::PreEditChange(UProperty* PropertyThatWillChange)
 {
 	Super::PreEditChange(PropertyThatWillChange);
 
-	if (PropertyThatWillChange)
-	{
-		const FName PropertyName = PropertyThatWillChange->GetFName();
-
-		// If the Sub Objects array is changed, in case of asset deletion make sure me flag as dirty since the cluster will be invalid
-		if (PropertyName == TEXT("SubObjects"))
-		{
-			SetIsDirty(true);
-		}
-	}
-
 	// Flush all pending rendering commands.
 	FlushRenderingCommands();
 }
@@ -471,12 +541,6 @@ void ALODActor::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEve
 
 		RecalculateDrawingDistance(CalculateSreenSize);
 	}
-	else if (PropertyName == GET_MEMBER_NAME_CHECKED(ALODActor, bOverrideScreenSize) || PropertyName == GET_MEMBER_NAME_CHECKED(ALODActor, ScreenSize)
-		|| PropertyName == GET_MEMBER_NAME_CHECKED(ALODActor, bOverrideMaterialMergeSettings) || PropertyName == GET_MEMBER_NAME_CHECKED(ALODActor, MaterialSettings))
-	{
-		// If we change override settings dirty the actor
-		SetIsDirty(true);
-	}
 
 	UpdateRegistrationToMatchMaximumLODLevel();
 
@@ -486,7 +550,6 @@ void ALODActor::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEve
 bool ALODActor::GetReferencedContentObjects( TArray<UObject*>& Objects ) const
 {
 	Super::GetReferencedContentObjects(Objects);
-	Objects.Append(SubObjects);
 	
 	// Retrieve referenced objects for sub actors as well
 	for (AActor* SubActor : SubActors)
@@ -572,7 +635,6 @@ void ALODActor::AddSubActor(AActor* InActor)
 {
 	SubActors.Add(InActor);
 	InActor->SetLODParent(StaticMeshComponent, LODDrawDistance);
-	SetIsDirty(true);
 
 	// Adding number of triangles
 	if (!InActor->IsA<ALODActor>())
@@ -606,7 +668,6 @@ const bool ALODActor::RemoveSubActor(AActor* InActor)
 	{
 		SubActors.Remove(InActor);
 		InActor->SetLODParent(nullptr, 0);
-		SetIsDirty(true);
 
 		// Deducting number of triangles
 		if (!InActor->IsA<ALODActor>())
@@ -677,45 +738,6 @@ void ALODActor::DetermineShadowingFlags()
 	StaticMeshComponent->MarkRenderStateDirty();
 }
 
-void ALODActor::SetIsDirty(const bool bNewState)
-{
-	bDirty = bNewState;
-
-	// Set parent LODActor dirty as well if bNewState = true
-	if (IsDirty())
-	{
-		// If this LODActor is a SubActor at a higher LOD level mark parent dirty as well
-		UPrimitiveComponent* LODParentComponent = StaticMeshComponent->GetLODParentPrimitive();
-		if (LODParentComponent)
-		{
-			ALODActor* LODParentActor = Cast<ALODActor>(LODParentComponent->GetOwner());
-			if (LODParentActor)
-			{
-				LODParentActor->Modify();
-				LODParentActor->SetIsDirty(true);
-			}
-		}
-		if (GetDefault<UHierarchicalLODSettings>()->bInvalidateHLODClusters)
-		{
-			// Set static mesh to null
-			StaticMeshComponent->SetStaticMesh(nullptr);
-			// Broadcast actor marked dirty event
-			if (GEditor)
-			{
-				GEditor->BroadcastHLODActorMarkedDirty(this);
-			}
-			PreviousSubObjects.Append(SubObjects);
-			SubObjects.Empty();
-		}
-	}	
-	else
-	{
-		UpdateSubActorLODParents();
-		// Deal with the case where the UObjects are being reused
-		PreviousSubObjects.RemoveAll([this](UObject* InObject) -> bool { return SubObjects.Contains(InObject); });
-	}
-}
-
 const bool ALODActor::HasValidSubActors() const
 {
 	int32 NumMeshes = 0;
@@ -813,7 +835,6 @@ void ALODActor::SetStaticMesh(class UStaticMesh* InStaticMesh)
 	if (StaticMeshComponent)
 	{
 		StaticMeshComponent->SetStaticMesh(InStaticMesh);
-		SetIsDirty(false);
 
 		ensure(StaticMeshComponent->GetStaticMesh() == InStaticMesh);
 		if (InStaticMesh && InStaticMesh->RenderData && InStaticMesh->RenderData->LODResources.Num() > 0)
@@ -836,7 +857,6 @@ void ALODActor::UpdateSubActorLODParents()
 
 void ALODActor::CleanSubActorArray()
 {
-	bool bIsDirty = false;
 	for (int32 SubActorIndex = 0; SubActorIndex < SubActors.Num(); ++SubActorIndex)
 	{
 		AActor* Actor = SubActors[SubActorIndex];
@@ -844,34 +864,8 @@ void ALODActor::CleanSubActorArray()
 		{
 			SubActors.RemoveAtSwap(SubActorIndex);
 			SubActorIndex--;
-			bIsDirty = true;
 		}
 	}
-
-	if (bIsDirty)
-	{
-		SetIsDirty(true);
-	}
-}
-
-void ALODActor::CleanSubObjectsArray()
-{
-	bool bIsDirty = false;
-	for (int32 SubObjectIndex = 0; SubObjectIndex < SubObjects.Num(); ++SubObjectIndex)
-	{
-		UObject* Object = SubObjects[SubObjectIndex];
-		if (Object == nullptr)
-		{
-			SubObjects.RemoveAtSwap(SubObjectIndex);
-			SubObjectIndex--;
-			bIsDirty = true;
-		}
-	}
-
-	if (bIsDirty)
-	{
-		SetIsDirty(true);		
-	}
 }
 
 void ALODActor::RecalculateDrawingDistance(const float InTransitionScreenSize)
@@ -975,6 +969,7 @@ void ALODActor::OnCVarsChanged()
 	}
 }
 
+
 void ALODActor::Serialize(FArchive& Ar)
 {
 	Super::Serialize(Ar);
@@ -999,29 +994,22 @@ void ALODActor::Serialize(FArchive& Ar)
 
 void ALODActor::PreSave(const class ITargetPlatform* TargetPlatform)
 {
-	AActor::PreSave(TargetPlatform);	
-	if (PreviousSubObjects.Num() && GetDefault<UHierarchicalLODSettings>()->bDeleteHLODAssets)
+	Super::PreSave(TargetPlatform);	
+
+	if(!GIsCookerLoadingPackage)
 	{
-		PreviousSubObjects.RemoveAll([](const UObject* Object) -> bool { return Object == nullptr; });
-		ObjectTools::DeleteObjectsUnchecked(PreviousSubObjects);
-		PreviousSubObjects.Empty();
+		// Always rebuild key on save here. We dont do this while cooking as keys rely on platform derived data which is context-dependent during cook
+		Key = UHLODProxy::GenerateKeyForActor(this);
+	}
+
+	// check & warn if we need building
+	if(!IsBuilt(true))
+	{
+		UE_LOG(LogHLOD, Log, TEXT("HLOD actor %s in map %s is not built. Meshes may not match."), *GetName(), *GetOutermost()->GetName());
 	}
 }
 
-void ALODActor::BeginDestroy()
-{
-	AActor::BeginDestroy();
-	if (PreviousSubObjects.Num())
-	{
-		for (UObject* Object : PreviousSubObjects)
-		{
-			if (Object)
-			{
-				Object->MarkPendingKill();
-			}
-		}
-		PreviousSubObjects.Empty();
-	}
-}
-#endif
+
+#endif	// #if WITH_EDITOR
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/LatentActionManager.cpp b/Engine/Source/Runtime/Engine/Private/LatentActionManager.cpp
index d29499371681..3ab56cf1ae59 100644
--- a/Engine/Source/Runtime/Engine/Private/LatentActionManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LatentActionManager.cpp
@@ -4,6 +4,9 @@
 #include "UObject/Class.h"
 #include "LatentActions.h"
 
+FOnLatentActionsChanged FLatentActionManager::LatentActionsChangedDelegate;
+
+
 /////////////////////////////////////////////////////
 // FPendingLatentAction
 
@@ -25,6 +28,8 @@ void FLatentActionManager::AddNewAction(UObject* InActionObject, int32 UUID, FPe
 		ObjectActionListPtr = MakeShareable(new FActionList());
 	}
 	ObjectActionListPtr->Add(UUID, NewAction);
+
+	LatentActionsChangedDelegate.Broadcast(InActionObject, ELatentActionChangeType::ActionsAdded);
 }
 
 void FLatentActionManager::RemoveActionsForObject(TWeakObjectPtr<UObject> InObject)
@@ -79,7 +84,11 @@ void FLatentActionManager::ProcessLatentActions(UObject* InObject, float DeltaTi
 					delete Action;
 				}
 			}
+
+			// Notify listeners that latent actions for this object were removed
+			LatentActionsChangedDelegate.Broadcast(It.Key().Get(), ELatentActionChangeType::ActionsRemoved);
 		}
+
 	}
 	ActionsToRemoveMap.Reset();
 
@@ -169,6 +178,11 @@ void FLatentActionManager::TickLatentActionForObject(float DeltaTime, FActionLis
 		delete DyingAction;
 	}
 
+	if (ItemsToRemove.Num() > 0)
+	{
+		LatentActionsChangedDelegate.Broadcast(InObject, ELatentActionChangeType::ActionsRemoved);
+	}
+
 	// Trigger any pending execution links
 	for (int32 i = 0; i < Response.LinksToExecute.Num(); ++i)
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/LegacyScreenPercentageDriver.cpp b/Engine/Source/Runtime/Engine/Private/LegacyScreenPercentageDriver.cpp
index b4da4fa5702c..b499d4a18064 100644
--- a/Engine/Source/Runtime/Engine/Private/LegacyScreenPercentageDriver.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LegacyScreenPercentageDriver.cpp
@@ -11,9 +11,11 @@
 FLegacyScreenPercentageDriver::FLegacyScreenPercentageDriver(
 	const FSceneViewFamily& InViewFamily,
 	float InGlobalResolutionFraction,
-	bool InAllowPostProcessSettingsScreenPercentage)
+	bool InAllowPostProcessSettingsScreenPercentage,
+	float InGlobalResolutionFractionUpperBound)
 	: ViewFamily(InViewFamily)
 	, GlobalResolutionFraction(InGlobalResolutionFraction)
+	, GlobalResolutionFractionUpperBound(InGlobalResolutionFractionUpperBound)
 	, AllowPostProcessSettingsScreenPercentage(InAllowPostProcessSettingsScreenPercentage)
 {
 	if (AllowPostProcessSettingsScreenPercentage || GlobalResolutionFraction != 1.0f)
@@ -33,7 +35,7 @@ float FLegacyScreenPercentageDriver::GetPrimaryResolutionFractionUpperBound() co
 
 	for (int32 i = 0; i < ViewFamily.Views.Num(); i++)
 	{
-		float ResolutionFraction = GlobalResolutionFraction;
+		float ResolutionFraction = GlobalResolutionFractionUpperBound;
 		if (AllowPostProcessSettingsScreenPercentage)
 		{
 			ResolutionFraction *= ViewFamily.Views[i]->FinalPostProcessSettings.ScreenPercentage / 100.0f;
@@ -53,7 +55,7 @@ ISceneViewFamilyScreenPercentage* FLegacyScreenPercentageDriver::Fork_GameThread
 	check(IsInGameThread());
 
 	return new FLegacyScreenPercentageDriver(
-		ForkedViewFamily, GlobalResolutionFraction, AllowPostProcessSettingsScreenPercentage);
+		ForkedViewFamily, GlobalResolutionFraction, AllowPostProcessSettingsScreenPercentage, GlobalResolutionFractionUpperBound);
 }
 
 void FLegacyScreenPercentageDriver::ComputePrimaryResolutionFractions_RenderThread(
diff --git a/Engine/Source/Runtime/Engine/Private/Level.cpp b/Engine/Source/Runtime/Engine/Private/Level.cpp
index e94b602e480c..b269cea37e1d 100644
--- a/Engine/Source/Runtime/Engine/Private/Level.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Level.cpp
@@ -964,13 +964,11 @@ void ULevel::IncrementalUpdateComponents(int32 NumComponentsToUpdate, bool bReru
 	}
 
 	// See whether we are done.
-	if (CurrentActorIndexForUpdateComponents == Actors.Num())
+	if (CurrentActorIndexForUpdateComponents >= Actors.Num())
 	{
 		CurrentActorIndexForUpdateComponents	= 0;
 		bHasCurrentActorCalledPreRegister		= false;
 		bAreComponentsCurrentlyRegistered		= true;
-		
-		CreateCluster();
 
 #if PERF_TRACK_DETAILED_ASYNC_STATS
 		QUICK_SCOPE_CYCLE_COUNTER(STAT_ULevel_IncrementalUpdateComponents_RerunConstructionScripts);
@@ -997,6 +995,8 @@ void ULevel::IncrementalUpdateComponents(int32 NumComponentsToUpdate, bool bReru
 			}
 			bHasRerunConstructionScripts = true;
 		}
+
+		CreateCluster();
 	}
 	// Only the game can use incremental update functionality.
 	else
@@ -1034,7 +1034,7 @@ bool ULevel::IncrementalUnregisterComponents(int32 NumComponentsToUnregister)
 		}
 	}
 
-	if (CurrentActorIndexForUnregisterComponents == Actors.Num())
+	if (CurrentActorIndexForUnregisterComponents >= Actors.Num())
 	{
 		CurrentActorIndexForUnregisterComponents = 0;
 		return true;
@@ -2007,7 +2007,7 @@ void ULevel::FixupForPIE(int32 PIEInstanceID)
 	{
 		FSoftPathPIEFixupSerializer() 
 		{
-			ArIsSaving = true;
+			this->SetIsSaving(true);
 		}
 
 		FArchive& operator<<(FSoftObjectPath& Value)
diff --git a/Engine/Source/Runtime/Engine/Private/LevelActor.cpp b/Engine/Source/Runtime/Engine/Private/LevelActor.cpp
index cb9595b5a44a..533852b5ee55 100644
--- a/Engine/Source/Runtime/Engine/Private/LevelActor.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LevelActor.cpp
@@ -759,7 +759,7 @@ APlayerController* UWorld::SpawnPlayActor(UPlayer* NewPlayer, ENetRole RemoteRol
 	Level actor moving/placing.
 -----------------------------------------------------------------------------*/
 
-bool UWorld::FindTeleportSpot(AActor* TestActor, FVector& TestLocation, FRotator TestRotation)
+bool UWorld::FindTeleportSpot(const AActor* TestActor, FVector& TestLocation, FRotator TestRotation)
 {
 	if( !TestActor || !TestActor->GetRootComponent() )
 	{
@@ -1007,7 +1007,7 @@ static FVector CombineAdjustments(FVector CurrentAdjustment, FVector AdjustmentT
 }
 
 // perf note: this is faster if ProposedAdjustment is null, since it can early out on first penetration
-bool UWorld::EncroachingBlockingGeometry(AActor* TestActor, FVector TestLocation, FRotator TestRotation, FVector* ProposedAdjustment)
+bool UWorld::EncroachingBlockingGeometry(const AActor* TestActor, FVector TestLocation, FRotator TestRotation, FVector* ProposedAdjustment)
 {
 	if (TestActor == nullptr)
 	{
@@ -1168,59 +1168,98 @@ void UWorld::LoadSecondaryLevels(bool bForce, TSet<FName>* FilenamesToSkip)
 					bAlreadyLoaded = true;
 				}
 
-				if ( !bSkipFile && !bAlreadyLoaded )
+				if ( !bSkipFile )
 				{
-					bool bLoadedLevelPackage = false;
-					const FName StreamingLevelWorldAssetPackageFName = StreamingLevel->GetWorldAssetPackageFName();
-					// Load the package and find the world object.
-					if( FPackageName::IsShortPackageName(StreamingLevelWorldAssetPackageFName) == false )
+					if ( !bAlreadyLoaded )
 					{
-						ULevel::StreamedLevelsOwningWorld.Add(StreamingLevelWorldAssetPackageFName, this);
-						LevelPackage = LoadPackage( NULL, *StreamingLevelWorldAssetPackageName, LOAD_None );
-						ULevel::StreamedLevelsOwningWorld.Remove(StreamingLevelWorldAssetPackageFName);
-
-						if( LevelPackage )
+						bool bLoadedLevelPackage = false;
+						const FName StreamingLevelWorldAssetPackageFName = StreamingLevel->GetWorldAssetPackageFName();
+						// Load the package and find the world object.
+						if( FPackageName::IsShortPackageName(StreamingLevelWorldAssetPackageFName) == false )
 						{
-							bLoadedLevelPackage = true;
+							ULevel::StreamedLevelsOwningWorld.Add(StreamingLevelWorldAssetPackageFName, this);
+							LevelPackage = LoadPackage( NULL, *StreamingLevelWorldAssetPackageName, LOAD_None );
+							ULevel::StreamedLevelsOwningWorld.Remove(StreamingLevelWorldAssetPackageFName);
 
-							// Find the world object in the loaded package.
-							UWorld* LoadedWorld	= UWorld::FindWorldInPackage(LevelPackage);
-							// If the world was not found, it could be a redirector to a world. If so, follow it to the destination world.
-							if (!LoadedWorld)
+							if( LevelPackage )
 							{
-								LoadedWorld = UWorld::FollowWorldRedirectorInPackage(LevelPackage);
+								bLoadedLevelPackage = true;
+
+								// Find the world object in the loaded package.
+								UWorld* LoadedWorld	= UWorld::FindWorldInPackage(LevelPackage);
+								// If the world was not found, it could be a redirector to a world. If so, follow it to the destination world.
+								if (!LoadedWorld)
+								{
+									LoadedWorld = UWorld::FollowWorldRedirectorInPackage(LevelPackage);
+								}
+								check(LoadedWorld);
+
+								if ( !LevelPackage->IsFullyLoaded() )
+								{
+									// LoadedWorld won't be serialized as there's a BeginLoad on the stack so we manually serialize it here.
+									check( LoadedWorld->GetLinker() );
+									LoadedWorld->GetLinker()->Preload( LoadedWorld );
+								}
+
+
+								// Keep reference to prevent garbage collection.
+								check( LoadedWorld->PersistentLevel );
+
+								LoadedWorld->PersistentLevel->HandleLegacyMapBuildData();
+
+								ULevel* NewLoadedLevel = LoadedWorld->PersistentLevel;
+								NewLoadedLevel->OwningWorld = this;
+
+								FStreamingLevelPrivateAccessor::SetLoadedLevel(StreamingLevel, NewLoadedLevel);
 							}
-							check(LoadedWorld);
+						}
+						else
+						{
+							UE_LOG(LogSpawn, Warning, TEXT("Streaming level uses short package name (%s). Level will not be loaded."), *StreamingLevelWorldAssetPackageName);
+						}
 
-							if ( !LevelPackage->IsFullyLoaded() )
-							{
-								// LoadedWorld won't be serialized as there's a BeginLoad on the stack so we manually serialize it here.
-								check( LoadedWorld->GetLinker() );
-								LoadedWorld->GetLinker()->Preload( LoadedWorld );
-							}
-
-
-							// Keep reference to prevent garbage collection.
-							check( LoadedWorld->PersistentLevel );
-
-							LoadedWorld->PersistentLevel->HandleLegacyMapBuildData();
-
-							ULevel* NewLoadedLevel = LoadedWorld->PersistentLevel;
-							NewLoadedLevel->OwningWorld = this;
-
-							FStreamingLevelPrivateAccessor::SetLoadedLevel(StreamingLevel, NewLoadedLevel);
+						// Remove this level object if the file couldn't be found.
+						if ( !bLoadedLevelPackage )
+						{
+							RemoveStreamingLevelAt(LevelIndex--);
+							MarkPackageDirty();
 						}
 					}
 					else
 					{
-						UE_LOG(LogSpawn, Warning, TEXT("Streaming level uses short package name (%s). Level will not be loaded."), *StreamingLevelWorldAssetPackageName);
-					}
-
-					// Remove this level object if the file couldn't be found.
-					if ( !bLoadedLevelPackage )
-					{
-						RemoveStreamingLevelAt(LevelIndex--);
-						MarkPackageDirty();
+						UWorld* LoadedWorld = UWorld::FindWorldInPackage(LevelPackage);
+						// If the world was not found, it could be a redirector to a world. If so, follow it to the destination world.
+						if (!LoadedWorld)
+						{
+							LoadedWorld = UWorld::FollowWorldRedirectorInPackage(LevelPackage);
+						}
+						if (LoadedWorld)
+						{
+							if (ULevel* WorldLevel = LoadedWorld->PersistentLevel)
+							{
+								ULevel* LoadedLevel = StreamingLevel->GetLoadedLevel();
+								if (!LoadedLevel)
+								{
+									FStreamingLevelPrivateAccessor::SetLoadedLevel(StreamingLevel, WorldLevel);
+									if (WorldLevel->OwningWorld != this)
+									{
+										WorldLevel->OwningWorld = this;
+									}
+								}
+								else if (LoadedLevel != WorldLevel)
+								{
+									UE_LOG(LogSpawn, Warning, TEXT("Streaming level already has a loaded level, but it differs from the one in the associated package (%s)."), *StreamingLevelWorldAssetPackageName);
+								}
+							}
+							else
+							{
+								UE_LOG(LogSpawn, Warning, TEXT("Streaming level already has a loaded level, but the world in the associated package (%s) does not have its persistent level set."), *StreamingLevelWorldAssetPackageName);
+							}
+						}
+						else
+						{
+							UE_LOG(LogSpawn, Warning, TEXT("Streaming level already has a loaded level, but the associated package (%s) seems to contain no world."), *StreamingLevelWorldAssetPackageName);
+						}
 					}
 				}
 			}
diff --git a/Engine/Source/Runtime/Engine/Private/LevelActorContainer.cpp b/Engine/Source/Runtime/Engine/Private/LevelActorContainer.cpp
index 72a5502c89fd..413726ac4c34 100644
--- a/Engine/Source/Runtime/Engine/Private/LevelActorContainer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LevelActorContainer.cpp
@@ -66,7 +66,7 @@ public:
 	void AddObjectToCluster(int32 ObjectIndex, FUObjectItem* ObjectItem, UObject* Obj, TArray<UObject*>& ObjectsToSerialize, bool bOuterAndClass)
 	{
 		// If we haven't finished loading, we can't be sure we know all the references
-		check(!Obj->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad));
+		check(!Obj->HasAnyFlags(RF_NeedLoad));
 		check(ObjectItem->GetOwnerIndex() == 0 || ObjectItem->GetOwnerIndex() == ClusterRootIndex || ObjectIndex == ClusterRootIndex);
 		check(Obj->CanBeInCluster());
 		if (ObjectIndex != ClusterRootIndex && ObjectItem->GetOwnerIndex() == 0 && !GUObjectArray.IsDisregardForGC(Obj) && !Obj->IsRooted())
@@ -111,7 +111,7 @@ public:
 		if (Object)
 		{
 			// If we haven't finished loading, we can't be sure we know all the references
-			check(!Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad));
+			check(!Object->HasAnyFlags(RF_NeedLoad));
 
 			FUObjectItem* ObjectItem = GUObjectArray.ObjectToObjectItem(Object);
 
@@ -140,18 +140,18 @@ public:
 						Cluster.MutableObjects.AddUnique(OtherClusterReferencedMutableObjectIndex);
 					}
 				}
-				else if (!GUObjectArray.IsDisregardForGC(Object)) // Objects that can create clusters themselves and haven't been postloaded yet should be excluded
+				else if (!GUObjectArray.IsDisregardForGC(Object)) // Objects that are in disregard for GC set can be safely skipped
 				{
 					check(ObjectItem->GetOwnerIndex() == 0);
 
 					// New object, add it to the cluster.
-					if (CanAddToCluster(Object) && !Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad))
+					if (CanAddToCluster(Object) && !Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad) && !Object->IsRooted())
 					{
 						AddObjectToCluster(GUObjectArray.ObjectToIndex(Object), ObjectItem, Object, ObjectsToSerialize, true);
 					}
 					else
 					{
-						checkf(!Object->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("%s is being added to cluster but hasn't finished loading yet"), *Object->GetFullName());
+						UE_CLOG(Object->HasAnyFlags(RF_NeedLoad), LogLevelActorContainer, Log, TEXT("%s is being added to %s's cluster but hasn't finished loading yet"), *ParentLevel->GetFullName(), *Object->GetFullName());
 						Cluster.MutableObjects.AddUnique(GUObjectArray.ObjectToIndex(Object));
 					}
 				}
@@ -171,7 +171,7 @@ void ULevelActorContainer::CreateCluster()
 	}
 
 	// If we haven't finished loading, we can't be sure we know all the references
-	check(!HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad));
+	check(!HasAnyFlags(RF_NeedLoad));
 
 	// Create a new cluster, reserve an arbitrary amount of memory for it.
 	const int32 ClusterIndex = GUObjectClusters.AllocateCluster(GUObjectArray.ObjectToIndex(this));
diff --git a/Engine/Source/Runtime/Engine/Private/LevelStreaming.cpp b/Engine/Source/Runtime/Engine/Private/LevelStreaming.cpp
index c7374271be10..0b8d923a342d 100644
--- a/Engine/Source/Runtime/Engine/Private/LevelStreaming.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LevelStreaming.cpp
@@ -53,25 +53,25 @@ int32 ULevelStreamingKismet::UniqueLevelInstanceId = 0;
  */
 static void NetDriverRenameStreamingLevelPackageForPIE(const UWorld* World, FName UnPrefixedPackageName)
 {
-	if (World == nullptr || World->NetDriver == nullptr || !World->NetDriver->GuidCache.IsValid())
-	{
-		UE_LOG(LogNet, Verbose, TEXT("NetDriverRenameStreamingLevelPackageForPIE, GuidCache is invalid! Package name %s"), *UnPrefixedPackageName.ToString());
-		return;
-	}
-
-	const FWorldContext* const WorldContext = GEngine->GetWorldContextFromWorld(World);
+	FWorldContext* WorldContext = GEngine->GetWorldContextFromWorld(World);
 	if (!WorldContext || WorldContext->WorldType != EWorldType::PIE)
 	{
 		return;
 	}
 
-	for (TPair<FNetworkGUID, FNetGuidCacheObject>& GuidPair : World->NetDriver->GuidCache->ObjectLookup)
+	for (FNamedNetDriver& Driver : WorldContext->ActiveNetDrivers)
 	{
-		// Only look for packages, which will have a static GUID and an invalid OuterGUID.
-		const bool bIsPackage = GuidPair.Key.IsStatic() && !GuidPair.Value.OuterGUID.IsValid();
-		if (bIsPackage && GuidPair.Value.PathName == UnPrefixedPackageName)
+		if (Driver.NetDriver && Driver.NetDriver->GuidCache.IsValid())
 		{
-			GuidPair.Value.PathName = *UWorld::ConvertToPIEPackageName(GuidPair.Value.PathName.ToString(), WorldContext->PIEInstance);
+			for (TPair<FNetworkGUID, FNetGuidCacheObject>& GuidPair : Driver.NetDriver->GuidCache->ObjectLookup)
+			{
+				// Only look for packages, which will have a static GUID and an invalid OuterGUID.
+				const bool bIsPackage = GuidPair.Key.IsStatic() && !GuidPair.Value.OuterGUID.IsValid();
+				if (bIsPackage && GuidPair.Value.PathName == UnPrefixedPackageName)
+				{
+					GuidPair.Value.PathName = *UWorld::ConvertToPIEPackageName(GuidPair.Value.PathName.ToString(), WorldContext->PIEInstance);
+				}
+			}
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/LevelTick.cpp b/Engine/Source/Runtime/Engine/Private/LevelTick.cpp
index 03e774cc1cb4..3e2703195ed2 100644
--- a/Engine/Source/Runtime/Engine/Private/LevelTick.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LevelTick.cpp
@@ -21,6 +21,7 @@
 #include "Engine/EngineTypes.h"
 #include "RHI.h"
 #include "RenderingThread.h"
+#include "Materials/MaterialParameterCollectionInstance.h"
 #include "Engine/World.h"
 #include "GameFramework/Controller.h"
 #include "AI/NavigationSystemBase.h"
@@ -1007,6 +1008,15 @@ void UWorld::SendAllEndOfFrameUpdates()
 		GTWork();
 		ParallelFor(LocalComponentsThatNeedEndOfFrameUpdate.Num(), ParallelWork);
 	}
+	
+	for (UMaterialParameterCollectionInstance* ParameterCollectionInstance : ParameterCollectionInstances)
+	{
+		if (ParameterCollectionInstance)
+		{
+			ParameterCollectionInstance->DeferredUpdateRenderState();
+		}
+	}
+			
 	LocalComponentsThatNeedEndOfFrameUpdate.Reset();
 
 	EndSendEndOfFrameUpdatesDrawEvent(DrawEvent);
diff --git a/Engine/Source/Runtime/Engine/Private/LocalPlayer.cpp b/Engine/Source/Runtime/Engine/Private/LocalPlayer.cpp
index d26e6f356955..17f7eda09f1a 100644
--- a/Engine/Source/Runtime/Engine/Private/LocalPlayer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/LocalPlayer.cpp
@@ -663,6 +663,9 @@ void ULocalPlayer::GetViewPoint(FMinimalViewInfo& OutViewInfo, EStereoscopicPass
 	{
 		ViewExt->SetupViewPoint(PlayerController, OutViewInfo);
 	};
+
+	// We store the originally desired FOV as other classes may adjust to account for ultra-wide aspect ratios
+	OutViewInfo.DesiredFOV = OutViewInfo.FOV;
 }
 
 bool ULocalPlayer::CalcSceneViewInitOptions(
@@ -797,6 +800,8 @@ FSceneView* ULocalPlayer::CalcSceneView( class FSceneViewFamily* ViewFamily,
 	OutViewLocation = ViewInfo.Location;
 	OutViewRotation = ViewInfo.Rotation;
 	ViewInitOptions.bUseFieldOfViewForLOD = ViewInfo.bUseFieldOfViewForLOD;
+	ViewInitOptions.FOV = ViewInfo.FOV;
+	ViewInitOptions.DesiredFOV = ViewInfo.DesiredFOV;
 
 	// Fill out the rest of the view init options
 	ViewInitOptions.ViewFamily = ViewFamily;
@@ -1542,18 +1547,18 @@ FString ULocalPlayer::GetNickname() const
 	return TEXT("");
 }
 
-TSharedPtr<const FUniqueNetId> ULocalPlayer::GetUniqueNetIdFromCachedControllerId() const
+FUniqueNetIdRepl ULocalPlayer::GetUniqueNetIdFromCachedControllerId() const
 {
 	UWorld* World = GetWorld();
 	if (World != nullptr)
 	{
-		return UOnlineEngineInterface::Get()->GetUniquePlayerId(World, ControllerId);
+		return FUniqueNetIdRepl(UOnlineEngineInterface::Get()->GetUniquePlayerId(World, ControllerId));
 	}
 
-	return nullptr;
+	return FUniqueNetIdRepl();
 }
 
-TSharedPtr<const FUniqueNetId> ULocalPlayer::GetCachedUniqueNetId() const
+FUniqueNetIdRepl ULocalPlayer::GetCachedUniqueNetId() const
 {
 	return CachedUniqueNetId;
 }
@@ -1563,11 +1568,11 @@ void ULocalPlayer::SetCachedUniqueNetId(TSharedPtr<const FUniqueNetId> NewUnique
 	CachedUniqueNetId = NewUniqueNetId;
 }
 
-TSharedPtr<const FUniqueNetId> ULocalPlayer::GetPreferredUniqueNetId() const
+FUniqueNetIdRepl ULocalPlayer::GetPreferredUniqueNetId() const
 {
 	// Prefer the cached unique net id (only if it's valid)
 	// This is for backwards compatibility for games that don't yet cache the unique id properly
-	if (GetCachedUniqueNetId().IsValid() && GetCachedUniqueNetId()->IsValid())
+	if (GetCachedUniqueNetId().IsValid())
 	{
 		return GetCachedUniqueNetId();
 	}
@@ -1579,23 +1584,8 @@ TSharedPtr<const FUniqueNetId> ULocalPlayer::GetPreferredUniqueNetId() const
 bool ULocalPlayer::IsCachedUniqueNetIdPairedWithControllerId() const
 {
 	// Get the UniqueNetId that is paired with the controller
-	TSharedPtr<const FUniqueNetId> UniqueIdFromController = GetUniqueNetIdFromCachedControllerId();
-
-	if (CachedUniqueNetId.IsValid() != UniqueIdFromController.IsValid())
-	{
-		// Definitely can't match if one is valid and not the other
-		return false;
-	}
-
-	if (!CachedUniqueNetId.IsValid())
-	{
-		// Both are invalid, technically they match
-		check(!UniqueIdFromController.IsValid());
-		return true;
-	}
-
-	// Both are valid, ask them if they match
-	return *CachedUniqueNetId == *UniqueIdFromController;
+	FUniqueNetIdRepl UniqueIdFromController = GetUniqueNetIdFromCachedControllerId();
+	return (CachedUniqueNetId == UniqueIdFromController);
 }
 
 UWorld* ULocalPlayer::GetWorld() const
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/HLSLMaterialTranslator.h b/Engine/Source/Runtime/Engine/Private/Materials/HLSLMaterialTranslator.h
index 6c322ccd3fc2..cf204d9bca55 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/HLSLMaterialTranslator.h
+++ b/Engine/Source/Runtime/Engine/Private/Materials/HLSLMaterialTranslator.h
@@ -136,7 +136,8 @@ protected:
 	bool SharedPixelProperties[CompiledMP_MAX];
 
 	/* Stack that tracks compiler state specific to the function currently being compiled. */
-	TArray<FMaterialFunctionCompileState> FunctionStacks[SF_NumFrequencies];
+	TArray<FMaterialFunctionCompileState*> FunctionStacks[SF_NumFrequencies];
+
 	/** Material being compiled.  Only transient compilation output like error information can be stored on the FMaterial. */
 	FMaterial* Material;
 	/** Compilation output which will be stored in the DDC. */
@@ -239,6 +240,8 @@ protected:
 	uint32 bUsesPixelDepthOffset : 1;
 	uint32 bUsesWorldPositionOffset : 1;
 	uint32 bUsesEmissiveColor : 1;
+	/** true if the Roughness input evaluates to a constant 1.0 */
+	uint32 bIsFullyRough : 1;
 	/** Tracks the number of texture coordinates used by this material. */
 	uint32 NumUserTexCoords;
 	/** Tracks the number of texture coordinates used by the vertex shader in this material. */
@@ -291,6 +294,7 @@ public:
 	,	bUsesPixelDepthOffset(false)
     ,   bUsesWorldPositionOffset(false)
 	,	bUsesEmissiveColor(0)
+	,	bIsFullyRough(0)
 	,	NumUserTexCoords(0)
 	,	NumUserVertexTexCoords(0)
 	,	NumParticleDynamicParameters(0)
@@ -310,11 +314,9 @@ public:
 		SharedPixelProperties[MP_PixelDepthOffset] = true;
 		SharedPixelProperties[MP_SubsurfaceColor] = true;
 
+		for (int32 Frequency = 0; Frequency < SF_NumFrequencies; ++Frequency)
 		{
-			for (int32 Frequency = 0; Frequency < SF_NumFrequencies; ++Frequency)
-			{
-				FunctionStacks[Frequency].Add(FMaterialFunctionCompileState(nullptr));
-			}
+			FunctionStacks[Frequency].Add(new FMaterialFunctionCompileState(nullptr));
 		}
 
 		// Default value for attribute stack added to simplify code when compiling new attributes, see SetMaterialProperty.
@@ -325,6 +327,33 @@ public:
 		ParameterOwnerStack.Add(FMaterialParameterInfo());
 	}
 
+	~FHLSLMaterialTranslator()
+	{
+		ClearAllFunctionStacks();
+	}
+
+	void ClearAllFunctionStacks()
+	{
+		for (uint32 Frequency = 0; Frequency < SF_NumFrequencies; ++Frequency)
+		{
+			ClearFunctionStack(Frequency);
+		}
+	}
+
+	void ClearFunctionStack(uint32 Frequency)
+	{
+		check(Frequency < SF_NumFrequencies);
+
+		if (FunctionStacks[Frequency].Num() == 0)
+		{
+			return;  // Already cleared (at the end of Translate(), for example)
+		}
+
+		check(FunctionStacks[Frequency].Num() == 1);  // All states should be popped off, leaving only the null state
+		delete FunctionStacks[Frequency][0];
+		FunctionStacks[Frequency].Empty();
+	}
+
 	void GatherCustomVertexInterpolators(TArray<UMaterialExpression*> Expressions)
 	{
 		for (UMaterialExpression* Expression : Expressions)
@@ -341,48 +370,55 @@ public:
 				}
 
 				// Each interpolator chain must be handled as an independent compile
-				for (FMaterialFunctionCompileState& FunctionStack : FunctionStacks[SF_Vertex])
+				for (FMaterialFunctionCompileState* FunctionStack : FunctionStacks[SF_Vertex])
 				{
-					FunctionStack.ExpressionStack.Empty();
-					FunctionStack.ExpressionCodeMap.Empty();
+					FunctionStack->Reset();
 				}
 			}
 			else if (UMaterialExpressionMaterialFunctionCall* FunctionCall = Cast<UMaterialExpressionMaterialFunctionCall>(Expression))
 			{
 				if (FunctionCall->MaterialFunction)
 				{
-					FunctionCall->MaterialFunction->LinkIntoCaller(FunctionCall->FunctionInputs);
-					PushFunction(FMaterialFunctionCompileState(FunctionCall));
+					FMaterialFunctionCompileState LocalState(FunctionCall);
+					FunctionCall->LinkFunctionIntoCaller(this);
+					PushFunction(&LocalState);
 
 					if (const TArray<UMaterialExpression*>* FunctionExpressions = FunctionCall->MaterialFunction->GetFunctionExpressions())
 					{
 						GatherCustomVertexInterpolators(*FunctionExpressions);
 					}
 
-					const FMaterialFunctionCompileState CompileState = PopFunction();
-					check(CompileState.ExpressionStack.Num() == 0);
-					FunctionCall->MaterialFunction->UnlinkFromCaller();
+					FMaterialFunctionCompileState* CompileState = PopFunction();
+					check(CompileState->ExpressionStack.Num() == 0);
+					FunctionCall->UnlinkFunctionFromCaller(this);
 				}
 			}
 			else if (UMaterialExpressionMaterialAttributeLayers* LayersExpression = Cast<UMaterialExpressionMaterialAttributeLayers>(Expression))
 			{
+				const FMaterialLayersFunctions* OverrideLayers = StaticMaterialLayersParameter(LayersExpression->ParameterName);
+				if (OverrideLayers)
+				{
+					LayersExpression->OverrideLayerGraph(OverrideLayers);
+				}
+
 				if (LayersExpression->bIsLayerGraphBuilt)
 				{
 					for (auto* Layer : LayersExpression->LayerCallers)
 					{
 						if (Layer && Layer->MaterialFunction)
 						{
-							Layer->MaterialFunction->LinkIntoCaller(Layer->FunctionInputs);
-							PushFunction(FMaterialFunctionCompileState(Layer));
+							FMaterialFunctionCompileState LocalState(Layer);
+							Layer->LinkFunctionIntoCaller(this);
+							PushFunction(&LocalState);
 
 							if (const TArray<UMaterialExpression*>* FunctionExpressions = Layer->MaterialFunction->GetFunctionExpressions())
 							{
 								GatherCustomVertexInterpolators(*FunctionExpressions);
 							}
 
-							const FMaterialFunctionCompileState CompileState = PopFunction();
-							check(CompileState.ExpressionStack.Num() == 0);
-							Layer->MaterialFunction->UnlinkFromCaller();
+							FMaterialFunctionCompileState* CompileState = PopFunction();
+							check(CompileState->ExpressionStack.Num() == 0);
+							Layer->UnlinkFunctionFromCaller(this);
 						}
 					}
 
@@ -390,25 +426,31 @@ public:
 					{
 						if (Blend && Blend->MaterialFunction)
 						{
-							Blend->MaterialFunction->LinkIntoCaller(Blend->FunctionInputs);
-							PushFunction(FMaterialFunctionCompileState(Blend));
+							FMaterialFunctionCompileState LocalState(Blend);
+							Blend->LinkFunctionIntoCaller(this);
+							PushFunction(&LocalState);
 
 							if (const TArray<UMaterialExpression*>* FunctionExpressions = Blend->MaterialFunction->GetFunctionExpressions())
 							{
 								GatherCustomVertexInterpolators(*FunctionExpressions);
 							}
 
-							const FMaterialFunctionCompileState CompileState = PopFunction();
-							check(CompileState.ExpressionStack.Num() == 0);
-							Blend->MaterialFunction->UnlinkFromCaller();
+							FMaterialFunctionCompileState* CompileState = PopFunction();
+							check(CompileState->ExpressionStack.Num() == 0);
+							Blend->UnlinkFunctionFromCaller(this);
 						}
 					}
 				}
+
+				if (OverrideLayers)
+				{
+					LayersExpression->OverrideLayerGraph(nullptr);
+				}
 			}
 		}
 	}
 
-	void CompileCustomOutputs(TArray<UMaterialExpressionCustomOutput*>& CustomOutputExpressions, TSet<UClass*>& SeenCustomOutputExpressionsClases, bool bIsBeforeAttributes)
+	void CompileCustomOutputs(TArray<UMaterialExpressionCustomOutput*>& CustomOutputExpressions, TSet<UClass*>& SeenCustomOutputExpressionsClasses, bool bIsBeforeAttributes)
 	{
 		for (UMaterialExpressionCustomOutput* CustomOutput : CustomOutputExpressions)
 		{
@@ -417,13 +459,13 @@ public:
 				continue;
 			}
 
-			if (!CustomOutput->AllowMultipleCustomOutputs() && SeenCustomOutputExpressionsClases.Contains(CustomOutput->GetClass()))
+			if (!CustomOutput->AllowMultipleCustomOutputs() && SeenCustomOutputExpressionsClasses.Contains(CustomOutput->GetClass()))
 			{
 				Errorf(TEXT("The material can contain only one %s node"), *CustomOutput->GetDescription());
 			}
 			else
 			{
-				SeenCustomOutputExpressionsClases.Add(CustomOutput->GetClass());		
+				SeenCustomOutputExpressionsClasses.Add(CustomOutput->GetClass());		
 				int32 NumOutputs = CustomOutput->GetNumOutputs();
 
 				if (CustomOutput->NeedsCustomOutputDefines())
@@ -436,8 +478,8 @@ public:
 					for (int32 Index = 0; Index < NumOutputs; Index++)
 					{
 						{
-							FunctionStacks[SF_Pixel].Empty();
-							FunctionStacks[SF_Pixel].Add(FMaterialFunctionCompileState(nullptr));
+							ClearFunctionStack(SF_Pixel);
+							FunctionStacks[SF_Pixel].Add(new FMaterialFunctionCompileState(nullptr));
 						}
 						MaterialProperty = MP_MAX; // Indicates we're not compiling any material property.
 						ShaderFrequency = SF_Pixel;
@@ -446,8 +488,8 @@ public:
 						CustomOutput->Compile(this, Index);
 					}
 
-					FunctionStacks[SF_Pixel].Empty();
-					FunctionStacks[SF_Pixel].Add(FMaterialFunctionCompileState(nullptr));
+					ClearFunctionStack(SF_Pixel);
+					FunctionStacks[SF_Pixel].Add(new FMaterialFunctionCompileState(nullptr));
 				}
 			}
 		}
@@ -506,6 +548,14 @@ public:
 				Material->GatherExpressionsForCustomInterpolators(Expressions);
 				GatherCustomVertexInterpolators(Expressions);
 
+				// Reset shared stack data
+				while (FunctionStacks[SF_Vertex].Num() > 1)
+				{
+					FMaterialFunctionCompileState* Stack = FunctionStacks[SF_Vertex].Pop(false);
+					delete Stack;
+				}
+				FunctionStacks[SF_Vertex][0]->Reset();
+
 				// Whilst expression list is available, apply node count limits
 				int32 NumMaterialLayersAttributes = 0;
 				for (UMaterialExpression* Expression : Expressions)
@@ -531,10 +581,10 @@ public:
 			// Gather the implementation for any custom output expressions
 			TArray<UMaterialExpressionCustomOutput*> CustomOutputExpressions;
 			Material->GatherCustomOutputExpressions(CustomOutputExpressions);
-			TSet<UClass*> SeenCustomOutputExpressionsClases;
+			TSet<UClass*> SeenCustomOutputExpressionsClasses;
 
 			// Some custom outputs must be pre-compiled so they can be re-used as shared inputs
-			CompileCustomOutputs(CustomOutputExpressions, SeenCustomOutputExpressionsClases, true);			
+			CompileCustomOutputs(CustomOutputExpressions, SeenCustomOutputExpressionsClasses, true);			
 
 			// Normal must always be compiled first; this will ensure its chunk calculations are the first to be added
 			{
@@ -621,7 +671,10 @@ public:
 			MaterialCompilationOutput.bModifiesMeshPosition = bUsesPixelDepthOffset || bUsesWorldPositionOffset;
 			MaterialCompilationOutput.bUsesWorldPositionOffset = bUsesWorldPositionOffset;
 			MaterialCompilationOutput.bUsesPixelDepthOffset = bUsesPixelDepthOffset;
-			
+
+			// Fully rough if we have a roughness code chunk and it's constant and evaluates to 1.
+			bIsFullyRough = Chunk[MP_Roughness] != INDEX_NONE && IsMaterialPropertyUsed(MP_Roughness, Chunk[MP_Roughness], FLinearColor(1, 0, 0, 0), 1) == false;
+
 			if (BlendMode == BLEND_Modulate && MaterialShadingModel != MSM_Unlit && !Material->IsDeferredDecal())
 			{
 				Errorf(TEXT("Dynamically lit translucency is not supported for BLEND_Modulate materials."));
@@ -801,7 +854,7 @@ public:
 			else
 #endif // #if HANDLE_CUSTOM_OUTPUTS_AS_MATERIAL_ATTRIBUTES
 			{
-				CompileCustomOutputs(CustomOutputExpressions, SeenCustomOutputExpressionsClases, false);
+				CompileCustomOutputs(CustomOutputExpressions, SeenCustomOutputExpressionsClasses, false);
 			}
 
 			// Output the implementation for any custom expressions we will call below.
@@ -906,8 +959,9 @@ public:
 			// Create the material uniform buffer struct.
 			MaterialCompilationOutput.UniformExpressionSet.CreateBufferStruct();
 		}
+		ClearAllFunctionStacks();
+		
 		INC_FLOAT_STAT_BY(STAT_ShaderCompiling_HLSLTranslation,(float)HLSLTranslateTime);
-
 		return bSuccess;
 	}
 
@@ -1005,6 +1059,7 @@ public:
 
 		OutEnvironment.SetDefine(TEXT("MATERIAL_ENABLE_TRANSLUCENCY_FOGGING"), Material->ShouldApplyFogging());
 		OutEnvironment.SetDefine(TEXT("MATERIAL_COMPUTE_FOG_PER_PIXEL"), Material->ComputeFogPerPixel());
+		OutEnvironment.SetDefine(TEXT("MATERIAL_FULLY_ROUGH"), bIsFullyRough || Material->IsFullyRough());
 
 		for (int32 CollectionIndex = 0; CollectionIndex < ParameterCollections.Num(); CollectionIndex++)
 		{
@@ -1405,6 +1460,24 @@ protected:
 		return Errorf(TEXT("Invalid node used in hull/domain shader input!"));
 	}
 
+	void AddEstimatedTextureSample(const uint32 Count = 1)
+	{
+		if (IsCurrentlyCompilingForPreviousFrame())
+		{
+			// Ignore non-actionable cases
+			return;
+		}
+
+		if (ShaderFrequency == SF_Pixel || ShaderFrequency == SF_Compute)
+		{
+			MaterialCompilationOutput.EstimatedNumTextureSamplesPS += Count;
+		}
+		else
+		{
+			MaterialCompilationOutput.EstimatedNumTextureSamplesVS += Count;
+		}
+	}
+
 	/** Creates a unique symbol name and adds it to the symbol list. */
 	FString CreateSymbolName(const TCHAR* SymbolNameHint)
 	{
@@ -1886,15 +1959,15 @@ protected:
 			// If we are inside a function, add that to the error message.  
 			// Only add the function call node to ErrorExpressions, since we can't add a reference to the expressions inside the function as they are private objects.
 			// Add the first function node on the stack because that's the one visible in the material being compiled, the rest are all nested functions.
-			UMaterialExpressionMaterialFunctionCall* ErrorFunction = CurrentFunctionStack[1].FunctionCall;
+			UMaterialExpressionMaterialFunctionCall* ErrorFunction = CurrentFunctionStack[1]->FunctionCall;
 			Material->ErrorExpressions.Add(ErrorFunction);
 			ErrorFunction->LastErrorText = Text;
 			ErrorString = FString(TEXT("Function ")) + ErrorFunction->MaterialFunction->GetName() + TEXT(": ");
 		}
 
-		if (CurrentFunctionStack.Last().ExpressionStack.Num() > 0)
+		if (CurrentFunctionStack.Last()->ExpressionStack.Num() > 0)
 		{
-			UMaterialExpression* ErrorExpression = CurrentFunctionStack.Last().ExpressionStack.Last().Expression;
+			UMaterialExpression* ErrorExpression = CurrentFunctionStack.Last()->ExpressionStack.Last().Expression;
 			check(ErrorExpression);
 
 			if (ErrorExpression->GetClass() != UMaterialExpressionMaterialFunctionCall::StaticClass()
@@ -1931,36 +2004,61 @@ protected:
 			ExpressionKey.MaterialAttributeID = FGuid(0, 0, 0, 0);
 		}
 
+		// Some expressions can discard output indices and share compiles with a swizzle/mask
+		if (ExpressionKey.Expression && ExpressionKey.Expression->CanIgnoreOutputIndex())
+		{
+			ExpressionKey.OutputIndex = INDEX_NONE;
+		}
+
 		// Check if this expression has already been translated.
 		check(ShaderFrequency < SF_NumFrequencies);
 		auto& CurrentFunctionStack = FunctionStacks[ShaderFrequency];
-		int32* ExistingCodeIndex = CurrentFunctionStack.Last().ExpressionCodeMap.Find(ExpressionKey);
-		if(ExistingCodeIndex)
+		FMaterialFunctionCompileState* CurrentFunctionState = CurrentFunctionStack.Last();
+
+		int32* ExistingCodeIndex = CurrentFunctionState->ExpressionCodeMap.Find(ExpressionKey);
+		if (ExistingCodeIndex)
 		{
 			return *ExistingCodeIndex;
 		}
 		else
 		{
 			// Disallow reentrance.
-			if(CurrentFunctionStack.Last().ExpressionStack.Find(ExpressionKey) != INDEX_NONE)
+			if (CurrentFunctionState->ExpressionStack.Find(ExpressionKey) != INDEX_NONE)
 			{
 				return Error(TEXT("Reentrant expression"));
 			}
 
 			// The first time this expression is called, translate it.
-			CurrentFunctionStack.Last().ExpressionStack.Add(ExpressionKey);
+			CurrentFunctionState->ExpressionStack.Add(ExpressionKey);
 			const int32 FunctionDepth = CurrentFunctionStack.Num();
+			
+			// Attempt to share function states between function calls
+			UMaterialExpressionMaterialFunctionCall* FunctionCall = Cast<UMaterialExpressionMaterialFunctionCall>(ExpressionKey.Expression);
+			if (FunctionCall)
+			{
+				FMaterialExpressionKey ReuseCompileStateExpressionKey = ExpressionKey;
+ 				ReuseCompileStateExpressionKey.OutputIndex = INDEX_NONE; // Discard the output so we can share the stack internals
+
+				FMaterialFunctionCompileState* SharedFunctionState = CurrentFunctionState->FindOrAddSharedFunctionState(ReuseCompileStateExpressionKey, FunctionCall);
+				FunctionCall->SetSharedCompileState(SharedFunctionState);
+			}
 
 			int32 Result = ExpressionKey.Expression->Compile(Compiler, ExpressionKey.OutputIndex);
 
-			FMaterialExpressionKey PoppedExpressionKey = CurrentFunctionStack.Last().ExpressionStack.Pop();
+			// Restore state
+			if (FunctionCall)
+			{
+				FunctionCall->SetSharedCompileState(nullptr);
+			}
+
+			FMaterialExpressionKey PoppedExpressionKey = CurrentFunctionState->ExpressionStack.Pop();
 
 			// Verify state integrity
 			check(PoppedExpressionKey == ExpressionKey);
 			check(FunctionDepth == CurrentFunctionStack.Num());
 
 			// Cache the translation.
-			CurrentFunctionStack.Last().ExpressionCodeMap.Add(ExpressionKey,Result);
+			CurrentFunctionStack.Last()->ExpressionCodeMap.Add(ExpressionKey,Result);
 
 			return Result;
 		}
@@ -2144,7 +2242,7 @@ protected:
 	}
 
 	/** Pushes a function onto the compiler's function stack, which indicates that compilation is entering a function. */
-	virtual void PushFunction(const FMaterialFunctionCompileState& FunctionState) override
+	virtual void PushFunction(FMaterialFunctionCompileState* FunctionState) override
 	{
 		check(ShaderFrequency < SF_NumFrequencies);
 		auto& CurrentFunctionStack = FunctionStacks[ShaderFrequency];
@@ -2152,7 +2250,7 @@ protected:
 	}	
 
 	/** Pops a function from the compiler's function stack, which indicates that compilation is leaving a function. */
-	virtual FMaterialFunctionCompileState PopFunction() override
+	virtual FMaterialFunctionCompileState* PopFunction() override
 	{
 		check(ShaderFrequency < SF_NumFrequencies);
 		auto& CurrentFunctionStack = FunctionStacks[ShaderFrequency];
@@ -3103,7 +3201,8 @@ protected:
 		// For WebGL 1 which is essentially GLES2.0, we can safely assume a higher number of supported vertex attributes
 		// even when we are compiling ES 2 feature level shaders.
 		// For UI materials can safely use more texture coordinates due to how they are packed in the slate material shader
-		const uint32 MaxNumCoordinates = ((Platform == SP_OPENGL_ES2_WEBGL) || (FeatureLevel != ERHIFeatureLevel::ES2) || Material->IsUIMaterial()) ? 8 : 3;
+		// Landscape materials also calculate their texture coordinates in the vertex factory and do not need to be sent using an interpolator
+		const uint32 MaxNumCoordinates = ((Platform == SP_OPENGL_ES2_WEBGL) || (FeatureLevel != ERHIFeatureLevel::ES2) || Material->IsUIMaterial() || Material->IsUsedWithLandscape()) ? 8 : 3;
 
 		if (CoordinateIndex >= MaxNumCoordinates)
 		{
@@ -3144,7 +3243,7 @@ protected:
 				*SampleCode,
 				CoordinateIndex
 				);
-		}
+	}
 
 	virtual int32 TextureSample(
 		int32 TextureIndex,
@@ -3428,6 +3527,8 @@ protected:
 			*MipValue0Code,
 			*MipValue1Code
 			);
+	
+		AddEstimatedTextureSample();
 
 		if (bStoreTexCoordScales)
 		{
@@ -3598,6 +3699,8 @@ protected:
 			BufferUV = AddInlinedCodeChunk(MCT_Float2, TEXT("GetDefaultSceneTextureUV(Parameters, %d)"), (int)SceneTextureId);
 		}
 
+		AddEstimatedTextureSample();
+
 		if (FeatureLevel >= ERHIFeatureLevel::SM4)
 		{
 			return AddCodeChunk(
@@ -3750,6 +3853,7 @@ protected:
 		}
 
 		MaterialCompilationOutput.bRequiresSceneColorCopy = true;
+		AddEstimatedTextureSample();
 
 		int32 ScreenUVCode = GetScreenAlignedUV(Offset, ViewportUV, bUseOffset);
 		return AddCodeChunk(
@@ -3970,18 +4074,27 @@ protected:
 		// Look up the weight-map index for this static parameter.
 		int32 WeightmapIndex = INDEX_NONE;
 		bool bFoundParameter = false;
-		
+		bool bAtLeastOneWeightBasedBlend = false;
+
 		FMaterialParameterInfo ParameterInfo = GetParameterAssociationInfo();
 		ParameterInfo.Name = ParameterName;
 
-		for(int32 ParameterIndex = 0;ParameterIndex < StaticParameters.TerrainLayerWeightParameters.Num();++ParameterIndex)
+		int32 NumActiveTerrainLayerWeightParameters = 0;
+		for(int32 ParameterIndex = 0;ParameterIndex < StaticParameters.TerrainLayerWeightParameters.Num(); ++ParameterIndex)
 		{
 			const FStaticTerrainLayerWeightParameter& Parameter = StaticParameters.TerrainLayerWeightParameters[ParameterIndex];
+			if (Parameter.bOverride)
+			{
+				NumActiveTerrainLayerWeightParameters++;
+			}
 			if(Parameter.ParameterInfo == ParameterInfo)
 			{
 				WeightmapIndex = Parameter.WeightmapIndex;
 				bFoundParameter = true;
-				break;
+			}
+			if (Parameter.bWeightBasedBlend)
+			{
+				bAtLeastOneWeightBasedBlend = true;
 			}
 		}
 
@@ -3993,18 +4106,24 @@ protected:
 		{
 			return INDEX_NONE;
 		}
-		else if (GetFeatureLevel() >= ERHIFeatureLevel::SM4)
-		{
-			FString WeightmapName = FString::Printf(TEXT("Weightmap%d"),WeightmapIndex);
-			int32 TextureReferenceIndex = INDEX_NONE;
-			int32 TextureCodeIndex = TextureParameter(FName(*WeightmapName), GEngine->WeightMapPlaceholderTexture, TextureReferenceIndex);
-			int32 WeightmapCode = TextureSample(TextureCodeIndex, TextureCoordinate(3, false, false), SAMPLERTYPE_Masks);
-			FString LayerMaskName = FString::Printf(TEXT("LayerMask_%s"),*ParameterName.ToString());
-			return Dot(WeightmapCode,VectorParameter(FName(*LayerMaskName), FLinearColor(1.f,0.f,0.f,0.f)));
-		}
 		else
-		{
-			int32 WeightmapCode = AddInlinedCodeChunk(MCT_Float4, TEXT("Parameters.LayerWeights"));
+		{			
+			int32 WeightmapCode;
+			if (GetFeatureLevel() <= ERHIFeatureLevel::ES3_1 && NumActiveTerrainLayerWeightParameters <= 3 && bAtLeastOneWeightBasedBlend)
+			{
+				// Mobile can pack 3 layers into the normal map texture B and A channels, implying the 3rd using weight based blending
+				// Layer texture is sampled into Parameters.LayerWeights in LandscapeVertexFactory.ush
+				WeightmapCode = AddInlinedCodeChunk(MCT_Float4, TEXT("Parameters.LayerWeights"));
+			}
+			else
+			{
+				// Otherwise we sample normally
+				FString WeightmapName = FString::Printf(TEXT("Weightmap%d"),WeightmapIndex);
+				int32 TextureReferenceIndex = INDEX_NONE;
+				int32 TextureCodeIndex = TextureParameter(FName(*WeightmapName), GEngine->WeightMapPlaceholderTexture, TextureReferenceIndex);
+				WeightmapCode = TextureSample(TextureCodeIndex, TextureCoordinate(3, false, false), SAMPLERTYPE_Masks);
+			}
+
 			FString LayerMaskName = FString::Printf(TEXT("LayerMask_%s"),*ParameterName.ToString());
 			return Dot(WeightmapCode,VectorParameter(FName(*LayerMaskName), FLinearColor(1.f,0.f,0.f,0.f)));
 		}
@@ -4225,7 +4344,19 @@ protected:
 			return INDEX_NONE;
 		}
 
-		return AddCodeChunk(MCT_Float3,TEXT("cross(%s,%s)"),*CoerceParameter(A,MCT_Float3),*CoerceParameter(B,MCT_Float3));
+		if(GetParameterUniformExpression(A) && GetParameterUniformExpression(B))
+		{		
+			EMaterialValueType ResultType = GetArithmeticResultType(A,B);
+			if (ResultType == MCT_Float2 || (ResultType & MCT_Float) == 0)
+			{
+				return Errorf(TEXT("Cross product requires 3-component vector input."));
+			}
+			return AddUniformExpression(new FMaterialUniformExpressionFoldedMath(GetParameterUniformExpression(A),GetParameterUniformExpression(B),FMO_Cross,ResultType),MCT_Float3,TEXT("cross(%s,%s)"),*GetParameterCode(A),*GetParameterCode(B));
+		}
+		else
+		{
+			return AddCodeChunk(MCT_Float3,TEXT("cross(%s,%s)"),*CoerceParameter(A,MCT_Float3),*CoerceParameter(B,MCT_Float3));
+		}
 	}
 
 	virtual int32 Power(int32 Base,int32 Exponent) override
@@ -4997,6 +5128,8 @@ protected:
 			return INDEX_NONE;
 		}
 
+		AddEstimatedTextureSample(2);
+
 		return AddCodeChunk(MCT_Float2,
 			TEXT("floor(%s) + float2(SobolIndex(SobolPixel(uint2(%s)), uint(%s)) ^ uint2(%s * 0x10000) & 0xffff) / 0x10000"),
 			*GetParameterCode(Cell),
@@ -5012,6 +5145,8 @@ protected:
 			return INDEX_NONE;
 		}
 
+		AddEstimatedTextureSample(2);
+
 		return AddCodeChunk(MCT_Float2,
 			TEXT("float2(SobolIndex(SobolPixel(uint2(Parameters.SvPosition.xy)), uint(View.StateFrameIndexMod8 + 8 * %s)) ^ uint2(%s * 0x10000) & 0xffff) / 0x10000"),
 			*GetParameterCode(Index),
@@ -5040,6 +5175,13 @@ protected:
 			return INDEX_NONE;
 		}
 
+		if (NoiseFunction == NOISEFUNCTION_SimplexTex ||
+			NoiseFunction == NOISEFUNCTION_GradientTex ||
+			NoiseFunction == NOISEFUNCTION_GradientTex3D)
+		{
+			AddEstimatedTextureSample();
+		}
+
 		// to limit performance problems due to values outside reasonable range
 		Levels = FMath::Clamp(Levels, 1, 10);
 
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/Material.cpp b/Engine/Source/Runtime/Engine/Private/Materials/Material.cpp
index b63064719210..d9510f5fc3a1 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/Material.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/Material.cpp
@@ -23,6 +23,8 @@
 #include "Materials/MaterialExpressionDynamicParameter.h"
 #include "Materials/MaterialExpressionFontSampleParameter.h"
 #include "Materials/MaterialExpressionQualitySwitch.h"
+#include "Materials/MaterialExpressionFeatureLevelSwitch.h"
+#include "Materials/MaterialExpressionMakeMaterialAttributes.h"
 #include "Materials/MaterialExpressionParameter.h"
 #include "Materials/MaterialExpressionScalarParameter.h"
 #include "Materials/MaterialExpressionStaticBoolParameter.h"
@@ -61,6 +63,10 @@
 #include "Widgets/Notifications/SNotificationList.h"
 #include "ThumbnailRendering/SceneThumbnailInfoWithPrimitive.h"
 #endif
+#include "ShaderCodeLibrary.h"
+#include "Materials/MaterialExpressionCurveAtlasRowParameter.h"
+#include "Curves/CurveLinearColor.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 #define LOCTEXT_NAMESPACE "Material"
 
@@ -576,6 +582,31 @@ void UMaterialInterface::AssertDefaultMaterialsPostLoaded()
 	}
 }
 
+void SetCompactFullNameFromObject(FCompactFullName &Dest, UObject* InDepObject)
+{
+	UObject* DepObject = InDepObject;
+	if (DepObject)
+	{
+		Dest.ObjectClassAndPath.Add(DepObject->GetClass()->GetFName());
+		while (DepObject)
+		{
+			Dest.ObjectClassAndPath.Insert(DepObject->GetFName(), 1);
+			DepObject = DepObject->GetOuter();
+		}
+	}
+	else
+	{
+		Dest.ObjectClassAndPath.Add(FName("null"));
+	}
+}
+
+FString MaterialDomainString(EMaterialDomain MaterialDomain)
+{
+	static const UEnum* Enum = FindObject<UEnum>(ANY_PACKAGE, TEXT("EMaterialDomain"));
+	check(Enum);
+	return Enum->GetNameStringByValue(int64(MaterialDomain));
+}
+
 static TAutoConsoleVariable<int32> CVarDiscardUnusedQualityLevels(
 	TEXT("r.DiscardUnusedQuality"),
 	0,
@@ -642,80 +673,76 @@ void ProcessSerializedInlineShaderMaps(UMaterialInterface* Owner, TArray<FMateri
 	UMaterial* OwnerMaterial = Cast<UMaterial>(Owner);
 	UMaterialInstance* OwnerMaterialInstance = Cast<UMaterialInstance>(Owner);
 
-	for (FMaterialResource& Resource : LoadedResources)
-	{
-		Resource.RegisterInlineShaderMap();
-	}
-
 	if (CVarDiscardUnusedQualityLevels.GetValueOnAnyThread())
 	{
-		// Map EMaterialQualityLevel to a score.
-		// Higher quality levels are of increasing weight such that lower quality is preferred when neighbouring hi/lo QLs exist.
-		static const int32 QualityScores[EMaterialQualityLevel::Num + 1] = { 0, 3, 1, 10 };
+		// Scan through all incoming material resources and retain only those with shadermaps
+		// which are either shared across all QLs (== EMaterialQualityLevel::Num) or which == r.MaterialQualityLevel.
 
-		int32 DesiredQL = (int32)GetCachedScalabilityCVars().MaterialQualityLevel;
-		check(DesiredQL < EMaterialQualityLevel::Num);
-		const int32 DesiredScore = QualityScores[DesiredQL];
-
-		FMaterialShaderMap* BestShaderMap[ERHIFeatureLevel::Num];
-		for (int32 FeatureIdx = 0; FeatureIdx < ERHIFeatureLevel::Num; ++FeatureIdx)
+		const int32 DesiredQL = (int32)GetCachedScalabilityCVars().MaterialQualityLevel;
+		// Find the material resources that best match the desired QL.
+		FMaterialResource* DesiredQLMaterialResource[ERHIFeatureLevel::Num] = { 0 };
+		for (FMaterialResource& Resource : LoadedResources)
 		{
-			BestShaderMap[FeatureIdx] = nullptr;
+			FMaterialShaderMap* LoadedShaderMap = Resource.GetGameThreadShaderMap();
+			if(LoadedShaderMap && LoadedShaderMap->GetShaderPlatform() == GMaxRHIShaderPlatform)
+			{
+				const EMaterialQualityLevel::Type LoadedQualityLevel = LoadedShaderMap->GetShaderMapId().QualityLevel;
+				const ERHIFeatureLevel::Type LoadedFeatureLevel = LoadedShaderMap->GetShaderMapId().FeatureLevel;
+
+				if (LoadedQualityLevel == DesiredQL)
+				{
+					// We always choose an exact match.
+					DesiredQLMaterialResource[LoadedFeatureLevel] = &Resource;
+				}
+				else if (DesiredQLMaterialResource[LoadedFeatureLevel] == nullptr && LoadedQualityLevel == EMaterialQualityLevel::Num)
+				{
+					// QLs of EMaterialQualityLevel::Num are applicable to all QLs.
+					DesiredQLMaterialResource[LoadedFeatureLevel] = &Resource;
+				}
+			}
 		}
 
-		for (int32 ResourceIndex = 0; ResourceIndex < LoadedResources.Num(); ResourceIndex++)
+		// Register inline shader maps we're going to use, discard any unused.
+		for (FMaterialResource& Resource : LoadedResources)
 		{
-			FMaterialResource& LoadedResource = LoadedResources[ResourceIndex];
-			FMaterialShaderMap* LoadedShaderMap = LoadedResource.GetGameThreadShaderMap();
-
+			FMaterialShaderMap* LoadedShaderMap = Resource.GetGameThreadShaderMap();
 			if (LoadedShaderMap && LoadedShaderMap->GetShaderPlatform() == GMaxRHIShaderPlatform)
 			{
-				EMaterialQualityLevel::Type LoadedQualityLevel = LoadedShaderMap->GetShaderMapId().QualityLevel;
-				LoadedQualityLevel = LoadedQualityLevel == EMaterialQualityLevel::Num ? EMaterialQualityLevel::High : LoadedQualityLevel;
-				ERHIFeatureLevel::Type LoadedFeatureLevel = LoadedShaderMap->GetShaderMapId().FeatureLevel;
-
-				// find current QL:
-				int32 CurrentQL = (int32)EMaterialQualityLevel::Num;
-				for (int32 i = 0; i < EMaterialQualityLevel::Num; i++)
+				if (DesiredQLMaterialResource[LoadedShaderMap->GetShaderMapId().FeatureLevel] == &Resource)
 				{
-					FMaterialResource* MaterialResource = OutMaterialResourcesLoaded[i][LoadedFeatureLevel];
-					if (MaterialResource != nullptr && MaterialResource->GetGameThreadShaderMap() != nullptr)
-					{
-						int32 FoundQL = MaterialResource->GetGameThreadShaderMap()->GetShaderMapId().QualityLevel;
-						CurrentQL = FoundQL == EMaterialQualityLevel::Num ? EMaterialQualityLevel::High : FoundQL;
-					}
+					Resource.RegisterInlineShaderMap();
 				}
-
-				// Determine if this is a better match than our current shader map.
-				const int32 CurrentScore = FMath::Abs(QualityScores[CurrentQL] - DesiredScore);
-				const int32 PotentialScore = FMath::Abs(QualityScores[LoadedQualityLevel] - DesiredScore);
-				if (PotentialScore < CurrentScore)
+				else
 				{
-					BestShaderMap[LoadedFeatureLevel] = LoadedShaderMap;
+					// We don't need this shadermap, free it up.
+					Resource.DiscardShaderMap();
 				}
 			}
 		}
 
 		for (int32 FeatureIdx = 0; FeatureIdx < ERHIFeatureLevel::Num; ++FeatureIdx)
 		{
-			if (BestShaderMap[FeatureIdx])
+			if (DesiredQLMaterialResource[FeatureIdx])
 			{
-				// replace existing shadermap with loadedshadermap.
+				// Apply the desired QL shadermap to all QL slots of the output material resource.
+				FMaterialShaderMap* DesiredQLShaderMap = DesiredQLMaterialResource[FeatureIdx]->GetGameThreadShaderMap();
+				check(DesiredQLShaderMap);
 				for (int32 QualityLevelIndex = 0; QualityLevelIndex < EMaterialQualityLevel::Num; QualityLevelIndex++)
 				{
-					if (!OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx])
-					{
-						OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx] =
-							OwnerMaterialInstance ? OwnerMaterialInstance->AllocatePermutationResource() : OwnerMaterial->AllocateResource();
-					}
-					OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx]->ReleaseShaderMap();
-					OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx]->SetInlineShaderMap(BestShaderMap[FeatureIdx]);
+					OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx] =
+						OwnerMaterialInstance ? OwnerMaterialInstance->AllocatePermutationResource() : OwnerMaterial->AllocateResource();
+					OutMaterialResourcesLoaded[QualityLevelIndex][FeatureIdx]->SetInlineShaderMap(DesiredQLShaderMap);
 				}
 			}
 		}
 	}
 	else
 	{
+		for (FMaterialResource& Resource : LoadedResources)
+		{
+			Resource.RegisterInlineShaderMap();
+		}
+
 		// Apply in 2 passes - first pass is for shader maps without a specified quality level
 		// Second pass is where shader maps with a specified quality level override
 		for (int32 PassIndex = 0; PassIndex < 2; PassIndex++)
@@ -2231,6 +2258,75 @@ bool UMaterial::GetScalarParameterValue(const FMaterialParameterInfo& ParameterI
 	return false;
 }
 
+bool UMaterial::IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<UCurveLinearColor>& Curve, TSoftObjectPtr<UCurveLinearColorAtlas>& Atlas) const
+{
+	// In the case of duplicate parameters with different values, this will return the
+	// first matching expression found, not necessarily the one that's used for rendering
+	UMaterialExpressionScalarParameter* Parameter = nullptr;
+	float TempScalar;
+
+	for (UMaterialExpression* Expression : Expressions)
+	{
+		// Only need to check parameters that match in associated scope
+		if (ParameterInfo.Association == EMaterialParameterAssociation::GlobalParameter)
+		{
+			if (UMaterialExpressionScalarParameter* ExpressionParameter = Cast<UMaterialExpressionScalarParameter>(Expression))
+			{
+				if (ExpressionParameter->IsNamedParameter(ParameterInfo, TempScalar))
+				{
+					OutValue = ExpressionParameter->IsUsedAsAtlasPosition();
+					if (OutValue)
+					{
+						UMaterialExpressionCurveAtlasRowParameter* AtlasParameter = Cast<UMaterialExpressionCurveAtlasRowParameter>(Expression);
+						Curve = TSoftObjectPtr<UCurveLinearColor>(FSoftObjectPath(AtlasParameter->Curve->GetPathName()));
+						Atlas = TSoftObjectPtr<UCurveLinearColorAtlas>(FSoftObjectPath(AtlasParameter->Atlas->GetPathName()));
+					}
+					return true;
+				}
+			}
+			else if (UMaterialExpressionMaterialFunctionCall* FunctionCall = Cast<UMaterialExpressionMaterialFunctionCall>(Expression))
+			{
+				UMaterialFunctionInterface* Function = FunctionCall->MaterialFunction;
+				UMaterialFunctionInterface* ParameterOwner = nullptr;
+
+				if (Function && Function->GetNamedParameterOfType(ParameterInfo, Parameter, &ParameterOwner))
+				{
+					OutValue = Parameter->IsUsedAsAtlasPosition();
+					if (OutValue)
+					{
+						UMaterialExpressionCurveAtlasRowParameter* AtlasParameter = Cast<UMaterialExpressionCurveAtlasRowParameter>(Expression);
+						Curve = TSoftObjectPtr<UCurveLinearColor>(FSoftObjectPath(AtlasParameter->Curve->GetPathName()));
+						Atlas = TSoftObjectPtr<UCurveLinearColorAtlas>(FSoftObjectPath(AtlasParameter->Atlas->GetPathName()));
+					}
+					return true;
+				}
+			}
+		}
+		else
+		{
+			if (UMaterialExpressionMaterialAttributeLayers* LayersExpression = Cast<UMaterialExpressionMaterialAttributeLayers>(Expression))
+			{
+				UMaterialFunctionInterface* Function = LayersExpression->GetParameterAssociatedFunction(ParameterInfo);
+				UMaterialFunctionInterface* ParameterOwner = nullptr;
+
+				if (Function && Function->GetNamedParameterOfType(ParameterInfo, Parameter, &ParameterOwner))
+				{
+					OutValue = Parameter->IsUsedAsAtlasPosition();
+					if (OutValue)
+					{
+						UMaterialExpressionCurveAtlasRowParameter* AtlasParameter = Cast<UMaterialExpressionCurveAtlasRowParameter>(Expression);
+						Curve = TSoftObjectPtr<UCurveLinearColor>(FSoftObjectPath(AtlasParameter->Curve->GetPathName()));
+						Atlas = TSoftObjectPtr<UCurveLinearColorAtlas>(FSoftObjectPath(AtlasParameter->Atlas->GetPathName()));
+					}
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 bool UMaterial::GetScalarParameterSliderMinMax(const FMaterialParameterInfo& ParameterInfo, float& OutSliderMin, float& OutSliderMax) const
 {
 	// In the case of duplicate parameters with different values, this will return the
@@ -3201,10 +3297,10 @@ const FMaterialResource* UMaterial::GetMaterialResource(ERHIFeatureLevel::Type I
 void UMaterial::Serialize(FArchive& Ar)
 {
 	LLM_SCOPE(ELLMTag::Materials);
-
 	SCOPED_LOADTIMER(MaterialSerializeTime);
 
 	Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
+	Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
 
 	Super::Serialize(Ar);
 
@@ -3280,6 +3376,19 @@ void UMaterial::Serialize(FArchive& Ar)
 			BlendMode = BLEND_Translucent;
 		}
 	}
+#if WITH_EDITOR
+	if (Ar.IsSaving() && Ar.IsCooking() && Ar.IsPersistent() && !Ar.IsObjectReferenceCollector() && FShaderCodeLibrary::NeedsShaderStableKeys())
+	{
+		SaveShaderStableKeys(Ar.CookingTarget());
+	}
+#endif
+
+	if (Ar.CustomVer(FAthenaObjectVersion::GUID) < FAthenaObjectVersion::CachedMaterialQualityNodeUsage)
+	{
+		TArray<bool, TInlineAllocator<EMaterialQualityLevel::Num>> QualityLevelsUsed;
+		GetQualityLevelNodeUsage(QualityLevelsUsed);
+		CachedQualityLevelsUsed = QualityLevelsUsed;
+	}
 }
 
 void UMaterial::PostDuplicate(bool bDuplicateForPIE)
@@ -3332,7 +3441,21 @@ void UMaterial::BackwardsCompatibilityInputConversion()
 
 void UMaterial::GetQualityLevelUsage(TArray<bool, TInlineAllocator<EMaterialQualityLevel::Num> >& OutQualityLevelsUsed, EShaderPlatform ShaderPlatform)
 {
+#if WITH_EDITOR
 	GetQualityLevelNodeUsage(OutQualityLevelsUsed);
+	CachedQualityLevelsUsed = OutQualityLevelsUsed;
+#else
+	if (CachedQualityLevelsUsed.Num() != EMaterialQualityLevel::Num)
+	{
+		// Allow an initial call to cache the data during PostInit
+		// which will return default values and be updated later
+		GetQualityLevelNodeUsage(OutQualityLevelsUsed);
+	}
+	else
+	{
+		OutQualityLevelsUsed = CachedQualityLevelsUsed;
+	}
+#endif
 
 	// OR in the quality overrides if we're a valid shader platform
 	if (ShaderPlatform != SP_NumPlatforms)
@@ -3682,8 +3805,61 @@ void UMaterial::PostLoad()
 		FixCommentPositions(EditorComments);
 	}
 #endif // #if WITH_EDITOR
+
+	//DumpDebugInfo();
 }
 
+void UMaterial::DumpDebugInfo()
+{
+	UE_LOG(LogConsoleResponse, Display, TEXT("----------------------------- %s"), *GetFullName());
+
+	{
+		static const UEnum* Enum = FindObject<UEnum>(ANY_PACKAGE, TEXT("EMaterialDomain"));
+		check(Enum);
+		UE_LOG(LogConsoleResponse, Display, TEXT("  MaterialDomain %s"), *Enum->GetNameStringByValue(int64(MaterialDomain)));
+	}
+
+	for (int32 QualityLevel = 0; QualityLevel < EMaterialQualityLevel::Num; QualityLevel++)
+	{
+		for (int32 FeatureLevel = 0; FeatureLevel < ERHIFeatureLevel::Num; FeatureLevel++)
+		{
+			if (MaterialResources[QualityLevel][FeatureLevel])
+			{
+				MaterialResources[QualityLevel][FeatureLevel]->DumpDebugInfo();
+			}
+		}
+	}
+}
+
+void UMaterial::SaveShaderStableKeys(const class ITargetPlatform* TP)
+{
+#if WITH_EDITOR
+	FStableShaderKeyAndValue SaveKeyVal;
+	SetCompactFullNameFromObject(SaveKeyVal.ClassNameAndObjectPath, this);
+	SaveShaderStableKeysInner(TP, SaveKeyVal);
+#endif
+}
+
+void UMaterial::SaveShaderStableKeysInner(const class ITargetPlatform* TP, const FStableShaderKeyAndValue& InSaveKeyVal)
+{
+#if WITH_EDITOR
+	FStableShaderKeyAndValue SaveKeyVal(InSaveKeyVal);
+	SaveKeyVal.MaterialDomain = FName(*MaterialDomainString(MaterialDomain));
+	TArray<FMaterialResource*>* MatRes = CachedMaterialResourcesForCooking.Find(TP);
+	if (MatRes)
+	{
+		for (FMaterialResource* Mat : *MatRes)
+		{
+			if (Mat)
+			{
+				Mat->SaveShaderStableKeys(EShaderPlatform::SP_NumPlatforms, SaveKeyVal);
+			}
+		}
+	}
+#endif
+}
+
+
 void UMaterial::PropagateDataToMaterialProxy()
 {
 	for (int32 i = 0; i < ARRAY_COUNT(DefaultMaterialInstances); i++)
@@ -4001,7 +4177,6 @@ void UMaterial::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEve
 		MaterialGraph->NotifyGraphChanged();
 	}
 } 
-#endif // WITH_EDITOR
 
 bool UMaterial::AddExpressionParameter(UMaterialExpression* Expression, TMap<FName, TArray<UMaterialExpression*> >& ParameterTypeMap)
 {
@@ -4058,7 +4233,6 @@ bool UMaterial::AddExpressionParameter(UMaterialExpression* Expression, TMap<FNa
 	return bRet;
 }
 
-
 bool UMaterial::RemoveExpressionParameter(UMaterialExpression* Expression)
 {
 	FName ParmName;
@@ -4075,7 +4249,7 @@ bool UMaterial::RemoveExpressionParameter(UMaterialExpression* Expression)
 
 	return false;
 }
-
+#endif // WITH_EDITOR
 
 bool UMaterial::IsParameter(const UMaterialExpression* Expression)
 {
@@ -4108,8 +4282,7 @@ bool UMaterial::IsDynamicParameter(const UMaterialExpression* Expression)
 	return false;
 }
 
-
-
+#if WITH_EDITOR
 void UMaterial::BuildEditorParameterList()
 {
 	EditorParameters.Empty();
@@ -4120,7 +4293,6 @@ void UMaterial::BuildEditorParameterList()
 	}
 }
 
-
 bool UMaterial::HasDuplicateParameters(const UMaterialExpression* Expression)
 {
 	FName ExpressionName;
@@ -4145,7 +4317,6 @@ bool UMaterial::HasDuplicateParameters(const UMaterialExpression* Expression)
 	return false;
 }
 
-
 bool UMaterial::HasDuplicateDynamicParameters(const UMaterialExpression* Expression)
 {
 	const UMaterialExpressionDynamicParameter* DynParam = Cast<UMaterialExpressionDynamicParameter>(Expression);
@@ -4162,7 +4333,7 @@ bool UMaterial::HasDuplicateDynamicParameters(const UMaterialExpression* Express
 	}
 	return false;
 }
-
+#endif // WITH_EDITOR
 
 void UMaterial::UpdateExpressionDynamicParameters(const UMaterialExpression* Expression)
 {
@@ -4182,7 +4353,7 @@ void UMaterial::UpdateExpressionDynamicParameters(const UMaterialExpression* Exp
 	}
 }
 
-
+#if WITH_EDITOR
 void UMaterial::PropagateExpressionParameterChanges(UMaterialExpression* Parameter)
 {
 	FName ParmName;
@@ -4206,7 +4377,6 @@ void UMaterial::PropagateExpressionParameterChanges(UMaterialExpression* Paramet
 	}
 }
 
-
 void UMaterial::UpdateExpressionParameterName(UMaterialExpression* Expression)
 {
 	FName ExpressionName;
@@ -4225,7 +4395,7 @@ void UMaterial::UpdateExpressionParameterName(UMaterialExpression* Expression)
 		}
 	}
 }
-
+#endif // WITH_EDITOR
 
 bool UMaterial::GetExpressionParameterName(const UMaterialExpression* Expression, FName& OutName)
 {
@@ -4754,29 +4924,74 @@ void UMaterial::GetAllExpressionsForCustomInterpolators(TArray<class UMaterialEx
 }
 
 #if WITH_EDITOR
-bool UMaterial::GetAllReferencedExpressions(TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet)
+bool UMaterial::GetAllReferencedExpressions(TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+	ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality)
 {
 	OutExpressions.Empty();
 
-	for (int32 MPIdx = 0; MPIdx < MP_MAX; MPIdx++)
+	// For mobile only consider nodes connected to material properties that affect mobile, and exclude any custom outputs
+	if (InFeatureLevel <= ERHIFeatureLevel::ES3_1)
 	{
-		EMaterialProperty MaterialProp = EMaterialProperty(MPIdx);
-		TArray<UMaterialExpression*> MPRefdExpressions;
-		if (GetExpressionsInPropertyChain(MaterialProp, MPRefdExpressions, InStaticParameterSet) == true)
+		if (bUseMaterialAttributes)
 		{
-			for (int32 AddIdx = 0; AddIdx < MPRefdExpressions.Num(); AddIdx++)
+			TArray<UMaterialExpression*> MPRefdExpressions;
+			if (GetExpressionsInPropertyChain(MP_MaterialAttributes, MPRefdExpressions, InStaticParameterSet, InFeatureLevel, InQuality) == true)
 			{
-				OutExpressions.AddUnique(MPRefdExpressions[AddIdx]);
+				for (int32 AddIdx = 0; AddIdx < MPRefdExpressions.Num(); AddIdx++)
+				{
+					OutExpressions.AddUnique(MPRefdExpressions[AddIdx]);
+				}
+			}
+		}
+		else
+		{
+			EMaterialProperty MobileRelevantMaterialProperties[] =
+			{
+				MP_EmissiveColor,
+				MP_OpacityMask,
+				MP_BaseColor,
+				MP_Normal,
+				MP_WorldPositionOffset,
+				MP_WorldDisplacement,
+				MP_TessellationMultiplier,
+			};
+
+
+			for (EMaterialProperty MaterialProp : MobileRelevantMaterialProperties)
+			{
+				TArray<UMaterialExpression*> MPRefdExpressions;
+				if (GetExpressionsInPropertyChain(MaterialProp, MPRefdExpressions, InStaticParameterSet, InFeatureLevel, InQuality) == true)
+				{
+					for (int32 AddIdx = 0; AddIdx < MPRefdExpressions.Num(); AddIdx++)
+					{
+						OutExpressions.AddUnique(MPRefdExpressions[AddIdx]);
+					}
+				}
 			}
 		}
 	}
-
-	TArray<class UMaterialExpressionCustomOutput*> CustomOutputExpressions;
-	GetAllCustomOutputExpressions(CustomOutputExpressions);
-	for (UMaterialExpressionCustomOutput* Expression : CustomOutputExpressions)
+	else
 	{
-		TArray<FExpressionInput*> ProcessedInputs;
-		RecursiveGetExpressionChain(Expression, ProcessedInputs, OutExpressions, InStaticParameterSet);
+	    for (int32 MPIdx = 0; MPIdx < MP_MAX; MPIdx++)
+	    {
+		    EMaterialProperty MaterialProp = EMaterialProperty(MPIdx);
+		    TArray<UMaterialExpression*> MPRefdExpressions;
+			if (GetExpressionsInPropertyChain(MaterialProp, MPRefdExpressions, InStaticParameterSet, InFeatureLevel, InQuality) == true)
+			{
+			    for (int32 AddIdx = 0; AddIdx < MPRefdExpressions.Num(); AddIdx++)
+			    {
+				    OutExpressions.AddUnique(MPRefdExpressions[AddIdx]);
+			    }
+		    }
+	    }
+    
+	    TArray<class UMaterialExpressionCustomOutput*> CustomOutputExpressions;
+	    GetAllCustomOutputExpressions(CustomOutputExpressions);
+	    for (UMaterialExpressionCustomOutput* Expression : CustomOutputExpressions)
+	    {
+		    TArray<FExpressionInput*> ProcessedInputs;
+			RecursiveGetExpressionChain(Expression, ProcessedInputs, OutExpressions, InStaticParameterSet, InFeatureLevel, InQuality);
+		}
 	}
 
 	return true;
@@ -4784,7 +4999,8 @@ bool UMaterial::GetAllReferencedExpressions(TArray<UMaterialExpression*>& OutExp
 
 
 bool UMaterial::GetExpressionsInPropertyChain(EMaterialProperty InProperty, 
-	TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet)
+	TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+	ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality)
 {
 	OutExpressions.Empty();
 	FExpressionInput* StartingExpression = GetExpressionInputForProperty(InProperty);
@@ -4799,7 +5015,7 @@ bool UMaterial::GetExpressionsInPropertyChain(EMaterialProperty InProperty,
 	if (StartingExpression->Expression)
 	{
 		ProcessedInputs.AddUnique(StartingExpression);
-		RecursiveGetExpressionChain(StartingExpression->Expression, ProcessedInputs, OutExpressions, InStaticParameterSet);
+		RecursiveGetExpressionChain(StartingExpression->Expression, ProcessedInputs, OutExpressions, InStaticParameterSet, InFeatureLevel, InQuality);
 	}
 	return true;
 }
@@ -4896,11 +5112,12 @@ bool UMaterial::GetGroupSortPriority(const FString& InGroupName, int32& OutSortP
 	return false;
 }
 
-bool UMaterial::GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,  
-	TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet)
+bool UMaterial::GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,
+	TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet,
+	ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality)
 {
 	TArray<UMaterialExpression*> ChainExpressions;
-	if (GetExpressionsInPropertyChain(InProperty, ChainExpressions, InStaticParameterSet) == true)
+	if (GetExpressionsInPropertyChain(InProperty, ChainExpressions, InStaticParameterSet, InFeatureLevel, InQuality) == true)
 	{
 		// Extract the texture and texture parameter expressions...
 		for (int32 ExpressionIdx = 0; ExpressionIdx < ChainExpressions.Num(); ExpressionIdx++)
@@ -4939,10 +5156,54 @@ bool UMaterial::GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<
 #endif // WITH_EDITOR
 
 bool UMaterial::RecursiveGetExpressionChain(UMaterialExpression* InExpression, TArray<FExpressionInput*>& InOutProcessedInputs, 
-	TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet)
+	TArray<UMaterialExpression*>& OutExpressions, struct FStaticParameterSet* InStaticParameterSet,
+	ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality)
 {
 	OutExpressions.AddUnique(InExpression);
-	TArray<FExpressionInput*> Inputs = InExpression->GetInputs();
+	TArray<FExpressionInput*> Inputs;
+	
+	UMaterialExpressionFeatureLevelSwitch* FeatureLevelSwitchExp;
+	UMaterialExpressionQualitySwitch* QualitySwitchExp;
+	UMaterialExpressionMakeMaterialAttributes* MakeMaterialAttributesExp;
+
+	if (InFeatureLevel != ERHIFeatureLevel::Num && (FeatureLevelSwitchExp = Cast<UMaterialExpressionFeatureLevelSwitch>(InExpression)) != nullptr)
+	{
+		if (FeatureLevelSwitchExp->Inputs[InFeatureLevel].IsConnected())
+		{
+			Inputs.Add(&FeatureLevelSwitchExp->Inputs[InFeatureLevel]);
+		}
+		else
+		{
+			Inputs.Add(&FeatureLevelSwitchExp->Default);
+		}
+	}
+	else if (InQuality != EMaterialQualityLevel::Num && (QualitySwitchExp = Cast<UMaterialExpressionQualitySwitch>(InExpression)) != nullptr)
+	{
+		if (QualitySwitchExp->Inputs[InQuality].IsConnected())
+		{
+			Inputs.Add(&QualitySwitchExp->Inputs[InQuality]);
+		}
+		else
+		{
+			Inputs.Add(&QualitySwitchExp->Default);
+		}
+	}
+	else if (InFeatureLevel <= ERHIFeatureLevel::ES3_1 && (MakeMaterialAttributesExp = Cast<UMaterialExpressionMakeMaterialAttributes>(InExpression)) != nullptr)
+	{
+		// Follow only mobile-relevant inputs
+		Inputs.Add(&MakeMaterialAttributesExp->EmissiveColor);
+		Inputs.Add(&MakeMaterialAttributesExp->OpacityMask);
+		Inputs.Add(&MakeMaterialAttributesExp->BaseColor);
+		Inputs.Add(&MakeMaterialAttributesExp->Normal);
+		Inputs.Add(&MakeMaterialAttributesExp->WorldPositionOffset);
+		Inputs.Add(&MakeMaterialAttributesExp->WorldDisplacement);
+		Inputs.Add(&MakeMaterialAttributesExp->TessellationMultiplier);
+	}
+	else
+	{
+		Inputs = InExpression->GetInputs();
+	}
+
 	for (int32 InputIdx = 0; InputIdx < Inputs.Num(); InputIdx++)
 	{
 		FExpressionInput* InnerInput = Inputs[InputIdx];
@@ -4998,7 +5259,7 @@ bool UMaterial::RecursiveGetExpressionChain(UMaterialExpression* InExpression, T
 					if (bProcessInput == true)
 					{
 						InOutProcessedInputs.Add(InnerInput);
-						RecursiveGetExpressionChain(InnerInput->Expression, InOutProcessedInputs, OutExpressions, InStaticParameterSet);
+						RecursiveGetExpressionChain(InnerInput->Expression, InOutProcessedInputs, OutExpressions, InStaticParameterSet, InFeatureLevel, InQuality);
 					}
 				}
 			}
@@ -5041,11 +5302,13 @@ void UMaterial::AppendReferencedTextures(TArray<UTexture*>& InOutTextures) const
 		// Not all expressions are cooked
 		else if (Expression)
 		{
+			// Append even if null as textures can be stripped at cook without our knowledge
+			// so we want to maintain the indices. This will waste a small amount of memory
 			UTexture* ReferencedTexture = Expression->GetReferencedTexture();
-
-			if (ReferencedTexture)
+			checkf(!ReferencedTexture || Expression->CanReferenceTexture(), TEXT("This expression type missing an override for CanReferenceTexture?"));
+			if (Expression->CanReferenceTexture())
 			{
-				InOutTextures.AddUnique(ReferencedTexture);
+				InOutTextures.Add(ReferencedTexture);
 			}
 		}
 	}
@@ -5383,6 +5646,14 @@ bool UMaterial::IsPropertyActive(EMaterialProperty InProperty) const
 				return InProperty == MP_EmissiveColor
 					|| InProperty == MP_Opacity;
 
+			case DBM_AlphaComposite:
+				return InProperty == MP_EmissiveColor
+					|| InProperty == MP_Metallic
+					|| InProperty == MP_Specular
+					|| InProperty == MP_BaseColor
+					|| InProperty == MP_Roughness
+					|| InProperty == MP_Opacity;
+
 			case DBM_DBuffer_ColorNormalRoughness:
 				return InProperty == MP_Normal
 					|| InProperty == MP_BaseColor
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialExpressions.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialExpressions.cpp
index a1c707685efd..01ba7f661a85 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialExpressions.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialExpressions.cpp
@@ -203,6 +203,7 @@
 #include "Materials/MaterialExpressionAtmosphericLightVector.h"
 #include "Materials/MaterialExpressionAtmosphericLightColor.h"
 #include "Materials/MaterialExpressionMaterialLayerOutput.h"
+#include "Materials/MaterialExpressionCurveAtlasRowParameter.h"
 #include "EditorSupportDelegates.h"
 #include "MaterialCompiler.h"
 #if WITH_EDITOR
@@ -212,6 +213,7 @@
 #include "Widgets/Notifications/SNotificationList.h"
 #endif //WITH_EDITOR
 #include "Materials/MaterialInstanceConstant.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 #define LOCTEXT_NAMESPACE "MaterialExpression"
 
@@ -598,7 +600,7 @@ bool UMaterialExpression::NeedsLoadForClient() const
 {
 	// Expressions that reference texture objects need to be cooked
 	UMaterialExpression* MutableThis = const_cast<UMaterialExpression*>(this);
-	return MutableThis->GetReferencedTexture() != nullptr;
+	return MutableThis->GetReferencedTexture() != nullptr || CanReferenceTexture();
 }
 
 void UMaterialExpression::PostInitProperties()
@@ -1395,6 +1397,10 @@ bool UMaterialExpressionTextureSample::CanEditChange(const UProperty* InProperty
 			// The Texture property is overridden by a connection to TextureObject
 			bIsEditable = TextureObject.GetTracedInput().Expression == NULL;
 		}
+		else if (PropertyFName == GET_MEMBER_NAME_CHECKED(UMaterialExpressionTextureSample, AutomaticViewMipBias))
+		{
+			bIsEditable = AutomaticViewMipBiasValue.GetTracedInput().Expression == NULL;
+		}
 	}
 
 	return bIsEditable;
@@ -1473,6 +1479,8 @@ FExpressionInput* UMaterialExpressionTextureSample::GetInput(int32 InputIndex)
 		IF_INPUT_RETURN(MipValue);
 	}
 
+	IF_INPUT_RETURN(AutomaticViewMipBiasValue);
+
 	return NULL;
 }
 #undef IF_INPUT_RETURN
@@ -1502,6 +1510,8 @@ FName UMaterialExpressionTextureSample::GetInputName(int32 InputIndex) const
 		IF_INPUT_RETURN(CoordinatesDY, TEXT("DDY(UVs)"));
 	}
 
+	IF_INPUT_RETURN(AutomaticViewMipBiasValue, TEXT("View MipBias"));
+
 	return TEXT("");
 }
 #undef IF_INPUT_RETURN
@@ -1571,6 +1581,18 @@ int32 UMaterialExpressionTextureSample::Compile(class FMaterialCompiler* Compile
 		int32 TextureReferenceIndex = INDEX_NONE;
 		int32 TextureCodeIndex = INDEX_NONE;
 
+		bool bDoAutomaticViewMipBias = AutomaticViewMipBias;
+		if (AutomaticViewMipBiasValue.GetTracedInput().Expression)
+		{
+			bool bSucceeded;
+			bool bValue = Compiler->GetStaticBoolValue(AutomaticViewMipBiasValue.Compile(Compiler), bSucceeded);
+
+			if (bSucceeded)
+			{
+				bDoAutomaticViewMipBias = bValue;
+			}
+		}
+
 		if (InputExpression)
 		{
 			TextureCodeIndex = TextureObject.Compile(Compiler);
@@ -1660,7 +1682,7 @@ int32 UMaterialExpressionTextureSample::Compile(class FMaterialCompiler* Compile
 				MipValueMode,
 				SamplerSource,
 				TextureReferenceIndex,
-				AutomaticViewMipBias);
+				bDoAutomaticViewMipBias);
 		}
 		else
 		{
@@ -1716,6 +1738,8 @@ uint32 UMaterialExpressionTextureSample::GetInputType(int32 InputIndex)
 		IF_INPUT_RETURN(CoordinatesDY, MCT_Float);
 	}
 
+	IF_INPUT_RETURN(AutomaticViewMipBiasValue, MCT_StaticBool);
+
 	return MCT_Unknown;
 }
 #undef IF_INPUT_RETURN
@@ -2189,7 +2213,7 @@ bool UMaterialExpressionTextureSampleParameter2D::TextureIsValid( UTexture* InTe
 	bool Result=false;
 	if (InTexture)		
 	{
-		if( InTexture->GetClass() == UTexture2D::StaticClass() ) 
+		if (InTexture->IsA(UTexture2D::StaticClass()))
 		{
 			Result = true;
 		}
@@ -4679,8 +4703,21 @@ void UMaterialExpressionGetMaterialAttributes::PostEditChangeProperty(FPropertyC
 	{
 		if (PreEditAttributeGetTypes.Num() < AttributeGetTypes.Num())
 		{
-			// Attribute type added
+			// Attribute type added so default out type
 			AttributeGetTypes.Last() = FMaterialAttributeDefinitionMap::GetDefaultID();
+
+			// Attempt to find a valid attribute that's not already listed
+			const TArray<FGuid>& OrderedVisibleAttributes = FMaterialAttributeDefinitionMap::GetOrderedVisibleAttributeList();
+			for (const FGuid& AttributeID : OrderedVisibleAttributes)
+			{
+				if (PreEditAttributeGetTypes.Find(AttributeID) == INDEX_NONE)
+				{
+					 AttributeGetTypes.Last() = AttributeID;
+					 break;
+				}
+			}
+		
+			// Copy final defaults to new output
 			FString AttributeName = FMaterialAttributeDefinitionMap::GetDisplayName(AttributeGetTypes.Last());
 			Outputs.Add(FExpressionOutput(*AttributeName, 0, 0, 0, 0, 0));
 
@@ -4891,8 +4928,21 @@ void UMaterialExpressionSetMaterialAttributes::PostEditChangeProperty(FPropertyC
 	{
 		if (PreEditAttributeSetTypes.Num() < AttributeSetTypes.Num())
 		{
-			// Attribute type added
+			// Attribute type added so default out type
 			AttributeSetTypes.Last() = FMaterialAttributeDefinitionMap::GetDefaultID();
+
+			// Attempt to find a valid attribute that's not already listed
+			const TArray<FGuid>& OrderedVisibleAttributes = FMaterialAttributeDefinitionMap::GetOrderedVisibleAttributeList();
+			for (const FGuid& AttributeID : OrderedVisibleAttributes)
+			{
+				if (PreEditAttributeSetTypes.Find(AttributeID) == INDEX_NONE)
+				{
+					 AttributeSetTypes.Last() = AttributeID;
+					 break;
+				}
+			}
+		
+			// Copy final defaults to new input
 			Inputs.Add(FExpressionInput());
 			GraphNode->ReconstructNode();
 		}	 
@@ -5063,6 +5113,8 @@ FName UMaterialExpressionBlendMaterialAttributes::GetInputName(int32 InputIndex)
 //
 UMaterialExpressionMaterialAttributeLayers::UMaterialExpressionMaterialAttributeLayers(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)	
+	, NumActiveLayerCallers(0)
+	, NumActiveBlendCallers(0)
 	, bIsLayerGraphBuilt(false)
 	, ParamLayers(nullptr)
 {
@@ -5123,10 +5175,22 @@ void UMaterialExpressionMaterialAttributeLayers::RebuildLayerGraph(bool bReportE
 	const TArray<UMaterialFunctionInterface*>& Layers = GetLayers();
 	const TArray<UMaterialFunctionInterface*>& Blends = GetBlends();
 	const TArray<bool>& LayerStates = GetLayerStates();
+	
+	// Pre-populate callers, we maintain these transient objects to avoid
+	// heavy UObject recreation as the graphs are frequently rebuilt
+	while (LayerCallers.Num() < Layers.Num())
+	{
+		LayerCallers.Add(NewObject<UMaterialExpressionMaterialFunctionCall>(GetTransientPackage()));
+	}
+	while (BlendCallers.Num() < Blends.Num())
+	{
+		BlendCallers.Add(NewObject<UMaterialExpressionMaterialFunctionCall>(GetTransientPackage()));
+	}
 
+	// Reset graph connectivity
 	bIsLayerGraphBuilt = false;
-	LayerCallers.Empty(Layers.Num());
-	BlendCallers.Empty(Blends.Num());
+	NumActiveLayerCallers = 0;
+	NumActiveBlendCallers = 0;
 
 	if (ValidateLayerConfiguration(nullptr, bReportErrors))
 	{
@@ -5135,10 +5199,11 @@ void UMaterialExpressionMaterialAttributeLayers::RebuildLayerGraph(bool bReportE
 		{
 			if (Layers[LayerIndex] && LayerStates[LayerIndex])
 			{
-				int32 CallerIndex = LayerCallers.Add(NewObject<UMaterialExpressionMaterialFunctionCall>(GetTransientPackage()));
+				int32 CallerIndex = NumActiveLayerCallers;
 				LayerCallers[CallerIndex]->MaterialFunction = Layers[LayerIndex];
 				LayerCallers[CallerIndex]->FunctionParameterInfo.Association = EMaterialParameterAssociation::LayerParameter;
 				LayerCallers[CallerIndex]->FunctionParameterInfo.Index = LayerIndex;
+				++NumActiveLayerCallers;
 
 #if WITH_EDITOR
 				Layers[LayerIndex]->GetInputsAndOutputs(LayerCallers[CallerIndex]->FunctionInputs, LayerCallers[CallerIndex]->FunctionOutputs);
@@ -5156,7 +5221,7 @@ void UMaterialExpressionMaterialAttributeLayers::RebuildLayerGraph(bool bReportE
 					}
 				}
 
-				// Recursively run through internal functions to allow connection of inputs/ouputs
+				// Recursively run through internal functions to allow connection of inputs/outputs
 				LayerCallers[CallerIndex]->UpdateFromFunctionResource();
 #endif
 			}
@@ -5167,9 +5232,11 @@ void UMaterialExpressionMaterialAttributeLayers::RebuildLayerGraph(bool bReportE
 			const int32 LayerIndex = BlendIndex + 1;
 			if (Layers[LayerIndex] && LayerStates[LayerIndex])
 			{
+				int32 CallerIndex = NumActiveBlendCallers;
+				++NumActiveBlendCallers;
+
 				if (Blends[BlendIndex])
 				{
-					int32 CallerIndex = BlendCallers.Add(NewObject<UMaterialExpressionMaterialFunctionCall>(GetTransientPackage()));
 					BlendCallers[CallerIndex]->MaterialFunction = Blends[BlendIndex];
 					BlendCallers[CallerIndex]->FunctionParameterInfo.Association = EMaterialParameterAssociation::BlendParameter;
 					BlendCallers[CallerIndex]->FunctionParameterInfo.Index = BlendIndex;
@@ -5188,28 +5255,39 @@ void UMaterialExpressionMaterialAttributeLayers::RebuildLayerGraph(bool bReportE
 				else
 				{
 					// Empty entries for opaque layers
-					BlendCallers.Add(nullptr);
+					BlendCallers[CallerIndex]->MaterialFunction = nullptr;
 				}
 			}
 		}
 
+		// Empty out unused callers
+		for (int32 CallerIndex = NumActiveLayerCallers; CallerIndex < LayerCallers.Num(); ++CallerIndex)
+		{
+			LayerCallers[CallerIndex]->MaterialFunction = nullptr;
+		}
+
+		for (int32 CallerIndex = NumActiveBlendCallers; CallerIndex < BlendCallers.Num(); ++CallerIndex)
+		{
+			BlendCallers[CallerIndex]->MaterialFunction = nullptr;
+		}
+
 #if WITH_EDITOR
 		// Assemble function chain so each layer blends with the previous
-		if (LayerCallers.Num() >= 2 && BlendCallers.Num() >= 1)
+		if (NumActiveLayerCallers >= 2 && NumActiveBlendCallers >= 1)
 		{
-			if (BlendCallers[0])
+			if (BlendCallers[0]->MaterialFunction)
 			{
 				BlendCallers[0]->FunctionInputs[0].Input.Connect(0, LayerCallers[0]);
 				BlendCallers[0]->FunctionInputs[1].Input.Connect(0, LayerCallers[1]);
 			}
 
-			for (int32 LayerIndex = 2; LayerIndex < LayerCallers.Num(); ++LayerIndex)
+			for (int32 LayerIndex = 2; LayerIndex < NumActiveLayerCallers; ++LayerIndex)
 			{
-				if (BlendCallers[LayerIndex - 1])
+				if (BlendCallers[LayerIndex - 1]->MaterialFunction)
 				{
 					// Active blend input is previous blend or direct layer if previous is opaque
 					UMaterialExpressionMaterialFunctionCall* BlendInput = BlendCallers[LayerIndex - 2];
-					BlendInput = BlendInput ? BlendInput : LayerCallers[LayerIndex - 1];
+					BlendInput = BlendInput->MaterialFunction ? BlendInput : LayerCallers[LayerIndex - 1];
 
 					BlendCallers[LayerIndex - 1]->FunctionInputs[0].Input.Connect(0, BlendInput);
 					BlendCallers[LayerIndex - 1]->FunctionInputs[1].Input.Connect(0, LayerCallers[LayerIndex]);
@@ -5443,17 +5521,17 @@ int32 UMaterialExpressionMaterialAttributeLayers::Compile(FMaterialCompiler* Com
 
 	if (ValidateLayerConfiguration(Compiler, true) && bIsLayerGraphBuilt)
 	{
-		if (BlendCallers.Num() && BlendCallers.Last())
+		if (NumActiveBlendCallers > 0 && BlendCallers[NumActiveBlendCallers-1]->MaterialFunction)
 		{
 			// Multiple blended layers
-			Result = BlendCallers.Last()->Compile(Compiler, 0);
+			Result = BlendCallers[NumActiveBlendCallers-1]->Compile(Compiler, 0);
 		}
-		else if (LayerCallers.Num() && LayerCallers.Last())
+		else if (NumActiveLayerCallers > 0 && LayerCallers[NumActiveLayerCallers-1]->MaterialFunction)
 		{
 			// Single layer
-			Result = LayerCallers.Last()->Compile(Compiler, 0);
+			Result = LayerCallers[NumActiveLayerCallers-1]->Compile(Compiler, 0);
 		}
-		else if (LayerCallers.Num() == 0)
+		else if (NumActiveLayerCallers == 0)
 		{
 			// Pass-through
 			const FGuid AttributeID = Compiler->GetMaterialAttribute();
@@ -9851,15 +9929,15 @@ int32 UMaterialFunction::Compile(FMaterialCompiler* Compiler, const FFunctionExp
 
 	if (ValidateFunctionUsage(Compiler, Output))
 	{
-	if (Output.ExpressionOutput->A.GetTracedInput().Expression)
-	{
-		// Compile the given function output
-		ReturnValue = Output.ExpressionOutput->A.Compile(Compiler);
-	}
-	else
-	{
-		ReturnValue = Compiler->Errorf(TEXT("Missing function output connection '%s'"), *Output.ExpressionOutput->OutputName.ToString());
-	}
+		if (Output.ExpressionOutput->A.GetTracedInput().Expression)
+		{
+			// Compile the given function output
+			ReturnValue = Output.ExpressionOutput->A.Compile(Compiler);
+		}
+		else
+		{
+			ReturnValue = Compiler->Errorf(TEXT("Missing function output connection '%s'"), *Output.ExpressionOutput->OutputName.ToString());
+		}
 	}
 
 	return ReturnValue;
@@ -9976,11 +10054,13 @@ void UMaterialFunction::AppendReferencedTextures(TArray<UTexture*>& InOutTexture
 	{
 		if(CurrentExpression)
 		{
+			// Append even if null as textures can be stripped at cook without our knowledge
+			// so we want to maintain the indices. This will waste a small amount of memory
 			UTexture* ReferencedTexture = CurrentExpression->GetReferencedTexture();
-
-			if (ReferencedTexture)
+			checkf(!ReferencedTexture || CurrentExpression->CanReferenceTexture(), TEXT("This expression type missing an override for CanReferenceTexture?"));
+			if (CurrentExpression->CanReferenceTexture())
 			{
-				InOutTextures.AddUnique(ReferencedTexture);
+				InOutTextures.Add(ReferencedTexture);
 			}
 		}
 	}
@@ -10463,7 +10543,7 @@ void UMaterialFunctionInstance::AppendReferencedTextures(TArray<UTexture*>& InOu
 	// @TODO: This should be able to replace base textures rather than append
 	for (const FTextureParameterValue& TextureParam : TextureParameterValues)
 	{
-		InOutTextures.AddUnique(TextureParam.ParameterValue);
+		InOutTextures.Add(TextureParam.ParameterValue);
 	}
 }
 
@@ -10757,15 +10837,19 @@ int32 UMaterialExpressionMaterialFunctionCall::Compile(class FMaterialCompiler*
 	// Link the function's inputs into the caller graph before entering
 	LinkFunctionIntoCaller(Compiler);
 
+	// Some functions (e.g. layers) don't benefit from re-using state so we locally create one as we did before sharing was added
+	FMaterialFunctionCompileState LocalState(this);
+
 	// Tell the compiler that we are entering a function
-	Compiler->PushFunction(FMaterialFunctionCompileState(this));
+	const int32 ExpressionStackCheckSize = SharedCompileState ? SharedCompileState->ExpressionStack.Num() : 0;
+	Compiler->PushFunction(SharedCompileState ? SharedCompileState : &LocalState);
 
 	// Compile the requested output
 	const int32 ReturnValue = MaterialFunction->Compile(Compiler, FunctionOutputs[OutputIndex]);
 
 	// Tell the compiler that we are leaving a function
-	const FMaterialFunctionCompileState CompileState = Compiler->PopFunction();
-	check(CompileState.ExpressionStack.Num() == 0);
+	FMaterialFunctionCompileState* CompileState = Compiler->PopFunction();
+	check(!SharedCompileState || CompileState->ExpressionStack.Num() == ExpressionStackCheckSize);
 
 	// Restore the function since we are leaving it
 	UnlinkFunctionFromCaller(Compiler);
@@ -11332,7 +11416,18 @@ int32 UMaterialExpressionFunctionInput::CompilePreviewValue(FMaterialCompiler* C
 {
 	if (Preview.GetTracedInput().Expression)
 	{
-		return Preview.Compile(Compiler);
+		int32 ExpressionResult;
+		if (Preview.Expression->GetOuter() == GetOuter())
+		{
+			ExpressionResult = Preview.Compile(Compiler);
+		}
+		else
+		{
+			FMaterialFunctionCompileState* FunctionState = Compiler->PopFunction();
+			ExpressionResult = Preview.Compile(Compiler);
+			Compiler->PushFunction(FunctionState);
+		}
+		return ExpressionResult;
 	}
 	else
 	{
@@ -11395,19 +11490,19 @@ int32 UMaterialExpressionFunctionInput::Compile(class FMaterialCompiler* Compile
 		else
 		{
 			// Tell the compiler that we are leaving the function
-			const FMaterialFunctionCompileState FunctionState = Compiler->PopFunction();
+			FMaterialFunctionCompileState* FunctionState = Compiler->PopFunction();
 
 			// Backup EffectivePreviewDuringCompile which will be modified by UnlinkFromCaller and LinkIntoCaller of any potential chained function calls to the same function
 			FExpressionInput LocalPreviewDuringCompile = EffectivePreviewDuringCompile;
 
 			// Restore the function since we are leaving it
-			FunctionState.FunctionCall->UnlinkFunctionFromCaller(Compiler);
+			FunctionState->FunctionCall->UnlinkFunctionFromCaller(Compiler);
 
 			// Compile the function input
 			ExpressionResult = LocalPreviewDuringCompile.Compile(Compiler);
 
 			// Link the function's inputs into the caller graph before entering
-			FunctionState.FunctionCall->LinkFunctionIntoCaller(Compiler);
+			FunctionState->FunctionCall->LinkFunctionIntoCaller(Compiler);
 
 			// Tell the compiler that we are re-entering the function
 			Compiler->PushFunction(FunctionState);
@@ -14353,4 +14448,93 @@ void UMaterialExpressionPreSkinnedNormal::GetExpressionToolTip(TArray<FString>&
 }
 #endif // WITH_EDITOR
 
+//
+//  UMaterialExpressionCurveAtlasRowParameter
+//
+UMaterialExpressionCurveAtlasRowParameter::UMaterialExpressionCurveAtlasRowParameter(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+#if WITH_EDITORONLY_DATA
+	bCollapsed = true;
+	Outputs.Reset();
+	Outputs.Add(FExpressionOutput(TEXT(""), 1, 1, 1, 1, 0));
+	Outputs.Add(FExpressionOutput(TEXT(""), 1, 1, 0, 0, 0));
+	Outputs.Add(FExpressionOutput(TEXT(""), 1, 0, 1, 0, 0));
+	Outputs.Add(FExpressionOutput(TEXT(""), 1, 0, 0, 1, 0));
+	Outputs.Add(FExpressionOutput(TEXT(""), 1, 0, 0, 0, 1));
+#endif // WITH_EDITORONLY_DATA
+
+}
+
+UTexture* UMaterialExpressionCurveAtlasRowParameter::GetReferencedTexture()
+{
+	return Atlas;
+};
+
+#if WITH_EDITOR
+
+void UMaterialExpressionCurveAtlasRowParameter::GetTexturesForceMaterialRecompile(TArray<UTexture *> &Textures) const
+{	
+	if (Atlas)
+	{
+		Textures.AddUnique(Atlas);
+	}
+}
+
+
+int32 UMaterialExpressionCurveAtlasRowParameter::Compile(class FMaterialCompiler* Compiler, int32 OutputIndex)
+{
+	// Need to recalculate the row index b/c a recompile could be triggered from the texture changing
+	int32 SlotIndex = INDEX_NONE;
+	if (Atlas && Curve)
+	{
+		SlotIndex = Atlas->GradientCurves.Find(Curve);
+	}
+	if (SlotIndex != INDEX_NONE)
+	{
+		float NewValue = ((float)SlotIndex * Atlas->GradientPixelSize) / Atlas->TextureSize + (0.5f * Atlas->GradientPixelSize) / Atlas->TextureSize;
+		SetParameterValue(ParameterName, NewValue);
+	}
+	// if the input is hooked up, use it, otherwise use the internal constant
+	int32 Arg1 = InputTime.GetTracedInput().Expression ? InputTime.Compile(Compiler) : Compiler->Constant(0);
+	int32 Arg2 = Compiler->ScalarParameter(ParameterName, DefaultValue);
+
+	int32 UV = Compiler->AppendVector(Arg1, Arg2);
+	return CompileTextureSample(
+		Compiler,
+		Atlas,
+		UV,
+		SAMPLERTYPE_LinearColor,
+		TOptional<FName>(),
+		INDEX_NONE,
+		INDEX_NONE,
+		TMVM_None,
+		SSM_Clamp_WorldGroupSettings);
+}
+
+void UMaterialExpressionCurveAtlasRowParameter::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	if (PropertyChangedEvent.Property 
+		&& (PropertyChangedEvent.Property->GetName() == TEXT("Atlas") || PropertyChangedEvent.Property->GetName() == TEXT("Curve")))
+	{
+		int32 SlotIndex = INDEX_NONE;
+		if (Atlas && Curve)
+		{
+			SlotIndex = Atlas->GradientCurves.Find(Curve);
+		}
+		if (SlotIndex != INDEX_NONE)
+		{
+			float NewValue = ((float)SlotIndex * Atlas->GradientPixelSize) / Atlas->TextureSize + (0.5f * Atlas->GradientPixelSize) / Atlas->TextureSize;
+			SetParameterValue(ParameterName, NewValue);
+		}
+		else
+		{
+			SetParameterValue(ParameterName, 0.0f);
+		}
+	}
+
+	// Need to update expression properties before super call (which triggers recompile)
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+#endif
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstance.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstance.cpp
index 9e210ce97557..cb98e02ad3ba 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstance.cpp
@@ -30,6 +30,10 @@
 #include "Interfaces/ITargetPlatformManagerModule.h"
 #include "Components.h"
 #include "HAL/LowLevelMemTracker.h"
+#include "ShaderCodeLibrary.h"
+#include "Materials/MaterialExpressionCurveAtlasRowParameter.h"
+#include "Curves/CurveLinearColor.h"
+#include "Curves/CurveLinearColorAtlas.h"
 
 DECLARE_CYCLE_STAT(TEXT("MaterialInstance CopyMatInstParams"), STAT_MaterialInstance_CopyMatInstParams, STATGROUP_Shaders);
 DECLARE_CYCLE_STAT(TEXT("MaterialInstance Serialize"), STAT_MaterialInstance_Serialize, STATGROUP_Shaders);
@@ -343,6 +347,8 @@ void GameThread_UpdateMIParameter(const UMaterialInstance* Instance, const Param
 bool UMaterialInstance::UpdateParameters()
 {
 	bool bDirty = false;
+
+#if WITH_EDITOR
 	if(IsTemplate(RF_ClassDefaultObject)==false)
 	{
 		// Get a pointer to the parent material.
@@ -391,6 +397,8 @@ bool UMaterialInstance::UpdateParameters()
 			}
 		}
 	}
+#endif // WITH_EDITOR
+
 	return bDirty;
 }
 
@@ -631,6 +639,51 @@ bool UMaterialInstance::GetScalarParameterValue(const FMaterialParameterInfo& Pa
 	return false;
 }
 
+bool UMaterialInstance::IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<UCurveLinearColor>& Curve, TSoftObjectPtr<UCurveLinearColorAtlas>& Atlas) const
+{
+	bool bFoundAValue = false;
+
+	if (GetReentrantFlag())
+	{
+		return false;
+	}
+
+	// Instance-included default
+	if (ParameterInfo.Association != EMaterialParameterAssociation::GlobalParameter)
+	{
+		UMaterialExpressionScalarParameter* Parameter = nullptr;
+		for (const FStaticMaterialLayersParameter& LayersParam : StaticParameters.MaterialLayersParameters)
+		{
+			if (LayersParam.bOverride)
+			{
+				UMaterialFunctionInterface* Function = LayersParam.GetParameterAssociatedFunction(ParameterInfo);
+				UMaterialFunctionInterface* ParameterOwner = nullptr;
+
+				if (Function && Function->GetNamedParameterOfType(ParameterInfo, Parameter, &ParameterOwner))
+				{
+					OutValue = Parameter->IsUsedAsAtlasPosition();
+					if (OutValue)
+					{
+						UMaterialExpressionCurveAtlasRowParameter* AtlasParameter = Cast<UMaterialExpressionCurveAtlasRowParameter>(Parameter);
+						Curve = TSoftObjectPtr<UCurveLinearColor>(FSoftObjectPath(AtlasParameter->Curve->GetPathName()));
+						Atlas = TSoftObjectPtr<UCurveLinearColorAtlas> (FSoftObjectPath(AtlasParameter->Atlas->GetPathName()));
+					}
+					return true;
+				}
+			}
+		}
+	}
+
+	// Next material in hierarchy
+	if (Parent)
+	{
+		FMICReentranceGuard	Guard(this);
+		return Parent->IsScalarParameterUsedAsAtlasPosition(ParameterInfo, OutValue, Curve, Atlas);
+	}
+
+	return false;
+}
+
 bool UMaterialInstance::GetVectorParameterValue(const FMaterialParameterInfo& ParameterInfo, FLinearColor& OutValue, bool bOveriddenOnly) const
 {
 	bool bFoundAValue = false;
@@ -1452,7 +1505,7 @@ void UMaterialInstance::CopyMaterialInstanceParameters(UMaterialInterface* Sourc
 {
 	SCOPE_CYCLE_COUNTER(STAT_MaterialInstance_CopyMatInstParams);
 
-	if(Source)
+	if ((Source != nullptr) && (Source != this))
 	{
 		// First, clear out all the parameter values
 		ClearParameterValuesInternal();
@@ -2816,6 +2869,7 @@ void UMaterialInstance::Serialize(FArchive& Ar)
 	Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
 	Super::Serialize(Ar);
 		
+#if WITH_EDITOR
 	if (Ar.CustomVer(FRenderingObjectVersion::GUID) < FRenderingObjectVersion::MaterialAttributeLayerParameters)
 	{
 		// Material attribute layers parameter refactor fix-up
@@ -2836,6 +2890,7 @@ void UMaterialInstance::Serialize(FArchive& Ar)
 			Parameter.ParameterInfo.Name = Parameter.ParameterName_DEPRECATED;
 		}
 	}
+#endif // WITH_EDITOR
 
 	// Only serialize the static permutation resource if one exists
 	if (bHasStaticPermutationResource)
@@ -2916,6 +2971,12 @@ void UMaterialInstance::Serialize(FArchive& Ar)
 			}
 		}
 	}
+#if WITH_EDITOR
+	if (Ar.IsSaving() && Ar.IsCooking() && Ar.IsPersistent() && !Ar.IsObjectReferenceCollector() && FShaderCodeLibrary::NeedsShaderStableKeys())
+	{
+		SaveShaderStableKeys(Ar.CookingTarget());
+	}
+#endif
 }
 
 void UMaterialInstance::PostLoad()
@@ -2936,7 +2997,7 @@ void UMaterialInstance::PostLoad()
 			Resource.DiscardShaderMap();
 		}
 	}
-	// Empty the lsit of loaded resources, we don't need it anymore
+	// Empty the list of loaded resources, we don't need it anymore
 	LoadedMaterialResources.Empty();
 
 	AssertDefaultMaterialsPostLoaded();
@@ -3037,6 +3098,7 @@ void UMaterialInstance::PostLoad()
 
 		LightingGuidFixupMap.Add(GetLightingGuid(), this);
 	}
+	//DumpDebugInfo();
 }
 
 void UMaterialInstance::BeginDestroy()
@@ -3569,12 +3631,13 @@ bool UMaterialInstance::GetGroupSortPriority(const FString& InGroupName, int32&
 }
 
 bool UMaterialInstance::GetTexturesInPropertyChain(EMaterialProperty InProperty, TArray<UTexture*>& OutTextures,  
-	TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet)
+	TArray<FName>* OutTextureParamNames, struct FStaticParameterSet* InStaticParameterSet,
+	ERHIFeatureLevel::Type InFeatureLevel, EMaterialQualityLevel::Type InQuality)
 {
 	if (Parent != NULL)
 	{
 		TArray<FName> LocalTextureParamNames;
-		bool bResult = Parent->GetTexturesInPropertyChain(InProperty, OutTextures, &LocalTextureParamNames, InStaticParameterSet);
+		bool bResult = Parent->GetTexturesInPropertyChain(InProperty, OutTextures, &LocalTextureParamNames, InStaticParameterSet, InFeatureLevel, InQuality);
 		if (LocalTextureParamNames.Num() > 0)
 		{
 			// Check textures set in parameters as well...
@@ -3907,6 +3970,112 @@ bool UMaterialInstance::Equivalent(const UMaterialInstance* CompareTo) const
 	return true;
 }
 
+#if !UE_BUILD_SHIPPING
+
+static void FindRedundantMICS(const TArray<FString>& Args)
+{
+	TArray<UObject*> MICs;
+	GetObjectsOfClass(UMaterialInstance::StaticClass(), MICs);
+
+	int32 NumRedundant = 0;
+	for (int32 OuterIndex = 0; OuterIndex < MICs.Num(); OuterIndex++)
+	{
+		for (int32 InnerIndex = OuterIndex + 1; InnerIndex < MICs.Num(); InnerIndex++)
+		{
+			if (((UMaterialInstance*)MICs[OuterIndex])->Equivalent((UMaterialInstance*)MICs[InnerIndex]))
+			{
+				NumRedundant++;
+				break;
+			}
+		}
+	}
+	UE_LOG(LogConsoleResponse, Display, TEXT("----------------------------- %d UMaterialInstance's %d redundant "), MICs.Num(), NumRedundant);
+}
+
+static FAutoConsoleCommand FindRedundantMICSCmd(
+	TEXT("FindRedundantMICS"),
+	TEXT("Looks at all loaded MICs and looks for redundant ones."),
+	FConsoleCommandWithArgsDelegate::CreateStatic(&FindRedundantMICS)
+);
+
+#endif
+
+void UMaterialInstance::DumpDebugInfo()
+{
+	UE_LOG(LogConsoleResponse, Display, TEXT("----------------------------- %s"), *GetFullName());
+
+	UE_LOG(LogConsoleResponse, Display, TEXT("  Parent %s"), Parent ? *Parent->GetFullName() : TEXT("null"));
+
+	if (Parent)
+	{
+		UMaterial* Base = GetMaterial();
+		UE_LOG(LogConsoleResponse, Display, TEXT("  Base %s"), Base ? *Base->GetFullName() : TEXT("null"));
+
+		if (Base)
+		{
+			static const UEnum* Enum = FindObject<UEnum>(ANY_PACKAGE, TEXT("EMaterialDomain"));
+			check(Enum);
+			UE_LOG(LogConsoleResponse, Display, TEXT("  MaterialDomain %s"), *Enum->GetNameStringByValue(int64(Base->MaterialDomain)));
+		}
+		if (bHasStaticPermutationResource)
+		{
+			for (int32 QualityLevel = 0; QualityLevel < EMaterialQualityLevel::Num; QualityLevel++)
+			{
+				for (int32 FeatureLevel = 0; FeatureLevel < ERHIFeatureLevel::Num; FeatureLevel++)
+				{
+					if (StaticPermutationMaterialResources[QualityLevel][FeatureLevel])
+					{
+						StaticPermutationMaterialResources[QualityLevel][FeatureLevel]->DumpDebugInfo();
+					}
+				}
+			}
+		}
+		else
+		{
+			UE_LOG(LogConsoleResponse, Display, TEXT("    This MIC does not have static permulations, and is therefore is just a version of the parent."));
+		}
+	}
+}
+
+void UMaterialInstance::SaveShaderStableKeys(const class ITargetPlatform* TP)
+{
+#if WITH_EDITOR
+	FStableShaderKeyAndValue SaveKeyVal;
+	SetCompactFullNameFromObject(SaveKeyVal.ClassNameAndObjectPath, this);
+	UMaterial* Base = GetMaterial();
+	if (Base)
+	{
+		SaveKeyVal.MaterialDomain = FName(*MaterialDomainString(Base->MaterialDomain));
+	}
+	SaveShaderStableKeysInner(TP, SaveKeyVal);
+#endif
+}
+
+void UMaterialInstance::SaveShaderStableKeysInner(const class ITargetPlatform* TP, const FStableShaderKeyAndValue& InSaveKeyVal)
+{
+#if WITH_EDITOR
+	if (bHasStaticPermutationResource)
+	{
+		FStableShaderKeyAndValue SaveKeyVal(InSaveKeyVal);
+		TArray<FMaterialResource*>* MatRes = CachedMaterialResourcesForCooking.Find(TP);
+		if (MatRes)
+		{
+			for (FMaterialResource* Mat : *MatRes)
+			{
+				if (Mat)
+				{
+					Mat->SaveShaderStableKeys(EShaderPlatform::SP_NumPlatforms, SaveKeyVal);
+				}
+			}
+		}
+	}
+	else if (Parent)
+	{
+		Parent->SaveShaderStableKeysInner(TP, InSaveKeyVal);
+	}
+#endif
+}
+
 
 UMaterialInstance::FCustomStaticParametersGetterDelegate UMaterialInstance::CustomStaticParametersGetters;
 TArray<UMaterialInstance::FCustomParameterSetUpdaterDelegate> UMaterialInstance::CustomParameterSetUpdaters;
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstanceDynamic.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstanceDynamic.cpp
index 357b94dc94dd..116f60002704 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstanceDynamic.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInstanceDynamic.cpp
@@ -293,6 +293,12 @@ void UMaterialInstanceDynamic::K2_CopyMaterialInstanceParameters(UMaterialInterf
 void UMaterialInstanceDynamic::CopyMaterialUniformParameters(UMaterialInterface* Source)
 {
 	SCOPE_CYCLE_COUNTER(STAT_MaterialInstanceDynamic_CopyUniformParams)
+
+	if ((Source == nullptr) || (Source == this))
+	{
+		return;
+	}
+
 	ClearParameterValuesInternal();
 
 	if (!FPlatformProperties::IsServerOnly())
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInterface.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInterface.cpp
index 2abcf2b5e999..d7829a11a413 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialInterface.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialInterface.cpp
@@ -59,6 +59,7 @@ UMaterialInterface::UMaterialInterface(const FObjectInitializer& ObjectInitializ
 {
 	if (!HasAnyFlags(RF_ClassDefaultObject))
 	{
+		MaterialDomainString(MD_Surface); // find the enum for this now before we start saving
 #if USE_EVENT_DRIVEN_ASYNC_LOAD_AT_BOOT_TIME
 		if (!GIsInitialLoad || !GEventDrivenLoaderEnabled)
 #endif
@@ -291,6 +292,11 @@ bool UMaterialInterface::GetScalarParameterValue(const FMaterialParameterInfo& P
 	return false;
 }
 
+bool UMaterialInterface::IsScalarParameterUsedAsAtlasPosition(const FMaterialParameterInfo& ParameterInfo, bool& OutValue, TSoftObjectPtr<class UCurveLinearColor>& Curve, TSoftObjectPtr<class UCurveLinearColorAtlas>& Atlas) const
+{
+	return false;
+}
+
 bool UMaterialInterface::GetScalarCurveParameterValue(const FMaterialParameterInfo& ParameterInfo, FInterpCurveFloat& OutValue) const
 {
 	return false;
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialShader.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialShader.cpp
index 781fb8ca63bc..70450b797789 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialShader.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialShader.cpp
@@ -379,7 +379,8 @@ void FStaticParameterSet::AppendKeyString(FString& KeyString) const
 		const FStaticTerrainLayerWeightParameter& TerrainLayerWeightParameter = TerrainLayerWeightParameters[ParamIndex];
 		KeyString += TerrainLayerWeightParameter.ParameterInfo.ToString() 
 			+ TerrainLayerWeightParameter.ExpressionGUID.ToString() 
-			+ FString::FromInt(TerrainLayerWeightParameter.WeightmapIndex);
+			+ FString::FromInt(TerrainLayerWeightParameter.WeightmapIndex)
+			+ (TerrainLayerWeightParameter.bWeightBasedBlend ? TEXT("W") : TEXT("N"));
 	}
 
 	for (int32 ParamIndex = 0;ParamIndex < MaterialLayersParameters.Num();ParamIndex++)
@@ -677,6 +678,25 @@ void FMaterialShaderMapId::UpdateParameterSet(const FStaticParameterSet& StaticP
 {
 	ParameterSet = StaticParameters;
 
+	//since bOverrides aren't used to check id matches, make sure they're consistently set to false in the static parameter set as part of the id.
+	//this ensures deterministic cook results, rather than allowing bOverride to be set in the shader map's copy of the id based on the first id used.
+	for (FStaticSwitchParameter& StaticSwitchParameter : ParameterSet.StaticSwitchParameters)
+	{
+		StaticSwitchParameter.bOverride = false;
+	}
+	for (FStaticComponentMaskParameter& StaticComponentMaskParameter : ParameterSet.StaticComponentMaskParameters)
+	{
+		StaticComponentMaskParameter.bOverride = false;
+	}
+	for (FStaticTerrainLayerWeightParameter& StaticTerrainLayerWeightParameter : ParameterSet.TerrainLayerWeightParameters)
+	{
+		StaticTerrainLayerWeightParameter.bOverride = false;
+	}
+	for (FStaticMaterialLayersParameter& StaticMaterialLayersParameter : ParameterSet.MaterialLayersParameters)
+	{
+		StaticMaterialLayersParameter.bOverride = false;
+	}
+
 	// We can't store the objects referenced by layers so we re-use the DDC key as an identifier
 	ParameterSetLayerParametersKey.Empty();
 	for (const FStaticMaterialLayersParameter& LayersParam : ParameterSet.MaterialLayersParameters)
@@ -851,6 +871,8 @@ FShaderCompileJob* FMaterialShaderType::BeginCompileShader(
 	//update material shader stats
 	UpdateMaterialShaderCompilingStats(Material);
 
+	Material->SetupExtaCompilationSettings(Platform, NewJob->Input.ExtraSettings);
+
 	// Allow the shader type to modify the compile environment.
 	SetupCompileEnvironment(Platform, Material, ShaderEnvironment);
 
@@ -1641,6 +1663,11 @@ FShader* FMaterialShaderMap::ProcessCompilationResultsForSingleJob(FShaderCompil
 		}
 	}
 
+#if WITH_EDITOR
+	// add shader source to 
+	ShaderProcessedSource.Add(CurrentJob.ShaderType->GetFName(), CurrentJob.Output.OptionalFinalShaderSource);
+#endif
+
 	return Shader;
 }
 
@@ -2032,6 +2059,14 @@ void FMaterialShaderMap::LoadMissingShadersFromMemory(const FMaterial* Material)
 	}
 }
 
+#if WITH_EDITOR
+const FString* FMaterialShaderMap::GetShaderSource(const FName ShaderTypeName) const
+{
+	const FString* Source = ShaderProcessedSource.Find(ShaderTypeName);
+	return Source;
+}
+#endif
+
 void FMaterialShaderMap::GetShaderList(TMap<FShaderId, FShader*>& OutShaders) const
 {
 	TShaderMap<FMaterialShaderType>::GetShaderList(OutShaders);
@@ -2041,6 +2076,15 @@ void FMaterialShaderMap::GetShaderList(TMap<FShaderId, FShader*>& OutShaders) co
 	}
 }
 
+void FMaterialShaderMap::GetShaderList(TMap<FName, FShader*>& OutShaders) const
+{
+	TShaderMap<FMaterialShaderType>::GetShaderList(OutShaders);
+	for (int32 Index = 0; Index < MeshShaderMaps.Num(); Index++)
+	{
+		MeshShaderMaps[Index].GetShaderList(OutShaders);
+	}
+}
+
 void FMaterialShaderMap::GetShaderPipelineList(TArray<FShaderPipeline*>& OutShaderPipelines) const
 {
 	TShaderMap<FMaterialShaderType>::GetShaderPipelineList(OutShaderPipelines, FShaderPipeline::EAll);
@@ -2279,6 +2323,22 @@ void FMaterialShaderMap::Serialize(FArchive& Ar, bool bInlineShaderResources)
 				MeshShaderMap->SerializeInline(Ar, bInlineShaderResources, false);
 			}
 		}
+
+		bool bCooking = Ar.IsCooking();
+		Ar << bCooking;
+
+#if WITH_EDITOR
+		if (!bCooking)
+		{
+			int32 NrShaderSources = ShaderProcessedSource.Num();
+			Ar << NrShaderSources;
+			for (auto SourceEntry : ShaderProcessedSource)
+			{
+				Ar << SourceEntry.Key;
+				Ar << SourceEntry.Value;
+			}
+		}
+#endif
 	}
 
 	if (Ar.IsLoading())
@@ -2319,6 +2379,28 @@ void FMaterialShaderMap::Serialize(FArchive& Ar, bool bInlineShaderResources)
 			check(MeshShaderMap);
 			MeshShaderMap->SerializeInline(Ar, bInlineShaderResources, false);
 		}
+
+		bool bCooked;
+		Ar << bCooked;
+
+#if WITH_EDITOR
+		if (!bCooked)
+		{
+			int32 NrShaderSources = 0;
+			Ar << NrShaderSources;
+
+			ShaderProcessedSource.Empty();
+			FString ShaderSourceSrc;
+			FName ShaderName;
+			for (int32 i = 0; i < NrShaderSources; ++i)
+			{
+				Ar << ShaderName;
+				Ar << ShaderSourceSrc;
+
+				ShaderProcessedSource.Add(ShaderName, ShaderSourceSrc);
+			}
+		}
+#endif
 	}
 }
 
@@ -2441,6 +2523,42 @@ void FMaterialShaderMap::InitOrderedMeshShaderMaps()
 	}
 }
 
+void FMaterialShaderMap::DumpDebugInfo()
+{
+	const FString& FriendlyNameS = GetFriendlyName();
+	UE_LOG(LogConsoleResponse, Display, TEXT("FMaterialShaderMap:  FriendlyName %s"), *FriendlyNameS);
+	const FString& DebugDescriptionS = GetDebugDescription();
+	UE_LOG(LogConsoleResponse, Display, TEXT("  DebugDescription %s"), *DebugDescriptionS);
+
+	TMap<FShaderId, FShader*> ShadersL;
+	GetShaderList(ShadersL);
+	UE_LOG(LogConsoleResponse, Display, TEXT("  --- %d shaders"), ShadersL.Num());
+	int32 Index = 0;
+	for (auto& KeyValue : ShadersL)
+	{
+		UE_LOG(LogConsoleResponse, Display, TEXT("    --- shader %d"), Index);
+		FShader* Shader = KeyValue.Value;
+		Shader->DumpDebugInfo();
+		Index++;
+	}
+	//TArray<FShaderPipeline*> ShaderPipelinesL;
+	//GetShaderPipelineList(ShaderPipelinesL);
+}
+
+void FMaterialShaderMap::SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, const FStableShaderKeyAndValue& SaveKeyVal)
+{
+#if WITH_EDITOR
+	TMap<FShaderId, FShader*> ShadersL;
+	GetShaderList(ShadersL);
+	for (auto& KeyValue : ShadersL)
+	{
+		FShader* Shader = KeyValue.Value;
+		Shader->SaveShaderStableKeys(TargetShaderPlatform, SaveKeyVal);
+	}
+#endif
+}
+
+
 /**
  * Dump material stats for a given platform.
  * 
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialShared.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialShared.cpp
index b340f405297a..9f6b823b192e 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialShared.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialShared.cpp
@@ -33,6 +33,7 @@
 #include "MaterialShaderQualitySettings.h"
 #include "DecalRenderingCommon.h"
 #include "ExternalTexture.h"
+#include "ShaderCodeLibrary.h"
 
 DEFINE_LOG_CATEGORY(LogMaterial);
 
@@ -347,6 +348,11 @@ void FMaterialCompilationOutput::Serialize(FArchive& Ar)
 {
 	UniformExpressionSet.Serialize(Ar);
 
+	Ar << NumUsedUVScalars;
+	Ar << NumUsedCustomInterpolatorScalars;
+	Ar << EstimatedNumTextureSamplesVS;
+	Ar << EstimatedNumTextureSamplesPS;
+
 	Ar << bRequiresSceneColorCopy;
 	Ar << bNeedsSceneTextures;
 	Ar << bUsesEyeAdaptation;
@@ -756,17 +762,7 @@ void FMaterial::SerializeInlineShaderMap(FArchive& Ar)
 			{
 				TRefCountPtr<FMaterialShaderMap> LoadedShaderMap = new FMaterialShaderMap();
 				LoadedShaderMap->Serialize(Ar);
-
-				// Toss the loaded shader data if this is a server only instance
-				//@todo - don't cook it in the first place
-				if (FApp::CanEverRender())
-				{
-					GameThreadShaderMap = RenderingThreadShaderMap = LoadedShaderMap;
-				}
-				else
-				{
-					GameThreadShaderMap = LoadedShaderMap;
-				}
+				GameThreadShaderMap = LoadedShaderMap;
 			}
 		}
 	}
@@ -776,6 +772,12 @@ void FMaterial::RegisterInlineShaderMap()
 {
 	if (GameThreadShaderMap)
 	{
+		// Toss the loaded shader data if this is a server only instance
+		//@todo - don't cook it in the first place
+		if (FApp::CanEverRender())
+		{
+			RenderingThreadShaderMap = GameThreadShaderMap;
+		}
 		GameThreadShaderMap->RegisterSerializedShaders();
 	}
 }
@@ -1099,7 +1101,7 @@ float FMaterialResource::GetRefractionDepthBiasValue() const { return Material->
 float FMaterialResource::GetMaxDisplacement() const { return Material->MaxDisplacement; }
 bool FMaterialResource::ShouldApplyFogging() const {return Material->bUseTranslucencyVertexFog;}
 bool FMaterialResource::ComputeFogPerPixel() const {return Material->bComputeFogPerPixel;}
-FString FMaterialResource::GetFriendlyName() const { return *GetNameSafe(Material); }
+FString FMaterialResource::GetFriendlyName() const { return *GetNameSafe(Material); } //avoid using the material instance name here, we want materials that share a shadermap to also share a friendly name.
 
 uint32 FMaterialResource::GetDecalBlendMode() const
 {
@@ -1151,164 +1153,6 @@ void FMaterialResource::NotifyCompilationFinished()
 	UMaterial::NotifyCompilationFinished(MaterialInstance ? (UMaterialInterface*)MaterialInstance : (UMaterialInterface*)Material);
 }
 
-/**
- * Gets instruction counts that best represent the likely usage of this material based on shading model and other factors.
- * @param Descriptions - an array of descriptions to be populated
- * @param InstructionCounts - an array of instruction counts matching the Descriptions.  
- *		The dimensions of these arrays are guaranteed to be identical and all values are valid.
- */
-void FMaterialResource::GetRepresentativeInstructionCounts(TArray<FString> &Descriptions, TArray<int32> &InstructionCounts) const
-{
-	TMap<FName, FString> ShaderTypeNamesAndDescriptions;
-
-	//when adding a shader type here be sure to update FPreviewMaterial::ShouldCache()
-	//so the shader type will get compiled with preview materials
-	const FMaterialShaderMap* MaterialShaderMap = GetGameThreadShaderMap();
-	if (MaterialShaderMap && MaterialShaderMap->IsCompilationFinalized())
-	{
-		GetRepresentativeShaderTypesAndDescriptions(ShaderTypeNamesAndDescriptions);
-
-		if( IsUIMaterial() )
-		{
-			for (const TPair<FName, FString>& ShaderTypePair : ShaderTypeNamesAndDescriptions)
-			{
-				FShaderType* ShaderType = FindShaderTypeByName(ShaderTypePair.Key);
-				int32 NumInstructions = MaterialShaderMap->GetMaxNumInstructionsForShader(ShaderType);
-				if (NumInstructions > 0)
-				{
-					//if the shader was found, add it to the output arrays
-					InstructionCounts.Push(NumInstructions);
-					Descriptions.Push(ShaderTypePair.Value);
-				}
-			}
-		}
-		else
-		{
-			const FMeshMaterialShaderMap* MeshShaderMap = MaterialShaderMap->GetMeshShaderMap(&FLocalVertexFactory::StaticType);
-			if (MeshShaderMap)
-			{
-				Descriptions.Empty();
-				InstructionCounts.Empty();
-
-				for (const TPair<FName, FString>& ShaderTypePair : ShaderTypeNamesAndDescriptions)
-				{
-					FShaderType* ShaderType = FindShaderTypeByName(ShaderTypePair.Key);
-					if (ShaderType)
-					{
-						int32 NumInstructions = MeshShaderMap->GetMaxNumInstructionsForShader(ShaderType);
-						if (NumInstructions > 0)
-						{
-							//if the shader was found, add it to the output arrays
-							InstructionCounts.Push(NumInstructions);
-							Descriptions.Push(ShaderTypePair.Value);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	check(Descriptions.Num() == InstructionCounts.Num());
-}
-
-void FMaterialResource::GetRepresentativeShaderTypesAndDescriptions(TMap<FName, FString>& ShaderTypeNamesAndDescriptions) const
-{
-	static auto* MobileHDR = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.MobileHDR"));
-	bool bMobileHDR = MobileHDR && MobileHDR->GetValueOnAnyThread() == 1;
-
-	if( IsUIMaterial() )
-	{
-		static FName TSlateMaterialShaderPSDefaultfalseName = TEXT("TSlateMaterialShaderPSDefaultfalse");
-		ShaderTypeNamesAndDescriptions.Add(TSlateMaterialShaderPSDefaultfalseName, TEXT("Default UI Pixel Shader"));
-
-		static FName TSlateMaterialShaderVSfalseName = TEXT("TSlateMaterialShaderVSfalse");
-		ShaderTypeNamesAndDescriptions.Add(TSlateMaterialShaderVSfalseName, TEXT("Default UI Vertex Shader"));
-
-		static FName TSlateMaterialShaderVStrueName = TEXT("TSlateMaterialShaderVStrue");
-		ShaderTypeNamesAndDescriptions.Add(TSlateMaterialShaderVStrueName, TEXT("Instanced UI Vertex Shader"));
-	}
-	else if (GetFeatureLevel() >= ERHIFeatureLevel::SM4)
-	{
-		if (GetShadingModel() == MSM_Unlit)
-		{
-			//unlit materials are never lightmapped
-			static FName TBasePassPSFNoLightMapPolicyName = TEXT("TBasePassPSFNoLightMapPolicy");
-			ShaderTypeNamesAndDescriptions.Add(TBasePassPSFNoLightMapPolicyName, TEXT("Base pass shader without light map"));
-		}
-		else
-		{
-			//also show a dynamically lit shader
-			static FName TBasePassPSFNoLightMapPolicyName = TEXT("TBasePassPSFNoLightMapPolicy");
-			ShaderTypeNamesAndDescriptions.Add(TBasePassPSFNoLightMapPolicyName, TEXT("Base pass shader"));
-
-			static auto* CVarAllowStaticLighting = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.AllowStaticLighting"));
-			const bool bAllowStaticLighting = CVarAllowStaticLighting->GetValueOnAnyThread() != 0;
-
-			if (bAllowStaticLighting)
-			{
-				if (IsUsedWithStaticLighting())
-				{
-					static FName TBasePassPSTLightMapPolicyName = TEXT("TBasePassPSTDistanceFieldShadowsAndLightMapPolicyHQ");
-					ShaderTypeNamesAndDescriptions.Add(TBasePassPSTLightMapPolicyName, TEXT("Base pass shader with Surface Lightmap"));
-				}
-
-				static FName TBasePassPSFPrecomputedVolumetricLightmapLightingPolicyName = TEXT("TBasePassPSFPrecomputedVolumetricLightmapLightingPolicy");
-				ShaderTypeNamesAndDescriptions.Add(TBasePassPSFPrecomputedVolumetricLightmapLightingPolicyName, TEXT("Base pass shader with Volumetric Lightmap"));
-			}
-		}
-
-		static FName TBasePassVSFNoLightMapPolicyName = TEXT("TBasePassVSFNoLightMapPolicy");
-		ShaderTypeNamesAndDescriptions.Add(TBasePassVSFNoLightMapPolicyName, TEXT("Vertex shader"));
-	}
-	else
-	{
-		const TCHAR* DescSuffix = bMobileHDR ? TEXT(" (HDR)") : TEXT(" (LDR)");
-
-		if (GetShadingModel() == MSM_Unlit)
-		{
-			//unlit materials are never lightmapped
-			static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFNoLightMapPolicy0HDRLinear64");
-			static FName Name_LDRGamma32 =	TEXT("TMobileBasePassPSFNoLightMapPolicy0LDRGamma32");
-			const FName TBasePassForForwardShadingPSFNoLightMapPolicy0Name = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
-			ShaderTypeNamesAndDescriptions.Add(TBasePassForForwardShadingPSFNoLightMapPolicy0Name, FString::Printf(TEXT("Mobile base pass shader without light map%s"), DescSuffix));
-		}
-		else
-		{
-			if (IsUsedWithStaticLighting())
-			{
-				//lit materials are usually lightmapped
-				{
-					static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSTLightMapPolicyLQ0HDRLinear64");
-					static FName Name_LDRGamma32 =	TEXT("TMobileBasePassPSTLightMapPolicyLQ0LDRGamma32");
-					static FName TSlateMaterialShaderVStrueName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
-					ShaderTypeNamesAndDescriptions.Add(TSlateMaterialShaderVStrueName, FString::Printf(TEXT("Mobile base pass shader with static lighting%s"), DescSuffix));
-				}
-
-				// + distance field shadows
-				{
-					static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsAndLQLightMapPolicy0HDRLinear64");
-					static FName Name_LDRGamma32 =	TEXT("TMobileBasePassPSFMobileDistanceFieldShadowsAndLQLightMapPolicy0LDRGamma32");
-					static FName TBasePassForForwardShadingPSTDistanceFieldShadowsAndLightMapPolicy0LQName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
-					ShaderTypeNamesAndDescriptions.Add(TBasePassForForwardShadingPSTDistanceFieldShadowsAndLightMapPolicy0LQName, FString::Printf(TEXT("Mobile base pass shader with distance field shadows%s"), DescSuffix));
-				}
-			}
-
-			//also show a dynamically lit shader
-			static FName Name_HDRLinear64 = TEXT("TMobileBasePassPSFMobileMovableDirectionalLightCSMLightingPolicy0HDRLinear64");
-			static FName Name_LDRGamma32 =	TEXT("TMobileBasePassPSFMobileMovableDirectionalLightCSMLightingPolicy0LDRGamma32");
-			const FName TBasePassForForwardShadingPSFSimpleDirectionalLightAndSHIndirectPolicy0Name = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
-			ShaderTypeNamesAndDescriptions.Add(TBasePassForForwardShadingPSFSimpleDirectionalLightAndSHIndirectPolicy0Name, FString::Printf(TEXT("Mobile base pass shader with only dynamic lighting%s"), DescSuffix));
-		}
-
-		{
-			static FName Name_HDRLinear64 = TEXT("TMobileBasePassVSFNoLightMapPolicyHDRLinear64");
-			static FName Name_LDRGamma32 =	TEXT("TMobileBasePassVSFNoLightMapPolicyLDRGamma32");
-			const FName TBasePassForForwardShadingVSFNoLightMapPolicyName = bMobileHDR ? Name_HDRLinear64 : Name_LDRGamma32;
-			ShaderTypeNamesAndDescriptions.Add(TBasePassForForwardShadingVSFNoLightMapPolicyName, FString::Printf(TEXT("Mobile base pass vertex shader%s"), DescSuffix));
-		}
-	}
-}
-
 void FMaterialResource::GetResourceSizeEx(FResourceSizeEx& CumulativeResourceSize)
 {
 	TSet<const FMaterialShaderMap*> UniqueShaderMaps;
@@ -1530,7 +1374,6 @@ void FMaterial::SetupMaterialEnvironment(
 	OutEnvironment.SetDefine(TEXT("MATERIAL_TANGENTSPACENORMAL"), IsTangentSpaceNormal());
 	OutEnvironment.SetDefine(TEXT("GENERATE_SPHERICAL_PARTICLE_NORMALS"),ShouldGenerateSphericalParticleNormals());
 	OutEnvironment.SetDefine(TEXT("MATERIAL_USES_SCENE_COLOR_COPY"), RequiresSceneColorCopy_GameThread());
-	OutEnvironment.SetDefine(TEXT("MATERIAL_FULLY_ROUGH"), IsFullyRough());
 	OutEnvironment.SetDefine(TEXT("MATERIAL_HQ_FORWARD_REFLECTIONS"), IsUsingHQForwardReflections());
 	OutEnvironment.SetDefine(TEXT("MATERIAL_PLANAR_FORWARD_REFLECTIONS"), IsUsingPlanarForwardReflections());
 	OutEnvironment.SetDefine(TEXT("MATERIAL_NONMETAL"), IsNonmetal());
@@ -1583,6 +1426,7 @@ void FMaterial::SetupMaterialEnvironment(
 		OutEnvironment.SetDefine(TEXT("DECALBLENDMODEID_EMISSIVE"), (uint32)DBM_Emissive);
 		OutEnvironment.SetDefine(TEXT("DECALBLENDMODEID_TRANSLUCENT"), (uint32)DBM_Translucent);
 		OutEnvironment.SetDefine(TEXT("DECALBLENDMODEID_AO"), (uint32)DBM_AmbientOcclusion);
+		OutEnvironment.SetDefine(TEXT("DECALBLENDMODEID_ALPHACOMPOSITE"), (uint32)DBM_AlphaComposite);
 	}
 
 	switch(GetMaterialDomain())
@@ -2312,6 +2156,15 @@ void FMaterialResource::GetUserInterpolatorUsage(uint32& NumUsedUVScalars, uint3
 	}
 }
 
+void FMaterialResource::GetEstimatedNumTextureSamples(uint32& VSSamples, uint32& PSSamples) const
+{
+	VSSamples = PSSamples = 0;
+	if (const FMaterialShaderMap* ShaderMap = GetGameThreadShaderMap())
+	{
+		ShaderMap->GetEstimatedNumTextureSamples(VSSamples, PSSamples);
+	}
+}
+
 FString FMaterialResource::GetMaterialUsageDescription() const
 {
 	check(Material);
@@ -2509,7 +2362,9 @@ bool FMaterial::GetMaterialExpressionSource( FString& OutSource )
 	};
 
 	FMaterialCompilationOutput TempOutput;
-	FViewSourceMaterialTranslator MaterialTranslator(this, TempOutput, FStaticParameterSet(), GMaxRHIShaderPlatform, GetQualityLevel(), GetFeatureLevel());
+	FMaterialShaderMapId ShaderMapID;
+	GetShaderMapId(GMaxRHIShaderPlatform, ShaderMapID);
+	FViewSourceMaterialTranslator MaterialTranslator(this, TempOutput, ShaderMapID.GetParameterSet(), GMaxRHIShaderPlatform, GetQualityLevel(), GetFeatureLevel());
 	bool bSuccess = MaterialTranslator.Translate();
 
 	if( bSuccess )
@@ -2571,6 +2426,40 @@ void FMaterial::RestoreEditorLoadedMaterialShadersFromMemory(const TMap<FMateria
 	}
 }
 
+void FMaterial::DumpDebugInfo()
+{
+	if (GameThreadShaderMap)
+	{
+		FString FeatureLevelName;
+		GetFeatureLevelName(FeatureLevel, FeatureLevelName);
+		FString QualityLevelString;
+		GetMaterialQualityLevelName(QualityLevel, QualityLevelString);
+
+		UE_LOG(LogConsoleResponse, Display, TEXT("FMaterial:  FeatureLevel %s     Quality Level %s"), *FeatureLevelName, *QualityLevelString);
+
+		GameThreadShaderMap->DumpDebugInfo();
+	}
+}
+
+void FMaterial::SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, FStableShaderKeyAndValue& SaveKeyVal)
+{
+#if WITH_EDITOR
+	if (GameThreadShaderMap)
+	{
+		FString FeatureLevelName;
+		GetFeatureLevelName(FeatureLevel, FeatureLevelName);
+		SaveKeyVal.FeatureLevel = FName(*FeatureLevelName);
+
+		FString QualityLevelString;
+		GetMaterialQualityLevelName(QualityLevel, QualityLevelString);
+		SaveKeyVal.QualityLevel = FName(*QualityLevelString);
+
+		GameThreadShaderMap->SaveShaderStableKeys(TargetShaderPlatform, SaveKeyVal);
+	}
+#endif
+}
+
+
 FMaterialUpdateContext::FMaterialUpdateContext(uint32 Options, EShaderPlatform InShaderPlatform)
 {
 	bool bReregisterComponents = (Options & EOptions::ReregisterComponents) != 0;
@@ -2888,12 +2777,14 @@ FMaterialInstanceBasePropertyOverrides::FMaterialInstanceBasePropertyOverrides()
 	,bOverride_BlendMode(false)
 	,bOverride_ShadingModel(false)
 	,bOverride_DitheredLODTransition(false)
+	,bOverride_CastDynamicShadowAsMasked(false)
 	,bOverride_TwoSided(false)
 	,OpacityMaskClipValue(.333333f)
 	,BlendMode(BLEND_Opaque)
 	,ShadingModel(MSM_DefaultLit)
 	,TwoSided(0)
 	,DitheredLODTransition(0)
+	,bCastDynamicShadowAsMasked(false)
 {
 
 }
@@ -3030,23 +2921,25 @@ void FMaterialAttributeDefinitionMap::InitializeAttributeMap()
 	AttributeMap.Empty(MP_MAX + 1);
 
 	// Basic attributes
-	Add(FGuid(0x69B8D336, 0x16ED4D49, 0x9AA49729, 0x2F050F7A), TEXT("BaseColor"),		MP_BaseColor,		MCT_Float3,	FVector4(0,0,0,0), SF_Pixel);
-	Add(FGuid(0xB769B54D, 0xD08D4440, 0xABC21BA6, 0xCD27D0E2), TEXT("EmissiveColor"),	MP_EmissiveColor,	MCT_Float3,	FVector4(0,0,0,0), SF_Pixel);
-	Add(FGuid(0x0FA2821A, 0x200F4A4A, 0xB719B789, 0xC1259C64), TEXT("Normal"),			MP_Normal,			MCT_Float3,	FVector4(0,0,1,0), SF_Pixel);
-	Add(FGuid(0x57C3A161, 0x7F064296, 0xB00B24A5, 0xA496F34C), TEXT("Metallic"),		MP_Metallic,		MCT_Float,	FVector4(0,0,0,0), SF_Pixel);
+	Add(FGuid(0x69B8D336, 0x16ED4D49, 0x9AA49729, 0x2F050F7A), TEXT("BaseColor"),		MP_BaseColor,		MCT_Float3,	FVector4(0,0,0,0),	SF_Pixel);
+	Add(FGuid(0x57C3A161, 0x7F064296, 0xB00B24A5, 0xA496F34C), TEXT("Metallic"),		MP_Metallic,		MCT_Float,	FVector4(0,0,0,0),	SF_Pixel);
 	Add(FGuid(0x9FDAB399, 0x25564CC9, 0x8CD2D572, 0xC12C8FED), TEXT("Specular"),		MP_Specular,		MCT_Float,	FVector4(.5,0,0,0), SF_Pixel);
 	Add(FGuid(0xD1DD967C, 0x4CAD47D3, 0x9E6346FB, 0x08ECF210), TEXT("Roughness"),		MP_Roughness,		MCT_Float,	FVector4(.5,0,0,0), SF_Pixel);
-	Add(FGuid(0xB8F50FBA, 0x2A754EC1, 0x9EF672CF, 0xEB27BF51), TEXT("Opacity"),			MP_Opacity,			MCT_Float,	FVector4(1,0,0,0), SF_Pixel);
-	Add(FGuid(0x679FFB17, 0x2BB5422C, 0xAD520483, 0x166E0C75), TEXT("OpacityMask"),		MP_OpacityMask,		MCT_Float,	FVector4(1,0,0,0), SF_Pixel);
+	Add(FGuid(0xB769B54D, 0xD08D4440, 0xABC21BA6, 0xCD27D0E2), TEXT("EmissiveColor"),	MP_EmissiveColor,	MCT_Float3,	FVector4(0,0,0,0),	SF_Pixel);
+	Add(FGuid(0xB8F50FBA, 0x2A754EC1, 0x9EF672CF, 0xEB27BF51), TEXT("Opacity"),			MP_Opacity,			MCT_Float,	FVector4(1,0,0,0),	SF_Pixel);
+	Add(FGuid(0x679FFB17, 0x2BB5422C, 0xAD520483, 0x166E0C75), TEXT("OpacityMask"),		MP_OpacityMask,		MCT_Float,	FVector4(1,0,0,0),	SF_Pixel);
+	Add(FGuid(0x0FA2821A, 0x200F4A4A, 0xB719B789, 0xC1259C64), TEXT("Normal"),			MP_Normal,			MCT_Float3,	FVector4(0,0,1,0),	SF_Pixel);
 
 	// Advanced attributes
-	Add(FGuid(0x5B8FC679, 0x51CE4082, 0x9D777BEE, 0xF4F72C44), TEXT("SubsurfaceColor"),			MP_SubsurfaceColor,			MCT_Float3,	FVector4(1,1,1,0), SF_Pixel);
-	Add(FGuid(0xD0B0FA03, 0x14D74455, 0xA851BAC5, 0x81A0788B), TEXT("Refraction"),				MP_Refraction,				MCT_Float2,	FVector4(1,0,0,0), SF_Pixel);
-	Add(FGuid(0xE8EBD0AD, 0xB1654CBE, 0xB079C3A8, 0xB39B9F15), TEXT("AmbientOcclusion"),		MP_AmbientOcclusion,		MCT_Float,	FVector4(1,0,0,0), SF_Pixel);
-	Add(FGuid(0x0AC97EC3, 0xE3D047BA, 0xB610167D, 0xC4D919FF), TEXT("PixelDepthOffset"),		MP_PixelDepthOffset,		MCT_Float,	FVector4(0,0,0,0), SF_Pixel);
-	Add(FGuid(0xA0119D44, 0xC456450D, 0x9C39C933, 0x1F72D8D1), TEXT("TessellationMultiplier"),	MP_TessellationMultiplier,	MCT_Float,	FVector4(1,0,0,0), SF_Hull);
-	Add(FGuid(0x2091ECA2, 0xB59248EE, 0x8E2CD578, 0xD371926D), TEXT("WorldDisplacement"),		MP_WorldDisplacement,		MCT_Float3,	FVector4(0,0,0,0), SF_Domain);
-	Add(FGuid(0xF905F895, 0xD5814314, 0x916D2434, 0x8C40CE9E), TEXT("WorldPositionOffset"),		MP_WorldPositionOffset,		MCT_Float3,	FVector4(0,0,0,0), SF_Vertex);
+	Add(FGuid(0xF905F895, 0xD5814314, 0x916D2434, 0x8C40CE9E), TEXT("WorldPositionOffset"),		MP_WorldPositionOffset,		MCT_Float3,	FVector4(0,0,0,0),	SF_Vertex);
+	Add(FGuid(0x2091ECA2, 0xB59248EE, 0x8E2CD578, 0xD371926D), TEXT("WorldDisplacement"),		MP_WorldDisplacement,		MCT_Float3,	FVector4(0,0,0,0),	SF_Domain);
+	Add(FGuid(0xA0119D44, 0xC456450D, 0x9C39C933, 0x1F72D8D1), TEXT("TessellationMultiplier"),	MP_TessellationMultiplier,	MCT_Float,	FVector4(1,0,0,0),	SF_Hull);
+	Add(FGuid(0x5B8FC679, 0x51CE4082, 0x9D777BEE, 0xF4F72C44), TEXT("SubsurfaceColor"),			MP_SubsurfaceColor,			MCT_Float3,	FVector4(1,1,1,0),	SF_Pixel);
+	Add(FGuid(0x9E502E69, 0x3C8F48FA, 0x94645CFD, 0x28E5428D), TEXT("ClearCoat"),				MP_CustomData0,				MCT_Float,	FVector4(1,0,0,0),	SF_Pixel);
+	Add(FGuid(0xBE4F2FFD, 0x12FC4296, 0xB0124EEA, 0x12C28D92), TEXT("ClearCoatRoughness"),		MP_CustomData1,				MCT_Float,	FVector4(.1,0,0,0),	SF_Pixel);
+	Add(FGuid(0xE8EBD0AD, 0xB1654CBE, 0xB079C3A8, 0xB39B9F15), TEXT("AmbientOcclusion"),		MP_AmbientOcclusion,		MCT_Float,	FVector4(1,0,0,0),	SF_Pixel);
+	Add(FGuid(0xD0B0FA03, 0x14D74455, 0xA851BAC5, 0x81A0788B), TEXT("Refraction"),				MP_Refraction,				MCT_Float2,	FVector4(1,0,0,0),	SF_Pixel);
+	Add(FGuid(0x0AC97EC3, 0xE3D047BA, 0xB610167D, 0xC4D919FF), TEXT("PixelDepthOffset"),		MP_PixelDepthOffset,		MCT_Float,	FVector4(0,0,0,0),	SF_Pixel);
 
 	// Texture coordinates
 	Add(FGuid(0xD30EC284, 0xE13A4160, 0x87BB5230, 0x2ED115DC), TEXT("CustomizedUV0"), MP_CustomizedUVs0, MCT_Float2, FVector4(0,0,0,0), SF_Vertex, 0);
@@ -3058,10 +2951,6 @@ void FMaterialAttributeDefinitionMap::InitializeAttributeMap()
 	Add(FGuid(0x8214A8CA, 0x0CB944CF, 0x9DFD78DB, 0xE48BB55F), TEXT("CustomizedUV6"), MP_CustomizedUVs6, MCT_Float2, FVector4(0,0,0,0), SF_Vertex, 6);
 	Add(FGuid(0xD8F8D01F, 0xC6F74715, 0xA3CFB4FF, 0x9EF51FAC), TEXT("CustomizedUV7"), MP_CustomizedUVs7, MCT_Float2, FVector4(0,0,0,0), SF_Vertex, 7);
 
-	// Custom attributes
-	Add(FGuid(0x9E502E69, 0x3C8F48FA, 0x94645CFD, 0x28E5428D), TEXT("ClearCoat"),			MP_CustomData0, MCT_Float, FVector4(1,0,0,0), SF_Pixel);
-	Add(FGuid(0xBE4F2FFD, 0x12FC4296, 0xB0124EEA, 0x12C28D92), TEXT("ClearCoatRoughness"),	MP_CustomData1, MCT_Float, FVector4(.1,0,0,0), SF_Pixel);
-
 	// Lightmass attributes	
 	Add(FGuid(0x68934E1B, 0x70EB411B, 0x86DF5AA5, 0xDF2F626C), TEXT("DiffuseColor"),	MP_DiffuseColor,	MCT_Float3, FVector4(0,0,0,0), SF_Pixel, INDEX_NONE, bHideAttribute);
 	Add(FGuid(0xE89CBD84, 0x62EA48BE, 0x80F88521, 0x2B0C403C), TEXT("SpecularColor"),	MP_SpecularColor,	MCT_Float3, FVector4(0,0,0,0), SF_Pixel, INDEX_NONE, bHideAttribute);
@@ -3081,6 +2970,10 @@ void FMaterialAttributeDefinitionMap::Add(const FGuid& AttributeID, const FStrin
 {
 	checkf(!AttributeMap.Contains(Property), TEXT("Tried to add duplicate material property."));
 	AttributeMap.Add(Property, FMaterialAttributeDefintion(AttributeID, DisplayName, Property, ValueType, DefaultValue, ShaderFrequency, TexCoordIndex, bIsHidden, BlendFunction));
+	if (!bIsHidden)
+	{
+		OrderedVisibleAttributeList.Add(AttributeID);
+	}
 }
 
 FMaterialAttributeDefintion* FMaterialAttributeDefinitionMap::Find(const FGuid& AttributeID)
@@ -3164,6 +3057,11 @@ void FMaterialAttributeDefinitionMap::AddCustomAttribute(const FGuid& AttributeI
 	checkf(!GMaterialPropertyAttributesMap.CustomAttributes.Contains(UserAttribute), TEXT("Tried to add duplicate custom output attribute (%s)."), *DisplayName);
 #endif
 	GMaterialPropertyAttributesMap.CustomAttributes.Add(UserAttribute);
+
+	if (!UserAttribute.bIsHidden)
+	{
+		GMaterialPropertyAttributesMap.OrderedVisibleAttributeList.Add(AttributeID);
+	}
 }
 
 void FMaterialAttributeDefinitionMap::GetCustomAttributeList(TArray<FMaterialCustomOutputAttributeDefintion>& CustomAttributeList)
@@ -3177,17 +3075,10 @@ void FMaterialAttributeDefinitionMap::GetCustomAttributeList(TArray<FMaterialCus
 
 void FMaterialAttributeDefinitionMap::GetDisplayNameToIDList(TArray<TPair<FString, FGuid>>& NameToIDList)
 {
-	NameToIDList.Empty(GMaterialPropertyAttributesMap.AttributeMap.Num() + GMaterialPropertyAttributesMap.CustomAttributes.Num());
-	for (const auto& Attribute : GMaterialPropertyAttributesMap.AttributeMap)
+	NameToIDList.Empty(GMaterialPropertyAttributesMap.OrderedVisibleAttributeList.Num());
+	for (const FGuid& AttributeID : GMaterialPropertyAttributesMap.OrderedVisibleAttributeList)
 	{
-		if (!Attribute.Value.bIsHidden)
-		{
-			NameToIDList.Emplace(Attribute.Value.DisplayName, Attribute.Value.AttributeID);
-		}
-	}
-
-	for (auto& Attribute : GMaterialPropertyAttributesMap.CustomAttributes)
-	{
-		NameToIDList.Emplace(Attribute.DisplayName, Attribute.AttributeID);
+		FMaterialAttributeDefintion* Attribute = GMaterialPropertyAttributesMap.Find(AttributeID);
+		NameToIDList.Emplace(Attribute->DisplayName, AttributeID);
 	}
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.cpp
index 8ac8a6b5b948..047a09165c34 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.cpp
@@ -354,6 +354,7 @@ FUniformBufferRHIRef FUniformExpressionSet::CreateUniformBuffer(const FMaterialR
 	{
 		FMemMark Mark(FMemStack::Get());
 		void* const TempBuffer = FMemStack::Get().PushBytes(UniformBufferStruct->GetSize(),UNIFORM_BUFFER_STRUCT_ALIGNMENT);
+		checkf(TempBuffer, TEXT("Failed to allocate uniform buffer struct of %i bytes."), UniformBufferStruct->GetSize());
 
 		FLinearColor* TempVectorBuffer = (FLinearColor*)TempBuffer;
 		for(int32 VectorIndex = 0;VectorIndex < UniformVectorExpressions.Num();++VectorIndex)
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.h b/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.h
index 339768d963ae..5f087dc59d78 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.h
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MaterialUniformExpressions.h
@@ -727,7 +727,8 @@ enum EFoldedMathOperation
 	FMO_Sub,
 	FMO_Mul,
 	FMO_Div,
-	FMO_Dot
+	FMO_Dot,
+	FMO_Cross
 };
 
 /** Converts an arbitrary number into a safe divisor. i.e. FMath::Abs(Number) >= DELTA */
@@ -802,6 +803,29 @@ public:
 					OutValue.R = OutValue.G = OutValue.B = OutValue.A = DotProduct;
 				}
 				break;
+			case FMO_Cross: 
+				{
+					// Must be Float3, replicate CoerceParameter behavior
+					switch (ValueType)
+					{
+					case MCT_Float:
+						ValueA.B = ValueA.G = ValueA.R;
+						ValueB.B = ValueB.G = ValueB.R;
+						break;
+					case MCT_Float1:
+						ValueA.B = ValueA.G = 0.f;
+						ValueB.B = ValueB.G = 0.f;
+						break;
+					case MCT_Float2:
+						ValueA.B = 0.f;
+						ValueB.B = 0.f;
+						break;
+					};
+					FVector Cross = FVector::CrossProduct(FVector(ValueA), FVector(ValueB));
+					OutValue.R = Cross.X; OutValue.G = Cross.Y; OutValue.B = Cross.Z;
+					OutValue.A = 0.f;
+				}
+				break;
 			default: UE_LOG(LogMaterial, Fatal,TEXT("Unknown folded math operation: %08x"),(int32)Op);
 		};
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/MeshMaterialShader.cpp b/Engine/Source/Runtime/Engine/Private/Materials/MeshMaterialShader.cpp
index 108bf1cda780..1f9b1eba9aa8 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/MeshMaterialShader.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/MeshMaterialShader.cpp
@@ -53,6 +53,8 @@ FShaderCompileJob* FMeshMaterialShaderType::BeginCompileShader(
 	check(VertexFactoryType);
 	VertexFactoryType->ModifyCompilationEnvironment(Platform, Material, ShaderEnvironment);
 
+	Material->SetupExtaCompilationSettings(Platform, NewJob->Input.ExtraSettings);
+
 	//update material shader stats
 	UpdateMaterialShaderCompilingStats(Material);
 
diff --git a/Engine/Source/Runtime/Engine/Private/Materials/ParameterCollection.cpp b/Engine/Source/Runtime/Engine/Private/Materials/ParameterCollection.cpp
index 3ade3ec7179c..db3adfd0fdbb 100644
--- a/Engine/Source/Runtime/Engine/Private/Materials/ParameterCollection.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Materials/ParameterCollection.cpp
@@ -12,6 +12,14 @@
 #include "Materials/MaterialParameterCollection.h"
 #include "Materials/MaterialExpressionCollectionParameter.h"
 
+int32 GDeferUpdateRenderStates = 1;
+FAutoConsoleVariableRef CVarDeferUpdateRenderStates(
+	TEXT("r.DeferUpdateRenderStates"),
+	GDeferUpdateRenderStates,
+	TEXT("Whether to defer updating the render states of material parameter collections when a paramter is changed until a rendering command needs them up to date.  Deferring updates is more efficient because multiple SetVectorParameterValue and SetScalarParameterValue calls in a frame will only result in one update."),
+	ECVF_RenderThreadSafe
+);
+
 TMap<FGuid, FMaterialParameterCollectionInstanceResource*> GDefaultMaterialParameterCollectionInstances;
 
 UMaterialParameterCollection::UMaterialParameterCollection(const FObjectInitializer& ObjectInitializer)
@@ -477,7 +485,8 @@ void UMaterialParameterCollection::UpdateDefaultResource()
 UMaterialParameterCollectionInstance::UMaterialParameterCollectionInstance(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	Resource = NULL;
+	Resource = nullptr;
+	bNeedsRenderStateUpdate = false;
 }
 
 void UMaterialParameterCollectionInstance::PostInitProperties()
@@ -596,12 +605,33 @@ bool UMaterialParameterCollectionInstance::GetVectorParameterValue(FName Paramet
 
 void UMaterialParameterCollectionInstance::UpdateRenderState()
 {
-	// Propagate the new values to the rendering thread
-	TArray<FVector4> ParameterData;
-	GetParameterData(ParameterData);
-	Resource->GameThread_UpdateContents(Collection ? Collection->StateId : FGuid(), ParameterData, GetFName());
-	// Update the world's scene with the new uniform buffer pointer
-	World->UpdateParameterCollectionInstances(false);
+	// Don't need material parameters on the server
+	if (World && World->GetNetMode() == NM_DedicatedServer)
+	{
+		return;
+	}
+
+	bNeedsRenderStateUpdate = true;
+
+	if (!GDeferUpdateRenderStates)
+	{
+		DeferredUpdateRenderState();
+	}
+}
+
+void UMaterialParameterCollectionInstance::DeferredUpdateRenderState()
+{
+	if (bNeedsRenderStateUpdate)
+	{
+		// Propagate the new values to the rendering thread
+		TArray<FVector4> ParameterData;
+		GetParameterData(ParameterData);
+		Resource->GameThread_UpdateContents(Collection ? Collection->StateId : FGuid(), ParameterData, GetFName());
+		// Update the world's scene with the new uniform buffer pointer
+		World->UpdateParameterCollectionInstances(false);
+	}
+
+	bNeedsRenderStateUpdate = false;
 }
 
 void UMaterialParameterCollectionInstance::GetParameterData(TArray<FVector4>& ParameterData) const
diff --git a/Engine/Source/Runtime/Engine/Private/MeshParticleVertexFactory.cpp b/Engine/Source/Runtime/Engine/Private/MeshParticleVertexFactory.cpp
index 66666caeac34..95ab8d4282d0 100644
--- a/Engine/Source/Runtime/Engine/Private/MeshParticleVertexFactory.cpp
+++ b/Engine/Source/Runtime/Engine/Private/MeshParticleVertexFactory.cpp
@@ -106,6 +106,45 @@ private:
 	FShaderResourceParameter PrevTransformBuffer;
 };
 
+class FDummyPrevTransformBuffer : public FRenderResource
+{
+public:
+	virtual ~FDummyPrevTransformBuffer() {}
+
+	virtual void InitRHI()
+	{
+		FRHIResourceCreateInfo CreateInfo;
+		VB = RHICreateVertexBuffer(sizeof(FVector4) * 3, BUF_Static | BUF_ShaderResource, CreateInfo);
+		SRV = RHICreateShaderResourceView(VB, sizeof(FVector4), PF_A32B32G32R32F);
+	}
+
+	virtual void ReleaseRHI()
+	{
+		VB.SafeRelease();
+		SRV.SafeRelease();
+	}
+
+	virtual FString GetFriendlyName() const
+	{
+		return TEXT("FDummyPrevTransformBuffer");
+	}
+
+	inline FVertexBufferRHIParamRef GetVB() const
+	{
+		return VB;
+	}
+
+	inline FShaderResourceViewRHIParamRef GetSRV() const
+	{
+		return SRV;
+	}
+
+private:
+	FVertexBufferRHIRef VB;
+	FShaderResourceViewRHIRef SRV;
+};
+
+static TGlobalResource<FDummyPrevTransformBuffer> GDummyPrevTransformBuffer;
 
 void FMeshParticleVertexFactory::InitRHI()
 {
@@ -154,7 +193,9 @@ void FMeshParticleVertexFactory::InitRHI()
 			// Add a dummy resource to avoid crash due to missing resource
 			if (GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM4)
 			{
-				PrevTransformBuffer.Initialize(sizeof(FVector4), 3, PF_A32B32G32R32F, BUF_Dynamic);
+				PrevTransformBuffer.NumBytes = 0;
+				PrevTransformBuffer.Buffer = GDummyPrevTransformBuffer.GetVB();
+				PrevTransformBuffer.SRV = GDummyPrevTransformBuffer.GetSRV();
 			}
 		}
 
diff --git a/Engine/Source/Runtime/Engine/Private/NetConnection.cpp b/Engine/Source/Runtime/Engine/Private/NetConnection.cpp
index 883d886d6439..812fa247aa71 100644
--- a/Engine/Source/Runtime/Engine/Private/NetConnection.cpp
+++ b/Engine/Source/Runtime/Engine/Private/NetConnection.cpp
@@ -33,8 +33,9 @@
 #include "UObject/ObjectKey.h"
 #include "UObject/UObjectIterator.h"
 
-#if !UE_BUILD_SHIPPING
 static TAutoConsoleVariable<int32> CVarPingExcludeFrameTime( TEXT( "net.PingExcludeFrameTime" ), 0, TEXT( "Calculate RTT time between NIC's of server and client." ) );
+
+#if !UE_BUILD_SHIPPING
 static TAutoConsoleVariable<int32> CVarPingDisplayServerTime( TEXT( "net.PingDisplayServerTime" ), 0, TEXT( "Show server frame time" ) );
 #endif
 
@@ -98,6 +99,8 @@ UNetConnection::UNetConnection(const FObjectInitializer& ObjectInitializer)
 ,	CountedFrames		( 0 )
 ,	InBytes				( 0 )
 ,	OutBytes			( 0 )
+,	InTotalBytes		( 0 )
+,	OutTotalBytes		( 0 ) 
 ,	InPackets			( 0 )
 ,	OutPackets			( 0 )
 ,	InTotalPackets		( 0 )
@@ -415,6 +418,20 @@ void UNetConnection::EnableEncryption()
 	}
 }
 
+bool UNetConnection::IsEncryptionEnabled() const
+{
+	if (Handler.IsValid())
+	{
+		TSharedPtr<FEncryptionComponent> EncryptionComponent = Handler->GetEncryptionComponent();
+		if (EncryptionComponent.IsValid())
+		{
+			return EncryptionComponent->IsEncryptionEnabled();
+		}
+	}
+
+	return false;
+}
+
 void UNetConnection::Serialize( FArchive& Ar )
 {
 	UObject::Serialize( Ar );
@@ -921,6 +938,7 @@ void UNetConnection::ReceivedRawPacket( void* InData, int32 Count )
 	UE_LOG(LogNetTraffic, Verbose, TEXT("%6.3f: Received %i"), FPlatformTime::Seconds() - GStartTime, Count );
 	int32 PacketBytes = Count + PacketOverhead;
 	InBytes += PacketBytes;
+	InTotalBytes += PacketBytes;
 	++InPackets;
 	++InTotalPackets;
 	Driver->InBytes += PacketBytes;
@@ -1106,6 +1124,7 @@ void UNetConnection::FlushNet(bool bIgnoreSimulation)
 		QueuedBits += (PacketBytes * 8);
 
 		OutBytes += PacketBytes;
+		OutTotalBytes += PacketBytes;
 		Driver->OutBytes += PacketBytes;
 		GNetOutBytes += PacketBytes;
 		InitSendBuffer();
@@ -1239,7 +1258,6 @@ void UNetConnection::ReceivedPacket( FBitReader& Reader )
 			// If this is the client, we're reading in confirmation that our request to get frame time from server is granted
 			const bool bHasServerFrameTime = !!Reader.ReadBit();
 
-#if !UE_BUILD_SHIPPING	// We never actually read it for shipping
 			if ( !Driver->IsServer() )
 			{
 				if ( bHasServerFrameTime )
@@ -1255,7 +1273,7 @@ void UNetConnection::ReceivedPacket( FBitReader& Reader )
 				// Server remembers so he can use during SendAck to notify to client of his frame time
 				bLastHasServerFrameTime = bHasServerFrameTime;
 			}
-#endif
+
 			uint32 RemoteInKBytesPerSecond = 0;
 			Reader.SerializeIntPacked( RemoteInKBytesPerSecond );
 
@@ -1287,14 +1305,14 @@ void UNetConnection::ReceivedPacket( FBitReader& Reader )
 				{
 					UE_LOG( LogNetTraffic, Warning, TEXT( "ServerFrameTime: %2.2f" ), ServerFrameTime * 1000.0f );
 				}
-
-				const float GameTime	= ServerFrameTime + FrameTime;
-				const float RTT			= ( FPlatformTime::Seconds() - OutLagTime[Index] ) - ( CVarPingExcludeFrameTime.GetValueOnAnyThread() ? GameTime : 0.0f );
-				const float NewLag		= FMath::Max( RTT, 0.0f );
-#else
-				const float NewLag		= FPlatformTime::Seconds() - OutLagTime[Index];
 #endif
 
+				// use FApp's time because it is set closer to the beginning of the frame - we don't care about the time so far of the current frame to process the packet
+				const double CurrentTime = FApp::GetCurrentTime();
+				const double GameTime	 = ServerFrameTime;
+				const double RTT		 = (CurrentTime - OutLagTime[Index] ) - ( CVarPingExcludeFrameTime.GetValueOnAnyThread() ? GameTime : 0.0 );
+				const double NewLag		 = FMath::Max( RTT, 0.0 );
+
 				if ( OutBytesPerSecondHistory[Index] > 0 )
 				{
 					RemoteSaturation = ( 1.0f - FMath::Min( ( float )RemoteInKBytesPerSecond / ( float )OutBytesPerSecondHistory[Index], 1.0f ) ) * 100.0f;
@@ -1506,38 +1524,51 @@ void UNetConnection::ReceivedPacket( FBitReader& Reader )
 			{
 				// This was an open bunch for a channel that's already opened.
 				// We can ignore future bunches from this channel.
-				const bool bNewlyOpened = Bunch.bOpen && (!Bunch.bPartial || Bunch.bPartialInitial);
-				if (bNewlyOpened || IgnoringChannels.Contains(Bunch.ChIndex))
-				{
-					if (bNewlyOpened)
-					{
-						// NOTE: This could break if there are sufficient enough MustBeMapped GUIDs to have
-						//			prevented the actor GUID from being written.
-						//			Don't think that's currently handle by the normal system either, though.
-						if (Bunch.bHasMustBeMappedGUIDs)
-						{
-							// Skip passed any must be mapped guids.
-							uint16 NumMustBeMappedGUIDs = 0;
-							Bunch << NumMustBeMappedGUIDs;
-							for (int32 i = 0; i < NumMustBeMappedGUIDs; i++)
-							{
-								FNetworkGUID TempNetGUID;
-								Bunch << TempNetGUID;
-							}
-						}
+				const bool bNewlyOpenedActorChannel = Bunch.bOpen && (Bunch.ChType == CHTYPE_Actor) && (!Bunch.bPartial || Bunch.bPartialInitial);
 
-						FNetworkGUID ActorGUID;
-						Bunch << ActorGUID;
-						IgnoringChannels.Add(Bunch.ChIndex, ActorGUID);
+				if (bNewlyOpenedActorChannel)
+				{
+					// NOTE: This could break if this is a PartialBunch and the ActorGUID wasn't serialized.
+					//			Seems unlikely given the aggressive Flushing + increased MTU on InternalAck.
+
+					// Any GUIDs / Exports will have been read already for InternalAck connections,
+					// but we may have to skip over must-be-mapped GUIDs before we can read the actor GUID.
+
+					if (Bunch.bHasMustBeMappedGUIDs)
+					{
+						uint16 NumMustBeMappedGUIDs = 0;
+						Bunch << NumMustBeMappedGUIDs;
+
+						for (int32 i = 0; i < NumMustBeMappedGUIDs; i++)
+						{
+							FNetworkGUID NetGUID;
+							Bunch << NetGUID;
+						}
 					}
 
+					FNetworkGUID ActorGUID;
+					Bunch << ActorGUID;
+
+					IgnoringChannels.Add(Bunch.ChIndex, ActorGUID);
+				}
+
+				if (IgnoringChannels.Contains(Bunch.ChIndex))
+				{
 					if (Bunch.bClose && (!Bunch.bPartial || Bunch.bPartialFinal))
 					{
 						FNetworkGUID ActorGUID = IgnoringChannels.FindAndRemoveChecked(Bunch.ChIndex);
 						if (ActorGUID.IsStatic())
 						{
-							AActor* StaticActor = Cast<AActor>(Driver->GuidCache->GetObjectFromNetGUID(ActorGUID, false));
-							Driver->World->DestroyActor(StaticActor);
+							UObject* FoundObject = Driver->GuidCache->GetObjectFromNetGUID(ActorGUID, false);
+							if (AActor* StaticActor = Cast<AActor>(FoundObject))
+							{
+								DestroyIgnoredActor(StaticActor);
+							}
+							else
+							{
+								ensure(FoundObject == nullptr);
+								UE_LOG(LogNetTraffic, Log, TEXT("UNetConnection::ReceivedPacket: Unable to find static actor to cleanup for ignored bunch. (Channel %d NetGUID %lu)"), Bunch.ChIndex, ActorGUID.Value);
+							}
 						}
 					}
 					continue;
@@ -1637,6 +1668,7 @@ void UNetConnection::ReceivedPacket( FBitReader& Reader )
 				bSkipAck = true;
 			}
 			Driver->InBunches++;
+			Driver->InTotalBunches++;
 
 			// Disconnect if we received a corrupted packet from the client (eg server crash attempt).
 			if ( !Driver->ServerConnection && ( Bunch.IsCriticalError() || Bunch.IsError() ) )
@@ -1804,7 +1836,6 @@ void UNetConnection::SendAck(int32 AckPacketId, bool FirstTime/*=1*/)
 		AckData.WriteBit( 1 );
 		AckData.WriteIntWrapped(AckPacketId, MAX_PACKETID);
 		
-#if !UE_BUILD_SHIPPING	// We never actually write it for shipping
 		const bool bHasServerFrameTime = Driver->IsServer() ? bLastHasServerFrameTime : ( CVarPingExcludeFrameTime.GetValueOnGameThread() > 0 ? true : false );
 
 		AckData.WriteBit( bHasServerFrameTime ? 1 : 0 );
@@ -1814,10 +1845,6 @@ void UNetConnection::SendAck(int32 AckPacketId, bool FirstTime/*=1*/)
 			uint8 FrameTimeByte = FMath::Min( FMath::FloorToInt( FrameTime * 1000 ), 255 );
 			AckData << FrameTimeByte;
 		}
-#else
-		// We still write the bit in shipping to keep the format the same
-		AckData.WriteBit( 0 );
-#endif
 
 		// Notify server of our current rate per second at this time
 		uint32 InKBytesPerSecond = InBytesPerSecond / 1024;
@@ -1842,6 +1869,7 @@ int32 UNetConnection::SendRawBunch( FOutBunch& Bunch, bool InAllowMerge )
 	check(!Bunch.ReceivedAck);
 	check(!Bunch.IsError());
 	Driver->OutBunches++;
+	Driver->OutTotalBunches++;
 	TimeSensitive = 1;
 
 	// Build header.
@@ -2737,6 +2765,14 @@ void UNetConnection::SetPlayerOnlinePlatformName(const FName InPlayerOnlinePlatf
 	PlayerOnlinePlatformName = InPlayerOnlinePlatformName;
 }
 
+void UNetConnection::DestroyIgnoredActor(AActor* Actor)
+{
+	if (Driver && Driver->World)
+	{
+		Driver->World->DestroyActor(Actor, true);
+	}
+}
+
 /*-----------------------------------------------------------------------------
 	USimulatedClientNetConnection.
 -----------------------------------------------------------------------------*/
@@ -2760,7 +2796,7 @@ static void	AddSimulatedNetConnections(const TArray<FString>& Args, UWorld* Worl
 	int32 ConnectionCount = 99;
 	if (Args.Num() > 0)
 	{
-		Lex::FromString(ConnectionCount, *Args[0]);
+		LexFromString(ConnectionCount, *Args[0]);
 	}
 
 	// Search for server game net driver. Do it this way so we can cheat in PIE
diff --git a/Engine/Source/Runtime/Engine/Private/NetworkDriver.cpp b/Engine/Source/Runtime/Engine/Private/NetworkDriver.cpp
index 6bc1854f6945..711a51abc0e4 100644
--- a/Engine/Source/Runtime/Engine/Private/NetworkDriver.cpp
+++ b/Engine/Source/Runtime/Engine/Private/NetworkDriver.cpp
@@ -218,6 +218,8 @@ UNetDriver::UNetDriver(const FObjectInitializer& ObjectInitializer)
 ,	OutPackets(0)
 ,	InBunches(0)
 ,	OutBunches(0)
+,	InTotalBunches(0)
+,	OutTotalBunches(0)
 ,	InPacketsLost(0)
 ,	OutPacketsLost(0)
 ,	InOutOfOrderPackets(0)
@@ -1224,7 +1226,7 @@ bool UNetDriver::InitBase(bool bInitAsClient, FNetworkNotify* InNotify, const FU
 	if (const TCHAR* InitialConnectTimeoutOverride = URL.GetOption(TEXT("InitialConnectTimeout="), nullptr))
 	{
 		float ParsedValue;
-		Lex::FromString(ParsedValue, InitialConnectTimeoutOverride);
+		LexFromString(ParsedValue, InitialConnectTimeoutOverride);
 		if (ParsedValue != 0.0f)
 		{
 			InitialConnectTimeout = ParsedValue;
@@ -1233,7 +1235,7 @@ bool UNetDriver::InitBase(bool bInitAsClient, FNetworkNotify* InNotify, const FU
 	if (const TCHAR* ConnectionTimeoutOverride = URL.GetOption(TEXT("ConnectionTimeout="), nullptr))
 	{
 		float ParsedValue;
-		Lex::FromString(ParsedValue, ConnectionTimeoutOverride);
+		LexFromString(ParsedValue, ConnectionTimeoutOverride);
 		if (ParsedValue != 0.0f)
 		{
 			ConnectionTimeout = ParsedValue;
@@ -1251,7 +1253,6 @@ bool UNetDriver::InitBase(bool bInitAsClient, FNetworkNotify* InNotify, const FU
 	{
 		ConnectionlessHandler.Reset(nullptr);
 		InitDestroyedStartupActors();
-
 		InitReplicationDriverClass();
 		SetReplicationDriver(UReplicationDriver::CreateReplicationDriver(this, URL, GetWorld()));
 	}
@@ -2099,7 +2100,7 @@ bool UNetDriver::HandleNetDumpServerRPCCommand( const TCHAR* Cmd, FOutputDevice&
 	{
 		bool bHasNetFields = false;
 
-		ensureMsgf(!ClassIt->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("UNetDriver::HandleNetDumpServerRPCCommand: %s has flag RF_NeedPostLoad. NetFields and ClassReps will be incorrect!"), *GetFullNameSafe(*ClassIt));
+		ClassIt->SetUpRuntimeReplicationData();
 
 		for ( int32 i = 0; i < ClassIt->NetFields.Num(); i++ )
 		{
@@ -2295,6 +2296,11 @@ FActorDestructionInfo* UNetDriver::CreateDestructionInfo( UNetDriver* NetDriver,
 	}
 
 	FNetworkGUID NetGUID = NetDriver->GuidCache->GetOrAssignNetGUID( ThisActor );
+	if (NetGUID.IsDefault())
+	{
+		UE_LOG(LogNet, Error, TEXT("CreateDestructionInfo got an invalid NetGUID for %s"), *ThisActor->GetName());
+		return nullptr;
+	}
 
 	TUniquePtr<FActorDestructionInfo>& NewInfoPtr = NetDriver->DestroyedStartupOrDormantActors.FindOrAdd( NetGUID );
 	if (NewInfoPtr.IsValid() == false)
@@ -2333,8 +2339,8 @@ void UNetDriver::NotifyActorDestroyed( AActor* ThisActor, bool IsSeamlessTravel
 	// Remove the actor from the property tracker map
 	RepChangedPropertyTrackerMap.Remove(ThisActor);
 
-	FActorDestructionInfo* DestructionInfo = NULL;
-	const bool bIsServer = ServerConnection == NULL;
+	FActorDestructionInfo* DestructionInfo = nullptr;
+	const bool bIsServer = IsServer();
 	
 	if (bIsServer)
 	{
@@ -2371,7 +2377,10 @@ void UNetDriver::NotifyActorDestroyed( AActor* ThisActor, bool IsSeamlessTravel
 					// Make a new destruction info if necessary. It is necessary if the actor is dormant or recently dormant because
 					// even though the client knew about the actor at some point, it doesn't have a channel to handle destruction.
 					DestructionInfo = CreateDestructionInfo(this, ThisActor, DestructionInfo);
-					Connection->AddDestructionInfo(DestructionInfo);
+					if (DestructionInfo)
+					{
+						Connection->AddDestructionInfo(DestructionInfo);
+					}
 				}
 			}
 						
@@ -2401,7 +2410,7 @@ void UNetDriver::RemoveNetworkActor(AActor* Actor)
 
 void UNetDriver::NotifyActorRenamed(AActor* ThisActor, FName PreviousName)
 {
-	const bool bIsServer = ServerConnection == nullptr;
+	const bool bIsServer = IsServer();
 	const bool bIsActorStatic = !GuidCache->IsDynamicObject(ThisActor);
 	const bool bActorHasRole = ThisActor->GetRemoteRole() != ROLE_None;
 
@@ -2426,11 +2435,11 @@ void UNetDriver::NotifyActorRenamed(AActor* ThisActor, FName PreviousName)
 	}
 }
 
-void UNetDriver::NotifyStreamingLevelUnload( ULevel* Level)
+void UNetDriver::NotifyStreamingLevelUnload(ULevel* Level)
 {
 	if (ServerConnection && ServerConnection->PackageMap)
 	{
-		UE_LOG(LogNet, Log, TEXT("NotifyStreamingLevelUnload: %s"), *Level->GetName() );
+		UE_LOG(LogNet, Log, TEXT("NotifyStreamingLevelUnload: %s"), *Level->GetFullName() );
 
 		if (Level->LevelScriptActor)
 		{
@@ -2522,7 +2531,6 @@ void UNetDriver::FlushActorDormancy(AActor* Actor, bool bWasDormInitial)
 	// Going out of dormancy can be event based like this since it only affects clients already joined. Its more efficient in this
 	// way too, since we dont have to check every dormant actor in ::ServerReplicateActor to see if it needs to go out of dormancy
 
-#if WITH_SERVER_CODE
 	if (CVarSetNetDormancyEnabled.GetValueOnAnyThread() == 0)
 		return;
 
@@ -2535,8 +2543,6 @@ void UNetDriver::FlushActorDormancy(AActor* Actor, bool bWasDormInitial)
 	}
 
 	FlushActorDormancyInternal(Actor);
-	
-#endif // WITH_SERVER_CODE
 }
 
 void UNetDriver::NotifyActorDormancyChange(AActor* Actor, ENetDormancy OldDormancyState)
@@ -2551,7 +2557,6 @@ void UNetDriver::NotifyActorDormancyChange(AActor* Actor, ENetDormancy OldDorman
 
 void UNetDriver::FlushActorDormancyInternal(AActor *Actor)
 {
-#if WITH_SERVER_CODE
 	// Go through each connection and remove the actor from the dormancy list
 	for (int32 i=0; i < ClientConnections.Num(); ++i)
 	{
@@ -2561,7 +2566,6 @@ void UNetDriver::FlushActorDormancyInternal(AActor *Actor)
 			NetConnection->FlushDormancy(Actor);
 		}
 	}
-#endif
 }
 
 void UNetDriver::ForcePropertyCompare( AActor* Actor )
@@ -2645,6 +2649,7 @@ void UNetDriver::AddReferencedObjects(UObject* InThis, FReferenceCollector& Coll
 	for (FObjectReplicator* Replicator : This->AllOwnedReplicators)
 	{
 		Collector.AddReferencedObject(Replicator->ObjectPtr, This);
+		Collector.AddReferencedObject(Replicator->ObjectClass, This);
 	}
 }
 
@@ -4148,8 +4153,13 @@ void UNetDriver::CreateReplicatedStaticActorDestructionInfo(UNetDriver* NetDrive
 	check(NetDriver && Level);
 
 	FNetworkGUID NetGUID = NetDriver->GuidCache->AssignNewNetGUIDFromPath_Server( Info.PathName.ToString(), Info.ObjOuter.Get(), Info.ObjClass );
+	if (NetGUID.IsDefault())
+	{
+		UE_LOG(LogNet, Error, TEXT("CreateReplicatedStaticActorDestructionInfo got an invalid NetGUID for %s"), *Info.PathName.ToString());
+		return;
+	}
 
-	UE_LOG(LogNet, Log, TEXT("CreateReplicatedStaticActorDestructionInfo %s %s %s %s"), *NetDriver->GetName(), *Level->GetName(), *Info.PathName.ToString(), *NetGUID.ToString());
+	UE_LOG(LogNet, Verbose, TEXT("CreateReplicatedStaticActorDestructionInfo %s %s %s %s"), *NetDriver->GetName(), *Level->GetName(), *Info.PathName.ToString(), *NetGUID.ToString());
 	
 	TUniquePtr<FActorDestructionInfo>& NewInfoPtr = NetDriver->DestroyedStartupOrDormantActors.FindOrAdd( NetGUID );
 	if (NewInfoPtr.IsValid() == false)
diff --git a/Engine/Source/Runtime/Engine/Private/OnlineReplStructs.cpp b/Engine/Source/Runtime/Engine/Private/OnlineReplStructs.cpp
index d50e0831653a..a8a65127044c 100644
--- a/Engine/Source/Runtime/Engine/Private/OnlineReplStructs.cpp
+++ b/Engine/Source/Runtime/Engine/Private/OnlineReplStructs.cpp
@@ -12,6 +12,11 @@
 #include "EngineLogs.h"
 #include "Net/OnlineEngineInterface.h"
 
+namespace
+{
+	static const FString InvalidUniqueNetIdStr = TEXT("INVALID");
+}
+
 /** Flags relevant to network serialization of a unique id */
 enum class EUniqueIdEncodingFlags : uint8
 {
@@ -20,52 +25,84 @@ enum class EUniqueIdEncodingFlags : uint8
 	/** Data is optimized based on some assumptions (even number of [0-9][a-f][A-F] that can be packed into nibbles) */
 	IsEncoded = (1 << 0),
 	/** This unique id is empty or invalid, nothing further to serialize */
-	IsEmpty = (1 << 1)
+	IsEmpty = (1 << 1),
+	/** Reserved for future use */
+	Unused1 = (1 << 2),
+	/** Remaining bits are used for encoding the type without requiring another byte */
+	Reserved1 = (1 << 3),
+	Reserved2 = (1 << 4),
+	Reserved3 = (1 << 5),
+	Reserved4 = (1 << 6),
+	Reserved5 = (1 << 7),
+	/** Helper masks */
+	FlagsMask = (Reserved1 - 1),
+	TypeMask = (MAX_uint8 ^ FlagsMask)
 };
 ENUM_CLASS_FLAGS(EUniqueIdEncodingFlags);
 
 FArchive& operator<<( FArchive& Ar, FUniqueNetIdRepl& UniqueNetId)
 {
-	int32 Size = UniqueNetId.IsValid() ? UniqueNetId->GetSize() : 0;
-	Ar << Size;
-
-	if (Size > 0)
+	if (!Ar.IsPersistent() || Ar.IsNetArchive())
 	{
-		if (Ar.IsSaving())
+		bool bOutSuccess = false;
+		UniqueNetId.NetSerialize(Ar, nullptr, bOutSuccess);
+	}
+	else
+	{
+		int32 Size = UniqueNetId.IsValid() ? UniqueNetId->GetSize() : 0;
+		Ar << Size;
+
+		if (Size > 0)
 		{
-			check(UniqueNetId.IsValid());
-			FString Contents = UniqueNetId->ToString();
-			Ar << Contents;
+			if (Ar.IsSaving())
+			{
+				check(UniqueNetId.IsValid());
+
+				FName Type = UniqueNetId.IsValid() ? UniqueNetId->GetType() : NAME_None;
+				Ar << Type;
+
+				FString Contents = UniqueNetId->ToString();
+				Ar << Contents;
+			}
+			else if (Ar.IsLoading())
+			{
+				FName Type;
+				Ar << Type;
+
+				FString Contents;
+				Ar << Contents;	// that takes care about possible overflow
+
+				UniqueNetId.UniqueIdFromString(Type, Contents);
+			}
 		}
 		else if (Ar.IsLoading())
 		{
-			FString Contents;
-			Ar << Contents;	// that takes care about possible overflow
-
-			UniqueNetId.UniqueIdFromString(Contents);
+			// @note: replicated a nullptr unique id
+			UniqueNetId.SetUniqueNetId(nullptr);
 		}
 	}
-	else if (Ar.IsLoading())
-	{
-		// @note: replicated a nullptr unique id
-		UniqueNetId.SetUniqueNetId(nullptr);
-	}
-
 	return Ar;
 }
 
+inline uint8 GetTypeHashFromEncoding(EUniqueIdEncodingFlags inFlags)
+{
+	uint8 TypeHash = static_cast<uint8>(inFlags & EUniqueIdEncodingFlags::TypeMask) >> 3;
+	return (TypeHash < 32) ? TypeHash : 0;
+}
+
 /**
  * Possibly encode the unique net id in a smaller form
  *
  * Empty:
  *    <uint8 flags> noted it is encoded and empty
  * NonEmpty:
- * - Encoded - <uint8 flags> <uint8 encoded size> <encoded bytes>
- * - Unencoded - <uint8 flags> <serialized FString>
+ * - Encoded - <uint8 flags/type> <uint8 encoded size> <encoded bytes>
+ * - Unencoded - <uint8 flags/type> <serialized FString>
  */
 void FUniqueNetIdRepl::MakeReplicationData()
 {
-	//UE_LOG(LogNet, Warning, TEXT("MakeReplicationData %s"), *ToString());
+	//LOG_SCOPE_VERBOSITY_OVERRIDE(LogNet, ELogVerbosity::VeryVerbose);
+	//UE_LOG(LogNet, VeryVerbose, TEXT("MakeReplicationData %s"), *ToString());
 
 	FString Contents;
 	if (IsValid())
@@ -79,8 +116,12 @@ void FUniqueNetIdRepl::MakeReplicationData()
 		// For now don't allow odd chars (HexToBytes adds a 0)
 		const bool bEvenChars = (Length % 2) == 0;
 		const int32 EncodedSize32 = ((Length * sizeof(ANSICHAR)) + 1) / 2;
-		EUniqueIdEncodingFlags EncodingFlags = (bEvenChars && (EncodedSize32 < UINT8_MAX)) ? EUniqueIdEncodingFlags::IsEncoded : EUniqueIdEncodingFlags::NotEncoded;
-		if (EnumHasAllFlags(EncodingFlags, EUniqueIdEncodingFlags::IsEncoded))
+		const bool bIsNumeric = Contents.IsNumeric();
+
+		//UE_LOG(LogNet, VeryVerbose, TEXT("bEvenChars: %d bIsNumeric: %d EncodedSize: %d"), bEvenChars, bIsNumeric, EncodedSize32);
+
+		EUniqueIdEncodingFlags EncodingFlags = (bIsNumeric || (bEvenChars && (EncodedSize32 < UINT8_MAX))) ? EUniqueIdEncodingFlags::IsEncoded : EUniqueIdEncodingFlags::NotEncoded;
+		if (EnumHasAllFlags(EncodingFlags, EUniqueIdEncodingFlags::IsEncoded) && !bIsNumeric)
 		{
 			const TCHAR* const ContentChar = *Contents;
 			for (int32 i = 0; i < Length; ++i)
@@ -94,6 +135,11 @@ void FUniqueNetIdRepl::MakeReplicationData()
 			}
 		}
 
+		// Encode the unique id type
+		uint8 TypeHash = UOnlineEngineInterface::Get()->GetReplicationHashForSubsystem(GetType());
+		ensure(TypeHash < 32);
+		EncodingFlags = static_cast<EUniqueIdEncodingFlags>((TypeHash << 3) | static_cast<uint8>(EncodingFlags));
+
 		if (EnumHasAllFlags(EncodingFlags, EUniqueIdEncodingFlags::IsEncoded))
 		{
 			uint8 EncodedSize = static_cast<uint8>(EncodedSize32);
@@ -109,15 +155,16 @@ void FUniqueNetIdRepl::MakeReplicationData()
 			int32 HexEncodeLength = HexToBytes(Contents, ReplicationBytes.GetData() + HexStartOffset);
 			ensure(HexEncodeLength == EncodedSize32);
 			//Writer.Seek(HexStartOffset + HexEncodeLength);
-			//UE_LOG(LogNet, Warning, TEXT("HexEncoded UniqueId, serializing %d bytes"), ReplicationBytes.Num());
+			//UE_LOG(LogNet, VeryVerbose, TEXT("HexEncoded UniqueId, serializing %d bytes"), ReplicationBytes.Num());
 		}
 		else
 		{
 			ReplicationBytes.Empty(Length);
+
 			FMemoryWriter Writer(ReplicationBytes);
 			Writer << EncodingFlags;
 			Writer << Contents;
-			//UE_LOG(LogNet, Warning, TEXT("Normal UniqueId, serializing %d bytes"), ReplicationBytes.Num());
+			//UE_LOG(LogNet, VeryVerbose, TEXT("Normal UniqueId, serializing %d bytes"), ReplicationBytes.Num());
 		}
 	}
 	else
@@ -127,14 +174,14 @@ void FUniqueNetIdRepl::MakeReplicationData()
 		ReplicationBytes.Empty();
 		FMemoryWriter Writer(ReplicationBytes);
 		Writer << EncodingFlags;
-		//UE_LOG(LogNet, Warning, TEXT("Empty/Invalid UniqueId, serializing %d bytes"), ReplicationBytes.Num());
+		//UE_LOG(LogNet, VeryVerbose, TEXT("Empty/Invalid UniqueId, serializing %d bytes"), ReplicationBytes.Num());
 	}
 }
 
-void FUniqueNetIdRepl::UniqueIdFromString(const FString& Contents)
+void FUniqueNetIdRepl::UniqueIdFromString(FName Type, const FString& Contents)
 {
 	// Don't need to distinguish OSS interfaces here with world because we just want the create function below
-	TSharedPtr<const FUniqueNetId> UniqueNetIdPtr = UOnlineEngineInterface::Get()->CreateUniquePlayerId(Contents);
+	TSharedPtr<const FUniqueNetId> UniqueNetIdPtr = UOnlineEngineInterface::Get()->CreateUniquePlayerId(Contents, Type);
 	SetUniqueNetId(UniqueNetIdPtr);
 }
 
@@ -151,7 +198,7 @@ bool FUniqueNetIdRepl::NetSerialize(FArchive& Ar, UPackageMap* Map, bool& bOutSu
 
 		Ar.Serialize(ReplicationBytes.GetData(), ReplicationBytes.Num());
 		bOutSuccess = (ReplicationBytes.Num() > 0);
-		//UE_LOG(LogNet, Warning, TEXT("UID Save: ByteSize: %d Success: %d"), ReplicationBytes.Num(), bOutSuccess);
+		//UE_LOG(LogNet, Warning, TEXT("UID Save: Bytes: %d Success: %d"), ReplicationBytes.Num(), bOutSuccess);
 	}
 	else if (Ar.IsLoading())
 	{
@@ -167,39 +214,62 @@ bool FUniqueNetIdRepl::NetSerialize(FArchive& Ar, UPackageMap* Map, bool& bOutSu
 				if (!EnumHasAllFlags(EncodingFlags, EUniqueIdEncodingFlags::IsEmpty))
 				{
 					// Non empty and hex encoded
-					uint8 EncodedSize = 0;
-					Ar << EncodedSize;
-					if (!Ar.IsError())
+					uint8 TypeHash = GetTypeHashFromEncoding(EncodingFlags);
+					if (TypeHash == 0)
 					{
-						if (EncodedSize > 0)
+						// If no type was encoded, assume default
+						TypeHash = UOnlineEngineInterface::Get()->GetReplicationHashForSubsystem(UOnlineEngineInterface::Get()->GetDefaultOnlineSubsystemName());
+					}
+
+					if (TypeHash != 0)
+					{
+						// Get the size
+						uint8 EncodedSize = 0;
+						Ar << EncodedSize;
+						if (!Ar.IsError())
 						{
-							uint8* TempBytes = (uint8*)FMemory_Alloca(EncodedSize);
-							Ar.Serialize(TempBytes, EncodedSize);
-							if (!Ar.IsError())
+							if (EncodedSize > 0)
 							{
-								FString Contents = BytesToHex(TempBytes, EncodedSize);
-								if (Contents.Len() > 0)
+								uint8* TempBytes = (uint8*)FMemory_Alloca(EncodedSize);
+								Ar.Serialize(TempBytes, EncodedSize);
+								if (!Ar.IsError())
 								{
-									// BytesToHex loses case
-									Contents.ToLowerInline();
-									UniqueIdFromString(Contents);
+									FString Contents = BytesToHex(TempBytes, EncodedSize);
+									if (Contents.Len() > 0)
+									{
+										FName Type = UOnlineEngineInterface::Get()->GetSubsystemFromReplicationHash(TypeHash);
+										if (Type != NAME_None)
+										{
+											// BytesToHex loses case
+											Contents.ToLowerInline();
+											UniqueIdFromString(Type, Contents);
+										}
+										else
+										{
+											UE_LOG(LogNet, Warning, TEXT("Error with unique id type"));
+										}
+									}
+								}
+								else
+								{
+									UE_LOG(LogNet, Warning, TEXT("Error with encoded unique id contents"));
 								}
 							}
 							else
 							{
-								UE_LOG(LogNet, Warning, TEXT("Error with encoded unique id contents"));
+								UE_LOG(LogNet, Warning, TEXT("Empty Encoding!"));
 							}
+
+							bOutSuccess = (EncodedSize == 0) || IsValid();
 						}
 						else
 						{
-							UE_LOG(LogNet, Warning, TEXT("Empty Encoding!"));
+							UE_LOG(LogNet, Warning, TEXT("Error with encoded unique id size"));
 						}
-
-						bOutSuccess = (EncodedSize == 0) || IsValid();
 					}
 					else
 					{
-						UE_LOG(LogNet, Warning, TEXT("Error with encoded unique id size"));
+						UE_LOG(LogNet, Warning, TEXT("Error with encoded type hash"));
 					}
 				}
 				else
@@ -211,16 +281,38 @@ bool FUniqueNetIdRepl::NetSerialize(FArchive& Ar, UPackageMap* Map, bool& bOutSu
 			else
 			{
 				// Original FString serialization goes here
-				FString Contents;
-				Ar << Contents;
-				if (!Ar.IsError())
+				uint8 TypeHash = GetTypeHashFromEncoding(EncodingFlags);
+				if (TypeHash == 0)
 				{
-					UniqueIdFromString(Contents);
-					bOutSuccess = !Contents.IsEmpty();
+					// If no type was encoded, assume default
+					TypeHash = UOnlineEngineInterface::Get()->GetReplicationHashForSubsystem(UOnlineEngineInterface::Get()->GetDefaultOnlineSubsystemName());
+				}
+
+				if (TypeHash != 0)
+				{
+					FString Contents;
+					Ar << Contents;
+					if (!Ar.IsError())
+					{
+						FName Type = UOnlineEngineInterface::Get()->GetSubsystemFromReplicationHash(TypeHash);
+						if (Type != NAME_None)
+						{
+							UniqueIdFromString(Type, Contents);
+							bOutSuccess = !Contents.IsEmpty();
+						}
+						else
+						{
+							UE_LOG(LogNet, Warning, TEXT("Error with unique id type"));
+						}
+					}
+					else
+					{
+						UE_LOG(LogNet, Warning, TEXT("Error with unencoded unique id"));
+					}
 				}
 				else
 				{
-					UE_LOG(LogNet, Warning, TEXT("Error with unencoded unique id"));
+					UE_LOG(LogNet, Warning, TEXT("Error with encoded type hash"));
 				}
 			}
 		}
@@ -246,7 +338,23 @@ bool FUniqueNetIdRepl::ExportTextItem(FString& ValueStr, FUniqueNetIdRepl const&
 		return false;
 	}
 
-	ValueStr += UniqueNetId.IsValid() ? UniqueNetId->ToString() : TEXT("INVALID");
+	if (IsValid())
+	{
+		FName Type = UniqueNetId->GetType();
+		if (Type == UOnlineEngineInterface::Get()->GetDefaultOnlineSubsystemName())
+		{
+			ValueStr += FString::Printf(TEXT("%s"), *UniqueNetId->ToString());
+		}
+		else
+		{
+			ValueStr += FString::Printf(TEXT("%s:%s"), *Type.ToString(), *UniqueNetId->ToString());
+		}
+	}
+	else
+	{
+		ValueStr = InvalidUniqueNetIdStr;
+	}
+	
 	return true;
 }
 
@@ -257,17 +365,26 @@ bool FUniqueNetIdRepl::ImportTextItem(const TCHAR*& Buffer, int32 PortFlags, UOb
 	bool bShouldWarn = true;
 	if (Buffer)
 	{
-		static FString InvalidString(TEXT("INVALID"));
-		if (Buffer[0] == TEXT('\0') || Buffer == InvalidString)
+		if (Buffer[0] == TEXT('\0') || (Buffer == FString(TEXT("()"))) || (Buffer == InvalidUniqueNetIdStr))
 		{
-			// An empty string or the word invalid are just considered expected invalid FUniqueNetIdRepls. No need to warn about those.
+			// An empty string, BP empty "()", or the word invalid are just considered expected invalid FUniqueNetIdRepls. No need to warn about those.
 			bShouldWarn = false;
 		}
 		else
 		{
 			checkf(UOnlineEngineInterface::Get() && UOnlineEngineInterface::Get()->IsLoaded(), TEXT("Attempted to ImportText to FUniqueNetIdRepl while OSS is not loaded. Parent:%s"), *GetPathNameSafe(Parent));
 			FString Contents(Buffer);
-			UniqueIdFromString(Contents);
+
+			TArray<FString> Tokens;
+			int32 NumTokens = Contents.ParseIntoArray(Tokens, TEXT(":"));
+			if (NumTokens == 2)
+			{
+				UniqueIdFromString(FName(*Tokens[0]), Tokens[1]);
+			}
+			else if (NumTokens == 1)
+			{
+				UniqueIdFromString(NAME_None, Tokens[0]);
+			}
 		}
 	}
 
@@ -285,11 +402,12 @@ TSharedRef<FJsonValue> FUniqueNetIdRepl::ToJson() const
 {
 	if (IsValid())
 	{
-		return MakeShareable(new FJsonValueString(ToString()));
+		const FString JsonString = FString::Printf(TEXT("%s:%s"), *UniqueNetId->GetType().ToString(), *ToString());
+		return MakeShareable(new FJsonValueString(JsonString));
 	}
 	else
 	{
-		return MakeShareable(new FJsonValueString(TEXT("INVALID")));
+		return MakeShareable(new FJsonValueString(InvalidUniqueNetIdStr));
 	}
 }
 
@@ -298,29 +416,54 @@ void FUniqueNetIdRepl::FromJson(const FString& Json)
 	SetUniqueNetId(nullptr);
 	if (!Json.IsEmpty())
 	{
-		UniqueIdFromString(Json);
+		TArray<FString> Tokens;
+
+		int32 NumTokens = Json.ParseIntoArray(Tokens, TEXT(":"));
+		if (NumTokens == 2)
+		{
+			UniqueIdFromString(FName(*Tokens[0]), Tokens[1]);
+		}
+		else if (NumTokens == 1)
+		{
+			UniqueIdFromString(NAME_None, Tokens[0]);
+		}
 	}
 }
 
 void TestUniqueIdRepl(UWorld* InWorld)
 {
 #if !UE_BUILD_SHIPPING
-	bool bSuccess = true;
+
+#define CHECK_REPL_EQUALITY(IdOne, IdTwo, TheBool) \
+	if (!IdOne.IsValid() || !IdTwo.IsValid() || (IdOne != IdTwo) || (*IdOne != *IdTwo.GetUniqueNetId())) \
+	{ \
+		UE_LOG(LogNet, Warning, TEXT(#IdOne) TEXT(" input %s != ") TEXT(#IdTwo) TEXT(" output %s"), *IdOne.ToString(), *IdTwo.ToString()); \
+		TheBool = false; \
+	} 
+
+#define CHECK_REPL_VALIDITY(IdOne, TheBool) \
+	if (!IdOne.IsValid()) \
+	{ \
+		UE_LOG(LogNet, Warning, TEXT(#IdOne) TEXT(" is not valid")); \
+		TheBool = false; \
+	} 
+
+	bool bSetupSuccess = true;
 
 	TSharedPtr<const FUniqueNetId> UserId = UOnlineEngineInterface::Get()->GetUniquePlayerId(InWorld, 0);
 
 	FUniqueNetIdRepl EmptyIdIn;
 	if (EmptyIdIn.IsValid())
 	{
-		UE_LOG(LogNet, Warning, TEXT("EmptyId is valid."), *EmptyIdIn->ToString());
-		bSuccess = false;
+		UE_LOG(LogNet, Warning, TEXT("EmptyId is valid: %s"), *EmptyIdIn.ToString());
+		bSetupSuccess = false;
 	}
 
 	FUniqueNetIdRepl ValidIdIn(UserId);
 	if (!ValidIdIn.IsValid() || UserId != ValidIdIn.GetUniqueNetId() || *UserId != *ValidIdIn)
 	{
-		UE_LOG(LogNet, Warning, TEXT("UserId input %s != UserId output %s"), *UserId->ToString(), *ValidIdIn->ToString());
-		bSuccess = false;
+		UE_LOG(LogNet, Warning, TEXT("UserId input %s != UserId output %s"), UserId.IsValid() ? *UserId->ToString() : *InvalidUniqueNetIdStr, *ValidIdIn.ToString());
+		bSetupSuccess = false;
 	}
 
 	FUniqueNetIdRepl OddStringIdIn(UOnlineEngineInterface::Get()->CreateUniquePlayerId(TEXT("abcde")));
@@ -328,61 +471,88 @@ void TestUniqueIdRepl(UWorld* InWorld)
 	FUniqueNetIdRepl UpperCaseStringIdIn(UOnlineEngineInterface::Get()->CreateUniquePlayerId(TEXT("abcDEF")));
 
 #if 1
-	#define WAYTOOLONG TEXT("deadbeefba5eba11deadbeefba5eba11 \
+#define WAYTOOLONG TEXT("deadbeefba5eba11deadbeefba5eba11 \
+		deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11 \
 		deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11 \
-deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11 \
 		deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11 \
 		deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11 \
 		deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11")
 #else
-	#define WAYTOOLONG TEXT("deadbeef")
+#define WAYTOOLONG TEXT("deadbeef")
 #endif
 
 	FUniqueNetIdRepl WayTooLongForHexEncodingIdIn(UOnlineEngineInterface::Get()->CreateUniquePlayerId(WAYTOOLONG));
-	if (bSuccess)
+
+	CHECK_REPL_VALIDITY(OddStringIdIn, bSetupSuccess);
+	CHECK_REPL_VALIDITY(NonHexStringIdIn, bSetupSuccess);
+	CHECK_REPL_VALIDITY(UpperCaseStringIdIn, bSetupSuccess);
+	CHECK_REPL_VALIDITY(WayTooLongForHexEncodingIdIn, bSetupSuccess);
+
+	bool bRegularSerializationSuccess = true;
+	bool bNetworkSerializationSuccess = true;
+	if (bSetupSuccess)
 	{
-		// Regular Serialization
+		// Regular Serialization (persistent/disk based using FString)
 		{
 			TArray<uint8> Buffer;
 			Buffer.Empty();
 
 			// Serialize In
 			{
-				FMemoryWriter TestUniqueIdWriter(Buffer);
+				FMemoryWriter TestUniqueIdWriter(Buffer, true);
 
 				TestUniqueIdWriter << EmptyIdIn;
 				TestUniqueIdWriter << ValidIdIn;
-			}	
-			
+				TestUniqueIdWriter << OddStringIdIn;
+				TestUniqueIdWriter << NonHexStringIdIn;
+				TestUniqueIdWriter << UpperCaseStringIdIn;
+				TestUniqueIdWriter << WayTooLongForHexEncodingIdIn;
+			}
+
 			FUniqueNetIdRepl EmptyIdOut;
 			FUniqueNetIdRepl ValidIdOut;
+			FUniqueNetIdRepl OddStringIdOut;
+			FUniqueNetIdRepl NonHexStringIdOut;
+			FUniqueNetIdRepl UpperCaseStringIdOut;
+			FUniqueNetIdRepl WayTooLongForHexEncodingIdOut;
+
 			// Serialize Out
 			{
-				FMemoryReader TestUniqueIdReader(Buffer);
+				FMemoryReader TestUniqueIdReader(Buffer, true);
 				TestUniqueIdReader << EmptyIdOut;
 				TestUniqueIdReader << ValidIdOut;
+				TestUniqueIdReader << OddStringIdOut;
+				TestUniqueIdReader << NonHexStringIdOut;
+				TestUniqueIdReader << UpperCaseStringIdOut;
+				TestUniqueIdReader << WayTooLongForHexEncodingIdOut;
 			}
-			
+
 			if (EmptyIdOut.IsValid())
 			{
 				UE_LOG(LogNet, Warning, TEXT("EmptyId %s should have been invalid"), *EmptyIdOut->ToString());
-				bSuccess = false;
+				bRegularSerializationSuccess = false;
 			}
 
-			if (*UserId != *ValidIdOut.GetUniqueNetId())
+			if (EmptyIdIn != EmptyIdOut)
 			{
-				UE_LOG(LogNet, Warning, TEXT("UserId input %s != UserId output %s"), *ValidIdIn->ToString(), *ValidIdOut->ToString());
-				bSuccess = false;
+				UE_LOG(LogNet, Warning, TEXT("EmptyId In/Out mismatch"));
+				bRegularSerializationSuccess = false;
 			}
+
+			CHECK_REPL_EQUALITY(ValidIdIn, ValidIdOut, bRegularSerializationSuccess);
+			CHECK_REPL_EQUALITY(OddStringIdIn, OddStringIdOut, bRegularSerializationSuccess);
+			CHECK_REPL_EQUALITY(NonHexStringIdIn, NonHexStringIdOut, bRegularSerializationSuccess);
+			CHECK_REPL_EQUALITY(UpperCaseStringIdIn, UpperCaseStringIdOut, bRegularSerializationSuccess);
+			CHECK_REPL_EQUALITY(WayTooLongForHexEncodingIdIn, WayTooLongForHexEncodingIdOut, bRegularSerializationSuccess);
 		}
 
-		// Network serialization
+		// Network serialization (network/transient using MakeReplicationData)
 		{
 			bool bOutSuccess = false;
 
 			TArray<uint8> Buffer;
 			Buffer.Empty();
-			
+
 			// Serialize In
 			uint8 EncodingFailures = 0;
 			{
@@ -402,90 +572,152 @@ deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11deadbeefba5eba11
 				EncodingFailures += bOutSuccess ? 0 : 1;
 			}
 
-			FUniqueNetIdRepl EmptyIdOut;
-			FUniqueNetIdRepl ValidIdOut;
-			FUniqueNetIdRepl OddStringIdOut;
-			FUniqueNetIdRepl NonHexStringIdOut;
-			FUniqueNetIdRepl UpperCaseStringIdOut;
-			FUniqueNetIdRepl WayTooLongForHexEncodingIdOut;
+			if (EncodingFailures > 0)
+			{
+				UE_LOG(LogNet, Warning, TEXT("There were %d encoding failures"), EncodingFailures);
+				bNetworkSerializationSuccess = false;
+			}
+
+			if (bNetworkSerializationSuccess)
+			{
+				FUniqueNetIdRepl EmptyIdOut;
+				FUniqueNetIdRepl ValidIdOut;
+				FUniqueNetIdRepl OddStringIdOut;
+				FUniqueNetIdRepl NonHexStringIdOut;
+				FUniqueNetIdRepl UpperCaseStringIdOut;
+				FUniqueNetIdRepl WayTooLongForHexEncodingIdOut;
+
+				// Serialize Out
+				uint8 DecodingFailures = 0;
+				{
+					FMemoryReader TestUniqueIdReader(Buffer);
+
+					EmptyIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+					ValidIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+					OddStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+					NonHexStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+					UpperCaseStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+					WayTooLongForHexEncodingIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+					DecodingFailures += bOutSuccess ? 0 : 1;
+				}
+
+				if (DecodingFailures > 0)
+				{
+					UE_LOG(LogNet, Warning, TEXT("There were %d decoding failures"), DecodingFailures);
+					bNetworkSerializationSuccess = false;
+				}
+
+				if (EmptyIdOut.IsValid())
+				{
+					UE_LOG(LogNet, Warning, TEXT("EmptyId %s should have been invalid"), *EmptyIdOut->ToString());
+					bNetworkSerializationSuccess = false;
+				}
+
+				if (EmptyIdIn != EmptyIdOut)
+				{
+					UE_LOG(LogNet, Warning, TEXT("EmptyId In/Out mismatch"));
+					bRegularSerializationSuccess = false;
+				}
+
+				CHECK_REPL_EQUALITY(ValidIdIn, ValidIdOut, bNetworkSerializationSuccess);
+				CHECK_REPL_EQUALITY(OddStringIdIn, OddStringIdOut, bNetworkSerializationSuccess);
+				CHECK_REPL_EQUALITY(NonHexStringIdIn, NonHexStringIdOut, bNetworkSerializationSuccess);
+				CHECK_REPL_EQUALITY(UpperCaseStringIdIn, UpperCaseStringIdOut, bNetworkSerializationSuccess);
+				CHECK_REPL_EQUALITY(WayTooLongForHexEncodingIdIn, WayTooLongForHexEncodingIdOut, bNetworkSerializationSuccess);
+			}
+		}
+	}
+
+	bool bPlatformSerializationSuccess = true;
+#if PLATFORM_XBOXONE || PLATFORM_PS4
+	if (bSetupSuccess)
+	{
+#if PLATFORM_XBOXONE
+		TSharedPtr<const FUniqueNetId> PlatformUserId = UOnlineEngineInterface::Get()->GetUniquePlayerId(InWorld, 0, FName(TEXT("LIVE")));
+#elif PLATFORM_PS4
+		TSharedPtr<const FUniqueNetId> PlatformUserId = UOnlineEngineInterface::Get()->GetUniquePlayerId(InWorld, 0, FName(TEXT("PS4")));
+#endif
+
+		FUniqueNetIdRepl ValidPlatformIdIn(PlatformUserId);
+		if (!ValidPlatformIdIn.IsValid() || PlatformUserId != ValidPlatformIdIn.GetUniqueNetId() || *PlatformUserId != *ValidPlatformIdIn)
+		{
+			UE_LOG(LogNet, Warning, TEXT("PlatformUserId input %s != PlatformUserId output %s"), PlatformUserId.IsValid() ? *PlatformUserId->ToString() : *InvalidUniqueNetIdStr, *ValidPlatformIdIn.ToString());
+			bPlatformSerializationSuccess = false;
+		}
+
+		if (bPlatformSerializationSuccess)
+		{
+			bool bOutSuccess = false;
+
+			TArray<uint8> Buffer;
+			Buffer.Empty();
+
+			FMemoryWriter TestUniqueIdWriter(Buffer);
+
+			// Serialize In
+			uint8 EncodingFailures = 0;
+			{
+				ValidPlatformIdIn.NetSerialize(TestUniqueIdWriter, nullptr, bOutSuccess);
+				EncodingFailures += bOutSuccess ? 0 : 1;
+			}
+
+			if (EncodingFailures > 0)
+			{
+				UE_LOG(LogNet, Warning, TEXT("There were %d platform encoding failures"), EncodingFailures);
+				bPlatformSerializationSuccess = false;
+			}
+
+			FUniqueNetIdRepl ValidPlatformIdOut;
+
 			// Serialize Out
 			uint8 DecodingFailures = 0;
 			{
 				FMemoryReader TestUniqueIdReader(Buffer);
 
-				EmptyIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
-				DecodingFailures += bOutSuccess ? 0 : 1;
-				ValidIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
-				DecodingFailures += bOutSuccess ? 0 : 1;
-				OddStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
-				DecodingFailures += bOutSuccess ? 0 : 1;
-				NonHexStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
-				DecodingFailures += bOutSuccess ? 0 : 1;	
-				UpperCaseStringIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
-				DecodingFailures += bOutSuccess ? 0 : 1;
-				WayTooLongForHexEncodingIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
+				ValidPlatformIdOut.NetSerialize(TestUniqueIdReader, nullptr, bOutSuccess);
 				DecodingFailures += bOutSuccess ? 0 : 1;
 			}
 
-			if (EmptyIdOut.IsValid())
+			if (DecodingFailures > 0)
 			{
-				UE_LOG(LogNet, Warning, TEXT("EmptyId %s should have been invalid"), *EmptyIdOut->ToString());
-				bSuccess = false;
+				UE_LOG(LogNet, Warning, TEXT("There were %d platform decoding failures"), DecodingFailures);
+				bPlatformSerializationSuccess = false;
 			}
 
-			if (*UserId != *ValidIdOut.GetUniqueNetId())
-			{
-				UE_LOG(LogNet, Warning, TEXT("UserId input %s != UserId output %s"), *ValidIdIn->ToString(), *ValidIdOut->ToString());
-				bSuccess = false;
-			}
-
-			if (*OddStringIdIn != *OddStringIdOut)
-			{
-				UE_LOG(LogNet, Warning, TEXT("OddStringIdIn %s != OddStringIdOut %s"), *OddStringIdIn->ToString(), *OddStringIdOut->ToString());
-				bSuccess = false;
-			}
-
-			if (*NonHexStringIdIn != *NonHexStringIdOut)
-			{
-				UE_LOG(LogNet, Warning, TEXT("NonHexStringIdIn %s != NonHexStringIdOut %s"), *NonHexStringIdIn->ToString(), *NonHexStringIdOut->ToString());
-				bSuccess = false;
-			}
-
-			if (*UpperCaseStringIdIn != *UpperCaseStringIdOut)
-			{
-				UE_LOG(LogNet, Warning, TEXT("UpperCaseStringIdIn %s != UpperCaseStringIdOut %s"), *UpperCaseStringIdIn->ToString(), *UpperCaseStringIdOut->ToString());
-				bSuccess = false;
-			}
-
-			if (*WayTooLongForHexEncodingIdIn != *WayTooLongForHexEncodingIdOut)
-			{
-				UE_LOG(LogNet, Warning, TEXT("WayTooLongForHexEncodingIdIn %s != WayTooLongForHexEncodingIdOut %s"), *WayTooLongForHexEncodingIdIn->ToString(), *WayTooLongForHexEncodingIdOut->ToString());
-				bSuccess = false;
-			}
+			CHECK_REPL_EQUALITY(ValidPlatformIdIn, ValidPlatformIdOut, bPlatformSerializationSuccess);
 		}
 	}
+#endif
 
-	if (bSuccess)
+	bool bJSONSerializationSuccess = true;
+	if (bSetupSuccess)
 	{
+		// JSON Serialization
 		FString OutString;
 		TSharedRef<FJsonValue> JsonValue = ValidIdIn.ToJson();
-		bSuccess = JsonValue->TryGetString(OutString);
-		if (bSuccess)
+		bJSONSerializationSuccess = JsonValue->TryGetString(OutString);
+		if (bJSONSerializationSuccess)
 		{
 			FUniqueNetIdRepl NewIdOut;
 			NewIdOut.FromJson(OutString);
-			bSuccess = NewIdOut.IsValid();
+			bJSONSerializationSuccess = NewIdOut.IsValid() && (ValidIdIn == NewIdOut);
 		}
 	}
 
-	if (!bSuccess)
-	{
-		UE_LOG(LogNet, Warning, TEXT("TestUniqueIdRepl test failure!"));
-	}
+	UE_LOG(LogNet, Log, TEXT("TestUniqueIdRepl tests:"));
+	UE_LOG(LogNet, Log, TEXT("	Setup: %s"), bSetupSuccess ? TEXT("PASS") : TEXT("FAIL"));
+	UE_LOG(LogNet, Log, TEXT("	Normal: %s"), bRegularSerializationSuccess ? (bSetupSuccess ? TEXT("PASS") : TEXT("SKIPPED")) : TEXT("FAIL"));
+	UE_LOG(LogNet, Log, TEXT("	Network: %s"), bNetworkSerializationSuccess ? (bSetupSuccess ? TEXT("PASS") : TEXT("SKIPPED")) : TEXT("FAIL"));
+	UE_LOG(LogNet, Log, TEXT("	Platform: %s"), bPlatformSerializationSuccess ? (bSetupSuccess ? TEXT("PASS") : TEXT("SKIPPED")) : TEXT("FAIL"));
+	UE_LOG(LogNet, Log, TEXT("	JSON: %s"), bJSONSerializationSuccess ? (bSetupSuccess ? TEXT("PASS") : TEXT("SKIPPED")) : TEXT("FAIL"));
+	
+#undef CHECK_REPL_VALIDITY
+#undef CHECK_REPL_EQUALITY
+
 #endif
 }
-
-
-
-
-PRAGMA_ENABLE_OPTIMIZATION
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/PackageMapClient.cpp b/Engine/Source/Runtime/Engine/Private/PackageMapClient.cpp
index 733ec8b838d5..e72f6ea40167 100644
--- a/Engine/Source/Runtime/Engine/Private/PackageMapClient.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PackageMapClient.cpp
@@ -299,16 +299,17 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 	if ( Ar.AtEnd() && NetGUID.IsDynamic() )
 	{
 		// This must be a destruction info coming through or something is wrong
-		// If so, we should be both closing the channel and we should find the actor
+		// If so, we should be closing the channel
 		// This can happen when dormant actors that don't have channels get destroyed
-		if ( bIsClosingChannel == 0 || Actor == NULL )
+		// Not finding the actor can happen if the client streamed in this level after a dynamic actor has been spawned and deleted on the server side
+		if ( bIsClosingChannel == 0 )
 		{
-			UE_LOG( LogNetPackageMap, Error, TEXT( "UPackageMapClient::SerializeNewActor: bIsClosingChannel == 0 || Actor == NULL : %s" ), Actor ? *Actor->GetName() : TEXT( "NULL" ) );
+			UE_LOG( LogNetPackageMap, Error, TEXT( "UPackageMapClient::SerializeNewActor: bIsClosingChannel == 0 : %s [%s]" ), *GetNameSafe(Actor), *NetGUID.ToString() );
 			Ar.SetError();
 			return false;
 		}
 
-		UE_LOG( LogNetPackageMap, Log, TEXT( "UPackageMapClient::SerializeNewActor:  Skipping full read because we are deleting dynamic actor: %s" ), Actor ? *Actor->GetName() : TEXT( "NULL" ) );
+		UE_LOG( LogNetPackageMap, Log, TEXT( "UPackageMapClient::SerializeNewActor:  Skipping full read because we are deleting dynamic actor: %s" ), *GetNameSafe(Actor) );
 		return false;		// This doesn't mean an error. This just simply means we didn't spawn an actor.
 	}
 
@@ -323,7 +324,8 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 
 	if ( NetGUID.IsDynamic() )
 	{
-		UObject* Archetype = NULL;
+		UObject* Archetype = nullptr;
+		UObject* ActorLevel = nullptr;
 		FVector_NetQuantize10 Location;
 		FVector_NetQuantize10 LocalLocation;
 		FVector_NetQuantize10 Scale;
@@ -334,8 +336,9 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 		if (Ar.IsSaving())
 		{
 			Archetype = Actor->GetArchetype();
+			ActorLevel = Actor->GetLevel();
 
-			check( Archetype != NULL );
+			check( Archetype != nullptr );
 			check( Actor->NeedsLoadForClient() );			// We have no business sending this unless the client can load
 			check( Archetype->NeedsLoadForClient() );		// We have no business sending this unless the client can load
 
@@ -356,7 +359,12 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 		}
 
 		FNetworkGUID ArchetypeNetGUID;
-		SerializeObject( Ar, UObject::StaticClass(), Archetype, &ArchetypeNetGUID );
+		SerializeObject(Ar, UObject::StaticClass(), Archetype, &ArchetypeNetGUID);
+
+		if (Ar.IsSaving() || (Connection && (Connection->EngineNetworkProtocolVersion >= EEngineNetworkVersionHistory::HISTORY_NEW_ACTOR_OVERRIDE_LEVEL)))
+		{
+			SerializeObject(Ar, ULevel::StaticClass(), ActorLevel);
+		}
 
 #if WITH_EDITOR
 		UObjectRedirector* ArchetypeRedirector = Cast<UObjectRedirector>(Archetype);
@@ -461,29 +469,49 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 			{
 				if ( Archetype )
 				{
-					FActorSpawnParameters SpawnInfo;
-					SpawnInfo.Template = Cast<AActor>(Archetype);
-					SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
-					SpawnInfo.bRemoteOwned = true;
-					SpawnInfo.bNoFail = true;
-
-					UWorld* World = Connection->Driver->GetWorld();
-					FVector SpawnLocation = FRepMovement::RebaseOntoLocalOrigin( Location, World->OriginLocation );
-					Actor = World->SpawnActorAbsolute(Archetype->GetClass(), FTransform( Rotation, SpawnLocation ), SpawnInfo );
-					// Velocity was serialized by the server
-					if (bSerializeVelocity)
+					// For streaming levels, it's possible that the owning level has been made not-visible but is still loaded.
+					// In that case, the level will still be found but the owning world will be invalid.
+					// If that happens, wait to spawn the Actor until the next time the level is streamed in.
+					// At that point, the Server should resend any dynamic Actors.
+					ULevel* SpawnLevel = Cast<ULevel>(ActorLevel);
+					if (SpawnLevel == nullptr || SpawnLevel->GetWorld() != nullptr)
 					{
-						Actor->PostNetReceiveVelocity(Velocity);
-					}
+						FActorSpawnParameters SpawnInfo;
+						SpawnInfo.Template = Cast<AActor>(Archetype);
+						SpawnInfo.OverrideLevel = SpawnLevel;
+						SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+						SpawnInfo.bRemoteOwned = true;
+						SpawnInfo.bNoFail = true;
 
-					// Scale was serialized by the server
-					if (bSerializeScale)
+						UWorld* World = Connection->Driver->GetWorld();
+						FVector SpawnLocation = FRepMovement::RebaseOntoLocalOrigin(Location, World->OriginLocation);
+						Actor = World->SpawnActorAbsolute(Archetype->GetClass(), FTransform(Rotation, SpawnLocation), SpawnInfo);
+						if (Actor)
+						{
+							// Velocity was serialized by the server
+							if (bSerializeVelocity)
+							{
+								Actor->PostNetReceiveVelocity(Velocity);
+							}
+
+							// Scale was serialized by the server
+							if (bSerializeScale)
+							{
+								Actor->SetActorScale3D(Scale);
+							}
+
+							GuidCache->RegisterNetGUID_Client(NetGUID, Actor);
+							bActorWasSpawned = true;
+						}
+						else
+						{
+							UE_LOG(LogNetPackageMap, Warning, TEXT("SerializeNewActor: Failed to spawn actor for NetGUID: %s, Channel: %d"), *NetGUID.ToString(), Channel->ChIndex);
+						}
+					}
+					else
 					{
-						Actor->SetActorScale3D(Scale);
+						UE_LOG(LogNetPackageMap, Log, TEXT("SerializeNewActor: Actor level has invalid world (may be streamed out). NetGUID: %s, Channel: %d"), *NetGUID.ToString(), Channel->ChIndex);
 					}
-
-					GuidCache->RegisterNetGUID_Client( NetGUID, Actor );
-					bActorWasSpawned = true;
 				}
 				else
 				{
@@ -498,7 +526,7 @@ bool UPackageMapClient::SerializeNewActor(FArchive& Ar, class UActorChannel *Cha
 		UDemoNetDriver* DemoNetDriver = Cast<UDemoNetDriver>(Connection->Driver);
 		if (DemoNetDriver == nullptr)
 		{
-			UE_LOG( LogNetPackageMap, Warning, TEXT( "SerializeNewActor: Static actor failed to load: FullNetGuidPath: %s, Channel: %d" ), *GuidCache->FullNetGUIDPath( NetGUID ), Channel->ChIndex );
+			UE_LOG( LogNetPackageMap, Log, TEXT( "SerializeNewActor: Failed to find static actor: FullNetGuidPath: %s, Channel: %d" ), *GuidCache->FullNetGUIDPath( NetGUID ), Channel->ChIndex );
 		}
 
 		if (bFilterGuidRemapping)
@@ -571,7 +599,7 @@ bool FNetGUIDCache::CanClientLoadObject( const UObject* Object, const FNetworkGU
 }
 
 /** Writes an object NetGUID given the NetGUID and either the object itself, or FString full name of the object. Appends full name/path if necessary */
-void UPackageMapClient::InternalWriteObject( FArchive & Ar, FNetworkGUID NetGUID, const UObject* Object, FString ObjectPathName, UObject* ObjectOuter )
+void UPackageMapClient::InternalWriteObject( FArchive & Ar, FNetworkGUID NetGUID, UObject* Object, FString ObjectPathName, UObject* ObjectOuter )
 {
 	check( Ar.IsSaving() );
 
@@ -974,8 +1002,12 @@ UObject* UPackageMapClient::ResolvePathAndAssignNetGUID( const FNetworkGUID& Net
 static const int32 MAX_GUID_MEMORY = MAX_BUNCH_SIZE >> 3;
 static const int32 MAX_GUID_COUNT = 2048;
 
-bool UPackageMapClient::ExportNetGUIDForReplay(FNetworkGUID& NetGUID, const UObject* Object, FString& PathName, UObject* ObjOuter)
+bool UPackageMapClient::ExportNetGUIDForReplay(FNetworkGUID& NetGUID, UObject* Object, FString& PathName, UObject* ObjOuter)
 {
+	int32 const * const FoundExpectedPacketIdPtr = OverrideAckState->NetGUIDAckStatus.Find(NetGUID);
+	const int32 ExpectedPacketId = FoundExpectedPacketIdPtr ? *FoundExpectedPacketIdPtr : OverrideAckState->NetGUIDAckStatus.Emplace(NetGUID, GUID_PACKET_NOT_ACKED);
+
+	if (GUID_PACKET_ACKED != ExpectedPacketId)
 	{
 		TGuardValue<bool> ExportingGUID(GuidCache->IsExportingNetGUIDBunch, true);
 
@@ -987,6 +1019,14 @@ bool UPackageMapClient::ExportNetGUIDForReplay(FNetworkGUID& NetGUID, const UObj
 
 		check(!Writer.IsError());
 		ensureMsgf(GUIDMemory.Num() <= MAX_GUID_MEMORY, TEXT("ExportNetGUIDForReplay exceeded MAX_GUID_MEMORY. Max=%l Count=%l"), MAX_GUID_MEMORY, GUIDMemory.Num());
+
+		// It's possible InternalWriteObject has modified the NetGUIDAckStatus, so
+		// do a quick sanity check to make sure the ID wasn't removed before updating the status.
+		int32* NewPacketIdPtr = OverrideAckState->NetGUIDAckStatus.Find(NetGUID);
+		if (ensureMsgf(NewPacketIdPtr != nullptr, TEXT("ExportNetGUIDForReplay PacketID was removed for %u %s"), NetGUID.Value, *GetPathNameSafe(Object)))
+		{
+			*NewPacketIdPtr = GUID_PACKET_ACKED;
+		}
 	}
 
 	CurrentExportNetGUIDs.Empty();
@@ -995,7 +1035,7 @@ bool UPackageMapClient::ExportNetGUIDForReplay(FNetworkGUID& NetGUID, const UObj
 }
 
 /** Exports the NetGUID and paths needed to the CurrentExportBunch */
-bool UPackageMapClient::ExportNetGUID( FNetworkGUID NetGUID, const UObject* Object, FString PathName, UObject* ObjOuter )
+bool UPackageMapClient::ExportNetGUID( FNetworkGUID NetGUID, UObject* Object, FString PathName, UObject* ObjOuter )
 {
 	check( NetGUID.IsValid() );
 	check( ( Object == NULL ) == !PathName.IsEmpty() );
@@ -1417,6 +1457,8 @@ void UPackageMapClient::AppendNetFieldExports(FArchive& Archive)
 		return;
 	}
 
+	TSet< uint32 > ExportedPathInThisBunchAlready;
+
 	for (const uint64 FieldExport : NetFieldExports)
 	{
 		// Parse the path name index and cmd index out of the uint64
@@ -1430,7 +1472,7 @@ void UPackageMapClient::AppendNetFieldExports(FArchive& Archive)
 		check(NetFieldExportHandle == NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Handle);
 
 		// Export the path if we need to
-		uint32 NeedsExport = OverrideAckState->NetFieldExportGroupPathAcked.Contains(PathNameIndex) ? 0 : 1;
+		uint32 NeedsExport = (OverrideAckState->NetFieldExportGroupPathAcked.Contains(PathNameIndex) || ExportedPathInThisBunchAlready.Contains(PathNameIndex)) ? 0 : 1;
 
 		Archive.SerializeIntPacked(PathNameIndex);
 		Archive.SerializeIntPacked(NeedsExport);
@@ -1441,6 +1483,8 @@ void UPackageMapClient::AppendNetFieldExports(FArchive& Archive)
 
 			Archive << PathName;
 			Archive.SerializeIntPacked(NumExports);
+
+			ExportedPathInThisBunchAlready.Add(PathNameIndex);
 		}
 
 		Archive << NetFieldExportGroup->NetFieldExports[NetFieldExportHandle];
@@ -1840,7 +1884,7 @@ bool UPackageMapClient::NetGUIDHasBeenAckd(FNetworkGUID NetGUID)
 }
 
 /** Immediately export an Object's NetGUID. This will */
-void UPackageMapClient::HandleUnAssignedObject(const UObject* Obj)
+void UPackageMapClient::HandleUnAssignedObject(UObject* Obj)
 {
 	check( Obj != NULL );
 
@@ -2220,7 +2264,7 @@ bool FNetGUIDCache::IsNetGUIDAuthority() const
 }
 
 /** Gets or assigns a new NetGUID to this object. Returns whether the object is fully mapped or not */
-FNetworkGUID FNetGUIDCache::GetOrAssignNetGUID( const UObject* Object, const TWeakObjectPtr<UObject>* WeakObjectPtr)
+FNetworkGUID FNetGUIDCache::GetOrAssignNetGUID( UObject* Object, const TWeakObjectPtr<UObject>* WeakObjectPtr)
 {
 	// Construct WeakPtr once: either use the passed in one or create a new one.
 	const TWeakObjectPtr<UObject>& WeakObject = WeakObjectPtr ? *WeakObjectPtr : MakeWeakObjectPtr( const_cast<UObject*>( Object ) );
@@ -2283,7 +2327,7 @@ FNetworkGUID FNetGUIDCache::GetNetGUID(const UObject* Object) const
 /**
  *	Generate a new NetGUID for this object and assign it.
  */
-FNetworkGUID FNetGUIDCache::AssignNewNetGUID_Server( const UObject* Object )
+FNetworkGUID FNetGUIDCache::AssignNewNetGUID_Server( UObject* Object )
 {
 	check( IsNetGUIDAuthority() );
 
@@ -2300,7 +2344,7 @@ FNetworkGUID FNetGUIDCache::AssignNewNetGUID_Server( const UObject* Object )
 	return NewNetGuid;
 }
 
-FNetworkGUID FNetGUIDCache::AssignNewNetGUIDFromPath_Server( const FString& PathName, const UObject* ObjOuter, const UClass* ObjClass )
+FNetworkGUID FNetGUIDCache::AssignNewNetGUIDFromPath_Server( const FString& PathName, UObject* ObjOuter, UClass* ObjClass )
 {
 	if ( !IsNetGUIDAuthority() )
 	{
@@ -2351,7 +2395,7 @@ void FNetGUIDCache::RegisterNetGUID_Internal( const FNetworkGUID& NetGUID, const
  *	Associates a net guid directly with an object
  *  This function is only called on server
  */
-void FNetGUIDCache::RegisterNetGUID_Server( const FNetworkGUID& NetGUID, const UObject* Object )
+void FNetGUIDCache::RegisterNetGUID_Server( const FNetworkGUID& NetGUID, UObject* Object )
 {
 	check( Object != NULL );
 	check( IsNetGUIDAuthority() );				// Only the server should call this
@@ -2759,8 +2803,22 @@ UObject* FNetGUIDCache::GetObjectFromNetGUID( const FNetworkGUID& NetGUID, const
 				}
 				else
 				{
-					check(PendingAsyncPackages[CacheObjectPtr->PathName] == NetGUID);
-					UE_LOG(LogNetPackageMap, Log, TEXT("GetObjectFromNetGUID: Already async loading package. Path: %s, NetGUID: %s"), *CacheObjectPtr->PathName.ToString(), *NetGUID.ToString());
+					// With level streaming support we may end up trying to load the same package with a different
+					// NetGUID during replay fast-forwarding. This is because if a package was unloaded, and later
+					// re-loaded, it will likely be assigned a new NetGUID (since the TWeakObjectPtr to the old package
+					// in the cache object would have gone stale). During replay fast-forward, it's possible
+					// to see the new NetGUID before the previous one has finished loading, so here we fix up
+					// PendingAsyncPackages to refer to the new NewGUID.
+					const FNetworkGUID ExistingNetGUID = PendingAsyncPackages[CacheObjectPtr->PathName];
+					if (ExistingNetGUID != NetGUID)
+					{
+						UE_LOG(LogNetPackageMap, Log, TEXT("GetObjectFromNetGUID: Already async loading package with a different NetGUID. Path: %s, original NetGUID: %s, new NetGUID: %s"), *CacheObjectPtr->PathName.ToString(), *ExistingNetGUID.ToString(), *NetGUID.ToString());
+						PendingAsyncPackages[CacheObjectPtr->PathName] = NetGUID;
+					}
+					else
+					{
+						UE_LOG(LogNetPackageMap, Log, TEXT("GetObjectFromNetGUID: Already async loading package. Path: %s, NetGUID: %s"), *CacheObjectPtr->PathName.ToString(), *NetGUID.ToString());
+					}
 				}
 
 				// There is nothing else to do except wait on the delegate to tell us this package is done loading
@@ -3104,12 +3162,12 @@ void FNetGUIDCache::GenerateFullNetGUIDPath_r( const FNetworkGUID& NetGUID, FStr
 	}
 }
 
-uint32 FNetGUIDCache::GetClassNetworkChecksum( const UClass* Class )
+uint32 FNetGUIDCache::GetClassNetworkChecksum( UClass* Class )
 {
 	return Driver->NetCache->GetClassNetCache( Class )->GetClassChecksum();
 }
 
-uint32 FNetGUIDCache::GetNetworkChecksum( const UObject* Obj )
+uint32 FNetGUIDCache::GetNetworkChecksum( UObject* Obj )
 {
 	if ( Obj == NULL )
 	{
@@ -3117,7 +3175,7 @@ uint32 FNetGUIDCache::GetNetworkChecksum( const UObject* Obj )
 	}
 
 	// If Obj is already a class, we can use that directly
-	const UClass* Class = Cast< UClass >( Obj );
+	UClass* Class = Cast< UClass >( Obj );
 
 	return ( Class != NULL ) ? GetClassNetworkChecksum( Class ) : GetClassNetworkChecksum( Obj->GetClass() );
 }
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/FXSystem.cpp b/Engine/Source/Runtime/Engine/Private/Particles/FXSystem.cpp
index bb8d047ed69c..ccaa0baf7c4d 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/FXSystem.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/FXSystem.cpp
@@ -12,6 +12,7 @@
 #include "Particles/ParticleCurveTexture.h"
 #include "VectorField/VectorField.h"
 #include "Components/VectorFieldComponent.h"
+#include "SceneUtils.h"
 
 /*-----------------------------------------------------------------------------
 	External FX system interface.
@@ -343,6 +344,7 @@ void FFXSystem::PreRender(FRHICommandListImmediate& RHICmdList, const FGlobalDis
 {
 	if (RHISupportsGPUParticles())
 	{
+		SCOPED_DRAW_EVENT(RHICmdList, GPUParticles_PreRender);
 		UpdateMultiGPUResources(RHICmdList);
 
 		RHICmdList.SetCurrentStat(GET_STATID(STAT_CLM_FXPreRender_Prepare));
@@ -376,6 +378,7 @@ void FFXSystem::PostRenderOpaque(
 {
 	if (RHISupportsGPUParticles() && IsParticleCollisionModeSupported(GetShaderPlatform(), PCM_DepthBuffer))
 	{
+		SCOPED_DRAW_EVENT(RHICmdList, GPUParticles_PostRenderOpaque);
 		PrepareGPUSimulation(RHICmdList);
 		
 		SimulateGPUParticles(RHICmdList, EParticleSimulatePhase::CollisionDepthBuffer, ViewUniformBuffer, NULL, SceneTexturesUniformBufferStruct, SceneTexturesUniformBuffer);
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/FXSystemPrivate.h b/Engine/Source/Runtime/Engine/Private/Particles/FXSystemPrivate.h
index a39f8aba356e..e8c6b95f208f 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/FXSystemPrivate.h
+++ b/Engine/Source/Runtime/Engine/Private/Particles/FXSystemPrivate.h
@@ -9,6 +9,7 @@
 #include "CoreMinimal.h"
 #include "FXSystem.h"
 #include "VectorField.h"
+#include "ParticleSortingGPU.h"
 
 class FCanvas;
 class FGlobalDistanceFieldParameterData;
@@ -291,7 +292,6 @@ private:
 
 	/** Previous frame new particles for multi-gpu simulation*/
 	TArray<FNewParticle> LastFrameNewParticles;
-
 #if WITH_EDITOR
 	/** true if the system has been suspended. */
 	bool bSuspended;
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleComponents.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleComponents.cpp
index f586e1fa13a8..b241379b0cbe 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleComponents.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleComponents.cpp
@@ -46,6 +46,9 @@
 #include "Misc/UObjectToken.h"
 #include "Misc/MapErrors.h"
 #include "Engine/StaticMesh.h"
+#include "Interfaces/ITargetPlatform.h"
+#include "DeviceProfiles/DeviceProfile.h"
+#include "DeviceProfiles/DeviceProfileManager.h"
 #if WITH_EDITOR
 #include "Engine/InterpCurveEdSetup.h"
 #include "ObjectEditorUtils.h"
@@ -112,6 +115,11 @@ DECLARE_CYCLE_STAT(TEXT("ParticleComponent CreateRenderState Concurrent GT"), ST
 
 DEFINE_LOG_CATEGORY(LogParticles);
 
+const FGuid FParticleSystemCustomVersion::GUID(0x4A56EB40, 0x10F511DC, 0x92D3347E, 0xB2C96AE7);
+// Register the custom version with core
+FCustomVersionRegistration GRegisterParticleSystemCustomVersion(FParticleSystemCustomVersion::GUID, FParticleSystemCustomVersion::LatestVersion, TEXT("ParticleSystemVer"));
+
+
 int32 GParticleLODBias = 0;
 FAutoConsoleVariableRef CVarParticleLODBias(
 	TEXT("r.ParticleLODBias"),
@@ -131,6 +139,18 @@ static TAutoConsoleVariable<float> CVarQLSpawnRateReferenceLevel(
 	ECVF_Scalability);
 
 
+int32 OldDetailModeToBitmask(int32 OldMode)
+{
+	// low = L+M+H, Medium = M+H, High = H
+	uint32 AllDetailModes = /*(1<<EParticleDetailMode::PDM_VeryLow) |*/ (1 << EParticleDetailMode::PDM_Low) | (1 << EParticleDetailMode::PDM_Medium) | (1 << EParticleDetailMode::PDM_High);
+	uint32 DetailModeBitmask = OldMode == EDetailMode::DM_Low ? AllDetailModes
+		: OldMode == EDetailMode::DM_Medium ? ((1 << EParticleDetailMode::PDM_Medium) | (1 << EParticleDetailMode::PDM_High))
+		: OldMode == EDetailMode::DM_High ? (1 << EParticleDetailMode::PDM_High) : AllDetailModes;
+
+	return DetailModeBitmask;
+}
+
+
 /** Whether to allow particle systems to perform work. */
 ENGINE_API bool GIsAllowingParticles = true;
 
@@ -303,6 +323,11 @@ void UParticleLODLevel::CompileModules( FParticleEmitterBuildInfo& EmitterBuildI
 	EmitterBuildInfo.EstimatedMaxActiveParticleCount = CalculateMaxActiveParticleCount();
 }
 
+bool UParticleLODLevel::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
 void UParticleLODLevel::PostLoad()
 {
 	Super::PostLoad();
@@ -417,7 +442,7 @@ void UParticleLODLevel::UpdateModuleLists()
 		UParticleModuleTypeDataMesh* MeshTD = Cast<UParticleModuleTypeDataMesh>(TypeDataModule);
 		if (MeshTD
 			&& MeshTD->Mesh
-			&& MeshTD->Mesh->HasValidRenderData())
+			&& MeshTD->Mesh->HasValidRenderData(false))
 		{
 			UParticleSpriteEmitter* SpriteEmitter = Cast<UParticleSpriteEmitter>(GetOuter());
 			if (SpriteEmitter && (MeshTD->bOverrideMaterial == false))
@@ -764,6 +789,7 @@ UParticleEmitter::UParticleEmitter(const FObjectInitializer& ObjectInitializer)
 	, bDisabledLODsKeepEmitterAlive(false)
 	, bDisableWhenInsignficant(0)
 	, SignificanceLevel(EParticleSignificanceLevel::Critical)
+	, bUseLegacySpawningBehavior(false)
 {
 	// Structure to hold one-time initialization
 	struct FConstructorStatics
@@ -919,10 +945,28 @@ int32 ParticleEmitterHelper_FixupModuleLODErrors( int32 LODIndex, int32 ModuleIn
 	return Result;
 }
 
+bool UParticleEmitter::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
+void UParticleEmitter::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	Ar.UsingCustomVersion(FParticleSystemCustomVersion::GUID);
+}
+
 void UParticleEmitter::PostLoad()
 {
 	Super::PostLoad();
 
+	const int32 PSysVer = GetLinkerCustomVersion(FParticleSystemCustomVersion::GUID);
+	if (PSysVer < FParticleSystemCustomVersion::FixLegacySpawningBugs)
+	{
+		bUseLegacySpawningBehavior = true;
+	}	
+
 	for (int32 LODIndex = 0; LODIndex < LODLevels.Num(); LODIndex++)
 	{
 		UParticleLODLevel* LODLevel = LODLevels[LODIndex];
@@ -951,11 +995,7 @@ void UParticleEmitter::PostLoad()
 	// set up DetailModeFlags from deprecated DetailMode if needed
 	if (DetailModeBitmask == PDM_DefaultValue)
 	{
-		// low = L+M+H, Medium = M+H, High = H
-		uint32 AllDetailModes = /*(1<<EParticleDetailMode::PDM_VeryLow) |*/ (1 << EParticleDetailMode::PDM_Low) | (1 << EParticleDetailMode::PDM_Medium) | (1 << EParticleDetailMode::PDM_High);
-		DetailModeBitmask = DetailMode_DEPRECATED == EDetailMode::DM_Low ? AllDetailModes
-			: DetailMode_DEPRECATED == EDetailMode::DM_Medium ? ((1 << EParticleDetailMode::PDM_Medium) | (1 << EParticleDetailMode::PDM_High))
-			: DetailMode_DEPRECATED == EDetailMode::DM_High ? (1 << EParticleDetailMode::PDM_High) : AllDetailModes;
+		DetailModeBitmask = OldDetailModeToBitmask(DetailMode_DEPRECATED);
 	}
 
 #if	WITH_EDITORONLY_DATA
@@ -2026,6 +2066,7 @@ UParticleSystem::UParticleSystem(const FObjectInitializer& ObjectInitializer)
 	InsignificantReaction = EParticleSystemInsignificanceReaction::Auto;
 	InsignificanceDelay = 0.0f;
 	MaxSignificanceLevel = EParticleSignificanceLevel::Critical;
+	MaxPoolSize = 32;
 	bShouldManageSignificance = false;
 }
 
@@ -2076,15 +2117,18 @@ bool UParticleSystem::DoesAnyEmitterHaveMotionBlur(int32 LODLevelIndex) const
 {
 	for (auto& EmitterIter : Emitters)
 	{
-		auto* EmitterLOD = EmitterIter->GetLODLevel(LODLevelIndex);
-		if (!EmitterLOD)
+		if (EmitterIter)
 		{
-			continue;
-		}
+			auto* EmitterLOD = EmitterIter->GetLODLevel(LODLevelIndex);
+			if (!EmitterLOD)
+			{
+				continue;
+			}
 
-		if (EmitterLOD->TypeDataModule && EmitterLOD->TypeDataModule->IsMotionBlurEnabled())
-		{
-			return true;
+			if (EmitterLOD->TypeDataModule && EmitterLOD->TypeDataModule->IsMotionBlurEnabled())
+			{
+				return true;
+			}
 		}
 	}
 
@@ -2202,21 +2246,29 @@ void UParticleSystem::PreSave(const class ITargetPlatform* TargetPlatform)
 	for (int32 EmitterIdx = 0; EmitterIdx < NumEmitters; EmitterIdx++)
 	{
 		UParticleEmitter* Emitter = Emitters[EmitterIdx];
-		Emitter->bIsSoloing = false;
-		FLODSoloTrack& SoloTrack = SoloTracking[EmitterIdx];
-		int32 NumLODs = FMath::Min(Emitter->LODLevels.Num(),SoloTrack.SoloEnableSetting.Num());
-		for (int32 LODIdx = 0; LODIdx < NumLODs; LODIdx++)
+		if (Emitter != nullptr)
 		{
-			UParticleLODLevel* LODLevel = Emitter->LODLevels[LODIdx];
+			Emitter->bIsSoloing = false;
+			FLODSoloTrack& SoloTrack = SoloTracking[EmitterIdx];
+			int32 NumLODs = FMath::Min(Emitter->LODLevels.Num(), SoloTrack.SoloEnableSetting.Num());
+			for (int32 LODIdx = 0; LODIdx < NumLODs; LODIdx++)
 			{
-				// Restore the enabled settings - ie turn off soloing...
-				LODLevel->bEnabled = SoloTrack.SoloEnableSetting[LODIdx];
+				UParticleLODLevel* LODLevel = Emitter->LODLevels[LODIdx];
+				{
+					// Restore the enabled settings - ie turn off soloing...
+					LODLevel->bEnabled = SoloTrack.SoloEnableSetting[LODIdx];
+				}
 			}
 		}
 	}
 #endif // WITH_EDITORONLY_DATA
 }
 
+bool UParticleSystem::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
 void UParticleSystem::PostLoad()
 {
 	Super::PostLoad();
@@ -2453,6 +2505,50 @@ void UParticleSystem::PostLoad()
 	SetupSoloing();
 }
 
+void UParticleSystem::Serialize(FArchive& Ar)
+{
+	Ar.UsingCustomVersion(FParticleSystemCustomVersion::GUID);
+
+	int32 CookTargetPlatformDetailModeMask = 0xFFFFFFFF;
+#if WITH_EDITOR
+	if (Ar.IsCooking())
+	{
+		// If we're cooking, check the device profile for whether we want to eliminate all emitters that don't match the detail mode. 
+		// This will only work if scalability settings affecting detail mode can not be changed at runtime (depends on platform)!
+		//
+		if (UDeviceProfile* DeviceProfile = UDeviceProfileManager::Get().FindProfile(Ar.CookingTarget()->IniPlatformName()))
+		{
+			// if we don't prune, we assume all detail modes
+			int32 CVarDoPrune = 0;
+			if (DeviceProfile->GetConsolidatedCVarValue(TEXT("fx.PruneEmittersOnCookByDetailMode"), CVarDoPrune) && CVarDoPrune == 1)
+			{
+				// get the detail mode from the device platform ini; if it's not there, we assume all detail modes
+				int32 CVarDetailMode = 3;
+				if (DeviceProfile->GetConsolidatedCVarValue(TEXT("r.DetailMode"), CVarDetailMode))
+				{
+					CookTargetPlatformDetailModeMask = (1 << CVarDetailMode);
+				}
+			}
+		}
+
+		// if we're cooking, save only emitters with matching detail modes
+		for (int32 EmitterIdx = 0; EmitterIdx<Emitters.Num(); EmitterIdx++)
+		{
+			// null out if detail mode doesn't match
+			if (Emitters[EmitterIdx] && !(Emitters[EmitterIdx]->DetailModeBitmask & CookTargetPlatformDetailModeMask))
+			{
+				UE_LOG(LogParticles, Display, TEXT("Pruning emitter, detail mode mismatch (PDM %i) (only works if platform can't change detail mode at runtime!): %s - set fx.PruneEmittersOnCookByDetailMode to 0 in DeviceProfile.ini for the target profile to avoid"), Emitters[EmitterIdx]->DetailModeBitmask, *Emitters[EmitterIdx]->EmitterName.ToString());
+				Emitters[EmitterIdx] = nullptr;
+			}
+		}
+	}
+#endif
+
+	Super::Serialize(Ar);
+
+}
+
+
 void UParticleSystem::UpdateColorModuleClampAlpha(UParticleModuleColorBase* ColorModule)
 {
 	if (ColorModule)
@@ -2470,11 +2566,11 @@ void UParticleSystem::GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) c
 	const float BoundsSize = FixedRelativeBoundingBox.GetSize().GetMax();
 	OutTags.Add(FAssetRegistryTag("FixedBoundsSize", bUseFixedRelativeBoundingBox ? FString::Printf(TEXT("%.2f"), BoundsSize) : FString(TEXT("None")), FAssetRegistryTag::TT_Numerical));
 
-	OutTags.Add(FAssetRegistryTag("NumEmitters", Lex::ToString(Emitters.Num()), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("NumEmitters", LexToString(Emitters.Num()), FAssetRegistryTag::TT_Numerical));
 
-	OutTags.Add(FAssetRegistryTag("NumLODs", Lex::ToString(LODDistances.Num()), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("NumLODs", LexToString(LODDistances.Num()), FAssetRegistryTag::TT_Numerical));
 
-	OutTags.Add(FAssetRegistryTag("WarmupTime", Lex::ToString(WarmupTime), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("WarmupTime", LexToString(WarmupTime), FAssetRegistryTag::TT_Numerical));
 
 	// Done here instead of as an AssetRegistrySearchable string to avoid the long prefix on the enum value string
 	FString LODMethodString = TEXT("Unknown");
@@ -2509,10 +2605,10 @@ void UParticleSystem::GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) c
 			++NumEmittersAtEachSig[(int32)Emitter->SignificanceLevel];			
 		}
 	}
-	OutTags.Add(FAssetRegistryTag("Critical Emitters", Lex::ToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Critical]), FAssetRegistryTag::TT_Numerical));
-	OutTags.Add(FAssetRegistryTag("High Emitters", Lex::ToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::High]), FAssetRegistryTag::TT_Numerical));
-	OutTags.Add(FAssetRegistryTag("Medium Emitters", Lex::ToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Medium]), FAssetRegistryTag::TT_Numerical));
-	OutTags.Add(FAssetRegistryTag("Low Emitters", Lex::ToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Low]), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("Critical Emitters", LexToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Critical]), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("High Emitters", LexToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::High]), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("Medium Emitters", LexToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Medium]), FAssetRegistryTag::TT_Numerical));
+	OutTags.Add(FAssetRegistryTag("Low Emitters", LexToString(NumEmittersAtEachSig[(int32)EParticleSignificanceLevel::Low]), FAssetRegistryTag::TT_Numerical));
 
 	Super::GetAssetRegistryTags(OutTags);
 }
@@ -2550,6 +2646,16 @@ bool UParticleSystem::CanBeClusterRoot() const
 	return true;
 }
 
+bool UParticleSystem::CanBePooled()const
+{
+	if (MaxPoolSize == 0)
+	{
+		return false;
+	}
+
+	return true;
+}
+
 bool UParticleSystem::CalculateMaxActiveParticleCounts()
 {
 	bool bSuccess = true;
@@ -3188,6 +3294,7 @@ UParticleSystemComponent::UParticleSystemComponent(const FObjectInitializer& Obj
 	CustomTimeDilation = 1.0f;
 	bAllowConcurrentTick = true;
 	bAsyncWorkOutstanding = false;
+	PoolingMethod = EPSCPoolMethod::None;
 	bWasActive = false;
 #if WITH_EDITORONLY_DATA
 	EditorDetailMode = -1;
@@ -3278,7 +3385,7 @@ void UParticleSystemComponent::OnSignificanceChanged(bool bSignificant, bool bAp
 		}
 	}
 	else
-	{
+	{	
 		if (bAsync)
 		{
 			SetComponentTickEnabledAsync(false);
@@ -3605,7 +3712,7 @@ void UParticleSystemComponent::OnUnregister()
 
 	bWasActive = bIsActive && !bWasDeactivated;
 
-	ResetParticles(true);
+	ResetParticles(!bAllowRecycling);
 	FXSystem = NULL;
 	Super::OnUnregister();
 
@@ -3990,6 +4097,11 @@ FParticleDynamicData* UParticleSystemComponent::CreateDynamicData(ERHIFeatureLev
 			//QUICK_SCOPE_CYCLE_COUNTER(STAT_ParticleSystemComponent_GetDynamicData);
 			for (int32 EmitterIndex = 0; EmitterIndex < EmitterInstances.Num(); EmitterIndex++)
 			{
+				if (SceneProxy)
+				{
+					++NumMeshEmitterLODIndices;
+				}
+
 				FDynamicEmitterDataBase* NewDynamicEmitterData = NULL;
 				FParticleEmitterInstance* EmitterInst = EmitterInstances[EmitterIndex];
 				if (EmitterInst)
@@ -4010,11 +4122,6 @@ FParticleDynamicData* UParticleSystemComponent::CreateDynamicData(ERHIFeatureLev
 						}
 #endif
 						NewDynamicEmitterData = EmitterInst->GetDynamicData(bIsOwnerSeleted, InFeatureLevel);
-
-						if (SceneProxy)
-						{
-							++NumMeshEmitterLODIndices;
-						}
 					}
 					if( NewDynamicEmitterData != NULL )
 					{
@@ -4060,16 +4167,19 @@ FParticleDynamicData* UParticleSystemComponent::CreateDynamicData(ERHIFeatureLev
 				}
 			}
 
-			ENQUEUE_RENDER_COMMAND(UpdateMeshEmitterLODIndicesCmd)(
-				[Proxy = SceneProxy, NumMeshEmitterLODIndices](FRHICommandList&)
+			if (SceneProxy && static_cast<FParticleSystemSceneProxy*>(SceneProxy)->MeshEmitterLODIndices.Num() != NumMeshEmitterLODIndices)
 			{
-				if (Proxy)
+				ENQUEUE_RENDER_COMMAND(UpdateMeshEmitterLODIndicesCmd)(
+					[Proxy = SceneProxy, NumMeshEmitterLODIndices](FRHICommandList&)
 				{
-					FParticleSystemSceneProxy *ParticleProxy = static_cast<FParticleSystemSceneProxy*>(Proxy);
-					ParticleProxy->MeshEmitterLODIndices.Reset();
-					ParticleProxy->MeshEmitterLODIndices.AddZeroed(NumMeshEmitterLODIndices);
-				}
-			});
+					if (Proxy)
+					{
+						FParticleSystemSceneProxy *ParticleProxy = static_cast<FParticleSystemSceneProxy*>(Proxy);
+						ParticleProxy->MeshEmitterLODIndices.Reset();
+						ParticleProxy->MeshEmitterLODIndices.AddZeroed(NumMeshEmitterLODIndices);
+					}
+				});
+			}
 		}
 	}
 
@@ -4604,7 +4714,6 @@ bool UParticleSystemComponent::IsReadyForOwnerToAutoDestroy() const
 void UParticleSystemComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction)
 {
 	LLM_SCOPE(ELLMTag::Particles);
-
 	FInGameScopedCycleCounter InGameCycleCounter(GetWorld(), EInGamePerfTrackers::VFXSignificance, EInGamePerfTrackerThreads::GameThread, bIsManagingSignificance);
 
 	if (Template == nullptr || Template->Emitters.Num() == 0)
@@ -4679,26 +4788,26 @@ void UParticleSystemComponent::TickComponent(float DeltaTime, enum ELevelTick Ti
 	// See if DetailMode has changed since the last time we checked
 	else if (bWarmingUp == false && LastCheckedDetailMode != DetailModeCVar)
 	{
-		// Save the detail mode we've checked
-		LastCheckedDetailMode = DetailModeCVar;
-
-		if (!bRequiresReset)
+		if (!bRequiresReset && LastCheckedDetailMode!=-1)	// only reset if the component isn't new and detail mode has really changed
 		{
+			check(DetailModeCVar < NUM_DETAILMODE_FLAGS);
 			SCOPE_CYCLE_COUNTER(STAT_UParticleSystemComponent_CheckForReset);
 			for (int32 EmitterIndex = 0; EmitterIndex < EmitterInstances.Num(); ++EmitterIndex)
 			{
-				FParticleEmitterInstance* Instance = EmitterInstances[EmitterIndex];
-				if (Instance && Instance->SpriteTemplate)
+				UParticleEmitter *Emitter = Template->Emitters[EmitterIndex];
+				// [op] this should exist if the emitter hasn't been cooked out; need to reset always in this case,
+				//   not only when the detail mode doesn't match, since we need to turn emitters back on as well
+				//   and can't check for instance, because it may not have been created if detail mode is mismatched
+				if(Emitter)
 				{
-					check(DetailModeCVar < NUM_DETAILMODE_FLAGS);
-					if (!(Instance->SpriteTemplate->DetailModeBitmask & (1<<DetailModeCVar)))
-					{
-						bRequiresReset = true;
-						break;
-					}
+					bRequiresReset = true;
+					break;
 				}
 			}
 		}
+
+		// Save the detail mode we've checked
+		LastCheckedDetailMode = DetailModeCVar;
 	}
 	
 	if (bRequiresReset)
@@ -4830,7 +4939,7 @@ void UParticleSystemComponent::TickComponent(float DeltaTime, enum ELevelTick Ti
 		BurstEvents.Reset();
 		TotalActiveParticles = 0;
 		bNeedsFinalize = true;
-		if (!ThisTickFunction || !ThisTickFunction->IsCompletionHandleValid() || !CanTickInAnyThread() || FXConsoleVariables::bFreezeParticleSimulation || !FXConsoleVariables::bAllowAsyncTick ||
+		if (!ThisTickFunction || !ThisTickFunction->IsCompletionHandleValid() || !CanTickInAnyThread() || FXConsoleVariables::bFreezeParticleSimulation || !FXConsoleVariables::bAllowAsyncTick || !FApp::ShouldUseThreadingForPerformance() ||
 			GDistributionType == 0) // this may not be absolutely required, however if you are using distributions it will be glacial anyway. If you want to get rid of this, note that some modules use this indirectly as their criteria for CanTickInAnyThread
 		{
 			bDisallowAsync = true;
@@ -5224,27 +5333,29 @@ void UParticleSystemComponent::InitParticles()
 		for (int32 Idx = 0; Idx < NumEmitters; Idx++)
 		{
 			UParticleEmitter* Emitter = Template->Emitters[Idx];
-			FParticleEmitterInstance* Instance = NumInstances == 0 ? NULL : EmitterInstances[Idx];
-			check(GlobalDetailMode < NUM_DETAILMODE_FLAGS);
-			const bool bDetailModeAllowsRendering = DetailMode <= GlobalDetailMode && (Emitter->DetailModeBitmask & (1<<GlobalDetailMode));
-			const bool bShouldCreateAndOrInit = bDetailModeAllowsRendering && Emitter->HasAnyEnabledLODs() && bCanEverRender;
-
-			if (bShouldCreateAndOrInit)
+			if (Emitter)
 			{
-				if (Instance)
-				{
-					Instance->SetHaltSpawning(false);
-					Instance->SetHaltSpawningExternal(false);
-				}
-				else
-				{
-					Instance = Emitter->CreateInstance(this);
-					EmitterInstances[Idx] = Instance;
-				}
+				FParticleEmitterInstance* Instance = NumInstances == 0 ? NULL : EmitterInstances[Idx];
+				check(GlobalDetailMode < NUM_DETAILMODE_FLAGS);
+				const bool bDetailModeAllowsRendering = DetailMode <= GlobalDetailMode && (Emitter->DetailModeBitmask & (1 << GlobalDetailMode));
+				const bool bShouldCreateAndOrInit = bDetailModeAllowsRendering && Emitter->HasAnyEnabledLODs() && bCanEverRender;
 
-				if (Instance)
+				if (bShouldCreateAndOrInit)
 				{
-					Instance->bEnabled = true;
+					if (Instance)
+					{
+						Instance->SetHaltSpawning(false);
+						Instance->SetHaltSpawningExternal(false);
+					}
+					else
+					{
+						Instance = Emitter->CreateInstance(this);
+						EmitterInstances[Idx] = Instance;
+					}
+
+					if (Instance)
+					{
+						Instance->bEnabled = true;
 						Instance->InitParameters(Emitter, this);
 						Instance->Init();
 
@@ -5252,10 +5363,10 @@ void UParticleSystemComponent::InitParticles()
 						bSetLodLevels |= !bIsFirstCreate;//Only set lod levels if we init any instances and it's not the first creation time.
 					}
 				}
-			else
-			{
-				if (Instance)
+				else
 				{
+					if (Instance)
+					{
 #if STATS
 						Instance->PreDestructorCall();
 #endif
@@ -5263,6 +5374,7 @@ void UParticleSystemComponent::InitParticles()
 						EmitterInstances[Idx] = NULL;
 						bClearDynamicData = true;
 					}
+				}
 			}
 		}
 
@@ -5390,6 +5502,12 @@ void UParticleSystemComponent::SetTemplate(class UParticleSystem* NewTemplate)
 	SCOPE_CYCLE_COUNTER(STAT_ParticleSetTemplateTime);
 	ForceAsyncWorkCompletion(STALL);
 
+	if (PoolingMethod != EPSCPoolMethod::None)
+	{
+		UE_LOG(LogParticles, Warning, TEXT("Changing template on pooled PSC! This will cause a reinit of the system, eliminating the benefits of pooling! Please avoid doing this.\nPSC: %s\nOld Template: %s\nNew Template")
+		, *GetFullName(), *Template->GetFullName(), *NewTemplate->GetFullName());
+	}
+
 	if( GIsAllowingParticles || GIsEditor ) 
 	{
 		bIsViewRelevanceDirty = true;
@@ -5678,6 +5796,9 @@ void UParticleSystemComponent::ActivateSystem(bool bFlagAsJustAttached)
 
 void UParticleSystemComponent::Complete()
 {
+	UWorld* World = GetWorld();
+	check(World);
+
 	UE_LOG(LogParticles, Verbose,
 		TEXT("HasCompleted()==true @ %fs %s"), GetWorld()->TimeSeconds,
 		Template != NULL ? *Template->GetName() : TEXT("NULL"));
@@ -5689,7 +5810,16 @@ void UParticleSystemComponent::Complete()
 	bIsActive = false;
 	SetComponentTickEnabled(false);
 
-	if (bAutoDestroy)
+	if (PoolingMethod == EPSCPoolMethod::AutoRelease)
+	{
+		World->GetPSCPool().ReclaimWorldParticleSystem(this);
+	}
+	else if (PoolingMethod == EPSCPoolMethod::ManualRelease_OnComplete)
+	{
+		PoolingMethod = EPSCPoolMethod::ManualRelease;
+		World->GetPSCPool().ReclaimWorldParticleSystem(this);
+	}
+	else if (bAutoDestroy)
 	{
 		DestroyComponent();
 	}
@@ -5971,6 +6101,32 @@ void UParticleSystemComponent::SetTrailSourceData(FName InFirstSocketName, FName
 	}
 }
 
+void UParticleSystemComponent::ReleaseToPool()
+{
+	if (PoolingMethod != EPSCPoolMethod::ManualRelease)
+	{
+		UE_LOG(LogParticles, Warning, TEXT("Manually releasing a PSC to the pool that was not spawned with EPSCPoolMethod::ManualRelease. Template=%s Component=%s"),
+			Template ? *Template->GetPathName() : TEXT("NULL"),
+			*GetPathName()
+		);
+		return;
+	}
+	
+	if (bWasCompleted)
+	{
+		//If we're already complete then release to the pool straight away.
+		UWorld* World = GetWorld();
+		check(World);
+		World->GetPSCPool().ReclaimWorldParticleSystem(this);
+	}
+	else
+	{
+		//If we haven't completed, deactivate and defer release to pool.
+		PoolingMethod = EPSCPoolMethod::ManualRelease_OnComplete;
+		Deactivate();
+	}
+}
+
 bool UParticleSystemComponent::HasCompleted()
 {
 	ForceAsyncWorkCompletion(STALL);
@@ -7398,6 +7554,65 @@ int32 UParticleSystemComponent::GetNamedMaterialIndex(FName Name) const
 	return INDEX_NONE;
 }
 
+/**
+* Archive for counting struct memory
+*/
+class FArchiveCountStructMem : public FArchive
+{
+public:
+	FArchiveCountStructMem()
+		: Num(0), Max(0)
+	{
+		ArIsCountingMemory = 1;
+	}
+	void CountBytes(SIZE_T InNum, SIZE_T InMax)
+	{
+		Num += InNum;
+		Max += InMax;
+	}
+	SIZE_T Num, Max;
+};
+
+uint32 UParticleSystemComponent::GetApproxMemoryUsage()const
+{
+	uint32 MemUsage = sizeof(UParticleSystemComponent);
+
+	for (FParticleEmitterInstance* EmitterInst : EmitterInstances)
+	{
+		if (EmitterInst)
+		{
+			int32 Num;
+			int32 Max;
+			EmitterInst->GetAllocatedSize(Num, Max);
+			MemUsage += Max;
+		}
+	}
+
+	FParticleSystemSceneProxy* PSysSceneProxy = (FParticleSystemSceneProxy*)SceneProxy;
+	if (PSysSceneProxy != NULL)
+	{
+		MemUsage += PSysSceneProxy->GetAllocatedSize();
+		if (FParticleDynamicData* DynamicData = PSysSceneProxy->GetDynamicData())
+		{
+			MemUsage += DynamicData->GetMemoryFootprint();
+			for (FDynamicEmitterDataBase* DynEmitterData : DynamicData->DynamicEmitterDataArray)
+			{
+				if (DynEmitterData)
+				{
+					//TODO: This is gonna be relatively small but maybe work adding
+					//MemUsage += DynEmitterData->GetMemoryFootprint();
+
+					FArchiveCountStructMem MemCounter;
+					const_cast<FDynamicEmitterReplayDataBase&>(DynEmitterData->GetSource()).Serialize(MemCounter);
+
+					MemUsage += MemCounter.Max;
+				}
+			}
+		}
+	}
+
+	return MemUsage;
+}
 
 UParticleSystemReplay::UParticleSystemReplay(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleCurveTexture.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleCurveTexture.cpp
index b8831d403be8..a1444fda6e4a 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleCurveTexture.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleCurveTexture.cpp
@@ -32,15 +32,15 @@ static_assert(GParticleCurveTextureSizeY <= 0xffff, "Curve texture taller than s
 TGlobalResource<FParticleCurveTexture> GParticleCurveTexture;
 
 /*-----------------------------------------------------------------------------
-	Shaders used for uploading curves to the GPU.
+Shaders used for uploading curves to the GPU.
 -----------------------------------------------------------------------------*/
 
 /**
 * Uniform buffer to hold parameters for particle curve injection.
 */
 BEGIN_UNIFORM_BUFFER_STRUCT(FParticleCurveInjectionParameters, )
-	UNIFORM_MEMBER(FVector2D, PixelScale)
-	UNIFORM_MEMBER(FVector2D, CurveOffset)
+UNIFORM_MEMBER(FVector2D, PixelScale)
+UNIFORM_MEMBER(FVector2D, CurveOffset)
 END_UNIFORM_BUFFER_STRUCT(FParticleCurveInjectionParameters)
 
 IMPLEMENT_UNIFORM_BUFFER_STRUCT(FParticleCurveInjectionParameters, TEXT("ParticleCurveInjection"));
@@ -48,8 +48,8 @@ IMPLEMENT_UNIFORM_BUFFER_STRUCT(FParticleCurveInjectionParameters, TEXT("Particl
 typedef TUniformBufferRef<FParticleCurveInjectionParameters> FParticleCurveInjectionBufferRef;
 
 /**
- * Vertex shader for simulating particles on the GPU.
- */
+* Vertex shader for simulating particles on the GPU.
+*/
 class FParticleCurveInjectionVS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(FParticleCurveInjectionVS, Global);
@@ -73,8 +73,8 @@ public:
 	}
 
 	/**
-	 * Sets parameters for particle injection.
-	 */
+	* Sets parameters for particle injection.
+	*/
 	void SetParameters(FRHICommandList& RHICmdList, const FVector2D& CurveOffset)
 	{
 		FParticleCurveInjectionParameters Parameters;
@@ -88,8 +88,8 @@ public:
 };
 
 /**
- * Pixel shader for simulating particles on the GPU.
- */
+* Pixel shader for simulating particles on the GPU.
+*/
 class FParticleCurveInjectionPS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(FParticleCurveInjectionPS, Global);
@@ -125,8 +125,8 @@ IMPLEMENT_SHADER_TYPE(, FParticleCurveInjectionVS, TEXT("/Engine/Private/Particl
 IMPLEMENT_SHADER_TYPE(, FParticleCurveInjectionPS, TEXT("/Engine/Private/ParticleCurveInjectionShader.usf"), TEXT("PixelMain"), SF_Pixel);
 
 /**
- * Vertex declaration for injecting curves.
- */
+* Vertex declaration for injecting curves.
+*/
 class FParticleCurveInjectionVertexDeclaration : public FRenderResource
 {
 public:
@@ -167,12 +167,12 @@ public:
 TGlobalResource<FParticleCurveInjectionVertexDeclaration> GParticleCurveInjectionVertexDeclaration;
 
 /**
- * Transfers a list of curves to a texture on the GPU. All main memory allocated
- * for curve samples is released.
- * @param CurveTextureRHI - The texture holding the curve data, sampled by the particle simulation shader
- * @param CurveTextureTargetRHI - The render target for the curve texture.
- * @param InPendingCurves - Curves to be stored on the GPU.
- */
+* Transfers a list of curves to a texture on the GPU. All main memory allocated
+* for curve samples is released.
+* @param CurveTextureRHI - The texture holding the curve data, sampled by the particle simulation shader
+* @param CurveTextureTargetRHI - The render target for the curve texture.
+* @param InPendingCurves - Curves to be stored on the GPU.
+*/
 static void InjectCurves(
 	FRHICommandListImmediate& RHICmdList,
 	FTexture2DRHIParamRef CurveTextureRHI,
@@ -631,4 +631,4 @@ void FParticleCurveTexture::SubmitPendingCurves()
 
 		PendingCurves.Reset();
 	}
-}
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleEmitterInstances.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleEmitterInstances.cpp
index fa04fa0e165b..4fe318a8563a 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleEmitterInstances.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleEmitterInstances.cpp
@@ -1319,6 +1319,7 @@ void FParticleEmitterInstance::UpdateBoundingBox(float DeltaTime)
 			? Component->GetComponentToWorld().ToMatrixWithScale() 
 			: FMatrix::Identity;
 
+		bool bSkipDoubleSpawnUpdate = !SpriteTemplate->bUseLegacySpawningBehavior;
 		for (int32 i=0; i<ActiveParticles; i++)
 		{
 			DECLARE_PARTICLE(Particle, ParticleData + ParticleStride * ParticleIndices[i]);
@@ -1326,15 +1327,22 @@ void FParticleEmitterInstance::UpdateBoundingBox(float DeltaTime)
 			// Do linear integrator and update bounding box
 			// Do angular integrator, and wrap result to within +/- 2 PI
 			Particle.OldLocation	= Particle.Location;
-			if ((Particle.Flags & STATE_Particle_Freeze) == 0)
+
+			bool bJustSpawned = (Particle.Flags & STATE_Particle_JustSpawned) != 0;
+			Particle.Flags &= ~STATE_Particle_JustSpawned;
+
+			//Don't update position for newly spawned particles. They already have a partial update applied during spawn.
+			bool bSkipUpdate = bJustSpawned && bSkipDoubleSpawnUpdate;
+
+			if ((Particle.Flags & STATE_Particle_Freeze) == 0 && !bSkipUpdate)
 			{
 				if ((Particle.Flags & STATE_Particle_FreezeTranslation) == 0)
 				{
-					NewLocation	= Particle.Location + (DeltaTime * Particle.Velocity);
+					NewLocation = Particle.Location + (DeltaTime * Particle.Velocity);
 				}
 				else
 				{
-					NewLocation	= Particle.Location;
+					NewLocation = Particle.Location;
 				}
 				if ((Particle.Flags & STATE_Particle_FreezeRotation) == 0)
 				{
@@ -1342,13 +1350,13 @@ void FParticleEmitterInstance::UpdateBoundingBox(float DeltaTime)
 				}
 				else
 				{
-					NewRotation	= Particle.Rotation;
+					NewRotation = Particle.Rotation;
 				}
 			}
 			else
 			{
-				NewLocation	= Particle.Location;
-				NewRotation	= Particle.Rotation;
+				NewLocation = Particle.Location;
+				NewRotation = Particle.Rotation;
 			}
 
 			float LocalMax(0.0f);
@@ -1679,14 +1687,21 @@ void FParticleEmitterInstance::ResetParticleParameters(float DeltaTime)
 		}
 	}
 
+	bool bSkipDoubleSpawnUpdate = !SpriteTemplate->bUseLegacySpawningBehavior;
 	for (int32 ParticleIndex = 0; ParticleIndex < ActiveParticles; ParticleIndex++)
 	{
 		DECLARE_PARTICLE(Particle, ParticleData + ParticleStride * ParticleIndices[ParticleIndex]);
 		Particle.Velocity		= Particle.BaseVelocity;
 		Particle.Size = GetParticleBaseSize(Particle);
 		Particle.RotationRate	= Particle.BaseRotationRate;
-		Particle.Color			= Particle.BaseColor;
-		Particle.RelativeTime	+= Particle.OneOverMaxLifetime * DeltaTime;
+		Particle.Color = Particle.BaseColor;
+
+		bool bJustSpawned = (Particle.Flags & STATE_Particle_JustSpawned) != 0;
+
+		//Don't update position for newly spawned particles. They already have a partial update applied during spawn.
+		bool bSkipUpdate = bJustSpawned && bSkipDoubleSpawnUpdate;
+
+		Particle.RelativeTime	+= bSkipUpdate ? 0.0f : Particle.OneOverMaxLifetime * DeltaTime;
 
 		if (CameraPayloadOffset > 0)
 		{
@@ -2045,9 +2060,8 @@ float FParticleEmitterInstance::Spawn(float DeltaTime)
 			NewCount = ActiveParticles + Number + BurstCount;
 		}
 
-		float	BurstIncrement = (BurstCount > 0.0f) ? (1.f / BurstCount) : 0.0f;
-		float	BurstStartTime = DeltaTime * BurstIncrement;
-
+		float	BurstIncrement = SpriteTemplate->bUseLegacySpawningBehavior ? (BurstCount > 0.0f) ? (1.f / BurstCount) : 0.0f : 0.0f;
+		float	BurstStartTime = SpriteTemplate->bUseLegacySpawningBehavior ? DeltaTime * BurstIncrement : 0.0f;
 
 		if (NewCount >= MaxActiveParticles)
 		{
@@ -2110,53 +2124,74 @@ void FParticleEmitterInstance::SpawnParticles( int32 Count, float StartTime, flo
 	{
 		LODLevel->EventGenerator->HandleParticleBurst(this, EventPayload, Count);
 	}
-
-	UParticleLODLevel* HighestLODLevel = SpriteTemplate->LODLevels[0];
-	float SpawnTime = StartTime;
-	float Interp = 1.0f;
-	const float InterpIncrement = (Count > 0 && Increment > 0.0f) ? (1.0f / (float)Count) : 0.0f;
-	for (int32 i=0; i<Count; i++)
+	
+	auto SpawnInternal = [&](bool bLegacySpawnBehavior)
 	{
-		check(ActiveParticles <= MaxActiveParticles);
-		DECLARE_PARTICLE_PTR(Particle, ParticleData + ParticleStride * ParticleIndices[ActiveParticles]);
-		const uint32 CurrentParticleIndex = ActiveParticles++;
-		StartTime -= Increment;
-		Interp -= InterpIncrement;
-
-		PreSpawn(Particle, InitialLocation, InitialVelocity);
-		for (int32 ModuleIndex = 0; ModuleIndex < LODLevel->SpawnModules.Num(); ModuleIndex++)
+		UParticleLODLevel* HighestLODLevel = SpriteTemplate->LODLevels[0];
+		float SpawnTime = StartTime;
+		float Interp = 1.0f;
+		const float InterpIncrement = (Count > 0 && Increment > 0.0f) ? (1.0f / (float)Count) : 0.0f;
+		for (int32 i = 0; i < Count; i++)
 		{
-			UParticleModule* SpawnModule = LODLevel->SpawnModules[ModuleIndex];
-			if (SpawnModule->bEnabled)
+			check(ActiveParticles <= MaxActiveParticles);
+			DECLARE_PARTICLE_PTR(Particle, ParticleData + ParticleStride * ParticleIndices[ActiveParticles]);
+			const uint32 CurrentParticleIndex = ActiveParticles++;
+
+			if (bLegacySpawnBehavior)
 			{
-				UParticleModule* OffsetModule = HighestLODLevel->SpawnModules[ModuleIndex];
-				SpawnModule->Spawn(this, GetModuleDataOffset(OffsetModule), SpawnTime, Particle);
-
-				ensureMsgf(!Particle->Location.ContainsNaN(), TEXT("NaN in Particle Location. Template: %s, Component: %s"), Component ? *GetNameSafe(Component->Template) : TEXT("UNKNOWN"), *GetPathNameSafe(Component));
+				StartTime -= Increment;
+				Interp -= InterpIncrement;
 			}
-		}
-		PostSpawn(Particle, Interp, SpawnTime);
 
-		// Spawn modules may set a relative time greater than 1.0f to indicate that a particle should not be spawned. We kill these particles.
-		if(Particle->RelativeTime > 1.0f)
-		{
-			KillParticle(CurrentParticleIndex);
-
-			// Process next particle
-			continue;
-		}
-
-		if (EventPayload)
-		{
-			if (EventPayload->bSpawnEventsPresent)
+			PreSpawn(Particle, InitialLocation, InitialVelocity);
+			for (int32 ModuleIndex = 0; ModuleIndex < LODLevel->SpawnModules.Num(); ModuleIndex++)
 			{
-				LODLevel->EventGenerator->HandleParticleSpawned(this, EventPayload, Particle);
-			}
-		}
+				UParticleModule* SpawnModule = LODLevel->SpawnModules[ModuleIndex];
+				if (SpawnModule->bEnabled)
+				{
+					UParticleModule* OffsetModule = HighestLODLevel->SpawnModules[ModuleIndex];
+					SpawnModule->Spawn(this, GetModuleDataOffset(OffsetModule), SpawnTime, Particle);
 
-		INC_DWORD_STAT(STAT_SpriteParticlesSpawned);
+					ensureMsgf(!Particle->Location.ContainsNaN(), TEXT("NaN in Particle Location. Template: %s, Component: %s"), Component ? *GetNameSafe(Component->Template) : TEXT("UNKNOWN"), *GetPathNameSafe(Component));
+				}
+			}
+			PostSpawn(Particle, Interp, SpawnTime);
+
+			// Spawn modules may set a relative time greater than 1.0f to indicate that a particle should not be spawned. We kill these particles.
+			if (Particle->RelativeTime > 1.0f)
+			{
+				KillParticle(CurrentParticleIndex);
+
+				// Process next particle
+				continue;
+			}
+			
+			if (EventPayload)
+			{
+				if (EventPayload->bSpawnEventsPresent)
+				{
+					LODLevel->EventGenerator->HandleParticleSpawned(this, EventPayload, Particle);
+				}
+			}
+
+			if (!bLegacySpawnBehavior)
+			{
+				SpawnTime -= Increment;
+				Interp -= InterpIncrement;
+			}
+
+			INC_DWORD_STAT(STAT_SpriteParticlesSpawned);
+		}
+	};
+
+	if (SpriteTemplate->bUseLegacySpawningBehavior)
+	{
+		SpawnInternal(true);
+	}
+	else
+	{
+		SpawnInternal(false);
 	}
-
 }
 
 UParticleLODLevel* FParticleEmitterInstance::GetCurrentLODLevelChecked()
@@ -2316,6 +2351,7 @@ void FParticleEmitterInstance::PostSpawn(FBaseParticle* Particle, float Interpol
 
 	// Store a sequence counter.
 	Particle->Flags |= ((ParticleCounter++) & STATE_CounterMask);
+	Particle->Flags |= STATE_Particle_JustSpawned;
 }
 
 /**
@@ -3353,6 +3389,7 @@ void FParticleMeshEmitterInstance::UpdateBoundingBox(float DeltaTime)
 		FPlatformMisc::Prefetch(ParticleData, ParticleStride * ParticleIndices[0]);
 		FPlatformMisc::Prefetch(ParticleData, (ParticleIndices[0] * ParticleStride) + PLATFORM_CACHE_LINE_SIZE);
 
+		bool bSkipDoubleSpawnUpdate = !SpriteTemplate->bUseLegacySpawningBehavior;
 		for (int32 i=0; i<ActiveParticles; i++)
 		{
 			DECLARE_PARTICLE(Particle, ParticleData + ParticleStride * ParticleIndices[i]);
@@ -3361,7 +3398,14 @@ void FParticleMeshEmitterInstance::UpdateBoundingBox(float DeltaTime)
 
 			// Do linear integrator and update bounding box
 			Particle.OldLocation = Particle.Location;
-			if ((Particle.Flags & STATE_Particle_Freeze) == 0)
+
+			bool bJustSpawned = (Particle.Flags & STATE_Particle_JustSpawned) != 0;
+			Particle.Flags &= ~STATE_Particle_JustSpawned;
+
+			//Don't update position for newly spawned particles. They already have a partial update applied during spawn.
+			bool bSkipUpdate = bJustSpawned && bSkipDoubleSpawnUpdate;
+
+			if ((Particle.Flags & STATE_Particle_Freeze) == 0 && !bSkipUpdate)
 			{
 				if ((Particle.Flags & STATE_Particle_FreezeTranslation) == 0)
 				{
@@ -3520,7 +3564,7 @@ void FParticleMeshEmitterInstance::PostSpawn(FBaseParticle* Particle, float Inte
 bool FParticleMeshEmitterInstance::IsDynamicDataRequired(UParticleLODLevel* InCurrentLODLevel)
 {
 	return MeshTypeData->Mesh != NULL
-		&& MeshTypeData->Mesh->HasValidRenderData()
+		&& MeshTypeData->Mesh->HasValidRenderData(false)
 		&& FParticleEmitterInstance::IsDynamicDataRequired(InCurrentLODLevel);
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleGpuSimulation.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleGpuSimulation.cpp
index b9f6da944744..4c2caec5df1b 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleGpuSimulation.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleGpuSimulation.cpp
@@ -58,12 +58,23 @@ DECLARE_GPU_STAT_NAMED(ParticleSimulation, TEXT("Particle Simulation"));
 #define TRACK_TILE_ALLOCATIONS 0
 
 /** The texture size allocated for GPU simulation. */
-extern const int32 GParticleSimulationTextureSizeX = 1024;
-extern const int32 GParticleSimulationTextureSizeY = 1024;
+int32 GParticleSimulationTextureSizeX = 1024;
+static FAutoConsoleVariableRef CVarParticleSimulationSizeX(
+	TEXT("fx.GPUSimulationTextureSizeX"),
+	GParticleSimulationTextureSizeX,
+	TEXT("GPU Particle simulation texture X dimension (default=1024); set in project renderer settings, potentially overridden by device profile."),
+	ECVF_ReadOnly
+);
+
+int32 GParticleSimulationTextureSizeY = 1024;
+FAutoConsoleVariableRef CVarParticleSimulationSizeY(
+	TEXT("fx.GPUSimulationTextureSizeY"),
+	GParticleSimulationTextureSizeY,
+	TEXT("GPU Particle simulation texture Y dimension (default=1024); set in project renderer settings, potentially overridden by device profile."),
+	ECVF_ReadOnly
+);
+
 
-/** Texture size must be power-of-two. */
-static_assert((GParticleSimulationTextureSizeX & (GParticleSimulationTextureSizeX - 1)) == 0, "Particle simulation texture size X is not a power of two.");
-static_assert((GParticleSimulationTextureSizeY & (GParticleSimulationTextureSizeY - 1)) == 0, "Particle simulation texture size Y is not a power of two.");
 
 /** The tile size. Texture space is allocated in TileSize x TileSize units. */
 const int32 GParticleSimulationTileSize = 4;
@@ -71,13 +82,11 @@ const int32 GParticlesPerTile = GParticleSimulationTileSize * GParticleSimulatio
 
 /** Tile size must be power-of-two and <= each dimension of the simulation texture. */
 static_assert((GParticleSimulationTileSize & (GParticleSimulationTileSize - 1)) == 0, "Particle simulation tile size is not a power of two.");
-static_assert(GParticleSimulationTileSize <= GParticleSimulationTextureSizeX, "Particle simulation tile size is larger than texture.");
-static_assert(GParticleSimulationTileSize <= GParticleSimulationTextureSizeY, "Particle simulation tile size is larger than texture.");
 
 /** How many tiles are in the simulation textures. */
-const int32 GParticleSimulationTileCountX = GParticleSimulationTextureSizeX / GParticleSimulationTileSize;
-const int32 GParticleSimulationTileCountY = GParticleSimulationTextureSizeY / GParticleSimulationTileSize;
-const int32 GParticleSimulationTileCount = GParticleSimulationTileCountX * GParticleSimulationTileCountY;
+int32 GParticleSimulationTileCountX = 0;
+int32 GParticleSimulationTileCountY = 0;
+int32 GParticleSimulationTileCount = 0;
 
 /** GPU particle rendering code assumes that the number of particles per instanced draw is <= 16. */
 static_assert(MAX_PARTICLES_PER_INSTANCE <= 16, "Max particles per instance is greater than 16.");
@@ -128,6 +137,15 @@ public:
 	FParticleTileAllocator()
 		: FreeTileCount(GParticleSimulationTileCount)
 	{
+		/** Texture size must be power-of-two. */
+		check((GParticleSimulationTextureSizeX & (GParticleSimulationTextureSizeX - 1)) == 0); // fx.GPUSimulationTextureSizeX is not a power of two.
+		check((GParticleSimulationTextureSizeY & (GParticleSimulationTextureSizeY - 1)) == 0); // fx.GPUSimulationTextureSizeY is not a power of two.
+
+		check(GParticleSimulationTileSize <= GParticleSimulationTextureSizeX); // Particle simulation tile size is larger than fx.GPUSimulationTextureSizeX.
+		check(GParticleSimulationTileSize <= GParticleSimulationTextureSizeY); // Particle simulation tile size is larger than fx.GPUSimulationTextureSizeY.
+
+		FreeTiles.AddUninitialized(GParticleSimulationTileCount);
+
 		for ( int32 TileIndex = 0; TileIndex < GParticleSimulationTileCount; ++TileIndex )
 		{
 			FreeTiles[TileIndex] = GParticleSimulationTileCount - TileIndex - 1;
@@ -153,7 +171,7 @@ public:
 	 * Frees a tile so it may be allocated by another emitter.
 	 * @param TileIndex - The index of the tile to free.
 	 */
-	void Free( uint32 TileIndex )
+	void Free( int32 TileIndex )
 	{
 		FScopeLock Lock(&CriticalSection);
 		check( TileIndex < GParticleSimulationTileCount );
@@ -174,7 +192,7 @@ public:
 private:
 
 	/** List of free tiles. */
-	uint32 FreeTiles[GParticleSimulationTileCount];
+	TArray<uint32> FreeTiles;
 	/** How many tiles are in the free list. */
 	int32 FreeTileCount;
 
@@ -366,6 +384,8 @@ public:
 	/** Vertex buffer that points to the current sorted vertex buffer. */
 	FParticleIndicesVertexBuffer SortedVertexBuffer;
 
+	FParticleSortBuffers ParticleSortBuffers;
+
 	/** Frame index used to track double buffered resources on the GPU. */
 	int32 FrameIndex;
 
@@ -486,8 +506,6 @@ private:
 	FParticleTileAllocator TileAllocator;
 };
 
-/** The global vertex buffers used for sorting particles on the GPU. */
-TGlobalResource<FParticleSortBuffers> GParticleSortBuffers(GParticleSimulationTextureSizeX * GParticleSimulationTextureSizeY);
 
 /*-----------------------------------------------------------------------------
 	Vertex factory.
@@ -523,6 +541,7 @@ typedef TUniformBufferRef<FGPUSpriteEmitterUniformParameters> FGPUSpriteEmitterU
  */
 BEGIN_UNIFORM_BUFFER_STRUCT( FGPUSpriteEmitterDynamicUniformParameters, )
 	UNIFORM_MEMBER( FVector2D, LocalToWorldScale )
+	UNIFORM_MEMBER( float, EmitterInstRandom)
 	UNIFORM_MEMBER( FVector4, AxisLockRight )
 	UNIFORM_MEMBER( FVector4, AxisLockUp )
 	UNIFORM_MEMBER( FVector4, DynamicColor)
@@ -949,8 +968,6 @@ public:
 	{
 		FGlobalShader::ModifyCompilationEnvironment( Parameters, OutEnvironment );
 		OutEnvironment.SetDefine(TEXT("TILES_PER_INSTANCE"), TILES_PER_INSTANCE);
-		OutEnvironment.SetDefine(TEXT("TILE_SIZE_X"), (float)GParticleSimulationTileSize / (float)GParticleSimulationTextureSizeX);
-		OutEnvironment.SetDefine(TEXT("TILE_SIZE_Y"), (float)GParticleSimulationTileSize / (float)GParticleSimulationTextureSizeY);
 
 		if (Parameters.Platform == SP_OPENGL_ES2_ANDROID)
 		{
@@ -968,6 +985,8 @@ public:
 		: FGlobalShader(Initializer)
 	{
 		TileOffsets.Bind(Initializer.ParameterMap, TEXT("TileOffsets"));
+		TileSizeX.Bind(Initializer.ParameterMap, TEXT("TileSizeX"));
+		TileSizeY.Bind(Initializer.ParameterMap, TEXT("TileSizeY"));
 	}
 
 	/** Serialization. */
@@ -975,6 +994,8 @@ public:
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize( Ar );
 		Ar << TileOffsets;
+		Ar << TileSizeX;
+		Ar << TileSizeY;
 		return bShaderHasOutdatedParameters;
 	}
 
@@ -986,12 +1007,16 @@ public:
 		{
 			RHICmdList.SetShaderResourceViewParameter(VertexShaderRHI, TileOffsets.GetBaseIndex(), TileOffsetsRef);
 		}
+		SetShaderValue(RHICmdList, VertexShaderRHI, TileSizeX, (float)GParticleSimulationTileSize / (float)GParticleSimulationTextureSizeX);
+		SetShaderValue(RHICmdList, VertexShaderRHI, TileSizeY, (float)GParticleSimulationTileSize / (float)GParticleSimulationTextureSizeY);
 	}
 
 private:
 
 	/** Buffer from which to read tile offsets. */
 	FShaderResourceParameter TileOffsets;
+	FShaderParameter TileSizeX;
+	FShaderParameter TileSizeY;
 };
 
 /**
@@ -2102,8 +2127,6 @@ public:
 	{
 		FGlobalShader::ModifyCompilationEnvironment( Parameters, OutEnvironment );
 		OutEnvironment.SetDefine( TEXT("THREAD_COUNT"), PARTICLE_BOUNDS_THREADS );
-		OutEnvironment.SetDefine( TEXT("TEXTURE_SIZE_X"), GParticleSimulationTextureSizeX );
-		OutEnvironment.SetDefine( TEXT("TEXTURE_SIZE_Y"), GParticleSimulationTextureSizeY );
 		OutEnvironment.CompilerFlags.Add( CFLAG_StandardOptimization );
 	}
 
@@ -2120,6 +2143,8 @@ public:
 		PositionTexture.Bind( Initializer.ParameterMap, TEXT("PositionTexture") );
 		PositionTextureSampler.Bind( Initializer.ParameterMap, TEXT("PositionTextureSampler") );
 		OutBounds.Bind( Initializer.ParameterMap, TEXT("OutBounds") );
+		TextureSizeX.Bind(Initializer.ParameterMap, TEXT("TextureSizeX"));
+		TextureSizeY.Bind(Initializer.ParameterMap, TEXT("TextureSizeY"));
 	}
 
 	/** Serialization. */
@@ -2130,6 +2155,8 @@ public:
 		Ar << PositionTexture;
 		Ar << PositionTextureSampler;
 		Ar << OutBounds;
+		Ar << TextureSizeX;
+		Ar << TextureSizeY;
 		return bShaderHasOutdatedParameters;
 	}
 
@@ -2165,6 +2192,9 @@ public:
 		{
 			RHICmdList.SetShaderTexture(ComputeShaderRHI, PositionTexture.GetBaseIndex(), PositionTextureRHI);
 		}
+
+		SetShaderValue(RHICmdList, ComputeShaderRHI, TextureSizeX, GParticleSimulationTextureSizeX);
+		SetShaderValue(RHICmdList, ComputeShaderRHI, TextureSizeY, GParticleSimulationTextureSizeY);
 	}
 
 	/**
@@ -2192,6 +2222,8 @@ private:
 	FShaderResourceParameter PositionTextureSampler;
 	/** Output key buffer. */
 	FShaderResourceParameter OutBounds;
+	FShaderParameter TextureSizeX;
+	FShaderParameter TextureSizeY;
 };
 IMPLEMENT_SHADER_TYPE(,FParticleBoundsCS,TEXT("/Engine/Private/ParticleBoundsShader.usf"),TEXT("ComputeParticleBounds"),SF_Compute);
 
@@ -3083,6 +3115,8 @@ class FGPUSpriteParticleEmitterInstance : public FParticleEmitterInstance
 	FRandomStream RandomStream;
 	/** The number of times this emitter should loop. */
 	int32 AllowedLoopCount;
+	/** Random number per emitter to allow each emitter to be randomized */
+	float EmitterInstRandom;
 
 	/**
 	 * Information used to spawn particles.
@@ -3107,17 +3141,17 @@ class FGPUSpriteParticleEmitterInstance : public FParticleEmitterInstance
 
 public:
 
-	/** Initialization constructor. */
-	FGPUSpriteParticleEmitterInstance(FFXSystem* InFXSystem, FGPUSpriteEmitterInfo& InEmitterInfo)
-		: FXSystem(InFXSystem)
-		, EmitterInfo(InEmitterInfo)
-		, LocalVectorFieldRotation(FRotator::ZeroRotator)
-		, PointAttractorStrength(0.0f)
-		, PendingDeltaSeconds(0.0f)
-		, OffsetSeconds(0.0f)
-		, TileToAllocateFrom(INDEX_NONE)
-		, FreeParticlesInTile(0)
-		, AllowedLoopCount(0)
+/** Initialization constructor. */
+FGPUSpriteParticleEmitterInstance(FFXSystem* InFXSystem, FGPUSpriteEmitterInfo& InEmitterInfo)
+	: FXSystem(InFXSystem)
+	, EmitterInfo(InEmitterInfo)
+	, LocalVectorFieldRotation(FRotator::ZeroRotator)
+	, PointAttractorStrength(0.0f)
+	, PendingDeltaSeconds(0.0f)
+	, OffsetSeconds(0.0f)
+	, TileToAllocateFrom(INDEX_NONE)
+	, FreeParticlesInTile(0)
+	, AllowedLoopCount(0)
 	{
 		Simulation = new FParticleSimulationGPU();
 		if (EmitterInfo.LocalVectorField.Field)
@@ -3276,6 +3310,8 @@ public:
 		DynamicData->MacroUVOverride.Radius = LODLevel->RequiredModule->MacroUVRadius;
 		DynamicData->MacroUVOverride.Position = LODLevel->RequiredModule->MacroUVPosition;
 
+		DynamicData->EmitterDynamicParameters.EmitterInstRandom = EmitterInstRandom;
+
 		const bool bSimulateGPUParticles = 
 			FXConsoleVariables::bFreezeGPUSimulation == false &&
 			FXConsoleVariables::bFreezeParticleSimulation == false &&
@@ -3414,6 +3450,7 @@ public:
 		FreeParticlesInTile = 0;
 
 		RandomStream.Initialize( FMath::Rand() );
+		EmitterInstRandom = RandomStream.GetFraction();
 
 		FParticleSimulationResources* ParticleSimulationResources = FXSystem->GetParticleSimulationResources();
 		const int32 MinTileCount = GetMinTileCount();
@@ -3776,15 +3813,22 @@ private:
 			EmitterInfo.LocalVectorField.MaxInitialRotation,
 			RandomStream.GetFraction() );
 
-		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(
-			FResetVectorFieldCommand,
-			FParticleSimulationGPU*,Simulation,Simulation,
+		// [op] This could cause trouble if the sim destroy render command gets	submitted before we call init, which ends up 
+		//		calling this; don't bother initializing the vector field if we're about to obliterate the sim and its resources anyway
+		//		FORT-79970
+		//
+		if (!Simulation->bDestroyed_GameThread)
 		{
-			if (Simulation && Simulation->LocalVectorField.Resource)
-			{
-				Simulation->LocalVectorField.Resource->ResetVectorField();
-			}
-		});
+			ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(
+				FResetVectorFieldCommand,
+				FVectorFieldResource*, Resource, Simulation->LocalVectorField.Resource,
+				{
+					if (Resource)
+					{
+						Resource->ResetVectorField();
+					}
+				});
+		}
 	}
 
 	/**
@@ -4326,7 +4370,14 @@ FAutoConsoleCommand DumpTileAllocsCommand(
 void FFXSystem::InitGPUSimulation()
 {
 	check(ParticleSimulationResources == NULL);
+	ensure(GParticleSimulationTextureSizeX > 0 && GParticleSimulationTextureSizeY > 0);
+	/** How many tiles are in the simulation textures. */
+	GParticleSimulationTileCountX = GParticleSimulationTextureSizeX / GParticleSimulationTileSize;
+	GParticleSimulationTileCountY = GParticleSimulationTextureSizeY / GParticleSimulationTileSize;
+	GParticleSimulationTileCount = GParticleSimulationTileCountX * GParticleSimulationTileCountY;
+
 	ParticleSimulationResources = new FParticleSimulationResources();
+
 	InitGPUResources();
 }
 
@@ -4354,6 +4405,15 @@ void FFXSystem::InitGPUResources()
 	{
 		check(ParticleSimulationResources);
 		ParticleSimulationResources->Init();
+
+		ParticleSimulationResources->ParticleSortBuffers.SetBufferSize(GParticleSimulationTextureSizeX * GParticleSimulationTextureSizeY);
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(
+			FInitParticleSortBuffersCommand,
+			FParticleSimulationResources *, ParticleSimulationResources, ParticleSimulationResources,
+			{
+				ParticleSimulationResources->ParticleSortBuffers.InitRHI();
+			}
+		);
 	}
 }
 
@@ -4363,6 +4423,13 @@ void FFXSystem::ReleaseGPUResources()
 	{
 		check(ParticleSimulationResources);
 		ParticleSimulationResources->Release();
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(
+			FReleaseParticleSortBuffersCommand,
+			FParticleSimulationResources *, ParticleSimulationResources, ParticleSimulationResources,
+			{
+				ParticleSimulationResources->ParticleSortBuffers.ReleaseRHI();
+			}
+		);
 	}
 }
 
@@ -4428,22 +4495,18 @@ void FFXSystem::SortGPUParticles(FRHICommandListImmediate& RHICmdList)
 	{
 		int32 BufferIndex = SortParticlesGPU(
 			RHICmdList,
-			GParticleSortBuffers,
+			ParticleSimulationResources->ParticleSortBuffers,
 			ParticleSimulationResources->GetVisualizeStateTextures().PositionTextureRHI,
 			ParticleSimulationResources->SimulationsToSort,
 			GetFeatureLevel()
 			);
-		ParticleSimulationResources->SortedVertexBuffer.VertexBufferRHI =
-			GParticleSortBuffers.GetSortedVertexBufferRHI(BufferIndex);
-		ParticleSimulationResources->SortedVertexBuffer.VertexBufferSRV =
-			GParticleSortBuffers.GetSortedVertexBufferSRV(BufferIndex);
+		ParticleSimulationResources->SortedVertexBuffer.VertexBufferRHI = ParticleSimulationResources->ParticleSortBuffers.GetSortedVertexBufferRHI(BufferIndex);
+		ParticleSimulationResources->SortedVertexBuffer.VertexBufferSRV = ParticleSimulationResources->ParticleSortBuffers.GetSortedVertexBufferSRV(BufferIndex);
 	}
 	else
 	{
-		ParticleSimulationResources->SortedVertexBuffer.VertexBufferRHI =
-		GParticleSortBuffers.GetSortedVertexBufferRHI(0);
-		ParticleSimulationResources->SortedVertexBuffer.VertexBufferSRV =
-		GParticleSortBuffers.GetSortedVertexBufferSRV(0);
+		ParticleSimulationResources->SortedVertexBuffer.VertexBufferRHI = ParticleSimulationResources->ParticleSortBuffers.GetSortedVertexBufferRHI(0);
+		ParticleSimulationResources->SortedVertexBuffer.VertexBufferSRV = ParticleSimulationResources->ParticleSortBuffers.GetSortedVertexBufferSRV(0);
 	}
 }
 
@@ -4727,6 +4790,8 @@ void FFXSystem::SimulateGPUParticles(
 	
 	if ( SimulationCommands.Num() || TilesToClear.Num())
 	{
+		SCOPED_DRAW_EVENT(RHICmdList, GPUParticles_SimulateAndClear);
+
 		SetRenderTargets(RHICmdList, 2, CurrentStateRenderTargets, FTextureRHIParamRef(), 0, NULL);
 		FGraphicsPipelineStateInitializer GraphicsPSOInit;
 		RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules.cpp
index 9a941e30880a..0539b4dc3f99 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules.cpp
@@ -117,6 +117,11 @@ UParticleModule::UParticleModule(const FObjectInitializer& ObjectInitializer)
 	bUpdateForGPUEmitter = false;
 }
 
+bool UParticleModule::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 #if WITH_EDITOR
 void UParticleModule::PostEditChangeProperty( FPropertyChangedEvent& PropertyChangedEvent )
 {
@@ -2050,6 +2055,11 @@ void UParticleModuleSubUV::PostLoad()
 	}	
 }
 
+bool UParticleModuleSubUV::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
 void UParticleModuleSubUV::PostInitProperties()
 {
 	Super::PostInitProperties();
@@ -3504,6 +3514,10 @@ void UParticleModuleTypeDataMesh::PostLoad()
 	}
 }
 
+bool UParticleModuleTypeDataMesh::IsPostLoadThreadSafe() const
+{
+	return false;
+}
 
 #if WITH_EDITOR
 void UParticleModuleTypeDataMesh::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules_Location.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules_Location.cpp
index 957da3ee25a4..1fb582785e5c 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules_Location.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleModules_Location.cpp
@@ -1600,20 +1600,8 @@ void UParticleModuleLocationBoneSocket::Spawn(FParticleEmitterInstance* Owner, i
 		return;
 	}
 
-	if (!InstancePayload->SourceComponent.IsValid())
-	{
-		// Setup the source skeletal mesh component...
-		USkeletalMeshComponent* SkeletalMeshComponent = GetSkeletalMeshComponentSource(Owner);
-		if (SkeletalMeshComponent != NULL)
-		{
-			InstancePayload->SourceComponent = SkeletalMeshComponent;
-			RegeneratePreSelectedIndices(InstancePayload, SkeletalMeshComponent);
-		}
-		else
-		{
-			return;
-		}
-	}
+	// Setup the source skeletal mesh component...
+	GetSkeletalMeshComponentSource(Owner, InstancePayload);
 
 	// Early out if source component is still invalid 
 	if (!InstancePayload->SourceComponent.IsValid())
@@ -1990,44 +1978,60 @@ int32 UParticleModuleLocationBoneSocket::GetMaxSourceIndex(FModuleLocationBoneSo
 	return 0;
 }
 
-USkeletalMeshComponent* UParticleModuleLocationBoneSocket::GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner)
+void UParticleModuleLocationBoneSocket::GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner, FModuleLocationBoneSocketInstancePayload* InstancePayload)
 {
 	if (Owner == NULL)
 	{
-		return NULL;
+		InstancePayload->SourceComponent = nullptr;
+		return;
 	}
 
 	UParticleSystemComponent* PSysComp = Owner->Component;
 	if (PSysComp == NULL)
 	{
-		return NULL;
+		InstancePayload->SourceComponent = nullptr;
+		return;
 	}
 
-	AActor* Actor;
-	if (PSysComp->GetActorParameter(SkelMeshActorParamName, Actor) == true)
+	USkeletalMeshComponent* NewSkelComp = nullptr;
+
+	AActor* Actor = nullptr;
+	PSysComp->GetActorParameter(SkelMeshActorParamName, Actor);
+	bool bActorChanged = Actor != InstancePayload->CachedActor.Get();
+	if (!InstancePayload->SourceComponent.IsValid() || bActorChanged)
 	{
-		ASkeletalMeshActor* SkelMeshActor = Cast<ASkeletalMeshActor>(Actor);
-		if (SkelMeshActor != NULL)
+		InstancePayload->SourceComponent = nullptr;
+		InstancePayload->CachedActor = Actor;
+
+		if (Actor)
 		{
-			return SkelMeshActor->GetSkeletalMeshComponent();
-		}
-		else if (Actor)
-		{
-			USkeletalMeshComponent* SkeletalMeshComponent = Actor->FindComponentByClass<USkeletalMeshComponent>();
-			if (SkeletalMeshComponent)
+			ASkeletalMeshActor* SkelMeshActor = Cast<ASkeletalMeshActor>(Actor);
+			if (SkelMeshActor != NULL)
 			{
-				return SkeletalMeshComponent;
+				NewSkelComp = SkelMeshActor->GetSkeletalMeshComponent();
 			}
-			//@todo. Warn about this...
+			else if (Actor)
+			{
+				USkeletalMeshComponent* SkeletalMeshComponent = Actor->FindComponentByClass<USkeletalMeshComponent>();
+				if (SkeletalMeshComponent)
+				{
+					NewSkelComp = SkeletalMeshComponent;
+				}
+				//@todo. Warn about this...
+			}
+		}
+
+		if (USkeletalMeshComponent* SkelMesh = Cast<USkeletalMeshComponent>(PSysComp->GetAttachParent()))
+		{
+			NewSkelComp = SkelMesh;
+		}
+
+		if (NewSkelComp)
+		{
+			InstancePayload->SourceComponent = NewSkelComp;
+			RegeneratePreSelectedIndices(InstancePayload, NewSkelComp);
 		}
 	}
-
-	if (USkeletalMeshComponent* SkelMesh = Cast<USkeletalMeshComponent>(PSysComp->GetAttachParent()))
-	{
-		return SkelMesh;
-	}
-
-	return NULL;
 }
 
 bool UParticleModuleLocationBoneSocket::GetSocketInfoForSourceIndex(FModuleLocationBoneSocketInstancePayload* InstancePayload, USkeletalMeshComponent* SourceComponent, int32 SourceIndex, USkeletalMeshSocket*& OutSocket, FVector& OutOffset)const
@@ -2266,20 +2270,8 @@ void UParticleModuleLocationSkelVertSurface::Spawn(FParticleEmitterInstance* Own
 	{
 		return;
 	}
-
-	if (!InstancePayload->SourceComponent.IsValid())
-	{
-		// Setup the source skeletal mesh component...
-		USkeletalMeshComponent* SkeletalMeshComponent = GetSkeletalMeshComponentSource(Owner);
-		if (SkeletalMeshComponent != NULL)
-		{
-			InstancePayload->SourceComponent = SkeletalMeshComponent;
-		}
-		else
-		{
-			return;
-		}
-	}
+	
+	GetSkeletalMeshComponentSource(Owner, InstancePayload);
 
 	// Early out if source component is still invalid 
 	if (!InstancePayload->SourceComponent.IsValid())
@@ -2486,9 +2478,11 @@ void UParticleModuleLocationSkelVertSurface::Update(FParticleEmitterInstance* Ow
 	
 	FModuleLocationVertSurfaceInstancePayload* InstancePayload = 
 		(FModuleLocationVertSurfaceInstancePayload*)(Owner->GetModuleInstanceData(this));
+
+	GetSkeletalMeshComponentSource(Owner, InstancePayload);
+
 	if (!InstancePayload->SourceComponent.IsValid())
 	{
-		//@todo. Should we setup the source skeletal mesh component here too??
 		return;
 	}
 
@@ -2598,8 +2592,6 @@ uint32 UParticleModuleLocationSkelVertSurface::PrepPerInstanceBlock(FParticleEmi
 		Payload->InitArrayProxies(ValidAssociatedBones.Num());
 	}
 
-	UpdateBoneIndicesList(Owner);
-
 	return Super::PrepPerInstanceBlock(Owner, InstData);
 }
 
@@ -2611,57 +2603,19 @@ void UParticleModuleLocationSkelVertSurface::UpdateBoneIndicesList(FParticleEmit
 
 	AActor* ActorInst = NULL;
 
-	if (Owner->Component->GetActorParameter(SkelMeshActorParamName, ActorInst) && (ActorInst != NULL))
+	if (USkeletalMeshComponent* SkelMeshComp = InstancePayload->SourceComponent.Get())
 	{
-		ASkeletalMeshActor* SkeletalMeshActor = Cast<ASkeletalMeshActor>(ActorInst);
-
-		if ( SkeletalMeshActor != NULL )
+		int32 InsertionIndex = 0;
+		for (int32 FindBoneIdx = 0; FindBoneIdx < ValidAssociatedBones.Num(); FindBoneIdx++)
 		{
-			if (SkeletalMeshActor->GetSkeletalMeshComponent() && (SkeletalMeshActor->GetSkeletalMeshComponent()->SkeletalMesh != NULL))
+			const int32 BoneIdx = SkelMeshComp->SkeletalMesh->RefSkeleton.FindBoneIndex(ValidAssociatedBones[FindBoneIdx]);
+			if (BoneIdx != INDEX_NONE && ValidAssociatedBones.Num() > InsertionIndex)
 			{
-				int32 InsertionIndex = 0;
-				for (int32 FindBoneIdx = 0; FindBoneIdx < ValidAssociatedBones.Num(); FindBoneIdx++)
-				{
-					const int32 BoneIdx = SkeletalMeshActor->GetSkeletalMeshComponent()->SkeletalMesh->RefSkeleton.FindBoneIndex(ValidAssociatedBones[FindBoneIdx]);
-					if (BoneIdx != INDEX_NONE && ValidAssociatedBones.Num() > InsertionIndex)
-					{
-						InstancePayload->ValidAssociatedBoneIndices[InsertionIndex++] = BoneIdx;
-					}
-				}
-				// Cache the number of bone indices on the payload
-				InstancePayload->NumValidAssociatedBoneIndices = InsertionIndex;
-			}
-		}
-		// If we have an arbitrary actor, search for skeletal mesh components
-		else 
-		{
-			if(ActorInst != NULL)
-			{
-				TInlineComponentArray<USkeletalMeshComponent*> Components;
-				ActorInst->GetComponents(Components);
-
-				int32 InsertionIndex = 0;
-				// look over all of the components looking for a SkelMeshComp and then if we find one we look at it to see if the bones match
-				for( int32 CompIdx = 0; CompIdx < Components.Num(); ++CompIdx )
-				{
-					USkeletalMeshComponent* SkelComp = Components[ CompIdx ];
-
-					if( ( SkelComp->SkeletalMesh != NULL ) && SkelComp->IsRegistered() )
-					{
-						for (int32 FindBoneIdx = 0; FindBoneIdx < ValidAssociatedBones.Num(); FindBoneIdx++)
-						{
-							const int32 BoneIdx = SkelComp->SkeletalMesh->RefSkeleton.FindBoneIndex(ValidAssociatedBones[FindBoneIdx]);
-							if (BoneIdx != INDEX_NONE && ValidAssociatedBones.Num() > InsertionIndex)
-							{
-								InstancePayload->ValidAssociatedBoneIndices[InsertionIndex++] = BoneIdx;
-							}
-						}
-					}
-				}
-                // Cache the number of bone indices on the payload
-				InstancePayload->NumValidAssociatedBoneIndices = InsertionIndex;
+				InstancePayload->ValidAssociatedBoneIndices[InsertionIndex++] = BoneIdx;
 			}
 		}
+		// Cache the number of bone indices on the payload
+		InstancePayload->NumValidAssociatedBoneIndices = InsertionIndex;
 	}
 }
 
@@ -2775,44 +2729,51 @@ bool UParticleModuleLocationSkelVertSurface::IsValidForLODLevel(UParticleLODLeve
 
 #endif
 
-USkeletalMeshComponent* UParticleModuleLocationSkelVertSurface::GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner)
+void UParticleModuleLocationSkelVertSurface::GetSkeletalMeshComponentSource(FParticleEmitterInstance* Owner, FModuleLocationVertSurfaceInstancePayload* InstancePayload)
 {
 	if (Owner == NULL)
 	{
-		return NULL;
+		return;
 	}
 
 	UParticleSystemComponent* PSysComp = Owner->Component;
 	if (PSysComp == NULL)
 	{
-		return NULL;
+		return;
 	}
 
-	AActor* Actor;
-	if (PSysComp->GetActorParameter(SkelMeshActorParamName, Actor) == true)
+	USkeletalMeshComponent* NewSkelMeshComp = nullptr;
+	AActor* Actor = nullptr;
+	PSysComp->GetActorParameter(SkelMeshActorParamName, Actor);
+	bool bChangedActor = InstancePayload->CachedActor.Get() != Actor;
+	if (!InstancePayload->SourceComponent.IsValid() || bChangedActor)
 	{
+		InstancePayload->SourceComponent = nullptr;
+		InstancePayload->CachedActor = Actor;
 		if(Actor == NULL)
 		{
-			return NULL;
+			return;
 		}
 		
 		ASkeletalMeshActor* SkelMeshActor = Cast<ASkeletalMeshActor>(Actor);
 		if (SkelMeshActor != NULL)
 		{
-			return SkelMeshActor->GetSkeletalMeshComponent();
+			NewSkelMeshComp = SkelMeshActor->GetSkeletalMeshComponent();
 		}
 		else
 		{
 			USkeletalMeshComponent* SkeletalMeshComponent = Actor->FindComponentByClass<USkeletalMeshComponent>();
 			if (SkeletalMeshComponent)
 			{
-				return SkeletalMeshComponent;
+				NewSkelMeshComp = SkeletalMeshComponent;
 			}
 			//@todo. Warn about this...
 		}
-	}
 
-	return NULL;
+		InstancePayload->SourceComponent = NewSkelMeshComp;
+
+		UpdateBoneIndicesList(Owner);
+	}
 }
 
 
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSimulationGPU.h b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSimulationGPU.h
index 90b47a50665b..2ea16de59ffd 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSimulationGPU.h
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSimulationGPU.h
@@ -13,15 +13,15 @@
 ------------------------------------------------------------------------------*/
 
 /** The texture size allocated for GPU simulation. */
-extern const int32 GParticleSimulationTextureSizeX;
-extern const int32 GParticleSimulationTextureSizeY;
+extern int32 GParticleSimulationTextureSizeX;
+extern int32 GParticleSimulationTextureSizeY;
 
 /** The tile size. Texture space is allocated in TileSize x TileSize units. */
 extern const int32 GParticleSimulationTileSize;
 extern const int32 GParticlesPerTile;
 
 /** How many tiles are in the simulation textures. */
-extern const int32 GParticleSimulationTileCountX;
-extern const int32 GParticleSimulationTileCountY;
-extern const int32 GParticleSimulationTileCount;
+extern int32 GParticleSimulationTileCountX;
+extern int32 GParticleSimulationTileCountY;
+extern int32 GParticleSimulationTileCount;
 
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSortingGPU.h b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSortingGPU.h
index 07c8f6f4b7b8..943eeb91fd51 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSortingGPU.h
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSortingGPU.h
@@ -19,11 +19,16 @@ class FParticleSortBuffers : public FRenderResource
 public:
 
 	/** Initialization constructor. */
-	explicit FParticleSortBuffers(int32 InBufferSize)
-		: BufferSize(InBufferSize)
+	explicit FParticleSortBuffers()
+		:BufferSize(0)
 	{
 	}
 
+	void SetBufferSize(int32 InBufferSize)
+	{
+		BufferSize = InBufferSize;
+	}
+
 	/**
 	 * Initialize RHI resources.
 	 */
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSystemRender.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSystemRender.cpp
index 371719486658..c17b38db93da 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleSystemRender.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleSystemRender.cpp
@@ -1560,9 +1560,27 @@ public:
 
 uint32 FDynamicMeshEmitterData::GetMeshLODIndexFromProxy(const FParticleSystemSceneProxy *InOwnerProxy) const
 {
-	return 0;
-	// [op] disabling this temporarily - FORT-67139 - until I can test the VF reinit on LOD change
-//	return InOwnerProxy && EmitterIndex < InOwnerProxy->MeshEmitterLODIndices.Num() ? InOwnerProxy->MeshEmitterLODIndices[EmitterIndex] : 0;
+	int FirstAvailableLOD = 0;
+	for (; FirstAvailableLOD < StaticMesh->RenderData->LODResources.Num(); FirstAvailableLOD++)
+	{
+		if (StaticMesh->RenderData->LODResources[FirstAvailableLOD].GetNumVertices() > 0)
+		{
+			break;
+		}
+	}
+
+	// hack for FORT - 71986.  Needs to be resolved for real ASAP.  
+	// For now return the first valid LOD, should be 0 on non-mobile platforms.
+	//if (!InOwnerProxy)
+	{
+		return FirstAvailableLOD;
+	}
+	const auto FeatureLevel = InOwnerProxy->GetScene().GetFeatureLevel();
+	int32 MeshMinimumLOD = StaticMesh->MinLOD.GetValueForFeatureLevel(FeatureLevel);
+	FirstAvailableLOD = FMath::Clamp(FirstAvailableLOD, MeshMinimumLOD, StaticMesh->GetNumLODs()-1);
+	
+	int32 MeshLOD = (InOwnerProxy->MeshEmitterLODIndices.IsValidIndex(EmitterIndex)) ? InOwnerProxy->MeshEmitterLODIndices[EmitterIndex] : 0;
+	return FMath::Clamp(MeshLOD, FirstAvailableLOD, StaticMesh->GetNumLODs()-1);
 }
 
 FParticleVertexFactoryBase *FDynamicMeshEmitterData::CreateVertexFactory(ERHIFeatureLevel::Type InFeatureLevel, const FParticleSystemSceneProxy *InOwnerProxy)
@@ -1648,7 +1666,7 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 
 						if (FGlobalDynamicVertexBuffer::Get().IsRenderAlarmLoggingEnabled())
 						{
-							UE_LOG(LogParticles, Warning, TEXT("Panic logging.  Allocated %u bytes for Resource: %s, Owner: %s"), ParticleCount * DynamicParameterVertexStride, *Proxy->GetResourceName().ToString(), *Proxy->GetOwnerName().ToString())
+							UE_LOG(LogParticles, Warning, TEXT("Panic logging.  Allocated %u bytes for Resource: %s, Owner: %s"), ParticleCount * DynamicParameterVertexStride, *Proxy->GetResourceName().ToString(), *Proxy->GetOwnerName().ToString());
 						}
 					}
 
@@ -1785,6 +1803,7 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 			//@todo. Handle LODs.
 			for (int32 LODIndex = 0; LODIndex < 1; LODIndex++)
 			{
+				uint32 TotalTriangles = 0;
 				for (int32 SectionIndex = 0; SectionIndex < LODModel.Sections.Num(); SectionIndex++)
 				{
 					FMaterialRenderProxy* MaterialProxy = nullptr;
@@ -1794,12 +1813,21 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 					}
 					const FStaticMeshSection& Section = LODModel.Sections[SectionIndex];
 
-					if ((Section.NumTriangles == 0) || (MaterialProxy == nullptr))
+					if (Section.NumTriangles == 0)
 					{
 						//@todo. This should never occur, but it does occasionally.
+						UE_LOG(LogParticles, Warning, TEXT("Mesh section %i has 0 triangles (LOD %i)"), SectionIndex, GetMeshLODIndexFromProxy(Proxy));
 						continue;
 					}
 
+					if (MaterialProxy == nullptr)
+					{
+						UE_LOG(LogParticles, Warning, TEXT("Mesh section %i has a null material proxy (LOD %i)"), SectionIndex, GetMeshLODIndexFromProxy(Proxy));
+						continue;
+					}
+
+					TotalTriangles += Section.NumTriangles;
+
 					FMeshBatch& Mesh = Collector.AllocateMesh();
 					Mesh.VertexFactory = MeshVertexFactory;
 					Mesh.LCI = NULL;
@@ -1831,7 +1859,7 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 						{
 							Mesh.Type = PT_TriangleList;
 							Mesh.MaterialRenderProxy = MaterialProxy;
-							Mesh.bWireframe = true;	
+							Mesh.bWireframe = true;
 							BatchElement.FirstIndex = 0;
 							BatchElement.IndexBuffer = &LODModel.IndexBuffer;
 							BatchElement.NumPrimitives = LODModel.IndexBuffer.GetNumIndices() / 3;
@@ -1857,7 +1885,7 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 						BatchElement.UserIndex = 0;
 
 						Mesh.Elements.Reserve(ParticleCount);
-						for(int32 ParticleIndex = 1; ParticleIndex < ParticleCount; ++ParticleIndex)
+						for (int32 ParticleIndex = 1; ParticleIndex < ParticleCount; ++ParticleIndex)
 						{
 							FMeshBatchElement* NextElement = new(Mesh.Elements) FMeshBatchElement();
 							*NextElement = Mesh.Elements[0];
@@ -1867,15 +1895,20 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 
 					Mesh.bCanApplyViewModeOverrides = true;
 					Mesh.bUseWireframeSelectionColoring = Proxy->IsSelected();
-			
-				#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 					Mesh.VisualizeLODIndex = (int8)Proxy->GetVisualizeLODIndex();
-				#endif
+#endif
 
 					Collector.AddMesh(ViewIndex, Mesh);
 
 					INC_DWORD_STAT_BY(STAT_MeshParticlePolys, ParticleCount * LODModel.GetNumTriangles());
 				}
+
+				if (TotalTriangles == 0)
+				{
+					UE_LOG(LogParticles, Warning, TEXT("WARNING: particle mesh LOD %i has no triangles, but is reported as a valid LOD!"), GetMeshLODIndexFromProxy(Proxy));
+				}
 			}
 		}
 		else if (Source.EmitterRenderMode == ERM_Point)
@@ -1892,6 +1925,10 @@ void FDynamicMeshEmitterData::GetDynamicMeshElementsEmitter(const FParticleSyste
 	{
 		if (EmitterIndex < Proxy->MeshEmitterLODIndices.Num())
 		{
+			if (Proxy->MeshEmitterLODIndices[EmitterIndex] != LastCalculatedMeshLOD)
+			{
+				Proxy->MarkEmitterVertexFactoryDirty(EmitterIndex);
+			}
 			Proxy->MeshEmitterLODIndices[EmitterIndex] = LastCalculatedMeshLOD;
 		}
 	}
@@ -2401,8 +2438,8 @@ void FDynamicMeshEmitterData::GetInstanceData(void* InstanceData, void* DynamicP
 			{
 				ParticlePos = Proxy->GetLocalToWorld().TransformPosition(ParticlePos);
 			}
-			FVector ParticleSize = Particle.Size*TransMat.GetScaleVector();
-			int32 LODIndexToUse = ComputeStaticMeshLOD(StaticMesh->RenderData.Get(), ParticlePos, ParticleSize.Size(), *View, 0, TotalLODSizeScale);
+			FVector ParticleSize = TransMat.TransformVector(Particle.Size);
+			int32 LODIndexToUse = ComputeStaticMeshLOD(StaticMesh->RenderData.Get(), ParticlePos, ParticleSize.Size()*0.5f*StaticMesh->GetBounds().SphereRadius, *View, 0, TotalLODSizeScale);
 			LODIndexToUse = FMath::Min(LODIndexToUse, StaticMesh->GetNumLODs() - 1);
 			LastCalculatedMeshLOD = LODIndexToUse < LastCalculatedMeshLOD ? LODIndexToUse : LastCalculatedMeshLOD;
 		}
@@ -6918,10 +6955,7 @@ void FParticleSystemSceneProxy::GetDynamicMeshElements(const TArray<const FScene
 				{
 					if (VisibilityMap & (1 << ViewIndex))
 					{
-
 						const FSceneView* View = Views[ViewIndex];
-
-
 						Data->GetDynamicMeshElementsEmitter(this, View, ViewFamily, ViewIndex, Collector, VertexFactory);
 						NumDraws++;
 					}
@@ -7306,3 +7340,4 @@ ENGINE_API void DrawParticleSystemHelpers(const FSceneView* View,FPrimitiveDrawI
 	}
 }
 #endif	//#if WITH_EDITOR
+
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/ParticleTrail2EmitterInstance.cpp b/Engine/Source/Runtime/Engine/Private/Particles/ParticleTrail2EmitterInstance.cpp
index ca6181653533..b808ec2739b3 100644
--- a/Engine/Source/Runtime/Engine/Private/Particles/ParticleTrail2EmitterInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Particles/ParticleTrail2EmitterInstance.cpp
@@ -196,13 +196,19 @@ void FParticleTrailsEmitterInstance_Base::UpdateBoundingBox(float DeltaTime)
 			FVector MaxPos(-FLT_MAX);
 			FVector TempMin;
 			FVector TempMax;
+			bool bSkipDoubleSpawnUpdate = !SpriteTemplate->bUseLegacySpawningBehavior;
 			for (int32 i = 0; i < LocalActiveParticles; i++)
 			{
 				DECLARE_PARTICLE_PTR(Particle, ParticleData + ParticleStride * ParticleIndices[i]);
 				FVector Size = Particle->Size * Scale;
 				// Do linear integrator and update bounding box
-				Particle->Location	+= DeltaTime * Particle->Velocity;
-				Particle->Rotation	+= DeltaTime * Particle->RotationRate;
+				bool bJustSpawned = (Particle->Flags & STATE_Particle_JustSpawned) != 0;
+				Particle->Flags &= ~STATE_Particle_JustSpawned;
+
+				//Don't update position for newly spawned particles. They already have a partial update applied during spawn.
+				bool bSkipUpdate = bJustSpawned && bSkipDoubleSpawnUpdate;
+				Particle->Location	+= bSkipUpdate ? FVector::ZeroVector : DeltaTime * Particle->Velocity;
+				Particle->Rotation	+= bSkipUpdate ? 0.0f : DeltaTime * Particle->RotationRate;
 				Particle->Location	+= PositionOffsetThisTick;
 				FPlatformMisc::Prefetch(ParticleData, (ParticleIndices[i+1] * ParticleStride));
 				FPlatformMisc::Prefetch(ParticleData, (ParticleIndices[i+1] * ParticleStride) + PLATFORM_CACHE_LINE_SIZE);
@@ -3537,14 +3543,20 @@ void FParticleAnimTrailEmitterInstance::UpdateBoundingBox(float DeltaTime)
 			FVector PrevParticleLocation = FirstParticle->Location;
 			float PrevParticleLength = FirstPayload->Length;
 
+			bool bSkipDoubleSpawnUpdate = !SpriteTemplate->bUseLegacySpawningBehavior;
 			for (int32 i = 0; i < LocalActiveParticles; i++)
 			{
 				DECLARE_PARTICLE_PTR(Particle, ParticleData + ParticleStride * ParticleIndices[i]);
 				FAnimTrailTypeDataPayload*	Payload = ((FAnimTrailTypeDataPayload*)((uint8*)Particle + TypeDataOffset));
 
+				bool bJustSpawned = (Particle->Flags & STATE_Particle_JustSpawned) != 0;
+				Particle->Flags &= ~STATE_Particle_JustSpawned;
+
+				//Don't update position for newly spawned particles. They already have a partial update applied during spawn.
+				bool bSkipUpdate = bJustSpawned && bSkipDoubleSpawnUpdate;
 				// Do linear integrator and update bounding box
-				Particle->Location	+= DeltaTime * Particle->Velocity;
-				Particle->Rotation	+= DeltaTime * Particle->RotationRate;
+				Particle->Location	+= bSkipUpdate ? FVector::ZeroVector : DeltaTime * Particle->Velocity;
+				Particle->Rotation	+= bSkipUpdate ? 0.0f : DeltaTime * Particle->RotationRate;
 				Particle->Location	+= PositionOffsetThisTick;
 				
 				FPlatformMisc::Prefetch(ParticleData, (ParticleIndices[i+1] * ParticleStride));
diff --git a/Engine/Source/Runtime/Engine/Private/Particles/WorldPSCPool.cpp b/Engine/Source/Runtime/Engine/Private/Particles/WorldPSCPool.cpp
new file mode 100644
index 000000000000..c20de41dca24
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Private/Particles/WorldPSCPool.cpp
@@ -0,0 +1,424 @@
+// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
+
+#include "Particles/WorldPSCPool.h"
+#include "HAL/IConsoleManager.h"
+#include "Engine/World.h"
+#include "Particles/ParticleSystemComponent.h"
+#include "ParticleHelper.h"
+
+static float GParticleSystemPoolKillUnusedTime = 180.0f;
+static FAutoConsoleVariableRef ParticleSystemPoolKillUnusedTime(
+	TEXT("FX.ParticleSystemPool.KillUnusedTime"),
+	GParticleSystemPoolKillUnusedTime,
+	TEXT("How long a pooled particle component needs to be unused for before it is destroyed.")
+);
+
+static int32 GbEnableParticleSystemPooling = 1;
+static FAutoConsoleVariableRef bEnableParticleSystemPooling(
+	TEXT("FX.ParticleSystemPool.Enable"),
+	GbEnableParticleSystemPooling,
+	TEXT("How many Particle System Components to preallocate when creating new ones for the pool.")
+);
+
+static float GParticleSystemPoolingCleanTime = 30.0f;
+static FAutoConsoleVariableRef ParticleSystemPoolingCleanTime(
+	TEXT("FX.ParticleSystemPool.CleanTime"),
+	GParticleSystemPoolingCleanTime,
+	TEXT("How often should the pool be cleaned (in seconds).")
+);
+
+FPSCPool::FPSCPool()
+	: MaxUsed(0)
+{
+
+}
+
+void FPSCPool::Cleanup()
+{
+	for (FPSCPoolElem& Elem : FreeElements)
+	{
+		Elem.PSC->DestroyComponent();
+	}
+
+	for (UParticleSystemComponent* PSC : InUseComponents_Auto)
+	{
+		PSC->DestroyComponent();
+	}
+
+	//Warn if there are any manually released PSCs still in the world at cleanup time.
+	for (UParticleSystemComponent* PSC : InUseComponents_Manual)
+	{
+		UE_LOG(LogParticles, Warning, TEXT("Pooled PSC set to manual release is still in use as the pool is being cleaned up. %s"), *PSC->Template->GetFullName());
+		PSC->DestroyComponent();
+	}
+
+	FreeElements.Empty();
+	InUseComponents_Auto.Empty();
+	InUseComponents_Manual.Empty();
+}
+
+UParticleSystemComponent* FPSCPool::Acquire(UWorld* World, UParticleSystem* Template, EPSCPoolMethod PoolingMethod)
+{
+	check(GbEnableParticleSystemPooling);
+	check(PoolingMethod != EPSCPoolMethod::None);
+
+	FPSCPoolElem RetElem;
+	if (FreeElements.Num())
+	{
+		RetElem = FreeElements.Pop(false);
+		check(RetElem.PSC->Template == Template);
+		check(!RetElem.PSC->IsPendingKill());
+
+		// Rename the PSC to move it into the current PersistentLevel - it may have been spawned in one
+		// level but is now needed in another level.
+		// Use the REN_ForceNoResetLoaders flag to prevent the rename from potentially calling FlushAsyncLoading.
+		RetElem.PSC->Rename(nullptr, World, REN_ForceNoResetLoaders);
+	}
+	else
+	{
+		//None in the pool so create a new one.
+		RetElem.PSC = NewObject<UParticleSystemComponent>(World);
+		RetElem.PSC->bAutoDestroy = false;//<<< We don't auto destroy. We'll just periodically clear up the pool.
+		RetElem.PSC->SecondsBeforeInactive = 0.0f;
+		RetElem.PSC->bAutoActivate = false;
+		RetElem.PSC->SetTemplate(Template);
+		RetElem.PSC->bOverrideLODMethod = false;
+		RetElem.PSC->bAllowRecycling = true;
+	}
+
+	RetElem.PSC->PoolingMethod = PoolingMethod;
+
+#if ENABLE_PSC_POOL_DEBUGGING
+	if (PoolingMethod == EPSCPoolMethod::AutoRelease)
+	{
+		InUseComponents_Auto.Add(RetElem.PSC);
+	}
+	else if (PoolingMethod == EPSCPoolMethod::ManualRelease)
+	{
+		InUseComponents_Manual.Add(RetElem.PSC);
+	}
+#endif 
+
+	MaxUsed = FMath::Max(MaxUsed, InUseComponents_Manual.Num() + InUseComponents_Auto.Num());
+
+	//UE_LOG(LogParticles, Log, TEXT("FPSCPool::Acquire() - World: %p - PSC: %p - Sys: %s"), World, RetElem.PSC, *Template->GetFullName());
+
+	return RetElem.PSC;
+}
+
+void FPSCPool::Reclaim(UParticleSystemComponent* PSC, const float CurrentTimeSeconds)
+{
+	check(PSC);
+
+	//UE_LOG(LogParticles, Log, TEXT("FPSCPool::Reclaim() - World: %p - PSC: %p - Sys: %s"), PSC->GetWorld(), PSC, *PSC->Template->GetFullName());
+
+#if ENABLE_PSC_POOL_DEBUGGING
+	int32 InUseIdx = INDEX_NONE;
+	if (PSC->PoolingMethod == EPSCPoolMethod::AutoRelease)
+	{
+		InUseIdx = InUseComponents_Auto.IndexOfByKey(PSC);
+		if (InUseIdx != INDEX_NONE)
+		{
+			InUseComponents_Auto.RemoveAtSwap(InUseIdx);
+		}
+	}
+	else if (PSC->PoolingMethod == EPSCPoolMethod::ManualRelease)
+	{
+		InUseIdx = InUseComponents_Manual.IndexOfByKey(PSC);
+		if (InUseIdx != INDEX_NONE)
+		{
+			InUseComponents_Manual.RemoveAtSwap(InUseIdx);
+		}
+	}
+	
+	if(InUseIdx == INDEX_NONE)
+	{
+		UE_LOG(LogParticles, Error, TEXT("World Particle System Pool is reclaiming a component that is not in it's InUse list!"));
+	}
+#endif
+
+	//Don't add back to the pool if we're no longer pooling or we've hit our max resident pool size.
+	if (GbEnableParticleSystemPooling != 0 && FreeElements.Num() < (int32)PSC->Template->MaxPoolSize)
+	{
+		PSC->bHasBeenActivated = false;//Clear this flag so we re register with the significance manager on next activation.
+		PSC->DetachFromComponent(FDetachmentTransformRules::KeepWorldTransform); // When detaching, maintain world position for optimization purposes
+		PSC->SetRelativeScale3D(FVector(1.f)); // Reset scale to avoid future uses of this PSC having incorrect scale
+		PSC->SetAbsolute(); // Clear out Absolute settings to defaults
+		PSC->UnregisterComponent();
+		PSC->SetCastShadow(false);
+
+		PSC->OnParticleSpawn.Clear();
+		PSC->OnParticleBurst.Clear();
+		PSC->OnParticleDeath.Clear();
+		PSC->OnParticleCollide.Clear();
+
+		//Clear some things so that this PSC is re-used as though it were brand new.
+		PSC->bWasActive = false;
+
+		//Clear out instance parameters.
+		PSC->InstanceParameters.Reset();
+		
+		//Ensure a small cull distance doesn't linger to future users.
+		PSC->SetCullDistance(FLT_MAX);
+
+		FreeElements.Push(FPSCPoolElem(PSC, CurrentTimeSeconds));
+	}
+	else
+	{
+		//We've stopped pooling while some effects were in flight so ensure they're destroyed now.
+		PSC->DestroyComponent();
+	}
+}
+
+void FPSCPool::KillUnusedComponents(float KillTime, UParticleSystem* Template)
+{
+	int32 i = 0;
+	while (i < FreeElements.Num())
+	{
+		if (FreeElements[i].LastUsedTime < KillTime)
+		{
+			UParticleSystemComponent* PSC = FreeElements[i].PSC;
+			if (PSC)
+			{
+				PSC->DestroyComponent();
+			}
+
+			FreeElements.RemoveAtSwap(i, 1, false);
+		}
+		else
+		{
+			++i;
+		}
+	}
+	FreeElements.Shrink();
+
+#if ENABLE_PSC_POOL_DEBUGGING
+	//Clean up any in use components that have been cleared out from under the pool. This could happen in someone manually destroys a component for example.
+	i = 0;
+	while (i < InUseComponents_Manual.Num())
+	{
+		if (!InUseComponents_Manual[i])
+		{
+			UE_LOG(LogParticles, Log, TEXT("Manual Pooled PSC has been destroyed! Possibly via a DestroyComponent() call. You should not destroy these but rather call ReleaseToPool on the component so it can be re-used. |\t System: %s"), *Template->GetFullName());
+			InUseComponents_Manual.RemoveAtSwap(i, 1, false);
+		}
+		else
+		{
+			++i;
+		}
+	}
+	InUseComponents_Manual.Shrink();
+
+	i = 0;
+	while (i < InUseComponents_Auto.Num())
+	{
+		if (!InUseComponents_Auto[i])
+		{
+			UE_LOG(LogParticles, Log, TEXT("Auto Pooled PSC has been destroyed! Possibly via a DestroyComponent() call. You should not destroy these manually. Just deactivate them and allow then to be reclaimed by the pool automatically. |\t System: %s"), *Template->GetFullName());
+			InUseComponents_Auto.RemoveAtSwap(i, 1, false);
+		}
+		else
+		{
+			++i;
+		}
+	}
+	InUseComponents_Auto.Shrink();
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+FWorldPSCPool::FWorldPSCPool()
+	: LastParticleSytemPoolCleanTime(0.0f)
+	, CachedWorldTime(0.0f)
+{
+
+}
+
+FWorldPSCPool::~FWorldPSCPool()
+{
+	Cleanup();
+}
+
+void FWorldPSCPool::Cleanup()
+{
+	for (TPair<UParticleSystem*, FPSCPool>& Pool : WorldParticleSystemPools)
+	{
+		Pool.Value.Cleanup();
+	}
+
+	WorldParticleSystemPools.Empty();
+}
+
+UParticleSystemComponent* FWorldPSCPool::CreateWorldParticleSystem(UParticleSystem* Template, UWorld* World, EPSCPoolMethod PoolingMethod)
+{
+	check(IsInGameThread());
+	check(World);
+	if (!Template)
+	{
+		UE_LOG(LogParticles, Warning, TEXT("Attempted CreateWorldParticleSystem() with a NULL Template!"));
+		return nullptr;
+	}
+
+	if (World->bIsTearingDown)
+	{
+		UE_LOG(LogParticles, Warning, TEXT("Failed to create pooled particle system as we are tearing the world down."));
+		return nullptr;
+	}
+
+	UParticleSystemComponent* PSC = nullptr;
+	if (GbEnableParticleSystemPooling != 0)
+	{
+		if (Template->CanBePooled())
+		{
+			FPSCPool& PSCPool = WorldParticleSystemPools.FindOrAdd(Template);
+			PSC = PSCPool.Acquire(World, Template, PoolingMethod);
+		}
+	}
+	else
+	{
+		WorldParticleSystemPools.Empty();//Ensure the pools are cleared out if we've just switched to not pooling.
+	}
+
+	if(PSC == nullptr)
+	{
+		//Create a new auto destroy system if we're not pooling.
+		PSC = NewObject<UParticleSystemComponent>(World);
+		PSC->bAutoDestroy = true;
+		PSC->SecondsBeforeInactive = 0.0f;
+		PSC->bAutoActivate = false;
+		PSC->SetTemplate(Template);
+		PSC->bOverrideLODMethod = false;
+	}
+
+	check(PSC);
+	return PSC;
+}
+
+/** Called when an in-use particle component is finished and wishes to be returned to the pool. */
+void FWorldPSCPool::ReclaimWorldParticleSystem(UParticleSystemComponent* PSC)
+{
+	check(IsInGameThread());
+	
+	//If this component has been already destroyed we don't add it back to the pool. Just warn so users can fixup.
+	if (PSC->IsPendingKill())
+	{
+		UE_LOG(LogParticles, Log, TEXT("Pooled PSC has been destroyed! Possibly via a DestroyComponent() call. You should not destroy components set to auto destroy manually. \nJust deactivate them and allow them to destroy themselves or be reclaimed by the pool if pooling is enabled. | PSC: %p |\t System: %s"), PSC, *PSC->Template->GetFullName());
+		return;
+	}
+
+	if (GbEnableParticleSystemPooling)
+	{
+		float CurrentTime = PSC->GetWorld()->GetTimeSeconds();
+
+		//Periodically clear up the pools.
+		if (CurrentTime - LastParticleSytemPoolCleanTime > GParticleSystemPoolingCleanTime)
+		{
+			LastParticleSytemPoolCleanTime = CurrentTime;
+			for (TPair<UParticleSystem*, FPSCPool>& Pair : WorldParticleSystemPools)
+			{
+				Pair.Value.KillUnusedComponents(CurrentTime - GParticleSystemPoolKillUnusedTime, PSC->Template);
+			}
+		}
+		
+		FPSCPool* PSCPool = WorldParticleSystemPools.Find(PSC->Template);
+		if (!PSCPool)
+		{
+			UE_LOG(LogParticles, Warning, TEXT("WorldPSC Pool trying to reclaim a system for which it doesn't have a pool! Likely because SetTemplate() has been called on this PSC. | World: %p | PSC: %p | Sys: %s"), PSC->GetWorld(), PSC, *PSC->Template->GetFullName());
+			//Just add the new pool and reclaim to that one.
+			PSCPool = &WorldParticleSystemPools.Add(PSC->Template);
+		}
+
+		PSCPool->Reclaim(PSC, CurrentTime);
+	}
+	else
+	{
+		PSC->DestroyComponent();
+	}
+}
+
+void FWorldPSCPool::ReclaimActiveParticleSystems()
+{
+	check(IsInGameThread());
+
+	for (TPair<UParticleSystem*, FPSCPool>& Pair : WorldParticleSystemPools)
+	{
+		FPSCPool& Pool = Pair.Value;
+
+		for (UParticleSystemComponent* PSC : Pool.InUseComponents_Auto)
+		{
+			if (ensureAlways(PSC))
+			{
+				PSC->Complete();
+			}
+		}
+		for (UParticleSystemComponent* PSC : Pool.InUseComponents_Manual)
+		{
+			if (ensureAlways(PSC))
+			{
+				PSC->Complete();
+			}
+		}
+	}
+}
+
+void FWorldPSCPool::Dump()
+{
+#if ENABLE_PSC_POOL_DEBUGGING
+	FString DumpStr;
+
+	uint32 TotalMemUsage = 0;
+	for (TPair<UParticleSystem*, FPSCPool>& Pair : WorldParticleSystemPools)
+	{
+		UParticleSystem* System = Pair.Key;
+		FPSCPool& Pool = Pair.Value;		
+		uint32 FreeMemUsage = 0;
+		for (FPSCPoolElem& Elem : Pool.FreeElements)
+		{
+			if (ensureAlways(Elem.PSC))
+			{
+				FreeMemUsage += Elem.PSC->GetApproxMemoryUsage();
+			}
+		}
+		uint32 InUseMemUsage = 0;
+		for (UParticleSystemComponent* PSC : Pool.InUseComponents_Auto)
+		{
+			if (ensureAlways(PSC))
+			{
+				InUseMemUsage += PSC->GetApproxMemoryUsage();				
+			}
+		}
+		for (UParticleSystemComponent* PSC : Pool.InUseComponents_Manual)
+		{
+			if (ensureAlways(PSC))
+			{
+				InUseMemUsage += PSC->GetApproxMemoryUsage();
+			}
+		}
+
+		TotalMemUsage += FreeMemUsage;
+		TotalMemUsage += InUseMemUsage;
+
+		DumpStr += FString::Printf(TEXT("Free: %d (%uB) \t|\t Used(Auto - Manual): %d - %d (%uB) \t|\t MaxUsed: %d \t|\t System: %s\n"), Pool.FreeElements.Num(), FreeMemUsage, Pool.InUseComponents_Auto.Num(), Pool.InUseComponents_Manual.Num(), InUseMemUsage, Pool.MaxUsed, *System->GetFullName());
+	}
+
+	UE_LOG(LogParticles, Log, TEXT("***************************************"));
+	UE_LOG(LogParticles, Log, TEXT("*Particle System Pool Info - Total Mem = %.2fMB*"), TotalMemUsage / 1024.0f / 1024.0f);
+	UE_LOG(LogParticles, Log, TEXT("***************************************"));
+	UE_LOG(LogParticles, Log, TEXT("%s"), *DumpStr);
+	UE_LOG(LogParticles, Log, TEXT("***************************************"));
+
+#endif
+}
+
+void DumpPooledWorldParticleSystemInfo(UWorld* World)
+{
+	check(World);
+	World->GetPSCPool().Dump();
+}
+
+FAutoConsoleCommandWithWorld DumpPSCPoolInfoCommand(
+	TEXT("fx.DumpPSCPoolInfo"),
+	TEXT("Dump Particle System Pooling Info"),
+	FConsoleCommandWithWorldDelegate::CreateStatic(&DumpPooledWorldParticleSystemInfo)
+);
diff --git a/Engine/Source/Runtime/Engine/Private/Pawn.cpp b/Engine/Source/Runtime/Engine/Private/Pawn.cpp
index 03d8c146b4ed..0e10caa61d63 100644
--- a/Engine/Source/Runtime/Engine/Private/Pawn.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Pawn.cpp
@@ -57,6 +57,7 @@ APawn::APawn(const FObjectInitializer& ObjectInitializer)
 	bReplicateMovement = true;
 	BaseEyeHeight = 64.0f;
 	AllowedYawError = 10.99f;
+	BlendedReplayViewPitch = 0.0f;
 	bCollideWhenPlacing = true;
 	SpawnCollisionHandlingMethod = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButDontSpawnIfColliding;
 	bProcessingOutsideWorldBounds = false;
@@ -783,11 +784,20 @@ FRotator APawn::GetBaseAimRotation() const
 	// If we have no controller, we simply use our rotation
 	POVRot = GetActorRotation();
 
-	// If our Pitch is 0, then use RemoteViewPitch
+	// If our Pitch is 0, then use a replicated view pitch
 	if( FMath::IsNearlyZero(POVRot.Pitch) )
 	{
-		POVRot.Pitch = RemoteViewPitch;
-		POVRot.Pitch = POVRot.Pitch * 360.f/255.f;
+		if (BlendedReplayViewPitch != 0.0f)
+		{
+			// If we are in a replay and have a blended value for playback, use that
+			POVRot.Pitch = BlendedReplayViewPitch;
+		}
+		else
+		{
+			// Else use the RemoteViewPitch
+			POVRot.Pitch = RemoteViewPitch;
+			POVRot.Pitch = POVRot.Pitch * 360.0f / 255.0f;
+		}
 	}
 
 	return POVRot;
diff --git a/Engine/Source/Runtime/Engine/Private/PendingNetGame.cpp b/Engine/Source/Runtime/Engine/Private/PendingNetGame.cpp
index c672527dad35..3bd7b014bca9 100644
--- a/Engine/Source/Runtime/Engine/Private/PendingNetGame.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PendingNetGame.cpp
@@ -368,7 +368,7 @@ void UPendingNetGame::FinalizeEncryptedConnection(const FEncryptionKeyResponse&
 			else
 			{
 				// This error will be resolved in TickWorldTravel()
-				FString ResponseStr(Lex::ToString(Response.Response));
+				FString ResponseStr(LexToString(Response.Response));
 				UE_LOG(LogNet, Warning, TEXT("UPendingNetGame::FinalizeEncryptedConnection: encryption failure [%s] %s"), *ResponseStr, *Response.ErrorMsg);
 				ConnectionError = TEXT("Encryption ack failure");
 				Connection->Close();
@@ -412,7 +412,7 @@ void UPendingNetGame::SetEncryptionKey(const FEncryptionKeyResponse& Response)
 				else
 				{
 					// This error will be resolved in TickWorldTravel()
-					FString ResponseStr(Lex::ToString(Response.Response));
+					FString ResponseStr(LexToString(Response.Response));
 					UE_LOG(LogNet, Warning, TEXT("UPendingNetGame::SetEncryptionKey: encryption failure [%s] %s"), *ResponseStr, *Response.ErrorMsg);
 					ConnectionError = TEXT("Encryption failure");
 					Connection->Close();
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodyInstance.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodyInstance.cpp
index 188b6efe9cd8..da6dcb8a3e42 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodyInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodyInstance.cpp
@@ -444,8 +444,6 @@ FBodyInstance::FBodyInstance()
 	, SceneIndexSync(0)
 	, SceneIndexAsync(0)
 	, ObjectType(ECC_WorldStatic)
-	, Scale3D(1.0f)
-	, CollisionProfileName(UCollisionProfile::CustomCollisionProfileName)
 	, MaskFilter(0)
 	, CollisionEnabled(ECollisionEnabled::QueryAndPhysics)
 #if WITH_PHYSX
@@ -470,9 +468,15 @@ FBodyInstance::FBodyInstance()
 	, bLockXRotation(false)
 	, bLockYRotation(false)
 	, bLockZRotation(false)
+	, bOverrideMaxAngularVelocity(false)
 	, bUseAsyncScene(false)
 	, bOverrideMaxDepenetrationVelocity(false)
 	, bOverrideWalkableSlopeOnInstance(false)
+	, bInterpolateWhenSubStepping(true)
+	, bPendingCollisionProfileSetup(false)
+	, bHasSharedShapes(false)
+	, Scale3D(1.0f)
+	, CollisionProfileName(UCollisionProfile::CustomCollisionProfileName)
 	, MaxDepenetrationVelocity(0.f)
 	, MassInKgOverride(100.f)
 	, ExternalCollisionProfileBodySetup(nullptr)
@@ -489,12 +493,12 @@ FBodyInstance::FBodyInstance()
 	, StabilizationThresholdMultiplier(1.f)
 	, PhysicsBlendWeight(0.f)
 	, PositionSolverIterationCount(8)
+	, VelocitySolverIterationCount(1)
 #if WITH_PHYSX
 	, RigidActorSync(nullptr)
 	, RigidActorAsync(nullptr)
 	, BodyAggregate(nullptr)
 #endif // WITH_PHYSX
-	, VelocitySolverIterationCount(1)
 {
 	MaxAngularVelocity = UPhysicsSettings::Get()->MaxAngularVelocity;
 }
@@ -639,6 +643,7 @@ void FBodyInstance::InvalidateCollisionProfileName()
 {
 	CollisionProfileName = UCollisionProfile::CustomCollisionProfileName;
 	ExternalCollisionProfileBodySetup = nullptr;
+	bPendingCollisionProfileSetup = false;
 }
 
 void FBodyInstance::SetResponseToChannel(ECollisionChannel Channel, ECollisionResponse NewResponse)
@@ -668,7 +673,7 @@ void FBodyInstance::SetResponseToChannels(const FCollisionResponseContainer& New
 	CollisionResponses.SetCollisionResponseContainer(NewReponses);
 	UpdatePhysicsFilterData();
 }
-	
+
 void FBodyInstance::SetObjectType(ECollisionChannel Channel)
 {
 	InvalidateCollisionProfileName();
@@ -676,6 +681,22 @@ void FBodyInstance::SetObjectType(ECollisionChannel Channel)
 	UpdatePhysicsFilterData();
 }
 
+void FBodyInstance::ApplyDeferredCollisionProfileName()
+{
+	if(bPendingCollisionProfileSetup)
+	{
+		SetCollisionProfileName(CollisionProfileName);
+		bPendingCollisionProfileSetup = false;
+	}
+}
+
+void FBodyInstance::SetCollisionProfileNameDeferred(FName InCollisionProfileName)
+{
+	CollisionProfileName = InCollisionProfileName;
+	ExternalCollisionProfileBodySetup = nullptr;
+	bPendingCollisionProfileSetup = true;
+}
+
 void FBodyInstance::SetCollisionProfileName(FName InCollisionProfileName)
 {
 	SCOPE_CYCLE_COUNTER(STAT_BodyInst_SetCollisionProfileName);
@@ -683,13 +704,15 @@ void FBodyInstance::SetCollisionProfileName(FName InCollisionProfileName)
 	//Note that GetCollisionProfileName will use the external profile if one is set.
 	//GetCollisionProfileName will be consistent with the values set by LoadProfileData.
 	//This is why we can't use CollisionProfileName directly during the equality check
-	if (GetCollisionProfileName() != InCollisionProfileName)
+	if (bPendingCollisionProfileSetup || GetCollisionProfileName() != InCollisionProfileName)
 	{
 		//LoadProfileData uses GetCollisionProfileName internally so we must now set the external collision data to null.
 		ExternalCollisionProfileBodySetup = nullptr;
 		CollisionProfileName = InCollisionProfileName;
 		// now Load ProfileData
 		LoadProfileData(false);
+
+		bPendingCollisionProfileSetup = false;
 	}
 	
 	ExternalCollisionProfileBodySetup = nullptr;	//Even if incoming is the same as GetCollisionProfileName we turn it into "manual mode"
@@ -788,6 +811,7 @@ void FBodyInstance::UseExternalCollisionProfile(UBodySetup* InExternalCollisionP
 {
 	ensureAlways(InExternalCollisionProfileBodySetup);
 	ExternalCollisionProfileBodySetup = InExternalCollisionProfileBodySetup;
+	bPendingCollisionProfileSetup = false;
 	LoadProfileData(false);
 }
 
@@ -964,6 +988,7 @@ void FBodyInstance::UpdatePhysicsShapeFilterData(uint32 ComponentID, bool bPhysi
 			const TEnumAsByte<ECollisionEnabled::Type> UseCollisionEnabled = CollisionEnabledOverride && !bIsWelded ? *CollisionEnabledOverride : (TEnumAsByte<ECollisionEnabled::Type>)BI->GetCollisionEnabled();
 			const FCollisionResponseContainer& UseResponse = ResponseOverride && !bIsWelded ? *ResponseOverride : BI->CollisionResponses.GetResponseContainer();
 			bool bUseNotify = bNotifyOverride && !bIsWelded ? *bNotifyOverride : BI->bNotifyRigidBodyCollision;
+			bool bUseContactModification = BI->bContactModification;
 
 
 			UPrimitiveComponent* OwnerPrimitiveComponent = BI->OwnerComponent.Get();
@@ -976,7 +1001,7 @@ void FBodyInstance::UpdatePhysicsShapeFilterData(uint32 ComponentID, bool bPhysi
 			PxFilterData PComplexQueryData;
 			if (UseCollisionEnabled != ECollisionEnabled::NoCollision)
 			{
-				CreateShapeFilterData(BI->ObjectType, MaskFilter, ActorID, UseResponse, ComponentID, InstanceBodyIndex, PSimpleQueryData, PSimFilterData, bUseCCD && !bPhysicsStatic, bUseNotify, bPhysicsStatic);	//InstanceBodyIndex and CCD are determined by root body in case of welding
+				CreateShapeFilterData(BI->ObjectType, MaskFilter, ActorID, UseResponse, ComponentID, InstanceBodyIndex, PSimpleQueryData, PSimFilterData, bUseCCD && !bPhysicsStatic, bUseNotify, bPhysicsStatic, bUseContactModification);	//InstanceBodyIndex and CCD are determined by root body in case of welding
 				PComplexQueryData = PSimpleQueryData;
 
 				// Build filterdata variations for complex and simple
@@ -1205,6 +1230,7 @@ void FBodyInstance::UpdatePhysicsFilterData()
 	UpdatePhysicsShapeFilterData(ComponentID, bPhysicsStatic, CollisionEnabledOverride, ResponseOverride, bNotifyOverridePtr);
 #endif
 
+	UpdateInterpolateWhenSubStepping();
 }
 
 TAutoConsoleVariable<int32> CDisableQueryOnlyActors(TEXT("p.DisableQueryOnlyActors"), 0, TEXT("If QueryOnly is used, actors are marked as simulation disabled. This is NOT compatible with origin shifting at the moment."));
@@ -1802,6 +1828,8 @@ void FBodyInstance::InitBody(class UBodySetup* Setup, const FTransform& Transfor
 
 	Bodies.Reset();
 	Transforms.Reset();
+
+	UpdateInterpolateWhenSubStepping();
 }
 
 FVector GetInitialLinearVelocity(const AActor* OwningActor, bool& bComponentAwake)
@@ -2075,6 +2103,8 @@ bool FBodyInstance::Weld(FBodyInstance* TheirBody, const FTransform& TheirTM)
 		TermBodyHelper(TheirBody->SceneIndexAsync, TheirBody->RigidActorAsync, TheirBody);
 	});
 	
+	UpdateInterpolateWhenSubStepping();
+
 	TheirBody->UpdateDebugRendering();
 	UpdateDebugRendering();
 
@@ -2131,6 +2161,8 @@ void FBodyInstance::UnWeld(FBodyInstance* TheirBI)
 		TheirBI->WeldParent = nullptr;
 	});
 
+	UpdateInterpolateWhenSubStepping();
+
 	TheirBI->UpdateDebugRendering();
 	UpdateDebugRendering();
 #endif
@@ -3339,10 +3371,14 @@ void FBodyInstance::UpdateMassProperties()
 			Shapes.AddUninitialized(NumShapes);
 			PRigidBody->getShapes(Shapes.GetData(), NumShapes);
 
-			//Ignore trimeshes
+			// Ignore trimeshes & shapes which don't contribute to the mass
 			for(int32 ShapeIdx = Shapes.Num() - 1; ShapeIdx >= 0; --ShapeIdx)
 			{
-				if(Shapes[ShapeIdx]->getGeometryType() == PxGeometryType::eTRIANGLEMESH)
+				const PxShape* Shape = Shapes[ShapeIdx];
+				const FKShapeElem* ShapeElem = FPhysxUserData::Get<FKShapeElem>(Shape->userData);
+				bool bIsTriangleMesh = Shape->getGeometryType() == PxGeometryType::eTRIANGLEMESH;
+				bool bHasNoMass = ShapeElem && !ShapeElem->GetContributeToMass();
+				if (bIsTriangleMesh || bHasNoMass)
 				{
 					Shapes.RemoveAtSwap(ShapeIdx);
 				}
@@ -3740,6 +3776,15 @@ void FBodyInstance::SetEnableGravity(bool bInGravityEnabled)
 	}
 }
 
+void FBodyInstance::SetContactModification(bool bNewContactModification)
+{
+	if (bNewContactModification != bContactModification)
+	{
+		bContactModification = bNewContactModification;
+		UpdatePhysicsFilterData();
+	}
+}
+
 void FBodyInstance::SetUseCCD(bool bInUseCCD)
 {
 	if (bUseCCD != bInUseCCD)
@@ -4338,7 +4383,7 @@ bool FBodyInstance::IsValidCollisionProfileName(FName InCollisionProfileName)
 
 void FBodyInstance::LoadProfileData(bool bVerifyProfile)
 {
-	FName UseCollisionProfileName = GetCollisionProfileName();
+	const FName UseCollisionProfileName = GetCollisionProfileName();
 	if ( bVerifyProfile )
 	{
 		// if collision profile name exists, 
@@ -4365,7 +4410,6 @@ void FBodyInstance::LoadProfileData(bool bVerifyProfile)
 				InvalidateCollisionProfileName(); 
 			}
 		}
-
 	}
 	else
 	{
@@ -4677,6 +4721,7 @@ void FBodyInstance::GetFilterData_AssumesLocked(FShapeData& ShapeData, bool bFor
 	bool bUseCollisionEnabledOverride = false;
 	bool bResponseOverride = false;
 	bool bNotifyOverride = false;
+	bool bUseContactModification = bContactModification;
 
 	if(USkeletalMeshComponent* SkelMeshComp = Cast<USkeletalMeshComponent>(OwnerComponentInst))
 	{
@@ -4746,7 +4791,7 @@ void FBodyInstance::GetFilterData_AssumesLocked(FShapeData& ShapeData, bool bFor
 			PxFilterData PComplexQueryData;
 			uint32 ActorID = Owner ? Owner->GetUniqueID() : 0;
 			uint32 CompID = (OwnerComponentInst != nullptr) ? OwnerComponentInst->GetUniqueID() : 0;
-			CreateShapeFilterData(ObjectType, MaskFilter, ActorID, UseResponse, CompID, InstanceBodyIndex, PSimpleQueryData, PSimFilterData, bUseCCD && !bPhysicsStatic, bUseNotifyRBCollision, bPhysicsStatic);	//CCD is determined by root body in case of welding
+			CreateShapeFilterData(ObjectType, MaskFilter, ActorID, UseResponse, CompID, InstanceBodyIndex, PSimpleQueryData, PSimFilterData, bUseCCD && !bPhysicsStatic, bUseNotifyRBCollision, bPhysicsStatic, bUseContactModification);	//CCD is determined by root body in case of welding
 			PComplexQueryData = PSimpleQueryData;
 			
 			// Set output sim data
@@ -4953,6 +4998,33 @@ void FBodyInstance::GetShapeFlags_AssumesLocked(FShapeData& ShapeData, TEnumAsBy
 }
 #endif // WITH_PHYSX
 
+void FBodyInstance::UpdateInterpolateWhenSubStepping()
+{
+	if(UPhysicsSettings::Get()->bSubstepping)
+	{
+		// We interpolate based around our current collision enabled flag
+		ECollisionEnabled::Type UseCollisionEnabled = ECollisionEnabled::NoCollision;
+		if(OwnerComponent.IsValid() && OwnerComponent.Get()->GetBodyInstance() != this)
+		{
+			UseCollisionEnabled = OwnerComponent->GetCollisionEnabled();
+		}
+		else
+		{
+			UseCollisionEnabled = GetCollisionEnabled();
+		}
+	
+		bInterpolateWhenSubStepping = UseCollisionEnabled == ECollisionEnabled::PhysicsOnly || UseCollisionEnabled == ECollisionEnabled::QueryAndPhysics;
+
+		// If we have a weld parent we should take into account that too as that may be simulating while we are not
+		if(WeldParent)
+		{
+			// Potentially recurse here
+			WeldParent->UpdateInterpolateWhenSubStepping();
+			bInterpolateWhenSubStepping |= WeldParent->bInterpolateWhenSubStepping;
+		}
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////
 // FBodyInstanceEditorHelpers
 
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodySetup.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodySetup.cpp
index d4c116e49f1a..ec5823217a12 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodySetup.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/BodySetup.cpp
@@ -45,34 +45,31 @@
 #define CASE_ENUM_TO_TEXT(txt) case txt: return TEXT(#txt);
 #endif
 
-namespace Lex
+const TCHAR* LexToString(ECollisionTraceFlag Enum)
 {
-	const TCHAR* ToString(ECollisionTraceFlag Enum)
+	switch (Enum)
 	{
-		switch (Enum)
-		{
-			FOREACH_ENUM_ECOLLISIONTRACEFLAG(CASE_ENUM_TO_TEXT)
-		}
-		return TEXT("<Unknown ECollisionTraceFlag>");
+		FOREACH_ENUM_ECOLLISIONTRACEFLAG(CASE_ENUM_TO_TEXT)
 	}
+	return TEXT("<Unknown ECollisionTraceFlag>");
+}
 
-	const TCHAR* ToString(EPhysicsType Enum)
+const TCHAR* LexToString(EPhysicsType Enum)
+{
+	switch (Enum)
 	{
-		switch (Enum)
-		{
-			FOREACH_ENUM_EPHYSICSTYPE(CASE_ENUM_TO_TEXT)
-		}
-		return TEXT("<Unknown EPhysicsType>");
+		FOREACH_ENUM_EPHYSICSTYPE(CASE_ENUM_TO_TEXT)
 	}
+	return TEXT("<Unknown EPhysicsType>");
+}
 
-	const TCHAR* ToString(EBodyCollisionResponse::Type Enum)
+const TCHAR* LexToString(EBodyCollisionResponse::Type Enum)
+{
+	switch (Enum)
 	{
-		switch (Enum)
-		{
-			FOREACH_ENUM_EBODYCOLLISIONRESPONSE(CASE_ENUM_TO_TEXT)
-		}
-		return TEXT("<Unknown EBodyCollisionResponse>");
+		FOREACH_ENUM_EBODYCOLLISIONRESPONSE(CASE_ENUM_TO_TEXT)
 	}
+	return TEXT("<Unknown EBodyCollisionResponse>");
 }
 
 
@@ -174,6 +171,7 @@ UBodySetup::UBodySetup(const FObjectInitializer& ObjectInitializer)
 	bConsiderForBounds = true;
 	bMeshCollideAll = false;
 	CollisionTraceFlag = CTF_UseDefault;
+	bFailedToCreatePhysicsMeshes = false;
 	bHasCookedCollisionData = true;
 	bNeverNeedsCookedCollisionData = false;
 	bGenerateMirroredCollision = true;
@@ -471,9 +469,16 @@ void UBodySetup::CreatePhysicsMeshes()
 				}
 				else
 				{
-					CookHelper.CreatePhysicsMeshes_Concurrent();
-					FinishCreatingPhysicsMeshes(CookHelper.OutNonMirroredConvexMeshes, CookHelper.OutMirroredConvexMeshes, CookHelper.OutTriangleMeshes);
-					bClearMeshes = false;
+                    if (CookHelper.CreatePhysicsMeshes_Concurrent())
+                    {
+					    FinishCreatingPhysicsMeshes(CookHelper.OutNonMirroredConvexMeshes, CookHelper.OutMirroredConvexMeshes, CookHelper.OutTriangleMeshes);
+					    bClearMeshes = false;
+                        bFailedToCreatePhysicsMeshes = false;
+                    }
+                    else
+                    {
+                        bFailedToCreatePhysicsMeshes = true;
+                    }
 				}
 			}
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintDrives.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintDrives.cpp
index cf29e95c5d2d..f9fc604caa47 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintDrives.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintDrives.cpp
@@ -18,6 +18,7 @@ FConstraintDrive::FConstraintDrive()
 FLinearDriveConstraint::FLinearDriveConstraint()
 	: PositionTarget(ForceInit)
 	, VelocityTarget(ForceInit)
+	, bEnablePositionDrive(false)
 {
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintInstance.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintInstance.cpp
index 708e9c92936a..e06bdd65ee63 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintInstance.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/ConstraintInstance.cpp
@@ -285,11 +285,13 @@ FConstraintInstance::FConstraintInstance()
 	, bSwingVelocityDrive_DEPRECATED(false)
 	, bTwistPositionDrive_DEPRECATED(false)
 	, bTwistVelocityDrive_DEPRECATED(false)
+	, bAngularSlerpDrive_DEPRECATED(false)
 	, bAngularOrientationDrive_DEPRECATED(false)
 	, bEnableSwingDrive_DEPRECATED(true)
 	, bEnableTwistDrive_DEPRECATED(true)
 	, bAngularVelocityDrive_DEPRECATED(false)
 	, AngularPositionTarget_DEPRECATED(ForceInit)
+	, AngularDriveMode_DEPRECATED(EAngularDriveMode::SLERP)
 	, AngularOrientationTarget_DEPRECATED(ForceInit)
 	, AngularVelocityTarget_DEPRECATED(ForceInit)
 	, AngularDriveSpring_DEPRECATED(50.0f)
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysAnim.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysAnim.cpp
index d9416df2d8f8..9aa61924000f 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysAnim.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysAnim.cpp
@@ -349,7 +349,10 @@ void USkeletalMeshComponent::PerformBlendPhysicsBones(const TArray<FBoneIndexTyp
 
 bool USkeletalMeshComponent::ShouldBlendPhysicsBones() const
 {
-	return Bodies.Num() > 0 && CollisionEnabledHasPhysics(GetCollisionEnabled()) && (DoAnyPhysicsBodiesHaveWeight() || bBlendPhysics);
+	const bool bHasPhysicsBodies = Bodies.Num() > 0;
+	const bool bCollisionEnabledHasPhysics = CollisionEnabledHasPhysics(GetCollisionEnabled());
+	const bool bBlendPhysicsOrWeights = DoAnyPhysicsBodiesHaveWeight() || bBlendPhysics;
+	return bHasPhysicsBodies && bCollisionEnabledHasPhysics && bBlendPhysicsOrWeights;
 }
 
 bool USkeletalMeshComponent::DoAnyPhysicsBodiesHaveWeight() const
@@ -458,6 +461,9 @@ void USkeletalMeshComponent::FinalizeAnimationUpdate()
 
 	// New bone positions need to be sent to render thread
 	MarkRenderDynamicDataDirty();
+
+	// If we have any Slave Components, they need to be refreshed as well.
+	RefreshSlaveComponents();
 }
 
 void USkeletalMeshComponent::CompleteParallelBlendPhysics()
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysCommandHandler.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysCommandHandler.cpp
index 365e5c2dc06d..753cbae064fc 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysCommandHandler.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysCommandHandler.cpp
@@ -64,12 +64,33 @@ void FPhysCommandHandler::ExecuteCommands()
 			}
 			break;
 		}
+		case PhysCommand::DeleteContactModifyCallback:
+		{
+			FContactModifyCallback* ContactModifyCallback = Command.Pointer.ContactModifyCallback;
+			if (FPhysScene::ContactModifyCallbackFactory.IsValid())
+			{
+				FPhysScene::ContactModifyCallbackFactory->Destroy(ContactModifyCallback);
+			}
+			else
+			{
+				delete ContactModifyCallback;
+			}
+			break;
+		}
+
 		case PhysCommand::DeleteCPUDispatcher:
 		{
 			physx::PxCpuDispatcher * CPUDispatcher = Command.Pointer.CPUDispatcher;
 			delete CPUDispatcher;
 			break;
 		}
+
+		case PhysCommand::DeleteMbpBroadphaseCallback:
+		{
+			FPhysXMbpBroadphaseCallback* Callback = Command.Pointer.MbpCallback;
+			delete Callback;
+			break;
+		}
 #endif
 		case PhysCommand::Max:	//this is just here because right now all commands are APEX and having a switch with only default is bad
 		default:
@@ -99,9 +120,33 @@ void FPhysCommandHandler::DeferredRelease(physx::PxScene* PScene)
 
 }
 
+void  FPhysCommandHandler::DeferredDeleteContactModifyCallback(FContactModifyCallback* ContactModifyCallback)
+{
+	if (ContactModifyCallback)	//default is nullptr
+	{
+		FPhysPendingCommand Command;
+		Command.Pointer.ContactModifyCallback = ContactModifyCallback;
+		Command.CommandType = PhysCommand::DeleteContactModifyCallback;
+
+		EnqueueCommand(Command);
+	}
+}
+
+void FPhysCommandHandler::DeferredDeleteMbpBroadphaseCallback(FPhysXMbpBroadphaseCallback* MbpCallback)
+{
+	if(MbpCallback)	//default is nullptr
+	{
+		FPhysPendingCommand Command;
+		Command.Pointer.MbpCallback = MbpCallback;
+		Command.CommandType = PhysCommand::DeleteMbpBroadphaseCallback;
+
+		EnqueueCommand(Command);
+	}
+}
+
 void  FPhysCommandHandler::DeferredDeleteSimEventCallback(physx::PxSimulationEventCallback * SimEventCallback)
 {
-	check(SimEventCallback);
+	check(SimEventCallback)
 
 	FPhysPendingCommand Command;
 	Command.Pointer.SimEventCallback = SimEventCallback;
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysLevel.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysLevel.cpp
index 340946490e56..7c4a392e2947 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysLevel.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysLevel.cpp
@@ -266,6 +266,11 @@ bool InitGamePhys()
 	GPhysXFoundation = PxCreateFoundation(PX_FOUNDATION_VERSION, *GPhysXAllocator, *ErrorCallback);
 	check(GPhysXFoundation);
 
+#if STATS
+	FPhysXProfilerCallback* ProfilerCallback = new FPhysXProfilerCallback();
+	PxSetProfilerCallback(ProfilerCallback);
+#endif
+
 #if PHYSX_MEMORY_STATS
 	// Want names of PhysX allocations
 	GPhysXFoundation->setReportAllocationNames(true);
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysScene.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysScene.cpp
index f0cfacf90e76..8e0078696864 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysScene.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysScene.cpp
@@ -31,6 +31,7 @@
 #include "PhysicsEngine/BodySetup.h"
 #include "PhysicsEngine/ConstraintInstance.h"
 #include "PhysicsReplication.h"
+#include "ProfilingDebugging/CsvProfiler.h"
 
 /** Physics stats **/
 
@@ -38,6 +39,8 @@ DEFINE_STAT(STAT_TotalPhysicsTime);
 DEFINE_STAT(STAT_NumCloths);
 DEFINE_STAT(STAT_NumClothVerts);
 
+CSV_DECLARE_CATEGORY_MODULE_EXTERN(CORE_API, Basic);
+
 DECLARE_CYCLE_STAT(TEXT("Start Physics Time (sync)"), STAT_PhysicsKickOffDynamicsTime, STATGROUP_Physics);
 DECLARE_CYCLE_STAT(TEXT("Fetch Results Time (sync)"), STAT_PhysicsFetchDynamicsTime, STATGROUP_Physics);
 
@@ -118,6 +121,20 @@ FAutoConsoleTaskPriority CPrio_FPhysXTask_Cloth(
 	ENamedThreads::HighTaskPriority // if we don't have hi pri threads, then use normal priority threads at high task priority instead
 	);
 
+int32 GPhysXOverrideMbpNumSubdivisions_Client = 0;
+int32 GPhysXOverrideMbpNumSubdivisions_Server = 0;
+int32 GPhysXForceMbp_Client = 0;
+int32 GPhysXForceMbp_Server = 0;
+int32 GPhysXForceNoKinematicStaticPairs = 0;
+int32 GPhysXForceNoKinematicKinematicPairs = 0;
+
+FAutoConsoleVariableRef CVarOverrideMbpNumSubdivisionsClient(TEXT("p.OverrideMbpNumSubdivisionsClient"), GPhysXOverrideMbpNumSubdivisions_Client, TEXT("Override for number of subdivisions to perform when building MBP regions on a client, note regions are only generated when a scene is created - this will not update the scene if it's already running (0 = No override, 1>16 - Override number)"), ECVF_Default);
+FAutoConsoleVariableRef CVarOverrideMbpNumSubdivisionsServer(TEXT("p.OverrideMbpNumSubdivisionsServer"), GPhysXOverrideMbpNumSubdivisions_Server, TEXT("Override for number of subdivisions to perform when building MBP regions on a server, note regions are only generated when a scene is created - this will not update the scene if it's already running (0 = No override, 1>16 - Override number)"), ECVF_Default);
+FAutoConsoleVariableRef CVarForceMbpClient(TEXT("p.ForceMbpClient"), GPhysXForceMbp_Client, TEXT("Forces all created scenes to use MBP on client builds"), ECVF_Default);
+FAutoConsoleVariableRef CVarForceMbpServer(TEXT("p.ForceMbpServer"), GPhysXForceMbp_Server, TEXT("Forces all created scenes to use MBP on server builds"), ECVF_Default);
+FAutoConsoleVariableRef CVarForceNoKSPairs(TEXT("p.ForceNoKSPairs"), GPhysXForceNoKinematicStaticPairs, TEXT("Disables kinematic-static pairs. This makes converting from static to dynamic a little slower - but provides better broadphase performance because we early reject those pairs."), ECVF_Default);
+FAutoConsoleVariableRef CVarForceNoKKPairs(TEXT("p.ForceNoKKPairs"), GPhysXForceNoKinematicKinematicPairs, TEXT("Disables kinematic-kinematic pairs. This is required when using APEX destruction to correctly generate chunk pairs - when not using destruction this speeds up the broadphase by early rejecting KK pairs."), ECVF_Default);
+
 DECLARE_STATS_GROUP(TEXT("PhysXTasks"), STATGROUP_PhysXTasks, STATCAT_Advanced);
 
 struct FPhysXRingBuffer
@@ -141,6 +158,42 @@ struct FBatchPhysXTasks
 	}
 };
 
+struct FPhysTaskScopedNamedEvent
+{
+	FPhysTaskScopedNamedEvent() = delete;
+	FPhysTaskScopedNamedEvent(const FPhysTaskScopedNamedEvent& InOther) = delete;
+	FPhysTaskScopedNamedEvent& operator=(const FPhysTaskScopedNamedEvent& InOther) = delete;
+
+	FPhysTaskScopedNamedEvent(PxBaseTask* InTask)
+	{
+#if ENABLE_STATNAMEDEVENTS
+		check(InTask);
+		const char* TaskName = InTask->getName();
+		
+		bEmittedEvent = GCycleStatsShouldEmitNamedEvents != 0;
+
+		if(bEmittedEvent)
+		{
+			FPlatformMisc::BeginNamedEvent(FColor::Green, TaskName);
+		}
+#endif
+	}
+
+	~FPhysTaskScopedNamedEvent()
+	{
+#if ENABLE_STATNAMEDEVENTS
+		if(bEmittedEvent)
+		{
+			FPlatformMisc::EndNamedEvent();
+		}
+#endif
+	}
+
+private:
+
+	bool bEmittedEvent;
+};
+
 static FAutoConsoleVariableSink CVarBatchPhysXTasks(FConsoleCommandDelegate::CreateStatic(&FBatchPhysXTasks::SetPhysXTasksSinkFunc));
 
 namespace DynamicStatsHelper
@@ -330,16 +383,20 @@ void FPhysXTask<IsCloth>::DoTask(ENamedThreads::Type CurrentThread, const FGraph
 	{
 		PxBaseTask* Task = RingBuffer.Buffer[RingBuffer.Start];
 
-#if STATS
-		const char* StatName = Task->getName();
-		FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(StatName));
+#if ENABLE_STATNAMEDEVENTS || STATS
+		FPhysTaskScopedNamedEvent TaskEvent(Task);
 #endif
+
+#if STATS
+		const char* TaskName = Task->getName();
+		FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(TaskName));
+#endif
+
 		Task->run();
 		Task->release();
 
 		RingBuffer.Start = (RingBuffer.Start + 1) % RingBuffer.Size;
 		--RingBuffer.Num;
-
 	}
 }
 
@@ -370,10 +427,15 @@ class FPhysXCPUDispatcherSingleThread : public PxCpuDispatcher
 		}
 
 		{
-#if STATS
-			const char* StatName = Task.getName();
-			FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(StatName));
+#if ENABLE_STATNAMEDEVENTS || STATS
+			FPhysTaskScopedNamedEvent TaskEvent(&Task);
 #endif
+
+#if STATS
+			const char* TaskName = Task.getName();
+			FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(TaskName));
+#endif
+
 			Task.run();
 			Task.release();
 		}
@@ -382,9 +444,14 @@ class FPhysXCPUDispatcherSingleThread : public PxCpuDispatcher
 		{
 			PxBaseTask& ChildTask = *TaskStack.Pop();
 			{
+
+#if ENABLE_STATNAMEDEVENTS || STATS
+				FPhysTaskScopedNamedEvent TaskEvent(&ChildTask);
+#endif
+
 #if STATS
-				const char* StatName = ChildTask.getName();
-				FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(StatName));
+				const char* ChildTaskName = ChildTask.getName();
+				FScopeCycleCounter CycleCounter(DynamicStatsHelper::FindOrCreateStatId(ChildTaskName));
 #endif
 				ChildTask.run();
 				ChildTask.release();
@@ -400,6 +467,7 @@ class FPhysXCPUDispatcherSingleThread : public PxCpuDispatcher
 };
 
 TSharedPtr<ISimEventCallbackFactory> FPhysScene::SimEventCallbackFactory;
+TSharedPtr<IContactModifyCallbackFactory> FPhysScene::ContactModifyCallbackFactory;
 
 #endif // WITH_PHYSX
 
@@ -1008,11 +1076,12 @@ void FPhysScene::UpdateKinematicsOnDeferredSkelMeshes()
 	DeferredKinematicUpdateSkelMeshes.Reset();
 }
 
-
 /** Exposes ticking of physics-engine scene outside Engine. */
 void FPhysScene::TickPhysScene(uint32 SceneType, FGraphEventRef& InOutCompletionEvent)
 {
 	SCOPE_CYCLE_COUNTER(STAT_TotalPhysicsTime);
+	CSV_SCOPED_TIMING_STAT(Basic, TotalPhysicsTime);
+
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsKickOffDynamicsTime, SceneType == PST_Sync);
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsKickOffDynamicsTime_Async, SceneType == PST_Async);
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsKickOffDynamicsTime_Cloth, SceneType == PST_Cloth);
@@ -1028,12 +1097,6 @@ void FPhysScene::TickPhysScene(uint32 SceneType, FGraphEventRef& InOutCompletion
 		return;
 	}
 
-	if (IsSubstepping(SceneType))	//we don't bother sub-stepping cloth
-	{
-		//We're about to start stepping so swap buffers. Might want to find a better place for this?
-		PhysSubSteppers[SceneType]->SwapBuffers();
-	}
-
 	/**
 	* clamp down... if this happens we are simming physics slower than real-time, so be careful with it.
 	* it can improve framerate dramatically (really, it is the same as scaling all velocities down and
@@ -1070,6 +1133,25 @@ void FPhysScene::TickPhysScene(uint32 SceneType, FGraphEventRef& InOutCompletion
 	// Update any skeletal meshes that need their bone transforms sent to physics sim
 	UpdateKinematicsOnDeferredSkelMeshes();
 
+#if !WITH_PHYSX
+	const bool bSimulateScene = false;
+#else
+#if !WITH_APEX
+	PxScene* PScene = GetPhysXScene(SceneType);
+	const bool bSimulateScene = PScene && (UseDelta > 0.f);
+#else
+	apex::Scene* ApexScene = GetApexScene(SceneType);
+	const bool bSimulateScene = ApexScene && UseDelta > 0.f;
+#endif
+#endif
+
+	// Replicate physics
+#if WITH_PHYSX
+	if (bSimulateScene && PhysicsReplication)
+	{
+		PhysicsReplication->Tick(AveragedFrameTime[SceneType]);
+	}
+#endif
 
 	float PreTickTime = IsSubstepping(SceneType) ? UseDelta : AveragedFrameTime[SceneType];
 
@@ -1077,30 +1159,21 @@ void FPhysScene::TickPhysScene(uint32 SceneType, FGraphEventRef& InOutCompletion
 	OnPhysScenePreTick.Broadcast(this, SceneType, PreTickTime);
 
 	// If not substepping, call this delegate here. Otherwise we call it in FPhysSubstepTask::SubstepSimulationStart
-		if (IsSubstepping(SceneType) == false)
-		{
+	if (IsSubstepping(SceneType) == false)
+	{
 		OnPhysSceneStep.Broadcast(this, SceneType, PreTickTime);
-		}
-
+	}
+	else
+	{
+		//We're about to start stepping so swap buffers. Might want to find a better place for this?
+		PhysSubSteppers[SceneType]->SwapBuffers();
+	}
 
 #if WITH_PHYSX
-
 	FlushDeferredActors((EPhysicsSceneType)SceneType);
 	DeferredSceneData[SceneType].bIsSimulating = true;
-
-#if !WITH_APEX
-	PxScene* PScene = GetPhysXScene(SceneType);
-	if (PScene && (UseDelta > 0.f))
-#else
-	apex::Scene* ApexScene = GetApexScene(SceneType);
-	if (ApexScene && UseDelta > 0.f)
-#endif
+	if (bSimulateScene)
 	{
-		if (PhysicsReplication)
-		{
-			PhysicsReplication->Tick(AveragedFrameTime[SceneType]);
-		}
-
 		if(IsSubstepping(SceneType)) //we don't bother sub-stepping cloth
 		{
 			bTaskOutstanding = SubstepSimulation(SceneType, InOutCompletionEvent);
@@ -1130,6 +1203,7 @@ void FPhysScene::TickPhysScene(uint32 SceneType, FGraphEventRef& InOutCompletion
 		TArray<FBaseGraphTask*> NewTasks;
 		InOutCompletionEvent->DispatchSubsequents(NewTasks, ENamedThreads::AnyThread); // nothing to do, so nothing to wait for
 	}
+
 	bSubstepping = UPhysicsSettings::Get()->bSubstepping;
 	bSubsteppingAsync = UPhysicsSettings::Get()->bSubsteppingAsync;
 }
@@ -1186,6 +1260,7 @@ void FPhysScene::ProcessPhysScene(uint32 SceneType)
 	checkSlow(SceneType < PST_MAX);
 
 	SCOPE_CYCLE_COUNTER(STAT_TotalPhysicsTime);
+	CSV_SCOPED_TIMING_STAT(Basic, TotalPhysicsTime);
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsFetchDynamicsTime, SceneType == PST_Sync);
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsFetchDynamicsTime_Cloth, SceneType == PST_Cloth);
 	CONDITIONAL_SCOPE_CYCLE_COUNTER(STAT_PhysicsFetchDynamicsTime_Async, SceneType == PST_Async);
@@ -1249,6 +1324,9 @@ void FPhysScene::ProcessPhysScene(uint32 SceneType)
 	DeferredSceneData[SceneType].bIsSimulating = false;
 	FlushDeferredActors((EPhysicsSceneType)SceneType);
 #endif
+
+	// Broadcast 'post tick' delegate
+	OnPhysScenePostTick.Broadcast(this, SceneType);
 }
 
 /** Struct to remember a pending component transform change */
@@ -1856,6 +1934,18 @@ void FPhysScene::AddDebugLines(uint32 SceneType, class ULineBatchComponent* Line
 	}
 }
 
+#if !UE_BUILD_SHIPPING
+int32 ForceSubstep = 0;
+FAutoConsoleVariableRef CVarSubStep(
+	TEXT("p.ForceSubstep"),
+	ForceSubstep,
+	TEXT("Whether to force substepping on")
+	TEXT("0: Ignore, 1: Force"),
+	ECVF_Default);
+#else
+constexpr int32 ForceSubstep = 0;
+#endif
+
 bool FPhysScene::IsSubstepping(uint32 SceneType) const
 {
 	// Substepping relies on interpolating transforms over frames, but only game worlds will be ticked,
@@ -1867,7 +1957,7 @@ bool FPhysScene::IsSubstepping(uint32 SceneType) const
 
 	if (SceneType == PST_Sync)
 	{
-		return bSubstepping;
+		return ForceSubstep == 1 || bSubstepping;
 	}
 
 	if (SceneType == PST_Async)
@@ -1951,6 +2041,7 @@ void FPhysScene::InitPhysScene(uint32 SceneType)
 
 	// Create sim event callback
 	SimEventCallback[SceneType] = SimEventCallbackFactory.IsValid() ? SimEventCallbackFactory->Create(this, SceneType) : new FPhysXSimEventCallback(this, SceneType);
+	ContactModifyCallback[SceneType] = ContactModifyCallbackFactory.IsValid() ? ContactModifyCallbackFactory->Create(this, SceneType) : nullptr;
 
 	// Include scene descriptor in loop, so that we might vary it with scene type
 	PxSceneDesc PSceneDesc(GPhysXSDK->getTolerancesScale());
@@ -1963,6 +2054,7 @@ void FPhysScene::InitPhysScene(uint32 SceneType)
 
 	PSceneDesc.filterShader = GSimulationFilterShader ? GSimulationFilterShader : PhysXSimFilterShader;
 	PSceneDesc.simulationEventCallback = SimEventCallback[SceneType];
+	PSceneDesc.contactModifyCallback = ContactModifyCallback[SceneType];
 
 	if(UPhysicsSettings::Get()->bEnablePCM)
 	{
@@ -2007,9 +2099,16 @@ void FPhysScene::InitPhysScene(uint32 SceneType)
 		PSceneDesc.flags |= PxSceneFlag::eENABLE_CCD;
 	}
 
-	// Need to turn this on to consider kinematics turning into dynamic. Otherwise, you'll need to call resetFiltering to do the expensive broadphase reinserting
-	PSceneDesc.flags |= PxSceneFlag::eENABLE_KINEMATIC_STATIC_PAIRS;
-	PSceneDesc.flags |= PxSceneFlag::eENABLE_KINEMATIC_PAIRS;	//this is only needed for destruction, but unfortunately this flag cannot be modified after creation and the plugin has no hook (yet)
+	if(!UPhysicsSettings::Get()->bDisableKinematicStaticPairs && GPhysXForceNoKinematicStaticPairs == 0)
+	{
+		// Need to turn this on to consider kinematics turning into dynamic. Otherwise, you'll need to call resetFiltering to do the expensive broadphase reinserting
+		PSceneDesc.flags |= PxSceneFlag::eENABLE_KINEMATIC_STATIC_PAIRS;
+	}
+
+	if(!UPhysicsSettings::Get()->bDisableKinematicKinematicPairs && GPhysXForceNoKinematicKinematicPairs == 0)
+	{
+		PSceneDesc.flags |= PxSceneFlag::eENABLE_KINEMATIC_PAIRS;	//this is only needed for destruction, but unfortunately this flag cannot be modified after creation and the plugin has no hook (yet)
+	}
 
 	// @TODO Should we set up PSceneDesc.limits? How?
 
@@ -2028,6 +2127,21 @@ void FPhysScene::InitPhysScene(uint32 SceneType)
 		UE_LOG(LogPhysics, Log, TEXT("Invalid PSceneDesc"));
 	}
 
+	// Setup MBP desc settings if required
+	FBroadphaseSettings& BroadphaseSettings = IsRunningDedicatedServer() ? UPhysicsSettings::Get()->ServerBroadphaseSettings : UPhysicsSettings::Get()->ClientBroadphaseSettings;
+	bool bUseMBP = (GPhysXForceMbp_Server != 0 && IsRunningDedicatedServer()) || (GPhysXForceMbp_Client != 0 && !IsRunningDedicatedServer()) || BroadphaseSettings.bUseMBP;
+
+	if(bUseMBP)
+	{
+		MbpBroadphaseCallbacks[SceneType] = new FPhysXMbpBroadphaseCallback();
+		PSceneDesc.broadPhaseType = PxBroadPhaseType::eMBP;
+		PSceneDesc.broadPhaseCallback = MbpBroadphaseCallbacks[SceneType];
+	}
+	else
+	{
+		MbpBroadphaseCallbacks[SceneType] = nullptr;
+	}
+
 	// Create scene, and add to map
 	PxScene* PScene = GPhysXSDK->createScene(PSceneDesc);
 	if(PxPvdSceneClient* PVDClient = PScene->getScenePvdClient())
@@ -2035,6 +2149,49 @@ void FPhysScene::InitPhysScene(uint32 SceneType)
 		PVDClient->setScenePvdFlags(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS | PxPvdSceneFlag::eTRANSMIT_CONTACTS | PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES);
 	}
 
+	// Setup actual MBP data on live scene
+	if(bUseMBP)
+	{
+		uint32 NumSubdivisions = BroadphaseSettings.MBPNumSubdivs;
+		
+		if(IsRunningDedicatedServer())
+		{
+			if(GPhysXOverrideMbpNumSubdivisions_Server > 0)
+			{
+				NumSubdivisions = GPhysXOverrideMbpNumSubdivisions_Server;
+			}
+		}
+		else
+		{
+			if(GPhysXOverrideMbpNumSubdivisions_Client > 0)
+			{
+				NumSubdivisions = GPhysXOverrideMbpNumSubdivisions_Client;
+			}
+		}
+
+		// Must have at least one and no more than 256 regions, subdivision is num^2 so only up to 16
+		NumSubdivisions = FMath::Clamp<uint32>(NumSubdivisions, 1, 16);
+
+		const FBox& Bounds = BroadphaseSettings.MBPBounds;
+		PxBounds3 MbpBounds(U2PVector(Bounds.Min), U2PVector(Bounds.Max));
+
+		// Storage for generated regions, the generation function will create num^2 regions
+		TArray<PxBounds3> GeneratedRegions;
+		GeneratedRegions.AddZeroed(NumSubdivisions * NumSubdivisions);
+
+		// Final parameter is up axis (2 == Z for Unreal Engine)
+		PxBroadPhaseExt::createRegionsFromWorldBounds(GeneratedRegions.GetData(), MbpBounds, NumSubdivisions, 2);
+
+		for(const PxBounds3& Region : GeneratedRegions)
+		{
+			PxBroadPhaseRegion NewRegion;
+			NewRegion.bounds = Region;
+			NewRegion.userData = nullptr; // No need to track back to an Unreal instance at the moment
+
+			PScene->addBroadPhaseRegion(NewRegion);
+		}
+	}
+
 #if WITH_APEX
 	// Build the APEX scene descriptor for the PhysX scene
 	apex::SceneDesc ApexSceneDesc;
@@ -2113,6 +2270,8 @@ void FPhysScene::TermPhysScene(uint32 SceneType)
 		// @todo block on any running scene before calling this
 		GPhysCommandHandler->DeferredRelease(PScene);
 		GPhysCommandHandler->DeferredDeleteSimEventCallback(SimEventCallback[SceneType]);
+		GPhysCommandHandler->DeferredDeleteContactModifyCallback(ContactModifyCallback[SceneType]);
+		GPhysCommandHandler->DeferredDeleteMbpBroadphaseCallback(MbpBroadphaseCallbacks[SceneType]);
 
 		// Commands may have accumulated as the scene is terminated - flush any commands for this scene.
 		GPhysCommandHandler->Flush();
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp
index 8c73eb34199e..ce7842634c56 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp
@@ -7,6 +7,26 @@
 #include "PhysXPublic.h"
 #endif
 
+struct FSubstepCallbackGuard
+{
+#if !UE_BUILD_SHIPPING
+	FSubstepCallbackGuard(FPhysSubstepTask& InSubstepTask) : SubstepTask(InSubstepTask)
+	{
+		++SubstepTask.SubstepCallbackGuard;
+	}
+
+	~FSubstepCallbackGuard()
+	{
+		--SubstepTask.SubstepCallbackGuard;
+	}
+
+	FPhysSubstepTask& SubstepTask;
+#else
+	FSubstepCallbackGuard(FPhysSubstepTask&)
+	{
+	}
+#endif
+};
 
 #if WITH_PHYSX
 FPhysSubstepTask::FPhysSubstepTask(PxApexScene * GivenScene, FPhysScene* InPhysScene, uint32 InSceneType) :
@@ -18,6 +38,7 @@ FPhysSubstepTask::FPhysSubstepTask(PxApexScene * GivenScene, FPhysScene* InPhysS
 	StepScale(0.f),
 	TotalSubTime(0.f),
 	CurrentSubStep(0),
+	SubstepCallbackGuard(0),
 	PhysScene(InPhysScene),
 	SceneType(InSceneType),
 	PAScene(GivenScene)
@@ -42,10 +63,10 @@ void FPhysSubstepTask::SetKinematicTarget_AssumesLocked(FBodyInstance* Body, con
 #if WITH_PHYSX
 	TM.DiagnosticCheck_IsValid();
 
-	//We only interpolate kinematic actors
-	if (!Body->IsNonKinematic())
+	//We only interpolate kinematic actors that need it
+	if (!Body->IsNonKinematic() && Body->ShouldInterpolateWhenSubStepping())
 	{
-		FKinematicTarget KinmaticTarget(Body, TM);
+		FKinematicTarget_AssumesLocked KinmaticTarget(Body, TM);
 		FPhysTarget & TargetState = PhysTargetBuffers[External].FindOrAdd(Body);
 		TargetState.bKinematicTarget = true;
 		TargetState.KinematicTarget = KinmaticTarget;
@@ -83,13 +104,19 @@ void FPhysSubstepTask::AddCustomPhysics_AssumesLocked(FBodyInstance* Body, const
 #endif
 }
 
+#if !UE_BUILD_SHIPPING
+#define SUBSTEPPING_WARNING() ensureMsgf(SubstepCallbackGuard == 0, TEXT("Applying a sub-stepped force from a substep callback. This usually indicates an error. Make sure you're only using physx data, and that you are adding non-substepped forces"));
+#else
+#define SUBSTEPPING_WARNING()
+#endif
+
 void FPhysSubstepTask::AddForce_AssumesLocked(FBodyInstance* Body, const FVector& Force, bool bAccelChange)
 {
 #if WITH_PHYSX
 	//We should only apply forces on non kinematic actors
 	if (Body->IsNonKinematic())
 	{
-
+		SUBSTEPPING_WARNING()
 		FForceTarget ForceTarget;
 		ForceTarget.bPosition = false;
 		ForceTarget.Force = Force;
@@ -106,6 +133,7 @@ void FPhysSubstepTask::AddForceAtPosition_AssumesLocked(FBodyInstance* Body, con
 #if WITH_PHYSX
 	if (Body->IsNonKinematic())
 	{
+		SUBSTEPPING_WARNING()
 		FForceTarget ForceTarget;
 		ForceTarget.bPosition = true;
 		ForceTarget.Force = Force;
@@ -123,6 +151,7 @@ void FPhysSubstepTask::AddTorque_AssumesLocked(FBodyInstance* Body, const FVecto
 	//We should only apply torque on non kinematic actors
 	if (Body->IsNonKinematic())
 	{
+		SUBSTEPPING_WARNING()
 		FTorqueTarget TorqueTarget;
 		TorqueTarget.Torque = Torque;
 		TorqueTarget.bAccelChange = bAccelChange;
@@ -139,6 +168,7 @@ void FPhysSubstepTask::AddRadialForceToBody_AssumesLocked(FBodyInstance* Body, c
 	//We should only apply torque on non kinematic actors
 	if (Body->IsNonKinematic())
 	{
+		SUBSTEPPING_WARNING()
 		FRadialForceTarget RadialForceTarget;
 		RadialForceTarget.Origin = Origin;
 		RadialForceTarget.Radius = Radius;
@@ -156,6 +186,7 @@ void FPhysSubstepTask::AddRadialForceToBody_AssumesLocked(FBodyInstance* Body, c
 void FPhysSubstepTask::ApplyCustomPhysics(const FPhysTarget& PhysTarget, FBodyInstance* BodyInstance, float DeltaTime)
 {
 #if WITH_PHYSX
+	FSubstepCallbackGuard Guard(*this);
 	for (int32 i = 0; i < PhysTarget.CustomPhysics.Num(); ++i)
 	{
 		const FCustomTarget& CustomTarget = PhysTarget.CustomPhysics[i];
@@ -392,6 +423,7 @@ void FPhysSubstepTask::SubstepSimulationStart()
 	// Call scene step delegate
 	if (PhysScene != nullptr)
 	{
+		FSubstepCallbackGuard Guard(*this);
 		PhysScene->OnPhysSceneStep.Broadcast(PhysScene, SceneType, DeltaTime);
 	}
 
@@ -420,13 +452,23 @@ void FPhysSubstepTask::SubstepSimulationEnd(ENamedThreads::Type CurrentThread, c
 			SCOPE_CYCLE_COUNTER(STAT_TotalPhysicsTime);
 			SCOPE_CYCLE_COUNTER(STAT_SubstepSimulationEnd);
 
+			{
 #if WITH_APEX
-			PAScene->fetchResults(true, &OutErrorCode);
+				SCOPED_APEX_SCENE_WRITE_LOCK(PAScene);
+				PxScene* PScene = PAScene->getPhysXScene();
 #else
-			PAScene->lockWrite();
-			PAScene->fetchResults(true, &OutErrorCode);
-			PAScene->unlockWrite();
+				PxScene* PScene = PAScene;
+				SCOPED_SCENE_WRITE_LOCK(PScene);
 #endif
+
+				// Dont rebuild scene queries here as this is an intermediate step
+				PScene->setSceneQueryUpdateMode(PxSceneQueryUpdateMode::eBUILD_DISABLED_COMMIT_DISABLED);
+
+				PAScene->fetchResults(true, &OutErrorCode);
+
+				// re-enable query updates (the next fetchResults will rebuild the SQ tree)
+				PScene->setSceneQueryUpdateMode(PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED);
+			}
 		}
 
 		if (OutErrorCode != 0)
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.h b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.h
index 87f6a1622ba7..4e55cf372dd4 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.h
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.h
@@ -89,6 +89,17 @@ struct FKinematicTarget
 	FTransform OriginalTM;
 };
 
+/** Kinematic target struct to use when lock is assumed */
+struct FKinematicTarget_AssumesLocked : public FKinematicTarget
+{
+	FKinematicTarget_AssumesLocked(FBodyInstance* Body, const FTransform& TM)
+	{
+		BodyInstance = Body;
+		TargetTM = TM;
+		OriginalTM = Body->GetUnrealWorldTransform_AssumesLocked(true, true);
+	}
+};
+
 /** Holds information about requested force */
 struct FForceTarget
 {
@@ -202,6 +213,9 @@ private:
 	float StepScale;
 	float TotalSubTime;
 	uint32 CurrentSubStep;
+	int32 SubstepCallbackGuard;
+	friend struct FSubstepCallbackGuard;
+
 	FGraphEventRef CompletionEvent;
 
 	FPhysScene* PhysScene;
@@ -211,4 +225,4 @@ private:
 	PxApexScene * PAScene;
 #endif
 
-};
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysUtils.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysUtils.cpp
index 9430d6bf7fcd..553280d48ccd 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysUtils.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysUtils.cpp
@@ -447,6 +447,7 @@ void PvdConnect(FString Host, bool bVisualization)
 	PxPvdInstrumentationFlags ConnectionFlags = bVisualization  ? PxPvdInstrumentationFlag::eALL : (PxPvdInstrumentationFlag::ePROFILE | PxPvdInstrumentationFlag::eMEMORY);
 
 	PxPvdTransport* transport = PxDefaultPvdSocketTransportCreate(TCHAR_TO_ANSI(*Host), Port, Timeout);
+	GPhysXVisualDebugger->disconnect();	//make sure we're disconnected first
 	GPhysXVisualDebugger->connect(*transport, ConnectionFlags);
 
 	// per scene properties (e.g. PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS) are 
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXCookHelper.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXCookHelper.cpp
index 64642af581a0..bead3dc3a647 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXCookHelper.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXCookHelper.cpp
@@ -14,8 +14,10 @@ FPhysXCookHelper::FPhysXCookHelper(IPhysXCookingModule* InPhysXCookingModule)
 {
 }
 
-void FPhysXCookHelper::CreatePhysicsMeshes_Concurrent()
+bool FPhysXCookHelper::CreatePhysicsMeshes_Concurrent()
 {
+	bool bSuccess = true;
+
 	CreateConvexElements_Concurrent(CookInfo.NonMirroredConvexVertices, OutNonMirroredConvexMeshes, false);
 	CreateConvexElements_Concurrent(CookInfo.MirroredConvexVertices, OutMirroredConvexMeshes, true);
 
@@ -25,6 +27,7 @@ void FPhysXCookHelper::CreatePhysicsMeshes_Concurrent()
 		const bool bError = !PhysXCookingModule->GetPhysXCooking()->CreateTriMesh(FPlatformProperties::GetPhysicsFormat(), CookInfo.TriMeshCookFlags, CookInfo.TriangleMeshDesc.Vertices, CookInfo.TriangleMeshDesc.Indices, CookInfo.TriangleMeshDesc.MaterialIndices, CookInfo.TriangleMeshDesc.bFlipNormals, OutTriangleMeshes[0]);
 		if (bError)
 		{
+			bSuccess = false;
 			UE_LOG(LogPhysics, Warning, TEXT("Failed to cook TriMesh: %s."), *CookInfo.OuterDebugName);
 		}
 		else if (CookInfo.bSupportUVFromHitResults)
@@ -32,6 +35,8 @@ void FPhysXCookHelper::CreatePhysicsMeshes_Concurrent()
 			OutUVInfo.FillFromTriMesh(CookInfo.TriangleMeshDesc);
 		}
 	}
+
+    return bSuccess;
 }
 
 void FPhysXCookHelper::CreatePhysicsMeshesAsync_Concurrent(FSimpleDelegateGraphTask::FDelegate FinishDelegate)
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.cpp
index f6d0593bf7e7..47aa983acbd8 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.cpp
@@ -968,4 +968,67 @@ void FPhysXErrorCallback::reportError(PxErrorCode::Enum e, const char* message,
 		UE_LOG(LogPhysics, Log, TEXT("%s"), *ErrorString);
 	}
 }
+
+void* FPhysXProfilerCallback::zoneStart(const char* eventName, bool detached, uint64_t contextId)
+{
+	if(GCycleStatsShouldEmitNamedEvents > 0)
+	{
+		FPlatformMisc::BeginNamedEvent(FColor::Red, *FString::Printf(TEXT("PHYSX: %s"), StringCast<TCHAR>(eventName).Get()));
+	}
+
+	return nullptr;
+}
+
+void FPhysXProfilerCallback::zoneEnd(void* profilerData, const char* eventName, bool detached, uint64_t contextId)
+{
+	if(GCycleStatsShouldEmitNamedEvents > 0)
+	{
+		FPlatformMisc::EndNamedEvent();
+	}
+}
+
+void FPhysXMbpBroadphaseCallback::onObjectOutOfBounds(PxShape& InShape, PxActor& InActor)
+{
+	FBodyInstance* ActorBodyInstance = FPhysxUserData::Get<FBodyInstance>(InActor.userData);
+	if(ActorBodyInstance)
+	{
+		UPrimitiveComponent* OwnerComponent = ActorBodyInstance->OwnerComponent.Get();
+
+		if(OwnerComponent)
+		{
+			UE_LOG(LogPhysics, Warning, TEXT("Component %s at location %s has physics bodies outside of MBP bounds. Check MBP bounds are correct for this world, collisions are disabled for bodies outside of MBP bounds when MBP is enabled."), *OwnerComponent->GetName(), *OwnerComponent->GetComponentLocation().ToString());
+			return;
+		}
+	}
+
+	UE_LOG(LogPhysics, Warning, TEXT("Unknown component has physics bodies outside of MBP bounds. Check MBP bounds are correct for this world, collisions are disabled for bodies outside of MBP bounds when MBP is enabled."));
+}
+
+void FPhysXMbpBroadphaseCallback::onObjectOutOfBounds(PxAggregate& InAggregate)
+{
+	const PxU32 NumActors = InAggregate.getNbActors();
+	if(NumActors > 0)
+	{
+		// The following code assumes that an aggregate does not span multiple components, this code will need to be updated if this changes
+		PxActor* FirstActor;
+
+		if(InAggregate.getActors(&FirstActor, 1) > 0)
+		{
+			FBodyInstance* ActorBodyInstance = FPhysxUserData::Get<FBodyInstance>(FirstActor->userData);
+			if(ActorBodyInstance)
+			{
+				UPrimitiveComponent* OwnerComponent = ActorBodyInstance->OwnerComponent.Get();
+
+				if(OwnerComponent)
+				{
+					UE_LOG(LogPhysics, Warning, TEXT("Component %s at location %s has physics bodies outside of MBP bounds. Check MBP bounds are correct for this world, collisions are disabled for bodies outside of MBP bounds when MBP is enabled."), *OwnerComponent->GetName(), *OwnerComponent->GetComponentLocation().ToString());
+					return;
+				}
+			}
+		}
+	}
+
+	UE_LOG(LogPhysics, Warning, TEXT("Unknown component has physics bodies outside of MBP bounds. Check MBP bounds are correct for this world, collisions are disabled for bodies outside of MBP bounds when MBP is enabled."));
+}
+
 #endif // WITH_PHYSX
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.h b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.h
index 716692fa8351..3b36898066e9 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.h
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysXSupport.h
@@ -442,6 +442,24 @@ private:
 	int32 SceneType;
 };
 
+class FPhysXProfilerCallback : public PxProfilerCallback
+{
+
+public:
+	virtual void* zoneStart(const char* eventName, bool detached, uint64_t contextId) override;
+	virtual void zoneEnd(void* profilerData, const char* eventName, bool detached, uint64_t contextId) override;
+
+private:
+};
+
+struct FPhysXMbpBroadphaseCallback : public PxBroadPhaseCallback
+{
+
+public:
+	virtual void onObjectOutOfBounds(PxShape& InShape, PxActor& InActor) override;
+	virtual void onObjectOutOfBounds(PxAggregate& InAggregate) override;
+
+};
 
 #if WITH_APEX
 /**
diff --git a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysicsReplication.cpp b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysicsReplication.cpp
index 377a1c2b733f..0044043b1504 100644
--- a/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysicsReplication.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysicsReplication.cpp
@@ -11,128 +11,257 @@
 #include "DrawDebugHelpers.h"
 #include "PhysicsEngine/PhysicsSettings.h"
 #include "PhysicsPublic.h"
+#include "Engine/Classes/GameFramework/PlayerController.h"
+#include "Engine/Classes/GameFramework/PlayerState.h"
+#include "Engine/Classes/Engine/Player.h"
 
 namespace CharacterMovementCVars
 {
 	extern int32 NetShowCorrections;
 	extern float NetCorrectionLifetime;
+
+	static int32 SkipPhysicsReplication = 0;
+	static FAutoConsoleVariableRef CVarSkipPhysicsReplication(TEXT("p.SkipPhysicsReplication"), SkipPhysicsReplication, TEXT(""));
+
+	static float NetPingExtrapolation = 0.3f;
+	static FAutoConsoleVariableRef CVarNetPingExtrapolation(TEXT("p.NetPingExtrapolation"), NetPingExtrapolation, TEXT(""));
+
+	static float ErrorPerLinearDifference = 1.0f;
+	static FAutoConsoleVariableRef CVarErrorPerLinearDifference(TEXT("p.ErrorPerLinearDifference"), ErrorPerLinearDifference, TEXT(""));
+
+	static float ErrorPerAngularDifference = 1.0f;
+	static FAutoConsoleVariableRef CVarErrorPerAngularDifference(TEXT("p.ErrorPerAngularDifference"), ErrorPerAngularDifference, TEXT(""));
+
+	static float ErrorAccumulationSeconds = 0.5f;
+	static FAutoConsoleVariableRef CVarErrorAccumulation(TEXT("p.ErrorAccumulationSeconds"), ErrorAccumulationSeconds, TEXT(""));
+
+	static float ErrorAccumulationDistanceSq = 15.0f;
+	static FAutoConsoleVariableRef CVarErrorAccumulationDistanceSq(TEXT("p.ErrorAccumulationDistanceSq"), ErrorAccumulationDistanceSq, TEXT(""));
+
+	static float ErrorAccumulationSimilarity = 100.0f;
+	static FAutoConsoleVariableRef CVarErrorAccumulationSimilarity(TEXT("p.ErrorAccumulationSimilarity"), ErrorAccumulationSimilarity, TEXT(""));
+
+	static float MaxRestoredStateError = 1.0f;
+	static FAutoConsoleVariableRef CVarMaxRestoredStateError(TEXT("p.MaxRestoredStateError"), MaxRestoredStateError, TEXT(""));
+
+	static float PositionLerp = 0.0f;
+	static FAutoConsoleVariableRef CVarLinSet(TEXT("p.PositionLerp"), PositionLerp, TEXT(""));
+
+	static float LinearVelocityCoefficient = 100.0f;
+	static FAutoConsoleVariableRef CVarLinLerp(TEXT("p.LinearVelocityCoefficient"), LinearVelocityCoefficient, TEXT(""));
+
+	static float AngleLerp = 0.4f;
+	static FAutoConsoleVariableRef CVarAngSet(TEXT("p.AngleLerp"), AngleLerp, TEXT(""));
+
+	static float AngularVelocityCoefficient = 10.0f;
+	static FAutoConsoleVariableRef CVarAngLerp(TEXT("p.AngularVelocityCoefficient"), AngularVelocityCoefficient, TEXT(""));
 }
 
-bool FPhysicsReplication::ApplyRigidBodyState(float DeltaSeconds, FBodyInstance* BI, const FReplicatedPhysicsTarget& PhysicsTarget, const FRigidBodyErrorCorrection& ErrorCorrection)
+bool FPhysicsReplication::ApplyRigidBodyState(float DeltaSeconds, FBodyInstance* BI, FReplicatedPhysicsTarget& PhysicsTarget, const FRigidBodyErrorCorrection& ErrorCorrection, const float PingSecondsOneWay)
 {
-	bool bRestoredState = true;
-	bool bTeleport = true;
-	FVector DeltaPos = FVector::ZeroVector;
-	FRigidBodyState NewState = PhysicsTarget.TargetState;
-
-	if (BI->IsInstanceSimulatingPhysics())
+	if (CharacterMovementCVars::SkipPhysicsReplication)
 	{
-		// failure cases
-		const float QuatSizeSqr = NewState.Quaternion.SizeSquared();
-		if (QuatSizeSqr < KINDA_SMALL_NUMBER)
+		return false;
+	}
+
+	//
+	// NOTES:
+	//
+	// The operation of this method has changed since 4.18.
+	//
+	// When a new remote physics state is received, this method will
+	// be called on tick until the local state is within an adequate
+	// tolerance of the new state.
+	//
+	// The received state is extrapolated based on ping, by some
+	// adjustable amount.
+	//
+	// A correction velocity is added new state's velocity, and assigned
+	// to the body. The correction velocity scales with the positional
+	// difference, so without the interference of external forces, this
+	// will result in an exponentially decaying correction.
+	//
+	// Generally it is not needed and will interrupt smoothness of
+	// the replication, but stronger corrections can be obtained by
+	// adjusting position lerping.
+	//
+	// If progress is not being made towards equilibrium, due to some
+	// divergence in physics states between the owning and local sims,
+	// an error value is accumulated, representing the amount of time
+	// spent in an unresolvable state.
+	//
+	// Once the error value has exceeded some threshold (0.5 seconds
+	// by default), a hard snap to the target physics state is applied.
+	//
+
+	bool bRestoredState = true;
+	const FRigidBodyState NewState = PhysicsTarget.TargetState;
+	const float NewQuatSizeSqr = NewState.Quaternion.SizeSquared();
+
+	// failure cases
+	if (!BI->IsInstanceSimulatingPhysics())
+	{
+		UE_LOG(LogPhysics, Warning, TEXT("Physics replicating on non-simulated body. (%s)"), *BI->GetBodyDebugName());
+		return bRestoredState;
+	}
+	else if (NewQuatSizeSqr < KINDA_SMALL_NUMBER)
+	{
+		UE_LOG(LogPhysics, Warning, TEXT("Invalid zero quaternion set for body. (%s)"), *BI->GetBodyDebugName());
+		return bRestoredState;
+	}
+	else if (FMath::Abs(NewQuatSizeSqr - 1.f) > KINDA_SMALL_NUMBER)
+	{
+		UE_LOG(LogPhysics, Warning, TEXT("Quaternion (%f %f %f %f) with non-unit magnitude detected. (%s)"),
+			NewState.Quaternion.X, NewState.Quaternion.Y, NewState.Quaternion.Z, NewState.Quaternion.W, *BI->GetBodyDebugName());
+		return bRestoredState;
+	}
+
+	// Grab configuration variables from engine config or from CVars if overriding is turned on.
+	const float NetPingExtrapolation = CharacterMovementCVars::NetPingExtrapolation >= 0.0f ? CharacterMovementCVars::NetPingExtrapolation : ErrorCorrection.PingExtrapolation;
+	const float ErrorPerLinearDiff = CharacterMovementCVars::ErrorPerLinearDifference >= 0.0f ? CharacterMovementCVars::ErrorPerLinearDifference : ErrorCorrection.ErrorPerLinearDifference;
+	const float ErrorPerAngularDiff = CharacterMovementCVars::ErrorPerAngularDifference >= 0.0f ? CharacterMovementCVars::ErrorPerAngularDifference : ErrorCorrection.ErrorPerAngularDifference;
+	const float MaxRestoredStateError = CharacterMovementCVars::MaxRestoredStateError >= 0.0f ? CharacterMovementCVars::MaxRestoredStateError : ErrorCorrection.MaxRestoredStateError;
+	const float ErrorAccumulationSeconds = CharacterMovementCVars::ErrorAccumulationSeconds >= 0.0f ? CharacterMovementCVars::ErrorAccumulationSeconds : ErrorCorrection.ErrorAccumulationSeconds;
+	const float ErrorAccumulationDistanceSq = CharacterMovementCVars::ErrorAccumulationDistanceSq >= 0.0f ? CharacterMovementCVars::ErrorAccumulationDistanceSq : ErrorCorrection.ErrorAccumulationDistanceSq;
+	const float ErrorAccumulationSimilarity = CharacterMovementCVars::ErrorAccumulationSimilarity >= 0.0f ? CharacterMovementCVars::ErrorAccumulationSimilarity : ErrorCorrection.ErrorAccumulationSimilarity;
+	const float PositionLerp = CharacterMovementCVars::PositionLerp >= 0.0f ? CharacterMovementCVars::PositionLerp : ErrorCorrection.PositionLerp;
+	const float LinearVelocityCoefficient = CharacterMovementCVars::LinearVelocityCoefficient >= 0.0f ? CharacterMovementCVars::LinearVelocityCoefficient : ErrorCorrection.LinearVelocityCoefficient;
+	const float AngleLerp = CharacterMovementCVars::AngleLerp >= 0.0f ? CharacterMovementCVars::AngleLerp : ErrorCorrection.AngleLerp;
+	const float AngularVelocityCoefficient = CharacterMovementCVars::AngularVelocityCoefficient >= 0.0f ? CharacterMovementCVars::AngularVelocityCoefficient : ErrorCorrection.AngularVelocityCoefficient;
+
+	// Get Current state
+	FRigidBodyState CurrentState;
+	BI->GetRigidBodyState(CurrentState);
+	const FQuat InvCurrentQuat = CurrentState.Quaternion.Inverse();
+
+	/////// EXTRAPOLATE APPROXIMATE TARGET VALUES ///////
+
+	// Starting from the last known authoritative position, and
+	// extrapolate an approximation using the last known velocity
+	// and ping.
+	const float ExtrapolationDeltaSeconds = PingSecondsOneWay * NetPingExtrapolation;
+	const FVector ExtrapolationDeltaPos = NewState.LinVel * ExtrapolationDeltaSeconds;
+	const FVector_NetQuantize100 TargetPos = NewState.Position + ExtrapolationDeltaPos;
+	float NewStateAngVel;
+	FVector NewStateAngVelAxis;
+	NewState.AngVel.FVector::ToDirectionAndLength(NewStateAngVelAxis, NewStateAngVel);
+	NewStateAngVel = FMath::DegreesToRadians(NewStateAngVel);
+	const FQuat ExtrapolationDeltaQuaternion = FQuat(NewStateAngVelAxis, NewStateAngVel * ExtrapolationDeltaSeconds);
+	const FQuat TargetAng = ExtrapolationDeltaQuaternion * NewState.Quaternion;
+
+	/////// COMPUTE DIFFERENCES ///////
+
+	const FVector LinDiff = TargetPos - CurrentState.Position;
+	FVector AngDiffAxis;
+	float AngDiff;
+	const FQuat DeltaQuat = TargetAng * InvCurrentQuat;
+	DeltaQuat.ToAxisAndAngle(AngDiffAxis, AngDiff);
+	AngDiff = FMath::RadiansToDegrees(FMath::UnwindRadians(AngDiff));
+
+	/////// ACCUMULATE ERROR IF NOT APPROACHING SOLUTION ///////
+
+	const float Error = (LinDiff.Size() * ErrorPerLinearDiff) + (AngDiff * ErrorPerAngularDiff);
+	bRestoredState = Error < MaxRestoredStateError;
+	if (bRestoredState)
+	{
+		PhysicsTarget.AccumulatedErrorSeconds = 0.0f;
+	}
+	else
+	{
+		//
+		// The heuristic for error accumulation here is:
+		// 1. Did the physics tick from the previous step fail to
+		//    move the body towards a resolved position?
+		// 2. Was the linear error in the same direction as the
+		//    previous frame?
+		// 3. Is the linear error large enough to accumulate error?
+		//
+		// If these conditions are met, then "error" time will accumulate.
+		// Once error has accumulated for a certain number of seconds,
+		// a hard-snap to the target will be performed.
+		//
+		// TODO: Rotation while moving linearly can still mess up this
+		// heuristic. We need to account for it.
+		//
+
+		// Project the change in position from the previous tick onto the
+		// linear error from the previous tick. This value roughly represents
+		// how much correction was performed over the previous physics tick.
+		const float PrevProgress = FVector::DotProduct(
+			FVector(CurrentState.Position) - PhysicsTarget.PrevPos,
+			(PhysicsTarget.PrevPosTarget - PhysicsTarget.PrevPos).GetSafeNormal());
+
+		// Project the current linear error onto the linear error from the
+		// previous tick. This value roughly represents how little the direction
+		// of the linear error state has changed, and how big the error is.
+		const float PrevSimilarity = FVector::DotProduct(
+			TargetPos - FVector(CurrentState.Position),
+			PhysicsTarget.PrevPosTarget - PhysicsTarget.PrevPos);
+
+		// If the conditions from the heuristic outlined above are met, accumulate
+		// error. Otherwise, reduce it.
+		if (PrevProgress < ErrorAccumulationDistanceSq &&
+			PrevSimilarity > ErrorAccumulationSimilarity)
 		{
-
-			UE_LOG(LogPhysics, Warning, TEXT("Invalid zero quaternion set for body. (%s)"), *BI->GetBodyDebugName());
-			return bRestoredState;
+			PhysicsTarget.AccumulatedErrorSeconds += DeltaSeconds;
 		}
-		else if (FMath::Abs(QuatSizeSqr - 1.f) > KINDA_SMALL_NUMBER)
+		else
 		{
-			UE_LOG(LogPhysics, Warning, TEXT("Quaternion (%f %f %f %f) with non-unit magnitude detected. (%s)"),
-				NewState.Quaternion.X, NewState.Quaternion.Y, NewState.Quaternion.Z, NewState.Quaternion.W, *BI->GetBodyDebugName());
-			return bRestoredState;
+			PhysicsTarget.AccumulatedErrorSeconds = FMath::Max(PhysicsTarget.AccumulatedErrorSeconds - DeltaSeconds, 0.0f);
 		}
+	}
 
-		FRigidBodyState CurrentState;
-		BI->GetRigidBodyState(CurrentState);
+	PhysicsTarget.PrevPosTarget = TargetPos;
+	PhysicsTarget.PrevPos = FVector(CurrentState.Position);
 
+	// Hard snap if error accumulation is big enough, and clear the error accumulator.
+	const bool bHardSnap = PhysicsTarget.AccumulatedErrorSeconds > ErrorAccumulationSeconds;
+	if (bHardSnap)
+	{
+		PhysicsTarget.AccumulatedErrorSeconds = 0.0f;
+		bRestoredState = true;
+	}
 
-		NewState.Position = FMath::Lerp(CurrentState.Position, NewState.Position, ErrorCorrection.LinearInterpAlpha);
-		NewState.LinVel = FMath::Lerp(CurrentState.LinVel, NewState.LinVel, ErrorCorrection.LinearInterpAlpha);
+	/////// SIMPLE EXPONENTIAL MATCH ///////
 
-		const bool bShouldSleep = (NewState.Flags & ERigidBodyFlags::Sleeping) != 0;
-		/////// POSITION CORRECTION ///////
+	const FVector NewLinVel = bHardSnap ? FVector(NewState.LinVel) : FVector(NewState.LinVel) + (LinDiff * CharacterMovementCVars::LinearVelocityCoefficient * DeltaSeconds);
+	const FVector NewAngVel = bHardSnap ? FVector(NewState.AngVel) : FVector(NewState.AngVel) + (AngDiff * CharacterMovementCVars::AngularVelocityCoefficient * DeltaSeconds);
 
-		// Find out how much of a correction we are making
-		DeltaPos = NewState.Position - CurrentState.Position;
-		const float DeltaMagSq = DeltaPos.SizeSquared();
-		const float BodyLinearSpeedSq = CurrentState.LinVel.SizeSquared();
+	const FVector NewPos = FMath::Lerp(CurrentState.Position, TargetPos, bHardSnap ? 1.0f : CharacterMovementCVars::PositionLerp);
+	const FQuat NewAng = FQuat::Slerp(CurrentState.Quaternion, TargetAng, bHardSnap ? 1.0f : CharacterMovementCVars::AngleLerp);
 
-		// Snap position by default (big correction, or we are moving too slowly)
-		FVector UpdatedPos = NewState.Position;
-		FVector FixLinVel = FVector::ZeroVector;
+	/////// UPDATE BODY ///////
 
-		// If its a small correction and velocity is above threshold, only make a partial correction, 
-		// and calculate a velocity that would fix it over 'fixTime'.
-		//TODO: make this work with hard teleporting
-		//if (DeltaMagSq < ErrorCorrection.LinearDeltaThresholdSq  && BodyLinearSpeedSq >= ErrorCorrection.BodySpeedThresholdSq)
-		{
-			//UpdatedPos =  FMath::Lerp(CurrentState.Position, NewState.Position, ErrorCorrection.LinearInterpAlpha);
-			FixLinVel = (NewState.Position - UpdatedPos) * ErrorCorrection.LinearRecipFixTime;
-			//FixLinVel = FMath::Lerp(CurrentState.LinVel, NewState.LinVel, ErrorCorrection.LinearInterpAlpha);
-			bTeleport = false;
-		}
+	// Store sleeping state
+	const bool bShouldSleep = (NewState.Flags & ERigidBodyFlags::Sleeping) != 0;
+	const bool bWasAwake = BI->IsInstanceAwake();
 
-		// Get the linear correction
-		DeltaPos = UpdatedPos - CurrentState.Position;
+	// Set the new transform
+	BI->SetBodyTransform(FTransform(NewAng, NewPos), ETeleportType::TeleportPhysics);
 
-		/////// ORIENTATION CORRECTION ///////
-		// Get quaternion that takes us from old to new
-		const FQuat InvCurrentQuat = CurrentState.Quaternion.Inverse();
-		const FQuat DeltaQuat = NewState.Quaternion * InvCurrentQuat;
+	// Set the new velocities
+	BI->SetLinearVelocity(NewLinVel, false);
+	BI->SetAngularVelocityInRadians(FMath::DegreesToRadians(NewAngVel), false);
 
-		FVector DeltaAxis;
-		float DeltaAng;	// radians
-		DeltaQuat.ToAxisAndAngle(DeltaAxis, DeltaAng);
-		DeltaAng = FMath::UnwindRadians(DeltaAng);
+	/////// SLEEP UPDATE ///////
 
-		// Snap rotation by default (big correction, or we are moving too slowly)
-		FQuat UpdatedQuat = NewState.Quaternion;
-		FVector FixAngVel = FVector::ZeroVector; // degrees per second
-
-												 // If the error is small, and we are moving, try to move smoothly to it
-		if (FMath::Abs(DeltaAng) < ErrorCorrection.AngularDeltaThreshold)
-		{
-			UpdatedQuat = FMath::Lerp(CurrentState.Quaternion, NewState.Quaternion, ErrorCorrection.AngularInterpAlpha);
-			FixAngVel = DeltaAxis.GetSafeNormal() * FMath::RadiansToDegrees(DeltaAng) * (1.f - ErrorCorrection.AngularInterpAlpha) * ErrorCorrection.AngularRecipFixTime;
-		}
-
-		/////// BODY UPDATE ///////
-		FVector NewVelocity = NewState.LinVel + FixLinVel;
-		if (bTeleport)
-		{
-			NewVelocity = NewState.LinVel;
-		}
-
-		BI->SetBodyTransform(FTransform(UpdatedQuat, UpdatedPos), ETeleportType::TeleportPhysics);
-		BI->SetLinearVelocity(NewVelocity, false);
-		BI->SetAngularVelocityInRadians(FMath::DegreesToRadians(NewState.AngVel + FixAngVel), false);
-
-		// state is restored when no velocity corrections are required
-		bRestoredState = (FixLinVel.SizeSquared() < KINDA_SMALL_NUMBER) && (FixAngVel.SizeSquared() < KINDA_SMALL_NUMBER);
-
-		/////// SLEEP UPDATE ///////
-		const bool bIsAwake = BI->IsInstanceAwake();
-		if (bIsAwake && (bShouldSleep && bRestoredState))
-		{
-			BI->PutInstanceToSleep();
-		}
-		else if (!bIsAwake)
-		{
-			BI->WakeInstance();
-		}
+	if (bShouldSleep && !bWasAwake)
+	{
+		BI->PutInstanceToSleep();
 	}
 
 #if !UE_BUILD_SHIPPING
 	if (CharacterMovementCVars::NetShowCorrections != 0)
 	{
-		FVector Origin;
-		FVector Extents;
-		FBox Bounds = BI->GetBodyBounds();
-		Bounds.GetCenterAndExtents(Origin, Extents);
+		PhysicsTarget.ErrorHistory.bAutoAdjustMinMax = false;
+		PhysicsTarget.ErrorHistory.MinValue = 0.0f;
+		PhysicsTarget.ErrorHistory.MaxValue = 1.0f;
+		PhysicsTarget.ErrorHistory.AddSample(PhysicsTarget.AccumulatedErrorSeconds / ErrorAccumulationSeconds);
 		if (UWorld* OwningWorld = PhysScene->GetOwningWorld())
 		{
-			DrawDebugBox(OwningWorld, Origin + DeltaPos, Extents, FQuat::Identity, FColor(100, 255, 100), true, CharacterMovementCVars::NetCorrectionLifetime);
-			DrawDebugBox(OwningWorld, Origin, Extents, FQuat::Identity, bTeleport ? FColor(255, 100, 100) : FColor(255.f, 0.f, 255.f), true, CharacterMovementCVars::NetCorrectionLifetime);
+			FColor Color = FColor::White;
+			DrawDebugDirectionalArrow(OwningWorld, CurrentState.Position, TargetPos, 5.0f, Color, true, CharacterMovementCVars::NetCorrectionLifetime, 0, 1.5f);
+			DrawDebugFloatHistory(*OwningWorld, PhysicsTarget.ErrorHistory, NewPos + FVector(0.0f, 0.0f, 100.0f), FVector2D(100.0f, 50.0f), FColor::White);
 		}
 	}
 #endif
@@ -140,53 +269,113 @@ bool FPhysicsReplication::ApplyRigidBodyState(float DeltaSeconds, FBodyInstance*
 	return bRestoredState;
 }
 
-void FPhysicsReplication::OnTick(float DeltaSeconds, TMap<FBodyInstance *, FReplicatedPhysicsTarget>& BodyToTargetMap)
+float FPhysicsReplication::GetLocalPing() const
 {
-	
-	const FRigidBodyErrorCorrection& PhysicErrorCorrection = UPhysicsSettings::Get()->PhysicErrorCorrection;
-
-	for (auto Itr = BodyToTargetMap.CreateIterator(); Itr; ++Itr)
+	if (UWorld* World = PhysScene->GetOwningWorld())
 	{
-		FBodyInstance* BI = Itr.Key();
-		FReplicatedPhysicsTarget& PhysicsTarget = Itr.Value();
-		FRigidBodyState& UpdatedState = PhysicsTarget.TargetState;
-
-		bool bUpdated = false;
-
-		if (UPrimitiveComponent* OwnerComp = BI->OwnerComponent.Get())
+		if (APlayerController* PlayerController = World->GetFirstPlayerController())
 		{
-			AActor* OwningActor = OwnerComp->GetOwner();
-			if (OwningActor && OwningActor->Role == ROLE_SimulatedProxy)	//TODO: can we avoid the replication all together?
+			if (APlayerState* PlayerState = PlayerController->PlayerState)
 			{
+				return PlayerState->ExactPing;
+			}
+		}
+	}
+	return 0.0f;
+}
 
-				// force update if simulation is sleeping on server
-				if ((UpdatedState.Flags & ERigidBodyFlags::Sleeping) && BI->IsInstanceAwake())
+float FPhysicsReplication::GetOwnerPing(const AActor* const Owner, const FReplicatedPhysicsTarget& Target) const
+{
+	//
+	// NOTE: At the moment, we have no real way to objectively access the ping of the
+	// authoritative simulation owner to the server, which is what this function
+	// claims to return.
+	//
+	// In order to actually use ping to extrapolate replication, we need to access
+	// it with something along the lines of the disabled code below.
+	//
+#if false
+	if (UPlayer* OwningPlayer = OwningActor->GetNetOwningPlayer())
+	{
+		if (UWorld* World = PhysScene->GetOwningWorld())
+		{
+			if (APlayerController* PlayerController = OwningPlayer->GetPlayerController(World))
+			{
+				if (APlayerState* PlayerState = PlayerController->PlayerState)
 				{
-					UpdatedState.Flags |= ERigidBodyFlags::NeedsUpdate;
-				}
-
-				if (UpdatedState.Flags & ERigidBodyFlags::NeedsUpdate)
-				{
-					const bool bRestoredState = ApplyRigidBodyState(DeltaSeconds, BI, PhysicsTarget, PhysicErrorCorrection);
-					if (bRestoredState)
-					{
-						//UpdatedState.Flags &= ~ERigidBodyFlags::NeedsUpdate;	//TODO: needs fixing to properly clean up
-					}
-
-					bUpdated = true;
-
-
-					// Need to update the component to match new position.
-					OwnerComp->SyncComponentToRBPhysics();
+					return PlayerState->ExactPing;
 				}
 			}
 		}
 	}
+#endif
+
+	return 0.0f;
+}
+
+void FPhysicsReplication::OnTick(float DeltaSeconds, TMap<TWeakObjectPtr<UPrimitiveComponent>, FReplicatedPhysicsTarget>& ComponentsToTargets)
+{
+	const FRigidBodyErrorCorrection& PhysicErrorCorrection = UPhysicsSettings::Get()->PhysicErrorCorrection;
+
+	// Get the ping between this PC & the server
+	const float LocalPing = GetLocalPing();
+
+	for (auto Itr = ComponentsToTargets.CreateIterator(); Itr; ++Itr)
+	{
+		bool bRemoveItr = false;
+		if (UPrimitiveComponent* PrimComp = Itr.Key().Get())
+		{
+			if(FBodyInstance* BI = PrimComp->GetBodyInstance(Itr.Value().BoneName))
+			{
+				FReplicatedPhysicsTarget& PhysicsTarget = Itr.Value();
+				FRigidBodyState& UpdatedState = PhysicsTarget.TargetState;
+
+				bool bUpdated = false;
+				AActor* OwningActor = PrimComp->GetOwner();
+				if (OwningActor && OwningActor->Role == ROLE_SimulatedProxy)	//TODO: can we avoid the replication all together?
+				{
+					// Get the ping of the guy who owns this thing. If nobody is,
+					// then it's server authoritative.
+					const float OwnerPing = GetOwnerPing(OwningActor, PhysicsTarget);
+
+					// Get the total ping - this approximates the time since the update was
+					// actually generated on the machine that is doing the authoritative sim.
+					// NOTE: We divide by 2 to approximate 1-way ping from 2-way ping.
+					const float PingSecondsOneWay = (LocalPing + OwnerPing) * 0.5f * 0.001f;
+
+					// force update if simulation is sleeping on server
+					//if ((UpdatedState.Flags & ERigidBodyFlags::Sleeping) && BI->IsInstanceAwake())
+					//{
+					//	UpdatedState.Flags |= ERigidBodyFlags::NeedsUpdate;
+					//}
+
+					if (UpdatedState.Flags & ERigidBodyFlags::NeedsUpdate)
+					{
+						const bool bRestoredState = ApplyRigidBodyState(DeltaSeconds, BI, PhysicsTarget, PhysicErrorCorrection, PingSecondsOneWay);
+						if (bRestoredState)
+						{
+							bRemoveItr = true;
+						}
+
+						bUpdated = true;
+
+						// Need to update the component to match new position.
+						PrimComp->SyncComponentToRBPhysics();
+					}
+				}
+			}
+		}
+
+		if (bRemoveItr)
+		{
+			Itr.RemoveCurrent();
+		}
+	}
 }
 
 void FPhysicsReplication::Tick(float DeltaSeconds)
 {
-	OnTick(DeltaSeconds, BodiesToTargets);
+	OnTick(DeltaSeconds, ComponentToTargets);
 }
 
 FPhysicsReplication::FPhysicsReplication(FPhysScene* InPhysicsScene)
@@ -195,10 +384,19 @@ FPhysicsReplication::FPhysicsReplication(FPhysScene* InPhysicsScene)
 
 }
 
-void FPhysicsReplication::SetReplicatedTarget(FBodyInstance* BI, const FRigidBodyState& ReplicatedTarget)
+void FPhysicsReplication::SetReplicatedTarget(UPrimitiveComponent* Component, FName BoneName, const FRigidBodyState& ReplicatedTarget)
 {
 	if (UWorld* OwningWorld = PhysScene->GetOwningWorld())
 	{
-		BodiesToTargets.FindOrAdd(BI) = { ReplicatedTarget,  OwningWorld->GetTimeSeconds() };
+		//TODO: there's a faster way to compare this
+		FReplicatedPhysicsTarget& Target = ComponentToTargets.FindOrAdd(TWeakObjectPtr<UPrimitiveComponent>(Component));
+		Target.TargetState = ReplicatedTarget;
+		Target.BoneName = BoneName;
+		Target.ArrivedTimeSeconds = OwningWorld->GetTimeSeconds();
 	}
-}
\ No newline at end of file
+}
+
+void FPhysicsReplication::RemoveReplicatedTarget(UPrimitiveComponent* Component)
+{
+	ComponentToTargets.Remove(Component);
+}
diff --git a/Engine/Source/Runtime/Engine/Private/PlayerController.cpp b/Engine/Source/Runtime/Engine/Private/PlayerController.cpp
index 6f9aa77c6248..105d25760e68 100644
--- a/Engine/Source/Runtime/Engine/Private/PlayerController.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PlayerController.cpp
@@ -2268,7 +2268,7 @@ bool APlayerController::InputAxis(FKey Key, float Delta, float DeltaTime, int32
 	return bResult;
 }
 
-bool APlayerController::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
+bool APlayerController::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex)
 {
 	if (GEngine->XRSystem.IsValid())
 	{
@@ -2282,7 +2282,7 @@ bool APlayerController::InputTouch(uint32 Handle, ETouchType::Type Type, const F
 	bool bResult = false;
 	if (PlayerInput)
 	{
-		bResult = PlayerInput->InputTouch(Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex);
+		bResult = PlayerInput->InputTouch(Handle, Type, TouchLocation, Force, DeviceTimestamp, TouchpadIndex);
 
 		if (bEnableTouchEvents || bEnableTouchOverEvents)
 		{
@@ -2459,7 +2459,10 @@ void APlayerController::BuildInputStack(TArray<UInputComponent*>& InputStack)
 
 void APlayerController::ProcessPlayerInput(const float DeltaTime, const bool bGamePaused)
 {
-	TArray<UInputComponent*> InputStack;
+	static TArray<UInputComponent*> InputStack;
+
+	// must be called non-recursively and on the game thread
+	check(IsInGameThread() && !InputStack.Num());
 
 	// process all input components in the stack, top down
 	{
@@ -2472,6 +2475,8 @@ void APlayerController::ProcessPlayerInput(const float DeltaTime, const bool bGa
 		SCOPE_CYCLE_COUNTER(STAT_PC_ProcessInputStack);
 		PlayerInput->ProcessInputStack(InputStack, DeltaTime, bGamePaused);
 	}
+
+	InputStack.Reset();
 }
 
 void APlayerController::PreProcessInput(const float DeltaTime, const bool bGamePaused)
@@ -3033,7 +3038,7 @@ void APlayerController::DisplayDebug(class UCanvas* Canvas, const FDebugDisplayI
 	{
 		DisplayDebugManager.SetDrawColor(FColor::White);
 		DisplayDebugManager.DrawString(FString::Printf(TEXT("Force Feedback - Enabled: %s LL: %.2f LS: %.2f RL: %.2f RS: %.2f"), (bForceFeedbackEnabled ? TEXT("true") : TEXT("false")), ForceFeedbackValues.LeftLarge, ForceFeedbackValues.LeftSmall, ForceFeedbackValues.RightLarge, ForceFeedbackValues.RightSmall));
-		DisplayDebugManager.DrawString(FString::Printf(TEXT("Pawn: %s"), *this->AcknowledgedPawn->GetFName().ToString()));
+		DisplayDebugManager.DrawString(FString::Printf(TEXT("Pawn: %s"), this->AcknowledgedPawn ? *this->AcknowledgedPawn->GetFName().ToString() : TEXT("none")));
 		
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 		DisplayDebugManager.DrawString(TEXT("-------------Last Played Force Feedback--------------"));												      
@@ -5179,7 +5184,7 @@ void APlayerController::BuildHiddenComponentList(const FVector& ViewLocation, TS
 		}
 	}
 
-	// iterate backwards to we can remove as we go
+	// iterate backwards so we can remove as we go
 	for (int32 ComponentIndx = HiddenPrimitiveComponents.Num() - 1; ComponentIndx >= 0; --ComponentIndx)
 	{
 		TWeakObjectPtr<UPrimitiveComponent> ComponentPtr = HiddenPrimitiveComponents[ComponentIndx];
diff --git a/Engine/Source/Runtime/Engine/Private/PrimitiveComponentPhysics.cpp b/Engine/Source/Runtime/Engine/Private/PrimitiveComponentPhysics.cpp
index d3f56c6838db..7919cba2e9ff 100644
--- a/Engine/Source/Runtime/Engine/Private/PrimitiveComponentPhysics.cpp
+++ b/Engine/Source/Runtime/Engine/Private/PrimitiveComponentPhysics.cpp
@@ -13,6 +13,7 @@
 #include "DrawDebugHelpers.h"
 #include "PhysicsReplication.h"
 #include "PhysicsPublic.h"
+#include "UObject/UObjectThreadContext.h"
 
 //////////////// PRIMITIVECOMPONENT ///////////////
 
@@ -40,7 +41,7 @@ void UPrimitiveComponent::SetRigidBodyReplicatedTarget(FRigidBodyState& UpdatedS
 				FBodyInstance* BI = GetBodyInstance(BoneName);
 				if (BI && BI->IsInstanceSimulatingPhysics())
 				{
-					PhysicsReplication->SetReplicatedTarget(BI, UpdatedState);
+					PhysicsReplication->SetReplicatedTarget(this, BoneName, UpdatedState);
 				}
 			}
 		}
@@ -910,15 +911,25 @@ void UPrimitiveComponent::SetCollisionProfileName(FName InCollisionProfileName)
 {
 	SCOPE_CYCLE_COUNTER(STAT_PrimComp_SetCollisionProfileName);
 
-	ECollisionEnabled::Type OldCollisionEnabled = BodyInstance.GetCollisionEnabled();
-	BodyInstance.SetCollisionProfileName(InCollisionProfileName);
-	OnComponentCollisionSettingsChanged();
-
-	ECollisionEnabled::Type NewCollisionEnabled = BodyInstance.GetCollisionEnabled();
-
-	if (OldCollisionEnabled != NewCollisionEnabled)
+	FUObjectThreadContext& ThreadContext = FUObjectThreadContext::Get();
+	if (ThreadContext.ConstructedObject == this)
 	{
-		EnsurePhysicsStateCreated();
+		// If we are in our constructor, defer setup until PostInitProperties as derived classes
+		// may call SetCollisionProfileName more than once.
+		BodyInstance.SetCollisionProfileNameDeferred(InCollisionProfileName);
+	}
+	else
+	{
+		ECollisionEnabled::Type OldCollisionEnabled = BodyInstance.GetCollisionEnabled();
+		BodyInstance.SetCollisionProfileName(InCollisionProfileName);
+		OnComponentCollisionSettingsChanged();
+
+		ECollisionEnabled::Type NewCollisionEnabled = BodyInstance.GetCollisionEnabled();
+
+		if (OldCollisionEnabled != NewCollisionEnabled)
+		{
+			EnsurePhysicsStateCreated();
+		}
 	}
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/ProfilingDebugging/MallocLeakReporter.cpp b/Engine/Source/Runtime/Engine/Private/ProfilingDebugging/MallocLeakReporter.cpp
index 2833e65e40f2..d7e615a64cfc 100644
--- a/Engine/Source/Runtime/Engine/Private/ProfilingDebugging/MallocLeakReporter.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ProfilingDebugging/MallocLeakReporter.cpp
@@ -98,6 +98,8 @@ void FMallocLeakReporter::Clear()
 
 void FMallocLeakReporter::Checkpoint()
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FMallocLeakDetection_Checkpoint);
+
 #if MALLOC_LEAKDETECTION
 	FMallocLeakDetection::Get().CheckpointLinearFit();
 #endif
@@ -105,6 +107,8 @@ void FMallocLeakReporter::Checkpoint()
 
 int32 FMallocLeakReporter::WriteReports(const uint32 ReportFlags /*=EReportOption::ReportAll*/)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FMallocLeakReporter_WriteReports);
+
 	FString MapName = FPaths::GetBaseFilename(GWorld->GetName());
 
 	FString BaseName = FString::Printf(TEXT("%03d_%s"), ReportCount++, *MapName);
@@ -169,7 +173,7 @@ static FAutoConsoleCommand LeakReporterStartCommand(
 
 		FMallocLeakReporter::Get().Start(Size * 1024, ReportTime);
 
-		UE_LOG(LogConsoleResponse, Display, TEXT("Tracking allocations >=  %d KB and reporting every %d seconds"), Size / 1024, ReportTime);
+		UE_LOG(LogConsoleResponse, Display, TEXT("Tracking allocations >=  %d KB and reporting every %f seconds"), Size / 1024, ReportTime);
 	})
 );
 
diff --git a/Engine/Source/Runtime/Engine/Private/RendererSettings.cpp b/Engine/Source/Runtime/Engine/Private/RendererSettings.cpp
index 29dd3a536fde..1b331b9ec094 100644
--- a/Engine/Source/Runtime/Engine/Private/RendererSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/RendererSettings.cpp
@@ -60,6 +60,8 @@ URendererSettings::URendererSettings(const FObjectInitializer& ObjectInitializer
 	bSupportAtmosphericFog = true;
 	bSupportSkinCacheShaders = false;
 	bSupportMaterialLayers = false;
+	GPUSimulationTextureSizeX = 1024;
+	GPUSimulationTextureSizeY = 1024;
 }
 
 void URendererSettings::PostInitProperties()
@@ -85,6 +87,16 @@ void URendererSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyCh
 
 	if (PropertyChangedEvent.Property)
 	{
+		// round up GPU sim texture sizes to nearest power of two, and constrain to sensible values
+		if ( PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(URendererSettings, GPUSimulationTextureSizeX) 
+			|| PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(URendererSettings, GPUSimulationTextureSizeY) ) 
+		{
+			static const int32 MinGPUSimTextureSize = 32;
+			static const int32 MaxGPUSimTextureSize = 8192;
+			GPUSimulationTextureSizeX = FMath::RoundUpToPowerOfTwo( FMath::Clamp(GPUSimulationTextureSizeX, MinGPUSimTextureSize, MaxGPUSimTextureSize) );
+			GPUSimulationTextureSizeY = FMath::RoundUpToPowerOfTwo( FMath::Clamp(GPUSimulationTextureSizeY, MinGPUSimTextureSize, MaxGPUSimTextureSize) );
+		}
+
 		ExportValuesToConsoleVariables(PropertyChangedEvent.Property);
 
 		if (PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(URendererSettings, ReflectionCaptureResolution) && 
diff --git a/Engine/Source/Runtime/Engine/Private/RepLayout.cpp b/Engine/Source/Runtime/Engine/Private/RepLayout.cpp
index 79c7e584ebaf..ec5701b87eab 100644
--- a/Engine/Source/Runtime/Engine/Private/RepLayout.cpp
+++ b/Engine/Source/Runtime/Engine/Private/RepLayout.cpp
@@ -25,7 +25,7 @@ static TAutoConsoleVariable<int32> CVarDoPropertyChecksum( TEXT( "net.DoProperty
 
 FAutoConsoleVariable CVarDoReplicationContextString( TEXT( "net.ContextDebug" ), 0, TEXT( "" ) );
 
-FAutoConsoleVariable CVarNetShareSerializedData( TEXT( "net.ShareSerializedData" ), 0, TEXT( "" ) );
+FAutoConsoleVariable CVarNetShareSerializedData( TEXT( "net.ShareSerializedData" ), 1, TEXT( "" ) );
 FAutoConsoleVariable CVarNetVerifyShareSerializedData( TEXT( "net.VerifyShareSerializedData" ), 0, TEXT( "" ) );
 
 int32 LogSkippedRepNotifies = 0;
@@ -755,7 +755,8 @@ bool FRepLayout::ReplicateProperties(
 	// At this point we should have a non empty change list
 	check( Changed.Num() > 0 );
 
-	if (CVarNetShareSerializedData->GetInt() != 0)
+	// do not build shared state for InternalAck (demo) connections
+	if (!OwningChannel->Connection->InternalAck && (CVarNetShareSerializedData->GetInt() != 0))
 	{
 		// if no shared serialization info exists, build it
 		if (!RepChangelistState->SharedSerialization.IsValid())
@@ -1571,6 +1572,8 @@ void FRepLayout::SendProperties_BackwardsCompatible_r(
 {
 	int32 OldIndex = -1;
 
+	FNetBitWriter TempWriter( Writer.PackageMap, 0 );
+
 	while ( HandleIterator.NextHandle() )
 	{
 		const FRepLayoutCmd& Cmd = Cmds[HandleIterator.CmdIndex];
@@ -1632,7 +1635,7 @@ void FRepLayout::SendProperties_BackwardsCompatible_r(
 			check( ArrayHandleIterator.ArrayElementSize > 0 );
 			check( ArrayHandleIterator.NumHandlesPerElement > 0 );
 
-			FNetBitWriter TempWriter( Writer.PackageMap, 0 );
+			TempWriter.Reset();
 
 			// Write array num
 			TempWriter.SerializeIntPacked( ArrayNum );
@@ -1671,6 +1674,8 @@ void FRepLayout::SendAllProperties_BackwardsCompatible_r(
 	const int32							CmdEnd, 
 	const uint8*						SourceData ) const
 {
+	FNetBitWriter TempWriter( Writer.PackageMap, 0 );
+
 	for ( int32 CmdIndex = CmdStart; CmdIndex < CmdEnd; CmdIndex++ )
 	{
 		const FRepLayoutCmd& Cmd = Cmds[CmdIndex];
@@ -1687,7 +1692,7 @@ void FRepLayout::SendAllProperties_BackwardsCompatible_r(
 		{			
 			const FScriptArray* Array = ( FScriptArray * )Data;
 
-			FNetBitWriter TempWriter( Writer.PackageMap, 0 );
+			TempWriter.Reset();
 
 			// Write array num
 			uint32 ArrayNum = Array->Num();
@@ -1822,7 +1827,7 @@ static bool ReceivePropertyHelper(
 		}
 		else
 		{
-			UE_CLOG( LogSkippedRepNotifies > 0, LogRep, Display, TEXT( "2 FReceivedPropertiesStackState Skipping RepNotify for propery %s because local value has not changed." ), *Cmd.Property->GetName() );
+			UE_CLOG( LogSkippedRepNotifies > 0, LogRep, Display, TEXT( "2 FReceivedPropertiesStackState Skipping RepNotify for property %s because local value has not changed." ), *Cmd.Property->GetName() );
 		}
 	}
 	else
@@ -1935,7 +1940,7 @@ static FGuidReferencesMap* PrepReceivedArray(
 		}
 		else
 		{
-			UE_CLOG( LogSkippedRepNotifies > 0, LogRep, Display, TEXT( "1 FReceivedPropertiesStackState Skipping RepNotify for propery %s because local value has not changed." ), *Cmd.Property->GetName() );
+			UE_CLOG( LogSkippedRepNotifies > 0, LogRep, Display, TEXT( "1 FReceivedPropertiesStackState Skipping RepNotify for property %s because local value has not changed." ), *Cmd.Property->GetName() );
 		}
 	}
 
@@ -2330,7 +2335,7 @@ bool FRepLayout::ReceiveProperties_BackwardsCompatible_r(
 
 			if ( TempReader.GetBitsLeft() != 0 )
 			{
-				UE_LOG( LogRep, Warning, TEXT( "ReceiveProperties_BackwardsCompatible_r: Array didn't read propery number of bits. Owner: %s, Name: %s, Type: %s, NetFieldExportHandle: %i, Checksum: %u" ), *Owner->GetName(), *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Name, *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Type, NetFieldExportHandle, Checksum );
+				UE_LOG( LogRep, Warning, TEXT( "ReceiveProperties_BackwardsCompatible_r: Array didn't read proper number of bits. Owner: %s, Name: %s, Type: %s, NetFieldExportHandle: %i, Checksum: %u" ), *Owner->GetName(), *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Name, *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Type, NetFieldExportHandle, Checksum );
 				return false;
 			}
 		}
@@ -2345,7 +2350,7 @@ bool FRepLayout::ReceiveProperties_BackwardsCompatible_r(
 
 			if ( TempReader.GetBitsLeft() != 0 )
 			{
-				UE_LOG( LogRep, Warning, TEXT( "ReceiveProperties_BackwardsCompatible_r: Property didn't read propery number of bits. Owner: %s, Name: %s, Type: %s, NetFieldExportHandle: %i, Checksum: %u" ), *Owner->GetName(), *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Name, *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Type, NetFieldExportHandle, Checksum );
+				UE_LOG( LogRep, Warning, TEXT( "ReceiveProperties_BackwardsCompatible_r: Property didn't read proper number of bits. Owner: %s, Name: %s, Type: %s, NetFieldExportHandle: %i, Checksum: %u" ), *Owner->GetName(), *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Name, *NetFieldExportGroup->NetFieldExports[NetFieldExportHandle].Type, NetFieldExportHandle, Checksum );
 				return false;
 			}
 		}
@@ -2950,6 +2955,12 @@ public:
 				UObjectPropertyBase * ObjProperty = CastChecked< UObjectPropertyBase>( Cmd.Property );
 				if (ObjProperty)
 				{
+					if (ObjProperty->PropertyClass && (ObjProperty->PropertyClass->IsChildOf(AActor::StaticClass()) || ObjProperty->PropertyClass->IsChildOf(UActorComponent::StaticClass())))
+					{
+						// skip actor and component references
+						return;
+					}
+
 					UObject* ObjValue = ObjProperty->GetObjectPropertyValue( (const void*)( ShadowData + Cmd.Offset ) );
 					if (ObjValue && !ObjValue->IsNameStableForNetworking())
 					{
@@ -3248,7 +3259,7 @@ void FRepLayout::InitFromObjectClass( UClass * InObjectClass, const UNetConnecti
 
 	Parents.Empty();
 
-	ensureMsgf(!InObjectClass->HasAnyFlags(RF_NeedLoad | RF_NeedPostLoad), TEXT("FRepLayout::InitFromObjectClass: %s has not. NetFields and ClassReps will be incorrect!"), *GetFullNameSafe(InObjectClass));
+	InObjectClass->SetUpRuntimeReplicationData();
 
 	for ( int32 i = 0; i < InObjectClass->ClassReps.Num(); i++ )
 	{
@@ -3328,18 +3339,26 @@ void FRepLayout::InitFromObjectClass( UClass * InObjectClass, const UNetConnecti
 	// Setup lifetime replicated properties
 	for ( int32 i = 0; i < LifetimeProps.Num(); i++ )
 	{
-		// Store the condition on the parent in case we need it
-		Parents[LifetimeProps[i].RepIndex].Condition			= LifetimeProps[i].Condition;
-		Parents[LifetimeProps[i].RepIndex].RepNotifyCondition	= LifetimeProps[i].RepNotifyCondition;
+		const int32 ParentIndex = LifetimeProps[i].RepIndex;
 
-		if ( (Parents[LifetimeProps[i].RepIndex].Flags & ERepParentFlags::IsCustomDelta) != ERepParentFlags::None )
+		if (!ensureMsgf(Parents.IsValidIndex(ParentIndex), TEXT("Parents array index %d out of bounds! i = %d, LifetimeProps.Num() = %d, Parents.Num() = %d, InObjectClass = %s"),
+				ParentIndex, i, LifetimeProps.Num(), Parents.Num(), *GetFullNameSafe(InObjectClass)))
+		{
+			continue;
+		}
+
+		// Store the condition on the parent in case we need it
+		Parents[ParentIndex].Condition			= LifetimeProps[i].Condition;
+		Parents[ParentIndex].RepNotifyCondition	= LifetimeProps[i].RepNotifyCondition;
+
+		if ( (Parents[ParentIndex].Flags & ERepParentFlags::IsCustomDelta) != ERepParentFlags::None )
 		{
 			continue;		// We don't handle custom properties in the FRepLayout class
 		}
 
-		Parents[LifetimeProps[i].RepIndex].Flags |= ERepParentFlags::IsLifetime;
+		Parents[ParentIndex].Flags |= ERepParentFlags::IsLifetime;
 
-		if ( LifetimeProps[i].RepIndex == RemoteRoleIndex )
+		if ( ParentIndex == RemoteRoleIndex )
 		{
 			// We handle remote role specially, since it can change between connections when downgraded
 			// So we force it on the conditional list
@@ -3350,7 +3369,7 @@ void FRepLayout::InitFromObjectClass( UClass * InObjectClass, const UNetConnecti
 
 		if ( LifetimeProps[i].Condition == COND_None )
 		{
-			Parents[LifetimeProps[i].RepIndex].Flags &= ~ERepParentFlags::IsConditional;
+			Parents[ParentIndex].Flags &= ~ERepParentFlags::IsConditional;
 		}			
 	}
 
diff --git a/Engine/Source/Runtime/Engine/Private/Scalability.cpp b/Engine/Source/Runtime/Engine/Private/Scalability.cpp
index af937051d078..b159922af7d8 100644
--- a/Engine/Source/Runtime/Engine/Private/Scalability.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Scalability.cpp
@@ -10,6 +10,14 @@
 #include "Interfaces/IAnalyticsProvider.h"
 #include "Interfaces/IProjectManager.h"
 
+// @TODO: abstract this away into a PLATFORM_ define or something
+#if PLATFORM_XBOXONE || PLATFORM_PS4 || PLATFORM_SWITCH
+static bool GUserSettingsOverrideCVarPriority = false;
+#else
+static bool GUserSettingsOverrideCVarPriority = true;
+#endif
+
+
 static TAutoConsoleVariable<float> CVarResolutionQuality(
 	TEXT("sg.ResolutionQuality"),
 	100.0f,
@@ -521,7 +529,7 @@ void ProcessCommand(const TCHAR* Cmd, FOutputDevice& Ar)
 	}
 }
 
-void SetQualityLevels(const FQualityLevels& QualityLevels)
+void SetQualityLevels(const FQualityLevels& QualityLevels, bool bForce/* = false*/)
 {
 	const int32 NewViewDistanceQuality = FMath::Clamp(QualityLevels.ViewDistanceQuality, 0, CVarViewDistanceQuality_NumLevels->GetInt() - 1);
 	const int32 NewAntiAliasingQuality = FMath::Clamp(QualityLevels.AntiAliasingQuality, 0, CVarAntiAliasingQuality_NumLevels->GetInt() - 1);
@@ -531,16 +539,30 @@ void SetQualityLevels(const FQualityLevels& QualityLevels)
 	const int32 NewEffectsQuality = FMath::Clamp(QualityLevels.EffectsQuality, 0, CVarEffectsQuality_NumLevels->GetInt() - 1);
 	const int32 NewFoliageQuality = FMath::Clamp(QualityLevels.FoliageQuality, 0, CVarFoliageQuality_NumLevels->GetInt() - 1);
 
-	// set the cvars, but don't change their priority - there are issues with scalability and 
-	// device profiles conflicting in different combinations
-	CVarResolutionQuality.AsVariable()->SetWithCurrentPriority(QualityLevels.ResolutionQuality);
-	CVarViewDistanceQuality.AsVariable()->SetWithCurrentPriority(NewViewDistanceQuality);
-	CVarAntiAliasingQuality.AsVariable()->SetWithCurrentPriority(NewAntiAliasingQuality);
-	CVarShadowQuality.AsVariable()->SetWithCurrentPriority(NewShadowQuality);
-	CVarPostProcessQuality.AsVariable()->SetWithCurrentPriority(NewPostProcessQuality);
-	CVarTextureQuality.AsVariable()->SetWithCurrentPriority(NewTextureQuality);
-	CVarEffectsQuality.AsVariable()->SetWithCurrentPriority(NewEffectsQuality);
-	CVarFoliageQuality.AsVariable()->SetWithCurrentPriority(NewFoliageQuality);
+	if (GUserSettingsOverrideCVarPriority || bForce)
+	{
+		// set the cvars, but don't change their priority - there are issues with scalability and 
+		// device profiles conflicting in different combinations
+		CVarResolutionQuality.AsVariable()->SetWithCurrentPriority(QualityLevels.ResolutionQuality);
+		CVarViewDistanceQuality.AsVariable()->SetWithCurrentPriority(NewViewDistanceQuality);
+		CVarAntiAliasingQuality.AsVariable()->SetWithCurrentPriority(NewAntiAliasingQuality);
+		CVarShadowQuality.AsVariable()->SetWithCurrentPriority(NewShadowQuality);
+		CVarPostProcessQuality.AsVariable()->SetWithCurrentPriority(NewPostProcessQuality);
+		CVarTextureQuality.AsVariable()->SetWithCurrentPriority(NewTextureQuality);
+		CVarEffectsQuality.AsVariable()->SetWithCurrentPriority(NewEffectsQuality);
+		CVarFoliageQuality.AsVariable()->SetWithCurrentPriority(NewFoliageQuality);
+	}
+	else
+	{
+		CVarResolutionQuality.AsVariable()->Set(QualityLevels.ResolutionQuality, ECVF_SetByScalability);
+		CVarViewDistanceQuality.AsVariable()->Set(NewViewDistanceQuality, ECVF_SetByScalability);
+		CVarAntiAliasingQuality.AsVariable()->Set(NewAntiAliasingQuality, ECVF_SetByScalability);
+		CVarShadowQuality.AsVariable()->Set(NewShadowQuality, ECVF_SetByScalability);
+		CVarPostProcessQuality.AsVariable()->Set(NewPostProcessQuality, ECVF_SetByScalability);
+		CVarTextureQuality.AsVariable()->Set(NewTextureQuality, ECVF_SetByScalability);
+		CVarEffectsQuality.AsVariable()->Set(NewEffectsQuality, ECVF_SetByScalability);
+		CVarFoliageQuality.AsVariable()->Set(NewFoliageQuality, ECVF_SetByScalability);
+	}
 }
 
 FQualityLevels GetQualityLevels()
@@ -711,4 +733,3 @@ FQualityLevels GetQualityLevelCounts()
 
 }
 
-
diff --git a/Engine/Source/Runtime/Engine/Private/SceneManagement.cpp b/Engine/Source/Runtime/Engine/Private/SceneManagement.cpp
index 9aa0b8b68091..dc0368a8ea3a 100644
--- a/Engine/Source/Runtime/Engine/Private/SceneManagement.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SceneManagement.cpp
@@ -185,7 +185,9 @@ FMeshBatchAndRelevance::FMeshBatchAndRelevance(const FMeshBatch& InMesh, const F
 {
 	QUICK_SCOPE_CYCLE_COUNTER(STAT_FMeshBatchAndRelevance);
 	const FMaterial* Material = InMesh.MaterialRenderProxy->GetMaterial(FeatureLevel);
-	bHasOpaqueOrMaskedMaterial = !IsTranslucentBlendMode(Material->GetBlendMode());
+	EBlendMode BlendMode = Material->GetBlendMode();
+	bHasOpaqueMaterial = (BlendMode == BLEND_Opaque);
+	bHasMaskedMaterial = (BlendMode == BLEND_Masked);
 	bRenderInMainPass = PrimitiveSceneProxy->ShouldRenderInMainPass();
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/SceneUtils.cpp b/Engine/Source/Runtime/Engine/Private/SceneUtils.cpp
index 709271802c61..762e293f2986 100644
--- a/Engine/Source/Runtime/Engine/Private/SceneUtils.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SceneUtils.cpp
@@ -495,11 +495,11 @@ public:
 			const FName& StatName = Event->GetName();
 
 			// Check if we've seen this stat yet 
-			bool bIsNew = true;
+			bool bIsNew = false;
 			if (StatSeenMap.Find(StatName) == nullptr)
 			{
 				StatSeenMap.Add(StatName, true);
-				bIsNew = false;
+				bIsNew = true;
 			}
 
 			const float EventTime = GPUStatsChildTimesIncluded
@@ -778,3 +778,5 @@ void FRenderQueryPool::ReleaseQuery(FRenderQueryRHIRef &Query)
 		Query = NULL;
 	}
 }
+
+PRAGMA_ENABLE_OPTIMIZATION
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/SceneView.cpp b/Engine/Source/Runtime/Engine/Private/SceneView.cpp
index 1ae034d03516..fc71038aefd8 100644
--- a/Engine/Source/Runtime/Engine/Private/SceneView.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SceneView.cpp
@@ -274,7 +274,7 @@ static TAutoConsoleVariable<int32> CVarAllowTranslucencyAfterDOF(
 	TEXT("after DOF, if not specified otherwise in the material).\n")
 	TEXT(" 0: off (translucency is affected by depth of field)\n")
 	TEXT(" 1: on costs GPU performance and memory but keeps translucency unaffected by Depth of Field. (default)"),
-	ECVF_RenderThreadSafe);
+	ECVF_Scalability | ECVF_RenderThreadSafe);
 
 static TAutoConsoleVariable<int32> CVarEnableTemporalUpsample(
 	TEXT("r.TemporalAA.Upsampling"),
@@ -685,6 +685,9 @@ FSceneView::FSceneView(const FSceneViewInitOptions& InitOptions)
 	}
 
 	bUseFieldOfViewForLOD = InitOptions.bUseFieldOfViewForLOD;
+	FOV = InitOptions.FOV;
+	DesiredFOV = InitOptions.DesiredFOV;
+
 	DrawDynamicFlags = EDrawDynamicFlags::None;
 	bAllowTemporalJitter = true;
 
@@ -812,20 +815,6 @@ float FSceneView::GetLODDistanceFactor() const
 	return Fac;
 }
 
-float FSceneView::GetTemporalLODDistanceFactor(int32 Index, bool bUseLaggedLODTransition) const
-{
-	if (bUseLaggedLODTransition && State)
-	{
-		const FTemporalLODState& LODState = State->GetTemporalLODState();
-		if (LODState.TemporalLODLag != 0.0f)
-		{
-			return LODState.TemporalDistanceFactor[Index];
-		}
-	}
-	return GetLODDistanceFactor();
-}
-
-
 FVector FSceneView::GetTemporalLODOrigin(int32 Index, bool bUseLaggedLODTransition) const
 {
 	if (bUseLaggedLODTransition && State)
diff --git a/Engine/Source/Runtime/Engine/Private/ShaderCompiler/ShaderCompiler.cpp b/Engine/Source/Runtime/Engine/Private/ShaderCompiler/ShaderCompiler.cpp
index 0387df364291..2ecbd334908f 100644
--- a/Engine/Source/Runtime/Engine/Private/ShaderCompiler/ShaderCompiler.cpp
+++ b/Engine/Source/Runtime/Engine/Private/ShaderCompiler/ShaderCompiler.cpp
@@ -44,6 +44,7 @@
 #include "Interfaces/ITargetPlatformManagerModule.h"
 #include "ProfilingDebugging/CookStats.h"
 #include "SceneInterface.h"
+#include "ShaderCodeLibrary.h"
 
 #define LOCTEXT_NAMESPACE "ShaderCompiler"
 
@@ -1477,7 +1478,7 @@ FShaderCompilingManager::FShaderCompilingManager() :
 		FGuid Guid;
 		Guid = FGuid::NewGuid();
 		FString LegacyShaderWorkingDirectory = FPaths::ProjectIntermediateDir() / TEXT("Shaders/WorkingDirectory/")  / FString::FromInt(ProcessId) + TEXT("/");
-		ShaderBaseWorkingDirectory = FPlatformProcess::ShaderWorkingDir() / *Guid.ToString(EGuidFormats::Digits) + TEXT("/");
+		ShaderBaseWorkingDirectory = FPaths::ShaderWorkingDir() / *Guid.ToString(EGuidFormats::Digits) + TEXT("/");
 		UE_LOG(LogShaderCompilers, Log, TEXT("Guid format shader working directory is %d characters bigger than the processId version (%s)."), ShaderBaseWorkingDirectory.Len() - LegacyShaderWorkingDirectory.Len(), *LegacyShaderWorkingDirectory );
 	}
 
@@ -1499,10 +1500,10 @@ FShaderCompilingManager::FShaderCompilingManager() :
 
 	const int32 NumVirtualCores = FPlatformMisc::NumberOfCoresIncludingHyperthreads();
 
-	NumShaderCompilingThreads = bAllowCompilingThroughWorkers ? (NumVirtualCores - NumUnusedShaderCompilingThreads) : 1;
+	NumShaderCompilingThreads = (bAllowCompilingThroughWorkers && NumVirtualCores > NumUnusedShaderCompilingThreads) ? (NumVirtualCores - NumUnusedShaderCompilingThreads) : 1;
 
 	// Make sure there's at least one worker allowed to be active when compiling during the game
-	NumShaderCompilingThreadsDuringGame = bAllowCompilingThroughWorkers ? (NumVirtualCores - NumUnusedShaderCompilingThreadsDuringGame) : 1;
+	NumShaderCompilingThreadsDuringGame = (bAllowCompilingThroughWorkers && NumVirtualCores > NumUnusedShaderCompilingThreadsDuringGame) ? (NumVirtualCores - NumUnusedShaderCompilingThreadsDuringGame) : 1;
 
 	// On machines with few cores, each core will have a massive impact on compile time, so we prioritize compile latency over editor performance during the build
 	if (NumVirtualCores <= 4)
@@ -1510,6 +1511,53 @@ FShaderCompilingManager::FShaderCompilingManager() :
 		NumShaderCompilingThreads = NumVirtualCores - 1;
 		NumShaderCompilingThreadsDuringGame = NumVirtualCores - 1;
 	}
+#if PLATFORM_DESKTOP
+	else if (GIsBuildMachine)
+	{
+		// Cooker ends up running OOM so use a simple heuristic based on some INI values
+		float CookerMemoryUsedInGB = 0.0f;
+		float MemoryToLeaveForTheOSInGB = 0.0f;
+		float MemoryUsedPerSCWProcessInGB = 0.0f;
+		bool bFoundEntries = true;
+		bFoundEntries = bFoundEntries && GConfig->GetFloat(TEXT("DevOptions.Shaders"), TEXT("CookerMemoryUsedInGB"), CookerMemoryUsedInGB, GEngineIni);
+		bFoundEntries = bFoundEntries && GConfig->GetFloat(TEXT("DevOptions.Shaders"), TEXT("MemoryToLeaveForTheOSInGB"), MemoryToLeaveForTheOSInGB, GEngineIni);
+		bFoundEntries = bFoundEntries && GConfig->GetFloat(TEXT("DevOptions.Shaders"), TEXT("MemoryUsedPerSCWProcessInGB"), MemoryUsedPerSCWProcessInGB, GEngineIni);
+		if (bFoundEntries)
+		{
+			uint32 PhysicalGBRam = FPlatformMemory::GetPhysicalGBRam();
+			float AvailableMemInGB = (float)PhysicalGBRam - CookerMemoryUsedInGB;
+			if (AvailableMemInGB > 0.0f)
+			{
+				if (AvailableMemInGB > MemoryToLeaveForTheOSInGB)
+				{
+					AvailableMemInGB -= MemoryToLeaveForTheOSInGB;
+				}
+				else
+				{
+					UE_LOG(LogShaderCompilers, Warning, TEXT("Machine has %d GBs of RAM, cooker might take %f GBs, but not enough memory left for the OS! (Requested %f GBs for the OS)"), PhysicalGBRam, CookerMemoryUsedInGB, MemoryToLeaveForTheOSInGB);
+				}
+			}
+			else
+			{
+				UE_LOG(LogShaderCompilers, Warning, TEXT("Machine has %d GBs of RAM, but cooker might take %f GBs!"), PhysicalGBRam, CookerMemoryUsedInGB);
+			}
+			if (MemoryUsedPerSCWProcessInGB > 0.0f)
+			{
+				float NumSCWs = AvailableMemInGB / MemoryUsedPerSCWProcessInGB;
+				NumShaderCompilingThreads = FMath::RoundToInt(NumSCWs);
+
+				bool bUseVirtualCores = true;
+				GConfig->GetBool(TEXT("DevOptions.Shaders"), TEXT("bUseVirtualCores"), bUseVirtualCores, GEngineIni);
+				uint32 MaxNumCoresToUse = bUseVirtualCores ? NumVirtualCores : FPlatformMisc::NumberOfCores();
+				NumShaderCompilingThreads = FMath::Clamp<uint32>(NumShaderCompilingThreads, 1, MaxNumCoresToUse - 1);
+				if (NumShaderCompilingThreads < 8)
+				{
+					UE_LOG(LogShaderCompilers, Warning, TEXT("Only %d SCWs will be spawned, which will result in longer shader compile times."), NumShaderCompilingThreads);
+				}
+			}
+		}
+	}
+#endif
 
 	NumShaderCompilingThreads = FMath::Max<int32>(1, NumShaderCompilingThreads);
 	NumShaderCompilingThreadsDuringGame = FMath::Max<int32>(1, NumShaderCompilingThreadsDuringGame);
@@ -3115,6 +3163,11 @@ void GlobalBeginCompileShader(
 		Input.Environment.SetDefine(TEXT("PROJECT_MOBILE_DISABLE_VERTEX_FOG"), CVar ? (CVar->GetInt() != 0) : 0);
 	}
 
+	{
+		static IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.Mobile.UseLegacyShadingModel"));
+		Input.Environment.SetDefine(TEXT("PROJECT_MOBILE_USE_LEGACY_SHADING"), CVar ? (CVar->GetInt() != 0) : 0);
+	}
+
 	{
 		static IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.PostProcessing.PropagateAlpha"));
 		int32 PropagateAlpha = CVar->GetInt();
@@ -3810,7 +3863,20 @@ FString SaveGlobalShaderFile(EShaderPlatform Platform, FString SavePath, class I
 	{
 		UE_LOG(LogShaders, Fatal, TEXT("Could not save global shader file to '%s'"), *FullPath);
 	}
-
+#if WITH_EDITOR
+	if (FShaderCodeLibrary::NeedsShaderStableKeys())
+	{
+		for (TLinkedList<FShaderType*>::TIterator ShaderTypeIt(FShaderType::GetTypeList()); ShaderTypeIt; ShaderTypeIt.Next())
+		{
+			FGlobalShaderType* GlobalShaderType = ShaderTypeIt->GetGlobalShaderType();
+			if (!GlobalShaderType)
+			{
+				continue;
+			}
+			GlobalShaderType->SaveShaderStableKeys(Platform);
+		}
+	}
+#endif
 	return FullPath;
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/ShaderDerivedDataVersion.h b/Engine/Source/Runtime/Engine/Private/ShaderDerivedDataVersion.h
index c2ff9d21e255..47ed38def83a 100644
--- a/Engine/Source/Runtime/Engine/Private/ShaderDerivedDataVersion.h
+++ b/Engine/Source/Runtime/Engine/Private/ShaderDerivedDataVersion.h
@@ -11,5 +11,5 @@
 // In case of merge conflicts with DDC versions, you MUST generate a new GUID and set this new
 // guid as version
 
-#define GLOBALSHADERMAP_DERIVEDDATA_VER			TEXT("FD5EBAEBC05C478D8A361A1167A36EEC")
-#define MATERIALSHADERMAP_DERIVEDDATA_VER		TEXT("84A45572CDD0449A9E2E847A1F55D5DA")
+#define GLOBALSHADERMAP_DERIVEDDATA_VER			TEXT("4A393A7FDF3048EF8376E103162A8ED6")
+#define MATERIALSHADERMAP_DERIVEDDATA_VER		TEXT("F1CC9C7A48F5422EB67E3ADC82465189")
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalMesh.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalMesh.cpp
index 2c970a2ed7f7..395410d22c87 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalMesh.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalMesh.cpp
@@ -937,6 +937,7 @@ void USkeletalMesh::Serialize( FArchive& Ar )
 	Ar.UsingCustomVersion(FEditorObjectVersion::GUID);
 	Ar.UsingCustomVersion(FSkeletalMeshCustomVersion::GUID);
 	Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
+	Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
 
 	FStripDataFlags StripFlags( Ar );
 
@@ -1111,6 +1112,22 @@ void USkeletalMesh::Serialize( FArchive& Ar )
 	bRequiresLODHysteresisConversion = Ar.CustomVer(FFrameworkObjectVersion::GUID) < FFrameworkObjectVersion::LODHysteresisUseResolutionIndependentScreenSize;
 #endif
 
+	if (Ar.CustomVer(FAthenaObjectVersion::GUID) < FAthenaObjectVersion::ConvertReductionSettingOptions)
+	{
+		const int32 TotalLODNum = LODInfo.Num();
+		for (int32 LodIndex = 1; LodIndex < TotalLODNum; LodIndex++)
+		{
+			FSkeletalMeshLODInfo& ThisLODInfo = LODInfo[LodIndex];
+			// prior to this version, both of them were used
+			ThisLODInfo.ReductionSettings.ReductionMethod = SMOT_TriangleOrDeviation;
+			if (ThisLODInfo.ReductionSettings.MaxDeviationPercentage == 0.f)
+			{
+				// 0.f and 1.f should produce same result. However, it is bad to display 0.f in the slider
+				// as 0.01 and 0.f causes extreme confusion. 
+				ThisLODInfo.ReductionSettings.MaxDeviationPercentage = 1.f;
+			}
+		}
+	}
 }
 
 void USkeletalMesh::AddReferencedObjects(UObject* InThis, FReferenceCollector& Collector)
@@ -1360,6 +1377,8 @@ void USkeletalMesh::UpgradeOldClothingAssets()
 				CurrAsset->BindToSkeletalMesh(this, MappedLod, MappedSection, MappedLod);
 			}
 		}
+
+		UE_LOG(LogSkeletalMesh, Warning, TEXT("Legacy clothing asset '%s' was upgraded - please resave this asset."), *GetName());
 	}
 }
 
@@ -1519,6 +1538,17 @@ void USkeletalMesh::PostLoad()
 		}
 	}
 
+	// make sure older versions contain active bone indices with parents present
+	// even if they're not skinned, missing matrix calculation will mess up skinned children
+	if (GetLinkerCustomVersion(FAthenaObjectVersion::GUID) < FAthenaObjectVersion::EnsureActiveBoneIndicesToContainParents)
+	{
+		for (int32 LodIndex = 0; LodIndex < LODInfo.Num(); LodIndex++)
+		{
+			FSkeletalMeshLODModel& ThisLODModel = ImportedModel->LODModels[LodIndex];
+			RefSkeleton.EnsureParentsExistAndSort(ThisLODModel.ActiveBoneIndices);
+		}
+	}
+
 #if WITH_APEX_CLOTHING
 	UpgradeOldClothingAssets();
 #endif // WITH_APEX_CLOTHING
@@ -1644,15 +1674,18 @@ void USkeletalMesh::RebuildRefSkeletonNameToIndexMap()
 void USkeletalMesh::GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) const
 {
 	int32 NumTriangles = 0;
+	int32 NumVertices = 0;
 	FSkeletalMeshRenderData* SkelMeshRenderData = GetResourceForRendering();
 	if (SkelMeshRenderData && SkelMeshRenderData->LODRenderData.Num() > 0)
 	{
 		const FSkeletalMeshLODRenderData& LODData = SkelMeshRenderData->LODRenderData[0];
 		NumTriangles = LODData.GetTotalFaces();
+		NumVertices = LODData.GetNumVertices();
 	}
 	
 	int32 NumLODs = LODInfo.Num();
 
+	OutTags.Add(FAssetRegistryTag("Vertices", FString::FromInt(NumVertices), FAssetRegistryTag::TT_Numerical));
 	OutTags.Add(FAssetRegistryTag("Triangles", FString::FromInt(NumTriangles), FAssetRegistryTag::TT_Numerical));
 	OutTags.Add(FAssetRegistryTag("LODs", FString::FromInt(NumLODs), FAssetRegistryTag::TT_Numerical));
 	OutTags.Add(FAssetRegistryTag("Bones", FString::FromInt(RefSkeleton.GetRawBoneNum()), FAssetRegistryTag::TT_Numerical));
@@ -1683,10 +1716,10 @@ void USkeletalMesh::DebugVerifySkeletalMeshLOD()
 	{
 		for(int32 i=1; i<LODInfo.Num(); i++)
 		{
-			if (LODInfo[i].ScreenSize <= 0.1f)
+			if (LODInfo[i].ScreenSize.Default <= 0.1f)
 			{
 				// too small
-				UE_LOG(LogSkeletalMesh, Warning, TEXT("SkelMeshLOD (%s) : ScreenSize for LOD %d may be too small (%0.5f)"), *GetPathName(), i, LODInfo[i].ScreenSize);
+				UE_LOG(LogSkeletalMesh, Warning, TEXT("SkelMeshLOD (%s) : ScreenSize for LOD %d may be too small (%0.5f)"), *GetPathName(), i, LODInfo[i].ScreenSize.Default);
 			}
 		}
 	}
@@ -2478,6 +2511,7 @@ void USkeletalMesh::CreateBodySetup()
 	{
 		BodySetup = NewObject<UBodySetup>(this);
 		BodySetup->bSharedCookedData = true;
+		BodySetup->AddToCluster(this);
 	}
 }
 
@@ -2690,17 +2724,17 @@ void USkeletalMesh::ConvertLegacyLODScreenSize()
 
 			if (bRequiresLODScreenSizeConversion)
 			{
-				if (LODInfoEntry.ScreenSize == 0.0f)
+				if (LODInfoEntry.ScreenSize.Default == 0.0f)
 				{
-					LODInfoEntry.ScreenSize = 1.0f;
+					LODInfoEntry.ScreenSize.Default = 1.0f;
 				}
 				else
 				{
 					// legacy screen size was scaled by a fixed constant of 320.0f, so its kinda arbitrary. Convert back to distance based metric first.
-					const float ScreenDepth = FMath::Max(ScreenWidth / 2.0f * ProjMatrix.M[0][0], ScreenHeight / 2.0f * ProjMatrix.M[1][1]) * Bounds.SphereRadius / (LODInfoEntry.ScreenSize * 320.0f);
+					const float ScreenDepth = FMath::Max(ScreenWidth / 2.0f * ProjMatrix.M[0][0], ScreenHeight / 2.0f * ProjMatrix.M[1][1]) * Bounds.SphereRadius / (LODInfoEntry.ScreenSize.Default * 320.0f);
 
 					// Now convert using the query function
-					LODInfoEntry.ScreenSize = ComputeBoundsScreenSize(FVector::ZeroVector, Bounds.SphereRadius, FVector(0.0f, 0.0f, ScreenDepth), ProjMatrix);
+					LODInfoEntry.ScreenSize.Default = ComputeBoundsScreenSize(FVector::ZeroVector, Bounds.SphereRadius, FVector(0.0f, 0.0f, ScreenDepth), ProjMatrix);
 				}
 			}
 
@@ -2760,7 +2794,7 @@ FSkeletalMeshLODInfo& USkeletalMesh::AddLODInfo()
 		{
 			// copy previous copy
 			const int32 LastIndex = NewIndex - 1;
-			NewLODInfo.ScreenSize = LODInfo[LastIndex].ScreenSize * 0.5f;
+			NewLODInfo.ScreenSize.Default = LODInfo[LastIndex].ScreenSize.Default * 0.5f;
 			NewLODInfo.LODHysteresis = LODInfo[LastIndex].LODHysteresis;
 			NewLODInfo.BakePose = LODInfo[LastIndex].BakePose;
 			NewLODInfo.BonesToRemove = LODInfo[LastIndex].BonesToRemove;
@@ -4015,6 +4049,11 @@ bool FSkeletalMeshSceneProxy::GetMaterialTextureScales(int32 LODIndex, int32 Sec
 }
 #endif
 
+void FSkeletalMeshSceneProxy::OnTransformChanged()
+{
+	MeshObject->RefreshClothingTransforms(GetLocalToWorld(), GetScene().GetFrameNumber() + 1);
+}
+
 FSkinnedMeshComponentRecreateRenderStateContext::FSkinnedMeshComponentRecreateRenderStateContext(USkeletalMesh* InSkeletalMesh, bool InRefreshBounds /*= false*/)
 	: bRefreshBounds(InRefreshBounds)
 {
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalMeshComponentPhysics.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalMeshComponentPhysics.cpp
index d228302ad6fc..828e27b265a2 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalMeshComponentPhysics.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalMeshComponentPhysics.cpp
@@ -604,6 +604,38 @@ void USkeletalMeshComponent::InitArticulated(FPhysScene* PhysScene)
 TAutoConsoleVariable<int32> CVarEnableRagdollPhysics(TEXT("p.RagdollPhysics"), 1, TEXT("If 1, ragdoll physics will be used. Otherwise just root body is simulated"));
 
 void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, FPhysScene* PhysScene, USkeletalMeshComponent* OwningComponent, int32 UseRootBodyIndex, physx::PxAggregate* UseAggregate) const
+{
+	auto BoneTMCallable = [this](int32 BoneIndex)
+	{
+		return GetBoneTransform(BoneIndex);
+	};
+
+	InstantiatePhysicsAsset_Internal(PhysAsset, Scale3D, OutBodies, OutConstraints, BoneTMCallable, PhysScene, OwningComponent, UseRootBodyIndex, UseAggregate);
+}
+
+void USkeletalMeshComponent::InstantiatePhysicsAssetRefPose(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, FPhysScene* PhysScene /*= nullptr*/, USkeletalMeshComponent* OwningComponent /*= nullptr*/, int32 UseRootBodyIndex /*= INDEX_NONE*/, physx::PxAggregate* UseAggregate /*= nullptr*/) const
+{
+	if(SkeletalMesh)
+	{
+		auto BoneTMCallable = [this](int32 BoneIndex)
+		{
+			const FReferenceSkeleton& RefSkel = SkeletalMesh->RefSkeleton;
+
+			if(RefSkel.IsValidIndex(BoneIndex))
+			{
+				return RefSkel.GetRefBonePose()[BoneIndex];
+			}
+			else
+			{
+				return FTransform::Identity;
+			}
+		};
+
+		InstantiatePhysicsAsset_Internal(PhysAsset, Scale3D, OutBodies, OutConstraints, BoneTMCallable, PhysScene, OwningComponent, UseRootBodyIndex, UseAggregate);
+	}
+}
+
+void USkeletalMeshComponent::InstantiatePhysicsAsset_Internal(const UPhysicsAsset& PhysAsset, const FVector& Scale3D, TArray<FBodyInstance*>& OutBodies, TArray<FConstraintInstance*>& OutConstraints, TFunctionRef<FTransform(int32)> BoneTransformGetter, FPhysScene* PhysScene /*= nullptr*/, USkeletalMeshComponent* OwningComponent /*= nullptr*/, int32 UseRootBodyIndex /*= INDEX_NONE*/, physx::PxAggregate* UseAggregate /*= nullptr*/) const
 {
 	const float ActualScale = Scale3D.GetAbsMin();
 	const float Scale = ActualScale == 0.f ? KINDA_SMALL_NUMBER : ActualScale;
@@ -616,7 +648,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 	check(OutBodies.Num() == 0);
 	OutBodies.AddZeroed(NumOutBodies);
 
-	for (int32 BodyIdx = 0; BodyIdx<NumOutBodies; BodyIdx++)
+	for(int32 BodyIdx = 0; BodyIdx < NumOutBodies; BodyIdx++)
 	{
 		UBodySetup* PhysicsAssetBodySetup = PhysAsset.SkeletalBodySetups[BodyIdx];
 		OutBodies[BodyIdx] = new FBodyInstance;
@@ -625,7 +657,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 
 		// Get transform of bone by name.
 		int32 BoneIndex = GetBoneIndex(PhysicsAssetBodySetup->BoneName);
-		if (BoneIndex != INDEX_NONE)
+		if(BoneIndex != INDEX_NONE)
 		{
 			// Copy body setup default instance properties
 			BodyInst->CopyBodyInstancePropertiesFrom(&PhysicsAssetBodySetup->DefaultInstance);
@@ -641,7 +673,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 
 			BodyInst->bStartAwake = UseRootBodyIndex >= 0 ? BodyInstance.bStartAwake : true;	//We don't allow customization here. Just use whatever the component is set to
 
-			if (BodyIdx == UseRootBodyIndex)
+			if(BodyIdx == UseRootBodyIndex)
 			{
 				BodyInst->DOFMode = BodyInstance.DOFMode;
 				BodyInst->CustomDOFPlaneNormal = BodyInstance.CustomDOFPlaneNormal;
@@ -659,7 +691,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 			else
 			{
 				BodyInst->DOFMode = EDOFMode::None;
-				if (PhysScene != nullptr && !CVarEnableRagdollPhysics.GetValueOnGameThread())	//We only limit creation of the global physx scenes and not assets related to immedate mode
+				if(PhysScene != nullptr && !CVarEnableRagdollPhysics.GetValueOnGameThread())	//We only limit creation of the global physx scenes and not assets related to immedate mode
 				{
 					continue;
 				}
@@ -667,7 +699,8 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 
 #if WITH_PHYSX
 			// Create physics body instance.
-			FTransform BoneTransform = GetBoneTransform(BoneIndex);
+			FTransform BoneTransform = BoneTransformGetter(BoneIndex);
+
 			FBodyInstance::FInitBodySpawnParams SpawnParams(OwningComponent);
 			SpawnParams.DynamicActorScene = UseAsyncScene;
 
@@ -687,14 +720,14 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 	}
 
 #if WITH_PHYSX
-	if (PhysScene && Aggregate)
+	if(PhysScene && Aggregate)
 	{
 		// Get the scene type from the SkeletalMeshComponent's BodyInstance
 		const uint32 SceneType = GetPhysicsSceneType(PhysAsset, *PhysScene, UseAsyncScene);
 		PxScene* PScene = PhysScene->GetPhysXScene(SceneType);
 		SCOPED_SCENE_WRITE_LOCK(PScene);
 		// add Aggregate into the scene
-		if (Aggregate && Aggregate->getNbActors() > 0)
+		if(Aggregate && Aggregate->getNbActors() > 0)
 		{
 			PScene->addAggregate(*Aggregate);
 		}
@@ -706,7 +739,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 	check(OutConstraints.Num() == 0);
 	int32 NumOutConstraints = PhysAsset.ConstraintSetup.Num();
 	OutConstraints.AddZeroed(NumOutConstraints);
-	for (int32 ConstraintIdx = 0; ConstraintIdx<NumOutConstraints; ConstraintIdx++)
+	for(int32 ConstraintIdx = 0; ConstraintIdx < NumOutConstraints; ConstraintIdx++)
 	{
 		const UPhysicsConstraintTemplate* OutConstraintsetup = PhysAsset.ConstraintSetup[ConstraintIdx];
 		OutConstraints[ConstraintIdx] = new FConstraintInstance;
@@ -715,7 +748,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 		ConInst->CopyConstraintParamsFrom(&OutConstraintsetup->DefaultInstance);
 		ConInst->ConstraintIndex = ConstraintIdx; // Set the ConstraintIndex property in the ConstraintInstance.
 #if WITH_EDITOR
-		if (GetWorld()->IsGameWorld())
+		if(GetWorld()->IsGameWorld())
 		{
 			//In the editor we may be currently editing the physics asset, so make sure to use the default profile
 			OutConstraintsetup->ApplyConstraintProfile(NAME_None, *ConInst, /*bDefaultIfNotFound=*/true);
@@ -727,12 +760,12 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 		FBodyInstance* Body2 = NameToBodyMap.FindRef(ConInst->ConstraintBone2);
 
 		// If we have 2, joint 'em
-		if (Body1 && Body2)
+		if(Body1 && Body2)
 		{
 			// Validates the body. OutBodies could be invalid due to outdated PhysAssets / bad constraint bone (or body) names.
 			auto ValidateBody = [this](const FBodyInstance* InBody, const FName& InBoneName)
 			{
-				if (!InBody->IsValidBodyInstance())
+				if(!InBody->IsValidBodyInstance())
 				{
 					// Disable log for now.
 					// UE_LOG(LogSkeletalMesh, Warning, TEXT("USkeletalMeshComponent::InitArticulated : Unable to initialize constraint (%s) -  Body Invalid %s."), *(this->GetPathName()), *(InBoneName.ToString()));
@@ -757,7 +790,7 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 			const bool Body1Valid = ValidateBody(Body1, ConInst->ConstraintBone1);
 			const bool Body2Valid = ValidateBody(Body2, ConInst->ConstraintBone2);
 
-			if (Body1Valid && Body2Valid)
+			if(Body1Valid && Body2Valid)
 			{
 				ScalePosition(Body1, Scale, ConInst->Pos1);
 				ScalePosition(Body2, Scale, ConInst->Pos2);
@@ -767,7 +800,6 @@ void USkeletalMeshComponent::InstantiatePhysicsAsset(const UPhysicsAsset& PhysAs
 	}
 }
 
-
 void USkeletalMeshComponent::TermArticulated()
 {
 	ResetRootBodyIndex();
@@ -1261,9 +1293,9 @@ void USkeletalMeshComponent::OnUpdateTransform(EUpdateTransformFlags UpdateTrans
 	}
 
 	// Pass teleports on to anything in the animation tree that might be interested (e.g. AnimDynamics, RigidBody Node, etc.)
-	if(Teleport == ETeleportType::TeleportPhysics)
+	if(Teleport != ETeleportType::None)
 	{
-		ResetAnimInstanceDynamics();
+		ResetAnimInstanceDynamics(Teleport);
 	}
 
 	if(ClothingSimulation && ClothingSimulation->ShouldSimulate())
@@ -2345,15 +2377,88 @@ void USkeletalMeshComponent::GetWindForCloth_GameThread(FVector& WindDirection,
 #if WITH_CLOTH_COLLISION_DETECTION
 
 void USkeletalMeshComponent::FindClothCollisions(FClothCollisionData& OutCollisions)
-				{
+{
 	if(ClothingSimulation)
-					{
+	{
 		// Get collisions for this simulation, ignoring any externally added collisions
 		// (i.e. on grab the asset collisions, not environment etc.)
 		ClothingSimulation->GetCollisions(OutCollisions, false);
 	}
 }
 
+void USkeletalMeshComponent::ExtractCollisionsForCloth(USkeletalMeshComponent* SourceComponent, UPhysicsAsset* PhysicsAsset, USkeletalMeshComponent* DestClothComponent, FClothCollisionData& OutCollisions, FClothCollisionSource& ClothCollisionSource)
+{
+	// Extract collisions from this mesh 'raw', as this isnt a mesh that has cloth simulation
+	// (but we want it to affect other meshes with cloth simulation)
+	if(SourceComponent->SkeletalMesh && PhysicsAsset)
+	{
+		const FTransform& ComponentToComponentTransform = SourceComponent->GetComponentTransform() * DestClothComponent->GetComponentTransform().Inverse();
+		const TArray<FTransform>& ComponentSpaceTransforms = SourceComponent->GetComponentSpaceTransforms();
+
+		// Init cache on first copy
+		if(!ClothCollisionSource.bCached || ClothCollisionSource.CachedSkeletalMesh.Get() != SourceComponent->SkeletalMesh)
+		{
+			for(const USkeletalBodySetup* SkeletalBodySetup : PhysicsAsset->SkeletalBodySetups)
+			{
+				// Cache bones
+				int32 MeshBoneIndex = SourceComponent->SkeletalMesh->RefSkeleton.FindBoneIndex(SkeletalBodySetup->BoneName);
+				if(MeshBoneIndex != INDEX_NONE)
+				{
+					// Cache spheres & capsules form physics asset
+					for(const FKSphereElem& Sphere : SkeletalBodySetup->AggGeom.SphereElems)
+					{
+						FClothCollisionPrim_Sphere NewSphere;
+						NewSphere.LocalPosition = Sphere.Center;
+						NewSphere.Radius = Sphere.Radius;
+						NewSphere.BoneIndex = MeshBoneIndex;
+
+						ClothCollisionSource.CachedSpheres.Add(NewSphere);
+					}
+
+					for(const FKSphylElem& Sphyl : SkeletalBodySetup->AggGeom.SphylElems)
+					{
+						FClothCollisionPrim_Sphere Sphere0;
+						FClothCollisionPrim_Sphere Sphere1;
+						FVector OrientedDirection = Sphyl.Rotation.RotateVector(FVector(0.0f, 0.0f, 1.0f));
+						FVector HalfDim = OrientedDirection * (Sphyl.Length / 2.0f);
+						Sphere0.LocalPosition = Sphyl.Center - HalfDim;
+						Sphere1.LocalPosition = Sphyl.Center + HalfDim;
+						Sphere0.Radius = Sphyl.Radius;
+						Sphere1.Radius = Sphyl.Radius;
+						Sphere0.BoneIndex = MeshBoneIndex;
+						Sphere1.BoneIndex = MeshBoneIndex;
+
+						ClothCollisionSource.CachedSpheres.Add(Sphere0);
+						ClothCollisionSource.CachedSpheres.Add(Sphere1);
+
+						FClothCollisionPrim_SphereConnection Connection;
+						Connection.SphereIndices[0] = ClothCollisionSource.CachedSpheres.Num() - 2;
+						Connection.SphereIndices[1] = ClothCollisionSource.CachedSpheres.Num() - 1;
+
+						ClothCollisionSource.CachedSphereConnections.Add(Connection);
+					}
+				}
+			}
+
+			ClothCollisionSource.CachedSkeletalMesh = SourceComponent->SkeletalMesh;
+			ClothCollisionSource.bCached = true;
+		}
+
+		// Copy cached data
+		OutCollisions.Spheres.Append(ClothCollisionSource.CachedSpheres);
+		OutCollisions.SphereConnections.Append(ClothCollisionSource.CachedSphereConnections);
+
+		// Now transform output data
+		for(FClothCollisionPrim_Sphere& OutSphere : OutCollisions.Spheres)
+		{
+			const FTransform& BoneTransform = ComponentSpaceTransforms[OutSphere.BoneIndex] * ComponentToComponentTransform;
+
+			OutSphere.LocalPosition = BoneTransform.TransformPosition(OutSphere.LocalPosition);
+			OutSphere.BoneIndex = INDEX_NONE;
+		}
+	}
+}
+
 void USkeletalMeshComponent::CopyClothCollisionsToChildren()
 {
 	// 3 steps
@@ -2389,6 +2494,24 @@ void USkeletalMeshComponent::CopyClothCollisionsToChildren()
 	}
 }
 
+void USkeletalMeshComponent::CopyClothCollisionSources()
+{
+	FClothCollisionData ExternalCollisions;
+
+	for(FClothCollisionSource& ClothCollisionSource : ClothCollisionSources)
+	{
+		USkeletalMeshComponent* SourceComponent = ClothCollisionSource.SourceComponent.Get();
+		UPhysicsAsset* SourcePhysicsAsset = ClothCollisionSource.SourcePhysicsAsset.Get();
+
+		if(SourceComponent && SourcePhysicsAsset)
+		{
+			ExtractCollisionsForCloth(SourceComponent, SourcePhysicsAsset, this, ExternalCollisions, ClothCollisionSource);
+		}
+	}
+
+	ClothingSimulation->AddExternalCollisions(ExternalCollisions);
+}
+
 // children's collisions can affect to parent's cloth reversely
 void USkeletalMeshComponent::CopyChildrenClothCollisionsToParent()
 {
@@ -2403,10 +2526,10 @@ void USkeletalMeshComponent::CopyChildrenClothCollisionsToParent()
 
 	for (USceneComponent* AttachedChild : GetAttachChildren())
 	{
-		USkeletalMeshComponent* pChild = Cast<USkeletalMeshComponent>(AttachedChild);
-		if(pChild)
+		USkeletalMeshComponent* Child = Cast<USkeletalMeshComponent>(AttachedChild);
+		if(Child)
 		{
-			pChild->FindClothCollisions(NewCollisions);
+			Child->FindClothCollisions(NewCollisions);
 		}
 	}
 
@@ -2635,6 +2758,49 @@ void USkeletalMeshComponent::ProcessClothCollisionWithEnvironment()
 	ClothingSimulation->AddExternalCollisions(NewCollisionData);
 }
 
+void USkeletalMeshComponent::AddClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset)
+{
+	if(InSourceComponent && InSourcePhysicsAsset)
+	{
+		FClothCollisionSource* FoundCollisionSource = ClothCollisionSources.FindByPredicate(
+			[InSourceComponent, InSourcePhysicsAsset](const FClothCollisionSource& InCollisionSource)
+			{ 
+				return InCollisionSource.SourceComponent.Get() == InSourceComponent && InCollisionSource.SourcePhysicsAsset.Get() == InSourcePhysicsAsset; 
+			}
+		);
+
+		if(FoundCollisionSource == nullptr)
+		{
+			ClothCollisionSources.Emplace(InSourceComponent, InSourcePhysicsAsset);
+
+			// Add prerequisite so we dont end up with a frame delay
+			ClothTickFunction.AddPrerequisite(InSourceComponent, InSourceComponent->PrimaryComponentTick);
+		}
+	}
+}
+
+void USkeletalMeshComponent::RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent)
+{
+	if(InSourceComponent)
+	{
+		ClothCollisionSources.RemoveAll([InSourceComponent](const FClothCollisionSource& InCollisionSource)
+		{ 
+			return !InCollisionSource.SourceComponent.IsValid() || InCollisionSource.SourceComponent.Get() == InSourceComponent; 
+		});
+	}
+}
+
+void USkeletalMeshComponent::RemoveClothCollisionSource(USkeletalMeshComponent* InSourceComponent, UPhysicsAsset* InSourcePhysicsAsset)
+{
+	if(InSourceComponent && InSourcePhysicsAsset)
+	{
+		ClothCollisionSources.RemoveAll([InSourceComponent, InSourcePhysicsAsset](const FClothCollisionSource& InCollisionSource)
+		{ 
+			return !InCollisionSource.SourceComponent.IsValid() || (InCollisionSource.SourceComponent.Get() == InSourceComponent && InCollisionSource.SourcePhysicsAsset.Get() == InSourcePhysicsAsset); 
+		});
+	}
+}
+
 #endif// #if WITH_CLOTH_COLLISION_DETECTION
 
 void USkeletalMeshComponent::EndPhysicsTickComponent(FSkeletalMeshComponentEndPhysicsTickFunction& ThisTickFunction)
@@ -2690,6 +2856,11 @@ void USkeletalMeshComponent::UpdateClothTransformImp()
 		CopyClothCollisionsToChildren();
 	}
 
+	if(ClothCollisionSources.Num() > 0)
+	{
+		CopyClothCollisionSources();
+	}
+
 	//check the environment when only transform is updated
 	if(bCollideWithEnvironment && bActiveClothing)
 	{
@@ -2717,7 +2888,7 @@ void USkeletalMeshComponent::UpdateClothTransform(ETeleportType TeleportType)
 {
 	//Note that it's not safe to run the update here. This is because cloth sim could still be running on another thread. We defer it
 	bPendingClothTransformUpdate = true;
-	PendingTeleportType = TeleportType;
+	PendingTeleportType = ((TeleportType > PendingTeleportType) ? TeleportType : PendingTeleportType); 
 }
 
 void USkeletalMeshComponent::CheckClothTeleport()
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalMeshLODSettings.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalMeshLODSettings.cpp
index 05543402ccce..ed7836ddc00a 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalMeshLODSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalMeshLODSettings.cpp
@@ -3,6 +3,8 @@
 #include "Engine/SkeletalMeshLODSettings.h"
 #include "Engine/SkeletalMesh.h"
 #include "UObject/UObjectIterator.h"
+#include "UObject/AthenaObjectVersion.h"
+
 DEFINE_LOG_CATEGORY_STATIC(LogSkeletalMeshLODSettings, Warning, All)
 
 
@@ -200,6 +202,29 @@ void USkeletalMeshLODSettings::PostEditChangeProperty(FPropertyChangedEvent& Pro
 }
 #endif // WITH_EDITOR
 
+void USkeletalMeshLODSettings::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
+
+	if (Ar.CustomVer(FAthenaObjectVersion::GUID) < FAthenaObjectVersion::ConvertReductionSettingOptions)
+	{
+		for (int32 Index = 0; Index < LODGroups.Num(); ++Index)
+		{
+			FSkeletalMeshOptimizationSettings& ReductionSettings = LODGroups[Index].ReductionSettings;
+			// prior to this version, both of them were used
+			ReductionSettings.ReductionMethod = SMOT_TriangleOrDeviation;
+			if (ReductionSettings.MaxDeviationPercentage == 0.f)
+			{
+				// 0.f and 1.f should produce same result. However, it is bad to display 0.f in the slider
+				// as 0.01 and 0.f causes extreme confusion. 
+				ReductionSettings.MaxDeviationPercentage = 1.f;
+			}
+		}
+	}
+}
+
 /////////////////////////////////////////////////////////////
 // FSkeletalMeshOptimizationSettings 
 /////////////////////////////////////////////////////////////
@@ -210,6 +235,6 @@ FSkeletalMeshOptimizationSettings FSkeletalMeshLODGroupSettings::GetReductionSet
 
 const float FSkeletalMeshLODGroupSettings::GetScreenSize() const
 {
-	return ScreenSize;
+	return ScreenSize.Default;
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalMeshMerge.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalMeshMerge.cpp
index 19071fb78dec..fe92ee8e003b 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalMeshMerge.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalMeshMerge.cpp
@@ -537,8 +537,22 @@ void FSkeletalMeshMerge::GenerateLODModel( int32 LODIdx )
 			// get the source skel LOD info from this merge entry
 			const FSkeletalMeshLODInfo& SrcLODInfo = *(MergeSectionInfo.SkelMesh->GetLODInfo(SourceLODIdx));
 
-			// keep track of the lowest LOD displayfactor and hysterisis
-			MergeLODInfo.ScreenSize = FMath::Min<float>(MergeLODInfo.ScreenSize, SrcLODInfo.ScreenSize);
+			// keep track of the lowest LOD displayfactor and hysteresis
+			MergeLODInfo.ScreenSize.Default = FMath::Min<float>(MergeLODInfo.ScreenSize.Default, SrcLODInfo.ScreenSize.Default);
+#if WITH_EDITORONLY_DATA
+			for(const TTuple<FName, float>& PerPlatform : SrcLODInfo.ScreenSize.PerPlatform)
+			{
+				float* Value = MergeLODInfo.ScreenSize.PerPlatform.Find(PerPlatform.Key);
+				if(Value)
+				{
+					*Value = FMath::Min<float>(PerPlatform.Value, *Value);	
+				}
+				else
+				{
+					MergeLODInfo.ScreenSize.PerPlatform.Add(PerPlatform.Key, PerPlatform.Value);
+				}
+			}
+#endif
 			MergeLODInfo.LODHysteresis = FMath::Min<float>(MergeLODInfo.LODHysteresis,SrcLODInfo.LODHysteresis);
 
 			// get the source skel LOD model from this merge entry
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalMeshRenderData.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalMeshRenderData.cpp
index 259d28758ebd..d6eb6a564992 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalMeshRenderData.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalMeshRenderData.cpp
@@ -29,7 +29,7 @@ namespace SkeletalMeshCookStats
 // differences, etc.) replace the version GUID below with a new one.
 // In case of merge conflicts with DDC versions, you MUST generate a new GUID
 // and set this new GUID as the version.                                       
-#define SKELETALMESH_DERIVEDDATA_VER TEXT("EB4F09F0583B41FCA5DD00E131C06A1B")
+#define SKELETALMESH_DERIVEDDATA_VER TEXT("62632E8FC541408082BCF5CDBF0F301A")
 
 static const FString& GetSkeletalMeshDerivedDataVersion()
 {
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalRender.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalRender.cpp
index 0be1bc4b89da..c0e2325acde4 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalRender.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalRender.cpp
@@ -89,7 +89,7 @@ void FSkeletalMeshObject::UpdateMinDesiredLODLevel(const FSceneView* View, const
 		for(int32 LODLevel = SkeletalMeshRenderData->LODRenderData.Num()-1; LODLevel > 0; LODLevel--)
 		{
 			// Get ScreenSize for this LOD
-			float ScreenSize = SkeletalMeshLODInfo[LODLevel].ScreenSize;
+			float ScreenSize = SkeletalMeshLODInfo[LODLevel].ScreenSize.Default;
 
 			// If we are considering shifting to a better (lower) LOD, bias with hysteresis.
 			if(LODLevel  <= CurrentLODLevel)
@@ -179,7 +179,7 @@ float FSkeletalMeshObject::GetScreenSize(int32 LODIndex) const
 {
 	if (SkeletalMeshLODInfo.IsValidIndex(LODIndex))
 	{
-		return SkeletalMeshLODInfo[LODIndex].ScreenSize;
+		return SkeletalMeshLODInfo[LODIndex].ScreenSize.Default;
 	}
 	return 0.f;
 }
@@ -206,9 +206,6 @@ void UpdateRefToLocalMatricesInner(TArray<FMatrix>& ReferenceToLocal, const TArr
 	const bool bBoneVisibilityStatesValid = BoneVisibilityStates.Num() == ComponentTransform.Num();
 	const bool bIsMasterCompValid = MasterBoneMap != nullptr;
 	
-	// Handle case of using ParentAnimComponent for SpaceBases.
-	// this always should be same
-	check(BoneVisibilityStates.Num() == ComponentTransform.Num());
 	for (int32 RequiredBoneSetIndex = 0; RequiredBoneSets[RequiredBoneSetIndex] != NULL; RequiredBoneSetIndex++)
 	{
 		const TArray<FBoneIndexType>& RequiredBoneIndices = *RequiredBoneSets[RequiredBoneSetIndex];
@@ -220,6 +217,9 @@ void UpdateRefToLocalMatricesInner(TArray<FMatrix>& ReferenceToLocal, const TArr
 
 			if ( RefBasesInvMatrix->IsValidIndex(ThisBoneIndex) )
 			{
+				// On the off chance the parent matrix isn't valid, revert to identity.
+				ReferenceToLocal[ThisBoneIndex] = FMatrix::Identity;
+
 				//if we have master pose component, we use MasterBoneMap to figure out the mapping
 				if( bIsMasterCompValid )
 				{
@@ -241,32 +241,43 @@ void UpdateRefToLocalMatricesInner(TArray<FMatrix>& ReferenceToLocal, const TArr
 					}
 					else
 					{
-						// On the off chance the parent matrix isn't valid, revert to identity.
-						ReferenceToLocal[ThisBoneIndex] = FMatrix::Identity;
+						const int32 ParentIndex = RefSkeleton.GetParentIndex(ThisBoneIndex);
+						const FMatrix RefLocalPose = RefSkeleton.GetRefBonePose()[ThisBoneIndex].ToMatrixWithScale();
+						if (ParentIndex != INDEX_NONE)
+						{
+							ReferenceToLocal[ThisBoneIndex] = RefLocalPose * ReferenceToLocal[ParentIndex];
+						}
+						else
+						{
+							ReferenceToLocal[ThisBoneIndex] = RefLocalPose;
+						}
 					}
 				}
 				else
 				{
 					if (ComponentTransform.IsValidIndex(ThisBoneIndex))
 					{
-						// If we can't find this bone in the parent, we just use the reference pose.
-						const int32 ParentIndex = RefSkeleton.GetParentIndex(ThisBoneIndex);
-						bool bNeedToHideBone = BoneVisibilityStates[ThisBoneIndex] != BVS_Visible;
-						if (bNeedToHideBone && ParentIndex != INDEX_NONE)
+						if (bBoneVisibilityStatesValid)
 						{
-							ReferenceToLocal[ThisBoneIndex] = ReferenceToLocal[ParentIndex].ApplyScale(0.f);
+							// If we can't find this bone in the parent, we just use the reference pose.
+							const int32 ParentIndex = RefSkeleton.GetParentIndex(ThisBoneIndex);
+							bool bNeedToHideBone = BoneVisibilityStates[ThisBoneIndex] != BVS_Visible;
+							if (bNeedToHideBone && ParentIndex != INDEX_NONE)
+							{
+								ReferenceToLocal[ThisBoneIndex] = ReferenceToLocal[ParentIndex].ApplyScale(0.f);
+							}
+							else
+							{
+								checkSlow(ComponentTransform[ThisBoneIndex].IsRotationNormalized());
+								ReferenceToLocal[ThisBoneIndex] = ComponentTransform[ThisBoneIndex].ToMatrixWithScale();
+							}
 						}
 						else
 						{
 							checkSlow(ComponentTransform[ThisBoneIndex].IsRotationNormalized());
 							ReferenceToLocal[ThisBoneIndex] = ComponentTransform[ThisBoneIndex].ToMatrixWithScale();
-						}				
+						}
 					}
-					else
-					{
-						// On the off chance the parent matrix isn't valid, revert to identity.
-						ReferenceToLocal[ThisBoneIndex] = FMatrix::Identity;
-					}					
 				}
 			}
 			// removed else statement to set ReferenceToLocal[ThisBoneIndex] = FTransform::Identity;
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.cpp b/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.cpp
index 22b44d6a5e69..d33bb3cc7d32 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.cpp
@@ -221,15 +221,8 @@ void FSkeletalMeshObjectGPUSkin::ReleaseMorphResources()
 	{
 		FSkeletalMeshObjectLOD& SkelLOD = LODs[LODIndex];
 
-		// Check the LOD render data for verts, if it's been stripped we don't create morph buffers, so shouldn't release them
-		const int32 LodIndexInMesh = SkelLOD.LODIndex;
-		const FSkeletalMeshLODRenderData& RenderData = SkelLOD.SkelMeshRenderData->LODRenderData[LodIndexInMesh];
-
-		if(RenderData.GetNumVertices() > 0)
-		{
-			// release morph vertex buffers and factories if they were created
-			SkelLOD.ReleaseMorphResources();
-		}
+		// release morph vertex buffers and factories if they were created
+		SkelLOD.ReleaseMorphResources();
 	}
 
 	bMorphResourcesInitialized = false;
@@ -459,7 +452,7 @@ void FSkeletalMeshObjectGPUSkin::ProcessUpdatedDynamicData(FGPUSkinCache* GPUSki
 				int16 ActorIdx = Section.CorrespondClothAssetIndex;
 				if(FClothSimulData* SimData = DynamicData->ClothingSimData.Find(ActorIdx))
 				{
-					ClothShaderData.ClothLocalToWorld = DynamicData->ClothingSimData[ActorIdx].Transform.ToMatrixWithScale();
+					ClothShaderData.GetClothLocalToWorldForWriting(FrameNumberToPrepare) = DynamicData->ClothingSimData[ActorIdx].ComponentRelativeTransform.ToMatrixWithScale() * DynamicData->ClothObjectLocalToWorld;
 					bNeedFence = ClothShaderData.UpdateClothSimulData(RHICmdList, DynamicData->ClothingSimData[ActorIdx].Positions, DynamicData->ClothingSimData[ActorIdx].Normals, FrameNumberToPrepare, FeatureLevel) || bNeedFence;
 				}
 			}
@@ -468,9 +461,10 @@ void FSkeletalMeshObjectGPUSkin::ProcessUpdatedDynamicData(FGPUSkinCache* GPUSki
 			if (bUseSkinCache)
 			{
 				// This takes the cloth positions from cloth space into world space
-				FMatrix ClothLocalToWorld = bClothFactory ? VertexFactoryData.ClothVertexFactories[SectionIdx]->GetClothShaderData().ClothLocalToWorld : FMatrix::Identity;
+				FMatrix ClothLocalToWorld = bClothFactory ? VertexFactoryData.ClothVertexFactories[SectionIdx]->GetClothShaderData().GetClothLocalToWorldForWriting(FrameNumberToPrepare) : FMatrix::Identity;
 				// Matrices are transposed in ue4 meaning matrix multiples need to happen in reverse ((AB)x = b becomes xTBTAT = b).
 				FMatrix LocalToCloth = DynamicData->ClothObjectLocalToWorld * ClothLocalToWorld.Inverse();
+
 				GPUSkinCache->ProcessEntry(RHICmdList, VertexFactory,
 					VertexFactoryData.PassthroughVertexFactories[SectionIdx].Get(), Section, this, bMorph ? &LOD.MorphVertexBuffer : 0, bClothFactory ? &LODData.ClothVertexBuffer : 0,
 					bClothFactory ? DynamicData->ClothingSimData.Find(Section.CorrespondClothAssetIndex) : 0, LocalToCloth, DynamicData->ClothBlendWeight, RevisionNumber, SectionIdx, SkinCacheEntry);
@@ -907,6 +901,38 @@ FSkinWeightVertexBuffer* FSkeletalMeshObjectGPUSkin::GetSkinWeightVertexBuffer(i
 	return LODs[LODIndex].MeshObjectWeightBuffer;
 }
 
+void FSkeletalMeshObjectGPUSkin::RefreshClothingTransforms(const FMatrix& InNewLocalToWorld, uint32 FrameNumber)
+{
+	if(DynamicData && DynamicData->ClothingSimData.Num() > 0)
+	{
+		FSkeletalMeshObjectLOD& LOD = LODs[DynamicData->LODIndex];
+		const TArray<FSkelMeshRenderSection>& Sections = GetRenderSections(DynamicData->LODIndex);
+		const int32 NumSections = Sections.Num();
+
+		DynamicData->ClothObjectLocalToWorld = InNewLocalToWorld;
+
+		for(int32 SectionIndex = 0; SectionIndex < NumSections; ++SectionIndex)
+		{
+			if(LOD.GPUSkinVertexFactories.ClothVertexFactories.IsValidIndex(SectionIndex))
+			{
+				FGPUBaseSkinAPEXClothVertexFactory* ClothFactory = LOD.GPUSkinVertexFactories.ClothVertexFactories[SectionIndex].Get();
+
+				if(ClothFactory)
+				{
+					const FSkelMeshRenderSection& Section = Sections[SectionIndex];
+					FGPUBaseSkinAPEXClothVertexFactory::ClothShaderType& ClothShaderData = LOD.GPUSkinVertexFactories.ClothVertexFactories[SectionIndex]->GetClothShaderData();
+					const int16 ActorIdx = Section.CorrespondClothAssetIndex;
+
+					if(FClothSimulData* SimData = DynamicData->ClothingSimData.Find(ActorIdx))
+					{
+						ClothShaderData.GetClothLocalToWorldForWriting(FrameNumber) = InNewLocalToWorld * SimData->ComponentRelativeTransform.ToMatrixWithScale();
+					}
+				}
+			}
+		}
+	}
+}
+
 /** 
  * Initialize the stream components common to all GPU skin vertex factory types 
  *
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.h b/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.h
index 2b54b146dc0d..3b74960b59ec 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.h
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalRenderGPUSkin.h
@@ -326,6 +326,8 @@ public:
 		uint32 NumVertices = 0;
 	};
 
+	virtual void RefreshClothingTransforms(const FMatrix& InNewLocalToWorld, uint32 FrameNumber) override;
+
 private:
 
 	/**
diff --git a/Engine/Source/Runtime/Engine/Private/SkeletalRenderStatic.h b/Engine/Source/Runtime/Engine/Private/SkeletalRenderStatic.h
index 3b7ec4035fa4..03f6cb636d8b 100644
--- a/Engine/Source/Runtime/Engine/Private/SkeletalRenderStatic.h
+++ b/Engine/Source/Runtime/Engine/Private/SkeletalRenderStatic.h
@@ -36,7 +36,7 @@ public:
 	virtual const TArray<FMatrix>& GetReferenceToLocalMatrices() const override;
 	virtual int32 GetLOD() const override
 	{
-		return 0;
+		return WorkingMinDesiredLODLevel;
 	}
 	//virtual const FTwoVectors& GetCustomLeftRightVectors(int32 SectionIndex) const override;
 	virtual void DrawVertexElements(FPrimitiveDrawInterface* PDI, const FMatrix& ToWorldSpace, bool bDrawNormals, bool bDrawTangents, bool bDrawBinormals) const override {};
diff --git a/Engine/Source/Runtime/Engine/Private/Slate/DeferredCleanupSlateBrush.cpp b/Engine/Source/Runtime/Engine/Private/Slate/DeferredCleanupSlateBrush.cpp
new file mode 100644
index 000000000000..00fc8a64193e
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Private/Slate/DeferredCleanupSlateBrush.cpp
@@ -0,0 +1,52 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Slate/DeferredCleanupSlateBrush.h"
+#include "Engine/Texture.h"
+
+TSharedRef<FDeferredCleanupSlateBrush> FDeferredCleanupSlateBrush::CreateBrush(const FSlateBrush& Brush)
+{
+	return MakeShareable(new FDeferredCleanupSlateBrush(Brush), [](FDeferredCleanupSlateBrush* ObjectToDelete) { BeginCleanup(ObjectToDelete); });
+}
+
+TSharedRef<FDeferredCleanupSlateBrush> FDeferredCleanupSlateBrush::CreateBrush(
+	UTexture* InTexture,
+	const FLinearColor& InTint,
+	ESlateBrushTileType::Type InTiling,
+	ESlateBrushImageType::Type InImageType)
+{
+	FSlateBrush Brush;
+	Brush.SetResourceObject(InTexture);
+	Brush.ImageSize = FVector2D(InTexture->GetSurfaceWidth(), InTexture->GetSurfaceHeight());
+	Brush.TintColor = InTint;
+	Brush.Tiling = InTiling;
+	Brush.ImageType = InImageType;
+
+	return MakeShareable(new FDeferredCleanupSlateBrush(Brush), [](FDeferredCleanupSlateBrush* ObjectToDelete) { BeginCleanup(ObjectToDelete); });
+}
+
+TSharedRef<FDeferredCleanupSlateBrush> FDeferredCleanupSlateBrush::CreateBrush(
+	UObject* InResource,
+	const FVector2D& InImageSize,
+	const FLinearColor& InTint,
+	ESlateBrushTileType::Type InTiling,
+	ESlateBrushImageType::Type InImageType)
+{
+	FSlateBrush Brush;
+	Brush.SetResourceObject(InResource);
+	Brush.ImageSize = InImageSize;
+	Brush.TintColor = InTint;
+	Brush.Tiling = InTiling;
+	Brush.ImageType = InImageType;
+
+	return MakeShareable(new FDeferredCleanupSlateBrush(Brush), [](FDeferredCleanupSlateBrush* ObjectToDelete) { BeginCleanup(ObjectToDelete); });
+}
+
+void FDeferredCleanupSlateBrush::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	InternalBrush.AddReferencedObjects(Collector);
+}
+
+FString FDeferredCleanupSlateBrush::GetReferencerName() const
+{
+	return "FDeferredCleanupSlateBrush";
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/Slate/SGameLayerManager.cpp b/Engine/Source/Runtime/Engine/Private/Slate/SGameLayerManager.cpp
index d36ce4bf1be3..9663481ea615 100644
--- a/Engine/Source/Runtime/Engine/Private/Slate/SGameLayerManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Slate/SGameLayerManager.cpp
@@ -229,7 +229,6 @@ void SGameLayerManager::ClearWidgets()
 		PlayerLayers.Remove(LayerIt.Key());
 	}
 
-	WindowTitleBarStateStack.Empty();
 	SetWindowTitleBarState(nullptr, EWindowTitleBarMode::Overlay, false, false, false);
 }
 
@@ -387,7 +386,7 @@ void SGameLayerManager::AddOrUpdatePlayerLayers(const FGeometry& AllottedGeometr
 	ESplitScreenType::Type SplitType = ViewportClient->GetCurrentSplitscreenConfiguration();
 	TArray<struct FSplitscreenData>& SplitInfo = ViewportClient->SplitscreenInfo;
 
-	float InverseDPIScale = 1.0f / GetGameViewportDPIScale();
+	float InverseDPIScale = ViewportClient->Viewport ? 1.0f / GetGameViewportDPIScale() : 1.0f;
 
 	// Add and Update Player Layers
 	for ( int32 PlayerIndex = 0; PlayerIndex < GamePlayers.Num(); PlayerIndex++ )
@@ -414,7 +413,6 @@ void SGameLayerManager::AddOrUpdatePlayerLayers(const FGeometry& AllottedGeometr
 			Size = Size * AllottedGeometry.GetLocalSize() * InverseDPIScale;
 			Position = Position * AllottedGeometry.GetLocalSize() * InverseDPIScale;
 
-			const FWindowTitleBarState& WindowTitleBarState = WindowTitleBarStateStack.Top();
 			if (WindowTitleBarState.Mode == EWindowTitleBarMode::VerticalBox && Size.Y > WindowTitleBarVerticalBox->GetDesiredSize().Y)
 			{
 				Size.Y -= WindowTitleBarVerticalBox->GetDesiredSize().Y;
@@ -432,11 +430,11 @@ FVector2D SGameLayerManager::GetAspectRatioInset(ULocalPlayer* LocalPlayer) cons
 	FVector2D Offset(0.f, 0.f);
 	if ( LocalPlayer )
 	{
-		FSceneViewInitOptions ViewInitOptions;
-		if (LocalPlayer->CalcSceneViewInitOptions(ViewInitOptions, LocalPlayer->ViewportClient->Viewport))
+		FSceneViewProjectionData ProjectionData;
+		if (LocalPlayer->GetProjectionData(LocalPlayer->ViewportClient->Viewport, eSSP_FULL, ProjectionData))
 		{
-			FIntRect ViewRect = ViewInitOptions.GetViewRect();
-			FIntRect ConstrainedViewRect = ViewInitOptions.GetConstrainedViewRect();
+			const FIntRect ViewRect = ProjectionData.GetViewRect();
+			const FIntRect ConstrainedViewRect = ProjectionData.GetConstrainedViewRect();
 
 			// Return normalized coordinates.
 			Offset.X = ( ConstrainedViewRect.Min.X - ViewRect.Min.X ) / (float)ViewRect.Width();
@@ -452,34 +450,35 @@ void SGameLayerManager::SetDefaultWindowTitleBarHeight(float Height)
 	DefaultWindowTitleBarHeight = Height;
 }
 
-void SGameLayerManager::SetWindowTitleBarState(const TSharedPtr<SWidget>& TitleBarContent, EWindowTitleBarMode Mode, bool bIsTitleBarVisible, bool bWindowButtonsVisible, bool bTitleBarVisible)
+void SGameLayerManager::SetWindowTitleBarState(const TSharedPtr<SWidget>& TitleBarContent, EWindowTitleBarMode Mode, bool bTitleBarDragEnabled, bool bWindowButtonsVisible, bool bTitleBarVisible)
 {
-	WindowTitleBarStateStack.Push(FWindowTitleBarState(TitleBarContent.IsValid() ? TitleBarContent : DefaultTitleBarContentWidget, Mode, bIsTitleBarVisible, bWindowButtonsVisible, bTitleBarVisible && bIsGameUsingBorderlessWindow));
+	UE_LOG(LogSlate, Log, TEXT("Updating window title bar state: %s mode, drag %s, window buttons %s, title bar %s"),
+		Mode == EWindowTitleBarMode::Overlay ? TEXT("overlay") : TEXT("vertical box"),
+		bTitleBarDragEnabled ? TEXT("enabled") : TEXT("disabled"),
+		bWindowButtonsVisible ? TEXT("visible") : TEXT("hidden"),
+		bTitleBarVisible ? TEXT("visible") : TEXT("hidden"));
+	WindowTitleBarState.ContentWidget = TitleBarContent.IsValid() ? TitleBarContent : DefaultTitleBarContentWidget;
+	WindowTitleBarState.Mode = Mode;
+	WindowTitleBarState.bTitleBarDragEnabled = bTitleBarDragEnabled;
+	WindowTitleBarState.bWindowButtonsVisible = bWindowButtonsVisible;
+	WindowTitleBarState.bTitleBarVisible = bTitleBarVisible && bIsGameUsingBorderlessWindow;
 	UpdateWindowTitleBar();
 }
 
 void SGameLayerManager::RestorePreviousWindowTitleBarState()
 {
-	if (WindowTitleBarStateStack.Num() > 1)
-	{
-		WindowTitleBarStateStack.Pop();
-		UpdateWindowTitleBar();
-	}
-	else
-	{
-		UE_LOG(LogSlate, Warning, TEXT("SGameLayerManager::RestorePreviousWindowTitleBarState() called without a matching SGameLayerManager::SetWindowTitleBarState() call."));
-	}
+	// TODO: remove RestorePreviousWindowTitleBarState() and replace its usage in widget blueprints with SetWindowTitleBarState() calls
+	SetWindowTitleBarState(nullptr, EWindowTitleBarMode::Overlay, false, false, false);
 }
 
 void SGameLayerManager::SetWindowTitleBarVisibility(bool bIsVisible)
 {
-	WindowTitleBarStateStack.Top().bTitleBarVisible = bIsVisible && bIsGameUsingBorderlessWindow;
+	WindowTitleBarState.bTitleBarVisible = bIsVisible && bIsGameUsingBorderlessWindow;
 	UpdateWindowTitleBarVisibility();
 }
 
 void SGameLayerManager::UpdateWindowTitleBar()
 {
-	const FWindowTitleBarState& WindowTitleBarState = WindowTitleBarStateStack.Top();
 	if (WindowTitleBarState.ContentWidget.IsValid())
 	{
 		if (WindowTitleBarState.Mode == EWindowTitleBarMode::Overlay)
@@ -499,7 +498,6 @@ void SGameLayerManager::UpdateWindowTitleBar()
 
 void SGameLayerManager::UpdateWindowTitleBarVisibility()
 {
-	const FWindowTitleBarState& WindowTitleBarState = WindowTitleBarStateStack.Top();
 	const EVisibility VisibilityWhenEnabled = WindowTitleBarState.bTitleBarDragEnabled ? EVisibility::Visible : EVisibility::SelfHitTestInvisible;
 	if (WindowTitleBarState.Mode == EWindowTitleBarMode::Overlay)
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/Slate/SceneViewport.cpp b/Engine/Source/Runtime/Engine/Private/Slate/SceneViewport.cpp
index 11b1394a7a5f..58f898569695 100644
--- a/Engine/Source/Runtime/Engine/Private/Slate/SceneViewport.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Slate/SceneViewport.cpp
@@ -756,7 +756,15 @@ FReply FSceneViewport::OnTouchStarted( const FGeometry& MyGeometry, const FPoint
 
 		const FVector2D TouchPosition = MyGeometry.AbsoluteToLocal(TouchEvent.GetScreenSpacePosition());
 
-		if( !ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Began, TouchPosition, FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
+		if(ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Began, TouchPosition, TouchEvent.GetTouchForce(), FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
+		{
+			const bool bTemporaryCapture = ViewportClient->CaptureMouseOnClick() == EMouseCaptureMode::CaptureDuringMouseDown;
+			if (bTemporaryCapture)
+			{
+				CurrentReplyState = AcquireFocusAndCapture(TouchPosition.IntPoint());
+			}
+		}
+		else
 		{
 			CurrentReplyState = FReply::Unhandled(); 
 		}
@@ -780,7 +788,7 @@ FReply FSceneViewport::OnTouchMoved( const FGeometry& MyGeometry, const FPointer
 
 		const FVector2D TouchPosition = MyGeometry.AbsoluteToLocal(TouchEvent.GetScreenSpacePosition());
 
-		if( !ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Moved, TouchPosition, FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
+		if( !ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Moved, TouchPosition, TouchEvent.GetTouchForce(), FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
 		{
 			CurrentReplyState = FReply::Unhandled(); 
 		}
@@ -811,10 +819,15 @@ FReply FSceneViewport::OnTouchEnded( const FGeometry& MyGeometry, const FPointer
 
 		const FVector2D TouchPosition = MyGeometry.AbsoluteToLocal(TouchEvent.GetScreenSpacePosition());
 
-		if( !ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Ended, TouchPosition, FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
+		if( !ViewportClient->InputTouch( this, TouchEvent.GetUserIndex(), TouchEvent.GetPointerIndex(), ETouchType::Ended, TouchPosition, 0.0f, FDateTime::Now(), TouchEvent.GetTouchpadIndex()) )
 		{
 			CurrentReplyState = FReply::Unhandled(); 
 		}
+
+		if (ViewportClient->CaptureMouseOnClick() == EMouseCaptureMode::CaptureDuringMouseDown)
+		{
+			CurrentReplyState.ReleaseMouseCapture();
+		}
 	}
 
 	return CurrentReplyState;
@@ -1174,12 +1187,13 @@ void FSceneViewport::ResizeFrame(uint32 NewWindowSizeX, uint32 NewWindowSizeY, E
 
 			const FVector2D OldWindowPos = WindowToResize->GetPositionInScreen();
 			const FVector2D OldWindowSize = WindowToResize->GetClientSizeInScreen();
-			const EWindowMode::Type OldWindowMode = WindowMode;
+			const EWindowMode::Type OldWindowMode = WindowToResize->GetWindowMode();
 
 			// Set the new window mode first to ensure that the work area size is correct (fullscreen windows can affect this)
 			if (NewWindowMode != OldWindowMode)
 			{
 				WindowToResize->SetWindowMode(NewWindowMode);
+				WindowMode = NewWindowMode;
 			}
 
 			TOptional<FVector2D> NewWindowPos;
@@ -1271,17 +1285,28 @@ void FSceneViewport::ResizeFrame(uint32 NewWindowSizeX, uint32 NewWindowSizeY, E
 			}
 #endif
 			// Resize window
-			if (NewWindowSize != OldWindowSize || (NewWindowPos.IsSet() && NewWindowPos != OldWindowPos) || NewWindowMode != OldWindowMode)
+			const bool bSizeChanged = NewWindowSize != OldWindowSize;
+			const bool bPositionChanged = NewWindowPos.IsSet() && NewWindowPos != OldWindowPos;
+			const bool bModeChanged = NewWindowMode != OldWindowMode;
+			if (bSizeChanged || bPositionChanged || bModeChanged)
 			{
-				LockMouseToViewport(!CurrentReplyState.ShouldReleaseMouseLock());
-				if (NewWindowPos.IsSet())
+				if (CurrentReplyState.ShouldReleaseMouseLock())
+				{
+					LockMouseToViewport(false);
+				}
+
+				if (bModeChanged || (bSizeChanged && bPositionChanged))
 				{
 					WindowToResize->ReshapeWindow(NewWindowPos.GetValue(), NewWindowSize);
 				}
-				else
+				else if (bSizeChanged)
 				{
 					WindowToResize->Resize(NewWindowSize);
 				}
+				else
+				{
+					WindowToResize->MoveWindowTo(NewWindowPos.GetValue());
+				}
 			}
 
 			// Resize viewport
diff --git a/Engine/Source/Runtime/Engine/Private/SoundAttenuation.cpp b/Engine/Source/Runtime/Engine/Private/SoundAttenuation.cpp
index 1d48a6d1a460..5db6cdcdb73c 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundAttenuation.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundAttenuation.cpp
@@ -12,6 +12,7 @@
 
 void FSoundAttenuationSettings::PostSerialize(const FArchive& Ar)
 {
+#if WITH_EDITORONLY_DATA
 	if (Ar.UE4Ver() < VER_UE4_ATTENUATION_SHAPES)
 	{
 		FalloffDistance = RadiusMax_DEPRECATED - RadiusMin_DEPRECATED;
@@ -57,6 +58,7 @@ void FSoundAttenuationSettings::PostSerialize(const FArchive& Ar)
 			PluginSettings.ReverbPluginSettingsArray.Add(ReverbPluginSettings_DEPRECATED);
 		}
 	}
+#endif
 }
 
 float FSoundAttenuationSettings::GetFocusPriorityScale(const struct FGlobalFocusSettings& FocusSettings, float FocusFactor) const
diff --git a/Engine/Source/Runtime/Engine/Private/SoundBase.cpp b/Engine/Source/Runtime/Engine/Private/SoundBase.cpp
index e50024a281fe..311c6962dfc0 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundBase.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundBase.cpp
@@ -13,7 +13,9 @@ USoundBase::USoundBase(const FObjectInitializer& ObjectInitializer)
 	, bIgnoreFocus_DEPRECATED(false)
 	, Priority(1.0f)
 {
+#if WITH_EDITORONLY_DATA
 	MaxConcurrentPlayCount_DEPRECATED = 16;
+#endif
 }
 
 void USoundBase::PostInitProperties()
@@ -70,7 +72,7 @@ float USoundBase::GetMaxDistance() const
 	return (AttenuationSettings ? AttenuationSettings->Attenuation.GetMaxDimension() : WORLD_MAX);
 }
 
-float USoundBase::GetDuration() const
+float USoundBase::GetDuration()
 {
 	return Duration;
 }
@@ -168,6 +170,7 @@ void USoundBase::PostLoad()
 {
 	Super::PostLoad();
 
+#if WITH_EDITORONLY_DATA
 	const int32 LinkerUE4Version = GetLinkerUE4Version();
 
 	if (LinkerUE4Version < VER_UE4_SOUND_CONCURRENCY_PACKAGE)
@@ -178,5 +181,6 @@ void USoundBase::PostLoad()
 		ConcurrencyOverrides.ResolutionRule = MaxConcurrentResolutionRule_DEPRECATED;
 		ConcurrencyOverrides.VolumeScale = 1.0f;
 	}
+#endif
 }
 
diff --git a/Engine/Source/Runtime/Engine/Private/SoundCue.cpp b/Engine/Source/Runtime/Engine/Private/SoundCue.cpp
index 00caa05d5fac..035efa40cc07 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundCue.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundCue.cpp
@@ -17,6 +17,7 @@
 #include "Sound/SoundNodeAttenuation.h"
 #include "Sound/SoundNodeQualityLevel.h"
 #include "Sound/SoundNodeSoundClass.h"
+#include "Sound/SoundNodeRandom.h"
 #include "GameFramework/GameUserSettings.h"
 #include "AudioCompressionSettingsUtils.h"
 #if WITH_EDITOR
@@ -72,10 +73,9 @@ void USoundCue::CacheAggregateValues()
 {
 	if (FirstNode)
 	{
-		if (Duration == 0.0f)
-		{
-			Duration = FirstNode->GetDuration();
-		}
+		FirstNode->ConditionalPostLoad();
+
+		Duration = FirstNode->GetDuration();
 
 		if (MaxDistance == 0.0f)
 		{
@@ -100,6 +100,7 @@ void USoundCue::Serialize(FStructuredArchive::FRecord Record)
 	// Always force the duration to be updated when we are saving or cooking
 	if (UnderlyingArchive.IsSaving() || UnderlyingArchive.IsCooking())
 	{
+		Duration = (FirstNode ? FirstNode->GetDuration() : 0.f);
 		CacheAggregateValues();
 	}
 
@@ -210,6 +211,23 @@ void USoundCue::EvaluateNodes(bool bAddToRoot)
 
 #if WITH_EDITOR
 
+void USoundCue::RecursivelySetExcludeBranchCulling(USoundNode* CurrentNode)
+{
+	if (CurrentNode)
+	{
+		USoundNodeRandom* RandomNode = Cast<USoundNodeRandom>(CurrentNode);
+		if (RandomNode)
+		{
+			RandomNode->bSoundCueExcludedFromBranchCulling = bExcludeFromRandomNodeBranchCulling;
+			RandomNode->MarkPackageDirty();
+		}
+		for (USoundNode* ChildNode : CurrentNode->ChildNodes)
+		{
+			RecursivelySetExcludeBranchCulling(ChildNode);
+		}
+	}
+}
+
 void USoundCue::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
 {
 	Super::PostEditChangeProperty(PropertyChangedEvent);
@@ -224,6 +242,9 @@ void USoundCue::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyCha
 				It->Play();
 			}
 		}
+
+		// Propagate branch exclusion to child nodes which care (sound node random)
+		RecursivelySetExcludeBranchCulling(FirstNode);
 	}
 }
 #endif
@@ -366,11 +387,21 @@ float USoundCue::GetMaxDistance() const
 	return MaxDistance;
 }
 
-float USoundCue::GetDuration() const
+float USoundCue::GetDuration()
 {
+	// Always recalc the duration when in the editor as it could change
+	if (GIsEditor || (Duration < SMALL_NUMBER) || HasDelayNode())
+	{
+		if (FirstNode)
+		{
+			Duration = FirstNode->GetDuration();
+		}
+	}
+
 	return Duration;
 }
 
+
 bool USoundCue::ShouldApplyInteriorVolumes()
 {
 	// Only evaluate the sound class graph if we've not cached the result or if we're in editor
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNode.cpp b/Engine/Source/Runtime/Engine/Private/SoundNode.cpp
index 9aa184cab8ed..472f279f2121 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNode.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNode.cpp
@@ -134,7 +134,7 @@ void USoundNode::SetChildNodes(TArray<USoundNode*>& InChildNodes)
 }
 #endif //WITH_EDITOR
 
-float USoundNode::GetDuration() const
+float USoundNode::GetDuration()
 {
 	// Iterate over children and return maximum length of any of them
 	float MaxDuration = 0.0f;
@@ -155,6 +155,7 @@ float USoundNode::GetMaxDistance() const
 	{
 		if (ChildNode)
 		{
+			ChildNode->ConditionalPostLoad();
 			MaxDistance = FMath::Max(ChildNode->GetMaxDistance(), MaxDistance);
 		}
 	}
@@ -165,9 +166,10 @@ bool USoundNode::HasDelayNode() const
 {
 	for (USoundNode* ChildNode : ChildNodes)
 	{
-		if (ChildNode && ChildNode->HasDelayNode())
+		if (ChildNode)
 		{
-			return true;
+			ChildNode->ConditionalPostLoad();
+			return ChildNode->HasDelayNode();
 		}
 	}
 	return false;
@@ -177,9 +179,10 @@ bool USoundNode::HasConcatenatorNode() const
 {
 	for (USoundNode* ChildNode : ChildNodes)
 	{
-		if (ChildNode && ChildNode->HasConcatenatorNode())
+		if (ChildNode)
 		{
-			return true;
+			ChildNode->ConditionalPostLoad();
+			return ChildNode->HasConcatenatorNode();
 		}
 	}
 	return false;
@@ -189,9 +192,10 @@ bool USoundNode::IsVirtualizeWhenSilent() const
 {
 	for (USoundNode* ChildNode : ChildNodes)
 	{
-		if (ChildNode && ChildNode->IsVirtualizeWhenSilent())
+		if (ChildNode)
 		{
-			return true;
+			ChildNode->ConditionalPostLoad();
+			return ChildNode->IsVirtualizeWhenSilent();
 		}
 	}
 	return false;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeConcatenator.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeConcatenator.cpp
index bdef443ebeb2..00e496c3e2a8 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeConcatenator.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeConcatenator.cpp
@@ -63,7 +63,7 @@ bool USoundNodeConcatenator::NotifyWaveInstanceFinished( FWaveInstance* WaveInst
 }
 
 
-float USoundNodeConcatenator::GetDuration() const
+float USoundNodeConcatenator::GetDuration()
 {
 	// Sum up length of child nodes.
 	float Duration = 0.0f;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeDelay.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeDelay.cpp
index 3441e2739d42..1398aab677d3 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeDelay.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeDelay.cpp
@@ -67,7 +67,7 @@ void USoundNodeDelay::ParseNodes( FAudioDevice* AudioDevice, const UPTRINT NodeW
 	}
 }
 
-float USoundNodeDelay::GetDuration() const
+float USoundNodeDelay::GetDuration()
 {
 	// Get length of child node.
 	float ChildDuration = 0.0f;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeDialoguePlayer.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeDialoguePlayer.cpp
index 8f952c33b518..152945660559 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeDialoguePlayer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeDialoguePlayer.cpp
@@ -31,7 +31,7 @@ void USoundNodeDialoguePlayer::ParseNodes( FAudioDevice* AudioDevice, const UPTR
 	}
 }
 
-float USoundNodeDialoguePlayer::GetDuration() const
+float USoundNodeDialoguePlayer::GetDuration()
 {
 	USoundBase* SoundBase = GetDialogueWave() ? GetDialogueWave()->GetWaveFromContext(DialogueWaveParameter.Context) : NULL;
 	float Duration = 0.f;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeEnveloper.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeEnveloper.cpp
index e26a27ff48e4..cc3fdbd2a66f 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeEnveloper.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeEnveloper.cpp
@@ -110,7 +110,7 @@ void USoundNodeEnveloper::ParseNodes( FAudioDevice* AudioDevice, const UPTRINT N
 	Super::ParseNodes(AudioDevice, NodeWaveInstanceHash, ActiveSound, UpdatedParams, WaveInstances);
 }
 
-float USoundNodeEnveloper::GetDuration() const
+float USoundNodeEnveloper::GetDuration()
 {
 	float ChildDuration = (ChildNodes.Num() > 0 && ChildNodes[0] != NULL) ? ChildNodes[0]->GetDuration() : 0;
 
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeLooping.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeLooping.cpp
index c04769d434a9..a7f3ad70543f 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeLooping.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeLooping.cpp
@@ -142,7 +142,8 @@ void USoundNodeLooping::ResetChildren(const UPTRINT NodeWaveInstanceHash, FActiv
 		}
 	}
 }
-float USoundNodeLooping::GetDuration() const
+
+float USoundNodeLooping::GetDuration()
 {
 	// Assume no duration (i.e. no input node)
 	float Duration = 0.0f;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeRandom.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeRandom.cpp
index a0e74fcfe3a3..e23dfeacb573 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeRandom.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeRandom.cpp
@@ -52,7 +52,7 @@ void USoundNodeRandom::PostLoad()
 	Super::PostLoad();
 
 	// get a per-platform override
-	if (!bShouldExcludeFromBranchCulling)
+	if (!bShouldExcludeFromBranchCulling && !bSoundCueExcludedFromBranchCulling)
 	{
 		int32 AmountOfBranchesToPreselect = 0;
 		int32 PlatformOverride = FPlatformCompressionUtilities::GetMaxPreloadedBranchesForCurrentPlatform();
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeWaveParam.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeWaveParam.cpp
index 9cb200f39ad7..69e7fe2fa57e 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeWaveParam.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeWaveParam.cpp
@@ -14,7 +14,7 @@ USoundNodeWaveParam::USoundNodeWaveParam(const FObjectInitializer& ObjectInitial
 {
 }
 
-float USoundNodeWaveParam::GetDuration() const
+float USoundNodeWaveParam::GetDuration()
 {
 	// Since we can't know how long this node will be we say it is indefinitely looping
 	return INDEFINITELY_LOOPING_DURATION;
diff --git a/Engine/Source/Runtime/Engine/Private/SoundNodeWavePlayer.cpp b/Engine/Source/Runtime/Engine/Private/SoundNodeWavePlayer.cpp
index 105bbc6d0eb2..80f2eda00260 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundNodeWavePlayer.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundNodeWavePlayer.cpp
@@ -135,7 +135,7 @@ void USoundNodeWavePlayer::ParseNodes( FAudioDevice* AudioDevice, const UPTRINT
 	}
 }
 
-float USoundNodeWavePlayer::GetDuration() const
+float USoundNodeWavePlayer::GetDuration()
 {
 	float Duration = 0.f;
 	if (SoundWave)
diff --git a/Engine/Source/Runtime/Engine/Private/SoundSourceBus.cpp b/Engine/Source/Runtime/Engine/Private/SoundSourceBus.cpp
index b0ae05456b0d..b61d52ff4ccd 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundSourceBus.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundSourceBus.cpp
@@ -58,7 +58,7 @@ bool USoundSourceBus::IsPlayable() const
 	return true;
 }
 
-float USoundSourceBus::GetDuration() const
+float USoundSourceBus::GetDuration()
 {
 	return (SourceBusDuration > 0.0f) ? SourceBusDuration : INDEFINITELY_LOOPING_DURATION;
 }
diff --git a/Engine/Source/Runtime/Engine/Private/SoundWave.cpp b/Engine/Source/Runtime/Engine/Private/SoundWave.cpp
index cb86a476409a..5baa7920e28b 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundWave.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundWave.cpp
@@ -109,9 +109,8 @@ USoundWave::USoundWave(const FObjectInitializer& ObjectInitializer)
 	SubtitlePriority = DEFAULT_SUBTITLE_PRIORITY;
 	ResourceState = ESoundWaveResourceState::NeedsFree;
 	RawPCMDataSize = 0;
+	SetPrecacheState(ESoundWavePrecacheState::NotStarted);
 
-	// Default this to true since most sound wave types don't need precaching
-	bIsPrecacheDone = true;
 #if !WITH_EDITOR
 	bCachedSampleRateFromPlatformSettings = false;
 	bSampleRateManuallyReset = false;
@@ -548,7 +547,7 @@ void USoundWave::PostLoad()
 	if (!GIsEditor && !IsTemplate( RF_ClassDefaultObject ) && GEngine)
 	{
 		FAudioDevice* AudioDevice = GEngine->GetMainAudioDevice();
-		if (AudioDevice && AudioDevice->AreStartupSoundsPreCached())
+		if (AudioDevice)
 		{
 			// Upload the data to the hardware, but only if we've precached startup sounds already
 			AudioDevice->Precache(this);
@@ -727,6 +726,36 @@ void USoundWave::FreeResources()
 	}, TStatId());
 }
 
+bool USoundWave::CleanupDecompressor(bool bForceWait)
+{
+	check(IsInAudioThread());
+
+	if (!AudioDecompressor)
+	{
+		check(GetPrecacheState() == ESoundWavePrecacheState::Done);
+		return true;
+	}
+
+	if (AudioDecompressor->IsDone())
+	{
+		delete AudioDecompressor;
+		AudioDecompressor = nullptr;
+		SetPrecacheState(ESoundWavePrecacheState::Done);
+		return true;
+	}
+
+	if (bForceWait)
+	{
+		AudioDecompressor->EnsureCompletion();
+		delete AudioDecompressor;
+		AudioDecompressor = nullptr;
+		SetPrecacheState(ESoundWavePrecacheState::Done);
+		return true;
+	}
+
+	return false;
+}
+
 FWaveInstance* USoundWave::HandleStart( FActiveSound& ActiveSound, const UPTRINT WaveInstanceHash ) const
 {
 	// Create a new wave instance and associate with the ActiveSound
@@ -759,10 +788,10 @@ bool USoundWave::IsReadyForFinishDestroy()
 {
 	const bool bIsStreamingInProgress = IStreamingManager::Get().GetAudioStreamingManager().IsStreamingInProgress(this);
 
+	check(GetPrecacheState() != ESoundWavePrecacheState::InProgress);
+
 	// Wait till streaming and decompression finishes before deleting resource.
-	if ( !bIsStreamingInProgress && (( AudioDecompressor == nullptr ) || AudioDecompressor->IsDone()) )
-	{
-		if (ResourceState == ESoundWaveResourceState::NeedsFree)
+	if (!bIsStreamingInProgress && ResourceState == ESoundWaveResourceState::NeedsFree)
 		{
 			DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.FreeResources"), STAT_AudioFreeResources, STATGROUP_AudioThreadCommands);
 
@@ -773,9 +802,8 @@ bool USoundWave::IsReadyForFinishDestroy()
 				SoundWave->FreeResources();
 			}, GET_STATID(STAT_AudioFreeResources));
 		}
-	}
 	
-	return ResourceState == ESoundWaveResourceState::Freed && bIsPrecacheDone;
+	return ResourceState == ESoundWaveResourceState::Freed;
 }
 
 
@@ -783,12 +811,8 @@ void USoundWave::FinishDestroy()
 {
 	Super::FinishDestroy();
 
-	if (AudioDecompressor)
-	{
-		check(AudioDecompressor->IsDone());
-		delete AudioDecompressor;
-		AudioDecompressor = nullptr;
-	}
+	check(GetPrecacheState() != ESoundWavePrecacheState::InProgress);
+	check(AudioDecompressor == nullptr);
 
 	CleanupCachedRunningPlatformData();
 #if WITH_EDITOR
@@ -1059,7 +1083,7 @@ bool USoundWave::IsPlayable() const
 	return true;
 }
 
-float USoundWave::GetDuration() const
+float USoundWave::GetDuration()
 {
 	return (bLooping ? INDEFINITELY_LOOPING_DURATION : Duration);
 }
diff --git a/Engine/Source/Runtime/Engine/Private/SoundWaveProcedural.cpp b/Engine/Source/Runtime/Engine/Private/SoundWaveProcedural.cpp
index 9096efe3bb14..448ada0a0d5f 100644
--- a/Engine/Source/Runtime/Engine/Private/SoundWaveProcedural.cpp
+++ b/Engine/Source/Runtime/Engine/Private/SoundWaveProcedural.cpp
@@ -134,7 +134,7 @@ int32 USoundWaveProcedural::GeneratePCMData(uint8* PCMData, const int32 SamplesN
 		const int32 BytesToCopy = SamplesToCopy * SampleByteSize;
 
 		FMemory::Memcpy((void*)PCMData, &AudioBuffer[0], BytesToCopy);
-		AudioBuffer.RemoveAt(0, BytesToCopy);
+		AudioBuffer.RemoveAt(0, BytesToCopy, false);
 
 		// Decrease the available by count
 		if (bPumpQueuedAudio)
diff --git a/Engine/Source/Runtime/Engine/Private/StaticMesh.cpp b/Engine/Source/Runtime/Engine/Private/StaticMesh.cpp
index a7efbf669604..7849b296414f 100644
--- a/Engine/Source/Runtime/Engine/Private/StaticMesh.cpp
+++ b/Engine/Source/Runtime/Engine/Private/StaticMesh.cpp
@@ -781,8 +781,14 @@ void FStaticMeshRenderData::Serialize(FArchive& Ar, UStaticMesh* Owner, bool bCo
 			for (int32 ResourceIndex = 0; ResourceIndex < LODResources.Num(); ResourceIndex++)
 			{
 				FStaticMeshLODResources& LOD = LODResources[ResourceIndex];
-
-				bool bValid = LOD.DistanceFieldData != NULL;
+				
+				bool bStripDistanceFields = false;
+				if (Ar.IsCooking())
+				{
+					bStripDistanceFields = !Ar.CookingTarget()->SupportsFeature(ETargetPlatformFeatures::DeferredRendering);
+				}
+				
+				bool bValid = (LOD.DistanceFieldData != NULL) && !bStripDistanceFields;
 
 				Ar << bValid;
 
@@ -1403,7 +1409,7 @@ static FString BuildStaticMeshDerivedDataKey(UStaticMesh* Mesh, const FStaticMes
 	// Add LightmapUVVersion to key going forward
 	if ( (ELightmapUVVersion)Mesh->LightmapUVVersion > ELightmapUVVersion::BitByBit )
 	{
-		KeySuffix += Lex::ToString(Mesh->LightmapUVVersion);
+		KeySuffix += LexToString(Mesh->LightmapUVVersion);
 	}
 #if WITH_EDITOR
 	if (GIsAutomationTesting && Mesh->BuildCacheAutomationTestGuid.IsValid())
@@ -1848,12 +1854,30 @@ int32 UStaticMesh::GetNumLODs() const
 	return NumLODs;
 }
 
-bool UStaticMesh::HasValidRenderData() const
+// pass false for bCheckLODForVerts for any runtime code that can handle empty LODs, for example due to them being stripped
+//  as a result of minimum LOD setup on the static mesh; in cooked builds, those verts are stripped, but systems still need to
+//  be able to handle these cases; to check specifically for an LOD, pass true (default arg), and an LOD index (default arg implies MinLOD)
+//
+bool UStaticMesh::HasValidRenderData(bool bCheckLODForVerts, int32 LODIndex) const
 {
-	return RenderData != NULL
+	if (RenderData != nullptr
 		&& RenderData->LODResources.Num() > 0
-		&& RenderData->LODResources.GetData() != NULL
-		&& RenderData->LODResources[0].VertexBuffers.StaticMeshVertexBuffer.GetNumVertices() > 0;
+		&& RenderData->LODResources.GetData() != nullptr)
+	{
+		if (bCheckLODForVerts)
+		{
+		    if (LODIndex == INDEX_NONE)
+		    {
+			    LODIndex = FMath::Clamp<int32>(MinLOD.GetValueForFeatureLevel(GMaxRHIFeatureLevel), 0, RenderData->LODResources.Num() - 1);
+		    }
+			return (RenderData->LODResources[LODIndex].VertexBuffers.StaticMeshVertexBuffer.GetNumVertices() > 0);
+		}
+		else
+		{
+			return true;
+		}
+	}
+	return false;
 }
 
 FBoxSphereBounds UStaticMesh::GetBounds() const
@@ -2136,40 +2160,40 @@ void UStaticMesh::SetLODGroup(FName NewGroup, bool bRebuildImmediately)
 		Modify();
 	}
 	LODGroup = NewGroup;
-
-	const ITargetPlatform* Platform = GetTargetPlatformManagerRef().GetRunningTargetPlatform();
-	check(Platform);
-	const FStaticMeshLODGroup& GroupSettings = Platform->GetStaticMeshLODSettings().GetLODGroup(NewGroup);
-
-	// Set the number of LODs to at least the default. If there are already LODs they will be preserved, with default settings of the new LOD group.
-	int32 DefaultLODCount = GroupSettings.GetDefaultNumLODs();
-
-	if (SourceModels.Num() > DefaultLODCount)
+	if (NewGroup != NAME_None)
 	{
-		int32 NumToRemove = SourceModels.Num() - DefaultLODCount;
-		SourceModels.RemoveAt(DefaultLODCount, NumToRemove);
-	}
-	else if (DefaultLODCount > SourceModels.Num())
-	{
-		int32 NumToAdd = DefaultLODCount - SourceModels.Num();
-		SourceModels.AddDefaulted(NumToAdd);
-	}
+		const ITargetPlatform* Platform = GetTargetPlatformManagerRef().GetRunningTargetPlatform();
+		check(Platform);
+		const FStaticMeshLODGroup& GroupSettings = Platform->GetStaticMeshLODSettings().GetLODGroup(NewGroup);
 
-	check(SourceModels.Num() == DefaultLODCount);
+		// Set the number of LODs to at least the default. If there are already LODs they will be preserved, with default settings of the new LOD group.
+		int32 DefaultLODCount = GroupSettings.GetDefaultNumLODs();
 
-	// Set reduction settings to the defaults.
-	for (int32 LODIndex = 0; LODIndex < DefaultLODCount; ++LODIndex)
-	{
-		SourceModels[LODIndex].ReductionSettings = GroupSettings.GetDefaultSettings(LODIndex);
-	}
-	LightMapResolution = GroupSettings.GetDefaultLightMapResolution();
-	
-	if (!bBeforeDerivedDataCached)
-	{
-		bAutoComputeLODScreenSize = true;
-		
-	}
+		if (SourceModels.Num() > DefaultLODCount)
+		{
+			int32 NumToRemove = SourceModels.Num() - DefaultLODCount;
+			SourceModels.RemoveAt(DefaultLODCount, NumToRemove);
+		}
+		else if (DefaultLODCount > SourceModels.Num())
+		{
+			int32 NumToAdd = DefaultLODCount - SourceModels.Num();
+			SourceModels.AddDefaulted(NumToAdd);
+		}
 
+		check(SourceModels.Num() == DefaultLODCount);
+
+		// Set reduction settings to the defaults.
+		for (int32 LODIndex = 0; LODIndex < DefaultLODCount; ++LODIndex)
+		{
+			SourceModels[LODIndex].ReductionSettings = GroupSettings.GetDefaultSettings(LODIndex);
+		}
+		LightMapResolution = GroupSettings.GetDefaultLightMapResolution();
+
+		if (!bBeforeDerivedDataCached)
+		{
+			bAutoComputeLODScreenSize = true;
+		}
+	}
 	if (bRebuildImmediately && !bBeforeDerivedDataCached)
 	{
 		PostEditChange();
@@ -2284,7 +2308,7 @@ void UStaticMesh::GetAssetRegistryTags(TArray<FAssetRegistryTag>& OutTags) const
 	FString ComplexityString;
 	if (BodySetup != nullptr)
 	{
-		ComplexityString = Lex::ToString((ECollisionTraceFlag)BodySetup->GetCollisionTraceFlag());
+		ComplexityString = LexToString((ECollisionTraceFlag)BodySetup->GetCollisionTraceFlag());
 	}
 
 	OutTags.Add( FAssetRegistryTag("Triangles", FString::FromInt(NumTriangles), FAssetRegistryTag::TT_Numerical) );
@@ -2328,12 +2352,17 @@ void UStaticMesh::GetAssetRegistryTagMetadata(TMap<FName, FAssetRegistryTagMetad
 
 FStaticMeshSourceModel::FStaticMeshSourceModel()
 {
+	LODDistance_DEPRECATED = 0.0f;
 #if WITH_EDITOR
 	RawMeshBulkData = new FRawMeshBulkData();
 	ScreenSize.Default = 0.0f;
 	OriginalMeshDescription = nullptr;
 	StaticMeshOwner = nullptr;
 #endif // #if WITH_EDITOR
+	SourceImportFilename = FString();
+#if WITH_EDITORONLY_DATA
+	bImportWithBaseMesh = false;
+#endif
 }
 
 FStaticMeshSourceModel::~FStaticMeshSourceModel()
@@ -3233,6 +3262,11 @@ void UStaticMesh::Serialize(FArchive& Ar)
 #endif // WITH_EDITOR
 }
 
+bool UStaticMesh::IsPostLoadThreadSafe() const
+{
+	return false;
+}
+
 //
 //	UStaticMesh::PostLoad
 //
diff --git a/Engine/Source/Runtime/Engine/Private/StaticMeshLight.cpp b/Engine/Source/Runtime/Engine/Private/StaticMeshLight.cpp
index 8ebbeba260e0..5d9066263895 100644
--- a/Engine/Source/Runtime/Engine/Private/StaticMeshLight.cpp
+++ b/Engine/Source/Runtime/Engine/Private/StaticMeshLight.cpp
@@ -451,6 +451,9 @@ void UStaticMeshComponent::InvalidateLightingCacheDetailed(bool bInvalidateBuild
 	{
 		FStaticMeshComponentLODInfo& LODDataElement = LODData[i];
 		LODDataElement.MapBuildDataId = FGuid::NewGuid();
+		#if WITH_EDITOR
+			LODDataElement.bMapBuildDataIdLoaded = false;
+		#endif
 	}
 
 	MarkRenderStateDirty();
diff --git a/Engine/Source/Runtime/Engine/Private/StatsRender2.cpp b/Engine/Source/Runtime/Engine/Private/StatsRender2.cpp
index a3368a19649c..11e527239123 100644
--- a/Engine/Source/Runtime/Engine/Private/StatsRender2.cpp
+++ b/Engine/Source/Runtime/Engine/Private/StatsRender2.cpp
@@ -73,7 +73,7 @@ static FStatFont GStatFonts[(int32)EStatFontTypes::NumFonts] =
 	FStatFont( 72, 12, 2 ),
 };
 
-void FromString( EStatFontTypes& OutValue, const TCHAR* Buffer )
+void LexFromString( EStatFontTypes& OutValue, const TCHAR* Buffer )
 {
 	OutValue = EStatFontTypes::Small;
 
diff --git a/Engine/Source/Runtime/Engine/Private/StreamableManager.cpp b/Engine/Source/Runtime/Engine/Private/StreamableManager.cpp
index 9150c4ac1a8f..fe88e2ddca6a 100644
--- a/Engine/Source/Runtime/Engine/Private/StreamableManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/StreamableManager.cpp
@@ -588,10 +588,10 @@ struct FStreamable
 	/** If this object failed to load, don't try again */
 	bool	bLoadFailed;
 
-	/** List of handles that are waiting for this to load */
+	/** List of handles that are waiting for this to load. The same handle may be here multiple times with redirectors */
 	TArray< TSharedRef< FStreamableHandle> > LoadingHandles;
 
-	/** List of handles that are keeping this streamable in memory */
+	/** List of handles that are keeping this streamable in memory. The same handle may be here multiple times */
 	TArray< TWeakPtr< FStreamableHandle> > ActiveHandles;
 
 	FStreamable()
@@ -615,7 +615,7 @@ struct FStreamable
 		{
 			TSharedPtr<FStreamableHandle> ActiveHandle = ActiveHandles[i].Pin();
 
-			if (ActiveHandle.IsValid())
+			if (ActiveHandle.IsValid() && !ActiveHandle->bCanceled)
 			{
 				// Full cancel isn't safe any more
 
@@ -634,12 +634,7 @@ struct FStreamable
 
 	void AddLoadingRequest(TSharedRef<FStreamableHandle> NewRequest)
 	{
-		if (ActiveHandles.Contains(NewRequest))
-		{
-			ensureMsgf(!ActiveHandles.Contains(NewRequest), TEXT("Duplicate item added to StreamableRequest"));
-			return;
-		}
-		
+		// With redirectors we can end up adding the same handle multiple times, this is unusual but supported
 		ActiveHandles.Add(NewRequest);
 
 		LoadingHandles.Add(NewRequest);
@@ -784,28 +779,17 @@ FStreamable* FStreamableManager::StreamInternal(const FSoftObjectPath& InTargetN
 			FRedirectedPath RedirectedPath;
 			UE_LOG(LogStreamableManager, Verbose, TEXT("     Static loading %s"), *TargetName.ToString());
 			Existing->Target = StaticLoadObject(UObject::StaticClass(), nullptr, *TargetName.ToString());
-			// need to manually detect redirectors because the above call only expects to load a UObject::StaticClass() type
-			while (UObjectRedirector* Redirector = Cast<UObjectRedirector>(Existing->Target))
+
+			// Need to manually detect redirectors because the above call only expects to load a UObject::StaticClass() type
+			UObjectRedirector* Redir = Cast<UObjectRedirector>(Existing->Target);
+			if (Redir)
 			{
-				if (!RedirectedPath.LoadedRedirector)
-				{
-					RedirectedPath.LoadedRedirector = Redirector;
-				}
-				Existing->Target = Redirector->DestinationObject;
+				TargetName = HandleLoadedRedirector(Redir, TargetName, Existing);
 			}
+
 			if (Existing->Target)
 			{
 				UE_LOG(LogStreamableManager, Verbose, TEXT("     Static loaded %s"), *Existing->Target->GetFullName());
-				FSoftObjectPath PossiblyNewName(Existing->Target->GetPathName());
-				if (PossiblyNewName != TargetName)
-				{
-					UE_LOG(LogStreamableManager, Verbose, TEXT("     Which redirected to %s"), *PossiblyNewName.ToString());
-					RedirectedPath.NewPath = PossiblyNewName;
-					StreamableRedirects.Add(TargetName, RedirectedPath);
-					StreamableItems.Add(PossiblyNewName, Existing);
-					StreamableItems.Remove(TargetName);
-					TargetName = PossiblyNewName; // we are done with the old name
-				}
 			}
 			else
 			{
@@ -1045,37 +1029,14 @@ void FStreamableManager::FindInMemory( FSoftObjectPath& InOutTargetName, struct
 	}
 
 	UObjectRedirector* Redir = Cast<UObjectRedirector>(Existing->Target);
-	
-	FRedirectedPath RedirectedPath;
-	RedirectedPath.LoadedRedirector = Redir;
 
-	while (Redir)
+	if (Redir)
 	{
-		Existing->Target = Redir->DestinationObject;
-		Redir = Cast<UObjectRedirector>(Existing->Target);
-		UE_LOG(LogStreamableManager, Verbose, TEXT("     Found redirect %s"), *Redir->GetFullName());
-		if (!Existing->Target)
-		{
-			Existing->bLoadFailed = true;
-			UE_LOG(LogStreamableManager, Warning, TEXT("Destination of redirector was not found %s -> %s."), *InOutTargetName.ToString(), *Redir->GetFullName());
-		}
-		else
-		{
-			UE_LOG(LogStreamableManager, Verbose, TEXT("     Redirect to %s"), *Redir->DestinationObject->GetFullName());
-		}
+		InOutTargetName = HandleLoadedRedirector(Redir, InOutTargetName, Existing);
 	}
+
 	if (Existing->Target)
 	{
-		FSoftObjectPath PossiblyNewName(Existing->Target->GetPathName());
-		if (InOutTargetName != PossiblyNewName)
-		{
-			UE_LOG(LogStreamableManager, Verbose, TEXT("     Name changed to %s"), *PossiblyNewName.ToString());
-			RedirectedPath.NewPath = PossiblyNewName;
-			StreamableRedirects.Add(InOutTargetName, RedirectedPath);
-			StreamableItems.Add(PossiblyNewName, Existing);
-			StreamableItems.Remove(InOutTargetName);
-			InOutTargetName = PossiblyNewName; // we are done with the old name
-		}
 		UE_LOG(LogStreamableManager, Verbose, TEXT("     Found in memory %s"), *Existing->Target->GetFullName());
 		Existing->bLoadFailed = false;
 	}
@@ -1183,9 +1144,11 @@ void FStreamableManager::RemoveReferencedAsset(const FSoftObjectPath& Target, TS
 		ensureMsgf(Existing->ActiveHandles.Remove(Handle) > 0, TEXT("Failed to remove active handle for %s"), *Target.ToString());
 
 		// Try removing from loading list if it's still there, this won't call the callback as it's being called from cancel
-		if (Existing->LoadingHandles.Remove(Handle))
+		// This may remove more than one copy if streamables were merged
+		int32 LoadingRemoved = Existing->LoadingHandles.Remove(Handle);
+		if (LoadingRemoved > 0)
 		{
-			Handle->StreamablesLoading--;
+			Handle->StreamablesLoading -= LoadingRemoved;
 
 			if (Existing->LoadingHandles.Num() == 0)
 			{
@@ -1285,7 +1248,8 @@ bool FStreamableManager::GetActiveHandles(const FSoftObjectPath& Target, TArray<
 				TSharedRef<FStreamableHandle> HandleRef = Handle.ToSharedRef();
 				if (!bOnlyManagedHandles || ManagedActiveHandles.Contains(HandleRef))
 				{
-					HandleList.Add(HandleRef);
+					// Only add each handle once, we can have duplicates in the source list
+					HandleList.AddUnique(HandleRef);
 				}
 			}
 		}
@@ -1307,4 +1271,52 @@ FSoftObjectPath FStreamableManager::ResolveRedirects(const FSoftObjectPath& Targ
 	return Target;
 }
 
+FSoftObjectPath FStreamableManager::HandleLoadedRedirector(UObjectRedirector* LoadedRedirector, FSoftObjectPath RequestedPath, struct FStreamable* RequestedStreamable)
+{
+	UE_LOG(LogStreamableManager, Verbose, TEXT("     Found redirect %s"), *LoadedRedirector->GetPathName());
+
+	// Need to follow the redirector chain
+	while (UObjectRedirector* Redirector = Cast<UObjectRedirector>(RequestedStreamable->Target))
+	{
+		RequestedStreamable->Target = Redirector->DestinationObject;
+
+		if (!RequestedStreamable->Target)
+		{
+			RequestedStreamable->bLoadFailed = true;
+			UE_LOG(LogStreamableManager, Warning, TEXT("Destination of redirector was not found %s -> %s."), *RequestedPath.ToString(), *Redirector->GetPathName());
+
+			return RequestedPath;
+		}
+	}
+
+	FSoftObjectPath NewPath(RequestedStreamable->Target->GetPathName());
+	UE_LOG(LogStreamableManager, Verbose, TEXT("     Which redirected to %s"), *NewPath.ToString());
+
+	// We add the originally loaded redirector to GC keep alive, this will keep entire chain alive
+	StreamableRedirects.Add(RequestedPath, FRedirectedPath(NewPath, LoadedRedirector));
+
+	// Remove the requested streamable from it's old location
+	StreamableItems.Remove(RequestedPath);
+
+	if (FStreamable** FoundStreamable = StreamableItems.Find(NewPath))
+	{
+		// We found an existing streamable, need to merge the handles and delete old streamable
+		// This may result in the same handle being in the list twice! But the rest of the code is ready for that
+		// We let LoadFailed and InProgress stay as false on the new streamable because we've successfully loaded an object
+
+		RequestedStreamable->LoadingHandles.Append((*FoundStreamable)->LoadingHandles);
+		(*FoundStreamable)->LoadingHandles.Empty();
+
+		RequestedStreamable->ActiveHandles.Append((*FoundStreamable)->ActiveHandles);
+		(*FoundStreamable)->ActiveHandles.Empty();
+
+		delete *FoundStreamable;
+	}
+
+	// Add requested streamable with new path
+	StreamableItems.Add(NewPath, RequestedStreamable);
+	
+	return NewPath;
+}
+
 
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.cpp
index 376c46ba9018..f88bb9b3430c 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.cpp
@@ -228,6 +228,7 @@ void FAsyncTextureStreamingTask::UpdateBudgetedMips_Async(int64& MemoryUsed, int
 		PerfectWantedMipsBudgetResetThresold = MemoryBudgeted; 
 	}
 
+
 	const int64 NonStreamingTextureMemory =  AllocatedMemory - MemoryUsed;
 	int64 AvailableMemoryForStreaming = PoolSize - NonStreamingTextureMemory - MemoryMargin;
 
@@ -580,10 +581,19 @@ void FAsyncTextureStreamingTask::DoWork()
 	// Update the distance and size for each bounds.
 	StreamingData.UpdateBoundSizes_Async(Settings);
 	
+	bool bNewFilesLoaded = StreamingManager.GetAndResetNewFilesHaveLoaded();
+	
 	for (FStreamingTexture& StreamingTexture : StreamingTextures)
 	{
 		if (IsAborted()) break;
 
+		if (bNewFilesLoaded)
+		{
+			StreamingTexture.ClearCachedOptionalMipsState_Async();
+		}
+
+		StreamingTexture.UpdateOptionalMipsState_Async();
+		
 		StreamingData.UpdatePerfectWantedMips_Async(StreamingTexture, Settings);
 		StreamingTexture.DynamicBoostFactor = 1.f; // Reset after every computation.
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.h b/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.h
index c3e20f43aa4f..3915a8d77e2a 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.h
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/AsyncTextureStreaming.h
@@ -142,7 +142,7 @@ public:
 	const TArray<int32>& GetLoadRequests() const { return LoadRequests; }
 	const TArray<int32>& GetCancelationRequests() const { return CancelationRequests; }
 	const TArray<int32>& GetPendingUpdateDirties() const { return PendingUpdateDirties; }
-	
+
 	FAsyncTextureStreamingData StreamingData;
 	
 	/** Performs the async work. */
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/DynamicTextureInstanceManager.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/DynamicTextureInstanceManager.cpp
index 32c6a01df7fd..0a3ec3becc7c 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/DynamicTextureInstanceManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/DynamicTextureInstanceManager.cpp
@@ -147,6 +147,8 @@ void FDynamicTextureInstanceManager::OnPreGarbageCollect(FRemovedTextureArray& R
 		}
 	}
 }
+
+
 /*-----------------------------------
 ------ ITextureInstanceManager ------
 -----------------------------------*/
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/LevelTextureManager.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/LevelTextureManager.cpp
index cbd68b5cd658..22d1b6271075 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/LevelTextureManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/LevelTextureManager.cpp
@@ -21,6 +21,7 @@ FLevelTextureManager::FLevelTextureManager(ULevel* InLevel, TextureInstanceTask:
 	}
 }
 
+
 void FLevelTextureManager::Remove(FRemovedTextureArray* RemovedTextures)
 { 
 	TArray<const UPrimitiveComponent*> ReferencedComponents;
@@ -315,3 +316,4 @@ uint32 FLevelTextureManager::GetAllocatedSize() const
 		UnprocessedComponents.GetAllocatedSize() + 
 		PendingComponents.GetAllocatedSize();
 }
+
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.cpp
index 1db276b78f86..ad2261adc315 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.cpp
@@ -18,6 +18,7 @@
 #include "DeviceProfiles/DeviceProfileManager.h"
 #include "Streaming/AsyncTextureStreaming.h"
 #include "Components/PrimitiveComponent.h"
+#include "Misc/CoreDelegates.h"
 
 bool TrackTexture( const FString& TextureName );
 bool UntrackTexture( const FString& TextureName );
@@ -111,6 +112,8 @@ FStreamingManagerTexture::FStreamingManagerTexture()
 	DynamicComponentManager.RegisterTasks(TextureInstanceAsyncWork->GetTask());
 
 	FCoreUObjectDelegates::GetPreGarbageCollectDelegate().AddRaw(this, &FStreamingManagerTexture::OnPreGarbageCollect);
+
+	FCoreDelegates::PakFileMountedCallback.AddRaw(this, &FStreamingManagerTexture::OnPakFileMounted);
 }
 
 FStreamingManagerTexture::~FStreamingManagerTexture()
@@ -151,6 +154,13 @@ void FStreamingManagerTexture::OnPreGarbageCollect()
 }
 
 
+
+void FStreamingManagerTexture::OnPakFileMounted(const TCHAR* PakFilename)
+{
+	// clear the cached file exists checks which failed as they may now be loaded
+	bNewFilesLoaded = true;
+}
+
 /**
  * Cancels the timed Forced resources (i.e used the Kismet action "Stream In Textures").
  */
@@ -712,6 +722,7 @@ void FStreamingManagerTexture::SetTexturesRemovedTimestamp(const FRemovedTexture
 	}
 }
 
+
 void FStreamingManagerTexture::NotifyPrimitiveUpdated( const UPrimitiveComponent* Primitive )
 {
 	STAT(GatheredStats.CallbacksCycles = -(int32)FPlatformTime::Cycles();)
@@ -1115,7 +1126,7 @@ void FStreamingManagerTexture::LogViewLocationChange()
  * @param DeltaTime				Time since last call in seconds
  * @param bProcessEverything	[opt] If true, process all resources with no throttling limits
  */
-static TAutoConsoleVariable<int32> CVarFramesForFullUpdate(
+ENGINE_API TAutoConsoleVariable<int32> CVarFramesForFullUpdate(
 	TEXT("r.Streaming.FramesForFullUpdate"),
 	5,
 	TEXT("Texture streaming is time sliced per frame. This values gives the number of frames to visit all textures."));
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.h b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.h
index 46e6fa6de70f..2e4b2dccb1dd 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.h
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingManagerTexture.h
@@ -138,7 +138,6 @@ struct FStreamingManagerTexture : public ITextureStreamingManager
 
 	/* Notifies manager that level primitives were shifted */
 	virtual void NotifyLevelOffset(ULevel* Level, const FVector& Offset) override;
-
 	/** Called when a spawned actor is destroyed. */
 	virtual void NotifyActorDestroyed( AActor* Actor ) override;
 
@@ -198,6 +197,11 @@ protected:
 		 */
 		void BoostTextures( AActor* Actor, float BoostFactor ) override;
 
+		/**
+		 * Updates the state of a texture with information about it's optional bulkdata
+		 */
+		void SetOptionalBulkData( UTexture* Texture, bool bHasOptionalBulkData );
+
 		/**
 		 * Stream textures in/out, based on the priorities calculated by the async work.
 		 *
@@ -205,12 +209,30 @@ protected:
 		 */
 		void StreamTextures( bool bProcessEverything );
 
+		/**
+		 * If new files have loaded this function will return true once
+		 * bNewFilesLoaded is set on the game thread and reset on the async thread
+		 * no need for synchronization as if we are a frame behind then that's ok 
+		 */
+		FORCEINLINE bool GetAndResetNewFilesHaveLoaded()
+		{
+			bool bResult = bNewFilesLoaded;
+			if ( bResult )
+			{
+				bNewFilesLoaded = false;
+			}
+			return bResult;
+		}
+
 		/** All streaming UTexture2D objects. */
 		TArray<FStreamingTexture> StreamingTextures;
 
 		/** All the textures referenced in StreamingTextures. Used to handled deleted textures.  */
 		TSet<const UTexture2D*> ReferencedTextures;
 
+		/** All the currently installed optional bulkdata files */
+		TSet<FString> OptionalBulkDataFiles;
+
 		/** Index of the StreamingTexture that will be updated next by UpdateStreamingTextures(). */
 		int32 CurrentUpdateStreamingTextureIndex;
 //END: Thread-safe functions and data
@@ -323,6 +345,8 @@ protected:
 	/** Whether texture streaming is paused or not. When paused, it won't stream any textures in or out. */
 	bool bPauseTextureStreaming;
 
+	bool bNewFilesLoaded;
+
 	/** Last time all data were fully updated. Instances are considered visible if they were rendered between that last time and the current time. */
 	float LastWorldUpdateTime;
 
@@ -331,6 +355,9 @@ protected:
 
 	TArray<int32> InflightTextures;
 
+	TMap<FString, bool> CachedFileExistsChecks;
+	void OnPakFileMounted(const TCHAR* PakFilename);
+
 #if STATS_FAST
 	uint64 MaxStreamingTexturesSize;
 	uint64 MaxOptimalTextureSize;
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.cpp
index afc3d737cc86..5699171f7665 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.cpp
@@ -7,6 +7,7 @@ StreamingTexture.cpp: Definitions of classes used for texture.
 #include "Streaming/StreamingTexture.h"
 #include "Misc/App.h"
 #include "Streaming/StreamingManagerTexture.h"
+#include "HAL/FileManager.h"
 
 FStreamingTexture::FStreamingTexture(UTexture2D* InTexture, const int32 NumStreamedMips[TEXTUREGROUP_MAX], const FTextureStreamingSettings& Settings)
 : Texture(InTexture)
@@ -14,6 +15,11 @@ FStreamingTexture::FStreamingTexture(UTexture2D* InTexture, const int32 NumStrea
 	UpdateStaticData(Settings);
 	UpdateDynamicData(NumStreamedMips, Settings, false);
 
+	if ( Texture )
+	{
+		UpdateOptionalMipsState_Async();
+	}
+
 	InstanceRemovedTimestamp = -FLT_MAX;
 	DynamicBoostFactor = 1.f;
 
@@ -33,6 +39,8 @@ FStreamingTexture::FStreamingTexture(UTexture2D* InTexture, const int32 NumStrea
 
 void FStreamingTexture::UpdateStaticData(const FTextureStreamingSettings& Settings)
 {
+
+	OptionalBulkDataFilename = TEXT("");
 	if (Texture)
 	{
 		LODGroup = (TextureGroup)Texture->LODGroup;
@@ -44,10 +52,20 @@ void FStreamingTexture::UpdateStaticData(const FTextureStreamingSettings& Settin
 		bIsCharacterTexture = (LODGroup == TEXTUREGROUP_Character || LODGroup == TEXTUREGROUP_CharacterSpecular || LODGroup == TEXTUREGROUP_CharacterNormalMap);
 		bIsTerrainTexture = (LODGroup == TEXTUREGROUP_Terrain_Heightmap || LODGroup == TEXTUREGROUP_Terrain_Weightmap);
 
+		NumNonOptionalMips = MipCount - Texture->CalcNumOptionalMips();
+		OptionalMipsState = EOptionalMipsState::NotCached;
+
 		for (int32 MipIndex=0; MipIndex < MAX_TEXTURE_MIP_COUNT; ++MipIndex)
 		{
 			TextureSizes[MipIndex] = Texture->CalcTextureMemorySize(FMath::Min(MipIndex + 1, MipCount));
 		}
+		const FString* PtrBulkDataFilename = nullptr;
+		const int32 OptionalMipCount = MipCount - NumNonOptionalMips;
+		const int32 OptionalMipIndex = OptionalMipCount - 1; // just here so it's clear why this -1 is here
+		if (Texture->GetMipDataFilename(OptionalMipIndex, PtrBulkDataFilename))
+		{
+			OptionalBulkDataFilename = *PtrBulkDataFilename;
+		}
 	}
 	else
 	{
@@ -56,6 +74,8 @@ void FStreamingTexture::UpdateStaticData(const FTextureStreamingSettings& Settin
 		MipCount = 0;
 		BudgetMipBias = 0;
 		BoostFactor = 1.f;
+		NumNonOptionalMips = MipCount;
+		OptionalMipsState = EOptionalMipsState::NotCached;
 
 		bIsCharacterTexture = false;
 		bIsTerrainTexture = false;
@@ -67,6 +87,24 @@ void FStreamingTexture::UpdateStaticData(const FTextureStreamingSettings& Settin
 	}
 }
 
+void FStreamingTexture::UpdateOptionalMipsState_Async()
+{
+	if (!Texture) return;
+
+	if (NumNonOptionalMips == ResidentMips && NumNonOptionalMips < MipCount)
+	{
+		if (OptionalMipsState == EOptionalMipsState::NotCached)
+		{
+			OptionalMipsState = EOptionalMipsState::NoOptionalMips;
+			check(OptionalBulkDataFilename != TEXT(""));
+			if (IFileManager::Get().FileExists(*OptionalBulkDataFilename))
+			{
+				OptionalMipsState = EOptionalMipsState::HasOptionalMips;
+			}
+		}
+	}
+}
+
 void FStreamingTexture::UpdateDynamicData(const int32 NumStreamedMips[TEXTUREGROUP_MAX], const FTextureStreamingSettings& Settings, bool bWaitForMipFading)
 {
 	// Note that those values are read from the async task and must not be assigned temporary values!!
@@ -99,7 +137,23 @@ void FStreamingTexture::UpdateDynamicData(const int32 NumStreamedMips[TEXTUREGRO
 		}
 
 		// The max mip count is affected by the texture bias and cinematic bias settings.
-		MaxAllowedMips = FMath::Clamp<int32>(FMath::Min<int32>(MipCount - LODBias, GMaxTextureMipCount), NumNonStreamingMips, MipCount);
+		// don't set MaxAllowdMips more then once as it could be read by async texture task
+		int32 TempMaxAllowedMips = FMath::Clamp<int32>(FMath::Min<int32>(MipCount - LODBias, GMaxTextureMipCount), NumNonStreamingMips, MipCount);
+
+		if (NumNonOptionalMips < MipCount)
+		{
+			if (NumNonOptionalMips > ResidentMips) // we have loaded the non optional mips so we can now try to load the optional mips
+			{
+				TempMaxAllowedMips = FMath::Min(TempMaxAllowedMips, NumNonOptionalMips);
+			}
+			else if (OptionalMipsState != EOptionalMipsState::HasOptionalMips)  // we don't have the optional mips file or we haven't yet checked if it exists (file check happens on the async texture streaming thread)
+			{
+				TempMaxAllowedMips = FMath::Min(TempMaxAllowedMips, NumNonOptionalMips);
+			}
+		}
+
+		MaxAllowedMips = TempMaxAllowedMips;
+		
 
 		if (NumStreamedMips[LODGroup] > 0)
 		{
@@ -120,6 +174,8 @@ void FStreamingTexture::UpdateDynamicData(const int32 NumStreamedMips[TEXTUREGRO
 		RequestedMips = 0;
 		MinAllowedMips = 0;
 		MaxAllowedMips = 0;
+		NumNonOptionalMips = 0;
+		OptionalMipsState = EOptionalMipsState::NotCached;
 		LastRenderTime = FLT_MAX;	
 	}
 }
@@ -349,10 +405,17 @@ void FStreamingTexture::StreamWantedMipsUsingCachedData(FStreamingManagerTexture
 
 void FStreamingTexture::StreamWantedMips_Internal(FStreamingManagerTexture& Manager, bool bUseCachedData)
 {
-	const int32 LocalWantedMips = bUseCachedData ? CachedWantedMips : WantedMips;
+	int32 LocalWantedMips = bUseCachedData ? CachedWantedMips : WantedMips;
 	const int32 LocalVisibleWantedMips = bUseCachedData ? CachedVisibleWantedMips : VisibleWantedMips;
 	const uint32 bLocalForceFullyLoadHeuristic = bUseCachedData ? bCachedForceFullyLoadHeuristic : bForceFullyLoadHeuristic;
 
+	const bool bRequestedOptionalMips =  LocalWantedMips > NumNonOptionalMips;
+
+	if ( bRequestedOptionalMips )
+	{
+		check( OptionalMipsState == EOptionalMipsState::HasOptionalMips );
+	}
+
 	if (Texture && LocalWantedMips != ResidentMips)
 	{
 		const bool bShouldPrioritizeAsyncIORequest = (bLocalForceFullyLoadHeuristic || bIsTerrainTexture || bIsCharacterTexture)
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.h b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.h
index ac14026eb307..2227db6a01d7 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.h
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/StreamingTexture.h
@@ -19,6 +19,15 @@ struct FTextureStreamingSettings;
 /** Self-contained structure to manage a streaming texture, possibly on a separate thread. */
 struct FStreamingTexture
 {
+private:
+	enum EOptionalMipsState
+	{
+		NotCached,
+		NoOptionalMips,
+		HasOptionalMips,
+	};
+public:
+
 	FStreamingTexture(UTexture2D* InTexture, const int32 NumStreamedMips[TEXTUREGROUP_MAX], const FTextureStreamingSettings& Settings);
 
 	/** Update data that should not change unless changing settings. */
@@ -65,6 +74,8 @@ struct FStreamingTexture
 
 	/** Init load order. Return wether this texture has any load/unload request */
 	bool UpdateLoadOrderPriority_Async(int32 MinMipForSplitRequest);
+
+	void UpdateOptionalMipsState_Async();
 	
 	void CancelPendingMipChangeRequest();
 	void StreamWantedMips(FStreamingManagerTexture& Manager);
@@ -95,6 +106,16 @@ struct FStreamingTexture
 		return !bIsStreamingPaused && (BudgetedMips > ResidentMips || !bBudgetedMipsIsValid);
 	}
 
+	FORCEINLINE void ClearCachedOptionalMipsState_Async()
+	{
+		// if we already have our optional mips there is no need to recache, pak files can't go away!
+		if (OptionalMipsState == EOptionalMipsState::HasOptionalMips)
+		{
+			return;
+		}
+		OptionalMipsState = EOptionalMipsState::NotCached;
+	}
+
 	/***************************************************************
 	 * Members initialized when this is constructed => NEVER CHANGES
 	 ***************************************************************/
@@ -146,6 +167,11 @@ struct FStreamingTexture
 	int32			MinAllowedMips;
 	/** Max mip to be requested by the streaming  */
 	int32			MaxAllowedMips;
+	/** Mips which are in an optional bulk data file (may not be present on device) */
+	int32			NumNonOptionalMips;
+	/** Cached state on disk of the optional mips for this streaming texture */
+	EOptionalMipsState	OptionalMipsState;
+	FString			OptionalBulkDataFilename;
 
 	/** How much game time has elapsed since the texture was bound for rendering. Based on FApp::GetCurrentTime(). */
 	float			LastRenderTime;
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DStreamIn_IO.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DStreamIn_IO.cpp
index 0fe6bd83d87f..b9787315e7b9 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DStreamIn_IO.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DStreamIn_IO.cpp
@@ -79,7 +79,7 @@ void FTexture2DStreamIn_IO::SetIOFilename(const FContext& Context)
 		}
 		else if (IOFilename != MipMap.BulkData.GetFilename())
 		{
-			UE_LOG(LogTexture, Error, TEXT("All of the streaming mips must be stored in the same file."), *IOFilename);
+			UE_LOG(LogTexture, Error, TEXT("All of the streaming mips must be stored in the same file %s %s."), *IOFilename, *MipMap.BulkData.GetFilename());
 			IOFilename.Reset();
 			break;
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DUpdate.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DUpdate.cpp
index b6b38fefe79e..9debfd1fba37 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DUpdate.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/Texture2DUpdate.cpp
@@ -98,15 +98,24 @@ void FTexture2DUpdate::Tick(UTexture2D* InTexture, EThreadType InCurrentThread)
 			}
 			else if (PendingTaskState != TS_Scheduled || InCurrentThread != TT_None)
 			{
-				// If the task was never scheduled (because synchro was not ready) schedule now.
-				// We also reschedule if this is an executing thread and it end up not being the good thread.
-				// This can happen when a task gets cancelled between scheduling and execution.
-				// We enforce that executing threads either execute or reschedule to prevent a possible stalls
-				// since game thread will not reschedule after the first time.
-				// It's completely safe to schedule several time as task execution can only ever happen once.
-				// we also keep track of how many callbacks are scheduled through ScheduledTaskCount to prevent
-				// deleting the object while another thread is scheduled to access it.
-				ScheduleTick(Context, RelevantThread);
+				// On systems with only a few cores, prevent async tasks from scheduling render commands.
+				// This avoids the render thread from gettings stalled by low priority async tasks.
+				if (InCurrentThread != TT_Async || FApp::ShouldUseThreadingForPerformance())
+				{
+					// If the task was never scheduled (because synchro was not ready) schedule now.
+					// We also reschedule if this is an executing thread and it end up not being the good thread.
+					// This can happen when a task gets cancelled between scheduling and execution.
+					// We enforce that executing threads either execute or reschedule to prevent a possible stalls
+					// since game thread will not reschedule after the first time.
+					// It's completely safe to schedule several time as task execution can only ever happen once.
+					// we also keep track of how many callbacks are scheduled through ScheduledTaskCount to prevent
+					// deleting the object while another thread is scheduled to access it.
+					ScheduleTick(Context, RelevantThread);
+				}
+				else
+				{
+					PendingTaskState = TS_Pending;
+				}
 			}
 			else // Otherwise unlock the task for the executing thread to process it.
 			{
@@ -136,7 +145,9 @@ void FTexture2DUpdate::PushTask(const FContext& Context, EThreadType InTaskThrea
 
 	// TaskSynchronization is expected to be set before call this.
 	// If the rendering thread is suspended, delay the scheduling until not suspended anymore.
-	const bool bCanExecuteNow = TaskSynchronization.GetValue() <= 0 && !(GSuspendRenderThreadTasks > 0 && RelevantThread == TT_Render);
+	// Otherwise, on systems with only a few cores, prevent async tasks from scheduling render commands.
+	// This avoids the render thread from gettings stalled by low priority async tasks.
+	const bool bCanExecuteNow = TaskSynchronization.GetValue() <= 0 && !(GSuspendRenderThreadTasks > 0 && RelevantThread == TT_Render) && (Context.CurrentThread != TT_Async || FApp::ShouldUseThreadingForPerformance());
 
 	if (RelevantThread == TT_None)
 	{
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.cpp b/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.cpp
index 8c8802917d54..77773e5c6392 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.cpp
@@ -61,6 +61,13 @@ TAutoConsoleVariable<float> CVarStreamingBoost(
 	ECVF_Scalability
 	);
 
+TAutoConsoleVariable<float> CVarStreamingMinBoost(
+	TEXT("r.Streaming.MinBoost"),
+	0.0f,
+	TEXT("Minimum clamp for r.Streaming.Boost"),
+	ECVF_Default
+	);
+
 TAutoConsoleVariable<float> CVarStreamingScreenSizeEffectiveMax(
 	TEXT("r.Streaming.MaxEffectiveScreenSize"),
 	0,
diff --git a/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.h b/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.h
index c510e62f8230..4593394565f3 100644
--- a/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.h
+++ b/Engine/Source/Runtime/Engine/Private/Streaming/TextureStreamingHelpers.h
@@ -50,6 +50,7 @@ extern TAutoConsoleVariable<int32> CVarSetTextureStreaming;
 #endif
 
 extern TAutoConsoleVariable<float> CVarStreamingBoost;
+extern TAutoConsoleVariable<float> CVarStreamingMinBoost;
 extern TAutoConsoleVariable<int32> CVarStreamingUseFixedPoolSize;
 extern TAutoConsoleVariable<int32> CVarStreamingPoolSize;
 extern TAutoConsoleVariable<int32> CVarStreamingCheckBuildStatus;
diff --git a/Engine/Source/Runtime/Engine/Private/Tests/AnalyticsTest.cpp b/Engine/Source/Runtime/Engine/Private/Tests/AnalyticsTest.cpp
index 6deeb061bf59..65213a0c0db4 100644
--- a/Engine/Source/Runtime/Engine/Private/Tests/AnalyticsTest.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Tests/AnalyticsTest.cpp
@@ -58,8 +58,9 @@ bool FAnalyticStartUpSimTest::RunTest(const FString& Parameters)
 			FString FullAccountIDTestEventName = FString::Printf(TEXT("AccountID\":\"%s"), *AccountIDTest);
 			FString FullOSIDTestEventName = FString::Printf(TEXT("OSID\":\"%s"), *OSID);
 
-			for ( const FAutomationEvent& Event : ExecutionInfo.GetEvents() )
+			for ( const FAutomationExecutionEntry& Entry : ExecutionInfo.GetEntries() )
 			{
+				const FAutomationEvent& Event = Entry.Event;
 				if ( Event.Type == EAutomationEventType::Info && Event.Message.Contains(TEXT("Engine.AutomationTest.Analytics.ProgramStartedEvent")) )
 				{
 					const FString& Message = Event.Message;
diff --git a/Engine/Source/Runtime/Engine/Private/Tests/AutomationCommon.cpp b/Engine/Source/Runtime/Engine/Private/Tests/AutomationCommon.cpp
index 2c7f1a4976b5..535219c13599 100644
--- a/Engine/Source/Runtime/Engine/Private/Tests/AutomationCommon.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Tests/AutomationCommon.cpp
@@ -96,7 +96,7 @@ namespace AutomationCommon
 	{
 		FAutomationScreenshotData Data;
 
-		Data.Name = TestName;
+		Data.Name = FPaths::MakeValidFileName(TestName, TEXT('_'));
 		Data.Context = MapOrContext;
 		Data.Id = FGuid::NewGuid();
 		Data.Commit = FEngineVersion::Current().HasChangelist() ? FString::FromInt(FEngineVersion::Current().GetChangelist()) : FString(TEXT(""));
@@ -129,7 +129,7 @@ namespace AutomationCommon
 		// TBD - 
 		// Device's native resolution (we want to use a hardware dump of the frontbuffer at the native resolution so we compare what we actually output rather than what we think we rendered)
 
-		const FString MapAndTest = MapOrContext + TEXT("/") + TestName;
+		const FString MapAndTest = MapOrContext + TEXT("/") + Data.Name;
 		AutomationCommon::GetScreenshotPath(MapAndTest, Data.Path);
 
 		return Data;
diff --git a/Engine/Source/Runtime/Engine/Private/Tests/EngineAutomationTests.cpp b/Engine/Source/Runtime/Engine/Private/Tests/EngineAutomationTests.cpp
index 7d9660bf5084..13924fd83855 100644
--- a/Engine/Source/Runtime/Engine/Private/Tests/EngineAutomationTests.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Tests/EngineAutomationTests.cpp
@@ -408,7 +408,7 @@ bool FAutomationLogAddMessage::RunTest(const FString& Parameters)
 	AddInfo(TEXT("Test log message."));
 
 	//** VERIFY **//
-	TestEqual<FString>(TEXT("Test log message was not added to the ExecutionInfo.Log array."), ExecutionInfo.GetEvents().Last().Message, TEXT("Test log message."));
+	TestEqual<FString>(TEXT("Test log message was not added to the ExecutionInfo.Log array."), ExecutionInfo.GetEntries().Last().Event.Message, TEXT("Test log message."));
 	
 	//** TEARDOWN **//
 	// We have to empty this log array so that it doesn't show in the automation results window as it may cause confusion.
@@ -425,7 +425,7 @@ bool FAutomationLogAddWarning::RunTest(const FString& Parameters)
 	AddWarning(TEXT("Test warning message."));
 
 	//** VERIFY **//
-	FString CurrentWarningMessage = ExecutionInfo.GetEvents().Last().Message;
+	FString CurrentWarningMessage = ExecutionInfo.GetEntries().Last().Event.Message;
 	// The warnings array is emptied so that it doesn't cause a false positive warning for this test.
 	ExecutionInfo.RemoveAllEvents(EAutomationEventType::Warning);
 
@@ -442,7 +442,7 @@ bool FAutomationLogAddError::RunTest(const FString& Parameters)
 	AddError(TEXT("Test error message"));
 	
 	//** VERIFY **//
-	FString CurrentErrorMessage = ExecutionInfo.GetEvents().Last().Message;
+	FString CurrentErrorMessage = ExecutionInfo.GetEntries().Last().Event.Message;
 	// The errors array is emptied so that this doesn't cause a false positive failure for this test.
 	ExecutionInfo.RemoveAllEvents(EAutomationEventType::Error);
 
diff --git a/Engine/Source/Runtime/Engine/Private/Texture.cpp b/Engine/Source/Runtime/Engine/Private/Texture.cpp
index 23febf5b00dd..642f405f295a 100644
--- a/Engine/Source/Runtime/Engine/Private/Texture.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Texture.cpp
@@ -112,6 +112,10 @@ void UTexture::UpdateResource()
 	}
 }
 
+bool UTexture::IsPostLoadThreadSafe() const
+{
+	return false;
+}
 
 int32 UTexture::GetCachedLODBias() const
 {
diff --git a/Engine/Source/Runtime/Engine/Private/Texture2D.cpp b/Engine/Source/Runtime/Engine/Private/Texture2D.cpp
index c5adf70b7c0d..1ce952a82418 100644
--- a/Engine/Source/Runtime/Engine/Private/Texture2D.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Texture2D.cpp
@@ -274,7 +274,27 @@ void UTexture2D::InvalidateLastRenderTimeForStreaming()
 	}
 	TextureReference.InvalidateLastRenderTime();
 }
-
+int32 UTexture2D::CalcNumOptionalMips() const
+{
+	if (PlatformData)
+	{
+		int32 NumOptionalMips = 0;
+		for (int32 MipIndex = 0; MipIndex < PlatformData->Mips.Num(); ++MipIndex)
+		{
+			if (PlatformData->Mips[MipIndex].BulkData.GetBulkDataFlags() & BULKDATA_OptionalPayload)
+			{
+				++NumOptionalMips;
+			}
+			else
+			{
+				// currently the rules specify all the optional mips need to be at the end of hte mip chain
+				break;
+			}
+		}
+		return NumOptionalMips;
+	}
+	return 0;
+}
 int32 UTexture2D::GetNumResidentMips() const
 {
 	FTexture2DResource* Texture2DResource = (FTexture2DResource*)Resource;
@@ -526,13 +546,6 @@ FString UTexture2D::GetDesc()
 		);
 }
 
-bool UTexture2D::IsReadyForStreaming() const
-{
-	FTexture2DResource* Texture2DResource = (FTexture2DResource*)Resource;
-	return Texture2DResource && Texture2DResource->bReadyForStreaming;
-}
-
-
 void UTexture2D::WaitForStreaming()
 {
 	if (bIsStreamable)
diff --git a/Engine/Source/Runtime/Engine/Private/Texture2DDynamic.cpp b/Engine/Source/Runtime/Engine/Private/Texture2DDynamic.cpp
index 7b6a367dd1e2..1452deeab5f4 100644
--- a/Engine/Source/Runtime/Engine/Private/Texture2DDynamic.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Texture2DDynamic.cpp
@@ -36,12 +36,13 @@ uint32 FTexture2DDynamicResource::GetSizeY() const
 void FTexture2DDynamicResource::InitRHI()
 {
 	// Create the sampler state RHI resource.
+	ESamplerAddressMode SamplerAddressMode = Owner->SamplerAddressMode;
 	FSamplerStateInitializerRHI SamplerStateInitializer
 	(
 		(ESamplerFilter)UDeviceProfileManager::Get().GetActiveProfile()->GetTextureLODSettings()->GetSamplerFilter( Owner ),
-		AM_Wrap,
-		AM_Wrap,
-		AM_Wrap
+		SamplerAddressMode,
+		SamplerAddressMode,
+		SamplerAddressMode
 	);
 	SamplerStateRHI = RHICreateSamplerState( SamplerStateInitializer );
 
@@ -89,6 +90,7 @@ UTexture2DDynamic::UTexture2DDynamic(const FObjectInitializer& ObjectInitializer
 {
 	NeverStream = true;
 	Format = PF_B8G8R8A8;
+	SamplerAddressMode = AM_Wrap;
 }
 
 
@@ -119,15 +121,33 @@ float UTexture2DDynamic::GetSurfaceHeight() const
 	return SizeY;
 }
 
+UTexture2DDynamic* UTexture2DDynamic::Create(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat)
+{
+	FTexture2DDynamicCreateInfo CreateInfo(InFormat);
+
+	return Create(InSizeX, InSizeY, CreateInfo);
+}
+
 UTexture2DDynamic* UTexture2DDynamic::Create(int32 InSizeX, int32 InSizeY, EPixelFormat InFormat, bool InIsResolveTarget)
 {
-	EPixelFormat DesiredFormat = EPixelFormat(InFormat);
+	FTexture2DDynamicCreateInfo CreateInfo(InFormat, InIsResolveTarget);
+
+	return Create(InSizeX, InSizeY, CreateInfo);
+}
+
+UTexture2DDynamic* UTexture2DDynamic::Create(int32 InSizeX, int32 InSizeY, const FTexture2DDynamicCreateInfo& InCreateInfo)
+{
+	EPixelFormat DesiredFormat = EPixelFormat(InCreateInfo.Format);
 	if (InSizeX > 0 && InSizeY > 0 )
 	{
 		
 		auto NewTexture = NewObject<UTexture2DDynamic>(GetTransientPackage(), NAME_None, RF_Transient);
 		if (NewTexture != NULL)
 		{
+			NewTexture->Filter = InCreateInfo.Filter;
+			NewTexture->SamplerAddressMode = InCreateInfo.SamplerAddressMode;
+			NewTexture->SRGB = InCreateInfo.bSRGB;
+
 			// Disable compression
 			NewTexture->CompressionSettings		= TC_Default;
 #if WITH_EDITORONLY_DATA
@@ -136,9 +156,8 @@ UTexture2DDynamic* UTexture2DDynamic::Create(int32 InSizeX, int32 InSizeY, EPixe
 			NewTexture->CompressionNoAlpha		= true;
 			NewTexture->DeferCompression		= false;
 #endif // #if WITH_EDITORONLY_DATA
-			if ( InIsResolveTarget )
+			if ( InCreateInfo.bIsResolveTarget )
 			{
-//				NewTexture->SRGB				= false;
 				NewTexture->bNoTiling			= false;
 			}
 			else
@@ -147,7 +166,7 @@ UTexture2DDynamic* UTexture2DDynamic::Create(int32 InSizeX, int32 InSizeY, EPixe
 				NewTexture->bNoTiling			= true;
 			}
 
-			NewTexture->Init(InSizeX, InSizeY, DesiredFormat, InIsResolveTarget);
+			NewTexture->Init(InSizeX, InSizeY, DesiredFormat, InCreateInfo.bIsResolveTarget);
 		}
 		return NewTexture;
 	}
diff --git a/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp b/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp
index d8df6389493e..7d7a0168c83a 100644
--- a/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp
+++ b/Engine/Source/Runtime/Engine/Private/TextureDerivedData.cpp
@@ -1006,10 +1006,19 @@ static void SerializePlatformData(
 		}
 	}
 
+	TArray<uint32> BulkDataMipFlags;
+
 	// Force resident mips inline
 	if (bCooked && Ar.IsSaving())
 	{
+		BulkDataMipFlags.AddZeroed(PlatformData->Mips.Num());
+		for (int32 MipIndex = 0; MipIndex < PlatformData->Mips.Num(); ++MipIndex)
+		{
+			BulkDataMipFlags[MipIndex] = PlatformData->Mips[MipIndex].BulkData.GetBulkDataFlags();
+		}
+
 		int32 MinMipToInline = 0;
+		int32 OptionalMips = 0; // TODO: do we need to consider platforms saving texture assets as cooked files? all the info to calculate the optional is part of the editor only data
 		
 #if WITH_EDITORONLY_DATA
 		check(Ar.CookingTarget());
@@ -1022,9 +1031,23 @@ static void SerializePlatformData(
 #endif
 		{
 			MinMipToInline = FMath::Max(0, NumMips - PlatformData->GetNumNonStreamingMips());
+#if WITH_EDITORONLY_DATA
+			const int32 Width = PlatformData->SizeX;
+			const int32 Height = PlatformData->SizeY;
+			const int32 LODGroup = Texture->LODGroup;
+			const int32 LODBias = Texture->LODBias;
+			const int32 NumCinematicMipLevels = Texture->NumCinematicMipLevels;
+
+			OptionalMips = Ar.CookingTarget()->GetTextureLODSettings().CalculateNumOptionalMips(LODGroup, Width, Height, NumMips, MinMipToInline, Texture->MipGenSettings);
+#endif
 		}
 
-		for (int32 MipIndex = 0; MipIndex < NumMips && MipIndex < MinMipToInline; ++MipIndex)
+		for (int32 MipIndex = 0; MipIndex < NumMips && MipIndex < OptionalMips; ++MipIndex )
+		{
+			PlatformData->Mips[MipIndex + FirstMipToSerialize].BulkData.SetBulkDataFlags(BULKDATA_Force_NOT_InlinePayload| BULKDATA_OptionalPayload);
+		}
+
+		for (int32 MipIndex = OptionalMips; MipIndex < NumMips && MipIndex < MinMipToInline; ++MipIndex)
 		{
 			PlatformData->Mips[MipIndex + FirstMipToSerialize].BulkData.SetBulkDataFlags(BULKDATA_Force_NOT_InlinePayload);
 		}
@@ -1033,7 +1056,6 @@ static void SerializePlatformData(
 			PlatformData->Mips[MipIndex + FirstMipToSerialize].BulkData.SetBulkDataFlags(BULKDATA_ForceInlinePayload | BULKDATA_SingleUse);
 		}
 	}
-
 	Ar << NumMips;
 	if (Ar.IsLoading())
 	{
@@ -1048,6 +1070,14 @@ static void SerializePlatformData(
 	{
 		PlatformData->Mips[FirstMipToSerialize + MipIndex].Serialize(Ar, Texture, MipIndex);
 	}
+
+	for (int32 MipIndex = 0; MipIndex < BulkDataMipFlags.Num(); ++MipIndex)
+	{
+		check( Ar.IsSaving() );
+		PlatformData->Mips[MipIndex].BulkData.ClearBulkDataFlags(~BulkDataMipFlags[MipIndex]);
+		PlatformData->Mips[MipIndex].BulkData.SetBulkDataFlags(BulkDataMipFlags[MipIndex]);
+	}
+	
 }
 
 void FTexturePlatformData::Serialize(FArchive& Ar, UTexture* Owner)
@@ -1525,31 +1555,31 @@ void UTexture::SerializeCookedPlatformData(FArchive& Ar)
 			}
 			else
 			{
-			TMap<FString, FTexturePlatformData*> *CookedPlatformDataPtr = GetCookedPlatformData();
+				TMap<FString, FTexturePlatformData*> *CookedPlatformDataPtr = GetCookedPlatformData();
 				if (CookedPlatformDataPtr == NULL)
-				return;
+					return;
 
-			TArray<FName> PlatformFormats;
+				TArray<FName> PlatformFormats;
 
-			Ar.CookingTarget()->GetTextureFormats(this, PlatformFormats);
-			for (int32 FormatIndex = 0; FormatIndex < PlatformFormats.Num(); FormatIndex++)
-			{
-				FString DerivedDataKey;
-				BuildSettings.TextureFormatName = PlatformFormats[FormatIndex];
-				GetTextureDerivedDataKey(*this, BuildSettings, DerivedDataKey);
-
-				FTexturePlatformData *PlatformDataPtr = (*CookedPlatformDataPtr).FindRef(DerivedDataKey);
-				
-				if (PlatformDataPtr == NULL)
+				Ar.CookingTarget()->GetTextureFormats(this, PlatformFormats);
+				for (int32 FormatIndex = 0; FormatIndex < PlatformFormats.Num(); FormatIndex++)
 				{
-					PlatformDataPtr = new FTexturePlatformData();
-					PlatformDataPtr->Cache(*this, BuildSettings, ETextureCacheFlags::InlineMips | ETextureCacheFlags::Async, nullptr);
-					
+					FString DerivedDataKey;
+					BuildSettings.TextureFormatName = PlatformFormats[FormatIndex];
+					GetTextureDerivedDataKey(*this, BuildSettings, DerivedDataKey);
+
+					FTexturePlatformData *PlatformDataPtr = (*CookedPlatformDataPtr).FindRef(DerivedDataKey);
+
+					if (PlatformDataPtr == NULL)
+					{
+						PlatformDataPtr = new FTexturePlatformData();
+						PlatformDataPtr->Cache(*this, BuildSettings, ETextureCacheFlags::InlineMips | ETextureCacheFlags::Async, nullptr);
+
 						CookedPlatformDataPtr->Add(DerivedDataKey, PlatformDataPtr);
-					
+
+					}
+					PlatformDataToSerialize.Add(PlatformDataPtr);
 				}
-				PlatformDataToSerialize.Add(PlatformDataPtr);
-			}
 			}
 
 			for (int32 i = 0; i < PlatformDataToSerialize.Num(); ++i)
diff --git a/Engine/Source/Runtime/Engine/Private/TextureLODSettings.cpp b/Engine/Source/Runtime/Engine/Private/TextureLODSettings.cpp
index 723cdc460657..99f8a356d9f2 100644
--- a/Engine/Source/Runtime/Engine/Private/TextureLODSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/TextureLODSettings.cpp
@@ -49,6 +49,8 @@ void FTextureLODGroup::SetupGroup()
 	MinLODMipCount = FMath::CeilLogTwo(MinLODSize);
 	MaxLODMipCount = FMath::CeilLogTwo(MaxLODSize);
 
+	OptionalMaxLODMipCount = FMath::CeilLogTwo(OptionalMaxLODSize);
+
 	// Linear filtering
 	if (MinMagFilter == NAME_Linear)
 	{
@@ -158,6 +160,25 @@ int32 UTextureLODSettings::CalculateLODBias(int32 Width, int32 Height, int32 Max
 	return UsedLODBias;
 }
 
+int32 UTextureLODSettings::CalculateNumOptionalMips(int32 LODGroup, const int32 Width, const int32 Height, const int32 NumMips, const int32 MinMipToInline, TextureMipGenSettings InMipGenSetting) const
+{
+	// shouldn't need to call this client side, this is calculated at save texture time
+	check( FPlatformProperties::RequiresCookedData() == false);
+
+	const FTextureLODGroup& LODGroupInfo = TextureLODGroups[LODGroup];
+
+	const TextureMipGenSettings& FinalMipGenSetting = (InMipGenSetting == TMGS_FromTextureGroup) ? (TextureMipGenSettings)LODGroupInfo.MipGenSettings : InMipGenSetting;
+	if ( FinalMipGenSetting == TMGS_NoMipmaps)
+	{
+		return 0;
+	}
+
+	int32 OptionalLOD = FMath::Min(LODGroupInfo.OptionalMaxLODMipCount+1, NumMips);
+
+	int32 NumOptionalMips = FMath::Min(NumMips - (OptionalLOD - LODGroupInfo.OptionalLODBias), MinMipToInline);
+	return NumOptionalMips;
+}
+
 /**
 * TextureLODGroups access with bounds check
 *
diff --git a/Engine/Source/Runtime/Engine/Private/TextureRenderTarget2D.cpp b/Engine/Source/Runtime/Engine/Private/TextureRenderTarget2D.cpp
index 0dbf62c00dff..fb42942735ea 100644
--- a/Engine/Source/Runtime/Engine/Private/TextureRenderTarget2D.cpp
+++ b/Engine/Source/Runtime/Engine/Private/TextureRenderTarget2D.cpp
@@ -117,6 +117,35 @@ void UTextureRenderTarget2D::InitAutoFormat(uint32 InSizeX, uint32 InSizeY)
 	UpdateResource();
 }
 
+void UTextureRenderTarget2D::ResizeTarget(uint32 InSizeX, uint32 InSizeY)
+{
+	if (SizeX != InSizeX || SizeY != InSizeY)
+	{
+		SizeX = InSizeX;
+		SizeY = InSizeY;
+
+		if (Resource)
+		{
+			ENQUEUE_UNIQUE_RENDER_COMMAND_THREEPARAMETER(
+				ResizeRenderTarget,
+				FTextureRenderTarget2DResource*, Resource, static_cast<FTextureRenderTarget2DResource*>(Resource),
+				int32, NewSizeX, SizeX,
+				int32, NewSizeY, SizeY,
+				{
+					Resource->Resize(NewSizeX, NewSizeY);
+					Resource->UpdateDeferredResource(RHICmdList, true);
+				}
+			);
+
+
+		}
+		else
+		{
+			UpdateResource();
+		}
+	}
+}
+
 void UTextureRenderTarget2D::UpdateResourceImmediate(bool bClearRenderTarget/*=true*/)
 {
 	if (Resource)
@@ -494,6 +523,16 @@ void FTextureRenderTarget2DResource::UpdateDeferredResource( FRHICommandListImme
 	RHICmdList.CopyToResolveTarget(RenderTargetTextureRHI, TextureRHI, FResolveParams());
 }
 
+void FTextureRenderTarget2DResource::Resize(int32 NewSizeX, int32 NewSizeY)
+{
+	if (TargetSizeX != NewSizeX || TargetSizeY != NewSizeY)
+	{
+		TargetSizeX = NewSizeX;
+		TargetSizeY = NewSizeY;
+		UpdateRHI();
+	}
+}
+
 /** 
  * @return width of target
  */
diff --git a/Engine/Source/Runtime/Engine/Private/TickTaskManager.cpp b/Engine/Source/Runtime/Engine/Private/TickTaskManager.cpp
index bd73db3dfd3e..b6039ada5249 100644
--- a/Engine/Source/Runtime/Engine/Private/TickTaskManager.cpp
+++ b/Engine/Source/Runtime/Engine/Private/TickTaskManager.cpp
@@ -1602,6 +1602,7 @@ FTickFunction::FTickFunction()
 	, ActualEndTickGroup(TG_PrePhysics)
 	, bTickEvenWhenPaused(false)
 	, bCanEverTick(false)
+	, bStartWithTickEnabled(false)
 	, bAllowTickOnDedicatedServer(true)
 	, bHighPriority(false)
 	, bRunOnAnyThread(false)
diff --git a/Engine/Source/Runtime/Engine/Private/Timeline.cpp b/Engine/Source/Runtime/Engine/Private/Timeline.cpp
index d4ec1735f3e8..bd372ff1129f 100644
--- a/Engine/Source/Runtime/Engine/Private/Timeline.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Timeline.cpp
@@ -954,3 +954,9 @@ void UTimelineComponent::GetAllCurves(TSet<class UCurveBase*>& InOutCurves) cons
 {
 	TheTimeline.GetAllCurves(InOutCurves);
 }
+
+
+bool UTimelineComponent::IsPostLoadThreadSafe() const
+{
+	return true;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Private/UnrealClient.cpp b/Engine/Source/Runtime/Engine/Private/UnrealClient.cpp
index e12e00837653..472f6238b382 100644
--- a/Engine/Source/Runtime/Engine/Private/UnrealClient.cpp
+++ b/Engine/Source/Runtime/Engine/Private/UnrealClient.cpp
@@ -20,7 +20,6 @@
 #include "EditorSupportDelegates.h"
 #include "HighResScreenshot.h"
 #include "GameFramework/GameUserSettings.h"
-#include "DynamicResolutionState.h"
 #include "HModel.h"
 #include "Framework/Notifications/NotificationManager.h"
 #include "Widgets/Notifications/SNotificationList.h"
@@ -412,22 +411,11 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 	RawRenderThreadTime = FPlatformTime::ToMilliseconds(GRenderThreadTime);
 	RenderThreadTime = 0.9 * RenderThreadTime + 0.1 * RawRenderThreadTime;
 
-	float RawResolutionFraction = -1.0f;
-	float RawMaxResolutionFraction = 1.0f;
-	EDynamicResolutionStatus DynamicResolutionStatus = GEngine->GetDynamicResolutionStatus();
-	if (DynamicResolutionStatus == EDynamicResolutionStatus::Enabled)
-	{
-		const IDynamicResolutionState* DynResState = GEngine->GetDynamicResolutionState();
-		if (DynResState->IsSupported())
-		{
-			RawResolutionFraction = DynResState->GetResolutionFractionApproximation();
-			RawMaxResolutionFraction = DynResState->GetResolutionFractionUpperBound();
-		}
-		else
-		{
-			DynamicResolutionStatus = EDynamicResolutionStatus::Disabled;
-		}
-	}
+	RawRHITTime = FPlatformTime::ToMilliseconds(GRHIThreadTime);
+	RHITTime = 0.9 * RHITTime + 0.1 * RawRHITTime;
+
+	FDynamicResolutionStateInfos DynamicResolutionStateInfos;
+	GEngine->GetDynamicResolutionCurrentStateInfos(/* out */ DynamicResolutionStateInfos);
 
 	/** Number of milliseconds the GPU was busy last frame. */
 	const uint32 GPUCycles = RHIGetGPUFrameCycles();
@@ -436,15 +424,17 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 
 	SET_FLOAT_STAT(STAT_UnitFrame, FrameTime);
 	SET_FLOAT_STAT(STAT_UnitRender, RenderThreadTime);
+	SET_FLOAT_STAT(STAT_UnitRHIT, RHITTime);
 	SET_FLOAT_STAT(STAT_UnitGame, GameThreadTime);
 	SET_FLOAT_STAT(STAT_UnitGPU, GPUFrameTime);
 
-	GEngine->SetAverageUnitTimes(FrameTime, RenderThreadTime, GameThreadTime, GPUFrameTime);
+	GEngine->SetAverageUnitTimes(FrameTime, RenderThreadTime, GameThreadTime, GPUFrameTime, RHITTime);
 
 	float Max_RenderThreadTime = 0.0f;
 	float Max_GameThreadTime = 0.0f;
 	float Max_GPUFrameTime = 0.0f;
 	float Max_FrameTime = 0.0f;
+	float Max_RHITTime = 0.0f;
 
 	const bool bShowUnitMaxTimes = InViewport->GetClient() ? InViewport->GetClient()->IsStatEnabled(TEXT("UnitMax")) : false;
 #if !UE_BUILD_SHIPPING
@@ -453,7 +443,8 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 	GameThreadTimes[CurrentIndex] = bShowRawUnitTimes ? RawGameThreadTime : GameThreadTime;
 	GPUFrameTimes[CurrentIndex] = bShowRawUnitTimes ? RawGPUFrameTime : GPUFrameTime;
 	FrameTimes[CurrentIndex] = bShowRawUnitTimes ? RawFrameTime : FrameTime;
-	ResolutionFractions[CurrentIndex] = RawResolutionFraction;
+	RHITTimes[CurrentIndex] = bShowRawUnitTimes ? RawRHITTime : RHITTime;
+	ResolutionFractions[CurrentIndex] = DynamicResolutionStateInfos.ResolutionFractionApproximation;
 	CurrentIndex++;
 	if (CurrentIndex == NumberOfSamples)
 	{
@@ -481,6 +472,10 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 			{
 				Max_FrameTime = FrameTimes[MaxIndex];
 			}
+			if (Max_RHITTime < RHITTimes[MaxIndex])
+			{
+				Max_RHITTime = RHITTimes[MaxIndex];
+			}
 		}
 	}
 #endif // #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
@@ -585,23 +580,91 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 			}
 			InY += RowHeight;
 		}
-
 		{
-			InCanvas->DrawShadowedString(X1, InY, TEXT("DynRes:"), Font, bShowUnitTimeGraph ? FColor(255, 160, 100) : FColor::White);
-			if (DynamicResolutionStatus != EDynamicResolutionStatus::Enabled)
+			const FColor RenderThreadAverageColor = GEngine->GetFrameTimeDisplayColor(RHITTime);
+			InCanvas->DrawShadowedString(X1, InY, TEXT("RHIT:"), Font, bShowUnitTimeGraph ? FColor(255, 100, 255) : FColor::White);
+			InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%3.2f ms"), RHITTime), Font, RenderThreadAverageColor);
+			if (bShowUnitMaxTimes)
 			{
-				InCanvas->DrawShadowedString(X2, InY,
-					DynamicResolutionStatus == EDynamicResolutionStatus::Paused ? TEXT("Paused") : TEXT("OFF"),
-					Font, FColor(160, 160, 160));
+				const FColor RenderThreadMaxColor = GEngine->GetFrameTimeDisplayColor(Max_RHITTime);
+				InCanvas->DrawShadowedString(X3, InY, *FString::Printf(TEXT("%4.2f ms"), Max_RHITTime), Font, RenderThreadMaxColor);
+			}
+			InY += RowHeight;
+		}
+		{
+			uint64 MemoryUsed = FPlatformMemory::GetMemoryUsedFast();
+			if (MemoryUsed > 0)
+			{
+				// print out currently used memory
+				InCanvas->DrawShadowedString(X1, InY, TEXT("Mem:"), Font, bShowUnitTimeGraph ? FColor(100, 100, 255) : FColor::White);
+				double MemInGb = MemoryUsed / (1024.0 * 1024.0 * 1024.0);
+				double MemInMb = MemoryUsed / (1024.0 * 1024.0);
+				InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%3.2f%s"), MemInGb > 1.0 ? MemInGb : MemInMb, MemInGb > 1.0 ? TEXT("GB") : TEXT("MB")), Font, FColor::Green);
+				InY += RowHeight;
+			}
+		}
+
+		ERHIFeatureLevel::Type FeatureLevel = InCanvas->GetFeatureLevel();
+		if (FeatureLevel >= ERHIFeatureLevel::SM4)
+		{
+			float ResolutionFraction = DynamicResolutionStateInfos.ResolutionFractionApproximation;
+			float ScreenPercentage = ResolutionFraction * 100.0f;
+
+			InCanvas->DrawShadowedString(X1, InY, TEXT("DynRes:"), Font, bShowUnitTimeGraph ? FColor(255, 160, 100) : FColor::White);
+			if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Enabled)
+			{
+				FColor Color = (ResolutionFraction < AlertResolutionFraction) ? FColor::Red : ((ResolutionFraction < FMath::Min(ResolutionFraction * 0.97f, 1.0f)) ? FColor::Yellow : FColor::Green);
+				InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%3.1f%% x %3.1f%%"), ScreenPercentage, ScreenPercentage), Font, Color);
+			}
+			else if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::DebugForceEnabled)
+			{
+				InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%3.1f%% x %3.1f%%"), ScreenPercentage, ScreenPercentage), Font, FColor::Magenta);
+			}
+			else if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Paused)
+			{
+				InCanvas->DrawShadowedString(X2, InY, TEXT("Paused"), Font, FColor::Magenta);
+			}
+			else if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Disabled)
+			{
+				InCanvas->DrawShadowedString(X2, InY, TEXT("OFF"), Font, FColor(160, 160, 160));
+			}
+			else if (DynamicResolutionStateInfos.Status == EDynamicResolutionStatus::Unsupported)
+			{
+				InCanvas->DrawShadowedString(X2, InY, TEXT("Unsupported"), Font, FColor(160, 160, 160));
 			}
 			else
 			{
-				float ScreenPercentage = RawResolutionFraction * 100.0f;
-				FColor Color = (RawResolutionFraction < AlertResolutionFraction) ? FColor::Red : ((RawResolutionFraction < FMath::Min(RawMaxResolutionFraction * 0.97f, 1.0f)) ? FColor::Yellow : FColor::Green);
-				InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%3.1f%% x %3.1f%%"), ScreenPercentage, ScreenPercentage), Font, Color);
+				check(0);
 			}
 			InY += RowHeight;
 		}
+		else // Mobile
+		{
+			// Draw calls
+			{
+				int32 NumDrawCalls = GNumDrawCallsRHI;
+				InCanvas->DrawShadowedString(X1, InY, TEXT("Draws:"), Font, bShowUnitTimeGraph ? FColor(100, 100, 255) : FColor::White);
+				InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%d"), NumDrawCalls), Font, FColor::Green);
+				InY += RowHeight;
+			}
+			
+			// Primitives
+			{
+				int32 NumPrimitives = GNumPrimitivesDrawnRHI;
+				InCanvas->DrawShadowedString(X1, InY, TEXT("Prims:"), Font, bShowUnitTimeGraph ? FColor(100, 100, 255) : FColor::White);
+				if (NumPrimitives < 10000)
+				{
+					InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%d"), NumPrimitives), Font, FColor::Green);
+				}
+				else
+				{
+					float NumPrimitivesK = NumPrimitives/1000.f;
+					InCanvas->DrawShadowedString(X2, InY, *FString::Printf(TEXT("%.1fK"), NumPrimitivesK), Font, FColor::Green);
+				}
+				
+				InY += RowHeight;
+			}
+		}
 	}
 
 #if !UE_BUILD_SHIPPING
@@ -622,6 +685,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 			EGS_Game,
 			EGS_GPU,
 			EGS_Frame,
+			EGS_RHIT,
 			EGS_UnboundedHighValueCount,
 
 			EGS_DynRes = EGS_UnboundedHighValueCount,
@@ -638,11 +702,17 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 		const float AlertTimeMS = TargetTimeMS;
 
 		// Graph layout
-		const float GraphBackgroundMarginSize = 8.0f;
+		const float GraphHeight = (bSmallGraph ? 120.0f : 350.0f);
+#if PLATFORM_ANDROID || PLATFORM_IOS
+		const float GraphLeftXPos = 20.0f;
+		const float GraphBottomYPos = GraphHeight + 80.0f;
+#else
 		const float GraphLeftXPos = 80.0f;
 		const float GraphBottomYPos = InViewport->GetSizeXY().Y / InCanvas->GetDPIScale() - 50.0f;
+#endif
+
+		const float GraphBackgroundMarginSize = 8.0f;
 		const float GraphHorizPixelsPerFrame = (bSmallGraph ? 1.0f : 2.0f);
-		const float GraphHeight = (bSmallGraph ? 120.0f : 350.0f);
 
 		const float TargetTimeMSHeight = GraphHeight * 0.85f;
 		const float	MaxDynresTargetTimeMSHeight = TargetTimeMSHeight * 0.75f;
@@ -656,7 +726,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 		const float GraphVerticalPixelsPerMS = TargetTimeMSHeight / TargetTimeMS;
 
 		// Scale dyn res so that RawMaxResolutionFraction is at MaxDynresTargetTimeMSHeight or below.
-		const float GraphVerticalPixelsPerResolutionFraction = FMath::Min(100.0f, MaxDynresTargetTimeMSHeight / (RawMaxResolutionFraction * RawMaxResolutionFraction));
+		const float GraphVerticalPixelsPerResolutionFraction = FMath::Min(100.0f, MaxDynresTargetTimeMSHeight / (DynamicResolutionStateInfos.ResolutionFractionUpperBound * DynamicResolutionStateInfos.ResolutionFractionUpperBound));
 
 		// Compute pulse effect for lines above alert threshold
 		const float AlertPulseFreq = 8.0f;
@@ -732,7 +802,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 			const FLinearColor LineColor(0.2f, 0.1f, 0.02f);
 			FVector StartPos(
 				GraphLeftXPos - 1.0f,
-				GraphBottomYPos - GraphVerticalPixelsPerResolutionFraction * RawMaxResolutionFraction * RawMaxResolutionFraction,
+				GraphBottomYPos - GraphVerticalPixelsPerResolutionFraction * DynamicResolutionStateInfos.ResolutionFractionUpperBound  * DynamicResolutionStateInfos.ResolutionFractionUpperBound ,
 				0.0f);
 			FVector EndPos(
 				GraphLeftXPos + GraphHorizPixelsPerFrame * NumberOfSamples + GraphBackgroundMarginSize,
@@ -745,7 +815,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 				LineColor,
 				HitProxyId);
 
-			float MaxScreenPercentage = RawMaxResolutionFraction * 100.0f;
+			float MaxScreenPercentage = DynamicResolutionStateInfos.ResolutionFractionUpperBound  * 100.0f;
 			InCanvas->DrawShadowedString(
 				EndPos.X + 4.0f,
 				EndPos.Y - AlertPrintHeight / 2,
@@ -753,7 +823,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 		}
 
 		// Screen percentage = 100% native line
-		if (RawMaxResolutionFraction > 1.0f)
+		if (DynamicResolutionStateInfos.ResolutionFractionUpperBound > 1.0f)
 		{
 			const FLinearColor LineColor(0.2f, 0.1f, 0.02f);
 			FVector StartPos(
@@ -771,7 +841,7 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 				LineColor,
 				HitProxyId);
 
-			if (GraphVerticalPixelsPerResolutionFraction * (RawMaxResolutionFraction * RawMaxResolutionFraction - 1.0f) >= AlertPrintHeight)
+			if (GraphVerticalPixelsPerResolutionFraction * (DynamicResolutionStateInfos.ResolutionFractionUpperBound  * DynamicResolutionStateInfos.ResolutionFractionUpperBound  - 1.0f) >= AlertPrintHeight)
 			{
 				InCanvas->DrawShadowedString(EndPos.X + 4.0f, EndPos.Y - AlertPrintHeight / 2, TEXT("100.0% x 100.0% (native)"), SmallFont, LineColor);
 			}
@@ -853,6 +923,13 @@ int32 FStatUnitData::DrawStat(FViewport* InViewport, FCanvas* InCanvas, int32 In
 				StatColor = FLinearColor(0.1f, 1.0f, 0.1f);		// Green
 				break;
 
+			case EGS_RHIT:
+				AbsoluteAlertValueThreshold = AlertTimeMS;
+				Values = RHITTimes.GetData();
+				GraphVerticalPixelPerValue = GraphVerticalPixelsPerMS;
+				StatColor = FLinearColor(1.0f, 0.1f, 1.0f);		// Green
+				break;
+
 			case EGS_DynRes:
 				AbsoluteAlertValueThreshold = AlertResolutionFraction;
 				RelativeAlertValueThreshold = 0.05;
diff --git a/Engine/Source/Runtime/Engine/Private/UnrealEngine.cpp b/Engine/Source/Runtime/Engine/Private/UnrealEngine.cpp
index f71cef16431a..7ede3a201605 100644
--- a/Engine/Source/Runtime/Engine/Private/UnrealEngine.cpp
+++ b/Engine/Source/Runtime/Engine/Private/UnrealEngine.cpp
@@ -8,6 +8,7 @@ UnrealEngine.cpp: Implements the UEngine class and helpers.
 #include "UObject/GCObject.h"
 #include "Misc/IQueuedWork.h"
 #include "HAL/RunnableThread.h"
+#include "HAL/ThreadHeartBeat.h"
 #include "RHI.h"
 #include "Widgets/SWidget.h"
 #include "UnrealClient.h"
@@ -113,6 +114,8 @@ UnrealEngine.cpp: Implements the UEngine class and helpers.
 #include "Sound/ReverbEffect.h"
 #include "AudioDevice.h"
 #include "Animation/SkeletalMeshActor.h"
+#include "Animation/AnimSequence.h"
+#include "Animation/AnimCompress.h"
 #include "Engine/Canvas.h"
 #include "GameFramework/HUD.h"
 #include "GameFramework/Character.h"
@@ -133,7 +136,7 @@ UnrealEngine.cpp: Implements the UEngine class and helpers.
 #include "Components/TextRenderComponent.h"
 #include "Sound/AudioSettings.h"
 #include "Streaming/Texture2DUpdate.h"
-
+#include "Rendering/SkeletalMeshRenderData.h"
 
 #if WITH_EDITOR
 #include "Settings/LevelEditorPlaySettings.h"
@@ -184,7 +187,6 @@ UnrealEngine.cpp: Implements the UEngine class and helpers.
 #include "Performance/EnginePerformanceTargets.h"
 
 #include "InstancedReferenceSubobjectHelper.h"
-#include "Engine/EndUserSettings.h"
 
 #include "Engine/LODActor.h"
 #include "Engine/AssetManager.h"
@@ -295,11 +297,23 @@ static FAutoConsoleVariableRef CVARShowMaterialDrawEvents(
 );
 #endif
 
+#if !UE_BUILD_SHIPPING && WITH_DYNAMIC_RESOLUTION
+static TAutoConsoleVariable<float> CVarForceDynamicResScreenPercentage(
+	TEXT("r.DynamicRes.TestScreenPercentage"),
+	0,
+	TEXT("Forces the screen percentage to a particular value with dynamic res.\n")
+	TEXT(" 0: Disabled (default); > 0: Screen percentage is enabled.\n"),
+	ECVF_Default | ECVF_RenderThreadSafe);
+#endif
+
+
 ENGINE_API uint32 GGPUFrameTime = 0;
 
 /** System resolution instance */
 FSystemResolution GSystemResolution;
 
+ENGINE_API int32 GUnbuiltHLODCount = 0;
+
 TAutoConsoleVariable<int32> CVarAllowOneFrameThreadLag(
 	TEXT("r.OneFrameThreadLag"),
 	1,
@@ -414,11 +428,27 @@ void ScalabilityCVarsSinkCallback()
 
 	{
 		static const auto ViewDistanceScale = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale"));
-		static const auto ViewDistanceScale_NoScalability = ConsoleMan.FindTConsoleVariableDataFloat( TEXT( "r.ViewDistanceScaleNoScalability" ) );
-		LocalScalabilityCVars.ViewDistanceScale = FMath::Max(ViewDistanceScale->GetValueOnGameThread() * ViewDistanceScale_NoScalability->GetValueOnGameThread(), 0.0f);
+		static const auto ApplySecondaryViewDistanceScale = ConsoleMan.FindTConsoleVariableDataInt(TEXT("r.ViewDistanceScale.ApplySecondaryScale"));
+		static const auto SecondaryViewDistanceScale = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale.SecondaryScale"));
+		bool bApplySecondary = (ApplySecondaryViewDistanceScale->GetValueOnGameThread() > 0);
+		LocalScalabilityCVars.ViewDistanceScale = FMath::Max(ViewDistanceScale->GetValueOnGameThread(), 0.0f);
+		LocalScalabilityCVars.ViewDistanceScale *= bApplySecondary ? FMath::Max(SecondaryViewDistanceScale->GetValueOnGameThread(), 0.0f) : 1.0f;
 		LocalScalabilityCVars.ViewDistanceScaleSquared = FMath::Square(LocalScalabilityCVars.ViewDistanceScale);
 	}
 
+	{
+		static const auto FieldOfViewMinAngle = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale.FieldOfViewMinAngle"));
+		static const auto FieldOfViewMinAngleScale = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale.FieldOfViewMinAngleScale"));
+		static const auto FieldOfViewMaxAngle = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale.FieldOfViewMaxAngle"));
+		static const auto FieldOfViewMaxAngleScale = ConsoleMan.FindTConsoleVariableDataFloat(TEXT("r.ViewDistanceScale.FieldOfViewMaxAngleScale"));
+		static const auto FieldOfViewAffectsHLOD = ConsoleMan.FindTConsoleVariableDataInt(TEXT("r.ViewDistanceScale.FieldOfViewAffectsHLOD"));
+		LocalScalabilityCVars.FieldOfViewMinAngle = FMath::Clamp(FieldOfViewMinAngle->GetValueOnGameThread(), 0.0f, 360.f);
+		LocalScalabilityCVars.FieldOfViewMinAngleScale = FMath::Max(FieldOfViewMinAngleScale->GetValueOnGameThread(), 0.0f);
+		LocalScalabilityCVars.FieldOfViewMaxAngle = FMath::Clamp(FieldOfViewMaxAngle->GetValueOnGameThread(), 0.0f, 360.f);
+		LocalScalabilityCVars.FieldOfViewMaxAngleScale = FMath::Max(FieldOfViewMaxAngleScale->GetValueOnGameThread(), 0.0f);
+		LocalScalabilityCVars.FieldOfViewAffectsHLOD = FieldOfViewAffectsHLOD->GetValueOnGameThread() != 0 ? 1 : 0;
+	}
+
 	{
 		static const auto MaterialQualityLevelVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.MaterialQualityLevel"));
 		LocalScalabilityCVars.MaterialQualityLevel = (EMaterialQualityLevel::Type)FMath::Clamp(MaterialQualityLevelVar->GetValueOnGameThread(), 0, (int32)EMaterialQualityLevel::Num - 1);
@@ -564,6 +594,9 @@ void SystemResolutionSinkCallback()
 			GSystemResolution.bForceRefresh = false;
 			GHDROutputEnabled = bHDROutputEnabled;
 
+			// tell anyone listening about the change
+			FCoreDelegates::OnSystemResolutionChanged.Broadcast(ResX, ResY);
+
 			if(GEngine && GEngine->GameViewport && GEngine->GameViewport->ViewportFrame)
 			{
 				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Resizing viewport due to setres change, %d x %d"), ResX, ResY);
@@ -1322,8 +1355,7 @@ void UEngine::Init(IEngineLoop* InEngineLoop)
 
 	// Make sure networking checksum has access to project version
 	const UGeneralProjectSettings& ProjectSettings = *GetDefault<UGeneralProjectSettings>();
-	FNetworkVersion::bHasCachedNetworkChecksum = false;
-	FNetworkVersion::ProjectVersion = ProjectSettings.ProjectVersion;
+	FNetworkVersion::SetProjectVersion(*ProjectSettings.ProjectVersion);
 
 #if !(UE_BUILD_SHIPPING) || ENABLE_PGO_PROFILE
 	// Optionally Exec an exec file
@@ -3188,6 +3220,54 @@ struct FCompareFSortedSkeletalMesh
 	}
 };
 
+/**
+* Helper structure for sorting anims by relative cost.
+*/
+struct FSortedAnimAsset
+{
+	int32		NumKB;
+	int32		MaxKB;
+	int32		ResKBExc;
+	int32		ResKBInc;
+	FName		AnimAssetType;
+	FString		Name;
+	int32		NumKeys;
+	float		SequenceLength;
+	float		RateScale;
+	int32		NumCurves;
+	FString		TranslationFormat;
+	FString		RotationFormat;
+	FString		ScaleFormat;
+
+	FSortedAnimAsset(int32 InNumKB, int32 InMaxKB, int32 InResKBExc, int32 InResKBInc, FName InAnimAssetType, FString InName, int32 InNumKeys, float InSequenceLength, float InRateScale, int32 InNumCurves, FString InTranslationFormat, FString InRotationFormat, FString InScaleFormat)
+		: NumKB(InNumKB)
+		, MaxKB(InMaxKB)
+		, ResKBExc(InResKBExc)
+		, ResKBInc(InResKBInc)
+		, AnimAssetType(InAnimAssetType)
+		, Name(InName)
+		, NumKeys(InNumKeys)
+		, SequenceLength(InSequenceLength)
+		, RateScale(InRateScale)
+		, NumCurves(InNumCurves)
+		, TranslationFormat(InTranslationFormat)
+		, RotationFormat(InRotationFormat)
+		, ScaleFormat(InScaleFormat)
+	{}
+};
+struct FCompareFSortedAnimAsset
+{
+	bool bAlphaSort;
+	FCompareFSortedAnimAsset(bool InAlphaSort)
+		: bAlphaSort(InAlphaSort)
+	{}
+	FORCEINLINE bool operator()(const FSortedAnimAsset& A, const FSortedAnimAsset& B) const
+	{
+		return bAlphaSort ? (A.Name < B.Name) : ((B.NumKB + B.ResKBExc) < (A.NumKB + A.ResKBExc));
+	}
+};
+
+
 /** Helper struct for sorting anim sets by size */
 struct FSortedSet
 {
@@ -3211,7 +3291,6 @@ struct FCompareFSortedSet
 	}
 };
 
-#if !UE_BUILD_SHIPPING
 struct FSortedParticleSet
 {
 	FString Name;
@@ -3279,7 +3358,6 @@ struct FCompareFSortedParticleSet
 	}
 };
 
-#endif
 
 static void ShowSubobjectGraph( FOutputDevice& Ar, UObject* CurrentObject, const FString& IndentString )
 {
@@ -3697,6 +3775,10 @@ bool UEngine::Exec( UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar )
 	{
 		return HandleListSkeletalMeshesCommand(Cmd, Ar);
 	}
+	else if (FParse::Command(&Cmd, TEXT("LISTANIMS")))
+	{
+		return HandleListAnimsCommand( Cmd, Ar );
+	}
 	else if(FParse::Command(&Cmd,TEXT("REMOTETEXTURESTATS")))
 	{
 		return HandleRemoteTextureStatsCommand( Cmd, Ar );
@@ -4579,23 +4661,47 @@ bool UEngine::HandleListTexturesCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 
 	// Collect textures.
 	TArray<FSortedTexture> SortedTextures;
-	for( TObjectIterator<UTexture2D> It; It; ++It )
+	for( TObjectIterator<UTexture> It; It; ++It )
 	{
-		UTexture2D*			Texture				= *It;
+		UTexture*			Texture				= *It;
+		UTexture2D*			Texture2D			= Cast<UTexture2D>(Texture);
+		UTextureCube*		TextureCube			= Cast<UTextureCube>(Texture);
+
 		int32				LODGroup			= Texture->LODGroup;
-		int32				NumMips				= Texture->GetNumMips();
-		int32				MaxResLODBias		 = NumMips - Texture->GetNumMipsAllowed(false);
-		int32				MaxAllowedSizeX		= FMath::Max<int32>(Texture->GetSizeX() >> MaxResLODBias, 1);
-		int32				MaxAllowedSizeY		= FMath::Max<int32>(Texture->GetSizeY() >> MaxResLODBias, 1);
-		EPixelFormat		Format				= Texture->GetPixelFormat();
-		int32				DroppedMips			= Texture->GetNumMips() - Texture->GetNumResidentMips();
-		int32				CurSizeX			= FMath::Max<int32>(Texture->GetSizeX() >> DroppedMips, 1);
-		int32				CurSizeY			= FMath::Max<int32>(Texture->GetSizeY() >> DroppedMips, 1);
-		bool			bIsStreamingTexture		= Texture->GetStreamingIndex() != INDEX_NONE;
-		int32				MaxAllowedSize		= Texture->CalcTextureMemorySizeEnum( TMC_AllMipsBiased );
-		int32				CurrentSize			= Texture->CalcTextureMemorySizeEnum( TMC_ResidentMips );
-		int32				UsageCount			= TextureToUsageMap.FindRef( Texture );
-		bool				bIsForced			= Texture->ShouldMipLevelsBeForcedResident() && bIsStreamingTexture;
+		int32				NumMips				= 0;
+		int32				MaxResLODBias		= 0;
+		int32				MaxAllowedSizeX		= 0;
+		int32				MaxAllowedSizeY		= 0;
+		EPixelFormat		Format				= PF_Unknown;
+		int32				DroppedMips			= 0;
+		int32				CurSizeX			= 0;
+		int32				CurSizeY			= 0;
+		bool				bIsStreamingTexture = false;
+		int32				MaxAllowedSize		= Texture->CalcTextureMemorySizeEnum(TMC_AllMipsBiased);
+		int32				CurrentSize			= Texture->CalcTextureMemorySizeEnum(TMC_ResidentMips);
+		int32				UsageCount			= 0;
+		bool				bIsForced			= false;
+
+		if (Texture2D != nullptr)
+		{
+			NumMips				= Texture2D->GetNumMips();
+			MaxResLODBias		= NumMips - Texture2D->GetNumMipsAllowed(false);
+			MaxAllowedSizeX		= FMath::Max<int32>(Texture2D->GetSizeX() >> MaxResLODBias, 1);
+			MaxAllowedSizeY		= FMath::Max<int32>(Texture2D->GetSizeY() >> MaxResLODBias, 1);
+			Format				= Texture2D->GetPixelFormat();
+			DroppedMips			= Texture2D->GetNumMips() - Texture2D->GetNumResidentMips();
+			CurSizeX			= FMath::Max<int32>(Texture2D->GetSizeX() >> DroppedMips, 1);
+			CurSizeY			= FMath::Max<int32>(Texture2D->GetSizeY() >> DroppedMips, 1);
+			bIsStreamingTexture = Texture2D->GetStreamingIndex() != INDEX_NONE;
+			UsageCount			= TextureToUsageMap.FindRef(Texture2D);
+			bIsForced			= Texture2D->ShouldMipLevelsBeForcedResident() && bIsStreamingTexture;
+		}
+		else if (TextureCube != nullptr)
+		{
+			NumMips				= TextureCube->GetNumMips();
+			Format				= TextureCube->GetPixelFormat();
+		}
+
 
 		if( (bShouldOnlyListStreaming && bIsStreamingTexture) ||	
 			(bShouldOnlyListNonStreaming && !bIsStreamingTexture) ||
@@ -4875,7 +4981,7 @@ bool UEngine::HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& A
 	TArray<FSortedSkeletalMesh> SortedMeshes;
 	for (TObjectIterator<USkeletalMesh> It; It; ++It)
 	{
-		USkeletalMesh*		Mesh = *It;
+		USkeletalMesh* Mesh = *It;
 
 		FArchiveCountMem Count(Mesh);
 		FResourceSizeEx ResourceSizeExc = FResourceSizeEx(EResourceSizeMode::Exclusive);
@@ -4883,14 +4989,14 @@ bool UEngine::HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& A
 		FResourceSizeEx ResourceSizeInc = FResourceSizeEx(EResourceSizeMode::EstimatedTotal);
 		Mesh->GetResourceSizeEx(ResourceSizeInc);
 
-		int32		NumKB = (Count.GetNum() + 512) / 1024;
-		int32		MaxKB = (Count.GetMax() + 512) / 1024;
-		int32		ResKBExc = (ResourceSizeExc.GetTotalMemoryBytes() + 512) / 1024;
-		int32		ResKBInc = (ResourceSizeInc.GetTotalMemoryBytes() + 512) / 1024;
-		int32		ResKBIncMobile = 0; // Update mobilesort once implemented
+		int32 NumKB = (Count.GetNum() + 512) / 1024;
+		int32 MaxKB = (Count.GetMax() + 512) / 1024;
+		int32 ResKBExc = (ResourceSizeExc.GetTotalMemoryBytes() + 512) / 1024;
+		int32 ResKBInc = (ResourceSizeInc.GetTotalMemoryBytes() + 512) / 1024;
+		int32 ResKBIncMobile = 0; // Update mobilesort once implemented
 
-		int32		LodCount = 0;
-		int32		MobileMinLOD = -1;
+		int32 LodCount = 0;
+		int32 MobileMinLOD = -1;
 
 #if WITH_EDITORONLY_DATA
 		if (Mesh->MinLod.PerPlatform.Find(("Mobile")) != nullptr)
@@ -4899,30 +5005,29 @@ bool UEngine::HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& A
 		}
 #endif
 
-		int32		VertexCountLod0 = 0;
-		int32		VertexCountLod1 = 0;
-		int32		VertexCountLod2 = 0;
-		int32		VertexCountTotal = 0;
-		int32		VertexCountTotalMobile = 0;
+		int32 VertexCountLod0 = 0;
+		int32 VertexCountLod1 = 0;
+		int32 VertexCountLod2 = 0;
+		int32 VertexCountTotal = 0;
+		int32 VertexCountTotalMobile = 0;
 
-		/*
-		FSkeletalMeshResource* Resource = Mesh->GetImportedResource();
-		if(Resource)
+		if(Mesh->GetResourceForRendering() && Mesh->GetResourceForRendering()->LODRenderData.Num() > 0)
 		{
-		LodCount = Resource->LODModels.Num();
-		VertexCountLod0 = LodCount > 0 ? Resource->LODModels[0].NumVertices : 0;
-		VertexCountLod1 = LodCount > 1 ? Resource->LODModels[1].NumVertices : 0;
-		VertexCountLod2 = LodCount > 2 ? Resource->LODModels[2].NumVertices : 0;
+			TIndirectArray<FSkeletalMeshLODRenderData>& LodRenderData = Mesh->GetResourceForRendering()->LODRenderData;
 
-		for(int32 i = 0; i < LodCount; i++)
-		{
-		VertexCountTotal += Resource->LODModels[i].NumVertices;
-		VertexCountTotalMobile += i >= MobileMinLOD ? Resource->LODModels[i].NumVertices : 0;
-		}
-		}
-		*/
+			LodCount = LodRenderData.Num();
+			VertexCountLod0 = LodCount > 0 ? LodRenderData[0].GetNumVertices() : 0;
+			VertexCountLod1 = LodCount > 1 ? LodRenderData[1].GetNumVertices() : 0;
+			VertexCountLod2 = LodCount > 2 ? LodRenderData[2].GetNumVertices() : 0;
 
-		int32		VertexCountCollision = 0;
+			for(int32 i = 0; i < LodCount; i++)
+			{
+				VertexCountTotal += LodRenderData[i].GetNumVertices();
+				VertexCountTotalMobile += i >= MobileMinLOD ? LodRenderData[i].GetNumVertices() : 0;
+			}
+		}
+
+		int32 VertexCountCollision = 0;
 		if (Mesh->BodySetup)
 		{
 #if WITH_PHYSX
@@ -4934,7 +5039,7 @@ bool UEngine::HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& A
 #endif
 		}
 
-		FString				Name = Mesh->GetFullName();
+		FString Name = Mesh->GetFullName();
 
 		new(SortedMeshes) FSortedSkeletalMesh(
 			NumKB,
@@ -5007,6 +5112,100 @@ bool UEngine::HandleListSkeletalMeshesCommand(const TCHAR* Cmd, FOutputDevice& A
 	return true;
 }
 
+bool UEngine::HandleListAnimsCommand(const TCHAR* Cmd, FOutputDevice& Ar)
+{
+	const bool bAlphaSort = FParse::Param(Cmd, TEXT("ALPHASORT"));
+	const bool bCSV = FParse::Param(Cmd, TEXT("CSV"));
+
+	Ar.Logf(TEXT("Listing all animations."));
+
+
+	TArray<FSortedAnimAsset> SortedAnimAssets;
+	for (TObjectIterator<UAnimationAsset> It; It; ++It)
+	{
+		UAnimationAsset* AnimAsset = *It;
+
+		FArchiveCountMem Count(AnimAsset);
+		FResourceSizeEx ResourceSizeExc = FResourceSizeEx(EResourceSizeMode::Exclusive);
+		AnimAsset->GetResourceSizeEx(ResourceSizeExc);
+		FResourceSizeEx ResourceSizeInc = FResourceSizeEx(EResourceSizeMode::EstimatedTotal);
+		AnimAsset->GetResourceSizeEx(ResourceSizeInc);
+
+		int32 NumKB = (Count.GetNum() + 512) / 1024;
+		int32 MaxKB = (Count.GetMax() + 512) / 1024;
+		int32 ResKBExc = (ResourceSizeExc.GetTotalMemoryBytes() + 512) / 1024;
+		int32 ResKBInc = (ResourceSizeInc.GetTotalMemoryBytes() + 512) / 1024;
+
+		FString Name = AnimAsset->GetFullName();
+
+		FName AnimAssetType = AnimAsset->GetClass()->GetFName();
+
+		int32 NumKeys = 0;
+		float SequenceLength = 0.f;
+		float RateScale = 1.f;
+		int32 NumCurves = 0;
+		FString TranslationFormat;
+		FString RotationFormat;
+		FString ScaleFormat;
+
+		if (UAnimSequence* AnimSeq = Cast<UAnimSequence>(AnimAsset))
+		{
+			NumKeys = AnimSeq->NumFrames;
+			SequenceLength = AnimSeq->GetPlayLength();
+			RateScale = AnimSeq->RateScale;
+			NumCurves = AnimSeq->CompressedCurveData.FloatCurves.Num();
+
+			TranslationFormat = FAnimationUtils::GetAnimationCompressionFormatString(AnimSeq->TranslationCompressionFormat);
+			RotationFormat = FAnimationUtils::GetAnimationCompressionFormatString(AnimSeq->RotationCompressionFormat);
+			ScaleFormat = FAnimationUtils::GetAnimationCompressionFormatString(AnimSeq->ScaleCompressionFormat);
+		}
+
+		new(SortedAnimAssets) FSortedAnimAsset(
+			NumKB,
+			MaxKB,
+			ResKBExc,
+			ResKBInc,
+			AnimAssetType,
+			Name,
+			NumKeys,
+			SequenceLength,
+			RateScale,
+			NumCurves,
+			TranslationFormat,
+			RotationFormat,
+			ScaleFormat
+		);
+	}
+
+	// Sort meshes by cost or alphabetically.
+	SortedAnimAssets.Sort(FCompareFSortedAnimAsset(bAlphaSort));
+
+	// Display.
+	int64 TotalNumKB = 0;
+	int64 TotalMaxKB = 0;
+	int64 TotalResKBExc = 0;
+	int64 TotalResKBInc = 0;
+
+	Ar.Logf(TEXT(",NumKB, MaxKB, ResKBExc, ResKBInc, Type, Name, Length, RateScale, NumCurves, TranslationFormat, RotationFormat, ScaleFormat"));
+
+	for (const FSortedAnimAsset& SortedAsset : SortedAnimAssets)
+	{
+
+		Ar.Logf(TEXT(",%i, %i, %i, %i, %s, %s, %f, %f, %d, %s, %s, %s"),
+			SortedAsset.NumKB, SortedAsset.MaxKB, SortedAsset.ResKBExc, SortedAsset.ResKBInc, *SortedAsset.AnimAssetType.ToString(), *SortedAsset.Name, SortedAsset.SequenceLength, 
+			SortedAsset.RateScale, SortedAsset.NumCurves, *SortedAsset.TranslationFormat, *SortedAsset.RotationFormat, *SortedAsset.ScaleFormat);
+
+		TotalNumKB += SortedAsset.NumKB;
+		TotalMaxKB += SortedAsset.MaxKB;
+		TotalResKBExc += SortedAsset.ResKBExc;
+		TotalResKBInc += SortedAsset.ResKBInc;
+	}
+
+	Ar.Logf(TEXT("Total NumKB: %lld KB, Total MaxKB: %lld KB, Total ResKB Exc: %lld KB, Total ResKB Inc %lld KB, Anim Count=%d"), TotalNumKB, TotalMaxKB, TotalResKBExc, TotalResKBInc, SortedAnimAssets.Num());
+
+	return true;
+}
+
 bool UEngine::HandleRemoteTextureStatsCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 {
 	// Address which sent the command.  We will send stats back to this address
@@ -5319,6 +5518,8 @@ bool UEngine::HandleMemReportDeferredCommand( const TCHAR* Cmd, FOutputDevice& A
 #if ALLOW_DEBUG_FILES
 	QUICK_SCOPE_CYCLE_COUNTER(HandleMemReportDeferredCommand);
 
+	FSlowHeartBeatScope HeartBeatSuspend;
+
 	const bool bPerformSlowCommands = FParse::Param( Cmd, TEXT("FULL") );
 	const bool bLogOutputToFile = !FParse::Param( Cmd, TEXT("LOG") );
 	FString InFileName;
@@ -6612,20 +6813,25 @@ bool UEngine::HandleObjCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 		Ar.Log( TEXT("Objects:") );
 		Ar.Log( TEXT("") );
 
-		UClass* CheckType = NULL;
-		UClass* MetaClass = NULL;
+		UClass* CheckType = nullptr;
+		UClass* MetaClass = nullptr;
 
 		// allow checking for any Outer, not just a UPackage
-		UObject* CheckOuter = NULL;
-		UPackage* InsidePackage = NULL;
-		UObject* InsideObject = NULL;
+		UObject* CheckOuter = nullptr;
+		UPackage* InsidePackage = nullptr;
+		UObject* InsideObject = nullptr;
+		UClass* InsideClass = nullptr;
 		ParseObject<UClass>(Cmd, TEXT("CLASS="  ), CheckType, ANY_PACKAGE );
 		ParseObject<UObject>(Cmd, TEXT("OUTER="), CheckOuter, ANY_PACKAGE);
 
-		ParseObject<UPackage>(Cmd, TEXT("PACKAGE="), InsidePackage, NULL);
-		if ( InsidePackage == NULL )
+		ParseObject<UPackage>(Cmd, TEXT("PACKAGE="), InsidePackage, nullptr);
+		if (InsidePackage == nullptr)
 		{
-			ParseObject<UObject>( Cmd, TEXT("INSIDE=" ), InsideObject, NULL );
+			ParseObject<UObject>(Cmd, TEXT("INSIDE="), InsideObject, nullptr);
+		}
+		if (InsidePackage == nullptr && InsideObject == nullptr)
+		{
+			ParseObject<UClass>(Cmd, TEXT("INSIDECLASS="), InsideClass, ANY_PACKAGE);
 		}
 		int32 Depth = -1;
 		FParse::Value(Cmd, TEXT("DEPTH="), Depth);
@@ -6652,9 +6858,10 @@ bool UEngine::HandleObjCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 				&&	(MetaClass		||	!FCString::Strifind(Cmd,TEXT("TYPE=")))
 				&&	(CheckOuter		||	!FCString::Strifind(Cmd,TEXT("OUTER=")))
 				&&	(InsidePackage	||	!FCString::Strifind(Cmd,TEXT("PACKAGE="))) 
-				&&	(InsideObject	||	!FCString::Strifind(Cmd,TEXT("INSIDE=")))))
+				&&	(InsideObject	||	!FCString::Strifind(Cmd,TEXT("INSIDE=")))
+				&&	(InsideClass || !FCString::Strifind(Cmd, TEXT("INSIDECLASS=")))))
 		{
-			const bool bTrackDetailedObjectInfo = bAll || (CheckType != NULL && CheckType != UObject::StaticClass()) || CheckOuter != NULL || InsideObject != NULL || InsidePackage != NULL || !ObjectName.IsEmpty();
+			const bool bTrackDetailedObjectInfo = bAll || (CheckType != NULL && CheckType != UObject::StaticClass()) || CheckOuter != nullptr || InsideObject != nullptr || InsidePackage != nullptr || InsideClass != nullptr || !ObjectName.IsEmpty();
 			const bool bOnlyListGCObjects = FParse::Param(Cmd, TEXT("GCONLY"));
 			const bool bOnlyListGCObjectsNoClusters = FParse::Param(Cmd, TEXT("GCNOCLUSTERS"));
 			const bool bOnlyListRootObjects = FParse::Param(Cmd, TEXT("ROOTONLY"));
@@ -6723,6 +6930,11 @@ bool UEngine::HandleObjCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 					continue;
 				}
 
+				if (InsideClass && !It->IsInA(InsideClass))
+				{
+					continue;
+				}
+
 				if (!ObjectName.IsEmpty() && It->GetName() != ObjectName)
 				{
 					continue;
@@ -7747,13 +7959,48 @@ bool UEngine::PerformError(const TCHAR* Cmd, FOutputDevice& Ar)
 	}
 	else if (FParse::Command(&Cmd, TEXT("HITCH")))
 	{
+		float Seconds = FCString::Atof(Cmd) / 1000.0f;
+		if (Seconds == 0.0f)
+		{
+			Seconds = 1.0f;
+		}
 		SCOPE_CYCLE_COUNTER(STAT_IntentionalHitch);
-		FPlatformProcess::Sleep(1.0f);
+		FPlatformProcess::Sleep(Seconds);
 		return true;
 	}
 	else if (FParse::Command(&Cmd, TEXT("RENDERHITCH")))
 	{
-		ENQUEUE_UNIQUE_RENDER_COMMAND(CauseRenderThreadHitch, { SCOPE_CYCLE_COUNTER(STAT_IntentionalHitch); FPlatformProcess::Sleep(1.0f); });
+		float Seconds = FCString::Atof(Cmd) / 1000.0f;
+		if (Seconds == 0.0f)
+		{
+			Seconds = 1.0f;
+		}
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(CauseRenderThreadHitch, float, Length, Seconds, { SCOPE_CYCLE_COUNTER(STAT_IntentionalHitch); FPlatformProcess::Sleep(Length); });
+		return true;
+	}
+	else if (FParse::Command(&Cmd, TEXT("SPIN")))
+	{
+		float Seconds = FCString::Atof(Cmd) / 1000.0f;
+		if (Seconds == 0.0f)
+		{
+			Seconds = 1.0f;
+		}
+		SCOPE_CYCLE_COUNTER(STAT_IntentionalHitch);
+		double StartTime = FPlatformTime::Seconds();
+		while (FPlatformTime::Seconds() < StartTime + Seconds)
+		{
+			
+		}
+		return true;
+	}
+	else if (FParse::Command(&Cmd, TEXT("RENDERSPIN")))
+	{
+		float Seconds = FCString::Atof(Cmd) / 1000.0f;
+		if (Seconds == 0.0f)
+		{
+			Seconds = 1.0f;
+		}
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(CauseRenderThreadHitch, float, Length, Seconds, { SCOPE_CYCLE_COUNTER(STAT_IntentionalHitch); double StartTime = FPlatformTime::Seconds(); while (FPlatformTime::Seconds() < StartTime + Length) {} });
 		return true;
 	}
 	else if (FParse::Command(&Cmd, TEXT("LONGLOG")))
@@ -8071,11 +8318,11 @@ float UEngine::GetMaxTickRate(float DeltaTime, bool bAllowFrameRateSmoothing) co
 		}
 	}
 
-	if (CVarCauseHitches.GetValueOnGameThread())
+	if (CVarCauseHitches.GetValueOnAnyThread())
 	{
 		static float RunningHitchTimer = 0.f;
 		RunningHitchTimer += DeltaTime;
-		float SleepTime = float(CVarCauseHitchesMS.GetValueOnGameThread()) / 1000.0f;
+		float SleepTime = float(CVarCauseHitchesMS.GetValueOnAnyThread()) / 1000.0f;
 		if (RunningHitchTimer > 1.f + SleepTime)
 		{
 			// hitch!
@@ -8085,16 +8332,16 @@ float UEngine::GetMaxTickRate(float DeltaTime, bool bAllowFrameRateSmoothing) co
 		}
 	}
 
-	if (CVarUnsteadyFPS.GetValueOnGameThread())
+	if (CVarUnsteadyFPS.GetValueOnAnyThread())
 	{
 		static float LastMaxTickRate = 20.f;
 		float RandDelta = FMath::FRandRange(-5.f, 5.f);
 		MaxTickRate = FMath::Clamp(LastMaxTickRate + RandDelta, 8.f, 32.f);
 		LastMaxTickRate = MaxTickRate;
 	}
-	else if (CVarMaxFPS.GetValueOnGameThread() > 0)
+	else if (CVarMaxFPS.GetValueOnAnyThread() > 0)
 	{
-		MaxTickRate = CVarMaxFPS.GetValueOnGameThread();
+		MaxTickRate = CVarMaxFPS.GetValueOnAnyThread();
 	}
 
 	return MaxTickRate;
@@ -8333,6 +8580,8 @@ UEngine::FErrorsAndWarningsCollector::~FErrorsAndWarningsCollector()
 
 bool UEngine::FErrorsAndWarningsCollector::Tick(float Seconds)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FErrorsAndWarningsCollector_Tick);
+
 	// Set this each tick, in case the cvar is changed at runtime
 	SetVerbosity((GSupressWarningsInOnScreenDisplay != 0) ? ELogVerbosity::Error : ELogVerbosity::Warning);
 
@@ -8900,11 +9149,12 @@ static float StatUnitTotalFrameTime = 0.0f;
 static float StatUnitTotalGameThreadTime = 0.0f;
 static float StatUnitTotalRenderThreadTime = 0.0f;
 static float StatUnitTotalGPUTime = 0.0f;
+static float StatUnitTotalRHITTime = 0.0f;
 
 void UEngine::GetAverageUnitTimes( TArray<float>& AverageTimes )
 {
 	uint32 FrameCount = 0;
-	AverageTimes.AddZeroed( 4 );
+	AverageTimes.AddZeroed( 5 );
 
 	if( StatUnitTotalFrameCount > 0 )
 	{
@@ -8912,6 +9162,7 @@ void UEngine::GetAverageUnitTimes( TArray<float>& AverageTimes )
 		AverageTimes[1] = StatUnitTotalGameThreadTime / StatUnitTotalFrameCount;
 		AverageTimes[2] = StatUnitTotalGPUTime / StatUnitTotalFrameCount;
 		AverageTimes[3] = StatUnitTotalRenderThreadTime / StatUnitTotalFrameCount;
+		AverageTimes[4] = StatUnitTotalRHITTime / StatUnitTotalFrameCount;
 	}
 
 	/** Reset the counters for the next call */
@@ -8920,9 +9171,10 @@ void UEngine::GetAverageUnitTimes( TArray<float>& AverageTimes )
 	StatUnitTotalGameThreadTime = 0.0f;
 	StatUnitTotalRenderThreadTime = 0.0f;
 	StatUnitTotalGPUTime = 0.0f;
+	StatUnitTotalRHITTime = 0.0f;
 }
 
-void UEngine::SetAverageUnitTimes(float FrameTime, float RenderThreadTime, float GameThreadTime, float GPUFrameTime)
+void UEngine::SetAverageUnitTimes(float FrameTime, float RenderThreadTime, float GameThreadTime, float GPUFrameTime, float RHITFrameTime)
 {
 	/** Only record the information once for the current frame */
 	if (StatUnitLastFrameCounter != GFrameCounter)
@@ -8935,6 +9187,7 @@ void UEngine::SetAverageUnitTimes(float FrameTime, float RenderThreadTime, float
 		StatUnitTotalRenderThreadTime += RenderThreadTime;
 		StatUnitTotalGameThreadTime += GameThreadTime;
 		StatUnitTotalGPUTime += GPUFrameTime;
+		StatUnitTotalRHITTime += RHITFrameTime;
 	}
 }
 
@@ -9014,16 +9267,6 @@ float DrawMapWarnings(UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanv
 		MessageY += FontSizeY;
 	}
 
-	// If dynamic resolution is not supported but is enabled, display an error message so
-	// does not even stand a chance to go through platform certification.
-	if (!GEngine->GetDynamicResolutionState()->IsSupported() && GEngine->GetDynamicResolutionStatus() != EDynamicResolutionStatus::Disabled)
-	{
-		SmallTextItem.SetColor(FLinearColor::Red);
-		SmallTextItem.Text = LOCTEXT("UNSUPPORTEDDYNRES", "DYNAMIC RESOLUTION IS NOT SUPPORTED ON THIS PLATFORM");
-		Canvas->DrawItem(SmallTextItem, FVector2D(MessageX, MessageY));
-		MessageY += FontSizeY;
-	}
-
 	if (World->NumUnbuiltReflectionCaptures > 0)
 	{
 		int32 NumLightingScenariosEnabled = 0;
@@ -9053,11 +9296,8 @@ float DrawMapWarnings(UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanv
 	if (World->GetWorldSettings()->bEnableHierarchicalLODSystem)
 #endif // WITH_EDITOR
 	{
-		// Cache so we don't iterate everything in non-editor builds
-		static TMap<FString, int32>  WorldUnbuiltHLODMap;
-
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 		static double LastCheckTime = 0;
-		static int32 UnbuiltLODCount = 0;
 
 		double TimeNow = FPlatformTime::Seconds();
 
@@ -9066,21 +9306,20 @@ float DrawMapWarnings(UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanv
 		if ((TimeNow - LastCheckTime) > 20)
 		{
 			LastCheckTime = TimeNow;
-			UnbuiltLODCount = 0;
+			GUnbuiltHLODCount = 0;
 			for (TActorIterator<ALODActor> HLODIt(World); HLODIt; ++HLODIt)
 			{
 				if (!HLODIt->IsBuilt())
 				{
-					++UnbuiltLODCount;
+					++GUnbuiltHLODCount;
 				}
 			}
 		}
 
-#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-		if (UnbuiltLODCount)
+		if (GUnbuiltHLODCount)
 		{
 			SmallTextItem.SetColor(FLinearColor::Red);
-			SmallTextItem.Text = FText::FromString(FString::Printf(TEXT("HLOD CLUSTER(S) NEED TO BE REBUILT (%u unbuilt object(s))"), UnbuiltLODCount));
+			SmallTextItem.Text = FText::FromString(FString::Printf(TEXT("HLOD CLUSTER(S) NEED TO BE REBUILT (%u unbuilt object(s))"), GUnbuiltHLODCount));
 			Canvas->DrawItem(SmallTextItem, FVector2D(MessageX, MessageY));
 			MessageY += FontSizeY;
 		}
@@ -9448,9 +9687,8 @@ void DrawStatsHUD( UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanvas*
 
 	// draw debug properties
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-#if (UE_BUILD_SHIPPING && WITH_EDITOR)
-	if (GEngine != NULL && World->GetNetMode() == NM_Standalone && CanvasObject != NULL)
-#endif
+
+	auto DrawDebugPropertiesForWorld = [Canvas, CanvasObject, &DebugProperties](UWorld* DebugWorld, int32& X, int32& Y)
 	{
 		// construct a list of objects relevant to "getall" type elements, so that we only have to do the object iterator once
 		// we do the iterator each frame so that new objects will show up immediately
@@ -9496,7 +9734,7 @@ void DrawStatsHUD( UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanvas*
 						continue;
 					}
 
-					if (Obj->GetWorld() && Obj->GetWorld() != World)
+					if (Obj->GetWorld() && Obj->GetWorld() != DebugWorld)
 					{
 						continue;
 					}
@@ -9509,9 +9747,6 @@ void DrawStatsHUD( UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanvas*
 				}
 			}
 		}
-		// draw starting in the top left
-		int32 X = StatsXOffset;
-		int32 Y = FPlatformProperties::SupportsWindowedMode() ? 20 : 40;
 		int32 MaxY = int32(Canvas->GetRenderTarget()->GetSizeXY().Y);
 		for (int32 i = 0; i < DebugProperties.Num() && Y < MaxY; i++)
 		{
@@ -9551,7 +9786,31 @@ void DrawStatsHUD( UWorld* World, FViewport* Viewport, FCanvas* Canvas, UCanvas*
 				}
 			}
 		}
+	};
+
+	// draw starting in the top left
+	int32 X = StatsXOffset;
+	int32 Y = FPlatformProperties::SupportsWindowedMode() ? 20 : 40;
+
+	DrawDebugPropertiesForWorld(World, X, Y);
+	
+	// Draw properties for server world actors in PIE
+	if (GIsEditor && World->WorldType == EWorldType::PIE && World->GetNetMode() == NM_Client && DebugProperties.Num() > 0)
+	{
+		for( TObjectIterator<UWorld> It; It; ++It)
+		{
+			UWorld* ServerWorld = *It;
+			if (ServerWorld->WorldType == EWorldType::PIE && ServerWorld->GetNetMode() == NM_DedicatedServer)
+			{				
+				Y += 20;
+				Y += Canvas->DrawShadowedString( X, Y, TEXT("[Server]"), GEngine->GetSmallFont(), FLinearColor::Gray);
+				DrawDebugPropertiesForWorld(ServerWorld, X, Y);
+				break;
+			}
+
+		}
 	}
+
 #endif
 }
 
@@ -9591,6 +9850,7 @@ DEFINE_STAT(STAT_GPUSkinVertices);
 DEFINE_STAT(STAT_UnitFrame);
 DEFINE_STAT(STAT_UnitGame);
 DEFINE_STAT(STAT_UnitRender);
+DEFINE_STAT(STAT_UnitRHIT);
 DEFINE_STAT(STAT_UnitGPU);
 
 /*-----------------------------------------------------------------------------
@@ -9757,30 +10017,56 @@ void UEngine::RestoreSelectedMaterialColor()
 	bIsOverridingSelectedColor = false;
 }
 
-EDynamicResolutionStatus UEngine::GetDynamicResolutionStatus() const
+void UEngine::GetDynamicResolutionCurrentStateInfos(FDynamicResolutionStateInfos& OutInfos) const
 {
-	#if !UE_SERVER
-	{
-		if (DynamicResolutionState->IsEnabled())
-		{
-			ensureMsgf(!bIsDynamicResolutionPaused,
-				TEXT("Looks like the dynamic resolution state has enabled itself."));
+	OutInfos.Status = EDynamicResolutionStatus::Unsupported;
+	OutInfos.ResolutionFractionApproximation = -1.0f;
+	OutInfos.ResolutionFractionUpperBound = -1.0f;
 
-			return EDynamicResolutionStatus::Enabled;
+	#if WITH_DYNAMIC_RESOLUTION
+	{
+		float ForceResolutionFraction = 0.0f;
+
+		#if !UE_BUILD_SHIPPING
+			ForceResolutionFraction = CVarForceDynamicResScreenPercentage.GetValueOnGameThread() / 100.0f;
+		#endif
+
+		if (!DynamicResolutionState.IsValid() || !DynamicResolutionState->IsSupported())
+		{
+			return;
+		}
+		#if !UE_BUILD_SHIPPING
+		else if (ForceResolutionFraction > 0)
+		{
+			OutInfos.Status = EDynamicResolutionStatus::DebugForceEnabled;
+			OutInfos.ResolutionFractionApproximation = ForceResolutionFraction;
+			OutInfos.ResolutionFractionUpperBound = DynamicResolutionState->GetResolutionFractionUpperBound();
+		}
+		#endif
+		else if (DynamicResolutionState->IsEnabled())
+		{
+			OutInfos.Status = EDynamicResolutionStatus::Enabled;
+			OutInfos.ResolutionFractionApproximation = DynamicResolutionState->GetResolutionFractionApproximation();
+			OutInfos.ResolutionFractionUpperBound = DynamicResolutionState->GetResolutionFractionUpperBound();
 		}
 		else if (bIsDynamicResolutionPaused)
 		{
-			return EDynamicResolutionStatus::Paused;
+			OutInfos.Status = EDynamicResolutionStatus::Paused;
+		}
+		else
+		{
+			OutInfos.Status = EDynamicResolutionStatus::Disabled;
 		}
-	}
-	#endif // !UE_SERVER
 
-	return EDynamicResolutionStatus::Disabled;
+		// Min to ensure consistency when changing ResolutionFractionUpperBound setting.
+		OutInfos.ResolutionFractionApproximation = FMath::Min(OutInfos.ResolutionFractionApproximation, OutInfos.ResolutionFractionUpperBound);
+	}
+	#endif // !WITH_DYNAMIC_RESOLUTION
 }
 
 void UEngine::PauseDynamicResolution()
 {
-	#if !UE_SERVER
+	#if WITH_DYNAMIC_RESOLUTION
 		ensureMsgf(!(DynamicResolutionState->IsEnabled() && bIsDynamicResolutionPaused),
 			TEXT("Looks like the dynamic resolution state has enabled itself."));
 
@@ -9793,7 +10079,7 @@ void UEngine::PauseDynamicResolution()
 	#endif // !UE_SERVER
 }
 
-#if !UE_SERVER
+#if WITH_DYNAMIC_RESOLUTION
 bool UEngine::ShouldEnableDynamicResolutionState() const
 {
 	// If dynamic resolution is paused, the state will have to be disabled in any cases.
@@ -9805,9 +10091,9 @@ bool UEngine::ShouldEnableDynamicResolutionState() const
 	int32 OperationMode = CVarDynamicResOperationMode.GetValueOnGameThread();
 	
 	// Whether dynamic resolution is allowed to be enabled.
-	bool bEnable = (OperationMode == 2) || (OperationMode == 1 && bDynamicResolutionEnableUserSetting);
+	bool bEnable = ((OperationMode == 2) || (OperationMode == 1 && bDynamicResolutionEnableUserSetting)) && !bIsDynamicResolutionPaused;
 
-	#if WITH_EDITOR
+#if WITH_EDITOR
 	if (GIsEditor && bEnable)
 	{
 		int32 bPIEContextCount = 0;
@@ -9827,7 +10113,7 @@ bool UEngine::ShouldEnableDynamicResolutionState() const
 
 		bEnable = (bPIEContextCount == 1);
 	}
-	#endif
+#endif
 
 	// Enable dynamic resolution if allowed, not paused.
 	return bEnable;
@@ -9846,11 +10132,11 @@ void UEngine::UpdateDynamicResolutionStatus()
 		DynamicResolutionState->SetEnabled(bShouldEnabledDynamicResolutionState);
 	}
 }
-#endif
+#endif // WITH_DYNAMIC_RESOLUTION
 
 void UEngine::EmitDynamicResolutionEvent(EDynamicResolutionStateEvent Event)
 {
-#if !UE_SERVER
+#if WITH_DYNAMIC_RESOLUTION
 	// Early return if dedicated server of commandlet.
 	if (IsRunningDedicatedServer() || IsRunningCommandlet())
 	{
@@ -9924,12 +10210,12 @@ void UEngine::EmitDynamicResolutionEvent(EDynamicResolutionStateEvent Event)
 	}
 
 	LastDynamicResolutionEvent = Event;
-#endif // !UE_SERVER
+#endif // WITH_DYNAMIC_RESOLUTION
 }
 
 void UEngine::ChangeDynamicResolutionStateAtNextFrame(TSharedPtr< class IDynamicResolutionState > NewState)
 {
-#if !UE_SERVER
+#if WITH_DYNAMIC_RESOLUTION
 	if (IsRunningDedicatedServer() || IsRunningCommandlet())
 	{
 		check(!DynamicResolutionState.IsValid());
@@ -11351,6 +11637,8 @@ bool UEngine::LoadMap( FWorldContext& WorldContext, FURL URL, class UPendingNetG
 
 	LLM_SCOPE(ELLMTag::LoadMapMisc);
 
+	FDisableHitchDetectorScope SuspendHitchDetector;
+
 	NETWORK_PROFILER(GNetworkProfiler.TrackSessionChange(true,URL));
 	MALLOC_PROFILER( FMallocProfiler::SnapshotMemoryLoadMapStart( URL.Map ) );
 	Error = TEXT("");
@@ -11684,7 +11972,7 @@ bool UEngine::LoadMap( FWorldContext& WorldContext, FURL URL, class UPendingNetG
 				GIsPlayInEditorWorld = true;
 			}
 			// Otherwise we are probably loading new map while in PIE, so we need to rename world package and all streaming levels
-			else if (Pending == NULL)
+			else if ((Pending == nullptr) || (Pending->DemoNetDriver != nullptr))
 			{
 				NewWorld->RenameToPIEWorld(WorldContext.PIEInstance);
 			}
@@ -12259,21 +12547,6 @@ UGameViewportClient* UEngine::GameViewportForWorld(const UWorld *InWorld) const
 	return (Context ? Context->GameViewport : NULL);
 }
 
-bool UEngine::AreGameAnalyticsEnabled() const
-{ 
-	return FPlatformMisc::AllowSendAnonymousGameUsageDataToEpic() && GetDefault<UEndUserSettings>()->bSendAnonymousUsageDataToEpic;
-}
-
-bool UEngine::AreGameAnalyticsAnonymous() const
-{
-	return !GetDefault<UEndUserSettings>()->bAllowUserIdInUsageData;
-}
-
-bool UEngine::AreGameMTBFEventsEnabled() const
-{
-	return GetDefault<UEndUserSettings>()->bSendMeanTimeBetweenFailureDataToEpic;
-}
-
 void UEngine::SetIsVanillaProduct(bool bInIsVanillaProduct)
 {
 	// set bIsVanillaProduct and if it changes broadcast the core delegate
@@ -14103,6 +14376,8 @@ static TArray<FString> AssetLoadTest_Filenames;
 
 static void TickAssetLoadTest(bool bInfinite = false)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_UEngine_TickAssetLoadTest);
+
 	check(IsInGameThread());
 	static FRandomStream RNG(FPlatformTime::Cycles());
 	static int32 RequestsOutstanding = 0;
diff --git a/Engine/Source/Runtime/Engine/Private/UserDefinedStruct.cpp b/Engine/Source/Runtime/Engine/Private/UserDefinedStruct.cpp
index 49d0ffab35c6..6b6d43bc1161 100644
--- a/Engine/Source/Runtime/Engine/Private/UserDefinedStruct.cpp
+++ b/Engine/Source/Runtime/Engine/Private/UserDefinedStruct.cpp
@@ -286,6 +286,7 @@ void UUserDefinedStruct::SerializeTaggedProperties(FArchive& Ar, uint8* Data, US
 	// So if we don't have defaults we need to use the struct defaults
 	const bool bUseNewDefaults = !Defaults
 		&& UDDefaultsStruct
+		&& (UDDefaultsStruct->GetDefaultInstance() != Data)
 		&& !bDuplicate
 		&& (Ar.IsSaving() || Ar.IsLoading())
 		&& !Ar.IsCooking();
diff --git a/Engine/Source/Runtime/Engine/Private/UserInterface/PlayerInput.cpp b/Engine/Source/Runtime/Engine/Private/UserInterface/PlayerInput.cpp
index b6172f5f387a..2aa3d4432e97 100644
--- a/Engine/Source/Runtime/Engine/Private/UserInterface/PlayerInput.cpp
+++ b/Engine/Source/Runtime/Engine/Private/UserInterface/PlayerInput.cpp
@@ -295,7 +295,7 @@ bool UPlayerInput::InputAxis(FKey Key, float Delta, float DeltaTime, int32 NumSa
 	return false;
 }
 
-bool UPlayerInput::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex) 
+bool UPlayerInput::InputTouch(uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) 
 {
 	// get the current state of each finger
 	checkf(TouchpadIndex == 0, TEXT("We currently assume one touchpad in UPlayerInput::InputTouch. If this triggers, add support for multiple pads"));
@@ -312,7 +312,7 @@ bool UPlayerInput::InputTouch(uint32 Handle, ETouchType::Type Type, const FVecto
 
 	// update touched/untouched flag
 	// > 0 means that it's currently held down (anything besides an end message is held down)
-	Touches[Handle].Z = (Type == ETouchType::Ended) ? 0.0f : 1.0f;
+	Touches[Handle].Z = (Type == ETouchType::Ended) ? 0.0f : Force;
 
 	// hook up KeyState for InputComponent
 	FKeyState& KeyState = KeyStateMap.FindOrAdd(EKeys::TouchKeys[Handle]);
diff --git a/Engine/Source/Runtime/Engine/Private/UserInterfaceSettings.cpp b/Engine/Source/Runtime/Engine/Private/UserInterfaceSettings.cpp
index c328dfe84462..a10af49d8089 100644
--- a/Engine/Source/Runtime/Engine/Private/UserInterfaceSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/UserInterfaceSettings.cpp
@@ -79,31 +79,57 @@ float UUserInterfaceSettings::GetDPIScaleBasedOnSize(FIntPoint Size) const
 {
 	float Scale = 1.0f;
 
-	if ( UIScaleRule == EUIScalingRule::Custom )
+	if (LastViewportSize.IsSet() && Size == LastViewportSize.GetValue())
 	{
-		if ( CustomScalingRuleClassInstance == nullptr )
+		Scale = CalculatedScale;
+	}
+	else
+	{
+		bool bOutError;
+		Scale = CalculateScale(Size, bOutError);
+		if (!bOutError)
+		{
+			CalculatedScale = Scale;
+#if !WITH_EDITOR
+			// Only cache the value outside the editor.
+			LastViewportSize = Size;
+#endif
+		}
+	}
+
+	return FMath::Max(Scale * ApplicationScale, 0.01f);
+}
+
+float UUserInterfaceSettings::CalculateScale(FIntPoint Size, bool& bError) const
+{
+	bError = false;
+
+	if (UIScaleRule == EUIScalingRule::Custom)
+	{
+		if (CustomScalingRuleClassInstance == nullptr)
 		{
 			CustomScalingRuleClassInstance = CustomScalingRuleClass.TryLoadClass<UDPICustomScalingRule>();
 
-			if ( CustomScalingRuleClassInstance == nullptr )
+			if (CustomScalingRuleClassInstance == nullptr)
 			{
 				FMessageLog("MapCheck").Error()
 					->AddToken(FTextToken::Create(FText::Format(LOCTEXT("CustomScalingRule_NotFound", "Project Settings - User Interface Custom Scaling Rule '{0}' could not be found."), FText::FromString(CustomScalingRuleClass.ToString()))));
+				bError = true;
 				return 1;
 			}
 		}
-		
-		if ( CustomScalingRule == nullptr )
+
+		if (CustomScalingRule == nullptr)
 		{
 			CustomScalingRule = CustomScalingRuleClassInstance->GetDefaultObject<UDPICustomScalingRule>();
 		}
 
-		Scale = CustomScalingRule->GetDPIScaleBasedOnSize(Size);
+		return CustomScalingRule->GetDPIScaleBasedOnSize(Size);
 	}
 	else
 	{
 		int32 EvalPoint = 0;
-		switch ( UIScaleRule )
+		switch (UIScaleRule)
 		{
 		case EUIScalingRule::ShortestSide:
 			EvalPoint = FMath::Min(Size.X, Size.Y);
@@ -120,12 +146,31 @@ float UUserInterfaceSettings::GetDPIScaleBasedOnSize(FIntPoint Size) const
 		}
 
 		const FRichCurve* DPICurve = UIScaleCurve.GetRichCurveConst();
-		Scale = DPICurve->Eval((float)EvalPoint, 1.0f);
+		return DPICurve->Eval((float)EvalPoint, 1.0f);
+	}
+}
+
+#if WITH_EDITOR
+
+void UUserInterfaceSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+
+	// Look for changed properties
+	const FName PropertyName = (PropertyChangedEvent.Property != nullptr) ? PropertyChangedEvent.Property->GetFName() : NAME_None;
+	const FName MemberPropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.MemberProperty->GetFName() : NAME_None;
+
+	if (MemberPropertyName == GET_MEMBER_NAME_CHECKED(UUserInterfaceSettings, CustomScalingRuleClass))
+	{
+		CustomScalingRuleClassInstance = nullptr;
+		CustomScalingRule = nullptr;
 	}
 
-	return FMath::Max(Scale * ApplicationScale, 0.01f);
+	LastViewportSize.Reset();
 }
 
+#endif
+
 void UUserInterfaceSettings::ForceLoadResources()
 {
 	bool bShouldLoadCurors = true;
diff --git a/Engine/Source/Runtime/Engine/Private/Volume.cpp b/Engine/Source/Runtime/Engine/Private/Volume.cpp
index 1012b9ede519..85a398852e7a 100644
--- a/Engine/Source/Runtime/Engine/Private/Volume.cpp
+++ b/Engine/Source/Runtime/Engine/Private/Volume.cpp
@@ -55,6 +55,20 @@ void AVolume::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent
 
 #endif // WITH_EDITOR
 
+/** @returns the coarse bounds of this volume */
+FBoxSphereBounds AVolume::GetBounds() const
+{
+	if (GetBrushComponent())
+	{
+		return GetBrushComponent()->CalcBounds(GetBrushComponent()->GetComponentTransform());
+	}
+	else
+	{
+		UE_LOG(LogVolume, Error, TEXT("AVolume::GetBounds : No BrushComponent"));
+		return FBoxSphereBounds(EForceInit::ForceInitToZero);
+	}
+}
+
 bool AVolume::EncompassesPoint(FVector Point, float SphereRadius/*=0.f*/, float* OutDistanceToPoint) const
 {
 	if (GetBrushComponent())
diff --git a/Engine/Source/Runtime/Engine/Private/World.cpp b/Engine/Source/Runtime/Engine/Private/World.cpp
index 12b1dc3465fb..67296310b15a 100644
--- a/Engine/Source/Runtime/Engine/Private/World.cpp
+++ b/Engine/Source/Runtime/Engine/Private/World.cpp
@@ -83,6 +83,7 @@
 
 #include "Materials/MaterialParameterCollectionInstance.h"
 #include "ProfilingDebugging/LoadTimeTracker.h"
+#include "ProfilingDebugging/CsvProfiler.h"
 
 #if WITH_EDITOR
 	#include "DerivedDataCacheInterface.h"
@@ -117,12 +118,18 @@
 #include "Net/PerfCountersHelpers.h"
 #include "InGamePerformanceTracker.h"
 #include "Engine/AssetManager.h"
+#include "Engine/HLODProxy.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogWorld, Log, All);
 DEFINE_LOG_CATEGORY(LogSpawn);
 
+CSV_DECLARE_CATEGORY_MODULE_EXTERN(CORE_API, Basic);
+
 #define LOCTEXT_NAMESPACE "World"
 
+static int32 bDisableRemapScriptActors = 0;
+FAutoConsoleVariableRef CVarDisableRemapScriptActors(TEXT("net.DisableRemapScriptActors"), bDisableRemapScriptActors, TEXT("When set, disables name remapping of compiled script actors (for networking)"));
+
 template<class Function>
 static void ForEachNetDriver(UEngine* Engine, UWorld* const World, const Function InFunction)
 {
@@ -493,7 +500,7 @@ bool UWorld::Rename(const TCHAR* InName, UObject* NewOuter, ERenameFlags Flags)
 		for (int32 HLODIndex = 0; HLODIndex < NumHLODLevels; ++HLODIndex)
 		{
 			// See if any LODActors were found in the level, and if so retrieve the HLOD Package
-			OldHLODPackages[HLODIndex] = Utilities->CreateOrRetrieveLevelHLODPackage(PersistentLevel, HLODIndex);
+			OldHLODPackages[HLODIndex] = Utilities->RetrieveLevelHLODPackage(PersistentLevel, HLODIndex);
 		}		
 	}
 
@@ -607,7 +614,7 @@ bool UWorld::Rename(const TCHAR* InName, UObject* NewOuter, ERenameFlags Flags)
 	}
 
 	// Move over HLOD assets to new _HLOD Package
-	if (OldHLODPackages.FindByPredicate([](UPackage* InPackage) -> bool { return InPackage != nullptr; }))
+	if (!bTestRename && OldHLODPackages.FindByPredicate([](UPackage* InPackage) -> bool { return InPackage != nullptr; }))
 	{
 		TArray<UObject*> DeleteObjects;
 
@@ -629,10 +636,18 @@ bool UWorld::Rename(const TCHAR* InName, UObject* NewOuter, ERenameFlags Flags)
 				// Rename them 'into' the new HLOD package
 				for (UObject* Object : Objects)
 				{
-					Object->Rename(*Object->GetName(), NewHLODPackage);
+					if(UHLODProxy* HLODProxy = Cast<UHLODProxy>(Object))
+					{
+						// HLOD proxy gets the same name as the package
+						HLODProxy->Rename(*FPackageName::GetShortName(*NewHLODPackage->GetName()), NewHLODPackage);
+					}
+					else
+					{
+						Object->Rename(*Object->GetName(), NewHLODPackage);
+					}
 				}
 				
-				DeleteObjects.Add(Cast<UObject>(OldHLODPackages[HLODIndex]));				
+				DeleteObjects.Add(Cast<UObject>(OldHLODPackages[HLODIndex]));
 			}
 		}
 		
@@ -918,9 +933,6 @@ void UWorld::PostLoad()
 	// Add the garbage collection callbacks
 	FLevelStreamingGCHelper::AddGarbageCollectorCallback();
 
-	// Initially set up the parameter collection list. This may be run again in UWorld::InitWorld.
-	SetupParameterCollectionInstances();
-
 #if WITH_EDITOR
 	if (GIsEditor)
 	{
@@ -1003,6 +1015,8 @@ UWorld* UWorld::GetWorld() const
 
 void UWorld::SetupParameterCollectionInstances()
 {
+	QUICK_SCOPE_CYCLE_COUNTER(Stat_World_SetupParameterCollectionInstances);
+
 	// Create an instance for each parameter collection in memory
 	for (UMaterialParameterCollection* CurrentCollection : TObjectRange<UMaterialParameterCollection>())
 	{
@@ -1118,10 +1132,6 @@ UAISystemBase* UWorld::CreateAISystem()
 			if (AISystemModule)
 			{
 				AISystem = AISystemModule->CreateAISystemInstance(this);
-				if (AISystem == NULL)
-				{
-					UE_LOG(LogWorld, Error, TEXT("Failed to create AISystem instance of class %s!"), *UAISystemBase::GetAISystemClassName().ToString());
-				}
 			}
 		}
 	}
@@ -1212,10 +1222,10 @@ void UWorld::InitWorld(const InitializationValues IVS)
 	}
 
 	// Prepare AI systems
-	if (IVS.bCreateNavigation || IVS.bCreateAISystem)
+	AWorldSettings* WorldSettings = GetWorldSettings();
+	if (WorldSettings)
 	{
-		AWorldSettings* WorldSettings = GetWorldSettings();
-		if (WorldSettings)
+		if (IVS.bCreateNavigation || IVS.bCreateAISystem)
 		{
 			if (IVS.bCreateNavigation)
 			{
@@ -1267,9 +1277,8 @@ void UWorld::InitWorld(const InitializationValues IVS)
 	// Create physics collision handler, if we have a physics scene
 	if (IVS.bCreatePhysicsScene)
 	{
-		AWorldSettings* WorldSettings = GetWorldSettings();
 		// First look for world override
-		TSubclassOf<UPhysicsCollisionHandler> PhysHandlerClass = WorldSettings->PhysicsCollisionHandlerClass;
+		TSubclassOf<UPhysicsCollisionHandler> PhysHandlerClass = (WorldSettings ? WorldSettings->PhysicsCollisionHandlerClass : nullptr);
 		// Then fall back to engine default
 		if(PhysHandlerClass == NULL)
 		{
@@ -1962,47 +1971,32 @@ DEFINE_STAT(STAT_RemoveFromWorldTime);
 DEFINE_STAT(STAT_UpdateLevelStreamingTime);
 
 /**
- * Static helper function for AddToWorld to determine whether we've already spent all the allotted time.
+ * Static helper function for Add/RemoveToWorld to determine whether we've already spent all the allotted time.
  *
  * @param	CurrentTask		Description of last task performed
  * @param	StartTime		StartTime, used to calculate time passed
  * @param	Level			Level work has been performed on
+ * @param	TimeLimit		The amount of time that is allowed to be used
  *
  * @return true if time limit has been exceeded, false otherwise
  */
-static bool IsTimeLimitExceeded( const TCHAR* CurrentTask, double StartTime, ULevel* Level, double TimeLimit = 0.0 )
+static bool IsTimeLimitExceeded( const TCHAR* CurrentTask, double StartTime, ULevel* Level, double TimeLimit )
 {
 	bool bIsTimeLimitExceed = false;
-	// We don't spread work across several frames in the Editor to avoid potential side effects.
-	if( Level->OwningWorld->IsGameWorld() == true )
-	{
-		if (TimeLimit == 0.0)
-		{
-			TimeLimit = GLevelStreamingActorsUpdateTimeLimit;
 
-			// Give the actor initialization code more time if we're performing a high priority load or are in seamless travel
-			AWorldSettings* WorldSettings = Level->OwningWorld->GetWorldSettings(false, false);
-			if (WorldSettings != nullptr)
-			{
-				if (WorldSettings->bHighPriorityLoading || WorldSettings->bHighPriorityLoadingLocal || Level->OwningWorld->IsInSeamlessTravel())
-				{
-					TimeLimit += GPriorityLevelStreamingActorsUpdateExtraTime;
-				}
-			}
-		}
-		double CurrentTime	= FPlatformTime::Seconds();
-		// Delta time in ms.
-		double DeltaTime	= (CurrentTime - StartTime) * 1000;
-		if( DeltaTime > TimeLimit )
+	double CurrentTime	= FPlatformTime::Seconds();
+	// Delta time in ms.
+	double DeltaTime	= (CurrentTime - StartTime) * 1000;
+	if( DeltaTime > TimeLimit )
+	{
+		// Log if a single event took way too much time.
+		if( DeltaTime > 20.0 )
 		{
-			// Log if a single event took way too much time.
-			if( DeltaTime > 20 )
-			{
-				UE_LOG(LogStreaming, Display, TEXT("UWorld::AddToWorld: %s for %s took (less than) %5.2f ms"), CurrentTask, *Level->GetOutermost()->GetName(), DeltaTime );
-			}
-			bIsTimeLimitExceed = true;
+			UE_LOG(LogStreaming, Display, TEXT("UWorld::AddToWorld: %s for %s took (less than) %5.2f ms"), CurrentTask, *Level->GetOutermost()->GetName(), DeltaTime );
 		}
+		bIsTimeLimitExceed = true;
 	}
+
 	return bIsTimeLimitExceed;
 }
 
@@ -2067,9 +2061,6 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 
 	const double StartTime = FPlatformTime::Seconds();
 
-	// Don't consider the time limit if the match hasn't started as we need to ensure that the levels are fully loaded
-	const bool bConsiderTimeLimit = bMatchStarted;
-
 	bool bExecuteNextStep = CurrentLevelPendingVisibility == Level || CurrentLevelPendingVisibility == NULL;
 	bool bPerformedLastStep	= false;
 	
@@ -2098,6 +2089,22 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 #endif
 	}
 
+	// Don't consider the time limit if the match hasn't started as we need to ensure that the levels are fully loaded
+	const bool bConsiderTimeLimit = bMatchStarted && IsGameWorld();
+	double TimeLimit = GLevelStreamingActorsUpdateTimeLimit;
+
+	if (bConsiderTimeLimit)
+	{
+		// Give the actor initialization code more time if we're performing a high priority load or are in seamless travel
+		if (AWorldSettings* WorldSettings = GetWorldSettings(false, false))
+		{
+			if (WorldSettings->bHighPriorityLoading || WorldSettings->bHighPriorityLoadingLocal || IsInSeamlessTravel())
+			{
+				TimeLimit += GPriorityLevelStreamingActorsUpdateExtraTime;
+			}
+		}
+	}
+
 	if( bExecuteNextStep && !Level->bAlreadyMovedActors )
 	{
 		SCOPE_TIME_TO_VAR(&MoveActorTime);
@@ -2105,7 +2112,7 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 		FLevelUtils::ApplyLevelTransform( Level, LevelTransform, false );
 
 		Level->bAlreadyMovedActors = true;
-		bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("moving actors"), StartTime, Level ));
+		bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("moving actors"), StartTime, Level, TimeLimit));
 	}
 
 	if( bExecuteNextStep && !Level->bAlreadyShiftedActors )
@@ -2119,7 +2126,7 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 		}
 		
 		Level->bAlreadyShiftedActors = true;
-		bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("shifting actors"), StartTime, Level ));
+		bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("shifting actors"), StartTime, Level, TimeLimit ));
 	}
 
 	// Wait on any async DDC handles
@@ -2181,11 +2188,11 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 		{
 			Level->IncrementalUpdateComponents( (!IsGameWorld() || IsRunningCommandlet()) ? 0 : NumComponentsToUpdate, bRerunConstructionScript );
 		}
-		while( !Level->bAreComponentsCurrentlyRegistered && (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("updating components"), StartTime, Level )));
+		while( !Level->bAreComponentsCurrentlyRegistered && (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("updating components"), StartTime, Level, TimeLimit )));
 
 		// We are done once all components are attached.
 		Level->bAlreadyUpdatedComponents	= Level->bAreComponentsCurrentlyRegistered;
-		bExecuteNextStep					= Level->bAreComponentsCurrentlyRegistered && (!bConsiderTimeLimit || !IsTimeLimitExceeded(TEXT("updating components"), StartTime, Level));
+		bExecuteNextStep					= Level->bAreComponentsCurrentlyRegistered && (!bConsiderTimeLimit || !IsTimeLimitExceeded(TEXT("updating components"), StartTime, Level, TimeLimit));
 	}
 
 	if( IsGameWorld() && AreActorsInitialized() )
@@ -2197,7 +2204,7 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 
 			Level->InitializeNetworkActors();
 			Level->bAlreadyInitializedNetworkActors = true;
-			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("initializing network actors"), StartTime, Level ));
+			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("initializing network actors"), StartTime, Level, TimeLimit ));
 		}
 
 		// Route various initialization functions and set volumes.
@@ -2209,7 +2216,7 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 			Level->bAlreadyRoutedActorInitialize = true;
 			bStartup = 0;
 
-			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("routing Initialize on actors"), StartTime, Level ));
+			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("routing Initialize on actors"), StartTime, Level, TimeLimit ));
 		}
 
 		// Sort the actor list; can't do this on save as the relevant properties for sorting might have been changed by code
@@ -2219,7 +2226,7 @@ void UWorld::AddToWorld( ULevel* Level, const FTransform& LevelTransform )
 
 			Level->SortActorList();
 			Level->bAlreadySortedActorList = true;
-			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("sorting actor list"), StartTime, Level ));
+			bExecuteNextStep = (!bConsiderTimeLimit || !IsTimeLimitExceeded( TEXT("sorting actor list"), StartTime, Level, TimeLimit ));
 			bPerformedLastStep = true;
 		}
 	}
@@ -2489,12 +2496,16 @@ void FLevelStreamingGCHelper::PrepareStreamedOutLevelsForGC()
 				{
 					// This can never ever be called during tick; same goes for GC in general.
 					check( !World->bInTick );
-					UNetDriver *NetDriver = World->GetNetDriver();
-					if (NetDriver)
+
+					FWorldContext& MutableContext = GEngine->GetWorldContextFromWorldChecked(World);
+					for (FNamedNetDriver& Driver : MutableContext.ActiveNetDrivers)
 					{
-						// The net driver must remove this level and its actors from the packagemap, or else
-						// the client package map will keep hard refs to them and prevent GC
-						NetDriver->NotifyStreamingLevelUnload(Level);
+						if (Driver.NetDriver != nullptr)
+						{
+							// The net driver must remove this level and its actors from the packagemap, or else
+							// the client package map will keep hard refs to them and prevent GC
+							Driver.NetDriver->NotifyStreamingLevelUnload(Level);
+						}
 					}
 
 					// Broadcast level unloaded event to blueprints through level streaming objects
@@ -2628,7 +2639,7 @@ FString UWorld::BuildPIEPackagePrefix(int PIEInstanceID)
 bool UWorld::RemapCompiledScriptActor(FString& Str) const 
 {
 	// We're really only interested in compiled script actors, skip everything else.
-	if (!Str.Contains(TEXT("_C_")))
+	if (bDisableRemapScriptActors != 0 || !Str.Contains(TEXT("_C_")))
 	{
 		return false;
 	}
@@ -2663,7 +2674,7 @@ public:
 	{
 		ArIsObjectReferenceCollector = true;
 		ArIsModifyingWeakAndStrongReferences = true;
-		ArIsPersistent = false;
+		this->SetIsPersistent(false);
 		ArIgnoreArchetypeRef = true;
 	}
 	virtual FArchive& operator<<(FLazyObjectPtr& LazyObjectPtr) override
@@ -2826,6 +2837,8 @@ UWorld* UWorld::DuplicateWorldForPIE(const FString& PackageName, UWorld* OwningW
 void UWorld::UpdateLevelStreaming()
 {
 	SCOPE_CYCLE_COUNTER(STAT_UpdateLevelStreamingTime);
+	CSV_SCOPED_TIMING_STAT(Basic, UpdateLevelStreaming);
+
 	// do nothing if level streaming is frozen
 	if (bIsLevelStreamingFrozen)
 	{
@@ -3211,6 +3224,23 @@ bool UWorld::AllowLevelLoadRequests()
 	return true;
 }
 
+void UWorld::HandleTimelineScrubbed()
+{
+	// Stop any FX from the pools
+	GetPSCPool().ReclaimActiveParticleSystems();
+
+	// Stop particles that belong to the AWorldSettings actor, as this persists on scrub
+	if (AWorldSettings* WorldSettings = GetWorldSettings())
+	{
+		TArray<UParticleSystemComponent*> ParticleSystemComponents;
+		WorldSettings->GetComponents(ParticleSystemComponents);
+		for (UParticleSystemComponent* PSC : ParticleSystemComponents)
+		{
+			PSC->Complete();
+		}
+	}
+}
+
 bool UWorld::HandleDemoScrubCommand(const TCHAR* Cmd, FOutputDevice& Ar, UWorld* InWorld)
 {
 	FString TimeString;
@@ -3798,6 +3828,8 @@ void UWorld::CleanupWorld(bool bSessionEnded, bool bCleanupResources, UWorld* Ne
 		}
 	}
 
+	PSCPool.Cleanup();
+
 	FWorldDelegates::OnPostWorldCleanup.Broadcast(this, bSessionEnded, bCleanupResources);
 }
 
@@ -4784,7 +4816,7 @@ void UWorld::SendChallengeControlMessage(const FEncryptionKeyResponse& Response,
 			}
 			else
 			{
-				FString ResponseStr(Lex::ToString(Response.Response));
+				FString ResponseStr(LexToString(Response.Response));
 				UE_LOG(LogNet, Warning, TEXT("UWorld::SendChallengeControlMessage: encryption failure [%s] %s"), *ResponseStr, *Response.ErrorMsg);
 				FNetControlMessage<NMT_Failure>::Send(Connection, ResponseStr);
 				Connection->FlushNet();
@@ -6230,6 +6262,17 @@ void UWorld::SetSelectedLevels( const TArray<class ULevel*>& InLevels )
 	// Broadcast we have change the selections
 	BroadcastSelectedLevelsChanged();
 }
+
+FDelegateHandle UWorld::AddOnFeatureLevelChangedHandler(const FOnFeatureLevelChanged::FDelegate& InHandler)
+{
+	return OnFeatureLevelChanged.Add(InHandler);
+}
+
+void UWorld::RemoveOnFeatureLevelChangedHandler(FDelegateHandle InHandle)
+{
+	OnFeatureLevelChanged.Remove(InHandle);
+}
+
 #endif // WITH_EDITOR
 
 /**
@@ -6822,6 +6865,8 @@ void UWorld::ChangeFeatureLevel(ERHIFeatureLevel::Type InFeatureLevel, bool bSho
 			SlowTask.EnterProgressFrame(10.0f);
 			RecreateScene(InFeatureLevel);
 
+			OnFeatureLevelChanged.Broadcast(FeatureLevel);
+
 			SlowTask.EnterProgressFrame(10.0f);
 			TriggerStreamingDataRebuild();
 		}
diff --git a/Engine/Source/Runtime/Engine/Private/WorldSettings.cpp b/Engine/Source/Runtime/Engine/Private/WorldSettings.cpp
index 41564295f16b..b4ca41e90ae8 100644
--- a/Engine/Source/Runtime/Engine/Private/WorldSettings.cpp
+++ b/Engine/Source/Runtime/Engine/Private/WorldSettings.cpp
@@ -22,6 +22,7 @@
 #include "PhysicsEngine/PhysicsSettings.h"
 #include "UObject/ReleaseObjectVersion.h"
 #include "SceneManagement.h"
+#include "AI/AISystemBase.h"
 #include "AI/NavigationSystemConfig.h"
 #include "AI/NavigationSystemBase.h"
 
@@ -95,6 +96,8 @@ AWorldSettings::AWorldSettings(const FObjectInitializer& ObjectInitializer)
 #if WITH_EDITORONLY_DATA
 	bActorLabelEditable = false;
 #endif // WITH_EDITORONLY_DATA
+
+	bReplayRewindable = true;
 }
 
 void AWorldSettings::PostInitProperties()
@@ -622,5 +625,10 @@ void UHierarchicalLODSetup::PostEditChangeProperty(struct FPropertyChangedEvent&
 
 #endif // WITH_EDITOR
 
+FSoftClassPath AWorldSettings::GetAISystemClassName() const
+{
+	return bEnableAISystem ? UAISystemBase::GetAISystemClassName() : FSoftClassPath();
+}
+
 #undef LOCTEXT_NAMESPACE
 
diff --git a/Engine/Source/Runtime/Engine/Public/ActiveSound.h b/Engine/Source/Runtime/Engine/Public/ActiveSound.h
index 3ac745f322ad..4cee770e8f10 100644
--- a/Engine/Source/Runtime/Engine/Public/ActiveSound.h
+++ b/Engine/Source/Runtime/Engine/Public/ActiveSound.h
@@ -369,6 +369,9 @@ public:
 	/** Whether or not this active sound is playing audio, as in making audible sounds. */
 	uint8 bIsPlayingAudio:1;
 
+	/** Whether or not the active sound is stoppping. */
+	uint8 bIsStopping:1;
+
 public:
 	uint8 UserIndex;
 
@@ -590,7 +593,16 @@ private:
 	friend class FAudioDevice;
 
 	/** Stops the active sound. Can only be called from the owning audio device. */
-	void Stop();
+	void Stop(bool bStopNow);
+
+	/** Whether or not the active sound is stopping. */
+	bool IsStopping() const { return bIsStopping; }
+
+	/** Ensures that the sound has finished stopping. Waits until the sound finishes stopping naturally. */
+	void EnsureStopped();
+
+	/** Called when an active sound has been stopped but needs to update it's stopping sounds. Returns true when stopping sources have finished stopping. */
+	bool UpdateStoppingSources(uint64 CurrentTick, bool bEnsureStopped);
 
 	/** Sets the target volume multiplier to achieve over the specified time period */
 	void UpdateAdjustVolumeMultiplier(const float DeltaTime);
diff --git a/Engine/Source/Runtime/Engine/Public/AlphaBlend.h b/Engine/Source/Runtime/Engine/Public/AlphaBlend.h
index b69b4745c18a..4b43b17ea525 100644
--- a/Engine/Source/Runtime/Engine/Public/AlphaBlend.h
+++ b/Engine/Source/Runtime/Engine/Public/AlphaBlend.h
@@ -193,10 +193,8 @@ private:
 	/** internal flat to reset blend time. The two distinction is required. Otherwise, you'll modify blend time when you just change range */
 	bool bNeedsToResetBlendTime;
 
+	mutable bool bNeedsToResetCachedDesiredBlendedValue;
+
 	/** Cached Desired Value with Alpha 1 so that we can check if reached or not */
-	float CachedDesiredBlendedValue;
-	
-	/** This function refreshes desired blended value, so that we can check if we reached there or not. We make sure this value gets updated whenever any data changes. 
-	 *	IsComplete is called by Update, and recalc in every frame might not be worth it, so caching that data here*/
-	void RecacheDesiredBlendedValue();
+	mutable float CachedDesiredBlendedValue;
 };
diff --git a/Engine/Source/Runtime/Engine/Public/Animation/AnimCurveTypes.h b/Engine/Source/Runtime/Engine/Public/Animation/AnimCurveTypes.h
index 50170ddd8dce..08c477f8f11a 100644
--- a/Engine/Source/Runtime/Engine/Public/Animation/AnimCurveTypes.h
+++ b/Engine/Source/Runtime/Engine/Public/Animation/AnimCurveTypes.h
@@ -92,7 +92,7 @@ private:
 	int32		CurveTypeFlags;
 
 public:
-	FAnimCurveBase(){}
+	FAnimCurveBase() : CurveTypeFlags(0) {}
 
 	FAnimCurveBase(FSmartName InName, int32 InCurveTypeFlags)
 		: Name(InName)
@@ -266,16 +266,23 @@ struct FBaseBlendedCurve
 	TArray<FCurveElement, Allocator> Elements;
 
 	/**
-	* List of SmartName UIDs, retrieved from AnimInstanceProxy (which keeps authority)
+	* UID to array index look up table for Elements
+	* This eliminates the look up cost
 	*/
-	TArray<SmartName::UID_Type> const * UIDList;
+	TArray<uint16> const * UIDToArrayIndexLUT;
 
+	/** 
+	 * Valid Curve count 
+	 * This should match Elements.Num() 
+	 */
+	uint16 NumValidCurveCount;
 
 	/**
 	 * constructor
 	 */
 	FBaseBlendedCurve()
-		: UIDList(nullptr)
+		: UIDToArrayIndexLUT(nullptr)
+		, NumValidCurveCount(0)
 		, bInitialized(false)
 	{
 	}
@@ -283,16 +290,16 @@ struct FBaseBlendedCurve
 	/** Initialize Curve Data from following data */
 	void InitFrom(const FBoneContainer& RequiredBones)
 	{
-		InitFrom(&RequiredBones.GetAnimCurveNameUids());
+		InitFrom(&RequiredBones.GetUIDToArrayLookupTable());
 	}
 
-	void InitFrom(TArray<SmartName::UID_Type> const * InSmartNameUIDs)
+	void InitFrom(TArray<uint16> const * InUIDToArrayIndexLUT)
 	{
-		check(InSmartNameUIDs != nullptr);
-		UIDList = InSmartNameUIDs;
+		check(InUIDToArrayIndexLUT != nullptr);
+		UIDToArrayIndexLUT = InUIDToArrayIndexLUT;
+		NumValidCurveCount = GetValidElementCount(UIDToArrayIndexLUT);
 		Elements.Reset();
-		Elements.AddZeroed(UIDList->Num());
-
+		Elements.AddZeroed(NumValidCurveCount);
 		// no name, means no curve
 		bInitialized = true;
 	}
@@ -301,11 +308,12 @@ struct FBaseBlendedCurve
 	void InitFrom(const FBaseBlendedCurve<OtherAllocator>& InCurveToInitFrom)
 	{
 		// make sure this doesn't happen
-		check(InCurveToInitFrom.UIDList != nullptr);
-		UIDList = InCurveToInitFrom.UIDList;
+		check(InCurveToInitFrom.UIDToArrayIndexLUT != nullptr);
+		UIDToArrayIndexLUT = InCurveToInitFrom.UIDToArrayIndexLUT;
+		NumValidCurveCount = GetValidElementCount(UIDToArrayIndexLUT);
+
 		Elements.Reset();
-		Elements.AddZeroed(UIDList->Num());
-		
+		Elements.AddZeroed(NumValidCurveCount);
 		bInitialized = true;
 	}
 
@@ -314,11 +322,11 @@ struct FBaseBlendedCurve
 		// make sure this doesn't happen
 		if (ensure(&InCurveToInitFrom != this))
 		{
-			check(InCurveToInitFrom.UIDList != nullptr);
-			UIDList = InCurveToInitFrom.UIDList;
+			check(InCurveToInitFrom.UIDToArrayIndexLUT != nullptr);
+			UIDToArrayIndexLUT = InCurveToInitFrom.UIDToArrayIndexLUT;
+			NumValidCurveCount = GetValidElementCount(UIDToArrayIndexLUT);
 			Elements.Reset();
-			Elements.AddZeroed(UIDList->Num());
-
+			Elements.AddZeroed(NumValidCurveCount);
 			bInitialized = true;
 		}
 	}
@@ -326,11 +334,10 @@ struct FBaseBlendedCurve
 	/** Set value of InUID to InValue */
 	void Set(USkeleton::AnimCurveUID InUid, float InValue)
 	{
-		int32 ArrayIndex;
-
 		check(bInitialized);
 
-		if (UIDList->Find(InUid, ArrayIndex))
+		int32 ArrayIndex = GetArrayIndexByUID(InUid);
+		if (ArrayIndex != INDEX_NONE)
 		{
 			Elements[ArrayIndex].SetValue(InValue);
 		}
@@ -339,11 +346,10 @@ struct FBaseBlendedCurve
 	/** Get Value of InUID - @todo : add validation check here and make sure caller also knows it's not valid*/
 	float Get(USkeleton::AnimCurveUID InUid) const
 	{
-		int32 ArrayIndex;
-
 		check(bInitialized);
 
-		if (UIDList->Find(InUid, ArrayIndex))
+		int32 ArrayIndex = GetArrayIndexByUID(InUid);
+		if (ArrayIndex != INDEX_NONE)
 		{
 			return Elements[ArrayIndex].Value;
 		}
@@ -351,6 +357,42 @@ struct FBaseBlendedCurve
 		return 0.f;
 	}
 
+	/** Get Array Index by UID */
+	int32 GetArrayIndexByUID(USkeleton::AnimCurveUID InUid) const
+	{
+		int32 ArrayIndex = (*UIDToArrayIndexLUT)[InUid];
+		if (ArrayIndex != MAX_uint16)
+		{
+			return ArrayIndex;
+		}
+		return INDEX_NONE;
+	}
+
+	/** return true if enabled. return false otherwise. */
+	bool IsEnabled(USkeleton::AnimCurveUID InUid) const
+	{
+		check(bInitialized);
+
+		return ((*UIDToArrayIndexLUT)[InUid] != MAX_uint16);
+	}
+	
+	/** Get Valid Element Count from given UIDToArrayIndexLUT */
+	static int32 GetValidElementCount(TArray<uint16> const* InUIDToArrayIndexLUT) 
+	{
+		int32 Count = 0;
+		if (InUIDToArrayIndexLUT)
+		{
+			for (int32 Index = 0; Index<InUIDToArrayIndexLUT->Num(); ++Index)
+			{
+				if ((*InUIDToArrayIndexLUT)[Index] != MAX_uint16)
+				{
+					++Count;
+				}
+			}
+		}
+
+		return Count;
+	}	
 	/**
 	 * Blend (A, B) using Alpha, same as Lerp
 	 */
@@ -493,10 +535,11 @@ struct FBaseBlendedCurve
 	template <typename OtherAllocator>
 	void CopyFrom(const FBaseBlendedCurve<OtherAllocator>& CurveToCopyFrom)
 	{
-		checkf(CurveToCopyFrom.IsValid(), TEXT("Copying data from an invalid curve UIDList: 0x%x  (Sizes %i/%i)"), CurveToCopyFrom.UIDList, (CurveToCopyFrom.UIDList ? CurveToCopyFrom.UIDList->Num() : -1), CurveToCopyFrom.Elements.Num());
-		UIDList = CurveToCopyFrom.UIDList;
+		checkf(CurveToCopyFrom.IsValid(), TEXT("Copying data from an invalid curve UIDToArrayIndexLUT: 0x%x  (Sizes %i/%i)"), CurveToCopyFrom.UIDToArrayIndexLUT, (CurveToCopyFrom.UIDToArrayIndexLUT ? CurveToCopyFrom.UIDToArrayIndexLUT->Num() : -1), CurveToCopyFrom.Elements.Num());
+		UIDToArrayIndexLUT = CurveToCopyFrom.UIDToArrayIndexLUT;
 		Elements.Reset();
 		Elements.Append(CurveToCopyFrom.Elements);
+		NumValidCurveCount = GetValidElementCount(UIDToArrayIndexLUT);
 		bInitialized = true;
 	}
 
@@ -504,10 +547,11 @@ struct FBaseBlendedCurve
 	{
 		if (&CurveToCopyFrom != this)
 		{
-			checkf(CurveToCopyFrom.IsValid(), TEXT("Copying data from an invalid curve UIDList: 0x%x  (Sizes %i/%i)"), CurveToCopyFrom.UIDList, (CurveToCopyFrom.UIDList ? CurveToCopyFrom.UIDList->Num() : -1), CurveToCopyFrom.Elements.Num());
-			UIDList = CurveToCopyFrom.UIDList;
+			checkf(CurveToCopyFrom.IsValid(), TEXT("Copying data from an invalid curve UIDToArrayIndexLUT: 0x%x  (Sizes %i/%i)"), CurveToCopyFrom.UIDToArrayIndexLUT, (CurveToCopyFrom.UIDToArrayIndexLUT ? CurveToCopyFrom.UIDToArrayIndexLUT->Num() : -1), CurveToCopyFrom.Elements.Num());
+			UIDToArrayIndexLUT = CurveToCopyFrom.UIDToArrayIndexLUT;
 			Elements.Reset();
 			Elements.Append(CurveToCopyFrom.Elements);
+			NumValidCurveCount = GetValidElementCount(UIDToArrayIndexLUT);
 			bInitialized = true;
 		}
 	}
@@ -515,25 +559,20 @@ struct FBaseBlendedCurve
 	void Empty()
 	{
 		// Set to nullptr as we only received a ptr reference from USkeleton
-		UIDList = nullptr;
+		UIDToArrayIndexLUT = nullptr;
 		Elements.Reset();
+		NumValidCurveCount = 0;
 		bInitialized = false;
 	}
 
 	/**  Whether initialized or not */
 	bool bInitialized;
-	/** Empty and allocate Count number */
-	void Reset(int32 Count)
-	{
-		Elements.Reset();
-		Elements.Reserve(Count);
-	}
 
 	// Only checks bare minimal validity. (namely that we have a UID list and that it 
 	// is the same size as our element list
 	bool IsValid() const
 	{
-		return UIDList && (Elements.Num() == UIDList->Num());
+		return UIDToArrayIndexLUT != nullptr && (Elements.Num() == NumValidCurveCount);
 	}
 };
 
@@ -548,8 +587,8 @@ struct ENGINE_API FBlendedHeapCurve : public FBaseBlendedCurve<FDefaultAllocator
 	/** Once moved, source is invalid */
 	void MoveFrom(FBlendedHeapCurve& CurveToMoveFrom)
 	{
-    	UIDList = CurveToMoveFrom.UIDList;
-		CurveToMoveFrom.UIDList = nullptr;
+		UIDToArrayIndexLUT = CurveToMoveFrom.UIDToArrayIndexLUT;
+		CurveToMoveFrom.UIDToArrayIndexLUT = nullptr;
 		Elements = MoveTemp(CurveToMoveFrom.Elements);
 		bInitialized = true;
 		CurveToMoveFrom.bInitialized = false;
diff --git a/Engine/Source/Runtime/Engine/Public/Animation/AnimInstanceProxy.h b/Engine/Source/Runtime/Engine/Public/Animation/AnimInstanceProxy.h
index a184c6667c2e..9c54d8434073 100644
--- a/Engine/Source/Runtime/Engine/Public/Animation/AnimInstanceProxy.h
+++ b/Engine/Source/Runtime/Engine/Public/Animation/AnimInstanceProxy.h
@@ -106,15 +106,16 @@ public:
 		, Skeleton(nullptr)
 		, SkeletalMeshComponent(nullptr)
 		, CurrentDeltaSeconds(0.0f)
-#if WITH_EDITORONLY_DATA
-		, bIsBeingDebugged(false)
-#endif
+		, CurrentTimeDilation(1.0f)
 		, RootNode(nullptr)
 		, SubInstanceInputNode(nullptr)
 		, SyncGroupWriteIndex(0)
 		, RootMotionMode(ERootMotionMode::NoRootMotionExtraction)
-		, bShouldExtractRootMotion(false)
 		, bBoneCachesInvalidated(false)
+		, bShouldExtractRootMotion(false)
+#if WITH_EDITORONLY_DATA
+		, bIsBeingDebugged(false)
+#endif
 	{
 	}
 
@@ -124,15 +125,16 @@ public:
 		, Skeleton(nullptr)
 		, SkeletalMeshComponent(nullptr)
 		, CurrentDeltaSeconds(0.0f)
-#if WITH_EDITORONLY_DATA
-		, bIsBeingDebugged(false)
-#endif
+		, CurrentTimeDilation(1.0f)
 		, RootNode(nullptr)
 		, SubInstanceInputNode(nullptr)
 		, SyncGroupWriteIndex(0)
 		, RootMotionMode(ERootMotionMode::NoRootMotionExtraction)
-		, bShouldExtractRootMotion(false)
 		, bBoneCachesInvalidated(false)
+		, bShouldExtractRootMotion(false)
+#if WITH_EDITORONLY_DATA
+		, bIsBeingDebugged(false)
+#endif
 	{
 	}
 
@@ -159,6 +161,12 @@ public:
 		return CurrentDeltaSeconds;
 	}
 
+	/** Get the last time dilation, gleaned from world settings */
+	float GetTimeDilation() const
+	{
+		return CurrentTimeDilation;
+	}
+
 #if WITH_EDITORONLY_DATA
 	/** Whether the UAnimInstance this context refers to is currently being debugged in the editor */
 	bool IsBeingDebugged() const
@@ -406,6 +414,9 @@ public:
 
 	bool IsSlotNodeRelevantForNotifies(const FName& SlotNodeName) const;
 	/** Reset any dynamics running simulation-style updates (e.g. on teleport, time skip etc.) */
+	void ResetDynamics(ETeleportType InTeleportType);
+
+	DEPRECATED(4.20, "Please use ResetDynamics with a ETeleportType argument")
 	void ResetDynamics();
 
 	/** Get the relative transform of the component we are running on */
@@ -434,6 +445,9 @@ protected:
 	/** Called before update so we can copy any data we need */
 	virtual void PreUpdate(UAnimInstance* InAnimInstance, float DeltaSeconds);
 
+	/** Called during PreUpdate, if SkelMesh LOD has changed since last update */
+	void OnPreUpdateLODChanged(const int32 PreviousLODIndex, const int32 NewLODIndex);
+
 	/** Update override point */
 	virtual void Update(float DeltaSeconds) {}
 
@@ -670,6 +684,7 @@ protected:
 
 	/** Manually add object references to GC */
 	void AddReferencedObjects(UAnimInstance* InAnimInstance, FReferenceCollector& Collector);
+
 	/** Allow nodes to register log messages to be processed on the game thread */
 	void LogMessage(FName InLogType, EMessageSeverity::Type InSeverity, const FText& InMessage);
 
@@ -698,10 +713,10 @@ private:
 	/** The last time passed into PreUpdate() */
 	float CurrentDeltaSeconds;
 
-#if WITH_EDITORONLY_DATA
-	/** Whether this UAnimInstance is currently being debugged in the editor */
-	bool bIsBeingDebugged;
+	/** The last dime dilation (gleaned from world settings) */
+	float CurrentTimeDilation;
 
+#if WITH_EDITORONLY_DATA
 	/** Array of visited nodes this frame */
 	TArray<FAnimBlueprintDebugData::FNodeVisit> UpdatedNodesThisFrame;
 
@@ -750,9 +765,6 @@ private:
 	// Root motion mode duplicated from the anim instance
 	ERootMotionMode::Type RootMotionMode;
 
-	// Diplicate of bool result of ShouldExtractRootMotion()
-	bool bShouldExtractRootMotion;
-
 	// Read/write buffers Tracker map for slot name->weights/relevancy
 	TMap<FName, int32> SlotNameToTrackerIndex;
 	TArray<FMontageActiveSlotTracker> SlotWeightTracker[2];
@@ -785,11 +797,6 @@ private:
 	int16 NumUroSkippedFrames_Update;
 	int16 NumUroSkippedFrames_Eval;
 
-protected:
-
-	/** When RequiredBones mapping has changed, AnimNodes need to update their bones caches. */
-	bool bBoneCachesInvalidated;
-
 private:
 	/** Copy of UAnimInstance::MontageInstances data used for update & evaluation */
 	TArray<FMontageEvaluationState> MontageEvaluationData;
@@ -797,6 +804,9 @@ private:
 	/** Delegate fired on the game thread before update occurs */
 	TArray<FAnimNode_Base*> GameThreadPreUpdateNodes;
 
+	/** When GameThreadPreUpdateNodes are disabled due to LOD, they are stored here. To be potentially restored later. */
+	TArray<FAnimNode_Base*> LODDisabledGameThreadPreUpdateNodes;
+
 	/** All nodes that need to be reset on DynamicReset() */
 	TArray<FAnimNode_Base*> DynamicResetNodes;
 	
@@ -812,6 +822,7 @@ private:
 	/** Array of snapshots. Each entry contains a name for finding specific pose snapshots */
 	TArray<FPoseSnapshot> PoseSnapshots;
 
+#if !NO_LOGGING
 	/** Logged message queues. Allows nodes to report messages to MessageLog even though they may be running
 	 *  on a worked thread
 	 */
@@ -820,4 +831,20 @@ private:
 
 	/** Cache of guids generated from previously sent messages so we can stop spam*/
 	TArray<FGuid> PreviouslyLoggedMessages;
+#endif
+
+protected:
+
+	/** When RequiredBones mapping has changed, AnimNodes need to update their bones caches. */
+	uint8 bBoneCachesInvalidated : 1;
+
+private:
+
+	// Diplicate of bool result of ShouldExtractRootMotion()
+	uint8 bShouldExtractRootMotion : 1;
+
+#if WITH_EDITORONLY_DATA
+	/** Whether this UAnimInstance is currently being debugged in the editor */
+	uint8 bIsBeingDebugged : 1;
+#endif
 };
diff --git a/Engine/Source/Runtime/Engine/Public/Animation/AnimTypes.h b/Engine/Source/Runtime/Engine/Public/Animation/AnimTypes.h
index b200f19beb3d..d2cd50abd34f 100644
--- a/Engine/Source/Runtime/Engine/Public/Animation/AnimTypes.h
+++ b/Engine/Source/Runtime/Engine/Public/Animation/AnimTypes.h
@@ -691,3 +691,22 @@ struct FAxisOption
 	}
 };
 
+// The transform component (attribute) to read from
+UENUM()
+namespace EComponentType
+{
+	enum Type
+	{
+		None = 0,
+		TranslationX,
+		TranslationY,
+		TranslationZ,
+		RotationX,
+		RotationY,
+		RotationZ,
+		Scale UMETA(DisplayName = "Scale (largest component)"),
+		ScaleX,
+		ScaleY,
+		ScaleZ
+	};
+}
diff --git a/Engine/Source/Runtime/Engine/Public/Audio.h b/Engine/Source/Runtime/Engine/Public/Audio.h
index 398aa3f8a540..cd804c0a03ea 100644
--- a/Engine/Source/Runtime/Engine/Public/Audio.h
+++ b/Engine/Source/Runtime/Engine/Public/Audio.h
@@ -648,6 +648,17 @@ public:
 	/** Stops the sound source. */
 	ENGINE_API virtual void Stop();
 
+	ENGINE_API virtual void StopNow() { checkf(false, TEXT("This should not get called in non-audio mixer.")); };
+
+	/** Whether or not the source is stopping. Only implemented in audio mixer. */
+	virtual bool IsStopping() { return false; }
+
+	/** Makes sure the source stops. Only implemented in audio mixer. */
+	virtual void EnsureStopped() {}
+
+	/** Called after a sound has been stopped and needs cleaning up. */
+	virtual void ReleaseStoppedSound() {}
+
 	/** Returns true if the sound source has finished playing. */
 	virtual	bool IsFinished() = 0;
 	
@@ -825,6 +836,7 @@ protected:
 	uint32 bIsVirtual : 1;
 
 	friend class FAudioDevice;
+	friend struct FActiveSound;
 };
 
 
diff --git a/Engine/Source/Runtime/Engine/Public/AudioDevice.h b/Engine/Source/Runtime/Engine/Public/AudioDevice.h
index 5754b8a23b91..7c58140858e4 100644
--- a/Engine/Source/Runtime/Engine/Public/AudioDevice.h
+++ b/Engine/Source/Runtime/Engine/Public/AudioDevice.h
@@ -494,6 +494,7 @@ private:
 	bool HandleAudioSoloSoundCue(const TCHAR* Cmd, FOutputDevice& Ar);
 	bool HandleAudioMixerDebugSound(const TCHAR* Cmd, FOutputDevice& Ar);
 	bool HandleSoundClassFixup(const TCHAR* Cmd, FOutputDevice& Ar);
+	bool HandleAudioDebugSound(const TCHAR* Cmd, FOutputDevice& Ar);
 
 	/**
 	* Lists a summary of loaded sound collated by class
@@ -985,12 +986,14 @@ public:
 
 		bHRTFEnabledForAll_OnGameThread = bNewHRTFEnabledForAll;
 
+		DECLARE_CYCLE_STAT(TEXT("FAudioThreadTask.SetHRTFEnabledForAll"), STAT_SetHRTFEnabledForAll, STATGROUP_AudioThreadCommands);
+
 		FAudioDevice* AudioDevice = this;
 		FAudioThread::RunCommandOnAudioThread([AudioDevice, bNewHRTFEnabledForAll]()
 		{
 			AudioDevice->bHRTFEnabledForAll = bNewHRTFEnabledForAll;
 
-		});
+		}, GET_STATID(STAT_SetHRTFEnabledForAll));
 	}
 
 	void SetSpatializationInterfaceEnabled(bool InbSpatializationInterfaceEnabled)
@@ -1079,6 +1082,9 @@ public:
 	/** Returns the number of active sound sources */
 	virtual int32 GetNumActiveSources() const { return 0; }
 
+	/** Returns the number of free sources. */
+	int32 GetNumFreeSources() const { return Sources.Num(); }
+
 	/** Returns the sample rate used by the audio device. */
 	float GetSampleRate() const { return SampleRate; }
 
@@ -1341,6 +1347,11 @@ public:
 	{
 	}
 
+	/** Updates timing information for hardware. */
+	virtual void UpdateHardwareTiming()
+	{
+	}
+
 	/** Lets the platform any tick actions */
 	virtual void UpdateHardware()
 	{
@@ -1465,6 +1476,15 @@ public:
 	/** The maximum number of concurrent audible sounds */
 	int32 MaxChannels;
 
+	/** The number of sources to reserve for stopping sounds. */
+	int32 NumStoppingVoices;
+
+	/** The number of sources currently stopping. */
+	int32 CurrentStoppingVoiceCount;
+
+	/** The maximum number of wave instances allowed. */
+	int32 MaxWaveInstances;
+
 	/** The sample rate of all the audio devices */
 	int32 SampleRate;
 
@@ -1651,6 +1671,9 @@ private:
 	float DeviceDeltaTime;
 
 	TArray<FActiveSound*> ActiveSounds;
+	/** Array of sound waves to add references to avoid GC until gauranteed to be done with precache or decodes. */
+	TArray<USoundWave*> ReferencedSoundWaves;
+	TArray<USoundWave*> PrecachingSoundWaves;
 	TArray<FWaveInstance*> ActiveWaveInstances;
 
 	/** Cached copy of sound class adjusters array. Cached to avoid allocating every frame. */
@@ -1686,9 +1709,6 @@ private:
 	/** A count of the number of one-shot active sounds. */
 	uint32 OneShotCount;
 
-	/** The max number of one shot active sounds. */
-	uint32 MaxOneShotActiveSounds;
-
 	/** Threshold priority for allowing oneshot active sounds through the max oneshot active sound limit. */
 	float OneShotPriorityCullThreshold;
 };
diff --git a/Engine/Source/Runtime/Engine/Public/AudioDeviceManager.h b/Engine/Source/Runtime/Engine/Public/AudioDeviceManager.h
index ac788f32e371..260206f2cae9 100644
--- a/Engine/Source/Runtime/Engine/Public/AudioDeviceManager.h
+++ b/Engine/Source/Runtime/Engine/Public/AudioDeviceManager.h
@@ -177,6 +177,7 @@ public:
 
 	/** Enables debug logging and soloing of sounds that substring match the given sound name. Only works if built with AUDIO_MIXER_ENABLE_DEBUG_MODE is turned on. */
 	void SetAudioMixerDebugSound(const TCHAR* SoundName);
+	void SetAudioDebugSound(const TCHAR* SoundName);
 
 	/** Gets the solo sound class used for debugging sounds */
 	const FString& GetDebugSoloSoundClass() const;
@@ -190,6 +191,9 @@ public:
 	/** Gets the audio mixer debug sound name. Returns emptry string if AUDIO_MIXER_ENABLE_DEBUG_MODE is not enabled. */
 	const FString& GetAudioMixerDebugSoundName() const;
 
+	/** Gets the debug sound string, returns true if one has been set. */
+	bool GetAudioDebugSound(FString& OutDebugSound);
+
 public:
 
 	/** Array of all created buffers */
@@ -210,6 +214,12 @@ private:
 		FString DebugSoloSoundWave;
 		FString DebugSoloSoundCue;
 		FString DebugAudioMixerSoundName;
+		FString DebugSoundName;
+		bool bDebugSoundName;
+
+		FDebugNames()
+			: bDebugSoundName(false)
+		{}
 	};
 
 	/** Call back for garbage collector, ensures no processing is happening on the thread before collecting resources */
diff --git a/Engine/Source/Runtime/Engine/Public/AudioThread.h b/Engine/Source/Runtime/Engine/Public/AudioThread.h
index 940330e9a819..46e616abac9a 100644
--- a/Engine/Source/Runtime/Engine/Public/AudioThread.h
+++ b/Engine/Source/Runtime/Engine/Public/AudioThread.h
@@ -48,6 +48,17 @@ private:
 	void OnPreGarbageCollect();
 	void OnPostGarbageCollect();
 
+	/** Stat id of the currently executing audio thread command. */
+	static TStatId CurrentAudioThreadStatId;
+	static TStatId LongestAudioThreadStatId;
+	static double LongestAudioThreadTimeMsec;
+	static FCriticalSection CurrentAudioThreadStatIdCS;
+
+	/** Sets the current audio thread stat id. */
+	static void SetCurrentAudioThreadStatId(TStatId InStatId);
+	static void SetLongestTimeAndId(TStatId NewLongestId, double LongestTimeMsec);
+	static double GetCurrentLongestTime() { return LongestAudioThreadTimeMsec; }
+
 public:
 
 	FAudioThread();
@@ -81,8 +92,15 @@ public:
 	static ENGINE_API void SuspendAudioThread();
 	static ENGINE_API void ResumeAudioThread();
 
+	/** Retrieves the current audio thread stat id. Useful for reporting when an audio thread command stalls or deadlocks. */
+	static ENGINE_API FString GetCurrentAudioThreadStatId();
+
+	static ENGINE_API void ResetAudioThreadTimers();
+
+	static ENGINE_API void GetLongestTaskInfo(FString& OutLongestTask, double& OutLongestTaskTimeMs);
 };
 
+
 /** Suspends the audio thread for the duration of the lifetime of the object */
 struct FAudioThreadSuspendContext
 {
diff --git a/Engine/Source/Runtime/Engine/Public/BoneContainer.h b/Engine/Source/Runtime/Engine/Public/BoneContainer.h
index da4333ab3fa7..7b970489763a 100644
--- a/Engine/Source/Runtime/Engine/Public/BoneContainer.h
+++ b/Engine/Source/Runtime/Engine/Public/BoneContainer.h
@@ -49,6 +49,40 @@ struct FCurveEvaluationOption
 	{
 	}
 };
+
+/** Stores cached data for Orient and Scale bone translation retargeting */
+struct FOrientAndScaleRetargetingCachedData
+{
+	FQuat TranslationDeltaOrient;
+	float TranslationScale;
+	FVector SourceTranslation;
+	FVector TargetTranslation;
+
+	FOrientAndScaleRetargetingCachedData
+	(
+		const FQuat& InTranslationDeltaOrient, 
+		const float InTranslationScale, 
+		const FVector& InSourceTranslation,
+		const FVector& InTargetTranslation
+	)
+		: TranslationDeltaOrient(InTranslationDeltaOrient)
+		, TranslationScale(InTranslationScale)
+		, SourceTranslation(InSourceTranslation)
+		, TargetTranslation(InTargetTranslation)
+	{
+	}
+};
+
+/** Retargeting cached data for a specific Retarget Source */
+struct FRetargetSourceCachedData
+{
+	/** Orient and Scale cached data. */
+	TArray<FOrientAndScaleRetargetingCachedData> OrientAndScaleData;
+
+	/** LUT from CompactPoseIndex to OrientAndScaleIndex */
+	TArray<int32> CompactPoseIndexToOrientAndScaleIndex;
+};
+
 /**
 * This is a native transient structure.
 * Contains:
@@ -85,9 +119,6 @@ private:
 	// Look up from compact pose format to skeleton
 	TArray<FCompactPoseBoneIndex> SkeletonToCompactPose;
 
-	/** Animation Curve UID array that matters to this container. Recalculated everytime LOD changes. */
-	TArray<SmartName::UID_Type> AnimCurveNameUids;
-
 	// Compact pose format of Parent Bones (to save us converting to mesh space and back)
 	TArray<FCompactPoseBoneIndex> CompactPoseParentBones;
 
@@ -97,6 +128,9 @@ private:
 	// Array of cached virtual bone data so that animations running from raw data can generate them.
 	TArray<FVirtualBoneCompactPoseData> VirtualBoneCompactPoseData;
 
+	/** Look up table of UID to array index UIDToArrayIndexLUT[InUID] = ArrayIndex of order. If MAX_uint16, it is invalid.*/
+	TArray<uint16> UIDToArrayIndexLUT;
+
 	/** For debugging. */
 	/** Disable Retargeting. Extract animation, but do not retarget it. */
 	bool bDisableRetargeting;
@@ -252,11 +286,11 @@ public:
 	/** Returns true if bone is child of for current asset. */
 	bool BoneIsChildOf(const FCompactPoseBoneIndex& BoneIndex, const FCompactPoseBoneIndex& ParentBoneIndex) const;
 
-	/** Get AnimCurveNameUids for curve evaluation */
-	TArray<SmartName::UID_Type> const& GetAnimCurveNameUids() const
+	/** Get UID To Array look up table */
+	TArray<uint16> const& GetUIDToArrayLookupTable() const
 	{
-		return AnimCurveNameUids; 
-	} 
+		return UIDToArrayIndexLUT;
+	}
 
 	/**
 	* Serializes the bones
@@ -327,7 +361,15 @@ public:
 	/** Cache required Anim Curve Uids */
 	void CacheRequiredAnimCurveUids(const FCurveEvaluationOption& CurveEvalOption);
 
+	const FRetargetSourceCachedData& GetRetargetSourceCachedData(const FName& InRetargetSource) const;
+
 private:
+	/** 
+	 * Runtime cached data for retargeting from a specific RetargetSource to this current SkelMesh LOD.
+	 * @todo: We could also cache this once per skelmesh per lod, rather than creating it at runtime for each skelmesh instance.
+	 */
+	mutable TMap<FName, FRetargetSourceCachedData> RetargetSourceCachedDataLUT;
+
 	/** Initialize FBoneContainer. */
 	void Initialize(const FCurveEvaluationOption& CurveEvalOption);
 
@@ -337,6 +379,8 @@ private:
 	/** Cache remapping data if current Asset is a Skeleton, with all compatible Skeletons. */
 	void RemapFromSkeleton(USkeleton const & SourceSkeleton);
 };
+
+
 USTRUCT()
 struct FBoneReference
 {
diff --git a/Engine/Source/Runtime/Engine/Public/ChartCreation.h b/Engine/Source/Runtime/Engine/Public/ChartCreation.h
index 464f62b369b2..78e8504f302d 100644
--- a/Engine/Source/Runtime/Engine/Public/ChartCreation.h
+++ b/Engine/Source/Runtime/Engine/Public/ChartCreation.h
@@ -28,6 +28,9 @@ enum class EFrameHitchType : uint8
 	// Hitched and it was likely caused by the render thread
 	RenderThread,
 
+	// Hitched and it was likely caused by the RHI thread
+	RHIThread,
+
 	// Hitched and it was likely caused by the GPU
 	GPU
 };
@@ -59,12 +62,16 @@ public:
 		// Duration of each of the major functional units (GPU time is frequently inferred rather than actual)
 		double GameThreadTimeSeconds;
 		double RenderThreadTimeSeconds;
+		double RHIThreadTimeSeconds;
 		double GPUTimeSeconds;
 		/** Duration of the primary networking portion of the frame (that is, communication between server and clients). Currently happens on the game thread on both client and server. */
 		double GameDriverTickFlushTimeSeconds;
 		/** Duration of the replay networking portion of the frame. Can happen in a separate thread (not on servers). */
 		double DemoDriverTickFlushTimeSeconds;
 
+		/** Dynamic resolution screen percentage. 0.0 if dynamic resolution is disabled. */
+		double DynamicResolutionScreenPercentage;
+
 		/** Total time spent flushing async loading on the game thread this frame. */
 		double FlushAsyncLoadingTime;
 		/** Total number of times FlushAsyncLoading() was called this frame. */
@@ -78,6 +85,7 @@ public:
 		// Was this frame bound in one of the major functional units (only set if bBinThisFrame is true and the frame was longer than FEnginePerformanceTargets::GetTargetFrameTimeThresholdMS) 
 		bool bGameThreadBound;
 		bool bRenderThreadBound;
+		bool bRHIThreadBound;
 		bool bGPUBound;
 
 		// Did we hitch?
@@ -93,15 +101,18 @@ public:
 			, IdleOvershootSeconds(0.0)
 			, GameThreadTimeSeconds(0.0)
 			, RenderThreadTimeSeconds(0.0)
+			, RHIThreadTimeSeconds(0.0)
 			, GPUTimeSeconds(0.0)
 			, GameDriverTickFlushTimeSeconds(0.0)
 			, DemoDriverTickFlushTimeSeconds(0.0)
+			, DynamicResolutionScreenPercentage(0.0)
 			, FlushAsyncLoadingTime(0.0)
 			, FlushAsyncLoadingCount(0)
 			, SyncLoadCount(0)
 			, bBinThisFrame(false)
 			, bGameThreadBound(false)
 			, bRenderThreadBound(false)
+			, bRHIThreadBound(false)
 			, bGPUBound(false)
 			, HitchStatus(EFrameHitchType::NoHitch)
 		{
@@ -130,19 +141,25 @@ public:
 	// Hitch time histogram (in seconds)
 	FHistogram HitchTimeHistogram;
 
+	// Hitch time histogram (in seconds)
+	FHistogram DynamicResHistogram;
+
 	/** Number of frames for each time of <boundtype> **/
 	uint32 NumFramesBound_GameThread;
 	uint32 NumFramesBound_RenderThread;
+	uint32 NumFramesBound_RHIThread;
 	uint32 NumFramesBound_GPU;
 
 	/** Time spent bound on each kind of thing (in seconds) */
 	double TotalFramesBoundTime_GameThread;
 	double TotalFramesBoundTime_RenderThread;
+	double TotalFramesBoundTime_RHIThread;
 	double TotalFramesBoundTime_GPU;
 
 	/** Total time spent on each thread (in seconds) */
 	double TotalFrameTime_GameThread;
 	double TotalFrameTime_RenderThread;
+	double TotalFrameTime_RHIThread;
 	double TotalFrameTime_GPU;
 
 	/** Total time spent flushing async loading (in seconds), and call count */
@@ -156,6 +173,7 @@ public:
 	/** Total number of hitches bound by each kind of thing */
 	int32 TotalGameThreadBoundHitchCount;
 	int32 TotalRenderThreadBoundHitchCount;
+	int32 TotalRHIThreadBoundHitchCount;
 	int32 TotalGPUBoundHitchCount;
 
 	/** Total number of draw calls made */
@@ -174,6 +192,15 @@ public:
 	/** Total accumulated raw (including idle) time spent with the chart registered */
 	double AccumulatedChartTime;
 
+	float StartTemperatureLevel;
+	float StopTemperatureLevel;
+	float MinTemperatureLevel;
+	float MaxTemperatureLevel;
+
+	int StartBatteryLevel;
+	int StopBatteryLevel;
+	FHistogram BatteryLevelHistogram;
+
 public:
 	FPerformanceTrackingChart(const FDateTime& InStartTime, const FString& InChartLabel);
 
@@ -283,6 +310,7 @@ public:
 	TArray<float> GPUFrameTimes;
 	TArray<float> FrameTimes;
 	TArray<int32> ActiveModes;
+	TArray<float> DynamicResolutionScreenPercentages;
 
 	/** Start time of the capture */
 	const FDateTime CaptureStartTime;
@@ -369,6 +397,8 @@ protected:
 	float AvgFPS;
 	float TimeDisregarded;
 	float AvgGPUFrameTime;
+	float AvgRenderThreadFrameTime;
+	float AvgGameThreadFrameTime;
 
 	double TotalFlushAsyncLoadingTimeInMS;
 	int32  TotalFlushAsyncLoadingCalls;
@@ -402,5 +432,6 @@ protected:
 	virtual void HandleHitchBucket(const FHistogram& HitchHistogram, int32 BucketIndex);
 	virtual void HandleHitchSummary(int32 TotalHitchCount, double TotalTimeSpentInHitchBuckets);
 	virtual void HandleFPSThreshold(int32 TargetFPS, int32 NumFramesBelow, float PctTimeAbove, float PctMissedFrames);
+	virtual void HandleDynamicResThreshold(int32 TargetScreenPercentage, float PctTimeAbove);
 	virtual void HandleBasicStats();
 };
diff --git a/Engine/Source/Runtime/Engine/Public/CollisionQueryParams.h b/Engine/Source/Runtime/Engine/Public/CollisionQueryParams.h
index 5e973e7dc007..5aae87a0a7f9 100644
--- a/Engine/Source/Runtime/Engine/Public/CollisionQueryParams.h
+++ b/Engine/Source/Runtime/Engine/Public/CollisionQueryParams.h
@@ -184,6 +184,7 @@ public:
 
 	/** Add a collection of actors for this trace to ignore */
 	void AddIgnoredActors(const TArray<AActor*>& InIgnoreActors);
+	void AddIgnoredActors(const TArray<const AActor*>& InIgnoreActors);
 
 	/** Variant that uses an array of TWeakObjectPtrs */
 	void AddIgnoredActors(const TArray<TWeakObjectPtr<AActor> >& InIgnoreActors);
diff --git a/Engine/Source/Runtime/Engine/Public/Components.h b/Engine/Source/Runtime/Engine/Public/Components.h
index 261d34f42bec..aa0793a77a19 100644
--- a/Engine/Source/Runtime/Engine/Public/Components.h
+++ b/Engine/Source/Runtime/Engine/Public/Components.h
@@ -45,15 +45,15 @@ struct FStaticMeshDataType
 	/** The stream to read the vertex color from. */
 	FVertexStreamComponent ColorComponent;
 
-	FShaderResourceViewRHIParamRef PositionComponentSRV;
+	FShaderResourceViewRHIParamRef PositionComponentSRV = nullptr;
 
-	FShaderResourceViewRHIParamRef TangentsSRV;
+	FShaderResourceViewRHIParamRef TangentsSRV = nullptr;
 
 	/** A SRV to manually bind and load TextureCoordinates in the Vertexshader. */
-	FShaderResourceViewRHIParamRef TextureCoordinatesSRV;
+	FShaderResourceViewRHIParamRef TextureCoordinatesSRV = nullptr;
 
 	/** A SRV to manually bind and load Colors in the Vertexshader. */
-	FShaderResourceViewRHIParamRef ColorComponentsSRV;
+	FShaderResourceViewRHIParamRef ColorComponentsSRV = nullptr;
 
 	int LightMapCoordinateIndex = -1;
 	int NumTexCoords = -1;
diff --git a/Engine/Source/Runtime/Engine/Public/DebugViewModeHelpers.h b/Engine/Source/Runtime/Engine/Public/DebugViewModeHelpers.h
index e077f336597b..042d7313b06e 100644
--- a/Engine/Source/Runtime/Engine/Public/DebugViewModeHelpers.h
+++ b/Engine/Source/Runtime/Engine/Public/DebugViewModeHelpers.h
@@ -47,5 +47,6 @@ ENGINE_API int32 GetNumActorsInWorld(UWorld* InWorld);
 ENGINE_API bool GetUsedMaterialsInWorld(UWorld* InWorld, OUT TSet<UMaterialInterface*>& OutMaterials, struct FSlowTask& Task);
 ENGINE_API bool CompileDebugViewModeShaders(EDebugViewShaderMode Mode, EMaterialQualityLevel::Type QualityLevel, ERHIFeatureLevel::Type FeatureLevel, bool bFullRebuild, bool bWaitForPreviousShaders, TSet<UMaterialInterface*>& Materials, FSlowTask& ProgressTask);
 
+ENGINE_API bool WaitForShaderCompilation(const FText& Message, FSlowTask& ProgressTask);
 
 
diff --git a/Engine/Source/Runtime/Engine/Public/DrawDebugHelpers.h b/Engine/Source/Runtime/Engine/Public/DrawDebugHelpers.h
index df2438ce0815..0da4ebd3f909 100644
--- a/Engine/Source/Runtime/Engine/Public/DrawDebugHelpers.h
+++ b/Engine/Source/Runtime/Engine/Public/DrawDebugHelpers.h
@@ -44,7 +44,7 @@ ENGINE_API void DrawDebugCylinder(const UWorld* InWorld, FVector const& Start, F
 ENGINE_API void DrawDebugCone(const UWorld* InWorld, FVector const& Origin, FVector const& Direction, float Length, float AngleWidth, float AngleHeight, int32 NumSides, FColor const& Color, bool bPersistentLines=false, float LifeTime=-1.f, uint8 DepthPriority = 0, float Thickness = 0.f);
 /** Used by gameplay when defining a cone by a vertical and horizontal dot products. */
 ENGINE_API void DrawDebugAltCone(const UWorld* InWorld, FVector const& Origin, FRotator const& Rotation, float Length, float AngleWidth, float AngleHeight, FColor const& DrawColor, bool bPersistentLines=false, float LifeTime=-1.f, uint8 DepthPriority=0, float Thickness = 0.f);
-ENGINE_API void DrawDebugString(const UWorld* InWorld, FVector const& TextLocation, const FString& Text, class AActor* TestBaseActor = NULL, FColor const& TextColor = FColor::White, float Duration = -1.000000, bool bDrawShadow = false);
+ENGINE_API void DrawDebugString(const UWorld* InWorld, FVector const& TextLocation, const FString& Text, class AActor* TestBaseActor = NULL, FColor const& TextColor = FColor::White, float Duration = -1.000000, bool bDrawShadow = false, float FontScale = 1.f);
 ENGINE_API void DrawDebugFrustum(const UWorld* InWorld, const FMatrix& FrustumToWorld, FColor const& Color, bool bPersistentLines = false, float LifeTime=-1.f, uint8 DepthPriority = 0, float Thickness = 0.f);
 /** Draw a circle using user define axis and radius */
 ENGINE_API void DrawCircle(const UWorld* InWorld, const FVector& Base, const FVector& X, const FVector& Y, const FColor& Color, float Radius, int32 NumSides, bool bPersistentLines = false, float LifeTime = -1.f, uint8 DepthPriority = 0, float Thickness = 0);
diff --git a/Engine/Source/Runtime/Engine/Public/DynamicResolutionState.h b/Engine/Source/Runtime/Engine/Public/DynamicResolutionState.h
index fc4424bf3c40..1d6f94aade0e 100644
--- a/Engine/Source/Runtime/Engine/Public/DynamicResolutionState.h
+++ b/Engine/Source/Runtime/Engine/Public/DynamicResolutionState.h
@@ -45,14 +45,14 @@ public:
 	/** Setup a screen percentage driver for a given view family. */
 	virtual void SetupMainViewFamily(class FSceneViewFamily& ViewFamily) = 0;
 
+protected:
+
 	/** Returns a non thread safe aproximation of the current resolution fraction applied on render thread, mostly used for stats and analytic. */
 	virtual float GetResolutionFractionApproximation() const = 0;
 
 	/** Returns the max resolution resolution fraction. */
 	virtual float GetResolutionFractionUpperBound() const = 0;
 
-protected:
-
 	/** Enables/Disables dynamic resolution. This is only called by GEngine automatically. */
 	virtual void SetEnabled(bool bEnable) = 0;
 
diff --git a/Engine/Source/Runtime/Engine/Public/EngineAnalytics.h b/Engine/Source/Runtime/Engine/Public/EngineAnalytics.h
index e52ff3811a2e..35d6595fd496 100644
--- a/Engine/Source/Runtime/Engine/Public/EngineAnalytics.h
+++ b/Engine/Source/Runtime/Engine/Public/EngineAnalytics.h
@@ -9,15 +9,14 @@ class IAnalyticsProvider;
 class IAnalyticsProviderET;
 
 /**
- * The public interface for the engine's analytics provider singleton.
- * For Epic builds, this will point to epic's internal analytics provider.
- * For licensee builds, it will be NULL by default unless they provide their own
- * configuration.
+ * The public interface for the editor's analytics provider singleton.
  * 
- * WARNING: This is an analytics provider instance that is created whenever UE4 is launched. 
+ * WARNING: This is an analytics provider instance that is created whenever UE4 editor is launched. 
  * It is intended ONLY for use by Epic Games. This is NOT intended for games to send 
  * game-specific telemetry. Create your own provider instance for your game and configure
  * it independently.
+ *
+ * It is called FEngineAnalytics for legacy reasons, and is only used for editor telemetry.
  */
 class FEngineAnalytics : FNoncopyable
 {
@@ -33,17 +32,11 @@ public:
 	static ENGINE_API void Initialize();
 	/** Called to shut down the singleton */
 	static ENGINE_API void Shutdown(bool bIsEngineShutdown = false);
-	/** Is this an editor run? (false for games and commandlets) */
-	static ENGINE_API bool IsEditorRun() { return bIsEditorRun; }
-	/** Is this a game run? (false for the editor, commandlets, programs and non-cooked games) */
-	static ENGINE_API bool IsGameRun() { return bIsGameRun; }
 
 	static ENGINE_API void Tick(float DeltaTime);
 
 private:
 	static bool bIsInitialized;
-	static bool bIsEditorRun;
-	static bool bIsGameRun;
 	static ENGINE_API TSharedPtr<IAnalyticsProviderET> Analytics;
 	static TSharedPtr<FEngineSessionManager> SessionManager;
 };
diff --git a/Engine/Source/Runtime/Engine/Public/EngineLogs.h b/Engine/Source/Runtime/Engine/Public/EngineLogs.h
index 5282a2983be3..26423873fe35 100644
--- a/Engine/Source/Runtime/Engine/Public/EngineLogs.h
+++ b/Engine/Source/Runtime/Engine/Public/EngineLogs.h
@@ -8,7 +8,6 @@
 
 class Error;
 
-ENGINE_API DECLARE_LOG_CATEGORY_EXTERN(LogMCP, Warning, All);
 ENGINE_API DECLARE_LOG_CATEGORY_EXTERN(LogPath, Warning, All);
 ENGINE_API DECLARE_LOG_CATEGORY_EXTERN(LogPhysics, Warning, All);
 ENGINE_API DECLARE_LOG_CATEGORY_EXTERN(LogBlueprint, Warning, All);
diff --git a/Engine/Source/Runtime/Engine/Public/EngineStats.h b/Engine/Source/Runtime/Engine/Public/EngineStats.h
index 96d363fafac0..2d029637f74d 100644
--- a/Engine/Source/Runtime/Engine/Public/EngineStats.h
+++ b/Engine/Source/Runtime/Engine/Public/EngineStats.h
@@ -34,6 +34,7 @@ DECLARE_CYCLE_STAT_EXTERN(TEXT("Deferred Tick Time"),STAT_DeferredTickTime,STATG
 /** Unit time stats */
 DECLARE_FLOAT_COUNTER_STAT_EXTERN(TEXT("StatUnit FrameTime"), STAT_UnitFrame, STATGROUP_Engine, );
 DECLARE_FLOAT_COUNTER_STAT_EXTERN(TEXT("StatUnit RenderThreadTime"), STAT_UnitRender, STATGROUP_Engine, );
+DECLARE_FLOAT_COUNTER_STAT_EXTERN(TEXT("StatUnit RHIThreadTime"), STAT_UnitRHIT, STATGROUP_Engine, );
 DECLARE_FLOAT_COUNTER_STAT_EXTERN(TEXT("StatUnit GameThreadTime"), STAT_UnitGame, STATGROUP_Engine, );
 DECLARE_FLOAT_COUNTER_STAT_EXTERN(TEXT("StatUnit GPUTime"), STAT_UnitGPU, STATGROUP_Engine, );
 
diff --git a/Engine/Source/Runtime/Engine/Public/GPUSkinVertexFactory.h b/Engine/Source/Runtime/Engine/Public/GPUSkinVertexFactory.h
index 18d1ec915369..c6459fd9d02a 100644
--- a/Engine/Source/Runtime/Engine/Public/GPUSkinVertexFactory.h
+++ b/Engine/Source/Runtime/Engine/Public/GPUSkinVertexFactory.h
@@ -246,7 +246,7 @@ public:
 			}
 		}
 		
-		// if FeatureLevel < ERHIFeatureLevel::ES3_1
+		// if FeatureLevel <= ERHIFeatureLevel::ES3_1
 		FUniformBufferRHIParamRef GetUniformBuffer() const
 		{
 			return UniformBuffer;
@@ -296,7 +296,7 @@ public:
 		// RevisionNumber Tracker
 		uint32 PreviousRevisionNumber;
 		uint32 CurrentRevisionNumber;
-		// if FeatureLevel < ERHIFeatureLevel::ES3_1
+		// if FeatureLevel <= ERHIFeatureLevel::ES3_1
 		FUniformBufferRHIRef UniformBuffer;
 		
 		static TConsoleVariableData<int32>* MaxBonesVar;
@@ -383,7 +383,7 @@ private:
 
 /** Vertex factory with vertex stream components for GPU skinned vertices */
 template<bool bExtraBoneInfluencesT>
-class TGPUSkinVertexFactory : public FGPUBaseSkinVertexFactory
+class ENGINE_API TGPUSkinVertexFactory : public FGPUBaseSkinVertexFactory
 {
 	DECLARE_VERTEX_FACTORY_TYPE(TGPUSkinVertexFactory<bExtraBoneInfluencesT>);
 
@@ -695,12 +695,26 @@ public:
 			check(ClothSimulPositionNormalBuffer[Index].VertexBufferRHI.IsValid());
 			return ClothSimulPositionNormalBuffer[Index];
 		}
-
-		/**
-		* Matrix to apply to positions/normals
-		*/
-		FMatrix ClothLocalToWorld;
 		
+		FMatrix& GetClothLocalToWorldForWriting(uint32 FrameNumber)
+		{
+			uint32 Index = GetOldestIndex(FrameNumber);
+
+			return ClothLocalToWorld[Index];
+		}
+
+		const FMatrix& GetClothLocalToWorldForReading(bool bPrevious, uint32 FrameNumber) const
+		{
+			int32 Index = GetMostRecentIndex(FrameNumber);
+
+			if(bPrevious && DoWeHavePreviousData())
+			{
+				Index = 1 - Index;
+			}
+
+			return ClothLocalToWorld[Index];
+		}
+
 		/**
 		 * weight to blend between simulated positions and key-framed poses
 		 * if ClothBlendWeight is 1.0, it shows only simulated positions and if it is 0.0, it shows only key-framed animation
@@ -715,6 +729,11 @@ public:
 		// from GFrameNumber, to detect pause and old data when an object was not rendered for some time
 		uint32 BufferFrameNumber[2];
 
+		/**
+		 * Matrix to apply to positions/normals
+		 */
+		FMatrix ClothLocalToWorld[2];
+
 		// @return 0 / 1, index into ClothSimulPositionNormalBuffer[]
 		uint32 GetMostRecentIndex(uint32 FrameNumber) const
 		{
@@ -777,6 +796,9 @@ public:
 			// both are not valid
 			BufferFrameNumber[0] = -1;
 			BufferFrameNumber[1] = -1;
+
+			ClothLocalToWorld[0] = FMatrix::Identity;
+			ClothLocalToWorld[1] = FMatrix::Identity;
 		}
 	};
 
diff --git a/Engine/Source/Runtime/Engine/Public/GenericQuadTree.h b/Engine/Source/Runtime/Engine/Public/GenericQuadTree.h
index b1dc48f1a1b9..5397f0b5397d 100644
--- a/Engine/Source/Runtime/Engine/Public/GenericQuadTree.h
+++ b/Engine/Source/Runtime/Engine/Public/GenericQuadTree.h
@@ -128,7 +128,7 @@ void TQuadTree<ElementType, NodeCapacity>::Serialize(FArchive& Ar)
 	{
 		if(SubTreeFlags[Idx])
 		{
-			if(Ar.ArIsLoading)
+			if(Ar.IsLoading())
 			{
 				SubTrees[Idx] = new TreeType(FBox2D(), MinimumQuadSize);
 			}
diff --git a/Engine/Source/Runtime/Engine/Public/LegacyScreenPercentageDriver.h b/Engine/Source/Runtime/Engine/Public/LegacyScreenPercentageDriver.h
index ffea75e36f28..a7f3b277aaf0 100644
--- a/Engine/Source/Runtime/Engine/Public/LegacyScreenPercentageDriver.h
+++ b/Engine/Source/Runtime/Engine/Public/LegacyScreenPercentageDriver.h
@@ -15,7 +15,18 @@
 class ENGINE_API FLegacyScreenPercentageDriver : public ISceneViewFamilyScreenPercentage
 {
 public:
-	FLegacyScreenPercentageDriver(const FSceneViewFamily& ViewFamily, float GlobalResolutionFraction, bool AllowPostProcessSettingsScreenPercentage);
+	FORCEINLINE FLegacyScreenPercentageDriver(
+		const FSceneViewFamily& InViewFamily,
+		float InGlobalResolutionFraction,
+		bool InAllowPostProcessSettingsScreenPercentage)
+		: FLegacyScreenPercentageDriver(InViewFamily, InGlobalResolutionFraction, InAllowPostProcessSettingsScreenPercentage, InGlobalResolutionFraction)
+	{ }
+
+	FLegacyScreenPercentageDriver(
+		const FSceneViewFamily& InViewFamily,
+		float InGlobalResolutionFraction,
+		bool InAllowPostProcessSettingsScreenPercentage,
+		float InGlobalResolutionFractionUpperBound);
 
 	/** Gets the view rect fraction from the r.ScreenPercentage cvar. */
 	static float GetCVarResolutionFraction();
@@ -28,6 +39,9 @@ private:
 	// ViewRect fraction to apply to all view of the view family.
 	const float GlobalResolutionFraction;
 
+	// ViewRect fraction to apply to all view of the view family.
+	const float GlobalResolutionFractionUpperBound;
+
 	// Whether FPostProcessSettings::ScreenPercentage should be applied or not.
 	const bool AllowPostProcessSettingsScreenPercentage;
 
diff --git a/Engine/Source/Runtime/Engine/Public/MaterialCompiler.h b/Engine/Source/Runtime/Engine/Public/MaterialCompiler.h
index f9aa021c71f8..83ad991b9e1a 100644
--- a/Engine/Source/Runtime/Engine/Public/MaterialCompiler.h
+++ b/Engine/Source/Runtime/Engine/Public/MaterialCompiler.h
@@ -82,10 +82,10 @@ public:
 	virtual int32 ForceCast(int32 Code,EMaterialValueType DestType,uint32 ForceCastFlags = 0) = 0;
 
 	/** Pushes a function onto the compiler's function stack, which indicates that compilation is entering a function. */
-	virtual void PushFunction(const FMaterialFunctionCompileState& FunctionState) = 0;
+	virtual void PushFunction(FMaterialFunctionCompileState* FunctionState) = 0;
 
 	/** Pops a function from the compiler's function stack, which indicates that compilation is leaving a function. */
-	virtual FMaterialFunctionCompileState PopFunction() = 0;
+	virtual FMaterialFunctionCompileState* PopFunction() = 0;
 
 	virtual int32 GetCurrentFunctionStackDepth() = 0;
 
@@ -322,8 +322,8 @@ public:
 
 	virtual int32 CallExpression(FMaterialExpressionKey ExpressionKey,FMaterialCompiler* InCompiler) override { return Compiler->CallExpression(ExpressionKey,InCompiler); }
 
-	virtual void PushFunction(const FMaterialFunctionCompileState& FunctionState) override { Compiler->PushFunction(FunctionState); }
-	virtual FMaterialFunctionCompileState PopFunction() override { return Compiler->PopFunction(); }
+	virtual void PushFunction(FMaterialFunctionCompileState* FunctionState) override { Compiler->PushFunction(FunctionState); }
+	virtual FMaterialFunctionCompileState* PopFunction() override { return Compiler->PopFunction(); }
 	virtual int32 GetCurrentFunctionStackDepth() override { return Compiler->GetCurrentFunctionStackDepth(); }
 
 	virtual EMaterialValueType GetType(int32 Code) override { return Compiler->GetType(Code); }
diff --git a/Engine/Source/Runtime/Engine/Public/MaterialShared.h b/Engine/Source/Runtime/Engine/Public/MaterialShared.h
index 919c4dfee005..71dd5ac0c09a 100644
--- a/Engine/Source/Runtime/Engine/Public/MaterialShared.h
+++ b/Engine/Source/Runtime/Engine/Public/MaterialShared.h
@@ -143,6 +143,8 @@ enum EMaterialDomain
 	MD_MAX
 };
 
+ENGINE_API FString MaterialDomainString(EMaterialDomain MaterialDomain);
+
 /**
  * The context of a material being rendered.
  */
@@ -381,6 +383,8 @@ public:
 	FMaterialCompilationOutput() :
 		NumUsedUVScalars(0),
 		NumUsedCustomInterpolatorScalars(0),
+		EstimatedNumTextureSamplesVS(0),
+		EstimatedNumTextureSamplesPS(0),
 		bRequiresSceneColorCopy(false),
 		bNeedsSceneTextures(false),
 		bUsesEyeAdaptation(false),
@@ -402,6 +406,10 @@ public:
 	/** Number of used custom vertex interpolation scalars. */
 	uint8 NumUsedCustomInterpolatorScalars;
 
+	/** Number of times SampleTexture is called, excludes custom nodes. */
+	uint16 EstimatedNumTextureSamplesVS;
+	uint16 EstimatedNumTextureSamplesPS;
+
 	/** Indicates whether the material uses scene color. */
 	bool bRequiresSceneColorCopy;
 
@@ -737,9 +745,16 @@ public:
 	 */
 	bool TryToAddToExistingCompilationTask(FMaterial* Material);
 
+#if WITH_EDITOR
+	ENGINE_API const FString *GetShaderSource(const FName ShaderTypeName) const;
+#endif
+
 	/** Builds a list of the shaders in a shader map. */
 	ENGINE_API void GetShaderList(TMap<FShaderId, FShader*>& OutShaders) const;
 
+	/** Builds a list of the shaders in a shader map. Key is FShaderType::TypeName */
+	ENGINE_API void GetShaderList(TMap<FName, FShader*>& OutShaders) const;
+
 	/** Builds a list of the shader pipelines in a shader map. */
 	ENGINE_API void GetShaderPipelineList(TArray<FShaderPipeline*>& OutShaderPipelines) const;
 
@@ -835,6 +850,7 @@ public:
 	bool UsesSceneDepthLookup() const { return MaterialCompilationOutput.bUsesSceneDepthLookup; }
 	uint32 GetNumUsedUVScalars() const { return MaterialCompilationOutput.NumUsedUVScalars; }
 	uint32 GetNumUsedCustomInterpolatorScalars() const { return MaterialCompilationOutput.NumUsedCustomInterpolatorScalars; }
+	void GetEstimatedNumTextureSamples(uint32& VSSamples, uint32& PSSamples) const { VSSamples = MaterialCompilationOutput.EstimatedNumTextureSamplesVS; PSSamples = MaterialCompilationOutput.EstimatedNumTextureSamplesPS; }
 
 	bool IsValidForRendering() const
 	{
@@ -859,6 +875,8 @@ public:
 			}
 		}
 	}
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, const struct FStableShaderKeyAndValue& SaveKeyVal);
 
 private:
 
@@ -926,6 +944,11 @@ private:
 #if ALLOW_SHADERMAP_DEBUG_DATA
 	/** Debug information about how the material shader map was compiled. */
 	FString DebugDescription;
+
+#if WITH_EDITOR
+	/** Map that stores source code used to compile a certain shader present in this FMaterialShaderMap instance. Key is ShaderType::TypeName. */
+	TMap<FName, FString> ShaderProcessedSource;
+#endif
 #endif
 
 	FShader* ProcessCompilationResultsForSingleJob(class FShaderCompileJob* SingleJob, const FShaderPipelineType* ShaderPipeline, const FSHAHash& MaterialShaderMapHash);
@@ -999,6 +1022,41 @@ public:
 class FMaterialFunctionCompileState
 {
 public:
+	explicit FMaterialFunctionCompileState(UMaterialExpressionMaterialFunctionCall* InFunctionCall)
+		: FunctionCall(InFunctionCall)
+	{}
+
+	~FMaterialFunctionCompileState()
+	{
+		ClearSharedFunctionStates();
+	}
+
+	FMaterialFunctionCompileState* FindOrAddSharedFunctionState(FMaterialExpressionKey& ExpressionKey, class UMaterialExpressionMaterialFunctionCall* SharedFunctionCall)
+	{
+		if (FMaterialFunctionCompileState** ExistingState = SharedFunctionStates.Find(ExpressionKey))
+		{
+			return *ExistingState;
+		}
+		return SharedFunctionStates.Add(ExpressionKey, new FMaterialFunctionCompileState(SharedFunctionCall));
+	}
+
+	void ClearSharedFunctionStates()
+	{
+		for (auto SavedStateIt = SharedFunctionStates.CreateIterator(); SavedStateIt; ++SavedStateIt)
+		{
+			FMaterialFunctionCompileState* SavedState = SavedStateIt.Value();
+			SavedState->ClearSharedFunctionStates();
+			delete SavedState;
+		}
+		SharedFunctionStates.Empty();
+	}
+
+	void Reset()
+	{
+		ExpressionStack.Empty();
+		ExpressionCodeMap.Empty();
+		ClearSharedFunctionStates();
+	}
 
 	class UMaterialExpressionMaterialFunctionCall* FunctionCall;
 
@@ -1008,9 +1066,9 @@ public:
 	/** A map from material expression to the index into CodeChunks of the code for the material expression. */
 	TMap<FMaterialExpressionKey,int32> ExpressionCodeMap;
 
-	explicit FMaterialFunctionCompileState(UMaterialExpressionMaterialFunctionCall* InFunctionCall) :
-		FunctionCall(InFunctionCall)
-	{}
+private:
+	/** Cache of MaterialFunctionOutput CodeChunks.  Allows for further reuse than just the ExpressionCodeMap */
+	TMap<FMaterialExpressionKey, FMaterialFunctionCompileState*> SharedFunctionStates;
 };
 
 /** Returns whether the given expression class is allowed. */
@@ -1345,6 +1403,13 @@ public:
 			&& !IsWireframe();
 	}
 
+	/** call during shader compilation jobs setup to fill additional settings that may be required by classes who inherit from this */
+	virtual void SetupExtaCompilationSettings(const EShaderPlatform Platform, FExtraShaderCompilerSettings& Settings) const
+	{}
+
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, struct FStableShaderKeyAndValue& SaveKeyVal); // arg is non-const, we modify it as we go
+
 	/** 
 	 * Adds an FMaterial to the global list.
 	 * Any FMaterials that don't belong to a UMaterialInterface need to be registered in this way to work correctly with runtime recompiling of outdated shaders.
@@ -1779,6 +1844,7 @@ public:
 	/** Returns the number of samplers used in this material, or -1 if the material does not have a valid shader map (compile error or still compiling). */
 	ENGINE_API int32 GetSamplerUsage() const;
 	ENGINE_API void GetUserInterpolatorUsage(uint32& NumUsedUVScalars, uint32& NumUsedCustomInterpolatorScalars) const;
+	ENGINE_API void GetEstimatedNumTextureSamples(uint32& VSSamples, uint32& PSSamples) const;
 
 	ENGINE_API virtual FString GetMaterialUsageDescription() const override;
 
@@ -1872,16 +1938,6 @@ public:
 
 	ENGINE_API virtual void NotifyCompilationFinished() override;
 
-	/**
-	 * Gets instruction counts that best represent the likely usage of this material based on shading model and other factors.
-	 * @param Descriptions - an array of descriptions to be populated
-	 * @param InstructionCounts - an array of instruction counts matching the Descriptions.  
-	 *		The dimensions of these arrays are guaranteed to be identical and all values are valid.
-	 */
-	ENGINE_API void GetRepresentativeInstructionCounts(TArray<FString> &Descriptions, TArray<int32> &InstructionCounts) const;
-
-	ENGINE_API void GetRepresentativeShaderTypesAndDescriptions(TMap<FName, FString>& OutShaderTypeNameAndDescriptions) const;
-
 	ENGINE_API void GetResourceSizeEx(FResourceSizeEx& CumulativeResourceSize);
 
 	ENGINE_API virtual void LegacySerialize(FArchive& Ar) override;
@@ -1914,6 +1970,7 @@ protected:
 	ENGINE_API virtual FString GetDebugName() const override;
 
 	friend class FDebugViewModeMaterialProxy; // Needed to redirect compilation
+
 };
 
 /**
@@ -2149,6 +2206,11 @@ public:
 	/** Returns a list of registered custom attributes */
 	ENGINE_API static void GetCustomAttributeList(TArray<FMaterialCustomOutputAttributeDefintion>& CustomAttributeList);
 
+	ENGINE_API static const TArray<FGuid>& GetOrderedVisibleAttributeList()
+	{
+		return GMaterialPropertyAttributesMap.OrderedVisibleAttributeList;
+	}
+
 private:
 	// Customization class for displaying data in the material editor
 	friend class FMaterialAttributePropertyDetails;
@@ -2170,9 +2232,8 @@ private:
 
 	TMap<EMaterialProperty, FMaterialAttributeDefintion>	AttributeMap; // Fixed map of compile-time definitions
 	TArray<FMaterialCustomOutputAttributeDefintion>			CustomAttributes; // Array of custom output definitions
+	TArray<FGuid>											OrderedVisibleAttributeList; // List used for consistency with e.g. combobox filling
 
 	FString													AttributeDDCString;
 	bool bIsInitialized;
 };
-
-
diff --git a/Engine/Source/Runtime/Engine/Public/Net/OnlineEngineInterface.h b/Engine/Source/Runtime/Engine/Public/Net/OnlineEngineInterface.h
index 5320fa042193..7a998a009ecb 100644
--- a/Engine/Source/Runtime/Engine/Public/Net/OnlineEngineInterface.h
+++ b/Engine/Source/Runtime/Engine/Public/Net/OnlineEngineInterface.h
@@ -8,9 +8,6 @@
 #include "UObject/CoreOnline.h"
 #include "OnlineEngineInterface.generated.h"
 
-/** Temporary version-check macro for dedicated server voice changes, for compatibility while the changes propagate. */
-#define OSS_DEDICATED_SERVER_VOICECHAT 1
-
 class FVoicePacket;
 class UNetConnection;
 struct FWorldContext;
@@ -67,14 +64,36 @@ public:
 	/** Returns the name of the default online subsystem, generally the DefaultPlatformService config value. */
 	virtual FName GetDefaultOnlineSubsystemName() const { return NAME_None; }
 
+	/**
+	 * Utils
+	 */
+
+	/** 
+	 * Return the replication hash for a given subsystem
+	 *
+	 * @param InSubsystemName name of subsystem to retrieve hash from
+	 *
+	 * @return replication hash, or 0 if invalid/unknown
+	 */
+	virtual uint8 GetReplicationHashForSubsystem(FName InSubsystemName) const { return 0; }
+
+	/**
+	 * Return the name of the online subsystem associated with this hash
+	 *
+	 * @param InHash replication hash for an online subsystem
+	 *
+	 * @return name of subsystem this hash belongs to
+	 */
+	virtual FName GetSubsystemFromReplicationHash(uint8 InHash) const { return NAME_None; }
+
 	/**
 	 * Identity
 	 */
 
 	/** @return a proper FUniqueNetId pointer generated by the default OnlineSubsystem */
-	virtual TSharedPtr<const FUniqueNetId> CreateUniquePlayerId(const FString& Str) { return nullptr; }
+	virtual TSharedPtr<const FUniqueNetId> CreateUniquePlayerId(const FString& Str, FName Type = NAME_None) { return nullptr; }
 	/** @return the unique id for a given local user on the given OnlineSubsystem */
-	virtual TSharedPtr<const FUniqueNetId> GetUniquePlayerId(UWorld* World, int32 LocalUserNum) { return nullptr; }
+	virtual TSharedPtr<const FUniqueNetId> GetUniquePlayerId(UWorld* World, int32 LocalUserNum, FName Type = NAME_None) { return nullptr; }
 
 	/** @return the stored nickname on the OnlineSubsystem for a player with a given unique id */
 	virtual FString GetPlayerNickname(UWorld* World, const FUniqueNetId& UniqueId) { return TEXT("INVALID"); }
diff --git a/Engine/Source/Runtime/Engine/Public/Net/VoiceConfig.h b/Engine/Source/Runtime/Engine/Public/Net/VoiceConfig.h
index 92c545cc2ad1..41a76fda98a6 100644
--- a/Engine/Source/Runtime/Engine/Public/Net/VoiceConfig.h
+++ b/Engine/Source/Runtime/Engine/Public/Net/VoiceConfig.h
@@ -48,12 +48,19 @@ class USoundAttenuation;
 template <typename EnumType>
 static FORCEINLINE EnumType GetEnumValueFromString(const FString& EnumName, const FString& String)
 {
-	UEnum* Enum = FindObject<UEnum>((UObject*) ANY_PACKAGE, *EnumName, true);
+	UEnum* const Enum = FindObject<UEnum>((UObject*) ANY_PACKAGE, *EnumName, true);
 	if (!Enum)
 	{
 		return EnumType(0);
 	}
-	return (EnumType)Enum->GetValueByName(FName(*String));
+
+	const int64 Result = Enum->GetValueByName(FName(*String));
+	if (Result == INDEX_NONE)
+	{
+		return EnumType(0);
+	}
+
+	return static_cast<EnumType>(Result);
 }
 
 USTRUCT(BlueprintType)
diff --git a/Engine/Source/Runtime/Engine/Public/ParticleHelper.h b/Engine/Source/Runtime/Engine/Public/ParticleHelper.h
index 5c571f390546..9416dcd5c17a 100644
--- a/Engine/Source/Runtime/Engine/Public/ParticleHelper.h
+++ b/Engine/Source/Runtime/Engine/Public/ParticleHelper.h
@@ -217,6 +217,8 @@ struct FBaseParticle
 -----------------------------------------------------------------------------*/
 enum EParticleStates
 {
+	/** Ignore updates to the particle						*/
+	STATE_Particle_JustSpawned			= 0x02000000,
 	/** Ignore updates to the particle						*/
 	STATE_Particle_Freeze				= 0x04000000,
 	/** Ignore collision updates to the particle			*/
@@ -232,7 +234,7 @@ enum EParticleStates
 	/** Flag indicating the particle has had at least one collision	*/
 	STATE_Particle_CollisionHasOccurred	= 0x80000000,
 	/** State mask. */
-	STATE_Mask = 0xFC000000,
+	STATE_Mask = 0xFE000000,
 	/** Counter mask. */
 	STATE_CounterMask = (~STATE_Mask)
 };
@@ -929,6 +931,8 @@ struct FModuleLocationVertSurfaceInstancePayload
 {
 	/** The skeletal mesh component used as the source of the sockets */
 	TWeakObjectPtr<USkeletalMeshComponent> SourceComponent;
+	/** Actor that owns the skel mesh component we're using. */
+	TWeakObjectPtr<AActor> CachedActor;
 	/** The index of the vertice this particle system spawns from */
 	int32 VertIndex;
 	/** The number of valid bone indices that which can be used for . */
@@ -2615,12 +2619,27 @@ public:
 		bVertexFactoriesDirty = true;
 	}
 
+	void MarkEmitterVertexFactoryDirty(uint32 EmitterIndex) const
+	{
+		check(EmitterVertexFactoryArray[EmitterIndex]);
+		EmitterVertexFactoryArray[EmitterIndex]->SetDirty();
+	}
+
 	void ClearVertexFactoriesIfDirty() const
 	{
+		// clear all VFs?
 		if (bVertexFactoriesDirty)
 		{
 			ClearVertexFactories();
 		}
+		else
+		{
+			// selectively clear
+			for (int32 Index = 0; Index < EmitterVertexFactoryArray.Num(); Index++)
+			{
+				ClearEmitterVertexFactoryIfDirty(Index);
+			}
+		}
 	}
 
 	void ClearVertexFactories() const
@@ -2638,6 +2657,17 @@ public:
 		bVertexFactoriesDirty = false;
 	}
 
+	void ClearEmitterVertexFactoryIfDirty(uint32 EmitterIndex) const
+	{
+		FParticleVertexFactoryBase *VertexFactory = EmitterVertexFactoryArray[EmitterIndex];
+		if (VertexFactory && VertexFactory->IsDirty())
+		{
+			VertexFactory->ReleaseResource();
+			delete VertexFactory;
+			EmitterVertexFactoryArray[EmitterIndex] = nullptr;
+		}
+	}
+
 	void AddEmitterVertexFactory(FDynamicEmitterDataBase *InDynamicData) const
 	{
 		while(InDynamicData->EmitterIndex >= EmitterVertexFactoryArray.Num())
@@ -2668,7 +2698,7 @@ public:
 	// persistent proxy storage for mesh emitter LODs; need to store these here, because GDME needs to calc the index,
 	// but VF needs to be init'ed with the correct LOD, and DynamicData goes away every frame
 	mutable TArray<int32> MeshEmitterLODIndices;
-
+	ERHIFeatureLevel::Type GetFeatureLevel() const { return FeatureLevel;  }
 protected:
 
 	/**
@@ -2873,3 +2903,24 @@ public:
 	void AddTemplate(class UParticleEmitter* Emitter);
 	~FParticleResetContext();
 };
+
+
+struct FParticleSystemCustomVersion
+{
+	enum Type
+	{
+		// Before any version changes were made
+		BeforeCustomVersionWasAdded = 0,
+		SkipCookingEmittersBasedOnDetailMode,	// skip emitter cooking if their detail mode doesn't match predefined
+		FixLegacySpawningBugs,					// fixing some spawning bugs but must keep old behavior around for existing systems.
+
+		// -----<new versions can be added above this line>-------------------------------------------------
+		VersionPlusOne,
+		LatestVersion = VersionPlusOne - 1
+	};
+	// The GUID for this custom version number
+	const static FGuid GUID;
+
+private:
+	FParticleSystemCustomVersion() {}
+};
diff --git a/Engine/Source/Runtime/Engine/Public/ParticleVertexFactory.h b/Engine/Source/Runtime/Engine/Public/ParticleVertexFactory.h
index 3f9b3935ba6e..120ebed6d6ae 100644
--- a/Engine/Source/Runtime/Engine/Public/ParticleVertexFactory.h
+++ b/Engine/Source/Runtime/Engine/Public/ParticleVertexFactory.h
@@ -45,6 +45,7 @@ public:
 		, LastFrameRealTime(-1.0f)
 		, ParticleFactoryType(Type)
 		, bInUse(false)
+		, bIsDirty(false)
 	{
 	}
 
@@ -92,6 +93,9 @@ public:
 		return true;
 	}
 
+	bool IsDirty() { return bIsDirty; }
+	void SetDirty() { bIsDirty = true; }
+
 private:
 
 	/** Last state where we set this. We only need to setup these once per frame, so detemine same frame by number, time, and view family. */
@@ -105,6 +109,7 @@ private:
 
 	/** Whether the vertex factory is in use. */
 	bool bInUse;
+	bool bIsDirty;	// needs to be recreated before use next frame
 
 };
 
diff --git a/Engine/Source/Runtime/Engine/Public/PhysXCookHelper.h b/Engine/Source/Runtime/Engine/Public/PhysXCookHelper.h
index 2c8e0958148e..770fd9423752 100644
--- a/Engine/Source/Runtime/Engine/Public/PhysXCookHelper.h
+++ b/Engine/Source/Runtime/Engine/Public/PhysXCookHelper.h
@@ -24,7 +24,7 @@ struct ENGINE_API FPhysXCookHelper
 	FPhysXCookHelper(IPhysXCookingModule* InPhysXCookingModule);
 
 	/** Cooks based on CookInfo and saves the results into the output data */
-	void CreatePhysicsMeshes_Concurrent();
+	bool CreatePhysicsMeshes_Concurrent();
 
 	/** Cooks based on CookInfo and saves the results into the output data. Calls back into the delegate on the game thread when done */
 	void CreatePhysicsMeshesAsync_Concurrent(FSimpleDelegateGraphTask::FDelegate FinishDelegate);
diff --git a/Engine/Source/Runtime/Engine/Public/PhysXPublic.h b/Engine/Source/Runtime/Engine/Public/PhysXPublic.h
index dd2e30434af8..89139bdb4bbf 100644
--- a/Engine/Source/Runtime/Engine/Public/PhysXPublic.h
+++ b/Engine/Source/Runtime/Engine/Public/PhysXPublic.h
@@ -433,4 +433,9 @@ namespace nvidia
 /** The default interface is nullptr. This can be set by other modules to get custom behavior */
 extern ENGINE_API nvidia::apex::PhysX3Interface* GPhysX3Interface;
 
+struct ENGINE_API FContactModifyCallback : public PxContactModifyCallback
+{
+	virtual ~FContactModifyCallback() {}	//This should only be called from the factory's destroy method which is called after simulation is done.
+};
+
 #endif
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Public/PhysicsPublic.h b/Engine/Source/Runtime/Engine/Public/PhysicsPublic.h
index 21a8b4dbb270..cb5903164e57 100644
--- a/Engine/Source/Runtime/Engine/Public/PhysicsPublic.h
+++ b/Engine/Source/Runtime/Engine/Public/PhysicsPublic.h
@@ -73,6 +73,8 @@ namespace nvidia
 #endif // WITH_APEX
 
 struct FConstraintInstance;
+struct FContactModifyCallback;
+struct FPhysXMbpBroadphaseCallback;
 class UPhysicsAsset;
 
 
@@ -185,6 +187,8 @@ namespace PhysCommand
 		ReleasePScene,
 		DeleteCPUDispatcher,
 		DeleteSimEventCallback,
+		DeleteContactModifyCallback,
+		DeleteMbpBroadphaseCallback,
 		Max
 	};
 }
@@ -207,7 +211,9 @@ public:
 
 #if WITH_PHYSX
 	void ENGINE_API DeferredRelease(physx::PxScene * PScene);
-	void ENGINE_API DeferredDeleteSimEventCallback(physx::PxSimulationEventCallback * SimEventCallback);
+	void ENGINE_API DeferredDeleteSimEventCallback(physx::PxSimulationEventCallback* SimEventCallback);
+	void ENGINE_API DeferredDeleteContactModifyCallback(FContactModifyCallback* ContactModifyCallback);
+	void ENGINE_API DeferredDeleteMbpBroadphaseCallback(FPhysXMbpBroadphaseCallback* MbpCallback);
 	void ENGINE_API DeferredDeleteCPUDispathcer(physx::PxCpuDispatcher * CPUDispatcher);
 #endif
 	
@@ -223,9 +229,11 @@ private:
 			apex::DestructibleActor * DestructibleActor;
 #endif
 #if WITH_PHYSX
-			physx::PxScene * PScene;
-			physx::PxCpuDispatcher * CPUDispatcher;
-			physx::PxSimulationEventCallback * SimEventCallback;
+			physx::PxScene* PScene;
+			physx::PxCpuDispatcher* CPUDispatcher;
+			physx::PxSimulationEventCallback* SimEventCallback;
+			FContactModifyCallback* ContactModifyCallback;
+			FPhysXMbpBroadphaseCallback* MbpCallback;
 #endif
 		} Pointer;
 
@@ -277,6 +285,14 @@ public:
 };
 #endif // WITH PHYSX
 
+/** Interface for the creation of contact modify callbacks. */
+class IContactModifyCallbackFactory
+{
+public:
+	virtual FContactModifyCallback* Create(class FPhysScene* PhysScene, int32 SceneType) = 0;
+	virtual void Destroy(FContactModifyCallback* Callback) = 0;
+};
+
 class FPhysicsReplication;
 
 /** Interface for the creation of customized physics replication.*/
@@ -318,6 +334,9 @@ public:
 	DECLARE_MULTICAST_DELEGATE_ThreeParams(FOnPhysSceneStep, FPhysScene*, uint32 /*SceneType*/, float /*DeltaSeconds*/);
 	FOnPhysSceneStep OnPhysSceneStep;
 
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FOnPhysScenePostTick, FPhysScene*, uint32 /*SceneType*/);
+	FOnPhysScenePostTick OnPhysScenePostTick;
+
 
 
 private:
@@ -459,6 +478,8 @@ private:
 	class PxCpuDispatcher*			CPUDispatcher[PST_MAX];
 	/** Simulation event callback object */
 	physx::PxSimulationEventCallback*			SimEventCallback[PST_MAX];
+	FContactModifyCallback*			ContactModifyCallback[PST_MAX];
+	FPhysXMbpBroadphaseCallback* MbpBroadphaseCallbacks[PST_MAX];
 
 	struct FPendingCollisionData
 	{
@@ -484,6 +505,9 @@ public:
 	If not set it defaults to using FPhysXSimEventCallback. */
 	ENGINE_API static TSharedPtr<ISimEventCallbackFactory> SimEventCallbackFactory;
 
+	/** Static factory used to override the simulation contact modify callback from other modules.*/
+	ENGINE_API static TSharedPtr<IContactModifyCallbackFactory> ContactModifyCallbackFactory;
+
 
 	/** Utility for looking up the PxScene of the given EPhysicsSceneType associated with this FPhysScene.  SceneType must be in the range [0,PST_MAX). */
 	ENGINE_API physx::PxScene*					GetPhysXScene(uint32 SceneType) const;
@@ -676,7 +700,7 @@ private:
 **/
 FORCEINLINE bool PhysSingleThreadedMode()
 {
-	if (IsRunningDedicatedServer() || FPlatformMisc::NumberOfCores() < 3 || !FPlatformProcess::SupportsMultithreading() || FParse::Param(FCommandLine::Get(), TEXT("SingleThreadedPhysics")))
+	if (IsRunningDedicatedServer() || !FApp::ShouldUseThreadingForPerformance() || FPlatformMisc::NumberOfCores() < 3 || !FPlatformProcess::SupportsMultithreading() || FParse::Param(FCommandLine::Get(), TEXT("SingleThreadedPhysics")))
 	{
 		return true;
 	}
diff --git a/Engine/Source/Runtime/Engine/Public/PhysicsReplication.h b/Engine/Source/Runtime/Engine/Public/PhysicsReplication.h
index 21c864de07cc..679f8d7e6ae8 100644
--- a/Engine/Source/Runtime/Engine/Public/PhysicsReplication.h
+++ b/Engine/Source/Runtime/Engine/Public/PhysicsReplication.h
@@ -11,17 +11,37 @@
 
 struct FReplicatedPhysicsTarget
 {
+	FReplicatedPhysicsTarget() :
+		ArrivedTimeSeconds(0.0f),
+		AccumulatedErrorSeconds(0.0f)
+	{ }
+
 	/** The target state replicated by server */
 	FRigidBodyState TargetState;
 
+	/** The bone name used to find the body */
+	FName BoneName;
+
 	/** Client time when target state arrived */
 	float ArrivedTimeSeconds;
+
+	/** Physics sync error accumulation */
+	float AccumulatedErrorSeconds;
+
+	/** Correction values from previous update */
+	FVector PrevPosTarget;
+	FVector PrevPos;
+
+#if !UE_BUILD_SHIPPING
+	FDebugFloatHistory ErrorHistory;
+#endif
 };
 
 struct FBodyInstance;
 struct FRigidBodyErrorCorrection;
 class UWorld;
 class FPhysScene;
+class UPrimitiveComponent;
 
 class ENGINE_API FPhysicsReplication
 {
@@ -33,16 +53,27 @@ public:
 	void Tick(float DeltaSeconds);
 
 	/** Sets the latest replicated target for a body instance */
-	void SetReplicatedTarget(FBodyInstance* BI, const FRigidBodyState& ReplicatedTarget);
+	void SetReplicatedTarget(UPrimitiveComponent* Component, FName BoneName, const FRigidBodyState& ReplicatedTarget);
+
+	/** Remove the replicated target*/
+	void RemoveReplicatedTarget(UPrimitiveComponent* Component);
 
 protected:
 
 	/** Update the physics body state given a set of replicated targets */
-	virtual void OnTick(float DeltaSeconds, TMap<FBodyInstance*, FReplicatedPhysicsTarget>& BodyToTargetMap);
-	bool ApplyRigidBodyState(float DeltaSeconds, FBodyInstance* BI, const FReplicatedPhysicsTarget& PhysicsTarget, const FRigidBodyErrorCorrection& ErrorCorrection);
+	virtual void OnTick(float DeltaSeconds, TMap<TWeakObjectPtr<UPrimitiveComponent>, FReplicatedPhysicsTarget>& ComponentsToTargets);
+	bool ApplyRigidBodyState(float DeltaSeconds, FBodyInstance* BI, FReplicatedPhysicsTarget& PhysicsTarget, const FRigidBodyErrorCorrection& ErrorCorrection, const float PingSecondsOneWay);
 
 private:
-	TMap<FBodyInstance*, FReplicatedPhysicsTarget> BodiesToTargets;
+
+	/** Get the ping from this machine to the server */
+	float GetLocalPing() const;
+
+	/** Get the ping from  */
+	float GetOwnerPing(const AActor* const Owner, const FReplicatedPhysicsTarget& Target) const;
+
+private:
+	TMap<TWeakObjectPtr<UPrimitiveComponent>, FReplicatedPhysicsTarget> ComponentToTargets;
 	FPhysScene* PhysScene;
 
 };
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexBuffer.h b/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexBuffer.h
index daa4c5a9a17e..6463bd2065c4 100644
--- a/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexBuffer.h
+++ b/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexBuffer.h
@@ -162,6 +162,7 @@ public:
 		if ((uint32)ArrayType::Num() < NumVertices)
 		{
 			// Enlarge the array.
+			ArrayType::Reserve(NumVertices);
 			ArrayType::AddUninitialized(NumVertices - ArrayType::Num());
 		}
 		else if ((uint32)ArrayType::Num() > NumVertices)
diff --git a/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexClothBuffer.h b/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexClothBuffer.h
index 30ae0a597b4c..62457077d09d 100644
--- a/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexClothBuffer.h
+++ b/Engine/Source/Runtime/Engine/Public/Rendering/SkeletalMeshVertexClothBuffer.h
@@ -8,8 +8,8 @@ class FSkeletalMeshVertexDataInterface;
 struct FMeshToMeshVertData;
 
 /**
-* A vertex buffer for holding skeletal mesh per APEX cloth information only.
-* This buffer sits along side FSkeletalMeshVertexBuffer in each skeletal mesh lod
+* A vertex buffer for holding skeletal mesh clothing information only.
+* This buffer sits along side the other skeletal mesh buffers per LOD
 */
 class FSkeletalMeshVertexClothBuffer : public FVertexBuffer
 {
diff --git a/Engine/Source/Runtime/Engine/Public/Rendering/StaticMeshVertexDataInterface.h b/Engine/Source/Runtime/Engine/Public/Rendering/StaticMeshVertexDataInterface.h
index 0338568bd0e5..651f74730d51 100644
--- a/Engine/Source/Runtime/Engine/Public/Rendering/StaticMeshVertexDataInterface.h
+++ b/Engine/Source/Runtime/Engine/Public/Rendering/StaticMeshVertexDataInterface.h
@@ -4,7 +4,16 @@
 
 class FResourceArrayInterface;
 
+enum class EResizeBufferFlags
+{
+	None =										0, // No flags
+	AllowSlackOnGrow =							1 << 0, // will allocate slack when growing the array.
+	AllowSlackOnReduce=							1 << 1, // will leave the slack when reducing the array.
+};
+ENUM_CLASS_FLAGS(EResizeBufferFlags);
+
 /** An interface to the static-mesh vertex data storage type. */
+
 class FStaticMeshVertexDataInterface
 {
 public:
@@ -15,8 +24,10 @@ public:
 	/**
 	* Resizes the vertex data buffer, discarding any data which no longer fits.
 	* @param NumVertices - The number of vertices to allocate the buffer for.
+	* @param BufferFlags - Flags to define the expected behavior of the buffer	
 	*/
-	virtual void ResizeBuffer(uint32 NumVertices) = 0;
+	virtual void ResizeBuffer(uint32 NumVertices, EResizeBufferFlags BufferFlags = EResizeBufferFlags::None) = 0;
+
 
 	virtual void Empty(uint32 NumVertices) = 0;
 
@@ -25,6 +36,9 @@ public:
 	/** @return The stride of the vertex data in the buffer. */
 	virtual uint32 GetStride() const = 0;
 
+	/** @return The number of elements. */
+	virtual int32 Num() const = 0;
+
 	/** @return A pointer to the data in the buffer. */
 	virtual uint8* GetDataPointer() = 0;
 
diff --git a/Engine/Source/Runtime/Engine/Public/Scalability.h b/Engine/Source/Runtime/Engine/Public/Scalability.h
index 1a6adb90554e..f877da082d5d 100644
--- a/Engine/Source/Runtime/Engine/Public/Scalability.h
+++ b/Engine/Source/Runtime/Engine/Public/Scalability.h
@@ -79,7 +79,7 @@ namespace Scalability
 
 
 	/** This is the only suggested way to set the current state - don't set CVars directly **/
-	ENGINE_API void SetQualityLevels(const FQualityLevels& QualityLevels);
+	ENGINE_API void SetQualityLevels(const FQualityLevels& QualityLevels, bool bForce = false);
 
 	/** This is the only suggested way to get the current state - don't get CVars directly */
 	ENGINE_API FQualityLevels GetQualityLevels();
diff --git a/Engine/Source/Runtime/Engine/Public/SceneManagement.h b/Engine/Source/Runtime/Engine/Public/SceneManagement.h
index 6f9e2e2c1541..9ba292968a81 100644
--- a/Engine/Source/Runtime/Engine/Public/SceneManagement.h
+++ b/Engine/Source/Runtime/Engine/Public/SceneManagement.h
@@ -1679,13 +1679,16 @@ private:
 	 * Cached usage information to speed up traversal in the most costly passes (depth-only, base pass, shadow depth), 
 	 * This is done so the Mesh does not have to be dereferenced to determine pass relevance. 
 	 */
-	uint32 bHasOpaqueOrMaskedMaterial : 1;
+	uint32 bHasOpaqueMaterial : 1;
+	uint32 bHasMaskedMaterial : 1;
 	uint32 bRenderInMainPass : 1;
 
 public:
 	FMeshBatchAndRelevance(const FMeshBatch& InMesh, const FPrimitiveSceneProxy* InPrimitiveSceneProxy, ERHIFeatureLevel::Type FeatureLevel);
 
-	bool GetHasOpaqueOrMaskedMaterial() const { return bHasOpaqueOrMaskedMaterial; }
+	bool GetHasOpaqueMaterial() const { return bHasOpaqueMaterial; }
+	bool GetHasMaskedMaterial() const { return bHasMaskedMaterial; }
+	bool GetHasOpaqueOrMaskedMaterial() const { return bHasOpaqueMaterial || bHasMaskedMaterial; }
 	bool GetRenderInMainPass() const { return bRenderInMainPass; }
 };
 
diff --git a/Engine/Source/Runtime/Engine/Public/SceneView.h b/Engine/Source/Runtime/Engine/Public/SceneView.h
index 3d3d262b95f2..45562c2b0cfd 100644
--- a/Engine/Source/Runtime/Engine/Public/SceneView.h
+++ b/Engine/Source/Runtime/Engine/Public/SceneView.h
@@ -209,6 +209,10 @@ struct FSceneViewInitOptions : public FSceneViewProjectionData
 	/** Whether to use FOV when computing mesh LOD. */
 	bool bUseFieldOfViewForLOD;
 
+	/** Actual field of view and that desired by the camera originally */
+	float FOV;
+	float DesiredFOV;
+
 #if WITH_EDITOR
 	/** default to 0'th view index, which is a bitfield of 1 */
 	uint64 EditorViewBitflag;
@@ -241,6 +245,8 @@ struct FSceneViewInitOptions : public FSceneViewProjectionData
 		, OriginOffsetThisFrame(ForceInitToZero)
 		, bInCameraCut(false)
 		, bUseFieldOfViewForLOD(true)
+		, FOV(90.f)
+		, DesiredFOV(90.f)
 #if WITH_EDITOR
 		, EditorViewBitflag(1)
 		, OverrideLODViewOrigin(ForceInitToZero)
@@ -908,6 +914,10 @@ public:
 	// Whether to use FOV when computing mesh LOD.
 	bool bUseFieldOfViewForLOD;
 
+	/** Actual field of view and that desired by the camera originally */
+	float FOV;
+	float DesiredFOV;
+
 	EDrawDynamicFlags::Type DrawDynamicFlags;
 
 	/** Current buffer visualization mode */
@@ -1169,12 +1179,6 @@ public:
 	 */
 	float GetLODDistanceFactor() const;
 
-	/** Get LOD distance factor for temporal LOD: Sqrt(GetTemporalLODDistanceFactor(?)*SphereRadius*SphereRadius / ScreenPercentage) = distance to this LOD transition
-	 * @param Index, 0 or 1, which temporal sample to return
-	 * @return distance factor
-	 */
-	float GetTemporalLODDistanceFactor(int32 Index, bool bUseLaggedLODTransition = true) const;
-
 	/** 
 	 * Returns the blend factor between the last two LOD samples
 	 */
diff --git a/Engine/Source/Runtime/Engine/Public/SingleAnimationPlayData.h b/Engine/Source/Runtime/Engine/Public/SingleAnimationPlayData.h
index 29b6fa882cba..16bd24105028 100644
--- a/Engine/Source/Runtime/Engine/Public/SingleAnimationPlayData.h
+++ b/Engine/Source/Runtime/Engine/Public/SingleAnimationPlayData.h
@@ -37,6 +37,7 @@ struct FSingleAnimationPlayData
 
 	FSingleAnimationPlayData()
 	{
+		AnimToPlay = nullptr;
 		SavedPlayRate = 1.0f;
 		bSavedLooping = true;
 		bSavedPlaying = true;
diff --git a/Engine/Source/Runtime/Engine/Public/SkeletalMeshReductionSettings.h b/Engine/Source/Runtime/Engine/Public/SkeletalMeshReductionSettings.h
index f9f14a65ee22..322e83fb4c4b 100644
--- a/Engine/Source/Runtime/Engine/Public/SkeletalMeshReductionSettings.h
+++ b/Engine/Source/Runtime/Engine/Public/SkeletalMeshReductionSettings.h
@@ -15,8 +15,9 @@
 UENUM()
 enum SkeletalMeshOptimizationType
 {
-	SMOT_NumOfTriangles UMETA(DisplayName = "Number of Triangles"),
-	SMOT_MaxDeviation UMETA(DisplayName = "Max Deviation"),
+	SMOT_NumOfTriangles UMETA(DisplayName = "Triangles", ToolTip = "Triangle requirement will be used for simplification."),
+	SMOT_MaxDeviation UMETA(DisplayName = "Accuracy", ToolTip = "Accuracy requirement will be used for simplification."),
+	SMOT_TriangleOrDeviation UMETA(DisplayName = "Any", ToolTip = "Simplification will continue until either Triangle or Accuracy requirement is met."),
 	SMOT_MAX UMETA(Hidden),
 };
 
@@ -107,7 +108,7 @@ struct FSkeletalMeshOptimizationSettings
 	FSkeletalMeshOptimizationSettings()
 		: ReductionMethod(SMOT_NumOfTriangles)
 		, NumOfTrianglesPercentage(0.5f)
-		, MaxDeviationPercentage(0.02f)
+		, MaxDeviationPercentage(0.5f)
 		, bRemapMorphTargets(false)
 		, SilhouetteImportance(SMOI_Normal)
 		, TextureImportance(SMOI_Normal)
diff --git a/Engine/Source/Runtime/Engine/Public/SkeletalMeshTypes.h b/Engine/Source/Runtime/Engine/Public/SkeletalMeshTypes.h
index 9defb50d0aa6..5acaa66d7b9b 100644
--- a/Engine/Source/Runtime/Engine/Public/SkeletalMeshTypes.h
+++ b/Engine/Source/Runtime/Engine/Public/SkeletalMeshTypes.h
@@ -273,6 +273,8 @@ public:
 
 	friend class FSkeletalMeshSectionIter;
 
+	virtual void OnTransformChanged() override;
+
 protected:
 	AActor* Owner;
 	class FSkeletalMeshObject* MeshObject;
diff --git a/Engine/Source/Runtime/Engine/Public/SkeletalRenderPublic.h b/Engine/Source/Runtime/Engine/Public/SkeletalRenderPublic.h
index 1354b1700c21..c6a507233c32 100644
--- a/Engine/Source/Runtime/Engine/Public/SkeletalRenderPublic.h
+++ b/Engine/Source/Runtime/Engine/Public/SkeletalRenderPublic.h
@@ -184,6 +184,9 @@ public:
 	/** Get the skeletal mesh resource for which this mesh object was created. */
 	FORCEINLINE FSkeletalMeshRenderData& GetSkeletalMeshRenderData() const { return *SkeletalMeshRenderData; }
 
+	/** Called to notify clothing data that component transform has changed */
+	virtual void RefreshClothingTransforms(const FMatrix& InNewLocalToWorld, uint32 FrameNumber) {};
+
 	/** Setup for rendering a specific LOD entry of the component */
 	struct FSkelMeshObjectLODInfo
 	{
diff --git a/Engine/Source/Runtime/Engine/Public/Slate/DeferredCleanupSlateBrush.h b/Engine/Source/Runtime/Engine/Public/Slate/DeferredCleanupSlateBrush.h
new file mode 100644
index 000000000000..a5525c64239d
--- /dev/null
+++ b/Engine/Source/Runtime/Engine/Public/Slate/DeferredCleanupSlateBrush.h
@@ -0,0 +1,47 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "RenderingThread.h"
+#include "UObject/GCObject.h"
+#include "Styling/SlateBrush.h"
+
+class ENGINE_API FDeferredCleanupSlateBrush : public ISlateBrushSource, public FDeferredCleanupInterface, public FGCObject
+{
+public:
+	static TSharedRef<FDeferredCleanupSlateBrush> CreateBrush(const FSlateBrush& Brush);
+
+	static TSharedRef<FDeferredCleanupSlateBrush> CreateBrush(
+		class UTexture* InTexture,
+		const FLinearColor& InTint = FLinearColor(1.0f, 1.0f, 1.0f, 1.0f),
+		ESlateBrushTileType::Type InTiling = ESlateBrushTileType::NoTile,
+		ESlateBrushImageType::Type InImageType = ESlateBrushImageType::FullColor);
+
+	static TSharedRef<FDeferredCleanupSlateBrush> CreateBrush(
+		class UObject* InResource,
+		const FVector2D& InImageSize,
+		const FLinearColor& InTint = FLinearColor(1.0f, 1.0f, 1.0f, 1.0f),
+		ESlateBrushTileType::Type InTiling = ESlateBrushTileType::NoTile,
+		ESlateBrushImageType::Type InImageType = ESlateBrushImageType::FullColor);
+
+	virtual const FSlateBrush* GetSlateBrush() const override { return &InternalBrush; }
+
+	// FGCObject
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+	virtual FString GetReferencerName() const override;
+
+	static const FSlateBrush* TrySlateBrush(const TSharedPtr<FDeferredCleanupSlateBrush>& DeferredSlateBrush)
+	{
+		return DeferredSlateBrush.IsValid() ? DeferredSlateBrush->GetSlateBrush() : nullptr;
+	}
+
+private:
+	FDeferredCleanupSlateBrush();
+
+	FDeferredCleanupSlateBrush(const FSlateBrush& Brush)
+		: InternalBrush(Brush)
+	{
+	}
+
+	FSlateBrush InternalBrush;
+};
diff --git a/Engine/Source/Runtime/Engine/Public/Slate/SGameLayerManager.h b/Engine/Source/Runtime/Engine/Public/Slate/SGameLayerManager.h
index 4fd1d3945039..42b6a6ebd600 100644
--- a/Engine/Source/Runtime/Engine/Public/Slate/SGameLayerManager.h
+++ b/Engine/Source/Runtime/Engine/Public/Slate/SGameLayerManager.h
@@ -82,7 +82,6 @@ public:
 	SLATE_BEGIN_ARGS(SGameLayerManager)
 	{
 		_Visibility = EVisibility::SelfHitTestInvisible;
-		_Clipping = EWidgetClipping::ClipToBoundsAlways;
 	}
 
 		/** Slot for this content (optional) */
@@ -196,7 +195,7 @@ private:
 		}
 	};
 
-	TArray<FWindowTitleBarState> WindowTitleBarStateStack;
+	FWindowTitleBarState WindowTitleBarState;
 	TSharedPtr<SWidget> DefaultTitleBarContentWidget;
 	float DefaultWindowTitleBarHeight;
 	bool bIsGameUsingBorderlessWindow;
diff --git a/Engine/Source/Runtime/Engine/Public/StaticMeshResources.h b/Engine/Source/Runtime/Engine/Public/StaticMeshResources.h
index 62679d925f10..02ed8722721c 100644
--- a/Engine/Source/Runtime/Engine/Public/StaticMeshResources.h
+++ b/Engine/Source/Runtime/Engine/Public/StaticMeshResources.h
@@ -837,7 +837,7 @@ public:
 		}
 	}
 
-	void AllocateInstances(int32 InNumInstances, bool DestroyExistingInstances)
+	void AllocateInstances(int32 InNumInstances, EResizeBufferFlags BufferFlags, bool DestroyExistingInstances)
 	{
 		NumInstances = InNumInstances;
 
@@ -850,13 +850,13 @@ public:
 
 		// We cannot write directly to the data on all platforms,
 		// so we make a TArray of the right type, then assign it
-		InstanceOriginData->ResizeBuffer(NumInstances);
+		InstanceOriginData->ResizeBuffer(NumInstances, BufferFlags);
 		InstanceOriginDataPtr = InstanceOriginData->GetDataPointer();
 
-		InstanceLightmapData->ResizeBuffer(NumInstances);
+		InstanceLightmapData->ResizeBuffer(NumInstances, BufferFlags);
 		InstanceLightmapDataPtr = InstanceLightmapData->GetDataPointer();
 
-		InstanceTransformData->ResizeBuffer(NumInstances);
+		InstanceTransformData->ResizeBuffer(NumInstances, BufferFlags);
 		InstanceTransformDataPtr = InstanceTransformData->GetDataPointer();
 	}
 
@@ -1031,14 +1031,36 @@ public:
 		}
 	}
 
+	FORCEINLINE_DEBUGGABLE void ClearInstanceEditorData(int32 InstanceIndex)
+	{
+		FVector4 InstanceTransform[3];
+		if (bUseHalfFloat)
+		{
+			GetInstanceTransformInternal<FFloat16>(InstanceIndex, InstanceTransform);
+			InstanceTransform[0][3] = 0.0f;
+			InstanceTransform[1][3] = 0.0f;
+			InstanceTransform[2][3] = 0.0f;
+			SetInstanceTransformInternal<FFloat16>(InstanceIndex, InstanceTransform);
+		}
+		else
+		{
+			GetInstanceTransformInternal<float>(InstanceIndex, InstanceTransform);
+			InstanceTransform[0][3] = 0.0f;
+			InstanceTransform[1][3] = 0.0f;
+			InstanceTransform[2][3] = 0.0f;
+			SetInstanceTransformInternal<float>(InstanceIndex, InstanceTransform);
+		}
+	}
+
 	FORCEINLINE_DEBUGGABLE void SwapInstance(int32 Index1, int32 Index2)
 	{
 		if (bUseHalfFloat)
 		{
 			FInstanceTransformMatrix<FFloat16>* ElementData = reinterpret_cast<FInstanceTransformMatrix<FFloat16>*>(InstanceTransformDataPtr);
-			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+			uint32 CurrentSize = InstanceTransformData->Num() * InstanceTransformData->GetStride();
+			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index1]) + 0) >= (void*)(InstanceTransformDataPtr));
-			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index2]) + 0) >= (void*)(InstanceTransformDataPtr));
 
 			FInstanceTransformMatrix<FFloat16> TempStore = ElementData[Index1];
@@ -1048,9 +1070,10 @@ public:
 		else
 		{
 			FInstanceTransformMatrix<float>* ElementData = reinterpret_cast<FInstanceTransformMatrix<float>*>(InstanceTransformDataPtr);
-			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+			uint32 CurrentSize = InstanceTransformData->Num() * InstanceTransformData->GetStride();
+			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index1]) + 0) >= (void*)(InstanceTransformDataPtr));
-			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index2]) + 0) >= (void*)(InstanceTransformDataPtr));
 			
 			FInstanceTransformMatrix<float> TempStore = ElementData[Index1];
@@ -1060,9 +1083,10 @@ public:
 		{
 
 			FVector4* ElementData = reinterpret_cast<FVector4*>(InstanceOriginDataPtr);
-			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceOriginDataPtr + InstanceOriginData->GetResourceSize()));
+			uint32 CurrentSize = InstanceOriginData->Num() * InstanceOriginData->GetStride();
+			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceOriginDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index1]) + 0) >= (void*)(InstanceOriginDataPtr));
-			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceOriginDataPtr + InstanceOriginData->GetResourceSize()));
+			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceOriginDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index2]) + 0) >= (void*)(InstanceOriginDataPtr));
 
 			FVector4 TempStore = ElementData[Index1];
@@ -1071,9 +1095,10 @@ public:
 		}
 		{
 			FInstanceLightMapVector* ElementData = reinterpret_cast<FInstanceLightMapVector*>(InstanceLightmapDataPtr);
-			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceLightmapDataPtr + InstanceLightmapData->GetResourceSize()));
+			uint32 CurrentSize = InstanceLightmapData->Num() * InstanceLightmapData->GetStride();
+			check((void*)((&ElementData[Index1]) + 1) <= (void*)(InstanceLightmapDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index1]) + 0) >= (void*)(InstanceLightmapDataPtr));
-			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceLightmapDataPtr + InstanceLightmapData->GetResourceSize()));
+			check((void*)((&ElementData[Index2]) + 1) <= (void*)(InstanceLightmapDataPtr + CurrentSize));
 			check((void*)((&ElementData[Index2]) + 0) >= (void*)(InstanceLightmapDataPtr));
 			
 			FInstanceLightMapVector TempStore = ElementData[Index1];
@@ -1150,7 +1175,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void GetInstanceTransformInternal(int32 InstanceIndex, FVector4 (&Transform)[3]) const
 	{
 		FInstanceTransformMatrix<T>* ElementData = reinterpret_cast<FInstanceTransformMatrix<T>*>(InstanceTransformDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+		uint32 CurrentSize = InstanceTransformData->Num() * InstanceTransformData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceTransformDataPtr));
 		
 		Transform[0][0] = ElementData[InstanceIndex].InstanceTransform1[0];
@@ -1172,7 +1198,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void GetInstanceOriginInternal(int32 InstanceIndex, FVector4 &Origin) const
 	{
 		FVector4* ElementData = reinterpret_cast<FVector4*>(InstanceOriginDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceOriginDataPtr + InstanceOriginData->GetResourceSize()));
+		uint32 CurrentSize = InstanceOriginData->Num() * InstanceOriginData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceOriginDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceOriginDataPtr));
 
 		Origin = ElementData[InstanceIndex];
@@ -1181,7 +1208,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void GetInstanceLightMapDataInternal(int32 InstanceIndex, FVector4 &LightmapData) const
 	{
 		FInstanceLightMapVector* ElementData = reinterpret_cast<FInstanceLightMapVector*>(InstanceLightmapDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceLightmapDataPtr + InstanceLightmapData->GetResourceSize()));
+		uint32 CurrentSize = InstanceLightmapData->Num() * InstanceLightmapData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceLightmapDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceLightmapDataPtr));
 
 		LightmapData = FVector4
@@ -1197,7 +1225,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void SetInstanceTransformInternal(int32 InstanceIndex, FVector4(Transform)[3]) const
 	{
 		FInstanceTransformMatrix<T>* ElementData = reinterpret_cast<FInstanceTransformMatrix<T>*>(InstanceTransformDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceTransformDataPtr + InstanceTransformData->GetResourceSize()));
+		uint32 CurrentSize = InstanceTransformData->Num() * InstanceTransformData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceTransformDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceTransformDataPtr));
 
 		ElementData[InstanceIndex].InstanceTransform1[0] = Transform[0][0];
@@ -1219,7 +1248,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void SetInstanceOriginInternal(int32 InstanceIndex, const FVector4& Origin) const
 	{
 		FVector4* ElementData = reinterpret_cast<FVector4*>(InstanceOriginDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceOriginDataPtr + InstanceOriginData->GetResourceSize()));
+		uint32 CurrentSize = InstanceOriginData->Num() * InstanceOriginData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceOriginDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceOriginDataPtr));
 
 		ElementData[InstanceIndex] = Origin;
@@ -1228,7 +1258,8 @@ private:
 	FORCEINLINE_DEBUGGABLE void SetInstanceLightMapDataInternal(int32 InstanceIndex, const FVector4& LightmapData) const
 	{
 		FInstanceLightMapVector* ElementData = reinterpret_cast<FInstanceLightMapVector*>(InstanceLightmapDataPtr);
-		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceLightmapDataPtr + InstanceLightmapData->GetResourceSize()));
+		uint32 CurrentSize = InstanceLightmapData->Num() * InstanceLightmapData->GetStride();
+		check((void*)((&ElementData[InstanceIndex]) + 1) <= (void*)(InstanceLightmapDataPtr + CurrentSize));
 		check((void*)((&ElementData[InstanceIndex]) + 0) >= (void*)(InstanceLightmapDataPtr));
 
 		ElementData[InstanceIndex].InstanceLightmapAndShadowMapUVBias[0] = FMath::Clamp<int32>(FMath::TruncToInt(LightmapData.X * 32767.0f), MIN_int16, MAX_int16);
@@ -1237,7 +1268,7 @@ private:
 		ElementData[InstanceIndex].InstanceLightmapAndShadowMapUVBias[3] = FMath::Clamp<int32>(FMath::TruncToInt(LightmapData.W * 32767.0f), MIN_int16, MAX_int16);
 	}
 
-	void AllocateBuffers(int32 InNumInstances)
+	void AllocateBuffers(int32 InNumInstances, EResizeBufferFlags BufferFlags = EResizeBufferFlags::None)
 	{
 		delete InstanceOriginData;
 		InstanceOriginDataPtr = nullptr;
@@ -1249,9 +1280,9 @@ private:
 		InstanceLightmapDataPtr = nullptr;
 		 		
 		InstanceOriginData = new TStaticMeshVertexData<FVector4>();
-		InstanceOriginData->ResizeBuffer(InNumInstances);
+		InstanceOriginData->ResizeBuffer(InNumInstances, BufferFlags);
 		InstanceLightmapData = new TStaticMeshVertexData<FInstanceLightMapVector>();
-		InstanceLightmapData->ResizeBuffer(InNumInstances);
+		InstanceLightmapData->ResizeBuffer(InNumInstances, BufferFlags);
 		if (bUseHalfFloat)
 		{
 			InstanceTransformData = new TStaticMeshVertexData<FInstanceTransformMatrix<FFloat16>>();
@@ -1260,7 +1291,7 @@ private:
 		{
 			InstanceTransformData = new TStaticMeshVertexData<FInstanceTransformMatrix<float>>();
 		}
-		InstanceTransformData->ResizeBuffer(InNumInstances);
+		InstanceTransformData->ResizeBuffer(InNumInstances, BufferFlags);
 	}
 
 	FStaticMeshVertexDataInterface* InstanceOriginData = nullptr;
diff --git a/Engine/Source/Runtime/Engine/Public/StaticMeshVertexData.h b/Engine/Source/Runtime/Engine/Public/StaticMeshVertexData.h
index b602f447ba36..9d611398242e 100644
--- a/Engine/Source/Runtime/Engine/Public/StaticMeshVertexData.h
+++ b/Engine/Source/Runtime/Engine/Public/StaticMeshVertexData.h
@@ -28,18 +28,25 @@ public:
 	* Resizes the vertex data buffer, discarding any data which no longer fits.
 	*
 	* @param NumVertices - The number of vertices to allocate the buffer for.
+	* @param BufferFlags - Flags to define the expected behavior of the buffer
 	*/
-	void ResizeBuffer(uint32 NumVertices) override
+	void ResizeBuffer(uint32 NumVertices, EResizeBufferFlags BufferFlags = EResizeBufferFlags::None) override
 	{
-		if((uint32)Data.Num() < NumVertices)
+		if ((uint32)Data.Num() < NumVertices)
 		{
 			// Enlarge the array.
+			if (!EnumHasAnyFlags(BufferFlags, EResizeBufferFlags::AllowSlackOnGrow))
+			{
+				Data.Reserve(NumVertices);
+			}
+
 			Data.AddUninitialized(NumVertices - Data.Num());
 		}
-		else if((uint32)Data.Num() > NumVertices)
+		else if ((uint32)Data.Num() > NumVertices)
 		{
 			// Shrink the array.
-			Data.RemoveAt(NumVertices, Data.Num() - NumVertices);
+			bool AllowShinking = !EnumHasAnyFlags(BufferFlags, EResizeBufferFlags::AllowSlackOnReduce);
+			Data.RemoveAt(NumVertices, Data.Num() - NumVertices, AllowShinking);
 		}
 	}
 
@@ -115,7 +122,7 @@ public:
 	*
 	* @returns Number of elements allocated by this container.
 	*/
-	FORCEINLINE int32 Num() const
+	virtual int32 Num() const override
 	{
 		return Data.Num();
 	}
diff --git a/Engine/Source/Runtime/Engine/Public/StaticParameterSet.h b/Engine/Source/Runtime/Engine/Public/StaticParameterSet.h
index beb7f0a7d226..4eb1ae3c066b 100644
--- a/Engine/Source/Runtime/Engine/Public/StaticParameterSet.h
+++ b/Engine/Source/Runtime/Engine/Public/StaticParameterSet.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "UObject/NameTypes.h"
 #include "Misc/Guid.h"
+#include "UObject/AthenaObjectVersion.h"
 #include "UObject/RenderingObjectVersion.h"
 #include "UObject/ReleaseObjectVersion.h"
 #include "Materials/MaterialLayersFunctions.h"
@@ -143,21 +144,27 @@ struct FStaticTerrainLayerWeightParameter
 	UPROPERTY()
 	int32 WeightmapIndex;
 
+	UPROPERTY()
+	bool bWeightBasedBlend;
+
 	FStaticTerrainLayerWeightParameter() :
 		bOverride(false),
 		ExpressionGUID(0, 0, 0, 0),
-		WeightmapIndex(INDEX_NONE)
+		WeightmapIndex(INDEX_NONE),
+		bWeightBasedBlend(true)
 	{ }
 
-	FStaticTerrainLayerWeightParameter(const FMaterialParameterInfo& InInfo, int32 InWeightmapIndex, bool InOverride, FGuid InGuid) :
+	FStaticTerrainLayerWeightParameter(const FMaterialParameterInfo& InInfo, int32 InWeightmapIndex, bool InOverride, FGuid InGuid, bool InWeightBasedBlend) :
 		ParameterInfo(InInfo),
 		bOverride(InOverride),
 		ExpressionGUID(InGuid),
-		WeightmapIndex(InWeightmapIndex)
+		WeightmapIndex(InWeightmapIndex),
+		bWeightBasedBlend(InWeightBasedBlend)
 	{ }
 
 	friend FArchive& operator<<(FArchive& Ar, FStaticTerrainLayerWeightParameter& P)
 	{
+		Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
 		if (Ar.CustomVer(FRenderingObjectVersion::GUID) < FRenderingObjectVersion::MaterialAttributeLayerParameters)
 		{
 			Ar << P.ParameterInfo.Name;
@@ -166,6 +173,11 @@ struct FStaticTerrainLayerWeightParameter
 		{
 			Ar << P.ParameterInfo;
 		}
+		Ar.UsingCustomVersion(FAthenaObjectVersion::GUID);
+		if (Ar.CustomVer(FAthenaObjectVersion::GUID) >= FAthenaObjectVersion::StaticParameterTerrainLayerWeightBlendType)
+		{
+			Ar << P.bWeightBasedBlend;
+		}
 		Ar << P.WeightmapIndex<< P.bOverride << P.ExpressionGUID;
 		return Ar;
 	}
diff --git a/Engine/Source/Runtime/Engine/Public/TextureResource.h b/Engine/Source/Runtime/Engine/Public/TextureResource.h
index f92e40f238c3..487216f1cafa 100644
--- a/Engine/Source/Runtime/Engine/Public/TextureResource.h
+++ b/Engine/Source/Runtime/Engine/Public/TextureResource.h
@@ -539,6 +539,7 @@ protected:
 	 */
 	friend class UTextureRenderTarget2D;
 	virtual void UpdateDeferredResource(FRHICommandListImmediate& RHICmdList, bool bClearRenderTarget=true) override;
+	void Resize(int32 NewSizeX, int32 NewSizeY);
 
 private:
 	/** The UTextureRenderTarget2D which this resource represents. */
diff --git a/Engine/Source/Runtime/Engine/Public/UnrealClient.h b/Engine/Source/Runtime/Engine/Public/UnrealClient.h
index ac12aa1a6bed..14f1f3ad987a 100644
--- a/Engine/Source/Runtime/Engine/Public/UnrealClient.h
+++ b/Engine/Source/Runtime/Engine/Public/UnrealClient.h
@@ -126,7 +126,7 @@ public:
 */
 #define MAX_HITPROXYSIZE 200
 
-DECLARE_DELEGATE(FOnScreenshotRequestProcessed);
+DECLARE_MULTICAST_DELEGATE(FOnScreenshotRequestProcessed);
 
 struct ENGINE_API FScreenshotRequest
 {
@@ -199,12 +199,14 @@ struct FStatUnitData
 	float GameThreadTime;
 	float GPUFrameTime;
 	float FrameTime;
+	float RHITTime;
 
 	/** Raw equivalents of the above variables */
 	float RawRenderThreadTime;
 	float RawGameThreadTime;
 	float RawGPUFrameTime;
 	float RawFrameTime;
+	float RawRHITTime;
 
 	/** Time that has transpired since the last draw call */
 	double LastTime;
@@ -217,6 +219,7 @@ struct FStatUnitData
 	TArray<float> GameThreadTimes;
 	TArray<float> GPUFrameTimes;
 	TArray<float> FrameTimes;
+	TArray<float> RHITTimes;
 	TArray<float> ResolutionFractions;
 #endif //!UE_BUILD_SHIPPING
 
@@ -225,6 +228,7 @@ struct FStatUnitData
 		, GameThreadTime(0.0f)
 		, GPUFrameTime(0.0f)
 		, FrameTime(0.0f)
+		, RHITTime(0.0f)
 		, RawRenderThreadTime(0.0f)
 		, RawGameThreadTime(0.0f)
 		, RawGPUFrameTime(0.0f)
@@ -237,6 +241,7 @@ struct FStatUnitData
 		GameThreadTimes.AddZeroed(NumberOfSamples);
 		GPUFrameTimes.AddZeroed(NumberOfSamples);
 		FrameTimes.AddZeroed(NumberOfSamples);
+		RHITTimes.AddZeroed(NumberOfSamples);
 		ResolutionFractions.Reserve(NumberOfSamples);
 		for (int32 i = 0; i < NumberOfSamples; i++)
 		{
@@ -773,11 +778,15 @@ public:
 	 * @param	Handle - Identifier unique to this touch event
 	 * @param	Type - What kind of touch event this is (see ETouchType)
 	 * @param	TouchLocation - Screen position of the touch
+	 * @param	Force - How hard the touch is
 	 * @param	DeviceTimestamp - Timestamp of the event
 	 * @param	TouchpadIndex - For devices with multiple touchpads, this is the index of which one
 	 * @return	True to consume the key event, false to pass it on.
 	 */
-	virtual bool InputTouch(FViewport* Viewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { return false; }
+	virtual bool InputTouch(FViewport* Viewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { return false; }
+
+	DEPRECATED(4.20, "InputTouch now takes a Force")
+	bool InputTouch(FViewport* Viewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { return InputTouch(Viewport, ControllerId, Handle, Type, TouchLocation, 1.0f, DeviceTimestamp, TouchpadIndex); }
 
 	/**
 	 * Check a gesture event received by the viewport.
diff --git a/Engine/Source/Runtime/Engine/Public/UnrealEngine.h b/Engine/Source/Runtime/Engine/Public/UnrealEngine.h
index b2c05b660ebc..dbf8394a4795 100644
--- a/Engine/Source/Runtime/Engine/Public/UnrealEngine.h
+++ b/Engine/Source/Runtime/Engine/Public/UnrealEngine.h
@@ -413,6 +413,19 @@ struct FCachedSystemScalabilityCVars
 	int32 MaxCSMShadowResolution;
 	float ViewDistanceScale;
 	float ViewDistanceScaleSquared;
+	int32 FieldOfViewAffectsHLOD;
+
+	float CalculateFieldOfViewDistanceScale(const float FieldOfView) const
+	{
+		if (!FMath::IsNearlyEqual(FieldOfViewMaxAngleScale, FieldOfViewMinAngleScale))
+		{
+			float ClampedFoV = FMath::Clamp(FieldOfView, FieldOfViewMinAngle, FieldOfViewMaxAngle);
+			ClampedFoV = (ClampedFoV - FieldOfViewMinAngle) / (FieldOfViewMaxAngle - FieldOfViewMinAngle);
+			return FMath::Lerp<float>(FieldOfViewMinAngleScale, FieldOfViewMaxAngleScale, ClampedFoV);
+		}
+		
+		return FieldOfViewMaxAngleScale;
+	}
 
 	FCachedSystemScalabilityCVars();
 
@@ -420,6 +433,12 @@ protected:
 	// This isn't public as it's only used to detect the change. Use ComputeAnisotropyRT()
 	int32 MaxAnisotropy;
 
+	// Scaling view distance with active camera field of view
+	float FieldOfViewMinAngle;
+	float FieldOfViewMinAngleScale;
+	float FieldOfViewMaxAngle;
+	float FieldOfViewMaxAngleScale;
+
 	friend void ScalabilityCVarsSinkCallback();
 };
 
@@ -456,3 +475,4 @@ struct ENGINE_API FSystemResolution
 };
 
 ENGINE_API extern FSystemResolution GSystemResolution;
+ENGINE_API extern int32 GUnbuiltHLODCount;
diff --git a/Engine/Source/Runtime/EngineMessages/Public/EngineServiceMessages.h b/Engine/Source/Runtime/EngineMessages/Public/EngineServiceMessages.h
index 309f3e4eb575..d1d683bd1a82 100644
--- a/Engine/Source/Runtime/EngineMessages/Public/EngineServiceMessages.h
+++ b/Engine/Source/Runtime/EngineMessages/Public/EngineServiceMessages.h
@@ -171,7 +171,7 @@ struct FEngineServiceNotification
 	double TimeSeconds;
 
 	/** Default constructor. */
-	FEngineServiceNotification() { }
+	FEngineServiceNotification() : TimeSeconds(0.0) { }
 
 	/** Creates and initializes a new instance. */
 	FEngineServiceNotification(const FString& InText, double InTimeSeconds)
diff --git a/Engine/Source/Runtime/EngineSettings/Classes/GeneralProjectSettings.h b/Engine/Source/Runtime/EngineSettings/Classes/GeneralProjectSettings.h
index 7f50091236ee..4f038fb9e552 100644
--- a/Engine/Source/Runtime/EngineSettings/Classes/GeneralProjectSettings.h
+++ b/Engine/Source/Runtime/EngineSettings/Classes/GeneralProjectSettings.h
@@ -59,11 +59,11 @@ class ENGINESETTINGS_API UGeneralProjectSettings
 	UPROPERTY(config, EditAnywhere, Category=Publisher)
 	FString SupportContact;
 
-	/** The project's title as displayed on the window title bar (can include the tokens {GameName}, {PlatformArchitecture}, or {RHIName}, which will be replaced with the specified text) */
+	/** The project's title as displayed on the window title bar (can include the tokens {GameName}, {PlatformArchitecture}, {BuildConfiguration} or {RHIName}, which will be replaced with the specified text) */
 	UPROPERTY(config, EditAnywhere, Category=Displayed)
 	FText ProjectDisplayedTitle;
 
-	/** Additional data to be displayed on the window title bar in non-shipping configurations (can include the tokens {GameName}, {PlatformArchitecture}, or {RHIName}, which will be replaced with the specified text) */
+	/** Additional data to be displayed on the window title bar in non-shipping configurations (can include the tokens {GameName}, {PlatformArchitecture}, {BuildConfiguration} or {RHIName}, which will be replaced with the specified text) */
 	UPROPERTY(config, EditAnywhere, Category=Displayed)
 	FText ProjectDebugTitleInfo;
 
diff --git a/Engine/Source/Runtime/Foliage/Private/InstancedFoliage.cpp b/Engine/Source/Runtime/Foliage/Private/InstancedFoliage.cpp
index f48ebcfba970..c0593da831a0 100644
--- a/Engine/Source/Runtime/Foliage/Private/InstancedFoliage.cpp
+++ b/Engine/Source/Runtime/Foliage/Private/InstancedFoliage.cpp
@@ -49,9 +49,10 @@ InstancedFoliage.cpp: Instanced foliage implementation.
 
 DEFINE_LOG_CATEGORY(LogInstancedFoliage);
 
-DECLARE_CYCLE_STAT(TEXT("FoliageTrace"), STAT_FoliageTrace, STATGROUP_Foliage);
-DECLARE_CYCLE_STAT(TEXT("FoliageAddInstance"), STAT_FoliageAddInstance, STATGROUP_Foliage);
-DECLARE_CYCLE_STAT(TEXT("FoliageCreateComponent"), STAT_FoliageCreateComponent, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("FoliageActor_Trace"), STAT_FoliageTrace, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("FoliageMeshInfo_AddInstance"), STAT_FoliageAddInstance, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("FoliageMeshInfo_RemoveInstance"), STAT_FoliageRemoveInstance, STATGROUP_Foliage);
+DECLARE_CYCLE_STAT(TEXT("FoliageMeshInfo_CreateComponent"), STAT_FoliageCreateComponent, STATGROUP_Foliage);
 
 
 static TAutoConsoleVariable<int32> CVarFoliageDiscardDataOnLoad(
@@ -1022,6 +1023,53 @@ void FFoliageMeshInfo::UpdateComponentSettings(const UFoliageType* InSettings)
 	}
 }
 
+void FFoliageMeshInfo::AddInstances(AInstancedFoliageActor* InIFA, const UFoliageType* InSettings, const TSet<const FFoliageInstance*>& InNewInstances, bool RebuildFoliageTree)
+{
+	SCOPE_CYCLE_COUNTER(STAT_FoliageAddInstance);
+
+	InIFA->Modify();
+
+	if (Component == nullptr)
+	{
+		CreateNewComponent(InIFA, InSettings);
+		check(Component);
+	}
+	else
+	{
+		Component->InitPerInstanceRenderData(false);
+		Component->InvalidateLightingCache();
+	}
+
+	bool PreviousbAutoRebuildTreeOnInstanceChanges = Component->bAutoRebuildTreeOnInstanceChanges;
+	Component->bAutoRebuildTreeOnInstanceChanges = RebuildFoliageTree;
+
+	Instances.Reserve(Instances.Num() + InNewInstances.Num());
+	Component->PreAllocateInstancesMemory(InNewInstances.Num());
+
+	for (const FFoliageInstance* Instance : InNewInstances)
+	{
+		// Add the instance taking either a free slot or adding a new item.
+		int32 InstanceIndex = Instances.Add(*Instance);
+		FFoliageInstance& AddedInstance = Instances[InstanceIndex];
+
+		AddedInstance.BaseId = InIFA->InstanceBaseCache.AddInstanceBaseId(Instance->BaseComponent);
+
+		// Add the instance to the hash
+		AddToBaseHash(InstanceIndex);
+		InstanceHash->InsertInstance(AddedInstance.Location, InstanceIndex);
+
+		// Calculate transform for the instance
+		FTransform InstanceToWorld = Instance->GetInstanceWorldTransform();
+
+		// Add the instance to the component
+		Component->AddInstanceWorldSpace(InstanceToWorld);
+	}
+
+	CheckValid();
+
+	Component->bAutoRebuildTreeOnInstanceChanges = PreviousbAutoRebuildTreeOnInstanceChanges;
+}
+
 void FFoliageMeshInfo::AddInstance(AInstancedFoliageActor* InIFA, const UFoliageType* InSettings, const FFoliageInstance& InNewInstance, UActorComponent* InBaseComponent, bool RebuildFoliageTree)
 {
 	FFoliageInstance Instance = InNewInstance;
@@ -1070,88 +1118,90 @@ void FFoliageMeshInfo::AddInstance(AInstancedFoliageActor* InIFA, const UFoliage
 
 void FFoliageMeshInfo::RemoveInstances(AInstancedFoliageActor* InIFA, const TArray<int32>& InInstancesToRemove, bool RebuildFoliageTree)
 {
-	if (InInstancesToRemove.Num())
+	SCOPE_CYCLE_COUNTER(STAT_FoliageRemoveInstance);
+
+	if (InInstancesToRemove.Num() <= 0)
 	{
-		check(Component);
-		InIFA->Modify();
+		return;
+	}
 
-		bool PreviousbAutoRebuildTreeOnInstanceChanges = Component->bAutoRebuildTreeOnInstanceChanges;
-		Component->bAutoRebuildTreeOnInstanceChanges = false;
+	check(Component);
+	InIFA->Modify();
 
+	bool PreviousbAutoRebuildTreeOnInstanceChanges = Component->bAutoRebuildTreeOnInstanceChanges;
+	Component->bAutoRebuildTreeOnInstanceChanges = false;
 
-		TSet<int32> InstancesToRemove;
-		for (int32 Instance : InInstancesToRemove)
+	TSet<int32> InstancesToRemove;
+	InstancesToRemove.Append(InInstancesToRemove);
+
+	while (InstancesToRemove.Num() > 0)
+	{
+		// Get an item from the set for processing
+		auto It = InstancesToRemove.CreateConstIterator();
+		int32 InstanceIndex = *It;
+		int32 InstanceIndexToRemove = InstanceIndex;
+
+		FFoliageInstance& Instance = Instances[InstanceIndex];
+
+		// remove from hash
+		RemoveFromBaseHash(InstanceIndex);
+		InstanceHash->RemoveInstance(Instance.Location, InstanceIndex);
+
+		// remove from the component
+		Component->RemoveInstance(InstanceIndex);
+
+		// Remove it from the selection.
+		SelectedIndices.Remove(InstanceIndex);
+
+		// remove from instances array
+		Instances.RemoveAtSwap(InstanceIndex, 1, false);
+
+		// update hashes for swapped instance
+		if (InstanceIndex != Instances.Num() && Instances.Num() > 0)
 		{
-			InstancesToRemove.Add(Instance);
-		}
+			// Instance hash
+			FFoliageInstance& SwappedInstance = Instances[InstanceIndex];
+			InstanceHash->RemoveInstance(SwappedInstance.Location, Instances.Num());
+			InstanceHash->InsertInstance(SwappedInstance.Location, InstanceIndex);
 
-		while (InstancesToRemove.Num())
-		{
-			// Get an item from the set for processing
-			auto It = InstancesToRemove.CreateConstIterator();
-			int32 InstanceIndex = *It;
-			int32 InstanceIndexToRemove = InstanceIndex;
-
-			FFoliageInstance& Instance = Instances[InstanceIndex];
-
-			// remove from hash
-			RemoveFromBaseHash(InstanceIndex);
-			InstanceHash->RemoveInstance(Instance.Location, InstanceIndex);
-
-			// remove from the component
-			Component->RemoveInstance(InstanceIndex);
-
-			// Remove it from the selection.
-			SelectedIndices.Remove(InstanceIndex);
-
-			// remove from instances array
-			Instances.RemoveAtSwap(InstanceIndex);
-
-			// update hashes for swapped instance
-			if (InstanceIndex != Instances.Num() && Instances.Num())
+			// Component hash
+			auto* InstanceSet = ComponentHash.Find(SwappedInstance.BaseId);
+			if (InstanceSet)
 			{
-				// Instance hash
-				FFoliageInstance& SwappedInstance = Instances[InstanceIndex];
-				InstanceHash->RemoveInstance(SwappedInstance.Location, Instances.Num());
-				InstanceHash->InsertInstance(SwappedInstance.Location, InstanceIndex);
-
-				// Component hash
-				auto* InstanceSet = ComponentHash.Find(SwappedInstance.BaseId);
-				if (InstanceSet)
-				{
-					InstanceSet->Remove(Instances.Num());
-					InstanceSet->Add(InstanceIndex);
-				}
-
-				// Selection
-				if (SelectedIndices.Contains(Instances.Num()))
-				{
-					SelectedIndices.Remove(Instances.Num());
-					SelectedIndices.Add(InstanceIndex);
-				}
-
-				// Removal list
-				if (InstancesToRemove.Contains(Instances.Num()))
-				{
-					// The item from the end of the array that we swapped in to InstanceIndex is also on the list to remove.
-					// Remove the item at the end of the array and leave InstanceIndex in the removal list.
-					InstanceIndexToRemove = Instances.Num();
-				}
+				InstanceSet->Remove(Instances.Num());
+				InstanceSet->Add(InstanceIndex);
 			}
 
-			// Remove the removed item from the removal list
-			InstancesToRemove.Remove(InstanceIndexToRemove);
+			// Selection
+			if (SelectedIndices.Contains(Instances.Num()))
+			{
+				SelectedIndices.Remove(Instances.Num());
+				SelectedIndices.Add(InstanceIndex);
+			}
+
+			// Removal list
+			if (InstancesToRemove.Contains(Instances.Num()))
+			{
+				// The item from the end of the array that we swapped in to InstanceIndex is also on the list to remove.
+				// Remove the item at the end of the array and leave InstanceIndex in the removal list.
+				InstanceIndexToRemove = Instances.Num();
+			}
 		}
-		
-		Component->bAutoRebuildTreeOnInstanceChanges = PreviousbAutoRebuildTreeOnInstanceChanges;
 
-		if (RebuildFoliageTree)
-		{
-			Component->BuildTreeIfOutdated(true, true);
-		}		
-
-		CheckValid();
+		// Remove the removed item from the removal list
+		InstancesToRemove.Remove(InstanceIndexToRemove);
 	}
+
+	Instances.Shrink();
+		
+	Component->bAutoRebuildTreeOnInstanceChanges = PreviousbAutoRebuildTreeOnInstanceChanges;
+
+	if (RebuildFoliageTree)
+	{
+		Component->BuildTreeIfOutdated(true, true);
+	}		
+
+	CheckValid();
 }
 
 void FFoliageMeshInfo::PreMoveInstances(AInstancedFoliageActor* InIFA, const TArray<int32>& InInstancesToMove)
@@ -1662,6 +1712,9 @@ void AInstancedFoliageActor::MoveInstancesForMovedComponent(UActorComponent* InC
 				Modify();
 			}
 
+			check(MeshInfo.Component);
+			MeshInfo.Component->bAutoRebuildTreeOnInstanceChanges = false;
+
 			for (int32 InstanceIndex : *InstanceSet)
 			{
 				FFoliageInstance& Instance = MeshInfo.Instances[InstanceIndex];
@@ -1679,12 +1732,14 @@ void AInstancedFoliageActor::MoveInstancesForMovedComponent(UActorComponent* InC
 				Instance.Rotation = NewTransform.Rotator();
 
 				// Apply render data
-				check(MeshInfo.Component);
-				MeshInfo.Component->UpdateInstanceTransform(InstanceIndex, Instance.GetInstanceWorldTransform(), true);
+				MeshInfo.Component->UpdateInstanceTransform(InstanceIndex, Instance.GetInstanceWorldTransform(), true, true);
 
 				// Re-add the new instance location to the hash
 				MeshInfo.InstanceHash->InsertInstance(Instance.Location, InstanceIndex);
 			}
+
+			MeshInfo.Component->bAutoRebuildTreeOnInstanceChanges = true;
+			MeshInfo.Component->BuildTreeIfOutdated(true, false);
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Foliage/Public/InstancedFoliage.h b/Engine/Source/Runtime/Foliage/Public/InstancedFoliage.h
index 3f8964573772..3e64d4e9ca9f 100644
--- a/Engine/Source/Runtime/Foliage/Public/InstancedFoliage.h
+++ b/Engine/Source/Runtime/Foliage/Public/InstancedFoliage.h
@@ -79,6 +79,8 @@ struct FFoliageInstance : public FFoliageInstancePlacementInfo
 
 	FGuid ProceduralGuid;
 
+	UActorComponent* BaseComponent;
+
 	FFoliageInstance()
 		: BaseId(0)
 	{}
@@ -196,6 +198,8 @@ struct FFoliageMeshInfo
 #if WITH_EDITOR
 	FOLIAGE_API void AddInstance(AInstancedFoliageActor* InIFA, const UFoliageType* InSettings, const FFoliageInstance& InNewInstance, bool RebuildFoliageTree);
 	FOLIAGE_API void AddInstance(AInstancedFoliageActor* InIFA, const UFoliageType* InSettings, const FFoliageInstance& InNewInstance, UActorComponent* InBaseComponent, bool RebuildFoliageTree);
+	FOLIAGE_API void AddInstances(AInstancedFoliageActor* InIFA, const UFoliageType* InSettings, const TSet<const FFoliageInstance*>& InNewInstances, bool RebuildFoliageTree);
+	
 	FOLIAGE_API void RemoveInstances(AInstancedFoliageActor* InIFA, const TArray<int32>& InInstancesToRemove, bool RebuildFoliageTree);
 	// Apply changes in the FoliageType to the component
 	FOLIAGE_API void UpdateComponentSettings(const UFoliageType* InSettings);
diff --git a/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsManager.h b/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsManager.h
index f70e7b3f1260..a57a323ffd2f 100644
--- a/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsManager.h
+++ b/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsManager.h
@@ -40,12 +40,34 @@ struct FGameplayTagTableRow : public FTableRowBase
 	GAMEPLAYTAGS_API bool operator<(FGameplayTagTableRow const& Other) const;
 };
 
+/** Simple struct for a table row in the restricted gameplay tag table and element in the ini list */
+USTRUCT()
+struct FRestrictedGameplayTagTableRow : public FGameplayTagTableRow
+{
+	GENERATED_USTRUCT_BODY()
+
+	/** Tag specified in the table */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GameplayTag)
+	bool bAllowNonRestrictedChildren;
+
+	/** Constructors */
+	FRestrictedGameplayTagTableRow() {}
+	FRestrictedGameplayTagTableRow(FName InTag, const FString& InDevComment = TEXT(""), bool InAllowNonRestrictedChildren = false) : FGameplayTagTableRow(InTag, InDevComment), bAllowNonRestrictedChildren(InAllowNonRestrictedChildren) {}
+	GAMEPLAYTAGS_API FRestrictedGameplayTagTableRow(FRestrictedGameplayTagTableRow const& Other);
+
+	/** Assignment/Equality operators */
+	GAMEPLAYTAGS_API FRestrictedGameplayTagTableRow& operator=(FRestrictedGameplayTagTableRow const& Other);
+	GAMEPLAYTAGS_API bool operator==(FRestrictedGameplayTagTableRow const& Other) const;
+	GAMEPLAYTAGS_API bool operator!=(FRestrictedGameplayTagTableRow const& Other) const;
+};
+
 UENUM()
 enum class EGameplayTagSourceType : uint8
 {
 	Native,				// Was added from C++ code
 	DefaultTagList,		// The default tag list in DefaultGameplayTags.ini
 	TagList,			// Another tag list from an ini in tags/*.ini
+	RestrictedTagList,	// Restricted tags from an ini
 	DataTable,			// From a DataTable
 	Invalid,			// Not a real source
 };
@@ -68,13 +90,17 @@ struct FGameplayTagSource
 	UPROPERTY()
 	class UGameplayTagsList* SourceTagList;
 
+	/** If this has restricted tags and is bound to an ini object for saving, this is the one */
+	UPROPERTY()
+	class URestrictedGameplayTagsList* SourceRestrictedTagList;
+
 	FGameplayTagSource() 
-		: SourceName(NAME_None), SourceType(EGameplayTagSourceType::Invalid), SourceTagList(nullptr) 
+		: SourceName(NAME_None), SourceType(EGameplayTagSourceType::Invalid), SourceTagList(nullptr), SourceRestrictedTagList(nullptr)
 	{
 	}
 
-	FGameplayTagSource(FName InSourceName, EGameplayTagSourceType InSourceType, UGameplayTagsList* InSourceTagList = nullptr) 
-		: SourceName(InSourceName), SourceType(InSourceType), SourceTagList(InSourceTagList)
+	FGameplayTagSource(FName InSourceName, EGameplayTagSourceType InSourceType, UGameplayTagsList* InSourceTagList = nullptr, URestrictedGameplayTagsList* InSourceRestrictedTagList = nullptr) 
+		: SourceName(InSourceName), SourceType(InSourceType), SourceTagList(InSourceTagList), SourceRestrictedTagList(InSourceRestrictedTagList)
 	{
 	}
 
@@ -107,7 +133,7 @@ struct FGameplayTagNode
 	FGameplayTagNode(){};
 
 	/** Simple constructor */
-	FGameplayTagNode(FName InTag, TSharedPtr<FGameplayTagNode> InParentNode);
+	FGameplayTagNode(FName InTag, TSharedPtr<FGameplayTagNode> InParentNode, bool InIsExplicitTag, bool InIsRestrictedTag, bool InAllowNonRestrictedChildren);
 
 	/** Returns a correctly constructed container with only this tag, useful for doing container queries */
 	FORCEINLINE const FGameplayTagContainer& GetSingleTagContainer() const { return CompleteTagWithParents; }
@@ -159,6 +185,30 @@ struct FGameplayTagNode
 	/** Reset the node of all of its values */
 	GAMEPLAYTAGS_API void ResetNode();
 
+	/** Returns true if the tag was explicitly specified in code or data */
+	FORCEINLINE bool IsExplicitTag() const {
+#if WITH_EDITORONLY_DATA
+		return bIsExplicitTag;
+#endif
+		return true;
+	}
+
+	/** Returns true if the tag is a restricted tag and allows non-restricted children */
+	FORCEINLINE bool GetAllowNonRestrictedChildren() const { 
+#if WITH_EDITORONLY_DATA
+		return bAllowNonRestrictedChildren;  
+#endif
+		return true;
+	}
+
+	/** Returns true if the tag is a restricted tag */
+	FORCEINLINE bool IsRestrictedGameplayTag() const {
+#if WITH_EDITORONLY_DATA
+		return bIsRestrictedTag;
+#endif
+		return true;
+	}
+
 private:
 	/** Raw name for this tag at current rank in the tree */
 	FName Tag;
@@ -181,9 +231,28 @@ private:
 
 	/** Comment for this tag */
 	FString DevComment;
+
+	/** If this is true then the tag can only have normal tag children if bAllowNonRestrictedChildren is true */
+	uint8 bIsRestrictedTag : 1;
+
+	/** If this is true then any children of this tag must come from the restricted tags */
+	uint8 bAllowNonRestrictedChildren : 1;
+
+	/** If this is true then the tag was explicitly added and not only implied by its child tags */
+	uint8 bIsExplicitTag : 1;
+
+	/** If this is true then at least one tag that inherits from this tag is coming from multiple sources. Used for updating UI in the editor. */
+	uint8 bDescendantHasConflict : 1;
+
+	/** If this is true then this tag is coming from multiple sources. No descendants can be changed on this tag until this is resolved. */
+	uint8 bNodeHasConflict : 1;
+
+	/** If this is true then at least one tag that this tag descends from is coming from multiple sources. This tag and it's descendants can't be changed in the editor. */
+	uint8 bAncestorHasConflict : 1;
 #endif 
 
 	friend class UGameplayTagsManager;
+	friend class SGameplayTagWidget;
 };
 
 /** Holds data about the tag dictionary, is in a singleton UObject */
@@ -206,6 +275,16 @@ class GAMEPLAYTAGS_API UGameplayTagsManager : public UObject
 		return *SingletonManager;
 	}
 
+	/**
+	* Adds the gameplay tags corresponding to the strings in the array TagStrings to OutTagsContainer
+	*
+	* @param TagStrings Array of strings to search for as tags to add to the tag container
+	* @param OutTagsContainer Container to add the found tags to.
+	* @param ErrorIfNotfound: ensure() that tags exists.
+	*
+	*/
+	void RequestGameplayTagContainer(const TArray<FString>& TagStrings, FGameplayTagContainer& OutTagsContainer, bool bErrorIfNotFound=true) const;
+
 	/**
 	 * Gets the FGameplayTag that corresponds to the TagName
 	 *
@@ -342,7 +421,7 @@ class GAMEPLAYTAGS_API UGameplayTagsManager : public UObject
 	/** Returns true if if the passed in name is in the tag dictionary and can be created */
 	bool ValidateTagCreation(FName TagName) const;
 
-	/** Returns the tag source for a given tag source name, or null if not found */
+	/** Returns the tag source for a given tag source name and type, or null if not found */
 	const FGameplayTagSource* FindTagSource(FName TagSourceName) const;
 
 	/** Fills in an array with all tag sources of a specific type */
@@ -373,6 +452,15 @@ class GAMEPLAYTAGS_API UGameplayTagsManager : public UObject
 		return bUseFastReplication;
 	}
 
+	/** Returns a list of the ini files that contain restricted tags */
+	void GetRestrictedTagConfigFiles(TArray<FString>& RestrictedConfigFiles) const;
+
+	/** Returns a list of the source files that contain restricted tags */
+	void GetRestrictedTagSources(TArray<const FGameplayTagSource*>& Sources) const;
+
+	/** Returns a list of the owners for a restricted tag config file. May be empty */
+	void GetOwnersForTagSource(const FString& SourceName, TArray<FString>& OutOwners) const;
+
 	/** Handles redirectors for an entire container, will also error on invalid tags */
 	void RedirectTagsForContainer(FGameplayTagContainer& Container, UProperty* SerializingProperty) const;
 
@@ -417,8 +505,8 @@ class GAMEPLAYTAGS_API UGameplayTagsManager : public UObject
 	/** Returns true if this tag is directly in the dictionary already */
 	bool IsDictionaryTag(FName TagName) const;
 
-	/** Returns comment and source for tag. If not found return false */
-	bool GetTagEditorData(FName TagName, FString& OutComment, FName &OutTagSource) const;
+	/** Returns information about tag. If not found return false */
+	bool GetTagEditorData(FName TagName, FString& OutComment, FName &OutTagSource, bool& bOutIsTagExplicit, bool &bOutIsRestrictedTag, bool &bOutAllowNonRestrictedChildren) const;
 
 	/** Refresh the gameplaytag tree due to an editor change */
 	void EditorRefreshGameplayTagTree();
@@ -497,24 +585,29 @@ private:
 	friend class FGameplayEffectsTest;
 	friend class FGameplayTagsModule;
 	friend class FGameplayTagsEditorModule;
+	friend class UGameplayTagsSettings;
+	friend class SAddNewGameplayTagSourceWidget;
 
 	/**
 	 * Helper function to insert a tag into a tag node array
 	 *
-	 * @param Tag					Tag to insert
-	 * @param ParentNode			Parent node, if any, for the tag
-	 * @param NodeArray				Node array to insert the new node into, if necessary (if the tag already exists, no insertion will occur)
-	 * @param SourceName			File tag was added from
-	 * @param DevComment			Comment from developer about this tag
+	 * @param Tag							Tag to insert
+	 * @param ParentNode					Parent node, if any, for the tag
+	 * @param NodeArray						Node array to insert the new node into, if necessary (if the tag already exists, no insertion will occur)
+	 * @param SourceName					File tag was added from
+	 * @param DevComment					Comment from developer about this tag
+	 * @param bIsExplicitTag				Is the tag explicitly defined or is it implied by the existence of a child tag
+	 * @param bIsRestrictedTag				Is the tag a restricted tag or a regular gameplay tag
+	 * @param bAllowNonRestrictedChildren	If the tag is a restricted tag, can it have regular gameplay tag children or should all of its children be restricted tags as well?
 	 *
 	 * @return Index of the node of the tag
 	 */
-	int32 InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGameplayTagNode> ParentNode, TArray< TSharedPtr<FGameplayTagNode> >& NodeArray, FName SourceName, const FString& DevComment);
+	int32 InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGameplayTagNode> ParentNode, TArray< TSharedPtr<FGameplayTagNode> >& NodeArray, FName SourceName, const FString& DevComment, bool bIsExplicitTag, bool bIsRestrictedTag, bool bAllowNonRestrictedChildren);
 
 	/** Helper function to populate the tag tree from each table */
 	void PopulateTreeFromDataTable(class UDataTable* Table);
 
-	void AddTagTableRow(const FGameplayTagTableRow& TagRow, FName SourceName);
+	void AddTagTableRow(const FGameplayTagTableRow& TagRow, FName SourceName, bool bIsRestrictedTag = false);
 
 	void AddChildrenTags(FGameplayTagContainer& TagContainer, TSharedPtr<FGameplayTagNode> GameplayTagNode, bool RecurseAll=true, bool OnlyIncludeDictionaryTags=false) const;
 
@@ -533,6 +626,9 @@ private:
 	/** Constructs the net indices for each tag */
 	void ConstructNetIndex();
 
+	/** Marks all of the nodes that descend from CurNode as having an ancestor node that has a source conflict. */
+	void MarkChildrenOfNodeConflict(TSharedPtr<FGameplayTagNode> CurNode);
+
 	/** Roots of gameplay tag nodes */
 	TSharedPtr<FGameplayTagNode> GameplayRootTag;
 
@@ -570,6 +666,9 @@ private:
 	/** Sorted list of nodes, used for network replication */
 	TArray<TSharedPtr<FGameplayTagNode>> NetworkGameplayTagNodeIndex;
 
+	UPROPERTY()
+	TArray<UDataTable*> RestrictedGameplayTagTables;
+
 	/** Holds all of the valid gameplay-related tags that can be applied to assets */
 	UPROPERTY()
 	TArray<UDataTable*> GameplayTagTables;
diff --git a/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsSettings.h b/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsSettings.h
index 76d18557d965..a8899f7b899b 100644
--- a/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsSettings.h
+++ b/Engine/Source/Runtime/GameplayTags/Classes/GameplayTagsSettings.h
@@ -69,6 +69,40 @@ class GAMEPLAYTAGS_API UGameplayTagsList : public UObject
 	void SortTags();
 };
 
+/** Base class for storing a list of restricted gameplay tags as an ini list. This is used for both the central list and additional lists */
+UCLASS(config = GameplayTags, notplaceable)
+class GAMEPLAYTAGS_API URestrictedGameplayTagsList : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+	/** Relative path to the ini file that is backing this list */
+	UPROPERTY()
+	FString ConfigFileName;
+
+	/** List of restricted tags saved to this file */
+	UPROPERTY(config, EditAnywhere, Category = GameplayTags)
+	TArray<FRestrictedGameplayTagTableRow> RestrictedGameplayTagList;
+
+	/** Sorts tags alphabetically */
+	void SortTags();
+};
+
+USTRUCT()
+struct GAMEPLAYTAGS_API FRestrictedConfigInfo
+{
+	GENERATED_BODY()
+
+	/** Allows new tags to be saved into their own INI file. This is make merging easier for non technical developers by setting up their own ini file. */
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = GameplayTags)
+	FString RestrictedConfigName;
+
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = GameplayTags)
+	TArray<FString> Owners;
+
+	bool operator==(const FRestrictedConfigInfo& Other) const;
+	bool operator!=(const FRestrictedConfigInfo& Other) const;
+};
+
 /**
  *	Class for importing GameplayTags directly from a config file.
  *	FGameplayTagsEditorModule::StartupModule adds this class to the Project Settings menu to be edited.
@@ -123,10 +157,23 @@ class GAMEPLAYTAGS_API UGameplayTagsSettings : public UGameplayTagsList
 	UPROPERTY(config, EditAnywhere, Category= "Advanced Replication")
 	int32 NetIndexFirstBitSegment;
 
-#if WITH_EDITOR
-	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	/** Allows new tags to be saved into their own INI file. */
+	UPROPERTY(config, EditAnywhere, AdvancedDisplay, Category = "Advanced Gameplay Tags")
+	TArray<FRestrictedConfigInfo> RestrictedConfigFiles;
+#if WITH_EDITORONLY_DATA
+	// Dummy parameter used to hook the editor UI
+	UPROPERTY(EditAnywhere, AdvancedDisplay, transient, Category = "Advanced Gameplay Tags")
+	FString RestrictedTagList;
 #endif
+#if WITH_EDITOR
+	virtual void PreEditChange(UProperty* PropertyThatWillChange) override;
+	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 
+private:
+	// temporary copy of RestrictedConfigFiles that we use to identify changes in the list
+	// this is required to autopopulate the owners field
+	TArray<FRestrictedConfigInfo> RestrictedConfigFilesTempCopy;
+#endif
 };
 
 UCLASS(config=GameplayTags, notplaceable)
diff --git a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagContainer.cpp b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagContainer.cpp
index 1568c01231e2..98bb271545d2 100644
--- a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagContainer.cpp
+++ b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagContainer.cpp
@@ -975,10 +975,10 @@ bool FGameplayTagContainer::NetSerialize(FArchive& Ar, class UPackageMap* Map, b
 	if (Ar.IsSaving())
 	{
 		uint8 NumTags = GameplayTags.Num();
-		uint8 MaxSize = (1 << NumBitsForContainerSize);
-		if (!ensureMsgf(NumTags < MaxSize, TEXT("TagContainer has %d elements when max is %d! Tags: %s"), NumTags, MaxSize, *ToStringSimple()))
+		uint8 MaxSize = (1 << NumBitsForContainerSize) - 1;
+		if (!ensureMsgf(NumTags <= MaxSize, TEXT("TagContainer has %d elements when max is %d! Tags: %s"), NumTags, MaxSize, *ToStringSimple()))
 		{
-			NumTags = MaxSize - 1;
+			NumTags = MaxSize;
 		}
 		
 		Ar.SerializeBits(&NumTags, NumBitsForContainerSize);
diff --git a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsManager.cpp b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsManager.cpp
index 69c1c7cd4e10..c2eb2569ee7b 100644
--- a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsManager.cpp
+++ b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsManager.cpp
@@ -86,7 +86,46 @@ void UGameplayTagsManager::ConstructGameplayTagTree()
 	{
 		GameplayRootTag = MakeShareable(new FGameplayTagNode());
 
-		// Add native tags first
+		UGameplayTagsSettings* MutableDefault = GetMutableDefault<UGameplayTagsSettings>();
+		FString DefaultEnginePath = FString::Printf(TEXT("%sDefaultEngine.ini"), *FPaths::SourceConfigDir());
+		TArray<FName> RestrictedGameplayTagSourceNames;
+
+		// Add prefixes first
+		if (ShouldImportTagsFromINI())
+		{
+#if STATS
+			FString PerfMessage = FString::Printf(TEXT("UGameplayTagsManager::ConstructGameplayTagTree: ImportINI prefixes"));
+			SCOPE_LOG_TIME_IN_SECONDS(*PerfMessage, nullptr)
+#endif
+
+			TArray<FString> RestrictedGameplayTagFiles;
+			GetRestrictedTagConfigFiles(RestrictedGameplayTagFiles);
+			RestrictedGameplayTagFiles.Sort();
+
+			for (FString& FileName : RestrictedGameplayTagFiles)
+			{
+				FName TagSource = FName(*FPaths::GetCleanFilename(FileName));
+				RestrictedGameplayTagSourceNames.Add(TagSource);
+				FGameplayTagSource* FoundSource = FindOrAddTagSource(TagSource, EGameplayTagSourceType::RestrictedTagList);
+
+				// Make sure we have regular tag sources to match the restricted tag sources but don't try to read any tags from them yet.
+				FindOrAddTagSource(TagSource, EGameplayTagSourceType::TagList);
+
+				FoundSource->SourceRestrictedTagList->LoadConfig(URestrictedGameplayTagsList::StaticClass(), *FileName);
+#if WITH_EDITOR
+				if (GIsEditor || IsRunningCommandlet()) // Sort tags for UI Purposes but don't sort in -game scenario since this would break compat with noneditor cooked builds
+				{
+					FoundSource->SourceRestrictedTagList->SortTags();
+				}
+#endif
+				for (const FRestrictedGameplayTagTableRow& TableRow : FoundSource->SourceRestrictedTagList->RestrictedGameplayTagList)
+				{
+					AddTagTableRow(TableRow, TagSource, true);
+				}
+			}
+		}
+
+		// Add native tags before other tags
 		for (FName TagToAdd : NativeTagsToAdd)
 		{
 			AddTagTableRow(FGameplayTagTableRow(TagToAdd), FGameplayTagSource::GetNativeName());
@@ -107,9 +146,6 @@ void UGameplayTagsManager::ConstructGameplayTagTree()
 			}
 		}
 
-		UGameplayTagsSettings* MutableDefault = GetMutableDefault<UGameplayTagsSettings>();
-		FString DefaultEnginePath = FString::Printf(TEXT("%sDefaultEngine.ini"), *FPaths::SourceConfigDir());
-
 		// Create native source
 		FindOrAddTagSource(FGameplayTagSource::GetNativeName(), EGameplayTagSourceType::Native);
 
@@ -158,6 +194,23 @@ void UGameplayTagsManager::ConstructGameplayTagTree()
 			for (FString& FileName : FilesInDirectory)
 			{
 				TagSource = FName(*FPaths::GetCleanFilename(FileName));
+
+				// skip the restricted tag files
+				bool bIsRestrictedTagFile = false;
+				for (const FName& RestrictedTagSource : RestrictedGameplayTagSourceNames)
+				{
+					if (TagSource == RestrictedTagSource)
+					{
+						bIsRestrictedTagFile = true;
+						break;
+					}
+				}
+
+				if (bIsRestrictedTagFile)
+				{
+					continue;
+				}
+
 				FGameplayTagSource* FoundSource = FindOrAddTagSource(TagSource, EGameplayTagSourceType::TagList);
 
 				UE_LOG(LogGameplayTags, Display, TEXT("Loading Tag File: %s"), *FileName);
@@ -178,7 +231,7 @@ void UGameplayTagsManager::ConstructGameplayTagTree()
 				}
 
 #if WITH_EDITOR
-				if (GIsEditor || IsRunningCommandlet()) // Sort tags for UI Purposes but don't sort in -game scenerio since this would break compat with noneditor cooked builds
+				if (GIsEditor || IsRunningCommandlet()) // Sort tags for UI Purposes but don't sort in -game scenario since this would break compat with noneditor cooked builds
 				{
 					FoundSource->SourceTagList->SortTags();
 				}
@@ -450,6 +503,53 @@ bool UGameplayTagsManager::ShouldImportTagsFromINI() const
 	return MutableDefault->ImportTagsFromConfig;
 }
 
+void UGameplayTagsManager::GetRestrictedTagConfigFiles(TArray<FString>& RestrictedConfigFiles) const
+{
+	UGameplayTagsSettings* MutableDefault = GetMutableDefault<UGameplayTagsSettings>();
+
+	if (MutableDefault)
+	{
+		for (const FRestrictedConfigInfo& Config : MutableDefault->RestrictedConfigFiles)
+		{
+			RestrictedConfigFiles.Add(FString::Printf(TEXT("%sTags/%s"), *FPaths::SourceConfigDir(), *Config.RestrictedConfigName));
+		}
+	}
+}
+
+void UGameplayTagsManager::GetRestrictedTagSources(TArray<const FGameplayTagSource*>& Sources) const
+{
+	UGameplayTagsSettings* MutableDefault = GetMutableDefault<UGameplayTagsSettings>();
+
+	if (MutableDefault)
+	{
+		for (const FRestrictedConfigInfo& Config : MutableDefault->RestrictedConfigFiles)
+		{
+			const FGameplayTagSource* Source = FindTagSource(*Config.RestrictedConfigName);
+			if (Source)
+			{
+				Sources.Add(Source);
+			}
+		}
+	}
+}
+
+void UGameplayTagsManager::GetOwnersForTagSource(const FString& SourceName, TArray<FString>& OutOwners) const
+{
+	UGameplayTagsSettings* MutableDefault = GetMutableDefault<UGameplayTagsSettings>();
+
+	if (MutableDefault)
+	{
+		for (const FRestrictedConfigInfo& Config : MutableDefault->RestrictedConfigFiles)
+		{
+			if (Config.RestrictedConfigName.Equals(SourceName))
+			{
+				OutOwners = Config.Owners;
+				return;
+			}
+		}
+	}
+}
+
 void UGameplayTagsManager::RedirectTagsForContainer(FGameplayTagContainer& Container, UProperty* SerializingProperty) const
 {
 	TSet<FName> NamesToRemove;
@@ -597,26 +697,86 @@ void UGameplayTagsManager::PopulateTreeFromDataTable(class UDataTable* InTable)
 	}
 }
 
-void UGameplayTagsManager::AddTagTableRow(const FGameplayTagTableRow& TagRow, FName SourceName)
+void UGameplayTagsManager::AddTagTableRow(const FGameplayTagTableRow& TagRow, FName SourceName, bool bIsRestrictedTag)
 {
 	TSharedPtr<FGameplayTagNode> CurNode = GameplayRootTag;
+	TArray<TSharedPtr<FGameplayTagNode>> AncestorNodes;
+	bool bAllowNonRestrictedChildren = true;
+
+	const FRestrictedGameplayTagTableRow* RestrictedTagRow = static_cast<const FRestrictedGameplayTagTableRow*>(&TagRow);
+	if (bIsRestrictedTag && RestrictedTagRow)
+	{
+		bAllowNonRestrictedChildren = RestrictedTagRow->bAllowNonRestrictedChildren;
+	}
 
 	// Split the tag text on the "." delimiter to establish tag depth and then insert each tag into the
 	// gameplay tag tree
 	TArray<FString> SubTags;
 	TagRow.Tag.ToString().ParseIntoArray(SubTags, TEXT("."), true);
 
+	bool bHasSeenConflict = false;
+
 	for (int32 SubTagIdx = 0; SubTagIdx < SubTags.Num(); ++SubTagIdx)
 	{
 		TArray< TSharedPtr<FGameplayTagNode> >& ChildTags = CurNode.Get()->GetChildTagNodes();
 
 		bool bFromDictionary = (SubTagIdx == (SubTags.Num() - 1));
-		int32 InsertionIdx = InsertTagIntoNodeArray(*SubTags[SubTagIdx], CurNode, ChildTags, bFromDictionary ? SourceName : NAME_None, TagRow.DevComment);
+		int32 InsertionIdx = InsertTagIntoNodeArray(*SubTags[SubTagIdx], CurNode, ChildTags, SourceName, TagRow.DevComment, bFromDictionary, bIsRestrictedTag, bAllowNonRestrictedChildren);
 
 		CurNode = ChildTags[InsertionIdx];
+
+		// Tag conflicts only affect the editor so we don't look for them in the game
+#if WITH_EDITORONLY_DATA
+		if (bIsRestrictedTag)
+		{
+			CurNode->bAncestorHasConflict = bHasSeenConflict;
+
+			// If the sources don't match and the tag is explicit and we should've added the tag explicitly here, we have a conflict
+			if (CurNode->SourceName != SourceName && (CurNode->bIsExplicitTag && SubTagIdx == SubTags.Num() - 1))
+			{
+				// mark all ancestors as having a bad descendant
+				for (TSharedPtr<FGameplayTagNode> CurAncestorNode : AncestorNodes)
+				{
+					CurAncestorNode->bDescendantHasConflict = true;
+				}
+
+				// mark the current tag as having a conflict
+				CurNode->bNodeHasConflict = true;
+
+				// append source names
+				FString CombinedSources = CurNode->SourceName.ToString();
+				CombinedSources.Append(TEXT(" and "));
+				CombinedSources.Append(SourceName.ToString());
+				CurNode->SourceName = FName(*CombinedSources);
+
+				// mark all current descendants as having a bad ancestor
+				MarkChildrenOfNodeConflict(CurNode);
+			}
+
+			// mark any children we add later in this function as having a bad ancestor
+			if (CurNode->bNodeHasConflict)
+			{
+				bHasSeenConflict = true;
+			}
+
+			AncestorNodes.Add(CurNode);
+		}
+#endif
 	}
 }
 
+void UGameplayTagsManager::MarkChildrenOfNodeConflict(TSharedPtr<FGameplayTagNode> CurNode)
+{
+#if WITH_EDITORONLY_DATA
+	TArray< TSharedPtr<FGameplayTagNode> >& ChildTags = CurNode.Get()->GetChildTagNodes();
+	for (TSharedPtr<FGameplayTagNode> ChildNode : ChildTags)
+	{
+		ChildNode->bAncestorHasConflict = true;
+		MarkChildrenOfNodeConflict(ChildNode);
+	}
+#endif
+}
+
 UGameplayTagsManager::~UGameplayTagsManager()
 {
 	DestroyGameplayTagTree();
@@ -638,7 +798,7 @@ bool UGameplayTagsManager::IsNativelyAddedTag(FGameplayTag Tag) const
 	return NativeTagsToAdd.Contains(Tag.GetTagName());
 }
 
-int32 UGameplayTagsManager::InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGameplayTagNode> ParentNode, TArray< TSharedPtr<FGameplayTagNode> >& NodeArray, FName SourceName, const FString& DevComment)
+int32 UGameplayTagsManager::InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGameplayTagNode> ParentNode, TArray< TSharedPtr<FGameplayTagNode> >& NodeArray, FName SourceName, const FString& DevComment, bool bIsExplicitTag, bool bIsRestrictedTag, bool bAllowNonRestrictedChildren)
 {
 	int32 InsertionIdx = INDEX_NONE;
 	int32 WhereToInsert = INDEX_NONE;
@@ -648,12 +808,35 @@ int32 UGameplayTagsManager::InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGamepl
 	{
 		if (NodeArray[CurIdx].IsValid())
 		{
-			if (NodeArray[CurIdx].Get()->GetSimpleTagName() == Tag)
+			FGameplayTagNode* CurrNode = NodeArray[CurIdx].Get();
+			if (CurrNode->GetSimpleTagName() == Tag)
 			{
 				InsertionIdx = CurIdx;
+#if WITH_EDITORONLY_DATA
+				// If we are explicitly adding this tag then overwrite the existing children restrictions with whatever is in the ini
+				// If we restrict children in the input data, make sure we restrict them in the existing node. This applies to explicit and implicitly defined nodes
+				if (bAllowNonRestrictedChildren == false || bIsExplicitTag)
+				{
+					// check if the tag is explicitly being created in more than one place.
+					if (CurrNode->bIsExplicitTag && bIsExplicitTag)
+					{
+						// restricted tags always get added first
+						// 
+						// There are two possibilities if we're adding a restricted tag. 
+						// If the existing tag is non-restricted the restricted tag should take precedence. This may invalidate some child tags of the existing tag.
+						// If the existing tag is restricted we have a conflict. This is explicitly not allowed.
+						if (bIsRestrictedTag)
+						{
+							
+						}
+					}
+					CurrNode->bAllowNonRestrictedChildren = bAllowNonRestrictedChildren;
+					CurrNode->bIsExplicitTag = CurrNode->bIsExplicitTag || bIsExplicitTag;
+				}
+#endif				
 				break;
 			}
-			else if (NodeArray[CurIdx].Get()->GetSimpleTagName() > Tag && WhereToInsert == INDEX_NONE)
+			else if (CurrNode->GetSimpleTagName() > Tag && WhereToInsert == INDEX_NONE)
 			{
 				// Insert new node before this
 				WhereToInsert = CurIdx;
@@ -670,7 +853,7 @@ int32 UGameplayTagsManager::InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGamepl
 		}
 
 		// Don't add the root node as parent
-		TSharedPtr<FGameplayTagNode> TagNode = MakeShareable(new FGameplayTagNode(Tag, ParentNode != GameplayRootTag ? ParentNode : nullptr));
+		TSharedPtr<FGameplayTagNode> TagNode = MakeShareable(new FGameplayTagNode(Tag, ParentNode != GameplayRootTag ? ParentNode : nullptr, bIsExplicitTag, bIsRestrictedTag, bAllowNonRestrictedChildren));
 
 		// Add at the sorted location
 		InsertionIdx = NodeArray.Insert(TagNode, WhereToInsert);
@@ -689,6 +872,7 @@ int32 UGameplayTagsManager::InsertTagIntoNodeArray(FName Tag, TSharedPtr<FGamepl
 
 #if WITH_EDITOR
 	static FName NativeSourceName = FGameplayTagSource::GetNativeName();
+
 	// Set/update editor only data
 	if (NodeArray[InsertionIdx]->SourceName.IsNone() && !SourceName.IsNone())
 	{
@@ -1010,7 +1194,7 @@ void UGameplayTagsManager::GetAllTagsFromSource(FName TagSource, TArray< TShared
 bool UGameplayTagsManager::IsDictionaryTag(FName TagName) const
 {
 	TSharedPtr<FGameplayTagNode> Node = FindTagNode(TagName);
-	if (Node.IsValid() && Node->SourceName != NAME_None)
+	if (Node.IsValid() && Node->bIsExplicitTag)
 	{
 		return true;
 	}
@@ -1018,13 +1202,16 @@ bool UGameplayTagsManager::IsDictionaryTag(FName TagName) const
 	return false;
 }
 
-bool UGameplayTagsManager::GetTagEditorData(FName TagName, FString& OutComment, FName &OutTagSource) const
+bool UGameplayTagsManager::GetTagEditorData(FName TagName, FString& OutComment, FName& OutTagSource, bool& bOutIsTagExplicit, bool &bOutIsRestrictedTag, bool &bOutAllowNonRestrictedChildren) const
 {
 	TSharedPtr<FGameplayTagNode> Node = FindTagNode(TagName);
 	if (Node.IsValid())
 	{
 		OutComment = Node->DevComment;
 		OutTagSource = Node->SourceName;
+		bOutIsTagExplicit = Node->bIsExplicitTag;
+		bOutIsRestrictedTag = Node->bIsRestrictedTag;
+		bOutAllowNonRestrictedChildren = Node->bAllowNonRestrictedChildren;
 		return true;
 	}
 	return false;
@@ -1121,12 +1308,29 @@ FGameplayTagSource* UGameplayTagsManager::FindOrAddTagSource(FName TagSourceName
 		NewSource->SourceTagList = NewObject<UGameplayTagsList>(this, TagSourceName, RF_Transient);
 		NewSource->SourceTagList->ConfigFileName = FString::Printf(TEXT("%sTags/%s"), *FPaths::SourceConfigDir(), *TagSourceName.ToString());
 	}
+	else if (SourceType == EGameplayTagSourceType::RestrictedTagList)
+	{
+		NewSource->SourceRestrictedTagList = NewObject<URestrictedGameplayTagsList>(this, TagSourceName, RF_Transient);
+		NewSource->SourceRestrictedTagList->ConfigFileName = FString::Printf(TEXT("%sTags/%s"), *FPaths::SourceConfigDir(), *TagSourceName.ToString());
+	}
 
 	return NewSource;
 }
 
 DECLARE_CYCLE_STAT(TEXT("UGameplayTagsManager::RequestGameplayTag"), STAT_UGameplayTagsManager_RequestGameplayTag, STATGROUP_GameplayTags);
 
+void UGameplayTagsManager::RequestGameplayTagContainer(const TArray<FString>& TagStrings, FGameplayTagContainer& OutTagsContainer, bool bErrorIfNotFound/*=true*/) const
+{
+	for (const FString& CurrentTagString : TagStrings)
+	{
+		FGameplayTag RequestedTag = RequestGameplayTag(FName(*(CurrentTagString.TrimStartAndEnd())), bErrorIfNotFound);
+		if (RequestedTag.IsValid())
+		{
+			OutTagsContainer.AddTag(RequestedTag);
+		}
+	}
+}
+
 FGameplayTag UGameplayTagsManager::RequestGameplayTag(FName TagName, bool ErrorIfNotFound) const
 {
 	SCOPE_CYCLE_COUNTER(STAT_UGameplayTagsManager_RequestGameplayTag);
@@ -1438,7 +1642,56 @@ bool FGameplayTagTableRow::operator<(FGameplayTagTableRow const& Other) const
 	return (Tag < Other.Tag);
 }
 
-FGameplayTagNode::FGameplayTagNode(FName InTag, TSharedPtr<FGameplayTagNode> InParentNode)
+FRestrictedGameplayTagTableRow::FRestrictedGameplayTagTableRow(FRestrictedGameplayTagTableRow const& Other)
+{
+	*this = Other;
+}
+
+FRestrictedGameplayTagTableRow& FRestrictedGameplayTagTableRow::operator=(FRestrictedGameplayTagTableRow const& Other)
+{
+	// Guard against self-assignment
+	if (this == &Other)
+	{
+		return *this;
+	}
+
+	Super::operator=(Other);
+	bAllowNonRestrictedChildren = Other.bAllowNonRestrictedChildren;
+
+	return *this;
+}
+
+bool FRestrictedGameplayTagTableRow::operator==(FRestrictedGameplayTagTableRow const& Other) const
+{
+	if (bAllowNonRestrictedChildren != Other.bAllowNonRestrictedChildren)
+	{
+		return false;
+	}
+
+	if (Tag != Other.Tag)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+bool FRestrictedGameplayTagTableRow::operator!=(FRestrictedGameplayTagTableRow const& Other) const
+{
+	if (bAllowNonRestrictedChildren == Other.bAllowNonRestrictedChildren)
+	{
+		return false;
+	}
+
+	if (Tag == Other.Tag)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+FGameplayTagNode::FGameplayTagNode(FName InTag, TSharedPtr<FGameplayTagNode> InParentNode, bool InIsExplicitTag, bool InIsRestrictedTag, bool InAllowNonRestrictedChildren)
 	: Tag(InTag)
 	, ParentNode(InParentNode)
 	, NetIndex(INVALID_TAGNETINDEX)
@@ -1465,6 +1718,16 @@ FGameplayTagNode::FGameplayTagNode(FName InTag, TSharedPtr<FGameplayTagNode> InP
 	// Manually construct the tag container as we want to bypass the safety checks
 	CompleteTagWithParents.GameplayTags.Add(FGameplayTag(FName(*CompleteTagString)));
 	CompleteTagWithParents.ParentTags = ParentCompleteTags;
+
+#if WITH_EDITORONLY_DATA
+	bIsExplicitTag = InIsExplicitTag;
+	bIsRestrictedTag = InIsRestrictedTag;
+	bAllowNonRestrictedChildren = InAllowNonRestrictedChildren;
+
+	bDescendantHasConflict = false;
+	bNodeHasConflict = false;
+	bAncestorHasConflict = false;
+#endif 
 }
 
 void FGameplayTagNode::ResetNode()
@@ -1480,6 +1743,17 @@ void FGameplayTagNode::ResetNode()
 
 	ChildTags.Empty();
 	ParentNode.Reset();
+
+#if WITH_EDITORONLY_DATA
+	SourceName = NAME_None;
+	DevComment = "";
+	bIsExplicitTag = false;
+	bIsRestrictedTag = false;
+	bAllowNonRestrictedChildren = false;
+	bDescendantHasConflict = false;
+	bNodeHasConflict = false;
+	bAncestorHasConflict = false;
+#endif 
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsSettings.cpp b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsSettings.cpp
index 776b1c2fb5c0..930fa3dfbd0e 100644
--- a/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsSettings.cpp
+++ b/Engine/Source/Runtime/GameplayTags/Private/GameplayTagsSettings.cpp
@@ -14,11 +14,50 @@ void UGameplayTagsList::SortTags()
 	GameplayTagList.Sort();
 }
 
+URestrictedGameplayTagsList::URestrictedGameplayTagsList(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	// No config filename, needs to be set at creation time
+}
+
+void URestrictedGameplayTagsList::SortTags()
+{
+	RestrictedGameplayTagList.Sort();
+}
+
+bool FRestrictedConfigInfo::operator==(const FRestrictedConfigInfo& Other) const
+{
+	if (RestrictedConfigName != Other.RestrictedConfigName)
+	{
+		return false;
+	}
+
+	if (Owners.Num() != Other.Owners.Num())
+	{
+		return false;
+	}
+
+	for (int32 Idx = 0; Idx < Owners.Num(); ++Idx)
+	{
+		if (Owners[Idx] != Other.Owners[Idx])
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool FRestrictedConfigInfo::operator!=(const FRestrictedConfigInfo& Other) const
+{
+	return !(operator==(Other));
+}
+
 UGameplayTagsSettings::UGameplayTagsSettings(const FObjectInitializer& ObjectInitializer)
 : Super(ObjectInitializer)
 {
 	ConfigFileName = GetDefaultConfigFilename();
-	ImportTagsFromConfig = false;
+	ImportTagsFromConfig = true;
 	WarnOnInvalidTags = true;
 	FastReplication = false;
 	NumBitsForContainerSize = 6;
@@ -26,11 +65,53 @@ UGameplayTagsSettings::UGameplayTagsSettings(const FObjectInitializer& ObjectIni
 }
 
 #if WITH_EDITOR
+void UGameplayTagsSettings::PreEditChange(UProperty* PropertyThatWillChange)
+{
+	Super::PreEditChange(PropertyThatWillChange);
+
+	if (PropertyThatWillChange && PropertyThatWillChange->GetFName() == GET_MEMBER_NAME_CHECKED(UGameplayTagsSettings, RestrictedConfigFiles))
+	{
+		RestrictedConfigFilesTempCopy = RestrictedConfigFiles;
+	}
+}
+
 void UGameplayTagsSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
 	Super::PostEditChangeProperty(PropertyChangedEvent);
 	if (PropertyChangedEvent.Property)
 	{
+		if (PropertyChangedEvent.Property->GetName() == "RestrictedConfigName")
+		{
+			UGameplayTagsManager& Manager = UGameplayTagsManager::Get();
+			for (const FRestrictedConfigInfo& Info : RestrictedConfigFiles)
+			{
+				if (!Info.RestrictedConfigName.IsEmpty())
+				{
+					Manager.FindOrAddTagSource(*Info.RestrictedConfigName, EGameplayTagSourceType::RestrictedTagList);
+				}
+			}
+		}
+
+		// if we're adding a new restricted config file we will try to auto populate the owner
+		if (PropertyChangedEvent.ChangeType == EPropertyChangeType::ArrayAdd && PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(UGameplayTagsSettings, RestrictedConfigFiles))
+		{
+			if (RestrictedConfigFilesTempCopy.Num() + 1 == RestrictedConfigFiles.Num())
+			{
+				int32 FoundIdx = RestrictedConfigFilesTempCopy.Num();
+				for (int32 Idx = 0; Idx < RestrictedConfigFilesTempCopy.Num(); ++Idx)
+				{
+					if (RestrictedConfigFilesTempCopy[Idx] != RestrictedConfigFiles[Idx])
+					{
+						FoundIdx = Idx;
+						break;
+					}
+				}
+
+				ensure(FoundIdx < RestrictedConfigFiles.Num());
+				RestrictedConfigFiles[FoundIdx].Owners.Add(FPlatformProcess::UserName());
+
+			}
+		}
 		IGameplayTagsModule::OnTagSettingsChanged.Broadcast();
 	}
 }
diff --git a/Engine/Source/Runtime/GameplayTasks/Private/GameplayTask.cpp b/Engine/Source/Runtime/GameplayTasks/Private/GameplayTask.cpp
index 4b71989ee6bc..ffbf584e048f 100644
--- a/Engine/Source/Runtime/GameplayTasks/Private/GameplayTask.cpp
+++ b/Engine/Source/Runtime/GameplayTasks/Private/GameplayTask.cpp
@@ -51,7 +51,7 @@ IGameplayTaskOwnerInterface* UGameplayTask::ConvertToTaskOwner(AActor& OwnerActo
 
 void UGameplayTask::ReadyForActivation()
 {
-	if (TasksComponent.IsValid())
+	if (UGameplayTasksComponent* TasksPtr = TasksComponent.Get())
 	{
 		if (RequiresPriorityOrResourceManagement() == false)
 		{
@@ -59,7 +59,7 @@ void UGameplayTask::ReadyForActivation()
 		}
 		else
 		{
-			TasksComponent->AddTaskReadyForActivation(*this);
+			TasksPtr->AddTaskReadyForActivation(*this);
 		}
 	}
 	else
@@ -101,9 +101,9 @@ void UGameplayTask::InitSimulatedTask(UGameplayTasksComponent& InGameplayTasksCo
 
 UWorld* UGameplayTask::GetWorld() const
 {
-	if (TasksComponent.IsValid())
+	if (UGameplayTasksComponent* TasksPtr = TasksComponent.Get())
 	{
-		return TasksComponent.Get()->GetWorld();
+		return TasksPtr->GetWorld();
 	}
 
 	return nullptr;
@@ -115,9 +115,9 @@ AActor* UGameplayTask::GetOwnerActor() const
 	{
 		return TaskOwner->GetGameplayTaskOwner(this);		
 	}
-	else if (TasksComponent.IsValid())
+	else if (UGameplayTasksComponent* TasksPtr = TasksComponent.Get())
 	{
-		return TasksComponent->GetGameplayTaskOwner(this);
+		return TasksPtr->GetGameplayTaskOwner(this);
 	}
 
 	return nullptr;
@@ -129,9 +129,9 @@ AActor* UGameplayTask::GetAvatarActor() const
 	{
 		return TaskOwner->GetGameplayTaskAvatar(this);
 	}
-	else if (TasksComponent.IsValid())
+	else if (UGameplayTasksComponent* TasksPtr = TasksComponent.Get())
 	{
-		return TasksComponent->GetGameplayTaskAvatar(this);
+		return TasksPtr->GetGameplayTaskAvatar(this);
 	}
 
 	return nullptr;
@@ -204,9 +204,9 @@ void UGameplayTask::OnDestroy(bool bInOwnerFinished)
 	ensure(TaskState != EGameplayTaskState::Finished && !IsPendingKill());
 	TaskState = EGameplayTaskState::Finished;
 
-	if (TasksComponent.IsValid())
+	if (UGameplayTasksComponent* TasksPtr = TasksComponent.Get())
 	{
-		TasksComponent->OnGameplayTaskDeactivated(*this);
+		TasksPtr->OnGameplayTaskDeactivated(*this);
 	}
 
 	MarkPendingKill();
diff --git a/Engine/Source/Runtime/HardwareSurvey/Private/HardwareSurveyModule.cpp b/Engine/Source/Runtime/HardwareSurvey/Private/HardwareSurveyModule.cpp
index 640de3229d6c..dd9b9aa0d0eb 100644
--- a/Engine/Source/Runtime/HardwareSurvey/Private/HardwareSurveyModule.cpp
+++ b/Engine/Source/Runtime/HardwareSurvey/Private/HardwareSurveyModule.cpp
@@ -8,6 +8,7 @@
 #include "IHardwareSurveyModule.h"
 #include "AnalyticsEventAttribute.h"
 #include "Interfaces/IAnalyticsProvider.h"
+#include "Stats/Stats.h"
 
 /**
  * Implements the HardwareSurvey module.
@@ -61,6 +62,8 @@ protected:
 
 	bool TickHardwareSurvey(float Delta)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_HardwareSurveyModule_TickHardwareSurvey);
+
 		bool bContinueTick = true;
 		if (bPendingHardwareSurveyResults)
 		{
diff --git a/Engine/Source/Runtime/IOS/IOSAudio/IOSAudio.Build.cs b/Engine/Source/Runtime/IOS/IOSAudio/IOSAudio.Build.cs
index 38aa91697f85..e1ab682cb862 100644
--- a/Engine/Source/Runtime/IOS/IOSAudio/IOSAudio.Build.cs
+++ b/Engine/Source/Runtime/IOS/IOSAudio/IOSAudio.Build.cs
@@ -19,6 +19,7 @@ public class IOSAudio : ModuleRules
 			"Core",
 			"CoreUObject",
 			"Engine",
+            "AudioMixer"
 		});
 
 		PublicFrameworks.AddRange(new string[]
diff --git a/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioDevice.cpp b/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioDevice.cpp
index 0b570c9e95d0..74bc26a408e8 100644
--- a/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioDevice.cpp
+++ b/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioDevice.cpp
@@ -37,9 +37,17 @@ void FIOSAudioDevice::ResumeContext()
 	if (SuspendCounter > 0)
 	{
 		FPlatformAtomics::InterlockedDecrement(&SuspendCounter);
-
-		AUGraphStart(AudioUnitGraph);
-		AudioOutputUnitStart(OutputUnit);
+        
+		if (AudioUnitGraph != NULL)
+		{
+			AUGraphStart(AudioUnitGraph);
+		}
+		
+		if (OutputUnit != NULL)
+		{
+			AudioOutputUnitStart(OutputUnit);
+		}
+		
 		UE_LOG(LogIOSAudio, Display, TEXT("Resuming Audio"));
 	}
 }
@@ -51,8 +59,16 @@ void FIOSAudioDevice::SuspendContext()
 	{
 		FPlatformAtomics::InterlockedIncrement(&SuspendCounter);
 
-		AudioOutputUnitStop(OutputUnit);
-		AUGraphStop(AudioUnitGraph);
+		if (OutputUnit != NULL)
+		{
+			AudioOutputUnitStop(OutputUnit);
+		}
+
+		if (AudioUnitGraph != NULL)
+		{
+			AUGraphStop(AudioUnitGraph);
+		}
+		
 		UE_LOG(LogIOSAudio, Display, TEXT("Suspending Audio"));
 	}
 }
@@ -67,7 +83,9 @@ FIOSAudioDevice::FIOSAudioDevice() :
 	FAudioDevice(),
 	AudioUnitGraph(NULL),
 	OutputNode(0),
+	OutputUnit(NULL),
 	MixerNode(0),
+	MixerUnit(NULL),
 	NextBusNumber(0)
 {
 	bDisableAudioCaching = true;	// Do not allow DTYPE_Native buffers, only DTYPE_RealTime or DTYPE_Streaming since on the fly decompression is so cheap, it saves memory, and requires fewer code paths
@@ -119,7 +137,9 @@ bool FIOSAudioDevice::InitializeHardware()
 
 	// Setup audio output unit
 	UnitDescription.componentType         = kAudioUnitType_Output;
-	UnitDescription.componentSubType      = kAudioUnitSubType_RemoteIO;
+    
+    // tmeporarily set the audio unit to voice processing so we can use VOIP, there probably is a better way to do this going forward
+	UnitDescription.componentSubType      = FPlatformMisc::IsVoiceChatEnabled() ? kAudioUnitSubType_VoiceProcessingIO : kAudioUnitSubType_RemoteIO;
 	UnitDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
 	UnitDescription.componentFlags        = 0;
 	UnitDescription.componentFlagsMask    = 0;
@@ -158,6 +178,7 @@ bool FIOSAudioDevice::InitializeHardware()
 	if (Status != noErr)
 	{
 		HandleError(TEXT("Failed to retrieve output unit reference!"), true);
+		OutputUnit = NULL;
 		return false;
 	}
 	
@@ -165,6 +186,7 @@ bool FIOSAudioDevice::InitializeHardware()
 	if (Status != noErr)
 	{
 		HandleError(TEXT("Failed to retrieve mixer unit reference!"), true);
+		MixerUnit = NULL;
 		return false;
 	}
 
diff --git a/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioSource.cpp b/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioSource.cpp
index 66a44ef5445d..714b69d12ec2 100644
--- a/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioSource.cpp
+++ b/Engine/Source/Runtime/IOS/IOSAudio/Private/IOSAudioSource.cpp
@@ -14,6 +14,7 @@
 #include "Interfaces/IAudioFormat.h"
 #include "AudioDecompress.h"
 #include "ADPCMAudioInfo.h"
+#include "Audio.h"
 
 const uint32	Callback_Free = 0;
 const uint32	Callback_Locked = 1;
@@ -42,9 +43,10 @@ namespace
 
 FIOSAudioSoundSource::FIOSAudioSoundSource(FIOSAudioDevice* InAudioDevice, uint32 InBusNumber) :
 	FSoundSource(InAudioDevice),
+	SampleRate(0),
+    SourceLPFFrequency(MAX_FILTER_FREQUENCY),
 	IOSAudioDevice(InAudioDevice),
 	IOSBuffer(NULL),
-	SampleRate(0),
 	BusNumber(InBusNumber)
 {
 	check(IOSAudioDevice);
@@ -192,6 +194,9 @@ bool FIOSAudioSoundSource::Init(FWaveInstance* InWaveInstance)
 	
 	UnlockCallback(&CallbackLock);
 
+    LowpassFilterBank.SetNum(CHANNELS_PER_BUS);
+    LPFParamBank.SetNum(CHANNELS_PER_BUS);
+    
 	return true;
 }
 
@@ -219,6 +224,16 @@ void FIOSAudioSoundSource::Update(void)
 		Volume *= 1.25f;
 	}
 
+    SetFilterFrequency();
+    
+    SourceLPFFrequency = LPFFrequency;
+    
+	// Factor in the xaudio2 attenuation that happens to stereo assets.
+	if (WaveInstance->WaveData->NumChannels == 2 && WaveInstance->bUseSpatialization)
+	{
+		Volume *= 0.5f;
+	}
+
 	// Apply global multiplier to disable sound when not the foreground app
 	Volume *= AudioDevice->GetPlatformAudioHeadroom();
 	Volume = FMath::Clamp(Volume, 0.0f, 1.0f);
@@ -270,11 +285,26 @@ void FIOSAudioSoundSource::Play(void)
 {
 	if (WaveInstance && AttachToAUGraph())
 	{
+        
 		Paused = false;
 		Playing = true;
 
 		// Updates the source which sets the pitch and volume
 		Update();
+        
+        for (Audio::FBiquadFilter& Filter : LowpassFilterBank)
+        {
+            Filter.Reset();
+            Filter.Init(SampleRate, 1, Audio::EBiquadFilter::Lowpass, LPFFrequency);
+        }
+        
+        for (Audio::FParam& Param : LPFParamBank)
+        {
+            Param.Init();
+            Param.SetValue(LPFFrequency);
+            Param.Reset();
+        }
+        
 	}
 }
 
@@ -392,6 +422,14 @@ bool FIOSAudioSoundSource::DetachFromAUGraph()
 	// Set a callback for the specified node's specified input
 	for (int32 Channel = 0; Channel < CHANNELS_PER_BUS; Channel++)
 	{
+        Status = AudioUnitSetParameter(IOSAudioDevice->GetMixerUnit(),
+                                       k3DMixerParam_Gain,
+                                       kAudioUnitScope_Input,
+                                       GetAudioUnitElement(Channel),
+                                       -120.0,
+                                       0);
+        UE_CLOG(Status != noErr, LogIOSAudio, Error, TEXT("Failed to set k3DMixerParam_Gain for audio mixer unit: BusNumber=%d, Channel=%d"), BusNumber, Channel);
+        
 		Status = AudioUnitSetParameter(IOSAudioDevice->GetMixerUnit(),
 		                               k3DMixerParam_Enable,
 		                               kAudioUnitScope_Input,
@@ -399,14 +437,6 @@ bool FIOSAudioSoundSource::DetachFromAUGraph()
 		                               0,
 		                               0);
 		UE_CLOG(Status != noErr, LogIOSAudio, Error, TEXT("Failed to set k3DMixerParam_Enable for audio mixer unit: BusNumber=%d, Channel=%d"), BusNumber, Channel);
-
-		Status = AudioUnitSetParameter(IOSAudioDevice->GetMixerUnit(),
-		                               k3DMixerParam_Gain,
-		                               kAudioUnitScope_Input,
-		                               GetAudioUnitElement(Channel),
-		                               -120.0,
-		                               0);
-		UE_CLOG(Status != noErr, LogIOSAudio, Error, TEXT("Failed to set k3DMixerParam_Gain for audio mixer unit: BusNumber=%d, Channel=%d"), BusNumber, Channel);
 	}
 
 	return Status == noErr;
@@ -418,9 +448,9 @@ OSStatus FIOSAudioSoundSource::IOSAudioRenderCallback(void* RefCon, AudioUnitRen
 {
 	FIOSAudioSoundSource* Source = static_cast<FIOSAudioSoundSource*>(RefCon);
 	UInt32 Channel = BusNumber % CHANNELS_PER_BUS;
-	
+    
 	AudioSampleType* OutData = reinterpret_cast<AudioSampleType*>(IOData->mBuffers[0].mData);
-	
+    
 	// Make sure we should be rendering
 	if (!LockCallback(&Source->CallbackLock))
 	{
@@ -449,10 +479,53 @@ OSStatus FIOSAudioSoundSource::IOSAudioRenderCallback(void* RefCon, AudioUnitRen
 				(uint8*)Source->IOSBuffer->SampleData,
 				Source->WaveInstance->LoopingMode == LOOP_WithNotification || Source->WaveInstance->LoopingMode == LOOP_Forever);
 	}
-	
+    
+    // If the channel count is higher than we've expected,
+    // initialize a new LPF for this channel.
+    if (Source->LPFParamBank.Num() <= Channel)
+    {
+        int32 ChannelIndex = Source->LPFParamBank.AddDefaulted(1);
+        Source->LPFParamBank[ChannelIndex].Init();
+        Source->LPFParamBank[ChannelIndex].SetValue(Source->SourceLPFFrequency);
+        Source->LPFParamBank[ChannelIndex].Reset();
+        
+        ChannelIndex = Source->LowpassFilterBank.AddDefaulted(1);
+        Source->LowpassFilterBank[ChannelIndex].Reset();
+        Source->LowpassFilterBank[ChannelIndex].Init(Source->SampleRate, 1, Audio::EBiquadFilter::Lowpass, Source->SourceLPFFrequency);
+    }
+    
+    // Set up LPF filter for this channel:
+    Audio::FParam& LPFParam = Source->LPFParamBank[Channel];
+    Audio::FBiquadFilter& LowpassFilter = Source->LowpassFilterBank[Channel];
+    
+    LPFParam.Reset();
+    const bool bShouldUpdateCutoffFrequency = !FMath::IsNearlyEqual(Source->SourceLPFFrequency, LPFParam.GetValue());
+    
+    if(bShouldUpdateCutoffFrequency)
+    {
+        LPFParam.SetValue(Source->SourceLPFFrequency, NumFrames);
+    }
+    else
+    {
+        LowpassFilter.SetFrequency(Source->SourceLPFFrequency);
+    }
+    
 	for(int32 sampleItr = 0; sampleItr < NumFrames; ++sampleItr)
 	{
-		*OutData++ = *(Source->IOSBuffer->SampleData + sampleItr * Source->IOSBuffer->NumChannels + Channel);
+		AudioSampleType IntSample = *(Source->IOSBuffer->SampleData + sampleItr * Source->IOSBuffer->NumChannels + Channel);
+        
+        // Apply LPF:
+        if(bShouldUpdateCutoffFrequency)
+        {
+            LowpassFilter.SetFrequency(LPFParam.Update());
+        }
+        
+        float FloatSample = ((float) IntSample) / 32767.0f;
+        if(LPFParam.GetValue() != MAX_FILTER_FREQUENCY)
+        {
+            LowpassFilter.ProcessAudioFrame(&FloatSample, &FloatSample);
+        }
+        *OutData++ = (SInt16) (FloatSample * 32767.0f);
 	}
 	
 	if(Source->bChannel0Finished && Channel == Source->IOSBuffer->NumChannels - 1)
diff --git a/Engine/Source/Runtime/IOS/IOSAudio/Public/IOSAudioDevice.h b/Engine/Source/Runtime/IOS/IOSAudio/Public/IOSAudioDevice.h
index a15d005f19b2..119e198e0014 100644
--- a/Engine/Source/Runtime/IOS/IOSAudio/Public/IOSAudioDevice.h
+++ b/Engine/Source/Runtime/IOS/IOSAudio/Public/IOSAudioDevice.h
@@ -10,6 +10,8 @@
 #include "AudioEffect.h"
 #include "AudioDevice.h"
 #include "Sound/SoundWave.h"
+#include "DSP/ParamInterpolator.h"
+#include "DSP/Filter.h"
 
 /*------------------------------------------------------------------------------------
 	Audio Framework system headers
@@ -147,6 +149,14 @@ public:
 	/** Calculates the audio unit element of the input channel relative to the base bus number */
 	AudioUnitElement GetAudioUnitElement(int32 Channel);
 
+    TArray<Audio::FBiquadFilter> LowpassFilterBank;
+    TArray<Audio::FParam> LPFParamBank;
+    
+    int32 SampleRate;
+    
+    // Cached version of Source->LPFFrequency.
+    float SourceLPFFrequency;
+    
 protected:
 	bool AttachToAUGraph();
 	bool DetachFromAUGraph();
@@ -156,7 +166,6 @@ protected:
 	/** Cached sound buffer associated with currently bound wave instance. */
 	/** Do not shadow the declaration of Buffer in the parent class since that member gets used by the streaming engine */
 	FIOSAudioSoundBuffer* IOSBuffer;
-	int32                 SampleRate;
 	uint32                BusNumber;
 	
 	int32	CallbackLock;
diff --git a/Engine/Source/Runtime/IOS/IOSRuntimeSettings/Classes/IOSRuntimeSettings.h b/Engine/Source/Runtime/IOS/IOSRuntimeSettings/Classes/IOSRuntimeSettings.h
index fea217845e44..6a5a0ddba677 100644
--- a/Engine/Source/Runtime/IOS/IOSRuntimeSettings/Classes/IOSRuntimeSettings.h
+++ b/Engine/Source/Runtime/IOS/IOSRuntimeSettings/Classes/IOSRuntimeSettings.h
@@ -7,12 +7,7 @@
 #include "UObject/Object.h"
 #include "UObject/Class.h"
 #include "UObject/PropertyPortFlags.h"
-
-#if WITH_ENGINE
 #include "AudioCompressionSettings.h"
-#else
-struct FPlatformRuntimeAudioCompressionOverrides;
-#endif
 
 #include "IOSRuntimeSettings.generated.h"
 
@@ -314,6 +309,10 @@ public:
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = Input, meta = (DisplayName = "Use AppleTV Remote absolute trackpad values"))
 	bool bUseRemoteAbsoluteDpadValues;
 	
+	// If checked, Bluetooth connected controllers will send input
+	UPROPERTY(GlobalConfig, EditAnywhere, Category = Input, meta = (DisplayName = "Allow MFi (Bluetooth) controllers"))
+	bool bAllowControllers;
+	
 	// Supports default portrait orientation. Landscape will not be supported.
 	UPROPERTY(GlobalConfig, EditAnywhere, Category = DeviceOrientations)
 	uint32 bSupportsPortraitOrientation : 1;
diff --git a/Engine/Source/Runtime/IOS/LaunchDaemonMessages/Classes/IOSMessageProtocol.h b/Engine/Source/Runtime/IOS/LaunchDaemonMessages/Classes/IOSMessageProtocol.h
index fcc1fb75def7..734bf791ab86 100644
--- a/Engine/Source/Runtime/IOS/LaunchDaemonMessages/Classes/IOSMessageProtocol.h
+++ b/Engine/Source/Runtime/IOS/LaunchDaemonMessages/Classes/IOSMessageProtocol.h
@@ -43,7 +43,11 @@ struct FIOSLaunchDaemonPong
 	UPROPERTY()
 	bool bCanReboot;
 
-	FIOSLaunchDaemonPong() {}
+	FIOSLaunchDaemonPong()
+		: bCanPowerOff(false)
+		, bCanPowerOn(false)
+		, bCanReboot(false)
+	{}
 
 	FIOSLaunchDaemonPong(FString InDeviceID, FString InDeviceName, FString InDeviceStatus, FString InDeviceType, bool bInCanPowerOff, bool bInCanPowerOn, bool bInCanReboot)
 		: DeviceID(InDeviceID)
diff --git a/Engine/Source/Runtime/InputCore/Classes/InputCoreTypes.h b/Engine/Source/Runtime/InputCore/Classes/InputCoreTypes.h
index 4140d919c23c..333c7620d7a5 100644
--- a/Engine/Source/Runtime/InputCore/Classes/InputCoreTypes.h
+++ b/Engine/Source/Runtime/InputCore/Classes/InputCoreTypes.h
@@ -129,7 +129,8 @@ struct INPUTCORE_API FKeyDetails
 		NoFlags                 = 0,
 	};
 
-	FKeyDetails(const FKey InKey, const TAttribute<FText>& InDisplayName, const uint8 InKeyFlags = 0, const FName InMenuCategory = NAME_None);
+	FKeyDetails(const FKey InKey, const TAttribute<FText>& InLongDisplayName, const uint8 InKeyFlags = 0, const FName InMenuCategory = NAME_None, const TAttribute<FText>& InShortDisplayName = TAttribute<FText>() );
+	FKeyDetails(const FKey InKey, const TAttribute<FText>& InLongDisplayName, const TAttribute<FText>& InShortDisplayName, const uint8 InKeyFlags = 0, const FName InMenuCategory = NAME_None);
 
 	FORCEINLINE bool IsModifierKey() const { return bIsModifierKey != 0; }
 	FORCEINLINE bool IsGamepadKey() const { return bIsGamepadKey != 0; }
@@ -139,11 +140,13 @@ struct INPUTCORE_API FKeyDetails
 	FORCEINLINE bool IsBindableInBlueprints() const { return bIsBindableInBlueprints != 0; }
 	FORCEINLINE bool ShouldUpdateAxisWithoutSamples() const { return bShouldUpdateAxisWithoutSamples != 0; }
 	FORCEINLINE FName GetMenuCategory() const { return MenuCategory; }
-	FText GetDisplayName() const;
+	FText GetDisplayName(const bool bLongDisplayName = true) const;
 	FORCEINLINE const FKey& GetKey() const { return Key; }
 
 private:
 
+	void CommonInit(const uint8 InKeyFlags);	
+
 	enum class EInputAxisType : uint8
 	{
 		None,
@@ -152,18 +155,18 @@ private:
 	};
 
 	FKey  Key;
-	
-	TAttribute<FText> DisplayName;
 
 	FName MenuCategory;
 
-	int32 bIsModifierKey:1;
-	int32 bIsGamepadKey:1;
-	int32 bIsMouseButton:1;
-	int32 bIsBindableInBlueprints:1;
-	int32 bShouldUpdateAxisWithoutSamples:1;
+	uint8 bIsModifierKey : 1;
+	uint8 bIsGamepadKey : 1;
+	uint8 bIsMouseButton : 1;
+	uint8 bIsBindableInBlueprints : 1;
+	uint8 bShouldUpdateAxisWithoutSamples : 1;
 	EInputAxisType AxisType;
 
+	TAttribute<FText> LongDisplayName;
+	TAttribute<FText> ShortDisplayName;
 };
 
 UENUM(BlueprintType)
@@ -521,6 +524,7 @@ struct INPUTCORE_API EKeys
 	static void AddMenuCategoryDisplayInfo(const FName CategoryName, const FText DisplayName, const FName PaletteIcon);
 	static FText GetMenuCategoryDisplayName(const FName CategoryName);
 	static FName GetMenuCategoryPaletteIcon(const FName CategoryName);
+
 private:
 
 	struct FCategoryDisplayInfo
diff --git a/Engine/Source/Runtime/InputCore/Private/InputCoreTypes.cpp b/Engine/Source/Runtime/InputCore/Private/InputCoreTypes.cpp
index cdc9b4270823..47da0455f856 100644
--- a/Engine/Source/Runtime/InputCore/Private/InputCoreTypes.cpp
+++ b/Engine/Source/Runtime/InputCore/Private/InputCoreTypes.cpp
@@ -325,17 +325,32 @@ bool EKeys::bInitialized = false;
 TMap<FKey, TSharedPtr<FKeyDetails> > EKeys::InputKeys;
 TMap<FName, EKeys::FCategoryDisplayInfo> EKeys::MenuCategoryDisplayInfo;
 
-FKeyDetails::FKeyDetails(const FKey InKey, const TAttribute<FText>& InDisplayName, const uint8 InKeyFlags, const FName InMenuCategory)
+FKeyDetails::FKeyDetails(const FKey InKey, const TAttribute<FText>& InLongDisplayName, const TAttribute<FText>& InShortDisplayName, const uint8 InKeyFlags, const FName InMenuCategory)
 	: Key(InKey)
-	, DisplayName(InDisplayName)
 	, MenuCategory(InMenuCategory)
-	, bIsModifierKey((InKeyFlags & EKeyFlags::ModifierKey) != 0)
-	, bIsGamepadKey((InKeyFlags & EKeyFlags::GamepadKey) != 0)
-	, bIsMouseButton((InKeyFlags & EKeyFlags::MouseButton) != 0)
-	, bIsBindableInBlueprints((~InKeyFlags & EKeyFlags::NotBlueprintBindableKey) != 0)
-	, bShouldUpdateAxisWithoutSamples((InKeyFlags & EKeyFlags::UpdateAxisWithoutSamples) != 0)
-	, AxisType(EInputAxisType::None)
+	, LongDisplayName(InLongDisplayName)
+	, ShortDisplayName(InShortDisplayName)
 {
+	CommonInit(InKeyFlags);
+}
+
+FKeyDetails::FKeyDetails(const FKey InKey, const TAttribute<FText>& InLongDisplayName, const uint8 InKeyFlags, const FName InMenuCategory, const TAttribute<FText>& InShortDisplayName)
+	: Key(InKey)
+	, MenuCategory(InMenuCategory)
+	, LongDisplayName(InLongDisplayName)
+	, ShortDisplayName(InShortDisplayName)
+{
+	CommonInit(InKeyFlags);
+}
+
+void FKeyDetails::CommonInit(const uint8 InKeyFlags)
+{
+	bIsModifierKey = ((InKeyFlags & EKeyFlags::ModifierKey) != 0);
+	bIsGamepadKey = ((InKeyFlags & EKeyFlags::GamepadKey) != 0);
+	bIsMouseButton = ((InKeyFlags & EKeyFlags::MouseButton) != 0);
+	bIsBindableInBlueprints = ((~InKeyFlags & EKeyFlags::NotBlueprintBindableKey) != 0);
+	bShouldUpdateAxisWithoutSamples = ((InKeyFlags & EKeyFlags::UpdateAxisWithoutSamples) != 0);
+	
 	if ((InKeyFlags & EKeyFlags::FloatAxis) != 0)
 	{
 		ensure((InKeyFlags & EKeyFlags::VectorAxis) == 0);
@@ -345,6 +360,10 @@ FKeyDetails::FKeyDetails(const FKey InKey, const TAttribute<FText>& InDisplayNam
 	{
 		AxisType = EInputAxisType::Vector;
 	}
+	else
+	{
+		AxisType = EInputAxisType::None;
+	}
 
 	// Set up default menu categories
 	if (MenuCategory.IsNone())
@@ -392,11 +411,11 @@ void EKeys::Initialize()
 	AddKey(FKeyDetails(EKeys::Enter, LOCTEXT("Enter", "Enter")));
 	AddKey(FKeyDetails(EKeys::Pause, LOCTEXT("Pause", "Pause")));
 
-	AddKey(FKeyDetails(EKeys::CapsLock, LOCTEXT("CapsLock", "Caps Lock")));
-	AddKey(FKeyDetails(EKeys::Escape, LOCTEXT("Escape", "Escape")));
-	AddKey(FKeyDetails(EKeys::SpaceBar, LOCTEXT("SpaceBar", "Space Bar")));
-	AddKey(FKeyDetails(EKeys::PageUp, LOCTEXT("PageUp", "Page Up")));
-	AddKey(FKeyDetails(EKeys::PageDown, LOCTEXT("PageDown", "Page Down")));
+	AddKey(FKeyDetails(EKeys::CapsLock, LOCTEXT("CapsLock", "Caps Lock"), LOCTEXT("CapsLockShort", "Caps")));
+	AddKey(FKeyDetails(EKeys::Escape, LOCTEXT("Escape", "Escape"), LOCTEXT("EscapeShort", "Esc")));
+	AddKey(FKeyDetails(EKeys::SpaceBar, LOCTEXT("SpaceBar", "Space Bar"), LOCTEXT("SpaceBarShort", "Space")));
+	AddKey(FKeyDetails(EKeys::PageUp, LOCTEXT("PageUp", "Page Up"), LOCTEXT("PageUpShort", "PgUp")));
+	AddKey(FKeyDetails(EKeys::PageDown, LOCTEXT("PageDown", "Page Down"), LOCTEXT("PageDownShort", "PgDn")));
 	AddKey(FKeyDetails(EKeys::End, LOCTEXT("End", "End")));
 	AddKey(FKeyDetails(EKeys::Home, LOCTEXT("Home", "Home")));
 
@@ -405,14 +424,14 @@ void EKeys::Initialize()
 	AddKey(FKeyDetails(EKeys::Right, LOCTEXT("Right", "Right")));
 	AddKey(FKeyDetails(EKeys::Down, LOCTEXT("Down", "Down")));
 
-	AddKey(FKeyDetails(EKeys::Insert, LOCTEXT("Insert", "Insert")));
+	AddKey(FKeyDetails(EKeys::Insert, LOCTEXT("Insert", "Insert"), LOCTEXT("InsertShort", "Ins")));
     
 #if PLATFORM_MAC
-    AddKey(FKeyDetails(EKeys::BackSpace, LOCTEXT("Delete", "Delete")));
+    AddKey(FKeyDetails(EKeys::BackSpace, LOCTEXT("Delete", "Delete"), LOCTEXT("DeleteShort", "Del")));
     AddKey(FKeyDetails(EKeys::Delete, LOCTEXT("ForwardDelete", "Fn+Delete")));
 #else
     AddKey(FKeyDetails(EKeys::BackSpace, LOCTEXT("BackSpace", "Backspace")));
-    AddKey(FKeyDetails(EKeys::Delete, LOCTEXT("Delete", "Delete")));
+    AddKey(FKeyDetails(EKeys::Delete, LOCTEXT("Delete", "Delete"), LOCTEXT("DeleteShort", "Del")));
 #endif
 
 	AddKey(FKeyDetails(EKeys::Zero, FText::FromString("0")));
@@ -495,28 +514,28 @@ void EKeys::Initialize()
 	AddKey(FKeyDetails(EKeys::LeftCommand, LOCTEXT("LeftCommand", "Left Cmd"), FKeyDetails::ModifierKey));
 	AddKey(FKeyDetails(EKeys::RightCommand, LOCTEXT("RightCommand", "Right Cmd"), FKeyDetails::ModifierKey));
 
-	AddKey(FKeyDetails(EKeys::Semicolon, LOCTEXT("Semicolon", "Semicolon")));
-	AddKey(FKeyDetails(EKeys::Equals, FText::FromString("=")));
-	AddKey(FKeyDetails(EKeys::Comma, LOCTEXT("Comma", "Comma")));
-	AddKey(FKeyDetails(EKeys::Hyphen, LOCTEXT("Hyphen", "Hyphen")));
-	AddKey(FKeyDetails(EKeys::Underscore, LOCTEXT("Underscore", "Underscore")));
-	AddKey(FKeyDetails(EKeys::Period, LOCTEXT("Period", "Period")));
-	AddKey(FKeyDetails(EKeys::Slash, FText::FromString("/")));
+	AddKey(FKeyDetails(EKeys::Semicolon, LOCTEXT("Semicolon", "Semicolon"), FText::FromString(";")));
+	AddKey(FKeyDetails(EKeys::Equals, LOCTEXT("Equals", "Equals"), FText::FromString("=")));
+	AddKey(FKeyDetails(EKeys::Comma, LOCTEXT("Comma", "Comma"), FText::FromString(",")));
+	AddKey(FKeyDetails(EKeys::Hyphen, LOCTEXT("Hyphen", "Hyphen"), FText::FromString("-")));
+	AddKey(FKeyDetails(EKeys::Underscore, LOCTEXT("Underscore", "Underscore"), FText::FromString("_")));
+	AddKey(FKeyDetails(EKeys::Period, LOCTEXT("Period", "Period"), FText::FromString(".")));
+	AddKey(FKeyDetails(EKeys::Slash, LOCTEXT("Slash", "Slash"), FText::FromString("/")));
 	AddKey(FKeyDetails(EKeys::Tilde, FText::FromString("`"))); // Yes this is not actually a tilde, it is a long, sad, and old story
-	AddKey(FKeyDetails(EKeys::LeftBracket, FText::FromString("[")));
-	AddKey(FKeyDetails(EKeys::Backslash, FText::FromString("\\")));
-	AddKey(FKeyDetails(EKeys::RightBracket, FText::FromString("]")));
-	AddKey(FKeyDetails(EKeys::Apostrophe, LOCTEXT("Apostrophe", "Apostrophe")));
-	AddKey(FKeyDetails(EKeys::Quote, FText::FromString("\"")));
+	AddKey(FKeyDetails(EKeys::LeftBracket, LOCTEXT("LeftBracket", "Left Bracket"), FText::FromString("[")));
+	AddKey(FKeyDetails(EKeys::Backslash, LOCTEXT("Backslash", "Backslash"), FText::FromString("\\")));
+	AddKey(FKeyDetails(EKeys::RightBracket, LOCTEXT("RightBracket", "Right Bracket"), FText::FromString("]")));
+	AddKey(FKeyDetails(EKeys::Apostrophe, LOCTEXT("Apostrophe", "Apostrophe"), FText::FromString("'")));
+	AddKey(FKeyDetails(EKeys::Quote, LOCTEXT("Quote", "Quote"), FText::FromString("\"")));
 
-	AddKey(FKeyDetails(EKeys::LeftParantheses, FText::FromString("(")));
-	AddKey(FKeyDetails(EKeys::RightParantheses, FText::FromString(")")));
-	AddKey(FKeyDetails(EKeys::Ampersand, FText::FromString("&")));
-	AddKey(FKeyDetails(EKeys::Asterix, LOCTEXT("Asterix", "Asterisk")));
-	AddKey(FKeyDetails(EKeys::Caret, FText::FromString("^")));
-	AddKey(FKeyDetails(EKeys::Dollar, FText::FromString("$")));
-	AddKey(FKeyDetails(EKeys::Exclamation, FText::FromString("!")));
-	AddKey(FKeyDetails(EKeys::Colon, LOCTEXT("Colon", "Colon")));
+	AddKey(FKeyDetails(EKeys::LeftParantheses, LOCTEXT("LeftParantheses", "Left Parantheses"), FText::FromString("(")));
+	AddKey(FKeyDetails(EKeys::RightParantheses, LOCTEXT("RightParantheses", "Right Parantheses"), FText::FromString(")")));
+	AddKey(FKeyDetails(EKeys::Ampersand, LOCTEXT("Ampersand", "Ampersand"), FText::FromString("&")));
+	AddKey(FKeyDetails(EKeys::Asterix, LOCTEXT("Asterix", "Asterisk"), FText::FromString("*")));
+	AddKey(FKeyDetails(EKeys::Caret, LOCTEXT("Caret", "Caret"), FText::FromString("^")));
+	AddKey(FKeyDetails(EKeys::Dollar, LOCTEXT("Dollar", "Dollar"), FText::FromString("$")));
+	AddKey(FKeyDetails(EKeys::Exclamation, LOCTEXT("Exclamation", "Exclamation"), FText::FromString("!")));
+	AddKey(FKeyDetails(EKeys::Colon, LOCTEXT("Colon", "Colon"), FText::FromString(":")));
 
 	AddKey(FKeyDetails(EKeys::A_AccentGrave, FText::FromString(FString::Chr(224))));
 	AddKey(FKeyDetails(EKeys::E_AccentGrave, FText::FromString(FString::Chr(232))));
@@ -997,9 +1016,9 @@ bool FKey::ShouldUpdateAxisWithoutSamples() const
 	return (KeyDetails.IsValid() ? KeyDetails->ShouldUpdateAxisWithoutSamples() : false);
 }
 
-FText FKeyDetails::GetDisplayName() const
+FText FKeyDetails::GetDisplayName(const bool bLongDisplayName) const
 {
-	return DisplayName.Get();
+	return ((bLongDisplayName || !ShortDisplayName.IsSet()) ? LongDisplayName.Get() : ShortDisplayName.Get());
 }
 
 FText FKey::GetDisplayName() const
@@ -1084,7 +1103,7 @@ void FKey::ResetKey()
 	if (KeyNameStr.StartsWith(FKey::SyntheticCharPrefix))
 	{
 		// This was a dynamically added key, so we need to force it to be synthesized if it doesn't already exist
-		const FString KeyNameStr2 = KeyNameStr.RightChop(9);
+		const FString KeyNameStr2 = KeyNameStr.RightChop(FCString::Strlen(FKey::SyntheticCharPrefix));
 		const uint32 CharCode = FCString::Atoi(*KeyNameStr2);
 		if (CharCode > 0)
 		{
diff --git a/Engine/Source/Runtime/Json/Private/Dom/JsonObject.cpp b/Engine/Source/Runtime/Json/Private/Dom/JsonObject.cpp
index 96bf5326834e..00e81f03191c 100644
--- a/Engine/Source/Runtime/Json/Private/Dom/JsonObject.cpp
+++ b/Engine/Source/Runtime/Json/Private/Dom/JsonObject.cpp
@@ -41,6 +41,11 @@ bool FJsonObject::TryGetNumberField( const FString& FieldName, uint32& OutNumber
 	return Field.IsValid() && Field->TryGetNumber(OutNumber);
 }
 
+bool FJsonObject::TryGetNumberField(const FString& FieldName, int64& OutNumber) const
+{
+	TSharedPtr<FJsonValue> Field = TryGetField(FieldName);
+	return Field.IsValid() && Field->TryGetNumber(OutNumber);
+}
 
 void FJsonObject::SetNumberField( const FString& FieldName, double Number )
 {
diff --git a/Engine/Source/Runtime/Json/Public/Dom/JsonObject.h b/Engine/Source/Runtime/Json/Public/Dom/JsonObject.h
index 9aee89eedc2c..7fa9aa1aad4f 100644
--- a/Engine/Source/Runtime/Json/Public/Dom/JsonObject.h
+++ b/Engine/Source/Runtime/Json/Public/Dom/JsonObject.h
@@ -130,6 +130,9 @@ public:
 	/** Get the field named FieldName as a number, and makes sure it's within uint32 range. Returns false if it doesn't exist or cannot be converted.  */
 	bool TryGetNumberField(const FString& FieldName, uint32& OutNumber) const;
 
+	/** Get the field named FieldName as a number. Returns false if it doesn't exist or cannot be converted. */
+	bool TryGetNumberField(const FString& FieldName, int64& OutNumber) const;
+
 	/** Add a field named FieldName with Number as value */
 	void SetNumberField( const FString& FieldName, double Number );
 
diff --git a/Engine/Source/Runtime/Json/Public/Serialization/JsonReader.h b/Engine/Source/Runtime/Json/Public/Serialization/JsonReader.h
index f4f70939e013..cd7b5ab57913 100644
--- a/Engine/Source/Runtime/Json/Public/Serialization/JsonReader.h
+++ b/Engine/Source/Runtime/Json/Public/Serialization/JsonReader.h
@@ -798,14 +798,7 @@ public:
 
 public:
 
-	virtual ~FJsonStringReader()
-	{
-		if (Reader != nullptr)
-		{
-			check(Reader->Close());
-			delete Reader;
-		}
-	}
+	virtual ~FJsonStringReader() = default;
 
 protected:
 
@@ -840,16 +833,15 @@ protected:
 			return;
 		}
 
-		Reader = new FBufferReader((void*)*Content, Content.Len() * sizeof(TCHAR), false);
-		check(Reader);
+		Reader = MakeUnique<FBufferReader>((void*)*Content, Content.Len() * sizeof(TCHAR), false);
+		check(Reader.IsValid());
 
-		Stream = Reader;
+		Stream = Reader.Get();
 	}
 
 protected:
-
 	const FString Content;
-	FBufferReader* Reader;
+	TUniquePtr<FBufferReader> Reader;
 };
 
 
diff --git a/Engine/Source/Runtime/Json/Public/Serialization/JsonSerializerMacros.h b/Engine/Source/Runtime/Json/Public/Serialization/JsonSerializerMacros.h
index f5e63a35472f..7089b2bc0a00 100644
--- a/Engine/Source/Runtime/Json/Public/Serialization/JsonSerializerMacros.h
+++ b/Engine/Source/Runtime/Json/Public/Serialization/JsonSerializerMacros.h
@@ -48,11 +48,18 @@
 					FJsonSerializer::Serialize(JsonObject.ToSharedRef(), Writer); \
 				} \
 			} \
+			else \
+			{ \
+				JsonValue = FString(); \
+			} \
 		} \
 		else \
 		{ \
-			Serializer.WriteIdentifierPrefix(TEXT(JsonName)); \
-			Serializer.WriteRawJSONValue(*JsonValue); \
+			if (!JsonValue.IsEmpty()) \
+			{ \
+				Serializer.WriteIdentifierPrefix(TEXT(JsonName)); \
+				Serializer.WriteRawJSONValue(*JsonValue); \
+			} \
 		}
 
 #define JSON_SERIALIZE_ARRAY_SERIALIZABLE(JsonName, JsonArray, ElementType) \
@@ -149,6 +156,7 @@ struct FJsonSerializerBase
 	virtual void EndArray() = 0;
 	virtual void Serialize(const TCHAR* Name, int32& Value) = 0;
 	virtual void Serialize(const TCHAR* Name, uint32& Value) = 0;
+	virtual void Serialize(const TCHAR* Name, int64& Value) = 0;
 	virtual void Serialize(const TCHAR* Name, bool& Value) = 0;
 	virtual void Serialize(const TCHAR* Name, FString& Value) = 0;
 	virtual void Serialize(const TCHAR* Name, FText& Value) = 0;
@@ -255,6 +263,16 @@ public:
 	{
 		JsonWriter->WriteValue(Name, static_cast<int64>(Value));
 	}
+	/**
+	 * Writes the field name and the corresponding value to the JSON data
+	 *
+	 * @param Name the field name to write out
+	 * @param Value the value to write out
+	 */
+	virtual void Serialize(const TCHAR* Name, int64& Value) override
+	{
+		JsonWriter->WriteValue(Name, Value);
+	}
 	/**
 	 * Writes the field name and the corresponding value to the JSON data
 	 *
@@ -487,6 +505,19 @@ public:
 			JsonObject->TryGetNumberField(Name, Value);
 		}
 	}
+	/**
+	 * If the underlying json object has the field, it is read into the value
+	 *
+	 * @param Name the name of the field to read
+	 * @param Value the out value to read the data into
+	 */
+	virtual void Serialize(const TCHAR* Name, int64& Value) override
+	{
+		if (JsonObject->HasTypedField<EJson::Number>(Name))
+		{
+			JsonObject->TryGetNumberField(Name, Value);
+		}
+	}
 	/**
 	 * If the underlying json object has the field, it is read into the value
 	 *
@@ -716,6 +747,7 @@ struct FJsonSerializable
 		FJsonSerializerWriter<TCHAR, TCondensedJsonPrintPolicy< TCHAR >> Serializer(JsonWriter);
 		((FJsonSerializable*)this)->Serialize(Serializer, bFlatObject);
 	}
+
 	/**
 	 * Serializes the contents of a JSON string into this object
 	 *
@@ -734,6 +766,26 @@ struct FJsonSerializable
 		}
 		return false;
 	}
+
+	/**
+	 * Serializes the contents of a JSON string into this object
+	 *
+	 * @param Json the JSON data to serialize from
+	 */
+	virtual bool FromJson(FString&& Json)
+	{
+		TSharedPtr<FJsonObject> JsonObject;
+		TSharedRef<TJsonReader<> > JsonReader = TJsonReaderFactory<>::Create(MoveTemp(Json));
+		if (FJsonSerializer::Deserialize(JsonReader,JsonObject) &&
+			JsonObject.IsValid())
+		{
+			FJsonSerializerReader Serializer(JsonObject);
+			Serialize(Serializer, false);
+			return true;
+		}
+		return false;
+	}
+
 	virtual bool FromJson(TSharedPtr<FJsonObject> JsonObject)
 	{
 		if (JsonObject.IsValid())
diff --git a/Engine/Source/Runtime/JsonUtilities/Private/JsonObjectConverter.cpp b/Engine/Source/Runtime/JsonUtilities/Private/JsonObjectConverter.cpp
index 69370562e815..6f8a575ca4cd 100644
--- a/Engine/Source/Runtime/JsonUtilities/Private/JsonObjectConverter.cpp
+++ b/Engine/Source/Runtime/JsonUtilities/Private/JsonObjectConverter.cpp
@@ -8,6 +8,7 @@
 #include "UObject/EnumProperty.h"
 #include "UObject/TextProperty.h"
 #include "UObject/PropertyPortFlags.h"
+#include "UObject/Package.h"
 #include "Policies/CondensedJsonPrintPolicy.h"
 #include "JsonObjectWrapper.h"
 
@@ -20,6 +21,7 @@ FString FJsonObjectConverter::StandardizeCase(const FString &StringIn)
 	return FixedString;
 }
 
+
 namespace
 {
 /** Convert property to JSON, assuming either the property is not an array or the value is an individual array element */
@@ -178,6 +180,30 @@ TSharedPtr<FJsonValue> ConvertScalarUPropertyToJsonValue(UProperty* Property, co
 }
 }
 
+TSharedPtr<FJsonValue> FJsonObjectConverter::ObjectJsonCallback(UProperty* Property, const void* Value)
+{
+	if (UObjectProperty* ObjectProperty = Cast<UObjectProperty>(Property))
+	{
+		if (!ObjectProperty->HasAnyFlags(RF_Transient)) // We are taking Transient to mean we don't want to serialize to Json either (could make a new flag if nessasary)
+		{
+			TSharedRef<FJsonObject> Out = MakeShareable(new FJsonObject());
+
+			CustomExportCallback CustomCB;
+			CustomCB.BindStatic(FJsonObjectConverter::ObjectJsonCallback);
+
+			void** PtrToValuePtr = (void**)Value;
+
+			if (FJsonObjectConverter::UStructToJsonObject(ObjectProperty->PropertyClass, (*PtrToValuePtr), Out, 0, 0, &CustomCB))
+			{
+				return MakeShareable(new FJsonValueObject(Out));
+			}
+		}
+	}
+
+	// invalid
+	return TSharedPtr<FJsonValue>();
+}
+
 TSharedPtr<FJsonValue> FJsonObjectConverter::UPropertyToJsonValue(UProperty* Property, const void* Value, int64 CheckFlags, int64 SkipFlags, const CustomExportCallback* ExportCb)
 {
 	if (Property->ArrayDim == 1)
@@ -309,366 +335,463 @@ bool FJsonObjectConverter::GetTextFromObject(const TSharedRef<FJsonObject>& Obj,
 	return false;
 }
 
-//template bool FJsonObjectConverter::UStructToJsonObjectString<TCHAR, TCondensedJsonPrintPolicy>(const UStruct* StructDefinition, const void* Struct, FString& OutJsonString, int64 CheckFlags, int64 SkipFlags, int32 Indent, const CustomExportCallback* ExportCb);
 
 namespace
 {
+	bool JsonValueToUPropertyWithContainer(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, const UStruct* ContainerStruct, void* Container, int64 CheckFlags, int64 SkipFlags);
+	bool JsonAttributesToUStructWithContainer(const TMap< FString, TSharedPtr<FJsonValue> >& JsonAttributes, const UStruct* StructDefinition, void* OutStruct, const UStruct* ContainerStruct, void* Container, int64 CheckFlags, int64 SkipFlags);
 
-/** Convert JSON to property, assuming either the property is not an array or the value is an individual array element */
-bool ConvertScalarJsonValueToUProperty(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, int64 CheckFlags, int64 SkipFlags)
-{
-	if (UEnumProperty* EnumProperty = Cast<UEnumProperty>(Property))
+	/** Convert JSON to property, assuming either the property is not an array or the value is an individual array element */
+	bool ConvertScalarJsonValueToUPropertyWithContainer(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, const UStruct* ContainerStruct, void* Container, int64 CheckFlags, int64 SkipFlags)
 	{
-		if (JsonValue->Type == EJson::String)
-		{
-			// see if we were passed a string for the enum
-			const UEnum* Enum = EnumProperty->GetEnum();
-			check(Enum);
-			FString StrValue = JsonValue->AsString();
-			int64 IntValue = Enum->GetValueByName(FName(*StrValue));
-			if (IntValue == INDEX_NONE)
-			{
-				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
-				return false;
-			}
-			EnumProperty->GetUnderlyingProperty()->SetIntPropertyValue(OutValue, IntValue);
-		}
-		else
-		{
-			// AsNumber will log an error for completely inappropriate types (then give us a default)
-			EnumProperty->GetUnderlyingProperty()->SetIntPropertyValue(OutValue, (int64)JsonValue->AsNumber());
-		}
-	}
-	else if (UNumericProperty *NumericProperty = Cast<UNumericProperty>(Property))
-	{
-		if (NumericProperty->IsEnum() && JsonValue->Type == EJson::String)
-		{
-			// see if we were passed a string for the enum
-			const UEnum* Enum = NumericProperty->GetIntPropertyEnum();
-			check(Enum); // should be assured by IsEnum()
-			FString StrValue = JsonValue->AsString();
-			int64 IntValue = Enum->GetValueByName(FName(*StrValue));
-			if (IntValue == INDEX_NONE)
-			{
-				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
-				return false;
-			}
-			NumericProperty->SetIntPropertyValue(OutValue, IntValue);
-		}
-		else if(NumericProperty->IsFloatingPoint())
-		{
-			// AsNumber will log an error for completely inappropriate types (then give us a default)
-			NumericProperty->SetFloatingPointPropertyValue(OutValue, JsonValue->AsNumber());
-		}
-		else if (NumericProperty->IsInteger())
+		if (UEnumProperty* EnumProperty = Cast<UEnumProperty>(Property))
 		{
 			if (JsonValue->Type == EJson::String)
 			{
-				// parse string -> int64 ourselves so we don't lose any precision going through AsNumber (aka double)
-				NumericProperty->SetIntPropertyValue(OutValue, FCString::Atoi64(*JsonValue->AsString()));
+				// see if we were passed a string for the enum
+				const UEnum* Enum = EnumProperty->GetEnum();
+				check(Enum);
+				FString StrValue = JsonValue->AsString();
+				int64 IntValue = Enum->GetValueByName(FName(*StrValue));
+				if (IntValue == INDEX_NONE)
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
+					return false;
+				}
+				EnumProperty->GetUnderlyingProperty()->SetIntPropertyValue(OutValue, IntValue);
 			}
 			else
 			{
 				// AsNumber will log an error for completely inappropriate types (then give us a default)
-				NumericProperty->SetIntPropertyValue(OutValue, (int64)JsonValue->AsNumber());
+				EnumProperty->GetUnderlyingProperty()->SetIntPropertyValue(OutValue, (int64)JsonValue->AsNumber());
 			}
 		}
-		else 
+		else if (UNumericProperty *NumericProperty = Cast<UNumericProperty>(Property))
 		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to set numeric property type %s for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
-			return false;
-		}
-	}		
-	else if (UBoolProperty *BoolProperty = Cast<UBoolProperty>(Property))
-	{
-		// AsBool will log an error for completely inappropriate types (then give us a default)
-		BoolProperty->SetPropertyValue(OutValue, JsonValue->AsBool());
-	}
-	else if (UStrProperty *StringProperty = Cast<UStrProperty>(Property))
-	{
-		// AsString will log an error for completely inappropriate types (then give us a default)
-		StringProperty->SetPropertyValue(OutValue, JsonValue->AsString());
-	}
-	else if (UArrayProperty *ArrayProperty = Cast<UArrayProperty>(Property))
-	{
-		if (JsonValue->Type == EJson::Array)
-		{
-			TArray< TSharedPtr<FJsonValue> > ArrayValue = JsonValue->AsArray();
-			int32 ArrLen = ArrayValue.Num(); 
-
-			// make the output array size match
-			FScriptArrayHelper Helper(ArrayProperty, OutValue);
-			Helper.Resize(ArrLen);
-
-			// set the property values
-			for (int32 i=0;i<ArrLen;++i)
+			if (NumericProperty->IsEnum() && JsonValue->Type == EJson::String)
 			{
-				const TSharedPtr<FJsonValue>& ArrayValueItem = ArrayValue[i];
-				if (ArrayValueItem.IsValid() && !ArrayValueItem->IsNull())
+				// see if we were passed a string for the enum
+				const UEnum* Enum = NumericProperty->GetIntPropertyEnum();
+				check(Enum); // should be assured by IsEnum()
+				FString StrValue = JsonValue->AsString();
+				int64 IntValue = Enum->GetValueByName(FName(*StrValue));
+				if (IntValue == INDEX_NONE)
 				{
-					if (!FJsonObjectConverter::JsonValueToUProperty(ArrayValueItem, ArrayProperty->Inner, Helper.GetRawPtr(i), CheckFlags & (~CPF_ParmFlags), SkipFlags))
-					{
-						UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize array element [%d] for property %s"), i, *Property->GetNameCPP());
-						return false;
-					}
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import enum %s from string value %s for property %s"), *Enum->CppType, *StrValue, *Property->GetNameCPP());
+					return false;
 				}
+				NumericProperty->SetIntPropertyValue(OutValue, IntValue);
 			}
-		}
-		else
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TArray from non-array JSON key for property %s"), *Property->GetNameCPP());
-			return false;
-		}
-	}
-	else if ( UMapProperty* MapProperty = Cast<UMapProperty>(Property) )
-	{
-		if ( JsonValue->Type == EJson::Object )
-		{
-			TSharedPtr<FJsonObject> ObjectValue = JsonValue->AsObject();
-
-			FScriptMapHelper Helper(MapProperty, OutValue);
-
-			// set the property values
-			for ( const auto& Entry : ObjectValue->Values )
+			else if (NumericProperty->IsFloatingPoint())
 			{
-				if ( Entry.Value.IsValid() && !Entry.Value->IsNull() )
+				// AsNumber will log an error for completely inappropriate types (then give us a default)
+				NumericProperty->SetFloatingPointPropertyValue(OutValue, JsonValue->AsNumber());
+			}
+			else if (NumericProperty->IsInteger())
+			{
+				if (JsonValue->Type == EJson::String)
 				{
-					int32 NewIndex = Helper.AddDefaultValue_Invalid_NeedsRehash();
-					
-					TSharedPtr<FJsonValueString> TempKeyValue = MakeShareable(new FJsonValueString(Entry.Key));
-
-					const bool bKeySuccess = FJsonObjectConverter::JsonValueToUProperty(TempKeyValue, MapProperty->KeyProp, Helper.GetKeyPtr(NewIndex), CheckFlags & ( ~CPF_ParmFlags ), SkipFlags);
-					const bool bValueSuccess = FJsonObjectConverter::JsonValueToUProperty(Entry.Value, MapProperty->ValueProp, Helper.GetValuePtr(NewIndex), CheckFlags & ( ~CPF_ParmFlags ), SkipFlags);
-
-					if ( !(bKeySuccess && bValueSuccess) )
-					{
-						UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize map element [key: %s] for property %s"), *Entry.Key, *Property->GetNameCPP());
-						return false;
-					}
+					// parse string -> int64 ourselves so we don't lose any precision going through AsNumber (aka double)
+					NumericProperty->SetIntPropertyValue(OutValue, FCString::Atoi64(*JsonValue->AsString()));
 				}
-			}
-
-			Helper.Rehash();
-		}
-		else
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TMap from non-object JSON key for property %s"), *Property->GetNameCPP());
-			return false;
-		}
-	}
-	else if ( USetProperty* SetProperty = Cast<USetProperty>(Property) )
-	{
-		if ( JsonValue->Type == EJson::Array )
-		{
-			TArray< TSharedPtr<FJsonValue> > ArrayValue = JsonValue->AsArray();
-			int32 ArrLen = ArrayValue.Num();
-
-			FScriptSetHelper Helper(SetProperty, OutValue);
-
-			// set the property values
-			for ( int32 i=0; i < ArrLen; ++i )
-			{
-				const TSharedPtr<FJsonValue>& ArrayValueItem = ArrayValue[i];
-				if ( ArrayValueItem.IsValid() && !ArrayValueItem->IsNull() )
+				else
 				{
-					int32 NewIndex = Helper.AddDefaultValue_Invalid_NeedsRehash();
-					if ( !FJsonObjectConverter::JsonValueToUProperty(ArrayValueItem, SetProperty->ElementProp, Helper.GetElementPtr(NewIndex), CheckFlags & ( ~CPF_ParmFlags ), SkipFlags) )
-					{
-						UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize set element [%d] for property %s"), i, *Property->GetNameCPP());
-						return false;
-					}
+					// AsNumber will log an error for completely inappropriate types (then give us a default)
+					NumericProperty->SetIntPropertyValue(OutValue, (int64)JsonValue->AsNumber());
 				}
 			}
-
-			Helper.Rehash();
-		}
-		else
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TSet from non-array JSON key for property %s"), *Property->GetNameCPP());
-			return false;
-		}
-	}
-	else if (UTextProperty* TextProperty = Cast<UTextProperty>(Property))
-	{
-		if (JsonValue->Type == EJson::String)
-		{
-			// assume this string is already localized, so import as invariant
-			TextProperty->SetPropertyValue(OutValue, FText::FromString(JsonValue->AsString()));
-		}
-		else if (JsonValue->Type == EJson::Object)
-		{
-			TSharedPtr<FJsonObject> Obj = JsonValue->AsObject();
-			check(Obj.IsValid()); // should not fail if Type == EJson::Object
-
-			// import the subvalue as a culture invariant string
-			FText Text;
-			if (!FJsonObjectConverter::GetTextFromObject(Obj.ToSharedRef(), Text))
-			{
-				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import FText from JSON object with invalid keys for property %s"), *Property->GetNameCPP());
-				return false;
-			}
-			TextProperty->SetPropertyValue(OutValue, Text);
-		}
-		else
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import FText from JSON that was neither string nor object for property %s"), *Property->GetNameCPP());
-			return false;
-		}
-	}
-	else if (UStructProperty *StructProperty = Cast<UStructProperty>(Property))
-	{
-		static const FName NAME_DateTime(TEXT("DateTime"));
-		static const FName NAME_Color(TEXT("Color"));
-		static const FName NAME_LinearColor(TEXT("LinearColor"));
-		if (JsonValue->Type == EJson::Object)
-		{
-			TSharedPtr<FJsonObject> Obj = JsonValue->AsObject();
-			check(Obj.IsValid()); // should not fail if Type == EJson::Object
-			if (!FJsonObjectConverter::JsonObjectToUStruct(Obj.ToSharedRef(), StructProperty->Struct, OutValue, CheckFlags & (~CPF_ParmFlags), SkipFlags))
-			{
-				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - FJsonObjectConverter::JsonObjectToUStruct failed for property %s"), *Property->GetNameCPP());
-				return false;
-			}
-		}
-		else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_LinearColor)
-		{
-			FLinearColor& ColorOut = *(FLinearColor*)OutValue;
-			FString ColorString = JsonValue->AsString();
-
-			FColor IntermediateColor;
-			IntermediateColor = FColor::FromHex(ColorString);
-
-			ColorOut = IntermediateColor;
-		}
-		else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_Color)
-		{
-			FColor& ColorOut = *(FColor*)OutValue;
-			FString ColorString = JsonValue->AsString();
-
-			ColorOut = FColor::FromHex(ColorString);
-		}
-		else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_DateTime)
-		{
-			FString DateString = JsonValue->AsString();
-			FDateTime& DateTimeOut = *(FDateTime*)OutValue;
-			if (DateString == TEXT("min"))
-			{
-				// min representable value for our date struct. Actual date may vary by platform (this is used for sorting)
-				DateTimeOut = FDateTime::MinValue();
-			}
-			else if (DateString == TEXT("max"))
-			{
-				// max representable value for our date struct. Actual date may vary by platform (this is used for sorting)
-				DateTimeOut = FDateTime::MaxValue();
-			}
-			else if (DateString == TEXT("now"))
-			{
-				// this value's not really meaningful from json serialization (since we don't know timezone) but handle it anyway since we're handling the other keywords
-				DateTimeOut = FDateTime::UtcNow();
-			}
-			else if (FDateTime::ParseIso8601(*DateString, DateTimeOut))
-			{
-				// ok
-			}
-			else if (FDateTime::Parse(DateString, DateTimeOut))
-			{
-				// ok
-			}
 			else
 			{
-				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to import FDateTime for property %s"), *Property->GetNameCPP());
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to set numeric property type %s for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
 				return false;
 			}
 		}
-		else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetCppStructOps() && StructProperty->Struct->GetCppStructOps()->HasImportTextItem())
+		else if (UBoolProperty *BoolProperty = Cast<UBoolProperty>(Property))
 		{
-			UScriptStruct::ICppStructOps* TheCppStructOps = StructProperty->Struct->GetCppStructOps();
-			
-			FString ImportTextString = JsonValue->AsString();
-			const TCHAR* ImportTextPtr = *ImportTextString;
-			if (!TheCppStructOps->ImportTextItem(ImportTextPtr, OutValue, PPF_None, nullptr, (FOutputDevice*)GWarn))
+			// AsBool will log an error for completely inappropriate types (then give us a default)
+			BoolProperty->SetPropertyValue(OutValue, JsonValue->AsBool());
+		}
+		else if (UStrProperty *StringProperty = Cast<UStrProperty>(Property))
+		{
+			// AsString will log an error for completely inappropriate types (then give us a default)
+			StringProperty->SetPropertyValue(OutValue, JsonValue->AsString());
+		}
+		else if (UArrayProperty *ArrayProperty = Cast<UArrayProperty>(Property))
+		{
+			if (JsonValue->Type == EJson::Array)
 			{
-				// Fall back to trying the tagged property approach if custom ImportTextItem couldn't get it done
-				Property->ImportText(ImportTextPtr, OutValue, PPF_None, nullptr);
+				TArray< TSharedPtr<FJsonValue> > ArrayValue = JsonValue->AsArray();
+				int32 ArrLen = ArrayValue.Num();
+
+				// make the output array size match
+				FScriptArrayHelper Helper(ArrayProperty, OutValue);
+				Helper.Resize(ArrLen);
+
+				// set the property values
+				for (int32 i = 0; i < ArrLen; ++i)
+				{
+					const TSharedPtr<FJsonValue>& ArrayValueItem = ArrayValue[i];
+					if (ArrayValueItem.IsValid() && !ArrayValueItem->IsNull())
+					{
+						if (!JsonValueToUPropertyWithContainer(ArrayValueItem, ArrayProperty->Inner, Helper.GetRawPtr(i), ContainerStruct, Container, CheckFlags & (~CPF_ParmFlags), SkipFlags))
+						{
+							UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize array element [%d] for property %s"), i, *Property->GetNameCPP());
+							return false;
+						}
+					}
+				}
+			}
+			else
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TArray from non-array JSON key for property %s"), *Property->GetNameCPP());
+				return false;
 			}
 		}
-		else if (JsonValue->Type == EJson::String)
+		else if (UMapProperty* MapProperty = Cast<UMapProperty>(Property))
 		{
-			FString ImportTextString = JsonValue->AsString();
-			const TCHAR* ImportTextPtr = *ImportTextString;
-			Property->ImportText(ImportTextPtr, OutValue, PPF_None, nullptr);
+			if (JsonValue->Type == EJson::Object)
+			{
+				TSharedPtr<FJsonObject> ObjectValue = JsonValue->AsObject();
+
+				FScriptMapHelper Helper(MapProperty, OutValue);
+
+				// set the property values
+				for (const auto& Entry : ObjectValue->Values)
+				{
+					if (Entry.Value.IsValid() && !Entry.Value->IsNull())
+					{
+						int32 NewIndex = Helper.AddDefaultValue_Invalid_NeedsRehash();
+
+						TSharedPtr<FJsonValueString> TempKeyValue = MakeShareable(new FJsonValueString(Entry.Key));
+
+						const bool bKeySuccess = JsonValueToUPropertyWithContainer(TempKeyValue, MapProperty->KeyProp, Helper.GetKeyPtr(NewIndex), ContainerStruct, Container, CheckFlags & (~CPF_ParmFlags), SkipFlags);
+						const bool bValueSuccess = JsonValueToUPropertyWithContainer(Entry.Value, MapProperty->ValueProp, Helper.GetValuePtr(NewIndex), ContainerStruct, Container, CheckFlags & (~CPF_ParmFlags), SkipFlags);
+
+						if (!(bKeySuccess && bValueSuccess))
+						{
+							UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize map element [key: %s] for property %s"), *Entry.Key, *Property->GetNameCPP());
+							return false;
+						}
+					}
+				}
+
+				Helper.Rehash();
+			}
+			else
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TMap from non-object JSON key for property %s"), *Property->GetNameCPP());
+				return false;
+			}
+		}
+		else if (USetProperty* SetProperty = Cast<USetProperty>(Property))
+		{
+			if (JsonValue->Type == EJson::Array)
+			{
+				TArray< TSharedPtr<FJsonValue> > ArrayValue = JsonValue->AsArray();
+				int32 ArrLen = ArrayValue.Num();
+
+				FScriptSetHelper Helper(SetProperty, OutValue);
+
+				// set the property values
+				for (int32 i = 0; i < ArrLen; ++i)
+				{
+					const TSharedPtr<FJsonValue>& ArrayValueItem = ArrayValue[i];
+					if (ArrayValueItem.IsValid() && !ArrayValueItem->IsNull())
+					{
+						int32 NewIndex = Helper.AddDefaultValue_Invalid_NeedsRehash();
+						if (!JsonValueToUPropertyWithContainer(ArrayValueItem, SetProperty->ElementProp, Helper.GetElementPtr(NewIndex), ContainerStruct, Container, CheckFlags & (~CPF_ParmFlags), SkipFlags))
+						{
+							UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to deserialize set element [%d] for property %s"), i, *Property->GetNameCPP());
+							return false;
+						}
+					}
+				}
+
+				Helper.Rehash();
+			}
+			else
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TSet from non-array JSON key for property %s"), *Property->GetNameCPP());
+				return false;
+			}
+		}
+		else if (UTextProperty* TextProperty = Cast<UTextProperty>(Property))
+		{
+			if (JsonValue->Type == EJson::String)
+			{
+				// assume this string is already localized, so import as invariant
+				TextProperty->SetPropertyValue(OutValue, FText::FromString(JsonValue->AsString()));
+			}
+			else if (JsonValue->Type == EJson::Object)
+			{
+				TSharedPtr<FJsonObject> Obj = JsonValue->AsObject();
+				check(Obj.IsValid()); // should not fail if Type == EJson::Object
+
+									  // import the subvalue as a culture invariant string
+				FText Text;
+				if (!FJsonObjectConverter::GetTextFromObject(Obj.ToSharedRef(), Text))
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import FText from JSON object with invalid keys for property %s"), *Property->GetNameCPP());
+					return false;
+				}
+				TextProperty->SetPropertyValue(OutValue, Text);
+			}
+			else
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import FText from JSON that was neither string nor object for property %s"), *Property->GetNameCPP());
+				return false;
+			}
+		}
+		else if (UStructProperty *StructProperty = Cast<UStructProperty>(Property))
+		{
+			static const FName NAME_DateTime(TEXT("DateTime"));
+			static const FName NAME_Color(TEXT("Color"));
+			static const FName NAME_LinearColor(TEXT("LinearColor"));
+			if (JsonValue->Type == EJson::Object)
+			{
+				TSharedPtr<FJsonObject> Obj = JsonValue->AsObject();
+				check(Obj.IsValid()); // should not fail if Type == EJson::Object
+				if (!JsonAttributesToUStructWithContainer(Obj->Values, StructProperty->Struct, OutValue, ContainerStruct, Container, CheckFlags & (~CPF_ParmFlags), SkipFlags))
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - FJsonObjectConverter::JsonObjectToUStruct failed for property %s"), *Property->GetNameCPP());
+					return false;
+				}
+			}
+			else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_LinearColor)
+			{
+				FLinearColor& ColorOut = *(FLinearColor*)OutValue;
+				FString ColorString = JsonValue->AsString();
+
+				FColor IntermediateColor;
+				IntermediateColor = FColor::FromHex(ColorString);
+
+				ColorOut = IntermediateColor;
+			}
+			else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_Color)
+			{
+				FColor& ColorOut = *(FColor*)OutValue;
+				FString ColorString = JsonValue->AsString();
+
+				ColorOut = FColor::FromHex(ColorString);
+			}
+			else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetFName() == NAME_DateTime)
+			{
+				FString DateString = JsonValue->AsString();
+				FDateTime& DateTimeOut = *(FDateTime*)OutValue;
+				if (DateString == TEXT("min"))
+				{
+					// min representable value for our date struct. Actual date may vary by platform (this is used for sorting)
+					DateTimeOut = FDateTime::MinValue();
+				}
+				else if (DateString == TEXT("max"))
+				{
+					// max representable value for our date struct. Actual date may vary by platform (this is used for sorting)
+					DateTimeOut = FDateTime::MaxValue();
+				}
+				else if (DateString == TEXT("now"))
+				{
+					// this value's not really meaningful from json serialization (since we don't know timezone) but handle it anyway since we're handling the other keywords
+					DateTimeOut = FDateTime::UtcNow();
+				}
+				else if (FDateTime::ParseIso8601(*DateString, DateTimeOut))
+				{
+					// ok
+				}
+				else if (FDateTime::Parse(DateString, DateTimeOut))
+				{
+					// ok
+				}
+				else
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable to import FDateTime for property %s"), *Property->GetNameCPP());
+					return false;
+				}
+			}
+			else if (JsonValue->Type == EJson::String && StructProperty->Struct->GetCppStructOps() && StructProperty->Struct->GetCppStructOps()->HasImportTextItem())
+			{
+				UScriptStruct::ICppStructOps* TheCppStructOps = StructProperty->Struct->GetCppStructOps();
+
+				FString ImportTextString = JsonValue->AsString();
+				const TCHAR* ImportTextPtr = *ImportTextString;
+				if (!TheCppStructOps->ImportTextItem(ImportTextPtr, OutValue, PPF_None, nullptr, (FOutputDevice*)GWarn))
+				{
+					// Fall back to trying the tagged property approach if custom ImportTextItem couldn't get it done
+					Property->ImportText(ImportTextPtr, OutValue, PPF_None, nullptr);
+				}
+			}
+			else if (JsonValue->Type == EJson::String)
+			{
+				FString ImportTextString = JsonValue->AsString();
+				const TCHAR* ImportTextPtr = *ImportTextString;
+				Property->ImportText(ImportTextPtr, OutValue, PPF_None, nullptr);
+			}
+			else
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import UStruct from non-object JSON key for property %s"), *Property->GetNameCPP());
+				return false;
+			}
+		}
+		else if (UObjectProperty *ObjectProperty = Cast<UObjectProperty>(Property))
+		{
+			if (JsonValue->Type == EJson::Object)
+			{
+				UObject* Outer = GetTransientPackage();
+				if (ContainerStruct->IsChildOf(UObject::StaticClass()))
+				{
+					Outer = (UObject*)Container;
+				}
+
+				UClass* PropertyClass = ObjectProperty->PropertyClass;
+				UObject* createdObj = StaticAllocateObject(PropertyClass, Outer, NAME_None, EObjectFlags::RF_NoFlags, EInternalObjectFlags::None, false);
+				(*PropertyClass->ClassConstructor)(FObjectInitializer(createdObj, PropertyClass->ClassDefaultObject, false, false));
+
+				ObjectProperty->SetObjectPropertyValue(OutValue, createdObj);
+
+				TSharedPtr<FJsonObject> Obj = JsonValue->AsObject();
+				check(Obj.IsValid()); // should not fail if Type == EJson::Object
+				if (!JsonAttributesToUStructWithContainer(Obj->Values, ObjectProperty->PropertyClass, createdObj, ObjectProperty->PropertyClass, createdObj, CheckFlags & (~CPF_ParmFlags), SkipFlags))
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - FJsonObjectConverter::JsonObjectToUStruct failed for property %s"), *Property->GetNameCPP());
+					return false;
+				}
+			}
+			else if (JsonValue->Type == EJson::String)
+			{
+				// Default to expect a string for everything else
+				if (Property->ImportText(*JsonValue->AsString(), OutValue, 0, NULL) == NULL)
+				{
+					UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
+					return false;
+				}
+			}
 		}
 		else
 		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import UStruct from non-object JSON key for property %s"), *Property->GetNameCPP());
+			// Default to expect a string for everything else
+			if (Property->ImportText(*JsonValue->AsString(), OutValue, 0, NULL) == NULL)
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+
+	bool JsonValueToUPropertyWithContainer(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, const UStruct* ContainerStruct, void* Container, int64 CheckFlags, int64 SkipFlags)
+	{
+		if (!JsonValue.IsValid())
+		{
+			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Invalid value JSON key"));
 			return false;
 		}
-	}
-	else
-	{
-		// Default to expect a string for everything else
-		if (Property->ImportText(*JsonValue->AsString(), OutValue, 0, NULL) == NULL)
+
+		bool bArrayOrSetProperty = Property->IsA<UArrayProperty>() || Property->IsA<USetProperty>();
+		bool bJsonArray = JsonValue->Type == EJson::Array;
+
+		if (!bJsonArray)
 		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Unable import property type %s from string value for property %s"), *Property->GetClass()->GetName(), *Property->GetNameCPP());
-			return false;
-		}
-	}
+			if (bArrayOrSetProperty)
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TArray from non-array JSON key"));
+				return false;
+			}
 
-	return true;
-}
-}
+			if (Property->ArrayDim != 1)
+			{
+				UE_LOG(LogJson, Warning, TEXT("Ignoring excess properties when deserializing %s"), *Property->GetName());
+			}
 
-bool FJsonObjectConverter::JsonValueToUProperty(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, int64 CheckFlags, int64 SkipFlags)
-{
-	if (!JsonValue.IsValid())
-	{
-		UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Invalid value JSON key"));
-		return false;
-	}
-
-	bool bArrayOrSetProperty = Property->IsA<UArrayProperty>() || Property->IsA<USetProperty>();
-	bool bJsonArray = JsonValue->Type == EJson::Array;
-
-	if (!bJsonArray)
-	{
-		if (bArrayOrSetProperty)
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonValueToUProperty - Attempted to import TArray from non-array JSON key"));
-			return false;			
+			return ConvertScalarJsonValueToUPropertyWithContainer(JsonValue, Property, OutValue, ContainerStruct, Container, CheckFlags, SkipFlags);
 		}
 
-		if (Property->ArrayDim != 1)
+		// In practice, the ArrayDim == 1 check ought to be redundant, since nested arrays of UPropertys are not supported
+		if (bArrayOrSetProperty && Property->ArrayDim == 1)
+		{
+			// Read into TArray
+			return ConvertScalarJsonValueToUPropertyWithContainer(JsonValue, Property, OutValue, ContainerStruct, Container, CheckFlags, SkipFlags);
+		}
+
+		// We're deserializing a JSON array
+		const auto& ArrayValue = JsonValue->AsArray();
+		if (Property->ArrayDim < ArrayValue.Num())
 		{
 			UE_LOG(LogJson, Warning, TEXT("Ignoring excess properties when deserializing %s"), *Property->GetName());
 		}
 
-		return ConvertScalarJsonValueToUProperty(JsonValue, Property, OutValue, CheckFlags, SkipFlags);
-	}
-
-	// In practice, the ArrayDim == 1 check ought to be redundant, since nested arrays of UPropertys are not supported
-	if (bArrayOrSetProperty && Property->ArrayDim == 1)
-	{
-		// Read into TArray
-		return ConvertScalarJsonValueToUProperty(JsonValue, Property, OutValue, CheckFlags, SkipFlags);
-	}
-
-	// We're deserializing a JSON array
-	const auto& ArrayValue = JsonValue->AsArray();
-	if (Property->ArrayDim < ArrayValue.Num())
-	{
-		UE_LOG(LogJson, Warning, TEXT("Ignoring excess properties when deserializing %s"), *Property->GetName());
-	}
-
-	// Read into native array
-	int ItemsToRead = FMath::Clamp(ArrayValue.Num(), 0, Property->ArrayDim);
-	for (int Index = 0; Index != ItemsToRead; ++Index)
-	{
-		if (!ConvertScalarJsonValueToUProperty(ArrayValue[Index], Property, (char*)OutValue + Index * Property->ElementSize, CheckFlags, SkipFlags))
+		// Read into native array
+		int ItemsToRead = FMath::Clamp(ArrayValue.Num(), 0, Property->ArrayDim);
+		for (int Index = 0; Index != ItemsToRead; ++Index)
 		{
-			return false;
+			if (!ConvertScalarJsonValueToUPropertyWithContainer(ArrayValue[Index], Property, (char*)OutValue + Index * Property->ElementSize, ContainerStruct, Container, CheckFlags, SkipFlags))
+			{
+				return false;
+			}
 		}
+		return true;
 	}
-	return true;
+
+	bool JsonAttributesToUStructWithContainer(const TMap< FString, TSharedPtr<FJsonValue> >& JsonAttributes, const UStruct* StructDefinition, void* OutStruct, const UStruct* ContainerStruct, void* Container, int64 CheckFlags, int64 SkipFlags)
+	{
+		if (StructDefinition == FJsonObjectWrapper::StaticStruct())
+		{
+			// Just copy it into the object
+			FJsonObjectWrapper* ProxyObject = (FJsonObjectWrapper *)OutStruct;
+			ProxyObject->JsonObject = MakeShareable(new FJsonObject());
+			ProxyObject->JsonObject->Values = JsonAttributes;
+			return true;
+		}
+
+		// iterate over the struct properties
+		for (TFieldIterator<UProperty> PropIt(StructDefinition); PropIt; ++PropIt)
+		{
+			UProperty* Property = *PropIt;
+			FString PropertyName = Property->GetName();
+
+			// Check to see if we should ignore this property
+			if (CheckFlags != 0 && !Property->HasAnyPropertyFlags(CheckFlags))
+			{
+				continue;
+			}
+			if (Property->HasAnyPropertyFlags(SkipFlags))
+			{
+				continue;
+			}
+
+			// find a json value matching this property name
+			TSharedPtr<FJsonValue> JsonValue;
+			for (auto It = JsonAttributes.CreateConstIterator(); It; ++It)
+			{
+				// use case insensitive search sincd FName may change caseing strangely on us
+				if (PropertyName.Equals(It.Key(), ESearchCase::IgnoreCase))
+				{
+					JsonValue = It.Value();
+					break;
+				}
+			}
+			if (!JsonValue.IsValid() || JsonValue->IsNull())
+			{
+				// we allow values to not be found since this mirrors the typical UObject mantra that all the fields are optional when deserializing
+				continue;
+			}
+
+			void* Value = Property->ContainerPtrToValuePtr<uint8>(OutStruct);
+			if (!JsonValueToUPropertyWithContainer(JsonValue, Property, Value, ContainerStruct, Container, CheckFlags, SkipFlags))
+			{
+				UE_LOG(LogJson, Error, TEXT("JsonObjectToUStruct - Unable to parse %s.%s from JSON"), *StructDefinition->GetName(), *PropertyName);
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+}
+
+bool FJsonObjectConverter::JsonValueToUProperty(TSharedPtr<FJsonValue> JsonValue, UProperty* Property, void* OutValue, int64 CheckFlags, int64 SkipFlags)
+{
+	return JsonValueToUPropertyWithContainer(JsonValue, Property, OutValue, nullptr, nullptr, CheckFlags, SkipFlags);
 }
 
 bool FJsonObjectConverter::JsonObjectToUStruct(const TSharedRef<FJsonObject>& JsonObject, const UStruct* StructDefinition, void* OutStruct, int64 CheckFlags, int64 SkipFlags)
@@ -678,57 +801,7 @@ bool FJsonObjectConverter::JsonObjectToUStruct(const TSharedRef<FJsonObject>& Js
 
 bool FJsonObjectConverter::JsonAttributesToUStruct(const TMap< FString, TSharedPtr<FJsonValue> >& JsonAttributes, const UStruct* StructDefinition, void* OutStruct, int64 CheckFlags, int64 SkipFlags)
 {
-	if (StructDefinition == FJsonObjectWrapper::StaticStruct())
-	{
-		// Just copy it into the object
-		FJsonObjectWrapper* ProxyObject = (FJsonObjectWrapper *)OutStruct;
-		ProxyObject->JsonObject = MakeShareable(new FJsonObject());
-		ProxyObject->JsonObject->Values = JsonAttributes;
-		return true;
-	}
-
-	// iterate over the struct properties
-	for(TFieldIterator<UProperty> PropIt(StructDefinition); PropIt; ++PropIt)
-	{
-		UProperty* Property = *PropIt;
-		FString PropertyName = Property->GetName();
-
-		// Check to see if we should ignore this property
-		if (CheckFlags != 0 && !Property->HasAnyPropertyFlags(CheckFlags))
-		{
-			continue;
-		}
-		if (Property->HasAnyPropertyFlags(SkipFlags))
-		{
-			continue;
-		}
-
-		// find a json value matching this property name
-		TSharedPtr<FJsonValue> JsonValue;
-		for (auto It = JsonAttributes.CreateConstIterator(); It; ++It)
-		{
-			// use case insensitive search sincd FName may change caseing strangely on us
-			if (PropertyName.Equals(It.Key(), ESearchCase::IgnoreCase))
-			{
-				JsonValue = It.Value();
-				break;
-			}
-		}
-		if (!JsonValue.IsValid() || JsonValue->IsNull())
-		{
-			// we allow values to not be found since this mirrors the typical UObject mantra that all the fields are optional when deserializing
-			continue;
-		}
-
-		void* Value = Property->ContainerPtrToValuePtr<uint8>(OutStruct);
-		if (!JsonValueToUProperty(JsonValue, Property, Value, CheckFlags, SkipFlags))
-		{
-			UE_LOG(LogJson, Error, TEXT("JsonObjectToUStruct - Unable to parse %s.%s from JSON"), *StructDefinition->GetName(), *PropertyName);
-			return false;
-		}
-	}
-	
-	return true;
+	return JsonAttributesToUStructWithContainer(JsonAttributes, StructDefinition, OutStruct, StructDefinition, OutStruct, CheckFlags, SkipFlags);
 }
 
 FFormatNamedArguments FJsonObjectConverter::ParseTextArgumentsFromJson(const TSharedPtr<const FJsonObject>& JsonObject)
diff --git a/Engine/Source/Runtime/JsonUtilities/Public/JsonObjectConverter.h b/Engine/Source/Runtime/JsonUtilities/Public/JsonObjectConverter.h
index b1d780d4aa22..79d69f11f2d6 100644
--- a/Engine/Source/Runtime/JsonUtilities/Public/JsonObjectConverter.h
+++ b/Engine/Source/Runtime/JsonUtilities/Public/JsonObjectConverter.h
@@ -30,6 +30,11 @@ public: // UStruct -> JSON
 	 */
 	DECLARE_DELEGATE_RetVal_TwoParams(TSharedPtr<FJsonValue>, CustomExportCallback, UProperty* /* Property */, const void* /* Value */);
 
+	/**
+	 * Utility Export Callback for having object properties expanded to full Json.
+	 */
+	static TSharedPtr<FJsonValue> ObjectJsonCallback(UProperty* Property , const void* Value);
+
 	/**
 	 * Templated version of UStructToJsonObject to try and make most of the params. Also serves as an example use case
 	 *
@@ -187,7 +192,7 @@ public: // JSON -> UStruct
 	 *
 	 * @param JsonAttributes Json Object to copy data out of
 	 * @param StructDefinition UStruct definition that is looked over for properties
-	 * @param Struct The UStruct instance to copy in to
+	 * @param OutStruct The UStruct instance to copy in to
 	 * @param CheckFlags Only convert properties that match at least one of these flags. If 0 check all properties.
 	 * @param SkipFlags Skip properties that match any of these flags
 	 *
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeComponent.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeComponent.h
index 91514d1c9b7a..265ca566c7b4 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeComponent.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeComponent.h
@@ -176,7 +176,8 @@ struct FWeightmapLayerAllocationInfo
 	uint8 WeightmapTextureChannel;
 
 	FWeightmapLayerAllocationInfo()
-		: WeightmapTextureIndex(0)
+		: LayerInfo(nullptr)
+		, WeightmapTextureIndex(0)
 		, WeightmapTextureChannel(0)
 	{
 	}
@@ -402,6 +403,16 @@ public:
 	UPROPERTY(NonPIEDuplicateTransient)
 	UTexture2D* MobileWeightNormalmapTexture;
 
+#if WITH_EDITORONLY_DATA
+	/** Layer allocations used by mobile. Cached value here used only in the editor for usage visualization. */
+	TArray<FWeightmapLayerAllocationInfo> MobileWeightmapLayerAllocations;
+
+	/** The editor needs to save out the combination MIC we'll use for mobile, 
+	  because we cannot generate it at runtime for standalone PIE games */
+	UPROPERTY(NonPIEDuplicateTransient)
+	UMaterialInstanceConstant* MobileCombinationMaterialInstance;
+#endif
+
 public:
 	/** Platform Data where don't support texture sampling in vertex buffer */
 	FLandscapeComponentDerivedData PlatformData;
@@ -507,6 +518,7 @@ public:
 	void SerializeStateHashes(FArchive& Ar);
 
 	// Generates mobile platform data for this component
+	void GenerateMobileWeightmapLayerAllocations();
 	void GeneratePlatformVertexData(const ITargetPlatform* TargetPlatform);
 	void GeneratePlatformPixelData();
 
@@ -585,7 +597,7 @@ public:
 	void UpdateMaterialInstances_Internal(FMaterialUpdateContext& Context);
 
 	/** Helper function for UpdateMaterialInstance to get Material without set parameters */
-	UMaterialInstanceConstant* GetCombinationMaterial(bool bMobile = false);
+	UMaterialInstanceConstant* GetCombinationMaterial(const TArray<FWeightmapLayerAllocationInfo>& Allocations, bool bMobile = false) const;
 	/**
 	 * Generate mipmaps for height and tangent data.
 	 * @param HeightmapTextureMipData - array of pointers to the locked mip data.
@@ -672,9 +684,9 @@ public:
 	LANDSCAPE_API bool ComponentHasVisibilityPainted() const;
 
 	/**
-	 * Generate a key for this component's layer allocations to use with MaterialInstanceConstantMap.
+	 * Generate a key for a component's layer allocations to use with MaterialInstanceConstantMap.
 	 */
-	FString GetLayerAllocationKey(UMaterialInterface* LandscapeMaterial, bool bMobile = false) const;
+	static FString GetLayerAllocationKey(const TArray<FWeightmapLayerAllocationInfo>& Allocations, UMaterialInterface* LandscapeMaterial, bool bMobile = false);
 
 	/** @todo document */
 	void GetLayerDebugColorKey(int32& R, int32& G, int32& B) const;
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeGrassType.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeGrassType.h
index d0682fc93952..52784c455dcd 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeGrassType.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeGrassType.h
@@ -6,6 +6,7 @@
 #include "UObject/ObjectMacros.h"
 #include "UObject/Object.h"
 #include "Engine/EngineTypes.h"
+#include "PerPlatformProperties.h"
 #include "LandscapeGrassType.generated.h"
 
 class UStaticMesh;
@@ -32,7 +33,7 @@ struct FGrassVariety
 
 	/* Instances per 10 square meters. */
 	UPROPERTY(EditAnywhere, Category=Grass, meta = (UIMin = 0, ClampMin = 0, UIMax = 10000, ClampMax = 10000))
-	float GrassDensity;
+	FPerPlatformFloat GrassDensity;
 
 	/* If true, use a jittered grid sequence for placement, otherwise use a halton sequence. */
 	UPROPERTY(EditAnywhere, Category=Grass)
@@ -43,14 +44,14 @@ struct FGrassVariety
 
 	/* The distance where instances will begin to fade out if using a PerInstanceFadeAmount material node. 0 disables. */
 	UPROPERTY(EditAnywhere, Category=Grass, meta = (UIMin = 0, ClampMin = 0, UIMax = 1000000, ClampMax = 1000000))
-	int32 StartCullDistance;
+	FPerPlatformInt StartCullDistance;
 
 	/**
 	 * The distance where instances will have completely faded out when using a PerInstanceFadeAmount material node. 0 disables. 
 	 * When the entire cluster is beyond this distance, the cluster is completely culled and not rendered at all.
 	 */
 	UPROPERTY(EditAnywhere, Category = Grass, meta = (UIMin = 0, ClampMin = 0, UIMax = 1000000, ClampMax = 1000000))
-	int32 EndCullDistance;
+	FPerPlatformInt EndCullDistance;
 
 	/** 
 	 * Specifies the smallest LOD that will be used for this component.
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeMaterialInstanceConstant.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeMaterialInstanceConstant.h
index e36dd8c35d96..4d72002f44eb 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeMaterialInstanceConstant.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeMaterialInstanceConstant.h
@@ -18,6 +18,12 @@ class ULandscapeMaterialInstanceConstant : public UMaterialInstanceConstant
 	UPROPERTY()
 	uint32 bDisableTessellation:1;
 
+	UPROPERTY()
+	uint32 bMobile:1;
+
+	UPROPERTY()
+	uint32 bEditorToolUsage:1;
+
 	virtual FMaterialResource* AllocatePermutationResource() override;
 	virtual bool HasOverridenBaseProperties() const override;
 };
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeProxy.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeProxy.h
index ae8dce170873..4124656f9ffc 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeProxy.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeProxy.h
@@ -597,8 +597,10 @@ public:
 	LANDSCAPE_API static ULandscapeLayerInfoObject* VisibilityLayer;
 #endif
 
+#if WITH_EDITORONLY_DATA
 	/** Map of material instance constants used to for the components. Key is generated with ULandscapeComponent::GetLayerAllocationKey() */
 	TMap<FString, UMaterialInstanceConstant*> MaterialInstanceConstantMap;
+#endif
 
 	/** Map of weightmap usage */
 	TMap<UTexture2D*, FLandscapeWeightmapUsage> WeightmapUsageMap;
@@ -708,6 +710,12 @@ public:
 
 	/** Frame counter to count down to the next time we check to update baked textures, so we don't check every frame */
 	int32 UpdateBakedTexturesCountdown;
+
+	/** Editor notification when changing feature level, used to flush grass */
+	void OnFeatureLevelChanged(ERHIFeatureLevel::Type NewFeatureLevel);
+
+	/** Handle so we can unregister the delegate */
+	FDelegateHandle FeatureLevelChangedDelegateHandle;
 #endif
 
 	//~ Begin AActor Interface.
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineControlPoint.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineControlPoint.h
index 501ca622b9ef..7a29854f6b5b 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineControlPoint.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineControlPoint.h
@@ -21,7 +21,7 @@ struct FLandscapeSplineConnection
 {
 	GENERATED_USTRUCT_BODY()
 
-	FLandscapeSplineConnection() {}
+	FLandscapeSplineConnection() : Segment(nullptr), End(0) {}
 
 	FLandscapeSplineConnection(ULandscapeSplineSegment* InSegment, int32 InEnd)
 		: Segment(InSegment)
@@ -107,6 +107,10 @@ class ULandscapeSplineControlPoint : public UObject
 	UPROPERTY()
 	uint32 bEnableCollision_DEPRECATED:1;
 
+	/** Name of the collision profile to use for this spline */
+	UPROPERTY(EditAnywhere, Category=Mesh)
+	FName CollisionProfileName;
+
 	/** Whether the Control Point Mesh should cast a shadow. */
 	UPROPERTY(EditAnywhere, Category=Mesh)
 	uint32 bCastShadow:1;
diff --git a/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineSegment.h b/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineSegment.h
index a4f26e4d4bd1..2bf5b0ad54f3 100644
--- a/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineSegment.h
+++ b/Engine/Source/Runtime/Landscape/Classes/LandscapeSplineSegment.h
@@ -46,6 +46,7 @@ struct FLandscapeSplineInterpPoint
 	float StartEndFalloff;
 
 	FLandscapeSplineInterpPoint()
+		: StartEndFalloff(0.0f)
 	{
 	}
 
@@ -184,6 +185,15 @@ class ULandscapeSplineSegment : public UObject
 	UPROPERTY()
 	uint32 bEnableCollision_DEPRECATED:1;
 
+	/** Name of the collision profile to use for this spline */
+	//
+	// TODO: This field does not have proper Slate customization.
+	// Instead of a text field, this should be a dropdown with the
+	// default option.
+	//
+	UPROPERTY(EditAnywhere, Category=LandscapeSplineMeshes)
+	FName CollisionProfileName;
+
 	/** Whether the Spline Meshes should cast a shadow. */
 	UPROPERTY(EditAnywhere, Category=LandscapeSplineMeshes)
 	uint32 bCastShadow:1;
@@ -285,6 +295,8 @@ public:
 #endif // WITH_EDITOR
 protected:
 	virtual void PostInitProperties() override;
+private:
+	void UpdateMeshCollisionProfile(USplineMeshComponent* MeshComponent);
 public:
 	//~ End UObject Interface
 
diff --git a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerBlend.h b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerBlend.h
index 65ea15212248..a384a390dc3a 100644
--- a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerBlend.h
+++ b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerBlend.h
@@ -90,6 +90,7 @@ class LANDSCAPE_API UMaterialExpressionLandscapeLayerBlend : public UMaterialExp
 	virtual FName GetInputName(int32 InputIndex) const override;
 #endif
 	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const override { return true; }
 	//~ End UMaterialExpression Interface
 
 	virtual FGuid& GetParameterExpressionId() override;
diff --git a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSample.h b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSample.h
index 1e795f7b872a..ab07bbe86f49 100644
--- a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSample.h
+++ b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSample.h
@@ -35,6 +35,7 @@ public:
 	virtual void GetCaption(TArray<FString>& OutCaptions) const override;
 #endif
 	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const override { return true; }
 	//~ End UMaterialExpression Interface
 
 	virtual FGuid& GetParameterExpressionId() override;
diff --git a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSwitch.h b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSwitch.h
index d63e22ba9737..e882e7d7b8fe 100644
--- a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSwitch.h
+++ b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerSwitch.h
@@ -48,6 +48,7 @@ public:
 	virtual void GetCaption(TArray<FString>& OutCaptions) const override;
 #endif
 	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const override { return true; }
 #if WITH_EDITOR
 	virtual uint32 GetInputType(int32 InputIndex) override {return MCT_Unknown;}
 	virtual uint32 GetOutputType(int32 InputIndex) override {return MCT_Unknown;}
diff --git a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerWeight.h b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerWeight.h
index 92fed2162e63..b1107dda8b12 100644
--- a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerWeight.h
+++ b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeLayerWeight.h
@@ -47,6 +47,7 @@ public:
 	virtual void GetCaption(TArray<FString>& OutCaptions) const override;
 #endif
 	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const override { return true; }
 #if WITH_EDITOR
 	virtual uint32 GetInputType(int32 InputIndex) override {return MCT_Float | MCT_MaterialAttributes;}
 #endif //WITH_EDITOR
diff --git a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeVisibilityMask.h b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeVisibilityMask.h
index 976ef9bfb73a..e0541d172d51 100644
--- a/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeVisibilityMask.h
+++ b/Engine/Source/Runtime/Landscape/Classes/Materials/MaterialExpressionLandscapeVisibilityMask.h
@@ -31,6 +31,7 @@ public:
 	virtual void GetCaption(TArray<FString>& OutCaptions) const override;
 #endif
 	virtual UTexture* GetReferencedTexture() override;
+	virtual bool CanReferenceTexture() const override { return true; }
 	//~ End UMaterialExpression Interface
 
 	virtual FGuid& GetParameterExpressionId() override;
diff --git a/Engine/Source/Runtime/Landscape/Private/Landscape.cpp b/Engine/Source/Runtime/Landscape/Private/Landscape.cpp
index a85fd27986f4..0d3958727397 100644
--- a/Engine/Source/Runtime/Landscape/Private/Landscape.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/Landscape.cpp
@@ -454,7 +454,7 @@ bool ULandscapeComponent::ComponentHasVisibilityPainted() const
 	return false;
 }
 
-FString ULandscapeComponent::GetLayerAllocationKey(UMaterialInterface* LandscapeMaterial, bool bMobile /*= false*/) const
+FString ULandscapeComponent::GetLayerAllocationKey(const TArray<FWeightmapLayerAllocationInfo>& Allocations, UMaterialInterface* LandscapeMaterial, bool bMobile /*= false*/)
 {
 	if (!LandscapeMaterial)
 	{
@@ -465,9 +465,9 @@ FString ULandscapeComponent::GetLayerAllocationKey(UMaterialInterface* Landscape
 
 	// Sort the allocations
 	TArray<FString> LayerStrings;
-	for (int32 LayerIdx = 0; LayerIdx < WeightmapLayerAllocations.Num(); LayerIdx++)
+	for (int32 LayerIdx = 0; LayerIdx < Allocations.Num(); LayerIdx++)
 	{
-		LayerStrings.Add(FString::Printf(TEXT("_%s_%d"), *WeightmapLayerAllocations[LayerIdx].GetLayerName().ToString(), bMobile ? 0 : WeightmapLayerAllocations[LayerIdx].WeightmapTextureIndex));
+		LayerStrings.Add(FString::Printf(TEXT("_%s_%d"), *Allocations[LayerIdx].GetLayerName().ToString(), Allocations[LayerIdx].WeightmapTextureIndex));
 	}
 	/**
 	 * Generate a key for this component's layer allocations to use with MaterialInstanceConstantMap.
@@ -478,6 +478,12 @@ FString ULandscapeComponent::GetLayerAllocationKey(UMaterialInterface* Landscape
 	{
 		Result += LayerStrings[LayerIdx];
 	}
+
+	if (bMobile)
+	{
+		Result += TEXT("M");
+	}
+
 	return Result;
 }
 
@@ -665,6 +671,7 @@ void ULandscapeComponent::PostLoad()
 	}
 #endif
 
+#if !UE_BUILD_SHIPPING
 	// Be sure we have the appropriate material count
 	const bool bTessellationEnabled = (MaterialInstances.Num() > 0 && MaterialInstances[0] != nullptr && MaterialInstances[0]->Parent != nullptr && MaterialInstances[0]->Parent->GetMaterial()->D3D11TessellationMode != EMaterialTessellationMode::MTM_NoTessellation);
 
@@ -679,6 +686,7 @@ void ULandscapeComponent::PostLoad()
 			UE_LOG(LogLandscape, Error, TEXT("Landscape component (%d, %d) have a material with Tessellation enabled but we do not have the right amount of MaterialInstances. To correct this issue, open the map in the editor and resave the map."),	SectionBaseX, SectionBaseY);
 		}
 	}
+#endif // UE_BUILD_SHIPPING
 
 #if WITH_EDITOR
 	if (GIsEditor && !HasAnyFlags(RF_ClassDefaultObject))
@@ -705,6 +713,23 @@ void ULandscapeComponent::PostLoad()
 	}
 #endif
 
+#if !UE_BUILD_SHIPPING
+	if (MobileCombinationMaterialInstance == nullptr)
+	{
+		if (GIsEditor)
+		{
+			UpdateMaterialInstances();
+		}
+		else
+		{
+			if(GMaxRHIFeatureLevel <= ERHIFeatureLevel::ES3_1)
+			{
+				UE_LOG(LogLandscape, Error, TEXT("Landscape component (%d, %d) Does not have a valid mobile combination material. To correct this issue, open the map in the editor and resave the map."), SectionBaseX, SectionBaseY);
+			}
+		}
+	}
+#endif // UE_BUILD_SHIPPING
+
 	GrassData->ConditionalDiscardDataOnLoad();
 }
 
@@ -782,6 +807,7 @@ ALandscapeProxy::ALandscapeProxy(const FObjectInitializer& ObjectInitializer)
 		// This layer should be no weight blending
 		VisibilityLayer->bNoWeightBlend = true;
 #endif
+		VisibilityLayer->LayerUsageDebugColor = FLinearColor(0, 0, 0, 0);
 		VisibilityLayer->AddToRoot();
 	}
 #endif
@@ -1299,7 +1325,9 @@ void ALandscapeProxy::AddReferencedObjects(UObject* InThis, FReferenceCollector&
 
 	Super::AddReferencedObjects(InThis, Collector);
 
+#if WITH_EDITORONLY_DATA
 	Collector.AddReferencedObjects(This->MaterialInstanceConstantMap, This);
+#endif
 
 	for (auto It = This->WeightmapUsageMap.CreateIterator(); It; ++It)
 	{
@@ -1633,6 +1661,11 @@ void ALandscapeProxy::PostLoad()
 
 		FixupWeightmaps();
 	}
+
+	// track feature level change to flush grass cache
+	FOnFeatureLevelChanged::FDelegate FeatureLevelChangedDelegate = FOnFeatureLevelChanged::FDelegate::CreateUObject(this, &ALandscapeProxy::OnFeatureLevelChanged);
+	FeatureLevelChangedDelegateHandle = GetWorld()->AddOnFeatureLevelChangedHandler(FeatureLevelChangedDelegate);
+
 #endif
 }
 
@@ -1641,9 +1674,11 @@ void ALandscapeProxy::Destroyed()
 {
 	Super::Destroyed();
 
-	if (GIsEditor && !GetWorld()->IsGameWorld())
+	UWorld* World = GetWorld();
+
+	if (GIsEditor && !World->IsGameWorld())
 	{
-		ULandscapeInfo::RecreateLandscapeInfo(GetWorld(), false);
+		ULandscapeInfo::RecreateLandscapeInfo(World, false);
 
 		if (SplineComponent)
 		{
@@ -1655,6 +1690,13 @@ void ALandscapeProxy::Destroyed()
 		TotalTexturesToStreamForVisibleGrassMapRender -= NumTexturesToStreamForVisibleGrassMapRender;
 		NumTexturesToStreamForVisibleGrassMapRender = 0;
 	}
+
+	// unregister feature level changed handler for grass
+	if (FeatureLevelChangedDelegateHandle.IsValid())
+	{
+		World->RemoveOnFeatureLevelChangedHandler(FeatureLevelChangedDelegateHandle);
+		FeatureLevelChangedDelegateHandle.Reset();
+	}
 }
 
 void ALandscapeProxy::GetSharedProperties(ALandscapeProxy* Landscape)
@@ -2420,6 +2462,7 @@ void LandscapeMaterialsParameterValuesGetter(FStaticParameterSet& OutStaticParam
 					if (TerrainLayerWeightParam.bOverride)
 					{
 						ParentParameter.WeightmapIndex = TerrainLayerWeightParam.WeightmapIndex;
+						ParentParameter.bWeightBasedBlend = TerrainLayerWeightParam.bWeightBasedBlend;
 					}
 				}
 			}
@@ -2475,6 +2518,7 @@ ALandscapeProxy::~ALandscapeProxy()
 	NumTexturesToStreamForVisibleGrassMapRender = 0;
 #endif
 }
+
 //
 // ALandscapeMeshProxyActor
 //
diff --git a/Engine/Source/Runtime/Landscape/Private/LandscapeEdit.cpp b/Engine/Source/Runtime/Landscape/Private/LandscapeEdit.cpp
index 7b84abba2c9c..cb916835a9ae 100644
--- a/Engine/Source/Runtime/Landscape/Private/LandscapeEdit.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/LandscapeEdit.cpp
@@ -52,6 +52,7 @@ LandscapeEdit.cpp: Landscape editing
 #include "ScopedTransaction.h"
 #endif
 #include "Algo/Count.h"
+#include "Serialization/MemoryWriter.h"
 
 DEFINE_LOG_CATEGORY(LogLandscape);
 
@@ -125,6 +126,7 @@ ULandscapeMaterialInstanceConstant* ALandscapeProxy::GetLayerThumbnailMIC(UMater
 
 	ULandscapeMaterialInstanceConstant* MaterialInstance = NewObject<ULandscapeMaterialInstanceConstant>(GetTransientPackage());
 	MaterialInstance->bIsLayerThumbnail = true;
+	MaterialInstance->bMobile = false;
 	MaterialInstance->SetParentEditorOnly(LandscapeMaterial);
 
 	FStaticParameterSet StaticParameters;
@@ -155,7 +157,7 @@ ULandscapeMaterialInstanceConstant* ALandscapeProxy::GetLayerThumbnailMIC(UMater
 	return MaterialInstance;
 }
 
-UMaterialInstanceConstant* ULandscapeComponent::GetCombinationMaterial(bool bMobile /*= false*/)
+UMaterialInstanceConstant* ULandscapeComponent::GetCombinationMaterial(const TArray<FWeightmapLayerAllocationInfo>& Allocations, bool bMobile /*= false*/) const
 {
 	check(GIsEditor);
 
@@ -189,8 +191,7 @@ UMaterialInstanceConstant* ULandscapeComponent::GetCombinationMaterial(bool bMob
 	if (ensure(MaterialToUse != nullptr))
 	{
 		ALandscapeProxy* Proxy = GetLandscapeProxy();
-		FString LayerKey = GetLayerAllocationKey(MaterialToUse, bMobile);
-		//UE_LOG(LogLandscape, Log, TEXT("Looking for key %s"), *LayerKey);
+		FString LayerKey = GetLayerAllocationKey(Allocations, MaterialToUse, bMobile);
 
 		// Find or set a matching MIC in the Landscape's map.
 		UMaterialInstanceConstant* CombinationMaterialInstance = Proxy->MaterialInstanceConstantMap.FindRef(*LayerKey);
@@ -198,7 +199,9 @@ UMaterialInstanceConstant* ULandscapeComponent::GetCombinationMaterial(bool bMob
 		{
 			FlushRenderingCommands();
 
-			CombinationMaterialInstance = NewObject<ULandscapeMaterialInstanceConstant>(GetOutermost());
+			ULandscapeMaterialInstanceConstant* LandscapeCombinationMaterialInstance = NewObject<ULandscapeMaterialInstanceConstant>(GetOutermost());
+			LandscapeCombinationMaterialInstance->bMobile = bMobile;
+			CombinationMaterialInstance = LandscapeCombinationMaterialInstance;
 			UE_LOG(LogLandscape, Log, TEXT("Looking for key %s, making new combination %s"), *LayerKey, *CombinationMaterialInstance->GetName());
 			Proxy->MaterialInstanceConstantMap.Add(*LayerKey, CombinationMaterialInstance);
 			CombinationMaterialInstance->SetParentEditorOnly(MaterialToUse);
@@ -210,12 +213,12 @@ UMaterialInstanceConstant* ULandscapeComponent::GetCombinationMaterial(bool bMob
 			}
 
 			FStaticParameterSet StaticParameters;
-			for (const FWeightmapLayerAllocationInfo& Allocation : WeightmapLayerAllocations)
+			for (const FWeightmapLayerAllocationInfo& Allocation : Allocations)
 			{
 				if (Allocation.LayerInfo)
 				{
 					const FName LayerParameter = (Allocation.LayerInfo == ALandscapeProxy::VisibilityLayer) ? UMaterialExpressionLandscapeVisibilityMask::ParameterName : Allocation.LayerInfo->LayerName;
-					StaticParameters.TerrainLayerWeightParameters.Add(FStaticTerrainLayerWeightParameter(LayerParameter, Allocation.WeightmapTextureIndex, true, FGuid()));
+					StaticParameters.TerrainLayerWeightParameters.Add(FStaticTerrainLayerWeightParameter(LayerParameter, Allocation.WeightmapTextureIndex, true, FGuid(), !Allocation.LayerInfo->bNoWeightBlend));
 				}
 			}
 			CombinationMaterialInstance->UpdateStaticPermutation(StaticParameters);
@@ -233,7 +236,7 @@ void ULandscapeComponent::UpdateMaterialInstances_Internal(FMaterialUpdateContex
 	check(GIsEditor);
 
 	// Find or set a matching MIC in the Landscape's map.
-	UMaterialInstanceConstant* CombinationMaterialInstance = GetCombinationMaterial(false);
+	UMaterialInstanceConstant* CombinationMaterialInstance = GetCombinationMaterial(WeightmapLayerAllocations, false);
 
 	if (CombinationMaterialInstance != nullptr)
 	{
@@ -307,6 +310,12 @@ void ULandscapeComponent::UpdateMaterialInstances_Internal(FMaterialUpdateContex
 		MaterialInstances.Empty(1);
 		MaterialInstances.Add(nullptr);
 	}
+
+	// Update mobile combination material
+	{
+		GenerateMobileWeightmapLayerAllocations();
+		MobileCombinationMaterialInstance = GetCombinationMaterial(MobileWeightmapLayerAllocations, true);
+	}
 }
 
 void ULandscapeComponent::UpdateMaterialInstances()
@@ -539,7 +548,7 @@ void ULandscapeComponent::FixupWeightmaps()
 				UMaterialInstanceConstant* CombinationMaterialInstance = Cast<UMaterialInstanceConstant>(GetMaterialInstance(0, false)->Parent);
 				if (CombinationMaterialInstance)
 				{
-					Proxy->MaterialInstanceConstantMap.Add(*GetLayerAllocationKey(CombinationMaterialInstance->Parent), CombinationMaterialInstance);
+					Proxy->MaterialInstanceConstantMap.Add(*GetLayerAllocationKey(WeightmapLayerAllocations, CombinationMaterialInstance->Parent), CombinationMaterialInstance);
 				}
 			}
 		}
@@ -4909,147 +4918,191 @@ bool ALandscapeStreamingProxy::IsValidLandscapeActor(ALandscape* Landscape)
 	return false;
 }
 
-struct FMobileLayerAllocation
+/* Returns the list of layer names relevant to mobile platforms. Walks the material tree following feature level switch nodes. */
+static void GetAllMobileRelevantLayerNames(TSet<FName>& OutLayerNames, UMaterial* InMaterial)
 {
-	FWeightmapLayerAllocationInfo Allocation;
+	TArray<FMaterialParameterInfo> ParameterInfos;
+	TArray<FGuid> ParameterIds;
 
-	FMobileLayerAllocation(const FWeightmapLayerAllocationInfo& InAllocation)
-		: Allocation(InAllocation)
+	TArray<UMaterialExpression*> ES2MobileExpressions;
+	InMaterial->GetAllReferencedExpressions(ES2MobileExpressions, nullptr, ERHIFeatureLevel::ES2);
+	TArray<UMaterialExpression*> ES31Expressions;
+	InMaterial->GetAllReferencedExpressions(ES31Expressions, nullptr, ERHIFeatureLevel::ES3_1);
+
+	TArray<UMaterialExpression*> MobileExpressions = MoveTemp(ES2MobileExpressions);
+	for (UMaterialExpression* Expression : ES31Expressions)
 	{
+		MobileExpressions.AddUnique(Expression);
 	}
 
-	friend bool operator<(const FMobileLayerAllocation& Lhs, const FMobileLayerAllocation& Rhs)
+	for (UMaterialExpression* Expression : MobileExpressions)
 	{
-		ULandscapeLayerInfoObject* LhsLayerInfo = Lhs.Allocation.LayerInfo;
-		ULandscapeLayerInfoObject* RhsLayerInfo = Rhs.Allocation.LayerInfo;
+		UMaterialExpressionLandscapeLayerWeight* LayerWeightExpression = Cast<UMaterialExpressionLandscapeLayerWeight>(Expression);
+		UMaterialExpressionLandscapeLayerSwitch* LayerSwitchExpression = Cast<UMaterialExpressionLandscapeLayerSwitch>(Expression);
+		UMaterialExpressionLandscapeLayerSample* LayerSampleExpression = Cast<UMaterialExpressionLandscapeLayerSample>(Expression);
+		UMaterialExpressionLandscapeLayerBlend*	LayerBlendExpression = Cast<UMaterialExpressionLandscapeLayerBlend>(Expression);
+		UMaterialExpressionLandscapeVisibilityMask* VisibilityMaskExpression = Cast<UMaterialExpressionLandscapeVisibilityMask>(Expression);
+
+		FMaterialParameterInfo BaseParameterInfo;
+		BaseParameterInfo.Association = EMaterialParameterAssociation::GlobalParameter;
+		BaseParameterInfo.Index = INDEX_NONE;
+
+		if(LayerWeightExpression != nullptr)
+		{
+			LayerWeightExpression->GetAllParameterInfo(ParameterInfos, ParameterIds, BaseParameterInfo);
+		}
+		if (LayerSwitchExpression != nullptr)
+		{
+			LayerSwitchExpression->GetAllParameterInfo(ParameterInfos, ParameterIds, BaseParameterInfo);
+		}
+		if (LayerSampleExpression != nullptr)
+		{
+			LayerSampleExpression->GetAllParameterInfo(ParameterInfos, ParameterIds, BaseParameterInfo);
+		}
+		if (LayerBlendExpression != nullptr)
+		{
+			LayerBlendExpression->GetAllParameterInfo(ParameterInfos, ParameterIds, BaseParameterInfo);
+		}
+		if (VisibilityMaskExpression != nullptr)
+		{
+			VisibilityMaskExpression->GetAllParameterInfo(ParameterInfos, ParameterIds, BaseParameterInfo);
+		}
+	}
+
+	for (FMaterialParameterInfo& Info : ParameterInfos)
+	{
+		OutLayerNames.Add(Info.Name);
+	}
+}
+
+void ULandscapeComponent::GenerateMobileWeightmapLayerAllocations()
+{
+	TSet<FName> LayerNames;
+	GetAllMobileRelevantLayerNames(LayerNames, GetLandscapeMaterial()->GetMaterial());
+	MobileWeightmapLayerAllocations = WeightmapLayerAllocations.FilterByPredicate([&](const FWeightmapLayerAllocationInfo& Allocation) -> bool 
+		{
+			return Allocation.LayerInfo && LayerNames.Contains(Allocation.LayerInfo == ALandscapeProxy::VisibilityLayer ? UMaterialExpressionLandscapeVisibilityMask::ParameterName : Allocation.GetLayerName());
+		}
+	);
+	MobileWeightmapLayerAllocations.StableSort(([&](const FWeightmapLayerAllocationInfo& A, const FWeightmapLayerAllocationInfo& B) -> bool
+	{
+		ULandscapeLayerInfoObject* LhsLayerInfo = A.LayerInfo;
+		ULandscapeLayerInfoObject* RhsLayerInfo = B.LayerInfo;
 
 		if (!LhsLayerInfo && !RhsLayerInfo) return false; // equally broken :P
 		if (!LhsLayerInfo && RhsLayerInfo) return false; // broken layers sort to the end
 		if (!RhsLayerInfo && LhsLayerInfo) return true;
 
-		if (LhsLayerInfo == ALandscapeProxy::VisibilityLayer && RhsLayerInfo != ALandscapeProxy::VisibilityLayer) return true; // visibility layer to the front
+		// Sort visibility layer to the front
+		if (LhsLayerInfo == ALandscapeProxy::VisibilityLayer && RhsLayerInfo != ALandscapeProxy::VisibilityLayer) return true;
 		if (RhsLayerInfo == ALandscapeProxy::VisibilityLayer && LhsLayerInfo != ALandscapeProxy::VisibilityLayer) return false;
 
-		if (LhsLayerInfo->bNoWeightBlend && !RhsLayerInfo->bNoWeightBlend) return false; // non-blended layers sort to the end
-		if (RhsLayerInfo->bNoWeightBlend && !LhsLayerInfo->bNoWeightBlend) return true;
-
-		// TODO: If we want to support cleanly decaying a pc landscape for mobile
-		// we should probably add other sort criteria, e.g. coverage
-		// or e.g. add an "importance" to layerinfos and sort on that
+		// Sort non-weight blended layers to the front so if we have exactly 3 layers, the 3rd is definitely weight-based.
+		if (LhsLayerInfo->bNoWeightBlend && !RhsLayerInfo->bNoWeightBlend) return true;
+		if (RhsLayerInfo->bNoWeightBlend && !LhsLayerInfo->bNoWeightBlend) return false;
 
 		return false; // equal, preserve order
-	}
-};
+	}));
+}
 
 void ULandscapeComponent::GeneratePlatformPixelData()
 {
-	check(!IsTemplate())
+	check(!IsTemplate());
 
-	TArray<FMobileLayerAllocation> MobileLayerAllocations;
-	MobileLayerAllocations.Reserve(WeightmapLayerAllocations.Num());
-	for (const auto& Allocation : WeightmapLayerAllocations)
-	{
-		MobileLayerAllocations.Emplace(Allocation);
-	}
-	MobileLayerAllocations.StableSort();
-
-	// in the current mobile shader only 3 layers are supported (the 3rd only as a blended layer)
-	// so make sure we have a blended layer for layer 3 if possible
-	if (MobileLayerAllocations.Num() >= 3 &&
-		MobileLayerAllocations[2].Allocation.LayerInfo && MobileLayerAllocations[2].Allocation.LayerInfo->bNoWeightBlend)
-	{
-		int32 BlendedLayerToMove = INDEX_NONE;
-
-		// First try to swap layer 3 with an earlier blended layer
-		// this will allow both to work
-		for (int32 i = 1; i >= 0; --i)
-		{
-			if (MobileLayerAllocations[i].Allocation.LayerInfo && !MobileLayerAllocations[i].Allocation.LayerInfo->bNoWeightBlend)
-			{
-				BlendedLayerToMove = i;
-				break;
-			}
-		}
-
-		// otherwise swap layer 3 with the first weight-blended layer found
-		// as non-blended layers aren't supported for layer 3 it wasn't going to work anyway, might as well swap it out for one that will work
-		if (BlendedLayerToMove == INDEX_NONE)
-		{
-			// I wish I could specify a start index here, but it doesn't affect the result
-			BlendedLayerToMove = MobileLayerAllocations.IndexOfByPredicate([](const FMobileLayerAllocation& MobileAllocation){ return MobileAllocation.Allocation.LayerInfo && !MobileAllocation.Allocation.LayerInfo->bNoWeightBlend; });
-		}
-
-		if (BlendedLayerToMove != INDEX_NONE)
-		{
-			// Preserve order of all but the blended layer we're moving into slot 3
-			FMobileLayerAllocation TempAllocation = MoveTemp(MobileLayerAllocations[BlendedLayerToMove]);
-			MobileLayerAllocations.RemoveAt(BlendedLayerToMove, 1, false);
-			MobileLayerAllocations.Insert(MoveTemp(TempAllocation), 2);
-		}
-	}
+	GenerateMobileWeightmapLayerAllocations();
 
 	int32 WeightmapSize = (SubsectionSizeQuads + 1) * NumSubsections;
-	UTexture2D* NewWeightNormalmapTexture = GetLandscapeProxy()->CreateLandscapeTexture(WeightmapSize, WeightmapSize, TEXTUREGROUP_Terrain_Weightmap, TSF_BGRA8);
-	CreateEmptyTextureMips(NewWeightNormalmapTexture);
+
+	MobileWeightNormalmapTexture = GetLandscapeProxy()->CreateLandscapeTexture(WeightmapSize, WeightmapSize, TEXTUREGROUP_Terrain_Weightmap, TSF_BGRA8);
+	CreateEmptyTextureMips(MobileWeightNormalmapTexture);
+	TArray<UTexture2D*> MobileWeightmapTextures;
 
 	{
 		FLandscapeTextureDataInterface LandscapeData;
 
-		if (WeightmapTextures.Num() > 0)
+		// copy normals into B/A channels
+		LandscapeData.CopyTextureFromHeightmap(MobileWeightNormalmapTexture, 2, this, 2);
+		LandscapeData.CopyTextureFromHeightmap(MobileWeightNormalmapTexture, 3, this, 3);
+
+		UTexture2D* CurrentWeightmapTexture = MobileWeightNormalmapTexture;
+		MobileWeightmapTextures.Add(CurrentWeightmapTexture);
+		int32 CurrentChannel = 0;
+		int32 RemainingChannels = 2;
+
+		MobileBlendableLayerMask = 0;
+
+		bool bAtLeastOneWeightBasedBlend = MobileWeightmapLayerAllocations.FindByPredicate([&](const FWeightmapLayerAllocationInfo& Allocation) -> bool { return !Allocation.LayerInfo->bNoWeightBlend; }) != nullptr;
+
+		for (auto& Allocation : MobileWeightmapLayerAllocations)
 		{
-			int32 CurrentIdx = 0;
-			for (const auto& MobileAllocation : MobileLayerAllocations)
+			if (Allocation.LayerInfo)
 			{
-				// Only for valid Layers
-				if (MobileAllocation.Allocation.LayerInfo)
+				// If we can pack into 2 channels with the 3rd implied, track the mask for the weight blendable layers
+				if (bAtLeastOneWeightBasedBlend && MobileWeightmapLayerAllocations.Num() <= 3)
 				{
-					LandscapeData.CopyTextureFromWeightmap(NewWeightNormalmapTexture, CurrentIdx, this, MobileAllocation.Allocation.LayerInfo);
-					CurrentIdx++;
-					if (CurrentIdx >= 2) // Only support 2 layers in texture
+					// we don't need to create a new texture for the 3rd layer
+					if (RemainingChannels == 0)
 					{
 						break;
 					}
+
+					MobileBlendableLayerMask |= (!Allocation.LayerInfo->bNoWeightBlend ? (1 << CurrentChannel) : 0);
 				}
+
+				if (RemainingChannels == 0)
+				{
+
+					// create a new weightmap texture if we've run out of channels
+					CurrentChannel = 0;
+					RemainingChannels = 4;
+					CurrentWeightmapTexture = GetLandscapeProxy()->CreateLandscapeTexture(WeightmapSize, WeightmapSize, TEXTUREGROUP_Terrain_Weightmap, TSF_BGRA8);
+					CreateEmptyTextureMips(CurrentWeightmapTexture);
+					MobileWeightmapTextures.Add(CurrentWeightmapTexture);
+				}
+
+				LandscapeData.CopyTextureFromWeightmap(CurrentWeightmapTexture, CurrentChannel, this, Allocation.LayerInfo);
+				// update Allocation
+				Allocation.WeightmapTextureIndex = MobileWeightmapTextures.Num() - 1;
+				Allocation.WeightmapTextureChannel = CurrentChannel;
+				CurrentChannel++;
+				RemainingChannels--;
 			}
 		}
-
-		// copy normals into B/A channels.
-		LandscapeData.CopyTextureFromHeightmap(NewWeightNormalmapTexture, 2, this, 2);
-		LandscapeData.CopyTextureFromHeightmap(NewWeightNormalmapTexture, 3, this, 3);
 	}
 
-	NewWeightNormalmapTexture->PostEditChange();
+	for (int TextureIdx = 0; TextureIdx < MobileWeightmapTextures.Num(); TextureIdx++)
+	{
+		MobileWeightmapTextures[TextureIdx]->PostEditChange();
+	}
 
-	MobileWeightNormalmapTexture = NewWeightNormalmapTexture;
-
-	FLinearColor Masks[5];
+	FLinearColor Masks[4];
 	Masks[0] = FLinearColor(1, 0, 0, 0);
 	Masks[1] = FLinearColor(0, 1, 0, 0);
 	Masks[2] = FLinearColor(0, 0, 1, 0);
 	Masks[3] = FLinearColor(0, 0, 0, 1);
-	Masks[4] = FLinearColor(0, 0, 0, 0); // mask out layers 4+ altogether
+
 
 	if (!GIsEditor)
 	{
-		// This path is used by game mode running with uncooked data, eg Mobile Preview.
+		// This path is used by game mode running with uncooked data, eg standalone executable Mobile Preview.
 		// Game mode cannot create MICs, so we use a MaterialInstanceDynamic here.
-		UMaterialInstanceDynamic* NewMobileMaterialInstance = UMaterialInstanceDynamic::Create(MaterialInstances[0], GetOutermost());
-
-		MobileBlendableLayerMask = 0;
+		UMaterialInstanceDynamic* NewMobileMaterialInstance = UMaterialInstanceDynamic::Create(MobileCombinationMaterialInstance, GetOutermost());
 
 		// Set the layer mask
-		int32 CurrentIdx = 0;
-		for (const auto& MobileAllocation : MobileLayerAllocations)
+		for (const auto& Allocation : MobileWeightmapLayerAllocations)
 		{
-			const FWeightmapLayerAllocationInfo& Allocation = MobileAllocation.Allocation;
 			if (Allocation.LayerInfo)
 			{
 				FName LayerName = Allocation.LayerInfo == ALandscapeProxy::VisibilityLayer ? UMaterialExpressionLandscapeVisibilityMask::ParameterName : Allocation.LayerInfo->LayerName;
-				NewMobileMaterialInstance->SetVectorParameterValue(FName(*FString::Printf(TEXT("LayerMask_%s"), *LayerName.ToString())), Masks[FMath::Min(4, CurrentIdx)]);
-				MobileBlendableLayerMask |= (!Allocation.LayerInfo->bNoWeightBlend ? (1 << CurrentIdx) : 0);
-				CurrentIdx++;
+				NewMobileMaterialInstance->SetVectorParameterValue(FName(*FString::Printf(TEXT("LayerMask_%s"), *LayerName.ToString())), Masks[Allocation.WeightmapTextureChannel]);
 			}
 		}
+
+		for (int TextureIdx = 0; TextureIdx < MobileWeightmapTextures.Num(); TextureIdx++)
+		{
+			NewMobileMaterialInstance->SetTextureParameterValue(FName(*FString::Printf(TEXT("Weightmap%d"), TextureIdx)), MobileWeightmapTextures[TextureIdx]);
+		}
+		
 		MobileMaterialInterface = NewMobileMaterialInstance;
 	}
 	else
@@ -5057,27 +5110,26 @@ void ULandscapeComponent::GeneratePlatformPixelData()
 		// When cooking, we need to make a persistent MIC. In the editor we also do so in
 		// case we start a Cook in Editor operation, which will reuse the MIC we create now.
 
-		UMaterialInstanceConstant* CombinationMaterialInstance = GetCombinationMaterial(true);
+		MobileCombinationMaterialInstance = GetCombinationMaterial(MobileWeightmapLayerAllocations, true);
 		UMaterialInstanceConstant* NewMobileMaterialInstance = NewObject<ULandscapeMaterialInstanceConstant>(GetOutermost());
 
-		NewMobileMaterialInstance->SetParentEditorOnly(CombinationMaterialInstance);
-
-		MobileBlendableLayerMask = 0;
+		NewMobileMaterialInstance->SetParentEditorOnly(MobileCombinationMaterialInstance);
 
 		// Set the layer mask
-		int32 CurrentIdx = 0;
-		for (const auto& MobileAllocation : MobileLayerAllocations)
+		for (const auto& Allocation : MobileWeightmapLayerAllocations)
 		{
-			const FWeightmapLayerAllocationInfo& Allocation = MobileAllocation.Allocation;
 			if (Allocation.LayerInfo)
 			{
 				FName LayerName = Allocation.LayerInfo == ALandscapeProxy::VisibilityLayer ? UMaterialExpressionLandscapeVisibilityMask::ParameterName : Allocation.LayerInfo->LayerName;
-				NewMobileMaterialInstance->SetVectorParameterValueEditorOnly(FName(*FString::Printf(TEXT("LayerMask_%s"), *LayerName.ToString())), Masks[FMath::Min(4, CurrentIdx)]);
-				MobileBlendableLayerMask |= (!Allocation.LayerInfo->bNoWeightBlend ? (1 << CurrentIdx) : 0);
-				CurrentIdx++;
+				NewMobileMaterialInstance->SetVectorParameterValueEditorOnly(FName(*FString::Printf(TEXT("LayerMask_%s"), *LayerName.ToString())), Masks[Allocation.WeightmapTextureChannel]);
 			}
 		}
 
+		for (int TextureIdx = 0; TextureIdx < MobileWeightmapTextures.Num(); TextureIdx++)
+		{
+			NewMobileMaterialInstance->SetTextureParameterValueEditorOnly(FName(*FString::Printf(TEXT("Weightmap%d"), TextureIdx)), MobileWeightmapTextures[TextureIdx]);
+		}
+
 		NewMobileMaterialInstance->PostEditChange();
 
 		MobileMaterialInterface = NewMobileMaterialInstance;
diff --git a/Engine/Source/Runtime/Landscape/Private/LandscapeGrass.cpp b/Engine/Source/Runtime/Landscape/Private/LandscapeGrass.cpp
index aa468740a2bb..a8b5527ca4a1 100644
--- a/Engine/Source/Runtime/Landscape/Private/LandscapeGrass.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/LandscapeGrass.cpp
@@ -954,6 +954,11 @@ void ALandscapeProxy::RenderGrassMaps(const TArray<ULandscapeComponent*>& InLand
 	FLandscapeGrassWeightExporter Exporter(this, InLandscapeComponents, GrassTypes, true, MoveTemp(HeightMips));
 	Exporter.ApplyResults();
 }
+
+void ALandscapeProxy::OnFeatureLevelChanged(ERHIFeatureLevel::Type NewFeatureLevel)
+{
+	FlushGrassComponents();
+}
 #endif //WITH_EDITOR
 
 // the purpose of this class is to copy the lightmap from the terrain, and set the CoordinateScale and CoordinateBias to zero.
@@ -1339,12 +1344,12 @@ struct FGrassBuilderBase
 
 	int32 SqrtMaxInstances;
 
-	FGrassBuilderBase(ALandscapeProxy* Landscape, ULandscapeComponent* Component, const FGrassVariety& GrassVariety, int32 SqrtSubsections = 1, int32 SubX = 0, int32 SubY = 0, bool bEnableDensityScaling = true)
+	FGrassBuilderBase(ALandscapeProxy* Landscape, ULandscapeComponent* Component, const FGrassVariety& GrassVariety, ERHIFeatureLevel::Type FeatureLevel, int32 SqrtSubsections = 1, int32 SubX = 0, int32 SubY = 0, bool bEnableDensityScaling = true)
 	{
 		bHaveValidData = true;
 
 		const float DensityScale = bEnableDensityScaling ? CVarGrassDensityScale.GetValueOnAnyThread() : 1.0f;
-		GrassDensity = GrassVariety.GrassDensity * DensityScale;
+		GrassDensity = GrassVariety.GrassDensity.GetValueForFeatureLevel(FeatureLevel) * DensityScale;
 
 		DrawScale = Landscape->GetRootComponent()->RelativeScale3D;
 		DrawLoc = Landscape->GetActorLocation();
@@ -1465,8 +1470,8 @@ struct FAsyncGrassBuilder : public FGrassBuilderBase
 	TArray<FClusterNode> ClusterTree;
 	int32 OutOcclusionLayerNum;
 
-	FAsyncGrassBuilder(ALandscapeProxy* Landscape, ULandscapeComponent* Component, const ULandscapeGrassType* GrassType, const FGrassVariety& GrassVariety, UHierarchicalInstancedStaticMeshComponent* HierarchicalInstancedStaticMeshComponent, int32 SqrtSubsections, int32 SubX, int32 SubY, uint32 InHaltonBaseIndex)
-		: FGrassBuilderBase(Landscape, Component, GrassVariety, SqrtSubsections, SubX, SubY, GrassType->bEnableDensityScaling)
+	FAsyncGrassBuilder(ALandscapeProxy* Landscape, ULandscapeComponent* Component, const ULandscapeGrassType* GrassType, const FGrassVariety& GrassVariety, ERHIFeatureLevel::Type FeatureLevel, UHierarchicalInstancedStaticMeshComponent* HierarchicalInstancedStaticMeshComponent, int32 SqrtSubsections, int32 SubX, int32 SubY, uint32 InHaltonBaseIndex)
+		: FGrassBuilderBase(Landscape, Component, GrassVariety, FeatureLevel, SqrtSubsections, SubX, SubY, GrassType->bEnableDensityScaling)
 		, GrassData(Component, GrassType)
 		, Scaling(GrassVariety.Scaling)
 		, ScaleX(GrassVariety.ScaleX)
@@ -1680,7 +1685,7 @@ struct FAsyncGrassBuilder : public FGrassBuilderBase
 			if (InstanceTransforms.Num())
 			{
 				TotalInstances += InstanceTransforms.Num();
-				InstanceBuffer.AllocateInstances(InstanceTransforms.Num(), true);
+				InstanceBuffer.AllocateInstances(InstanceTransforms.Num(), EResizeBufferFlags::AllowSlackOnGrow | EResizeBufferFlags::AllowSlackOnReduce, true);
 				for (int32 InstanceIndex = 0; InstanceIndex < InstanceTransforms.Num(); InstanceIndex++)
 				{
 					const FMatrix& OutXForm = InstanceTransforms[InstanceIndex];
@@ -1733,7 +1738,7 @@ struct FAsyncGrassBuilder : public FGrassBuilderBase
 				InstanceTransforms.AddUninitialized(NumKept);
 				TotalInstances += NumKept;
 				{
-					InstanceBuffer.AllocateInstances(NumKept, true);
+					InstanceBuffer.AllocateInstances(NumKept, EResizeBufferFlags::AllowSlackOnGrow | EResizeBufferFlags::AllowSlackOnReduce, true);
 					int32 InstanceIndex = 0;
 					int32 OutInstanceIndex = 0;
 					for (int32 xStart = 0; xStart < SqrtMaxInstances; xStart++)
@@ -2040,6 +2045,7 @@ void ALandscapeProxy::UpdateGrass(const TArray<FVector>& Cameras, bool bForceSyn
 				}
 			}
 #endif
+			ERHIFeatureLevel::Type FeatureLevel = World->Scene->GetFeatureLevel();
 
 			int32 NumCompsCreated = 0;
 			for (int32 ComponentIndex = 0; ComponentIndex < LandscapeComponents.Num(); ComponentIndex++)
@@ -2074,10 +2080,11 @@ void ALandscapeProxy::UpdateGrass(const TArray<FVector>& Cameras, bool bForceSyn
 						for (auto& GrassVariety : GrassType->GrassVarieties)
 						{
 							GrassVarietyIndex++;
-							if (GrassVariety.GrassMesh && GrassVariety.GrassDensity > 0.0f && GrassVariety.EndCullDistance > 0)
+							int32 EndCullDistance = GrassVariety.EndCullDistance.GetValueForFeatureLevel(FeatureLevel);
+							if (GrassVariety.GrassMesh && GrassVariety.GrassDensity.GetValueForFeatureLevel(FeatureLevel) > 0.0f && EndCullDistance > 0)
 							{
-								float MustHaveDistance = GuardBand * (float)GrassVariety.EndCullDistance * CullDistanceScale;
-								float DiscardDistance = DiscardGuardBand * (float)GrassVariety.EndCullDistance * CullDistanceScale;
+								float MustHaveDistance = GuardBand * (float)EndCullDistance * CullDistanceScale;
+								float DiscardDistance = DiscardGuardBand * (float)EndCullDistance * CullDistanceScale;
 
 								bool bUseHalton = !GrassVariety.bUseGrid;
 
@@ -2086,7 +2093,7 @@ void ALandscapeProxy::UpdateGrass(const TArray<FVector>& Cameras, bool bForceSyn
 									continue;
 								}
 
-								FGrassBuilderBase ForSubsectionMath(this, Component, GrassVariety);
+								FGrassBuilderBase ForSubsectionMath(this, Component, GrassVariety, FeatureLevel);
 
 								int32 SqrtSubsections = 1;
 
@@ -2264,8 +2271,8 @@ void ALandscapeProxy::UpdateGrass(const TArray<FVector>& Cameras, bool bForceSyn
 										}
 										else
 										{
-											HierarchicalInstancedStaticMeshComponent->InstanceStartCullDistance = GrassVariety.StartCullDistance * CullDistanceScale;
-											HierarchicalInstancedStaticMeshComponent->InstanceEndCullDistance = GrassVariety.EndCullDistance * CullDistanceScale;
+											HierarchicalInstancedStaticMeshComponent->InstanceStartCullDistance = GrassVariety.StartCullDistance.GetValueForFeatureLevel(FeatureLevel) * CullDistanceScale;
+											HierarchicalInstancedStaticMeshComponent->InstanceEndCullDistance = GrassVariety.EndCullDistance.GetValueForFeatureLevel(FeatureLevel) * CullDistanceScale;
 										}
 
 										//@todo - take the settings from a UFoliageType object.  For now, disable distance field lighting on grass so we don't hitch.
@@ -2293,7 +2300,7 @@ void ALandscapeProxy::UpdateGrass(const TArray<FVector>& Cameras, bool bForceSyn
 												check(HaltonBaseIndex > (uint32)MaxInstancesSub);
 												HaltonIndexForSub = HaltonBaseIndex - (uint32)MaxInstancesSub;
 											}
-											Builder = new FAsyncGrassBuilder(this, Component, GrassType, GrassVariety, HierarchicalInstancedStaticMeshComponent, SqrtSubsections, SubX, SubY, HaltonIndexForSub);
+											Builder = new FAsyncGrassBuilder(this, Component, GrassType, GrassVariety, FeatureLevel, HierarchicalInstancedStaticMeshComponent, SqrtSubsections, SubX, SubY, HaltonIndexForSub);
 										}
 
 										if (Builder->bHaveValidData)
diff --git a/Engine/Source/Runtime/Landscape/Private/LandscapeRender.cpp b/Engine/Source/Runtime/Landscape/Private/LandscapeRender.cpp
index b5b3b91dbafa..b39a72c0c9ab 100644
--- a/Engine/Source/Runtime/Landscape/Private/LandscapeRender.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/LandscapeRender.cpp
@@ -43,7 +43,7 @@ FAutoConsoleVariableRef CVarLandscapeMeshLODBias(
 	GLandscapeMeshLODBias,
 	TEXT("LOD bias for landscape/terrain meshes."),
 	ECVF_Scalability
-	);
+);
 
 float GLandscapeLOD0DistributionScale = 1.f;
 FAutoConsoleVariableRef CVarLandscapeLOD0DistributionScale(
@@ -51,7 +51,7 @@ FAutoConsoleVariableRef CVarLandscapeLOD0DistributionScale(
 	GLandscapeLOD0DistributionScale,
 	TEXT("Multiplier for the landscape LOD0DistributionSetting property"),
 	ECVF_Scalability
-	);
+);
 
 float GLandscapeLODDistributionScale = 1.f;
 FAutoConsoleVariableRef CVarLandscapeLODDistributionScale(
@@ -83,6 +83,26 @@ static void OnLODDistributionScaleChanged(IConsoleVariable* CVar)
 		LandscapeComponent->MarkRenderStateDirty();
 	}
 }
+
+int32 GVarDumpLandscapeLODsCurrentFrame = 0;
+bool GVarDumpLandscapeLODs = false;
+
+static void OnDumpLandscapeLODs(const TArray< FString >& Args)
+{
+	if (Args.Num() >= 1)
+	{
+		GVarDumpLandscapeLODs = FCString::Atoi(*Args[0]) == 0 ? false : true;
+	}
+
+	// Add some buffer to be able to correctly catch the frame during the rendering
+	GVarDumpLandscapeLODsCurrentFrame = GVarDumpLandscapeLODs ? GFrameNumberRenderThread + 3 : INDEX_NONE;
+}
+
+static FAutoConsoleCommand CVarDumpLandscapeLODs(
+	TEXT("Landscape.DumpLODs"),
+	TEXT("Will dump the current status of LOD value and current texture streaming status"),
+	FConsoleCommandWithArgsDelegate::CreateStatic(&OnDumpLandscapeLODs)
+);
 #endif
 
 #if WITH_EDITOR
@@ -96,7 +116,7 @@ FAutoConsoleVariableRef CVarLandscapeDebugViewMode(
 #endif
 
 /*------------------------------------------------------------------------------
-	Forsyth algorithm for cache optimizing index buffers.
+Forsyth algorithm for cache optimizing index buffers.
 ------------------------------------------------------------------------------*/
 
 // Forsyth algorithm to optimize post-transformed vertex cache
@@ -457,17 +477,17 @@ struct FLandscapeDebugOptions
 		, bDisableStatic(false)
 		, CombineMode(eCombineMode_Default)
 		, PatchesConsoleCommand(
-		TEXT("Landscape.Patches"),
-		TEXT("Show/hide Landscape patches"),
-		FConsoleCommandDelegate::CreateRaw(this, &FLandscapeDebugOptions::Patches))
+			TEXT("Landscape.Patches"),
+			TEXT("Show/hide Landscape patches"),
+			FConsoleCommandDelegate::CreateRaw(this, &FLandscapeDebugOptions::Patches))
 		, StaticConsoleCommand(
-		TEXT("Landscape.Static"),
-		TEXT("Enable/disable Landscape static drawlists"),
-		FConsoleCommandDelegate::CreateRaw(this, &FLandscapeDebugOptions::Static))
+			TEXT("Landscape.Static"),
+			TEXT("Enable/disable Landscape static drawlists"),
+			FConsoleCommandDelegate::CreateRaw(this, &FLandscapeDebugOptions::Static))
 		, CombineConsoleCommand(
-		TEXT("Landscape.Combine"),
-		TEXT("Set landscape component combining mode : 0 = Default, 1 = Combine All, 2 = Disabled"),
-		FConsoleCommandWithArgsDelegate::CreateRaw(this, &FLandscapeDebugOptions::Combine))
+			TEXT("Landscape.Combine"),
+			TEXT("Set landscape component combining mode : 0 = Default, 1 = Combine All, 2 = Disabled"),
+			FConsoleCommandWithArgsDelegate::CreateRaw(this, &FLandscapeDebugOptions::Combine))
 	{
 	}
 
@@ -803,16 +823,15 @@ FLandscapeComponentSceneProxy::FLandscapeComponentSceneProxy(ULandscapeComponent
 
 	const int8 SubsectionSizeLog2 = FMath::CeilLogTwo(InComponent->SubsectionSizeQuads + 1);
 	SharedBuffersKey = (SubsectionSizeLog2 & 0xf) | ((NumSubsections & 0xf) << 4) |
-	                   (FeatureLevel <= ERHIFeatureLevel::ES3_1 ? 0 : 1 << 30) | (XYOffsetmapTexture == nullptr ? 0 : 1 << 31);
+		(FeatureLevel <= ERHIFeatureLevel::ES3_1 ? 0 : 1 << 30) | (XYOffsetmapTexture == nullptr ? 0 : 1 << 31);
 
 	bSupportsHeightfieldRepresentation = true;
 
 #if WITH_EDITOR
 	for (auto& Allocation : InComponent->WeightmapLayerAllocations)
 	{
-		if (Allocation.LayerInfo != nullptr && Allocation.LayerInfo != ALandscapeProxy::VisibilityLayer)
+		if (Allocation.LayerInfo != nullptr)
 		{
-			// Use black for hole layer
 			LayerColors.Add(Allocation.LayerInfo->LayerUsageDebugColor);
 		}
 	}
@@ -895,7 +914,7 @@ void FLandscapeComponentSceneProxy::CreateRenderThreadResources()
 
 #if WITH_EDITOR
 	// Create MeshBatch for grass rendering
-	if(SharedBuffers->GrassIndexBuffer)
+	if (SharedBuffers->GrassIndexBuffer)
 	{
 		const int32 NumMips = FMath::CeilLogTwo(SubsectionSizeVerts);
 		GrassMeshBatch.Elements.Empty(NumMips);
@@ -1067,7 +1086,7 @@ FPrimitiveViewRelevance FLandscapeComponentSceneProxy::GetViewRelevance(const FS
 #else
 		IsSelected() ||
 #endif
-		 !IsStaticPathAvailable())
+		!IsStaticPathAvailable())
 	{
 		Result.bDynamicRelevance = true;
 	}
@@ -1136,8 +1155,8 @@ FLightInteraction FLandscapeComponentSceneProxy::FLandscapeLCI::GetInteraction(c
 {
 	// ask base class
 	ELightInteractionType LightInteraction = GetStaticInteraction(LightSceneProxy, IrrelevantLights);
-	
-	if(LightInteraction != LIT_MAX)
+
+	if (LightInteraction != LIT_MAX)
 	{
 		return FLightInteraction(LightInteraction);
 	}
@@ -1200,19 +1219,19 @@ void FLandscapeComponentSceneProxy::OnTransformChanged()
 		1.f / (float)SubsectionSizeQuads,
 		SectionBase.X,
 		SectionBase.Y
-		);
+	);
 	LandscapeParams.SubsectionOffsetParams = FVector4(
 		HeightmapSubsectionOffsetU,
 		HeightmapSubsectionOffsetV,
 		WeightmapSubsectionOffset,
 		SubsectionSizeQuads
-		);
+	);
 	LandscapeParams.LightmapSubsectionOffsetParams = FVector4(
 		LightmapExtendFactorX,
 		LightmapExtendFactorY,
 		0,
 		0
-		);
+	);
 
 	LandscapeUniformShaderParameters.SetContents(LandscapeParams);
 }
@@ -1255,7 +1274,7 @@ void FLandscapeComponentSceneProxy::BuildDynamicMeshElement(const FViewCustomDat
 	OutMeshBatch.LCI = ComponentLightInfo.Get();
 	OutMeshBatch.ReverseCulling = IsLocalToWorldDeterminantNegative();
 	OutMeshBatch.CastShadow = InToolMesh ? false : true;
-	OutMeshBatch.bUseAsOccluder =  ShouldUseAsOccluder() && GetScene().GetShadingPath() == EShadingPath::Deferred && !IsMovable();
+	OutMeshBatch.bUseAsOccluder = ShouldUseAsOccluder() && GetScene().GetShadingPath() == EShadingPath::Deferred && !IsMovable();
 	OutMeshBatch.bUseForMaterial = true;
 	OutMeshBatch.Type = bCurrentRequiresAdjacencyInformation ? PT_12_ControlPointPatchList : PT_TriangleList;
 	OutMeshBatch.LODIndex = 0;
@@ -1319,7 +1338,7 @@ void FLandscapeComponentSceneProxy::BuildDynamicMeshElement(const FViewCustomDat
 	{
 		const int8 CurrentLODIndex = InPrimitiveCustomData->SubSections[0].BatchElementCurrentLOD;
 
-		FMeshBatchElement BatchElement; 
+		FMeshBatchElement BatchElement;
 
 		if (InToolMesh)
 		{
@@ -1672,7 +1691,7 @@ void FLandscapeComponentSceneProxy::CalculateBatchElementLOD(const FSceneView& I
 				CalculateLODFromScreenSize(View, SubSectionLODData.ScreenSizeSquared, InViewLODScale, SubSectionIndex, InOutLODData);
 				check(SubSectionLODData.fBatchElementCurrentLOD != -1.0f);
 
-				InOutLODData.ShaderCurrentLOD.Component(SubSectionIndex) = SubSectionLODData.fBatchElementCurrentLOD;				
+				InOutLODData.ShaderCurrentLOD.Component(SubSectionIndex) = SubSectionLODData.fBatchElementCurrentLOD;
 
 				// Determine if we should use the combined batch or not
 				if (ComponentScreenSize > ComponentSquaredScreenSizeToUseSubSections * SquaredViewLODScale)
@@ -1795,7 +1814,7 @@ int8 FLandscapeComponentSceneProxy::GetLODFromScreenSize(float InScreenSizeSquar
 
 		return SelectedLODIndex;
 	}
-	
+
 	return INDEX_NONE;
 }
 
@@ -1808,7 +1827,7 @@ void* FLandscapeComponentSceneProxy::InitViewCustomData(const FSceneView& InView
 	PrimitiveCustomDataIndex = GetPrimitiveSceneInfo()->GetIndex();
 	const FSceneView& View = GetLODView(InView);
 
-	FViewCustomDataLOD* LODData = new (InCustomDataMemStack) FViewCustomDataLOD();
+	FViewCustomDataLOD* LODData = (FViewCustomDataLOD*)new(InCustomDataMemStack) FViewCustomDataLOD();
 
 	check(InMeshScreenSizeSquared <= 1.0f);
 	LODData->ComponentScreenSize = InMeshScreenSizeSquared;
@@ -1837,7 +1856,7 @@ void* FLandscapeComponentSceneProxy::InitViewCustomData(const FSceneView& InView
 				ComputeStaticBatchIndexToRender(*LODData, i);
 			}
 		}
-	}	
+	}
 
 	// Mobile use a different way of calculating the Bias
 	if (GetScene().GetFeatureLevel() >= ERHIFeatureLevel::SM4)
@@ -1861,7 +1880,7 @@ void FLandscapeComponentSceneProxy::ComputeTessellationFalloffShaderValues(const
 		if (UseTessellationComponentScreenSizeFalloff)
 		{
 			float MaxTesselationDistance = ComputeBoundsDrawDistance(FMath::Sqrt(TessellationComponentSquaredScreenSize), LandscapeComponent->Bounds.SphereRadius / 2.0f, InViewProjectionMatrix);
-			float FallOffStartingDistance = FMath::Min(ComputeBoundsDrawDistance(FMath::Sqrt(FMath::Min(FMath::Square(TessellationComponentScreenSizeFalloff), TessellationComponentSquaredScreenSize)), LandscapeComponent->Bounds.SphereRadius / 2.0f , InViewProjectionMatrix) - MaxTesselationDistance, MaxTesselationDistance);
+			float FallOffStartingDistance = FMath::Min(ComputeBoundsDrawDistance(FMath::Sqrt(FMath::Min(FMath::Square(TessellationComponentScreenSizeFalloff), TessellationComponentSquaredScreenSize)), LandscapeComponent->Bounds.SphereRadius / 2.0f, InViewProjectionMatrix) - MaxTesselationDistance, MaxTesselationDistance);
 
 			// Calculate the falloff using a = C - K * d by sending C & K into the shader
 			OutC = MaxTesselationDistance / (MaxTesselationDistance - FallOffStartingDistance);
@@ -1912,15 +1931,15 @@ struct SubSectionData
 
 // SubSectionIndex, NeighborIndex
 static const SubSectionData SubSectionValues[4][4] = { { SubSectionData(0, 1, false), SubSectionData(1, 0, false), SubSectionData(1, 0, true), SubSectionData(0, 1, true) },
-													   { SubSectionData(0, 1, false), SubSectionData(-1, 0, true), SubSectionData(-1, 0, false), SubSectionData(0, 1, true) },
-													   { SubSectionData(0, -1, true), SubSectionData(1, 0, false), SubSectionData(1, 0, true), SubSectionData(0, -1, false) },
-													   { SubSectionData(0, -1, true), SubSectionData(-1, 0, true), SubSectionData(-1, 0, false), SubSectionData(0, -1, false) } };
+{ SubSectionData(0, 1, false), SubSectionData(-1, 0, true), SubSectionData(-1, 0, false), SubSectionData(0, 1, true) },
+{ SubSectionData(0, -1, true), SubSectionData(1, 0, false), SubSectionData(1, 0, true), SubSectionData(0, -1, false) },
+{ SubSectionData(0, -1, true), SubSectionData(-1, 0, true), SubSectionData(-1, 0, false), SubSectionData(0, -1, false) } };
 
 
 float FLandscapeComponentSceneProxy::GetNeighborLOD(const FSceneView& InView, float InBatchElementCurrentLOD, int8 InNeighborIndex, int8 InSubSectionX, int8 InSubSectionY, int8 InCurrentSubSectionIndex) const
 {
 	float NeighborLOD = InBatchElementCurrentLOD;
-	
+
 	// Assume no sub section initialization
 	bool InsideComponent = false;
 	int32 PrimitiveDataIndex = PrimitiveCustomDataIndex;
@@ -1945,14 +1964,14 @@ float FLandscapeComponentSceneProxy::GetNeighborLOD(const FSceneView& InView, fl
 	if (!InsideComponent)
 	{
 		Neighbor = Neighbors[InNeighborIndex];
-		
+
 		if (Neighbor != nullptr)
 		{
 			PrimitiveDataIndex = Neighbor->PrimitiveCustomDataIndex;
 		}
 		else
 		{
-			DesiredSubSectionIndex = CurrentSubSectionIndex; 
+			DesiredSubSectionIndex = CurrentSubSectionIndex;
 		}
 	}
 
@@ -2015,7 +2034,7 @@ float FLandscapeComponentSceneProxy::GetNeighborLOD(const FSceneView& InView, fl
 			{
 				NeighborLOD = SubSectionLODData.fBatchElementCurrentLOD;
 			}
-		}		
+		}
 	}
 
 	return NeighborLOD;
@@ -2027,7 +2046,7 @@ void FLandscapeComponentSceneProxy::ComputeStaticBatchIndexToRender(FViewCustomD
 
 	SubSectionLODData.StaticBatchElementIndexToRender = INDEX_NONE;
 	SubSectionLODData.StaticBatchElementIndexToRender = ConvertBatchElementLODToBatchElementIndex(SubSectionLODData.BatchElementCurrentLOD, OutLODData.UseCombinedMeshBatch) + SubSectionIndex;
-	check(SubSectionLODData.StaticBatchElementIndexToRender != INDEX_NONE);	
+	check(SubSectionLODData.StaticBatchElementIndexToRender != INDEX_NONE);
 }
 
 void FLandscapeComponentSceneProxy::PostInitViewCustomData(const FSceneView& InView, void* InViewCustomData)
@@ -2045,7 +2064,30 @@ void FLandscapeComponentSceneProxy::PostInitViewCustomData(const FSceneView& InV
 			FViewCustomDataSubSectionLOD& SubSectionLODData = CurrentLODData->SubSections[SubSectionIndex];
 			GetShaderCurrentNeighborLOD(InView, SubSectionLODData.fBatchElementCurrentLOD, NumSubsections > 1 ? SubX : INDEX_NONE, NumSubsections > 1 ? SubY : INDEX_NONE, SubSectionIndex, SubSectionLODData.ShaderCurrentNeighborLOD);
 		}
-	}	
+	}
+
+#if !UE_BUILD_SHIPPING
+	if (GVarDumpLandscapeLODs && GFrameNumberRenderThread == GVarDumpLandscapeLODsCurrentFrame)
+	{
+		if (NumSubsections == 1)
+		{
+			UE_LOG(LogLandscape, Warning, TEXT("\nComponent: [%s] -> MeshBatchLOD: %d, ComponentScreenSize: %f, ShaderCurrentLOD: %s, LODTessellation: %s\nHeightmap Texture Name: %s, Heightmap Streamed Mip: %d\nSubSections:\n|0| IndexToRender: %d, fLOD: %f, LOD: %d, NeighborLOD: %s\n"), *SectionBase.ToString(),
+				CurrentLODData->StaticMeshBatchLOD, CurrentLODData->ComponentScreenSize, *CurrentLODData->ShaderCurrentLOD.ToString(), *CurrentLODData->LodTessellationParams.ToString(),
+				HeightmapTexture != nullptr ? *HeightmapTexture->GetFullName() : TEXT("Invalid"), HeightmapTexture != nullptr ? ((FTexture2DResource*)HeightmapTexture->Resource)->GetCurrentFirstMip() : INDEX_NONE,
+				CurrentLODData->SubSections[0].StaticBatchElementIndexToRender, CurrentLODData->SubSections[0].fBatchElementCurrentLOD, CurrentLODData->SubSections[0].BatchElementCurrentLOD, *CurrentLODData->SubSections[0].ShaderCurrentNeighborLOD.ToString());
+		}
+		else
+		{
+			UE_LOG(LogLandscape, Warning, TEXT("\nComponent: [%s] -> MeshBatchLOD: %d, ComponentScreenSize: %f, UseCombinedMeshBatch: %d, ShaderCurrentLOD: %s, LODTessellation: %s\nHeightmap Texture Name: %s, Heightmap Streamed Mip: %d\nSubSections:\n|0| IndexToRender: %d, fLOD: %f, LOD: %d, NeighborLOD: %s\n|1| IndexToRender: %d, fLOD: %f, LOD: %d, NeighborLOD: %s\n|2| IndexToRender: %d, fLOD: %f, LOD: %d, NeighborLOD: %s\n|3| IndexToRender: %d, fLOD: %f, LOD: %d, NeighborLOD: %s\n"),
+				*SectionBase.ToString(), CurrentLODData->StaticMeshBatchLOD, CurrentLODData->ComponentScreenSize, CurrentLODData->UseCombinedMeshBatch, *CurrentLODData->ShaderCurrentLOD.ToString(), *CurrentLODData->LodTessellationParams.ToString(),
+				HeightmapTexture != nullptr ? *HeightmapTexture->GetFullName() : TEXT("Invalid"), HeightmapTexture != nullptr ? ((FTexture2DResource*)HeightmapTexture->Resource)->GetCurrentFirstMip() : INDEX_NONE,
+				CurrentLODData->SubSections[0].StaticBatchElementIndexToRender, CurrentLODData->SubSections[0].fBatchElementCurrentLOD, CurrentLODData->SubSections[0].BatchElementCurrentLOD, *CurrentLODData->SubSections[0].ShaderCurrentNeighborLOD.ToString(),
+				CurrentLODData->SubSections[1].StaticBatchElementIndexToRender, CurrentLODData->SubSections[1].fBatchElementCurrentLOD, CurrentLODData->SubSections[1].BatchElementCurrentLOD, *CurrentLODData->SubSections[1].ShaderCurrentNeighborLOD.ToString(),
+				CurrentLODData->SubSections[2].StaticBatchElementIndexToRender, CurrentLODData->SubSections[2].fBatchElementCurrentLOD, CurrentLODData->SubSections[2].BatchElementCurrentLOD, *CurrentLODData->SubSections[2].ShaderCurrentNeighborLOD.ToString(),
+				CurrentLODData->SubSections[3].StaticBatchElementIndexToRender, CurrentLODData->SubSections[3].fBatchElementCurrentLOD, CurrentLODData->SubSections[3].BatchElementCurrentLOD, *CurrentLODData->SubSections[3].ShaderCurrentNeighborLOD.ToString());
+		}
+	}
+#endif
 }
 
 bool FLandscapeComponentSceneProxy::IsUsingCustomLODRules() const
@@ -2054,7 +2096,7 @@ bool FLandscapeComponentSceneProxy::IsUsingCustomLODRules() const
 }
 
 bool FLandscapeComponentSceneProxy::IsUsingCustomWholeSceneShadowLODRules() const
-{ 
+{
 	return true;
 }
 
@@ -2178,15 +2220,15 @@ FLODMask FLandscapeComponentSceneProxy::GetCustomWholeSceneShadowLOD(const FScen
 
 namespace
 {
-    FLinearColor GetColorForLod(int32 CurrentLOD, int32 ForcedLOD, bool DisplayCombinedBatch)
-    {
-	    int32 ColorIndex = INDEX_NONE;
-	    if (GEngine->LODColorationColors.Num() > 0)
-	    {
-		    ColorIndex = CurrentLOD;
-		    ColorIndex = FMath::Clamp(ColorIndex, 0, GEngine->LODColorationColors.Num() - 1);
-	    }
-	    const FLinearColor& LODColor = ColorIndex != INDEX_NONE ? GEngine->LODColorationColors[ColorIndex] : FLinearColor::Gray;
+	FLinearColor GetColorForLod(int32 CurrentLOD, int32 ForcedLOD, bool DisplayCombinedBatch)
+	{
+		int32 ColorIndex = INDEX_NONE;
+		if (GEngine->LODColorationColors.Num() > 0)
+		{
+			ColorIndex = CurrentLOD;
+			ColorIndex = FMath::Clamp(ColorIndex, 0, GEngine->LODColorationColors.Num() - 1);
+		}
+		const FLinearColor& LODColor = ColorIndex != INDEX_NONE ? GEngine->LODColorationColors[ColorIndex] : FLinearColor::Gray;
 
 		if (ForcedLOD >= 0)
 		{
@@ -2198,7 +2240,7 @@ namespace
 			return LODColor * 0.2f;
 		}
 
-	    return LODColor * 0.1f;
+		return LODColor * 0.1f;
 	}
 }
 
@@ -2224,7 +2266,7 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 		{
 			const FSceneView* View = Views[ViewIndex];
 			FLandscapeElementParamArray& ParameterArray = Collector.AllocateOneFrameResource<FLandscapeElementParamArray>();
-			 
+
 			const FViewCustomDataLOD* PrimitiveCustomData = (const FViewCustomDataLOD*)View->GetCustomData(GetPrimitiveSceneInfo()->GetIndex());
 
 			if (PrimitiveCustomData == nullptr)
@@ -2263,7 +2305,7 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 			// No Tessellation on tool material
 			BuildDynamicMeshElement(PrimitiveCustomData, true, TessellationEnabledOnDefaultMaterial ? AvailableMaterials[1] : AvailableMaterials[0], MeshTools, ParameterArray.ElementParams);
 #endif
-			
+
 			// Render the landscape component
 #if WITH_EDITOR
 			switch (GLandscapeViewMode)
@@ -2335,7 +2377,7 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 
 			case ELandscapeViewMode::LOD:
 			{
-			
+
 				const bool bMaterialModifiesMeshPosition = Mesh.MaterialRenderProxy->GetMaterial(View->GetFeatureLevel())->MaterialModifiesMeshPosition_RenderThread();
 
 				auto& TemplateMesh = bIsWireframe ? Mesh : MeshTools;
@@ -2347,7 +2389,7 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 					LODMesh.Elements.Add(TemplateMesh.Elements[i]);
 					int32 CurrentLOD = ((FLandscapeBatchElementParams*)TemplateMesh.Elements[i].UserData)->CurrentLOD;
 					LODMesh.VisualizeLODIndex = CurrentLOD;
-					FLinearColor Color = GetColorForLod(CurrentLOD, ForcedLOD, PrimitiveCustomData != nullptr? PrimitiveCustomData->UseCombinedMeshBatch : true);
+					FLinearColor Color = GetColorForLod(CurrentLOD, ForcedLOD, PrimitiveCustomData != nullptr ? PrimitiveCustomData->UseCombinedMeshBatch : true);
 					FMaterialRenderProxy* LODMaterialProxy =
 						bMaterialModifiesMeshPosition && bIsWireframe
 						? (FMaterialRenderProxy*)new FOverrideSelectionColorMaterialRenderProxy(Mesh.MaterialRenderProxy, Color)
@@ -2403,7 +2445,7 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 						auto CollisionMaterialInstance = new FColoredMaterialRenderProxy(
 							GEngine->ShadedLevelColorationUnlitMaterial->GetRenderProxy(IsSelected(), IsHovered()),
 							GetWireframeColor()
-							);
+						);
 						Collector.RegisterOneFrameMaterialProxy(CollisionMaterialInstance);
 
 						Mesh.MaterialRenderProxy = CollisionMaterialInstance;
@@ -2419,33 +2461,33 @@ void FLandscapeComponentSceneProxy::GetDynamicMeshElements(const TArray<const FS
 				}
 				else
 #endif
-				// Regular Landscape rendering. Only use the dynamic path if we're rendering a rich view or we've disabled the static path for debugging.
-				if( IsRichView(ViewFamily) || 
-					GLandscapeDebugOptions.bDisableStatic ||
-					bIsWireframe ||
+					// Regular Landscape rendering. Only use the dynamic path if we're rendering a rich view or we've disabled the static path for debugging.
+					if (IsRichView(ViewFamily) ||
+						GLandscapeDebugOptions.bDisableStatic ||
+						bIsWireframe ||
 #if WITH_EDITOR
-					(IsSelected() && !GLandscapeEditModeActive) ||
+						(IsSelected() && !GLandscapeEditModeActive) ||
 #else
-					IsSelected() ||
+						IsSelected() ||
 #endif
-					!IsStaticPathAvailable())
-				{
-					Mesh.bCanApplyViewModeOverrides = true;
-					Mesh.bUseWireframeSelectionColoring = IsSelected();
+						!IsStaticPathAvailable())
+					{
+						Mesh.bCanApplyViewModeOverrides = true;
+						Mesh.bUseWireframeSelectionColoring = IsSelected();
 
-					Collector.AddMesh(ViewIndex, Mesh);
+						Collector.AddMesh(ViewIndex, Mesh);
 
-					NumPasses++;
-					NumTriangles += Mesh.GetNumPrimitives();
-					NumDrawCalls += Mesh.Elements.Num();
-				}
+						NumPasses++;
+						NumTriangles += Mesh.GetNumPrimitives();
+						NumDrawCalls += Mesh.Elements.Num();
+					}
 
 #if WITH_EDITOR
 			} // switch
 #endif
 
 #if WITH_EDITOR
-			// Extra render passes for landscape tools
+			  // Extra render passes for landscape tools
 			if (GLandscapeEditModeActive)
 			{
 				// Region selection
@@ -2820,17 +2862,17 @@ void FLandscapeSharedBuffers::CreateOccluderIndexBuffer(int32 NumOccluderVertice
 	}
 
 	uint16 NumLineQuads = ((uint16)FMath::Sqrt(NumOccluderVertices) - 1);
-	uint16 NumLineVtx = NumLineQuads+1;
+	uint16 NumLineVtx = NumLineQuads + 1;
 	check(NumLineVtx*NumLineVtx == NumOccluderVertices);
 
-	int32 NumTris = NumLineQuads*NumLineQuads*2;
-	int32 NumIndices = NumTris*3;
+	int32 NumTris = NumLineQuads*NumLineQuads * 2;
+	int32 NumIndices = NumTris * 3;
 	OccluderIndicesSP = MakeShared<FOccluderIndexArray, ESPMode::ThreadSafe>();
 	OccluderIndicesSP->SetNumUninitialized(NumIndices, false);
-	
+
 	uint16* OcclusionIndices = OccluderIndicesSP->GetData();
 	const uint16 NumLineVtxPlusOne = NumLineVtx + 1;
-	const uint16 QuadIndices[2][3] = {{0, NumLineVtx, NumLineVtxPlusOne}, {0, NumLineVtxPlusOne, 1}};
+	const uint16 QuadIndices[2][3] = { {0, NumLineVtx, NumLineVtxPlusOne}, {0, NumLineVtxPlusOne, 1} };
 	uint16 QuadOffset = 0;
 	int32 Index = 0;
 	for (int32 y = 0; y < NumLineQuads; y++)
@@ -2857,7 +2899,7 @@ void FLandscapeSharedBuffers::CreateGrassIndexBuffer()
 {
 	TArray<INDEX_TYPE> NewIndices;
 
-	int32 ExpectedNumIndices = FMath::Square(NumSubsections) * (FMath::Square(SubsectionSizeVerts) * 4/3 - 1); // *4/3 is for mips, -1 because we only go down to 2x2 not 1x1
+	int32 ExpectedNumIndices = FMath::Square(NumSubsections) * (FMath::Square(SubsectionSizeVerts) * 4 / 3 - 1); // *4/3 is for mips, -1 because we only go down to 2x2 not 1x1
 	NewIndices.Empty(ExpectedNumIndices);
 
 	int32 NumMips = FMath::CeilLogTwo(SubsectionSizeVerts);
@@ -3154,7 +3196,7 @@ public:
 			{
 				SetShaderValue(RHICmdList, VertexShaderParamRef, LodTessellationParameter, LODData->LodTessellationParams);
 			}
-				
+
 			if (LodBiasParameter.IsBound())
 			{
 				check(LODData->LodBias == SceneProxy->GetShaderLODBias());
@@ -3182,7 +3224,7 @@ public:
 				FVector4 ShaderCurrentNeighborLOD[FLandscapeComponentSceneProxy::NEIGHBOR_COUNT] = { FVector4(ForceInitToZero), FVector4(ForceInitToZero), FVector4(ForceInitToZero), FVector4(ForceInitToZero) };
 
 				if (LODData->UseCombinedMeshBatch)
-				{					
+				{
 					int32 SubSectionCount = SceneProxy->NumSubsections == 1 ? 1 : FLandscapeComponentSceneProxy::MAX_SUBSECTION_COUNT;
 
 					for (int32 NeighborSubSectionIndex = 0; NeighborSubSectionIndex < SubSectionCount; ++NeighborSubSectionIndex)
@@ -3201,12 +3243,12 @@ public:
 
 					SetShaderValue(RHICmdList, VertexShaderParamRef, NeighborSectionLodParameter, ShaderCurrentNeighborLOD);
 				}
-			}			
+			}
 		}
 		else
 		{
 			float ComponentScreenSize = SceneProxy->GetComponentScreenSize(&View, SceneProxy->LandscapeComponent->Bounds.Origin, SceneProxy->ComponentMaxExtend, SceneProxy->LandscapeComponent->Bounds.SphereRadius);
-			
+
 			FLandscapeComponentSceneProxy::FViewCustomDataLOD CurrentLODData;
 			SceneProxy->CalculateBatchElementLOD(InView, ComponentScreenSize, View.LODDistanceFactor, CurrentLODData, true);
 			check(CurrentLODData.UseCombinedMeshBatch);
@@ -3244,7 +3286,7 @@ public:
 				}
 
 				SetShaderValue(RHICmdList, VertexShaderParamRef, NeighborSectionLodParameter, CurrentNeighborLOD);
-			}				
+			}
 		}
 
 		if (XYOffsetTextureParameter.IsBound() && SceneProxy->XYOffsetmapTexture)
@@ -3292,8 +3334,8 @@ void FLandscapeVertexFactoryPixelShaderParameters::Bind(const FShaderParameterMa
 void FLandscapeVertexFactoryPixelShaderParameters::Serialize(FArchive& Ar)
 {
 	Ar << NormalmapTextureParameter
-	   << NormalmapTextureParameterSampler
-	   << LocalToWorldNoScalingParameter;
+		<< NormalmapTextureParameterSampler
+		<< LocalToWorldNoScalingParameter;
 }
 
 /**
@@ -3339,7 +3381,7 @@ void FLandscapeVertexFactory::InitRHI()
 }
 
 FLandscapeVertexFactory::FLandscapeVertexFactory(ERHIFeatureLevel::Type InFeatureLevel)
-: FVertexFactory(InFeatureLevel)
+	: FVertexFactory(InFeatureLevel)
 {
 }
 
@@ -3406,11 +3448,15 @@ class FLandscapeMaterialResource : public FMaterialResource
 {
 	const bool bIsLayerThumbnail;
 	const bool bDisableTessellation;
+	const bool bMobile;
+	const bool bEditorToolUsage;
 
 public:
 	FLandscapeMaterialResource(ULandscapeMaterialInstanceConstant* Parent)
 		: bIsLayerThumbnail(Parent->bIsLayerThumbnail)
 		, bDisableTessellation(Parent->bDisableTessellation)
+		, bMobile(Parent->bMobile)
+		, bEditorToolUsage(Parent->bEditorToolUsage)
 	{
 	}
 
@@ -3462,6 +3508,13 @@ public:
 
 	bool ShouldCache(EShaderPlatform Platform, const FShaderType* ShaderType, const FVertexFactoryType* VertexFactoryType) const override
 	{
+		// Don't compile if this is a mobile shadermap and a desktop MIC, and vice versa, unless it's a tool material
+		if (!(IsPCPlatform(Platform) && bEditorToolUsage) && bMobile != IsMobilePlatform(Platform))
+		{
+			// @todo For some reason this causes this resource to return true for IsCompilationFinished. For now we will needlessly compile this shader until this is fixed.
+			//return false;
+		}
+
 		if (VertexFactoryType)
 		{
 			// Always check against FLocalVertexFactory in editor builds as it is required to render thumbnails
@@ -3469,7 +3522,7 @@ public:
 			if (bIsLayerThumbnail)
 			{
 				static const FName LocalVertexFactory = FName(TEXT("FLocalVertexFactory"));
-				if (VertexFactoryType->GetFName() == LocalVertexFactory)
+				if (!IsMobilePlatform(Platform) && VertexFactoryType->GetFName() == LocalVertexFactory)
 				{
 					if (Algo::Find(GetAllowedShaderTypes(), ShaderType->GetFName()))
 					{
@@ -3800,7 +3853,7 @@ void ULandscapeComponent::GetStreamingTextureInfo(FStreamingTextureLevelContext&
 	ERHIFeatureLevel::Type FeatureLevel = LevelContext.GetFeatureLevel();
 
 	// TODO - LOD Materials - Currently all LOD materials are instances of [0] so have the same textures
-    const UMaterialInterface* MaterialInterface = FeatureLevel >= ERHIFeatureLevel::SM4 ? GetMaterialInstance(0): MobileMaterialInterface;
+	const UMaterialInterface* MaterialInterface = FeatureLevel >= ERHIFeatureLevel::SM4 ? GetMaterialInstance(0) : MobileMaterialInterface;
 
 	// Normal usage...
 	// Enumerate the textures used by the material.
@@ -3835,7 +3888,7 @@ void ULandscapeComponent::GetStreamingTextureInfo(FStreamingTextureLevelContext&
 				{
 					UMaterialExpressionTextureCoordinate* TextureCoordinate = nullptr;
 					UMaterialExpressionLandscapeLayerCoords* TerrainTextureCoordinate = nullptr;
-		
+
 					for (UMaterialExpression* FindExp : Material->Expressions)
 					{
 						if (FindExp && FindExp->GetFName() == TextureSample->Coordinates.ExpressionName)
@@ -3969,7 +4022,7 @@ void ALandscapeProxy::ChangeTessellationComponentScreenSize(float InTessellation
 					}
 				}
 
-				delete[] RenderProxies;
+		delete[] RenderProxies;
 			}
 		);
 	}
@@ -4002,7 +4055,7 @@ void ALandscapeProxy::ChangeComponentScreenSizeToUseSubSections(float InComponen
 					}
 				}
 
-				delete[] RenderProxies;
+		delete[] RenderProxies;
 			}
 		);
 	}
@@ -4035,7 +4088,7 @@ void ALandscapeProxy::ChangeUseTessellationComponentScreenSizeFalloff(bool InUse
 					}
 				}
 
-				delete[] RenderProxies;
+		delete[] RenderProxies;
 			}
 		);
 	}
@@ -4068,14 +4121,14 @@ void ALandscapeProxy::ChangeTessellationComponentScreenSizeFalloff(float InTesse
 					}
 				}
 
-				delete[] RenderProxies;
+		delete[] RenderProxies;
 			}
 		);
 	}
 }
 
 void ALandscapeProxy::ChangeLODDistanceFactor(float InLODDistanceFactor)
-{	
+{
 	// Deprecated
 }
 
@@ -4111,9 +4164,9 @@ void FLandscapeComponentSceneProxy::GetHeightfieldRepresentation(UTexture2D*& Ou
 	OutDescription.HeightfieldScaleBias = HeightmapScaleBias;
 
 	OutDescription.MinMaxUV = FVector4(
-		HeightmapScaleBias.Z, 
-		HeightmapScaleBias.W, 
-		HeightmapScaleBias.Z + SubsectionSizeVerts * NumSubsections * HeightmapScaleBias.X - HeightmapScaleBias.X, 
+		HeightmapScaleBias.Z,
+		HeightmapScaleBias.W,
+		HeightmapScaleBias.Z + SubsectionSizeVerts * NumSubsections * HeightmapScaleBias.X - HeightmapScaleBias.X,
 		HeightmapScaleBias.W + SubsectionSizeVerts * NumSubsections * HeightmapScaleBias.Y - HeightmapScaleBias.Y);
 
 	OutDescription.HeightfieldRect = FIntRect(SectionBase.X, SectionBase.Y, SectionBase.X + NumSubsections * SubsectionSizeQuads, SectionBase.Y + NumSubsections * SubsectionSizeQuads);
@@ -4225,7 +4278,7 @@ void FLandscapeNeighborInfo::UnregisterNeighbors()
 // FLandscapeMeshProxySceneProxy
 //
 FLandscapeMeshProxySceneProxy::FLandscapeMeshProxySceneProxy(UStaticMeshComponent* InComponent, const FGuid& InGuid, const TArray<FIntPoint>& InProxyComponentBases, int8 InProxyLOD)
-: FStaticMeshSceneProxy(InComponent, false)
+	: FStaticMeshSceneProxy(InComponent, false)
 {
 	if (!IsComponentLevelVisible())
 	{
diff --git a/Engine/Source/Runtime/Landscape/Private/LandscapeRenderMobile.cpp b/Engine/Source/Runtime/Landscape/Private/LandscapeRenderMobile.cpp
index 90f1d7a3e62f..781c9dd4d0ed 100644
--- a/Engine/Source/Runtime/Landscape/Private/LandscapeRenderMobile.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/LandscapeRenderMobile.cpp
@@ -9,6 +9,7 @@ LandscapeRenderMobile.cpp: Landscape Rendering without using vertex texture fetc
 #include "Serialization/BufferArchive.h"
 #include "Serialization/MemoryReader.h"
 #include "PrimitiveSceneInfo.h"
+#include "LandscapeLayerInfoObject.h"
 
 void FLandscapeVertexFactoryMobile::InitRHI()
 {
@@ -317,6 +318,18 @@ FLandscapeComponentSceneProxyMobile::FLandscapeComponentSceneProxyMobile(ULandsc
 	NormalmapTexture = InComponent->MobileWeightNormalmapTexture;
 
 	BlendableLayerMask = InComponent->MobileBlendableLayerMask;
+
+#if WITH_EDITOR
+	TArray<FWeightmapLayerAllocationInfo>& LayerAllocations = InComponent->MobileWeightmapLayerAllocations.Num() ? InComponent->MobileWeightmapLayerAllocations : InComponent->WeightmapLayerAllocations;
+	LayerColors.Empty();
+	for (auto& Allocation : LayerAllocations)
+	{
+		if (Allocation.LayerInfo != nullptr)
+		{
+			LayerColors.Add(Allocation.LayerInfo->LayerUsageDebugColor);
+		}
+	}
+#endif
 }
 
 bool FLandscapeComponentSceneProxyMobile::CollectOccluderElements(FOccluderElementsCollector& Collector) const
diff --git a/Engine/Source/Runtime/Landscape/Private/LandscapeSplines.cpp b/Engine/Source/Runtime/Landscape/Private/LandscapeSplines.cpp
index 24c0a674d4f6..0758d878950f 100644
--- a/Engine/Source/Runtime/Landscape/Private/LandscapeSplines.cpp
+++ b/Engine/Source/Runtime/Landscape/Private/LandscapeSplines.cpp
@@ -46,6 +46,13 @@ IMPLEMENT_HIT_PROXY(HLandscapeSplineProxy_Tangent, HLandscapeSplineProxy);
 
 #define LOCTEXT_NAMESPACE "Landscape.Splines"
 
+int32 SplinesAlwaysUseBlockAll = 0;
+static FAutoConsoleVariableRef CVarSplinesAlwaysUseBlockAll(
+	TEXT("splines.blockall"),
+	SplinesAlwaysUseBlockAll,
+	TEXT("Force splines to always use the BlockAll collision profile instead of whatever is stored in the CollisionProfileName property")
+);
+
 //////////////////////////////////////////////////////////////////////////
 // LANDSCAPE SPLINES SCENE PROXY
 
@@ -1274,7 +1281,12 @@ void ULandscapeSplineControlPoint::PostLoad()
 		// Fix collision profile
 		if (LocalMeshComponent != nullptr) // ForeignMeshComponents didn't exist yet
 		{
-			const FName CollisionProfile = bEnableCollision_DEPRECATED ? UCollisionProfile::BlockAll_ProfileName : UCollisionProfile::NoCollision_ProfileName;
+#if WITH_EDITORONLY_DATA
+			const FName DesiredCollisionProfileName = SplinesAlwaysUseBlockAll ? UCollisionProfile::BlockAll_ProfileName : CollisionProfileName;
+			const FName CollisionProfile = bEnableCollision_DEPRECATED ? DesiredCollisionProfileName : UCollisionProfile::NoCollision_ProfileName;
+#else
+			const FName CollisionProfile = UCollisionProfile::BlockAll_ProfileName;
+#endif
 			if (LocalMeshComponent->GetCollisionProfileName() != CollisionProfile)
 			{
 				LocalMeshComponent->SetCollisionProfileName(CollisionProfile);
@@ -1959,13 +1971,7 @@ void ULandscapeSplineSegment::PostLoad()
 		// Fix collision profile
 		for (auto* LocalMeshComponent : LocalMeshComponents) // ForeignMeshComponents didn't exist yet
 		{
-			const bool bUsingEditorMesh = LocalMeshComponent->bHiddenInGame;
-			const FName CollisionProfile = (bEnableCollision_DEPRECATED && !bUsingEditorMesh) ? UCollisionProfile::BlockAll_ProfileName : UCollisionProfile::NoCollision_ProfileName;
-			if (LocalMeshComponent->GetCollisionProfileName() != CollisionProfile)
-			{
-				LocalMeshComponent->SetCollisionProfileName(CollisionProfile);
-			}
-
+			UpdateMeshCollisionProfile(LocalMeshComponent);
 			LocalMeshComponent->SetFlags(RF_TextExportTransient);
 		}
 	}
@@ -2009,6 +2015,33 @@ void ULandscapeSplineSegment::PostLoad()
 		}
 	}
 #endif
+
+	// If the "spline.blockall" cvar is on we might need to rebuild collision
+	// for our spline meshes.
+	if (SplinesAlwaysUseBlockAll)
+	{
+		for (auto* LocalMeshComponent : LocalMeshComponents)
+		{
+			UpdateMeshCollisionProfile(LocalMeshComponent);
+			LocalMeshComponent->Modify();
+		}
+	}
+}
+
+void ULandscapeSplineSegment::UpdateMeshCollisionProfile(USplineMeshComponent* MeshComponent)
+{
+	const bool bUsingEditorMesh = MeshComponent->bHiddenInGame;
+#if WITH_EDITORONLY_DATA
+	const FName DesiredCollisionProfileName = SplinesAlwaysUseBlockAll ? UCollisionProfile::BlockAll_ProfileName : CollisionProfileName;
+	const FName CollisionProfile = (bEnableCollision_DEPRECATED && !bUsingEditorMesh) ? DesiredCollisionProfileName : UCollisionProfile::NoCollision_ProfileName;
+#else
+	const FName CollisionProfile = UCollisionProfile::BlockAll_ProfileName;
+#endif
+	if (MeshComponent->GetCollisionProfileName() != CollisionProfile)
+	{
+		MeshComponent->SetCollisionProfileName(CollisionProfile);
+		MeshComponent->Modify();
+	}
 }
 
 /**  */
diff --git a/Engine/Source/Runtime/Launch/Launch.Build.cs b/Engine/Source/Runtime/Launch/Launch.Build.cs
index 848bc4cada92..8b62c5e0fe23 100644
--- a/Engine/Source/Runtime/Launch/Launch.Build.cs
+++ b/Engine/Source/Runtime/Launch/Launch.Build.cs
@@ -10,30 +10,30 @@ public class Launch : ModuleRules
 		PrivateIncludePaths.Add("Runtime/Launch/Private");
 
 		PrivateIncludePathModuleNames.AddRange(new string[] {
-			"AutomationController",
-			"TaskGraph",
+				"AutomationController",
+				"TaskGraph",
 		});
 
 		PrivateDependencyModuleNames.AddRange(new string[] {
-			"Core",
-			"CoreUObject",
-			"Engine",
-			"InputCore",
-			"MoviePlayer",
-			"Networking",
-			"PakFile",
-			"Projects",
-			"RenderCore",
-			"RHI",
-			"SandboxFile",
-			"Serialization",
-			"ShaderCore",
-			"ApplicationCore",
-			"Slate",
-			"SlateCore",
-			"Sockets",
-            "Overlay",
-			"UtilityShaders",
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"InputCore",
+				"MoviePlayer",
+				"Networking",
+				"PakFile",
+				"Projects",
+				"RenderCore",
+				"RHI",
+				"SandboxFile",
+				"Serialization",
+				"ShaderCore",
+				"ApplicationCore",
+				"Slate",
+				"SlateCore",
+				"Sockets",
+                "Overlay",
+				"UtilityShaders",
 		});
 
 		// Enable the LauncherCheck module to be used for platforms that support the Launcher.
@@ -54,9 +54,9 @@ public class Launch : ModuleRules
 		if (Target.Type != TargetType.Server)
 		{
 			PrivateDependencyModuleNames.AddRange(new string[] {
-				"HeadMountedDisplay",
+					"HeadMountedDisplay",
 				"MediaUtils",
-				"MRMesh",
+					"MRMesh",
 			});
 
 			if ((Target.Platform == UnrealTargetPlatform.Win32) ||
@@ -84,13 +84,13 @@ public class Launch : ModuleRules
 
 			PrivateIncludePathModuleNames.AddRange(new string[] {
 				"Media",
-				"SlateNullRenderer",
+					"SlateNullRenderer",
 				"SlateRHIRenderer",
 			});
 
 			DynamicallyLoadedModuleNames.AddRange(new string[] {
 				"Media",
-				"SlateNullRenderer",
+					"SlateNullRenderer",
 				"SlateRHIRenderer",
 			});
 		}
@@ -99,21 +99,21 @@ public class Launch : ModuleRules
 		if (Target.Configuration != UnrealTargetConfiguration.Shipping)
 		{
 			PrivateDependencyModuleNames.AddRange(new string[] {
-				"NetworkFile",
-				"StreamingFile",
-				"CookedIterativeFile",
-				"AutomationWorker",
+					"NetworkFile",
+					"StreamingFile",
+					"CookedIterativeFile",
+					"AutomationWorker",
 			});
 		}
 
 		DynamicallyLoadedModuleNames.AddRange(new string[] {
-			"Renderer",
+				"Renderer",
 		});
 
 		if (Target.bCompileAgainstEngine)
 		{
 			PrivateIncludePathModuleNames.AddRange(new string[] {
-				"MessagingCommon",
+					"MessagingCommon",
 			});
 
 			PublicDependencyModuleNames.Add("SessionServices");
@@ -156,24 +156,24 @@ public class Launch : ModuleRules
 			PublicIncludePathModuleNames.Add("ProfilerClient");
 
 			PrivateDependencyModuleNames.AddRange(new string[] {
-				"SourceControl",
-				"UnrealEd",
-				"DesktopPlatform",
-				"PIEPreviewDeviceProfileSelector",
+					"SourceControl",
+					"UnrealEd",
+					"DesktopPlatform",
+					"PIEPreviewDeviceProfileSelector",
 			});
 
 
 			// ExtraModules that are loaded when WITH_EDITOR=1 is true
 			DynamicallyLoadedModuleNames.AddRange(new string[] {
-				"AutomationWindow",
-				"ProfilerClient",
-				"Toolbox",
-				"GammaUI",
-				"ModuleUI",
-				"OutputLog",
-				"TextureCompressor",
-				"MeshUtilities",
-				"SourceCodeAccess"
+					"AutomationWindow",
+					"ProfilerClient",
+					"Toolbox",
+					"GammaUI",
+					"ModuleUI",
+					"OutputLog",
+					"TextureCompressor",
+					"MeshUtilities",
+					"SourceCodeAccess"
 			});
 
 			if (Target.Platform == UnrealTargetPlatform.Mac)
@@ -261,10 +261,11 @@ public class Launch : ModuleRules
 			PrivateDependencyModuleNames.Add("UnixCommonStartup");
 		}
 
-		if (Target.LinkType == TargetLinkType.Monolithic && !Target.bFormalBuild)
+		if(Target.LinkType == TargetLinkType.Monolithic && !Target.bFormalBuild)
 		{
 			PrivateDefinitions.Add(string.Format("COMPILED_IN_CL={0}", Target.Version.Changelist));
 			PrivateDefinitions.Add(string.Format("COMPILED_IN_COMPATIBLE_CL={0}", Target.Version.EffectiveCompatibleChangelist));
+			PrivateDefinitions.Add(string.Format("COMPILED_IN_BRANCH_NAME={0}", (Target.Version.BranchName == null || Target.Version.BranchName.Length == 0)? "UE4" : Target.Version.BranchName));
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Launch/Private/Android/AndroidEventManager.cpp b/Engine/Source/Runtime/Launch/Private/Android/AndroidEventManager.cpp
index 277343367650..3ae9edb31eb8 100644
--- a/Engine/Source/Runtime/Launch/Private/Android/AndroidEventManager.cpp
+++ b/Engine/Source/Runtime/Launch/Private/Android/AndroidEventManager.cpp
@@ -258,7 +258,7 @@ FAppEventManager::FAppEventManager():
 
 void FAppEventManager::OnScaleFactorChanged(IConsoleVariable* CVar)
 {
-	if (CVar->GetFlags() & ECVF_SetByConsole)
+	if ((CVar->GetFlags() & ECVF_SetByMask) == ECVF_SetByConsole)
 	{
 		FAppEventManager::GetInstance()->ExecWindowResized();
 	}
diff --git a/Engine/Source/Runtime/Launch/Private/Android/AndroidJNI.cpp b/Engine/Source/Runtime/Launch/Private/Android/AndroidJNI.cpp
index f60f5869cbc9..c8874450e168 100644
--- a/Engine/Source/Runtime/Launch/Private/Android/AndroidJNI.cpp
+++ b/Engine/Source/Runtime/Launch/Private/Android/AndroidJNI.cpp
@@ -31,6 +31,7 @@ static IVirtualKeyboardEntry *VirtualKeyboardWidget = NULL;
 static volatile bool GVirtualKeyboardShown = false;
 
 extern FString GFilePathBase;
+extern FString GInternalFilePath;
 extern FString GExternalFilePath;
 extern FString GFontPathBase;
 extern bool GOBBinAPK;
@@ -90,8 +91,15 @@ void FJavaWrapper::FindClassesAndMethods(JNIEnv* Env)
 	AndroidThunkJava_LocalNotificationClearAll = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_LocalNotificationClearAll", "()V", bIsOptional);
 	AndroidThunkJava_LocalNotificationGetLaunchNotification = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_LocalNotificationGetLaunchNotification", "()Lcom/epicgames/ue4/GameActivity$LaunchNotification;", bIsOptional);
 	//AndroidThunkJava_LocalNotificationDestroyIfExists = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_LocalNotificationDestroyIfExists", "(I)Z", bIsOptional);
-	AndroidThunkJava_HasActiveWiFiConnection = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_HasActiveWiFiConnection", "()Z", bIsOptional);
+	AndroidThunkJava_GetNetworkConnectionType = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_GetNetworkConnectionType", "()I", bIsOptional);
 	AndroidThunkJava_GetAndroidId = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_GetAndroidId", "()Ljava/lang/String;", bIsOptional);
+	AndroidThunkJava_ShareURL = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_ShareURL", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V", bIsOptional);
+	AndroidThunkJava_LaunchPackage = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_LaunchPackage", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z", bIsOptional);
+	AndroidThunkJava_HasIntentExtrasKey = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_HasIntentExtrasKey", "(Ljava/lang/String;)Z", bIsOptional);
+	AndroidThunkJava_GetIntentExtrasBoolean = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_GetIntentExtrasBoolean", "(Ljava/lang/String;)Z", bIsOptional);
+	AndroidThunkJava_GetIntentExtrasInt = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_GetIntentExtrasInt", "(Ljava/lang/String;)I", bIsOptional);
+	AndroidThunkJava_GetIntentExtrasString = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_GetIntentExtrasString", "(Ljava/lang/String;)Ljava/lang/String;", bIsOptional);
+	AndroidThunkJava_PushSensorEvents = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_PushSensorEvents", "()V", bIsOptional);
 
 	// this is optional - only inserted if Gear VR plugin enabled
 	AndroidThunkJava_IsGearVRApplication = FindMethod(Env, GameActivityClassID, "AndroidThunkJava_IsGearVRApplication", "()Z", true);
@@ -303,9 +311,16 @@ jmethodID FJavaWrapper::AndroidThunkJava_LocalNotificationScheduleAtTime;
 jmethodID FJavaWrapper::AndroidThunkJava_LocalNotificationClearAll;
 jmethodID FJavaWrapper::AndroidThunkJava_LocalNotificationGetLaunchNotification;
 //jmethodID FJavaWrapper::AndroidThunkJava_LocalNotificationDestroyIfExists;
-jmethodID FJavaWrapper::AndroidThunkJava_HasActiveWiFiConnection;
+jmethodID FJavaWrapper::AndroidThunkJava_GetNetworkConnectionType;
 jmethodID FJavaWrapper::AndroidThunkJava_GetAndroidId;
+jmethodID FJavaWrapper::AndroidThunkJava_ShareURL;
+jmethodID FJavaWrapper::AndroidThunkJava_LaunchPackage;
+jmethodID FJavaWrapper::AndroidThunkJava_HasIntentExtrasKey;
+jmethodID FJavaWrapper::AndroidThunkJava_GetIntentExtrasBoolean;
+jmethodID FJavaWrapper::AndroidThunkJava_GetIntentExtrasInt;
+jmethodID FJavaWrapper::AndroidThunkJava_GetIntentExtrasString;
 jmethodID FJavaWrapper::AndroidThunkJava_SetSustainedPerformanceMode;
+jmethodID FJavaWrapper::AndroidThunkJava_PushSensorEvents;
 
 jclass FJavaWrapper::InputDeviceInfoClass;
 jfieldID FJavaWrapper::InputDeviceInfo_VendorId;
@@ -558,6 +573,61 @@ FString AndroidThunkCpp_GetMetaDataString(const FString& Key)
 	return Result;
 }
 
+bool AndroidThunkCpp_HasIntentExtrasKey(const FString& Key)
+{
+	bool Result = false;
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring Argument = Env->NewStringUTF(TCHAR_TO_UTF8(*Key));
+		Result = FJavaWrapper::CallBooleanMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_HasIntentExtrasKey, Argument);
+		Env->DeleteLocalRef(Argument);
+	}
+	return Result;
+}
+
+bool AndroidThunkCpp_GetIntentExtrasBoolean(const FString& Key)
+{
+	bool Result = false;
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring Argument = Env->NewStringUTF(TCHAR_TO_UTF8(*Key));
+		Result = FJavaWrapper::CallBooleanMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_GetIntentExtrasBoolean, Argument);
+		Env->DeleteLocalRef(Argument);
+	}
+	return Result;
+}
+
+int32 AndroidThunkCpp_GetIntentExtrasInt(const FString& Key)
+{
+	int32 Result = 0;
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring Argument = Env->NewStringUTF(TCHAR_TO_UTF8(*Key));
+		Result = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_GetIntentExtrasInt, Argument);
+		Env->DeleteLocalRef(Argument);
+	}
+	return Result;
+}
+
+FString AndroidThunkCpp_GetIntentExtrasString(const FString& Key)
+{
+	FString Result = FString("");
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring Argument = Env->NewStringUTF(TCHAR_TO_UTF8(*Key));
+		jstring JavaString = (jstring)FJavaWrapper::CallObjectMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_GetIntentExtrasString, Argument);
+		Env->DeleteLocalRef(Argument);
+		if (JavaString != NULL)
+		{
+			const char* JavaChars = Env->GetStringUTFChars(JavaString, 0);
+			Result = FString(UTF8_TO_TCHAR(JavaChars));
+			Env->ReleaseStringUTFChars(JavaString, JavaChars);
+			Env->DeleteLocalRef(JavaString);
+		}
+	}
+	return Result;
+}
+
 void AndroidThunkCpp_SetSustainedPerformanceMode(bool bEnable)
 {
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
@@ -566,6 +636,14 @@ void AndroidThunkCpp_SetSustainedPerformanceMode(bool bEnable)
 	}
 }
 
+void AndroidThunkCpp_PushSensorEvents()
+{
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		FJavaWrapper::CallVoidMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_PushSensorEvents);
+	}
+}
+
 void AndroidThunkCpp_ShowHiddenAlertDialog()
 {
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
@@ -939,6 +1017,36 @@ FString AndroidThunkCpp_GetAndroidId()
 	return androidIdResult;
 }
 
+void AndroidThunkCpp_ShareURL(const FString& URL, const FText& Description, const FText& SharePrompt, int32 LocationHintX, int32 LocationHintY)
+{
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring URLArg = Env->NewStringUTF(TCHAR_TO_UTF8(*URL));
+		jstring DescArg = Env->NewStringUTF(TCHAR_TO_UTF8(*Description.ToString()));
+		jstring PromptArg = Env->NewStringUTF(TCHAR_TO_UTF8(*SharePrompt.ToString()));
+		FJavaWrapper::CallVoidMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_ShareURL, URLArg, DescArg, PromptArg, LocationHintX, LocationHintY);
+		Env->DeleteLocalRef(PromptArg);
+		Env->DeleteLocalRef(DescArg);
+		Env->DeleteLocalRef(URLArg);
+	}
+}
+
+bool AndroidThunkCpp_LaunchPackage(const FString& PackageName, const FString& ExtraKey, const FString& ExtraValue)
+{
+	bool result = false;
+	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
+	{
+		jstring PackageNameArg = Env->NewStringUTF(TCHAR_TO_UTF8(*PackageName));
+		jstring ExtraKeyArg = Env->NewStringUTF(TCHAR_TO_UTF8(*ExtraKey));
+		jstring ExtraValueArg = Env->NewStringUTF(TCHAR_TO_UTF8(*ExtraValue));
+		result = FJavaWrapper::CallBooleanMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_LaunchPackage, PackageNameArg, ExtraKeyArg, ExtraValueArg);
+		Env->DeleteLocalRef(ExtraValueArg);
+		Env->DeleteLocalRef(ExtraKeyArg);
+		Env->DeleteLocalRef(PackageNameArg);
+	}
+	return result;
+}
+
 void AndroidThunkCpp_GoogleClientConnect()
 {
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
@@ -1255,15 +1363,15 @@ bool AndroidThunkCpp_DestroyScheduledNotificationIfExists(int32 NotificationId)
 }
 */
 
-bool AndroidThunkCpp_HasActiveWiFiConnection()
+int32 AndroidThunkCpp_GetNetworkConnectionType()
 {
-	bool bIsActive = false;
+	int32 result = -1;
 	if (JNIEnv* Env = FAndroidApplication::GetJavaEnv())
 	{
-		bIsActive = FJavaWrapper::CallBooleanMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_HasActiveWiFiConnection);
+		result = FJavaWrapper::CallIntMethod(Env, FJavaWrapper::GameActivityThis, FJavaWrapper::AndroidThunkJava_GetNetworkConnectionType);
 	}
 
-	return bIsActive;
+	return result;
 }
 
 void AndroidThunkCpp_SetThreadName(const char * name)
@@ -1352,7 +1460,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* InJavaVM, void* InReserved)
 //Native-defined functions
 
 //This function is declared in the Java-defined class, GameActivity.java: "public native void nativeSetGlobalActivity();"
-JNI_METHOD void Java_com_epicgames_ue4_GameActivity_nativeSetGlobalActivity(JNIEnv* jenv, jobject thiz, jboolean bUseExternalFilesDir, jboolean bOBBinAPK, jstring APKFilename /*, jobject googleServices*/)
+JNI_METHOD void Java_com_epicgames_ue4_GameActivity_nativeSetGlobalActivity(JNIEnv* jenv, jobject thiz, jboolean bUseExternalFilesDir, jstring internalFilePath, jstring externalFilePath, jboolean bOBBinAPK, jstring APKFilename /*, jobject googleServices*/)
 {
 	if (!FJavaWrapper::GameActivityThis)
 	{
@@ -1379,15 +1487,13 @@ JNI_METHOD void Java_com_epicgames_ue4_GameActivity_nativeSetGlobalActivity(JNIE
 		GAPKFilename = FString(nativeAPKFilenameString);
 		jenv->ReleaseStringUTFChars(APKFilename, nativeAPKFilenameString);
 
-		// Cache path to external files directory
-		jclass ContextClass = jenv->FindClass("android/content/Context");
-		jmethodID getExternalFilesDir = jenv->GetMethodID(ContextClass, "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
-		jobject externalFilesDirPath = jenv->CallObjectMethod(FJavaWrapper::GameActivityThis, getExternalFilesDir, nullptr);
-		jmethodID getFilePath = jenv->GetMethodID(jenv->FindClass("java/io/File"), "getPath", "()Ljava/lang/String;");
-		jstring externalFilesPathString = (jstring)jenv->CallObjectMethod(externalFilesDirPath, getFilePath, nullptr);
-		const char *nativeExternalFilesPathString = jenv->GetStringUTFChars(externalFilesPathString, 0);
-		// Copy that somewhere safe 
-		GExternalFilePath = FString(nativeExternalFilesPathString);
+		const char *nativeInternalPath = jenv->GetStringUTFChars(internalFilePath, 0);
+		GInternalFilePath = FString(nativeInternalPath);
+		jenv->ReleaseStringUTFChars(internalFilePath, nativeInternalPath);
+
+		const char *nativeExternalPath = jenv->GetStringUTFChars(externalFilePath, 0);
+		GExternalFilePath = FString(nativeExternalPath);
+		jenv->ReleaseStringUTFChars(externalFilePath, nativeExternalPath);
 
 		if (bUseExternalFilesDir)
 		{
@@ -1395,11 +1501,7 @@ JNI_METHOD void Java_com_epicgames_ue4_GameActivity_nativeSetGlobalActivity(JNIE
 			FPlatformMisc::LowLevelOutputDebugStringf(TEXT("GFilePathBase Path override to'%s'\n"), *GFilePathBase);
 		}
 
-		// then release...
-		jenv->ReleaseStringUTFChars(externalFilesPathString, nativeExternalFilesPathString);
-		jenv->DeleteLocalRef(externalFilesPathString);
-		jenv->DeleteLocalRef(externalFilesDirPath);
-		jenv->DeleteLocalRef(ContextClass);
+		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("InternalFilePath found as '%s'\n"), *GInternalFilePath);
 		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("ExternalFilePath found as '%s'\n"), *GExternalFilePath);
 	}
 }
diff --git a/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp b/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp
index 2bbdae6c805d..6728fe01a0f7 100644
--- a/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp
+++ b/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp
@@ -42,6 +42,12 @@
 typedef float(*GetAxesType)(const AInputEvent*, int32_t axis, size_t pointer_index);
 static GetAxesType GetAxes = NULL;
 
+// Define missing events for earlier NDKs
+#if PLATFORM_ANDROID_NDK_VERSION < 140200
+#define AMOTION_EVENT_AXIS_RELATIVE_X 27
+#define AMOTION_EVENT_AXIS_RELATIVE_Y 28
+#endif
+
 // List of default axes to query for each controller
 // Ideal solution is to call out to Java and enumerate the list of axes.
 static const int32_t AxisList[] =
@@ -99,6 +105,24 @@ extern "C"
 	void *__dso_handle;
 }
 
+int32 GAndroidEnableMouse = 0;
+static FAutoConsoleVariableRef CVarEnableMouse(
+	TEXT("Android.EnableMouse"),
+	GAndroidEnableMouse,
+	TEXT("Whether mouse support is enabled on Android.\n")
+	TEXT(" 0: disabled (default)\n")
+	TEXT(" 1: enabled"),
+	ECVF_ReadOnly);
+
+int32 GAndroidEnableHardwareKeyboard = 0;
+static FAutoConsoleVariableRef CVarEnableHWKeyboard(
+	TEXT("Android.EnableHardwareKeyboard"),
+	GAndroidEnableHardwareKeyboard,
+	TEXT("Whether hardware keyboard support is enabled on Android.\n")
+	TEXT(" 0: disabled (default)\n")
+	TEXT(" 1: enabled"),
+	ECVF_ReadOnly);
+
 extern void AndroidThunkCpp_InitHMDs();
 extern void AndroidThunkCpp_ShowConsoleWindow();
 extern bool AndroidThunkCpp_VirtualInputIgnoreClick(int, int);
@@ -422,7 +446,98 @@ int32 AndroidMain(struct android_app* state)
 	return 0;
 }
 
+// this is a prototype currently unused, left here for possible future use
+#if !defined(WITH_Android_Choreographer)
+#define WITH_Android_Choreographer (0)
+#endif
 
+#if WITH_Android_Choreographer
+
+struct AChoreographer;
+struct FChoreographer
+{
+	typedef void(*AChoreographer_frameCallback)(long frameTimeNanos, void* data);
+	typedef AChoreographer* (*func_AChoreographer_getInstance)();
+	typedef void(*func_AChoreographer_postFrameCallback)(
+		AChoreographer* choreographer, AChoreographer_frameCallback callback,
+		void* data);
+
+	func_AChoreographer_getInstance AChoreographer_getInstance_ = nullptr;
+	func_AChoreographer_postFrameCallback AChoreographer_postFrameCallback_ = nullptr;
+
+	FCriticalSection ChoreographerSetupLock;
+
+	TFunction<void(int64)> Callback;
+
+	int64 FrameCounterInc = 0;
+
+	void SetupChoreographer()
+	{
+		FScopeLock Lock(&ChoreographerSetupLock);
+		check(!AChoreographer_getInstance_);
+		if (!AChoreographer_getInstance_)
+		{
+			void* lib = dlopen("libandroid.so", RTLD_NOW | RTLD_LOCAL);
+			if (lib != nullptr)
+			{
+				// Retrieve function pointers from shared object.
+				AChoreographer_getInstance_ =
+					reinterpret_cast<func_AChoreographer_getInstance>(
+						dlsym(lib, "AChoreographer_getInstance"));
+				AChoreographer_postFrameCallback_ =
+					reinterpret_cast<func_AChoreographer_postFrameCallback>(
+						dlsym(lib, "AChoreographer_postFrameCallback"));
+			}
+
+			if (!AChoreographer_getInstance_ || !AChoreographer_postFrameCallback_)
+			{
+				UE_LOG(LogAndroid, Fatal, TEXT("Failed to set up Choreographer"));
+			}
+			SetCallback();
+		}
+	}
+	void SetupCallback(TFunction<void(int64)> InCallback)
+	{
+		FScopeLock Lock(&ChoreographerSetupLock);
+		check(AChoreographer_getInstance_);
+		Callback = InCallback;
+	}
+
+	void SetCallback();
+	void DoCallback(int64 InFrameCounter)
+	{
+		FScopeLock Lock(&ChoreographerSetupLock);
+		// Post next callback for self.
+		FrameCounterInc++;
+		SetCallback();
+		if (Callback)
+		{
+			//Callback(FrameCounterInc);
+			Callback(InFrameCounter);
+		}
+	}
+};
+FChoreographer TheChoreographer;
+
+void StartChoreographer(TFunction<void(int64)> Callback)
+{
+	TheChoreographer.SetupCallback(Callback);
+}
+
+
+static void choreographer_callback(long frameTimeNanos, void* data)
+{
+	TheChoreographer.DoCallback((frameTimeNanos * 60 + 500000000) / 1000000000);
+}
+
+void FChoreographer::SetCallback()
+{
+	AChoreographer* choreographer = AChoreographer_getInstance_();
+	UE_CLOG(!choreographer, LogAndroid, Fatal, TEXT("Choreographer was null."));
+	AChoreographer_postFrameCallback_(choreographer, choreographer_callback, nullptr);
+}
+
+#endif
 
 static void* AndroidEventThreadWorker( void* param )
 {
@@ -446,6 +561,10 @@ static void* AndroidEventThreadWorker( void* param )
 	FPlatformMisc::LowLevelOutputDebugString(L"Passed callback initialization");
 	FPlatformMisc::LowLevelOutputDebugString(L"Passed sensor initialization");
 
+#if WITH_Android_Choreographer
+	TheChoreographer.SetupChoreographer();
+#endif
+
 	//continue to process events until the engine is shutting down
 	while (!GIsRequestingExit)
 	{
@@ -517,6 +636,78 @@ static int32_t HandleInputCB(struct android_app* app, AInputEvent* event)
 	int32 EventType = AInputEvent_getType(event);
 	int32 EventSource = AInputEvent_getSource(event);
 
+	if ((EventSource & AINPUT_SOURCE_MOUSE) == AINPUT_SOURCE_MOUSE)
+	{
+		static int32 previousButtonState = 0;
+
+		if (!GAndroidEnableMouse)
+		{
+			// this will block event
+			return 1;
+		}
+
+		int32 action = AMotionEvent_getAction(event);
+		int32 actionType = action & AMOTION_EVENT_ACTION_MASK;
+		int32 device = AInputEvent_getDeviceId(event);
+		int32 buttonState = AMotionEvent_getButtonState(event);
+
+//		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("-- EVENT: %d, device: %d, action: %x, actionType: %x, buttonState: %x"), EventType, device, action, actionType, buttonState);
+
+		if (actionType == AMOTION_EVENT_ACTION_DOWN || actionType == AMOTION_EVENT_ACTION_UP)
+		{
+			bool bDown = (actionType == AMOTION_EVENT_ACTION_DOWN);
+			if (!bDown)
+			{
+				buttonState = previousButtonState;
+			}
+			if (buttonState & AMOTION_EVENT_BUTTON_PRIMARY)
+			{
+//				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Mouse button 0: %d"), bDown ? 1 : 0);
+				FAndroidInputInterface::MouseButtonEvent(device, 0, bDown);
+			}
+			if (buttonState & AMOTION_EVENT_BUTTON_SECONDARY)
+			{
+//				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Mouse button 1: %d"), bDown ? 1 : 0);
+				FAndroidInputInterface::MouseButtonEvent(device, 0, bDown);
+			}
+			if (buttonState & AMOTION_EVENT_BUTTON_TERTIARY)
+			{
+//				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Mouse button 2: %d"), bDown ? 1 : 0);
+				FAndroidInputInterface::MouseButtonEvent(device, 0, bDown);
+			}
+			previousButtonState = buttonState;
+			return 1;
+		}
+
+		if (actionType == AMOTION_EVENT_ACTION_SCROLL)
+		{
+			if (GetAxes)
+			{
+				float WheelDelta = GetAxes(event, AMOTION_EVENT_AXIS_VSCROLL, 0);
+
+				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Mouse scroll: %f"), WheelDelta);
+				FAndroidInputInterface::MouseWheelEvent(device, WheelDelta);
+			}
+			return 1;
+		}
+
+		if (GetAxes && (actionType == AMOTION_EVENT_ACTION_MOVE || actionType == AMOTION_EVENT_ACTION_HOVER_MOVE))
+		{
+			float XAbsolute = GetAxes(event, AMOTION_EVENT_AXIS_X, 0);
+			float YAbsolute = GetAxes(event, AMOTION_EVENT_AXIS_Y, 0);
+			float XRelative = GetAxes(event, AMOTION_EVENT_AXIS_RELATIVE_X, 0);
+			float YRelative = GetAxes(event, AMOTION_EVENT_AXIS_RELATIVE_Y, 0);
+
+			if (XRelative != 0.0f || YRelative != 0.0f)
+			{
+				FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Mouse absolute: (%f, %f), relative (%f, %f)"), XAbsolute, YAbsolute, XRelative, YRelative);
+				FAndroidInputInterface::MouseMoveEvent(device, XAbsolute, YAbsolute, XRelative, YRelative);
+			}
+		}
+
+		return 1;
+	}
+
 	if (EventType == AINPUT_EVENT_TYPE_MOTION)
 	{
 		int action = AMotionEvent_getAction(event);
@@ -690,8 +881,10 @@ static int32_t HandleInputCB(struct android_app* app, AInputEvent* event)
 	if (EventType == AINPUT_EVENT_TYPE_KEY)
 	{
 		int keyCode = AKeyEvent_getKeyCode(event);
+		int keyFlags = AKeyEvent_getFlags(event);
+		bool bSoftKey = (keyFlags & AKEY_EVENT_FLAG_SOFT_KEYBOARD) != 0;
 
-		FPlatformMisc::LowLevelOutputDebugStringf(L"Received keycode: %d", keyCode);
+		FPlatformMisc::LowLevelOutputDebugStringf(L"Received keycode: %d, softkey: %d", keyCode, bSoftKey ? 1 : 0);
 
 		//Trap codes handled as possible gamepad events
 		if (ValidGamepadKeyCodes.Contains(keyCode))
@@ -718,14 +911,17 @@ static int32_t HandleInputCB(struct android_app* app, AInputEvent* event)
 				return 0;
 			}
 
-			FDeferredAndroidMessage Message;
+			if (bSoftKey || GAndroidEnableHardwareKeyboard)
+			{
+				FDeferredAndroidMessage Message;
 
-			Message.messageType = AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_UP ? MessageType_KeyUp : MessageType_KeyDown; 
-			Message.KeyEventData.unichar = keyCode;
-			Message.KeyEventData.keyId = keyCode;
-			Message.KeyEventData.modifier = AKeyEvent_getMetaState(event);
-			Message.KeyEventData.isRepeat = AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_MULTIPLE;
-			FAndroidInputInterface::DeferMessage(Message);
+				Message.messageType = AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_UP ? MessageType_KeyUp : MessageType_KeyDown;
+				Message.KeyEventData.unichar = keyCode;
+				Message.KeyEventData.keyId = keyCode;
+				Message.KeyEventData.modifier = AKeyEvent_getMetaState(event);
+				Message.KeyEventData.isRepeat = AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_MULTIPLE;
+				FAndroidInputInterface::DeferMessage(Message);
+			}
 
 			// allow event to be generated for volume up and down, but conditionally allow system to handle it, too
 			if (keyCode == AKEYCODE_VOLUME_UP || keyCode == AKEYCODE_VOLUME_DOWN)
diff --git a/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.cpp b/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.cpp
index ebc99546ac7d..b141db70a415 100644
--- a/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.cpp
+++ b/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.cpp
@@ -148,6 +148,7 @@ extern bool GShowSplashScreen;
 		[[NSUserDefaults standardUserDefaults] synchronize];
 	}
 }
+#endif
 
 /** 
  * Shows an alert with up to 3 buttons. A delegate callback will later set AlertResponse property
@@ -244,6 +245,7 @@ extern bool GShowSplashScreen;
 }
 #endif
 
+#if !UE_BUILD_SHIPPING && !PLATFORM_TVOS
 - (void)SwipeLeftAction:(id)Ignored
 {
 	// Populate the text field with the previous entry in the history array
diff --git a/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.h b/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.h
index 5323feac91f0..c9f351ab7de5 100644
--- a/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.h
+++ b/Engine/Source/Runtime/Launch/Private/IOS/IOSAppDelegateConsoleHandling.h
@@ -11,12 +11,14 @@
  * Shows the console input dialog
  */
 - (void)ShowConsole;
+#endif
 
 /**
  * Shows an alert with up to 3 buttons. A delegate callback will later set AlertResponse property
  */
 - (void)ShowAlert:(NSMutableArray*)StringArray;
 
+#if !UE_BUILD_SHIPPING && !PLATFORM_TVOS
 /**
  * Handles processing of an input console command
  */
diff --git a/Engine/Source/Runtime/Launch/Private/IOS/LaunchIOS.cpp b/Engine/Source/Runtime/Launch/Private/IOS/LaunchIOS.cpp
index eb2ea7428a5d..11516f435915 100644
--- a/Engine/Source/Runtime/Launch/Private/IOS/LaunchIOS.cpp
+++ b/Engine/Source/Runtime/Launch/Private/IOS/LaunchIOS.cpp
@@ -24,11 +24,43 @@
 FEngineLoop GEngineLoop;
 FGameLaunchDaemonMessageHandler GCommandSystem;
 
+static const double cMaxThreadWaitTime = 2.0;    // Setting this to be 2 seconds
+
 void FAppEntry::Suspend()
 {
 	if (GEngine && GEngine->GetMainAudioDevice())
 	{
-		GEngine->GetMainAudioDevice()->SuspendContext();
+        FAudioDevice* AudioDevice = GEngine->GetMainAudioDevice();
+        
+        if (FTaskGraphInterface::IsRunning())
+        {
+            FGraphEventRef ResignTask = FFunctionGraphTask::CreateAndDispatchWhenReady([AudioDevice]()
+            {
+                FAudioThread::RunCommandOnAudioThread([AudioDevice]()
+                {
+                    AudioDevice->SuspendContext();
+                }, TStatId());
+                
+                FAudioCommandFence AudioCommandFence;
+                AudioCommandFence.BeginFence();
+                AudioCommandFence.Wait();
+            }, TStatId(), NULL, ENamedThreads::GameThread);
+            
+            // Do not wait forever for this task to complete since the game thread may be stuck on waiting for user input from a modal dialog box
+            double    startTime = FPlatformTime::Seconds();
+            while((FPlatformTime::Seconds() - startTime) < cMaxThreadWaitTime)
+            {
+                FPlatformProcess::Sleep(0.05f);
+                if(ResignTask->IsComplete())
+                {
+                    break;
+                }
+            }
+        }
+        else
+        {
+            AudioDevice->SuspendContext();
+        }        
 	}
 	else
 	{
@@ -44,7 +76,22 @@ void FAppEntry::Resume()
 {
 	if (GEngine && GEngine->GetMainAudioDevice())
 	{
-		GEngine->GetMainAudioDevice()->ResumeContext();
+        FAudioDevice* AudioDevice = GEngine->GetMainAudioDevice();
+        
+        if (FTaskGraphInterface::IsRunning())
+        {
+            FFunctionGraphTask::CreateAndDispatchWhenReady([AudioDevice]()
+            {
+                FAudioThread::RunCommandOnAudioThread([AudioDevice]()
+                {
+                    AudioDevice->ResumeContext();
+                }, TStatId());
+            }, TStatId(), NULL, ENamedThreads::GameThread);
+        }
+        else
+        {
+            AudioDevice->ResumeContext();
+        }
 	}
 	else
 	{
@@ -262,6 +309,9 @@ int main(int argc, char *argv[])
 		GSavedCommandLine += UTF8_TO_TCHAR(argv[Option]);
 	}
 
+	// convert $'s to " because Xcode swallows the " and this will allow -execcmds= to be usable from xcode
+	GSavedCommandLine = GSavedCommandLine.Replace(TEXT("$"), TEXT("\""));
+
 	FIOSCommandLineHelper::InitCommandArgs(FString());
 	
 #if !UE_BUILD_SHIPPING
diff --git a/Engine/Source/Runtime/Launch/Private/LaunchEngineLoop.cpp b/Engine/Source/Runtime/Launch/Private/LaunchEngineLoop.cpp
index e45a0237c018..0c3016dfe423 100644
--- a/Engine/Source/Runtime/Launch/Private/LaunchEngineLoop.cpp
+++ b/Engine/Source/Runtime/Launch/Private/LaunchEngineLoop.cpp
@@ -132,6 +132,7 @@
 	#include "LongGPUTask.h"
 	#include "RenderUtils.h"
 	#include "DynamicResolutionState.h"
+	#include "EngineModule.h"
 
 #if !UE_SERVER
 	#include "AppMediaTimeSource.h"
@@ -148,6 +149,7 @@
 
 	#include "ShaderCodeLibrary.h"
 	#include "ShaderCache.h"
+	#include "ShaderPipelineCache.h"
 
 #if !UE_BUILD_SHIPPING
 	#include "STaskGraph.h"
@@ -208,15 +210,12 @@ class FFeedbackContext;
 	#define RHI_COMMAND_LIST_DEBUG_TRACES 0
 #endif
 
+#ifndef REAPPLY_INI_SETTINGS_AFTER_EARLY_LOADING_SCREEN
+#define REAPPLY_INI_SETTINGS_AFTER_EARLY_LOADING_SCREEN 0
+#endif
 
-#if !(IS_PROGRAM || WITH_EDITOR)
-// If enabled, pak entry filenames are unloaded from memory if possible.
-int GPakPlatformFile_UnloadFilenamesIfPossible = 0;
-static FAutoConsoleVariableRef CVar_UnloadFilenamesIfPossible(
-	TEXT("pak.UnloadFilenamesIfPossible"),
-	GPakPlatformFile_UnloadFilenamesIfPossible,
-	TEXT("Allow unloading of pak entry filenames from memory")
-);
+#if WITH_ENGINE
+	CSV_DECLARE_CATEGORY_MODULE_EXTERN(CORE_API, Basic);
 #endif
 
 int32 GUseDisregardForGCOnDedicatedServers = 1;
@@ -233,6 +232,12 @@ static TAutoConsoleVariable<int32> CVarDoAsyncEndOfFrameTasksRandomize(
 	TEXT("Used to add random sleeps to tick.DoAsyncEndOfFrameTasks to shake loose bugs on either thread. Also does random render thread flushes from the game thread.")
 	);
 
+static TAutoConsoleVariable<int32> CVarDoAsyncEndOfFrameTasksValidateReplicatedProperties(
+	TEXT("tick.DoAsyncEndOfFrameTasks.ValidateReplicatedProperties"),
+	0,
+	TEXT("If true, validates that replicated properties haven't changed during the Slate tick. Results will not be valid if demo.ClientRecordAsyncEndOfFrame is also enabled.")
+	);
+
 static FAutoConsoleTaskPriority CPrio_AsyncEndOfFrameGameTasks(
 	TEXT("TaskGraph.TaskPriorities.AsyncEndOfFrameGameTasks"),
 	TEXT("Task and thread priority for the experiemntal async end of frame tasks."),
@@ -317,7 +322,9 @@ public:
 			// fall through to standard printf path
 #endif
 
-#if PLATFORM_USE_LS_SPEC_FOR_WIDECHAR
+#if PLATFORM_TCHAR_IS_CHAR16
+			printf("%s\n", TCHAR_TO_UTF8(*FOutputDeviceHelper::FormatLogLine(Verbosity, Category, V, GPrintLogTimes)));
+#elif PLATFORM_USE_LS_SPEC_FOR_WIDECHAR
 			// printf prints wchar_t strings just fine with %ls, while mixing printf()/wprintf() is not recommended (see https://stackoverflow.com/questions/8681623/printf-and-wprintf-in-single-c-code)
 			printf("%ls\n", *line);
 #else
@@ -405,6 +412,8 @@ static void RHIExitAndStopRHIThread()
 #if HAS_GPU_STATS
 	FRealtimeGPUProfiler::Get()->Release();
 #endif
+	FShaderPipelineCache::Shutdown();
+	
 	// Stop the RHI Thread (using GRHIThread_InternalUseOnly is unreliable since RT may be stopped)
 	if (FTaskGraphInterface::IsRunning() && FTaskGraphInterface::Get().IsThreadProcessingTasks(ENamedThreads::RHIThread))
 	{
@@ -948,7 +957,6 @@ bool IsServerDelegateForOSS(FName WorldContextHandle)
 
 			if (World == nullptr)
 			{
-				UE_LOG(LogInit, Error, TEXT("Failed to determine if OSS is server in PIE, OSS requests will fail"));
 				return false;
 			}
 		}
@@ -966,6 +974,7 @@ static void UpdateCoreCsvStats()
 	CSV_CUSTOM_STAT_GLOBAL(RenderThreadTime, FPlatformTime::ToMilliseconds(GRenderThreadTime), ECsvCustomStatOp::Set);
 	CSV_CUSTOM_STAT_GLOBAL(GameThreadTime, FPlatformTime::ToMilliseconds(GGameThreadTime), ECsvCustomStatOp::Set);
 	CSV_CUSTOM_STAT_GLOBAL(GPUTime, FPlatformTime::ToMilliseconds(GGPUFrameTime), ECsvCustomStatOp::Set);
+	CSV_CUSTOM_STAT_GLOBAL(RHIThreadTime, FPlatformTime::ToMilliseconds(GRHIThreadTime), ECsvCustomStatOp::Set);
 	FPlatformMemoryStats MemoryStats = FPlatformMemory::GetStats();
 	float PhysicalMBFree = float(MemoryStats.AvailablePhysical / 1024) / 1024.0f;
 	CSV_CUSTOM_STAT_GLOBAL(MemoryFreeMB, PhysicalMBFree, ECsvCustomStatOp::Set);
@@ -1450,6 +1459,15 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 		return 1;
 	}
 
+	const bool bShouldReapplyCVarsFromIniAfterLoadScreen = REAPPLY_INI_SETTINGS_AFTER_EARLY_LOADING_SCREEN;
+	if (bShouldReapplyCVarsFromIniAfterLoadScreen)
+	{
+		UE_LOG(LogInit, Verbose, TEXT("Reapplying ini settings after early loading screen."));
+
+		extern CORE_API void RecordApplyCVarSettingsFromIni();
+		RecordApplyCVarSettingsFromIni();
+	}
+
 #if WITH_ENGINE
 	extern ENGINE_API void InitializeRenderingCVarsCaching();
 	InitializeRenderingCVarsCaching();
@@ -1558,7 +1576,7 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 			{
 				NumThreadsInThreadPool = 2;
 			}
-			verify(GIOThreadPool->Create(NumThreadsInThreadPool, 64 * 1024, TPri_AboveNormal));
+			verify(GIOThreadPool->Create(NumThreadsInThreadPool, 96 * 1024, TPri_AboveNormal));
 		}
 	}
 
@@ -1593,12 +1611,7 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	// Set all CVars which have been setup in the device profiles.
 	UDeviceProfileManager::InitializeCVarsForActiveDeviceProfile();
 
-	if (FApp::ShouldUseThreadingForPerformance() && FPlatformMisc::AllowRenderThread()
-#if ENABLE_LOW_LEVEL_MEM_TRACKER
-		// disable rendering thread when LLM is on so that memory is attributer better
-		&& !FLowLevelMemTracker::Get().ShouldReduceThreads()
-#endif
-		)
+	if (FPlatformMisc::UseRenderThread())
 	{
 		GUseThreadedRendering = true;
 	}
@@ -1760,7 +1773,7 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	}
 #if WITH_ENGINE
 
-	EndInitTextLocalization();
+	InitEngineTextLocalization();
 
 	// This must be called before any window (including the splash screen is created
 	FSlateApplication::InitHighDPI();
@@ -1824,7 +1837,11 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	if (FPlatformProperties::RequiresCookedData())
 	{
 		// Will open material shader code storage if project was packaged with it
+        // This only opens the Global shader library, which is always in the content dir.
 		FShaderCodeLibrary::InitForRuntime(GMaxRHIShaderPlatform);
+			
+		// Will open the pipeline cache if available
+		FShaderPipelineCache::Initialize(GMaxRHIShaderPlatform);
 	}
 
 	FShaderCache::LoadBinaryCache();
@@ -1838,8 +1855,10 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 		GDistanceFieldAsyncQueue = new FDistanceFieldAsyncQueue();
 	}
 
+	// Cache the renderer module in the main thread so that we can safely retrieve it later from the rendering thread.
+	GetRendererModule();
+
 	{
-		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Initial UObject load"), STAT_InitialUObjectLoad, STATGROUP_LoadTime);
 
 		// Initialize shader types before loading any shaders
 		InitializeShaderTypes();
@@ -1876,11 +1895,7 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 		{
 			if(GRHISupportsRHIThread)
 			{
-#if PLATFORM_ANDROID
-				const bool DefaultUseRHIThread = !PLATFORM_RHITHREAD_DEFAULT_BYPASS; // temporary until we decide this is the default.
-#else
 				const bool DefaultUseRHIThread = true;
-#endif
 				GUseRHIThread_InternalUseOnly = DefaultUseRHIThread;
 				if(FParse::Param(FCommandLine::Get(), TEXT("rhithread")))
 				{
@@ -1914,15 +1929,79 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 			// it wouldn't have anything in it's .ini file)
 			GetMoviePlayer()->SetupLoadingScreenFromIni();
 
+			// Load up all modules that need to hook into the loading screen
+			if (!IProjectManager::Get().LoadModulesForProject(ELoadingPhase::PreEarlyLoadingScreen) || !IPluginManager::Get().LoadModulesForEnabledPlugins(ELoadingPhase::PreEarlyLoadingScreen))
+			{
+				return 1;
+			}
+
 			if (GetMoviePlayer()->HasEarlyStartupMovie())
 			{
 				GetMoviePlayer()->Initialize(SlateRenderer.Get());
 
-				// hide splash screen now
+                // hide splash screen now before playing any movies
 				FPlatformMisc::PlatformHandleSplashScreen(false);
 
 				// only allowed to play any movies marked as early startup.  These movies or widgets can have no interaction whatsoever with uobjects or engine features
 				GetMoviePlayer()->PlayEarlyStartupMovies();
+
+                // display the splash screen again now that early startup movies have played
+                FPlatformMisc::PlatformHandleSplashScreen(true);
+
+#if 0 && PAK_TRACKER// dump the files which have been accessed inside the pak file
+				FPakPlatformFile* PakPlatformFile = (FPakPlatformFile*)(FPlatformFileManager::Get().FindPlatformFile(FPakPlatformFile::GetTypeName()));
+				FString FileList = TEXT("All files accessed before init\n");
+				for (const auto& PakMapFile : PakPlatformFile->GetPakMap())
+				{
+					FileList += PakMapFile.Key + TEXT("\n");
+				}
+				UE_LOG(LogInit, Display, TEXT("\n%s"), *FileList);
+#endif
+
+#if 0 && CONFIG_REMEMBER_ACCESS_PATTERN
+
+				TArray<FString> ConfigFilenames;
+				GConfig->GetConfigFilenames(ConfigFilenames);
+				for (const FString& ConfigFilename : ConfigFilenames)
+				{
+					const FConfigFile* Config = GConfig->FindConfigFile(ConfigFilename);
+
+					for (auto& ConfigSection : *Config)
+					{
+						TSet<FName> ProcessedValues;
+						const FName SectionName = FName(*ConfigSection.Key);
+
+						for (auto& ConfigValue : ConfigSection.Value)
+						{
+							const FName& ValueName = ConfigValue.Key;
+							if (ProcessedValues.Contains(ValueName))
+								continue;
+
+							ProcessedValues.Add(ValueName);
+
+							TArray<FConfigValue> ValueArray;
+							ConfigSection.Value.MultiFind(ValueName, ValueArray, true);
+
+							bool bHasBeenAccessed = false;
+							for (const auto& ValueArrayEntry : ValueArray)
+							{
+								if (ValueArrayEntry.HasBeenRead())
+								{
+									bHasBeenAccessed = true;
+									break;
+								}
+							}
+
+							if (bHasBeenAccessed)
+							{
+								UE_LOG(LogInit, Display, TEXT("Accessed Ini Setting %s %s %s"), *ConfigFilename, *SectionName.ToString(), *ValueName.ToString());
+							}
+
+						}
+					}
+
+				}
+#endif
 			}
 		}
 		else if ( IsRunningCommandlet() )
@@ -1931,6 +2010,33 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 			FEngineFontServices::Create();
 		}
 #endif
+		if (bShouldReapplyCVarsFromIniAfterLoadScreen)
+		{
+			if (FCoreDelegates::OnMountAllPakFiles.IsBound() )
+			{
+				TArray<FString> PakFolders;
+				PakFolders.Add(FPaths::Combine(*FPaths::ProjectPersistentDownloadDir(), TEXT("InstalledContent"), FApp::GetProjectName(), TEXT("Content"), TEXT("Paks")));
+				FCoreDelegates::OnMountAllPakFiles.Execute(PakFolders);
+			}
+
+			extern CORE_API void ReapplyRecordedCVarSettingsFromIni();
+			extern CORE_API void DeleteRecordedCVarSettingsFromIni();
+
+			ReapplyRecordedCVarSettingsFromIni();
+			DeleteRecordedCVarSettingsFromIni();
+
+		}
+
+		if (FPlatformProperties::RequiresCookedData())
+		{
+			// Open the game library which contains the material shaders.
+	        FShaderCodeLibrary::OpenLibrary(FApp::GetProjectName(), FPaths::ProjectContentDir());
+			FShaderCodeLibrary::OpenLibrary(FApp::GetProjectName(), FPaths::Combine(*FPaths::ProjectPersistentDownloadDir(), TEXT("InstalledContent"), FApp::GetProjectName(), TEXT("Content")));
+		}
+		
+		InitGameTextLocalization();
+
+		DECLARE_SCOPE_CYCLE_COUNTER(TEXT("Initial UObject load"), STAT_InitialUObjectLoad, STATGROUP_LoadTime);
 
 		// In order to be able to use short script package names get all script
 		// package names from ini files and register them with FPackageName system.
@@ -1938,7 +2044,6 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 
 		SlowTask.EnterProgressFrame(5);
 
-
 #if USE_EVENT_DRIVEN_ASYNC_LOAD_AT_BOOT_TIME
 		// If we don't do this now and the async loading thread is active, then we will attempt to load this module from a thread
 		FModuleManager::Get().LoadModule("AssetRegistry");
@@ -2021,11 +2126,7 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	{
 		if (GRHISupportsRHIThread)
 		{
-#if PLATFORM_ANDROID
-			const bool DefaultUseRHIThread = !PLATFORM_RHITHREAD_DEFAULT_BYPASS; // temporary until we decide this is the default.
-#else
 			const bool DefaultUseRHIThread = true;
-#endif
 			GUseRHIThread_InternalUseOnly = DefaultUseRHIThread;
 			if (FParse::Param(FCommandLine::Get(),TEXT("rhithread")))
 			{
@@ -2040,7 +2141,6 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	}
 #endif // !PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK
 
-
 	// Playing a movie can only happen after the rendering thread is started.
 #if !UE_SERVER// && !UE_EDITOR
 	if (!IsRunningDedicatedServer() && !IsRunningCommandlet() && !GetMoviePlayer()->IsMovieCurrentlyPlaying())
@@ -2425,7 +2525,8 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	}
 
 #else // WITH_ENGINE
-	EndInitTextLocalization();
+	InitEngineTextLocalization();
+	InitGameTextLocalization();
 #if USE_LOCALIZED_PACKAGE_CACHE
 	FPackageLocalizationManager::Get().InitializeFromDefaultCache();
 #endif	// USE_LOCALIZED_PACKAGE_CACHE
@@ -2435,14 +2536,6 @@ int32 FEngineLoop::PreInit(const TCHAR* CmdLine)
 	//run automation smoke tests now that everything is setup to run
 	FAutomationTestFramework::Get().RunSmokeTests();
 
-#if !(IS_PROGRAM || WITH_EDITOR)
-	if (GPakPlatformFile_UnloadFilenamesIfPossible)
-	{
-		FPakPlatformFile* PakPlatformFile = (FPakPlatformFile*)(FPlatformFileManager::Get().FindPlatformFile(FPakPlatformFile::GetTypeName()));
-		PakPlatformFile->UnloadFilenames(true);
-	}
-#endif
-
 	// Note we still have 20% remaining on the slow task: this will be used by the Editor/Engine initialization next
 	return 0;
 }
@@ -2735,11 +2828,6 @@ int32 FEngineLoop::Init()
 {
 	LLM_SCOPE(ELLMTag::EngineInitMemory);
 
-#if defined(WITH_CODE_GUARD_HANDLER) && WITH_CODE_GUARD_HANDLER
-	void CheckImageIntegrity();
-	CheckImageIntegrity();
-#endif
-
 	DECLARE_SCOPE_CYCLE_COUNTER( TEXT( "FEngineLoop::Init" ), STAT_FEngineLoop_Init, STATGROUP_LoadTime );
 
 	FScopedSlowTask SlowTask(100);
@@ -2802,8 +2890,12 @@ int32 FEngineLoop::Init()
 		if (!IsRunningCommandlet())
 		{
 			SessionService = FModuleManager::LoadModuleChecked<ISessionServicesModule>("SessionServices").GetSessionService();
+			
+			if (SessionService.IsValid())
+			{
 			SessionService->Start();
 		}
+		}
 
 		EngineService = new FEngineService();
 	}
@@ -2863,6 +2955,11 @@ int32 FEngineLoop::Init()
 	// Ready to measure thread heartbeat
 	FThreadHeartBeat::Get().Start();
 
+#if defined(WITH_CODE_GUARD_HANDLER) && WITH_CODE_GUARD_HANDLER
+    void CheckImageIntegrity();
+    CheckImageIntegrity();
+#endif
+    
 	FCoreDelegates::OnFEngineLoopInitComplete.Broadcast();
 	return 0;
 }
@@ -3184,6 +3281,17 @@ uint64 FScopedSampleMallocChurn::DumpFrame = 0;
 
 #endif
 
+static inline void IssueLongGPUTaskHelper()
+{
+#if WITH_PROFILEGPU && !UE_BUILD_SHIPPING
+	if (GTriggerGPUProfile && !GTriggerGPUHitchProfile)
+	{
+		FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+		IssueScalableLongGPUTask(RHICmdList);
+	}
+#endif
+}
+
 void FEngineLoop::Tick()
 {
 #if !UE_BUILD_SHIPPING && !UE_BUILD_TEST && MALLOC_GT_HOOKS
@@ -3207,14 +3315,18 @@ void FEngineLoop::Tick()
 	// Ensure we aren't starting a frame while loading or playing a loading movie
 	ensure(GetMoviePlayer()->IsLoadingFinished() && !GetMoviePlayer()->IsMovieCurrentlyPlaying());
 
+#if UE_EXTERNAL_PROFILING_ENABLED
 	FExternalProfiler* ActiveProfiler = FActiveExternalProfilerBase::GetActiveProfiler();
 	if (ActiveProfiler)
 	{
 		ActiveProfiler->FrameSync();
 	}
+#endif		// UE_EXTERNAL_PROFILING_ENABLED
+
 	FPlatformMisc::BeginNamedEventFrame();
 
-	SCOPED_NAMED_EVENT(FEngineLoopTick, FColor::Red);
+	uint64 CurrentFrameCounter = GFrameCounter;
+	SCOPED_NAMED_EVENT_F(TEXT("Frame %d"), FColor::Red, CurrentFrameCounter);
 
 	// execute callbacks for cvar changes
 	{
@@ -3225,7 +3337,7 @@ void FEngineLoop::Tick()
 	{
 		SCOPE_CYCLE_COUNTER(STAT_FrameTime);
 
-		#if WITH_PROFILEGPU
+		#if WITH_PROFILEGPU && !UE_BUILD_SHIPPING
 			// Issue the measurement of the execution time of a basic LongGPUTask unit on the very first frame
 			// The results will be retrived on the first call of IssueScalableLongGPUTask
 			if (GFrameCounter == 0 && IsFeatureLevelSupported(GMaxRHIShaderPlatform, ERHIFeatureLevel::SM4) && FApp::CanEverRender())
@@ -3262,20 +3374,19 @@ void FEngineLoop::Tick()
 		}
 
 		// beginning of RHI frame
-		ENQUEUE_UNIQUE_RENDER_COMMAND(
-			BeginFrame,
+		ENQUEUE_RENDER_COMMAND(BeginFrame)([CurrentFrameCounter](FRHICommandListImmediate& RHICmdList)
 			{
 				GRHICommandList.LatchBypass();
 				GFrameNumberRenderThread++;
 
 				// If we are profiling, kick off a long GPU task to make the GPU always behind the CPU so that we
 				// won't get GPU idle time measured in profiling results
-				if (GTriggerGPUProfile && !GTriggerGPUHitchProfile)
-				{
-					IssueScalableLongGPUTask(RHICmdList);
-				}
+			IssueLongGPUTaskHelper();
+
+			FString FrameString = FString::Printf(TEXT("Frame %d"), CurrentFrameCounter);
+			FPlatformMisc::BeginNamedEvent(FColor::Yellow, *FrameString);
+			RHICmdList.PushEvent(*FrameString, FColor::Green);
 
-				RHICmdList.PushEvent(*FString::Printf(TEXT("Frame%d"),GFrameNumberRenderThread), FColor(0, 255, 0, 255));
 				GPU_STATS_BEGINFRAME(RHICmdList);
 				RHICmdList.BeginFrame();
 				FCoreDelegates::OnBeginFrameRT.Broadcast();
@@ -3434,12 +3545,21 @@ void FEngineLoop::Tick()
 		FGraphEventRef ConcurrentTask;
 		const bool bDoConcurrentSlateTick = GEngine->ShouldDoAsyncEndOfFrameTasks();
 
+		const UGameViewportClient* const GameViewport = GEngine->GameViewport;
+		const UWorld* const GameViewportWorld = GameViewport ? GameViewport->GetWorld() : nullptr;
+		UDemoNetDriver* const CurrentDemoNetDriver = GameViewportWorld ? GameViewportWorld->DemoNetDriver : nullptr;
+
+		// Optionally validate that Slate has not modified any replicated properties for client replay recording.
+		FDemoSavedPropertyState PreSlateObjectStates;
+		const bool bValidateReplicatedProperties = CurrentDemoNetDriver && CVarDoAsyncEndOfFrameTasksValidateReplicatedProperties.GetValueOnGameThread() != 0;
+		if (bValidateReplicatedProperties)
+		{
+			PreSlateObjectStates = CurrentDemoNetDriver->SavePropertyState();
+		}
+
 		if (bDoConcurrentSlateTick)
 		{
 			const float DeltaSeconds = FApp::GetDeltaTime();
-			const UGameViewportClient* const GameViewport = GEngine->GameViewport;
-			const UWorld* const GameViewportWorld = GameViewport ? GameViewport->GetWorld() : nullptr;
-			UDemoNetDriver* const CurrentDemoNetDriver = GameViewportWorld ? GameViewportWorld->DemoNetDriver : nullptr;
 
 			if (CurrentDemoNetDriver && CurrentDemoNetDriver->ShouldTickFlushAsyncEndOfFrame())
 			{
@@ -3474,8 +3594,19 @@ void FEngineLoop::Tick()
 		}
 
 #if WITH_ENGINE
+		if (bValidateReplicatedProperties)
+		{
+			const bool bReplicatedPropertiesDifferent = CurrentDemoNetDriver->ComparePropertyState(PreSlateObjectStates);
+			if (bReplicatedPropertiesDifferent)
+			{
+				UE_LOG(LogInit, Log, TEXT("Replicated properties changed during Slate tick!"));
+			}
+		}
+
 		if (ConcurrentTask.GetReference())
 		{
+			CSV_SCOPED_TIMING_STAT(Basic, ConcurrentWithSlateTickTasks_Wait);
+
 			QUICK_SCOPE_CYCLE_COUNTER(STAT_ConcurrentWithSlateTickTasks_Wait);
 			FTaskGraphInterface::Get().WaitUntilTaskCompletes(ConcurrentTask);
 			ConcurrentTask = nullptr;
@@ -3587,6 +3718,7 @@ void FEngineLoop::Tick()
 			RHICmdList.EndFrame();
 			GPU_STATS_ENDFRAME(RHICmdList);
 			RHICmdList.PopEvent();
+			FPlatformMisc::EndNamedEvent();
 		});
 
 		// Set CPU utilization stats.
@@ -3846,11 +3978,14 @@ bool FEngineLoop::AppInit( )
 
 	CheckForPrintTimesOverride();
 
+	IPluginManager&  PluginManager  = IPluginManager::Get();
+	IProjectManager& ProjectManager = IProjectManager::Get();
+
 	// Check whether the project or any of its plugins are missing or are out of date
 #if UE_EDITOR && !IS_MONOLITHIC
-	if(!GIsBuildMachine && FPaths::IsProjectFilePathSet() && IPluginManager::Get().AreRequiredPluginsAvailable())
+	if(!GIsBuildMachine && FPaths::IsProjectFilePathSet() && PluginManager.AreRequiredPluginsAvailable())
 	{
-		const FProjectDescriptor* CurrentProject = IProjectManager::Get().GetCurrentProject();
+		const FProjectDescriptor* CurrentProject = ProjectManager.GetCurrentProject();
 		if(CurrentProject != nullptr && CurrentProject->Modules.Num() > 0)
 		{
 			bool bNeedCompile = false;
@@ -3863,8 +3998,8 @@ bool FEngineLoop::AppInit( )
 			{
 				// Check if any of the project or plugin modules are out of date, and the user wants to compile them.
 				TArray<FString> IncompatibleFiles;
-				IProjectManager::Get().CheckModuleCompatibility(IncompatibleFiles);
-				IPluginManager::Get().CheckModuleCompatibility(IncompatibleFiles);
+				ProjectManager.CheckModuleCompatibility(IncompatibleFiles);
+				PluginManager.CheckModuleCompatibility(IncompatibleFiles);
 
 				if (IncompatibleFiles.Num() > 0)
 				{
@@ -3915,8 +4050,8 @@ bool FEngineLoop::AppInit( )
 
 				// Get a list of modules which are still incompatible
 				TArray<FString> StillIncompatibleFiles;
-				IProjectManager::Get().CheckModuleCompatibility(StillIncompatibleFiles);
-				IPluginManager::Get().CheckModuleCompatibility(StillIncompatibleFiles);
+				ProjectManager.CheckModuleCompatibility(StillIncompatibleFiles);
+				PluginManager.CheckModuleCompatibility(StillIncompatibleFiles);
 
 				if(!bCompileResult || StillIncompatibleFiles.Num() > 0)
 				{
@@ -3944,15 +4079,15 @@ bool FEngineLoop::AppInit( )
 	// Must be before Render/RHI subsystem D3DCreate() for platform services that need D3D hooks like Steam
 
 	// Load "pre-init" plugin modules
-	if (!IProjectManager::Get().LoadModulesForProject(ELoadingPhase::PostConfigInit) || !IPluginManager::Get().LoadModulesForEnabledPlugins(ELoadingPhase::PostConfigInit))
+	if (!ProjectManager.LoadModulesForProject(ELoadingPhase::PostConfigInit) || !PluginManager.LoadModulesForEnabledPlugins(ELoadingPhase::PostConfigInit))
 	{
 		return false;
 	}
 
 	// Register the callback that allows the text localization manager to load data for plugins
-	FTextLocalizationManager::Get().GatherAdditionalLocResPathsCallback.AddLambda([](TArray<FString>& OutLocResPaths)
+	FCoreDelegates::GatherAdditionalLocResPathsCallback.AddLambda([&PluginManager](TArray<FString>& OutLocResPaths)
 	{
-		IPluginManager::Get().GetLocalizationPathsForEnabledPlugins(OutLocResPaths);
+		PluginManager.GetLocalizationPathsForEnabledPlugins(OutLocResPaths);
 	});
 
 	PreInitHMDDevice();
diff --git a/Engine/Source/Runtime/Launch/Private/Mac/LaunchMac.cpp b/Engine/Source/Runtime/Launch/Private/Mac/LaunchMac.cpp
index 706c220ef286..09c30158bc01 100644
--- a/Engine/Source/Runtime/Launch/Private/Mac/LaunchMac.cpp
+++ b/Engine/Source/Runtime/Launch/Private/Mac/LaunchMac.cpp
@@ -361,6 +361,9 @@ INT32_MAIN_INT32_ARGC_TCHAR_ARGV()
 	GSavedCommandLine += TEXT(" -installed");
 #endif
 
+	// convert $'s to " because Xcode swallows the " and this will allow -execcmds= to be usable from xcode
+	GSavedCommandLine = GSavedCommandLine.Replace(TEXT("$"), TEXT("\""));
+
 	SCOPED_AUTORELEASE_POOL;
 	[NSApplication sharedApplication];
 	[NSApp setDelegate:[UE4AppDelegate new]];
diff --git a/Engine/Source/Runtime/Launch/Public/Android/AndroidJNI.h b/Engine/Source/Runtime/Launch/Public/Android/AndroidJNI.h
index 092b68e7a536..8136e6311dfa 100644
--- a/Engine/Source/Runtime/Launch/Public/Android/AndroidJNI.h
+++ b/Engine/Source/Runtime/Launch/Public/Android/AndroidJNI.h
@@ -49,9 +49,16 @@ public:
 	static jmethodID AndroidThunkJava_LocalNotificationClearAll;
 	static jmethodID AndroidThunkJava_LocalNotificationGetLaunchNotification;
 	//static jmethodID AndroidThunkJava_LocalNotificationDestroyIfExists; - This is not needed yet but will be soon so just leaving commented out for now
-	static jmethodID AndroidThunkJava_HasActiveWiFiConnection;
+	static jmethodID AndroidThunkJava_GetNetworkConnectionType;
 	static jmethodID AndroidThunkJava_GetAndroidId;
+	static jmethodID AndroidThunkJava_ShareURL;
+	static jmethodID AndroidThunkJava_LaunchPackage;
+	static jmethodID AndroidThunkJava_HasIntentExtrasKey;
+	static jmethodID AndroidThunkJava_GetIntentExtrasBoolean;
+	static jmethodID AndroidThunkJava_GetIntentExtrasInt;
+	static jmethodID AndroidThunkJava_GetIntentExtrasString;
 	static jmethodID AndroidThunkJava_SetSustainedPerformanceMode;
+	static jmethodID AndroidThunkJava_PushSensorEvents;
 
 	static jmethodID AndroidThunkCpp_VirtualInputIgnoreClick;
 	static jmethodID AndroidThunkCpp_IsVirtuaKeyboardShown;
diff --git a/Engine/Source/Runtime/Launch/Resources/Version.h b/Engine/Source/Runtime/Launch/Resources/Version.h
index 3dc772bfde29..4279a8cafa7a 100644
--- a/Engine/Source/Runtime/Launch/Resources/Version.h
+++ b/Engine/Source/Runtime/Launch/Resources/Version.h
@@ -59,8 +59,7 @@
 #define ENGINE_PATCH_VERSION	0
 
 // Macros for encoding strings
-#define VERSION_TEXT_2(x) L ## x
-#define VERSION_TEXT(x) VERSION_TEXT_2(x)
+#define VERSION_TEXT(x) TEXT(x)
 #define VERSION_STRINGIFY_2(x) VERSION_TEXT(#x)
 #define VERSION_STRINGIFY(x) VERSION_STRINGIFY_2(x)
 
diff --git a/Engine/Source/Runtime/Mac/CoreAudio/Private/CoreAudioBuffer.cpp b/Engine/Source/Runtime/Mac/CoreAudio/Private/CoreAudioBuffer.cpp
index 25aa2e5b21ce..a318ada95750 100644
--- a/Engine/Source/Runtime/Mac/CoreAudio/Private/CoreAudioBuffer.cpp
+++ b/Engine/Source/Runtime/Mac/CoreAudio/Private/CoreAudioBuffer.cpp
@@ -152,7 +152,7 @@ void FCoreAudioSoundBuffer::Seek( const float SeekTime )
  */
 FCoreAudioSoundBuffer* FCoreAudioSoundBuffer::CreateQueuedBuffer( FCoreAudioDevice* CoreAudioDevice, USoundWave* Wave )
 {
-	check(Wave->bIsPrecacheDone);
+	check(Wave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 
 	// Always create a new buffer for real time decompressed sounds
 	FCoreAudioSoundBuffer* Buffer = new FCoreAudioSoundBuffer( CoreAudioDevice, SoundFormat_PCMRT );
diff --git a/Engine/Source/Runtime/Media/Private/MediaModule.cpp b/Engine/Source/Runtime/Media/Private/MediaModule.cpp
index 59a311217dda..73221b8c0dc4 100644
--- a/Engine/Source/Runtime/Media/Private/MediaModule.cpp
+++ b/Engine/Source/Runtime/Media/Private/MediaModule.cpp
@@ -136,7 +136,10 @@ public:
 
 	virtual void StartupModule() override
 	{
-		TickerThread = FRunnableThread::Create(&Ticker, TEXT("FMediaTicker"));
+		if (!IsRunningDedicatedServer())
+		{
+			TickerThread = FRunnableThread::Create(&Ticker, TEXT("FMediaTicker"));
+		}
 	}
 
 	virtual void ShutdownModule() override
diff --git a/Engine/Source/Runtime/MediaAssets/Private/Assets/MediaTexture.cpp b/Engine/Source/Runtime/MediaAssets/Private/Assets/MediaTexture.cpp
index 724b1875b072..01bf356dca53 100644
--- a/Engine/Source/Runtime/MediaAssets/Private/Assets/MediaTexture.cpp
+++ b/Engine/Source/Runtime/MediaAssets/Private/Assets/MediaTexture.cpp
@@ -213,6 +213,10 @@ void UMediaTexture::PostLoad()
 	CurrentPlayer = MediaPlayer;
 }
 
+bool UMediaTexture::IsPostLoadThreadSafe() const
+{
+	return false;
+}
 
 #if WITH_EDITOR
 
diff --git a/Engine/Source/Runtime/MediaAssets/Public/MediaTexture.h b/Engine/Source/Runtime/MediaAssets/Public/MediaTexture.h
index e8d2e5db411c..f4684b7cc7c1 100644
--- a/Engine/Source/Runtime/MediaAssets/Public/MediaTexture.h
+++ b/Engine/Source/Runtime/MediaAssets/Public/MediaTexture.h
@@ -136,6 +136,7 @@ public:
 	virtual FString GetDesc() override;
 	virtual void GetResourceSizeEx(FResourceSizeEx& CumulativeResourceSize) override;
 	virtual void PostLoad() override;
+	virtual bool IsPostLoadThreadSafe() const override;
 
 #if WITH_EDITOR
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
diff --git a/Engine/Source/Runtime/Messaging/Private/Bus/MessageTracer.cpp b/Engine/Source/Runtime/Messaging/Private/Bus/MessageTracer.cpp
index b7297dedb79c..af2191f7dc56 100644
--- a/Engine/Source/Runtime/Messaging/Private/Bus/MessageTracer.cpp
+++ b/Engine/Source/Runtime/Messaging/Private/Bus/MessageTracer.cpp
@@ -446,6 +446,8 @@ void FMessageTracer::Stop()
 
 bool FMessageTracer::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FMessageTracer_Tick);
+
 	if (ResetPending)
 	{
 		ResetMessages();
diff --git a/Engine/Source/Runtime/Messaging/Private/MessagingModule.cpp b/Engine/Source/Runtime/Messaging/Private/MessagingModule.cpp
index 2abb3ae894ea..7242e7f217e0 100644
--- a/Engine/Source/Runtime/Messaging/Private/MessagingModule.cpp
+++ b/Engine/Source/Runtime/Messaging/Private/MessagingModule.cpp
@@ -13,7 +13,7 @@
 
 
 #ifndef PLATFORM_SUPPORTS_MESSAGEBUS
-	#define PLATFORM_SUPPORTS_MESSAGEBUS 1
+	#define PLATFORM_SUPPORTS_MESSAGEBUS !UE_BUILD_SHIPPING
 #endif
 
 
diff --git a/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcClient.cpp b/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcClient.cpp
index c5e124d8eafb..8f5fe7196c23 100644
--- a/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcClient.cpp
+++ b/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcClient.cpp
@@ -145,6 +145,8 @@ void FMessageRpcClient::HandleRpcMessages(const TSharedRef<IMessageContext, ESPM
 
 bool FMessageRpcClient::HandleTicker(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FMessageRpcClient_HandleTicker);
+
 	const FDateTime UtcNow = FDateTime::UtcNow();
 
 	for (TMap<FGuid, TSharedPtr<IMessageRpcCall>>::TIterator It(Calls); It; ++It)
diff --git a/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcServer.cpp b/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcServer.cpp
index b3cd4c0c219d..7b331e08a6f5 100644
--- a/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcServer.cpp
+++ b/Engine/Source/Runtime/MessagingRpc/Private/MessageRpcServer.cpp
@@ -165,6 +165,8 @@ void FMessageRpcServer::HandleMessage(const TSharedRef<IMessageContext, ESPMode:
 
 bool FMessageRpcServer::HandleTicker(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FMessageRpcServer_HandleTicker);
+
 	const FDateTime UtcNow = FDateTime::UtcNow();
 
 	for (TMap<FGuid, FReturnInfo>::TIterator It(Returns); It; ++It)
diff --git a/Engine/Source/Runtime/MessagingRpc/Public/MessageRpcMessages.h b/Engine/Source/Runtime/MessagingRpc/Public/MessageRpcMessages.h
index ac3c503709f5..fc3c655ce41d 100644
--- a/Engine/Source/Runtime/MessagingRpc/Public/MessageRpcMessages.h
+++ b/Engine/Source/Runtime/MessagingRpc/Public/MessageRpcMessages.h
@@ -48,7 +48,7 @@ struct FMessageRpcProgress
 	FString StatusText;
 
 	/** Default constructor. */
-	FMessageRpcProgress() { }
+	FMessageRpcProgress() : Completion(0.0f) { }
 
 	/** Creates and initializes a new instance. */
 	FMessageRpcProgress(const FGuid& InCallId, float InCompletion, const FText& InStatusText)
diff --git a/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.cpp b/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.cpp
index 0f92dfe55e71..4e41aec4c4ac 100644
--- a/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.cpp
+++ b/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.cpp
@@ -353,6 +353,12 @@ bool FDefaultGameMoviePlayer::PlayMovie()
 
 			bBeganPlaying = true;
 		}
+
+		//Allow anything that set up this LoadingScreenAttribute to know the loading screen is now displaying
+		if (bBeganPlaying)
+		{
+			OnMoviePlaybackStarted().Broadcast();
+		}
 	}
 
 	return bBeganPlaying;
@@ -373,10 +379,6 @@ void FDefaultGameMoviePlayer::StopMovie()
 {
 	LastPlayTime = 0;
 	bUserCalledFinish = true;
-	if (UserWidgetHolder.IsValid())
-	{
-		UserWidgetHolder->SetContent( SNullWidget::NullWidget );
-	}
 }
 
 void FDefaultGameMoviePlayer::WaitForMovieToFinish(bool bAllowEngineTick)
@@ -478,8 +480,6 @@ void FDefaultGameMoviePlayer::WaitForMovieToFinish(bool bAllowEngineTick)
 			}
 		}
 
-		UserWidgetHolder->SetContent( SNullWidget::NullWidget );
-
 		LoadingIsDone.Set(1);
 		IsMoviePlaying = false;
 
diff --git a/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.h b/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.h
index 9b7797d39971..8bf090fbe6c3 100644
--- a/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.h
+++ b/Engine/Source/Runtime/MoviePlayer/Private/DefaultGameMoviePlayer.h
@@ -83,6 +83,7 @@ public:
 	virtual bool IsStartupMoviePlaying() const override { return IsMoviePlaying; };
 
 	virtual FOnPrepareLoadingScreen& OnPrepareLoadingScreen() override { return OnPrepareLoadingScreenDelegate; }
+	virtual FOnMoviePlaybackStarted& OnMoviePlaybackStarted() override { return OnMoviePlaybackStartedDelegate; }
 	virtual FOnMoviePlaybackFinished& OnMoviePlaybackFinished() override { return OnMoviePlaybackFinishedDelegate; }
 	virtual FOnMovieClipFinished& OnMovieClipFinished() override { return OnMovieClipFinishedDelegate; }
 
@@ -170,6 +171,8 @@ private:
 	/** Called before a movie is queued up to play to configure the movie player accordingly. */
 	FOnPrepareLoadingScreen OnPrepareLoadingScreenDelegate;
 	
+	FOnMoviePlaybackStarted OnMoviePlaybackStartedDelegate;
+
 	FOnMoviePlaybackFinished OnMoviePlaybackFinishedDelegate;
 
 	FOnMovieClipFinished OnMovieClipFinishedDelegate;
diff --git a/Engine/Source/Runtime/MoviePlayer/Private/MoviePlayer.cpp b/Engine/Source/Runtime/MoviePlayer/Private/MoviePlayer.cpp
index 8def97ecbf69..adcfb1e6f0bc 100644
--- a/Engine/Source/Runtime/MoviePlayer/Private/MoviePlayer.cpp
+++ b/Engine/Source/Runtime/MoviePlayer/Private/MoviePlayer.cpp
@@ -65,7 +65,6 @@ TSharedRef<SWidget> FLoadingScreenAttributes::NewTestLoadingScreenWidget()
 	return SNew(SLoadingScreenTestWidget);
 }
 
-
 void CreateMoviePlayer()
 {
 	// Do not create the movie player if it already exists
diff --git a/Engine/Source/Runtime/MoviePlayer/Private/NullMoviePlayer.h b/Engine/Source/Runtime/MoviePlayer/Private/NullMoviePlayer.h
index 231811d274d5..0a083e96d7da 100644
--- a/Engine/Source/Runtime/MoviePlayer/Private/NullMoviePlayer.h
+++ b/Engine/Source/Runtime/MoviePlayer/Private/NullMoviePlayer.h
@@ -46,6 +46,7 @@ public:
 	virtual bool LoadingScreenIsPrepared() const override {return false;}
 	virtual void SetupLoadingScreenFromIni() override {}
 	virtual FOnPrepareLoadingScreen& OnPrepareLoadingScreen() override { return OnPrepareLoadingScreenDelegate; }
+	virtual FOnMoviePlaybackStarted& OnMoviePlaybackStarted() override { return OnMoviePlaybackStartedDelegate; }
 	virtual FOnMoviePlaybackFinished& OnMoviePlaybackFinished() override { return OnMoviePlaybackFinishedDelegate; }
 	virtual FOnMovieClipFinished& OnMovieClipFinished() override { return OnMovieClipFinishedDelegate; }
 	virtual void SetSlateOverlayWidget(TSharedPtr<SWidget> NewOverlayWidget) override { }
@@ -64,6 +65,7 @@ private:
 	/** Called before a movie is queued up to play to configure the movie player accordingly. */
 	FOnPrepareLoadingScreen OnPrepareLoadingScreenDelegate;
 
+	FOnMoviePlaybackStarted OnMoviePlaybackStartedDelegate;
 	FOnMoviePlaybackFinished OnMoviePlaybackFinishedDelegate;
 	FOnMovieClipFinished OnMovieClipFinishedDelegate;
 
diff --git a/Engine/Source/Runtime/MoviePlayer/Public/MoviePlayer.h b/Engine/Source/Runtime/MoviePlayer/Public/MoviePlayer.h
index 1bd9eb86933d..b6feb8dceae7 100644
--- a/Engine/Source/Runtime/MoviePlayer/Public/MoviePlayer.h
+++ b/Engine/Source/Runtime/MoviePlayer/Public/MoviePlayer.h
@@ -217,6 +217,10 @@ public:
 	/** returns true if the movie being played in the last one in the play list */
 	virtual bool IsLastMovieInPlaylist() = 0;
 
+	/* Callback for when the LoadingScreen setup above in WidgetLoadingScreen is displayed **/
+	DECLARE_EVENT(IGameMoviePlayer, FOnMoviePlaybackStarted)
+	virtual FOnMoviePlaybackStarted& OnMoviePlaybackStarted() = 0;
+
 	DECLARE_EVENT(IGameMoviePlayer, FOnMoviePlaybackFinished)
 	virtual FOnMoviePlaybackFinished& OnMoviePlaybackFinished() = 0;
 
diff --git a/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneAnimTypeID.cpp b/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneAnimTypeID.cpp
index 4ba5b9284004..5d2e0fc17cff 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneAnimTypeID.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneAnimTypeID.cpp
@@ -2,12 +2,9 @@
 
 #include "Evaluation/MovieSceneAnimTypeID.h"
 
-namespace Lex
+FString LexToString(const FMovieSceneAnimTypeID& AnimTypeID)
 {
-	FString ToString(const FMovieSceneAnimTypeID& AnimTypeID)
-	{
-		return FString::Printf(TEXT("%#010x"), AnimTypeID.ID);
-	}
+	return FString::Printf(TEXT("%#010x"), AnimTypeID.ID);
 }
 
 uint64 FMovieSceneAnimTypeID::Initialize(uint64* StaticPtr, uint32 Seed)
diff --git a/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneSequenceHierarchy.cpp b/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneSequenceHierarchy.cpp
index d49a78d9b4d9..23418b76c30c 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneSequenceHierarchy.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/Evaluation/MovieSceneSequenceHierarchy.cpp
@@ -8,6 +8,7 @@
 
 FMovieSceneSubSequenceData::FMovieSceneSubSequenceData()
 	: Sequence(nullptr)
+	, HierarchicalBias(0)
 {}
 
 FMovieSceneSubSequenceData::FMovieSceneSubSequenceData(const UMovieSceneSubSection& InSubSection)
diff --git a/Engine/Source/Runtime/MovieScene/Private/MovieScene.cpp b/Engine/Source/Runtime/MovieScene/Private/MovieScene.cpp
index fd6d9258282e..072b57aba56b 100644
--- a/Engine/Source/Runtime/MovieScene/Private/MovieScene.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/MovieScene.cpp
@@ -55,6 +55,11 @@ UMovieScene::UMovieScene(const FObjectInitializer& ObjectInitializer)
 #endif
 }
 
+bool UMovieScene::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UMovieScene::Serialize( FArchive& Ar )
 {
 	Ar.UsingCustomVersion(FMovieSceneEvaluationCustomVersion::GUID);
diff --git a/Engine/Source/Runtime/MovieScene/Private/MovieSceneCommonHelpers.cpp b/Engine/Source/Runtime/MovieScene/Private/MovieSceneCommonHelpers.cpp
index 6eb41231cba7..ba92f7f4a798 100644
--- a/Engine/Source/Runtime/MovieScene/Private/MovieSceneCommonHelpers.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/MovieSceneCommonHelpers.cpp
@@ -277,7 +277,7 @@ FPropertyAndIndex FindPropertyAndArrayIndex(UStruct* InStruct, const FString& Pr
 			{
 				TCHAR NumberBuffer[11];
 				FMemory::Memcpy(NumberBuffer, &PropertyName[OpenIndex + 1], sizeof(TCHAR) * NumberLength);
-				LexicalConversion::FromString(PropertyAndIndex.ArrayIndex, NumberBuffer);
+				LexFromString(PropertyAndIndex.ArrayIndex, NumberBuffer);
 			}
 
 			return PropertyAndIndex;
diff --git a/Engine/Source/Runtime/MovieScene/Private/MovieSceneSection.cpp b/Engine/Source/Runtime/MovieScene/Private/MovieSceneSection.cpp
index f8da7eba6eaa..be64b7a96f42 100644
--- a/Engine/Source/Runtime/MovieScene/Private/MovieSceneSection.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/MovieSceneSection.cpp
@@ -57,6 +57,11 @@ void UMovieSceneSection::PostInitProperties()
 	}
 }
 
+bool UMovieSceneSection::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UMovieSceneSection::Serialize(FArchive& Ar)
 {
 	Super::Serialize(Ar);
diff --git a/Engine/Source/Runtime/MovieScene/Private/MovieSceneSequence.cpp b/Engine/Source/Runtime/MovieScene/Private/MovieSceneSequence.cpp
index cf52122e8a2a..237ff8dd09de 100644
--- a/Engine/Source/Runtime/MovieScene/Private/MovieSceneSequence.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/MovieSceneSequence.cpp
@@ -42,7 +42,7 @@ void UMovieSceneSequence::PostLoad()
 void UMovieSceneSequence::PreSave(const ITargetPlatform* TargetPlatform)
 {
 #if WITH_EDITOR
-	if (!HasAnyFlags(RF_ClassDefaultObject))
+	if (!HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
 	{
 		if (TargetPlatform && TargetPlatform->RequiresCookedData())
 		{
diff --git a/Engine/Source/Runtime/MovieScene/Private/MovieSceneTrack.cpp b/Engine/Source/Runtime/MovieScene/Private/MovieSceneTrack.cpp
index 0f835656f45a..79760cedc056 100644
--- a/Engine/Source/Runtime/MovieScene/Private/MovieSceneTrack.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/MovieSceneTrack.cpp
@@ -43,6 +43,11 @@ void UMovieSceneTrack::PostLoad()
 	}
 }
 
+bool UMovieSceneTrack::IsPostLoadThreadSafe() const
+{
+	return true;
+}
+
 void UMovieSceneTrack::UpdateEasing()
 {
 	int32 MaxRows = GetMaxRowIndex();
diff --git a/Engine/Source/Runtime/MovieScene/Private/Sections/MovieSceneSubSection.cpp b/Engine/Source/Runtime/MovieScene/Private/Sections/MovieSceneSubSection.cpp
index d0bcbd18f0fe..f40ed15fbbda 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Sections/MovieSceneSubSection.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/Sections/MovieSceneSubSection.cpp
@@ -213,7 +213,7 @@ UMovieSceneSection* UMovieSceneSubSection::SplitSection( FQualifiedFrameTime Spl
 
 	FFrameNumber InitialStartOffset = Parameters.GetStartFrameOffset();
 
-	UMovieSceneSubSection* NewSection = Cast<UMovieSceneSubSection>( UMovieSceneSection::SplitSection(SplitTime));
+	UMovieSceneSubSection* NewSection = Cast<UMovieSceneSubSection>( UMovieSceneSection::SplitSection( SplitTime ) );
 	if ( NewSection )
 	{
 		if (InitialRange.GetLowerBound().IsClosed())
diff --git a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneSegmentCompilerTests.cpp b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneSegmentCompilerTests.cpp
index fe73ddcf0e23..20ef00dbb67c 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneSegmentCompilerTests.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneSegmentCompilerTests.cpp
@@ -82,15 +82,13 @@ namespace Impl
 	
 	FORCEINLINE_DEBUGGABLE void AssertSegmentValues(FAutomationTestBase* Test, TArrayView<const FMovieSceneSegment> Expected, TArrayView<const FMovieSceneSegment> Actual)
 	{
-		using namespace Lex;
-
 		for (const FMovieSceneSegment& Segment : Actual)
 		{
-			Test->AddInfo(FString::Printf(TEXT("Actual   %s, Impls: %s"), *ToString(Segment.Range), *Join(Segment.Impls)));
+			Test->AddInfo(FString::Printf(TEXT("Actual   %s, Impls: %s"), *LexToString(Segment.Range), *Join(Segment.Impls)));
 		}
 		for (const FMovieSceneSegment& Segment : Expected)
 		{
-			Test->AddInfo(FString::Printf(TEXT("Expected %s, Impls: %s"), *ToString(Segment.Range), *Join(Segment.Impls)));
+			Test->AddInfo(FString::Printf(TEXT("Expected %s, Impls: %s"), *LexToString(Segment.Range), *Join(Segment.Impls)));
 		}
 
 		if (Actual.Num() != Expected.Num())
@@ -104,7 +102,7 @@ namespace Impl
 
 			if (ExpectedSegment.Range != ActualSegment.Range)
 			{
-				Test->AddError(FString::Printf(TEXT("Incorrect compiled segment range at segment index %d. Expected:\n%s\nActual:\n%s"), Index, *ToString(ExpectedSegment.Range), *ToString(ActualSegment.Range)));
+				Test->AddError(FString::Printf(TEXT("Incorrect compiled segment range at segment index %d. Expected:\n%s\nActual:\n%s"), Index, *LexToString(ExpectedSegment.Range), *LexToString(ActualSegment.Range)));
 			}
 
 			AssertSegmentImpls(Test, ExpectedSegment.Impls, ActualSegment.Impls, *FString::Printf(TEXT("index %d"), Index));
@@ -126,7 +124,6 @@ namespace Impl
 
 	FORCEINLINE_DEBUGGABLE void AssertEvaluationTree(FAutomationTestBase* Test, const TMovieSceneEvaluationTree<int32>& Tree, TArrayView<const FEvaluationTreeIteratorResult> Expected)
 	{
-		using namespace Lex;
 		int32 Index = 0;
 		for (FMovieSceneEvaluationTreeRangeIterator It(Tree); It; ++It, ++Index)
 		{
@@ -138,7 +135,7 @@ namespace Impl
 
 			if (It.Range() != Expected[Index].Get<0>())
 			{
-				Test->AddError(FString::Printf(TEXT("Incorrect range iterated at index %d. %s != %s"), Index, *ToString(It.Range()), *ToString(Expected[Index].Get<0>())));
+				Test->AddError(FString::Printf(TEXT("Incorrect range iterated at index %d. %s != %s"), Index, *LexToString(It.Range()), *LexToString(Expected[Index].Get<0>())));
 				continue;
 			}
 
@@ -542,7 +539,6 @@ IMPLEMENT_SIMPLE_AUTOMATION_TEST(FMovieSceneCompilerTreeIteratorTest, "System.En
 bool FMovieSceneCompilerTreeIteratorTest::RunTest(const FString& Parameters)
 {
 	using namespace Impl;
-	using namespace Lex;
 
 	//	Time				-inf				10							20				25					30							inf
 	//											[============= 0 ===========]
@@ -578,7 +574,6 @@ IMPLEMENT_SIMPLE_AUTOMATION_TEST(FMovieSceneCompilerTreeIteratorBoundsTest, "Sys
 bool FMovieSceneCompilerTreeIteratorBoundsTest::RunTest(const FString& Parameters)
 {
 	using namespace Impl;
-	using namespace Lex;
 
 	//	Time				-inf				10							20				25					30							inf
 	//						[======== 0 ========][========= 1 ==============][============= 2 ==================][=========== 3 =============]
diff --git a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTestsCommon.h b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTestsCommon.h
index 38c510324f0f..5d464333a189 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTestsCommon.h
+++ b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTestsCommon.h
@@ -5,7 +5,4 @@
 #include "Math/Range.h"
 #include "Containers/UnrealString.h"
 
-namespace Lex
-{
-	MOVIESCENE_API FString ToString(const TRange<FFrameNumber>& InRange);
-}
+MOVIESCENE_API FString LexToString(const TRange<FFrameNumber>& InRange);
diff --git a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTransformTests.cpp b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTransformTests.cpp
index 32cfc8c737e9..d2b09fb42f79 100644
--- a/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTransformTests.cpp
+++ b/Engine/Source/Runtime/MovieScene/Private/Tests/MovieSceneTransformTests.cpp
@@ -28,33 +28,28 @@ bool IsEqual(TRange<FFrameNumber> A, TRange<FFrameNumber> B)
 	return IsEqual(A.GetLowerBound(), B.GetLowerBound()) && IsEqual(A.GetUpperBound(), B.GetUpperBound());
 }
 
-namespace Lex
+FString LexToString(const TRange<FFrameNumber>& InRange)
 {
-	FString ToString(const TRange<FFrameNumber>& InRange)
-	{
-		TRangeBound<FFrameNumber> SourceLower = InRange.GetLowerBound();
-		TRangeBound<FFrameNumber> SourceUpper = InRange.GetUpperBound();
+	TRangeBound<FFrameNumber> SourceLower = InRange.GetLowerBound();
+	TRangeBound<FFrameNumber> SourceUpper = InRange.GetUpperBound();
 
-		return *FString::Printf(TEXT("%s-%s"),
-			SourceLower.IsOpen() ? 
-				TEXT("[...") : 
-				SourceLower.IsInclusive() ?
-					*FString::Printf(TEXT("[%i"), SourceLower.GetValue().Value) :
-					*FString::Printf(TEXT("(%i"), SourceLower.GetValue().Value),
+	return *FString::Printf(TEXT("%s-%s"),
+		SourceLower.IsOpen() ? 
+			TEXT("[...") : 
+			SourceLower.IsInclusive() ?
+				*FString::Printf(TEXT("[%i"), SourceLower.GetValue().Value) :
+				*FString::Printf(TEXT("(%i"), SourceLower.GetValue().Value),
 
-			SourceUpper.IsOpen() ? 
-				TEXT("...]") : 
-				SourceUpper.IsInclusive() ?
-					*FString::Printf(TEXT("%i]"), SourceUpper.GetValue().Value) :
-					*FString::Printf(TEXT("%i)"), SourceUpper.GetValue().Value)
-			);
-	}
+		SourceUpper.IsOpen() ? 
+			TEXT("...]") : 
+			SourceUpper.IsInclusive() ?
+				*FString::Printf(TEXT("%i]"), SourceUpper.GetValue().Value) :
+				*FString::Printf(TEXT("%i)"), SourceUpper.GetValue().Value)
+		);
 }
 
 bool TestTransform(FAutomationTestBase& Test, FMovieSceneSequenceTransform Transform, TArrayView<TRange<FFrameNumber>> InSource, TArrayView<TRange<FFrameNumber>> InExpected, const TCHAR* TestName)
 {
-	using namespace Lex;
-
 	check(InSource.Num() == InExpected.Num());
 
 	bool bSuccess = true;
@@ -69,8 +64,8 @@ bool TestTransform(FAutomationTestBase& Test, FMovieSceneSequenceTransform Trans
 				Transform.TimeScale,
 				Transform.Offset.FrameNumber.Value,
 				Transform.Offset.GetSubFrame(),
-				*ToString(Result),
-				*ToString(InExpected[Index])));
+				*LexToString(Result),
+				*LexToString(InExpected[Index])));
 
 			bSuccess = false;
 		}
diff --git a/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneAnimTypeID.h b/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneAnimTypeID.h
index aa9a01ac8d42..648fec2b1341 100644
--- a/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneAnimTypeID.h
+++ b/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneAnimTypeID.h
@@ -7,11 +7,6 @@
 
 struct FMovieSceneAnimTypeID;
 
-namespace Lex
-{
-	MOVIESCENE_API FString ToString(const FMovieSceneAnimTypeID& AnimTypeID);
-}
-
 /**
  * Animation type ID that uniquely identifies the type of a change made
  * (ie changing a transform, spawning an object, etc) as part of a sequence evaluation
@@ -39,7 +34,7 @@ struct FMovieSceneAnimTypeID
 
 protected:
 
-	friend FString Lex::ToString(const FMovieSceneAnimTypeID&);
+	friend MOVIESCENE_API FString LexToString(const FMovieSceneAnimTypeID&);
 
 	FMovieSceneAnimTypeID(uint64* StaticPtr, uint32 Seed = 0)
 		: ID(*StaticPtr ? *StaticPtr : Initialize(StaticPtr, Seed))
diff --git a/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneEvaluationTemplate.h b/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneEvaluationTemplate.h
index bea41f049ab9..3f6a57d5dd21 100644
--- a/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneEvaluationTemplate.h
+++ b/Engine/Source/Runtime/MovieScene/Public/Evaluation/MovieSceneEvaluationTemplate.h
@@ -85,7 +85,7 @@ struct FMovieSceneSubSectionData
 {
 	GENERATED_BODY()
 
-	FMovieSceneSubSectionData() {}
+	FMovieSceneSubSectionData() : Flags(ESectionEvaluationFlags::None) {}
 
 	FMovieSceneSubSectionData(UMovieSceneSubSection& InSubSection, const FGuid& InObjectBindingId, ESectionEvaluationFlags InFlags);
 
diff --git a/Engine/Source/Runtime/MovieScene/Public/MovieScene.h b/Engine/Source/Runtime/MovieScene/Public/MovieScene.h
index 191c7c3ea377..76b79a6ce6ad 100644
--- a/Engine/Source/Runtime/MovieScene/Public/MovieScene.h
+++ b/Engine/Source/Runtime/MovieScene/Public/MovieScene.h
@@ -145,6 +145,7 @@ public:
 
 	/**~ UObject implementation */
 	virtual void Serialize( FArchive& Ar ) override;
+	virtual bool IsPostLoadThreadSafe() const override;
 
 public:
 
diff --git a/Engine/Source/Runtime/MovieScene/Public/MovieScenePossessable.h b/Engine/Source/Runtime/MovieScene/Public/MovieScenePossessable.h
index e3a8aa20141b..836378e7b86c 100644
--- a/Engine/Source/Runtime/MovieScene/Public/MovieScenePossessable.h
+++ b/Engine/Source/Runtime/MovieScene/Public/MovieScenePossessable.h
@@ -18,7 +18,7 @@ struct FMovieScenePossessable
 public:
 
 	/** Default constructor. */
-	FMovieScenePossessable() { }
+	FMovieScenePossessable() : PossessedObjectClass(nullptr) { }
 
 	/**
 	 * Creates and initializes a new instance.
diff --git a/Engine/Source/Runtime/MovieScene/Public/MovieSceneSection.h b/Engine/Source/Runtime/MovieScene/Public/MovieSceneSection.h
index f46b8a8270dc..b148c943de7a 100644
--- a/Engine/Source/Runtime/MovieScene/Public/MovieSceneSection.h
+++ b/Engine/Source/Runtime/MovieScene/Public/MovieSceneSection.h
@@ -461,6 +461,7 @@ protected:
 
 	//~ UObject interface
 	MOVIESCENE_API virtual void PostInitProperties() override;
+	MOVIESCENE_API virtual bool IsPostLoadThreadSafe() const override;
 	MOVIESCENE_API virtual void Serialize(FArchive& Ar) override;
 
 	virtual void OnMoved(int32 DeltaTime) {}
diff --git a/Engine/Source/Runtime/MovieScene/Public/MovieSceneTrack.h b/Engine/Source/Runtime/MovieScene/Public/MovieSceneTrack.h
index 42774e9a8fb5..4422953163c6 100644
--- a/Engine/Source/Runtime/MovieScene/Public/MovieSceneTrack.h
+++ b/Engine/Source/Runtime/MovieScene/Public/MovieSceneTrack.h
@@ -215,6 +215,7 @@ protected:
 	//~ UObject interface
 	MOVIESCENE_API virtual void PostInitProperties() override;
 	MOVIESCENE_API virtual void PostLoad() override;
+	MOVIESCENE_API virtual bool IsPostLoadThreadSafe() const override;
 
 	/** Intentionally not a UPROPERTY so this isn't serialized */
 	FMovieSceneBlendTypeField SupportedBlendTypes;
diff --git a/Engine/Source/Runtime/MovieSceneCapture/Private/MovieSceneCapture.cpp b/Engine/Source/Runtime/MovieSceneCapture/Private/MovieSceneCapture.cpp
index 8099f6664e3e..e8751a792529 100644
--- a/Engine/Source/Runtime/MovieSceneCapture/Private/MovieSceneCapture.cpp
+++ b/Engine/Source/Runtime/MovieSceneCapture/Private/MovieSceneCapture.cpp
@@ -36,6 +36,7 @@ FMovieSceneCaptureSettings::FMovieSceneCaptureSettings()
 	OutputDirectory.Path = FPaths::VideoCaptureDir();
 	FPaths::MakePlatformFilename( OutputDirectory.Path );
 
+	bOverwriteExisting = false;
 	bUseRelativeFrameNumbers = false;
 	HandleFrames = 0;
 	GameModeOverride = nullptr;
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DAttachTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DAttachTemplate.h
index 60e55de6a6d5..f6478ff72916 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DAttachTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DAttachTemplate.h
@@ -17,7 +17,14 @@ struct FMovieScene3DAttachSectionTemplate : public FMovieSceneEvalTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieScene3DAttachSectionTemplate() {}
+	FMovieScene3DAttachSectionTemplate() 
+		: AttachmentLocationRule(EAttachmentRule::KeepRelative)
+		, AttachmentRotationRule(EAttachmentRule::KeepRelative)
+		, AttachmentScaleRule(EAttachmentRule::KeepRelative)
+		, DetachmentLocationRule(EDetachmentRule::KeepRelative)
+		, DetachmentRotationRule(EDetachmentRule::KeepRelative)
+		, DetachmentScaleRule(EDetachmentRule::KeepRelative)
+	{}
 	FMovieScene3DAttachSectionTemplate(const UMovieScene3DAttachSection& Section);
 
 	/** The object binding ID we should attach to */
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DPathTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DPathTemplate.h
index 60e05a14004e..2e1284f45534 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DPathTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScene3DPathTemplate.h
@@ -16,7 +16,13 @@ struct FMovieScene3DPathSectionTemplate : public FMovieSceneEvalTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieScene3DPathSectionTemplate() {}
+	FMovieScene3DPathSectionTemplate() 
+		: FrontAxisEnum(MovieScene3DPathSection_Axis::X)
+		, UpAxisEnum(MovieScene3DPathSection_Axis::X)
+		, bFollow(false)
+		, bReverse(false)
+		, bForceUpright(false)
+	{}
 	FMovieScene3DPathSectionTemplate(const UMovieScene3DPathSection& Section);
 
 	/** The object binding ID of the path we should attach to */
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneAudioTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneAudioTemplate.h
index 06500294faee..d83dd3c64996 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneAudioTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneAudioTemplate.h
@@ -19,7 +19,7 @@ struct FMovieSceneAudioSectionTemplateData
 {
 	GENERATED_BODY()
 
-	FMovieSceneAudioSectionTemplateData() {}
+	FMovieSceneAudioSectionTemplateData() : Sound(nullptr), AudioStartOffset(0.0f), RowIndex(0), bOverrideAttenuation(false), AttenuationSettings(nullptr) {}
 	FMovieSceneAudioSectionTemplateData(const UMovieSceneAudioSection& Section);
 
 	/** Ensure that the sound is playing for the specified audio component and data */
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneCameraCutTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneCameraCutTemplate.h
index 57fa5a8f039b..07ff6b2f7001 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneCameraCutTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneCameraCutTemplate.h
@@ -18,7 +18,7 @@ struct FMovieSceneCameraCutSectionTemplate : public FMovieSceneEvalTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieSceneCameraCutSectionTemplate() {}
+	FMovieSceneCameraCutSectionTemplate() : bHasCutTransform(false) {}
 	FMovieSceneCameraCutSectionTemplate(const UMovieSceneCameraCutSection& Section, TOptional<FTransform> CutTransform);
 
 	/** GUID of the camera we should cut to in this sequence */
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneColorTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneColorTemplate.h
index ff63683f7e58..87fa82811e8f 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneColorTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneColorTemplate.h
@@ -18,7 +18,7 @@ struct FMovieSceneColorSectionTemplate : public FMovieScenePropertySectionTempla
 {
 	GENERATED_BODY()
 	
-	FMovieSceneColorSectionTemplate() {}
+	FMovieSceneColorSectionTemplate() : BlendType((EMovieSceneBlendType)0) {}
 	FMovieSceneColorSectionTemplate(const UMovieSceneColorSection& Section, const UMovieSceneColorTrack& Track);
 
 	/** Curve data as RGBA */
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneEventTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneEventTemplate.h
index 96f991469160..220bd35aded4 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneEventTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneEventTemplate.h
@@ -18,7 +18,7 @@ struct FMovieSceneEventSectionTemplate : public FMovieSceneEvalTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieSceneEventSectionTemplate() {}
+	FMovieSceneEventSectionTemplate() : bFireEventsWhenForwards(false), bFireEventsWhenBackwards(false) {}
 	FMovieSceneEventSectionTemplate(const UMovieSceneEventSection& Section, const UMovieSceneEventTrack& Track);
 
 	UPROPERTY()
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneFadeTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneFadeTemplate.h
index 53a5e409bbf8..f66a28921351 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneFadeTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneFadeTemplate.h
@@ -16,7 +16,7 @@ struct FMovieSceneFadeSectionTemplate : public FMovieSceneEvalTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieSceneFadeSectionTemplate() {}
+	FMovieSceneFadeSectionTemplate() : bFadeAudio(false) {}
 	FMovieSceneFadeSectionTemplate(const UMovieSceneFadeSection& Section);
 
 private:
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneLevelVisibilityTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneLevelVisibilityTemplate.h
index 0960ecd8dea5..e0048423d72a 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneLevelVisibilityTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneLevelVisibilityTemplate.h
@@ -15,7 +15,7 @@ struct FMovieSceneLevelVisibilitySectionTemplate
 {
 	GENERATED_BODY()
 	
-	FMovieSceneLevelVisibilitySectionTemplate(){}
+	FMovieSceneLevelVisibilitySectionTemplate() : Visibility(ELevelVisibility::Visible) {}
 	FMovieSceneLevelVisibilitySectionTemplate(const UMovieSceneLevelVisibilitySection& Section);
 
 	static FSharedPersistentDataKey GetSharedDataKey();
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneMaterialParameterCollectionTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneMaterialParameterCollectionTemplate.h
index fc0d94cde8c6..27200b3d1a49 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneMaterialParameterCollectionTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneMaterialParameterCollectionTemplate.h
@@ -15,7 +15,7 @@ struct FMovieSceneMaterialParameterCollectionTemplate : public FMovieSceneParame
 {
 	GENERATED_BODY()
 
-	FMovieSceneMaterialParameterCollectionTemplate() {}
+	FMovieSceneMaterialParameterCollectionTemplate() : MPC(nullptr) {}
 	FMovieSceneMaterialParameterCollectionTemplate(const UMovieSceneParameterSection& Section, const UMovieSceneMaterialParameterCollectionTrack& Track);
 
 private:
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScenePropertyTemplates.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScenePropertyTemplates.h
index e4a29ba7aaf5..d9e1849d129d 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScenePropertyTemplates.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieScenePropertyTemplates.h
@@ -49,7 +49,7 @@ struct FMovieSceneFloatPropertySectionTemplate : public FMovieScenePropertySecti
 {
 	GENERATED_BODY()
 	
-	FMovieSceneFloatPropertySectionTemplate(){}
+	FMovieSceneFloatPropertySectionTemplate() : BlendType((EMovieSceneBlendType)0) {}
 	FMovieSceneFloatPropertySectionTemplate(const UMovieSceneFloatSection& Section, const UMovieScenePropertyTrack& Track);
 
 protected:
@@ -105,7 +105,7 @@ struct FMovieSceneIntegerPropertySectionTemplate : public FMovieScenePropertySec
 {
 	GENERATED_BODY()
 	
-	FMovieSceneIntegerPropertySectionTemplate(){}
+	FMovieSceneIntegerPropertySectionTemplate() : BlendType((EMovieSceneBlendType)0) {}
 	FMovieSceneIntegerPropertySectionTemplate(const UMovieSceneIntegerSection& Section, const UMovieScenePropertyTrack& Track);
 
 protected:
@@ -147,7 +147,7 @@ struct FMovieSceneVectorPropertySectionTemplate : public FMovieScenePropertySect
 {
 	GENERATED_BODY()
 	
-	FMovieSceneVectorPropertySectionTemplate(){}
+	FMovieSceneVectorPropertySectionTemplate() : NumChannelsUsed(0), BlendType((EMovieSceneBlendType)0) {}
 	FMovieSceneVectorPropertySectionTemplate(const UMovieSceneVectorSection& Section, const UMovieScenePropertyTrack& Track);
 
 protected:
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneSkeletalAnimationTemplate.cpp b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneSkeletalAnimationTemplate.cpp
index 3dbcfc1662f2..6c8db6c8fbf3 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneSkeletalAnimationTemplate.cpp
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneSkeletalAnimationTemplate.cpp
@@ -328,7 +328,7 @@ namespace MovieScene
 				if (bResetDynamics)
 				{
 					// make sure we reset any simulations
-					AnimInst->ResetDynamics();
+					AnimInst->ResetDynamics(ETeleportType::ResetPhysics);
 				}
 			}
 		}
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneTemplateCommon.cpp b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneTemplateCommon.cpp
index dc511cba58b6..75957e105e35 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneTemplateCommon.cpp
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneTemplateCommon.cpp
@@ -46,7 +46,7 @@ void F3DTransformTrackToken::Apply(USceneComponent& SceneComponent, float DeltaT
 	USceneComponent* RootComponent = Actor ? Actor->GetRootComponent() : nullptr;
 	bool bIsSimulatingPhysics = RootComponent ? RootComponent->IsSimulatingPhysics() : false;
 
-	SceneComponent.SetRelativeLocationAndRotation(Translation, Rotation, false, nullptr, bIsSimulatingPhysics ? ETeleportType::TeleportPhysics : ETeleportType::None);
+	SceneComponent.SetRelativeLocationAndRotation(Translation, Rotation, false, nullptr, bIsSimulatingPhysics ? ETeleportType::ResetPhysics : ETeleportType::None);
 	SceneComponent.SetRelativeScale3D(Scale);
 
 	// Force the location and rotation values to avoid Rot->Quat->Rot conversions
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneVisibilityTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneVisibilityTemplate.h
index 26db5c0a65f1..cbb58d23e2db 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneVisibilityTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Evaluation/MovieSceneVisibilityTemplate.h
@@ -16,7 +16,7 @@ struct FMovieSceneVisibilitySectionTemplate : public FMovieSceneBoolPropertySect
 {
 	GENERATED_BODY()
 	
-	FMovieSceneVisibilitySectionTemplate(){}
+	FMovieSceneVisibilitySectionTemplate() {}
 	FMovieSceneVisibilitySectionTemplate(const UMovieSceneBoolSection& Section, const UMovieScenePropertyTrack& Track);
 
 private:
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Private/Sections/MovieSceneEventSection.cpp b/Engine/Source/Runtime/MovieSceneTracks/Private/Sections/MovieSceneEventSection.cpp
index ba0dcdebe7fe..dfe0b0efc5b0 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Private/Sections/MovieSceneEventSection.cpp
+++ b/Engine/Source/Runtime/MovieSceneTracks/Private/Sections/MovieSceneEventSection.cpp
@@ -75,8 +75,8 @@ public:
 		: Bytes(InBytes)
 	{
 		ArNoDelta = true;
-		ArIsSaving = true;
-		ArIsPersistent = true;
+		this->SetIsSaving(true);
+		this->SetIsPersistent(true);
 		UsingCustomVersion(EventParameterVersionGUID);
 	}
 
@@ -146,7 +146,7 @@ public:
 	FEventParameterReader(const TArray<uint8>& InBytes)
 		: Bytes(InBytes)
 	{
-		ArIsLoading = true;
+		this->SetIsLoading(true);
 		UsingCustomVersion(EventParameterVersionGUID);
 	}
 
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieScene3DTransformTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieScene3DTransformTemplate.h
index 937b01511cb6..c5e6dd802446 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieScene3DTransformTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieScene3DTransformTemplate.h
@@ -19,7 +19,10 @@ struct FMovieScene3DTransformTemplateData
 {
 	GENERATED_BODY()
 
-	FMovieScene3DTransformTemplateData(): bUseQuaternionInterpolation(false) {}
+	FMovieScene3DTransformTemplateData()
+		: BlendType((EMovieSceneBlendType)0)
+		, bUseQuaternionInterpolation(false) 
+	{}
 	FMovieScene3DTransformTemplateData(const UMovieScene3DTransformSection& Section);
 
 	MovieScene::TMultiChannelValue<float, 9> Evaluate(FFrameTime InTime) const;
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieSceneParameterTemplate.h b/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieSceneParameterTemplate.h
index fac2f409d216..e419b154a296 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieSceneParameterTemplate.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Public/Evaluation/MovieSceneParameterTemplate.h
@@ -180,7 +180,7 @@ struct FMovieSceneComponentMaterialSectionTemplate : public FMovieSceneParameter
 {
 	GENERATED_BODY()
 
-	FMovieSceneComponentMaterialSectionTemplate() {}
+	FMovieSceneComponentMaterialSectionTemplate() : MaterialIndex(0) {}
 	FMovieSceneComponentMaterialSectionTemplate(const UMovieSceneParameterSection& Section, const UMovieSceneComponentMaterialTrack& Track);
 
 private:
diff --git a/Engine/Source/Runtime/MovieSceneTracks/Public/Sections/MovieSceneCameraShakeSection.h b/Engine/Source/Runtime/MovieSceneTracks/Public/Sections/MovieSceneCameraShakeSection.h
index db1ab0a122a5..7d4da9369194 100644
--- a/Engine/Source/Runtime/MovieSceneTracks/Public/Sections/MovieSceneCameraShakeSection.h
+++ b/Engine/Source/Runtime/MovieSceneTracks/Public/Sections/MovieSceneCameraShakeSection.h
@@ -17,6 +17,7 @@ struct FMovieSceneCameraShakeSectionData
 	FMovieSceneCameraShakeSectionData()
 		: ShakeClass(nullptr)
 		, PlayScale(1.f)
+		, PlaySpace(ECameraAnimPlaySpace::CameraLocal)
 	{
 	}
 
diff --git a/Engine/Source/Runtime/NavigationSystem/Private/NavGraph/NavigationGraph.cpp b/Engine/Source/Runtime/NavigationSystem/Private/NavGraph/NavigationGraph.cpp
index 6c2d5205e583..78805bb75085 100644
--- a/Engine/Source/Runtime/NavigationSystem/Private/NavGraph/NavigationGraph.cpp
+++ b/Engine/Source/Runtime/NavigationSystem/Private/NavGraph/NavigationGraph.cpp
@@ -12,6 +12,7 @@
 // FNavGraphNode
 //----------------------------------------------------------------------//
 FNavGraphNode::FNavGraphNode() 
+	: Owner(nullptr)
 {
 	Edges.Reserve(InitialEdgesCount);
 }
diff --git a/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp b/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp
index affdb2bfec44..f2447711f999 100644
--- a/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp
+++ b/Engine/Source/Runtime/NavigationSystem/Private/NavMesh/RecastNavMesh.cpp
@@ -376,15 +376,22 @@ void ARecastNavMesh::PostInitProperties()
 		static const FNavMeshConfig::FRecastNamedFiltersCreator RecastNamedFiltersCreator(bUseVirtualFilters);
 		NavLinkFlag = FNavMeshConfig::NavLinkFlag;
 	}
-	else if(GetWorld() != NULL)
+
+	UWorld* MyWorld = GetWorld();
+	if (MyWorld != nullptr 
+		&& HasAnyFlags(RF_NeedLoad) //  was loaded
+		&& FNavigationSystem::ShouldDiscardSubLevelNavData(*this))
 	{
 		// get rid of instances saved within levels that are streamed-in
 		if ((GEngine->IsSettingUpPlayWorld() == false) // this is a @HACK
-			&&	(GetWorld()->GetOutermost() != GetOutermost())
+			&&	(MyWorld->GetOutermost() != GetOutermost())
 			// If we are cooking, then let them all pass.
 			// They will be handled at load-time when running.
 			&&	(IsRunningCommandlet() == false))
 		{
+			UE_LOG(LogNavigation, Log, TEXT("Discarding %s due to it not being part of PersistentLevel")
+				, *GetNameSafe(this));
+			
 			// marking self for deletion 
 			CleanUpAndMarkPendingKill();
 		}
diff --git a/Engine/Source/Runtime/NavigationSystem/Private/NavigationSystem.cpp b/Engine/Source/Runtime/NavigationSystem/Private/NavigationSystem.cpp
index 083eb66009db..8f90dff423c1 100644
--- a/Engine/Source/Runtime/NavigationSystem/Private/NavigationSystem.cpp
+++ b/Engine/Source/Runtime/NavigationSystem/Private/NavigationSystem.cpp
@@ -20,6 +20,7 @@
 #include "Engine/Engine.h"
 #include "UObject/Package.h"
 #include "Components/PrimitiveComponent.h"
+#include "UObject/UObjectThreadContext.h"
 
 #if WITH_RECAST
 #include "NavMesh/RecastNavMesh.h"
@@ -38,6 +39,7 @@
 #endif
 
 #include "NavAreas/NavArea_Null.h"
+#include "NavAreas/NavArea_Obstacle.h"
 #include "NavAreas/NavArea_Default.h"
 #include "NavAreas/NavAreaMeta_SwitchByAgent.h"
 #include "NavLinkCustomInterface.h"
@@ -119,6 +121,14 @@ namespace FNavigationSystem
 			: (const UNavigationSystemV1*)nullptr;
 		return NavSysCDO && NavSysCDO->ShouldLoadNavigationOnClient(&NavData);
 	}
+
+	bool ShouldDiscardSubLevelNavData(ANavigationData& NavData)
+	{
+		const UNavigationSystemV1* NavSysCDO = (*GEngine->NavigationSystemClass != nullptr)
+			? (GEngine->NavigationSystemClass->GetDefaultObject<const UNavigationSystemV1>())
+			: (const UNavigationSystemV1*)nullptr;
+		return NavSysCDO == nullptr || NavSysCDO->ShouldDiscardSubLevelNavData(&NavData);
+	}
 }
 
 namespace NavigationDebugDrawing
@@ -147,6 +157,23 @@ FNavigationInvoker::FNavigationInvoker(AActor& InActor, float InGenerationRadius
 
 }
 
+//----------------------------------------------------------------------//
+// helpers
+//----------------------------------------------------------------------//
+namespace
+{
+#if ENABLE_VISUAL_LOG
+	void NavigationDataDump(const UObject* Object, const FName& CategoryName, const ELogVerbosity::Type Verbosity, const FBox& Box, const UWorld& World, FVisualLogEntry& CurrentEntry)
+	{
+		const ANavigationData* MainNavData = FNavigationSystem::GetCurrent<UNavigationSystemV1>(&World)->GetDefaultNavDataInstance();
+		const FNavDataGenerator* Generator = MainNavData ? MainNavData->GetGenerator() : nullptr;
+		if (Generator)
+		{
+			Generator->GrabDebugSnapshot(&CurrentEntry, FMath::IsNearlyZero(Box.GetVolume()) ? MainNavData->GetBounds().ExpandBy(FVector(20, 20, 20)) : Box, CategoryName, Verbosity);
+		}
+	}
+#endif // ENABLE_VISUAL_LOG
+}
 //----------------------------------------------------------------------//
 // UNavigationSystemV1                                                                
 //----------------------------------------------------------------------//
@@ -164,6 +191,7 @@ UNavigationSystemV1::FOnNavigationDirty UNavigationSystemV1::NavigationDirtyEven
 
 bool UNavigationSystemV1::bUpdateNavOctreeOnComponentChange = true;
 bool UNavigationSystemV1::bStaticRuntimeNavigation = false;
+bool UNavigationSystemV1::bIsPIEActive = false;
 //----------------------------------------------------------------------//
 // life cycle stuff                                                                
 //----------------------------------------------------------------------//
@@ -318,6 +346,7 @@ UNavigationSystemV1::UNavigationSystemV1(const FObjectInitializer& ObjectInitial
 	bGenerateNavigationOnlyAroundNavigationInvokers = false;
 	DataGatheringMode = ENavDataGatheringModeConfig::Instant;
 	bCanAccumulateDirtyAreas = true;
+	bShouldDiscardSubLevelNavData = true;
 #if !UE_BUILD_SHIPPING
 	bDirtyAreasReportedWhileAccumulationLocked = false;
 #endif // !UE_BUILD_SHIPPING
@@ -846,7 +875,12 @@ void UNavigationSystemV1::Tick(float DeltaSeconds)
 
 	UWorld* World = GetWorld();
 
-	if (World == nullptr || (bTickWhilePaused == false && World->IsPaused()))
+	if (World == nullptr 
+		|| (bTickWhilePaused == false && World->IsPaused())
+#if WITH_EDITOR
+		|| (bIsPIEActive && !World->IsGameWorld())
+#endif // WITH_EDITOR
+		)
 	{
 		return;
 	}
@@ -1688,7 +1722,11 @@ void UNavigationSystemV1::RequestRegistration(ANavigationData* NavData, bool bTr
 	{
 		NavDataRegistrationQueue.AddUnique(NavData);
 
-		if (bTriggerRegistrationProcessing == true)
+		// checking if bWorldInitDone since requesting out-of-order registration
+		// processing when we're still setting up can result in odd cases,
+		// like initializing navmesh generators while the nav system doesn't have
+		// the navmesh bounds collected yet.
+		if (bTriggerRegistrationProcessing && bWorldInitDone)
 		{
 			// trigger registration candidates processing
 			DECLARE_CYCLE_STAT(TEXT("FSimpleDelegateGraphTask.Process registration candidates"),
@@ -1708,6 +1746,12 @@ void UNavigationSystemV1::RequestRegistration(ANavigationData* NavData, bool bTr
 
 void UNavigationSystemV1::ProcessRegistrationCandidates()
 {
+	//if (FUObjectThreadContext::Get().IsRoutingPostLoad)
+	//{
+	//	// postopne
+	//	return;
+	//}
+
 	FScopeLock RegistrationLock(&NavDataRegistrationSection);
 
 	if (NavDataRegistrationQueue.Num() == 0)
@@ -2239,7 +2283,7 @@ ANavigationData* UNavigationSystemV1::GetNavDataWithID(const uint16 NavDataID) c
 
 void UNavigationSystemV1::AddDirtyArea(const FBox& NewArea, int32 Flags)
 {
-	if (Flags > 0 && bCanAccumulateDirtyAreas)
+	if (Flags > 0 && bCanAccumulateDirtyAreas && NewArea.IsValid)
 	{
 		DirtyAreas.Add(FNavigationDirtyArea(NewArea, Flags));
 	}
@@ -3176,8 +3220,6 @@ void UNavigationSystemV1::Build()
 
 void UNavigationSystemV1::SpawnMissingNavigationData()
 {
-	DoInitialSetup();
-
 	const int32 SupportedAgentsCount = SupportedAgents.Num();
 	check(SupportedAgentsCount >= 0);
 	
@@ -3190,18 +3232,17 @@ void UNavigationSystemV1::SpawnMissingNavigationData()
 	for (TActorIterator<ANavigationData> It(NavWorld); It && NumberFound < SupportedAgentsCount; ++It)
 	{
 		ANavigationData* Nav = (*It);
-		if (Nav != NULL && Nav->GetTypedOuter<UWorld>() == NavWorld && Nav->IsPendingKill() == false)
+		if (Nav != nullptr 
+			&& Nav->IsPendingKill() == false
+			// mz@todo the 'is level in' condition is temporary
+			&& (Nav->GetTypedOuter<UWorld>() == NavWorld || NavWorld->GetLevels().Contains(Nav->GetLevel())))
 		{
 			// find out which one it is
 			for (int32 AgentIndex = 0; AgentIndex < SupportedAgentsCount; ++AgentIndex)
 			{
-				if (AlreadyInstantiated[AgentIndex] == true)
-				{
-					// already present, skip
-					continue;
-				}
-
-				if (Nav->GetClass() == SupportedAgents[AgentIndex].NavigationDataClass && Nav->DoesSupportAgent(SupportedAgents[AgentIndex]) == true)
+				if (AlreadyInstantiated[AgentIndex] == false
+					&& Nav->GetClass() == SupportedAgents[AgentIndex].NavigationDataClass 
+					&& Nav->DoesSupportAgent(SupportedAgents[AgentIndex]) == true)
 				{
 					AlreadyInstantiated[AgentIndex] = true;
 					++NumberFound;
@@ -3237,7 +3278,7 @@ void UNavigationSystemV1::SpawnMissingNavigationData()
 				}
 
 				ANavigationData* Instance = CreateNavigationDataInstance(NavConfig);
-				if (Instance != NULL)
+				if (Instance)
 				{
 					RequestRegistration(Instance);
 				}
@@ -3247,17 +3288,13 @@ void UNavigationSystemV1::SpawnMissingNavigationData()
 				}
 			}
 		}
-
-		ProcessRegistrationCandidates();
 	}
 	
-	if (MainNavData == NULL || MainNavData->IsPendingKill())
+	if (MainNavData == nullptr || MainNavData->IsPendingKillPending())
 	{
 		// update 
 		MainNavData = GetDefaultNavDataInstance(FNavigationSystem::DontCreate);
 	}
-
-	UpdateAbstractNavData();
 }
 
 ANavigationData* UNavigationSystemV1::CreateNavigationDataInstance(const FNavDataConfig& NavConfig)
@@ -3266,7 +3303,22 @@ ANavigationData* UNavigationSystemV1::CreateNavigationDataInstance(const FNavDat
 	check(World);
 
 	FActorSpawnParameters SpawnInfo;
-	SpawnInfo.OverrideLevel = World->PersistentLevel;
+	if (bSpawnNavDataInNavBoundsLevel && RegisteredNavBounds.Num() > 0)
+	{
+		// pick the first valid level
+		for (const FNavigationBounds& Bounds : RegisteredNavBounds)
+		{
+			if (Bounds.Level.IsValid())
+			{
+				SpawnInfo.OverrideLevel = Bounds.Level.Get();
+				break;
+			}
+		}
+	}
+	if (SpawnInfo.OverrideLevel == nullptr)
+	{
+		SpawnInfo.OverrideLevel = World->PersistentLevel;
+	}
 	ANavigationData* Instance = World->SpawnActor<ANavigationData>(*NavConfig.NavigationDataClass, SpawnInfo);
 
 	if (Instance != NULL)
@@ -3307,13 +3359,26 @@ ANavigationData* UNavigationSystemV1::CreateNavigationDataInstance(const FNavDat
 
 void UNavigationSystemV1::OnPIEStart()
 {
-	// Do not tick async build for editor world while PIE is active
-	bAsyncBuildPaused = true;
+	bIsPIEActive = true;
+	// no updates for editor world while PIE is active
+	const UWorld* MyWorld = GetWorld();
+	if (MyWorld && !MyWorld->IsGameWorld())
+	{
+		bAsyncBuildPaused = true;
+		AddNavigationBuildLock(ENavigationBuildLock::NoUpdateInEditor);
+	}
 }
 
 void UNavigationSystemV1::OnPIEEnd()
 {
-	bAsyncBuildPaused = false;
+	bIsPIEActive = false;
+	const UWorld* MyWorld = GetWorld();
+	if (MyWorld && !MyWorld->IsGameWorld())
+	{
+		bAsyncBuildPaused = false;
+		// there's no need to request while navigation rebuilding just because PIE has ended
+		RemoveNavigationBuildLock(ENavigationBuildLock::NoUpdateInEditor, /*bSkipRebuildInEditor=*/true);
+	}
 }
 
 void UNavigationSystemV1::RemoveNavigationBuildLock(uint8 Flags, bool bSkipRebuildInEditor)
@@ -3346,7 +3411,10 @@ void UNavigationSystemV1::RebuildAll(bool bIsLoadTime)
 	// discard all pending dirty areas, we are going to rebuild navmesh anyway 
 	DirtyAreas.Reset();
 	PendingNavBoundsUpdates.Reset();
-	
+#if !UE_BUILD_SHIPPING
+	bDirtyAreasReportedWhileAccumulationLocked = false;
+#endif // !UE_BUILD_SHIPPING
+
 	// 
 	for (int32 NavDataIndex = 0; NavDataIndex < NavDataSet.Num(); ++NavDataIndex)
 	{
@@ -3811,8 +3879,15 @@ bool UNavigationSystemV1::HandleCycleNavDrawnCommand( const TCHAR* Cmd, FOutputD
 	return true;
 }
 
-bool UNavigationSystemV1::HandleCountNavMemCommand( const TCHAR* Cmd, FOutputDevice& Ar )
+bool UNavigationSystemV1::HandleCountNavMemCommand()
 {
+	UE_LOG(LogNavigation, Warning, TEXT("Logging NavigationSystem memory usage:"));
+
+	if (NavOctree.IsValid())
+	{
+		UE_LOG(LogNavigation, Warning, TEXT("NavOctree memory: %d"), NavOctree->GetSizeBytes());
+	}
+
 	for (int32 NavDataIndex = 0; NavDataIndex < NavDataSet.Num(); ++NavDataIndex)
 	{
 		ANavigationData* NavData = NavDataSet[NavDataIndex];
@@ -3841,7 +3916,7 @@ bool FNavigationSystemExec::Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevic
 		}
 		else if (FParse::Command(&Cmd, TEXT("CountNavMem")))
 		{
-			NavSys->HandleCountNavMemCommand( Cmd, Ar );
+			NavSys->HandleCountNavMemCommand();
 			return false;
 		}
 		/** Builds the navigation mesh (or rebuilds it). **/
@@ -4192,31 +4267,9 @@ void UNavigationSystemV1::GetOnScreenMessages(TMultiMap<FCoreDelegates::EOnScree
 	{
 		OutMessages.Add(FCoreDelegates::EOnScreenMessageSeverity::Error
 			, LOCTEXT("NAVMESHERROR", "NAVMESH NEEDS TO BE REBUILT"));
-
-		/*SmallTextItem.SetColor(FLinearColor::White);
-		SmallTextItem.Text = ;
-		Canvas->DrawItem(SmallTextItem, FVector2D(MessageX, MessageY));
-		MessageY += FontSizeY;*/
 	}
 }
 #endif // !UE_BUILD_SHIPPING
-// mz@todo
-//FVisualLogger::NavigationDataDumpDelegate
-//{
-//	UWorld* World = nullptr;
-//	FVisualLogEntry* CurrentEntry = nullptr;
-//	if (CheckVisualLogInputInternal(Object, Category, Verbosity, &World, &CurrentEntry) == false || CurrentEntry == nullptr)
-//	{
-//		return;
-//	}
-//
-//	const ANavigationData* MainNavData = World ? UNavigationSystemV1::GetNavigationSystem(World)->GetDefaultNavDataInstance(FNavigationSystem::ECreateIfEmpty::DontCreate) : nullptr;
-//	const FNavDataGenerator* Generator = MainNavData ? MainNavData->GetGenerator() : nullptr;
-//	if (Generator)
-//	{
-//		Generator->GrabDebugSnapshot(CurrentEntry, FMath::IsNearlyZero(Box.GetVolume()) ? MainNavData->GetBounds().ExpandBy(FVector(20, 20, 20)) : Box, Category, Verbosity);
-//	}
-//}
 
 INavigationDataInterface* UNavigationSystemV1::GetNavDataForActor(const AActor& Actor)
 {
@@ -4264,9 +4317,48 @@ const FNavDataConfig& UNavigationSystemV1::GetDefaultSupportedAgent()
 		: DefaultAgent;
 }
 
+void UNavigationSystemV1::OverrideSupportedAgents(const TArray<FNavDataConfig>& NewSupportedAgents)
+{
+	UE_CLOG(bWorldInitDone, LogNavigation, Warning, TEXT("Trying to override NavigationSystem\'s SupportedAgents past the World\'s initialization"));
+
+	SupportedAgents = NewSupportedAgents;
+	if (SupportedAgents.Num() == 0)
+	{
+		SupportedAgents.Add(FNavDataConfig(FNavigationSystem::FallbackAgentRadius, FNavigationSystem::FallbackAgentHeight));
+	}
+}
+
 void UNavigationSystemV1::Configure(const UNavigationSystemConfig& Config)
 {
 
 }
 
+//----------------------------------------------------------------------//
+// UNavigationSystemModuleConfig
+//----------------------------------------------------------------------//
+UNavigationSystemModuleConfig::UNavigationSystemModuleConfig(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	const UNavigationSystemV1* NavSysCDO = GetDefault<UNavigationSystemV1>();
+	bAutoSpawnMissingNavData = NavSysCDO && NavSysCDO->bAutoCreateNavigationData;
+	bSpawnNavDataInNavBoundsLevel = NavSysCDO && NavSysCDO->bSpawnNavDataInNavBoundsLevel;
+}
+
+UNavigationSystemBase* UNavigationSystemModuleConfig::CreateAndConfigureNavigationSystem(UWorld& World) const
+{
+	UNavigationSystemV1* NavSysInstance = Cast<UNavigationSystemV1>(Super::CreateAndConfigureNavigationSystem(World));
+	UE_CLOG(NavSysInstance == nullptr, LogNavigation, Error
+		, TEXT("Unable to spawn navsys instance of class %s - unable to cast to UNavigationSystemV1")
+		, *NavigationSystemClass.GetAssetName()
+	);
+	
+	if (NavSysInstance)
+	{
+		NavSysInstance->bAutoCreateNavigationData = bAutoSpawnMissingNavData;
+		NavSysInstance->bSpawnNavDataInNavBoundsLevel = bSpawnNavDataInNavBoundsLevel;
+	}
+
+	return NavSysInstance;
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/NavigationSystem/Public/NavigationSystem.h b/Engine/Source/Runtime/NavigationSystem/Public/NavigationSystem.h
index 801eda18681f..088f99df0ce4 100644
--- a/Engine/Source/Runtime/NavigationSystem/Public/NavigationSystem.h
+++ b/Engine/Source/Runtime/NavigationSystem/Public/NavigationSystem.h
@@ -16,11 +16,10 @@
 #include "AI/NavigationSystemBase.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "NavigationOctree.h"
+#include "AI/NavigationSystemConfig.h"
 #include "NavigationSystem.generated.h"
 
 
-#define NAV_USE_MAIN_NAVIGATION_DATA NULL
-
 class AController;
 class ANavMeshBoundsVolume;
 class AWorldSettings;
@@ -32,6 +31,7 @@ class INavRelevantInterface;
 class UCrowdManagerBase;
 class UNavArea;
 class UNavigationPath;
+class UNavigationSystemModuleConfig;
 struct FNavigationRelevantData;
 struct FNavigationOctreeElement;
 
@@ -43,7 +43,7 @@ class FEdMode;
 DECLARE_MULTICAST_DELEGATE_OneParam(FOnNavAreaChanged, const UClass* /*AreaClass*/);
 
 /** Delegate to let interested parties know that Nav Data has been registered */
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnNavDataGenerigEvent, ANavigationData*, NavData);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnNavDataGenericEvent, ANavigationData*, NavData);
 
 DECLARE_MULTICAST_DELEGATE(FOnNavigationInitDone);
 
@@ -73,6 +73,7 @@ namespace FNavigationSystem
 	};
 
 	bool NAVIGATIONSYSTEM_API ShouldLoadNavigationOnClient(ANavigationData& NavData);
+	bool NAVIGATIONSYSTEM_API ShouldDiscardSubLevelNavData(ANavigationData& NavData);
 }
 
 struct FNavigationSystemExec: public FSelfRegisteringExec
@@ -97,6 +98,8 @@ class NAVIGATIONSYSTEM_API UNavigationSystemV1 : public UNavigationSystemBase
 {
 	GENERATED_BODY()
 
+	friend UNavigationSystemModuleConfig;
+
 public:
 	UNavigationSystemV1(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());
 	virtual ~UNavigationSystemV1();
@@ -116,9 +119,15 @@ protected:
 	UPROPERTY(config, EditAnywhere, Category=NavigationSystem)
 	uint32 bAutoCreateNavigationData:1;
 
+	UPROPERTY(config, EditAnywhere, Category = NavigationSystem)
+	uint32 bSpawnNavDataInNavBoundsLevel:1;
+
 	UPROPERTY(config, EditAnywhere, Category=NavigationSystem)
 	uint32 bAllowClientSideNavigation:1;
 
+	UPROPERTY(config, EditAnywhere, Category = NavigationSystem)
+	uint32 bShouldDiscardSubLevelNavData:1;
+
 	UPROPERTY(config, EditAnywhere, Category=NavigationSystem)
 	uint32 bTickWhilePaused:1;
 
@@ -188,10 +197,10 @@ public:
 	TArray<FNavigationBoundsUpdateRequest> PendingNavBoundsUpdates;
 
  	UPROPERTY(/*BlueprintAssignable, */Transient)
-	FOnNavDataGenerigEvent OnNavDataRegisteredEvent;
+	FOnNavDataGenericEvent OnNavDataRegisteredEvent;
 
 	UPROPERTY(BlueprintAssignable, Transient, meta = (displayname = OnNavigationGenerationFinished))
-	FOnNavDataGenerigEvent OnNavigationGenerationFinishedDelegate;
+	FOnNavDataGenericEvent OnNavigationGenerationFinishedDelegate;
 
 	FOnNavigationInitDone OnNavigationInitDone;
 	
@@ -200,10 +209,12 @@ private:
 	
 	/** set to true when navigation processing was blocked due to missing nav bounds */
 	uint32 bNavDataRemovedDueToMissingNavBounds : 1;
-	
+
+protected:	
 	/** All areas where we build/have navigation */
 	TSet<FNavigationBounds> RegisteredNavBounds;
 
+private:
 	TMap<AActor*, FNavigationInvoker> Invokers;
 
 	float NextInvokersUpdateTime;
@@ -301,6 +312,7 @@ public:
 		RegistrationFailed_DataPendingKill,			// means navigation data being registered is marked as pending kill
 		RegistrationFailed_AgentAlreadySupported,	// this means that navigation agent supported by given nav data is already handled by some other, previously registered instance
 		RegistrationFailed_AgentNotValid,			// given instance contains navmesh that doesn't support any of expected agent types, or instance doesn't specify any agent
+		RegistrationFailed_NotSuitable,				// given instance had been considered unsuitable by current navigation system instance itself
 		RegistrationSuccessful,
 	};
 
@@ -452,12 +464,13 @@ public:
 
 	virtual bool IsNavigationBuilt(const AWorldSettings* Settings) const override;
 
-	bool IsThereAnywhereToBuildNavigation() const;
+	virtual bool IsThereAnywhereToBuildNavigation() const;
 
 	bool ShouldGenerateNavigationEverywhere() const { return bWholeWorldNavigable; }
 
 	bool ShouldAllowClientSideNavigation() const { return bAllowClientSideNavigation; }
 	virtual bool ShouldLoadNavigationOnClient(ANavigationData* NavData = nullptr) const { return bAllowClientSideNavigation; }
+	virtual bool ShouldDiscardSubLevelNavData(ANavigationData* NavData = nullptr) const { return bShouldDiscardSubLevelNavData; }
 
 	FBox GetWorldBounds() const;
 	
@@ -476,6 +489,7 @@ public:
 	static const FNavDataConfig& GetDefaultSupportedAgent();
 	FORCEINLINE const FNavDataConfig& GetDefaultSupportedAgentConfig() const { check(SupportedAgents.Num() > 0);  return SupportedAgents[0]; }
 	FORCEINLINE const TArray<FNavDataConfig>& GetSupportedAgents() const { return SupportedAgents; }
+	void OverrideSupportedAgents(const TArray<FNavDataConfig>& NewSupportedAgents);
 
 	virtual void ApplyWorldOffset(const FVector& InOffset, bool bWorldShift) override;
 
@@ -489,7 +503,7 @@ public:
 
 	static bool DoesPathIntersectBox(const FNavigationPath* Path, const FBox& Box, uint32 StartingIndex = 0, FVector* AgentExtent = NULL);
 	static bool DoesPathIntersectBox(const FNavigationPath* Path, const FBox& Box, const FVector& AgentLocation, uint32 StartingIndex = 0, FVector* AgentExtent = NULL);
-
+	
 	//----------------------------------------------------------------------//
 	// Active tiles
 	//----------------------------------------------------------------------//
@@ -506,8 +520,10 @@ public:
 	// @todo document
 	virtual void UnregisterNavData(ANavigationData* NavData);
 
-	/** adds NavData to registration candidates queue - NavDataRegistrationQueue */
-	void RequestRegistration(ANavigationData* NavData, bool bTriggerRegistrationProcessing = true);
+	/** adds NavData to registration candidates queue - NavDataRegistrationQueue
+	 *	@return true if registration request was successful, false if given NavData 
+	 *	was deemed unsuitable for registration consideration */
+	virtual void RequestRegistration(ANavigationData* NavData, bool bTriggerRegistrationProcessing = true);
 
 protected:
 
@@ -539,7 +555,7 @@ protected:
 	ANavigationData* GetNavDataWithID(const uint16 NavDataID) const;
 
 public:
-	void ReleaseInitialBuildingLock();
+	virtual void ReleaseInitialBuildingLock();
 
 	//----------------------------------------------------------------------//
 	// navigation octree related functions
@@ -766,7 +782,7 @@ public:
 	 * Exec command handlers
 	 */
 	bool HandleCycleNavDrawnCommand( const TCHAR* Cmd, FOutputDevice& Ar );
-	bool HandleCountNavMemCommand( const TCHAR* Cmd, FOutputDevice& Ar );
+	bool HandleCountNavMemCommand();
 	
 	//----------------------------------------------------------------------//
 	// debug
@@ -816,7 +832,7 @@ protected:
 	uint8 bInitialSetupHasBeenPerformed : 1;
 	uint8 bInitialLevelsAdded : 1;
 	uint8 bWorldInitDone : 1;
-	uint8 bAsyncBuildPaused : 1;
+	uint8 bAsyncBuildPaused : 1; // mz@todo remove, replaced by bIsPIEActive and IsGameWorld
 	uint8 bCanAccumulateDirtyAreas : 1;
 #if !UE_BUILD_SHIPPING
 	uint8 bDirtyAreasReportedWhileAccumulationLocked : 1;
@@ -840,6 +856,7 @@ protected:
 	static bool bNavigationAutoUpdateEnabled;
 	static bool bUpdateNavOctreeOnComponentChange;
 	static bool bStaticRuntimeNavigation;
+	static bool bIsPIEActive;
 
 	static TMap<INavLinkCustomInterface*, FWeakObjectPtr> PendingCustomLinkRegistration;
 	TSet<const UClass*> NavAreaClasses;
@@ -959,13 +976,28 @@ public:
 	DEPRECATED(4.16, "This version of GetRandomPointInNavigableRadius is deprecated. Please use the new version")
 	UFUNCTION(BlueprintPure, Category = "AI|Navigation", meta = (WorldContext = "WorldContextObject", DisplayName = "GetRandomPointInNavigableRadius_DEPRECATED", ScriptNoExport, DeprecatedFunction, DeprecationMessage = "This version of GetRandomPointInNavigableRadius is deprecated. Please use the new version"))
 	static FVector GetRandomPointInNavigableRadius(UObject* WorldContextObject, const FVector& Origin, float Radius, ANavigationData* NavData = NULL, TSubclassOf<UNavigationQueryFilter> FilterClass = NULL);
-
 	DEPRECATED(4.20, "SimpleMoveToActor is deprecated. Use UAIBlueprintHelperLibrary::SimpleMoveToActor instead")
 	UFUNCTION(BlueprintCallable, Category = "AI|Navigation", meta = (DisplayName = "SimpleMoveToActor_DEPRECATED", ScriptNoExport, DeprecatedFunction, DeprecationMessage = "SimpleMoveToActor is deprecated. Use AIBlueprintHelperLibrary::SimpleMoveToActor instead"))
 	static void SimpleMoveToActor(AController* Controller, const AActor* Goal);
-
 	DEPRECATED(4.20, "SimpleMoveToLocation is deprecated. Use UAIBlueprintHelperLibrary::SimpleMoveToLocation instead")
 	UFUNCTION(BlueprintCallable, Category = "AI|Navigation", meta = (DisplayName = "SimpleMoveToLocation_DEPRECATED", ScriptNoExport, DeprecatedFunction, DeprecationMessage = "SimpleMoveToLocation is deprecated. Use AIBlueprintHelperLibrary::SimpleMoveToLocation instead"))
 	static void SimpleMoveToLocation(AController* Controller, const FVector& Goal);
 };
 
+
+UCLASS()
+class NAVIGATIONSYSTEM_API UNavigationSystemModuleConfig : public UNavigationSystemConfig
+{
+	GENERATED_BODY()
+
+protected:
+	UPROPERTY(EditAnywhere, Category = Navigation)
+	uint32 bAutoSpawnMissingNavData : 1;
+
+	UPROPERTY(EditAnywhere, Category = Navigation)
+	uint32 bSpawnNavDataInNavBoundsLevel : 1;
+
+public:
+	UNavigationSystemModuleConfig(const FObjectInitializer& ObjectInitializer = FObjectInitializer::Get());
+	virtual UNavigationSystemBase* CreateAndConfigureNavigationSystem(UWorld& World) const override;
+};
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Private/HttpNetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Private/HttpNetworkReplayStreaming.cpp
index 8f56e33c7f9c..5e869e4dbc5e 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Private/HttpNetworkReplayStreaming.cpp
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Private/HttpNetworkReplayStreaming.cpp
@@ -9,6 +9,9 @@
 #include "GenericPlatform/GenericPlatformHttp.h"
 #include "ProfilingDebugging/ScopedTimers.h"
 #include "HAL/LowLevelMemTracker.h"
+#include "Engine/World.h"
+#include "UnrealEngine.h"
+#include "Engine/LocalPlayer.h"
 
 DEFINE_LOG_CATEGORY_STATIC( LogHttpReplay, Log, All );
 
@@ -23,6 +26,25 @@ static TAutoConsoleVariable<FString> CVarMetaFilterOverride( TEXT( "httpReplay.M
 static TAutoConsoleVariable<float> CVarChunkUploadDelayInSeconds( TEXT( "httpReplay.ChunkUploadDelayInSeconds" ), 10.0f, TEXT( "" ) );
 static TAutoConsoleVariable<int> CVarMaxCacheSize( TEXT( "httpReplay.MaxCacheSize" ), 1024 * 1024 * 10, TEXT( "" ) );		// 10 MB cache by default
 
+static const FString GetUserStringFromUserIndex(const int32 UserIndex)
+{
+	if (UserIndex != INDEX_NONE)
+	{
+		if (UWorld* World = GWorld.GetReference())
+		{
+			if (GEngine != nullptr)
+			{
+				if (ULocalPlayer* LocalPlayer = GEngine->GetLocalPlayerFromControllerId(World, UserIndex))
+				{
+					return LocalPlayer->GetPreferredUniqueNetId().ToString();
+				}
+			}
+		}
+	}
+
+	return FString();
+}
+
 class FNetworkReplayListItem : public FJsonSerializable
 {
 public:
@@ -114,6 +136,7 @@ public:
 	FString Viewer;
 	int32 Time;
 	int32 NumChunks;
+	FString Metadata;
 
 	// FJsonSerializable
 	BEGIN_JSON_SERIALIZER
@@ -121,6 +144,7 @@ public:
 		JSON_SERIALIZE("numChunks", NumChunks);
 		JSON_SERIALIZE("time", Time);
 		JSON_SERIALIZE("viewerId", Viewer);
+		JSON_SERIALIZE("meta", Metadata);
 	END_JSON_SERIALIZER
 };
 
@@ -167,7 +191,7 @@ int64 FHttpStreamFArchive::TotalSize()
 
 void FHttpStreamFArchive::Seek( int64 InPos ) 
 {
-	check( InPos < Buffer.Num() );
+	check( InPos <= Buffer.Num() );
 
 	Pos = InPos;
 }
@@ -200,29 +224,58 @@ FHttpNetworkReplayStreamer::FHttpNetworkReplayStreamer() :
 	GConfig->GetString( TEXT( "HttpNetworkReplayStreaming" ), TEXT( "ServerURL" ), ServerURL, GEngineIni );
 }
 
-void FHttpNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& InReplayVersion, const FOnStreamReadyDelegate& Delegate )
+void FHttpNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& InReplayVersion, const FStartStreamingCallback& Delegate)
 {
+	TArray<FString> UserStrings;
+	for (int32 UserIndex : UserIndices)
+	{
+		FString UserString(GetUserStringFromUserIndex(UserIndex));
+		if (!UserString.IsEmpty())
+		{
+			UserStrings.Add(MoveTemp(UserString));
+		}
+	}
+
+	StartStreaming(CustomName, FriendlyName, UserStrings, bRecord, InReplayVersion, Delegate);
+}
+
+FString FHttpNetworkReplayStreamer::GetRecordingMetadata() const
+{
+	FString MetaString;
+	FParse::Value( FCommandLine::Get(), TEXT( "ReplayMeta=" ), MetaString );
+	return MetaString;
+}
+
+void FHttpNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& InReplayVersion, const FStartStreamingCallback& Delegate )
+{
+	FStartStreamingResult StreamingResult;
+	StreamingResult.bRecording = bRecord;
+
 	if ( !SessionName.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::StartStreaming. SessionName already set." ) );
+		Delegate.ExecuteIfBound(StreamingResult);
 		return;
 	}
 
 	if ( IsStreaming() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::StartStreaming. IsStreaming == true." ) );
+		Delegate.ExecuteIfBound(StreamingResult);
 		return;
 	}
 
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::StartStreaming. ServerURL is empty, aborting." ) );
+		Delegate.ExecuteIfBound(StreamingResult);
 		return;
 	}
 
 	if ( IsHttpRequestInFlight() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::StartStreaming. IsHttpRequestInFlight == true." ) );
+		Delegate.ExecuteIfBound(StreamingResult);
 		return;
 	}
 
@@ -232,15 +285,15 @@ void FHttpNetworkReplayStreamer::StartStreaming( const FString& CustomName, cons
 	StartStreamingDelegate = Delegate;
 
 	// Setup the archives
-	StreamArchive.ArIsLoading		= !bRecord;
-	StreamArchive.ArIsSaving		= !StreamArchive.ArIsLoading;
+	StreamArchive.SetIsLoading(!bRecord);
+	StreamArchive.SetIsSaving(bRecord);
 	StreamArchive.bAtEndOfReplay	= false;
 
-	HeaderArchive.ArIsLoading		= StreamArchive.ArIsLoading;
-	HeaderArchive.ArIsSaving		= StreamArchive.ArIsSaving;
+	HeaderArchive.SetIsLoading(!bRecord);
+	HeaderArchive.SetIsSaving(bRecord);
 
-	CheckpointArchive.ArIsLoading	= StreamArchive.ArIsLoading;
-	CheckpointArchive.ArIsSaving	= StreamArchive.ArIsSaving;
+	CheckpointArchive.SetIsLoading(!bRecord);
+	CheckpointArchive.SetIsSaving(bRecord);
 
 	LastChunkTime = FPlatformTime::Seconds();
 
@@ -288,7 +341,7 @@ void FHttpNetworkReplayStreamer::StartStreaming( const FString& CustomName, cons
 		AddRequestToQueue( EQueuedHttpRequestType::StartDownloading, HttpRequest );
 
 		// Download the header (will add to queue)
-		DownloadHeader();
+		DownloadHeader(FDownloadHeaderCallback());
 
 		// Download the first set of checkpoints (will add to queue)
 		EnumerateCheckpoints();
@@ -313,9 +366,8 @@ void FHttpNetworkReplayStreamer::StartStreaming( const FString& CustomName, cons
 			URL = FString::Printf( TEXT( "%sreplay?app=%s&version=%u&cl=%u&friendlyName=%s" ), *ServerURL, *ReplayVersion.AppString, ReplayVersion.NetworkVersion, ReplayVersion.Changelist, *FGenericPlatformHttp::UrlEncode( FriendlyName ) );
 		}
 
-		FString MetaString;
-
-		if ( FParse::Value( FCommandLine::Get(), TEXT( "ReplayMeta=" ), MetaString ) && !MetaString.IsEmpty() )
+		FString MetaString = GetRecordingMetadata();
+		if ( !MetaString.IsEmpty() )
 		{
 			URL += FString::Printf( TEXT( "&meta=%s" ), *FGenericPlatformHttp::UrlEncode( MetaString ) );
 		}
@@ -530,7 +582,7 @@ void FHttpNetworkReplayStreamer::StopStreaming()
 
 void FHttpNetworkReplayStreamer::UploadHeader()
 {
-	check( StreamArchive.ArIsSaving );
+	check( StreamArchive.IsSaving() );
 
 	if ( SessionName.IsEmpty() )
 	{
@@ -574,9 +626,37 @@ void FHttpNetworkReplayStreamer::UploadHeader()
 	LastChunkTime = FPlatformTime::Seconds();
 }
 
+bool FHttpNetworkReplayStreamer::CompressRequest(FHttpRequestPtr HttpRequest, const TArray<uint8>& RequestBuffer) const
+{
+	if ( SupportsCompression() )
+	{
+		SCOPE_CYCLE_COUNTER( STAT_HttpReplay_CompressTime );
+
+		const double StartTime = FPlatformTime::Seconds();
+		FHttpStreamFArchive Compressed;
+
+		if ( !CompressBuffer( RequestBuffer, Compressed ) )
+		{
+			return false;
+		}
+
+		const double EndTime = FPlatformTime::Seconds();
+
+		UE_LOG( LogHttpReplay, VeryVerbose, TEXT( "Compressed request. Original: %i, Compressed: %i, Time: %2.2f MS" ), StreamArchive.Buffer.Num(), Compressed.Buffer.Num(), ( EndTime - StartTime ) * 1000.0f );
+
+		HttpRequest->SetContent( Compressed.Buffer );
+	}
+	else
+	{
+		HttpRequest->SetContent( RequestBuffer );
+	}
+
+	return true;
+}
+
 void FHttpNetworkReplayStreamer::FlushStream()
 {
-	check( StreamArchive.ArIsSaving );
+	check( StreamArchive.IsSaving() );
 
 	if ( SessionName.IsEmpty() )
 	{
@@ -599,33 +679,14 @@ void FHttpNetworkReplayStreamer::FlushStream()
 
 	HttpRequest->OnProcessRequestComplete().BindRaw( this, &FHttpNetworkReplayStreamer::HttpUploadStreamFinished );
 
-	if ( SupportsCompression() )
+	if (!CompressRequest(HttpRequest, StreamArchive.Buffer))
 	{
-		SCOPE_CYCLE_COUNTER( STAT_HttpReplay_CompressTime );
-
-		const double StartTime = FPlatformTime::Seconds();
-		FHttpStreamFArchive Compressed;
-
-		if ( !CompressBuffer( StreamArchive.Buffer, Compressed ) )
-		{
-			SetLastError( ENetworkReplayError::ServiceUnavailable );
-			return;
-		}
-
-		const double EndTime = FPlatformTime::Seconds();
-
-		UE_LOG( LogHttpReplay, VeryVerbose, TEXT( "Compressed stream. Original: %i, Compressed: %i, Time: %2.2f MS" ), StreamArchive.Buffer.Num(), Compressed.Buffer.Num(), ( EndTime - StartTime ) * 1000.0f );
-
-		HttpRequest->SetContent( Compressed.Buffer );
-
-		TotalUploadBytes += Compressed.Buffer.Num();
-	}
-	else
-	{
-		HttpRequest->SetContent( StreamArchive.Buffer );
-		TotalUploadBytes += StreamArchive.Buffer.Num();
+		SetLastError( ENetworkReplayError::ServiceUnavailable );
+		return;
 	}
 
+	TotalUploadBytes += HttpRequest->GetContentLength();
+
 	HttpRequest->SetURL( FString::Printf( TEXT( "%sreplay/%s/file/stream.%i?numChunks=%i&time=%i&mTime1=%i&mTime2=%i&absSize=%i" ), *ServerURL, *SessionName, StreamChunkIndex, StreamChunkIndex + 1, TotalDemoTimeInMS, StreamTimeRangeStart, StreamTimeRangeEnd, TotalUploadBytes ) );
 	HttpRequest->SetVerb( TEXT( "POST" ) );
 	HttpRequest->SetHeader( TEXT( "Content-Type" ), TEXT( "application/octet-stream" ) );
@@ -709,28 +770,36 @@ bool FQueuedGotoFakeCheckpoint::PreProcess( FHttpNetworkReplayStreamer* Streamer
 	// Reset chunk index
 	Streamer->StreamChunkIndex		= 0;
 
-	Streamer->GotoCheckpointDelegate.ExecuteIfBound( true, Streamer->LastGotoTimeInMS );
-	Streamer->GotoCheckpointDelegate = FOnCheckpointReadyDelegate();
+	FGotoCallback& GotoCheckpointDelegate = Streamer->GotoCheckpointDelegate;
+	if (GotoCheckpointDelegate.IsBound())
+	{
+		FGotoResult Result;
+		Result.Result = EStreamingOperationResult::Success;
+		Result.ExtraTimeMS = Streamer->LastGotoTimeInMS;
+
+		GotoCheckpointDelegate.Execute( Result );
+		GotoCheckpointDelegate = FGotoCallback();
+	}	
 
 	Streamer->LastGotoTimeInMS = -1;
 
 	return true;
 }
 
-void FHttpNetworkReplayStreamer::GotoCheckpointIndex( const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate )
+void FHttpNetworkReplayStreamer::GotoCheckpointIndex( const int32 CheckpointIndex, const FGotoCallback& Delegate )
 {
 	if ( GotoCheckpointDelegate.IsBound() || DownloadCheckpointIndex != -1 )
 	{
 		// If we're currently going to a checkpoint now, ignore this request
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::GotoCheckpointIndex. Busy processing another checkpoint." ) );
-		Delegate.ExecuteIfBound( false, -1 );
+		Delegate.ExecuteIfBound(FGotoResult());
 		return;
 	}
 
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::GotoCheckpointIndex. ServerURL is empty, aborting." ) );
-		Delegate.ExecuteIfBound( false, -1 );
+		Delegate.ExecuteIfBound(FGotoResult());
 		return;
 	}
 
@@ -748,7 +817,7 @@ void FHttpNetworkReplayStreamer::GotoCheckpointIndex( const int32 CheckpointInde
 	if ( !CheckpointList.ReplayEvents.IsValidIndex( CheckpointIndex ) )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::GotoCheckpointIndex. Invalid checkpoint index." ) );
-		Delegate.ExecuteIfBound( false, -1 );
+		Delegate.ExecuteIfBound(FGotoResult());
 		return;
 	}
 
@@ -766,11 +835,12 @@ void FHttpNetworkReplayStreamer::GotoCheckpointIndex( const int32 CheckpointInde
 	AddRequestToQueue( EQueuedHttpRequestType::DownloadingCheckpoint, HttpRequest );
 }
 
-void FHttpNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate)
+void FHttpNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate)
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::SearchEvents. ServerURL is empty, aborting." ) );
+		Delegate.Execute(FSearchEventsResult());
 		return;
 	}
 
@@ -779,16 +849,40 @@ void FHttpNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const F
 	HttpRequest->SetURL(FString::Printf(TEXT("%sevent?group=%s"), *ServerURL, *EventGroup));
 	HttpRequest->SetVerb(TEXT("GET"));
 
-	HttpRequest->OnProcessRequestComplete().BindRaw(this, &FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished, Delegate);
+	FEnumerateStreamsCallback WrappedDelegate = FEnumerateStreamsCallback::CreateLambda([Delegate](const FEnumerateStreamsResult& Result)
+	{
+		if (Delegate.IsBound())
+		{
+			FSearchEventsResult NewResult;
+			NewResult.Result = Result.Result;
+			NewResult.CorruptedStreams = Result.CorruptedStreams;
+			NewResult.FoundStreams = Result.FoundStreams;
+			Delegate.Execute(NewResult);
+		}
+	});
+
+	HttpRequest->OnProcessRequestComplete().BindRaw(this, &FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished, WrappedDelegate);
 
 	AddRequestToQueue(EQueuedHttpRequestType::EnumeratingSessions, HttpRequest);
 }
 
-void FHttpNetworkReplayStreamer::RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& Delegate)
+void FHttpNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData(ReplayName, EventID, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	UE_LOG(LogHttpReplay, Verbose, TEXT("FHttpNetworkReplayStreamer::RequestEventData: Ignoring explicit ReplayName."));
+	RequestEventData(EventID, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::RequestEventData. ServerURL is empty, aborting." ) );
+		Delegate.Execute(FRequestEventDataResult());
 		return;
 	}
 
@@ -803,32 +897,35 @@ void FHttpNetworkReplayStreamer::RequestEventData(const FString& EventID, const
 	AddRequestToQueue(EQueuedHttpRequestType::RequestEventData, HttpRequest);
 }
 
-void FHttpNetworkReplayStreamer::HttpRequestEventDataFinished(FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnRequestEventDataComplete RequestEventDataCompleteDelegate)
+void FHttpNetworkReplayStreamer::HttpRequestEventDataFinished(FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FRequestEventDataCallback RequestEventDataCompleteDelegate)
 {
 	RequestFinished(StreamerState, EQueuedHttpRequestType::RequestEventData, HttpRequest);
 
+	FRequestEventDataResult Result;
 	if (bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok)
 	{
-		RequestEventDataCompleteDelegate.ExecuteIfBound(HttpResponse->GetContent(), true);
 		UE_LOG(LogHttpReplay, Verbose, TEXT("FHttpNetworkReplayStreamer::HttpRequestEventDataFinished."));
+
+		Result.ReplayEventListItem = HttpResponse->GetContent();
+		Result.Result = EStreamingOperationResult::Success;
 	}
 	else
 	{
 		// FAIL
 		UE_LOG(LogHttpReplay, Error, TEXT("FHttpNetworkReplayStreamer::HttpRequestEventDataFinished. FAILED, Response code: %d"), HttpResponse.IsValid() ? HttpResponse->GetResponseCode() : 0);
-
-		RequestEventDataCompleteDelegate.ExecuteIfBound(TArray<uint8>(), false);
 	}
+
+	RequestEventDataCompleteDelegate.ExecuteIfBound(Result);
 }
 
-void FHttpNetworkReplayStreamer::GotoTimeInMS( const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate )
+void FHttpNetworkReplayStreamer::GotoTimeInMS( const uint32 TimeInMS, const FGotoCallback& Delegate )
 {
 	if ( LastGotoTimeInMS != -1 || DownloadCheckpointIndex != -1 )
 	{
 		// If we're processing requests, be on the safe side and cancel the scrub
 		// FIXME: We can cancel the in-flight requests as well
 		UE_LOG( LogHttpReplay, Log, TEXT( "FHttpNetworkReplayStreamer::GotoTimeInMS. Busy processing pending requests." ) );
-		Delegate.ExecuteIfBound( false, -1 );
+		Delegate.ExecuteIfBound( FGotoResult() );
 		return;
 	}
 
@@ -836,7 +933,7 @@ void FHttpNetworkReplayStreamer::GotoTimeInMS( const uint32 TimeInMS, const FOnC
 	{
 		// If we're currently going to a checkpoint now, ignore this request
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::GotoTimeInMS. Busy processing another checkpoint." ) );
-		Delegate.ExecuteIfBound( false, -1 );
+		Delegate.ExecuteIfBound( FGotoResult() );
 		return;
 	}
 
@@ -896,25 +993,10 @@ void FHttpNetworkReplayStreamer::FlushCheckpointInternal( uint32 TimeInMS )
 		HttpRequest->SetVerb(TEXT("POST"));
 		HttpRequest->SetHeader(TEXT("Content-Type"), TEXT("application/octet-stream"));
 
-		if (SupportsCompression())
+		if (!CompressRequest(HttpRequest, CheckpointArchive.Buffer))
 		{
-			SCOPE_CYCLE_COUNTER(STAT_HttpReplay_CompressTime);
-
-			const double StartTime = FPlatformTime::Seconds();
-			FHttpStreamFArchive Compressed;
-			if (!CompressBuffer(CheckpointArchive.Buffer, Compressed))
-			{
-				SetLastError(ENetworkReplayError::ServiceUnavailable);
-				return;
-			}
-			const double EndTime = FPlatformTime::Seconds();
-			HttpRequest->SetContent(Compressed.Buffer);
-
-			UE_LOG(LogHttpReplay, VeryVerbose, TEXT("Compressed checkpoint. Original: %i, Compressed: %i, Time: %2.2f MS"), CheckpointArchive.Buffer.Num(), Compressed.Buffer.Num(), (EndTime - StartTime) * 1000.0f);
-		}
-		else
-		{
-			HttpRequest->SetContent(CheckpointArchive.Buffer);
+			SetLastError(ENetworkReplayError::ServiceUnavailable);
+			return;
 		}
 
 		AddRequestToQueue(EQueuedHttpRequestType::UploadingCheckpoint, HttpRequest, 2, 2.0f);
@@ -1006,7 +1088,7 @@ void FHttpNetworkReplayStreamer::AddEvent( const uint32 TimeInMS, const FString&
 	AddOrUpdateEvent( TEXT( "" ), TimeInMS, Group, Meta, Data );
 }
 
-void FHttpNetworkReplayStreamer::DownloadHeader(const FOnDownloadHeaderComplete& Delegate /*= FOnDownloadHeaderComplete()*/)
+void FHttpNetworkReplayStreamer::DownloadHeader(const FDownloadHeaderCallback& Delegate)
 {
 	// Download header first
 	TSharedRef<IHttpRequest> HttpRequest = FHttpModule::Get().CreateRequest();
@@ -1140,11 +1222,17 @@ void FHttpNetworkReplayStreamer::ConditionallyDownloadNextChunk()
 	LastChunkTime = FPlatformTime::Seconds();
 }
 
-void FHttpNetworkReplayStreamer::KeepReplay( const FString& ReplayName, const bool bKeep )
+void FHttpNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	KeepReplay(ReplayName, bKeep, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::KeepReplay( const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate )
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::KeepReplay. ServerURL is empty, aborting." ) );
+		Delegate.ExecuteIfBound(FKeepReplayResult());
 		return;
 	}
 
@@ -1163,19 +1251,53 @@ void FHttpNetworkReplayStreamer::KeepReplay( const FString& ReplayName, const bo
 	HttpRequest->SetVerb( TEXT( "POST" ) );
 	HttpRequest->SetHeader( TEXT( "Content-Type" ), TEXT( "application/json" ) );
 
-	HttpRequest->OnProcessRequestComplete().BindRaw( this, &FHttpNetworkReplayStreamer::KeepReplayFinished );
+	HttpRequest->OnProcessRequestComplete().BindRaw( this, &FHttpNetworkReplayStreamer::KeepReplayFinished, Delegate, ReplayName );
 
 	AddRequestToQueue( EQueuedHttpRequestType::KeepReplay, HttpRequest );
 }
 
-void FHttpNetworkReplayStreamer::KeepReplayFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded )
+void FHttpNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplayFriendlyName(ReplayName, NewFriendlyName, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogHttpReplay, Log, TEXT("FHttpNetworkReplayStreamer::RenameReplayFriendlyName is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FHttpNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewReplayName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplay(ReplayName, NewReplayName, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewReplayName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogHttpReplay, Log, TEXT("FHttpNetworkReplayStreamer::RenameReplay is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FHttpNetworkReplayStreamer::KeepReplayFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FKeepReplayCallback Delegate, FString ReplayName )
 {
 	RequestFinished( StreamerState, EQueuedHttpRequestType::KeepReplay, HttpRequest );
 
+	FKeepReplayResult Result;
 	if ( !bSucceeded || HttpResponse->GetResponseCode() != EHttpResponseCodes::NoContent )
 	{
 		UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::KeepReplayFinished. FAILED, Response code: %d" ), HttpResponse.IsValid() ? HttpResponse->GetResponseCode() : 0 );
 	}
+	else
+	{
+		Result.Result = EStreamingOperationResult::Success;
+		Result.NewReplayName = ReplayName;
+	}
+
+	Delegate.Execute(Result);
 }
 
 void FHttpNetworkReplayStreamer::RefreshViewer( const bool bFinal )
@@ -1340,23 +1462,35 @@ bool FHttpNetworkReplayStreamer::IsLoadingCheckpoint() const
 	return GotoCheckpointDelegate.IsBound();
 }
 
-void FHttpNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate ) const
+void FHttpNetworkReplayStreamer::DeleteFinishedStream(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate)
 {
-	// Stubbed!
-	Delegate.ExecuteIfBound(false);
+	DeleteFinishedStream(StreamName, Delegate);
 }
 
-void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate )
+void FHttpNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate )
+{
+	UE_LOG(LogHttpReplay, Log, TEXT("FHttpNetworkReplayStreamer::DeleteFinishedStream is currently unsupported."));
+	FDeleteFinishedStreamResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.ExecuteIfBound(Result);
+}
+
+void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate )
+{
+	EnumerateStreams( InReplayVersion, GetUserStringFromUserIndex(UserIndex), MetaString, ExtraParms, Delegate );
+}
+
+void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate )
 {
 	EnumerateStreams( InReplayVersion, UserString, MetaString, TArray< FString >(), Delegate );
 }
 
-void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate )
+void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate )
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::EnumerateStreams. ServerURL is empty, aborting." ) );
-		Delegate.ExecuteIfBound( TArray<FNetworkReplayStreamInfo>() );
+		Delegate.ExecuteIfBound( FEnumerateStreamsResult() );
 		return;
 	}
 
@@ -1405,12 +1539,17 @@ void FHttpNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion&
 	AddRequestToQueue( EQueuedHttpRequestType::EnumeratingSessions, HttpRequest );
 }
 
-void FHttpNetworkReplayStreamer::EnumerateRecentStreams( const FNetworkReplayVersion& InReplayVersion, const FString& InRecentViewer, const FOnEnumerateStreamsComplete& Delegate )
+void FHttpNetworkReplayStreamer::EnumerateRecentStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate )
+{
+	EnumerateRecentStreams( InReplayVersion, GetUserStringFromUserIndex(UserIndex), Delegate );
+}
+
+void FHttpNetworkReplayStreamer::EnumerateRecentStreams( const FNetworkReplayVersion& InReplayVersion, const FString& InRecentViewer, const FEnumerateStreamsCallback& Delegate )
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::EnumerateRecentStreams. ServerURL is empty, aborting." ) );
-		Delegate.ExecuteIfBound( TArray<FNetworkReplayStreamInfo>() );
+		Delegate.ExecuteIfBound( FEnumerateStreamsResult() );
 		return;
 	}
 
@@ -1513,17 +1652,22 @@ void FHttpNetworkReplayStreamer::ConditionallyEnumerateCheckpoints()
 	}
 };
 
-void FHttpNetworkReplayStreamer::EnumerateEvents(const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate)
+void FHttpNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
 {
-	EnumerateEvents( SessionName, Group, EnumerationCompleteDelegate );
+	EnumerateEvents(ReplayName, Group, Delegate);
 }
 
-void FHttpNetworkReplayStreamer::EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate )
+void FHttpNetworkReplayStreamer::EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	EnumerateEvents(SessionName, Group, Delegate);
+}
+
+void FHttpNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& EnumerationCompleteDelegate)
 {
 	if ( ServerURL.IsEmpty() )
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::EnumerateRecentStreams. ServerURL is empty, aborting." ) );
-		EnumerationCompleteDelegate.ExecuteIfBound(FReplayEventList(), false);
+		EnumerationCompleteDelegate.ExecuteIfBound(FEnumerateEventsResult());
 		return;
 	}
 
@@ -1607,8 +1751,8 @@ void FHttpNetworkReplayStreamer::HttpStopUploadingFinished( FHttpRequestPtr Http
 		SetLastError( ENetworkReplayError::ServiceUnavailable );
 	}
 
-	StreamArchive.ArIsLoading = false;
-	StreamArchive.ArIsSaving = false;
+	StreamArchive.SetIsLoading(false);
+	StreamArchive.SetIsSaving(false);
 	StreamArchive.Buffer.Empty();
 	StreamArchive.Pos = 0;
 	StreamChunkIndex = 0;
@@ -1620,6 +1764,9 @@ void FHttpNetworkReplayStreamer::HttpHeaderUploadFinished( FHttpRequestPtr HttpR
 	TSharedPtr< FQueuedHttpRequest > SavedFlightHttpRequest = InFlightHttpRequest;
 
 	RequestFinished( EStreamerState::StreamingUp, EQueuedHttpRequestType::UploadingHeader, HttpRequest );
+
+	FStartStreamingResult Result;
+	Result.bRecording = true;
 	
 	if ( bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::NoContent )
 	{
@@ -1629,8 +1776,7 @@ void FHttpNetworkReplayStreamer::HttpHeaderUploadFinished( FHttpRequestPtr HttpR
 		}
 
 		UE_LOG( LogHttpReplay, Verbose, TEXT( "FHttpNetworkReplayStreamer::HttpHeaderUploadFinished. TotalUploadBytes: %i" ), TotalUploadBytes );
-
-		StartStreamingDelegate.ExecuteIfBound( true, true );
+		Result.Result = EStreamingOperationResult::Success;
 	}
 	else
 	{
@@ -1640,12 +1786,11 @@ void FHttpNetworkReplayStreamer::HttpHeaderUploadFinished( FHttpRequestPtr HttpR
 		}
 
 		UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpHeaderUploadFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
-		StartStreamingDelegate.ExecuteIfBound( false, true );
 		SetLastError( ENetworkReplayError::ServiceUnavailable );
 	}
 
-	// Reset delegate
-	StartStreamingDelegate = FOnStreamReadyDelegate();
+	StartStreamingDelegate.ExecuteIfBound(Result);
+	StartStreamingDelegate = FStartStreamingCallback();
 }
 
 void FHttpNetworkReplayStreamer::HttpUploadStreamFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded )
@@ -1738,6 +1883,7 @@ void FHttpNetworkReplayStreamer::HttpStartDownloadingFinished( FHttpRequestPtr H
 		ViewerName = StartDownloadingResponse.Viewer;
 
 		bStreamIsLive = State == TEXT( "Live" );
+		StreamMetadata = StartDownloadingResponse.Metadata;
 
 		NumTotalStreamChunks = StartDownloadingResponse.NumChunks;
 		TotalDemoTimeInMS = StartDownloadingResponse.Time;
@@ -1748,10 +1894,10 @@ void FHttpNetworkReplayStreamer::HttpStartDownloadingFinished( FHttpRequestPtr H
 		{			
 			UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpStartDownloadingFinished. NO CHUNKS" ) );
 
-			StartStreamingDelegate.ExecuteIfBound( false, false );
+			StartStreamingDelegate.ExecuteIfBound(FStartStreamingResult());
 
 			// Reset delegate
-			StartStreamingDelegate = FOnStreamReadyDelegate();
+			StartStreamingDelegate = FStartStreamingCallback();
 
 			SetLastError( ENetworkReplayError::ServiceUnavailable );
 		}
@@ -1760,24 +1906,25 @@ void FHttpNetworkReplayStreamer::HttpStartDownloadingFinished( FHttpRequestPtr H
 	{
 		UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpStartDownloadingFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
 
-		StartStreamingDelegate.ExecuteIfBound( false, false );
+		StartStreamingDelegate.ExecuteIfBound(FStartStreamingResult());
 
 		// Reset delegate
-		StartStreamingDelegate = FOnStreamReadyDelegate();
+		StartStreamingDelegate = FStartStreamingCallback();
 
 		SetLastError( ENetworkReplayError::ServiceUnavailable );
 	}
 }
 
-void FHttpNetworkReplayStreamer::HttpDownloadHeaderFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnDownloadHeaderComplete Delegate)
+void FHttpNetworkReplayStreamer::HttpDownloadHeaderFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FDownloadHeaderCallback Delegate)
 {
 	RequestFinished( EStreamerState::StreamingDown, EQueuedHttpRequestType::DownloadingHeader, HttpRequest );
 
 	check( StreamArchive.IsLoading() );
 
-	bool bWasRequestSuccessful = bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok;
-	if ( bWasRequestSuccessful )
+	FDownloadHeaderResult Result;
+	if ( bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok )
 	{
+		Result.Result = EStreamingOperationResult::Success;
 		HeaderArchive.Buffer.Append( HttpResponse->GetContent() );
 
 		UE_LOG( LogHttpReplay, Log, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadHeaderFinished. Size: %i" ), HeaderArchive.Buffer.Num() );
@@ -1788,15 +1935,42 @@ void FHttpNetworkReplayStreamer::HttpDownloadHeaderFinished( FHttpRequestPtr Htt
 		UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadHeaderFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
 
 		StreamArchive.Buffer.Empty();
-		StartStreamingDelegate.ExecuteIfBound( false, false );
+		StartStreamingDelegate.ExecuteIfBound(FStartStreamingResult());
 
 		// Reset delegate
-		StartStreamingDelegate = FOnStreamReadyDelegate();
+		StartStreamingDelegate = FStartStreamingCallback();
 
 		SetLastError( ENetworkReplayError::ServiceUnavailable );
 	}
 
-	Delegate.ExecuteIfBound(bWasRequestSuccessful);
+	Delegate.ExecuteIfBound(Result);
+}
+
+bool FHttpNetworkReplayStreamer::DecompressResponse(FHttpResponsePtr HttpResponse, TArray<uint8>& ResultBuffer) const
+{
+	if ( SupportsCompression() )
+	{
+		SCOPE_CYCLE_COUNTER( STAT_HttpReplay_DecompressTime );
+
+		FHttpStreamFArchive Compressed;
+		Compressed.Buffer = HttpResponse->GetContent();
+
+		TArray< uint8 > Uncompressed;
+		if ( !DecompressBuffer( Compressed, Uncompressed ) )
+		{
+			ResultBuffer.Empty();
+			UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::DecompressResponse. DecompressBuffer FAILED." ) );
+			return false;
+		}
+
+		ResultBuffer.Append(Uncompressed);
+	}
+	else
+	{
+		ResultBuffer.Append(HttpResponse->GetContent());
+	}
+
+	return true;
 }
 
 void FHttpNetworkReplayStreamer::HttpDownloadFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, int32 RequestedStreamChunkIndex, bool bStreamWasLive )
@@ -1861,28 +2035,11 @@ void FHttpNetworkReplayStreamer::HttpDownloadFinished( FHttpRequestPtr HttpReque
 
 				// Add response to response cache
 				AddResponseToCache( HttpRequest, HttpResponse );
-
-				if ( SupportsCompression() )
+				
+				if (!DecompressResponse(HttpResponse, StreamArchive.Buffer))
 				{
-					SCOPE_CYCLE_COUNTER( STAT_HttpReplay_DecompressTime );
-
-					FHttpStreamFArchive Compressed;
-					Compressed.Buffer = HttpResponse->GetContent();
-					TArray< uint8 > Uncompressed;
-
-					if ( !DecompressBuffer( Compressed, Uncompressed ) )
-					{
-						StreamArchive.Buffer.Empty();
-						UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadFinished. DecompressBuffer FAILED." ) );
-						SetLastError( ENetworkReplayError::ServiceUnavailable );
-						return;
-					}
-
-					StreamArchive.Buffer.Append( Uncompressed );
-				}
-				else
-				{
-					StreamArchive.Buffer.Append( HttpResponse->GetContent() );
+					SetLastError( ENetworkReplayError::ServiceUnavailable );
+					return;
 				}
 
 				StreamChunkIndex++;
@@ -1941,7 +2098,8 @@ void FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished( FHttpRequestPtr
 	// But for now, this is a safe change, and can co-exist with the more proper fix
 	if ( bStopStreamingCalled )
 	{
-		GotoCheckpointDelegate	= FOnCheckpointReadyDelegate();
+		GotoCheckpointDelegate.ExecuteIfBound(FGotoResult());
+		GotoCheckpointDelegate	= FGotoCallback();
 		DownloadCheckpointIndex = -1;
 		LastGotoTimeInMS		= -1;
 		return;
@@ -1952,35 +2110,24 @@ void FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished( FHttpRequestPtr
 		if ( HttpResponse->GetContent().Num() == 0 )
 		{
 			UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished. Checkpoint empty." ) );
-			GotoCheckpointDelegate.ExecuteIfBound( false, -1 );
-			GotoCheckpointDelegate = FOnCheckpointReadyDelegate();
+			GotoCheckpointDelegate.ExecuteIfBound(FGotoResult());
+			GotoCheckpointDelegate = FGotoCallback();
 			return;
 		}
 
 		// Add response to response cache
 		AddResponseToCache( HttpRequest, HttpResponse );
 
+		CheckpointArchive.Buffer.Empty();
+
 		// Get the checkpoint data
-		if ( SupportsCompression() )
+		if (!DecompressResponse(HttpResponse, CheckpointArchive.Buffer))
 		{
-			SCOPE_CYCLE_COUNTER( STAT_HttpReplay_DecompressTime );
-
-			FHttpStreamFArchive Compressed;
-			Compressed.Buffer = HttpResponse->GetContent();
-
-			if ( !DecompressBuffer( Compressed, CheckpointArchive.Buffer ) )
-			{
-				UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished. DecompressBuffer FAILED." ) );
-				GotoCheckpointDelegate.ExecuteIfBound( false, -1 );
-				GotoCheckpointDelegate	= FOnCheckpointReadyDelegate();
-				DownloadCheckpointIndex = -1;
-				LastGotoTimeInMS		= -1;
-				return;
-			}
-		}
-		else
-		{
-			CheckpointArchive.Buffer = HttpResponse->GetContent();
+			GotoCheckpointDelegate.ExecuteIfBound(FGotoResult());
+			GotoCheckpointDelegate	= FGotoCallback();
+			DownloadCheckpointIndex = -1;
+			LastGotoTimeInMS		= -1;
+			return;
 		}
 
 		CheckpointArchive.Pos = 0;
@@ -2020,7 +2167,10 @@ void FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished( FHttpRequestPtr
 		}
 
 		// Notify game code of success
-		GotoCheckpointDelegate.ExecuteIfBound( true, LastGotoTimeInMS );
+		FGotoResult Result;
+		Result.Result = EStreamingOperationResult::Success;
+		Result.ExtraTimeMS = LastGotoTimeInMS;
+		GotoCheckpointDelegate.ExecuteIfBound(Result);
 
 		UE_LOG( LogHttpReplay, Verbose, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished. SUCCESS. StreamChunkIndex: %i" ), StreamChunkIndex );
 	}
@@ -2028,11 +2178,11 @@ void FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished( FHttpRequestPtr
 	{
 		// Oops, something went wrong, notify game code of failure
 		UE_LOG( LogHttpReplay, Error, TEXT( "FHttpNetworkReplayStreamer::HttpDownloadCheckpointFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
-		GotoCheckpointDelegate.ExecuteIfBound( false, -1 );
+		GotoCheckpointDelegate.ExecuteIfBound(FGotoResult());
 	}
 
 	// Reset things
-	GotoCheckpointDelegate	= FOnCheckpointReadyDelegate();
+	GotoCheckpointDelegate	= FGotoCallback();
 	DownloadCheckpointIndex = -1;
 	LastGotoTimeInMS		= -1;
 }
@@ -2064,7 +2214,7 @@ void FHttpNetworkReplayStreamer::HttpRefreshViewerFinished( FHttpRequestPtr Http
 	}
 }
 
-void FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnEnumerateStreamsComplete Delegate )
+void FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateStreamsCallback Delegate )
 {
 	check( InFlightHttpRequest.IsValid() );
 	check( InFlightHttpRequest->Request == HttpRequest );
@@ -2072,6 +2222,7 @@ void FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished( FHttpRequestPtr
 
 	InFlightHttpRequest = NULL;
 
+	FEnumerateStreamsResult Result;
 	if ( bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok )
 	{		
 		UE_LOG( LogHttpReplay, Verbose, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished." ) );
@@ -2084,40 +2235,43 @@ void FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished( FHttpRequestPtr
 		if ( !ReplayList.FromJson( JsonString ) )
 		{
 			UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished. FromJson FAILED" ) );
-			Delegate.ExecuteIfBound( TArray<FNetworkReplayStreamInfo>() );		// FIXME: Notify failure here
-			return;
 		}
-
-		for ( int32 i = 0; i < ReplayList.Replays.Num(); i++ )
+		else
 		{
-			FNetworkReplayStreamInfo NewStream;
+			Result.Result = EStreamingOperationResult::Success;
+			for (int32 i = 0; i < ReplayList.Replays.Num(); i++)
+			{
+				FNetworkReplayStreamInfo NewStream;
 
-			NewStream.Name			= ReplayList.Replays[i].SessionName;
-			NewStream.FriendlyName	= ReplayList.Replays[i].FriendlyName;
-			NewStream.Timestamp		= ReplayList.Replays[i].Timestamp;
-			NewStream.SizeInBytes	= ReplayList.Replays[i].SizeInBytes;
-			NewStream.LengthInMS	= ReplayList.Replays[i].DemoTimeInMs;
-			NewStream.NumViewers	= ReplayList.Replays[i].NumViewers;
-			NewStream.bIsLive		= ReplayList.Replays[i].bIsLive;
-			NewStream.Changelist	= ReplayList.Replays[i].Changelist;
-			NewStream.bShouldKeep	= ReplayList.Replays[i].bShouldKeep;
+				NewStream.Name = ReplayList.Replays[i].SessionName;
+				NewStream.FriendlyName = ReplayList.Replays[i].FriendlyName;
+				NewStream.Timestamp = ReplayList.Replays[i].Timestamp;
+				NewStream.SizeInBytes = ReplayList.Replays[i].SizeInBytes;
+				NewStream.LengthInMS = ReplayList.Replays[i].DemoTimeInMs;
+				NewStream.NumViewers = ReplayList.Replays[i].NumViewers;
+				NewStream.bIsLive = ReplayList.Replays[i].bIsLive;
+				NewStream.Changelist = ReplayList.Replays[i].Changelist;
+				NewStream.bShouldKeep = ReplayList.Replays[i].bShouldKeep;
 
-			Streams.Add( NewStream );
+				Result.FoundStreams.Add(NewStream);
+			}
 		}
-
-		Delegate.ExecuteIfBound( Streams );
 	}
 	else
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateSessionsFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
-		Delegate.ExecuteIfBound( TArray<FNetworkReplayStreamInfo>() );		// FIXME: Notify failure here
 	}
+
+	Delegate.Execute(Result);
 }
 
 void FHttpNetworkReplayStreamer::HttpEnumerateCheckpointsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded )
 {
 	RequestFinished( EStreamerState::StreamingDown, EQueuedHttpRequestType::EnumeratingCheckpoints, HttpRequest );
 
+	FStartStreamingResult Result;
+	Result.bRecording = false;
+
 	if ( bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok )
 	{		
 		UE_LOG( LogHttpReplay, Verbose, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateCheckpointsFinished." ) );
@@ -2129,76 +2283,62 @@ void FHttpNetworkReplayStreamer::HttpEnumerateCheckpointsFinished( FHttpRequestP
 		if ( !CheckpointList.FromJson( JsonString ) )
 		{
 			UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateCheckpointsFinished. FromJson FAILED" ) );
-
-			StartStreamingDelegate.ExecuteIfBound( false, false );
-
-			// Reset delegate
-			StartStreamingDelegate = FOnStreamReadyDelegate();
 			SetLastError( ENetworkReplayError::ServiceUnavailable );
-			return;
 		}
-
-		// Sort checkpoints by time
-		struct FCompareCheckpointTime
+		else
 		{
-			FORCEINLINE bool operator()(const FReplayEventListItem & A, const FReplayEventListItem & B) const
+			// Sort checkpoints by time
+			struct FCompareCheckpointTime
 			{
-				return A.Time1 < B.Time1;
-			}
-		};
+				FORCEINLINE bool operator()(const FReplayEventListItem & A, const FReplayEventListItem & B) const
+				{
+					return A.Time1 < B.Time1;
+				}
+			};
 
-		Sort( CheckpointList.ReplayEvents.GetData(), CheckpointList.ReplayEvents.Num(), FCompareCheckpointTime() );
+			Sort( CheckpointList.ReplayEvents.GetData(), CheckpointList.ReplayEvents.Num(), FCompareCheckpointTime() );
 
-		StartStreamingDelegate.ExecuteIfBound( true, false );
+			Result.Result = EStreamingOperationResult::Success;
+		}	
 	}
 	else
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateCheckpointsFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
-		StartStreamingDelegate.ExecuteIfBound( false, false );
-
-		// Reset delegate
-		StartStreamingDelegate = FOnStreamReadyDelegate();
-
 		SetLastError( ENetworkReplayError::ServiceUnavailable );
 	}
-
-	// Reset delegate
-	StartStreamingDelegate = FOnStreamReadyDelegate();
+	
+	StartStreamingDelegate.ExecuteIfBound(Result);
+	StartStreamingDelegate = FStartStreamingCallback();
 }
 
-void FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished(FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateEventsCompleteDelegate EnumerateEventsDelegate)
+void FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished(FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateEventsCallback Delegate)
 {
 	RequestFinished(StreamerState, EQueuedHttpRequestType::EnumeratingCustomEvent, HttpRequest);
 
+	FEnumerateEventsResult Result;
+
 	if (bSucceeded && HttpResponse->GetResponseCode() == EHttpResponseCodes::Ok)
 	{
 		FReplayEventList EventList;
 		FString JsonString = HttpResponse->GetContentAsString();
-		if (!EventList.FromJson(JsonString))
+		if (Result.ReplayEventList.FromJson(JsonString))
+		{
+			UE_LOG(LogHttpReplay, Verbose, TEXT("FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished. %s"), *JsonString);
+			Result.Result = EStreamingOperationResult::Success;
+		}
+		else
 		{
 			UE_LOG(LogHttpReplay, Warning, TEXT("FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished. FromJson FAILED"));
-
-			EnumerateEventsDelegate.ExecuteIfBound(FReplayEventList(), false);
-
-			// Reset delegate
-			EnumerateEventsDelegate = FEnumerateEventsCompleteDelegate();
-
 			SetLastError(ENetworkReplayError::ServiceUnavailable);
-
-			return;
 		}
-
-		UE_LOG(LogHttpReplay, Verbose, TEXT("FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished. %s"), *JsonString);
-		EnumerateEventsDelegate.ExecuteIfBound(EventList, true);
 	}
 	else
 	{
 		UE_LOG( LogHttpReplay, Warning, TEXT( "FHttpNetworkReplayStreamer::HttpEnumerateEventsFinished. FAILED, %s" ), *BuildRequestErrorString( HttpRequest, HttpResponse ) );
-		
-		EnumerateEventsDelegate.ExecuteIfBound(FReplayEventList(), false);
-		
 		SetLastError(ENetworkReplayError::ServiceUnavailable);
 	}
+	
+	Delegate.ExecuteIfBound(Result);
 }
 
 void FHttpNetworkReplayStreamer::HttpAddUserFinished(FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded)
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Public/HttpNetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Public/HttpNetworkReplayStreaming.h
index 24d1543ef6c5..497bc0780451 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Public/HttpNetworkReplayStreaming.h
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/HttpNetworkReplayStreaming/Public/HttpNetworkReplayStreaming.h
@@ -205,14 +205,15 @@ public:
 	FHttpNetworkReplayStreamer();
 
 	/** INetworkReplayStreamer implementation */
-	virtual void		StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate ) override;
+	virtual void		StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
+	virtual void		StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
 	virtual void		StopStreaming() override;
 	virtual FArchive*	GetHeaderArchive() override;
 	virtual FArchive*	GetStreamingArchive() override;
 	virtual FArchive*	GetCheckpointArchive() override;
 	virtual void		FlushCheckpoint( const uint32 TimeInMS ) override;
-	virtual void		GotoCheckpointIndex( const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate ) override;
-	virtual void		GotoTimeInMS( const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate ) override;
+	virtual void		GotoCheckpointIndex( const int32 CheckpointIndex, const FGotoCallback& Delegate ) override;
+	virtual void		GotoTimeInMS( const uint32 TimeInMS, const FGotoCallback& Delegate ) override;
 	virtual void		UpdateTotalDemoTime( uint32 TimeInMS ) override;
 	virtual uint32		GetTotalDemoTime() const override { return TotalDemoTimeInMS; }
 	virtual bool		IsDataAvailable() const override;
@@ -220,21 +221,44 @@ public:
 	virtual bool		IsDataAvailableForTimeRange( const uint32 StartTimeInMS, const uint32 EndTimeInMS ) override;
 	virtual bool		IsLoadingCheckpoint() const override;
 	virtual bool		IsLive() const override;
-	virtual void		DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate ) const override;
-	virtual void		EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void		EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void		EnumerateEvents( const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) override;
-	virtual void		EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) override;
-	virtual void		EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void		AddUserToReplay(const FString& UserString);
-	virtual void		RequestEventData(const FString& EventId, const FOnRequestEventDataComplete& Delegate) override;
-	virtual void		SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void		KeepReplay( const FString& ReplayName, const bool bKeep ) override;
+	virtual void		DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate ) override;
+	virtual void		DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate ) override;
+	virtual void		EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void		EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void		EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void		EnumerateEvents( const FString& Group, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void		EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void		EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void		EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void		EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void		AddUserToReplay(const FString& UserString) override;
+	virtual void		RequestEventData(const FString& EventId, const FRequestEventDataCallback& Delegate) override;
+	virtual void		RequestEventData(const FString& ReplayName, const FString& EventId, const FRequestEventDataCallback& Delegate) override;
+	virtual void		RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) override;
+	virtual void		SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate) override;
+	virtual void		KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) override;
+	virtual void		KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) override;
+	virtual void		RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) override;
+	virtual void		RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+	virtual void		RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) override;
+	virtual void		RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+
 	virtual ENetworkReplayError::Type GetLastError() const override;
 	virtual FString		GetReplayID() const override { return SessionName; }
 	virtual void		SetTimeBufferHintSeconds(const float InTimeBufferHintSeconds) override {}
 	virtual void		RefreshHeader() override;
-	virtual void		DownloadHeader(const FOnDownloadHeaderComplete& Delegate = FOnDownloadHeaderComplete());
+	virtual void		DownloadHeader(const FDownloadHeaderCallback& Delegate);
+	virtual uint32		GetMaxFriendlyNameSize() const override { return 0; }
+
+	virtual EStreamingOperationResult SetDemoPath(const FString& DemoPath) override
+	{
+		return EStreamingOperationResult::Unsupported;
+	}
+
+	virtual EStreamingOperationResult GetDemoPath(FString& DemoPath) const override
+	{
+		return EStreamingOperationResult::Unsupported;
+	}
 
 	/** FHttpNetworkReplayStreamer */
 	void UploadHeader();
@@ -264,6 +288,10 @@ public:
 	virtual bool CompressBuffer( const TArray< uint8 >& InBuffer, FHttpStreamFArchive& OutCompressed ) const { return false; }
 	virtual bool DecompressBuffer(FHttpStreamFArchive& InCompressed, TArray< uint8 >& OutBuffer) const { return false; }
 
+	virtual FString GetRecordingMetadata() const;
+	virtual bool DecompressResponse(FHttpResponsePtr HttpResponse, TArray<uint8>& ResultBuffer) const;
+	virtual bool CompressRequest(FHttpRequestPtr HttpRequest, const TArray<uint8>& RequestBuffer) const;
+
 	/** EStreamerState - Overall state of the streamer */
 	enum class EStreamerState
 	{
@@ -276,7 +304,7 @@ public:
 	void RequestFinished( EStreamerState ExpectedStreamerState, EQueuedHttpRequestType::Type ExpectedType, FHttpRequestPtr HttpRequest );
 
 	void HttpStartDownloadingFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
-	void HttpDownloadHeaderFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnDownloadHeaderComplete Delegate);
+	void HttpDownloadHeaderFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FDownloadHeaderCallback Delegate);
 	void HttpDownloadFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, int32 RequestedStreamChunkIndex, bool bStreamWasLive );
 	void HttpDownloadCheckpointFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
 	void HttpRefreshViewerFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
@@ -286,12 +314,15 @@ public:
 	void HttpUploadStreamFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
 	void HttpUploadCheckpointFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
 	void HttpUploadCustomEventFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
-	void HttpEnumerateSessionsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnEnumerateStreamsComplete Delegate );
+	void HttpEnumerateSessionsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateStreamsCallback Delegate );
 	void HttpEnumerateCheckpointsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
-	void HttpEnumerateEventsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateEventsCompleteDelegate EnumerateEventsDelegate );
+	void HttpEnumerateEventsFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FEnumerateEventsCallback EnumerateEventsDelegate );
 	void HttpAddUserFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
-	void HttpRequestEventDataFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FOnRequestEventDataComplete RequestEventDataCompleteDelegate );
-	void KeepReplayFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded );
+	void HttpRequestEventDataFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FRequestEventDataCallback RequestEventDataCompleteDelegate );
+
+	// Purposefully passing a copy of a string here, as we call this from a delegate and don't want
+	// to inadvertently capture a reference which may go out of scope.
+	void KeepReplayFinished( FHttpRequestPtr HttpRequest, FHttpResponsePtr HttpResponse, bool bSucceeded, FKeepReplayCallback KeepReplayDelegate, FString ReplayName );
 
 	bool ProcessNextHttpRequest();
 	void Tick( const float DeltaTime );
@@ -312,6 +343,7 @@ public:
 	EStreamerState			StreamerState;			// Overall state of the streamer
 	bool					bStopStreamingCalled;
 	bool					bStreamIsLive;			// If true, we are viewing a live stream
+	FString					StreamMetadata;
 	int32					NumTotalStreamChunks;
 	uint32					TotalDemoTimeInMS;
 	uint32					LastTotalDemoTimeInMS;
@@ -322,8 +354,8 @@ public:
 
 	ENetworkReplayError::Type		StreamerLastError;
 
-	FOnStreamReadyDelegate			StartStreamingDelegate;		// Delegate passed in to StartStreaming
-	FOnCheckpointReadyDelegate		GotoCheckpointDelegate;
+	FStartStreamingCallback			StartStreamingDelegate;		// Delegate passed in to StartStreaming
+	FGotoCallback					GotoCheckpointDelegate;
 	int32							DownloadCheckpointIndex;
 	int64							LastGotoTimeInMS;
 
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Private/InMemoryNetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Private/InMemoryNetworkReplayStreaming.cpp
index a1a4333282e9..e8526386e4e6 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Private/InMemoryNetworkReplayStreaming.cpp
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Private/InMemoryNetworkReplayStreaming.cpp
@@ -14,8 +14,16 @@ static FString GetAutomaticDemoName()
 	return FGuid::NewGuid().ToString();
 }
 
-void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate )
+void FInMemoryNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
 {
+	StartStreaming(CustomName, FriendlyName, TArray<FString>(), bRecord, ReplayVersion, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate )
+{
+	FStartStreamingResult Result;
+	Result.bRecording = bRecord;
+
 	if ( CustomName.IsEmpty() )
 	{
 		if ( bRecord )
@@ -26,7 +34,8 @@ void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName,
 		else
 		{
 			// Can't play a replay if the user didn't provide a name!
-			Delegate.ExecuteIfBound( false, bRecord );
+			Result.Result = EStreamingOperationResult::ReplayNotFound;
+			Delegate.ExecuteIfBound(Result);
 			return;
 		}
 	}
@@ -40,13 +49,14 @@ void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName,
 		FInMemoryReplay* FoundReplay = GetCurrentReplay();
 		if (FoundReplay == nullptr)
 		{
-			Delegate.ExecuteIfBound(false, bRecord);
+			Result.Result = EStreamingOperationResult::ReplayNotFound;
+			Delegate.ExecuteIfBound(Result);
 			return;
 		}
 
 		FileAr.Reset(new FInMemoryReplayStreamArchive(FoundReplay->StreamChunks));
-		FileAr->ArIsSaving = bRecord;
-		FileAr->ArIsLoading = !bRecord;
+		FileAr->SetIsSaving(bRecord);
+		FileAr->SetIsLoading(!bRecord);
 		HeaderAr.Reset(new FMemoryReader(FoundReplay->Header));
 		StreamerState = EStreamerState::Playback;
 	}
@@ -64,8 +74,8 @@ void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName,
 
 		// Open archives for writing
 		FileAr.Reset(new FInMemoryReplayStreamArchive(NewReplay->StreamChunks));
-		FileAr->ArIsSaving = bRecord;
-		FileAr->ArIsLoading = !bRecord;
+		FileAr->SetIsSaving(bRecord);
+		FileAr->SetIsLoading(!bRecord);
 		HeaderAr.Reset(new FMemoryWriter(NewReplay->Header));
 
 		OwningFactory->Replays.Add(CurrentStreamName, MoveTemp(NewReplay));
@@ -74,7 +84,12 @@ void FInMemoryNetworkReplayStreamer::StartStreaming( const FString& CustomName,
 	}
 
 	// Notify immediately
-	Delegate.ExecuteIfBound( FileAr.Get() != nullptr && HeaderAr.Get() != nullptr, bRecord );
+	if (FileAr.Get() != nullptr && HeaderAr.Get() != nullptr)
+	{
+		Result.Result = EStreamingOperationResult::Success;
+	}
+	
+	Delegate.ExecuteIfBound(Result);
 }
 
 void FInMemoryNetworkReplayStreamer::StopStreaming()
@@ -151,31 +166,60 @@ bool FInMemoryNetworkReplayStreamer::IsNamedStreamLive( const FString& StreamNam
 	return false;
 }
 
-void FInMemoryNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate ) const
+void FInMemoryNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate )
+{
+	DeleteFinishedStream(StreamName, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate )
 {
 	// Danger! Deleting a stream that is still being read by another streaming instance is not supported!
+	FDeleteFinishedStreamResult Result;
 
 	// Live streams can't be deleted
 	if (IsNamedStreamLive(StreamName))
 	{
 		UE_LOG(LogMemoryReplay, Log, TEXT("Can't delete network replay stream %s because it is live!"), *StreamName);
-		Delegate.ExecuteIfBound(false);
-		return;
+	}
+	else
+	{
+		if (OwningFactory->Replays.Remove(StreamName) > 0)
+		{
+			Result.Result = EStreamingOperationResult::Success;
+		}
 	}
 
-	const int32 NumRemoved = OwningFactory->Replays.Remove(StreamName);
-
-	Delegate.ExecuteIfBound(NumRemoved > 0);
+	
+	Delegate.ExecuteIfBound(Result);
 }
 
-void FInMemoryNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate )
+void FInMemoryNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateRecentStreams(ReplayVersion, FString(), Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate)
+{
+	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::EnumerateRecentStreams is currently unsupported."));
+	FEnumerateStreamsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FInMemoryNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreams(ReplayVersion, FString(), MetaString, ExtraParms, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate )
 {
 	EnumerateStreams( ReplayVersion, UserString, MetaString, TArray< FString >(), Delegate );
 }
 
-void FInMemoryNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate )
+void FInMemoryNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate )
 {
-	TArray<FNetworkReplayStreamInfo> Results;
+	FEnumerateStreamsResult Result;
+	Result.Result = EStreamingOperationResult::Success;
 
 	for ( const auto& StreamPair : OwningFactory->Replays )
 	{
@@ -188,11 +232,11 @@ void FInMemoryNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersi
 
 		if ( NetworkVersionPasses && ChangelistPasses )
 		{
-			Results.Add( StreamPair.Value->StreamInfo );
+			Result.FoundStreams.Add( StreamPair.Value->StreamInfo );
 		}
 	}
 
-	Delegate.ExecuteIfBound( Results );
+	Delegate.ExecuteIfBound( Result );
 }
 
 void FInMemoryNetworkReplayStreamer::AddUserToReplay( const FString& UserString )
@@ -205,29 +249,87 @@ void FInMemoryNetworkReplayStreamer::AddEvent( const uint32 TimeInMS, const FStr
 	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::AddEvent is currently unsupported."));
 }
 
-void FInMemoryNetworkReplayStreamer::EnumerateEvents( const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate )
+void FInMemoryNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
 {
-	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::EnumerateEvents is currently unsupported."));
+	EnumerateEvents(Group, Delegate);
 }
 
-void FInMemoryNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate)
+void FInMemoryNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate)
 {
-	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::EnumerateEvents is currently unsupported."));
+	EnumerateEvents(Group, Delegate);
 }
 
-void FInMemoryNetworkReplayStreamer::RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete)
+void FInMemoryNetworkReplayStreamer::EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::EnumerateEvents is currently unsupported."));
+	FEnumerateEventsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FInMemoryNetworkReplayStreamer::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
 {
 	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::RequestEventData is currently unsupported."));
+	FRequestEventDataResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
-void FInMemoryNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate)
+void FInMemoryNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData(EventID, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData(EventID, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate)
 {
 	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::SearchEvents is currently unsupported."));
+	FSearchEventsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
-void FInMemoryNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep)
+void FInMemoryNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	KeepReplay(ReplayName, bKeep, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate)
 {
 	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::KeepReplay is currently unsupported."));
+	FKeepReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FInMemoryNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplayFriendlyName(ReplayName, NewFriendlyName, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::RenameReplayFriendlyName is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FInMemoryNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplay(ReplayName, NewName, Delegate);
+}
+
+void FInMemoryNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogMemoryReplay, Log, TEXT("FInMemoryNetworkReplayStreamer::RenameReplay is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
 FArchive* FInMemoryNetworkReplayStreamer::GetCheckpointArchive()
@@ -323,40 +425,45 @@ void FInMemoryNetworkReplayStreamer::FlushCheckpoint(const uint32 TimeInMS)
 	FoundReplay->StreamChunks.Add(NewChunk);
 }
 
-void FInMemoryNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate)
+void FInMemoryNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FGotoCallback& Delegate)
 {
 	GotoCheckpointIndexInternal(CheckpointIndex, Delegate, -1);
 }
 
-void FInMemoryNetworkReplayStreamer::GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS)
+void FInMemoryNetworkReplayStreamer::GotoCheckpointIndexInternal(int32 CheckpointIndex, const FGotoCallback& Delegate, int32 ExtraSkipTimeInMS)
 {
 	check( FileAr.Get() != nullptr);
 
+	FGotoResult Result;
+	
 	if ( CheckpointIndex == -1 )
 	{
 		// Create a dummy checkpoint archive to indicate this is the first checkpoint
 		CheckpointAr.Reset(new FArchive);
 
 		FileAr->Seek(0);
-		
-		Delegate.ExecuteIfBound( true, TimeInMS );
-		return;
+		Result.ExtraTimeMS = ExtraSkipTimeInMS;
+		Result.Result = EStreamingOperationResult::Success;
 	}
-
-	FInMemoryReplay* FoundReplay = GetCurrentReplayChecked();
-
-	if (!FoundReplay->Checkpoints.IsValidIndex(CheckpointIndex))
+	else
 	{
-		UE_LOG(LogMemoryReplay, Log, TEXT("FNullNetworkReplayStreamer::GotoCheckpointIndex. Index %i is out of bounds."), CheckpointIndex);
-		Delegate.ExecuteIfBound( false, TimeInMS );
-		return;
+		FInMemoryReplay* FoundReplay = GetCurrentReplayChecked();
+
+		if (!FoundReplay->Checkpoints.IsValidIndex(CheckpointIndex))
+		{
+			UE_LOG(LogMemoryReplay, Log, TEXT("FNullNetworkReplayStreamer::GotoCheckpointIndex. Index %i is out of bounds."), CheckpointIndex);
+		}
+		else
+		{
+			CheckpointAr.Reset(new FMemoryReader(FoundReplay->Checkpoints[CheckpointIndex].Data));
+
+			FileAr->Seek(FoundReplay->Checkpoints[CheckpointIndex].StreamByteOffset);
+			Result.ExtraTimeMS = ExtraSkipTimeInMS;
+			Result.Result = EStreamingOperationResult::Success;
+		}
 	}
 
-	CheckpointAr.Reset(new FMemoryReader(FoundReplay->Checkpoints[CheckpointIndex].Data));
-
-	FileAr->Seek( FoundReplay->Checkpoints[CheckpointIndex].StreamByteOffset );
-
-	Delegate.ExecuteIfBound( true, TimeInMS );
+	Delegate.ExecuteIfBound( Result );
 }
 
 FInMemoryReplay* FInMemoryNetworkReplayStreamer::GetCurrentReplay()
@@ -397,7 +504,7 @@ FInMemoryReplay* FInMemoryNetworkReplayStreamer::GetCurrentReplayChecked() const
 	return FoundReplay;
 }
 
-void FInMemoryNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate)
+void FInMemoryNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FGotoCallback& Delegate)
 {
 	int32 CheckpointIndex = -1;
 
@@ -422,7 +529,7 @@ void FInMemoryNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const F
 		// except report an error.
 		if (FoundReplay->StreamChunks.Num() == 0 || FoundReplay->StreamChunks[0].TimeInMS > TimeInMS)
 		{
-			Delegate.ExecuteIfBound(false, TimeInMS);
+			Delegate.ExecuteIfBound(FGotoResult());
 			return;
 		}
 	}
@@ -514,7 +621,7 @@ int64 FInMemoryReplayStreamArchive::TotalSize()
 
 void FInMemoryReplayStreamArchive::Seek(int64 InPos) 
 {
-	check(InPos < TotalSize());
+	check(InPos <= TotalSize());
 
 	Pos = InPos;
 }
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Public/InMemoryNetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Public/InMemoryNetworkReplayStreaming.h
index 2c7bdd9bdf63..2f2e493dee50 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Public/InMemoryNetworkReplayStreaming.h
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/InMemoryNetworkReplayStreaming/Public/InMemoryNetworkReplayStreaming.h
@@ -123,14 +123,15 @@ public:
 	}
 	
 	/** INetworkReplayStreamer implementation */
-	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate ) override;
+	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
+	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
 	virtual void StopStreaming() override;
 	virtual FArchive* GetHeaderArchive() override;
 	virtual FArchive* GetStreamingArchive() override;
 	virtual FArchive* GetCheckpointArchive() override;
 	virtual void FlushCheckpoint( const uint32 TimeInMS ) override;
-	virtual void GotoCheckpointIndex( const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate ) override;
-	virtual void GotoTimeInMS( const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate ) override;
+	virtual void GotoCheckpointIndex( const int32 CheckpointIndex, const FGotoCallback& Delegate ) override;
+	virtual void GotoTimeInMS( const uint32 TimeInMS, const FGotoCallback& Delegate ) override;
 	virtual void UpdateTotalDemoTime( uint32 TimeInMS ) override;
 	virtual uint32 GetTotalDemoTime() const override;
 	virtual bool IsDataAvailable() const override;
@@ -138,23 +139,40 @@ public:
 	virtual bool IsDataAvailableForTimeRange( const uint32 StartTimeInMS, const uint32 EndTimeInMS ) override { return true; }
 	virtual bool IsLoadingCheckpoint() const override { return false; }
 	virtual bool IsLive() const override;
-	virtual void DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) const override;
-	virtual void EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate ) override {}
+	virtual void DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate) override;
+	virtual void DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate ) override;
 	virtual ENetworkReplayError::Type GetLastError() const override { return ENetworkReplayError::None; }
 	virtual void AddUserToReplay(const FString& UserString) override;
 	virtual void AddEvent(const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) override;
 	virtual void AddOrUpdateEvent( const FString& Name, const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data ) override {}
-	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate) override;
-	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) override;
-	virtual void RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete) override;
-	virtual void SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void KeepReplay( const FString& ReplayName, const bool bKeep ) override;
+	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) override;
+	virtual void SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate) override;
+
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
 	virtual FString	GetReplayID() const override { return TEXT( "" ); }
 	virtual void SetTimeBufferHintSeconds(const float InTimeBufferHintSeconds) override { TimeBufferHintSeconds = InTimeBufferHintSeconds; }
 	virtual void RefreshHeader() override {};
-	virtual void DownloadHeader(const FOnDownloadHeaderComplete& Delegate = FOnDownloadHeaderComplete()) override { }
+	virtual void DownloadHeader(const FDownloadHeaderCallback& Delegate) override
+	{
+		FDownloadHeaderResult Result;
+		Result.Result = EStreamingOperationResult::Success;
+		Delegate.Execute(Result);
+	}
 	/** FTickableObjectBase implementation */
 	virtual void Tick(float DeltaSeconds) override;
 	virtual ETickableTickType GetTickableTickType() const override { return ETickableTickType::Always; }
@@ -163,11 +181,23 @@ public:
 	/** FTickableGameObject implementation */
 	virtual bool IsTickableWhenPaused() const override { return true; }
 
+	virtual uint32 GetMaxFriendlyNameSize() const override { return 0; }
+
+	virtual EStreamingOperationResult SetDemoPath(const FString& DemoPath) override
+	{
+		return EStreamingOperationResult::Unsupported;
+	}
+
+	virtual EStreamingOperationResult GetDemoPath(FString& DemoPath) const override
+	{
+		return EStreamingOperationResult::Unsupported;
+	}
+
 private:
 	bool IsNamedStreamLive( const FString& StreamName ) const;
 
 	/** Handles the details of loading a checkpoint */
-	void GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS);
+	void GotoCheckpointIndexInternal(int32 CheckpointIndex, const FGotoCallback& Delegate, int32 TimeInMS);
 
 	/**
 	 * Returns a pointer to the currently active (recording or playback) replay in the owning factory's map.
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Private/LocalFileNetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Private/LocalFileNetworkReplayStreaming.cpp
index 80b86f84e86c..e4592c71ef5f 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Private/LocalFileNetworkReplayStreaming.cpp
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Private/LocalFileNetworkReplayStreaming.cpp
@@ -5,312 +5,514 @@
 #include "HAL/FileManager.h"
 #include "Misc/Paths.h"
 #include "Misc/Guid.h"
+#include "Async/Async.h"
+#include "ProfilingDebugging/ScopedTimers.h"
+#include "Engine/Engine.h"
+#include "Engine/LocalPlayer.h"
+#include "Engine/World.h"
+#include "UObject/CoreOnline.h"
 
 DEFINE_LOG_CATEGORY_STATIC(LogLocalFileReplay, Log, All);
 
+DECLARE_STATS_GROUP(TEXT("LocalReplay"), STATGROUP_LocalReplay, STATCAT_Advanced);
+
+DECLARE_CYCLE_STAT(TEXT("Local replay compress time"), STAT_LocalReplay_CompressTime, STATGROUP_LocalReplay);
+DECLARE_CYCLE_STAT(TEXT("Local replay decompress time"), STAT_LocalReplay_DecompressTime, STATGROUP_LocalReplay);
+
 namespace LocalFileReplay
 {
+	enum ELocalFileVersionHistory : uint32
+	{
+		HISTORY_INITIAL							= 0,
+		HISTORY_FIXEDSIZE_FRIENDLY_NAME			= 1,
+		HISTORY_COMPRESSION						= 2,
+		HISTORY_RECORDED_TIMESTAMP				= 3,
+		HISTORY_STREAM_CHUNK_TIMES				= 4,
+
+		// -----<new versions can be added before this line>-------------------------------------------------
+		HISTORY_PLUS_ONE,
+		HISTORY_LATEST 							= HISTORY_PLUS_ONE - 1
+	};
+
 	const uint32 FileMagic = 0x1CA2E27F;
-	const uint32 FileVersion = 0;
+	const uint32 MaxFriendlyNameLen = 256;
 
-	FString GetDemoPath()
-	{
-		return FPaths::Combine(*FPaths::ProjectSavedDir(), TEXT("Demos/"));
-	}
-
-	FString GetDemoFullFilename(const FString& StreamName)
-	{
-		return FPaths::Combine(*GetDemoPath(), *StreamName) + TEXT(".replay");
-	}
-
-	// Returns a name formatted as "demoX", where X is between 1 and MAX_DEMOS, inclusive.
-	// Returns the first value that doesn't yet exist, or if they all exist, returns the oldest one
-	// (it will be overwritten).
-	FString GetAutomaticDemoName()
-	{
-		FString FinalDemoName;
-		FDateTime BestDateTime = FDateTime::MaxValue();
-
-		const int MAX_DEMOS = 10;
-
-		// Start at 1 instead of 0, only for slightly more user-friendly file names.
-		for (int32 i = 1; i <= MAX_DEMOS; i++)
-		{
-			const FString DemoName = FString::Printf(TEXT("demo%i"), i);
-			const FString FullDemoName = LocalFileReplay::GetDemoFullFilename(DemoName);
-
-			FDateTime DateTime = IFileManager::Get().GetTimeStamp(*FullDemoName);
-			if (DateTime == FDateTime::MinValue())
-			{
-				// If we don't find this file, we can early out now
-				FinalDemoName = DemoName;
-				break;
-			}
-			else if (DateTime < BestDateTime)
-			{
-				// Use the oldest file
-				FinalDemoName = DemoName;
-				BestDateTime = DateTime;
-			}
-		}
-
-		return FinalDemoName;
-	}
+	TAutoConsoleVariable<int32> CVarMaxCacheSize(TEXT("localReplay.MaxCacheSize"), 1024 * 1024 * 10, TEXT(""));
+	TAutoConsoleVariable<int32> CVarMaxBufferedStreamChunks(TEXT("localReplay.MaxBufferedStreamChunks"), 5, TEXT(""));
+	TAutoConsoleVariable<int32> CVarAllowLiveStreamDelete(TEXT("localReplay.AllowLiveStreamDelete"), 1, TEXT(""));
+	TAutoConsoleVariable<float> CVarChunkUploadDelayInSeconds(TEXT("localReplay.ChunkUploadDelayInSeconds"), 20.0f, TEXT(""));
 };
 
-void FLocalFileStreamFArchive::SetChunk(int32 ChunkIndex)
+FLocalFileNetworkReplayStreamer::FLocalFileSerializationInfo::FLocalFileSerializationInfo() 
+	: FileVersion(LocalFileReplay::HISTORY_LATEST)
 {
-	check(Streamer != nullptr);
-	check(Streamer->ReplayInfo.DataChunks.IsValidIndex(ChunkIndex));
-	check(LocalFileAr.Get());
-
-	CurrentChunkIndex = ChunkIndex;
-
-	FLocalFileChunkInfo ChunkInfo = Streamer->ReplayInfo.Chunks[Streamer->ReplayInfo.DataChunks[CurrentChunkIndex].ChunkIndex];
-
-	LocalFileAr->Seek(ChunkInfo.Offset);
-
-	CurrentChunkBuffer.Reset(ChunkInfo.SizeInBytes);
-	CurrentChunkBuffer.AddUninitialized(ChunkInfo.SizeInBytes);
-
-	LocalFileAr->Serialize(CurrentChunkBuffer.GetData(), CurrentChunkBuffer.Num());
-
-	if (Streamer->SupportsCompression())
-	{
-		TArray<uint8> Uncompressed;
-		if (Streamer->DecompressBuffer(CurrentChunkBuffer, Uncompressed))
-		{
-			CurrentChunkBuffer = Uncompressed;
-		}
-		else
-		{
-			ArIsError = true;
-			return;
-		}
-	}
-
-	Pos = Streamer->ReplayInfo.DataChunks[CurrentChunkIndex].ReplayOffset;
-	CurrentChunkPos = 0;
 }
 
-void FLocalFileStreamFArchive::Serialize(void* V, int64 Length)
+void FLocalFileStreamFArchive::Serialize(void* V, int64 Length) 
 {
 	if (IsLoading())
 	{
-		if (Pos + Length > TotalSize())
+		if ((Pos + Length) > Buffer.Num())
 		{
 			ArIsError = true;
 			return;
 		}
 
-		check((CurrentChunkPos + Length) <= CurrentChunkBuffer.Num());
-
-		FMemory::Memcpy(V, CurrentChunkBuffer.GetData() + CurrentChunkPos, Length);
+		FMemory::Memcpy(V, Buffer.GetData() + Pos, Length);
 
 		Pos += Length;
-		CurrentChunkPos += Length;
-
-		if ((CurrentChunkPos >= CurrentChunkBuffer.Num()) && !AtEnd())
-		{
-			CurrentChunkIndex++;
-			SetChunk(CurrentChunkIndex);
-		}
 	}
 	else
 	{
-		ArIsError = true;
+		check(Pos <= Buffer.Num());
+
+		const int32 SpaceNeeded = Length - (Buffer.Num() - Pos);
+
+		if (SpaceNeeded > 0)
+		{
+			Buffer.AddZeroed(SpaceNeeded);
+		}
+
+		FMemory::Memcpy(Buffer.GetData() + Pos, V, Length);
+
+		Pos += Length;
 	}
 }
 
-int64 FLocalFileStreamFArchive::Tell()
+int64 FLocalFileStreamFArchive::Tell() 
 {
 	return Pos;
 }
 
 int64 FLocalFileStreamFArchive::TotalSize()
 {
-	check(Streamer != nullptr);
-	return Streamer->ReplayInfo.TotalDataSizeInBytes;
+	return Buffer.Num();
 }
 
-void FLocalFileStreamFArchive::Seek(int64 InPos)
+void FLocalFileStreamFArchive::Seek(int64 InPos) 
 {
-	check(Streamer != nullptr);
-	check(InPos < TotalSize());
-
-	int32 ChunkIndex = 0;
-
-	// figure out current chunk, set it, then offset within it
-	for(int32 i=0; i < Streamer->ReplayInfo.DataChunks.Num(); ++i)
-	{
-		if (Streamer->ReplayInfo.DataChunks[i].ReplayOffset <= InPos)
-		{
-			ChunkIndex = i;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	SetChunk(ChunkIndex);
+	check(InPos <= Buffer.Num());
 
 	Pos = InPos;
-	CurrentChunkPos = (Pos - Streamer->ReplayInfo.DataChunks[CurrentChunkIndex].ReplayOffset);
 }
 
-bool FLocalFileStreamFArchive::AtEnd()
+bool FLocalFileStreamFArchive::AtEnd() 
 {
-	return Pos >= TotalSize();
+	return Pos >= Buffer.Num() && bAtEndOfReplay;
 }
 
-void FLocalFileHeaderFArchive::Flush()
+FLocalFileNetworkReplayStreamer::FLocalFileNetworkReplayStreamer() 
+	: StreamTimeRange(0, 0)
+	, StreamDataOffset(0)
+	, StreamChunkIndex(0)
+	, LastChunkTime(0)
+	, LastRefreshTime(0)
+	, bStopStreamingCalled(false)
+	, HighPriorityEndTime(0)
+	, LastGotoTimeInMS(-1)
+	, StreamerState(EStreamerState::Idle)
+	, StreamerLastError(ENetworkReplayError::None)
+	, DemoSavePath(GetDefaultDemoSavePath())
 {
-	FArrayWriter::Flush();
-
-	check(Streamer != nullptr);
-	Streamer->FlushHeader();
 }
 
-FLocalFileReplayInfo FLocalFileNetworkReplayStreamer::ReadReplayInfo(const FString& StreamName) const
+FLocalFileNetworkReplayStreamer::FLocalFileNetworkReplayStreamer(const FString& InDemoSavePath) 
+	: StreamTimeRange(0, 0)
+	, StreamDataOffset(0)
+	, StreamChunkIndex(0)
+	, LastChunkTime(0)
+	, LastRefreshTime(0)
+	, bStopStreamingCalled(false)
+	, HighPriorityEndTime(0)
+	, LastGotoTimeInMS(-1)
+	, StreamerState(EStreamerState::Idle)
+	, StreamerLastError(ENetworkReplayError::None)
+	, DemoSavePath(InDemoSavePath.EndsWith(TEXT("/")) ? InDemoSavePath : InDemoSavePath + FString("/"))
 {
-	const FString FullFilename = LocalFileReplay::GetDemoFullFilename(StreamName);
+}
 
-	FLocalFileReplayInfo Info;
-	TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileReader(*FullFilename, FILEREAD_AllowWrite));
+FLocalFileNetworkReplayStreamer::~FLocalFileNetworkReplayStreamer()
+{
 
-	if (LocalFileAr.IsValid() && LocalFileAr->TotalSize() != 0)
+}
+
+bool FLocalFileNetworkReplayStreamer::ReadReplayInfo(const FString& StreamName, FLocalFileReplayInfo& Info) const
+{
+	TSharedPtr<FArchive> LocalFileAr = CreateLocalFileReader(GetDemoFullFilename(StreamName));
+	if (LocalFileAr.IsValid())
+	{
+		return ReadReplayInfo(*LocalFileAr.Get(), Info);
+	}
+
+	return false;
+}
+
+bool FLocalFileNetworkReplayStreamer::ReadReplayInfo(FArchive& Archive, FLocalFileReplayInfo& Info) const
+{
+	FLocalFileSerializationInfo DefaultSerializationInfo;
+	return ReadReplayInfo(Archive, Info, DefaultSerializationInfo);
+}
+
+bool FLocalFileNetworkReplayStreamer::ReadReplayInfo(FArchive& Archive, FLocalFileReplayInfo& Info, FLocalFileSerializationInfo& SerializationInfo) const
+{
+	// reset the info before reading
+	Info = FLocalFileReplayInfo();
+
+	if (Archive.TotalSize() != 0)
 	{
 		uint32 MagicNumber;
-		*LocalFileAr << MagicNumber;
+		Archive << MagicNumber;
 
 		uint32 FileVersion;
-		*LocalFileAr << FileVersion;
+		Archive << FileVersion;
 
-		if ((MagicNumber == LocalFileReplay::FileMagic) && (FileVersion == LocalFileReplay::FileVersion))
+		if (MagicNumber == LocalFileReplay::FileMagic)
 		{
+			SerializationInfo.FileVersion = FileVersion;
+
 			// read summary info
-			*LocalFileAr << Info.LengthInMS;
-			*LocalFileAr << Info.NetworkVersion;
-			*LocalFileAr << Info.Changelist;
-			*LocalFileAr << Info.FriendlyName;
+			Archive << Info.LengthInMS;
+			Archive << Info.NetworkVersion;
+			Archive << Info.Changelist;
+
+			FString FriendlyName;
+			Archive << FriendlyName;
+
+			if (FileVersion >= LocalFileReplay::HISTORY_FIXEDSIZE_FRIENDLY_NAME)
+			{
+				// trim whitespace since this may have been padded
+				Info.FriendlyName = FriendlyName.TrimEnd();
+			}
+			else
+			{
+				// Note, don't touch the FriendlyName if this is an older replay.
+				// Users can adjust the name as necessary using GetMaxFriendlyNameSize.
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::ReadReplayInfoInternal - Loading an old replay, friendly name length **must not** be changed."));
+			}
 
 			uint32 IsLive;
-			*LocalFileAr << IsLive;
+			Archive << IsLive;
 
 			Info.bIsLive = (IsLive != 0);
 
-			// now look for all chunks
-			while (!LocalFileAr->AtEnd())
+			if (FileVersion >= LocalFileReplay::HISTORY_RECORDED_TIMESTAMP)
 			{
+				Archive << Info.Timestamp;
+			}
+
+			if (FileVersion >= LocalFileReplay::HISTORY_COMPRESSION)
+			{
+				uint32 Compressed;
+				Archive << Compressed;
+
+				Info.bCompressed = (Compressed != 0);
+			}
+
+			int64 TotalSize = Archive.TotalSize();
+
+			// now look for all chunks
+			while (!Archive.AtEnd())
+			{
+				int64 TypeOffset = Archive.Tell();
+
 				ELocalFileChunkType ChunkType;
-				*LocalFileAr << ChunkType;
+				Archive << ChunkType;
 
 				int32 Idx = Info.Chunks.AddDefaulted();
-				Info.Chunks[Idx].ChunkType = ChunkType;
+				FLocalFileChunkInfo& Chunk = Info.Chunks[Idx];
+				Chunk.ChunkType = ChunkType;
 
-				*LocalFileAr << Info.Chunks[Idx].SizeInBytes;
+				Archive << Chunk.SizeInBytes;
 
-				Info.Chunks[Idx].Offset = LocalFileAr->Tell();
+				Chunk.TypeOffset = TypeOffset;
+				Chunk.DataOffset = Archive.Tell();
+
+				if ((Chunk.SizeInBytes < 0) || ((Chunk.DataOffset + Chunk.SizeInBytes) > TotalSize))
+				{
+					UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid chunk size: %lld"), Chunk.SizeInBytes);
+					Archive.SetError();
+					return false;
+				}
 
 				switch(ChunkType)
 				{
 				case ELocalFileChunkType::Header:
-					check(Info.HeaderChunkIndex == INDEX_NONE);
-					Info.HeaderChunkIndex = Idx;
-					break;
+				{
+					if (Info.HeaderChunkIndex == INDEX_NONE)
+					{
+						Info.HeaderChunkIndex = Idx;
+					}
+					else
+					{
+						UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Found multiple header chunks"));
+						Archive.SetError();
+						return false;
+					}
+				}
+				break;
 				case ELocalFileChunkType::Checkpoint:
 				{
 					int32 CheckpointIdx = Info.Checkpoints.AddDefaulted();
-					Info.Checkpoints[CheckpointIdx].ChunkIndex = Idx;
+					FLocalFileEventInfo& Checkpoint = Info.Checkpoints[CheckpointIdx];
 
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].Id;
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].Group;
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].Metadata;
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].Time1;
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].Time2;
+					Checkpoint.ChunkIndex = Idx;
+					
+					Archive << Checkpoint.Id;
+					Archive << Checkpoint.Group;
+					Archive << Checkpoint.Metadata;
+					Archive << Checkpoint.Time1;
+					Archive << Checkpoint.Time2;
 
-					*LocalFileAr << Info.Checkpoints[CheckpointIdx].SizeInBytes;
+					Archive << Checkpoint.SizeInBytes;
 
-					Info.Checkpoints[CheckpointIdx].Offset = LocalFileAr->Tell();
+					Checkpoint.EventDataOffset = Archive.Tell();
+					
+					if ((Checkpoint.SizeInBytes < 0) || ((Checkpoint.EventDataOffset + Checkpoint.SizeInBytes) > TotalSize))
+					{
+						UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid checkpoint size: %lld"), Checkpoint.SizeInBytes);
+						Archive.SetError();
+						return false;
+					}
+
+					if (Info.bCompressed)
+					{
+						int32 DecompressedSize = GetDecompressedSize(Archive);
+						if (DecompressedSize < 0)
+						{
+							UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid decompressed checkpoint size: %d"), DecompressedSize);
+							Archive.SetError();
+							return false;
+						}
+					}
 				}
 				break;
 				case ELocalFileChunkType::ReplayData:
 				{
 					int32 DataIdx = Info.DataChunks.AddDefaulted();
-					Info.DataChunks[DataIdx].ChunkIndex = Idx;
-					Info.DataChunks[DataIdx].ReplayOffset = Info.TotalDataSizeInBytes;
+					FLocalFileReplayDataInfo& DataChunk = Info.DataChunks[DataIdx];
+					DataChunk.ChunkIndex = Idx;
+					DataChunk.StreamOffset = Info.TotalDataSizeInBytes;
 
-					if (SupportsCompression())
+					if (FileVersion >= LocalFileReplay::HISTORY_STREAM_CHUNK_TIMES)
 					{
-						int64 SavedPos = LocalFileAr->Tell();
-						LocalFileAr->Seek(Info.Chunks[Idx].Offset);
-						Info.TotalDataSizeInBytes += GetDecompressedSize(*LocalFileAr);
-						LocalFileAr->Seek(SavedPos);
+						Archive << DataChunk.Time1;
+						Archive << DataChunk.Time2;
+						Archive << DataChunk.SizeInBytes;
 					}
 					else
 					{
-						Info.TotalDataSizeInBytes += Info.Chunks[Idx].SizeInBytes;
+						DataChunk.SizeInBytes = Chunk.SizeInBytes;
+					}
+
+					DataChunk.ReplayDataOffset = Archive.Tell();
+
+					if ((DataChunk.SizeInBytes < 0) || ((DataChunk.ReplayDataOffset + DataChunk.SizeInBytes) > TotalSize))
+					{
+						UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid stream chunk size: %lld"), DataChunk.SizeInBytes);
+						Archive.SetError();
+						return false;
+					}
+
+					if (Info.bCompressed)
+					{
+						int32 DecompressedSize = GetDecompressedSize(Archive);
+						if (DecompressedSize < 0)
+						{
+							UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid decompressed replay data size: %d"), DecompressedSize);
+							Archive.SetError();
+							return false;
+						}
+							
+						Info.TotalDataSizeInBytes += DecompressedSize;
+					}
+					else
+					{
+						Info.TotalDataSizeInBytes += DataChunk.SizeInBytes;
 					}
 				}
 				break;
 				case ELocalFileChunkType::Event:
 				{
 					int32 EventIdx = Info.Events.AddDefaulted();
-					Info.Events[EventIdx].ChunkIndex = Idx;
+					FLocalFileEventInfo& Event = Info.Events[EventIdx];
+					Event.ChunkIndex = Idx;
 
-					*LocalFileAr << Info.Events[EventIdx].Id;
-					*LocalFileAr << Info.Events[EventIdx].Group;
-					*LocalFileAr << Info.Events[EventIdx].Metadata;
-					*LocalFileAr << Info.Events[EventIdx].Time1;
-					*LocalFileAr << Info.Events[EventIdx].Time2;
+					Archive << Event.Id;
+					Archive << Event.Group;
+					Archive << Event.Metadata;
+					Archive << Event.Time1;
+					Archive << Event.Time2;
 
-					*LocalFileAr << Info.Events[EventIdx].SizeInBytes;
+					Archive << Event.SizeInBytes;
 
-					Info.Events[EventIdx].Offset = LocalFileAr->Tell();
+					Event.EventDataOffset = Archive.Tell();
+
+					if ((Event.SizeInBytes < 0) || ((Event.EventDataOffset + Event.SizeInBytes) > TotalSize))
+					{
+						UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Invalid event size: %lld"), Event.SizeInBytes);
+						Archive.SetError();
+						return false;
+					}
 				}
 				break;
+				case ELocalFileChunkType::Unknown:
+					UE_LOG(LogLocalFileReplay, Verbose, TEXT("ReadReplayInfo: Skipping unknown (cleared) chunk"));
+					break;
 				default:
-					UE_LOG(LogLocalFileReplay, Log, TEXT("ReadReplayInfo: Unhandled file chunk type: %d"), (uint32)ChunkType);
+					UE_LOG(LogLocalFileReplay, Warning, TEXT("ReadReplayInfo: Unhandled file chunk type: %d"), (uint32)ChunkType);
 					break;
 				}
 
-				LocalFileAr->Seek(Info.Chunks[Idx].Offset + Info.Chunks[Idx].SizeInBytes);
+				if (Archive.IsError())
+				{
+					UE_LOG(LogLocalFileReplay, Error, TEXT("ReadReplayInfo: Archive error after parsing chunk"));
+					return false;
+				}
+
+				Archive.Seek(Chunk.DataOffset + Chunk.SizeInBytes);
 			}
 		}
 
-		Info.bIsValid = (Info.HeaderChunkIndex != INDEX_NONE) && (Info.TotalDataSizeInBytes > 0);
+		if (FileVersion < LocalFileReplay::HISTORY_STREAM_CHUNK_TIMES)
+		{
+			for(int i=0; i < Info.DataChunks.Num(); ++i)
+			{
+				const int32 CheckpointStartIdx = i - 1;
+
+				if (Info.Checkpoints.IsValidIndex(CheckpointStartIdx))
+				{
+					Info.DataChunks[i].Time1 = Info.Checkpoints[CheckpointStartIdx].Time1;
+				}
+				else
+				{
+					Info.DataChunks[i].Time1 = 0;
+				}					
+
+				if (Info.Checkpoints.IsValidIndex(i))
+				{
+					Info.DataChunks[i].Time2 = Info.Checkpoints[i].Time1;
+				}
+				else
+				{
+					Info.DataChunks[i].Time2 = Info.LengthInMS;
+				}
+			}
+		}
+
+		Info.bIsValid = Info.Chunks.IsValidIndex(Info.HeaderChunkIndex);
+
+		return Info.bIsValid && !Archive.IsError();
 	}
 
-	return Info;
+	return false;
 }
 
-void FLocalFileNetworkReplayStreamer::WriteReplayInfo(const FString& StreamName, FLocalFileReplayInfo& InReplayInfo)
+bool FLocalFileNetworkReplayStreamer::WriteReplayInfo(const FString& StreamName, const FLocalFileReplayInfo& InReplayInfo)
 {
 	// Update metadata with latest info
-	TUniquePtr<FArchive> ReplayInfoFileAr(IFileManager::Get().CreateFileWriter(*LocalFileReplay::GetDemoFullFilename(StreamName), FILEWRITE_Append | FILEWRITE_AllowRead));
+	TSharedPtr<FArchive> ReplayInfoFileAr = CreateLocalFileWriter(GetDemoFullFilename(StreamName));
 	if (ReplayInfoFileAr.IsValid())
 	{
-		ReplayInfoFileAr->Seek(0);
+		return WriteReplayInfo(*ReplayInfoFileAr.Get(), InReplayInfo);
+	}
 
-		uint32 FileMagic = LocalFileReplay::FileMagic;
-		*ReplayInfoFileAr << FileMagic;
-		
-		uint32 FileVersion = LocalFileReplay::FileVersion;
-		*ReplayInfoFileAr << FileVersion;
+	return false;
+}
 
-		*ReplayInfoFileAr << InReplayInfo.LengthInMS;
-		*ReplayInfoFileAr << InReplayInfo.NetworkVersion;
-		*ReplayInfoFileAr << InReplayInfo.Changelist;
-		*ReplayInfoFileAr << InReplayInfo.FriendlyName;
+bool FLocalFileNetworkReplayStreamer::WriteReplayInfo(FArchive& Archive, const FLocalFileReplayInfo& InReplayInfo)
+{
+	FLocalFileSerializationInfo DefaultSerializationInfo;
+	return WriteReplayInfo(Archive, InReplayInfo, DefaultSerializationInfo);
+}
 
-		uint32 IsLive = InReplayInfo.bIsLive ? 1 : 0;
-		*ReplayInfoFileAr << IsLive;
+bool FLocalFileNetworkReplayStreamer::WriteReplayInfo(FArchive& Archive, const FLocalFileReplayInfo& InReplayInfo, FLocalFileSerializationInfo& SerializationInfo)
+{
+	if (SerializationInfo.FileVersion < LocalFileReplay::HISTORY_FIXEDSIZE_FRIENDLY_NAME)
+	{
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkRepalyStreamer::WriteReplayInfo: Unable to safely rewrite old replay info"));
+		return false;
+	}
+
+	Archive.Seek(0);
+
+	uint32 MagicNumber = LocalFileReplay::FileMagic;
+	Archive << MagicNumber;
+
+	Archive << SerializationInfo.FileVersion;
+
+	Archive << const_cast<int32&>(InReplayInfo.LengthInMS);
+	Archive << const_cast<uint32&>(InReplayInfo.NetworkVersion);
+	Archive << const_cast<uint32&>(InReplayInfo.Changelist);
+
+	FString FixedSizeName;
+	FixupFriendlyNameLength(InReplayInfo.FriendlyName, FixedSizeName);
+
+	Archive << FixedSizeName;
+
+	uint32 IsLive = InReplayInfo.bIsLive ? 1 : 0;
+	Archive << IsLive;
+
+	// It's possible we're updating an older replay (e.g., for a rename)
+	// Therefore, we can't write out any data that the replay wouldn't have had.
+	if (SerializationInfo.FileVersion >= LocalFileReplay::HISTORY_RECORDED_TIMESTAMP)
+	{
+		Archive << const_cast<FDateTime&>(InReplayInfo.Timestamp);
+	}
+
+	if (SerializationInfo.FileVersion >= LocalFileReplay::HISTORY_COMPRESSION)
+	{
+		uint32 Compressed = SupportsCompression() ? 1 : 0;
+		Archive << Compressed;
+	}
+
+	return !Archive.IsError();
+}
+
+void FLocalFileNetworkReplayStreamer::FixupFriendlyNameLength(const FString& UnfixedName, FString& FixedName) const
+{
+	const uint32 DesiredLength = GetMaxFriendlyNameSize();
+	const uint32 NameLen = UnfixedName.Len();
+	if (NameLen < DesiredLength)
+	{
+		FixedName = UnfixedName.RightPad(DesiredLength);
+	}
+	else
+	{
+		FixedName = UnfixedName.Left(DesiredLength);
 	}
 }
 
-void FLocalFileNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate)
+void FLocalFileNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
 {
+	StartStreaming_Internal(CustomName, FriendlyName, UserIndices, bRecord, ReplayVersion, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<FString>& UserStrings, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	TArray<int32> UserIndices;
+	GetUserIndicesFromUserStrings(UserStrings, UserIndices);
+	StartStreaming_Internal(CustomName, FriendlyName, UserIndices, bRecord, ReplayVersion, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::StartStreaming_Internal(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	FStartStreamingResult Result;
+	Result.bRecording = bRecord;
+
+	if (IsStreaming())
+	{
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::StartStreaming. IsStreaming == true." ) );
+		Delegate.ExecuteIfBound(Result);
+		return;
+	}
+
+	if (IsFileRequestInProgress())
+	{
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::StartStreaming. IsFileRequestInProgress == true." ) );
+		Delegate.ExecuteIfBound(Result);
+		return;
+	}
+
 	FString FinalDemoName = CustomName;
 
 	if (CustomName.IsEmpty())
@@ -318,219 +520,407 @@ void FLocalFileNetworkReplayStreamer::StartStreaming(const FString& CustomName,
 		if (bRecord)
 		{
 			// If we're recording and the caller didn't provide a name, generate one automatically
-			FinalDemoName = LocalFileReplay::GetAutomaticDemoName();
+			FinalDemoName = GetAutomaticDemoName();
 		}
 		else
 		{
 			// Can't play a replay if the user didn't provide a name!
-			Delegate.ExecuteIfBound(false, bRecord);
+			Result.Result = EStreamingOperationResult::ReplayNotFound;
+			Delegate.ExecuteIfBound(Result);
 			return;
 		}
 	}
 
-	const FString FullDemoFilename = LocalFileReplay::GetDemoFullFilename(FinalDemoName);
+	// Setup the archives
+	StreamAr.SetIsLoading(!bRecord);
+	StreamAr.SetIsSaving(!StreamAr.IsLoading());
+	StreamAr.bAtEndOfReplay = false;
+
+	HeaderAr.SetIsLoading(StreamAr.IsLoading());
+	HeaderAr.SetIsSaving(StreamAr.IsSaving());
+
+	CheckpointAr.SetIsLoading(StreamAr.IsLoading());
+	CheckpointAr.SetIsSaving(StreamAr.IsSaving());
+
+	CurrentReplayInfo.LengthInMS = 0;
+
+	StreamTimeRange = TInterval<uint32>(0, 0);
+
+	StreamDataOffset = 0;
+	StreamChunkIndex = 0;
+
+	LastChunkTime = FPlatformTime::Seconds();
+
+	const FString FullDemoFilename = GetDemoFullFilename(FinalDemoName);
 
 	CurrentStreamName = FinalDemoName;
 
 	if (!bRecord)
 	{
-		// Load metadata if it exists
-		ReplayInfo = ReadReplayInfo(CurrentStreamName);
+		// We are playing
+		StreamerState = EStreamerState::Playback;
 
-		if (ReplayInfo.bIsValid)
-		{
-			HeaderPlaybackAr.Reset(IFileManager::Get().CreateFileReader(*FullDemoFilename, FILEREAD_AllowWrite));
-			HeaderPlaybackAr->Seek(ReplayInfo.Chunks[ReplayInfo.HeaderChunkIndex].Offset);
-
-			if (ReplayInfo.DataChunks.Num() > 0)
+		// Add the request to start loading
+		AddDelegateFileRequestToQueue<FStartStreamingResult>(EQueuedLocalFileRequestType::StartPlayback, 
+			[this, bRecord, FullDemoFilename](TLocalFileRequestCommonData<FStartStreamingResult>& RequestData)
 			{
-				FilePlaybackAr.Reset(new FLocalFileStreamFArchive(this));
-				FilePlaybackAr->ArIsLoading = 1;
-				FilePlaybackAr->LocalFileAr.Reset(IFileManager::Get().CreateFileReader(*FullDemoFilename, FILEREAD_AllowWrite));
-				FilePlaybackAr->Seek(0);
-			}
+				RequestData.DelegateResult.bRecording = bRecord;
+				
+				if (!FPaths::FileExists(FullDemoFilename))
+				{
+					RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+				}
+				else
+				{
+					// Load metadata if it exists
+					ReadReplayInfo(CurrentStreamName, RequestData.ReplayInfo);
+				}
+			},
+			[this, bRecord, Delegate](TLocalFileRequestCommonData<FStartStreamingResult>& RequestData)
+			{
+				if (RequestData.DelegateResult.Result == EStreamingOperationResult::ReplayNotFound)
+				{
+					Delegate.ExecuteIfBound(RequestData.DelegateResult);
+				}
+				else
+				{
+					CurrentReplayInfo = RequestData.ReplayInfo;
 
-			StreamerState = EStreamerState::Playback;
-		}
+					if (!CurrentReplayInfo.bIsValid)
+					{
+						RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayCorrupt;
+
+						Delegate.ExecuteIfBound(RequestData.DelegateResult);
+					}
+					else
+					{
+						DownloadHeader(FDownloadHeaderCallback());
+
+						AddDelegateFileRequestToQueue<FStartStreamingCallback, FStartStreamingResult>(EQueuedLocalFileRequestType::StartPlayback, Delegate,
+							[this, bRecord](TLocalFileRequestCommonData<FStartStreamingResult>& PlaybackRequestData)
+							{
+								PlaybackRequestData.DelegateResult.bRecording = bRecord;	
+
+								if (CurrentReplayInfo.bIsValid)
+								{
+									PlaybackRequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+								}
+							});
+					}
+				}
+			});
 	}
 	else
 	{
-		// Delete any existing demo with this name
-		IFileManager::Get().Delete(*FullDemoFilename);
-
-		FileRecordingAr.Reset(new FArrayWriter());
-	
+		// We are recording
 		StreamerState = EStreamerState::Recording;
 
-		// Set up replay info
-		ReplayInfo.NetworkVersion = ReplayVersion.NetworkVersion;
-		ReplayInfo.Changelist = ReplayVersion.Changelist;
-		ReplayInfo.FriendlyName = FriendlyName;
-		ReplayInfo.bIsLive = true;
+		AddDelegateFileRequestToQueue<FStartStreamingResult>(EQueuedLocalFileRequestType::StartRecording,
+			[this, bRecord, FullDemoFilename, ReplayVersion, FriendlyName](TLocalFileRequestCommonData<FStartStreamingResult>& RequestData)
+			{
+				RequestData.DelegateResult.bRecording = bRecord;
 
-		WriteReplayInfo(CurrentStreamName, ReplayInfo);
+				// Delete any existing demo with this name
+				IFileManager::Get().Delete(*FullDemoFilename);
 
-		HeaderRecordingAr.Reset(new FLocalFileHeaderFArchive(this));
+				RequestData.ReplayInfo.NetworkVersion = ReplayVersion.NetworkVersion;
+				RequestData.ReplayInfo.Changelist = ReplayVersion.Changelist;
+				RequestData.ReplayInfo.FriendlyName = FriendlyName;
+				RequestData.ReplayInfo.bIsLive = true;
+				RequestData.ReplayInfo.Timestamp = FDateTime::Now();
+
+				WriteReplayInfo(CurrentStreamName, RequestData.ReplayInfo);
+
+				RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+			},
+			[this, Delegate](TLocalFileRequestCommonData<FStartStreamingResult>& RequestData)
+			{
+				CurrentReplayInfo = RequestData.ReplayInfo;
+
+				Delegate.ExecuteIfBound(RequestData.DelegateResult);
+			});
+
+		RefreshHeader();
 	}
-
-	// Notify immediately
-	Delegate.ExecuteIfBound(GetStreamingArchive() != nullptr && GetHeaderArchive() != nullptr, bRecord);
 }
 
-void FLocalFileNetworkReplayStreamer::FlushHeader()
+void FLocalFileNetworkReplayStreamer::CancelStreamingRequests()
 {
-	if (HeaderRecordingAr.Get() && (HeaderRecordingAr->Num() > 0))
+	// Cancel any active request
+	if (ActiveRequest.IsValid())
 	{
-		TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileWriter(*LocalFileReplay::GetDemoFullFilename(CurrentStreamName), FILEWRITE_Append | FILEWRITE_AllowRead));
-		if (LocalFileAr.IsValid())
-		{
-			LocalFileAr->Seek(LocalFileAr->TotalSize());
-
-			ELocalFileChunkType ChunkType = ELocalFileChunkType::Header;
-			*LocalFileAr << ChunkType;
-
-			int32 ChunkSize = HeaderRecordingAr->Num();
-			*LocalFileAr << ChunkSize;
-
-			LocalFileAr->Serialize(HeaderRecordingAr->GetData(), HeaderRecordingAr->Num());
-		}
-
-		HeaderRecordingAr.Reset();
+		ActiveRequest->CancelRequest();
+		ActiveRequest = nullptr;
 	}
+
+	// Empty the request queue
+	QueuedRequests.Empty();
+
+	StreamerState = EStreamerState::Idle;
+	bStopStreamingCalled = false;
+}
+
+void FLocalFileNetworkReplayStreamer::SetLastError( const ENetworkReplayError::Type InLastError )
+{
+	CancelStreamingRequests();
+	StreamerLastError = InLastError;
+}
+
+ENetworkReplayError::Type FLocalFileNetworkReplayStreamer::GetLastError() const
+{
+	return StreamerLastError;
 }
 
 void FLocalFileNetworkReplayStreamer::StopStreaming()
 {
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::StartPlayback) || IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::StartRecording))
+	{
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::StopStreaming. Called while existing StartStreaming request wasn't finished" ) );
+		CancelStreamingRequests();
+		check( !IsStreaming() );
+		return;
+	}
+
+	if (!IsStreaming())
+	{
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::StopStreaming. Not currently streaming." ) );
+		check( bStopStreamingCalled == false );
+		return;
+	}
+
+	if (bStopStreamingCalled)
+	{
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::StopStreaming. Already called" ) );
+		return;
+	}
+
+	bStopStreamingCalled = true;
+
 	if (StreamerState == EStreamerState::Recording)
 	{
-		FlushStream();
-		FlushHeader();
+		// Flush any final pending stream
+		int32 TotalLengthInMS = CurrentReplayInfo.LengthInMS;
 
-		ReplayInfo.bIsLive = false;
+		FlushStream(TotalLengthInMS);
 
-		WriteReplayInfo(CurrentStreamName, ReplayInfo);
+		AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::StopRecording,
+			[this, TotalLengthInMS](FLocalFileReplayInfo& ReplayInfo)
+			{
+				if (ReadReplayInfo(CurrentStreamName, ReplayInfo))
+				{
+					ReplayInfo.bIsLive = false;
+					ReplayInfo.LengthInMS = TotalLengthInMS;
+
+					WriteReplayInfo(CurrentStreamName, ReplayInfo);
+				}
+			},
+			[this](FLocalFileReplayInfo& ReplayInfo)
+			{
+				CurrentReplayInfo = ReplayInfo;
+			});
 	}
-	
-	FilePlaybackAr.Reset();
-	FileRecordingAr.Reset();
-	HeaderRecordingAr.Reset();
-	HeaderPlaybackAr.Reset();
-	CheckpointPlaybackAr.Reset();
-	CheckpointRecordingAr.Reset();
 
-	CurrentStreamName.Empty();
-	StreamerState = EStreamerState::Idle;
+	// Finally, add the stop streaming request, which should put things in the right state after the above requests are done
+	AddSimpleRequestToQueue(EQueuedLocalFileRequestType::StopStreaming,
+		[]()
+		{
+			UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::StopStreaming"));
+		},
+		[this]()
+		{
+			bStopStreamingCalled = false;
+			StreamAr.SetIsLoading(false);
+			StreamAr.SetIsSaving(false);
+			StreamAr.Buffer.Empty();
+			StreamAr.Pos = 0;
+			StreamDataOffset = 0;
+			StreamChunkIndex = 0;
+			CurrentStreamName.Empty();
+			StreamerState = EStreamerState::Idle;
+		});
 }
 
 FArchive* FLocalFileNetworkReplayStreamer::GetHeaderArchive()
 {
-	if (StreamerState == EStreamerState::Recording)
-	{
-		return HeaderRecordingAr.Get();
-	}
-
-	return HeaderPlaybackAr.Get();
+	return &HeaderAr;
 }
 
 FArchive* FLocalFileNetworkReplayStreamer::GetStreamingArchive()
 {
-	if (StreamerState == EStreamerState::Recording)
-	{
-		return FileRecordingAr.Get();
-	}
-
-	return FilePlaybackAr.Get();
+	return &StreamAr;
 }
 
 void FLocalFileNetworkReplayStreamer::UpdateTotalDemoTime(uint32 TimeInMS)
 {
 	check(StreamerState == EStreamerState::Recording);
 
-	ReplayInfo.LengthInMS = TimeInMS;
+	CurrentReplayInfo.LengthInMS = TimeInMS;
 }
 
 bool FLocalFileNetworkReplayStreamer::IsDataAvailable() const
 {
-	check(StreamerState == EStreamerState::Playback);
+	if (GetLastError() != ENetworkReplayError::None)
+	{
+		return false;
+	}
 
-	return FilePlaybackAr.IsValid() && FilePlaybackAr->Tell() < FilePlaybackAr->TotalSize();
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingCheckpoint))
+	{
+		return false;
+	}
+
+	if (HighPriorityEndTime > 0)
+	{
+		// If we are waiting for a high priority portion of the stream, pretend like we don't have any data so that game code waits for the entire portion
+		// of the high priority stream to load.
+		// We do this because we assume the game wants to race through this high priority portion of the stream in a single frame
+		return false;
+	}
+
+	// If we are loading, and we have more data
+	if (StreamAr.IsLoading() && StreamAr.Pos < StreamAr.Buffer.Num() && CurrentReplayInfo.DataChunks.Num() > 0)
+	{
+		return true;
+	}
+
+	return false;
 }
 
 bool FLocalFileNetworkReplayStreamer::IsLive() const
 {
-	return IsNamedStreamLive(CurrentStreamName);
+	return CurrentReplayInfo.bIsLive;
 }
 
 bool FLocalFileNetworkReplayStreamer::IsNamedStreamLive(const FString& StreamName) const
 {
-	FLocalFileReplayInfo Info = ReadReplayInfo(StreamName);
-	return Info.bIsLive;
+	check(!IsInGameThread());
+
+	FLocalFileReplayInfo Info;
+	return ReadReplayInfo(StreamName, Info) && Info.bIsLive;
 }
 
-void FLocalFileNetworkReplayStreamer::DeleteFinishedStream(const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) const
+void FLocalFileNetworkReplayStreamer::DeleteFinishedStream(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate)
 {
-	// Live streams can't be deleted
-	if (IsNamedStreamLive(StreamName))
-	{
-		UE_LOG(LogLocalFileReplay, Log, TEXT("Can't delete network replay stream %s because it is live!"), *StreamName);
-		Delegate.ExecuteIfBound(false);
-		return;
-	}
-
-	// Delete the directory with the specified name in the Saved/Demos directory
-	const FString FullDemoFilename = LocalFileReplay::GetDemoFullFilename(StreamName);
-
-	const bool DeleteSucceeded = IFileManager::Get().Delete(*FullDemoFilename);
-
-	Delegate.ExecuteIfBound(DeleteSucceeded);
+	DeleteFinishedStream_Internal(StreamName, UserIndex, Delegate);
 }
 
-void FLocalFileNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate)
+void FLocalFileNetworkReplayStreamer::DeleteFinishedStream(const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate)
 {
-	EnumerateStreams(ReplayVersion, UserString, MetaString, TArray< FString >(), Delegate);
+	DeleteFinishedStream_Internal(StreamName, INDEX_NONE, Delegate);
 }
 
-void FLocalFileNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate)
+void FLocalFileNetworkReplayStreamer::DeleteFinishedStream_Internal(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate)
 {
-	const FString WildCardPath = LocalFileReplay::GetDemoPath() + TEXT("*.replay");
-
-	TArray<FString> ReplayFileNames;
-	IFileManager::Get().FindFiles(ReplayFileNames, *WildCardPath, true, false);
-
-	TArray<FNetworkReplayStreamInfo> Results;
-
-	for (const FString& ReplayFileName : ReplayFileNames)
-	{
-		FNetworkReplayStreamInfo Info;
-
-		// Read stored info for this replay
-		FLocalFileReplayInfo StoredReplayInfo = ReadReplayInfo(FPaths::GetBaseFilename(ReplayFileName));
-		if (!StoredReplayInfo.bIsValid)
+	AddDelegateFileRequestToQueue<FDeleteFinishedStreamCallback, FDeleteFinishedStreamResult>(EQueuedLocalFileRequestType::DeletingFinishedStream, Delegate,
+		[this, StreamName](TLocalFileRequestCommonData<FDeleteFinishedStreamResult>& RequestData)
 		{
-			continue;
-		}
+			const bool bIsLive = IsNamedStreamLive(StreamName);
 
-		// Check version. NetworkVersion and changelist of 0 will ignore version check.
-		const bool NetworkVersionMatches = ReplayVersion.NetworkVersion == StoredReplayInfo.NetworkVersion;
-		const bool ChangelistMatches = ReplayVersion.Changelist == StoredReplayInfo.Changelist;
+			if (LocalFileReplay::CVarAllowLiveStreamDelete.GetValueOnAnyThread() || !bIsLive)
+			{
+				UE_CLOG(bIsLive, LogLocalFileReplay, Warning, TEXT("Deleting network replay stream %s that is currently live!"), *StreamName);
 
-		const bool NetworkVersionPasses = ReplayVersion.NetworkVersion == 0 || NetworkVersionMatches;
-		const bool ChangelistPasses = ReplayVersion.Changelist == 0 || ChangelistMatches;
+				const FString FullDemoFilename = GetDemoFullFilename(StreamName);
+			
+				if (!FPaths::FileExists(FullDemoFilename))
+				{
+					RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+				}
+				else if (IFileManager::Get().Delete(*FullDemoFilename))
+				{
+					RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+				}
+			}
+			else
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("Can't delete network replay stream %s because it is live!"), *StreamName);
+			}
+		});
+}
 
-		if (NetworkVersionPasses && ChangelistPasses)
+void FLocalFileNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreams_Internal(ReplayVersion, UserIndex, MetaString, ExtraParms, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreams_Internal(ReplayVersion, GetUserIndexFromUserString(UserString), MetaString, ExtraParms, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreams_Internal(ReplayVersion, GetUserIndexFromUserString(UserString), MetaString, TArray< FString >(), Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateStreams_Internal(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	AddDelegateFileRequestToQueue<FEnumerateStreamsCallback, FEnumerateStreamsResult>(EQueuedLocalFileRequestType::EnumeratingStreams, Delegate,
+		[this, ReplayVersion](TLocalFileRequestCommonData<FEnumerateStreamsResult>& RequestData)
 		{
-			Info.Name = FPaths::GetBaseFilename(ReplayFileName);
-			Info.Timestamp = IFileManager::Get().GetTimeStamp(*LocalFileReplay::GetDemoFullFilename(Info.Name));
-			Info.bIsLive = StoredReplayInfo.bIsLive;
-			Info.LengthInMS = StoredReplayInfo.LengthInMS;
-			Info.FriendlyName = StoredReplayInfo.FriendlyName;
-			Info.SizeInBytes = StoredReplayInfo.TotalDataSizeInBytes;
+			const FString WildCardPath = GetDemoPath() + TEXT("*.replay");
 
-			Results.Add(Info);
-		}
-	}
+			TArray<FString> ReplayFileNames;
+			IFileManager::Get().FindFiles(ReplayFileNames, *WildCardPath, true, false);
 
-	Delegate.ExecuteIfBound(Results);
+			for (const FString& ReplayFileName : ReplayFileNames)
+			{
+				// Read stored info for this replay
+				FLocalFileReplayInfo StoredReplayInfo;
+				if (!ReadReplayInfo(FPaths::GetBaseFilename(ReplayFileName), StoredReplayInfo))
+				{
+					continue;
+				}
+
+				// Check version. NetworkVersion and changelist of 0 will ignore version check.
+				const bool bNetworkVersionMatches = ReplayVersion.NetworkVersion == StoredReplayInfo.NetworkVersion;
+				const bool bChangelistMatches = ReplayVersion.Changelist == StoredReplayInfo.Changelist;
+
+				const bool bNetworkVersionPasses = ReplayVersion.NetworkVersion == 0 || bNetworkVersionMatches;
+				const bool bChangelistPasses = ReplayVersion.Changelist == 0 || bChangelistMatches;
+
+				if (bNetworkVersionPasses && bChangelistPasses)
+				{
+					FNetworkReplayStreamInfo Info;
+
+					Info.Name = FPaths::GetBaseFilename(ReplayFileName);
+					Info.bIsLive = StoredReplayInfo.bIsLive;
+					Info.Changelist = StoredReplayInfo.Changelist; 
+					Info.LengthInMS = StoredReplayInfo.LengthInMS;
+					Info.FriendlyName = StoredReplayInfo.FriendlyName;
+					Info.SizeInBytes = StoredReplayInfo.TotalDataSizeInBytes;
+					Info.Timestamp = StoredReplayInfo.Timestamp;
+
+					// If we don't have a valid timestamp, assume it's the file's timestamp.
+					if (Info.Timestamp == FDateTime::MinValue())
+					{
+						Info.Timestamp = IFileManager::Get().GetTimeStamp(*GetDemoFullFilename(Info.Name));
+					}
+
+					RequestData.DelegateResult.FoundStreams.Add(Info);
+				}
+			}
+
+			RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateRecentStreams_Internal(ReplayVersion, UserIndex, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateRecentStreams_Internal(ReplayVersion, GetUserIndexFromUserString(RecentViewer), Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateRecentStreams_Internal(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate)
+{
+	UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::EnumerateRecentStreams is currently unsupported."));
+	FEnumerateStreamsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.ExecuteIfBound(Result);
 }
 
 void FLocalFileNetworkReplayStreamer::AddUserToReplay(const FString& UserString)
@@ -559,7 +949,6 @@ void FLocalFileNetworkReplayStreamer::AddOrUpdateEvent(const FString& Name, cons
 
 	UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::AddOrUpdateEvent. Size: %i"), Data.Num());
 
-	int32 EventIndex = INDEX_NONE;
 
 	FString EventName = Name;
 
@@ -572,117 +961,168 @@ void FLocalFileNetworkReplayStreamer::AddOrUpdateEvent(const FString& Name, cons
 	// prefix with stream name to be consistent with http streamer
 	EventName = CurrentStreamName + TEXT("_") + EventName;
 
-	// see if this event already exists
-	if (EventIndex == INDEX_NONE) //-V547
-	{
-		for (int32 i=0; i < ReplayInfo.Events.Num(); ++i)
+	AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::UpdatingEvent,
+		[this, EventName, Group, TimeInMS, Meta, Data](FLocalFileReplayInfo& ReplayInfo)
 		{
-			if (ReplayInfo.Events[i].Id == EventName)
+			if (ReadReplayInfo(CurrentStreamName, ReplayInfo))
 			{
-				EventIndex = i;
-				break;
+				TSharedPtr<FArchive> LocalFileAr = CreateLocalFileWriter(GetDemoFullFilename(CurrentStreamName));
+				if (LocalFileAr.IsValid())
+				{
+					int32 EventIndex = INDEX_NONE;
+
+					// see if this event already exists
+					for (int32 i=0; i < ReplayInfo.Events.Num(); ++i)
+					{
+						if (ReplayInfo.Events[i].Id == EventName)
+						{
+							EventIndex = i;
+							break;
+						}
+					}
+
+					// serialize event to temporary location
+					FArrayWriter Writer;
+
+					ELocalFileChunkType ChunkType = ELocalFileChunkType::Event;
+					Writer << ChunkType;
+
+					int64 SavedPos = Writer.Tell();
+
+					int32 PlaceholderSize = 0;
+					Writer << PlaceholderSize;
+
+					int64 MetadataPos = Writer.Tell();
+
+					FString TempName = EventName;
+					Writer << TempName;
+
+					FString Value = Group;
+					Writer << Value;
+
+					Value = Meta;
+					Writer << Value;
+
+					uint32 Time1 = TimeInMS;
+					Writer << Time1;
+
+					uint32 Time2 = TimeInMS;
+					Writer << Time2;
+
+					int32 EventSize = Data.Num();
+					Writer << EventSize;
+
+					Writer.Serialize((void*)Data.GetData(), Data.Num());
+
+					int32 ChunkSize = Writer.Tell() - MetadataPos;
+
+					Writer.Seek(SavedPos);
+					Writer << ChunkSize;
+
+					if (EventIndex == INDEX_NONE)
+					{
+						// append new event chunk
+						LocalFileAr->Seek(LocalFileAr->TotalSize());
+					}
+					else 
+					{
+						if (ChunkSize > ReplayInfo.Chunks[ReplayInfo.Events[EventIndex].ChunkIndex].SizeInBytes)
+						{
+							LocalFileAr->Seek(ReplayInfo.Chunks[ReplayInfo.Events[EventIndex].ChunkIndex].TypeOffset);
+
+							// clear chunk type so it will be skipped later
+							ChunkType = ELocalFileChunkType::Unknown;
+							*LocalFileAr << ChunkType;
+
+							LocalFileAr->Seek(LocalFileAr->TotalSize());
+						}
+						else
+						{
+							LocalFileAr->Seek(ReplayInfo.Chunks[ReplayInfo.Events[EventIndex].ChunkIndex].TypeOffset);
+						}
+					}
+
+					LocalFileAr->Serialize(Writer.GetData(), Writer.TotalSize());
+
+					LocalFileAr = nullptr;
+				}
+
+				ReadReplayInfo(CurrentStreamName, ReplayInfo);
 			}
-		}
-	}
-	
-	TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileWriter(*LocalFileReplay::GetDemoFullFilename(CurrentStreamName), FILEWRITE_Append | FILEWRITE_AllowRead));
-	if (LocalFileAr.IsValid())
-	{
-		if (EventIndex == INDEX_NONE)
+		},
+		[this](FLocalFileReplayInfo& ReplayInfo)
 		{
-			// append new event chunk
-			LocalFileAr->Seek(LocalFileAr->TotalSize());
-
-			int32 Idx = ReplayInfo.Events.AddDefaulted();
-			ReplayInfo.Events[Idx].Id = EventName;
-			ReplayInfo.Events[Idx].Offset = LocalFileAr->Tell();
-			ReplayInfo.Events[Idx].SizeInBytes = Data.Num();
-		}
-		else 
-		{
-			LocalFileAr->Seek(ReplayInfo.Events[EventIndex].Offset);
-
-			// write data into existing space if possible
-			if (Data.Num() > ReplayInfo.Events[EventIndex].SizeInBytes)
+			if (ReplayInfo.bIsValid)
 			{
-				// otherwise clear chunk type so it will be skipped later
-				ELocalFileChunkType ChunkType = ELocalFileChunkType::Unknown;
-				*LocalFileAr << ChunkType;
-
-				LocalFileAr->Seek(LocalFileAr->TotalSize());
+				const int32 TotalLengthInMS = CurrentReplayInfo.LengthInMS;
+				CurrentReplayInfo = ReplayInfo;
+				CurrentReplayInfo.LengthInMS = TotalLengthInMS;
 			}
-		}
-
-		// flush event
-		ELocalFileChunkType ChunkType = ELocalFileChunkType::Event;
-		*LocalFileAr << ChunkType;
-
-		int64 SavedPos = LocalFileAr->Tell();
-
-		int32 PlaceholderSize = 0;
-		*LocalFileAr << PlaceholderSize;
-
-		int64 MetadataPos = LocalFileAr->Tell();
-
-		*LocalFileAr << EventName;
-
-		FString Value = Group;
-		*LocalFileAr << Value;
-
-		Value = Meta;
-		*LocalFileAr << Value;
-
-		uint32 Time1 = TimeInMS;
-		*LocalFileAr << Time1;
-
-		uint32 Time2 = TimeInMS;
-		*LocalFileAr << Time2;
-
-		int32 EventSize = Data.Num();
-		*LocalFileAr << EventSize;
-
-		LocalFileAr->Serialize((void*)Data.GetData(), Data.Num());
-
-		int32 ChunkSize = LocalFileAr->Tell() - MetadataPos;
-
-		LocalFileAr->Seek(SavedPos);
-		*LocalFileAr << ChunkSize;
-	}
+		});
 }
 
-void FLocalFileNetworkReplayStreamer::EnumerateEvents(const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate)
+void FLocalFileNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
 {
-	EnumerateEvents(CurrentStreamName, Group, EnumerationCompleteDelegate);
+	EnumerateEvents_Internal(ReplayName, Group, UserIndex, Delegate);
 }
 
-void FLocalFileNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate)
+void FLocalFileNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate)
 {
-	// Read stored info for this replay
-	FLocalFileReplayInfo StoredReplayInfo = ReadReplayInfo(ReplayName);
-	if (!StoredReplayInfo.bIsValid)
-	{
-		EnumerationCompleteDelegate.ExecuteIfBound(FReplayEventList(), false);
-		return;
-	}
-
-	FReplayEventList EventList;
-
-	for (const FLocalFileEventInfo& EventInfo : StoredReplayInfo.Events)
-	{
-		int Idx = EventList.ReplayEvents.AddDefaulted();
-
-		FReplayEventListItem& Event = EventList.ReplayEvents[Idx];
-		Event.ID = EventInfo.Id;
-		Event.Group = EventInfo.Group;
-		Event.Metadata = EventInfo.Metadata;
-		Event.Time1 = EventInfo.Time1;
-		Event.Time2 = EventInfo.Time2;
-	}
-
-	EnumerationCompleteDelegate.ExecuteIfBound(EventList, true);
+	EnumerateEvents_Internal(ReplayName, Group, INDEX_NONE, Delegate);
 }
 
-void FLocalFileNetworkReplayStreamer::RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete)
+void FLocalFileNetworkReplayStreamer::EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	EnumerateEvents_Internal(CurrentStreamName, Group, INDEX_NONE, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::EnumerateEvents_Internal(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
+{
+	AddDelegateFileRequestToQueue<FEnumerateEventsCallback, FEnumerateEventsResult>(EQueuedLocalFileRequestType::EnumeratingEvents, Delegate,
+		[this, ReplayName, Group](TLocalFileRequestCommonData<FEnumerateEventsResult>& RequestData)
+		{
+			if (!FPaths::FileExists(GetDemoFullFilename(ReplayName)))
+			{
+				RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+			}
+			else
+			{
+				// Read stored info for this replay
+				FLocalFileReplayInfo StoredReplayInfo;
+				if (ReadReplayInfo(ReplayName, StoredReplayInfo))
+				{
+					for (const FLocalFileEventInfo& EventInfo : StoredReplayInfo.Events)
+					{
+						if (Group.IsEmpty() || (EventInfo.Group == Group))
+						{
+							int Idx = RequestData.DelegateResult.ReplayEventList.ReplayEvents.AddDefaulted();
+
+							FReplayEventListItem& Event = RequestData.DelegateResult.ReplayEventList.ReplayEvents[Idx];
+							Event.ID = EventInfo.Id;
+							Event.Group = EventInfo.Group;
+							Event.Metadata = EventInfo.Metadata;
+							Event.Time1 = EventInfo.Time1;
+							Event.Time2 = EventInfo.Time2;
+						}
+					}
+
+					RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+				}
+			}
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData_Internal(ReplayName, EventID, UserIndex, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData_Internal(ReplayName, EventID, INDEX_NONE, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
 {
 	// Assume current stream
 	FString StreamName = CurrentStreamName;
@@ -694,248 +1134,660 @@ void FLocalFileNetworkReplayStreamer::RequestEventData(const FString& EventID, c
 		StreamName = EventID.Left(Idx);
 	}
 
-	// Read stored info for this replay
-	FLocalFileReplayInfo StoredReplayInfo = ReadReplayInfo(StreamName);
-	if (StoredReplayInfo.bIsValid)
-	{
-		for (const FLocalFileEventInfo& EventInfo : StoredReplayInfo.Events)
-		{
-			if (EventInfo.Id == EventID)
-			{
-				TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileReader(*LocalFileReplay::GetDemoFullFilename(StreamName), FILEREAD_AllowWrite));
-				LocalFileAr->Seek(EventInfo.Offset);
-
-				TArray<uint8> Buffer;
-				Buffer.AddUninitialized(EventInfo.SizeInBytes);
-
-				LocalFileAr->Serialize(Buffer.GetData(), Buffer.Num());
-
-				RequestEventDataComplete.ExecuteIfBound(Buffer, true);
-				return;
-			}
-		}
-	}
-
-	RequestEventDataComplete.ExecuteIfBound(TArray<uint8>(), false);
+	RequestEventData_Internal(StreamName, EventID, INDEX_NONE, Delegate);
 }
 
-void FLocalFileNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate)
+void FLocalFileNetworkReplayStreamer::RequestEventData_Internal(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& RequestEventDataComplete)
+{
+	AddDelegateFileRequestToQueue<FRequestEventDataCallback, FRequestEventDataResult>(EQueuedLocalFileRequestType::RequestingEvent, RequestEventDataComplete,
+		[this, ReplayName, EventID](TLocalFileRequestCommonData<FRequestEventDataResult>& RequestData)
+		{
+			const FString FullDemoFilename = GetDemoFullFilename(ReplayName);
+			if (!FPaths::FileExists(FullDemoFilename))
+			{
+				RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+			}
+			else
+			{
+				// Read stored info for this replay
+				FLocalFileReplayInfo StoredReplayInfo;
+				if (ReadReplayInfo(ReplayName, StoredReplayInfo))
+				{
+					TSharedPtr<FArchive> LocalFileAr = CreateLocalFileReader(FullDemoFilename);
+					if (LocalFileAr.IsValid())
+					{
+						for (const FLocalFileEventInfo& EventInfo : StoredReplayInfo.Events)
+						{
+							if (EventInfo.Id == EventID)
+							{
+								LocalFileAr->Seek(EventInfo.EventDataOffset);
+
+								RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+								RequestData.DelegateResult.ReplayEventListItem.AddUninitialized(EventInfo.SizeInBytes);
+
+								LocalFileAr->Serialize(RequestData.DelegateResult.ReplayEventListItem.GetData(), RequestData.DelegateResult.ReplayEventListItem.Num());
+
+								break;
+							}
+						}
+
+						LocalFileAr = nullptr;
+					}
+				}
+			}
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate)
 {
 	UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::SearchEvents is currently unsupported."));
+	FSearchEventsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.ExecuteIfBound(Result);
+}
+
+void FLocalFileNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	KeepReplay_Internal(ReplayName, bKeep, UserIndex, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate)
+{
+	KeepReplay_Internal(ReplayName, bKeep, INDEX_NONE, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::KeepReplay_Internal(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	AddDelegateFileRequestToQueue<FKeepReplayCallback, FKeepReplayResult>(EQueuedLocalFileRequestType::KeepReplay, Delegate,
+		[this, ReplayName](TLocalFileRequestCommonData<FKeepReplayResult>& RequestData)
+		{
+			// Replays are kept during streaming so there's no need to explicitly save them.
+			// However, sanity check that what was passed in still exists.
+			if (!FPaths::FileExists(GetDemoFullFilename(ReplayName)))
+			{
+				RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+			}
+			else
+			{
+				RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+				RequestData.DelegateResult.NewReplayName = ReplayName;
+			}
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplayFriendlyName_Internal(ReplayName, NewFriendlyName, UserIndex, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate)
+{
+	RenameReplayFriendlyName_Internal(ReplayName, NewFriendlyName, INDEX_NONE, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName_Internal(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	AddDelegateFileRequestToQueue<FRenameReplayCallback, FRenameReplayResult>(EQueuedLocalFileRequestType::RenameReplayFriendlyName, Delegate,
+		[this, ReplayName, NewFriendlyName](TLocalFileRequestCommonData<FRenameReplayResult>& RequestData)
+		{
+			const FString& FullReplayName = GetDemoFullFilename(ReplayName);
+			if (!FPaths::FileExists(FullReplayName))
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName: Replay does not exist %s"), *ReplayName);
+				RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+				return;
+			}
+
+			FLocalFileSerializationInfo SerializationInfo;
+			FLocalFileReplayInfo TempReplayInfo;
+
+			// Do this inside a scope, to make sure the file archive is closed before continuing.
+			{
+				TSharedPtr<FArchive> ReadAr = CreateLocalFileReader(FullReplayName);
+				if (!ReadAr.IsValid() || ReadAr->TotalSize() <= 0 || !ReadReplayInfo(*ReadAr.Get(), TempReplayInfo, SerializationInfo))
+				{
+					UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName: Failed to read replay info %s"), *ReplayName);
+					return;
+				}
+
+				if (SerializationInfo.FileVersion < LocalFileReplay::HISTORY_FIXEDSIZE_FRIENDLY_NAME)
+				{
+					UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName: Replay too old to rename safely %s"), *ReplayName);
+					return;
+				}
+			}
+
+			TempReplayInfo.FriendlyName = NewFriendlyName;
+
+			// Do this inside a scope, to make sure the file archive is closed before continuing.
+			{
+				TSharedPtr<FArchive> WriteAr = CreateLocalFileWriter(FullReplayName);
+				if (!WriteAr.IsValid() || WriteAr->TotalSize() <= 0 || !WriteReplayInfo(*WriteAr.Get(), TempReplayInfo, SerializationInfo))
+				{
+					UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName: Failed to write replay info %s"), *ReplayName);
+					return;
+				}
+			}
+
+			RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplay_Internal(ReplayName, NewName, UserIndex, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate)
+{
+	RenameReplay_Internal(ReplayName, NewName, INDEX_NONE, Delegate);
+}
+
+void FLocalFileNetworkReplayStreamer::RenameReplay_Internal(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	AddDelegateFileRequestToQueue<FRenameReplayCallback, FRenameReplayResult>(EQueuedLocalFileRequestType::RenameReplay, Delegate,
+		[this, ReplayName, NewName](TLocalFileRequestCommonData<FRenameReplayResult>& RequestData)
+		{
+			const FString& FullReplayName = GetDemoFullFilename(ReplayName);
+			if (!FPaths::FileExists(FullReplayName))
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplay: Replay does not exist (old %s new %s)"), *ReplayName, *NewName);
+				RequestData.DelegateResult.Result = EStreamingOperationResult::ReplayNotFound;
+				return;
+			}
+
+			const FString& NewReplayName = GetDemoFullFilename(NewName);
+
+			FString NewReplayBaseName = FPaths::GetBaseFilename(NewReplayName);
+			NewReplayBaseName.RemoveFromEnd(".replay");
+
+			// Sanity check to make sure the input name isn't changing directories.
+			if (NewName != NewReplayBaseName)
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplay: Path separator characters present in replay (old %s new %s)"), *ReplayName, *NewName);
+				return;
+			}
+
+			if (!IFileManager::Get().Move(*NewReplayName, *FullReplayName, /* bReplace= */ false))
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::RenameReplay: Failed to rename replay (old %s new %s)"), *ReplayName, *NewName);
+				return;
+			}
+
+			RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+		});
 }
 
 FArchive* FLocalFileNetworkReplayStreamer::GetCheckpointArchive()
 {
-	if (StreamerState == EStreamerState::Recording)
-	{
-		// If the archive is null, and the API is being used properly, the caller is writing a checkpoint...
-		if (CheckpointRecordingAr.Get() == nullptr)
-		{
-			// Create a file writer for the next checkpoint index.
-			check(StreamerState != EStreamerState::Playback);
-
-			UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::GetCheckpointArchive. Creating new checkpoint."));
-
-			// create in memory checkpoint, since it could take multiple frames to accumulate the checkpoint data
-			CheckpointRecordingAr.Reset(new FArrayWriter());
-		}
-
-		return CheckpointRecordingAr.Get();
-	}
-
-	check(StreamerState == EStreamerState::Playback);
-	return CheckpointPlaybackAr.Get();
+	return &CheckpointAr;
 }
 
-void FLocalFileNetworkReplayStreamer::FlushStream()
+void FLocalFileNetworkReplayStreamer::FlushStream(const uint32 TimeInMS)
 {
-	check(StreamerState == EStreamerState::Recording);
+	check( StreamAr.IsSaving() );
 
-	TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileWriter(*LocalFileReplay::GetDemoFullFilename(CurrentStreamName), FILEWRITE_Append | FILEWRITE_AllowRead));
-	if (LocalFileAr.IsValid())
+	if (CurrentStreamName.IsEmpty() || IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::WriteHeader))
 	{
-		LocalFileAr->Seek(LocalFileAr->TotalSize());
+		// If we haven't uploaded the header, or we are not recording, we don't need to flush
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::FlushStream. Waiting on header upload." ) );
+		return;
+	}
 
-		// flush chunk to disk
-		if (FileRecordingAr.Get() && (FileRecordingAr->Num() > 0))
+	if (StreamAr.Buffer.Num() == 0)
+	{
+		// Nothing to flush
+		return;
+	}
+
+	StreamTimeRange.Max = CurrentReplayInfo.LengthInMS;
+
+	const uint32 StreamChunkStartMS = StreamTimeRange.Min;
+	const uint32 StreamChunkEndMS = StreamTimeRange.Max;
+
+	StreamTimeRange.Min = StreamTimeRange.Max;
+
+	// Save any newly streamed data to disk
+	UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::FlushStream. StreamChunkIndex: %i, Size: %i"), StreamChunkIndex, StreamAr.Buffer.Num());
+
+	AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::WritingStream, 
+		[this, StreamChunkStartMS, StreamChunkEndMS, StreamData=MoveTemp(StreamAr.Buffer)](FLocalFileReplayInfo& ReplayInfo) mutable
 		{
-			// keep track of which replay chunk this is
-			ReplayInfo.DataChunks.AddDefaulted();
-
-			ELocalFileChunkType ChunkType = ELocalFileChunkType::ReplayData;
-			*LocalFileAr << ChunkType;
-
-			if (SupportsCompression())
+			TSharedPtr<FArchive> LocalFileAr = CreateLocalFileWriter(GetDemoFullFilename(CurrentStreamName));
+			if (LocalFileAr.IsValid())
 			{
-				TArray<uint8> Compressed;
-				if (CompressBuffer(*FileRecordingAr, Compressed))
-				{
-					int32 ChunkSize = Compressed.Num();
-					*LocalFileAr << ChunkSize;
+				LocalFileAr->Seek(LocalFileAr->TotalSize());
 
-					LocalFileAr->Serialize(Compressed.GetData(), Compressed.Num());
+				TArray<uint8> FinalData;
+
+				if (SupportsCompression())
+				{
+					SCOPE_CYCLE_COUNTER( STAT_LocalReplay_CompressTime );
+
+					if (!CompressBuffer(StreamData, FinalData))
+					{
+						UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::FlushStream - CompressBuffer failed"));
+						SetLastError( ENetworkReplayError::ServiceUnavailable );
+					}
 				}
 				else
 				{
-					UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::FlushStream - CompressBuffer failed"));
+					FinalData = MoveTemp(StreamData);
 				}
+
+				// flush chunk to disk
+				if (FinalData.Num() > 0)
+				{
+					ELocalFileChunkType ChunkType = ELocalFileChunkType::ReplayData;
+					*LocalFileAr << ChunkType;
+
+					int64 SavedPos = LocalFileAr->Tell();
+
+					int32 PlaceholderSize = 0;
+					*LocalFileAr << PlaceholderSize;
+
+					int64 MetadataPos = LocalFileAr->Tell();
+
+					uint32 Time1 = StreamChunkStartMS;
+					*LocalFileAr << Time1;
+
+					uint32 Time2 = StreamChunkEndMS;
+					*LocalFileAr << Time2;
+
+					int32 DataSize = FinalData.Num();
+					*LocalFileAr << DataSize;
+
+					LocalFileAr->Serialize((void*)FinalData.GetData(), FinalData.Num());
+
+					int32 ChunkSize = LocalFileAr->Tell() - MetadataPos;
+
+					LocalFileAr->Seek(SavedPos);
+					*LocalFileAr << ChunkSize;
+				}
+			
+				LocalFileAr = nullptr;
 			}
-			else
+
+			ReadReplayInfo(CurrentStreamName, ReplayInfo);
+		},
+		[this](FLocalFileReplayInfo& ReplayInfo)
+		{
+			if (ReplayInfo.bIsValid)
 			{
-				int32 ChunkSize = FileRecordingAr->Num();
-				*LocalFileAr << ChunkSize;
-
-				LocalFileAr->Serialize(FileRecordingAr->GetData(), FileRecordingAr->Num());
+				const int32 TotalLengthInMS = CurrentReplayInfo.LengthInMS;
+				CurrentReplayInfo = ReplayInfo;
+				CurrentReplayInfo.LengthInMS = TotalLengthInMS;
 			}
+		});
 
-			FileRecordingAr.Reset(new FArrayWriter);
-		}
-	}
+	StreamAr.Buffer.Empty();
+	StreamAr.Pos = 0;
+
+	// Keep track of the time range we have in our buffer, so we can accurately upload that each time we submit a chunk
+	StreamTimeRange.Min = StreamTimeRange.Max;
+
+	StreamChunkIndex++;
+
+	LastChunkTime = FPlatformTime::Seconds();
 }
 
 void FLocalFileNetworkReplayStreamer::FlushCheckpoint(const uint32 TimeInMS)
 {
-	UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::FlushCheckpoint. TimeInMS: %u"), TimeInMS);
-
-	FlushStream();
-
+	if (CheckpointAr.Buffer.Num() == 0)
 	{
-		TUniquePtr<FArchive> LocalFileAr(IFileManager::Get().CreateFileWriter(*LocalFileReplay::GetDemoFullFilename(CurrentStreamName), FILEWRITE_Append | FILEWRITE_AllowRead));
-		if (LocalFileAr.IsValid())
+		UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::FlushCheckpoint. Checkpoint is empty." ) );
+		return;
+	}
+
+	// Flush any existing stream, we need checkpoints to line up with the next chunk
+	FlushStream(TimeInMS);
+
+	// Flush the checkpoint
+	FlushCheckpointInternal(TimeInMS);
+}
+
+void FLocalFileNetworkReplayStreamer::FlushCheckpointInternal(const uint32 TimeInMS)
+{
+	if (CurrentStreamName.IsEmpty() || StreamerState != EStreamerState::Recording || CheckpointAr.Buffer.Num() == 0)
+	{
+		// If there is no active session, or we are not recording, we don't need to flush
+		CheckpointAr.Buffer.Empty();
+		CheckpointAr.Pos = 0;
+		return;
+	}
+
+	const int32 TotalLengthInMS = CurrentReplayInfo.LengthInMS;
+
+	AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::WritingCheckpoint, 
+		[this, TimeInMS, TotalLengthInMS, CheckpointData=MoveTemp(CheckpointAr.Buffer)](FLocalFileReplayInfo& ReplayInfo) mutable
 		{
-			LocalFileAr->Seek(LocalFileAr->TotalSize());
-
-			// flush checkpoint
-			if (CheckpointRecordingAr.Get() && (CheckpointRecordingAr->Num() > 0))
+			if (ReadReplayInfo(CurrentStreamName, ReplayInfo))
 			{
-				ELocalFileChunkType ChunkType = ELocalFileChunkType::Checkpoint;
-				*LocalFileAr << ChunkType;
+				int32 CheckpointId = ReplayInfo.DataChunks.Num();
 
-				int64 SavedPos = LocalFileAr->Tell();
-			
-				int32 PlaceholderSize = 0;
-				*LocalFileAr << PlaceholderSize;
-
-				int64 MetadataPos = LocalFileAr->Tell();
-
-				//@todo - use actual checkpoint index?
-				FString Id = FString::Printf(TEXT("checkpoint%ld"), ReplayInfo.DataChunks.Num());
-				*LocalFileAr << Id;
-
-				FString Group = TEXT("checkpoint");
-				*LocalFileAr << Group;
-
-				FString Metadata = FString::Printf(TEXT("%ld"), ReplayInfo.DataChunks.Num());
-				*LocalFileAr << Metadata;
-
-				uint32 Time1 = TimeInMS;
-				*LocalFileAr << Time1;
-
-				uint32 Time2 = TimeInMS;
-				*LocalFileAr << Time2;
-
-				if (SupportsCompression())
+				TSharedPtr<FArchive> LocalFileAr = CreateLocalFileWriter(GetDemoFullFilename(CurrentStreamName));
+				if (LocalFileAr.IsValid())
 				{
-					TArray<uint8> Compressed;
-					if (CompressBuffer(*CheckpointRecordingAr, Compressed))
-					{
-						int32 CheckpointSize = Compressed.Num();
-						*LocalFileAr << CheckpointSize;
+					LocalFileAr->Seek(LocalFileAr->TotalSize());
 
-						LocalFileAr->Serialize(Compressed.GetData(), Compressed.Num());
+					TArray<uint8> FinalData;
+
+					if (SupportsCompression())
+					{
+						SCOPE_CYCLE_COUNTER( STAT_LocalReplay_CompressTime );
+
+						if (!CompressBuffer(CheckpointData, FinalData))
+						{
+							UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::FlushStream - CompressBuffer failed"));
+							SetLastError( ENetworkReplayError::ServiceUnavailable );
+						}
 					}
 					else
 					{
-						UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::FlushStream - CompressBuffer failed"));
+						FinalData = MoveTemp(CheckpointData);
+					}
+
+					// flush checkpoint
+					if (FinalData.Num() > 0)
+					{
+						ELocalFileChunkType ChunkType = ELocalFileChunkType::Checkpoint;
+						*LocalFileAr << ChunkType;
+
+						int64 SavedPos = LocalFileAr->Tell();
+
+						int32 PlaceholderSize = 0;
+						*LocalFileAr << PlaceholderSize;
+
+						int64 MetadataPos = LocalFileAr->Tell();
+
+						FString Id = FString::Printf(TEXT("checkpoint%ld"), CheckpointId);
+						*LocalFileAr << Id;
+
+						FString Group = TEXT("checkpoint");
+						*LocalFileAr << Group;
+
+						FString Metadata = FString::Printf(TEXT("%ld"), CheckpointId);
+						*LocalFileAr << Metadata;
+
+						uint32 Time1 = TimeInMS;
+						*LocalFileAr << Time1;
+
+						uint32 Time2 = TimeInMS;
+						*LocalFileAr << Time2;
+
+						int32 CheckpointSize = FinalData.Num();
+						*LocalFileAr << CheckpointSize;
+
+						LocalFileAr->Serialize((void*)FinalData.GetData(), FinalData.Num());
+
+						int32 ChunkSize = LocalFileAr->Tell() - MetadataPos;
+
+						LocalFileAr->Seek(SavedPos);
+						*LocalFileAr << ChunkSize;
+					}
+
+					LocalFileAr = nullptr;
+				}
+
+				if (ReadReplayInfo(CurrentStreamName, ReplayInfo))
+				{
+					ReplayInfo.LengthInMS = TotalLengthInMS;
+
+					WriteReplayInfo(CurrentStreamName, ReplayInfo);
+				}
+			}
+		},
+		[this](FLocalFileReplayInfo& ReplayInfo)
+		{
+			if (ReplayInfo.bIsValid)
+			{
+				int32 CurrentTotalLengthInMS = CurrentReplayInfo.LengthInMS;
+				CurrentReplayInfo = ReplayInfo;
+				CurrentReplayInfo.LengthInMS = CurrentTotalLengthInMS;
+			}
+		});
+
+	CheckpointAr.Buffer.Empty();
+	CheckpointAr.Pos = 0;	
+}
+
+void FLocalFileNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FGotoCallback& Delegate)
+{
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingCheckpoint))
+	{
+		// If we're currently going to a checkpoint now, ignore this request
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Busy processing another checkpoint."));
+		Delegate.ExecuteIfBound(FGotoResult());
+		return;
+	}
+
+	if (CheckpointIndex == INDEX_NONE)
+	{
+		SetHighPriorityTimeRange(0, LastGotoTimeInMS);
+
+		AddSimpleRequestToQueue(EQueuedLocalFileRequestType::ReadingCheckpoint, 
+			[]()
+			{
+				UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex"));
+			},
+			[this, Delegate]()
+			{
+				// Make sure to reset the checkpoint archive (this is how we signify that the engine should start from the beginning of the stream (we don't need a checkpoint for that))
+				CheckpointAr.Buffer.Empty();
+				CheckpointAr.Pos = 0;
+
+				if (!IsDataAvailableForTimeRange(0, LastGotoTimeInMS))
+				{
+					// Completely reset our stream (we're going to start loading from the start of the checkpoint)
+					StreamAr.Buffer.Empty();
+
+					StreamDataOffset = 0;
+
+					// Reset our stream range
+					StreamTimeRange = TInterval<uint32>(0, 0);
+
+					// Reset chunk index
+					StreamChunkIndex = 0;
+
+					LastChunkTime = 0;		// Force the next chunk to start loading immediately in case LastGotoTimeInMS is 0 (which would effectively disable high priority mode immediately)
+				}
+
+				StreamAr.Pos = 0;
+				StreamAr.bAtEndOfReplay	= false;
+
+				FGotoResult Result;
+				Result.ExtraTimeMS = LastGotoTimeInMS;
+				Result.Result = EStreamingOperationResult::Success;
+
+				Delegate.ExecuteIfBound( Result );
+
+				LastGotoTimeInMS = -1;
+			});
+		
+		return;
+	}
+
+	if (!CurrentReplayInfo.Checkpoints.IsValidIndex(CheckpointIndex))
+	{
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Invalid checkpoint index."));
+		Delegate.ExecuteIfBound(FGotoResult());
+		return;
+	}
+
+	AddCachedFileRequestToQueue<FGotoResult>(EQueuedLocalFileRequestType::ReadingCheckpoint, CurrentReplayInfo.Checkpoints[CheckpointIndex].ChunkIndex,
+		[this, CheckpointIndex](TLocalFileRequestCommonData<FGotoResult>& RequestData)
+		{
+			// If we get here after StopStreaming was called, then assume this operation should be cancelled
+			// A more correct fix would be to actually cancel this in-flight request when StopStreaming is called
+			// But for now, this is a safe change, and can co-exist with the more proper fix
+			if (bStopStreamingCalled)
+			{
+				return;
+			}
+
+			RequestData.DataBuffer.Empty();
+
+			const FString FullDemoFilename = GetDemoFullFilename(CurrentStreamName);
+
+			TSharedPtr<FArchive> LocalFileAr = CreateLocalFileReader(FullDemoFilename);
+			if (LocalFileAr.IsValid())
+			{
+				if (ReadReplayInfo(*LocalFileAr, RequestData.ReplayInfo))
+				{
+					LocalFileAr->Seek(RequestData.ReplayInfo.Checkpoints[CheckpointIndex].EventDataOffset);
+
+					RequestData.DataBuffer.AddUninitialized(RequestData.ReplayInfo.Checkpoints[CheckpointIndex].SizeInBytes);
+
+					LocalFileAr->Serialize(RequestData.DataBuffer.GetData(), RequestData.DataBuffer.Num());
+
+					// Get the checkpoint data
+					if (RequestData.ReplayInfo.bCompressed)
+					{
+						if (SupportsCompression())
+						{
+							SCOPE_CYCLE_COUNTER( STAT_LocalReplay_DecompressTime );
+
+							TArray<uint8> UncompressedData;
+
+							if (!DecompressBuffer(RequestData.DataBuffer, UncompressedData))
+							{
+								UE_LOG(LogLocalFileReplay, Error, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. DecompressBuffer FAILED."));
+								RequestData.DataBuffer.Empty();
+								return;
+							}
+
+							RequestData.DataBuffer = MoveTemp(UncompressedData);
+						}
+						else
+						{
+							UE_LOG(LogLocalFileReplay, Error, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Compressed checkpoint but streamer does not support compression."));
+							RequestData.DataBuffer.Empty();
+							return;
+						}
 					}
 				}
-				else
-				{
-					int32 CheckpointSize = CheckpointRecordingAr->Num();
-					*LocalFileAr << CheckpointSize;
 
-					LocalFileAr->Serialize(CheckpointRecordingAr->GetData(), CheckpointRecordingAr->Num());
-				}
-
-				int32 ChunkSize = LocalFileAr->Tell() - MetadataPos;
-
-				LocalFileAr->Seek(SavedPos);
-				*LocalFileAr << ChunkSize;
-
-				CheckpointRecordingAr.Reset();
+				LocalFileAr = nullptr;
 			}
-		}
-	}
-
-	WriteReplayInfo(CurrentStreamName, ReplayInfo);
-}
-
-void FLocalFileNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate)
-{
-	GotoCheckpointIndexInternal(CheckpointIndex, Delegate, -1);
-}
-
-void FLocalFileNetworkReplayStreamer::GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS)
-{
-	if (CheckpointIndex == -1)
-	{
-		// Create a dummy checkpoint archive to indicate this is the first checkpoint
-		CheckpointPlaybackAr.Reset(new FArrayReader);
-		FilePlaybackAr->Seek(0);
-		Delegate.ExecuteIfBound(true, TimeInMS);
-		return;
-	}
-
-	if (!ReplayInfo.Checkpoints.IsValidIndex(CheckpointIndex))
-	{
-		UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Invalid Index: %i"), CheckpointIndex);
-		Delegate.ExecuteIfBound(false, TimeInMS);
-		return;
-	}
-
-	const FString FullFilename = LocalFileReplay::GetDemoFullFilename(CurrentStreamName);
-	
-	TUniquePtr< FArchive > LocalFileAr (IFileManager::Get().CreateFileReader(*FullFilename, FILEREAD_AllowWrite));
-	LocalFileAr->Seek(ReplayInfo.Checkpoints[CheckpointIndex].Offset);
-
-	CheckpointPlaybackAr.Reset(new FArrayReader());
-
-	CheckpointPlaybackAr->AddUninitialized(ReplayInfo.Checkpoints[CheckpointIndex].SizeInBytes);
-	LocalFileAr->Serialize(CheckpointPlaybackAr->GetData(), CheckpointPlaybackAr->Num());
-
-	if (SupportsCompression())
-	{
-		TArray<uint8> Uncompressed;
-		if (DecompressBuffer(*CheckpointPlaybackAr, Uncompressed))
+		},
+		[this, CheckpointIndex, Delegate](TLocalFileRequestCommonData<FGotoResult>& RequestData)
 		{
-			CheckpointPlaybackAr->Empty();
-			CheckpointPlaybackAr->Append(Uncompressed);
-		}
-	}
+			if (bStopStreamingCalled)
+			{
+				Delegate.ExecuteIfBound(RequestData.DelegateResult);
+				LastGotoTimeInMS = -1;
+				return;
+			}
 
-	check(FilePlaybackAr.Get() != nullptr);
-	FilePlaybackAr->SetChunk(FCString::Atoi64(*ReplayInfo.Checkpoints[CheckpointIndex].Metadata));
+			if (RequestData.DataBuffer.Num() == 0)
+			{
+				UE_LOG( LogLocalFileReplay, Warning, TEXT( "FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Checkpoint empty." ) );
+				Delegate.ExecuteIfBound(RequestData.DelegateResult);
+				LastGotoTimeInMS = -1;
+				return;
+			}
 
-	Delegate.ExecuteIfBound(true, TimeInMS);
+			AddRequestToCache(CurrentReplayInfo.Checkpoints[CheckpointIndex].ChunkIndex, RequestData.DataBuffer);
+
+			CheckpointAr.Buffer = MoveTemp(RequestData.DataBuffer);
+			CheckpointAr.Pos = 0;
+
+			int32 DataChunkIndex = FCString::Atoi(*CurrentReplayInfo.Checkpoints[CheckpointIndex].Metadata);
+			check(CurrentReplayInfo.DataChunks.IsValidIndex(DataChunkIndex));
+
+			bool bIsDataAvailableForTimeRange = IsDataAvailableForTimeRange(CurrentReplayInfo.Checkpoints[CheckpointIndex].Time1, LastGotoTimeInMS);
+
+			if (!bIsDataAvailableForTimeRange)
+			{
+				// Completely reset our stream (we're going to start loading from the start of the checkpoint)
+				StreamAr.Buffer.Empty();
+				StreamAr.Pos = 0;
+				StreamAr.bAtEndOfReplay	= false;
+
+				// Reset any time we were waiting on in the past
+				HighPriorityEndTime	= 0;
+
+				StreamDataOffset = CurrentReplayInfo.DataChunks[DataChunkIndex].StreamOffset;
+
+				// Reset our stream range
+				StreamTimeRange = TInterval<uint32>(0, 0);
+
+				// Set the next chunk to be right after this checkpoint (which was stored in the metadata)
+				StreamChunkIndex = DataChunkIndex;
+
+				LastChunkTime = 0;		// Force the next chunk to start loading immediately in case LastGotoTimeInMS is 0 (which would effectively disable high priority mode immediately)
+			}
+			else
+			{
+				// set stream position back to the correct location
+				StreamAr.Pos = CurrentReplayInfo.DataChunks[DataChunkIndex].StreamOffset - StreamDataOffset;
+				check(StreamAr.Pos >= 0 && StreamAr.Pos <= StreamAr.Buffer.Num());
+				StreamAr.bAtEndOfReplay = false;
+			}
+
+			// If we want to fast forward past the end of a stream (and we set a new chunk to stream), clamp to the checkpoint
+			if ( LastGotoTimeInMS >= 0 && StreamChunkIndex >= CurrentReplayInfo.DataChunks.Num() && !bIsDataAvailableForTimeRange )
+			{
+				UE_LOG( LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. Clamped to checkpoint: %i"), LastGotoTimeInMS );
+
+				StreamTimeRange = TInterval<uint32>(CurrentReplayInfo.Checkpoints[CheckpointIndex].Time1, CurrentReplayInfo.Checkpoints[CheckpointIndex].Time1);
+				LastGotoTimeInMS = -1;
+			}
+
+			if ( LastGotoTimeInMS >= 0 )
+			{
+				// If we are fine scrubbing, make sure to wait on the part of the stream that is needed to do this in one frame
+				SetHighPriorityTimeRange(CurrentReplayInfo.Checkpoints[CheckpointIndex].Time1, LastGotoTimeInMS);
+
+				// Subtract off starting time so we pass in the leftover to the engine to fast forward through for the fine scrubbing part
+				LastGotoTimeInMS -= CurrentReplayInfo.Checkpoints[CheckpointIndex].Time1;
+			}
+
+			// Notify game code of success
+			RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+			RequestData.DelegateResult.ExtraTimeMS = LastGotoTimeInMS;
+
+			Delegate.ExecuteIfBound(RequestData.DelegateResult);
+
+			UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::GotoCheckpointIndex. SUCCESS. StreamChunkIndex: %i"), StreamChunkIndex);
+
+			// Reset things
+			LastGotoTimeInMS		= -1;
+		});
 }
 
-void FLocalFileNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate)
+void FLocalFileNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FGotoCallback& Delegate)
 {
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingCheckpoint) || LastGotoTimeInMS != -1)
+	{
+		// If we're processing requests, be on the safe side and cancel the scrub
+		// FIXME: We can cancel the in-flight requests as well
+		UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::GotoTimeInMS. Busy processing pending requests."));
+		Delegate.ExecuteIfBound( FGotoResult() );
+		return;
+	}
+
+	UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::GotoTimeInMS. TimeInMS: %i"), (int)TimeInMS );
+
+	check(LastGotoTimeInMS == -1);
+
 	int32 CheckpointIndex = -1;
 
-	if (ReplayInfo.Checkpoints.Num() > 0 && TimeInMS >= ReplayInfo.Checkpoints[ ReplayInfo.Checkpoints.Num() - 1 ].Time1)
+	LastGotoTimeInMS = FMath::Min( TimeInMS, (uint32)CurrentReplayInfo.LengthInMS );
+
+	if (CurrentReplayInfo.Checkpoints.Num() > 0 && TimeInMS >= CurrentReplayInfo.Checkpoints[CurrentReplayInfo.Checkpoints.Num() - 1].Time1)
 	{
 		// If we're after the very last checkpoint, that's the one we want
-		CheckpointIndex = ReplayInfo.Checkpoints.Num() - 1;
+		CheckpointIndex = CurrentReplayInfo.Checkpoints.Num() - 1;
 	}
 	else
 	{
 		// Checkpoints should be sorted by time, return the checkpoint that exists right before the current time
 		// For fine scrubbing, we'll fast forward the rest of the way
 		// NOTE - If we're right before the very first checkpoint, we'll return -1, which is what we want when we want to start from the very beginning
-		for (int i = 0; i < ReplayInfo.Checkpoints.Num(); i++)
+		for (int32 i = 0; i < CurrentReplayInfo.Checkpoints.Num(); i++)
 		{
-			if (TimeInMS < ReplayInfo.Checkpoints[i].Time1)
+			if (TimeInMS < CurrentReplayInfo.Checkpoints[i].Time1)
 			{
 				CheckpointIndex = i - 1;
 				break;
@@ -943,55 +1795,886 @@ void FLocalFileNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const
 		}
 	}
 
-	int32 ExtraSkipTimeInMS = TimeInMS;
+	GotoCheckpointIndex( CheckpointIndex, Delegate );
+}
 
-	if (CheckpointIndex >= 0)
+bool FLocalFileNetworkReplayStreamer::HasPendingFileRequests() const
+{
+	// If there is currently one in progress, or we have more to process, return true
+	return IsFileRequestInProgress() || QueuedRequests.Num() > 0;
+}
+
+bool FLocalFileNetworkReplayStreamer::IsFileRequestInProgress() const
+{
+	return ActiveRequest.IsValid();
+}
+
+bool FLocalFileNetworkReplayStreamer::IsFileRequestPendingOrInProgress(const EQueuedLocalFileRequestType::Type RequestType) const
+{
+	for (const TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe>& Request : QueuedRequests)
 	{
-		// Subtract off checkpoint time so we pass in the leftover to the engine to fast forward through for the fine scrubbing part
-		ExtraSkipTimeInMS = TimeInMS - ReplayInfo.Checkpoints[ CheckpointIndex ].Time1;
+		if (Request->GetRequestType() == RequestType)
+		{
+			return true;
+		}
 	}
 
-	GotoCheckpointIndexInternal(CheckpointIndex, Delegate, ExtraSkipTimeInMS);
+	if (ActiveRequest.IsValid())
+	{
+		if (ActiveRequest->GetRequestType() == RequestType)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+bool FLocalFileNetworkReplayStreamer::ProcessNextFileRequest()
+{
+	if (IsFileRequestInProgress())
+	{
+		return false;
+	}
+
+	if (QueuedRequests.Num() > 0)
+	{
+		TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe> QueuedRequest = QueuedRequests[0];
+		QueuedRequests.RemoveAt( 0 );
+
+		UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::ProcessNextFileRequest. Dequeue Type: %s"), EQueuedLocalFileRequestType::ToString(QueuedRequest->GetRequestType()));
+
+		check( !ActiveRequest.IsValid() );
+
+		ActiveRequest = QueuedRequest;
+
+		if (ActiveRequest->GetCachedRequest())
+		{
+			ActiveRequest->FinishRequest();
+
+			return ProcessNextFileRequest();
+		}
+		else
+		{
+			ActiveRequest->IssueRequest();
+		}
+
+		return true;
+	}
+
+	return false;
 }
 
 void FLocalFileNetworkReplayStreamer::Tick(float DeltaSeconds)
 {
-	if (StreamerState == EStreamerState::Playback)
+	// Attempt to process the next file request
+	if (ProcessNextFileRequest())
 	{
-		// update replay info with latest information
-		if (ReplayInfo.bIsLive)
-		{
-			int64 LastDataSize = ReplayInfo.TotalDataSizeInBytes;
-				
-			FLocalFileReplayInfo LatestInfo = ReadReplayInfo(CurrentStreamName);
-			if (LatestInfo.bIsValid)
-			{
-				ReplayInfo = LatestInfo;
+		check(IsFileRequestInProgress());
+	}
 
-				// reopen playback file if size has changed
-				if (FilePlaybackAr.IsValid() && (LastDataSize != ReplayInfo.TotalDataSizeInBytes))
+	if (bStopStreamingCalled)
+	{
+		return;
+	}
+
+	if (StreamerState == EStreamerState::Recording)
+	{
+		ConditionallyFlushStream();
+	}
+	else if (StreamerState == EStreamerState::Playback)
+	{
+		if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::StartPlayback))
+		{
+			// If we're still waiting on finalizing the start request then return
+			return;
+		}
+
+		// Check to see if we're done loading the high priority portion of the stream
+		// If so, we can cancel the request
+		if (HighPriorityEndTime > 0 && StreamTimeRange.Contains(HighPriorityEndTime))
+		{
+			HighPriorityEndTime = 0;
+		}
+
+		// Check to see if we're at the end of non live streams
+		if (StreamChunkIndex >= CurrentReplayInfo.DataChunks.Num() && !CurrentReplayInfo.bIsLive)
+		{
+			// Make note of when we reach the end of non live stream
+			StreamAr.bAtEndOfReplay = true;
+		}
+
+		ConditionallyLoadNextChunk();
+		ConditionallyRefreshReplayInfo();
+	}
+}
+
+TSharedPtr<FArchive> FLocalFileNetworkReplayStreamer::CreateLocalFileReader(const FString& InFilename) const
+{
+	return MakeShareable(IFileManager::Get().CreateFileReader(*InFilename, FILEREAD_AllowWrite));
+}
+
+TSharedPtr<FArchive> FLocalFileNetworkReplayStreamer::CreateLocalFileWriter(const FString& InFilename) const
+{
+	return MakeShareable(IFileManager::Get().CreateFileWriter(*InFilename, FILEWRITE_Append | FILEWRITE_AllowRead));
+}
+
+TSharedPtr<FArchive> FLocalFileNetworkReplayStreamer::CreateLocalFileWriterForOverwrite(const FString& InFilename) const
+{
+	return MakeShareable(IFileManager::Get().CreateFileWriter(*InFilename, FILEWRITE_AllowRead));
+}
+
+FString FLocalFileNetworkReplayStreamer::GetDemoPath() const
+{
+	return DemoSavePath;
+}
+
+FString FLocalFileNetworkReplayStreamer::GetDemoFullFilename(const FString& StreamName) const
+{
+	if (FPaths::IsRelative(StreamName))
+	{
+		// Treat relative paths as demo stream names.
+		return FPaths::Combine(*GetDemoPath(), *StreamName) + TEXT(".replay");
+	}
+	else
+	{
+		// Return absolute paths without modification.
+		return StreamName;
+	}
+}
+
+FString FLocalFileNetworkReplayStreamer::GetAutomaticDemoName() const
+{
+	const int32 MaxDemos = FNetworkReplayStreaming::GetMaxNumberOfAutomaticReplays();
+	const bool bUnlimitedDemos = (MaxDemos <= 0);
+	const bool bUseDatePostfix = FNetworkReplayStreaming::UseDateTimeAsAutomaticReplayPostfix();
+	const FString AutoPrefix = FNetworkReplayStreaming::GetAutomaticReplayPrefix();
+
+	IFileManager& FileManager = IFileManager::Get();
+
+	if (bUseDatePostfix)
+	{
+		if (!bUnlimitedDemos)
+		{
+			const FString WildCardPath = GetDemoFullFilename(AutoPrefix + FString(TEXT("*")));
+
+			TArray<FString> FoundAutoReplays;
+			FileManager.FindFiles(FoundAutoReplays, *WildCardPath, /* bFiles= */ true, /* bDirectories= */ false);
+
+			if (FoundAutoReplays.Num() >= MaxDemos)
+			{
+				const FString* OldestReplay = nullptr;
+				FDateTime OldestReplayTimestamp = FDateTime::MaxValue();
+
+				for (FString& AutoReplay : FoundAutoReplays)
 				{
-					int64 OldPos = FilePlaybackAr->Tell();
-					FilePlaybackAr->LocalFileAr.Reset(IFileManager::Get().CreateFileReader(*LocalFileReplay::GetDemoFullFilename(CurrentStreamName), FILEREAD_AllowWrite));
-					FilePlaybackAr->Seek(OldPos);
+					// Convert the replay name to a full path, making sure to remove the extra .replay postfix
+					// that GetDemoFullFilename will add.
+					AutoReplay = GetDemoFullFilename(AutoReplay);
+					AutoReplay.RemoveFromEnd(TEXT(".replay"));
+
+					FDateTime Timestamp = FileManager.GetTimeStamp(*AutoReplay);
+					if (Timestamp < OldestReplayTimestamp)
+					{
+						OldestReplay = &AutoReplay;
+						OldestReplayTimestamp = Timestamp;
+					}
+				}
+
+				check(OldestReplay != nullptr)
+
+				// Return an empty string to indicate failure.
+				if (!ensureMsgf(FileManager.Delete(**OldestReplay, /*bRequireExists=*/ true, /*bEvenIfReadOnly=*/ true), TEXT("FLocalFileNetworkReplayStreamer::GetAutomaticDemoName: Failed to delete old replay %s"), **OldestReplay))
+				{
+					// TODO: Maybe consider sorting the list of replays, and iterating them.
+					//			This would take more time, but may be more robust.
+					//			For example, we could delete multiple files to get below the budget.
+					//			The current behavior should be sufficient, though, as failure to overwrite
+					//			a file would result in similar issues in the indexed case (e.g., no replay would be saved).
+					return FString();
+				}
+			}
+		}
+		
+
+		return AutoPrefix + FDateTime::Now().ToString();
+	}
+	else
+	{
+		FString FinalDemoName;
+		FDateTime BestDateTime = FDateTime::MaxValue();
+
+		int32 i = 1;
+		while (bUnlimitedDemos || i <= MaxDemos)
+		{
+			const FString DemoName = FString::Printf(TEXT("%s%i"), *AutoPrefix, i);
+			const FString FullDemoName = GetDemoFullFilename(DemoName);
+
+			FDateTime DateTime = FileManager.GetTimeStamp(*FullDemoName);
+			if (DateTime == FDateTime::MinValue())
+			{
+				// If we don't find this file, we can early out now
+				FinalDemoName = DemoName;
+				break;
+			}
+			else if (!bUnlimitedDemos && DateTime < BestDateTime)
+			{
+				// Use the oldest file
+				FinalDemoName = DemoName;
+				BestDateTime = DateTime;
+			}
+
+			++i;
+		}
+
+		return FinalDemoName;
+	}
+}
+
+const FString& FLocalFileNetworkReplayStreamer::GetDefaultDemoSavePath()
+{
+	static const FString DefaultDemoSavePath = FPaths::Combine(*FPaths::ProjectSavedDir(), TEXT("Demos/"));
+	return DefaultDemoSavePath;
+}
+
+uint32 FLocalFileNetworkReplayStreamer::GetMaxFriendlyNameSize() const
+{
+	return LocalFileReplay::MaxFriendlyNameLen;
+}
+
+void FLocalFileNetworkReplayStreamer::DownloadHeader(const FDownloadHeaderCallback& Delegate)
+{
+	if (CurrentReplayInfo.bIsValid && CurrentReplayInfo.Chunks.IsValidIndex(CurrentReplayInfo.HeaderChunkIndex))
+	{
+		const FLocalFileChunkInfo& ChunkInfo = CurrentReplayInfo.Chunks[CurrentReplayInfo.HeaderChunkIndex];
+
+		int64 HeaderOffset = ChunkInfo.DataOffset;
+		int32 HeaderSize = ChunkInfo.SizeInBytes;
+
+		AddDelegateFileRequestToQueue<FDownloadHeaderResult>(EQueuedLocalFileRequestType::ReadingHeader,
+			[this, HeaderSize, HeaderOffset](TLocalFileRequestCommonData<FDownloadHeaderResult>& RequestData)
+			{
+				TArray<uint8>& HeaderData = RequestData.DataBuffer;
+
+				const FString FullDemoFilename = GetDemoFullFilename(CurrentStreamName);
+
+				TSharedPtr<FArchive> LocalFileAr = CreateLocalFileReader(FullDemoFilename);
+				if (LocalFileAr.IsValid())
+				{
+					HeaderData.AddUninitialized(HeaderSize);
+
+					LocalFileAr->Seek(HeaderOffset);
+					LocalFileAr->Serialize((void*)HeaderData.GetData(), HeaderData.Num());
+
+					RequestData.DelegateResult.Result = EStreamingOperationResult::Success;
+
+					LocalFileAr = nullptr;
+				}
+			},
+			[this, Delegate](TLocalFileRequestCommonData<FDownloadHeaderResult>& RequestData)
+			{
+				HeaderAr.Buffer = MoveTemp(RequestData.DataBuffer);
+				HeaderAr.Pos = 0;
+
+				Delegate.ExecuteIfBound(RequestData.DelegateResult);
+			});
+	}
+	else
+	{
+		Delegate.ExecuteIfBound(FDownloadHeaderResult());
+	}
+}
+
+void FLocalFileNetworkReplayStreamer::WriteHeader()
+{
+	check(StreamAr.IsSaving());
+
+	if (CurrentStreamName.IsEmpty())
+	{
+		// IF there is no active session, or we are not recording, we don't need to flush
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::WriteHeader. No session name!"));
+		return;
+	}
+
+	if (HeaderAr.Buffer.Num() == 0)
+	{
+		// Header wasn't serialized
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::WriteHeader. No header to upload"));
+		return;
+	}
+
+	if (!IsStreaming())
+	{
+		UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamer::WriteHeader. Not currently streaming"));
+		return;
+	}
+
+	int32 HeaderChunkIndex = CurrentReplayInfo.HeaderChunkIndex;
+	int64 HeaderTypeOffset = (HeaderChunkIndex != INDEX_NONE) ? CurrentReplayInfo.Chunks[HeaderChunkIndex].TypeOffset : 0;
+	int32 HeaderSize = (HeaderChunkIndex != INDEX_NONE) ? CurrentReplayInfo.Chunks[HeaderChunkIndex].SizeInBytes : 0;
+
+	AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::WritingHeader, 
+		[this, HeaderChunkIndex, HeaderTypeOffset, HeaderSize, HeaderData=MoveTemp(HeaderAr.Buffer)](FLocalFileReplayInfo& ReplayInfo)
+		{
+			TSharedPtr<FArchive> LocalFileAr = CreateLocalFileWriter(GetDemoFullFilename(CurrentStreamName));
+			if (LocalFileAr.IsValid())
+			{
+				if (HeaderChunkIndex == INDEX_NONE)
+				{
+					// append new chunk
+					LocalFileAr->Seek(LocalFileAr->TotalSize());
+				}
+				else 
+				{
+					if (HeaderData.Num() > HeaderSize)
+					{
+						LocalFileAr->Seek(HeaderTypeOffset);
+
+						// clear chunk type so it will be skipped later
+						ELocalFileChunkType ChunkType = ELocalFileChunkType::Unknown;
+						*LocalFileAr << ChunkType;
+
+						LocalFileAr->Seek(LocalFileAr->TotalSize());
+					}
+					else
+					{
+						LocalFileAr->Seek(HeaderTypeOffset);
+					}
+				}
+
+				ELocalFileChunkType ChunkType = ELocalFileChunkType::Header;
+				*LocalFileAr << ChunkType;
+
+				int32 ChunkSize = HeaderData.Num();
+				*LocalFileAr << ChunkSize;
+
+				LocalFileAr->Serialize((void*)HeaderData.GetData(), HeaderData.Num());
+
+				LocalFileAr = nullptr;
+			}
+
+			ReadReplayInfo(CurrentStreamName, ReplayInfo);
+		},
+		[this](FLocalFileReplayInfo& ReplayInfo)
+		{
+			if (ReplayInfo.bIsValid)
+			{
+				int32 TotalLengthInMS = CurrentReplayInfo.LengthInMS;
+				CurrentReplayInfo = ReplayInfo;
+				CurrentReplayInfo.LengthInMS = TotalLengthInMS;
+			}
+		});
+
+	// We're done with the header archive
+	HeaderAr.Buffer.Empty();
+	HeaderAr.Pos = 0;
+
+	LastChunkTime = FPlatformTime::Seconds();
+}
+
+void FLocalFileNetworkReplayStreamer::RefreshHeader()
+{
+	AddSimpleRequestToQueue(EQueuedLocalFileRequestType::WriteHeader, 
+		[]()
+		{
+			UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::RefreshHeader"));
+		},
+		[this]()
+		{
+			WriteHeader();
+		});
+}
+
+void FLocalFileNetworkReplayStreamer::SetHighPriorityTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS)
+{
+	HighPriorityEndTime = EndTimeInMS;
+}
+
+bool FLocalFileNetworkReplayStreamer::IsDataAvailableForTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS)
+{
+	if (GetLastError() != ENetworkReplayError::None)
+	{
+		return false;
+	}
+
+	// If the time is within the stream range we have loaded, we will return true
+	return (StreamTimeRange.Contains(StartTimeInMS) && StreamTimeRange.Contains(EndTimeInMS));
+}
+
+bool FLocalFileNetworkReplayStreamer::IsLoadingCheckpoint() const
+{
+	return IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingCheckpoint);
+}
+
+void FLocalFileNetworkReplayStreamer::OnFileRequestComplete(const TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe>& Request)
+{
+	if (Request.IsValid() && ActiveRequest.IsValid())
+	{
+		UE_LOG(LogLocalFileReplay, Verbose, TEXT("FLocalFileNetworkReplayStreamer::OnFileRequestComplete. Type: %s"), EQueuedLocalFileRequestType::ToString(Request->GetRequestType()));
+
+		ActiveRequest = nullptr;
+	}
+}
+
+bool FLocalFileNetworkReplayStreamer::IsStreaming() const
+{
+	return (StreamerState != EStreamerState::Idle);
+}
+
+void FLocalFileNetworkReplayStreamer::ConditionallyFlushStream()
+{
+	if ( IsFileRequestInProgress() || HasPendingFileRequests() )
+	{
+		return;
+	}
+
+	const float FLUSH_TIME_IN_SECONDS = LocalFileReplay::CVarChunkUploadDelayInSeconds.GetValueOnGameThread();
+
+	if ( FPlatformTime::Seconds() - LastChunkTime > FLUSH_TIME_IN_SECONDS )
+	{
+		FlushStream(CurrentReplayInfo.LengthInMS);
+	}
+};
+
+void FLocalFileNetworkReplayStreamer::ConditionallyLoadNextChunk()
+{
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingCheckpoint))
+	{
+		// Don't load a stream chunk while we're waiting for a checkpoint to load
+		return;
+	}
+
+	if (IsFileRequestPendingOrInProgress(EQueuedLocalFileRequestType::ReadingStream))
+	{
+		// Only load one chunk at a time
+		return;
+	}
+
+	const bool bMoreChunksDefinitelyAvailable = CurrentReplayInfo.DataChunks.IsValidIndex(StreamChunkIndex);	// We know for a fact there are more chunks available
+	if (!bMoreChunksDefinitelyAvailable)
+	{
+		// don't read if no more chunks available, ConditionallyRefreshReplayInfo will refresh that data for us if bIsLive
+		return;
+	}
+
+	// Determine if it's time to load the next chunk
+	const bool bHighPriorityMode		= (HighPriorityEndTime > 0 && StreamTimeRange.Max < HighPriorityEndTime);			// We're within the high priority time range
+	const bool bReallyNeedToLoadChunk	= bHighPriorityMode && bMoreChunksDefinitelyAvailable;
+
+	// If it's not critical to load the next chunk (i.e. we're not scrubbing or at the end already), then check to see if we should grab the next chunk
+	if (!bReallyNeedToLoadChunk)
+	{
+		const double MIN_WAIT_FOR_NEXT_CHUNK_IN_SECONDS = 3;
+
+		const double LoadElapsedTime = FPlatformTime::Seconds() - LastChunkTime;
+
+		if (LoadElapsedTime < MIN_WAIT_FOR_NEXT_CHUNK_IN_SECONDS)
+		{
+			return;		// Unless it's critical (i.e. bReallyNeedToLoadChunk is true), never try faster than MIN_WAIT_FOR_NEXT_CHUNK_IN_SECONDS
+		}
+
+		if ((StreamTimeRange.Max > StreamTimeRange.Min) && (StreamAr.Buffer.Num() > 0))
+		{
+			// Make a guess on how far we're in
+			const float PercentIn		= StreamAr.Buffer.Num() > 0 ? ( float )StreamAr.Pos / ( float )StreamAr.Buffer.Num() : 0.0f;
+			const float TotalStreamTime	= ( float )( StreamTimeRange.Size() ) / 1000.0f;
+			const float CurrentTime		= TotalStreamTime * PercentIn;
+			const float TimeLeft		= TotalStreamTime - CurrentTime;
+
+			// Determine if we have enough buffer to stop streaming for now
+			const float MAX_BUFFERED_TIME = LocalFileReplay::CVarChunkUploadDelayInSeconds.GetValueOnAnyThread() * 0.5f;
+
+			if (TimeLeft > MAX_BUFFERED_TIME)
+			{
+				// Don't stream ahead by more than MAX_BUFFERED_TIME seconds
+				UE_LOG(LogLocalFileReplay, VeryVerbose, TEXT("ConditionallyLoadNextChunk. Cancelling due buffer being large enough. TotalStreamTime: %2.2f, PercentIn: %2.2f, TimeLeft: %2.2f"), TotalStreamTime, PercentIn, TimeLeft);
+				return;
+			}
+		}
+	}
+
+	UE_LOG(LogLocalFileReplay, Log, TEXT("FLocalFileNetworkReplayStreamer::ConditionallyLoadNextChunk. Index: %d"), StreamChunkIndex);
+
+	int32 RequestedStreamChunkIndex = StreamChunkIndex;
+
+	AddCachedFileRequestToQueue<FStreamingResultBase>(EQueuedLocalFileRequestType::ReadingStream, CurrentReplayInfo.DataChunks[StreamChunkIndex].ChunkIndex,
+		[this, RequestedStreamChunkIndex](TLocalFileRequestCommonData<FStreamingResultBase>& RequestData)
+		{
+			if (ReadReplayInfo(CurrentStreamName, RequestData.ReplayInfo))
+			{
+				check(RequestData.ReplayInfo.DataChunks.IsValidIndex(RequestedStreamChunkIndex));
+
+				RequestData.DataBuffer.Empty();
+			
+				const FString FullDemoFilename = GetDemoFullFilename(CurrentStreamName);
+		
+				TSharedPtr<FArchive> LocalFileAr = CreateLocalFileReader(FullDemoFilename);
+				if (LocalFileAr.IsValid())
+				{
+					LocalFileAr->Seek(RequestData.ReplayInfo.DataChunks[RequestedStreamChunkIndex].ReplayDataOffset);
+
+					RequestData.DataBuffer.AddUninitialized(RequestData.ReplayInfo.DataChunks[RequestedStreamChunkIndex].SizeInBytes);
+
+					LocalFileAr->Serialize(RequestData.DataBuffer.GetData(), RequestData.DataBuffer.Num());
+
+					if (RequestData.ReplayInfo.bCompressed)
+					{
+						if (SupportsCompression())
+						{
+							SCOPE_CYCLE_COUNTER( STAT_LocalReplay_DecompressTime );
+
+							TArray<uint8> UncompressedData;
+							if (DecompressBuffer(RequestData.DataBuffer, UncompressedData))
+							{
+								RequestData.DataBuffer = MoveTemp(UncompressedData);
+							}
+							else
+							{
+								RequestData.DataBuffer.Empty();
+								return;
+							}
+						}
+						else
+						{
+							RequestData.DataBuffer.Empty();
+							return;
+						}
+					}
+
+					LocalFileAr = nullptr;
+				}
+			}
+		},
+		[this, RequestedStreamChunkIndex](TLocalFileRequestCommonData<FStreamingResultBase>& RequestData)
+		{
+			// Make sure our stream chunk index didn't change under our feet
+			if (RequestedStreamChunkIndex != StreamChunkIndex)
+			{
+				StreamAr.Buffer.Empty();
+				StreamAr.Pos = 0;
+				SetLastError( ENetworkReplayError::ServiceUnavailable );
+				return;
+			}
+
+			if (RequestData.DataBuffer.Num() > 0)
+			{
+				if (StreamAr.Buffer.Num() == 0)
+				{
+					StreamTimeRange.Min = CurrentReplayInfo.DataChunks[RequestedStreamChunkIndex].Time1;
+				}
+
+				// This is the new end of the stream
+				StreamTimeRange.Max = CurrentReplayInfo.DataChunks[RequestedStreamChunkIndex].Time2;
+
+				check(StreamTimeRange.IsValid());
+
+				AddRequestToCache(CurrentReplayInfo.DataChunks[RequestedStreamChunkIndex].ChunkIndex, RequestData.DataBuffer);
+
+				StreamAr.Buffer.Append(RequestData.DataBuffer);
+
+				int32 MaxBufferedChunks = LocalFileReplay::CVarMaxBufferedStreamChunks.GetValueOnAnyThread();
+				if (MaxBufferedChunks > 0)
+				{
+					int32 MinChunkIndex = FMath::Max(0, (RequestedStreamChunkIndex + 1) - MaxBufferedChunks);
+					if (MinChunkIndex > 0)
+					{
+						int32 TrimBytes = CurrentReplayInfo.DataChunks[MinChunkIndex].StreamOffset - StreamDataOffset;
+						if (TrimBytes > 0)
+						{
+							// can't remove chunks if we're actively seeking within that data
+							if (StreamAr.Pos >= TrimBytes)
+							{
+								StreamAr.Buffer.RemoveAt(0, TrimBytes);
+								StreamAr.Pos -= TrimBytes;
+
+								StreamTimeRange.Min = CurrentReplayInfo.DataChunks[MinChunkIndex].Time1;
+								StreamDataOffset += TrimBytes;
+
+								check(StreamTimeRange.IsValid());
+							}
+						}
+					}
+				}				
+
+				StreamChunkIndex++;
+			}
+			else if (HighPriorityEndTime != 0)
+			{
+				// We failed to load live content during fast forward
+				HighPriorityEndTime = 0;
+			}
+		});
+
+	LastChunkTime = FPlatformTime::Seconds();
+}
+
+void FLocalFileNetworkReplayStreamer::ConditionallyRefreshReplayInfo()
+{
+	if (IsFileRequestInProgress() || HasPendingFileRequests())
+	{
+		return;
+	}
+
+	if (CurrentReplayInfo.bIsLive)
+	{
+		const double REFRESH_REPLAYINFO_IN_SECONDS = 10.0;
+
+		if (FPlatformTime::Seconds() - LastRefreshTime > REFRESH_REPLAYINFO_IN_SECONDS)
+		{
+			int64 LastDataSize = CurrentReplayInfo.TotalDataSizeInBytes;
+			const FString FullDemoFilename = GetDemoFullFilename(CurrentStreamName);
+
+			AddGenericRequestToQueue<FLocalFileReplayInfo>(EQueuedLocalFileRequestType::RefreshingLiveStream, 
+				[this](FLocalFileReplayInfo& ReplayInfo)
+				{
+					ReadReplayInfo(CurrentStreamName, ReplayInfo);
+				},
+				[this, LastDataSize](FLocalFileReplayInfo& ReplayInfo)
+				{
+					if (ReplayInfo.bIsValid && (ReplayInfo.TotalDataSizeInBytes != LastDataSize))
+					{
+						CurrentReplayInfo = ReplayInfo;
+					}
+				});
+
+			LastRefreshTime = FPlatformTime::Seconds();
+		}
+	}
+}
+
+void FLocalFileNetworkReplayStreamer::AddRequestToCache(int32 ChunkIndex, const TArray<uint8>& RequestData)
+{
+	if (!CurrentReplayInfo.bIsValid)
+	{
+		return;
+	}
+
+	if (!CurrentReplayInfo.Chunks.IsValidIndex(ChunkIndex))
+	{
+		return;
+	}
+
+	if (RequestData.Num() == 0)
+	{
+		return;
+	}
+
+	// Add to cache (or freshen existing entry)
+	RequestCache.Add(ChunkIndex, FCachedFileRequest(RequestData, FPlatformTime::Seconds()));
+
+	// Anytime we add something to cache, make sure it's within budget
+	CleanupRequestCache();
+}
+
+void FLocalFileNetworkReplayStreamer::CleanupRequestCache()
+{
+	// Remove older entries until we're under the CVarMaxCacheSize threshold
+	while (RequestCache.Num())
+	{
+		double OldestTime = 0.0;
+		int32 OldestKey = INDEX_NONE;
+		uint32 TotalSize = 0;
+
+		for (auto It = RequestCache.CreateIterator(); It; ++It)
+		{
+			if ((OldestKey == INDEX_NONE) || It.Value().LastAccessTime < OldestTime)
+			{
+				OldestTime = It.Value().LastAccessTime;
+				OldestKey = It.Key();
+			}
+
+			// Accumulate total cache size
+			TotalSize += It.Value().RequestData.Num();
+		}
+
+		check(OldestKey != INDEX_NONE);
+
+		const uint32 MaxCacheSize = LocalFileReplay::CVarMaxCacheSize.GetValueOnAnyThread();
+
+		if (TotalSize <= MaxCacheSize)
+		{
+			break;	// We're good
+		}
+
+		RequestCache.Remove(OldestKey);
+	}
+}
+
+void FQueuedLocalFileRequest::CancelRequest()
+{
+	bCancelled = true;
+}
+
+void FGenericQueuedLocalFileRequest::IssueRequest()
+{
+	auto SharedRef = AsShared();
+
+	Async<void>(EAsyncExecution::TaskGraph, 
+		[SharedRef]()
+		{
+			SharedRef->RequestFunction();
+		}, 
+		[SharedRef]() 
+		{
+			if (!SharedRef->bCancelled)
+			{
+				AsyncTask(ENamedThreads::GameThread, [SharedRef]()
+				{
+					SharedRef->FinishRequest();
+				});
+			}
+		});
+}
+
+void FGenericQueuedLocalFileRequest::FinishRequest()
+{
+	if (CompletionCallback)
+	{
+		CompletionCallback();
+	}
+
+	if (!bCancelled && Streamer.IsValid())
+	{
+		Streamer->OnFileRequestComplete(AsShared());
+	}
+}
+
+const FString FLocalFileNetworkReplayStreamer::GetUserStringFromUserIndex(const int32 UserIndex)
+{
+	if (UserIndex != INDEX_NONE && GEngine != nullptr)
+	{
+		if (UWorld* World = GWorld.GetReference())
+		{
+			if (ULocalPlayer const * const LocalPlayer = GEngine->GetLocalPlayerFromControllerId(World, UserIndex))
+			{
+				return LocalPlayer->GetPreferredUniqueNetId().ToString();
+			}
+		}
+	}
+
+	return FString();
+}
+
+const void FLocalFileNetworkReplayStreamer::GetUserStringsFromUserIndices(const TArray<int32>& UserIndices, TArray<FString>& OutUserStrings)
+{
+	if (GEngine != nullptr)
+	{
+		if (UserIndices.Num() == 1)
+		{
+			OutUserStrings.Emplace(GetUserStringFromUserIndex(UserIndices[0]));
+		}
+		else if (UserIndices.Num() > 1)
+		{
+			if (UWorld* World = GWorld.GetReference())
+			{
+				TMap<int32, FString> IdToString;
+				for (auto ConstIt = GEngine->GetLocalPlayerIterator(World); ConstIt; ++ConstIt)
+				{
+					if (ULocalPlayer const * const LocalPlayer = *ConstIt)
+					{
+						IdToString.Emplace(LocalPlayer->GetControllerId(), LocalPlayer->GetPreferredUniqueNetId().ToString());
+					}
+				}
+
+				for (const int32 UserIndex : UserIndices)
+				{
+					if (FString const * const UserString = IdToString.Find(UserIndex))
+					{
+						OutUserStrings.Emplace(*UserString);
+					}
 				}
 			}
 		}
 	}
-	else if (StreamerState == EStreamerState::Recording)
-	{
-		// when a replay chunk gets flushed it will update the header
-	}
 }
 
-TStatId FLocalFileNetworkReplayStreamer::GetStatId() const
+const int32 FLocalFileNetworkReplayStreamer::GetUserIndexFromUserString(const FString& UserString)
 {
-	RETURN_QUICK_DECLARE_CYCLE_STAT(FLocalFileNetworkReplayStreamer, STATGROUP_Tickables);
+	if (!UserString.IsEmpty() && GEngine != nullptr)
+	{
+		if (UWorld* World = GWorld.GetReference())
+		{
+			for (auto ConstIt = GEngine->GetLocalPlayerIterator(World); ConstIt; ++ConstIt)
+			{
+				if (ULocalPlayer const * const LocalPlayer = *ConstIt)
+				{
+					if (UserString.Equals(LocalPlayer->GetPreferredUniqueNetId().ToString()))
+					{
+						return LocalPlayer->GetControllerId();
+					}
+				}
+			}
+		}
+	}
+
+	return INDEX_NONE;
+}
+
+const void FLocalFileNetworkReplayStreamer::GetUserIndicesFromUserStrings(const TArray<FString>& UserStrings, TArray<int32>& OutUserIndices)
+{
+	if (GEngine != nullptr)
+	{
+		if (UserStrings.Num() == 1)
+		{
+			OutUserIndices.Emplace(GetUserIndexFromUserString(UserStrings[0]));
+		}
+		else if (UserStrings.Num() > 1)
+		{
+			if (UWorld* World = GWorld.GetReference())
+			{
+				TMap<FString, int32> StringToId;
+				for (auto ConstIt = GEngine->GetLocalPlayerIterator(World); ConstIt; ++ConstIt)
+				{
+					if (ULocalPlayer const * const LocalPlayer = *ConstIt)
+					{
+						StringToId.Emplace(LocalPlayer->GetPreferredUniqueNetId().ToString(), LocalPlayer->GetControllerId());
+					}
+				}
+
+				for (const FString& UserString : UserStrings)
+				{
+					if (int32 const * const UserIndex = StringToId.Find(UserString))
+					{
+						OutUserIndices.Emplace(*UserIndex);
+					}
+				}
+			}
+		}
+	}
 }
 
 IMPLEMENT_MODULE(FLocalFileNetworkReplayStreamingFactory, LocalFileNetworkReplayStreaming)
 
-TSharedPtr< INetworkReplayStreamer > FLocalFileNetworkReplayStreamingFactory::CreateReplayStreamer() 
+TSharedPtr<INetworkReplayStreamer> FLocalFileNetworkReplayStreamingFactory::CreateReplayStreamer() 
 {
-	return TSharedPtr< INetworkReplayStreamer >(new FLocalFileNetworkReplayStreamer);
+	TSharedPtr<FLocalFileNetworkReplayStreamer> Streamer = MakeShared<FLocalFileNetworkReplayStreamer>();
+	LocalFileStreamers.Add(Streamer);
+	return Streamer;
 }
+
+void FLocalFileNetworkReplayStreamingFactory::Tick( float DeltaTime )
+{
+	for (int i = LocalFileStreamers.Num() - 1; i >= 0; i--)
+	{
+		check(LocalFileStreamers[i].IsValid());
+
+		LocalFileStreamers[i]->Tick(DeltaTime);
+
+		// We can release our hold when streaming is completely done
+		if (LocalFileStreamers[i].IsUnique() && !LocalFileStreamers[i]->HasPendingFileRequests())
+		{
+			if (LocalFileStreamers[i]->IsStreaming())
+			{
+				UE_LOG(LogLocalFileReplay, Warning, TEXT("FLocalFileNetworkReplayStreamingFactory::Tick. Stream was stopped early."));
+			}
+
+			LocalFileStreamers.RemoveAt(i);
+		}
+	}
+}
+
+TStatId FLocalFileNetworkReplayStreamingFactory::GetStatId() const
+{
+	RETURN_QUICK_DECLARE_CYCLE_STAT(FLocalFileNetworkReplayStreamingFactory, STATGROUP_Tickables);
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Public/LocalFileNetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Public/LocalFileNetworkReplayStreaming.h
index aaa4d247b9d0..0b007369df0a 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Public/LocalFileNetworkReplayStreaming.h
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/LocalFileNetworkReplayStreaming/Public/LocalFileNetworkReplayStreaming.h
@@ -9,6 +9,9 @@
 #include "Serialization/ArrayReader.h"
 #include "Serialization/ArrayWriter.h"
 #include "Serialization/MemoryReader.h"
+#include "Async/Async.h"
+#include "Templates/SharedPointer.h"
+#include "HAL/ThreadSafeBool.h"
 
 class FNetworkReplayVersion;
 class FLocalFileNetworkReplayStreamer;
@@ -27,13 +30,15 @@ struct FLocalFileChunkInfo
 {
 	FLocalFileChunkInfo() : 
 		ChunkType(ELocalFileChunkType::Unknown),
-		SizeInBytes(0), 
-		Offset(0) 
+		SizeInBytes(0),
+		TypeOffset(0),
+		DataOffset(0)
 	{}
 
 	ELocalFileChunkType ChunkType;
 	int32 SizeInBytes;
-	int64 Offset;
+	int64 TypeOffset;
+	int64 DataOffset;
 };
 
 /** Struct to hold replay data chunk metadata */
@@ -41,11 +46,19 @@ struct FLocalFileReplayDataInfo
 {
 	FLocalFileReplayDataInfo() :
 		ChunkIndex(INDEX_NONE),
-		ReplayOffset(0)
+		Time1(0),
+		Time2(0),
+		SizeInBytes(0),
+		ReplayDataOffset(0),
+		StreamOffset(0)
 	{}
 
 	int32 ChunkIndex;
-	int64 ReplayOffset;
+	uint32 Time1;
+	uint32 Time2;
+	int32 SizeInBytes;
+	int64 ReplayDataOffset;
+	int64 StreamOffset;
 };
 
 /** Struct to hold event metadata */
@@ -56,7 +69,7 @@ struct FLocalFileEventInfo
 		Time1(0),
 		Time2(0),
 		SizeInBytes(0),
-		Offset(0)
+		EventDataOffset(0)
 	{}
 	
 	int32 ChunkIndex;
@@ -68,19 +81,21 @@ struct FLocalFileEventInfo
 	uint32 Time2;
 
 	int32 SizeInBytes;
-	int64 Offset;
+	int64 EventDataOffset;
 };
 
 /** Struct to hold metadata about an entire replay */
 struct FLocalFileReplayInfo
 {
-	FLocalFileReplayInfo() : 
+	FLocalFileReplayInfo() :
 		LengthInMS(0), 
 		NetworkVersion(0),
 		Changelist(0),
+		Timestamp(0),
 		TotalDataSizeInBytes(0),
 		bIsLive(false),
 		bIsValid(false),
+		bCompressed(false),
 		HeaderChunkIndex(INDEX_NONE)
 	{}
 
@@ -88,9 +103,11 @@ struct FLocalFileReplayInfo
 	uint32 NetworkVersion;
 	uint32 Changelist;
 	FString	FriendlyName;
+	FDateTime Timestamp;
 	int64 TotalDataSizeInBytes;
 	bool bIsLive;
 	bool bIsValid;
+	bool bCompressed;
 
 	int32 HeaderChunkIndex;
 
@@ -104,125 +121,452 @@ struct FLocalFileReplayInfo
 class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileStreamFArchive : public FArchive
 {
 public:
-	FLocalFileStreamFArchive(FLocalFileNetworkReplayStreamer* InStreamer) :
-		Streamer(InStreamer), 
-		Pos(0), 
-		CurrentChunkIndex(0), 
-		CurrentChunkPos(0) 
+	FLocalFileStreamFArchive() : Pos( 0 ), bAtEndOfReplay( false ) {}
+
+	virtual void	Serialize( void* V, int64 Length ) override;
+	virtual int64	Tell() override;
+	virtual int64	TotalSize() override;
+	virtual void	Seek( int64 InPos ) override;
+	virtual bool	AtEnd() override;
+
+	TArray< uint8 >	Buffer;
+	int32			Pos;
+	bool			bAtEndOfReplay;
+};
+
+namespace EQueuedLocalFileRequestType
+{
+	enum Type
+	{
+		StartRecording,
+		WriteHeader,
+		WritingHeader,
+		WritingStream,
+		StopRecording,
+		StartPlayback,
+		ReadingHeader,
+		ReadingStream,
+		EnumeratingStreams,
+		WritingCheckpoint,
+		ReadingCheckpoint,
+		UpdatingEvent,
+		EnumeratingEvents,
+		RequestingEvent,
+		StopStreaming,	
+		DeletingFinishedStream,
+		RefreshingLiveStream,
+		KeepReplay,
+		RenameReplay,
+		RenameReplayFriendlyName,
+	};
+
+	inline const TCHAR* ToString( EQueuedLocalFileRequestType::Type Type )
+	{
+		switch ( Type )
+		{
+		case StartRecording:
+			return TEXT( "StartRecording" );
+		case WriteHeader:
+			return TEXT( "WriteHeader" );
+		case WritingHeader:
+			return TEXT( "WritingHeader" );
+		case WritingStream:
+			return TEXT( "WritingStream" );
+		case StopRecording:
+			return TEXT( "StopRecording" );
+		case StartPlayback:
+			return TEXT( "StartPlayback" );
+		case ReadingHeader:
+			return TEXT( "ReadingHeader" );
+		case ReadingStream:
+			return TEXT( "ReadingStream" );
+		case EnumeratingStreams:
+			return TEXT( "EnumeratingStreams" );
+		case WritingCheckpoint:
+			return TEXT( "WritingCheckpoint" );
+		case ReadingCheckpoint:
+			return TEXT( "ReadingCheckpoint" );
+		case UpdatingEvent:
+			return TEXT( "UpdatingEvent" );
+		case EnumeratingEvents:
+			return TEXT( "EnumeratingEvents" );
+		case RequestingEvent:
+			return TEXT("RequestingEvent");
+		case StopStreaming:
+			return TEXT( "StopStreaming" );
+		case DeletingFinishedStream:
+			return TEXT( "DeletingFinishedStream" );
+		case RefreshingLiveStream:
+			return TEXT( "RefreshingLiveStream" );
+		case KeepReplay:
+			return TEXT( "KeepReplay" );
+		case RenameReplay:
+			return TEXT( "RenameReplay" );
+		case RenameReplayFriendlyName:
+			return TEXT( "RenameReplayFriendlyName" );
+		}
+
+		return TEXT( "Unknown EQueuedLocalFileRequestType type." );
+	}
+};
+
+class FCachedFileRequest
+{
+public:
+	FCachedFileRequest( const TArray<uint8>& InRequestData, const double InLastAccessTime ) : RequestData( InRequestData ), LastAccessTime( InLastAccessTime )
 	{
 	}
 
-	/** FArchive overrides */
-	virtual void	Serialize(void* V, int64 Length) override;
-	virtual int64	Tell() override;
-	virtual int64	TotalSize() override;
-	virtual void	Seek(int64 InPos) override;
-	virtual bool	AtEnd() override;
-
-	/** Seek to the beginning of specified chunk */
-	void			SetChunk(int32 ChunkIndex);
-
-	FLocalFileNetworkReplayStreamer* Streamer;
-	TUniquePtr<FArchive>	LocalFileAr;
-	int64					Pos;
-	int32					CurrentChunkIndex;
-	TArray<uint8>			CurrentChunkBuffer;
-	int32					CurrentChunkPos;
+	TArray<uint8> RequestData;
+	double LastAccessTime;
 };
 
-/** Archive to wrap header writes that respects FArchive::Flush */
-class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileHeaderFArchive : public FArrayWriter
+class FQueuedLocalFileRequest
 {
 public:
-	FLocalFileHeaderFArchive(FLocalFileNetworkReplayStreamer* InStreamer) : Streamer(InStreamer) {}
+	FQueuedLocalFileRequest(const TSharedPtr<FLocalFileNetworkReplayStreamer>& InStreamer, EQueuedLocalFileRequestType::Type InType)
+		: Streamer(InStreamer)
+		, RequestType(InType)
+		, bCancelled(false)
+	{
+	}
 
-	virtual void Flush() override;
+	virtual ~FQueuedLocalFileRequest() {}
 
-	FLocalFileNetworkReplayStreamer* Streamer;
+	EQueuedLocalFileRequestType::Type GetRequestType() const { return RequestType; }
+
+	virtual bool GetCachedRequest() { return false; }
+	virtual void IssueRequest() = 0;
+	virtual void FinishRequest() = 0;
+
+	void CancelRequest();
+
+protected:
+	TSharedPtr<FLocalFileNetworkReplayStreamer> Streamer;
+	EQueuedLocalFileRequestType::Type RequestType;
+	FThreadSafeBool bCancelled;	
+};
+
+class FGenericQueuedLocalFileRequest : public FQueuedLocalFileRequest, public TSharedFromThis<FGenericQueuedLocalFileRequest, ESPMode::ThreadSafe>
+{
+public:
+	FGenericQueuedLocalFileRequest(const TSharedPtr<FLocalFileNetworkReplayStreamer>& InStreamer, EQueuedLocalFileRequestType::Type InType, TFunction<void()>& InFunction, TFunction<void()>& InCompletionCallback)
+		: FQueuedLocalFileRequest(InStreamer, InType)
+		, RequestFunction(MoveTemp(InFunction))
+		, CompletionCallback(MoveTemp(InCompletionCallback))
+	{
+	}
+
+	virtual void IssueRequest() override;
+	virtual void FinishRequest() override;
+
+protected:
+	TFunction<void()> RequestFunction;
+	TFunction<void()> CompletionCallback;
+};
+
+template <typename StorageType>
+class TGenericQueuedLocalFileRequest : public FQueuedLocalFileRequest, public TSharedFromThis<TGenericQueuedLocalFileRequest<StorageType>, ESPMode::ThreadSafe>
+{
+public:
+	TGenericQueuedLocalFileRequest(const TSharedPtr<FLocalFileNetworkReplayStreamer>& InStreamer, EQueuedLocalFileRequestType::Type InType, TFunction<void(StorageType&)>& InFunction, TFunction<void(StorageType&)>& InCompletionCallback)
+		: FQueuedLocalFileRequest(InStreamer, InType)
+		, RequestFunction(MoveTemp(InFunction))
+		, CompletionCallback(MoveTemp(InCompletionCallback))
+	{
+	}
+
+	virtual void IssueRequest() override
+	{
+		auto SharedRef = this->AsShared();
+
+		Async<void>(EAsyncExecution::TaskGraph, 
+			[SharedRef]()
+			{
+				SharedRef->RequestFunction(SharedRef->Storage);
+			},
+			[SharedRef]() 
+			{
+				if (!SharedRef->bCancelled)
+				{
+					AsyncTask(ENamedThreads::GameThread, [SharedRef]()
+					{
+						SharedRef->FinishRequest();
+					});
+				}
+			});
+	}
+
+	virtual void FinishRequest() override
+	{
+		if (CompletionCallback)
+		{
+			CompletionCallback(Storage);
+		}
+
+		if (!bCancelled && this->Streamer.IsValid())
+		{
+			this->Streamer->OnFileRequestComplete(this->AsShared());
+		}
+	}
+
+	StorageType Storage;
+
+protected:
+	TFunction<void(StorageType&)> RequestFunction;
+	TFunction<void(StorageType&)> CompletionCallback;
+};
+
+template <typename DelegateResultType>
+class TLocalFileRequestCommonData
+{
+public:
+	DelegateResultType DelegateResult;
+	FLocalFileReplayInfo ReplayInfo;
+	TArray<uint8> DataBuffer;
+};
+
+template <typename DelegateResultType>
+class TGenericCachedLocalFileRequest : public TGenericQueuedLocalFileRequest<TLocalFileRequestCommonData<DelegateResultType>>
+{
+public:
+	TGenericCachedLocalFileRequest(int32 InCacheKey, const TSharedPtr<FLocalFileNetworkReplayStreamer>& InStreamer, EQueuedLocalFileRequestType::Type InType, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>& InFunction, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>& InCompletionCallback)
+		: TGenericQueuedLocalFileRequest<TLocalFileRequestCommonData<DelegateResultType>>(InStreamer, InType, InFunction, InCompletionCallback)
+		, CacheKey(InCacheKey)
+	{}
+
+	virtual bool GetCachedRequest() override
+	{
+		FCachedFileRequest* CachedRequest = this->Streamer->RequestCache.Find(CacheKey);
+		if (CachedRequest != nullptr)
+		{
+			// If we have this response in the cache, process it now
+			CachedRequest->LastAccessTime = FPlatformTime::Seconds();
+			this->Storage.DataBuffer = CachedRequest->RequestData;
+			return true;
+		}
+
+		return false; 
+	}
+
+protected:
+	int32 CacheKey;
 };
 
 /** Local file streamer that supports playback/recording to a single file on disk */
-class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileNetworkReplayStreamer : public INetworkReplayStreamer, public FTickableGameObject
+class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileNetworkReplayStreamer : public INetworkReplayStreamer, public TSharedFromThis<FLocalFileNetworkReplayStreamer>
 {
 public:
-	FLocalFileNetworkReplayStreamer() :
-		StreamerState(EStreamerState::Idle)
-	{}
+	FLocalFileNetworkReplayStreamer();
+	FLocalFileNetworkReplayStreamer(const FString& InDemoSavePath);
+	virtual ~FLocalFileNetworkReplayStreamer();
 
 	/** INetworkReplayStreamer implementation */
-	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate) override;
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) override;
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) override;
 	virtual void StopStreaming() override;
 	virtual FArchive* GetHeaderArchive() override;
 	virtual FArchive* GetStreamingArchive() override;
 	virtual FArchive* GetCheckpointArchive() override;
 	virtual void FlushCheckpoint(const uint32 TimeInMS) override;
-	virtual void GotoCheckpointIndex(const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate) override;
-	virtual void GotoTimeInMS(const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate) override;
+	virtual void GotoCheckpointIndex(const int32 CheckpointIndex, const FGotoCallback& Delegate) override;
+	virtual void GotoTimeInMS(const uint32 TimeInMS, const FGotoCallback& Delegate) override;
 	virtual void UpdateTotalDemoTime(uint32 TimeInMS) override;
-	virtual uint32 GetTotalDemoTime() const override { return ReplayInfo.LengthInMS; }
+	virtual uint32 GetTotalDemoTime() const override { return CurrentReplayInfo.LengthInMS; }
 	virtual bool IsDataAvailable() const override;
-	virtual void SetHighPriorityTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) override {}
-	virtual bool IsDataAvailableForTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) override { return true; }
-	virtual bool IsLoadingCheckpoint() const override { return false; }
+	virtual void SetHighPriorityTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) override;
+	virtual bool IsDataAvailableForTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) override;
+	virtual bool IsLoadingCheckpoint() const override;
 	virtual bool IsLive() const override;
-	virtual void DeleteFinishedStream(const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) const override;
-	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void EnumerateStreams(const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate) override {}
-	virtual ENetworkReplayError::Type GetLastError() const override { return ENetworkReplayError::None; }
+	virtual void DeleteFinishedStream(const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate) override;
+	virtual void DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate ) override;
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateStreams(const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual ENetworkReplayError::Type GetLastError() const override;
 	virtual void AddUserToReplay(const FString& UserString) override;
 	virtual void AddEvent(const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) override;
 	virtual void AddOrUpdateEvent(const FString& Name, const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) override;
-	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate) override;
-	virtual void EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate) override;
-	virtual void RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete) override;
-	virtual void SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void KeepReplay(const FString& ReplayName, const bool bKeep) override {}
+	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate) override;
+	virtual void EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate ) override;
+	virtual void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) override;
+	virtual void SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
 	virtual FString	GetReplayID() const override { return TEXT(""); }
 	virtual void SetTimeBufferHintSeconds(const float InTimeBufferHintSeconds) override {}
-	virtual void RefreshHeader() override {};
-	virtual void DownloadHeader(const FOnDownloadHeaderComplete& Delegate = FOnDownloadHeaderComplete()) override {}
+	virtual void RefreshHeader() override;
+	virtual void DownloadHeader(const FDownloadHeaderCallback& Delegate) override;
 
 	virtual bool SupportsCompression() const { return false; }
 	virtual int32 GetDecompressedSize(FArchive& InCompressed) const { return 0; }
 	virtual bool DecompressBuffer(const TArray<uint8>& InCompressed, TArray< uint8 >& OutBuffer) const { return false; }
 	virtual bool CompressBuffer(const TArray< uint8 >& InBuffer, TArray< uint8 >& OutCompressed) const { return false; }
 
-	/** FTickableObjectBase implementation */
-	virtual void Tick(float DeltaSeconds) override;
-	virtual bool IsTickable() const override { return true; }
-	virtual TStatId GetStatId() const override;
+	void Tick(float DeltaSeconds);
 
-	/** FTickableGameObject implementation */
-	virtual bool IsTickableWhenPaused() const override { return true; }
+	virtual uint32 GetMaxFriendlyNameSize() const override;
 
-	void FlushHeader();
+	virtual EStreamingOperationResult SetDemoPath(const FString& DemoPath) override
+	{
+		if (CurrentStreamName.IsEmpty())
+		{
+			DemoSavePath = DemoPath;
+			return EStreamingOperationResult::Success;
+		}
+		else
+		{
+			return EStreamingOperationResult::Unspecified;
+		}
+	}
 
-	/** Currently playing or recording replay metadata */
-	FLocalFileReplayInfo ReplayInfo;
+	virtual EStreamingOperationResult GetDemoPath(FString& DemoPath) const override
+	{
+		DemoPath = DemoSavePath;
+		return EStreamingOperationResult::Success;
+	}
+
+	void OnFileRequestComplete(const TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe>& Request);
+
+	bool IsStreaming() const;
+
+	bool HasPendingFileRequests() const;
+
+	void AddSimpleRequestToQueue(EQueuedLocalFileRequestType::Type RequestType, TFunction<void()>&& InFunction, TFunction<void()>&& InCompletionCallback)
+	{
+		QueuedRequests.Add(MakeShared<FGenericQueuedLocalFileRequest, ESPMode::ThreadSafe>(AsShared(), RequestType, InFunction, InCompletionCallback));
+	}
+
+	template <typename StorageType>
+	void AddGenericRequestToQueue(EQueuedLocalFileRequestType::Type RequestType, TFunction<void(StorageType&)>&& InFunction, TFunction<void(StorageType&)>&& InCompletionCallback)
+	{
+		QueuedRequests.Add(MakeShared<TGenericQueuedLocalFileRequest<StorageType>, ESPMode::ThreadSafe>(AsShared(), RequestType, InFunction, InCompletionCallback));
+	}
+
+	template<typename DelegateResultType>
+	void AddDelegateFileRequestToQueue(EQueuedLocalFileRequestType::Type RequestType, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>&& InFunction, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>&& InCompletionCallback)
+	{
+		AddGenericRequestToQueue<TLocalFileRequestCommonData<DelegateResultType>>(RequestType, MoveTemp(InFunction), MoveTemp(InCompletionCallback));
+	}
+
+	template<typename DelegateType, typename DelegateResultType>
+	void AddDelegateFileRequestToQueue(EQueuedLocalFileRequestType::Type RequestType, const DelegateType& Delegate, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>&& InFunction)
+	{
+		AddGenericRequestToQueue<TLocalFileRequestCommonData<DelegateResultType>>(RequestType, MoveTemp(InFunction), 
+			[Delegate](TLocalFileRequestCommonData<DelegateResultType>& Storage) 
+			{ 
+				Delegate.ExecuteIfBound(Storage.DelegateResult); 
+			});
+	}
+
+	template<typename DelegateResultType>
+	void AddCachedFileRequestToQueue(EQueuedLocalFileRequestType::Type RequestType, int32 InCacheKey, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>&& InFunction, TFunction<void(TLocalFileRequestCommonData<DelegateResultType>&)>&& InCompletionCallback)
+	{
+		QueuedRequests.Add(MakeShared<TGenericCachedLocalFileRequest<DelegateResultType>, ESPMode::ThreadSafe>(InCacheKey, AsShared(), RequestType, InFunction, InCompletionCallback));
+	}
+
+	/** Map of chunk index to cached value */
+	TMap<int32, FCachedFileRequest> RequestCache;
 
 protected:
-	FLocalFileReplayInfo ReadReplayInfo(const FString& StreamName) const;
-	void WriteReplayInfo(const FString& StreamName, FLocalFileReplayInfo& ReplayInfo);
+
+	static const FString GetUserStringFromUserIndex(const int32 UserIndex);
+	static const void GetUserStringsFromUserIndices(const TArray<int32>& UserIndices, TArray<FString>& OutUserStrings);
+
+	static const int32 GetUserIndexFromUserString(const FString& UserString);
+	static const void GetUserIndicesFromUserStrings(const TArray<FString>& UserStrings, TArray<int32>& OutUserIndices);
+
+	void StartStreaming_Internal(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate);
+	void DeleteFinishedStream_Internal(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate);
+	void EnumerateStreams_Internal(const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate);
+	void EnumerateRecentStreams_Internal(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate);
+	void EnumerateEvents_Internal(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate);
+	void RequestEventData_Internal(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate);
+	void KeepReplay_Internal(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate);
+	void RenameReplayFriendlyName_Internal(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate);
+	void RenameReplay_Internal(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate);
+
+	/** Currently playing or recording replay metadata */
+	FLocalFileReplayInfo CurrentReplayInfo;
+
+	TInterval<uint32> StreamTimeRange;
+	int64 StreamDataOffset;
+
+	int32 StreamChunkIndex;
+	double LastChunkTime;
+	double LastRefreshTime;
+	bool bStopStreamingCalled;
+	uint32 HighPriorityEndTime;
+	int64 LastGotoTimeInMS;
+
+	TArray<TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe>> QueuedRequests;
+	TSharedPtr<FQueuedLocalFileRequest, ESPMode::ThreadSafe> ActiveRequest;
+
+	bool ProcessNextFileRequest();
+	bool IsFileRequestInProgress() const;
+	bool IsFileRequestPendingOrInProgress(const EQueuedLocalFileRequestType::Type RequestType) const;
+	void CancelStreamingRequests();
+
+	void SetLastError(const ENetworkReplayError::Type InLastError);
+
+	void ConditionallyFlushStream();
+	void ConditionallyLoadNextChunk();
+	void ConditionallyRefreshReplayInfo();
+
+	void FlushCheckpointInternal(const uint32 TimeInMS);
+
+	struct FLocalFileSerializationInfo
+	{
+		FLocalFileSerializationInfo();
+
+		uint32 FileVersion;
+	};
+
+	bool ReadReplayInfo(const FString& StreamName, FLocalFileReplayInfo& OutReplayInfo) const;
+	bool ReadReplayInfo(FArchive& Archive, FLocalFileReplayInfo& OutReplayInfo) const;
+	bool ReadReplayInfo(FArchive& Archive, FLocalFileReplayInfo& OutReplayInfo, struct FLocalFileSerializationInfo& SerializationInfo) const;
+
+	bool WriteReplayInfo(const FString& StreamName, const FLocalFileReplayInfo& ReplayInfo);
+	bool WriteReplayInfo(FArchive& Archive, const FLocalFileReplayInfo& ReplayInfo);
+	bool WriteReplayInfo(FArchive& Archive, const FLocalFileReplayInfo& InReplayInfo, struct FLocalFileSerializationInfo& SerializationInfo);
+
+	void FixupFriendlyNameLength(const FString& UnfixedName, FString& FixedName) const;
 
 	bool IsNamedStreamLive(const FString& StreamName) const;
 
-	/** Handles the details of loading a checkpoint */
-	void GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS);
+	void FlushStream(const uint32 TimeInMS);
 
-	void FlushStream();
+	void WriteHeader();
+
+	virtual TSharedPtr<FArchive> CreateLocalFileReader(const FString& InFilename) const;
+	virtual TSharedPtr<FArchive> CreateLocalFileWriter(const FString& InFilename) const;
+	virtual TSharedPtr<FArchive> CreateLocalFileWriterForOverwrite(const FString& InFilename) const;
+
+	FString GetDemoPath() const;
+	FString GetDemoFullFilename(const FString& FileName) const;
+
+	// Returns a name formatted as "demoX", where X is between 1 and MAX_DEMOS, inclusive.
+	// Returns the first value that doesn't yet exist, or if they all exist, returns the oldest one
+	// (it will be overwritten).
+	FString GetAutomaticDemoName() const;
 
 	/** Handle to the archive that will read/write the demo header */
-	TUniquePtr<FArchive> HeaderPlaybackAr;
-	TUniquePtr<FLocalFileHeaderFArchive> HeaderRecordingAr;
+	FLocalFileStreamFArchive HeaderAr;
 
 	/** Handle to the archive that will read/write network packets */
-	TUniquePtr<FLocalFileStreamFArchive> FilePlaybackAr;
-	TUniquePtr<FArrayWriter> FileRecordingAr;
+	FLocalFileStreamFArchive StreamAr;
 
 	/* Handle to the archive that will read/write checkpoint files */
-	TUniquePtr<FArrayReader> CheckpointPlaybackAr;
-	TUniquePtr<FArrayWriter> CheckpointRecordingAr;
+	FLocalFileStreamFArchive CheckpointAr;
 
 	/** EStreamerState - Overall state of the streamer */
 	enum class EStreamerState
@@ -235,12 +579,31 @@ protected:
 	/** Overall state of the streamer */
 	EStreamerState StreamerState;
 
+	ENetworkReplayError::Type StreamerLastError;
+
 	/** Remember the name of the current stream, if any. */
 	FString CurrentStreamName;
+
+	FString DemoSavePath;
+
+	void AddRequestToCache(int32 ChunkIndex, const TArray<uint8>& RequestData);
+	void CleanupRequestCache();
+
+public:
+	static const FString& GetDefaultDemoSavePath();
 };
 
-class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileNetworkReplayStreamingFactory : public INetworkReplayStreamingFactory
+class LOCALFILENETWORKREPLAYSTREAMING_API FLocalFileNetworkReplayStreamingFactory : public INetworkReplayStreamingFactory, public FTickableGameObject
 {
 public:
-	virtual TSharedPtr< INetworkReplayStreamer > CreateReplayStreamer();
+	virtual TSharedPtr<INetworkReplayStreamer> CreateReplayStreamer();
+
+	/** FTickableGameObject */
+	virtual void Tick(float DeltaTime) override;
+	virtual ETickableTickType GetTickableTickType() const override { return ETickableTickType::Always; }
+	virtual TStatId GetStatId() const override;
+	bool IsTickableWhenPaused() const override { return true; }
+
+protected:
+	TArray<TSharedPtr<FLocalFileNetworkReplayStreamer>> LocalFileStreamers;
 };
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Private/NetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Private/NetworkReplayStreaming.cpp
index a9b288a397bc..cc04313520bd 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Private/NetworkReplayStreaming.cpp
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Private/NetworkReplayStreaming.cpp
@@ -3,6 +3,7 @@
 #include "NetworkReplayStreaming.h"
 #include "Misc/CommandLine.h"
 #include "Misc/ConfigCacheIni.h"
+#include "HAL/ConsoleManager.h"
 
 IMPLEMENT_MODULE( FNetworkReplayStreaming, NetworkReplayStreaming );
 
@@ -38,3 +39,50 @@ INetworkReplayStreamingFactory& FNetworkReplayStreaming::GetFactory(const TCHAR*
 
 	return FModuleManager::Get().LoadModuleChecked< INetworkReplayStreamingFactory >( *FactoryName );
 }
+
+int32 FNetworkReplayStreaming::GetMaxNumberOfAutomaticReplays()
+{
+	static const int32 DefaultMax = 10;
+
+	int32 MaxAutomaticReplays = DefaultMax;
+	GConfig->GetInt(TEXT("NetworkReplayStreaming"), TEXT("MaxNumberAutomaticReplays"), MaxAutomaticReplays, GEngineIni);
+
+	if (!ensureMsgf(MaxAutomaticReplays >= 0, TEXT("INetworkReplayStreamer::GetMaxNumberOfAutomaticReplays: Invalid configured value, using default. %d"), MaxAutomaticReplays))
+	{
+		MaxAutomaticReplays = DefaultMax;
+	}
+
+	return MaxAutomaticReplays;
+}
+
+static TAutoConsoleVariable<FString> CVarReplayStreamerAutoDemoPrefix(
+	TEXT("demo.ReplayStreamerAutoDemoPrefix"),
+	FString(TEXT("demo")),
+	TEXT("Prefix to use when generating automatic demo names.")
+);
+
+static TAutoConsoleVariable<int32> CVarReplayStreamerAutoDemoUseDateTimePostfix(
+	TEXT("demo.ReplayStreamerAutoDemoUseDateTimePostfix"),
+	0,
+	TEXT("When enabled, uses the current time as a postfix for automatic demo names instead of indices")
+);
+
+FString FNetworkReplayStreaming::GetAutomaticReplayPrefix()
+{
+	return CVarReplayStreamerAutoDemoPrefix.GetValueOnAnyThread();
+}
+
+bool FNetworkReplayStreaming::UseDateTimeAsAutomaticReplayPostfix()
+{
+	return !!CVarReplayStreamerAutoDemoUseDateTimePostfix.GetValueOnAnyThread();
+}
+
+const FString FNetworkReplayStreaming::GetAutomaticReplayPrefixExtern() const
+{
+	return GetAutomaticReplayPrefix();
+}
+
+const int32 FNetworkReplayStreaming::GetMaxNumberOfAutomaticReplaysExtern() const
+{
+	return GetMaxNumberOfAutomaticReplays();
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Public/NetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Public/NetworkReplayStreaming.h
index 19f219ea8683..50a4c353226f 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Public/NetworkReplayStreaming.h
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/NetworkReplayStreaming/Public/NetworkReplayStreaming.h
@@ -51,7 +51,7 @@ public:
 /** Struct to store information about a stream, returned from search results. */
 struct FNetworkReplayStreamInfo
 {
-	FNetworkReplayStreamInfo() : SizeInBytes( 0 ), LengthInMS( 0 ), NumViewers( 0 ), bIsLive( false ), Changelist( 0 ), bShouldKeep( false ) {}
+	FNetworkReplayStreamInfo() : Timestamp( 0 ), SizeInBytes( 0 ), LengthInMS( 0 ), NumViewers( 0 ), bIsLive( false ), Changelist( 0 ), bShouldKeep( false ) {}
 
 	/** The name of the stream (generally this is auto generated, refer to friendly name for UI) */
 	FString Name;
@@ -157,35 +157,375 @@ DECLARE_DELEGATE_TwoParams(FOnRequestEventDataComplete, const TArray<uint8>&, bo
 */
 DECLARE_DELEGATE_OneParam(FOnDownloadHeaderComplete, const bool);
 
-/** Generic interface for network replay streaming */
+/**
+ * Below are all available new style delegate declarations for the INetworkReplayStreamer interface.
+ *
+ * All delegates should be named in the form F<MethodName>Callback.
+ * All delegates should have an associated Result type.
+ * All delegates should take one, and only one, argument which will be a const reference to the appropriate Result type.
+ *
+ * All result types should be named in the form F<MethodName>Result.
+ * All result types should inherit from FStreamingResultBase.
+ * All result types should be default constructible to a sensible error state, with OperationResult = Unspecified.
+ *
+ * FGotoCallback and FGotoResult are used for GotoCheckpointIndex and GotoTimeInMS, as they perform logically similar operations.
+ * EnumerateRecentStreams uses the same delegate and result types as EnumerateStreams.
+ */
+
+/** Possible results for replay commands. */
+enum class EStreamingOperationResult
+{
+	Success,		//! The operation succeeded.
+	Unsupported,	//! The operation is not supported by the current streamer.
+	ReplayNotFound,	//! The requested replay was not found.
+	ReplayCorrupt,	//! The requested replay was found but was corrupt.
+	NotEnoughSpace,	//! The operation failed due to insufficient storage space.
+	NotEnoughSlots,	//! The operation failed due to reaching a predefined replay limit.
+	Unspecified,	//! The operation failed for unspecified reasons.
+	UnfinishedTask, //! The operation failed due to an outstanding task.
+};
+
+/**
+ * Base type for all Streaming Operation results.
+ * Should be used to store generic result information and convenience methods.
+ */
+struct FStreamingResultBase
+{
+	EStreamingOperationResult Result = EStreamingOperationResult::Unspecified;
+
+	virtual ~FStreamingResultBase() {}
+
+	bool WasSuccessful() const
+	{
+		return EStreamingOperationResult::Success == Result;
+	}
+};
+
+/** Start StartStreaming Types */
+struct FStartStreamingResult : public FStreamingResultBase
+{
+	//! Whether or not Recording was requested (vs. Playback).
+	bool bRecording = false;
+};
+
+DECLARE_DELEGATE_OneParam(FStartStreamingCallback, const FStartStreamingResult&);
+
+static FORCEINLINE FStartStreamingCallback UpgradeStartStreamingDelegate(const FOnStreamReadyDelegate& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FStartStreamingCallback::CreateLambda([OldDelegate](const FStartStreamingResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.WasSuccessful(), Result.bRecording);
+		});
+	}
+	else
+	{
+		return FStartStreamingCallback();
+	}
+}
+/** End StartStreaming Types */
+
+/** Start Goto Types */
+struct FGotoResult : public FStreamingResultBase
+{
+	//! Amount of extra time that the stream may need to be fast forwarded in order to reach
+	//! the exact time specified (relative to the latest checkpoint before the specified time).
+	int64 ExtraTimeMS = -1;
+};
+
+DECLARE_DELEGATE_OneParam(FGotoCallback, const FGotoResult&);
+
+static FORCEINLINE FGotoCallback UpgradeGotoDelegate(const FOnCheckpointReadyDelegate& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FGotoCallback::CreateLambda([OldDelegate](const FGotoResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.WasSuccessful(), Result.ExtraTimeMS);
+		});
+	}
+	else
+	{
+		return FGotoCallback();
+	}
+}
+/** End Goto Types */
+
+/** Start DeleteFinishedStream Types */
+struct FDeleteFinishedStreamResult : public FStreamingResultBase
+{
+};
+
+DECLARE_DELEGATE_OneParam(FDeleteFinishedStreamCallback, const FDeleteFinishedStreamResult&);
+
+static FORCEINLINE FDeleteFinishedStreamCallback UpgradeDeleteFinishedStreamDelegate(const FOnDeleteFinishedStreamComplete& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FDeleteFinishedStreamCallback::CreateLambda([OldDelegate](const FDeleteFinishedStreamResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.WasSuccessful());
+		});
+	}
+	else
+	{
+		return FDeleteFinishedStreamCallback();
+	}
+}
+/** End DeleteFinishedStream Types */
+
+/** Start EnumerateStreams Types */
+struct FEnumerateStreamsResult : public FStreamingResultBase
+{
+	//! A list of streams that were found
+	TArray<FNetworkReplayStreamInfo> FoundStreams;
+
+	//! A list of streams (by name) that were found and were corrupted.
+	TArray<FString> CorruptedStreams;
+};
+
+DECLARE_DELEGATE_OneParam(FEnumerateStreamsCallback, const FEnumerateStreamsResult&);
+
+static FORCEINLINE FEnumerateStreamsCallback UpgradeEnumerateStreamsDelegate(const FOnEnumerateStreamsComplete& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FEnumerateStreamsCallback::CreateLambda([OldDelegate](const FEnumerateStreamsResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.FoundStreams);
+		});
+	}
+	else
+	{
+		return FEnumerateStreamsCallback();
+	}
+}
+/** End EnumerateStreams Types */
+
+/** Start EnumerateEvents Types */
+struct FEnumerateEventsResult : public FStreamingResultBase
+{
+	//! A list of events that were found
+	FReplayEventList ReplayEventList;
+};
+
+DECLARE_DELEGATE_OneParam(FEnumerateEventsCallback, const FEnumerateEventsResult&);
+
+static FORCEINLINE FEnumerateEventsCallback UpgradeEnumerateEventsDelegate(const FEnumerateEventsCompleteDelegate& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FEnumerateEventsCallback::CreateLambda([OldDelegate](const FEnumerateEventsResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.ReplayEventList, Result.WasSuccessful());
+		});
+	}
+	else
+	{
+		return FEnumerateEventsCallback();
+	}
+}
+/** End EnumerateEvents Types */
+
+/** Start RequestEventData Types */
+struct FRequestEventDataResult : public FStreamingResultBase
+{
+	//! A replay event with its data parameter filled in.
+	TArray<uint8> ReplayEventListItem;
+};
+
+DECLARE_DELEGATE_OneParam(FRequestEventDataCallback, const FRequestEventDataResult&);
+
+static FORCEINLINE FRequestEventDataCallback UpgradeRequestEventDelegate(const FOnRequestEventDataComplete& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FRequestEventDataCallback::CreateLambda([OldDelegate](const FRequestEventDataResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.ReplayEventListItem, Result.WasSuccessful());
+		});
+	}
+	else
+	{
+		return FRequestEventDataCallback();
+	}
+}
+/** End RequestEventData Types */
+
+/** Start DownloadHeader Types */
+struct FDownloadHeaderResult : public FStreamingResultBase
+{
+};
+
+DECLARE_DELEGATE_OneParam(FDownloadHeaderCallback, const FDownloadHeaderResult&);
+
+static FORCEINLINE FDownloadHeaderCallback UpgradeDownloadHeaderDelegate(const FOnDownloadHeaderComplete& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FDownloadHeaderCallback::CreateLambda([OldDelegate](const FDownloadHeaderResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.WasSuccessful());
+		});
+	}
+	else
+	{
+		return FDownloadHeaderCallback();
+	}
+}
+/** End DownloadHeader Types */
+
+/** Start SearchEvent Types */
+struct FSearchEventsResult : public FStreamingResultBase
+{
+	// An array containing information about the streams that were found.
+	TArray<FNetworkReplayStreamInfo> FoundStreams;
+
+	//! A list of streams (by name) that were found and were corrupted.
+	TArray<FString> CorruptedStreams;
+};
+
+DECLARE_DELEGATE_OneParam(FSearchEventsCallback, const FSearchEventsResult&);
+
+static FORCEINLINE FSearchEventsCallback UpgradeSearchEventsDelegate(const FOnEnumerateStreamsComplete& OldDelegate)
+{
+	if (OldDelegate.IsBound())
+	{
+		return FSearchEventsCallback::CreateLambda([OldDelegate](const FSearchEventsResult& Result)
+		{
+			OldDelegate.ExecuteIfBound(Result.FoundStreams);
+		});
+	}
+	else
+	{
+		return FSearchEventsCallback();
+	}
+}
+/** End SearchEvent Types */
+
+/** Start KeepReplay Types */
+struct FKeepReplayResult : public FStreamingResultBase
+{
+	//! Saving the replay may cause the name to change.
+	//! This points to the new name for the replay so it can be referenced in further operations.
+	FString NewReplayName;
+
+	//! Only valid if the error is NotEnoughSpace or NotEnoughSlots.
+	//! For NotEnoughSpace, this will be the amount of storage space needed (in bytes) for the replay.
+	//! For NotEnoughSlots, this will be the maximum number of slots that can be used to store replays.
+	int64 RequiredSpace = 0;
+};
+
+DECLARE_DELEGATE_OneParam(FKeepReplayCallback, const FKeepReplayResult&);
+/** End KeepReplay Types */
+
+/** Start RenameReplay Types */
+struct FRenameReplayResult : public FStreamingResultBase
+{
+};
+
+DECLARE_DELEGATE_OneParam(FRenameReplayCallback, const FRenameReplayResult&);
+/** End KeepReplay Types */
+
+
+/**
+ * Generic interface for network replay streaming
+ *
+ * When a delegate is provided as an argument, it is expected that the implementation calls
+ * that delegate upon completion, and indicates success / failure through an appropriate
+ * result type passed into the delegate.
+ */
 class INetworkReplayStreamer 
 {
 public:
 	virtual ~INetworkReplayStreamer() {}
 
-	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate ) = 0;
+	DEPRECATED(4.20, "Please use the version of StartStreaming that accepts a FStartStreamingCallback delegate.")
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate) { StartStreaming(CustomName, FriendlyName, UserNames, bRecord, ReplayVersion, UpgradeStartStreamingDelegate(Delegate)); }
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) = 0;
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) = 0;
+
 	virtual void StopStreaming() = 0;
 	virtual FArchive* GetHeaderArchive() = 0;
 	virtual FArchive* GetStreamingArchive() = 0;
 	virtual FArchive* GetCheckpointArchive() = 0;
-	virtual void FlushCheckpoint( const uint32 TimeInMS ) = 0;
-	virtual void GotoCheckpointIndex( const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate ) = 0;
-	virtual void GotoTimeInMS( const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate ) = 0;
-	virtual void UpdateTotalDemoTime( uint32 TimeInMS ) = 0;
+	virtual void FlushCheckpoint(const uint32 TimeInMS) = 0;
+
+	DEPRECATED(4.20, "Please use the version of GotoCheckpointIndex that accepts a FGotoCallback delegate.")
+	virtual void GotoCheckpointIndex(const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate) { GotoCheckpointIndex(CheckpointIndex, UpgradeGotoDelegate(Delegate)); }
+	virtual void GotoCheckpointIndex(const int32 CheckpointIndex, const FGotoCallback& Delegate) = 0;
+
+	DEPRECATED(4.20, "Please use the version of GotoCheckpointIndex that accepts a FGotoCallback delegate.")
+	virtual void GotoTimeInMS(const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate) { GotoTimeInMS(TimeInMS, UpgradeGotoDelegate(Delegate)); }
+	virtual void GotoTimeInMS(const uint32 TimeInMS, const FGotoCallback& Delegate) = 0;
+
+	virtual void UpdateTotalDemoTime(uint32 TimeInMS) = 0;
 	virtual uint32 GetTotalDemoTime() const = 0;
 	virtual bool IsDataAvailable() const = 0;
-	virtual void SetHighPriorityTimeRange( const uint32 StartTimeInMS, const uint32 EndTimeInMS ) = 0;
-	virtual bool IsDataAvailableForTimeRange( const uint32 StartTimeInMS, const uint32 EndTimeInMS ) = 0;
+	virtual void SetHighPriorityTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) = 0;
+	virtual bool IsDataAvailableForTimeRange(const uint32 StartTimeInMS, const uint32 EndTimeInMS) = 0;
 	virtual bool IsLoadingCheckpoint() const = 0;
-	virtual void AddEvent( const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data ) = 0;
-	virtual void AddOrUpdateEvent( const FString& Name, const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data ) = 0;
-	virtual void EnumerateEvents( const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) = 0;
-	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) = 0;
-	virtual void RequestEventData( const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete ) = 0;
-	virtual void SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) = 0;
-	virtual void KeepReplay( const FString& ReplayName, const bool bKeep ) = 0;
+	virtual void AddEvent(const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) = 0;
+	virtual void AddOrUpdateEvent(const FString& Name, const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) = 0;
+
+	DEPRECATED(4.20, "Please use the version of EnumerateEvents that accepts a FEnumerateEventsCallback delegate.")
+	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCompleteDelegate& Delegate) { EnumerateEvents(Group, UpgradeEnumerateEventsDelegate(Delegate)); }
+	virtual void EnumerateEvents(const FString& Group, const FEnumerateEventsCallback& Delegate) = 0;
+
+	DEPRECATED(4.20, "Please use the version of EnumerateEvents that accepts a FEnumerateEventsCallback delegate.")
+	virtual void EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& Delegate) { EnumerateEvents(ReplayName, Group, UpgradeEnumerateEventsDelegate(Delegate)); }
+	virtual void EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate) = 0;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate ) = 0;
+
+	DEPRECATED(4.20, "Please use the version of RequestEventData that accepts a FRequestEventDataCallback delegate.")
+	virtual void RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& Delegate) { RequestEventData(EventID, UpgradeRequestEventDelegate(Delegate)); }
+	virtual void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate) = 0;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate) = 0;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) = 0;
+
+	DEPRECATED(4.20, "Please use the version of SearchEvents that accepts a FSearchEventsCallback delegate.")
+	virtual void SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) { SearchEvents(EventGroup, UpgradeSearchEventsDelegate(Delegate)); }
+	virtual void SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate) = 0;
 	virtual void RefreshHeader() = 0;
-	virtual void DownloadHeader(const FOnDownloadHeaderComplete& Delegate = FOnDownloadHeaderComplete()) = 0;
+
+	DEPRECATED(4.20, "Please use the version of DownloadHeader that accepts a FDownloadHeaderCallback delegate.")
+	virtual void DownloadHeader() { DownloadHeader(FDownloadHeaderCallback()); }
+
+	DEPRECATED(4.20, "Please use the version of DownloadHeader that accepts a FDownloadHeaderCallback delegate.")
+	virtual void DownloadHeader(const FOnDownloadHeaderComplete& Delegate) { DownloadHeader(UpgradeDownloadHeaderDelegate(Delegate)); }
+	virtual void DownloadHeader(const FDownloadHeaderCallback& Delegate) = 0;
+
+	/**
+	 * Used to commit a replay to permanent storage.
+	 *
+	 * @param ReplayName Name of the replay to keep.
+	 * @param bKeep Whether or not we actually want to keep this replay.
+	 */
+	DEPRECATED(4.20, "Please use the version of KeepReplay that accepts a FKeepReplayCallback delegate.")
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep) { KeepReplay(ReplayName, bKeep, FKeepReplayCallback()); }
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) = 0;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) = 0;
+
+	/**
+	 * Used to change the friendly name of a replay.
+	 * Note, changing the friendly name **does not** change the name used to refer to replay.
+	 *
+	 * @param ReplayName Name of the replay to rename.
+	 * @param NewFriendlyName The new friendly name for the replay.
+	 */
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) = 0;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) = 0;
+
+	/**
+	 * Used to change the name of a replay.
+	 * Note, this **will** change the name used to refer to the replay (if successful).
+	 *
+	 * @param ReplayName Name of the replay to rename.
+	 * @param NewName The new name for the replay.
+	 */
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) = 0;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) = 0;
 
 	/** Returns true if the playing stream is currently in progress */
 	virtual bool IsLive() const = 0;
@@ -197,27 +537,38 @@ public:
 	 * @param StreamName The name of the stream to delete
 	 * @param Delegate A delegate that will be executed if bound when the delete operation completes
 	 */
-	virtual void DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) const = 0;
+	DEPRECATED(4.20, "Please use the version of DeleteFinishedStream that accepts a FDeleteFinishedStreamCallback delegate.")
+	virtual void DeleteFinishedStream(const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) { DeleteFinishedStream(StreamName, UpgradeDeleteFinishedStreamDelegate(Delegate)); }
+	virtual void DeleteFinishedStream(const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate) = 0;
+	virtual void DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate ) = 0;
 
 	/**
 	 * Retrieves the streams that are available for viewing. May execute asynchronously.
 	 *
 	 * @param Delegate A delegate that will be executed if bound when the list of streams is available
 	 */
-	virtual void EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate ) = 0;
+	DEPRECATED(4.20, "Please use the version of EnumerateStreams that accepts a FEnumerateStreamsCallback delegate.")
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate) { EnumerateStreams(ReplayVersion, UserString, MetaString, UpgradeEnumerateStreamsDelegate(Delegate)); }
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate) = 0;
 
 	/**
 	* Retrieves the streams that are available for viewing. May execute asynchronously.
 	* Allows the caller to pass in a custom list of query parameters
 	*/
-	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate ) = 0;
+	DEPRECATED(4.20, "Please use the version of EnumerateStreams that accepts a FEnumerateStreamsCallback delegate.")
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray<FString>& ExtraParms, const FOnEnumerateStreamsComplete& Delegate) { EnumerateStreams(ReplayVersion, UserString, MetaString, ExtraParms, UpgradeEnumerateStreamsDelegate(Delegate)); }
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray<FString>& ExtraParms, const FEnumerateStreamsCallback& Delegate) = 0;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) = 0;
 
 	/**
 	 * Retrieves the streams that have been recently viewed. May execute asynchronously.
 	 *
 	 * @param Delegate A delegate that will be executed if bound when the list of streams is available
 	 */
-	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate ) = 0;
+	DEPRECATED(4.20, "Please use the version of EnumerateRecentStreams that accepts a FEnumerateStreamsCallback delegate.")
+	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate) { EnumerateRecentStreams(ReplayVersion, RecentViewer, UpgradeEnumerateStreamsDelegate(Delegate)); }
+	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate) = 0;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate ) = 0;
 
 	/** Returns the last error that occurred while streaming replays */
 	virtual ENetworkReplayError::Type GetLastError() const = 0;
@@ -235,6 +586,23 @@ public:
 	 * before the beginning of the buffer.
 	 */
 	virtual void SetTimeBufferHintSeconds(const float InTimeBufferHintSeconds) = 0;
+
+	/** Returns the maximum size of the friendly name text for this streamer, or 0 for unlimited. */
+	virtual uint32 GetMaxFriendlyNameSize() const = 0;
+
+	/**
+	 * Changes the base directory where Demos are stored.
+	 * Note, this will always fail for streamers that don't support replays stored on disk.
+	 * This method should not be called after StartStreaming, or while async operations are pending on a streamer.
+	 *
+	 */
+	virtual EStreamingOperationResult SetDemoPath(const FString& DemoPath) = 0;
+
+	/**
+	 * Gets the current base directory where Demos are stored.
+	 * Note, this will always fail for streamers that don't support replays stored on disk.
+	 */
+	virtual EStreamingOperationResult GetDemoPath(FString& DemoPath) const = 0;
 };
 
 /** Replay streamer factory */
@@ -254,4 +622,20 @@ public:
 	}
 
 	virtual INetworkReplayStreamingFactory& GetFactory(const TCHAR* FactoryNameOverride = nullptr);
+
+	virtual const FString GetAutomaticReplayPrefixExtern() const;
+	virtual const int32 GetMaxNumberOfAutomaticReplaysExtern() const;
+
+	// Gets the configured max value for the number of automatic replays to support.
+	// 0 indicates no limit.
+	static NETWORKREPLAYSTREAMING_API int32 GetMaxNumberOfAutomaticReplays();
+
+	// Gets the configured automatic replay name prefix.
+	// The prefix should always be a non-empty string.
+	// If using streamers that store replays on disk, this must also be comprised of only valid file name characters.
+	static NETWORKREPLAYSTREAMING_API FString GetAutomaticReplayPrefix();
+
+	// Gets the configured value for whether or not we should use FDateTime::Now as the automatic replay postfix.
+	// If false, it's up to the streamer to determine a proper postfix.
+	static NETWORKREPLAYSTREAMING_API bool UseDateTimeAsAutomaticReplayPostfix();
 };
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Private/NullNetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Private/NullNetworkReplayStreaming.cpp
index b71cf9eff9b9..bf484ffcead9 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Private/NullNetworkReplayStreaming.cpp
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Private/NullNetworkReplayStreaming.cpp
@@ -141,17 +141,18 @@ static void WriteReplayInfo( const FString& StreamName, const FNullReplayInfo& R
 // Returns a name formatted as "demoX", where X is 0-9.
 // Returns the first value that doesn't yet exist, or if they all exist, returns the oldest one
 // (it will be overwritten).
-static FString GetAutomaticDemoName()
+FString GetAutomaticDemoName()
 {
+	const int MaxDemos = FNetworkReplayStreaming::GetMaxNumberOfAutomaticReplays();
+	const bool bUnlimitedDemos = MaxDemos == 0;
+
 	FString FinalDemoName;
 	FDateTime BestDateTime = FDateTime::MaxValue();
 
-	const int MAX_DEMOS = 10;
-
-	for (int32 i = 0; i < MAX_DEMOS; i++)
+	int32 i = 1;
+	while(bUnlimitedDemos || i <= MaxDemos)
 	{
 		const FString DemoName = FString::Printf(TEXT("demo%i"), i + 1);
-		
 		const FString FullDemoName = GetDemoFilename(DemoName);
 		
 		FDateTime DateTime = IFileManager::Get().GetTimeStamp(*FullDemoName);
@@ -162,21 +163,31 @@ static FString GetAutomaticDemoName()
 			FinalDemoName = DemoName;
 			break;
 		}
-		else if (DateTime < BestDateTime)
+		else if (!bUnlimitedDemos && DateTime < BestDateTime)
 		{
 			// Use the oldest file
 			FinalDemoName = DemoName;
 			BestDateTime = DateTime;
 		}
+
+		++i;
 	}
 
 	return FinalDemoName;
 }
 
-void FNullNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate )
+void FNullNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	StartStreaming(CustomName, FriendlyName, TArray<FString>(), bRecord, ReplayVersion, Delegate);
+}
+
+void FNullNetworkReplayStreamer::StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate )
 {
 	FString FinalDemoName = CustomName;
 
+	FStartStreamingResult Result;
+	Result.bRecording = bRecord;
+
 	if ( CustomName.IsEmpty() )
 	{
 		if ( bRecord )
@@ -187,7 +198,8 @@ void FNullNetworkReplayStreamer::StartStreaming( const FString& CustomName, cons
 		else
 		{
 			// Can't play a replay if the user didn't provide a name!
-			Delegate.ExecuteIfBound( false, bRecord );
+			Result.Result = EStreamingOperationResult::ReplayNotFound;
+			Delegate.ExecuteIfBound( Result );
 			return;
 		}
 	}
@@ -233,7 +245,11 @@ void FNullNetworkReplayStreamer::StartStreaming( const FString& CustomName, cons
 	}
 
 	// Notify immediately
-	Delegate.ExecuteIfBound( FileAr.Get() != nullptr && HeaderAr.Get() != nullptr, bRecord );
+	if (FileAr.Get() != nullptr && HeaderAr.Get() != nullptr)
+	{
+		Result.Result = EStreamingOperationResult::Success;
+	}
+	Delegate.ExecuteIfBound(Result);
 }
 
 void FNullNetworkReplayStreamer::StopStreaming()
@@ -287,39 +303,57 @@ bool FNullNetworkReplayStreamer::IsNamedStreamLive( const FString& StreamName )
 	return !IFileManager::Get().FileExists(*GetFinalFilename(StreamName));
 }
 
-void FNullNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate ) const
+void FNullNetworkReplayStreamer::DeleteFinishedStream(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate)
 {
+	DeleteFinishedStream(StreamName, Delegate);
+}
+
+void FNullNetworkReplayStreamer::DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate )
+{
+	FDeleteFinishedStreamResult Result;
+
 	// Live streams can't be deleted
 	if (IsNamedStreamLive(StreamName))
 	{
 		UE_LOG(LogNullReplay, Log, TEXT("Can't delete network replay stream %s because it is live!"), *StreamName);
-		Delegate.ExecuteIfBound(false);
-		return;
+	}
+	else
+	{
+		// Delete the directory with the specified name in the Saved/Demos directory
+		const FString DemoName = GetStreamDirectory(StreamName);
+		if (!FPaths::DirectoryExists(DemoName))
+		{
+			Result.Result = EStreamingOperationResult::ReplayNotFound;
+		}
+		else if (IFileManager::Get().DeleteDirectory(*DemoName, false, true))
+		{
+			Result.Result = EStreamingOperationResult::Success;
+		}
 	}
 
-	// Delete the directory with the specified name in the Saved/Demos directory
-	const FString DemoName = GetStreamDirectory(StreamName);
-
-	const bool DeleteSucceeded = IFileManager::Get().DeleteDirectory( *DemoName, false, true );
-
-	Delegate.ExecuteIfBound(DeleteSucceeded);
+	Delegate.ExecuteIfBound(Result);
 }
 
-void FNullNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate )
+void FNullNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreams(ReplayVersion, FString(), MetaString, ExtraParms, Delegate);
+}
+
+void FNullNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate )
 {
 	EnumerateStreams( ReplayVersion, UserString, MetaString, TArray< FString >(), Delegate );
 }
 
-void FNullNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate )
+void FNullNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate )
 {
 	// Simply returns a stream for each folder in the Saved/Demos directory
-	const FString WildCardPath = GetDemoPath() + TEXT( "*" );
+	const FString WildCardPath = ::GetDemoPath() + TEXT( "*" );
 
 	TArray<FString> DirectoryNames;
 	IFileManager::Get().FindFiles( DirectoryNames, *WildCardPath, false, true );
 
-	TArray<FNetworkReplayStreamInfo> Results;
-
+	FEnumerateStreamsResult Result;
+	
 	for ( const FString& Directory : DirectoryNames )
 	{
 		// Assume there will be one file with a .demo extension in the directory
@@ -348,14 +382,16 @@ void FNullNetworkReplayStreamer::EnumerateStreams( const FNetworkReplayVersion&
 			Info.Name = Directory;
 			Info.Timestamp = IFileManager::Get().GetTimeStamp( *FullDemoFilePath );
 			Info.bIsLive = IsNamedStreamLive( Directory );
+			Info.Changelist = StoredReplayInfo.Changelist;
 			Info.LengthInMS = StoredReplayInfo.LengthInMS;
 			Info.FriendlyName = StoredReplayInfo.FriendlyName;
 
-			Results.Add( Info );
+			Result.FoundStreams.Add( Info );
 		}
 	}
 
-	Delegate.ExecuteIfBound( Results );
+	Result.Result = EStreamingOperationResult::Success;
+	Delegate.ExecuteIfBound( Result );
 }
 
 void FNullNetworkReplayStreamer::AddUserToReplay(const FString& UserString)
@@ -368,19 +404,111 @@ void FNullNetworkReplayStreamer::AddEvent( const uint32 TimeInMS, const FString&
 	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::AddEvent is currently unsupported."));
 }
 
-void FNullNetworkReplayStreamer::EnumerateEvents( const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate )
+void FNullNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
+{
+	EnumerateEvents(Group, Delegate);
+}
+
+void FNullNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	EnumerateEvents(Group, Delegate);
+}
+
+void FNullNetworkReplayStreamer::EnumerateEvents( const FString& Group, const FEnumerateEventsCallback& Delegate )
 {
 	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::EnumerateEvents is currently unsupported."));
+	FEnumerateEventsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
-void FNullNetworkReplayStreamer::RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete)
+void FNullNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData(EventID, Delegate);
+}
+
+void FNullNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	RequestEventData(EventID, Delegate);
+}
+
+void FNullNetworkReplayStreamer::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
 {
 	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::RequestEventData is currently unsupported."));
+	FRequestEventDataResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
-void FNullNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate)
+void FNullNetworkReplayStreamer::SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate)
 {
 	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::SearchEvents is currently unsupported."));
+	FSearchEventsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FNullNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	KeepReplay(ReplayName, bKeep, Delegate);
+}
+
+void FNullNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate)
+{
+	// Replays are kept during streaming so there's no need to explicitly save them.
+	// However, sanity check that what was passed in still exists.
+	FKeepReplayResult Result;
+	if (!FPaths::DirectoryExists(GetStreamDirectory(ReplayName)))
+	{
+		Result.Result = EStreamingOperationResult::ReplayNotFound;
+	}
+	else
+	{
+		Result.Result = EStreamingOperationResult::Success;
+		Result.NewReplayName = ReplayName;
+	}
+
+	Delegate.Execute(Result);
+}
+
+void FNullNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplayFriendlyName(ReplayName, NewFriendlyName, Delegate);
+}
+
+void FNullNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::RenameReplayFriendlyName is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FNullNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplay(ReplayName, NewName, Delegate);
+}
+
+void FNullNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::RenameReplay is currently unsupported."));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
+}
+
+void FNullNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateRecentStreams(ReplayVersion, FString(), Delegate);
+}
+
+void FNullNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate)
+{
+	UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::EnumerateRecentStreams is currently unsupported."));
+
+	FEnumerateStreamsResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.Execute(Result);
 }
 
 FArchive* FNullNetworkReplayStreamer::GetCheckpointArchive()
@@ -430,57 +558,62 @@ void FNullNetworkReplayStreamer::FlushCheckpoint(const uint32 TimeInMS)
 	++CurrentCheckpointIndex;
 }
 
-void FNullNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate)
+void FNullNetworkReplayStreamer::GotoCheckpointIndex(const int32 CheckpointIndex, const FGotoCallback& Delegate)
 {
 	GotoCheckpointIndexInternal(CheckpointIndex, Delegate, -1);
 }
 
-void FNullNetworkReplayStreamer::GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS)
+void FNullNetworkReplayStreamer::GotoCheckpointIndexInternal(int32 CheckpointIndex, const FGotoCallback& Delegate, int32 ExtraTimeInMS)
 {
 	check( FileAr.Get() != nullptr);
 
+	FGotoResult Result;
 	if ( CheckpointIndex == -1 )
 	{
 		// Create a dummy checkpoint archive to indicate this is the first checkpoint
 		CheckpointAr.Reset(new FArchive);
 
 		FileAr->Seek(0);
-		
-		Delegate.ExecuteIfBound( true, TimeInMS );
-		return;
+		Result.ExtraTimeMS = ExtraTimeInMS;
+		Result.Result = EStreamingOperationResult::Success;
 	}
-
-	// Attempt to open the checkpoint file for the given index. Will fail if file doesn't exist.
-	const FString CheckpointFilename = GetCheckpointFilename(CurrentStreamName, CheckpointIndex);
-	CheckpointAr.Reset( IFileManager::Get().CreateFileReader( *CheckpointFilename ) );
-
-	if ( CheckpointAr.Get() == nullptr )
+	else
 	{
-		UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::GotoCheckpointIndex. Index: %i. Couldn't open checkpoint file %s"), CheckpointIndex, *CheckpointFilename);
-		Delegate.ExecuteIfBound( false, TimeInMS );
-		return;
+		// Attempt to open the checkpoint file for the given index. Will fail if file doesn't exist.
+		const FString CheckpointFilename = GetCheckpointFilename(CurrentStreamName, CheckpointIndex);
+		CheckpointAr.Reset(IFileManager::Get().CreateFileReader(*CheckpointFilename));
+
+		if (CheckpointAr.Get() == nullptr)
+		{
+			UE_LOG(LogNullReplay, Log, TEXT("FNullNetworkReplayStreamer::GotoCheckpointIndex. Index: %i. Couldn't open checkpoint file %s"), CheckpointIndex, *CheckpointFilename);
+		}
+		else
+		{
+			Result.ExtraTimeMS = ExtraTimeInMS;
+			Result.Result = EStreamingOperationResult::Success;
+
+			// Open and deserialize the corresponding event, this tells us where we need to seek to
+			// in the main replay file to sync up with the checkpoint we're loading.
+			const FString EventFilename = GetEventFilename(CurrentStreamName, CheckpointIndex);
+			TUniquePtr<FArchive> EventFile(IFileManager::Get().CreateFileReader(*EventFilename));
+			if (EventFile.Get() != nullptr)
+			{
+				FString JsonString;
+				*EventFile << JsonString;
+
+				FNullCheckpointListItem Item;
+				Item.FromJson(JsonString);
+
+				// Reopen, since for live replays the file is being written to and read from simultaneously
+				// and we need the reported file size to be up to date.
+				ReopenStreamFileForReading();
+
+				FileAr->Seek(FCString::Atoi64(*Item.Metadata));
+			}
+		}
 	}
 
-	// Open and deserialize the corresponding event, this tells us where we need to seek to
-	// in the main replay file to sync up with the checkpoint we're loading.
-	const FString EventFilename = GetEventFilename(CurrentStreamName, CheckpointIndex);
-	TUniquePtr<FArchive> EventFile( IFileManager::Get().CreateFileReader(*EventFilename));
-	if (EventFile.Get() != nullptr)
-	{
-		FString JsonString;
-		*EventFile << JsonString;
-
-		FNullCheckpointListItem Item;
-		Item.FromJson(JsonString);
-
-		// Reopen, since for live replays the file is being written to and read from simultaneously
-		// and we need the reported file size to be up to date.
-		ReopenStreamFileForReading();
-
-		FileAr->Seek( FCString::Atoi64( *Item.Metadata ) );
-	}
-
-	Delegate.ExecuteIfBound( true, TimeInMS );
+	Delegate.ExecuteIfBound( Result );
 }
 
 void FNullNetworkReplayStreamer::ReopenStreamFileForReading()
@@ -503,7 +636,7 @@ void FNullNetworkReplayStreamer::UpdateReplayInfoIfValid()
 	}
 }
 
-void FNullNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate)
+void FNullNetworkReplayStreamer::GotoTimeInMS(const uint32 TimeInMS, const FGotoCallback& Delegate)
 {
 	// Enumerate all the events in the events folder, since we need to know what times the checkpoints correlate with
 	TArray<FNullCheckpointListItem> Checkpoints;
@@ -608,6 +741,12 @@ TStatId FNullNetworkReplayStreamer::GetStatId() const
 	RETURN_QUICK_DECLARE_CYCLE_STAT(FNullNetworkReplayStreamer, STATGROUP_Tickables);
 }
 
+EStreamingOperationResult FNullNetworkReplayStreamer::GetDemoPath(FString& DemoPath) const
+{
+	DemoPath = ::GetDemoPath();
+	return EStreamingOperationResult::Success;
+}
+
 IMPLEMENT_MODULE( FNullNetworkReplayStreamingFactory, NullNetworkReplayStreaming )
 
 TSharedPtr< INetworkReplayStreamer > FNullNetworkReplayStreamingFactory::CreateReplayStreamer() 
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Public/NullNetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Public/NullNetworkReplayStreaming.h
index 484316940421..0413ce70d031 100644
--- a/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Public/NullNetworkReplayStreaming.h
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/NullNetworkReplayStreaming/Public/NullNetworkReplayStreaming.h
@@ -44,14 +44,15 @@ public:
 	{}
 	
 	/** INetworkReplayStreamer implementation */
-	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FOnStreamReadyDelegate& Delegate ) override;
+	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< FString >& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
+	virtual void StartStreaming( const FString& CustomName, const FString& FriendlyName, const TArray< int32 >& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate ) override;
 	virtual void StopStreaming() override;
 	virtual FArchive* GetHeaderArchive() override;
 	virtual FArchive* GetStreamingArchive() override;
 	virtual FArchive* GetCheckpointArchive() override;
 	virtual void FlushCheckpoint( const uint32 TimeInMS ) override;
-	virtual void GotoCheckpointIndex( const int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate ) override;
-	virtual void GotoTimeInMS( const uint32 TimeInMS, const FOnCheckpointReadyDelegate& Delegate ) override;
+	virtual void GotoCheckpointIndex( const int32 CheckpointIndex, const FGotoCallback& Delegate ) override;
+	virtual void GotoTimeInMS( const uint32 TimeInMS, const FGotoCallback& Delegate ) override;
 	virtual void UpdateTotalDemoTime( uint32 TimeInMS ) override;
 	virtual uint32 GetTotalDemoTime() const override { return ReplayInfo.LengthInMS; }
 	virtual bool IsDataAvailable() const override;
@@ -59,23 +60,41 @@ public:
 	virtual bool IsDataAvailableForTimeRange( const uint32 StartTimeInMS, const uint32 EndTimeInMS ) override { return true; }
 	virtual bool IsLoadingCheckpoint() const override { return false; }
 	virtual bool IsLive() const override;
-	virtual void DeleteFinishedStream( const FString& StreamName, const FOnDeleteFinishedStreamComplete& Delegate) const override;
-	virtual void EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FOnEnumerateStreamsComplete& Delegate ) override;
-	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FOnEnumerateStreamsComplete& Delegate ) override {}
+	virtual void DeleteFinishedStream( const FString& StreamName, const FDeleteFinishedStreamCallback& Delegate) override;
+	virtual void DeleteFinishedStream( const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateStreams( const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate ) override;
+	virtual void EnumerateRecentStreams( const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate ) override;
 	virtual ENetworkReplayError::Type GetLastError() const override { return ENetworkReplayError::None; }
 	virtual void AddUserToReplay(const FString& UserString) override;
 	virtual void AddEvent(const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data) override;
 	virtual void AddOrUpdateEvent( const FString& Name, const uint32 TimeInMS, const FString& Group, const FString& Meta, const TArray<uint8>& Data ) override {}
-	virtual void EnumerateEvents( const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) override;
-	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCompleteDelegate& EnumerationCompleteDelegate ) override {}
-	virtual void RequestEventData(const FString& EventID, const FOnRequestEventDataComplete& RequestEventDataComplete) override;
-	virtual void SearchEvents(const FString& EventGroup, const FOnEnumerateStreamsComplete& Delegate) override;
-	virtual void KeepReplay( const FString& ReplayName, const bool bKeep ) override {}
+
+	virtual void EnumerateEvents( const FString& Group, const FEnumerateEventsCallback& EnumerationCompleteDelegate ) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& EnumerationCompleteDelegate ) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate ) override;
+
+	virtual void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) override;
+	virtual void SearchEvents(const FString& EventGroup, const FSearchEventsCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
 	virtual FString	GetReplayID() const override { return TEXT( "" ); }
 	virtual void SetTimeBufferHintSeconds(const float InTimeBufferHintSeconds) override {}
 	virtual void RefreshHeader() override {};
-	virtual void DownloadHeader(const FOnDownloadHeaderComplete& Delegate = FOnDownloadHeaderComplete()) override {}
+	virtual void DownloadHeader(const FDownloadHeaderCallback& Delegate) override
+	{
+		FDownloadHeaderResult Result;
+		Result.Result = EStreamingOperationResult::Success;
+		Delegate.Execute(Result);
+	}
 
 	/** FTickableObjectBase implementation */
 	virtual void Tick(float DeltaSeconds) override;
@@ -85,11 +104,20 @@ public:
 	/** FTickableGameObject implementation */
 	virtual bool IsTickableWhenPaused() const override { return true; }
 
+	virtual uint32 GetMaxFriendlyNameSize() const override { return 0; }
+
+	virtual EStreamingOperationResult SetDemoPath(const FString& DemoPath) override
+	{
+		return EStreamingOperationResult::Unsupported;
+	}
+
+	virtual EStreamingOperationResult GetDemoPath(FString& DemoPath) const override;
+
 private:
 	bool IsNamedStreamLive( const FString& StreamName ) const;
 
 	/** Handles the details of loading a checkpoint */
-	void GotoCheckpointIndexInternal(int32 CheckpointIndex, const FOnCheckpointReadyDelegate& Delegate, int32 TimeInMS);
+	void GotoCheckpointIndexInternal(int32 CheckpointIndex, const FGotoCallback& Delegate, int32 TimeInMS);
 
 	/** Reopen the file to refresh it's size, since file-based FArchives do not appear to update their size if they're being written to. */
 	void ReopenStreamFileForReading();
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Private/SaveGameNetworkReplayStreaming.cpp b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Private/SaveGameNetworkReplayStreaming.cpp
new file mode 100644
index 000000000000..227883b0675e
--- /dev/null
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Private/SaveGameNetworkReplayStreaming.cpp
@@ -0,0 +1,1725 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "SaveGameNetworkReplayStreaming.h"
+#include "Misc/Paths.h"
+#include "PlatformFeatures.h"
+#include "SaveGameSystem.h"
+#include "Serialization/MemoryReader.h"
+#include "Serialization/MemoryWriter.h"
+#include "Logging/LogMacros.h"
+#include "HAL/IConsoleManager.h"
+#include "Async/Async.h"
+#include "Tickable.h"
+#include "Misc/NetworkVersion.h"
+#include "GameDelegates.h"
+#include "Engine/World.h"
+#include "Engine/Engine.h"
+#include "Engine/LocalPlayer.h"
+#include "GameFramework/PlayerController.h"
+
+DEFINE_LOG_CATEGORY_STATIC(LogSaveGameReplay, Log, All);
+
+TAutoConsoleVariable<FString> CVarSaveGameFilterEventGroup(
+	TEXT("demo.SaveGameEventFilter"),
+	FString(),
+	TEXT("When set to a non-empty string, only replay events in the specified group will be saved to header meta-data.")
+);
+
+static const FString SaveReplayExt(TEXT(".sav_rep"));
+#define ReplaySaveFileFormat TEXT("rep_%d.sav_rep")
+#define ReplayMetaSaveFileFormat TEXT("repmet_%d.sav_rep")
+
+namespace SaveGameReplay
+{
+	enum ESaveGameHeaderVersionHistory : uint32
+	{
+		HISTORY_INITIAL = 0,
+		HISTORY_EVENTS = 1,
+
+		// -----<new versions can be added before this line>-------------------------------------------------
+		HISTORY_PLUS_ONE,
+		HISTORY_LATEST = HISTORY_PLUS_ONE - 1
+	};
+
+	typedef FSaveGameNetworkReplayStreamer FStreamer;
+
+	template<typename TResult>
+	struct TAsyncTypes
+	{
+		typedef TSharedPtr<TResult, ESPMode::ThreadSafe> TSharedResult;
+
+		typedef TFunction<TSharedResult()> TAsyncFunc;
+		typedef TFunction<void(const TResult& Result)> TPostAsyncFunc;
+
+		static TSharedResult MakeSharedResult()
+		{
+			// Can't directly use MakeShared here because there's no version that taks ESPMode properly.
+			return TSharedResult(new TResult());
+		}
+	};
+
+	bool IsSaveGameFileName(const FString& ReplayName)
+	{
+		return ReplayName.EndsWith(SaveReplayExt);
+	}
+
+	int32 GetReplayIndexFromName(const FString& ReplayName)
+	{
+		// Validate it's an appropriate save name and Grab the replay index.
+		// The replay index should be immediately before the replay extension, and immediately after the last underscore
+		// in the replay name. So, we can inspect that part of the replay and convert it to an int to determine the index.
+		if (ensureMsgf(IsSaveGameFileName(ReplayName), TEXT("GetReplayIndexFromName called with non-save name %s"), *ReplayName))
+		{
+			const int32 EndIndexPos = ReplayName.Len() - SaveReplayExt.Len();
+			if (EndIndexPos > 0)
+			{
+				const int32 StartIndexPos = ReplayName.Find(TEXT("_"), ESearchCase::CaseSensitive, ESearchDir::FromEnd, EndIndexPos) + 1;
+				if (StartIndexPos > 0 && EndIndexPos > StartIndexPos)
+				{
+					int32 ReplayIndex = 0;
+					if (LexTryParseString(ReplayIndex, *ReplayName.Mid(StartIndexPos, EndIndexPos - StartIndexPos)))
+					{
+						return ReplayIndex;
+					}
+				}
+			}
+		}
+
+		return INDEX_NONE;
+	}
+
+	class FAsyncTaskManager : private FTickableGameObject
+	{
+	private:
+
+		class FAsyncTaskBase
+		{
+		public:
+
+			FAsyncTaskBase(const FStreamer& OwningStreamer, const FString& InDescription) :
+				StreamerSharedRef(OwningStreamer.AsShared()),
+				Description(InDescription)
+			{
+			}
+
+			virtual ~FAsyncTaskBase() {}
+
+			virtual bool HasFinished() const = 0;
+
+			virtual void Finalize() = 0;
+
+			const FString& GetDescription()
+			{
+				return Description;
+			}
+
+		private:
+
+			// We hold onto a reference of the streamer to make sure it stays alive long enough
+			// to complete this task.
+			const TSharedRef<const FLocalFileNetworkReplayStreamer> StreamerSharedRef;
+			const FString Description;
+		};
+
+		template<typename TResult>
+		class TAsyncTask : public FAsyncTaskBase
+		{
+		public:
+
+			typedef typename TAsyncTypes<TResult>::TSharedResult TSharedResult;
+			typedef typename TAsyncTypes<TResult>::TAsyncFunc TAsyncFunc;
+			typedef typename TAsyncTypes<TResult>::TPostAsyncFunc TPostAsyncFunc;
+
+			TAsyncTask(const FStreamer& OwningStreamer, const FString& Description, TAsyncFunc InAsyncWork, TPostAsyncFunc InPostAsyncWork) :
+				FAsyncTaskBase(OwningStreamer, Description),
+				Future(Async(EAsyncExecution::Thread, InAsyncWork)),
+				PostAsyncWork(InPostAsyncWork)
+			{
+			}
+
+			virtual bool HasFinished() const
+			{
+				return Future.IsReady();
+			}
+
+			virtual void Finalize() override
+			{
+				PostAsyncWork(*Future.Get().Get());
+			}
+
+			TFuture<TSharedResult> Future;
+			TPostAsyncFunc PostAsyncWork;
+		};
+
+	public:
+
+		static FAsyncTaskManager& Get()
+		{
+			static FAsyncTaskManager TaskManager;
+			return TaskManager;
+		}
+
+		template<typename TResult>
+		void StartTask(const FStreamer& OwningStreamer, const FString& Description, typename TAsyncTypes<TResult>::TAsyncFunc InAsyncWork, typename TAsyncTypes<TResult>::TPostAsyncFunc InPostAsyncWork)
+		{
+			if (ensureMsgf(IsInGameThread(), TEXT("SaveGameReplay::FAsyncTaskManager::StartTask - Called from outside the GameThread.")))
+			{
+				if (AreAnyTasksOutstanding())
+				{
+					UE_LOG(LogSaveGameReplay, Warning, TEXT("SaveGameReplay::FAsyncTaskManager::StartTask - New task attempted while processing pending task (NewTask = %s PendingTask = %s)"), *Description, *(OutstandingTask->GetDescription()));
+
+					TResult Result;
+					Result.Result = EStreamingOperationResult::UnfinishedTask;
+					InPostAsyncWork(Result);
+				}
+				else
+				{
+					OutstandingTask = MakeUnique<TAsyncTask<TResult>>(OwningStreamer, Description, InAsyncWork, InPostAsyncWork);
+				}
+			}
+		}
+
+		const bool AreAnyTasksOutstanding() const
+		{
+			return OutstandingTask.IsValid();
+		}
+
+	private:
+
+		FAsyncTaskManager() {}
+		~FAsyncTaskManager() {}
+		FAsyncTaskManager(const FAsyncTaskManager&) = delete;
+
+		virtual void Tick(float DeltaTime) override
+		{
+			if (OutstandingTask.IsValid() && OutstandingTask->HasFinished())
+			{
+				// Transfer ownership so the OutstandingTask is cleared, but still temporarily alive.
+				// This will allow us to start new tasks / check state appropriately from Finalize.
+				TUniquePtr<FAsyncTaskBase> LocalTask(OutstandingTask.Release());
+				LocalTask->Finalize();
+			}
+		}
+
+		virtual bool IsTickable() const override
+		{
+			return OutstandingTask.IsValid();
+		}
+
+		/** return the stat id to use for this tickable **/
+		virtual TStatId GetStatId() const override
+		{
+			RETURN_QUICK_DECLARE_CYCLE_STAT(SaveGameReplayAsyncTaskManager, STATGROUP_Tickables);
+		}
+
+		TUniquePtr<FAsyncTaskBase> OutstandingTask;
+	};
+
+	class FSaveGameReplayMoveFileHelper
+	{
+	private:
+
+		FSaveGameReplayMoveFileHelper() = delete;
+		~FSaveGameReplayMoveFileHelper() = delete;
+
+		struct FMoveContext
+		{
+			FMoveContext(const TSharedPtr<INetworkReplayStreamer>& InStreamer, const FString& InSourceDirectory, const FString& InDestinationDirectory, const int32 InUserIndex) :
+				Streamer(InStreamer),
+				SourceDirectory(InSourceDirectory),
+				DestinationDirectory(InDestinationDirectory),
+				UserIndex(InUserIndex)
+			{
+			}
+
+			const TSharedPtr<INetworkReplayStreamer> Streamer;
+			const FString SourceDirectory;
+			const FString DestinationDirectory;
+
+			// It's usually not safe to cache user indices, but this is a development only feature so it's probably OK.
+			// If this gets co-opted for non-dev stuff at some point, maybe consider a weak ptr to the ULocalPlayer that issued the request.
+			const int32 UserIndex;
+		};
+
+		static void RunCommand(const TArray<FString>& Params, const TFunction<void(const TSharedPtr<INetworkReplayStreamer>&, const FString&, const int32)> CommandToRun)
+		{
+			const TCHAR* StreamerOverride = nullptr;
+			if (Params.Num() == 1)
+			{
+				StreamerOverride = *Params[0];
+			}
+			else if (Params.Num() != 0)
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper commands take either a Streamer Override or no arguments."));
+				return;
+			}
+
+			// Note, RTTI is disabled by default so there's no way to tell what the actual streamer type is (without embedding it ourselves).
+			// Therefore, just assume that if the streamer is valid and supports local file operations, that this will work.
+			// This should be fine, because the Console Commands shouldn't be available unless the SaveGameStreamer module is linked anyway.
+			// (Note, we could move the commands to Module startup / shutdown which would guarantee that the module was actually loaded, and not just linked).
+			TSharedPtr<INetworkReplayStreamer> Streamer = FNetworkReplayStreaming::Get().GetFactory(StreamerOverride).CreateReplayStreamer();
+
+			if (ensureMsgf(Streamer.IsValid(), TEXT("FSaveGameReplayMoveFileHelper Invalid local streamer")))
+			{
+				FString DemoPath;
+				if (ensureMsgf(EStreamingOperationResult::Success == Streamer->GetDemoPath(DemoPath), TEXT("FSaveGameReplayMoveFileHelper Streamer not supported.")))
+				{
+					const int32 UserIndex = GetFirstPlayerIndex();
+					if (ensureMsgf(INDEX_NONE != UserIndex, TEXT("FSaveGameReplayMoveFileHelper Unable to get UserIndex")))
+					{
+						CommandToRun(Streamer, DemoPath, UserIndex);
+					}
+				}
+			}
+		}
+
+		static int32 GetFirstPlayerIndex()
+		{
+			if (GEngine)
+			{
+				if (UWorld* World = GWorld.GetReference())
+				{
+					if (APlayerController* Controller = GEngine->GetFirstLocalPlayerController(World))
+					{
+						if (ULocalPlayer* Player = Controller->GetLocalPlayer())
+						{
+							return Player->GetControllerId();
+						}
+					}
+				}
+			}
+
+			return INDEX_NONE;
+		}
+
+		static void SanitizeUnsavedNames(const TArray<FString>& Params)
+		{
+			RunCommand(Params, [](const TSharedPtr<INetworkReplayStreamer>& Streamer, const FString& DemoPath, const int32 UserIndex)
+			{
+				FSaveGameReplayMoveFileHelper::SanitizeNames(DemoPath);
+			});
+		}
+
+		static void ImportReplayFiles(const TArray<FString>& Params)
+		{
+			RunCommand(Params, [](const TSharedPtr<INetworkReplayStreamer>& Streamer, const FString& DemoPath, const int32 UserIndex)
+			{
+				FSaveGameReplayMoveFileHelper::MoveFilesFromTemp(DemoPath, UserIndex);
+			});
+		}
+
+		static void ExportReplayFiles(const TArray<FString>& Params)
+		{
+			RunCommand(Params, [](const TSharedPtr<INetworkReplayStreamer>& Streamer, const FString& DemoPath, const int32 UserIndex)
+			{
+				FSaveGameReplayMoveFileHelper::MoveFilesToTemp(Streamer, DemoPath, UserIndex);
+			});
+		}
+
+		static void SanitizeNames(const FString& DemoPath)
+		{
+			IFileManager& FileManager = IFileManager::Get();
+
+			const FString WildCard(FPaths::Combine(DemoPath, FString::Printf(TEXT("*%s.replay"), *SaveReplayExt)));
+			TArray<FString> FoundFiles;
+
+			FileManager.FindFiles(FoundFiles, *WildCard, /*bFiles=*/true, /*bDirectories=*/false);
+
+			for (const FString& CurrentName : FoundFiles)
+			{
+				UE_LOG(LogSaveGameReplay, Log, TEXT("FSaveGameMoveFileHelper::SanitizeNames - Handling %s"), *CurrentName);
+
+				FString NewName(CurrentName);
+				NewName.RemoveFromEnd(TEXT(".replay"));
+				MakeUniqueReplayName(NewName);
+
+				if (!FileManager.Move(*FPaths::Combine(DemoPath, NewName), *FPaths::Combine(DemoPath, CurrentName)))
+				{
+					UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::SanitizeNames - Failed to sanitize %s"), *CurrentName);
+				}
+			}
+		}
+
+		static void MakeUniqueReplayName(FString& Name)
+		{
+			IFileManager& FileManager = IFileManager::Get();
+
+			// Make sure to sanitize this so the system doesn't get tricked into thinking this is a saved replay.
+			// Note, this may still happen if the usually manually entered this...
+			Name.RemoveFromEnd(SaveReplayExt);
+
+			int32 Index = 1;
+			FString UseName = FString::Printf(TEXT("%s.replay"), *Name);
+			while (FileManager.FileExists(*UseName))
+			{
+				UseName = FString::Printf(TEXT("%s - %d.replay"), *Name, ++Index);
+			}
+
+			Name = MoveTemp(UseName);
+		}
+
+		static void MoveFilesInternal(const TSharedPtr<FMoveContext>& Context)
+		{
+			Context->Streamer->EnumerateStreams(FNetworkReplayVersion(), Context->UserIndex, FString(), TArray<FString>(), FEnumerateStreamsCallback::CreateStatic(FSaveGameReplayMoveFileHelper::OnEnumerateStreamsComplete, Context));
+		}
+
+		static void MoveFilesInternal_PostEnumerate(const TSharedPtr<FMoveContext>& Context)
+		{
+			Context->Streamer->EnumerateRecentStreams(FNetworkReplayVersion(), Context->UserIndex, FEnumerateStreamsCallback::CreateStatic(FSaveGameReplayMoveFileHelper::OnEnumerateRecentStreamsComplete, Context));
+		}
+
+		static void CopyFile(const TSharedPtr<FMoveContext>& Context, const FString& BaseFileName)
+		{
+			const FString SourceFileName = FPaths::Combine(Context->SourceDirectory, BaseFileName) + ".replay";
+
+			FString DestinationFileName = FPaths::Combine(Context->DestinationDirectory, BaseFileName);
+			MakeUniqueReplayName(DestinationFileName);
+
+			const uint32 Result = IFileManager::Get().Copy(*DestinationFileName, *SourceFileName);
+			if (0 != Result)
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::CopyFile: Failed - from '%s' to '%s' error = %lu"), *SourceFileName, *DestinationFileName, Result);
+			}
+
+			UE_LOG(LogSaveGameReplay, Log, TEXT("FSaveGameMoveFileHelper::CopyFile: Result = %d"), Result);
+		}
+
+		static void SaveFile(const TSharedPtr<FMoveContext>& Context, const FString& SaveGameName, ISaveGameSystem* SaveGameSystem)
+		{
+			TArray<uint8> SaveData;
+			if (!SaveGameSystem->LoadGame(false, *SaveGameName, Context->UserIndex, SaveData))
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::SaveFile: Failed to load save game %s"), *SaveGameName)
+					return;
+			}
+
+			FString DestinationFileName = FPaths::Combine(Context->DestinationDirectory, SaveGameName);
+			MakeUniqueReplayName(DestinationFileName);
+
+			TUniquePtr<FArchive> FileAR(IFileManager::Get().CreateFileWriter(*DestinationFileName));
+			FileAR->Serialize(SaveData.GetData(), SaveData.Num());
+
+			if (FileAR->IsError())
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::SaveFile: Failed to save game %s to %s"), *SaveGameName, *DestinationFileName);
+			}
+		}
+
+		static void OnEnumerateStreamsComplete(const FEnumerateStreamsResult& Result, const TSharedPtr<FMoveContext> Context)
+		{
+			UE_LOG(LogSaveGameReplay, Log, TEXT("FSaveGameReplayMoveFileHelper::OnEnumerateStreamsComplete: Success=%s NumFiles=%d"), *(Result.WasSuccessful() ? GTrue : GFalse).ToString(), Result.FoundStreams.Num());
+
+			if (Result.WasSuccessful())
+			{
+				if (Result.FoundStreams.Num() > 0)
+				{
+					if (IsSaveGameFileName(Result.FoundStreams[0].Name))
+					{
+						if (ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem())
+						{
+							for (const FNetworkReplayStreamInfo& StreamInfo : Result.FoundStreams)
+							{
+								SaveFile(Context, StreamInfo.Name, SaveGameSystem);
+							}
+						}
+						else
+						{
+							UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::OnEnumerateRecentStreamsComplete: Unable to get SaveGameSystem"));
+						}
+					}
+					else
+					{
+						for (const FNetworkReplayStreamInfo& StreamInfo : Result.FoundStreams)
+						{
+							CopyFile(Context, StreamInfo.Name);
+						}
+					}
+				}
+			}
+			else
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::OnEnumerateRecentStreamsComplete: Enumerate failed"));
+			}
+
+			MoveFilesInternal_PostEnumerate(Context);
+		}
+
+		static void OnEnumerateRecentStreamsComplete(const FEnumerateStreamsResult& Result, const TSharedPtr<FMoveContext> Context)
+		{
+			if (Result.WasSuccessful())
+			{
+				// Currently, the LocalFileStreamer doesn't support EnumerateRecentStreams
+				// and the SaveGameStreamer will just return non-Saved replays.
+				for (const FNetworkReplayStreamInfo& StreamInfo : Result.FoundStreams)
+				{
+					CopyFile(Context, StreamInfo.Name);
+				}
+			}
+			else
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameMoveFileHelper::OnEnumerateRecentStreamsComplete: Enumerate failed"))
+			}
+		}
+
+		static FString& GetTempDemoDirectory()
+		{
+			static FString TempDemoDir = FPaths::Combine(FPaths::ProjectLogDir(), TEXT("Demos/"));
+			return TempDemoDir;
+		}
+
+		static void MoveFilesLocalInternal(const TSharedPtr<FMoveContext>& MoveContext)
+		{
+			TArray<FString> ReplayFiles;
+			IFileManager::Get().FindFiles(ReplayFiles, *MoveContext->SourceDirectory, TEXT(".replay"));
+
+			for (FString& ReplayFileName : ReplayFiles)
+			{
+				ReplayFileName.RemoveFromEnd(TEXT(".replay"));
+				CopyFile(MoveContext, ReplayFileName);
+			}
+		}
+
+	public:
+
+		static void MoveFiles(const TSharedPtr<INetworkReplayStreamer>& Streamer, const FString& DestinationDirectory, const FString& SourceDirectory, const int32 UserIndex)
+		{
+			UE_LOG(LogSaveGameReplay, Log, TEXT("FSaveGameReplayMoveFileHelper::MoveFiles: Moving files from %s to %s"), *FPaths::ConvertRelativePathToFull(SourceDirectory), *FPaths::ConvertRelativePathToFull(DestinationDirectory));
+
+			MoveFilesInternal(MakeShareable(new FMoveContext(Streamer, SourceDirectory, DestinationDirectory, UserIndex)));
+		}
+
+		static void MoveFilesToTemp(const TSharedPtr<INetworkReplayStreamer>& Streamer, const FString& SourceDirectory, const int32 UserIndex)
+		{
+			MoveFiles(Streamer, GetTempDemoDirectory(), SourceDirectory, UserIndex);
+		}
+
+		static void MoveFilesFromTemp(const FString& DestinationDirectory, const int32 UserIndex)
+		{
+			TSharedPtr<FMoveContext> MoveContext(MakeShareable(new FMoveContext(nullptr, GetTempDemoDirectory(), DestinationDirectory, UserIndex)));
+			MoveFilesLocalInternal(MoveContext);
+		}
+
+	private:
+
+		static FAutoConsoleCommand ImportReplayFilesCommand;
+		static FAutoConsoleCommand ExportReplayFilesCommand;
+		static FAutoConsoleCommand SanitizedUnsavedNamesCommand;
+	};
+
+	FAutoConsoleCommand FSaveGameReplayMoveFileHelper::ImportReplayFilesCommand(
+		TEXT("SaveGameStreamerImportReplays"),
+		TEXT("Imports replays from the default demo path in FLocalFileNetworkReplayStreamer into the default demo path from FSaveGameNetworkReplayStreamer."),
+		FConsoleCommandWithArgsDelegate::CreateStatic(&FSaveGameReplayMoveFileHelper::ImportReplayFiles)
+	);
+
+	FAutoConsoleCommand FSaveGameReplayMoveFileHelper::ExportReplayFilesCommand(
+		TEXT("SaveGameStreamerExportReplays"),
+		TEXT("Exports replays from both the default demo path and saved demo path in FSaveGameNetworkReplayStreamer and copies them to the default demo path in FSaveGameNetworkReplayStreamer."),
+		FConsoleCommandWithArgsDelegate::CreateStatic(&FSaveGameReplayMoveFileHelper::ExportReplayFiles)
+	);
+
+	FAutoConsoleCommand FSaveGameReplayMoveFileHelper::SanitizedUnsavedNamesCommand(
+		TEXT("SaveGameStreamerSanitizedUnsavedNames"),
+		TEXT("Removes the 'saved replay' postfix from any unsaved replays. This can be used to fix issues where saved replays become unusable after exporting and reimporting."),
+		FConsoleCommandWithArgsDelegate::CreateStatic(&FSaveGameReplayMoveFileHelper::SanitizeUnsavedNames)
+	);
+
+	struct FScopedBindExtendedSaveDelegate
+	{
+		typedef TFunction<bool(const TCHAR*, EGameDelegates_SaveGame, FString&)> FDelegateFunction;
+
+		FScopedBindExtendedSaveDelegate(FDelegateFunction Func) :
+			Function(Func)
+		{
+			FExtendedSaveGameInfoDelegate& ExtendedSaveGameInfoDelegate = FGameDelegates::Get().GetExtendedSaveGameInfoDelegate();
+
+			if (ExtendedSaveGameInfoDelegate.IsBound())
+			{
+				OldDelegate = ExtendedSaveGameInfoDelegate;
+			}
+
+			ExtendedSaveGameInfoDelegate.BindRaw(this, &FScopedBindExtendedSaveDelegate::Execute);
+			Handle = ExtendedSaveGameInfoDelegate.GetHandle();
+		}
+
+		~FScopedBindExtendedSaveDelegate()
+		{
+			FExtendedSaveGameInfoDelegate& ExtendedSaveGameInfoDelegate = FGameDelegates::Get().GetExtendedSaveGameInfoDelegate();
+			
+			if (ensureMsgf(Handle == ExtendedSaveGameInfoDelegate.GetHandle(), TEXT("FScopedBindExtendedSaveDelegate: Delegate binding was changed within scope lifecycle.")) &&
+				OldDelegate.IsSet() && OldDelegate->IsBound())
+			{
+				ExtendedSaveGameInfoDelegate = OldDelegate.GetValue();
+			}
+			else
+			{
+				ExtendedSaveGameInfoDelegate.Unbind();
+			}
+		}
+
+		void Execute(const TCHAR* FileName, EGameDelegates_SaveGame Option, FString& OptionValue)
+		{
+			if (!Function(FileName, Option, OptionValue) && OldDelegate.IsSet())
+			{
+				OldDelegate->ExecuteIfBound(FileName, Option, OptionValue);
+			}
+		}
+
+	private:
+
+		FScopedBindExtendedSaveDelegate(const FScopedBindExtendedSaveDelegate&) = delete;
+		FScopedBindExtendedSaveDelegate(FScopedBindExtendedSaveDelegate&&) = delete;
+
+		FDelegateFunction Function;
+		TOptional<FExtendedSaveGameInfoDelegate> OldDelegate;
+		FDelegateHandle Handle;
+	};
+}
+
+struct FConstConsoleVars
+{
+	static const int32 GetMaxNumReplaySlots()
+	{
+		return MaxNumReplaySlots;
+	}
+
+private:
+
+	static int32 MaxNumReplaySlots;
+	static FAutoConsoleVariableRef CVarMaxNumReplaySlots;
+};
+
+int32 FConstConsoleVars::MaxNumReplaySlots = 10;
+FAutoConsoleVariableRef FConstConsoleVars::CVarMaxNumReplaySlots( TEXT("demo.MaxNumReplaySlots"), FConstConsoleVars::MaxNumReplaySlots, TEXT("Maximum number of save slots to consider when using the FSaveGameNetworkReplayStreamer"));
+
+static void PopulateStreamingResultFromSaveExistsResult(const ISaveGameSystem::ESaveExistsResult SaveExistsResult, FStreamingResultBase& StreamingResult)
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	if (ESaveExistsResult::Corrupt == SaveExistsResult)
+	{
+		StreamingResult.Result = EStreamingOperationResult::ReplayCorrupt;
+	}
+	else if (ESaveExistsResult::DoesNotExist == SaveExistsResult)
+	{
+		StreamingResult.Result = EStreamingOperationResult::ReplayNotFound;
+	}
+	else if (ESaveExistsResult::OK == SaveExistsResult)
+	{
+		StreamingResult.Result = EStreamingOperationResult::Success;
+	}
+	else
+	{
+		StreamingResult.Result = EStreamingOperationResult::Unspecified;
+	}
+}
+
+FSaveGameNetworkReplayStreamer::FSaveGameNetworkReplayStreamer() :
+	FLocalFileNetworkReplayStreamer(GetDefaultDemoSavePath()),
+	PlaybackReplayName(GetDefaultPlaybackName())
+{
+}
+
+FSaveGameNetworkReplayStreamer::FSaveGameNetworkReplayStreamer(const FString& InDemoPath, const FString& InPlaybackReplayName) :
+	FLocalFileNetworkReplayStreamer(InDemoPath),
+	PlaybackReplayName(ensureMsgf(!InPlaybackReplayName.IsEmpty(), TEXT("FSaveGameNetworkReplayStreamer: InPlaybackReplayName was empty, using default.")) ? InPlaybackReplayName : GetDefaultPlaybackName())
+{
+}
+
+void FSaveGameNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	if (!IsSaveGameFileName(CustomName))
+	{
+		FLocalFileNetworkReplayStreamer::StartStreaming(CustomName, FriendlyName, UserIndices, bRecord, ReplayVersion, Delegate);
+	}
+	else if (UserIndices.Num() > 0 && UserIndices[0] != INDEX_NONE)
+	{
+		StartStreamingSaved(CustomName, FriendlyName, UserIndices, bRecord, ReplayVersion, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming - Invalid UserIndex"));
+		Delegate.ExecuteIfBound(FStartStreamingResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<FString>& UserStrings, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	// If we're not handling a SaveFile directly, then just do normal streaming behavior.
+	if (!IsSaveGameFileName(CustomName))
+	{
+		FLocalFileNetworkReplayStreamer::StartStreaming(CustomName, FriendlyName, UserStrings, bRecord, ReplayVersion, Delegate);
+	}
+	else if (UserStrings.Num() > 0 && !UserStrings[0].IsEmpty())
+	{
+		TArray<int32> UserIndices;
+		GetUserIndicesFromUserStrings(UserStrings, UserIndices);
+		StartStreaming(CustomName, FriendlyName, UserIndices, bRecord, ReplayVersion, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming - Invalid UserString"));
+		Delegate.ExecuteIfBound(FStartStreamingResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::StartStreamingSaved(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate)
+{
+	// We should only hit this path if we're playing back a replay.
+	check(!bRecord);
+
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FStartStreamingResult>;
+
+	auto AsyncWork = [this, CustomName, UserIndices, ReplayVersion]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		StartStreaming_Internal(CustomName, FString(), UserIndices, false, ReplayVersion, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	auto PostAsyncWork = [this, UserIndices, ReplayVersion, Delegate](const FStartStreamingResult& Result)
+	{
+		if (Result.WasSuccessful())
+		{
+			FLocalFileNetworkReplayStreamer::StartStreaming(GetLocalPlaybackName(), FString(), UserIndices, false, ReplayVersion, Delegate);
+		}
+		else
+		{
+			Delegate.ExecuteIfBound(Result);
+		}
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FStartStreamingResult>(*this, TEXT("StartStreaming"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::StartStreaming_Internal(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, FStartStreamingResult& Result)
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	Result.bRecording = bRecord;
+
+	// Make sure the save game system is available.
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming: Unable to retrieve save game system")))
+	{
+		return;
+	}
+
+	if (bRecord)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming: Cannot record directly to a save game, use KeepReplay() instead."));
+		return;
+	}
+
+	const int32 UserIndex = UserIndices.Num() > 0 ? UserIndices[0] : INDEX_NONE;
+
+	// Make sure that the file actually exists.
+	const ESaveExistsResult SaveExistsResult = SaveGameSystem->DoesSaveGameExistWithResult(*CustomName, UserIndex);
+	if (SaveExistsResult != ESaveExistsResult::OK)
+	{
+		PopulateStreamingResultFromSaveExistsResult(SaveExistsResult, Result);
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming: Replay does not exist or is invalid."));
+		return;
+	}
+
+	// Try to load the data.
+	TArray<uint8> ReplayData;
+	if (!SaveGameSystem->LoadGame(/*bAttemptToUseUI=*/false, *CustomName, UserIndex, ReplayData))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming: Failed to load replay data."));
+		return;
+	}
+
+	// Copy the data over to the playback slot.
+	TSharedPtr<FArchive> CopyAr = CreateLocalFileWriterForOverwrite(GetFullPlaybackName());
+	if (CopyAr.IsValid())
+	{
+		CopyAr->Serialize(ReplayData.GetData(), ReplayData.Num());
+	}
+
+	if (!CopyAr.IsValid() || CopyAr->IsError())
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StartStreaming: Failed to copy replay to local file."));
+		return;
+	}
+
+	Result.Result = EStreamingOperationResult::Success;
+}
+
+void FSaveGameNetworkReplayStreamer::DeleteFinishedStream(const FString& ReplayName, const FDeleteFinishedStreamCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::DeleteFinishedStream(ReplayName, INDEX_NONE, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::DeleteFinishedStream - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FDeleteFinishedStreamResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::DeleteFinishedStream(const FString& ReplayName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate)
+{
+	// If we're not handling a SaveFile directly, then just do normal streaming behavior.
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::DeleteFinishedStream(ReplayName, UserIndex, Delegate);
+	}
+	else if (UserIndex != INDEX_NONE)
+	{
+		DeleteFinishedStreamSaved(ReplayName, UserIndex, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::DeleteFinishedStream - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FDeleteFinishedStreamResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::DeleteFinishedStreamSaved(const FString& ReplayName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate) const
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FDeleteFinishedStreamResult>;
+
+	auto AsyncWork = [this, ReplayName, UserIndex]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		DeleteFinishedStream_Internal(ReplayName, UserIndex, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	auto PostAsyncWork = [Delegate](const FDeleteFinishedStreamResult& Result)
+	{
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FDeleteFinishedStreamResult>(*this, TEXT("DeleteFinishedStream"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::DeleteFinishedStream_Internal(const FString& InReplayName, const int32 UserIndex, FDeleteFinishedStreamResult& Result) const
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::DeleteFinishedStream: Unable to retrieve save game systems")))
+	{
+		return;
+	}
+
+	FSaveGameSanitizedNames SanitizedNames;
+	if (!StreamNameToSanitizedNames(InReplayName, SanitizedNames))
+	{
+		return;
+	}
+
+	const FString& ReplayMetaName = SanitizedNames.ReplayMetaName;
+	const FString& ReplayName = SanitizedNames.ReplayName;
+
+	// Do a quick sanity check to make sure the passed in name is a valid meta or replay name.
+	const bool bIsMetaName = ReplayMetaName.Equals(InReplayName);
+	const bool bIsReplayName = ReplayName.Equals(InReplayName);
+	if (!bIsMetaName && !bIsReplayName)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::DeleteFinishedStream: Invalid Replay name %s"), *InReplayName);
+		Result.Result = EStreamingOperationResult::ReplayNotFound;
+		return;
+	}
+
+	bool bDeletedMeta = SaveGameSystem->DeleteGame(/*bAttemptToUseUI=*/false, *ReplayMetaName, UserIndex);
+	bool bDeletedReplay = SaveGameSystem->DeleteGame(/*bAttemptToUseUI=*/false, *ReplayName, UserIndex);
+
+	// If we failed to delete a replay, just make sure they don't actually exist on the system anymore.
+	if (!bDeletedMeta)
+	{
+		bDeletedMeta = (SaveGameSystem->DoesSaveGameExistWithResult(*ReplayMetaName, UserIndex) == ESaveExistsResult::DoesNotExist);
+	}
+	if (!bDeletedReplay)
+	{
+		bDeletedReplay = (SaveGameSystem->DoesSaveGameExistWithResult(*ReplayName, UserIndex) == ESaveExistsResult::DoesNotExist);
+	}
+
+	if (!bDeletedMeta || !bDeletedReplay)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::DeleteFinishedStream: Unable to delete replay or metadata %s (meta deleted = %d, replay deleted = %d)"), *InReplayName, bDeletedMeta, bDeletedReplay);
+		return;
+	}
+
+	Result.Result = EStreamingOperationResult::Success;
+}
+
+void FSaveGameNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate)
+{
+	UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay - Invalid UserIndex."));
+	Delegate.ExecuteIfBound(FKeepReplayResult());
+}
+
+void FSaveGameNetworkReplayStreamer::KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	KeepReplaySaved(ReplayName, bKeep, UserIndex, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::KeepReplaySaved(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate)
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FKeepReplayResult>;
+	using FScopedSaveGameDelegate = SaveGameReplay::FScopedBindExtendedSaveDelegate;
+
+	if (UserIndex == INDEX_NONE)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FKeepReplayResult());
+		return;
+	}
+
+	auto AsyncWork = [this, ReplayName, bKeep, UserIndex]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		KeepReplay_Internal(ReplayName, bKeep, UserIndex, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	TSharedPtr<FScopedSaveGameDelegate> ScopedBindExtendedSaveDelegate = MakeShareable<FScopedSaveGameDelegate>(new FScopedSaveGameDelegate(WrapGetSaveGameOption()));
+	auto PostAsyncWork = [Delegate, ScopedBindExtendedSaveDelegate](const FKeepReplayResult& Result) mutable
+	{
+		// Want to release the delegate before sending the result, in case another event is triggered.
+		ScopedBindExtendedSaveDelegate.Reset();
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FKeepReplayResult>(*this, TEXT("KeepReplay"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::KeepReplay_Internal(const FString& ReplayName, const bool bKeep, const int32 UserIndex, FKeepReplayResult& Result)
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Unable to retrieve save game systems")))
+	{
+		return;
+	}
+
+	if (IsSaveGameFileName(ReplayName))
+	{
+		// TODO: Maybe we should see whether or not the replay already exists, and change status accordingly?
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Requested to keep an already kept replay %s"), *ReplayName);
+		return;
+	}
+
+	// Don't go through the process of saving, because the caller told us not to keep it.
+	// Note, this is explicitly done after we check the save game system and name to propagate
+	// those usage errors early.
+	if (!bKeep)
+	{
+		Result.Result = EStreamingOperationResult::Success;
+		Result.NewReplayName = ReplayName;
+		return;
+	}
+
+	// Make sure the path still exists.
+	const FString FullDemoFileName = GetDemoFullFilename(ReplayName);
+	if (!FPaths::FileExists(FullDemoFileName))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Requested replay does not exist %s"), *ReplayName);
+		Result.Result = EStreamingOperationResult::ReplayNotFound;
+		return;
+	}
+
+	// Before trying to read anything, make sure there's an open save game slot.
+	int32 SaveSlot = 0;
+	FSaveGameSanitizedNames SanitizedNames;
+	const int32 MaxNumReplays = FConstConsoleVars::GetMaxNumReplaySlots();
+
+	for (; SaveSlot < MaxNumReplays; ++SaveSlot)
+	{
+		ReplayIndexToSanitizedNames(SaveSlot, SanitizedNames);
+
+		const ESaveExistsResult ReplaySaveFileStatus = SaveGameSystem->DoesSaveGameExistWithResult(*SanitizedNames.ReplayName, UserIndex);
+		const ESaveExistsResult MetaSaveFileStatus = SaveGameSystem->DoesSaveGameExistWithResult(*SanitizedNames.ReplayMetaName, UserIndex);
+
+		// At this point, we know at least one (or both) exist.
+		// However, either (or both) may be in a bad state. Just skip this for now.
+		if (ReplaySaveFileStatus != MetaSaveFileStatus)
+		{
+			UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Mismatched save file statuses Index=%d ReplayStatus=%d MetaStatus=%d"), SaveSlot, static_cast<int32>(ReplaySaveFileStatus), static_cast<int32>(MetaSaveFileStatus));
+			continue;
+		}
+		// We've found an empty slot, stop searching
+		else if (ReplaySaveFileStatus == ESaveExistsResult::DoesNotExist)
+		{
+			break;
+		}
+	}
+
+	if (SaveSlot == MaxNumReplays)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: No available save slots remain %s"), *ReplayName);
+		Result.Result = EStreamingOperationResult::NotEnoughSlots;
+		Result.RequiredSpace = MaxNumReplays;
+		return;
+	}
+
+	// Note, the use of nesting here is done to ensure that the Archive is properly closed **before** sending the delegate.
+	// This is done in case users want to perform additional work on the saved file in the delegate.
+	{
+		const FString& ReplaySaveFileName = SanitizedNames.ReplayName;
+		const FString& ReplayMetaSaveFileName = SanitizedNames.ReplayMetaName;
+
+		// Read the file into memory.
+		// TODO: When / if the Save Game system supports Archives, we can skip this step.
+		TSharedPtr<FArchive> ReplayFileAr = CreateLocalFileReader(FullDemoFileName);
+		if (ReplayFileAr.IsValid() && ReplayFileAr->TotalSize() > 0)
+		{
+			// Read in the Replay and MetaData
+			TArray<uint8> ReplayData;
+			ReplayData.SetNumUninitialized(ReplayFileAr->TotalSize());
+			ReplayFileAr->Serialize(ReplayData.GetData(), ReplayData.Num());
+
+			// Now, create the Meta Data and save that.
+			FSaveGameMetaData MetaData;
+			FMemoryReader MetaDataReader(ReplayData);
+			if (ReadMetaDataFromLocalStream(MetaDataReader, MetaData))
+			{
+				// Set the name as the SaveSlot name, and the timestamp as the original file's timestamp.
+				MetaData.ReplayName = ReplaySaveFileName;
+
+				// If we don't have a valid timestamp, assume it's the file's timestamp.
+				if (MetaData.ReplayInfo.Timestamp == FDateTime::MinValue())
+				{
+					MetaData.ReplayInfo.Timestamp = IFileManager::Get().GetTimeStamp(*FullDemoFileName);
+				}
+
+				TArray<uint8> MetaDataBytes;
+				FMemoryWriter MetaDataWriter(MetaDataBytes);
+				if (SerializeMetaData(MetaDataWriter, MetaData))
+				{
+					// The SaveGameSystem will show system dialogs for out of memory when required.
+					// However, it's possible that we could run into a situation where either the metadata or the save game fail on OOM.
+					// In that case, we would *technically* report a correct save relative to the last save request, but an incorrect total size.
+
+					// Now save the Replay and MetaData.
+					TSharedPtr<FSaveGameOptionInfo> OptionInfo = MakeShareable(new FSaveGameOptionInfo());
+					WeakOptionInfo = OptionInfo;
+
+					OptionInfo->bIsForRename = false;
+					OptionInfo->bIsSavingMetaData = false;
+					OptionInfo->ReplayFriendlyName = MetaData.ReplayInfo.FriendlyName;
+					OptionInfo->SaveDataSize = ReplayData.Num();
+
+					if (SaveGameSystem->SaveGame(/*bAttemptToUseUI=*/false, *ReplaySaveFileName, UserIndex, ReplayData))
+					{
+
+						OptionInfo->bIsSavingMetaData = true;
+						OptionInfo->SaveDataSize = MetaDataBytes.Num();
+
+						if (SaveGameSystem->SaveGame(/*bAttemptToUseUI=*/false, *ReplayMetaSaveFileName, UserIndex, MetaDataBytes))
+						{
+							Result.Result = EStreamingOperationResult::Success;
+							Result.NewReplayName = ReplayMetaSaveFileName;
+						}
+						else
+						{
+							UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Failed to save replay meta data to slot %s"), *ReplayName);
+						}
+					}
+					else
+					{
+						UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Failed to save replay to slot %s"), *ReplayName);
+					}
+				}
+				else
+				{
+					UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Unable to generate meta data %s"), *ReplayName);
+				}
+			}
+			else
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Unable to grab meta data from replay %s"), *ReplayName);
+			}
+		}
+		else
+		{
+			UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::KeepReplay: Unable to read StreamInfo"));
+		}
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName(ReplayName, NewFriendlyName, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RenameReplayFriendlyName - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FRenameReplayResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::RenameReplayFriendlyName(ReplayName, NewFriendlyName, Delegate);
+	}
+	else if (UserIndex != INDEX_NONE)
+	{
+		RenameReplayFriendlyNameSaved(ReplayName, NewFriendlyName, UserIndex, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RenameReplayFriendlyName - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FRenameReplayResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplayFriendlyNameSaved(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) const
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FRenameReplayResult>;
+	using FScopedSaveGameDelegate = SaveGameReplay::FScopedBindExtendedSaveDelegate;
+
+	auto AsyncWork = [this, ReplayName, NewFriendlyName, UserIndex]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		RenameReplayFriendlyName_Internal(ReplayName, NewFriendlyName, UserIndex, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	TSharedPtr<FScopedSaveGameDelegate> ScopedBindExtendedSaveDelegate = MakeShareable<FScopedSaveGameDelegate>(new FScopedSaveGameDelegate(WrapGetSaveGameOption()));
+	auto PostAsyncWork = [Delegate, ScopedBindExtendedSaveDelegate](const FRenameReplayResult& Result) mutable
+	{
+		ScopedBindExtendedSaveDelegate.Reset();
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FRenameReplayResult>(*this, TEXT("RenameReplayFriendlyName"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplayFriendlyName_Internal(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, FRenameReplayResult& Result) const
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::RenameReplayFriendlyNameSaved: Unable to retrieve save game systems")))
+	{
+		return;
+	}
+
+	FSaveGameSanitizedNames SanitizedNames;
+	if (!StreamNameToSanitizedNames(ReplayName, SanitizedNames))
+	{
+		return;
+	}
+
+	FSaveGameMetaData MetaData;
+	if (!ReadMetaDataFromSaveGame(*SaveGameSystem, SanitizedNames, UserIndex, MetaData, Result))
+	{
+		return;
+	}
+
+	MetaData.ReplayInfo.FriendlyName = NewFriendlyName;
+
+	TArray<uint8> MetaDataBytes;
+	FMemoryWriter MetaDataWriter(MetaDataBytes);
+	if (!SerializeMetaData(MetaDataWriter, MetaData))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RenameReplayFriendlyNameSaved: Failed to write meta data %s"), *ReplayName);
+		return;
+	}
+
+	TSharedPtr<FSaveGameOptionInfo> OptionInfo = MakeShareable(new FSaveGameOptionInfo());
+	WeakOptionInfo = OptionInfo;
+
+	OptionInfo->bIsForRename = true;
+	OptionInfo->bIsSavingMetaData = true;
+	OptionInfo->SaveDataSize = MetaDataBytes.Num();
+	OptionInfo->ReplayFriendlyName = MetaData.ReplayInfo.FriendlyName;
+
+	if (!SaveGameSystem->SaveGame(/*bAttemptToUseUI=*/ false, *SanitizedNames.ReplayMetaName, UserIndex, MetaDataBytes))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RenameReplayFriendlyNameSaved: Failed to save meta data %ss"), *ReplayName);
+		return;
+	}
+
+	Result.Result = EStreamingOperationResult::Success;
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	RenameReplaySaved(ReplayName, NewName, UserIndex, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate)
+{
+	RenameReplaySaved(ReplayName, NewName, INDEX_NONE, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::RenameReplaySaved(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate)
+{
+	UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RenameReplay: Is currently unsupported"));
+	FRenameReplayResult Result;
+	Result.Result = EStreamingOperationResult::Unsupported;
+	Delegate.ExecuteIfBound(Result);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreamsSaved(ReplayVersion, GetUserIndexFromUserString(UserString), MetaString, TArray< FString >(), Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreamsSaved(ReplayVersion, GetUserIndexFromUserString(UserString), MetaString, ExtraParms, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	EnumerateStreamsSaved(ReplayVersion, UserIndex, MetaString, ExtraParms, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateStreamsSaved(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate)
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FEnumerateStreamsResult>;
+
+	if (UserIndex == INDEX_NONE)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateStreams - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FEnumerateStreamsResult());
+		return;
+	}
+
+	auto AsyncWork = [this, ReplayVersion, UserIndex, MetaString, ExtraParms]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		EnumerateStreams_Internal(ReplayVersion, UserIndex, MetaString, ExtraParms, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	auto PostAsyncWork = [Delegate](const FEnumerateStreamsResult& Result)
+	{
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FEnumerateStreamsResult>(*this, TEXT("EnumerateStreams"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateStreams_Internal(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, FEnumerateStreamsResult& Result)
+{
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::EnumerateStreams: Unable to retrieve save game systems")))
+	{
+		const int32 MaxNumReplays = FConstConsoleVars::GetMaxNumReplaySlots();
+
+		Result.Result = EStreamingOperationResult::Success;
+		Result.FoundStreams.Reserve(MaxNumReplays);
+
+		// TODO: This could be a lot cleaner if the SaveGameSystem supported enumerate all available save games.
+		FStreamingResultBase SaveFileStatus;
+		FStreamingResultBase MetaFileStatus;
+		FSaveGameSanitizedNames SanitizedNames;
+
+		for (int32 i = 0; i < MaxNumReplays; ++i)
+		{
+			ReplayIndexToSanitizedNames(i, SanitizedNames);
+			const FString& ReplaySaveFileName = SanitizedNames.ReplayName;
+			const FString& ReplayMetaSaveFileName = SanitizedNames.ReplayMetaName;
+
+			const auto ReplaySaveFileStatus = SaveGameSystem->DoesSaveGameExistWithResult(*ReplaySaveFileName, UserIndex);
+			const auto ReplayMetaSaveFileStatus = SaveGameSystem->DoesSaveGameExistWithResult(*ReplayMetaSaveFileName, UserIndex);
+
+			PopulateStreamingResultFromSaveExistsResult(ReplaySaveFileStatus, SaveFileStatus);
+			PopulateStreamingResultFromSaveExistsResult(ReplayMetaSaveFileStatus, MetaFileStatus);
+
+			if (EStreamingOperationResult::ReplayCorrupt == SaveFileStatus.Result || EStreamingOperationResult::ReplayCorrupt == MetaFileStatus.Result)
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateStreams: Found corrupted stream Index=%d"), i);
+
+				// Just track the replay name, because we can delete both from that.
+				Result.CorruptedStreams.Add(ReplaySaveFileName);
+				continue;
+			}
+			else if (SaveFileStatus.Result != MetaFileStatus.Result)
+			{
+				UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateStreams: Mismatched result Index=%d ReplayResult=%d MetaResult=%d"), i, static_cast<int32>(SaveFileStatus.Result), static_cast<int32>(MetaFileStatus.Result));
+				continue;
+			}
+			// Can ignore cases where the files don't exist.
+			else if (EStreamingOperationResult::ReplayNotFound == SaveFileStatus.Result)
+			{
+				continue;
+			}
+			// At this point, if the status isn't OK, it's due to an error.
+			else if (!SaveFileStatus.WasSuccessful())
+			{
+				UE_LOG(LogSaveGameReplay, Log, TEXT("FSaveGameNetworkReplayStreamer::EnumerateStreams: Error reading save files Index=%d Status=%d"), i, static_cast<int32>(SaveFileStatus.Result));
+				continue;
+			}
+
+			// Grab the data and sanity check to make sure that the meta file didn't go bad between our last check and now.
+			FSaveGameMetaData MetaData;
+			if (ReadMetaDataFromSaveGame(*SaveGameSystem, SanitizedNames, UserIndex, MetaData, MetaFileStatus))
+			{
+				FNetworkReplayStreamInfo& StreamInfo = Result.FoundStreams.Emplace_GetRef();
+				PopulateStreamInfoFromMetaData(MetaData, StreamInfo);
+				StreamInfo.Name = ReplaySaveFileName;
+			}
+			else if (EStreamingOperationResult::ReplayCorrupt == MetaFileStatus.Result)
+			{
+				Result.CorruptedStreams.Add(ReplaySaveFileName);
+			}
+		}
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate)
+{
+	FLocalFileNetworkReplayStreamer::EnumerateStreams(ReplayVersion, UserIndex, FString(), TArray<FString>(), Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate)
+{
+	// Recent Streams will just be any stream we have locally that hasn't been committed to memory.
+	// So, just do Local Stream enumeration.
+	FLocalFileNetworkReplayStreamer::EnumerateStreams(ReplayVersion, RecentViewer, FString(), TArray<FString>(), Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::EnumerateEvents(ReplayName, Group, INDEX_NONE, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateEvents - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FEnumerateEventsResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateEvents(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::EnumerateEvents(ReplayName, Group, UserIndex, Delegate);
+	}
+	else if (UserIndex != INDEX_NONE)
+	{
+		EnumerateEventsSaved(ReplayName, Group, UserIndex, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateEvents - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FEnumerateEventsResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateEventsSaved(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate) const
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FEnumerateEventsResult>;
+
+	auto AsyncWork = [this, ReplayName, Group, UserIndex]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		EnumerateEvents_Internal(ReplayName, Group, UserIndex, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	auto PostAsyncWork = [Delegate](const FEnumerateEventsResult& Result)
+	{
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FEnumerateEventsResult>(*this, TEXT("EnumerateEvents"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::EnumerateEvents_Internal(const FString& ReplayName, const FString& Group, const int32 UserIndex, FEnumerateEventsResult& Result) const
+{
+	// Note, this may be run Asynchronously, use we can't assume we're on the game thread.
+	const FString ConfigFilterGroup = CVarSaveGameFilterEventGroup.GetValueOnAnyThread();
+	if (!Group.IsEmpty() && !ConfigFilterGroup.IsEmpty() && Group.Equals(ConfigFilterGroup))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateEvents: Passed in group conflicts with configured value. CVar=%s | Group=%s"), *ConfigFilterGroup, *Group);
+	}
+
+	const FString& UseGroup = Group.IsEmpty() ? ConfigFilterGroup : Group;
+
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::EnumerateEventsSaved: Unable to retrieve save game systems")))
+	{
+		return;
+	}
+
+	FSaveGameSanitizedNames SanitizedNames;
+	if (!StreamNameToSanitizedNames(ReplayName, SanitizedNames))
+	{
+		return;
+	}
+
+	FSaveGameMetaData MetaData;
+	if (ReadMetaDataFromSaveGame(*SaveGameSystem, SanitizedNames, UserIndex, MetaData, Result))
+	{
+		Result.Result = EStreamingOperationResult::Success;
+
+		if (UseGroup.IsEmpty())
+		{
+			Result.ReplayEventList = MoveTemp(MetaData.VersionedInfo.Events);
+		}
+		else
+		{
+			TArray<FReplayEventListItem>& InReplayEvents = MetaData.VersionedInfo.Events.ReplayEvents;
+			TArray<FReplayEventListItem>& OutReplayEvents = Result.ReplayEventList.ReplayEvents;
+
+			for (FReplayEventListItem& ReplayEvent : InReplayEvents)
+			{
+				if (UseGroup.Equals(ReplayEvent.Group))
+				{
+					OutReplayEvents.Add(MoveTemp(ReplayEvent));
+				}
+			}
+		}
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	// Once a replay is saved, it's stream name will have changed.
+	// Therefore, the name encoded in the event won't be helpful.
+	// However, if the replay hasn't been saved yet, it still may be findable with it's original name.
+	UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RequestEventData: No replay name available, defaulting to FLocalFileStreamFArchive::RequestEventData"));
+	FLocalFileNetworkReplayStreamer::RequestEventData(EventID, Delegate);
+}
+
+void FSaveGameNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::RequestEventData(ReplayName, EventID, INDEX_NONE, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RequestEventData - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FRequestEventDataResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RequestEventData(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	if (!IsSaveGameFileName(ReplayName))
+	{
+		FLocalFileNetworkReplayStreamer::RequestEventData(ReplayName, EventID, UserIndex, Delegate);
+	}
+	else if (UserIndex != INDEX_NONE)
+	{
+		RequestEventDataSaved(ReplayName, EventID, UserIndex, Delegate);
+	}
+	else
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::RequestEventData - Invalid UserIndex."));
+		Delegate.ExecuteIfBound(FRequestEventDataResult());
+	}
+}
+
+void FSaveGameNetworkReplayStreamer::RequestEventDataSaved(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate)
+{
+	using TAsyncTypes = SaveGameReplay::TAsyncTypes<FRequestEventDataResult>;
+
+	auto AsyncWork = [this, ReplayName, EventID, UserIndex]()
+	{
+		auto SharedResult = TAsyncTypes::MakeSharedResult();
+		RequestEventData_Internal(ReplayName, EventID, UserIndex, *SharedResult.Get());
+		return SharedResult;
+	};
+
+	auto PostAsyncWork = [Delegate](const FRequestEventDataResult& Result)
+	{
+		Delegate.ExecuteIfBound(Result);
+	};
+
+	SaveGameReplay::FAsyncTaskManager::Get().StartTask<FRequestEventDataResult>(*this, TEXT("RequestEventData"), AsyncWork, PostAsyncWork);
+}
+
+void FSaveGameNetworkReplayStreamer::RequestEventData_Internal(const FString& ReplayName, const FString& EventID, const int32 UserIndex, FRequestEventDataResult& Result)
+{
+	ISaveGameSystem* SaveGameSystem = IPlatformFeaturesModule::Get().GetSaveGameSystem();
+	if (!ensureMsgf(SaveGameSystem, TEXT("FSaveGameNetworkReplayStreamer::RequestEventDataSaved: Unable to retrieve save game systems")))
+	{
+		return;
+	}
+
+	FSaveGameSanitizedNames SanitizedNames;
+	if (!StreamNameToSanitizedNames(ReplayName, SanitizedNames))
+	{
+		return;
+	}
+
+	FSaveGameMetaData MetaData;
+	if (ReadMetaDataFromSaveGame(*SaveGameSystem, SanitizedNames, UserIndex, MetaData, Result))
+	{
+		for (int32 i = 0; i < MetaData.VersionedInfo.Events.ReplayEvents.Num(); ++i)
+		{
+			if (MetaData.VersionedInfo.Events.ReplayEvents[i].ID.Equals(EventID))
+			{
+				Result.Result = EStreamingOperationResult::Success;
+				Result.ReplayEventListItem = MoveTemp(MetaData.VersionedInfo.EventData[i]);
+				break;
+			}
+		}
+	}
+}
+
+bool FSaveGameNetworkReplayStreamer::ReadMetaDataFromLocalStream(FArchive& StreamArchive, FSaveGameMetaData& OutMetaData) const
+{
+	check(StreamArchive.IsLoading());
+
+	FLocalFileReplayInfo FileReplayInfo;
+	if (!ReadReplayInfo(StreamArchive, FileReplayInfo) || !FileReplayInfo.bIsValid)
+	{
+		return false;
+	}
+
+	const FString FilterGroup = CVarSaveGameFilterEventGroup.GetValueOnAnyThread();
+	const bool bShouldFilter = !FilterGroup.IsEmpty();
+
+	TArray<FReplayEventListItem> EventList;
+	TArray<TArray<uint8>> EventData;
+
+	for (int32 i = 0; i < FileReplayInfo.Events.Num() && !StreamArchive.IsError(); ++i)
+	{
+		FLocalFileEventInfo& LocalEvent = FileReplayInfo.Events[i];
+		if (bShouldFilter && !LocalEvent.Group.Equals(FilterGroup))
+		{
+			continue;
+		}
+
+		FReplayEventListItem ReplayEvent;
+		TArray<uint8> ReplayEventData;
+
+		ReplayEvent.ID = MoveTemp(LocalEvent.Id);
+		ReplayEvent.Group = MoveTemp(LocalEvent.Group);
+		ReplayEvent.Metadata = MoveTemp(LocalEvent.Metadata);
+		ReplayEvent.Time1 = LocalEvent.Time1;
+		ReplayEvent.Time2 = LocalEvent.Time2;
+
+		if (LocalEvent.SizeInBytes > 0)
+		{
+			ReplayEventData.SetNumUninitialized(LocalEvent.SizeInBytes);
+			StreamArchive.Seek(LocalEvent.EventDataOffset);
+			StreamArchive.Serialize(ReplayEventData.GetData(), ReplayEventData.Num());
+		}
+
+		EventList.Add(MoveTemp(ReplayEvent));
+		EventData.Add(MoveTemp(ReplayEventData));
+	}
+
+	const bool bSuccess = !StreamArchive.IsError();
+
+	if (bSuccess)
+	{
+		OutMetaData.VersionedInfo.FileVersion = SaveGameReplay::HISTORY_LATEST;
+		OutMetaData.VersionedInfo.EventData = MoveTemp(EventData);
+		OutMetaData.VersionedInfo.Events.ReplayEvents = MoveTemp(EventList);
+
+		OutMetaData.ReplayInfo = MoveTemp(FileReplayInfo);
+	}
+
+	return bSuccess;
+}
+
+bool FSaveGameNetworkReplayStreamer::ReadMetaDataFromSaveGame(class ISaveGameSystem& SaveGameSystem, const FSaveGameSanitizedNames& SanitizedNames, const int32 UserIndex, FSaveGameMetaData& OutMetaData, FStreamingResultBase& OutResult) const
+{
+	using ESaveExistsResult = ISaveGameSystem::ESaveExistsResult;
+
+	const ESaveExistsResult ReplayMetaSaveFileStatus = SaveGameSystem.DoesSaveGameExistWithResult(*SanitizedNames.ReplayMetaName, UserIndex);
+	
+	if (ESaveExistsResult::OK != ReplayMetaSaveFileStatus)
+	{
+		PopulateStreamingResultFromSaveExistsResult(ReplayMetaSaveFileStatus, OutResult);
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::ReadMetaDataFromSaveGame: Replay does not exist or is invalid."));
+		return false;
+	}
+
+	TArray<uint8> MetaDataBytes;
+	if (!SaveGameSystem.LoadGame(/** bAttemptToUseUI= */ false, *SanitizedNames.ReplayMetaName, UserIndex, MetaDataBytes))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::ReadMetaDataFromSaveGame: Failed to load replay."));
+		return false;
+	}
+
+	FMemoryReader MetaDataReader(MetaDataBytes);
+	if (!SerializeMetaData(MetaDataReader, OutMetaData))
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::EnumerateEvents: Failed to read meta data."));
+		return false;
+	}
+
+	return true;
+}
+
+void FSaveGameNetworkReplayStreamer::PopulateStreamInfoFromMetaData(const FSaveGameMetaData& MetaData, FNetworkReplayStreamInfo& OutStreamInfo) const
+{
+	OutStreamInfo.Name = MetaData.ReplayName;
+	OutStreamInfo.Timestamp = MetaData.ReplayInfo.Timestamp;
+	OutStreamInfo.LengthInMS = MetaData.ReplayInfo.LengthInMS;
+	OutStreamInfo.FriendlyName = MetaData.ReplayInfo.FriendlyName;
+	OutStreamInfo.SizeInBytes = MetaData.ReplayInfo.TotalDataSizeInBytes;
+	OutStreamInfo.Changelist = MetaData.ReplayInfo.Changelist;
+
+	OutStreamInfo.bIsLive = false;
+	OutStreamInfo.NumViewers = 0;
+}
+
+bool FSaveGameNetworkReplayStreamer::SerializeMetaData(FArchive& Archive, FSaveGameMetaData& MetaData) const
+{
+	if (Archive.IsSaving())
+	{
+		// Because we store meta data separately, we don't care about the replay version, and can
+		// safely change the name length.
+		FixupFriendlyNameLength(MetaData.ReplayInfo.FriendlyName, MetaData.ReplayInfo.FriendlyName);
+	}
+
+	Archive << MetaData.ReplayName;
+	Archive << MetaData.ReplayInfo.FriendlyName;
+	Archive << MetaData.ReplayInfo.Timestamp;
+	Archive << MetaData.ReplayInfo.TotalDataSizeInBytes;
+	Archive << MetaData.ReplayInfo.LengthInMS;
+	Archive << MetaData.ReplayInfo.Changelist;
+
+	if (Archive.IsLoading())
+	{
+		MetaData.ReplayInfo.FriendlyName.TrimStartAndEndInline();
+	}
+
+	return !Archive.IsError() && SerializeVersionedMetaData(Archive, MetaData);
+}
+
+bool FSaveGameNetworkReplayStreamer::SerializeVersionedMetaData(FArchive& Archive, FSaveGameMetaData& MetaData) const
+{
+	if ((Archive.IsLoading() && Archive.AtEnd()) ||
+		(Archive.IsSaving() && SaveGameReplay::HISTORY_INITIAL == MetaData.VersionedInfo.FileVersion))
+	{
+		MetaData.VersionedInfo.FileVersion = SaveGameReplay::HISTORY_INITIAL;
+		return true;
+	}
+
+	Archive << MetaData.VersionedInfo.FileVersion;
+
+	if (MetaData.VersionedInfo.FileVersion >= SaveGameReplay::HISTORY_EVENTS)
+	{
+		TArray<FReplayEventListItem>& Events = MetaData.VersionedInfo.Events.ReplayEvents;
+		TArray<TArray<uint8>>& EventData = MetaData.VersionedInfo.EventData;
+
+		int32 NumEvents = Events.Num();
+		Archive << NumEvents;
+
+		Events.SetNum(NumEvents);
+		EventData.SetNum(NumEvents);
+
+		for (int32 i = 0; i < NumEvents && !Archive.IsError(); ++i)
+		{
+			FReplayEventListItem& ReplayEvent = Events[i];
+			TArray<uint8>& ReplayEventData = EventData[i];
+
+			Archive << ReplayEvent.Group;
+			Archive << ReplayEvent.ID;
+			Archive << ReplayEvent.Metadata;
+			Archive << ReplayEvent.Time1;
+			Archive << ReplayEvent.Time2;
+
+			int32 EventDataSize = ReplayEventData.Num();
+			Archive << EventDataSize;
+
+			if (EventDataSize > 0)
+			{
+				ReplayEventData.SetNum(EventDataSize);
+				Archive.Serialize(ReplayEventData.GetData(), ReplayEventData.Num());
+			}
+		}
+	}
+
+	return !Archive.IsError();
+}
+
+bool FSaveGameNetworkReplayStreamer::IsSaveGameFileName(const FString& ReplayName) const
+{
+	return SaveGameReplay::IsSaveGameFileName(ReplayName);
+}
+
+bool FSaveGameNetworkReplayStreamer::StreamNameToSanitizedNames(const FString& StreamName, FSaveGameSanitizedNames& OutSanitizedNames) const
+{
+	const int32 ReplayIndex = GetReplayIndexFromName(StreamName);
+	if (INDEX_NONE == ReplayIndex)
+	{
+		UE_LOG(LogSaveGameReplay, Warning, TEXT("FSaveGameNetworkReplayStreamer::StreamNameToSanitizedNames: Failed to parse replay index from name %s"), *StreamName);
+		return false;
+	}
+
+	ReplayIndexToSanitizedNames(ReplayIndex, OutSanitizedNames);
+	return true;
+}
+
+void FSaveGameNetworkReplayStreamer::ReplayIndexToSanitizedNames(const int32 ReplayIndex, FSaveGameSanitizedNames& OutSanitizedNames) const
+{
+	OutSanitizedNames.ReplayIndex = ReplayIndex;
+	OutSanitizedNames.ReplayName = FString::Printf(ReplaySaveFileFormat, ReplayIndex);
+	OutSanitizedNames.ReplayMetaName = FString::Printf(ReplayMetaSaveFileFormat, ReplayIndex);
+}
+
+int32 FSaveGameNetworkReplayStreamer::GetReplayIndexFromName(const FString& ReplayName) const
+{
+	return SaveGameReplay::GetReplayIndexFromName(ReplayName);
+}
+
+FString FSaveGameNetworkReplayStreamer::GetFullPlaybackName() const
+{
+	// Note, we don't want this file to get enumerated later, otherwise it may look like we have an unsaved replay.
+	// So, we'll use a subdirectory for the playback file.
+	// This should work because the LocalFileStreamer only enumerates the top level directory.
+	// TODO: Maybe we could just put this into a legitimate temporary directory.
+	return GetDemoFullFilename(GetLocalPlaybackName());
+}
+
+FString FSaveGameNetworkReplayStreamer::GetLocalPlaybackName() const
+{
+	return FPaths::Combine(TEXT("Temp/"), PlaybackReplayName);
+}
+
+const FString& FSaveGameNetworkReplayStreamer::GetDefaultDemoSavePath()
+{
+	static const FString DefaultDemoSavePath = FPaths::Combine(*FPaths::ProjectPersistentDownloadDir(), TEXT("Demos/"));
+	return DefaultDemoSavePath;
+}
+
+const FString& FSaveGameNetworkReplayStreamer::GetDefaultPlaybackName()
+{
+	static const FString DefaultPlaybackName(TEXT("Playback"));
+	return DefaultPlaybackName;
+}
+
+TFunction<bool(const TCHAR*, EGameDelegates_SaveGame, FString&)> FSaveGameNetworkReplayStreamer::WrapGetSaveGameOption() const
+{
+	return [this](const TCHAR* FileName, EGameDelegates_SaveGame Option, FString& OptionValue)
+	{
+		check(WeakOptionInfo.IsValid());
+
+		TSharedPtr<FSaveGameOptionInfo> OptionInfo = WeakOptionInfo.Pin();
+		OptionInfo->Option = Option;
+		OptionInfo->ReplaySaveName = FString(FileName);
+		return GetSaveGameOption(*OptionInfo.Get(), OptionValue);
+	};
+}
+
+IMPLEMENT_MODULE(FSaveGameNetworkReplayStreamingFactory, SaveGameNetworkReplayStreaming)
+
+TSharedPtr< INetworkReplayStreamer > FSaveGameNetworkReplayStreamingFactory::CreateReplayStreamer()
+{
+	if (IPlatformFeaturesModule::Get().GetSaveGameSystem() == nullptr)
+	{
+		UE_LOG(LogSaveGameReplay, Error, TEXT("FSaveGameNetworkReplayStreamingFactory: Unable to get SaveGameSystem."));
+		return nullptr;
+	}
+
+	TSharedPtr<FSaveGameNetworkReplayStreamer> Streamer = MakeShared<FSaveGameNetworkReplayStreamer>();
+	LocalFileStreamers.Add(Streamer);
+	return Streamer;
+}
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Public/SaveGameNetworkReplayStreaming.h b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Public/SaveGameNetworkReplayStreaming.h
new file mode 100644
index 000000000000..ef77f6223538
--- /dev/null
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/Public/SaveGameNetworkReplayStreaming.h
@@ -0,0 +1,170 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Stats/Stats.h"
+#include "NetworkReplayStreaming.h"
+#include "LocalFileNetworkReplayStreaming.h"
+
+enum class EGameDelegates_SaveGame : short;
+
+/**
+ * Local file streamer that supports playback/recording to files on disk, and transferring replays to and from SaveGame slots.
+ *
+ * EnumerateStreams may be used to list all available replays that are in SaveGame slots.
+ * The Name member in any FNetworkReplayStreamInfo returned will be the SaveGame slot where the replay lives.
+ *
+ * EnumerateRecentStreams may be used to list all available replays that are not in SaveGame slots.
+ * The Name member in any FNetworkReplayStreamInfo returned will be the relative path where the replay lives.
+ *
+ * StartStreaming can be used to play replays both in and not in SaveGame slots.
+ * StartStreaming does not automatically put a replay in a SaveGame slot.
+ *
+ * KeepReplay can be used to move a non SaveGame slot replay into a SaveGame slot. The original replay is left untouched.
+ *
+ * DeleteFinishedStream can be used to delete replays both in and not in SaveGame slots.
+ *
+ * Only one Save Game operation is permitted to occur at a single time (even across Streamers).
+ *
+ * TODO: Proper handling of UserIndex.
+ */
+class SAVEGAMENETWORKREPLAYSTREAMING_API FSaveGameNetworkReplayStreamer : public FLocalFileNetworkReplayStreamer
+{
+public:
+
+	FSaveGameNetworkReplayStreamer();
+	FSaveGameNetworkReplayStreamer(const FString& DemoSavePath, const FString& PlaybackReplayName);
+
+	/** INetworkReplayStreamer implementation */
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<FString>& UserNames, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) override;
+	virtual void StartStreaming(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate) override;
+	virtual void DeleteFinishedStream(const FString& ReplayName, const FDeleteFinishedStreamCallback& Delegate) override;
+	virtual void DeleteFinishedStream(const FString& StreamName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate) override;
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateStreams(const FNetworkReplayVersion& ReplayVersion, const FString& UserString, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateStreams(const FNetworkReplayVersion& InReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const FString& RecentViewer, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void EnumerateRecentStreams(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FEnumerateStreamsCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const FKeepReplayCallback& Delegate) override;
+	virtual void KeepReplay(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplayFriendlyName(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const FRenameReplayCallback& Delegate) override;
+	virtual void RenameReplay(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate) override;
+
+	virtual void EnumerateEvents(const FString& ReplayName, const FString& Group, const FEnumerateEventsCallback& Delegate) override;
+	virtual void EnumerateEvents( const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate) override;
+	virtual void RequestEventData(const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventID, const FRequestEventDataCallback& Delegate) override;
+	virtual void RequestEventData(const FString& ReplayName, const FString& EventId, const int32 UserIndex, const FRequestEventDataCallback& Delegate) override;
+
+protected:
+
+	void StartStreamingSaved(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, const FStartStreamingCallback& Delegate);
+	void DeleteFinishedStreamSaved(const FString& ReplayName, const int32 UserIndex, const FDeleteFinishedStreamCallback& Delegate) const;
+	void EnumerateStreamsSaved(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, const FEnumerateStreamsCallback& Result);
+	void KeepReplaySaved(const FString& ReplayName, const bool bKeep, const int32 UserIndex, const FKeepReplayCallback& Result);
+	void RenameReplayFriendlyNameSaved(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, const FRenameReplayCallback& Delegate) const;
+	void RenameReplaySaved(const FString& ReplayName, const FString& NewName, const int32 UserIndex, const FRenameReplayCallback& Delegate);
+	void EnumerateEventsSaved(const FString& ReplayName, const FString& Group, const int32 UserIndex, const FEnumerateEventsCallback& Delegate) const;
+	void RequestEventDataSaved(const FString& ReplayName, const FString& EventID, const int32 UserIndex, const FRequestEventDataCallback& Delegate);
+
+	void StartStreaming_Internal(const FString& CustomName, const FString& FriendlyName, const TArray<int32>& UserIndices, bool bRecord, const FNetworkReplayVersion& ReplayVersion, FStartStreamingResult& Result);
+	void DeleteFinishedStream_Internal(const FString& ReplayName, const int32 UserIndex, FDeleteFinishedStreamResult& Result) const;
+	void EnumerateStreams_Internal(const FNetworkReplayVersion& ReplayVersion, const int32 UserIndex, const FString& MetaString, const TArray< FString >& ExtraParms, FEnumerateStreamsResult& Result);
+	void KeepReplay_Internal(const FString& ReplayName, const bool bKeep, const int32 UserIndex, FKeepReplayResult& Result);
+	void RenameReplayFriendlyName_Internal(const FString& ReplayName, const FString& NewFriendlyName, const int32 UserIndex, FRenameReplayResult& Result) const;
+	void EnumerateEvents_Internal(const FString& ReplayName, const FString& Group, const int32 UserIndex, FEnumerateEventsResult& Result) const;
+	void RequestEventData_Internal(const FString& ReplayName, const FString& EventID, const int32 UserIndex, FRequestEventDataResult& Result);
+
+	struct FSaveGameReplayVersionedInfo
+	{
+		// Save game file version.
+		uint32 FileVersion;
+
+		// Events that are serialized in the header.
+		FReplayEventList Events;
+
+		// Actual event data. Indices correlate to Event index.
+		TArray<TArray<uint8>> EventData;
+	};
+
+	struct FSaveGameMetaData
+	{
+		FString ReplayName;
+
+		FLocalFileReplayInfo ReplayInfo;
+
+		FSaveGameReplayVersionedInfo VersionedInfo;
+	};
+
+	struct FSaveGameSanitizedNames
+	{
+		FString ReplayMetaName;
+		FString ReplayName;
+		int32 ReplayIndex;
+	};
+
+	bool StreamNameToSanitizedNames(const FString& StreamName, FSaveGameSanitizedNames& OutSanitizedNames) const;
+	void ReplayIndexToSanitizedNames(const int32 ReplayIndex, FSaveGameSanitizedNames& OutSanitizedNames) const;
+
+	bool ReadMetaDataFromLocalStream(FArchive& Archive, FSaveGameMetaData& OutMetaData) const;
+	bool ReadMetaDataFromSaveGame(class ISaveGameSystem& SaveGameSystem, const FSaveGameSanitizedNames& SanitizedNames, const int32 UserIndex, FSaveGameMetaData& OutMetaData, FStreamingResultBase& OutResult) const;
+	void PopulateStreamInfoFromMetaData(const FSaveGameMetaData& MetaData, FNetworkReplayStreamInfo& OutStreamInfo) const;
+
+	bool SerializeMetaData(FArchive& Archive, FSaveGameMetaData& MetaData) const;
+	bool SerializeVersionedMetaData(FArchive& Archive, FSaveGameMetaData& MetaData) const;
+
+	// Returns whether the input name corresponds to a save game.
+	bool IsSaveGameFileName(const FString& ReplayName) const;
+
+	int32 GetReplayIndexFromName(const FString& ReplayName) const;
+
+	FString GetFullPlaybackName() const;
+	FString GetLocalPlaybackName() const;
+
+	struct FSaveGameOptionInfo
+	{
+		EGameDelegates_SaveGame Option;
+		bool bIsForRename = false;
+		bool bIsSavingMetaData = false;
+		int32 SaveDataSize = INDEX_NONE;
+
+		FString ReplayFriendlyName;
+		FString ReplaySaveName;
+	};
+
+	/**
+	 * Called during KeepReplay to get options when saving a replay.
+	 * Note, this may be called off the GameThread and may not be called on every platform.
+	 * @see FGameDelegates::GetExtendedSaveGameInfoDelegate
+	 *
+	 * @param OptionInfo	Info struct that describes the requested option and current streamer status.
+	 * @param OptionValue	(Out) The desired value for the option.
+	 *
+	 * @return True if this event was handled. False if it should be passed to the original delegate (
+	 */
+	virtual bool GetSaveGameOption(const FSaveGameOptionInfo& OptionInfo, FString& OptionValue) const { return false; }
+
+
+	// Special replay name that will be used when copying over SaveGame replays for playback.
+	const FString PlaybackReplayName;
+
+	static const FString& GetDefaultDemoSavePath();
+	static const FString& GetDefaultPlaybackName();
+
+private:
+
+	TFunction<bool(const TCHAR*, EGameDelegates_SaveGame, FString&)> WrapGetSaveGameOption() const;
+
+	// Although this isn't used on the GameThread, it should only be created / destroyed
+	// from the same thread. Therefore, no need to make it thread safe (for now).
+	mutable TWeakPtr<FSaveGameOptionInfo> WeakOptionInfo;
+};
+
+class SAVEGAMENETWORKREPLAYSTREAMING_API FSaveGameNetworkReplayStreamingFactory : public FLocalFileNetworkReplayStreamingFactory
+{
+public:
+	virtual TSharedPtr< INetworkReplayStreamer > CreateReplayStreamer();
+};
diff --git a/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/SaveGameNetworkReplayStreaming.Build.cs b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/SaveGameNetworkReplayStreaming.Build.cs
new file mode 100644
index 000000000000..e82205e4d88c
--- /dev/null
+++ b/Engine/Source/Runtime/NetworkReplayStreaming/SaveGameNetworkReplayStreaming/SaveGameNetworkReplayStreaming.Build.cs
@@ -0,0 +1,26 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+namespace UnrealBuildTool.Rules
+{
+    public class SaveGameNetworkReplayStreaming : ModuleRules
+    {
+        public SaveGameNetworkReplayStreaming(ReadOnlyTargetRules Target) : base(Target)
+        {
+            PublicDependencyModuleNames.AddRange(
+                new string[] {
+                    "Core",
+                    "NetworkReplayStreaming",
+                    "LocalFileNetworkReplayStreaming"
+                }
+			);
+
+            PrivateDependencyModuleNames.AddRange(
+                new string[]
+                {
+                    "Engine",
+					"Json"
+				}
+            );
+        }
+    }
+}
diff --git a/Engine/Source/Runtime/NullDrv/Public/NullRHI.h b/Engine/Source/Runtime/NullDrv/Public/NullRHI.h
index c84f0c24d185..7d120beaa71c 100644
--- a/Engine/Source/Runtime/NullDrv/Public/NullRHI.h
+++ b/Engine/Source/Runtime/NullDrv/Public/NullRHI.h
@@ -718,10 +718,6 @@ public:
 
 	}
 
-	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override
-	{
-
-	}
 	virtual void RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo) final override
 	{
 
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/BuildPatchServices.Build.cs b/Engine/Source/Runtime/Online/BuildPatchServices/BuildPatchServices.Build.cs
index 0e3649f4c7d8..474a9e787e2f 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/BuildPatchServices.Build.cs
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/BuildPatchServices.Build.cs
@@ -9,8 +9,14 @@ public class BuildPatchServices : ModuleRules
 		PublicDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"Core",
-				"CoreUObject",
+				"Core"
+			}
+		);
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject"
 			}
 		);
 
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchDiffManifests.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchDiffManifests.cpp
index 83f907cbfc99..3c4c6b84a27a 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchDiffManifests.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchDiffManifests.cpp
@@ -3,6 +3,7 @@
 #include "BuildPatchDiffManifests.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Guid.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "Policies/PrettyJsonPrintPolicy.h"
 #include "Policies/CondensedJsonPrintPolicy.h"
 #include "Serialization/JsonWriter.h"
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.cpp
index 853b351530ef..ace46be13b29 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.cpp
@@ -8,10 +8,11 @@
 #include "BuildPatchFileConstructor.h"
 #include "HAL/PlatformFilemanager.h"
 #include "HAL/FileManager.h"
+#include "HAL/RunnableThread.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Paths.h"
-#include "HAL/RunnableThread.h"
 #include "Misc/ScopeLock.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "BuildPatchServicesPrivate.h"
 #include "Interfaces/IBuildInstaller.h"
 #include "Data/ChunkData.h"
@@ -261,9 +262,9 @@ uint32 FBuildPatchFileConstructor::Run()
 			CountBytesProcessed(FileSize);
 			GLog->Logf(TEXT("FBuildPatchFileConstructor::SkipFile %s"), *FileToConstruct);
 			// Get the file manifest.
-			const FFileManifestData* FileManifest = BuildManifest->GetFileManifest(FileToConstruct);
+			const FFileManifest* FileManifest = BuildManifest->GetFileManifest(FileToConstruct);
 			// Go through each chunk part, and dereference it from the reference tracker.
-			for (const FChunkPartData& ChunkPart : FileManifest->FileChunkParts)
+			for (const FChunkPart& ChunkPart : FileManifest->FileChunkParts)
 			{
 				bFileSuccess = ChunkReferenceTracker->PopReference(ChunkPart.Guid) && bFileSuccess;
 			}
@@ -370,10 +371,10 @@ bool FBuildPatchFileConstructor::ConstructFileFromChunks( const FString& Filenam
 
 	// Calculate the hash as we write the data
 	FSHA1 HashState;
-	FSHAHashData HashValue;
+	FSHAHash HashValue;
 
 	// First make sure we can get the file manifest
-	const FFileManifestData* FileManifest = BuildManifest->GetFileManifest(Filename);
+	const FFileManifest* FileManifest = BuildManifest->GetFileManifest(Filename);
 	bSuccess = FileManifest != nullptr;
 	if( bSuccess )
 	{
@@ -408,7 +409,7 @@ bool FBuildPatchFileConstructor::ConstructFileFromChunks( const FString& Filenam
 				int64 ByteCounter = 0;
 				for (int32 ChunkPartIdx = StartChunkPart; ChunkPartIdx < FileManifest->FileChunkParts.Num() && !bShouldAbort; ++ChunkPartIdx)
 				{
-					const FChunkPartData& ChunkPart = FileManifest->FileChunkParts[ChunkPartIdx];
+					const FChunkPart& ChunkPart = FileManifest->FileChunkParts[ChunkPartIdx];
 					const int64 NextBytePosition = ByteCounter + ChunkPart.Size;
 					if (NextBytePosition <= StartPosition)
 					{
@@ -468,7 +469,7 @@ bool FBuildPatchFileConstructor::ConstructFileFromChunks( const FString& Filenam
 			// For each chunk, load it, and place it's data into the file
 			for( int32 ChunkPartIdx = StartChunkPart; ChunkPartIdx < FileManifest->FileChunkParts.Num() && bSuccess && !bShouldAbort; ++ChunkPartIdx )
 			{
-				const FChunkPartData& ChunkPart = FileManifest->FileChunkParts[ChunkPartIdx];
+				const FChunkPart& ChunkPart = FileManifest->FileChunkParts[ChunkPartIdx];
 				bSuccess = InsertChunkData( ChunkPart, *NewFile, HashState );
 				FileConstructorStat->OnFileProgress(Filename, NewFile->Tell());
 				if( bSuccess )
@@ -572,7 +573,7 @@ bool FBuildPatchFileConstructor::ConstructFileFromChunks( const FString& Filenam
 	return bSuccess;
 }
 
-bool FBuildPatchFileConstructor::InsertChunkData(const FChunkPartData& ChunkPart, FArchive& DestinationFile, FSHA1& HashState)
+bool FBuildPatchFileConstructor::InsertChunkData(const FChunkPart& ChunkPart, FArchive& DestinationFile, FSHA1& HashState)
 {
 	uint8* Data;
 	uint8* DataStart;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.h
index ebf28a46cdd7..632288865570 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchFileConstructor.h
@@ -199,7 +199,7 @@ namespace BuildPatchServices
 		 * @param HashState			An FSHA1 hash state to update with the data going into the destination file.
 		 * @return true if no errors were detected
 		 */
-		bool InsertChunkData(const FChunkPartData& ChunkPart, FArchive& DestinationFile, FSHA1& HashState);
+		bool InsertChunkData(const FChunkPart& ChunkPart, FArchive& DestinationFile, FSHA1& HashState);
 
 		/**
 		 * Delete all contents of a directory
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchGeneration.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchGeneration.cpp
index 429ad17c58fe..d977ef595fd3 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchGeneration.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchGeneration.cpp
@@ -2,9 +2,10 @@
 
 #include "BuildPatchGeneration.h"
 #include "Templates/ScopedPointer.h"
+#include "Templates/UniquePtr.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/SecureHash.h"
-#include "Templates/UniquePtr.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "BuildPatchManifest.h"
 #include "BuildPatchServicesModule.h"
 #include "BuildPatchHash.h"
@@ -642,7 +643,7 @@ bool FBuildDataGenerator::GenerateChunksManifestFromDirectory(const BuildPatchSe
 	ChunkWriter.WaitForThread();
 
 	// Collect chunk info for the manifest builder.
-	TMap<FGuid, FChunkInfoData> ChunkInfoMap;
+	TMap<FGuid, FChunkInfo> ChunkInfoMap;
 	TMap<FGuid, int64> ChunkFileSizes = CloudEnumeration->GetChunkFileSizes();
 	ChunkWriter.GetChunkFilesizes(ChunkFileSizes);
 	for (const TPair<uint64, TSet<FGuid>>& ChunkInventoryPair : CloudEnumeration->GetChunkInventory())
@@ -657,7 +658,7 @@ bool FBuildDataGenerator::GenerateChunksManifestFromDirectory(const BuildPatchSe
 		{
 			if (ChunkShaHashes.Contains(ChunkGuid) && ChunkFileSizes.Contains(ChunkGuid))
 			{
-				FChunkInfoData& ChunkInfo = ChunkInfoMap.FindOrAdd(ChunkGuid);
+				FChunkInfo& ChunkInfo = ChunkInfoMap.FindOrAdd(ChunkGuid);
 				ChunkInfo.Guid = ChunkGuid;
 				ChunkInfo.Hash = ChunkInventoryPair.Key;
 				FMemory::Memcpy(ChunkInfo.ShaHash.Hash, ChunkShaHashes[ChunkGuid].Hash, FSHA1::DigestSize);
@@ -668,7 +669,7 @@ bool FBuildDataGenerator::GenerateChunksManifestFromDirectory(const BuildPatchSe
 	}
 
 	// Finalize the manifest data.
-	TArray<FChunkInfoData> ChunkInfoList;
+	TArray<FChunkInfo> ChunkInfoList;
 	ChunkInfoMap.GenerateValueArray(ChunkInfoList);
 	if (ManifestBuilder->FinalizeData(BuildStream->GetAllFiles(), MoveTemp(ChunkInfoList)) == false)
 	{
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchInstaller.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchInstaller.cpp
index 0291eddff5bf..fe5dafb53439 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchInstaller.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchInstaller.cpp
@@ -1136,14 +1136,14 @@ namespace BuildPatchServices
 		const bool bCheckFileChanges = !bDiscoveredByVerification;
 		if (bCheckFileChanges)
 		{
-			const FFileManifestData* OldFileManifest = CurrentBuildManifest.IsValid() ? CurrentBuildManifest->GetFileManifest(Filename) : nullptr;
-			const FFileManifestData* NewFileManifest = NewBuildManifest->GetFileManifest(Filename);
+			const FFileManifest* OldFileManifest = CurrentBuildManifest.IsValid() ? CurrentBuildManifest->GetFileManifest(Filename) : nullptr;
+			const FFileManifest* NewFileManifest = NewBuildManifest->GetFileManifest(Filename);
 			const int64 InstalledFilesize = IFileManager::Get().FileSize(*InstalledFilename);
 			const int64 OriginalFileSize = OldFileManifest ? OldFileManifest->GetFileSize() : INDEX_NONE;
 			const int64 NewFileSize = NewFileManifest ? NewFileManifest->GetFileSize() : INDEX_NONE;
-			const FSHAHashData HashZero;
-			const FSHAHashData& HashOld = OldFileManifest ? OldFileManifest->FileHash : HashZero;
-			const FSHAHashData& HashNew = NewFileManifest ? NewFileManifest->FileHash : HashZero;
+			const FSHAHash HashZero;
+			const FSHAHash& HashOld = OldFileManifest ? OldFileManifest->FileHash : HashZero;
+			const FSHAHash& HashNew = NewFileManifest ? NewFileManifest->FileHash : HashZero;
 			const bool bFileSizeDiffers = OriginalFileSize != InstalledFilesize && NewFileSize != InstalledFilesize;
 			bUserEditedFile = bFileSizeDiffers || FBuildPatchUtils::VerifyFile(FileSystem.Get(), InstalledFilename, HashOld, HashNew) == 0;
 		}
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.cpp
index 0ec12fc0d27f..98bac44189f2 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.cpp
@@ -17,6 +17,7 @@
 #include "Serialization/JsonSerializer.h"
 #include "Data/ChunkData.h"
 #include "Core/BlockStructure.h"
+#include "Data/ManifestUObject.h"
 
 using namespace BuildPatchServices;
 
@@ -25,10 +26,6 @@ using namespace BuildPatchServices;
 // The manifest header magic codeword, for quick checking that the opened file is probably a manifest file.
 #define MANIFEST_HEADER_MAGIC		0x44BEC00C
 
-// The maximum number of FNames that we expect a manifest to generate. This is not a technical limitation, just a sanity check
-// and can be increased if more properties are added to our manifest UObject. FNames are only used by the UOject serialization system.
-#define MANIFEST_MAX_NAMES			50
-
 /**
  * Helper functions that convert generic types to and from string blobs for use with JSON parsing.
  * It's kind of horrible but guarantees no loss of data as the JSON reader/writer only supports float functionality 
@@ -151,41 +148,9 @@ FArchive& operator<<(FArchive& Ar, FManifestFileHeader& Header)
 	return Ar;
 }
 
-/* FCustomFieldData implementation
+/* FChunkInfo implementation
 *****************************************************************************/
-FCustomFieldData::FCustomFieldData()
-	: Key(TEXT(""))
-	, Value(TEXT(""))
-{
-}
-
-FCustomFieldData::FCustomFieldData(const FString& InKey, const FString& InValue)
-	: Key(InKey)
-	, Value(InValue)
-{
-}
-
-/* FSHAHashData implementation
-*****************************************************************************/
-FSHAHashData::FSHAHashData()
-{
-	FMemory::Memset(Hash, 0, FSHA1::DigestSize);
-}
-
-FString FSHAHashData::ToString() const
-{
-	return BytesToHex(Hash, FSHA1::DigestSize);
-}
-
-bool FSHAHashData::IsZero() const
-{
-	static const uint8 Zero[FSHA1::DigestSize] = {0};
-	return FMemory::Memcmp(Hash, Zero, FSHA1::DigestSize) == 0;
-}
-
-/* FChunkInfoData implementation
-*****************************************************************************/
-FChunkInfoData::FChunkInfoData()
+FChunkInfo::FChunkInfo()
 	: Guid()
 	, Hash(0)
 	, ShaHash()
@@ -194,18 +159,18 @@ FChunkInfoData::FChunkInfoData()
 {
 }
 
-/* FChunkPartData implementation
+/* FChunkPart implementation
 *****************************************************************************/
-FChunkPartData::FChunkPartData()
+FChunkPart::FChunkPart()
 	: Guid()
 	, Offset(0)
 	, Size(0)
 {
 }
 
-/* FFileManifestData implementation
+/* FFileManifest implementation
 *****************************************************************************/
-FFileManifestData::FFileManifestData()
+FFileManifest::FFileManifest()
 	: Filename(TEXT(""))
 	, FileHash()
 	, FileChunkParts()
@@ -217,17 +182,17 @@ FFileManifestData::FFileManifestData()
 {
 }
 
-int64 FFileManifestData::GetFileSize() const
+int64 FFileManifest::GetFileSize() const
 {
 	return FileSize;
 }
 
-bool FFileManifestData::operator<(const FFileManifestData& Other) const
+bool FFileManifest::operator<(const FFileManifest& Other) const
 {
 	return Filename < Other.Filename;
 }
 
-void FFileManifestData::Init()
+void FFileManifest::Init()
 {
 	FileSize = 0;
 	for (auto FileChunkPartIt = FileChunkParts.CreateConstIterator(); FileChunkPartIt; ++FileChunkPartIt)
@@ -236,261 +201,6 @@ void FFileManifestData::Init()
 	}
 }
 
-/**
- * Archive for writing a manifest into memory
- */
-class FManifestWriter : public FArchive
-{
-public:
-	FManifestWriter()
-		: FArchive()
-		, Offset(0)
-	{
-		ArIsPersistent = false;
-		ArIsSaving = true;
-	}
-
-	virtual void Seek(int64 InPos) override
-	{
-		Offset = InPos;
-	}
-
-	virtual int64 Tell() override
-	{
-		return Offset;
-	}
-
-	virtual FString GetArchiveName() const override
-	{
-		return TEXT("FManifestWriter");
-	}
-
-	virtual FArchive& operator<<(FName& N) override
-	{
-		if (!FNameIndexLookup.Contains(N))
-		{
-			const int32 ArNameIndex = FNameIndexLookup.Num();
-			FNameIndexLookup.Add(N, ArNameIndex);
-		}
-		*this << FNameIndexLookup[N];
-		return *this;
-	}
-
-	virtual void Serialize(void* Data, int64 Num) override
-	{
-		if (Num && !ArIsError)
-		{
-			const int64 NumBytesToAdd = Offset + Num - Bytes.Num();
-			if (NumBytesToAdd > 0)
-			{
-				const int64 NewArrayCount = Bytes.Num() + NumBytesToAdd;
-				if (NewArrayCount >= MAX_int32)
-				{
-					ArIsError = true;
-					return;
-				}
-
-				Bytes.AddUninitialized((int32)NumBytesToAdd);
-			}
-
-			check((Offset + Num) <= Bytes.Num());
-
-			if (Num)
-			{
-				FMemory::Memcpy(&Bytes[Offset], Data, Num);
-				Offset += Num;
-			}
-		}
-	}
-
-	virtual int64 TotalSize() override
-	{
-		return Bytes.Num();
-	}
-
-	void Finalize()
-	{
-		TArray<uint8> FinalData;
-		FMemoryWriter NameTableWriter(FinalData);
-
-		int32 NumNames = FNameIndexLookup.Num();
-		check(NumNames <= MANIFEST_MAX_NAMES);
-		NameTableWriter << NumNames;
-		for (auto& MapEntry : FNameIndexLookup)
-		{
-			FName& Name = MapEntry.Key;
-			int32& Index = MapEntry.Value;
-			NameTableWriter << Name;
-			NameTableWriter << Index;
-		}
-
-		FinalData.Append(Bytes);
-
-		Bytes = MoveTemp(FinalData);
-	}
-
-	TArray<uint8>& GetBytes()
-	{
-		return Bytes;
-	}
-
-private:
-	int64 Offset;
-	TArray<uint8> Bytes;
-	TMap<FName, int32> FNameIndexLookup;
-};
-
-/**
- * Archive for reading a manifest from data in memory
- */
-class FManifestReader : public FArchive
-{
-public:
-	FManifestReader(const TArray<uint8>& InBytes)
-		: FArchive()
-		, Offset(0)
-		, Bytes(InBytes)
-	{
-		ArIsPersistent = false;
-		ArIsLoading = true;
-
-		// Must load table immediately
-		FMemoryReader NameTableReader(InBytes);
-		int32 NumNames;
-		NameTableReader << NumNames;
-
-		// Check not insane, we know to expect a small number for a manifest
-		if (NumNames < MANIFEST_MAX_NAMES)
-		{
-			FNameLookup.Empty(NumNames);
-			for (; NumNames > 0; --NumNames)
-			{
-				FName Name;
-				int32 Index;
-				NameTableReader << Name;
-				NameTableReader << Index;
-				FNameLookup.Add(Index, Name);
-			}
-		}
-		else
-		{
-			ArIsError = true;
-		}
-
-		Offset = NameTableReader.Tell();
-	}
-
-	virtual FString GetArchiveName() const override
-	{
-		return TEXT("FManifestReader");
-	}
-
-	virtual void Seek(int64 InPos) override
-	{
-		check(InPos <= Bytes.Num());
-		Offset = InPos;
-	}
-
-	virtual int64 Tell() override
-	{
-		return Offset;
-	}
-
-	virtual FArchive& operator<<(FName& N) override
-	{
-		if (ArIsError)
-		{
-			N = NAME_None;
-		}
-		else
-		{
-			// Read index and lookup
-			int32 ArNameIndex;
-			*this << ArNameIndex;
-			if (FNameLookup.Contains(ArNameIndex))
-			{
-				N = FNameLookup[ArNameIndex];
-			}
-			else
-			{
-				N = NAME_None;
-				ArIsError = true;
-			}
-		}
-		return *this;
-	}
-
-	virtual void Serialize(void* Data, int64 Num) override
-	{
-		if (Num && !ArIsError)
-		{
-			// Only serialize if we have the requested amount of data
-			if (Offset + Num <= Bytes.Num())
-			{
-				FMemory::Memcpy(Data, &Bytes[Offset], Num);
-				Offset += Num;
-			}
-			else
-			{
-				ArIsError = true;
-			}
-		}
-	}
-
-	virtual int64 TotalSize() override
-	{
-		return Bytes.Num();
-	}
-
-private:
-	int64 Offset;
-	const TArray<uint8>& Bytes;
-	TMap<int32, FName> FNameLookup;
-};
-
-/* UBuildPatchManifest implementation
-*****************************************************************************/
-UBuildPatchManifest::UBuildPatchManifest(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, ManifestFileVersion(EBuildPatchAppManifestVersion::Invalid)
-	, bIsFileData(false)
-	, AppID(INDEX_NONE)
-	, AppName(TEXT(""))
-	, BuildVersion(TEXT(""))
-	, LaunchExe(TEXT(""))
-	, LaunchCommand(TEXT(""))
-	, PrereqIds()
-	, PrereqName(TEXT(""))
-	, PrereqPath(TEXT(""))
-	, PrereqArgs(TEXT(""))
-	, FileManifestList()
-	, ChunkList()
-	, CustomFields()
-{
-}
-
-void UBuildPatchManifest::Clear()
-{
-	ManifestFileVersion = EBuildPatchAppManifestVersion::Invalid;
-	bIsFileData = false;
-	AppID = INDEX_NONE;
-	AppName.Empty();
-	BuildVersion.Empty();
-	LaunchExe.Empty();
-	LaunchCommand.Empty();
-	PrereqIds.Empty();
-	PrereqName.Empty();
-	PrereqPath.Empty();
-	PrereqArgs.Empty();
-	FileManifestList.Empty();
-	ChunkList.Empty();
-	CustomFields.Empty();
-}
-
-UBuildPatchManifest::~UBuildPatchManifest()
-{
-}
-
 /* FBuildPatchCustomField implementation
 *****************************************************************************/
 FBuildPatchCustomField::FBuildPatchCustomField(const FString& Value)
@@ -627,44 +337,13 @@ FBuildPatchAppManifest::~FBuildPatchAppManifest()
 
 bool FBuildPatchAppManifest::SaveToFile(const FString& Filename, bool bUseBinary)
 {
-	bool bSuccess = false;
-	FArchive* FileOut = IFileManager::Get().CreateFileWriter(*Filename);
-	if (FileOut)
+	TUniquePtr<FArchive> FileOut(IFileManager::Get().CreateFileWriter(*Filename));
+	bool bSuccess = FileOut.IsValid();
+	if (bSuccess)
 	{
 		if (bUseBinary)
 		{
-			FManifestWriter ManifestData;
-			Serialize(ManifestData);
-			ManifestData.Finalize();
-			if (!ManifestData.IsError())
-			{
-				int32 DataSize = ManifestData.TotalSize();
-				TArray<uint8> TempCompressed;
-				TempCompressed.AddUninitialized(DataSize);
-				int32 CompressedSize = DataSize;
-				bool bDataIsCompressed = FCompression::CompressMemory(
-					static_cast<ECompressionFlags>(COMPRESS_ZLIB | COMPRESS_BiasMemory),
-					TempCompressed.GetData(),
-					CompressedSize,
-					ManifestData.GetBytes().GetData(),
-					DataSize);
-				TempCompressed.SetNum(CompressedSize);
-
-				TArray<uint8>& FileData = bDataIsCompressed ? TempCompressed : ManifestData.GetBytes();
-
-				FManifestFileHeader Header;
-				Header.StoredAs = bDataIsCompressed ? EManifestFileHeader::STORED_COMPRESSED : EManifestFileHeader::STORED_RAW;
-				Header.DataSize = DataSize;
-				Header.CompressedSize = bDataIsCompressed ? CompressedSize : 0;
-				FSHA1::HashBuffer(FileData.GetData(), FileData.Num(), Header.SHAHash.Hash);
-
-				// Write to disk
-				*FileOut << Header;
-				Header.HeaderSize = FileOut->Tell();
-				FileOut->Seek(0);
-				*FileOut << Header;
-				FileOut->Serialize(FileData.GetData(), FileData.Num());
-			}
+			bSuccess = FManifestUObject::SaveToArchive(*FileOut, *this);
 		}
 		else
 		{
@@ -673,9 +352,7 @@ bool FBuildPatchAppManifest::SaveToFile(const FString& Filename, bool bUseBinary
 			FTCHARToUTF8 JsonUTF8(*JSONOutput);
 			FileOut->Serialize((UTF8CHAR*)JsonUTF8.Get(), JsonUTF8.Length() * sizeof(UTF8CHAR));
 		}
-		bSuccess = FileOut->Close();
-		delete FileOut;
-		FileOut = nullptr;
+		bSuccess = FileOut->Close() && bSuccess;
 	}
 
 	return bSuccess;
@@ -703,121 +380,12 @@ bool FBuildPatchAppManifest::DeserializeFromData(const TArray<uint8>& DataInput)
 		}
 		else
 		{
-			FMemoryReader ManifestFile(DataInput);
-			FManifestFileHeader Header;
-			ManifestFile << Header;
-			const int32 SignedHeaderSize = Header.HeaderSize;
-			if (Header.CheckMagic() && DataInput.Num() > SignedHeaderSize)
-			{
-				FSHAHashData DataHash;
-				FSHA1::HashBuffer(&DataInput[Header.HeaderSize], DataInput.Num() - Header.HeaderSize, DataHash.Hash);
-				if (DataHash == Header.SHAHash)
-				{
-					TArray<uint8> UncompressedData;
-					if (Header.StoredAs == EManifestFileHeader::STORED_COMPRESSED && (Header.CompressedSize + Header.HeaderSize) == DataInput.Num())
-					{
-						UncompressedData.AddUninitialized(Header.DataSize);
-						if (!FCompression::UncompressMemory(
-							static_cast<ECompressionFlags>(COMPRESS_ZLIB | COMPRESS_BiasMemory),
-							UncompressedData.GetData(),
-							Header.DataSize,
-							&DataInput[Header.HeaderSize],
-							DataInput.Num() - Header.HeaderSize))
-						{
-							return false;
-						}
-					}
-					else if ((Header.DataSize + Header.HeaderSize) == DataInput.Num())
-					{
-						UncompressedData.Append(&DataInput[Header.HeaderSize], Header.DataSize);
-					}
-					else
-					{
-						return false;
-					}
-					FManifestReader ManifestData(UncompressedData);
-					return Serialize(ManifestData);
-				}
-				else
-				{
-					return false;
-				}
-			}
-			else
-			{
-				return false;
-			}
+			return FManifestUObject::LoadFromMemory(DataInput, *this);
 		}
 	}
 	return false;
 }
 
-bool FBuildPatchAppManifest::Serialize(FArchive& Ar)
-{
-	UBuildPatchManifest* Data = NewObject<UBuildPatchManifest>();
-	Data->AddToRoot();
-
-	// Make sure we use the correct serialization version, this is now fixed and must never use a newer version,
-	// because the property tag has changed in structure meaning older clients would not read correctly.
-	Ar.SetUE4Ver(VER_UE4_STRUCT_GUID_IN_PROPERTY_TAG - 1);
-
-	if (Ar.IsLoading())
-	{
-		DestroyData();
-	}
-	else
-	{
-		Data->ManifestFileVersion = ManifestFileVersion;
-		Data->bIsFileData = bIsFileData;
-		Data->AppID = AppID;
-		Data->AppName = AppName;
-		Data->BuildVersion = BuildVersion;
-		Data->LaunchExe = LaunchExe;
-		Data->LaunchCommand = LaunchCommand;
-		Data->PrereqIds = PrereqIds;
-		Data->PrereqName = PrereqName;
-		Data->PrereqPath = PrereqPath;
-		Data->PrereqArgs = PrereqArgs;
-		Data->FileManifestList = FileManifestList;
-		Data->ChunkList = ChunkList;
-		Data->CustomFields = CustomFields;
-	}
-
-	Data->Serialize(Ar);
-
-	if (Ar.IsLoading())
-	{
-		ManifestFileVersion = MoveTemp(Data->ManifestFileVersion);
-		bIsFileData = MoveTemp(Data->bIsFileData);
-		AppID = MoveTemp(Data->AppID);
-		AppName = MoveTemp(Data->AppName);
-		BuildVersion = MoveTemp(Data->BuildVersion);
-		LaunchExe = MoveTemp(Data->LaunchExe);
-		LaunchCommand = MoveTemp(Data->LaunchCommand);
-		PrereqIds = MoveTemp(Data->PrereqIds);
-		PrereqName = MoveTemp(Data->PrereqName);
-		PrereqPath = MoveTemp(Data->PrereqPath);
-		PrereqArgs = MoveTemp(Data->PrereqArgs);
-		FileManifestList = MoveTemp(Data->FileManifestList);
-		ChunkList = MoveTemp(Data->ChunkList);
-		CustomFields = MoveTemp(Data->CustomFields);
-
-		// If we didn't load the version number, we know it was skipped when saving therefore must be
-		// the first UObject version
-		if (ManifestFileVersion == static_cast<uint8>(EBuildPatchAppManifestVersion::Invalid))
-		{
-			ManifestFileVersion = EBuildPatchAppManifestVersion::StoredAsCompressedUClass;
-		}
-
-		// Setup internal lookups
-		InitLookups();
-	}
-
-	Data->Clear();
-	Data->RemoveFromRoot();
-	return !Ar.IsError();
-}
-
 void FBuildPatchAppManifest::DestroyData()
 {
 	// Clear Manifest data
@@ -854,7 +422,7 @@ void FBuildPatchAppManifest::InitLookups()
 	FileManifestLookup.Empty(FileManifestList.Num());
 	TaggedFilesLookup.Empty();
 	FileNameLookup.Empty(bIsFileData ? FileManifestList.Num() : 0);
-	for (FFileManifestData& File : FileManifestList)
+	for (FFileManifest& File : FileManifestList)
 	{
 		File.Init();
 		TotalBuildSize += File.GetFileSize();
@@ -880,13 +448,13 @@ void FBuildPatchAppManifest::InitLookups()
 	}
 	TotalDownloadSize = 0;
 	ChunkInfoLookup.Empty(ChunkList.Num());
-	for (FChunkInfoData& Chunk : ChunkList)
+	for (FChunkInfo& Chunk : ChunkList)
 	{
 		ChunkInfoLookup.Add(Chunk.Guid, &Chunk);
 		TotalDownloadSize += Chunk.FileSize;
 	}
 	CustomFieldLookup.Empty(CustomFields.Num());
-	for (FCustomFieldData& CustomField : CustomFields)
+	for (FCustomField& CustomField : CustomFields)
 	{
 		CustomFieldLookup.Add(CustomField.Key, &CustomField);
 	}
@@ -921,7 +489,7 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 		Writer->WriteValue(TEXT("PrereqArgs"), PrereqArgs);
 		// Write file manifest data
 		Writer->WriteArrayStart(TEXT("FileManifestList"));
-		for (const FFileManifestData& FileManifest : FileManifestList)
+		for (const FFileManifest& FileManifest : FileManifestList)
 		{
 			Writer->WriteObjectStart();
 			{
@@ -948,7 +516,7 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 				{
 					Writer->WriteArrayStart(TEXT("FileChunkParts"));
 					{
-						for (const FChunkPartData& FileChunkPart : FileManifest.FileChunkParts)
+						for (const FChunkPart& FileChunkPart : FileManifest.FileChunkParts)
 						{
 							Writer->WriteObjectStart();
 							{
@@ -978,7 +546,7 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 		Writer->WriteArrayEnd();
 		// Write chunk hash list
 		Writer->WriteObjectStart(TEXT("ChunkHashList"));
-		for (const FChunkInfoData& ChunkInfo : ChunkList)
+		for (const FChunkInfo& ChunkInfo : ChunkList)
 		{
 			const FGuid& ChunkGuid = ChunkInfo.Guid;
 			const uint64& ChunkHash = ChunkInfo.Hash;
@@ -987,16 +555,16 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 		Writer->WriteObjectEnd();
 		// Write chunk sha list
 		Writer->WriteObjectStart(TEXT("ChunkShaList"));
-		for (const FChunkInfoData& ChunkInfo : ChunkList)
+		for (const FChunkInfo& ChunkInfo : ChunkList)
 		{
 			const FGuid& ChunkGuid = ChunkInfo.Guid;
-			const FSHAHashData& ChunkSha = ChunkInfo.ShaHash;
+			const FSHAHash& ChunkSha = ChunkInfo.ShaHash;
 			Writer->WriteValue(ChunkGuid.ToString(), ToHexString(ChunkSha));
 		}
 		Writer->WriteObjectEnd();
 		// Write data group list
 		Writer->WriteObjectStart(TEXT("DataGroupList"));
-		for (const FChunkInfoData& ChunkInfo : ChunkList)
+		for (const FChunkInfo& ChunkInfo : ChunkList)
 		{
 			const FGuid& DataGuid = ChunkInfo.Guid;
 			const uint8& DataGroup = ChunkInfo.GroupNumber;
@@ -1005,7 +573,7 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 		Writer->WriteObjectEnd();
 		// Write chunk size list
 		Writer->WriteObjectStart(TEXT("ChunkFilesizeList"));
-		for (const FChunkInfoData& ChunkInfo : ChunkList)
+		for (const FChunkInfo& ChunkInfo : ChunkList)
 		{
 			const FGuid& ChunkGuid = ChunkInfo.Guid;
 			const int64& ChunkSize = ChunkInfo.FileSize;
@@ -1014,7 +582,7 @@ void FBuildPatchAppManifest::SerializeToJSON(FString& JSONOutput)
 		Writer->WriteObjectEnd();
 		// Write custom fields
 		Writer->WriteObjectStart(TEXT("CustomFields"));
-		for (const FCustomFieldData& CustomField : CustomFields)
+		for (const FCustomField& CustomField : CustomFields)
 		{
 			Writer->WriteValue(CustomField.Key, CustomField.Value);
 		}
@@ -1110,15 +678,15 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 		{
 			TSharedPtr<FJsonObject> JsonFileManifest = (*JsonFileManifestIt)->AsObject();
 
-			const int32 FileIndex = FileManifestList.Add(FFileManifestData());
-			FFileManifestData& FileManifest = FileManifestList[FileIndex];
+			const int32 FileIndex = FileManifestList.Add(FFileManifest());
+			FFileManifest& FileManifest = FileManifestList[FileIndex];
 			FileManifest.Filename = JsonFileManifest->GetStringField(TEXT("Filename"));
 			bSuccess = bSuccess && FString::ToBlob(JsonFileManifest->GetStringField(TEXT("FileHash")), FileManifest.FileHash.Hash, FSHA1::DigestSize);
 			TArray<TSharedPtr<FJsonValue>> JsonChunkPartArray = JsonFileManifest->GetArrayField(TEXT("FileChunkParts"));
 			for (auto JsonChunkPartIt = JsonChunkPartArray.CreateConstIterator(); JsonChunkPartIt && bSuccess; ++JsonChunkPartIt)
 			{
-				const int32 ChunkIndex = FileManifest.FileChunkParts.Add(FChunkPartData());
-				FChunkPartData& FileChunkPart = FileManifest.FileChunkParts[ChunkIndex];
+				const int32 ChunkIndex = FileManifest.FileChunkParts.Add(FChunkPart());
+				FChunkPart& FileChunkPart = FileManifest.FileChunkParts[ChunkIndex];
 				TSharedPtr<FJsonObject> JsonChunkPart = (*JsonChunkPartIt)->AsObject();
 				bSuccess = bSuccess && FGuid::Parse(JsonChunkPart->GetStringField(TEXT("Guid")), FileChunkPart.Guid);
 				bSuccess = bSuccess && FromStringBlob(JsonChunkPart->GetStringField(TEXT("Offset")), FileChunkPart.Offset);
@@ -1141,7 +709,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 		}
 	}
 	FileManifestList.Sort();
-	for (FFileManifestData& FileManifest : FileManifestList)
+	for (FFileManifest& FileManifest : FileManifestList)
 	{
 		FileManifestLookup.Add(FileManifest.Filename, &FileManifest);
 	}
@@ -1149,12 +717,12 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 	// For each chunk setup its info
 	for (const FGuid& DataGuid : AllDataGuids)
 	{
-		int32 ChunkIndex = ChunkList.Add(FChunkInfoData());
+		int32 ChunkIndex = ChunkList.Add(FChunkInfo());
 		ChunkList[ChunkIndex].Guid = DataGuid;
 	}
 
 	// Setup chunk info lookup
-	for (FChunkInfoData& ChunkInfo : ChunkList)
+	for (FChunkInfo& ChunkInfo : ChunkList)
 	{
 		ChunkInfoLookup.Add(ChunkInfo.Guid, &ChunkInfo);
 	}
@@ -1174,7 +742,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 			bSuccess = bSuccess && FromStringBlob(ChunkHashIt.Value()->AsString(), ChunkHash);
 			if (bSuccess && ChunkInfoLookup.Contains(ChunkGuid))
 			{
-				FChunkInfoData* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
+				FChunkInfo* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
 				ChunkInfoData->Hash = ChunkHash;
 				bHasChunkHashList = true;
 			}
@@ -1189,12 +757,12 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 		for (auto ChunkHashIt = JsonChunkHashListObj->Values.CreateConstIterator(); ChunkHashIt && bSuccess; ++ChunkHashIt)
 		{
 			FGuid ChunkGuid;
-			FSHAHashData ChunkSha;
+			FSHAHash ChunkSha;
 			bSuccess = bSuccess && FGuid::Parse(ChunkHashIt.Key(), ChunkGuid);
 			bSuccess = bSuccess && FromHexString(ChunkHashIt.Value()->AsString(), ChunkSha);
 			if (bSuccess && ChunkInfoLookup.Contains(ChunkGuid))
 			{
-				FChunkInfoData* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
+				FChunkInfo* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
 				ChunkInfoData->ShaHash = ChunkSha;
 			}
 		}
@@ -1215,10 +783,10 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 		// We fall back to using the hash of the prereq exe if we have no prereq ids specified
 		FString PrereqFilename = PrereqPath;
 		PrereqFilename.ReplaceInline(TEXT("\\"), TEXT("/"));
-		const FFileManifestData* const * FoundFileManifest = FileManifestLookup.Find(PrereqFilename);
+		const FFileManifest* const * FoundFileManifest = FileManifestLookup.Find(PrereqFilename);
 		if (FoundFileManifest)
 		{
-			FSHAHashData PrereqHash;
+			FSHAHash PrereqHash;
 			FMemory::Memcpy(PrereqHash.Hash, (*FoundFileManifest)->FileHash.Hash, FSHA1::DigestSize);
 			PrereqIds.Add(PrereqHash.ToString());
 		}
@@ -1238,7 +806,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 			bSuccess = bSuccess && FromStringBlob(DataGroupIt.Value()->AsString(), DataGroup);
 			if (bSuccess && ChunkInfoLookup.Contains(DataGuid))
 			{
-				FChunkInfoData* ChunkInfoData = ChunkInfoLookup[DataGuid];
+				FChunkInfo* ChunkInfoData = ChunkInfoLookup[DataGuid];
 				ChunkInfoData->GroupNumber = DataGroup;
 			}
 		}
@@ -1247,7 +815,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 	{
 		// If the list did not exist in the manifest then the grouping is the deprecated crc functionality, as long
 		// as there are no previous parsing errors we can build the group list from the Guids.
-		for (FChunkInfoData& ChunkInfo : ChunkList)
+		for (FChunkInfo& ChunkInfo : ChunkList)
 		{
 			ChunkInfo.GroupNumber = FCrc::MemCrc_DEPRECATED(&ChunkInfo.Guid, sizeof(FGuid)) % 100;
 		}
@@ -1268,7 +836,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 				FromStringBlob(ChunkFilesizeIt.Value()->AsString(), ChunkSize);
 				if (ChunkInfoLookup.Contains(ChunkGuid))
 				{
-					FChunkInfoData* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
+					FChunkInfo* ChunkInfoData = ChunkInfoLookup[ChunkGuid];
 					ChunkInfoData->FileSize = ChunkSize;
 					bHasChunkFilesizeList = true;
 				}
@@ -1278,7 +846,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 	if (bHasChunkFilesizeList == false)
 	{
 		// Missing chunk list, version before we saved them compressed.. Assume chunk size
-		for (FChunkInfoData& ChunkInfo : ChunkList)
+		for (FChunkInfo& ChunkInfo : ChunkList)
 		{
 			ChunkInfo.FileSize = BuildPatchServices::ChunkDataSize;
 		}
@@ -1303,11 +871,11 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 		TSharedPtr< FJsonObject > JsonCustomFieldsObj = JsonCustomFields->AsObject();
 		for( auto CustomFieldIt = JsonCustomFieldsObj->Values.CreateConstIterator(); CustomFieldIt && bSuccess; ++CustomFieldIt )
 		{
-			CustomFields.Add(FCustomFieldData(CustomFieldIt.Key(), CustomFieldIt.Value()->AsString()));
+			CustomFields.Add(FCustomField(CustomFieldIt.Key(), CustomFieldIt.Value()->AsString()));
 		}
 	}
 	CustomFieldLookup.Empty(CustomFields.Num());
-	for (FCustomFieldData& CustomField : CustomFields)
+	for (FCustomField& CustomField : CustomFields)
 	{
 		CustomFieldLookup.Add(CustomField.Key, &CustomField);
 	}
@@ -1315,7 +883,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 	// If this is file data, fill out the guid to filename lookup, and chunk file size and SHA.
 	if (bIsFileData)
 	{
-		for (FFileManifestData& FileManifest : FileManifestList)
+		for (FFileManifest& FileManifest : FileManifestList)
 		{
 			if (FileManifest.FileChunkParts.Num() == 1)
 			{
@@ -1323,7 +891,7 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 				FileNameLookup.Add(Guid, &FileManifest.Filename);
 				if (ChunkInfoLookup.Contains(Guid))
 				{
-					FChunkInfoData* ChunkInfoData = ChunkInfoLookup[Guid];
+					FChunkInfo* ChunkInfoData = ChunkInfoLookup[Guid];
 					ChunkInfoData->FileSize = FileManifest.GetFileSize();
 					ChunkInfoData->ShaHash = FileManifest.FileHash;
 				}
@@ -1340,11 +908,11 @@ bool FBuildPatchAppManifest::DeserializeFromJSON( const FString& JSONInput )
 	TotalDownloadSize = 0;
 	if (bSuccess)
 	{
-		for (const FFileManifestData& FileManifest : FileManifestList)
+		for (const FFileManifest& FileManifest : FileManifestList)
 		{
 			TotalBuildSize += FileManifest.GetFileSize();
 		}
-		for (const FChunkInfoData& Chunk : ChunkList)
+		for (const FChunkInfo& Chunk : ChunkList)
 		{
 			TotalDownloadSize += Chunk.FileSize;
 		}
@@ -1374,10 +942,10 @@ void FBuildPatchAppManifest::GetChunksRequiredForFiles(const TSet<FString>& File
 {
 	for (const FString& Filename : Filenames)
 	{
-		const FFileManifestData* FileManifest = GetFileManifest(Filename);
+		const FFileManifest* FileManifest = GetFileManifest(Filename);
 		if (FileManifest != nullptr)
 		{
-			for (const FChunkPartData& ChunkPart : FileManifest->FileChunkParts)
+			for (const FChunkPart& ChunkPart : FileManifest->FileChunkParts)
 			{
 				RequiredChunks.Add(ChunkPart.Guid);
 			}
@@ -1397,18 +965,18 @@ int64 FBuildPatchAppManifest::GetDownloadSize(const TSet<FString>& Tags) const
 	int64 TotalSize = 0;
 	for (const FString& Tag : Tags)
 	{
-		const TArray<FFileManifestData*>* Files = TaggedFilesLookup.Find(Tag);
+		const TArray<FFileManifest*>* Files = TaggedFilesLookup.Find(Tag);
 		if (Files != nullptr)
 		{
-			for (const FFileManifestData* File : *Files)
+			for (const FFileManifest* File : *Files)
 			{
-				for (const FChunkPartData& ChunkPart : File->FileChunkParts)
+				for (const FChunkPart& ChunkPart : File->FileChunkParts)
 				{
 					bool bAlreadyInSet;
 					RequiredChunks.Add(ChunkPart.Guid, &bAlreadyInSet);
 					if (!bAlreadyInSet)
 					{
-						const FChunkInfoData * const * ChunkInfo = ChunkInfoLookup.Find(ChunkPart.Guid);
+						const FChunkInfo * const * ChunkInfo = ChunkInfoLookup.Find(ChunkPart.Guid);
 						if (ChunkInfo != nullptr)
 						{
 							TotalSize += (*ChunkInfo)->FileSize;
@@ -1471,14 +1039,14 @@ int64 FBuildPatchAppManifest::GetBuildSize() const
 int64 FBuildPatchAppManifest::GetBuildSize(const TSet<FString>& Tags) const
 {
 	// For each tag we iterate the files and for each new file we find we add the size for it.
-	TSet<const FFileManifestData*> RequiredFiles;
+	TSet<const FFileManifest*> RequiredFiles;
 	int64 TotalSize = 0;
 	for (const FString& Tag : Tags)
 	{
-		const TArray<FFileManifestData*>* Files = TaggedFilesLookup.Find(Tag);
+		const TArray<FFileManifest*>* Files = TaggedFilesLookup.Find(Tag);
 		if (Files != nullptr)
 		{
-			for (const FFileManifestData* File : *Files)
+			for (const FFileManifest* File : *Files)
 			{
 				bool bAlreadyInSet;
 				RequiredFiles.Add(File, &bAlreadyInSet);
@@ -1511,7 +1079,7 @@ int64 FBuildPatchAppManifest::GetFileSize(const TSet<FString>& Filenames) const
 
 int64 FBuildPatchAppManifest::GetFileSize(const FString& Filename) const
 {
-	FFileManifestData* const * FileManifest = FileManifestLookup.Find(Filename);
+	FFileManifest* const * FileManifest = FileManifestLookup.Find(Filename);
 	if (FileManifest)
 	{
 		return (*FileManifest)->GetFileSize();
@@ -1577,10 +1145,10 @@ void FBuildPatchAppManifest::GetTaggedFileList(const TSet<FString>& Tags, TSet<F
 {
 	for (const FString& Tag : Tags)
 	{
-		const TArray<FFileManifestData*>* Files = TaggedFilesLookup.Find(Tag);
+		const TArray<FFileManifest*>* Files = TaggedFilesLookup.Find(Tag);
 		if (Files != nullptr)
 		{
-			for (const FFileManifestData* File : *Files)
+			for (const FFileManifest* File : *Files)
 			{
 				TaggedFiles.Add(File->Filename);
 			}
@@ -1596,15 +1164,15 @@ void FBuildPatchAppManifest::GetDataList(TArray<FGuid>& DataGuids) const
 void FBuildPatchAppManifest::GetDataList(TSet<FGuid>& DataGuids) const
 {
 	DataGuids.Empty(ChunkInfoLookup.Num());
-	for (const TPair<FGuid, FChunkInfoData*> Pair : ChunkInfoLookup)
+	for (const TPair<FGuid, FChunkInfo*> Pair : ChunkInfoLookup)
 	{
 		DataGuids.Add(Pair.Key);
 	}
 }
 
-const FFileManifestData* FBuildPatchAppManifest::GetFileManifest(const FString& Filename) const
+const FFileManifest* FBuildPatchAppManifest::GetFileManifest(const FString& Filename) const
 {
-	const FFileManifestData* const * FileManifest = FileManifestLookup.Find(Filename);
+	const FFileManifest* const * FileManifest = FileManifestLookup.Find(Filename);
 	return (FileManifest) ? (*FileManifest) : nullptr;
 }
 
@@ -1615,7 +1183,7 @@ bool FBuildPatchAppManifest::IsFileDataManifest() const
 
 bool FBuildPatchAppManifest::GetChunkHash(const FGuid& ChunkGuid, uint64& OutHash) const
 {
-	const FChunkInfoData* const * ChunkInfo = ChunkInfoLookup.Find(ChunkGuid);
+	const FChunkInfo* const * ChunkInfo = ChunkInfoLookup.Find(ChunkGuid);
 	if (ChunkInfo)
 	{
 		OutHash = (*ChunkInfo)->Hash;
@@ -1624,18 +1192,19 @@ bool FBuildPatchAppManifest::GetChunkHash(const FGuid& ChunkGuid, uint64& OutHas
 	return false;
 }
 
-bool FBuildPatchAppManifest::GetChunkShaHash(const FGuid& ChunkGuid, FSHAHashData& OutHash) const
+bool FBuildPatchAppManifest::GetChunkShaHash(const FGuid& ChunkGuid, FSHAHash& OutHash) const
 {
-	const FChunkInfoData* const * ChunkInfo = ChunkInfoLookup.Find(ChunkGuid);
+	static const uint8 Zero[FSHA1::DigestSize] = {0};
+	const FChunkInfo* const * ChunkInfo = ChunkInfoLookup.Find(ChunkGuid);
 	if (ChunkInfo != nullptr)
 	{
 		OutHash = (*ChunkInfo)->ShaHash;
-		return OutHash.IsZero() == false;
+		return FMemory::Memcmp(OutHash.Hash, Zero, FSHA1::DigestSize) != 0;
 	}
 	return false;
 }
 
-bool FBuildPatchAppManifest::GetFileHash(const FGuid& FileGuid, FSHAHashData& OutHash) const
+bool FBuildPatchAppManifest::GetFileHash(const FGuid& FileGuid, FSHAHash& OutHash) const
 {
 	const FString* const * FoundFilename = FileNameLookup.Find(FileGuid);
 	if (FoundFilename)
@@ -1645,9 +1214,9 @@ bool FBuildPatchAppManifest::GetFileHash(const FGuid& FileGuid, FSHAHashData& Ou
 	return false;
 }
 
-bool FBuildPatchAppManifest::GetFileHash(const FString& Filename, FSHAHashData& OutHash) const
+bool FBuildPatchAppManifest::GetFileHash(const FString& Filename, FSHAHash& OutHash) const
 {
-	const FFileManifestData* const * FoundFileManifest = FileManifestLookup.Find(Filename);
+	const FFileManifest* const * FoundFileManifest = FileManifestLookup.Find(Filename);
 	if (FoundFileManifest)
 	{
 		FMemory::Memcpy(OutHash.Hash, (*FoundFileManifest)->FileHash.Hash, FSHA1::DigestSize);
@@ -1658,7 +1227,7 @@ bool FBuildPatchAppManifest::GetFileHash(const FString& Filename, FSHAHashData&
 
 bool FBuildPatchAppManifest::GetFilePartHash(const FGuid& FilePartGuid, uint64& OutHash) const
 {
-	const FChunkInfoData* const * FilePartInfo = ChunkInfoLookup.Find(FilePartGuid);
+	const FChunkInfo* const * FilePartInfo = ChunkInfoLookup.Find(FilePartGuid);
 	if (FilePartInfo)
 	{
 		OutHash = (*FilePartInfo)->Hash;
@@ -1723,8 +1292,8 @@ void FBuildPatchAppManifest::CopyCustomFields(const IBuildManifestRef& InOther,
 	FBuildPatchAppManifestRef Other = StaticCastSharedRef< FBuildPatchAppManifest >(InOther);
 
 	// Use lookup to overwrite existing and list additional fields
-	TArray<FCustomFieldData> Extras;
-	for (const FCustomFieldData& CustomField : Other->CustomFields)
+	TArray<FCustomField> Extras;
+	for (const FCustomField& CustomField : Other->CustomFields)
 	{
 		if (CustomFieldLookup.Contains(CustomField.Key))
 		{
@@ -1744,7 +1313,7 @@ void FBuildPatchAppManifest::CopyCustomFields(const IBuildManifestRef& InOther,
 
 	// Reset the loookup
 	CustomFieldLookup.Empty(CustomFields.Num());
-	for (FCustomFieldData& CustomField : CustomFields)
+	for (FCustomField& CustomField : CustomFields)
 	{
 		CustomFieldLookup.Add(CustomField.Key, &CustomField);
 	}
@@ -1768,9 +1337,9 @@ const IManifestFieldPtr FBuildPatchAppManifest::SetCustomField(const FString& Fi
 	}
 	else
 	{
-		CustomFields.Add(FCustomFieldData(FieldName, Value));
+		CustomFields.Add(FCustomField(FieldName, Value));
 		CustomFieldLookup.Empty(CustomFields.Num());
-		for (FCustomFieldData& CustomField : CustomFields)
+		for (FCustomField& CustomField : CustomFields)
 		{
 			CustomFieldLookup.Add(CustomField.Key, &CustomField);
 		}
@@ -1790,9 +1359,9 @@ const IManifestFieldPtr FBuildPatchAppManifest::SetCustomField(const FString& Fi
 
 void FBuildPatchAppManifest::RemoveCustomField(const FString& FieldName)
 {
-	CustomFields.RemoveAll([&](const FCustomFieldData& Entry){ return Entry.Key == FieldName; });
+	CustomFields.RemoveAll([&](const FCustomField& Entry){ return Entry.Key == FieldName; });
 	CustomFieldLookup.Empty(CustomFields.Num());
-	for (FCustomFieldData& CustomField : CustomFields)
+	for (FCustomField& CustomField : CustomFields)
 	{
 		CustomFieldLookup.Add(CustomField.Key, &CustomField);
 	}
@@ -1833,10 +1402,10 @@ TArray<FFileChunkPart> FBuildPatchAppManifest::GetFilePartsForChunk(const FGuid&
 {
 	TArray<FFileChunkPart> FileParts;
 	FBlockStructure FoundParts;
-	for (const FFileManifestData& FileManifest: FileManifestList)
+	for (const FFileManifest& FileManifest: FileManifestList)
 	{
 		uint64 FileOffset = 0;
-		for (const FChunkPartData& ChunkPart : FileManifest.FileChunkParts)
+		for (const FChunkPart& ChunkPart : FileManifest.FileChunkParts)
 		{
 			if (ChunkId == ChunkPart.Guid)
 			{
@@ -1861,9 +1430,9 @@ TArray<FFileChunkPart> FBuildPatchAppManifest::GetFilePartsForChunk(const FGuid&
 
 bool FBuildPatchAppManifest::HasFileAttributes() const
 {
-	for (const TPair<FString, FFileManifestData*>& FileManifestPair : FileManifestLookup)
+	for (const TPair<FString, FFileManifest*>& FileManifestPair : FileManifestLookup)
 	{
-		const FFileManifestData* FileManifest = FileManifestPair.Value;
+		const FFileManifest* FileManifest = FileManifestPair.Value;
 		if (FileManifest->bIsReadOnly || FileManifest->bIsUnixExecutable || FileManifest->bIsCompressed)
 		{
 			return true;
@@ -1878,7 +1447,7 @@ void FBuildPatchAppManifest::GetRemovableFiles(const IBuildManifestRef& InOldMan
 	const FBuildPatchAppManifestRef OldManifest = StaticCastSharedRef< FBuildPatchAppManifest >(InOldManifest);
 	// Simply put, any files that exist in the OldManifest file list, but do not in this manifest's file list, are assumed
 	// to be files no longer required by the build
-	for (const FFileManifestData& OldFile : OldManifest->FileManifestList)
+	for (const FFileManifest& OldFile : OldManifest->FileManifestList)
 	{
 		if (!FileManifestLookup.Contains(OldFile.Filename))
 		{
@@ -1932,7 +1501,7 @@ void FBuildPatchAppManifest::GetOutdatedFiles(const FBuildPatchAppManifestPtr& O
 	{
 		// Enumerate files in the this file list, that do not exist, or have different hashes in the OldManifest
 		// to be files no longer required by the build
-		for (const FFileManifestData& NewFile : FileManifestList)
+		for (const FFileManifest& NewFile : FileManifestList)
 		{
 			const int64 ExistingFileSize = IFileManager::Get().FileSize(*(InstallDirectory / NewFile.Filename));
 			// Check changed
@@ -1957,8 +1526,8 @@ bool FBuildPatchAppManifest::IsFileOutdated(const FBuildPatchAppManifestRef& Old
 		return false;
 	}
 	// Get file manifests
-	const FFileManifestData* OldFile = OldManifest->GetFileManifest(Filename);
-	const FFileManifestData* NewFile = GetFileManifest(Filename);
+	const FFileManifest* OldFile = OldManifest->GetFileManifest(Filename);
+	const FFileManifest* NewFile = GetFileManifest(Filename);
 	// Out of date if not in either manifest
 	if (!OldFile || !NewFile)
 	{
@@ -1976,9 +1545,9 @@ uint32 FBuildPatchAppManifest::GetNumberOfChunkReferences(const FGuid& ChunkGuid
 {
 	uint32 RefCount = 0;
 	// For each file in the manifest, check if it has references to this chunk
-	for (const FFileManifestData& FileManifest : FileManifestList)
+	for (const FFileManifest& FileManifest : FileManifestList)
 	{
-		for (const FChunkPartData& ChunkPart : FileManifest.FileChunkParts)
+		for (const FChunkPart& ChunkPart : FileManifest.FileChunkParts)
 		{
 			if (ChunkPart.Guid == ChunkGuid)
 			{
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.h
index e56b4b6f6b48..6903ccfb286f 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchManifest.h
@@ -7,12 +7,9 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "UObject/Object.h"
 #include "Misc/Guid.h"
 #include "Interfaces/IBuildManifest.h"
 #include "Data/ChunkData.h"
-#include "BuildPatchManifest.generated.h"
 
 class FBuildPatchAppManifest;
 class FBuildPatchCustomField;
@@ -99,7 +96,6 @@ namespace EBuildPatchAppManifestVersion
 /**
  * An enum type to describe the format that manifest data is stored
  */
-UENUM()
 namespace EManifestFileHeader
 {
 	enum Type
@@ -113,213 +109,78 @@ namespace EManifestFileHeader
 	};
 }
 
-/**
- * A data structure that hold a manifests custom field. This is a key value pair of strings
- */
-USTRUCT()
-struct FCustomFieldData
-{
-public:
-	GENERATED_USTRUCT_BODY()
-	FCustomFieldData();
-	FCustomFieldData(const FString& Key, const FString& Value);
-
-public:
-	UPROPERTY()
-	FString Key;
-
-	UPROPERTY()
-	FString Value;
-};
-
-/**
- * A UStruct wrapping SHA1 hash data for serialization
- */
-USTRUCT()
-struct FSHAHashData
-{
-	GENERATED_USTRUCT_BODY()
-
-	UPROPERTY()
-	uint8 Hash[FSHA1::DigestSize];
-
-	FSHAHashData();
-	FString ToString() const;
-	bool IsZero() const;
-
-	friend bool operator==(const FSHAHashData& X, const FSHAHashData& Y)
-	{
-		return FMemory::Memcmp(X.Hash, Y.Hash, FSHA1::DigestSize) == 0;
-	}
-
-	friend bool operator==(const FSHAHashData& X, const FSHAHash& Y)
-	{
-		return FMemory::Memcmp(X.Hash, Y.Hash, FSHA1::DigestSize) == 0;
-	}
-
-	friend bool operator!=(const FSHAHashData& X, const FSHAHashData& Y)
-	{
-		return FMemory::Memcmp(X.Hash, Y.Hash, FSHA1::DigestSize) != 0;
-	}
-
-	friend bool operator!=(const FSHAHashData& X, const FSHAHash& Y)
-	{
-		return FMemory::Memcmp(X.Hash, Y.Hash, FSHA1::DigestSize) != 0;
-	}
-};
-
-static_assert(FSHA1::DigestSize == 20, "If this changes a lot of stuff here will break!");
-
 /**
  * A data structure describing a chunk file
  */
-USTRUCT()
-struct FChunkInfoData
+struct FChunkInfo
 {
 public:
-	GENERATED_USTRUCT_BODY()
-	FChunkInfoData();
+	FChunkInfo();
 
 public:
-	UPROPERTY()
 	FGuid Guid;
 
-	UPROPERTY()
 	uint64 Hash;
 
-	UPROPERTY()
-	FSHAHashData ShaHash;
+	FSHAHash ShaHash;
 
-	UPROPERTY()
 	int64 FileSize;
 
-	UPROPERTY()
 	uint8 GroupNumber;
 };
 
 /**
  * A data structure describing the part of a chunk used to construct a file
  */
-USTRUCT()
-struct FChunkPartData
+struct FChunkPart
 {
 public:
-	GENERATED_USTRUCT_BODY()
-	FChunkPartData();
+	FChunkPart();
 
 public:
 	// The GUID of the chunk containing this part
-	UPROPERTY()
 	FGuid Guid;
 
 	// The offset of the first byte into the chunk
-	UPROPERTY()
 	uint32 Offset;
 
 	// The size of this part
-	UPROPERTY()
 	uint32 Size;
 };
 
 /**
  * A data structure that describes a file's construction information
  */
-USTRUCT()
-struct FFileManifestData
+struct FFileManifest
 {
 public:
-	GENERATED_USTRUCT_BODY()
-	FFileManifestData();
+	FFileManifest();
 
 	void Init();
 	int64 GetFileSize() const;
-	bool operator<(const FFileManifestData& Other) const;
+	bool operator<(const FFileManifest& Other) const;
 
 public:
-	UPROPERTY()
 	FString Filename;
 
-	UPROPERTY()
-	FSHAHashData FileHash;
+	FSHAHash FileHash;
 
-	UPROPERTY()
-	TArray<FChunkPartData> FileChunkParts;
+	TArray<FChunkPart> FileChunkParts;
 
-	UPROPERTY()
 	TArray<FString> InstallTags;
 
-	UPROPERTY()
 	bool bIsUnixExecutable;
 
-	UPROPERTY()
 	FString SymlinkTarget;
 
-	UPROPERTY()
 	bool bIsReadOnly;
 
-	UPROPERTY()
 	bool bIsCompressed;
 
 private:
 	int64 FileSize;
 };
 
-/**
- * This is the manifest UObject where all manifest data is stored
- */
-UCLASS()
-class UBuildPatchManifest : public UObject
-{
-public:
-	GENERATED_UCLASS_BODY()
-	~UBuildPatchManifest();
-
-	void Clear();
-
-public:
-	UPROPERTY()
-	uint8 ManifestFileVersion;
-
-	UPROPERTY()
-	bool bIsFileData;
-
-	UPROPERTY()
-	uint32 AppID;
-
-	UPROPERTY()
-	FString AppName;
-
-	UPROPERTY()
-	FString BuildVersion;
-
-	UPROPERTY()
-	FString LaunchExe;
-
-	UPROPERTY()
-	FString LaunchCommand;
-
-	UPROPERTY()
-	TSet<FString> PrereqIds;
-
-	UPROPERTY()
-	FString PrereqName;
-
-	UPROPERTY()
-	FString PrereqPath;
-
-	UPROPERTY()
-	FString PrereqArgs;
-
-	UPROPERTY()
-	TArray<FFileManifestData> FileManifestList;
-
-	UPROPERTY()
-	TArray<FChunkInfoData> ChunkList;
-
-	UPROPERTY()
-	TArray<FCustomFieldData> CustomFields;
-};
-
 /**
  * The manifest file header wraps the manifest data stored in a file on disc to describe how to read it
  */
@@ -336,7 +197,7 @@ public:
 	uint32 HeaderSize;
 	uint32 DataSize;
 	uint32 CompressedSize;
-	FSHAHashData SHAHash;
+	FSHAHash SHAHash;
 	uint8 StoredAs;
 };
 
@@ -390,8 +251,8 @@ public:
 	FString Filename;
 	// The offset into the file of this piece
 	uint64 FileOffset;
-	// The FChunkPartData that can be salvaged from this file
-	FChunkPartData ChunkPart;
+	// The FChunkPart that can be salvaged from this file
+	FChunkPart ChunkPart;
 };
 
 // Required to allow private access to manifest builder for now..
@@ -414,7 +275,9 @@ class FBuildPatchAppManifest
 	friend class BuildPatchServices::FManifestBuilder;
 	friend class FBuildMergeManifests;
 	friend class FBuildDiffManifests;
+	friend class FManifestUObject;
 public:
+	typedef TPair<FString, FString> FCustomField;
 
 	/**
 	 * Default constructor
@@ -585,7 +448,7 @@ public:
 	 * @param Filename	The filename.
 	 * @return	The file manifest, or invalid ptr
 	 */
-	virtual const FFileManifestData* GetFileManifest(const FString& Filename) const;
+	virtual const FFileManifest* GetFileManifest(const FString& Filename) const;
 
 	/**
 	 * Gets whether this manifest is made up of file data instead of chunk data
@@ -607,7 +470,7 @@ public:
 	 * @param OutHash		OUT		Receives the hash value if found
 	 * @return	true if we had the hash for this chunk
 	 */
-	virtual bool GetChunkShaHash(const FGuid& ChunkGuid, FSHAHashData& OutHash) const;
+	virtual bool GetChunkShaHash(const FGuid& ChunkGuid, FSHAHash& OutHash) const;
 
 	/**
 	 * Gets the file hash for given file data
@@ -615,7 +478,7 @@ public:
 	 * @param OutHash		OUT		Receives the hash value if found
 	 * @return	true if we had the hash for this file
 	 */
-	virtual bool GetFileHash(const FGuid& FileGuid, FSHAHashData& OutHash) const; // DEPRECATE ME
+	virtual bool GetFileHash(const FGuid& FileGuid, FSHAHash& OutHash) const; // DEPRECATE ME
 
 	/**
 	 * Gets the file hash for a given file
@@ -623,7 +486,7 @@ public:
 	 * @param OutHash		OUT		Receives the hash value if found
 	 * @return	true if we had the hash for this file
 	 */
-	virtual bool GetFileHash(const FString& Filename, FSHAHashData& OutHash) const;
+	virtual bool GetFileHash(const FString& Filename, FSHAHash& OutHash) const;
 
 	/**
 	 * Gets the file hash for given file data. Valid for non-chunked manifest
@@ -668,9 +531,6 @@ public:
 	virtual bool HasFileAttributes() const;
 
 private:
-
-	bool Serialize(FArchive& Ar);
-
 	/**
 	 * Destroys any memory we have allocated and clears out ready for generation of a new manifest
 	 */
@@ -682,7 +542,6 @@ private:
 	void InitLookups();
 
 private:
-
 	/** Holds the actual manifest data. Some other variables point to the memory held by these objects */
 	uint8 ManifestFileVersion;
 	bool bIsFileData;
@@ -695,19 +554,19 @@ private:
 	FString PrereqName;
 	FString PrereqPath;
 	FString PrereqArgs;
-	TArray<FFileManifestData> FileManifestList;
-	TArray<FChunkInfoData> ChunkList;
-	TArray<FCustomFieldData> CustomFields;
+	TArray<FFileManifest> FileManifestList;
+	TArray<FChunkInfo> ChunkList;
+	TArray<FCustomField> CustomFields;
 
 	/** Holds the handle to our PreExit delegate */
 	FDelegateHandle OnPreExitHandle;
 
 	/** Some lookups to optimize data access */
 	TMap<FGuid, FString*> FileNameLookup;
-	TMap<FString, FFileManifestData*> FileManifestLookup;
-	TMap<FString, TArray<FFileManifestData*>> TaggedFilesLookup;
-	TMap<FGuid, FChunkInfoData*> ChunkInfoLookup;
-	TMap<FString, FCustomFieldData*> CustomFieldLookup;
+	TMap<FString, FFileManifest*> FileManifestLookup;
+	TMap<FString, TArray<FFileManifest*>> TaggedFilesLookup;
+	TMap<FGuid, FChunkInfo*> ChunkInfoLookup;
+	TMap<FString, FCustomField*> CustomFieldLookup;
 
 	/** Holds the total build size in bytes */
 	int64 TotalBuildSize;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchMergeManifests.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchMergeManifests.cpp
index 6318f7f93615..23780382e9e7 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchMergeManifests.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchMergeManifests.cpp
@@ -1,13 +1,14 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "BuildPatchMergeManifests.h"
-#include "Misc/FileHelper.h"
-#include "Misc/Paths.h"
 #include "HAL/ThreadSafeBool.h"
-#include "Misc/Guid.h"
-#include "BuildPatchManifest.h"
 #include "Async/Future.h"
 #include "Async/Async.h"
+#include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
+#include "Misc/OutputDeviceRedirector.h"
+#include "Misc/Guid.h"
+#include "BuildPatchManifest.h"
 
 DECLARE_LOG_CATEGORY_EXTERN(LogMergeManifests, Log, All);
 DEFINE_LOG_CATEGORY(LogMergeManifests);
@@ -27,13 +28,13 @@ namespace MergeHelpers
 		return FBuildPatchAppManifestPtr();
 	}
 
-	bool CopyFileDataFromManifestToArray(const TSet<FString>& Filenames, const FBuildPatchAppManifestPtr& Source, TArray<FFileManifestData>& DestArray)
+	bool CopyFileDataFromManifestToArray(const TSet<FString>& Filenames, const FBuildPatchAppManifestPtr& Source, TArray<FFileManifest>& DestArray)
 	{
 		bool bSuccess = true;
 		for (const FString& Filename : Filenames)
 		{
 			check(Source.IsValid());
-			const FFileManifestData* FileManifest = Source->GetFileManifest(Filename);
+			const FFileManifest* FileManifest = Source->GetFileManifest(Filename);
 			if (FileManifest == nullptr)
 			{
 				UE_LOG(LogMergeManifests, Error, TEXT("Could not find file in %s %s: %s"), *Source->GetAppName(), *Source->GetVersionString(), *Filename);
@@ -172,16 +173,16 @@ bool FBuildMergeManifests::MergeManifests(const FString& ManifestFilePathA, cons
 
 	// Fill out the chunk list in order of reference
 	TSet<FGuid> ReferencedChunks;
-	for (const FFileManifestData& FileManifest: MergedManifest.FileManifestList)
+	for (const FFileManifest& FileManifest: MergedManifest.FileManifestList)
 	{
-		for (const FChunkPartData& FileChunkPart : FileManifest.FileChunkParts)
+		for (const FChunkPart& FileChunkPart : FileManifest.FileChunkParts)
 		{
 			if (ReferencedChunks.Contains(FileChunkPart.Guid) == false)
 			{
 				ReferencedChunks.Add(FileChunkPart.Guid);
 
 				// Find the chunk info
-				FChunkInfoData** ChunkInfo = ManifestB->ChunkInfoLookup.Find(FileChunkPart.Guid);
+				FChunkInfo** ChunkInfo = ManifestB->ChunkInfoLookup.Find(FileChunkPart.Guid);
 				if (ChunkInfo == nullptr)
 				{
 					ChunkInfo = ManifestA->ChunkInfoLookup.Find(FileChunkPart.Guid);
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchPackageChunkData.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchPackageChunkData.cpp
index 2631a907ffa6..4287937cab36 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchPackageChunkData.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchPackageChunkData.cpp
@@ -4,6 +4,7 @@
 #include "BuildPatchManifest.h"
 #include "Async/TaskGraphInterfaces.h"
 #include "Serialization/MemoryWriter.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "Core/Platform.h"
 #include "Common/HttpManager.h"
 #include "Common/FileSystem.h"
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchServicesModule.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchServicesModule.cpp
index 368b33c7c444..71eac4529f54 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchServicesModule.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchServicesModule.cpp
@@ -5,13 +5,14 @@
 =============================================================================*/
 
 #include "BuildPatchServicesModule.h"
+#include "Containers/Ticker.h"
 #include "Misc/CommandLine.h"
 #include "Misc/Paths.h"
-#include "Containers/Ticker.h"
 #include "Misc/ConfigCacheIni.h"
 #include "Misc/FeedbackContext.h"
 #include "Misc/CoreDelegates.h"
 #include "Misc/App.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "Modules/ModuleManager.h"
 #include "HttpModule.h"
 #include "HttpManager.h"
@@ -202,6 +203,8 @@ IBuildInstallerRef FBuildPatchServicesModule::StartBuildInstall(BuildPatchServic
 
 bool FBuildPatchServicesModule::Tick( float Delta )
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FBuildPatchServicesModule_Tick);
+
 	// Using a local bool for this check will improve the assert message that gets displayed.
 	// This one is unlikely to assert unless the FTicker's core tick is not ticked on the main thread for some reason.
 	const bool bIsCalledFromMainThread = IsInGameThread();
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.cpp
index 67ffbb97530b..d4617ef61b1b 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.cpp
@@ -6,6 +6,7 @@
 
 #include "BuildPatchUtil.h"
 #include "Misc/Paths.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "BuildPatchServicesModule.h"
 #include "Data/ChunkData.h"
 #include "BuildPatchHash.h"
@@ -21,7 +22,7 @@ FString FBuildPatchUtils::GetChunkNewFilename( const EBuildPatchAppManifestVersi
 	return FPaths::Combine( *RootDirectory, *FString::Printf( TEXT("%s/%02d/%016llX_%s.chunk"), *EBuildPatchAppManifestVersion::GetChunkSubdir( ManifestVersion ),FCrc::MemCrc32( &ChunkGUID, sizeof( FGuid ) ) % 100, ChunkHash, *ChunkGUID.ToString() ) );
 }
 
-FString FBuildPatchUtils::GetFileNewFilename(const EBuildPatchAppManifestVersion::Type ManifestVersion, const FString& RootDirectory, const FGuid& FileGUID, const FSHAHashData& FileHash)
+FString FBuildPatchUtils::GetFileNewFilename(const EBuildPatchAppManifestVersion::Type ManifestVersion, const FString& RootDirectory, const FGuid& FileGUID, const FSHAHash& FileHash)
 {
 	check( FileGUID.IsValid() );
 	return FPaths::Combine( *RootDirectory, *FString::Printf( TEXT("%s/%02d/%s_%s.file"), *EBuildPatchAppManifestVersion::GetFileSubdir( ManifestVersion ), FCrc::MemCrc32( &FileGUID, sizeof( FGuid ) ) % 100, *FileHash.ToString(), *FileGUID.ToString() ) );
@@ -46,7 +47,7 @@ void FBuildPatchUtils::GetChunkDetailFromNewFilename( const FString& ChunkNewFil
 	FGuid::Parse( GuidString, ChunkGUID );
 }
 
-void FBuildPatchUtils::GetFileDetailFromNewFilename(const FString& FileNewFilename, FGuid& FileGUID, FSHAHashData& FileHash)
+void FBuildPatchUtils::GetFileDetailFromNewFilename(const FString& FileNewFilename, FGuid& FileGUID, FSHAHash& FileHash)
 {
 	const FString FileFilename = FPaths::GetBaseFilename( FileNewFilename );
 	FString GuidString;
@@ -105,7 +106,7 @@ FString FBuildPatchUtils::GetDataFilename(const FBuildPatchAppManifestRef& Manif
 	}
 	else if (Manifest->GetManifestVersion() <= EBuildPatchAppManifestVersion::StoredAsCompressedUClass)
 	{
-		FSHAHashData FileHash;
+		FSHAHash FileHash;
 		const bool bFound = Manifest->GetFileHash(DataGUID, FileHash);
 		// Should be impossible to not exist
 		check(bFound);
@@ -143,7 +144,7 @@ bool FBuildPatchUtils::GetGUIDFromFilename( const FString& DataFilename, FGuid&
 	return false;
 }
 
-uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHashData& Hash1, const FSHAHashData& Hash2)
+uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHash& Hash1, const FSHAHash& Hash2)
 {
 	FBuildPatchFloatDelegate NoProgressDelegate;
 	FBuildPatchBoolRetDelegate NoPauseDelegate;
@@ -151,7 +152,7 @@ uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileT
 	return VerifyFile(FileSystem, FileToVerify, Hash1, Hash2, NoProgressDelegate, NoPauseDelegate, NoAbortDelegate);
 }
 
-uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHashData& Hash1, const FSHAHashData& Hash2, FBuildPatchFloatDelegate ProgressDelegate, FBuildPatchBoolRetDelegate ShouldPauseDelegate, FBuildPatchBoolRetDelegate ShouldAbortDelegate)
+uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHash& Hash1, const FSHAHash& Hash2, FBuildPatchFloatDelegate ProgressDelegate, FBuildPatchBoolRetDelegate ShouldPauseDelegate, FBuildPatchBoolRetDelegate ShouldAbortDelegate)
 {
 	uint8 ReturnValue = 0;
 	TUniquePtr<FArchive> FileReader = FileSystem->CreateFileReader(*FileToVerify);
@@ -159,7 +160,7 @@ uint8 FBuildPatchUtils::VerifyFile(IFileSystem* FileSystem, const FString& FileT
 	if (FileReader.IsValid())
 	{
 		FSHA1 HashState;
-		FSHAHashData HashValue;
+		FSHAHash HashValue;
 		const int64 FileSize = FileReader->TotalSize();
 		uint8* FileReadBuffer = new uint8[FileBufferSize];
 		while (!FileReader->AtEnd() && (!ShouldAbortDelegate.IsBound() || !ShouldAbortDelegate.Execute()))
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.h
index b37d299e05dd..9b68eb45171a 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/BuildPatchUtil.h
@@ -52,7 +52,7 @@ struct FBuildPatchUtils
 	 * @param FileHash			The file hash value
 	 * @return	The file chunk path
 	 */
-	static FString GetFileNewFilename(const EBuildPatchAppManifestVersion::Type ManifestVersion, const FString& RootDirectory, const FGuid& FileGUID, const FSHAHashData& FileHash);
+	static FString GetFileNewFilename(const EBuildPatchAppManifestVersion::Type ManifestVersion, const FString& RootDirectory, const FGuid& FileGUID, const FSHAHash& FileHash);
 	static FString GetFileNewFilename(const EBuildPatchAppManifestVersion::Type ManifestVersion, const FString& RootDirectory, const FGuid& FileGUID, const uint64& FilePartHash);
 
 	/**
@@ -69,7 +69,7 @@ struct FBuildPatchUtils
 	 * @param FileGUID			OUT	The file chunk Guid
 	 * @param FileHash			OUT	The file chunk rolling hash value
 	 */
-	static void GetFileDetailFromNewFilename(const FString& FileNewFilename, FGuid& FileGUID, FSHAHashData& FileHash);
+	static void GetFileDetailFromNewFilename(const FString& FileNewFilename, FGuid& FileGUID, FSHAHash& FileHash);
 
 	/**
 	 * Gets the filename for a chunk generated from it's GUID
@@ -132,7 +132,7 @@ struct FBuildPatchUtils
 	 * @param ShouldAbortDelegate	IN		Delegate that returns a bool, which if true will abort the process
 	 * @return		0 if no match, 1 for match with Hash1, and 2 for match with Hash2
 	 */
-	static uint8 VerifyFile(BuildPatchServices::IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHashData& Hash1, const FSHAHashData& Hash2, FBuildPatchFloatDelegate ProgressDelegate, FBuildPatchBoolRetDelegate ShouldPauseDelegate, FBuildPatchBoolRetDelegate ShouldAbortDelegate);
+	static uint8 VerifyFile(BuildPatchServices::IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHash& Hash1, const FSHAHash& Hash2, FBuildPatchFloatDelegate ProgressDelegate, FBuildPatchBoolRetDelegate ShouldPauseDelegate, FBuildPatchBoolRetDelegate ShouldAbortDelegate);
 
 	/**
 	 * Checks a file against SHA1 hashes. The function takes two so that it can return no match, match with Hash1, or match with Hash2, that way we can check the file for being the same as an old manifest or new manifest
@@ -143,5 +143,5 @@ struct FBuildPatchUtils
 	 * @param Hash2					IN		A second Hash to match against the file
 	 * @return		0 if no match, 1 for match with Hash1, and 2 for match with Hash2
 	 */
-	static uint8 VerifyFile(BuildPatchServices::IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHashData& Hash1, const FSHAHashData& Hash2);
+	static uint8 VerifyFile(BuildPatchServices::IFileSystem* FileSystem, const FString& FileToVerify, const FSHAHash& Hash1, const FSHAHash& Hash2);
 };
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ChunkData.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ChunkData.cpp
index 2d29e35de638..e6ed4078fa53 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ChunkData.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ChunkData.cpp
@@ -483,7 +483,7 @@ namespace BuildPatchServices
 										OutLoadResult = EChunkLoadResult::HashCheckFailed;
 									}
 								}
-								FSHAHashData ShaHashCheck;
+								FSHAHash ShaHashCheck;
 								if (OutLoadResult == EChunkLoadResult::Success && (Header->HashType & EChunkHashFlags::Sha1) != EChunkHashFlags::None)
 								{
 									FSHA1::HashBuffer(Data, Header->DataSize, ShaHashCheck.Hash);
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.cpp
new file mode 100644
index 000000000000..c88a2cffe4f0
--- /dev/null
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.cpp
@@ -0,0 +1,643 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Data/ManifestUObject.h"
+#include "Serialization/Archive.h"
+#include "Serialization/MemoryWriter.h"
+#include "Serialization/MemoryReader.h"
+#include "Algo/Transform.h"
+#include "BuildPatchManifest.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogManifestUObject, Log, All);
+DEFINE_LOG_CATEGORY(LogManifestUObject);
+
+
+// The maximum number of FNames that we expect a manifest to generate. This is not a technical limitation, just a sanity check
+// and can be increased if more properties are added to our manifest UObject. FNames are only used by the UOject serialization system.
+#define MANIFEST_MAX_NAMES			50
+
+/* FCustomFieldData implementation
+*****************************************************************************/
+FCustomFieldData::FCustomFieldData()
+	: Key(TEXT(""))
+	, Value(TEXT(""))
+{
+}
+
+FCustomFieldData::FCustomFieldData(const FString& InKey, const FString& InValue)
+	: Key(InKey)
+	, Value(InValue)
+{
+}
+
+/* FSHAHashData implementation
+*****************************************************************************/
+FSHAHashData::FSHAHashData()
+{
+	FMemory::Memset(Hash, 0, FSHA1::DigestSize);
+}
+
+/* FChunkInfoData implementation
+*****************************************************************************/
+FChunkInfoData::FChunkInfoData()
+	: Guid()
+	, Hash(0)
+	, ShaHash()
+	, FileSize(0)
+	, GroupNumber(0)
+{
+}
+
+/* FChunkPartData implementation
+*****************************************************************************/
+FChunkPartData::FChunkPartData()
+	: Guid()
+	, Offset(0)
+	, Size(0)
+{
+}
+
+/* FFileManifestData implementation
+*****************************************************************************/
+FFileManifestData::FFileManifestData()
+	: Filename(TEXT(""))
+	, FileHash()
+	, FileChunkParts()
+	, bIsUnixExecutable(false)
+	, SymlinkTarget(TEXT(""))
+	, bIsReadOnly(false)
+	, bIsCompressed(false)
+{
+}
+
+/* UBuildPatchManifest implementation
+*****************************************************************************/
+UBuildPatchManifest::UBuildPatchManifest(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+	, ManifestFileVersion(EBuildPatchAppManifestVersion::Invalid)
+	, bIsFileData(false)
+	, AppID(INDEX_NONE)
+	, AppName(TEXT(""))
+	, BuildVersion(TEXT(""))
+	, LaunchExe(TEXT(""))
+	, LaunchCommand(TEXT(""))
+	, PrereqIds()
+	, PrereqName(TEXT(""))
+	, PrereqPath(TEXT(""))
+	, PrereqArgs(TEXT(""))
+	, FileManifestList()
+	, ChunkList()
+	, CustomFields()
+{
+}
+
+UBuildPatchManifest::~UBuildPatchManifest()
+{
+}
+
+namespace ManifestUObjectHelpers
+{
+	FChunkPart FromChunkPartData(const FChunkPartData& Input)
+	{
+		FChunkPart Output;
+		Output.Guid = Input.Guid;
+		Output.Offset = Input.Offset;
+		Output.Size = Input.Size;
+		return Output;
+	}
+
+	FFileManifest FromFileManifestData(const FFileManifestData& Input)
+	{
+		FFileManifest Output;
+		Output.Filename = Input.Filename;
+		FMemory::Memcpy(Output.FileHash.Hash, Input.FileHash.Hash, FSHA1::DigestSize);
+		Output.FileChunkParts.Empty(Input.FileChunkParts.Num());
+		Algo::Transform(Input.FileChunkParts, Output.FileChunkParts, &ManifestUObjectHelpers::FromChunkPartData);
+		Output.InstallTags = Input.InstallTags;
+		Output.bIsUnixExecutable = Input.bIsUnixExecutable;
+		Output.SymlinkTarget = Input.SymlinkTarget;
+		Output.bIsReadOnly = Input.bIsReadOnly;
+		Output.bIsCompressed = Input.bIsCompressed;
+		return Output;
+	}
+
+	FChunkInfo FromChunkInfoData(const FChunkInfoData& Input)
+	{
+		FChunkInfo Output;
+		Output.Guid = Input.Guid;
+		Output.Hash = Input.Hash;
+		FMemory::Memcpy(Output.ShaHash.Hash, Input.ShaHash.Hash, FSHA1::DigestSize);
+		Output.FileSize = Input.FileSize;
+		Output.GroupNumber = Input.GroupNumber;
+		return Output;
+	}
+
+	FBuildPatchAppManifest::FCustomField FromCustomFieldData(const FCustomFieldData& Input)
+	{
+		FBuildPatchAppManifest::FCustomField Output;
+		Output.Key = Input.Key;
+		Output.Value = Input.Value;
+		return Output;
+	}
+
+	FChunkPartData ToChunkPartData(const FChunkPart& Input)
+	{
+		FChunkPartData Output;
+		Output.Guid = Input.Guid;
+		Output.Offset = Input.Offset;
+		Output.Size = Input.Size;
+		return Output;
+	}
+
+	FFileManifestData ToFileManifestData(const FFileManifest& Input)
+	{
+		FFileManifestData Output;
+		Output.Filename = Input.Filename;
+		FMemory::Memcpy(Output.FileHash.Hash, Input.FileHash.Hash, FSHA1::DigestSize);
+		Output.FileChunkParts.Empty(Input.FileChunkParts.Num());
+		Algo::Transform(Input.FileChunkParts, Output.FileChunkParts, &ManifestUObjectHelpers::ToChunkPartData);
+		Output.InstallTags = Input.InstallTags;
+		Output.bIsUnixExecutable = Input.bIsUnixExecutable;
+		Output.SymlinkTarget = Input.SymlinkTarget;
+		Output.bIsReadOnly = Input.bIsReadOnly;
+		Output.bIsCompressed = Input.bIsCompressed;
+		return Output;
+	}
+
+	FChunkInfoData ToChunkInfoData(const FChunkInfo& Input)
+	{
+		FChunkInfoData Output;
+		Output.Guid = Input.Guid;
+		Output.Hash = Input.Hash;
+		FMemory::Memcpy(Output.ShaHash.Hash, Input.ShaHash.Hash, FSHA1::DigestSize);
+		Output.FileSize = Input.FileSize;
+		Output.GroupNumber = Input.GroupNumber;
+		return Output;
+	}
+
+	FCustomFieldData ToCustomFieldData(const FBuildPatchAppManifest::FCustomField& Input)
+	{
+		FCustomFieldData Output;
+		Output.Key = Input.Key;
+		Output.Value = Input.Value;
+		return Output;
+	}
+}
+
+/**
+ * Archive for writing a manifest into memory
+ */
+class FManifestWriter : public FArchive
+{
+public:
+	FManifestWriter()
+		: FArchive()
+		, Offset(0)
+	{
+		this->SetIsPersistent(false);
+		this->SetIsSaving(true);
+	}
+
+	virtual void Seek(int64 InPos) override
+	{
+		Offset = InPos;
+	}
+
+	virtual int64 Tell() override
+	{
+		return Offset;
+	}
+
+	virtual FString GetArchiveName() const override
+	{
+		return TEXT("FManifestWriter");
+	}
+
+	virtual FArchive& operator<<(FName& N) override
+	{
+		if (!FNameIndexLookup.Contains(N))
+		{
+			const int32 ArNameIndex = FNameIndexLookup.Num();
+			FNameIndexLookup.Add(N, ArNameIndex);
+		}
+		*this << FNameIndexLookup[N];
+		return *this;
+	}
+
+	virtual void Serialize(void* Data, int64 Num) override
+	{
+		if (Num && !ArIsError)
+		{
+			const int64 NumBytesToAdd = Offset + Num - Bytes.Num();
+			if (NumBytesToAdd > 0)
+			{
+				const int64 NewArrayCount = Bytes.Num() + NumBytesToAdd;
+				if (NewArrayCount >= MAX_int32)
+				{
+					ArIsError = true;
+					return;
+				}
+				Bytes.AddUninitialized((int32)NumBytesToAdd);
+			}
+			check((Offset + Num) <= Bytes.Num());
+			FMemory::Memcpy(&Bytes[Offset], Data, Num);
+			Offset += Num;
+		}
+	}
+
+	virtual int64 TotalSize() override
+	{
+		return Bytes.Num();
+	}
+
+	void Finalize()
+	{
+		TArray<uint8> FinalData;
+		FMemoryWriter NameTableWriter(FinalData);
+		int32 NumNames = FNameIndexLookup.Num();
+		check(NumNames <= MANIFEST_MAX_NAMES);
+		NameTableWriter << NumNames;
+		for (auto& MapEntry : FNameIndexLookup)
+		{
+			FName& Name = MapEntry.Key;
+			int32& Index = MapEntry.Value;
+			NameTableWriter << Name;
+			NameTableWriter << Index;
+		}
+		FinalData.Append(Bytes);
+		Bytes = MoveTemp(FinalData);
+	}
+
+	TArray<uint8>& GetBytes()
+	{
+		return Bytes;
+	}
+
+private:
+	int64 Offset;
+	TArray<uint8> Bytes;
+	TMap<FName, int32> FNameIndexLookup;
+};
+
+/**
+* Archive for reading a manifest from data in memory
+*/
+class FManifestReader : public FArchive
+{
+public:
+	FManifestReader(const TArray<uint8>& InBytes)
+		: FArchive()
+		, Offset(0)
+		, Bytes(InBytes)
+	{
+		this->SetIsPersistent(false);
+		this->SetIsLoading(true);
+
+		// Must load table immediately
+		FMemoryReader NameTableReader(InBytes);
+		int32 NumNames;
+		NameTableReader << NumNames;
+
+		// Check not insane, we know to expect a small number for a manifest
+		if (NumNames < MANIFEST_MAX_NAMES)
+		{
+			FNameLookup.Empty(NumNames);
+			for (; NumNames > 0; --NumNames)
+			{
+				FName Name;
+				int32 Index;
+				NameTableReader << Name;
+				NameTableReader << Index;
+				FNameLookup.Add(Index, Name);
+			}
+		}
+		else
+		{
+			ArIsError = true;
+		}
+		Offset = NameTableReader.Tell();
+	}
+
+	virtual FString GetArchiveName() const override
+	{
+		return TEXT("FManifestReader");
+	}
+
+	virtual void Seek(int64 InPos) override
+	{
+		check(InPos <= Bytes.Num());
+		Offset = InPos;
+	}
+
+	virtual int64 Tell() override
+	{
+		return Offset;
+	}
+
+	virtual FArchive& operator<<(FName& N) override
+	{
+		if (ArIsError)
+		{
+			N = NAME_None;
+		}
+		else
+		{
+			// Read index and lookup
+			int32 ArNameIndex;
+			*this << ArNameIndex;
+			if (FNameLookup.Contains(ArNameIndex))
+			{
+				N = FNameLookup[ArNameIndex];
+			}
+			else
+			{
+				N = NAME_None;
+				ArIsError = true;
+			}
+		}
+		return *this;
+	}
+
+	virtual void Serialize(void* Data, int64 Num) override
+	{
+		if (Num && !ArIsError)
+		{
+			// Only serialize if we have the requested amount of data
+			if (Offset + Num <= Bytes.Num())
+			{
+				FMemory::Memcpy(Data, &Bytes[Offset], Num);
+				Offset += Num;
+			}
+			else
+			{
+				ArIsError = true;
+			}
+		}
+	}
+
+	virtual int64 TotalSize() override
+	{
+		return Bytes.Num();
+	}
+
+private:
+	int64 Offset;
+	const TArray<uint8>& Bytes;
+	TMap<int32, FName> FNameLookup;
+};
+
+/* FManifestUObject implementation
+*****************************************************************************/
+
+bool FManifestUObject::LoadFromMemory(const TArray<uint8>& DataInput, FBuildPatchAppManifest& AppManifest)
+{
+#if !BUILDPATCHSERVICES_NOUOBJECT
+
+	FMemoryReader ManifestFile(DataInput);
+	FManifestFileHeader Header;
+	ManifestFile << Header;
+	const int32 SignedHeaderSize = Header.HeaderSize;
+	if (Header.CheckMagic() && DataInput.Num() > SignedHeaderSize)
+	{
+		FSHAHash DataHash;
+		FSHA1::HashBuffer(&DataInput[Header.HeaderSize], DataInput.Num() - Header.HeaderSize, DataHash.Hash);
+		if (DataHash == Header.SHAHash)
+		{
+			TArray<uint8> UncompressedData;
+			if (Header.StoredAs == EManifestFileHeader::STORED_COMPRESSED && (Header.CompressedSize + Header.HeaderSize) == DataInput.Num())
+			{
+				UncompressedData.AddUninitialized(Header.DataSize);
+				if (!FCompression::UncompressMemory(
+					static_cast<ECompressionFlags>(COMPRESS_ZLIB | COMPRESS_BiasMemory),
+					UncompressedData.GetData(),
+					Header.DataSize,
+					&DataInput[Header.HeaderSize],
+					DataInput.Num() - Header.HeaderSize))
+				{
+					return false;
+				}
+			}
+			else if ((Header.DataSize + Header.HeaderSize) == DataInput.Num())
+			{
+				UncompressedData.Append(&DataInput[Header.HeaderSize], Header.DataSize);
+			}
+			else
+			{
+				return false;
+			}
+			FManifestReader ManifestData(UncompressedData);
+			return LoadInternal(ManifestData, AppManifest);
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+
+#else // !BUILDPATCHSERVICES_NOUOBJECT
+
+	UE_LOG(LogManifestUObject, Error, TEXT("FManifestUObject::LoadFromMemory called but UObjects are disabled for BuildPatchServices"));
+	return false;
+
+#endif // !BUILDPATCHSERVICES_NOUOBJECT
+}
+
+bool FManifestUObject::SaveToArchive(FArchive& Ar, const FBuildPatchAppManifest& AppManifest)
+{
+#if !BUILDPATCHSERVICES_NOUOBJECT
+
+	if (Ar.IsSaving())
+	{
+		FManifestWriter ManifestData;
+		bool bSaveOk = SaveInternal(ManifestData, AppManifest);
+		ManifestData.Finalize();
+		if (bSaveOk && !ManifestData.IsError())
+		{
+			int32 DataSize = ManifestData.TotalSize();
+			TArray<uint8> TempCompressed;
+			TempCompressed.AddUninitialized(DataSize);
+			int32 CompressedSize = DataSize;
+			bool bDataIsCompressed = FCompression::CompressMemory(
+				static_cast<ECompressionFlags>(COMPRESS_ZLIB | COMPRESS_BiasMemory),
+				TempCompressed.GetData(),
+				CompressedSize,
+				ManifestData.GetBytes().GetData(),
+				DataSize);
+			TempCompressed.SetNum(CompressedSize);
+
+			TArray<uint8>& FileData = bDataIsCompressed ? TempCompressed : ManifestData.GetBytes();
+
+			FManifestFileHeader Header;
+			Header.StoredAs = bDataIsCompressed ? EManifestFileHeader::STORED_COMPRESSED : EManifestFileHeader::STORED_RAW;
+			Header.DataSize = DataSize;
+			Header.CompressedSize = bDataIsCompressed ? CompressedSize : 0;
+			FSHA1::HashBuffer(FileData.GetData(), FileData.Num(), Header.SHAHash.Hash);
+
+			// Write to provided archive
+			Ar << Header;
+			Header.HeaderSize = Ar.Tell();
+			Ar.Seek(0);
+			Ar << Header;
+			Ar.Serialize(FileData.GetData(), FileData.Num());
+		}
+		else
+		{
+			Ar.SetError();
+		}
+		return !Ar.IsError();
+	}
+	Ar.SetError();
+	return false;
+
+#else // !BUILDPATCHSERVICES_NOUOBJECT
+
+	UE_LOG(LogManifestUObject, Error, TEXT("FManifestUObject::SaveToArchive called but UObjects are disabled for BuildPatchServices"));
+	Ar.SetError();
+	return false;
+
+#endif // !BUILDPATCHSERVICES_NOUOBJECT
+}
+
+bool FManifestUObject::LoadInternal(FArchive& Ar, FBuildPatchAppManifest& AppManifest)
+{
+#if !BUILDPATCHSERVICES_NOUOBJECT
+
+	UBuildPatchManifest* Data = NewObject<UBuildPatchManifest>();
+	Data->AddToRoot();
+
+	// Make sure we use the correct serialization version, this is now fixed and must never use a newer version,
+	// because the property tag has changed in structure meaning older clients would not read correctly.
+	Ar.SetUE4Ver(VER_UE4_STRUCT_GUID_IN_PROPERTY_TAG - 1);
+
+	if (Ar.IsLoading())
+	{
+		Data->Serialize(Ar);
+
+		AppManifest.DestroyData();
+		AppManifest.ManifestFileVersion = MoveTemp(Data->ManifestFileVersion);
+		AppManifest.bIsFileData = MoveTemp(Data->bIsFileData);
+		AppManifest.AppID = MoveTemp(Data->AppID);
+		AppManifest.AppName = MoveTemp(Data->AppName);
+		AppManifest.BuildVersion = MoveTemp(Data->BuildVersion);
+		AppManifest.LaunchExe = MoveTemp(Data->LaunchExe);
+		AppManifest.LaunchCommand = MoveTemp(Data->LaunchCommand);
+		AppManifest.PrereqIds = MoveTemp(Data->PrereqIds);
+		AppManifest.PrereqName = MoveTemp(Data->PrereqName);
+		AppManifest.PrereqPath = MoveTemp(Data->PrereqPath);
+		AppManifest.PrereqArgs = MoveTemp(Data->PrereqArgs);
+
+		AppManifest.FileManifestList.Empty(Data->FileManifestList.Num());
+		Algo::Transform(Data->FileManifestList, AppManifest.FileManifestList, &ManifestUObjectHelpers::FromFileManifestData);
+
+		AppManifest.ChunkList.Empty(Data->ChunkList.Num());
+		Algo::Transform(Data->ChunkList, AppManifest.ChunkList, &ManifestUObjectHelpers::FromChunkInfoData);
+
+		AppManifest.CustomFields.Empty(Data->CustomFields.Num());
+		Algo::Transform(Data->CustomFields, AppManifest.CustomFields, &ManifestUObjectHelpers::FromCustomFieldData);
+
+		// If we didn't load the version number, we know it was skipped when saving therefore must be
+		// the first UObject version
+		if (AppManifest.ManifestFileVersion == static_cast<uint8>(EBuildPatchAppManifestVersion::Invalid))
+		{
+			AppManifest.ManifestFileVersion = EBuildPatchAppManifestVersion::StoredAsCompressedUClass;
+		}
+
+		// Setup internal lookups
+		AppManifest.InitLookups();
+	}
+	else
+	{
+		Ar.SetError();
+	}
+
+	// Clear data to reduce memory usages before GC occurs
+	Data->AppName.Empty();
+	Data->BuildVersion.Empty();
+	Data->LaunchExe.Empty();
+	Data->LaunchCommand.Empty();
+	Data->PrereqIds.Empty();
+	Data->PrereqName.Empty();
+	Data->PrereqPath.Empty();
+	Data->PrereqArgs.Empty();
+	Data->FileManifestList.Empty();
+	Data->ChunkList.Empty();
+	Data->CustomFields.Empty();
+
+	Data->RemoveFromRoot();
+	return !Ar.IsError();
+
+#else // !BUILDPATCHSERVICES_NOUOBJECT
+
+	UE_LOG(LogManifestUObject, Error, TEXT("FManifestUObject::SerializeInternal called but UObjects are disabled for BuildPatchServices"));
+	return false;
+
+#endif // !BUILDPATCHSERVICES_NOUOBJECT
+}
+
+bool FManifestUObject::SaveInternal(FArchive& Ar, const FBuildPatchAppManifest& AppManifest)
+{
+#if !BUILDPATCHSERVICES_NOUOBJECT
+
+	UBuildPatchManifest* Data = NewObject<UBuildPatchManifest>();
+	Data->AddToRoot();
+
+	// Make sure we use the correct serialization version, this is now fixed and must never use a newer version,
+	// because the property tag has changed in structure meaning older clients would not read correctly.
+	Ar.SetUE4Ver(VER_UE4_STRUCT_GUID_IN_PROPERTY_TAG - 1);
+
+	if (Ar.IsLoading())
+	{
+		Ar.SetError();
+	}
+	else
+	{
+		Data->ManifestFileVersion = AppManifest.ManifestFileVersion;
+		Data->bIsFileData = AppManifest.bIsFileData;
+		Data->AppID = AppManifest.AppID;
+		Data->AppName = AppManifest.AppName;
+		Data->BuildVersion = AppManifest.BuildVersion;
+		Data->LaunchExe = AppManifest.LaunchExe;
+		Data->LaunchCommand = AppManifest.LaunchCommand;
+		Data->PrereqIds = AppManifest.PrereqIds;
+		Data->PrereqName = AppManifest.PrereqName;
+		Data->PrereqPath = AppManifest.PrereqPath;
+		Data->PrereqArgs = AppManifest.PrereqArgs;
+
+		Data->FileManifestList.Empty(AppManifest.FileManifestList.Num());
+		Algo::Transform(AppManifest.FileManifestList, Data->FileManifestList, &ManifestUObjectHelpers::ToFileManifestData);
+
+		Data->ChunkList.Empty(AppManifest.ChunkList.Num());
+		Algo::Transform(AppManifest.ChunkList, Data->ChunkList, &ManifestUObjectHelpers::ToChunkInfoData);
+
+		Data->CustomFields.Empty(AppManifest.CustomFields.Num());
+		Algo::Transform(AppManifest.CustomFields, Data->CustomFields, &ManifestUObjectHelpers::ToCustomFieldData);
+
+		Data->Serialize(Ar);
+	}
+
+	// Clear data to reduce memory usages before GC occurs
+	Data->AppName.Empty();
+	Data->BuildVersion.Empty();
+	Data->LaunchExe.Empty();
+	Data->LaunchCommand.Empty();
+	Data->PrereqIds.Empty();
+	Data->PrereqName.Empty();
+	Data->PrereqPath.Empty();
+	Data->PrereqArgs.Empty();
+	Data->FileManifestList.Empty();
+	Data->ChunkList.Empty();
+	Data->CustomFields.Empty();
+
+	Data->RemoveFromRoot();
+	return !Ar.IsError();
+
+#else // !BUILDPATCHSERVICES_NOUOBJECT
+
+	UE_LOG(LogManifestUObject, Error, TEXT("FManifestUObject::SerializeInternal called but UObjects are disabled for BuildPatchServices"));
+	return false;
+
+#endif // !BUILDPATCHSERVICES_NOUOBJECT
+}
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.h
new file mode 100644
index 000000000000..46ff4e1c16ea
--- /dev/null
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Data/ManifestUObject.h
@@ -0,0 +1,187 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Object.h"
+#include "Misc/Guid.h"
+#include "Misc/SecureHash.h"
+#include "ManifestUObject.generated.h"
+
+/**
+ * This file contains structures and classes specific for use with loading and saving manifests with UStruct serialization, and relies
+ * on the ability to have a CoreUObject dependency.
+ */
+
+#ifndef BUILDPATCHSERVICES_NOUOBJECT
+#define BUILDPATCHSERVICES_NOUOBJECT 0
+#endif
+
+class FBuildPatchAppManifest;
+
+USTRUCT()
+struct FCustomFieldData
+{
+public:
+	GENERATED_USTRUCT_BODY()
+	FCustomFieldData();
+	FCustomFieldData(const FString& Key, const FString& Value);
+
+public:
+	UPROPERTY()
+	FString Key;
+
+	UPROPERTY()
+	FString Value;
+};
+
+USTRUCT()
+struct FSHAHashData
+{
+public:
+	GENERATED_USTRUCT_BODY()
+	FSHAHashData();
+
+public:
+	UPROPERTY()
+	uint8 Hash[FSHA1::DigestSize];
+
+};
+static_assert(FSHA1::DigestSize == 20, "If this changes a lot of stuff here will break!");
+
+USTRUCT()
+struct FChunkInfoData
+{
+public:
+	GENERATED_USTRUCT_BODY()
+	FChunkInfoData();
+
+public:
+	UPROPERTY()
+	FGuid Guid;
+
+	UPROPERTY()
+	uint64 Hash;
+
+	UPROPERTY()
+	FSHAHashData ShaHash;
+
+	UPROPERTY()
+	int64 FileSize;
+
+	UPROPERTY()
+	uint8 GroupNumber;
+};
+
+USTRUCT()
+struct FChunkPartData
+{
+public:
+	GENERATED_USTRUCT_BODY()
+	FChunkPartData();
+
+public:
+	UPROPERTY()
+	FGuid Guid;
+
+	UPROPERTY()
+	uint32 Offset;
+
+	UPROPERTY()
+	uint32 Size;
+};
+
+USTRUCT()
+struct FFileManifestData
+{
+public:
+	GENERATED_USTRUCT_BODY()
+	FFileManifestData();
+
+public:
+	UPROPERTY()
+	FString Filename;
+
+	UPROPERTY()
+	FSHAHashData FileHash;
+
+	UPROPERTY()
+	TArray<FChunkPartData> FileChunkParts;
+
+	UPROPERTY()
+	TArray<FString> InstallTags;
+
+	UPROPERTY()
+	bool bIsUnixExecutable;
+
+	UPROPERTY()
+	FString SymlinkTarget;
+
+	UPROPERTY()
+	bool bIsReadOnly;
+
+	UPROPERTY()
+	bool bIsCompressed;
+};
+
+UCLASS()
+class UBuildPatchManifest : public UObject
+{
+public:
+	GENERATED_UCLASS_BODY()
+	~UBuildPatchManifest();
+
+public:
+	UPROPERTY()
+	uint8 ManifestFileVersion;
+
+	UPROPERTY()
+	bool bIsFileData;
+
+	UPROPERTY()
+	uint32 AppID;
+
+	UPROPERTY()
+	FString AppName;
+
+	UPROPERTY()
+	FString BuildVersion;
+
+	UPROPERTY()
+	FString LaunchExe;
+
+	UPROPERTY()
+	FString LaunchCommand;
+
+	UPROPERTY()
+	TSet<FString> PrereqIds;
+
+	UPROPERTY()
+	FString PrereqName;
+
+	UPROPERTY()
+	FString PrereqPath;
+
+	UPROPERTY()
+	FString PrereqArgs;
+
+	UPROPERTY()
+	TArray<FFileManifestData> FileManifestList;
+
+	UPROPERTY()
+	TArray<FChunkInfoData> ChunkList;
+
+	UPROPERTY()
+	TArray<FCustomFieldData> CustomFields;
+};
+
+class FManifestUObject
+{
+public:
+	static bool LoadFromMemory(const TArray<uint8>& DataInput, FBuildPatchAppManifest& AppManifest);
+	static bool SaveToArchive(FArchive& Ar, const FBuildPatchAppManifest& AppManifest);
+
+private:
+	static bool LoadInternal(FArchive& Ar, FBuildPatchAppManifest& AppManifest);
+	static bool SaveInternal(FArchive& Ar, const FBuildPatchAppManifest& AppManifest);
+};
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ChunkWriter.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ChunkWriter.cpp
index 1cebcefc88f0..31ffde1bffd4 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ChunkWriter.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ChunkWriter.cpp
@@ -4,6 +4,7 @@
 #include "HAL/FileManager.h"
 #include "HAL/RunnableThread.h"
 #include "Misc/ScopeLock.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "Data/ChunkData.h"
 #include "BuildPatchUtil.h"
 
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/CloudEnumeration.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/CloudEnumeration.cpp
index 99ce17fe9a9a..58e7aba337d7 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/CloudEnumeration.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/CloudEnumeration.cpp
@@ -155,7 +155,7 @@ namespace BuildPatchServices
 		Manifest->GetDataList(DataList);
 		if (!Manifest->IsFileDataManifest())
 		{
-			FSHAHashData DataShaHash;
+			FSHAHash DataShaHash;
 			uint64 DataChunkHash;
 			for (const auto& DataGuid : DataList)
 			{
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.cpp
index 7844f4b99487..2c449b196153 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.cpp
@@ -32,11 +32,11 @@ namespace BuildPatchServices
 		virtual ~FManifestBuilder();
 
 		virtual void AddChunkMatch(const FGuid& ChunkGuid, const FBlockStructure& Structure) override;
-		virtual bool FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfoData> ChunkInfo) override;
+		virtual bool FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfo> ChunkInfo) override;
 		virtual bool SaveToFile(const FString& Filename) override;
 
 	private:
-		TArray<FChunkPartData> GetChunkPartsForFile(uint64 StartIdx, uint64 Size, TSet<FGuid>& ReferencedChunks);
+		TArray<FChunkPart> GetChunkPartsForFile(uint64 StartIdx, uint64 Size, TSet<FGuid>& ReferencedChunks);
 
 		FBuildPatchAppManifestRef Manifest;
 		TMap<FString, FFileAttributes> FileAttributesMap;
@@ -93,7 +93,7 @@ namespace BuildPatchServices
 		UE_LOG(LogManifestBuilder, Verbose, TEXT("Match added for chunk %s."), *ChunkGuid.ToString());
 	}
 
-	bool FManifestBuilder::FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfoData> ChunkInfo)
+	bool FManifestBuilder::FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfo> ChunkInfo)
 	{
 		// Keep track of referenced chunks so we can trim the list down.
 		TSet<FGuid> ReferencedChunks;
@@ -102,7 +102,7 @@ namespace BuildPatchServices
 		{
 			FFileAttributes FileAttributes = FileAttributesMap.FindRef(FileSpan.Filename);
 			Manifest->FileManifestList.AddDefaulted();
-			FFileManifestData& FileManifest = Manifest->FileManifestList.Last();
+			FFileManifest& FileManifest = Manifest->FileManifestList.Last();
 			FileManifest.Filename = FileSpan.Filename;
 			FMemory::Memcpy(FileManifest.FileHash.Hash, FileSpan.SHAHash.Hash, FSHA1::DigestSize);
 			FileManifest.InstallTags = FileAttributes.InstallTags.Array();
@@ -119,7 +119,7 @@ namespace BuildPatchServices
 		// Setup chunk list, removing all that were not referenced.
 		Manifest->ChunkList = MoveTemp(ChunkInfo);
 		int32 TotalChunkListNum = Manifest->ChunkList.Num();
-		Manifest->ChunkList.RemoveAll([&](FChunkInfoData& Candidate){ return ReferencedChunks.Contains(Candidate.Guid) == false; });
+		Manifest->ChunkList.RemoveAll([&](FChunkInfo& Candidate){ return ReferencedChunks.Contains(Candidate.Guid) == false; });
 		UE_LOG(LogManifestBuilder, Verbose, TEXT("Chunk info list trimmed from %d to %d."), TotalChunkListNum, Manifest->ChunkList.Num());
 
 		// Init the manifest, and we are done.
@@ -145,7 +145,7 @@ namespace BuildPatchServices
 		if (Manifest->PrereqIds.Num() == 0 && !Manifest->PrereqPath.IsEmpty())
 		{
 			UE_LOG(LogManifestBuilder, Log, TEXT("Setting PrereqIds to be the SHA hash of the PrereqPath."));
-			FSHAHashData PrereqHash;
+			FSHAHash PrereqHash;
 			Manifest->GetFileHash(Manifest->PrereqPath, PrereqHash);
 			Manifest->PrereqIds.Add(PrereqHash.ToString());
 		}
@@ -177,9 +177,9 @@ namespace BuildPatchServices
 		return Manifest->SaveToFile(Filename, false);
 	}
 
-	TArray<FChunkPartData> FManifestBuilder::GetChunkPartsForFile(uint64 FileStart, uint64 FileSize, TSet<FGuid>& ReferencedChunks)
+	TArray<FChunkPart> FManifestBuilder::GetChunkPartsForFile(uint64 FileStart, uint64 FileSize, TSet<FGuid>& ReferencedChunks)
 	{
-		TArray<FChunkPartData> FileChunkParts;
+		TArray<FChunkPart> FileChunkParts;
 		// Collect all matching blocks.
 		TArray<FFileBlock> MatchingBlocks;
 		uint64 FileEnd = FileStart + FileSize;
@@ -229,7 +229,7 @@ namespace BuildPatchServices
 		for (const FFileBlock& MatchingBlock : MatchingBlocks)
 		{
 			FileChunkParts.AddDefaulted();
-			FChunkPartData& ChunkPart = FileChunkParts.Last();
+			FChunkPart& ChunkPart = FileChunkParts.Last();
 			ChunkPart.Guid = MatchingBlock.ChunkGuid;
 			ChunkPart.Offset = MatchingBlock.ChunkOffset;
 			ChunkPart.Size = MatchingBlock.Size;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.h
index ec88e6887d91..901272469090 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Generation/ManifestBuilder.h
@@ -41,7 +41,7 @@ namespace BuildPatchServices
 	{
 	public:
 		virtual void AddChunkMatch(const FGuid& ChunkGuid, const FBlockStructure& Structure) = 0;
-		virtual bool FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfoData> ChunkInfo) = 0;
+		virtual bool FinalizeData(const TArray<FFileSpan>& FileSpans, TArray<FChunkInfo> ChunkInfo) = 0;
 		virtual bool SaveToFile(const FString& Filename) = 0;
 	};
 
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/ChunkReferenceTracker.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/ChunkReferenceTracker.cpp
index b2a83678b7bf..0c2e923ba8e0 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/ChunkReferenceTracker.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/ChunkReferenceTracker.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Installer/ChunkReferenceTracker.h"
+#include "Templates/Greater.h"
 #include "Algo/Sort.h"
 #include "Misc/ScopeLock.h"
 
@@ -39,10 +40,10 @@ namespace BuildPatchServices
 		// Create our full list of chunks, including dupe references, and track the reference count of each chunk.
 		for (const FString& File : FilesToConstruct)
 		{
-			const FFileManifestData* NewFileManifest = InstallManifest->GetFileManifest(File);
+			const FFileManifest* NewFileManifest = InstallManifest->GetFileManifest(File);
 			if (NewFileManifest != nullptr)
 			{
-				for (const FChunkPartData& ChunkPart : NewFileManifest->FileChunkParts)
+				for (const FChunkPart& ChunkPart : NewFileManifest->FileChunkParts)
 				{
 					ReferenceCount.FindOrAdd(ChunkPart.Guid)++;
 					UseStack.Add(ChunkPart.Guid);
@@ -65,10 +66,10 @@ namespace BuildPatchServices
 		InstallManifest->GetFileList(AllFiles);
 		for (const FString& File : AllFiles)
 		{
-			const FFileManifestData* NewFileManifest = InstallManifest->GetFileManifest(File);
+			const FFileManifest* NewFileManifest = InstallManifest->GetFileManifest(File);
 			if (NewFileManifest != nullptr)
 			{
-				for (const FChunkPartData& ChunkPart : NewFileManifest->FileChunkParts)
+				for (const FChunkPart& ChunkPart : NewFileManifest->FileChunkParts)
 				{
 					bool bWasAlreadyInSet = false;
 					AllChunks.Add(ChunkPart.Guid, &bWasAlreadyInSet);
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/CloudChunkSource.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/CloudChunkSource.cpp
index 38ce247324d8..54219be58db7 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/CloudChunkSource.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/CloudChunkSource.cpp
@@ -520,7 +520,7 @@ namespace BuildPatchServices
 					TArray<uint8> DownloadedData = Download->GetData();
 
 					// If we know the SHA for this chunk, inject to data for verification.
-					FSHAHashData LegacyHashType;
+					FSHAHash LegacyHashType;
 					if (InstallManifest->GetChunkShaHash(DownloadId, LegacyHashType))
 					{
 						FSHAHash ChunkShaHash;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/FileAttribution.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/FileAttribution.cpp
index 27b02ef03c0d..ac151c3a972a 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/FileAttribution.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/FileAttribution.cpp
@@ -24,8 +24,8 @@ namespace BuildPatchServices
 
 	private:
 		FString SelectFullFilePath(const FString& BuildFile);
-		bool HasSameAttributes(const FFileManifestData* NewFileManifest, const FFileManifestData* OldFileManifest);
-		void SetupFileAttributes(const FString& FilePath, const FFileManifestData& FileManifest, bool bForce);
+		bool HasSameAttributes(const FFileManifest* NewFileManifest, const FFileManifest* OldFileManifest);
+		void SetupFileAttributes(const FString& FilePath, const FFileManifest& FileManifest, bool bForce);
 
 	private:
 		IFileSystem* FileSystem;
@@ -73,8 +73,8 @@ namespace BuildPatchServices
 		for (int32 BuildFileIdx = 0; BuildFileIdx < BuildFileList.Num() && !bShouldAbort; ++BuildFileIdx)
 		{
 			const FString& BuildFile = BuildFileList[BuildFileIdx];
-			const FFileManifestData* NewFileManifest = NewManifest->GetFileManifest(BuildFile);
-			const FFileManifestData* OldFileManifest = OldManifest.IsValid() ? OldManifest->GetFileManifest(BuildFile) : nullptr;
+			const FFileManifest* NewFileManifest = NewManifest->GetFileManifest(BuildFile);
+			const FFileManifest* OldFileManifest = OldManifest.IsValid() ? OldManifest->GetFileManifest(BuildFile) : nullptr;
 			bool bHasChanged = bForce || (TouchedFiles.Contains(BuildFile) && !HasSameAttributes(NewFileManifest, OldFileManifest));
 			if (NewFileManifest != nullptr && bHasChanged)
 			{
@@ -109,7 +109,7 @@ namespace BuildPatchServices
 		return InstallFilename;
 	}
 
-	bool FFileAttribution::HasSameAttributes(const FFileManifestData* NewFileManifest, const FFileManifestData* OldFileManifest)
+	bool FFileAttribution::HasSameAttributes(const FFileManifest* NewFileManifest, const FFileManifest* OldFileManifest)
 	{
 		// Currently it is not supported to rely on this, as the update process always makes new files when a file changes.
 		// This can be reconsidered when the patching process changes.
@@ -121,7 +121,7 @@ namespace BuildPatchServices
 		//     && (NewFileManifest->bIsCompressed == OldFileManifest->bIsCompressed);
 	}
 
-	void FFileAttribution::SetupFileAttributes(const FString& FilePath, const FFileManifestData& FileManifest, bool bForce)
+	void FFileAttribution::SetupFileAttributes(const FString& FilePath, const FFileManifest& FileManifest, bool bForce)
 	{
 		EFileAttributes FileAttributes = EFileAttributes::None;
 
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallChunkSource.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallChunkSource.cpp
index 89d6a000108a..cea22aa39965 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallChunkSource.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallChunkSource.cpp
@@ -39,7 +39,7 @@ namespace BuildPatchServices
 		typedef FRollingHash<BuildPatchServices::ChunkDataSize> FChunkHash;
 		void FindChunkLocation(const FGuid& DataId, const FString** FoundInstallDirectory, const FBuildPatchAppManifest** FoundInstallManifest) const;
 		bool LoadFromBuild(const FGuid& DataId);
-		FSHAHashData GetShaHashForDataSet(const uint8* ChunkData);
+		FSHAHash GetShaHashForDataSet(const uint8* ChunkData);
 
 	private:
 		// Configuration.
@@ -199,7 +199,7 @@ namespace BuildPatchServices
 		// We must have a hash for this chunk or else we cant verify it
 		EChunkHashFlags HashType = EChunkHashFlags::None;
 		uint64 ChunkHash = 0;
-		FSHAHashData ChunkShaHash;
+		FSHAHash ChunkShaHash;
 		if (FoundInstallManifest->GetChunkShaHash(DataId, ChunkShaHash))
 		{
 			HashType |= EChunkHashFlags::Sha1;
@@ -333,9 +333,9 @@ namespace BuildPatchServices
 		}
 	}
 
-	FSHAHashData FInstallChunkSource::GetShaHashForDataSet(const uint8* ChunkData)
+	FSHAHash FInstallChunkSource::GetShaHashForDataSet(const uint8* ChunkData)
 	{
-		FSHAHashData ShaHashCheck;
+		FSHAHash ShaHashCheck;
 		FSHA1::HashBuffer(ChunkData, BuildPatchServices::ChunkDataSize, ShaHashCheck.Hash);
 		return ShaHashCheck;
 	}
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerAnalytics.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerAnalytics.cpp
index a77fe01a68a2..544e5ea660b5 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerAnalytics.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerAnalytics.cpp
@@ -4,7 +4,9 @@
 #include "HttpServiceTracker.h"
 #include "AnalyticsEventAttribute.h"
 #include "Interfaces/IAnalyticsProvider.h"
+#include "Misc/Guid.h"
 #include "Misc/ScopeLock.h"
+#include "Stats/Stats.h"
 
 #define ERROR_EVENT_SEND_LIMIT 20
 
@@ -158,6 +160,8 @@ namespace BuildPatchServices
 
 	bool FInstallerAnalytics::Tick(float Delta)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FInstallerAnalytics_Tick);
+
 		if (Analytics != nullptr)
 		{
 			// Process the Analytics Event queue
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerError.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerError.cpp
index 1ec9a9ffc363..a08e19ad2926 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerError.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/InstallerError.cpp
@@ -45,8 +45,12 @@ namespace BuildPatchServices
 
 	FText GetDiskSpaceMessage(const FString& Location, uint64 RequiredBytes, uint64 AvailableBytes, const FNumberFormattingOptions* FormatOptions)
 	{
-		static const FText OutOfDiskSpace(NSLOCTEXT("BuildPatchInstallError", "InstallDirectoryDiskSpace", "There is not enough space at {Location}\n{RequiredBytes} is required.\n{AvailableBytes} is available.\nYou need an additional {SpaceAdditional} to perform the installation."));
-		static const FNumberFormattingOptions DefaultOptions = FNumberFormattingOptions()
+#if PLATFORM_DESKTOP
+        static const FText OutOfDiskSpace(NSLOCTEXT("BuildPatchInstallError", "InstallDirectoryDiskSpace", "There is not enough space at {Location}\n{RequiredBytes} is required.\n{AvailableBytes} is available.\nYou need an additional {SpaceAdditional} to perform the installation."));
+#else
+        static const FText OutOfDiskSpace(NSLOCTEXT("BuildPatchInstallError", "InstallDirectoryDiskSpaceDevice", "There is not enough space on your device.\n{RequiredBytes} is required.\n{AvailableBytes} is available.\nYou need an additional {SpaceAdditional} to perform the installation."));
+#endif // PLATFORM_DESKTOP
+        static const FNumberFormattingOptions DefaultOptions = FNumberFormattingOptions()
 			.SetMinimumFractionalDigits(2)
 			.SetMaximumFractionalDigits(2);
 		FormatOptions = FormatOptions == nullptr ? &DefaultOptions : FormatOptions;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/Verifier.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/Verifier.cpp
index d15f53c897bb..6564ca31220c 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/Verifier.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Installer/Verifier.cpp
@@ -129,7 +129,7 @@ namespace BuildPatchServices
 
 	bool FVerification::VerfiyFileSha(const FString& BuildFile, int64 BuildFileSize)
 	{
-		FSHAHashData BuildFileHash;
+		FSHAHash BuildFileHash;
 		bool bFoundHash = Manifest->GetFileHash(BuildFile, BuildFileHash);
 		checkf(bFoundHash, TEXT("Missing file hash from manifest."));
 		TFunction<void(float)> FileProgress = [this, &BuildFileSize, &BuildFile](float Progress)
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Fake/ChunkReferenceTracker.fake.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Fake/ChunkReferenceTracker.fake.h
index 37f219ed20d0..d400ae0562ed 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Fake/ChunkReferenceTracker.fake.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Fake/ChunkReferenceTracker.fake.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "Installer/ChunkReferenceTracker.h"
+#include "Templates/Greater.h"
 #include "Algo/Sort.h"
 
 #if WITH_DEV_AUTOMATION_TESTS
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Mock/Manifest.mock.h b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Mock/Manifest.mock.h
index 06f17f0b0f4d..d7198fd49086 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Mock/Manifest.mock.h
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Mock/Manifest.mock.h
@@ -236,7 +236,7 @@ namespace BuildPatchServices
 			DataGuids.Append(DataList);
 		}
 
-		virtual const FFileManifestData* GetFileManifest(const FString& Filename) const override
+		virtual const FFileManifest* GetFileManifest(const FString& Filename) const override
 		{
 			return FileManifests.Find(Filename);
 		}
@@ -256,7 +256,7 @@ namespace BuildPatchServices
 			return false;
 		}
 
-		virtual bool GetChunkShaHash(const FGuid& ChunkGuid, FSHAHashData& OutHash) const override
+		virtual bool GetChunkShaHash(const FGuid& ChunkGuid, FSHAHash& OutHash) const override
 		{
 			if (ChunkShaHashes.Contains(ChunkGuid))
 			{
@@ -266,7 +266,7 @@ namespace BuildPatchServices
 			return false;
 		}
 
-		virtual bool GetFileHash(const FGuid& FileGuid, FSHAHashData& OutHash) const override
+		virtual bool GetFileHash(const FGuid& FileGuid, FSHAHash& OutHash) const override
 		{
 			if (FileIdToHashes.Contains(FileGuid))
 			{
@@ -276,7 +276,7 @@ namespace BuildPatchServices
 			return false;
 		}
 
-		virtual bool GetFileHash(const FString& Filename, FSHAHashData& OutHash) const override
+		virtual bool GetFileHash(const FString& Filename, FSHAHash& OutHash) const override
 		{
 			if (FileNameToHashes.Contains(Filename))
 			{
@@ -349,11 +349,11 @@ namespace BuildPatchServices
 		uint32 NumFiles;
 		TSet<FString> TaggedFileList;
 		TArray<FGuid> DataList;
-		TMap<FString, FFileManifestData> FileManifests;
+		TMap<FString, FFileManifest> FileManifests;
 		TMap<FGuid, uint64> ChunkHashes;
-		TMap<FGuid, FSHAHashData> ChunkShaHashes;
-		TMap<FGuid, FSHAHashData> FileIdToHashes;
-		TMap<FString, FSHAHashData> FileNameToHashes;
+		TMap<FGuid, FSHAHash> ChunkShaHashes;
+		TMap<FGuid, FSHAHash> FileIdToHashes;
+		TMap<FString, FSHAHash> FileNameToHashes;
 		TMap<FGuid, uint64> FilePartHashes;
 		TSet<FGuid> ProducibleChunks;
 		TSet<FString> OutdatedFiles;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/ChunkReferenceTracker.spec.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/ChunkReferenceTracker.spec.cpp
index 839693316b2a..fffe01e86f47 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/ChunkReferenceTracker.spec.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/ChunkReferenceTracker.spec.cpp
@@ -17,7 +17,7 @@ TArray<FString> FileList;
 TArray<FString> SubsetFileList;
 TSet<FGuid> AllChunks;
 TSet<FGuid> SubsetReferencedChunks;
-TMap<FString, FFileManifestData> FileManifests;
+TMap<FString, FFileManifest> FileManifests;
 TMap<FGuid, int32> ChunkRefCounts;
 TArray<FGuid> UseOrderForwardSortedSubsetArray;
 TArray<FGuid> UseOrderReverseSortedSubsetArray;
@@ -38,9 +38,9 @@ void FChunkReferenceTrackerSpec::Define()
 	SubsetFileList = FileList.FilterByPredicate([](const FString& Element) { return Element.StartsWith(TEXT("Some")); });
 	for (const FString& Filename : FileList)
 	{
-		FFileManifestData& FileManifest = FileManifests.Add(Filename, FFileManifestData());
+		FFileManifest& FileManifest = FileManifests.Add(Filename, FFileManifest());
 		FileManifest.Filename = Filename;
-		FChunkPartData ChunkPartData;
+		FChunkPart ChunkPartData;
 		// New chunk.
 		ChunkPartData.Guid = FGuid::NewGuid();
 		AllChunks.Add(ChunkPartData.Guid);
@@ -60,7 +60,7 @@ void FChunkReferenceTrackerSpec::Define()
 	}
 	for (const FString& File : SubsetFileList)
 	{
-		for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+		for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 		{
 			SubsetReferencedChunks.Add(FileChunkPart.Guid);
 			UseOrderForwardSortedSubsetArray.Add(FileChunkPart.Guid);
@@ -70,7 +70,7 @@ void FChunkReferenceTrackerSpec::Define()
 	}
 	for (const FString& File : FileList)
 	{
-		for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+		for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 		{
 			++ChunkRefCounts.FindOrAdd(FileChunkPart.Guid);
 		}
@@ -114,7 +114,7 @@ void FChunkReferenceTrackerSpec::Define()
 				{
 					for (const FString& File : FileList)
 					{
-						for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+						for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 						{
 							ChunkReferenceTracker->PopReference(FileChunkPart.Guid);
 						}
@@ -157,7 +157,7 @@ void FChunkReferenceTrackerSpec::Define()
 				{
 					for (const FString& File : SubsetFileList)
 					{
-						for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+						for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 						{
 							ChunkReferenceTracker->PopReference(FileChunkPart.Guid);
 						}
@@ -204,7 +204,7 @@ void FChunkReferenceTrackerSpec::Define()
 			{
 				for (const FString& File : FileList)
 				{
-					for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+					for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 					{
 						ChunkReferenceTracker->PopReference(FileChunkPart.Guid);
 					}
@@ -358,7 +358,7 @@ void FChunkReferenceTrackerSpec::Define()
 			{
 				for (const FString& File : FileList)
 				{
-					for (const FChunkPartData& FileChunkPart : FileManifests[File].FileChunkParts)
+					for (const FChunkPart& FileChunkPart : FileManifests[File].FileChunkParts)
 					{
 						TEST_TRUE(ChunkReferenceTracker->PopReference(FileChunkPart.Guid));
 					}
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/CloudChunkSource.spec.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/CloudChunkSource.spec.cpp
index 8f4a11ac7b52..de5f170cf3d6 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/CloudChunkSource.spec.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/CloudChunkSource.spec.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Misc/AutomationTest.h"
+#include "Misc/OutputDeviceRedirector.h"
 #include "Tests/TestHelpers.h"
 #include "Tests/Mock/PlatformProcess.mock.h"
 #include "Tests/Mock/PlatformMisc.mock.h"
@@ -41,7 +42,7 @@ TUniquePtr<BuildPatchServices::FCloudSourceConfig> CloudSourceConfig;
 TSet<FGuid> InitialDownloadSet;
 TSet<FGuid> EmptyInitialDownloadSet;
 TSet<FGuid> LargeInitialDownloadSet;
-FSHAHashData SomeShaData;
+FSHAHash SomeShaData;
 FGuid SomeChunk;
 FGuid FirstChunk;
 BuildPatchServices::FChunkHeader FirstHeader;
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/FileAttribution.spec.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/FileAttribution.spec.cpp
index 50a5f9ef440e..12d6f58bceb1 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/FileAttribution.spec.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/FileAttribution.spec.cpp
@@ -113,7 +113,7 @@ void FFileAttributionSpec::Define()
 			{
 				BeforeEach([this]()
 				{
-					FFileManifestData FileManifest;
+					FFileManifest FileManifest;
 					FileManifest.Filename = MissingFile;
 					MockFileSystem->FileSizes.Add(StagedFileDirectory / MissingFile, INDEX_NONE);
 					MockFileSystem->FileAttributes.Add(StagedFileDirectory / MissingFile, EFileAttributes::None);
@@ -320,11 +320,11 @@ void FFileAttributionSpec::MakeUnit()
 	MockOldManifest = MakeShareable(new FMockManifest());
 	for (const FString& File : AllFiles)
 	{
-		FChunkPartData ChunkPart;
+		FChunkPart ChunkPart;
 		ChunkPart.Guid = FGuid::NewGuid();
 		ChunkPart.Offset = 0;
 		ChunkPart.Size = 64;
-		FFileManifestData FileManifest;
+		FFileManifest FileManifest;
 		FileManifest.Filename = File;
 		FSHA1::HashBuffer(*FGuid::NewGuid().ToString(), sizeof(TCHAR) * 32, FileManifest.FileHash.Hash);
 		FileManifest.FileChunkParts.Add(ChunkPart);
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/InstallChunkSource.spec.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/InstallChunkSource.spec.cpp
index 3ee90d5f53d0..14d6e4d899aa 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/InstallChunkSource.spec.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/InstallChunkSource.spec.cpp
@@ -449,7 +449,7 @@ void FInstallChunkSourceSpec::InventUsableChunkData()
 		for (const FGuid& ProducibleChunk : MockInstallationManifest->ProducibleChunks)
 		{
 			uint64 ChunkPolyHash;
-			FSHAHashData ChunkShaHash;
+			FSHAHash ChunkShaHash;
 			for (const FFileChunkPart& FileChunkPart : MockInstallationManifest->FilePartsForChunk[ProducibleChunk])
 			{
 				TArray<uint8>& FileData = FakeFileSystem->DiskData[MockInstallLocation / FileChunkPart.Filename];
diff --git a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/Verifier.spec.cpp b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/Verifier.spec.cpp
index 92986b26c2ad..2fd8f81d6125 100644
--- a/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/Verifier.spec.cpp
+++ b/Engine/Source/Runtime/Online/BuildPatchServices/Private/Tests/Unit/Verifier.spec.cpp
@@ -342,7 +342,7 @@ void FVerifierSpec::MakeFileData()
 	AllFiles = TSet<FString>(MockManifest->BuildFileList);
 	MockManifest->TaggedFileList = AllFiles;
 	FRandomStream RandomData(0);
-	FSHAHashData SHAHashData;
+	FSHAHash SHAHashData;
 	for (const FString& Filename : MockManifest->BuildFileList)
 	{
 		FString FullFilename = VerifyDirectory / Filename;
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Apple/AppleHTTP.cpp b/Engine/Source/Runtime/Online/HTTP/Private/Apple/AppleHTTP.cpp
index bd56e8dfd98c..2e1b380a692e 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Apple/AppleHTTP.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Apple/AppleHTTP.cpp
@@ -250,11 +250,7 @@ bool FAppleHttpRequest::StartRequest()
 	if(UserAgent.IsEmpty())
 	{
 		NSString* Tag = FPlatformHttp::GetDefaultUserAgent().GetNSString();
-		[Request addValue:Tag forHTTPHeaderField:@"User-Agent"];
-	}
-	else
-	{
-		[Request addValue:UserAgent.GetNSString() forHTTPHeaderField:@"User-Agent"];
+		[Request setValue:Tag forHTTPHeaderField:@"User-Agent"];
 	}
 
 	Response = MakeShareable( new FAppleHttpResponse( *this ) );
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.cpp b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.cpp
index 0ae0543a1569..1a0d4f28b001 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.cpp
@@ -29,12 +29,13 @@ FCurlHttpRequest::FCurlHttpRequest()
 	:	EasyHandle(NULL)
 	,	HeaderList(NULL)
 	,	bCanceled(false)
-	,	bCompleted(false)
+	,	bCurlRequestCompleted(false)
 	,	CurlAddToMultiResult(CURLM_OK)
 	,	CurlCompletionResult(CURLE_OK)
 	,	CompletionStatus(EHttpRequestStatus::NotStarted)
 	,	ElapsedTime(0.0f)
 	,	TimeSinceLastResponse(0.0f)
+	,	bAnyHttpActivity(false)
 	,   BytesSent(0)
 	,	LastReportedBytesRead(0)
 	,	LastReportedBytesSent(0)
@@ -96,13 +97,16 @@ FCurlHttpRequest::FCurlHttpRequest()
 #endif // #if WITH_SSL
 	}
 
-		InfoMessageCache.AddDefaulted(NumberOfInfoMessagesToCache);
+	InfoMessageCache.AddDefaulted(NumberOfInfoMessagesToCache);
 }
 
 FCurlHttpRequest::~FCurlHttpRequest()
 {
 	if (EasyHandle)
 	{
+		// clear to prevent crashing in debug callback when this handle is part of an asynchronous curl_multi_perform()
+		curl_easy_setopt(EasyHandle, CURLOPT_DEBUGDATA, nullptr);
+
 		// cleanup the handle first (that order is used in howtos)
 		curl_easy_cleanup(EasyHandle);
 
@@ -482,6 +486,7 @@ size_t FCurlHttpRequest::DebugCallback(CURL * Handle, curl_infotype DebugInfoTyp
 		case CURLINFO_SSL_DATA_IN:
 		case CURLINFO_SSL_DATA_OUT:
 			TimeSinceLastResponse = 0.0f;
+			bAnyHttpActivity = true;
 			break;
 		default:
 			break;
@@ -522,7 +527,7 @@ bool FCurlHttpRequest::SetupRequest()
 {
 	check(EasyHandle);
 
-	bCompleted = false;
+	bCurlRequestCompleted = false;
 	bCanceled = false;
 	CurlAddToMultiResult = CURLM_OK;
 
@@ -562,6 +567,12 @@ bool FCurlHttpRequest::SetupRequest()
 
 	curl_easy_setopt(EasyHandle, CURLOPT_URL, TCHAR_TO_ANSI(*URL));
 
+	if (!FCurlHttpManager::CurlRequestOptions.LocalHostAddr.IsEmpty())
+	{
+		// Set the local address to use for making these requests
+		CURLcode ErrCode = curl_easy_setopt(EasyHandle, CURLOPT_INTERFACE, TCHAR_TO_ANSI(*FCurlHttpManager::CurlRequestOptions.LocalHostAddr));
+	}
+
 	// set up verb (note that Verb is expected to be uppercase only)
 	if (Verb == TEXT("POST"))
 	{
@@ -620,6 +631,13 @@ bool FCurlHttpRequest::SetupRequest()
 	curl_easy_setopt(EasyHandle, CURLOPT_WRITEFUNCTION, StaticReceiveResponseBodyCallback);
 
 	// set up headers
+
+	// Empty string here tells Curl to list all supported encodings, allowing servers to send compressed content.
+	if (FCurlHttpManager::CurlRequestOptions.bAcceptCompressedContent)
+	{
+		curl_easy_setopt(EasyHandle, CURLOPT_ACCEPT_ENCODING, "");
+	}
+
 	if (GetHeader("User-Agent").IsEmpty())
 	{
 		SetHeader(TEXT("User-Agent"), FPlatformHttp::GetDefaultUserAgent());
@@ -690,6 +708,7 @@ bool FCurlHttpRequest::StartThreadedRequest()
 	// reset timeout
 	ElapsedTime = 0.0f;
 	TimeSinceLastResponse = 0.0f;
+	bAnyHttpActivity = false;
 	
 	UE_LOG(LogHttp, Verbose, TEXT("%p: request (easy handle:%p) has started threaded processing"), this, EasyHandle);
 
@@ -708,7 +727,7 @@ bool FCurlHttpRequest::IsThreadedRequestComplete()
 		return true;
 	}
 	
-	if (bCompleted && ElapsedTime >= FHttpModule::Get().GetHttpDelayTime())
+	if (bCurlRequestCompleted && ElapsedTime >= FHttpModule::Get().GetHttpDelayTime())
 	{
 		return true;
 	}
@@ -830,7 +849,7 @@ void FCurlHttpRequest::FinishedRequest()
 	
 	CheckProgressDelegate();
 	// if completed, get more info
-	if (bCompleted)
+	if (bCurlRequestCompleted)
 	{
 		if (Response.IsValid())
 		{
@@ -923,16 +942,30 @@ void FCurlHttpRequest::FinishedRequest()
 		}
 
 		// Mark last request attempt as completed but failed
-		switch (CurlCompletionResult)
+		if (bCurlRequestCompleted)
 		{
-		case CURLE_COULDNT_CONNECT:
-		case CURLE_COULDNT_RESOLVE_PROXY:
-		case CURLE_COULDNT_RESOLVE_HOST:
-			// report these as connection errors (safe to retry)
-			CompletionStatus = EHttpRequestStatus::Failed_ConnectionError;
-			break;
-		default:
-			CompletionStatus = EHttpRequestStatus::Failed;
+			switch (CurlCompletionResult)
+			{
+			case CURLE_COULDNT_CONNECT:
+			case CURLE_COULDNT_RESOLVE_PROXY:
+			case CURLE_COULDNT_RESOLVE_HOST:
+				// report these as connection errors (safe to retry)
+				CompletionStatus = EHttpRequestStatus::Failed_ConnectionError;
+				break;
+			default:
+				CompletionStatus = EHttpRequestStatus::Failed;
+			}
+		}
+		else
+		{
+			if (bAnyHttpActivity)
+			{
+				CompletionStatus = EHttpRequestStatus::Failed;
+			}
+			else
+			{
+				CompletionStatus = EHttpRequestStatus::Failed_ConnectionError;
+			}
 		}
 		// No response since connection failed
 		Response = NULL;
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.h b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.h
index c47f255458dd..8bace5450bb4 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.h
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttp.h
@@ -176,7 +176,7 @@ public:
 	 */
 	inline void MarkAsCompleted(CURLcode InCurlCompletionResult)
 	{
-		bCompleted = true;
+		bCurlRequestCompleted = true;
 		CurlCompletionResult = InCurlCompletionResult;
 	}
 	
@@ -325,7 +325,7 @@ private:
 	/** Set to true if request has been canceled */
 	bool			bCanceled;
 	/** Set to true when request has been completed */
-	bool			bCompleted;
+	bool			bCurlRequestCompleted;
 	/** Set to true if request failed to be added to curl multi */
 	CURLMcode		CurlAddToMultiResult;
 	/** Operation result code as returned by libcurl */
@@ -342,6 +342,8 @@ private:
 	float ElapsedTime;
 	/** Elapsed time since the last received HTTP response. */
 	float TimeSinceLastResponse;
+	/** Have we had any HTTP activity with the host? Sending headers, SSL handshake, etc */
+	bool bAnyHttpActivity;
 	/** Number of bytes sent already */
 	FThreadSafeCounter BytesSent;
 	/** Last bytes read reported to progress delegate */
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.cpp b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.cpp
index 1a1062b56ea1..42a37cf169bc 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.cpp
@@ -22,6 +22,9 @@
 #include "Ssl.h"
 #endif
 
+#include "SocketSubsystem.h"
+#include "IPAddress.h"
+
 CURLM* FCurlHttpManager::GMultiHandle = NULL;
 CURLSH* FCurlHttpManager::GShareHandle = NULL;
 
@@ -183,6 +186,17 @@ void FCurlHttpManager::InitCurl()
 			UE_LOG(LogInit, Fatal, TEXT("Could not initialize create libcurl multi handle! HTTP transfers will not function properly."));
 		}
 
+		int32 MaxTotalConnections = 0;
+		if (GConfig->GetInt(TEXT("HTTP.Curl"), TEXT("MaxTotalConnections"), MaxTotalConnections, GEngineIni) && MaxTotalConnections > 0)
+		{
+			const CURLMcode SetOptResult = curl_multi_setopt(GMultiHandle, CURLMOPT_MAX_TOTAL_CONNECTIONS, static_cast<long>(MaxTotalConnections));
+			if (SetOptResult != CURLM_OK)
+			{
+				UE_LOG(LogInit, Warning, TEXT("Failed to set libcurl max total connections options (%d), error %d ('%s')"),
+					MaxTotalConnections, static_cast<int32>(SetOptResult), StringCast<TCHAR>(curl_multi_strerror(SetOptResult)).Get());
+			}
+		}
+
 		GShareHandle = curl_share_init();
 		if (NULL != GShareHandle)
 		{
@@ -313,13 +327,16 @@ void FCurlHttpManager::InitCurl()
 	{
 		CurlRequestOptions.bVerifyPeer = false;
 	}
-	else
+	bool bVerifyPeer = true;
+	if (GConfig->GetBool(TEXT("/Script/Engine.NetworkSettings"), TEXT("n.VerifyPeer"), bVerifyPeer, GEngineIni))
 	{
-		bool bVerifyPeer = true;
-		if (GConfig->GetBool(TEXT("/Script/Engine.NetworkSettings"), TEXT("n.VerifyPeer"), bVerifyPeer, GEngineIni))
-		{
-			CurlRequestOptions.bVerifyPeer = bVerifyPeer;
-		}
+		CurlRequestOptions.bVerifyPeer = bVerifyPeer;
+	}
+
+	bool bAcceptCompressedContent = true;
+	if (GConfig->GetBool(TEXT("HTTP"), TEXT("AcceptCompressedContent"), bAcceptCompressedContent, GEngineIni))
+	{
+		CurlRequestOptions.bAcceptCompressedContent = bAcceptCompressedContent;
 	}
 
 	int32 ConfigBufferSize = 0;
@@ -328,6 +345,41 @@ void FCurlHttpManager::InitCurl()
 		CurlRequestOptions.BufferSize = ConfigBufferSize;
 	}
 
+	CurlRequestOptions.MaxHostConnections = FHttpModule::Get().GetHttpMaxConnectionsPerServer();
+	if (CurlRequestOptions.MaxHostConnections > 0)
+	{
+		const CURLMcode SetOptResult = curl_multi_setopt(GMultiHandle, CURLMOPT_MAX_HOST_CONNECTIONS, static_cast<long>(CurlRequestOptions.MaxHostConnections));
+		if (SetOptResult != CURLM_OK)
+		{
+			FUTF8ToTCHAR Converter(curl_multi_strerror(SetOptResult));
+			UE_LOG(LogInit, Warning, TEXT("Failed to set max host connections options (%d), error %d ('%s')"),
+				CurlRequestOptions.MaxHostConnections, (int32)SetOptResult, Converter.Get());
+			CurlRequestOptions.MaxHostConnections = 0;
+		}
+	}
+	else
+	{
+		CurlRequestOptions.MaxHostConnections = 0;
+	}
+
+	TCHAR Home[256] = TEXT("");
+	if (FParse::Value(FCommandLine::Get(), TEXT("MULTIHOMEHTTP="), Home, ARRAY_COUNT(Home)))
+	{
+		ISocketSubsystem* SocketSubsystem = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM);
+		if (SocketSubsystem)
+		{
+			TSharedRef<FInternetAddr> HostAddr = SocketSubsystem->CreateInternetAddr();
+			HostAddr->SetAnyAddress();
+
+			bool bIsValid = false;
+			HostAddr->SetIp(Home, bIsValid);
+			if (bIsValid)
+			{
+				CurlRequestOptions.LocalHostAddr = FString(Home);
+			}
+		}
+	}
+
 	// print for visibility
 	CurlRequestOptions.Log();
 }
@@ -361,6 +413,13 @@ void FCurlHttpManager::FCurlRequestOptions::Log()
 		(CertBundlePath != nullptr) ? TEXT("set CURLOPT_CAINFO to it") : TEXT("use whatever was configured at build time.")
 		);
 
+	UE_LOG(LogInit, Log, TEXT(" - MaxHostConnections = %d  - Libcurl will %slimit the number of connections to a host"),
+		MaxHostConnections,
+		(MaxHostConnections == 0) ? TEXT("NOT ") : TEXT("")
+		);
+
+	UE_LOG(LogInit, Log, TEXT(" - LocalHostAddr = %s"), LocalHostAddr.IsEmpty() ? TEXT("Default") : *LocalHostAddr);
+
 	UE_LOG(LogInit, Log, TEXT(" - BufferSize = %d"), CurlRequestOptions.BufferSize);
 }
 
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.h b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.h
index bfdc58e26edc..72b6716b1f12 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.h
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Curl/CurlHttpManager.h
@@ -25,7 +25,9 @@ public:
 		FCurlRequestOptions()
 			:	bVerifyPeer(true)
 			,	bDontReuseConnections(false)
+			,	bAcceptCompressedContent(true)
 			,	CertBundlePath(nullptr)
+			,	MaxHostConnections(0)
 			,	BufferSize(64*1024)
 		{}
 
@@ -38,9 +40,18 @@ public:
 		/** Forbid reuse connections (for debugging purposes, since normally it's faster to reuse) */
 		bool bDontReuseConnections;
 
+		/** Allow servers to send compressed content.  Can have a very small cpu cost, and huge bandwidth and response time savings from correctly configured servers. */
+		bool bAcceptCompressedContent;
+
 		/** A path to certificate bundle */
 		const char * CertBundlePath;
 
+		/** The maximum number of connections to a particular host */
+		int32 MaxHostConnections;
+
+		/** Local address to use when making request, respects MULTIHOME command line option */
+		FString LocalHostAddr;
+
 		/** Receive buffer size */
 		int32 BufferSize;
 	}
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/GenericPlatform/GenericPlatformHttp.cpp b/Engine/Source/Runtime/Online/HTTP/Private/GenericPlatform/GenericPlatformHttp.cpp
index e39d66c44cb4..10aea35c6ef6 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/GenericPlatform/GenericPlatformHttp.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/GenericPlatform/GenericPlatformHttp.cpp
@@ -259,10 +259,30 @@ FString FGenericPlatformHttp::GetMimeType(const FString& FilePath)
 
 FString FGenericPlatformHttp::GetDefaultUserAgent()
 {
-	static FString CachedUserAgent = FString::Printf(TEXT("game=%s, engine=UE4, version=%s, platform=%s, osver=%s"), FApp::GetProjectName(), *FEngineVersion::Current().ToString(), *FString(FPlatformProperties::IniPlatformName()), *FPlatformMisc::GetOSVersion());
+	//** strip/escape slashes and whitespace from components
+	static FString CachedUserAgent = FString::Printf(TEXT("%s/%s %s/%s"),
+		*EscapeUserAgentString(FApp::GetProjectName()),
+		*EscapeUserAgentString(FApp::GetBuildVersion()),
+		*EscapeUserAgentString(FString(FPlatformProperties::IniPlatformName())),
+		*EscapeUserAgentString(FPlatformMisc::GetOSVersion()));
 	return CachedUserAgent;
 }
 
+FString FGenericPlatformHttp::EscapeUserAgentString(const FString& UnescapedString)
+{
+	if (UnescapedString.Contains(" ") || UnescapedString.Contains("/"))
+	{
+		FString EscapedString;
+		EscapedString = UnescapedString.Replace(TEXT(" "), TEXT(""));
+		EscapedString = UnescapedString.Replace(TEXT("/"), TEXT("+"));
+		return EscapedString;
+	}
+	else
+	{
+		return UnescapedString;
+	}
+}
+
 TOptional<FString> FGenericPlatformHttp::GetOperatingSystemProxyAddress()
 {
 	return TOptional<FString>();
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/HttpManager.cpp b/Engine/Source/Runtime/Online/HTTP/Private/HttpManager.cpp
index 7d60267ae48c..404c33cf8869 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/HttpManager.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/HttpManager.cpp
@@ -9,6 +9,8 @@
 #include "HttpThread.h"
 #include "Misc/ConfigCacheIni.h"
 
+#include "Stats/Stats.h"
+
 // FHttpManager
 
 FCriticalSection FHttpManager::RequestLock;
@@ -97,6 +99,8 @@ void FHttpManager::Flush(bool bShutdown)
 
 bool FHttpManager::Tick(float DeltaSeconds)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FHttpManager_Tick);
+
 	FScopeLock ScopeLock(&RequestLock);
 
 	// Tick each active request
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/HttpModule.cpp b/Engine/Source/Runtime/Online/HTTP/Private/HttpModule.cpp
index 4fa2b5bcf2a3..b67688318308 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/HttpModule.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/HttpModule.cpp
@@ -17,46 +17,42 @@ IMPLEMENT_MODULE(FHttpModule, HTTP);
 
 FHttpModule* FHttpModule::Singleton = NULL;
 
+void FHttpModule::UpdateConfigs()
+{
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpTimeout"), HttpTimeout, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpConnectionTimeout"), HttpConnectionTimeout, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpReceiveTimeout"), HttpReceiveTimeout, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpSendTimeout"), HttpSendTimeout, GEngineIni);
+	GConfig->GetInt(TEXT("HTTP"), TEXT("HttpMaxConnectionsPerServer"), HttpMaxConnectionsPerServer, GEngineIni);
+	GConfig->GetBool(TEXT("HTTP"), TEXT("bEnableHttp"), bEnableHttp, GEngineIni);
+	GConfig->GetBool(TEXT("HTTP"), TEXT("bUseNullHttp"), bUseNullHttp, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpDelayTime"), HttpDelayTime, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadActiveFrameTimeInSeconds"), HttpThreadActiveFrameTimeInSeconds, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadActiveMinimumSleepTimeInSeconds"), HttpThreadActiveMinimumSleepTimeInSeconds, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadIdleFrameTimeInSeconds"), HttpThreadIdleFrameTimeInSeconds, GEngineIni);
+	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadIdleMinimumSleepTimeInSeconds"), HttpThreadIdleMinimumSleepTimeInSeconds, GEngineIni);
+}
+
 void FHttpModule::StartupModule()
 {	
 	Singleton = this;
+
 	MaxReadBufferSize = 256 * 1024;
-
 	HttpTimeout = 300.0f;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpTimeout"), HttpTimeout, GEngineIni);
-
 	HttpConnectionTimeout = -1;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpConnectionTimeout"), HttpConnectionTimeout, GEngineIni);
-
 	HttpReceiveTimeout = HttpConnectionTimeout;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpReceiveTimeout"), HttpReceiveTimeout, GEngineIni);
-
 	HttpSendTimeout = HttpConnectionTimeout;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpSendTimeout"), HttpSendTimeout, GEngineIni);
-
 	HttpMaxConnectionsPerServer = 16;
-	GConfig->GetInt(TEXT("HTTP"), TEXT("HttpMaxConnectionsPerServer"), HttpMaxConnectionsPerServer, GEngineIni);
-	
 	bEnableHttp = true;
-	GConfig->GetBool(TEXT("HTTP"), TEXT("bEnableHttp"), bEnableHttp, GEngineIni);
-
 	bUseNullHttp = false;
-	GConfig->GetBool(TEXT("HTTP"), TEXT("bUseNullHttp"), bUseNullHttp, GEngineIni);
-
 	HttpDelayTime = 0;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpDelayTime"), HttpDelayTime, GEngineIni);
-
 	HttpThreadActiveFrameTimeInSeconds = 1.0f / 200.0f; // 200Hz
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadActiveFrameTimeInSeconds"), HttpThreadActiveFrameTimeInSeconds, GEngineIni);
-
 	HttpThreadActiveMinimumSleepTimeInSeconds = 0.0f;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadActiveMinimumSleepTimeInSeconds"), HttpThreadActiveMinimumSleepTimeInSeconds, GEngineIni);
-
 	HttpThreadIdleFrameTimeInSeconds = 1.0f / 30.0f; // 30Hz
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadIdleFrameTimeInSeconds"), HttpThreadIdleFrameTimeInSeconds, GEngineIni);
+	HttpThreadIdleMinimumSleepTimeInSeconds = 0.0f;	
 
-	HttpThreadIdleMinimumSleepTimeInSeconds = 0.0f;
-	GConfig->GetFloat(TEXT("HTTP"), TEXT("HttpThreadIdleMinimumSleepTimeInSeconds"), HttpThreadIdleMinimumSleepTimeInSeconds, GEngineIni);
+	// override the above defaults from configs
+	UpdateConfigs();
 
 	if (!FParse::Value(FCommandLine::Get(), TEXT("httpproxy="), ProxyAddress))
 	{
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/HttpRetrySystem.cpp b/Engine/Source/Runtime/Online/HTTP/Private/HttpRetrySystem.cpp
index d96646418fff..fe64f6832061 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/HttpRetrySystem.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/HttpRetrySystem.cpp
@@ -6,14 +6,14 @@
 #include "HttpModule.h"
 #include "Http.h"
 
-
 FHttpRetrySystem::FRequest::FRequest(
 	FManager& InManager,
 	const TSharedRef<IHttpRequest>& HttpRequest, 
 	const FHttpRetrySystem::FRetryLimitCountSetting& InRetryLimitCountOverride,
 	const FHttpRetrySystem::FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride,
 	const FHttpRetrySystem::FRetryResponseCodes& InRetryResponseCodes,
-	const FHttpRetrySystem::FRetryVerbs& InRetryVerbs
+	const FHttpRetrySystem::FRetryVerbs& InRetryVerbs,
+	const FHttpRetrySystem::FRetryDomainsPtr& InRetryDomains
 	)
     : FHttpRequestAdapterBase(HttpRequest)
     , Status(FHttpRetrySystem::FRequest::EStatus::NotStarted)
@@ -21,21 +21,65 @@ FHttpRetrySystem::FRequest::FRequest(
     , RetryTimeoutRelativeSecondsOverride(InRetryTimeoutRelativeSecondsOverride)
 	, RetryResponseCodes(InRetryResponseCodes)
 	, RetryVerbs(InRetryVerbs)
+	, RetryDomains(InRetryDomains)
 	, RetryManager(InManager)
 {
     // if the InRetryTimeoutRelativeSecondsOverride override is being used the value cannot be negative
     check(!(InRetryTimeoutRelativeSecondsOverride.bUseValue) || (InRetryTimeoutRelativeSecondsOverride.Value >= 0.0));
+
+	if (RetryDomains.IsValid())
+	{
+		if (RetryDomains->Domains.Num() == 0)
+		{
+			// If there are no domains to cycle through, go through the simpler path
+			RetryDomains.Reset();
+		}
+		else
+		{
+			// Start with the active index
+			RetryDomainsIndex = RetryDomains->ActiveIndex;
+			check(RetryDomains->Domains.IsValidIndex(RetryDomainsIndex));
+		}
+	}
 }
 
 bool FHttpRetrySystem::FRequest::ProcessRequest()
 { 
 	TSharedRef<FRequest> RetryRequest = StaticCastSharedRef<FRequest>(AsShared());
 
+	OriginalUrl = HttpRequest->GetURL();
+	if (RetryDomains.IsValid())
+	{
+		SetUrlFromRetryDomains();
+	}
+
 	HttpRequest->OnRequestProgress().BindSP(RetryRequest, &FHttpRetrySystem::FRequest::HttpOnRequestProgress);
 
 	return RetryManager.ProcessRequest(RetryRequest);
 }
 
+void FHttpRetrySystem::FRequest::SetUrlFromRetryDomains()
+{
+	check(RetryDomains.IsValid());
+	FString OriginalUrlDomain = FPlatformHttp::GetUrlDomain(OriginalUrl);
+	if (!OriginalUrlDomain.IsEmpty())
+	{
+		const FString Url(OriginalUrl.Replace(*OriginalUrlDomain, *RetryDomains->Domains[RetryDomainsIndex]));
+		HttpRequest->SetURL(Url);
+	}
+}
+
+void FHttpRetrySystem::FRequest::MoveToNextRetryDomain()
+{
+	check(RetryDomains.IsValid());
+	const int32 NextDomainIndex = (RetryDomainsIndex + 1) % RetryDomains->Domains.Num();
+	if (RetryDomains->ActiveIndex.CompareExchange(RetryDomainsIndex, NextDomainIndex))
+	{
+		RetryDomainsIndex = NextDomainIndex;
+	}
+	SetUrlFromRetryDomains();
+}
+
 void FHttpRetrySystem::FRequest::CancelRequest() 
 { 
 	TSharedRef<FRequest> RetryRequest = StaticCastSharedRef<FRequest>(AsShared());
@@ -58,7 +102,8 @@ TSharedRef<FHttpRetrySystem::FRequest> FHttpRetrySystem::FManager::CreateRequest
 	const FRetryLimitCountSetting& InRetryLimitCountOverride,
 	const FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride,
 	const FRetryResponseCodes& InRetryResponseCodes,
-	const FRetryVerbs& InRetryVerbs)
+	const FRetryVerbs& InRetryVerbs,
+	const FRetryDomainsPtr& InRetryDomains)
 {
 	return MakeShareable(new FRequest(
 		*this,
@@ -66,7 +111,8 @@ TSharedRef<FHttpRetrySystem::FRequest> FHttpRetrySystem::FManager::CreateRequest
 		InRetryLimitCountOverride,
 		InRetryTimeoutRelativeSecondsOverride,
 		InRetryResponseCodes,
-		InRetryVerbs
+		InRetryVerbs,
+		InRetryDomains
 		));
 }
 
@@ -219,8 +265,16 @@ float FHttpRetrySystem::FManager::GetLockoutPeriodSeconds(const FHttpRetryReques
 	{
 		if (LockoutPeriod <= 0.0f)
 		{
-			LockoutPeriod = 5.0f + 5.0f * ((HttpRetryRequestEntry.CurrentRetryCount - 1) >> 1);
-			LockoutPeriod = LockoutPeriod > 30.0f ? 30.0f : LockoutPeriod;
+			if (HttpRetryRequestEntry.Request->GetStatus() != EHttpRequestStatus::Failed_ConnectionError ||
+				!HttpRetryRequestEntry.Request->RetryDomains.IsValid())
+			{
+				LockoutPeriod = 5.0f + 5.0f * ((HttpRetryRequestEntry.CurrentRetryCount - 1) >> 1);
+				LockoutPeriod = LockoutPeriod > 30.0f ? 30.0f : LockoutPeriod;
+			}
+			else
+			{
+				// Do not have a lockout period if we failed to connect to a domain and we have other domains to try
+			}
 		}
 	}
 
@@ -285,7 +339,7 @@ bool FHttpRetrySystem::FManager::Update(uint32* FileCount, uint32* FailingCount,
 		FHttpRetryRequestEntry& HttpRetryRequestEntry = RequestList[index];
 		TSharedRef<FHttpRetrySystem::FRequest>& HttpRetryRequest = HttpRetryRequestEntry.Request;
 
-		EHttpRequestStatus::Type RequestStatus = HttpRetryRequest->GetStatus();
+		const EHttpRequestStatus::Type RequestStatus = HttpRetryRequest->GetStatus();
 
 		if (HttpRetryRequestEntry.bShouldCancel)
 		{
@@ -318,6 +372,14 @@ bool FHttpRetrySystem::FManager::Update(uint32* FileCount, uint32* FailingCount,
 						}
 					}
 
+					// If we failed to connect, try the next domain in the list
+					if (RequestStatus == EHttpRequestStatus::Failed_ConnectionError)
+					{
+						if (HttpRetryRequest->RetryDomains.IsValid())
+						{
+							HttpRetryRequest->MoveToNextRetryDomain();
+						}
+					}
 					// Save these for failure case retry checks if we hit a completion state
 					bool bShouldRetry = false;
 					bool bCanRetry = false;
diff --git a/Engine/Source/Runtime/Online/HTTP/Private/Windows/WindowsPlatformHttp.cpp b/Engine/Source/Runtime/Online/HTTP/Private/Windows/WindowsPlatformHttp.cpp
index 9feba20a34a3..4a2adc1310de 100644
--- a/Engine/Source/Runtime/Online/HTTP/Private/Windows/WindowsPlatformHttp.cpp
+++ b/Engine/Source/Runtime/Online/HTTP/Private/Windows/WindowsPlatformHttp.cpp
@@ -102,11 +102,11 @@ static bool IsValidIPv4Address(const FString& InString)
 		if (IsUnsignedInteger(AStr) && IsUnsignedInteger(BStr) && IsUnsignedInteger(CStr) && IsUnsignedInteger(DStr) && IsUnsignedInteger(PortStr))
 		{
 			uint32 A, B, C, D, Port;
-			Lex::FromString(A, *AStr);
-			Lex::FromString(B, *BStr);
-			Lex::FromString(C, *CStr);
-			Lex::FromString(D, *DStr);
-			Lex::FromString(Port, *PortStr);
+			LexFromString(A, *AStr);
+			LexFromString(B, *BStr);
+			LexFromString(C, *CStr);
+			LexFromString(D, *DStr);
+			LexFromString(Port, *PortStr);
 
 			if (A < 256 && B < 256 && C < 256 && D < 256 && Port < 65536)
 			{
diff --git a/Engine/Source/Runtime/Online/HTTP/Public/GenericPlatform/GenericPlatformHttp.h b/Engine/Source/Runtime/Online/HTTP/Public/GenericPlatform/GenericPlatformHttp.h
index 1775b956e065..e3684a10d484 100644
--- a/Engine/Source/Runtime/Online/HTTP/Public/GenericPlatform/GenericPlatformHttp.h
+++ b/Engine/Source/Runtime/Online/HTTP/Public/GenericPlatform/GenericPlatformHttp.h
@@ -8,9 +8,6 @@
 class FHttpManager;
 class IHttpRequest;
 
-// Temporary define until UE4Main has this function so OSS can know to avoid it
-#define HTTP_GENERIC_PLATFORM_HAS_GETURLDOMAIN 1
-
 /**
  * Platform specific Http implementations
  * Intended usage is to use FPlatformHttp instead of FGenericPlatformHttp
@@ -90,6 +87,7 @@ public:
 	 * @return the default User-Agent string that requests should use.
 	 */
 	static FString GetDefaultUserAgent();
+	static FString EscapeUserAgentString(const FString& UnescapedString);
 
 	/**
 	 * Get the proxy address specified by the operating system
diff --git a/Engine/Source/Runtime/Online/HTTP/Public/HttpModule.h b/Engine/Source/Runtime/Online/HTTP/Public/HttpModule.h
index e76ada14c89f..6e4e1cc196ed 100644
--- a/Engine/Source/Runtime/Online/HTTP/Public/HttpModule.h
+++ b/Engine/Source/Runtime/Online/HTTP/Public/HttpModule.h
@@ -47,6 +47,11 @@ public:
 	 */
 	HTTP_API static FHttpModule& Get();
 
+	/**
+	 * Update all config-based values
+	 */
+	HTTP_API void UpdateConfigs();
+
 	/**
 	 * Instantiates a new Http request for the current platform
 	 *
diff --git a/Engine/Source/Runtime/Online/HTTP/Public/HttpRetrySystem.h b/Engine/Source/Runtime/Online/HTTP/Public/HttpRetrySystem.h
index 1144346a6971..1f1cd61dfcf0 100644
--- a/Engine/Source/Runtime/Online/HTTP/Public/HttpRetrySystem.h
+++ b/Engine/Source/Runtime/Online/HTTP/Public/HttpRetrySystem.h
@@ -47,6 +47,23 @@ namespace FHttpRetrySystem
     typedef TOptionalSetting<RetryTimeoutRelativeSecondsType> FRetryTimeoutRelativeSecondsSetting;
 	typedef TSet<int32> FRetryResponseCodes;
     typedef TSet<FName> FRetryVerbs;
+	
+	struct FRetryDomains
+	{
+		FRetryDomains(TArray<FString>&& InDomains) 
+			: Domains(MoveTemp(InDomains))
+			, ActiveIndex(0)
+		{}
+
+		/** The domains to use */
+		const TArray<FString> Domains;
+		/**
+		 * Index into Domains to attempt
+		 * Domains are cycled through on some errors, and when we succeed on one domain, we remain on that domain until that domain results in an error
+		 */
+		TAtomic<int32> ActiveIndex;
+	};
+	typedef TSharedPtr<FRetryDomains, ESPMode::ThreadSafe> FRetryDomainsPtr;
 };
 
 /**
@@ -99,17 +116,28 @@ namespace FHttpRetrySystem
 			const FRetryLimitCountSetting& InRetryLimitCountOverride = FRetryLimitCountSetting::Unused(),
 			const FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride = FRetryTimeoutRelativeSecondsSetting::Unused(),
             const FRetryResponseCodes& InRetryResponseCodes = FRetryResponseCodes(),
-            const FRetryVerbs& InRetryVerbs = FRetryVerbs()
+            const FRetryVerbs& InRetryVerbs = FRetryVerbs(),
+			const FRetryDomainsPtr& InRetryDomains = FRetryDomainsPtr()
 			);
 
 		void HttpOnRequestProgress(FHttpRequestPtr InHttpRequest, int32 BytesSent, int32 BytesRcv);
 
+		/** Update our HTTP request's URL's domain from our RetryDomains */
+		void SetUrlFromRetryDomains();
+		/** Move to the next retry domain from our RetryDomains */
+		void MoveToNextRetryDomain();
+
 		EStatus::Type                        Status;
 
         FRetryLimitCountSetting              RetryLimitCountOverride;
         FRetryTimeoutRelativeSecondsSetting  RetryTimeoutRelativeSecondsOverride;
 		FRetryResponseCodes					 RetryResponseCodes;
         FRetryVerbs                          RetryVerbs;
+		FRetryDomainsPtr					 RetryDomains;
+		/** The current index in RetryDomains we are attempting */
+		int32								 RetryDomainsIndex = 0;
+		/** The original URL before replacing anything from RetryDomains */
+		FString								 OriginalUrl;
 
 		FHttpRequestWillRetryDelegate OnRequestWillRetryDelegate;
 
@@ -132,7 +160,8 @@ namespace FHttpRetrySystem
 			const FRetryLimitCountSetting& InRetryLimitCountOverride = FRetryLimitCountSetting::Unused(),
 			const FRetryTimeoutRelativeSecondsSetting& InRetryTimeoutRelativeSecondsOverride = FRetryTimeoutRelativeSecondsSetting::Unused(),
 			const FRetryResponseCodes& InRetryResponseCodes = FRetryResponseCodes(),
-			const FRetryVerbs& InRetryVerbs = FRetryVerbs()
+			const FRetryVerbs& InRetryVerbs = FRetryVerbs(),
+			const FRetryDomainsPtr& InRetryDomains = FRetryDomainsPtr()
 			);
 
 
diff --git a/Engine/Source/Runtime/Online/HTTP/Public/Interfaces/IHttpRequest.h b/Engine/Source/Runtime/Online/HTTP/Public/Interfaces/IHttpRequest.h
index 38a04d486948..1b0e11bb2a3a 100644
--- a/Engine/Source/Runtime/Online/HTTP/Public/Interfaces/IHttpRequest.h
+++ b/Engine/Source/Runtime/Online/HTTP/Public/Interfaces/IHttpRequest.h
@@ -55,6 +55,11 @@ namespace EHttpRequestStatus
 		}
 		return TEXT("");
 	}
+
+	inline bool IsFinished(const EHttpRequestStatus::Type Value)
+	{
+		return Value == Failed || Value == Failed_ConnectionError || Value == Succeeded;
+	}
 }
 
 typedef TSharedPtr<class IHttpRequest> FHttpRequestPtr;
diff --git a/Engine/Source/Runtime/Online/ICMP/Private/Icmp.cpp b/Engine/Source/Runtime/Online/ICMP/Private/Icmp.cpp
index 7d7ab479405f..52913900b392 100644
--- a/Engine/Source/Runtime/Online/ICMP/Private/Icmp.cpp
+++ b/Engine/Source/Runtime/Online/ICMP/Private/Icmp.cpp
@@ -103,6 +103,8 @@ public:
 private:
 	virtual bool Tick(float DeltaTime) override
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_Icmp_Tick);
+
 		if (bThreadCompleted)
 		{
 			FIcmpEchoResult Result;
diff --git a/Engine/Source/Runtime/Online/ICMP/Private/UDPPing.cpp b/Engine/Source/Runtime/Online/ICMP/Private/UDPPing.cpp
index 78d06e66f2ad..4af9153717e8 100644
--- a/Engine/Source/Runtime/Online/ICMP/Private/UDPPing.cpp
+++ b/Engine/Source/Runtime/Online/ICMP/Private/UDPPing.cpp
@@ -76,7 +76,7 @@ FIcmpEchoResult UDPEchoImpl(ISocketSubsystem* SocketSub, const FString& TargetAd
 	}
 
 	int32 Port = 0;
-	Lex::FromString(Port, *PortStr);
+	LexFromString(Port, *PortStr);
 
 	//ISocketSubsystem* SocketSub = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM);
 	if (SocketSub)
@@ -216,7 +216,15 @@ public:
 				return Result;
 			};
 
-			FutureResult = AsyncThread(Task, StackSize);
+			// if we don't need a special stack size, use the task graph
+			if (StackSize == 0)
+			{
+				FutureResult = Async(EAsyncExecution::ThreadPool, Task);
+			}
+			else
+			{
+				FutureResult = AsyncThread(Task, StackSize);
+			}
 		}
 		else
 		{
@@ -237,6 +245,8 @@ public:
 private:
 	virtual bool Tick(float DeltaTime) override
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_UDPPing_Tick);
+
 		if (bThreadCompleted)
 		{
 			FIcmpEchoResult Result;
diff --git a/Engine/Source/Runtime/Online/Stomp/Private/StompClient.cpp b/Engine/Source/Runtime/Online/Stomp/Private/StompClient.cpp
index b1177d7054ab..f4278e060388 100644
--- a/Engine/Source/Runtime/Online/Stomp/Private/StompClient.cpp
+++ b/Engine/Source/Runtime/Online/Stomp/Private/StompClient.cpp
@@ -4,6 +4,7 @@
 #include "StompLog.h"
 
 #if WITH_STOMP
+#include "Stats/Stats.h"
 
 #include "StompMessage.h"
 #include "StompFrame.h"
@@ -290,6 +291,8 @@ void FStompClient::HandleIncomingFrame(const uint8* Data, SIZE_T Length)
 
 bool FStompClient::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FStompClient_Tick);
+
 	if (IsConnected())
 	{
 		FDateTime Now = FDateTime::UtcNow();
diff --git a/Engine/Source/Runtime/Online/Voice/Private/Windows/VoiceCaptureWindows.cpp b/Engine/Source/Runtime/Online/Voice/Private/Windows/VoiceCaptureWindows.cpp
index 07f593a7126e..c7f835a081e8 100644
--- a/Engine/Source/Runtime/Online/Voice/Private/Windows/VoiceCaptureWindows.cpp
+++ b/Engine/Source/Runtime/Online/Voice/Private/Windows/VoiceCaptureWindows.cpp
@@ -635,6 +635,8 @@ bool FVoiceCaptureWindows::CreateNotifications(uint32 BufferSize)
 
 bool FVoiceCaptureWindows::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FVoiceCaptureWindows_Tick);
+
 	if (VoiceCaptureState != EVoiceCaptureState::UnInitialized &&
 		VoiceCaptureState != EVoiceCaptureState::NotCapturing)
 	{
diff --git a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocket.cpp b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocket.cpp
index dc133fe4ca5f..e2ea5f661006 100644
--- a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocket.cpp
+++ b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocket.cpp
@@ -7,7 +7,9 @@
 #include "LwsWebSocketsManager.h"
 #include "WebSocketsModule.h"
 #include "WebSocketsLog.h"
+#if WITH_SSL
 #include "Ssl.h"
+#endif
 #include "Misc/ScopeLock.h"
 
 // FLwsSendBuffer 
@@ -284,8 +286,12 @@ int FLwsWebSocket::LwsCallback(lws* Instance, lws_callback_reasons Reason, void*
 		// The status is the first two bytes of the message in network byte order
 		CloseStatus = BYTESWAP_ORDER16(CloseStatus);
 #endif
-		FUTF8ToTCHAR Convert((const ANSICHAR*)Data + sizeof(uint16), Length - sizeof(uint16));
-		FString CloseReasonString(Convert.Get());
+		FString CloseReasonString;
+		if (Length > sizeof(uint16))
+		{
+			auto Convert = StringCast<TCHAR>((const ANSICHAR*)Data + sizeof(uint16), Length - sizeof(uint16));
+			CloseReasonString.AppendChars(Convert.Get(), Convert.Length());
+		}
 
 		// We only modify our state if we are Connected or ClosingByRequest (effectively connected)
 		if (State == EState::Connected ||
diff --git a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.cpp b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.cpp
index 217b68105056..3c5579639805 100644
--- a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.cpp
+++ b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.cpp
@@ -6,11 +6,14 @@
 
 #include "WebSocketsModule.h"
 #include "HAL/RunnableThread.h"
+#if WITH_SSL
 #include "Ssl.h"
+#endif
 #include "WebSocketsLog.h"
 #include "HAL/PlatformTime.h"
 #include "HAL/PlatformProcess.h"
 #include "Misc/ConfigCacheIni.h"
+#include "Stats/Stats.h"
 
 namespace {
 	static const struct lws_extension LwsExtensions[] = {
@@ -33,8 +36,11 @@ static void LwsLog(int Level, const char* LogLine);
 
 // FLwsWebSocketsManager
 FLwsWebSocketsManager::FLwsWebSocketsManager()
-	: SslContext(nullptr)
-	, LwsContext(nullptr)
+	: 
+#if WITH_SSL
+	SslContext(nullptr),
+#endif
+	LwsContext(nullptr)
 	, Thread(nullptr)
 {
 	ThreadTargetFrameTimeInSeconds = 1.0f / 30.0f; // 30Hz
@@ -284,12 +290,14 @@ int FLwsWebSocketsManager::CallbackWrapper(lws* Connection, lws_callback_reasons
 	{
 	case LWS_CALLBACK_RECEIVE_PONG:
 		return 0;
+#if WITH_SSL
 	case LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS:
 	case LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS:
 	{
 		FSslModule::Get().GetCertificateManager().AddCertificatesToSslContext(static_cast<SSL_CTX*>(UserData));
 		return 0;
 	}
+#endif
 	case LWS_CALLBACK_WSI_DESTROY:
 	{
 		SocketsDestroyedDuringService.Add(Socket);
@@ -364,6 +372,8 @@ void FLwsWebSocketsManager::StartProcessingWebSocket(FLwsWebSocket* Socket)
 
 bool FLwsWebSocketsManager::GameThreadTick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FLwsWebSocketsManager_GameThreadTick);
+
 	for (const FLwsWebSocketRef& Socket : Sockets)
 	{
 		Socket->GameThreadTick();
diff --git a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.h b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.h
index 2c19d7fb2c20..c729998ec5de 100644
--- a/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.h
+++ b/Engine/Source/Runtime/Online/WebSockets/Private/Lws/LwsWebSocketsManager.h
@@ -42,13 +42,13 @@ public:
 	 */
 	void StartProcessingWebSocket(FLwsWebSocket* Socket);
 
-private:
-
 	// IWebSocketsManager
 	virtual void InitWebSockets(TArrayView<const FString> Protocols) override;
 	virtual void ShutdownWebSockets() override;
 	virtual TSharedRef<IWebSocket> CreateWebSocket(const FString& Url, const TArray<FString>& Protocols, const TMap<FString, FString>& UpgradeHeaders) override;
 
+private:
+
 	//~ Begin FRunnable Interface
 	virtual bool Init() override;
 	virtual uint32 Run() override;
@@ -73,8 +73,10 @@ private:
 	/** Callback on events for a libwebsockets connection */
 	int CallbackWrapper(lws* Connection, lws_callback_reasons Reason, void* UserData, void* Data, size_t Length);
 
+#if WITH_SSL
 	/** OpenSSL context */
 	SSL_CTX* SslContext;
+#endif
 	/** libwebsockets context */
 	lws_context* LwsContext;
 	/** array of protocols that we have registered with libwebsockets */
diff --git a/Engine/Source/Runtime/Online/WebSockets/Private/PlatformWebSocket.h b/Engine/Source/Runtime/Online/WebSockets/Private/PlatformWebSocket.h
index 978f60688efc..9ef988b4b8e2 100644
--- a/Engine/Source/Runtime/Online/WebSockets/Private/PlatformWebSocket.h
+++ b/Engine/Source/Runtime/Online/WebSockets/Private/PlatformWebSocket.h
@@ -5,11 +5,25 @@
 #include "HAL/Platform.h"
 
 #if WITH_LIBWEBSOCKETS
-#include "Lws/LwsWebSocketsManager.h"
-typedef FLwsWebSocketsManager FPlatformWebSocketsManager;
+	#if PLATFORM_SWITCH
+		#include "Lws/Switch/LwsSwitchWebSocketsManager.h"
+	#else
+		#include "Lws/LwsWebSocketsManager.h"
+	#endif //PLATFORM_SWITCH
+
 #elif PLATFORM_XBOXONE
-#include "XboxOne/XboxOneWebSocketsManager.h"
-typedef FXboxOneWebSocketsManager FPlatformWebSocketsManager;
+	#include "XboxOne/XboxOneWebSocketsManager.h"
 #else
-#error "Web sockets not implemented on this platform yet"
-#endif
+	#error "Web sockets not implemented on this platform yet"
+#endif // WITH_LIBWEBSOCKETS
+
+#if WITH_LIBWEBSOCKETS
+	#if PLATFORM_SWITCH
+		typedef FLwsSwitchWebSocketsManager FPlatformWebSocketsManager;
+	#else
+		typedef FLwsWebSocketsManager FPlatformWebSocketsManager;
+	#endif // PLATFORM_SWITCH
+
+#elif PLATFORM_XBOXONE
+	typedef FXboxOneWebSocketsManager FPlatformWebSocketsManager;
+#endif //WITH_LIBWEBSOCKETS
diff --git a/Engine/Source/Runtime/Online/WebSockets/Private/WebSocketsModule.cpp b/Engine/Source/Runtime/Online/WebSockets/Private/WebSocketsModule.cpp
index b3ccc1935c4f..f7400569307c 100644
--- a/Engine/Source/Runtime/Online/WebSockets/Private/WebSocketsModule.cpp
+++ b/Engine/Source/Runtime/Online/WebSockets/Private/WebSocketsModule.cpp
@@ -29,7 +29,7 @@ void FWebSocketsModule::StartupModule()
 	Singleton = this;
 
 #if WITH_WEBSOCKETS
-	const FString Protocols[] = {TEXT("ws"), TEXT("wss"), TEXT("v10.stomp"), TEXT("v11.stomp"), TEXT("v12.stomp")};
+	const FString Protocols[] = {TEXT("ws"), TEXT("wss"), TEXT("v10.stomp"), TEXT("v11.stomp"), TEXT("v12.stomp"), TEXT("xmpp")};
 
 	WebSocketsManager = new FPlatformWebSocketsManager;
 	WebSocketsManager->InitWebSockets(Protocols);
diff --git a/Engine/Source/Runtime/Online/WebSockets/WebSockets.Build.cs b/Engine/Source/Runtime/Online/WebSockets/WebSockets.Build.cs
index 3650ab030952..3e10a8533dfe 100644
--- a/Engine/Source/Runtime/Online/WebSockets/WebSockets.Build.cs
+++ b/Engine/Source/Runtime/Online/WebSockets/WebSockets.Build.cs
@@ -21,7 +21,10 @@ public class WebSockets : ModuleRules
 					Target.Platform == UnrealTargetPlatform.Mac ||
 					Target.IsInPlatformGroup(UnrealPlatformGroup.Unix) ||
 					Target.Platform == UnrealTargetPlatform.IOS ||
-					Target.Platform == UnrealTargetPlatform.PS4;
+					Target.Platform == UnrealTargetPlatform.PS4 ||
+					Target.Platform == UnrealTargetPlatform.Switch;
+
+			bool bUsePlatformSSL = Target.Platform == UnrealTargetPlatform.Switch;
 
 			bool bPlatformSupportsXboxWebsockets = Target.Platform == UnrealTargetPlatform.XboxOne;
 
@@ -42,8 +45,17 @@ public class WebSockets : ModuleRules
 			if (bPlatformSupportsLibWebsockets)
 			{
 				PublicDefinitions.Add("WITH_LIBWEBSOCKETS=1");
- 				AddEngineThirdPartyPrivateStaticDependencies(Target, "OpenSSL", "libWebSockets", "zlib");
-				PrivateDependencyModuleNames.Add("SSL");
+
+				if (bUsePlatformSSL)
+				{
+					PrivateDefinitions.Add("WITH_SSL=0");
+					AddEngineThirdPartyPrivateStaticDependencies(Target, "libWebSockets");
+				}
+				else
+				{
+					AddEngineThirdPartyPrivateStaticDependencies(Target, "OpenSSL", "libWebSockets", "zlib");
+					PrivateDependencyModuleNames.Add("SSL");
+				}
 			}
 		}
 		else
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppModule.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppModule.cpp
index 324bf9eac212..88f0783bf078 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppModule.cpp
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppModule.cpp
@@ -11,8 +11,10 @@
 #include "XmppNull.h"
 #if WITH_XMPP_JINGLE
 #include "XmppJingle/XmppJingle.h"
-#elif WITH_XMPP_STROPHE
+#endif
+#if WITH_XMPP_STROPHE
 #include "XmppStrophe/XmppStrophe.h"
+#include "WebSocketsModule.h"
 #endif
 
 DEFINE_LOG_CATEGORY(LogXmpp);
@@ -34,8 +36,10 @@ void FXmppModule::StartupModule()
 	{
 #if WITH_XMPP_JINGLE
 		FXmppJingle::Init();
-#elif WITH_XMPP_STROPHE
+#endif
+#if WITH_XMPP_STROPHE
 		FXmppStrophe::Init();
+		FModuleManager::LoadModuleChecked<FWebSocketsModule>("WebSockets");
 #endif
 	}
 }
@@ -51,7 +55,8 @@ void FXmppModule::ShutdownModule()
 	{
 #if WITH_XMPP_JINGLE
 		FXmppJingle::Cleanup();
-#elif WITH_XMPP_STROPHE
+#endif
+#if WITH_XMPP_STROPHE
 		FXmppStrophe::Cleanup();
 #endif
 	}
@@ -81,6 +86,7 @@ bool FXmppModule::HandleXmppCommand( const TCHAR* Cmd, FOutputDevice& Ar )
 	XmppServer.Domain = TEXT("localhost.net");
 	XmppServer.ServerPort = 5222;
 
+
 	if (FParse::Command(&Cmd, TEXT("Test")))
 	{
 		FString UserName = FParse::Token(Cmd, false);
@@ -683,19 +689,37 @@ TSharedRef<IXmppConnection> FXmppModule::CreateConnection(const FString& UserId)
 	}
 	else
 	{
+		bool bEnableWebsockets = false;
+		GConfig->GetBool(TEXT("XMPP"), TEXT("bEnableWebsockets"), bEnableWebsockets, GEngineIni);
+
+		bool bUseStrophe = WITH_XMPP_STROPHE && bEnableWebsockets;
+		bool bUseJingle = WITH_XMPP_JINGLE && !bUseStrophe;
+		if (!bUseJingle && !bUseStrophe)
+		{
+			// if not using websockets, use the previous default implementation (jingle if available, otherwise strophe)
 #if WITH_XMPP_JINGLE
-		if (bEnabled)
-		{
-			Connection = FXmppJingle::CreateConnection();
-		}
-		else
+			bUseJingle = true;
 #elif WITH_XMPP_STROPHE
-		if (bEnabled)
+			bUseStrophe = true;
+#endif
+		}
+
+		if (bEnabled && (bUseStrophe || bUseJingle))
 		{
-			Connection = FXmppStrophe::CreateConnection();
+#if WITH_XMPP_STROPHE
+			if (bUseStrophe)
+			{
+				Connection = FXmppStrophe::CreateConnection();
+			}
+#endif
+#if WITH_XMPP_JINGLE
+			if (bUseJingle)
+			{
+				Connection = FXmppJingle::CreateConnection();
+			}
+#endif
 		}
 		else
-#endif
 		{
 			Connection = FXmppNull::CreateConnection();
 		}
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheStanza.h b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheStanza.h
index 82a6d23f9abe..d07ba3ee1ee4 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheStanza.h
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheStanza.h
@@ -22,9 +22,11 @@ class FStropheStanza
 	friend class FStropheError;
 	// For GetStanzaPtr access
 	friend class FStropheConnection;
+	friend class FStropheWebsocketConnection;
 
 	// For cloning stanzas from our socket
 	friend int StropheStanzaEventHandler(xmpp_conn_t* const Connection, xmpp_stanza_t* const IncomingStanza, void* const UserData);
+	friend int StropheWebsocketStanzaEventHandler(xmpp_conn_t* const Connection, xmpp_stanza_t* const IncomingStanza, void* const UserData);
 
 public:
 	explicit FStropheStanza(const FXmppConnectionStrophe& Context, const FString& StanzaName = FString());
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.cpp
new file mode 100644
index 000000000000..6f9563ffaba1
--- /dev/null
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.cpp
@@ -0,0 +1,218 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "XmppStrophe/StropheWebsocketConnection.h"
+
+#include "XmppConnection.h"
+#include "XmppLog.h"
+#include "XmppStrophe/StropheContext.h"
+#include "XmppStrophe/StropheError.h"
+#include "XmppStrophe/StropheStanza.h"
+#include "XmppStrophe/XmppConnectionStrophe.h"
+
+#if WITH_XMPP_STROPHE
+
+#include "WebSocketsModule.h"
+#include "IWebSocket.h"
+
+THIRD_PARTY_INCLUDES_START
+#include "strophe.h"
+THIRD_PARTY_INCLUDES_END
+
+int StropheWebsocketStanzaEventHandler(xmpp_conn_t* const UnusedPtr, xmpp_stanza_t* const EventStanza, void* const VoidConnectionPtr)
+{
+	check(VoidConnectionPtr != nullptr);
+
+	const FStropheStanza IncomingStanza(EventStanza);
+
+	// Ignore session stanza (bug in libstrophe that we see get this at all)
+	static const FString LoginSessionStanza(TEXT("_xmpp_session1"));
+	if (IncomingStanza.GetId() != LoginSessionStanza)
+	{
+		// We want to forward our stanza to our connection and out to our handlers
+		FXmppConnectionStrophe* const ConnectionPtr = static_cast<FXmppConnectionStrophe* const>(VoidConnectionPtr);
+		ConnectionPtr->ReceiveStanza(IncomingStanza);
+	}
+
+	return 1;
+}
+
+static void StropheWebsocketConnectionEventHandler(xmpp_conn_t* const UnusedPtr,
+	const xmpp_conn_event_t ConnectionEvent,
+	const int ErrorNo,
+	xmpp_stream_error_t* const StreamError,
+	void* const VoidConnectionPtr)
+{
+	check(VoidConnectionPtr != nullptr);
+	FXmppConnectionStrophe* const ConnectionPtr = static_cast<FXmppConnectionStrophe* const>(VoidConnectionPtr);
+
+	EStropheConnectionEvent Event = EStropheConnectionEvent::Fail;
+	switch (ConnectionEvent)
+	{
+	case XMPP_CONN_CONNECT:
+		Event = EStropheConnectionEvent::Connect;
+		break;
+	case XMPP_CONN_RAW_CONNECT:
+		Event = EStropheConnectionEvent::RawConnect;
+		break;
+	case XMPP_CONN_DISCONNECT:
+		Event = EStropheConnectionEvent::Disconnect;
+		break;
+	case XMPP_CONN_FAIL:
+		Event = EStropheConnectionEvent::Fail;
+		break;
+	}
+
+	ConnectionPtr->ReceiveConnectionStateChange(Event);
+
+	if (StreamError != nullptr)
+	{
+		const FStropheError Error(*StreamError, ErrorNo);
+		ConnectionPtr->ReceiveConnectionError(Error, Event);
+	}
+}
+
+FStropheWebsocketConnection::FStropheWebsocketConnection(FStropheContext& InContext, const FString& Url)
+	: Context(InContext)
+{
+	TArray<FString> Protocols;
+	Protocols.Add(TEXT("xmpp"));
+	Websocket = FWebSocketsModule::Get().CreateWebSocket(Url, Protocols);
+
+	Websocket->OnConnected().AddRaw(this, &FStropheWebsocketConnection::OnWebsocketConnected);
+	Websocket->OnConnectionError().AddRaw(this, &FStropheWebsocketConnection::OnWebsocketConnectionError);
+	Websocket->OnClosed().AddRaw(this, &FStropheWebsocketConnection::OnWebsocketClosed);
+	Websocket->OnRawMessage().AddRaw(this, &FStropheWebsocketConnection::OnRawMessage);
+
+	XmppConnectionPtr = xmpp_conn_new(Context.GetContextPtr());
+	const int32 IsWebsocket = 1;
+	xmpp_conn_extsock_t ExternalSocket = 
+	{
+		&FStropheWebsocketConnection::WebsocketConnectHandler,
+		&FStropheWebsocketConnection::WebsocketCloseHandler,
+		&FStropheWebsocketConnection::WebsocketSendHandler,
+		IsWebsocket,
+		this
+	};
+
+	xmpp_conn_set_extsock_handlers(XmppConnectionPtr, &ExternalSocket);
+}
+
+FStropheWebsocketConnection::~FStropheWebsocketConnection()
+{
+	Websocket->OnConnected().RemoveAll(this);
+	Websocket->OnConnectionError().RemoveAll(this);
+	Websocket->OnClosed().RemoveAll(this);
+	Websocket->OnRawMessage().RemoveAll(this);
+
+	xmpp_conn_release(XmppConnectionPtr);
+}
+
+bool FStropheWebsocketConnection::Connect(const FXmppUserJid& UserJid, const FString& Password, FXmppConnectionStrophe& ConnectionManager)
+{
+	bool bSuccess = true;
+
+	ConnectionManager.ProcessLoginStatusChange(EXmppLoginStatus::ProcessingLogin);
+
+	const FString UserJidFullPath = UserJid.GetFullPath();
+	xmpp_conn_set_jid(XmppConnectionPtr, TCHAR_TO_UTF8(*UserJidFullPath));
+	xmpp_conn_set_pass(XmppConnectionPtr, TCHAR_TO_UTF8(*Password));
+
+	const int Result = xmpp_extsock_connect_client(XmppConnectionPtr, StropheWebsocketConnectionEventHandler, &ConnectionManager);
+	if (Result != XMPP_EOK)
+	{
+		UE_LOG(LogXmpp, Error, TEXT("Websocket failed to connect. Error %i"), Result);
+		bSuccess = false;
+
+		ConnectionManager.ProcessLoginStatusChange(EXmppLoginStatus::LoggedOut);
+	}
+
+	xmpp_handler_add(XmppConnectionPtr, StropheWebsocketStanzaEventHandler, nullptr, nullptr, nullptr, &ConnectionManager);
+
+	return bSuccess;
+}
+
+bool FStropheWebsocketConnection::SendStanza(FStropheStanza&& Stanza)
+{
+	if (!Websocket->IsConnected())
+	{
+		return false;
+	}
+
+	xmpp_send(XmppConnectionPtr, Stanza.GetStanzaPtr());
+	return true;
+}
+
+void FStropheWebsocketConnection::Tick()
+{
+	// Handles timeouts, processes timers
+	xmpp_run_once(Context.GetContextPtr(), 0);
+}
+
+void FStropheWebsocketConnection::Disconnect()
+{
+	xmpp_disconnect(XmppConnectionPtr);
+
+	xmpp_handler_delete(XmppConnectionPtr, StropheWebsocketStanzaEventHandler);
+}
+
+void FStropheWebsocketConnection::WebsocketConnectHandler(void* const Userdata)
+{
+	FStropheWebsocketConnection* const Websocket = static_cast<FStropheWebsocketConnection* const>(Userdata);
+	Websocket->WebsocketConnect();
+}
+
+void FStropheWebsocketConnection::WebsocketCloseHandler(void* const Userdata)
+{
+	FStropheWebsocketConnection* const Websocket = static_cast<FStropheWebsocketConnection* const>(Userdata);
+	Websocket->WebsocketClose();
+}
+
+void FStropheWebsocketConnection::WebsocketSendHandler(const char* const Data, const size_t Length, void* const Userdata)
+{
+	FStropheWebsocketConnection* const Websocket = static_cast<FStropheWebsocketConnection* const>(Userdata);
+	Websocket->WebsocketSend(Data, Length);
+
+}
+
+void FStropheWebsocketConnection::WebsocketConnect()
+{
+	Websocket->Connect();
+}
+
+void FStropheWebsocketConnection::WebsocketClose()
+{
+	Websocket->Close();
+}
+
+void FStropheWebsocketConnection::WebsocketSend(const char* const Data, const size_t Length)
+{
+	Websocket->Send(Data, Length);
+}
+
+void FStropheWebsocketConnection::OnWebsocketConnected()
+{
+	xmpp_extsock_connected(XmppConnectionPtr);
+}
+
+void FStropheWebsocketConnection::OnWebsocketConnectionError(const FString& Error)
+{
+	xmpp_extsock_connection_error(XmppConnectionPtr, TCHAR_TO_UTF8(*Error));
+}
+
+void FStropheWebsocketConnection::OnWebsocketClosed(int32 StatusCode, const FString& Reason, bool bWasClean)
+{
+	Disconnect();
+}
+
+void FStropheWebsocketConnection::OnRawMessage(const void* Data, SIZE_T Size, SIZE_T BytesRemaining)
+{
+	xmpp_extsock_receive(XmppConnectionPtr, static_cast<const char*>(Data), Size);
+	if (BytesRemaining == 0)
+	{
+		// need to reset the parser on message boundaries because xmpp websockets have each message
+		//   as an xml document instead of the full stream being parsable as a single document
+		xmpp_extsock_parser_reset(XmppConnectionPtr);
+	}
+}
+
+#endif
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.h b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.h
new file mode 100644
index 000000000000..caf5b6df6718
--- /dev/null
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/StropheWebsocketConnection.h
@@ -0,0 +1,69 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "XmppStrophe/StropheContext.h"
+
+#if WITH_XMPP_STROPHE
+
+class FStropheStanza;
+class FXmppConnectionStrophe;
+class FXmppUserJid;
+class IWebSocket;
+
+typedef struct _xmpp_conn_t xmpp_conn_t;
+
+class FStropheWebsocketConnection
+{
+public:
+	explicit FStropheWebsocketConnection(FStropheContext& InContext, const FString& Url);
+	~FStropheWebsocketConnection();
+
+	// Do not allow copies/assigns
+	FStropheWebsocketConnection(const FStropheWebsocketConnection& Other) = delete;
+	FStropheWebsocketConnection(FStropheWebsocketConnection&& Other) = delete;
+	FStropheWebsocketConnection& operator=(const FStropheWebsocketConnection& Other) = delete;
+	FStropheWebsocketConnection& operator=(FStropheWebsocketConnection&& Other) = delete;
+
+	/** Connect to previously set url
+	 * @param UserJid username
+	 * @param Password password
+	 * @param ConnectionManager connection object that will receive the stanzas/errors
+	 *
+	 * @return true if no errors were detected
+	 */
+	bool Connect(const FXmppUserJid& UserJid, const FString& Password, FXmppConnectionStrophe& ConnectionManager);
+	/** Disconnect from the server*/
+	void Disconnect();
+
+	/** Send a stanza */
+	bool SendStanza(FStropheStanza&& Stanza);
+
+	/** Tick to process events */
+	void Tick();
+
+private:
+	FStropheContext& Context;
+
+	TSharedPtr<IWebSocket> Websocket;
+
+	xmpp_conn_t* XmppConnectionPtr;
+
+	/* Handlers for strophe external socket events */
+	static void WebsocketConnectHandler(void* const Userdata);
+	static void WebsocketCloseHandler(void* const Userdata);
+	static void WebsocketSendHandler(const char* const Data, const size_t Length, void* const Userdata);
+
+	void WebsocketConnect();
+	void WebsocketClose();
+	void WebsocketSend(const char* const Data, const size_t Length);
+
+	/* Handlers for websocket events */
+	void OnWebsocketConnected();
+	void OnWebsocketConnectionError(const FString& Error);
+	void OnWebsocketClosed(int32 StatusCode, const FString& Reason, bool bWasClean);
+	void OnRawMessage(const void* Data, SIZE_T Size, SIZE_T BytesRemaining);
+};
+
+#endif
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.cpp
index ea52ac687630..e52558db1afc 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.cpp
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.cpp
@@ -40,41 +40,58 @@ const FXmppServer& FXmppConnectionStrophe::GetServer() const
 
 void FXmppConnectionStrophe::Login(const FString& UserId, const FString& Auth)
 {
+	FString ErrorStr;
+
 	FXmppUserJid NewJid(UserId, ServerConfiguration.Domain, ServerConfiguration.ClientResource);
 	if (!NewJid.IsValid())
 	{
-		UE_LOG(LogXmpp, Error, TEXT("Invalid Jid %s"), *UserJid.GetFullPath());
-		return;
-	}
-
-	UE_LOG(LogXmpp, Log, TEXT("Starting Login on connection"));
-	UE_LOG(LogXmpp, Log, TEXT("  Server = %s:%d"), *ServerConfiguration.ServerAddr, ServerConfiguration.ServerPort);
-	UE_LOG(LogXmpp, Log, TEXT("  User = %s"), *NewJid.GetFullPath());
-
-	if (LoginStatus == EXmppLoginStatus::ProcessingLogin)
-	{
-		UE_LOG(LogXmpp, Warning, TEXT("Still processing last login"));
-	}
-	else if (LoginStatus == EXmppLoginStatus::ProcessingLogout)
-	{
-		UE_LOG(LogXmpp, Warning, TEXT("Still processing last logout"));
-	}
-	else if (LoginStatus == EXmppLoginStatus::LoggedIn)
-	{
-		UE_LOG(LogXmpp, Warning, TEXT("Already logged in"));
+		ErrorStr = FString::Printf(TEXT("Invalid Jid %s"), *UserJid.GetFullPath());
 	}
 	else
 	{
-		// Close down any existing thread
-		if (StropheThread.IsValid())
+		UE_LOG(LogXmpp, Log, TEXT("Starting Login on connection"));
+		UE_LOG(LogXmpp, Log, TEXT("  Server = %s:%d"), *ServerConfiguration.ServerAddr, ServerConfiguration.ServerPort);
+		UE_LOG(LogXmpp, Log, TEXT("  User = %s"), *NewJid.GetFullPath());
+
+		if (LoginStatus == EXmppLoginStatus::ProcessingLogin)
 		{
-			Logout();
+			ErrorStr = TEXT("Still processing last login");
 		}
+		else if (LoginStatus == EXmppLoginStatus::ProcessingLogout)
+		{
+			ErrorStr = TEXT("Still processing last logout");
+		}
+		else if (LoginStatus == EXmppLoginStatus::LoggedIn)
+		{
+			ErrorStr = TEXT("Already logged in");
+		}
+		else
+		{
+			// Close down any existing thread
+			if (StropheThread.IsValid() || WebsocketConnection.IsValid())
+			{
+				Logout();
+			}
 
-		UserJid = MoveTemp(NewJid);
-		MucDomain = FString::Printf(TEXT("muc.%s"), *ServerConfiguration.Domain);
+			UserJid = MoveTemp(NewJid);
+			MucDomain = FString::Printf(TEXT("muc.%s"), *ServerConfiguration.Domain);
 
-		StartXmppThread(UserJid, Auth);
+			if (ServerConfiguration.ServerAddr.StartsWith(TEXT("wss://")) || ServerConfiguration.ServerAddr.StartsWith(TEXT("ws://")))
+			{
+				WebsocketConnection = MakeUnique<FStropheWebsocketConnection>(StropheContext, FString::Printf(TEXT("%s:%i"), *ServerConfiguration.ServerAddr, ServerConfiguration.ServerPort));
+				WebsocketConnection->Connect(UserJid, Auth, *this);
+			}
+			else
+			{
+				StartXmppThread(UserJid, Auth);
+			}
+		}
+	}
+
+	if (!ErrorStr.IsEmpty())
+	{
+		UE_LOG(LogXmpp, Warning, TEXT("Login failed. %s"), *ErrorStr);
+		OnLoginComplete().Broadcast(GetUserJid(), false, ErrorStr);
 	}
 }
 
@@ -85,6 +102,11 @@ void FXmppConnectionStrophe::Logout()
 		StopXmppThread();
 	}
 
+	if (WebsocketConnection.IsValid())
+	{
+		WebsocketConnection.Reset();
+	}
+
 	MessagesStrophe->OnDisconnect();
 	MultiUserChatStrophe->OnDisconnect();
 	PingStrophe->OnDisconnect();
@@ -146,47 +168,18 @@ bool FXmppConnectionStrophe::Tick(float DeltaTime)
 
 	while (!IncomingLoginStatusChanges.IsEmpty())
 	{
-		EXmppLoginStatus::Type OldLoginStatus = LoginStatus;
 		EXmppLoginStatus::Type NewLoginStatus;
 		if (IncomingLoginStatusChanges.Dequeue(NewLoginStatus))
 		{
-			if (OldLoginStatus != NewLoginStatus)
-			{
-				UE_LOG(LogXmpp, Log, TEXT("Strophe XMPP thread received LoginStatus change Was: %s Now: %s"), EXmppLoginStatus::ToString(OldLoginStatus), EXmppLoginStatus::ToString(NewLoginStatus));
-
-				// New login status needs to be set before calling below delegates
-				LoginStatus = NewLoginStatus;
-
-				if (NewLoginStatus == EXmppLoginStatus::LoggedIn)
-				{
-					UE_LOG(LogXmpp, Log, TEXT("Logged IN JID=%s"), *GetUserJid().GetFullPath());
-					if (OldLoginStatus == EXmppLoginStatus::ProcessingLogin)
-					{
-						OnLoginComplete().Broadcast(GetUserJid(), true, FString());
-					}
-					OnLoginChanged().Broadcast(GetUserJid(), EXmppLoginStatus::LoggedIn);
-				}
-				else if (NewLoginStatus == EXmppLoginStatus::LoggedOut)
-				{
-					UE_LOG(LogXmpp, Log, TEXT("Logged OUT JID=%s"), *GetUserJid().GetFullPath());
-					if (OldLoginStatus == EXmppLoginStatus::ProcessingLogin)
-					{
-						OnLoginComplete().Broadcast(GetUserJid(), false, FString());
-					}
-					else if (OldLoginStatus == EXmppLoginStatus::ProcessingLogout)
-					{
-						OnLogoutComplete().Broadcast(GetUserJid(), true, FString());
-					}
-					if (OldLoginStatus == EXmppLoginStatus::LoggedIn ||
-						OldLoginStatus == EXmppLoginStatus::ProcessingLogout)
-					{
-						OnLoginChanged().Broadcast(GetUserJid(), EXmppLoginStatus::LoggedOut);
-					}
-				}
-			}
+			ProcessLoginStatusChange(NewLoginStatus);
 		}
 	}
 
+	if (WebsocketConnection.IsValid())
+	{
+		WebsocketConnection->Tick();
+	}
+
 	return true;
 }
 
@@ -197,12 +190,20 @@ bool FXmppConnectionStrophe::SendStanza(FStropheStanza&& Stanza)
 		return false;
 	}
 
-	if (!StropheThread.IsValid())
+	bool bQueuedStanzaToBeSent = true;
+	if (StropheThread.IsValid())
+	{
+		bQueuedStanzaToBeSent = StropheThread->SendStanza(MoveTemp(Stanza));
+	}
+	else if (WebsocketConnection.IsValid())
+	{
+		bQueuedStanzaToBeSent = WebsocketConnection->SendStanza(MoveTemp(Stanza));
+	}
+	else
 	{
 		return false;
 	}
 
-	const bool bQueuedStanzaToBeSent = StropheThread->SendStanza(MoveTemp(Stanza));
 	if (bQueuedStanzaToBeSent)
 	{
 		// Reset our ping timer now that we're queuing a different message to be sent
@@ -229,7 +230,7 @@ void FXmppConnectionStrophe::StopXmppThread()
 	StropheThread.Reset();
 }
 
-void FXmppConnectionStrophe::ReceiveConnectionStateChange(EStropheConnectionEvent StateChange)
+void FXmppConnectionStrophe::ReceiveConnectionStateChange(EStropheConnectionEvent StateChange, bool bQueue)
 {
 	EXmppLoginStatus::Type NewLoginStatus = EXmppLoginStatus::LoggedOut;
 	switch (StateChange)
@@ -245,9 +246,16 @@ void FXmppConnectionStrophe::ReceiveConnectionStateChange(EStropheConnectionEven
 		break;
 	}
 
-	UE_LOG(LogXmpp, Log, TEXT("Strophe XMPP thread received state change Was: %s Now: %s"), EXmppLoginStatus::ToString(LoginStatus), EXmppLoginStatus::ToString(NewLoginStatus));
+	if (bQueue)
+	{
+		UE_LOG(LogXmpp, Log, TEXT("Strophe XMPP thread received state change Was: %s Now: %s"), EXmppLoginStatus::ToString(LoginStatus), EXmppLoginStatus::ToString(NewLoginStatus));
 
-	QueueNewLoginStatus(NewLoginStatus);
+		QueueNewLoginStatus(NewLoginStatus);
+	}
+	else
+	{
+		ProcessLoginStatusChange(NewLoginStatus);
+	}
 }
 
 void FXmppConnectionStrophe::ReceiveConnectionError(const FStropheError& Error, EStropheConnectionEvent Event)
@@ -315,7 +323,6 @@ void FXmppConnectionStrophe::ReceiveStanza(const FStropheStanza& Stanza)
 		}
 	}
 
-	checkfSlow(false, TEXT("Unhandled XMPP stanza %s"), *Stanza.GetName());
 	UE_LOG(LogXmpp, Warning, TEXT("%s Stanza left unhandled"), *Stanza.GetName());
 }
 
@@ -324,4 +331,43 @@ void FXmppConnectionStrophe::QueueNewLoginStatus(EXmppLoginStatus::Type NewStatu
 	IncomingLoginStatusChanges.Enqueue(NewStatus);
 }
 
+void FXmppConnectionStrophe::ProcessLoginStatusChange(EXmppLoginStatus::Type NewLoginStatus)
+{
+	EXmppLoginStatus::Type OldLoginStatus = LoginStatus;
+	if (OldLoginStatus != NewLoginStatus)
+	{
+		UE_LOG(LogXmpp, Log, TEXT("Strophe processing LoginStatus change Was: %s Now: %s"), EXmppLoginStatus::ToString(OldLoginStatus), EXmppLoginStatus::ToString(NewLoginStatus));
+
+		// New login status needs to be set before calling below delegates
+		LoginStatus = NewLoginStatus;
+
+		if (NewLoginStatus == EXmppLoginStatus::LoggedIn)
+		{
+			UE_LOG(LogXmpp, Log, TEXT("Logged IN JID=%s"), *GetUserJid().GetFullPath());
+			if (OldLoginStatus == EXmppLoginStatus::ProcessingLogin)
+			{
+				OnLoginComplete().Broadcast(GetUserJid(), true, FString());
+			}
+			OnLoginChanged().Broadcast(GetUserJid(), EXmppLoginStatus::LoggedIn);
+		}
+		else if (NewLoginStatus == EXmppLoginStatus::LoggedOut)
+		{
+			UE_LOG(LogXmpp, Log, TEXT("Logged OUT JID=%s"), *GetUserJid().GetFullPath());
+			if (OldLoginStatus == EXmppLoginStatus::ProcessingLogin)
+			{
+				OnLoginComplete().Broadcast(GetUserJid(), false, FString());
+			}
+			else if (OldLoginStatus == EXmppLoginStatus::ProcessingLogout)
+			{
+				OnLogoutComplete().Broadcast(GetUserJid(), true, FString());
+			}
+			if (OldLoginStatus == EXmppLoginStatus::LoggedIn ||
+				OldLoginStatus == EXmppLoginStatus::ProcessingLogout)
+			{
+				OnLoginChanged().Broadcast(GetUserJid(), EXmppLoginStatus::LoggedOut);
+			}
+		}
+	}
+}
+
 #endif
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.h b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.h
index 193c55ce2164..b2cab562b025 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.h
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppConnectionStrophe.h
@@ -6,6 +6,7 @@
 #include "XmppConnection.h"
 #include "XmppStrophe/StropheConnection.h"
 #include "XmppStrophe/XmppStropheThread.h"
+#include "XmppStrophe/StropheWebsocketConnection.h"
 
 #include "Containers/Ticker.h"
 
@@ -69,10 +70,11 @@ public:
 
 	// XMPP Thread methods
 
-	void ReceiveConnectionStateChange(EStropheConnectionEvent Event);
+	void ReceiveConnectionStateChange(EStropheConnectionEvent Event, bool bQueue = true);
 	void ReceiveConnectionError(const FStropheError& Error, EStropheConnectionEvent Event);
 	void ReceiveStanza(const FStropheStanza& Stanza);
 	void QueueNewLoginStatus(EXmppLoginStatus::Type NewStatus);
+	void ProcessLoginStatusChange(EXmppLoginStatus::Type NewLoginStatus);
 
 	/** Get our Context object */
 	const FStropheContext& GetContext() const { return StropheContext; }
@@ -87,8 +89,11 @@ protected:
 	/** Our XMPP thread that manages sending/receiving/sending events */
 	TUniquePtr<FXmppStropheThread> StropheThread;
 
+	/** If using websockets, use event driven websocket connection instead */
+	TUniquePtr<FStropheWebsocketConnection> WebsocketConnection;
+
 	/** Current login status */
-	volatile EXmppLoginStatus::Type LoginStatus;
+	TAtomic<EXmppLoginStatus::Type> LoginStatus;
 
 	/** Queue of login status changes processed on tick so that we do not miss processing any status changes */
 	TQueue<EXmppLoginStatus::Type> IncomingLoginStatusChanges;
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.cpp
index cbd88a64a28f..d1c3c41dab9a 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.cpp
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.cpp
@@ -601,28 +601,67 @@ bool FXmppMultiUserChatStrophe::ExitRoom(const FXmppRoomId& RoomId)
 {
 	UE_LOG(LogXmpp, Verbose, TEXT("MUC: ExitRoom RoomId=%s"), *RoomId);
 
+	bool bSuccess = false;
+	FString ErrorStr;
+	FXmppRoomStrophe* RoomPtr = Chatrooms.Find(RoomId);
+
 	if (ConnectionManager.GetLoginStatus() != EXmppLoginStatus::LoggedIn)
 	{
-		return false;
+		// Not logged in, so cannot leave the chat room
+		ErrorStr = TEXT("User not logged in");
+		bSuccess = false;
 	}
-
-	// If we're not in this room, we don't need to exit
-	FXmppRoomStrophe* RoomPtr = Chatrooms.Find(RoomId);
-	if (RoomPtr == nullptr)
+	else if (RoomPtr == nullptr)
 	{
-		return true;
+		ErrorStr = TEXT("Room was never created.");
+		bSuccess = true;	// Returning true since we can't be in the room at all.
 	}
-
-	// We're not in this room (probably)
-	if (RoomPtr->Status != ERoomStatusStrophe::Joined)
+	else
 	{
-		return false;
+		switch (RoomPtr->Status)
+		{
+		case ERoomStatusStrophe::ExitPending:
+			{
+				// We've already queued an exit, so do not queue again or trigger delegates
+				bSuccess = true;
+			}
+			break;
+		case ERoomStatusStrophe::Joined:
+			{
+				ERoomStatusStrophe OldStatus = RoomPtr->Status;
+
+				// Queue our exit
+				RoomPtr->Status = ERoomStatusStrophe::ExitPending;
+				bSuccess = SendExitRoomStanza(*RoomPtr);
+
+				if (!bSuccess)
+				{
+					ErrorStr = TEXT("Could not send ExitRoom stanza");
+					RoomPtr->Status = OldStatus;	// Restore old room status if we could not queue the exit operation
+				}
+			}
+			break;
+		case ERoomStatusStrophe::NotJoined:
+		case ERoomStatusStrophe::CreatePending:
+		case ERoomStatusStrophe::JoinPublicPending:
+		case ERoomStatusStrophe::JoinPrivatePending:
+		default:
+			{
+				// We're (probably) not in this room, so we don't need to exit
+				ErrorStr = FString::Printf(TEXT("User not in room: status is %s"), LexToString(RoomPtr->Status));
+				bSuccess = false;
+			}
+			break;
+		}
 	}
 
-	// Queue our exit
-	RoomPtr->Status = ERoomStatusStrophe::ExitPending;
+	if (!bSuccess || RoomPtr == nullptr)
+	{
+		UE_LOG(LogXmpp, Warning, TEXT("MUC: Cannot leave room %s: %s"), *RoomId, *ErrorStr);
+		OnXmppRoomExitCompleteDelegate.Broadcast(ConnectionManager.AsShared(), bSuccess, RoomId, ErrorStr);
+	}
 
-	return SendExitRoomStanza(*RoomPtr);
+	return bSuccess;
 }
 
 bool FXmppMultiUserChatStrophe::SendChat(const FXmppRoomId& RoomId, const FString& MsgBody, const FString& ChatInfo)
@@ -986,6 +1025,14 @@ void FXmppMultiUserChatStrophe::OnReceiveRoomConfigSuccess(FXmppRoomId&& RoomId)
 				OnXmppRoomConfiguredDelegate.Broadcast(ConnectionManager.AsShared(), true, RoomPtr->GetRoomId(), FString());
 				break;
 			case EConfigureRoomTypeStrophe::UseCreateCallback:
+				if (ensure(RoomPtr->Status == ERoomStatusStrophe::CreatePending))
+				{
+					RoomPtr->Status = ERoomStatusStrophe::Joined;
+				}
+				else
+				{
+					UE_LOG(LogXmpp, Warning, TEXT("OnReceiveRoomConfigSuccess: Room %s is not in the CreatePending state (%s)"), *RoomPtr->GetRoomId(), LexToString(RoomPtr->Status));
+				}
 				OnXmppRoomCreateCompleteDelegate.Broadcast(ConnectionManager.AsShared(), true, RoomPtr->GetRoomId(), FString());
 				break;
 			}
@@ -1196,7 +1243,7 @@ void FXmppMultiUserChatStrophe::HandleExitRoomComplete(FXmppRoomStrophe& Room, F
 	{
 		if (Room.Status != ERoomStatusStrophe::ExitPending)
 		{
-			UE_LOG(LogXmpp, Verbose, TEXT("MUC: Server initiated room exit complete; in state %s"), Lex::ToString(Room.Status));
+			UE_LOG(LogXmpp, Verbose, TEXT("MUC: Server initiated room exit complete; in state %s"), LexToString(Room.Status));
 		}
 		OnXmppRoomExitCompleteDelegate.Broadcast(ConnectionManager.AsShared(), true, Room.GetRoomId(), FString());
 	}
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.h b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.h
index d8353ef66dd7..184065059748 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.h
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppMultiUserChatStrophe.h
@@ -25,29 +25,26 @@ enum class ERoomStatusStrophe : uint8
 	ExitPending
 };
 
-namespace Lex
+inline const TCHAR* LexToString(ERoomStatusStrophe Value)
 {
-	inline const TCHAR* ToString(ERoomStatusStrophe Value)
+	switch (Value)
 	{
-		switch (Value)
-		{
-		case ERoomStatusStrophe::NotJoined:
-			return TEXT("NotJoined");
-		case ERoomStatusStrophe::Joined:
-			return TEXT("Joined");
-		case ERoomStatusStrophe::CreatePending:
-			return TEXT("CreatePending");
-		case ERoomStatusStrophe::JoinPrivatePending:
-			return TEXT("JoinPrivatePending");
-		case ERoomStatusStrophe::JoinPublicPending:
-			return TEXT("JoinPublicPending");
-		case ERoomStatusStrophe::ExitPending:
-			return TEXT("ExitPending");
-		}
-
-		checkf(false, TEXT("Unhandled ERoomStatusStrophe %d"), static_cast<int32>(Value));
-		return TEXT("Unknown");
+	case ERoomStatusStrophe::NotJoined:
+		return TEXT("NotJoined");
+	case ERoomStatusStrophe::Joined:
+		return TEXT("Joined");
+	case ERoomStatusStrophe::CreatePending:
+		return TEXT("CreatePending");
+	case ERoomStatusStrophe::JoinPrivatePending:
+		return TEXT("JoinPrivatePending");
+	case ERoomStatusStrophe::JoinPublicPending:
+		return TEXT("JoinPublicPending");
+	case ERoomStatusStrophe::ExitPending:
+		return TEXT("ExitPending");
 	}
+
+	checkf(false, TEXT("Unhandled ERoomStatusStrophe %d"), static_cast<int32>(Value));
+	return TEXT("Unknown");
 }
 
 /**
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppPresenceStrophe.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppPresenceStrophe.cpp
index 77384f637039..e5cc8f5f5149 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppPresenceStrophe.cpp
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppPresenceStrophe.cpp
@@ -89,7 +89,7 @@ bool FXmppPresenceStrophe::ReceiveStanza(const FStropheStanza& IncomingStanza)
 		TOptional<const FStropheStanza> TimestampStanza = IncomingStanza.GetChild(Strophe::SN_DELAY);
 		if (TimestampStanza.IsSet())
 		{
-			FDateTime::ParseIso8601(*TimestampStanza->GetText(), Presence.SentTime);
+			FDateTime::ParseIso8601(*TimestampStanza->GetAttribute(Strophe::SA_STAMP), Presence.SentTime);
 		}
 
 		FString UnusedPlatformUserId;
@@ -112,22 +112,25 @@ bool FXmppPresenceStrophe::UpdatePresence(const FXmppUserPresence& NewPresence)
 			{
 			case EXmppPresenceStatus::Away:
 				AvailabilityStanza.SetText(TEXT("away"));
+				PresenceStanza.AddChild(AvailabilityStanza);
 				break;
 			case EXmppPresenceStatus::Chat:
 				AvailabilityStanza.SetText(TEXT("chat"));
+				PresenceStanza.AddChild(AvailabilityStanza);
 				break;
 			case EXmppPresenceStatus::DoNotDisturb:
 				AvailabilityStanza.SetText(TEXT("dnd"));
+				PresenceStanza.AddChild(AvailabilityStanza);
 				break;
 			case EXmppPresenceStatus::ExtendedAway:
 				AvailabilityStanza.SetText(TEXT("xa"));
+				PresenceStanza.AddChild(AvailabilityStanza);
 				break;
 			}
-
-			PresenceStanza.AddChild(AvailabilityStanza);
 		}
 
 		// Update Status String
+		if (!NewPresence.StatusStr.IsEmpty())
 		{
 			FStropheStanza StatusStanza(ConnectionManager, Strophe::SN_STATUS);
 			StatusStanza.SetText(NewPresence.StatusStr);
diff --git a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppStropheThread.cpp b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppStropheThread.cpp
index b41de608fb88..c76a4910170a 100644
--- a/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppStropheThread.cpp
+++ b/Engine/Source/Runtime/Online/XMPP/Private/XmppStrophe/XmppStropheThread.cpp
@@ -9,6 +9,7 @@
 
 #include "HAL/RunnableThread.h"
 #include "Misc/Guid.h"
+#include "Misc/ConfigCacheIni.h"
 
 #if WITH_XMPP_STROPHE
 
@@ -25,7 +26,8 @@ FXmppStropheThread::FXmppStropheThread(FXmppConnectionStrophe& InConnectionManag
 	bConnectRequest = true;
 
 	static int32 ThreadInstanceIdx = 0;
-	constexpr const int32 StackSize = 64 * 1024;
+	int32 StackSize = 128 * 1024;
+	GConfig->GetInt(TEXT("XMPP"), TEXT("ThreadStackSize"), StackSize, GEngineIni);
 	ThreadPtr.Reset(FRunnableThread::Create(this, *FString::Printf(TEXT("XmppConnectionThread_%d"), ThreadInstanceIdx++), StackSize, TPri_Normal));
 }
 
diff --git a/Engine/Source/Runtime/Online/XMPP/XMPP.Build.cs b/Engine/Source/Runtime/Online/XMPP/XMPP.Build.cs
index da545e26632c..9fb3aa42ac15 100644
--- a/Engine/Source/Runtime/Online/XMPP/XMPP.Build.cs
+++ b/Engine/Source/Runtime/Online/XMPP/XMPP.Build.cs
@@ -8,7 +8,7 @@ public class XMPP : ModuleRules
 	{
 		PublicDefinitions.Add("XMPP_PACKAGE=1");
 
-        PrivateIncludePaths.AddRange(
+		PrivateIncludePaths.AddRange(
 			new string[] 
 			{
 				"Runtime/Online/XMPP/Private"
@@ -22,30 +22,49 @@ public class XMPP : ModuleRules
 				"Json"
 			}
 		);
+		
+		bool TargetPlatformSupportsJingle = false;
+		bool TargetPlatformSupportsStrophe = false;
+		
+		if (Target.IsInPlatformGroup(UnrealPlatformGroup.Unix))
+		{
+			TargetPlatformSupportsJingle = true;
+		}
+		else if (Target.Platform == UnrealTargetPlatform.Win32 ||
+			Target.Platform == UnrealTargetPlatform.Win64 ||
+			Target.Platform == UnrealTargetPlatform.PS4 ||
+			Target.Platform == UnrealTargetPlatform.Mac)
+		{
+			TargetPlatformSupportsJingle = true;
+			TargetPlatformSupportsStrophe = true;
+		}
+		else if (Target.Platform == UnrealTargetPlatform.XboxOne ||
+			Target.Platform == UnrealTargetPlatform.Android ||
+			Target.Platform == UnrealTargetPlatform.IOS ||
+			Target.Platform == UnrealTargetPlatform.Switch)
+		{
+			TargetPlatformSupportsStrophe = true;
+		}
 
-		if (Target.Platform == UnrealTargetPlatform.Win64 ||
-			Target.Platform == UnrealTargetPlatform.Win32 ||
-			Target.IsInPlatformGroup(UnrealPlatformGroup.Unix) ||
-			Target.Platform == UnrealTargetPlatform.Mac ||
-			Target.Platform == UnrealTargetPlatform.PS4 )
+		if (TargetPlatformSupportsJingle)
 		{
 			AddEngineThirdPartyPrivateStaticDependencies(Target, "WebRTC");
-			PublicDefinitions.Add("WITH_XMPP_JINGLE=1");
+			PrivateDefinitions.Add("WITH_XMPP_JINGLE=1");
 		}
 		else
 		{
-			PublicDefinitions.Add("WITH_XMPP_JINGLE=0");
+			PrivateDefinitions.Add("WITH_XMPP_JINGLE=0");
 		}
 		
-		if (Target.Platform == UnrealTargetPlatform.XboxOne ||
-			Target.Platform == UnrealTargetPlatform.Android ||
-			Target.Platform == UnrealTargetPlatform.IOS )
+		if (TargetPlatformSupportsStrophe)
 		{
 			AddEngineThirdPartyPrivateStaticDependencies(Target, "libstrophe");
+			PrivateDependencyModuleNames.Add("WebSockets");
+			PrivateDefinitions.Add("WITH_XMPP_STROPHE=1");
 		}
 		else
 		{
-			PublicDefinitions.Add("WITH_XMPP_STROPHE=0");
+			PrivateDefinitions.Add("WITH_XMPP_STROPHE=0");
 		}
 
 		if (Target.Platform == UnrealTargetPlatform.Win64 ||
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidEGL.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidEGL.cpp
index ac7440a8c9d8..62d65e356969 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidEGL.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidEGL.cpp
@@ -163,7 +163,9 @@ struct AndroidESPImpl
 	EOpenGLCurrentContext CurrentContextType;
 	GLuint OnScreenColorRenderBuffer;
 	GLuint ResolveFrameBuffer;
-	int32 SyncInterval;
+	int32 DesiredSyncInterval;
+	int32 DriverSyncInterval;
+	double LastTimeEmulatedSync;
 	AndroidESPImpl();
 };
 
@@ -574,7 +576,9 @@ eglDisplay(EGL_NO_DISPLAY)
 	,ResolveFrameBuffer(0)
 	,NativeVisualID(0)
 	,CurrentContextType(CONTEXT_Invalid)
-	,SyncInterval(-1)
+	,DesiredSyncInterval(-1)
+	,DriverSyncInterval(1)
+	,LastTimeEmulatedSync(-1.0)
 {
 }
 
@@ -750,48 +754,175 @@ int32 AndroidEGL::GetError()
 	return eglGetError();
 }
 
+// this is a prototype currently unused, left here for possible future use
+#if !defined(WITH_Android_Choreographer)
+#define WITH_Android_Choreographer (0)
+#endif
+
+#if WITH_Android_Choreographer
+
+extern void StartChoreographer(TFunction<void(int64)> Callback);
+
+
+struct AChoreographer;
+struct FChoreographerFramePacer
+{
+	bool bSetup = false;
+	FCriticalSection ChoreographerSetupLock;
+
+	int64 LastFrameCounter = -1000; // this will force it to always fire on the very first frame....we don't know what the frame counter will be then.
+	int64 TriggerFrameCounter = MAX_int64;
+
+	FEvent* ChoreographerEvent = nullptr;
+
+	void SetupChoreographer()
+	{
+		if (!bSetup)
+		{
+			bSetup = true;
+			ChoreographerEvent = FPlatformProcess::GetSynchEventFromPool(false);
+			StartChoreographer([this](int64 FrameCounter) {DoCallback(FrameCounter); });
+		}
+	}
+
+	void DoCallback(int64 FrameCounter)
+	{
+		FScopeLock Lock(&ChoreographerSetupLock);
+		LastFrameCounter = FrameCounter;
+		if (FrameCounter >= TriggerFrameCounter)
+		{
+			TriggerFrameCounter = MAX_int64;
+			ChoreographerEvent->Trigger();
+		}
+	}
+	void StartSync(int32 SyncInterval)
+	{
+		FScopeLock Lock(&ChoreographerSetupLock);
+		SetupChoreographer();
+		TriggerFrameCounter = LastFrameCounter + SyncInterval;
+		ChoreographerEvent->Reset();
+	}
+	void WaitSync()
+	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_StallForChoreographerSyncInterval);
+		check(ChoreographerEvent);
+		if (!ChoreographerEvent->Wait(FTimespan::FromMilliseconds(75.0)))
+		{
+			UE_LOG(LogRHI, Error, TEXT("Timed out waiting for ChoreographerEvent."));
+			FScopeLock Lock(&ChoreographerSetupLock);
+			TriggerFrameCounter = MAX_int64;
+			ChoreographerEvent->Reset();
+		}
+	}
+};
+FChoreographerFramePacer TheChoreographerFramePacer;
+
+static TAutoConsoleVariable<int32> CVarUseChoreographer(
+	TEXT("a.UseChoreographer"),
+	1,
+	TEXT("True to use Choreographer to do frame pacing on android."));
+
+static bool ShouldUseChoreographer()
+{
+	// should check the ndk version, etc
+	return CVarUseChoreographer.GetValueOnAnyThread() > 0;
+}
+
+#endif
+
 bool AndroidEGL::SwapBuffers(int32 SyncInterval)
 {
 	VERIFY_EGL_SCOPE();
-	if (PImplData->SyncInterval != SyncInterval)
+
+// this is a prototype currently unused, left here for possible future use
+#if WITH_Android_Choreographer
+
+	static bool bUseChoreographer = false;
+
+	if (bUseChoreographer)
 	{
+		TheChoreographerFramePacer.WaitSync();
+		bUseChoreographer = false;
+	}
+#endif
+
+	if (PImplData->DesiredSyncInterval != SyncInterval)
+	{
+		PImplData->DesiredSyncInterval = SyncInterval;
 		// make sure requested interval is in supported range
 		EGLint MinSwapInterval, MaxSwapInterval;
 		eglGetConfigAttrib(PImplData->eglDisplay, PImplData->eglConfigParam, EGL_MIN_SWAP_INTERVAL, &MinSwapInterval);
 		eglGetConfigAttrib(PImplData->eglDisplay, PImplData->eglConfigParam, EGL_MAX_SWAP_INTERVAL, &MaxSwapInterval);
-		PImplData->SyncInterval = FMath::Clamp<int32>(SyncInterval, MinSwapInterval, MaxSwapInterval);
-		//FPlatformMisc::LowLevelOutputDebugStringf(TEXT("AndroidEGL:SwapBuffers Min=%d, Max=%d, Request=%d, Set=%d"), MinSwapInterval, MaxSwapInterval, SyncInterval, PImplData->SyncInterval);
 
-		// disabled for now since setting it to 0 doesn't do anything with compositor limiting us to 60 fps and have seen issues with some drivers
-		//eglSwapInterval(PImplData->eglDisplay, PImplData->SyncInterval);
+		int32 DesiredDriverSyncInterval = FMath::Clamp<int32>(SyncInterval, MinSwapInterval, MaxSwapInterval);
+		
+		UE_LOG(LogRHI, Log, TEXT("AndroidEGL:SwapBuffers Min=%d, Max=%d, Request=%d, SetDriver=%d"), MinSwapInterval, MaxSwapInterval, PImplData->DesiredSyncInterval, DesiredDriverSyncInterval);
+
+		if (DesiredDriverSyncInterval != PImplData->DriverSyncInterval)
+		{
+			PImplData->DriverSyncInterval = DesiredDriverSyncInterval;
+			UE_LOG(LogRHI, Log, TEXT("Called eglSwapInterval %d"), DesiredDriverSyncInterval);
+			eglSwapInterval(PImplData->eglDisplay, PImplData->DriverSyncInterval);
+		}
 	}
 
-	if ( PImplData->eglSurface == NULL || !eglSwapBuffers(PImplData->eglDisplay, PImplData->eglSurface))
 	{
-		// shutdown if swapbuffering goes down
-		if( PImplData->SwapBufferFailureCount > 10 )
-		{
-			//Process.killProcess(Process.myPid());		//@todo android
-		}
-		PImplData->SwapBufferFailureCount++;
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_eglSwapBuffers);
 
-		// basic reporting
-		if( PImplData->eglSurface == NULL )
+		if (PImplData->eglSurface == NULL || !eglSwapBuffers(PImplData->eglDisplay, PImplData->eglSurface))
 		{
+			// shutdown if swapbuffering goes down
+			if (PImplData->SwapBufferFailureCount > 10)
+			{
+				//Process.killProcess(Process.myPid());		//@todo android
+			}
+			PImplData->SwapBufferFailureCount++;
+
+			// basic reporting
+			if (PImplData->eglSurface == NULL)
+			{
+				return false;
+			}
+			else
+			{
+				if (eglGetError() == EGL_CONTEXT_LOST)
+				{
+					//Logger.LogOut("swapBuffers: EGL11.EGL_CONTEXT_LOST err: " + eglGetError());					
+					//Process.killProcess(Process.myPid());		//@todo android
+				}
+			}
+
 			return false;
 		}
-		else
+	}
+
+	if (PImplData->DesiredSyncInterval > PImplData->DriverSyncInterval)
+	{
+// this is a prototype currently unused, left here for possible future use
+#if WITH_Android_Choreographer		
+		if (ShouldUseChoreographer())
 		{
-			if( eglGetError() == EGL_CONTEXT_LOST )
-			{				
-				//Logger.LogOut("swapBuffers: EGL11.EGL_CONTEXT_LOST err: " + eglGetError());					
-				//Process.killProcess(Process.myPid());		//@todo android
+			TheChoreographerFramePacer.StartSync(PImplData->DesiredSyncInterval);
+			bUseChoreographer = true;
+		}
+		else 
+#endif
+		if (PImplData->LastTimeEmulatedSync > 0.0)
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_StallForEmulatedSyncInterval);
+			float MinTimeBetweenFrames = (float(PImplData->DesiredSyncInterval) / 60.0f);
+
+			float ThisTime = FPlatformTime::Seconds() - PImplData->LastTimeEmulatedSync;
+			if (ThisTime > 0 && ThisTime < MinTimeBetweenFrames)
+			{
+				FPlatformProcess::Sleep(MinTimeBetweenFrames - ThisTime);
 			}
 		}
 
-		return false;
 	}
 
+
+	PImplData->LastTimeEmulatedSync = FPlatformTime::Seconds();
 	return true;
 }
 
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidESDeferredOpenGL.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidESDeferredOpenGL.cpp
index 15d98af615dd..fd5c20870b31 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidESDeferredOpenGL.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidESDeferredOpenGL.cpp
@@ -49,6 +49,15 @@ void FAndroidESDeferredOpenGL::ProcessExtensions(const FString& ExtensionsString
 
 	bSupportsBindlessTexture = ExtensionsString.Contains(TEXT("GL_NV_bindless_texture"));
 
+	// Disable ASTC if requested by device profile
+	static const auto CVarDisableASTC = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Android.DisableASTCSupport"));
+	if (bSupportsASTC && CVarDisableASTC->GetValueOnAnyThread())
+	{
+		bSupportsASTC = false;
+		FAndroidGPUInfo::Get().RemoveTargetPlatform(TEXT("Android_ASTC"));
+		UE_LOG(LogRHI, Log, TEXT("ASTC was disabled via r.OpenGL.DisableASTCSupport"));
+	}
+
 	// Nexus 9 running Android < 6.0 runs slow with NvTimerQuery so disable it
 	if (FAndroidMisc::GetDeviceModel() == FString(TEXT("Nexus 9")))
 	{
@@ -631,11 +640,6 @@ bool FAndroidMisc::SupportsES30()
 	return FAndroidGPUInfo::Get().bES30Support;
 }
 
-bool FAndroidMisc::SupportsShaderIOBlocks()
-{
-	return FAndroidGPUInfo::Get().bSupportsShaderIOBlocks;
-}
-
 void FAndroidMisc::GetValidTargetPlatforms(TArray<FString>& TargetPlatformNames)
 {
 	TargetPlatformNames = FAndroidGPUInfo::Get().TargetPlatformNames;
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.cpp
index cd50b2341d7d..eccb389d682c 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.cpp
@@ -169,6 +169,13 @@ void* PlatformGetWindow(FPlatformOpenGLContext* Context, void** AddParam)
 	return (void*)&Context->eglContext;
 }
 
+
+static TAutoConsoleVariable<int32> CVarDisableOpenGLGPUSync(
+	TEXT("r.Android.DisableOpenGLGPUSync"),
+	1,
+	TEXT("When true, android OpenGL will not prevent the GPU from running more than one frame behind. This will allow higher performance on some devices but increase input latency."),
+	ECVF_RenderThreadSafe);
+
 bool PlatformBlitToViewport( FPlatformOpenGLDevice* Device, const FOpenGLViewport& Viewport, uint32 BackbufferSizeX, uint32 BackbufferSizeY, bool bPresent,bool bLockToVsync, int32 SyncInterval )
 {
 	if (bPresent && Viewport.GetCustomPresent())
@@ -179,7 +186,7 @@ bool PlatformBlitToViewport( FPlatformOpenGLDevice* Device, const FOpenGLViewpor
 	{
 		AndroidEGL::GetInstance()->SwapBuffers(bLockToVsync ? SyncInterval : 0);
 	}
-	return bPresent;
+	return bPresent && !CVarDisableOpenGLGPUSync.GetValueOnAnyThread();
 }
 
 void PlatformRenderingContextSetup(FPlatformOpenGLDevice* Device)
@@ -239,9 +246,7 @@ bool PlatformInitOpenGL()
 		GConfig->GetBool(TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings"), TEXT("bBuildForES31"), bBuildForES31, GEngineIni);
 
 		const bool bSupportsFloatingPointRTs = FAndroidMisc::SupportsFloatingPointRenderTargets();
-		const bool bSupportsShaderIOBlocks = FAndroidMisc::SupportsShaderIOBlocks();
-
-		const bool bES20Fallback = !bSupportsFloatingPointRTs || !bSupportsShaderIOBlocks || !!CVarDisableES31->GetValueOnAnyThread();
+		const bool bES20Fallback = !bSupportsFloatingPointRTs || !!CVarDisableES31->GetValueOnAnyThread();
 
 		if (bBuildForES31 && bES31Supported && !bES20Fallback)
 		{
@@ -272,9 +277,6 @@ bool PlatformInitOpenGL()
 				Message.Append(TEXT("	Floating point render target support: "));
 				Message.Append(bSupportsFloatingPointRTs ? TEXT("Yes\n") : TEXT("NO\n"));
 
-				Message.Append(TEXT("	EXT_shader_io_blocks support: "));
-				Message.Append(bSupportsShaderIOBlocks ? TEXT("Yes\n") : TEXT("NO\n"));
-
 				UE_LOG(LogRHI, Log, TEXT("%s"), *Message);
 			}
 
@@ -357,7 +359,6 @@ FPlatformOpenGLContext* PlatformCreateOpenGLContext(FPlatformOpenGLDevice* Devic
 
 void PlatformDestroyOpenGLContext(FPlatformOpenGLDevice* Device, FPlatformOpenGLContext* Context)
 {
-	delete Device; //created here, destroyed here, but held by RHI.
 }
 
 FRHITexture* PlatformCreateBuiltinBackBuffer(FOpenGLDynamicRHI* OpenGLRHI, uint32 SizeX, uint32 SizeY)
@@ -429,47 +430,71 @@ void PlatformLabelObjects()
 }
 
 //--------------------------------
+#define VIRTUALIZE_QUERIES (1)
 
+static int32 GMaxmimumOcclusionQueries = 4000;
 
-static int32 GMaxmimumOcclusionQueries = 1020;
-
+#if VIRTUALIZE_QUERIES
 // These data structures could be better, but it would be tricky. InFlightVirtualQueries.Remove(QueryId) is a drag
 TArray<GLuint> UsableRealQueries;
 TArray<int32> InFlightVirtualQueries;
 TArray<GLuint> VirtualToRealMap;
 TArray<GLuint64> VirtualResults;
 TArray<int32> FreeVirtuals;
+TArray<GLuint> QueriesBeganButNotEnded;
+#endif
 
-#define QUERY_CHECK(x) if (!(x)) { FPlatformMisc::LocalPrint(TEXT("Failed a check on line:\n")); FPlatformMisc::LocalPrint(TEXT( PREPROCESSOR_TO_STRING(__LINE__))); FPlatformMisc::LocalPrint(TEXT("\n")); *((int*)3) = 13; }
+#define QUERY_CHECK(x) check(x)
+//#define QUERY_CHECK(x) if (!(x)) { FPlatformMisc::LocalPrint(TEXT("Failed a check on line:\n")); FPlatformMisc::LocalPrint(TEXT( PREPROCESSOR_TO_STRING(__LINE__))); FPlatformMisc::LocalPrint(TEXT("\n")); *((int*)3) = 13; }
+
+#define CHECK_QUERY_ERRORS (DO_CHECK)
 
 void PlatformGetNewRenderQuery(GLuint* OutQuery, uint64* OutQueryContext)
 {
+#if CHECK_QUERY_ERRORS
+	GLenum Err = glGetError();
+	while (Err != GL_NO_ERROR)
+	{
+		Err = glGetError();
+	}
+#endif
+
+	*OutQueryContext = 0;
+	VERIFY_GL_SCOPE();
+
+#if !VIRTUALIZE_QUERIES
+	FOpenGLES2::GenQueries(1, OutQuery);
+	//glGenQueriesEXT(1, OutQuery);
+#if CHECK_QUERY_ERRORS
+	Err = glGetError();
+	if (Err != GL_NO_ERROR)
+	{
+		FPlatformMisc::LowLevelOutputDebugStringf(TEXT("GenQueries Failed, glError %d (0x%x)"), Err, Err);
+		*(char*)3 = 0;
+	}
+#endif
+#else
+
+
 	if (!UsableRealQueries.Num() && !InFlightVirtualQueries.Num())
 	{
+		GRHIMaximumReccommendedOustandingOcclusionQueries = GMaxmimumOcclusionQueries;
 		UE_LOG(LogRHI, Log, TEXT("AndroidOpenGL: Using a maximum of %d occlusion queries."), GMaxmimumOcclusionQueries);
 
-		GLenum Err = glGetError();
-		while (Err != GL_NO_ERROR)
-		{
-			Err = glGetError();
-		}
-
-		VERIFY_GL_SCOPE();
-
-		QUERY_CHECK(Err == GL_NO_ERROR);
 		UsableRealQueries.AddDefaulted(GMaxmimumOcclusionQueries);
 		glGenQueriesEXT(GMaxmimumOcclusionQueries, &UsableRealQueries[0]);
+#if CHECK_QUERY_ERRORS
 		Err = glGetError();
 		if (Err != GL_NO_ERROR)
 		{
 			FPlatformMisc::LowLevelOutputDebugStringf(TEXT("GenQueries Failed, glError %d (0x%x)"), Err, Err);
 			*(char*)3 = 0;
 		}
+#endif
 		VirtualToRealMap.Add(0); // this is null, it is not a real query and never will be
 		VirtualResults.Add(0); // this is null, it is not a real query and never will be
 	}
 
-	*OutQueryContext = 0;
 	if (FreeVirtuals.Num())
 	{
 		*OutQuery = FreeVirtuals.Pop();
@@ -478,10 +503,14 @@ void PlatformGetNewRenderQuery(GLuint* OutQuery, uint64* OutQueryContext)
 	*OutQuery = VirtualToRealMap.Num();
 	VirtualToRealMap.Add(0);
 	VirtualResults.Add(0);
+#endif
 }
 
 void PlatformReleaseRenderQuery(GLuint Query, uint64 QueryContext)
 {
+#if !VIRTUALIZE_QUERIES
+	glDeleteQueriesEXT(1, &Query);
+#else
 	GLuint RealIndex = VirtualToRealMap[Query];
 	if (RealIndex)
 	{
@@ -491,6 +520,7 @@ void PlatformReleaseRenderQuery(GLuint Query, uint64 QueryContext)
 		QUERY_CHECK(!VirtualToRealMap[Query]);
 	}
 	FreeVirtuals.Add(Query);
+#endif
 }
 
 void FAndroidOpenGL::GetQueryObject(GLuint QueryId, EQueryMode QueryMode, GLuint *OutResult)
@@ -500,10 +530,37 @@ void FAndroidOpenGL::GetQueryObject(GLuint QueryId, EQueryMode QueryMode, GLuint
 	*OutResult = GLuint(Result);
 }
 
+static void GetQueryObjectui64(GLuint QueryId, GLenum QueryName, GLuint64* OutResult)
+{
+	if (glGetQueryObjectui64vEXT)
+	{
+		glGetQueryObjectui64vEXT(QueryId, QueryName, OutResult);
+	}
+	else
+	{
+		GLuint TempResult = 0;
+		glGetQueryObjectuivEXT(QueryId, QueryName, &TempResult);
+		*OutResult = TempResult;
+	}
+}
 
 void FAndroidOpenGL::GetQueryObject(GLuint QueryId, EQueryMode QueryMode, GLuint64* OutResult)
 {
 	GLenum QueryName = (QueryMode == QM_Result) ? GL_QUERY_RESULT_EXT : GL_QUERY_RESULT_AVAILABLE_EXT;
+	VERIFY_GL_SCOPE();
+	uint32 IdleStart = (QueryName == GL_QUERY_RESULT_EXT) ? FPlatformTime::Cycles() : 0;
+
+#if !VIRTUALIZE_QUERIES
+#if CHECK_QUERY_ERRORS
+	GLenum Err = glGetError();
+	while (Err != GL_NO_ERROR)
+	{
+		Err = glGetError();
+	}
+#endif
+
+	GetQueryObjectui64(QueryId, QueryName, OutResult);
+#else
 	GLuint RealIndex = VirtualToRealMap[QueryId];
 	if (!RealIndex)
 	{
@@ -518,7 +575,6 @@ void FAndroidOpenGL::GetQueryObject(GLuint QueryId, EQueryMode QueryMode, GLuint
 		return;
 	}
 
-
 	if (QueryName == GL_QUERY_RESULT_EXT)
 	{
 		{
@@ -530,29 +586,46 @@ void FAndroidOpenGL::GetQueryObject(GLuint QueryId, EQueryMode QueryMode, GLuint
 		VirtualToRealMap[QueryId] = 0;
 	}
 
+#if CHECK_QUERY_ERRORS
 	GLenum Err = glGetError();
 	while (Err != GL_NO_ERROR)
 	{
 		Err = glGetError();
 	}
+#endif
 
-	VERIFY_GL_SCOPE();
-
-	glGetQueryObjectui64vEXT(RealIndex, QueryName, OutResult);
-
-	Err = glGetError();
-	QUERY_CHECK(Err == GL_NO_ERROR);
+	GetQueryObjectui64(RealIndex, QueryName, OutResult);
 
 	if (QueryName == GL_QUERY_RESULT_EXT)
 	{
 		VirtualResults[QueryId] = *OutResult;
 	}
+#endif
+	if (QueryName == GL_QUERY_RESULT_EXT)
+	{
+		uint32 ThisCycles = FPlatformTime::Cycles() - IdleStart;
+		if (IsInRHIThread())
+		{
+			GWorkingRHIThreadStallTime += ThisCycles;
+		}
+		else
+		{
+			GRenderThreadIdle[ERenderThreadIdleTypes::WaitingForGPUQuery] += ThisCycles;
+			GRenderThreadNumIdle[ERenderThreadIdleTypes::WaitingForGPUQuery]++;
+		}
+	}
+
+#if CHECK_QUERY_ERRORS
+	Err = glGetError();
+	QUERY_CHECK(Err == GL_NO_ERROR);
+#endif
 }
 
-void FAndroidOpenGL::BeginQuery(GLenum QueryType, GLuint Query)
+GLuint FAndroidOpenGL::MakeVirtualQueryReal(GLuint Query)
 {
-	QUERY_CHECK(QueryType == UGL_ANY_SAMPLES_PASSED || SupportsDisjointTimeQueries());
-
+#if !VIRTUALIZE_QUERIES
+	return Query;
+#else
 	GLuint RealIndex = VirtualToRealMap[Query];
 	if (RealIndex)
 	{
@@ -564,7 +637,8 @@ void FAndroidOpenGL::BeginQuery(GLenum QueryType, GLuint Query)
 	}
 	if (!UsableRealQueries.Num())
 	{
-		QUERY_CHECK(InFlightVirtualQueries.Num() == GMaxmimumOcclusionQueries);
+		QUERY_CHECK(InFlightVirtualQueries.Num() + QueriesBeganButNotEnded.Num() == GMaxmimumOcclusionQueries);
+		QUERY_CHECK(InFlightVirtualQueries.Num()); // if this fires, then it means the nesting of begins is too deep.
 		GLuint OutResult;
 		QUICK_SCOPE_CYCLE_COUNTER(STAT_FAndroidOpenGL_BeginQuery_FreeWait);
 		FAndroidOpenGL::GetQueryObject(InFlightVirtualQueries[0], QM_Result, &OutResult);
@@ -573,37 +647,99 @@ void FAndroidOpenGL::BeginQuery(GLenum QueryType, GLuint Query)
 	RealIndex = UsableRealQueries.Pop();
 	VirtualToRealMap[Query] = RealIndex;
 	VirtualResults[Query] = 0;
-	InFlightVirtualQueries.Add(Query);
 
+	return RealIndex;
+#endif
+}
+
+
+void FAndroidOpenGL::QueryTimestampCounter(GLuint Query)
+{
+	QUERY_CHECK(SupportsDisjointTimeQueries());
+	VERIFY_GL_SCOPE();
+#if CHECK_QUERY_ERRORS
 	GLenum Err = glGetError();
 	while (Err != GL_NO_ERROR)
 	{
 		Err = glGetError();
 	}
+#endif
+#if !VIRTUALIZE_QUERIES
+	glQueryCounterEXT(Query, GL_TIMESTAMP_EXT);
+#else
+
+	GLuint RealIndex = MakeVirtualQueryReal(Query);
+
+	InFlightVirtualQueries.Add(Query);
+
+	glQueryCounterEXT(RealIndex, GL_TIMESTAMP_EXT);
+#endif
+#if CHECK_QUERY_ERRORS
+
+	Err = glGetError();
+
+	QUERY_CHECK(Err == GL_NO_ERROR);
+#endif
+
+}
+
+
+void FAndroidOpenGL::BeginQuery(GLenum QueryType, GLuint Query)
+{
+	QUERY_CHECK(QueryType == UGL_ANY_SAMPLES_PASSED || SupportsDisjointTimeQueries());
+#if CHECK_QUERY_ERRORS
+	GLenum Err = glGetError();
+	while (Err != GL_NO_ERROR)
+	{
+		Err = glGetError();
+	}
+#endif
 
 	VERIFY_GL_SCOPE();
 
+#if !VIRTUALIZE_QUERIES
+	glBeginQueryEXT(QueryType, Query);
+#else
+	GLuint RealIndex = MakeVirtualQueryReal(Query);
+	QueriesBeganButNotEnded.Add(Query);
 	glBeginQueryEXT(QueryType, RealIndex);
-
+#endif
+#if CHECK_QUERY_ERRORS
 	Err = glGetError();
+
 	QUERY_CHECK(Err == GL_NO_ERROR);
+#endif
 }
 
 void FAndroidOpenGL::EndQuery(GLenum QueryType)
 {
 	QUERY_CHECK(QueryType == UGL_ANY_SAMPLES_PASSED || SupportsDisjointTimeQueries());
+
+#if CHECK_QUERY_ERRORS
 	GLenum Err = glGetError();
 	while (Err != GL_NO_ERROR)
 	{
 		Err = glGetError();
 	}
+#endif
 
 	VERIFY_GL_SCOPE();
 
+	if (QueryType == UGL_ANY_SAMPLES_PASSED)
+	{
+		//return;
+	}
+
+#if VIRTUALIZE_QUERIES
+	InFlightVirtualQueries.Add(QueriesBeganButNotEnded.Pop());
+#endif
 	glEndQueryEXT(QueryType);
 
+#if CHECK_QUERY_ERRORS
 	Err = glGetError();
+
 	QUERY_CHECK(Err == GL_NO_ERROR);
+#endif
 }
 
 
@@ -639,6 +775,15 @@ void FAndroidOpenGL::ProcessExtensions(const FString& ExtensionsString)
 		bSupportsOcclusionQueries = true;
 	}
 
+	// Disable ASTC if requested by device profile
+	static const auto CVarDisableASTC = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Android.DisableASTCSupport"));
+	if (bSupportsASTC && CVarDisableASTC->GetValueOnAnyThread())
+	{
+		bSupportsASTC = false;
+		FAndroidGPUInfo::Get().RemoveTargetPlatform(TEXT("Android_ASTC"));
+		UE_LOG(LogRHI, Log, TEXT("ASTC was disabled via r.OpenGL.DisableASTCSupport"));
+	}
+
 	// Get procedures
 	if (bSupportsOcclusionQueries || bSupportsDisjointTimeQueries)
 	{
@@ -1106,11 +1251,6 @@ bool FAndroidMisc::SupportsES30()
 	return FAndroidGPUInfo::Get().bES30Support;
 }
 
-bool FAndroidMisc::SupportsShaderIOBlocks()
-{
-	return FAndroidGPUInfo::Get().bSupportsShaderIOBlocks;
-}
-
 void FAndroidMisc::GetValidTargetPlatforms(TArray<FString>& TargetPlatformNames)
 {
 	TargetPlatformNames = FAndroidGPUInfo::Get().TargetPlatformNames;
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.h b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.h
index 18a8f0eb8971..e94b8731fccf 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGL.h
@@ -195,10 +195,9 @@ struct FAndroidOpenGL : public FOpenGLES2
 	static FORCEINLINE bool HasHardwareHiddenSurfaceRemoval() { return bHasHardwareHiddenSurfaceRemoval; };
 
 	// Optional:
-	static FORCEINLINE void QueryTimestampCounter(GLuint QueryID)
-	{
-		glQueryCounterEXT(QueryID, GL_TIMESTAMP_EXT);
-	}
+	static void QueryTimestampCounter(GLuint QueryID);
+
+	static GLuint MakeVirtualQueryReal(GLuint QueryID);
 
 	static FORCEINLINE void GenQueries(GLsizei NumQueries, GLuint* QueryIDs)
 	{
@@ -248,6 +247,7 @@ struct FAndroidOpenGL : public FOpenGLES2
 	{
 		if (GUseThreadedRendering)
 		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_eglClientWaitSyncKHR_p);
 			// check( Flags == GL_SYNC_FLUSH_COMMANDS_BIT );
 			GLenum Result = eglClientWaitSyncKHR_p( AndroidEGL::GetInstance()->GetDisplay(), Sync, EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, Timeout );
 			switch (Result)
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGLPrivate.h b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGLPrivate.h
index 7abdb198ac25..7983648f5c9e 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGLPrivate.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Android/AndroidOpenGLPrivate.h
@@ -25,10 +25,14 @@ public:
 	FString GLVersion;
 	bool bSupportsFloatingPointRenderTargets;
 	bool bSupportsFrameBufferFetch;
-	bool bSupportsShaderIOBlocks;
 	bool bES30Support;
 	TArray<FString> TargetPlatformNames;
 
+	void RemoveTargetPlatform(FString PlatformName)
+	{
+		TargetPlatformNames.Remove(PlatformName);
+	}
+
 private:
 	FAndroidGPUInfo()
 	{
@@ -90,10 +94,6 @@ private:
 		{
 			TargetPlatformNames.Add(TEXT("Android_ETC2"));
 		}
-		if (ExtensionsString.Contains(TEXT("GL_KHR_texture_compression_astc_ldr")))
-		{
-			TargetPlatformNames.Add(TEXT("Android_ASTC"));
-		}
 
 		// all devices support ETC
 		TargetPlatformNames.Add(TEXT("Android_ETC1a"));
@@ -110,7 +110,6 @@ private:
 
 		bSupportsFrameBufferFetch = ExtensionsString.Contains(TEXT("GL_EXT_shader_framebuffer_fetch")) || ExtensionsString.Contains(TEXT("GL_NV_shader_framebuffer_fetch")) 
 			|| ExtensionsString.Contains(TEXT("GL_ARM_shader_framebuffer_fetch ")); // has space at the end to exclude GL_ARM_shader_framebuffer_fetch_depth_stencil match
-		bSupportsShaderIOBlocks = ExtensionsString.Contains(TEXT("GL_EXT_shader_io_blocks"));
 
 		GAndroidGPUInfoReady = true;
 	}
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLCommands.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLCommands.cpp
index 43f8296d6f6d..747fabb6c2f6 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLCommands.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLCommands.cpp
@@ -20,7 +20,7 @@
 #define DECLARE_ISBOUNDSHADER(ShaderType) inline void ValidateBoundShader(TRefCountPtr<FOpenGLBoundShaderState> InBoundShaderState, F##ShaderType##RHIParamRef ShaderType##RHI) \
 { \
 	FOpenGL##ShaderType* ShaderType = FOpenGLDynamicRHI::ResourceCast(ShaderType##RHI); \
-	ensureMsgf(InBoundShaderState && ShaderType == InBoundShaderState->ShaderType, TEXT("Parameters are being set for a %s which is not currently bound"), TEXT(#ShaderType)); \
+	ensureMsgf(InBoundShaderState && ShaderType == InBoundShaderState->Get##ShaderType(), TEXT("Parameters are being set for a %s which is not currently bound"), TEXT(#ShaderType)); \
 }
 
 DECLARE_ISBOUNDSHADER(VertexShader)
@@ -276,6 +276,7 @@ static FORCEINLINE GLint ModifyFilterByMips(GLint Filter, bool bHasMips)
 // Vertex state.
 void FOpenGLDynamicRHI::RHISetStreamSource(uint32 StreamIndex, FVertexBufferRHIParamRef VertexBufferRHI, uint32 Offset)
 {
+	VERIFY_GL_SCOPE();
 	FOpenGLVertexBuffer* VertexBuffer = ResourceCast(VertexBufferRHI);
 	PendingState.Streams[StreamIndex].VertexBuffer = VertexBuffer;
 	PendingState.Streams[StreamIndex].Stride = PendingState.BoundShaderState ? PendingState.BoundShaderState->StreamStrides[StreamIndex] : 0;
@@ -301,6 +302,7 @@ PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 void FOpenGLDynamicRHI::UpdateRasterizerStateInOpenGLContext( FOpenGLContextState& ContextState )
 {
+	VERIFY_GL_SCOPE();
 	if (FOpenGL::SupportsPolygonMode() && ContextState.RasterizerState.FillMode != PendingState.RasterizerState.FillMode)
 	{
 		FOpenGL::PolygonMode(GL_FRONT_AND_BACK, PendingState.RasterizerState.FillMode);
@@ -362,6 +364,7 @@ void FOpenGLDynamicRHI::UpdateRasterizerStateInOpenGLContext( FOpenGLContextStat
 
 void FOpenGLDynamicRHI::UpdateViewportInOpenGLContext( FOpenGLContextState& ContextState )
 {
+	VERIFY_GL_SCOPE();
 	if (ContextState.Viewport != PendingState.Viewport)
 	{
 		//@todo the viewport defined by glViewport does not clip, unlike the viewport in d3d
@@ -385,6 +388,7 @@ void FOpenGLDynamicRHI::UpdateViewportInOpenGLContext( FOpenGLContextState& Cont
 
 void FOpenGLDynamicRHI::RHISetViewport(uint32 MinX,uint32 MinY,float MinZ,uint32 MaxX,uint32 MaxY,float MaxZ)
 {
+	VERIFY_GL_SCOPE();
 	PendingState.Viewport.Min.X = MinX;
 	PendingState.Viewport.Min.Y = MinY;
 	PendingState.Viewport.Max.X = MaxX;
@@ -399,6 +403,7 @@ void FOpenGLDynamicRHI::RHISetViewport(uint32 MinX,uint32 MinY,float MinZ,uint32
 
 void FOpenGLDynamicRHI::RHISetScissorRect(bool bEnable,uint32 MinX,uint32 MinY,uint32 MaxX,uint32 MaxY)
 {
+	VERIFY_GL_SCOPE();
 	PendingState.bScissorEnabled = bEnable;
 	PendingState.Scissor.Min.X = MinX;
 	PendingState.Scissor.Min.Y = MinY;
@@ -475,6 +480,7 @@ void FOpenGLDynamicRHI::RHISetUAVParameter(FComputeShaderRHIParamRef ComputeShad
 
 void FOpenGLDynamicRHI::InternalSetShaderTexture(FOpenGLTextureBase* Texture, FOpenGLShaderResourceView* SRV, GLint TextureIndex, GLenum Target, GLuint Resource, int NumMips, int LimitMip)
 {
+	VERIFY_GL_SCOPE();
 	auto& PendingTextureState = PendingState.Textures[TextureIndex];
 	PendingTextureState.Texture = Texture;
 	PendingTextureState.SRV = SRV;
@@ -487,21 +493,15 @@ void FOpenGLDynamicRHI::InternalSetShaderTexture(FOpenGLTextureBase* Texture, FO
 
 void FOpenGLDynamicRHI::InternalSetSamplerStates(GLint TextureIndex, FOpenGLSamplerState* SamplerState)
 {
+	VERIFY_GL_SCOPE();
 	PendingState.SamplerStates[TextureIndex] = SamplerState;
 }
 
-void FOpenGLDynamicRHI::CachedSetupTextureStage(FOpenGLContextState& ContextState, GLint TextureIndex, GLenum Target, GLuint Resource, GLint LimitMip, GLint NumMips)
+void FOpenGLDynamicRHI::CachedSetupTextureStageInner(FOpenGLContextState& ContextState, GLint TextureIndex, GLenum Target, GLuint Resource, GLint LimitMip, GLint NumMips)
 {
+	DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CachedSetupTextureStage);
 	VERIFY_GL_SCOPE();
-	auto& TextureState = ContextState.Textures[TextureIndex];
-	const bool bSameTarget = (TextureState.Target == Target);
-	const bool bSameResource = (TextureState.Resource == Resource);
-
-	if( bSameTarget && bSameResource )
-	{
-		// Nothing changed, no need to update
-		return;
-	}
+	FTextureStage& TextureState = ContextState.Textures[TextureIndex];
 
 	// Something will have to be changed. Switch to the stage in question.
 	if( ContextState.ActiveTexture != TextureIndex )
@@ -510,19 +510,19 @@ void FOpenGLDynamicRHI::CachedSetupTextureStage(FOpenGLContextState& ContextStat
 		ContextState.ActiveTexture = TextureIndex;
 	}
 
-	if (bSameTarget)
+	if (TextureState.Target == Target)
 	{
 		glBindTexture(Target, Resource);
 	}
 	else
 	{
-		if(TextureState.Target != GL_NONE)
+		if (TextureState.Target != GL_NONE)
 		{
 			// Unbind different texture target on the same stage, to avoid OpenGL keeping its data, and potential driver problems.
 			glBindTexture(TextureState.Target, 0);
 		}
 
-		if(Target != GL_NONE)
+		if (Target != GL_NONE)
 		{
 			glBindTexture(Target, Resource);
 		}
@@ -533,35 +533,49 @@ void FOpenGLDynamicRHI::CachedSetupTextureStage(FOpenGLContextState& ContextStat
 	// which should be preferred.
 	if(Target != GL_NONE && Target != GL_TEXTURE_BUFFER && Target != GL_TEXTURE_EXTERNAL_OES && !FOpenGL::SupportsTextureView())
 	{
-		TPair<GLenum, GLenum>* MipLimits = TextureMipLimits.Find(Resource);
+		TPair<GLenum, GLenum>* MipLimits;
+		
+		{
+			DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CachedSetupTextureStage_Find);
+			MipLimits = TextureMipLimits.Find(Resource);
+		}
 		
 		GLint BaseMip = LimitMip == -1 ? 0 : LimitMip;
 		GLint MaxMip = LimitMip == -1 ? NumMips - 1 : LimitMip;
 		
 		const bool bSameLimitMip = MipLimits && MipLimits->Key == BaseMip;
 		const bool bSameNumMips = MipLimits && MipLimits->Value == MaxMip;
-		
-		if(FOpenGL::SupportsTextureBaseLevel() && !bSameLimitMip)
-		{
-			FOpenGL::TexParameter(Target, GL_TEXTURE_BASE_LEVEL, BaseMip);
-		}
-		TextureState.LimitMip = LimitMip;
-		
-		if (FOpenGL::SupportsTextureMaxLevel() && !bSameNumMips)
-		{
-			FOpenGL::TexParameter(Target, GL_TEXTURE_MAX_LEVEL, MaxMip);
-		}
 
-		TextureState.NumMips = NumMips;
-		
-		TextureMipLimits.Add(Resource, TPair<GLenum, GLenum>(BaseMip, MaxMip));
+		if (!bSameLimitMip || !bSameNumMips)
+		{
+			DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CachedSetupTextureStage_TexParameter);
+			if (FOpenGL::SupportsTextureBaseLevel() && !bSameLimitMip)
+			{
+				FOpenGL::TexParameter(Target, GL_TEXTURE_BASE_LEVEL, BaseMip);
+			}
+			if (FOpenGL::SupportsTextureMaxLevel() && !bSameNumMips)
+			{
+				FOpenGL::TexParameter(Target, GL_TEXTURE_MAX_LEVEL, MaxMip);
+			}
+			if (MipLimits)
+			{
+				MipLimits->Key = BaseMip;
+				MipLimits->Value = MaxMip;
+			}
+			else
+			{
+				TextureMipLimits.Add(Resource, TPair<GLenum, GLenum>(BaseMip, MaxMip));
+			}
+		}
 	}
 	else
 	{
-		TextureState.LimitMip = 0;
-		TextureState.NumMips = 0;
+		LimitMip = 0;
+		NumMips = 0;
 	}
 
+	TextureState.LimitMip = LimitMip;
+	TextureState.NumMips = NumMips;
 	TextureState.Target = Target;
 	TextureState.Resource = Resource;
 }
@@ -650,20 +664,21 @@ inline void FOpenGLDynamicRHI::ApplyTextureStage(FOpenGLContextState& ContextSta
 template <typename StateType>
 void FOpenGLDynamicRHI::SetupTexturesForDraw( FOpenGLContextState& ContextState, const StateType& ShaderState, int32 MaxTexturesNeeded )
 {
+	VERIFY_GL_SCOPE();
 	SCOPE_CYCLE_COUNTER_DETAILED(STAT_OpenGLTextureBindTime);
 	
 	// Skip texture setup when running bindless texture, it is done with program setup
-	if (OpenGLConsoleVariables::bBindlessTexture && FOpenGL::SupportsBindlessTexture())
+	if (FOpenGL::SupportsBindlessTexture() && OpenGLConsoleVariables::bBindlessTexture)
 	{
 		return;
 	}
 
-	const bool bSupportsSamplerObjects = FOpenGL::SupportsSamplerObjects();
-	const int32 MaxProgramTexture = ShaderState->MaxTextureStageUsed();
+	int32 MaxProgramTexture = 0;
+	const TBitArray<>& NeededBits = ShaderState->GetTextureNeeds(MaxProgramTexture);
 
 	for( int32 TextureStageIndex = 0; TextureStageIndex <= MaxProgramTexture; ++TextureStageIndex )
 	{
-		if (!ShaderState->NeedsTextureStage(TextureStageIndex))
+		if (!NeededBits[TextureStageIndex])
 		{
 			// Current program doesn't make use of this texture stage. No matter what UE4 wants to have on in,
 			// it won't be useful for this draw, so telling OpenGL we don't really need it to give the driver
@@ -712,7 +727,7 @@ void FOpenGLDynamicRHI::SetupTexturesForDraw( FOpenGLContextState& ContextState,
 			
 			bool bExternalTexture = (TextureStage.Target == GL_TEXTURE_EXTERNAL_OES);
 
-			if (bSupportsSamplerObjects && !bExternalTexture)
+			if (FOpenGL::SupportsSamplerObjects() && !bExternalTexture)
 			{
 				FOpenGLSamplerState* PendingSampler = PendingState.SamplerStates[TextureStageIndex];
 			
@@ -724,7 +739,7 @@ void FOpenGLDynamicRHI::SetupTexturesForDraw( FOpenGLContextState& ContextState,
 			}
 			else if (TextureStage.Target != GL_TEXTURE_BUFFER)
 			{
-				if (bSupportsSamplerObjects)
+				if (FOpenGL::SupportsSamplerObjects())
 				{
 					FOpenGL::BindSampler(TextureStageIndex, 0);
 					ContextState.SamplerStates[TextureStageIndex] = nullptr;
@@ -748,6 +763,7 @@ void FOpenGLDynamicRHI::SetupTexturesForDraw( FOpenGLContextState& ContextState
 
 void FOpenGLDynamicRHI::InternalSetShaderUAV(GLint UAVIndex, GLenum Format, GLuint Resource)
 {
+	VERIFY_GL_SCOPE();
 	PendingState.UAVs[UAVIndex].Format = Format;
 	PendingState.UAVs[UAVIndex].Resource = Resource;
 }
@@ -1159,31 +1175,39 @@ void FOpenGLDynamicRHI::RHISetShaderSampler(FPixelShaderRHIParamRef PixelShaderR
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FVertexShaderRHIParamRef VertexShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
 	VALIDATE_BOUND_SHADER(VertexShaderRHI);
+	VERIFY_GL_SCOPE();
 	PendingState.BoundUniformBuffers[SF_Vertex][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Vertex] |= 1 << BufferIndex;
+	PendingState.bAnyDirtyGraphicsUniformBuffers = true;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FHullShaderRHIParamRef HullShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
 	VALIDATE_BOUND_SHADER(HullShaderRHI);
+	VERIFY_GL_SCOPE();
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	PendingState.BoundUniformBuffers[SF_Hull][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Hull] |= 1 << BufferIndex;
+	PendingState.bAnyDirtyGraphicsUniformBuffers = true;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FDomainShaderRHIParamRef DomainShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
 	VALIDATE_BOUND_SHADER(DomainShaderRHI);
+	VERIFY_GL_SCOPE();
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	PendingState.BoundUniformBuffers[SF_Domain][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Domain] |= 1 << BufferIndex;
+	PendingState.bAnyDirtyGraphicsUniformBuffers = true;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FGeometryShaderRHIParamRef GeometryShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
 	VALIDATE_BOUND_SHADER(GeometryShaderRHI);
+	VERIFY_GL_SCOPE();
 	PendingState.BoundUniformBuffers[SF_Geometry][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Geometry] |= 1 << BufferIndex;
+	PendingState.bAnyDirtyGraphicsUniformBuffers = true;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderSampler(FComputeShaderRHIParamRef ComputeShaderRHI,uint32 SamplerIndex,FSamplerStateRHIParamRef NewStateRHI)
@@ -1203,13 +1227,16 @@ void FOpenGLDynamicRHI::RHISetShaderSampler(FComputeShaderRHIParamRef ComputeSha
 
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FPixelShaderRHIParamRef PixelShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
+	VERIFY_GL_SCOPE();
 	VALIDATE_BOUND_SHADER(PixelShaderRHI);
 	PendingState.BoundUniformBuffers[SF_Pixel][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Pixel] |= 1 << BufferIndex;
+	PendingState.bAnyDirtyGraphicsUniformBuffers = true;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderUniformBuffer(FComputeShaderRHIParamRef ComputeShaderRHI,uint32 BufferIndex,FUniformBufferRHIParamRef BufferRHI)
 {
+	VERIFY_GL_SCOPE();
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	PendingState.BoundUniformBuffers[SF_Compute][BufferIndex] = BufferRHI;
 	PendingState.DirtyUniformBuffers[SF_Compute] |= 1 << BufferIndex;
@@ -1221,6 +1248,7 @@ void FOpenGLDynamicRHI::RHISetShaderParameter(FVertexShaderRHIParamRef VertexSha
 
 	VERIFY_GL_SCOPE();
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_VERTEX].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderParameter(FPixelShaderRHIParamRef PixelShaderRHI,uint32 BufferIndex,uint32 BaseIndex,uint32 NumBytes,const void* NewValue)
@@ -1229,6 +1257,7 @@ void FOpenGLDynamicRHI::RHISetShaderParameter(FPixelShaderRHIParamRef PixelShade
 
 	VERIFY_GL_SCOPE();
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_PIXEL].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderParameter(FHullShaderRHIParamRef HullShaderRHI,uint32 BufferIndex,uint32 BaseIndex,uint32 NumBytes,const void* NewValue)
@@ -1238,6 +1267,7 @@ void FOpenGLDynamicRHI::RHISetShaderParameter(FHullShaderRHIParamRef HullShaderR
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	VERIFY_GL_SCOPE();
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_HULL].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderParameter(FDomainShaderRHIParamRef DomainShaderRHI,uint32 BufferIndex,uint32 BaseIndex,uint32 NumBytes,const void* NewValue)
@@ -1247,6 +1277,7 @@ void FOpenGLDynamicRHI::RHISetShaderParameter(FDomainShaderRHIParamRef DomainSha
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	VERIFY_GL_SCOPE();
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_DOMAIN].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderParameter(FGeometryShaderRHIParamRef GeometryShaderRHI,uint32 BufferIndex,uint32 BaseIndex,uint32 NumBytes,const void* NewValue)
@@ -1255,12 +1286,15 @@ void FOpenGLDynamicRHI::RHISetShaderParameter(FGeometryShaderRHIParamRef Geometr
 
 	VERIFY_GL_SCOPE();
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_GEOMETRY].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetShaderParameter(FComputeShaderRHIParamRef ComputeShaderRHI,uint32 BufferIndex,uint32 BaseIndex,uint32 NumBytes,const void* NewValue)
 { 
+	VERIFY_GL_SCOPE();
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_COMPUTE].Set(BufferIndex, BaseIndex, NumBytes, NewValue);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 void FOpenGLDynamicRHI::RHISetDepthStencilState(FDepthStencilStateRHIParamRef NewStateRHI,uint32 StencilRef)
@@ -1283,6 +1317,7 @@ void FOpenGLDynamicRHI::RHISetStencilRef(uint32 StencilRef)
 
 void FOpenGLDynamicRHI::UpdateDepthStencilStateInOpenGLContext( FOpenGLContextState& ContextState )
 {
+	VERIFY_GL_SCOPE();
 	if (ContextState.DepthStencilState.bZEnable != PendingState.DepthStencilState.bZEnable)
 	{
 		if (PendingState.DepthStencilState.bZEnable)
@@ -1625,6 +1660,7 @@ void FOpenGLDynamicRHI::SetPendingBlendStateForActiveRenderTargets( FOpenGLConte
 
 void FOpenGLDynamicRHI::RHISetBlendState(FBlendStateRHIParamRef NewStateRHI,const FLinearColor& BlendFactor)
 {
+	VERIFY_GL_SCOPE();
 	FOpenGLBlendState* NewState = ResourceCast(NewStateRHI);
 	FMemory::Memcpy(&PendingState.BlendState,&(NewState->Data),sizeof(FOpenGLBlendStateData));
 	
@@ -1784,24 +1820,21 @@ void FOpenGLDynamicRHI::RHISetRenderTargets(
 	}
 }
 
-void FOpenGLDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
+void FOpenGLDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMaskIn)
 {
 	if (FOpenGL::SupportsDiscardFrameBuffer())
 	{
-		{
-			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_DiscardRenderTargets_Flush);
-			FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::FlushRHIThread);
-		}
-
+		VERIFY_GL_SCOPE();
+		uint32 ColorBitMask = ColorBitMaskIn;
 		// 8 Color + Depth + Stencil = 10
 		GLenum Attachments[MaxSimultaneousRenderTargets + 2];
-		uint32 I=0;
-		if(Depth) 
+		uint32 I = 0;
+		if (Depth)
 		{
 			Attachments[I] = GL_DEPTH_ATTACHMENT;
 			I++;
 		}
-		if(Stencil) 
+		if (Stencil)
 		{
 			Attachments[I] = GL_STENCIL_ATTACHMENT;
 			I++;
@@ -1811,7 +1844,7 @@ void FOpenGLDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32
 		uint32 J = 0;
 		while (ColorBitMask)
 		{
-			if(ColorBitMask & 1)
+			if (ColorBitMask & 1)
 			{
 				Attachments[I] = GL_COLOR_ATTACHMENT0 + J;
 				I++;
@@ -1826,6 +1859,7 @@ void FOpenGLDynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32
 
 void FOpenGLDynamicRHI::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo)
 {
+	VERIFY_GL_SCOPE();
 	this->RHISetRenderTargets(RenderTargetsInfo.NumColorRenderTargets,
 		RenderTargetsInfo.ColorRenderTarget,
 		&RenderTargetsInfo.DepthStencilRenderTarget,
@@ -1864,6 +1898,7 @@ void FOpenGLDynamicRHI::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsIn
 
 void FOpenGLDynamicRHI::EnableVertexElementCached(
 	FOpenGLContextState& ContextState,
+	GLuint AttributeIndex,
 	const FOpenGLVertexElement &VertexElement,
 	GLsizei Stride,
 	void *Pointer,
@@ -1873,23 +1908,22 @@ void FOpenGLDynamicRHI::EnableVertexElementCached(
 
 	check( !(FOpenGL::SupportsVertexAttribBinding() && OpenGLConsoleVariables::bUseVAB));
 
-	GLuint AttributeIndex = VertexElement.AttributeIndex;
-	AttributeIndex = RemapVertexAttrib(AttributeIndex);
+	if (!ContextState.GetVertexAttrEnabled(AttributeIndex))
+	{
+		ContextState.SetVertexAttrEnabled(AttributeIndex, true);
+		glEnableVertexAttribArray(AttributeIndex);
+	}
 	FOpenGLCachedAttr &Attr = ContextState.VertexAttrs[AttributeIndex];
 
-	if (!Attr.bEnabled)
-	{
-		glEnableVertexAttribArray(AttributeIndex);
-		Attr.bEnabled = true;
-	}
+	bool bAnyDifferent = //bitwise ors to get rid of the branches
+		(Attr.Pointer != Pointer) |
+		(Attr.Buffer != Buffer) |
+		(Attr.Size != VertexElement.Size) |
+		(Attr.Type != VertexElement.Type) |
+		(Attr.bNormalized != VertexElement.bNormalized) |
+		(Attr.Stride != Stride); 
 
-	if (
-		(Attr.Pointer != Pointer) ||
-		(Attr.Buffer != Buffer) ||
-		(Attr.Size != VertexElement.Size) ||
-		(Attr.Type != VertexElement.Type) ||
-		(Attr.bNormalized != VertexElement.bNormalized) ||
-		(Attr.Stride != Stride))
+	if (bAnyDifferent)
 	{
 		CachedBindArrayBuffer(ContextState, Buffer);
 		if( !VertexElement.bShouldConvertToFloat )
@@ -1929,18 +1963,11 @@ void FOpenGLDynamicRHI::EnableVertexElementCached(
 	}
 }
 
-void FOpenGLDynamicRHI::EnableVertexElementCachedZeroStride(FOpenGLContextState& ContextState, const FOpenGLVertexElement& VertexElement, uint32 NumVertices, FOpenGLVertexBuffer* ZeroStrideVertexBuffer)
+FORCEINLINE void FOpenGLDynamicRHI::EnableVertexElementCachedZeroStride(FOpenGLContextState& ContextState, GLuint AttributeIndex, const FOpenGLVertexElement& VertexElement, uint32 NumVertices, FOpenGLVertexBuffer* ZeroStrideVertexBuffer)
 {
-	VERIFY_GL_SCOPE();
-
-	GLuint AttributeIndex = VertexElement.AttributeIndex;
-	AttributeIndex = RemapVertexAttrib(AttributeIndex);
-
-	FOpenGLCachedAttr &Attr = ContextState.VertexAttrs[AttributeIndex];
 	uint32 Stride = ZeroStrideVertexBuffer->GetSize();
-
 	FOpenGLVertexBuffer* ExpandedVertexBuffer = FindExpandedZeroStrideBuffer(ZeroStrideVertexBuffer, Stride, NumVertices, VertexElement);
-	EnableVertexElementCached(ContextState, VertexElement, Stride, 0, ExpandedVertexBuffer->Resource);
+	EnableVertexElementCached(ContextState, AttributeIndex, VertexElement, Stride, 0, ExpandedVertexBuffer->Resource);
 }
 
 void FOpenGLDynamicRHI::FreeZeroStrideBuffers()
@@ -1958,22 +1985,26 @@ void FOpenGLDynamicRHI::SetupVertexArrays(FOpenGLContextState& ContextState, uin
 		return;
 	}
 	VERIFY_GL_SCOPE();
-	bool UsedAttributes[NUM_OPENGL_VERTEX_STREAMS] = { 0 };
+	
+	uint32 UsedAttributes = 0;
+	static_assert(NUM_OPENGL_VERTEX_STREAMS <= sizeof(UsedAttributes) * 8, "Not enough bits in UsedAttributes to store NUM_OPENGL_VERTEX_STREAMS");
 
 	check(IsValidRef(PendingState.BoundShaderState));
-	check(IsValidRef(PendingState.BoundShaderState->VertexShader));
+
+	const FOpenGLShaderBindings& Bindings = PendingState.BoundShaderState->GetVertexShader()->Bindings;
+
 	FOpenGLVertexDeclaration* VertexDeclaration = PendingState.BoundShaderState->VertexDeclaration;
 	for (int32 ElementIndex = 0; ElementIndex < VertexDeclaration->VertexElements.Num(); ElementIndex++)
 	{
 		FOpenGLVertexElement& VertexElement = VertexDeclaration->VertexElements[ElementIndex];
 		uint32 AttributeIndex = VertexElement.AttributeIndex;
-		const bool bAttribInUse = (PendingState.BoundShaderState->VertexShader->Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
+		const bool bAttribInUse = (Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
 		if (!bAttribInUse)
 		{
 			continue; // skip unused attributes.
 		}
 
-		AttributeIndex = RemapVertexAttrib(AttributeIndex);
+		AttributeIndex = RemapVertexAttrib(Bindings, AttributeIndex);
 
 		if ( VertexElement.StreamIndex < NumStreams)
 		{
@@ -1988,6 +2019,7 @@ void FOpenGLDynamicRHI::SetupVertexArrays(FOpenGLContextState& ContextState, uin
 				check(Stream->VertexBuffer->GetZeroStrideBuffer());
 				EnableVertexElementCachedZeroStride(
 					ContextState,
+					AttributeIndex,
 					VertexElement,
 					MaxVertices,
 					Stream->VertexBuffer
@@ -1998,25 +2030,25 @@ void FOpenGLDynamicRHI::SetupVertexArrays(FOpenGLContextState& ContextState, uin
 				check( Stride > 0 );
 				EnableVertexElementCached(
 					ContextState,
+					AttributeIndex,
 					VertexElement,
 					Stride,
 					INDEX_TO_VOID(BaseVertexIndex * Stride + Stream->Offset + VertexElement.Offset),
 					Stream->VertexBuffer->Resource
 					);
 			}
-			UsedAttributes[AttributeIndex] = true;
+
+			UsedAttributes |= (1<<AttributeIndex);
 		}
 		else
 		{
 			//workaround attributes with no streams
 			VERIFY_GL_SCOPE();
 
-			FOpenGLCachedAttr &Attr = ContextState.VertexAttrs[AttributeIndex];
-
-			if (Attr.bEnabled)
+			if (ContextState.GetVertexAttrEnabled(AttributeIndex))
 			{
+				ContextState.SetVertexAttrEnabled(AttributeIndex, false);
 				glDisableVertexAttribArray(AttributeIndex);
-				Attr.bEnabled = false;
 			}
 
 			float data[4] = { 0.0f};
@@ -2025,15 +2057,19 @@ void FOpenGLDynamicRHI::SetupVertexArrays(FOpenGLContextState& ContextState, uin
 		}
 	}
 
-	// Disable remaining vertex arrays
-	for (GLuint AttribIndex = 0; AttribIndex < NUM_OPENGL_VERTEX_STREAMS; AttribIndex++)
+	uint32 NotUsedButEnabledMask = (ContextState.VertexAttrs_EnabledBits & ~(UsedAttributes));
+
+	for (GLuint AttribIndex = 0; AttribIndex < NUM_OPENGL_VERTEX_STREAMS && NotUsedButEnabledMask; AttribIndex++)
 	{
-		if (UsedAttributes[AttribIndex] == false && ContextState.VertexAttrs[AttribIndex].bEnabled)
+		if (NotUsedButEnabledMask & 1)
 		{
 			glDisableVertexAttribArray(AttribIndex);
-			ContextState.VertexAttrs[AttribIndex].bEnabled = false;
+			ContextState.SetVertexAttrEnabled(AttribIndex, false);
 		}
+		NotUsedButEnabledMask >>= 1;
 	}
+
+	// Disable remaining vertex arrays
 }
 
 void FOpenGLDynamicRHI::SetupVertexArraysVAB(FOpenGLContextState& ContextState, uint32 BaseVertexIndex, FOpenGLStream* Streams, uint32 NumStreams, uint32 MaxVertices)
@@ -2046,12 +2082,11 @@ void FOpenGLDynamicRHI::SetupVertexArraysVAB(FOpenGLContextState& ContextState,
 	uint32 StreamMask = ContextState.ActiveStreamMask;
 
 	check(IsValidRef(PendingState.BoundShaderState));
-	check(IsValidRef(PendingState.BoundShaderState->VertexShader));
 	FOpenGLVertexDeclaration* VertexDeclaration = PendingState.BoundShaderState->VertexDeclaration;
-	uint32 AttributeMask = PendingState.BoundShaderState->VertexShader->Bindings.InOutMask;
+	uint32 AttributeMask = PendingState.BoundShaderState->GetVertexShader()->Bindings.InOutMask;
 	if (FOpenGL::NeedsVertexAttribRemapTable())
 	{
-		AttributeMask = PendingState.BoundShaderState->VertexShader->Bindings.VertexRemappedMask;
+		AttributeMask = PendingState.BoundShaderState->GetVertexShader()->Bindings.VertexRemappedMask;
 	}
 
 	if (ContextState.VertexDecl != VertexDeclaration || AttributeMask != ContextState.ActiveAttribMask)
@@ -2066,7 +2101,7 @@ void FOpenGLDynamicRHI::SetupVertexArraysVAB(FOpenGLContextState& ContextState,
 		{
 			FOpenGLVertexElement& VertexElement = VertexDeclaration->VertexElements[ElementIndex];
 			uint32 AttributeIndex = VertexElement.AttributeIndex;
-			const bool bAttribInUse = (PendingState.BoundShaderState->VertexShader->Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
+			const bool bAttribInUse = (PendingState.BoundShaderState->GetVertexShader()->Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
 			if (bAttribInUse)
 			{
 				AttributeIndex = RemapVertexAttrib(AttributeIndex);
@@ -2216,47 +2251,54 @@ void FOpenGLDynamicRHI::SetupVertexArraysVAB(FOpenGLContextState& ContextState,
 void FOpenGLDynamicRHI::SetupVertexArraysUP(FOpenGLContextState& ContextState, void* Buffer, uint32 Stride)
 {
 	VERIFY_GL_SCOPE();
-	bool UsedAttributes[NUM_OPENGL_VERTEX_STREAMS] = { 0 };
+
+	uint32 UsedAttributes = 0;
+	static_assert(NUM_OPENGL_VERTEX_STREAMS <= sizeof(UsedAttributes) * 8, "Not enough bits in UsedAttributes to store NUM_OPENGL_VERTEX_STREAMS");
 
 	check(IsValidRef(PendingState.BoundShaderState));
-	check(IsValidRef(PendingState.BoundShaderState->VertexShader));
 	FOpenGLVertexDeclaration* VertexDeclaration = PendingState.BoundShaderState->VertexDeclaration;
 
+	const FOpenGLShaderBindings& Bindings = PendingState.BoundShaderState->GetVertexShader()->Bindings;
+
 	for (int32 ElementIndex = 0; ElementIndex < VertexDeclaration->VertexElements.Num(); ElementIndex++)
 	{
 		FOpenGLVertexElement &VertexElement = VertexDeclaration->VertexElements[ElementIndex];
 		check(VertexElement.StreamIndex < 1);
 
 		uint32 AttributeIndex = VertexElement.AttributeIndex;
-		const bool bAttribInUse = (PendingState.BoundShaderState->VertexShader->Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
+		const bool bAttribInUse = (Bindings.InOutMask & (0x1 << AttributeIndex)) != 0;
 		if (bAttribInUse)
 		{
-			AttributeIndex = RemapVertexAttrib(AttributeIndex);
+			AttributeIndex = RemapVertexAttrib(Bindings, AttributeIndex);
 			check(Stride > 0);
 			EnableVertexElementCached(
 				ContextState,
+				AttributeIndex,
 				VertexElement,
 				Stride,
 				(void*)(((char*)Buffer) + VertexElement.Offset),
 				0
 				);
-			UsedAttributes[AttributeIndex] = true;
+			UsedAttributes |= (1 << AttributeIndex);
 		}
 	}
 
-	// Disable remaining vertex arrays
-	for (GLuint AttribIndex = 0; AttribIndex < NUM_OPENGL_VERTEX_STREAMS; AttribIndex++)
+	uint32 NotUsedButEnabledMask = (ContextState.VertexAttrs_EnabledBits & ~(UsedAttributes));
+
+	for (GLuint AttribIndex = 0; AttribIndex < NUM_OPENGL_VERTEX_STREAMS && NotUsedButEnabledMask; AttribIndex++)
 	{
-		if (UsedAttributes[AttribIndex] == false && ContextState.VertexAttrs[AttribIndex].bEnabled)
+		if (NotUsedButEnabledMask & 1)
 		{
 			glDisableVertexAttribArray(AttribIndex);
-			ContextState.VertexAttrs[AttribIndex].bEnabled = false;
+			ContextState.SetVertexAttrEnabled(AttribIndex, false);
 		}
+		NotUsedButEnabledMask >>= 1;
 	}
 }
 
 void FOpenGLDynamicRHI::OnProgramDeletion( GLint ProgramResource )
 {
+	VERIFY_GL_SCOPE();
 	if( SharedContextState.Program == ProgramResource )
 	{
 		SharedContextState.Program = -1;
@@ -2270,6 +2312,7 @@ void FOpenGLDynamicRHI::OnProgramDeletion( GLint ProgramResource )
 
 void FOpenGLDynamicRHI::OnVertexBufferDeletion( GLuint VertexBufferResource )
 {
+	VERIFY_GL_SCOPE();
 	if (SharedContextState.ArrayBufferBound == VertexBufferResource)
 	{
 		SharedContextState.ArrayBufferBound = -1;	// will force refresh
@@ -2311,6 +2354,7 @@ void FOpenGLDynamicRHI::OnVertexBufferDeletion( GLuint VertexBufferResource )
 
 void FOpenGLDynamicRHI::OnIndexBufferDeletion( GLuint IndexBufferResource )
 {
+	VERIFY_GL_SCOPE();
 	if (SharedContextState.ElementArrayBufferBound == IndexBufferResource)
 	{
 		SharedContextState.ElementArrayBufferBound = -1;	// will force refresh
@@ -2324,6 +2368,7 @@ void FOpenGLDynamicRHI::OnIndexBufferDeletion( GLuint IndexBufferResource )
 
 void FOpenGLDynamicRHI::OnPixelBufferDeletion( GLuint PixelBufferResource )
 {
+	VERIFY_GL_SCOPE();
 	if (SharedContextState.PixelUnpackBufferBound == PixelBufferResource)
 	{
 		SharedContextState.PixelUnpackBufferBound = -1;	// will force refresh
@@ -2337,6 +2382,7 @@ void FOpenGLDynamicRHI::OnPixelBufferDeletion( GLuint PixelBufferResource )
 
 void FOpenGLDynamicRHI::OnUniformBufferDeletion( GLuint UniformBufferResource, uint32 AllocatedSize, bool bStreamDraw )
 {
+	VERIFY_GL_SCOPE();
 	if (SharedContextState.UniformBufferBound == UniformBufferResource)
 	{
 		SharedContextState.UniformBufferBound = -1;	// will force refresh
@@ -2361,33 +2407,65 @@ void FOpenGLDynamicRHI::OnUniformBufferDeletion( GLuint UniformBufferResource, u
 	}
 }
 
-void FOpenGLDynamicRHI::CommitNonComputeShaderConstants()
+FORCEINLINE void FOpenGLDynamicRHI::CommitNonComputeShaderConstants()
+{
+	if (GUseEmulatedUniformBuffers)
+	{
+		CommitNonComputeShaderConstantsSlowPath();
+	}
+	else
+	{
+		FOpenGLLinkedProgram* LinkedProgram = PendingState.BoundShaderState->LinkedProgram;
+		if (LinkedProgram == PendingState.LinkedProgramAndDirtyFlag)
+		{
+			return;
+		}
+		CommitNonComputeShaderConstantsFastPath(LinkedProgram);
+		PendingState.LinkedProgramAndDirtyFlag = LinkedProgram;
+	}
+}
+
+
+void FOpenGLDynamicRHI::CommitNonComputeShaderConstantsSlowPath()
 {
 	VERIFY_GL_SCOPE();
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 
 	FOpenGLLinkedProgram* LinkedProgram = PendingState.BoundShaderState->LinkedProgram;
 	if (GUseEmulatedUniformBuffers)
 	{
-		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_VERTEX].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_VERTEX, PendingState.BoundUniformBuffers[SF_Vertex], PendingState.BoundShaderState->VertexShader->UniformBuffersCopyInfo);
+		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_VERTEX].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_VERTEX, PendingState.BoundUniformBuffers[SF_Vertex], PendingState.BoundShaderState->GetVertexShader()->UniformBuffersCopyInfo);
 	}
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_VERTEX].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_VERTEX);
 
 	if (GUseEmulatedUniformBuffers)
 	{
-		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_PIXEL].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_PIXEL, PendingState.BoundUniformBuffers[SF_Pixel], PendingState.BoundShaderState->PixelShader->UniformBuffersCopyInfo);
+		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_PIXEL].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_PIXEL, PendingState.BoundUniformBuffers[SF_Pixel], PendingState.BoundShaderState->GetPixelShader()->UniformBuffersCopyInfo);
 	}
 	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_PIXEL].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_PIXEL);
 
-	if (PendingState.BoundShaderState->GeometryShader)
+	if (PendingState.BoundShaderState->GetGeometryShader())
 	{
 		if (GUseEmulatedUniformBuffers)
 		{
-			PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_GEOMETRY].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_GEOMETRY, PendingState.BoundUniformBuffers[SF_Geometry], PendingState.BoundShaderState->GeometryShader->UniformBuffersCopyInfo);
+			PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_GEOMETRY].CommitPackedUniformBuffers(LinkedProgram, CrossCompiler::SHADER_STAGE_GEOMETRY, PendingState.BoundUniformBuffers[SF_Geometry], PendingState.BoundShaderState->GetGeometryShader()->UniformBuffersCopyInfo);
 		}
 		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_GEOMETRY].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_GEOMETRY);
 	}
 }
 
+void FOpenGLDynamicRHI::CommitNonComputeShaderConstantsFastPath(FOpenGLLinkedProgram* LinkedProgram)
+{
+	VERIFY_GL_SCOPE();
+	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_VERTEX].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_VERTEX);
+	PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_PIXEL].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_PIXEL);
+
+	if (PendingState.BoundShaderState->GetGeometryShader())
+	{
+		PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_GEOMETRY].CommitPackedGlobals(LinkedProgram, CrossCompiler::SHADER_STAGE_GEOMETRY);
+	}
+}
+
 void FOpenGLDynamicRHI::CommitComputeShaderConstants(FComputeShaderRHIParamRef ComputeShaderRHI)
 {
 	VERIFY_GL_SCOPE();
@@ -2398,6 +2476,7 @@ void FOpenGLDynamicRHI::CommitComputeShaderConstants(FComputeShaderRHIParamRef C
 
 	FOpenGLShaderParameterCache& StageShaderParameters = PendingState.ShaderParameters[CrossCompiler::SHADER_STAGE_COMPUTE];
 	StageShaderParameters.CommitPackedGlobals(ComputeShader->LinkedProgram, CrossCompiler::SHADER_STAGE_COMPUTE);
+	PendingState.LinkedProgramAndDirtyFlag = nullptr;
 }
 
 template <EShaderFrequency Frequency>
@@ -2421,13 +2500,15 @@ template <> FORCEINLINE uint32 GetNumTextureUnits<SF_Geometry>() { return FOpenG
 template <> FORCEINLINE uint32 GetNumTextureUnits<SF_Compute>() { return FOpenGL::GetMaxComputeTextureImageUnits(); }
 
 template <EShaderFrequency Frequency>
-FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FRHITexture* RESTRICT TextureRHI, float CurrentTime)
+FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FRHITexture* RESTRICT TextureRHI)
 {
 	FOpenGLTextureBase* Texture = GetOpenGLTextureFromRHITexture(TextureRHI);
+#if !UE_BUILD_TEST && !UE_BUILD_SHIPPING
 	ensureMsgf(BindIndex < GetNumTextureUnits<Frequency>(), TEXT("Using more %s texture units (%d) than allowed (%d) on a shader unit!"), GetShaderFrequencyString(Frequency, false), BindIndex, GetNumTextureUnits<Frequency>());
+#endif
 	if (Texture)
 	{
-		TextureRHI->SetLastRenderTime(CurrentTime);
+		TextureRHI->SetLastRenderTime(FApp::GetCurrentTime());
 		OpenGLRHI->InternalSetShaderTexture(Texture, nullptr, GetFirstTextureUnit<Frequency>() + BindIndex, Texture->Target, Texture->Resource, Texture->NumMips, -1);
 	}
 	else
@@ -2439,7 +2520,7 @@ FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindI
 }
 
 template <EShaderFrequency Frequency>
-FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FOpenGLSamplerState* RESTRICT SamplerState, float CurrentTime)
+FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FOpenGLSamplerState* RESTRICT SamplerState)
 {
 	OpenGLRHI->InternalSetSamplerStates(GetFirstTextureUnit<Frequency>() + BindIndex, SamplerState);
 	
@@ -2447,24 +2528,24 @@ FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindI
 }
 
 template <EShaderFrequency Frequency>
-FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FOpenGLShaderResourceView* RESTRICT SRV, float CurrentTime)
+FORCEINLINE void SetResource(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, uint32 BindIndex, FRHIShaderResourceView* RESTRICT RHISRV)
 {
-	ensureMsgf(BindIndex < GetNumTextureUnits<Frequency>(), TEXT("Using more %s texture units (%d) than allowed (%d) on a shader unit!"), GetShaderFrequencyString(Frequency, false), BindIndex, GetNumTextureUnits<Frequency>());
+#if !UE_BUILD_TEST && !UE_BUILD_SHIPPING
+	ensureMsgf(BindIndex < GetNumTextureUnits<Frequency>(), TEXT("Using more %s texture units (%d) than allowed (%d) on a shader unit!"), GetShaderFrequencyString(Frequency, false), BindIndex, GetNumTextureUnits<Frequency>());	VERIFY_GL_SCOPE();
+#endif
+	auto SRV = FOpenGLDynamicRHI::ResourceCast(RHISRV);
 	OpenGLRHI->InternalSetShaderTexture(NULL, SRV, GetFirstTextureUnit<Frequency>() + BindIndex, SRV->Target, SRV->Resource, 0, SRV->LimitMip);
-	SetResource<Frequency>(OpenGLRHI,BindIndex,OpenGLRHI->GetPointSamplerState(), CurrentTime);
-	
-	FShaderCache::SetSRV(FShaderCache::GetDefaultCacheState(), Frequency, BindIndex, SRV);
+	SetResource<Frequency>(OpenGLRHI,BindIndex,OpenGLRHI->GetPointSamplerState());
+	FShaderCache::SetSRV(FShaderCache::GetDefaultCacheState(), Frequency, BindIndex, RHISRV);
 }
 
 template <class GLResourceType, EShaderFrequency ShaderFrequency>
-inline int32 SetShaderResourcesFromBuffer(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, FOpenGLUniformBuffer* RESTRICT Buffer, const uint32* RESTRICT ResourceMap, int32 BufferIndex)
+FORCEINLINE void SetShaderResourcesFromBuffer(FOpenGLDynamicRHI* RESTRICT OpenGLRHI, FOpenGLUniformBuffer* RESTRICT Buffer, const uint32* RESTRICT ResourceMap, int32 BufferIndex)
 {
-	const TRefCountPtr<FRHIResource>* RESTRICT Resources = Buffer->ResourceTable.GetData();
-	float CurrentTime = FApp::GetCurrentTime();
-	int32 NumSetCalls = 0;
 	uint32 BufferOffset = ResourceMap[BufferIndex];
 	if (BufferOffset > 0)
 	{
+		const TRefCountPtr<FRHIResource>* RESTRICT Resources = Buffer->ResourceTable.GetData();
 		const uint32* RESTRICT ResourceInfos = &ResourceMap[BufferOffset];
 		uint32 ResourceInfo = *ResourceInfos++;
 		do 
@@ -2474,76 +2555,104 @@ inline int32 SetShaderResourcesFromBuffer(FOpenGLDynamicRHI* RESTRICT OpenGLRHI,
 			const uint8 BindIndex = FRHIResourceTableEntry::GetBindIndex(ResourceInfo);
 
 			GLResourceType* ResourcePtr = (GLResourceType*)Resources[ResourceIndex].GetReference();
-			SetResource<ShaderFrequency>(OpenGLRHI, BindIndex, ResourcePtr, CurrentTime);
+			SetResource<ShaderFrequency>(OpenGLRHI, BindIndex, ResourcePtr);
 
-			NumSetCalls++;
 			ResourceInfo = *ResourceInfos++;
 		} while (FRHIResourceTableEntry::GetUniformBufferIndex(ResourceInfo) == BufferIndex);
 	}
-	return NumSetCalls;
 }
 
 template <class ShaderType>
-void FOpenGLDynamicRHI::SetResourcesFromTables(const ShaderType* RESTRICT Shader)
+FORCEINLINE void FOpenGLDynamicRHI::SetResourcesFromTables(const ShaderType* RESTRICT Shader)
 {
 	checkSlow(Shader);
 	const FOpenGLShaderResourceTable* RESTRICT SRT = &Shader->Bindings.ShaderResourceTable;
 
 	// Mask the dirty bits by those buffers from which the shader has bound resources.
 	uint32 DirtyBits = SRT->ResourceTableBits & PendingState.DirtyUniformBuffers[ShaderType::StaticFrequency];
-	uint32 NumSetCalls = 0;
-	while (DirtyBits)
+	int32 BufferIndex = 0;
+	do
 	{
-		// Scan for the lowest set bit, compute its index, clear it in the set of dirty bits.
-		const uint32 LowestBitMask = (DirtyBits) & (-(int32)DirtyBits);
-		const int32 BufferIndex = FMath::FloorLog2(LowestBitMask); // todo: This has a branch on zero, we know it could never be zero...
-		DirtyBits ^= LowestBitMask;
-
-		FOpenGLUniformBuffer* Buffer = (FOpenGLUniformBuffer*)PendingState.BoundUniformBuffers[ShaderType::StaticFrequency][BufferIndex].GetReference();
-		if(!FShaderCache::IsPredrawCall(FShaderCache::GetDefaultCacheState()))
+		uint32 LowBit = (DirtyBits & 1);
+		if (LowBit)
 		{
+			FOpenGLUniformBuffer* Buffer = (FOpenGLUniformBuffer*)PendingState.BoundUniformBuffers[ShaderType::StaticFrequency][BufferIndex].GetReference();
 			check(Buffer);
 			check(BufferIndex < SRT->ResourceTableLayoutHashes.Num());
 			check(Buffer->GetLayout().GetHash() == SRT->ResourceTableLayoutHashes[BufferIndex]);
 
 			// todo: could make this two pass: gather then set
-			SetShaderResourcesFromBuffer<FRHITexture,(EShaderFrequency)ShaderType::StaticFrequency>(this,Buffer,SRT->TextureMap.GetData(),BufferIndex);
-			SetShaderResourcesFromBuffer<FOpenGLShaderResourceView,(EShaderFrequency)ShaderType::StaticFrequency>(this,Buffer,SRT->ShaderResourceViewMap.GetData(),BufferIndex);
-			SetShaderResourcesFromBuffer<FOpenGLSamplerState,(EShaderFrequency)ShaderType::StaticFrequency>(this,Buffer,SRT->SamplerMap.GetData(),BufferIndex);
+			SetShaderResourcesFromBuffer<FRHITexture, (EShaderFrequency)ShaderType::StaticFrequency>(this, Buffer, SRT->TextureMap.GetData(), BufferIndex);
+			SetShaderResourcesFromBuffer<FRHIShaderResourceView, (EShaderFrequency)ShaderType::StaticFrequency>(this, Buffer, SRT->ShaderResourceViewMap.GetData(), BufferIndex);
+			SetShaderResourcesFromBuffer<FOpenGLSamplerState, (EShaderFrequency)ShaderType::StaticFrequency>(this, Buffer, SRT->SamplerMap.GetData(), BufferIndex);
 		}
-	}
-	PendingState.DirtyUniformBuffers[ShaderType::StaticFrequency] = 0;
-	//SetTextureInTableCalls += NumSetCalls;
+		BufferIndex++;
+		DirtyBits >>= 1;
+	} while (DirtyBits);
 }
 
-void FOpenGLDynamicRHI::CommitGraphicsResourceTables()
+
+void FOpenGLDynamicRHI::CommitGraphicsResourceTablesInner()
 {
-	if (auto* Shader = PendingState.BoundShaderState->VertexShader.GetReference())
+	VERIFY_GL_SCOPE();
+
+	if (!FShaderCache::IsPredrawCall(FShaderCache::GetDefaultCacheState()))
 	{
-		SetResourcesFromTables(Shader);
-	}
-	if (auto* Shader = PendingState.BoundShaderState->PixelShader.GetReference())
-	{
-		SetResourcesFromTables(Shader);
-	}
-	if (auto* Shader = PendingState.BoundShaderState->HullShader.GetReference())
-	{
-		SetResourcesFromTables(Shader);
-	}
-	if (auto* Shader = PendingState.BoundShaderState->DomainShader.GetReference())
-	{
-		SetResourcesFromTables(Shader);
-	}
-	if (auto* Shader = PendingState.BoundShaderState->GeometryShader.GetReference())
-	{
-		SetResourcesFromTables(Shader);
+		if (PendingState.DirtyUniformBuffers[SF_Vertex])
+		{
+			if (auto* Shader = PendingState.BoundShaderState->GetVertexShader())
+			{
+				SetResourcesFromTables(Shader);
+			}
+		}
+		if (PendingState.DirtyUniformBuffers[SF_Pixel])
+		{
+			if (auto* Shader = PendingState.BoundShaderState->GetPixelShader())
+			{
+				SetResourcesFromTables(Shader);
+			}
+		}
+		if (PendingState.DirtyUniformBuffers[SF_Hull])
+		{
+			if (auto* Shader = PendingState.BoundShaderState->GetHullShader())
+			{
+				SetResourcesFromTables(Shader);
+			}
+		}
+		if (PendingState.DirtyUniformBuffers[SF_Domain])
+		{
+			if (auto* Shader = PendingState.BoundShaderState->GetDomainShader())
+			{
+				SetResourcesFromTables(Shader);
+			}
+		}
+		if (PendingState.DirtyUniformBuffers[SF_Geometry])
+		{
+			if (auto* Shader = PendingState.BoundShaderState->GetGeometryShader())
+			{
+				SetResourcesFromTables(Shader);
+			}
+		}
 	}
+	PendingState.bAnyDirtyGraphicsUniformBuffers = false;
+	PendingState.DirtyUniformBuffers[SF_Vertex] = 0;
+	PendingState.DirtyUniformBuffers[SF_Pixel] = 0;
+	PendingState.DirtyUniformBuffers[SF_Hull] = 0;
+	PendingState.DirtyUniformBuffers[SF_Domain] = 0;
+	PendingState.DirtyUniformBuffers[SF_Geometry] = 0;
 }
 
+
 void FOpenGLDynamicRHI::CommitComputeResourceTables(FOpenGLComputeShader* ComputeShader)
 {
+	VERIFY_GL_SCOPE();
+
 	check(ComputeShader);
-	SetResourcesFromTables(ComputeShader);
+	if (!FShaderCache::IsPredrawCall(FShaderCache::GetDefaultCacheState()))
+	{
+		SetResourcesFromTables(ComputeShader);
+	}
+	PendingState.DirtyUniformBuffers[SF_Compute] = 0;
 }
 
 #if DEBUG_GL_SHADERS
@@ -2551,6 +2660,7 @@ static void VerifyProgramPipeline()
 {
 	if (FOpenGL::SupportsSeparateShaderObjects())
 	{
+		VERIFY_GL_SCOPE();
 		GLint ProgramPipeline = 0;
 		glGetIntegerv(GL_PROGRAM_PIPELINE_BINDING, &ProgramPipeline);
 		if(ProgramPipeline)
@@ -2762,18 +2872,54 @@ void FOpenGLDynamicRHI::RHIDrawIndexedPrimitive(FIndexBufferRHIParamRef IndexBuf
 	RHI_DRAW_CALL_STATS(PrimitiveType,NumPrimitives*NumInstances);
 
 	FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
-	BindPendingFramebuffer(ContextState);
-	SetPendingBlendStateForActiveRenderTargets(ContextState);
-	UpdateViewportInOpenGLContext(ContextState);
-	UpdateScissorRectInOpenGLContext(ContextState);
-	UpdateRasterizerStateInOpenGLContext(ContextState);
-	UpdateDepthStencilStateInOpenGLContext(ContextState);
-	BindPendingShaderState(ContextState);
-	CommitGraphicsResourceTables();
-	SetupTexturesForDraw(ContextState);
-	CommitNonComputeShaderConstants();
-	CachedBindElementArrayBuffer(ContextState,IndexBuffer->Resource);
-	SetupVertexArrays(ContextState, BaseVertexIndex, PendingState.Streams, NUM_OPENGL_VERTEX_STREAMS, NumVertices + StartIndex);
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_BindPendingFramebuffer);
+		BindPendingFramebuffer(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_SetPendingBlendStateForActiveRenderTargets);
+		SetPendingBlendStateForActiveRenderTargets(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_UpdateViewportInOpenGLContext);
+		UpdateViewportInOpenGLContext(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_UpdateScissorRectInOpenGLContext);
+		UpdateScissorRectInOpenGLContext(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_UpdateRasterizerStateInOpenGLContext);
+		UpdateRasterizerStateInOpenGLContext(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_UpdateDepthStencilStateInOpenGLContext);
+		UpdateDepthStencilStateInOpenGLContext(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_BindPendingShaderState);
+		BindPendingShaderState(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CommitGraphicsResourceTables);
+		CommitGraphicsResourceTables();
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_SetupTexturesForDraw);
+		SetupTexturesForDraw(ContextState);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CommitNonComputeShaderConstants);
+		CommitNonComputeShaderConstants();
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_CachedBindElementArrayBuffer);
+		CachedBindElementArrayBuffer(ContextState, IndexBuffer->Resource);
+	}
+	{
+		DETAILED_QUICK_SCOPE_CYCLE_COUNTER(STAT_SetupVertexArrays);
+		SetupVertexArrays(ContextState, BaseVertexIndex, PendingState.Streams, NUM_OPENGL_VERTEX_STREAMS, NumVertices + StartIndex);
+	}
 
 	GLenum DrawMode = GL_TRIANGLES;
 	GLsizei NumElements = 0;
@@ -3008,6 +3154,7 @@ void FOpenGLDynamicRHI::RHIEndDrawPrimitiveUP()
  */
 void FOpenGLDynamicRHI::RHIBeginDrawIndexedPrimitiveUP( uint32 PrimitiveType, uint32 NumPrimitives, uint32 NumVertices, uint32 VertexDataStride, void*& OutVertexData, uint32 MinVertexIndex, uint32 NumIndices, uint32 IndexDataStride, void*& OutIndexData)
 {
+	VERIFY_GL_SCOPE();
 	SCOPE_CYCLE_COUNTER_DETAILED(STAT_OpenGLDrawPrimitiveUPTime);
 	check(PendingState.NumPrimitives == 0);
 	check((sizeof(uint16) == IndexDataStride) || (sizeof(uint32) == IndexDataStride));
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDevice.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDevice.cpp
index ae387b45f423..84aca84593f7 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDevice.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDevice.cpp
@@ -47,6 +47,18 @@ static FOpenGLDynamicRHI* PrivateOpenGLDevicePtr = NULL;
 /** true if we're not using UBOs. (ES2) */
 bool GUseEmulatedUniformBuffers;
 
+#ifndef EXPERIMENTAL_OPENGL_RHITHREAD
+#define EXPERIMENTAL_OPENGL_RHITHREAD 0
+#endif
+
+static TAutoConsoleVariable<int32> CVarAllowRGLHIThread(
+	TEXT("r.OpenGL.AllowRHIThread"),
+	0,
+	TEXT("Toggle experimental OpenGL RHI thread support.\n")
+	TEXT("0: GL scene rendering operations are performed on the render thread. (default)\n")
+	TEXT("1: GL scene rendering operations are queued onto the RHI thread gaining some parallelism with the render thread. (mobile feature levels only)"),
+	ECVF_RenderThreadSafe | ECVF_ReadOnly);
+
 void OnQueryCreation( FOpenGLRenderQuery* Query )
 {
 	check(PrivateOpenGLDevicePtr);
@@ -227,10 +239,10 @@ JNI_METHOD void Java_com_epicgames_ue4_MediaPlayer14_nativeClearCachedAttributeS
 	FOpenGLContextState& ContextState = PrivateOpenGLDevicePtr->GetContextStateForCurrentContext();
 
 	// update vertex attributes state
-	ContextState.VertexAttrs[PositionAttrib].bEnabled = false;
+	ContextState.SetVertexAttrEnabled(PositionAttrib, false);
 	ContextState.VertexAttrs[PositionAttrib].Stride = -1;
 
-	ContextState.VertexAttrs[TexCoordsAttrib].bEnabled = false;
+	ContextState.SetVertexAttrEnabled(TexCoordsAttrib, false);
 	ContextState.VertexAttrs[TexCoordsAttrib].Stride = -1;
 
 	// make sure the texture is set again
@@ -780,11 +792,13 @@ static void InitRHICapabilitiesForGL()
 	// Shader platform & RHI feature level
 	GMaxRHIFeatureLevel = FOpenGL::GetFeatureLevel();
 	GMaxRHIShaderPlatform = FOpenGL::GetShaderPlatform();
-
-#if !PLATFORM_DESKTOP
+	 
+	// Only enable the experimental OGL rhi thread if explicitly requested.
+#if EXPERIMENTAL_OPENGL_RHITHREAD
 	GRHISupportsRHIThread = GMaxRHIFeatureLevel <= ERHIFeatureLevel::ES3_1;
+#elif ((!PLATFORM_RHITHREAD_DEFAULT_BYPASS) || CAN_TOGGLE_COMMAND_LIST_BYPASS)
+	GRHISupportsRHIThread = GMaxRHIFeatureLevel <= ERHIFeatureLevel::ES3_1 && CVarAllowRGLHIThread.GetValueOnAnyThread();
 #else
-	// Enabling GRHISupportsRHIThread causes multi-threading issues on Linux, possibly Windows too
 	GRHISupportsRHIThread = false;
 #endif
 
@@ -827,6 +841,7 @@ static void InitRHICapabilitiesForGL()
 
 	GSupportsParallelRenderingTasksWithSeparateRHIThread = false; // hopefully this is just temporary
 	GRHIThreadNeedsKicking = true; // GL is SLOW
+	GRHISupportsExactOcclusionQueries = FOpenGL::SupportsExactOcclusionQueries();
 
 	GSupportsVolumeTextureRendering = FOpenGL::SupportsVolumeTextureRendering();
 	GSupportsRenderDepthTargetableShaderResources = true;
@@ -849,7 +864,7 @@ static void InitRHICapabilitiesForGL()
 	GMaxShadowDepthBufferSizeY = FMath::Min<int32>(Value_GL_MAX_RENDERBUFFER_SIZE, 4096);
 	GHardwareHiddenSurfaceRemoval = FOpenGL::HasHardwareHiddenSurfaceRemoval();
 	GRHISupportsInstancing = FOpenGL::SupportsInstancing(); // HTML5 supports it with ANGLE_instanced_arrays or WebGL 2.0+. Android supports it with OpenGL ES3.0+
-	GSupportsTimestampRenderQueries = FOpenGL::SupportsTimestampQueries();
+	GSupportsTimestampRenderQueries = FOpenGL::SupportsTimestampQueries() && FOpenGL::SupportsDisjointTimeQueries();
 
 	GSupportsHDR32bppEncodeModeIntrinsic = FOpenGL::SupportsHDR32bppEncodeModeIntrinsic();
 
@@ -1170,65 +1185,78 @@ FOpenGLDynamicRHI::FOpenGLDynamicRHI()
 extern void DestroyShadersAndPrograms();
 
 #if PLATFORM_ANDROID
+extern bool GOpenGLShaderHackLastCompileSuccess;
+
 // only used to test for shader compatibility issues
-static bool VerifyCompiledShader(GLuint Shader, const ANSICHAR* GlslCode, bool IsFatal )
+static bool VerifyCompiledShader(GLuint Shader, const ANSICHAR* GlslCode, bool IsFatal)
 {
 	SCOPE_CYCLE_COUNTER(STAT_OpenGLShaderCompileVerifyTime);
 
-	GLint CompileStatus;
-	glGetShaderiv(Shader, GL_COMPILE_STATUS, &CompileStatus);
-	if (CompileStatus != GL_TRUE)
+	if (!GOpenGLShaderHackLastCompileSuccess)
 	{
-		GLint LogLength;
-		ANSICHAR DefaultLog[] = "No log";
-		ANSICHAR *CompileLog = DefaultLog;
-		glGetShaderiv(Shader, GL_INFO_LOG_LENGTH, &LogLength);
-#if PLATFORM_ANDROID
-		if ( LogLength == 0 )
-		{
-			// make it big anyway
-			// there was a bug in android 2.2 where glGetShaderiv would return 0 even though there was a error message
-			// https://code.google.com/p/android/issues/detail?id=9953
-			LogLength = 4096;
-		}
-#endif
-		if (LogLength > 1)
-		{
-			CompileLog = (ANSICHAR *)FMemory::Malloc(LogLength);
-			glGetShaderInfoLog(Shader, LogLength, NULL, CompileLog);
-		}
-
 #if DEBUG_GL_SHADERS
 		if (GlslCode)
 		{
-			UE_LOG(LogRHI,Warning,TEXT("Shader:\n%s"),ANSI_TO_TCHAR(GlslCode));
-
+			UE_LOG(LogRHI, Warning, TEXT("Shader:\n%s"), ANSI_TO_TCHAR(GlslCode));
 
 			const ANSICHAR *Temp = GlslCode;
 
-			for ( int i = 0; i < 30 && (*Temp != '\0'); ++i )
+			for (int i = 0; i < 30 && (*Temp != '\0'); ++i)
 			{
-				FString Converted = ANSI_TO_TCHAR( Temp );
-				Converted.LeftChop( 256 );
+				FString Converted = ANSI_TO_TCHAR(Temp);
+				Converted.LeftChop(256);
 
-				UE_LOG(LogRHI,Display,TEXT("%s"), *Converted );
+				UE_LOG(LogRHI, Display, TEXT("%s"), *Converted);
 				Temp += Converted.Len();
 			}
-
 		}
 #endif
-		UE_LOG(LogRHI,Warning,TEXT("Failed to compile shader. Compile log:\n%s"), ANSI_TO_TCHAR(CompileLog));
+		UE_LOG(LogRHI, Warning, TEXT("Failed to compile shader."));
 
-		if (LogLength > 1)
-		{
-			FMemory::Free(CompileLog);
-		}
 		return false;
 	}
 	return true;
+
 }
 #endif
 
+#if PLATFORM_ANDROID
+static void AttemptLinkProgramExecute(GLuint VertexShaderResource, GLuint PixelShaderResource)
+{
+	GLuint Program = glCreateProgram();
+	glAttachShader(Program, VertexShaderResource);
+	glAttachShader(Program, PixelShaderResource);
+	glLinkProgram(Program);
+	GLint LinkStatus = 0;
+	glGetProgramiv(Program, GL_LINK_STATUS, &LinkStatus);
+	if (LinkStatus != GL_TRUE)
+	{
+		FOpenGL::bRequiresGLFragCoordVaryingLimitHack = true;
+		UE_LOG(LogRHI, Warning, TEXT("gl_FragCoord uses a varying... enabled hack"));
+		return;
+	}
+
+	UE_LOG(LogRHI, Warning, TEXT("gl_FragCoord does not need a varying"));
+}
+
+struct FRHICommandAttemptLinkProgram final : public FRHICommand<FRHICommandAttemptLinkProgram>
+{
+	GLuint VertexShaderResource;
+	GLuint PixelShaderResource;
+
+	FORCEINLINE_DEBUGGABLE FRHICommandAttemptLinkProgram(GLuint InVertexShaderResource, GLuint InPixelShaderResource)
+		: VertexShaderResource(InVertexShaderResource)
+		, PixelShaderResource(InPixelShaderResource)
+	{
+	}
+	void Execute(FRHICommandListBase& CmdList)
+	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_FRHICommandAttemptLinkProgram_Execute);
+		AttemptLinkProgramExecute(VertexShaderResource, PixelShaderResource);
+	}
+};
+#endif
+
 static void CheckVaryingLimit()
 {
 #if PLATFORM_ANDROID && !PLATFORM_LUMINGL4
@@ -1325,15 +1353,32 @@ static void CheckVaryingLimit()
 			Writer.Close();
 		}
 
+		FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
 		// Try to compile test shaders
+		GOpenGLShaderHackLastCompileSuccess = false;
 		TRefCountPtr<FOpenGLVertexShader> VertexShader = (FOpenGLVertexShader*)(RHICreateVertexShader(VertexShaderCode.GetReadAccess()).GetReference());
+
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (!VerifyCompiledShader(VertexShader->Resource, TestVertexProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Vertex shader for varying test failed to compile. Try running anyway."));
 			FOpenGL::bIsCheckingShaderCompilerHacks = false;
 			return;
 		}
+
+		GOpenGLShaderHackLastCompileSuccess = false;
 		TRefCountPtr<FOpenGLPixelShader> PixelShader = (FOpenGLPixelShader*)(RHICreatePixelShader(FragmentShaderCode.GetReadAccess()).GetReference());
+
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (!VerifyCompiledShader(PixelShader->Resource, TestFragmentProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Fragment shader for varying test failed to compile. Try running anyway."));
@@ -1344,20 +1389,16 @@ static void CheckVaryingLimit()
 		FOpenGL::bIsCheckingShaderCompilerHacks = false;
 
 		// Now try linking them.. this is where gl_FragCoord may cause a failure
-		GLuint Program = glCreateProgram();
-		glAttachShader(Program, VertexShader->Resource);
-		glAttachShader(Program, PixelShader->Resource);
-		glLinkProgram(Program);
-		GLint LinkStatus = 0;
-		glGetProgramiv(Program, GL_LINK_STATUS, &LinkStatus);
-		if (LinkStatus != GL_TRUE)
+		if (IsRunningRHIInSeparateThread())
 		{
-			FOpenGL::bRequiresGLFragCoordVaryingLimitHack = true;
-			UE_LOG(LogRHI, Warning, TEXT("gl_FragCoord uses a varying... enabled hack"));
-			return;
+			new (RHICmdList.AllocCommand<FRHICommandAttemptLinkProgram>()) FRHICommandAttemptLinkProgram(VertexShader->Resource, PixelShader->Resource);
+			// wait for AttemptLinkProgramExecute to complete.
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+		else
+		{
+			AttemptLinkProgramExecute(VertexShader->Resource, PixelShader->Resource);
 		}
-
-		UE_LOG(LogRHI, Warning, TEXT("gl_FragCoord does not need a varying"));
 	}
 #elif PLATFORM_IOS
 	if (IsES2Platform(GMaxRHIShaderPlatform))
@@ -1411,9 +1452,17 @@ static void CheckTextureCubeLodSupport()
 		}
 		const TArray<uint8>& Code = ShaderCode.GetReadAccess();
 
+		FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
 		// try to compile without any hacks
+		GOpenGLShaderHackLastCompileSuccess = false;
 		TRefCountPtr<FOpenGLPixelShader> PixelShader = (FOpenGLPixelShader*)(RHICreatePixelShader(Code).GetReference());
 
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (VerifyCompiledShader(PixelShader->Resource, TestFragmentProgram, false))
 		{
 			UE_LOG(LogRHI, Display, TEXT("Shaders compile fine no need to enable hacks"));
@@ -1428,8 +1477,14 @@ static void CheckTextureCubeLodSupport()
 		// second most number of devices fall into this hack category
 		// try to compile without using precision for texture samplers
 		// Samsung Galaxy Express	Samsung Galaxy S3	Samsung Galaxy S3 mini	Samsung Galaxy Tab GT-P1000	Samsung Galaxy Tab 2
+		GOpenGLShaderHackLastCompileSuccess = false;
 		PixelShader = (FOpenGLPixelShader*)(RHICreatePixelShader(Code).GetReference());
 
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (VerifyCompiledShader(PixelShader->Resource, TestFragmentProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Enabling shader compiler hack to remove precision modifiers for texture samplers"));
@@ -1443,8 +1498,14 @@ static void CheckTextureCubeLodSupport()
 		FOpenGL::bRequiresTextureCubeLodEXTToTextureCubeLodDefine = true;
 
 		// third most likely Samsung Galaxy Tab GT-P1000
+		GOpenGLShaderHackLastCompileSuccess = false;
 		PixelShader = (FOpenGLPixelShader*)(RHICreatePixelShader(Code).GetReference());
 
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (VerifyCompiledShader(PixelShader->Resource, TestFragmentProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Enabling shader compiler hack to redefine textureCubeLodEXT to textureCubeLod"));
@@ -1457,8 +1518,14 @@ static void CheckTextureCubeLodSupport()
 		FOpenGL::bRequiresTextureCubeLodEXTToTextureCubeLodDefine = true;
 
 		// try both hacks
+		GOpenGLShaderHackLastCompileSuccess = false;
 		PixelShader = (FOpenGLPixelShader*)(RHICreatePixelShader(Code).GetReference());
 
+		if (IsRunningRHIInSeparateThread())
+		{
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (VerifyCompiledShader(PixelShader->Resource, TestFragmentProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Enabling shader compiler hack to redefine textureCubeLodEXT to textureCubeLod and remove precision modifiers"));
@@ -1504,7 +1571,15 @@ static void CheckRoundFunction()
 		}
 
 		// Try to compile test shaders
+		GOpenGLShaderHackLastCompileSuccess = false;
 		TRefCountPtr<FOpenGLVertexShader> VertexShader = (FOpenGLVertexShader*)(RHICreateVertexShader(VertexShaderCode.GetReadAccess()).GetReference());
+
+		if (IsRunningRHIInSeparateThread())
+		{
+			FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+
 		if (!VerifyCompiledShader(VertexShader->Resource, TestVertexProgram, false))
 		{
 			UE_LOG(LogRHI, Warning, TEXT("Using the round() function hack, because the vertex shader for round function test failed to compile."));
@@ -1668,6 +1743,7 @@ void FOpenGLDynamicRHI::Cleanup()
 	PendingState.BoundShaderState.SafeRelease();
 	check(!IsValidRef(PendingState.BoundShaderState));
 
+	VERIFY_GL_SCOPE();
 	PendingState.CleanupResources();
 	SharedContextState.CleanupResources();
 	RenderingContextState.CleanupResources();
@@ -1747,15 +1823,6 @@ void FOpenGLDynamicRHI::InvalidateQueries( void )
 			Queries[Index]->bInvalidResource = true;
 		}
 	}
-
-	{
-		FScopeLock Lock(&TimerQueriesListCriticalSection);
-
-		for( int32 Index = 0; Index < TimerQueries.Num(); ++Index )
-		{
-			TimerQueries[Index]->bInvalidResource = true;
-		}
-	}
 }
 
 void* FOpenGLDynamicRHI::GetOpenGLCurrentContextHandle()
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDrv.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDrv.cpp
index 26d68f9441cd..3966a1763c5a 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDrv.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLDrv.cpp
@@ -61,6 +61,11 @@ void FOpenGLGPUProfiler::PopEvent()
 
 void FOpenGLGPUProfiler::BeginFrame(FOpenGLDynamicRHI* InRHI)
 {
+	if (!bIntialized)
+	{
+		bIntialized = true;
+		InitResources();
+	}
 	if (NestedFrameCount++>0)
 	{
 		// guard against nested Begin/EndFrame calls.
@@ -306,13 +311,17 @@ void FOpenGLGPUProfiler::EndFrame()
 
 void FOpenGLGPUProfiler::Cleanup()
 {
-	for (int32 Index = 0; Index < MAX_GPUFRAMEQUERIES; ++Index)
+	if (bIntialized)
 	{
-		DisjointGPUFrameTimeQuery[Index].ReleaseResource();
-	}
+		for (int32 Index = 0; Index < MAX_GPUFRAMEQUERIES; ++Index)
+		{
+			DisjointGPUFrameTimeQuery[Index].ReleaseResources();
+		}
 
-	FrameTiming.ReleaseResource();
-	NestedFrameCount = 0;
+		FrameTiming.ReleaseResources();
+		NestedFrameCount = 0;
+		bIntialized = false;
+	}
 }
 
 /** Start this frame of per tracking */
@@ -379,6 +388,7 @@ float FOpenGLEventNode::GetTiming()
 
 void FOpenGLDynamicRHI::InitializeStateResources()
 {
+	VERIFY_GL_SCOPE();
 	SharedContextState.InitializeResources(FOpenGL::GetMaxCombinedTextureImageUnits(), OGL_MAX_COMPUTE_STAGE_UAV_UNITS);
 	RenderingContextState.InitializeResources(FOpenGL::GetMaxCombinedTextureImageUnits(), OGL_MAX_COMPUTE_STAGE_UAV_UNITS);
 	PendingState.InitializeResources(FOpenGL::GetMaxCombinedTextureImageUnits(), OGL_MAX_COMPUTE_STAGE_UAV_UNITS);
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLES2.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLES2.cpp
index 4f2bc6a93f20..7e3cbe3ec1db 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLES2.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLES2.cpp
@@ -32,7 +32,7 @@ static TAutoConsoleVariable<int32> CVarDisjointTimerQueries(
 	TEXT("r.DisjointTimerQueries"),
 	0,
 	TEXT("If set to 1, allows GPU time to be measured (e.g. STAT UNIT). It defaults to 0 because some devices supports it but very slowly."),
-	ECVF_RenderThreadSafe);
+	ECVF_ReadOnly);
 
 /** Some timer query implementations are never disjoint */
 bool FOpenGLES2::bTimerQueryCanBeDisjoint = true;
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLIndexBuffer.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLIndexBuffer.cpp
index 73d1e1786d01..82ad602751e6 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLIndexBuffer.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLIndexBuffer.cpp
@@ -36,14 +36,20 @@ FIndexBufferRHIRef FOpenGLDynamicRHI::CreateIndexBuffer_RenderThread(class FRHIC
 
 void* FOpenGLDynamicRHI::RHILockIndexBuffer(FIndexBufferRHIParamRef IndexBufferRHI,uint32 Offset,uint32 Size,EResourceLockMode LockMode)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 	VERIFY_GL_SCOPE();
 	FOpenGLIndexBuffer* IndexBuffer = ResourceCast(IndexBufferRHI);
 	return IndexBuffer->Lock(Offset, Size, LockMode == RLM_ReadOnly, IndexBuffer->IsDynamic());
+	RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(void*);
 }
 
 void FOpenGLDynamicRHI::RHIUnlockIndexBuffer(FIndexBufferRHIParamRef IndexBufferRHI)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 	VERIFY_GL_SCOPE();
 	FOpenGLIndexBuffer* IndexBuffer = ResourceCast(IndexBufferRHI);
 	IndexBuffer->Unlock();
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLQuery.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLQuery.cpp
index ff7b271b0c67..ee07fc8cf08c 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLQuery.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLQuery.cpp
@@ -211,7 +211,6 @@ void EndOcclusionQueryBatch()
 
 FRenderQueryRHIRef FOpenGLDynamicRHI::RHICreateRenderQuery(ERenderQueryType QueryType)
 {
-	VERIFY_GL_SCOPE();
 
 	check(QueryType == RQT_Occlusion || QueryType == RQT_AbsoluteTime);
 
@@ -350,78 +349,86 @@ void FOpenGLDynamicRHI::GetRenderQueryResult_OnThisThread(FOpenGLRenderQuery* Qu
 		Query->bInvalidResource = true;
 	}
 
-		// Check if the query is valid first
-		if (Query->bInvalidResource)
-		{
+	// Check if the query is valid first
+	if (Query->bInvalidResource)
+	{
 		Query->Result = 0;
 		Query->TotalResults.Increment();
-		}
-		else
+	}
+	else
+	{
+		// Check if the query is finished
+		GLuint Result = 0;
+		FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_ResultAvailable, &Result);
+
+		// Isn't the query finished yet, and can we wait for it?
+		if (Result == GL_FALSE && bWait)
 		{
-			// Check if the query is finished
-			GLuint Result = 0;
+			SCOPE_CYCLE_COUNTER(STAT_RenderQueryResultTime);
+			uint32 IdleStart = FPlatformTime::Cycles();
+			double StartTime = FPlatformTime::Seconds();
+			do
+			{
+				GBatcher.Waited();
+				FPlatformProcess::Sleep(0);	// yield to other threads - some of them may be OpenGL driver's and we'd be starving them
+
+				if (Query->bInvalidResource)
+				{
+					// Query got invalidated while we were sleeping.
+					// Bail out, no sense to wait and generate OpenGL errors,
+					// we're in a new OpenGL context that knows nothing about us.
+					Query->Result = 1000;	// safe value
+					Result = GL_FALSE;
+					bWait = false;
+					Query->bResultWasSuccess = true;
+					break;
+				}
+
 				FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_ResultAvailable, &Result);
 
-			// Isn't the query finished yet, and can we wait for it?
-			if (Result == GL_FALSE && bWait)
-			{
-			SCOPE_CYCLE_COUNTER(STAT_RenderQueryResultTime);
-				uint32 IdleStart = FPlatformTime::Cycles();
-				double StartTime = FPlatformTime::Seconds();
-				do
+				// timer queries are used for Benchmarks which can stall a bit more
+				double TimeoutValue = (Query->QueryType == RQT_AbsoluteTime) ? 2.0 : 0.5;
+
+				if ((FPlatformTime::Seconds() - StartTime) > TimeoutValue)
 				{
-				GBatcher.Waited();
-					FPlatformProcess::Sleep(0);	// yield to other threads - some of them may be OpenGL driver's and we'd be starving them
-
-					if (Query->bInvalidResource)
-					{
-						// Query got invalidated while we were sleeping.
-						// Bail out, no sense to wait and generate OpenGL errors,
-						// we're in a new OpenGL context that knows nothing about us.
-						Query->Result = 1000;	// safe value
-						Result = GL_FALSE;
-						bWait = false;
-					Query->bResultWasSuccess = true;
-						break;
-					}
-
-					FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_ResultAvailable, &Result);
-
-					// timer queries are used for Benchmarks which can stall a bit more
-					double TimeoutValue = (Query->QueryType == RQT_AbsoluteTime) ? 2.0 : 0.5;
-
-					if ((FPlatformTime::Seconds() - StartTime) > TimeoutValue)
-					{
-						UE_LOG(LogRHI, Log, TEXT("Timed out while waiting for GPU to catch up. (%.1f s)"), TimeoutValue);
-						break;
-					}
-				} while (Result == GL_FALSE);
-				GRenderThreadIdle[ERenderThreadIdleTypes::WaitingForGPUQuery] += FPlatformTime::Cycles() - IdleStart;
+					UE_LOG(LogRHI, Log, TEXT("Timed out while waiting for GPU to catch up. (%.1f s)"), TimeoutValue);
+					break;
+				}
+			} while (Result == GL_FALSE);
+			uint32 ThisCycles = FPlatformTime::Cycles() - IdleStart;
+			if (IsInRHIThread())
+			{
+				GWorkingRHIThreadStallTime += ThisCycles;
+			}
+			else
+			{
+				GRenderThreadIdle[ERenderThreadIdleTypes::WaitingForGPUQuery] += ThisCycles;
 				GRenderThreadNumIdle[ERenderThreadIdleTypes::WaitingForGPUQuery]++;
 			}
+		}
 
-			if (Result == GL_TRUE)
+		if (Result == GL_TRUE)
+		{
+			VERIFY_GL_SCOPE();
+			if (Query->QueryType == RQT_AbsoluteTime)
 			{
-				VERIFY_GL_SCOPE();
-				if (Query->QueryType == RQT_AbsoluteTime)
-				{
-					FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_Result, &Query->Result);
-				}
-				else
-				{
-					GLuint Result32 = 0;
-					FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_Result, &Result32);
+				FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_Result, &Query->Result);
+			}
+			else
+			{
+				GLuint Result32 = 0;
+				FOpenGL::GetQueryObject(Query->Resource, FOpenGL::QM_Result, &Result32);
 				Query->Result = Result32 * (FOpenGL::SupportsExactOcclusionQueries() ? 1 : 500000); // half a mega pixel display
-				}
+			}
 			Query->bResultWasSuccess = true;
 			Query->TotalResults.Increment();
-			}
-			else if (Result == GL_FALSE && bWait)
-			{
+		}
+		else if (Result == GL_FALSE && bWait)
+		{
 			Query->Result = 0;
 			Query->TotalResults.Increment();
-			}
 		}
+	}
 }
 
 
@@ -468,17 +475,17 @@ bool FOpenGLDynamicRHI::RHIGetRenderQueryResult(FRenderQueryRHIParamRef QueryRHI
 	if (Query->TotalResults.GetValue() == Query->TotalBegins.GetValue() && Query->bResultWasSuccess)
 	{
 		if (Query->QueryType == RQT_AbsoluteTime)
-	{
-		// GetTimingFrequency is the number of ticks per second
-		uint64 Div = FMath::Max(1llu, FOpenGLBufferedGPUTiming::GetTimingFrequency() / (1000 * 1000));
+		{
+			// GetTimingFrequency is the number of ticks per second
+			uint64 Div = FMath::Max(1llu, FOpenGLBufferedGPUTiming::GetTimingFrequency() / (1000 * 1000));
 
-		// convert from GPU specific timestamp to micro sec (1 / 1 000 000 s) which seems a reasonable resolution
-		OutResult = Query->Result / Div;
-	}
-	else
-	{
-		OutResult = Query->Result;
-	}
+			// convert from GPU specific timestamp to micro sec (1 / 1 000 000 s) which seems a reasonable resolution
+			OutResult = Query->Result / Div;
+		}
+		else
+		{
+			OutResult = Query->Result;
+		}
 		return true;
 	}
 	OutResult = 0;
@@ -506,7 +513,7 @@ FOpenGLRenderQuery::FOpenGLRenderQuery(ERenderQueryType InQueryType)
 	else
 	{
 		CreationFence.Reset();
-		new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand([=]() {VERIFY_GL_SCOPE(); AcquireResource(); CreationFence.WriteAssertFence(); });
+		new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand([=]() {AcquireResource(); CreationFence.WriteAssertFence(); });
 		CreationFence.SetRHIThreadFence();
 	}
 }
@@ -514,7 +521,6 @@ FOpenGLRenderQuery::FOpenGLRenderQuery(ERenderQueryType InQueryType)
 
 FOpenGLRenderQuery::~FOpenGLRenderQuery()
 {
-	CreationFence.WaitFence();
 
 	OnQueryDeletion( this );
 
@@ -530,6 +536,7 @@ FOpenGLRenderQuery::~FOpenGLRenderQuery()
 		}
 		else
 		{
+			CreationFence.WaitFence();
 			new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand([Resource = Resource, ResourceContext = ResourceContext]() {VERIFY_GL_SCOPE(); ReleaseResource(Resource, ResourceContext); });
 		}
 	}
@@ -537,6 +544,7 @@ FOpenGLRenderQuery::~FOpenGLRenderQuery()
 
 void FOpenGLRenderQuery::AcquireResource()
 {
+	VERIFY_GL_SCOPE();
 	bInvalidResource = false;
 	PlatformGetNewRenderQuery(&Resource, &ResourceContext);
 	OnQueryCreation(this);
@@ -571,6 +579,8 @@ void FOpenGLEventQuery::WaitForCompletion()
 {
 	VERIFY_GL_SCOPE();
 
+	QUICK_SCOPE_CYCLE_COUNTER(STAT_FOpenGLEventQuery_WaitForCompletion);
+
 
 	checkSlow(FOpenGL::IsSync(Sync));
 
@@ -600,16 +610,25 @@ void FOpenGLEventQuery::WaitForCompletion()
 
 void FOpenGLEventQuery::InitDynamicRHI()
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 	VERIFY_GL_SCOPE();
 	// Initialize the query by issuing an initial event.
 	IssueEvent();
 
-	checkSlow(FOpenGL::IsSync(Sync));
+	check(FOpenGL::IsSync(Sync));
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLEventQuery::ReleaseDynamicRHI()
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
+	VERIFY_GL_SCOPE();
 	FOpenGL::DeleteSync(Sync);
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 /*=============================================================================
@@ -639,7 +658,7 @@ void FOpenGLBufferedGPUTiming::PlatformStaticInitialize(void* UserData)
 	// Are the static variables initialized?
 	if ( !GAreGlobalsInitialized )
 	{
-		GIsSupported = FOpenGL::SupportsTimestampQueries();
+		GIsSupported = FOpenGL::SupportsTimestampQueries() && FOpenGL::SupportsDisjointTimeQueries();
 		GTimingFrequency = 1000 * 1000 * 1000;
 		GAreGlobalsInitialized = true;
 	}
@@ -648,7 +667,19 @@ void FOpenGLBufferedGPUTiming::PlatformStaticInitialize(void* UserData)
 /**
  * Initializes all OpenGL resources and if necessary, the static variables.
  */
-void FOpenGLBufferedGPUTiming::InitDynamicRHI()
+
+static TArray<FOpenGLRenderQuery*> TimerQueryPool;
+
+static FOpenGLRenderQuery* GetTimeQuery()
+{
+	if (TimerQueryPool.Num())
+	{
+		return TimerQueryPool.Pop();
+	}
+	return new FOpenGLRenderQuery(RQT_AbsoluteTime);
+}
+
+void FOpenGLBufferedGPUTiming::InitResources()
 {
 	VERIFY_GL_SCOPE();
 
@@ -657,7 +688,7 @@ void FOpenGLBufferedGPUTiming::InitDynamicRHI()
 	CurrentTimestamp = 0;
 	NumIssuedTimestamps = 0;
 	bIsTiming = false;
-	GIsSupported = FOpenGL::SupportsTimestampQueries();
+	GIsSupported = FOpenGL::SupportsTimestampQueries() && FOpenGL::SupportsDisjointTimeQueries();
 
 	if ( GIsSupported )
 	{
@@ -666,8 +697,8 @@ void FOpenGLBufferedGPUTiming::InitDynamicRHI()
 
 		for(int32 BufferIndex = 0; BufferIndex < BufferSize; ++BufferIndex)
 		{
-			StartTimestamps.Add(new FOpenGLRenderQuery(RQT_AbsoluteTime));
-			EndTimestamps.Add(new FOpenGLRenderQuery(RQT_AbsoluteTime));
+			StartTimestamps.Add(GetTimeQuery());
+			EndTimestamps.Add(GetTimeQuery());
 		}
 	}
 }
@@ -675,18 +706,18 @@ void FOpenGLBufferedGPUTiming::InitDynamicRHI()
 /**
  * Releases all OpenGL resources.
  */
-void FOpenGLBufferedGPUTiming::ReleaseDynamicRHI()
+void FOpenGLBufferedGPUTiming::ReleaseResources()
 {
 	VERIFY_GL_SCOPE();
 
 	for(FOpenGLRenderQuery* Query : StartTimestamps)
 	{
-		delete Query;
+		TimerQueryPool.Add(Query);
 	}
 
 	for(FOpenGLRenderQuery* Query : EndTimestamps)
 	{
-		delete Query;
+		TimerQueryPool.Add(Query);
 	}
 
 	StartTimestamps.Reset();
@@ -967,7 +998,7 @@ bool FOpenGLDisjointTimeStampQuery::GetResult( uint64* OutResult/*=NULL*/ )
 	return bIsResultValid;
 }
 
-void FOpenGLDisjointTimeStampQuery::InitDynamicRHI()
+void FOpenGLDisjointTimeStampQuery::InitResources()
 {
 	VERIFY_GL_SCOPE();
 	if ( IsSupported() )
@@ -976,7 +1007,7 @@ void FOpenGLDisjointTimeStampQuery::InitDynamicRHI()
 	}
 }
 
-void FOpenGLDisjointTimeStampQuery::ReleaseDynamicRHI()
+void FOpenGLDisjointTimeStampQuery::ReleaseResources()
 {
 	VERIFY_GL_SCOPE();
 	if ( IsSupported() )
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLRenderTarget.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLRenderTarget.cpp
index 838f2c233455..fc109550d0c3 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLRenderTarget.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLRenderTarget.cpp
@@ -881,6 +881,9 @@ void FOpenGLDynamicRHI::RHIReadSurfaceData(FTextureRHIParamRef TextureRHI,FIntRe
 		return;
 	}
 
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 	TArray<uint8> Temp;
 
 	FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
@@ -895,10 +898,15 @@ void FOpenGLDynamicRHI::RHIReadSurfaceData(FTextureRHIParamRef TextureRHI,FIntRe
 
 		FMemory::Memcpy(OutData.GetData(), Temp.GetData(), Size * sizeof(FColor));
 	}
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLDynamicRHI::RHIMapStagingSurface(FTextureRHIParamRef TextureRHI,void*& OutData,int32& OutWidth,int32& OutHeight)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
+
 	VERIFY_GL_SCOPE();
 	
 	FOpenGLTexture2D* Texture2D = (FOpenGLTexture2D*)TextureRHI->GetTexture2D();
@@ -910,20 +918,30 @@ void FOpenGLDynamicRHI::RHIMapStagingSurface(FTextureRHIParamRef TextureRHI,void
 	
 	uint32 Stride = 0;
 	OutData = Texture2D->Lock( 0, 0, RLM_ReadOnly, Stride );
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLDynamicRHI::RHIUnmapStagingSurface(FTextureRHIParamRef TextureRHI)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
+
 	VERIFY_GL_SCOPE();
 	
 	FOpenGLTexture2D* Texture2D = (FOpenGLTexture2D*)TextureRHI->GetTexture2D();
 	check(Texture2D);
 
 	Texture2D->Unlock( 0, 0 );
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLDynamicRHI::RHIReadSurfaceFloatData(FTextureRHIParamRef TextureRHI,FIntRect Rect,TArray<FFloat16Color>& OutData,ECubeFace CubeFace,int32 ArrayIndex,int32 MipIndex)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
+
 	VERIFY_GL_SCOPE();	
 
 	//reading from arrays only supported on SM5 and up.
@@ -991,10 +1009,15 @@ void FOpenGLDynamicRHI::RHIReadSurfaceFloatData(FTextureRHIParamRef TextureRHI,F
 	}
 
 	GetContextStateForCurrentContext().Framebuffer = (GLuint)-1;
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLDynamicRHI::RHIRead3DSurfaceFloatData(FTextureRHIParamRef TextureRHI,FIntRect Rect,FIntPoint ZMinMax,TArray<FFloat16Color>& OutData)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+
+	RHITHREAD_GLCOMMAND_PROLOGUE();
+
 	VERIFY_GL_SCOPE();
 
 	check( FOpenGL::SupportsFloatReadSurface() );
@@ -1047,6 +1070,8 @@ void FOpenGLDynamicRHI::RHIRead3DSurfaceFloatData(FTextureRHIParamRef TextureRHI
 	glDeleteFramebuffers( 1, &SourceFramebuffer);
 	FOpenGL::DeleteTextures( 1, &TempTexture );
 	ContextState.Framebuffer = (GLuint)-1;
+
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLShaders.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLShaders.cpp
index 51bc2db491d8..2ddbf27ec19b 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLShaders.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLShaders.cpp
@@ -22,6 +22,10 @@
 #endif
 #include "SceneUtils.h"
 
+#if PLATFORM_ANDROID
+bool GOpenGLShaderHackLastCompileSuccess = false;
+#endif
+
 // Create any resources that are required by internal ogl rhi functions.
 void FOpenGLDynamicRHI::SetupRecursiveResources()
 {
@@ -473,6 +477,7 @@ GLint CompileCurrentShader(const GLuint Resource, const FAnsiCharArray& GlslCode
 	if (FOpenGL::IsCheckingShaderCompilerHacks())
 	{
 		glGetShaderiv(Resource, GL_COMPILE_STATUS, &CompileStatus);
+		GOpenGLShaderHackLastCompileSuccess = (CompileStatus == GL_TRUE);
 	}
 #endif
 #if (PLATFORM_HTML5 || (PLATFORM_ANDROID && !PLATFORM_LUMINGL4) || PLATFORM_IOS) && !UE_BUILD_SHIPPING
@@ -504,12 +509,26 @@ GLint CompileCurrentShader(const GLuint Resource, const FAnsiCharArray& GlslCode
 	return CompileStatus;
 }
 
+// Set the shader hash for FRHIShaders only.
+template<typename TRHIType>
+static typename TEnableIf<TPointerIsConvertibleFromTo<TRHIType, const FRHIShader>::Value, void>::Type SetShaderHash(const FSHAHash& Hash, TRHIType* Shader)
+{
+	Shader->SetHash(Hash);
+}
+
+template<typename TRHIType>
+static typename TEnableIf<!TPointerIsConvertibleFromTo<TRHIType, const FRHIShader>::Value, void>::Type SetShaderHash(const FSHAHash& Hash, TRHIType* Shader)
+{
+	// Cannot set the shader hash on a non-FRHIShader type.
+	checkNoEntry();
+}
+
 /**
  * Compiles an OpenGL shader using the given GLSL microcode.
  * @returns the compiled shader upon success.
  */
 template <typename ShaderType>
-ShaderType* CompileOpenGLShader(const TArray<uint8>& InShaderCode)
+ShaderType* CompileOpenGLShader(const TArray<uint8>& InShaderCode, FRHIShader* RHIShader = nullptr)
 {
 	SCOPE_CYCLE_COUNTER(STAT_OpenGLShaderCompileTime);
 	VERIFY_GL_SCOPE();
@@ -644,7 +663,14 @@ ShaderType* CompileOpenGLShader(const TArray<uint8>& InShaderCode)
 		// Just use the CRC - if it isn't being cached & logged we'll be dependent on the CRC alone anyway
 		FSHAHash Hash;
 		FMemory::Memcpy(Hash.Hash, &GlslCodeOriginalCRC, sizeof(uint32));
-		Shader->SetHash(Hash);
+		if (RHIShader)
+		{
+			SetShaderHash(Hash, RHIShader);
+		}
+		else
+		{
+			SetShaderHash(Hash, Shader);
+		}
 	}
 
 #if DEBUG_GL_SHADERS
@@ -1170,31 +1196,53 @@ static ANSICHAR* SetIndex(ANSICHAR* Str, int32 Offset, int32 Index)
 	return Str;
 }
 
+template<typename RHIType, typename TOGLProxyType>
+RHIType* CreateProxyShader(const TArray<uint8>& Code)
+{
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
+	{
+		return new TOGLProxyType([&](RHIType* OwnerRHI)
+		{
+			return CompileOpenGLShader<typename TOGLProxyType::ContainedGLType>(Code, OwnerRHI);
+		});
+	}
+	else
+	{
+		// take a copy of the code for RHIT version.
+		TArray<uint8> CodeCopy = Code;
+		return new TOGLProxyType([Code = MoveTemp(CodeCopy)](RHIType* OwnerRHI)
+		{
+			return CompileOpenGLShader<typename TOGLProxyType::ContainedGLType>(Code, OwnerRHI);
+		});
+	}
+}
+
 FVertexShaderRHIRef FOpenGLDynamicRHI::RHICreateVertexShader(const TArray<uint8>& Code)
 {
-	return CompileOpenGLShader<FOpenGLVertexShader>(Code);
+	return CreateProxyShader<FRHIVertexShader, FOpenGLVertexShaderProxy>(Code);
 }
 
 FPixelShaderRHIRef FOpenGLDynamicRHI::RHICreatePixelShader(const TArray<uint8>& Code)
 {
-	return CompileOpenGLShader<FOpenGLPixelShader>(Code);
+	return CreateProxyShader<FRHIPixelShader, FOpenGLPixelShaderProxy>(Code);
 }
 
 FGeometryShaderRHIRef FOpenGLDynamicRHI::RHICreateGeometryShader(const TArray<uint8>& Code)
 {
-	return CompileOpenGLShader<FOpenGLGeometryShader>(Code);
+	return CreateProxyShader<FRHIGeometryShader, FOpenGLGeometryShaderProxy>(Code);
 }
 
 FHullShaderRHIRef FOpenGLDynamicRHI::RHICreateHullShader(const TArray<uint8>& Code)
 {
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
-	return CompileOpenGLShader<FOpenGLHullShader>(Code);
+	return CreateProxyShader<FRHIHullShader, FOpenGLHullShaderProxy>(Code);
 }
 
 FDomainShaderRHIRef FOpenGLDynamicRHI::RHICreateDomainShader(const TArray<uint8>& Code)
 {
 	check(GMaxRHIFeatureLevel >= ERHIFeatureLevel::SM5);
-	return CompileOpenGLShader<FOpenGLDomainShader>(Code);
+	return CreateProxyShader<FRHIDomainShader, FOpenGLDomainShaderProxy>(Code);
 }
 
 FGeometryShaderRHIRef FOpenGLDynamicRHI::RHICreateGeometryShaderWithStreamOutput(const TArray<uint8>& Code, const FStreamOutElementList& ElementList, uint32 NumStrides, const uint32* Strides, int32 RasterizedStream) 
@@ -1206,6 +1254,7 @@ FGeometryShaderRHIRef FOpenGLDynamicRHI::RHICreateGeometryShaderWithStreamOutput
 
 static void MarkShaderParameterCachesDirty(FOpenGLShaderParameterCache* ShaderParameters, bool UpdateCompute)
 {
+	VERIFY_GL_SCOPE();
 	const int32 StageStart = UpdateCompute  ? CrossCompiler::SHADER_STAGE_COMPUTE : CrossCompiler::SHADER_STAGE_VERTEX;
 	const int32 StageEnd = UpdateCompute ? CrossCompiler::NUM_SHADER_STAGES : CrossCompiler::NUM_NON_COMPUTE_SHADER_STAGES;
 	for (int32 Stage = StageStart; Stage < StageEnd; ++Stage)
@@ -1362,9 +1411,9 @@ public:
 	bool		bUsingTessellation;
 	bool		bDrawn;
 
+	int32		MaxTextureStage;
 	TBitArray<>	TextureStageNeeds;
 	TBitArray<>	UAVStageNeeds;
-	int32		MaxTextureStage;
 
 	TArray<FOpenGLBindlessSamplerInfo> Samplers;
 
@@ -1377,6 +1426,7 @@ public:
 
 	~FOpenGLLinkedProgram()
 	{
+		VERIFY_GL_SCOPE();
 		check(Program);
 		FOpenGL::DeleteProgramPipelines(1, &Program);
 		
@@ -1447,10 +1497,11 @@ static int32 CountSetBits(const TBitArray<>& Array)
 	return Result;
 }
 
-void FOpenGLLinkedProgram::VerifyUniformBlockBindings( int Stage, uint32 FirstUniformBuffer )
+FORCEINLINE_DEBUGGABLE void FOpenGLLinkedProgram::VerifyUniformBlockBindings( int Stage, uint32 FirstUniformBuffer )
 {
 	if ( FOpenGL::SupportsSeparateShaderObjects() && FOpenGL::SupportsUniformBuffers() )
 	{
+		VERIFY_GL_SCOPE();
 		FOpenGLUniformName Name;
 		Name.Buffer[0] = CrossCompiler::ShaderStageIndexToTypeName(Stage);
 		Name.Buffer[1] = 'b';
@@ -2178,7 +2229,7 @@ static FOpenGLSeparateShaderObjectCache& GetOpenGLSeparateShaderObjectCache()
 }
 
 template<class TOpenGLStage0, class TOpenGLStage1>
-static void BindShaderStage(FOpenGLLinkedProgramConfiguration::ShaderInfo& ShaderInfo, TOpenGLStage0* NextStage, FOpenGLLinkedProgramConfiguration::ShaderInfo& PrevInfo, TOpenGLStage1* PrevStage)
+static void BindShaderStage(FOpenGLLinkedProgramConfiguration::ShaderInfo& ShaderInfo, TOpenGLStage0* NextStage, const FSHAHash& NextStageHash, FOpenGLLinkedProgramConfiguration::ShaderInfo& PrevInfo, TOpenGLStage1* PrevStage)
 {
 	check(NextStage && PrevStage);
 	
@@ -2386,7 +2437,7 @@ static void BindShaderStage(FOpenGLLinkedProgramConfiguration::ShaderInfo& Shade
 	
 	ShaderInfo.Bindings = NextStageBindings;
 	ShaderInfo.Resource = NextStageResource;
-	ShaderInfo.Hash = NextStage->GetHash();
+	ShaderInfo.Hash = NextStageHash;
 }
 
 // ============================================================================================================================
@@ -2443,47 +2494,47 @@ FBoundShaderStateRHIRef FOpenGLDynamicRHI::RHICreateBoundShaderState_OnThisThrea
 		// Fill-in the configuration
 		Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX].Bindings = VertexShader->Bindings;
 		Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX].Resource = VertexShader->Resource;
-		Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX].Hash = VertexShader->GetHash();
+		Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX].Hash = VertexShaderRHI->GetHash();
 		
 		if ( FOpenGL::SupportsTessellation())
 		{
 			if ( HullShader)
 			{
 				check(VertexShader);
-				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_HULL], HullShader, Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
+				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_HULL], HullShader, HullShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
 			}
 			if ( DomainShader)
 			{
 				check(HullShader);
-				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader, Config.Shaders[CrossCompiler::SHADER_STAGE_HULL], HullShader);
+				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader, DomainShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_HULL], HullShader);
 			}
 		}
-		
+        
 		if (GeometryShader)
 		{
 			check(DomainShader || VertexShader);
 			if ( DomainShader )
 			{
-				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader, Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader);
+				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader, GeometryShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader);
 			}
 			else
 			{
-				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader, Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
+				BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader, GeometryShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
 			}
 		}
 		
 		check(DomainShader || GeometryShader || VertexShader);
 		if ( DomainShader )
 		{
-			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader);
+			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, PixelShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_DOMAIN], DomainShader);
 		}
 		else if ( GeometryShader )
 		{
-			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader);
+			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, PixelShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_GEOMETRY], GeometryShader);
 		}
 		else
 		{
-			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
+			BindShaderStage(Config.Shaders[CrossCompiler::SHADER_STAGE_PIXEL], PixelShader, PixelShaderRHI->GetHash(), Config.Shaders[CrossCompiler::SHADER_STAGE_VERTEX], VertexShader);
 		}
 
 		// Check if we already have such a program in released programs cache. Use it, if we do.
@@ -2559,6 +2610,7 @@ FBoundShaderStateRHIRef FOpenGLDynamicRHI::RHICreateBoundShaderState_OnThisThrea
 				// Make sure we have OpenGL context set up, and invalidate the parameters cache and current program (as we'll link a new one soon)
 				GetContextStateForCurrentContext().Program = -1;
 				MarkShaderParameterCachesDirty(PendingState.ShaderParameters, false);
+				PendingState.LinkedProgramAndDirtyFlag = nullptr;
 
 				// Link program, using the data provided in config
 				LinkedProgram = LinkProgram(Config);
@@ -2628,6 +2680,7 @@ PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 void DestroyShadersAndPrograms()
 {
+	VERIFY_GL_SCOPE();
 	GetOpenGLUniformBlockLocations().Empty();
 	GetOpenGLUniformBlockBindings().Empty();
 	
@@ -2673,6 +2726,7 @@ void FOpenGLDynamicRHI::SetupBindlessTextures( FOpenGLContextState& ContextState
 	{
 		return;
 	}
+	VERIFY_GL_SCOPE();
 
 	// Bind all textures via Bindless
 	for (int32 Texture = 0; Texture < Samplers.Num(); Texture++)
@@ -2714,6 +2768,7 @@ void FOpenGLDynamicRHI::SetupBindlessTextures( FOpenGLContextState& ContextState
 	}
 }
 
+
 void FOpenGLDynamicRHI::BindPendingShaderState( FOpenGLContextState& ContextState )
 {
 	SCOPE_CYCLE_COUNTER_DETAILED(STAT_OpenGLShaderBindTime);
@@ -2728,6 +2783,8 @@ void FOpenGLDynamicRHI::BindPendingShaderState( FOpenGLContextState& ContextStat
 		ContextState.Program = PendingProgram;
 		ContextState.bUsingTessellation = PendingState.BoundShaderState->LinkedProgram->bUsingTessellation;
 		MarkShaderParameterCachesDirty(PendingState.ShaderParameters, false);
+		PendingState.LinkedProgramAndDirtyFlag = nullptr;
+
 		//Disable the forced rebinding to reduce driver overhead - required by SSOs
 		ForceUniformBindingUpdate = FOpenGL::SupportsSeparateShaderObjects();
 	}
@@ -2736,64 +2793,67 @@ void FOpenGLDynamicRHI::BindPendingShaderState( FOpenGLContextState& ContextStat
 	{
 		int32 NextUniformBufferIndex = OGL_FIRST_UNIFORM_BUFFER;
 
-		int32 NumVertexUniformBuffers = PendingState.BoundShaderState->VertexShader->Bindings.NumUniformBuffers;
+		static_assert(SF_Compute == 5 && SF_NumFrequencies == 6, "Unexpected SF_ ordering");
+		int32 NumUniformBuffers[SF_Compute];
+
+		PendingState.BoundShaderState->GetNumUniformBuffers(NumUniformBuffers);
+			
 		PendingState.BoundShaderState->LinkedProgram->VerifyUniformBlockBindings(CrossCompiler::SHADER_STAGE_VERTEX, NextUniformBufferIndex);
+
 		BindUniformBufferBase(
 			ContextState,
-			NumVertexUniformBuffers,
+			NumUniformBuffers[SF_Vertex],
 			PendingState.BoundUniformBuffers[SF_Vertex],
 			NextUniformBufferIndex,
 			ForceUniformBindingUpdate);
-		NextUniformBufferIndex += NumVertexUniformBuffers;
+		NextUniformBufferIndex += NumUniformBuffers[SF_Vertex];
 
-		int32 NumPixelUniformBuffers = PendingState.BoundShaderState->PixelShader->Bindings.NumUniformBuffers;
 		PendingState.BoundShaderState->LinkedProgram->VerifyUniformBlockBindings(CrossCompiler::SHADER_STAGE_PIXEL, NextUniformBufferIndex);
 		BindUniformBufferBase(
 			ContextState,
-			NumPixelUniformBuffers,
+			NumUniformBuffers[SF_Pixel],
 			PendingState.BoundUniformBuffers[SF_Pixel],
 			NextUniformBufferIndex,
 			ForceUniformBindingUpdate);
-		NextUniformBufferIndex += NumPixelUniformBuffers;
+		NextUniformBufferIndex += NumUniformBuffers[SF_Pixel];
 
-		if (PendingState.BoundShaderState->GeometryShader)
+		if (NumUniformBuffers[SF_Geometry] >= 0)
 		{
-			int32 NumGeometryUniformBuffers = PendingState.BoundShaderState->GeometryShader->Bindings.NumUniformBuffers;
 			PendingState.BoundShaderState->LinkedProgram->VerifyUniformBlockBindings(CrossCompiler::SHADER_STAGE_GEOMETRY, NextUniformBufferIndex);
 			BindUniformBufferBase(
 				ContextState,
-				NumGeometryUniformBuffers,
+				NumUniformBuffers[SF_Geometry],
 				PendingState.BoundUniformBuffers[SF_Geometry],
 				NextUniformBufferIndex,
 				ForceUniformBindingUpdate);
-			NextUniformBufferIndex += NumGeometryUniformBuffers;
+			NextUniformBufferIndex += NumUniformBuffers[SF_Geometry];
 		}
 
-		if (PendingState.BoundShaderState->HullShader)
+		if (NumUniformBuffers[SF_Hull] >= 0)
 		{
-			int32 NumHullUniformBuffers = PendingState.BoundShaderState->HullShader->Bindings.NumUniformBuffers;
 			PendingState.BoundShaderState->LinkedProgram->VerifyUniformBlockBindings(CrossCompiler::SHADER_STAGE_HULL, NextUniformBufferIndex);
 			BindUniformBufferBase(ContextState,
-				NumHullUniformBuffers,
+				NumUniformBuffers[SF_Hull],
 				PendingState.BoundUniformBuffers[SF_Hull],
 				NextUniformBufferIndex,
 				ForceUniformBindingUpdate);
-			NextUniformBufferIndex += NumHullUniformBuffers;
+			NextUniformBufferIndex += NumUniformBuffers[SF_Hull];
 		}
 
-		if (PendingState.BoundShaderState->DomainShader)
+		if (NumUniformBuffers[SF_Domain] >= 0)
 		{
-			int32 NumDomainUniformBuffers = PendingState.BoundShaderState->DomainShader->Bindings.NumUniformBuffers;
 			PendingState.BoundShaderState->LinkedProgram->VerifyUniformBlockBindings(CrossCompiler::SHADER_STAGE_DOMAIN, NextUniformBufferIndex);
 			BindUniformBufferBase(ContextState,
-				NumDomainUniformBuffers,
+				NumUniformBuffers[SF_Domain],
 				PendingState.BoundUniformBuffers[SF_Domain],
 				NextUniformBufferIndex,
 				ForceUniformBindingUpdate);
-			NextUniformBufferIndex += NumDomainUniformBuffers;
+			NextUniformBufferIndex += NumUniformBuffers[SF_Domain];
+		}
+		if (FOpenGL::SupportsBindlessTexture())
+		{
+			SetupBindlessTextures(ContextState, PendingState.BoundShaderState->LinkedProgram->Samplers);
 		}
-
-		SetupBindlessTextures( ContextState, PendingState.BoundShaderState->LinkedProgram->Samplers );
 	}
 }
 
@@ -2810,19 +2870,12 @@ FOpenGLBoundShaderState::FOpenGLBoundShaderState(
 		InHullShaderRHI, InDomainShaderRHI,	InGeometryShaderRHI, this)
 {
 	FOpenGLVertexDeclaration* InVertexDeclaration = FOpenGLDynamicRHI::ResourceCast(InVertexDeclarationRHI);
-	FOpenGLVertexShader* InVertexShader = FOpenGLDynamicRHI::ResourceCast(InVertexShaderRHI);
-	FOpenGLPixelShader* InPixelShader = FOpenGLDynamicRHI::ResourceCast(InPixelShaderRHI);
-	FOpenGLHullShader* InHullShader = FOpenGLDynamicRHI::ResourceCast(InHullShaderRHI);
-	FOpenGLDomainShader* InDomainShader = FOpenGLDynamicRHI::ResourceCast(InDomainShaderRHI);
-	FOpenGLGeometryShader* InGeometryShader = FOpenGLDynamicRHI::ResourceCast(InGeometryShaderRHI);
-
 	VertexDeclaration = InVertexDeclaration;
-	VertexShader = InVertexShader;
-	PixelShader = InPixelShader;
-	GeometryShader = InGeometryShader;
-
-	HullShader = InHullShader;
-	DomainShader = InDomainShader;
+	VertexShaderProxy = static_cast<FOpenGLVertexShaderProxy*>(InVertexShaderRHI);
+	PixelShaderProxy = static_cast<FOpenGLPixelShaderProxy*>(InPixelShaderRHI);
+	GeometryShaderProxy = static_cast<FOpenGLGeometryShaderProxy*>(InGeometryShaderRHI);
+	HullShaderProxy = static_cast<FOpenGLHullShaderProxy*>(InHullShaderRHI);
+	DomainShaderProxy = static_cast<FOpenGLDomainShaderProxy*>(InDomainShaderRHI);
 
 	LinkedProgram = InLinkedProgram;
 
@@ -2839,13 +2892,16 @@ FOpenGLBoundShaderState::FOpenGLBoundShaderState(
 FOpenGLBoundShaderState::~FOpenGLBoundShaderState()
 {
 	check(LinkedProgram);
-	FOpenGLLinkedProgram* Prog = StaticLastReleasedPrograms[StaticLastReleasedProgramsIndex];
-	StaticLastReleasedPrograms[StaticLastReleasedProgramsIndex++] = LinkedProgram;
-	if (StaticLastReleasedProgramsIndex == LAST_RELEASED_PROGRAMS_CACHE_COUNT)
+	RunOnGLRenderContextThread([LinkedProgram = LinkedProgram]()
 	{
-		StaticLastReleasedProgramsIndex = 0;
-	}
-	OnProgramDeletion(LinkedProgram->Program);
+		FOpenGLLinkedProgram* Prog = StaticLastReleasedPrograms[StaticLastReleasedProgramsIndex];
+		StaticLastReleasedPrograms[StaticLastReleasedProgramsIndex++] = LinkedProgram;
+		if (StaticLastReleasedProgramsIndex == LAST_RELEASED_PROGRAMS_CACHE_COUNT)
+		{
+			StaticLastReleasedProgramsIndex = 0;
+		}
+		OnProgramDeletion(LinkedProgram->Program);
+	});
 }
 
 bool FOpenGLBoundShaderState::NeedsTextureStage(int32 TextureStageIndex)
@@ -2858,6 +2914,38 @@ int32 FOpenGLBoundShaderState::MaxTextureStageUsed()
 	return LinkedProgram->MaxTextureStage;
 }
 
+const TBitArray<>& FOpenGLBoundShaderState::GetTextureNeeds(int32& OutMaxTextureStageUsed)
+{
+	OutMaxTextureStageUsed = LinkedProgram->MaxTextureStage;
+	return LinkedProgram->TextureStageNeeds;
+}
+
+void FOpenGLBoundShaderState::GetNumUniformBuffers(int32 NumUniformBuffers[SF_Compute])
+{
+	if (IsRunningRHIInSeparateThread())
+	{
+		// fast path, no need to check any fences....
+		check(IsInRHIThread());
+		check(IsValidRef(VertexShaderProxy) && IsValidRef(PixelShaderProxy));
+
+
+		NumUniformBuffers[SF_Vertex] = VertexShaderProxy->GetGLResourceObject_OnRHIThread()->Bindings.NumUniformBuffers;
+		NumUniformBuffers[SF_Pixel] = PixelShaderProxy->GetGLResourceObject_OnRHIThread()->Bindings.NumUniformBuffers;
+		NumUniformBuffers[SF_Geometry] = GeometryShaderProxy ? GeometryShaderProxy->GetGLResourceObject_OnRHIThread()->Bindings.NumUniformBuffers : -1;
+		NumUniformBuffers[SF_Hull] = HullShaderProxy ? HullShaderProxy->GetGLResourceObject_OnRHIThread()->Bindings.NumUniformBuffers : -1;
+		NumUniformBuffers[SF_Domain] = DomainShaderProxy ? DomainShaderProxy->GetGLResourceObject_OnRHIThread()->Bindings.NumUniformBuffers : -1;
+	}
+	else
+	{
+		NumUniformBuffers[SF_Vertex] = VertexShaderProxy->GetGLResourceObject()->Bindings.NumUniformBuffers;
+		NumUniformBuffers[SF_Pixel] = PixelShaderProxy->GetGLResourceObject()->Bindings.NumUniformBuffers;
+		NumUniformBuffers[SF_Geometry] = GeometryShaderProxy ? GeometryShaderProxy->GetGLResourceObject()->Bindings.NumUniformBuffers : -1;
+		NumUniformBuffers[SF_Hull] = HullShaderProxy ? HullShaderProxy->GetGLResourceObject()->Bindings.NumUniformBuffers : -1;
+		NumUniformBuffers[SF_Domain] = DomainShaderProxy ? DomainShaderProxy->GetGLResourceObject()->Bindings.NumUniformBuffers : -1;
+	}
+}
+
+
 bool FOpenGLBoundShaderState::RequiresDriverInstantiation()
 {
 	check(LinkedProgram);
@@ -2876,6 +2964,12 @@ int32 FOpenGLComputeShader::MaxTextureStageUsed()
 	return LinkedProgram->MaxTextureStage;
 }
 
+const TBitArray<>& FOpenGLComputeShader::GetTextureNeeds(int32& OutMaxTextureStageUsed)
+{
+	OutMaxTextureStageUsed = LinkedProgram->MaxTextureStage;
+	return LinkedProgram->TextureStageNeeds;
+}
+
 bool FOpenGLComputeShader::NeedsUAVStage(int32 UAVStageIndex)
 {
 	return LinkedProgram->UAVStageNeeds[UAVStageIndex];
@@ -2893,6 +2987,7 @@ void FOpenGLDynamicRHI::BindPendingComputeShaderState(FOpenGLContextState& Conte
 		FOpenGL::BindProgramPipeline(PendingProgram);
 		ContextState.Program = PendingProgram;
 		MarkShaderParameterCachesDirty(PendingState.ShaderParameters, true);
+		PendingState.LinkedProgramAndDirtyFlag = nullptr;
 		ForceUniformBindingUpdate = true;
 	}
 
@@ -2910,8 +3005,8 @@ void FOpenGLDynamicRHI::BindPendingComputeShaderState(FOpenGLContextState& Conte
 }
 
 /** Constructor. */
-FOpenGLShaderParameterCache::FOpenGLShaderParameterCache() :
-	GlobalUniformArraySize(-1)
+FOpenGLShaderParameterCache::FOpenGLShaderParameterCache() 
+	: GlobalUniformArraySize(-1)
 {
 	for (int32 ArrayIndex = 0; ArrayIndex < CrossCompiler::PACKED_TYPEINDEX_MAX; ++ArrayIndex)
 	{
@@ -2990,6 +3085,8 @@ void FOpenGLShaderParameterCache::Set(uint32 BufferIndexName, uint32 ByteOffset,
  * Commit shader parameters to the currently bound program.
  * @param ParameterTable - Information on the bound uniform arrays for the program.
  */
+
+
 void FOpenGLShaderParameterCache::CommitPackedGlobals(const FOpenGLLinkedProgram* LinkedProgram, int32 Stage)
 {
 	SCOPE_CYCLE_COUNTER(STAT_OpenGLUniformCommitTime);
@@ -3014,25 +3111,19 @@ void FOpenGLShaderParameterCache::CommitPackedGlobals(const FOpenGLLinkedProgram
 	for (int32 PackedUniform = 0; PackedUniform < PackedUniforms.Num(); ++PackedUniform)
 	{
 		const FOpenGLLinkedProgram::FPackedUniformInfo& UniformInfo = PackedUniforms[PackedUniform];
-		if (UniformInfo.Location < 0)
-		{
-			// Probably this uniform array was optimized away in a linked program
-			continue;
-		}
-		
-		const uint32 ArrayIndex = UniformInfo.Index;
-		check(ArrayIndex < CrossCompiler::PACKED_TYPEINDEX_MAX);
-		const int32 NumVectors = PackedArrays[PackedUniform].Size / BytesPerRegister;
 		GLint Location = UniformInfo.Location;
-		const void* UniformData = PackedGlobalUniforms[ArrayIndex];
+		const uint32 ArrayIndex = UniformInfo.Index;
+		if (Location >= 0 && // Probably this uniform array was optimized away in a linked program
+			PackedGlobalUniformDirty[ArrayIndex].NumVectors > 0)
+		{			
+			check(ArrayIndex < CrossCompiler::PACKED_TYPEINDEX_MAX);
+			const uint32 NumVectors = PackedArrays[PackedUniform].Size / BytesPerRegister;
+			const void* UniformData = PackedGlobalUniforms[ArrayIndex];
 
-		// This has to be >=. If LowVector == HighVector it means that particular vector was written to.
-		if (PackedGlobalUniformDirty[ArrayIndex].NumVectors > 0)
-		{
-			const int32 StartVector = PackedGlobalUniformDirty[ArrayIndex].StartVector;
-			int32 NumDirtyVectors = FMath::Min((int32)PackedGlobalUniformDirty[ArrayIndex].NumVectors, NumVectors - StartVector);
+			const uint32 StartVector = PackedGlobalUniformDirty[ArrayIndex].StartVector;
+			int32 NumDirtyVectors = FMath::Min(PackedGlobalUniformDirty[ArrayIndex].NumVectors, NumVectors - StartVector);
 			check(NumDirtyVectors);
-			UniformData = (uint8*)UniformData + StartVector * SizeOfFloat4;
+			UniformData = (uint8*)UniformData + StartVector * sizeof(float) * 4;
 			Location += StartVector;
 			switch (UniformInfo.Index)
 			{
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLState.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLState.cpp
index ad76251fea88..249e8a4d55f4 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLState.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLState.cpp
@@ -87,6 +87,38 @@ static GLenum TranslateFillMode(ERasterizerFillMode FillMode)
 	return GL_FILL;
 }
 
+static ERasterizerCullMode TranslateCullMode(GLenum CullMode)
+{
+	if (FOpenGL::SupportsClipControl())
+	{
+		switch(CullMode)
+		{
+			case GL_BACK: return CM_CW;
+			case GL_FRONT: return CM_CCW;
+			default: return CM_None;	
+		}
+	}
+	else
+	{
+		switch(CullMode)
+		{
+			case GL_FRONT: return CM_CW;
+			case GL_BACK: return CM_CCW;
+			default: return CM_None;	
+		}
+	}
+}
+
+static ERasterizerFillMode TranslateFillMode(GLenum FillMode)
+{
+	switch(FillMode)
+	{
+		case GL_POINT: return FM_Point;
+		case GL_LINE: return FM_Wireframe;
+		default: return FM_Solid;
+	}
+}
+
 static GLenum TranslateCompareFunction(ECompareFunction CompareFunction)
 {
 	switch(CompareFunction)
@@ -117,6 +149,36 @@ static GLenum TranslateStencilOp(EStencilOp StencilOp)
 	};
 }
 
+static ECompareFunction TranslateCompareFunction(GLenum CompareFunction)
+{
+	switch(CompareFunction)
+	{
+	case GL_LESS: return CF_Less;
+	case GL_LEQUAL: return CF_LessEqual;
+	case GL_GREATER: return CF_Greater;
+	case GL_GEQUAL: return CF_GreaterEqual;
+	case GL_EQUAL: return CF_Equal;
+	case GL_NOTEQUAL: return CF_NotEqual;
+	case GL_NEVER: return CF_Never;
+	default: return CF_Always;
+	};
+}
+
+static EStencilOp TranslateStencilOp(GLenum StencilOp)
+{
+	switch(StencilOp)
+	{
+	case GL_ZERO: return SO_Zero;
+	case GL_REPLACE: return SO_Replace;
+	case GL_INCR: return SO_SaturatedIncrement;
+	case GL_DECR: return SO_SaturatedDecrement;
+	case GL_INVERT: return SO_Invert;
+	case GL_INCR_WRAP: return SO_Increment;
+	case GL_DECR_WRAP: return SO_Decrement;
+	default: return SO_Keep;
+	};
+}
+
 static GLenum TranslateBlendOp(EBlendOperation BlendOp)
 {
 	switch(BlendOp)
@@ -148,6 +210,37 @@ static GLenum TranslateBlendFactor(EBlendFactor BlendFactor)
 	};
 }
 
+static EBlendOperation TranslateBlendOp(GLenum BlendOp)
+{
+	switch(BlendOp)
+	{
+	case GL_FUNC_SUBTRACT: return BO_Subtract;
+	case GL_MIN: return BO_Min;
+	case GL_MAX: return BO_Max;
+	case GL_FUNC_REVERSE_SUBTRACT: return BO_ReverseSubtract;
+	default: return BO_Add;
+	};
+}
+
+static EBlendFactor TranslateBlendFactor(GLenum BlendFactor)
+{
+	switch(BlendFactor)
+	{
+	case GL_ONE: return BF_One;
+	case GL_SRC_COLOR: return BF_SourceColor;
+	case GL_ONE_MINUS_SRC_COLOR: return BF_InverseSourceColor;
+	case GL_SRC_ALPHA: return BF_SourceAlpha;
+	case GL_ONE_MINUS_SRC_ALPHA: return BF_InverseSourceAlpha;
+	case GL_DST_ALPHA: return BF_DestAlpha;
+	case GL_ONE_MINUS_DST_ALPHA: return BF_InverseDestAlpha;
+	case GL_DST_COLOR: return BF_DestColor;
+	case GL_ONE_MINUS_DST_COLOR: return BF_InverseDestColor;
+	case GL_CONSTANT_COLOR: return BF_ConstantBlendFactor;
+	case GL_ONE_MINUS_CONSTANT_COLOR: return BF_InverseConstantBlendFactor;
+	default: return BF_Zero;
+	};
+}
+
 FOpenGLSamplerState::~FOpenGLSamplerState()
 {
 	CreationFence.WaitFence();
@@ -290,6 +383,16 @@ FRasterizerStateRHIRef FOpenGLDynamicRHI::RHICreateRasterizerState(const FRaster
 	return RasterizerState;
 }
 
+bool FOpenGLRasterizerState::GetInitializer(FRasterizerStateInitializerRHI& Init)
+{
+	FMemory::Memzero(Init);
+	Init.CullMode = TranslateCullMode(Data.CullMode);
+	Init.FillMode = TranslateFillMode(Data.FillMode);
+	Init.DepthBias = Data.DepthBias;
+	Init.SlopeScaleDepthBias = Data.SlopeScaleDepthBias;
+	return true;
+}
+
 FDepthStencilStateRHIRef FOpenGLDynamicRHI::RHICreateDepthStencilState(const FDepthStencilStateInitializerRHI& Initializer)
 {
 	FOpenGLDepthStencilState* DepthStencilState = new FOpenGLDepthStencilState;
@@ -313,6 +416,59 @@ FDepthStencilStateRHIRef FOpenGLDynamicRHI::RHICreateDepthStencilState(const FDe
 	return DepthStencilState;
 }
 
+bool FOpenGLDepthStencilState::GetInitializer(FDepthStencilStateInitializerRHI& Init)
+{
+	Init.bEnableBackFaceStencil = Data.bTwoSidedStencilMode;
+	Init.bEnableFrontFaceStencil = Data.bStencilEnable;
+	Init.bEnableDepthWrite = Data.bZWriteEnable;
+	Init.StencilReadMask = Data.StencilReadMask;
+	Init.StencilWriteMask = Data.StencilWriteMask;
+	Init.DepthTest = TranslateCompareFunction(Data.ZFunc);
+	Init.FrontFaceStencilTest = TranslateCompareFunction(Data.StencilFunc);
+	Init.FrontFaceStencilFailStencilOp = TranslateStencilOp(Data.StencilFail);
+	Init.FrontFaceDepthFailStencilOp = TranslateStencilOp(Data.StencilZFail);
+	Init.FrontFacePassStencilOp = TranslateStencilOp(Data.StencilPass);
+	Init.BackFaceStencilTest = TranslateCompareFunction(Data.CCWStencilFunc);
+	Init.BackFaceStencilFailStencilOp = TranslateStencilOp(Data.CCWStencilFail);
+	Init.BackFaceDepthFailStencilOp = TranslateStencilOp(Data.CCWStencilZFail);
+	Init.BackFacePassStencilOp = TranslateStencilOp(Data.CCWStencilPass);
+	return true;
+}
+
+bool FOpenGLBlendState::GetInitializer(FBlendStateInitializerRHI& Init)
+{
+	Init.bUseIndependentRenderTargetBlendStates = true;
+	for(uint32 RenderTargetIndex = 0;RenderTargetIndex < MaxSimultaneousRenderTargets;++RenderTargetIndex)
+	{
+		FOpenGLBlendStateData::FRenderTarget const& RenderTarget = Data.RenderTargets[RenderTargetIndex];
+		FBlendStateInitializerRHI::FRenderTarget& RenderTargetInitializer = Init.RenderTargets[RenderTargetIndex];
+		
+		RenderTargetInitializer.ColorBlendOp = TranslateBlendOp(RenderTarget.ColorBlendOperation);
+		RenderTargetInitializer.ColorSrcBlend = TranslateBlendFactor(RenderTarget.ColorSourceBlendFactor);
+		RenderTargetInitializer.ColorDestBlend = TranslateBlendFactor(RenderTarget.ColorDestBlendFactor);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.ColorBlendOp == Init.RenderTargets[0].ColorBlendOp);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.ColorSrcBlend == Init.RenderTargets[0].ColorSrcBlend);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.ColorDestBlend == Init.RenderTargets[0].ColorDestBlend);
+		
+		RenderTargetInitializer.AlphaBlendOp = TranslateBlendOp(RenderTarget.AlphaBlendOperation);
+		RenderTargetInitializer.AlphaSrcBlend = TranslateBlendFactor(RenderTarget.AlphaSourceBlendFactor);
+		RenderTargetInitializer.AlphaDestBlend = TranslateBlendFactor(RenderTarget.AlphaDestBlendFactor);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.AlphaBlendOp == Init.RenderTargets[0].AlphaBlendOp);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.AlphaSrcBlend == Init.RenderTargets[0].AlphaSrcBlend);
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.AlphaDestBlend == Init.RenderTargets[0].AlphaDestBlend);
+		
+		uint32 Mask = CW_NONE;
+		Mask |= (RenderTarget.ColorWriteMaskR) ? CW_RED : 0;
+		Mask |= (RenderTarget.ColorWriteMaskG) ? CW_GREEN : 0;
+		Mask |= (RenderTarget.ColorWriteMaskB) ? CW_BLUE : 0;
+		Mask |= (RenderTarget.ColorWriteMaskA) ? CW_ALPHA : 0;
+		RenderTargetInitializer.ColorWriteMask = (EColorWriteMask)Mask;
+		
+		Init.bUseIndependentRenderTargetBlendStates &= (RenderTargetInitializer.ColorWriteMask == Init.RenderTargets[0].ColorWriteMask);
+	}
+	return true;
+}
+
 FBlendStateRHIRef FOpenGLDynamicRHI::RHICreateBlendState(const FBlendStateInitializerRHI& Initializer)
 {
 	FOpenGLBlendState* BlendState = new FOpenGLBlendState;
@@ -361,6 +517,7 @@ void FOpenGLRHIState::InitializeResources(int32 NumCombinedTextures, int32 NumCo
 		ShaderParameters[CrossCompiler::SHADER_STAGE_DOMAIN].InitializeResources(FOpenGL::GetMaxDomainUniformComponents() * 4 * sizeof(float));
 	}
 
+	LinkedProgramAndDirtyFlag = nullptr;
 	if ( FOpenGL::SupportsComputeShaders() )
 	{
 		ShaderParameters[CrossCompiler::SHADER_STAGE_COMPUTE].InitializeResources(FOpenGL::GetMaxComputeUniformComponents() * 4 * sizeof(float));
@@ -370,4 +527,5 @@ void FOpenGLRHIState::InitializeResources(int32 NumCombinedTextures, int32 NumCo
 	{
 		DirtyUniformBuffers[Frequency] = MAX_uint16;
 	}
+	bAnyDirtyGraphicsUniformBuffers = true;
 }
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLTexture.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLTexture.cpp
index 5f01b4f11cd3..51fb25c0c598 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLTexture.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLTexture.cpp
@@ -47,6 +47,11 @@ void OpenGLTextureAllocated(FRHITexture* Texture, uint32 Flags)
 
 	if (( TextureCube = (FOpenGLTextureCube*)Texture->GetTextureCube()) != NULL)
 	{
+		if (TextureCube->IsMemorySizeSet())
+		{
+			return; // already set this up on RT
+		}
+
 		TextureSize = CalcTextureSize( TextureCube->GetSize(), TextureCube->GetSize(), TextureCube->GetFormat(), TextureCube->GetNumMips() );
 		TextureSize *= TextureCube->GetArraySize() * (TextureCube->GetArraySize() == 1 ? 6 : 1);
 		TextureCube->SetMemorySize( TextureSize );
@@ -62,6 +67,10 @@ void OpenGLTextureAllocated(FRHITexture* Texture, uint32 Flags)
 	}
 	else if ((Texture2D = (FOpenGLTexture2D*)Texture->GetTexture2D()) != NULL)
 	{
+		if (Texture2D->IsMemorySizeSet())
+		{
+			return; // already set this up on RT
+		}
 		TextureSize = CalcTextureSize( Texture2D->GetSizeX(), Texture2D->GetSizeY(), Texture2D->GetFormat(), Texture2D->GetNumMips() )*Texture2D->GetNumSamples();
 		Texture2D->SetMemorySize( TextureSize );
 		Texture2D->SetIsPowerOfTwo(FMath::IsPowerOfTwo(Texture2D->GetSizeX()) && FMath::IsPowerOfTwo(Texture2D->GetSizeY()));
@@ -76,6 +85,10 @@ void OpenGLTextureAllocated(FRHITexture* Texture, uint32 Flags)
 	}
 	else if ((Texture3D = (FOpenGLTexture3D*)Texture->GetTexture3D()) != NULL)
 	{
+		if (Texture3D->IsMemorySizeSet())
+		{
+			return; // already set this up on RT
+		}
 		TextureSize = CalcTextureSize3D( Texture3D->GetSizeX(), Texture3D->GetSizeY(), Texture3D->GetSizeZ(), Texture3D->GetFormat(), Texture3D->GetNumMips() );
 		Texture3D->SetMemorySize( TextureSize );
 		Texture3D->SetIsPowerOfTwo(FMath::IsPowerOfTwo(Texture3D->GetSizeX()) && FMath::IsPowerOfTwo(Texture3D->GetSizeY()) && FMath::IsPowerOfTwo(Texture3D->GetSizeZ()));
@@ -90,6 +103,10 @@ void OpenGLTextureAllocated(FRHITexture* Texture, uint32 Flags)
 	}
 	else if ((Texture2DArray = (FOpenGLTexture2DArray*)Texture->GetTexture2DArray()) != NULL)
 	{
+		if (Texture2DArray->IsMemorySizeSet())
+		{
+			return; // already set this up on RT
+		}
 		TextureSize = Texture2DArray->GetSizeZ() * CalcTextureSize( Texture2DArray->GetSizeX(), Texture2DArray->GetSizeY(), Texture2DArray->GetFormat(), Texture2DArray->GetNumMips() );
 		Texture2DArray->SetMemorySize( TextureSize );
 		Texture2DArray->SetIsPowerOfTwo(FMath::IsPowerOfTwo(Texture2DArray->GetSizeX()) && FMath::IsPowerOfTwo(Texture2DArray->GetSizeY()));
@@ -344,15 +361,19 @@ FRHITexture* FOpenGLDynamicRHI::CreateOpenGLRHITextureOnly(const uint32 SizeX, c
 	}
 	check(Target != GL_NONE);
 
+
+	FRHITexture* Result;
 	// Allocate RHIResource with empty GL values.
 	if (bCubeTexture)
 	{
-		return new FOpenGLTextureCube(this, 0, Target, -1, SizeX, SizeY, 0, NumMips, 1, 1, ArraySize, (EPixelFormat)Format, true, false, Flags, nullptr, InClearValue);
+		Result = new FOpenGLTextureCube(this, 0, Target, -1, SizeX, SizeY, 0, NumMips, 1, 1, ArraySize, (EPixelFormat)Format, true, false, Flags, nullptr, InClearValue);
 	}
 	else
 	{
-		return new FOpenGLTexture2D(this, 0, Target, -1, SizeX, SizeY, 0, NumMips, NumSamples, NumSamplesTileMem, 1, (EPixelFormat)Format, false, false, Flags, nullptr, InClearValue);
+		Result = new FOpenGLTexture2D(this, 0, Target, -1, SizeX, SizeY, 0, NumMips, NumSamples, NumSamplesTileMem, 1, (EPixelFormat)Format, false, false, Flags, nullptr, InClearValue);
 	}
+	OpenGLTextureAllocated(Result, Flags);
+	return Result;
 }
 
 // Initalize the FRHITexture's GL resources and fill in state.
@@ -804,6 +825,30 @@ void TOpenGLTexture<RHIResourceType>::Resolve(uint32 MipIndex,uint32 ArrayIndex)
 	// next operation that needs the stage will switch something else in on it.
 }
 
+template<typename RHIResourceType>
+uint32 TOpenGLTexture<RHIResourceType>::GetLockSize(uint32 InMipIndex, uint32 ArrayIndex, EResourceLockMode LockMode, uint32& DestStride)
+{
+	// Calculate the dimensions of the mip-map.
+	EPixelFormat PixelFormat = this->GetFormat();
+	const uint32 BlockSizeX = GPixelFormats[PixelFormat].BlockSizeX;
+	const uint32 BlockSizeY = GPixelFormats[PixelFormat].BlockSizeY;
+	const uint32 BlockBytes = GPixelFormats[PixelFormat].BlockBytes;
+	const uint32 MipSizeX = FMath::Max(this->GetSizeX() >> InMipIndex, BlockSizeX);
+	const uint32 MipSizeY = FMath::Max(this->GetSizeY() >> InMipIndex, BlockSizeY);
+	uint32 NumBlocksX = (MipSizeX + BlockSizeX - 1) / BlockSizeX;
+	uint32 NumBlocksY = (MipSizeY + BlockSizeY - 1) / BlockSizeY;
+	if (PixelFormat == PF_PVRTC2 || PixelFormat == PF_PVRTC4)
+	{
+		// PVRTC has minimum 2 blocks width and height
+		NumBlocksX = FMath::Max<uint32>(NumBlocksX, 2);
+		NumBlocksY = FMath::Max<uint32>(NumBlocksY, 2);
+	}
+	const uint32 MipBytes = NumBlocksX * NumBlocksY * BlockBytes;
+	DestStride = NumBlocksX * BlockBytes;
+	return MipBytes;
+}
+
+
 template<typename RHIResourceType>
 void* TOpenGLTexture<RHIResourceType>::Lock(uint32 InMipIndex,uint32 ArrayIndex,EResourceLockMode LockMode,uint32& DestStride)
 {
@@ -817,29 +862,13 @@ void* TOpenGLTexture<RHIResourceType>::Lock(uint32 InMipIndex,uint32 ArrayIndex,
 #endif
 
 	SCOPE_CYCLE_COUNTER(STAT_OpenGLLockTextureTime);
+	
+	const uint32 MipBytes = GetLockSize(InMipIndex, ArrayIndex, LockMode, DestStride);
 
 	void* result = NULL;
 
-	// Calculate the dimensions of the mip-map.
-	EPixelFormat PixelFormat = this->GetFormat();
-	const uint32 BlockSizeX = GPixelFormats[PixelFormat].BlockSizeX;
-	const uint32 BlockSizeY = GPixelFormats[PixelFormat].BlockSizeY;
-	const uint32 BlockBytes = GPixelFormats[PixelFormat].BlockBytes;
-	const uint32 MipSizeX = FMath::Max(this->GetSizeX() >> InMipIndex,BlockSizeX);
-	const uint32 MipSizeY = FMath::Max(this->GetSizeY() >> InMipIndex,BlockSizeY);
-	uint32 NumBlocksX = (MipSizeX + BlockSizeX - 1) / BlockSizeX;
-	uint32 NumBlocksY = (MipSizeY + BlockSizeY - 1) / BlockSizeY;
-	if ( PixelFormat == PF_PVRTC2 || PixelFormat == PF_PVRTC4 )
-	{
-		// PVRTC has minimum 2 blocks width and height
-		NumBlocksX = FMath::Max<uint32>(NumBlocksX, 2);
-		NumBlocksY = FMath::Max<uint32>(NumBlocksY, 2);
-	}
-	const uint32 MipBytes = NumBlocksX * NumBlocksY * BlockBytes;
-
-	DestStride = NumBlocksX * BlockBytes;
-
 	const int32 BufferIndex = InMipIndex * (bCubemap ? 6 : 1) * this->GetEffectiveSizeZ() + ArrayIndex;
+	EPixelFormat PixelFormat = this->GetFormat();
 
 	// Should we use client-storage to improve update time on platforms that require it
 	const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[PixelFormat];
@@ -1817,237 +1846,242 @@ void FOpenGLDynamicRHI::RHIGetResourceInfo(FTextureRHIParamRef Ref, FRHIResource
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FTexture2DRHIParamRef Texture2DRHI, uint8 MipLevel)
 {
-	FOpenGLTexture2D* Texture2D = ResourceCast(Texture2DRHI);
-
-	FOpenGLShaderResourceView *View = 0;
-
-	if (FOpenGL::SupportsTextureView())
+	FOpenGLShaderResourceViewProxy *ViewProxy = new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		VERIFY_GL_SCOPE();
+		FOpenGLTexture2D* Texture2D = ResourceCast(Texture2DRHI);
 
-		GLuint Resource = 0;
+		if (FOpenGL::SupportsTextureView())
+		{
+			VERIFY_GL_SCOPE();
 
-		FOpenGL::GenTextures( 1, &Resource);
-		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2D->GetFormat()];
-		const bool bSRGB = (Texture2D->GetFlags()&TexCreate_SRGB) != 0;
-		
-		FOpenGL::TextureView( Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
-		
-		View = new FOpenGLShaderResourceView(this, Resource, Texture2D->Target, MipLevel, true);
-	}
-	else
-	{
-		View = new FOpenGLShaderResourceView(this, Texture2D->Resource, Texture2D->Target, MipLevel, false);
-	}
-	
-	FShaderCache::LogSRV(View, Texture2DRHI, MipLevel, 1, PF_Unknown);
+			GLuint Resource = 0;
 
-	return View;
+			FOpenGL::GenTextures(1, &Resource);
+			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2D->GetFormat()];
+			const bool bSRGB = (Texture2D->GetFlags()&TexCreate_SRGB) != 0;
+
+			FOpenGL::TextureView(Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
+
+			return new FOpenGLShaderResourceView(this, Resource, Texture2D->Target, MipLevel, true);
+		}
+		else
+		{
+			return new FOpenGLShaderResourceView(this, Texture2D->Resource, Texture2D->Target, MipLevel, false);
+		}
+
+	});
+	FShaderCache::LogSRV(ViewProxy, Texture2DRHI, MipLevel, 1, PF_Unknown);
+	return ViewProxy;
 }
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FTexture2DRHIParamRef Texture2DRHI, uint8 MipLevel, uint8 NumMipLevels, uint8 Format)
 {
-	FOpenGLTexture2D* Texture2D = ResourceCast(Texture2DRHI);
-
-	FOpenGLShaderResourceView *View = 0;
-
-	if (FOpenGL::SupportsTextureView())
+	FOpenGLShaderResourceViewProxy *ViewProxy = new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		VERIFY_GL_SCOPE();
+		FOpenGLTexture2D* Texture2D = ResourceCast(Texture2DRHI);
+		FOpenGLShaderResourceView *View = 0;
 
-		GLuint Resource = 0;
-
-		FOpenGL::GenTextures( 1, &Resource);
-
-		if (Format != PF_X24_G8)
+		if (FOpenGL::SupportsTextureView())
 		{
-			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Format];
-			const bool bSRGB = (Texture2D->GetFlags()&TexCreate_SRGB) != 0;
+			VERIFY_GL_SCOPE();
+
+			GLuint Resource = 0;
+
+			FOpenGL::GenTextures( 1, &Resource);
+
+			if (Format != PF_X24_G8)
+			{
+				const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Format];
+				const bool bSRGB = (Texture2D->GetFlags()&TexCreate_SRGB) != 0;
 		
-			FOpenGL::TextureView( Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, NumMipLevels, 0, 1);
+				FOpenGL::TextureView( Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, NumMipLevels, 0, 1);
+			}
+			else
+			{
+				// PF_X24_G8 doesn't correspond to a real format under OpenGL
+				// The solution is to create a view with the original format, and convert it to return the stencil index
+				// To match component locations, texture swizzle needs to be setup too
+				const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2D->GetFormat()];
+
+				// create a second depth/stencil view
+				FOpenGL::TextureView( Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[0], MipLevel, NumMipLevels, 0, 1);
+
+				// Use a texture stage that's not likely to be used for draws, to avoid waiting
+				FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
+				CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Texture2D->Target, Resource, 0, NumMipLevels);
+
+				//set the texture to return the stencil index, and then force the components to match D3D
+				glTexParameteri( Texture2D->Target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
+				glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
+				glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_G, GL_RED);
+				glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
+				glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
+			}
+		
+			View = new FOpenGLShaderResourceView(this, Resource, Texture2D->Target, MipLevel, true);
 		}
 		else
 		{
-			// PF_X24_G8 doesn't correspond to a real format under OpenGL
-			// The solution is to create a view with the original format, and convert it to return the stencil index
-			// To match component locations, texture swizzle needs to be setup too
-			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2D->GetFormat()];
-
-			// create a second depth/stencil view
-			FOpenGL::TextureView( Resource, Texture2D->Target, Texture2D->Resource, GLFormat.InternalFormat[0], MipLevel, NumMipLevels, 0, 1);
-
-			// Use a texture stage that's not likely to be used for draws, to avoid waiting
-			FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
-			CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Texture2D->Target, Resource, 0, NumMipLevels);
-
-			//set the texture to return the stencil index, and then force the components to match D3D
-			glTexParameteri( Texture2D->Target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
-			glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
-			glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_G, GL_RED);
-			glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
-			glTexParameteri( Texture2D->Target, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
-		}
+			uint32 const Target = Texture2D->Target;
+			GLuint Resource = Texture2D->Resource;
 		
-		View = new FOpenGLShaderResourceView(this, Resource, Texture2D->Target, MipLevel, true);
-	}
-	else
-	{
-		uint32 const Target = Texture2D->Target;
-		GLuint Resource = Texture2D->Resource;
+			FTexture2DRHIParamRef DepthStencilTex = nullptr;
 		
-		FTexture2DRHIParamRef DepthStencilTex = nullptr;
-		
-		// For stencil sampling we have to use a separate single channel texture to blit stencil data into
-#if PLATFORM_DESKTOP || PLATFORM_ANDROIDESDEFERRED
-		if (FOpenGL::GetFeatureLevel() >= ERHIFeatureLevel::SM4 && Format == PF_X24_G8 && FOpenGL::SupportsPixelBuffers())
-		{
-			check(NumMipLevels == 1 && MipLevel == 0);
-			
-			if (!Texture2D->SRVResource)
+			// For stencil sampling we have to use a separate single channel texture to blit stencil data into
+	#if PLATFORM_DESKTOP || PLATFORM_ANDROIDESDEFERRED
+			if (FOpenGL::GetFeatureLevel() >= ERHIFeatureLevel::SM4 && Format == PF_X24_G8 && FOpenGL::SupportsPixelBuffers())
 			{
-				FOpenGL::GenTextures(1, &Texture2D->SRVResource);
-				
-				GLenum const InternalFormat = GL_R8UI;
-				GLenum const ChannelFormat = GL_RED_INTEGER;
-				uint32 const SizeX = Texture2D->GetSizeX();
-				uint32 const SizeY = Texture2D->GetSizeY();
-				GLenum const Type = GL_UNSIGNED_BYTE;
-				uint32 const Flags = 0;
-				
-				FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
-				CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Target, Texture2D->SRVResource, MipLevel, NumMipLevels);
-				
-				if (!FOpenGL::TexStorage2D(Target, NumMipLevels, InternalFormat, SizeX, SizeY, ChannelFormat, Type, Flags))
-				{
-					glTexImage2D(Target, 0, InternalFormat, SizeX, SizeY, 0, ChannelFormat, Type, nullptr);
-				}
-				
-				TArray<uint8> ZeroData;
-				ZeroData.AddZeroed(SizeX * SizeY);
-				
-				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-				glTexSubImage2D(
-								Target,
-								0,
-								0,
-								0,
-								SizeX,
-								SizeY,
-								ChannelFormat,
-								Type,
-								ZeroData.GetData());
-				glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-				
-				//set the texture to return the stencil index, and then force the components to match D3D
-				glTexParameteri( Target, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
-				glTexParameteri( Target, GL_TEXTURE_SWIZZLE_G, GL_RED);
-				glTexParameteri( Target, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
-				glTexParameteri( Target, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
-			}
-			check(Texture2D->SRVResource);
+				check(NumMipLevels == 1 && MipLevel == 0);
 			
-			Resource = Texture2D->SRVResource;
-			DepthStencilTex = Texture2DRHI;
-		}
-#endif
+				if (!Texture2D->SRVResource)
+				{
+					FOpenGL::GenTextures(1, &Texture2D->SRVResource);
+				
+					GLenum const InternalFormat = GL_R8UI;
+					GLenum const ChannelFormat = GL_RED_INTEGER;
+					uint32 const SizeX = Texture2D->GetSizeX();
+					uint32 const SizeY = Texture2D->GetSizeY();
+					GLenum const Type = GL_UNSIGNED_BYTE;
+					uint32 const Flags = 0;
+				
+					FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
+					CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Target, Texture2D->SRVResource, MipLevel, NumMipLevels);
+				
+					if (!FOpenGL::TexStorage2D(Target, NumMipLevels, InternalFormat, SizeX, SizeY, ChannelFormat, Type, Flags))
+					{
+						glTexImage2D(Target, 0, InternalFormat, SizeX, SizeY, 0, ChannelFormat, Type, nullptr);
+					}
+				
+					TArray<uint8> ZeroData;
+					ZeroData.AddZeroed(SizeX * SizeY);
+				
+					glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+					glTexSubImage2D(
+									Target,
+									0,
+									0,
+									0,
+									SizeX,
+									SizeY,
+									ChannelFormat,
+									Type,
+									ZeroData.GetData());
+					glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+				
+					//set the texture to return the stencil index, and then force the components to match D3D
+					glTexParameteri( Target, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
+					glTexParameteri( Target, GL_TEXTURE_SWIZZLE_G, GL_RED);
+					glTexParameteri( Target, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
+					glTexParameteri( Target, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
+				}
+				check(Texture2D->SRVResource);
+			
+				Resource = Texture2D->SRVResource;
+				DepthStencilTex = Texture2DRHI;
+			}
+	#endif
 		
-		View = new FOpenGLShaderResourceView(this, Resource, Target, MipLevel, false);
-		View->Texture2D = DepthStencilTex;
-	}
-	
-	FShaderCache::LogSRV(View, Texture2DRHI, MipLevel, NumMipLevels, Format);
-
-	return View;
+			View = new FOpenGLShaderResourceView(this, Resource, Target, MipLevel, false);
+			View->Texture2D = DepthStencilTex;
+		}
+		return View;
+	});
+	FShaderCache::LogSRV(ViewProxy, Texture2DRHI, MipLevel, NumMipLevels, Format);
+	return ViewProxy;
 }
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FTexture3DRHIParamRef Texture3DRHI, uint8 MipLevel)
 {
-	FOpenGLTexture3D* Texture3D = ResourceCast(Texture3DRHI);
-
-	FOpenGLShaderResourceView *View = 0;
-
-	if (FOpenGL::SupportsTextureView())
+	FOpenGLShaderResourceViewProxy *ViewProxy = new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		VERIFY_GL_SCOPE();
+		FOpenGLTexture3D* Texture3D = ResourceCast(Texture3DRHI);
 
-		GLuint Resource = 0;
+		FOpenGLShaderResourceView *View = 0;
 
-		FOpenGL::GenTextures( 1, &Resource);
-		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture3D->GetFormat()];
-		const bool bSRGB = (Texture3D->GetFlags()&TexCreate_SRGB) != 0;
+		if (FOpenGL::SupportsTextureView())
+		{
+			VERIFY_GL_SCOPE();
+
+			GLuint Resource = 0;
+
+			FOpenGL::GenTextures( 1, &Resource);
+			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture3D->GetFormat()];
+			const bool bSRGB = (Texture3D->GetFlags()&TexCreate_SRGB) != 0;
 		
-		FOpenGL::TextureView( Resource, Texture3D->Target, Texture3D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
+			FOpenGL::TextureView( Resource, Texture3D->Target, Texture3D->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
 		
-		View = new FOpenGLShaderResourceView(this, Resource, Texture3D->Target, MipLevel, true);
-	}
-	else
-	{
-		View = new FOpenGLShaderResourceView(this, Texture3D->Resource, Texture3D->Target, MipLevel, false);
-	}
-	
-	FShaderCache::LogSRV(View, Texture3DRHI, MipLevel, Texture3DRHI->GetNumMips(), Texture3DRHI->GetFormat());
-
-	return View;
+			return new FOpenGLShaderResourceView(this, Resource, Texture3D->Target, MipLevel, true);
+		}
+		else
+		{
+			return new FOpenGLShaderResourceView(this, Texture3D->Resource, Texture3D->Target, MipLevel, false);
+		}
+	});
+	FShaderCache::LogSRV(ViewProxy, Texture3DRHI, MipLevel, Texture3DRHI->GetNumMips(), Texture3DRHI->GetFormat());
+	return ViewProxy;
 }
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FTexture2DArrayRHIParamRef Texture2DArrayRHI, uint8 MipLevel)
 {
-	FOpenGLTexture2DArray* Texture2DArray = ResourceCast(Texture2DArrayRHI);
-
-	FOpenGLShaderResourceView *View = 0;
-
-	if (FOpenGL::SupportsTextureView())
+	FOpenGLShaderResourceViewProxy *ViewProxy = new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		VERIFY_GL_SCOPE();
+		FOpenGLTexture2DArray* Texture2DArray = ResourceCast(Texture2DArrayRHI);
+		FOpenGLShaderResourceView *View = 0;
 
-		GLuint Resource = 0;
+		if (FOpenGL::SupportsTextureView())
+		{
+			VERIFY_GL_SCOPE();
 
-		FOpenGL::GenTextures( 1, &Resource);
-		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2DArray->GetFormat()];
-		const bool bSRGB = (Texture2DArray->GetFlags()&TexCreate_SRGB) != 0;
-		
-		FOpenGL::TextureView( Resource, Texture2DArray->Target, Texture2DArray->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
-		
-		View = new FOpenGLShaderResourceView(this, Resource, Texture2DArray->Target, MipLevel, true);
-	}
-	else
-	{
-		View = new FOpenGLShaderResourceView(this, Texture2DArray->Resource, Texture2DArray->Target, MipLevel, false);
-	}
+			GLuint Resource = 0;
+
+			FOpenGL::GenTextures(1, &Resource);
+			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Texture2DArray->GetFormat()];
+			const bool bSRGB = (Texture2DArray->GetFlags()&TexCreate_SRGB) != 0;
+
+			FOpenGL::TextureView(Resource, Texture2DArray->Target, Texture2DArray->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 1);
+
+			return new FOpenGLShaderResourceView(this, Resource, Texture2DArray->Target, MipLevel, true);
+		}
+		else
+		{
+			return new FOpenGLShaderResourceView(this, Texture2DArray->Resource, Texture2DArray->Target, MipLevel, false);
+		}
+	});
 	
-	FShaderCache::LogSRV(View, Texture2DArrayRHI, MipLevel, Texture2DArrayRHI->GetNumMips(), Texture2DArrayRHI->GetFormat());
+	FShaderCache::LogSRV(ViewProxy, Texture2DArrayRHI, MipLevel, Texture2DArrayRHI->GetNumMips(), Texture2DArrayRHI->GetFormat());
 
-	return View;
+	return ViewProxy;
 }
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FTextureCubeRHIParamRef TextureCubeRHI, uint8 MipLevel)
 {
-	FOpenGLTextureCube* TextureCube = ResourceCast(TextureCubeRHI);
 
-	FOpenGLShaderResourceView *View = 0;
-
-	if (FOpenGL::SupportsTextureView())
+	FOpenGLShaderResourceViewProxy *ViewProxy = new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		VERIFY_GL_SCOPE();
+		FOpenGLTextureCube* TextureCube = ResourceCast(TextureCubeRHI);
+		if (FOpenGL::SupportsTextureView())
+		{
+			VERIFY_GL_SCOPE();
 
-		GLuint Resource = 0;
+			GLuint Resource = 0;
 
-		FOpenGL::GenTextures( 1, &Resource);
-		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[TextureCube->GetFormat()];
-		const bool bSRGB = (TextureCube->GetFlags()&TexCreate_SRGB) != 0;
-		
-		FOpenGL::TextureView( Resource, TextureCube->Target, TextureCube->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 6);
-		
-		View = new FOpenGLShaderResourceView(this, Resource, TextureCube->Target, MipLevel, true);
-	}
-	else
-	{
-		View = new FOpenGLShaderResourceView(this, TextureCube->Resource, TextureCube->Target, MipLevel, false);
-	}
-	
-	FShaderCache::LogSRV(View, TextureCube, MipLevel, TextureCubeRHI->GetNumMips(), TextureCubeRHI->GetFormat());
+			FOpenGL::GenTextures(1, &Resource);
+			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[TextureCube->GetFormat()];
+			const bool bSRGB = (TextureCube->GetFlags()&TexCreate_SRGB) != 0;
 
-	return View;
+			FOpenGL::TextureView(Resource, TextureCube->Target, TextureCube->Resource, GLFormat.InternalFormat[bSRGB], MipLevel, 1, 0, 6);
+
+			return new FOpenGLShaderResourceView(this, Resource, TextureCube->Target, MipLevel, true);
+		}
+		else
+		{
+			return new FOpenGLShaderResourceView(this, TextureCube->Resource, TextureCube->Target, MipLevel, false);
+		}
+	});
+
+	FShaderCache::LogSRV(ViewProxy, TextureCubeRHI, MipLevel, TextureCubeRHI->GetNumMips(), TextureCubeRHI->GetFormat());
+
+	return ViewProxy;
 }
 
 
@@ -2090,7 +2124,11 @@ uint32 FOpenGLDynamicRHI::RHIComputeMemorySize(FTextureRHIParamRef TextureRHI)
 		return 0;
 	}
 
-	FOpenGLTextureBase* Texture = GetOpenGLTextureFromRHITexture(TextureRHI);
+	FOpenGLTextureBase* Texture = static_cast<FOpenGLTextureBase*>(TextureRHI->GetTextureBaseRHI());
+	if (!Texture->IsMemorySizeSet())
+	{
+		GetOpenGLTextureFromRHITexture(TextureRHI);
+	}
 	return Texture->GetMemorySize();
 }
 
@@ -2270,36 +2308,56 @@ void FOpenGLDynamicRHI::RHIUnlockTexture2DArray(FTexture2DArrayRHIParamRef Textu
 	Texture->Unlock(MipIndex, TextureIndex);
 }
 
-void FOpenGLDynamicRHI::RHIUpdateTexture2D(FTexture2DRHIParamRef TextureRHI,uint32 MipIndex,const FUpdateTextureRegion2D& UpdateRegion,uint32 SourcePitch,const uint8* SourceData)
+void FOpenGLDynamicRHI::RHIUpdateTexture2D(FTexture2DRHIParamRef TextureRHI,uint32 MipIndex,const FUpdateTextureRegion2D& UpdateRegionIn,uint32 SourcePitch,const uint8* SourceDataIn)
 {
-	VERIFY_GL_SCOPE();
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	const FUpdateTextureRegion2D UpdateRegion = UpdateRegionIn;
 
-	FOpenGLTexture2D* Texture = ResourceCast(TextureRHI);
+	uint8* RHITSourceData = nullptr;
+	if (!ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
+	{
+		const int32 DataSize = SourcePitch*UpdateRegion.Height;
+		RHITSourceData = (uint8*)FMemory::Malloc(DataSize, 16);
+		FMemory::Memcpy(RHITSourceData, SourceDataIn, DataSize);
+	}
+	const uint8* SourceData = RHITSourceData ? RHITSourceData : SourceDataIn;
+	RunOnGLRenderContextThread([=]()
+	{
+		VERIFY_GL_SCOPE();
 
-	// Use a texture stage that's not likely to be used for draws, to avoid waiting
-	FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
-	CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Texture->Target, Texture->Resource, 0, Texture->GetNumMips());
-	CachedBindPixelUnpackBuffer(ContextState, 0);
+		FOpenGLTexture2D* Texture = ResourceCast(TextureRHI);
 
-	EPixelFormat PixelFormat = Texture->GetFormat();
-	check(GPixelFormats[PixelFormat].BlockSizeX == 1);
-	check(GPixelFormats[PixelFormat].BlockSizeY == 1);
-	const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[PixelFormat];
-	const uint32 FormatBPP = GPixelFormats[PixelFormat].BlockBytes;
-	checkf(!GLFormat.bCompressed, TEXT("RHIUpdateTexture2D not currently supported for compressed (%s) textures by the OpenGL RHI"), GPixelFormats[PixelFormat].Name);
+		// Use a texture stage that's not likely to be used for draws, to avoid waiting
+		FOpenGLContextState& ContextState = GetContextStateForCurrentContext();
+		CachedSetupTextureStage(ContextState, FOpenGL::GetMaxCombinedTextureImageUnits() - 1, Texture->Target, Texture->Resource, 0, Texture->GetNumMips());
+		CachedBindPixelUnpackBuffer(ContextState, 0);
 
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, SourcePitch / FormatBPP);
+		EPixelFormat PixelFormat = Texture->GetFormat();
+		check(GPixelFormats[PixelFormat].BlockSizeX == 1);
+		check(GPixelFormats[PixelFormat].BlockSizeY == 1);
+		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[PixelFormat];
+		const uint32 FormatBPP = GPixelFormats[PixelFormat].BlockBytes;
+		checkf(!GLFormat.bCompressed, TEXT("RHIUpdateTexture2D not currently supported for compressed (%s) textures by the OpenGL RHI"), GPixelFormats[PixelFormat].Name);
 
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	glTexSubImage2D(Texture->Target, MipIndex, UpdateRegion.DestX, UpdateRegion.DestY, UpdateRegion.Width, UpdateRegion.Height,
-		GLFormat.Format, GLFormat.Type, SourceData);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, SourcePitch / FormatBPP);
 
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		glTexSubImage2D(Texture->Target, MipIndex, UpdateRegion.DestX, UpdateRegion.DestY, UpdateRegion.Width, UpdateRegion.Height,
+			GLFormat.Format, GLFormat.Type, SourceData);
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 
-	// No need to restore texture stage; leave it like this,
-	// and the next draw will take care of cleaning it up; or
-	// next operation that needs the stage will switch something else in on it.
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+		// No need to restore texture stage; leave it like this,
+		// and the next draw will take care of cleaning it up; or
+		// next operation that needs the stage will switch something else in on it.
+
+		// free source data if we're on RHIT
+		if (RHITSourceData)
+		{
+			FMemory::Free(RHITSourceData);
+		}
+	});
 }
 
 void FOpenGLDynamicRHI::RHIUpdateTexture3D(FTexture3DRHIParamRef TextureRHI,uint32 MipIndex,const FUpdateTextureRegion3D& UpdateRegion,uint32 SourceRowPitch,uint32 SourceDepthPitch,const uint8* SourceData)
@@ -2359,6 +2417,7 @@ void FOpenGLDynamicRHI::RHIUpdateTexture3D(FTexture3DRHIParamRef TextureRHI,uint
 
 void FOpenGLDynamicRHI::InvalidateTextureResourceInCache(GLuint Resource)
 {
+	VERIFY_GL_SCOPE();
 	if (SharedContextState.Textures || RenderingContextState.Textures)
 	{
 		for (int32 SamplerIndex = 0; SamplerIndex < FOpenGL::GetMaxCombinedTextureImageUnits(); ++SamplerIndex)
@@ -2436,10 +2495,28 @@ void FOpenGLDynamicRHI::RHIUnlockTextureCubeFace(FTextureCubeRHIParamRef Texture
 
 void FOpenGLDynamicRHI::RHIBindDebugLabelName(FTextureRHIParamRef TextureRHI, const TCHAR* Name)
 {
-	FOpenGLTextureBase* Texture = GetOpenGLTextureFromRHITexture(TextureRHI);
-	FOpenGL::LabelObject(GL_TEXTURE, Texture->Resource, TCHAR_TO_ANSI(Name));
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
+	{
+		VERIFY_GL_SCOPE();
+		FOpenGLTextureBase* Texture = GetOpenGLTextureFromRHITexture(TextureRHI);
+		FOpenGL::LabelObject(GL_TEXTURE, Texture->Resource, TCHAR_TO_ANSI(Name));
+	}
+	else
+	{
+		// copy string name for RHIT version.
+		FAnsiCharArray TextureDebugName;
+		TextureDebugName.Append(TCHAR_TO_ANSI(Name), FCString::Strlen(Name) + 1);
+		RunOnGLRenderContextThread([TextureRHI, TextureDebugName = MoveTemp(TextureDebugName)]()
+		{
+			VERIFY_GL_SCOPE();
+			FOpenGLTextureBase* Texture = GetOpenGLTextureFromRHITexture(TextureRHI);
+			FOpenGL::LabelObject(GL_TEXTURE, Texture->Resource, TextureDebugName.GetData());
+		});
+	}
 }
 
+
 void FOpenGLDynamicRHI::RHIVirtualTextureSetFirstMipInMemory(FTexture2DRHIParamRef TextureRHI, uint32 FirstMip)
 {
 }
@@ -2557,4 +2634,113 @@ void FOpenGLDynamicRHI::RHIAliasTextureResources(FTextureRHIParamRef DestRHIText
 	}
 }
 
+void* FOpenGLDynamicRHI::LockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush)
+{
+	check(IsInRenderingThread());
+	static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks"));
+	bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
+	void* Result;
+	uint32 MipBytes = 0;
+	if (!bBuffer || LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
+	{
+		RHITHREAD_GLCOMMAND_PROLOGUE();
+		return this->RHILockTexture2D(Texture, MipIndex, LockMode, DestStride, bLockWithinMiptail);
+		RHITHREAD_GLCOMMAND_EPILOGUE_GET_RETURN(void *);
+		Result = ReturnValue;
+		MipBytes = ResourceCast_Unfenced(Texture)->GetLockSize(MipIndex, 0, LockMode, DestStride);
+	}
+	else
+	{
+		MipBytes = ResourceCast_Unfenced(Texture)->GetLockSize(MipIndex, 0, LockMode, DestStride);
+		Result = FMemory::Malloc(MipBytes, 16);
+	}
+	check(Result);
+
+	GLLockTracker.Lock(Texture, Result, MipIndex, DestStride, MipBytes, LockMode);
+	return Result;
+}
+
+void FOpenGLDynamicRHI::UnlockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush)
+{
+	check(IsInRenderingThread());
+	static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks"));
+	bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
+	FTextureLockTracker::FLockParams Params = GLLockTracker.Unlock(Texture, MipIndex);
+	if (!bBuffer || Params.LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
+	{
+		GLLockTracker.TotalMemoryOutstanding = 0;
+		RHITHREAD_GLCOMMAND_PROLOGUE();
+		this->RHIUnlockTexture2D(Texture, MipIndex, bLockWithinMiptail);
+		RHITHREAD_GLCOMMAND_EPILOGUE();
+	}
+	else
+	{
+		auto GLCommand = [=]()
+		{
+			uint32 DestStride;
+			uint8* TexMem = (uint8*)this->RHILockTexture2D(Texture, MipIndex, Params.LockMode, DestStride, bLockWithinMiptail);
+			uint8* BuffMem = (uint8*)Params.Buffer;
+			check(DestStride == Params.Stride);
+			FMemory::Memcpy(TexMem, BuffMem, Params.BufferSize);
+			FMemory::Free(Params.Buffer);
+			this->RHIUnlockTexture2D(Texture, MipIndex, bLockWithinMiptail);
+		};
+		new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand(GLCommand);
+	}
+}
+
+void* FOpenGLDynamicRHI::RHILockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail)
+{
+	check(IsInRenderingThread());
+	static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks"));
+	bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
+	void* Result;
+	uint32 MipBytes = 0;
+	if (!bBuffer || LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
+	{
+		RHITHREAD_GLCOMMAND_PROLOGUE();
+		return this->RHILockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, LockMode, DestStride, bLockWithinMiptail);
+		RHITHREAD_GLCOMMAND_EPILOGUE_GET_RETURN(void *);
+		Result = ReturnValue;
+		MipBytes = ResourceCast_Unfenced(Texture)->GetLockSize(MipIndex, 0, LockMode, DestStride);
+	}
+	else
+	{
+		MipBytes = ResourceCast_Unfenced(Texture)->GetLockSize(MipIndex, 0, LockMode, DestStride);
+		Result = FMemory::Malloc(MipBytes, 16);
+	}
+	check(Result);
+	GLLockTracker.Lock(Texture, Result, MipIndex, DestStride, MipBytes, LockMode);
+	return Result;
+}
+
+void FOpenGLDynamicRHI::RHIUnlockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, bool bLockWithinMiptail)
+{
+	check(IsInRenderingThread());
+	static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks"));
+	bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
+	FTextureLockTracker::FLockParams Params = GLLockTracker.Unlock(Texture, MipIndex);
+	if (!bBuffer || Params.LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
+	{
+		GLLockTracker.TotalMemoryOutstanding = 0;
+		RHITHREAD_GLCOMMAND_PROLOGUE();
+		this->RHIUnlockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, bLockWithinMiptail);
+		RHITHREAD_GLCOMMAND_EPILOGUE();
+	}
+	else
+	{
+		auto GLCommand = [=]()
+		{
+			uint32 DestStride;
+			uint8* TexMem = (uint8*)this->RHILockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, RLM_WriteOnly, DestStride, bLockWithinMiptail);
+			uint8* BuffMem = (uint8*)Params.Buffer;
+			check(DestStride == Params.Stride);
+			FMemory::Memcpy(TexMem, BuffMem, Params.BufferSize);
+			FMemory::Free(Params.Buffer);
+			this->RHIUnlockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, bLockWithinMiptail);
+		};
+		new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand(GLCommand);
+	}
+}
+
 
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUAV.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUAV.cpp
index 4da750dfc5ef..e6319cb5928a 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUAV.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUAV.cpp
@@ -9,63 +9,68 @@
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FVertexBufferRHIParamRef VertexBufferRHI, uint32 Stride, uint8 Format)
 {
-	GLuint TextureID = 0;
-	if ( FOpenGL::SupportsResourceView() )
-	{
-		UE_CLOG(!GPixelFormats[Format].Supported, LogRHI, Error, TEXT("Unsupported EPixelFormat %d"), Format);
-
-		FOpenGLVertexBuffer* VertexBuffer = ResourceCast(VertexBufferRHI);
-
-		const uint32 FormatBPP = GPixelFormats[Format].BlockBytes;
-
-		if (FormatBPP != Stride && GMaxRHIFeatureLevel == ERHIFeatureLevel::SM4)
+	FShaderResourceViewRHIRef Result = new FOpenGLShaderResourceViewProxy([=, OGLRHI = this](FShaderResourceViewRHIParamRef OwnerRHI)
+	{ 
+		VERIFY_GL_SCOPE();
+		GLuint TextureID = 0;
+		if (FOpenGL::SupportsResourceView())
 		{
-			UE_LOG(LogRHI, Fatal,TEXT("OpenGL 3.2 RHI supports only tightly packed texture buffers!"));
-			return new FOpenGLShaderResourceView(this, 0, GL_TEXTURE_BUFFER);
+			UE_CLOG(!GPixelFormats[Format].Supported, LogRHI, Error, TEXT("Unsupported EPixelFormat %d"), Format);
+
+			FOpenGLVertexBuffer* VertexBuffer = FOpenGLDynamicRHI::ResourceCast(VertexBufferRHI);
+
+			const uint32 FormatBPP = GPixelFormats[Format].BlockBytes;
+
+			if (FormatBPP != Stride && GMaxRHIFeatureLevel == ERHIFeatureLevel::SM4)
+			{
+				UE_LOG(LogRHI, Fatal,TEXT("OpenGL 3.2 RHI supports only tightly packed texture buffers!"));
+				return new FOpenGLShaderResourceView(OGLRHI, 0, GL_TEXTURE_BUFFER);
+			}
+
+			const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Format];
+			FOpenGL::GenTextures(1, &TextureID);
+
+			// Use a texture stage that's not likely to be used for draws, to avoid waiting
+			OGLRHI->CachedSetupTextureStage(OGLRHI->GetContextStateForCurrentContext(), FOpenGL::GetMaxCombinedTextureImageUnits() - 1, GL_TEXTURE_BUFFER, TextureID, -1, 1);
+			FOpenGL::TexBuffer(GL_TEXTURE_BUFFER, GLFormat.InternalFormat[0], VertexBuffer->Resource);
 		}
 
-		const FOpenGLTextureFormat& GLFormat = GOpenGLTextureFormats[Format];
-		FOpenGL::GenTextures(1,&TextureID);
+		// No need to restore texture stage; leave it like this,
+		// and the next draw will take care of cleaning it up; or
+		// next operation that needs the stage will switch something else in on it.
 
-		// Use a texture stage that's not likely to be used for draws, to avoid waiting
-		CachedSetupTextureStage(GetContextStateForCurrentContext(), FOpenGL::GetMaxCombinedTextureImageUnits() - 1, GL_TEXTURE_BUFFER, TextureID, -1, 1);
-		FOpenGL::TexBuffer(GL_TEXTURE_BUFFER, GLFormat.InternalFormat[0], VertexBuffer->Resource);
-	}
-
-	// No need to restore texture stage; leave it like this,
-	// and the next draw will take care of cleaning it up; or
-	// next operation that needs the stage will switch something else in on it.
-
-	FShaderResourceViewRHIRef Result = new FOpenGLShaderResourceView(this,TextureID,GL_TEXTURE_BUFFER,VertexBufferRHI,Format);
+		return new FOpenGLShaderResourceView(OGLRHI, TextureID, GL_TEXTURE_BUFFER, VertexBufferRHI, Format);
+	});
 	FShaderCache::LogSRV(Result, VertexBufferRHI, Stride, Format);
-
 	return Result;
 }
 
 FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FIndexBufferRHIParamRef BufferRHI)
 {
-	GLuint TextureID = 0;
-	if (FOpenGL::SupportsResourceView())
+	return new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef OwnerRHI)
 	{
-		FOpenGLIndexBuffer* IndexBuffer = ResourceCast(BufferRHI);
-		FOpenGL::GenTextures(1, &TextureID);
-		CachedSetupTextureStage(GetContextStateForCurrentContext(), FOpenGL::GetMaxCombinedTextureImageUnits() - 1, GL_TEXTURE_BUFFER, TextureID, -1, 1);
-		uint32 Stride = BufferRHI->GetStride();
-		GLenum Format = (Stride == 2) ? GL_R16UI : GL_R32UI;
-		FOpenGL::TexBuffer(GL_TEXTURE_BUFFER, Format, IndexBuffer->Resource);
-	}
+		VERIFY_GL_SCOPE();
+		GLuint TextureID = 0;
+		if (FOpenGL::SupportsResourceView())
+		{
+			FOpenGLIndexBuffer* IndexBuffer = ResourceCast(BufferRHI);
+			FOpenGL::GenTextures(1, &TextureID);
+			CachedSetupTextureStage(GetContextStateForCurrentContext(), FOpenGL::GetMaxCombinedTextureImageUnits() - 1, GL_TEXTURE_BUFFER, TextureID, -1, 1);
+			uint32 Stride = BufferRHI->GetStride();
+			GLenum Format = (Stride == 2) ? GL_R16UI : GL_R32UI;
+			FOpenGL::TexBuffer(GL_TEXTURE_BUFFER, Format, IndexBuffer->Resource);
+		}
 
-	FShaderResourceViewRHIRef Result = new FOpenGLShaderResourceView(this, TextureID, GL_TEXTURE_BUFFER);
-	return Result;
+		return new FOpenGLShaderResourceView(this, TextureID, GL_TEXTURE_BUFFER);
+	});
 }
 
 FOpenGLShaderResourceView::~FOpenGLShaderResourceView()
 {
-	FShaderCache::RemoveSRV(this);
-	
 	if (Resource && OwnsResource)
 	{
-		OpenGLRHI->InvalidateTextureResourceInCache( Resource );
+		VERIFY_GL_SCOPE();
+		OpenGLRHI->InvalidateTextureResourceInCache(Resource);
 		FOpenGL::DeleteTextures(1, &Resource);
 	}
 }
@@ -156,7 +161,10 @@ FShaderResourceViewRHIRef FOpenGLDynamicRHI::RHICreateShaderResourceView(FStruct
 {
 	FOpenGLStructuredBuffer* StructuredBuffer = ResourceCast(StructuredBufferRHI);
 	UE_LOG(LogRHI, Fatal,TEXT("OpenGL RHI doesn't support RHICreateShaderResourceView yet!"));
-	return new FOpenGLShaderResourceView(this,0,GL_TEXTURE_BUFFER);
+	return new FOpenGLShaderResourceViewProxy([=](FShaderResourceViewRHIParamRef)
+	{
+		return nullptr;
+	});
 }
 
 void FOpenGLDynamicRHI::RHIClearTinyUAV(FUnorderedAccessViewRHIParamRef UnorderedAccessViewRHI, const uint32* Values)
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUtil.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUtil.cpp
index 92e4f168b886..23f1ed34e261 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUtil.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLUtil.cpp
@@ -122,15 +122,20 @@ void DecrementBufferMemory(GLenum Type, bool bStructuredBuffer, uint32 NumBytes)
 }
 
 // Run passed function on whichever thread owns the render context.
-void RunOnGLRenderContextThread(TFunction<void(void)> GLFunc)
+void RunOnGLRenderContextThread(TFunction<void(void)> GLFunc, bool bWaitForCompletion)
 {
 	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
-	if (RHICmdList.Bypass() || !IsRunningRHIInSeparateThread() || IsInRHIThread())
+	if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
 	{
 		GLFunc();
 	}
 	else
 	{
 		new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand(MoveTemp(GLFunc));
+		if (bWaitForCompletion)
+		{
+			RHITHREAD_GLTRACE_BLOCKING;
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
 	}
 }
\ No newline at end of file
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexBuffer.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexBuffer.cpp
index 9472100ab1f4..d913843248bd 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexBuffer.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexBuffer.cpp
@@ -195,6 +195,8 @@ FVertexBufferRHIRef FOpenGLDynamicRHI::RHICreateVertexBuffer(uint32 Size, uint32
 void* FOpenGLDynamicRHI::RHILockVertexBuffer(FVertexBufferRHIParamRef VertexBufferRHI,uint32 Offset,uint32 Size,EResourceLockMode LockMode)
 {
 	check(Size > 0);
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 
 	VERIFY_GL_SCOPE();
 	FOpenGLVertexBuffer* VertexBuffer = ResourceCast(VertexBufferRHI);
@@ -215,12 +217,15 @@ void* FOpenGLDynamicRHI::RHILockVertexBuffer(FVertexBufferRHIParamRef VertexBuff
 				return Staging;
 			}
 		}
-		return VertexBuffer->Lock(Offset, Size, LockMode == RLM_ReadOnly, VertexBuffer->IsDynamic());
+		return (void*)VertexBuffer->Lock(Offset, Size, LockMode == RLM_ReadOnly, VertexBuffer->IsDynamic());
 	}
+	RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(void*);
 }
 
 void FOpenGLDynamicRHI::RHIUnlockVertexBuffer(FVertexBufferRHIParamRef VertexBufferRHI)
 {
+	FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+	RHITHREAD_GLCOMMAND_PROLOGUE();
 	VERIFY_GL_SCOPE();
 	FOpenGLVertexBuffer* VertexBuffer = ResourceCast(VertexBufferRHI);
 	if( (FOpenGL::SupportsVertexAttribBinding() && OpenGLConsoleVariables::bUseVAB) || !( VertexBuffer->GetUsage() & BUF_ZeroStride ) )
@@ -230,6 +235,7 @@ void FOpenGLDynamicRHI::RHIUnlockVertexBuffer(FVertexBufferRHIParamRef VertexBuf
 			VertexBuffer->Unlock();
 		}
 	}
+	RHITHREAD_GLCOMMAND_EPILOGUE();
 }
 
 void FOpenGLDynamicRHI::RHICopyVertexBuffer(FVertexBufferRHIParamRef SourceBufferRHI,FVertexBufferRHIParamRef DestBufferRHI)
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexDeclaration.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexDeclaration.cpp
index e7dd775e2d95..b6d4dd6c1c68 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexDeclaration.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLVertexDeclaration.cpp
@@ -114,11 +114,35 @@ struct FOpenGLVertexDeclarationKey
 		{
 			FORCEINLINE bool operator()( const FOpenGLVertexElement& A, const FOpenGLVertexElement& B ) const
 			{
-				return ((int32)A.Offset + A.StreamIndex * MAX_uint16) < ((int32)B.Offset + B.StreamIndex * MAX_uint16);
+				if (A.StreamIndex < B.StreamIndex)
+				{
+					return true;
+				}
+				if (A.StreamIndex > B.StreamIndex)
+				{
+					return false;
+				}
+				if (A.Offset < B.Offset)
+				{
+					return true;
+				}
+				if (A.Offset > B.Offset)
+				{
+					return false;
+				}
+				if (A.AttributeIndex < B.AttributeIndex)
+				{
+					return true;
+				}
+				if (A.AttributeIndex > B.AttributeIndex)
+				{
+					return false;
+				}
+				return false;
 			}
 		};
 		// Sort the FOpenGLVertexElements by stream then offset.
-		Sort( VertexElements.GetData(), VertexElements.Num(), FCompareFOpenGLVertexElement() );
+		StableSort( VertexElements.GetData(), VertexElements.Num(), FCompareFOpenGLVertexElement() );
 
 		Hash = FCrc::MemCrc_DEPRECATED(VertexElements.GetData(),VertexElements.Num()*sizeof(FOpenGLVertexElement));
 		Hash = FCrc::MemCrc_DEPRECATED(StreamStrides, sizeof(StreamStrides), Hash);
@@ -173,3 +197,167 @@ FVertexDeclarationRHIRef FOpenGLDynamicRHI::RHICreateVertexDeclaration(const FVe
 
 	return *VertexDeclarationRefPtr;
 }
+
+bool FOpenGLVertexDeclaration::GetInitializer(FVertexDeclarationElementList& Init)
+{
+	check(!Init.Num());
+	for(int32 ElementIndex = 0;ElementIndex < VertexElements.Num();ElementIndex++)
+	{
+		FOpenGLVertexElement const& GLElement = VertexElements[ElementIndex];
+		FVertexElement Element;
+		Element.StreamIndex = GLElement.StreamIndex;
+		Element.Offset = GLElement.Offset;
+		Element.bUseInstanceIndex = GLElement.Divisor == 1;
+		Element.AttributeIndex = GLElement.AttributeIndex;
+		Element.Stride = GLElement.HashStride;
+		
+		switch(GLElement.Type)
+		{
+			case GL_FLOAT:
+			{
+				switch(GLElement.Size)
+				{
+					case 1:
+						Element.Type = VET_Float1;
+						break;
+					case 2:
+						Element.Type = VET_Float2;
+						break;
+					case 3:
+						Element.Type = VET_Float3;
+						break;
+					case 4:
+						Element.Type = VET_Float4;
+						break;
+					default:
+						check(false);
+						break;
+				}
+				break;
+			}
+			case GL_UNSIGNED_BYTE:
+			{
+				if (GLElement.Size == 4)
+				{
+					// Can't distinguish VET_PackedNormal, VET_Color & VET_UByte4N, but it shouldn't matter
+					Element.Type = (GLElement.bNormalized) ? VET_UByte4N : VET_UByte4;
+				}
+				else if (GLElement.Size == GL_BGRA)
+				{
+					Element.Type = VET_Color;
+				}
+				else
+				{
+					check(false);
+				}
+				break;
+			}
+			case GL_BYTE:
+			{
+				if (GLElement.Size == 4)
+				{
+					// Can't distinguish VET_PackedNormal, VET_Color & VET_UByte4N, but it shouldn't matter
+					ensure(GLElement.bNormalized);
+					Element.Type = VET_PackedNormal;
+				}
+				else
+				{
+					checkf(false, TEXT("Vertex Declaration GL_BYTE, Size=%d"), GLElement.Size);
+				}
+				break;
+			}
+			case GL_SHORT:
+			{
+				switch(GLElement.Size)
+				{
+					case 2:
+						if (GLElement.bNormalized)
+						{
+							Element.Type = VET_Short2N;
+						}
+						else
+						{
+							Element.Type = (!GLElement.bShouldConvertToFloat) ? VET_Short2 : VET_Half2;
+						}
+						break;
+					case 4:
+						if (GLElement.bNormalized)
+						{
+							Element.Type = VET_Short4N;
+						}
+						else
+						{
+							Element.Type = (!GLElement.bShouldConvertToFloat) ? VET_Short4 : VET_Half4;
+						}
+						break;
+					default:
+						check(false);
+						break;
+				}
+				break;
+			}
+#if defined(GL_HALF_FLOAT)
+			case GL_HALF_FLOAT:
+#endif
+#if defined(GL_HALF_FLOAT_OES)
+			case GL_HALF_FLOAT_OES:
+#endif
+			{
+				switch(GLElement.Size)
+				{
+					case 2:
+						Element.Type = VET_Half2;
+						break;
+					case 4:
+						Element.Type = VET_Half4;
+						break;
+					default:
+						check(false);
+						break;
+				}
+				break;
+			}
+			case GL_UNSIGNED_SHORT:
+			{
+				switch(GLElement.Size)
+				{
+					case 2:
+						if (GLElement.bNormalized)
+						{
+							Element.Type = VET_UShort2N;
+						}
+						else
+						{
+							Element.Type = VET_UShort2;
+						}
+						break;
+					case 4:
+						if (GLElement.bNormalized)
+						{
+							Element.Type = VET_UShort4N;
+						}
+						else
+						{
+							Element.Type = VET_UShort4;
+						}
+						break;
+					default:
+						check(false);
+						break;
+				}
+				break;
+			}
+			case GL_UNSIGNED_INT_2_10_10_10_REV:
+			{
+				Element.Type = VET_URGB10A2N;
+				break;
+			}
+			default:
+				checkf(false, TEXT("Unknown GLEnum 0x%x"), (int32)GLElement.Type);
+				break;
+		}
+		Init.Add(Element);
+	}
+
+	return true;
+}
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLViewport.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLViewport.cpp
index fc05c2eb115f..8cd8439f4707 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLViewport.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/OpenGLViewport.cpp
@@ -110,11 +110,6 @@ void FOpenGLDynamicRHI::RHIBeginDrawingViewport(FViewportRHIParamRef ViewportRHI
 		PlatformRenderingContextSetup(PlatformDevice);
 	}
 
-	if(!GPUProfilingData.FrameTiming.IsInitialized())
-	{
-		GPUProfilingData.FrameTiming.InitResource();
-	}
-	
 	// Set the render target and viewport.
 	if( RenderTarget )
 	{
@@ -135,6 +130,8 @@ void FOpenGLDynamicRHI::RHIEndDrawingViewport(FViewportRHIParamRef ViewportRHI,b
 	FOpenGLViewport* Viewport = ResourceCast(ViewportRHI);
 
 	SCOPE_CYCLE_COUNTER(STAT_OpenGLPresentTime);
+	uint32 IdleStart = FPlatformTime::Cycles();
+
 
 	check(DrawingViewport.GetReference() == Viewport);
 
@@ -190,6 +187,17 @@ void FOpenGLDynamicRHI::RHIEndDrawingViewport(FViewportRHIParamRef ViewportRHI,b
 		PlatformSharedContextSetup(PlatformDevice);
 		bRevertToSharedContextAfterDrawingViewport = false;
 	}
+	uint32 ThisCycles = FPlatformTime::Cycles() - IdleStart;
+	if (IsInRHIThread())
+	{
+		GWorkingRHIThreadStallTime += ThisCycles;
+	}
+	else if (IsInActualRenderingThread())
+	{
+		GRenderThreadIdle[ERenderThreadIdleTypes::WaitingForGPUPresent] += ThisCycles;
+		GRenderThreadNumIdle[ERenderThreadIdleTypes::WaitingForGPUPresent]++;
+	}
+
 }
 
 
@@ -246,7 +254,7 @@ FOpenGLViewport::~FOpenGLViewport()
 	BackBuffer.SafeRelease();
 	check(!IsValidRef(BackBuffer));
 
-	PlatformDestroyOpenGLContext(OpenGLRHI->PlatformDevice,OpenGLContext);
+	RunOnGLRenderContextThread([&]() {	PlatformDestroyOpenGLContext(OpenGLRHI->PlatformDevice, OpenGLContext); }, true);
 	OpenGLContext = NULL;
 	OpenGLRHI->Viewports.Remove(this);
 }
diff --git a/Engine/Source/Runtime/OpenGLDrv/Private/Windows/OpenGLWindows.cpp b/Engine/Source/Runtime/OpenGLDrv/Private/Windows/OpenGLWindows.cpp
index 8a72cc73ee0d..67b60307ebe6 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Private/Windows/OpenGLWindows.cpp
+++ b/Engine/Source/Runtime/OpenGLDrv/Private/Windows/OpenGLWindows.cpp
@@ -62,7 +62,8 @@ public:
 		check(Context);
 		PrevDC = wglGetCurrentDC();
 		PrevContext = GetCurrentContext();
-		bSameDCAndContext = (PrevContext == Context->OpenGLContext) && (PrevDC == Context->DeviceContext);
+		bSameDC = (PrevDC == Context->DeviceContext);
+		bSameDCAndContext = (PrevContext == Context->OpenGLContext) && bSameDC;
 		if (!bSameDCAndContext)
 		{
 //			if (PrevContext)
@@ -95,10 +96,16 @@ public:
 		return bSameDCAndContext;
 	}
 
+	bool ContextsShareSameDC() const
+	{
+		return bSameDC;
+	}
+
 private:
 	HDC					PrevDC;
 	HGLRC				PrevContext;
 	bool				bSameDCAndContext;
+	bool				bSameDC;
 };
 
 void DeleteQueriesForCurrentContext( HGLRC Context );
@@ -421,6 +428,7 @@ void PlatformReleaseOpenGLContext(FPlatformOpenGLDevice* Device, FPlatformOpenGL
 	Device->TargetDirty = true;
 
 	bool bActiveContextWillBeReleased = false;
+	bool bSharedDC = false;
 
 	{
 		FScopeLock ScopeLock(Device->ContextUsageGuard);
@@ -428,6 +436,7 @@ void PlatformReleaseOpenGLContext(FPlatformOpenGLDevice* Device, FPlatformOpenGL
 			FScopeContext ScopeContext(Context);
 
 			bActiveContextWillBeReleased = ScopeContext.ContextWasAlreadyActive();
+			bSharedDC = ScopeContext.ContextsShareSameDC();
 
 			DeleteQueriesForCurrentContext(Context->OpenGLContext);
 			glBindVertexArray(0);
@@ -453,6 +462,13 @@ void PlatformReleaseOpenGLContext(FPlatformOpenGLDevice* Device, FPlatformOpenGL
 	ReleaseDC(Context->WindowHandle, Context->DeviceContext);
 	Context->DeviceContext = NULL;
 
+	if (PlatformOpenGLCurrentContext(Device) == CONTEXT_Rendering && bSharedDC)
+	{
+		// The rendering context has been made current using the DC of the now destroyed context. Since this DC has been released the current context will be invalid.
+		// To properly set the rendering context we must make current here with it's own DC.
+		ContextMakeCurrent(Device->RenderingContext.DeviceContext, Device->RenderingContext.OpenGLContext);
+	}
+
 	check(Context->WindowHandle);
 
 	if (Context->bReleaseWindowOnDestroy)
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLDrv.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLDrv.h
index 201ab5a30d67..0e369dde4122 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLDrv.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLDrv.h
@@ -14,6 +14,7 @@
 #include "RHI.h"
 #include "GPUProfiler.h"
 #include "RenderResource.h"
+#include "Templates/EnableIf.h"
 
 //TODO: Move these to OpenGLDrvPrivate.h
 #if PLATFORM_WINDOWS
@@ -59,7 +60,7 @@ struct Rect;
 template<class T> struct TOpenGLResourceTraits;
 
 // This class has multiple inheritance but really FGPUTiming is a static class
-class FOpenGLBufferedGPUTiming : public FRenderResource, public FGPUTiming
+class FOpenGLBufferedGPUTiming : public FGPUTiming
 {
 public:
 
@@ -71,9 +72,6 @@ public:
 	 */
 	FOpenGLBufferedGPUTiming(class FOpenGLDynamicRHI* InOpenGLRHI, int32 BufferSize);
 
-	/**
-	 * Start a GPU timing measurement.
-	 */
 	void	StartTiming();
 
 	/**
@@ -90,15 +88,8 @@ public:
 	 */
 	uint64	GetTiming(bool bGetCurrentResultsAndBlock = false);
 
-	/**
-	 * Initializes all OpenGL resources.
-	 */
-	virtual void InitDynamicRHI() override;
-
-	/**
-	 * Releases all OpenGL resources.
-	 */
-	virtual void ReleaseDynamicRHI() override;
+	void InitResources();
+	void ReleaseResources();
 
 
 private:
@@ -129,7 +120,7 @@ private:
   * OpenGL lacks this concept at present, so the class is just a placeholder
   * Timings are all assumed to be non-disjoint
   */
-class FOpenGLDisjointTimeStampQuery : public FRenderResource
+class FOpenGLDisjointTimeStampQuery
 {
 public:
 	FOpenGLDisjointTimeStampQuery(class FOpenGLDynamicRHI* InOpenGLRHI=NULL);
@@ -137,7 +128,7 @@ public:
 	void Init(class FOpenGLDynamicRHI* InOpenGLRHI)
 	{
 		OpenGLRHI = InOpenGLRHI;
-		InitResource();
+		InitResources();
 	}
 
 	void StartTracking();
@@ -150,18 +141,16 @@ public:
 	}
 	static bool IsSupported()
 	{
-		return FOpenGL::SupportsDisjointTimeQueries();
+#if UE_BUILD_SHIPPING
+		return false;
+#else
+		return false;
+		//return FOpenGL::SupportsDisjointTimeQueries();
+#endif
 	}
 
-	/**
-	 * Initializes all resources.
-	 */
-	virtual void InitDynamicRHI();
-
-	/**
-	 * Releases all resources.
-	 */
-	virtual void ReleaseDynamicRHI();
+	void InitResources();
+	void ReleaseResources();
 
 
 private:
@@ -182,12 +171,12 @@ public:
 	,	Timing(InRHI, 1)
 	{
 		// Initialize Buffered timestamp queries 
-		Timing.InitResource();
+		Timing.InitResources();
 	}
 
 	virtual ~FOpenGLEventNode()
 	{
-		Timing.ReleaseResource();
+		Timing.ReleaseResources();
 	}
 
 	/** 
@@ -218,15 +207,15 @@ public:
 		RootEventTiming(InRHI, 1),
 		DisjointQuery(InRHI)
 	{
-	  RootEventTiming.InitResource();
-	  DisjointQuery.InitResource();
+	  RootEventTiming.InitResources();
+	  DisjointQuery.InitResources();
 	}
 
 	~FOpenGLEventNodeFrame()
 	{
 
-		RootEventTiming.ReleaseResource();
-		DisjointQuery.ReleaseResource();
+		RootEventTiming.ReleaseResources();
+		DisjointQuery.ReleaseResources();
 	}
 
 	/** Start this frame of per tracking */
@@ -264,6 +253,7 @@ struct FOpenGLGPUProfiler : public FGPUProfiler
 	class FOpenGLDynamicRHI* OpenGLRHI;
 	// count the number of beginframe calls without matching endframe calls.
 	int32 NestedFrameCount;
+	bool bIntialized;
 
 	/** GPU hitch profile histories */
 	TIndirectArray<FOpenGLEventNodeFrame> GPUHitchEventNodeFrames;
@@ -274,11 +264,16 @@ struct FOpenGLGPUProfiler : public FGPUProfiler
 	,	CurrentGPUFrameQueryIndex(0)
 	,	OpenGLRHI(InOpenGLRHI)
 	,	NestedFrameCount(0)
+	,	bIntialized(false)
 	{
-		FrameTiming.InitResource();
-		for ( int32 Index=0; Index < MAX_GPUFRAMEQUERIES; ++Index )
+	}
+
+	void InitResources()
+	{
+		FrameTiming.InitResources();
+		for (int32 Index = 0; Index < MAX_GPUFRAMEQUERIES; ++Index)
 		{
-			DisjointGPUFrameTimeQuery[Index].Init(InOpenGLRHI);
+			DisjointGPUFrameTimeQuery[Index].Init(OpenGLRHI);
 		}
 	}
 
@@ -321,8 +316,24 @@ public:
 	virtual void Shutdown();
 	virtual const TCHAR* GetName() override { return TEXT("OpenGL"); }
 
+	// If using a Proxy object return the contained GL object rather than the proxy itself.
 	template<typename TRHIType>
-	static FORCEINLINE typename TOpenGLResourceTraits<TRHIType>::TConcreteType* ResourceCast(TRHIType* Resource)
+	static FORCEINLINE typename TEnableIf<TIsGLProxyObject<typename TOpenGLResourceTraits<TRHIType>::TConcreteType>::Value, typename TOpenGLResourceTraits<TRHIType>::TConcreteType::ContainedGLType*>::Type ResourceCast(TRHIType* Resource)
+	{	
+		auto GLProxy = static_cast<typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>(Resource);
+		// rhi resource can be null.
+		return GLProxy ? GLProxy->GetGLResourceObject() : nullptr;
+	}
+
+	template<typename TRHIType>
+	static FORCEINLINE typename TEnableIf<!TIsGLProxyObject<typename TOpenGLResourceTraits<TRHIType>::TConcreteType>::Value, typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>::Type ResourceCast(TRHIType* Resource)
+	{
+		CheckRHITFence(static_cast<typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>(Resource));
+		return static_cast<typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>(Resource);
+	}
+
+	template<typename TRHIType>
+	static FORCEINLINE typename TEnableIf<!TIsGLProxyObject<typename TOpenGLResourceTraits<TRHIType>::TConcreteType>::Value, typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>::Type ResourceCast_Unfenced(TRHIType* Resource)
 	{
 		return static_cast<typename TOpenGLResourceTraits<TRHIType>::TConcreteType*>(Resource);
 	}
@@ -408,7 +419,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef Viewport, uint32 SizeX, uint32 SizeY, bool bIsFullscreen) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets,const FVertexBufferRHIParamRef* VertexBuffers,const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override;
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual void RHISubmitCommandsAndFlushGPU() final override;
 	virtual bool RHIGetAvailableResolutions(FScreenResolutionArray& Resolutions, bool bIgnoreRefreshRate) final override;
@@ -500,6 +510,7 @@ public:
 	virtual void RHIPushEvent(const TCHAR* Name, FColor Color) final override;
 	virtual void RHIPopEvent() final override;
 	virtual void RHIInvalidateCachedState() final override;
+	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override;
 
 	// FOpenGLDynamicRHI interface.
 	virtual FTexture2DRHIRef RHICreateTexture2DFromResource(EPixelFormat Format, uint32 SizeX, uint32 SizeY, uint32 NumMips, uint32 NumSamples, uint32 NumSamplesTileMem, const FClearValueBinding& ClearValueBinding, GLuint Resource, uint32 Flags);
@@ -518,12 +529,26 @@ public:
 	void InvalidateTextureResourceInCache(GLuint Resource);
 	void InvalidateUAVResourceInCache(GLuint Resource);
 	/** Set a resource on texture target of a specific real OpenGL stage. Goes through cache to eliminate redundant calls. */
-	void CachedSetupTextureStage(FOpenGLContextState& ContextState, GLint TextureIndex, GLenum Target, GLuint Resource, GLint BaseMip, GLint NumMips);
+	FORCEINLINE void CachedSetupTextureStage(FOpenGLContextState& ContextState, GLint TextureIndex, GLenum Target, GLuint Resource, GLint BaseMip, GLint NumMips)
+	{
+		FTextureStage& TextureState = ContextState.Textures[TextureIndex];
+		const bool bSameTarget = (TextureState.Target == Target);
+		const bool bSameResource = (TextureState.Resource == Resource);
+
+		if (bSameTarget && bSameResource)
+		{
+			// Nothing changed, no need to update
+			return;
+		}
+		CachedSetupTextureStageInner(ContextState, TextureIndex, Target, Resource, BaseMip, NumMips);
+	}
+
+	void CachedSetupTextureStageInner(FOpenGLContextState& ContextState, GLint TextureIndex, GLenum Target, GLuint Resource, GLint BaseMip, GLint NumMips);
 	void CachedSetupUAVStage(FOpenGLContextState& ContextState, GLint UAVIndex, GLenum Format, GLuint Resource);
 	void UpdateSRV(FOpenGLShaderResourceView* SRV);
 	FOpenGLContextState& GetContextStateForCurrentContext(bool bAssertIfInvalid = true);
 
-	void CachedBindArrayBuffer( FOpenGLContextState& ContextState, GLuint Buffer )
+	FORCEINLINE void CachedBindArrayBuffer( FOpenGLContextState& ContextState, GLuint Buffer )
 	{
 		VERIFY_GL_SCOPE();
 		if( ContextState.ArrayBufferBound != Buffer )
@@ -599,6 +624,8 @@ public:
 #define RHITHREAD_GLTRACE 1
 #if RHITHREAD_GLTRACE 
 	#define RHITHREAD_GLTRACE_BLOCKING QUICK_SCOPE_CYCLE_COUNTER(STAT_OGLRHIThread_Flush);
+//#define RHITHREAD_GLTRACE_BLOCKING FPlatformMisc::LowLevelOutputDebugStringf(TEXT("FLUSHING %s!\n"), ANSI_TO_TCHAR(__FUNCTION__))
+//#define RHITHREAD_GLTRACE_BLOCKING UE_LOG(LogRHI, Warning,TEXT("FLUSHING %s!\n"), ANSI_TO_TCHAR(__FUNCTION__));
 #else
 	#define RHITHREAD_GLTRACE_BLOCKING 
 #endif
@@ -620,7 +647,7 @@ public:
 
 #define RHITHREAD_GLCOMMAND_EPILOGUE_GET_RETURN(x) };\
 		x ReturnValue = (x)0;\
-		if (RHICmdList.Bypass() ||  !IsRunningRHIInSeparateThread())\
+		if (RHICmdList.Bypass() ||  !IsRunningRHIInSeparateThread() || IsInRHIThread() )\
 		{\
 			ReturnValue = GLCommand();\
 		}\
@@ -633,7 +660,7 @@ public:
 
 
 #define RHITHREAD_GLCOMMAND_EPILOGUE() };\
-		if (RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())\
+		if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))\
 		{\
 			return GLCommand();\
 		}\
@@ -703,93 +730,10 @@ public:
 		}
 	};
 
-	virtual void* LockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush)
-	{
-		check(IsInRenderingThread());
-		static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks")); 
-		bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
-		void* Result;
-		uint32 MipBytes = 0;
-		if (!bBuffer || LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
-		{
-			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
-			Result = this->RHILockTexture2D(Texture, MipIndex, LockMode, DestStride, bLockWithinMiptail);
-		}
-		else
-		{
-			// Calculate the dimensions of the mip-map.
-			EPixelFormat PixelFormat = Texture->GetFormat();
-			const uint32 BlockSizeX = GPixelFormats[PixelFormat].BlockSizeX;
-			const uint32 BlockSizeY = GPixelFormats[PixelFormat].BlockSizeY;
-			const uint32 BlockBytes = GPixelFormats[PixelFormat].BlockBytes;
-			const uint32 MipSizeX = FMath::Max(Texture->GetSizeX() >> MipIndex, BlockSizeX);
-			const uint32 MipSizeY = FMath::Max(Texture->GetSizeY() >> MipIndex, BlockSizeY);
-			uint32 NumBlocksX = (MipSizeX + BlockSizeX - 1) / BlockSizeX;
-			uint32 NumBlocksY = (MipSizeY + BlockSizeY - 1) / BlockSizeY;
-			if (PixelFormat == PF_PVRTC2 || PixelFormat == PF_PVRTC4)
-			{
-				// PVRTC has minimum 2 blocks width and height
-				NumBlocksX = FMath::Max<uint32>(NumBlocksX, 2);
-				NumBlocksY = FMath::Max<uint32>(NumBlocksY, 2);
-			}
-			MipBytes = NumBlocksX * NumBlocksY * BlockBytes;
-
-			DestStride = NumBlocksX * BlockBytes;
-
-			Result = FMemory::Malloc(MipBytes, 16);
-
-			check(Result);
-		}
-		GLLockTracker.Lock(Texture, Result, MipIndex, DestStride, MipBytes, LockMode);
-
-		return Result;
-	}
-
-	virtual void UnlockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush) final override
-	{
-		check(IsInRenderingThread());
-		static auto* CVarRHICmdBufferWriteLocks = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.RHICmdBufferWriteLocks"));
-		bool bBuffer = CVarRHICmdBufferWriteLocks->GetValueOnRenderThread() > 0;
-		FTextureLockTracker::FLockParams Params = GLLockTracker.Unlock(Texture, MipIndex);
-		if (!bBuffer || Params.LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
-		{
-			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockVertexBuffer_Flush);
-			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
-			this->RHIUnlockTexture2D(Texture, MipIndex, bLockWithinMiptail);
-			GLLockTracker.TotalMemoryOutstanding = 0;
-		}
-		else
-		{
-			auto GLCommand = [=]()
-			{
-				uint32 DestStride;
-				uint8* TexMem = (uint8*)this->RHILockTexture2D(Texture, MipIndex, Params.LockMode, DestStride, bLockWithinMiptail);
-				uint8* BuffMem = (uint8*)Params.Buffer;
-				if (DestStride == Params.Stride)
-				{
-					FMemory::Memcpy(TexMem, BuffMem, Params.BufferSize);
-				}
-				else
-				{
-					EPixelFormat PixelFormat = Texture->GetFormat();
-					const uint32 BlockSizeY = GPixelFormats[PixelFormat].BlockSizeY;
-					const uint32 BlockBytes = GPixelFormats[PixelFormat].BlockBytes;
-					const uint32 MipSizeY = FMath::Max(Texture->GetSizeY() >> MipIndex, BlockSizeY);
-					uint32 NumBlocksY = (MipSizeY + BlockSizeY - 1) / BlockSizeY;
-					uint32 SourceStride = Params.Stride;
-					for (uint32 Y = 0; Y < NumBlocksY; ++Y)
-					{
-						FMemory::Memcpy(TexMem, BuffMem, SourceStride);
-						BuffMem += SourceStride;
-						TexMem += DestStride;
-					}
-				}
-				FMemory::Free(Params.Buffer);
-				this->RHIUnlockTexture2D(Texture, MipIndex, bLockWithinMiptail);
-			};
-			new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand(GLCommand); 
-		}
-	}
+	virtual void* LockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush) final override;
+	virtual void UnlockTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, bool bLockWithinMiptail, bool bNeedsDefaultRHIFlush) final override;
+	virtual void* RHILockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail) final override;
+	virtual void RHIUnlockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, bool bLockWithinMiptail) final override;
 
 	virtual FIndexBufferRHIRef CreateIndexBuffer_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 Stride, uint32 Size, uint32 InUsage, FRHIResourceCreateInfo& CreateInfo) final override;
 
@@ -807,35 +751,43 @@ public:
 
 	virtual FShaderResourceViewRHIRef CreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FVertexBufferRHIParamRef VertexBuffer, uint32 Stride, uint8 Format) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(VertexBuffer, Stride, Format);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef CreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FIndexBufferRHIParamRef Buffer) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Buffer);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
+	virtual FVertexDeclarationRHIRef CreateVertexDeclaration_RenderThread(class FRHICommandListImmediate& RHICmdList, const FVertexDeclarationElementList& Elements) final override
+	{
+		// threadsafe, doesn't really do anything
+		return this->RHICreateVertexDeclaration(Elements);
+	}
+
+	virtual FTextureReferenceRHIRef RHICreateTextureReference_RenderThread(class FRHICommandListImmediate& RHICmdList, FLastRenderTimeContainer* LastRenderTime) final override
+	{
+		// threadsafe, doesn't really do anything
+		return this->RHICreateTextureReference(LastRenderTime);
+	}
+
+
 	virtual FTexture2DRHIRef RHICreateTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 SizeX, uint32 SizeY, uint8 Format, uint32 NumMips, uint32 NumSamples, uint32 Flags, FRHIResourceCreateInfo& CreateInfo) final override
 	{
-#if 1
-		RHITHREAD_GLCOMMAND_PROLOGUE();
-		return this->RHICreateTexture2D(SizeX, SizeY, Format, NumMips, NumSamples, Flags, CreateInfo);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FTexture2DRHIRef);
-#else
-		// Fill in the GL resources.
-		FRHITexture* Texture = CreateOpenGLRHITextureOnly(SizeX, SizeY, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, InClearValue, BulkData);
-
+		const bool bCubeTexture = false;
+		const bool bArrayTexture = false;
+		const bool bIsExternal = false;
+		const uint32 ArraySize = 1;
+		FOpenGLTexture2D* Texture2D = (FOpenGLTexture2D*)CreateOpenGLRHITextureOnly(SizeX, SizeY, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, CreateInfo.ClearValueBinding, CreateInfo.BulkData);
+		Texture2D->CreationFence.Reset();
 		RunOnGLRenderContextThread([=]()
 		{
-			InitializeGLTexture(Texture, SizeX, SizeY, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, InClearValue, BulkData);
+			// Fill in the GL resources.
+			InitializeGLTexture(Texture2D, SizeX, SizeY, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, CreateInfo.ClearValueBinding, CreateInfo.BulkData);
+			Texture2D->CreationFence.WriteAssertFence();
 		});
-
-		return Texture;
-#endif
+		Texture2D->CreationFence.SetRHIThreadFence();
+		return Texture2D;
 	}
 
 	virtual FTexture2DRHIRef RHICreateTextureExternal2D_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 SizeX, uint32 SizeY, uint8 Format, uint32 NumMips, uint32 NumSamples, uint32 Flags, FRHIResourceCreateInfo& CreateInfo) final override
@@ -882,65 +834,61 @@ public:
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture2DRHI, uint8 MipLevel) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Texture2DRHI, MipLevel);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture2DRHI, uint8 MipLevel, uint8 NumMipLevels, uint8 Format) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Texture2DRHI, MipLevel, NumMipLevels, Format);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture3DRHIParamRef Texture3DRHI, uint8 MipLevel) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Texture3DRHI, MipLevel);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DArrayRHIParamRef Texture2DArrayRHI, uint8 MipLevel) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Texture2DArrayRHI, MipLevel);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef TextureCubeRHI, uint8 MipLevel) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(TextureCubeRHI, MipLevel);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FVertexBufferRHIParamRef VertexBuffer, uint32 Stride, uint8 Format) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(VertexBuffer, Stride, Format);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FIndexBufferRHIParamRef Buffer) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(Buffer);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FShaderResourceViewRHIRef RHICreateShaderResourceView_RenderThread(class FRHICommandListImmediate& RHICmdList, FStructuredBufferRHIParamRef StructuredBuffer) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateShaderResourceView(StructuredBuffer);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FShaderResourceViewRHIRef);
 	}
 
 	virtual FTextureCubeRHIRef RHICreateTextureCube_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 Size, uint8 Format, uint32 NumMips, uint32 Flags, FRHIResourceCreateInfo& CreateInfo) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
-		return this->RHICreateTextureCube(Size, Format, NumMips, Flags, CreateInfo);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FTextureCubeRHIRef);
+		const bool bCubeTexture = true;
+		const bool bArrayTexture = false;
+		const bool bIsExternal = false;
+		const uint32 ArraySize = 1;
+		uint32 NumSamples = 1;
+		FOpenGLTextureCube* TextureCube = (FOpenGLTextureCube*)CreateOpenGLRHITextureOnly(Size, Size, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, CreateInfo.ClearValueBinding, CreateInfo.BulkData);
+		TextureCube->CreationFence.Reset();
+		RunOnGLRenderContextThread([=]()
+		{
+			// Fill in the GL resources.
+			InitializeGLTexture(TextureCube, Size, Size, bCubeTexture, bArrayTexture, bIsExternal, Format, NumMips, NumSamples, ArraySize, Flags, CreateInfo.ClearValueBinding, CreateInfo.BulkData);
+			TextureCube->CreationFence.WriteAssertFence();
+		});
+		TextureCube->CreationFence.SetRHIThreadFence();
+		return TextureCube;
 	}
 
 	virtual FTextureCubeRHIRef RHICreateTextureCubeArray_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 Size, uint32 ArraySize, uint8 Format, uint32 NumMips, uint32 Flags, FRHIResourceCreateInfo& CreateInfo) final override
@@ -952,26 +900,9 @@ public:
 
 	virtual FRenderQueryRHIRef RHICreateRenderQuery_RenderThread(class FRHICommandListImmediate& RHICmdList, ERenderQueryType QueryType) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateRenderQuery(QueryType);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FRenderQueryRHIRef);
 	}
 
-	virtual void* RHILockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail) final override
-	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
-		return this->RHILockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, LockMode, DestStride, bLockWithinMiptail);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(void*);
-	}
-
-	virtual void RHIUnlockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, bool bLockWithinMiptail) final override
-	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
-		this->RHIUnlockTextureCubeFace(Texture, FaceIndex, ArrayIndex, MipIndex, bLockWithinMiptail);
-		RHITHREAD_GLCOMMAND_EPILOGUE();
-	}
-
-
 	virtual FTexture2DRHIRef AsyncReallocateTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture2D, int32 NewMipCount, int32 NewSizeX, int32 NewSizeY, FThreadSafeCounter* RequestStatus) final override;
 
 	virtual ETextureReallocationStatus FinalizeAsyncReallocateTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture2D, bool bBlockUntilCompleted) final override
@@ -986,44 +917,32 @@ public:
 
 	virtual FVertexShaderRHIRef CreateVertexShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateVertexShader(Code);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FVertexShaderRHIRef);
 	}
 
 	virtual FPixelShaderRHIRef CreatePixelShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreatePixelShader(Code);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FPixelShaderRHIRef);
 	}
 
 	virtual FGeometryShaderRHIRef CreateGeometryShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateGeometryShader(Code);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FGeometryShaderRHIRef);
 	}
 
 	virtual FGeometryShaderRHIRef CreateGeometryShaderWithStreamOutput_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code, const FStreamOutElementList& ElementList, uint32 NumStrides, const uint32* Strides, int32 RasterizedStream) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateGeometryShaderWithStreamOutput(Code, ElementList, NumStrides, Strides, RasterizedStream);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FGeometryShaderRHIRef);
 	}
 
 	virtual FComputeShaderRHIRef CreateComputeShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateComputeShader(Code);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FComputeShaderRHIRef);
 	}
 
 	virtual FHullShaderRHIRef CreateHullShader_RenderThread(class FRHICommandListImmediate& RHICmdList, const TArray<uint8>& Code) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		return this->RHICreateHullShader(Code);
-		RHITHREAD_GLCOMMAND_EPILOGUE_RETURN(FHullShaderRHIRef);
 	}
 
 	virtual FSamplerStateRHIRef RHICreateSamplerState(const FSamplerStateInitializerRHI& Initializer) final override;
@@ -1037,10 +956,7 @@ public:
 
 	virtual void UpdateTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture2DRHIParamRef Texture, uint32 MipIndex, const struct FUpdateTextureRegion2D& UpdateRegion, uint32 SourcePitch, const uint8* SourceData) final override
 	{
-		RHITHREAD_GLCOMMAND_PROLOGUE();
 		GDynamicRHI->RHIUpdateTexture2D(Texture, MipIndex, UpdateRegion, SourcePitch, SourceData);
-		RHITHREAD_GLCOMMAND_EPILOGUE();
-
 	}
 
 	virtual void UpdateTexture3D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture3DRHIParamRef Texture, uint32 MipIndex, const struct FUpdateTextureRegion3D& UpdateRegion, uint32 SourceRowPitch, uint32 SourceDepthPitch, const uint8* SourceData) final override
@@ -1116,12 +1032,6 @@ private:
 	/** A critical section to protect modifications and iteration over Queries list */
 	FCriticalSection QueriesListCriticalSection;
 
-	/** Query list. This is used to inform queries they're no longer valid when OpenGL context they're in gets released from another thread. */
-	TArray<FOpenGLRenderQuery*> TimerQueries;
-
-	/** A critical section to protect modifications and iteration over Queries list */
-	FCriticalSection TimerQueriesListCriticalSection;
-
 	FOpenGLGPUProfiler GPUProfilingData;
 	friend FOpenGLGPUProfiler;
 //	FOpenGLEventQuery FrameSyncEvent;
@@ -1136,8 +1046,8 @@ private:
 	/** needs to be called before each dispatch call */
 	
 
-	void EnableVertexElementCached(FOpenGLContextState& ContextCache, const FOpenGLVertexElement &VertexElement, GLsizei Stride, void *Pointer, GLuint Buffer);
-	void EnableVertexElementCachedZeroStride(FOpenGLContextState& ContextCache, const FOpenGLVertexElement &VertexElement, uint32 NumVertices, FOpenGLVertexBuffer* VertexBuffer);
+	void EnableVertexElementCached(FOpenGLContextState& ContextCache, GLuint AttributeIndex, const FOpenGLVertexElement &VertexElement, GLsizei Stride, void *Pointer, GLuint Buffer);
+	void EnableVertexElementCachedZeroStride(FOpenGLContextState& ContextCache, GLuint AttributeIndex, const FOpenGLVertexElement &VertexElement, uint32 NumVertices, FOpenGLVertexBuffer* VertexBuffer);
 	void SetupVertexArrays(FOpenGLContextState& ContextCache, uint32 BaseVertexIndex, FOpenGLStream* Streams, uint32 NumStreams, uint32 MaxVertices);
 	void SetupVertexArraysVAB(FOpenGLContextState& ContextCache, uint32 BaseVertexIndex, FOpenGLStream* Streams, uint32 NumStreams, uint32 MaxVertices);
 	void SetupVertexArraysUP(FOpenGLContextState& ContextState, void* Buffer, uint32 Stride);
@@ -1154,9 +1064,18 @@ private:
 	void UpdateViewportInOpenGLContext( FOpenGLContextState& ContextState );
 	
 	template <class ShaderType> void SetResourcesFromTables(const ShaderType* RESTRICT);
-	void CommitGraphicsResourceTables();
+	FORCEINLINE void CommitGraphicsResourceTables()
+	{
+		if (PendingState.bAnyDirtyGraphicsUniformBuffers)
+		{
+			CommitGraphicsResourceTablesInner();
+		}
+	}
+	void CommitGraphicsResourceTablesInner();
 	void CommitComputeResourceTables(class FOpenGLComputeShader* ComputeShader);
 	void CommitNonComputeShaderConstants();
+	void CommitNonComputeShaderConstantsSlowPath();
+	void CommitNonComputeShaderConstantsFastPath(FOpenGLLinkedProgram* LinkedProgram);
 	void CommitComputeShaderConstants(FComputeShaderRHIParamRef ComputeShaderRHI);
 	void SetPendingBlendStateForActiveRenderTargets( FOpenGLContextState& ContextState );
 	
@@ -1188,17 +1107,30 @@ private:
 	void FreeZeroStrideBuffers();
 
 	/** Remaps vertex attributes on devices where GL_MAX_VERTEX_ATTRIBS < 16 */
-	uint32 RemapVertexAttrib(uint32 VertexAttributeIndex)
+	FORCEINLINE uint32 RemapVertexAttrib(uint32 VertexAttributeIndex)
 	{
 		if (FOpenGL::NeedsVertexAttribRemapTable())
 		{
-			check(VertexAttributeIndex < ARRAY_COUNT(PendingState.BoundShaderState->VertexShader->Bindings.VertexAttributeRemap));
-			VertexAttributeIndex = PendingState.BoundShaderState->VertexShader->Bindings.VertexAttributeRemap[VertexAttributeIndex];
-			check(VertexAttributeIndex < NUM_OPENGL_VERTEX_STREAMS); // check that this attribute has remaped correctly.
+			check(VertexAttributeIndex < ARRAY_COUNT(PendingState.BoundShaderState->GetVertexShader()->Bindings.VertexAttributeRemap));
+			VertexAttributeIndex = PendingState.BoundShaderState->GetVertexShader()->Bindings.VertexAttributeRemap[VertexAttributeIndex];
 		}
+		check(VertexAttributeIndex < NUM_OPENGL_VERTEX_STREAMS); // check that this attribute has remaped correctly.
 		return VertexAttributeIndex;
 	}
 
+	FORCEINLINE uint32 RemapVertexAttrib(const FOpenGLShaderBindings& Bindings, uint32 VertexAttributeIndex)
+	{
+		if (FOpenGL::NeedsVertexAttribRemapTable())
+		{
+			check(VertexAttributeIndex < ARRAY_COUNT(Bindings.VertexAttributeRemap));
+			VertexAttributeIndex = Bindings.VertexAttributeRemap[VertexAttributeIndex];
+		}
+		check(VertexAttributeIndex < NUM_OPENGL_VERTEX_STREAMS); // check that this attribute has remaped correctly.
+		return VertexAttributeIndex;
+	}
+
+	
+
 	FTextureLockTracker GLLockTracker;
 
 };
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLResources.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLResources.h
index de692152bd2e..82dc97ab90a9 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLResources.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLResources.h
@@ -27,6 +27,8 @@
 
 class FOpenGLDynamicRHI;
 class FOpenGLLinkedProgram;
+typedef TArray<ANSICHAR> FAnsiCharArray;
+
 
 extern void OnVertexBufferDeletion( GLuint VertexBufferResource );
 extern void OnIndexBufferDeletion( GLuint IndexBufferResource );
@@ -61,24 +63,33 @@ void DecrementBufferMemory(GLenum Type, bool bStructuredBuffer, uint32 NumBytes)
 
 // Extra stats for finer-grained timing
 // They shouldn't always be on, as they may impact overall performance
-#define OPENGLRHI_DETAILED_STATS 0
+#if UE_BUILD_DEVELOPMENT
+	#define OPENGLRHI_DETAILED_STATS 1
+#else
+	#define OPENGLRHI_DETAILED_STATS 0
+#endif
 #if OPENGLRHI_DETAILED_STATS
 	DECLARE_CYCLE_STAT_EXTERN(TEXT("MapBuffer time"),STAT_OpenGLMapBufferTime,STATGROUP_OpenGLRHI, );
 	DECLARE_CYCLE_STAT_EXTERN(TEXT("UnmapBuffer time"),STAT_OpenGLUnmapBufferTime,STATGROUP_OpenGLRHI, );
 	#define SCOPE_CYCLE_COUNTER_DETAILED(Stat)	SCOPE_CYCLE_COUNTER(Stat)
+	#define DETAILED_QUICK_SCOPE_CYCLE_COUNTER(x) QUICK_SCOPE_CYCLE_COUNTER(x)
 #else
 	#define SCOPE_CYCLE_COUNTER_DETAILED(Stat)
+	#define DETAILED_QUICK_SCOPE_CYCLE_COUNTER(x)
 #endif
 
-#if 1
-#define USE_REAL_RHI_FENCES (1)
-#define ASSERT_ON_REAL_RHI_FENCES_WAIT (1)
+#if UE_BUILD_TEST
+#define USE_REAL_RHI_FENCES (0)
 #define USE_CHEAP_ASSERTONLY_RHI_FENCES (1)
-#define GLAF_CHECK(x) if (!(x)) { FPlatformMisc::LocalPrint(TEXT("Failed a check on line:\n")); FPlatformMisc::LocalPrint(TEXT( PREPROCESSOR_TO_STRING(__LINE__))); FPlatformMisc::LocalPrint(TEXT("\n")); *((int*)3) = 13; }
+#define GLAF_CHECK(x) \
+if (!(x)) \
+{  \
+	UE_LOG(LogRHI, Fatal, TEXT("AssertFence Fail on line %s."), TEXT(PREPROCESSOR_TO_STRING(__LINE__))); \
+	FPlatformMisc::LocalPrint(TEXT("Failed a check on line:\n")); FPlatformMisc::LocalPrint(TEXT(PREPROCESSOR_TO_STRING(__LINE__))); FPlatformMisc::LocalPrint(TEXT("\n")); *((int*)3) = 13; \
+}
 
 #elif DO_CHECK
 #define USE_REAL_RHI_FENCES (1)
-#define ASSERT_ON_REAL_RHI_FENCES_WAIT (1)
 #define USE_CHEAP_ASSERTONLY_RHI_FENCES (1)
 #define GLAF_CHECK(x)  check(x)
 
@@ -86,13 +97,84 @@ void DecrementBufferMemory(GLenum Type, bool bStructuredBuffer, uint32 NumBytes)
 
 #else
 #define USE_REAL_RHI_FENCES (0)
-#define ASSERT_ON_REAL_RHI_FENCES_WAIT (0)
 #define USE_CHEAP_ASSERTONLY_RHI_FENCES (0)
 
 #define GLAF_CHECK(x) 
 
 #endif
 
+class FOpenGLRHIThreadResourceFence
+{
+	FGraphEventRef RealRHIFence;
+
+public:
+
+	FORCEINLINE_DEBUGGABLE void Reset()
+	{
+		if (IsRunningRHIInSeparateThread())
+		{
+			GLAF_CHECK(IsInRenderingThread());
+			GLAF_CHECK(!RealRHIFence.GetReference() || RealRHIFence->IsComplete());
+			RealRHIFence = nullptr;
+		}
+	}
+	FORCEINLINE_DEBUGGABLE void SetRHIThreadFence()
+	{
+		if (IsRunningRHIInSeparateThread())
+		{
+			GLAF_CHECK(IsInRenderingThread());
+
+			GLAF_CHECK(!RealRHIFence.GetReference() || RealRHIFence->IsComplete());
+			if (IsRunningRHIInSeparateThread())
+			{
+				RealRHIFence = FRHICommandListExecutor::GetImmediateCommandList().RHIThreadFence(false);
+			}
+		}
+	}
+	FORCEINLINE_DEBUGGABLE void WriteAssertFence()
+	{
+		if (IsRunningRHIInSeparateThread())
+		{
+			GLAF_CHECK((IsInRenderingThread() && !IsRunningRHIInSeparateThread()) || (IsInRHIThread() && IsRunningRHIInSeparateThread()));
+		}
+	}
+	FORCEINLINE_DEBUGGABLE void WaitFence()
+	{
+		if (IsRunningRHIInSeparateThread())
+		{
+			GLAF_CHECK(IsInRenderingThread());
+			if (!IsRunningRHIInSeparateThread() && !FRHICommandListExecutor::GetImmediateCommandList().Bypass() && !GRHINeedsExtraDeletionLatency) // if we don't have an RHI thread, but we are doing parallel rendering, then we need to flush now because we are not deferring resource destruction
+			{
+				QUICK_SCOPE_CYCLE_COUNTER(STAT_FOpenGLRHIThreadResourceFence_Flush);
+				FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+			}
+			if (RealRHIFence.GetReference() && RealRHIFence->IsComplete())
+			{
+				RealRHIFence = nullptr;
+			}
+			else if (RealRHIFence.GetReference())
+			{
+				UE_LOG(LogRHI, Warning, TEXT("FOpenGLRHIThreadResourceFence waited.")); 
+				QUICK_SCOPE_CYCLE_COUNTER(STAT_FOpenGLRHIThreadResourceFence_Wait);
+				FRHICommandListExecutor::WaitOnRHIThreadFence(RealRHIFence);
+				RealRHIFence = nullptr;
+			}
+		}
+	}
+	FORCEINLINE_DEBUGGABLE void WaitFenceRenderThreadOnly()
+	{
+		if (IsRunningRHIInSeparateThread())
+		{
+			// Do not check if running on RHI thread.
+			// all rhi thread operations will be in order, check for RHIT isnt required.
+			if (IsInRenderingThread())
+			{
+				WaitFence();
+			}
+		}
+	}
+};
+
 class FOpenGLAssertRHIThreadFence
 {
 #if USE_REAL_RHI_FENCES
@@ -104,11 +186,11 @@ class FOpenGLAssertRHIThreadFence
 
 public:
 
-	FORCEINLINE void Reset()
+	FORCEINLINE_DEBUGGABLE void Reset()
 	{
 		if (IsRunningRHIInSeparateThread())
 		{
-			GLAF_CHECK(IsInRenderingThread() || IsInRHIThread());
+			check(IsInRenderingThread() || IsInRHIThread());
 #if USE_REAL_RHI_FENCES
 
 			GLAF_CHECK(!RealRHIFence.GetReference() || RealRHIFence->IsComplete());
@@ -121,11 +203,11 @@ public:
 #endif
 		}
 	}
-	FORCEINLINE void SetRHIThreadFence()
+	FORCEINLINE_DEBUGGABLE void SetRHIThreadFence()
 	{
 		if (IsRunningRHIInSeparateThread())
 		{
-			GLAF_CHECK(IsInRenderingThread() || IsInRHIThread());
+			check(IsInRenderingThread() || IsInRHIThread());
 
 #if USE_CHEAP_ASSERTONLY_RHI_FENCES
 			int32 AFenceVal = AssertFence.GetValue();
@@ -133,29 +215,30 @@ public:
 #endif
 #if USE_REAL_RHI_FENCES
 			GLAF_CHECK(!RealRHIFence.GetReference() || RealRHIFence->IsComplete());
-			if (IsRunningRHIInSeparateThread())
+			// Only get the fence if running on RT.
+			if (IsRunningRHIInSeparateThread() && IsInRenderingThread())
 			{
 				RealRHIFence = FRHICommandListExecutor::GetImmediateCommandList().RHIThreadFence(false);
 			}
 #endif
 		}
 	}
-	FORCEINLINE void WriteAssertFence()
+	FORCEINLINE_DEBUGGABLE void WriteAssertFence()
 	{
 		if (IsRunningRHIInSeparateThread())
 		{
-			GLAF_CHECK((IsInRenderingThread() && !IsRunningRHIInSeparateThread()) || (IsInRHIThread() && IsRunningRHIInSeparateThread()));
+			check((IsInRenderingThread() && !IsRunningRHIInSeparateThread()) || (IsInRHIThread() && IsRunningRHIInSeparateThread()));
 #if USE_CHEAP_ASSERTONLY_RHI_FENCES
 			int32 NewValue = AssertFence.Increment();
 			GLAF_CHECK(NewValue == 2);
 #endif
 		}
 	}
-	FORCEINLINE void WaitFence()
+	FORCEINLINE_DEBUGGABLE void WaitFence()
 	{
 		if (IsRunningRHIInSeparateThread())
 		{
-			GLAF_CHECK(IsInRenderingThread() || IsInRHIThread());
+			check(IsInRenderingThread() || IsInRHIThread());
 			if (!IsRunningRHIInSeparateThread() && !FRHICommandListExecutor::GetImmediateCommandList().Bypass() && !GRHINeedsExtraDeletionLatency) // if we don't have an RHI thread, but we are doing parallel rendering, then we need to flush now because we are not deferring resource destruction
 			{
 				FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::FlushRHIThread);
@@ -173,23 +256,125 @@ public:
 #endif
 		}
 	}
-	FORCEINLINE void WaitFencePossiblyFromRHIThread()
+
+	FORCEINLINE_DEBUGGABLE void WaitFenceRenderThreadOnly()
 	{
 		if (IsRunningRHIInSeparateThread())
 		{
-			if (IsInRHIThread())
+			// Do not check if running on RHI thread.
+			// all rhi thread operations will be in order, check for RHIT isnt required.
+			if (IsInRenderingThread())
 			{
-#if USE_CHEAP_ASSERTONLY_RHI_FENCES
-				GLAF_CHECK(AssertFence.GetValue() == 0 || AssertFence.GetValue() == 2);
-#endif
-				RealRHIFence = nullptr;
-				return;
+				WaitFence();
 			}
-			WaitFence();
 		}
 	}
 };
 
+
+//////////////////////////////////////////////////////////////////////////
+// Proxy object that fulfils immediate requirements of RHIResource creation whilst allowing deferment of GL resource creation on to the RHI thread.
+
+template<typename TRHIType, typename TOGLResourceType>
+class TOpenGLResourceProxy : public TRHIType
+{
+public:
+	TOpenGLResourceProxy(TFunction<TOGLResourceType*(TRHIType*)> CreateFunc)
+		: GLResourceObject(nullptr)
+	{
+		check((bool)CreateFunc);
+		FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+		if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
+		{
+			GLResourceObject = CreateFunc(this);
+			GLResourceObject->AddRef();
+			bQueuedCreation = false;
+		}
+		else
+		{
+			CreationFence.Reset();
+			new (RHICmdList.AllocCommand<FRHICommandGLCommand>()) FRHICommandGLCommand([this, CreateFunc = MoveTemp(CreateFunc)]()
+			{
+				GLResourceObject = CreateFunc(this);
+				GLResourceObject->AddRef();
+				CreationFence.WriteAssertFence();
+			});
+			CreationFence.SetRHIThreadFence();
+			bQueuedCreation = true;
+		}
+	}
+
+	virtual ~TOpenGLResourceProxy()
+	{
+		// Wait for any queued creation calls.
+		WaitIfQueued();
+
+		check(GLResourceObject);
+
+		FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+		if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
+		{
+			GLResourceObject->Release();
+		}
+		else
+		{
+			RunOnGLRenderContextThread([GLResourceObject = GLResourceObject]()
+			{
+				GLResourceObject->Release();
+			});
+			GLResourceObject = nullptr;
+		}
+	}
+
+	TOpenGLResourceProxy(const TOpenGLResourceProxy&) = delete;
+	TOpenGLResourceProxy& operator = (const TOpenGLResourceProxy&) = delete;
+
+	TOGLResourceType* GetGLResourceObject()
+	{
+		CreationFence.WaitFenceRenderThreadOnly();
+		return GLResourceObject;
+	}
+
+	FORCEINLINE TOGLResourceType* GetGLResourceObject_OnRHIThread()
+	{
+		check(IsInRHIThread());
+		return GLResourceObject;
+	}
+
+	typedef TOGLResourceType ContainedGLType;
+private:
+	void WaitIfQueued()
+	{
+		if (bQueuedCreation)
+		{
+			CreationFence.WaitFence();
+		}
+	}
+
+	//FOpenGLRHIThreadResourceFence CreationFence;
+	FOpenGLAssertRHIThreadFence CreationFence;
+	TRefCountPtr<TOGLResourceType> GLResourceObject;
+	bool bQueuedCreation;
+};
+
+typedef TOpenGLResourceProxy<FRHIVertexShader, FOpenGLVertexShader> FOpenGLVertexShaderProxy;
+typedef TOpenGLResourceProxy<FRHIPixelShader, FOpenGLPixelShader> FOpenGLPixelShaderProxy;
+typedef TOpenGLResourceProxy<FRHIGeometryShader, FOpenGLGeometryShader> FOpenGLGeometryShaderProxy;
+typedef TOpenGLResourceProxy<FRHIHullShader, FOpenGLHullShader> FOpenGLHullShaderProxy;
+typedef TOpenGLResourceProxy<FRHIDomainShader, FOpenGLDomainShader> FOpenGLDomainShaderProxy;
+
+template <typename T>
+struct TIsGLProxyObject
+{
+	enum { Value = false };
+};
+
+template<typename TRHIType, typename TOGLResourceType>
+struct TIsGLProxyObject<TOpenGLResourceProxy<TRHIType, TOGLResourceType>>
+{
+	enum { Value = true };
+};
+
 typedef void (*BufferBindFunction)( GLuint Buffer );
 
 template<typename BaseType>
@@ -257,7 +442,7 @@ public:
 		{
 			FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
 
-			if (RHICmdList.Bypass() || !IsRunningRHIInSeparateThread() || IsInRHIThread())
+			if (ShouldRunGLRenderContextOpOnThisThread(RHICmdList))
 			{
 				CreateGLBuffer(InData, ResourceToUse, ResourceSize);
 			}
@@ -329,7 +514,7 @@ public:
 	virtual ~TOpenGLBuffer()
 	{
 		// this is a bit of a special case, normally the RT destroys all rhi resources...but this isn't an rhi resource
-		TransitionFence.WaitFencePossiblyFromRHIThread();
+		TransitionFence.WaitFenceRenderThreadOnly();
 
 		if (Resource != 0)
 		{
@@ -956,6 +1141,8 @@ public:
 	{
 		FMemory::Memcpy(StreamStrides, InStrides, sizeof(StreamStrides));
 	}
+	
+	virtual bool GetInitializer(FVertexDeclarationElementList& Init) override final;
 };
 
 
@@ -973,11 +1160,11 @@ public:
 
 	FOpenGLLinkedProgram* LinkedProgram;
 	TRefCountPtr<FOpenGLVertexDeclaration> VertexDeclaration;
-	TRefCountPtr<FOpenGLVertexShader> VertexShader;
-	TRefCountPtr<FOpenGLPixelShader> PixelShader;
-	TRefCountPtr<FOpenGLGeometryShader> GeometryShader;
-	TRefCountPtr<FOpenGLHullShader> HullShader;
-	TRefCountPtr<FOpenGLDomainShader> DomainShader;
+	TRefCountPtr<FOpenGLVertexShaderProxy> VertexShaderProxy;
+	TRefCountPtr<FOpenGLPixelShaderProxy> PixelShaderProxy;
+	TRefCountPtr<FOpenGLGeometryShaderProxy> GeometryShaderProxy;
+	TRefCountPtr<FOpenGLHullShaderProxy> HullShaderProxy;
+	TRefCountPtr<FOpenGLDomainShaderProxy> DomainShaderProxy;
 
 	/** Initialization constructor. */
 	FOpenGLBoundShaderState(
@@ -990,10 +1177,29 @@ public:
 		FDomainShaderRHIParamRef InDomainShaderRHI
 		);
 
+	const TBitArray<>& GetTextureNeeds(int32& OutMaxTextureStageUsed);
+	void GetNumUniformBuffers(int32 NumVertexUniformBuffers[SF_Compute]);
+
 	bool NeedsTextureStage(int32 TextureStageIndex);
 	int32 MaxTextureStageUsed();
 	bool RequiresDriverInstantiation();
 
+	FOpenGLVertexShader* GetVertexShader()
+	{
+		check(IsValidRef(VertexShaderProxy));
+		return VertexShaderProxy->GetGLResourceObject();
+	}
+
+	FOpenGLPixelShader* GetPixelShader()
+	{
+		check(IsValidRef(PixelShaderProxy));
+		return PixelShaderProxy->GetGLResourceObject();
+	}
+
+	FOpenGLGeometryShader* GetGeometryShader()	{ return GeometryShaderProxy ? GeometryShaderProxy->GetGLResourceObject() : nullptr;}
+	FOpenGLHullShader* GetHullShader()	{ return HullShaderProxy ? HullShaderProxy->GetGLResourceObject() : nullptr; }
+	FOpenGLDomainShader* GetDomainShader()	{ return DomainShaderProxy ? DomainShaderProxy->GetGLResourceObject() : nullptr;}
+
 	virtual ~FOpenGLBoundShaderState();
 };
 
@@ -1070,16 +1276,25 @@ public:
 	, MemorySize( 0 )
 	, bIsPowerOfTwo(false)
 	, bIsAliased(false)
+	, bMemorySizeReady(false)
 	{}
 
 	int32 GetMemorySize() const
 	{
+		check(bMemorySizeReady);
 		return MemorySize;
 	}
 
 	void SetMemorySize(uint32 InMemorySize)
 	{
+		check(!bMemorySizeReady);
 		MemorySize = InMemorySize;
+		bMemorySizeReady = true;
+	}
+
+	bool IsMemorySizeSet()
+	{
+		return bMemorySizeReady;
 	}
 
 	void SetIsPowerOfTwo(bool bInIsPowerOfTwo)
@@ -1116,9 +1331,10 @@ public:
 	FOpenGLAssertRHIThreadFence CreationFence;
 
 private:
-	uint32 MemorySize		: 31;
+	uint32 MemorySize		: 30;
 	uint32 bIsPowerOfTwo	: 1;
 	uint32 bIsAliased : 1;
+	uint32 bMemorySizeReady : 1;
 };
 
 // Textures.
@@ -1305,6 +1521,11 @@ public:
 	 */
 	void* Lock(uint32 MipIndex,uint32 ArrayIndex,EResourceLockMode LockMode,uint32& DestStride);
 
+	/**
+	* Returns the size of the memory block that is returned from Lock, threadsafe
+	*/
+	uint32 GetLockSize(uint32 MipIndex, uint32 ArrayIndex, EResourceLockMode LockMode, uint32& DestStride);
+
 	/** Unlocks a previously locked mip-map. */
 	void Unlock(uint32 MipIndex,uint32 ArrayIndex);
 
@@ -1387,6 +1608,27 @@ private:
 	const uint32 bCubemap : 1;
 };
 
+template <typename T>
+struct TIsGLResourceWithFence
+{
+	enum
+	{
+		Value = TOr<
+		TPointerIsConvertibleFromTo<T, const FOpenGLTextureBase>
+		//		,TIsDerivedFrom<T, FRHITexture>
+		>::Value
+	};
+};
+
+template<typename T>
+static typename TEnableIf<!TIsGLResourceWithFence<T>::Value>::Type CheckRHITFence(T* Resource) {}
+
+template<typename T>
+static typename TEnableIf<TIsGLResourceWithFence<T>::Value>::Type CheckRHITFence(T* Resource)
+{
+	Resource->CreationFence.WaitFenceRenderThreadOnly();
+}
+
 class OPENGLDRV_API FOpenGLBaseTexture2D : public FRHITexture2D
 {
 public:
@@ -1479,6 +1721,7 @@ inline FOpenGLTextureBase* GetOpenGLTextureFromRHITexture(FRHITexture* Texture)
 	}
 	else
 	{
+		CheckRHITFence(static_cast<FOpenGLTextureBase*>(Texture->GetTextureBaseRHI()));
 		return static_cast<FOpenGLTextureBase*>(Texture->GetTextureBaseRHI());
 	}
 }
@@ -1489,7 +1732,8 @@ inline uint32 GetOpenGLTextureSizeXFromRHITexture(FRHITexture* Texture)
 	{
 		return 0;
 	}
-	else if(Texture->GetTexture2D())
+	CheckRHITFence(static_cast<FOpenGLTextureBase*>(Texture->GetTextureBaseRHI()));
+	if(Texture->GetTexture2D())
 	{
 		return ((FOpenGLTexture2D*)Texture)->GetSizeX();
 	}
@@ -1518,7 +1762,9 @@ inline uint32 GetOpenGLTextureSizeYFromRHITexture(FRHITexture* Texture)
 	{
 		return 0;
 	}
-	else if(Texture->GetTexture2D())
+
+	CheckRHITFence(static_cast<FOpenGLTextureBase*>(Texture->GetTextureBaseRHI()));
+	if(Texture->GetTexture2D())
 	{
 		return ((FOpenGLTexture2D*)Texture)->GetSizeY();
 	}
@@ -1547,7 +1793,9 @@ inline uint32 GetOpenGLTextureSizeZFromRHITexture(FRHITexture* Texture)
 	{
 		return 0;
 	}
-	else if(Texture->GetTexture2D())
+
+	CheckRHITFence(Texture);
+	if(Texture->GetTexture2D())
 	{
 		return 0;
 	}
@@ -1653,7 +1901,7 @@ public:
 	virtual uint32 GetBufferSize() override;
 };
 
-class FOpenGLShaderResourceView : public FRHIShaderResourceView
+class FOpenGLShaderResourceView : public FRefCountedObject
 {
 	// In OpenGL 3.2, the only view that actually works is a Buffer<type> kind of view from D3D10,
 	// and it's mapped to OpenGL's buffer texture.
@@ -1722,6 +1970,26 @@ protected:
 	bool OwnsResource;
 };
 
+// this class is required to remove the SRV from the shader cache upon deletion
+class FOpenGLShaderResourceViewProxy : public TOpenGLResourceProxy<FRHIShaderResourceView, FOpenGLShaderResourceView>
+{
+public:
+	FOpenGLShaderResourceViewProxy(TFunction<FOpenGLShaderResourceView*(FShaderResourceViewRHIParamRef)> CreateFunc)
+		: TOpenGLResourceProxy<FRHIShaderResourceView, FOpenGLShaderResourceView>(CreateFunc)
+	{}
+
+	virtual ~FOpenGLShaderResourceViewProxy()
+	{
+		FShaderCache::RemoveSRV(this);
+	}
+};
+
+template<>
+struct TIsGLProxyObject<FOpenGLShaderResourceViewProxy>
+{
+	enum { Value = true };
+};
+
 void OPENGLDRV_API OpenGLTextureDeleted(FRHITexture* Texture);
 void OPENGLDRV_API OpenGLTextureAllocated( FRHITexture* Texture , uint32 Flags);
 
@@ -1816,27 +2084,27 @@ struct TOpenGLResourceTraits<FRHIVertexDeclaration>
 template<>
 struct TOpenGLResourceTraits<FRHIVertexShader>
 {
-	typedef FOpenGLVertexShader TConcreteType;
+	typedef FOpenGLVertexShaderProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIGeometryShader>
 {
-	typedef FOpenGLGeometryShader TConcreteType;
+	typedef FOpenGLGeometryShaderProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIHullShader>
 {
-	typedef FOpenGLHullShader TConcreteType;
+	typedef FOpenGLHullShaderProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIDomainShader>
 {
-	typedef FOpenGLDomainShader TConcreteType;
+	typedef FOpenGLDomainShaderProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIPixelShader>
 {
-	typedef FOpenGLPixelShader TConcreteType;
+	typedef FOpenGLPixelShaderProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIComputeShader>
@@ -1901,7 +2169,8 @@ struct TOpenGLResourceTraits<FRHIVertexBuffer>
 template<>
 struct TOpenGLResourceTraits<FRHIShaderResourceView>
 {
-	typedef FOpenGLShaderResourceView TConcreteType;
+	//typedef FOpenGLShaderResourceView TConcreteType;
+	typedef FOpenGLShaderResourceViewProxy TConcreteType;
 };
 template<>
 struct TOpenGLResourceTraits<FRHIUnorderedAccessView>
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaderResources.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaderResources.h
index 7fea86b4add8..8847676a0889 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaderResources.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaderResources.h
@@ -303,11 +303,11 @@ public:
 };
 
 
-typedef TOpenGLShader<FRHIVertexShader, GL_VERTEX_SHADER, SF_Vertex> FOpenGLVertexShader;
-typedef TOpenGLShader<FRHIPixelShader, GL_FRAGMENT_SHADER, SF_Pixel> FOpenGLPixelShader;
-typedef TOpenGLShader<FRHIGeometryShader, GL_GEOMETRY_SHADER, SF_Geometry> FOpenGLGeometryShader;
-typedef TOpenGLShader<FRHIHullShader, GL_TESS_CONTROL_SHADER, SF_Hull> FOpenGLHullShader;
-typedef TOpenGLShader<FRHIDomainShader, GL_TESS_EVALUATION_SHADER, SF_Domain> FOpenGLDomainShader;
+typedef TOpenGLShader<FRefCountedObject, GL_VERTEX_SHADER, SF_Vertex> FOpenGLVertexShader;
+typedef TOpenGLShader<FRefCountedObject, GL_FRAGMENT_SHADER, SF_Pixel> FOpenGLPixelShader;
+typedef TOpenGLShader<FRefCountedObject, GL_GEOMETRY_SHADER, SF_Geometry> FOpenGLGeometryShader;
+typedef TOpenGLShader<FRefCountedObject, GL_TESS_CONTROL_SHADER, SF_Hull> FOpenGLHullShader;
+typedef TOpenGLShader<FRefCountedObject, GL_TESS_EVALUATION_SHADER, SF_Domain> FOpenGLDomainShader;
 
 
 class FOpenGLComputeShader : public TOpenGLShader<FRHIComputeShader, GL_COMPUTE_SHADER, SF_Compute>
@@ -321,7 +321,9 @@ public:
 
 	bool NeedsTextureStage(int32 TextureStageIndex);
 	int32 MaxTextureStageUsed();
+	const TBitArray<>& GetTextureNeeds(int32& OutMaxTextureStageUsed);
 	bool NeedsUAVStage(int32 UAVStageIndex);
+
 	FOpenGLLinkedProgram* LinkedProgram;
 };
 
@@ -360,6 +362,7 @@ public:
 	void CommitPackedUniformBuffers(FOpenGLLinkedProgram* LinkedProgram, int32 Stage, FUniformBufferRHIRef* UniformBuffers, const TArray<CrossCompiler::FUniformBufferCopyInfo>& UniformBuffersCopyInfo);
 
 private:
+
 	/** CPU memory block for storing uniform values. */
 	uint8* PackedGlobalUniforms[CrossCompiler::PACKED_TYPEINDEX_MAX];
 	
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaders.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaders.h
index d872c0983704..5484fba7998d 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaders.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLShaders.h
@@ -9,8 +9,6 @@
 #include "CoreMinimal.h"
 #include "OpenGLDrv.h"
 
-typedef TArray<ANSICHAR> FAnsiCharArray;
-
 enum EOpenGLShaderTargetPlatform
 {
 	OGLSTP_Unknown,
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLState.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLState.h
index f34a1112fafe..167e931d3baf 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLState.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLState.h
@@ -92,6 +92,8 @@ struct FOpenGLRasterizerStateData
 class FOpenGLRasterizerState : public FRHIRasterizerState
 {
 public:
+	virtual bool GetInitializer(FRasterizerStateInitializerRHI& Init) override final;
+	
 	FOpenGLRasterizerStateData Data;
 };
 
@@ -138,6 +140,8 @@ struct FOpenGLDepthStencilStateData
 class FOpenGLDepthStencilState : public FRHIDepthStencilState
 {
 public:
+	virtual bool GetInitializer(FDepthStencilStateInitializerRHI& Init) override final;
+	
 	FOpenGLDepthStencilStateData Data;
 };
 
@@ -185,6 +189,8 @@ struct FOpenGLBlendStateData
 class FOpenGLBlendState : public FRHIBlendState
 {
 public:
+	virtual bool GetInitializer(FBlendStateInitializerRHI& Init) override final;
+	
 	FOpenGLBlendStateData Data;
 };
 
@@ -236,9 +242,14 @@ struct FOpenGLCachedAttr
 	GLuint StreamIndex;
 	GLboolean bNormalized;
 
-	bool bEnabled;
-
-	FOpenGLCachedAttr() : Pointer(FOpenGLCachedAttr_Invalid), Stride(-1), Divisor(0xFFFFFFFF), Type(0), StreamIndex(0xFFFFFFFF), bEnabled(false) {}
+	FOpenGLCachedAttr() : 
+		Pointer(FOpenGLCachedAttr_Invalid), 
+		Stride(-1), 
+		Divisor(0xFFFFFFFF), 
+		Type(0), 
+		StreamIndex(0xFFFFFFFF)
+	{
+	}
 };
 
 struct FOpenGLStream
@@ -333,6 +344,25 @@ struct FOpenGLContextState : public FOpenGLCommonState
 	FOpenGLCachedAttr				VertexAttrs[NUM_OPENGL_VERTEX_STREAMS];
 	FOpenGLStream					VertexStreams[NUM_OPENGL_VERTEX_STREAMS];
 
+	uint32 VertexAttrs_EnabledBits;
+	FORCEINLINE bool GetVertexAttrEnabled(int32 Index) const
+	{
+		static_assert(NUM_OPENGL_VERTEX_STREAMS <= sizeof(VertexAttrs_EnabledBits) * 8, "Not enough bits in VertexAttrs_EnabledBits to store NUM_OPENGL_VERTEX_STREAMS");
+		return !!(VertexAttrs_EnabledBits & (1 << Index));
+	}
+	FORCEINLINE void SetVertexAttrEnabled(int32 Index, bool bEnable)
+	{
+		if (bEnable)
+		{
+			VertexAttrs_EnabledBits |= (1 << Index);
+		}
+		else
+		{
+			VertexAttrs_EnabledBits &= ~(1 << Index);
+		}
+	}
+
+
 	FOpenGLVertexDeclaration* VertexDecl;
 	uint32 ActiveAttribMask;
 	uint32 ActiveStreamMask;
@@ -361,6 +391,7 @@ struct FOpenGLContextState : public FOpenGLCommonState
 	,	LastES2ColorRTResource(0)
 #endif
 	,	LastES2ColorTargetType(GL_NONE)
+	, VertexAttrs_EnabledBits(0)
 	, VertexDecl(0)
 	, ActiveAttribMask(0)
 	, ActiveStreamMask(0)
@@ -424,6 +455,9 @@ struct FOpenGLRHIState : public FOpenGLCommonState
 	uint32							IndexDataStride;
 
 	FOpenGLStream					Streams[NUM_OPENGL_VERTEX_STREAMS];
+
+	// we null this when the we dirty PackedGlobalUniformDirty. Thus we can skip all of CommitNonComputeShaderConstants if it matches the current program
+	FOpenGLLinkedProgram* LinkedProgramAndDirtyFlag;
 	FOpenGLShaderParameterCache*	ShaderParameters;
 
 	TRefCountPtr<FOpenGLBoundShaderState>	BoundShaderState;
@@ -436,6 +470,7 @@ struct FOpenGLRHIState : public FOpenGLCommonState
 	FUniformBufferRHIRef BoundUniformBuffers[SF_NumFrequencies][MAX_UNIFORM_BUFFERS_PER_SHADER_STAGE];
 
 	/** Bit array to track which uniform buffers have changed since the last draw call. */
+	bool bAnyDirtyGraphicsUniformBuffers;
 	uint16 DirtyUniformBuffers[SF_NumFrequencies];
 
 	// Used for if(!FOpenGL::SupportsFastBufferData())
@@ -466,6 +501,7 @@ struct FOpenGLRHIState : public FOpenGLCommonState
 	,	NumPrimitives(0)
 	,	MinVertexIndex(0)
 	,	IndexDataStride(0)
+	,	LinkedProgramAndDirtyFlag(nullptr)
 	,	ShaderParameters(NULL)
 	,	BoundShaderState(NULL)
 	,	CurrentComputeShader(NULL)
diff --git a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLUtil.h b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLUtil.h
index 13af507a319d..5c854f43ceef 100644
--- a/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLUtil.h
+++ b/Engine/Source/Runtime/OpenGLDrv/Public/OpenGLUtil.h
@@ -11,7 +11,7 @@
 #define ENABLE_OPENGL_FRAMEDUMP 0
 
 /** Set to 1 to enable the VERIFY_GL macros which call glGetError */
-#define ENABLE_VERIFY_GL (0 & UE_BUILD_DEBUG)
+#define ENABLE_VERIFY_GL (0 & DO_CHECK)
 #define ENABLE_VERIFY_GL_TRACE 0
 
 // Additional check that our GL calls are occurring on the expected thread
@@ -62,11 +62,20 @@ FORCEINLINE GLenum GetOpenGLCubeFace(ECubeFace Face)
 extern bool PlatformOpenGLContextValid();
 
 #if ENABLE_VERIFY_GL_THREAD
+	#if UE_BUILD_TEST
+		#define GLCONTEXT_CLAUSE 
+	#else
+		#define GLCONTEXT_CLAUSE PlatformOpenGLContextValid() &&
+	#endif
 	// check that the current thread has a valid context and matches our RT / RHIT expectations.
 	// Note that the game thread can access the shared context.
-	#define CHECK_EXPECTED_GL_THREAD() if(!(PlatformOpenGLContextValid() && (IsInGameThread() || ( (IsInRenderingThread() && !IsRunningRHIInSeparateThread()) || (IsInRHIThread() && IsRunningRHIInSeparateThread()) ))))\
+	// use commandline switch -norhithread if this causes issues.
+	#define CHECK_EXPECTED_GL_THREAD() \
+		if(!( \
+			 GLCONTEXT_CLAUSE\
+			(IsInGameThread() || ( (IsInRenderingThread() && !IsRunningRHIInSeparateThread()) || (IsInRHIThread() && IsRunningRHIInSeparateThread()) ))))\
 		{ \
-			UE_LOG(LogRHI, Fatal, TEXT("Potential use of GL context from incorrect thread."));\
+			UE_LOG(LogRHI, Fatal, TEXT("Potential use of GL context from incorrect thread. [IsInGameThread() = %d, IsInRenderingThread() && !IsRunningRHIInSeparateThread() = %d, IsInRHIThread() && IsRunningRHIInSeparateThread() = %d]"), IsInGameThread(), IsInRenderingThread() && !IsRunningRHIInSeparateThread(), IsInRHIThread() && IsRunningRHIInSeparateThread());\
 		}
 #else
 	#define CHECK_EXPECTED_GL_THREAD() 
@@ -189,4 +198,8 @@ struct FRHICommandGLCommand final : public FRHICommand<FRHICommandGLCommand>
 	}
 };
 
-void RunOnGLRenderContextThread(TFunction<void(void)> GLFunc);
\ No newline at end of file
+void RunOnGLRenderContextThread(TFunction<void(void)> GLFunc, bool bWaitForCompletion = false);
+inline bool ShouldRunGLRenderContextOpOnThisThread(FRHICommandListImmediate& RHICmdList)
+{
+	return (RHICmdList.Bypass() || !IsRunningRHIInSeparateThread() || IsInRHIThread());
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/PacketHandlers/PacketHandler/Private/PacketAudit.cpp b/Engine/Source/Runtime/PacketHandlers/PacketHandler/Private/PacketAudit.cpp
index dc971c59a1c5..6a73317502ae 100644
--- a/Engine/Source/Runtime/PacketHandlers/PacketHandler/Private/PacketAudit.cpp
+++ b/Engine/Source/Runtime/PacketHandlers/PacketHandler/Private/PacketAudit.cpp
@@ -147,7 +147,7 @@ public:
 
 		check(*MemSizeData <= (AUDIT_MAPPING_SIZE - sizeof(uint32)));
 
-		ArIsLoading = true;
+		this->SetIsLoading(true);
 	}
 
 	virtual int64 TotalSize() override
@@ -196,7 +196,7 @@ public:
 		MemSizeData = (uint32*)InData;
 		MemPayloadData = InData + sizeof(uint32);
 
-		ArIsSaving = true;
+		this->SetIsSaving(true);
 
 		*MemSizeData = 0;
 	}
diff --git a/Engine/Source/Runtime/PacketHandlers/PacketHandler/Public/EncryptionComponent.h b/Engine/Source/Runtime/PacketHandlers/PacketHandler/Public/EncryptionComponent.h
index d17677f49b7d..afdf1d76db8d 100644
--- a/Engine/Source/Runtime/PacketHandlers/PacketHandler/Public/EncryptionComponent.h
+++ b/Engine/Source/Runtime/PacketHandlers/PacketHandler/Public/EncryptionComponent.h
@@ -27,6 +27,11 @@ public:
 	 */
 	virtual void DisableEncryption() = 0;
 
+	/**
+	 * Returns true if encryption is currently enabled.
+	 */
+	virtual bool IsEncryptionEnabled() const = 0;
+
 	/**
 	 * Sets the encryption key to be used by this component. The key must be the correct size for the encryption algorithm
 	 * that the component implements. This should be called before EnableEncryption.
diff --git a/Engine/Source/Runtime/PakFile/Private/IPlatformFilePak.cpp b/Engine/Source/Runtime/PakFile/Private/IPlatformFilePak.cpp
index 5710ebf77992..82698d6dc46d 100644
--- a/Engine/Source/Runtime/PakFile/Private/IPlatformFilePak.cpp
+++ b/Engine/Source/Runtime/PakFile/Private/IPlatformFilePak.cpp
@@ -88,7 +88,7 @@ DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("PakCache Async Decrypts (Uncompressed Path)
 void DecryptData(uint8* InData, uint32 InDataSize)
 {
 	SCOPE_SECONDS_ACCUMULATOR(STAT_PakCache_DecryptTime);
-	FAES::FAESKey Key; 
+	FAES::FAESKey Key;
 	FPakPlatformFile::GetPakEncryptionKey(Key);
 	FAES::DecryptData(InData, InDataSize, Key);
 }
@@ -113,21 +113,21 @@ static FAutoConsoleVariableRef CVar_Enable(
 	TEXT("pakcache.Enable"),
 	GPakCache_Enable,
 	TEXT("If > 0, then enable the pak cache.")
-	);
+);
 
 int32 GPakCache_MaxRequestsToLowerLevel = 2;
 static FAutoConsoleVariableRef CVar_MaxRequestsToLowerLevel(
 	TEXT("pakcache.MaxRequestsToLowerLevel"),
 	GPakCache_MaxRequestsToLowerLevel,
 	TEXT("Controls the maximum number of IO requests submitted to the OS filesystem at one time. Limited by PAK_CACHE_MAX_REQUESTS.")
-	);
+);
 
 int32 GPakCache_MaxRequestSizeToLowerLevelKB = 1024;
 static FAutoConsoleVariableRef CVar_MaxRequestSizeToLowerLevelKB(
 	TEXT("pakcache.MaxRequestSizeToLowerLevellKB"),
 	GPakCache_MaxRequestSizeToLowerLevelKB,
 	TEXT("Controls the maximum size (in KB) of IO requests submitted to the OS filesystem.")
-	);
+);
 
 int32 GPakCache_NumUnreferencedBlocksToCache = 10;
 static FAutoConsoleVariableRef CVar_NumUnreferencedBlocksToCache(
@@ -272,7 +272,7 @@ static void AddToIntervalTree_Dangerous(
 	uint64 MaxInterval,
 	uint32 CurrentShift,
 	uint32 MaxShift
-	)
+)
 {
 	while (true)
 	{
@@ -323,7 +323,7 @@ static void AddToIntervalTree(
 	TIntervalTreeIndex Index,
 	uint32 StartShift,
 	uint32 MaxShift
-	)
+)
 {
 	GIntervalTreeNodeNodeAllocator.EnsureNoRealloc(1 + MaxShift - StartShift);
 	TItem& Item = Allocator.Get(Index);
@@ -341,7 +341,7 @@ static FORCEINLINE bool ScanNodeListForRemoval(
 	TIntervalTreeIndex Index,
 	uint64 MinInterval,
 	uint64 MaxInterval
-	)
+)
 {
 	while (*Iter != IntervalTreeInvalidIndex)
 	{
@@ -367,7 +367,7 @@ static bool RemoveFromIntervalTree(
 	uint64 MaxInterval,
 	uint32 CurrentShift,
 	uint32 MaxShift
-	)
+)
 {
 	bool bResult = false;
 	if (*RootNode != IntervalTreeInvalidIndex)
@@ -422,7 +422,7 @@ static bool RemoveFromIntervalTree(
 	TIntervalTreeIndex Index,
 	uint32 StartShift,
 	uint32 MaxShift
-	)
+)
 {
 	TItem& Item = Allocator.Get(Index);
 	uint64 MinInterval = GetRequestOffset(Item.OffsetAndPakIndex);
@@ -437,7 +437,7 @@ static FORCEINLINE void ScanNodeListForRemovalFunc(
 	uint64 MinInterval,
 	uint64 MaxInterval,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	while (*Iter != IntervalTreeInvalidIndex)
 	{
@@ -469,7 +469,7 @@ static void MaybeRemoveOverlappingNodesInIntervalTree(
 	uint32 CurrentShift,
 	uint32 MaxShift,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	if (*RootNode != IntervalTreeInvalidIndex)
 	{
@@ -531,7 +531,7 @@ static FORCEINLINE bool ScanNodeList(
 	uint64 MinInterval,
 	uint64 MaxInterval,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	while (Iter != IntervalTreeInvalidIndex)
 	{
@@ -561,7 +561,7 @@ static bool OverlappingNodesInIntervalTree(
 	uint32 CurrentShift,
 	uint32 MaxShift,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	if (RootNode != IntervalTreeInvalidIndex)
 	{
@@ -619,7 +619,7 @@ static bool ScanNodeListWithShrinkingInterval(
 	uint64 MinInterval,
 	uint64& MaxInterval,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	while (Iter != IntervalTreeInvalidIndex)
 	{
@@ -651,7 +651,7 @@ static bool OverlappingNodesInIntervalTreeWithShrinkingInterval(
 	uint32 CurrentShift,
 	uint32 MaxShift,
 	TFunctionRef<bool(TIntervalTreeIndex)> Func
-	)
+)
 {
 	if (RootNode != IntervalTreeInvalidIndex)
 	{
@@ -713,7 +713,7 @@ static void MaskInterval(
 	uint64 MaxInterval,
 	uint32 BytesToBitsShift,
 	uint64* Bits
-	)
+)
 {
 	TItem& Item = Allocator.Get(Index);
 	uint64 Offset = uint64(GetRequestOffset(Item.OffsetAndPakIndex));
@@ -758,7 +758,7 @@ static void OverlappingNodesInIntervalTreeMask(
 	uint32 MaxShift,
 	uint32 BytesToBitsShift,
 	uint64* Bits
-	)
+)
 {
 	OverlappingNodesInIntervalTree(
 		RootNode,
@@ -770,10 +770,10 @@ static void OverlappingNodesInIntervalTreeMask(
 		CurrentShift,
 		MaxShift,
 		[&Allocator, MinInterval, MaxInterval, BytesToBitsShift, Bits](TIntervalTreeIndex Index) -> bool
-		{
-			MaskInterval(Index, Allocator, MinInterval, MaxInterval, BytesToBitsShift, Bits);
-			return true;
-		}
+	{
+		MaskInterval(Index, Allocator, MinInterval, MaxInterval, BytesToBitsShift, Bits);
+		return true;
+	}
 	);
 }
 
@@ -940,7 +940,7 @@ class FPakPrecacher
 				}
 				MaxNode = MAX_uint64 >> StartShift;
 				check(MaxNode >= StartingLastByte && (MaxNode >> 1) < StartingLastByte);
-//				UE_LOG(LogTemp, Warning, TEXT("Test %d %llX %llX "), MaxShift, (uint64(PAK_CACHE_GRANULARITY) << (MaxShift + 1)), (uint64(PAK_CACHE_GRANULARITY) << MaxShift));
+				//				UE_LOG(LogTemp, Warning, TEXT("Test %d %llX %llX "), MaxShift, (uint64(PAK_CACHE_GRANULARITY) << (MaxShift + 1)), (uint64(PAK_CACHE_GRANULARITY) << MaxShift));
 				check(MaxShift && (uint64(PAK_CACHE_GRANULARITY) << (MaxShift + 1)) == 0 && (uint64(PAK_CACHE_GRANULARITY) << MaxShift) != 0);
 			}
 		}
@@ -1105,7 +1105,7 @@ public:
 	void SimulatePakFileCorruption()
 	{
 		FScopeLock Lock(&CachedFilesScopeLock);
-		
+
 		for (FPakData& PakData : CachedPakData)
 		{
 			for (TPakChunkHash& Hash : PakData.ChunkHashes)
@@ -1306,10 +1306,10 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 				Pak.StartShift,
 				Pak.MaxShift,
 				[this, &Pak, FirstByte, LastByte](TIntervalTreeIndex Index) -> bool
-				{
-					check(0); // if we are complete, then how come there are overlapping in flight blocks?
-					return true;
-				}
+			{
+				check(0); // if we are complete, then how come there are overlapping in flight blocks?
+				return true;
+			}
 			);
 #endif
 		}
@@ -1435,22 +1435,22 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 				Pak.StartShift,
 				Pak.MaxShift,
 				[this, OffsetOfLastByte](TIntervalTreeIndex BlockIndex) -> bool
+			{
+				FCacheBlock &Block = CacheBlockAllocator.Get(BlockIndex);
+				check(Block.InRequestRefCount);
+				if (!--Block.InRequestRefCount)
 				{
-					FCacheBlock &Block = CacheBlockAllocator.Get(BlockIndex);
-					check(Block.InRequestRefCount);
-					if (!--Block.InRequestRefCount)
+					if (GPakCache_NumUnreferencedBlocksToCache && GetRequestOffset(Block.OffsetAndPakIndex) + Block.Size > OffsetOfLastByte) // last block
 					{
-						if (GPakCache_NumUnreferencedBlocksToCache && GetRequestOffset(Block.OffsetAndPakIndex) + Block.Size > OffsetOfLastByte) // last block
-						{
-							OffsetAndPakIndexOfSavedBlocked.Remove(Block.OffsetAndPakIndex);
-							OffsetAndPakIndexOfSavedBlocked.Add(Block.OffsetAndPakIndex);
-							return false;
-						}
-						ClearBlock(Block);
-						return true;
+						OffsetAndPakIndexOfSavedBlocked.Remove(Block.OffsetAndPakIndex);
+						OffsetAndPakIndexOfSavedBlocked.Add(Block.OffsetAndPakIndex);
+						return false;
 					}
-					return false;
+					ClearBlock(Block);
+					return true;
 				}
+				return false;
+			}
 			);
 			TrimCache();
 			OverlappingNodesInIntervalTree<FCacheBlock>(
@@ -1463,12 +1463,12 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 				Pak.StartShift,
 				Pak.MaxShift,
 				[this](TIntervalTreeIndex BlockIndex) -> bool
-				{
-					FCacheBlock &Block = CacheBlockAllocator.Get(BlockIndex);
-					check(Block.InRequestRefCount);
-					Block.InRequestRefCount--;
-					return true;
-				}
+			{
+				FCacheBlock &Block = CacheBlockAllocator.Get(BlockIndex);
+				check(Block.InRequestRefCount);
+				Block.InRequestRefCount--;
+				return true;
+			}
 			);
 		}
 		else
@@ -1552,17 +1552,17 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 							Pak.StartShift,
 							Pak.MaxShift,
 							[this, &Pak, &BestNext, &BestPakIndex, PakIndex, &Limit, LocalLastReadRequest](TIntervalTreeIndex Index) -> bool
+						{
+							FJoinedOffsetAndPakIndex First = FirstUnfilledBlockForRequest(Index, LocalLastReadRequest);
+							check(LocalLastReadRequest != 0 || First != MAX_uint64); // if there was not trimming, and this thing is in the waiting list, then why was no start block found?
+							if (First < BestNext)
 							{
-								FJoinedOffsetAndPakIndex First = FirstUnfilledBlockForRequest(Index, LocalLastReadRequest);
-								check(LocalLastReadRequest != 0 || First != MAX_uint64); // if there was not trimming, and this thing is in the waiting list, then why was no start block found?
-								if (First < BestNext)
-								{
-									BestNext = First;
-									BestPakIndex = PakIndex;
-									Limit = GetRequestOffset(BestNext) - 1;
-								}
-								return true; // always have to keep going because we want the smallest one
+								BestNext = First;
+								BestPakIndex = PakIndex;
+								Limit = GetRequestOffset(BestNext) - 1;
 							}
+							return true; // always have to keep going because we want the smallest one
+						}
 						);
 					}
 				}
@@ -1747,10 +1747,10 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 				Pak.StartShift,
 				Pak.MaxShift,
 				[](TIntervalTreeIndex) -> bool
-				{
-					check(0); // if this is in flight, then why does it overlap my new block
-					return false;
-				}
+			{
+				check(0); // if this is in flight, then why does it overlap my new block
+				return false;
+			}
 			);
 			OverlappingNodesInIntervalTree<FPakInRequest>(
 				Pak.InRequests[Priority][(int32)EInRequestStatus::Complete],
@@ -1762,10 +1762,10 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 				Pak.StartShift,
 				Pak.MaxShift,
 				[](TIntervalTreeIndex) -> bool
-				{
-					check(0); // if this is complete, then why does it overlap my new block
-					return false;
-				}
+			{
+				check(0); // if this is complete, then why does it overlap my new block
+				return false;
+			}
 			);
 #endif
 			if (Priority == AIOP_MIN)
@@ -1843,7 +1843,6 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 	void StartBlockTask(FCacheBlock& Block)
 	{
 		// CachedFilesScopeLock is locked
-
 #define CHECK_REDUNDANT_READS (0)
 #if CHECK_REDUNDANT_READS
 		static struct FRedundantReadTracker
@@ -1898,10 +1897,24 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 		RequestsToLower[IndexToFill].Memory = nullptr;
 		check(&CacheBlockAllocator.Get(RequestsToLower[IndexToFill].BlockIndex) == &Block);
 
+        // FORT HACK
+        // DO NOT BRING BACK
+        // FORT HACK
+        bool bDoCheck = true;
+#if PLATFORM_IOS
+        static const int32 Range = 100;
+        static const int32 Offset = 500;
+        static int32 RandomCheckCount = FMath::Rand() % Range + Offset;
+        bDoCheck = --RandomCheckCount <= 0;
+        if (bDoCheck)
+        {
+            RandomCheckCount = FMath::Rand() % Range + Offset;
+        }
+#endif
 		FAsyncFileCallBack CallbackFromLower =
-			[this, IndexToFill](bool bWasCanceled, IAsyncReadRequest* Request)
+			[this, IndexToFill, bDoCheck](bool bWasCanceled, IAsyncReadRequest* Request)
 		{
-			if (bSigned)
+			if (bSigned && bDoCheck)
 			{
 				StartSignatureCheck(bWasCanceled, Request, IndexToFill);
 			}
@@ -1957,7 +1970,7 @@ private: // below here we assume CachedFilesScopeLock until we get to the next s
 
 #if 0
 				static int64 LastPrint = 0;
-				if (BlockMemoryHighWater / 1024 / 1024 /16 != LastPrint)
+				if (BlockMemoryHighWater / 1024 / 1024 / 16 != LastPrint)
 				{
 					LastPrint = BlockMemoryHighWater / 1024 / 1024 / 16;
 					//FPlatformMisc::LowLevelOutputDebugStringf(TEXT("Precache HighWater %dMB\r\n"), int32(LastPrint));
@@ -2194,7 +2207,7 @@ public:
 		FScopeLock Lock(&CachedFilesScopeLock);
 		ClearOldBlockTasks();
 		TIntervalTreeIndex RequestIndex = OutstandingRequests.FindRef(Owner->UniqueID);
-		static_assert(IntervalTreeInvalidIndex == 0, "FindRef will return 0 for something not found"); 
+		static_assert(IntervalTreeInvalidIndex == 0, "FindRef will return 0 for something not found");
 		if (RequestIndex)
 		{
 			FPakInRequest& Request = InRequestAllocator.Get(RequestIndex);
@@ -2422,7 +2435,7 @@ static FAutoConsoleCommand WaitPrecacheCmd(
 	TEXT("pak.WaitPrecache"),
 	TEXT("Debug command to wait on the pak precache."),
 	FConsoleCommandWithArgsDelegate::CreateStatic(&WaitPrecache)
-	);
+);
 
 static void DumpBlocks(const TArray<FString>& Args)
 {
@@ -2433,7 +2446,7 @@ static FAutoConsoleCommand DumpBlocksCmd(
 	TEXT("pak.DumpBlocks"),
 	TEXT("Debug command to spew the outstanding blocks."),
 	FConsoleCommandWithArgsDelegate::CreateStatic(&DumpBlocks)
-	);
+);
 
 static FCriticalSection FPakReadRequestEvent;
 
@@ -2713,7 +2726,7 @@ public:
 		Size = InFileSize;
 		SetComplete();
 	}
-	virtual void WaitCompletionImpl(float TimeLimitSeconds) override	
+	virtual void WaitCompletionImpl(float TimeLimitSeconds) override
 	{
 	}
 	virtual void CancelImpl()
@@ -2868,7 +2881,7 @@ FAutoConsoleTaskPriority CPrio_AsyncIOCPUWorkTaskPriority(
 	ENamedThreads::BackgroundThreadPriority, // if we have background priority task threads, then use them...
 	ENamedThreads::NormalTaskPriority, // .. at normal task priority
 	ENamedThreads::NormalTaskPriority // if we don't have background threads, then use normal priority threads at normal task priority instead
-	);
+);
 
 class FAsyncIOCPUWorkTask
 {
@@ -2883,7 +2896,7 @@ public:
 	}
 	static FORCEINLINE TStatId GetStatId()
 	{
-		RETURN_QUICK_DECLARE_CYCLE_STAT(FsyncIOCPUWorkTask, STATGROUP_TaskGraphTasks);
+		RETURN_QUICK_DECLARE_CYCLE_STAT(FAsyncIOCPUWorkTask, STATGROUP_TaskGraphTasks);
 	}
 	static FORCEINLINE ENamedThreads::Type GetDesiredThread()
 	{
@@ -2912,7 +2925,7 @@ public:
 
 	static FORCEINLINE TStatId GetStatId()
 	{
-		RETURN_QUICK_DECLARE_CYCLE_STAT(FsyncIOCPUWorkTask, STATGROUP_TaskGraphTasks);
+		RETURN_QUICK_DECLARE_CYCLE_STAT(FAsyncIOSignatureCheckTask, STATGROUP_TaskGraphTasks);
 	}
 	static FORCEINLINE ENamedThreads::Type GetDesiredThread()
 	{
@@ -2943,7 +2956,7 @@ void FPakPrecacher::DoSignatureCheck(bool bWasCanceled, IAsyncReadRequest* Reque
 	uint16 PakIndex;
 	TPakChunkHash MasterSignatureHash = 0;
 	static const int64 MaxHashesToCache = 16;
-	TPakChunkHash HashCache[MaxHashesToCache];
+	TPakChunkHash HashCache[MaxHashesToCache] = { 0 };
 
 	{
 		// Try and keep lock for as short a time as possible. Find our request and copy out the data we need
@@ -3091,6 +3104,10 @@ public:
 	~FPakAsyncReadFileHandle()
 	{
 		FScopeLock ScopedLock(&CriticalSection);
+		if (LiveRequests.Num() > 0 || NumLiveRawRequests > 0)
+		{
+			UE_LOG(LogPakFile, Fatal, TEXT("LiveRequests.Num or NumLiveRawReqeusts was > 0 in ~FPakAsyncReadFileHandle!"));
+		}
 		check(!LiveRequests.Num()); // must delete all requests before you delete the handle
 		check(!NumLiveRawRequests); // must delete all requests before you delete the handle
 		for (FCachedAsyncBlock* Block : Blocks)
@@ -3157,7 +3174,7 @@ public:
 				}
 			}
 			check(!LiveRequests.Contains(Result))
-			LiveRequests.Add(Result);
+				LiveRequests.Add(Result);
 			if (!bAnyUnfinished)
 			{
 				Result->RequestIsComplete();
@@ -3501,7 +3518,7 @@ void FPakPlatformFile::TrackPak(const TCHAR* Filename, const FPakEntry* PakEntry
 {
 	FString Key(Filename);
 
-	if(!GPakSizeMap.Find(Key))
+	if (!GPakSizeMap.Find(Key))
 	{
 		GPakSizeMap.Add(Key, PakEntry->Size);
 	}
@@ -3520,9 +3537,9 @@ IAsyncReadFileHandle* FPakPlatformFile::OpenAsyncRead(const TCHAR* Filename)
 		if (bFoundEntry && PakFile && PakFile->GetFilenameName() != NAME_None)
 		{
 #if PAK_TRACKER
-			TrackPak(Filename, FileEntry);
+			TrackPak(Filename, &FileEntry);
 #endif
-			
+
 			return new FPakAsyncReadFileHandle(&FileEntry, PakFile, Filename);
 		}
 	}
@@ -3553,7 +3570,7 @@ public:
 		Alignment = FAES::AESBlockSize,
 	};
 
-	static FORCEINLINE int64 AlignReadRequest(int64 Size) 
+	static FORCEINLINE int64 AlignReadRequest(int64 Size)
 	{
 		return Align(Size, Alignment);
 	}
@@ -3583,12 +3600,12 @@ public:
 
 	void EnsureBufferSpace(int64 CompressionBlockSize, int64 ScrachSize)
 	{
-		if(TempBufferSize < CompressionBlockSize)
+		if (TempBufferSize < CompressionBlockSize)
 		{
 			TempBufferSize = CompressionBlockSize;
 			TempBuffer = MakeUnique<uint8[]>(TempBufferSize);
 		}
-		if(ScratchBufferSize < ScrachSize)
+		if (ScratchBufferSize < ScrachSize)
 		{
 			ScratchBufferSize = ScrachSize;
 			ScratchBuffer = MakeUnique<uint8[]>(ScratchBufferSize);
@@ -3623,7 +3640,7 @@ public:
 			FCompression::UncompressMemory(Flags, UncompressedBuffer, UncompressedSize, CompressedBuffer, CompressedSize, false, FPlatformMisc::GetPlatformCompression()->GetCompressionBitWindow());
 			if (CopyOut)
 			{
-				FMemory::Memcpy(CopyOut, UncompressedBuffer+CopyOffset, CopyLength);
+				FMemory::Memcpy(CopyOut, UncompressedBuffer + CopyOffset, CopyLength);
 			}
 		}
 
@@ -3664,9 +3681,9 @@ public:
 		FCompressionScratchBuffers& ScratchSpace = FCompressionScratchBuffers::Get();
 		bool bStartedUncompress = false;
 
-		int64 WorkingBufferRequiredSize = FCompression::CompressMemoryBound((ECompressionFlags)PakEntry.CompressionMethod,CompressionBlockSize, FPlatformMisc::GetPlatformCompression()->GetCompressionBitWindow());
+		int64 WorkingBufferRequiredSize = FCompression::CompressMemoryBound((ECompressionFlags)PakEntry.CompressionMethod, CompressionBlockSize, FPlatformMisc::GetPlatformCompression()->GetCompressionBitWindow());
 		WorkingBufferRequiredSize = EncryptionPolicy::AlignReadRequest(WorkingBufferRequiredSize);
-		ScratchSpace.EnsureBufferSpace(CompressionBlockSize, WorkingBufferRequiredSize*2);
+		ScratchSpace.EnsureBufferSpace(CompressionBlockSize, WorkingBufferRequiredSize * 2);
 		WorkingBuffers[0] = ScratchSpace.ScratchBuffer.Get();
 		WorkingBuffers[1] = ScratchSpace.ScratchBuffer.Get() + WorkingBufferRequiredSize;
 
@@ -3674,12 +3691,12 @@ public:
 		{
 			const FPakCompressedBlock& Block = PakEntry.CompressionBlocks[CompressionBlockIndex];
 			int64 Pos = CompressionBlockIndex * CompressionBlockSize;
-			int64 CompressedBlockSize = Block.CompressedEnd-Block.CompressedStart;
-			int64 UncompressedBlockSize = FMath::Min<int64>(PakEntry.UncompressedSize-Pos, PakEntry.CompressionBlockSize);
+			int64 CompressedBlockSize = Block.CompressedEnd - Block.CompressedStart;
+			int64 UncompressedBlockSize = FMath::Min<int64>(PakEntry.UncompressedSize - Pos, PakEntry.CompressionBlockSize);
 			int64 ReadSize = EncryptionPolicy::AlignReadRequest(CompressedBlockSize);
 			int64 WriteSize = FMath::Min<int64>(UncompressedBlockSize - DirectCopyStart, Length);
 			PakReader->Seek(Block.CompressedStart + (PakFile.GetInfo().HasRelativeCompressedChunkOffsets() ? PakEntry.Offset : 0));
-			PakReader->Serialize(WorkingBuffers[CompressionBlockIndex & 1],ReadSize);
+			PakReader->Serialize(WorkingBuffers[CompressionBlockIndex & 1], ReadSize);
 			if (bStartedUncompress)
 			{
 				UncompressTask.EnsureCompletion();
@@ -3709,7 +3726,7 @@ public:
 				TaskDetails.CopyOffset = DirectCopyStart;
 				TaskDetails.CopyLength = WriteSize;
 			}
-			
+
 			if (Length == WriteSize)
 			{
 				UncompressTask.StartSynchronousTask();
@@ -3725,7 +3742,7 @@ public:
 			++CompressionBlockIndex;
 		}
 
-		if(bStartedUncompress)
+		if (bStartedUncompress)
 		{
 			UncompressTask.EnsureCompletion();
 		}
@@ -3738,7 +3755,7 @@ bool FPakEntry::VerifyPakEntriesMatch(const FPakEntry& FileEntryA, const FPakEnt
 	if (FileEntryA.Size != FileEntryB.Size)
 	{
 		UE_LOG(LogPakFile, Error, TEXT("Pak header file size mismatch, got: %lld, expected: %lld"), FileEntryB.Size, FileEntryA.Size);
-		bResult = false;		
+		bResult = false;
 	}
 	if (FileEntryA.UncompressedSize != FileEntryB.UncompressedSize)
 	{
@@ -3763,7 +3780,7 @@ bool FPakPlatformFile::IsNonPakFilenameAllowed(const FString& InFilename)
 	bool bAllowed = true;
 
 #if EXCLUDE_NONPAK_UE_EXTENSIONS
-	if ( PakFiles.Num() || UE_BUILD_SHIPPING)
+	if (PakFiles.Num() || UE_BUILD_SHIPPING)
 	{
 		FName Ext = FName(*FPaths::GetExtension(InFilename));
 		bAllowed = !ExcludedNonPakExtensions.Contains(Ext);
@@ -3895,7 +3912,7 @@ void FPakFile::Initialize(FArchive* Reader)
 	}
 	else
 	{
-        LLM_SCOPE(ELLMTag::FileSystem);
+		LLM_SCOPE(ELLMTag::FileSystem);
 		// Serialize trailer and check if everything is as expected.
 		Reader->Seek(CachedTotalSize - Info.GetSerializedSize());
 		Info.Serialize(*Reader);
@@ -3989,7 +4006,7 @@ void FPakFile::LoadIndex(FArchive* Reader)
 			FPakDirectory* Directory = Index.Find(Path);
 			if (Directory != NULL)
 			{
-				Directory->Add(FPaths::GetCleanFilename(Filename), &Files.Last());	
+				Directory->Add(FPaths::GetCleanFilename(Filename), &Files.Last());
 			}
 			else
 			{
@@ -3999,7 +4016,7 @@ void FPakFile::LoadIndex(FArchive* Reader)
 				// add the parent directories up to the mount point
 				while (MountPoint != Path)
 				{
-					Path = Path.Left(Path.Len()-1);
+					Path = Path.Left(Path.Len() - 1);
 					int32 Offset = 0;
 					if (Path.FindLastChar('/', Offset))
 					{
@@ -4152,7 +4169,7 @@ void FPakFile::UnloadFilenames(bool bShrinkPakEntries)
 	// within the maximum number of retries.
 	if (NumRetries >= MAX_RETRIES)
 	{
-//		FPlatformMisc::LowLevelOutputDebugString(TEXT("Can't unload pak filenames due to hash collision..."));
+		//		FPlatformMisc::LowLevelOutputDebugString(TEXT("Can't unload pak filenames due to hash collision..."));
 		delete[] MiniFileEntries;
 		return;
 	}
@@ -4276,12 +4293,12 @@ void FPakFile::UnloadFilenames(bool bShrinkPakEntries)
 			}
 
 			TotalSizeOfCompressedEntries += sizeof(uint32)
-					+ (bIsOffset32BitSafe ? sizeof(uint32) : sizeof(uint64))
-					+ (bIsUncompressedSize32BitSafe ? sizeof(uint32) : sizeof(uint64));
+				+ (bIsOffset32BitSafe ? sizeof(uint32) : sizeof(uint64))
+				+ (bIsUncompressedSize32BitSafe ? sizeof(uint32) : sizeof(uint64));
 			if (Entry.CompressionMethod != COMPRESS_None)
 			{
 				TotalSizeOfCompressedEntries +=
-						(bIsSize32BitSafe ? sizeof(uint32) : sizeof(uint64));
+					(bIsSize32BitSafe ? sizeof(uint32) : sizeof(uint64));
 				if (Entry.CompressionBlocks.Num() > 1)
 				{
 					TotalSizeOfCompressedEntries += Entry.CompressionBlocks.Num() * sizeof(uint32);
@@ -4329,14 +4346,14 @@ void FPakFile::UnloadFilenames(bool bShrinkPakEntries)
 
 				// Build the Flags field.
 				*(uint32*)CurrentEntryPtr =
-						  (bIsOffset32BitSafe ? (1 << 31) : 0)
-						| (bIsUncompressedSize32BitSafe ? (1 << 30) : 0)
-						| (bIsSize32BitSafe ? (1 << 29) : 0)
-						| (FullEntry->CompressionMethod << 23)
-						| (FullEntry->bEncrypted ? (1 << 22) : 0)
-						| (FullEntry->CompressionBlocks.Num() << 6)
-						| (FullEntry->CompressionBlockSize >> 11)
-				;
+					(bIsOffset32BitSafe ? (1 << 31) : 0)
+					| (bIsUncompressedSize32BitSafe ? (1 << 30) : 0)
+					| (bIsSize32BitSafe ? (1 << 29) : 0)
+					| (FullEntry->CompressionMethod << 23)
+					| (FullEntry->bEncrypted ? (1 << 22) : 0)
+					| (FullEntry->CompressionBlocks.Num() << 6)
+					| (FullEntry->CompressionBlockSize >> 11)
+					;
 				CurrentEntryPtr += sizeof(uint32);
 
 				// Build the Offset field.
@@ -4427,7 +4444,7 @@ public:
 		, InnerArchivePtr(InReader)
 	{}
 
-	virtual ~FThreadCheckingArchiveProxy() 
+	virtual ~FThreadCheckingArchiveProxy()
 	{
 		if (InnerArchivePtr)
 		{
@@ -4512,7 +4529,7 @@ public:
 	{}
 
 	/** Console commands **/
-	virtual bool Exec( UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar ) override
+	virtual bool Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar) override
 	{
 		if (FParse::Command(&Cmd, TEXT("Mount")))
 		{
@@ -4565,7 +4582,7 @@ void FPakPlatformFile::HandlePakListCommand(const TCHAR* Cmd, FOutputDevice& Ar)
 	for (auto Pak : Paks)
 	{
 		Ar.Logf(TEXT("%s Mounted to %s"), *Pak.PakFile->GetFilename(), *Pak.PakFile->GetMountPoint());
-	}	
+	}
 }
 
 void FPakPlatformFile::HandlePakCorruptCommand(const TCHAR* Cmd, FOutputDevice& Ar)
@@ -4597,7 +4614,7 @@ FPakPlatformFile::~FPakPlatformFile()
 			delete PakFiles[PakFileIndex].PakFile;
 			PakFiles[PakFileIndex].PakFile = nullptr;
 		}
-	}	
+	}
 }
 
 void FPakPlatformFile::FindPakFilesInDirectory(IPlatformFile* LowLevelFile, const TCHAR* Directory, TArray<FString>& OutPakFiles)
@@ -4630,7 +4647,7 @@ void FPakPlatformFile::FindPakFilesInDirectory(IPlatformFile* LowLevelFile, cons
 							int32 StartOfChunkIndex = ChunkIdentifier.Len();
 
 							BaseFilename.FindChar(TEXT('-'), DelimiterIndex);
-							FString ChunkNumberString = BaseFilename.Mid(StartOfChunkIndex, DelimiterIndex-StartOfChunkIndex);
+							FString ChunkNumberString = BaseFilename.Mid(StartOfChunkIndex, DelimiterIndex - StartOfChunkIndex);
 							int32 ChunkNumber = 0;
 							TTypeFromString<int32>::FromString(ChunkNumber, *ChunkNumberString);
 							if (ChunkInstall->GetChunkLocation(ChunkNumber) == EChunkLocation::NotAvailable)
@@ -4719,78 +4736,17 @@ bool FPakPlatformFile::Initialize(IPlatformFile* Inner, const TCHAR* CmdLine)
 
 	// signed if we have keys, and are not running with fileopenlog (currently results in a deadlock).
 	bSigned = !DecryptionKey.Exponent.IsZero() && !DecryptionKey.Modulus.IsZero() && !FParse::Param(FCommandLine::Get(), TEXT("fileopenlog"));;
-	
-	bool bMountPaks = true;
-	TArray<FString> PaksToLoad;
-#if !UE_BUILD_SHIPPING
-	// Optionally get a list of pak filenames to load, only these paks will be mounted
-	FString CmdLinePaksToLoad;
-	if (FParse::Value(CmdLine, TEXT("-paklist="), CmdLinePaksToLoad))
-	{
-		CmdLinePaksToLoad.ParseIntoArray(PaksToLoad, TEXT("+"), true);
-	}
 
-	//if we are using a fileserver, then dont' mount paks automatically.  We only want to read files from the server.
-	FString FileHostIP;
-	const bool bCookOnTheFly = FParse::Value(FCommandLine::Get(), TEXT("filehostip"), FileHostIP);
-	const bool bPreCookedNetwork = FParse::Param(FCommandLine::Get(), TEXT("precookednetwork") );
-	if (bPreCookedNetwork)
-	{
-		// precooked network builds are dependent on cook on the fly
-		check(bCookOnTheFly);
-	}
-	bMountPaks &= (!bCookOnTheFly || bPreCookedNetwork);
-#endif
-
-	if (bMountPaks)
-	{	
-		// Find and mount pak files from the specified directories.
-		TArray<FString> PakFolders;
-		GetPakFolders(CmdLine, PakFolders);
-		TArray<FString> FoundPakFiles;
-		FindAllPakFiles(LowerLevel, PakFolders, FoundPakFiles);
-		// Sort in descending order.
-		FoundPakFiles.Sort(TGreater<FString>());
-		// Mount all found pak files
-		for (int32 PakFileIndex = 0; PakFileIndex < FoundPakFiles.Num(); PakFileIndex++)
-		{
-			const FString& PakFilename = FoundPakFiles[PakFileIndex];
-			bool bLoadPak = true;
-			if (PaksToLoad.Num() && !PaksToLoad.Contains(FPaths::GetBaseFilename(PakFilename)))
-			{
-				bLoadPak = false;
-			}
-			if (bLoadPak)
-			{
-				// hardcode default load ordering of game main pak -> game content -> engine content -> saved dir
-				// would be better to make this config but not even the config system is initialized here so we can't do that
-				uint32 PakOrder = 0;
-				if (PakFilename.StartsWith(FString::Printf(TEXT("%sPaks/%s-"), *FPaths::ProjectContentDir(), FApp::GetProjectName())))
-				{
-					PakOrder = 4;
-				}
-				else if (PakFilename.StartsWith(FPaths::ProjectContentDir()))
-				{
-					PakOrder = 3;
-				}
-				else if (PakFilename.StartsWith(FPaths::EngineContentDir()))
-				{
-					PakOrder = 2;
-				}
-				else if (PakFilename.StartsWith(FPaths::ProjectSavedDir()))
-				{
-					PakOrder = 1;
-				}
-
-				Mount(*PakFilename, PakOrder);
-			}
-		}
-	}
+	// Find and mount pak files from the specified directories.
+	TArray<FString> PakFolders;
+	GetPakFolders(FCommandLine::Get(), PakFolders);
+	MountAllPakFiles(PakFolders);
 
 #if !UE_BUILD_SHIPPING
 	GPakExec = MakeUnique<FPakExec>(*this);
 #endif // !UE_BUILD_SHIPPING
 
+	FCoreDelegates::OnMountAllPakFiles.BindRaw(this, &FPakPlatformFile::MountAllPakFiles);
 	FCoreDelegates::OnMountPak.BindRaw(this, &FPakPlatformFile::HandleMountPakDelegate);
 	FCoreDelegates::OnUnmountPak.BindRaw(this, &FPakPlatformFile::HandleUnmountPakDelegate);
 
@@ -4802,7 +4758,7 @@ void FPakPlatformFile::InitializeNewAsyncIO()
 {
 #if USE_PAK_PRECACHE
 #if !WITH_EDITOR
-	if (FPlatformProcess::SupportsMultithreading() &&  !FParse::Param(FCommandLine::Get(), TEXT("FileOpenLog")))
+	if (FPlatformProcess::SupportsMultithreading() && !FParse::Param(FCommandLine::Get(), TEXT("FileOpenLog")))
 	{
 		FEncryptionKey DecryptionKey;
 		GetPakSigningKeys(DecryptionKey);
@@ -4832,7 +4788,7 @@ bool FPakPlatformFile::Mount(const TCHAR* InPakFilename, uint32 PakOrder, const
 				Pak->SetMountPoint(InPath);
 			}
 			FString PakFilename = InPakFilename;
-			if ( PakFilename.EndsWith(TEXT("_P.pak")) )
+			if (PakFilename.EndsWith(TEXT("_P.pak")))
 			{
 				// Prioritize based on the chunk version number
 				// Default to version 1 for single patch system
@@ -4841,7 +4797,7 @@ bool FPakPlatformFile::Mount(const TCHAR* InPakFilename, uint32 PakOrder, const
 				int32 VersionEndIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd);
 				if (VersionEndIndex != INDEX_NONE && VersionEndIndex > 0)
 				{
-					int32 VersionStartIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd, VersionEndIndex-1);
+					int32 VersionStartIndex = PakFilename.Find("_", ESearchCase::CaseSensitive, ESearchDir::FromEnd, VersionEndIndex - 1);
 					if (VersionStartIndex != INDEX_NONE)
 					{
 						VersionStartIndex++;
@@ -4891,7 +4847,7 @@ bool FPakPlatformFile::Unmount(const TCHAR* InPakFilename)
 	}
 #endif
 	{
-		FScopeLock ScopedLock(&PakListCritical); 
+		FScopeLock ScopedLock(&PakListCritical);
 
 		for (int32 PakIndex = 0; PakIndex < PakFiles.Num(); PakIndex++)
 		{
@@ -4936,6 +4892,97 @@ IFileHandle* FPakPlatformFile::CreatePakFileHandle(const TCHAR* Filename, FPakFi
 	return Result;
 }
 
+int32 FPakPlatformFile::MountAllPakFiles(const TArray<FString>& PakFolders)
+{
+	int32 NumPakFilesMounted = 0;
+
+	bool bMountPaks = true;
+	TArray<FString> PaksToLoad;
+#if !UE_BUILD_SHIPPING
+	// Optionally get a list of pak filenames to load, only these paks will be mounted
+	FString CmdLinePaksToLoad;
+	if (FParse::Value(FCommandLine::Get(), TEXT("-paklist="), CmdLinePaksToLoad))
+	{
+		CmdLinePaksToLoad.ParseIntoArray(PaksToLoad, TEXT("+"), true);
+	}
+
+	//if we are using a fileserver, then dont' mount paks automatically.  We only want to read files from the server.
+	FString FileHostIP;
+	const bool bCookOnTheFly = FParse::Value(FCommandLine::Get(), TEXT("filehostip"), FileHostIP);
+	const bool bPreCookedNetwork = FParse::Param(FCommandLine::Get(), TEXT("precookednetwork"));
+	if (bPreCookedNetwork)
+	{
+		// precooked network builds are dependent on cook on the fly
+		check(bCookOnTheFly);
+	}
+	bMountPaks &= (!bCookOnTheFly || bPreCookedNetwork);
+#endif
+
+	if (bMountPaks)
+	{
+		TArray<FString> FoundPakFiles;
+		FindAllPakFiles(LowerLevel, PakFolders, FoundPakFiles);
+		// Sort in descending order.
+		FoundPakFiles.Sort(TGreater<FString>());
+		// Mount all found pak files
+
+		TArray<FPakListEntry> ExistingPaks;
+		GetMountedPaks(ExistingPaks);
+		TSet<FString> ExistingPaksFileName;
+		// Find the single pak we just mounted
+		for (auto Pak : ExistingPaks)
+		{
+			ExistingPaksFileName.Add(Pak.PakFile->GetFilename());
+		}
+
+
+		for (int32 PakFileIndex = 0; PakFileIndex < FoundPakFiles.Num(); PakFileIndex++)
+		{
+			const FString& PakFilename = FoundPakFiles[PakFileIndex];
+
+			UE_LOG(LogPakFile, Display, TEXT("Found Pak file %s attempting to mount."), *PakFilename);
+
+			if (PaksToLoad.Num() && !PaksToLoad.Contains(FPaths::GetBaseFilename(PakFilename)))
+			{
+				continue;
+			}
+
+			if (ExistingPaksFileName.Contains(PakFilename))
+			{
+				UE_LOG(LogPakFile, Display, TEXT("Pak file %s already exists."), *PakFilename);
+				continue;
+			}
+
+			// hardcode default load ordering of game main pak -> game content -> engine content -> saved dir
+			// would be better to make this config but not even the config system is initialized here so we can't do that
+			uint32 PakOrder = 0;
+			if (PakFilename.StartsWith(FString::Printf(TEXT("%sPaks/%s-"), *FPaths::ProjectContentDir(), FApp::GetProjectName())))
+			{
+				PakOrder = 4;
+			}
+			else if (PakFilename.StartsWith(FPaths::ProjectContentDir()))
+			{
+				PakOrder = 3;
+			}
+			else if (PakFilename.StartsWith(FPaths::EngineContentDir()))
+			{
+				PakOrder = 2;
+			}
+			else if (PakFilename.StartsWith(FPaths::ProjectSavedDir()))
+			{
+				PakOrder = 1;
+			}
+
+			UE_LOG(LogPakFile, Display, TEXT("Mounting pak file %s."), *PakFilename);
+
+			Mount(*PakFilename, PakOrder);
+			++NumPakFilesMounted;
+		}
+	}
+	return NumPakFilesMounted;
+}
+
+
 bool FPakPlatformFile::HandleMountPakDelegate(const FString& PakFilePath, uint32 PakOrder, IPlatformFile::FDirectoryVisitor* Visitor)
 {
 	bool bReturn = Mount(*PakFilePath, PakOrder);
@@ -4973,9 +5020,9 @@ IFileHandle* FPakPlatformFile::OpenRead(const TCHAR* Filename, bool bAllowWrite)
 	if (FindFileInPakFiles(Filename, &PakFile, &FileEntry))
 	{
 #if PAK_TRACKER
-		TrackPak(Filename, FileEntry);
+		TrackPak(Filename, &FileEntry);
 #endif
-		
+
 		Result = CreatePakFileHandle(Filename, PakFile, &FileEntry);
 	}
 	else
@@ -4990,7 +5037,7 @@ IFileHandle* FPakPlatformFile::OpenRead(const TCHAR* Filename, bool bAllowWrite)
 }
 
 bool FPakPlatformFile::BufferedCopyFile(IFileHandle& Dest, IFileHandle& Source, const int64 FileSize, uint8* Buffer, const int64 BufferSize) const
-{	
+{
 	int64 RemainingSizeToCopy = FileSize;
 	// Continue copying chunks using the buffer
 	while (RemainingSizeToCopy > 0)
diff --git a/Engine/Source/Runtime/PakFile/Private/SignedArchiveReader.cpp b/Engine/Source/Runtime/PakFile/Private/SignedArchiveReader.cpp
index 891319ca44d0..7fa6517065f3 100644
--- a/Engine/Source/Runtime/PakFile/Private/SignedArchiveReader.cpp
+++ b/Engine/Source/Runtime/PakFile/Private/SignedArchiveReader.cpp
@@ -361,7 +361,7 @@ FSignedArchiveReader::FSignedArchiveReader(FArchive* InPakReader, FChunkCacheWor
 	, SignatureChecker(InSignatureChecker)
 {
 	// Cache global info about the archive
-	ArIsLoading = true;
+	this->SetIsLoading(true);
 	SizeOnDisk = PakReader->TotalSize();
 	ChunkCount = SizeOnDisk / FPakInfo::MaxChunkDataSize + ((SizeOnDisk % FPakInfo::MaxChunkDataSize) ? 1 : 0);
 	PakSize = SizeOnDisk;
diff --git a/Engine/Source/Runtime/PakFile/Public/IPlatformFilePak.h b/Engine/Source/Runtime/PakFile/Public/IPlatformFilePak.h
index 0304753ccd09..e3efacff5330 100644
--- a/Engine/Source/Runtime/PakFile/Public/IPlatformFilePak.h
+++ b/Engine/Source/Runtime/PakFile/Public/IPlatformFilePak.h
@@ -459,7 +459,8 @@ public:
 				//     FString RelativeFilename(Filename.Mid(Path.Len() + 1));
 				//     Path = Path.Mid(MountPoint.Len()) / RelativeFilename;
 				// Hash the Path.
-				uint32 PathHash = FCrc::MemCrc32(*Path + MountPoint.Len(), (Path.Len() - MountPoint.Len()) * sizeof(TCHAR), FilenameStartHash);
+				int AdjustedMountPointLen = Path.Len() < MountPoint.Len() ? Path.Len() : MountPoint.Len();
+				uint32 PathHash = FCrc::MemCrc32(*Path + AdjustedMountPointLen, (Path.Len() - AdjustedMountPointLen) * sizeof(TCHAR), FilenameStartHash);
 				// Hash the RelativeFilename.
 				PathHash = FCrc::MemCrc32(*Filename + Path.Len(), (Filename.Len() - Path.Len()) * sizeof(TCHAR), PathHash);
 
@@ -1292,6 +1293,9 @@ public:
 
 	bool Unmount(const TCHAR* InPakFilename);
 
+	int32 MountAllPakFiles(const TArray<FString>& PakFilesToMount);
+
+
 	/**
 	 * Finds a file in the specified pak files.
 	 *
@@ -1676,7 +1680,15 @@ public:
 		TSet<FString> FilesVisitedInPak;
 
 		TArray<FPakListEntry> Paks;
-		GetMountedPaks(Paks);
+		FString StandardDirectory = Directory;
+		FPaths::MakeStandardFilename(StandardDirectory);
+		
+		// don't look for in pak files for target-only locations
+		if (!StandardDirectory.StartsWith(FPaths::ProjectPersistentDownloadDir()) &&
+			!StandardDirectory.StartsWith(FPaths::CloudDir()))
+		{
+			GetMountedPaks(Paks);
+		}
 
 		// Iterate pak files first
 		for (int32 PakIndex = 0; PakIndex < Paks.Num(); PakIndex++)
@@ -1686,8 +1698,6 @@ public:
 			const bool bIncludeFiles = true;
 			const bool bIncludeFolders = true;
 			TSet<FString> FilesVisitedInThisPak;
-			FString StandardDirectory = Directory;
-			FPaths::MakeStandardFilename(StandardDirectory);
 
 			PakFile.FindFilesAtPath(FilesVisitedInThisPak, *StandardDirectory, bIncludeFiles, bIncludeFolders);
 			for (TSet<FString>::TConstIterator SetIt(FilesVisitedInThisPak); SetIt && Result; ++SetIt)
@@ -1780,7 +1790,16 @@ public:
 		TSet<FString> FilesVisitedInPak;
 
 		TArray<FPakListEntry> Paks;
-		GetMountedPaks(Paks);
+ 
+		FString StandardDirectory = Directory;
+		FPaths::MakeStandardFilename(StandardDirectory);
+
+		// don't look for in pak files for target-only locations
+		if (!StandardDirectory.StartsWith(FPaths::ProjectPersistentDownloadDir()) &&
+			!StandardDirectory.StartsWith(FPaths::CloudDir()))
+		{
+			GetMountedPaks(Paks);
+		}
 
 		// Iterate pak files first
 		for (int32 PakIndex = 0; PakIndex < Paks.Num(); PakIndex++)
@@ -1790,8 +1809,6 @@ public:
 			const bool bIncludeFiles = true;
 			const bool bIncludeFolders = true;
 			TSet<FString> FilesVisitedInThisPak;
-			FString StandardDirectory = Directory;
-			FPaths::MakeStandardFilename(StandardDirectory);
 
 			PakFile.FindFilesAtPath(FilesVisitedInThisPak, *StandardDirectory, bIncludeFiles, bIncludeFolders);
 			for (TSet<FString>::TConstIterator SetIt(FilesVisitedInThisPak); SetIt && Result; ++SetIt)
diff --git a/Engine/Source/Runtime/PerfCounters/Private/PerfCounters.cpp b/Engine/Source/Runtime/PerfCounters/Private/PerfCounters.cpp
index d0cda96c10c0..5c167236b96f 100644
--- a/Engine/Source/Runtime/PerfCounters/Private/PerfCounters.cpp
+++ b/Engine/Source/Runtime/PerfCounters/Private/PerfCounters.cpp
@@ -183,6 +183,8 @@ static bool SendAsUtf8(FSocket* Conn, const FString& Message)
 
 bool FPerfCounters::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FPerfCounters_Tick);
+
 	if (LIKELY(Socket != nullptr))
 	{
 		TickSocket(DeltaTime);
diff --git a/Engine/Source/Runtime/Portal/Rpc/Private/PortalRpcLocator.cpp b/Engine/Source/Runtime/Portal/Rpc/Private/PortalRpcLocator.cpp
index 43d79375f4fa..4ae797612bb9 100644
--- a/Engine/Source/Runtime/Portal/Rpc/Private/PortalRpcLocator.cpp
+++ b/Engine/Source/Runtime/Portal/Rpc/Private/PortalRpcLocator.cpp
@@ -59,6 +59,8 @@ private:
 
 	bool HandleTicker(float DeltaTime)
 	{
+        QUICK_SCOPE_CYCLE_COUNTER(STAT_FPortalRpcLocatorImple_HandleTicker);
+
 		if (ServerAddress.IsValid() && ((FDateTime::UtcNow() - LastServerResponse).GetTotalSeconds() > PORTAL_RPC_LOCATE_TIMEOUT))
 		{
 			ServerAddress.Invalidate();
diff --git a/Engine/Source/Runtime/Projects/Private/ModuleDescriptor.cpp b/Engine/Source/Runtime/Projects/Private/ModuleDescriptor.cpp
index 89f1159a1871..2335382db046 100644
--- a/Engine/Source/Runtime/Projects/Private/ModuleDescriptor.cpp
+++ b/Engine/Source/Runtime/Projects/Private/ModuleDescriptor.cpp
@@ -37,7 +37,10 @@ const TCHAR* ELoadingPhase::ToString( const ELoadingPhase::Type Value )
 
 	case PostConfigInit:
 		return TEXT( "PostConfigInit" );
-			
+		
+	case PreEarlyLoadingScreen:
+		return TEXT("PreEarlyLoadingScreen");
+
 	case PreLoadingScreen:
 		return TEXT( "PreLoadingScreen" );
 
diff --git a/Engine/Source/Runtime/Projects/Private/PluginManager.cpp b/Engine/Source/Runtime/Projects/Private/PluginManager.cpp
index 1747d5b93f04..fbd90d75e92f 100644
--- a/Engine/Source/Runtime/Projects/Private/PluginManager.cpp
+++ b/Engine/Source/Runtime/Projects/Private/PluginManager.cpp
@@ -619,6 +619,11 @@ bool FPluginManager::ConfigureEnabledPlugins()
 		IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
 		for (TSharedRef<IPlugin> Plugin: GetEnabledPluginsWithContent())
 		{
+			if (NewPluginMountedEvent.IsBound())
+			{
+				NewPluginMountedEvent.Broadcast(*Plugin);
+			}
+
 			if (ensure(RegisterMountPointDelegate.IsBound()))
 			{
 				FString ContentDir = Plugin->GetContentDir();
@@ -1156,6 +1161,11 @@ TArray<TSharedRef<IPlugin>> FPluginManager::GetPluginsWithPakFile() const
 	return PluginsWithPakFile;
 }
 
+IPluginManager::FNewPluginMountedEvent& FPluginManager::OnNewPluginCreated()
+{
+	return NewPluginCreatedEvent;
+}
+
 IPluginManager::FNewPluginMountedEvent& FPluginManager::OnNewPluginMounted()
 {
 	return NewPluginMountedEvent;
@@ -1205,9 +1215,9 @@ void FPluginManager::MountNewlyCreatedPlugin(const FString& PluginName)
 			}
 
 			// Notify any listeners that a new plugin has been mounted
-			if (NewPluginMountedEvent.IsBound())
+			if (NewPluginCreatedEvent.IsBound())
 			{
-				NewPluginMountedEvent.Broadcast(*Plugin);
+				NewPluginCreatedEvent.Broadcast(*Plugin);
 			}
 			break;
 		}
diff --git a/Engine/Source/Runtime/Projects/Private/PluginManager.h b/Engine/Source/Runtime/Projects/Private/PluginManager.h
index 08d5f47404e4..822f07578b7b 100644
--- a/Engine/Source/Runtime/Projects/Private/PluginManager.h
+++ b/Engine/Source/Runtime/Projects/Private/PluginManager.h
@@ -108,6 +108,7 @@ public:
 	virtual TArray< FPluginStatus > QueryStatusForAllPlugins() const override;
 	virtual void AddPluginSearchPath(const FString& ExtraDiscoveryPath, bool bRefresh = true) override;
 	virtual TArray<TSharedRef<IPlugin>> GetPluginsWithPakFile() const override;
+	virtual FNewPluginMountedEvent& OnNewPluginCreated() override;
 	virtual FNewPluginMountedEvent& OnNewPluginMounted() override;
 	virtual void MountNewlyCreatedPlugin(const FString& PluginName) override;
 
@@ -179,6 +180,7 @@ private:
 	TSet<FString> PluginDiscoveryPaths;
 
 	/** Callback for notifications that a new plugin was mounted */
+	FNewPluginMountedEvent NewPluginCreatedEvent;
 	FNewPluginMountedEvent NewPluginMountedEvent;
 };
 PRAGMA_ENABLE_DEPRECATION_WARNINGS
diff --git a/Engine/Source/Runtime/Projects/Public/Interfaces/IPluginManager.h b/Engine/Source/Runtime/Projects/Public/Interfaces/IPluginManager.h
index 53865801b439..1f800ecb0f86 100644
--- a/Engine/Source/Runtime/Projects/Public/Interfaces/IPluginManager.h
+++ b/Engine/Source/Runtime/Projects/Public/Interfaces/IPluginManager.h
@@ -225,7 +225,7 @@ public:
 	 *
 	 * @return	 Pointer to the plugin's information, or nullptr.
 	 */
-	virtual TSharedPtr<IPlugin> FindPlugin(const FString& Name) = 0;
+	virtual PROJECTS_API TSharedPtr<IPlugin> FindPlugin(const FString& Name) = 0;
 
 	/**
 	 * Gets an array of all the enabled plugins.
@@ -276,6 +276,9 @@ public:
 	 */
 	DECLARE_EVENT_OneParam(IPluginManager, FNewPluginMountedEvent, IPlugin&);
 
+
+	virtual FNewPluginMountedEvent& OnNewPluginCreated() = 0;
+
 	/**
 	 * Gets an array of plugins that loaded their own content pak file
 	 */
diff --git a/Engine/Source/Runtime/Projects/Public/ModuleDescriptor.h b/Engine/Source/Runtime/Projects/Public/ModuleDescriptor.h
index 96afecb7b3a9..9a05134f4a4a 100644
--- a/Engine/Source/Runtime/Projects/Public/ModuleDescriptor.h
+++ b/Engine/Source/Runtime/Projects/Public/ModuleDescriptor.h
@@ -18,6 +18,9 @@ namespace ELoadingPhase
 		/** Loaded before the engine is fully initialized, immediately after the config system has been initialized.  Necessary only for very low-level hooks */
 		PostConfigInit,
 
+		/** Loaded before coreUObject for setting up manual loading screens, used for our chunk patching system */
+		PreEarlyLoadingScreen,
+
 		/** Loaded before the engine is fully initialized for modules that need to hook into the loading screen before it triggers */
 		PreLoadingScreen,
 
diff --git a/Engine/Source/Runtime/PropertyPath/Private/PropertyPathHelpers.cpp b/Engine/Source/Runtime/PropertyPath/Private/PropertyPathHelpers.cpp
index 70a1ad568afe..6d108bbdb970 100644
--- a/Engine/Source/Runtime/PropertyPath/Private/PropertyPathHelpers.cpp
+++ b/Engine/Source/Runtime/PropertyPath/Private/PropertyPathHelpers.cpp
@@ -787,7 +787,7 @@ namespace PropertyPathHelpers
 		if ( ArrayPos != INDEX_NONE )
 		{
 			FString IndexToken = OutFieldName.RightChop(ArrayPos + 1).LeftChop(1);
-			Lex::FromString(OutArrayIndex, *IndexToken);
+			LexFromString(OutArrayIndex, *IndexToken);
 
 			OutFieldName = OutFieldName.Left(ArrayPos);
 		}
diff --git a/Engine/Source/Runtime/RHI/Private/PipelineFileCache.cpp b/Engine/Source/Runtime/RHI/Private/PipelineFileCache.cpp
new file mode 100644
index 000000000000..63da0d01d8f6
--- /dev/null
+++ b/Engine/Source/Runtime/RHI/Private/PipelineFileCache.cpp
@@ -0,0 +1,2627 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/*=============================================================================
+PipelineFileCache.cpp: Pipeline state cache implementation.
+=============================================================================*/
+
+#include "PipelineFileCache.h"
+#include "PipelineStateCache.h"
+#include "HAL/FileManager.h"
+#include "Misc/EngineVersion.h"
+#include "Serialization/Archive.h"
+#include "Serialization/MemoryReader.h"
+#include "Serialization/MemoryWriter.h"
+#include "RHI.h"
+#include "RHIResources.h"
+#include "Misc/ScopeRWLock.h"
+#include "Misc/Paths.h"
+#include "Async/AsyncFileHandle.h"
+#include "HAL/PlatformFilemanager.h"
+#include "Misc/FileHelper.h"
+
+// Loaded + New created
+#if STATS // If STATS are not enabled RHI_API will DLLEXPORT on an empty line
+RHI_API DEFINE_STAT(STAT_TotalGraphicsPipelineStateCount);
+RHI_API DEFINE_STAT(STAT_TotalComputePipelineStateCount);
+#endif
+
+// New Saved count
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Serialized Graphics Pipeline State Count"), STAT_SerializedGraphicsPipelineStateCount, STATGROUP_PipelineStateCache );
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Serialized Compute Pipeline State Count"), STAT_SerializedComputePipelineStateCount, STATGROUP_PipelineStateCache );
+
+// New created - Cache Miss count
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("New Graphics Pipeline State Count"), STAT_NewGraphicsPipelineStateCount, STATGROUP_PipelineStateCache );
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("New Compute Pipeline State Count"), STAT_NewComputePipelineStateCount, STATGROUP_PipelineStateCache );
+
+// Memory - Only track the file representation and new state cache stats
+DECLARE_MEMORY_STAT(TEXT("New Cached PSO"), STAT_NewCachedPSOMemory, STATGROUP_PipelineStateCache);
+DECLARE_MEMORY_STAT(TEXT("PSO Stat"), STAT_PSOStatMemory, STATGROUP_PipelineStateCache);
+DECLARE_MEMORY_STAT(TEXT("File Cache"), STAT_FileCacheMemory, STATGROUP_PipelineStateCache);
+
+
+enum class EPipelineCacheFileFormatVersions : uint32
+{
+    FirstWorking = 7,
+    LibraryID = 9,
+    ShaderMetaData = 10,
+	SortedVertexDesc = 11
+};
+
+const uint64 FPipelineCacheFileFormatMagic = 0x5049504543414348; // PIPECACH
+const uint32 FPipelineCacheFileFormatCurrentVersion = (uint32)EPipelineCacheFileFormatVersions::SortedVertexDesc;
+
+/**
+  * PipelineFileCache API access
+  **/
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheEnabled(
+														   TEXT("r.ShaderPipelineCache.Enabled"),
+														   PIPELINE_CACHE_DEFAULT_ENABLED,
+														   TEXT("1 Enables the PipelineFileCache, 0 disables it."),
+														   ECVF_Default | ECVF_RenderThreadSafe
+														   );
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheLogPSO(
+														   TEXT("r.ShaderPipelineCache.LogPSO"),
+														   PIPELINE_CACHE_DEFAULT_ENABLED,
+														   TEXT("1 Logs new PSO entries into the file cache and allow saving, 0 uses existing PSO file cache in readonly mode (if enabled)."),
+														   ECVF_Default | ECVF_RenderThreadSafe
+														   );
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheReportPSO(
+														   TEXT("r.ShaderPipelineCache.ReportPSO"),
+														   PIPELINE_CACHE_DEFAULT_ENABLED,
+														   TEXT("1 reports new PSO entries via a delegate, but does not record or modify any cache file."),
+														   ECVF_Default | ECVF_RenderThreadSafe
+														   );
+
+static int32 GPSOFileCachePrintNewPSODescriptors = !UE_BUILD_SHIPPING;
+static FAutoConsoleVariableRef CVarPSOFileCachePrintNewPSODescriptors(
+														   TEXT("r.ShaderPipelineCache.PrintNewPSODescriptors"),
+														   GPSOFileCachePrintNewPSODescriptors,
+														   TEXT("1 prints descriptions for all new PSO entries to the log/console while 0 does not. Defaults to 0 in *Shipping* builds, otherwise 1."),
+														   ECVF_Default
+														   );
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheSaveUserCache(
+                                                            TEXT("r.ShaderPipelineCache.SaveUserCache"),
+#if PIPELINE_CACHE_DEFAULT_ENABLED
+															(int32)1,
+#else
+															(int32)0,
+#endif
+                                                            TEXT("If > 0 then any missed PSOs will be saved to a writable user cache file for subsequent runs to load and avoid in-game hitches. Enabled by default on macOS only."),
+                                                            ECVF_Default | ECVF_RenderThreadSafe
+                                                            );
+
+FRWLock FPipelineFileCache::FileCacheLock;
+FPipelineCacheFile* FPipelineFileCache::FileCache = nullptr;
+TMap<uint32, uint32> FPipelineFileCache::RunTimeToFileHashes;
+TMap<uint32, FPipelineStateStats*> FPipelineFileCache::Stats;
+TSet<FPipelineCacheFileFormatPSO> FPipelineFileCache::NewPSOs;
+uint32 FPipelineFileCache::NumNewPSOs;
+FPipelineFileCache::PSOOrder FPipelineFileCache::RequestedOrder = FPipelineFileCache::PSOOrder::Default;
+bool FPipelineFileCache::FileCacheEnabled = false;
+FPipelineFileCache::FPipelineStateLoggedEvent FPipelineFileCache::PSOLoggedEvent;
+
+
+void FRHIComputeShader::UpdateStats()
+{
+	FPipelineStateStats::UpdateStats(Stats);
+}
+
+void FPipelineStateStats::UpdateStats(FPipelineStateStats* Stats)
+{
+	if (Stats)
+	{
+		FPlatformAtomics::InterlockedExchange(&Stats->LastFrameUsed, GFrameCounter);
+		FPlatformAtomics::InterlockedIncrement(&Stats->TotalBindCount);
+		FPlatformAtomics::InterlockedCompareExchange(&Stats->FirstFrameUsed, GFrameCounter, -1);
+	}
+}
+
+struct FPipelineCacheFileFormatHeader
+{
+	uint64 Magic;			// Sanity check
+	uint32 Version; 		// File version must match engine version, otherwise we ignore
+	uint32 GameVersion; 	// Same as above but game specific code can invalidate
+	TEnumAsByte<EShaderPlatform> Platform; // The shader platform for all referenced PSOs.
+	FGuid Guid;				// Guid to identify the file uniquely
+	uint64 TableOffset;		// absolute file offset to TOC
+	
+	friend FArchive& operator<<(FArchive& Ar, FPipelineCacheFileFormatHeader& Info)
+	{
+		Ar << Info.Magic;
+		Ar << Info.Version;
+		Ar << Info.GameVersion;
+		Ar << Info.Platform;
+		Ar << Info.Guid;
+		Ar << Info.TableOffset;
+		
+		return Ar;
+	}
+};
+
+FArchive& operator<<( FArchive& Ar, FPipelineStateStats& Info )
+{
+	Ar << Info.FirstFrameUsed;
+	Ar << Info.LastFrameUsed;
+	Ar << Info.CreateCount;
+	Ar << Info.TotalBindCount;
+	Ar << Info.PSOHash;
+	
+	return Ar;
+}
+
+struct FPipelineCacheFileFormatPSOMetaData
+{
+	FPipelineCacheFileFormatPSOMetaData()
+	: FileOffset(0)
+	{
+	}
+	
+	~FPipelineCacheFileFormatPSOMetaData()
+	{
+	}
+
+	uint64 FileOffset;
+	uint64 FileSize;
+	FGuid FileGuid;
+	FPipelineStateStats Stats;
+	TSet<FSHAHash> Shaders;
+	
+	friend FArchive& operator<<(FArchive& Ar, FPipelineCacheFileFormatPSOMetaData& Info)
+	{
+		Ar << Info.FileOffset;
+		Ar << Info.FileSize;
+		Ar << Info.FileGuid;
+		Ar << Info.Stats;
+        if (Ar.GameNetVer() == (uint32)EPipelineCacheFileFormatVersions::LibraryID)
+        {
+            TSet<uint32> IDs;
+            Ar << IDs;
+        }
+        else if (Ar.GameNetVer() >= (uint32)EPipelineCacheFileFormatVersions::ShaderMetaData)
+        {
+            Ar << Info.Shaders;
+        }
+		
+		return Ar;
+	}
+};
+
+
+FString FPipelineFileCacheRasterizerState::ToString() const
+{
+	return FString::Printf(TEXT("<%f %f %u %u %u %u>")
+		, DepthBias
+		, SlopeScaleDepthBias
+		, uint32(FillMode)
+		, uint32(CullMode)
+		, uint32(!!bAllowMSAA)
+		, uint32(!!bEnableLineAA)
+	);
+}
+
+void FPipelineFileCacheRasterizerState::FromString(const FString& InSrc)
+{
+	FString Src = InSrc;
+	Src.ReplaceInline(TEXT("\r"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\n"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\t"), TEXT(" "));
+	Src.ReplaceInline(TEXT("<"), TEXT(" "));
+	Src.ReplaceInline(TEXT(">"), TEXT(" "));
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(" "));
+
+	check(Parts.Num() == 6 && sizeof(FillMode) == 1 && sizeof(CullMode) == 1 && sizeof(bAllowMSAA) == 1 && sizeof(bEnableLineAA) == 1); //not a very robust parser
+	LexFromString(DepthBias, *Parts[0]);
+	LexFromString(SlopeScaleDepthBias, *Parts[1]);
+	LexFromString((uint8&)FillMode, *Parts[2]);
+	LexFromString((uint8&)CullMode, *Parts[3]);
+	LexFromString((uint8&)bAllowMSAA, *Parts[4]);
+	LexFromString((uint8&)bEnableLineAA, *Parts[5]);
+}
+
+FString FPipelineCacheFileFormatPSO::ComputeDescriptor::ToString() const
+{
+	return ComputeShader.ToString();
+}
+void FPipelineCacheFileFormatPSO::ComputeDescriptor::FromString(const FString& Src)
+{
+	ComputeShader.FromString(Src.TrimStartAndEnd());
+}
+
+FString FPipelineCacheFileFormatPSO::ComputeDescriptor::HeaderLine()
+{
+	return FString(TEXT("ComputeShader"));
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::ShadersToString() const
+{
+	FString Result;
+
+	Result += FString::Printf(TEXT("%s,%s,%s,%s,%s")
+		, *VertexShader.ToString()
+		, *FragmentShader.ToString()
+		, *GeometryShader.ToString()
+		, *HullShader.ToString()
+		, *DomainShader.ToString()
+	);
+
+	return Result;
+}
+void FPipelineCacheFileFormatPSO::GraphicsDescriptor::ShadersFromString(const FString& Src)
+{
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(","));
+	int32 PartIndex = 0;
+	check(Parts.Num() == 5); //not a very robust parser
+
+	VertexShader.FromString(Parts[PartIndex++]);
+	FragmentShader.FromString(Parts[PartIndex++]);
+	GeometryShader.FromString(Parts[PartIndex++]);
+	HullShader.FromString(Parts[PartIndex++]);
+	DomainShader.FromString(Parts[PartIndex++]);
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::ShaderHeaderLine()
+{
+	return FString(TEXT("VertexShader,FragmentShader,GeometryShader,HullShader,DomainShader"));
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::StateToString() const
+{
+	FString Result;
+
+	Result += FString::Printf(TEXT("%s,%s,%s,")
+		, *BlendState.ToString()
+		, *RasterizerState.ToString()
+		, *DepthStencilState.ToString()
+	);
+	Result += FString::Printf(TEXT("%d,%d,%d,")
+		, MSAASamples
+		, uint32(DepthStencilFormat)
+		, DepthStencilFlags
+	);
+	Result += FString::Printf(TEXT("%d,%d,%d,%d,%d,")
+		, uint32(DepthLoad)
+		, uint32(StencilLoad)
+		, uint32(DepthStore)
+		, uint32(StencilStore)
+		, uint32(PrimitiveType)
+	);
+
+	Result += FString::Printf(TEXT("%d,")
+		, RenderTargetsActive
+	);
+	for (int32 Index = 0; Index < MaxSimultaneousRenderTargets; Index++)
+	{
+		Result += FString::Printf(TEXT("%d,%d,%d,%d,")
+			, uint32(RenderTargetFormats[Index])
+			, RenderTargetFlags[Index]
+			, uint32(RenderTargetsLoad[Index])
+			, uint32(RenderTargetsStore[Index])
+		);
+	}
+
+	FVertexElement NullVE;
+	FMemory::Memzero(NullVE);
+	Result += FString::Printf(TEXT("%d,")
+		, VertexDescriptor.Num()
+	);
+	for (int32 Index = 0; Index < MaxVertexElementCount; Index++)
+	{
+		if (Index < VertexDescriptor.Num())
+		{
+			Result += FString::Printf(TEXT("%s,")
+				, *VertexDescriptor[Index].ToString()
+			);
+		}
+		else
+		{
+			Result += FString::Printf(TEXT("%s,")
+				, *NullVE.ToString()
+			);
+		}
+	}
+	return Result.Left(Result.Len() - 1); // remove trailing comma
+}
+void FPipelineCacheFileFormatPSO::GraphicsDescriptor::StateFromString(const FString& Src)
+{
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(","));
+	int32 PartIndex = 0;
+
+
+
+
+	check(Parts.Num() - PartIndex >= 3); //not a very robust parser
+	BlendState.FromString(Parts[PartIndex++]);
+	RasterizerState.FromString(Parts[PartIndex++]);
+	DepthStencilState.FromString(Parts[PartIndex++]);
+
+	check(Parts.Num() - PartIndex >= 3 && sizeof(EPixelFormat) == sizeof(uint32)); //not a very robust parser
+	LexFromString(MSAASamples, *Parts[PartIndex++]);
+	LexFromString((uint32&)DepthStencilFormat, *Parts[PartIndex++]);
+	LexFromString(DepthStencilFlags, *Parts[PartIndex++]);
+
+	check(Parts.Num() - PartIndex >= 5 && sizeof(DepthLoad) == 1 && sizeof(StencilLoad) == 1 && sizeof(DepthStore) == 1 && sizeof(StencilStore) == 1 && sizeof(PrimitiveType) == 4); //not a very robust parser
+	LexFromString((uint32&)DepthLoad, *Parts[PartIndex++]);
+	LexFromString((uint32&)StencilLoad, *Parts[PartIndex++]);
+	LexFromString((uint32&)DepthStore, *Parts[PartIndex++]);
+	LexFromString((uint32&)StencilStore, *Parts[PartIndex++]);
+	LexFromString((uint32&)PrimitiveType, *Parts[PartIndex++]);
+
+	check(Parts.Num() - PartIndex >= 1); //not a very robust parser
+	LexFromString(RenderTargetsActive, *Parts[PartIndex++]);
+
+	for (int32 Index = 0; Index < MaxSimultaneousRenderTargets; Index++)
+	{
+		check(Parts.Num() - PartIndex >= 4 && sizeof(ERenderTargetLoadAction) == 1 && sizeof(ERenderTargetStoreAction) == 1 && sizeof(EPixelFormat) == sizeof(uint32)); //not a very robust parser
+		LexFromString((uint32&)(RenderTargetFormats[Index]), *Parts[PartIndex++]);
+		LexFromString(RenderTargetFlags[Index], *Parts[PartIndex++]);
+		LexFromString((uint8&)RenderTargetsLoad[Index], *Parts[PartIndex++]);
+		LexFromString((uint8&)RenderTargetsStore[Index], *Parts[PartIndex++]);
+	}
+
+	check(Parts.Num() - PartIndex >= 1); //not a very robust parser
+	int32 VertDescNum = 0;
+	LexFromString(VertDescNum, *Parts[PartIndex++]);
+	check(VertDescNum >= 0 && VertDescNum <= MaxVertexElementCount);
+
+	VertexDescriptor.Empty(VertDescNum);
+	VertexDescriptor.AddZeroed(VertDescNum);
+
+	check(Parts.Num() - PartIndex == MaxVertexElementCount); //not a very robust parser
+	for (int32 Index = 0; Index < VertDescNum; Index++)
+	{
+		VertexDescriptor[Index].FromString(Parts[PartIndex++]);
+	}
+	
+	VertexDescriptor.Sort([](FVertexElement const& A, FVertexElement const& B)
+	  {
+		  if (A.StreamIndex < B.StreamIndex)
+		  {
+			  return true;
+		  }
+		  if (A.StreamIndex > B.StreamIndex)
+		  {
+			  return false;
+		  }
+		  if (A.Offset < B.Offset)
+		  {
+			  return true;
+		  }
+		  if (A.Offset > B.Offset)
+		  {
+			  return false;
+		  }
+		  if (A.AttributeIndex < B.AttributeIndex)
+		  {
+			  return true;
+		  }
+		  if (A.AttributeIndex > B.AttributeIndex)
+		  {
+			  return false;
+		  }
+		  return false;
+	  });
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::StateHeaderLine()
+{
+	FString Result;
+
+	Result += FString::Printf(TEXT("%s,%s,%s,")
+		, TEXT("BlendState")
+		, TEXT("RasterizerState")
+		, TEXT("DepthStencilState")
+	);
+	Result += FString::Printf(TEXT("%s,%s,%s,")
+		, TEXT("MSAASamples")
+		, TEXT("DepthStencilFormat")
+		, TEXT("DepthStencilFlags")
+	);
+	Result += FString::Printf(TEXT("%s,%s,%s,%s,%s,")
+		, TEXT("DepthLoad")
+		, TEXT("StencilLoad")
+		, TEXT("DepthStore")
+		, TEXT("StencilStore")
+		, TEXT("PrimitiveType")
+	);
+
+	Result += FString::Printf(TEXT("%s,")
+		, TEXT("RenderTargetsActive")
+	);
+	for (int32 Index = 0; Index < MaxSimultaneousRenderTargets; Index++)
+	{
+		Result += FString::Printf(TEXT("%s%d,%s%d,%s%d,%s%d,")
+			, TEXT("RenderTargetFormats"), Index
+			, TEXT("RenderTargetFlags"), Index
+			, TEXT("RenderTargetsLoad"), Index
+			, TEXT("RenderTargetsStore"), Index
+		);
+	}
+
+	Result += FString::Printf(TEXT("%s,")
+		, TEXT("VertexDescriptorNum")
+	);
+	for (int32 Index = 0; Index < MaxVertexElementCount; Index++)
+	{
+		Result += FString::Printf(TEXT("%s%d,")
+			, TEXT("VertexDescriptor"), Index
+		);
+	}
+	return Result.Left(Result.Len() - 1); // remove trailing comma
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::ToString() const
+{
+	return FString::Printf(TEXT("%s,%s"), *ShadersToString(), *StateToString());
+}
+
+void FPipelineCacheFileFormatPSO::GraphicsDescriptor::FromString(const FString& Src)
+{
+	static const int32 NumShaderParts = 5;
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(","));
+	check(Parts.Num() > NumShaderParts);
+	TArray<FString> StateParts(Parts);
+	StateParts.RemoveAt(0, NumShaderParts);
+	Parts.RemoveAt(NumShaderParts, Parts.Num() - 5);
+	ShadersFromString(FString::Join(Parts, TEXT(",")));
+	StateFromString(FString::Join(StateParts, TEXT(",")));
+}
+
+FString FPipelineCacheFileFormatPSO::GraphicsDescriptor::HeaderLine()
+{
+	return FString::Printf(TEXT("%s,%s"), *ShaderHeaderLine(), *StateHeaderLine());
+}
+
+
+
+/**
+  * FPipelineCacheFileFormatPSO
+  **/
+
+/*friend*/ uint32 GetTypeHash(const FPipelineCacheFileFormatPSO &Key)
+{
+	if(FPlatformAtomics::AtomicRead((volatile int32*)&Key.Hash) == 0)
+	{
+		uint32 KeyHash = GetTypeHash(Key.Type);
+		switch(Key.Type)
+		{
+			case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+			{
+				KeyHash ^= GetTypeHash(Key.ComputeDesc.ComputeShader);
+				break;
+			}
+			case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+			{
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RenderTargetsActive, sizeof(Key.GraphicsDesc.RenderTargetsActive), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.MSAASamples, sizeof(Key.GraphicsDesc.MSAASamples), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.PrimitiveType, sizeof(Key.GraphicsDesc.PrimitiveType), KeyHash);
+				
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.VertexShader.Hash, sizeof(Key.GraphicsDesc.VertexShader.Hash), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.FragmentShader.Hash, sizeof(Key.GraphicsDesc.FragmentShader.Hash), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.GeometryShader.Hash, sizeof(Key.GraphicsDesc.GeometryShader.Hash), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.HullShader.Hash, sizeof(Key.GraphicsDesc.HullShader.Hash), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DomainShader.Hash, sizeof(Key.GraphicsDesc.DomainShader.Hash), KeyHash);
+				
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilFormat, sizeof(Key.GraphicsDesc.DepthStencilFormat), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilFlags, sizeof(Key.GraphicsDesc.DepthStencilFlags), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthLoad, sizeof(Key.GraphicsDesc.DepthLoad), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.StencilLoad, sizeof(Key.GraphicsDesc.StencilLoad), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStore, sizeof(Key.GraphicsDesc.DepthStore), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.StencilStore, sizeof(Key.GraphicsDesc.StencilStore), KeyHash);
+				
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.bUseIndependentRenderTargetBlendStates, sizeof(Key.GraphicsDesc.BlendState.bUseIndependentRenderTargetBlendStates), KeyHash);
+				for( uint32 i = 0; i < MaxSimultaneousRenderTargets; i++ )
+				{
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].ColorBlendOp, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].ColorBlendOp), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].ColorSrcBlend, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].ColorSrcBlend), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].ColorDestBlend, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].ColorDestBlend), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].ColorWriteMask, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].ColorWriteMask), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaBlendOp, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaBlendOp), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaSrcBlend, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaSrcBlend), KeyHash);
+					KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaDestBlend, sizeof(Key.GraphicsDesc.BlendState.RenderTargets[i].AlphaDestBlend), KeyHash);
+				}
+
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RenderTargetFormats, sizeof(Key.GraphicsDesc.RenderTargetFormats), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RenderTargetFlags, sizeof(Key.GraphicsDesc.RenderTargetFlags), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RenderTargetsLoad, sizeof(Key.GraphicsDesc.RenderTargetsLoad), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RenderTargetsStore, sizeof(Key.GraphicsDesc.RenderTargetsStore), KeyHash);
+
+				for(auto const& Element : Key.GraphicsDesc.VertexDescriptor)
+				{
+					KeyHash = FCrc::MemCrc32(&Element, sizeof(FVertexElement), KeyHash);
+				}
+				
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.DepthBias, sizeof(Key.GraphicsDesc.RasterizerState.DepthBias), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.SlopeScaleDepthBias, sizeof(Key.GraphicsDesc.RasterizerState.SlopeScaleDepthBias), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.FillMode, sizeof(Key.GraphicsDesc.RasterizerState.FillMode), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.CullMode, sizeof(Key.GraphicsDesc.RasterizerState.CullMode), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.bAllowMSAA, sizeof(Key.GraphicsDesc.RasterizerState.bAllowMSAA), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.RasterizerState.bEnableLineAA, sizeof(Key.GraphicsDesc.RasterizerState.bEnableLineAA), KeyHash);
+				
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.bEnableDepthWrite, sizeof(Key.GraphicsDesc.DepthStencilState.bEnableDepthWrite), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.DepthTest, sizeof(Key.GraphicsDesc.DepthStencilState.DepthTest), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.bEnableFrontFaceStencil, sizeof(Key.GraphicsDesc.DepthStencilState.bEnableFrontFaceStencil), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.FrontFaceStencilTest, sizeof(Key.GraphicsDesc.DepthStencilState.FrontFaceStencilTest), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.FrontFaceStencilFailStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.FrontFaceStencilFailStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.FrontFaceDepthFailStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.FrontFaceDepthFailStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.FrontFacePassStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.FrontFacePassStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.bEnableBackFaceStencil, sizeof(Key.GraphicsDesc.DepthStencilState.bEnableBackFaceStencil), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.BackFaceStencilTest, sizeof(Key.GraphicsDesc.DepthStencilState.BackFaceStencilTest), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.BackFaceStencilFailStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.BackFaceStencilFailStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.BackFaceDepthFailStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.BackFaceDepthFailStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.BackFacePassStencilOp, sizeof(Key.GraphicsDesc.DepthStencilState.BackFacePassStencilOp), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.StencilReadMask, sizeof(Key.GraphicsDesc.DepthStencilState.StencilReadMask), KeyHash);
+				KeyHash = FCrc::MemCrc32(&Key.GraphicsDesc.DepthStencilState.StencilWriteMask, sizeof(Key.GraphicsDesc.DepthStencilState.StencilWriteMask), KeyHash);
+				
+				break;
+			}
+			default:
+			{
+				check(false);
+				break;
+			}
+		}
+		FPlatformAtomics::InterlockedCompareExchange((volatile int32*)&Key.Hash, KeyHash, 0);
+	}
+	return FPlatformAtomics::AtomicRead((volatile int32*)&Key.Hash);
+}
+
+/*friend*/ FArchive& operator<<( FArchive& Ar, FPipelineCacheFileFormatPSO& Info )
+{
+	Ar << Info.Type;
+	switch (Info.Type)
+	{
+		case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+		{
+			Ar << Info.ComputeDesc.ComputeShader;
+            if (Ar.GameNetVer() == (uint32)EPipelineCacheFileFormatVersions::LibraryID)
+            {
+                uint32 ID = 0;
+                Ar << ID;
+            }
+			break;
+		}
+		case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+		{
+			Ar << Info.GraphicsDesc.VertexShader;
+			Ar << Info.GraphicsDesc.FragmentShader;
+			Ar << Info.GraphicsDesc.GeometryShader;
+			Ar << Info.GraphicsDesc.HullShader;
+			Ar << Info.GraphicsDesc.DomainShader;
+            if (Ar.GameNetVer() == (uint32)EPipelineCacheFileFormatVersions::LibraryID)
+            {
+				for (uint32 i = 0; i < SF_Compute; i++)
+				{
+                    uint32 ID = 0;
+                    Ar << ID;
+                }
+			}
+			if (Ar.GameNetVer() < (uint32)EPipelineCacheFileFormatVersions::SortedVertexDesc)
+			{
+				check(Ar.IsLoading());
+				
+				FVertexDeclarationElementList Elements;
+				Ar << Elements;
+				Elements.Sort([](FVertexElement const& A, FVertexElement const& B)
+							  {
+								  if (A.StreamIndex < B.StreamIndex)
+								  {
+									  return true;
+								  }
+								  if (A.StreamIndex > B.StreamIndex)
+								  {
+									  return false;
+								  }
+								  if (A.Offset < B.Offset)
+								  {
+									  return true;
+								  }
+								  if (A.Offset > B.Offset)
+								  {
+									  return false;
+								  }
+								  if (A.AttributeIndex < B.AttributeIndex)
+								  {
+									  return true;
+								  }
+								  if (A.AttributeIndex > B.AttributeIndex)
+								  {
+									  return false;
+								  }
+								  return false;
+							  });
+				
+				Info.GraphicsDesc.VertexDescriptor.AddZeroed(Elements.Num());
+				for (uint32 i = 0; i < (uint32)Elements.Num(); i++)
+				{
+					Info.GraphicsDesc.VertexDescriptor[i].StreamIndex = Elements[i].StreamIndex;
+					Info.GraphicsDesc.VertexDescriptor[i].Offset = Elements[i].Offset;
+					Info.GraphicsDesc.VertexDescriptor[i].Type = Elements[i].Type;
+					Info.GraphicsDesc.VertexDescriptor[i].AttributeIndex = Elements[i].AttributeIndex;
+					Info.GraphicsDesc.VertexDescriptor[i].Stride = Elements[i].Stride;
+					Info.GraphicsDesc.VertexDescriptor[i].bUseInstanceIndex = Elements[i].bUseInstanceIndex;
+				}
+			}
+			else
+			{
+				Ar << Info.GraphicsDesc.VertexDescriptor;
+			}
+			Ar << Info.GraphicsDesc.BlendState;
+			Ar << Info.GraphicsDesc.RasterizerState;
+			Ar << Info.GraphicsDesc.DepthStencilState;
+			for ( uint32 i = 0; i < MaxSimultaneousRenderTargets; i++ )
+			{
+				uint32 Format = (uint32)Info.GraphicsDesc.RenderTargetFormats[i];
+				Ar << Format;
+				Info.GraphicsDesc.RenderTargetFormats[i] = (EPixelFormat)Format;
+				Ar << Info.GraphicsDesc.RenderTargetFlags[i];
+				Ar << Info.GraphicsDesc.RenderTargetsLoad[i];
+				Ar << Info.GraphicsDesc.RenderTargetsStore[i];
+			}
+			Ar << Info.GraphicsDesc.RenderTargetsActive;
+			Ar << Info.GraphicsDesc.MSAASamples;
+			uint32 PrimType = (uint32)Info.GraphicsDesc.PrimitiveType;
+			Ar << PrimType;
+			Info.GraphicsDesc.PrimitiveType = (EPrimitiveType)PrimType;
+			uint32 Format = (uint32)Info.GraphicsDesc.DepthStencilFormat;
+			Ar << Format;
+			Info.GraphicsDesc.DepthStencilFormat = (EPixelFormat)Format;
+			Ar << Info.GraphicsDesc.DepthStencilFlags;
+			Ar << Info.GraphicsDesc.DepthLoad;
+			Ar << Info.GraphicsDesc.StencilLoad;
+			Ar << Info.GraphicsDesc.DepthStore;
+			Ar << Info.GraphicsDesc.StencilStore;
+			break;
+		}
+		default:
+		{
+			check(false);
+			break;
+		}
+	}
+	return Ar;
+}
+
+FPipelineCacheFileFormatPSO::FPipelineCacheFileFormatPSO()
+: Hash(0)
+{
+}
+
+/*static*/ bool FPipelineCacheFileFormatPSO::Init(FPipelineCacheFileFormatPSO& PSO, FRHIComputeShader const* Init)
+{
+	check(Init);
+
+	PSO.Hash = 0;
+	PSO.Type = DescriptorType::Compute;
+	
+	// Because of the cheat in the copy constructor - lets play this safe
+	FMemory::Memset(&PSO.ComputeDesc, 0, sizeof(ComputeDescriptor));
+	
+	PSO.ComputeDesc.ComputeShader = Init->GetHash();
+	
+	return true;
+}
+
+/*static*/ bool FPipelineCacheFileFormatPSO::Init(FPipelineCacheFileFormatPSO& PSO, FGraphicsPipelineStateInitializer const& Init)
+{
+	bool bOK = true;
+	
+	PSO.Hash = 0;
+	PSO.Type = DescriptorType::Graphics;
+	
+	// Because of the cheat in the copy constructor - lets play this safe
+	FMemory::Memset(&PSO.GraphicsDesc, 0, sizeof(GraphicsDescriptor));
+	
+	check (Init.BoundShaderState.VertexDeclarationRHI);
+	{
+		bOK &= Init.BoundShaderState.VertexDeclarationRHI->GetInitializer(PSO.GraphicsDesc.VertexDescriptor);
+		check(bOK);
+		
+		PSO.GraphicsDesc.VertexDescriptor.Sort([](FVertexElement const& A, FVertexElement const& B)
+		{
+			if (A.StreamIndex < B.StreamIndex)
+			{
+				return true;
+			}
+			if (A.StreamIndex > B.StreamIndex)
+			{
+				return false;
+			}
+			if (A.Offset < B.Offset)
+			{
+				return true;
+			}
+			if (A.Offset > B.Offset)
+			{
+				return false;
+			}
+			if (A.AttributeIndex < B.AttributeIndex)
+			{
+				return true;
+			}
+			if (A.AttributeIndex > B.AttributeIndex)
+			{
+				return false;
+			}
+			return false;
+		});
+	}
+	
+	if (Init.BoundShaderState.VertexShaderRHI)
+	{
+		PSO.GraphicsDesc.VertexShader = Init.BoundShaderState.VertexShaderRHI->GetHash();
+	}
+	
+	if (Init.BoundShaderState.HullShaderRHI)
+	{
+		PSO.GraphicsDesc.HullShader = Init.BoundShaderState.HullShaderRHI->GetHash();
+	}
+	
+	if (Init.BoundShaderState.DomainShaderRHI)
+	{
+		PSO.GraphicsDesc.DomainShader = Init.BoundShaderState.DomainShaderRHI->GetHash();
+	}
+	
+	if (Init.BoundShaderState.PixelShaderRHI)
+	{
+		PSO.GraphicsDesc.FragmentShader = Init.BoundShaderState.PixelShaderRHI->GetHash();
+	}
+	
+	if (Init.BoundShaderState.GeometryShaderRHI)
+	{
+		PSO.GraphicsDesc.GeometryShader = Init.BoundShaderState.GeometryShaderRHI->GetHash();
+	}
+	
+	check (Init.BlendState);
+	{
+		bOK &= Init.BlendState->GetInitializer(PSO.GraphicsDesc.BlendState);
+		check(bOK);
+	}
+	
+	check (Init.RasterizerState);
+	{
+		FRasterizerStateInitializerRHI Temp;
+		bOK &= Init.RasterizerState->GetInitializer(Temp);
+		check(bOK);
+		
+		PSO.GraphicsDesc.RasterizerState = Temp;
+	}
+	
+	check (Init.DepthStencilState);
+	{
+		bOK &= Init.DepthStencilState->GetInitializer(PSO.GraphicsDesc.DepthStencilState);
+		check(bOK);
+	}
+	
+	for (uint32 i = 0; i < MaxSimultaneousRenderTargets; i++)
+	{
+		PSO.GraphicsDesc.RenderTargetFormats[i] = Init.RenderTargetFormats[i];
+		PSO.GraphicsDesc.RenderTargetFlags[i] = Init.RenderTargetFlags[i];
+		PSO.GraphicsDesc.RenderTargetsLoad[i] = Init.RenderTargetLoadActions[i];
+		PSO.GraphicsDesc.RenderTargetsStore[i] = Init.RenderTargetStoreActions[i];
+	}
+	
+	PSO.GraphicsDesc.RenderTargetsActive = Init.RenderTargetsEnabled;
+	PSO.GraphicsDesc.MSAASamples = Init.NumSamples;
+	
+	PSO.GraphicsDesc.DepthStencilFormat = Init.DepthStencilTargetFormat;
+	PSO.GraphicsDesc.DepthStencilFlags = Init.DepthStencilTargetFlag;
+	PSO.GraphicsDesc.DepthLoad = Init.DepthTargetLoadAction;
+	PSO.GraphicsDesc.StencilLoad = Init.StencilTargetLoadAction;
+	PSO.GraphicsDesc.DepthStore = Init.DepthTargetStoreAction;
+	PSO.GraphicsDesc.StencilStore = Init.StencilTargetStoreAction;
+	
+	PSO.GraphicsDesc.PrimitiveType = Init.PrimitiveType;
+	
+	return bOK;
+}
+
+FPipelineCacheFileFormatPSO::~FPipelineCacheFileFormatPSO()
+{
+	
+}
+
+bool FPipelineCacheFileFormatPSO::operator==(const FPipelineCacheFileFormatPSO& Other) const
+{
+	bool bSame = true;
+	if (this != &Other)
+	{
+		bSame = false;
+		//if (Type == Other.Type && GetTypeHash(*this) == GetTypeHash(Other))
+		{
+			switch(Type)
+			{
+				case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+				{
+					// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+					bSame = (FMemory::Memcmp(&ComputeDesc, &Other.ComputeDesc, sizeof(ComputeDescriptor)) == 0);
+					break;
+				}
+				case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+				{
+					// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+					
+					bSame = GraphicsDesc.VertexDescriptor.Num() == Other.GraphicsDesc.VertexDescriptor.Num();
+					for (uint32 i = 0; i < (uint32)FMath::Min(GraphicsDesc.VertexDescriptor.Num(), Other.GraphicsDesc.VertexDescriptor.Num()); i++)
+					{
+						bSame &= (FMemory::Memcmp(&GraphicsDesc.VertexDescriptor[i], &Other.GraphicsDesc.VertexDescriptor[i], sizeof(FVertexElement)) == 0);
+					}
+					bSame &= GraphicsDesc.PrimitiveType == Other.GraphicsDesc.PrimitiveType && GraphicsDesc.VertexShader == Other.GraphicsDesc.VertexShader && GraphicsDesc.FragmentShader == Other.GraphicsDesc.FragmentShader && GraphicsDesc.GeometryShader == Other.GraphicsDesc.GeometryShader && GraphicsDesc.HullShader == Other.GraphicsDesc.HullShader && GraphicsDesc.DomainShader == Other.GraphicsDesc.DomainShader && GraphicsDesc.RenderTargetsActive == Other.GraphicsDesc.RenderTargetsActive &&
+					GraphicsDesc.MSAASamples == Other.GraphicsDesc.MSAASamples && GraphicsDesc.DepthStencilFormat == Other.GraphicsDesc.DepthStencilFormat &&
+					GraphicsDesc.DepthStencilFlags == Other.GraphicsDesc.DepthStencilFlags && GraphicsDesc.DepthLoad == Other.GraphicsDesc.DepthLoad &&
+					GraphicsDesc.DepthStore == Other.GraphicsDesc.DepthStore && GraphicsDesc.StencilLoad == Other.GraphicsDesc.StencilLoad && GraphicsDesc.StencilStore == Other.GraphicsDesc.StencilStore &&
+					FMemory::Memcmp(&GraphicsDesc.BlendState, &Other.GraphicsDesc.BlendState, sizeof(FBlendStateInitializerRHI)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.RasterizerState, &Other.GraphicsDesc.RasterizerState, sizeof(FPipelineFileCacheRasterizerState)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.DepthStencilState, &Other.GraphicsDesc.DepthStencilState, sizeof(FDepthStencilStateInitializerRHI)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.RenderTargetFormats, &Other.GraphicsDesc.RenderTargetFormats, sizeof(GraphicsDesc.RenderTargetFormats)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.RenderTargetFlags, &Other.GraphicsDesc.RenderTargetFlags, sizeof(GraphicsDesc.RenderTargetFlags)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.RenderTargetsLoad, &Other.GraphicsDesc.RenderTargetsLoad, sizeof(GraphicsDesc.RenderTargetsLoad)) == 0 &&
+					FMemory::Memcmp(&GraphicsDesc.RenderTargetsStore, &Other.GraphicsDesc.RenderTargetsStore, sizeof(GraphicsDesc.RenderTargetsStore)) == 0;
+					break;
+				}
+				default:
+				{
+					check(false);
+					break;
+				}
+			}
+		}
+	}
+	return bSame;
+}
+
+FPipelineCacheFileFormatPSO::FPipelineCacheFileFormatPSO(const FPipelineCacheFileFormatPSO& Other)
+: Type(Other.Type)
+, Hash(Other.Hash)
+{
+	switch(Type)
+	{
+		case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+		{
+			// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+			FMemory::Memcpy(&ComputeDesc, &Other.ComputeDesc, sizeof(ComputeDescriptor));
+			break;
+		}
+		case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+		{
+			// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+			FMemory::Memcpy(&GraphicsDesc, &Other.GraphicsDesc, sizeof(GraphicsDescriptor));
+			break;
+		}
+		default:
+		{
+			check(false);
+			break;
+		}
+	}
+}
+
+FPipelineCacheFileFormatPSO& FPipelineCacheFileFormatPSO::operator=(const FPipelineCacheFileFormatPSO& Other)
+{
+	if(this != &Other)
+	{
+		Type = Other.Type;
+		Hash = Other.Hash;
+		switch(Type)
+		{
+			case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+			{
+				// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+				FMemory::Memcpy(&ComputeDesc, &Other.ComputeDesc, sizeof(ComputeDescriptor));
+				break;
+			}
+			case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+			{
+				// If we implement a classic copy constructor without memcpy - remove memset in ::Init() function above
+				FMemory::Memcpy(&GraphicsDesc, &Other.GraphicsDesc, sizeof(GraphicsDescriptor));
+				break;
+			}
+			default:
+			{
+				check(false);
+				break;
+			}
+		}
+	}
+	return *this;
+}
+
+struct FPipelineCacheFileFormatTOC
+{
+	FPipelineCacheFileFormatTOC()
+	: SortedOrder(FPipelineFileCache::PSOOrder::Default)
+	{}
+	
+	FPipelineFileCache::PSOOrder SortedOrder;
+	TMap<uint32, FPipelineCacheFileFormatPSOMetaData> MetaData;
+	
+	friend FArchive& operator<<(FArchive& Ar, FPipelineCacheFileFormatTOC& Info)
+	{
+		Ar << Info.SortedOrder;
+		Ar << Info.MetaData;
+		
+		return Ar;
+	}
+};
+
+class FPipelineCacheFile
+{
+public:
+	static uint32 GameVersion;
+
+	FPipelineCacheFile()
+	: TOCOffset(0)
+	, UserFileGuid(FGuid::NewGuid())
+	, UserAsyncFileHandle(nullptr)
+	, GameAsyncFileHandle(nullptr)
+	{
+	}
+	
+	bool OpenPipelineFileCache(FString const& FilePath, FGuid& Guid, TSharedPtr<IAsyncReadFileHandle, ESPMode::ThreadSafe>& Handle, FPipelineCacheFileFormatTOC& Content)
+	{
+		bool bOK = false;
+		FArchive* FileReader = IFileManager::Get().CreateFileReader(*FilePath);
+		if (FileReader)
+		{
+			FPipelineCacheFileFormatHeader Header;
+			*FileReader << Header;
+            FileReader->SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+			if (Header.Magic == FPipelineCacheFileFormatMagic && Header.Version == FPipelineCacheFileFormatCurrentVersion && Header.GameVersion == GameVersion && Header.Platform == ShaderPlatform)
+			{
+				check(Header.TableOffset > 0);
+				TOCOffset = Header.TableOffset;
+				Guid = Header.Guid;
+				FileReader->Seek(Header.TableOffset);
+				
+				*FileReader << Content;
+				bOK = !FileReader->IsError();
+			}
+			
+			if(!FileReader->Close())
+			{
+				bOK = false;
+			}
+			delete FileReader;
+			
+			if(bOK)
+			{
+				UE_LOG(LogRHI, Log, TEXT("Opened FPipelineCacheFile: %s (GUID: %s) with %d entries."), *FilePath, *Guid.ToString(), Content.MetaData.Num());
+				Handle = MakeShareable(FPlatformFileManager::Get().GetPlatformFile().OpenAsyncRead(*FilePath));
+			}
+		}
+		else
+		{
+			UE_LOG(LogRHI, Log, TEXT("Could not open FPipelineCacheFile: %s"), *FilePath);
+		}
+		
+		return bOK;
+	}
+	
+    bool ShouldDeleteExistingUserCache()
+    {
+        static bool bOnce = false;
+        static bool bCmdLineForce = false;
+        if (!bOnce)
+        {
+            bOnce = true;
+            bCmdLineForce = FParse::Param(FCommandLine::Get(), TEXT("deleteuserpsocache"));
+            UE_CLOG(bCmdLineForce, LogRHI, Warning, TEXT("****************************** Deleting user-writable PSO cache as requested on command line"));
+        }
+        return bCmdLineForce;
+    }
+    
+	bool OpenPipelineFileCache(FString const& FileName, EShaderPlatform Platform)
+	{
+		SET_DWORD_STAT(STAT_TotalGraphicsPipelineStateCount, 0);
+		SET_DWORD_STAT(STAT_TotalComputePipelineStateCount, 0);
+		SET_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount, 0);
+		SET_DWORD_STAT(STAT_SerializedComputePipelineStateCount, 0);
+		SET_DWORD_STAT(STAT_NewGraphicsPipelineStateCount, 0);
+		SET_DWORD_STAT(STAT_NewComputePipelineStateCount, 0);
+		
+		TOC.SortedOrder = FPipelineFileCache::PSOOrder::Default;
+		TOC.MetaData.Empty();
+		
+		Name = FileName;
+		
+		ShaderPlatform = Platform;
+		PlatformName = LegacyShaderPlatformToShaderFormat(Platform);
+		
+
+		FString GamePathStable = FPaths::ProjectContentDir() / TEXT("PipelineCaches") / ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()) / FString::Printf(TEXT("%s_%s.stable.upipelinecache"), *FileName, *PlatformName.ToString());
+		FString GamePath = FPaths::ProjectContentDir() / TEXT("PipelineCaches") / ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()) / FString::Printf(TEXT("%s_%s.upipelinecache"), *FileName, *PlatformName.ToString());
+
+#if PLATFORM_MAC
+		static bool bCommandLineNotStable = FParse::Param(FCommandLine::Get(), TEXT("nostablepipelinecache")) || IsRHIDeviceNVIDIA();
+#else
+		static bool bCommandLineNotStable = FParse::Param(FCommandLine::Get(), TEXT("nostablepipelinecache"));
+#endif
+		if (!bCommandLineNotStable && IFileManager::Get().FileExists(*GamePathStable))
+		{
+			GamePath = GamePathStable;
+		}
+
+		FString FilePath = FPaths::ProjectSavedDir() / FString::Printf(TEXT("%s_%s.upipelinecache"), *FileName, *PlatformName.ToString());
+
+#define FAKE_BRCL 0
+#if FAKE_BRCL
+		RecordingFilename = FString::Printf(TEXT("%s-CL-%u-"), TEXT("++Fortnite+Release-3.4"), 3951433);
+#else
+		RecordingFilename = FString::Printf(TEXT("%s-CL-%u-"), *FEngineVersion::Current().GetBranchDescriptor(), FEngineVersion::Current().GetChangelist());
+#endif
+
+		FGuid UniqueFileGuid;
+		FPlatformMisc::CreateGuid(UniqueFileGuid);  // not very unique on android, but won't matter much here
+		RecordingFilename += FString::Printf(TEXT("%s_%s_%s.rec.upipelinecache"), *FileName, *PlatformName.ToString(), *UniqueFileGuid.ToString());
+		RecordingFilename = FPaths::ProjectSavedDir() / TEXT("CollectedPSOs") / RecordingFilename;
+
+		UE_LOG(LogRHI, Log, TEXT("Base name for record PSOs is %s"), *RecordingFilename);
+
+		FString JournalPath = FilePath + TEXT(".tmp");
+        bool const bJournalFileExists = IFileManager::Get().FileExists(*JournalPath);
+		if (bJournalFileExists || ShouldDeleteExistingUserCache())
+		{
+			UE_LOG(LogRHI, Log, TEXT("Deleting FPipelineCacheFile: %s"), *FilePath);
+            // If either of the above are true we need to dispose of this case as we consider it invalid
+            if (IFileManager::Get().FileExists(*FilePath))
+            {
+                IFileManager::Get().Delete(*FilePath);
+            }
+            if (bJournalFileExists)
+            {
+                IFileManager::Get().Delete(*JournalPath);
+            }
+		}
+
+		const bool bGameFileOk = OpenPipelineFileCache(GamePath, GameFileGuid, GameAsyncFileHandle, GameTOC);
+        bool bUserFileOk = false;
+        
+        if (FPipelineFileCache::LogPSOtoFileCache() && (CVarPSOFileCacheSaveUserCache.GetValueOnAnyThread() > 0))
+        {
+            bUserFileOk = OpenPipelineFileCache(FilePath, UserFileGuid, UserAsyncFileHandle, TOC);
+            if (!bUserFileOk)
+            {
+                // Start the file again!
+                IFileManager::Get().Delete(*FilePath);
+                TOCOffset = 0;
+            }
+            else
+            {
+                for (auto const& Entry : GameTOC.MetaData)
+                {
+					auto* MetaPtr = TOC.MetaData.Find(Entry.Key);
+                    if (!MetaPtr || (MetaPtr->FileGuid != UserFileGuid && MetaPtr->FileGuid != GameFileGuid))
+                    {
+                        TOC.MetaData.Add(Entry.Key, Entry.Value);
+                    }
+                }
+            }
+        }
+        
+        if (!bUserFileOk)
+        {
+            TOC = GameTOC;
+        }
+        for (auto const& Entry : TOC.MetaData)
+        {
+            FPipelineStateStats* Stat = FPipelineFileCache::Stats.FindRef(Entry.Key);
+            if (!Stat)
+            {
+                Stat = new FPipelineStateStats;
+                Stat->PSOHash = Entry.Key;
+                Stat->TotalBindCount = -1;
+                FPipelineFileCache::Stats.Add(Entry.Key, Stat);
+            }
+        }
+		
+		SET_MEMORY_STAT(STAT_FileCacheMemory, TOC.MetaData.GetAllocatedSize());
+		
+		return bGameFileOk || bUserFileOk;
+	}
+	bool SavePipelineFileCache(FString const& FilePath, FPipelineFileCache::SaveMode Mode, TMap<uint32, FPipelineStateStats*> const& Stats, TSet<FPipelineCacheFileFormatPSO>& NewEntries, FPipelineFileCache::PSOOrder Order)
+	{
+		QUICK_SCOPE_CYCLE_COUNTER(STAT_SavePipelineFileCache);
+		double StartTime = FPlatformTime::Seconds();
+		FString SaveFilePath = FilePath;
+		
+		if (FPipelineFileCache::SaveMode::BoundPSOsOnly == Mode)
+		{
+			SaveFilePath = GetRecordingFilename();
+		}
+		
+		bool bFileWriteSuccess = false;
+		bool bPerformWrite = true;
+		if (FPipelineFileCache::SaveMode::Incremental == Mode)
+		{
+			bPerformWrite = NewEntries.Num() || Order != TOC.SortedOrder;
+			bFileWriteSuccess = !bPerformWrite;
+		}
+		
+		if (bPerformWrite)
+		{
+            uint32 NumNewEntries = 0;
+            
+			FString JournalPath;
+			if (Mode != FPipelineFileCache::SaveMode::BoundPSOsOnly)
+			{
+				JournalPath = SaveFilePath + TEXT(".jnl");
+				FArchive* JournalWriter = IFileManager::Get().CreateFileWriter(*JournalPath);
+				check(JournalWriter);
+
+				// Header
+				{
+					FPipelineCacheFileFormatHeader Header;
+
+					Header.Magic = FPipelineCacheFileFormatMagic;
+					Header.Version = FPipelineCacheFileFormatCurrentVersion;
+					Header.GameVersion = GameVersion;
+					Header.Platform = ShaderPlatform;
+					Header.Guid = UserFileGuid;
+					Header.TableOffset = 0;
+
+					*JournalWriter << Header;
+				}
+
+				check(!JournalWriter->IsError());
+				JournalWriter->Close();
+				delete JournalWriter;
+				bPerformWrite = IFileManager::Get().FileExists(*JournalPath);
+			}
+			if (bPerformWrite)
+			{
+                FString GamePathStable = FPaths::ProjectContentDir() / TEXT("PipelineCaches") / ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()) / FString::Printf(TEXT("%s_%s.stable.upipelinecache"), *Name, *PlatformName.ToString());
+                FString GamePath = FPaths::ProjectContentDir() / TEXT("PipelineCaches") / ANSI_TO_TCHAR(FPlatformProperties::IniPlatformName()) / FString::Printf(TEXT("%s_%s.upipelinecache"), *Name, *PlatformName.ToString());
+#if PLATFORM_MAC
+                static bool bCommandLineNotStable = FParse::Param(FCommandLine::Get(), TEXT("nostablepipelinecache")) || IsRHIDeviceNVIDIA();
+#else
+				static bool bCommandLineNotStable = FParse::Param(FCommandLine::Get(), TEXT("nostablepipelinecache"));
+#endif
+                if (!bCommandLineNotStable && IFileManager::Get().FileExists(*GamePathStable))
+                {
+                    GamePath = GamePathStable;
+                }
+
+                int64 GameFileSize = IFileManager::Get().FileSize(*GamePath);
+				TArray<uint8> GameFileBytes;
+				int64 FileSize = IFileManager::Get().FileSize(*FilePath);
+				TArray<uint8> UserFileBytes;
+				if(FPipelineFileCache::SaveMode::Incremental != Mode)
+				{
+					if (GameFileSize > 0)
+					{
+						if (GameAsyncFileHandle.IsValid())
+						{
+							GameFileBytes.AddZeroed(GameFileSize);
+							IAsyncReadRequest* Request = GameAsyncFileHandle->ReadRequest(0, GameFileSize, AIOP_Normal, nullptr, GameFileBytes.GetData());
+							Request->WaitCompletion();
+							delete Request;
+							// Can't report errors here because the AsyncIO requests have no such mechanism.
+						}
+						else
+						{
+							bool bReadOK = FFileHelper::LoadFileToArray(GameFileBytes, *GamePath);
+							UE_CLOG(!bReadOK, LogRHI, Warning, TEXT("Failed to read %lld bytes from %s while re-saving the PipelineFileCache!"), GameFileSize, *GamePath);
+						}
+					}
+		 
+					if (FileSize > 0)
+					{
+						if (UserAsyncFileHandle.IsValid())
+						{
+							UserFileBytes.AddZeroed(FileSize);
+							IAsyncReadRequest* Request = UserAsyncFileHandle->ReadRequest(0, FileSize, AIOP_Normal, nullptr, UserFileBytes.GetData());
+							Request->WaitCompletion();
+							delete Request;
+							// Can't report errors here because the AsyncIO requests have no such mechanism.
+						}
+						else
+						{
+							bool bReadOK = FFileHelper::LoadFileToArray(UserFileBytes, *FilePath);
+							UE_CLOG(!bReadOK, LogRHI, Warning, TEXT("Failed to read %lld bytes from %s while re-saving the PipelineFileCache!"), FileSize, *FilePath);
+						}
+					}
+				}
+		 
+				// Assume caller has handled Platform specifc path + filename
+				TArray<uint8> SaveBytes;
+				FArchive* FileWriter;
+				bool bUseMemoryWriter = (Mode == FPipelineFileCache::SaveMode::BoundPSOsOnly);
+				FString TempPath = SaveFilePath;
+				// Only use a file switcheroo on Apple platforms as they are the only ones tested so far.
+				// At least two other platforms MoveFile implementation looks broken when moving from a writable source file to a writeable destination.
+				// They only handle moves/renames between the read-only -> writeable directories/devices.
+				if ((PLATFORM_APPLE || PLATFORM_ANDROID) && Mode != FPipelineFileCache::SaveMode::Incremental)
+				{
+					TempPath += TEXT(".tmp");
+				}
+				if (bUseMemoryWriter)
+				{
+					FileWriter = new FMemoryWriter(SaveBytes, true, false, FName(*SaveFilePath));
+				}
+				else
+				{
+					FileWriter = IFileManager::Get().CreateFileWriter(*TempPath, FILEWRITE_Append);
+				}
+				if (FileWriter)
+				{
+                    FileWriter->SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+					FileWriter->Seek(0);
+		 
+					// Header
+					FPipelineCacheFileFormatHeader Header;
+					{
+						Header.Magic = FPipelineCacheFileFormatMagic;
+						Header.Version = FPipelineCacheFileFormatCurrentVersion;
+						Header.GameVersion = GameVersion;
+						Header.Platform = ShaderPlatform;
+						Header.Guid = UserFileGuid;
+						Header.TableOffset = 0;
+		 
+						*FileWriter << Header;
+		 
+						TOCOffset = FMath::Max(TOCOffset, (uint64)FileWriter->Tell());
+					}
+		 
+					uint32 TotalEntries = 0;
+                    uint32 ConsolidatedEntries = 0;
+                    uint32 RemovedEntries = 0;
+                    switch (Mode)
+                    {
+						// This mode just writes new, used, entries to the end of the file and updates the TOC which will contain entries from the Game-Content file that are redundant.
+                        case FPipelineFileCache::SaveMode::Incremental:
+                        {
+                            // PSO Descriptors
+                            uint64 PSOOffset = TOCOffset;
+                            
+                            FileWriter->Seek(PSOOffset);
+                            
+                            // Add new entries
+							TotalEntries = NewEntries.Num();
+							for(auto It = NewEntries.CreateIterator(); It; ++It)
+                            {
+								FPipelineCacheFileFormatPSO& NewEntry = *It;
+                                check(!IsPSOEntryCached(NewEntry));
+                                
+                                uint32 PSOHash = GetTypeHash(NewEntry);
+								
+								FPipelineStateStats const* Stat = Stats.FindRef(PSOHash);
+                                if (Stat && Stat->TotalBindCount > 0)
+								{
+									FPipelineCacheFileFormatPSOMetaData Meta;
+									Meta.Stats.PSOHash = PSOHash;
+									Meta.FileOffset = PSOOffset;
+									Meta.FileGuid = UserFileGuid;
+									
+									switch(NewEntry.Type)
+									{
+										case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+										{
+											INC_DWORD_STAT(STAT_SerializedComputePipelineStateCount);
+											Meta.Shaders.Add(NewEntry.ComputeDesc.ComputeShader);
+											break;
+										}
+										case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+										{
+											INC_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount);
+											
+											if (NewEntry.GraphicsDesc.VertexShader != FSHAHash())
+												Meta.Shaders.Add(NewEntry.GraphicsDesc.VertexShader);
+											
+											if (NewEntry.GraphicsDesc.FragmentShader != FSHAHash())
+												Meta.Shaders.Add(NewEntry.GraphicsDesc.FragmentShader);
+											
+											if (NewEntry.GraphicsDesc.HullShader != FSHAHash())
+												Meta.Shaders.Add(NewEntry.GraphicsDesc.HullShader);
+											
+											if (NewEntry.GraphicsDesc.DomainShader != FSHAHash())
+												Meta.Shaders.Add(NewEntry.GraphicsDesc.DomainShader);
+											
+											if (NewEntry.GraphicsDesc.GeometryShader != FSHAHash())
+												Meta.Shaders.Add(NewEntry.GraphicsDesc.GeometryShader);
+											
+											break;
+										}
+										default:
+										{
+											check(false);
+											break;
+										}
+									}
+									
+									TArray<uint8> Bytes;
+									FMemoryWriter Wr(Bytes);
+									Wr.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+									Wr << NewEntry;
+									
+									FileWriter->Serialize(Bytes.GetData(), Wr.TotalSize());
+									
+									Meta.FileSize = Wr.TotalSize();
+									
+									TOC.MetaData.Add(PSOHash, Meta);
+									PSOOffset += Meta.FileSize;
+									
+									check(PSOOffset == FileWriter->Tell());
+									
+									NumNewEntries++;
+									
+									It.RemoveCurrent();
+								}
+                            }
+                            
+                            if(Order != FPipelineFileCache::PSOOrder::Default)
+                            {
+                                SortMetaData(TOC.MetaData, Order);
+                                TOC.SortedOrder = Order;
+                            }
+                            else
+                            {
+                                // Added new entries and not re-sorted - the sort order invalid - reset to default
+                                TOC.SortedOrder = FPipelineFileCache::PSOOrder::Default;
+                            }
+                            
+                            Header.TableOffset = PSOOffset;
+                            TOCOffset = PSOOffset;
+                            
+                            FileWriter->Seek(Header.TableOffset);
+                            *FileWriter << TOC;
+                            break;
+                        }
+						// These modes actually save to a separate file that records only PSOs that were bound.
+						// BoundPSOsOnly will record all those PSOs used in this run of the game.
+                        case FPipelineFileCache::SaveMode::BoundPSOsOnly:
+                        {
+							FMemoryReader UserFileBytesReader(UserFileBytes);
+							FMemoryReader GameFileBytesReader(GameFileBytes);
+							UserFileBytesReader.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+							GameFileBytesReader.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+
+                            FPipelineCacheFileFormatTOC TempTOC = TOC;
+                            TMap<uint32, FPipelineCacheFileFormatPSO> PSOs;
+							
+							Header.Guid = FGuid::NewGuid();
+							
+                            for (auto& Entry : NewEntries)
+                            {
+                                FPipelineCacheFileFormatPSOMetaData Meta;
+                                Meta.Stats.PSOHash = GetTypeHash(Entry);
+                                Meta.FileOffset = 0;
+                                Meta.FileSize = 0;
+                                Meta.FileGuid = Header.Guid;
+                                
+                                switch(Entry.Type)
+                                {
+                                    case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+                                    {
+                                        INC_DWORD_STAT(STAT_SerializedComputePipelineStateCount);
+                                        Meta.Shaders.Add(Entry.ComputeDesc.ComputeShader);
+                                        break;
+                                    }
+                                    case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+                                    {
+                                        INC_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount);
+                                        
+                                        if (Entry.GraphicsDesc.VertexShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.VertexShader);
+                                        
+                                        if (Entry.GraphicsDesc.FragmentShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.FragmentShader);
+                                        
+                                        if (Entry.GraphicsDesc.HullShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.HullShader);
+                                        
+                                        if (Entry.GraphicsDesc.DomainShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.DomainShader);
+                                        
+                                        if (Entry.GraphicsDesc.GeometryShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.GeometryShader);
+                                        
+                                        break;
+                                    }
+                                    default:
+                                    {
+                                        check(false);
+                                        break;
+                                    }
+                                }
+                                
+                                TempTOC.MetaData.Add(Meta.Stats.PSOHash, Meta);
+                                PSOs.Add(Meta.Stats.PSOHash, Entry);
+                            }
+                            
+                            for (auto& Pair : Stats)
+                            {
+                                auto* MetaPtr = TempTOC.MetaData.Find(Pair.Key);
+                                if (MetaPtr)
+                                {
+                                    auto& Meta = *MetaPtr;
+                                    check(Meta.Stats.PSOHash == Pair.Value->PSOHash);
+                                    Meta.Stats.CreateCount += Pair.Value->CreateCount;
+                                    if (Pair.Value->FirstFrameUsed > Meta.Stats.FirstFrameUsed)
+                                    {
+                                        Meta.Stats.FirstFrameUsed = Pair.Value->FirstFrameUsed;
+                                    }
+                                    if (Pair.Value->LastFrameUsed > Meta.Stats.LastFrameUsed)
+                                    {
+                                        Meta.Stats.LastFrameUsed = Pair.Value->LastFrameUsed;
+                                    }
+									Meta.Stats.TotalBindCount = (int64)FMath::Min((uint64)INT64_MAX, (uint64)FMath::Max(Meta.Stats.TotalBindCount, 0ll) + (uint64)FMath::Max(Pair.Value->TotalBindCount, 0ll));
+                                }
+                            }
+                            
+                            for (auto It = TempTOC.MetaData.CreateIterator(); It; ++It)
+                            {
+                                FPipelineStateStats const* Stat = Stats.FindRef(It->Key);
+								
+								bool bUsed = (Stat && (Stat->TotalBindCount > 0));
+								if (bUsed)
+                                {
+                                    if (!PSOs.Contains(It->Key))
+                                    {
+                                        FPipelineCacheFileFormatPSO PSO;
+                                        check(It->Value.FileSize > 0);
+                                        if (It->Value.FileGuid == UserFileGuid)
+                                        {
+											check(It->Value.FileOffset < (uint32)UserFileBytes.Num());
+											UserFileBytesReader.Seek(It->Value.FileOffset);
+											UserFileBytesReader << PSO;
+                                        }
+                                        else if (It->Value.FileGuid == GameFileGuid)
+                                        {
+											check(It->Value.FileOffset < (uint32)GameFileBytes.Num());
+											GameFileBytesReader.Seek(It->Value.FileOffset);
+											GameFileBytesReader << PSO;
+                                        }
+										else
+										{
+											UE_LOG(LogRHI, Verbose, TEXT("Trying to reconcile from unknown file GUID: %s but bound log file is: %s user file is: %s and game file is: %s - this means you have stale entries in a local cache file or the game content file is filled with bogus entries whose FileGUID doesn't match."), *(It->Value.FileGuid.ToString()), *(Header.Guid.ToString()), *(UserFileGuid.ToString()), *(GameFileGuid.ToString()));
+											
+											RemovedEntries++;
+											It.RemoveCurrent();
+										}
+
+										PSOs.Add(It->Key, PSO);
+                                    }
+                                }
+                                else
+                                {
+                                    RemovedEntries++;
+                                    It.RemoveCurrent();
+                                }
+                            }
+							TotalEntries = TempTOC.MetaData.Num();
+                            
+                            SortMetaData(TempTOC.MetaData, Order);
+                            TempTOC.SortedOrder = Order;
+                            
+                            uint64 TempTOCOffset = (uint64)FileWriter->Tell();
+                            
+                            uint64 PSOOffset = TempTOCOffset;
+                            
+                            for (auto& Entry : TempTOC.MetaData)
+                            {
+                                FPipelineCacheFileFormatPSO& PSO = PSOs.FindChecked(Entry.Key);
+                                
+                                FileWriter->Seek(PSOOffset);
+                                
+                                Entry.Value.FileGuid = Header.Guid;
+                                Entry.Value.FileOffset = PSOOffset;
+
+								int64 At = FileWriter->Tell();
+                                
+                                (*FileWriter) << PSO;
+                                
+                                Entry.Value.FileSize = FileWriter->Tell() - At;
+                                
+                                PSOOffset += Entry.Value.FileSize;
+                                check(PSOOffset == FileWriter->Tell());
+								
+								NumNewEntries++;
+                            }
+                            
+                            Header.TableOffset = PSOOffset;
+                            TempTOCOffset = PSOOffset;
+                            
+                            FileWriter->Seek(Header.TableOffset);
+                            *FileWriter << TempTOC;
+                            
+                            break;
+                        }
+						// This mode should store all the PSOs that this device binds that weren't in a game-content cache.
+						// It will store the meta-data for all the PSOs that are ever bound, but it will omit PSO descriptors for entries that were cached in the game-content file
+						// This way the user builds up a log of uncaught entries but doesn't have to replicate the entire game-content file.
+                        case FPipelineFileCache::SaveMode::SortedBoundPSOs:
+                        {
+							TMap<uint32, FPipelineCacheFileFormatPSO> PSOs;
+                            for (auto& Entry : TOC.MetaData)
+                            {
+                                FPipelineCacheFileFormatPSO PSO;
+                                uint8* Bytes = nullptr;
+                                check(Entry.Value.FileSize > 0);
+                                if (Entry.Value.FileGuid == UserFileGuid)
+                                {
+                                    Bytes = &UserFileBytes[Entry.Value.FileOffset];
+									
+									TArray<uint8> PSOData(Bytes, Entry.Value.FileSize);
+									FMemoryReader Ar(PSOData);
+									Ar.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+									Ar << PSO;
+									PSOs.Add(Entry.Key, PSO);
+                                }
+								else if (Entry.Value.FileGuid != GameFileGuid)
+								{
+									UE_LOG(LogRHI, Verbose, TEXT("Trying to reconcile from unknown file GUID: %s but user file is: %s and game file is: %s - this means you have stale entries in a local cache file that reference a previous version of the game content cache."), *(Entry.Value.FileGuid.ToString()), *(UserFileGuid.ToString()), *(GameFileGuid.ToString()));
+								}
+                            }
+                            
+                            for (auto& Entry : NewEntries)
+                            {
+                                FPipelineCacheFileFormatPSOMetaData Meta;
+                                Meta.Stats.PSOHash = GetTypeHash(Entry);
+                                Meta.FileOffset = 0;
+                                Meta.FileSize = 0;
+                                Meta.FileGuid = UserFileGuid;
+                                
+                                switch(Entry.Type)
+                                {
+                                    case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+                                    {
+                                        INC_DWORD_STAT(STAT_SerializedComputePipelineStateCount);
+                                        Meta.Shaders.Add(Entry.ComputeDesc.ComputeShader);
+                                        break;
+                                    }
+                                    case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+                                    {
+                                        INC_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount);
+                                        
+                                        if (Entry.GraphicsDesc.VertexShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.VertexShader);
+                                        
+                                        if (Entry.GraphicsDesc.FragmentShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.FragmentShader);
+                                        
+                                        if (Entry.GraphicsDesc.HullShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.HullShader);
+                                        
+                                        if (Entry.GraphicsDesc.DomainShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.DomainShader);
+                                        
+                                        if (Entry.GraphicsDesc.GeometryShader != FSHAHash())
+                                            Meta.Shaders.Add(Entry.GraphicsDesc.GeometryShader);
+                                        
+                                        break;
+                                    }
+                                    default:
+                                    {
+                                        check(false);
+                                        break;
+                                    }
+                                }
+                                
+                                TOC.MetaData.Add(Meta.Stats.PSOHash, Meta);
+                                PSOs.Add(Meta.Stats.PSOHash, Entry);
+                            }
+							
+							FPipelineCacheFileFormatTOC TempTOC = TOC;
+							// Update PSO usage stats for new and old
+							for (auto& Pair : Stats)
+							{
+								auto* MetaPtr = TempTOC.MetaData.Find(Pair.Key);
+								if (MetaPtr)
+								{
+									auto& Meta = *MetaPtr;
+									check(Meta.Stats.PSOHash == Pair.Value->PSOHash);
+									Meta.Stats.CreateCount += Pair.Value->CreateCount;
+									if (Pair.Value->FirstFrameUsed > Meta.Stats.FirstFrameUsed)
+									{
+										Meta.Stats.FirstFrameUsed = Pair.Value->FirstFrameUsed;
+									}
+									if (Pair.Value->LastFrameUsed > Meta.Stats.LastFrameUsed)
+									{
+										Meta.Stats.LastFrameUsed = Pair.Value->LastFrameUsed;
+									}
+									Meta.Stats.TotalBindCount = (int64)FMath::Min((uint64)INT64_MAX, (uint64)FMath::Max(Meta.Stats.TotalBindCount, 0ll) + (uint64)FMath::Max(Pair.Value->TotalBindCount, 0ll));
+								}
+							}
+							
+							for (auto It = TempTOC.MetaData.CreateIterator(); It; ++It)
+							{
+								// If the entry doesn't belong to the game content or user local cache then remove it as it is invalid
+								// Anything that has never been compiled (BindCount < 0) is invalid and can be removed
+								// Or, if the BindCount is >= 0 and the same as in the GameTOC we have never seen it and we don't need to store it in the game cache
+								FPipelineCacheFileFormatPSOMetaData* GameData = GameTOC.MetaData.Find(It->Key);
+								if ((It->Value.FileGuid != UserFileGuid && It->Value.FileGuid != GameFileGuid)
+									|| It->Value.Stats.TotalBindCount < 0
+									|| (GameData && (It->Value.Stats.TotalBindCount == GameData->Stats.TotalBindCount)))
+								{
+									RemovedEntries++;
+									It.RemoveCurrent();
+								}
+							}
+							TotalEntries = TempTOC.MetaData.Num();
+							
+                            SortMetaData(TempTOC.MetaData, Order);
+                            TOC.SortedOrder = TempTOC.SortedOrder = Order;
+                            
+                            TOCOffset = (uint64)FileWriter->Tell();
+                            
+                            uint64 PSOOffset = TOCOffset;
+                            
+                            for (auto& Entry : TempTOC.MetaData)
+                            {
+                                // When saved in this mode the user local file only stores the PSO descriptor for entries that weren't in the game-content cache
+								// We don't need to store the PSO data for entries that come from the game cache
+								// We do store the meta-data for all PSOs that this device has ever seen and that are valid with the current game-content and user cache.
+								auto& CurrentMeta = TOC.MetaData.FindChecked(Entry.Key);
+								if (CurrentMeta.FileGuid == UserFileGuid)
+								{
+									CurrentMeta.FileOffset = PSOOffset;
+									Entry.Value.FileOffset = PSOOffset;
+									
+									FPipelineCacheFileFormatPSO& PSO = PSOs.FindChecked(Entry.Key);
+									
+									FileWriter->Seek(PSOOffset);
+									
+									TArray<uint8> Bytes;
+									FMemoryWriter Wr(Bytes);
+									Wr.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+									Wr << PSO;
+									
+									NewEntries.Remove(PSO);
+									
+									FileWriter->Serialize(Bytes.GetData(), Wr.TotalSize());
+									
+									CurrentMeta.FileSize = Wr.TotalSize();
+									Entry.Value.FileSize = Wr.TotalSize();
+									
+									PSOOffset += Entry.Value.FileSize;
+									check(PSOOffset == FileWriter->Tell());
+									
+									NumNewEntries++;
+								}
+                            }
+                            
+                            Header.TableOffset = PSOOffset;
+                            TOCOffset = PSOOffset;
+                            
+                            FileWriter->Seek(Header.TableOffset);
+                            *FileWriter << TempTOC;
+							
+                            break;
+                        }
+                        default:
+                        {
+                            check(false);
+                            break;
+                        }
+                    }
+		 
+					// Overwrite the header now that we have the TOC location.
+					FileWriter->Seek(0);
+					*FileWriter << Header;
+		 
+					FileWriter->Flush();
+		 
+					bFileWriteSuccess = !FileWriter->IsError();
+		 
+					if(!FileWriter->Close())
+					{
+						bFileWriteSuccess = false;
+					}
+					if (bFileWriteSuccess && bUseMemoryWriter)
+					{
+						if (TotalEntries > 0)
+						{
+							bFileWriteSuccess = FFileHelper::SaveArrayToFile(SaveBytes, *TempPath);
+						}
+						else
+						{
+							delete FileWriter;
+							float ThisTimeMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
+							UE_LOG(LogRHI, Log, TEXT("FPipelineFileCache skipping saving empty .upipelinecache (took %6.2fms): %s."), ThisTimeMS, *SaveFilePath);
+							return false;
+						}
+					}
+		 
+					if (bFileWriteSuccess)
+                    {
+						delete FileWriter;
+						
+						// As on POSIX only file moves on the same device are atomic
+						if ((SaveFilePath == TempPath) || IFileManager::Get().Move(*SaveFilePath, *TempPath, true, true, true, true))
+						{
+							float ThisTimeMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
+
+							TCHAR const* ModeName = nullptr;
+							switch (Mode)
+							{
+							case FPipelineFileCache::SaveMode::Incremental:
+								ModeName = TEXT("Incremental");
+								break;
+							case FPipelineFileCache::SaveMode::BoundPSOsOnly:
+								ModeName = TEXT("BoundPSOsOnly");
+								break;
+							case FPipelineFileCache::SaveMode::SortedBoundPSOs:
+							default:
+								ModeName = TEXT("SortedBoundPSOs");
+								break;
+							}
+							UE_LOG(LogRHI, Log, TEXT("FPipelineFileCache %s saved %u total, %u new, %u removed, %u cons .upipelinecache (took %6.2fms): %s."), ModeName, TotalEntries, NumNewEntries, RemovedEntries, ConsolidatedEntries, ThisTimeMS, *SaveFilePath);
+							
+							if (JournalPath.Len())
+							{
+								IFileManager::Get().Delete(*JournalPath);
+							}
+						}
+						else
+						{
+							float ThisTimeMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
+							UE_LOG(LogRHI, Error, TEXT("Failed to move .upipelinecache from %s to %s (took %6.2fms)."), *TempPath, *SaveFilePath, ThisTimeMS);
+						}
+					}
+                    else
+                    {
+						delete FileWriter;
+						IFileManager::Get().Delete(*TempPath);
+						float ThisTimeMS = float(FPlatformTime::Seconds() - StartTime) * 1000.0f;
+						UE_LOG(LogRHI, Error, TEXT("Failed to write .upipelinecache, (took %6.2fms): %s."), ThisTimeMS, *SaveFilePath);
+                    }
+		 
+				}
+                else
+                {
+                    UE_LOG(LogRHI, Error, TEXT("Failed to open .upipelinecache for write: %s."), *SaveFilePath);
+                }
+			}
+		}
+		
+		SET_MEMORY_STAT(STAT_FileCacheMemory, TOC.MetaData.GetAllocatedSize());
+		
+		return bFileWriteSuccess;
+	}
+	
+	bool IsPSOEntryCached(FPipelineCacheFileFormatPSO const& NewEntry) const
+	{
+		uint32 PSOHash = GetTypeHash(NewEntry);
+		FPipelineCacheFileFormatPSOMetaData const * const Existing = TOC.MetaData.Find(PSOHash);
+		//check(!Existing || TOC.PSOs[Existing->Offset] == NewEntry);  // @todo re-instate this check
+		return (Existing != nullptr);
+	}
+	
+	static void SortMetaData(TMap<uint32, FPipelineCacheFileFormatPSOMetaData>& MetaData, FPipelineFileCache::PSOOrder Order)
+	{
+		// Only sorting metadata ordering - this should not affect PSO data offsets / lookups
+		switch(Order)
+		{
+			case FPipelineFileCache::PSOOrder::FirstToLatestUsed:
+			{
+				MetaData.ValueSort([](const FPipelineCacheFileFormatPSOMetaData& A, const FPipelineCacheFileFormatPSOMetaData& B) {return A.Stats.FirstFrameUsed > B.Stats.FirstFrameUsed;});
+				break;
+			}
+			case FPipelineFileCache::PSOOrder::MostToLeastUsed:
+			{
+				MetaData.ValueSort([](const FPipelineCacheFileFormatPSOMetaData& A, const FPipelineCacheFileFormatPSOMetaData& B) {return A.Stats.TotalBindCount > B.Stats.TotalBindCount;});
+				break;
+			}
+			case FPipelineFileCache::PSOOrder::Default:
+			default:
+			{
+				// NOP - leave as is
+				break;
+			}
+		}
+	}
+	
+	void GetOrderedPSOHashes(TArray<FPipelineCachePSOHeader>& PSOHashes, FPipelineFileCache::PSOOrder Order)
+	{
+		if(Order != TOC.SortedOrder)
+		{
+			SortMetaData(TOC.MetaData, Order);
+			TOC.SortedOrder = Order;
+		}
+		for (auto const& Hash : TOC.MetaData)
+		{
+				FPipelineCachePSOHeader Header;
+				Header.Hash = Hash.Key;
+				Header.Shaders = Hash.Value.Shaders;
+				PSOHashes.Add(Header);
+			}
+		}
+	
+	bool OnExternalReadCallback(FPipelineCacheFileFormatPSORead* Entry, double RemainingTime)
+	{
+		TSharedPtr<IAsyncReadRequest, ESPMode::ThreadSafe> LocalReadRequest = Entry->ReadRequest;
+		
+		check(LocalReadRequest.IsValid());
+		
+		if (RemainingTime < 0.0 && !LocalReadRequest->PollCompletion())
+		{
+			return false;
+		}
+		else if (RemainingTime >= 0.0 && !LocalReadRequest->WaitCompletion(RemainingTime))
+		{
+			return false;
+		}
+		
+		Entry->bReadCompleted = 1;
+		
+		return true;
+	}
+	
+	void FetchPSODescriptors(TArray<FPipelineCacheFileFormatPSORead*>& Batch)
+	{
+		for (FPipelineCacheFileFormatPSORead* Entry : Batch)
+		{
+			FPipelineCacheFileFormatPSOMetaData const& Meta = TOC.MetaData.FindChecked(Entry->Hash);
+			
+			if (Meta.FileGuid == GameFileGuid)
+			{
+                FPipelineCacheFileFormatPSOMetaData const* GameMeta = GameTOC.MetaData.Find(Entry->Hash);
+                if (GameMeta)
+                {
+                    Entry->Data.SetNum(GameMeta->FileSize);
+                    Entry->ParentFileHandle = GameAsyncFileHandle;
+                    Entry->ReadRequest = MakeShareable(GameAsyncFileHandle->ReadRequest(GameMeta->FileOffset, GameMeta->FileSize, AIOP_Normal, nullptr, Entry->Data.GetData()));
+                }
+                else
+                {
+                    UE_LOG(LogRHI, Verbose, TEXT("Encountered a PSO entry %u that has been removed from the game-content file: %s"), Entry->Hash, *Meta.FileGuid.ToString());
+                    Entry->bValid = false;
+                    continue;
+                }
+			}
+			else if (Meta.FileGuid == UserFileGuid)
+			{
+                Entry->Data.SetNum(Meta.FileSize);
+				Entry->ParentFileHandle = UserAsyncFileHandle;
+				Entry->ReadRequest = MakeShareable(UserAsyncFileHandle->ReadRequest(Meta.FileOffset, Meta.FileSize, AIOP_Normal, nullptr, Entry->Data.GetData()));
+			}
+            else
+            {
+                UE_LOG(LogRHI, Verbose, TEXT("Encountered a PSO entry %u that references unknown file ID: %s"), Entry->Hash, *Meta.FileGuid.ToString());
+                Entry->bValid = false;
+                continue;
+            }
+			
+            Entry->bValid = true;
+			FExternalReadCallback ExternalReadCallback = [this, Entry](double ReaminingTime)
+			{
+				return this->OnExternalReadCallback(Entry, ReaminingTime);
+			};
+			
+			if (!Entry->Ar || !Entry->Ar->AttachExternalReadDependency(ExternalReadCallback))
+			{
+				ExternalReadCallback(0.0);
+				check(Entry->bReadCompleted);
+			}			
+		}
+	}
+	
+	FName GetPlatformName() const
+	{
+		return PlatformName;
+	}
+
+	const FString& GetRecordingFilename() const
+	{
+		return RecordingFilename;
+	}
+	
+private:
+	FString Name;
+	EShaderPlatform ShaderPlatform;
+	FName PlatformName;
+	uint64 TOCOffset;
+    FPipelineCacheFileFormatTOC GameTOC; // < The game TOC is kept around separately to handle cases where a fast-saved user cache tries to load removed entries from the game file.
+	FPipelineCacheFileFormatTOC TOC;
+	FGuid UserFileGuid;
+	FGuid GameFileGuid;
+	TSharedPtr<IAsyncReadFileHandle, ESPMode::ThreadSafe> UserAsyncFileHandle;
+	TSharedPtr<IAsyncReadFileHandle, ESPMode::ThreadSafe> GameAsyncFileHandle;
+
+	FString RecordingFilename;
+};
+uint32 FPipelineCacheFile::GameVersion = 0;
+
+bool FPipelineFileCache::IsPipelineFileCacheEnabled()
+{
+	static bool bOnce = false;
+	static bool bCmdLineForce = false;
+	if (!bOnce)
+	{
+		bOnce = true;
+		bCmdLineForce = FParse::Param(FCommandLine::Get(), TEXT("psocache"));
+		UE_CLOG(bCmdLineForce, LogRHI, Warning, TEXT("****************************** Forcing PSO cache from command line"));
+	}
+	return FileCacheEnabled && (bCmdLineForce || CVarPSOFileCacheEnabled.GetValueOnAnyThread() == 1);
+}
+
+bool FPipelineFileCache::LogPSOtoFileCache()
+{
+	static bool bOnce = false;
+	static bool bCmdLineForce = false;
+	if (!bOnce)
+	{
+		bOnce = true;
+		bCmdLineForce = FParse::Param(FCommandLine::Get(), TEXT("logpso"));
+		UE_CLOG(bCmdLineForce, LogRHI, Warning, TEXT("****************************** Forcing logging of PSOs from command line"));
+	}
+	return (bCmdLineForce || CVarPSOFileCacheLogPSO.GetValueOnAnyThread() == 1);
+}
+
+bool FPipelineFileCache::ReportNewPSOs()
+{
+    static bool bOnce = false;
+    static bool bCmdLineForce = false;
+    if (!bOnce)
+    {
+        bOnce = true;
+        bCmdLineForce = FParse::Param(FCommandLine::Get(), TEXT("reportpso"));
+        UE_CLOG(bCmdLineForce, LogRHI, Warning, TEXT("****************************** Forcing reporting of new PSOs from command line"));
+    }
+    return (bCmdLineForce || CVarPSOFileCacheReportPSO.GetValueOnAnyThread() == 1);
+}
+
+void FPipelineFileCache::Initialize(uint32 InGameVersion)
+{
+	// Make enabled explicit on a flag not the existence of "FileCache" object as we are using that behind a lock and in Open / Close operations
+	FileCacheEnabled = true;
+	FPipelineCacheFile::GameVersion = InGameVersion;
+	if (FPipelineCacheFile::GameVersion == 0)
+	{
+		// Defaulting the CL is fine though
+		FPipelineCacheFile::GameVersion = (uint32)FEngineVersion::Current().GetChangelist();
+	}
+	
+	SET_MEMORY_STAT(STAT_NewCachedPSOMemory, 0);
+	SET_MEMORY_STAT(STAT_PSOStatMemory, 0);
+}
+
+void FPipelineFileCache::Shutdown()
+{
+	if(IsPipelineFileCacheEnabled())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_Write);
+		for (auto const& Pair : Stats)
+		{
+			delete Pair.Value;
+		}
+		Stats.Empty();
+		NewPSOs.Empty();
+        NumNewPSOs = 0;
+		
+		FileCacheEnabled = false;
+		
+		SET_MEMORY_STAT(STAT_NewCachedPSOMemory, 0);
+		SET_MEMORY_STAT(STAT_PSOStatMemory, 0);
+	}
+}
+
+bool FPipelineFileCache::OpenPipelineFileCache(FString const& Name, EShaderPlatform Platform)
+{
+	bool bOk = false;
+	
+	if(IsPipelineFileCacheEnabled())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_Write);
+		
+		if(FileCache == nullptr)
+		{
+			FileCache = new FPipelineCacheFile();
+			
+			bOk = FileCache->OpenPipelineFileCache(Name, Platform);
+			
+			// File Cache now exists - these caches should be empty for this file otherwise will have false positives from any previous file caching - if not something has been caching when it should not be
+			check(NewPSOs.Num() == 0);
+			check(RunTimeToFileHashes.Num() == 0);
+		}
+	}
+	
+	return bOk;
+}
+
+bool FPipelineFileCache::SavePipelineFileCache(FString const& Name, SaveMode Mode)
+{
+	bool bOk = false;
+	
+	if(IsPipelineFileCacheEnabled() && LogPSOtoFileCache())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_Write);
+		
+		if(FileCache)
+		{
+			FName PlatformName = FileCache->GetPlatformName();
+			FString Path = FPaths::ProjectSavedDir() / FString::Printf(TEXT("%s_%s.upipelinecache"), *Name, *PlatformName.ToString());
+			bOk = FileCache->SavePipelineFileCache(Path, Mode, Stats, NewPSOs, RequestedOrder);
+			
+			// If successful clear new PSO's as they should have been saved out
+			// Leave everything else in-tact (e.g stats) for subsequent in place save operations
+			if (bOk)
+			{
+                NumNewPSOs = NewPSOs.Num();
+				SET_MEMORY_STAT(STAT_NewCachedPSOMemory, (NumNewPSOs * (sizeof(FPipelineCacheFileFormatPSO) + sizeof(uint32) + sizeof(uint32))));
+			}
+		}
+	}
+	
+	return bOk;
+}
+
+void FPipelineFileCache::ClosePipelineFileCache()
+{
+	if(IsPipelineFileCacheEnabled())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_Write);
+		
+		if(FileCache)
+		{
+			delete FileCache;
+			FileCache = nullptr;
+			
+			// Reset stats tracking for the next file.
+			for (auto const& Pair : Stats)
+			{
+				FPlatformAtomics::InterlockedExchange((int64*)&Pair.Value->TotalBindCount, -1);
+				FPlatformAtomics::InterlockedExchange((int64*)&Pair.Value->FirstFrameUsed, -1);
+				FPlatformAtomics::InterlockedExchange((int64*)&Pair.Value->LastFrameUsed, -1);
+			}
+			
+			// Reset serialized counts
+			SET_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount, 0);
+			SET_DWORD_STAT(STAT_SerializedComputePipelineStateCount, 0);
+			
+			// Not tracking when there is no file clear other stats as well
+			SET_DWORD_STAT(STAT_TotalGraphicsPipelineStateCount, 0);
+			SET_DWORD_STAT(STAT_TotalComputePipelineStateCount, 0);
+			SET_DWORD_STAT(STAT_NewGraphicsPipelineStateCount, 0);
+			SET_DWORD_STAT(STAT_NewComputePipelineStateCount, 0);
+			
+			// Clear Runtime hashes otherwise we can't start adding newPSO's for a newly opened file
+			RunTimeToFileHashes.Empty();
+			NewPSOs.Empty();
+            NumNewPSOs = 0;
+			
+			SET_MEMORY_STAT(STAT_NewCachedPSOMemory, 0);
+			SET_MEMORY_STAT(STAT_FileCacheMemory, 0);
+		}
+	}
+}
+
+void FPipelineFileCache::CacheGraphicsPSO(uint32 RunTimeHash, FGraphicsPipelineStateInitializer const& Initializer)
+{
+	if(IsPipelineFileCacheEnabled() && (LogPSOtoFileCache() || ReportNewPSOs()))
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_ReadOnly);
+	
+		if(FileCache)
+		{
+			if(!RunTimeToFileHashes.Contains(RunTimeHash))
+			{
+				Lock.ReleaseReadOnlyLockAndAcquireWriteLock_USE_WITH_CAUTION();
+				if(!RunTimeToFileHashes.Contains(RunTimeHash))
+				{
+					FPipelineCacheFileFormatPSO NewEntry;
+					bool bOK = FPipelineCacheFileFormatPSO::Init(NewEntry, Initializer);
+					check(bOK);
+					
+					uint32 PSOHash = GetTypeHash(NewEntry);
+					RunTimeToFileHashes.Add(RunTimeHash, PSOHash);
+					if (!FileCache->IsPSOEntryCached(NewEntry))
+					{
+				        UE_LOG(LogRHI, Warning, TEXT("Encountered a new graphics PSO: %u"), PSOHash);
+						if (GPSOFileCachePrintNewPSODescriptors > 0)
+						{
+							UE_LOG(LogRHI, Warning, TEXT("New Graphics PSO (%u) Description: %s"), PSOHash, *NewEntry.GraphicsDesc.ToString());
+						}
+                        if (LogPSOtoFileCache())
+                        {
+                            NewPSOs.Add(NewEntry);
+                            INC_MEMORY_STAT_BY(STAT_NewCachedPSOMemory, sizeof(FPipelineCacheFileFormatPSO) + sizeof(uint32) + sizeof(uint32));
+                        }
+
+                        NumNewPSOs++;
+						INC_DWORD_STAT(STAT_NewGraphicsPipelineStateCount);
+						INC_DWORD_STAT(STAT_TotalGraphicsPipelineStateCount);
+						
+						if (ReportNewPSOs() && PSOLoggedEvent.IsBound())
+						{
+							PSOLoggedEvent.Broadcast(NewEntry);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void FPipelineFileCache::CacheComputePSO(uint32 RunTimeHash, FRHIComputeShader const* Initializer)
+{
+	if(IsPipelineFileCacheEnabled() && (LogPSOtoFileCache() || ReportNewPSOs()))
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_ReadOnly);
+		
+		if(FileCache)
+		{
+			if(!RunTimeToFileHashes.Contains(RunTimeHash))
+			{
+				Lock.ReleaseReadOnlyLockAndAcquireWriteLock_USE_WITH_CAUTION();
+				if(!RunTimeToFileHashes.Contains(RunTimeHash))
+				{
+					FPipelineCacheFileFormatPSO NewEntry;
+					bool bOK = FPipelineCacheFileFormatPSO::Init(NewEntry, Initializer);
+					check(bOK);
+					
+					uint32 PSOHash = GetTypeHash(NewEntry);
+					RunTimeToFileHashes.Add(RunTimeHash, PSOHash);
+					if (!FileCache->IsPSOEntryCached(NewEntry))
+					{
+				        UE_LOG(LogRHI, Warning, TEXT("Encountered a new compute PSO: %u"), PSOHash);
+						if (GPSOFileCachePrintNewPSODescriptors > 0)
+						{
+							UE_LOG(LogRHI, Warning, TEXT("New compute PSO (%u) Description: %s"), PSOHash, *NewEntry.ComputeDesc.ComputeShader.ToString());
+						}
+
+                        if (LogPSOtoFileCache())
+                        {
+                            NewPSOs.Add(NewEntry);
+                            INC_MEMORY_STAT_BY(STAT_NewCachedPSOMemory, sizeof(FPipelineCacheFileFormatPSO) + sizeof(uint32) + sizeof(uint32));
+                        }
+						
+                        NumNewPSOs++;
+						INC_DWORD_STAT(STAT_NewComputePipelineStateCount);
+						INC_DWORD_STAT(STAT_TotalComputePipelineStateCount);
+						
+						if (ReportNewPSOs() && PSOLoggedEvent.IsBound())
+						{
+							PSOLoggedEvent.Broadcast(NewEntry);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+FPipelineStateStats* FPipelineFileCache::RegisterPSOStats(uint32 RunTimeHash)
+{
+	FPipelineStateStats* Stat = nullptr;
+	if(IsPipelineFileCacheEnabled() && LogPSOtoFileCache())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_ReadOnly);
+		
+		if(FileCache)
+		{
+			uint32 PSOHash = RunTimeToFileHashes.FindChecked(RunTimeHash);
+			Stat = Stats.FindRef(PSOHash);
+			if (!Stat)
+			{
+				Lock.ReleaseReadOnlyLockAndAcquireWriteLock_USE_WITH_CAUTION();
+				Stat = Stats.FindRef(PSOHash);
+				if(!Stat)
+				{
+					Stat = new FPipelineStateStats;
+					Stat->PSOHash = PSOHash;
+					Stats.Add(PSOHash, Stat);
+					
+					INC_MEMORY_STAT_BY(STAT_PSOStatMemory, sizeof(FPipelineStateStats) + sizeof(uint32));
+				}
+			}
+			Stat->CreateCount++;
+		}
+	}
+	return Stat;
+}
+
+void FPipelineFileCache::GetOrderedPSOHashes(TArray<FPipelineCachePSOHeader>& PSOHashes, PSOOrder Order)
+{
+	if(IsPipelineFileCacheEnabled())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_Write);
+		
+		RequestedOrder = Order;
+		
+		if(FileCache)
+		{
+			FileCache->GetOrderedPSOHashes(PSOHashes, Order);
+		}
+	}
+}
+
+void FPipelineFileCache::FetchPSODescriptors(TArray<FPipelineCacheFileFormatPSORead*>& Batch)
+{
+	if(IsPipelineFileCacheEnabled())
+	{
+		FRWScopeLock Lock(FileCacheLock, SLT_ReadOnly);
+		
+		if(FileCache)
+		{
+			FileCache->FetchPSODescriptors(Batch);
+		}
+	}
+}
+
+struct FPipelineCacheFileData
+{
+	FPipelineCacheFileFormatHeader Header;
+	TMap<uint32, FPipelineCacheFileFormatPSO> PSOs;
+	FPipelineCacheFileFormatTOC TOC;
+	
+	static FPipelineCacheFileData Open(FString const& FilePath)
+	{
+		FPipelineCacheFileData Data;
+		Data.Header.Magic = 0;
+		FArchive* FileAReader = IFileManager::Get().CreateFileReader(*FilePath);
+		if (FileAReader)
+		{
+			*FileAReader << Data.Header;
+			if (Data.Header.Magic == FPipelineCacheFileFormatMagic && Data.Header.Version >= (uint32)EPipelineCacheFileFormatVersions::FirstWorking)
+			{
+                FileAReader->SetGameNetVer(Data.Header.Version);
+				check(Data.Header.TableOffset > 0);
+				FileAReader->Seek(Data.Header.TableOffset);
+				
+				*FileAReader << Data.TOC;
+				if (!FileAReader->IsError())
+				{
+					for (auto& Entry : Data.TOC.MetaData)
+					{
+                        if (Entry.Value.FileGuid == Data.Header.Guid)
+                        {
+                            FPipelineCacheFileFormatPSO PSO;
+                            FileAReader->Seek(Entry.Value.FileOffset);
+                            *FileAReader << PSO;
+                            
+                            Data.PSOs.Add(Entry.Key, PSO);
+                        }
+					}
+				}
+				
+				if (FileAReader->IsError())
+				{
+                    UE_LOG(LogRHI, Error, TEXT("Failed to read: %s."), *FilePath);
+					Data.Header.Magic = 0;
+				}
+				else
+				{
+					if (Data.Header.Version < (uint32)EPipelineCacheFileFormatVersions::ShaderMetaData)
+					{
+						for (auto& Entry : Data.TOC.MetaData)
+						{
+							FPipelineCacheFileFormatPSO& PSO = Data.PSOs.FindChecked(Entry.Key);
+							switch(PSO.Type)
+							{
+								case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+									Entry.Value.Shaders.Add(PSO.ComputeDesc.ComputeShader);
+									break;
+								case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+									Entry.Value.Shaders.Add(PSO.GraphicsDesc.VertexShader);
+									
+									if (PSO.GraphicsDesc.FragmentShader != FSHAHash())
+									{
+										Entry.Value.Shaders.Add(PSO.GraphicsDesc.FragmentShader);
+									}
+									
+									if (PSO.GraphicsDesc.GeometryShader != FSHAHash())
+									{
+										Entry.Value.Shaders.Add(PSO.GraphicsDesc.GeometryShader);
+									}
+									
+									if (PSO.GraphicsDesc.HullShader != FSHAHash())
+									{
+										Entry.Value.Shaders.Add(PSO.GraphicsDesc.HullShader);
+									}
+									
+									if (PSO.GraphicsDesc.DomainShader != FSHAHash())
+									{
+										Entry.Value.Shaders.Add(PSO.GraphicsDesc.DomainShader);
+									}
+									break;
+								default:
+									check(false);
+									break;
+							}
+						}
+					}
+					
+					if (Data.Header.Version < (uint32)EPipelineCacheFileFormatVersions::SortedVertexDesc)
+					{
+						TMap<uint32, FPipelineCacheFileFormatPSOMetaData> MetaData;
+						TMap<uint32, FPipelineCacheFileFormatPSO> PSOs;
+						for (auto& Entry : Data.TOC.MetaData)
+						{
+							FPipelineCacheFileFormatPSO& PSO = Data.PSOs.FindChecked(Entry.Key);
+							PSOs.Add(GetTypeHash(PSO), PSO);
+							MetaData.Add(GetTypeHash(PSO), Entry.Value);
+						}
+						
+						Data.TOC.MetaData = MetaData;
+						Data.PSOs = PSOs;
+					}
+                    
+                    Data.Header.Version = FPipelineCacheFileFormatCurrentVersion;
+                }
+			}
+			
+			FileAReader->Close();
+			
+			delete FileAReader;
+		}
+        else
+        {
+            UE_LOG(LogRHI, Error, TEXT("Failed to open: %s."), *FilePath);
+        }
+		return Data;
+	}
+};
+		 
+uint32 FPipelineFileCache::NumPSOsLogged()
+{
+	uint32 Result = 0;
+	if(IsPipelineFileCacheEnabled() && LogPSOtoFileCache())
+	{
+		// Only count PSOs that are both new and have at least one bind, otherwise we can ignore them.
+		FRWScopeLock Lock(FileCacheLock, SLT_ReadOnly);
+		if (NumNewPSOs)
+		{
+			for (auto& PSO : NewPSOs)
+			{
+				FPipelineStateStats const* Stat = Stats.FindRef(GetTypeHash(PSO));
+				if (Stat && Stat->TotalBindCount > 0)
+				{
+					Result++;
+				}
+			}
+		}
+	}
+	return Result;
+}
+
+FPipelineFileCache::FPipelineStateLoggedEvent& FPipelineFileCache::OnPipelineStateLogged()
+{
+	return PSOLoggedEvent;
+}
+
+bool FPipelineFileCache::LoadPipelineFileCacheInto(FString const& Path, TSet<FPipelineCacheFileFormatPSO>& PSOs)
+{
+	FPipelineCacheFileData A = FPipelineCacheFileData::Open(Path);
+	bool bAny = false;
+	for (const auto& Pair : A.PSOs)
+	{
+		PSOs.Add(Pair.Value);
+		bAny = true;
+	}
+	return bAny;
+}
+
+bool FPipelineFileCache::SavePipelineFileCacheFrom(uint32 GameVersion, EShaderPlatform Platform, FString const& Path, const TSet<FPipelineCacheFileFormatPSO>& PSOs)
+{
+	FPipelineCacheFileData Output;
+	Output.Header.Magic = FPipelineCacheFileFormatMagic;
+	Output.Header.Version = FPipelineCacheFileFormatCurrentVersion;
+	Output.Header.GameVersion = GameVersion;
+	Output.Header.Platform = Platform;
+	Output.Header.TableOffset = 0;
+	Output.Header.Guid = FGuid::NewGuid();
+
+	Output.TOC.MetaData.Reserve(PSOs.Num());
+
+	for (const FPipelineCacheFileFormatPSO& Item : PSOs)
+	{
+		FPipelineCacheFileFormatPSOMetaData Meta;
+		Meta.Stats.PSOHash = GetTypeHash(Item);
+		Meta.FileGuid = Output.Header.Guid;
+		Meta.FileSize = 0;
+		switch (Item.Type)
+		{
+			case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+			{
+				INC_DWORD_STAT(STAT_SerializedComputePipelineStateCount);
+				Meta.Shaders.Add(Item.ComputeDesc.ComputeShader);
+				break;
+			}
+			case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+			{
+				INC_DWORD_STAT(STAT_SerializedGraphicsPipelineStateCount);
+
+				if (Item.GraphicsDesc.VertexShader != FSHAHash())
+					Meta.Shaders.Add(Item.GraphicsDesc.VertexShader);
+
+				if (Item.GraphicsDesc.FragmentShader != FSHAHash())
+					Meta.Shaders.Add(Item.GraphicsDesc.FragmentShader);
+
+				if (Item.GraphicsDesc.HullShader != FSHAHash())
+					Meta.Shaders.Add(Item.GraphicsDesc.HullShader);
+
+				if (Item.GraphicsDesc.DomainShader != FSHAHash())
+					Meta.Shaders.Add(Item.GraphicsDesc.DomainShader);
+
+				if (Item.GraphicsDesc.GeometryShader != FSHAHash())
+					Meta.Shaders.Add(Item.GraphicsDesc.GeometryShader);
+
+				break;
+			}
+			default:
+			{
+				check(false);
+				break;
+			}
+		}
+
+		Output.TOC.MetaData.Add(Meta.Stats.PSOHash, Meta);
+		Output.PSOs.Add(Meta.Stats.PSOHash, Item);
+	}
+
+	FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*Path);
+	if (!FileWriter)
+	{
+		return false;
+	}
+	FileWriter->SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+	*FileWriter << Output.Header;
+
+	uint64 PSOOffset = (uint64)FileWriter->Tell();
+
+	for (auto& Entry : Output.TOC.MetaData)
+	{
+		FPipelineCacheFileFormatPSO& PSO = Output.PSOs.FindChecked(Entry.Key);
+
+		uint32 PSOHash = Entry.Key;
+
+		Entry.Value.FileOffset = PSOOffset;
+		Entry.Value.FileGuid = Output.Header.Guid;
+
+		TArray<uint8> Bytes;
+		FMemoryWriter Wr(Bytes);
+		Wr.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+		Wr << PSO;
+
+		FileWriter->Serialize(Bytes.GetData(), Wr.TotalSize());
+
+		Entry.Value.FileSize = Wr.TotalSize();
+		PSOOffset += Entry.Value.FileSize;
+	}
+
+	FileWriter->Seek(0);
+
+	Output.Header.TableOffset = PSOOffset;
+	*FileWriter << Output.Header;
+
+	FileWriter->Seek(PSOOffset);
+	*FileWriter << Output.TOC;
+
+	FileWriter->Flush();
+
+	bool bOK = !FileWriter->IsError();
+
+	FileWriter->Close();
+
+	delete FileWriter;
+	return bOK;
+}
+
+
+bool FPipelineFileCache::MergePipelineFileCaches(FString const& PathA, FString const& PathB, FPipelineFileCache::PSOOrder Order, FString const& OutputPath)
+{
+	bool bOK = false;
+	
+	FPipelineCacheFileData A = FPipelineCacheFileData::Open(PathA);
+	FPipelineCacheFileData B = FPipelineCacheFileData::Open(PathB);
+	
+	if (A.Header.Magic == FPipelineCacheFileFormatMagic && B.Header.Magic == FPipelineCacheFileFormatMagic && A.Header.GameVersion == B.Header.GameVersion && A.Header.Platform == B.Header.Platform && A.Header.Version == FPipelineCacheFileFormatCurrentVersion && B.Header.Version == FPipelineCacheFileFormatCurrentVersion)
+	{
+		FPipelineCacheFileData Output;
+		Output.Header.Magic = FPipelineCacheFileFormatMagic;
+		Output.Header.Version = FPipelineCacheFileFormatCurrentVersion;
+		Output.Header.GameVersion = A.Header.GameVersion;
+		Output.Header.Platform = A.Header.Platform;
+		Output.Header.TableOffset = 0;
+		Output.Header.Guid = FGuid::NewGuid();
+		
+		for (auto const& Entry : A.TOC.MetaData)
+		{
+			Output.TOC.MetaData.Add(Entry.Key, Entry.Value);
+		}
+		for (auto const& Entry : B.TOC.MetaData)
+		{
+			Output.TOC.MetaData.Add(Entry.Key, Entry.Value);
+		}
+		FPipelineCacheFile::SortMetaData(Output.TOC.MetaData, Order);
+		Output.TOC.SortedOrder = Order;
+
+		FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*OutputPath);
+		if (FileWriter)
+		{
+            FileWriter->SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+			FileWriter->Seek(0);
+			*FileWriter << Output.Header;
+			
+			uint64 PSOOffset = (uint64)FileWriter->Tell();
+			
+            TSet<uint32> HashesToRemove;
+            
+			for (auto& Entry : Output.TOC.MetaData)
+			{
+				FPipelineCacheFileFormatPSO PSO;
+				if (Entry.Value.FileGuid == A.Header.Guid)
+				{
+					PSO = A.PSOs.FindChecked(Entry.Key);
+				}
+				else if (Entry.Value.FileGuid == B.Header.Guid)
+				{
+					PSO = B.PSOs.FindChecked(Entry.Key);
+				}
+                else
+                {
+                    HashesToRemove.Add(Entry.Key);
+                    continue;
+                }
+				
+				uint32 PSOHash = Entry.Key;
+				
+				Entry.Value.FileOffset = PSOOffset;
+				Entry.Value.FileGuid = Output.Header.Guid;
+				
+				TArray<uint8> Bytes;
+				FMemoryWriter Wr(Bytes);
+				Wr.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+				Wr << PSO;
+				
+				FileWriter->Serialize(Bytes.GetData(), Wr.TotalSize());
+				
+				Entry.Value.FileSize = Wr.TotalSize();
+				PSOOffset += Entry.Value.FileSize;
+			}
+            
+            for (uint32 Key : HashesToRemove)
+            {
+                Output.TOC.MetaData.Remove(Key);
+            }
+			
+			FileWriter->Seek(0);
+			
+			Output.Header.TableOffset = PSOOffset;
+			*FileWriter << Output.Header;
+			
+			FileWriter->Seek(PSOOffset);
+			*FileWriter << Output.TOC;
+			
+			FileWriter->Flush();
+			
+			bOK = !FileWriter->IsError();
+            
+            UE_CLOG(!bOK, LogRHI, Error, TEXT("Failed to write output file: %s."), *OutputPath);
+			
+			FileWriter->Close();
+			
+			delete FileWriter;
+		}
+        else
+        {
+            UE_LOG(LogRHI, Error, TEXT("Failed to open output file: %s."), *OutputPath);
+        }
+	}
+    else if (A.Header.GameVersion != B.Header.GameVersion)
+    {
+        UE_LOG(LogRHI, Error, TEXT("Incompatible game versions: %u vs. %u."), A.Header.GameVersion, B.Header.GameVersion);
+    }
+    else if (A.Header.Platform != B.Header.Platform)
+    {
+        UE_LOG(LogRHI, Error, TEXT("Incompatible shader platforms: %s vs. %s."), *LegacyShaderPlatformToShaderFormat(A.Header.Platform).ToString(), *LegacyShaderPlatformToShaderFormat(B.Header.Platform).ToString());
+    }
+    else if (A.Header.Version != B.Header.Version)
+    {
+        UE_LOG(LogRHI, Error, TEXT("Incompatible file versions: %u vs. %u."), A.Header.Version, B.Header.Version);
+    }
+    else
+    {
+        UE_LOG(LogRHI, Error, TEXT("Incompatible file headers: %u vs. %u: expected %u."), A.Header.Magic, B.Header.Magic, FPipelineCacheFileFormatMagic);
+    }
+	return bOK;
+}
+
diff --git a/Engine/Source/Runtime/RHI/Private/PipelineStateCache.cpp b/Engine/Source/Runtime/RHI/Private/PipelineStateCache.cpp
index e049d5694650..7218d722321b 100644
--- a/Engine/Source/Runtime/RHI/Private/PipelineStateCache.cpp
+++ b/Engine/Source/Runtime/RHI/Private/PipelineStateCache.cpp
@@ -5,6 +5,7 @@ PipelineStateCache.cpp: Pipeline state cache implementation.
 =============================================================================*/
 
 #include "PipelineStateCache.h"
+#include "PipelineFileCache.h"
 #include "Misc/ScopeRWLock.h"
 #include "Misc/ScopeLock.h"
 #include "Misc/CoreDelegates.h"
@@ -80,6 +81,7 @@ class FPipelineState
 public:
 
 	FPipelineState()
+	: Stats(nullptr)
 	{
 		InitStats();
 	}
@@ -92,14 +94,20 @@ public:
 
 	FGraphEventRef CompletionEvent;
 
+	inline void AddUse()
+	{
+		FPipelineStateStats::UpdateStats(Stats);
+	}
+	
 #if PSO_TRACK_CACHE_STATS
+	
 	void InitStats()
 	{
 		FirstUsedTime = LastUsedTime = FPlatformTime::Seconds();
 		FirstFrameUsed = LastFrameUsed = 0;
 		Hits = HitsAcrossFrames = 0;
 	}
-
+	
 	void AddHit()
 	{
 		LastUsedTime = FPlatformTime::Seconds();
@@ -124,6 +132,7 @@ public:
 	void AddHit() {}
 #endif // PSO_TRACK_CACHE_STATS
 
+	FPipelineStateStats* Stats;
 };
 
 /* State for compute  */
@@ -133,6 +142,12 @@ public:
 	FComputePipelineState(FRHIComputeShader* InComputeShader)
 		: ComputeShader(InComputeShader)
 	{
+		ComputeShader->AddRef();
+	}
+	
+	~FComputePipelineState()
+	{
+		ComputeShader->Release();
 	}
 
 	virtual bool IsCompute() const
@@ -322,34 +337,35 @@ public:
 		// this is verified by the VerifyMutex.
 		for ( FPipelineStateCacheType* PipelineStateCache : AllThreadsPipelineStateCache)
 		{
-			for (const auto& PipelineStateCacheIterator : *PipelineStateCache)
+			for (auto PipelineStateCacheIterator = PipelineStateCache->CreateIterator(); PipelineStateCacheIterator; ++PipelineStateCacheIterator)
 			{
-				const TMyKey& ThreadKey = PipelineStateCacheIterator.Key;
-				const TMyValue& ThreadValue = PipelineStateCacheIterator.Value;
+				const TMyKey& ThreadKey = PipelineStateCacheIterator->Key;
+				const TMyValue& ThreadValue = PipelineStateCacheIterator->Value;
 
 				// All events should be complete because we are running this code after the RHI Flush
-				check(!ThreadValue->CompletionEvent.IsValid() || ThreadValue->CompletionEvent->IsComplete());
-				
-				ThreadValue->CompletionEvent = nullptr;
-
-				BackfillMap->Remove(ThreadKey);
-
-				TMyValue* CurrentValue = CurrentMap->Find(ThreadKey);
-				if (CurrentValue) 
+				if(!ThreadValue->CompletionEvent.IsValid() || ThreadValue->CompletionEvent->IsComplete())
 				{
-					// if two threads get from the backfill map then we might just be dealing with one pipelinestate, in which case we have already added it to the currentmap and don't need to do anything else
-					if ( *CurrentValue != ThreadValue ) 
+					ThreadValue->CompletionEvent = nullptr;
+
+					BackfillMap->Remove(ThreadKey);
+
+					TMyValue* CurrentValue = CurrentMap->Find(ThreadKey);
+					if (CurrentValue)
 					{
-						++DuplicateStateGenerated;
-						DeleteArray.Add(ThreadValue);
+						// if two threads get from the backfill map then we might just be dealing with one pipelinestate, in which case we have already added it to the currentmap and don't need to do anything else
+						if ( *CurrentValue != ThreadValue )
+						{
+							++DuplicateStateGenerated;
+							DeleteArray.Add(ThreadValue);
+						}
 					}
-				}
-				else
-				{
-					CurrentMap->Add(ThreadKey, ThreadValue);
+					else
+					{
+						CurrentMap->Add(ThreadKey, ThreadValue);
+					}
+					PipelineStateCacheIterator.RemoveCurrent();
 				}
 			}
-			PipelineStateCache->Empty();
 		}
 
 	}
@@ -443,6 +459,24 @@ public:
 		: Pipeline(InPipeline)
 		, Initializer(InInitializer)
 	{
+		if (Initializer.BoundShaderState.VertexDeclarationRHI)
+			Initializer.BoundShaderState.VertexDeclarationRHI->AddRef();
+		if (Initializer.BoundShaderState.VertexShaderRHI)
+			Initializer.BoundShaderState.VertexShaderRHI->AddRef();
+		if (Initializer.BoundShaderState.PixelShaderRHI)
+			Initializer.BoundShaderState.PixelShaderRHI->AddRef();
+		if (Initializer.BoundShaderState.GeometryShaderRHI)
+			Initializer.BoundShaderState.GeometryShaderRHI->AddRef();
+		if (Initializer.BoundShaderState.DomainShaderRHI)
+			Initializer.BoundShaderState.DomainShaderRHI->AddRef();
+		if (Initializer.BoundShaderState.HullShaderRHI)
+			Initializer.BoundShaderState.HullShaderRHI->AddRef();
+		if (Initializer.BlendState)
+			Initializer.BlendState->AddRef();
+		if (Initializer.RasterizerState)
+			Initializer.RasterizerState->AddRef();
+		if (Initializer.DepthStencilState)
+			Initializer.DepthStencilState->AddRef();
 	}
 
 	static ESubsequentsMode::Type GetSubsequentsMode() { return ESubsequentsMode::TrackSubsequents; }
@@ -458,6 +492,25 @@ public:
 		{
 			FGraphicsPipelineState* GfxPipeline = static_cast<FGraphicsPipelineState*>(Pipeline);
 			GfxPipeline->RHIPipeline = RHICreateGraphicsPipelineState(Initializer);
+			
+			if (Initializer.BoundShaderState.VertexDeclarationRHI)
+				Initializer.BoundShaderState.VertexDeclarationRHI->Release();
+			if (Initializer.BoundShaderState.VertexShaderRHI)
+				Initializer.BoundShaderState.VertexShaderRHI->Release();
+			if (Initializer.BoundShaderState.PixelShaderRHI)
+				Initializer.BoundShaderState.PixelShaderRHI->Release();
+			if (Initializer.BoundShaderState.GeometryShaderRHI)
+				Initializer.BoundShaderState.GeometryShaderRHI->Release();
+			if (Initializer.BoundShaderState.DomainShaderRHI)
+				Initializer.BoundShaderState.DomainShaderRHI->Release();
+			if (Initializer.BoundShaderState.HullShaderRHI)
+				Initializer.BoundShaderState.HullShaderRHI->Release();
+			if (Initializer.BlendState)
+				Initializer.BlendState->Release();
+			if (Initializer.RasterizerState)
+				Initializer.RasterizerState->Release();
+			if (Initializer.DepthStencilState)
+				Initializer.DepthStencilState->Release();
 		}
 	}
 
@@ -551,7 +604,7 @@ static bool IsAsyncCompilationAllowed(FRHICommandList& RHICmdList)
 FComputePipelineState* PipelineStateCache::GetAndOrCreateComputePipelineState(FRHICommandList& RHICmdList, FRHIComputeShader* ComputeShader)
 {
 	SCOPE_CYCLE_COUNTER(STAT_GetOrCreatePSO);
-
+	
 	bool DoAsyncCompile = IsAsyncCompilationAllowed(RHICmdList);
 
 	FComputePipelineState* OutCachedState = nullptr;
@@ -562,8 +615,11 @@ FComputePipelineState* PipelineStateCache::GetAndOrCreateComputePipelineState(FR
 
 	if (WasFound == false)
 	{
+		FPipelineFileCache::CacheComputePSO(GetTypeHash(ComputeShader), ComputeShader);
+
 		// create new graphics state
 		OutCachedState = new FComputePipelineState(ComputeShader);
+		OutCachedState->Stats = FPipelineFileCache::RegisterPSOStats(GetTypeHash(ComputeShader));
 
 		// create a compilation task, or just do it now...
 		if (DoAsyncCompile)
@@ -606,6 +662,7 @@ FComputePipelineState* PipelineStateCache::GetAndOrCreateComputePipelineState(FR
 	bool WasFound = GComputePipelineCache.FindOrAdd(ComputeShader, OutCachedState, [&RHICmdList, &ComputeShader, &DoAsyncCompile] {
 			// create new graphics state
 			TSharedPtr<FComputePipelineState, ESPMode::Fast> PipelineState(new FComputePipelineState(ComputeShader));
+			PipelineState->Stats = FPipelineFileCache::RegisterPSOStats(GetTypeHash(ComputeShader));
 
 			// create a compilation task, or just do it now...
 			if (DoAsyncCompile)
@@ -649,7 +706,7 @@ FRHIComputePipelineState* ExecuteSetComputePipelineState(FComputePipelineState*
 {
 	ensure(ComputePipelineState->RHIPipeline);
 	FRWScopeLock ScopeLock(GComputePipelineCache.RWLock(), SLT_Write);
-
+	ComputePipelineState->AddUse();
 	ComputePipelineState->CompletionEvent = nullptr;
 	return ComputePipelineState->RHIPipeline;
 }
@@ -724,8 +781,11 @@ FGraphicsPipelineState* PipelineStateCache::GetAndOrCreateGraphicsPipelineState(
 
 	if (bWasFound == false)
 	{
+		FPipelineFileCache::CacheGraphicsPSO(GetTypeHash(*Initializer), *Initializer);
+
 		// create new graphics state
 		OutCachedState = new FGraphicsPipelineState();
+		OutCachedState->Stats = FPipelineFileCache::RegisterPSOStats(GetTypeHash(*Initializer));
 
 		// create a compilation task, or just do it now...
 		if (DoAsyncCompile)
@@ -765,6 +825,8 @@ FRHIGraphicsPipelineState* ExecuteSetGraphicsPipelineState(FGraphicsPipelineStat
 {
 	FRHIGraphicsPipelineState* RHIPipeline = GraphicsPipelineState->RHIPipeline;
 
+	GraphicsPipelineState->AddUse();
+
 #if PIPELINESTATECACHE_VERIFYTHREADSAFE
 	int32 Result = GraphicsPipelineState->InUseCount.Decrement();
 	check(Result >= 0);
@@ -840,7 +902,6 @@ void DumpPipelineCacheStats()
 #endif // PSO_VALIDATE_CACHE
 }
 
-
 void PipelineStateCache::Shutdown()
 {
 	// call discard twice to clear both the backing and main caches
@@ -849,7 +910,8 @@ void PipelineStateCache::Shutdown()
 		GComputePipelineCache.Discard([](FComputePipelineState* CacheItem) {
 			delete CacheItem;
 		});
-
+		
 		GGraphicsPipelineCache.DiscardAndSwap();
 	}
+	FPipelineFileCache::Shutdown();
 }
diff --git a/Engine/Source/Runtime/RHI/Private/RHI.cpp b/Engine/Source/Runtime/RHI/Private/RHI.cpp
index 601d83e3f297..cdaf3f93ef91 100644
--- a/Engine/Source/Runtime/RHI/Private/RHI.cpp
+++ b/Engine/Source/Runtime/RHI/Private/RHI.cpp
@@ -7,11 +7,13 @@
 #include "RHI.h"
 #include "Modules/ModuleManager.h"
 #include "Misc/ConfigCacheIni.h"
+#include "ProfilingDebugging/CsvProfiler.h"
 
 IMPLEMENT_MODULE(FDefaultModuleImpl, RHI);
 
 /** RHI Logging. */
 DEFINE_LOG_CATEGORY(LogRHI);
+CSV_DEFINE_CATEGORY(RHI, true);
 
 // Define counter stats.
 DEFINE_STAT(STAT_RHIDrawPrimitiveCalls);
@@ -108,6 +110,153 @@ FRHIResource* FRHIResource::CurrentlyDeleting = nullptr;
 TArray<FRHIResource::ResourcesToDelete> FRHIResource::DeferredDeletionQueue;
 uint32 FRHIResource::CurrentFrame = 0;
 
+FString FVertexElement::ToString() const
+{
+	return FString::Printf(TEXT("<%u %u %u %u %u %u>")
+		, uint32(StreamIndex)
+		, uint32(Offset)
+		, uint32(Type)
+		, uint32(AttributeIndex)
+		, uint32(Stride)
+		, uint32(bUseInstanceIndex)
+	);
+}
+
+void FVertexElement::FromString(const FString& InSrc)
+{
+	FString Src = InSrc;
+	Src.ReplaceInline(TEXT("\r"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\n"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\t"), TEXT(" "));
+	Src.ReplaceInline(TEXT("<"), TEXT(" "));
+	Src.ReplaceInline(TEXT(">"), TEXT(" "));
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(" "));
+
+	check(Parts.Num() == 6 && sizeof(Type) == 1); //not a very robust parser
+	LexFromString(StreamIndex, *Parts[0]);
+	LexFromString(Offset, *Parts[1]);
+	LexFromString((uint8&)Type, *Parts[2]);
+	LexFromString(AttributeIndex, *Parts[3]);
+	LexFromString(Stride, *Parts[4]);
+	LexFromString(bUseInstanceIndex, *Parts[5]);
+}
+
+FString FDepthStencilStateInitializerRHI::ToString() const
+{
+	return
+		FString::Printf(TEXT("<%u %u ")
+			, uint32(!!bEnableDepthWrite)
+			, uint32(DepthTest)
+		)
+		+ FString::Printf(TEXT("%u %u %u %u %u ")
+			, uint32(!!bEnableFrontFaceStencil)
+			, uint32(FrontFaceStencilTest)
+			, uint32(FrontFaceStencilFailStencilOp)
+			, uint32(FrontFaceDepthFailStencilOp)
+			, uint32(FrontFacePassStencilOp)
+		)
+		+ FString::Printf(TEXT("%u %u %u %u %u ")
+			, uint32(!!bEnableBackFaceStencil)
+			, uint32(BackFaceStencilTest)
+			, uint32(BackFaceStencilFailStencilOp)
+			, uint32(BackFaceDepthFailStencilOp)
+			, uint32(BackFacePassStencilOp)
+		)
+		+ FString::Printf(TEXT("%u %u>")
+			, uint32(StencilReadMask)
+			, uint32(StencilWriteMask)
+		);
+}
+void FDepthStencilStateInitializerRHI::FromString(const FString& InSrc)
+{
+	FString Src = InSrc;
+	Src.ReplaceInline(TEXT("\r"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\n"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\t"), TEXT(" "));
+	Src.ReplaceInline(TEXT("<"), TEXT(" "));
+	Src.ReplaceInline(TEXT(">"), TEXT(" "));
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(" "));
+
+	check(Parts.Num() == 14 && sizeof(bool) == 1 && sizeof(FrontFaceStencilFailStencilOp) == 1 && sizeof(BackFaceStencilTest) == 1 && sizeof(BackFaceDepthFailStencilOp) == 1); //not a very robust parser
+
+	LexFromString((uint8&)bEnableDepthWrite, *Parts[0]);
+	LexFromString((uint8&)DepthTest, *Parts[1]);
+
+	LexFromString((uint8&)bEnableFrontFaceStencil, *Parts[2]);
+	LexFromString((uint8&)FrontFaceStencilTest, *Parts[3]);
+	LexFromString((uint8&)FrontFaceStencilFailStencilOp, *Parts[4]);
+	LexFromString((uint8&)FrontFaceDepthFailStencilOp, *Parts[5]);
+	LexFromString((uint8&)FrontFacePassStencilOp, *Parts[6]);
+
+	LexFromString((uint8&)bEnableBackFaceStencil, *Parts[7]);
+	LexFromString((uint8&)BackFaceStencilTest, *Parts[8]);
+	LexFromString((uint8&)BackFaceStencilFailStencilOp, *Parts[9]);
+	LexFromString((uint8&)BackFaceDepthFailStencilOp, *Parts[10]);
+	LexFromString((uint8&)BackFacePassStencilOp, *Parts[11]);
+
+	LexFromString(StencilReadMask, *Parts[12]);
+	LexFromString(StencilWriteMask, *Parts[13]);
+}
+
+FString FBlendStateInitializerRHI::ToString() const
+{
+	FString Result = TEXT("<");
+	for (int32 Index = 0; Index < MaxSimultaneousRenderTargets; Index++)
+	{
+		Result += RenderTargets[Index].ToString();
+	}
+	Result += FString::Printf(TEXT("%d>"), uint32(!!bUseIndependentRenderTargetBlendStates));
+	return Result;
+}
+
+void FBlendStateInitializerRHI::FromString(const FString& InSrc)
+{
+	FString Src = InSrc;
+	Src.ReplaceInline(TEXT("\r"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\n"), TEXT(" "));
+	Src.ReplaceInline(TEXT("\t"), TEXT(" "));
+	Src.ReplaceInline(TEXT("<"), TEXT(" "));
+	Src.ReplaceInline(TEXT(">"), TEXT(" "));
+	TArray<FString> Parts;
+	Src.TrimStartAndEnd().ParseIntoArray(Parts, TEXT(" "));
+
+
+	check(Parts.Num() == MaxSimultaneousRenderTargets * FRenderTarget::NUM_STRING_FIELDS + 1 && sizeof(bool) == 1); //not a very robust parser
+	for (int32 Index = 0; Index < MaxSimultaneousRenderTargets; Index++)
+	{
+		RenderTargets[Index].FromString(Parts, FRenderTarget::NUM_STRING_FIELDS * Index);
+	}
+	LexFromString((int8&)bUseIndependentRenderTargetBlendStates, *Parts[MaxSimultaneousRenderTargets * FRenderTarget::NUM_STRING_FIELDS]);
+}
+
+
+FString FBlendStateInitializerRHI::FRenderTarget::ToString() const
+{
+	return FString::Printf(TEXT("%u %u %u %u %u %u %u ")
+		, uint32(ColorBlendOp)
+		, uint32(ColorSrcBlend)
+		, uint32(ColorDestBlend)
+		, uint32(AlphaBlendOp)
+		, uint32(AlphaSrcBlend)
+		, uint32(AlphaDestBlend)
+		, uint32(ColorWriteMask)
+	);
+}
+
+void FBlendStateInitializerRHI::FRenderTarget::FromString(const TArray<FString>& Parts, int32 Index)
+{
+	check(Index + NUM_STRING_FIELDS <= Parts.Num());
+	LexFromString((uint8&)ColorBlendOp, *Parts[Index++]);
+	LexFromString((uint8&)ColorSrcBlend, *Parts[Index++]);
+	LexFromString((uint8&)ColorDestBlend, *Parts[Index++]);
+	LexFromString((uint8&)AlphaBlendOp, *Parts[Index++]);
+	LexFromString((uint8&)AlphaSrcBlend, *Parts[Index++]);
+	LexFromString((uint8&)AlphaDestBlend, *Parts[Index++]);
+	LexFromString((uint8&)ColorWriteMask, *Parts[Index++]);
+}
+
 bool FRHIResource::Bypass()
 {
 	return GRHICommandList.Bypass();
@@ -306,6 +455,8 @@ bool GRHISupportsQuadTopology = false;
 bool GRHISupportsRectTopology = false;
 bool GSupportsParallelRenderingTasksWithSeparateRHIThread = true;
 bool GRHIThreadNeedsKicking = false;
+int32 GRHIMaximumReccommendedOustandingOcclusionQueries = MAX_int32;
+bool GRHISupportsExactOcclusionQueries = true;
 bool GSupportsVolumeTextureRendering = true;
 bool GSupportsSeparateRenderTargetBlendState = false;
 bool GSupportsDepthRenderTargetWithoutColorRenderTarget = true;
@@ -378,6 +529,8 @@ void RHIPrivateBeginFrame()
 {
 	GNumDrawCallsRHI = GCurrentNumDrawCallsRHI;
 	GNumPrimitivesDrawnRHI = GCurrentNumPrimitivesDrawnRHI;
+	CSV_CUSTOM_STAT(RHI, DrawCalls, GNumDrawCallsRHI, ECsvCustomStatOp::Set);
+	CSV_CUSTOM_STAT(RHI, PrimitivesDrawn, GNumPrimitivesDrawnRHI, ECsvCustomStatOp::Set);
 	GCurrentNumDrawCallsRHI = GCurrentNumPrimitivesDrawnRHI = 0;
 }
 
diff --git a/Engine/Source/Runtime/RHI/Private/RHICommandList.cpp b/Engine/Source/Runtime/RHI/Private/RHICommandList.cpp
index 50d8d5dbe645..97fc1c7e058a 100644
--- a/Engine/Source/Runtime/RHI/Private/RHICommandList.cpp
+++ b/Engine/Source/Runtime/RHI/Private/RHICommandList.cpp
@@ -120,6 +120,9 @@ bool GIsRunningRHIInSeparateThread_InternalUseOnly = false;
 bool GIsRunningRHIInDedicatedThread_InternalUseOnly = false;
 bool GIsRunningRHIInTaskThread_InternalUseOnly = false;
 
+uint32 GWorkingRHIThreadTime = 0;
+uint32 GWorkingRHIThreadStallTime = 0;
+
 RHI_API bool GEnableAsyncCompute = true;
 RHI_API FRHICommandListExecutor GRHICommandList;
 
@@ -371,8 +374,12 @@ public:
 		}
 		{
 			FScopeLock Lock(&GRHIThreadOnTasksCritical);
+			uint32 StartCycles = FPlatformTime::Cycles();
+
 			FRHICommandListExecutor::ExecuteInner_DoExecute(*RHICmdList);
 			delete RHICmdList;
+
+			GWorkingRHIThreadTime += (FPlatformTime::Cycles() - StartCycles); // this subtraction often wraps and the math stuff works
 		}
 		if (IsRunningRHIInTaskThread())
 		{
@@ -1935,9 +1942,14 @@ void* FDynamicRHI::LockVertexBuffer_RenderThread(class FRHICommandListImmediate&
 	void* Result;
 	if (!bBuffer || LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
 	{
-		QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockVertexBuffer_Flush);
-		RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread); 
-		Result = GDynamicRHI->RHILockVertexBuffer(VertexBuffer, Offset, SizeRHI, LockMode);
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockVertexBuffer_Flush);
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockVertexBuffer_Lock);
+			Result = GDynamicRHI->RHILockVertexBuffer(VertexBuffer, Offset, SizeRHI, LockMode);
+		}
 	}
 	else
 	{
@@ -1957,10 +1969,15 @@ void FDynamicRHI::UnlockVertexBuffer_RenderThread(class FRHICommandListImmediate
 	FLockTracker::FLockParams Params = GLockTracker.Unlock(VertexBuffer);
 	if (!bBuffer || Params.LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
 	{
-		QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockVertexBuffer_Flush);
-		RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread); 
-		GDynamicRHI->RHIUnlockVertexBuffer(VertexBuffer);
-		GLockTracker.TotalMemoryOutstanding = 0;
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockVertexBuffer_Flush);
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockVertexBuffer_Unlock);
+			GDynamicRHI->RHIUnlockVertexBuffer(VertexBuffer);
+			GLockTracker.TotalMemoryOutstanding = 0;
+		}
 	}	
 	else
 	{
@@ -1984,9 +2001,14 @@ void* FDynamicRHI::LockIndexBuffer_RenderThread(class FRHICommandListImmediate&
 	void* Result;
 	if (!bBuffer || LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
 	{
-		QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockIndexBuffer_Flush);
-		RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread); 
-		Result = GDynamicRHI->RHILockIndexBuffer(IndexBuffer, Offset, SizeRHI, LockMode);
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockIndexBuffer_Flush);
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_LockIndexBuffer_Lock);
+			Result = GDynamicRHI->RHILockIndexBuffer(IndexBuffer, Offset, SizeRHI, LockMode);
+		}
 	}
 	else
 	{
@@ -2006,10 +2028,15 @@ void FDynamicRHI::UnlockIndexBuffer_RenderThread(class FRHICommandListImmediate&
 	FLockTracker::FLockParams Params = GLockTracker.Unlock(IndexBuffer);
 	if (!bBuffer || Params.LockMode != RLM_WriteOnly || RHICmdList.Bypass() || !IsRunningRHIInSeparateThread())
 	{
-		QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockIndexBuffer_Flush);
-		RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread); 
-		GDynamicRHI->RHIUnlockIndexBuffer(IndexBuffer);
-		GLockTracker.TotalMemoryOutstanding = 0;
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockIndexBuffer_Flush);
+			RHICmdList.ImmediateFlush(EImmediateFlushType::FlushRHIThread);
+		}
+		{
+			QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_UnlockIndexBuffer_Unlock);
+			GDynamicRHI->RHIUnlockIndexBuffer(IndexBuffer);
+			GLockTracker.TotalMemoryOutstanding = 0;
+		}
 	}	
 	else
 	{
@@ -2195,10 +2222,10 @@ void FDynamicRHI::UnlockTexture2D_RenderThread(class FRHICommandListImmediate& R
 	GDynamicRHI->RHIUnlockTexture2D(Texture, MipIndex, bLockWithinMiptail);
 }
 
-FRHIShaderLibraryRef FDynamicRHI::RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath)
+FRHIShaderLibraryRef FDynamicRHI::RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath, FString Name)
 {
 	FScopedRHIThreadStaller StallRHIThread(RHICmdList);
-	return GDynamicRHI->RHICreateShaderLibrary(Platform, FilePath);
+	return GDynamicRHI->RHICreateShaderLibrary(Platform, FilePath, Name);
 }
 
 FTextureReferenceRHIRef FDynamicRHI::RHICreateTextureReference_RenderThread(class FRHICommandListImmediate& RHICmdList, FLastRenderTimeContainer* LastRenderTime)
diff --git a/Engine/Source/Runtime/RHI/Private/RHIUtilities.cpp b/Engine/Source/Runtime/RHI/Private/RHIUtilities.cpp
index ba628e48f2c8..560edd2668de 100644
--- a/Engine/Source/Runtime/RHI/Private/RHIUtilities.cpp
+++ b/Engine/Source/Runtime/RHI/Private/RHIUtilities.cpp
@@ -165,8 +165,6 @@ struct FRHIFrameOffsetThread : public FRunnable
 		{
 			FRHIFlipDetails NewFlipFrame = GDynamicRHI->RHIWaitForFlip(-1);
 
-			FPlatformMisc::BeginNamedEvent(FColor::Orange, *FString::Printf(TEXT("Flip %d"), NewFlipFrame.PresentIndex));
-
 			int32 SyncInterval = RHIGetSyncInterval();
 			double TargetFrameTimeInSeconds = double(SyncInterval) / 60.0;
 			double SlackInSeconds = CVarRHISyncSlackMS.GetValueOnAnyThread() / 1000.0;
@@ -174,8 +172,6 @@ struct FRHIFrameOffsetThread : public FRunnable
 
 			double Timeout = FMath::Max(0.0, TargetFlipTime - FPlatformTime::Seconds());
 
-			FPlatformMisc::EndNamedEvent();
-
 			FPlatformProcess::Sleep(Timeout);
 
 			{
diff --git a/Engine/Source/Runtime/RHI/Public/DynamicRHI.h b/Engine/Source/Runtime/RHI/Public/DynamicRHI.h
index 993dd486389b..d75fd83808dd 100644
--- a/Engine/Source/Runtime/RHI/Public/DynamicRHI.h
+++ b/Engine/Source/Runtime/RHI/Public/DynamicRHI.h
@@ -184,8 +184,16 @@ public:
 	{
 		return nullptr;
 	}
-	// FlushType: Wait RHI Thread
-	virtual FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString FilePath)
+    
+    /**
+     * Attempts to open a shader library for the given shader platform & name within the provided directory.
+     * @param Platform The shader platform for shaders withing the library.
+     * @param FilePath The directory in which the library should exist.
+     * @param Name The name of the library, i.e. "Global" or "Unreal" without shader-platform or file-extension qualification.
+     * @return The new library if one exists and can be constructed, otherwise nil.
+     */
+    // FlushType: Must be Thread-Safe.
+    virtual FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString const& FilePath, FString const& Name)
 	{
 		return nullptr;
 	}
@@ -241,6 +249,16 @@ public:
 	{
 		return new FRHIComputePipelineStateFallback(ComputeShader);
 	}
+	
+	virtual FGraphicsPipelineStateRHIRef RHICreateGraphicsPipelineState(const FGraphicsPipelineStateInitializer& Initializer, FRHIPipelineBinaryLibraryParamRef PipelineBinary)
+	{
+		return RHICreateGraphicsPipelineState(Initializer);
+	}
+	
+	virtual TRefCountPtr<FRHIComputePipelineState> RHICreateComputePipelineState(FRHIComputeShader* ComputeShader, FRHIPipelineBinaryLibraryParamRef PipelineBinary)
+	{
+		return RHICreateComputePipelineState(ComputeShader);
+	}
 
 	/**
 	* Creates a uniform buffer.  The contents of the uniform buffer are provided in a parameter, and are immutable.
@@ -767,9 +785,6 @@ public:
 	// FlushType: Flush Immediate (seems wrong)
 	virtual void RHISetStreamOutTargets(uint32 NumTargets, const FVertexBufferRHIParamRef* VertexBuffers, const uint32* Offsets) = 0;
 
-	// Each RHI should flush if it needs to when implementing this method.
-	virtual void RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask) = 0;
-
 	// Blocks the CPU until the GPU catches up and goes idle.
 	// FlushType: Flush Immediate (seems wrong)
 	virtual void RHIBlockUntilGPUIdle() = 0;
@@ -919,7 +934,7 @@ public:
 
 	virtual void UpdateTexture3D_RenderThread(class FRHICommandListImmediate& RHICmdList, FTexture3DRHIParamRef Texture, uint32 MipIndex, const struct FUpdateTextureRegion3D& UpdateRegion, uint32 SourceRowPitch, uint32 SourceDepthPitch, const uint8* SourceData);
 
-	virtual FRHIShaderLibraryRef RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath);
+	virtual FRHIShaderLibraryRef RHICreateShaderLibrary_RenderThread(class FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FString FilePath, FString Name);
 	virtual FTextureReferenceRHIRef RHICreateTextureReference_RenderThread(class FRHICommandListImmediate& RHICmdList, FLastRenderTimeContainer* LastRenderTime);
 	virtual FTexture2DRHIRef RHICreateTexture2D_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 SizeX, uint32 SizeY, uint8 Format, uint32 NumMips, uint32 NumSamples, uint32 Flags, FRHIResourceCreateInfo& CreateInfo);
 	virtual FTexture2DRHIRef RHICreateTextureExternal2D_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 SizeX, uint32 SizeY, uint8 Format, uint32 NumMips, uint32 NumSamples, uint32 Flags, FRHIResourceCreateInfo& CreateInfo);
@@ -940,6 +955,7 @@ public:
 	virtual FTextureCubeRHIRef RHICreateTextureCube_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 Size, uint8 Format, uint32 NumMips, uint32 Flags, FRHIResourceCreateInfo& CreateInfo);
 	virtual FTextureCubeRHIRef RHICreateTextureCubeArray_RenderThread(class FRHICommandListImmediate& RHICmdList, uint32 Size, uint32 ArraySize, uint8 Format, uint32 NumMips, uint32 Flags, FRHIResourceCreateInfo& CreateInfo);
 	virtual FRenderQueryRHIRef RHICreateRenderQuery_RenderThread(class FRHICommandListImmediate& RHICmdList, ERenderQueryType QueryType);
+
 	
 	virtual void* RHILockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, EResourceLockMode LockMode, uint32& DestStride, bool bLockWithinMiptail);
 	virtual void RHIUnlockTextureCubeFace_RenderThread(class FRHICommandListImmediate& RHICmdList, FTextureCubeRHIParamRef Texture, uint32 FaceIndex, uint32 ArrayIndex, uint32 MipIndex, bool bLockWithinMiptail);
diff --git a/Engine/Source/Runtime/RHI/Public/PipelineFileCache.h b/Engine/Source/Runtime/RHI/Public/PipelineFileCache.h
new file mode 100644
index 000000000000..93deb0bcd7ed
--- /dev/null
+++ b/Engine/Source/Runtime/RHI/Public/PipelineFileCache.h
@@ -0,0 +1,279 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+ 
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RHI.h"
+
+DECLARE_STATS_GROUP(TEXT("ShaderPipelineCache"),STATGROUP_PipelineStateCache, STATCAT_Advanced);
+
+DECLARE_DWORD_ACCUMULATOR_STAT_EXTERN(TEXT("Total Graphics Pipeline State Count"), STAT_TotalGraphicsPipelineStateCount, STATGROUP_PipelineStateCache, RHI_API);
+DECLARE_DWORD_ACCUMULATOR_STAT_EXTERN(TEXT("Total Compute Pipeline State Count"), STAT_TotalComputePipelineStateCount, STATGROUP_PipelineStateCache, RHI_API);
+
+#define PIPELINE_CACHE_DEFAULT_ENABLED (!WITH_EDITOR && PLATFORM_MAC)
+
+struct RHI_API FPipelineFileCacheRasterizerState
+{
+	FPipelineFileCacheRasterizerState() { FMemory::Memzero(*this); }
+	FPipelineFileCacheRasterizerState(FRasterizerStateInitializerRHI const& Other) { operator=(Other); }
+	
+	float DepthBias;
+	float SlopeScaleDepthBias;
+	TEnumAsByte<ERasterizerFillMode> FillMode;
+	TEnumAsByte<ERasterizerCullMode> CullMode;
+	bool bAllowMSAA;
+	bool bEnableLineAA;
+	
+	FPipelineFileCacheRasterizerState& operator=(FRasterizerStateInitializerRHI const& Other)
+	{
+		DepthBias = Other.DepthBias;
+		SlopeScaleDepthBias = Other.SlopeScaleDepthBias;
+		FillMode = Other.FillMode;
+		CullMode = Other.CullMode;
+		bAllowMSAA = Other.bAllowMSAA;
+		bEnableLineAA = Other.bEnableLineAA;
+		return *this;
+	}
+	
+	operator FRasterizerStateInitializerRHI () const
+	{
+		FRasterizerStateInitializerRHI Initializer = {FillMode, CullMode, DepthBias, SlopeScaleDepthBias, bAllowMSAA, bEnableLineAA};
+		return Initializer;
+	}
+	
+	friend RHI_API FArchive& operator<<(FArchive& Ar,FPipelineFileCacheRasterizerState& RasterizerStateInitializer)
+	{
+		Ar << RasterizerStateInitializer.DepthBias;
+		Ar << RasterizerStateInitializer.SlopeScaleDepthBias;
+		Ar << RasterizerStateInitializer.FillMode;
+		Ar << RasterizerStateInitializer.CullMode;
+		Ar << RasterizerStateInitializer.bAllowMSAA;
+		Ar << RasterizerStateInitializer.bEnableLineAA;
+		return Ar;
+	}
+	
+	friend RHI_API uint32 GetTypeHash(const FPipelineFileCacheRasterizerState &Key)
+	{
+		uint32 KeyHash = (*((uint32*)&Key.DepthBias) ^ *((uint32*)&Key.SlopeScaleDepthBias));
+		KeyHash ^= (Key.FillMode << 8);
+		KeyHash ^= Key.CullMode;
+		KeyHash ^= Key.bAllowMSAA ? 2 : 0;
+		KeyHash ^= Key.bEnableLineAA ? 1 : 0;
+		return KeyHash;
+	}
+	FString ToString() const;
+	void FromString(const FString& Src);
+};
+
+/**
+ * Tracks stats for the current session between opening & closing the file-cache.
+ */
+struct RHI_API FPipelineStateStats
+{
+	FPipelineStateStats()
+	: FirstFrameUsed(-1)
+	, LastFrameUsed(-1)
+	, CreateCount(0)
+	, TotalBindCount(0)
+	, PSOHash(0)
+	{
+	}
+	
+	~FPipelineStateStats()
+	{
+	}
+
+	static void UpdateStats(FPipelineStateStats* Stats);
+	
+	friend RHI_API FArchive& operator<<( FArchive& Ar, FPipelineStateStats& Info );
+
+	int64 FirstFrameUsed;
+	int64 LastFrameUsed;
+	uint64 CreateCount;
+	int64 TotalBindCount;
+	uint32 PSOHash;
+};
+
+struct RHI_API FPipelineCacheFileFormatPSO
+{
+	struct RHI_API ComputeDescriptor
+	{
+		FSHAHash ComputeShader;
+
+		FString ToString() const;
+		static FString HeaderLine();
+		void FromString(const FString& Src);
+	};
+	struct RHI_API GraphicsDescriptor
+	{
+		FSHAHash VertexShader;
+		FSHAHash FragmentShader;
+		FSHAHash GeometryShader;
+		FSHAHash HullShader;
+		FSHAHash DomainShader;
+		
+		FVertexDeclarationElementList VertexDescriptor;
+		FBlendStateInitializerRHI BlendState;
+		FPipelineFileCacheRasterizerState RasterizerState;
+		FDepthStencilStateInitializerRHI DepthStencilState;
+		
+		EPixelFormat RenderTargetFormats[MaxSimultaneousRenderTargets];
+		uint32 RenderTargetFlags[MaxSimultaneousRenderTargets];
+		ERenderTargetLoadAction RenderTargetsLoad[MaxSimultaneousRenderTargets];
+		ERenderTargetStoreAction RenderTargetsStore[MaxSimultaneousRenderTargets];
+		uint32 RenderTargetsActive;
+		uint32 MSAASamples;
+		
+		EPixelFormat DepthStencilFormat;
+		uint32 DepthStencilFlags;
+		ERenderTargetLoadAction DepthLoad;
+		ERenderTargetLoadAction StencilLoad;
+		ERenderTargetStoreAction DepthStore;
+		ERenderTargetStoreAction StencilStore;
+		
+		EPrimitiveType PrimitiveType;
+
+		FString ToString() const;
+		static FString HeaderLine();
+		void FromString(const FString& Src);
+
+		FString ShadersToString() const;
+		static FString ShaderHeaderLine();
+		void ShadersFromString(const FString& Src);
+
+		FString StateToString() const;
+		static FString StateHeaderLine();
+		void StateFromString(const FString& Src);
+	};
+	enum class DescriptorType : uint32
+	{
+		Compute = 0,
+		Graphics = 1
+	};
+	
+	DescriptorType Type;
+	ComputeDescriptor ComputeDesc;
+	GraphicsDescriptor GraphicsDesc;
+	mutable volatile uint32 Hash;
+	
+	FPipelineCacheFileFormatPSO();
+	~FPipelineCacheFileFormatPSO();
+	
+	FPipelineCacheFileFormatPSO& operator=(const FPipelineCacheFileFormatPSO& Other);
+	FPipelineCacheFileFormatPSO(const FPipelineCacheFileFormatPSO& Other);
+	
+	bool operator==(const FPipelineCacheFileFormatPSO& Other) const;
+
+	friend RHI_API uint32 GetTypeHash(const FPipelineCacheFileFormatPSO &Key);
+	friend RHI_API FArchive& operator<<( FArchive& Ar, FPipelineCacheFileFormatPSO& Info );
+	
+	static bool Init(FPipelineCacheFileFormatPSO& PSO, FRHIComputeShader const* Init);
+	static bool Init(FPipelineCacheFileFormatPSO& PSO, FGraphicsPipelineStateInitializer const& Init);
+
+
+};
+	
+struct RHI_API FPipelineCacheFileFormatPSORead
+{	
+	FPipelineCacheFileFormatPSORead()
+	: Ar(nullptr)
+	, Hash(0)
+	, bReadCompleted(false)
+    , bValid(false)
+	{}
+	
+	~FPipelineCacheFileFormatPSORead()
+	{
+		if(Ar)
+		{
+			delete Ar;
+		}
+	}
+	
+	TArray<uint8> Data;
+	FArchive* Ar;
+	uint32 Hash;
+	bool bReadCompleted;
+    bool bValid;
+	
+	TSharedPtr<class IAsyncReadRequest, ESPMode::ThreadSafe> ReadRequest;
+	TSharedPtr<class IAsyncReadFileHandle, ESPMode::ThreadSafe> ParentFileHandle;
+};
+
+struct RHI_API FPipelineCachePSOHeader
+{
+	TSet<FSHAHash> Shaders;
+	uint32 Hash;
+};
+
+extern RHI_API const uint32 FPipelineCacheFileFormatCurrentVersion;
+
+/**
+ * FPipelineFileCache:
+ * The RHI-level backend for FShaderPipelineCache, responsible for tracking PSOs and their usage stats as well as dealing with the pipeline cache files.
+ * It is not expected that games or end-users invoke this directly, they should be calling FShaderPipelineCache which exposes this functionality in a usable form. 
+ */
+class RHI_API FPipelineFileCache
+{
+    friend class FPipelineCacheFile;
+public:
+	enum class SaveMode : uint32
+	{
+		Incremental = 0, // Fast(er) approach which saves new entries incrementally at the end of the file, replacing the table-of-contents, but leaves everything else alone.
+        BoundPSOsOnly = 1, // Slower approach which consolidates and saves all PSOs used in this run of the program, removing any entry that wasn't seen, and sorted by the desired sort-mode.
+		SortedBoundPSOs = 2 // Slow save consolidates all PSOs used on this device that were never part of a cache file delivered in game-content, sorts entries into the desired order and will thus read-back from disk.
+	};
+	
+	enum class PSOOrder : uint32
+	{
+		Default = 0, // Whatever order they are already in.
+		FirstToLatestUsed = 1, // Start with the PSOs with the lowest first-frame used and work toward those with the highest.
+		MostToLeastUsed = 2 // Start with the most often used PSOs working toward the least.
+	};
+
+public:
+	
+	static void Initialize(uint32 GameVersion);
+	static void Shutdown();
+	
+	static bool LoadPipelineFileCacheInto(FString const& Path, TSet<FPipelineCacheFileFormatPSO>& PSOs);
+	static bool SavePipelineFileCacheFrom(uint32 GameVersion, EShaderPlatform Platform, FString const& Path, const TSet<FPipelineCacheFileFormatPSO>& PSOs);
+	static bool MergePipelineFileCaches(FString const& PathA, FString const& PathB, FPipelineFileCache::PSOOrder Order, FString const& OutputPath);
+
+	static bool OpenPipelineFileCache(FString const& Name, EShaderPlatform Platform);
+	static bool SavePipelineFileCache(FString const& Name, SaveMode Mode);
+	static void ClosePipelineFileCache();
+	
+	static void CacheGraphicsPSO(uint32 RunTimeHash, FGraphicsPipelineStateInitializer const& Initializer);
+	static void CacheComputePSO(uint32 RunTimeHash, FRHIComputeShader const* Initializer);
+	static FPipelineStateStats* RegisterPSOStats(uint32 RunTimeHash);
+	
+	/**
+	 * Event signature for being notified that a new PSO has been logged
+	 */
+	DECLARE_MULTICAST_DELEGATE_OneParam(FPipelineStateLoggedEvent, FPipelineCacheFileFormatPSO&);
+
+	/**
+	 * Gets the event delegate to register for pipeline state logging events.
+	 */
+	static FPipelineStateLoggedEvent& OnPipelineStateLogged();
+	
+	static void GetOrderedPSOHashes(TArray<FPipelineCachePSOHeader>& PSOHashes, PSOOrder Order);
+	static void FetchPSODescriptors(TArray<FPipelineCacheFileFormatPSORead*>& LoadedBatch);
+	static uint32 NumPSOsLogged();
+	
+	static bool IsPipelineFileCacheEnabled();
+	static bool LogPSOtoFileCache();
+    static bool ReportNewPSOs();
+	
+private:
+	static FRWLock FileCacheLock;
+	static class FPipelineCacheFile* FileCache;
+	static TMap<uint32, uint32> RunTimeToFileHashes;
+	static TMap<uint32, FPipelineStateStats*> Stats;
+	static TSet<FPipelineCacheFileFormatPSO> NewPSOs;
+    static uint32 NumNewPSOs;
+	static PSOOrder RequestedOrder;
+	static bool FileCacheEnabled;
+	static FPipelineStateLoggedEvent PSOLoggedEvent;
+};
diff --git a/Engine/Source/Runtime/RHI/Public/RHI.h b/Engine/Source/Runtime/RHI/Public/RHI.h
index 4c29bb61bfe6..18654d586f20 100644
--- a/Engine/Source/Runtime/RHI/Public/RHI.h
+++ b/Engine/Source/Runtime/RHI/Public/RHI.h
@@ -257,6 +257,12 @@ extern RHI_API bool GSupportsParallelRenderingTasksWithSeparateRHIThread;
 /** If an RHI is so slow, that it is the limiting factor for the entire frame, we can kick early to try to give it as much as possible. */
 extern RHI_API bool GRHIThreadNeedsKicking;
 
+/** If an RHI cannot do an unlimited number of occlusion queries without stalling and waiting for the GPU, this can be used to tune hte occlusion culler to try not to do that. */
+extern RHI_API int32 GRHIMaximumReccommendedOustandingOcclusionQueries;
+
+/** Some RHIs can only do visible or not occlusion queries. */
+extern RHI_API bool GRHISupportsExactOcclusionQueries;
+
 /** True if and only if the GPU support rendering to volume textures (2D Array, 3D). Some OpenGL 3.3 cards support SM4, but can't render to volume textures. */
 extern RHI_API bool GSupportsVolumeTextureRendering;
 
@@ -637,6 +643,8 @@ struct FVertexElement
 		Ar << Element.bUseInstanceIndex;
 		return Ar;
 	}
+	RHI_API FString ToString() const;
+	RHI_API void FromString(const FString& Src);
 };
 
 typedef TArray<FVertexElement,TFixedAllocator<MaxVertexElementCount> > FVertexDeclarationElementList;
@@ -821,6 +829,10 @@ struct FDepthStencilStateInitializerRHI
 		Ar << DepthStencilStateInitializer.StencilWriteMask;
 		return Ar;
 	}
+	RHI_API FString ToString() const;
+	RHI_API void FromString(const FString& Src);
+
+
 };
 
 class FBlendStateInitializerRHI
@@ -829,6 +841,10 @@ public:
 
 	struct FRenderTarget
 	{
+		enum
+		{
+			NUM_STRING_FIELDS = 7
+		};
 		TEnumAsByte<EBlendOperation> ColorBlendOp;
 		TEnumAsByte<EBlendFactor> ColorSrcBlend;
 		TEnumAsByte<EBlendFactor> ColorDestBlend;
@@ -866,6 +882,10 @@ public:
 			Ar << RenderTarget.ColorWriteMask;
 			return Ar;
 		}
+		RHI_API FString ToString() const;
+		RHI_API void FromString(const TArray<FString>& Parts, int32 Index);
+
+
 	};
 
 	FBlendStateInitializerRHI() {}
@@ -897,6 +917,10 @@ public:
 		Ar << BlendStateInitializer.bUseIndependentRenderTargetBlendStates;
 		return Ar;
 	}
+	RHI_API FString ToString() const;
+	RHI_API void FromString(const FString& Src);
+
+
 };
 
 /**
diff --git a/Engine/Source/Runtime/RHI/Public/RHICommandList.h b/Engine/Source/Runtime/RHI/Public/RHICommandList.h
index 2a03107744b0..5300e392b228 100644
--- a/Engine/Source/Runtime/RHI/Public/RHICommandList.h
+++ b/Engine/Source/Runtime/RHI/Public/RHICommandList.h
@@ -73,6 +73,10 @@ extern RHI_API bool GIsRunningRHIInSeparateThread_InternalUseOnly;
 extern RHI_API bool GIsRunningRHIInDedicatedThread_InternalUseOnly;
 extern RHI_API bool GIsRunningRHIInTaskThread_InternalUseOnly;
 
+/** private accumulator for the RHI thread. */
+extern RHI_API uint32 GWorkingRHIThreadTime;
+extern RHI_API uint32 GWorkingRHIThreadStallTime;
+
 /**
 * Whether the RHI commands are being run in a thread other than the render thread
 */
@@ -1805,6 +1809,22 @@ struct FRHICommandInvalidateCachedState final : public FRHICommand<FRHICommandIn
 	RHI_API void Execute(FRHICommandListBase& CmdList);
 };
 
+struct FRHICommandDiscardRenderTargets final : public FRHICommand<FRHICommandDiscardRenderTargets>
+{
+	uint32 ColorBitMask;
+	bool Depth;
+	bool Stencil;
+
+	FORCEINLINE_DEBUGGABLE FRHICommandDiscardRenderTargets(bool InDepth, bool InStencil, uint32 InColorBitMask)
+		: ColorBitMask(InColorBitMask)
+		, Depth(InDepth)
+		, Stencil(InStencil)
+	{
+	}
+	
+	RHI_API void Execute(FRHICommandListBase& CmdList);
+};
+
 struct FRHICommandDebugBreak final : public FRHICommand<FRHICommandDebugBreak>
 {
 	void Execute(FRHICommandListBase& CmdList)
@@ -2362,6 +2382,7 @@ public:
 
 	FORCEINLINE_DEBUGGABLE void SetComputeShader(FComputeShaderRHIParamRef ComputeShader)
 	{
+		ComputeShader->UpdateStats();
 		if (Bypass())
 		{
 			CMD_CONTEXT(RHISetComputeShader)(ComputeShader);
@@ -2752,6 +2773,16 @@ public:
 		}
 		new (AllocCommand<FRHICommandInvalidateCachedState>()) FRHICommandInvalidateCachedState();
 	}
+
+	FORCEINLINE void DiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
+	{
+		if (Bypass())
+		{
+			CMD_CONTEXT(RHIDiscardRenderTargets)(Depth, Stencil, ColorBitMask);
+			return;
+		}
+		new (AllocCommand<FRHICommandDiscardRenderTargets>()) FRHICommandDiscardRenderTargets(Depth, Stencil, ColorBitMask);
+	}
 	
 	FORCEINLINE_DEBUGGABLE void BreakPoint()
 	{
@@ -2863,6 +2894,7 @@ public:
 	
 	FORCEINLINE_DEBUGGABLE void SetComputeShader(FComputeShaderRHIParamRef ComputeShader)
 	{
+		ComputeShader->UpdateStats();
 		if (Bypass())
 		{
 			COMPUTE_CONTEXT(RHISetComputeShader)(ComputeShader);
@@ -3045,7 +3077,7 @@ class RHI_API FRHICommandListImmediate : public FRHICommandList
 			: Lambda(Forward<LAMBDA>(InLambda))
 		{}
 
-		void ExecuteAndDestruct(FRHICommandListBase& CmdList, FRHICommandListDebugContext& Context) override final
+		void ExecuteAndDestruct(FRHICommandListBase& CmdList, FRHICommandListDebugContext&) override final
 		{
 			Lambda(*static_cast<FRHICommandListImmediate*>(&CmdList));
 			Lambda.~LAMBDA();
@@ -3803,11 +3835,6 @@ public:
 		GDynamicRHI->RHISetStreamOutTargets(NumTargets,VertexBuffers,Offsets);
 	}
 	
-	FORCEINLINE void DiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask)
-	{
-		GDynamicRHI->RHIDiscardRenderTargets(Depth,Stencil,ColorBitMask);
-	}
-	
 	FORCEINLINE void BlockUntilGPUIdle()
 	{
 		QUICK_SCOPE_CYCLE_COUNTER(STAT_RHIMETHOD_BlockUntilGPUIdle_Flush);
@@ -3903,12 +3930,6 @@ public:
 		return RHIGetCommandContextContainer(Index, Num, GetGPUMask());
 	}
 	void UpdateTextureReference(FTextureReferenceRHIParamRef TextureRef, FTextureRHIParamRef NewTexture);
-	
-	FORCEINLINE FRHIShaderLibraryRef CreateShaderLibrary(EShaderPlatform Platform, FString FilePath)
-	{
-		LLM_SCOPE(ELLMTag::Shaders);
-		return GDynamicRHI->RHICreateShaderLibrary_RenderThread(*this, Platform, FilePath);
-	}
 
 };
 
@@ -3966,7 +3987,7 @@ public:
 
 
 // This controls if the cmd list bypass can be toggled at runtime. It is quite expensive to have these branches in there.
-#define CAN_TOGGLE_COMMAND_LIST_BYPASS (!UE_BUILD_SHIPPING && !UE_BUILD_TEST) || (UE_BUILD_TEST && PLATFORM_ANDROID)
+#define CAN_TOGGLE_COMMAND_LIST_BYPASS (!UE_BUILD_SHIPPING && !UE_BUILD_TEST)
 
 class RHI_API FRHICommandListExecutor
 {
@@ -4002,7 +4023,7 @@ public:
 #if CAN_TOGGLE_COMMAND_LIST_BYPASS
 		return bLatchedUseParallelAlgorithms;
 #else
-		return  FApp::ShouldUseThreadingForPerformance() && !Bypass();
+		return  FApp::ShouldUseThreadingForPerformance() && !Bypass() && (GSupportsParallelRenderingTasksWithSeparateRHIThread || !IsRunningRHIInSeparateThread());
 #endif
 	}
 	static void CheckNoOutstandingCmdLists();
@@ -4461,9 +4482,9 @@ FORCEINLINE void RHIRecreateRecursiveBoundShaderStates()
 	GDynamicRHI->RHIRecreateRecursiveBoundShaderStates();
 }
 
-FORCEINLINE FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString FilePath)
+FORCEINLINE FRHIShaderLibraryRef RHICreateShaderLibrary(EShaderPlatform Platform, FString const& FilePath, FString const& Name)
 {
-	return FRHICommandListExecutor::GetImmediateCommandList().CreateShaderLibrary(Platform, FilePath);
+    return GDynamicRHI->RHICreateShaderLibrary(Platform, FilePath, Name);
 }
 
 
diff --git a/Engine/Source/Runtime/RHI/Public/RHICommandListCommandExecutes.inl b/Engine/Source/Runtime/RHI/Public/RHICommandListCommandExecutes.inl
index 9c7a26b5e537..06680c8b0347 100644
--- a/Engine/Source/Runtime/RHI/Public/RHICommandListCommandExecutes.inl
+++ b/Engine/Source/Runtime/RHI/Public/RHICommandListCommandExecutes.inl
@@ -652,4 +652,8 @@ void FRHICommandInvalidateCachedState::Execute(FRHICommandListBase& CmdList)
 	INTERNAL_DECORATOR(RHIInvalidateCachedState)();
 }
 
-
+void FRHICommandDiscardRenderTargets::Execute(FRHICommandListBase& CmdList)
+{
+	RHISTAT(RHIDiscardRenderTargets);
+	INTERNAL_DECORATOR(RHIDiscardRenderTargets)(Depth, Stencil, ColorBitMask);
+}
diff --git a/Engine/Source/Runtime/RHI/Public/RHIContext.h b/Engine/Source/Runtime/RHI/Public/RHIContext.h
index 5e93806c1f73..8d41cef4d74c 100644
--- a/Engine/Source/Runtime/RHI/Public/RHIContext.h
+++ b/Engine/Source/Runtime/RHI/Public/RHIContext.h
@@ -253,6 +253,9 @@ public:
 
 	virtual void RHISubmitCommandsHint() = 0;
 
+	// Not all RHIs need this (Mobile specific)
+	virtual void RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask) {};
+
 	// This method is queued with an RHIThread, otherwise it will flush after it is queued; without an RHI thread there is no benefit to queuing this frame advance commands
 	virtual void RHIBeginDrawingViewport(FViewportRHIParamRef Viewport, FTextureRHIParamRef RenderTargetRHI) = 0;
 
diff --git a/Engine/Source/Runtime/RHI/Public/RHIDefinitions.h b/Engine/Source/Runtime/RHI/Public/RHIDefinitions.h
index 0c7eaece22fc..2c603ec6c1f2 100644
--- a/Engine/Source/Runtime/RHI/Public/RHIDefinitions.h
+++ b/Engine/Source/Runtime/RHI/Public/RHIDefinitions.h
@@ -919,6 +919,46 @@ inline ERHIFeatureLevel::Type GetMaxSupportedFeatureLevel(EShaderPlatform InShad
 	}
 }
 
+inline bool IsSimulatedPlatform(EShaderPlatform Platform)
+{
+	switch (Platform)
+	{
+		case SP_OPENGL_PCES2:
+		case SP_PCD3D_ES2:
+		case SP_PCD3D_ES3_1:
+		case SP_OPENGL_PCES3_1:
+			return true;
+		break;
+
+		default:
+			return false;
+		break;
+	}
+
+	return false;
+}
+
+inline EShaderPlatform GetSimulatedPlatform(EShaderPlatform Platform)
+{
+	switch (Platform)
+	{
+		case SP_OPENGL_PCES2:
+		case SP_PCD3D_ES2:
+			return SP_OPENGL_ES2_ANDROID;
+		break;
+		case SP_PCD3D_ES3_1:
+		case SP_OPENGL_PCES3_1:
+			return SP_OPENGL_ES3_1_ANDROID;
+		break;
+
+		default:
+			return Platform;
+		break;
+	}
+
+	return Platform;
+}
+
 /** Returns true if the feature level is supported by the shader platform. */
 inline bool IsFeatureLevelSupported(EShaderPlatform InShaderPlatform, ERHIFeatureLevel::Type InFeatureLevel)
 {
@@ -984,6 +1024,11 @@ inline bool RHISupportsDrawIndirect(const EShaderPlatform Platform)
 	return (Platform == EShaderPlatform::SP_METAL_SM5 || Platform == EShaderPlatform::SP_PCD3D_SM5 || Platform == EShaderPlatform::SP_VULKAN_SM5 || Platform == EShaderPlatform::SP_PS4);
 }
 
+inline bool RHISupportsNativeShaderLibraries(const EShaderPlatform Platform)
+{
+	return IsMetalPlatform(Platform);
+}
+
 
 // Return what the expected number of samplers will be supported by a feature level
 // Note that since the Feature Level is pretty orthogonal to the RHI/HW, this is not going to be perfect
diff --git a/Engine/Source/Runtime/RHI/Public/RHIResources.h b/Engine/Source/Runtime/RHI/Public/RHIResources.h
index bad7c2e77a0d..45578b793acc 100644
--- a/Engine/Source/Runtime/RHI/Public/RHIResources.h
+++ b/Engine/Source/Runtime/RHI/Public/RHIResources.h
@@ -144,15 +144,33 @@ private:
 //
 
 class FRHISamplerState : public FRHIResource {};
-class FRHIRasterizerState : public FRHIResource {};
-class FRHIDepthStencilState : public FRHIResource {};
-class FRHIBlendState : public FRHIResource {};
+class FRHIRasterizerState : public FRHIResource
+{
+public:
+	virtual bool GetInitializer(struct FRasterizerStateInitializerRHI& Init) { return false; }
+};
+class FRHIDepthStencilState : public FRHIResource
+{
+public:
+	virtual bool GetInitializer(struct FDepthStencilStateInitializerRHI& Init) { return false; }
+};
+class FRHIBlendState : public FRHIResource
+{
+public:
+	virtual bool GetInitializer(class FBlendStateInitializerRHI& Init) { return false; }
+};
 
 //
 // Shader bindings
 //
 
-class FRHIVertexDeclaration : public FRHIResource {};
+typedef TArray<struct FVertexElement,TFixedAllocator<MaxVertexElementCount> > FVertexDeclarationElementList;
+class FRHIVertexDeclaration : public FRHIResource
+{
+public:
+	virtual bool GetInitializer(FVertexDeclarationElementList& Init) { return false; }
+};
+
 class FRHIBoundShaderState : public FRHIResource {};
 
 //
@@ -179,7 +197,17 @@ class FRHIHullShader : public FRHIShader {};
 class FRHIDomainShader : public FRHIShader {};
 class FRHIPixelShader : public FRHIShader {};
 class FRHIGeometryShader : public FRHIShader {};
-class FRHIComputeShader : public FRHIShader {};
+class RHI_API FRHIComputeShader : public FRHIShader
+{
+public:
+	FRHIComputeShader() : Stats(nullptr) {}
+	
+	inline void SetStats(struct FPipelineStateStats* Ptr) { Stats = Ptr; }
+	void UpdateStats();
+	
+private:
+	struct FPipelineStateStats* Stats;
+};
 
 //
 // Pipeline States
@@ -1740,10 +1768,12 @@ protected:
 class FRHIShaderLibrary : public FRHIResource
 {
 public:
-	FRHIShaderLibrary(EShaderPlatform InPlatform) : Platform(InPlatform) {}
+	FRHIShaderLibrary(EShaderPlatform InPlatform, FString const& InName) : Platform(InPlatform), LibraryName(InName), LibraryId(GetTypeHash(InName)) {}
 	virtual ~FRHIShaderLibrary() {}
 	
 	FORCEINLINE EShaderPlatform GetPlatform(void) const { return Platform; }
+	FORCEINLINE FString GetName(void) const { return LibraryName; }
+	FORCEINLINE uint32 GetId(void) const { return LibraryId; }
 	
 	virtual bool IsNativeLibrary() const = 0;
 	
@@ -1777,22 +1807,38 @@ public:
 		//Access the library we are iterating through - allow query e.g. GetPlatform from iterator object
 		FRHIShaderLibrary* GetLibrary() const			 {return ShaderLibrarySource;};
 		
-	private:
+	protected:
 		//Control source object lifetime while iterator is 'active'
 		TRefCountPtr<FRHIShaderLibrary> ShaderLibrarySource;
 	};
 	
 	virtual TRefCountPtr<FShaderLibraryIterator> CreateIterator(void) = 0;
-	
+	virtual bool RequestEntry(const FSHAHash& Hash, FArchive* Ar) = 0;
+	virtual bool ContainsEntry(const FSHAHash& Hash) = 0;
 	virtual uint32 GetShaderCount(void) const = 0;
 
 protected:
 	EShaderPlatform Platform;
+	FString LibraryName;
+	uint32 LibraryId;
 };
 
 typedef FRHIShaderLibrary*				FRHIShaderLibraryParamRef;
 typedef TRefCountPtr<FRHIShaderLibrary>	FRHIShaderLibraryRef;
 
+class FRHIPipelineBinaryLibrary : public FRHIResource
+{
+public:
+	FRHIPipelineBinaryLibrary(EShaderPlatform InPlatform, FString const& FilePath) : Platform(InPlatform) {}
+	virtual ~FRHIPipelineBinaryLibrary() {}
+	
+	FORCEINLINE EShaderPlatform GetPlatform(void) const { return Platform; }
+	
+protected:
+	EShaderPlatform Platform;
+};
+typedef FRHIPipelineBinaryLibrary*				FRHIPipelineBinaryLibraryParamRef;
+typedef TRefCountPtr<FRHIPipelineBinaryLibrary>	FRHIPipelineBinaryLibraryRef;
 
 enum class ERenderTargetActions : uint8
 {
diff --git a/Engine/Source/Runtime/RenderCore/Private/RenderingThread.cpp b/Engine/Source/Runtime/RenderCore/Private/RenderingThread.cpp
index de5ded3d470b..9cd20864b360 100644
--- a/Engine/Source/Runtime/RenderCore/Private/RenderingThread.cpp
+++ b/Engine/Source/Runtime/RenderCore/Private/RenderingThread.cpp
@@ -255,6 +255,8 @@ uint32 GRenderThreadIdle[ERenderThreadIdleTypes::Num] = {0};
 uint32 GRenderThreadNumIdle[ERenderThreadIdleTypes::Num] = {0};
 /** How many cycles the renderthread used (excluding idle time). It's set once per frame in FViewport::Draw. */
 uint32 GRenderThreadTime = 0;
+/** How many cycles the rhithread used (excluding idle time). */
+uint32 GRHIThreadTime = 0;
 
 
 
diff --git a/Engine/Source/Runtime/RenderCore/Public/RenderCore.h b/Engine/Source/Runtime/RenderCore/Public/RenderCore.h
index 45133c8c0140..0602cfbbecc9 100644
--- a/Engine/Source/Runtime/RenderCore/Public/RenderCore.h
+++ b/Engine/Source/Runtime/RenderCore/Public/RenderCore.h
@@ -276,6 +276,8 @@ extern RENDERCORE_API uint32 GRenderThreadNumIdle[ERenderThreadIdleTypes::Num];
 extern RENDERCORE_API FInputLatencyTimer GInputLatencyTimer;
 /** How many cycles the renderthread used (excluding idle time). It's set once per frame in FViewport::Draw. */
 extern RENDERCORE_API uint32 GRenderThreadTime;
+/** How many cycles the rhithread used (excluding idle time). */
+extern RENDERCORE_API uint32 GRHIThreadTime;
 /** How many cycles the gamethread used (excluding idle time). It's set once per frame in FViewport::Draw. */
 extern RENDERCORE_API uint32 GGameThreadTime;
 /** How many cycles it took to swap buffers to present the frame. */
diff --git a/Engine/Source/Runtime/Renderer/Private/BasePassRendering.inl b/Engine/Source/Runtime/Renderer/Private/BasePassRendering.inl
index 84c1f1a6279c..d1ebe7f7c1f2 100644
--- a/Engine/Source/Runtime/Renderer/Private/BasePassRendering.inl
+++ b/Engine/Source/Runtime/Renderer/Private/BasePassRendering.inl
@@ -23,15 +23,15 @@ template<typename PixelParametersType> class TBasePassPixelShaderPolicyParamType
 template<typename VertexParametersType> class TBasePassVertexShaderPolicyParamType;
 
 template<typename VertexParametersType>
-inline void TBasePassVertexShaderPolicyParamType<VertexParametersType>::SetMesh(FRHICommandList& RHICmdList, const FVertexFactory* VertexFactory,const FSceneView& View,const FPrimitiveSceneProxy* Proxy, const FMeshBatch& Mesh, const FMeshBatchElement& BatchElement, const FDrawingPolicyRenderState& DrawRenderState)
+inline void TBasePassVertexShaderPolicyParamType<VertexParametersType>::SetMesh(FRHICommandList& RHICmdList, const FVertexFactory* VertexFactory, const FSceneView& View, const FPrimitiveSceneProxy* Proxy, const FMeshBatch& Mesh, const FMeshBatchElement& BatchElement, const FDrawingPolicyRenderState& DrawRenderState)
 {
 	FVertexShaderRHIParamRef VertexShaderRHI = GetVertexShader();
 	FMeshMaterialShader::SetMesh(RHICmdList, VertexShaderRHI, VertexFactory, View, Proxy, BatchElement, DrawRenderState);
 
 	const bool bHasPreviousLocalToWorldParameter = PreviousLocalToWorldParameter.IsBound();
 	const bool bHasSkipOutputVelocityParameter = SkipOutputVelocityParameter.IsBound();
-    
-    float SkipOutputVelocityValue = 1.0f;
+
+	float SkipOutputVelocityValue = 1.0f;
 	FMatrix PreviousLocalToWorldMatrix;
 
 	if (bHasPreviousLocalToWorldParameter || bHasSkipOutputVelocityParameter)
@@ -59,15 +59,15 @@ inline void TBasePassVertexShaderPolicyParamType<VertexParametersType>::SetMesh(
 		}
 	}
 
-    if (bHasPreviousLocalToWorldParameter)
-    {
-        SetShaderValue(RHICmdList, VertexShaderRHI, PreviousLocalToWorldParameter, PreviousLocalToWorldMatrix);
-    }
-    
-    if (bHasSkipOutputVelocityParameter)
-    {
-        SetShaderValue(RHICmdList, VertexShaderRHI, SkipOutputVelocityParameter, SkipOutputVelocityValue);
-    }
+	if (bHasPreviousLocalToWorldParameter)
+	{
+		SetShaderValue(RHICmdList, VertexShaderRHI, PreviousLocalToWorldParameter, PreviousLocalToWorldMatrix);
+	}
+
+	if (bHasSkipOutputVelocityParameter)
+	{
+		SetShaderValue(RHICmdList, VertexShaderRHI, SkipOutputVelocityParameter, SkipOutputVelocityValue);
+	}
 }
 
 template<typename VertexParametersType>
diff --git a/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessAmbientOcclusion.cpp b/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessAmbientOcclusion.cpp
index 0149d566d527..b7acaf4cfdaa 100644
--- a/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessAmbientOcclusion.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessAmbientOcclusion.cpp
@@ -129,7 +129,8 @@ bool FSSAOHelper::IsBasePassAmbientOcclusionRequired(const FViewInfo& View)
 bool FSSAOHelper::IsAmbientOcclusionAsyncCompute(const FViewInfo& View, uint32 AOPassCount)
 {
 	// if AsyncCompute is feasible
-	if(IsAmbientOcclusionCompute(View) && (AOPassCount > 0))
+	// only single level is allowed.  more levels end up reading from gbuffer normals atm which is not allowed.
+	if(IsAmbientOcclusionCompute(View) && (AOPassCount == 1))
 	{
 		int32 ComputeCVar = CVarAmbientOcclusionCompute.GetValueOnRenderThread();
 
diff --git a/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessDeferredDecals.cpp b/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessDeferredDecals.cpp
index de6aaf153099..53bda7fb6663 100644
--- a/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessDeferredDecals.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/CompositionLighting/PostProcessDeferredDecals.cpp
@@ -136,13 +136,6 @@ struct FDecalDepthState
 	}
 };
 
-enum EDecalRasterizerState
-{
-	DRS_Undefined,
-	DRS_CCW,
-	DRS_CW,
-};
-
 // @param RenderState 0:before BasePass, 1:before lighting, (later we could add "after lighting" and multiply)
 FBlendStateRHIParamRef GetDecalBlendState(const ERHIFeatureLevel::Type SMFeatureLevel, EDecalRenderStage InDecalRenderStage, EDecalBlendMode DecalBlendMode, bool bHasNormal)
 {
@@ -314,6 +307,25 @@ FBlendStateRHIParamRef GetDecalBlendState(const ERHIFeatureLevel::Type SMFeature
 		case DBM_Emissive:
 			return TStaticBlendState< CW_RGB, BO_Add, BF_SourceAlpha, BF_One >::GetRHI();
 
+		case DBM_AlphaComposite:
+			if (GSupportsSeparateRenderTargetBlendState)
+			{
+				return TStaticBlendState<
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One,	// Emissive
+					CW_RGB, BO_Add, BF_Zero, BF_One, BO_Add, BF_Zero, BF_One,				// Normal
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One,	// Metallic, Specular, Roughness
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One	// BaseColor
+				>::GetRHI();
+			}
+			else if (SMFeatureLevel == ERHIFeatureLevel::SM4)
+			{
+				return TStaticBlendState<
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One,	// Emissive
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One,	// Normal
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One,	// Metallic, Specular, Roughness
+					CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_Zero, BF_One	// BaseColor
+				>::GetRHI();
+			}
 		default:
 			// the decal type should not be rendered in this pass - internal error
 			check(0);
@@ -842,7 +854,7 @@ void FRCPassPostProcessDeferredDecals::Process(FRenderingCompositePassContext& C
 							const auto& Scale3d = DecalProxy.ComponentTrans.GetScale3D();
 							bReverseHanded = Scale3d[0] * Scale3d[1] * Scale3d[2] < 0.f;
 						}
-						EDecalRasterizerState DecalRasterizerState = ComputeDecalRasterizerState(bInsideDecal, bReverseHanded, View);
+						EDecalRasterizerState DecalRasterizerState = FDecalRenderingCommon::ComputeDecalRasterizerState(bInsideDecal, bReverseHanded, View.bReverseCulling);
 
 						if (LastDecalRasterizerState != DecalRasterizerState)
 						{
diff --git a/Engine/Source/Runtime/Renderer/Private/DecalRenderingShared.cpp b/Engine/Source/Runtime/Renderer/Private/DecalRenderingShared.cpp
index e96c2e4c6f6a..1f3129c4773a 100644
--- a/Engine/Source/Runtime/Renderer/Private/DecalRenderingShared.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DecalRenderingShared.cpp
@@ -27,9 +27,10 @@ static bool IsBlendModeSupported(EShaderPlatform Platform, EDecalBlendMode Decal
 	{
 		switch (DecalBlendMode)
 		{
-			case DBM_Stain:			// Modulate
-			case DBM_Emissive:		// Additive
-			case DBM_Translucent:	// Translucent
+			case DBM_Stain:			 // Modulate
+			case DBM_Emissive:		 // Additive
+			case DBM_Translucent:	 // Translucent
+			case DBM_AlphaComposite: // Premultiplied Alpha
 				break;
 			default:
 				return false;
diff --git a/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp b/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp
index 8eb6cf85d417..deab742a2eeb 100644
--- a/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp
@@ -640,18 +640,22 @@ void FDeferredShadingSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 		&& bUseGBuffer;
 
 	bool bComputeLightGrid = false;
-	if (bUseGBuffer)
+	// Simple forward shading doesn't support local lights. No need to compute light grid
+	if (!IsSimpleForwardShadingEnabled(GetFeatureLevelShaderPlatform(FeatureLevel)))
 	{
-		bComputeLightGrid = bRenderDeferredLighting;
-	}
-	else
-	{
-		bComputeLightGrid = ViewFamily.EngineShowFlags.Lighting;
-	}
+		if (bUseGBuffer)
+		{
+			bComputeLightGrid = bRenderDeferredLighting;
+		}
+		else
+		{
+			bComputeLightGrid = ViewFamily.EngineShowFlags.Lighting;
+		}
 
-	bComputeLightGrid |= (
-		ShouldRenderVolumetricFog() ||
-		ViewFamily.ViewMode != VMI_Lit);
+		bComputeLightGrid |= (
+			ShouldRenderVolumetricFog() ||
+			ViewFamily.ViewMode != VMI_Lit);
+	}
 
 	if (ClearMethodCVar)
 	{
@@ -1202,18 +1206,16 @@ void FDeferredShadingSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 			}
 		}
 
-		RenderDynamicSkyLighting(RHICmdList, VelocityRT, DynamicBentNormalAO);
-		ServiceLocalQueue();
+		// Render diffuse sky lighting and reflections that only operate on opaque pixels
+		RenderDeferredReflectionsAndSkyLighting(RHICmdList, DynamicBentNormalAO, VelocityRT);
+
+		DynamicBentNormalAO = NULL;
 
 		// SSS need the SceneColor finalized as an SRV.
 		ResolveSceneColor(RHICmdList);
 
-		// Render reflections that only operate on opaque pixels
-		RenderDeferredReflections(RHICmdList, DynamicBentNormalAO, VelocityRT);
 		ServiceLocalQueue();
 
-		DynamicBentNormalAO = NULL;
-
 		// Post-lighting composition lighting stage
 		// e.g. ScreenSpaceSubsurfaceScattering
 		for(int32 ViewIndex = 0; ViewIndex < Views.Num(); ++ViewIndex)
@@ -1331,13 +1333,13 @@ void FDeferredShadingSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 		RendererModule.RenderOverlayExtensions(View, RHICmdList, SceneContext);
 	}
 
-	if (ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO || ViewFamily.EngineShowFlags.VisualizeDistanceFieldGI)
+	if (ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO)
 	{
 		// Use the skylight's max distance if there is one, to be consistent with DFAO shadowing on the skylight
 		const float OcclusionMaxDistance = Scene->SkyLight && !Scene->SkyLight->bWantsStaticShadowing ? Scene->SkyLight->OcclusionMaxDistance : Scene->DefaultMaxDistanceFieldOcclusionDistance;
 		TRefCountPtr<IPooledRenderTarget> DummyOutput;
 		RHICmdList.SetCurrentStat(GET_STATID(STAT_CLM_RenderDistanceFieldLighting));
-		RenderDistanceFieldLighting(RHICmdList, FDistanceFieldAOParameters(OcclusionMaxDistance), VelocityRT, DummyOutput, DummyOutput, false, ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO, ViewFamily.EngineShowFlags.VisualizeDistanceFieldGI); 
+		RenderDistanceFieldLighting(RHICmdList, FDistanceFieldAOParameters(OcclusionMaxDistance), VelocityRT, DummyOutput, false, ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO); 
 		ServiceLocalQueue();
 	}
 
diff --git a/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h b/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h
index 2ad6a4faae66..d1470a5c0c48 100644
--- a/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h
+++ b/Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h
@@ -195,11 +195,8 @@ private:
 	/** Renders the scene's atmosphere. */
 	void RenderAtmosphere(FRHICommandListImmediate& RHICmdList, const FLightShaftsOutput& LightShaftsOutput);
 
-	/** Renders reflections that can be done in a deferred pass. */
-	void RenderDeferredReflections(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT);
-
-	/** Render dynamic sky lighting from Movable sky lights. */
-	void RenderDynamicSkyLighting(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& VelocityTexture, TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO);
+	/** Renders sky lighting and reflections that can be done in a deferred pass. */
+	void RenderDeferredReflectionsAndSkyLighting(FRHICommandListImmediate& RHICmdList, TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT);
 
 	/** Computes DFAO, modulates it to scene color (which is assumed to contain diffuse indirect lighting), and stores the output bent normal for use occluding specular. */
 	void RenderDFAOAsIndirectShadowing(
@@ -212,22 +209,18 @@ private:
 		FRHICommandListImmediate& RHICmdList, 
 		const class FDistanceFieldAOParameters& Parameters, 
 		const TRefCountPtr<IPooledRenderTarget>& VelocityTexture,
-		TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO, 
-		TRefCountPtr<IPooledRenderTarget>& OutDynamicIrradiance,
+		TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO,
 		bool bModulateToSceneColor,
-		bool bVisualizeAmbientOcclusion,
-		bool bVisualizeGlobalIllumination);
+		bool bVisualizeAmbientOcclusion);
 
 	/** Render Ambient Occlusion using mesh distance fields on a screen based grid. */
 	void RenderDistanceFieldAOScreenGrid(
 		FRHICommandListImmediate& RHICmdList, 
 		const FViewInfo& View,
-		FIntPoint TileListGroupSize,
 		const FDistanceFieldAOParameters& Parameters, 
 		const TRefCountPtr<IPooledRenderTarget>& VelocityTexture,
 		const TRefCountPtr<IPooledRenderTarget>& DistanceFieldNormal, 
-		TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO, 
-		TRefCountPtr<IPooledRenderTarget>& OutDynamicIrradiance);
+		TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO);
 
 	void RenderMeshDistanceFieldVisualization(FRHICommandListImmediate& RHICmdList, const FDistanceFieldAOParameters& Parameters);
 
@@ -433,12 +426,6 @@ private:
 
 	void VisualizeVolumetricLightmap(FRHICommandListImmediate& RHICmdList);
 
-	/** Output SpecularColor * IndirectDiffuseGI for metals so they are not black in reflections */
-	void RenderReflectionCaptureSpecularBounceForAllViews(FRHICommandListImmediate& RHICmdList);
-
-	/** Render image based reflections (SSR, Env, SkyLight) with compute shaders */
-	void RenderTiledDeferredImageBasedReflections(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT);
-
 	/** Render image based reflections (SSR, Env, SkyLight) without compute shaders */
 	void RenderStandardDeferredImageBasedReflections(FRHICommandListImmediate& RHICmdList, FGraphicsPipelineStateInitializer& GraphicsPSOInit, bool bReflectionEnv, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT);
 
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.cpp
index ad76ee86c9c4..e8a868f9ae55 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.cpp
@@ -14,7 +14,6 @@
 #include "OneColorShader.h"
 #include "GlobalDistanceField.h"
 #include "FXSystem.h"
-#include "PostProcess/PostProcessSubsurface.h"
 #include "DistanceFieldGlobalIllumination.h"
 #include "RendererModule.h"
 #include "PipelineStateCache.h"
@@ -27,6 +26,15 @@ FAutoConsoleVariableRef CVarDistanceFieldAO(
 	ECVF_Scalability | ECVF_RenderThreadSafe
 	);
 
+int32 GDistanceFieldAOQuality = 2;
+FAutoConsoleVariableRef CVarDistanceFieldAOQuality(
+	TEXT("r.AOQuality"),
+	GDistanceFieldAOQuality,
+	TEXT("Defines the distance field AO method which allows to adjust for quality or performance.\n")
+	TEXT(" 0:off, 1:medium, 2:high (default)"),
+	ECVF_Scalability | ECVF_RenderThreadSafe
+);
+
 int32 GDistanceFieldAOApplyToStaticIndirect = 0;
 FAutoConsoleVariableRef CVarDistanceFieldAOApplyToStaticIndirect(
 	TEXT("r.AOApplyToStaticIndirect"),
@@ -99,6 +107,25 @@ FAutoConsoleVariableRef CVarAOJitterConeDirections(
 	ECVF_RenderThreadSafe
 	);
 
+int32 GAOObjectDistanceField = 1;
+FAutoConsoleVariableRef CVarAOObjectDistanceField(
+	TEXT("r.AOObjectDistanceField"),
+	GAOObjectDistanceField,
+	TEXT("Determines whether object distance fields are used to compute ambient occlusion.\n")
+	TEXT("Only global distance field will be used when this option is disabled.\n"),
+	ECVF_RenderThreadSafe
+);
+
+bool UseDistanceFieldAO()
+{
+	return GDistanceFieldAO && GDistanceFieldAOQuality >= 1;
+}
+
+bool UseAOObjectDistanceField()
+{
+	return GAOObjectDistanceField && GDistanceFieldAOQuality >= 2;
+}
+
 TGlobalResource<FTemporaryIrradianceCacheResources> GTemporaryIrradianceCacheResources;
 
 int32 GDistanceFieldAOTileSizeX = 16;
@@ -108,8 +135,6 @@ DEFINE_LOG_CATEGORY(LogDistanceField);
 
 IMPLEMENT_UNIFORM_BUFFER_STRUCT(FAOSampleData2,TEXT("AOSamples2"));
 
-DECLARE_GPU_STAT(SkyLightDiffuse);
-
 FDistanceFieldAOParameters::FDistanceFieldAOParameters(float InOcclusionMaxDistance, float InContrast)
 {
 	Contrast = FMath::Clamp(InContrast, .01f, 2.0f);
@@ -678,7 +703,7 @@ void ListDistanceFieldLightingMemory(const FViewInfo& View, FSceneRenderer& Scen
 
 bool SupportsDistanceFieldAO(ERHIFeatureLevel::Type FeatureLevel, EShaderPlatform ShaderPlatform)
 {
-	return GDistanceFieldAO 
+	return GDistanceFieldAO && GDistanceFieldAOQuality > 0
 		// Pre-GCN AMD cards have a driver bug that prevents the global distance field from being generated correctly
 		// Better to disable entirely than to display garbage
 		&& !GRHIDeviceIsAMDPreGCNArchitecture
@@ -757,7 +782,7 @@ void FDeferredShadingSceneRenderer::RenderDFAOAsIndirectShadowing(
 		// Use the skylight's max distance if there is one, to be consistent with DFAO shadowing on the skylight
 		const float OcclusionMaxDistance = Scene->SkyLight && !Scene->SkyLight->bWantsStaticShadowing ? Scene->SkyLight->OcclusionMaxDistance : Scene->DefaultMaxDistanceFieldOcclusionDistance;
 		TRefCountPtr<IPooledRenderTarget> DummyOutput;
-		RenderDistanceFieldLighting(RHICmdList, FDistanceFieldAOParameters(OcclusionMaxDistance), VelocityTexture, DynamicBentNormalAO, DummyOutput, true, false, false);
+		RenderDistanceFieldLighting(RHICmdList, FDistanceFieldAOParameters(OcclusionMaxDistance), VelocityTexture, DynamicBentNormalAO, true, false);
 	}
 }
 
@@ -765,11 +790,9 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 	FRHICommandListImmediate& RHICmdList, 
 	const FDistanceFieldAOParameters& Parameters, 
 	const TRefCountPtr<IPooledRenderTarget>& VelocityTexture,
-	TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO, 
-	TRefCountPtr<IPooledRenderTarget>& OutDynamicIrradiance,
+	TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO,
 	bool bModulateToSceneColor,
-	bool bVisualizeAmbientOcclusion,
-	bool bVisualizeGlobalIllumination)
+	bool bVisualizeAmbientOcclusion)
 {
 	SCOPED_DRAW_EVENT(RHICmdList, RenderDistanceFieldLighting);
 
@@ -788,7 +811,6 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 		if (GDistanceFieldVolumeTextureAtlas.VolumeTextureRHI && Scene->DistanceFieldSceneData.NumObjectsInBuffer)
 		{
 			check(!Scene->DistanceFieldSceneData.HasPendingOperations());
-			const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View);
 
 			SCOPED_DRAW_EVENT(RHICmdList, DistanceFieldLighting);
 
@@ -806,7 +828,10 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 				GDistanceFieldVolumeTextureAtlas.ListMeshDistanceFields();
 			}
 
-			CullObjectsToView(RHICmdList, Scene, View, Parameters, GAOCulledObjectBuffers);
+			if (UseAOObjectDistanceField())
+			{
+				CullObjectsToView(RHICmdList, Scene, View, Parameters, GAOCulledObjectBuffers);
+			}
 
 			TRefCountPtr<IPooledRenderTarget> DistanceFieldNormal;
 
@@ -820,35 +845,24 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 			ComputeDistanceFieldNormal(RHICmdList, Views, DistanceFieldNormal->GetRenderTargetItem(), Parameters);
 
 			// Intersect objects with screen tiles, build lists
-			FIntPoint TileListGroupSize = BuildTileObjectLists(RHICmdList, Scene, Views, DistanceFieldNormal->GetRenderTargetItem(), Parameters);
+			if (UseAOObjectDistanceField())
+			{
+				BuildTileObjectLists(RHICmdList, Scene, Views, DistanceFieldNormal->GetRenderTargetItem(), Parameters);
+			}
 
 			GRenderTargetPool.VisualizeTexture.SetCheckPoint(RHICmdList, DistanceFieldNormal);
 
-			if (bUseDistanceFieldGI)
-			{
-				extern void UpdateVPLs(
-					FRHICommandListImmediate& RHICmdList,
-					const FViewInfo& View,
-					const FScene* Scene,
-					const FDistanceFieldAOParameters& Parameters);
-
-				UpdateVPLs(RHICmdList, View, Scene, Parameters);
-			}
-
 			TRefCountPtr<IPooledRenderTarget> BentNormalOutput;
-			TRefCountPtr<IPooledRenderTarget> IrradianceOutput;
 
 			RenderDistanceFieldAOScreenGrid(
 				RHICmdList, 
 				View,
-				TileListGroupSize,
 				Parameters, 
 				VelocityTexture,
 				DistanceFieldNormal, 
-				BentNormalOutput, 
-				IrradianceOutput);
+				BentNormalOutput);
 
-			if ( IsTransientResourceBufferAliasingEnabled() )
+			if (IsTransientResourceBufferAliasingEnabled() && UseAOObjectDistanceField())
 			{
 				GAOCulledObjectBuffers.Buffers.DiscardTransientResource();
 
@@ -860,59 +874,26 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 
 			GRenderTargetPool.VisualizeTexture.SetCheckPoint(RHICmdList, BentNormalOutput);
 
-			if (bVisualizeAmbientOcclusion || bVisualizeGlobalIllumination)
+			if (bVisualizeAmbientOcclusion)
 			{
 				SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilNop);
 			}
 			else
 			{
-				FPooledRenderTargetDesc Desc = SceneContext.GetSceneColor()->GetDesc();
-				Desc.Flags &= ~(TexCreate_FastVRAM | TexCreate_Transient);
-				// Make sure we get a signed format
-				Desc.Format = PF_FloatRGBA;
-				GRenderTargetPool.FindFreeElement(RHICmdList, Desc, OutDynamicBentNormalAO, TEXT("DynamicBentNormalAO"));
-
-				if (bUseDistanceFieldGI)
-				{
-					Desc.Format = PF_FloatRGB;
-					GRenderTargetPool.FindFreeElement(RHICmdList, Desc, OutDynamicIrradiance, TEXT("DynamicIrradiance"));
-				}
-
-				FTextureRHIParamRef RenderTargets[3] =
-				{
-					OutDynamicBentNormalAO->GetRenderTargetItem().TargetableTexture,
-					NULL,
-					NULL
-				};
-
-				int32 NumRenderTargets = 1;
-
-				if (bModulateToSceneColor)
-				{
-					RenderTargets[NumRenderTargets] = SceneContext.GetSceneColorSurface();
-					NumRenderTargets++;
-				}
-
-				if (bUseDistanceFieldGI)
-				{
-					RenderTargets[NumRenderTargets] = OutDynamicIrradiance->GetRenderTargetItem().TargetableTexture;
-					NumRenderTargets++;
-				}
-
-				SetRenderTargets(RHICmdList, NumRenderTargets, RenderTargets, SceneContext.GetSceneDepthSurface(), ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilNop);
+				SetRenderTarget(RHICmdList, SceneContext.GetSceneColorSurface(), SceneContext.GetSceneDepthSurface(), ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilNop);
 			}
 
-			// Upsample to full resolution, write to output
-			UpsampleBentNormalAO(RHICmdList, Views, BentNormalOutput, IrradianceOutput, bModulateToSceneColor, bVisualizeAmbientOcclusion, bVisualizeGlobalIllumination);
+			// Upsample to full resolution, write to output in case of debug AO visualization or scene color modulation (standard upsampling is done later together with sky lighting and reflection environment)
+			if (bModulateToSceneColor || bVisualizeAmbientOcclusion)
+			{
+				UpsampleBentNormalAO(RHICmdList, Views, BentNormalOutput, bModulateToSceneColor && !bVisualizeAmbientOcclusion);
+			}
 
-			if (!bVisualizeAmbientOcclusion && !bVisualizeGlobalIllumination)
+			OutDynamicBentNormalAO = BentNormalOutput;
+
+			if (!bVisualizeAmbientOcclusion)
 			{
 				RHICmdList.CopyToResolveTarget(OutDynamicBentNormalAO->GetRenderTargetItem().TargetableTexture, OutDynamicBentNormalAO->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-			
-				if (bUseDistanceFieldGI)
-				{
-					RHICmdList.CopyToResolveTarget(OutDynamicIrradiance->GetRenderTargetItem().TargetableTexture, OutDynamicIrradiance->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-				}
 			}
 
 			return true;
@@ -922,111 +903,6 @@ bool FDeferredShadingSceneRenderer::RenderDistanceFieldLighting(
 	return false;
 }
 
-template<bool bApplyShadowing, bool bSupportIrradiance>
-class TDynamicSkyLightDiffusePS : public FGlobalShader
-{
-	DECLARE_SHADER_TYPE(TDynamicSkyLightDiffusePS, Global);
-public:
-
-	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
-	{
-		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM4);
-	}
-
-	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
-	{
-		FGlobalShader::ModifyCompilationEnvironment(Parameters,OutEnvironment);
-		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
-		OutEnvironment.SetDefine(TEXT("APPLY_SHADOWING"), bApplyShadowing);
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), bSupportIrradiance);
-	}
-
-	/** Default constructor. */
-	TDynamicSkyLightDiffusePS() {}
-
-	/** Initialization constructor. */
-	TDynamicSkyLightDiffusePS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
-		: FGlobalShader(Initializer)
-	{
-		SceneTextureParameters.Bind(Initializer);
-		DynamicBentNormalAOTexture.Bind(Initializer.ParameterMap, TEXT("BentNormalAOTexture"));
-		DynamicBentNormalAOSampler.Bind(Initializer.ParameterMap, TEXT("BentNormalAOSampler"));
-		DynamicIrradianceTexture.Bind(Initializer.ParameterMap, TEXT("IrradianceTexture"));
-		DynamicIrradianceSampler.Bind(Initializer.ParameterMap, TEXT("IrradianceSampler"));
-		ContrastAndNormalizeMulAdd.Bind(Initializer.ParameterMap, TEXT("ContrastAndNormalizeMulAdd"));
-		OcclusionExponent.Bind(Initializer.ParameterMap, TEXT("OcclusionExponent"));
-		OcclusionTintAndMinOcclusion.Bind(Initializer.ParameterMap, TEXT("OcclusionTintAndMinOcclusion"));
-		OcclusionCombineMode.Bind(Initializer.ParameterMap, TEXT("OcclusionCombineMode"));
-	}
-
-	void SetParameters(FRHICommandList& RHICmdList, const FSceneView& View, FTextureRHIParamRef DynamicBentNormalAO, IPooledRenderTarget* DynamicIrradiance, const FDistanceFieldAOParameters& Parameters, const FSkyLightSceneProxy* SkyLight)
-	{
-		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
-		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
-		SceneTextureParameters.Set(RHICmdList, ShaderRHI, View.FeatureLevel, ESceneTextureSetupMode::All);
-
-		SetTextureParameter(RHICmdList, ShaderRHI, DynamicBentNormalAOTexture, DynamicBentNormalAOSampler, TStaticSamplerState<SF_Point>::GetRHI(), DynamicBentNormalAO);
-
-		if (DynamicIrradianceTexture.IsBound())
-		{
-			SetTextureParameter(RHICmdList, ShaderRHI, DynamicIrradianceTexture, DynamicIrradianceSampler, TStaticSamplerState<SF_Point>::GetRHI(), DynamicIrradiance->GetRenderTargetItem().ShaderResourceTexture);
-		}
-
-		// Scale and bias to remap the contrast curve to [0,1]
-		const float Min = 1 / (1 + FMath::Exp(-Parameters.Contrast * (0 * 10 - 5)));
-		const float Max = 1 / (1 + FMath::Exp(-Parameters.Contrast * (1 * 10 - 5)));
-		const float Mul = 1.0f / (Max - Min);
-		const float Add = -Min / (Max - Min);
-
-		SetShaderValue(RHICmdList, ShaderRHI, ContrastAndNormalizeMulAdd, FVector(Parameters.Contrast, Mul, Add));
-
-		SetShaderValue(RHICmdList, ShaderRHI, OcclusionExponent, SkyLight->OcclusionExponent);
-
-		FVector4 OcclusionTintAndMinOcclusionValue = FVector4(SkyLight->OcclusionTint);
-		OcclusionTintAndMinOcclusionValue.W = SkyLight->MinOcclusion;
-		SetShaderValue(RHICmdList, ShaderRHI, OcclusionTintAndMinOcclusion, OcclusionTintAndMinOcclusionValue);
-
-		SetShaderValue(RHICmdList, ShaderRHI, OcclusionCombineMode, SkyLight->OcclusionCombineMode == OCM_Minimum ? 0.0f : 1.0f);
-	}
-
-	// FShader interface.
-	virtual bool Serialize(FArchive& Ar) override
-	{
-		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
-		Ar << SceneTextureParameters;
-		Ar << DynamicBentNormalAOTexture;
-		Ar << DynamicBentNormalAOSampler;
-		Ar << DynamicIrradianceTexture;
-		Ar << DynamicIrradianceSampler;
-		Ar << ContrastAndNormalizeMulAdd;
-		Ar << OcclusionExponent;
-		Ar << OcclusionTintAndMinOcclusion;
-		Ar << OcclusionCombineMode;
-		return bShaderHasOutdatedParameters;
-	}
-
-private:
-
-	FSceneTextureShaderParameters SceneTextureParameters;
-	FShaderResourceParameter DynamicBentNormalAOTexture;
-	FShaderResourceParameter DynamicBentNormalAOSampler;
-	FShaderResourceParameter DynamicIrradianceTexture;
-	FShaderResourceParameter DynamicIrradianceSampler;
-	FShaderParameter ContrastAndNormalizeMulAdd;
-	FShaderParameter OcclusionExponent;
-	FShaderParameter OcclusionTintAndMinOcclusion;
-	FShaderParameter OcclusionCombineMode;
-};
-
-#define IMPLEMENT_SKYLIGHT_PS_TYPE(bApplyShadowing, bSupportIrradiance) \
-	typedef TDynamicSkyLightDiffusePS<bApplyShadowing, bSupportIrradiance> TDynamicSkyLightDiffusePS##bApplyShadowing##bSupportIrradiance; \
-	IMPLEMENT_SHADER_TYPE(template<>,TDynamicSkyLightDiffusePS##bApplyShadowing##bSupportIrradiance,TEXT("/Engine/Private/SkyLighting.usf"),TEXT("SkyLightDiffusePS"),SF_Pixel);
-
-IMPLEMENT_SKYLIGHT_PS_TYPE(true, true)
-IMPLEMENT_SKYLIGHT_PS_TYPE(false, true)
-IMPLEMENT_SKYLIGHT_PS_TYPE(true, false)
-IMPLEMENT_SKYLIGHT_PS_TYPE(false, false)
-
 bool FDeferredShadingSceneRenderer::ShouldRenderDistanceFieldAO() const
 {
 	return ViewFamily.EngineShowFlags.DistanceFieldAO 
@@ -1035,117 +911,3 @@ bool FDeferredShadingSceneRenderer::ShouldRenderDistanceFieldAO() const
 		&& !ViewFamily.EngineShowFlags.VisualizeMeshDistanceFields
 		&& !ViewFamily.EngineShowFlags.VisualizeGlobalDistanceField;
 }
-
-void FDeferredShadingSceneRenderer::RenderDynamicSkyLighting(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& VelocityTexture, TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO)
-{
-	if (ShouldRenderDeferredDynamicSkyLight(Scene, ViewFamily))
-	{
-		SCOPED_DRAW_EVENT(RHICmdList, SkyLightDiffuse);
-		SCOPED_GPU_STAT(RHICmdList, SkyLightDiffuse);
-
-		bool bApplyShadowing = false;
-
-		FDistanceFieldAOParameters Parameters(Scene->SkyLight->OcclusionMaxDistance, Scene->SkyLight->Contrast);
-		TRefCountPtr<IPooledRenderTarget> DynamicIrradiance;
-
-		if (Scene->SkyLight->bCastShadows 
-			&& !GDistanceFieldAOApplyToStaticIndirect
-			&& ShouldRenderDistanceFieldAO() 
-			&& ViewFamily.EngineShowFlags.AmbientOcclusion)
-		{
-			bApplyShadowing = RenderDistanceFieldLighting(RHICmdList, Parameters, VelocityTexture, DynamicBentNormalAO, DynamicIrradiance, false, false, false);
-		}
-
-		FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
-
-		SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilRead);
-
-		FGraphicsPipelineStateInitializer GraphicsPSOInit;
-		RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
-
-		for( int32 ViewIndex = 0; ViewIndex < Views.Num(); ViewIndex++ )
-		{
-			const FViewInfo& View = Views[ViewIndex];
-
-			RHICmdList.SetViewport(View.ViewRect.Min.X, View.ViewRect.Min.Y, 0.0f, View.ViewRect.Max.X, View.ViewRect.Max.Y, 1.0f);
-			GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
-			GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
-
-			if (GAOOverwriteSceneColor)
-			{
-				GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
-			}
-			else
-			{
-				const bool bCheckerboardSubsurfaceRendering = FRCPassPostProcessSubsurface::RequiresCheckerboardSubsurfaceRendering(SceneContext.GetSceneColorFormat());
-				if (bCheckerboardSubsurfaceRendering)
-				{
-					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_One, BF_One>::GetRHI();
-				}
-				else
-				{
-					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGBA, BO_Add, BF_One, BF_One, BO_Add, BF_One, BF_One>::GetRHI();
-				}
-			}
-
-			const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View) && IsValidRef(DynamicIrradiance);
-			TShaderMapRef< FPostProcessVS > VertexShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.PrimitiveType = PT_TriangleList;
-
-			if (bApplyShadowing)
-			{
-				if (bUseDistanceFieldGI)
-				{
-					TShaderMapRef<TDynamicSkyLightDiffusePS<true, true> > PixelShader(View.ShaderMap);
-
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-
-					PixelShader->SetParameters(RHICmdList, View, DynamicBentNormalAO->GetRenderTargetItem().ShaderResourceTexture, DynamicIrradiance, Parameters, Scene->SkyLight);
-				}
-				else
-				{
-					TShaderMapRef<TDynamicSkyLightDiffusePS<true, false> > PixelShader(View.ShaderMap);
-
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-
-					PixelShader->SetParameters(RHICmdList, View, DynamicBentNormalAO->GetRenderTargetItem().ShaderResourceTexture, DynamicIrradiance, Parameters, Scene->SkyLight);
-				}
-			}
-			else
-			{
-				if (bUseDistanceFieldGI)
-				{
-					TShaderMapRef<TDynamicSkyLightDiffusePS<false, true> > PixelShader(View.ShaderMap);
-
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-
-					PixelShader->SetParameters(RHICmdList, View, GWhiteTexture->TextureRHI, NULL, Parameters, Scene->SkyLight);
-				}
-				else
-				{
-					TShaderMapRef<TDynamicSkyLightDiffusePS<false, false> > PixelShader(View.ShaderMap);
-
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-
-					PixelShader->SetParameters(RHICmdList, View, GWhiteTexture->TextureRHI, NULL, Parameters, Scene->SkyLight);
-				}
-			}
-
-			DrawRectangle( 
-				RHICmdList,
-				0, 0, 
-				View.ViewRect.Width(), View.ViewRect.Height(),
-				View.ViewRect.Min.X, View.ViewRect.Min.Y, 
-				View.ViewRect.Width(), View.ViewRect.Height(),
-				FIntPoint(View.ViewRect.Width(), View.ViewRect.Height()),
-				SceneContext.GetBufferSizeXY(),
-				*VertexShader);
-		}
-	}
-}
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.h b/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.h
index a748e3a9b0e8..d2f2d04ee1ac 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.h
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldAmbientOcclusion.h
@@ -334,6 +334,44 @@ private:
 	FShaderParameter AOGlobalMaxOcclusionDistance;
 };
 
+class FDFAOUpsampleParameters
+{
+public:
+	void Bind(const FShaderParameterMap& ParameterMap)
+	{
+		BentNormalAOTexture.Bind(ParameterMap, TEXT("BentNormalAOTexture"));
+		BentNormalAOSampler.Bind(ParameterMap, TEXT("BentNormalAOSampler"));
+		AOBufferBilinearUVMax.Bind(ParameterMap, TEXT("AOBufferBilinearUVMax"));
+	}
+
+	void Set(FRHICommandList& RHICmdList, const FPixelShaderRHIParamRef& ShaderRHI, const FViewInfo& View, const TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal)
+	{
+		FTextureRHIParamRef BentNormalAO = DistanceFieldAOBentNormal ? DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture : GWhiteTexture->TextureRHI;
+		SetTextureParameter(RHICmdList, ShaderRHI, BentNormalAOTexture, BentNormalAOSampler, TStaticSamplerState<SF_Bilinear>::GetRHI(), BentNormalAO);
+
+		FIntPoint const AOBufferSize = GetBufferSizeForAO();
+		FVector2D const UVMax(
+			(View.ViewRect.Width() / GAODownsampleFactor - 0.51f) / AOBufferSize.X, // 0.51 - so bilateral gather4 won't sample invalid texels
+			(View.ViewRect.Height() / GAODownsampleFactor - 0.51f) / AOBufferSize.Y);
+		SetShaderValue(RHICmdList, ShaderRHI, AOBufferBilinearUVMax, UVMax);
+	}
+
+	/** Serializer. */
+	friend FArchive& operator<<(FArchive& Ar, FDFAOUpsampleParameters& P)
+	{
+		Ar << P.BentNormalAOTexture;
+		Ar << P.BentNormalAOSampler;
+		Ar << P.AOBufferBilinearUVMax;
+
+		return Ar;
+	}
+
+private:
+	FShaderResourceParameter BentNormalAOTexture;
+	FShaderResourceParameter BentNormalAOSampler;
+	FShaderParameter AOBufferBilinearUVMax;
+};
+
 inline float GetMaxAOViewDistance()
 {
 	extern float GAOMaxViewDistance;
@@ -484,4 +522,5 @@ extern void TrackGPUProgress(FRHICommandListImmediate& RHICmdList, uint32 DebugI
 extern bool ShouldRenderDeferredDynamicSkyLight(const FScene* Scene, const FSceneViewFamily& ViewFamily);
 
 extern void CullObjectsToView(FRHICommandListImmediate& RHICmdList, FScene* Scene, const FViewInfo& View, const FDistanceFieldAOParameters& Parameters, FDistanceFieldObjectBufferResource& CulledObjectBuffers);
-extern FIntPoint BuildTileObjectLists(FRHICommandListImmediate& RHICmdList, FScene* Scene, TArray<FViewInfo>& Views, FSceneRenderTargetItem& DistanceFieldNormal, const FDistanceFieldAOParameters& Parameters);
+extern void BuildTileObjectLists(FRHICommandListImmediate& RHICmdList, FScene* Scene, TArray<FViewInfo>& Views, FSceneRenderTargetItem& DistanceFieldNormal, const FDistanceFieldAOParameters& Parameters);
+extern FIntPoint GetTileListGroupSizeForView(const FViewInfo& View);
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.cpp
index 10d1e2478829..b37173ee84fa 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.cpp
@@ -44,15 +44,6 @@ FAutoConsoleVariableRef CVarAOHistoryWeight(
 	ECVF_RenderThreadSafe
 	);
 
-float GAOHistoryMinConfidenceScale = .8f;
-FAutoConsoleVariableRef CVarAOHistoryMinConfidenceScale(
-	TEXT("r.AOHistoryMinConfidenceScale"),
-	GAOHistoryMinConfidenceScale,
-	TEXT("Minimum amount that confidence can scale down the history weight. Pixels whose AO value was interpolated from foreground onto background incorrectly have a confidence of 0.\n")
-	TEXT("At a value of 1, confidence is effectively disabled.  Lower values increase the convergence speed of AO history for pixels with low confidence, but introduce jittering (history is thrown away)."),
-	ECVF_RenderThreadSafe
-	);
-
 float GAOHistoryDistanceThreshold = 30;
 FAutoConsoleVariableRef CVarAOHistoryDistanceThreshold(
 	TEXT("r.AOHistoryDistanceThreshold"),
@@ -69,10 +60,107 @@ FAutoConsoleVariableRef CVarAOViewFadeDistanceScale(
 	ECVF_RenderThreadSafe
 	);
 
-template<bool bSupportIrradiance>
-class TUpdateHistoryDepthRejectionPS : public FGlobalShader
+bool UseAOHistoryStabilityPass()
 {
-	DECLARE_SHADER_TYPE(TUpdateHistoryDepthRejectionPS, Global);
+	extern int32 GDistanceFieldAOQuality;
+	return GAOHistoryStabilityPass && GDistanceFieldAOQuality >= 2;
+}
+
+class FGeometryAwareUpsampleParameters
+{
+public:
+	void Bind(const FShaderParameterMap& ParameterMap)
+	{
+		DistanceFieldNormalTexture.Bind(ParameterMap, TEXT("DistanceFieldNormalTexture"));
+		DistanceFieldNormalSampler.Bind(ParameterMap, TEXT("DistanceFieldNormalSampler"));
+		BentNormalAOTexture.Bind(ParameterMap, TEXT("BentNormalAOTexture"));
+		BentNormalAOSampler.Bind(ParameterMap, TEXT("BentNormalAOSampler"));
+		DistanceFieldGBufferTexelSize.Bind(ParameterMap, TEXT("DistanceFieldGBufferTexelSize"));
+		DistanceFieldGBufferJitterOffset.Bind(ParameterMap, TEXT("DistanceFieldGBufferJitterOffset"));
+		BentNormalBufferAndTexelSize.Bind(ParameterMap, TEXT("BentNormalBufferAndTexelSize"));
+		MinDownsampleFactorToBaseLevel.Bind(ParameterMap, TEXT("MinDownsampleFactorToBaseLevel"));
+		DistanceFadeScale.Bind(ParameterMap, TEXT("DistanceFadeScale"));
+		JitterOffset.Bind(ParameterMap, TEXT("JitterOffset"));
+	}
+
+	void Set(FRHICommandList& RHICmdList, const FPixelShaderRHIParamRef& ShaderRHI, const FViewInfo& View, FSceneRenderTargetItem& DistanceFieldNormal, FSceneRenderTargetItem& DistanceFieldAOBentNormal)
+	{
+		SetTextureParameter(
+			RHICmdList,
+			ShaderRHI,
+			DistanceFieldNormalTexture,
+			DistanceFieldNormalSampler,
+			TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(),
+			DistanceFieldNormal.ShaderResourceTexture
+		);
+
+		SetTextureParameter(
+			RHICmdList,
+			ShaderRHI,
+			BentNormalAOTexture,
+			BentNormalAOSampler,
+			TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(),
+			DistanceFieldAOBentNormal.ShaderResourceTexture
+		);
+
+		extern FVector2D GetJitterOffset(int32 SampleIndex);
+		FVector2D const JitterOffsetValue = GetJitterOffset(View.ViewState->GetDistanceFieldTemporalSampleIndex());
+
+		const FIntPoint DownsampledBufferSize = GetBufferSizeForAO();
+		const FVector2D BaseLevelTexelSizeValue(1.0f / DownsampledBufferSize.X, 1.0f / DownsampledBufferSize.Y);
+		SetShaderValue(RHICmdList, ShaderRHI, DistanceFieldGBufferTexelSize, BaseLevelTexelSizeValue);
+
+		SetShaderValue(RHICmdList, ShaderRHI, DistanceFieldGBufferJitterOffset, BaseLevelTexelSizeValue * JitterOffsetValue);
+
+		extern FIntPoint GetBufferSizeForConeTracing();
+		const FIntPoint ConeTracingBufferSize = GetBufferSizeForConeTracing();
+		const FVector4 BentNormalBufferAndTexelSizeValue(ConeTracingBufferSize.X, ConeTracingBufferSize.Y, 1.0f / ConeTracingBufferSize.X, 1.0f / ConeTracingBufferSize.Y);
+		SetShaderValue(RHICmdList, ShaderRHI, BentNormalBufferAndTexelSize, BentNormalBufferAndTexelSizeValue);
+
+		extern int32 GConeTraceDownsampleFactor;
+		const float MinDownsampleFactor = GConeTraceDownsampleFactor;
+		SetShaderValue(RHICmdList, ShaderRHI, MinDownsampleFactorToBaseLevel, MinDownsampleFactor);
+
+		extern float GAOViewFadeDistanceScale;
+		const float DistanceFadeScaleValue = 1.0f / ((1.0f - GAOViewFadeDistanceScale) * GetMaxAOViewDistance());
+		SetShaderValue(RHICmdList, ShaderRHI, DistanceFadeScale, DistanceFadeScaleValue);
+
+
+		SetShaderValue(RHICmdList, ShaderRHI, JitterOffset, JitterOffsetValue);
+	}
+
+	/** Serializer. */
+	friend FArchive& operator<<(FArchive& Ar, FGeometryAwareUpsampleParameters& P)
+	{
+		Ar << P.DistanceFieldNormalTexture;
+		Ar << P.DistanceFieldNormalSampler;
+		Ar << P.BentNormalAOTexture;
+		Ar << P.BentNormalAOSampler;
+		Ar << P.DistanceFieldGBufferTexelSize;
+		Ar << P.DistanceFieldGBufferJitterOffset;
+		Ar << P.BentNormalBufferAndTexelSize;
+		Ar << P.MinDownsampleFactorToBaseLevel;
+		Ar << P.DistanceFadeScale;
+		Ar << P.JitterOffset;
+		return Ar;
+	}
+
+private:
+	FShaderResourceParameter DistanceFieldNormalTexture;
+	FShaderResourceParameter DistanceFieldNormalSampler;
+	FShaderResourceParameter BentNormalAOTexture;
+	FShaderResourceParameter BentNormalAOSampler;
+	FShaderParameter DistanceFieldGBufferTexelSize;
+	FShaderParameter DistanceFieldGBufferJitterOffset;
+	FShaderParameter BentNormalBufferAndTexelSize;
+	FShaderParameter MinDownsampleFactorToBaseLevel;
+	FShaderParameter DistanceFadeScale;
+	FShaderParameter JitterOffset;
+};
+
+class FUpdateHistoryDepthRejectionPS : public FGlobalShader
+{
+	DECLARE_SHADER_TYPE(FUpdateHistoryDepthRejectionPS, Global);
 public:
 
 	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
@@ -83,76 +171,45 @@ public:
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
 		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), bSupportIrradiance);
 	}
 
 	/** Default constructor. */
-	TUpdateHistoryDepthRejectionPS() {}
+	FUpdateHistoryDepthRejectionPS() {}
 
 	/** Initialization constructor. */
-	TUpdateHistoryDepthRejectionPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
+	FUpdateHistoryDepthRejectionPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
 		: FGlobalShader(Initializer)
 	{
 		SceneTextureParameters.Bind(Initializer);
-		BentNormalAOTexture.Bind(Initializer.ParameterMap, TEXT("BentNormalAOTexture"));
-		ConfidenceTexture.Bind(Initializer.ParameterMap, TEXT("ConfidenceTexture"));
-		ConfidenceSampler.Bind(Initializer.ParameterMap, TEXT("ConfidenceSampler"));
-		BentNormalAOSampler.Bind(Initializer.ParameterMap, TEXT("BentNormalAOSampler"));
+		AOParameters.Bind(Initializer.ParameterMap);
+		GeometryAwareUpsampleParameters.Bind(Initializer.ParameterMap);
 		BentNormalHistoryTexture.Bind(Initializer.ParameterMap, TEXT("BentNormalHistoryTexture"));
-		ConfidenceHistorySampler.Bind(Initializer.ParameterMap, TEXT("ConfidenceHistorySampler"));
-		ConfidenceHistoryTexture.Bind(Initializer.ParameterMap, TEXT("ConfidenceHistoryTexture"));
 		BentNormalHistorySampler.Bind(Initializer.ParameterMap, TEXT("BentNormalHistorySampler"));
-		IrradianceTexture.Bind(Initializer.ParameterMap, TEXT("IrradianceTexture"));
-		IrradianceSampler.Bind(Initializer.ParameterMap, TEXT("IrradianceSampler"));
-		IrradianceHistoryTexture.Bind(Initializer.ParameterMap, TEXT("IrradianceHistoryTexture"));
-		IrradianceHistorySampler.Bind(Initializer.ParameterMap, TEXT("IrradianceHistorySampler"));
 		HistoryWeight.Bind(Initializer.ParameterMap, TEXT("HistoryWeight"));
-		AOHistoryMinConfidenceScale.Bind(Initializer.ParameterMap, TEXT("AOHistoryMinConfidenceScale"));
 		HistoryDistanceThreshold.Bind(Initializer.ParameterMap, TEXT("HistoryDistanceThreshold"));
 		UseHistoryFilter.Bind(Initializer.ParameterMap, TEXT("UseHistoryFilter"));
 		VelocityTexture.Bind(Initializer.ParameterMap, TEXT("VelocityTexture"));
 		VelocityTextureSampler.Bind(Initializer.ParameterMap, TEXT("VelocityTextureSampler"));
-		DistanceFieldNormalTexture.Bind(Initializer.ParameterMap, TEXT("DistanceFieldNormalTexture"));
-		DistanceFieldNormalSampler.Bind(Initializer.ParameterMap, TEXT("DistanceFieldNormalSampler"));
 		HistoryScreenPositionScaleBias.Bind(Initializer.ParameterMap, TEXT("HistoryScreenPositionScaleBias"));
 		HistoryUVMinMax.Bind(Initializer.ParameterMap, TEXT("HistoryUVMinMax"));
 	}
 
 	void SetParameters(
 		FRHICommandList& RHICmdList, 
-		const FSceneView& View, 
+		const FViewInfo& View,
 		const FIntRect& HistoryViewRect,
 		FSceneRenderTargetItem& DistanceFieldNormal, 
+		FSceneRenderTargetItem& DistanceFieldAOBentNormal,
 		FSceneRenderTargetItem& BentNormalHistoryTextureValue, 
-		FSceneRenderTargetItem& ConfidenceHistoryTextureValue,
-		TRefCountPtr<IPooledRenderTarget>* IrradianceHistoryRT, 
-		FSceneRenderTargetItem& DistanceFieldAOBentNormal, 
-		FSceneRenderTargetItem& DistanceFieldAOConfidence, 
-		IPooledRenderTarget* DistanceFieldIrradiance,
-		IPooledRenderTarget* VelocityTextureValue)
+		IPooledRenderTarget* VelocityTextureValue,
+		const FDistanceFieldAOParameters& Parameters)
 	{
 		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
 
 		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
 		SceneTextureParameters.Set(RHICmdList, ShaderRHI, View.FeatureLevel, ESceneTextureSetupMode::All);
-
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			BentNormalAOTexture,
-			BentNormalAOSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			DistanceFieldAOBentNormal.ShaderResourceTexture
-			);
-
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			ConfidenceTexture,
-			ConfidenceSampler.IsBound() ? ConfidenceSampler : BentNormalAOSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			DistanceFieldAOConfidence.ShaderResourceTexture
-			);
+		AOParameters.Set(RHICmdList, ShaderRHI, Parameters);
+		GeometryAwareUpsampleParameters.Set(RHICmdList, ShaderRHI, View, DistanceFieldNormal, DistanceFieldAOBentNormal);
 
 		SetTextureParameter(
 			RHICmdList,
@@ -163,52 +220,9 @@ public:
 			BentNormalHistoryTextureValue.ShaderResourceTexture
 			);
 
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			ConfidenceHistoryTexture,
-			ConfidenceHistorySampler.IsBound() ? ConfidenceHistorySampler : BentNormalHistorySampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			ConfidenceHistoryTextureValue.ShaderResourceTexture
-			);
-
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			DistanceFieldNormalTexture,
-			DistanceFieldNormalSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			DistanceFieldNormal.ShaderResourceTexture
-			);
-
-		if (IrradianceTexture.IsBound())
-		{
-			SetTextureParameter(
-				RHICmdList,
-				ShaderRHI,
-				IrradianceTexture,
-				IrradianceSampler,
-				TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-				DistanceFieldIrradiance->GetRenderTargetItem().ShaderResourceTexture
-				);
-		}
-		
-		if (IrradianceHistoryTexture.IsBound())
-		{
-			SetTextureParameter(
-				RHICmdList,
-				ShaderRHI,
-				IrradianceHistoryTexture,
-				IrradianceHistorySampler,
-				TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-				(*IrradianceHistoryRT)->GetRenderTargetItem().ShaderResourceTexture
-				);
-		}
-
 		SetShaderValue(RHICmdList, ShaderRHI, HistoryWeight, GAOHistoryWeight);
-		SetShaderValue(RHICmdList, ShaderRHI, AOHistoryMinConfidenceScale, GAOHistoryMinConfidenceScale);
 		SetShaderValue(RHICmdList, ShaderRHI, HistoryDistanceThreshold, GAOHistoryDistanceThreshold);
-		SetShaderValue(RHICmdList, ShaderRHI, UseHistoryFilter, (GAOHistoryStabilityPass ? 1.0f : 0.0f));
+		SetShaderValue(RHICmdList, ShaderRHI, UseHistoryFilter, UseAOHistoryStabilityPass() ? 1.0f : 0.0f);
 
 		SetTextureParameter(
 			RHICmdList,
@@ -219,7 +233,6 @@ public:
 			VelocityTextureValue ? VelocityTextureValue->GetRenderTargetItem().ShaderResourceTexture : GBlackTexture->TextureRHI
 			);
 
-
 		{
 			FIntPoint HistoryBufferSize = FSceneRenderTargets::Get(RHICmdList).GetBufferSizeXY() / FIntPoint(GAODownsampleFactor, GAODownsampleFactor);
 
@@ -236,39 +249,27 @@ public:
 			const FVector4 HistoryUVMinMaxValue(
 				(HistoryViewRect.Min.X + 0.5f) * InvBufferSizeX,
 				(HistoryViewRect.Min.Y + 0.5f) * InvBufferSizeY,
-				(HistoryViewRect.Max.X - 0.5f - GAODownsampleFactor) * InvBufferSizeX,
-				(HistoryViewRect.Max.Y - 0.5f - GAODownsampleFactor) * InvBufferSizeY);
+				(HistoryViewRect.Max.X - 0.5f) * InvBufferSizeX,
+				(HistoryViewRect.Max.Y - 0.5f) * InvBufferSizeY);
 
 			SetShaderValue(RHICmdList, ShaderRHI, HistoryScreenPositionScaleBias, HistoryScreenPositionScaleBiasValue);
 			SetShaderValue(RHICmdList, ShaderRHI, HistoryUVMinMax, HistoryUVMinMaxValue);
 		}
-
 	}
 	// FShader interface.
 	virtual bool Serialize(FArchive& Ar)
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << SceneTextureParameters;
-		Ar << BentNormalAOTexture;
-		Ar << ConfidenceTexture;
-		Ar << ConfidenceSampler;
-		Ar << BentNormalAOSampler;
+		Ar << AOParameters;
+		Ar << GeometryAwareUpsampleParameters;
 		Ar << BentNormalHistoryTexture;
-		Ar << ConfidenceHistoryTexture;
-		Ar << ConfidenceHistorySampler;
 		Ar << BentNormalHistorySampler;
-		Ar << IrradianceTexture;
-		Ar << IrradianceSampler;
-		Ar << IrradianceHistoryTexture;
-		Ar << IrradianceHistorySampler;
 		Ar << HistoryWeight;
-		Ar << AOHistoryMinConfidenceScale;
 		Ar << HistoryDistanceThreshold;
 		Ar << UseHistoryFilter;
 		Ar << VelocityTexture;
 		Ar << VelocityTextureSampler;
-		Ar << DistanceFieldNormalTexture;
-		Ar << DistanceFieldNormalSampler;
 		Ar << HistoryScreenPositionScaleBias;
 		Ar << HistoryUVMinMax;
 		return bShaderHasOutdatedParameters;
@@ -277,35 +278,23 @@ public:
 private:
 
 	FSceneTextureShaderParameters SceneTextureParameters;
-	FShaderResourceParameter BentNormalAOTexture;
-	FShaderResourceParameter ConfidenceTexture;
-	FShaderResourceParameter ConfidenceSampler;
-	FShaderResourceParameter BentNormalAOSampler;
-	FShaderResourceParameter ConfidenceHistorySampler;
-	FShaderResourceParameter ConfidenceHistoryTexture;
+	FAOParameters AOParameters;
+	FGeometryAwareUpsampleParameters GeometryAwareUpsampleParameters;
 	FShaderResourceParameter BentNormalHistoryTexture;
 	FShaderResourceParameter BentNormalHistorySampler;
-	FShaderResourceParameter IrradianceTexture;
-	FShaderResourceParameter IrradianceSampler;
-	FShaderResourceParameter IrradianceHistoryTexture;
-	FShaderResourceParameter IrradianceHistorySampler;
 	FShaderParameter HistoryWeight;
-	FShaderParameter AOHistoryMinConfidenceScale;
 	FShaderParameter HistoryDistanceThreshold;
 	FShaderParameter UseHistoryFilter;
 	FShaderResourceParameter VelocityTexture;
 	FShaderResourceParameter VelocityTextureSampler;
-	FShaderResourceParameter DistanceFieldNormalTexture;
-	FShaderResourceParameter DistanceFieldNormalSampler;
 	FShaderParameter HistoryScreenPositionScaleBias;
 	FShaderParameter HistoryUVMinMax;
 };
 
-IMPLEMENT_SHADER_TYPE(template<>,TUpdateHistoryDepthRejectionPS<true>,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("UpdateHistoryDepthRejectionPS"),SF_Pixel);
-IMPLEMENT_SHADER_TYPE(template<>,TUpdateHistoryDepthRejectionPS<false>,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("UpdateHistoryDepthRejectionPS"),SF_Pixel);
+IMPLEMENT_SHADER_TYPE(, FUpdateHistoryDepthRejectionPS,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("UpdateHistoryDepthRejectionPS"),SF_Pixel);
 
 
-template<bool bSupportIrradiance, bool bManuallyClampUV>
+template<bool bManuallyClampUV>
 class TFilterHistoryPS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(TFilterHistoryPS, Global);
@@ -319,7 +308,6 @@ public:
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
 		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), bSupportIrradiance);
 		OutEnvironment.SetDefine(TEXT("MANUALLY_CLAMP_UV"), bManuallyClampUV);
 	}
 
@@ -331,11 +319,7 @@ public:
 		: FGlobalShader(Initializer)
 	{
 		BentNormalAOTexture.Bind(Initializer.ParameterMap, TEXT("BentNormalAOTexture"));
-		ConfidenceTexture.Bind(Initializer.ParameterMap, TEXT("ConfidenceTexture"));
-		ConfidenceSampler.Bind(Initializer.ParameterMap, TEXT("ConfidenceSampler"));
 		BentNormalAOSampler.Bind(Initializer.ParameterMap, TEXT("BentNormalAOSampler"));
-		IrradianceTexture.Bind(Initializer.ParameterMap, TEXT("IrradianceTexture"));
-		IrradianceSampler.Bind(Initializer.ParameterMap, TEXT("IrradianceSampler"));
 		HistoryWeight.Bind(Initializer.ParameterMap, TEXT("HistoryWeight"));
 		BentNormalAOTexelSize.Bind(Initializer.ParameterMap, TEXT("BentNormalAOTexelSize"));
 		MaxSampleBufferUV.Bind(Initializer.ParameterMap, TEXT("MaxSampleBufferUV"));
@@ -347,9 +331,7 @@ public:
 		FRHICommandList& RHICmdList, 
 		const FViewInfo& View, 
 		FSceneRenderTargetItem& DistanceFieldNormal, 
-		FSceneRenderTargetItem& BentNormalHistoryTextureValue, 
-		FSceneRenderTargetItem& ConfidenceHistoryTextureValue, 
-		IPooledRenderTarget* IrradianceHistoryRT)
+		FSceneRenderTargetItem& BentNormalHistoryTextureValue)
 	{
 		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
 
@@ -364,15 +346,6 @@ public:
 			BentNormalHistoryTextureValue.ShaderResourceTexture
 			);
 
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			ConfidenceTexture,
-			ConfidenceSampler.IsBound() ? ConfidenceSampler : BentNormalAOSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			ConfidenceHistoryTextureValue.ShaderResourceTexture
-			);
-
 		SetTextureParameter(
 			RHICmdList,
 			ShaderRHI,
@@ -382,18 +355,6 @@ public:
 			DistanceFieldNormal.ShaderResourceTexture
 			);
 
-		if (IrradianceTexture.IsBound())
-		{
-			SetTextureParameter(
-				RHICmdList,
-				ShaderRHI,
-				IrradianceTexture,
-				IrradianceSampler,
-				TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-				IrradianceHistoryRT->GetRenderTargetItem().ShaderResourceTexture
-				);
-		}
-
 		SetShaderValue(RHICmdList, ShaderRHI, HistoryWeight, GAOHistoryWeight);
 		FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
 		
@@ -415,11 +376,7 @@ public:
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << BentNormalAOTexture;
-		Ar << ConfidenceTexture;
-		Ar << ConfidenceSampler;
 		Ar << BentNormalAOSampler;
-		Ar << IrradianceTexture;
-		Ar << IrradianceSampler;
 		Ar << HistoryWeight;
 		Ar << BentNormalAOTexelSize;
 		Ar << MaxSampleBufferUV;
@@ -431,11 +388,7 @@ public:
 private:
 
 	FShaderResourceParameter BentNormalAOTexture;
-	FShaderResourceParameter ConfidenceTexture;
-	FShaderResourceParameter ConfidenceSampler;
 	FShaderResourceParameter BentNormalAOSampler;
-	FShaderResourceParameter IrradianceTexture;
-	FShaderResourceParameter IrradianceSampler;
 	FShaderParameter HistoryWeight;
 	FShaderParameter BentNormalAOTexelSize;
 	FShaderParameter MaxSampleBufferUV;
@@ -444,17 +397,71 @@ private:
 };
 
 
-#define VARIATION1(A,B) \
-	typedef TFilterHistoryPS<A,B> TFilterHistoryPS##A##B; \
-	IMPLEMENT_SHADER_TYPE(template<>,TFilterHistoryPS##A##B,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("FilterHistoryPS"),SF_Pixel);
+#define VARIATION1(A) \
+	typedef TFilterHistoryPS<A> TFilterHistoryPS##A; \
+	IMPLEMENT_SHADER_TYPE(template<>,TFilterHistoryPS##A,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("FilterHistoryPS"),SF_Pixel);
 
-VARIATION1(false, false)
-VARIATION1(false, true)
-VARIATION1(true, false)
-VARIATION1(true, true)
+VARIATION1(false)
+VARIATION1(true)
 
 #undef VARIATION1
 
+class FGeometryAwareUpsamplePS : public FGlobalShader
+{
+	DECLARE_SHADER_TYPE(FGeometryAwareUpsamplePS, Global);
+public:
+
+	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
+	{
+		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM5) && DoesPlatformSupportDistanceFieldAO(Parameters.Platform);
+	}
+
+	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
+	{
+		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
+	}
+
+	/** Default constructor. */
+	FGeometryAwareUpsamplePS() {}
+
+	/** Initialization constructor. */
+	FGeometryAwareUpsamplePS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
+		: FGlobalShader(Initializer)
+	{
+		AOParameters.Bind(Initializer.ParameterMap);
+		GeometryAwareUpsampleParameters.Bind(Initializer.ParameterMap);
+	}
+
+	void SetParameters(
+		FRHICommandList& RHICmdList,
+		const FViewInfo& View,
+		FSceneRenderTargetItem& DistanceFieldNormal,
+		FSceneRenderTargetItem& DistanceFieldAOBentNormal,
+		const FDistanceFieldAOParameters& Parameters)
+	{
+		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
+
+		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
+
+		AOParameters.Set(RHICmdList, ShaderRHI, Parameters);
+		GeometryAwareUpsampleParameters.Set(RHICmdList, ShaderRHI, View, DistanceFieldNormal, DistanceFieldAOBentNormal);
+	}
+
+	// FShader interface.
+	virtual bool Serialize(FArchive& Ar) override
+	{
+		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
+		Ar << AOParameters;
+		Ar << GeometryAwareUpsampleParameters;
+		return bShaderHasOutdatedParameters;
+	}
+
+private:
+	FAOParameters AOParameters;
+	FGeometryAwareUpsampleParameters GeometryAwareUpsampleParameters;
+};
+
+IMPLEMENT_SHADER_TYPE(,FGeometryAwareUpsamplePS, TEXT("/Engine/Private/DistanceFieldLightingPost.usf"), TEXT("GeometryAwareUpsamplePS"), SF_Pixel);
 
 void AllocateOrReuseAORenderTarget(FRHICommandList& RHICmdList, TRefCountPtr<IPooledRenderTarget>& Target, const TCHAR* Name, EPixelFormat Format, uint32 Flags) 
 {
@@ -468,69 +475,84 @@ void AllocateOrReuseAORenderTarget(FRHICommandList& RHICmdList, TRefCountPtr<IPo
 	}
 }
 
+void GeometryAwareUpsample(FRHICommandList& RHICmdList, const FViewInfo& View, TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal, FSceneRenderTargetItem& DistanceFieldNormal, FSceneRenderTargetItem& BentNormalInterpolation, const FDistanceFieldAOParameters& Parameters)
+{
+	SCOPED_DRAW_EVENT(RHICmdList, GeometryAwareUpsample);
+
+	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
+
+	SetRenderTarget(RHICmdList, DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture, FTextureRHIParamRef());
+
+	FGraphicsPipelineStateInitializer GraphicsPSOInit;
+	RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
+	{
+		RHICmdList.SetViewport(0, 0, 0.0f, View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor, 1.0f);
+		GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
+		GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
+		GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
+
+		TShaderMapRef<FPostProcessVS> VertexShader(View.ShaderMap);
+		GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
+		GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
+		GraphicsPSOInit.PrimitiveType = PT_TriangleList;
+
+		TShaderMapRef<FGeometryAwareUpsamplePS> PixelShader(View.ShaderMap);
+		GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+		SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+		PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, BentNormalInterpolation, Parameters);
+
+		VertexShader->SetParameters(RHICmdList, View.ViewUniformBuffer);
+
+		DrawRectangle(
+			RHICmdList,
+			0, 0,
+			View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor,
+			0, 0,
+			View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor,
+			FIntPoint(View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor),
+			SceneContext.GetBufferSizeXY() / FIntPoint(GAODownsampleFactor, GAODownsampleFactor),
+			*VertexShader);
+	}
+
+	RHICmdList.CopyToResolveTarget(DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture, DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
+}
+
 void UpdateHistory(
 	FRHICommandList& RHICmdList,
 	const FViewInfo& View, 
 	const TCHAR* BentNormalHistoryRTName,
-	const TCHAR* ConfidenceHistoryRTName,
-	const TCHAR* IrradianceHistoryRTName,
 	IPooledRenderTarget* VelocityTexture,
 	FSceneRenderTargetItem& DistanceFieldNormal,
+	FSceneRenderTargetItem& BentNormalInterpolation,
 	/** Contains last frame's history, if non-NULL.  This will be updated with the new frame's history. */
 	FIntRect* DistanceFieldAOHistoryViewRect,
 	TRefCountPtr<IPooledRenderTarget>* BentNormalHistoryState,
-	TRefCountPtr<IPooledRenderTarget>* ConfidenceHistoryState,
-	TRefCountPtr<IPooledRenderTarget>* IrradianceHistoryState,
-	/** Source */
-	TRefCountPtr<IPooledRenderTarget>& BentNormalSource, 
-	TRefCountPtr<IPooledRenderTarget>& ConfidenceSource,
-	TRefCountPtr<IPooledRenderTarget>& IrradianceSource, 
 	/** Output of Temporal Reprojection for the next step in the pipeline. */
 	TRefCountPtr<IPooledRenderTarget>& BentNormalHistoryOutput,
-	TRefCountPtr<IPooledRenderTarget>& IrradianceHistoryOutput)
+	const FDistanceFieldAOParameters& Parameters)
 {
 	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
 
-	if (BentNormalHistoryState)
+	if (BentNormalHistoryState && GAOUseHistory)
 	{
-		const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View);
-
 		FIntPoint BufferSize = GetBufferSizeForAO();
 
 		if (*BentNormalHistoryState 
 			&& !View.bCameraCut 
-			&& !View.bPrevTransformsReset 
-			&& (!bUseDistanceFieldGI || (IrradianceHistoryState && *IrradianceHistoryState))
+			&& !View.bPrevTransformsReset
 			&& !GAOClearHistory
 			// If the scene render targets reallocate, toss the history so we don't read uninitialized data
 			&& (*BentNormalHistoryState)->GetDesc().Extent == BufferSize)
 		{
-			uint32 HistoryPassOutputFlags = GAOHistoryStabilityPass ? GFastVRamConfig.DistanceFieldAOHistory : 0;
+			uint32 HistoryPassOutputFlags = UseAOHistoryStabilityPass() ? GFastVRamConfig.DistanceFieldAOHistory : 0;
 			// Reuse a render target from the pool with a consistent name, for vis purposes
 			TRefCountPtr<IPooledRenderTarget> NewBentNormalHistory;
 			AllocateOrReuseAORenderTarget(RHICmdList, NewBentNormalHistory, BentNormalHistoryRTName, PF_FloatRGBA, HistoryPassOutputFlags);
 
-			TRefCountPtr<IPooledRenderTarget> NewConfidenceHistory;
-			AllocateOrReuseAORenderTarget(RHICmdList, NewConfidenceHistory, ConfidenceHistoryRTName, PF_G8, HistoryPassOutputFlags);
-
-			TRefCountPtr<IPooledRenderTarget> NewIrradianceHistory;
-
-			if (bUseDistanceFieldGI)
-			{
-				AllocateOrReuseAORenderTarget(RHICmdList, NewIrradianceHistory, IrradianceHistoryRTName, PF_FloatRGB);
-			}
-
 			SCOPED_DRAW_EVENT(RHICmdList, UpdateHistory);
 
 			{
-				FTextureRHIParamRef RenderTargets[3] =
-				{
-					NewBentNormalHistory->GetRenderTargetItem().TargetableTexture,
-					NewConfidenceHistory->GetRenderTargetItem().TargetableTexture,
-					bUseDistanceFieldGI ? NewIrradianceHistory->GetRenderTargetItem().TargetableTexture : NULL,
-				};
-
-				SetRenderTargets(RHICmdList, ARRAY_COUNT(RenderTargets) - (bUseDistanceFieldGI ? 0 : 1), RenderTargets, FTextureRHIParamRef(), 0, NULL);
+				SetRenderTarget(RHICmdList, NewBentNormalHistory->GetRenderTargetItem().TargetableTexture, FTextureRHIParamRef());
 				RHICmdList.SetViewport(0, 0, 0.0f, View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor, 1.0f);
 
 				FGraphicsPipelineStateInitializer GraphicsPSOInit;
@@ -544,22 +566,11 @@ void UpdateHistory(
 				GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
 				GraphicsPSOInit.PrimitiveType = PT_TriangleList;
 
-				if (bUseDistanceFieldGI)
-				{
-					TShaderMapRef<TUpdateHistoryDepthRejectionPS<true> > PixelShader(View.ShaderMap);
+				TShaderMapRef<FUpdateHistoryDepthRejectionPS> PixelShader(View.ShaderMap);
 
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-					PixelShader->SetParameters(RHICmdList, View, *DistanceFieldAOHistoryViewRect, DistanceFieldNormal, (*BentNormalHistoryState)->GetRenderTargetItem(), (*ConfidenceHistoryState)->GetRenderTargetItem(), IrradianceHistoryState, BentNormalSource->GetRenderTargetItem(), ConfidenceSource->GetRenderTargetItem(), IrradianceSource, VelocityTexture);
-				}
-				else
-				{
-					TShaderMapRef<TUpdateHistoryDepthRejectionPS<false> > PixelShader(View.ShaderMap);
-
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-					PixelShader->SetParameters(RHICmdList, View, *DistanceFieldAOHistoryViewRect, DistanceFieldNormal, (*BentNormalHistoryState)->GetRenderTargetItem(), (*ConfidenceHistoryState)->GetRenderTargetItem(), IrradianceHistoryState, BentNormalSource->GetRenderTargetItem(), ConfidenceSource->GetRenderTargetItem(), IrradianceSource, VelocityTexture);
-				}
+				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+				PixelShader->SetParameters(RHICmdList, View, *DistanceFieldAOHistoryViewRect, DistanceFieldNormal, BentNormalInterpolation,(*BentNormalHistoryState)->GetRenderTargetItem(), VelocityTexture, Parameters);
 
 				VertexShader->SetParameters(RHICmdList, View.ViewUniformBuffer);
 
@@ -574,15 +585,9 @@ void UpdateHistory(
 					*VertexShader);
 
 				RHICmdList.CopyToResolveTarget(NewBentNormalHistory->GetRenderTargetItem().TargetableTexture, NewBentNormalHistory->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-				RHICmdList.CopyToResolveTarget(NewConfidenceHistory->GetRenderTargetItem().TargetableTexture, NewConfidenceHistory->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-			
-				if (bUseDistanceFieldGI)
-				{
-					RHICmdList.CopyToResolveTarget(NewIrradianceHistory->GetRenderTargetItem().TargetableTexture, NewIrradianceHistory->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-				}
 			}
 
-			if (GAOHistoryStabilityPass)
+			if (UseAOHistoryStabilityPass())
 			{
 				const FPooledRenderTargetDesc& HistoryDesc = (*BentNormalHistoryState)->GetDesc();
 
@@ -590,30 +595,13 @@ void UpdateHistory(
 				if (HistoryDesc.Extent != SceneContext.GetBufferSizeXY() / FIntPoint(GAODownsampleFactor, GAODownsampleFactor))
 				{
 					GRenderTargetPool.FreeUnusedResource(*BentNormalHistoryState);
-					GRenderTargetPool.FreeUnusedResource(*ConfidenceHistoryState);
 					*BentNormalHistoryState = NULL;
-					*ConfidenceHistoryState = NULL;
 					// Update the view state's render target reference with the new history
 					AllocateOrReuseAORenderTarget(RHICmdList, *BentNormalHistoryState, BentNormalHistoryRTName, PF_FloatRGBA);
-					AllocateOrReuseAORenderTarget(RHICmdList, *ConfidenceHistoryState, ConfidenceHistoryRTName, PF_G8);
-
-					if (bUseDistanceFieldGI)
-					{
-						GRenderTargetPool.FreeUnusedResource(*IrradianceHistoryState);
-						*IrradianceHistoryState = NULL;
-						AllocateOrReuseAORenderTarget(RHICmdList, *IrradianceHistoryState, IrradianceHistoryRTName, PF_FloatRGB);
-					}
 				}
 
 				{
-					FTextureRHIParamRef RenderTargets[3] =
-					{
-						(*BentNormalHistoryState)->GetRenderTargetItem().TargetableTexture,
-						(*ConfidenceHistoryState)->GetRenderTargetItem().TargetableTexture,
-						bUseDistanceFieldGI ? (*IrradianceHistoryState)->GetRenderTargetItem().TargetableTexture : NULL,
-					};
-
-					SetRenderTargets(RHICmdList, ARRAY_COUNT(RenderTargets) - (bUseDistanceFieldGI ? 0 : 1), RenderTargets, FTextureRHIParamRef(), 0, NULL, true);
+					SetRenderTarget(RHICmdList, (*BentNormalHistoryState)->GetRenderTargetItem().TargetableTexture, FTextureRHIParamRef());
 					RHICmdList.SetViewport(0, 0, 0.0f, View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor, 1.0f);
 
 					FGraphicsPipelineStateInitializer GraphicsPSOInit;
@@ -629,41 +617,19 @@ void UpdateHistory(
 
 					if (View.ViewRect.Min == FIntPoint::ZeroValue && View.ViewRect.Max == SceneContext.GetBufferSizeXY())
 					{
-						if (bUseDistanceFieldGI)
-						{
-							TShaderMapRef<TFilterHistoryPS<true, false> > PixelShader(View.ShaderMap);
+						TShaderMapRef<TFilterHistoryPS<false> > PixelShader(View.ShaderMap);
 
-							GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-							SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-							PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem(), NewConfidenceHistory->GetRenderTargetItem(), NewIrradianceHistory);
-						}
-						else
-						{
-							TShaderMapRef<TFilterHistoryPS<false, false> > PixelShader(View.ShaderMap);
-
-							GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-							SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-							PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem(), NewConfidenceHistory->GetRenderTargetItem(), NewIrradianceHistory);
-						}
+						GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+						SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+						PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem());
 					}
 					else
 					{
-						if (bUseDistanceFieldGI)
-						{
-							TShaderMapRef<TFilterHistoryPS<true, true> > PixelShader(View.ShaderMap);
+						TShaderMapRef<TFilterHistoryPS<true> > PixelShader(View.ShaderMap);
 
-							GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-							SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-							PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem(), NewConfidenceHistory->GetRenderTargetItem(), NewIrradianceHistory);
-						}
-						else
-						{
-							TShaderMapRef<TFilterHistoryPS<false, true> > PixelShader(View.ShaderMap);
-
-							GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-							SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-							PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem(), NewConfidenceHistory->GetRenderTargetItem(), NewIrradianceHistory);
-						}
+						GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+						SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+						PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, NewBentNormalHistory->GetRenderTargetItem());
 					}
 
 					VertexShader->SetParameters(RHICmdList, View.ViewUniformBuffer);
@@ -679,42 +645,29 @@ void UpdateHistory(
 						*VertexShader);
 
 					RHICmdList.CopyToResolveTarget((*BentNormalHistoryState)->GetRenderTargetItem().TargetableTexture, (*BentNormalHistoryState)->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-					RHICmdList.CopyToResolveTarget((*ConfidenceHistoryState)->GetRenderTargetItem().TargetableTexture, (*ConfidenceHistoryState)->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-
-					if (bUseDistanceFieldGI)
-					{
-						RHICmdList.CopyToResolveTarget((*IrradianceHistoryState)->GetRenderTargetItem().TargetableTexture, (*IrradianceHistoryState)->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-					}
 				}
 
 				BentNormalHistoryOutput = *BentNormalHistoryState;
-				IrradianceHistoryOutput = *IrradianceHistoryState;
 			}
 			else
 			{
 				// Update the view state's render target reference with the new history
 				*BentNormalHistoryState = NewBentNormalHistory;
 				BentNormalHistoryOutput = NewBentNormalHistory;
-
-				*ConfidenceHistoryState = NewConfidenceHistory;
-
-				*IrradianceHistoryState = NewIrradianceHistory;
-				IrradianceHistoryOutput = NewIrradianceHistory;
 			}
 		}
 		else
 		{
-			// Use the current frame's mask for next frame's history
-			*BentNormalHistoryState = BentNormalSource;
-			BentNormalHistoryOutput = BentNormalSource;
-			BentNormalSource = NULL;
+			// Use the current frame's upscaled mask for next frame's history
+			TRefCountPtr<IPooledRenderTarget> DistanceFieldAOBentNormal;
+			AllocateOrReuseAORenderTarget(RHICmdList, DistanceFieldAOBentNormal, TEXT("DistanceFieldBentNormalAO"), PF_FloatRGBA, GFastVRamConfig.DistanceFieldAOBentNormal);
 
-			*ConfidenceHistoryState = ConfidenceSource;
-			ConfidenceSource = NULL;
+			GeometryAwareUpsample(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldNormal, BentNormalInterpolation, Parameters);
 
-			*IrradianceHistoryState = IrradianceSource;
-			IrradianceHistoryOutput = IrradianceSource;
-			IrradianceSource = NULL;
+			RHICmdList.CopyToResolveTarget(DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture, DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
+
+			*BentNormalHistoryState = DistanceFieldAOBentNormal;
+			BentNormalHistoryOutput = DistanceFieldAOBentNormal;
 		}
 
 		DistanceFieldAOHistoryViewRect->Min = FIntPoint::ZeroValue;
@@ -723,21 +676,19 @@ void UpdateHistory(
 	}
 	else
 	{
-		// Temporal reprojection is disabled or there is no view state - pass through
-		BentNormalHistoryOutput = BentNormalSource;
-		IrradianceHistoryOutput = IrradianceSource;
+		// Temporal reprojection is disabled or there is no view state - just upscale
+		TRefCountPtr<IPooledRenderTarget> DistanceFieldAOBentNormal;
+		AllocateOrReuseAORenderTarget(RHICmdList, DistanceFieldAOBentNormal, TEXT("DistanceFieldBentNormalAO"), PF_FloatRGBA, GFastVRamConfig.DistanceFieldAOBentNormal);
+
+		GeometryAwareUpsample(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldNormal, BentNormalInterpolation, Parameters);
+
+		RHICmdList.CopyToResolveTarget(DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture, DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
+
+		BentNormalHistoryOutput = DistanceFieldAOBentNormal;
 	}
 }
 
-enum EAOUpsampleType
-{
-	AOUpsample_OutputBentNormal,
-	AOUpsample_OutputAO,
-	AOUpsample_OutputBentNormalAndIrradiance,
-	AOUpsample_OutputIrradiance
-};
-
-template<EAOUpsampleType UpsampleType, bool bModulateToSceneColor, bool bSupportSpecularOcclusion>
+template<bool bModulateToSceneColor>
 class TDistanceFieldAOUpsamplePS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(TDistanceFieldAOUpsamplePS, Global);
@@ -750,12 +701,7 @@ public:
 
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
-		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
 		OutEnvironment.SetDefine(TEXT("MODULATE_SCENE_COLOR"), bModulateToSceneColor);
-		OutEnvironment.SetDefine(TEXT("OUTPUT_BENT_NORMAL"), (UpsampleType == AOUpsample_OutputBentNormal || UpsampleType == AOUpsample_OutputBentNormalAndIrradiance));
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), (UpsampleType == AOUpsample_OutputIrradiance || UpsampleType == AOUpsample_OutputBentNormalAndIrradiance));
-		OutEnvironment.SetDefine(TEXT("SUPPORT_SPECULAR_OCCLUSION"), bSupportSpecularOcclusion);
-		OutEnvironment.SetDefine(TEXT("OUTPUT_AO"), (UpsampleType == AOUpsample_OutputAO));
 	}
 
 	/** Default constructor. */
@@ -766,28 +712,17 @@ public:
 		: FGlobalShader(Initializer)
 	{
 		SceneTextureParameters.Bind(Initializer);
-		BentNormalAOTexture.Bind(Initializer.ParameterMap,TEXT("BentNormalAOTexture"));
-		BentNormalAOSampler.Bind(Initializer.ParameterMap,TEXT("BentNormalAOSampler"));
-		IrradianceTexture.Bind(Initializer.ParameterMap,TEXT("IrradianceTexture"));
-		IrradianceSampler.Bind(Initializer.ParameterMap,TEXT("IrradianceSampler"));
-		SpecularOcclusionTexture.Bind(Initializer.ParameterMap,TEXT("SpecularOcclusionTexture"));
-		SpecularOcclusionSampler.Bind(Initializer.ParameterMap,TEXT("SpecularOcclusionSampler"));
+		DFAOUpsampleParameters.Bind(Initializer.ParameterMap);
 		MinIndirectDiffuseOcclusion.Bind(Initializer.ParameterMap,TEXT("MinIndirectDiffuseOcclusion"));
 	}
 
-	void SetParameters(FRHICommandList& RHICmdList, const FSceneView& View, TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal, IPooledRenderTarget* DistanceFieldIrradiance)
+	void SetParameters(FRHICommandList& RHICmdList, const FViewInfo& View, TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal)
 	{
 		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
 
 		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
 		SceneTextureParameters.Set(RHICmdList, ShaderRHI, View.FeatureLevel, ESceneTextureSetupMode::All);
-
-		SetTextureParameter(RHICmdList, ShaderRHI, BentNormalAOTexture, BentNormalAOSampler, TStaticSamplerState<SF_Bilinear>::GetRHI(), DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture);
-
-		if (IrradianceTexture.IsBound())
-		{
-			SetTextureParameter(RHICmdList, ShaderRHI, IrradianceTexture, IrradianceSampler, TStaticSamplerState<SF_Bilinear>::GetRHI(), DistanceFieldIrradiance->GetRenderTargetItem().ShaderResourceTexture);
-		}
+		DFAOUpsampleParameters.Set(RHICmdList, ShaderRHI, View, DistanceFieldAOBentNormal);
 
 		FScene* Scene = (FScene*)View.Family->Scene;
 		const float MinOcclusion = Scene->SkyLight ? Scene->SkyLight->MinOcclusion : 0;
@@ -798,12 +733,7 @@ public:
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << SceneTextureParameters;
-		Ar << BentNormalAOTexture;
-		Ar << BentNormalAOSampler;
-		Ar << IrradianceTexture;
-		Ar << IrradianceSampler;
-		Ar << SpecularOcclusionTexture;
-		Ar << SpecularOcclusionSampler;
+		Ar << DFAOUpsampleParameters;
 		Ar << MinIndirectDiffuseOcclusion;
 		return bShaderHasOutdatedParameters;
 	}
@@ -811,145 +741,22 @@ public:
 private:
 
 	FSceneTextureShaderParameters SceneTextureParameters;
-	FShaderResourceParameter BentNormalAOTexture;
-	FShaderResourceParameter BentNormalAOSampler;
-	FShaderResourceParameter IrradianceTexture;
-	FShaderResourceParameter IrradianceSampler;
-	FShaderResourceParameter SpecularOcclusionTexture;
-	FShaderResourceParameter SpecularOcclusionSampler;
+	FDFAOUpsampleParameters DFAOUpsampleParameters;
 	FShaderParameter MinIndirectDiffuseOcclusion;
 };
 
-#define IMPLEMENT_UPSAMPLE_PS_TYPE(UpsampleType, bModulateToSceneColor, bSupportSpecularOcclusion) \
-	typedef TDistanceFieldAOUpsamplePS<UpsampleType, bModulateToSceneColor, bSupportSpecularOcclusion> TDistanceFieldAOUpsamplePS##UpsampleType##bModulateToSceneColor##bSupportSpecularOcclusion; \
-	IMPLEMENT_SHADER_TYPE(template<>,TDistanceFieldAOUpsamplePS##UpsampleType##bModulateToSceneColor##bSupportSpecularOcclusion,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("AOUpsamplePS"),SF_Pixel);
+#define IMPLEMENT_UPSAMPLE_PS_TYPE(bModulateToSceneColor) \
+	typedef TDistanceFieldAOUpsamplePS<bModulateToSceneColor> TDistanceFieldAOUpsamplePS##bModulateToSceneColor; \
+	IMPLEMENT_SHADER_TYPE(template<>,TDistanceFieldAOUpsamplePS##bModulateToSceneColor,TEXT("/Engine/Private/DistanceFieldLightingPost.usf"),TEXT("AOUpsamplePS"),SF_Pixel);
 
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormal, true, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputAO, true, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormalAndIrradiance, true, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputIrradiance, true, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormal, false, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputAO, false, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormalAndIrradiance, false, true)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputIrradiance, false, true)
-
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormal, true, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputAO, true, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormalAndIrradiance, true, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputIrradiance, true, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormal, false, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputAO, false, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputBentNormalAndIrradiance, false, false)
-IMPLEMENT_UPSAMPLE_PS_TYPE(AOUpsample_OutputIrradiance, false, false)
-
-template<bool bSupportSpecularOcclusion>
-void SetUpsampleShaders(
-	FRHICommandList& RHICmdList,
-	FGraphicsPipelineStateInitializer& GraphicsPSOInit,
-	const FViewInfo& View,
-	TShaderMapRef<FPostProcessVS>& VertexShader,
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal, 
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldIrradiance,
-	bool bModulateSceneColor,
-	bool bVisualizeAmbientOcclusion,
-	bool bVisualizeGlobalIllumination)
-{
-	const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View);
-
-	if (bModulateSceneColor)
-	{
-		if (bVisualizeAmbientOcclusion)
-		{
-			TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputAO, true, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-		}
-		else if (bVisualizeGlobalIllumination && bUseDistanceFieldGI)
-		{
-			TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputIrradiance, true, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-		}
-		else
-		{
-			if (bUseDistanceFieldGI)
-			{
-				TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputBentNormalAndIrradiance, true, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-				GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-			}
-			else
-			{
-				TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputBentNormal, true, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-				GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-			}
-		}
-	}
-	else
-	{
-		if (bVisualizeAmbientOcclusion)
-		{
-			TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputAO, false, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-		}
-		else if (bVisualizeGlobalIllumination && bUseDistanceFieldGI)
-		{
-			TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputIrradiance, false, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-		}
-		else
-		{
-			if (bUseDistanceFieldGI)
-			{
-				TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputBentNormalAndIrradiance, false, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-				GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-			}
-			else
-			{
-				TShaderMapRef<TDistanceFieldAOUpsamplePS<AOUpsample_OutputBentNormal, false, bSupportSpecularOcclusion> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-				GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal, DistanceFieldIrradiance);
-			}
-		}
-	}
-}
+IMPLEMENT_UPSAMPLE_PS_TYPE(false)
+IMPLEMENT_UPSAMPLE_PS_TYPE(true)
 
 void UpsampleBentNormalAO(
 	FRHICommandList& RHICmdList, 
 	const TArray<FViewInfo>& Views, 
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal, 
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldIrradiance,
-	bool bModulateSceneColor,
-	bool bVisualizeAmbientOcclusion,
-	bool bVisualizeGlobalIllumination)
+	TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal,
+	bool bModulateSceneColor)
 {
 	FGraphicsPipelineStateInitializer GraphicsPSOInit;
 	RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
@@ -967,13 +774,7 @@ void UpsampleBentNormalAO(
 
 		if (bModulateSceneColor)
 		{
-			GraphicsPSOInit.BlendState = TStaticBlendState<
-				// Opaque blending to DistanceFieldAOBentNormal
-				CW_RGBA, BO_Add, BF_One, BF_Zero, BO_Add, BF_One, BF_Zero,
-				// Modulate scene color target
-				CW_RGB, BO_Add, BF_DestColor, BF_Zero, BO_Add, BF_Zero, BF_One,
-				// Opaque blending to DistanceFieldIrradiance
-				CW_RGBA, BO_Add, BF_One, BF_Zero, BO_Add, BF_One, BF_Zero>::GetRHI();
+			GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_DestColor, BF_Zero, BO_Add, BF_Zero, BF_One>::GetRHI();
 		}
 		else
 		{
@@ -982,7 +783,24 @@ void UpsampleBentNormalAO(
 
 		TShaderMapRef<FPostProcessVS> VertexShader(View.ShaderMap);
 
-		SetUpsampleShaders<false>(RHICmdList, GraphicsPSOInit, View, VertexShader, DistanceFieldAOBentNormal, DistanceFieldIrradiance, bModulateSceneColor, bVisualizeAmbientOcclusion, bVisualizeGlobalIllumination);
+		if (bModulateSceneColor)
+		{
+			TShaderMapRef<TDistanceFieldAOUpsamplePS<true> > PixelShader(View.ShaderMap);
+			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
+			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
+			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal);
+		}
+		else
+		{
+			TShaderMapRef<TDistanceFieldAOUpsamplePS<false> > PixelShader(View.ShaderMap);
+			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
+			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
+			GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+			SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+			PixelShader->SetParameters(RHICmdList, View, DistanceFieldAOBentNormal);
+		}
 
 		DrawRectangle( 
 			RHICmdList,
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.h b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.h
index 589f1946fb08..d4836e7b96e3 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.h
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingPost.h
@@ -17,28 +17,18 @@ extern void UpdateHistory(
 	FRHICommandList& RHICmdList,
 	const FViewInfo& View, 
 	const TCHAR* BentNormalHistoryRTName,
-	const TCHAR* ConfidenceHistoryRTName,
-	const TCHAR* IrradianceHistoryRTName,
 	IPooledRenderTarget* VelocityTexture,
+	FSceneRenderTargetItem& BentNormalInterpolation,
 	FSceneRenderTargetItem& DistanceFieldNormal,
 	/** Contains last frame's history, if non-NULL.  This will be updated with the new frame's history. */
 	FIntRect* DistanceFieldAOHistoryViewRect,
 	TRefCountPtr<IPooledRenderTarget>* BentNormalHistoryState,
-	TRefCountPtr<IPooledRenderTarget>* ConfidenceHistoryState,
-	TRefCountPtr<IPooledRenderTarget>* IrradianceHistoryState,
-	/** Source */
-	TRefCountPtr<IPooledRenderTarget>& BentNormalSource, 
-	TRefCountPtr<IPooledRenderTarget>& ConfidenceSource,
-	TRefCountPtr<IPooledRenderTarget>& IrradianceSource, 
 	/** Output of Temporal Reprojection for the next step in the pipeline. */
 	TRefCountPtr<IPooledRenderTarget>& BentNormalHistoryOutput,
-	TRefCountPtr<IPooledRenderTarget>& IrradianceHistoryOutput);
+	const FDistanceFieldAOParameters& Parameters);
 
 extern void UpsampleBentNormalAO(
 	FRHICommandList& RHICmdList, 
 	const TArray<FViewInfo>& Views, 
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal, 
-	TRefCountPtr<IPooledRenderTarget>& DistanceFieldIrradiance,
-	bool bModulateSceneColor,
-	bool bVisualizeAmbientOcclusion,
-	bool bVisualizeGlobalIllumination);
+	TRefCountPtr<IPooledRenderTarget>& DistanceFieldAOBentNormal,
+	bool bModulateSceneColor);
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingShared.h b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingShared.h
index 5d61c0345976..717358734d90 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingShared.h
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldLightingShared.h
@@ -47,6 +47,8 @@ inline bool SupportsDistanceFieldGI(ERHIFeatureLevel::Type FeatureLevel, EShader
 }
 
 extern bool IsDistanceFieldGIAllowed(const FViewInfo& View);
+extern bool UseDistanceFieldAO();
+extern bool UseAOObjectDistanceField();
 
 class FDistanceFieldObjectBuffers
 {
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectCulling.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectCulling.cpp
index a691588c09b7..f71284232848 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectCulling.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectCulling.cpp
@@ -603,20 +603,23 @@ void ScatterTilesToObjects(FRHICommandListImmediate& RHICmdList, const FViewInfo
 	SetRenderTarget(RHICmdList, NULL, NULL);
 }
 
-FIntPoint BuildTileObjectLists(FRHICommandListImmediate& RHICmdList, FScene* Scene, TArray<FViewInfo>& Views, FSceneRenderTargetItem& DistanceFieldNormal, const FDistanceFieldAOParameters& Parameters)
+FIntPoint GetTileListGroupSizeForView(const FViewInfo& View)
+{
+	return FIntPoint(
+		FMath::DivideAndRoundUp(FMath::Max(View.ViewRect.Size().X / GAODownsampleFactor, 1), GDistanceFieldAOTileSizeX),
+		FMath::DivideAndRoundUp(FMath::Max(View.ViewRect.Size().Y / GAODownsampleFactor, 1), GDistanceFieldAOTileSizeY));
+}
+
+void BuildTileObjectLists(FRHICommandListImmediate& RHICmdList, FScene* Scene, TArray<FViewInfo>& Views, FSceneRenderTargetItem& DistanceFieldNormal, const FDistanceFieldAOParameters& Parameters)
 {
 	SCOPED_DRAW_EVENT(RHICmdList, BuildTileList);
 	SetRenderTarget(RHICmdList, NULL, NULL);
 
-	FIntPoint TileListGroupSize;
-
 	for (int32 ViewIndex = 0; ViewIndex < Views.Num(); ViewIndex++)
 	{
 		const FViewInfo& View = Views[ViewIndex];
 
-		TileListGroupSize = FIntPoint(
-			FMath::DivideAndRoundUp(FMath::Max(View.ViewRect.Size().X / GAODownsampleFactor, 1), GDistanceFieldAOTileSizeX), 
-			FMath::DivideAndRoundUp(FMath::Max(View.ViewRect.Size().Y / GAODownsampleFactor, 1), GDistanceFieldAOTileSizeY));
+		const FIntPoint TileListGroupSize = GetTileListGroupSizeForView(View);
 
 		FTileIntersectionResources*& TileIntersectionResources = ((FSceneViewState*)View.State)->AOTileIntersectionResources;
 
@@ -694,6 +697,4 @@ FIntPoint BuildTileObjectLists(FRHICommandListImmediate& RHICmdList, FScene* Sce
 			ensure(0);
 		}
 	}
-
-	return TileListGroupSize;
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectManagement.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectManagement.cpp
index 432becbe4218..34fb5d21eedc 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectManagement.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldObjectManagement.cpp
@@ -36,8 +36,8 @@ FAutoConsoleVariableRef CVarAOLogObjectBufferReallocation(
 	);
 
 // Must match equivalent shader defines
-int32 FDistanceFieldObjectBuffers::ObjectDataStride = 18;
-int32 FDistanceFieldCulledObjectBuffers::ObjectDataStride = 16;
+int32 FDistanceFieldObjectBuffers::ObjectDataStride = 17;
+int32 FDistanceFieldCulledObjectBuffers::ObjectDataStride = 17;
 int32 FDistanceFieldCulledObjectBuffers::ObjectBoxBoundsStride = 5;
 
 // In float4's.  Must match corresponding usf definition
@@ -900,16 +900,17 @@ void ProcessPrimitiveUpdate(
 					const FVector UVScale = FVector(BlockSize) * InvTextureDim;
 					const float VolumeScale = UniformScaleVolumeToWorld.GetMaximumAxisScale();
 
-					const FMatrix WorldToVolume = UniformScaleVolumeToWorld.Inverse();
-					// WorldToVolume
-					UploadObjectData.Add(*(FVector4*)&WorldToVolume.M[0]);
-					UploadObjectData.Add(*(FVector4*)&WorldToVolume.M[1]);
-					UploadObjectData.Add(*(FVector4*)&WorldToVolume.M[2]);
-					UploadObjectData.Add(*(FVector4*)&WorldToVolume.M[3]);
+					const FMatrix WorldToVolumeT = UniformScaleVolumeToWorld.Inverse().GetTransposed();
+					// WorldToVolumeT
+					UploadObjectData.Add(*(FVector4*)&WorldToVolumeT.M[0]);
+					UploadObjectData.Add(*(FVector4*)&WorldToVolumeT.M[1]);
+					UploadObjectData.Add(*(FVector4*)&WorldToVolumeT.M[2]);
+
+					const float OftenMovingValue = CacheType == GDF_Full ? 1.0f : 0.0f;
 
 					// Clamp to texel center by subtracting a half texel in the [-1,1] position space
 					// LocalPositionExtent
-					UploadObjectData.Add(FVector4(LocalPositionExtent - InvBlockSize, 0));
+					UploadObjectData.Add(FVector4(LocalPositionExtent - InvBlockSize, OftenMovingValue));
 
 					// UVScale, VolumeScale and sign gives bGeneratedAsTwoSided
 					const float WSign = bBuiltAsIfTwoSided ? -1 : 1;
@@ -934,29 +935,32 @@ void ProcessPrimitiveUpdate(
 						MaxDrawDist = 0.f;
 					}
 #endif
-					UploadObjectData.Add(
-						FVector4(
-							DistanceMinMax.Y - DistanceMinMax.X,
-							DistanceMinMax.X,
-							MinDrawDist2,
-							MaxDrawDist * MaxDrawDist));
+					// This is needed to bypass the check Nan/Inf behavior of FVector4.
+					// If the check is turned on, FVector4 constructor automatically converts
+					// the FVector4 being constructed to (0, 0, 0, 1) when any of inputs
+					// to the constructor contains Nan/Inf
+					UploadObjectData.AddUninitialized();
+					FVector4& TmpVec4 = UploadObjectData.Last();
+					TmpVec4.X = DistanceMinMax.Y - DistanceMinMax.X;
+					TmpVec4.Y = DistanceMinMax.X;
+					TmpVec4.Z = MinDrawDist2;
+					TmpVec4.W = MaxDrawDist * MaxDrawDist;
 
 					UploadObjectData.Add(*(FVector4*)&UniformScaleVolumeToWorld.M[0]);
 					UploadObjectData.Add(*(FVector4*)&UniformScaleVolumeToWorld.M[1]);
 					UploadObjectData.Add(*(FVector4*)&UniformScaleVolumeToWorld.M[2]);
 
-					UploadObjectData.Add(*(FVector4*)&LocalToWorld.M[0]);
-					UploadObjectData.Add(*(FVector4*)&LocalToWorld.M[1]);
-					UploadObjectData.Add(*(FVector4*)&LocalToWorld.M[2]);
-					UploadObjectData.Add(*(FVector4*)&LocalToWorld.M[3]);
+					FMatrix LocalToWorldT = LocalToWorld.GetTransposed();
+					UploadObjectData.Add(*(FVector4*)&LocalToWorldT.M[0]);
+					UploadObjectData.Add(*(FVector4*)&LocalToWorldT.M[1]);
+					UploadObjectData.Add(*(FVector4*)&LocalToWorldT.M[2]);
 
 					UploadObjectData.Add(FVector4(Allocation.Offset, Allocation.NumLOD0, Allocation.NumSurfels, InstancedAllocation.Offset + InstancedAllocation.NumSurfels * TransformIndex));
 
-					UploadObjectData.Add(FVector4(LocalVolumeBounds.Min, 0));
-
-					// Box bounds
-					const float OftenMovingWSign = CacheType == GDF_Full ? 1.0f : -1.0f;
-					UploadObjectData.Add(FVector4(LocalVolumeBounds.Max, OftenMovingWSign));
+					FMatrix VolumeToWorldT = VolumeToWorld.GetTransposed();
+					UploadObjectData.Add(*(FVector4*)&VolumeToWorldT.M[0]);
+					UploadObjectData.Add(*(FVector4*)&VolumeToWorldT.M[1]);
+					UploadObjectData.Add(*(FVector4*)&VolumeToWorldT.M[2]);
 
 					checkSlow(UploadObjectData.Num() % UploadObjectDataStride == 0);
 
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldScreenGridLighting.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldScreenGridLighting.cpp
index 2b4888ed4445..3742574391db 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldScreenGridLighting.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldScreenGridLighting.cpp
@@ -227,7 +227,7 @@ IMPLEMENT_CONETRACE_CS_TYPE(false, false)
 
 const int32 GConeTraceGlobalDFTileSize = 8;
 
-template<bool bSupportIrradiance>
+template<bool bConeTraceObjects>
 class TConeTraceScreenGridGlobalOcclusionCS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(TConeTraceScreenGridGlobalOcclusionCS,Global)
@@ -241,7 +241,7 @@ public:
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
 		FGlobalShader::ModifyCompilationEnvironment(Parameters,OutEnvironment);
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), bSupportIrradiance);
+		OutEnvironment.SetDefine(TEXT("CONE_TRACE_OBJECTS"), bConeTraceObjects);
 		OutEnvironment.SetDefine(TEXT("CONE_TRACE_GLOBAL_DISPATCH_SIZEX"), GConeTraceGlobalDFTileSize);
 		OutEnvironment.SetDefine(TEXT("OUTPUT_VISIBILITY_DIRECTLY"), TEXT("1"));
 		OutEnvironment.SetDefine(TEXT("TRACE_DOWNSAMPLE_FACTOR"), GConeTraceDownsampleFactor);
@@ -298,9 +298,11 @@ public:
 
 		SetUniformBufferParameterImmediate(RHICmdList, ShaderRHI, GetUniformBufferParameter<FAOSampleData2>(), AOSampleData);
 
-		FTileIntersectionResources* TileIntersectionResources = View.ViewState->AOTileIntersectionResources;
-
-		SetSRVParameter(RHICmdList, ShaderRHI, TileConeDepthRanges, TileIntersectionResources->TileConeDepthRanges.SRV);
+		if (UseAOObjectDistanceField())
+		{
+			FTileIntersectionResources* TileIntersectionResources = View.ViewState->AOTileIntersectionResources;
+			SetSRVParameter(RHICmdList, ShaderRHI, TileConeDepthRanges, TileIntersectionResources->TileConeDepthRanges.SRV);
+		}
 
 		SetShaderValue(RHICmdList, ShaderRHI, TileListGroupSize, TileListGroupSizeValue);
 
@@ -320,12 +322,8 @@ public:
 		FAOScreenGridResources* ScreenGridResources = View.ViewState->AOScreenGridResources;
 
 		int32 NumOutUAVs = 0;
-		FUnorderedAccessViewRHIParamRef OutUAVs[2];
+		FUnorderedAccessViewRHIParamRef OutUAVs[1];
 		OutUAVs[NumOutUAVs++] = ScreenGridResources->ScreenGridConeVisibility.UAV;
-		if (bSupportIrradiance)
-		{
-			OutUAVs[NumOutUAVs++] = ScreenGridResources->ConeDepthVisibilityFunction.UAV;			
-		}
 
 		// Note: no transition, want to overlap object cone tracing and global DF cone tracing since both shaders use atomics to ScreenGridConeVisibility
 		RHICmdList.TransitionResources(EResourceTransitionAccess::ERWNoBarrier, EResourceTransitionPipeline::EComputeToCompute, OutUAVs, NumOutUAVs);
@@ -406,6 +404,8 @@ public:
 		BentNormalNormalizeFactor.Bind(Initializer.ParameterMap, TEXT("BentNormalNormalizeFactor"));
 		ScreenGridConeVisibility.Bind(Initializer.ParameterMap, TEXT("ScreenGridConeVisibility"));
 		DistanceFieldBentNormal.Bind(Initializer.ParameterMap, TEXT("DistanceFieldBentNormal"));
+		ConeBufferMax.Bind(Initializer.ParameterMap, TEXT("ConeBufferMax"));
+		DFNormalBufferUVMax.Bind(Initializer.ParameterMap, TEXT("DFNormalBufferUVMax"));
 	}
 
 	FCombineConeVisibilityCS()
@@ -450,6 +450,15 @@ public:
 		DistanceFieldBentNormal.SetTexture(RHICmdList, ShaderRHI, DownsampledBentNormal.ShaderResourceTexture, DownsampledBentNormal.UAV);
 
 		SetSRVParameter(RHICmdList, ShaderRHI, ScreenGridConeVisibility, ScreenGridResources->ScreenGridConeVisibility.SRV);
+
+		FIntPoint const ConeBufferMaxValue(View.ViewRect.Width() / GAODownsampleFactor / GConeTraceDownsampleFactor - 1, View.ViewRect.Height() / GAODownsampleFactor / GConeTraceDownsampleFactor - 1);
+		SetShaderValue(RHICmdList, ShaderRHI, ConeBufferMax, ConeBufferMaxValue);
+
+		FIntPoint const DFNormalBufferSize = GetBufferSizeForAO();
+		FVector2D const DFNormalBufferUVMaxValue(
+			(View.ViewRect.Width()  / GAODownsampleFactor - 0.5f) / DFNormalBufferSize.X,
+			(View.ViewRect.Height() / GAODownsampleFactor - 0.5f) / DFNormalBufferSize.Y);
+		SetShaderValue(RHICmdList, ShaderRHI, DFNormalBufferUVMax, DFNormalBufferUVMaxValue);
 	}
 
 	void UnsetParameters(FRHICommandList& RHICmdList, FSceneRenderTargetItem& DownsampledBentNormal)
@@ -465,6 +474,8 @@ public:
 		Ar << BentNormalNormalizeFactor;
 		Ar << ScreenGridConeVisibility;
 		Ar << DistanceFieldBentNormal;
+		Ar << DFNormalBufferUVMax;
+		Ar << ConeBufferMax;
 		return bShaderHasOutdatedParameters;
 	}
 
@@ -472,287 +483,56 @@ private:
 
 	FScreenGridParameters ScreenGridParameters;
 	FShaderParameter BentNormalNormalizeFactor;
+	FShaderParameter DFNormalBufferUVMax;
+	FShaderParameter ConeBufferMax;
 	FShaderResourceParameter ScreenGridConeVisibility;
 	FRWShaderParameter DistanceFieldBentNormal;
 };
 
 IMPLEMENT_SHADER_TYPE(,FCombineConeVisibilityCS,TEXT("/Engine/Private/DistanceFieldScreenGridLighting.usf"),TEXT("CombineConeVisibilityCS"),SF_Compute);
 
-template<bool bSupportIrradiance, bool bHighQuality>
-class TGeometryAwareUpsamplePS : public FGlobalShader
-{
-	DECLARE_SHADER_TYPE(TGeometryAwareUpsamplePS, Global);
-public:
-
-	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
-	{
-		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM5) && DoesPlatformSupportDistanceFieldAO(Parameters.Platform);
-	}
-
-	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
-	{
-		OutEnvironment.SetDefine(TEXT("DOWNSAMPLE_FACTOR"), GAODownsampleFactor);
-		OutEnvironment.SetDefine(TEXT("SUPPORT_IRRADIANCE"), bSupportIrradiance);
-		OutEnvironment.SetDefine(TEXT("HIGH_QUALITY_FILL_GAPS"), bHighQuality);
-	}
-
-	/** Default constructor. */
-	TGeometryAwareUpsamplePS() {}
-
-	/** Initialization constructor. */
-	TGeometryAwareUpsamplePS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
-		: FGlobalShader(Initializer)
-	{
-		AOParameters.Bind(Initializer.ParameterMap);
-		DistanceFieldNormalTexture.Bind(Initializer.ParameterMap, TEXT("DistanceFieldNormalTexture"));
-		DistanceFieldNormalSampler.Bind(Initializer.ParameterMap, TEXT("DistanceFieldNormalSampler"));
-		BentNormalAOTexture.Bind(Initializer.ParameterMap, TEXT("BentNormalAOTexture"));
-		BentNormalAOSampler.Bind(Initializer.ParameterMap, TEXT("BentNormalAOSampler"));
-		IrradianceTexture.Bind(Initializer.ParameterMap, TEXT("IrradianceTexture"));
-		IrradianceSampler.Bind(Initializer.ParameterMap, TEXT("IrradianceSampler"));
-		DistanceFieldGBufferTexelSize.Bind(Initializer.ParameterMap, TEXT("DistanceFieldGBufferTexelSize"));
-		BentNormalBufferAndTexelSize.Bind(Initializer.ParameterMap, TEXT("BentNormalBufferAndTexelSize"));
-		MinDownsampleFactorToBaseLevel.Bind(Initializer.ParameterMap, TEXT("MinDownsampleFactorToBaseLevel"));
-		DistanceFadeScale.Bind(Initializer.ParameterMap, TEXT("DistanceFadeScale"));
-		JitterOffset.Bind(Initializer.ParameterMap, TEXT("JitterOffset"));
-	}
-
-	void SetParameters(
-		FRHICommandList& RHICmdList, 
-		const FViewInfo& View, 
-		FSceneRenderTargetItem& DistanceFieldNormal, 
-		FSceneRenderTargetItem& DistanceFieldAOBentNormal, 
-		IPooledRenderTarget* DistanceFieldIrradiance, 
-		const FDistanceFieldAOParameters& Parameters)
-	{
-		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
-
-		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
-
-		AOParameters.Set(RHICmdList, ShaderRHI, Parameters);
-
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			DistanceFieldNormalTexture,
-			DistanceFieldNormalSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			DistanceFieldNormal.ShaderResourceTexture
-			);
-
-		SetTextureParameter(
-			RHICmdList,
-			ShaderRHI,
-			BentNormalAOTexture,
-			BentNormalAOSampler,
-			TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-			DistanceFieldAOBentNormal.ShaderResourceTexture
-			);
-
-		if (IrradianceTexture.IsBound())
-		{
-			SetTextureParameter(
-				RHICmdList,
-				ShaderRHI,
-				IrradianceTexture,
-				IrradianceSampler,
-				TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(),
-				DistanceFieldIrradiance->GetRenderTargetItem().ShaderResourceTexture
-				);
-		}
-
-		const FIntPoint DownsampledBufferSize = GetBufferSizeForAO();
-		const FVector2D BaseLevelTexelSizeValue(1.0f / DownsampledBufferSize.X, 1.0f / DownsampledBufferSize.Y);
-		SetShaderValue(RHICmdList, ShaderRHI, DistanceFieldGBufferTexelSize, BaseLevelTexelSizeValue);
-
-		const FIntPoint ConeTracingBufferSize = GetBufferSizeForConeTracing();
-		const FVector4 BentNormalBufferAndTexelSizeValue(ConeTracingBufferSize.X, ConeTracingBufferSize.Y, 1.0f / ConeTracingBufferSize.X, 1.0f / ConeTracingBufferSize.Y);
-		SetShaderValue(RHICmdList, ShaderRHI, BentNormalBufferAndTexelSize, BentNormalBufferAndTexelSizeValue);
-
-		const float MinDownsampleFactor = GConeTraceDownsampleFactor; 
-		SetShaderValue(RHICmdList, ShaderRHI, MinDownsampleFactorToBaseLevel, MinDownsampleFactor);
-
-		extern float GAOViewFadeDistanceScale;
-		const float DistanceFadeScaleValue = 1.0f / ((1.0f - GAOViewFadeDistanceScale) * GetMaxAOViewDistance());
-		SetShaderValue(RHICmdList, ShaderRHI, DistanceFadeScale, DistanceFadeScaleValue);
-
-		SetShaderValue(RHICmdList, ShaderRHI, JitterOffset, GetJitterOffset(View.ViewState->GetDistanceFieldTemporalSampleIndex()));
-	}
-
-	// FShader interface.
-	virtual bool Serialize(FArchive& Ar) override
-	{
-		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
-		Ar << AOParameters;
-		Ar << DistanceFieldNormalTexture;
-		Ar << DistanceFieldNormalSampler;
-		Ar << BentNormalAOTexture;
-		Ar << BentNormalAOSampler;
-		Ar << IrradianceTexture;
-		Ar << IrradianceSampler;
-		Ar << DistanceFieldGBufferTexelSize;
-		Ar << BentNormalBufferAndTexelSize;
-		Ar << MinDownsampleFactorToBaseLevel;
-		Ar << DistanceFadeScale;
-		Ar << JitterOffset;
-		return bShaderHasOutdatedParameters;
-	}
-
-private:
-
-	FAOParameters AOParameters;
-	FShaderResourceParameter DistanceFieldNormalTexture;
-	FShaderResourceParameter DistanceFieldNormalSampler;
-	FShaderResourceParameter BentNormalAOTexture;
-	FShaderResourceParameter BentNormalAOSampler;
-	FShaderResourceParameter IrradianceTexture;
-	FShaderResourceParameter IrradianceSampler;
-	FShaderParameter DistanceFieldGBufferTexelSize;
-	FShaderParameter BentNormalBufferAndTexelSize;
-	FShaderParameter MinDownsampleFactorToBaseLevel;
-	FShaderParameter DistanceFadeScale;
-	FShaderParameter JitterOffset;
-};
-
-#define IMPLEMENT_AWARE_UPSAMPLE_PS_TYPE(bSupportIrradiance,bHighQuality) \
-	typedef TGeometryAwareUpsamplePS<bSupportIrradiance, bHighQuality> TGeometryAwareUpsamplePS##bSupportIrradiance##bHighQuality; \
-	IMPLEMENT_SHADER_TYPE(template<>,TGeometryAwareUpsamplePS##bSupportIrradiance##bHighQuality,TEXT("/Engine/Private/DistanceFieldScreenGridLighting.usf"),TEXT("GeometryAwareUpsamplePS"),SF_Pixel); 
-
-IMPLEMENT_AWARE_UPSAMPLE_PS_TYPE(true, true);
-IMPLEMENT_AWARE_UPSAMPLE_PS_TYPE(true, false);
-IMPLEMENT_AWARE_UPSAMPLE_PS_TYPE(false, true);
-IMPLEMENT_AWARE_UPSAMPLE_PS_TYPE(false, false);
-
 void PostProcessBentNormalAOScreenGrid(
 	FRHICommandListImmediate& RHICmdList, 
 	const FDistanceFieldAOParameters& Parameters, 
 	const FViewInfo& View, 
 	IPooledRenderTarget* VelocityTexture,
-	FSceneRenderTargetItem& BentNormalInterpolation, 
-	IPooledRenderTarget* IrradianceInterpolation,
+	FSceneRenderTargetItem& BentNormalInterpolation,
 	FSceneRenderTargetItem& DistanceFieldNormal,
-	TRefCountPtr<IPooledRenderTarget>& BentNormalOutput,
-	TRefCountPtr<IPooledRenderTarget>& IrradianceOutput)
+	TRefCountPtr<IPooledRenderTarget>& BentNormalOutput)
 {
 	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
-	const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View);
-
-	TRefCountPtr<IPooledRenderTarget> DistanceFieldAOBentNormal;
-	TRefCountPtr<IPooledRenderTarget> DistanceFieldAOConfidence;
-	TRefCountPtr<IPooledRenderTarget> DistanceFieldIrradiance;
-	AllocateOrReuseAORenderTarget(RHICmdList, DistanceFieldAOBentNormal, TEXT("DistanceFieldBentNormalAO"), PF_FloatRGBA, GFastVRamConfig.DistanceFieldAOBentNormal);
-	AllocateOrReuseAORenderTarget(RHICmdList, DistanceFieldAOConfidence, TEXT("DistanceFieldConfidence"), PF_G8, GFastVRamConfig.DistanceFieldAOConfidence);
-
-	if (bUseDistanceFieldGI)
-	{
-		AllocateOrReuseAORenderTarget(RHICmdList, DistanceFieldIrradiance, TEXT("DistanceFieldIrradiance"), PF_FloatRGB, GFastVRamConfig.DistanceFieldIrradiance);
-	}
-
-	{
-		SCOPED_DRAW_EVENT(RHICmdList, GeometryAwareUpsample);
-
-		FTextureRHIParamRef RenderTargets[3] =
-		{
-			DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture,
-			DistanceFieldAOConfidence->GetRenderTargetItem().TargetableTexture,
-			bUseDistanceFieldGI ? DistanceFieldIrradiance->GetRenderTargetItem().TargetableTexture : NULL,
-		};
-
-		SetRenderTargets(RHICmdList, ARRAY_COUNT(RenderTargets) - (bUseDistanceFieldGI ? 0 : 1), RenderTargets, FTextureRHIParamRef(), 0, NULL);
-
-		FGraphicsPipelineStateInitializer GraphicsPSOInit;
-		RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
-		{
-			RHICmdList.SetViewport(0, 0, 0.0f, View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor, 1.0f);
-			GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
-			GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
-			GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
-
-			TShaderMapRef<FPostProcessVS> VertexShader(View.ShaderMap);
-			GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-			GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-			GraphicsPSOInit.PrimitiveType = PT_TriangleList;
-
-			if (bUseDistanceFieldGI)
-			{
-				TShaderMapRef<TGeometryAwareUpsamplePS<true, false> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, BentNormalInterpolation, IrradianceInterpolation, Parameters);
-			}
-			else
-			{
-				TShaderMapRef<TGeometryAwareUpsamplePS<false, false> > PixelShader(View.ShaderMap);
-				GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-				SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-				PixelShader->SetParameters(RHICmdList, View, DistanceFieldNormal, BentNormalInterpolation, IrradianceInterpolation, Parameters);
-			}
-
-			VertexShader->SetParameters(RHICmdList, View.ViewUniformBuffer);
-
-			DrawRectangle( 
-				RHICmdList,
-				0, 0, 
-				View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor,
-				0, 0, 
-				View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor,
-				FIntPoint(View.ViewRect.Width() / GAODownsampleFactor, View.ViewRect.Height() / GAODownsampleFactor),
-				SceneContext.GetBufferSizeXY() / FIntPoint(GAODownsampleFactor, GAODownsampleFactor),
-				*VertexShader);
-		}
-
-		RHICmdList.CopyToResolveTarget(DistanceFieldAOBentNormal->GetRenderTargetItem().TargetableTexture, DistanceFieldAOBentNormal->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-		RHICmdList.CopyToResolveTarget(DistanceFieldAOConfidence->GetRenderTargetItem().TargetableTexture, DistanceFieldAOConfidence->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-
-		if (bUseDistanceFieldGI)
-		{
-			RHICmdList.CopyToResolveTarget(DistanceFieldIrradiance->GetRenderTargetItem().TargetableTexture, DistanceFieldIrradiance->GetRenderTargetItem().ShaderResourceTexture, FResolveParams());
-		}
-	}
 
 	FSceneViewState* ViewState = (FSceneViewState*)View.State;
 	FIntRect* DistanceFieldAOHistoryViewRect = ViewState ? &ViewState->DistanceFieldAOHistoryViewRect : nullptr;
 	TRefCountPtr<IPooledRenderTarget>* BentNormalHistoryState = ViewState ? &ViewState->DistanceFieldAOHistoryRT : NULL;
-	TRefCountPtr<IPooledRenderTarget>* ConfidenceHistoryState = ViewState ? &ViewState->DistanceFieldAOConfidenceHistoryRT : NULL;
-	TRefCountPtr<IPooledRenderTarget>* IrradianceHistoryState = ViewState ? &ViewState->DistanceFieldIrradianceHistoryRT : NULL;
-	BentNormalOutput = DistanceFieldAOBentNormal;
-	IrradianceOutput = DistanceFieldIrradiance;
 
-	if (GAOUseHistory)
-	{
-		UpdateHistory(
-			RHICmdList,
-			View, 
-			TEXT("DistanceFieldAOHistory"),
-			TEXT("DistanceFieldAOConfidence"),
-			TEXT("DistanceFieldIrradianceHistory"),
-			VelocityTexture,
-			DistanceFieldNormal,
-			DistanceFieldAOHistoryViewRect,
-			BentNormalHistoryState,
-			ConfidenceHistoryState,
-			IrradianceHistoryState,
-			DistanceFieldAOBentNormal, 
-			DistanceFieldAOConfidence,
-			DistanceFieldIrradiance,
-			BentNormalOutput,
-			IrradianceOutput);
-	}
+	UpdateHistory(
+		RHICmdList,
+		View, 
+		TEXT("DistanceFieldAOHistory"),
+		VelocityTexture,
+		DistanceFieldNormal,
+		BentNormalInterpolation,
+		DistanceFieldAOHistoryViewRect,
+		BentNormalHistoryState,
+		BentNormalOutput,
+		Parameters);
 }
 
 void FDeferredShadingSceneRenderer::RenderDistanceFieldAOScreenGrid(
 	FRHICommandListImmediate& RHICmdList, 
 	const FViewInfo& View,
-	FIntPoint TileListGroupSize,
 	const FDistanceFieldAOParameters& Parameters, 
 	const TRefCountPtr<IPooledRenderTarget>& VelocityTexture,
 	const TRefCountPtr<IPooledRenderTarget>& DistanceFieldNormal, 
-	TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO, 
-	TRefCountPtr<IPooledRenderTarget>& OutDynamicIrradiance)
+	TRefCountPtr<IPooledRenderTarget>& OutDynamicBentNormalAO)
 {
 	const bool bUseDistanceFieldGI = IsDistanceFieldGIAllowed(View);
 	const bool bUseGlobalDistanceField = UseGlobalDistanceField(Parameters) && Scene->DistanceFieldSceneData.NumObjectsInBuffer > 0;
+	const bool bUseObjectDistanceField = UseAOObjectDistanceField();
+
 	const FIntPoint ConeTraceBufferSize = GetBufferSizeForConeTracing();
+	const FIntPoint TileListGroupSize = GetTileListGroupSizeForView(View);
 
 	FAOScreenGridResources*& ScreenGridResources = View.ViewState->AOScreenGridResources;
 
@@ -792,7 +572,7 @@ void FDeferredShadingSceneRenderer::RenderDistanceFieldAOScreenGrid(
 
 		check(View.GlobalDistanceFieldInfo.Clipmaps.Num() > 0);
 
-		if (bUseDistanceFieldGI)
+		if (bUseObjectDistanceField)
 		{
 			TShaderMapRef<TConeTraceScreenGridGlobalOcclusionCS<true> > ComputeShader(View.ShaderMap);
 
@@ -812,6 +592,7 @@ void FDeferredShadingSceneRenderer::RenderDistanceFieldAOScreenGrid(
 		}
 	}
 
+	if (bUseObjectDistanceField)
 	{
 		SCOPED_DRAW_EVENT(RHICmdList, ConeTraceObjects);
 		FTileIntersectionResources* TileIntersectionResources = ((FSceneViewState*)View.State)->AOTileIntersectionResources;
@@ -921,9 +702,7 @@ void FDeferredShadingSceneRenderer::RenderDistanceFieldAOScreenGrid(
 		Parameters, 
 		View, 
 		VelocityTexture, 
-		DownsampledBentNormal->GetRenderTargetItem(), 
-		DownsampledIrradiance, 
+		DownsampledBentNormal->GetRenderTargetItem(),
 		DistanceFieldNormal->GetRenderTargetItem(), 
-		OutDynamicBentNormalAO, 
-		OutDynamicIrradiance);
+		OutDynamicBentNormalAO);
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldShadowing.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldShadowing.cpp
index 23511e6db484..b74a5c651c7f 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldShadowing.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldShadowing.cpp
@@ -36,6 +36,15 @@ FAutoConsoleVariableRef CVarDistanceFieldShadowing(
 	ECVF_Scalability | ECVF_RenderThreadSafe
 	);
 
+int32 GDFShadowQuality = 2;
+FAutoConsoleVariableRef CVarDFShadowQuality(
+	TEXT("r.DFShadowQuality"),
+	GDFShadowQuality,
+	TEXT("Defines the distance field shadow method which allows to adjust for quality or performance.\n")
+	TEXT(" 0:off, 1:medium (less samples, no SSS), 2:high (default)"),
+	ECVF_Scalability | ECVF_RenderThreadSafe
+);
+
 int32 GFullResolutionDFShadowing = 0;
 FAutoConsoleVariableRef CVarFullResolutionDFShadowing(
 	TEXT("r.DFFullResolution"),
@@ -52,10 +61,10 @@ FAutoConsoleVariableRef CVarShadowScatterTileCulling(
 	ECVF_RenderThreadSafe
 	);
 
-float GShadowWorldTileSize = 200.0f;
-FAutoConsoleVariableRef CVarShadowWorldTileSize(
-	TEXT("r.DFShadowWorldTileSize"),
-	GShadowWorldTileSize,
+float GShadowCullTileWorldSize = 200.0f;
+FAutoConsoleVariableRef CVarShadowCullTileWorldSize(
+	TEXT("r.DFShadowCullTileWorldSize"),
+	GShadowCullTileWorldSize,
 	TEXT("World space size of a tile used for culling for directional lights."),
 	ECVF_Scalability | ECVF_RenderThreadSafe
 	);
@@ -76,6 +85,9 @@ FAutoConsoleVariableRef CVarAverageObjectsPerShadowCullTile(
 	ECVF_RenderThreadSafe | ECVF_ReadOnly
 	);
 
+int32 const GDistanceFieldShadowTileSizeX = 8;
+int32 const GDistanceFieldShadowTileSizeY = 8;
+
 int32 GetDFShadowDownsampleFactor()
 {
 	return GFullResolutionDFShadowing ? 1 : GAODownsampleFactor;
@@ -135,7 +147,7 @@ public:
 
 		CulledObjectParameters.Set(RHICmdList, ShaderRHI, GShadowCulledObjectBuffers.Buffers);
 
-		SetShaderValue(RHICmdList, ShaderRHI, ObjectBoundingGeometryIndexCount, StencilingGeometry::GLowPolyStencilSphereIndexBuffer.GetIndexCount());
+		SetShaderValue(RHICmdList, ShaderRHI, ObjectBoundingGeometryIndexCount, ARRAY_COUNT(GCubeIndices));
 		SetShaderValue(RHICmdList, ShaderRHI, WorldToShadow, WorldToShadowValue);
 		SetShaderValue(RHICmdList, ShaderRHI, ShadowBoundingSphere, ShadowBoundingSphereValue);
 
@@ -204,9 +216,8 @@ public:
 		FGlobalShader(Initializer)
 	{
 		ObjectParameters.Bind(Initializer.ParameterMap);
-		ConservativeRadiusScale.Bind(Initializer.ParameterMap, TEXT("ConservativeRadiusScale"));
 		WorldToShadow.Bind(Initializer.ParameterMap, TEXT("WorldToShadow"));
-		MinRadius.Bind(Initializer.ParameterMap, TEXT("MinRadius"));
+		MinExpandRadius.Bind(Initializer.ParameterMap, TEXT("MinExpandRadius"));
 	}
 
 	FShadowObjectCullVS() {}
@@ -218,35 +229,25 @@ public:
 		
 		ObjectParameters.Set(RHICmdList, ShaderRHI, GShadowCulledObjectBuffers.Buffers);
 
-		const int32 NumRings = StencilingGeometry::GLowPolyStencilSphereVertexBuffer.GetNumRings();
-		const float RadiansPerRingSegment = PI / (float)NumRings;
-
-		// Boost the effective radius so that the edges of the sphere approximation lie on the sphere, instead of the vertices
-		const float ConservativeRadiusScaleValue = 1.0f / FMath::Cos(RadiansPerRingSegment);
-
-		SetShaderValue(RHICmdList, ShaderRHI, ConservativeRadiusScale, ConservativeRadiusScaleValue);
-
 		SetShaderValue(RHICmdList, ShaderRHI, WorldToShadow, WorldToShadowMatrixValue);
 
-		float MinRadiusValue = 2 * ShadowRadius / FMath::Min(NumGroupsValue.X, NumGroupsValue.Y);
-		SetShaderValue(RHICmdList, ShaderRHI, MinRadius, MinRadiusValue);
+		float MinExpandRadiusValue = 1.414f * ShadowRadius / FMath::Min(NumGroupsValue.X, NumGroupsValue.Y);
+		SetShaderValue(RHICmdList, ShaderRHI, MinExpandRadius, MinExpandRadiusValue);
 	}
 
 	virtual bool Serialize(FArchive& Ar) override
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << ObjectParameters;
-		Ar << ConservativeRadiusScale;
 		Ar << WorldToShadow;
-		Ar << MinRadius;
+		Ar << MinExpandRadius;
 		return bShaderHasOutdatedParameters;
 	}
 
 private:
 	FDistanceFieldCulledObjectBufferParameters ObjectParameters;
-	FShaderParameter ConservativeRadiusScale;
 	FShaderParameter WorldToShadow;
-	FShaderParameter MinRadius;
+	FShaderParameter MinExpandRadius;
 };
 
 IMPLEMENT_SHADER_TYPE(,FShadowObjectCullVS,TEXT("/Engine/Private/DistanceFieldShadowing.usf"),TEXT("ShadowObjectCullVS"),SF_Vertex);
@@ -321,7 +322,7 @@ enum EDistanceFieldShadowingType
 	DFS_PointLightTiledCulling
 };
 
-template<EDistanceFieldShadowingType ShadowingType>
+template<EDistanceFieldShadowingType ShadowingType, uint32 DFShadowQuality>
 class TDistanceFieldShadowingCS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(TDistanceFieldShadowingCS, Global);
@@ -335,10 +336,11 @@ public:
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
 		FLightTileIntersectionParameters::ModifyCompilationEnvironment(Parameters.Platform, OutEnvironment);
-		OutEnvironment.SetDefine(TEXT("THREADGROUP_SIZEX"), GDistanceFieldAOTileSizeX);
-		OutEnvironment.SetDefine(TEXT("THREADGROUP_SIZEY"), GDistanceFieldAOTileSizeY);
+		OutEnvironment.SetDefine(TEXT("THREADGROUP_SIZEX"), GDistanceFieldShadowTileSizeX);
+		OutEnvironment.SetDefine(TEXT("THREADGROUP_SIZEY"), GDistanceFieldShadowTileSizeY);
 		OutEnvironment.SetDefine(TEXT("SCATTER_TILE_CULLING"), ShadowingType == DFS_DirectionalLightScatterTileCulling);
 		OutEnvironment.SetDefine(TEXT("POINT_LIGHT"), ShadowingType == DFS_PointLightTiledCulling);
+		OutEnvironment.SetDefine(TEXT("DF_SHADOW_QUALITY"), DFShadowQuality);
 	}
 
 	/** Default constructor. */
@@ -464,6 +466,16 @@ public:
 		return bShaderHasOutdatedParameters;
 	}
 
+	static const TCHAR* GetSourceFilename()
+	{
+		return TEXT("/Engine/Private/DistanceFieldShadowing.usf");
+	}
+
+	static const TCHAR* GetFunctionName()
+	{
+		return TEXT("DistanceFieldShadowingCS");
+	}
+
 private:
 
 	FRWShaderParameter ShadowFactors;
@@ -484,9 +496,18 @@ private:
 	FShaderParameter DownsampleFactor;
 };
 
-IMPLEMENT_SHADER_TYPE(template<>,TDistanceFieldShadowingCS<DFS_DirectionalLightScatterTileCulling>,TEXT("/Engine/Private/DistanceFieldShadowing.usf"),TEXT("DistanceFieldShadowingCS"),SF_Compute);
-IMPLEMENT_SHADER_TYPE(template<>,TDistanceFieldShadowingCS<DFS_DirectionalLightTiledCulling>,TEXT("/Engine/Private/DistanceFieldShadowing.usf"),TEXT("DistanceFieldShadowingCS"),SF_Compute);
-IMPLEMENT_SHADER_TYPE(template<>,TDistanceFieldShadowingCS<DFS_PointLightTiledCulling>,TEXT("/Engine/Private/DistanceFieldShadowing.usf"),TEXT("DistanceFieldShadowingCS"),SF_Compute);
+// #define avoids a lot of code duplication
+#define VARIATION(A) \
+	typedef TDistanceFieldShadowingCS<A, 1> FDistanceFieldShadowingCS##A##1; \
+	typedef TDistanceFieldShadowingCS<A, 2> FDistanceFieldShadowingCS##A##2; \
+	IMPLEMENT_SHADER_TYPE2(FDistanceFieldShadowingCS##A##1, SF_Compute); \
+	IMPLEMENT_SHADER_TYPE2(FDistanceFieldShadowingCS##A##2, SF_Compute);
+
+VARIATION(DFS_DirectionalLightScatterTileCulling)
+VARIATION(DFS_DirectionalLightTiledCulling)
+VARIATION(DFS_PointLightTiledCulling)
+
+#undef VARIATION
 
 template<bool bUpsampleRequired>
 class TDistanceFieldShadowingUpsamplePS : public FGlobalShader
@@ -689,7 +710,6 @@ void ScatterObjectsToShadowTiles(
 	GraphicsPSOInit.RasterizerState = View.bReverseCulling ? TStaticRasterizerState<FM_Solid, CM_CW>::GetRHI() : TStaticRasterizerState<FM_Solid, CM_CCW>::GetRHI();
 	GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
 	GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
-
 	GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GetVertexDeclarationFVector4();
 	GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
 	GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
@@ -699,11 +719,11 @@ void ScatterObjectsToShadowTiles(
 	VertexShader->SetParameters(RHICmdList, View, FVector2D(LightTileDimensions.X, LightTileDimensions.Y), WorldToShadowValue, ShadowBoundingRadius);
 	PixelShader->SetParameters(RHICmdList, View, TileIntersectionResources);
 
-	RHICmdList.SetStreamSource(0, StencilingGeometry::GLowPolyStencilSphereVertexBuffer.VertexBufferRHI, 0);
+	RHICmdList.SetStreamSource(0, GetUnitCubeVertexBuffer(), 0);
 
 	RHICmdList.DrawIndexedPrimitiveIndirect(
 		PT_TriangleList,
-		StencilingGeometry::GLowPolyStencilSphereIndexBuffer.IndexBufferRHI, 
+		GetUnitCubeIndexBuffer(),
 		GShadowCulledObjectBuffers.Buffers.ObjectIndirectArguments.Buffer,
 		0);
 
@@ -754,8 +774,7 @@ void CullDistanceFieldObjectsForLight(
 	}
 
 	// Allocate tile resolution based on world space size
-	//@todo - light space perspective shadow maps would make much better use of the resolution
-	const float LightTiles = FMath::Min(ShadowBoundingRadius / GShadowWorldTileSize + 1, 256.0f);
+	const float LightTiles = FMath::Min(ShadowBoundingRadius / GShadowCullTileWorldSize + 1.0f, 256.0f);
 	FIntPoint LightTileDimensions(LightTiles, LightTiles);
 
 	if (LightSceneProxy->GetLightType() == LightType_Directional && GShadowScatterTileCulling)
@@ -813,9 +832,15 @@ void CullDistanceFieldObjectsForLight(
 	}
 }
 
+int32 GetDFShadowQuality()
+{
+	return FMath::Clamp(GDFShadowQuality, 0, 2);
+}
+
 bool SupportsDistanceFieldShadows(ERHIFeatureLevel::Type FeatureLevel, EShaderPlatform ShaderPlatform)
 {
-	return GDistanceFieldShadowing
+	return GDistanceFieldShadowing 
+		&& GetDFShadowQuality() > 0
 		&& FeatureLevel >= ERHIFeatureLevel::SM5
 		&& DoesPlatformSupportDistanceFieldShadowing(ShaderPlatform);
 }
@@ -851,43 +876,62 @@ bool FDeferredShadingSceneRenderer::ShouldPrepareForDistanceFieldShadows() const
 		&& SupportsDistanceFieldShadows(Scene->GetFeatureLevel(), Scene->GetShaderPlatform());
 }
 
-template<typename TRHICommandList>
-void RayTraceShadows(TRHICommandList& RHICmdList, const FViewInfo& View, FProjectedShadowInfo* ProjectedShadowInfo, FLightTileIntersectionResources* TileIntersectionResources)
+template<typename TRHICommandList, EDistanceFieldShadowingType DFSType, uint32 DFSQuality>
+void RayTraceShadowsDispatch(TRHICommandList& RHICmdList, const FViewInfo& View, FProjectedShadowInfo* ProjectedShadowInfo, FLightTileIntersectionResources* TileIntersectionResources)
 {
 	FIntRect ScissorRect;
-
 	if (!ProjectedShadowInfo->GetLightSceneInfo().Proxy->GetScissorRect(ScissorRect, View, View.ViewRect))
 	{
 		ScissorRect = View.ViewRect;
 	}
 
-	uint32 GroupSizeX = FMath::DivideAndRoundUp(ScissorRect.Size().X / GetDFShadowDownsampleFactor(), GDistanceFieldAOTileSizeX);
-	uint32 GroupSizeY = FMath::DivideAndRoundUp(ScissorRect.Size().Y / GetDFShadowDownsampleFactor(), GDistanceFieldAOTileSizeY);
+	uint32 GroupSizeX = FMath::DivideAndRoundUp(ScissorRect.Size().X / GetDFShadowDownsampleFactor(), GDistanceFieldShadowTileSizeX);
+	uint32 GroupSizeY = FMath::DivideAndRoundUp(ScissorRect.Size().Y / GetDFShadowDownsampleFactor(), GDistanceFieldShadowTileSizeY);
 
+	TShaderMapRef<TDistanceFieldShadowingCS<DFSType, DFSQuality> > ComputeShader(View.ShaderMap);
+	RHICmdList.SetComputeShader(ComputeShader->GetComputeShader());
 	FSceneRenderTargetItem& RayTracedShadowsRTI = ProjectedShadowInfo->RayTracedShadowsRT->GetRenderTargetItem();
+	ComputeShader->SetParameters(RHICmdList, View, ProjectedShadowInfo, RayTracedShadowsRTI, FVector2D(GroupSizeX, GroupSizeY), ScissorRect, TileIntersectionResources);
+	DispatchComputeShader(RHICmdList, *ComputeShader, GroupSizeX, GroupSizeY, 1);
+	ComputeShader->UnsetParameters(RHICmdList, RayTracedShadowsRTI);
+}
+
+template<typename TRHICommandList>
+void RayTraceShadows(TRHICommandList& RHICmdList, const FViewInfo& View, FProjectedShadowInfo* ProjectedShadowInfo, FLightTileIntersectionResources* TileIntersectionResources)
+{
+	int32 const DFShadowQuality = GetDFShadowQuality();
 	if (ProjectedShadowInfo->bDirectionalLight && GShadowScatterTileCulling)
 	{
-		TShaderMapRef<TDistanceFieldShadowingCS<DFS_DirectionalLightScatterTileCulling> > ComputeShader(View.ShaderMap);
-		RHICmdList.SetComputeShader(ComputeShader->GetComputeShader());
-		ComputeShader->SetParameters(RHICmdList, View, ProjectedShadowInfo, RayTracedShadowsRTI, FVector2D(GroupSizeX, GroupSizeY), ScissorRect, TileIntersectionResources);
-		DispatchComputeShader(RHICmdList, *ComputeShader, GroupSizeX, GroupSizeY, 1);
-		ComputeShader->UnsetParameters(RHICmdList, RayTracedShadowsRTI);
+		if (DFShadowQuality == 1)
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_DirectionalLightScatterTileCulling, 1>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
+		else
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_DirectionalLightScatterTileCulling, 2>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
 	}
 	else if (ProjectedShadowInfo->bDirectionalLight)
 	{
-		TShaderMapRef<TDistanceFieldShadowingCS<DFS_DirectionalLightTiledCulling> > ComputeShader(View.ShaderMap);
-		RHICmdList.SetComputeShader(ComputeShader->GetComputeShader());
-		ComputeShader->SetParameters(RHICmdList, View, ProjectedShadowInfo, RayTracedShadowsRTI, FVector2D(GroupSizeX, GroupSizeY), ScissorRect, TileIntersectionResources);
-		DispatchComputeShader(RHICmdList, *ComputeShader, GroupSizeX, GroupSizeY, 1);
-		ComputeShader->UnsetParameters(RHICmdList, RayTracedShadowsRTI);
+		if (DFShadowQuality == 1)
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_DirectionalLightTiledCulling, 1>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
+		else
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_DirectionalLightTiledCulling, 2>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
 	}
 	else
 	{
-		TShaderMapRef<TDistanceFieldShadowingCS<DFS_PointLightTiledCulling> > ComputeShader(View.ShaderMap);
-		RHICmdList.SetComputeShader(ComputeShader->GetComputeShader());
-		ComputeShader->SetParameters(RHICmdList, View, ProjectedShadowInfo, RayTracedShadowsRTI, FVector2D(GroupSizeX, GroupSizeY), ScissorRect, TileIntersectionResources);
-		DispatchComputeShader(RHICmdList, *ComputeShader, GroupSizeX, GroupSizeY, 1);
-		ComputeShader->UnsetParameters(RHICmdList, RayTracedShadowsRTI);
+		if (DFShadowQuality == 1)
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_PointLightTiledCulling, 1>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
+		else
+		{
+			RayTraceShadowsDispatch<TRHICommandList, DFS_PointLightTiledCulling, 2>(RHICmdList, View, ProjectedShadowInfo, TileIntersectionResources);
+		}
 	}
 }
 
@@ -956,9 +1000,9 @@ void FProjectedShadowInfo::BeginRenderRayTracedDistanceFieldProjection(FRHIComma
 			SCOPED_DRAW_EVENT(RHICmdList, RayTraceShadows);
 			SetRenderTarget(RHICmdList, NULL, NULL);
 
-				RayTraceShadows(RHICmdList, View, this, TileIntersectionResources);
-			}
+			RayTraceShadows(RHICmdList, View, this, TileIntersectionResources);
 		}
+	}
 }
 
 void FProjectedShadowInfo::RenderRayTracedDistanceFieldProjection(FRHICommandListImmediate& RHICmdList, const FViewInfo& View, IPooledRenderTarget* ScreenShadowMaskTexture, bool bProjectingForForwardShading) 
diff --git a/Engine/Source/Runtime/Renderer/Private/DistanceFieldVisualization.cpp b/Engine/Source/Runtime/Renderer/Private/DistanceFieldVisualization.cpp
index bd066278fea9..b6ec987976aa 100644
--- a/Engine/Source/Runtime/Renderer/Private/DistanceFieldVisualization.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/DistanceFieldVisualization.cpp
@@ -171,9 +171,7 @@ void FDeferredShadingSceneRenderer::RenderMeshDistanceFieldVisualization(FRHICom
 	//@todo - support multiple views
 	const FViewInfo& View = Views[0];
 
-	extern int32 GDistanceFieldAO;
-
-	if (GDistanceFieldAO 
+	if (UseDistanceFieldAO()
 		&& FeatureLevel >= ERHIFeatureLevel::SM5
 		&& DoesPlatformSupportDistanceFieldAO(View.GetShaderPlatform())
 		&& Views.Num() == 1)
diff --git a/Engine/Source/Runtime/Renderer/Private/LightGridInjection.cpp b/Engine/Source/Runtime/Renderer/Private/LightGridInjection.cpp
index 0d434c2ba74d..16fcb46d813e 100644
--- a/Engine/Source/Runtime/Renderer/Private/LightGridInjection.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/LightGridInjection.cpp
@@ -146,16 +146,11 @@ IMPLEMENT_UNIFORM_BUFFER_STRUCT(FForwardLightData, TEXT("ForwardLightData"));
 
 FForwardLightData::FForwardLightData()
 {
-	NumLocalLights = 0;
-	HasDirectionalLight = 0;
-	NumDirectionalLightCascades = 0;
-	CascadeEndDepths = FVector4(0, 0, 0, 0);
+	FMemory::Memzero(*this);
 	DirectionalLightShadowmapAtlas = GBlackTexture->TextureRHI;
-	ShadowmapSampler = TStaticSamplerState<SF_Point, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
-	DirectionalLightUseStaticShadowing = 0;
+	ShadowmapSampler = TStaticSamplerState<SF_Point,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI();
 	DirectionalLightStaticShadowmap = GBlackTexture->TextureRHI;
-	StaticShadowmapSampler = TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
-	DirectionalLightShadowmapAtlasBufferSize = FVector4(0, 0, 0, 0);
+	StaticShadowmapSampler = TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI();
 
 	ForwardLocalLightBuffer = nullptr;
 	NumCulledLightsGrid = nullptr;
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.cpp b/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.cpp
index 5ea8277e2254..07a26a23ef62 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.cpp
@@ -21,6 +21,14 @@ static TAutoConsoleVariable<int32> CVarMobileDisableVertexFog(
 	TEXT("Set to 1 to disable vertex fogging in all mobile shaders."),
 	ECVF_ReadOnly | ECVF_RenderThreadSafe);
 
+
+static TAutoConsoleVariable<int32> CVarMobileUseLegacyShadingModel(
+	TEXT("r.Mobile.UseLegacyShadingModel"),
+	0,
+	TEXT("If 1 then use legacy (pre 4.20) shading model (such as spherical guassian specular calculation.) (will cause a shader rebuild)"),
+	ECVF_ReadOnly | ECVF_RenderThreadSafe);
+
+
 // Changing this causes a full shader recompile
 static TAutoConsoleVariable<int32> CVarMobileSeparateMaskedPass(
 	TEXT("r.Mobile.SeparateMaskedPass"),
@@ -100,15 +108,23 @@ bool TMobileBasePassPSPolicyParamType<PixelParametersType>::ModifyCompilationEnv
 	return true;
 }
 
-void GetSkyTextureParams(FPrimitiveSceneInfo* PrimitiveSceneInfo, float& AverageBrightnessOUT, FTexture*& ReflectionTextureOUT)
+bool UseSkyReflectionCapture(const FScene* RenderScene)
 {
-	if (PrimitiveSceneInfo && PrimitiveSceneInfo->Scene->SkyLight && PrimitiveSceneInfo->Scene->SkyLight->ProcessedTexture->TextureRHI)
-	{
-		AverageBrightnessOUT = PrimitiveSceneInfo->Scene->SkyLight->AverageBrightness;
-		ReflectionTextureOUT = PrimitiveSceneInfo->Scene->SkyLight->ProcessedTexture;
-	}
+	return RenderScene
+		&& RenderScene->ReflectionSceneData.RegisteredReflectionCapturePositions.Num() == 0
+		&& RenderScene->SkyLight
+		&& RenderScene->SkyLight->ProcessedTexture->TextureRHI;
 }
 
+void GetSkyTextureParams(const FScene* Scene, float& AverageBrightnessOUT, FTexture*& ReflectionTextureOUT, float& OutSkyMaxMipIndex)
+{
+	if (Scene && Scene->SkyLight && Scene->SkyLight->ProcessedTexture->TextureRHI)
+	{
+		AverageBrightnessOUT = Scene->SkyLight->AverageBrightness;
+		ReflectionTextureOUT = Scene->SkyLight->ProcessedTexture;
+		OutSkyMaxMipIndex = FMath::Log2(ReflectionTextureOUT->GetSizeX());
+	}
+}
 
 FMobileBasePassMovablePointLightInfo::FMobileBasePassMovablePointLightInfo(const FPrimitiveSceneProxy* InSceneProxy)
 : NumMovablePointLights(0)
@@ -697,7 +713,7 @@ void FMobileSceneRenderer::RenderMobileEditorPrimitives(FRHICommandList& RHICmdL
 	}
 }
 
-void FMobileSceneRenderer::RenderMobileBasePassDynamicData(FRHICommandList& RHICmdList, const FViewInfo& View, const FDrawingPolicyRenderState& DrawRenderState, bool bWireFrame, int32 FirstElement, int32 AfterLastElement)
+void FMobileSceneRenderer::RenderMobileBasePassDynamicData(FRHICommandList& RHICmdList, const FViewInfo& View, const FDrawingPolicyRenderState& DrawRenderState, EBlendMode BlendMode, bool bWireFrame, int32 FirstElement, int32 AfterLastElement)
 {
 	AfterLastElement = FMath::Min(View.DynamicMeshElements.Num(), AfterLastElement);
 
@@ -713,7 +729,9 @@ void FMobileSceneRenderer::RenderMobileBasePassDynamicData(FRHICommandList& RHIC
 	for (int32 Index = FirstElement; Index < AfterLastElement; Index++)
 	{
 		const FMeshBatchAndRelevance& MeshBatchAndRelevance = View.DynamicMeshElements[Index];
-		if (MeshBatchAndRelevance.GetHasOpaqueOrMaskedMaterial() || bWireFrame)
+
+		if ((BlendMode == BLEND_Opaque && MeshBatchAndRelevance.GetHasOpaqueMaterial()) || 
+			(BlendMode == BLEND_Masked && MeshBatchAndRelevance.GetHasMaskedMaterial()) || bWireFrame)
 		{
 			const FMeshBatch& MeshBatch = *MeshBatchAndRelevance.Mesh;
 			FMobileBasePassOpaqueDrawingPolicyFactory::DrawDynamicMesh(RHICmdList, View, Context, MeshBatch, true, DrawRenderState, MeshBatchAndRelevance.PrimitiveSceneProxy, MeshBatch.BatchHitProxyId);
@@ -721,7 +739,6 @@ void FMobileSceneRenderer::RenderMobileBasePassDynamicData(FRHICommandList& RHIC
 	}
 }
 
-
 struct FMobileBasePassViewInfo
 {
 	const FMobileCSMVisibilityInfo* MobileCSMVisibilityInfo;
@@ -826,6 +843,7 @@ class FRenderMobileBasePassDynamicDataThreadTask : public FRenderTask
 	FDrawingPolicyRenderState DrawRenderState;
 	int32 FirstElement;
 	int32 AfterLastElement;
+	EBlendMode BlendMode;
 	bool bWireFrame;
 
 public:
@@ -835,6 +853,7 @@ public:
 		FRHICommandList& InRHICmdList,
 		const FViewInfo& InView,
 		const FDrawingPolicyRenderState& InDrawRenderState,
+		EBlendMode InBlendMode,
 		bool bInWireFrame,
 		int32 InFirstElement,
 		int32 InAfterLastElement
@@ -846,6 +865,7 @@ public:
 		, DrawRenderState(InDrawRenderState)
 		, FirstElement(InFirstElement)
 		, AfterLastElement(InAfterLastElement)
+		, BlendMode(InBlendMode)
 		, bWireFrame(bInWireFrame)
 	{
 		check(FirstElement < AfterLastElement); // don't create useless tasks
@@ -860,11 +880,39 @@ public:
 
 	void DoTask(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent)
 	{
-		ThisRenderer.RenderMobileBasePassDynamicData(RHICmdList, View, DrawRenderState, bWireFrame, FirstElement, AfterLastElement);
+		ThisRenderer.RenderMobileBasePassDynamicData(RHICmdList, View, DrawRenderState, BlendMode, bWireFrame, FirstElement, AfterLastElement);
 		RHICmdList.HandleRTThreadTaskCompletion(MyCompletionGraphEvent);
 	}
 };
 
+static void RenderMobileBasePassDynamicDataParallel(FMobileSceneRenderer& ThisRenderer, FMobileBasePassParallelCommandListSet& ParallelSet, EBlendMode BlendMode, bool bWireframe)
+{
+	if (ParallelSet.View.DynamicMeshElements.Num() > 0)
+	{
+		int32 NumExpectedPrimitives = ParallelSet.View.DynamicMeshElements.Num() / 2; // opaque and masked rendered separately 
+		int32 EffectiveThreads = FMath::Min<int32>(NumExpectedPrimitives, ParallelSet.Width);
+
+		int32 NumPer = ParallelSet.View.DynamicMeshElements.Num() / EffectiveThreads;
+		int32 Extra = ParallelSet.View.DynamicMeshElements.Num() - NumPer * EffectiveThreads;
+		int32 Start = 0;
+		for (int32 ThreadIndex = 0; ThreadIndex < EffectiveThreads; ThreadIndex++)
+		{
+			int32 Last = Start + (NumPer - 1) + (ThreadIndex < Extra);
+			check(Last >= Start);
+
+			{
+				FRHICommandList* CmdList = ParallelSet.NewParallelCommandList();
+				FGraphEventRef AnyThreadCompletionEvent = TGraphTask<FRenderMobileBasePassDynamicDataThreadTask>::CreateTask(ParallelSet.GetPrereqs(), ENamedThreads::ActualRenderingThread)
+					.ConstructAndDispatchWhenReady(ThisRenderer, *CmdList, ParallelSet.View, ParallelSet.DrawRenderState, BlendMode, bWireframe, Start, Last + 1);
+				ParallelSet.AddParallelCommandList(CmdList, AnyThreadCompletionEvent);
+			}
+
+			Start = Last + 1;
+		}
+		check(Start == ParallelSet.View.DynamicMeshElements.Num());
+	}
+}
+
 void FMobileSceneRenderer::RenderMobileBasePassViewParallel(const FViewInfo& View, FRHICommandListImmediate& ParentCmdList, TArray<FViewInfo>& InViews, const FDrawingPolicyRenderState& DrawRenderState)
 {
 	QUICK_SCOPE_CYCLE_COUNTER(STAT_RenderMobileBasePassViewParallel);
@@ -891,31 +939,9 @@ void FMobileSceneRenderer::RenderMobileBasePassViewParallel(const FViewInfo& Vie
 		{
 			Scene->MobileBasePassUniformLightMapPolicyDrawList[EBasePass_Default].DrawVisibleParallel(View.StaticMeshVisibilityMap, View.StaticMeshBatchVisibility, ParallelSet);
 		}
-
-		if (View.DynamicMeshElements.Num() > 0)
-		{
-			int32 EffectiveThreads = FMath::Min<int32>(View.DynamicMeshElements.Num(), ParallelSet.Width);
-
-			int32 NumPer = View.DynamicMeshElements.Num() / EffectiveThreads;
-			int32 Extra = View.DynamicMeshElements.Num() - NumPer * EffectiveThreads;
-			int32 Start = 0;
-			for (int32 ThreadIndex = 0; ThreadIndex < EffectiveThreads; ThreadIndex++)
-			{
-				int32 Last = Start + (NumPer - 1) + (ThreadIndex < Extra);
-				check(Last >= Start);
-
-				{
-					FRHICommandList* CmdList = ParallelSet.NewParallelCommandList();
-					bool bWireframe = !!ViewFamily.EngineShowFlags.Wireframe;
-					FGraphEventRef AnyThreadCompletionEvent = TGraphTask<FRenderMobileBasePassDynamicDataThreadTask>::CreateTask(ParallelSet.GetPrereqs(), ENamedThreads::ActualRenderingThread)
-						.ConstructAndDispatchWhenReady(*this, *CmdList, ParallelSet.View, ParallelSet.DrawRenderState, bWireframe, Start, Last + 1);
-					ParallelSet.AddParallelCommandList(CmdList, AnyThreadCompletionEvent);
-				}
-
-				Start = Last + 1;
-			}
-			check(Start == View.DynamicMeshElements.Num());
-		}
+		
+		const bool bWireframe = !!ViewFamily.EngineShowFlags.Wireframe;
+		RenderMobileBasePassDynamicDataParallel(*this, ParallelSet, BLEND_Opaque, bWireframe);
 	}
 
 	RenderMobileEditorPrimitives(ParentCmdList, View, DrawRenderState);
@@ -937,6 +963,12 @@ void FMobileSceneRenderer::RenderMobileBasePassViewParallel(const FViewInfo& Vie
 		{
 			Scene->MobileBasePassUniformLightMapPolicyDrawList[EBasePass_Masked].DrawVisibleParallel(View.StaticMeshVisibilityMap, View.StaticMeshBatchVisibility, ParallelSet);
 		}
+
+		const bool bWireframe = !!ViewFamily.EngineShowFlags.Wireframe;
+		if (!bWireframe)
+		{
+			RenderMobileBasePassDynamicDataParallel(*this, ParallelSet, BLEND_Masked, false);
+		}
 	}
 
 }
@@ -948,6 +980,24 @@ void FMobileSceneRenderer::RenderMobileBasePass(FRHICommandListImmediate& RHICmd
 	SCOPE_CYCLE_COUNTER(STAT_BasePassDrawTime);
 
 	EBasePassSort::Type SortMode = GetSortMode();
+#if UE_BUILD_DEVELOPMENT
+	if (SortMode == EBasePassSort::SortPerMesh)
+	{
+		FDrawListSortKey Test1;
+		FDrawListSortKey Test2;
+		FDrawListSortKey Test3;
+
+		ZeroDrawListSortKey(Test1);
+		ZeroDrawListSortKey(Test2);
+		ZeroDrawListSortKey(Test3);
+		Test1.Fields.bBackground = 1;
+		Test2.Fields.MeshElementIndex = 1;
+		Test3.Fields.DepthBits = 1;
+
+		UE_CLOG(Test1 < Test2 || Test3 < Test2, LogRHI, Fatal, TEXT("FDrawListSortKey is using non-portable code that doesn't work"));
+	}
+#endif	
+
 	int32 MaxDraws = GMaxBasePassDraws.GetValueOnRenderThread();
 	if (MaxDraws <= 0)
 	{
@@ -989,7 +1039,6 @@ void FMobileSceneRenderer::RenderMobileBasePass(FRHICommandListImmediate& RHICmd
 	}
 	else
 	{
-		//UE_LOG(LogRHI, Fatal, TEXT("Not parallel %d %d %d %d %d"), !!PassViews.Num(), !Views[0].bIsMobileMultiViewEnabled, !!(SortMode != EBasePassSort::SortPerMesh), !!GRHICommandList.UseParallelAlgorithms(), CVarMobileParallelBasePass.GetValueOnRenderThread());
 		// Draw the scene's emissive and light-map color.
 		for (int32 ViewIndex = 0; ViewIndex < PassViews.Num(); ViewIndex++)
 		{
@@ -1020,7 +1069,9 @@ void FMobileSceneRenderer::RenderMobileBasePass(FRHICommandListImmediate& RHICmd
 			}
 			FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
 
-			RenderMobileBasePassDynamicData(RHICmdList, View, DrawRenderState, ViewFamily.EngineShowFlags.Wireframe);
+			// render dynamic opaque primitives (or all if Wireframe)
+			const bool bWireframe = !!ViewFamily.EngineShowFlags.Wireframe;
+			RenderMobileBasePassDynamicData(RHICmdList, View, DrawRenderState, BLEND_Opaque, bWireframe);
 			FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
 
 			RenderMobileEditorPrimitives(RHICmdList, View, DrawRenderState);
@@ -1035,6 +1086,13 @@ void FMobileSceneRenderer::RenderMobileBasePass(FRHICommandListImmediate& RHICmd
 				DrawVisible(RHICmdList, Scene, EBasePass_Masked, View, DrawRenderState, VI.MobileCSMVisibilityInfo, VI.StereoView, VI.StereoViewNonCSM, VI.StereoViewCSM);
 			}
 			FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
+
+			// render dynamic masked primitives (or none if Wireframe)
+			if (!bWireframe)
+			{
+				RenderMobileBasePassDynamicData(RHICmdList, View, DrawRenderState, BLEND_Masked, false);
+				FRHICommandListExecutor::GetImmediateCommandList().ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
+			}
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.h b/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.h
index 661279a58aea..333497d31838 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.h
+++ b/Engine/Source/Runtime/Renderer/Private/MobileBasePassRendering.h
@@ -199,8 +199,9 @@ public:
 	TMobileBasePassVS() {}
 };
 
-
-void GetSkyTextureParams(FPrimitiveSceneInfo* PrimitiveSceneInfo, float& AverageBrightnessOUT, FTexture*& ReflectionTextureOUT);
+// If no reflection captures are available then attempt to use sky light's texture.
+bool UseSkyReflectionCapture(const FScene* RenderScene);
+void GetSkyTextureParams(const FScene* Scene, float& AverageBrightnessOUT, FTexture*& ReflectionTextureOUT, float& OutSkyMaxMipIndex);
 
 /**
  * The base type for pixel shaders that render the emissive color, and light-mapped/ambient lighting of a mesh.
@@ -241,7 +242,7 @@ public:
 		ReflectionCubemap2.Bind(Initializer.ParameterMap, TEXT("ReflectionCubemap2"));
 		ReflectionSampler2.Bind(Initializer.ParameterMap, TEXT("ReflectionCubemapSampler2"));
 
-		UsingSkyReflectionParam.Bind(Initializer.ParameterMap, TEXT("UsingSkyReflection"));
+		MobileSkyReflectionParam.Bind(Initializer.ParameterMap, TEXT("MobileSkyReflectionParams"));
 
 		CSMDebugHintParams.Bind(Initializer.ParameterMap, TEXT("CSMDebugHint"));
 
@@ -255,6 +256,23 @@ public:
 		const FViewInfo* View, 
 		const FDrawingPolicyRenderState& DrawRenderState)
 	{
+		// If we're using only the sky for reflection then set it once here.
+		FScene* RenderScene = View->Family->Scene->GetRenderScene();
+		if (UseSkyReflectionCapture(RenderScene))
+		{
+			// MobileSkyReflectionValues.x == max sky cube mip.
+			// if >0 this will disable shader's RGBM decoding and enable sky light tinting of this envmap.
+			FTexture* ReflectionTexture;
+			float AverageBrightness = 1.0f;
+			FVector4 MobileSkyReflectionValues;
+			GetSkyTextureParams(RenderScene, AverageBrightness, ReflectionTexture, MobileSkyReflectionValues.X);
+			FRHIPixelShader* PixelShader = GetPixelShader();
+			// Set the reflection cubemap
+			SetTextureParameter(RHICmdList, PixelShader, ReflectionCubemap, ReflectionSampler, ReflectionTexture);
+			SetShaderValue(RHICmdList, PixelShader, InvReflectionCubemapAverageBrightness, FVector(1.0f / AverageBrightness, 0, 0));
+			SetShaderValue(RHICmdList, PixelShader, MobileSkyReflectionParam, MobileSkyReflectionValues);
+		}
+
 		FMaterialShader::SetViewParameters(RHICmdList, GetPixelShader(), *View, DrawRenderState.GetViewUniformBuffer());
 		FMeshMaterialShader::SetPassUniformBuffer(RHICmdList, GetPixelShader(), DrawRenderState.GetPassUniformBuffer());
 	}
@@ -319,11 +337,11 @@ public:
 
 			SetShaderValue(RHICmdList, PixelShader, InvReflectionCubemapAverageBrightness, FVector(1.0f / AverageBrightness.X, 1.0f / AverageBrightness.Y, 1.0f / AverageBrightness.Z));
 		}
-		else if (ReflectionCubemap.IsBound())
+		else if (ReflectionCubemap.IsBound() && (!PrimitiveSceneInfo || !UseSkyReflectionCapture(PrimitiveSceneInfo->Scene)))
 		{
 			FTexture* ReflectionTexture = GBlackTextureCube;
 			float AverageBrightness = 1.0f;
-			float UsingSkyReflection = 0.0f;
+			FVector4 MobileSkyReflectionValues;
 
 			if (PrimitiveSceneInfo 
 				&& PrimitiveSceneInfo->CachedReflectionCaptureProxy
@@ -333,18 +351,11 @@ public:
 				AverageBrightness = PrimitiveSceneInfo->CachedReflectionCaptureProxy->EncodedHDRAverageBrightness;
 				ReflectionTexture = PrimitiveSceneInfo->CachedReflectionCaptureProxy->EncodedHDRCubemap;
 			}
-			else if (PrimitiveSceneInfo)
-			{
-				// If no environment map is available attempt to use sky light's texture.
-				GetSkyTextureParams(PrimitiveSceneInfo, AverageBrightness, ReflectionTexture);
-				// Disable shader's RGBM decoding and allow sky light tinting of this envmap.
-				UsingSkyReflection = 1.0f;
-			}
 
 			// Set the reflection cubemap
 			SetTextureParameter(RHICmdList, PixelShader, ReflectionCubemap, ReflectionSampler, ReflectionTexture);
 			SetShaderValue(RHICmdList, PixelShader, InvReflectionCubemapAverageBrightness, FVector(1.0f / AverageBrightness, 0, 0));
-			SetShaderValue(RHICmdList, PixelShader, UsingSkyReflectionParam, UsingSkyReflection);
+			SetShaderValue(RHICmdList, PixelShader, MobileSkyReflectionParam, MobileSkyReflectionValues);
 		}
 
 		if (NumMovablePointLights > 0)
@@ -388,7 +399,7 @@ public:
 		Ar << LightPositionAndInvRadiusParameter;
 		Ar << LightColorAndFalloffExponentParameter;
 		Ar << NumDynamicPointLightsParameter;
-		Ar << UsingSkyReflectionParam;
+		Ar << MobileSkyReflectionParam;
 		Ar << ReflectionCubemap1;
 		Ar << ReflectionCubemap2;
 		Ar << ReflectionPositionsAndRadii;
@@ -410,7 +421,7 @@ private:
 	FShaderResourceParameter ReflectionSampler;
 	FShaderParameter InvReflectionCubemapAverageBrightness;
 	FShaderParameter LightPositionAndInvRadiusParameter;
-	FShaderParameter UsingSkyReflectionParam;
+	FShaderParameter MobileSkyReflectionParam;
 	FShaderParameter LightColorAndFalloffExponentParameter;
 	FShaderParameter NumDynamicPointLightsParameter;
 
@@ -974,6 +985,14 @@ public:
 		else
 		{
 			PixelShader->SetMesh(RHICmdList, *MaterialResource, View, MeshVertexFactory, MeshMaterialRenderProxy, PrimitiveSceneProxy, BatchElement, DrawRenderState, NumMovablePointLights);
+
+			// Set directional light UB
+			const TShaderUniformBufferParameter<FMobileDirectionalLightShaderParameters>& MobileDirectionalLightParam = PixelShader->template GetUniformBufferParameter<FMobileDirectionalLightShaderParameters>();
+			if (MobileDirectionalLightParam.IsBound())
+			{
+				int32 UniformBufferIndex = PrimitiveSceneProxy ? GetFirstLightingChannelFromMask(PrimitiveSceneProxy->GetLightingChannelMask()) + 1 : 0;
+				SetUniformBufferParameter(RHICmdList, PixelShader->GetPixelShader(), MobileDirectionalLightParam, View.MobileDirectionalLightUniformBuffers[UniformBufferIndex]);
+			}
 		}
 
 		if (bEnableReceiveDecalOutput && View.bSceneHasDecals)
@@ -981,14 +1000,6 @@ public:
 			const uint8 StencilValue = (PrimitiveSceneProxy && !PrimitiveSceneProxy->ReceivesDecals() ? 0x01 : 0x00);
 			RHICmdList.SetStencilRef(GET_STENCIL_BIT_MASK(RECEIVE_DECAL, StencilValue)); // we hash the stencil group because we only have 6 bits.
 		}
-
-		// Set directional light UB
-		const TShaderUniformBufferParameter<FMobileDirectionalLightShaderParameters>& MobileDirectionalLightParam = PixelShader->template GetUniformBufferParameter<FMobileDirectionalLightShaderParameters>();
-		if (MobileDirectionalLightParam.IsBound())
-		{
-			int32 UniformBufferIndex = PrimitiveSceneProxy ? GetFirstLightingChannelFromMask(PrimitiveSceneProxy->GetLightingChannelMask()) + 1 : 0;
-			SetUniformBufferParameter(RHICmdList, PixelShader->GetPixelShader(), MobileDirectionalLightParam, View.MobileDirectionalLightUniformBuffers[UniformBufferIndex]);
-		}
 	}
 
 protected:
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileDecalRendering.cpp b/Engine/Source/Runtime/Renderer/Private/MobileDecalRendering.cpp
index d63571a7e93e..37686fd9c685 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileDecalRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/MobileDecalRendering.cpp
@@ -15,6 +15,17 @@
 #include "ScenePrivate.h"
 #include "DecalRenderingShared.h"
 
+
+static FRasterizerStateRHIParamRef GetDecalRasterizerState(EDecalRasterizerState DecalRasterizerState)
+{
+	switch (DecalRasterizerState)
+	{
+	case DRS_CW: return TStaticRasterizerState<FM_Solid, CM_CW>::GetRHI();
+	case DRS_CCW: return TStaticRasterizerState<FM_Solid, CM_CCW>::GetRHI();
+	default: check(0); return nullptr;
+	}
+}
+
 void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 {
 	if (Scene->Decals.Num() == 0 || !IsMobileHDR())
@@ -24,8 +35,12 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 
 	SCOPE_CYCLE_COUNTER(STAT_DecalsDrawTime);
 
-	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
-	SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilRead);
+	EShaderPlatform ShaderPlatform = ViewFamily.GetShaderPlatform();
+	if (ShaderPlatform != SP_METAL) // temporary workaround for iOS Metal to avoid restarting render-pass
+	{
+		FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
+		SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilRead);
+	}
 	
 	FGraphicsPipelineStateInitializer GraphicsPSOInit;
 	RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
@@ -46,6 +61,7 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 			RHICmdList.SetViewport(View.ViewRect.Min.X, View.ViewRect.Min.Y, 0, View.ViewRect.Max.X, View.ViewRect.Max.Y, 1);
 			RHICmdList.SetStreamSource(0, GetUnitCubeVertexBuffer(), 0);
 
+			EDecalRasterizerState LastDecalRasterizerState = DRS_Undefined;
 			TOptional<EDecalBlendMode> LastDecalBlendMode;
 			TOptional<bool> LastDecalDepthState;
 			bool bEncodedHDR = GetMobileHDRMode() == EMobileHDRMode::EnabledRGBE;
@@ -63,12 +79,29 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 				const float ConservativeRadius = DecalData.ConservativeRadius;
 				const bool bInsideDecal = ((FVector)View.ViewMatrices.GetViewOrigin() - ComponentToWorldMatrix.GetOrigin()).SizeSquared() < FMath::Square(ConservativeRadius * 1.05f + View.NearClippingDistance * 2.0f);
 
+				// update rasterizer state if needed
+				{
+					bool bReverseHanded = false;
+					{
+						// Account for the reversal of handedness caused by negative scale on the decal
+						const auto& Scale3d = DecalProxy.ComponentTrans.GetScale3D();
+						bReverseHanded = Scale3d[0] * Scale3d[1] * Scale3d[2] < 0.f;
+					}
+					EDecalRasterizerState DecalRasterizerState = FDecalRenderingCommon::ComputeDecalRasterizerState(bInsideDecal, bReverseHanded, View.bReverseCulling);
+
+					if (LastDecalRasterizerState != DecalRasterizerState)
+					{
+						LastDecalRasterizerState = DecalRasterizerState;
+						GraphicsPSOInit.RasterizerState = GetDecalRasterizerState(DecalRasterizerState);
+					}
+				}
+
+				// update DepthStencil state if needed
 				if (!LastDecalDepthState.IsSet() || LastDecalDepthState.GetValue() != bInsideDecal)
 				{
 					LastDecalDepthState = bInsideDecal;
 					if (bInsideDecal)
 					{
-						GraphicsPSOInit.RasterizerState = View.bReverseCulling ? TStaticRasterizerState<FM_Solid, CM_CCW>::GetRHI() : TStaticRasterizerState<FM_Solid, CM_CW>::GetRHI();
 						GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<
 							false, CF_Always,
 							true, CF_Equal, SO_Keep, SO_Keep, SO_Keep,
@@ -77,7 +110,6 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 					}
 					else
 					{
-						GraphicsPSOInit.RasterizerState = View.bReverseCulling ? TStaticRasterizerState<FM_Solid, CM_CW>::GetRHI() : TStaticRasterizerState<FM_Solid, CM_CCW>::GetRHI();
 						GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<
 							false, CF_DepthNearOrEqual,
 							true, CF_Equal, SO_Keep, SO_Keep, SO_Keep,
@@ -86,6 +118,7 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 					}
 				}
 
+				// update BlendMode if needed
 				if (!bEncodedHDR && (!LastDecalBlendMode.IsSet() || LastDecalBlendMode.GetValue() != DecalData.DecalBlendMode))
 				{
 					LastDecalBlendMode = DecalData.DecalBlendMode;
@@ -102,6 +135,10 @@ void FMobileSceneRenderer::RenderDecals(FRHICommandListImmediate& RHICmdList)
 						// Additive
 						GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_SourceAlpha, BF_One>::GetRHI();
 						break;
+					case DBM_AlphaComposite:
+						// Premultiplied alpha
+						GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_One, BF_InverseSourceAlpha>::GetRHI();
+						break;
 					default:
 						check(0);
 					};
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileReflectionEnvironmentCapture.cpp b/Engine/Source/Runtime/Renderer/Private/MobileReflectionEnvironmentCapture.cpp
index f7010618a99a..506700efb79c 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileReflectionEnvironmentCapture.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/MobileReflectionEnvironmentCapture.cpp
@@ -18,6 +18,13 @@ extern int32 GDiffuseIrradianceCubemapSize;
 extern float ComputeSingleAverageBrightnessFromCubemap(FRHICommandListImmediate& RHICmdList, ERHIFeatureLevel::Type FeatureLevel, int32 TargetSize, FSceneRenderTargetItem& Cubemap);
 extern void FullyResolveReflectionScratchCubes(FRHICommandListImmediate& RHICmdList);
 
+static TAutoConsoleVariable<int32> CVarMobileUseHighQualitySkyCaptureFiltering(
+	TEXT("r.Mobile.HighQualitySkyCaptureFiltering"),
+	1,
+	TEXT("1: (default) use high quality filtering when generating mobile sky captures.")
+	TEXT("0: use simple bilinear filtering when generating mobile sky captures."),
+	ECVF_RenderThreadSafe);
+
 class FMobileDownsamplePS : public FGlobalShader
 {
 	DECLARE_SHADER_TYPE(FMobileDownsamplePS, Global);
@@ -171,6 +178,7 @@ namespace MobileReflectionEnvironmentCapture
 		SCOPED_DRAW_EVENT(RHICmdList, CopyToSkyTexture);
 		if (ProcessedTexture->TextureRHI)
 		{
+			const bool bUseHQFiltering = CVarMobileUseHighQualitySkyCaptureFiltering.GetValueOnRenderThread() == 1;
 			const int32 EffectiveTopMipSize = ProcessedTexture->GetSizeX();
 			const int32 NumMips = FMath::CeilLogTwo(EffectiveTopMipSize) + 1;
 			FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
@@ -180,8 +188,9 @@ namespace MobileReflectionEnvironmentCapture
 			// GPU copy back to the skylight's texture, which is not a render target
 			for (int32 MipIndex = 0; MipIndex < NumMips; MipIndex++)
 			{
-				// The source for this copy is the dest from the filtering pass
-				FSceneRenderTargetItem& EffectiveSource = GetEffectiveRenderTarget(SceneContext, false, MipIndex);
+				// For simple mobile bilin filtering the source for this copy is the dest from the filtering pass.
+				// In the HQ case, the full image is contained in GetEffectiveRenderTarget(.., false,0).
+				FSceneRenderTargetItem& EffectiveSource = GetEffectiveRenderTarget(SceneContext, false, bUseHQFiltering ? 0 : MipIndex);
 				RHICmdList.TransitionResource(EResourceTransitionAccess::EReadable, EffectiveSource.ShaderResourceTexture);
 				FRHICopyTextureInfo CopyInfo(EffectiveSource.ShaderResourceTexture->GetSizeXYZ());
 				CopyInfo.NumArraySlices = 6;
@@ -198,7 +207,7 @@ namespace MobileReflectionEnvironmentCapture
 
 		const int32 EffectiveTopMipSize = CubmapSize;
 		const int32 NumMips = FMath::CeilLogTwo(EffectiveTopMipSize) + 1;
-
+		const bool bUseHQFiltering = CVarMobileUseHighQualitySkyCaptureFiltering.GetValueOnRenderThread() == 1;
 		FSceneRenderTargetItem& EffectiveColorRT = FSceneRenderTargets::Get(RHICmdList).ReflectionColorScratchCubemap[0]->GetRenderTargetItem();
 		// Premultiply alpha in-place using alpha blending
 		for (uint32 CubeFace = 0; CubeFace < CubeFace_MAX; CubeFace++)
@@ -312,14 +321,33 @@ namespace MobileReflectionEnvironmentCapture
 			ComputeDiffuseIrradiance(RHICmdList, FeatureLevel, DiffuseConvolutionSource->ShaderResourceTexture, DiffuseConvolutionSourceMip, OutIrradianceEnvironmentMap);
 		}
 
+		if (bUseHQFiltering)
+		{
+			// When HQ filtering is enabled the filter shader requires access to all mips levels of the source cubemap.
+			// Here we ensure that GetEffectiveSourceTexture(0,false) will have a complete set of mips for this process.
+			SCOPED_DRAW_EVENT(RHICmdList, PrepareSourceCubemapMipsForHQFiltering);
+			for (int32 MipIndex = 1; MipIndex < NumMips; MipIndex += 2)
+			{
+				FSceneRenderTargetItem& SourceTarget = GetEffectiveRenderTarget(SceneContext, true, MipIndex);
+				FSceneRenderTargetItem& DestTarget = GetEffectiveSourceTexture(SceneContext, true, MipIndex);
+				check(DestTarget.TargetableTexture != SourceTarget.ShaderResourceTexture);
+				for (int32 CubeFace = 0; CubeFace < CubeFace_MAX; CubeFace++)
+				{
+					RHICmdList.CopyToResolveTarget(SourceTarget.ShaderResourceTexture, DestTarget.ShaderResourceTexture, FResolveParams(FResolveRect(), (ECubeFace)CubeFace, MipIndex));
+				}
+			}
+		}
+
 		{
 			SCOPED_DRAW_EVENT(RHICmdList, FilterCubeMap);
-			// Filter all the mips, each one reads from whichever scratch render target holds the downsampled contents, and writes to the destination cubemap
+			// Filter all the mips.
+			// in simple mobile bilin case each one reads from whichever scratch render target holds the downsampled contents, and writes to the destination cubemap.
+			// HQ case, all mips are contained in GetEffectiveSourceTexture(.., false,0) as it needs a complete mip chain.
 			for (int32 MipIndex = 0; MipIndex < NumMips; MipIndex++)
 			{
 				SCOPED_DRAW_EVENT(RHICmdList, FilterCubeMip);
-				FSceneRenderTargetItem& EffectiveRT = GetEffectiveRenderTarget(SceneContext, false, MipIndex);
-				FSceneRenderTargetItem& EffectiveSource = GetEffectiveSourceTexture(SceneContext, false, MipIndex);
+				FSceneRenderTargetItem& EffectiveRT = GetEffectiveRenderTarget(SceneContext, false, bUseHQFiltering ? 0 : MipIndex);
+				FSceneRenderTargetItem& EffectiveSource = GetEffectiveSourceTexture(SceneContext, false, bUseHQFiltering ? 0 : MipIndex);
 				check(EffectiveRT.TargetableTexture != EffectiveSource.ShaderResourceTexture);
 				const int32 MipSize = 1 << (NumMips - MipIndex - 1);
 
@@ -337,35 +365,36 @@ namespace MobileReflectionEnvironmentCapture
 					RHICmdList.SetViewport(0, 0, 0.0f, MipSize, MipSize, 1.0f);
 
 					TShaderMapRef<FScreenVS> VertexShader(GetGlobalShaderMap(FeatureLevel));
-					TShaderMapRef< TCubeFilterPS<1> > CaptureCubemapArrayPixelShader(GetGlobalShaderMap(FeatureLevel));
 
-					FCubeFilterPS* PixelShader;
-					PixelShader = *TShaderMapRef< TCubeFilterPS<0> >(ShaderMap);
-					check(PixelShader);
+					FCubeFilterPS* HQFilterPixelShader = *TShaderMapRef< TCubeFilterPS<0> >(ShaderMap);
+					check(HQFilterPixelShader);
+					TShaderMapRef<FMobileDownsamplePS> BilinFilterPixelShader(ShaderMap);
+					FPixelShaderRHIParamRef PixelShaderRHI = bUseHQFiltering ? HQFilterPixelShader->GetPixelShader() : BilinFilterPixelShader->GetPixelShader();
 
 					GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
 					GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(PixelShader);
+					GraphicsPSOInit.BoundShaderState.PixelShaderRHI = PixelShaderRHI;
 					GraphicsPSOInit.PrimitiveType = PT_TriangleList;
 
 					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+
+					if(bUseHQFiltering)
 					{
-						const FPixelShaderRHIParamRef ShaderRHI = PixelShader->GetPixelShader();
-
-						SetShaderValue(RHICmdList, ShaderRHI, PixelShader->CubeFace, CubeFace);
-						SetShaderValue(RHICmdList, ShaderRHI, PixelShader->MipIndex, MipIndex);
-
-						SetShaderValue(RHICmdList, ShaderRHI, PixelShader->NumMips, NumMips);
-
+						SetShaderValue(RHICmdList, PixelShaderRHI, HQFilterPixelShader->CubeFace, CubeFace);
+						SetShaderValue(RHICmdList, PixelShaderRHI, HQFilterPixelShader->MipIndex, MipIndex);
+						SetShaderValue(RHICmdList, PixelShaderRHI, HQFilterPixelShader->NumMips, NumMips);
 						SetTextureParameter(
 							RHICmdList,
-							ShaderRHI,
-							PixelShader->SourceTexture,
-							PixelShader->SourceTextureSampler,
+							PixelShaderRHI,
+							HQFilterPixelShader->SourceTexture,
+							HQFilterPixelShader->SourceTextureSampler,
 							TStaticSamplerState<SF_Trilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(),
 							EffectiveSource.ShaderResourceTexture);
 					}
-					//PixelShader->SetParameters(RHICmdList, NumMips, CubeFace, MipIndex, EffectiveSource);
+					else
+					{
+						BilinFilterPixelShader->SetParameters(RHICmdList, CubeFace, MipIndex, EffectiveSource);
+					}
 
 					DrawRectangle(
 						RHICmdList,
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileShadingRenderer.cpp b/Engine/Source/Runtime/Renderer/Private/MobileShadingRenderer.cpp
index 8381bf5b785e..fc1e391ad4ab 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileShadingRenderer.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/MobileShadingRenderer.cpp
@@ -57,13 +57,20 @@ static TAutoConsoleVariable<int32> CVarMobileForceDepthResolve(
 	TEXT("1: Depth buffer is resolved by switching out render targets and drawing with the depth texture.\n"),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
+static TAutoConsoleVariable<int32> CVarMobileMoveSubmissionHintAfterTranslucency(
+	TEXT("r.Mobile.MoveSubmissionHintAfterTranslucency"),
+	1,
+	TEXT("0: Submission hint occurs after occlusion query.\n")
+	TEXT("1: Submission hint occurs after translucency. (Default)"),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
 DECLARE_CYCLE_STAT(TEXT("SceneStart"), STAT_CLMM_SceneStart, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("SceneEnd"), STAT_CLMM_SceneEnd, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("InitVIews"), STAT_CLMM_InitVIews, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("BasePass"), STAT_CLMM_BasePass, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("Occlusion"), STAT_CLMM_Occlusion, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("Post"), STAT_CLMM_Post, STATGROUP_CommandListMarkers);
-DECLARE_CYCLE_STAT(TEXT("Translency"), STAT_CLMM_Translency, STATGROUP_CommandListMarkers);
+DECLARE_CYCLE_STAT(TEXT("Translucency"), STAT_CLMM_Translucency, STATGROUP_CommandListMarkers);
 DECLARE_CYCLE_STAT(TEXT("Shadows"), STAT_CLMM_Shadows, STATGROUP_CommandListMarkers);
 
 FMobileSceneRenderer::FMobileSceneRenderer(const FSceneViewFamily* InViewFamily,FHitProxyConsumer* HitProxyConsumer)
@@ -125,6 +132,7 @@ void FMobileSceneRenderer::InitViews(FRHICommandListImmediate& RHICmdList)
 
 	UpdatePostProcessUsageFlags();
 
+	
 	PostInitViewCustomData();
 	
 	OnStartFrame(RHICmdList);
@@ -190,18 +198,21 @@ void FMobileSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 	// Dynamic vertex and index buffers need to be committed before rendering.
 	FGlobalDynamicVertexBuffer::Get().Commit();
 	FGlobalDynamicIndexBuffer::Get().Commit();
+	RHICmdList.ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
 
 	// Notify the FX system that the scene is about to be rendered.
 	if (Scene->FXSystem && !Views[0].bIsPlanarReflection && ViewFamily.EngineShowFlags.Particles)
 	{
 		Scene->FXSystem->PreRender(RHICmdList, NULL);
 	}
+	RHICmdList.ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
 
 	GRenderTargetPool.VisualizeTexture.OnStartFrame(Views[0]);
 
 	RHICmdList.SetCurrentStat(GET_STATID(STAT_CLMM_Shadows));
 
 	RenderShadowDepthMaps(RHICmdList);
+	RHICmdList.ImmediateFlush(EImmediateFlushType::DispatchToRHIThread);
 
 	// This might eventually be a problem with multiple views.
 	// Using only view 0 to check to do on-chip transform of alpha.
@@ -286,7 +297,7 @@ void FMobileSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 		Scene->FXSystem->PostRenderOpaque(RHICmdList);
 	}
 
-	RHICmdList.SetCurrentStat(GET_STATID(STAT_CLMM_Translency));
+	RHICmdList.SetCurrentStat(GET_STATID(STAT_CLMM_Translucency));
 	if (!View.bIsPlanarReflection)
 	{
 		RenderModulatedShadowProjections(RHICmdList);
@@ -369,6 +380,16 @@ void FMobileSceneRenderer::Render(FRHICommandListImmediate& RHICmdList)
 	{
 		RHICmdList.DiscardRenderTargets(true, true, 0);
 	}
+
+	if (DoOcclusionQueries(FeatureLevel))
+	{
+		// Optionally hint submission later to avoid render pass churn but delay query results
+		const bool bSubmissionAfterTranslucency = (CVarMobileMoveSubmissionHintAfterTranslucency.GetValueOnRenderThread() == 1);
+		if (bSubmissionAfterTranslucency)
+		{
+			RHICmdList.SubmitCommandsHint();
+		}
+	}
 	
 	if (ViewFamily.bResolveScene)
 	{
@@ -475,8 +496,16 @@ void FMobileSceneRenderer::RenderOcclusion(FRHICommandListImmediate& RHICmdList)
 
 	BeginOcclusionTests(RHICmdList, true);
 	FenceOcclusionTests(RHICmdList);
+
+	// Optionally hint submission later to avoid render pass churn but delay query results
+	const bool bSubmissionAfterTranslucency = (CVarMobileMoveSubmissionHintAfterTranslucency.GetValueOnRenderThread() == 1);
+	if (!bSubmissionAfterTranslucency)
+	{	
+		RHICmdList.SubmitCommandsHint();
+	}
 }
 
+
 void FMobileSceneRenderer::ConditionalResolveSceneDepth(FRHICommandListImmediate& RHICmdList, const FViewInfo& View)
 {
 	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
@@ -491,7 +520,9 @@ void FMobileSceneRenderer::ConditionalResolveSceneDepth(FRHICommandListImmediate
 		&& !View.bIsPlanarReflection)	// exclude depth resolve from planar reflection captures, can't do it reliably more than once per frame
 	{
 		bool bSceneDepthInAlpha = (SceneContext.GetSceneColor()->GetDesc().Format == PF_FloatRGBA);
-		bool bOnChipDepthFetch = (GSupportsShaderDepthStencilFetch || (bSceneDepthInAlpha && GSupportsShaderFramebufferFetch));
+		bool bOnChipDepthFetch = 
+			(GSupportsShaderDepthStencilFetch || 
+			(GSupportsShaderFramebufferFetch && (bSceneDepthInAlpha || IsMetalPlatform(ShaderPlatform))));
 		
 		const bool bAlwaysResolveDepth = CVarMobileAlwaysResolveDepth.GetValueOnRenderThread() == 1;
 
diff --git a/Engine/Source/Runtime/Renderer/Private/MobileTranslucentRendering.cpp b/Engine/Source/Runtime/Renderer/Private/MobileTranslucentRendering.cpp
index a6f6a93c3c16..c1c18bb3a1ff 100644
--- a/Engine/Source/Runtime/Renderer/Private/MobileTranslucentRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/MobileTranslucentRendering.cpp
@@ -342,15 +342,15 @@ void FMobileSceneRenderer::RenderTranslucency(FRHICommandListImmediate& RHICmdLi
 
 			if (!bGammaSpace)
 			{
-				FSceneRenderTargets::Get(RHICmdList).BeginRenderingTranslucency(RHICmdList, View, *this, false);
-			}
-			else
-			{
-				// Mobile multi-view is not side by side stereo
-				const FViewInfo& TranslucentViewport = (View.bIsMobileMultiViewEnabled) ? Views[0] : View;
-				RHICmdList.SetViewport(TranslucentViewport.ViewRect.Min.X, TranslucentViewport.ViewRect.Min.Y, 0.0f, TranslucentViewport.ViewRect.Max.X, TranslucentViewport.ViewRect.Max.Y, 1.0f);
+				FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
+				// Use begin rendering scene color with FExclusiveDepthStencil::DepthRead_StencilRead to avoid starting a new render pass on vulkan.
+				SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilRead);
 			}
 
+			// Mobile multi-view is not side by side stereo
+			const FViewInfo& TranslucentViewport = (View.bIsMobileMultiViewEnabled) ? Views[0] : View;
+			RHICmdList.SetViewport(TranslucentViewport.ViewRect.Min.X, TranslucentViewport.ViewRect.Min.Y, 0.0f, TranslucentViewport.ViewRect.Max.X, TranslucentViewport.ViewRect.Max.Y, 1.0f);
+
 			// Enable depth test, disable depth writes.
 			DrawRenderState.SetDepthStencilState(TStaticDepthStencilState<false, CF_DepthNearOrEqual>::GetRHI());
 
diff --git a/Engine/Source/Runtime/Renderer/Private/PlanarReflectionRendering.cpp b/Engine/Source/Runtime/Renderer/Private/PlanarReflectionRendering.cpp
index cd01ef60e451..0207227e0ab1 100644
--- a/Engine/Source/Runtime/Renderer/Private/PlanarReflectionRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PlanarReflectionRendering.cpp
@@ -224,14 +224,14 @@ static void UpdatePlanarReflectionContents_RenderThread(
 				const int32 NumBufferedFrames = FOcclusionQueryHelpers::GetNumBufferedFrames(SceneRenderer->FeatureLevel) + 1;
 				// +1 to frame counter because we are operating before the main view's InitViews, which is where OcclusionFrameCounter is incremented
 				uint32 OcclusionFrameCounter = ViewState->OcclusionFrameCounter + 1;
-				FRenderQueryRHIRef& PastQuery = OcclusionHistory.GetPastQuery(OcclusionFrameCounter, NumBufferedFrames);
+				FRenderQueryRHIParamRef PastQuery = OcclusionHistory.GetPastQuery(OcclusionFrameCounter, NumBufferedFrames);
 
-				if (IsValidRef(PastQuery))
+				if (PastQuery)
 				{
 					uint64 NumSamples = 0;
 					QUICK_SCOPE_CYCLE_COUNTER(STAT_PlanarReflectionOcclusionQueryResults);
 
-					if (RHIGetRenderQueryResult(PastQuery.GetReference(), NumSamples, true))
+					if (RHIGetRenderQueryResult(PastQuery, NumSamples, true))
 					{
 						bIsVisibleInAnyView = NumSamples > 0;
 						if (bIsVisibleInAnyView)
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.cpp
index ea82474b014e..9aa86191e54c 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.cpp
@@ -45,6 +45,12 @@ static TAutoConsoleVariable<float> CVarTemporalAACurrentFrameWeight(
 	TEXT("Weight of current frame's contribution to the history.  Low values cause blurriness and ghosting, high values fail to hide jittering."),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
+static TAutoConsoleVariable<int32> CVarTemporalAAUpsampleFiltered(
+	TEXT("r.TemporalAAUpsampleFiltered"),
+	1,
+	TEXT("Use filtering to fetch color history during TamporalAA upsampling (see AA_FILTERED define in TAA shader). Disabling this makes TAAU faster, but lower quality. "),
+	ECVF_Scalability | ECVF_RenderThreadSafe);
+
 static float CatmullRom( float x )
 {
 	float ax = FMath::Abs(x);
@@ -281,6 +287,8 @@ class FTAAFastDim : SHADER_PERMUTATION_BOOL("TAA_FAST");
 class FTAAResponsiveDim : SHADER_PERMUTATION_BOOL("TAA_RESPONSIVE");
 class FTAACameraCutDim : SHADER_PERMUTATION_BOOL("TAA_CAMERA_CUT");
 class FTAAScreenPercentageDim : SHADER_PERMUTATION_INT("TAA_SCREEN_PERCENTAGE_RANGE", 3);
+class FTAAUpsampleFilteredDim : SHADER_PERMUTATION_BOOL("TAA_UPSAMPLE_FILTERED");
+class FTAADownsampleDim : SHADER_PERMUTATION_BOOL("TAA_DOWNSAMPLE");
 
 }
 
@@ -302,20 +310,33 @@ class FPostProcessTemporalAAPS : public FGlobalShader
 		FPermutationDomain PermutationVector(Parameters.PermutationId);
 
 		// TAAU is compute shader only.
-		if (IsTAAUpsamplingConfig(PermutationVector.Get<FTAAPassConfigDim>())) return false;
+		if (IsTAAUpsamplingConfig(PermutationVector.Get<FTAAPassConfigDim>()))
+		{
+			return false;
+		}
 
 		// Fast dimensions is only for Main and Diaphragm DOF.
 		if (PermutationVector.Get<FTAAFastDim>() &&
 			!IsMainTAAConfig(PermutationVector.Get<FTAAPassConfigDim>()) &&
-			!IsDOFTAAConfig(PermutationVector.Get<FTAAPassConfigDim>())) return false;
+			!IsDOFTAAConfig(PermutationVector.Get<FTAAPassConfigDim>()))
+		{
+			return false;
+		}
 
 		// Responsive dimension is only for Main.
-		if (PermutationVector.Get<FTAAResponsiveDim>() &&
-			PermutationVector.Get<FTAAPassConfigDim>() != ETAAPassConfig::Main) return false;
+		if (PermutationVector.Get<FTAAResponsiveDim>() && !SupportsResponsiveDim(PermutationVector))
+		{
+			return false;
+		}
 
 		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM4);
 	}
 
+	static bool SupportsResponsiveDim(const FPermutationDomain& PermutationVector)
+	{
+		return PermutationVector.Get<FTAAPassConfigDim>() == ETAAPassConfig::Main;
+	}
+
 	/** Default constructor. */
 	FPostProcessTemporalAAPS() {}
 
@@ -366,7 +387,9 @@ class FPostProcessTemporalAACS : public FGlobalShader
 		FTAAPassConfigDim,
 		FTAAFastDim,
 		FTAACameraCutDim,
-		FTAAScreenPercentageDim>;
+		FTAAScreenPercentageDim,
+		FTAAUpsampleFilteredDim,
+		FTAADownsampleDim>;
 
 	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
 	{
@@ -374,16 +397,42 @@ class FPostProcessTemporalAACS : public FGlobalShader
 
 		// Screen percentage dimension is only for upsampling permutation.
 		if (!IsTAAUpsamplingConfig(PermutationVector.Get<FTAAPassConfigDim>()) &&
-			PermutationVector.Get<FTAAScreenPercentageDim>() != 0) return false;
+			PermutationVector.Get<FTAAScreenPercentageDim>() != 0)
+		{
+			return false;
+		}
 
 		// Fast dimensions is only for Main and Diaphragm DOF.
 		if (PermutationVector.Get<FTAAFastDim>() &&
 			!IsMainTAAConfig(PermutationVector.Get<FTAAPassConfigDim>()) &&
-			!IsDOFTAAConfig(PermutationVector.Get<FTAAPassConfigDim>())) return false;
+			!IsDOFTAAConfig(PermutationVector.Get<FTAAPassConfigDim>()))
+		{
+			return false;
+		}
+		
+		if (PermutationVector.Get<FTAAUpsampleFilteredDim>() &&
+			SupportsResponsiveDim(PermutationVector))
+		{
+			return false;
+		}
+
+		// TAA_DOWNSAMPLE is only only for Main and MainUpsampling configs.
+		if (PermutationVector.Get<FTAADownsampleDim>() &&
+			PermutationVector.Get<FTAAPassConfigDim>() != ETAAPassConfig::Main &&
+			PermutationVector.Get<FTAAPassConfigDim>() != ETAAPassConfig::MainUpsampling)
+		{
+			return false;
+		}
 
 		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM5);
 	}
 
+	static bool SupportsResponsiveDim(const FPermutationDomain& PermutationVector)
+	{
+		// TAA_UPSAMPLE_FILTERED is only used in MainUpsampling config
+		return PermutationVector.Get<FTAAPassConfigDim>() == ETAAPassConfig::Main;
+	}
+
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
 		OutEnvironment.SetDefine(TEXT("THREADGROUP_SIZEX"), GTemporalAATileSizeX);
@@ -402,6 +451,7 @@ class FPostProcessTemporalAACS : public FGlobalShader
 		EyeAdaptation.Bind(Initializer.ParameterMap, TEXT("EyeAdaptation"));
 		OutComputeTex0.Bind(Initializer.ParameterMap, TEXT("OutComputeTex0"));
 		OutComputeTex1.Bind(Initializer.ParameterMap, TEXT("OutComputeTex1"));
+		OutComputeTexDownsampled.Bind(Initializer.ParameterMap, TEXT("OutComputeTexDownsampled"));
 		InputViewMin.Bind(Initializer.ParameterMap, TEXT("InputViewMin"));
 		InputViewSize.Bind(Initializer.ParameterMap, TEXT("InputViewSize"));
 		TemporalJitterPixels.Bind(Initializer.ParameterMap, TEXT("TemporalJitterPixels"));
@@ -413,7 +463,7 @@ class FPostProcessTemporalAACS : public FGlobalShader
 	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Parameter.Serialize(Ar);
-		Ar << EyeAdaptation << OutComputeTex0 << OutComputeTex1 << InputViewMin << InputViewSize << TemporalJitterPixels << ScreenPercentageAndUpscaleFactor;
+		Ar << EyeAdaptation << OutComputeTex0 << OutComputeTex1 << OutComputeTexDownsampled << InputViewMin << InputViewSize << TemporalJitterPixels << ScreenPercentageAndUpscaleFactor;
 		return bShaderHasOutdatedParameters;
 	}
 
@@ -425,6 +475,7 @@ class FPostProcessTemporalAACS : public FGlobalShader
 		const FTAAPassParameters& PassParameters,
 		const FIntPoint& DestSize,
 		const FSceneRenderTargetItem* DestRenderTarget[2],
+		FUnorderedAccessViewRHIParamRef DestDownsampledUAV,
 		const FIntPoint& SrcSize,
 		bool bUseDither,
 		FTextureRHIParamRef EyeAdaptationTex)
@@ -440,6 +491,11 @@ class FPostProcessTemporalAACS : public FGlobalShader
 		if (DestRenderTarget[1])
 			RHICmdList.SetUAVParameter(ShaderRHI, OutComputeTex1.GetBaseIndex(), DestRenderTarget[1]->UAV);
 
+		if (DestDownsampledUAV)
+		{
+			RHICmdList.SetUAVParameter(ShaderRHI, OutComputeTexDownsampled.GetBaseIndex(), DestDownsampledUAV);
+		}
+
 		// VS params
 		SetTextureParameter(RHICmdList, ShaderRHI, EyeAdaptation, EyeAdaptationTex);
 
@@ -470,6 +526,8 @@ class FPostProcessTemporalAACS : public FGlobalShader
 			RHICmdList.SetUAVParameter(ShaderRHI, OutComputeTex0.GetBaseIndex(), NULL);
 		if (OutComputeTex1.IsBound())
 			RHICmdList.SetUAVParameter(ShaderRHI, OutComputeTex1.GetBaseIndex(), NULL);
+		if (OutComputeTexDownsampled.IsBound())
+			RHICmdList.SetUAVParameter(ShaderRHI, OutComputeTexDownsampled.GetBaseIndex(), NULL);
 	}
 
 	FTemporalAAParameters Parameter;
@@ -477,6 +535,7 @@ class FPostProcessTemporalAACS : public FGlobalShader
 	FShaderParameter TemporalAAComputeParams;
 	FShaderParameter OutComputeTex0;
 	FShaderParameter OutComputeTex1;
+	FShaderParameter OutComputeTexDownsampled;
 	FShaderParameter InputViewMin;
 	FShaderParameter InputViewSize;
 	FShaderParameter TemporalJitterPixels;
@@ -536,6 +595,7 @@ void DispatchCSTemplate(
 	const FTAAPassParameters& PassParameters,
 	const FIntPoint& SrcSize,
 	const FSceneRenderTargetItem* DestRenderTarget[2],
+	FUnorderedAccessViewRHIParamRef DestDownsampledUAV,
 	const bool bUseDither,
 	FTextureRHIParamRef EyeAdaptationTex)
 {
@@ -545,7 +605,7 @@ void DispatchCSTemplate(
 	RHICmdList.SetComputeShader(ComputeShader->GetComputeShader());
 
 	FIntPoint DestSize = FIntPoint::DivideAndRoundUp(PassParameters.OutputViewRect.Size(), PassParameters.ResolutionDivisor);
-	ComputeShader->SetParameters(RHICmdList, Context, InputHistory, PassParameters, DestSize, DestRenderTarget, SrcSize, bUseDither, EyeAdaptationTex);
+	ComputeShader->SetParameters(RHICmdList, Context, InputHistory, PassParameters, DestSize, DestRenderTarget, DestDownsampledUAV, SrcSize, bUseDither, EyeAdaptationTex);
 
 	uint32 GroupSizeX = FMath::DivideAndRoundUp(DestSize.X, GTemporalAATileSizeX);
 	uint32 GroupSizeY = FMath::DivideAndRoundUp(DestSize.Y, GTemporalAATileSizeY);
@@ -597,6 +657,10 @@ FRCPassPostProcessTemporalAA::FRCPassPostProcessTemporalAA(
 	bPreferAsyncCompute = false;
 	bPreferAsyncCompute &= (GNumAlternateFrameRenderingGroups == 1); // Can't handle multi-frame updates on async pipe
 
+	bDownsamplePossible = Parameters.bDownsample &&
+		bIsComputePass &&
+		IsMainTAAConfig(Parameters.Pass);
+
 	if (IsTAAUpsamplingConfig(Parameters.Pass))
 	{
 		bIsComputePass = true;
@@ -629,6 +693,8 @@ void FRCPassPostProcessTemporalAA::Process(FRenderingCompositePassContext& Conte
 	if (RenderTargetCount == 2)
 		DestRenderTarget[1] = &PassOutputs[1].RequestSurface(Context);
 
+	const FSceneRenderTargetItem& DestDownsampled = bDownsamplePossible ? PassOutputs[2].RequestSurface(Context) : FSceneRenderTargetItem();
+
 	// Whether this is main TAA pass;
 	bool bIsMainPass = Parameters.Pass == ETAAPassConfig::Main || Parameters.Pass == ETAAPassConfig::MainUpsampling;
 
@@ -660,9 +726,13 @@ void FRCPassPostProcessTemporalAA::Process(FRenderingCompositePassContext& Conte
 		PermutationVector.Set<FTAAPassConfigDim>(Parameters.Pass);
 		PermutationVector.Set<FTAAFastDim>(Parameters.bUseFast);
 		PermutationVector.Set<FTAACameraCutDim>(!Context.View.PrevViewInfo.TemporalAAHistory.IsValid());
+		PermutationVector.Set<FTAADownsampleDim>(DestDownsampled.IsValid());
 
 		if (IsTAAUpsamplingConfig(Parameters.Pass))
 		{
+			const bool bUpsampleFiltered = CVarTemporalAAUpsampleFiltered.GetValueOnRenderThread() != 0 && FPostProcessTemporalAACS::SupportsResponsiveDim(PermutationVector);
+			PermutationVector.Set<FTAAUpsampleFilteredDim>(bUpsampleFiltered);
+
 			// If screen percentage > 100% on X or Y axes, then use screen percentage range = 2 shader permutation to disable LDS caching.
 			if (SrcRect.Width() > DestRect.Width() ||
 				SrcRect.Height() > DestRect.Height())
@@ -713,13 +783,22 @@ void FRCPassPostProcessTemporalAA::Process(FRenderingCompositePassContext& Conte
 					EResourceTransitionAccess::ERWBarrier, EResourceTransitionPipeline::EGfxToCompute,
 					UAVs, RenderTargetCount);
 
+				if (DestDownsampled.IsValid())
+				{
+					RHICmdListComputeImmediate.TransitionResource(EResourceTransitionAccess::ERWBarrier, EResourceTransitionPipeline::EGfxToCompute, DestDownsampled.UAV);
+				}
+
 				DispatchCSTemplate(
 					RHICmdListComputeImmediate, Context, PermutationVector,
-					InputHistory, Parameters, SrcSize, DestRenderTarget, bUseDither, EyeAdaptationTex);
+					InputHistory, Parameters, SrcSize, DestRenderTarget, DestDownsampled.UAV, bUseDither, EyeAdaptationTex);
 
 				RHICmdListComputeImmediate.TransitionResources(
 					EResourceTransitionAccess::EReadable, EResourceTransitionPipeline::EComputeToGfx,
 					UAVs, RenderTargetCount, AsyncEndFence);
+				if (DestDownsampled.IsValid())
+				{
+					RHICmdListComputeImmediate.TransitionResource(EResourceTransitionAccess::EReadable, EResourceTransitionPipeline::EComputeToGfx, DestDownsampled.UAV);
+				}
 			}
 			FRHIAsyncComputeCommandListImmediate::ImmediateDispatch(RHICmdListComputeImmediate);
 		}
@@ -735,14 +814,24 @@ void FRCPassPostProcessTemporalAA::Process(FRenderingCompositePassContext& Conte
 				EResourceTransitionAccess::ERWBarrier, EResourceTransitionPipeline::EGfxToCompute,
 				UAVs, RenderTargetCount);
 
+			if (DestDownsampled.IsValid())
+			{
+				Context.RHICmdList.TransitionResource(EResourceTransitionAccess::ERWBarrier, EResourceTransitionPipeline::EGfxToCompute, DestDownsampled.UAV);
+			}
+
 			DispatchCSTemplate(
 				Context.RHICmdList, Context, PermutationVector,
-				InputHistory, Parameters, SrcSize, DestRenderTarget, bUseDither, EyeAdaptationTex);
+				InputHistory, Parameters, SrcSize, DestRenderTarget, DestDownsampled.UAV, bUseDither, EyeAdaptationTex);
 
 			Context.RHICmdList.TransitionResources(
 				EResourceTransitionAccess::EReadable, EResourceTransitionPipeline::EComputeToGfx,
 				UAVs, RenderTargetCount, AsyncEndFence);
 
+			if (DestDownsampled.IsValid())
+			{
+				Context.RHICmdList.TransitionResource(EResourceTransitionAccess::EReadable, EResourceTransitionPipeline::EComputeToGfx, DestDownsampled.UAV);
+			}
+
 			Context.RHICmdList.EndUpdateMultiFrameResource(DestRenderTarget[0]->ShaderResourceTexture);
 			if (RenderTargetCount == 2)
 				Context.RHICmdList.EndUpdateMultiFrameResource(DestRenderTarget[1]->ShaderResourceTexture);
@@ -873,27 +962,76 @@ void FRCPassPostProcessTemporalAA::Process(FRenderingCompositePassContext& Conte
 
 FPooledRenderTargetDesc FRCPassPostProcessTemporalAA::ComputeOutputDesc(EPassOutputId InPassOutputId) const
 {
-	FPooledRenderTargetDesc Ret = GetInput(ePId_Input0)->GetOutput()->RenderTargetDesc;
-	Ret.Flags &= ~(TexCreate_FastVRAM | TexCreate_Transient);
-	Ret.Reset();
-	//regardless of input type, PF_FloatRGBA is required to properly accumulate between frames for a good result.
-	Ret.Format = PF_FloatRGBA;
-	Ret.DebugName = kTAAOutputNames[static_cast<int32>(Parameters.Pass)];
-	Ret.AutoWritable = false;
-	Ret.TargetableFlags &= ~(TexCreate_RenderTargetable | TexCreate_UAV);
-	Ret.TargetableFlags |= bIsComputePass ? TexCreate_UAV : TexCreate_RenderTargetable;
+	FPooledRenderTargetDesc Ret;
 
-	// Need a UAV to resource transition from gfx to compute.
-	if (IsDOFTAAConfig(Parameters.Pass))
+	switch (InPassOutputId)
 	{
+	case ePId_Output0: // main color output
+	case ePId_Output1:
+
+		Ret = GetInput(ePId_Input0)->GetOutput()->RenderTargetDesc;
+		Ret.Flags &= ~(TexCreate_FastVRAM | TexCreate_Transient);
+		Ret.Reset();
+		//regardless of input type, PF_FloatRGBA is required to properly accumulate between frames for a good result.
+		Ret.Format = PF_FloatRGBA;
+		Ret.DebugName = kTAAOutputNames[static_cast<int32>(Parameters.Pass)];
+		Ret.AutoWritable = false;
+		Ret.TargetableFlags &= ~(TexCreate_RenderTargetable | TexCreate_UAV);
+		Ret.TargetableFlags |= bIsComputePass ? TexCreate_UAV : TexCreate_RenderTargetable;
+
+		if (OutputExtent.X > 0)
+		{
+			check(OutputExtent.X % Parameters.ResolutionDivisor == 0);
+			check(OutputExtent.Y % Parameters.ResolutionDivisor == 0);
+			Ret.Extent = OutputExtent / Parameters.ResolutionDivisor;
+		}
+
+		// Need a UAV to resource transition from gfx to compute.
+		if (IsDOFTAAConfig(Parameters.Pass))
+		{
+			Ret.TargetableFlags |= TexCreate_UAV;
+		}
+
+		break;
+
+	case ePId_Output2: // downsampled color output
+
+		if (!bDownsamplePossible)
+		{
+			break;
+		}
+
+		check(bIsComputePass);
+
+		Ret = GetInput(ePId_Input0)->GetOutput()->RenderTargetDesc;
+		Ret.Flags &= ~(TexCreate_FastVRAM);
+		Ret.Reset();
+
+		if (Parameters.DownsampleOverrideFormat != PF_Unknown)
+		{
+			Ret.Format = Parameters.DownsampleOverrideFormat;
+		}
+
+		Ret.DebugName = TEXT("SceneColorHalfRes");
+		Ret.AutoWritable = false;
+		Ret.TargetableFlags &= ~TexCreate_RenderTargetable;
 		Ret.TargetableFlags |= TexCreate_UAV;
-	}
 
-	if (OutputExtent.X > 0)
-	{
-		check(OutputExtent.X % Parameters.ResolutionDivisor == 0);
-		check(OutputExtent.Y % Parameters.ResolutionDivisor == 0);
-		Ret.Extent = OutputExtent / Parameters.ResolutionDivisor;
+		if (OutputExtent.X > 0)
+		{
+			check(OutputExtent.X % Parameters.ResolutionDivisor == 0);
+			check(OutputExtent.Y % Parameters.ResolutionDivisor == 0);
+			Ret.Extent = OutputExtent / Parameters.ResolutionDivisor;
+		}
+
+		Ret.Extent = FIntPoint::DivideAndRoundUp(Ret.Extent, 2);
+		Ret.Extent.X = FMath::Max(1, Ret.Extent.X);
+		Ret.Extent.Y = FMath::Max(1, Ret.Extent.Y);
+
+		break;
+
+	default:
+		check(false);
 	}
 
 	return Ret;
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.h b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.h
index 682ab7f57c07..7cb6ffbb4716 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.h
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessTemporalAA.h
@@ -54,6 +54,11 @@ struct FTAAPassParameters
 	// Whether to do compute or not.
 	bool bIsComputePass;
 
+	// Whether downsampled (box filtered, half resolution) frame should be written out.
+	// Only used when bIsComputePass is true.
+	bool bDownsample;
+	EPixelFormat DownsampleOverrideFormat;
+
 	// Viewport rectangle of the input and output of TAA at ResolutionDivisor == 1.
 	FIntRect InputViewRect;
 	FIntRect OutputViewRect;
@@ -66,6 +71,8 @@ struct FTAAPassParameters
 		: Pass(ETAAPassConfig::Main)
 		, bUseFast(false)
 		, bIsComputePass(false)
+		, bDownsample(false)
+		, DownsampleOverrideFormat(PF_Unknown)
 		, InputViewRect(View.ViewRect)
 		, OutputViewRect(View.ViewRect)
 		, ResolutionDivisor(1)
@@ -102,8 +109,10 @@ struct FTAAPassParameters
 
 // ePId_Input0: Full Res Scene color (point)
 // ePId_Input2: Velocity (point)
+// ePId_Output0: Antialiased color
+// ePId_Output1: Downsampled antialiased color (only when FTAAConfig::bDownsample is true)
 // derives from TRenderingCompositePassBase<InputCount, OutputCount> 
-class FRCPassPostProcessTemporalAA : public TRenderingCompositePassBase<3, 2>
+class FRCPassPostProcessTemporalAA : public TRenderingCompositePassBase<3, 3>
 {
 public:
 	FRCPassPostProcessTemporalAA(
@@ -119,6 +128,8 @@ public:
 
 	virtual FComputeFenceRHIParamRef GetComputePassEndFence() const override { return AsyncEndFence; }
 
+	bool IsDownsamplePossible() const { return bDownsamplePossible; }
+
 private:
 	const FTAAPassParameters Parameters;
 
@@ -128,4 +139,6 @@ private:
 
 	const FTemporalAAHistory& InputHistory;
 	FTemporalAAHistory* OutputHistory;
+
+	bool bDownsamplePossible = false;
 };
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessUpscale.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessUpscale.cpp
index 09fad06dd739..021854237c55 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessUpscale.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessUpscale.cpp
@@ -397,16 +397,25 @@ void FRCPassPostProcessUpscale::Process(FRenderingCompositePassContext& Context)
 
 	FIntPoint SrcSize = InputDesc->Extent;
 
-	// Set the view family's render target/viewport.
-	SetRenderTarget(Context.RHICmdList, DestRenderTarget.TargetableTexture, FTextureRHIRef());
-
+	bool bMobilePlatform = IsMobilePlatform(GShaderPlatformForFeatureLevel[Context.GetFeatureLevel()]);
+	if (bMobilePlatform)
+	{
+		// clear on mobile to avoid restore
+		SetRenderTarget(Context.RHICmdList, DestRenderTarget.TargetableTexture, FTextureRHIRef(), ESimpleRenderTargetMode::EClearColorAndDepth);
+	}
+	else
+	{
+		// Set the view family's render target/viewport.
+		SetRenderTarget(Context.RHICmdList, DestRenderTarget.TargetableTexture, FTextureRHIRef());
+	}
+	
 	bool bTessellatedQuad = PaniniConfig.D >= 0.01f;
 
 	// with distortion (bTessellatedQuad) we need to clear the background
 	FIntRect ExcludeRect = bTessellatedQuad ? FIntRect() : DestRect;
 
 	Context.SetViewportAndCallRHI(DestRect);
-	if (Context.GetLoadActionForRenderTarget(DestRenderTarget) == ERenderTargetLoadAction::EClear)
+	if (Context.GetLoadActionForRenderTarget(DestRenderTarget) == ERenderTargetLoadAction::EClear && !bMobilePlatform)
 	{
 		DrawClearQuad(Context.RHICmdList, true, FLinearColor::Black, false, 0, false, 0, PassOutputs[0].RenderTargetDesc.Extent, ExcludeRect);
 	}
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessVisualizeComplexity.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessVisualizeComplexity.cpp
index b145ae923250..0297502393a6 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessVisualizeComplexity.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessVisualizeComplexity.cpp
@@ -21,7 +21,22 @@ PostProcessVisualizeComplexity.cpp: Contains definitions for complexity viewmode
  */
 float GetMaxShaderComplexityCount(ERHIFeatureLevel::Type InFeatureType)
 {
-	return InFeatureType == ERHIFeatureLevel::ES2 ? GEngine->MaxES2PixelShaderAdditiveComplexityCount : GEngine->MaxPixelShaderAdditiveComplexityCount;
+	switch (InFeatureType)
+	{
+		case ERHIFeatureLevel::ES2:
+			return GEngine->MaxES2PixelShaderAdditiveComplexityCount;
+		break;
+
+		case ERHIFeatureLevel::ES3_1:
+			return GEngine->MaxES3PixelShaderAdditiveComplexityCount;
+		break;
+		
+		default:
+			return GEngine->MaxPixelShaderAdditiveComplexityCount;
+		break;
+	}
+
+	return GEngine->MaxPixelShaderAdditiveComplexityCount;
 }
 
 
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessing.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessing.cpp
index 14dc4a0da43e..bbcd1e1a9b51 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessing.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/PostProcessing.cpp
@@ -204,6 +204,12 @@ TAutoConsoleVariable<int32> CVarPostProcessingDisableMaterials(
 	TEXT(" Allows to disable post process materials. \n"),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
+TAutoConsoleVariable<int32> CVarTemporalAAAllowDownsampling(
+	TEXT("r.TemporalAA.AllowDownsampling"),
+	1,
+	TEXT("Allows half-resolution color buffer to be produced during TAA. Only possible when motion blur is off and when using compute shaders for post processing."),
+	ECVF_RenderThreadSafe);
+
 TAutoConsoleVariable<int32> CVarUseDiaphragmDOF(
 	TEXT("r.DOF.Algorithm"),
 	1,
@@ -265,10 +271,11 @@ public:
 
 		const bool bIsComputePass = ShouldDoComputePostProcessing(Context.View);
 
+		const int32 DownsampleQuality = FMath::Clamp(CDownsampleQuality.GetValueOnRenderThread(), 0, 1);
 		// Queue the down samples. 
 		for (int i = 1; i < DownSampleStages; i++)
 		{
-			FRenderingCompositePass* Pass = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessDownsample(PF_Unknown, 1, bIsComputePass, PassLabels[i]));
+			FRenderingCompositePass* Pass = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessDownsample(PF_Unknown, DownsampleQuality, bIsComputePass, PassLabels[i]));
 			Pass->SetInput(ePId_Input0, PostProcessDownsamples[i - 1]);
 			PostProcessDownsamples[i] = FRenderingCompositeOutputRef(Pass);
 
@@ -895,19 +902,19 @@ static FRenderingCompositeOutputRef AddBloom(FBloomDownSampleArray& BloomDownSam
 	return BloomOutput;
 }
 
-static void AddTemporalAA( FPostprocessContext& Context, FRenderingCompositeOutputRef& VelocityInput )
+static FTAAPassParameters MakeTAAPassParametersForView( const FViewInfo& View )
 {
-	check(VelocityInput.IsValid());
-	check(Context.View.ViewState);
+	FTAAPassParameters Parameters(View);
 
-	FSceneViewState* ViewState = Context.View.ViewState;
-
-	FTAAPassParameters Parameters(Context.View);
-	Parameters.Pass = Context.View.PrimaryScreenPercentageMethod == EPrimaryScreenPercentageMethod::TemporalUpscale
+	Parameters.Pass = View.PrimaryScreenPercentageMethod == EPrimaryScreenPercentageMethod::TemporalUpscale
 		? ETAAPassConfig::MainUpsampling
 		: ETAAPassConfig::Main;
-	Parameters.bIsComputePass = ShouldDoComputePostProcessing(Context.View);
-	Parameters.SetupViewRect(Context.View);
+
+	Parameters.bIsComputePass = Parameters.Pass == ETAAPassConfig::MainUpsampling
+		? true // TAAU is always a compute shader
+		: ShouldDoComputePostProcessing(View);
+
+	Parameters.SetupViewRect(View);
 
 	{
 		static const auto CVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.PostProcessAAQuality"));
@@ -915,15 +922,30 @@ static void AddTemporalAA( FPostprocessContext& Context, FRenderingCompositeOutp
 		Parameters.bUseFast = Quality == 3;
 	}
 
-	FRenderingCompositePass* TemporalAAPass = Context.Graph.RegisterPass(
-		new(FMemStack::Get()) FRCPassPostProcessTemporalAA(
-			Context,
-			Parameters,
-			Context.View.PrevViewInfo.TemporalAAHistory,
-			&ViewState->PendingPrevFrameViewInfo.TemporalAAHistory));
+	return Parameters;
+}
+
+static void AddTemporalAA( FPostprocessContext& Context, FRenderingCompositeOutputRef& VelocityInput, const FTAAPassParameters& Parameters, FRenderingCompositeOutputRef* OutSceneColorHalfRes )
+{
+	check(VelocityInput.IsValid());
+	check(Context.View.ViewState);
+
+	FSceneViewState* ViewState = Context.View.ViewState;
+
+	FRCPassPostProcessTemporalAA* TemporalAAPass = new(FMemStack::Get()) FRCPassPostProcessTemporalAA(
+		Context,
+		Parameters,
+		Context.View.PrevViewInfo.TemporalAAHistory,
+		&ViewState->PendingPrevFrameViewInfo.TemporalAAHistory);
+
 	TemporalAAPass->SetInput( ePId_Input0, Context.FinalOutput );
 	TemporalAAPass->SetInput( ePId_Input2, VelocityInput );
 	Context.FinalOutput = FRenderingCompositeOutputRef( TemporalAAPass );
+
+	if (OutSceneColorHalfRes && TemporalAAPass->IsDownsamplePossible())
+	{
+		*OutSceneColorHalfRes = FRenderingCompositeOutputRef(TemporalAAPass, ePId_Output2);
+	}
 }
 
 FPostProcessMaterialNode* IteratePostProcessMaterialNodes(const FFinalPostProcessSettings& Dest, EBlendableLocation InLocation, FBlendableEntry*& Iterator)
@@ -1523,18 +1545,36 @@ void FPostProcessing::Process(FRHICommandListImmediate& RHICmdList, const FViewI
 
 			EAntiAliasingMethod AntiAliasingMethod = Context.View.AntiAliasingMethod;
 
+			const int32 DownsampleQuality = FMath::Clamp(CDownsampleQuality.GetValueOnRenderThread(), 0, 1);
+
+			FRenderingCompositeOutputRef SceneColorHalfRes;
+			const EPixelFormat SceneColorHalfResFormat = PF_FloatRGB;
+
 			if( AntiAliasingMethod == AAM_TemporalAA && ViewState)
 			{
+				FTAAPassParameters Parameters = MakeTAAPassParametersForView(Context.View);
+
+				// Downsample pass may be merged with with TemporalAA when there is no motion blur and compute shader is used.
+				// This is currently only possible for r.Downsample.Quality = 0 (box filter).
+				const bool bDownsampleDuringTemporalAA = (CVarTemporalAAAllowDownsampling.GetValueOnRenderThread() != 0)
+					&& !IsMotionBlurEnabled(View)
+					&& !bVisualizeMotionBlur
+					&& Parameters.bIsComputePass
+					&& (DownsampleQuality == 0);
+
+				Parameters.bDownsample = bDownsampleDuringTemporalAA;
+				Parameters.DownsampleOverrideFormat = SceneColorHalfResFormat;
+
 				if(VelocityInput.IsValid())
 				{
-					AddTemporalAA( Context, VelocityInput );
+					AddTemporalAA( Context, VelocityInput, Parameters, bDownsampleDuringTemporalAA ? &SceneColorHalfRes : nullptr);
 				}
 				else
 				{
 					// black is how we clear the velocity buffer so this means no velocity
 					FRenderingCompositePass* NoVelocity = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessInput(GSystemTextures.BlackDummy));
 					FRenderingCompositeOutputRef NoVelocityRef(NoVelocity);
-					AddTemporalAA( Context, NoVelocityRef );
+					AddTemporalAA( Context, NoVelocityRef, Parameters, bDownsampleDuringTemporalAA ? &SceneColorHalfRes : nullptr);
 				}
 
 
@@ -1618,14 +1658,13 @@ void FPostProcessing::Process(FRHICommandListImmediate& RHICmdList, const FViewI
 				AddVisualizeBloomSetup(Context);
 			}
 
-			// down sample Scene color from full to half res
-			FRenderingCompositeOutputRef SceneColorHalfRes;
+			// Down sample Scene color from full to half res (this may have been done during TAA).
+			if (!SceneColorHalfRes.IsValid())
 			{
 				// doesn't have to be as high quality as the Scene color
-				int32 DownsampleQuality = FMath::Clamp(CDownsampleQuality.GetValueOnRenderThread(), 0, 1);
 				const bool bIsComputePass = ShouldDoComputePostProcessing(Context.View);
 
-				FRenderingCompositePass* HalfResPass = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessDownsample(PF_FloatRGB, DownsampleQuality, bIsComputePass, TEXT("SceneColorHalfRes")));
+				FRenderingCompositePass* HalfResPass = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessDownsample(SceneColorHalfResFormat, DownsampleQuality, bIsComputePass, TEXT("SceneColorHalfRes")));
 				HalfResPass->SetInput(ePId_Input0, FRenderingCompositeOutputRef(Context.FinalOutput));
 
 				SceneColorHalfRes = FRenderingCompositeOutputRef(HalfResPass);
@@ -2222,6 +2261,13 @@ void FPostProcessing::ProcessES2(FRHICommandListImmediate& RHICmdList, const FVi
 	// view settings. Those are copies for the RT then never get access by the main thread again.
 	// Pointers to other structures might be unsafe to touch.
 
+	const EDebugViewShaderMode DebugViewShaderMode = View.Family->GetDebugViewShaderMode();
+	bool bAllowFullPostProcess =
+		!(
+			DebugViewShaderMode == DVSM_ShaderComplexity ||
+			DebugViewShaderMode == DVSM_ShaderComplexityContainedQuadOverhead ||
+			DebugViewShaderMode == DVSM_ShaderComplexityBleedingQuadOverhead
+		);
 
 	// so that the passes can register themselves to the graph
 	{
@@ -2263,7 +2309,7 @@ void FPostProcessing::ProcessES2(FRHICommandListImmediate& RHICmdList, const FVi
 			&& View.GetShaderPlatform() == EShaderPlatform::SP_METAL;
 
 		// add the passes we want to add to the graph (commenting a line means the pass is not inserted into the graph) ---------
-		if( View.Family->EngineShowFlags.PostProcessing )
+		if( View.Family->EngineShowFlags.PostProcessing && bAllowFullPostProcess)
 		{
 			const EMobileHDRMode HDRMode = GetMobileHDRMode();
 			bool bUseEncodedHDR = HDRMode == EMobileHDRMode::EnabledRGBE;
@@ -2552,30 +2598,38 @@ void FPostProcessing::ProcessES2(FRHICommandListImmediate& RHICmdList, const FVi
 		bool bDisableUpscaleInTonemapper = IsMobileHDRMosaic() || !VarTonemapperUpscale || VarTonemapperUpscale->GetValueOnRenderThread() == 0;
 
 		bool* DoScreenPercentageInTonemapperPtr = nullptr;
+		FRenderingCompositePass* TonemapperPass = nullptr;
 		if (bUseTonemapperFilm)
 		{
 			//@todo Ronin Set to EAutoExposureMethod::AEM_Basic for PC vk crash.
 			FRCPassPostProcessTonemap* PostProcessTonemap = AddTonemapper(Context, BloomOutput, nullptr, EAutoExposureMethod::AEM_Histogram, false, false);
-			DoScreenPercentageInTonemapperPtr = &PostProcessTonemap->bDoScreenPercentageInTonemapper;
+			// remember the tonemapper pass so we can check if it's last
+			TonemapperPass = PostProcessTonemap;
+
+			PostProcessTonemap->bDoScreenPercentageInTonemapper = false;
+			DoScreenPercentageInTonemapperPtr = &PostProcessTonemap->bDoScreenPercentageInTonemapper;			
 		}
-		else
+		else if (bAllowFullPostProcess)
 		{
 			// Must run to blit to back buffer even if post processing is off.
 			FRCPassPostProcessTonemapES2* PostProcessTonemap = (FRCPassPostProcessTonemapES2*)Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessTonemapES2(Context.View, bViewRectSource, bSRGBAwareTarget));
+			// remember the tonemapper pass so we can check if it's last
+			TonemapperPass = PostProcessTonemap;
+
 			PostProcessTonemap->SetInput(ePId_Input0, Context.FinalOutput);
 			PostProcessTonemap->SetInput(ePId_Input1, BloomOutput);
 			PostProcessTonemap->SetInput(ePId_Input2, DofOutput);
+
 			Context.FinalOutput = FRenderingCompositeOutputRef(PostProcessTonemap);
+
+			PostProcessTonemap->bDoScreenPercentageInTonemapper = false;
 			DoScreenPercentageInTonemapperPtr = &PostProcessTonemap->bDoScreenPercentageInTonemapper;
 		}
 
-		// remember the tonemapper pass so we can check if it's last
-		FRenderingCompositePass* TonemapperPass = Context.FinalOutput.GetPass();
-		
 		// if Context.FinalOutput was the clipped result of sunmask stage then this stage also restores Context.FinalOutput back original target size.
 		FinalOutputViewRect = View.UnscaledViewRect;
 
-		if (View.Family->EngineShowFlags.PostProcessing)
+		if (View.Family->EngineShowFlags.PostProcessing && bAllowFullPostProcess)
 		{
 			if (IsMobileHDR() && !IsMobileHDRMosaic())
 			{
@@ -2639,32 +2693,30 @@ void FPostProcessing::ProcessES2(FRHICommandListImmediate& RHICmdList, const FVi
 				Node->SetInput(ePId_Input0, FRenderingCompositeOutputRef(Context.FinalOutput)); // Bilinear sampling.
 				Node->SetInput(ePId_Input1, FRenderingCompositeOutputRef(Context.FinalOutput)); // Point sampling.
 				Context.FinalOutput = FRenderingCompositeOutputRef(Node);
-				*DoScreenPercentageInTonemapperPtr = false;
 			}
-			else
+			else if (DoScreenPercentageInTonemapperPtr)
 			{
-				check(DoScreenPercentageInTonemapperPtr != nullptr);
 				*DoScreenPercentageInTonemapperPtr = true;
 			}
 		}
-		else
-		{
-			*DoScreenPercentageInTonemapperPtr = false;
-		}
 
-		const EDebugViewShaderMode DebugViewShaderMode = View.Family->GetDebugViewShaderMode();
+#ifdef WITH_EDITOR
+		bool bES2Legend = true;
+#else
+		// Legend is costly so we don't do it for ES2, ideally we make a shader permutation
+		bool bES2Legend = false;
+#endif
+
 		if(DebugViewShaderMode == DVSM_QuadComplexity)
 		{
-			// Legend is costly so we don't do it for ES2, ideally we make a shader permutation
-			FRenderingCompositePass* Node = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessVisualizeComplexity(GEngine->QuadComplexityColors, FVisualizeComplexityApplyPS::CS_STAIR,  1.f, false));
+			FRenderingCompositePass* Node = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessVisualizeComplexity(GEngine->QuadComplexityColors, FVisualizeComplexityApplyPS::CS_STAIR,  1.f, bES2Legend));
 			Node->SetInput(ePId_Input0, FRenderingCompositeOutputRef(Context.FinalOutput));
 			Context.FinalOutput = FRenderingCompositeOutputRef(Node);
 		}
 
 		if(DebugViewShaderMode == DVSM_ShaderComplexity || DebugViewShaderMode == DVSM_ShaderComplexityContainedQuadOverhead || DebugViewShaderMode == DVSM_ShaderComplexityBleedingQuadOverhead)
 		{
-			// Legend is costly so we don't do it for ES2, ideally we make a shader permutation
-			FRenderingCompositePass* Node = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessVisualizeComplexity(GEngine->ShaderComplexityColors, FVisualizeComplexityApplyPS::CS_RAMP,  1.f, false));
+			FRenderingCompositePass* Node = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessVisualizeComplexity(GEngine->ShaderComplexityColors, FVisualizeComplexityApplyPS::CS_RAMP,  1.f, bES2Legend));
 			Node->SetInput(ePId_Input0, FRenderingCompositeOutputRef(Context.FinalOutput));
 			Context.FinalOutput = FRenderingCompositeOutputRef(Node);
 		}
@@ -2726,16 +2778,18 @@ void FPostProcessing::ProcessPlanarReflection(FRHICommandListImmediate& RHICmdLi
 
 		if (AntiAliasingMethod == AAM_TemporalAA && ViewState)
 		{
+			FTAAPassParameters Parameters = MakeTAAPassParametersForView(Context.View);
+
 			if(VelocityInput.IsValid())
 			{
-				AddTemporalAA( Context, VelocityInput );
+				AddTemporalAA( Context, VelocityInput, Parameters, nullptr);
 			}
 			else
 			{
 				// black is how we clear the velocity buffer so this means no velocity
 				FRenderingCompositePass* NoVelocity = Context.Graph.RegisterPass(new(FMemStack::Get()) FRCPassPostProcessInput(GSystemTextures.BlackDummy));
 				FRenderingCompositeOutputRef NoVelocityRef(NoVelocity);
-				AddTemporalAA( Context, NoVelocityRef );
+				AddTemporalAA( Context, NoVelocityRef, Parameters, nullptr );
 			}
 		}
 
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/RenderTargetPool.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/RenderTargetPool.cpp
index 0fbfba80c11d..f7d603d47a99 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/RenderTargetPool.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/RenderTargetPool.cpp
@@ -91,7 +91,7 @@ static TAutoConsoleVariable<int32> CVarRtPoolTransientMode(
 	TEXT("1 : enable transient resource aliasing for fastVRam rendertargets\n")
 	TEXT("2 : enable transient resource aliasing for fastVRam rendertargets and those with a Transient hint. Best for memory usage - has some GPU cost (~0.2ms)\n")
 	TEXT("3 : enable transient resource aliasing for ALL rendertargets (not recommended)\n"),
-	ECVF_ReadOnly);
+	ECVF_RenderThreadSafe);
 
 bool FRenderTargetPool::IsEventRecordingEnabled() const
 {
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.cpp b/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.cpp
index 227c5f8f8368..1ea492ac5a56 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.cpp
@@ -84,7 +84,7 @@ static TAutoConsoleVariable<int32> CVarMobileMSAA(
 	TEXT("2: Use 2x MSAA (Temporal AA disabled)\n")
 	TEXT("4: Use 4x MSAA (Temporal AA disabled)\n")
 	TEXT("8: Use 8x MSAA (Temporal AA disabled)"),
-	ECVF_RenderThreadSafe | ECVF_ReadOnly
+	ECVF_RenderThreadSafe | ECVF_Scalability
 	);
 
 static TAutoConsoleVariable<int32> CVarGBufferFormat(
@@ -545,7 +545,7 @@ void FSceneRenderTargets::Allocate(FRHICommandListImmediate& RHICmdList, const F
 		// Reinitialize the render targets for the given size.
 		SetBufferSize(DesiredBufferSize.X, DesiredBufferSize.Y);
 
-		UE_LOG(LogRenderer, Log, TEXT("Reallocating scene render targets to support %ux%u Format %u NumSamples %u (Frame:%u)."), BufferSize.X, BufferSize.Y, (uint32)GetSceneColorFormat(), CurrentMSAACount, ViewFamily.FrameNumber);
+		UE_LOG(LogRenderer, Log, TEXT("Reallocating scene render targets to support %ux%u Format %u NumSamples %u (Frame:%u)."), BufferSize.X, BufferSize.Y, (uint32)GetSceneColorFormat(NewFeatureLevel), CurrentMSAACount, ViewFamily.FrameNumber);
 
 		UpdateRHI();
 	}
@@ -2167,10 +2167,15 @@ template void FSceneRenderTargets::ClearVolumeTextures<7>(FRHICommandList& RHICm
 template void FSceneRenderTargets::ClearVolumeTextures<8>(FRHICommandList& RHICmdList, ERHIFeatureLevel::Type FeatureLevel, FTextureRHIParamRef* RenderTargets, const FLinearColor* ClearColors);
 
 EPixelFormat FSceneRenderTargets::GetSceneColorFormat() const
+{
+	return GetSceneColorFormat(CurrentFeatureLevel);
+}
+
+EPixelFormat FSceneRenderTargets::GetSceneColorFormat(ERHIFeatureLevel::Type InFeatureLevel) const
 {
 	EPixelFormat SceneColorBufferFormat = PF_FloatRGBA;
 
-	if (CurrentFeatureLevel < ERHIFeatureLevel::SM4)
+	if (InFeatureLevel < ERHIFeatureLevel::SM4)
 	{
 		return GetMobileSceneColorFormat();
 	}
diff --git a/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h b/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h
index 304c5de4cbd9..b7d97ead26f4 100644
--- a/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h
+++ b/Engine/Source/Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h
@@ -427,6 +427,7 @@ public:
 
 	TRefCountPtr<IPooledRenderTarget>& GetSceneColor();
 
+	EPixelFormat GetSceneColorFormat(ERHIFeatureLevel::Type InFeatureLevel) const;
 	EPixelFormat GetSceneColorFormat() const;
 	EPixelFormat GetDesiredMobileSceneColorFormat() const;
 	EPixelFormat GetMobileSceneColorFormat() const;
diff --git a/Engine/Source/Runtime/Renderer/Private/PrimitiveSceneInfo.cpp b/Engine/Source/Runtime/Renderer/Private/PrimitiveSceneInfo.cpp
index bd8c683d893a..adc436846fc3 100644
--- a/Engine/Source/Runtime/Renderer/Private/PrimitiveSceneInfo.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/PrimitiveSceneInfo.cpp
@@ -103,7 +103,8 @@ FPrimitiveSceneInfo::FPrimitiveSceneInfo(UPrimitiveComponent* InComponent,FScene
 	ComponentForDebuggingOnly(InComponent),
 	bNeedsStaticMeshUpdate(false),
 	bNeedsUniformBufferUpdate(false),
-	bPrecomputedLightingBufferDirty(false)
+	bPrecomputedLightingBufferDirty(false),
+	bPrecomputedLightingBufferAssignedToProxyLCIs(false)
 {
 	check(ComponentForDebuggingOnly);
 	check(PrimitiveComponentId.IsValid());
@@ -624,6 +625,8 @@ void FPrimitiveSceneInfo::UpdatePrecomputedLightingBuffer()
 			IndirectLightingCacheUniformBuffer.SafeRelease();
 		}
 
+		bPrecomputedLightingBufferAssignedToProxyLCIs = false;
+
 		FPrimitiveSceneProxy::FLCIArray LCIs;
 		Proxy->GetLCIs(LCIs);
 		for (int32 i = 0; i < LCIs.Num(); ++i)
@@ -635,6 +638,7 @@ void FPrimitiveSceneInfo::UpdatePrecomputedLightingBuffer()
 			if (LCI->GetShadowMapInteraction().GetType() == SMIT_Texture || LCI->GetLightMapInteraction(Scene->GetFeatureLevel()).GetType() == LMIT_Texture)
 			{
 				LCI->SetPrecomputedLightingBuffer(CreatePrecomputedLightingUniformBuffer(BufferUsage, Scene->GetFeatureLevel(), NULL, NULL, FVector(0, 0, 0), 0, NULL, LCI));
+				bPrecomputedLightingBufferAssignedToProxyLCIs = true;
 			}
 			else
 			{
@@ -652,16 +656,21 @@ void FPrimitiveSceneInfo::ClearPrecomputedLightingBuffer(bool bSingleFrameOnly)
 	{
 		IndirectLightingCacheUniformBuffer.SafeRelease();
 
-		FPrimitiveSceneProxy::FLCIArray LCIs;
-		Proxy->GetLCIs(LCIs);
-		for (int32 i = 0; i < LCIs.Num(); ++i)
+		if (bPrecomputedLightingBufferAssignedToProxyLCIs)
 		{
-			FLightCacheInterface* LCI = LCIs[i];
-			if (LCI)
+			FPrimitiveSceneProxy::FLCIArray LCIs;
+			Proxy->GetLCIs(LCIs);
+			for (int32 i = 0; i < LCIs.Num(); ++i)
 			{
-				LCI->SetPrecomputedLightingBuffer(FUniformBufferRHIRef());
+				FLightCacheInterface* LCI = LCIs[i];
+				if (LCI)
+				{
+					LCI->SetPrecomputedLightingBuffer(FUniformBufferRHIRef());
+				}
 			}
+			bPrecomputedLightingBufferAssignedToProxyLCIs = false;
 		}
+
 		MarkPrecomputedLightingBufferDirty();
 	}
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/ReflectionEnvironment.cpp b/Engine/Source/Runtime/Renderer/Private/ReflectionEnvironment.cpp
index 7ba71e269bd3..c3c146bf23d3 100644
--- a/Engine/Source/Runtime/Renderer/Private/ReflectionEnvironment.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/ReflectionEnvironment.cpp
@@ -23,12 +23,15 @@
 #include "ScenePrivate.h"
 #include "PostProcess/SceneFilterRendering.h"
 #include "PostProcess/PostProcessing.h"
+#include "PostProcess/PostProcessSubsurface.h"
 #include "PostProcess/ScreenSpaceReflections.h"
 #include "LightRendering.h"
 #include "LightPropagationVolumeSettings.h"
 #include "PipelineStateCache.h"
+#include "DistanceFieldAmbientOcclusion.h"
 
 DECLARE_GPU_STAT_NAMED(ReflectionEnvironment, TEXT("Reflection Environment"));
+DECLARE_GPU_STAT(SkyLightDiffuse);
 
 extern TAutoConsoleVariable<int32> CVarLPVMixing;
 
@@ -385,49 +388,70 @@ void FReflectionEnvironmentCubemapArray::UpdateMaxCubemaps(uint32 InMaxCubemaps,
 	}
 }
 
-class FDistanceFieldAOSpecularOcclusionParameters
+class FSkyLightParameters
 {
 public:
-
 	void Bind(const FShaderParameterMap& ParameterMap)
 	{
-		BentNormalAOTexture.Bind(ParameterMap, TEXT("BentNormalAOTexture"));
-		BentNormalAOSampler.Bind(ParameterMap, TEXT("BentNormalAOSampler"));
 		ApplyBentNormalAO.Bind(ParameterMap, TEXT("ApplyBentNormalAO"));
 		InvSkySpecularOcclusionStrength.Bind(ParameterMap, TEXT("InvSkySpecularOcclusionStrength"));
 		OcclusionTintAndMinOcclusion.Bind(ParameterMap, TEXT("OcclusionTintAndMinOcclusion"));
+		ContrastAndNormalizeMulAdd.Bind(ParameterMap, TEXT("ContrastAndNormalizeMulAdd"));
+		OcclusionExponent.Bind(ParameterMap, TEXT("OcclusionExponent"));
+		OcclusionCombineMode.Bind(ParameterMap, TEXT("OcclusionCombineMode"));
 	}
 
 	template<typename ShaderRHIParamRef, typename TRHICmdList>
-	void SetParameters(TRHICmdList& RHICmdList, const ShaderRHIParamRef& ShaderRHI, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, float SkySpecularOcclusionStrength, const FVector4& OcclusionTintAndMinOcclusionValue)
+	void SetParameters(TRHICmdList& RHICmdList, const ShaderRHIParamRef& ShaderRHI, bool bApplyBentNormalAO, float SkySpecularOcclusionStrength, const FSkyLightSceneProxy* SkyLight)
 	{
-		FTextureRHIParamRef BentNormalAO = GWhiteTexture->TextureRHI;
-		bool bApplyBentNormalAO = false;
-
-		if (DynamicBentNormalAO)
+		float SkyLightContrast = 0.01f;
+		float SkyLightOcclusionExponent = 1.0f;
+		FVector4 SkyLightOcclusionTintAndMinOcclusion(0.0f, 0.0f, 0.0f, 0.0f);
+		EOcclusionCombineMode SkyLightOcclusionCombineMode = EOcclusionCombineMode::OCM_MAX;
+		if (SkyLight)
 		{
-			BentNormalAO = DynamicBentNormalAO->GetRenderTargetItem().ShaderResourceTexture;
-			bApplyBentNormalAO = true;
+			FDistanceFieldAOParameters Parameters(SkyLight->OcclusionMaxDistance, SkyLight->Contrast);
+			SkyLightContrast = Parameters.Contrast;
+			SkyLightOcclusionExponent = SkyLight->OcclusionExponent;
+			SkyLightOcclusionTintAndMinOcclusion = FVector4(SkyLight->OcclusionTint);
+			SkyLightOcclusionTintAndMinOcclusion.W = SkyLight->MinOcclusion;
+			SkyLightOcclusionCombineMode = SkyLight->OcclusionCombineMode;
 		}
 
-		SetTextureParameter(RHICmdList, ShaderRHI, BentNormalAOTexture, BentNormalAOSampler, TStaticSamplerState<SF_Point>::GetRHI(), BentNormalAO);
+		// Scale and bias to remap the contrast curve to [0,1]
+		const float Min = 1 / (1 + FMath::Exp(-SkyLightContrast * (0 * 10 - 5)));
+		const float Max = 1 / (1 + FMath::Exp(-SkyLightContrast * (1 * 10 - 5)));
+		const float Mul = 1.0f / (Max - Min);
+		const float Add = -Min / (Max - Min);
+
+		SetShaderValue(RHICmdList, ShaderRHI, ContrastAndNormalizeMulAdd, FVector(SkyLightContrast, Mul, Add));
+
+		SetShaderValue(RHICmdList, ShaderRHI, OcclusionExponent, SkyLightOcclusionExponent);
+		SetShaderValue(RHICmdList, ShaderRHI, OcclusionTintAndMinOcclusion, SkyLightOcclusionTintAndMinOcclusion);
+		SetShaderValue(RHICmdList, ShaderRHI, OcclusionCombineMode, SkyLightOcclusionCombineMode == OCM_Minimum ? 0.0f : 1.0f);
 		SetShaderValue(RHICmdList, ShaderRHI, ApplyBentNormalAO, bApplyBentNormalAO ? 1.0f : 0.0f);
 		SetShaderValue(RHICmdList, ShaderRHI, InvSkySpecularOcclusionStrength, 1.0f / FMath::Max(SkySpecularOcclusionStrength, .1f));
-		SetShaderValue(RHICmdList, ShaderRHI, OcclusionTintAndMinOcclusion, OcclusionTintAndMinOcclusionValue);
 	}
 
-	friend FArchive& operator<<(FArchive& Ar,FDistanceFieldAOSpecularOcclusionParameters& P)
+	friend FArchive& operator<<(FArchive& Ar, FSkyLightParameters& P)
 	{
-		Ar << P.BentNormalAOTexture << P.BentNormalAOSampler << P.ApplyBentNormalAO << P.InvSkySpecularOcclusionStrength << P.OcclusionTintAndMinOcclusion;
+		Ar << P.ApplyBentNormalAO;
+		Ar << P.InvSkySpecularOcclusionStrength;
+		Ar << P.OcclusionTintAndMinOcclusion;
+		Ar << P.ContrastAndNormalizeMulAdd;
+		Ar << P.OcclusionExponent;
+		Ar << P.OcclusionCombineMode;
+
 		return Ar;
 	}
 
 private:
-	FShaderResourceParameter BentNormalAOTexture;
-	FShaderResourceParameter BentNormalAOSampler;
 	FShaderParameter ApplyBentNormalAO;
 	FShaderParameter InvSkySpecularOcclusionStrength;
 	FShaderParameter OcclusionTintAndMinOcclusion;
+	FShaderParameter ContrastAndNormalizeMulAdd;
+	FShaderParameter OcclusionExponent;
+	FShaderParameter OcclusionCombineMode;
 };
 
 struct FReflectionCaptureSortData
@@ -456,9 +480,9 @@ struct FReflectionCaptureSortData
 IMPLEMENT_UNIFORM_BUFFER_STRUCT(FReflectionCaptureShaderData,TEXT("ReflectionCapture"));
 
 /** Compute shader that does tiled deferred culling of reflection captures, then sorts and composites them. */
-class FReflectionEnvironmentTiledDeferredPS : public FGlobalShader
+class FReflectionEnvironmentSkyLightingPS : public FGlobalShader
 {
-	DECLARE_SHADER_TYPE(FReflectionEnvironmentTiledDeferredPS,Global)
+	DECLARE_SHADER_TYPE(FReflectionEnvironmentSkyLightingPS, Global)
 public:
 
 	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
@@ -474,7 +498,7 @@ public:
 		FForwardLightingParameters::ModifyCompilationEnvironment(Parameters.Platform, OutEnvironment);
 	}
 
-	FReflectionEnvironmentTiledDeferredPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
+	FReflectionEnvironmentSkyLightingPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
 		: FGlobalShader(Initializer)
 	{
 		SceneTextureParameters.Bind(Initializer);
@@ -484,10 +508,11 @@ public:
 		ScreenSpaceReflectionsSampler.Bind(Initializer.ParameterMap, TEXT("ScreenSpaceReflectionsSampler"));
 		PreIntegratedGF.Bind(Initializer.ParameterMap, TEXT("PreIntegratedGF"));
 		PreIntegratedGFSampler.Bind(Initializer.ParameterMap, TEXT("PreIntegratedGFSampler"));
-		SpecularOcclusionParameters.Bind(Initializer.ParameterMap);
+		DFAOUpsampleParameters.Bind(Initializer.ParameterMap);
+		SkyLightParameters.Bind(Initializer.ParameterMap);
 	}
 
-	FReflectionEnvironmentTiledDeferredPS()
+	FReflectionEnvironmentSkyLightingPS()
 	{
 	}
 
@@ -497,7 +522,7 @@ public:
 		const FViewInfo& View,
 		FTextureRHIParamRef SSRTexture,
 		const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO
-		)
+	)
 	{
 		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
 
@@ -518,32 +543,32 @@ public:
 		}
 
 		SetTextureParameter(
-			RHICmdList, 
-			ShaderRHI, 
-			ReflectionCubemap, 
-			ReflectionCubemapSampler, 
-			TStaticSamplerState<SF_Trilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(), 
+			RHICmdList,
+			ShaderRHI,
+			ReflectionCubemap,
+			ReflectionCubemapSampler,
+			TStaticSamplerState<SF_Trilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(),
 			CubemapArray);
 
 		SetTextureParameter(RHICmdList, ShaderRHI, ScreenSpaceReflectionsTexture, ScreenSpaceReflectionsSampler, TStaticSamplerState<SF_Point>::GetRHI(), SSRTexture);
 
 		SetUniformBufferParameter(RHICmdList, ShaderRHI, GetUniformBufferParameter<FReflectionCaptureShaderData>(), View.ReflectionCaptureUniformBuffer);
 
-		SetTextureParameter(RHICmdList, ShaderRHI, PreIntegratedGF, PreIntegratedGFSampler, TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI(), GSystemTextures.PreintegratedGF->GetRenderTargetItem().ShaderResourceTexture);
+		SetTextureParameter(RHICmdList, ShaderRHI, PreIntegratedGF, PreIntegratedGFSampler, TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI(), GSystemTextures.PreintegratedGF->GetRenderTargetItem().ShaderResourceTexture);
 	
 		FReflectionUniformParameters ReflectionUniformParameters;
 		SetupReflectionUniformParameters(View, ReflectionUniformParameters);
 		SetUniformBufferParameterImmediate(RHICmdList, ShaderRHI, GetUniformBufferParameter<FReflectionUniformParameters>(), ReflectionUniformParameters);
 
-		const float MinOcclusion = Scene->SkyLight ? Scene->SkyLight->MinOcclusion : 0;
-		const FVector OcclusionTint = Scene->SkyLight ? (const FVector&)Scene->SkyLight->OcclusionTint : FVector::ZeroVector;
-		SpecularOcclusionParameters.SetParameters(RHICmdList, ShaderRHI, DynamicBentNormalAO, CVarSkySpecularOcclusionStrength.GetValueOnRenderThread(), FVector4(OcclusionTint, MinOcclusion));
+		bool const bApplyBentNormalAO = DynamicBentNormalAO ? true : false;
+		SkyLightParameters.SetParameters(RHICmdList, ShaderRHI, bApplyBentNormalAO, CVarSkySpecularOcclusionStrength.GetValueOnRenderThread(), Scene->SkyLight);
 
 		SetUniformBufferParameter(RHICmdList, ShaderRHI, GetUniformBufferParameter<FForwardLightData>(), View.ForwardLightingResources->ForwardLightDataUniformBuffer);
+		DFAOUpsampleParameters.Set(RHICmdList, ShaderRHI, View, DynamicBentNormalAO);
 	}
 
 	virtual bool Serialize(FArchive& Ar) override
-	{		
+	{
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << SceneTextureParameters;
 		Ar << ReflectionCubemap;
@@ -552,7 +577,8 @@ public:
 		Ar << ScreenSpaceReflectionsSampler;
 		Ar << PreIntegratedGF;
 		Ar << PreIntegratedGFSampler;
-		Ar << SpecularOcclusionParameters;
+		Ar << DFAOUpsampleParameters;
+		Ar << SkyLightParameters;
 		return bShaderHasOutdatedParameters;
 	}
 
@@ -565,39 +591,46 @@ private:
 	FShaderResourceParameter ScreenSpaceReflectionsSampler;
 	FShaderResourceParameter PreIntegratedGF;
 	FShaderResourceParameter PreIntegratedGFSampler;
-	FDistanceFieldAOSpecularOcclusionParameters SpecularOcclusionParameters;
+	FDFAOUpsampleParameters DFAOUpsampleParameters;
+	FSkyLightParameters SkyLightParameters;
 };
 
-template< uint32 bUseLightmaps, uint32 bHasSkyLight, uint32 bBoxCapturesOnly, uint32 bSphereCapturesOnly, uint32 bSupportDFAOIndirectOcclusion >
-class TReflectionEnvironmentTiledDeferredPS : public FReflectionEnvironmentTiledDeferredPS
+template< uint32 bUseLightmaps, uint32 bBoxCapturesOnly, uint32 bSphereCapturesOnly, uint32 bSupportDFAOIndirectOcclusion, uint32 bSpecularBounce, uint32 bEnableSkyLight, uint32 bEnableDynamicSkyLight, uint32 bApplySkyShadowing>
+class TReflectionEnvironmentSkyLightingPS : public FReflectionEnvironmentSkyLightingPS
 {
-	DECLARE_SHADER_TYPE(TReflectionEnvironmentTiledDeferredPS, Global);
+	DECLARE_SHADER_TYPE(TReflectionEnvironmentSkyLightingPS, Global);
 
 	/** Default constructor. */
-	TReflectionEnvironmentTiledDeferredPS() {}
+	TReflectionEnvironmentSkyLightingPS() {}
 public:
-	TReflectionEnvironmentTiledDeferredPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
-	: FReflectionEnvironmentTiledDeferredPS(Initializer)
+	TReflectionEnvironmentSkyLightingPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
+		: FReflectionEnvironmentSkyLightingPS(Initializer)
 	{}
 
 	static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment)
 	{
-		FReflectionEnvironmentTiledDeferredPS::ModifyCompilationEnvironment(Parameters, OutEnvironment);
+		FReflectionEnvironmentSkyLightingPS::ModifyCompilationEnvironment(Parameters, OutEnvironment);
 		OutEnvironment.SetDefine(TEXT("USE_LIGHTMAPS"), bUseLightmaps);
-		OutEnvironment.SetDefine(TEXT("ENABLE_SKY_LIGHT"), bHasSkyLight);
 		OutEnvironment.SetDefine(TEXT("REFLECTION_COMPOSITE_HAS_BOX_CAPTURES"), bBoxCapturesOnly);
 		OutEnvironment.SetDefine(TEXT("REFLECTION_COMPOSITE_HAS_SPHERE_CAPTURES"), bSphereCapturesOnly);
 		OutEnvironment.SetDefine(TEXT("SUPPORT_DFAO_INDIRECT_OCCLUSION"), bSupportDFAOIndirectOcclusion);
+		OutEnvironment.SetDefine(TEXT("SPECULAR_BOUNCE"), bSpecularBounce);
+		OutEnvironment.SetDefine(TEXT("ENABLE_SKY_LIGHT"), bEnableSkyLight);
+		OutEnvironment.SetDefine(TEXT("ENABLE_DYNAMIC_SKY_LIGHT"), bEnableDynamicSkyLight);
+		OutEnvironment.SetDefine(TEXT("APPLY_SKY_SHADOWING"), bApplySkyShadowing);
 	}
 
 	static const TCHAR* GetDebugName()
 	{
-		static const FString Name = FString::Printf(TEXT("TReflectionEnvironmentTiledDeferredPS(%s,%s,%s,%s,%s)"),
+		static const FString Name = FString::Printf(TEXT("TReflectionEnvironmentSkyLightingPS(%s,%s,%s,%s,%s,%s,%s,%s)"),
 			bUseLightmaps == 1 ? TEXT("true") : TEXT("false"),
-			bHasSkyLight == 1 ? TEXT("true") : TEXT("false"),
 			bBoxCapturesOnly == 1 ? TEXT("true") : TEXT("false"),
 			bSphereCapturesOnly == 1 ? TEXT("true") : TEXT("false"),
-			bSupportDFAOIndirectOcclusion == 1 ? TEXT("true") : TEXT("false")
+			bSupportDFAOIndirectOcclusion == 1 ? TEXT("true") : TEXT("false"),
+			bSpecularBounce == 1 ? TEXT("true") : TEXT("false"),
+			bEnableSkyLight == 1 ? TEXT("true") : TEXT("false"),
+			bEnableDynamicSkyLight == 1 ? TEXT("true") : TEXT("false"),
+			bApplySkyShadowing == 1 ? TEXT("true") : TEXT("false")
 		);
 
 		return *Name;
@@ -610,10 +643,10 @@ public:
 // Templatized version of IMPLEMENT_SHADER_TYPE
 // This allows us to avoid 32 IMPLEMENT_SHADER_TYPE macros, one per shader variation
 IMPLEMENT_SHADER_TYPE_WITH_DEBUG_NAME(
-	ARG_WITH_COMMAS(template<uint32 A, uint32 B, uint32 C, uint32 D, uint32 E>),
-	ARG_WITH_COMMAS(TReflectionEnvironmentTiledDeferredPS<A, B, C, D, E>),
+	ARG_WITH_COMMAS(template<uint32 A, uint32 B, uint32 C, uint32 D, uint32 E, uint32 F, uint32 G, uint32 H>),
+	ARG_WITH_COMMAS(TReflectionEnvironmentSkyLightingPS<A, B, C, D, E, F, G, H>),
 	TEXT("/Engine/Private/ReflectionEnvironmentPixelShader.usf"),
-	TEXT("ReflectionEnvironmentTiledDeferredMain"),
+	TEXT("ReflectionEnvironmentSkyLighting"),
 	SF_Pixel)
 
 // This function selects a shader variation dynamically at runtime based on its parameters
@@ -634,95 +667,6 @@ ShaderClass* SelectShaderVariation(TShaderMap<FGlobalShaderType>* ShaderMap, boo
 		SelectShaderVariation<ShaderClass, ShaderTemplateClass, ExtractedTemplateParameters..., 0>(ShaderMap, args...);
 }
 
-class FReflectionCaptureSpecularBouncePS : public FGlobalShader
-{
-	DECLARE_SHADER_TYPE(FReflectionCaptureSpecularBouncePS, Global);
-
-	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
-	{
-		return IsFeatureLevelSupported(Parameters.Platform, ERHIFeatureLevel::SM4);
-	}
-
-	/** Default constructor. */
-	FReflectionCaptureSpecularBouncePS() {}
-
-public:
-	FSceneTextureShaderParameters SceneTextureParameters;
-
-	/** Initialization constructor. */
-	FReflectionCaptureSpecularBouncePS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
-		: FGlobalShader(Initializer)
-	{
-		SceneTextureParameters.Bind(Initializer);
-	}
-
-	void SetParameters(FRHICommandList& RHICmdList, const FSceneView& View)
-	{
-		const FPixelShaderRHIParamRef ShaderRHI = GetPixelShader();
-
-		FGlobalShader::SetParameters<FViewUniformShaderParameters>(RHICmdList, ShaderRHI, View.ViewUniformBuffer);
-
-		SceneTextureParameters.Set(RHICmdList, ShaderRHI, View.FeatureLevel, ESceneTextureSetupMode::All);
-	}
-
-	// FShader interface.
-	virtual bool Serialize(FArchive& Ar) override
-	{
-		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
-		Ar << SceneTextureParameters;
-		return bShaderHasOutdatedParameters;
-	}
-};
-
-IMPLEMENT_SHADER_TYPE(,FReflectionCaptureSpecularBouncePS,TEXT("/Engine/Private/ReflectionEnvironmentPixelShader.usf"),TEXT("SpecularBouncePS"),SF_Pixel);
-
-void FDeferredShadingSceneRenderer::RenderReflectionCaptureSpecularBounceForAllViews(FRHICommandListImmediate& RHICmdList)
-{
-	FGraphicsPipelineStateInitializer GraphicsPSOInit;
-
-	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
-	SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EUninitializedColorExistingDepth, FExclusiveDepthStencil::DepthRead_StencilWrite);
-
-	RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
-	GraphicsPSOInit.RasterizerState = TStaticRasterizerState< FM_Solid, CM_None >::GetRHI();
-	GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState< false, CF_Always >::GetRHI();
-	GraphicsPSOInit.BlendState = TStaticBlendState< CW_RGB, BO_Add, BF_One, BF_One >::GetRHI();
-
-	auto ShaderMap = GetGlobalShaderMap(FeatureLevel);
-	TShaderMapRef< FPostProcessVS > VertexShader(ShaderMap);
-	TShaderMapRef< FReflectionCaptureSpecularBouncePS > PixelShader(ShaderMap);
-
-	GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = GFilterVertexDeclaration.VertexDeclarationRHI;
-	GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
-	GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
-	GraphicsPSOInit.PrimitiveType = PT_TriangleList;
-
-	SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
-
-	for (int32 ViewIndex = 0, Num = Views.Num(); ViewIndex < Num; ViewIndex++)
-	{
-		const FViewInfo& View = Views[ViewIndex];
-
-		RHICmdList.SetViewport(View.ViewRect.Min.X, View.ViewRect.Min.Y, 0.0f, View.ViewRect.Max.X, View.ViewRect.Max.Y, 1.0f);
-
-		
-		PixelShader->SetParameters(RHICmdList, View);
-
-		DrawRectangle( 
-			RHICmdList,
-			0, 0,
-			View.ViewRect.Width(), View.ViewRect.Height(),
-			0, 0,
-			View.ViewRect.Width(), View.ViewRect.Height(),
-			FIntPoint(View.ViewRect.Width(), View.ViewRect.Height()),
-			SceneContext.GetBufferSizeXY(),
-			*VertexShader,
-			EDRF_UseTriangleOptimization);
-	}
-
-	ResolveSceneColor(RHICmdList);
-}
-
 bool FDeferredShadingSceneRenderer::ShouldDoReflectionEnvironment() const
 {
 	const ERHIFeatureLevel::Type SceneFeatureLevel = Scene->GetFeatureLevel();
@@ -822,16 +766,49 @@ void FDeferredShadingSceneRenderer::SetupReflectionCaptureBuffers(FViewInfo& Vie
 	}
 }
 
-void FDeferredShadingSceneRenderer::RenderTiledDeferredImageBasedReflections(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT)
+void FDeferredShadingSceneRenderer::RenderDeferredReflectionsAndSkyLighting(FRHICommandListImmediate& RHICmdList, TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT)
 {
-	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
-	static const auto AllowStaticLightingVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.AllowStaticLighting"));
-	const bool bUseLightmaps = (AllowStaticLightingVar->GetValueOnRenderThread() == 1);
+	if (ViewFamily.EngineShowFlags.VisualizeLightCulling || !ViewFamily.EngineShowFlags.Lighting)
+	{
+		return;
+	}
+
+	// If we're currently capturing a reflection capture, output SpecularColor * IndirectIrradiance for metals so they are not black in reflections,
+	// Since we don't have multiple bounce specular reflections
+	bool bReflectionCapture = false;
+	for (int32 ViewIndex = 0, Num = Views.Num(); ViewIndex < Num; ViewIndex++)
+	{
+		const FViewInfo& View = Views[ViewIndex];
+		bReflectionCapture = bReflectionCapture || View.bIsReflectionCapture;
+	}
 
 	const bool bSkyLight = Scene->SkyLight
 		&& Scene->SkyLight->ProcessedTexture
 		&& !Scene->SkyLight->bHasStaticLighting;
 
+	bool bDynamicSkyLight = ShouldRenderDeferredDynamicSkyLight(Scene, ViewFamily);
+	bool bApplySkyShadowing = false;
+	if (bDynamicSkyLight)
+	{
+		SCOPED_DRAW_EVENT(RHICmdList, SkyLightDiffuse);
+		SCOPED_GPU_STAT(RHICmdList, SkyLightDiffuse);
+
+		FDistanceFieldAOParameters Parameters(Scene->SkyLight->OcclusionMaxDistance, Scene->SkyLight->Contrast);
+
+		extern int32 GDistanceFieldAOApplyToStaticIndirect;
+		if (Scene->SkyLight->bCastShadows
+			&& !GDistanceFieldAOApplyToStaticIndirect
+			&& ShouldRenderDistanceFieldAO()
+			&& ViewFamily.EngineShowFlags.AmbientOcclusion)
+		{
+			bApplySkyShadowing = RenderDistanceFieldLighting(RHICmdList, Parameters, VelocityRT, DynamicBentNormalAO, false, false);
+		}
+	}
+
+	FSceneRenderTargets& SceneContext = FSceneRenderTargets::Get(RHICmdList);
+	static const auto AllowStaticLightingVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.AllowStaticLighting"));
+	const bool bUseLightmaps = (AllowStaticLightingVar->GetValueOnRenderThread() == 1);
+
 	const bool bReflectionEnv = ShouldDoReflectionEnvironment();
 
 	for (int32 ViewIndex = 0, Num = Views.Num(); ViewIndex < Num; ViewIndex++)
@@ -841,19 +818,19 @@ void FDeferredShadingSceneRenderer::RenderTiledDeferredImageBasedReflections(FRH
 		const uint32 bSSR = ShouldRenderScreenSpaceReflections(Views[ViewIndex]);
 
 		TRefCountPtr<IPooledRenderTarget> SSROutput = GSystemTextures.BlackDummy;
-		if( bSSR )
+		if (bSSR)
 		{
 			RenderScreenSpaceReflections(RHICmdList, View, SSROutput, VelocityRT);
 		}
 
 		const bool bPlanarReflections = RenderDeferredPlanarReflections(RHICmdList, View, false, SSROutput);
 
-		bool bRequiresApply = bSkyLight || bReflectionEnv || bSSR || bPlanarReflections;
+		bool bRequiresApply = bSkyLight || bDynamicSkyLight || bReflectionEnv || bSSR || bPlanarReflections;
 
-		if(bRequiresApply)
+		if (bRequiresApply)
 		{
 			SCOPED_GPU_STAT(RHICmdList, ReflectionEnvironment);
-			SCOPED_DRAW_EVENTF(RHICmdList, ReflectionEnvironment, TEXT("ReflectionEnvironment PixelShader"));
+			SCOPED_DRAW_EVENTF(RHICmdList, ReflectionEnvironment, TEXT("ReflectionEnvironmentAndSky"));
 
 			// Render the reflection environment with tiled deferred culling
 			bool bHasBoxCaptures = (View.NumBoxReflectionCaptures > 0);
@@ -861,24 +838,39 @@ void FDeferredShadingSceneRenderer::RenderTiledDeferredImageBasedReflections(FRH
 
 			TShaderMapRef<FPostProcessVS> VertexShader(View.ShaderMap);
 
-			FReflectionEnvironmentTiledDeferredPS* PixelShader =
-				SelectShaderVariation<FReflectionEnvironmentTiledDeferredPS, TReflectionEnvironmentTiledDeferredPS>
-				(View.ShaderMap, bUseLightmaps, bSkyLight, bHasBoxCaptures, bHasSphereCaptures, DynamicBentNormalAO != NULL);
+			FReflectionEnvironmentSkyLightingPS* PixelShader =
+				SelectShaderVariation<FReflectionEnvironmentSkyLightingPS, TReflectionEnvironmentSkyLightingPS>
+				(View.ShaderMap, bUseLightmaps, bHasBoxCaptures, bHasSphereCaptures, DynamicBentNormalAO != NULL, bReflectionCapture, bSkyLight, bDynamicSkyLight, bApplySkyShadowing);
 
 			FGraphicsPipelineStateInitializer GraphicsPSOInit;
 
-			SceneContext.BeginRenderingSceneColor(RHICmdList, ESimpleRenderTargetMode::EExistingColorAndDepth, FExclusiveDepthStencil::DepthRead_StencilWrite, true);
+			SceneContext.BeginRenderingSceneColor(
+				RHICmdList,
+				bReflectionCapture ? ESimpleRenderTargetMode::EUninitializedColorExistingDepth : ESimpleRenderTargetMode::EExistingColorAndDepth,
+				FExclusiveDepthStencil::DepthRead_StencilWrite);
 			RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
 
-			if (GetReflectionEnvironmentCVar() == 2)
+			extern int32 GAOOverwriteSceneColor;
+			if (bReflectionCapture)
+			{
+				GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_One, BF_One>::GetRHI();
+			}
+			else if (GetReflectionEnvironmentCVar() == 2 || GAOOverwriteSceneColor)
 			{
 				// override scene color for debugging
 				GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
 			}
 			else
 			{
-				// additive to scene color
-				GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGBA, BO_Add, BF_One, BF_One, BO_Add, BF_One, BF_One>::GetRHI();
+				const bool bCheckerboardSubsurfaceRendering = FRCPassPostProcessSubsurface::RequiresCheckerboardSubsurfaceRendering(SceneContext.GetSceneColorFormat());
+				if (bCheckerboardSubsurfaceRendering)
+				{
+					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_One, BF_One>::GetRHI();
+				}
+				else
+				{
+					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGBA, BO_Add, BF_One, BF_One, BO_Add, BF_One, BF_One>::GetRHI();
+				}
 			}
 
 			GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
@@ -895,43 +887,33 @@ void FDeferredShadingSceneRenderer::RenderTiledDeferredImageBasedReflections(FRH
 
 			PixelShader->SetParameters(RHICmdList, View, SSROutput->GetRenderTargetItem().ShaderResourceTexture, DynamicBentNormalAO);
 
-			DrawRectangle(
-				RHICmdList,
-				0, 0,
-				View.ViewRect.Width(), View.ViewRect.Height(),
-				View.ViewRect.Min.X, View.ViewRect.Min.Y,
-				View.ViewRect.Width(), View.ViewRect.Height(),
-				FIntPoint(View.ViewRect.Width(), View.ViewRect.Height()),
-				SceneContext.GetBufferSizeXY(),
-				*VertexShader);
+			if (bReflectionCapture)
+			{
+				DrawRectangle(
+					RHICmdList,
+					0, 0,
+					View.ViewRect.Width(), View.ViewRect.Height(),
+					0, 0,
+					View.ViewRect.Width(), View.ViewRect.Height(),
+					FIntPoint(View.ViewRect.Width(), View.ViewRect.Height()),
+					SceneContext.GetBufferSizeXY(),
+					*VertexShader,
+					EDRF_UseTriangleOptimization);
+			}
+			else
+			{
+				DrawRectangle(
+					RHICmdList,
+					0, 0,
+					View.ViewRect.Width(), View.ViewRect.Height(),
+					View.ViewRect.Min.X, View.ViewRect.Min.Y,
+					View.ViewRect.Width(), View.ViewRect.Height(),
+					FIntPoint(View.ViewRect.Width(), View.ViewRect.Height()),
+					SceneContext.GetBufferSizeXY(),
+					*VertexShader);
+			}
 
 			ResolveSceneColor(RHICmdList);
 		}
 	}
 }
-
-void FDeferredShadingSceneRenderer::RenderDeferredReflections(FRHICommandListImmediate& RHICmdList, const TRefCountPtr<IPooledRenderTarget>& DynamicBentNormalAO, TRefCountPtr<IPooledRenderTarget>& VelocityRT)
-{
-	if (ViewFamily.EngineShowFlags.VisualizeLightCulling ||	!ViewFamily.EngineShowFlags.Lighting)
-	{
-		return;
-	}
-
-	bool bAnyViewIsReflectionCapture = false;
-	for (int32 ViewIndex = 0, Num = Views.Num(); ViewIndex < Num; ViewIndex++)
-	{
-		const FViewInfo& View = Views[ViewIndex];
-		bAnyViewIsReflectionCapture = bAnyViewIsReflectionCapture || View.bIsReflectionCapture;
-	}
-	
-	if (bAnyViewIsReflectionCapture)
-	{
-	    // If we're currently capturing a reflection capture, output SpecularColor * IndirectIrradiance for metals so they are not black in reflections,
-	    // Since we don't have multiple bounce specular reflections
-		RenderReflectionCaptureSpecularBounceForAllViews(RHICmdList);
-	}
-	else
-	{
-		RenderTiledDeferredImageBasedReflections(RHICmdList, DynamicBentNormalAO, VelocityRT);
-	}
-}
diff --git a/Engine/Source/Runtime/Renderer/Private/Renderer.cpp b/Engine/Source/Runtime/Renderer/Private/Renderer.cpp
index 82203861fe66..bee2ba91c3f8 100644
--- a/Engine/Source/Runtime/Renderer/Private/Renderer.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/Renderer.cpp
@@ -151,6 +151,8 @@ void FRendererModule::DebugLogOnCrash()
 	GRenderTargetPool.VisualizeTexture.SortOrder = 1;
 	GRenderTargetPool.VisualizeTexture.bFullList = true;
 	GRenderTargetPool.VisualizeTexture.DebugLog(false);
+	
+	GEngine->Exec(NULL, TEXT("rhi.DumpMemory"), *GLog);
 
 	// execute on main thread
 	{
@@ -159,7 +161,6 @@ void FRendererModule::DebugLogOnCrash()
 			void Thread()
 			{
 				GEngine->Exec(NULL, TEXT("Mem FromReport"), *GLog);
-				GEngine->Exec(NULL, TEXT("rhi.DumpMemory"), *GLog);
 			}
 		} Test;
 
diff --git a/Engine/Source/Runtime/Renderer/Private/RendererScene.cpp b/Engine/Source/Runtime/Renderer/Private/RendererScene.cpp
index dfd76ce39651..a65853217044 100644
--- a/Engine/Source/Runtime/Renderer/Private/RendererScene.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/RendererScene.cpp
@@ -451,14 +451,14 @@ void FScene::UpdateParameterCollections(const TArray<FMaterialParameterCollectio
 	ENQUEUE_RENDER_COMMAND(UpdateParameterCollectionsCommand)(
 		[this, InParameterCollections](FRHICommandList&)
 	{
-		// Empy the scene's map so any unused uniform buffers will be released
+		// Empty the scene's map so any unused uniform buffers will be released
 		ParameterCollections.Empty();
 
 		// Add each existing parameter collection id and its uniform buffer
 		for (int32 CollectionIndex = 0; CollectionIndex < InParameterCollections.Num(); CollectionIndex++)
 		{
-			FMaterialParameterCollectionInstanceResource* InstanceReousrce = InParameterCollections[CollectionIndex];
-			ParameterCollections.Add(InstanceReousrce->GetId(), InstanceReousrce->GetUniformBuffer());
+			FMaterialParameterCollectionInstanceResource* InstanceResource = InParameterCollections[CollectionIndex];
+			ParameterCollections.Add(InstanceResource->GetId(), InstanceResource->GetUniformBuffer());
 		}
 	});
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/SceneCore.cpp b/Engine/Source/Runtime/Renderer/Private/SceneCore.cpp
index 9654a269dcb8..3ec662ccd8ca 100644
--- a/Engine/Source/Runtime/Renderer/Private/SceneCore.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/SceneCore.cpp
@@ -296,13 +296,16 @@ FLightPrimitiveInteraction::~FLightPrimitiveInteraction()
 
 void FLightPrimitiveInteraction::FlushCachedShadowMapData()
 {
-	if (bCastShadow && !PrimitiveSceneInfo->Proxy->IsMeshShapeOftenMoving())
+	if (LightSceneInfo && PrimitiveSceneInfo && PrimitiveSceneInfo->Proxy && PrimitiveSceneInfo->Scene)
 	{
-		FCachedShadowMapData* CachedShadowMapData = PrimitiveSceneInfo->Scene->CachedShadowMaps.Find(LightSceneInfo->Id);
-
-		if (CachedShadowMapData)
+		if (bCastShadow && !PrimitiveSceneInfo->Proxy->IsMeshShapeOftenMoving())
 		{
-			CachedShadowMapData->ShadowMap.Release();
+			FCachedShadowMapData* CachedShadowMapData = PrimitiveSceneInfo->Scene->CachedShadowMaps.Find(LightSceneInfo->Id);
+
+			if (CachedShadowMapData)
+			{
+				CachedShadowMapData->ShadowMap.Release();
+			}
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/Renderer/Private/SceneOcclusion.cpp b/Engine/Source/Runtime/Renderer/Private/SceneOcclusion.cpp
index 4d3599a9c688..880ebd91920e 100644
--- a/Engine/Source/Runtime/Renderer/Private/SceneOcclusion.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/SceneOcclusion.cpp
@@ -221,7 +221,7 @@ void FSceneViewState::TrimOcclusionHistory(float CurrentTime, float MinHistoryTi
 			// If the primitive has an old pending occlusion query, release it.
 			if(PrimitiveIt->LastConsideredTime < MinQueryTime)
 			{
-				PrimitiveIt->ReleaseQueries(OcclusionQueryPool, NumBufferedFrames);
+				PrimitiveIt->ReleaseStaleQueries(OcclusionQueryPool, FrameNumber, NumBufferedFrames);
 			}
 
 			// If the primitive hasn't been considered for visibility recently, remove its history from the set.
@@ -261,25 +261,7 @@ bool FSceneViewState::IsShadowOccluded(FRHICommandListImmediate& RHICmdList, FSc
 
 void FSceneViewState::ConditionallyAllocateSceneSoftwareOcclusion(ERHIFeatureLevel::Type InFeatureLevel)
 {
-	static bool bOnce = false;
-	static bool bForceByCmdLine = false;
-	static bool bCmdLineShouldBeEnabledValue = false;
-	if (!bOnce)
-	{
-		bOnce = true;
-		if (FParse::Param(FCommandLine::Get(), TEXT("softwareocclusionculling")) && GMobileAllowSoftwareOcclusion == 0)
-		{
-			bForceByCmdLine = true;
-			bCmdLineShouldBeEnabledValue = true;
-		}
-		else if (FParse::Param(FCommandLine::Get(), TEXT("hardwareocclusionculling")) && GMobileAllowSoftwareOcclusion >= 1)
-		{
-			bForceByCmdLine = true;
-			bCmdLineShouldBeEnabledValue = false;
-		}
-	}
-	// Want to use software occlusion only for "Mobile" feature level
-	bool bShouldBeEnabled = bForceByCmdLine ? bCmdLineShouldBeEnabledValue : (InFeatureLevel <= ERHIFeatureLevel::ES3_1 && GMobileAllowSoftwareOcclusion != 0);
+	bool bShouldBeEnabled = InFeatureLevel <= ERHIFeatureLevel::ES3_1 && GMobileAllowSoftwareOcclusion != 0;
 
 	if (bShouldBeEnabled && !SceneSoftwareOcclusion)
 	{
@@ -633,7 +615,7 @@ static bool AllocatePlanarReflectionOcclusionQuery(FViewInfo& View, const FPlana
 	
 	uint32 OcclusionFrameCounter = ViewState->OcclusionFrameCounter;
 	FIndividualOcclusionHistory& OcclusionHistory = ViewState->PlanarReflectionOcclusionHistories.FindOrAdd(SceneProxy->PlanarReflectionId);
-	ViewState->OcclusionQueryPool.ReleaseQuery(OcclusionHistory.GetPastQuery(OcclusionFrameCounter, NumBufferedFrames));
+	OcclusionHistory.ReleaseQuery(ViewState->OcclusionQueryPool, OcclusionFrameCounter, NumBufferedFrames);
 	
 	if (bAllowBoundsTest)
 	{
@@ -1551,14 +1533,14 @@ void FSceneRenderer::BeginOcclusionTests(FRHICommandListImmediate& RHICmdList, b
 				{
 					VertexShader->SetParameters(RHICmdList, View);
 
-					{
-						SCOPED_DRAW_EVENT(RHICmdList, IndividualQueries);
-						View.IndividualOcclusionQueries.Flush(RHICmdList);
-					}
 					{
 						SCOPED_DRAW_EVENT(RHICmdList, GroupedQueries);
 						View.GroupedOcclusionQueries.Flush(RHICmdList);
 					}
+					{
+						SCOPED_DRAW_EVENT(RHICmdList, IndividualQueries);
+						View.IndividualOcclusionQueries.Flush(RHICmdList);
+					}
 				}
 			}
 			
diff --git a/Engine/Source/Runtime/Renderer/Private/ScenePrivate.h b/Engine/Source/Runtime/Renderer/Private/ScenePrivate.h
index a0c52d24582a..ce47552662af 100644
--- a/Engine/Source/Runtime/Renderer/Private/ScenePrivate.h
+++ b/Engine/Source/Runtime/Renderer/Private/ScenePrivate.h
@@ -72,13 +72,15 @@ public:
 	FPrimitiveComponentId PrimitiveId;
 
 	/** The occlusion query which contains the primitive's pending occlusion results. */
-	TArray<FRenderQueryRHIRef, TInlineAllocator<FOcclusionQueryHelpers::MaxBufferedOcclusionFrames> > PendingOcclusionQuery;
+	FRenderQueryRHIRef PendingOcclusionQuery[FOcclusionQueryHelpers::MaxBufferedOcclusionFrames];
+	uint32 PendingOcclusionQueryFrames[FOcclusionQueryHelpers::MaxBufferedOcclusionFrames]; 
 
+	uint32 LastTestFrameNumber;
+	uint32 LastConsideredFrameNumber;
 	uint32 HZBTestIndex;
-	uint32 HZBTestFrameNumber;
 
 	/** The last time the primitive was visible. */
-	float LastVisibleTime;
+	float LastProvenVisibleTime;
 
 	/** The last time the primitive was in the view frustum. */
 	float LastConsideredTime;
@@ -89,70 +91,121 @@ public:
 	 */
 	float LastPixelsPercentage;
 
-	/** whether or not this primitive was grouped the last time it was queried */
-	bool bGroupedQuery;
-
-	/** 
-	 * For things that have subqueries (folaige), this is the non-zero
-	 */
+	/**
+	* For things that have subqueries (folaige), this is the non-zero
+	*/
 	int32 CustomIndex;
 
+	/** When things first become eligible for occlusion, then might be sweeping into the frustum, we are going to leave them at visible for a few frames, then start real queries.  */
+	uint8 BecameEligibleForQueryCooldown : 6;
+
+	uint8 WasOccludedLastFrame : 1;
+	uint8 OcclusionStateWasDefiniteLastFrame : 1;
+
+	/** whether or not this primitive was grouped the last time it was queried */
+	bool bGroupedQuery[FOcclusionQueryHelpers::MaxBufferedOcclusionFrames];
+
 	/** Initialization constructor. */
 	FORCEINLINE FPrimitiveOcclusionHistory(FPrimitiveComponentId InPrimitiveId, int32 SubQuery)
 		: PrimitiveId(InPrimitiveId)
+		, LastTestFrameNumber(~0u)
+		, LastConsideredFrameNumber(~0u)
 		, HZBTestIndex(0)
-		, HZBTestFrameNumber(~0u)
-		, LastVisibleTime(0.0f)
+		, LastProvenVisibleTime(0.0f)
 		, LastConsideredTime(0.0f)
 		, LastPixelsPercentage(0.0f)
-		, bGroupedQuery(false)
 		, CustomIndex(SubQuery)
+		, BecameEligibleForQueryCooldown(0)
+		, WasOccludedLastFrame(false)
+		, OcclusionStateWasDefiniteLastFrame(false)
 	{
-		PendingOcclusionQuery.Empty(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
-		PendingOcclusionQuery.AddZeroed(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
+		for (int32 Index = 0; Index < FOcclusionQueryHelpers::MaxBufferedOcclusionFrames; Index++)
+		{
+			PendingOcclusionQueryFrames[Index] = 0;
+			bGroupedQuery[Index] = false;
+		}
 	}
 
 	FORCEINLINE FPrimitiveOcclusionHistory()
-		: HZBTestIndex(0)
-		, HZBTestFrameNumber(~0u)
-		, LastVisibleTime(0.0f)
+		: LastTestFrameNumber(~0u)
+		, LastConsideredFrameNumber(~0u)
+		, HZBTestIndex(0)
+		, LastProvenVisibleTime(0.0f)
 		, LastConsideredTime(0.0f)
 		, LastPixelsPercentage(0.0f)
-		, bGroupedQuery(false)
 		, CustomIndex(0)
+		, BecameEligibleForQueryCooldown(0)
+		, WasOccludedLastFrame(false)
+		, OcclusionStateWasDefiniteLastFrame(false)
 	{
-		PendingOcclusionQuery.Empty(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
-		PendingOcclusionQuery.AddZeroed(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
-	}
-
-
-	/** Destructor. Note that the query should have been released already. */
-	~FPrimitiveOcclusionHistory()
-	{
-		//		check( !IsValidRef(PendingOcclusionQuery) );
+		for (int32 Index = 0; Index < FOcclusionQueryHelpers::MaxBufferedOcclusionFrames; Index++)
+		{
+			PendingOcclusionQueryFrames[Index] = 0;
+			bGroupedQuery[Index] = false;
+		}
 	}
 
 	template<class TOcclusionQueryPool> // here we use a template just to allow this to be inlined without sorting out the header order
-	FORCEINLINE void ReleaseQueries(TOcclusionQueryPool& Pool, int32 NumBufferedFrames)
+	FORCEINLINE void ReleaseStaleQueries(TOcclusionQueryPool& Pool, uint32 FrameNumber, int32 NumBufferedFrames)
 	{
-		for (int32 QueryIndex = 0; QueryIndex < NumBufferedFrames; QueryIndex++)
+		for (uint32 DeltaFrame = NumBufferedFrames; DeltaFrame > 0; DeltaFrame--)
+		{
+			if (FrameNumber >= (DeltaFrame - 1))
+			{
+				uint32 TestFrame = FrameNumber - (DeltaFrame - 1);
+				const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(TestFrame, NumBufferedFrames);
+				if (PendingOcclusionQuery[QueryIndex].GetReference() && PendingOcclusionQueryFrames[QueryIndex] != TestFrame)
+				{
+					Pool.ReleaseQuery(PendingOcclusionQuery[QueryIndex]);
+				}
+			}
+		}
+	}
+	template<class TOcclusionQueryPool> // here we use a template just to allow this to be inlined without sorting out the header order
+	FORCEINLINE void ReleaseQuery(TOcclusionQueryPool& Pool, uint32 FrameNumber, int32 NumBufferedFrames)
+	{
+		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(FrameNumber, NumBufferedFrames);
+		if (PendingOcclusionQuery[QueryIndex].GetReference())
 		{
 			Pool.ReleaseQuery(PendingOcclusionQuery[QueryIndex]);
 		}
 	}
 
-	FORCEINLINE FRenderQueryRHIRef& GetPastQuery(uint32 FrameNumber, int32 NumBufferedFrames)
+	FORCEINLINE FRenderQueryRHIParamRef GetPastQuery(uint32 FrameNumber, int32 NumBufferedFrames, bool& bOutGrouped)
 	{
 		// Get the oldest occlusion query
 		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(FrameNumber, NumBufferedFrames);
-		return PendingOcclusionQuery[QueryIndex];
+		bOutGrouped = false;
+		if (PendingOcclusionQuery[QueryIndex].GetReference() && PendingOcclusionQueryFrames[QueryIndex] == FrameNumber - uint32(NumBufferedFrames))
+		{
+			bOutGrouped = bGroupedQuery[QueryIndex];
+			return PendingOcclusionQuery[QueryIndex].GetReference();
+		}
+		return nullptr;
 	}
 
-	FORCEINLINE void SetCurrentQuery(uint32 FrameNumber, FRenderQueryRHIParamRef NewQuery, int32 NumBufferedFrames)
+	FORCEINLINE void SetCurrentQuery(uint32 FrameNumber, FRenderQueryRHIParamRef NewQuery, int32 NumBufferedFrames, bool bGrouped)
 	{
 		// Get the current occlusion query
 		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryIssueIndex(FrameNumber, NumBufferedFrames);
 		PendingOcclusionQuery[QueryIndex] = NewQuery;
+		PendingOcclusionQueryFrames[QueryIndex] = FrameNumber;
+		bGroupedQuery[QueryIndex] = bGrouped;
+	}
+
+	FORCEINLINE uint32 LastQuerySubmitFrame() const
+	{
+		uint32 Result = 0;
+
+		for (int32 Index = 0; Index < FOcclusionQueryHelpers::MaxBufferedOcclusionFrames; Index++)
+		{
+			if (!bGroupedQuery[Index])
+			{
+				Result = FMath::Max(Result, PendingOcclusionQueryFrames[Index]);
+			}
+		}
+
+		return Result;
 	}
 };
 
@@ -197,31 +250,46 @@ struct FPrimitiveOcclusionHistoryKeyFuncs : BaseKeyFuncs<FPrimitiveOcclusionHist
 
 class FIndividualOcclusionHistory
 {
-	TArray<FRenderQueryRHIRef, TInlineAllocator<FOcclusionQueryHelpers::MaxBufferedOcclusionFrames> > PendingOcclusionQuery;
+	FRenderQueryRHIRef PendingOcclusionQuery[FOcclusionQueryHelpers::MaxBufferedOcclusionFrames];
+	uint32 PendingOcclusionQueryFrames[FOcclusionQueryHelpers::MaxBufferedOcclusionFrames]; // not intialized...this is ok
 
 public:
 
-	FORCEINLINE FIndividualOcclusionHistory()
-	{
-		PendingOcclusionQuery.Empty(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
-		PendingOcclusionQuery.AddZeroed(FOcclusionQueryHelpers::MaxBufferedOcclusionFrames);
-	}
-
-
 	template<class TOcclusionQueryPool> // here we use a template just to allow this to be inlined without sorting out the header order
-	FORCEINLINE void ReleaseQueries(TOcclusionQueryPool& Pool, int32 NumBufferedFrames)
+	FORCEINLINE void ReleaseStaleQueries(TOcclusionQueryPool& Pool, uint32 FrameNumber, int32 NumBufferedFrames)
 	{
-		for (int32 QueryIndex = 0; QueryIndex < NumBufferedFrames; QueryIndex++)
+		for (uint32 DeltaFrame = NumBufferedFrames; DeltaFrame > 0; DeltaFrame--)
+		{
+			if (FrameNumber >= (DeltaFrame - 1))
+			{
+				uint32 TestFrame = FrameNumber - (DeltaFrame - 1);
+				const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(TestFrame, NumBufferedFrames);
+				if (PendingOcclusionQuery[QueryIndex].GetReference() && PendingOcclusionQueryFrames[QueryIndex] != TestFrame)
+				{
+					Pool.ReleaseQuery(PendingOcclusionQuery[QueryIndex]);
+				}
+			}
+		}
+	}
+	template<class TOcclusionQueryPool> // here we use a template just to allow this to be inlined without sorting out the header order
+	FORCEINLINE void ReleaseQuery(TOcclusionQueryPool& Pool, uint32 FrameNumber, int32 NumBufferedFrames)
+	{
+		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(FrameNumber, NumBufferedFrames);
+		if (PendingOcclusionQuery[QueryIndex].GetReference())
 		{
 			Pool.ReleaseQuery(PendingOcclusionQuery[QueryIndex]);
 		}
 	}
 
-	FORCEINLINE FRenderQueryRHIRef& GetPastQuery(uint32 FrameNumber, int32 NumBufferedFrames)
+	FORCEINLINE FRenderQueryRHIParamRef GetPastQuery(uint32 FrameNumber, int32 NumBufferedFrames)
 	{
 		// Get the oldest occlusion query
 		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryLookupIndex(FrameNumber, NumBufferedFrames);
-		return PendingOcclusionQuery[QueryIndex];
+		if (PendingOcclusionQuery[QueryIndex].GetReference() && PendingOcclusionQueryFrames[QueryIndex] == FrameNumber - uint32(NumBufferedFrames))
+		{
+			return PendingOcclusionQuery[QueryIndex].GetReference();
+		}
+		return nullptr;
 	}
 
 	FORCEINLINE void SetCurrentQuery(uint32 FrameNumber, FRenderQueryRHIParamRef NewQuery, int32 NumBufferedFrames)
@@ -229,6 +297,7 @@ public:
 		// Get the current occlusion query
 		const uint32 QueryIndex = FOcclusionQueryHelpers::GetQueryIssueIndex(FrameNumber, NumBufferedFrames);
 		PendingOcclusionQuery[QueryIndex] = NewQuery;
+		PendingOcclusionQueryFrames[QueryIndex] = FrameNumber;
 	}
 };
 
@@ -417,6 +486,7 @@ class FHLODVisibilityState
 public:
 	FHLODVisibilityState()
 		: TemporalLODSyncTime(0.0f)
+		, FOVDistanceScaleSq(1.0f)
 		, UpdateCount(0)
 	{}
 
@@ -454,6 +524,7 @@ public:
 	TBitArray<>	ForcedVisiblePrimitiveMap;
 	TBitArray<>	ForcedHiddenPrimitiveMap;
 	float		TemporalLODSyncTime;
+	float		FOVDistanceScaleSq;
 	uint16		UpdateCount;
 };
 
@@ -705,7 +776,6 @@ public:
 
 	FIntRect DistanceFieldAOHistoryViewRect;
 	TRefCountPtr<IPooledRenderTarget> DistanceFieldAOHistoryRT;
-	TRefCountPtr<IPooledRenderTarget> DistanceFieldAOConfidenceHistoryRT;
 	TRefCountPtr<IPooledRenderTarget> DistanceFieldIrradianceHistoryRT;
 	// Mobile temporal AA surfaces.
 	TRefCountPtr<IPooledRenderTarget> MobileAaBloomSunVignette0;
@@ -1057,8 +1127,6 @@ public:
 		LightShaftOcclusionHistory.SafeRelease();
 		LightShaftBloomHistoryRTs.Empty();
 		DistanceFieldAOHistoryRT.SafeRelease();
-		DistanceFieldAOConfidenceHistoryRT.SafeRelease();
-		DistanceFieldAOConfidenceHistoryRT.SafeRelease();
 		DistanceFieldIrradianceHistoryRT.SafeRelease();
 		MobileAaBloomSunVignette0.SafeRelease();
 		MobileAaBloomSunVignette1.SafeRelease();
@@ -1821,7 +1889,6 @@ class FLODSceneTree
 public:
 	FLODSceneTree(FScene* InScene)
 		: Scene(InScene)
-		, LastHLODDistanceScale(-1.0f)
 	{
 	}
 
@@ -1841,23 +1908,23 @@ public:
 
 		void AddChild(FPrimitiveSceneInfo* NewChild)
 		{
-			if(NewChild && !ChildrenSceneInfos.Contains(NewChild))
+			if (NewChild)
 			{
-				ChildrenSceneInfos.Add(NewChild);
+				ChildrenSceneInfos.AddUnique(NewChild);
 			}
 		}
 
 		void RemoveChild(FPrimitiveSceneInfo* ChildToDelete)
 		{
-			if(ChildToDelete && ChildrenSceneInfos.Contains(ChildToDelete))
+			if (ChildToDelete)
 			{
 				ChildrenSceneInfos.Remove(ChildToDelete);
 			}
 		}
 	};
 
-	void AddChildNode(FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* ChildSceneInfo);
-	void RemoveChildNode(FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* ChildSceneInfo);
+	void AddChildNode(FPrimitiveComponentId ParentId, FPrimitiveSceneInfo* ChildSceneInfo);
+	void RemoveChildNode(FPrimitiveComponentId ParentId, FPrimitiveSceneInfo* ChildSceneInfo);
 
 	void UpdateNodeSceneInfo(FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* SceneInfo);
 	void UpdateVisibilityStates(FViewInfo& View);
@@ -1866,22 +1933,14 @@ public:
 
 private:
 
-	void ResetHLODDistanceScaleApplication()
-	{
-		LastHLODDistanceScale = -1.0f;
-	}
-
 	/** Scene this Tree belong to */
 	FScene* Scene;
 
 	/** The LOD groups in the scene.  The map key is the current primitive who has children. */
 	TMap<FPrimitiveComponentId, FLODSceneNode> SceneNodes;
 
-	/** Transition distance scaling */
-	float LastHLODDistanceScale;
-
 	/** Recursive state updates */
-	void ApplyNodeFadingToChildren(FSceneViewState* ViewState, FLODSceneNode& Node, const bool bIsFading, const bool bIsFadingOut);
+	void ApplyNodeFadingToChildren(FSceneViewState* ViewState, FLODSceneNode& Node, FHLODSceneNodeVisibilityState& NodeVisibility, const bool bIsFading, const bool bIsFadingOut);
 	void HideNodeChildren(FSceneViewState* ViewState, FLODSceneNode& Node);
 };
 
@@ -2357,10 +2416,10 @@ public:
 		{
 			// For opaque materials, stationary skylight is applied in base pass but movable skylight
 			// is applied in a separate render pass (bWantssStaticShadowing means stationary skylight)
-			bRenderSkyLight = bRenderSkyLight && ReadOnlyCVARCache.bEnableStationarySkylight
-				&& (SkyLight->bWantsStaticShadowing
+			bRenderSkyLight = bRenderSkyLight
+				&& ((ReadOnlyCVARCache.bEnableStationarySkylight && SkyLight->bWantsStaticShadowing)
 					|| (!SkyLight->bWantsStaticShadowing
-					&& (IsAnyForwardShadingEnabled(GetShaderPlatform()) || IsMobilePlatform(GetShaderPlatform()))));
+						&& (IsAnyForwardShadingEnabled(GetShaderPlatform()) || IsMobilePlatform(GetShaderPlatform()))));
 		}
 
 		return bRenderSkyLight;
diff --git a/Engine/Source/Runtime/Renderer/Private/SceneRendering.cpp b/Engine/Source/Runtime/Renderer/Private/SceneRendering.cpp
index bc0029d0c8f1..a67b708f2cd3 100644
--- a/Engine/Source/Runtime/Renderer/Private/SceneRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/SceneRendering.cpp
@@ -353,7 +353,6 @@ FASTVRAM_CVAR(DistanceFieldNormal, 1);
 FASTVRAM_CVAR(DistanceFieldAOHistory, 1);
 FASTVRAM_CVAR(DistanceFieldAODownsampledBentNormal, 1); 
 FASTVRAM_CVAR(DistanceFieldAOBentNormal, 0); 
-FASTVRAM_CVAR(DistanceFieldAOConfidence, 0); 
 FASTVRAM_CVAR(DistanceFieldIrradiance, 0); 
 FASTVRAM_CVAR(DistanceFieldShadows, 1);
 FASTVRAM_CVAR(Distortion, 1);
@@ -479,7 +478,6 @@ void FFastVramConfig::Update()
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldAOHistory, DistanceFieldAOHistory);
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldAODownsampledBentNormal, DistanceFieldAODownsampledBentNormal);
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldAOBentNormal, DistanceFieldAOBentNormal);
-	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldAOConfidence, DistanceFieldAOConfidence);
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldIrradiance, DistanceFieldIrradiance);
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_DistanceFieldShadows, DistanceFieldShadows);
 	bDirty |= UpdateTextureFlagFromCVar(CVarFastVRam_Distortion, Distortion);
@@ -2112,24 +2110,7 @@ void FSceneRenderer::ComputeFamilySize()
 
 bool FSceneRenderer::DoOcclusionQueries(ERHIFeatureLevel::Type InFeatureLevel) const
 {
-	static bool bOnce = false;
-	static bool bForceByCmdLine = false;
-	static bool bCmdLineShouldBeEnabledValue = false;
-	if (!bOnce)
-	{
-		bOnce = true;
-		if (FParse::Param(FCommandLine::Get(), TEXT("softwareocclusionculling")) && CVarAllowOcclusionQueries.GetValueOnRenderThread() >= 1)
-		{
-			bForceByCmdLine = true;
-			bCmdLineShouldBeEnabledValue = false;
-		}
-		else if (FParse::Param(FCommandLine::Get(), TEXT("hardwareocclusionculling")) && CVarAllowOcclusionQueries.GetValueOnRenderThread() == 0)
-		{
-			bForceByCmdLine = true;
-			bCmdLineShouldBeEnabledValue = true;
-		}
-	}
-	return bForceByCmdLine ? bCmdLineShouldBeEnabledValue : (InFeatureLevel >= ERHIFeatureLevel::ES3_1 && CVarAllowOcclusionQueries.GetValueOnRenderThread() != 0);
+	return InFeatureLevel >= ERHIFeatureLevel::ES3_1 && CVarAllowOcclusionQueries.GetValueOnRenderThread() != 0;
 }
 
 FSceneRenderer::~FSceneRenderer()
@@ -2221,8 +2202,8 @@ void FSceneRenderer::RenderFinish(FRHICommandListImmediate& RHICmdList)
 		}
 		const bool bShowSkinCacheOOM = CVarSkinCacheOOM != nullptr && GPUSkinCacheExtraRequiredMemory > 0;
 
-		extern int32 GDistanceFieldAO;
-		const bool bShowDFAODisabledWarning = !GDistanceFieldAO && (ViewFamily.EngineShowFlags.VisualizeMeshDistanceFields || ViewFamily.EngineShowFlags.VisualizeGlobalDistanceField || ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO);
+		extern bool UseDistanceFieldAO();
+		const bool bShowDFAODisabledWarning = !UseDistanceFieldAO() && (ViewFamily.EngineShowFlags.VisualizeMeshDistanceFields || ViewFamily.EngineShowFlags.VisualizeGlobalDistanceField || ViewFamily.EngineShowFlags.VisualizeDistanceFieldAO);
 
 		const bool bShowAtmosphericFogWarning = Scene->AtmosphericFog != nullptr && !ReadOnlyCVARCache.bEnableAtmosphericFog;
 
diff --git a/Engine/Source/Runtime/Renderer/Private/SceneRendering.h b/Engine/Source/Runtime/Renderer/Private/SceneRendering.h
index 9ac0167721b3..8f4e405b69f1 100644
--- a/Engine/Source/Runtime/Renderer/Private/SceneRendering.h
+++ b/Engine/Source/Runtime/Renderer/Private/SceneRendering.h
@@ -1690,7 +1690,7 @@ public:
 
 	bool RenderInverseOpacity(FRHICommandListImmediate& RHICmdList, const FViewInfo& View);
 
-	void RenderMobileBasePassDynamicData(FRHICommandList& RHICmdList, const FViewInfo& View, const FDrawingPolicyRenderState& DrawRenderState, bool bWireFrame, int32 FirstElement = 0, int32 AfterLastElement = MAX_int32);
+	void RenderMobileBasePassDynamicData(FRHICommandList& RHICmdList, const FViewInfo& View, const FDrawingPolicyRenderState& DrawRenderState, EBlendMode BlendMode, bool bWireFrame, int32 FirstElement = 0, int32 AfterLastElement = MAX_int32);
 
 protected:
 	/** Finds the visible dynamic shadows for each view. */
diff --git a/Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp b/Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp
index 547db1878320..84c77d06813a 100644
--- a/Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp
@@ -103,14 +103,6 @@ static FAutoConsoleVariableRef CVarAllowSubPrimitiveQueries(
 	ECVF_RenderThreadSafe
 	);
 
-static int32 GOcclusionQueriesLimit = 0;
-static FAutoConsoleVariableRef CVarOcclusionQueriesLimit(
-	TEXT("r.OcclusionQueriesLimit"),
-	GOcclusionQueriesLimit,
-	TEXT("Limit number of occlusion queries per frame, (0 no limit)"),
-	ECVF_RenderThreadSafe
-	);
-
 static TAutoConsoleVariable<float> CVarStaticMeshLODDistanceScale(
 	TEXT("r.StaticMeshLODDistanceScale"),
 	1.0f,
@@ -118,6 +110,19 @@ static TAutoConsoleVariable<float> CVarStaticMeshLODDistanceScale(
 	TEXT("(higher values make LODs transition earlier, e.g., 2 is twice as fast / half the distance)"),
 	ECVF_Scalability | ECVF_RenderThreadSafe);
 
+static TAutoConsoleVariable<float> CVarMinAutomaticViewMipBias(
+	TEXT("r.ViewTextureMipBias.Min"),
+	-1.0f,
+	TEXT("Automatic view mip bias's minimum value (default to -1)."),
+	ECVF_RenderThreadSafe);
+
+static TAutoConsoleVariable<float> CVarMinAutomaticViewMipBiasOffset(
+	TEXT("r.ViewTextureMipBias.Offset"),
+	-0.3,
+	TEXT("Automatic view mip bias's constant offset (default to -0.3)."),
+	ECVF_RenderThreadSafe);
+
+
 static int32 GOcclusionCullParallelPrimFetch = 0;
 static FAutoConsoleVariableRef CVarOcclusionCullParallelPrimFetch(
 	TEXT("r.OcclusionCullParallelPrimFetch"),
@@ -143,6 +148,46 @@ static FAutoConsoleVariableRef CVarDoInitViewsLightingAfterPrepass(
 	ECVF_RenderThreadSafe
 	);
 
+static int32 GFramesNotOcclusionTestedToExpandBBoxes = 5;
+static FAutoConsoleVariableRef CVarFramesNotOcclusionTestedToExpandBBoxes(
+	TEXT("r.GFramesNotOcclusionTestedToExpandBBoxes"),
+	GFramesNotOcclusionTestedToExpandBBoxes,
+	TEXT("If we don't occlusion test a primitive for this many frames, then we expand the BBox when we do occlusion test it for a few frames. See also r.ExpandNewlyOcclusionTestedBBoxesAmount, r.FramesToExpandNewlyOcclusionTestedBBoxes"),
+	ECVF_RenderThreadSafe
+);
+
+static int32 GFramesToExpandNewlyOcclusionTestedBBoxes = 2;
+static FAutoConsoleVariableRef CVarFramesToExpandNewlyOcclusionTestedBBoxes(
+	TEXT("r.FramesToExpandNewlyOcclusionTestedBBoxes"),
+	GFramesToExpandNewlyOcclusionTestedBBoxes,
+	TEXT("If we don't occlusion test a primitive for r.GFramesNotOcclusionTestedToExpandBBoxes frames, then we expand the BBox when we do occlusion test it for this number of frames. See also r.GFramesNotOcclusionTestedToExpandBBoxes, r.ExpandNewlyOcclusionTestedBBoxesAmount"),
+	ECVF_RenderThreadSafe
+);
+
+static float GExpandNewlyOcclusionTestedBBoxesAmount = 0.0f;
+static FAutoConsoleVariableRef CVarExpandNewlyOcclusionTestedBBoxesAmount(
+	TEXT("r.ExpandNewlyOcclusionTestedBBoxesAmount"),
+	GExpandNewlyOcclusionTestedBBoxesAmount,
+	TEXT("If we don't occlusion test a primitive for r.GFramesNotOcclusionTestedToExpandBBoxes frames, then we expand the BBox when we do occlusion test it for a few frames by this amount. See also r.FramesToExpandNewlyOcclusionTestedBBoxes, r.GFramesNotOcclusionTestedToExpandBBoxes."),
+	ECVF_RenderThreadSafe
+);
+
+static float GExpandAllTestedBBoxesAmount = 0.0f;
+static FAutoConsoleVariableRef CVarExpandAllTestedBBoxesAmount(
+	TEXT("r.ExpandAllOcclusionTestedBBoxesAmount"),
+	GExpandAllTestedBBoxesAmount,
+	TEXT("Amount to expand all occlusion test bounds by."),
+	ECVF_RenderThreadSafe
+);
+
+static float GNeverOcclusionTestDistance = 0.0f;
+static FAutoConsoleVariableRef CVarNeverOcclusionTestDistance(
+	TEXT("r.NeverOcclusionTestDistance"),
+	GNeverOcclusionTestDistance,
+	TEXT("When the distance between the viewpoint and the bounding sphere center is less than this, never occlusion cull."),
+	ECVF_RenderThreadSafe
+);
+
 /** Distance fade cvars */
 static int32 GDisableLODFade = false;
 static FAutoConsoleVariableRef CVarDisableLODFade( TEXT("r.DisableLODFade"), GDisableLODFade, TEXT("Disable fading for distance culling"), ECVF_RenderThreadSafe );
@@ -324,6 +369,7 @@ static int32 FrustumCull(const FScene* Scene, FViewInfo& View)
 
 	FThreadSafeCounter NumCulledPrimitives;
 	float MaxDrawDistanceScale = GetCachedScalabilityCVars().ViewDistanceScale;
+	MaxDrawDistanceScale *= GetCachedScalabilityCVars().CalculateFieldOfViewDistanceScale(View.DesiredFOV);
 
 	FSceneViewState* ViewState = (FSceneViewState*)View.State;
 	const bool bHLODActive = Scene->SceneLODHierarchy.IsActive();
@@ -491,11 +537,28 @@ struct FOcclusionBounds
 		, BoundsOrigin(InBoundsOrigin)
 		, BoundsExtent(InBoundsExtent)
 		, bGroupedQuery(bInGroupedQuery)
-	{}
-	FPrimitiveOcclusionHistory* PrimitiveOcclusionHistory;
+	{
+	}
+	FOcclusionBounds(FPrimitiveOcclusionHistoryKey InPrimitiveOcclusionHistoryKey, const FVector& InBoundsOrigin, const FVector& InBoundsExtent, uint32 InLastQuerySubmitFrame)
+		: PrimitiveOcclusionHistoryKey(InPrimitiveOcclusionHistoryKey)
+		, BoundsOrigin(InBoundsOrigin)
+		, BoundsExtent(InBoundsExtent)
+		, LastQuerySubmitFrame(InLastQuerySubmitFrame)
+	{
+	}
+	union 
+	{
+		FPrimitiveOcclusionHistory* PrimitiveOcclusionHistory;
+		FPrimitiveOcclusionHistoryKey PrimitiveOcclusionHistoryKey;
+	};
+
 	FVector BoundsOrigin;
 	FVector BoundsExtent;	
-	bool bGroupedQuery;
+	union 
+	{
+		bool bGroupedQuery;
+		uint32 LastQuerySubmitFrame;
+	};
 };
 
 struct FHZBBound
@@ -608,6 +671,8 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 	const bool bSubmitQueries		= Params.bSubmitQueries;
 	const bool bHZBOcclusion		= Params.bHZBOcclusion;
 
+	const float PrimitiveProbablyVisibleTime = GEngine->PrimitiveProbablyVisibleTime;
+
 	FSceneViewState* ViewState = (FSceneViewState*)View.State;
 	const int32 NumBufferedFrames = FOcclusionQueryHelpers::GetNumBufferedFrames(Scene->GetFeatureLevel());
 	const bool bClearQueries = !View.Family->EngineShowFlags.HitProxies;
@@ -623,6 +688,9 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 	TArray<FHZBBound>* HZBBoundsToAdd = Params.HZBBoundsToAdd;
 	TArray<FOcclusionBounds>* QueriesToAdd = Params.QueriesToAdd;	
 
+	const bool bNewlyConsideredBBoxExpandActive = GExpandNewlyOcclusionTestedBBoxesAmount > 0.0f && GFramesToExpandNewlyOcclusionTestedBBoxes > 0 && GFramesNotOcclusionTestedToExpandBBoxes > 0;
+	const float NeverOcclusionTestDistanceSquared = GNeverOcclusionTestDistance * GNeverOcclusionTestDistance;
+
 	const int32 ReserveAmount = NumToProcess;
 	if (!bSingleThreaded)
 	{		
@@ -742,7 +810,7 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 				{
 					if (bHZBOcclusion)
 					{
-						if (HZBOcclusionTests.IsValidFrame(PrimitiveOcclusionHistory->HZBTestFrameNumber))
+						if (HZBOcclusionTests.IsValidFrame(PrimitiveOcclusionHistory->LastTestFrameNumber))
 						{
 							bIsOccluded = !HZBOcclusionTests.IsVisible(PrimitiveOcclusionHistory->HZBTestIndex);
 							bOcclusionStateIsDefinite = true;
@@ -752,13 +820,14 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 					{
 						// Read the occlusion query results.
 						uint64 NumSamples = 0;
-						FRenderQueryRHIRef& PastQuery = PrimitiveOcclusionHistory->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames);
-						if (IsValidRef(PastQuery))
+						bool bGrouped = false;
+						FRenderQueryRHIParamRef PastQuery = PrimitiveOcclusionHistory->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames, bGrouped);
+						if (PastQuery)
 						{
 							//int32 RefCount = PastQuery.GetReference()->GetRefCount();
 							// NOTE: RHIGetOcclusionQueryResult should never fail when using a blocking call, rendering artifacts may show up.
 							//if (RHICmdList.GetRenderQueryResult(PastQuery, NumSamples, true))
-							if (GDynamicRHI->RHIGetRenderQueryResult(PastQuery.GetReference(), NumSamples, true))
+							if (GDynamicRHI->RHIGetRenderQueryResult(PastQuery, NumSamples, true))
 							{
 								// we render occlusion without MSAA
 								uint32 NumPixels = (uint32)NumSamples;
@@ -779,22 +848,29 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 
 
 								// Flag the primitive's occlusion state as definite if it wasn't grouped.
-								bOcclusionStateIsDefinite = !PrimitiveOcclusionHistory->bGroupedQuery;
+								bOcclusionStateIsDefinite = !bGrouped;
 							}
 							else
 							{
 								// If the occlusion query failed, treat the primitive as visible.  
 								// already set bIsOccluded = false;
 							}
-							//checkf(RefCount == PastQuery.GetReference()->GetRefCount(), TEXT("Ref count on prim: %i, old: %i, new: %i"), PrimitiveOcclusionHistory->PrimitiveId.PrimIDValue, RefCount, PastQuery.GetReference()->GetRefCount());
 						}
 						else
 						{
-							// If there's no occlusion query for the primitive, set it's visibility state to whether it has been unoccluded recently.
-							bIsOccluded = (PrimitiveOcclusionHistory->LastVisibleTime + GEngine->PrimitiveProbablyVisibleTime < CurrentRealTime);
-
-							
-							
+							if (NumBufferedFrames > 1 || GRHIMaximumReccommendedOustandingOcclusionQueries < MAX_int32)
+							{
+								// If there's no occlusion query for the primitive, assume it is whatever it was last frame
+								bIsOccluded = PrimitiveOcclusionHistory->WasOccludedLastFrame;
+								bOcclusionStateIsDefinite = PrimitiveOcclusionHistory->OcclusionStateWasDefiniteLastFrame;
+							}
+							else
+							{
+								// If there's no occlusion query for the primitive, set it's visibility state to whether it has been unoccluded recently.
+								bIsOccluded = (PrimitiveOcclusionHistory->LastProvenVisibleTime + GEngine->PrimitiveProbablyVisibleTime < CurrentRealTime);
+								// the state was definite last frame, otherwise we would have ran a query
+								bOcclusionStateIsDefinite = true;
+							}
 							if (bIsOccluded)
 							{
 								PrimitiveOcclusionHistory->LastPixelsPercentage = 0.0f;
@@ -802,10 +878,7 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 							else
 							{
 								PrimitiveOcclusionHistory->LastPixelsPercentage = GEngine->MaxOcclusionPixelsFraction;
-							}							
-
-							// the state was definite last frame, otherwise we would have ran a query
-							bOcclusionStateIsDefinite = true;							
+							}
 						}
 					}
 
@@ -826,14 +899,14 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 				{					
 					if (bSingleThreaded)
 					{						
-						OcclusionQueryPool.ReleaseQuery(PrimitiveOcclusionHistory->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames));
+						PrimitiveOcclusionHistory->ReleaseQuery(OcclusionQueryPool, OcclusionFrameCounter, NumBufferedFrames);
 					}
 					else
 					{
-						FRenderQueryRHIRef &Query = PrimitiveOcclusionHistory->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames);
-						if (IsValidRef(Query))
+						bool bGrouped = false;
+						FRenderQueryRHIParamRef Query = PrimitiveOcclusionHistory->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames, bGrouped);
+						if (Query)
 						{
-							check(Query.GetRefCount() > 0);
 							QueriesToRelease->Add(PrimitiveOcclusionHistory);							
 						}
 					}
@@ -842,15 +915,33 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 
 			if (PrimitiveOcclusionHistory)
 			{
-
-				// Set the primitive's considered time to keep its occlusion history from being trimmed.
-				PrimitiveOcclusionHistory->LastConsideredTime = CurrentRealTime;
-
 				if (bSubmitQueries && bCanBeOccluded)
 				{
+					bool bSkipNewlyConsidered = false;
+
+					if (bNewlyConsideredBBoxExpandActive)
+					{
+						if (!PrimitiveOcclusionHistory->BecameEligibleForQueryCooldown && OcclusionFrameCounter - PrimitiveOcclusionHistory->LastConsideredFrameNumber > uint32(GFramesNotOcclusionTestedToExpandBBoxes))
+						{
+							PrimitiveOcclusionHistory->BecameEligibleForQueryCooldown = GFramesToExpandNewlyOcclusionTestedBBoxes;
+						}
+
+						bSkipNewlyConsidered = !!PrimitiveOcclusionHistory->BecameEligibleForQueryCooldown;
+
+						if (bSkipNewlyConsidered)
+						{
+							PrimitiveOcclusionHistory->BecameEligibleForQueryCooldown--;
+						}
+					}
+
+
 					bool bAllowBoundsTest;
-					const FBoxSphereBounds& OcclusionBounds = bSubQueries ? (*SubBounds)[SubQuery] : Scene->PrimitiveOcclusionBounds[BitIt.GetIndex()];
-					if (View.bHasNearClippingPlane)
+					const FBoxSphereBounds OcclusionBounds = (bSubQueries ? (*SubBounds)[SubQuery] : Scene->PrimitiveOcclusionBounds[BitIt.GetIndex()]).ExpandBy(GExpandAllTestedBBoxesAmount + (bSkipNewlyConsidered ? GExpandNewlyOcclusionTestedBBoxesAmount : 0.0));
+					if (FVector::DistSquared(View.ViewLocation, OcclusionBounds.Origin) < NeverOcclusionTestDistanceSquared)
+					{
+						bAllowBoundsTest = false;
+					}
+					else if (View.bHasNearClippingPlane)
 					{
 						bAllowBoundsTest = View.NearClippingPlane.PlaneDot(OcclusionBounds.Origin) <
 							-(FVector::BoxPushOut(View.NearClippingPlane, OcclusionBounds.BoxExtent));
@@ -867,19 +958,9 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 						bAllowBoundsTest = OcclusionBounds.SphereRadius < HALF_WORLD_MAX;
 					}
 
-					// if we can't submit more queries this frame threat primitive as unoccluded
-					bool bQueriesOnLimit = true;
-					if (false && GOcclusionQueriesLimit > 0)
-					{
-						int32 NumQueries = View.GroupedOcclusionQueries.GetNumBatchOcclusionQueries() + View.IndividualOcclusionQueries.GetNumBatchOcclusionQueries();
-						if (NumQueries >= GOcclusionQueriesLimit)
-						{
-							bQueriesOnLimit = false;
-						}
-					}
-
-					if (bAllowBoundsTest && bQueriesOnLimit)
+					if (bAllowBoundsTest)
 					{
+						PrimitiveOcclusionHistory->LastTestFrameNumber = OcclusionFrameCounter;
 						if (bHZBOcclusion)
 						{
 							// Always run
@@ -891,7 +972,6 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 							{
 								HZBBoundsToAdd->Emplace(PrimitiveOcclusionHistory, OcclusionBounds.Origin, OcclusionBounds.BoxExtent);
 							}
-							PrimitiveOcclusionHistory->HZBTestFrameNumber = OcclusionFrameCounter;
 						}
 						else
 						{
@@ -909,10 +989,17 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 								}
 								else if (bOcclusionStateIsDefinite)
 								{
-									// If the primitive's is definitely unoccluded, only requery it occasionally.
-									float FractionMultiplier = FMath::Max(PrimitiveOcclusionHistory->LastPixelsPercentage / GEngine->MaxOcclusionPixelsFraction, 1.0f);
-									bRunQuery = (FractionMultiplier * GOcclusionRandomStream.GetFraction()) < GEngine->MaxOcclusionPixelsFraction;
 									bGroupedQuery = false;
+									float Rnd = GOcclusionRandomStream.GetFraction();
+									if (GRHISupportsExactOcclusionQueries)
+									{
+										float FractionMultiplier = FMath::Max(PrimitiveOcclusionHistory->LastPixelsPercentage / GEngine->MaxOcclusionPixelsFraction, 1.0f);
+										bRunQuery = (FractionMultiplier * Rnd) < GEngine->MaxOcclusionPixelsFraction;
+									}
+									else
+									{
+										bRunQuery = CurrentRealTime - PrimitiveOcclusionHistory->LastProvenVisibleTime > PrimitiveProbablyVisibleTime * (0.5f * 0.25f * Rnd);
+									}									
 								}
 								else
 								{
@@ -934,20 +1021,27 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 
 								if (bSingleThreaded)
 								{
-									PrimitiveOcclusionHistory->SetCurrentQuery(OcclusionFrameCounter,
-										bGroupedQuery ?
-										View.GroupedOcclusionQueries.BatchPrimitive(BoundOrigin, BoundExtent) :
-										View.IndividualOcclusionQueries.BatchPrimitive(BoundOrigin, BoundExtent),
-										NumBufferedFrames
+									if (GRHIMaximumReccommendedOustandingOcclusionQueries < MAX_int32 && !bGroupedQuery)
+									{
+										QueriesToAdd->Emplace(FPrimitiveOcclusionHistoryKey(PrimitiveId, SubQuery), BoundOrigin, BoundExtent, PrimitiveOcclusionHistory->LastQuerySubmitFrame());
+									}
+									else
+									{
+										PrimitiveOcclusionHistory->SetCurrentQuery(OcclusionFrameCounter,
+											bGroupedQuery ?
+											View.GroupedOcclusionQueries.BatchPrimitive(BoundOrigin, BoundExtent) :
+											View.IndividualOcclusionQueries.BatchPrimitive(BoundOrigin, BoundExtent),
+											NumBufferedFrames,
+											bGroupedQuery
 										);
+									}
 								}
 								else
 								{
+									check(GRHIMaximumReccommendedOustandingOcclusionQueries < MAX_int32); // it would be fairly easy to set up this path to optimize when there are a limited number, but it hasn't been done yet
 									QueriesToAdd->Emplace(PrimitiveOcclusionHistory, BoundOrigin, BoundExtent, bGroupedQuery);
 								}
 							}
-
-							PrimitiveOcclusionHistory->bGroupedQuery = bGroupedQuery;
 						}
 					}
 					else
@@ -957,24 +1051,24 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 						bOcclusionStateIsDefinite = true;
 					}
 				}
+				// Set the primitive's considered time to keep its occlusion history from being trimmed.
+				PrimitiveOcclusionHistory->LastConsideredTime = CurrentRealTime;
+				if (!bIsOccluded && bOcclusionStateIsDefinite)
+				{
+					PrimitiveOcclusionHistory->LastProvenVisibleTime = CurrentRealTime;
+				}
+				PrimitiveOcclusionHistory->LastConsideredFrameNumber = OcclusionFrameCounter;
+				PrimitiveOcclusionHistory->WasOccludedLastFrame = bIsOccluded;
+				PrimitiveOcclusionHistory->OcclusionStateWasDefiniteLastFrame = bOcclusionStateIsDefinite;
 			}
 
-
 			if (bSubQueries)
 			{
-					SubIsOccluded.Add(bIsOccluded);
-					if (!bIsOccluded)
-					{
-						bAllSubOccluded = false;
-						if (bOcclusionStateIsDefinite)
-						{
-							if (PrimitiveOcclusionHistory)
-							{
-								PrimitiveOcclusionHistory->LastVisibleTime = CurrentRealTime;
-							}
-						}
-					}
-
+				SubIsOccluded.Add(bIsOccluded);
+				if (!bIsOccluded)
+				{
+					bAllSubOccluded = false;
+				}
 				if (bIsOccluded || !bOcclusionStateIsDefinite)
 				{
 					bAllSubOcclusionStateIsDefinite = false;
@@ -990,11 +1084,6 @@ static void FetchVisibilityForPrimitives_Range(FVisForPrimParams& Params)
 				}
 				else if (bOcclusionStateIsDefinite)
 				{
-					if (PrimitiveOcclusionHistory)
-					{
-						PrimitiveOcclusionHistory->LastVisibleTime = CurrentRealTime;
-					}
-					
 					View.PrimitiveDefinitelyUnoccludedMap.AccessCorrespondingBit(BitIt) = true;
 				}					
 			}			
@@ -1071,6 +1160,10 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 	static int32 SubIsOccludedArrayIndex = 0;
 	SubIsOccludedArrayIndex = 1 - SubIsOccludedArrayIndex;
 
+	const int32 NumBufferedFrames = FOcclusionQueryHelpers::GetNumBufferedFrames(Scene->GetFeatureLevel());
+	uint32 OcclusionFrameCounter = ViewState->OcclusionFrameCounter;
+	TSet<FPrimitiveOcclusionHistory, FPrimitiveOcclusionHistoryKeyFuncs>& ViewPrimitiveOcclusionHistory = ViewState->PrimitiveOcclusionHistorySet;
+
 	if (GOcclusionCullParallelPrimFetch && GSupportsParallelOcclusionQueries)
 	{		
 		static const int32 MaxNumCullTasks = 4;
@@ -1167,9 +1260,6 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 			StartIndex += NumToProcess;
 		}
 
-		const int32 NumBufferedFrames = FOcclusionQueryHelpers::GetNumBufferedFrames(Scene->GetFeatureLevel());
-		uint32 OcclusionFrameCounter = ViewState->OcclusionFrameCounter;
-		TSet<FPrimitiveOcclusionHistory, FPrimitiveOcclusionHistoryKeyFuncs>& ViewPrimitiveOcclusionHistory = ViewState->PrimitiveOcclusionHistorySet;
 		FRenderQueryPool& OcclusionQueryPool = ViewState->OcclusionQueryPool;
 		FHZBOcclusionTester& HZBOcclusionTests = ViewState->HZBOcclusionTests;		
 
@@ -1220,7 +1310,7 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 				for (auto ReleaseQueryIter = OutQueriesToRelease[i].CreateIterator(); ReleaseQueryIter; ++ReleaseQueryIter)
 				{
 					FPrimitiveOcclusionHistory* History = *ReleaseQueryIter;
-					OcclusionQueryPool.ReleaseQuery(History->GetPastQuery(OcclusionFrameCounter, NumBufferedFrames));
+					History->ReleaseQuery(OcclusionQueryPool, OcclusionFrameCounter, NumBufferedFrames);
 				}
 				
 				//New query batching
@@ -1230,7 +1320,8 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 						RunQueriesIter->bGroupedQuery ?
 						View.GroupedOcclusionQueries.BatchPrimitive(RunQueriesIter->BoundsOrigin, RunQueriesIter->BoundsExtent) :
 						View.IndividualOcclusionQueries.BatchPrimitive(RunQueriesIter->BoundsOrigin, RunQueriesIter->BoundsExtent),
-						NumBufferedFrames
+						NumBufferedFrames,
+						RunQueriesIter->bGroupedQuery
 						);
 				}
 			}
@@ -1258,6 +1349,12 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 		TArray<bool>& SubIsOccluded = View.FrameSubIsOccluded[SubIsOccludedArrayIndex];
 		SubIsOccluded.Reset();
 
+		static TArray<FOcclusionBounds> PendingIndividualQueriesWhenOptimizing;
+		PendingIndividualQueriesWhenOptimizing.Reset();
+
+		static TArray<FOcclusionBounds*> PendingIndividualQueriesWhenOptimizingSorter;
+		PendingIndividualQueriesWhenOptimizingSorter.Reset();
+
 		FViewElementPDI OcclusionPDI(&View, NULL);
 		int32 StartIndex = 0;
 		int32 NumToProcess = View.PrimitiveVisibilityMap.Num();				
@@ -1272,11 +1369,87 @@ static int32 FetchVisibilityForPrimitives(const FScene* Scene, FViewInfo& View,
 			nullptr,
 			nullptr,
 			nullptr,
-			nullptr,
+			&PendingIndividualQueriesWhenOptimizing,
 			&SubIsOccluded
 			);
 
 		FetchVisibilityForPrimitives_Range<true>(Params);
+
+		int32 IndQueries = PendingIndividualQueriesWhenOptimizing.Num();
+		if (IndQueries)
+		{
+			int32 SoftMaxQueries = GRHIMaximumReccommendedOustandingOcclusionQueries / FMath::Min(NumBufferedFrames, 2); // extra RHIT frame does not count
+			int32 UsedQueries = View.GroupedOcclusionQueries.GetNumBatchOcclusionQueries();
+
+			int32 FirstQueryToDo = 0;
+			int32 QueriesToDo = IndQueries;
+
+
+			if (SoftMaxQueries < UsedQueries + IndQueries)
+			{
+				QueriesToDo = (IndQueries + 9) / 10;  // we need to make progress, even if it means stalling and waiting for the GPU. At a minimum, we will do 10%
+
+				if (SoftMaxQueries > UsedQueries + QueriesToDo)
+				{
+					// we can do more than the minimum
+					QueriesToDo = SoftMaxQueries - UsedQueries;
+				}
+			}
+			if (QueriesToDo == IndQueries)
+			{
+				for (int32 Index = 0; Index < IndQueries; Index++)
+				{
+					FOcclusionBounds* RunQueriesIter = &PendingIndividualQueriesWhenOptimizing[Index];
+					FPrimitiveOcclusionHistory* PrimitiveOcclusionHistory = ViewPrimitiveOcclusionHistory.Find(RunQueriesIter->PrimitiveOcclusionHistoryKey);
+
+					PrimitiveOcclusionHistory->SetCurrentQuery(OcclusionFrameCounter,
+						View.IndividualOcclusionQueries.BatchPrimitive(RunQueriesIter->BoundsOrigin, RunQueriesIter->BoundsExtent),
+						NumBufferedFrames,
+						false
+					);
+				}
+			}
+			else
+			{
+				check(QueriesToDo < IndQueries);
+				PendingIndividualQueriesWhenOptimizingSorter.Reserve(PendingIndividualQueriesWhenOptimizing.Num());
+				for (int32 Index = 0; Index < IndQueries; Index++)
+				{
+					FOcclusionBounds* RunQueriesIter = &PendingIndividualQueriesWhenOptimizing[Index];
+					PendingIndividualQueriesWhenOptimizingSorter.Add(RunQueriesIter);
+				}
+
+				PendingIndividualQueriesWhenOptimizingSorter.Sort(
+					[](const FOcclusionBounds& A, const FOcclusionBounds& B) 
+					{
+						return A.LastQuerySubmitFrame < B.LastQuerySubmitFrame;
+					}
+				);
+				for (int32 Index = 0; Index < QueriesToDo; Index++)
+				{
+					FOcclusionBounds* RunQueriesIter = PendingIndividualQueriesWhenOptimizingSorter[Index];
+					FPrimitiveOcclusionHistory* PrimitiveOcclusionHistory = ViewPrimitiveOcclusionHistory.Find(RunQueriesIter->PrimitiveOcclusionHistoryKey);
+					PrimitiveOcclusionHistory->SetCurrentQuery(OcclusionFrameCounter,
+						View.IndividualOcclusionQueries.BatchPrimitive(RunQueriesIter->BoundsOrigin, RunQueriesIter->BoundsExtent),
+						NumBufferedFrames,
+						false
+					);
+				}
+			}
+
+
+			// lets prevent this from staying too large for too long
+			if (PendingIndividualQueriesWhenOptimizing.GetSlack() > IndQueries * 4)
+			{
+				PendingIndividualQueriesWhenOptimizing.Empty();
+				PendingIndividualQueriesWhenOptimizingSorter.Empty();
+			}
+			else
+			{
+				PendingIndividualQueriesWhenOptimizing.Reset();
+				PendingIndividualQueriesWhenOptimizingSorter.Reset();
+			}
+		}
 		return Params.NumOccludedPrims;
 	}
 }
@@ -1409,7 +1582,6 @@ struct FRelevancePrimSet
 struct FMarkRelevantStaticMeshesForViewData
 {
 	FVector ViewOrigin;
-	float MaxDrawDistanceScaleSquared;
 	int32 ForcedLODLevel;
 	float LODScale;
 	float InvLODScale;
@@ -1421,8 +1593,6 @@ struct FMarkRelevantStaticMeshesForViewData
 	{
 		ViewOrigin = View.ViewMatrices.GetViewOrigin();
 
-		MaxDrawDistanceScaleSquared = GetCachedScalabilityCVars().ViewDistanceScaleSquared;
-
 		// outside of the loop to be more efficient
 		ForcedLODLevel = (View.Family->EngineShowFlags.LOD) ? GetCVarForceLOD() : 0;
 
@@ -2427,7 +2597,8 @@ void FSceneRenderer::PreVisibilityFrameSetup(FRHICommandListImmediate& RHICmdLis
 					SampleX = Halton(TemporalSampleIndex + 1, 2) - 0.5f;
 					SampleY = Halton(TemporalSampleIndex + 1, 3) - 0.5f;
 
-					View.MaterialTextureMipBias = -(FMath::Max(-FMath::Log2(EffectivePrimaryResolutionFraction), 0.0f) + 0.3f);
+					View.MaterialTextureMipBias = -(FMath::Max(-FMath::Log2(EffectivePrimaryResolutionFraction), 0.0f) ) + CVarMinAutomaticViewMipBiasOffset.GetValueOnRenderThread();
+					View.MaterialTextureMipBias = FMath::Max(View.MaterialTextureMipBias, CVarMinAutomaticViewMipBias.GetValueOnRenderThread());
 				}
 				else
 				{
@@ -3376,44 +3547,41 @@ void FDeferredShadingSceneRenderer::InitViewsPossiblyAfterPrepass(FRHICommandLis
 /*------------------------------------------------------------------------------
 	FLODSceneTree Implementation
 ------------------------------------------------------------------------------*/
-void FLODSceneTree::AddChildNode(const FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* ChildSceneInfo)
+void FLODSceneTree::AddChildNode(const FPrimitiveComponentId ParentId, FPrimitiveSceneInfo* ChildSceneInfo)
 {
-	if (NodeId.IsValid() && ChildSceneInfo)
+	if (ParentId.IsValid() && ChildSceneInfo)
 	{
-		FLODSceneNode* Node = SceneNodes.Find(NodeId);
+		FLODSceneNode* Parent = SceneNodes.Find(ParentId);
 
-		if(!Node)
+		if (!Parent)
 		{
-			Node = &SceneNodes.Add(NodeId, FLODSceneNode());
+			Parent = &SceneNodes.Add(ParentId, FLODSceneNode());
 
-			// scene info can be added later depending on order of adding to the scene
+			// Scene info can be added later depending on order of adding to the scene
 			// but at least add componentId, that way when parent is added, it will add its info properly
-			int32 ParentIndex = Scene->PrimitiveComponentIds.Find(NodeId);
-			if(Scene->Primitives.IsValidIndex(ParentIndex))
+			int32 ParentIndex = Scene->PrimitiveComponentIds.Find(ParentId);
+			if (Scene->Primitives.IsValidIndex(ParentIndex))
 			{
-				Node->SceneInfo = Scene->Primitives[ParentIndex];				
+				Parent->SceneInfo = Scene->Primitives[ParentIndex];				
 			}
-			//new nodes that will need distance scale, reset since we don't keep stateful data about this per node.
-			ResetHLODDistanceScaleApplication();
 		}
 
-		Node->AddChild(ChildSceneInfo);
+		Parent->AddChild(ChildSceneInfo);
 	}
 }
 
-void FLODSceneTree::RemoveChildNode(const FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* ChildSceneInfo)
+void FLODSceneTree::RemoveChildNode(const FPrimitiveComponentId ParentId, FPrimitiveSceneInfo* ChildSceneInfo)
 {
-	if(NodeId.IsValid() && ChildSceneInfo)
+	if (ParentId.IsValid() && ChildSceneInfo)
 	{
-		FLODSceneNode* Node = SceneNodes.Find(NodeId);
-		if (Node)
+		if (FLODSceneNode* Parent = SceneNodes.Find(ParentId))
 		{
-			Node->RemoveChild(ChildSceneInfo);
+			Parent->RemoveChild(ChildSceneInfo);
 
-			// delete from scene if no children remains
-			if(Node->ChildrenSceneInfos.Num() == 0)
+			// Delete from scene if no children remain
+			if (Parent->ChildrenSceneInfos.Num() == 0)
 			{
-				SceneNodes.Remove(NodeId);
+				SceneNodes.Remove(ParentId);
 			}
 		}
 	}
@@ -3421,8 +3589,7 @@ void FLODSceneTree::RemoveChildNode(const FPrimitiveComponentId NodeId, FPrimiti
 
 void FLODSceneTree::UpdateNodeSceneInfo(FPrimitiveComponentId NodeId, FPrimitiveSceneInfo* SceneInfo)
 {
-	FLODSceneNode* Node = SceneNodes.Find(NodeId);
-	if(Node)
+	if (FLODSceneNode* Node = SceneNodes.Find(NodeId))
 	{
 		Node->SceneInfo = SceneInfo;
 	}
@@ -3440,19 +3607,22 @@ void FLODSceneTree::UpdateVisibilityStates(FViewInfo& View)
 		}
 #endif
 
-		const float HLODDistanceScale = FMath::Max(0.0f, CVarHLODDistanceScale.GetValueOnRenderThread());
-		const bool bUpdateHLODOverrides = LastHLODDistanceScale != HLODDistanceScale;
-
 		// Per-frame initialization
 		FHLODVisibilityState& HLODState = ViewState->HLODVisibilityState;
 		TMap<FPrimitiveComponentId, FHLODSceneNodeVisibilityState>& VisibilityStates = ViewState->HLODSceneNodeVisibilityStates;
 
-		HLODState.PrimitiveFadingLODMap.Init(false, View.PrimitiveVisibilityMap.Num());
-		HLODState.PrimitiveFadingOutLODMap.Init(false, View.PrimitiveVisibilityMap.Num());
-		HLODState.ForcedVisiblePrimitiveMap.Init(false, View.PrimitiveVisibilityMap.Num());
-		HLODState.ForcedHiddenPrimitiveMap.Init(false, View.PrimitiveVisibilityMap.Num());
+		HLODState.PrimitiveFadingLODMap.Init(false, Scene->Primitives.Num());
+		HLODState.PrimitiveFadingOutLODMap.Init(false, Scene->Primitives.Num());
+		HLODState.ForcedVisiblePrimitiveMap.Init(false, Scene->Primitives.Num());
+		HLODState.ForcedHiddenPrimitiveMap.Init(false, Scene->Primitives.Num());
 		TArray<FPrimitiveViewRelevance, SceneRenderingAllocator>& RelevanceMap = View.PrimitiveViewRelevanceMap;
 
+		if (HLODState.PrimitiveFadingLODMap.Num() != Scene->Primitives.Num())
+		{
+			checkf(0, TEXT("HLOD update incorrectly allocated primitive maps"));
+			return;
+		}		
+
 		int32 UpdateCount = ++HLODState.UpdateCount;
 
 		// Update persistent state on temporal dither sync frames
@@ -3463,50 +3633,60 @@ void FLODSceneTree::UpdateVisibilityStates(FViewInfo& View)
 		{
 			HLODState.TemporalLODSyncTime = LODState.TemporalLODTime[0];
 			bSyncFrame = true;
+
+			// Only update our scaling on sync frames else we might end up changing transition direction mid-fade	
+			const FCachedSystemScalabilityCVars& ScalabilityCVars = GetCachedScalabilityCVars();
+			if (ScalabilityCVars.FieldOfViewAffectsHLOD)
+			{
+				HLODState.FOVDistanceScaleSq = ScalabilityCVars.CalculateFieldOfViewDistanceScale(View.DesiredFOV);
+				HLODState.FOVDistanceScaleSq *= HLODState.FOVDistanceScaleSq;
+			}
+			else
+			{
+				HLODState.FOVDistanceScaleSq = 1.f;
+			}
 		}
 
 		for (auto Iter = SceneNodes.CreateIterator(); Iter; ++Iter)
 		{
 			FLODSceneNode& Node = Iter.Value();
+			FPrimitiveSceneInfo* SceneInfo = Node.SceneInfo;
 
-			if (!Node.SceneInfo)
+			if (!SceneInfo || !SceneInfo->PrimitiveComponentId.IsValid() || !SceneInfo->IsIndexValid())
 			{
 				continue;
 			}
 
-			FHLODSceneNodeVisibilityState& NodeVisibility = VisibilityStates.FindOrAdd(Node.SceneInfo->PrimitiveComponentId);
-			const TIndirectArray<FStaticMesh>& NodeMeshes = Node.SceneInfo->StaticMeshes;
+			FHLODSceneNodeVisibilityState& NodeVisibility = VisibilityStates.FindOrAdd(SceneInfo->PrimitiveComponentId);
+			const TIndirectArray<FStaticMesh>& NodeMeshes = SceneInfo->StaticMeshes;
 
 			// Ignore already updated nodes, or those that we can't work with
-			if (NodeVisibility.UpdateCount == UpdateCount || NodeMeshes.Num() == 0)
+			if (NodeVisibility.UpdateCount == UpdateCount || !NodeMeshes.IsValidIndex(0))
 			{
 				continue;
 			}
 
-			const int32 NodeIndex = Node.SceneInfo->GetIndex();	
+			const int32 NodeIndex = SceneInfo->GetIndex();	
+
+			if (!Scene->PrimitiveBounds.IsValidIndex(NodeIndex))
+			{
+				checkf(0, TEXT("A HLOD Node's PrimitiveSceneInfo PackedIndex was out of Scene.Primitive bounds!"));
+				continue;
+			}
 
 			FPrimitiveBounds& Bounds = Scene->PrimitiveBounds[NodeIndex];
 			const bool bForcedIntoView = FMath::IsNearlyZero(Bounds.MinDrawDistanceSq);
-			{
-				if (bUpdateHLODOverrides)
-				{
-					// Determine desired HLOD state
-					float MinDrawDistance = Scene->Primitives[NodeIndex]->Proxy->GetMinDrawDistance();
-					const float AdjustedMinDrawDist = MinDrawDistance * HLODDistanceScale;
-					Bounds.MinDrawDistanceSq = AdjustedMinDrawDist * AdjustedMinDrawDist;
-				}
-			}
 
-			const float DistanceSquared = (Bounds.BoxSphereBounds.Origin - View.ViewMatrices.GetViewOrigin()).SizeSquared();
-			const bool bIsInDrawRange = DistanceSquared >= Bounds.MinDrawDistanceSq;
+			// Update visibility states of this node and owned children
+			const float DistanceSquared = Bounds.BoxSphereBounds.ComputeSquaredDistanceFromBoxToPoint(View.ViewMatrices.GetViewOrigin());
+			const bool bIsInDrawRange = DistanceSquared >= Bounds.MinDrawDistanceSq * HLODState.FOVDistanceScaleSq;
 
 			const bool bWasFadingPreUpdate = !!NodeVisibility.bIsFading;
 			const bool bIsDitheredTransition = NodeMeshes[0].bDitheredLODTransition;
 
-			// Update fading state
 			if (bIsDitheredTransition && !bForcedIntoView)
 			{		
-				// Update with syncs
+				// Update fading state with syncs
 				if (bSyncFrame)
 				{
 					// Fade when HLODs change threshold
@@ -3516,7 +3696,7 @@ void FLODSceneTree::UpdateVisibilityStates(FViewInfo& View)
 					{
 						NodeVisibility.bIsFading = false;
 					}
-					else if (bChangedRange )
+					else if (bChangedRange)
 					{
 						NodeVisibility.bIsFading = true;
 					}
@@ -3533,14 +3713,41 @@ void FLODSceneTree::UpdateVisibilityStates(FViewInfo& View)
 				NodeVisibility.bIsFading = false;
 			}
 
+			// Flush cached lighting data when changing visible contents
+			if (NodeVisibility.bIsVisible != NodeVisibility.bWasVisible || bWasFadingPreUpdate || NodeVisibility.bIsFading)
+			{
+				FLightPrimitiveInteraction* NodeLightList = SceneInfo->LightList;
+				while (NodeLightList)
+				{
+					NodeLightList->FlushCachedShadowMapData();
+					NodeLightList = NodeLightList->GetNextLight();
+				}
+			}
+
+			// Force fully disabled view relevance so shadows don't attempt to recompute
+			if (!NodeVisibility.bIsVisible)
+			{
+				if (RelevanceMap.IsValidIndex(NodeIndex))
+				{
+					FPrimitiveViewRelevance& ViewRelevance = RelevanceMap[NodeIndex];
+					FMemory::Memzero(&ViewRelevance, sizeof(FPrimitiveViewRelevance));
+					ViewRelevance.bInitializedThisFrame = true;
+				}
+				else
+				{
+					checkf(0, TEXT("A HLOD Node's PrimitiveSceneInfo PackedIndex was out of View.Relevancy bounds!"));
+				}
+			}
+
+			// NOTE: We update our children last as HideNodeChildren can add new visibility
+			// states, potentially invalidating our cached reference above, NodeVisibility
 			if (NodeVisibility.bIsFading)
 			{
 				// Fade until state back in sync
 				HLODState.PrimitiveFadingLODMap[NodeIndex] = true;
 				HLODState.PrimitiveFadingOutLODMap[NodeIndex] = !NodeVisibility.bIsVisible;
 				HLODState.ForcedVisiblePrimitiveMap[NodeIndex] = true;
-
-				ApplyNodeFadingToChildren(ViewState, Node, true, !!NodeVisibility.bIsVisible);
+				ApplyNodeFadingToChildren(ViewState, Node, NodeVisibility, true, !!NodeVisibility.bIsVisible);
 			}
 			else if (NodeVisibility.bIsVisible)
 			{
@@ -3553,46 +3760,34 @@ void FLODSceneTree::UpdateVisibilityStates(FViewInfo& View)
 				// Not visible and waiting for a transition to fade, keep HLOD hidden
 				HLODState.ForcedHiddenPrimitiveMap[NodeIndex] = true;
 			}
-
-			// Flush cached lighting data when changing visible contents
-			if (NodeVisibility.bIsVisible != NodeVisibility.bWasVisible || bWasFadingPreUpdate || NodeVisibility.bIsFading)
-			{
-				FLightPrimitiveInteraction* NodeLightList = Node.SceneInfo->LightList;
-				while (NodeLightList)
-				{
-					NodeLightList->FlushCachedShadowMapData();
-					NodeLightList = NodeLightList->GetNextLight();
-				}
-			}
-
-			// Force fully disabled view relevance so shadows don't attempt to recompute
-			if (!NodeVisibility.bIsVisible)
-			{
-				FPrimitiveViewRelevance& ViewRelevance = RelevanceMap[NodeIndex];
-				FMemory::Memzero(&ViewRelevance, sizeof(FPrimitiveViewRelevance));
-				ViewRelevance.bInitializedThisFrame = true;
-			}
 		}
-		LastHLODDistanceScale = HLODDistanceScale;
 	}	
 }
 
-void FLODSceneTree::ApplyNodeFadingToChildren(FSceneViewState* ViewState, FLODSceneNode& Node, const bool bIsFading, const bool bIsFadingOut)
+void FLODSceneTree::ApplyNodeFadingToChildren(FSceneViewState* ViewState, FLODSceneNode& Node, FHLODSceneNodeVisibilityState& NodeVisibility, const bool bIsFading, const bool bIsFadingOut)
 {
 	checkSlow(ViewState);
-
 	if (Node.SceneInfo)
 	{
 		FHLODVisibilityState& HLODState = ViewState->HLODVisibilityState;
-		TMap<FPrimitiveComponentId, FHLODSceneNodeVisibilityState>& VisibilityStates = ViewState->HLODSceneNodeVisibilityStates;
-		FHLODSceneNodeVisibilityState& NodeVisibility = VisibilityStates.FindOrAdd(Node.SceneInfo->PrimitiveComponentId);
 		NodeVisibility.UpdateCount = HLODState.UpdateCount;
 
 		// Force visibility during fades
-		for (const auto& Child : Node.ChildrenSceneInfos)
+		for (const auto Child : Node.ChildrenSceneInfos)
 		{
+			if (!Child || !Child->PrimitiveComponentId.IsValid() || !Child->IsIndexValid())
+			{
+				continue;
+			}
+
 			const int32 ChildIndex = Child->GetIndex();
 
+			if (!HLODState.PrimitiveFadingLODMap.IsValidIndex(ChildIndex))
+			{
+				checkf(0, TEXT("A HLOD Child's PrimitiveSceneInfo PackedIndex was out of FadingMap's bounds!"));
+				continue;
+			}
+		
 			HLODState.PrimitiveFadingLODMap[ChildIndex] = bIsFading;
 			HLODState.PrimitiveFadingOutLODMap[ChildIndex] = bIsFadingOut;
 			HLODState.ForcedHiddenPrimitiveMap[ChildIndex] = false;
@@ -3614,22 +3809,37 @@ void FLODSceneTree::ApplyNodeFadingToChildren(FSceneViewState* ViewState, FLODSc
 void FLODSceneTree::HideNodeChildren(FSceneViewState* ViewState, FLODSceneNode& Node)
 {
 	checkSlow(ViewState);
-	FHLODVisibilityState& HLODState = ViewState->HLODVisibilityState;
-	TMap<FPrimitiveComponentId, FHLODSceneNodeVisibilityState>& VisibilityStates = ViewState->HLODSceneNodeVisibilityStates;
-	FHLODSceneNodeVisibilityState& NodeVisibility = VisibilityStates.FindOrAdd(Node.SceneInfo->PrimitiveComponentId);
-
-	if (NodeVisibility.UpdateCount != HLODState.UpdateCount)
+	if (Node.SceneInfo)
 	{
-		NodeVisibility.UpdateCount = HLODState.UpdateCount;
+		FHLODVisibilityState& HLODState = ViewState->HLODVisibilityState;
+		TMap<FPrimitiveComponentId, FHLODSceneNodeVisibilityState>& VisibilityStates = ViewState->HLODSceneNodeVisibilityStates;
+		FHLODSceneNodeVisibilityState& NodeVisibility = VisibilityStates.FindOrAdd(Node.SceneInfo->PrimitiveComponentId);
 
-		for (const auto& Child : Node.ChildrenSceneInfos)
+		if (NodeVisibility.UpdateCount != HLODState.UpdateCount)
 		{
-			const int32 ChildIndex = Child->GetIndex();
-			HLODState.ForcedHiddenPrimitiveMap[ChildIndex] = true;
+			NodeVisibility.UpdateCount = HLODState.UpdateCount;
+
+			for (const auto Child : Node.ChildrenSceneInfos)
+			{
+				if (!Child || !Child->PrimitiveComponentId.IsValid() || !Child->IsIndexValid())
+				{
+					continue;
+				}
+
+				const int32 ChildIndex = Child->GetIndex();
+
+				if (!HLODState.ForcedHiddenPrimitiveMap.IsValidIndex(ChildIndex))
+				{
+					checkf(0, TEXT("A HLOD Child's PrimitiveSceneInfo PackedIndex was out of ForcedHidden's bounds!"));
+					continue;
+				}
+
+				HLODState.ForcedHiddenPrimitiveMap[ChildIndex] = true;
 
 				if (FLODSceneNode* ChildNode = SceneNodes.Find(Child->PrimitiveComponentId))
 				{
-				HideNodeChildren(ViewState, *ChildNode);
+					HideNodeChildren(ViewState, *ChildNode);
+				}
 			}
 		}
 	}
diff --git a/Engine/Source/Runtime/Renderer/Private/ShadowDepthRendering.cpp b/Engine/Source/Runtime/Renderer/Private/ShadowDepthRendering.cpp
index f1a30683f118..8c8de8989b46 100644
--- a/Engine/Source/Runtime/Renderer/Private/ShadowDepthRendering.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/ShadowDepthRendering.cpp
@@ -2099,7 +2099,7 @@ void FSceneRenderer::RenderShadowDepthMapAtlases(FRHICommandListImmediate& RHICm
 		};
 
 		{
-			SCOPED_DRAW_EVENT(RHICmdList, Clear);
+			SCOPED_DRAW_EVENT(RHICmdList, SetShadowRTsAndClear);
 			SetShadowRenderTargets(RHICmdList, true);	
 		}
 
diff --git a/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.h b/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.h
index eb6e1b2f1eec..7b542197fd8d 100644
--- a/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.h
+++ b/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.h
@@ -81,7 +81,22 @@ struct FDrawListStats
 	TMap<FName, int32> SingleMeshPolicyVertexFactoryFrequency;
 };
 
+
+inline uint8 PointerHash8(const void* Ptr)
+{
+	const int32 PtrShift1 = PLATFORM_64BITS ? 4 : 3;
+	const int32 PtrShift2 = PLATFORM_64BITS ? 12 : 11;
+	uint8 Hash1 = (reinterpret_cast<UPTRINT>(Ptr) >> PtrShift1) & 0xff;
+	uint8 Hash2 = (reinterpret_cast<UPTRINT>(Ptr) >> PtrShift2) & 0xff;
+	return Hash1^Hash2;
+}
+
 /** Fields in the key used to sort mesh elements in a draw list. */
+
+#define USE_SORT_DRAWLISTS_BY_SHADER (PLATFORM_ANDROID)
+
+#if !USE_SORT_DRAWLISTS_BY_SHADER
+
 struct FDrawListSortKeyFields
 {
 	uint64 MeshElementIndex : 16;			//
@@ -105,15 +120,61 @@ FORCEINLINE bool operator<(FDrawListSortKey A, FDrawListSortKey B)
 	return A.PackedInt < B.PackedInt;
 }
 
-inline uint8 PointerHash8(const void* Ptr)
+FORCEINLINE void ZeroDrawListSortKey(FDrawListSortKey& A)
 {
-	const int32 PtrShift1 = PLATFORM_64BITS ? 4 : 3;
-	const int32 PtrShift2 = PLATFORM_64BITS ? 12 : 11;
-	uint8 Hash1 = (reinterpret_cast<UPTRINT>(Ptr) >> PtrShift1) & 0xff;
-	uint8 Hash2 = (reinterpret_cast<UPTRINT>(Ptr) >> PtrShift2) & 0xff;
-	return Hash1^Hash2;
+	A.PackedInt = 0;
 }
 
+#else
+
+struct FDrawListSortKeyFields
+{
+	uint64 MeshElementIndex : 16;			//
+	uint64 DepthBits : 8;					// Order by mesh depth
+	uint64 MeshVF : 8;						// Order by mesh VertexFactory within DrawPolicy (VBO)
+	uint64 MeshMI : 8;						// Order by mesh material instance (Tex/Constants)
+	uint64 DrawingPolicyIndex : 16;			// Order by DrawPolicy ( PSO )
+	uint64 DrawingPolicyDepthBits : 7;		// Order DrawingPolicies front to back
+	uint64 PixelShaderHash : 8;				// Order by mesh pixel shader
+	uint64 VertexShaderHash : 8;			// Order by mesh vertex shader
+	uint64 bBackground : 1;					// Non-background meshes first 
+};
+
+struct FPackedIntPair
+{
+	uint64 PackedIntLow;
+	uint64 PackedIntHigh;
+};
+
+/** Key for sorting mesh elements. */
+union FDrawListSortKey
+{
+	FDrawListSortKeyFields Fields;
+	FPackedIntPair PackedIntPair;
+};
+
+FORCEINLINE bool operator<(FDrawListSortKey A, FDrawListSortKey B)
+{
+	return (A.PackedIntPair.PackedIntHigh == B.PackedIntPair.PackedIntHigh) ?
+		A.PackedIntPair.PackedIntLow < B.PackedIntPair.PackedIntLow :
+		A.PackedIntPair.PackedIntHigh < B.PackedIntPair.PackedIntHigh;
+}
+
+FORCEINLINE void ZeroDrawListSortKey(FDrawListSortKey& A)
+{
+	A.PackedIntPair.PackedIntLow = 0;
+	A.PackedIntPair.PackedIntHigh = 0;
+}
+
+FORCEINLINE void SetShadersDrawListSortKey(FDrawListSortKey& A, const FBoundShaderStateInput& BSSI)
+{
+	A.Fields.PixelShaderHash = PointerHash8(BSSI.PixelShaderRHI);
+	A.Fields.VertexShaderHash = PointerHash8(BSSI.VertexShaderRHI);
+}
+
+#endif
+
+
 /** Builds a sort key. */
 inline FDrawListSortKey GetSortKey(bool bBackground, float BoundsRadius, float DrawingPolicyDistanceSq, int32 DrawingPolicyIndex, float DistanceSq, int32 MeshElementIndex, FStaticMesh* Mesh)
 {
@@ -121,6 +182,8 @@ inline FDrawListSortKey GetSortKey(bool bBackground, float BoundsRadius, float D
 	FFloatToInt F2I;
 	
 	FDrawListSortKey Key;
+	ZeroDrawListSortKey(Key);
+
 	Key.Fields.bBackground = bBackground || BoundsRadius > HALF_WORLD_MAX/4.0f;
 	F2I.F = DrawingPolicyDistanceSq/HALF_WORLD_MAX;
 	Key.Fields.DrawingPolicyDepthBits = (F2I.I >> 24) & 0xff; // store policy depth 7 bit exponent
@@ -133,6 +196,7 @@ inline FDrawListSortKey GetSortKey(bool bBackground, float BoundsRadius, float D
 	return Key;
 }
 
+
 /**
  * A set of static meshs, each associated with a mesh drawing policy of a particular type.
  * @param DrawingPolicyType - The drawing policy type used to draw mesh in this draw list.
diff --git a/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.inl b/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.inl
index e2bb6319bd3c..930499ee99e6 100644
--- a/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.inl
+++ b/Engine/Source/Runtime/Renderer/Private/StaticMeshDrawList.inl
@@ -375,6 +375,7 @@ bool TStaticMeshDrawList<DrawingPolicyType>::DrawVisibleInner(
 
 	bool bDirty = false;
 	STAT(int32 StatInc = 0;)
+	uint32 NumDraws = 0;
 	for (int32 Index = FirstPolicy; Index <= LastPolicy; Index++)
 	{
 		FDrawingPolicyLink* DrawingPolicyLink = &DrawingPolicySet[OrderedDrawingPolicies[Index]];
@@ -397,6 +398,12 @@ bool TStaticMeshDrawList<DrawingPolicyType>::DrawVisibleInner(
 					// Avoid the cache miss looking up batch visibility if there is only one element.
 					uint64 BatchElementMask = Element.Mesh->bRequiresPerElementVisibility ? (*BatchVisibilityArray)[Element.Mesh->BatchVisibilityId] : ((1ull << SubCount) - 1);
 					Count += DrawElement<InstancedStereoPolicy::Disabled>(RHICmdList, View, PolicyContext, DrawRenderState, Element, BatchElementMask, DrawingPolicyLink, bDrawnShared);
+					if (++NumDraws % 16 == 0)
+					{
+						// Periodically kick the RHI thread when some work has accumulated.
+						RHICmdList.MaybeDispatchToRHIThread();
+					}
+
 				}
 			}
 
@@ -422,6 +429,11 @@ bool TStaticMeshDrawList<DrawingPolicyType>::DrawVisibleInner(
 					// Avoid the cache miss looking up batch visibility if there is only one element.
 					uint64 BatchElementMask = Element.Mesh->bRequiresPerElementVisibility ? (*ResolvedBatchVisiblityArray)[Element.Mesh->BatchVisibilityId] : ((1ull << SubCount) - 1);
 					Count += DrawElement<InstancedStereo>(RHICmdList, View, PolicyContext, DrawRenderState, Element, BatchElementMask, DrawingPolicyLink, bDrawnShared);
+					if (++NumDraws % 16 == 0)
+					{
+						// Periodically kick the RHI thread when some work has accumulated.
+						RHICmdList.MaybeDispatchToRHIThread();
+					}
 				}
 			}
 		}
@@ -892,7 +904,10 @@ int32 TStaticMeshDrawList<DrawingPolicyType>::DrawVisibleFrontToBackInner(
 				float DistanceSq = (Bounds.Origin - ViewLocation).SizeSquared();
 				float DrawingPolicyDistanceSq = (DrawingPolicyCenter - ViewLocation).SizeSquared();
 				int32 DrawingPolicyIndex = DrawingPolicyLink.SetId.AsInteger();
-				SortKeys.Add(GetSortKey(Element.bBackground,Bounds.SphereRadius,DrawingPolicyDistanceSq,DrawingPolicyIndex,DistanceSq,ElementIndex,Element.Mesh));
+				SortKeys.Add(GetSortKey(Element.bBackground, Bounds.SphereRadius, DrawingPolicyDistanceSq, DrawingPolicyIndex, DistanceSq, ElementIndex, Element.Mesh));
+#if USE_SORT_DRAWLISTS_BY_SHADER
+				SetShadersDrawListSortKey(SortKeys.Last(), DrawingPolicyLink.DrawingPolicy.GetBoundShaderStateInput(View.GetFeatureLevel()));
+#endif
 			}
 		}
 	}
@@ -924,8 +939,9 @@ int32 TStaticMeshDrawList<DrawingPolicyType>::DrawVisibleFrontToBackInner(
 		DrawElement<InstancedStereoPolicy::Disabled>(RHICmdList, View, PolicyContext, DrawRenderState, Element, BatchElementMask, DrawingPolicyLink, bDrawnShared);
 		NumDraws++;
 
-		if ((NumDraws % 16) == 0)
+		if (((uint32)NumDraws % 16) == 0)
 		{
+			// Periodically kick the RHI thread when some work has accumulated.
 			RHICmdList.MaybeDispatchToRHIThread();
 		}
 	}
diff --git a/Engine/Source/Runtime/Renderer/Private/TranslucentLighting.cpp b/Engine/Source/Runtime/Renderer/Private/TranslucentLighting.cpp
index 7b31dde43188..95497b1ed703 100644
--- a/Engine/Source/Runtime/Renderer/Private/TranslucentLighting.cpp
+++ b/Engine/Source/Runtime/Renderer/Private/TranslucentLighting.cpp
@@ -116,28 +116,28 @@ void FViewInfo::CalcTranslucencyLightingVolumeBounds(FBox* InOutCascadeBoundsArr
 		const float FrustumStartDistance = CascadeIndex == 0 ? 0 : InnerDistance;
 		const float FrustumEndDistance = CascadeIndex == 0 ? InnerDistance : OuterDistance;
 
-		float FOV = PI / 4.0f;
+		float FieldOfView = PI / 4.0f;
 		float AspectRatio = 1.0f;
 
 		if (IsPerspectiveProjection())
 		{
 			// Derive FOV and aspect ratio from the perspective projection matrix
-			FOV = FMath::Atan(1.0f / ShadowViewMatrices.GetProjectionMatrix().M[0][0]);
+			FieldOfView = FMath::Atan(1.0f / ShadowViewMatrices.GetProjectionMatrix().M[0][0]);
 			// Clamp to prevent shimmering when zooming in
-			FOV = FMath::Max(FOV, GTranslucentVolumeMinFOV * (float)PI / 180.0f);
+			FieldOfView = FMath::Max(FieldOfView, GTranslucentVolumeMinFOV * (float)PI / 180.0f);
 			const float RoundFactorRadians = GTranslucentVolumeFOVSnapFactor * (float)PI / 180.0f;
 			// Round up to a fixed factor
 			// This causes the volume lighting to make discreet jumps as the FOV animates, instead of slowly crawling over a long period
-			FOV = FOV + RoundFactorRadians - FMath::Fmod(FOV, RoundFactorRadians);
+			FieldOfView = FieldOfView + RoundFactorRadians - FMath::Fmod(FieldOfView, RoundFactorRadians);
 			AspectRatio = ShadowViewMatrices.GetProjectionMatrix().M[1][1] / ShadowViewMatrices.GetProjectionMatrix().M[0][0];
 		}
 
-		const float StartHorizontalLength = FrustumStartDistance * FMath::Tan(FOV);
+		const float StartHorizontalLength = FrustumStartDistance * FMath::Tan(FieldOfView);
 		const FVector StartCameraRightOffset = ShadowViewMatrices.GetViewMatrix().GetColumn(0) * StartHorizontalLength;
 		const float StartVerticalLength = StartHorizontalLength / AspectRatio;
 		const FVector StartCameraUpOffset = ShadowViewMatrices.GetViewMatrix().GetColumn(1) * StartVerticalLength;
 
-		const float EndHorizontalLength = FrustumEndDistance * FMath::Tan(FOV);
+		const float EndHorizontalLength = FrustumEndDistance * FMath::Tan(FieldOfView);
 		const FVector EndCameraRightOffset = ShadowViewMatrices.GetViewMatrix().GetColumn(0) * EndHorizontalLength;
 		const float EndVerticalLength = EndHorizontalLength / AspectRatio;
 		const FVector EndCameraUpOffset = ShadowViewMatrices.GetViewMatrix().GetColumn(1) * EndVerticalLength;
diff --git a/Engine/Source/Runtime/Renderer/Private/VolumeLighting.h b/Engine/Source/Runtime/Renderer/Private/VolumeLighting.h
index ab601aceb481..cef6bd1e1077 100644
--- a/Engine/Source/Runtime/Renderer/Private/VolumeLighting.h
+++ b/Engine/Source/Runtime/Renderer/Private/VolumeLighting.h
@@ -121,7 +121,7 @@ public:
 		OnePassShadowParameters.Set(RHICmdList, ShaderRHI, bDynamicallyShadowed && LightType == LightType_Point ? ShadowMap : NULL);
 
 		const FStaticShadowDepthMap* StaticShadowDepthMap = LightSceneInfo->Proxy->GetStaticShadowDepthMap();
-		const uint32 bStaticallyShadowedValue = LightSceneInfo->IsPrecomputedLightingValid() && StaticShadowDepthMap && StaticShadowDepthMap->TextureRHI ? 1 : 0;
+		const uint32 bStaticallyShadowedValue = LightSceneInfo->IsPrecomputedLightingValid() && StaticShadowDepthMap && StaticShadowDepthMap->Data && StaticShadowDepthMap->TextureRHI ? 1 : 0;
 		FTextureRHIParamRef StaticShadowDepthMapTexture = bStaticallyShadowedValue ? StaticShadowDepthMap->TextureRHI : GWhiteTexture->TextureRHI;
 		const FMatrix WorldToStaticShadow = bStaticallyShadowedValue ? StaticShadowDepthMap->Data->WorldToLight : FMatrix::Identity;
 		const FVector4 StaticShadowBufferSizeValue = bStaticallyShadowedValue ? FVector4(StaticShadowDepthMap->Data->ShadowMapSizeX, StaticShadowDepthMap->Data->ShadowMapSizeY, 1.0f / StaticShadowDepthMap->Data->ShadowMapSizeX, 1.0f / StaticShadowDepthMap->Data->ShadowMapSizeY) : FVector4(0, 0, 0, 0);
diff --git a/Engine/Source/Runtime/Renderer/Public/DecalRenderingCommon.h b/Engine/Source/Runtime/Renderer/Public/DecalRenderingCommon.h
index 294b4187be14..358ac90a472f 100644
--- a/Engine/Source/Runtime/Renderer/Public/DecalRenderingCommon.h
+++ b/Engine/Source/Runtime/Renderer/Public/DecalRenderingCommon.h
@@ -27,6 +27,13 @@ enum EDecalRenderStage
 	// later we could add "after lighting" and multiply
 };
 
+enum EDecalRasterizerState
+{
+	DRS_Undefined,
+	DRS_CCW,
+	DRS_CW,
+};
+
 /**
  * Shared decal functionality for deferred and forward shading
  */
@@ -90,6 +97,9 @@ struct FDecalRenderingCommon
 			case DBM_Emissive:
 				return RTM_SceneColor;
 
+			case DBM_AlphaComposite:
+				return RTM_SceneColorAndGBufferNoNormal;
+
 			case DBM_DBuffer_ColorNormalRoughness:
 			case DBM_DBuffer_Color:
 			case DBM_DBuffer_ColorNormal:
@@ -134,6 +144,7 @@ struct FDecalRenderingCommon
 			case DBM_Stain:
 			case DBM_Normal:
 			case DBM_Emissive:
+			case DBM_AlphaComposite:
 				return DRS_BeforeLighting;
 		
 			case DBM_Volumetric_DistanceFunction:
@@ -169,4 +180,21 @@ struct FDecalRenderingCommon
 
 		return 0;
 	}
+
+
+	static EDecalRasterizerState ComputeDecalRasterizerState(bool bInsideDecal, bool bIsInverted, bool ViewReverseCulling)
+	{
+		bool bClockwise = bInsideDecal;
+
+		if (ViewReverseCulling)
+		{
+			bClockwise = !bClockwise;
+		}
+
+		if (bIsInverted)
+		{
+			bClockwise = !bClockwise;
+		}
+		return bClockwise ? DRS_CW : DRS_CCW;
+	}
 };
diff --git a/Engine/Source/Runtime/Renderer/Public/PrimitiveSceneInfo.h b/Engine/Source/Runtime/Renderer/Public/PrimitiveSceneInfo.h
index 7616a22f179a..ab4601f5c33c 100644
--- a/Engine/Source/Runtime/Renderer/Public/PrimitiveSceneInfo.h
+++ b/Engine/Source/Runtime/Renderer/Public/PrimitiveSceneInfo.h
@@ -394,6 +394,9 @@ public:
 	 */
 	FORCEINLINE const int32* GetIndexAddress() const { return &PackedIndex; }
 
+	/** Simple comparison against the invalid values used before/after scene add/remove. */
+	FORCEINLINE bool IsIndexValid() const { return PackedIndex != INDEX_NONE && PackedIndex != MAX_int32; }
+
 	/* @return true if the object needs to be rendered in the velocity pass (is not moving like the world, needed for motionblur and TemporalAA) */
 	bool ShouldRenderVelocity(const FViewInfo& View, bool bCheckVisibility = true) const;
 	
@@ -449,6 +452,9 @@ private:
 
 	/** If this is TRUE, this primitive's precomputed lighting buffer needs to be updated before it can be rendered. */
 	bool bPrecomputedLightingBufferDirty;
+
+	/** If this is TRUE, this primitive's proxy LCIs have had a precomputed lighting buffer allocated. */
+	bool bPrecomputedLightingBufferAssignedToProxyLCIs;
 };
 
 /** Defines how the primitive is stored in the scene's primitive octree. */
diff --git a/Engine/Source/Runtime/SessionMessages/Public/SessionServiceMessages.h b/Engine/Source/Runtime/SessionMessages/Public/SessionServiceMessages.h
index bc28934bb6c8..f5fc817c0c40 100644
--- a/Engine/Source/Runtime/SessionMessages/Public/SessionServiceMessages.h
+++ b/Engine/Source/Runtime/SessionMessages/Public/SessionServiceMessages.h
@@ -121,7 +121,7 @@ struct FSessionServiceLog
 public:
 
 	/** Default constructor. */
-	FSessionServiceLog() { }
+	FSessionServiceLog() : TimeSeconds(0.0), Verbosity(0) { }
 
 	/**
 	 * Creates and initializes a new instance.
diff --git a/Engine/Source/Runtime/SessionServices/Private/SessionManager.cpp b/Engine/Source/Runtime/SessionServices/Private/SessionManager.cpp
index 217858650b1d..cdfb44315e91 100644
--- a/Engine/Source/Runtime/SessionServices/Private/SessionManager.cpp
+++ b/Engine/Source/Runtime/SessionServices/Private/SessionManager.cpp
@@ -233,6 +233,8 @@ void FSessionManager::RefreshSessions()
 
 void FSessionManager::SendPing()
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FSessionmanager_SendPing);
+
 	if (MessageEndpoint.IsValid())
 	{
 		MessageEndpoint->Publish(new FEngineServicePing(), EMessageScope::Network);
@@ -320,6 +322,8 @@ void FSessionManager::HandleSessionPongMessage(const FSessionServicePong& Messag
 
 bool FSessionManager::HandleTicker(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FSessionmanager_HandleTicker);
+
 	FDateTime Now = FDateTime::UtcNow();
 
 	// @todo gmp: don't expire sessions for now
diff --git a/Engine/Source/Runtime/SessionServices/Private/SessionServicesModule.cpp b/Engine/Source/Runtime/SessionServices/Private/SessionServicesModule.cpp
index dfe382549c06..e8eaab1498f2 100644
--- a/Engine/Source/Runtime/SessionServices/Private/SessionServicesModule.cpp
+++ b/Engine/Source/Runtime/SessionServices/Private/SessionServicesModule.cpp
@@ -90,24 +90,24 @@ public:
 
 	//~ ISessionServicesModule interface
 
-	virtual TSharedRef<ISessionManager> GetSessionManager() override
+	virtual TSharedPtr<ISessionManager> GetSessionManager() override
 	{
-		if (!SessionManager.IsValid())
+		if (!SessionManager.IsValid() && MessageBusPtr.IsValid())
 		{
 			SessionManager = MakeShareable(new FSessionManager(MessageBusPtr.Pin().ToSharedRef()));
 		}
 
-		return SessionManager.ToSharedRef();
+		return SessionManager;
 	}
 
-	virtual TSharedRef<ISessionService> GetSessionService() override
+	virtual TSharedPtr<ISessionService> GetSessionService() override
 	{
-		if (!SessionService.IsValid())
+		if (!SessionService.IsValid() && MessageBusPtr.IsValid())
 		{
 			SessionService = MakeShareable(new FSessionService(MessageBusPtr.Pin().ToSharedRef()));
 		}
 
-		return SessionService.ToSharedRef();
+		return SessionService;
 	}
 
 public:
@@ -117,7 +117,6 @@ public:
 	virtual void StartupModule() override
 	{
 		MessageBusPtr = IMessagingModule::Get().GetDefaultBus();
-		check(MessageBusPtr.IsValid());
 	}
 
 	virtual void ShutdownModule() override
diff --git a/Engine/Source/Runtime/SessionServices/Public/ISessionServicesModule.h b/Engine/Source/Runtime/SessionServices/Public/ISessionServicesModule.h
index 115ffd7443f6..d64f31f65f3e 100644
--- a/Engine/Source/Runtime/SessionServices/Public/ISessionServicesModule.h
+++ b/Engine/Source/Runtime/SessionServices/Public/ISessionServicesModule.h
@@ -21,7 +21,7 @@ public:
 	 * @return The session manager.
 	 * @see GetSessionService
 	 */
-	virtual TSharedRef<ISessionManager> GetSessionManager() = 0;
+	virtual TSharedPtr<ISessionManager> GetSessionManager() = 0;
 
 	/** 
 	 * Gets the session service.
@@ -29,7 +29,7 @@ public:
 	 * @return The session service.
 	 * @see GetSessionManager
 	 */
-	virtual TSharedRef<ISessionService> GetSessionService() = 0;
+	virtual TSharedPtr<ISessionService> GetSessionService() = 0;
 
 public:
 
diff --git a/Engine/Source/Runtime/ShaderCore/Private/Shader.cpp b/Engine/Source/Runtime/ShaderCore/Private/Shader.cpp
index 22e0d72818f8..190e21d274c8 100644
--- a/Engine/Source/Runtime/ShaderCore/Private/Shader.cpp
+++ b/Engine/Source/Runtime/ShaderCore/Private/Shader.cpp
@@ -39,6 +39,8 @@ static TAutoConsoleVariable<int32> CVarUsePipelines(
 static TLinkedList<FShaderType*>*			GShaderTypeList = nullptr;
 static TLinkedList<FShaderPipelineType*>*	GShaderPipelineList = nullptr;
 
+static FSHAHash ShaderSourceDefaultHash; //will only be read (never written) for the cooking case
+
 /**
  * Find the shader pipeline type with the given name.
  * @return NULL if no type matched.
@@ -530,11 +532,13 @@ void FShaderResource::SerializeShaderCode(FArchive& Ar)
 	// To not pollute the DDC we don't change the state of this object in memory, just the state of the object in the serialised archive.
 	bool bCodeShared = bCodeInSharedLocation;
 	
+#if WITH_EDITOR
 	// in case shader code sharing is enabled, code will be saved outside of material asset
 	if(Ar.IsSaving() && Ar.IsCooking() && Ar.IsPersistent() && !Ar.IsObjectReferenceCollector() && !bCodeInSharedLocation)
 	{
 		bCodeShared = FShaderCodeLibrary::AddShaderCode((EShaderPlatform)Target.Platform, (EShaderFrequency)Target.Frequency, OutputHash, Code, UncompressedCodeSize);
 	}
+#endif
 	
 	Ar << bCodeShared;
 	
@@ -650,6 +654,11 @@ bool FShaderResource::ArePlatformsCompatible(EShaderPlatform CurrentPlatform, ES
 	return bFeatureLevelCompatible;
 }
 
+FSHAHash &FShaderResource::FilterShaderSourceHashForSerialization(const FArchive& Ar, FSHAHash &HashToSerialize)
+{
+	return (!Ar.IsCooking()) ? HashToSerialize : ShaderSourceDefaultHash;
+}
+
 static void SafeAssignHash(FRHIShader* InShader, const FSHAHash& Hash)
 {
 	if (InShader)
@@ -846,10 +855,10 @@ FArchive& operator<<(FArchive& Ar,class FSelfContainedShaderId& Ref)
 	Ar << Ref.MaterialShaderMapHash 
 		<< Ref.VertexFactoryTypeName
 		<< Ref.ShaderPipelineName
-		<< Ref.VFSourceHash
+		<< FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.VFSourceHash)
 		<< Ref.VFSerializationHistory
 		<< Ref.ShaderTypeName
-		<< Ref.SourceHash
+		<< FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.SourceHash)
 		<< Ref.SerializationHistory
 		<< Ref.Target;
 
@@ -960,13 +969,13 @@ bool FShader::SerializeBase(FArchive& Ar, bool bShadersInline)
 	Ar << MaterialShaderMapHash;
 	Ar << ShaderPipeline;
 	Ar << VFType;
-	Ar << VFSourceHash;
+	Ar << FShaderResource::FilterShaderSourceHashForSerialization(Ar, VFSourceHash);
 	Ar << Type;
 	if (Ar.CustomVer(FRenderingObjectVersion::GUID) >= FRenderingObjectVersion::ShaderPermutationId)
 	{
 		Ar << PermutationId;
 	}
-	Ar << SourceHash;
+	Ar << FShaderResource::FilterShaderSourceHashForSerialization(Ar, SourceHash);
 	Ar << Target;
 
 	if (Ar.IsLoading())
@@ -1095,7 +1104,7 @@ void FShader::Register()
 {
 	FShaderId ShaderId = GetId();
 	check(ShaderId.MaterialShaderMapHash != FSHAHash());
-	check(ShaderId.SourceHash != FSHAHash());
+	check(ShaderId.SourceHash != FSHAHash() || FPlatformProperties::RequiresCookedData());
 	check(Resource);
 	Type->AddToShaderIdMap(ShaderId, this);
 }
@@ -1148,6 +1157,39 @@ void FShader::SetResource(FShaderResource* InResource)
 	Resource = InResource;
 }
 
+void FShader::DumpDebugInfo()
+{
+	UE_LOG(LogConsoleResponse, Display, TEXT("      FShader  :MaterialShaderMapHash %s"), *MaterialShaderMapHash.ToString());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :Target %s"), GetShaderFrequencyString((EShaderFrequency)Target.Frequency));
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :Target %s"), *LegacyShaderPlatformToShaderFormat(EShaderPlatform(Target.Platform)).ToString());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :VFType %s"), VFType ? VFType->GetName() : TEXT("null"));
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :VFSourceHash %s"), *VFSourceHash.ToString());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :Type %s"), Type->GetName());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :PermutationId %d"), PermutationId);
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :SourceHash %s"), *SourceHash.ToString());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :OutputHash %s"), *OutputHash.ToString());
+}
+
+void FShader::SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, const FStableShaderKeyAndValue& InSaveKeyVal)
+{
+#if WITH_EDITOR
+	if (TargetShaderPlatform == EShaderPlatform::SP_NumPlatforms || EShaderPlatform(Target.Platform) == TargetShaderPlatform)
+	{
+		FStableShaderKeyAndValue SaveKeyVal(InSaveKeyVal);
+		SaveKeyVal.TargetFrequency = FName(GetShaderFrequencyString((EShaderFrequency)Target.Frequency));
+		SaveKeyVal.TargetPlatform = FName(*LegacyShaderPlatformToShaderFormat(EShaderPlatform(Target.Platform)).ToString());
+		SaveKeyVal.VFType = FName(VFType ? VFType->GetName() : TEXT("null"));
+		SaveKeyVal.PermutationId = FName(*FString::Printf(TEXT("Perm_%d"), PermutationId));
+		SaveKeyVal.OutputHash = OutputHash;
+		if (Type)
+		{
+			Type->GetShaderStableKeyParts(SaveKeyVal);
+		}
+		FShaderCodeLibrary::AddShaderStableKeyValue(EShaderPlatform(Target.Platform), SaveKeyVal);
+	}
+#endif
+}
+
 bool FShaderPipelineType::bInitialized = false;
 
 FShaderPipelineType::FShaderPipelineType(
@@ -1513,7 +1555,9 @@ void FShaderPipeline::Validate()
 
 void FShaderPipeline::CookPipeline(FShaderPipeline* Pipeline)
 {
+#if WITH_EDITOR
 	FShaderCodeLibrary::AddShaderPipeline(Pipeline);
+#endif
 }
 
 void DumpShaderStats(EShaderPlatform Platform, EShaderFrequency Frequency)
@@ -1911,7 +1955,12 @@ void ShaderMapAppendKeyString(EShaderPlatform Platform, FString& KeyString)
 		{
 			static const auto* CVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.Shadow.CSM.MaxMobileCascades"));
 			KeyString += (CVar) ? FString::Printf(TEXT("MMC%d"), CVar->GetValueOnAnyThread()) : TEXT("");
-		}		
+		}	
+
+		{
+			static IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.Mobile.UseLegacyShadingModel"));
+			KeyString += (CVar && CVar->GetInt() != 0) ? TEXT("_legshad") : TEXT("");
+		}
 	}
 
 	if (Platform == SP_PS4)
diff --git a/Engine/Source/Runtime/ShaderCore/Private/ShaderCache.cpp b/Engine/Source/Runtime/ShaderCore/Private/ShaderCache.cpp
index 511b5d14a106..583670f4019a 100644
--- a/Engine/Source/Runtime/ShaderCore/Private/ShaderCache.cpp
+++ b/Engine/Source/Runtime/ShaderCore/Private/ShaderCache.cpp
@@ -36,7 +36,7 @@ const FGuid FShaderCacheCustomVersion::GameKey(0x03D4EB48, 0xB50B4CC3, 0xA598DE4
 FCustomVersionRegistration GRegisterShaderCacheVersion(FShaderCacheCustomVersion::Key, FShaderCacheCustomVersion::Latest, TEXT("ShaderCacheVersion"));
 FCustomVersionRegistration GRegisterShaderCacheGameVersion(FShaderCacheCustomVersion::GameKey, (int32)FEngineVersion::Current().GetChangelist(), TEXT("ShaderCacheGameVersion"));
 
-#define SHADER_CACHE_ENABLED (0)
+#define SHADER_CACHE_ENABLED 0
 
 static const ECompressionFlags ShaderCacheCompressionFlag = ECompressionFlags::COMPRESS_ZLIB;
 
@@ -49,7 +49,7 @@ FAutoConsoleVariableRef FShaderCache::CVarUseShaderCaching(
 														   ECVF_ReadOnly|ECVF_RenderThreadSafe
 														   );
 
-int32 FShaderCache::bUseUserShaderCache = 1;
+int32 FShaderCache::bUseUserShaderCache = 0;
 FAutoConsoleVariableRef FShaderCache::CVarUseUserShaderCache(
 	TEXT("r.UseUserShaderCache"),
 	bUseUserShaderCache,
@@ -199,6 +199,9 @@ public:
 	
 	FComputeShaderRHIRef CreateComputeShader(const FSHAHash& Hash) override final;
 	
+	virtual bool RequestEntry(const FSHAHash& Hash, FArchive* Ar) override final;
+	virtual bool ContainsEntry(const FSHAHash& Hash) override final;
+	
 	FName GetFormat( void ) const;
 	
 	//Archive override add Shader
@@ -266,7 +269,7 @@ private:
 };
 
 FShaderCacheLibrary::FShaderCacheLibrary(EShaderPlatform InPlatform, FString Name)
-: FShaderFactoryInterface(InPlatform)
+: FShaderFactoryInterface(InPlatform, Name)
 , FileName(Name)
 {
 }
@@ -501,6 +504,18 @@ FComputeShaderRHIRef FShaderCacheLibrary::CreateComputeShader(const FSHAHash& Ha
 	return Shader;
 }
 
+bool FShaderCacheLibrary::RequestEntry(const FSHAHash& Hash, FArchive* Ar)
+{
+	// FShaderCache is deprecated - so it doesn't need to work with other systems anymore
+	return false;
+}
+
+bool FShaderCacheLibrary::ContainsEntry(const FSHAHash& Hash)
+{
+	// FShaderCache is deprecated - so it doesn't need to work with other systems anymore
+	return false;
+}
+
 FName FShaderCacheLibrary::GetFormat( void ) const
 {
 	return LegacyShaderPlatformToShaderFormat(Platform);
@@ -790,7 +805,10 @@ void FShaderCache::InitShaderCache(uint32 Options, EShaderPlatform InShaderPlatf
 		GameVersion = (int32)FEngineVersion::Current().GetChangelist();
 	}
 	
-	if(bUseShaderCaching)
+	// Don't use FShaderCache if the newer FShaderPipelineCache is enabled.
+	static const auto CVar = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.ShaderPipelineCache.Enabled"));
+	bool bUsePipelineCacheInstead = (CVar && CVar->GetValueOnAnyThread() != 0);
+	if(!bUsePipelineCacheInstead && bUseShaderCaching)
 	{
 		Cache = new FShaderCache(Options, InShaderPlatform);
 	}
diff --git a/Engine/Source/Runtime/ShaderCore/Private/ShaderCodeLibrary.cpp b/Engine/Source/Runtime/ShaderCore/Private/ShaderCodeLibrary.cpp
index 095eaae2ecd6..6559b9541683 100644
--- a/Engine/Source/Runtime/ShaderCore/Private/ShaderCodeLibrary.cpp
+++ b/Engine/Source/Runtime/ShaderCore/Private/ShaderCodeLibrary.cpp
@@ -11,9 +11,14 @@ ShaderCodeLibrary.cpp: Bound shader state cache implementation.
 #include "Math/UnitConversion.h"
 #include "HAL/FileManagerGeneric.h"
 #include "Misc/ScopeLock.h"
+#include "Misc/ScopeRWLock.h"
 #include "Async/AsyncFileHandle.h"
+#include "PipelineFileCache.h"
+#include "Interfaces/IPluginManager.h"
 
 #include "Interfaces/IShaderFormatArchive.h"
+#include "ShaderPipelineCache.h"
+#include "Misc/FileHelper.h"
 
 #if WITH_EDITORONLY_DATA
 #include "Modules/ModuleManager.h"
@@ -23,23 +28,40 @@ ShaderCodeLibrary.cpp: Bound shader state cache implementation.
 #include "Interfaces/ITargetPlatformManagerModule.h"
 #endif
 
-DEFINE_LOG_CATEGORY(LogShaderLibrary);
+	DEFINE_LOG_CATEGORY(LogShaderLibrary);
 
 static const ECompressionFlags ShaderLibraryCompressionFlag = ECompressionFlags::COMPRESS_ZLIB;
 
-static FString GetCodeArchiveFilename(const FString& BaseDir, FName Platform)
+static uint32 GShaderCodeArchiveVersion = 1;
+static uint32 GShaderPipelineArchiveVersion = 1;
+
+static FString ShaderExtension = TEXT(".ushaderbytecode");
+static FString StableExtension = TEXT(".scl.csv");
+static FString PipelineExtension = TEXT(".ushaderpipelines");
+
+static FString GetCodeArchiveFilename(const FString& BaseDir, const FString& LibraryName, FName Platform)
 {
-	return BaseDir / TEXT("ShaderArchive-") + Platform.ToString() + TEXT(".ushaderbytecode");
+	return BaseDir / FString::Printf(TEXT("ShaderArchive-%s-"), *LibraryName) + Platform.ToString() + ShaderExtension;
 }
 
-static FString GetPipelinesArchiveFilename(const FString& BaseDir, FName Platform)
+static FString GetStableInfoArchiveFilename(const FString& BaseDir, const FString& LibraryName, FName Platform)
 {
-	return BaseDir / TEXT("ShaderArchive-") + Platform.ToString() + TEXT(".ushaderpipelines");
+	return BaseDir / FString::Printf(TEXT("ShaderStableInfo-%s-"), *LibraryName) + Platform.ToString() + StableExtension;
 }
 
-static FString GetShaderCodeFilename(const FString& BaseDir, FName Platform)
+static FString GetPipelinesArchiveFilename(const FString& BaseDir, const FString& LibraryName, FName Platform)
 {
-	return BaseDir / TEXT("ShaderCode-") + Platform.ToString();
+	return BaseDir / FString::Printf(TEXT("ShaderArchive-%s-"), *LibraryName) + Platform.ToString() + PipelineExtension;
+}
+
+static FString GetShaderCodeFilename(const FString& BaseDir, const FString& LibraryName, FName Platform)
+{
+	return BaseDir / FString::Printf(TEXT("ShaderCode-%s-"), *LibraryName) + Platform.ToString() + ShaderExtension;
+}
+
+static FString GetShaderDebugFolder(const FString& BaseDir, const FString& LibraryName, FName Platform)
+{
+	return BaseDir / FString::Printf(TEXT("ShaderDebug-%s-"), *LibraryName) + Platform.ToString();
 }
 
 static TArray<uint8>& FShaderLibraryHelperUncompressCode(EShaderPlatform Platform, int32 UncompressedSize, TArray<uint8>& Code, TArray<uint8>& UncompressedCode)
@@ -80,6 +102,210 @@ static void FShaderLibraryHelperCompressCode(EShaderPlatform Platform, const TAr
 	}
 }
 
+FString FCompactFullName::ToString() const
+{
+	FString RetString;
+	if (!ObjectClassAndPath.Num())
+	{
+		RetString += TEXT("empty");
+	}
+	else
+	{
+		for (int32 NameIdx = 0; NameIdx < ObjectClassAndPath.Num(); NameIdx++)
+		{
+			RetString += ObjectClassAndPath[NameIdx].ToString();
+			if (NameIdx == 0)
+			{
+				RetString += TEXT(" ");
+			}
+			else if (NameIdx < ObjectClassAndPath.Num() - 1)
+			{
+				if (NameIdx == ObjectClassAndPath.Num() - 2)
+				{
+					RetString += TEXT(".");
+				}
+				else
+				{
+					RetString += TEXT("/");
+				}
+			}
+		}
+	}
+	return RetString;
+}
+
+void FCompactFullName::ParseFromString(const FString& InSrc)
+{
+	FString Src = InSrc;
+	Src.ReplaceInline(TEXT("\t"), TEXT(" "));
+	Src.ReplaceInline(TEXT("."), TEXT(" "));
+	Src.ReplaceInline(TEXT("/"), TEXT(" "));
+	TArray<FString> Fields;
+	Src.TrimStartAndEnd().ParseIntoArray(Fields, TEXT(" "), true);
+	if (Fields.Num() == 1 && Fields[0] == TEXT("empty"))
+	{
+		Fields.Empty();
+	}
+	ObjectClassAndPath.Empty(Fields.Num());
+	for (const FString& Item : Fields)
+	{
+		ObjectClassAndPath.Add(FName(*Item));
+	}
+}
+
+uint32 GetTypeHash(const FCompactFullName& A)
+{
+	uint32 Hash = 0;
+	for (const FName& Name : A.ObjectClassAndPath)
+	{
+		Hash = HashCombine(Hash, GetTypeHash(Name));
+	}
+	return Hash;
+}
+
+void FStableShaderKeyAndValue::ComputeKeyHash()
+{
+	KeyHash = GetTypeHash(ClassNameAndObjectPath);
+
+	KeyHash = HashCombine(KeyHash, GetTypeHash(ShaderType));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(ShaderClass));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(MaterialDomain));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(FeatureLevel));
+
+	KeyHash = HashCombine(KeyHash, GetTypeHash(QualityLevel));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(TargetFrequency));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(TargetPlatform));
+
+	KeyHash = HashCombine(KeyHash, GetTypeHash(VFType));
+	KeyHash = HashCombine(KeyHash, GetTypeHash(PermutationId));
+}
+
+void FStableShaderKeyAndValue::ParseFromString(const FString& Src)
+{
+	TArray<FString> Fields;
+	Src.TrimStartAndEnd().ParseIntoArray(Fields, TEXT(","), false);
+	if (Fields.Num() > 11)
+	{
+		// hack fix for unsanitized names, should not occur anymore.
+
+		FString NewSrc(Src);
+
+		int32 ParenOpen = -1;
+		int32 ParenClose = -1;
+
+		if (NewSrc.FindChar(TCHAR('('), ParenOpen) && NewSrc.FindChar(TCHAR(')'), ParenClose) && ParenOpen < ParenClose && ParenOpen >= 0 && ParenClose >= 0)
+		{
+			for (int32 Index = ParenOpen + 1; Index < ParenClose; Index++)
+			{
+				if (NewSrc[Index] == TCHAR(','))
+				{
+					NewSrc[Index] = ' ';
+				}
+			}
+			Fields.Empty();
+			NewSrc.TrimStartAndEnd().ParseIntoArray(Fields, TEXT(","), false);
+			check(Fields.Num() == 11);
+		}
+	}
+
+
+	check(Fields.Num() == 11);
+
+	int32 Index = 0;
+	ClassNameAndObjectPath.ParseFromString(Fields[Index++]);
+
+	ShaderType = FName(*Fields[Index++]);
+	ShaderClass = FName(*Fields[Index++]);
+	MaterialDomain = FName(*Fields[Index++]);
+	FeatureLevel = FName(*Fields[Index++]);
+
+	QualityLevel = FName(*Fields[Index++]);
+	TargetFrequency = FName(*Fields[Index++]);
+	TargetPlatform = FName(*Fields[Index++]);
+
+	VFType = FName(*Fields[Index++]);
+	PermutationId = FName(*Fields[Index++]);
+
+	OutputHash.FromString(Fields[Index++]);
+
+	check(Index == 11);
+
+	ComputeKeyHash();
+}
+
+FString FStableShaderKeyAndValue::ToString() const
+{
+	FString Result;
+	Result.Reserve(2048);
+
+	const FString Delim(TEXT(","));
+
+	Result += ClassNameAndObjectPath.ToString().Replace(TEXT(","), TEXT(" "));
+	Result += Delim;
+
+	Result += ShaderType.ToString().Replace(TEXT(","), TEXT(" "));
+	Result += Delim;
+	Result += ShaderClass.ToString().Replace(TEXT(","), TEXT(" "));
+	Result += Delim;
+	Result += MaterialDomain.ToString();
+	Result += Delim;
+	Result += FeatureLevel.ToString();
+	Result += Delim;
+
+	Result += QualityLevel.ToString();
+	Result += Delim;
+	Result += TargetFrequency.ToString();
+	Result += Delim;
+	Result += TargetPlatform.ToString();
+	Result += Delim;
+
+	Result += VFType.ToString();
+	Result += Delim;
+	Result += PermutationId.ToString();
+	Result += Delim;
+
+	Result += OutputHash.ToString();
+
+	return Result;
+}
+
+FString FStableShaderKeyAndValue::HeaderLine()
+{
+	FString Result;
+	Result.Reserve(2048);
+
+	const FString Delim(TEXT(","));
+
+	Result += TEXT("ClassNameAndObjectPath");
+	Result += Delim;
+
+	Result += TEXT("ShaderType");
+	Result += Delim;
+	Result += TEXT("ShaderClass");
+	Result += Delim;
+	Result += TEXT("MaterialDomain");
+	Result += Delim;
+	Result += TEXT("FeatureLevel");
+	Result += Delim;
+
+	Result += TEXT("QualityLevel");
+	Result += Delim;
+	Result += TEXT("TargetFrequency");
+	Result += Delim;
+	Result += TEXT("TargetPlatform");
+	Result += Delim;
+
+	Result += TEXT("VFType");
+	Result += Delim;
+	Result += TEXT("Permutation");
+	Result += Delim;
+
+	Result += TEXT("OutputHash");
+
+	return Result;
+}
+
+
 struct FShaderCodeEntry
 {
 	// Serialized
@@ -97,7 +323,7 @@ struct FShaderCodeEntry
 #endif
 
 	FShaderCodeEntry()
-		: Size(0) 
+		: Size(0)
 		, Offset(0)
 		, UncompressedSize(0)
 		, Frequency(0)
@@ -116,20 +342,26 @@ static FArchive& operator <<(FArchive& Ar, FShaderCodeEntry& Ref)
 class FShaderCodeArchive final : public FShaderFactoryInterface
 {
 public:
-	FShaderCodeArchive(EShaderPlatform InPlatform, const FString& InLibraryDir)
-		: FShaderFactoryInterface(InPlatform)
+	FShaderCodeArchive(EShaderPlatform InPlatform, const FString& InLibraryDir, const FString& InLibraryName)
+		: FShaderFactoryInterface(InPlatform, InLibraryName)
 		, LibraryDir(InLibraryDir)
 		, LibraryCodeOffset(0)
 		, LibraryAsyncFileHandle(nullptr)
 	{
 		FName PlatformName = LegacyShaderPlatformToShaderFormat(InPlatform);
-		FString DestFilePath = GetCodeArchiveFilename(LibraryDir, PlatformName);
+		FString DestFilePath = GetCodeArchiveFilename(LibraryDir, LibraryName, PlatformName);
 
 		FArchive* Ar = IFileManager::Get().CreateFileReader(*DestFilePath);
 		if (Ar)
 		{
-			*Ar << Shaders;
-			LibraryCodeOffset = Ar->Tell();
+			uint32 Version = 0;
+			*Ar << Version;
+
+			if (Version == GShaderCodeArchiveVersion)
+			{
+				*Ar << Shaders;
+				LibraryCodeOffset = Ar->Tell();
+			}
 			Ar->Close();
 			delete Ar;
 
@@ -144,7 +376,7 @@ public:
 	{
 	}
 
-	virtual bool IsLibraryNativeFormat() const {return false;}
+	virtual bool IsLibraryNativeFormat() const { return false; }
 
 	TArray<uint8>* LookupShaderCode(uint8 Frequency, const FSHAHash& Hash, int32& OutSize)
 	{
@@ -153,6 +385,13 @@ public:
 		{
 			FScopeLock ScopeLock(&ReadRequestLock);
 
+			if (Entry->NumRefs == 0 && Entry->LoadedCode.Num() == 0)
+			{
+				// Someone has asked for a shader without previously invoking RequestEntry, we cannot afford to crash because this happens all too frequently.
+				UE_LOG(LogShaderLibrary, Warning, TEXT("Synchronously loading shader %s from library: %s - caller should have invoked FShaderCodeLibrary::RequestShaderCode first!"), *Hash.ToString(), *GetName());
+				RequestEntry(Hash, nullptr);
+			}
+
 			check(Entry->NumRefs > 0);
 			check(Entry->LoadedCode.Num() != 0);
 			check(Entry->bReadCompleted == 1);
@@ -163,7 +402,13 @@ public:
 		return nullptr;
 	}
 
-	bool RequestShaderCode(const FSHAHash& Hash, FArchive* Ar)
+	virtual bool ContainsEntry(const FSHAHash& Hash) final override
+	{
+		FShaderCodeEntry* Entry = Shaders.Find(Hash);
+		return (Entry != nullptr);
+	}
+
+	virtual bool RequestEntry(const FSHAHash& Hash, FArchive* Ar) final override
 	{
 		FShaderCodeEntry* Entry = Shaders.Find(Hash);
 		if (Entry)
@@ -178,7 +423,7 @@ public:
 			{
 				// should not have allocated mem for code if there is no active read request
 				check(Entry->LoadedCode.Num() == 0);
-				
+
 				int64 ReadSize = Entry->Size;
 				int64 ReadOffset = LibraryCodeOffset + Entry->Offset;
 				Entry->LoadedCode.SetNumUninitialized(ReadSize);
@@ -193,7 +438,7 @@ public:
 				{
 					return this->OnExternalReadCallback(LocalReadRequest, Entry, ReaminingTime);
 				};
-				
+
 				if (!Ar || !Ar->AttachExternalReadDependency(ExternalReadCallback))
 				{
 					// Archive does not support async loading 
@@ -216,7 +461,11 @@ public:
 
 	bool OnExternalReadCallback(const TSharedPtr<IAsyncReadRequest, ESPMode::ThreadSafe>& AsyncReadRequest, FShaderCodeEntry* Entry, double RemainingTime)
 	{
-		if (!AsyncReadRequest->WaitCompletion(RemainingTime))
+		if (RemainingTime < 0.0 && !AsyncReadRequest->PollCompletion())
+		{
+			return false;
+		}
+		else if (RemainingTime >= 0.0 && !AsyncReadRequest->WaitCompletion(RemainingTime))
 		{
 			return false;
 		}
@@ -395,15 +644,21 @@ public:
 
 	TSet<FShaderCodeLibraryPipeline> const* GetShaderPipelines(EShaderPlatform InPlatform)
 	{
-		if (Pipelines.Num() == 0 && IsOpenGLPlatform(Platform))
+		if (Pipelines.Num() == 0)
 		{
 			FName PlatformName = LegacyShaderPlatformToShaderFormat(InPlatform);
-			FString DestFilePath = GetPipelinesArchiveFilename(LibraryDir, PlatformName);
+			FString DestFilePath = GetPipelinesArchiveFilename(LibraryDir, LibraryName, PlatformName);
 
 			FArchive* Ar = IFileManager::Get().CreateFileReader(*DestFilePath);
 			if (Ar)
 			{
-				*Ar << Pipelines;
+				uint32 Version = 0;
+				*Ar << Version;
+
+				if (Version == GShaderPipelineArchiveVersion)
+				{
+					*Ar << Pipelines;
+				}
 
 				Ar->Close();
 				delete Ar;
@@ -493,7 +748,6 @@ struct FEditorShaderCodeArchive
 {
 	FEditorShaderCodeArchive(FName InFormat)
 		: FormatName(InFormat)
-		, Offset(0)
 		, Format(nullptr)
 	{
 		Format = FindShaderFormat(InFormat);
@@ -507,17 +761,40 @@ struct FEditorShaderCodeArchive
 		return Format;
 	}
 
-	bool AddShader(uint8 Frequency, const FSHAHash& Hash, TArray<uint8> const& InCode, int32 const UncompressedSize )
+	void OpenLibrary(FString const& Name)
+	{
+		check(LibraryName.Len() == 0);
+		check(Name.Len() > 0);
+		LibraryName = Name;
+		Offset = 0;
+		Shaders.Empty();
+		Pipelines.Empty();
+	}
+
+	void CloseLibrary(FString const& Name)
+	{
+		check(LibraryName == Name);
+		LibraryName = TEXT("");
+	}
+
+	bool HasShader(const FSHAHash& Hash) const
+	{
+		return Shaders.Contains(Hash);
+	}
+
+	bool AddShader(uint8 Frequency, const FSHAHash& Hash, TArray<uint8> const& InCode, int32 const UncompressedSize)
 	{
 		bool bAdd = false;
 		if (!Shaders.Contains(Hash))
 		{
+#if DO_CHECK
 			uint8 Count = 0;
 			for (uint8 i : InCode)
 			{
 				Count |= i;
 			}
 			check(Count > 0);
+#endif
 
 			FShaderCodeEntry Entry;
 			Entry.Size = InCode.Num();
@@ -536,116 +813,154 @@ struct FEditorShaderCodeArchive
 
 	bool AddPipeline(FShaderPipeline* Pipeline)
 	{
+		check(LibraryName.Len() != 0);
 		EShaderPlatform ShaderPlatform = ShaderFormatToLegacyShaderPlatform(FormatName);
-		if (IsOpenGLPlatform(ShaderPlatform))
+
+		FShaderCodeLibraryPipeline LibraryPipeline;
+		if (IsValidRef(Pipeline->VertexShader))
 		{
-			FShaderCodeLibraryPipeline LibraryPipeline;
-			if (IsValidRef(Pipeline->VertexShader))
-			{
-				LibraryPipeline.VertexShader = Pipeline->VertexShader->GetOutputHash();
-			}
-			if (IsValidRef(Pipeline->GeometryShader))
-			{
-				LibraryPipeline.GeometryShader = Pipeline->GeometryShader->GetOutputHash();
-			}
-			if (IsValidRef(Pipeline->HullShader))
-			{
-				LibraryPipeline.HullShader = Pipeline->HullShader->GetOutputHash();
-			}
-			if (IsValidRef(Pipeline->DomainShader))
-			{
-				LibraryPipeline.DomainShader = Pipeline->DomainShader->GetOutputHash();
-			}
-			if (IsValidRef(Pipeline->PixelShader))
-			{
-				LibraryPipeline.PixelShader = Pipeline->PixelShader->GetOutputHash();
-			}
-			if (!Pipelines.Contains(LibraryPipeline))
-			{
-				Pipelines.Add(LibraryPipeline);
-				return true;
-			}
+			LibraryPipeline.VertexShader = Pipeline->VertexShader->GetOutputHash();
+		}
+		if (IsValidRef(Pipeline->GeometryShader))
+		{
+			LibraryPipeline.GeometryShader = Pipeline->GeometryShader->GetOutputHash();
+		}
+		if (IsValidRef(Pipeline->HullShader))
+		{
+			LibraryPipeline.HullShader = Pipeline->HullShader->GetOutputHash();
+		}
+		if (IsValidRef(Pipeline->DomainShader))
+		{
+			LibraryPipeline.DomainShader = Pipeline->DomainShader->GetOutputHash();
+		}
+		if (IsValidRef(Pipeline->PixelShader))
+		{
+			LibraryPipeline.PixelShader = Pipeline->PixelShader->GetOutputHash();
+		}
+		if (!Pipelines.Contains(LibraryPipeline))
+		{
+			Pipelines.Add(LibraryPipeline);
+			return true;
 		}
 		return false;
 	}
-	
-	void AddExistingShaderCodeLibrary(FString const& OutputDir, bool bNativeFormat)
+
+	void AddExistingShaderCodeLibrary(FString const& OutputDir)
 	{
-		// Iterative cook - common case - include previous shader code library if it exists (CAUTION: This may slowly increase the size of the code library on repeated iterative cooking)
+		check(LibraryName.Len() > 0);
+
+		const FString ShaderIntermediateLocation = FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString() / LibraryName;
+
+		TArray<FString> ShaderFiles;
+		IFileManager::Get().FindFiles(ShaderFiles, *ShaderIntermediateLocation, *ShaderExtension);
+
+		for (const FString& ShaderFileName : ShaderFiles)
 		{
-			FArchive* PrevCookedAr = IFileManager::Get().CreateFileReader(*GetCodeArchiveFilename(OutputDir, FormatName));
-			
-			if(!PrevCookedAr)
+			if (ShaderFileName.Contains(LibraryName + TEXT("_") + FormatName.ToString() + TEXT(".")))
 			{
-				// If native library format cooking deletes the generated shader code library we need to handle a "backup" in the intermediate folder
-				// Not native or not iterative - ensure this file does not exist
-				
-				FString BackupfileDir = GetCodeArchiveFilename(FPaths::ProjectIntermediateDir() / TEXT("Shaders"), FormatName);
-				if(bNativeFormat && FParse::Param(FCommandLine::Get(), TEXT("iterate")))
+				FArchive* PrevCookedAr = IFileManager::Get().CreateFileReader(*GetCodeArchiveFilename(OutputDir, LibraryName, FormatName));
+
+				if (PrevCookedAr)
 				{
-					PrevCookedAr = IFileManager::Get().CreateFileReader(*BackupfileDir);
-				}
-				else
-				{
-					IFileManager::Get().Delete(*BackupfileDir);
+					uint32 Version = 0;
+					*PrevCookedAr << Version;
+
+					if (Version == GShaderCodeArchiveVersion)
+					{
+						TMap<FSHAHash, FShaderCodeEntry> PrevCookedShaders;
+
+						*PrevCookedAr << PrevCookedShaders;
+						int64 PrevCookedShadersCodeStart = PrevCookedAr->Tell();
+
+						for (TMap<FSHAHash, FShaderCodeEntry>::TIterator It(PrevCookedShaders); It; ++It)
+						{
+							FSHAHash& Hash = It.Key();
+
+							if (!Shaders.Contains(Hash))
+							{
+								// Shader not in list - lazy load shader code
+								FShaderCodeEntry& CodeEntry = It.Value();
+
+								int64 ReadSize = CodeEntry.Size;
+								int64 ReadOffset = PrevCookedShadersCodeStart + CodeEntry.Offset;
+
+								CodeEntry.LoadedCode.SetNumUninitialized(ReadSize);
+
+								// Read shader code from archive and add shader to set
+								PrevCookedAr->Seek(ReadOffset);
+								PrevCookedAr->Serialize(CodeEntry.LoadedCode.GetData(), ReadSize);
+
+								AddShader(CodeEntry.Frequency, Hash, CodeEntry.LoadedCode, CodeEntry.UncompressedSize);
+							}
+						}
+					}
+
+					PrevCookedAr->Close();
+					delete PrevCookedAr;
 				}
 			}
-			
-			if (PrevCookedAr)
+		}
+
+		TArray<FString> PipelineFiles;
+		IFileManager::Get().FindFiles(PipelineFiles, *ShaderIntermediateLocation, *PipelineExtension);
+
+		for (const FString& ShaderFileName : PipelineFiles)
+		{
+			if (ShaderFileName.Contains(LibraryName + TEXT("_") + FormatName.ToString() + TEXT(".")))
 			{
-				TMap<FSHAHash, FShaderCodeEntry> PrevCookedShaders;
-				
-				*PrevCookedAr << PrevCookedShaders;
-				int64 PrevCookedShadersCodeStart = PrevCookedAr->Tell();
-				
-				for (TMap<FSHAHash, FShaderCodeEntry>::TIterator It(PrevCookedShaders); It; ++It)
+				FArchive* PrevCookedAr = IFileManager::Get().CreateFileReader(*GetPipelinesArchiveFilename(OutputDir, LibraryName, FormatName));
+
+				if (PrevCookedAr)
 				{
-					FSHAHash& Hash = It.Key();
-					
-					if(!Shaders.Contains(Hash))
+					uint32 Version = 0;
+					*PrevCookedAr << Version;
+
+					if (Version == GShaderPipelineArchiveVersion)
 					{
-						// Shader not in list - lazy load shader code
-						FShaderCodeEntry& CodeEntry = It.Value();
-						
-						int64 ReadSize = CodeEntry.Size;
-						int64 ReadOffset = PrevCookedShadersCodeStart + CodeEntry.Offset;
-						
-						CodeEntry.LoadedCode.SetNumUninitialized(ReadSize);
-						
-						// Read shader code from archive and add shader to set
-						PrevCookedAr->Seek(ReadOffset);
-						PrevCookedAr->Serialize(CodeEntry.LoadedCode.GetData(), ReadSize);
-						
-						AddShader(CodeEntry.Frequency, Hash, CodeEntry.LoadedCode, CodeEntry.UncompressedSize);
+						TSet<FShaderCodeLibraryPipeline> PrevCookedPipelines;
+
+						*PrevCookedAr << PrevCookedPipelines;
+						int64 PrevCookedShadersCodeStart = PrevCookedAr->Tell();
+
+						Pipelines.Append(PrevCookedPipelines);
 					}
+
+					PrevCookedAr->Close();
+					delete PrevCookedAr;
 				}
-				
-				PrevCookedAr->Close();
-				delete PrevCookedAr;
 			}
 		}
 	}
-	
-	bool Finalize(FString OutputDir, FString DebugDir, bool bNativeFormat)
+
+	bool Finalize(FString OutputDir, bool bNativeFormat, bool bMasterCooker)
 	{
-		AddExistingShaderCodeLibrary(OutputDir, bNativeFormat);
-		
-		bool bSuccess = Shaders.Num() > 0;
+		check(LibraryName.Len() > 0);
+
+		if (bMasterCooker)
+		{
+			AddExistingShaderCodeLibrary(OutputDir);
+		}
+
+		bool bSuccess = IFileManager::Get().MakeDirectory(*OutputDir, true);
 
 		EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(FormatName);
 
 		// Shader library
+		if (bSuccess && Shaders.Num() > 0)
 		{
-			// Write to a temporary file
-			FString TempFilePath = FPaths::CreateTempFilename(*OutputDir, TEXT("ShaderArchive-"));
-			FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*TempFilePath, FILEWRITE_NoFail);
+			// Write to a intermediate file
+			FString IntermediateFormatPath = GetShaderCodeFilename(FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString(), LibraryName, FormatName);
+			FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*IntermediateFormatPath, FILEWRITE_NoFail);
 
 			if (FileWriter)
 			{
 				check(Format);
-				if (Format->CanStripShaderCode(bNativeFormat))
+
+				*FileWriter << GShaderCodeArchiveVersion;
+
+				if (Format->CanStripShaderCode(bNativeFormat) && !bNativeFormat)
 				{
-					FString DebugPlatformDir = GetShaderCodeFilename(DebugDir, FormatName);
+					FString DebugPlatformDir = GetShaderDebugFolder(FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString(), LibraryName, FormatName);
 					IFileManager::Get().MakeDirectory(*DebugPlatformDir, true);
 
 					TMap<FSHAHash, FShaderCodeEntry> StrippedShaders;
@@ -685,6 +1000,9 @@ struct FEditorShaderCodeArchive
 					{
 						FileWriter->Serialize(Pair.Value.LoadedCode.GetData(), Pair.Value.Size);
 					}
+
+					// Delete the temp dir
+					IFileManager::Get().DeleteDirectory(*DebugPlatformDir, false, true);
 				}
 				else
 				{
@@ -699,55 +1017,63 @@ struct FEditorShaderCodeArchive
 				FileWriter->Close();
 				delete FileWriter;
 
-				FString OutputFilePath = GetCodeArchiveFilename(OutputDir, FormatName);
-				// As on POSIX only file moves on the same device are atomic
-				IFileManager::Get().Move(*OutputFilePath, *TempFilePath, true, false, true, true);
-				IFileManager::Get().Delete(*TempFilePath);
-				
-				if(bNativeFormat)
+				// Only the master cooker needs to write to the output directory, child cookers only write to the Saved directory
+				if (bMasterCooker)
 				{
-					// Copy to intermediate location - support for iterative native library cooking
-					FString IntermediateFilePath = GetCodeArchiveFilename(FPaths::ProjectIntermediateDir() / TEXT("Shaders"), FormatName);
-					IFileManager::Get().Copy(*IntermediateFilePath, *OutputFilePath, true, true);
+					FString OutputFilePath = GetCodeArchiveFilename(OutputDir, LibraryName, FormatName);
+
+					// Copy to output location - support for iterative native library cooking
+					IFileManager::Get().Copy(*OutputFilePath, *IntermediateFormatPath, true, true);
 				}
 			}
 		}
 
 		// Pipelines
+		if (bSuccess && Pipelines.Num() > 0)
 		{
 			// Write to a temporary file
-			FString TempFilePath = FPaths::CreateTempFilename(*OutputDir, TEXT("ShaderArchive-"));
+			FString TempFilePath = GetPipelinesArchiveFilename(FPaths::ProjectSavedDir() / TEXT("Shaders"), LibraryName, FormatName);
 			FArchive* FileWriter = IFileManager::Get().CreateFileWriter(*TempFilePath, FILEWRITE_NoFail);
 
+			*FileWriter << GShaderPipelineArchiveVersion;
+
 			*FileWriter << Pipelines;
 
 			FileWriter->Close();
 			delete FileWriter;
 
-			FString OutputFilePath = GetPipelinesArchiveFilename(OutputDir, FormatName);
-			// As on POSIX only file moves on the same device are atomic
-			IFileManager::Get().Move(*OutputFilePath, *TempFilePath, true, false, true, true);
-			IFileManager::Get().Delete(*TempFilePath);
+			// Only the master cooker needs to write to the output directory, child cookers only write to the Saved directory
+			if (bMasterCooker)
+			{
+				FString OutputFilePath = GetPipelinesArchiveFilename(OutputDir, LibraryName, FormatName);
+
+				// Copy to output location - support for iterative native library cooking
+				IFileManager::Get().Copy(*OutputFilePath, *TempFilePath, true, true);
+			}
 		}
 
 		return bSuccess;
 	}
 
-	bool PackageNativeShaderLibrary(const FString& ShaderCodeDir, const FString& DebugShaderCodeDir)
+	bool PackageNativeShaderLibrary(const FString& ShaderCodeDir)
 	{
+		if (Shaders.Num() == 0)
+		{
+			return true;
+		}
+
 		bool bOK = false;
 
-		FString IntermediateFormatPath = GetShaderCodeFilename(FPaths::ProjectIntermediateDir(), FormatName);
-		FString IntermediateCookedByteCodePath = IntermediateFormatPath / TEXT("NativeCookedByteCode");
+		FString IntermediateFormatPath = GetShaderDebugFolder(FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString(), LibraryName, FormatName);
 		FString TempPath = IntermediateFormatPath / TEXT("NativeLibrary");
 
+		IFileManager::Get().MakeDirectory(*TempPath, true);
+		IFileManager::Get().MakeDirectory(*ShaderCodeDir, true);
+
 		EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(FormatName);
-		IShaderFormatArchive* Archive = Format->CreateShaderArchive(FormatName, TempPath);
+		IShaderFormatArchive* Archive = Format->CreateShaderArchive(LibraryName, FormatName, TempPath);
 		if (Archive)
 		{
-			FString OutputPath = GetShaderCodeFilename(ShaderCodeDir, FormatName);
-			FString DebugPath = GetShaderCodeFilename(DebugShaderCodeDir, FormatName);
-			
 			bOK = true;
 
 			// Add the shaders to the archive.
@@ -759,7 +1085,16 @@ struct FEditorShaderCodeArchive
 				TArray<uint8> UCode;
 				TArray<uint8>& UncompressedCode = FShaderLibraryHelperUncompressCode(Platform, Entry.UncompressedSize, Entry.LoadedCode, UCode);
 
-				if(!Archive->AddShader(Entry.Frequency, Hash, UncompressedCode))
+				if (Format->CanStripShaderCode(true))
+				{
+					if (!Format->StripShaderCode(UncompressedCode, IntermediateFormatPath, true))
+					{
+						bOK = false;
+						break;
+					}
+				}
+
+				if (!Archive->AddShader(Entry.Frequency, Hash, UncompressedCode))
 				{
 					bOK = false;
 					break;
@@ -768,33 +1103,149 @@ struct FEditorShaderCodeArchive
 
 			if (bOK)
 			{
-				bOK = Archive->Finalize(ShaderCodeDir, DebugPath, nullptr);
-				
+				bOK = Archive->Finalize(ShaderCodeDir, IntermediateFormatPath, nullptr);
+
 				// Delete Shader code library / pipelines as we now have native versions
 				{
-					FString OutputFilePath = GetCodeArchiveFilename(ShaderCodeDir, FormatName);
+					FString OutputFilePath = GetCodeArchiveFilename(ShaderCodeDir, LibraryName, FormatName);
 					IFileManager::Get().Delete(*OutputFilePath);
 				}
 				{
-					FString OutputFilePath = GetPipelinesArchiveFilename(ShaderCodeDir, FormatName);
+					FString OutputFilePath = GetPipelinesArchiveFilename(ShaderCodeDir, LibraryName, FormatName);
 					IFileManager::Get().Delete(*OutputFilePath);
 				}
 			}
-			
-			//Always delete debug directory
-			IFileManager::Get().DeleteDirectory(*DebugShaderCodeDir, true, true);
 		}
+
+		// Clean up the saved directory of temporary files
+		IFileManager::Get().DeleteDirectory(*IntermediateFormatPath, false, true);
+		IFileManager::Get().DeleteDirectory(*TempPath, false, true);
+
 		return bOK;
 	}
 
 private:
 	FName FormatName;
+	FString LibraryName;
 	TMap<FSHAHash, FShaderCodeEntry> Shaders;
-	uint64 Offset;
 	TSet<FShaderCodeLibraryPipeline> Pipelines;
+	uint64 Offset;
 	const IShaderFormat* Format;
 };
 
+struct FEditorShaderStableInfo
+{
+	FEditorShaderStableInfo(FName InFormat)
+		: FormatName(InFormat)
+	{
+	}
+
+	void OpenLibrary(FString const& Name)
+	{
+		check(LibraryName.Len() == 0);
+		check(Name.Len() > 0);
+		LibraryName = Name;
+		Offset = 0;
+		StableMap.Empty();
+	}
+
+	void CloseLibrary(FString const& Name)
+	{
+		check(LibraryName == Name);
+		LibraryName = TEXT("");
+	}
+
+	void AddShader(FStableShaderKeyAndValue& StableKeyValue)
+	{
+		FStableShaderKeyAndValue* Existing = StableMap.Find(StableKeyValue);
+		if (Existing && Existing->OutputHash != StableKeyValue.OutputHash)
+		{
+			UE_LOG(LogShaderLibrary, Warning, TEXT("Duplicate key in stable shader library, but different keys, skipping new item:"));
+			UE_LOG(LogShaderLibrary, Warning, TEXT("    Existing: %s"), *Existing->ToString());
+			UE_LOG(LogShaderLibrary, Warning, TEXT("    New     : %s"), *StableKeyValue.ToString());
+			return;
+		}
+		StableMap.Add(StableKeyValue);
+	}
+
+	void AddExistingShaderCodeLibrary(FString const& OutputDir)
+	{
+		check(LibraryName.Len() > 0);
+
+		const FString ShaderIntermediateLocation = FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString() / LibraryName;
+
+		TArray<FString> ShaderFiles;
+		IFileManager::Get().FindFiles(ShaderFiles, *ShaderIntermediateLocation, *ShaderExtension);
+
+		for (const FString& ShaderFileName : ShaderFiles)
+		{
+			if (ShaderFileName.Contains(LibraryName + TEXT("_") + FormatName.ToString() + TEXT(".")))
+			{
+				TArray<FString> SourceFileContents;
+				if (FFileHelper::LoadFileToStringArray(SourceFileContents, *GetStableInfoArchiveFilename(OutputDir, LibraryName, FormatName)))
+				{
+					for (int32 Index = 1; Index < SourceFileContents.Num(); Index++)
+					{
+						FStableShaderKeyAndValue Item;
+						Item.ParseFromString(SourceFileContents[Index]);
+						AddShader(Item);
+					}
+				}
+			}
+		}
+	}
+
+	bool Finalize(FString OutputDir, bool bNativeFormat, bool bMasterCooker, FString& OutSCLCSVPath)
+	{
+		check(LibraryName.Len() > 0);
+		OutSCLCSVPath = FString();
+
+		if (bMasterCooker)
+		{
+			AddExistingShaderCodeLibrary(OutputDir);
+		}
+
+		bool bSuccess = IFileManager::Get().MakeDirectory(*OutputDir, true);
+
+		EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(FormatName);
+
+		// Shader library
+		if (bSuccess && StableMap.Num() > 0)
+		{
+			// Write to a intermediate file
+			FString IntermediateFormatPath = GetStableInfoArchiveFilename(FPaths::ProjectSavedDir() / TEXT("Shaders") / FormatName.ToString(), LibraryName, FormatName);
+
+			TArray<FString> FileContents;
+
+			FileContents.Add(FStableShaderKeyAndValue::HeaderLine());
+
+			for (const FStableShaderKeyAndValue& Item : StableMap)
+			{
+				FileContents.Add(Item.ToString());
+			}
+			FFileHelper::SaveStringArrayToFile(FileContents, *IntermediateFormatPath);
+
+			// Only the master cooker needs to write to the output directory, child cookers only write to the Saved directory
+			if (bMasterCooker)
+			{
+				FString OutputFilePath = GetStableInfoArchiveFilename(OutputDir, LibraryName, FormatName);
+
+				// Copy to output location - support for iterative native library cooking
+				IFileManager::Get().Copy(*OutputFilePath, *IntermediateFormatPath, true, true);
+				OutSCLCSVPath = OutputFilePath;
+			}
+		}
+
+		return bSuccess;
+	}
+
+private:
+	FName FormatName;
+	FString LibraryName;
+	TSet<FStableShaderKeyAndValue> StableMap;
+	uint64 Offset;
+};
+
 struct FShaderCodeStats
 {
 	int64 ShadersSize;
@@ -809,11 +1260,17 @@ struct FShaderCodeStats
 class FShaderCodeLibraryImpl
 {
 	// At runtime, shader code collection for current shader platform
-	FRHIShaderLibraryRef ShaderCodeArchive;
+	TArray<FRHIShaderLibraryRef> ShaderCodeArchiveStack;
+	TSet<FShaderCodeLibraryPipeline> Pipelines;
+	EShaderPlatform ShaderPlatform;
+	uint64 ShaderCount;
+	FRWLock LibraryMutex;
 #if WITH_EDITOR
 	FCriticalSection ShaderCodeCS;
 	// At cook time, shader code collection for each shader platform
 	FEditorShaderCodeArchive* EditorShaderCodeArchive[EShaderPlatform::SP_NumPlatforms];
+	// At cook time, shader code collection for each shader platform
+	FEditorShaderStableInfo* EditorShaderStableInfo[EShaderPlatform::SP_NumPlatforms];
 	// At cook time, shader stats for each shader platform
 	FShaderCodeStats EditorShaderCodeStats[EShaderPlatform::SP_NumPlatforms];
 	// At cook time, whether the shader archive supports pipelines (only OpenGL should)
@@ -822,15 +1279,64 @@ class FShaderCodeLibraryImpl
 	bool bSupportsPipelines;
 	bool bNativeFormat;
 
+	class FShaderCodeLibraryIterator : public FRHIShaderLibrary::FShaderLibraryIterator
+	{
+	public:
+		FShaderCodeLibraryIterator(TArray<FRHIShaderLibraryRef>& Stack, FRWLock& InLibraryMutex)
+			: FShaderLibraryIterator(nullptr)
+			, LibraryMutex(InLibraryMutex, SLT_ReadOnly)
+			, IteratorImpl(Stack.CreateIterator())
+		{
+			if (Stack.Num() > 0)
+			{
+				Current = (*IteratorImpl)->CreateIterator();
+				ShaderLibrarySource = *IteratorImpl;
+			}
+		}
+
+		virtual bool IsValid() const final override
+		{
+			return IsValidRef(Current) && Current->IsValid();
+		}
+
+		virtual FRHIShaderLibrary::FShaderLibraryEntry operator*() const final override
+		{
+			check(IsValid());
+			return *(*Current);
+		}
+		virtual FShaderLibraryIterator& operator++() final override
+		{
+			++(*Current);
+			if (!Current->IsValid())
+			{
+				++IteratorImpl;
+				if (!!IteratorImpl)
+				{
+					Current = (*IteratorImpl)->CreateIterator();
+					ShaderLibrarySource = *IteratorImpl;
+				}
+			}
+			return *this;
+		}
+
+	private:
+		FRWScopeLock LibraryMutex;
+		TArray<FRHIShaderLibraryRef>::TIterator IteratorImpl;
+		TRefCountPtr<FRHIShaderLibrary::FShaderLibraryIterator> Current;
+	};
+
 public:
 	static FShaderCodeLibraryImpl* Impl;
 
 	FShaderCodeLibraryImpl(bool bInNativeFormat)
-		: bSupportsPipelines(false)
+		: ShaderPlatform(SP_NumPlatforms)
+		, ShaderCount(0)
+		, bSupportsPipelines(false)
 		, bNativeFormat(bInNativeFormat)
 	{
 #if WITH_EDITOR
 		FMemory::Memzero(EditorShaderCodeArchive);
+		FMemory::Memzero(EditorShaderStableInfo);
 		FMemory::Memzero(EditorShaderCodeStats);
 		FMemory::Memzero(EditorArchivePipelines);
 #endif
@@ -845,176 +1351,372 @@ public:
 			{
 				delete EditorShaderCodeArchive[i];
 			}
+			if (EditorShaderStableInfo[i])
+			{
+				delete EditorShaderStableInfo[i];
+			}
 		}
 		FMemory::Memzero(EditorShaderCodeArchive);
+		FMemory::Memzero(EditorShaderStableInfo);
+#endif
+	}
+
+	void OpenLibrary(FString const& Name, FString const& Directory)
+	{
+		if (ShaderPlatform < SP_NumPlatforms)
+		{
+			if (OpenShaderCode(Directory, ShaderPlatform, Name))
+			{
+				// Attempt to open the shared-cooked override code library if there is one.
+				// This is probably not ideal, but it should get shared-cooks working.
+				OpenShaderCode(Directory, ShaderPlatform, Name + TEXT("_SC"));
+
+				// Inform the pipeline cache that the state of loaded libraries has changed
+				FShaderPipelineCache::ShaderLibraryStateChanged(FShaderPipelineCache::Opened, ShaderPlatform, Name);
+			}
+			else
+			{
+				FName PlatformName = LegacyShaderPlatformToShaderFormat(ShaderPlatform);
+				UE_LOG(LogShaderLibrary, Error, TEXT("Cooked Context: Failed to load Shared Shader Library %s from %s for %s"), *Name, *Directory, *PlatformName.GetPlainNameString());
+			}
+		}
+
+#if WITH_EDITOR
+		for (uint32 i = 0; i < EShaderPlatform::SP_NumPlatforms; i++)
+		{
+			FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[i];
+			if (CodeArchive)
+			{
+				CodeArchive->OpenLibrary(Name);
+			}
+		}
+		for (uint32 i = 0; i < EShaderPlatform::SP_NumPlatforms; i++)
+		{
+			FEditorShaderStableInfo* StableArchive = EditorShaderStableInfo[i];
+			if (StableArchive)
+			{
+				StableArchive->OpenLibrary(Name);
+			}
+		}
+#endif
+	}
+
+	void CloseLibrary(FString const& Name)
+	{
+		{
+			FRWScopeLock(LibraryMutex, SLT_Write);
+			for (uint32 i = ShaderCodeArchiveStack.Num(); i > 0; i--)
+			{
+				FRHIShaderLibraryParamRef ShaderCodeArchive = ShaderCodeArchiveStack[i - 1];
+				if (ShaderCodeArchive->GetName() == Name)
+				{
+					ShaderCodeArchiveStack.RemoveAt(i - 1);
+					break;
+				}
+			}
+		}
+
+		// Inform the pipeline cache that the state of loaded libraries has changed
+		FShaderPipelineCache::ShaderLibraryStateChanged(FShaderPipelineCache::Closed, ShaderPlatform, Name);
+
+#if WITH_EDITOR
+		for (uint32 i = 0; i < EShaderPlatform::SP_NumPlatforms; i++)
+		{
+			if (EditorShaderCodeArchive[i])
+			{
+				EditorShaderCodeArchive[i]->CloseLibrary(Name);
+			}
+			if (EditorShaderStableInfo[i])
+			{
+				EditorShaderStableInfo[i]->CloseLibrary(Name);
+			}
+		}
 #endif
 	}
 
 	// At runtime, open shader code collection for specified shader platform
-	bool OpenShaderCode(const FString& ShaderCodeDir, EShaderPlatform ShaderPlatform)
+	bool OpenShaderCode(const FString& ShaderCodeDir, EShaderPlatform InShaderPlatform, FString const& Library)
 	{
-		ShaderCodeArchive = RHICreateShaderLibrary(ShaderPlatform, ShaderCodeDir);
-		if(ShaderCodeArchive.IsValid())
-		{
-			bNativeFormat = true;
+		check(ShaderPlatform == SP_NumPlatforms || InShaderPlatform == ShaderPlatform);
 
-			UE_LOG(LogShaderLibrary, Display, TEXT("Cooked Context: Loaded Native Format Shared Shader Library"));
+		ShaderPlatform = InShaderPlatform;
+
+		FRHIShaderLibraryRef ShaderCodeArchive = new FShaderCodeArchive(ShaderPlatform, ShaderCodeDir, Library);
+		if (ShaderCodeArchive->GetShaderCount() > 0)
+		{
+			bSupportsPipelines = true;
+			UE_LOG(LogShaderLibrary, Display, TEXT("Cooked Context: Using Shared Shader Library %s"), *Library);
+		}
+		else if (RHISupportsNativeShaderLibraries(ShaderPlatform))
+		{
+			ShaderCodeArchive = RHICreateShaderLibrary(ShaderPlatform, ShaderCodeDir, Library);
+
+			if (ShaderCodeArchive.IsValid())
+			{
+				bNativeFormat = true;
+
+				UE_LOG(LogShaderLibrary, Display, TEXT("Cooked Context: Loaded Native Shared Shader Library %s"), *Library);
+			}
+			else
+			{
+				UE_LOG(LogShaderLibrary, Display, TEXT("Failed to load Native Shared Shader Library: %s."), *Library);
+			}
 		}
 		else
 		{
-			ShaderCodeArchive = new FShaderCodeArchive(ShaderPlatform, ShaderCodeDir);
-			bool bValid = ShaderCodeArchive->GetShaderCount() > 0;
-			if (bValid)
+			UE_LOG(LogShaderLibrary, Display, TEXT("Failed to load Shared Shader Library: %s and no native library supported."), *Library);
+		}
+
+		bool const bOK = IsValidRef(ShaderCodeArchive);
+		if (bOK)
+		{
+			FRWScopeLock(LibraryMutex, SLT_Write);
+
+			ShaderCodeArchiveStack.Add(ShaderCodeArchive);
+
+			ShaderCount += ShaderCodeArchive->GetShaderCount();
+
+			if (bSupportsPipelines && !bNativeFormat)
 			{
-				bSupportsPipelines = true;// ??
-				UE_LOG(LogShaderLibrary, Display, TEXT("Cooked Context: Using Shared Shader Library"));
+				TSet<FShaderCodeLibraryPipeline> const* NewPipelines = ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->GetShaderPipelines(ShaderPlatform);
+				if (NewPipelines)
+				{
+					Pipelines.Append(*NewPipelines);
+				}
 			}
 		}
-		return IsValidRef(ShaderCodeArchive);
+		return bOK;
 	}
 
 	FVertexShaderRHIRef CreateVertexShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FVertexShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateVertexShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateVertexShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateVertexShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateVertexShader(Hash);
+		return Result;
 	}
 
 	FPixelShaderRHIRef CreatePixelShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FPixelShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreatePixelShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreatePixelShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreatePixelShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreatePixelShader(Hash);
+		return Result;
 	}
 
 	FGeometryShaderRHIRef CreateGeometryShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FGeometryShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateGeometryShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateGeometryShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateGeometryShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateGeometryShader(Hash);
+		return Result;
 	}
 
 	FGeometryShaderRHIRef CreateGeometryShaderWithStreamOutput(EShaderPlatform Platform, FSHAHash Hash, const FStreamOutElementList& ElementList, uint32 NumStrides, const uint32* Strides, int32 RasterizedStream)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FGeometryShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateGeometryShaderWithStreamOutput(ElementList, NumStrides, Strides, RasterizedStream, ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateGeometryShaderWithStreamOutput(ElementList, NumStrides, Strides, RasterizedStream, ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateGeometryShaderWithStreamOutput(Hash, ElementList, NumStrides, Strides, RasterizedStream);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateGeometryShaderWithStreamOutput(Hash, ElementList, NumStrides, Strides, RasterizedStream);
+		return Result;
 	}
 
 	FHullShaderRHIRef CreateHullShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FHullShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateHullShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateHullShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateHullShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateHullShader(Hash);
+		return Result;
 	}
 
 	FDomainShaderRHIRef CreateDomainShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FDomainShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateDomainShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateDomainShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateDomainShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateDomainShader(Hash);
+		return Result;
 	}
 
 	FComputeShaderRHIRef CreateComputeShader(EShaderPlatform Platform, FSHAHash Hash)
 	{
 		checkSlow(Platform == GetRuntimeShaderPlatform());
 
-		if(bNativeFormat)
+		FComputeShaderRHIRef Result;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
 		{
-			return RHICreateComputeShader(ShaderCodeArchive, Hash);
+			if (bNativeFormat)
+				Result = RHICreateComputeShader(ShaderCodeArchive, Hash);
+			else
+				Result = ((FShaderCodeArchive*)ShaderCodeArchive)->CreateComputeShader(Hash);
 		}
-
-		return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->CreateComputeShader(Hash);
+		return Result;
 	}
 
 	TRefCountPtr<FRHIShaderLibrary::FShaderLibraryIterator> CreateIterator(void)
 	{
-		return ShaderCodeArchive->CreateIterator();
+		return new FShaderCodeLibraryIterator(ShaderCodeArchiveStack, LibraryMutex);
 	}
 
 	uint32 GetShaderCount(void)
 	{
-		return ShaderCodeArchive->GetShaderCount();
+		return ShaderCount;
 	}
 
 	EShaderPlatform GetRuntimeShaderPlatform(void)
 	{
-		return ShaderCodeArchive->GetPlatform();
+		return ShaderPlatform;
 	}
 
 	TSet<FShaderCodeLibraryPipeline> const* GetShaderPipelines(EShaderPlatform Platform)
 	{
 		if (bSupportsPipelines)
 		{
+			FRWScopeLock(LibraryMutex, SLT_ReadOnly);
 			checkSlow(Platform == GetRuntimeShaderPlatform());
-			return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->GetShaderPipelines(Platform);
+			return &Pipelines;
 		}
 		return nullptr;
 	}
 
+	FRHIShaderLibraryParamRef FindShaderLibrary(const FSHAHash& Hash)
+	{
+		FRWScopeLock(LibraryMutex, SLT_ReadOnly);
+		FRHIShaderLibraryParamRef Result = nullptr;
+
+		// Search in library opened order
+		for (int32 i = 0; i < ShaderCodeArchiveStack.Num(); ++i)
+		{
+			FRHIShaderLibraryParamRef ShaderCodeArchive = ShaderCodeArchiveStack[i];
+			if (ShaderCodeArchive->ContainsEntry(Hash))
+			{
+				Result = ShaderCodeArchive;
+				break;
+			}
+		}
+		return Result;
+	}
+
+	bool ContainsShaderCode(const FSHAHash& Hash)
+	{
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
+			return true;
+		else
+			return false;
+	}
+
 	bool RequestShaderCode(const FSHAHash& Hash, FArchive* Ar)
 	{
-		if (!bNativeFormat)
-		{
-			return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->RequestShaderCode(Hash, Ar);
-		}
-		return false;
+		FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+		if (ShaderCodeArchive)
+			return ShaderCodeArchive->RequestEntry(Hash, Ar);
+		else
+			return false;
 	}
 
 	void ReleaseShaderCode(const FSHAHash& Hash)
 	{
 		if (!bNativeFormat)
 		{
-			return ((FShaderCodeArchive*)ShaderCodeArchive.GetReference())->ReleaseShaderCode(Hash);
+			FRHIShaderLibraryParamRef ShaderCodeArchive = FindShaderLibrary(Hash);
+			if (ShaderCodeArchive)
+				((FShaderCodeArchive*)ShaderCodeArchive)->ReleaseShaderCode(Hash);
 		}
 	}
 
 #if WITH_EDITOR
-	void AddShaderCode(EShaderPlatform ShaderPlatform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize)
+	void CleanDirectories(TArray<FName> const& ShaderFormats)
+	{
+		for (FName const& Format : ShaderFormats)
+		{
+			FString ShaderIntermediateLocation = FPaths::ProjectSavedDir() / TEXT("Shaders") / Format.ToString();
+			IFileManager::Get().DeleteDirectory(*ShaderIntermediateLocation, false, true);
+		}
+	}
+
+	void CookShaderFormats(TArray<FName> const& ShaderFormats)
+	{
+		for (FName const& Format : ShaderFormats)
+		{
+			EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(Format);
+			FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[Platform];
+			if (!CodeArchive)
+			{
+				CodeArchive = new FEditorShaderCodeArchive(Format);
+				EditorShaderCodeArchive[Platform] = CodeArchive;
+				EditorArchivePipelines[Platform] = !bNativeFormat;
+			}
+			check(CodeArchive);
+		}
+		for (FName const& Format : ShaderFormats)
+		{
+			EShaderPlatform Platform = ShaderFormatToLegacyShaderPlatform(Format);
+			FEditorShaderStableInfo* StableArchive = EditorShaderStableInfo[Platform];
+			if (!StableArchive)
+			{
+				StableArchive = new FEditorShaderStableInfo(Format);
+				EditorShaderStableInfo[Platform] = StableArchive;
+			}
+			check(StableArchive);
+		}
+	}
+
+	void AddShaderCode(EShaderPlatform Platform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize)
 	{
 		FScopeLock ScopeLock(&ShaderCodeCS);
-		FShaderCodeStats& CodeStats = EditorShaderCodeStats[ShaderPlatform];
+		FShaderCodeStats& CodeStats = EditorShaderCodeStats[Platform];
 		CodeStats.NumShaders++;
 		CodeStats.ShadersSize += InCode.Num();
 
-		FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[ShaderPlatform];
-		if (!CodeArchive)
-		{
-			FName Format = LegacyShaderPlatformToShaderFormat(ShaderPlatform);
-			CodeArchive = new FEditorShaderCodeArchive(Format);
-			EditorShaderCodeArchive[ShaderPlatform] = CodeArchive;
-			EditorArchivePipelines[ShaderPlatform] = IsOpenGLPlatform(ShaderPlatform);
-		}
+		FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[Platform];
 		check(CodeArchive);
 
 		if (CodeArchive->AddShader((uint8)Frequency, Hash, InCode, UncompressedSize))
@@ -1024,43 +1726,48 @@ public:
 		}
 	}
 
+	void AddShaderStableKeyValue(EShaderPlatform InShaderPlatform, FStableShaderKeyAndValue& StableKeyValue)
+	{
+		FScopeLock ScopeLock(&ShaderCodeCS);
+
+		StableKeyValue.ComputeKeyHash();
+
+		FEditorShaderStableInfo* StableArchive = EditorShaderStableInfo[InShaderPlatform];
+		check(StableArchive);
+
+		StableArchive->AddShader(StableKeyValue);
+	}
+
 	bool AddShaderPipeline(FShaderPipeline* Pipeline)
 	{
 		check(Pipeline);
 
-		EShaderPlatform ShaderPlatform = SP_NumPlatforms;
+		EShaderPlatform SPlatform = SP_NumPlatforms;
 		for (uint8 Freq = 0; Freq < SF_Compute; Freq++)
 		{
 			FShader* Shader = Pipeline->GetShader((EShaderFrequency)Freq);
 			if (Shader)
 			{
-				if (ShaderPlatform == SP_NumPlatforms)
+				if (SPlatform == SP_NumPlatforms)
 				{
-					ShaderPlatform = (EShaderPlatform)Shader->GetTarget().Platform;
+					SPlatform = (EShaderPlatform)Shader->GetTarget().Platform;
 				}
 				else
 				{
-					check(ShaderPlatform == (EShaderPlatform)Shader->GetTarget().Platform);
+					check(SPlatform == (EShaderPlatform)Shader->GetTarget().Platform);
 				}
 			}
 		}
 
 		FScopeLock ScopeLock(&ShaderCodeCS);
-		FShaderCodeStats& CodeStats = EditorShaderCodeStats[ShaderPlatform];
+		FShaderCodeStats& CodeStats = EditorShaderCodeStats[SPlatform];
 		CodeStats.NumPipelines++;
 
-		FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[ShaderPlatform];
-		if (!CodeArchive)
-		{
-			FName Format = LegacyShaderPlatformToShaderFormat(ShaderPlatform);
-			CodeArchive = new FEditorShaderCodeArchive(Format);
-			EditorShaderCodeArchive[ShaderPlatform] = CodeArchive;
-			EditorArchivePipelines[ShaderPlatform] = IsOpenGLPlatform(ShaderPlatform);
-		}
+		FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[SPlatform];
 		check(CodeArchive);
 
 		bool bAdded = false;
-		if (EditorArchivePipelines[ShaderPlatform] && ((FEditorShaderCodeArchive*)CodeArchive)->AddPipeline(Pipeline))
+		if (EditorArchivePipelines[SPlatform] && ((FEditorShaderCodeArchive*)CodeArchive)->AddPipeline(Pipeline))
 		{
 			CodeStats.NumUniquePipelines++;
 			bAdded = true;
@@ -1068,39 +1775,47 @@ public:
 		return bAdded;
 	}
 
-	bool SaveShaderCode(const FString& ShaderCodeDir, const FString& DebugOutputDir, const TArray<FName>& ShaderFormats)
+	bool SaveShaderCode(const FString& ShaderCodeDir, const FString& MetaOutputDir, const TArray<FName>& ShaderFormats, bool bMaster, FString& OutSCLCSVPath)
 	{
 		bool bOk = ShaderFormats.Num() > 0;
 
 		FScopeLock ScopeLock(&ShaderCodeCS);
 
-		for (int32 i = 0; i < ShaderFormats.Num(); ++i)	
+		for (int32 i = 0; i < ShaderFormats.Num(); ++i)
 		{
 			FName ShaderFormatName = ShaderFormats[i];
-			EShaderPlatform ShaderPlatform = ShaderFormatToLegacyShaderPlatform(ShaderFormatName);
-			FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[ShaderPlatform];
-
-			if (CodeArchive)
+			EShaderPlatform SPlatform = ShaderFormatToLegacyShaderPlatform(ShaderFormatName);
 			{
-				bOk &= CodeArchive->Finalize(ShaderCodeDir, DebugOutputDir, bNativeFormat);
+				FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[SPlatform];
+				if (CodeArchive)
+				{
+					bOk &= CodeArchive->Finalize(ShaderCodeDir, bNativeFormat, bMaster);
+				}
+			}
+			{
+				FEditorShaderStableInfo* StableArchive = EditorShaderStableInfo[SPlatform];
+				if (StableArchive)
+				{
+					bOk &= StableArchive->Finalize(MetaOutputDir, bNativeFormat, bMaster, OutSCLCSVPath);
+				}
 			}
 		}
 
 		return bOk;
 	}
 
-	bool PackageNativeShaderLibrary(const FString& ShaderCodeDir, const FString& DebugShaderCodeDir, const TArray<FName>& ShaderFormats)
+	bool PackageNativeShaderLibrary(const FString& ShaderCodeDir, const TArray<FName>& ShaderFormats)
 	{
 		bool bOK = true;
 		for (int32 i = 0; i < ShaderFormats.Num(); ++i)
 		{
 			FName ShaderFormatName = ShaderFormats[i];
-			EShaderPlatform ShaderPlatform = ShaderFormatToLegacyShaderPlatform(ShaderFormatName);
-			FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[ShaderPlatform];
+			EShaderPlatform SPlatform = ShaderFormatToLegacyShaderPlatform(ShaderFormatName);
+			FEditorShaderCodeArchive* CodeArchive = EditorShaderCodeArchive[SPlatform];
 
 			if (CodeArchive && CodeArchive->GetFormat()->SupportsShaderArchives())
 			{
-				bOK &= CodeArchive->PackageNativeShaderLibrary(ShaderCodeDir, DebugShaderCodeDir);
+				bOK &= CodeArchive->PackageNativeShaderLibrary(ShaderCodeDir);
 			}
 		}
 		return bOK;
@@ -1109,7 +1824,7 @@ public:
 	void DumpShaderCodeStats()
 	{
 		int32 PlatformId = 0;
-		for (const FShaderCodeStats& CodeStats : EditorShaderCodeStats)	
+		for (const FShaderCodeStats& CodeStats : EditorShaderCodeStats)
 		{
 			if (CodeStats.NumShaders > 0)
 			{
@@ -1134,10 +1849,18 @@ public:
 
 FShaderCodeLibraryImpl* FShaderCodeLibraryImpl::Impl = nullptr;
 
+static void FShaderCodeLibraryPluginMountedCallback(IPlugin& Plugin)
+{
+	if (Plugin.CanContainContent() && Plugin.IsEnabled())
+	{
+		FShaderCodeLibrary::OpenLibrary(Plugin.GetName(), Plugin.GetBaseDir());
+		FShaderCodeLibrary::OpenLibrary(Plugin.GetName(), Plugin.GetContentDir());
+	}
+}
+
 void FShaderCodeLibrary::InitForRuntime(EShaderPlatform ShaderPlatform)
 {
 	check(FPlatformProperties::RequiresCookedData());
-	
 
 	if (FShaderCodeLibraryImpl::Impl != nullptr)
 	{
@@ -1146,40 +1869,63 @@ void FShaderCodeLibrary::InitForRuntime(EShaderPlatform ShaderPlatform)
 		return;
 	}
 
-	if (!FPlatformProperties::IsServerOnly() && FApp::CanEverRender())
+	// Cannot be enabled by the server, pointless if we can't ever render and not compatible with cook-on-the-fly
+	bool bEnable = !FPlatformProperties::IsServerOnly() && FApp::CanEverRender();
+#if !UE_BUILD_SHIPPING
+	FString FileHostIP;
+	const bool bCookOnTheFly = FParse::Value(FCommandLine::Get(), TEXT("filehostip"), FileHostIP);
+	bEnable &= !bCookOnTheFly;
+#endif
+
+	if (bEnable)
 	{
 		FShaderCodeLibraryImpl::Impl = new FShaderCodeLibraryImpl(false);
-		if (!FShaderCodeLibraryImpl::Impl->OpenShaderCode(FPaths::ProjectContentDir(), ShaderPlatform))
+		if (FShaderCodeLibraryImpl::Impl->OpenShaderCode(FPaths::ProjectContentDir(), ShaderPlatform, TEXT("Global")))
+		{
+			IPluginManager::Get().OnNewPluginMounted().AddStatic(&FShaderCodeLibraryPluginMountedCallback);
+		
+#if !UE_BUILD_SHIPPING
+			// support shared cooked builds by also opening the shared cooked build shader code file
+			FShaderCodeLibraryImpl::Impl->OpenShaderCode(FPaths::ProjectContentDir(), ShaderPlatform, TEXT("Global_SC"));
+#endif
+
+			auto Plugins = IPluginManager::Get().GetEnabledPluginsWithContent();
+			for (auto Plugin : Plugins)
+			{
+				FShaderCodeLibraryPluginMountedCallback(*Plugin);
+			}
+
+		}
+		else
 		{
 			Shutdown();
 		}
 	}
 }
 
-void FShaderCodeLibrary::InitForCooking(bool bNativeFormat)
-{
-	FShaderCodeLibraryImpl::Impl = new FShaderCodeLibraryImpl(bNativeFormat);
-}
-
 void FShaderCodeLibrary::Shutdown()
 {
-#if WITH_EDITOR
-	DumpShaderCodeStats();
-#endif
-	delete FShaderCodeLibraryImpl::Impl;
-	FShaderCodeLibraryImpl::Impl = nullptr;
-}
-
-bool FShaderCodeLibrary::AddShaderCode(EShaderPlatform ShaderPlatform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize)
-{
-#if WITH_EDITOR
 	if (FShaderCodeLibraryImpl::Impl)
 	{
-		FShaderCodeLibraryImpl::Impl->AddShaderCode(ShaderPlatform, Frequency, Hash, InCode, UncompressedSize);
-		return true;
+#if WITH_EDITOR
+		DumpShaderCodeStats();
+#endif
+		delete FShaderCodeLibraryImpl::Impl;
+		FShaderCodeLibraryImpl::Impl = nullptr;
 	}
-#endif// WITH_EDITOR
+}
 
+bool FShaderCodeLibrary::IsEnabled()
+{
+	return FShaderCodeLibraryImpl::Impl != nullptr;
+}
+
+bool FShaderCodeLibrary::ContainsShaderCode(const FSHAHash& Hash)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		return FShaderCodeLibraryImpl::Impl->ContainsShaderCode(Hash);
+	}
 	return false;
 }
 
@@ -1187,7 +1933,7 @@ bool FShaderCodeLibrary::RequestShaderCode(const FSHAHash& Hash, FArchive* Ar)
 {
 	if (FShaderCodeLibraryImpl::Impl)
 	{
-		return FShaderCodeLibraryImpl::FShaderCodeLibraryImpl::Impl->RequestShaderCode(Hash, Ar);
+		return FShaderCodeLibraryImpl::Impl->RequestShaderCode(Hash, Ar);
 	}
 	return false;
 }
@@ -1200,19 +1946,6 @@ void FShaderCodeLibrary::ReleaseShaderCode(const FSHAHash& Hash)
 	}
 }
 
-bool FShaderCodeLibrary::AddShaderPipeline(FShaderPipeline* Pipeline)
-{
-#if WITH_EDITOR
-	if (FShaderCodeLibraryImpl::Impl && Pipeline)
-	{
-		FShaderCodeLibraryImpl::Impl->AddShaderPipeline(Pipeline);
-		return true;
-	}
-#endif// WITH_EDITOR
-
-	return false;
-}
-
 FVertexShaderRHIRef FShaderCodeLibrary::CreateVertexShader(EShaderPlatform Platform, FSHAHash Hash, TArray<uint8> const& Code)
 {
 	FVertexShaderRHIRef Shader;
@@ -1315,6 +2048,8 @@ FComputeShaderRHIRef FShaderCodeLibrary::CreateComputeShader(EShaderPlatform Pla
 		Shader = RHICreateComputeShader(Code);
 	}
 	SafeAssignHash(Shader, Hash);
+	FPipelineFileCache::CacheComputePSO(GetTypeHash(Shader.GetReference()), Shader.GetReference());
+	Shader->SetStats(FPipelineFileCache::RegisterPSOStats(GetTypeHash(Shader.GetReference())));
 	return Shader;
 }
 
@@ -1341,7 +2076,7 @@ uint32 FShaderCodeLibrary::GetShaderCount(void)
 TSet<FShaderCodeLibraryPipeline> const* FShaderCodeLibrary::GetShaderPipelines(EShaderPlatform Platform)
 {
 	TSet<FShaderCodeLibraryPipeline> const* Pipelines = nullptr;
-	if (FShaderCodeLibraryImpl::Impl && FPlatformProperties::RequiresCookedData() && IsOpenGLPlatform(Platform))
+	if (FShaderCodeLibraryImpl::Impl && FPlatformProperties::RequiresCookedData())
 	{
 		Pipelines = FShaderCodeLibraryImpl::Impl->GetShaderPipelines(Platform);
 	}
@@ -1358,22 +2093,117 @@ EShaderPlatform FShaderCodeLibrary::GetRuntimeShaderPlatform(void)
 	return Platform;
 }
 
-#if WITH_EDITOR
-bool FShaderCodeLibrary::SaveShaderCode(const FString& OutputDir, const FString& DebugDir, const TArray<FName>& ShaderFormats)
+void FShaderCodeLibrary::OpenLibrary(FString const& Name, FString const& Directory)
 {
 	if (FShaderCodeLibraryImpl::Impl)
 	{
-		return FShaderCodeLibraryImpl::Impl->SaveShaderCode(OutputDir, DebugDir, ShaderFormats);
+		FShaderCodeLibraryImpl::Impl->OpenLibrary(Name, Directory);
+	}
+}
+
+void FShaderCodeLibrary::CloseLibrary(FString const& Name)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		FShaderCodeLibraryImpl::Impl->CloseLibrary(Name);
+	}
+}
+
+#if WITH_EDITOR
+void FShaderCodeLibrary::InitForCooking(bool bNativeFormat)
+{
+	FShaderCodeLibraryImpl::Impl = new FShaderCodeLibraryImpl(bNativeFormat);
+}
+
+void FShaderCodeLibrary::CleanDirectories(TArray<FName> const& ShaderFormats)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		FShaderCodeLibraryImpl::Impl->CleanDirectories(ShaderFormats);
+	}
+}
+
+void FShaderCodeLibrary::CookShaderFormats(TArray<FName> const& ShaderFormats)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		FShaderCodeLibraryImpl::Impl->CookShaderFormats(ShaderFormats);
+	}
+}
+
+bool FShaderCodeLibrary::AddShaderCode(EShaderPlatform ShaderPlatform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize)
+{
+#if WITH_EDITOR
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		FShaderCodeLibraryImpl::Impl->AddShaderCode(ShaderPlatform, Frequency, Hash, InCode, UncompressedSize);
+		return true;
+	}
+#endif// WITH_EDITOR
+
+	return false;
+}
+
+bool FShaderCodeLibrary::NeedsShaderStableKeys()
+{
+#if WITH_EDITOR
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		return true;
+	}
+#endif// WITH_EDITOR
+	return false;
+}
+
+void FShaderCodeLibrary::AddShaderStableKeyValue(EShaderPlatform ShaderPlatform, FStableShaderKeyAndValue& StableKeyValue)
+{
+#if WITH_EDITOR
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		FShaderCodeLibraryImpl::Impl->AddShaderStableKeyValue(ShaderPlatform, StableKeyValue);
+	}
+#endif// WITH_EDITOR
+}
+
+bool FShaderCodeLibrary::AddShaderPipeline(FShaderPipeline* Pipeline)
+{
+#if WITH_EDITOR
+	if (FShaderCodeLibraryImpl::Impl && Pipeline)
+	{
+		FShaderCodeLibraryImpl::Impl->AddShaderPipeline(Pipeline);
+		return true;
+	}
+#endif// WITH_EDITOR
+
+	return false;
+}
+
+bool FShaderCodeLibrary::SaveShaderCodeMaster(const FString& OutputDir, const FString& MetaOutputDir, const TArray<FName>& ShaderFormats, FString& OutSCLCSVPath)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		return FShaderCodeLibraryImpl::Impl->SaveShaderCode(OutputDir, MetaOutputDir, ShaderFormats, true, OutSCLCSVPath);
 	}
 
 	return false;
 }
 
-bool FShaderCodeLibrary::PackageNativeShaderLibrary(const FString& ShaderCodeDir, const FString& DebugShaderCodeDir, const TArray<FName>& ShaderFormats)
+bool FShaderCodeLibrary::SaveShaderCodeChild(const FString& OutputDir, const FString& MetaOutputDir, const TArray<FName>& ShaderFormats)
 {
 	if (FShaderCodeLibraryImpl::Impl)
 	{
-		return FShaderCodeLibraryImpl::Impl->PackageNativeShaderLibrary(ShaderCodeDir, DebugShaderCodeDir, ShaderFormats);
+		FString OutSCLCSVPathJunk;
+		return FShaderCodeLibraryImpl::Impl->SaveShaderCode(OutputDir, MetaOutputDir, ShaderFormats, false, OutSCLCSVPathJunk);
+	}
+
+	return false;
+}
+
+bool FShaderCodeLibrary::PackageNativeShaderLibrary(const FString& ShaderCodeDir, const TArray<FName>& ShaderFormats)
+{
+	if (FShaderCodeLibraryImpl::Impl)
+	{
+		return FShaderCodeLibraryImpl::Impl->PackageNativeShaderLibrary(ShaderCodeDir, ShaderFormats);
 	}
 
 	return false;
diff --git a/Engine/Source/Runtime/ShaderCore/Private/ShaderParameters.cpp b/Engine/Source/Runtime/ShaderCore/Private/ShaderParameters.cpp
index a1cef926434b..cbe4090ec472 100644
--- a/Engine/Source/Runtime/ShaderCore/Private/ShaderParameters.cpp
+++ b/Engine/Source/Runtime/ShaderCore/Private/ShaderParameters.cpp
@@ -10,6 +10,7 @@
 #include "ShaderCore.h"
 #include "Shader.h"
 #include "VertexFactory.h"
+#include "ShaderCodeLibrary.h"
 
 void FShaderParameter::Bind(const FShaderParameterMap& ParameterMap,const TCHAR* ParameterName,EShaderParameterFlags Flags)
 {
@@ -390,6 +391,86 @@ void FShaderType::AddReferencedUniformBufferIncludes(FShaderCompilerEnvironment&
 	GeneratedUniformBuffersInclude.Append(UniformBufferIncludes);
 }
 
+void FShaderType::DumpDebugInfo()
+{
+	UE_LOG(LogConsoleResponse, Display, TEXT("----------------------------- GLobalShader %s"), GetName());
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :Target %s"), GetShaderFrequencyString(GetFrequency()));
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :TotalPermutationCount %d"), TotalPermutationCount);
+#if WITH_EDITOR
+	UE_LOG(LogConsoleResponse, Display, TEXT("               :SourceHash %s"), *GetSourceHash().ToString());
+#endif
+	switch (ShaderTypeForDynamicCast)
+	{
+	case EShaderTypeForDynamicCast::Global:
+		UE_LOG(LogConsoleResponse, Display, TEXT("               :ShaderType Global"));
+		break;
+	case EShaderTypeForDynamicCast::Material:
+		UE_LOG(LogConsoleResponse, Display, TEXT("               :ShaderType Material"));
+		break;
+	case EShaderTypeForDynamicCast::MeshMaterial:
+		UE_LOG(LogConsoleResponse, Display, TEXT("               :ShaderType MeshMaterial"));
+		break;
+	case EShaderTypeForDynamicCast::Niagara:
+		UE_LOG(LogConsoleResponse, Display, TEXT("               :ShaderType Niagara"));
+		break;
+	}
+
+	UE_LOG(LogConsoleResponse, Display, TEXT("  --- %d shaders"), ShaderIdMap.Num());
+	int32 Index = 0;
+	for (auto& KeyValue : ShaderIdMap)
+	{
+		UE_LOG(LogConsoleResponse, Display, TEXT("    --- shader %d"), Index);
+		FShader* Shader = KeyValue.Value;
+		Shader->DumpDebugInfo();
+		Index++;
+	}
+
+}
+
+void FShaderType::GetShaderStableKeyParts(FStableShaderKeyAndValue& SaveKeyVal)
+{
+#if WITH_EDITOR
+	static FName NAME_Global(TEXT("Global"));
+	static FName NAME_Material(TEXT("Material"));
+	static FName NAME_MeshMaterial(TEXT("MeshMaterial"));
+	static FName NAME_Niagara(TEXT("Niagara"));
+	switch (ShaderTypeForDynamicCast)
+	{
+	case EShaderTypeForDynamicCast::Global:
+		SaveKeyVal.ShaderClass = NAME_Global;
+		break;
+	case EShaderTypeForDynamicCast::Material:
+		SaveKeyVal.ShaderClass = NAME_Material;
+		break;
+	case EShaderTypeForDynamicCast::MeshMaterial:
+		SaveKeyVal.ShaderClass = NAME_MeshMaterial;
+		break;
+	case EShaderTypeForDynamicCast::Niagara:
+		SaveKeyVal.ShaderClass = NAME_Niagara;
+		break;
+	}
+	SaveKeyVal.ShaderType = FName(GetName() ? GetName() : TEXT("null"));
+#endif
+}
+
+void FShaderType::SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform)
+{
+#if WITH_EDITOR
+	FStableShaderKeyAndValue SaveKeyVal;
+	if (ShaderIdMap.Num())
+	{
+		for (auto& KeyValue : ShaderIdMap)
+		{
+			FShader* Shader = KeyValue.Value;
+			check(Shader);
+			check(Shader->Type == this);
+			Shader->SaveShaderStableKeys(TargetShaderPlatform, SaveKeyVal);
+		}
+	}
+#endif
+}
+
+
 void FVertexFactoryType::AddReferencedUniformBufferIncludes(FShaderCompilerEnvironment& OutEnvironment, FString& OutSourceFilePrefix, EShaderPlatform Platform)
 {
 	// Cache uniform buffer struct declarations referenced by this shader type's files
diff --git a/Engine/Source/Runtime/ShaderCore/Private/ShaderPipelineCache.cpp b/Engine/Source/Runtime/ShaderCore/Private/ShaderPipelineCache.cpp
new file mode 100644
index 000000000000..30bb719055f0
--- /dev/null
+++ b/Engine/Source/Runtime/ShaderCore/Private/ShaderPipelineCache.cpp
@@ -0,0 +1,1251 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/**
+ * Shader Pipeline Precompilation Cache
+ * Precompilation half of the shader pipeline cache, which builds on the runtime RHI pipeline cache.
+ */
+ 
+#include "ShaderPipelineCache.h"
+#include "RenderingThread.h"
+#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+#include "Serialization/MemoryWriter.h"
+#include "Serialization/ArchiveSaveCompressedProxy.h"
+#include "Serialization/ArchiveLoadCompressedProxy.h"
+#include "Serialization/CustomVersion.h"
+#include "Serialization/MemoryReader.h"
+#include "Shader.h"
+#include "Misc/EngineVersion.h"
+#include "PipelineStateCache.h"
+#include "PipelineFileCache.h"
+#include "Misc/ScopeRWLock.h"
+#include "Misc/CoreDelegates.h"
+#include "ShaderCodeLibrary.h"
+#include "TickableObjectRenderThread.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Async/AsyncFileHandle.h"
+
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Outstanding Tasks"), STAT_ShaderPipelineTaskCount, STATGROUP_PipelineStateCache );
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Waiting Tasks"), STAT_ShaderPipelineWaitingTaskCount, STATGROUP_PipelineStateCache );
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Active Tasks"), STAT_ShaderPipelineActiveTaskCount, STATGROUP_PipelineStateCache );
+DECLARE_MEMORY_STAT(TEXT("Pre-Compile Memory"), STAT_PreCompileMemory, STATGROUP_PipelineStateCache);
+DECLARE_CYCLE_STAT(TEXT("Pre-Compile Time"),STAT_PreCompileTime,STATGROUP_PipelineStateCache);
+DECLARE_FLOAT_ACCUMULATOR_STAT(TEXT("Total Pre-Compile Time"),STAT_PreCompileTotalTime,STATGROUP_PipelineStateCache);
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Total Pipelines Pre-Compiled"), STAT_PreCompileShadersTotal, STATGROUP_PipelineStateCache);
+DECLARE_DWORD_COUNTER_STAT(TEXT("# Pipelines Pre-Compiled"), STAT_PreCompileShadersNum, STATGROUP_PipelineStateCache);
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Total Batches Pre-Compiled"), STAT_PreCompileBatchTotal, STATGROUP_PipelineStateCache);
+DECLARE_DWORD_COUNTER_STAT(TEXT("# Batches Pre-Compiled"), STAT_PreCompileBatchNum, STATGROUP_PipelineStateCache);
+
+namespace FShaderPipelineCacheConstants
+{
+	static TCHAR const* SectionHeading = TEXT("ShaderPipelineCache.CacheFile");
+	static TCHAR const* LastOpenedKey = TEXT("LastOpened");
+	static TCHAR const* SortOrderKey = TEXT("SortOrder");
+	static TCHAR const* GameVersionKey = TEXT("GameVersion");
+}
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheBackgroundBatchSize(
+														  TEXT("r.ShaderPipelineCache.BackgroundBatchSize"),
+														  1,
+														  TEXT("Set the number of PipelineStateObjects to compile in a single batch operation when compiling in the background. Defaults to a maximum of 1 per frame, due to async. file IO it is less in practice."),
+														  ECVF_Default | ECVF_RenderThreadSafe
+														  );
+static TAutoConsoleVariable<int32> CVarPSOFileCacheBatchSize(
+														   TEXT("r.ShaderPipelineCache.BatchSize"),
+#if PLATFORM_MAC
+														   16, // On Mac, where we have many more PSOs to preload due to different video settings 16 works better than 50
+#else
+														   50,
+#endif
+														   TEXT("Set the number of PipelineStateObjects to compile in a single batch operation when compiling takes priority. Defaults to a maximum of 50 per frame, due to async. file IO it is less in practice."),
+														   ECVF_Default | ECVF_RenderThreadSafe
+														   );
+static TAutoConsoleVariable<int32> CVarPSOFileCacheSaveAfterPSOsLogged(
+														   TEXT("r.ShaderPipelineCache.SaveAfterPSOsLogged"),
+#if !UE_BUILD_SHIPPING
+														   100,
+#else
+														   0,
+#endif
+														   TEXT("Set the number of PipelineStateObjects to log before automatically saving. 0 will disable automatic saving. Shipping defaults to 0, otherwise default is 100."),
+														   ECVF_Default | ECVF_RenderThreadSafe
+														   );
+ 
+static TAutoConsoleVariable<int32> CVarPSOFileCacheAutoSaveTime(
+															TEXT("r.ShaderPipelineCache.AutoSaveTime"),
+															30,
+															TEXT("Set the time where any logged PSO's will be saved if the number is < r.ShaderPipelineCache.SaveAfterPSOsLogged. Disabled when r.ShaderPipelineCache.SaveAfterPSOsLogged is 0"),
+															ECVF_Default | ECVF_RenderThreadSafe
+														);
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheAutoSaveTimeBoundPSO(
+	TEXT("r.ShaderPipelineCache.AutoSaveTimeBoundPSO"),
+	10,
+	TEXT("Set the time where any logged PSO's will be saved when -logpso is on th ecommand line."),
+	ECVF_Default | ECVF_RenderThreadSafe
+);
+
+static TAutoConsoleVariable<int32> CVarPSOFileCacheSaveBoundPSOLog(
+																 TEXT("r.ShaderPipelineCache.SaveBoundPSOLog"),
+																 (int32)0,
+																 TEXT("If > 0 then a log of all bound PSOs for this run of the program will be saved to a writable user cache file. Defaults to 0 but is forced on with -logpso."),
+																 ECVF_Default | ECVF_RenderThreadSafe
+																 );
+
+static bool GetShaderPipelineCacheSaveBoundPSOLog()
+{
+	static bool bOnce = false;
+	static bool bCmdLineForce = false;
+	if (!bOnce)
+	{
+		bOnce = true;
+		bCmdLineForce = FParse::Param(FCommandLine::Get(), TEXT("logpso"));
+	}
+	return (bCmdLineForce || CVarPSOFileCacheSaveBoundPSOLog.GetValueOnAnyThread() == 1);
+}
+
+static bool GetPSOFileCacheSaveUserCache()
+{
+	static const auto CVarPSOFileCacheSaveUserCache = IConsoleManager::Get().FindConsoleVariable(TEXT("r.ShaderPipelineCache.SaveUserCache"));
+	return (CVarPSOFileCacheSaveUserCache && CVarPSOFileCacheSaveUserCache->GetInt() > 0);
+}
+
+void ConsoleCommandLoadPipelineFileCache(const TArray< FString >& Args)
+{
+	FShaderPipelineCache::ClosePipelineFileCache();
+	FString Name = FApp::GetProjectName();
+	if (Args.Num() > 0)
+	{
+		Name = Args[0];
+	}
+	FShaderPipelineCache::OpenPipelineFileCache(Name, GMaxRHIShaderPlatform);
+}
+
+void ConsoleCommandSavePipelineFileCache()
+{
+	if (GetShaderPipelineCacheSaveBoundPSOLog())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::BoundPSOsOnly);
+	}
+	if (GetPSOFileCacheSaveUserCache())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::SortedBoundPSOs);
+	}
+}
+
+void ConsoleCommandClosePipelineFileCache()
+{
+	FShaderPipelineCache::ClosePipelineFileCache();
+}
+
+void ConsoleCommandSwitchModePipelineCacheCmd(const TArray< FString >& Args)
+{
+    if (Args.Num() > 0)
+    {
+        FString Mode = Args[0];
+        if (Mode == TEXT("Pause"))
+        {
+            FShaderPipelineCache::PauseBatching();
+        }
+        else if (Mode == TEXT("Background"))
+        {
+            FShaderPipelineCache::SetBatchMode(FShaderPipelineCache::BatchMode::Background);
+            FShaderPipelineCache::ResumeBatching();
+        }
+        else if (Mode == TEXT("Fast"))
+        {
+            FShaderPipelineCache::SetBatchMode(FShaderPipelineCache::BatchMode::Fast);
+            FShaderPipelineCache::ResumeBatching();
+        }
+    }
+}
+
+static FAutoConsoleCommand LoadPipelineCacheCmd(
+												TEXT("r.ShaderPipelineCache.Open"),
+												TEXT("Takes the desired filename to open and then loads the pipeline file cache."),
+												FConsoleCommandWithArgsDelegate::CreateStatic(ConsoleCommandLoadPipelineFileCache)
+												);
+
+static FAutoConsoleCommand SavePipelineCacheCmd(
+										   		TEXT("r.ShaderPipelineCache.Save"),
+										   		TEXT("Save the current pipeline file cache."),
+										   		FConsoleCommandDelegate::CreateStatic(ConsoleCommandSavePipelineFileCache)
+										   		);
+
+static FAutoConsoleCommand ClosePipelineCacheCmd(
+												TEXT("r.ShaderPipelineCache.Close"),
+												TEXT("Close the current pipeline file cache."),
+												FConsoleCommandDelegate::CreateStatic(ConsoleCommandClosePipelineFileCache)
+												);
+
+static FAutoConsoleCommand SwitchModePipelineCacheCmd(
+                                                TEXT("r.ShaderPipelineCache.SetBatchMode"),
+                                                TEXT("Sets the compilation batch mode, which should be one of:\n\tPause: Suspend precompilation.\n\tBackground: Low priority precompilation.\n\tFast: High priority precompilation."),
+                                                FConsoleCommandWithArgsDelegate::CreateStatic(ConsoleCommandSwitchModePipelineCacheCmd)
+                                                );
+ 
+ 
+class FShaderPipelineCacheArchive final : public FArchive
+{
+public:
+	FShaderPipelineCacheArchive()
+	{
+	}
+	virtual ~FShaderPipelineCacheArchive()
+	{
+	}
+
+	virtual bool AttachExternalReadDependency(FExternalReadCallback& ReadCallback) override final
+	{
+		ExternalReadDependencies.Add(ReadCallback);
+		return true;
+	}
+
+	bool PollExternalReadDependencies()
+	{
+		for (uint32 i = 0; i < (uint32)ExternalReadDependencies.Num(); )
+		{
+			FExternalReadCallback& ReadCallback = ExternalReadDependencies[i];
+			bool bFinished = ReadCallback(-1.0);
+			if (bFinished)
+			{
+				ExternalReadDependencies.RemoveAt(i);
+			}
+			else
+			{
+				++i;
+			}
+		}
+		return (ExternalReadDependencies.Num() == 0);
+	}
+	
+	void BlockingWaitComplete()
+	{
+		for (uint32 i = 0; i < (uint32)ExternalReadDependencies.Num(); ++i)
+		{
+			FExternalReadCallback& ReadCallback = ExternalReadDependencies[i];
+			ReadCallback(0.0);
+		}
+	}
+
+private:
+	/**
+	*  List of external read dependencies that must be finished to load this package
+	*/
+	TArray<FExternalReadCallback> ExternalReadDependencies;
+};
+
+FShaderPipelineCache* FShaderPipelineCache::ShaderPipelineCache = nullptr;
+
+FShaderPipelineCache::FShaderCacheOpenedDelegate FShaderPipelineCache::OnCachedOpened;
+FShaderPipelineCache::FShaderCacheClosedDelegate FShaderPipelineCache::OnCachedClosed;
+FShaderPipelineCache::FShaderPrecompilationCompleteDelegate FShaderPipelineCache::OnPrecompilationComplete;
+
+static void PipelineStateCacheOnAppDeactivate()
+{
+	if (GetShaderPipelineCacheSaveBoundPSOLog())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::BoundPSOsOnly);
+	}
+	if (GetPSOFileCacheSaveUserCache())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::Incremental);
+	}
+}
+
+int32 FShaderPipelineCache::GetGameVersionForPSOFileCache()
+{
+	int32 GameVersion = (int32)FEngineVersion::Current().GetChangelist();
+	GConfig->GetInt(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::GameVersionKey, GameVersion, *GGameIni);
+	return GameVersion;
+}
+
+
+void FShaderPipelineCache::Initialize(EShaderPlatform Platform)
+{
+	check(ShaderPipelineCache == nullptr);
+	
+	if(FShaderCodeLibrary::IsEnabled())
+	{
+		FPipelineFileCache::Initialize(GetGameVersionForPSOFileCache());
+		ShaderPipelineCache = new FShaderPipelineCache(Platform);
+	}
+}
+
+void FShaderPipelineCache::Shutdown(void)
+{
+	if (ShaderPipelineCache)
+	{
+		delete ShaderPipelineCache;
+		ShaderPipelineCache = nullptr;
+	}
+}
+
+void FShaderPipelineCache::PauseBatching()
+{
+	if (ShaderPipelineCache)
+		ShaderPipelineCache->bPaused = true;
+}
+
+void FShaderPipelineCache::SetBatchMode(BatchMode Mode)
+{
+	if (ShaderPipelineCache)
+	{
+		switch (Mode)
+		{
+			case BatchMode::Fast:
+			{
+				ShaderPipelineCache->BatchSize = CVarPSOFileCacheBatchSize.GetValueOnAnyThread();
+				break;
+			}
+			case BatchMode::Background:
+			default:
+			{
+				ShaderPipelineCache->BatchSize = CVarPSOFileCacheBackgroundBatchSize.GetValueOnAnyThread();
+				break;
+			}
+		}
+	}
+}
+
+void FShaderPipelineCache::ResumeBatching()
+{
+	if (ShaderPipelineCache)
+		ShaderPipelineCache->bPaused = false;
+}
+
+uint32 FShaderPipelineCache::NumPrecompilesRemaining()
+{
+	uint32 NumRemaining = 0;
+	
+	if (ShaderPipelineCache)
+	{
+        int64 NumActiveTasksRemaining = FMath::Max(0ll, FPlatformAtomics::AtomicRead(&ShaderPipelineCache->TotalActiveTasks));
+        int64 NumWaitingTasksRemaining = FMath::Max(0ll, FPlatformAtomics::AtomicRead(&ShaderPipelineCache->TotalWaitingTasks));
+		NumRemaining = (uint32)(NumActiveTasksRemaining + NumWaitingTasksRemaining);
+	}
+
+	return NumRemaining;
+}
+
+uint32 FShaderPipelineCache::NumPrecompilesActive()
+{
+    uint32 NumRemaining = 0;
+    
+    if (ShaderPipelineCache)
+    {
+        int64 NumTasksRemaining = FPlatformAtomics::AtomicRead(&ShaderPipelineCache->TotalActiveTasks);
+        if(NumTasksRemaining > 0)
+        {
+            NumRemaining = (uint32) NumTasksRemaining;
+        }
+    }
+    
+    return NumRemaining;
+}
+
+bool FShaderPipelineCache::OpenPipelineFileCache(FString const& Name, EShaderPlatform Platform)
+{
+	if (ShaderPipelineCache)
+		return ShaderPipelineCache->Open(Name, Platform);
+	else
+		return false;
+}
+
+bool FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode Mode)
+{
+	if (ShaderPipelineCache)
+		return ShaderPipelineCache->Save(Mode);
+	else
+		return false;
+}
+
+void FShaderPipelineCache::ClosePipelineFileCache()
+{
+	if (ShaderPipelineCache)
+		ShaderPipelineCache->Close();
+}
+
+void FShaderPipelineCache::ShaderLibraryStateChanged(ELibraryState State, EShaderPlatform Platform, FString const& Name)
+{
+    if (ShaderPipelineCache)
+        ShaderPipelineCache->OnShaderLibraryStateChanged(State, Platform, Name);
+}
+
+bool FShaderPipelineCache::Precompile(FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FPipelineCacheFileFormatPSO const& PSO)
+{
+	INC_DWORD_STAT(STAT_PreCompileShadersTotal);
+	INC_DWORD_STAT(STAT_PreCompileShadersNum);
+    
+    uint64 StartTime = FPlatformTime::Cycles64();
+		
+	bool bOk = false;
+	
+	TArray<uint8> DummyCode;
+	
+	if(FPipelineCacheFileFormatPSO::DescriptorType::Graphics == PSO.Type)
+	{
+		FGraphicsPipelineStateInitializer GraphicsInitializer;
+		
+		auto VertexDesc = RHICmdList.CreateVertexDeclaration(PSO.GraphicsDesc.VertexDescriptor);
+		GraphicsInitializer.BoundShaderState.VertexDeclarationRHI = VertexDesc;
+		
+		FVertexShaderRHIRef VertexShader;
+		if (PSO.GraphicsDesc.VertexShader != FSHAHash())
+		{
+			VertexShader = FShaderCodeLibrary::CreateVertexShader(Platform, PSO.GraphicsDesc.VertexShader, DummyCode);
+			GraphicsInitializer.BoundShaderState.VertexShaderRHI = VertexShader;
+            
+            FShaderCodeLibrary::ReleaseShaderCode(PSO.GraphicsDesc.VertexShader);
+		}
+
+		FHullShaderRHIRef HullShader;
+		if (PSO.GraphicsDesc.HullShader != FSHAHash())
+		{
+			HullShader = FShaderCodeLibrary::CreateHullShader(Platform, PSO.GraphicsDesc.HullShader, DummyCode);
+			GraphicsInitializer.BoundShaderState.HullShaderRHI = HullShader;
+            
+            FShaderCodeLibrary::ReleaseShaderCode(PSO.GraphicsDesc.HullShader);
+		}
+
+		FDomainShaderRHIRef DomainShader;
+		if (PSO.GraphicsDesc.DomainShader != FSHAHash())
+		{
+			DomainShader = FShaderCodeLibrary::CreateDomainShader(Platform, PSO.GraphicsDesc.DomainShader, DummyCode);
+			GraphicsInitializer.BoundShaderState.DomainShaderRHI = DomainShader;
+            
+            FShaderCodeLibrary::ReleaseShaderCode(PSO.GraphicsDesc.DomainShader);
+		}
+
+		FPixelShaderRHIRef FragmentShader;
+		if (PSO.GraphicsDesc.FragmentShader != FSHAHash())
+		{
+			FragmentShader = FShaderCodeLibrary::CreatePixelShader(Platform, PSO.GraphicsDesc.FragmentShader, DummyCode);
+			GraphicsInitializer.BoundShaderState.PixelShaderRHI = FragmentShader;
+            
+            FShaderCodeLibrary::ReleaseShaderCode(PSO.GraphicsDesc.FragmentShader);
+		}
+
+		FGeometryShaderRHIRef GeometryShader;
+		if (PSO.GraphicsDesc.GeometryShader != FSHAHash())
+		{
+			GeometryShader = FShaderCodeLibrary::CreateGeometryShader(Platform, PSO.GraphicsDesc.GeometryShader, DummyCode);
+			GraphicsInitializer.BoundShaderState.GeometryShaderRHI = GeometryShader;
+            
+            FShaderCodeLibrary::ReleaseShaderCode(PSO.GraphicsDesc.GeometryShader);
+		}
+		
+		auto BlendState = RHICmdList.CreateBlendState(PSO.GraphicsDesc.BlendState);
+		GraphicsInitializer.BlendState = BlendState;
+		
+		auto RasterState = RHICmdList.CreateRasterizerState(PSO.GraphicsDesc.RasterizerState);
+		GraphicsInitializer.RasterizerState = RasterState;
+		
+		auto DepthState = RHICmdList.CreateDepthStencilState(PSO.GraphicsDesc.DepthStencilState);
+		GraphicsInitializer.DepthStencilState = DepthState;
+		
+		for (uint32 i = 0; i < MaxSimultaneousRenderTargets; ++i)
+		{
+			GraphicsInitializer.RenderTargetFormats[i] = PSO.GraphicsDesc.RenderTargetFormats[i];
+			GraphicsInitializer.RenderTargetFlags[i] = PSO.GraphicsDesc.RenderTargetFlags[i];
+			GraphicsInitializer.RenderTargetLoadActions[i] = PSO.GraphicsDesc.RenderTargetsLoad[i];
+			GraphicsInitializer.RenderTargetStoreActions[i] = PSO.GraphicsDesc.RenderTargetsStore[i];
+		}
+		
+		GraphicsInitializer.RenderTargetsEnabled = PSO.GraphicsDesc.RenderTargetsActive;
+		GraphicsInitializer.NumSamples = PSO.GraphicsDesc.MSAASamples;
+		
+		GraphicsInitializer.DepthStencilTargetFormat = PSO.GraphicsDesc.DepthStencilFormat;
+		GraphicsInitializer.DepthStencilTargetFlag = PSO.GraphicsDesc.DepthStencilFlags;
+		GraphicsInitializer.DepthTargetLoadAction = PSO.GraphicsDesc.DepthLoad;
+		GraphicsInitializer.StencilTargetLoadAction = PSO.GraphicsDesc.StencilLoad;
+		GraphicsInitializer.DepthTargetStoreAction = PSO.GraphicsDesc.DepthStore;
+		GraphicsInitializer.StencilTargetStoreAction = PSO.GraphicsDesc.StencilStore;
+		
+		GraphicsInitializer.PrimitiveType = PSO.GraphicsDesc.PrimitiveType;
+		
+		// Use SetGraphicsPipelineState to call down into PipelineStateCache and also handle the fallback case used by OpenGL.
+		SetGraphicsPipelineState(RHICmdList, GraphicsInitializer, EApplyRendertargetOption::DoNothing);
+		bOk = true;
+	}
+	else if(FPipelineCacheFileFormatPSO::DescriptorType::Compute == PSO.Type)
+	{
+		FComputeShaderRHIRef ComputeInitializer = FShaderCodeLibrary::CreateComputeShader(GMaxRHIShaderPlatform, PSO.ComputeDesc.ComputeShader, DummyCode);
+		FComputePipelineState* ComputeResult = PipelineStateCache::GetAndOrCreateComputePipelineState(RHICmdList, ComputeInitializer);
+		bOk = ComputeResult != nullptr;
+        
+        FShaderCodeLibrary::ReleaseShaderCode(PSO.ComputeDesc.ComputeShader);
+	}
+	else
+	{
+		check(false);
+	}
+    
+    if (bOk)
+    {
+        uint64 TimeDelta = FPlatformTime::Cycles64() - StartTime;
+        FPlatformAtomics::InterlockedIncrement(&TotalCompleteTasks);
+        FPlatformAtomics::InterlockedAdd(&TotalPrecompileTime, TimeDelta);
+    }
+	
+	return bOk;
+}
+
+void FShaderPipelineCache::PreparePipelineBatch(TArray<FPipelineCacheFileFormatPSORead*>& PipelineBatch)
+{
+	for(auto BatchIterator = PipelineBatch.CreateIterator();BatchIterator;++BatchIterator)
+	{
+		FPipelineCacheFileFormatPSORead* PSORead = *BatchIterator;
+		
+		FShaderPipelineCacheArchive* Archive = (FShaderPipelineCacheArchive*)PSORead->Ar;
+		
+		if (PSORead->bValid && ((Archive && Archive->PollExternalReadDependencies()) || PSORead->bReadCompleted))
+		{
+			check(PSORead->bReadCompleted);
+		
+			FPipelineCacheFileFormatPSO PSO;
+			
+			FMemoryReader Ar(PSORead->Data);
+			Ar.SetGameNetVer(FPipelineCacheFileFormatCurrentVersion);
+			Ar << PSO;
+			
+			// Create an FArchive that *only* registers read dependencies for tracking when the shaders are available
+			FShaderPipelineCacheArchive* ReadArchive = new FShaderPipelineCacheArchive;
+	
+			// Assume that the shader is present and the PSO can be compiled by default,
+			bool bOK = true;
+	
+            // Shaders required.
+            TSet<FSHAHash> Shaders;
+            
+            static FSHAHash EmptySHA;
+            
+            if (PSO.Type == FPipelineCacheFileFormatPSO::DescriptorType::Graphics)
+			{
+                // See if the shaders exist in the current code libraries, before trying to load the shader data
+                if (PSO.GraphicsDesc.VertexShader != EmptySHA)
+                {
+                    Shaders.Add(PSO.GraphicsDesc.VertexShader);
+                    bOK &= FShaderCodeLibrary::ContainsShaderCode(PSO.GraphicsDesc.VertexShader);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find VertexShader shader: %s"), *(PSO.GraphicsDesc.VertexShader.ToString()));
+					
+					if (PSO.GraphicsDesc.HullShader != EmptySHA)
+					{
+						Shaders.Add(PSO.GraphicsDesc.HullShader);
+						bOK &= FShaderCodeLibrary::ContainsShaderCode(PSO.GraphicsDesc.HullShader);
+						UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find HullShader shader: %s"), *(PSO.GraphicsDesc.HullShader.ToString()));
+					}
+					if (PSO.GraphicsDesc.DomainShader != EmptySHA)
+					{
+						Shaders.Add(PSO.GraphicsDesc.DomainShader);
+						bOK &= FShaderCodeLibrary::ContainsShaderCode(PSO.GraphicsDesc.DomainShader);
+						UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find DomainShader shader: %s"), *(PSO.GraphicsDesc.DomainShader.ToString()));
+					}
+					if (PSO.GraphicsDesc.FragmentShader != EmptySHA)
+					{
+						Shaders.Add(PSO.GraphicsDesc.FragmentShader);
+						bOK &= FShaderCodeLibrary::ContainsShaderCode(PSO.GraphicsDesc.FragmentShader);
+						UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find FragmentShader shader: %s"), *(PSO.GraphicsDesc.FragmentShader.ToString()));
+					}
+					if (PSO.GraphicsDesc.GeometryShader != EmptySHA)
+					{
+						Shaders.Add(PSO.GraphicsDesc.GeometryShader);
+						bOK &= FShaderCodeLibrary::ContainsShaderCode(PSO.GraphicsDesc.GeometryShader);
+						UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find GeometryShader shader: %s"), *(PSO.GraphicsDesc.GeometryShader.ToString()));
+					}
+				}
+				else
+				{
+					// if we don't have a vertex shader then we won't bother to add any shaders to the list of outstanding shaders to load
+					// Later on this PSO will be killed forever because it is truly bogus.
+					UE_LOG(LogRHI, Error, TEXT("PSO Entry has no vertex shader: %u this is an invalid entry!"), PSORead->Hash);
+					bOK = false;
+				}
+                
+                // If everything is OK then we can issue reads of the actual shader code
+				if (bOK && PSO.GraphicsDesc.VertexShader != FSHAHash())
+				{
+                    bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.GraphicsDesc.VertexShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to read VertexShader shader: %s"), *(PSO.GraphicsDesc.VertexShader.ToString()));
+				}
+		
+				if (bOK && PSO.GraphicsDesc.HullShader != EmptySHA)
+				{
+					bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.GraphicsDesc.HullShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to read HullShader shader: %s"), *(PSO.GraphicsDesc.HullShader.ToString()));
+				}
+		
+				if (bOK && PSO.GraphicsDesc.DomainShader != EmptySHA)
+				{
+					bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.GraphicsDesc.DomainShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to read DomainShader shader: %s"), *(PSO.GraphicsDesc.DomainShader.ToString()));
+				}
+		
+				if (bOK && PSO.GraphicsDesc.FragmentShader != EmptySHA)
+				{
+					bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.GraphicsDesc.FragmentShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to read FragmentShader shader: %s"), *(PSO.GraphicsDesc.FragmentShader.ToString()));
+				}
+		
+				if (bOK && PSO.GraphicsDesc.GeometryShader != EmptySHA)
+				{
+					bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.GraphicsDesc.GeometryShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to read GeometryShader shader: %s"), *(PSO.GraphicsDesc.GeometryShader.ToString()));
+				}
+			}
+			else if (PSO.Type == FPipelineCacheFileFormatPSO::DescriptorType::Compute)
+			{
+				if (PSO.ComputeDesc.ComputeShader != EmptySHA)
+				{
+                    Shaders.Add(PSO.ComputeDesc.ComputeShader);
+					bOK &= FShaderCodeLibrary::RequestShaderCode(PSO.ComputeDesc.ComputeShader, ReadArchive);
+                    UE_CLOG(!bOK, LogRHI, Verbose, TEXT("Failed to find ComputeShader shader: %s"), *(PSO.ComputeDesc.ComputeShader.ToString()));
+				}
+				else
+				{
+					bOK = false;
+					UE_LOG(LogRHI, Error, TEXT("Invalid PSO entry in pipeline cache!"));
+				}
+			}
+			else
+			{
+				bOK = false;
+				UE_LOG(LogRHI, Error, TEXT("Invalid PSO entry in pipeline cache!"));
+			}
+		
+			// Then if and only if all shaders can be found do we schedule a compile job
+			if (bOK)
+			{
+				// Add Async Read task
+				CompileJob AsyncJob;
+				
+				AsyncJob.PSO = PSO;
+				AsyncJob.ReadRequests = ReadArchive;
+				
+				ReadTasks.Add(AsyncJob);
+			
+				delete PSORead;
+			}
+			else if (Shaders.Num())
+			{
+				// Re-add to the OrderedCompile tasks and process later
+                // We can never know when this PSO might become valid so we can't ever drop it.
+				FPipelineCachePSOHeader Hdr;
+				Hdr.Hash = PSORead->Hash;
+				Hdr.Shaders = Shaders;
+				OrderedCompileTasks.Insert(Hdr, 0);
+                FPlatformAtomics::InterlockedDecrement(&TotalActiveTasks);
+                
+                delete PSORead;
+			}
+            else
+            {
+                UE_LOG(LogRHI, Error, TEXT("Invalid PSO entry in pipeline cache: %u!"), PSORead->Hash);
+                
+                // Invalid PSOs can be deleted
+                FPlatformAtomics::InterlockedDecrement(&TotalActiveTasks);
+                
+                delete PSORead;
+            }
+			
+			BatchIterator.RemoveCurrent();
+		}
+        else if (!PSORead->bValid)
+        {
+            UE_LOG(LogRHI, Error, TEXT("Invalid PSO entry in pipeline cache: %u!"), PSORead->Hash);
+            
+            // Invalid PSOs can be deleted
+            FPlatformAtomics::InterlockedDecrement(&TotalActiveTasks);
+            
+            delete PSORead;
+            BatchIterator.RemoveCurrent();
+        }
+	}
+}
+
+bool FShaderPipelineCache::ReadyForPrecompile()
+{
+	for(uint32 i = 0; i < (uint32)ReadTasks.Num(); )
+	{
+		check(ReadTasks[i].ReadRequests);
+		if (ReadTasks[i].ReadRequests->PollExternalReadDependencies())
+		{
+			CompileTasks.Add(ReadTasks[i]);
+			ReadTasks.RemoveAt(i);
+		}
+		else
+		{
+			++i;
+		}
+	}
+	return (CompileTasks.Num() != 0);
+}
+
+void FShaderPipelineCache::PrecompilePipelineBatch()
+{
+	INC_DWORD_STAT(STAT_PreCompileBatchTotal);
+	INC_DWORD_STAT(STAT_PreCompileBatchNum);
+	
+	for(uint32 i = 0; i < (uint32)CompileTasks.Num(); i++)
+	{
+		check(CompileTasks[i].ReadRequests && CompileTasks[i].ReadRequests->PollExternalReadDependencies());
+		Precompile(GRHICommandList.GetImmediateCommandList(), GMaxRHIShaderPlatform, CompileTasks[i].PSO);
+		CompiledHashes.Add(GetTypeHash(CompileTasks[i].PSO));
+#if STATS
+		switch(CompileTasks[i].PSO.Type)
+		{
+			case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+			{
+				INC_DWORD_STAT(STAT_TotalComputePipelineStateCount);
+				break;
+			}
+			case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+			{
+				INC_DWORD_STAT(STAT_TotalGraphicsPipelineStateCount);
+				break;
+			}
+			default:
+			{
+				check(false);
+				break;
+			}
+		}
+#endif
+		delete CompileTasks[i].ReadRequests;
+	}
+	int64 PrecompileCount = CompileTasks.Num();
+    FPlatformAtomics::InterlockedAdd(&TotalActiveTasks, - PrecompileCount);
+	CompileTasks.Empty();
+}
+
+bool FShaderPipelineCache::ReadyForNextBatch() const
+{
+	return ReadTasks.Num() == 0;
+}
+
+bool FShaderPipelineCache::ReadyForAutoSave() const
+{
+	bool bAutoSave = false;
+	uint32 SaveAfterNum = CVarPSOFileCacheSaveAfterPSOsLogged.GetValueOnAnyThread();
+	uint32 NumLogged = FPipelineFileCache::NumPSOsLogged();
+
+	const float TimeSinceSave = FPlatformTime::Seconds() - LastAutoSaveTime;
+
+	// autosave if its enabled, and we have more than the desired number, or it's been a while since our last save
+	if (SaveAfterNum > 0 && 
+			(NumLogged >= SaveAfterNum || (NumLogged > 0 && TimeSinceSave >= CVarPSOFileCacheAutoSaveTime.GetValueOnAnyThread()))
+		)
+	{
+		bAutoSave = true;
+	}
+	return bAutoSave;
+}
+
+void FShaderPipelineCache::PollShutdownItems()
+{
+	int64 RemovedTaskCount = 0;
+	
+	const int64 InitialReadTaskCount = ShutdownReadTasks.Num();
+	if(ShutdownReadTasks.Num() > 0)
+	{
+		for(uint32 i = 0; i < (uint32)ShutdownReadTasks.Num(); )
+		{
+			check(ShutdownReadTasks[i].ReadRequests);
+			if (ShutdownReadTasks[i].ReadRequests->PollExternalReadDependencies())
+			{
+                switch(ShutdownReadTasks[i].PSO.Type)
+                {
+                    case FPipelineCacheFileFormatPSO::DescriptorType::Compute:
+                    {
+                        FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.ComputeDesc.ComputeShader);
+                        break;
+                    }
+                    case FPipelineCacheFileFormatPSO::DescriptorType::Graphics:
+                    {
+                        if (ShutdownReadTasks[i].PSO.GraphicsDesc.VertexShader != FSHAHash())
+                        {
+                            FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.GraphicsDesc.VertexShader);
+                        }
+                        if (ShutdownReadTasks[i].PSO.GraphicsDesc.GeometryShader != FSHAHash())
+                        {
+                            FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.GraphicsDesc.GeometryShader);
+                        }
+                        if (ShutdownReadTasks[i].PSO.GraphicsDesc.HullShader != FSHAHash())
+                        {
+                            FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.GraphicsDesc.HullShader);
+                        }
+                        if (ShutdownReadTasks[i].PSO.GraphicsDesc.DomainShader != FSHAHash())
+                        {
+                            FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.GraphicsDesc.DomainShader);
+                        }
+                        if (ShutdownReadTasks[i].PSO.GraphicsDesc.FragmentShader != FSHAHash())
+                        {
+                            FShaderCodeLibrary::ReleaseShaderCode(ShutdownReadTasks[i].PSO.GraphicsDesc.FragmentShader);
+                        }
+                        break;
+                    }
+                    default:
+                    {
+                        check(false);
+                        break;
+                    }
+                }
+                
+                delete ShutdownReadTasks[i].ReadRequests;
+                
+				ShutdownReadTasks[i] = ShutdownReadTasks.Last();
+				ShutdownReadTasks.Pop(false);
+				
+				++RemovedTaskCount;
+			}
+			else
+			{
+				++i;
+			}
+		}
+		
+		if(ShutdownFetchTasks.Num() == 0)
+		{
+			ShutdownFetchTasks.Shrink();
+		}
+	}
+	
+	if(ShutdownFetchTasks.Num() > 0)
+	{
+		for(uint32 i = 0; i < (uint32)ShutdownFetchTasks.Num(); )
+		{
+			FPipelineCacheFileFormatPSORead* PSORead = ShutdownFetchTasks[i];
+			
+			FShaderPipelineCacheArchive* Archive = (FShaderPipelineCacheArchive*)PSORead->Ar;
+			check(Archive);
+			if ((Archive && Archive->PollExternalReadDependencies()) || PSORead->bReadCompleted)
+			{
+				delete PSORead;
+				ShutdownFetchTasks[i] = ShutdownFetchTasks.Last();
+				ShutdownFetchTasks.Pop(false);
+				
+				++RemovedTaskCount;
+			}
+			else
+			{
+				++i;
+			}
+		}
+		
+		if(ShutdownFetchTasks.Num() == 0)
+		{
+			ShutdownFetchTasks.Shrink();
+		}
+	}
+	
+	if(RemovedTaskCount > 0)
+    {
+        FPlatformAtomics::InterlockedAdd(&TotalActiveTasks, - RemovedTaskCount);
+	}
+}
+
+void FShaderPipelineCache::Flush()
+{
+	FScopeLock Lock(&Mutex);
+	
+	// reset everything
+	// Abandon all the existing work.
+	// This must be done on the render-thread to avoid locks.
+	CompileTasks.Empty();
+	OrderedCompileTasks.Empty();
+	CompiledHashes.Empty();
+	
+	// Marshall the current read tasks into shutdown
+	for(CompileJob& Entry: ReadTasks )
+	{
+		ShutdownReadTasks.Add(Entry);
+	}
+	ReadTasks.Empty();
+	
+	// Marshall the current fetch tasks into shutdown
+	for (FPipelineCacheFileFormatPSORead* Entry : FetchTasks)
+	{
+		check(Entry->ReadRequest.IsValid());
+		Entry->ReadRequest->Cancel();
+		ShutdownFetchTasks.Add(Entry);
+	}
+	FetchTasks.Empty();
+	
+	int64 StartTaskCount = OrderedCompileTasks.Num() + ShutdownReadTasks.Num() + ShutdownFetchTasks.Num();;
+    FPlatformAtomics::InterlockedExchange(&TotalWaitingTasks, 0);
+}
+
+FShaderPipelineCache::FShaderPipelineCache(EShaderPlatform Platform)
+: FTickableObjectRenderThread(true, false) // (RegisterNow, HighFrequency)
+, BatchSize(0)
+, bPaused(false)
+, TotalActiveTasks(0)
+, TotalWaitingTasks(0)
+, TotalCompleteTasks(0)
+, TotalPrecompileTime(0)
+, LastAutoSaveTime(0)
+, LastAutoSaveTimeLogBoundPSO(0)
+, LastAutoSaveNum(-1)
+{
+	SET_DWORD_STAT(STAT_ShaderPipelineTaskCount, 0);
+    SET_DWORD_STAT(STAT_ShaderPipelineWaitingTaskCount, 0);
+    SET_DWORD_STAT(STAT_ShaderPipelineActiveTaskCount, 0);
+	
+	BatchSize = CVarPSOFileCacheBatchSize.GetValueOnAnyThread();
+	
+	FCoreDelegates::ApplicationWillDeactivateDelegate.AddStatic(&PipelineStateCacheOnAppDeactivate);
+	
+	bool bFileOpen = false;
+	if(GConfig)
+	{
+		FString LastOpenedName;
+		if ((GConfig->GetString(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::LastOpenedKey, LastOpenedName, *GGameUserSettingsIni) || GConfig->GetString(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::LastOpenedKey, LastOpenedName, *GGameIni)) && LastOpenedName.Len())
+		{
+			bFileOpen = Open(LastOpenedName, Platform);
+		}
+	}
+	
+	if(!bFileOpen)
+	{
+		Open(FApp::GetProjectName(), Platform);
+	}
+}
+
+FShaderPipelineCache::~FShaderPipelineCache()
+{
+	if (GetShaderPipelineCacheSaveBoundPSOLog())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::BoundPSOsOnly);
+	}
+	if (GetPSOFileCacheSaveUserCache())
+	{
+		FShaderPipelineCache::SavePipelineFileCache(FPipelineFileCache::SaveMode::Incremental);
+	}
+	
+	Close();
+	
+	// The render thread tick should be dead now and we are safe to destroy everything that needs to wait or manual destruction
+
+	for(CompileJob& Entry: ReadTasks )
+	{
+		check(Entry.ReadRequests);
+		Entry.ReadRequests->BlockingWaitComplete();
+	}
+	
+	for(CompileJob& Entry: ShutdownReadTasks )
+	{
+		check(Entry.ReadRequests);
+		Entry.ReadRequests->BlockingWaitComplete();
+	}
+	
+	for (FPipelineCacheFileFormatPSORead* Entry : FetchTasks)
+	{
+		if(Entry->ReadRequest.IsValid())
+		{
+			Entry->ReadRequest->WaitCompletion(0.0);
+		}
+		delete Entry;
+	}
+	
+	for (FPipelineCacheFileFormatPSORead* Entry : ShutdownFetchTasks)
+	{
+		if(Entry->ReadRequest.IsValid())
+		{
+			Entry->ReadRequest->WaitCompletion(0.0);
+		}
+		delete Entry;
+	}	
+}
+
+bool FShaderPipelineCache::IsTickable() const
+{
+	return FPlatformProperties::RequiresCookedData() && !bPaused &&
+		(FPlatformAtomics::AtomicRead(&TotalActiveTasks) != 0 ||
+			FPlatformAtomics::AtomicRead(&TotalWaitingTasks) != 0 ||
+			FPlatformAtomics::AtomicRead(&TotalCompleteTasks) != 0 ||
+			ReadyForAutoSave()||
+			GetShaderPipelineCacheSaveBoundPSOLog());
+}
+
+void FShaderPipelineCache::Tick( float DeltaTime )
+{
+	FScopeLock Lock(&Mutex);
+    
+    if (FPlatformAtomics::AtomicRead(&TotalWaitingTasks) == 0 && FPlatformAtomics::AtomicRead(&TotalActiveTasks) == 0 && FPlatformAtomics::AtomicRead(&TotalCompleteTasks) != 0)
+    {
+        UE_LOG(LogRHI, Warning, TEXT("FShaderPipelineCache completed %u tasks in %.8f seconds."), (uint32)TotalCompleteTasks, FPlatformTime::ToSeconds64(TotalPrecompileTime));
+        if (OnPrecompilationComplete.IsBound())
+        {
+            OnPrecompilationComplete.Broadcast((uint32)TotalCompleteTasks, FPlatformTime::ToSeconds64(TotalPrecompileTime));
+        }
+        FPlatformAtomics::InterlockedExchange(&TotalCompleteTasks, 0);
+        FPlatformAtomics::InterlockedExchange(&TotalPrecompileTime, 0);
+    }
+	
+	if (ReadyForAutoSave())
+	{
+		if (GetPSOFileCacheSaveUserCache())
+		{
+			Save(FPipelineFileCache::SaveMode::Incremental);
+		}
+	}
+	if (GetShaderPipelineCacheSaveBoundPSOLog())
+	{
+		if (LastAutoSaveNum < int32(FPipelineFileCache::NumPSOsLogged()))
+		{
+			const float TimeSinceSave = FPlatformTime::Seconds() - LastAutoSaveTimeLogBoundPSO;
+
+			if (TimeSinceSave >= CVarPSOFileCacheAutoSaveTimeBoundPSO.GetValueOnAnyThread())
+			{
+				Save(FPipelineFileCache::SaveMode::BoundPSOsOnly);
+				LastAutoSaveTimeLogBoundPSO = FPlatformTime::Seconds();
+				LastAutoSaveNum = FPipelineFileCache::NumPSOsLogged();
+			}
+		}
+	}
+
+	PollShutdownItems();
+	
+	// Copy any new items over to our 'internal' safe array
+	if (PreFetchedTasks.Num())
+	{
+		OrderedCompileTasks = PreFetchedTasks;
+		PreFetchedTasks.Empty();
+	}
+	
+	if (ReadyForPrecompile())
+	{
+		SCOPE_SECONDS_ACCUMULATOR(STAT_PreCompileTotalTime);
+		SCOPE_CYCLE_COUNTER(STAT_PreCompileTime);
+		
+		PrecompilePipelineBatch();
+	}
+	
+	if (ReadyForNextBatch() && (OrderedCompileTasks.Num() || FetchTasks.Num()))
+	{
+        uint32 Num = 0;
+        if (BatchSize > static_cast<uint32>(FetchTasks.Num()))
+        {
+            Num = BatchSize - FetchTasks.Num();
+        }
+        Num = FMath::Min(Num, (uint32)OrderedCompileTasks.Num());
+            
+		if (FetchTasks.Num() < (int32)Num)
+		{
+			TArray<FPipelineCacheFileFormatPSORead*> NewBatch;
+		
+			Num -= FetchTasks.Num();
+            for (auto Iterator = OrderedCompileTasks.CreateIterator(); Iterator && Num > 0; ++Iterator)
+            {
+                bool bHasShaders = true;
+                for (FSHAHash const& Hash : Iterator->Shaders)
+                {
+                    bHasShaders &= FShaderCodeLibrary::ContainsShaderCode(Hash);
+                }
+            	if (bHasShaders)
+            	{
+            		FPipelineCacheFileFormatPSORead* Entry = new FPipelineCacheFileFormatPSORead;
+					Entry->Hash = Iterator->Hash;
+					Entry->Ar = new FShaderPipelineCacheArchive;
+					NewBatch.Add(Entry);
+	            	Iterator.RemoveCurrent();
+                    FPlatformAtomics::InterlockedIncrement(&TotalActiveTasks);
+                    FPlatformAtomics::InterlockedDecrement(&TotalWaitingTasks);
+                    --Num;
+            	}
+            }
+			
+			FPipelineFileCache::FetchPSODescriptors(NewBatch);
+			
+			FetchTasks.Append(NewBatch);
+		}		
+		
+        if (FetchTasks.Num() > CVarPSOFileCacheBatchSize.GetValueOnAnyThread())
+        {
+            UE_LOG(LogRHI, Warning, TEXT("FSahderPipelineCache: Attempting to pre-compile more jobs (%d) than the batch size (%d)"), FetchTasks.Num(), CVarPSOFileCacheBatchSize.GetValueOnAnyThread());
+        }
+        
+		PreparePipelineBatch(FetchTasks);
+	}
+	
+#if STATS
+	int64 ActiveTaskCount = FMath::Max((int64)0, FPlatformAtomics::AtomicRead(&TotalActiveTasks));
+    int64 WaitingTaskCount = FMath::Max((int64)0, FPlatformAtomics::AtomicRead(&TotalWaitingTasks));
+	SET_DWORD_STAT(STAT_ShaderPipelineTaskCount, ActiveTaskCount+WaitingTaskCount);
+    SET_DWORD_STAT(STAT_ShaderPipelineWaitingTaskCount, WaitingTaskCount);
+    SET_DWORD_STAT(STAT_ShaderPipelineActiveTaskCount, ActiveTaskCount);
+	
+	// Calc in one place otherwise this computation will be splattered all over the place - this will not be exact but counts the expensive bits
+	int64 InUseMemory = OrderedCompileTasks.GetAllocatedSize() + 
+						CompiledHashes.GetAllocatedSize() + 
+						ReadTasks.GetAllocatedSize() + 
+						CompileTasks.GetAllocatedSize() + 
+						ShutdownReadTasks.GetAllocatedSize() +
+						FetchTasks.GetAllocatedSize() +
+						ShutdownFetchTasks.GetAllocatedSize();
+	if(ActiveTaskCount+WaitingTaskCount > 0)
+	{
+		InUseMemory += (ReadTasks.Num() + CompileTasks.Num() + ShutdownReadTasks.Num()) * (sizeof(FShaderPipelineCacheArchive));
+		InUseMemory += (FetchTasks.Num() + ShutdownFetchTasks.Num()) * (sizeof(FPipelineCacheFileFormatPSORead));
+		for(int32 i = 0;i < FetchTasks.Num();++i)
+		{
+			InUseMemory += FetchTasks[i]->Data.Num();
+		}
+		for(int32 i = 0;i < ShutdownFetchTasks.Num();++i)
+		{
+			InUseMemory += ShutdownFetchTasks[i]->Data.Num();
+		}
+	}
+	SET_MEMORY_STAT(STAT_PreCompileMemory, InUseMemory);
+#endif
+}
+
+bool FShaderPipelineCache::NeedsRenderingResumedForRenderingThreadTick() const
+{
+	return true;
+}
+
+TStatId FShaderPipelineCache::GetStatId() const
+{
+	RETURN_QUICK_DECLARE_CYCLE_STAT(FShaderPipelineBatchCompiler, STATGROUP_Tickables);
+}
+
+bool FShaderPipelineCache::Open(FString const& Name, EShaderPlatform Platform)
+{
+	FileName = Name;
+    CurrentPlatform = Platform;
+	bool bOK = FPipelineFileCache::OpenPipelineFileCache(Name, Platform);
+	if (bOK)
+	{
+		FScopeLock Lock(&Mutex);
+		
+		Flush();
+
+		int32 Order = (int32)FPipelineFileCache::PSOOrder::Default;
+		
+		if(!GConfig->GetInt(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::SortOrderKey, Order, *GGameUserSettingsIni))
+		{
+			GConfig->GetInt(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::SortOrderKey, Order, *GGameIni);
+		}
+
+		TArray<FPipelineCachePSOHeader> LocalPreFetchedTasks;
+		FPipelineFileCache::GetOrderedPSOHashes(LocalPreFetchedTasks, (FPipelineFileCache::PSOOrder)Order);
+		PreFetchedTasks = LocalPreFetchedTasks;
+
+        // Iterate over all the tasks we haven't yet begun to read data for - these are the 'waiting' tasks
+        int64 Count = 0;
+        for (auto const& Task : PreFetchedTasks)
+        {
+            bool bHasShaders = true;
+            for (FSHAHash const& Hash : Task.Shaders)
+            {
+                bHasShaders &= FShaderCodeLibrary::ContainsShaderCode(Hash);
+            }
+            if (bHasShaders)
+            {
+                Count++;
+            }
+        }
+        
+		FPlatformAtomics::InterlockedAdd(&TotalWaitingTasks, Count);
+        
+        if (OnCachedOpened.IsBound())
+        {
+            OnCachedOpened.Broadcast(Name, Platform, PreFetchedTasks.Num());
+        }
+	}
+
+	UE_CLOG(!bOK, LogRHI, Display, TEXT("Failed to open default shader pipeline cache for %s using shader platform %d."), *Name, (uint32)Platform);
+	
+	bOpened = bOK;
+	
+	return bOK;
+}
+
+bool FShaderPipelineCache::Save(FPipelineFileCache::SaveMode Mode)
+{
+	FScopeLock Lock(&Mutex);
+		
+	bool bOK = FPipelineFileCache::SavePipelineFileCache(FileName, Mode);
+	UE_CLOG(!bOK, LogRHI, Warning, TEXT("Failed to save shader pipeline cache for %s using save mode %d."), *FileName, (uint32)Mode);
+
+	LastAutoSaveTime = FPlatformTime::Seconds();
+
+	return bOK;
+}
+
+void FShaderPipelineCache::Close()
+{
+	FScopeLock Lock(&Mutex);
+		
+	if(GConfig)
+	{
+		GConfig->SetString(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::LastOpenedKey, *FileName, *GGameUserSettingsIni);
+		GConfig->Flush(false, *GGameUserSettingsIni);
+	}
+	
+	// Log all bound PSOs
+	if (GetShaderPipelineCacheSaveBoundPSOLog())
+	{
+		Save(FPipelineFileCache::SaveMode::BoundPSOsOnly);
+	}
+	
+	// Force a fast save, just in case
+	if (GetPSOFileCacheSaveUserCache())
+	{
+		Save(FPipelineFileCache::SaveMode::Incremental);
+	}
+	
+	// Signal flush of outstanding work to allow restarting for a new cache file
+	Flush();
+    
+    if (OnCachedClosed.IsBound())
+    {
+        OnCachedClosed.Broadcast(FileName, CurrentPlatform);
+    }
+	
+	bOpened = false;
+
+	FPipelineFileCache::ClosePipelineFileCache();
+}
+
+void FShaderPipelineCache::OnShaderLibraryStateChanged(ELibraryState State, EShaderPlatform Platform, FString const& Name)
+{
+    FScopeLock Lock(&Mutex);
+	
+	if (State == FShaderPipelineCache::Opened && Name == FApp::GetProjectName() && Platform == CurrentPlatform && !bOpened)
+	{
+		Close();
+		FString LastOpenedName;
+		if ((!GConfig->GetString(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::LastOpenedKey, LastOpenedName, *GGameUserSettingsIni) && !GConfig->GetString(FShaderPipelineCacheConstants::SectionHeading, FShaderPipelineCacheConstants::LastOpenedKey, LastOpenedName, *GGameIni)) && !LastOpenedName.Len())
+		{
+			LastOpenedName = FApp::GetProjectName();
+		}
+		Open(LastOpenedName, Platform);
+	}
+	
+    // Copy any new items over to our 'internal' safe array
+    if (PreFetchedTasks.Num())
+    {
+        OrderedCompileTasks = PreFetchedTasks;
+        PreFetchedTasks.Empty();
+    }
+    
+    // Iterate over all the tasks we haven't yet begun to read data for - these are the 'waiting' tasks
+    int64 Count = 0;
+    for (auto const& Task : OrderedCompileTasks)
+    {
+        bool bHasShaders = true;
+        for (FSHAHash const& Hash : Task.Shaders)
+        {
+            bHasShaders &= FShaderCodeLibrary::ContainsShaderCode(Hash);
+        }
+        if (bHasShaders)
+        {
+            Count++;
+        }
+    }
+    
+    // Set the new waiting count that we can actually process.
+    FPlatformAtomics::InterlockedExchange(&TotalWaitingTasks, Count);
+}
diff --git a/Engine/Source/Runtime/ShaderCore/Private/VertexFactory.cpp b/Engine/Source/Runtime/ShaderCore/Private/VertexFactory.cpp
index e02b4961eb61..13a991d5c1ac 100644
--- a/Engine/Source/Runtime/ShaderCore/Private/VertexFactory.cpp
+++ b/Engine/Source/Runtime/ShaderCore/Private/VertexFactory.cpp
@@ -346,7 +346,7 @@ bool operator<<(FArchive& Ar,FVertexFactoryParameterRef& Ref)
 		Ref.ShaderFrequency = (EShaderFrequency)ShaderFrequencyByte;
 	}
 
-	Ar << Ref.VFHash;
+	Ar << FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.VFHash);
 
 
 	if (Ar.IsLoading())
diff --git a/Engine/Source/Runtime/ShaderCore/Public/Shader.h b/Engine/Source/Runtime/ShaderCore/Public/Shader.h
index f54cc4d78560..2be410e33317 100644
--- a/Engine/Source/Runtime/ShaderCore/Public/Shader.h
+++ b/Engine/Source/Runtime/ShaderCore/Public/Shader.h
@@ -294,6 +294,12 @@ public:
 		UncompressCode(OutCode);
 	}
 
+	/**
+	* Passes back a zeroed out hash to serialize when saving out cooked data.
+	* The goal here is to ensure that source hash changes do not cause widespread binary differences in cooked data, resulting in bloated patch diffs.
+	*/
+	SHADERCORE_API static FSHAHash &FilterShaderSourceHashForSerialization(const FArchive& Ar, FSHAHash &HashToSerialize);
+
 private:
 	// compression functions
 	void UncompressCode(TArray<uint8>& UncompressedCode) const;
@@ -682,6 +688,8 @@ public:
 	inline FShaderType* GetType() const { return Type; }
 	inline int32 GetPermutationId() const { return PermutationId; }
 	inline uint32 GetNumInstructions() const { return Resource->NumInstructions; }
+	inline void SetNumInstructions(uint32 Num) { Resource->NumInstructions = Num; }
+
 	inline uint32 GetNumTextureSamplers() const { return Resource->NumTextureSamplers; }
 	inline const TArray<uint8>& GetCode() const { return Resource->Code; }
 	inline const FShaderTarget GetTarget() const { return Target; }
@@ -809,6 +817,8 @@ public:
 		SerializedResource = nullptr;
 	}
 
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform, const struct FStableShaderKeyAndValue& SaveKeyVal);
 
 protected:
 
@@ -1058,6 +1068,9 @@ public:
 		(*GetStreamOutElementsRef)(ElementList, StreamStrides, RasterizedStream);
 	}
 
+	void DumpDebugInfo();
+	void SaveShaderStableKeys(EShaderPlatform TargetShaderPlatform);
+	void GetShaderStableKeyParts(FStableShaderKeyAndValue& SaveKeyVal);
 private:
 	EShaderTypeForDynamicCast ShaderTypeForDynamicCast;
 	uint32 HashIndex;
@@ -1322,7 +1335,7 @@ public:
 		Ar.UsingCustomVersion(FRenderingObjectVersion::GUID);
 
 		Ar << Ref.ShaderType;
-		Ar << Ref.SourceHash;
+		Ar << FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.SourceHash);
 
 		if (Ar.CustomVer(FRenderingObjectVersion::GUID) >= FRenderingObjectVersion::ShaderPermutationId)
 		{
@@ -1355,7 +1368,7 @@ public:
 	friend FArchive& operator<<(FArchive& Ar, class FShaderPipelineTypeDependency& Ref)
 	{
 		Ar << Ref.ShaderPipelineType;
-		Ar << Ref.StagesSourceHash;
+		Ar << FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.StagesSourceHash);
 		return Ar;
 	}
 
@@ -1664,6 +1677,19 @@ public:
 		}
 	}
 
+	/** Builds a list of the shaders in a shader map. Key is FShaderType::TypeName */
+	void GetShaderList(TMap<FName, FShader*>& OutShaders) const
+	{
+		check(bHasBeenRegistered);
+		for (TMap<FShaderPrimaryKey, TRefCountPtr<FShader> >::TConstIterator ShaderIt(Shaders); ShaderIt; ++ShaderIt)
+		{
+			if (ShaderIt.Value())
+			{
+				OutShaders.Add(ShaderIt.Value()->GetType()->GetFName(), ShaderIt.Value());
+			}
+		}
+	}
+
 	/** Builds a list of the shader pipelines in a shader map. */
 	void GetShaderPipelineList(TArray<FShaderPipeline*>& OutShaderPipelines, FShaderPipeline::EFilter Filter) const
 	{
diff --git a/Engine/Source/Runtime/ShaderCore/Public/ShaderCodeLibrary.h b/Engine/Source/Runtime/ShaderCore/Public/ShaderCodeLibrary.h
index 8827c177f727..f9f55b636bda 100644
--- a/Engine/Source/Runtime/ShaderCore/Public/ShaderCodeLibrary.h
+++ b/Engine/Source/Runtime/ShaderCore/Public/ShaderCodeLibrary.h
@@ -48,10 +48,74 @@ struct SHADERCORE_API FShaderCodeLibraryPipeline
 	}
 };
 
+struct SHADERCORE_API FCompactFullName
+{
+	TArray<FName> ObjectClassAndPath;
+
+	bool operator==(const FCompactFullName& Other) const
+	{
+		return ObjectClassAndPath == Other.ObjectClassAndPath;
+	}
+
+	FString ToString() const;
+	void ParseFromString(const FString& Src);
+	friend SHADERCORE_API uint32 GetTypeHash(const FCompactFullName& A);
+};
+
+
+struct SHADERCORE_API FStableShaderKeyAndValue
+{
+	FCompactFullName ClassNameAndObjectPath;
+	FName ShaderType;
+	FName ShaderClass;
+	FName MaterialDomain;
+	FName FeatureLevel;
+	FName QualityLevel;
+	FName TargetFrequency;
+	FName TargetPlatform;
+	FName VFType;
+	FName PermutationId;
+
+	uint32 KeyHash;
+
+	FSHAHash OutputHash;
+
+	FStableShaderKeyAndValue()
+		: KeyHash(0)
+	{
+	}
+
+	void ComputeKeyHash();
+	void ParseFromString(const FString& Src);
+	FString ToString() const;
+	static FString HeaderLine();
+
+	friend bool operator ==(const FStableShaderKeyAndValue& A, const FStableShaderKeyAndValue& B)
+	{
+		return
+			A.ClassNameAndObjectPath == B.ClassNameAndObjectPath &&
+			A.ShaderType == B.ShaderType &&
+			A.ShaderClass == B.ShaderClass &&
+			A.MaterialDomain == B.MaterialDomain &&
+			A.FeatureLevel == B.FeatureLevel &&
+			A.QualityLevel == B.QualityLevel &&
+			A.TargetFrequency == B.TargetFrequency &&
+			A.TargetPlatform == B.TargetPlatform &&
+			A.VFType == B.VFType &&
+			A.PermutationId == B.PermutationId;
+	}
+
+	friend uint32 GetTypeHash(const FStableShaderKeyAndValue &Key)
+	{
+		return Key.KeyHash;
+	}
+
+};
+
 class FShaderFactoryInterface : public FRHIShaderLibrary
 {
 public:
-	FShaderFactoryInterface(EShaderPlatform InPlatform) : FRHIShaderLibrary(InPlatform) {}
+	FShaderFactoryInterface(EShaderPlatform InPlatform, FString const& Name) : FRHIShaderLibrary(InPlatform, Name) {}
 	
 	virtual bool IsNativeLibrary() const override final {return false;}
 	
@@ -69,14 +133,19 @@ public:
 struct SHADERCORE_API FShaderCodeLibrary
 {
 	static void InitForRuntime(EShaderPlatform ShaderPlatform);
-	static void InitForCooking(bool bNativeFormat);
 	static void Shutdown();
 	
-	// At cook time, add shader code to collection
-	static bool AddShaderCode(EShaderPlatform ShaderPlatform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize);
+	static bool IsEnabled();
 	
-	// At cook time, add shader pipeline to collection
-	static bool AddShaderPipeline(FShaderPipeline* Pipeline);
+	// Open a named library.
+	// For cooking this will place all added shaders & pipelines into the library file with this name.
+	// At runtime this will open the shader library with this name.
+	static void OpenLibrary(FString const& Name, FString const& Directory);
+    
+	// Close a named library.
+	// For cooking, after this point any AddShaderCode/AddShaderPipeline calls will be invalid until OpenLibrary is called again.
+	// At runtime this will release the library data and further requests for shaders from this library will fail.
+	static void CloseLibrary(FString const& Name);
 	
 	/** Instantiate or retrieve a vertex shader from the cache for the provided code & hash. */
 	static FVertexShaderRHIRef CreateVertexShader(EShaderPlatform Platform, FSHAHash Hash, TArray<uint8> const& Code);
@@ -93,6 +162,8 @@ struct SHADERCORE_API FShaderCodeLibrary
 	/** Instantiate or retrieve a compute shader from the cache for the provided code & hash. */
 	static FComputeShaderRHIRef CreateComputeShader(EShaderPlatform Platform, FSHAHash Hash, TArray<uint8> const& Code);
 
+    static bool ContainsShaderCode(const FSHAHash& Hash);
+    
 	// Place a request to preload shader code
 	// Blocking call if no Archive is provided or Archive is not a type of FLinkerLoad
 	// Shader code preload will be finished before owning UObject PostLoad call
@@ -116,11 +187,35 @@ struct SHADERCORE_API FShaderCodeLibrary
 	static TSet<FShaderCodeLibraryPipeline> const* GetShaderPipelines(EShaderPlatform Platform);
 
 #if WITH_EDITOR
-	// Save collected shader code to a file for each specified shader platform
-	static bool SaveShaderCode(const FString& OutputDir, const FString& DebugOutputDir, const TArray<FName>& ShaderFormats);
+	// Initialize the library cooker
+	static void InitForCooking(bool bNativeFormat);
 	
-	// Package the separate shader bytecode files into a single native shader library.
-	static bool PackageNativeShaderLibrary(const FString& ShaderCodeDir, const FString& DebugShaderCodeDir, const TArray<FName>& ShaderFormats);
+	// Clean the cook directories
+	static void CleanDirectories(TArray<FName> const& ShaderFormats);
+    
+    // Specify the shader formats to cook
+    static void CookShaderFormats(TArray<FName> const& ShaderFormats);
+	
+	// At cook time, add shader code to collection
+	static bool AddShaderCode(EShaderPlatform ShaderPlatform, EShaderFrequency Frequency, const FSHAHash& Hash, const TArray<uint8>& InCode, uint32 const UncompressedSize);
+
+	// We check this early in the callstack to avoid creating a bunch of FName and keys and things we will never save anyway
+	static bool NeedsShaderStableKeys();
+
+	// At cook time, add the human readable key value information
+	static void AddShaderStableKeyValue(EShaderPlatform ShaderPlatform, FStableShaderKeyAndValue& StableKeyValue);
+
+	// At cook time, add shader pipeline to collection
+	static bool AddShaderPipeline(FShaderPipeline* Pipeline);
+	
+	// Save collected shader code to a file for each specified shader platform, collating all child cooker results.
+	static bool SaveShaderCodeMaster(const FString& OutputDir, const FString& MetaOutputDir, const TArray<FName>& ShaderFormats, FString& OutSCLCSVPath);
+	
+	// Save collected shader code to a file for each specified shader platform, handles only this instances intermediate results.
+	static bool SaveShaderCodeChild(const FString& OutputDir, const FString& MetaOutputDir, const TArray<FName>& ShaderFormats);
+	
+	// Package the separate shader bytecode files into a single native shader library. Must be called by the master process.
+	static bool PackageNativeShaderLibrary(const FString& ShaderCodeDir, const TArray<FName>& ShaderFormats);
 	
 	// Dump collected stats for each shader platform
 	static void DumpShaderCodeStats();
diff --git a/Engine/Source/Runtime/ShaderCore/Public/ShaderCore.h b/Engine/Source/Runtime/ShaderCore/Public/ShaderCore.h
index 397773a2c086..c44b1bba1dd6 100644
--- a/Engine/Source/Runtime/ShaderCore/Public/ShaderCore.h
+++ b/Engine/Source/Runtime/ShaderCore/Public/ShaderCore.h
@@ -356,6 +356,19 @@ inline FArchive& operator<<(FArchive& Ar, FResourceTableEntry& Entry)
 	return Ar;
 }
 
+/** Additional compilation settings that can be configured by each FMaterial instance before compilation */
+struct FExtraShaderCompilerSettings
+{
+	bool bExtractShaderSource = false;
+	FString OfflineCompilerPath;
+
+	friend FArchive& operator<<(FArchive& Ar, FExtraShaderCompilerSettings& StatsSettings)
+	{
+		// Note: this serialize is used to pass between UE4 and the shader compile worker, recompile both when modifying
+		return Ar << StatsSettings.bExtractShaderSource << StatsSettings.OfflineCompilerPath;
+	}
+};
+
 /** The environment used to compile a shader. */
 struct FShaderCompilerEnvironment : public FRefCountedObject
 {
@@ -485,6 +498,10 @@ struct FShaderCompilerInput
 	FShaderCompilerEnvironment Environment;
 	TRefCountPtr<FShaderCompilerEnvironment> SharedEnvironment;
 
+	// Additional compilation settings that can be filled by FMaterial::SetupExtaCompilationSettings
+	// FMaterial::SetupExtaCompilationSettings is usually called by each (*)MaterialShaderType::BeginCompileShader() function
+	FExtraShaderCompilerSettings ExtraSettings;
+
 	FShaderCompilerInput() :
 		bSkipPreprocessedCache(false),
 		bGenerateDirectCompileFile(false),
@@ -598,6 +615,7 @@ struct FShaderCompilerInput
 		Ar << Input.DumpDebugInfoPath;
 		Ar << Input.DebugGroupName;
 		Ar << Input.Environment;
+		Ar << Input.ExtraSettings;
 
 		// Note: skipping Input.SharedEnvironment, which is handled by FShaderCompileUtilities::DoWriteTasks in order to maintain sharing
 
@@ -933,6 +951,8 @@ struct FShaderCompilerOutput
 	bool bSupportsQueryingUsedAttributes;
 	TArray<FString> UsedAttributes;
 
+	FString OptionalFinalShaderSource;
+
 	/** Generates OutputHash from the compiler output. */
 	SHADERCORE_API void GenerateOutputHash();
 
@@ -941,6 +961,8 @@ struct FShaderCompilerOutput
 		// Note: this serialize is used to pass between UE4 and the shader compile worker, recompile both when modifying
 		Ar << Output.ParameterMap << Output.Errors << Output.Target << Output.ShaderCode << Output.NumInstructions << Output.NumTextureSamplers << Output.bSucceeded;
 		Ar << Output.bFailedRemovingUnused << Output.bSupportsQueryingUsedAttributes << Output.UsedAttributes;
+		Ar << Output.OptionalFinalShaderSource;
+
 		return Ar;
 	}
 };
diff --git a/Engine/Source/Runtime/ShaderCore/Public/ShaderPipelineCache.h b/Engine/Source/Runtime/ShaderCore/Public/ShaderPipelineCache.h
new file mode 100644
index 000000000000..2b82c564ce57
--- /dev/null
+++ b/Engine/Source/Runtime/ShaderCore/Public/ShaderPipelineCache.h
@@ -0,0 +1,213 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+/**
+ * Shader Pipeline Precompilation Cache
+ * Precompilation half of the shader pipeline cache, which builds on the runtime RHI pipeline cache.
+ */
+ 
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Stats/Stats.h"
+#include "RHI.h"
+#include "TickableObjectRenderThread.h"
+#include "PipelineFileCache.h"
+#include "Delegates/DelegateCombinations.h"
+
+class FShaderPipelineCacheArchive;
+
+/**
+ * FShaderPipelineCache:
+ * The FShaderPipelineCache provides the new Pipeline State Object (PSO) logging, serialisation & precompilation mechanism that replaces FShaderCache.
+ * Caching Pipeline State Objects and serialising the initialisers to disk allows for precompilation of these states the next time the game is run, which reduces hitching.
+ * To achieve this FShaderPipelineCache relies upon FShaderCodeLibrary & "Share Material Shader Code" and the RHI-level backend FPipelineFileCache.
+ *
+ * Basic Runtime Usage:
+ * - Enable the cache with r.ShaderPipelineCache.Enabled = 1, which allows the pipeline cache to load existing data from disk and precompile it.
+ * - Set the default batch size with r.ShaderPipelineCache.BatchSize = X, where X is the maximum number of PSOs to compile in a single batch when precompiling in the default Fast BatchMode.
+ * - Set the background batch size with r.ShaderPipelineCache.BackgroundBatchSize = X, where X is the maximum number of PSOs to compile when in the Background BatchMode.
+ * - Instrument the game code to call FShaderPipelineCache::SetBatchMode to switch the batch mode between Fast & Background modes.
+ * - BatchMode::Fast should be used when a loading screen or movie is being displayed to allow more PSOs to be compiled whereas Background should be used behind interactive menus.
+ * - If required call NumPrecompilesRemaining to determine the total number of outstanding PSOs to compile and keep the loading screen or movie visible until complete.
+ * - Depending on the game & target platform performance it may also be required to call PauseBatching to suspend precompilation during gameplay and then ResumeBatching when behind a loading screen, menu or movie to restart precompilation.
+ *
+ * Other Runtime Options:
+ * - In the GGameIni (and thus also GGameUserSettingsIni) the Shader Pipeline Cache uses the [ShaderPipelineCache.CacheFile] section to store some settings.
+ * - The LastOpened setting stores the name of the last opened cache file as specified with Open, which if present will be used within FShaderPipelineCache::Initialize to open the existing cache.
+ *   If not specified this will default to the AppName.
+ * - The SortMode settings stores the desired sort mode for the PSOs, which is one of:
+ *		+ Default: Loaded in the order specified in the file.
+ *		+ FirstToLatestUsed: Start with the PSOs with the lowest first-frame used and work toward those with the highest.
+ *		+ MostToLeastUsed: Start with the most often used PSOs working toward the least.
+ *   Will use "Default" within FShaderPipelineCache::Initialize & OpenPipelineFileCache if nothing is specified.
+ * - The GameVersionKey is a read-only integer specified in the GGameIni that specifies the game content version to disambiguate incompatible versions of the game content. By default this is taken from the FEngineVersion changlist.
+ *
+ * Logging Usage:
+ * - Enable the cache with r.ShaderPipelineCache.Enabled = 1 and also turn on runtime logging with r.ShaderPipelineCache.LogPSO = 1.
+ * - Ensure that you have configured the game to open the appropriate cache on startup (see above) and allow the game to play.
+ * - PSOs are logged as they are encountered as the Unreal Engine does not provide facility to cook them offline, so this system will only collect PSOs which are actually used to render.
+ * - As such you must either manually play through the game to collect logs or automate the process which is beyond the scope of this code.
+ * - The data can be saved at any time by calling FShaderPipelineCache::SavePipelineFileCache and this can happen automatically after a given number of PSOs by setting r.ShaderPipelineCache.SaveAfterPSOsLogged = X where X is the desired number of PSOs to log before saving (0 will disable auto-save).
+ * - Log files are shader platform specific to reduce overheads.
+ *
+ * Notes:
+ * - The open cache file can be changed by closing the existing file with ClosePipelineFileCache (which implicitly Fast saves) and then opening a new one with OpenPipelineFileCache.
+ * - Different files can be used to minimise PSO compilation by having a file per-scalability bucket (i.e. one file for Low, one for Med, one for High).
+ * - When logging if you switch files only new entries from after the switch will be logged, which means you will miss any PSOs that should have been logged prior to switching. This prevents polluting the cache with unexpected entries.
+ * - The UnrealEd.MergeShaderPipelineCaches command-let can be used to merge cache files with the same file-version, shader platform and game-version.
+ *
+ * File Locations & Packaging:
+ * - The writable cache file is always stored in the User Saved directory.
+ * - The game can also provide an immutable copy within its Game Content directory which will be used as the initial or seed data.
+ * - Having generated logs in development and merged them with UnrealEd.MergeShaderPipelineCaches they should be packaged inside the Gane Content directory for the relevant platform.
+ *
+ * Requirements:
+ * - FShaderCodeLibrary must be enabled via Project Settings > Packaging > "Share Material Shader Code".
+ * - Enabling "Native Shader Libraries" is optional, but strongly preferred for Metal.
+ */
+class SHADERCORE_API FShaderPipelineCache : public FTickableObjectRenderThread
+{
+	struct CompileJob
+	{
+		FPipelineCacheFileFormatPSO PSO;
+		FShaderPipelineCacheArchive* ReadRequests;
+	};
+
+public:
+	/**
+	 * Initializes the shader pipeline cache for the desired platform, called by the engine.
+	 * The shader platform is used only to load the initial pipeline cache and can be changed by closing & reopening the cache if necessary.
+	 */
+	static void Initialize(EShaderPlatform Platform);
+	/** Terminates the shader pipeline cache, called by the engine. */
+	static void Shutdown();
+	
+	/** Pauses precompilation. */
+	static void PauseBatching();
+	
+	enum class BatchMode
+	{
+		Background, // The maximum batch size is defined by r.ShaderPipelineCache.BackgroundBatchSize
+		Fast // The maximum batch size is defined by r.ShaderPipelineCache.BatchSize
+	};
+	
+	/** Sets the precompilation batching mode. */
+	static void SetBatchMode(BatchMode Mode);
+	
+	/** Resumes precompilation batching. */
+	static void ResumeBatching();
+	
+	/** Returns the number of pipelines waiting for precompilation. */
+	static uint32 NumPrecompilesRemaining();
+    
+    /** Returns the number of pipelines actively being precompiled this frame. */
+    static uint32 NumPrecompilesActive();
+
+	/** Opens the shader pipeline cache file with the given name and shader platform. */
+	static bool OpenPipelineFileCache(FString const& Name, EShaderPlatform Platform);
+	
+	/** Saves the current shader pipeline cache to disk using one of the defined save modes, Fast uses an incremental approach whereas Slow will consolidate all data into the file. */
+	static bool SavePipelineFileCache(FPipelineFileCache::SaveMode Mode);
+	
+	/** Closes the existing pipeline cache, allowing it to be reopened with a different file and/or shader platform. Will implicitly invoke a Fast Save. */
+	static void ClosePipelineFileCache();
+
+	static int32 GetGameVersionForPSOFileCache();
+
+	FShaderPipelineCache(EShaderPlatform Platform);
+	virtual ~FShaderPipelineCache();
+
+	virtual bool IsTickable() const override final;
+	
+	virtual void Tick( float DeltaTime ) override final;
+	
+	virtual bool NeedsRenderingResumedForRenderingThreadTick() const override final;
+	
+	virtual TStatId GetStatId() const override final;
+	
+	enum ELibraryState
+	{
+		Opened,
+		Closed
+	};
+	
+    /** Called by FShaderCodeLibrary to notify us that the shader code library state changed and shader availability will need to be re-evaluated */
+    static void ShaderLibraryStateChanged(ELibraryState State, EShaderPlatform Platform, FString const& Name);
+    
+    /**
+     * Delegate signature for being notified when a pipeline cache is opened
+     */
+    DECLARE_MULTICAST_DELEGATE_ThreeParams(FShaderCacheOpenedDelegate, FString const& /* Name */, EShaderPlatform /* Platform*/, uint32 /* Count */ );
+    
+    /**
+     * Gets the event delegate to register to to be notified when a pipeline cache is opened.
+     */
+    static FShaderCacheOpenedDelegate& GetCacheOpenedDelegate() { return OnCachedOpened; }
+    
+    /**
+     * Delegate signature for being notified when a pipeline cache is closed
+     */
+    DECLARE_MULTICAST_DELEGATE_TwoParams(FShaderCacheClosedDelegate, FString const& /* Name */, EShaderPlatform /* Platform*/ );
+    
+    /**
+     * Gets the event delegate to register to to be notified when a pipeline cache is closed.
+     */
+    static FShaderCacheClosedDelegate& GetCacheClosedDelegate() { return OnCachedClosed; }
+    
+    /**
+     * Delegate signature for being notified that all currently viable PSOs have been precompiled from the cache, how many that was and how long spent precompiling (in sec.)
+     */
+    DECLARE_MULTICAST_DELEGATE_TwoParams(FShaderPrecompilationCompleteDelegate, uint32 /** Count */, double /** Seconds */);
+    
+    /**
+     * Gets the event delegate to register to to be notified when all currently viable PSOs have been precompiled from the cache.
+     */
+    static FShaderPrecompilationCompleteDelegate& GetPrecompilationCompleteDelegate() { return OnPrecompilationComplete; }
+
+private:
+	bool Open(FString const& Name, EShaderPlatform Platform);
+	bool Save(FPipelineFileCache::SaveMode Mode);
+	void Close();
+
+	bool Precompile(FRHICommandListImmediate& RHICmdList, EShaderPlatform Platform, FPipelineCacheFileFormatPSO const& PSO);
+	void PreparePipelineBatch(TArray<FPipelineCacheFileFormatPSORead*>& PipelineBatch);
+	bool ReadyForPrecompile();
+	void PrecompilePipelineBatch();
+	bool ReadyForNextBatch() const;
+	bool ReadyForAutoSave() const;
+	void PollShutdownItems();
+	void Flush();
+    
+    void OnShaderLibraryStateChanged(ELibraryState State, EShaderPlatform Platform, FString const& Name);
+
+private:
+	static FShaderPipelineCache* ShaderPipelineCache;
+	TArray<CompileJob> ReadTasks;
+	TArray<CompileJob> CompileTasks;
+	TArray<FPipelineCachePSOHeader> OrderedCompileTasks;
+	TArray<FPipelineCacheFileFormatPSORead*> FetchTasks;
+	TSet<uint32> CompiledHashes;
+	FString FileName;
+    EShaderPlatform CurrentPlatform;
+	uint32 BatchSize;
+	bool bPaused;
+	bool bOpened;
+	
+    volatile int64 TotalActiveTasks;
+    volatile int64 TotalWaitingTasks;
+    volatile int64 TotalCompleteTasks;
+    volatile int64 TotalPrecompileTime;
+	FCriticalSection Mutex;
+	TArray<FPipelineCachePSOHeader> PreFetchedTasks;
+	
+	TArray<CompileJob> ShutdownReadTasks;
+	TArray<FPipelineCacheFileFormatPSORead*> ShutdownFetchTasks;
+    
+    static FShaderCacheOpenedDelegate OnCachedOpened;
+    static FShaderCacheClosedDelegate OnCachedClosed;
+    static FShaderPrecompilationCompleteDelegate OnPrecompilationComplete;
+
+	double LastAutoSaveTime;
+	double LastAutoSaveTimeLogBoundPSO;
+	int32 LastAutoSaveNum;
+};
diff --git a/Engine/Source/Runtime/ShaderCore/Public/VertexFactory.h b/Engine/Source/Runtime/ShaderCore/Public/VertexFactory.h
index e597ee4db92c..0bd6a52a6885 100644
--- a/Engine/Source/Runtime/ShaderCore/Public/VertexFactory.h
+++ b/Engine/Source/Runtime/ShaderCore/Public/VertexFactory.h
@@ -324,7 +324,7 @@ public:
 
 	friend FArchive& operator<<(FArchive& Ar,class FVertexFactoryTypeDependency& Ref)
 	{
-		Ar << Ref.VertexFactoryType << Ref.VFSourceHash;
+		Ar << Ref.VertexFactoryType << FShaderResource::FilterShaderSourceHashForSerialization(Ar, Ref.VFSourceHash);
 		return Ar;
 	}
 
diff --git a/Engine/Source/Runtime/ShaderCore/ShaderCore.Build.cs b/Engine/Source/Runtime/ShaderCore/ShaderCore.Build.cs
index 67f90e806ef6..b4a78bca4a5d 100644
--- a/Engine/Source/Runtime/ShaderCore/ShaderCore.Build.cs
+++ b/Engine/Source/Runtime/ShaderCore/ShaderCore.Build.cs
@@ -10,7 +10,7 @@ public class ShaderCore : ModuleRules
 
         PublicDependencyModuleNames.AddRange(new string[] { "RHI", "RenderCore" });
 
-		PrivateDependencyModuleNames.AddRange(new string[] { "Core" });
+		PrivateDependencyModuleNames.AddRange(new string[] { "Core", "Projects" });
 
 		PrivateIncludePathModuleNames.AddRange(new string[] { "DerivedDataCache", "TargetPlatform" });
 	}
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Application/AnalogCursor.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Application/AnalogCursor.cpp
index 29da391a9440..fb862a1977f5 100644
--- a/Engine/Source/Runtime/Slate/Private/Framework/Application/AnalogCursor.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Application/AnalogCursor.cpp
@@ -140,7 +140,7 @@ bool FAnalogCursor::HandleKeyDownEvent(FSlateApplication& SlateApp, const FKeyEv
 				SlateApp.CursorPointerIndex,
 				SlateApp.GetCursorPos(),
 				SlateApp.GetLastCursorPos(),
-				SlateApp.PressedMouseButtons,
+				SlateApp.GetPressedMouseButtons(),
 				EKeys::LeftMouseButton,
 				0,
 				SlateApp.GetPlatformApplication()->GetModifierKeys()
@@ -177,7 +177,7 @@ bool FAnalogCursor::HandleKeyUpEvent(FSlateApplication& SlateApp, const FKeyEven
 			SlateApp.CursorPointerIndex,
 			SlateApp.GetCursorPos(),
 			SlateApp.GetLastCursorPos(),
-			SlateApp.PressedMouseButtons,
+			SlateApp.GetPressedMouseButtons(),
 			EKeys::LeftMouseButton,
 			0,
 			SlateApp.GetPlatformApplication()->GetModifierKeys()
@@ -283,7 +283,7 @@ void FAnalogCursor::UpdateCursorPosition(FSlateApplication& SlateApp, TSharedRef
 			0,
 			UpdatedPosition,
 			OldPosition,
-			SlateApp.PressedMouseButtons,
+			SlateApp.GetPressedMouseButtons(),
 			EKeys::Invalid,
 			0,
 			SlateApp.GetPlatformApplication()->GetModifierKeys()
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Application/IPlatformTextField.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Application/IPlatformTextField.cpp
new file mode 100644
index 000000000000..04a75d0d8012
--- /dev/null
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Application/IPlatformTextField.cpp
@@ -0,0 +1,90 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Framework/Application/IPlatformTextField.h"
+#include "Misc/ConfigCacheIni.h"
+#include "HAL/Platform.h"
+#include "Internationalization/Culture.h"
+#include "Internationalization/Internationalization.h"
+
+bool IPlatformTextField::ShouldUseVirtualKeyboardAutocorrect(TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget)
+{
+	bool bUseAutocorrect = false;
+
+	if (TextEntryWidget.IsValid() && TextEntryWidget->GetVirtualKeyboardOptions().bEnableAutocorrect)
+	{
+		switch (TextEntryWidget->GetVirtualKeyboardType())
+		{
+		case EKeyboardType::Keyboard_Password:
+			{
+				// Never use autocorrect for password
+				bUseAutocorrect = false;
+			}
+			break;
+
+		case EKeyboardType::Keyboard_Email:
+		case EKeyboardType::Keyboard_Web:
+		case EKeyboardType::Keyboard_Number:
+		case EKeyboardType::Keyboard_AlphaNumeric:
+		case EKeyboardType::Keyboard_Default:
+		default:
+			{
+				// Check to see if autocorrect is turned on in the input settings
+				bUseAutocorrect = GConfig->GetBool(TEXT("/Script/Engine.InputSettings"), TEXT("bUseAutocorrect"), bUseAutocorrect, GInputIni);
+			}
+			break;
+		}
+
+		if (bUseAutocorrect)
+		{
+			static FString PlatformVersion;
+
+			if (PlatformVersion.IsEmpty())
+			{
+				FString OSVersion;
+				FString OSSubVersion;
+
+				FPlatformMisc::GetOSVersions(OSVersion, OSSubVersion);
+
+				PlatformVersion = OSVersion + " " + OSSubVersion;
+			}
+
+			// Match the current platform version (such as "iOS 11.2") against the list of excluded OS versions. If the platform version
+			// starts with an excluded version, disable autocorrect (this is to allow for "iOS 11" to disable autocorrect on all iOS 11 devices,
+			// or for "iOS 11.2.2" to only exclude that version).
+			TArray<FString> ExcludedOSVersions;
+			GConfig->GetArray(TEXT("/Script/Engine.InputSettings"), TEXT("ExcludedAutocorrectOS"), ExcludedOSVersions, GInputIni);
+
+			for (const FString& ExcludedVersion : ExcludedOSVersions)
+			{
+				if (PlatformVersion.StartsWith(ExcludedVersion))
+				{
+					bUseAutocorrect = false;
+					break;
+				}
+			}
+
+			// Get the current culture that the game is running in, and check against INI settings to see if autocorrect should be
+			// disabled for that culture. E.g., specifying a culture such as "en" in the INI will disable autocorrect for all English 
+			// cultures, but specifying "en-CA" will disable autocorrect only for Canadian English.
+			if (bUseAutocorrect && FInternationalization::IsAvailable())
+			{
+				FInternationalization& I18N = FInternationalization::Get();
+				TArray<FString> PrioritizedCultureNames = I18N.GetPrioritizedCultureNames(I18N.GetCurrentCulture()->GetName());
+
+				TArray<FString> ExcludedCultures;
+				GConfig->GetArray(TEXT("/Script/Engine.InputSettings"), TEXT("ExcludedAutocorrectCultures"), ExcludedCultures, GInputIni);
+
+				for (const FString& CultureName : PrioritizedCultureNames)
+				{
+					if (ExcludedCultures.Contains(CultureName))
+					{
+						bUseAutocorrect = false;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return bUseAutocorrect;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Application/NavigationConfig.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Application/NavigationConfig.cpp
index 7fdde59adb87..99af3bc1f741 100644
--- a/Engine/Source/Runtime/Slate/Private/Framework/Application/NavigationConfig.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Application/NavigationConfig.cpp
@@ -32,6 +32,20 @@ FNavigationConfig::~FNavigationConfig()
 {
 }
 
+void FNavigationConfig::OnRegister()
+{
+	UserNavigationState.Reset();
+}
+
+void FNavigationConfig::OnUnregister()
+{
+}
+
+void FNavigationConfig::OnUserRemoved(int32 UserIndex)
+{
+	UserNavigationState.Remove(UserIndex);
+}
+
 EUINavigation FNavigationConfig::GetNavigationDirectionFromKey(const FKeyEvent& InKeyEvent) const
 {
 	if (const EUINavigation* Rule = KeyEventRules.Find(InKeyEvent.GetKey()))
@@ -63,13 +77,14 @@ EUINavigation FNavigationConfig::GetNavigationDirectionFromAnalog(const FAnalogI
 		EUINavigation DesiredNavigation = GetNavigationDirectionFromAnalogInternal(InAnalogEvent);
 		if (DesiredNavigation != EUINavigation::Invalid)
 		{
-			FAnalogNavigationState& State = AnalogNavigationState.FindOrAdd(DesiredNavigation);
+			FUserNavigationState& UserState = UserNavigationState.FindOrAdd(InAnalogEvent.GetUserIndex());
+			FAnalogNavigationState& AnalogState = UserState.AnalogNavigationState.FindOrAdd(DesiredNavigation);
 
-			const float RepeatRate = GetRepeatRateForPressure( FMath::Abs(InAnalogEvent.GetAnalogValue()), FMath::Max(State.Repeats - 1, 0));
-			if (FApp::GetCurrentTime() - State.LastNavigationTime > RepeatRate)
+			const float RepeatRate = GetRepeatRateForPressure( FMath::Abs(InAnalogEvent.GetAnalogValue()), FMath::Max(AnalogState.Repeats - 1, 0));
+			if (FApp::GetCurrentTime() - AnalogState.LastNavigationTime > RepeatRate)
 			{
-				State.LastNavigationTime = FApp::GetCurrentTime();
-				State.Repeats++;
+				AnalogState.LastNavigationTime = FApp::GetCurrentTime();
+				AnalogState.Repeats++;
 				return DesiredNavigation;
 			}
 		}
@@ -82,6 +97,8 @@ EUINavigation FNavigationConfig::GetNavigationDirectionFromAnalogInternal(const
 {
 	if (bAnalogNavigation)
 	{
+		FUserNavigationState& UserState = UserNavigationState.FindOrAdd(InAnalogEvent.GetUserIndex());
+
 		if (InAnalogEvent.GetKey() == AnalogHorizontalKey)
 		{
 			if (InAnalogEvent.GetAnalogValue() < -AnalogNavigationHorizontalThreshold)
@@ -94,8 +111,8 @@ EUINavigation FNavigationConfig::GetNavigationDirectionFromAnalogInternal(const
 			}
 			else
 			{
-				AnalogNavigationState.Add(EUINavigation::Left, FAnalogNavigationState());
-				AnalogNavigationState.Add(EUINavigation::Right, FAnalogNavigationState());
+				UserState.AnalogNavigationState.Add(EUINavigation::Left, FAnalogNavigationState());
+				UserState.AnalogNavigationState.Add(EUINavigation::Right, FAnalogNavigationState());
 			}
 		}
 		else if (InAnalogEvent.GetKey() == AnalogVerticalKey)
@@ -110,8 +127,8 @@ EUINavigation FNavigationConfig::GetNavigationDirectionFromAnalogInternal(const
 			}
 			else
 			{
-				AnalogNavigationState.Add(EUINavigation::Up, FAnalogNavigationState());
-				AnalogNavigationState.Add(EUINavigation::Down, FAnalogNavigationState());
+				UserState.AnalogNavigationState.Add(EUINavigation::Up, FAnalogNavigationState());
+				UserState.AnalogNavigationState.Add(EUINavigation::Down, FAnalogNavigationState());
 			}
 		}
 	}
@@ -121,8 +138,8 @@ EUINavigation FNavigationConfig::GetNavigationDirectionFromAnalogInternal(const
 
 float FNavigationConfig::GetRepeatRateForPressure(float InPressure, int32 InRepeats) const
 {
-	float RepeatRate = (InRepeats == 0) ? 0.5f : 0.25f;
-	if (InPressure > 0.90f && RepeatRate > 0)
+	const float RepeatRate = (InRepeats == 0) ? 0.5f : 0.25f;
+	if (InPressure > 0.90f)
 	{
 		return RepeatRate * 0.5f;
 	}
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp
index 31013ac26697..3c5c38a9b2e6 100644
--- a/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Application/SlateApplication.cpp
@@ -39,7 +39,7 @@
 #include "HAL/LowLevelMemTracker.h"
 #include "ProfilingDebugging/CsvProfiler.h"
 
-#define SLATE_HAS_WIDGET_REFLECTOR !UE_BUILD_SHIPPING || PLATFORM_DESKTOP
+#define SLATE_HAS_WIDGET_REFLECTOR !(UE_BUILD_TEST || UE_BUILD_SHIPPING) && PLATFORM_DESKTOP
 
 #if PLATFORM_WINDOWS
 #include "Windows/WindowsHWrapper.h"
@@ -172,7 +172,7 @@ public:
 		{
 			return FWidgetAndPointer(RoutingPath.Widgets[WidgetIndex], RoutingPath.VirtualPointerPositions[WidgetIndex]);
 		}
-
+		
 		const FWidgetPath& GetRoutingPath() const
 		{
 			return RoutingPath;
@@ -221,7 +221,7 @@ public:
 		{
 			return &RoutingPath;
 		}
-
+	
 	private:
 		int32 WidgetIndex;
 		const FWidgetPath& RoutingPath;
@@ -258,7 +258,7 @@ public:
 		ReplyType Reply = ReplyType::Unhandled();
 		const FWidgetPath& RoutingPath = RoutingPolicy.GetRoutingPath();
 		const FWidgetPath* WidgetsUnderCursor = RoutingPolicy.GetWidgetsUnderCursor();
-
+		
 		EventCopy.SetEventPath( RoutingPath );
 
 		for ( ; !Reply.IsEventHandled() && RoutingPolicy.ShouldKeepGoing(); RoutingPolicy.Next() )
@@ -391,7 +391,8 @@ DECLARE_CYCLE_STAT( TEXT("Total Slate Tick Time"), STAT_SlateTickTime, STATGROUP
 DECLARE_CYCLE_STAT( TEXT("SlatePrepass"), STAT_SlatePrepass, STATGROUP_Slate );
 DECLARE_CYCLE_STAT( TEXT("Draw Window And Children Time"), STAT_SlateDrawWindowTime, STATGROUP_Slate );
 DECLARE_CYCLE_STAT( TEXT("TickRegisteredWidgets"), STAT_SlateTickRegisteredWidgets, STATGROUP_Slate );
-DECLARE_CYCLE_STAT( TEXT("Slate::PreTickEvent"), STAT_SlatePreTickEvent, STATGROUP_Slate );
+DECLARE_CYCLE_STAT( TEXT("PreTickEvent"), STAT_SlatePreTickEvent, STATGROUP_Slate );
+DECLARE_CYCLE_STAT( TEXT("QueryCursor"), STAT_SlateQueryCursor, STATGROUP_Slate);
 
 DECLARE_CYCLE_STAT(TEXT("ShowVirtualKeyboard"), STAT_ShowVirtualKeyboard, STATGROUP_Slate);
 
@@ -427,7 +428,7 @@ SLATE_DECLARE_CYCLE_COUNTER(GSlatePrepassWindowAndChildren, "Prepass Window And
 
 #if LOG_SLATE_EVENTS
 	#define LOG_EVENT_CONTENT( EventType, AdditionalContent, WidgetOrReply ) LogSlateEvent(EventLogger, EventType, AdditionalContent, WidgetOrReply);
-
+	
 	#define LOG_EVENT( EventType, WidgetOrReply ) LOG_EVENT_CONTENT( EventType, FString(), WidgetOrReply )
 	static void LogSlateEvent( const TSharedPtr<IEventLogger>& EventLogger, EEventLog::Type Event, const FString& AdditionalContent, const TSharedPtr<SWidget>& HandlerWidget )
 	{
@@ -446,7 +447,7 @@ SLATE_DECLARE_CYCLE_COUNTER(GSlatePrepassWindowAndChildren, "Prepass Window And
 	}
 #else
 	#define LOG_EVENT_CONTENT( EventType, AdditionalContent, WidgetOrReply )
-
+	
 	#define LOG_EVENT( Event, WidgetOrReply ) CheckReplyCorrectness(WidgetOrReply);
 	static void CheckReplyCorrectness(const TSharedPtr<SWidget>& HandlerWidget)
 	{
@@ -469,7 +470,7 @@ namespace SlateDefs
 
 
 /** True if we should allow throttling based on mouse movement activity.  int32 instead of bool only for console variable system. */
-TAutoConsoleVariable<int32> ThrottleWhenMouseIsMoving(
+TAutoConsoleVariable<int32> ThrottleWhenMouseIsMoving( 
 	TEXT( "Slate.ThrottleWhenMouseIsMoving" ),
 	false,
 	TEXT( "Whether to attempt to increase UI responsiveness based on mouse cursor movement." ) );
@@ -480,12 +481,6 @@ TAutoConsoleVariable<int32> TargetFrameRateForResponsiveness(
 	35,	// Frames per second
 	TEXT( "Minimum sustained average frame rate required before we consider the editor to be \"responsive\" for a smooth UI experience" ) );
 
-/** Whether to skip the second Slate PrePass call (the one right before rendering). */
-TAutoConsoleVariable<int32> SkipSecondPrepass(
-	TEXT("Slate.SkipSecondPrepass"),
-	0,
-	TEXT("Whether to skip the second Slate PrePass call (the one right before rendering)."));
-
 /** Whether Slate should go to sleep when there are no active timers and the user is idle */
 TAutoConsoleVariable<int32> AllowSlateToSleep(
 	TEXT("Slate.AllowSlateToSleep"),
@@ -498,6 +493,20 @@ TAutoConsoleVariable<float> SleepBufferPostInput(
 	0.0f,
 	TEXT("The amount of time that must pass without any user action before Slate is put to sleep (provided that there are no active timers)."));
 
+int32 GEnableSyntheticMouseMoves = 1;
+FAutoConsoleVariableRef CVarEnableSyntheticMouseMoves(
+	TEXT("Slate.EnableSyntheticMouseMoves"),
+	GEnableSyntheticMouseMoves,
+	TEXT("")
+);
+
+int32 GEnableCursorQueries = 1;
+FAutoConsoleVariableRef CVarAllowCursorQueries(
+	TEXT("Slate.EnableCursorQueries"),
+	GEnableCursorQueries,
+	TEXT("")
+);
+
 //////////////////////////////////////////////////////////////////////////
 bool FSlateApplication::MouseCaptorHelper::HasCapture() const
 {
@@ -643,7 +652,7 @@ bool FSlateApplication::MouseCaptorHelper::SetMouseCaptor(uint32 UserIndex, uint
 			// If the target widget wasn't found on the event path then start the search from the root
 			NewMouseCaptorPath = EventPath.GetPathDownTo( EventPath.Widgets[0].Widget );
 			NewMouseCaptorPath.ExtendPathTo( FWidgetMatcher( WidgetRef ) );
-
+			
 			MouseCaptorWeakPath = IsPathToCaptorFound( NewMouseCaptorPath, WidgetRef )
 				? NewMouseCaptorPath
 				: FWeakWidgetPath();
@@ -758,7 +767,8 @@ void FSlateApplication::MouseCaptorHelper::InformCurrentCaptorOfCaptureLoss(uint
 		TSharedPtr< SWidget > SharedWidgetPtr = WeakWidgetPtr.Pin();
 		if ( SharedWidgetPtr.IsValid() )
 		{
-			SharedWidgetPtr->OnMouseCaptureLost();
+			FCaptureLostEvent CaptureLostEvent(UserIndex, PointerIndex);
+			SharedWidgetPtr->OnMouseCaptureLost(CaptureLostEvent);
 		}
 	}
 }
@@ -814,8 +824,8 @@ void FSlateApplication::FDragDetector::OnPointerRelease(const FPointerEvent& Poi
 
 	if ( DetectionState )
 	{
-		if ( DetectionState->DetectDragButton == PointerEvent.GetEffectingButton() &&
-			 DetectionState->DetectDragUserIndex == PointerEvent.GetUserIndex() &&
+		if ( DetectionState->DetectDragButton == PointerEvent.GetEffectingButton() && 
+			 DetectionState->DetectDragUserIndex == PointerEvent.GetUserIndex() && 
 			 DetectionState->DetectDragPointerIndex == PointerEvent.GetPointerIndex() )
 		{
 			// The user has released the button (or finger) that was supposed to start the drag; stop detecting it.
@@ -846,10 +856,10 @@ FDelegateHandle FPopupSupport::RegisterClickNotification( const TSharedRef<SWidg
 			else
 			{
 				SubscriberIndex++;
-			}
+			}		
 		}
 	}} ClearOutStaleNotifications;
-
+	
 	ClearOutStaleNotifications( ClickZoneNotifications );
 
 	// Add a new notification.
@@ -870,7 +880,7 @@ void FPopupSupport::UnregisterClickNotification( FDelegateHandle Handle )
 		{
 			SubscriptionIndex++;
 		}
-	}
+	}	
 }
 
 void FPopupSupport::SendNotifications( const FWidgetPath& WidgetsUnderCursor )
@@ -917,6 +927,8 @@ void FSlateApplication::SetPlatformApplication(const TSharedRef<class GenericApp
 
 void FSlateApplication::Create()
 {
+	GSlateFastWidgetPath = GIsEditor ? 0 : 1;
+
 	Create(MakeShareable(FPlatformApplicationMisc::CreateApplication()));
 }
 
@@ -934,7 +946,7 @@ TSharedRef<FSlateApplication> FSlateApplication::Create(const TSharedRef<class G
 
 	// The grid needs to know the size and coordinate system of the desktop.
 	// Some monitor setups have a primary monitor on the right and below the
-	// left one, so the leftmost upper right monitor can be something like (-1280, -200)
+	// left one, so the leftmost upper right monitor can be something like (-1280, -200)Synt
 	{
 		// Get an initial value for the VirtualDesktop geometry
 		CurrentApplication->VirtualDesktopRect = []()
@@ -1021,14 +1033,15 @@ FSlateApplication::FSlateApplication()
 	, bIsGameFakingTouch( false )
 	, bIsFakingTouched( false )
 	, bTouchFallbackToMouse( true )
-	, bSoftwareCursorAvailable( false )
+	, bSoftwareCursorAvailable( false )	
 	, bQueryCursorRequested( false )
 	, bMenuAnimationsEnabled( true )
 	, AppIcon( FCoreStyle::Get().GetBrush("DefaultAppIcon") )
 	, VirtualDesktopRect( 0,0,0,0 )
-	, NavigationConfigFactory([] { return MakeShared<FNavigationConfig>(); })
+	, NavigationConfig(MakeShared<FNavigationConfig>())
 	, SimulateGestures(false, (int32)EGestureEvent::Count)
 	, ProcessingInput(0)
+	, InputManager(MakeShared<FSlateDefaultInputMapping>())
 {
 #if WITH_UNREAL_DEVELOPER_TOOLS
 	FModuleManager::Get().LoadModule(TEXT("Settings"));
@@ -1056,19 +1069,29 @@ FSlateApplication::FSlateApplication()
 	// Add the standard 'default' user because there's always 1 user.
 	RegisterUser(MakeShareable(new FSlateUser(0, false)));
 
+	NavigationConfig->OnRegister();
+
 	SimulateGestures[(int32)EGestureEvent::LongPress] = true;
+
+#if WITH_EDITOR
+	OnDebugSafeZoneChanged.AddRaw(this, &FSlateApplication::UpdateCustomSafeZone);
+#endif
 }
 
 FSlateApplication::~FSlateApplication()
 {
 	FTabCommands::Unregister();
 	FGenericCommands::Unregister();
-
+	
 	if (SlateTextField != nullptr)
 	{
 		delete SlateTextField;
 		SlateTextField = nullptr;
 	}
+
+#if WITH_EDITOR
+	OnDebugSafeZoneChanged.RemoveAll(this);
+#endif
 }
 
 void FSlateApplication::SetupPhysicalSensitivities()
@@ -1093,26 +1116,25 @@ void FSlateApplication::InitHighDPI()
 {
 	IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("EnableHighDPIAwareness"));
 
-	if (GIsEditor && CVar)
+	if (CVar)
 	{
 		bool bRequestEnableHighDPI = true;
+		if (GIsEditor)
+		{
 		GConfig->GetBool(TEXT("HDPI"), TEXT("EnableHighDPIAwareness"), bRequestEnableHighDPI, GEditorSettingsIni);
+		}
+
 		const bool bEnableHighDPI = bRequestEnableHighDPI && !FParse::Param(FCommandLine::Get(), TEXT("nohighdpi"));
 
 		// Set the cvar here for other systems that need it.
 		CVar->Set(bEnableHighDPI);
 
 		// High DPI must be enabled before any windows are shown.
-		// only doing this in editor for now
 		if (bEnableHighDPI)
 		{
 			FPlatformApplicationMisc::SetHighDPIMode();
 		}
 	}
-	else if (CVar)
-	{
-		CVar->Set(false);
-	}
 }
 
 const FStyleNode* FSlateApplication::GetRootStyle() const
@@ -1208,14 +1230,14 @@ FWidgetPath FSlateApplication::LocateWindowUnderMouse( FVector2D ScreenspaceMous
 	bool bPrevWindowWasModal = false;
 
 	for (int32 WindowIndex = Windows.Num() - 1; WindowIndex >= 0; --WindowIndex)
-	{
+	{ 
 		const TSharedRef<SWindow>& Window = Windows[WindowIndex];
 
 		if ( !Window->IsVisible() || Window->IsWindowMinimized())
 		{
 			continue;
 		}
-
+		
 		// Hittest the window's children first.
 		FWidgetPath ResultingPath = LocateWindowUnderMouse(ScreenspaceMouseCoordinate, Window->GetChildWindows(), bIgnoreEnabledStatus);
 		if (ResultingPath.IsValid())
@@ -1236,7 +1258,7 @@ FWidgetPath FSlateApplication::LocateWindowUnderMouse( FVector2D ScreenspaceMous
 			}
 		}
 	}
-
+	
 	return FWidgetPath();
 }
 
@@ -1261,13 +1283,13 @@ void FSlateApplication::DrawWindows()
 
 struct FDrawWindowArgs
 {
-	FDrawWindowArgs( FSlateDrawBuffer& InDrawBuffer, const FWidgetPath& InWidgetsUnderCursor )
+	FDrawWindowArgs( FSlateDrawBuffer& InDrawBuffer, const FWidgetPath& InWidgetsToVisualizeUnderCursor )
 		: OutDrawBuffer( InDrawBuffer )
-		, WidgetsUnderCursor( InWidgetsUnderCursor )
+		, WidgetsToVisualizeUnderCursor(InWidgetsToVisualizeUnderCursor)
 	{}
 
 	FSlateDrawBuffer& OutDrawBuffer;
-	const FWidgetPath& WidgetsUnderCursor;
+	const FWidgetPath& WidgetsToVisualizeUnderCursor;
 };
 
 
@@ -1280,8 +1302,7 @@ void FSlateApplication::DrawWindowAndChildren( const TSharedRef<SWindow>& Window
 	// Only draw visible windows
 	if( WindowToDraw->IsVisible() && (!WindowToDraw->IsWindowMinimized() || FApp::UseVRFocus()) )
 	{
-		SLATE_CYCLE_COUNTER_SCOPE_CUSTOM(GSlateDrawWindowAndChildren, WindowToDraw->GetCreatedInLocation());
-
+	
 		// Switch to the appropriate world for drawing
 		FScopedSwitchWorldHack SwitchWorld( WindowToDraw );
 
@@ -1339,7 +1360,7 @@ void FSlateApplication::DrawWindowAndChildren( const TSharedRef<SWindow>& Window
 			if (CursorWindow.IsValid() && WindowToDraw == CursorWindow)
 			{
 				TSharedPtr<SWidget> CursorWidget = CursorWidgetPtr.Pin();
-
+				
 				if (CursorWidget.IsValid())
 				{
 					CursorWidget->SlatePrepass(GetApplicationScale()*CursorWindow->GetNativeWindow()->GetDPIScaleFactor());
@@ -1363,12 +1384,12 @@ void FSlateApplication::DrawWindowAndChildren( const TSharedRef<SWindow>& Window
 
 		// The widget reflector may want to paint some additional stuff as part of the Widget introspection that it performs.
 		// For example: it may draw layout rectangles for hovered widgets.
-		const bool bVisualizeLayoutUnderCursor = DrawWindowArgs.WidgetsUnderCursor.IsValid();
-		const bool bCapturingFromThisWindow = bVisualizeLayoutUnderCursor && DrawWindowArgs.WidgetsUnderCursor.TopLevelWindow == WindowToDraw;
+		const bool bVisualizeLayoutUnderCursor = DrawWindowArgs.WidgetsToVisualizeUnderCursor.IsValid();
+		const bool bCapturingFromThisWindow = bVisualizeLayoutUnderCursor && DrawWindowArgs.WidgetsToVisualizeUnderCursor.TopLevelWindow == WindowToDraw;
 		TSharedPtr<IWidgetReflector> WidgetReflector = WidgetReflectorPtr.Pin();
 		if ( bCapturingFromThisWindow || (WidgetReflector.IsValid() && WidgetReflector->ReflectorNeedsToDrawIn(WindowToDraw)) )
 		{
-			MaxLayerId = WidgetReflector->Visualize( DrawWindowArgs.WidgetsUnderCursor, WindowElementList, MaxLayerId );
+			MaxLayerId = WidgetReflector->Visualize( DrawWindowArgs.WidgetsToVisualizeUnderCursor, WindowElementList, MaxLayerId );
 		}
 
 		// Visualize pointer presses and pressed keys for demo-recording purposes.
@@ -1406,7 +1427,7 @@ static void PrepassWindowAndChildren( TSharedRef<SWindow> WindowToPrepass )
 	{
 		SLATE_CYCLE_COUNTER_SCOPE_CUSTOM(GSlatePrepassWindowAndChildren, WindowToPrepass->GetCreatedInLocation());
 		FScopedSwitchWorldHack SwitchWorld(WindowToPrepass);
-
+		
 		{
 			SCOPE_CYCLE_COUNTER(STAT_SlatePrepass);
 			WindowToPrepass->SlatePrepass(FSlateApplication::Get().GetApplicationScale() * WindowToPrepass->GetNativeWindow()->GetDPIScaleFactor());
@@ -1463,7 +1484,6 @@ void FSlateApplication::DrawPrepass( TSharedPtr<SWindow> DrawOnlyThisWindow )
 	}
 }
 
-
 TArray<TSharedRef<SWindow>> GatherAllDescendants(const TArray< TSharedRef<SWindow> >& InWindowList)
 {
 	TArray<TSharedRef<SWindow>> GatheredDescendants(InWindowList);
@@ -1472,7 +1492,7 @@ TArray<TSharedRef<SWindow>> GatherAllDescendants(const TArray< TSharedRef<SWindo
 	{
 		GatheredDescendants.Append( GatherAllDescendants( SomeWindow->GetChildWindows() ) );
 	}
-
+	
 	return GatheredDescendants;
 }
 
@@ -1480,30 +1500,34 @@ void FSlateApplication::PrivateDrawWindows( TSharedPtr<SWindow> DrawOnlyThisWind
 {
 	check(Renderer.IsValid());
 
+	// Grab a scope lock around access to the resource proxy map, just to ensure we never cross over
+	// with the loading thread.
+	FScopeLock ScopeLock(Renderer->GetResourceCriticalSection());
+
+	FWidgetPath WidgetsToVisualizeUnderCursor;
+	
 #if SLATE_HAS_WIDGET_REFLECTOR
 	// Is user expecting visual feedback from the Widget Reflector?
 	const bool bVisualizeLayoutUnderCursor = WidgetReflectorPtr.IsValid() && WidgetReflectorPtr.Pin()->IsVisualizingLayoutUnderCursor();
-#else
-	const bool bVisualizeLayoutUnderCursor = false;
+	if (bVisualizeLayoutUnderCursor)
+	{
+		WidgetsToVisualizeUnderCursor =
+			WidgetsUnderCursorLastEvent.FindRef(FUserAndPointer(CursorUserIndex, CursorPointerIndex)).ToWidgetPath();
+	}
 #endif
 
-	FWidgetPath WidgetsUnderCursor = bVisualizeLayoutUnderCursor
-		? WidgetsUnderCursorLastEvent.FindRef(FUserAndPointer(CursorUserIndex,CursorPointerIndex)).ToWidgetPath()
-		: FWidgetPath();
-
-	if ( !SkipSecondPrepass.GetValueOnGameThread() )
 	{
+		// Prepass the window
 		SCOPED_NAMED_EVENT_TEXT("Slate::Prepass", FColor::Magenta);
 		DrawPrepass( DrawOnlyThisWindow );
 	}
 
-
-	FDrawWindowArgs DrawWindowArgs( Renderer->GetDrawBuffer(), WidgetsUnderCursor );
+	FDrawWindowArgs DrawWindowArgs( Renderer->GetDrawBuffer(), WidgetsToVisualizeUnderCursor);
 
 	{
 		SCOPE_CYCLE_COUNTER( STAT_SlateDrawWindowTime );
 
-		TSharedPtr<SWindow> ActiveModalWindow = GetActiveModalWindow();
+		TSharedPtr<SWindow> ActiveModalWindow = GetActiveModalWindow(); 
 
 		if (ActiveModalWindow.IsValid())
 		{
@@ -1523,7 +1547,7 @@ void FSlateApplication::PrivateDrawWindows( TSharedPtr<SWindow> DrawOnlyThisWind
 			for( auto CurrentWindowIt( NotificationWindows.CreateIterator() ); CurrentWindowIt; ++CurrentWindowIt )
 			{
 				DrawWindowAndChildren(*CurrentWindowIt, DrawWindowArgs);
-			}
+			}	
 		}
 		else if( DrawOnlyThisWindow.IsValid() )
 		{
@@ -1552,7 +1576,7 @@ void FSlateApplication::PrivateDrawWindows( TSharedPtr<SWindow> DrawOnlyThisWind
 		DrawWindowArgs.OutDrawBuffer.RemoveUnusedWindowElement(AllWindows);
 	}
 
-	{
+	{	
 		SLATE_CYCLE_COUNTER_SCOPE(GSlateRendererDrawWindows);
 		Renderer->DrawWindows( DrawWindowArgs.OutDrawBuffer );
 	}
@@ -1670,7 +1694,7 @@ void FSlateApplication::TickPlatform(float DeltaTime)
 	{
 		SCOPE_CYCLE_COUNTER(STAT_SlateMessageTick);
 
-		// We need to pump messages here so that slate can receive input.
+		// We need to pump messages here so that slate can receive input.  
 		if ( ( ActiveModalWindows.Num() > 0 ) || GIntraFrameDebuggingGameThread )
 		{
 			// We only need to pump messages for slate when a modal window or blocking mode is active is up because normally message pumping is handled in FEngineLoop::Tick
@@ -1700,39 +1724,34 @@ void FSlateApplication::TickApplication(ESlateTickType TickType, float DeltaTime
 
 	if(TickType == ESlateTickType::All)
 	{
-	    {
-		    SCOPED_NAMED_EVENT_TEXT("Slate::PreTick", FColor::Magenta);
-		    SCOPE_CYCLE_COUNTER(STAT_SlatePreTickEvent);
-		    PreTickEvent.Broadcast(DeltaTime);
-	    }
+	{
+		SCOPE_CYCLE_COUNTER(STAT_SlatePreTickEvent);
+		PreTickEvent.Broadcast(DeltaTime);
+	}
 
+		// The widget locking the cursor to its bounds may have been reshaped.
+		// Check if the widget was reshaped and update the cursor lock
+		// bounds if needed.
+		UpdateCursorLockRegion();
+
+		//FPlatformMisc::BeginNamedEvent(FColor::Magenta, "Slate::CaptureAndToolTipUpdate");
+	// When Slate captures the mouse, it is up to us to set the cursor 
+	// because the OS assumes that we own the mouse.
+		if (GEnableCursorQueries && (MouseCaptor.HasCapture() || bQueryCursorRequested))
 		{
-			//SCOPED_NAMED_EVENT_TEXT("Slate::UpdateCursorLockRegion", FColor::Magenta);
-	        // The widget locking the cursor to its bounds may have been reshaped.
-	        // Check if the widget was reshaped and update the cursor lock
-	        // bounds if needed.
-	        UpdateCursorLockRegion();
+			SCOPE_CYCLE_COUNTER(STAT_SlateQueryCursor);
+			QueryCursor();
 		}
 
-	    //SCOPED_NAMED_EVENT_TEXT("Slate::CaptureAndToolTipUpdate", FColor::Magenta);
-	    // When Slate captures the mouse, it is up to us to set the cursor 
-		// because the OS assumes that we own the mouse.
-		if (MouseCaptor.HasCapture() || bQueryCursorRequested)
 		{
-			QueryCursor();
-	    }
-    
-	    {
 			SCOPE_CYCLE_COUNTER(STAT_SlateUpdateTooltip);
-			SLATE_CYCLE_COUNTER_SCOPE(GUpdateTooltipTime);
 
-		    // Update tool tip, if we have one
-		    const bool AllowSpawningOfToolTips = false;
+			// Update tool tip, if we have one
+			const bool AllowSpawningOfToolTips = false;
 			UpdateToolTip(AllowSpawningOfToolTips);
 		}
 	}
 
-
 	// Advance time
 	LastTickTime = CurrentTime;
 	CurrentTime = FPlatformTime::Seconds();
@@ -1770,7 +1789,8 @@ void FSlateApplication::TickApplication(ESlateTickType TickType, float DeltaTime
 	if (TickType == ESlateTickType::All)
 	{
 		const bool bNeedsSyntheticMouseMouse = SynthesizeMouseMovePending > 0;
-		if (bNeedsSyntheticMouseMouse && (!GIsGameThreadIdInitialized || IsInGameThread()))
+
+		if (GEnableSyntheticMouseMoves && bNeedsSyntheticMouseMouse && (!GIsGameThreadIdInitialized || IsInGameThread())) 
 		{
 			// Force a mouse move event to make sure all widgets know whether there is a mouse cursor hovering over them
 			SynthesizeMouseMove();
@@ -1785,7 +1805,7 @@ void FSlateApplication::TickApplication(ESlateTickType TickType, float DeltaTime
 		const float SleepThreshold = SleepBufferPostInput.GetValueOnGameThread();
 		const double TimeSinceInput = LastTickTime - LastUserInteractionTime;
 		const double TimeSinceMouseMove = LastTickTime - LastMouseMoveTime;
-
+	
 		const bool bIsUserIdle = (TimeSinceInput > SleepThreshold) && (TimeSinceMouseMove > SleepThreshold);
 		const bool bAnyActiveTimersPending = AnyActiveTimersArePending();
 		if (bAnyActiveTimersPending)
@@ -1822,7 +1842,7 @@ void FSlateApplication::TickApplication(ESlateTickType TickType, float DeltaTime
 		{
 			bIsSlateAsleep = false; // if we get here, then Slate is not sleeping
 
-			// Update any notifications - this needs to be done after windows have updated themselves
+			// Update any notifications - this needs to be done after windows have updated themselves 
 			// (so they know their size)
 			{
 				SLATE_CYCLE_COUNTER_SCOPE(GSlateTickNotificationManager);
@@ -2048,20 +2068,12 @@ bool FSlateApplication::CanDisplayWindows() const
 
 EUINavigation FSlateApplication::GetNavigationDirectionFromKey(const FKeyEvent& InKeyEvent) const
 {
-	if (const FSlateUser* User = GetUser(InKeyEvent.GetUserIndex()))
-	{
-		return User->NavigationConfig->GetNavigationDirectionFromKey(InKeyEvent);
-	}
-	return EUINavigation::Invalid;
+	return NavigationConfig->GetNavigationDirectionFromKey(InKeyEvent);
 }
 
 EUINavigation FSlateApplication::GetNavigationDirectionFromAnalog(const FAnalogInputEvent& InAnalogEvent)
 {
-	if (const FSlateUser* User = GetUser(InAnalogEvent.GetUserIndex()))
-{
-		return User->NavigationConfig->GetNavigationDirectionFromAnalog(InAnalogEvent);
-	}
-	return EUINavigation::Invalid;
+	return NavigationConfig->GetNavigationDirectionFromAnalog(InAnalogEvent);
 }
 
 void FSlateApplication::AddModalWindow( TSharedRef<SWindow> InSlateWindow, const TSharedPtr<const SWidget> InParentWidget, bool bSlowTaskWindow )
@@ -2087,9 +2099,9 @@ void FSlateApplication::AddModalWindow( TSharedRef<SWindow> InSlateWindow, const
 	}
 
 #if WITH_EDITOR
-	FCoreDelegates::PreSlateModal.Broadcast();
+    FCoreDelegates::PreSlateModal.Broadcast();
 #endif
-	// Push the active modal window onto the stack.
+    // Push the active modal window onto the stack.
 	ActiveModalWindows.AddUnique( InSlateWindow );
 
 	// Close the open tooltip when a new window is open.  Tooltips from non-modal windows can be dangerous and cause rentrancy into code that shouldnt execute in a modal state.
@@ -2097,16 +2109,16 @@ void FSlateApplication::AddModalWindow( TSharedRef<SWindow> InSlateWindow, const
 
 	// Set the modal flag on the window
 	InSlateWindow->SetAsModalWindow();
-
+	
 	// Make sure we aren't in the middle of using a slate draw buffer
 	Renderer->FlushCommands();
 
-	// In slow task windows, depending on the frequency with which the window is updated, it could be quite some time
+	// In slow task windows, depending on the frequency with which the window is updated, it could be quite some time 
 	// before the window is ticked (and drawn) so we hide the window by default and the slow task window will show it when needed
 	const bool bShowWindow = !bSlowTaskWindow;
 
 	// Create the new window
-	// Note: generally a modal window should not be added without a parent but
+	// Note: generally a modal window should not be added without a parent but 
 	// due to this being called from wxWidget editors, this is not always possible
 	if( InParentWidget.IsValid() )
 	{
@@ -2170,10 +2182,7 @@ void FSlateApplication::AddModalWindow( TSharedRef<SWindow> InSlateWindow, const
 			// Tick any other systems that need to update during modal dialogs
 			ModalLoopTickEvent.Broadcast(DeltaTime);
 
-			FPlatformMisc::BeginNamedEvent(FColor::Magenta, "Slate::ModalTick");
-
 			{
-				SCOPED_NAMED_EVENT_TEXT("Slate::Tick", FColor::Magenta);
 				SCOPE_CYCLE_COUNTER(STAT_SlateTickTime);
 				SLATE_CYCLE_COUNTER_SCOPE(GSlateTotalTickTime);
 
@@ -2350,11 +2359,11 @@ void FSlateApplication::RequestDestroyWindow( TSharedRef<SWindow> InWindowToDest
 			/** @return the list of this window's child windows */
 			TArray< TSharedRef<SWindow> >& ChildWindows = WindowToDestroy->GetChildWindows();
 
-			// Children need to be destroyed first.
+			// Children need to be destroyed first. 
 			if( ChildWindows.Num() > 0 )
 			{
 				for( int32 ChildIndex = 0; ChildIndex < ChildWindows.Num(); ++ChildIndex )
-				{
+				{	
 					// Recursively request that the window is destroyed which will also queue any children of children etc...
 					Helper( ChildWindows[ ChildIndex ], OutWindowDestroyQueue );
 				}
@@ -2369,7 +2378,7 @@ void FSlateApplication::RequestDestroyWindow( TSharedRef<SWindow> InWindowToDest
 	DestroyWindowsImmediately();
 }
 
-void FSlateApplication::DestroyWindowImmediately( TSharedRef<SWindow> WindowToDestroy )
+void FSlateApplication::DestroyWindowImmediately( TSharedRef<SWindow> WindowToDestroy ) 
 {
 	// Request that the window and its children are destroyed
 	RequestDestroyWindow( WindowToDestroy );
@@ -2440,13 +2449,13 @@ void FSlateApplication::InvalidateAllViewports()
 void FSlateApplication::RegisterGameViewport( TSharedRef<SViewport> InViewport )
 {
 	RegisterViewport(InViewport);
-
+	
 	if (GameViewportWidget != InViewport)
 	{
 		InViewport->SetActive(true);
 		GameViewportWidget = InViewport;
 	}
-
+	
 	ActivateGameViewport();
 }
 
@@ -2505,16 +2514,17 @@ TSharedPtr<SViewport> FSlateApplication::GetGameViewport() const
 
 int32 FSlateApplication::GetUserIndexForKeyboard() const
 {
-	//@Todo Slate: Fix this to actual be a map and add API for the user to edit the mapping.
-	// HACK! Just directly mapping the keyboard to User Index 0.
-	return 0;
+	return InputManager->GetUserIndexForKeyboard();
 }
-
+ 
 int32 FSlateApplication::GetUserIndexForController(int32 ControllerId) const
 {
-	//@Todo Slate: Fix this to actual be a map and add API for the user to edit the mapping.
-	// HACK! Just directly mapping a controller to a User Index.
-	return ControllerId;
+	return InputManager->GetUserIndexForController(ControllerId);
+}
+
+void FSlateApplication::SetInputManager(TSharedRef<ISlateInputManager> InInputManager)
+{
+	InputManager = InInputManager;
 }
 
 void FSlateApplication::SetUserFocusToGameViewport(uint32 UserIndex, EFocusCause ReasonFocusIsChanging /* = EFocusCause::SetDirectly*/)
@@ -2547,7 +2557,7 @@ void FSlateApplication::ActivateGameViewport()
 	if (bAppIsActive && GameViewportWidget.IsValid())
 	{
 		TSharedRef<SViewport> GameViewportWidgetRef = GameViewportWidget.Pin().ToSharedRef();
-
+		
 		FWidgetPath PathToViewport;
 		// If we cannot find the window it could have been destroyed.
 		if (FSlateWindowHelper::FindPathToWidget(SlateWindows, GameViewportWidgetRef, PathToViewport, EVisibility::All))
@@ -2560,7 +2570,7 @@ void FSlateApplication::ActivateGameViewport()
 			// Without this we don't get WM_KEYDOWN or WM_CHAR messages in play in viewport sessions.
 			Window->GetNativeWindow()->SetWindowFocus();
 
-			// Activate the viewport and process the reply
+			// Activate the viewport and process the reply 
 			FWindowActivateEvent ActivateEvent(FWindowActivateEvent::EA_Activate, Window);
 			FReply ViewportActivatedReply = GameViewportWidgetRef->OnViewportActivated(ActivateEvent);
 			if (ViewportActivatedReply.IsEventHandled())
@@ -2753,6 +2763,11 @@ const void* FSlateApplication::FindBestParentWindowHandleForDialogs(const TShare
 	return ParentWindowWindowHandle;
 }
 
+const TSet<FKey> FSlateApplication::GetPressedMouseButtons() const
+{
+	return PressedMouseButtons;
+}
+
 TSharedPtr<SWindow> FSlateApplication::GetActiveTopLevelWindow() const
 {
 	return ActiveTopLevelWindow.Pin();
@@ -2891,10 +2906,12 @@ bool FSlateApplication::SetUserFocus(FSlateUser* User, const FWidgetPath& InFocu
 		OldFocusedWidget->OnFocusLost(FFocusEvent(InCause, User->GetUserIndex()));
 	}
 
+#if SLATE_HAS_WIDGET_REFLECTOR
 	if (bReflectorShowingFocus)
 	{
 		WidgetReflector->SetWidgetsToVisualize(NewFocusedWidgetPath);
 	}
+#endif
 
 	// Let the new widget know that it's received keyboard focus
 	if (NewFocusedWidget.IsValid())
@@ -2906,7 +2923,7 @@ bool FSlateApplication::SetUserFocus(FSlateUser* User, const FWidgetPath& InFocu
 
 		// Set ActiveTopLevelWindow to the newly focused window
 		ActiveTopLevelWindow = FocusedWindow;
-
+		
 		const FArrangedWidget& WidgetToFocus = NewFocusedWidgetPath.Widgets.Last();
 
 		FReply Reply = NewFocusedWidget->OnFocusReceived(WidgetToFocus.Geometry, FFocusEvent(InCause, User->GetUserIndex()));
@@ -3159,10 +3176,10 @@ void FSlateApplication::ProcessReply( const FWidgetPath& CurrentEventPath, const
 			return FNoReply();
 		});
 	}
-
+	
 	// Setting mouse capture, mouse position, and locking the mouse
 	// are all operations that we shouldn't do if our application isn't Active (The OS ignores half of it, and we'd be in a half state)
-	// We do allow the release of capture and lock when deactivated, this is innocuous of some platforms but required on others when
+	// We do allow the release of capture and lock when deactivated, this is innocuous of some platforms but required on others when 
 	// the Application deactivated before the window. (Mac is an example of this)
 	if (bAppIsActive || bIsVirtualInteraction)
 	{
@@ -3259,7 +3276,7 @@ void FSlateApplication::ProcessReply( const FWidgetPath& CurrentEventPath, const
 	{
 		LockCursor(nullptr);
 	}
-
+	
 	// If we have a valid Navigation request attempt the navigation.
 	if (TheReply.GetNavigationDestination().IsValid() || TheReply.GetNavigationType() != EUINavigation::Invalid)
 	{
@@ -3365,16 +3382,22 @@ void FSlateApplication::LockCursorToPath(const FWidgetPath& WidgetPath)
 		const FSlateRect SlateClipRect = WidgetGeom.Geometry.GetLayoutBoundingRect();
 		CursorLock.LastComputedBounds = SlateClipRect;
 		CursorLock.PathToLockingWidget = WidgetPath;
-
+			
 		// Generate a screen space clip rect based on the widgets geometry
+#if PLATFORM_DESKTOP
+		const bool bIsBorderlessGameWindow = Window->GetNativeWindow()->IsDefinitionValid() && Window->GetNativeWindow()->GetDefinition().Type == EWindowType::GameWindow && !Window->GetNativeWindow()->GetDefinition().HasOSWindowBorder;
+		const int32 ClipRectAdjustment = bIsBorderlessGameWindow ? 1 : 0;
+#else
+		const int32 ClipRectAdjustment = 0;
+#endif
 
 		// Note: We round the upper left coordinate of the clip rect so we guarantee the rect is inside the geometry of the widget.  If we truncated when there is a half pixel we would cause the clip
 		// rect to be half a pixel larger than the geometry and cause the mouse to go outside of the geometry.
 		RECT ClipRect;
-		ClipRect.left = FMath::RoundToInt(SlateClipRect.Left);
-		ClipRect.top = FMath::RoundToInt(SlateClipRect.Top);
-		ClipRect.right = FMath::TruncToInt(SlateClipRect.Right);
-		ClipRect.bottom = FMath::TruncToInt(SlateClipRect.Bottom);
+		ClipRect.left = FMath::RoundToInt(SlateClipRect.Left + ClipRectAdjustment);
+		ClipRect.top = FMath::RoundToInt(SlateClipRect.Top + ClipRectAdjustment);
+		ClipRect.right = FMath::TruncToInt(SlateClipRect.Right - ClipRectAdjustment);
+		ClipRect.bottom = FMath::TruncToInt(SlateClipRect.Bottom - ClipRectAdjustment);
 
 		// Lock the mouse to the widget
 		PlatformApplication->Cursor->Lock(&ClipRect);
@@ -3390,6 +3413,8 @@ void FSlateApplication::UnlockCursor()
 
 void FSlateApplication::UpdateCursorLockRegion()
 {
+	if(CursorLock.PathToLockingWidget.IsValid())
+	{
 	const FWidgetPath PathToWidget = CursorLock.PathToLockingWidget.ToWidgetPath(FWeakWidgetPath::EInterruptedPathHandling::ReturnInvalid);
 	if (PathToWidget.IsValid())
 	{
@@ -3400,6 +3425,7 @@ void FSlateApplication::UpdateCursorLockRegion()
 		}
 	}
 }
+}
 
 void FSlateApplication::SetLastUserInteractionTime(double InCurrentTime)
 {
@@ -3414,7 +3440,7 @@ void FSlateApplication::QueryCursor()
 {
 	bQueryCursorRequested = false;
 
-	// The slate loading widget thread is not allowed to execute this code
+	// The slate loading widget thread is not allowed to execute this code 
 	// as it is unsafe to read the hittest grid in another thread
 	if ( PlatformApplication->Cursor.IsValid() && IsInGameThread() )
 	{
@@ -3424,7 +3450,7 @@ void FSlateApplication::QueryCursor()
 		{
 			CursorReply = DragDropContent->OnCursorQuery();
 		}
-
+		
 		if (!CursorReply.IsEventHandled())
 		{
 			FWidgetPath WidgetsToQueryForCursor;
@@ -3638,12 +3664,12 @@ void FSlateApplication::UpdateToolTip( bool AllowSpawningOfNewToolTips )
 		!IsUsingHighPrecisionMouseMovment() && // If we are using HighPrecision movement then we can't rely on the OS cursor to be accurate
 		!IsDragDropping() &&				// We must not currently be in the middle of a drag-drop action
 		PlatformApplication->IsCursorDirectlyOverSlateWindow(); // The cursor must be over a Slate window
-
+	
 	// We still want to show tooltips for widgets that are disabled
 	const bool bIgnoreEnabledStatus = true;
 
 	float DPIScaleFactor = 1.0f;
-
+	
 	FWidgetPath WidgetsToQueryForToolTip;
 	// We don't show any tooltips when drag and dropping or when another app is active
 	if (bCheckForToolTipChanges)
@@ -3703,7 +3729,7 @@ void FSlateApplication::UpdateToolTip( bool AllowSpawningOfNewToolTips )
 
 	// Did the tool tip change from last time?
 	const bool bToolTipChanged = (NewToolTip != ActiveToolTip.Pin());
-
+	
 	// Any widgets that wish to handle visualizing the tooltip get a chance here.
 	TSharedPtr<SWidget> NewTooltipVisualizer;
 	if (bToolTipChanged)
@@ -3805,7 +3831,7 @@ void FSlateApplication::UpdateToolTip( bool AllowSpawningOfNewToolTips )
 		if ( NewToolTip.IsValid() || ( ActiveToolTipPtr.IsValid() && !ActiveToolTipPtr->IsInteractive() ) )
 		{
 			CloseToolTip();
-
+			
 			if (NewTooltipVisualizer.IsValid())
 			{
 				TooltipVisualizerPtr = NewTooltipVisualizer;
@@ -3930,7 +3956,7 @@ void FSlateApplication::CancelDragDrop()
 
 	for( auto LastWidgetIterator = WidgetsUnderCursorLastEvent.CreateConstIterator(); LastWidgetIterator; ++LastWidgetIterator)
 	{
-
+		
 		FWidgetPath WidgetsToDragLeave = LastWidgetIterator.Value().ToWidgetPath(FWeakWidgetPath::EInterruptedPathHandling::Truncate);
 		if(WidgetsToDragLeave.IsValid())
 		{
@@ -3963,7 +3989,7 @@ void FSlateApplication::EnterDebuggingMode()
 	}
 
 	Renderer->FlushCommands();
-
+	
 	// We are about to start an in stack tick. Make sure the rendering thread isn't already behind
 	Renderer->Sync();
 
@@ -3991,7 +4017,7 @@ void FSlateApplication::EnterDebuggingMode()
 	}
 
 	bRequestLeaveDebugMode = false;
-
+	
 	if ( PreviousGameViewport.IsValid() )
 	{
 		check(!GameViewportWidget.IsValid());
@@ -4026,12 +4052,12 @@ bool FSlateApplication::IsWindowInDestroyQueue(TSharedRef<SWindow> Window) const
 void FSlateApplication::SynthesizeMouseMove()
 {
 	SLATE_CYCLE_COUNTER_SCOPE(GSlateSynthesizeMouseMove);
-	// The slate loading widget thread is not allowed to execute this code
+	// The slate loading widget thread is not allowed to execute this code 
 	// as it is unsafe to read the hittest grid in another thread
 	if (PlatformApplication->Cursor.IsValid() && IsInGameThread())
 	{
 		// Synthetic mouse events accomplish two goals:
-		// 1) The UI can change even if the mosue doesn't move.
+		// 1) The UI can change even if the mouse doesn't move.
 		//    Synthesizing a mouse move sends out events.
 		//    In this case, the current and previous position will be the same.
 		//
@@ -4111,25 +4137,6 @@ void FSlateApplication::SetDragTriggerDistance( float ScreenPixels )
 	DragTriggerDistance = ScreenPixels;
 }
 
-void FSlateApplication::SetInputPreProcessor(bool bEnable, TSharedPtr<class IInputProcessor> NewInputProcessor /*= nullptr*/)
-{
-	if (bEnable)
-	{
-		RegisterInputPreProcessor(NewInputProcessor);
-	}
-	else
-{
-		if ( NewInputProcessor.IsValid() )
-	{
-			UnregisterInputPreProcessor(NewInputProcessor);
-	}
-	else
-	{
-			UnregisterAllInputPreProcessors();
-		}
-	}
-}
-
 bool FSlateApplication::RegisterInputPreProcessor(TSharedPtr<IInputProcessor> InputProcessor, const int32 Index /*= INDEX_NONE*/)
 {
 	bool bResult = false;
@@ -4146,11 +4153,6 @@ void FSlateApplication::UnregisterInputPreProcessor(TSharedPtr<IInputProcessor>
 	InputPreProcessors.Remove(InputProcessor);
 }
 
-void FSlateApplication::UnregisterAllInputPreProcessors()
-{
-	InputPreProcessors.RemoveAll();
-}
-
 void FSlateApplication::SetCursorRadius(float NewRadius)
 {
 	CursorRadius = FMath::Max<float>(0.0f, NewRadius);
@@ -4185,20 +4187,20 @@ FVector2D FSlateApplication::CalculateTooltipWindowPosition( const FSlateRect& I
 	const FPlatformRect WorkAreaFinderRect (Cursor.X, Cursor.Y, Cursor.X + 1.0f, Cursor.Y + 1.0f);
 	const FPlatformRect PlatformWorkArea = PlatformApplication->GetWorkArea(WorkAreaFinderRect);
 
-	const FSlateRect WorkAreaRect(
-		PlatformWorkArea.Left,
-		PlatformWorkArea.Top,
-		PlatformWorkArea.Left+(PlatformWorkArea.Right - PlatformWorkArea.Left),
+	const FSlateRect WorkAreaRect( 
+		PlatformWorkArea.Left, 
+		PlatformWorkArea.Top, 
+		PlatformWorkArea.Left+(PlatformWorkArea.Right - PlatformWorkArea.Left), 
 		PlatformWorkArea.Top+(PlatformWorkArea.Bottom - PlatformWorkArea.Top) );
 
-	float DPIScale = 1.0f;
+	float DPIScale = 1.0f; 
 
 	if (bAutoAdjustForDPIScale)
 	{
 		DPIScale = FPlatformApplicationMisc::GetDPIScaleFactorAtPoint(Cursor.X, Cursor.Y);
 	}
 
-	// We want the Tooltip to appear in a 'comfortable' distance. The following vector: 'TooltipCursorOffset'
+	// We want the Tooltip to appear in a 'comfortable' distance. The following vector: 'TooltipCursorOffset' 
 	// is used to move away from the cursor tip position. If we wouldn't do this the Tooltip would directly
 	// appear at the tip of the cursor. The coefficients 16 and 12 are estimated empirical.
 	const FVector2D TooltipCursorOffset(16 * DPIScale, 12 * DPIScale);
@@ -4225,7 +4227,7 @@ FVector2D FSlateApplication::CalculatePopupWindowPosition( const FSlateRect& InA
 {
 	FVector2D CalculatedPopUpWindowPosition( 0, 0 );
 
-	float DPIScale = 1.0f;
+	float DPIScale = 1.0f; 
 
 	if (bAutoAdjustForDPIScale)
 	{
@@ -4261,10 +4263,10 @@ FVector2D FSlateApplication::CalculatePopupWindowPosition( const FSlateRect& InA
 		WorkAreaFinderRect.Top = AnchorRect.Top + 1;
 		const FPlatformRect PlatformWorkArea = PlatformApplication->GetWorkArea(WorkAreaFinderRect);
 
-		const FSlateRect WorkAreaRect(
-			PlatformWorkArea.Left,
-			PlatformWorkArea.Top,
-			PlatformWorkArea.Left+(PlatformWorkArea.Right - PlatformWorkArea.Left),
+		const FSlateRect WorkAreaRect( 
+			PlatformWorkArea.Left, 
+			PlatformWorkArea.Top, 
+			PlatformWorkArea.Left+(PlatformWorkArea.Right - PlatformWorkArea.Left), 
 			PlatformWorkArea.Top+(PlatformWorkArea.Bottom - PlatformWorkArea.Top) );
 
 		FVector2D ProposedPlacement = InProposedPlacement;
@@ -4471,6 +4473,9 @@ TSharedPtr< FSlateWindowElementList > FSlateApplication::GetCachableElementList(
 
 	TSharedPtr< FSlateWindowElementList > NextElementList = Pools->GetNextCachableElementList(CurrentWindow);
 
+	// Cached buffers don't always report their references, just while the buffer is in use, and by the owning SInvalidation panel.
+	NextElementList->SetShouldReportReferencesToGC(false);
+
 	return NextElementList;
 }
 
@@ -4625,8 +4630,9 @@ void FSlateApplication::RegisterUser(TSharedRef<FSlateUser> NewUser)
 		Users[NewUser->GetUserIndex()] = NewUser;
 	}
 
+	//NavigationConfig->OnUserAdded(NewUser->GetUserIndex());
+
 	UE_LOG(LogSlate, Log, TEXT("Slate User Registered.  User Index %d, Is Virtual User: %d"), NewUser->UserIndex, NewUser->bVirtualUser);
-	NewUser->NavigationConfig = NavigationConfigFactory();
 	UserRegisteredEvent.Broadcast(NewUser->GetUserIndex());
 }
 
@@ -4638,6 +4644,8 @@ void FSlateApplication::UnregisterUser(int32 UserIndex)
 
 		ClearUserFocus(UserIndex, EFocusCause::SetDirectly);
 		Users[UserIndex].Reset();
+
+		NavigationConfig->OnUserRemoved(UserIndex);
 	}
 }
 
@@ -4867,7 +4875,7 @@ bool FSlateApplication::ShouldProcessUserInputMessages( const TSharedPtr< FGener
 		Window = FSlateWindowHelper::FindWindowByPlatformWindow( SlateWindows, PlatformWindow.ToSharedRef() );
 	}
 
-	if ( ActiveModalWindows.Num() == 0 ||
+	if ( ActiveModalWindows.Num() == 0 || 
 		( Window.IsValid() &&
 			( Window->IsDescendantOf( GetActiveModalWindow() ) || ActiveModalWindows.Contains( Window ) ) ) )
 	{
@@ -4918,7 +4926,7 @@ bool FSlateApplication::ProcessKeyCharEvent( FCharacterEvent& InCharacterEvent )
 	return Reply.IsEventHandled();
 }
 
-bool FSlateApplication::OnKeyDown( const int32 KeyCode, const uint32 CharacterCode, const bool IsRepeat )
+bool FSlateApplication::OnKeyDown( const int32 KeyCode, const uint32 CharacterCode, const bool IsRepeat ) 
 {
 	FKey const Key = FInputKeyManager::Get().GetKeyFromCodes( KeyCode, CharacterCode );
 	FKeyEvent KeyEvent(Key, PlatformApplication->GetModifierKeys(), GetUserIndexForKeyboard(), IsRepeat, CharacterCode, KeyCode);
@@ -4951,7 +4959,7 @@ bool FSlateApplication::ProcessKeyDownEvent( FKeyEvent& InKeyEvent )
 	FReply Reply = FReply::Unhandled();
 
 	SetLastUserInteractionTime(this->GetCurrentTime());
-
+	
 	if (IsDragDropping() && InKeyEvent.GetKey() == EKeys::Escape)
 	{
 		// Pressing ESC while drag and dropping terminates the drag drop.
@@ -5057,7 +5065,7 @@ bool FSlateApplication::ProcessKeyUpEvent( FKeyEvent& InKeyEvent )
 	FReply Reply = FReply::Unhandled();
 
 	SetLastUserInteractionTime(this->GetCurrentTime());
-
+	
 	LastUserInteractionTimeForThrottling = LastUserInteractionTime;
 
 	// Bubble the key event
@@ -5191,11 +5199,11 @@ bool FSlateApplication::OnMouseDown(const TSharedPtr< FGenericWindow >& Platform
 
 bool FSlateApplication::OnMouseDown( const TSharedPtr< FGenericWindow >& PlatformWindow, const EMouseButtons::Type Button, const FVector2D CursorPos )
 {
-	// convert to touch event if we are faking it
+	// convert to touch event if we are faking it	
 	if (bIsFakingTouch || bIsGameFakingTouch)
 	{
 		bIsFakingTouched = true;
-		return OnTouchStarted( PlatformWindow, PlatformApplication->Cursor->GetPosition(), 0, 0 );
+		return OnTouchStarted( PlatformWindow, PlatformApplication->Cursor->GetPosition(), 1.0f, 0, 0 );
 	}
 
 	FKey Key = TranslateMouseButtonToKey( Button );
@@ -5216,7 +5224,7 @@ bool FSlateApplication::OnMouseDown( const TSharedPtr< FGenericWindow >& Platfor
 bool FSlateApplication::ProcessMouseButtonDownEvent( const TSharedPtr< FGenericWindow >& PlatformWindow, FPointerEvent& MouseEvent )
 {
 	SCOPE_CYCLE_COUNTER(STAT_ProcessMouseButtonDown);
-
+	
 	TScopeCounter<int32> BeginInput(ProcessingInput);
 
 #if WITH_EDITOR
@@ -5230,7 +5238,7 @@ bool FSlateApplication::ProcessMouseButtonDownEvent( const TSharedPtr< FGenericW
 	QueueSynthesizedMouseMove();
 	SetLastUserInteractionTime(this->GetCurrentTime());
 	LastUserInteractionTimeForThrottling = LastUserInteractionTime;
-
+	
 	if (PlatformWindow.IsValid())
 	{
 		PlatformApplication->SetCapture(PlatformWindow);
@@ -5318,7 +5326,7 @@ bool FSlateApplication::ProcessMouseButtonDownEvent( const TSharedPtr< FGenericW
 FReply FSlateApplication::RoutePointerDownEvent(FWidgetPath& WidgetsUnderPointer, FPointerEvent& PointerEvent)
 {
 	TScopeCounter<int32> BeginInput(ProcessingInput);
-
+	
 	// Ensure the cursor location(s) get set to an initial value
 	PointerIndexPositionMap.Add(FUserAndPointer(PointerEvent.GetUserIndex(), PointerEvent.GetPointerIndex()), PointerEvent.GetScreenSpacePosition());
 	PointerIndexLastPositionMap.Add(FUserAndPointer(PointerEvent.GetUserIndex(), PointerEvent.GetPointerIndex()), PointerEvent.GetScreenSpacePosition());
@@ -5355,6 +5363,17 @@ FReply FSlateApplication::RoutePointerDownEvent(FWidgetPath& WidgetsUnderPointer
 			}
 			return ThisReply;
 		} );
+
+		// When we perform a touch begin, we need to also send a mouse enter as if it were a cursor.
+		if (PointerEvent.IsTouchEvent() && !IsFakingTouchEvents())
+		{
+			for (int32 WidgetIndex = WidgetsUnderPointer.Widgets.Num() - 1; WidgetIndex >= 0; --WidgetIndex)
+			{
+				const FArrangedWidget& TargetWidget = WidgetsUnderPointer.Widgets[WidgetIndex];
+
+				TargetWidget.Widget->OnMouseEnter(TargetWidget.Geometry, PointerEvent);
+			}
+		}
 	}
 	LOG_EVENT( EEventLog::MouseButtonDown, Reply );
 
@@ -5444,7 +5463,7 @@ FReply FSlateApplication::RoutePointerUpEvent(FWidgetPath& WidgetsUnderPointer,
 					{
 						TempReply = TargetWidget.Widget->OnMouseButtonUp( TargetWidget.Geometry, Event );
 					}
-
+					
 					if ( Event.IsTouchEvent() && !IsFakingTouchEvents() )
 					{
 						// Generate a Leave event when a touch ends as well, since a touch can enter a widget and then end inside it
@@ -5470,7 +5489,7 @@ FReply FSlateApplication::RoutePointerUpEvent(FWidgetPath& WidgetsUnderPointer,
 
 		// Switch worlds widgets in the current path
 		FScopedSwitchWorldHack SwitchWorld( LocalWidgetsUnderCursor );
-
+		
 		// Cache the drag drop content and reset the pointer in case OnMouseButtonUpMessage re-enters as a result of OnDrop
 		TSharedPtr< FDragDropOperation > LocalDragDropContent = DragDropContent;
 		DragDropContent.Reset();
@@ -5494,15 +5513,18 @@ FReply FSlateApplication::RoutePointerUpEvent(FWidgetPath& WidgetsUnderPointer,
 				TempReply =  CurWidget.Widget->OnMouseButtonUp(CurWidget.Geometry, Event);
 			}
 
-			if ( Event.IsTouchEvent() && !IsFakingTouchEvents() )
-			{
-				// Generate a Leave event when a touch ends as well, since a touch can enter a widget and then end inside it
-				CurWidget.Widget->OnMouseLeave(Event);
-			}
-
 			return TempReply;
 		});
 
+		// When we perform a touch end, we need to also send a mouse leave as if it were a cursor.
+		if (PointerEvent.IsTouchEvent() && !IsFakingTouchEvents())
+		{
+			for (int32 WidgetIndex = LocalWidgetsUnderCursor.Widgets.Num() - 1; WidgetIndex >= 0; --WidgetIndex)
+			{
+				LocalWidgetsUnderCursor.Widgets[WidgetIndex].Widget->OnMouseLeave(PointerEvent);
+			}
+			}
+
 		LOG_EVENT( bIsDragDropping ? EEventLog::DragDrop : EEventLog::MouseButtonUp, Reply );
 
 		// If we were dragging, notify the content
@@ -5560,7 +5582,7 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 	{
 		bShouldStartDetectingDrag = OnDragDropCheckOverride.Execute();
 	}
-#endif
+#endif 
 
 	if ( !bIsSynthetic && bShouldStartDetectingDrag )
 	{
@@ -5579,7 +5601,7 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 				LastWidgetsUnderCursor = *DetectDragForWidget;
 
 				DragDetector.ResetDetection();
-
+				
 				// Switch worlds widgets in the current path
 				FScopedSwitchWorldHack SwitchWorld(DragDetectPath);
 
@@ -5588,7 +5610,7 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 				{
 					return InDetectDragForMe.Widget->OnDragDetected(InDetectDragForMe.Geometry, TranslatedMouseEvent);
 				});
-
+				
 				LOG_EVENT(EEventLog::DragDetected, Reply);
 			}
 			else
@@ -5661,7 +5683,7 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 								SomeWidgetPreviouslyUnderCursor->OnMouseLeave(PointerEvent);
 								LOG_EVENT(EEventLog::MouseLeave, SomeWidgetPreviouslyUnderCursor);
 							}
-						}
+						}			
 					}
 				}
 			}
@@ -5705,7 +5727,7 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 		}
 	}
 	else
-	{
+	{	
 		// Switch worlds widgets in the current path
 		FScopedSwitchWorldHack SwitchWorld( WidgetsUnderPointer );
 
@@ -5733,21 +5755,27 @@ bool FSlateApplication::RoutePointerMoveEvent(const FWidgetPath& WidgetsUnderPoi
 				return FNoReply();
 			} );
 		}
-
+		
 		// Bubble the MouseMove event.
 		FReply Reply = FEventRouter::Route<FReply>(this, FEventRouter::FBubblePolicy(WidgetsUnderPointer), PointerEvent, [&](const FArrangedWidget& CurWidget, const FPointerEvent& Event)
 		{
 			FReply TempReply = FReply::Unhandled();
 
+			if (IsDragDropping())
+			{
+				TempReply = CurWidget.Widget->OnDragOver(CurWidget.Geometry, FDragDropEvent(Event, DragDropContent));
+			}
+			else
+			{
 			if (Event.IsTouchEvent())
 			{
 				TempReply = CurWidget.Widget->OnTouchMoved( CurWidget.Geometry, Event );
 			}
 			if (!TempReply.IsEventHandled())
 			{
-				TempReply = (IsDragDropping())
-					? CurWidget.Widget->OnDragOver( CurWidget.Geometry, FDragDropEvent( Event, DragDropContent ) )
-					: CurWidget.Widget->OnMouseMove( CurWidget.Geometry, Event );
+					TempReply = CurWidget.Widget->OnMouseMove(CurWidget.Geometry, Event);
+				}
+
 			}
 
 			return TempReply;
@@ -5820,7 +5848,7 @@ bool FSlateApplication::OnMouseDoubleClick( const TSharedPtr< FGenericWindow >&
 	if (bIsFakingTouch || bIsGameFakingTouch)
 	{
 		bIsFakingTouched = true;
-		return OnTouchStarted(PlatformWindow, PlatformApplication->Cursor->GetPosition(), 0, 0);
+		return OnTouchStarted(PlatformWindow, PlatformApplication->Cursor->GetPosition(), 1.0f, 0, 0);
 	}
 
 	FKey Key = TranslateMouseButtonToKey( Button );
@@ -5845,7 +5873,7 @@ bool FSlateApplication::ProcessMouseButtonDoubleClickEvent( const TSharedPtr< FG
 	QueueSynthesizedMouseMove();
 	SetLastUserInteractionTime(this->GetCurrentTime());
 	LastUserInteractionTimeForThrottling = LastUserInteractionTime;
-
+	
 	PlatformApplication->SetCapture( PlatformWindow );
 	PressedMouseButtons.Add( InMouseEvent.GetEffectingButton() );
 
@@ -5854,7 +5882,7 @@ bool FSlateApplication::ProcessMouseButtonDoubleClickEvent( const TSharedPtr< FG
 		// If a widget has mouse capture, we've opted to simply treat this event as a mouse down
 		return ProcessMouseButtonDownEvent(PlatformWindow, InMouseEvent);
 	}
-
+	
 	FWidgetPath WidgetsUnderCursor = LocateWindowUnderMouse(InMouseEvent.GetScreenSpacePosition(), GetInteractiveTopLevelWindows());
 
 	FReply Reply = RoutePointerDoubleClickEvent( WidgetsUnderCursor, InMouseEvent );
@@ -5890,7 +5918,7 @@ bool FSlateApplication::OnMouseUp( const EMouseButtons::Type Button )
 
 bool FSlateApplication::OnMouseUp( const EMouseButtons::Type Button, const FVector2D CursorPos )
 {
-	// convert to touch event if we are faking it
+	// convert to touch event if we are faking it	
 	if (bIsFakingTouch || bIsGameFakingTouch)
 	{
 		bIsFakingTouched = false;
@@ -5991,14 +6019,14 @@ bool FSlateApplication::ProcessMouseWheelOrGestureEvent( FPointerEvent& InWheelE
 	{
 		bShouldProcessEvent = InWheelEvent.GetWheelDelta() != 0;
 	}
-
+	
 	if ( !bShouldProcessEvent )
 	{
 		return false;
 	}
 
 	SetLastUserInteractionTime(this->GetCurrentTime());
-
+	
 	// NOTE: We intentionally don't reset LastUserInteractionTimeForThrottling here so that the UI can be responsive while scrolling
 
 	FWidgetPath EventPath = LocateWindowUnderMouse(InWheelEvent.GetScreenSpacePosition(), GetInteractiveTopLevelWindows());
@@ -6046,10 +6074,10 @@ FReply FSlateApplication::RouteMouseWheelOrGestureEvent(const FWidgetPath& Widge
 
 bool FSlateApplication::OnMouseMove()
 {
-	// convert to touch event if we are faking it
+	// convert to touch event if we are faking it	
 	if (bIsFakingTouched)
 	{
-		return OnTouchMoved(PlatformApplication->Cursor->GetPosition(), 0, 0);
+		return OnTouchMoved(PlatformApplication->Cursor->GetPosition(), 1.0f, 0, 0);
 	}
 	else if (!bIsGameFakingTouch && bIsFakingTouch)
 	{
@@ -6088,16 +6116,16 @@ bool FSlateApplication::OnRawMouseMove( const int32 X, const int32 Y )
 {
 	if (bIsFakingTouched)
 	{
-		return OnTouchMoved(GetCursorPos(), 0, 0);
+		return OnTouchMoved(GetCursorPos(), 1.0f, 0, 0);
 	}
-
+	
 	if ( X != 0 || Y != 0 )
 	{
 		FPointerEvent MouseEvent(
 			CursorPointerIndex,
 			GetCursorPos(),
 			GetLastCursorPos(),
-			FVector2D( X, Y ),
+			FVector2D( X, Y ), 
 			PressedMouseButtons,
 			PlatformApplication->GetModifierKeys()
 		);
@@ -6109,7 +6137,7 @@ bool FSlateApplication::OnRawMouseMove( const int32 X, const int32 Y )
 
 		ProcessMouseMoveEvent(MouseEvent);
 	}
-
+	
 	return true;
 }
 
@@ -6126,7 +6154,7 @@ bool FSlateApplication::ProcessMouseMoveEvent( FPointerEvent& MouseEvent, bool b
 		// Detecting a mouse move of zero delta is our way of filtering out synthesized move events
 		const bool AllowSpawningOfToolTips = true;
 		UpdateToolTip( AllowSpawningOfToolTips );
-
+		
 		// Guard against synthesized mouse moves and only track user interaction if the cursor pos changed
 		SetLastUserInteractionTime(this->GetCurrentTime());
 	}
@@ -6135,7 +6163,7 @@ bool FSlateApplication::ProcessMouseMoveEvent( FPointerEvent& MouseEvent, bool b
 	// Otherwise, we are synthesizing a MouseMove ourselves, and must verify that the
 	// cursor is indeed over a Slate window.
 	const bool bOverSlateWindow = !bIsSynthetic || PlatformApplication->IsCursorDirectlyOverSlateWindow();
-
+	
 	FWidgetPath WidgetsUnderCursor = bOverSlateWindow
 		? LocateWindowUnderMouse(MouseEvent.GetScreenSpacePosition(), GetInteractiveTopLevelWindows())
 		: FWidgetPath();
@@ -6221,7 +6249,7 @@ bool FSlateApplication::AttemptNavigation(const FWidgetPath& NavigationSource, c
 			// Resolve the Widget Path
 			const FArrangedWidget& FocusedArrangedWidget = NavigationSource.Widgets.Last();
 
-			// Switch worlds for widgets in the current path
+			// Switch worlds for widgets in the current path 
 			FScopedSwitchWorldHack SwitchWorld(NavigationSource);
 
 			DestinationWidget = NavigationSource.GetWindow()->GetHittestGrid()->FindNextFocusableWidget(FocusedArrangedWidget, NavigationType, NavigationReply, BoundaryWidget);
@@ -6272,7 +6300,7 @@ bool FSlateApplication::OnControllerAnalog( FGamepadKeyNames::Type KeyName, int3
 	check(Key.IsValid());
 
 	int32 UserIndex = GetUserIndexForController(ControllerId);
-
+	
 	FAnalogInputEvent AnalogInputEvent(Key, PlatformApplication->GetModifierKeys(), UserIndex, false, 0, 0, AnalogValue);
 
 	return ProcessAnalogInputEvent(AnalogInputEvent);
@@ -6296,7 +6324,7 @@ bool FSlateApplication::OnControllerButtonReleased( FGamepadKeyNames::Type KeyNa
 	check(Key.IsValid());
 
 	int32 UserIndex = GetUserIndexForController(ControllerId);
-
+	
 	FKeyEvent KeyEvent(Key, PlatformApplication->GetModifierKeys(),UserIndex, IsRepeat,  0, 0);
 
 	return ProcessKeyUpEvent(KeyEvent);
@@ -6305,7 +6333,7 @@ bool FSlateApplication::OnControllerButtonReleased( FGamepadKeyNames::Type KeyNa
 bool FSlateApplication::OnTouchGesture( EGestureEvent GestureType, const FVector2D &Delta, const float MouseWheelDelta, bool bIsDirectionInvertedFromDevice )
 {
 	const FVector2D CurrentCursorPosition = GetCursorPos();
-
+	
 	FPointerEvent GestureEvent(
 		CurrentCursorPosition,
 		CurrentCursorPosition,
@@ -6315,7 +6343,7 @@ bool FSlateApplication::OnTouchGesture( EGestureEvent GestureType, const FVector
 		Delta,
 		bIsDirectionInvertedFromDevice
 	);
-
+	
 	FPointerEvent MouseWheelEvent(
 		CursorPointerIndex,
 		CurrentCursorPosition,
@@ -6325,11 +6353,11 @@ bool FSlateApplication::OnTouchGesture( EGestureEvent GestureType, const FVector
 		MouseWheelDelta,
 		PlatformApplication->GetModifierKeys()
 	);
-
+	
 	return ProcessMouseWheelOrGestureEvent( MouseWheelEvent, &GestureEvent );
 }
 
-bool FSlateApplication::OnTouchStarted( const TSharedPtr< FGenericWindow >& PlatformWindow, const FVector2D& Location, int32 TouchIndex, int32 ControllerId )
+bool FSlateApplication::OnTouchStarted( const TSharedPtr< FGenericWindow >& PlatformWindow, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId )
 {
 	// Don't process touches that overlap or surpass with the cursor pointer index.
 	if (TouchIndex >= ((int32)ETouchIndex::CursorPointerIndex))
@@ -6346,6 +6374,7 @@ bool FSlateApplication::OnTouchStarted( const TSharedPtr< FGenericWindow >& Plat
 		TouchIndex,
 		Location,
 		Location,
+		Force,
 		true);
 	ProcessTouchStartedEvent( PlatformWindow, PointerEvent );
 
@@ -6357,15 +6386,30 @@ bool FSlateApplication::OnTouchStarted( const TSharedPtr< FGenericWindow >& Plat
 	return true;
 }
 
-void FSlateApplication::ProcessTouchStartedEvent( const TSharedPtr< FGenericWindow >& PlatformWindow, FPointerEvent& PointerEvent )
+void FSlateApplication::ProcessTouchStartedEvent( const TSharedPtr< FGenericWindow >& PlatformWindow, FPointerEvent& InTouchEvent )
 {
 	// Add or Update the entry if the finger has been added to the surface.
-	PointerIndexLastPositionMap.Add(FUserAndPointer(PointerEvent.GetUserIndex(), PointerEvent.GetPointerIndex()), PointerEvent.GetScreenSpacePosition());
+	FUserAndPointer UserAndIndex(InTouchEvent.GetUserIndex(), InTouchEvent.GetPointerIndex());
+	PointerIndexLastPositionMap.Add(UserAndIndex, InTouchEvent.GetScreenSpacePosition());
 
-	ProcessMouseButtonDownEvent( PlatformWindow, PointerEvent );
+	const FWeakWidgetPath& LastWidgetsUnderCursor = WidgetsUnderCursorLastEvent.FindRef(UserAndIndex);
+	if (LastWidgetsUnderCursor.IsValid())
+	{
+		FWidgetPath SafeWidgetPath = LastWidgetsUnderCursor.ToWidgetPath();
+
+		FEventRouter::Route<FNoReply>(this, FEventRouter::FBubblePolicy(SafeWidgetPath), InTouchEvent, [] (const FArrangedWidget& SomeWidget, const FPointerEvent& PointerEvent)
+		{
+			SomeWidget.Widget->OnMouseLeave(PointerEvent);
+			return FNoReply();
+		});
+
+		WidgetsUnderCursorLastEvent.Remove(UserAndIndex);
+	}
+
+	ProcessMouseButtonDownEvent(PlatformWindow, InTouchEvent);
 }
 
-bool FSlateApplication::OnTouchMoved( const FVector2D& Location, int32 TouchIndex, int32 ControllerId )
+bool FSlateApplication::OnTouchMoved( const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId )
 {
 	// Don't process touches that overlap or surpass with the cursor pointer index.
 	if (TouchIndex >= ((int32)ETouchIndex::CursorPointerIndex))
@@ -6381,6 +6425,7 @@ bool FSlateApplication::OnTouchMoved( const FVector2D& Location, int32 TouchInde
 		TouchIndex,
 		Location,
 		LastLocation,
+		Force,
 		true);
 	ProcessTouchMovedEvent(PointerEvent);
 
@@ -6410,6 +6455,7 @@ bool FSlateApplication::OnTouchEnded( const FVector2D& Location, int32 TouchInde
 		TouchIndex,
 		Location,
 		Location,
+		0.0f,
 		true);
 	ProcessTouchEndedEvent(PointerEvent);
 
@@ -6438,7 +6484,7 @@ void FSlateApplication::ProcessTouchEndedEvent( FPointerEvent& PointerEvent )
 
 bool FSlateApplication::OnMotionDetected(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration, int32 ControllerId)
 {
-	FMotionEvent MotionEvent(
+	FMotionEvent MotionEvent( 
 		ControllerId,
 		Tilt,
 		RotationRate,
@@ -6454,7 +6500,7 @@ void FSlateApplication::ProcessMotionDetectedEvent( FMotionEvent& MotionEvent )
 {
 	QueueSynthesizedMouseMove();
 	SetLastUserInteractionTime(this->GetCurrentTime());
-
+	
 	if ( FSlateUser* User = GetOrCreateUser(MotionEvent.GetUserIndex()) )
 	{
 		if (InputPreProcessors.HandleMotionDetectedEvent(*this, MotionEvent))
@@ -6504,7 +6550,7 @@ bool FSlateApplication::OnSizeChanged( const TSharedRef< FGenericWindow >& Platf
 			Renderer->FlushCommands();
 		}
 
-		// Inform the notification manager we have activated a window - it may want to force notifications
+		// Inform the notification manager we have activated a window - it may want to force notifications 
 		// back to the front of the z-order
 		FSlateNotificationManager::Get().ForceNotificationsInFront( Window.ToSharedRef() );
 	}
@@ -6633,18 +6679,18 @@ bool FSlateApplication::ProcessWindowActivatedEvent( const FWindowActivateEvent&
 		ReleaseMouseCapture();
 
 		const bool bActivatedByMouse = ActivateEvent.GetActivationType() == FWindowActivateEvent::EA_ActivateByMouse;
-
+		
 		// Only window activate by mouse is considered a user interaction
 		if (bActivatedByMouse)
 		{
 			SetLastUserInteractionTime(this->GetCurrentTime());
 		}
-
+		
 		// Widgets that happen to be under the mouse need to update if activation changes
 		// This also serves as a force redraw which is needed when restoring a window that was previously inactive.
 		QueueSynthesizedMouseMove();
 
-		// NOTE: The window is brought to front even when a modal window is active and this is not the modal window one of its children
+		// NOTE: The window is brought to front even when a modal window is active and this is not the modal window one of its children 
 		// The reason for this is so that the Slate window order is in sync with the OS window order when a modal window is open.  This is important so that when the modal window closes the proper window receives input from Slate.
 		// If you change this be sure to test windows are activated properly and receive input when they are opened when a modal dialog is open.
 		FSlateWindowHelper::BringWindowToFront(SlateWindows, ActivateEvent.GetAffectedWindow());
@@ -6674,7 +6720,7 @@ bool FSlateApplication::ProcessWindowActivatedEvent( const FWindowActivateEvent&
 				MenuStack.OnWindowActivated( ActivateEvent.GetAffectedWindow() );
 			}
 
-			// Inform the notification manager we have activated a window - it may want to force notifications
+			// Inform the notification manager we have activated a window - it may want to force notifications 
 			// back to the front of the z-order
 			FSlateNotificationManager::Get().ForceNotificationsInFront( ActivateEvent.GetAffectedWindow() );
 
@@ -6693,7 +6739,7 @@ bool FSlateApplication::ProcessWindowActivatedEvent( const FWindowActivateEvent&
 			ActiveModalWindow->FlashWindow();
 		}
 
-
+		
 		TSharedRef<SWindow> Window = ActivateEvent.GetAffectedWindow();
 		TSharedPtr<ISlateViewport> Viewport = Window->GetViewport();
 		if (Viewport.IsValid())
@@ -6707,7 +6753,7 @@ bool FSlateApplication::ProcessWindowActivatedEvent( const FWindowActivateEvent&
 				FWidgetPath PathToViewport;
 				if (FSlateWindowHelper::FindPathToWidget(JustThisWindow, ViewportWidgetPtr.ToSharedRef(), PathToViewport, EVisibility::All))
 				{
-					// Activate the viewport and process the reply
+					// Activate the viewport and process the reply 
 					FReply ViewportActivatedReply = Viewport->OnViewportActivated(ActivateEvent);
 					if (ViewportActivatedReply.IsEventHandled())
 					{
@@ -6790,12 +6836,11 @@ void FSlateApplication::ProcessApplicationActivationEvent(bool InAppActivated)
 	OnApplicationActivationStateChanged().Broadcast(InAppActivated);
 }
 
-void FSlateApplication::SetNavigationConfigFactory(TFunction<TSharedRef<FNavigationConfig>()> InNavigationConfigFactory)
+void FSlateApplication::SetNavigationConfig(TSharedRef<FNavigationConfig> InNavigationConfig)
 {
-	NavigationConfigFactory = InNavigationConfigFactory;
-	ForEachUser([&](FSlateUser* User) {
-		User->NavigationConfig = NavigationConfigFactory();
-	}, true);
+	NavigationConfig->OnUnregister();
+	NavigationConfig = InNavigationConfig;
+	NavigationConfig->OnRegister();
 }
 
 bool FSlateApplication::OnConvertibleLaptopModeChanged()
@@ -6837,11 +6882,11 @@ EWindowZone::Type FSlateApplication::GetWindowZoneForPoint( const TSharedRef< FG
 
 void FSlateApplication::PrivateDestroyWindow( const TSharedRef<SWindow>& DestroyedWindow )
 {
-	// Notify the window that it is going to be destroyed.  The window must be completely intact when this is called
+	// Notify the window that it is going to be destroyed.  The window must be completely intact when this is called 
 	// because delegates are allowed to leave Slate here
 	DestroyedWindow->NotifyWindowBeingDestroyed();
 
-	// Release rendering resources.
+	// Release rendering resources.  
 	// This MUST be done before destroying the native window as the native window is required to be valid before releasing rendering resources with some API's
 	Renderer->OnWindowDestroyed( DestroyedWindow );
 
@@ -6887,11 +6932,11 @@ void FSlateApplication::OnWindowClose( const TSharedRef< FGenericWindow >& Platf
 				bCanCloseWindow = !SlateViewport->OnRequestWindowClose().bIsHandled;
 			}
 		}
-
+		
 		if (bCanCloseWindow)
 		{
-			Window->RequestDestroyWindow();
-		}
+		    Window->RequestDestroyWindow();
+		}	 
 	}
 }
 
@@ -6967,7 +7012,7 @@ EDropEffect::Type FSlateApplication::OnDragEnter( const TSharedRef< SWindow >& W
 bool FSlateApplication::ProcessDragEnterEvent( TSharedRef<SWindow> WindowEntered, FDragDropEvent& DragDropEvent )
 {
 	SetLastUserInteractionTime(this->GetCurrentTime());
-
+	
 	FWidgetPath WidgetsUnderCursor = LocateWindowUnderMouse( DragDropEvent.GetScreenSpacePosition(), GetInteractiveTopLevelWindows() );
 
 	// Switch worlds for widgets in the current path
@@ -7093,7 +7138,7 @@ void FSlateApplication::OnVirtualDesktopSizeChanged(const FDisplayMetrics& NewDi
 }
 
 
-/*
+/* 
  *****************************************************************************/
 
 TSharedRef<FSlateApplication> FSlateApplication::InitializeAsStandaloneApplication(const TSharedRef<FSlateRenderer>& PlatformRenderer)
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Text/Android/AndroidPlatformTextField.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Text/Android/AndroidPlatformTextField.cpp
index 054b9d8a6069..4717316d4a11 100644
--- a/Engine/Source/Runtime/Slate/Private/Framework/Text/Android/AndroidPlatformTextField.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Text/Android/AndroidPlatformTextField.cpp
@@ -25,6 +25,7 @@
 // Java InputType text flags
 #define TYPE_TEXT_FLAG_NO_SUGGESTIONS		0x00080001
 #define TYPE_TEXT_FLAG_MULTI_LINE			0x00020000
+#define TYPE_TEXT_FLAG_AUTO_CORRECT			0x00008000
 
 int32 GAndroidNewKeyboard = 0;
 static FAutoConsoleVariableRef CVarAndroidNewKeyboard(
@@ -63,6 +64,16 @@ void FAndroidPlatformTextField::ShowVirtualKeyboard(bool bShow, int32 UserIndex,
 		
 		// Do not make suggestions as user types
 		InputType |= TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+
+		// Ensure that the autocorrect flag is turned on or off based on project settings
+		if (ShouldUseAutocorrect(TextEntryWidget))
+		{
+			InputType |= TYPE_TEXT_FLAG_AUTO_CORRECT;
+		}
+		else
+		{
+			InputType &= ~TYPE_TEXT_FLAG_AUTO_CORRECT;
+		}
 	}
 
 	bool bIsUsingIntegratedKeyboard = EnableNewKeyboardConfig();
@@ -117,6 +128,30 @@ bool FAndroidPlatformTextField::AllowMoveCursor()
 	return !EnableNewKeyboardConfig();
 }
 
+bool FAndroidPlatformTextField::ShouldUseAutocorrect(TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget) const
+{
+	bool bUseAutocorrect = IPlatformTextField::ShouldUseVirtualKeyboardAutocorrect(TextEntryWidget);
+
+	if (bUseAutocorrect)
+	{
+		static FString DeviceModel = FAndroidMisc::GetDeviceModel();
+
+		TArray<FString> ExcludedDeviceModels;
+		GConfig->GetArray(TEXT("/Script/Engine.InputSettings"), TEXT("ExcludedAutocorrectDeviceModels"), ExcludedDeviceModels, GInputIni);
+
+		for (const FString& ExcludedModel : ExcludedDeviceModels)
+		{
+			if (DeviceModel.StartsWith(ExcludedModel))
+			{
+				bUseAutocorrect = false;
+				break;
+			}
+		}
+	}
+
+	return bUseAutocorrect;
+}
+
 bool FAndroidPlatformTextField::EnableNewKeyboardConfig() const
 {
 	// read the value from the config file
diff --git a/Engine/Source/Runtime/Slate/Private/Framework/Text/IOS/IOSPlatformTextField.cpp b/Engine/Source/Runtime/Slate/Private/Framework/Text/IOS/IOSPlatformTextField.cpp
index e1b1f6952d23..93bbe83498b5 100644
--- a/Engine/Source/Runtime/Slate/Private/Framework/Text/IOS/IOSPlatformTextField.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Framework/Text/IOS/IOSPlatformTextField.cpp
@@ -8,10 +8,15 @@
 
 namespace
 {
-	void GetKeyboardConfig(EKeyboardType TargetKeyboardType, FKeyboardConfig& KeyboardConfig)
+	void GetKeyboardConfig(TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget, FKeyboardConfig& KeyboardConfig)
 	{
+		bool bUseAutocorrect = IPlatformTextField::ShouldUseVirtualKeyboardAutocorrect(TextEntryWidget);
+
 		KeyboardConfig.KeyboardType = UIKeyboardTypeDefault;
 		KeyboardConfig.bSecureTextEntry = NO;
+		KeyboardConfig.AutocorrectionType = bUseAutocorrect ? UITextAutocorrectionTypeYes : UITextAutocorrectionTypeNo;
+
+		EKeyboardType TargetKeyboardType = TextEntryWidget.IsValid() ? TextEntryWidget->GetVirtualKeyboardType() : Keyboard_Default;
 		
 		switch (TargetKeyboardType)
 		{
@@ -46,8 +51,13 @@ FIOSPlatformTextField::~FIOSPlatformTextField()
 {
 	if(TextField != nullptr)
 	{
-		[TextField release];
-		TextField = nullptr;
+		dispatch_async(dispatch_get_main_queue(), ^{
+#if !PLATFORM_TVOS
+            [TextField hide];
+#endif
+			[TextField release];
+			TextField = nullptr;
+		});
 	}
 }
 
@@ -60,10 +70,8 @@ void FIOSPlatformTextField::ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSh
 	{
 		if (bShow)
 		{
-			EKeyboardType TargetKeyboardType = (TextEntryWidget.IsValid()) ? TextEntryWidget->GetVirtualKeyboardType() : Keyboard_Default;
-			
 			FKeyboardConfig KeyboardConfig;
-			GetKeyboardConfig(TargetKeyboardType, KeyboardConfig);
+			GetKeyboardConfig(TextEntryWidget, KeyboardConfig);
 			
 			[View ActivateKeyboard:false keyboardConfig:KeyboardConfig];
 		}
@@ -88,10 +96,13 @@ void FIOSPlatformTextField::ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSh
 		}
         else
         {
-			if (TextField != nullptr)
+			if (TextField != nullptr && [TextField hasTextWidget])
 			{
 				dispatch_async(dispatch_get_main_queue(), ^{
-					[TextField hide];
+                    if (TextField != nullptr)
+                    {
+                        [TextField hide];
+                    }
 				});
 			}
         }
@@ -129,6 +140,11 @@ void FIOSPlatformTextField::ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSh
     TextWidget = nullptr;
 }
 
+-(bool)hasTextWidget
+{
+    return TextWidget.IsValid();
+}
+
 -(void)show:(TSharedPtr<IVirtualKeyboardEntry>)InTextWidget
 {
 	TextWidget = InTextWidget;
@@ -191,9 +207,8 @@ void FIOSPlatformTextField::ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSh
 							AlertTextField.text = [NSString stringWithFString : TextWidget->GetText().ToString()];
 							AlertTextField.placeholder = [NSString stringWithFString : TextWidget->GetHintText().ToString()];
 		 
-							EKeyboardType TargetKeyboardType = (TextWidget.IsValid()) ? TextWidget->GetVirtualKeyboardType() : Keyboard_Default;
 							FKeyboardConfig KeyboardConfig;
-							GetKeyboardConfig(TargetKeyboardType, KeyboardConfig);
+							GetKeyboardConfig(TextWidget, KeyboardConfig);
 
 							AlertTextField.keyboardType = KeyboardConfig.KeyboardType;
 							AlertTextField.autocorrectionType = KeyboardConfig.AutocorrectionType;
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SButton.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SButton.cpp
index b10c7c27542b..c77a994eca86 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SButton.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SButton.cpp
@@ -6,6 +6,8 @@
 #include "Widgets/Text/STextBlock.h"
 
 
+static FName SButtonTypeName("SButton");
+
 /**
  * Construct this widget
  *
@@ -51,6 +53,12 @@ void SButton::Construct( const FArguments& InArgs )
 		]
 	);
 
+	// Only do this if we're exactly an SButton
+	if (GetType() == SButtonTypeName)
+	{
+		bCanTick = false;
+	}
+
 	ContentPadding = InArgs._ContentPadding;
 
 	SetButtonStyle(InArgs._ButtonStyle);
@@ -346,7 +354,7 @@ void SButton::OnMouseLeave( const FPointerEvent& MouseEvent )
 	Invalidate(EInvalidateWidget::Layout);
 }
 
-void SButton::OnMouseCaptureLost()
+void SButton::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	Release();
 }
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableText.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableText.cpp
index f69afd5bb8e3..bf4875b38de9 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableText.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableText.cpp
@@ -32,6 +32,7 @@ void SEditableText::Construct( const FArguments& InArgs )
 	MinDesiredWidth = InArgs._MinDesiredWidth;
 	bSelectAllTextOnCommit = InArgs._SelectAllTextOnCommit;
 	VirtualKeyboardType = InArgs._VirtualKeyboardType;
+	VirtualKeyboardOptions = InArgs._VirtualKeyboardOptions;
 	VirtualKeyboardTrigger = InArgs._VirtualKeyboardTrigger;
 	VirtualKeyboardDismissAction = InArgs._VirtualKeyboardDismissAction;
 	OnKeyCharHandler = InArgs._OnKeyCharHandler;
@@ -530,6 +531,11 @@ EKeyboardType SEditableText::GetVirtualKeyboardType() const
 	return VirtualKeyboardType.Get();
 }
 
+FVirtualKeyboardOptions SEditableText::GetVirtualKeyboardOptions() const
+{
+	return VirtualKeyboardOptions;
+}
+
 EVirtualKeyboardTrigger SEditableText::GetVirtualKeyboardTrigger() const
 {
 	return VirtualKeyboardTrigger.Get();
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableTextBox.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableTextBox.cpp
index a6f5678fbd31..d888e8378dc9 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableTextBox.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SEditableTextBox.cpp
@@ -59,6 +59,7 @@ void SEditableTextBox::Construct( const FArguments& InArgs )
 					.OnKeyCharHandler( InArgs._OnKeyCharHandler )			
 					.OnKeyDownHandler( InArgs._OnKeyDownHandler )
 					.VirtualKeyboardType( InArgs._VirtualKeyboardType )
+					.VirtualKeyboardOptions( InArgs._VirtualKeyboardOptions )
 					.VirtualKeyboardTrigger( InArgs._VirtualKeyboardTrigger )
 					.VirtualKeyboardDismissAction( InArgs._VirtualKeyboardDismissAction )
 					.TextShapingMethod(InArgs._TextShapingMethod)
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SMultiLineEditableTextBox.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SMultiLineEditableTextBox.cpp
index dce796589022..5fd2c8d4013d 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SMultiLineEditableTextBox.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SMultiLineEditableTextBox.cpp
@@ -124,6 +124,7 @@ void SMultiLineEditableTextBox::Construct( const FArguments& InArgs )
 					.OnKeyCharHandler(InArgs._OnKeyCharHandler)
 					.OnKeyDownHandler(InArgs._OnKeyDownHandler)
 					.ModiferKeyForNewLine(InArgs._ModiferKeyForNewLine)
+					.VirtualKeyboardOptions( InArgs._VirtualKeyboardOptions )
 					.VirtualKeyboardTrigger( InArgs._VirtualKeyboardTrigger )
 					.VirtualKeyboardDismissAction( InArgs._VirtualKeyboardDismissAction )
 					.TextShapingMethod(InArgs._TextShapingMethod)
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualJoystick.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualJoystick.cpp
index 0618fb632713..6eebba931b6e 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualJoystick.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualJoystick.cpp
@@ -141,7 +141,7 @@ int32 SVirtualJoystick::OnPaint( const FPaintArgs& Args, const FGeometry& Allott
 					AllottedGeometry.ToPaintGeometry(
 					Control.VisualCenter - FVector2D(Control.CorrectedVisualSize.X * 0.5f, Control.CorrectedVisualSize.Y * 0.5f),
 					Control.CorrectedVisualSize),
-					Control.Image2.Get(),
+					Control.Image2->GetSlateBrush(),
 					ESlateDrawEffect::None,
 					ColorAndOpacitySRGB
 					);
@@ -155,7 +155,7 @@ int32 SVirtualJoystick::OnPaint( const FPaintArgs& Args, const FGeometry& Allott
 					AllottedGeometry.ToPaintGeometry(
 					Control.VisualCenter + Control.ThumbPosition - FVector2D(Control.CorrectedThumbSize.X * 0.5f, Control.CorrectedThumbSize.Y * 0.5f),
 					Control.CorrectedThumbSize),
-					Control.Image1.Get(),
+					Control.Image1->GetSlateBrush(),
 					ESlateDrawEffect::None,
 					ColorAndOpacitySRGB
 					);
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualKeyboardEntry.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualKeyboardEntry.cpp
index c0dd81dbe4f7..1cec94815aae 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualKeyboardEntry.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Input/SVirtualKeyboardEntry.cpp
@@ -32,6 +32,7 @@ void SVirtualKeyboardEntry::Construct( const FArguments& InArgs )
 	OnTextCommitted = InArgs._OnTextCommitted;
 	MinDesiredWidth = InArgs._MinDesiredWidth;
 	KeyboardType = InArgs._KeyboardType;
+	VirtualKeyboardOptions = InArgs._VirtualKeyboardOptions;
 }
 
 void SVirtualKeyboardEntry::SetText(const TAttribute< FText >& InNewText)
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/LayerManager/STooltipPresenter.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/LayerManager/STooltipPresenter.cpp
index 4f696e21910b..0781289bf891 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/LayerManager/STooltipPresenter.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/LayerManager/STooltipPresenter.cpp
@@ -7,7 +7,7 @@
 void STooltipPresenter::Construct(const FArguments& InArgs)
 {
 	this->ChildSlot.AttachWidget(InArgs._Content.Widget);
-	LocalCursorPosition = FVector2D::ZeroVector;
+	bCanTick = false;
 }
 
 void STooltipPresenter::SetContent(const TSharedRef<SWidget>& InWidget)
@@ -15,16 +15,13 @@ void STooltipPresenter::SetContent(const TSharedRef<SWidget>& InWidget)
 	ChildSlot.AttachWidget(InWidget);
 }
 
-void STooltipPresenter::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
-{
-	// Have to do this in Tick because we need Desktop-space geometry. OnArrangedChildren is called from Paint() and uses window-space geometry.
-	LocalCursorPosition = AllottedGeometry.AbsoluteToLocal(FSlateApplication::Get().GetCursorPos());
-}
-
 void STooltipPresenter::OnArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const
 {
 	static const FVector2D CursorSize = FVector2D(12, 12);
 
+	// Cached geometry is in desktop space.  We need to convert from desktop space where the mouse is to local space so use CachedGeometry.
+	const FVector2D LocalCursorPosition = GetCachedGeometry().AbsoluteToLocal(FSlateApplication::Get().GetCursorPos());
+
 	const FSlateRect CursorAnchorRect(LocalCursorPosition, LocalCursorPosition + CursorSize);
 	const FSlateRect TooltipPopup(LocalCursorPosition + CursorSize, LocalCursorPosition + CursorSize + ChildSlot.GetWidget()->GetDesiredSize());
 	
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBorder.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBorder.cpp
index c2bf2c4ba19a..22c7ec264928 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBorder.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBorder.cpp
@@ -36,9 +36,9 @@ void SBorder::Construct( const SBorder::FArguments& InArgs )
 	SetOnMouseDoubleClick(InArgs._OnMouseDoubleClick);
 
 	ChildSlot
-		.HAlign(InArgs._HAlign)
-		.VAlign(InArgs._VAlign)
-		.Padding(InArgs._Padding)
+	.HAlign(InArgs._HAlign)
+	.VAlign(InArgs._VAlign)
+	.Padding(InArgs._Padding)
 	[
 		InArgs._Content.Widget
 	];
@@ -67,18 +67,19 @@ int32 SBorder::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometr
 	const FSlateBrush* BrushResource = BorderImage.Get();
 		
 	const bool bEnabled = ShouldBeEnabled(bParentEnabled);
-	const bool bShowDisabledEffect = ShowDisabledEffect.Get();
-	ESlateDrawEffect DrawEffects = bShowDisabledEffect && !bEnabled ? ESlateDrawEffect::DisabledEffect : ESlateDrawEffect::None;
 
 	if ( BrushResource && BrushResource->DrawAs != ESlateBrushDrawType::NoDrawType )
 	{
+		const bool bShowDisabledEffect = ShowDisabledEffect.Get();
+		const ESlateDrawEffect DrawEffects = (bShowDisabledEffect && !bEnabled) ? ESlateDrawEffect::DisabledEffect : ESlateDrawEffect::None;
+
 		FSlateDrawElement::MakeBox(
 			OutDrawElements,
 			LayerId,
 			AllottedGeometry.ToPaintGeometry(),
 			BrushResource,
 			DrawEffects,
-			BrushResource->GetTint( InWidgetStyle ) *InWidgetStyle.GetColorAndOpacityTint() * BorderBackgroundColor.Get().GetColor( InWidgetStyle )
+			BrushResource->GetTint(InWidgetStyle) * InWidgetStyle.GetColorAndOpacityTint() * BorderBackgroundColor.Get().GetColor(InWidgetStyle)
 		);
 	}
 
@@ -92,36 +93,63 @@ FVector2D SBorder::ComputeDesiredSize(float LayoutScaleMultiplier) const
 
 void SBorder::SetBorderBackgroundColor(const TAttribute<FSlateColor>& InColorAndOpacity)
 {
-	BorderBackgroundColor = InColorAndOpacity;
+	if (!BorderBackgroundColor.IdenticalTo(InColorAndOpacity))
+	{
+		BorderBackgroundColor = InColorAndOpacity;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void SBorder::SetDesiredSizeScale(const TAttribute<FVector2D>& InDesiredSizeScale)
 {
-	DesiredSizeScale = InDesiredSizeScale;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if (!DesiredSizeScale.IdenticalTo(InDesiredSizeScale))
+	{
+		DesiredSizeScale = InDesiredSizeScale;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void SBorder::SetHAlign(EHorizontalAlignment HAlign)
 {
-	ChildSlot.HAlignment = HAlign;
+	if (ChildSlot.HAlignment != HAlign)
+	{
+		ChildSlot.HAlignment = HAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SBorder::SetVAlign(EVerticalAlignment VAlign)
 {
-	ChildSlot.VAlignment = VAlign;
+	if (ChildSlot.VAlignment != VAlign)
+	{
+		ChildSlot.VAlignment = VAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SBorder::SetPadding(const TAttribute<FMargin>& InPadding)
 {
-	ChildSlot.SlotPadding = InPadding;
+	if (!ChildSlot.SlotPadding.IdenticalTo(InPadding))
+	{
+		ChildSlot.SlotPadding = InPadding;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void SBorder::SetShowEffectWhenDisabled(const TAttribute<bool>& InShowEffectWhenDisabled)
 {
-	ShowDisabledEffect = InShowEffectWhenDisabled;
+	if (!ShowDisabledEffect.IdenticalTo(InShowEffectWhenDisabled))
+	{
+		ShowDisabledEffect = InShowEffectWhenDisabled;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void SBorder::SetBorderImage(const TAttribute<const FSlateBrush*>& InBorderImage)
 {
-	BorderImage = InBorderImage;
+	if (!BorderImage.IdenticalTo(InBorderImage))
+	{
+		BorderImage = InBorderImage;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBox.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBox.cpp
index 83159b62a6c9..394206e22f08 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBox.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SBox.cpp
@@ -45,12 +45,20 @@ void SBox::SetContent(const TSharedRef< SWidget >& InContent)
 
 void SBox::SetHAlign(EHorizontalAlignment HAlign)
 {
-	ChildSlot.HAlignment = HAlign;
+	if (ChildSlot.HAlignment != HAlign)
+	{
+		ChildSlot.HAlignment = HAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SBox::SetVAlign(EVerticalAlignment VAlign)
 {
-	ChildSlot.VAlignment = VAlign;
+	if (ChildSlot.VAlignment != VAlign)
+	{
+		ChildSlot.VAlignment = VAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SBox::SetPadding(const TAttribute<FMargin>& InPadding)
@@ -125,21 +133,18 @@ void SBox::SetMaxAspectRatio(TAttribute<FOptionalSize> InMaxAspectRatio)
 	}
 }
 
-#if SLATE_LAYOUT_CHANGE
-
-void SBox::ChildLayoutChanged()
+void SBox::ChildLayoutChanged(EInvalidateWidget InvalidateReason)
 {
-	if (WidthOverride.IsSet() && HeightOverride.IsSet())
+	if (WidthOverride.IsSet() && HeightOverride.IsSet() && !EnumHasAnyFlags(InvalidateReason, EInvalidateWidget::Visibility))
 	{
 		// Done.  We don't need to notify anyone else that our desired size has changed.
 	}
 	else
 	{
-		SPanel::ChildLayoutChanged();
+		SPanel::ChildLayoutChanged(InvalidateReason);
 	}
 }
 
-#endif
 
 FVector2D SBox::ComputeDesiredSize( float ) const
 {
@@ -206,8 +211,8 @@ float SBox::ComputeDesiredHeight() const
 
 void SBox::OnArrangeChildren( const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren ) const
 {
-	const EVisibility& MyCurrentVisibility = this->GetVisibility();
-	if ( ArrangedChildren.Accepts( MyCurrentVisibility ) )
+	const EVisibility ChildVisibility = ChildSlot.GetWidget()->GetVisibility();
+	if ( ArrangedChildren.Accepts(ChildVisibility) )
 	{
 		const FOptionalSize CurrentMaxAspectRatio = MaxAspectRatio.Get();
 		const FMargin SlotPadding(ChildSlot.SlotPadding.Get());
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SGridPanel.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SGridPanel.cpp
index 56316e576684..e4fbc8aeaa91 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SGridPanel.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SGridPanel.cpp
@@ -55,10 +55,11 @@ void SGridPanel::Construct( const FArguments& InArgs )
 
 int32 SGridPanel::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const
 {
-#if SLATE_DYNAMIC_PREPASS
-	// HACK
-	GetDesiredSize();
-#endif
+	if(GSlateLayoutCaching)
+	{
+		// HACK
+		GetDesiredSize();
+	}
 
 	FArrangedChildren ArrangedChildren(EVisibility::All);
 	this->ArrangeChildren(AllottedGeometry, ArrangedChildren);
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SSafeZone.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SSafeZone.cpp
index 6f02f2465ad2..ffb4ba49ae63 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SSafeZone.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SSafeZone.cpp
@@ -4,6 +4,7 @@
 #include "Layout/LayoutUtils.h"
 #include "Framework/Application/SlateApplication.h"
 #include "Misc/CoreDelegates.h"
+#include "Widgets/SViewport.h"
 
 float GSafeZoneScale = 1.0f;
 static FAutoConsoleVariableRef CVarDumpVMIR(
@@ -46,6 +47,7 @@ void SSafeZone::Construct( const FArguments& InArgs )
 #if WITH_EDITOR
 	OverrideScreenSize = InArgs._OverrideScreenSize;
 	OverrideDpiScale = InArgs._OverrideDpiScale;
+	FSlateApplication::Get().OnDebugSafeZoneChanged.AddSP(this, &SSafeZone::DebugSafeAreaUpdated);
 #endif
 
 	SetTitleSafe(bIsTitleSafe);
@@ -65,35 +67,26 @@ void SSafeZone::SafeAreaUpdated()
 
 void SSafeZone::SetTitleSafe( bool InIsTitleSafe )
 {
-	FDisplayMetrics Metrics;
-	FSlateApplication::Get().GetDisplayMetrics( Metrics );
-
-	const FMargin DeviceSafeMargin =
-#if PLATFORM_IOS
-		// Hack: This is a temp solution to support iPhoneX safeArea. TitleSafePaddingSize and ActionSafePaddingSize should be FVector4 and use them separately.
-		bIsTitleSafe
-		? FMargin(Metrics.TitleSafePaddingSize.X, Metrics.TitleSafePaddingSize.Y, Metrics.TitleSafePaddingSize.Z, Metrics.TitleSafePaddingSize.W)
-		: FMargin(Metrics.ActionSafePaddingSize.X, Metrics.ActionSafePaddingSize.Y, Metrics.ActionSafePaddingSize.Z, Metrics.ActionSafePaddingSize.W);
-#else
-		bIsTitleSafe ?
-		FMargin(Metrics.TitleSafePaddingSize.X, Metrics.TitleSafePaddingSize.Y) :
-		FMargin(Metrics.ActionSafePaddingSize.X, Metrics.ActionSafePaddingSize.Y);
-#endif
-
-
 #if WITH_EDITOR
-	if ( OverrideScreenSize.IsSet() )
+	if (OverrideScreenSize.IsSet() && !OverrideScreenSize.GetValue().IsZero())
 	{
-		const float WidthPaddingRatio = DeviceSafeMargin.Left / ( Metrics.PrimaryDisplayWidth * 0.5f );
-		const float HeightPaddingRatio = DeviceSafeMargin.Top / ( Metrics.PrimaryDisplayHeight * 0.5f );
-		const FMargin OverrideSafeMargin = FMargin(WidthPaddingRatio * OverrideScreenSize->X * 0.5f, HeightPaddingRatio * OverrideScreenSize->Y * 0.5f);
-
-		SafeMargin = OverrideSafeMargin;
+		FSlateApplication::Get().GetSafeZoneSize(SafeMargin, OverrideScreenSize.GetValue());
 	}
 	else
 #endif
 	{
-		SafeMargin = DeviceSafeMargin;
+		// Need to get owning viewport not display 
+		// use pixel values (same as custom safe zone above)
+		TSharedPtr<SViewport> GameViewport = FSlateApplication::Get().GetGameViewport();
+		if (GameViewport.IsValid())
+		{
+			TSharedPtr<ISlateViewport> ViewportInterface = GameViewport->GetViewportInterface().Pin();
+			if (ViewportInterface.IsValid())
+			{
+				const FIntPoint ViewportSize = ViewportInterface->GetSize();
+				FSlateApplication::Get().GetSafeZoneSize(SafeMargin, ViewportSize);
+			}
+		}
 	}
 
 #if PLATFORM_XBOXONE
@@ -119,10 +112,14 @@ void SSafeZone::SetOverrideScreenInformation(TOptional<FVector2D> InScreenSize,
 {
 	OverrideScreenSize = InScreenSize;
 	OverrideDpiScale = InOverrideDpiScale;
-
 	SetTitleSafe(bIsTitleSafe);
 }
 
+void SSafeZone::DebugSafeAreaUpdated(const FMargin& NewSafeZone)
+{
+	SafeAreaUpdated();
+}
+
 #endif
 
 FMargin SSafeZone::GetSafeMargin(float InLayoutScale) const
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScaleBox.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScaleBox.cpp
index a37e330ced50..8858d36233fb 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScaleBox.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScaleBox.cpp
@@ -13,7 +13,7 @@
 void SScaleBox::Construct( const SScaleBox::FArguments& InArgs )
 {
 	Stretch = InArgs._Stretch;
-	RefreshSafeZoneScale();
+
 
 	StretchDirection = InArgs._StretchDirection;
 	UserSpecifiedScale = InArgs._UserSpecifiedScale;
@@ -31,6 +31,13 @@ void SScaleBox::Construct( const SScaleBox::FArguments& InArgs )
 		InArgs._Content.Widget
 	];
 
+#if WITH_EDITOR
+	OverrideScreenSize = InArgs._OverrideScreenSize;
+	FSlateApplication::Get().OnDebugSafeZoneChanged.AddSP(this, &SScaleBox::DebugSafeAreaUpdated);
+#endif
+
+
+	RefreshSafeZoneScale();
 	OnSafeFrameChangedHandle = FCoreDelegates::OnSafeFrameChangedEvent.AddSP(this, &SScaleBox::RefreshSafeZoneScale);
 }
 
@@ -161,6 +168,12 @@ void SScaleBox::OnArrangeChildren( const FGeometry& AllottedGeometry, FArrangedC
 				}
 			}
 
+			if (GSlateLayoutCaching && LastAreaSize != AreaSize)
+			{
+				const_cast<SScaleBox*>(this)->InvalidatePrepass();
+				bRequiresAnotherPrepass = true;
+			}
+
 			LastAreaSize = AreaSize;
 			LastIncomingScale = AllottedGeometry.Scale;
 			LastSlotWidgetDesiredSize = SlotWidgetDesiredSize;
@@ -239,43 +252,82 @@ void SScaleBox::SetContent(TSharedRef<SWidget> InContent)
 
 void SScaleBox::SetHAlign(EHorizontalAlignment HAlign)
 {
-	ChildSlot.HAlignment = HAlign;
+	if(ChildSlot.HAlignment != HAlign)
+	{
+		ChildSlot.HAlignment = HAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SScaleBox::SetVAlign(EVerticalAlignment VAlign)
 {
-	ChildSlot.VAlignment = VAlign;
+	if(ChildSlot.VAlignment != VAlign)
+	{
+		ChildSlot.VAlignment = VAlign;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SScaleBox::SetStretchDirection(EStretchDirection::Type InStretchDirection)
 {
-	StretchDirection = InStretchDirection;
+	if(!StretchDirection.IdenticalTo(InStretchDirection))
+	{
+		StretchDirection = InStretchDirection;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SScaleBox::SetStretch(EStretch::Type InStretch)
 {
-	Stretch = InStretch;
-	RefreshSafeZoneScale();
+	if(!Stretch.IdenticalTo(InStretch))
+	{
+		Stretch = InStretch;
+		RefreshSafeZoneScale();
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SScaleBox::SetUserSpecifiedScale(float InUserSpecifiedScale)
 {
-	UserSpecifiedScale = InUserSpecifiedScale;
+	if(!UserSpecifiedScale.IdenticalTo(InUserSpecifiedScale))
+	{
+		UserSpecifiedScale = InUserSpecifiedScale;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 void SScaleBox::SetIgnoreInheritedScale(bool InIgnoreInheritedScale)
 {
-	IgnoreInheritedScale = InIgnoreInheritedScale;
+	if(!IgnoreInheritedScale.IdenticalTo(InIgnoreInheritedScale))
+	{
+		IgnoreInheritedScale = InIgnoreInheritedScale;
+		Invalidate(EInvalidateWidget::Layout);
+	}
 }
 
 FVector2D SScaleBox::ComputeDesiredSize(float InScale) const
 {
-	float LayoutScale = GetLayoutScale();
+	float ExpectedLayoutScale = GetLayoutScale();
 	if (IgnoreInheritedScale.Get(false))
 	{
-		return LayoutScale * SCompoundWidget::ComputeDesiredSize(InScale) / InScale;
+		return ExpectedLayoutScale * SCompoundWidget::ComputeDesiredSize(InScale) / InScale;
 	}
-	return LayoutScale * SCompoundWidget::ComputeDesiredSize(InScale);
+
+	FVector2D ComputedDesiredSize = SCompoundWidget::ComputeDesiredSize(InScale);
+
+	const EStretch::Type CurrentStretch = Stretch.Get();
+
+	switch (CurrentStretch)
+	{
+	case EStretch::ScaleToFitX:
+		ExpectedLayoutScale = ComputedDesiredSize.X == 0.0f ? 1.0f : FMath::Max(1.0f, GetCachedGeometry().GetLocalSize().X / ComputedDesiredSize.X);
+		break;
+	case EStretch::ScaleToFitY:
+		ExpectedLayoutScale = ComputedDesiredSize.Y == 0.0f ? 1.0f : FMath::Max(1.0f, GetCachedGeometry().GetLocalSize().Y / ComputedDesiredSize.Y);
+		break;
+	}
+
+	return ExpectedLayoutScale * ComputedDesiredSize;
 }
 
 float SScaleBox::GetRelativeLayoutScale(const FSlotBase& Child, float LayoutScaleMultiplier) const
@@ -317,33 +369,52 @@ float SScaleBox::GetLayoutScale() const
 void SScaleBox::RefreshSafeZoneScale()
 {
 	float ScaleDownBy = 0.f;
-
-	if (Stretch.Get() == EStretch::ScaleBySafeZone)
+	FMargin SafeMargin;
+	FVector2D ScaleBy;
+#if WITH_EDITOR
+	if (OverrideScreenSize.IsSet() && !OverrideScreenSize.GetValue().IsZero())
 	{
-		TSharedPtr<SViewport> GameViewport = FSlateApplication::Get().GetGameViewport();
-		if (GameViewport.IsValid())
-		{
-			TSharedPtr<ISlateViewport> ViewportInterface = GameViewport->GetViewportInterface().Pin();
-			if (ViewportInterface.IsValid())
-			{
-				const FIntPoint ViewportSize = ViewportInterface->GetSize();
-
-				FDisplayMetrics Metrics;
-				FSlateApplication::Get().GetDisplayMetrics(Metrics);
-
-				// Safe zones are uniform, so the axis we check is irrelevant
-#if PLATFORM_IOS
-				// FVector4(X,Y,Z,W) being used like FMargin(left, top, right, bottom)
-				// Consequence: Left and Right safe zones are represented by X and Z.
-				const float LeftSafeZone = Metrics.TitleSafePaddingSize.X;
-				const float RightSafeZone = Metrics.TitleSafePaddingSize.Z;
-				ScaleDownBy = (LeftSafeZone + RightSafeZone) / (float)ViewportSize.X;
-#else
-				ScaleDownBy = (Metrics.TitleSafePaddingSize.X * 2.f) / (float)ViewportSize.X;
+		FSlateApplication::Get().GetSafeZoneSize(SafeMargin, OverrideScreenSize.GetValue());
+		ScaleBy = OverrideScreenSize.GetValue();
+	}
+	else
 #endif
+	{
+		if (Stretch.Get() == EStretch::ScaleBySafeZone)
+		{
+			TSharedPtr<SViewport> GameViewport = FSlateApplication::Get().GetGameViewport();
+			if (GameViewport.IsValid())
+			{
+				TSharedPtr<ISlateViewport> ViewportInterface = GameViewport->GetViewportInterface().Pin();
+				if (ViewportInterface.IsValid())
+				{
+					const FIntPoint ViewportSize = ViewportInterface->GetSize();
+
+					FSlateApplication::Get().GetSafeZoneSize(SafeMargin, ViewportSize);
+					ScaleBy = ViewportSize;
+				}
 			}
 		}
 	}
+	const float SafeZoneScaleX = FMath::Max(SafeMargin.Left, SafeMargin.Right)/ (float)ScaleBy.X;
+	const float SafeZoneScaleY = FMath::Max(SafeMargin.Top, SafeMargin.Bottom) / (float)ScaleBy.Y;
+
+	// In order to deal with non-uniform safe-zones we take the largest scale as the amount to scale down by.
+	ScaleDownBy = FMath::Max(SafeZoneScaleX, SafeZoneScaleY);
 
 	SafeZoneScale = 1.f - ScaleDownBy;
 }
+
+#if WITH_EDITOR
+void SScaleBox::DebugSafeAreaUpdated(const FMargin& NewSafeZone)
+{
+	RefreshSafeZoneScale();
+}
+
+void SScaleBox::SetOverrideScreenInformation(TOptional<FVector2D> InScreenSize)
+{
+	OverrideScreenSize = InScreenSize;
+	RefreshSafeZoneScale();
+}
+
+#endif
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBar.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBar.cpp
index abd750bfaca0..c2a0996edc8f 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBar.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBar.cpp
@@ -234,7 +234,7 @@ FLinearColor SScrollBar::GetThumbOpacity() const
 	}
 	else
 	{
-		if ( bHideWhenNotInUse )
+		if ( bHideWhenNotInUse && !bAlwaysShow )
 		{
 			const double LastInteractionDelta = bIsScrolling ? 0 : ( FSlateApplication::Get().GetCurrentTime() - LastInteractionTime );
 
@@ -343,6 +343,7 @@ void SScrollBar::SetThickness(TAttribute<FVector2D> InThickness)
 
 void SScrollBar::SetScrollBarAlwaysVisible(bool InAlwaysVisible)
 {
+	bAlwaysShow = InAlwaysVisible;
 	if ( InAlwaysVisible )
 	{
 		Visibility = EVisibility::Visible;
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBox.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBox.cpp
index c2120db9b10a..9fb317c1cb8f 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBox.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SScrollBox.cpp
@@ -371,6 +371,23 @@ float SScrollBox::GetScrollOffset() const
 	return DesiredScrollOffset;
 }
 
+float SScrollBox::GetViewFraction() const
+{
+	const FGeometry ScrollPanelGeometry = FindChildGeometry(CachedGeometry, ScrollPanel.ToSharedRef());
+	const float ContentSize = GetScrollComponentFromVector(ScrollPanel->GetDesiredSize());
+
+	return FMath::Clamp<float>(GetScrollComponentFromVector(CachedGeometry.GetLocalSize()) > 0 ? GetScrollComponentFromVector(ScrollPanelGeometry.Size) / ContentSize : 1, 0.0f, 1.0f);
+}
+
+float SScrollBox::GetViewOffsetFraction() const
+{
+	const FGeometry ScrollPanelGeometry = FindChildGeometry(CachedGeometry, ScrollPanel.ToSharedRef());
+	const float ContentSize = GetScrollComponentFromVector(ScrollPanel->GetDesiredSize());
+
+	const float ViewFraction = GetViewFraction();
+	return FMath::Clamp<float>( DesiredScrollOffset/ContentSize, 0.0, 1.0 - ViewFraction );
+}
+
 void SScrollBox::SetScrollOffset( float NewScrollOffset )
 {
 	DesiredScrollOffset = NewScrollOffset;
@@ -588,8 +605,8 @@ void SScrollBox::Tick( const FGeometry& AllottedGeometry, const double InCurrent
 	}
 
 	// If this scroll box has no size, do not compute a view fraction because it will be wrong and causes pop in when the size is available
-	const float ViewFraction = FMath::Clamp<float>(GetScrollComponentFromVector(AllottedGeometry.GetLocalSize()) > 0 ? GetScrollComponentFromVector(ScrollPanelGeometry.Size) / ContentSize : 1, 0.0f, 1.0f);
-	const float ViewOffset = FMath::Clamp<float>( DesiredScrollOffset/ContentSize, 0.0, 1.0 - ViewFraction );
+	const float ViewFraction = GetViewFraction();
+	const float ViewOffset = GetViewOffsetFraction();
 	
 	// Update the scrollbar with the clamped version of the offset
 	float TargetPhysicalOffset = GetScrollComponentFromVector(ViewOffset*ScrollPanel->GetDesiredSize());
@@ -787,6 +804,22 @@ FReply SScrollBox::OnMouseMove( const FGeometry& MyGeometry, const FPointerEvent
 	return FReply::Unhandled();
 }
 
+void SScrollBox::OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent )
+{
+	if ( MouseEvent.IsTouchEvent() )
+	{
+		if ( !bFingerOwningTouchInteraction.IsSet() )
+		{
+			// If we currently do not have touch capture, allow this widget to begin scrolling on pointer enter events
+			// if it comes from a child widget
+			if ( MyGeometry.IsUnderLocation(MouseEvent.GetLastScreenSpacePosition()) )
+			{
+				bFingerOwningTouchInteraction = MouseEvent.GetPointerIndex();
+			}
+		}
+	}
+}
+
 void SScrollBox::OnMouseLeave( const FPointerEvent& MouseEvent )
 {
 	if ( HasMouseCapture() == false )
@@ -896,9 +929,9 @@ FReply SScrollBox::OnTouchEnded(const FGeometry& MyGeometry, const FPointerEvent
 	return FReply::Unhandled();
 }
 
-void SScrollBox::OnMouseCaptureLost()
+void SScrollBox::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
-	SCompoundWidget::OnMouseCaptureLost();
+	SCompoundWidget::OnMouseCaptureLost(CaptureLostEvent);
 }
 
 FNavigationReply SScrollBox::OnNavigation(const FGeometry& MyGeometry, const FNavigationEvent& InNavigationEvent)
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWidgetSwitcher.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWidgetSwitcher.cpp
index afd36daccd80..054985182123 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWidgetSwitcher.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWidgetSwitcher.cpp
@@ -8,7 +8,9 @@ SWidgetSwitcher::SWidgetSwitcher()
 	: WidgetIndex()
 	, AllChildren(this)
 	, OneDynamicChild(this, &AllChildren, &WidgetIndex)
-{ }
+{ 
+	bCanTick = false;
+}
 
 
 SWidgetSwitcher::FSlot& SWidgetSwitcher::AddSlot( int32 SlotIndex )
@@ -115,16 +117,18 @@ int32 SWidgetSwitcher::RemoveSlot( TSharedRef<SWidget> WidgetToRemove )
 	return -1;
 }
 
-
 void SWidgetSwitcher::SetActiveWidgetIndex( int32 Index )
 {
 	WidgetIndex = Index;
 	Invalidate(EInvalidateWidget::LayoutAndVolatility);
 }
 
-
-/* SCompoundWidget interface
- *****************************************************************************/
+#if SLATE_PARENT_POINTERS
+bool SWidgetSwitcher::ValidatePathToChild(SWidget* InChild)
+{
+	return InChild == GetActiveWidget().Get();
+}
+#endif
 
 void SWidgetSwitcher::OnArrangeChildren( const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren ) const
 {
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWindowTitleBarArea.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWindowTitleBarArea.cpp
index 28d89de088bd..4f0d12365575 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWindowTitleBarArea.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Layout/SWindowTitleBarArea.cpp
@@ -13,6 +13,9 @@
 #define IMAGE_BRUSH( RelativePath, ... ) FSlateImageBrush(FPaths::EngineContentDir() / TEXT("Slate") / RelativePath + TEXT(".png"), __VA_ARGS__)
 #define BOX_BRUSH( RelativePath, ... ) FSlateBoxBrush(FPaths::EngineContentDir() / TEXT("Slate") / RelativePath + TEXT(".png"), __VA_ARGS__)
 
+FSimpleDelegate SWindowTitleBarArea::OnCloseButtonClicked;
+bool SWindowTitleBarArea::bIsCloseButtonActive = true;
+
 FButtonStyle SWindowTitleBarArea::MinimizeButtonStyle;
 FButtonStyle SWindowTitleBarArea::MaximizeButtonStyle;
 FButtonStyle SWindowTitleBarArea::RestoreButtonStyle;
@@ -311,9 +314,16 @@ FReply SWindowTitleBarArea::MaximizeRestoreButton_OnClicked()
 
 FReply SWindowTitleBarArea::CloseButton_OnClicked()
 {
-	if (GameWindow.IsValid())
+	if (bIsCloseButtonActive)
 	{
-		GameWindow->RequestDestroyWindow();
+		if (OnCloseButtonClicked.IsBound())
+		{
+			OnCloseButtonClicked.Execute();
+		}
+		else if (GameWindow.IsValid())
+		{
+			GameWindow->RequestDestroyWindow();
+		}
 	}
 
 	return FReply::Handled();
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Notifications/SProgressBar.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Notifications/SProgressBar.cpp
index 2c5d591c483c..da4078af2044 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Notifications/SProgressBar.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Notifications/SProgressBar.cpp
@@ -154,7 +154,6 @@ int32 SProgressBar::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGe
 	if( ProgressFraction.IsSet() )
 	{
 		const float ClampedFraction = FMath::Clamp(ProgressFraction.GetValue(), 0.0f, 1.0f);
-
 		switch (BarFillType)
 		{
 			case EProgressBarFillType::RightToLeft:
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/SInvalidationPanel.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/SInvalidationPanel.cpp
index 5e65a1f067f4..554a72173cdb 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/SInvalidationPanel.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/SInvalidationPanel.cpp
@@ -10,6 +10,7 @@
 #include "Framework/Application/SlateApplication.h"
 #include "Layout/WidgetCaching.h"
 #include "Types/ReflectionMetadata.h"
+#include "Rendering/SlateObjectReferenceCollector.h"
 
 //DECLARE_CYCLE_STAT(TEXT("Invalidation Time"), STAT_InvalidationTime, STATGROUP_Slate);
 DECLARE_DWORD_COUNTER_STAT(TEXT("Num Cached Elements"), STAT_SlateNumCachedElements, STATGROUP_Slate);
@@ -19,6 +20,8 @@ DECLARE_DWORD_COUNTER_STAT(TEXT("Num Volatile Widgets"), STAT_SlateNumVolatileWi
 DECLARE_CYCLE_STAT(TEXT("SInvalidationPanel::Tick"), STAT_SlateInvalidationTick, STATGROUP_Slate);
 DECLARE_CYCLE_STAT(TEXT("SInvalidationPanel::Paint"), STAT_SlateInvalidationPaint, STATGROUP_Slate);
 
+DEFINE_LOG_CATEGORY_STATIC(LogSlateInvalidationPanel, Log, All);
+
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 
 /** True if we should allow widgets to be cached in the UI at all. */
@@ -86,12 +89,13 @@ void SInvalidationPanel::Construct( const FArguments& InArgs )
 	];
 
 	bNeedsCaching = true;
+	bNeedsCachePrepass = true;
 	bIsInvalidating = false;
 	bCanCache = true;
 	RootCacheNode = nullptr;
 	LastUsedCachedNodeIndex = 0;
 	LastHitTestIndex = 0;
-	LastLayerId = 0;
+	MaximumLayerIdCachedAt = 0;
 	LastClippingIntersectionSize = FVector2D::ZeroVector;
 
 	bCacheRelativeTransforms = InArgs._CacheRelativeTransforms;
@@ -99,6 +103,7 @@ void SInvalidationPanel::Construct( const FArguments& InArgs )
 	bCacheRenderData = ShouldCacheRenderData();
 
 #if SLATE_VERBOSE_NAMED_EVENTS
+	DebugName = InArgs._DebugName;
 	DebugTickName = InArgs._DebugName + TEXT("_Tick");
 	DebugPaintName = InArgs._DebugName + TEXT("_Paint");
 #endif
@@ -133,13 +138,34 @@ bool SInvalidationPanel::IsCachingNeeded() const
 
 bool SInvalidationPanel::IsCachingNeeded(FSlateWindowElementList& OutDrawElements, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, int32 LayerId) const
 {
-	if (LastLayerId != LayerId)
+	// We only need to re-cache if the incoming layer is higher than the maximum layer Id we cached at,
+	// we do this so that widgets that appear and live behind your invalidated UI don't constantly invalidate
+	// everything above it.
+	if (LayerId > MaximumLayerIdCachedAt)
 	{
 		return true;
 	}
 	
 	if (bCacheRelativeTransforms)
 	{
+		if (LastClippingIndex != OutDrawElements.GetClippingIndex())
+		{
+			return true;
+		}
+
+		int32 ClippingStateCount = OutDrawElements.GetClippingManager().GetClippingStates().Num();
+		if (LastClippingStateOffset != ClippingStateCount)
+		{
+			return true;
+		}
+
+		bool bOverlapping;
+		FVector2D IntersectionSize = AllottedGeometry.GetLayoutBoundingRect().IntersectionWith(MyCullingRect, bOverlapping).GetSize();
+		if (!LastClippingIntersectionSize.Equals(IntersectionSize, 1.0f))
+		{
+			return true;
+		}
+
 		// If the container we're in has changed in either scale or the rotation matrix has changed, 
 		if ( AllottedGeometry.GetAccumulatedLayoutTransform().GetScale() != LastAllottedGeometry.GetAccumulatedLayoutTransform().GetScale() ||
 			 AllottedGeometry.GetAccumulatedRenderTransform().GetMatrix() != LastAllottedGeometry.GetAccumulatedRenderTransform().GetMatrix() )
@@ -174,20 +200,19 @@ bool SInvalidationPanel::IsCachingNeeded(FSlateWindowElementList& OutDrawElement
 	{
 		return true;
 	}
-
-	if (bCacheRelativeTransforms)
-	{
-		bool bOverlapping;
-		FVector2D IntersectionSize = AllottedGeometry.GetLayoutBoundingRect().IntersectionWith(MyCullingRect, bOverlapping).GetSize();
-		if (!LastClippingIntersectionSize.Equals(IntersectionSize, 1.0f))
-		{
-			return true;
-		}
-	}
 	
 	return false;
 }
 
+void SInvalidationPanel::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	Collector.AddReferencedObjects(CachedResources);
+
+#if SLATE_VERBOSE_NAMED_EVENTS
+	UE_LOG(LogSlateInvalidationPanel, Verbose, TEXT("SInvalidationPanel(%s): %d References"), *DebugName, CachedResources.Num());
+#endif
+}
+
 void SInvalidationPanel::SetCanCache(bool InCanCache)
 {
 	bCanCache = InCanCache;
@@ -198,7 +223,7 @@ void SInvalidationPanel::SetCanCache(bool InCanCache)
 void SInvalidationPanel::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
 {
 #if SLATE_VERBOSE_NAMED_EVENTS
-	FScopedNamedEvent Event(FColor::Blue, *DebugTickName);
+	SCOPED_NAMED_EVENT_FSTRING(DebugTickName, FColor::Blue);
 #endif
 
 	SCOPE_CYCLE_COUNTER(STAT_SlateInvalidationTick);
@@ -207,8 +232,6 @@ void SInvalidationPanel::Tick( const FGeometry& AllottedGeometry, const double I
 	{
 		//SCOPE_CYCLE_COUNTER(STAT_InvalidationTime);
 
-		const bool bWasCachingNeeded = IsCachingNeeded();
-
 		bool bShouldCacheRenderData = ShouldCacheRenderData();
 		if (bCacheRenderData != bShouldCacheRenderData)
 		{
@@ -216,12 +239,10 @@ void SInvalidationPanel::Tick( const FGeometry& AllottedGeometry, const double I
 			InvalidateCache();
 		}
 		
-		// TODO We may be double pre-passing here, if the invalidation happened at the end of last frame,
-		// we'll have already done one pre-pass before getting here.
-		if ( bWasCachingNeeded )
+		if (bNeedsCachePrepass)
 		{
-			SlatePrepass(AllottedGeometry.Scale);
 			CachePrepass(SharedThis(this));
+			bNeedsCachePrepass = false;
 		}
 	}
 }
@@ -276,7 +297,7 @@ void SInvalidationPanel::OnGlobalInvalidate()
 int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const
 {
 #if SLATE_VERBOSE_NAMED_EVENTS
-	FScopedNamedEvent Event(FColor::Purple, *DebugPaintName);
+	SCOPED_NAMED_EVENT_FSTRING(DebugPaintName, FColor::Purple);
 #endif
 	SCOPE_CYCLE_COUNTER(STAT_SlateInvalidationPaint);
 
@@ -297,9 +318,14 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 				// to volatile and need to re-cache.
 				bNeedsCaching = false;
 
+				bNeedsCachePrepass = true;
+
 				// Mark that we're in the process of invalidating.
 				bIsInvalidating = true;
 
+				// Record a new maximum layer Id, throw in 10 so we have a bit of padding before we need to recache.
+				MaximumLayerIdCachedAt = LayerId + 10;
+
 				CachedWindowElements = FSlateApplication::Get().GetCachableElementList(OutDrawElements.GetWindow(), this);
 
 				// Reset the render data handle in case it was in use, and we're not overriding it this frame.
@@ -311,35 +337,24 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 				RootCacheNode = CreateCacheNode();
 				RootCacheNode->Initialize(Args, SharedMutableThis, AllottedGeometry);
 
+				// TODO We may be double pre-passing here, if the invalidation happened at the end of last frame,
+				// we'll have already done one pre-pass before getting here.
+				ChildSlot.GetWidget()->SlatePrepass(AllottedGeometry.Scale);
+
 				//TODO: When SWidget::Paint is called don't drag self if volatile, and we're doing a cache pass.
 				CachedMaxChildLayer = SCompoundWidget::OnPaint(
 					Args.EnableCaching(SharedMutableThis, RootCacheNode, true, false),
 					AllottedGeometry,
 					MyCullingRect,
 					*CachedWindowElements.Get(),
-					LayerId,
+					MaximumLayerIdCachedAt,
 					InWidgetStyle,
 					bParentEnabled);
 
 				{
-					// @TODO - fixme!
-					// This fixes a minor leak, but causes a GPU hang. 
-					// Possibly caused by non-threadsafe access of this array when the loading screen is visible
-					//CachedResources.Reset();
-
-					const TArray<FSlateDrawElement>& CachedElements = CachedWindowElements->GetDrawElements();
-					const int32 CachedElementCount = CachedElements.Num();
-					for (int32 Index = 0; Index < CachedElementCount; Index++)
-					{
-						const FSlateDrawElement& LocalElement = CachedElements[Index];
-						if (const FSlateBrush* BrushResource = LocalElement.GetDataPayload().BrushResource)
-						{
-							if (UObject* ResourceObject = BrushResource->GetResourceObject())
-							{
-								CachedResources.Add(ResourceObject);
-							}
-						}
-					}
+					CachedResources.Reset();
+					FSlateObjectReferenceCollector Collector(CachedResources);
+					CachedWindowElements->AddReferencedObjects(Collector);
 				}
 
 				if (bCacheRelativeTransforms)
@@ -350,7 +365,7 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 				LastClippingStateOffset = OutDrawElements.GetClippingManager().GetClippingStates().Num();
 				LastClippingIndex = OutDrawElements.GetClippingIndex();
 				LastClippingState = OutDrawElements.GetClippingState();
-
+				
 				const int32 ClippingStateOffset = OutDrawElements.GetClippingManager().MergeClippingStates(CachedWindowElements->GetClippingManager().GetClippingStates());
 
 				TArray<FSlateDrawElement>& CachedElements = CachedWindowElements->GetDrawElements();
@@ -376,7 +391,6 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 
 				LastAllottedGeometry = AllottedGeometry;
 				LastClipRectSize = MyCullingRect.GetSize().RoundToVector();
-				LastLayerId = LayerId;
 
 				if (bCacheRelativeTransforms)
 				{
@@ -389,7 +403,7 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 		else
 		{
 #if SLATE_VERBOSE_NAMED_EVENTS
-			FScopedNamedEvent MergeClipEvent(FColor::Magenta, TEXT("SInvalidationPanel::MergeClippingStates"));
+			SCOPED_NAMED_EVENT_TEXT("SInvalidationPanel::MergeClippingStates", FColor::Magenta);
 #endif
 			OutDrawElements.GetClippingManager().MergeClippingStates(CachedWindowElements->GetClippingManager().GetClippingStates());
 		}
@@ -406,28 +420,27 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 			// recording the hit test geometry on the same frame that we regenerate the cache.
 			if (bWasCachingNeeded == false)
 			{
-				INC_DWORD_STAT_BY(STAT_SlateNumCachedElements, CachedWindowElements->GetDrawElements().Num());
+				INC_DWORD_STAT_BY(STAT_SlateNumCachedElements, CachedWindowElements->GetElementCount());
 
-				RootCacheNode->RecordHittestGeometry(Args.GetGrid(), Args.GetLastHitTestIndex(), LayerId, AbsoluteDeltaPosition);
+				RootCacheNode->RecordHittestGeometry(Args.GetGrid(), Args.GetLastHitTestIndex(), MaximumLayerIdCachedAt, AbsoluteDeltaPosition);
 			}
 			else
 			{
-				INC_DWORD_STAT_BY(STAT_SlateNumInvalidatedElements, CachedWindowElements->GetDrawElements().Num());
+				INC_DWORD_STAT_BY(STAT_SlateNumInvalidatedElements, CachedWindowElements->GetElementCount());
 			}
 		}
 
 		int32 OutMaxChildLayer = CachedMaxChildLayer;
 
+		if (bCacheRenderData)
 		{
-			if (bCacheRenderData)
-			{
-				FSlateDrawElement::MakeCachedBuffer(OutDrawElements, LayerId, CachedRenderData, AbsoluteDeltaPosition);
-				OutDrawElements.MergeResources(CachedResources);
-			}
-			else
-			{
-				OutDrawElements.MergeElementList(CachedWindowElements.Get(), AbsoluteDeltaPosition);
-			}
+			FSlateDrawElement::MakeCachedBuffer(OutDrawElements, MaximumLayerIdCachedAt, CachedRenderData, AbsoluteDeltaPosition);
+			// Merge the resources into the draw element list so it can keep UObjects alive.
+			OutDrawElements.MergeResources(CachedResources);
+		}
+		else
+		{
+			OutDrawElements.MergeElementList(CachedWindowElements.Get(), AbsoluteDeltaPosition);
 		}
 
 		// Paint the volatile elements
@@ -553,7 +566,7 @@ int32 SInvalidationPanel::OnPaint( const FPaintArgs& Args, const FGeometry& Allo
 	else
 	{
 #if SLATE_VERBOSE_NAMED_EVENTS
-		FScopedNamedEvent UncachedPaintEvent(FColor::Emerald, TEXT("SInvalidationPanel Uncached"));
+		SCOPED_NAMED_EVENT_TEXT("SInvalidationPanel Uncached", FColor::Emerald);
 #endif
 		return SCompoundWidget::OnPaint(Args, AllottedGeometry, MyCullingRect, OutDrawElements, LayerId, InWidgetStyle, bParentEnabled);
 	}
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/SWeakWidget.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/SWeakWidget.cpp
index 2d2a89c18f81..b7258b0c1f18 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/SWeakWidget.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/SWeakWidget.cpp
@@ -12,6 +12,7 @@ SWeakWidget::SWeakWidget()
 
 void SWeakWidget::Construct(const FArguments& InArgs)
 {
+	bCanTick = false;
 	WeakChild.AttachWidget( InArgs._PossiblyNullContent );
 }
 
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SMultiLineEditableText.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SMultiLineEditableText.cpp
index 2b515ce35259..5b92130e4388 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SMultiLineEditableText.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SMultiLineEditableText.cpp
@@ -40,6 +40,7 @@ void SMultiLineEditableText::Construct( const FArguments& InArgs )
 	bAllowContextMenu = InArgs._AllowContextMenu;
 	OnContextMenuOpening = InArgs._OnContextMenuOpening;
 	bRevertTextOnEscape = InArgs._RevertTextOnEscape;
+	VirtualKeyboardOptions = InArgs._VirtualKeyboardOptions;
 	VirtualKeyboardTrigger = InArgs._VirtualKeyboardTrigger;
 	VirtualKeyboardDismissAction = InArgs._VirtualKeyboardDismissAction;
 	OnHScrollBarUserScrolled = InArgs._OnHScrollBarUserScrolled;
@@ -315,6 +316,11 @@ EKeyboardType SMultiLineEditableText::GetVirtualKeyboardType() const
 	return Keyboard_Default;
 }
 
+FVirtualKeyboardOptions SMultiLineEditableText::GetVirtualKeyboardOptions() const
+{
+	return VirtualKeyboardOptions;
+}
+
 EVirtualKeyboardTrigger SMultiLineEditableText::GetVirtualKeyboardTrigger() const
 {
 	return VirtualKeyboardTrigger.Get();
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SRichTextBlock.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SRichTextBlock.cpp
index 674951ffccb4..991715714656 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SRichTextBlock.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SRichTextBlock.cpp
@@ -53,6 +53,8 @@ void SRichTextBlock::Construct( const FArguments& InArgs )
 		TextLayoutCache = MakeUnique<FSlateTextBlockLayout>(this, TextStyle, InArgs._TextShapingMethod, InArgs._TextFlowDirection, InArgs._CreateSlateTextLayout, Marshaller.ToSharedRef(), nullptr);
 		TextLayoutCache->SetDebugSourceInfo(TAttribute<FString>::Create(TAttribute<FString>::FGetter::CreateLambda([this]{ return FReflectionMetaData::GetWidgetDebugInfo(this); })));
 	}
+
+	bCanTick = false;
 }
 
 int32 SRichTextBlock::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Text/STextBlock.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Text/STextBlock.cpp
index af553f7e2e78..18381932fc4a 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Text/STextBlock.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Text/STextBlock.cpp
@@ -211,8 +211,11 @@ bool STextBlock::ComputeVolatility() const
 
 void STextBlock::SetFont(const TAttribute< FSlateFontInfo >& InFont)
 {
-	Font = InFont;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!Font.IsSet() || !Font.IdenticalTo(InFont))
+	{
+		Font = InFont;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetColorAndOpacity(const TAttribute<FSlateColor>& InColorAndOpacity)
@@ -220,7 +223,7 @@ void STextBlock::SetColorAndOpacity(const TAttribute<FSlateColor>& InColorAndOpa
 	if ( !ColorAndOpacity.IsSet() || !ColorAndOpacity.IdenticalTo(InColorAndOpacity) )
 	{
 		ColorAndOpacity = InColorAndOpacity;
-		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+		Invalidate(EInvalidateWidget::PaintAndVolatility);
 	}
 }
 
@@ -253,56 +256,83 @@ void STextBlock::SetTextFlowDirection(const TOptional<ETextFlowDirection>& InTex
 
 void STextBlock::SetWrapTextAt(const TAttribute<float>& InWrapTextAt)
 {
-	WrapTextAt = InWrapTextAt;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!WrapTextAt.IdenticalTo(InWrapTextAt))
+	{
+		WrapTextAt = InWrapTextAt;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetAutoWrapText(const TAttribute<bool>& InAutoWrapText)
 {
-	AutoWrapText = InAutoWrapText;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!AutoWrapText.IdenticalTo(InAutoWrapText))
+	{
+		AutoWrapText = InAutoWrapText;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetWrappingPolicy(const TAttribute<ETextWrappingPolicy>& InWrappingPolicy)
 {
-	WrappingPolicy = InWrappingPolicy;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!WrappingPolicy.IdenticalTo(InWrappingPolicy))
+	{
+		WrappingPolicy = InWrappingPolicy;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetShadowOffset(const TAttribute<FVector2D>& InShadowOffset)
 {
-	ShadowOffset = InShadowOffset;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!ShadowOffset.IdenticalTo(InShadowOffset))
+	{
+		ShadowOffset = InShadowOffset;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetShadowColorAndOpacity(const TAttribute<FLinearColor>& InShadowColorAndOpacity)
 {
-	ShadowColorAndOpacity = InShadowColorAndOpacity;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!ShadowColorAndOpacity.IdenticalTo(InShadowColorAndOpacity))
+	{
+		ShadowColorAndOpacity = InShadowColorAndOpacity;
+		Invalidate(EInvalidateWidget::PaintAndVolatility);
+	}
 }
 
 void STextBlock::SetMinDesiredWidth(const TAttribute<float>& InMinDesiredWidth)
 {
-	MinDesiredWidth = InMinDesiredWidth;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!MinDesiredWidth.IdenticalTo(InMinDesiredWidth))
+	{
+		MinDesiredWidth = InMinDesiredWidth;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetLineHeightPercentage(const TAttribute<float>& InLineHeightPercentage)
 {
-	LineHeightPercentage = InLineHeightPercentage;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!LineHeightPercentage.IdenticalTo(InLineHeightPercentage))
+	{
+		LineHeightPercentage = InLineHeightPercentage;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetMargin(const TAttribute<FMargin>& InMargin)
 {
-	Margin = InMargin;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!Margin.IdenticalTo(InMargin))
+	{
+		Margin = InMargin;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 void STextBlock::SetJustification(const TAttribute<ETextJustify::Type>& InJustification)
 {
-	Justification = InJustification;
-	Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	if(!Justification.IdenticalTo(InJustification))
+	{
+		Justification = InJustification;
+		Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
 }
 
 FTextBlockStyle STextBlock::GetComputedTextStyle() const
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateEditableTextLayout.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateEditableTextLayout.cpp
index b636fe45483d..31f5649d4b7a 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateEditableTextLayout.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateEditableTextLayout.cpp
@@ -70,17 +70,17 @@ FSlateEditableTextLayout::FSlateEditableTextLayout(ISlateEditableTextWidget& InO
 	CreateSlateTextLayout = InCreateSlateTextLayout;
 	if (!CreateSlateTextLayout.IsBound())
 	{
-		SWidget* OwnerWidgetPtr = &InOwnerWidget.GetSlateWidget().Get();
-		CreateSlateTextLayout.BindLambda([OwnerWidgetPtr](FTextBlockStyle InDefaultTextStyle) {
-			return FSlateTextLayout::Create(OwnerWidgetPtr, MoveTemp(InDefaultTextStyle));
-		});
+		CreateSlateTextLayout.BindLambda([](SWidget* InOwningWidget, const FTextBlockStyle& InDefaultTextStyle) 
+			{
+				return FSlateTextLayout::Create(InOwningWidget, InDefaultTextStyle);
+			});
 	}
 
 	OwnerWidget = &InOwnerWidget;
 	Marshaller = InTextMarshaller;
 	HintMarshaller = InHintTextMarshaller;
 	TextStyle = InTextStyle;
-	TextLayout = CreateSlateTextLayout.Execute(TextStyle);
+	TextLayout = CreateSlateTextLayout.Execute(&InOwnerWidget.GetSlateWidget().Get(), TextStyle);
 
 	WrapTextAt = 0.0f;
 	AutoWrapText = false;
@@ -3509,6 +3509,11 @@ EKeyboardType FSlateEditableTextLayout::FVirtualKeyboardEntry::GetVirtualKeyboar
 	return (OwnerLayout->OwnerWidget->IsTextPassword()) ? Keyboard_Password : OwnerLayout->OwnerWidget->GetVirtualKeyboardType();
 }
 
+FVirtualKeyboardOptions FSlateEditableTextLayout::FVirtualKeyboardEntry::GetVirtualKeyboardOptions() const
+{
+	return OwnerLayout->OwnerWidget->GetVirtualKeyboardOptions();
+}
+
 bool FSlateEditableTextLayout::FVirtualKeyboardEntry::IsMultilineEntry() const
 {
 	return OwnerLayout->OwnerWidget->IsMultiLineTextEdit();
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateTextBlockLayout.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateTextBlockLayout.cpp
index 2a6faf8f7cbb..6f0fc008031a 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateTextBlockLayout.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Text/SlateTextBlockLayout.cpp
@@ -8,7 +8,7 @@
 SLATE_DECLARE_CYCLE_COUNTER(GSlateTextBlockLayoutComputeDesiredSize, "FSlateTextBlockLayout ComputeDesiredSize");
 
 FSlateTextBlockLayout::FSlateTextBlockLayout(SWidget* InOwner, FTextBlockStyle InDefaultTextStyle, const TOptional<ETextShapingMethod> InTextShapingMethod, const TOptional<ETextFlowDirection> InTextFlowDirection, const FCreateSlateTextLayout& InCreateSlateTextLayout, TSharedRef<ITextLayoutMarshaller> InMarshaller, TSharedPtr<IBreakIterator> InLineBreakPolicy)
-	: TextLayout((InCreateSlateTextLayout.IsBound()) ? InCreateSlateTextLayout.Execute(MoveTemp(InDefaultTextStyle)) : FSlateTextLayout::Create(InOwner, MoveTemp(InDefaultTextStyle)))
+	: TextLayout((InCreateSlateTextLayout.IsBound()) ? InCreateSlateTextLayout.Execute(InOwner, MoveTemp(InDefaultTextStyle)) : FSlateTextLayout::Create(InOwner, MoveTemp(InDefaultTextStyle)))
 	, Marshaller(MoveTemp(InMarshaller))
 	, TextHighlighter(FSlateTextHighlightRunRenderer::Create())
 	, CachedSize(ForceInitToZero)
diff --git a/Engine/Source/Runtime/Slate/Private/Widgets/Views/STableViewBase.cpp b/Engine/Source/Runtime/Slate/Private/Widgets/Views/STableViewBase.cpp
index c6fd6df513e9..4e1c3c3f4df4 100644
--- a/Engine/Source/Runtime/Slate/Private/Widgets/Views/STableViewBase.cpp
+++ b/Engine/Source/Runtime/Slate/Private/Widgets/Views/STableViewBase.cpp
@@ -120,13 +120,13 @@ void STableViewBase::OnFocusLost( const FFocusEvent& InFocusEvent )
 	bShowSoftwareCursor = false;
 }
 
-
-void STableViewBase::OnMouseCaptureLost()
+void STableViewBase::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
+	SCompoundWidget::OnMouseCaptureLost(CaptureLostEvent);
+
 	bShowSoftwareCursor = false;
 }
 
-
 struct FEndOfListResult
 {
 	FEndOfListResult( float InOffset, float InItemsAboveView )
@@ -211,7 +211,7 @@ EActiveTimerReturnType STableViewBase::UpdateInertialScroll(double InCurrentTime
 				if (Overscroll.GetOverscroll(GetCachedGeometry()) != 0.0f)
 				{
 					bKeepTicking = true;
-					RequestListRefresh();
+					RequestLayoutRefresh();
 				}
 
 				Overscroll.UpdateOverscroll(InDeltaTime);
@@ -311,7 +311,7 @@ void STableViewBase::Tick( const FGeometry& AllottedGeometry, const double InCur
 			if (ScrollIntoViewResult == EScrollIntoViewResult::Deferred)
 			{
 				// We call this rather than just leave bItemsNeedRefresh as true to ensure that EnsureTickToRefresh is registered
-				RequestListRefresh();
+				RequestLayoutRefresh();
 			}
 			else
 			{
@@ -463,6 +463,23 @@ FReply STableViewBase::OnMouseMove( const FGeometry& MyGeometry, const FPointerE
 }
 
 
+void STableViewBase::OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent )
+{
+	if ( MouseEvent.IsTouchEvent() )
+	{
+		if ( !bStartedTouchInteraction )
+		{
+			// If we don't have touch capture, see if a touch event entered from a child widget.
+			// If it did, begin scrolling
+			if ( MyGeometry.IsUnderLocation(MouseEvent.GetLastScreenSpacePosition()) )
+			{
+				bStartedTouchInteraction = true;
+			}
+		}
+	}
+}
+
+
 void STableViewBase::OnMouseLeave( const FPointerEvent& MouseEvent )
 {
 	SCompoundWidget::OnMouseLeave(MouseEvent);
@@ -613,16 +630,7 @@ bool STableViewBase::IsUserScrolling() const
 
 void STableViewBase::RequestListRefresh()
 {
-	if (!bItemsNeedRefresh)
-	{
-		bItemsNeedRefresh = true;
-		RegisterActiveTimer(0.f, FWidgetActiveTimerDelegate::CreateSP(this, &STableViewBase::EnsureTickToRefresh));
-	}
-
-	if (ItemsPanel.IsValid())
-	{
-		ItemsPanel->SetRefreshPending(true);
-	}
+	RequestLayoutRefresh();
 }
 
 bool STableViewBase::IsPendingRefresh() const
@@ -709,7 +717,7 @@ void STableViewBase::SetScrollOffset( const float InScrollOffset )
 	{
 		ScrollOffset = InScrollOffset;
 		OnTableViewScrolled.ExecuteIfBound( ScrollOffset );
-		RequestListRefresh();
+		RequestLayoutRefresh();
 	}
 }
 
@@ -726,7 +734,7 @@ void STableViewBase::AddScrollOffset(const float InScrollOffsetDelta, bool Refre
 		if (RefreshList)
 		{
 			OnTableViewScrolled.ExecuteIfBound(ScrollOffset);
-			RequestListRefresh();
+			RequestLayoutRefresh();
 		}
 	}
 }
@@ -832,18 +840,32 @@ float STableViewBase::GetScrollRateInItems() const
 		: 0.5f;
 }
 
+void STableViewBase::RequestLayoutRefresh()
+{
+	if (!bItemsNeedRefresh)
+	{
+		bItemsNeedRefresh = true;
+		RegisterActiveTimer(0.f, FWidgetActiveTimerDelegate::CreateSP(this, &STableViewBase::EnsureTickToRefresh));
+	}
+
+	if (ItemsPanel.IsValid())
+	{
+		ItemsPanel->SetRefreshPending(true);
+	}
+}
+
 void STableViewBase::ScrollToTop()
 {
 	EndInertialScrolling();
 	SetScrollOffset(0);
-	RequestListRefresh();
+	RequestLayoutRefresh();
 }
 
 void STableViewBase::ScrollToBottom()
 {
 	EndInertialScrolling();
 	SetScrollOffset(GetNumItemsBeingObserved());
-	RequestListRefresh();
+	RequestLayoutRefresh();
 }
 
 FVector2D STableViewBase::GetScrollDistance()
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Application/IPlatformTextField.h b/Engine/Source/Runtime/Slate/Public/Framework/Application/IPlatformTextField.h
index 6acf37fc814e..f745e9a810d6 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Application/IPlatformTextField.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Application/IPlatformTextField.h
@@ -3,8 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-
-class IVirtualKeyboardEntry;
+#include "Widgets/Input/IVirtualKeyboardEntry.h"
 
 class IPlatformTextField
 {
@@ -14,6 +13,8 @@ public:
 	virtual void ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget) = 0;
 	virtual bool AllowMoveCursor() { return true; }
 
+	static bool ShouldUseVirtualKeyboardAutocorrect(TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget);
+
 private:
 
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Application/NavigationConfig.h b/Engine/Source/Runtime/Slate/Public/Framework/Application/NavigationConfig.h
index 667fb95e04b0..40bd10115c9f 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Application/NavigationConfig.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Application/NavigationConfig.h
@@ -10,50 +10,98 @@ struct FKeyEvent;
 enum class EUINavigation : uint8;
 
 /**
- * This class is used to control which FKeys should move focus.  A new navigation
- * config has to be created per user.
+ * 
+ */
+struct FAnalogNavigationState
+{
+public:
+	double LastNavigationTime;
+	int32 Repeats;
+
+	FAnalogNavigationState()
+		: LastNavigationTime(0)
+		, Repeats(0)
+	{
+	}
+};
+
+/**  */
+struct FUserNavigationState
+{
+public:
+	TMap<EUINavigation, FAnalogNavigationState> AnalogNavigationState;
+};
+
+/**
+ * This class is used to control which FKeys and analog axis should move focus.
  */
 class SLATE_API FNavigationConfig : public TSharedFromThis<FNavigationConfig>
 {
 public:
+	/** ctor */
 	FNavigationConfig();
-
+	/** dtor */
 	virtual ~FNavigationConfig();
 
+	/** Gets the navigation direction from a given key event. */
 	virtual EUINavigation GetNavigationDirectionFromKey(const FKeyEvent& InKeyEvent) const;
+	/** Gets the navigation direction from a given analog event. */
+	virtual EUINavigation GetNavigationDirectionFromAnalog(const FAnalogInputEvent& InAnalogEvent);
 
-	EUINavigation GetNavigationDirectionFromAnalog(const FAnalogInputEvent& InAnalogEvent);
-
-	virtual float GetRepeatRateForPressure(float InPressure, int32 InRepeats) const;
+	/** Called when the navigation config is registered with Slate Application */
+	virtual void OnRegister();
+	/** Called when the navigation config is registered with Slate Application */
+	virtual void OnUnregister();
+	/** Notified when users are removed from the system, good chance to clean up any user specific state. */
+	virtual void OnUserRemoved(int32 UserIndex);
 
 public:
+	/** Should the Tab key perform next and previous style navigation. */
 	bool bTabNavigation;
+	/** Should we respect keys for navigation. */
 	bool bKeyNavigation;
+	/** Should we respect the analog stick for navigation. */
 	bool bAnalogNavigation;
 
+	/**  */
 	float AnalogNavigationHorizontalThreshold;
+	/**  */
 	float AnalogNavigationVerticalThreshold;
 
+	/** Which Axis Key controls horizontal navigation */
 	FKey AnalogHorizontalKey;
+	/** Which Axis Key controls vertical navigation */
 	FKey AnalogVerticalKey;
 
 	/** Digital key navigation rules. */
 	TMap<FKey, EUINavigation> KeyEventRules;
 
 protected:
+	/**
+	 * Gets the repeat rate of the navigation based on the current pressure being applied.  The idea being
+	 * that if the user moves the stick a little, we would navigate slowly, if they move it a lot, we would
+	 * repeat the navigation often.
+	 */
+	virtual float GetRepeatRateForPressure(float InPressure, int32 InRepeats) const;
+
+	/**
+	 * Gets the navigation direction from the analog internally.
+	 */
 	virtual EUINavigation GetNavigationDirectionFromAnalogInternal(const FAnalogInputEvent& InAnalogEvent);
 
-	struct FAnalogNavigationState
-	{
-		double LastNavigationTime;
-		int32 Repeats;
-
-		FAnalogNavigationState()
-			: LastNavigationTime(0)
-			, Repeats(0)
-		{
-		}
-	};
-
-	TMap<EUINavigation, FAnalogNavigationState> AnalogNavigationState;
+	/** Navigation state that we store per user. */
+	TMap<int, FUserNavigationState> UserNavigationState;
 };
+
+
+/** A navigation config that doesn't do any navigation. */
+class SLATE_API FNullNavigationConfig : public FNavigationConfig
+{
+public:
+	FNullNavigationConfig()
+	{
+		bTabNavigation = false;
+		bKeyNavigation = false;
+		bAnalogNavigation = false;
+	}
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Application/SlateApplication.h b/Engine/Source/Runtime/Slate/Public/Framework/Application/SlateApplication.h
index d162e357bf83..f919ad78ae0f 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Application/SlateApplication.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Application/SlateApplication.h
@@ -127,8 +127,6 @@ public:
 
 	FGestureDetector GestureDetector;
 
-	TSharedPtr<FNavigationConfig> NavigationConfig;
-
 private:
 	FORCEINLINE bool HasValidFocusPath() const
 	{
@@ -184,6 +182,23 @@ private:
 	friend class FSlateApplication;
 };
 
+/**
+ * Interface for a Slate Input Mapping.
+ */
+class SLATE_API ISlateInputManager
+{
+public:
+	virtual int32 GetUserIndexForKeyboard() const = 0;
+	virtual int32 GetUserIndexForController(int32 ControllerId) const = 0;
+};
+
+class SLATE_API FSlateDefaultInputMapping : public ISlateInputManager
+{
+public:
+	virtual int32 GetUserIndexForKeyboard() const override { return 0; }
+	virtual int32 GetUserIndexForController(int32 ControllerId) const override { return ControllerId; }
+};
+
 /**
  * Represents a virtual user of slate.
  */
@@ -969,7 +984,6 @@ protected:
 	 */
 	FSlateUser* GetOrCreateUser(int32 UserIndex);
 
-	friend class FAnalogCursor;
 	friend class FEventRouter;
 
 	virtual bool DoesWidgetHaveMouseCaptureByUser(const TSharedPtr<const SWidget> Widget, int32 UserIndex, TOptional<int32> PointerIndex) const override;
@@ -1161,13 +1175,22 @@ public:
 
 public:
 
-	TFunction<TSharedRef<FNavigationConfig>()> GetNavigationConfigFactory() const { return NavigationConfigFactory; }
+	TSharedRef<FNavigationConfig> GetNavigationConfig() const { return NavigationConfig; }
+
+	/**
+	 * Sets the navigation config.  If you need to control navigation config dynamically, you
+	 * should subclass FNavigationConfig to be dynamically adjustable to your needs.
+	 */
+	void SetNavigationConfig(TSharedRef<FNavigationConfig> InNavigationConfig);
 
 	/**
 	 * Sets the navigation config factory.  If you need to control navigation config dynamically, you
 	 * should subclass FNavigationConfig to be dynamically adjustable to your needs.
-	 */
-	void SetNavigationConfigFactory( TFunction<TSharedRef<FNavigationConfig>()> InNavigationConfigFactory );
+	*/
+	DEPRECATED(4.20, "Returning to a simpler method of registering navigation configs.\nSetNavigationConfig, is what you should use now.  Note: You'll need to store per user state information yourself if you have any, like we do for repeats with the analog stick in FNavigationConfig::UserNavigationState,\nrather than Slate creating a new Navigation Config per user.")
+	void SetNavigationConfigFactory(TFunction<TSharedRef<FNavigationConfig>()> InNavigationConfigFactory) { }
+
+public:
 
 	/** Called when the slate application is being shut down. */
 	void OnShutdown();
@@ -1276,10 +1299,6 @@ public:
 	/** Set the size of the deadzone for dragging in screen pixels */
 	void SetDragTriggerDistance( float ScreenPixels );
 	
-	/** [Deprecated] Adds or removes input pre-processor. */
-	DEPRECATED(4.17, "SetInputPreProcessor(...) is deprecated. Use RegisterInputPreProcessor(...) and/or UnregisterInputPreProcessor(...) / UnregisterAllInputPreProcessors(...) instead.")
-	void SetInputPreProcessor(bool bEnable, TSharedPtr<class IInputProcessor> InputProcessor = nullptr);
-
 	/** 
 	 * Adds input pre-processor if unique. 
 	 * @param InputProcessor	The input pre-processor to add.
@@ -1294,11 +1313,6 @@ public:
 	 */
 	void UnregisterInputPreProcessor(TSharedPtr<class IInputProcessor> InputProcessor);
 
-	/** 
-	 * Removes all input pre-processor from list of input pre-processors.
-	 */
-	void UnregisterAllInputPreProcessors();
-
 	/** Sets the hit detection radius of the cursor */
 	void SetCursorRadius(float NewRadius);
 
@@ -1417,8 +1431,8 @@ public:
 	virtual bool OnControllerButtonPressed( FGamepadKeyNames::Type KeyName, int32 ControllerId, bool IsRepeat ) override;
 	virtual bool OnControllerButtonReleased( FGamepadKeyNames::Type KeyName, int32 ControllerId, bool IsRepeat ) override;
 	virtual bool OnTouchGesture( EGestureEvent GestureType, const FVector2D& Delta, float WheelDelta, bool bIsDirectionInvertedFromDevice ) override;
-	virtual bool OnTouchStarted( const TSharedPtr< FGenericWindow >& PlatformWindow, const FVector2D& Location, int32 TouchIndex, int32 ControllerId ) override;
-	virtual bool OnTouchMoved( const FVector2D& Location, int32 TouchIndex, int32 ControllerId ) override;
+	virtual bool OnTouchStarted( const TSharedPtr< FGenericWindow >& PlatformWindow, const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId ) override;
+	virtual bool OnTouchMoved( const FVector2D& Location, float Force, int32 TouchIndex, int32 ControllerId ) override;
 	virtual bool OnTouchEnded( const FVector2D& Location, int32 TouchIndex, int32 ControllerId ) override;
 	virtual void ShouldSimulateGesture(EGestureEvent Gesture, bool bEnable) override;
 	virtual bool OnMotionDetected(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration, int32 ControllerId) override;
@@ -1504,6 +1518,11 @@ public:
 	 */
 	int32 GetUserIndexForController(int32 ControllerId) const;
 
+	/** 
+	 * @return int user index that this controller is mapped to. -1 if the controller isn't mapped
+	 */
+	void SetInputManager(TSharedRef<ISlateInputManager> InputManager);
+
 	/**
 	 * Register for a notification when the window action occurs.
 	 *
@@ -1513,7 +1532,6 @@ public:
 	 */
 	FDelegateHandle RegisterOnWindowActionNotification(const FOnWindowAction& Notification);
 
-
 	/** Event type for when Slate is ticking during a modal dialog loop */
 	DECLARE_EVENT_OneParam(FSlateApplication, FOnModalLoopTickEvent, float);
 
@@ -1566,6 +1584,8 @@ public:
 	FDragDropCheckingOverride OnDragDropCheckOverride;
 #endif
 
+	const TSet<FKey> GetPressedMouseButtons() const;
+
 private:
 
 	TSharedRef< FGenericWindow > MakeWindow( TSharedRef<SWindow> InSlateWindow, const bool bShowImmediately );
@@ -2102,7 +2122,7 @@ private:
 	TArray< TSharedPtr<FCacheElementPools> > ReleasedCachedElementLists;
 
 	/** This factory function creates a navigation config for each slate user. */
-	TFunction<TSharedRef<FNavigationConfig>()> NavigationConfigFactory;
+	TSharedRef<FNavigationConfig> NavigationConfig;
 
 	/** The simulated gestures Slate Application will be in charge of. */
 	TBitArray<FDefaultBitArrayAllocator> SimulateGestures;
@@ -2170,6 +2190,9 @@ private:
 	/** A list of input pre-processors, gets an opportunity to parse input before anything else. */
 	InputPreProcessorsHelper InputPreProcessors;
 
+	/** Allows applications finer control over how we map controllers to users. */
+	TSharedRef<ISlateInputManager> InputManager;
+
 #if WITH_EDITOR
 	/**
 	 * Delegate that is invoked before the input key get process by slate widgets bubble system.
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Text/Android/AndroidPlatformTextField.h b/Engine/Source/Runtime/Slate/Public/Framework/Text/Android/AndroidPlatformTextField.h
index ab661ff2757e..f9e3e2fcdb2d 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Text/Android/AndroidPlatformTextField.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Text/Android/AndroidPlatformTextField.h
@@ -13,6 +13,7 @@ public:
 	virtual void ShowVirtualKeyboard(bool bShow, int32 UserIndex, TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget) override;
 	virtual bool AllowMoveCursor() override;
 private:
+	bool ShouldUseAutocorrect(TSharedPtr<IVirtualKeyboardEntry> TextEntryWidget) const;
 	bool EnableNewKeyboardConfig() const;
 	//	SlateTextField* TextField;
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Text/IOS/IOSPlatformTextField.h b/Engine/Source/Runtime/Slate/Public/Framework/Text/IOS/IOSPlatformTextField.h
index 89e3202183c7..d226e281c548 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Text/IOS/IOSPlatformTextField.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Text/IOS/IOSPlatformTextField.h
@@ -43,6 +43,7 @@ typedef FIOSPlatformTextField FPlatformTextField;
 
 -(void)show:(TSharedPtr<IVirtualKeyboardEntry>)InTextWidget;
 -(void)hide;
+-(bool)hasTextWidget;
 
 @end
 #endif
diff --git a/Engine/Source/Runtime/Slate/Public/Framework/Text/SlateTextLayoutFactory.h b/Engine/Source/Runtime/Slate/Public/Framework/Text/SlateTextLayoutFactory.h
index a57ea0973515..36118da81b3b 100644
--- a/Engine/Source/Runtime/Slate/Public/Framework/Text/SlateTextLayoutFactory.h
+++ b/Engine/Source/Runtime/Slate/Public/Framework/Text/SlateTextLayoutFactory.h
@@ -6,4 +6,4 @@
 #include "Styling/SlateTypes.h"
 #include "Framework/Text/SlateTextLayout.h"
 
-DECLARE_DELEGATE_RetVal_OneParam(TSharedRef<FSlateTextLayout>, FCreateSlateTextLayout, FTextBlockStyle);
+DECLARE_DELEGATE_RetVal_TwoParams(TSharedRef<FSlateTextLayout>, FCreateSlateTextLayout, SWidget*, const FTextBlockStyle&);
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Images/SImage.h b/Engine/Source/Runtime/Slate/Public/Widgets/Images/SImage.h
index c0390dbe4e96..0b34bc7310fc 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Images/SImage.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Images/SImage.h
@@ -78,7 +78,7 @@ protected:
 
 protected:
 
-	/** The FName of the image resource to show */
+	/** The slate brush to draw for the image, or a bound delegate to a brush. */
 	TAttribute< const FSlateBrush* > Image;
 
 	/** Color and opacity scale for this image */
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/IVirtualKeyboardEntry.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/IVirtualKeyboardEntry.h
index 12332c662b96..e919abe7d907 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/IVirtualKeyboardEntry.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/IVirtualKeyboardEntry.h
@@ -5,6 +5,8 @@
 #include "CoreMinimal.h"
 #include "Types/SlateEnums.h"
 
+#include "IVirtualKeyboardEntry.generated.h"
+
 // @todo - hook up keyboard types
 enum EKeyboardType
 {
@@ -26,6 +28,24 @@ enum class ETextEntryType : uint8
 	TextEntryUpdated
 };
 
+USTRUCT()
+struct FVirtualKeyboardOptions
+{
+public:
+	GENERATED_BODY()
+
+	/** Enables autocorrect for this widget, if supported by the platform's virtual keyboard. Autocorrect must also be enabled in Input settings for this to take effect. */
+	UPROPERTY(EditAnywhere, Category = Autocorrect)
+	bool bEnableAutocorrect;
+
+	// TODO: Add additional VKB features, such as autocapitalization and autocomplete
+
+	FVirtualKeyboardOptions()
+		: bEnableAutocorrect(false)
+	{
+	}
+};
+
 class SLATE_API IVirtualKeyboardEntry
 {
 
@@ -62,6 +82,11 @@ public:
 	*/
 	virtual EKeyboardType GetVirtualKeyboardType() const = 0;
 
+	/**
+	 * @return	Returns additional virtual keyboard options
+	 */
+	virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const = 0;
+
 	/**
 	* Returns whether the entry is multi-line
 	*
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SButton.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SButton.h
index c2aa85519488..1387f70144ff 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SButton.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SButton.h
@@ -175,7 +175,7 @@ public:
 	virtual FReply OnMouseMove( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual void OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual void OnMouseLeave( const FPointerEvent& MouseEvent ) override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 	virtual bool IsInteractable() const override;
 	// SWidget
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableText.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableText.h
index 559de65625b9..d4c748d1eddc 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableText.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableText.h
@@ -58,6 +58,7 @@ public:
 		, _MinDesiredWidth(0.0f)
 		, _SelectAllTextOnCommit( false )
 		, _VirtualKeyboardType(EKeyboardType::Keyboard_Default)
+		, _VirtualKeyboardOptions(FVirtualKeyboardOptions())
 		, _VirtualKeyboardTrigger(EVirtualKeyboardTrigger::OnFocusByPointer)
 		, _VirtualKeyboardDismissAction(EVirtualKeyboardDismissAction::TextChangeOnDismiss)
 		, _TextShapingMethod()
@@ -152,6 +153,9 @@ public:
 		/** The type of virtual keyboard to use on mobile devices */
 		SLATE_ATTRIBUTE( EKeyboardType, VirtualKeyboardType)
 
+		/** Additional options used by the virtual keyboard summoned by this widget */
+		SLATE_ARGUMENT( FVirtualKeyboardOptions, VirtualKeyboardOptions )
+
 		/** The type of event that will trigger the display of the virtual keyboard */
 		SLATE_ATTRIBUTE( EVirtualKeyboardTrigger, VirtualKeyboardTrigger )
 
@@ -373,6 +377,7 @@ protected:
 	virtual bool CanTypeCharacter(const TCHAR InChar) const override;
 	virtual void EnsureActiveTick() override;
 	virtual EKeyboardType GetVirtualKeyboardType() const override;
+	virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const override;
 	virtual EVirtualKeyboardTrigger GetVirtualKeyboardTrigger() const override;
 	virtual EVirtualKeyboardDismissAction GetVirtualKeyboardDismissAction() const override;
 	virtual TSharedRef<SWidget> GetSlateWidget() override;
@@ -458,6 +463,9 @@ protected:
 	/** The type of virtual keyboard to use for editing this text on mobile */
 	TAttribute<EKeyboardType> VirtualKeyboardType;
 
+	/** Additional options used by the virtual keyboard summoned by this widget */
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** The type of event that will trigger the display of the virtual keyboard */
 	TAttribute<EVirtualKeyboardTrigger> VirtualKeyboardTrigger;
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h
index c3907d5e1dbd..5719fefbea7b 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SEditableTextBox.h
@@ -49,6 +49,7 @@ public:
 		, _BackgroundColor()
 		, _Padding()
 		, _ErrorReporting()
+		, _VirtualKeyboardOptions(FVirtualKeyboardOptions())
 		, _VirtualKeyboardTrigger(EVirtualKeyboardTrigger::OnFocusByPointer)
 		, _VirtualKeyboardDismissAction(EVirtualKeyboardDismissAction::TextChangeOnDismiss)
 		{}
@@ -131,6 +132,9 @@ public:
 		/** The type of virtual keyboard to use on mobile devices */
 		SLATE_ATTRIBUTE(EKeyboardType, VirtualKeyboardType)
 
+		/** Additional options for the virtual keyboard summoned by this widget */
+		SLATE_ARGUMENT(FVirtualKeyboardOptions, VirtualKeyboardOptions)
+
 		/** The type of event that will trigger the display of the virtual keyboard */
 		SLATE_ATTRIBUTE(EVirtualKeyboardTrigger, VirtualKeyboardTrigger)
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h
index 1eee58bf0380..f15bee0ce072 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SMultiLineEditableTextBox.h
@@ -66,6 +66,7 @@ public:
 		, _Margin()
 		, _ErrorReporting()
 		, _ModiferKeyForNewLine(EModifierKey::None)
+		, _VirtualKeyboardOptions(FVirtualKeyboardOptions())
 		, _VirtualKeyboardTrigger(EVirtualKeyboardTrigger::OnFocusByPointer)
 		, _VirtualKeyboardDismissAction(EVirtualKeyboardDismissAction::TextChangeOnDismiss)
 		, _TextShapingMethod()
@@ -212,6 +213,9 @@ public:
 		/** The optional modifier key necessary to create a newline when typing into the editor. */
 		SLATE_ARGUMENT( EModifierKey::Type, ModiferKeyForNewLine)
 
+		/** Additional options used by the virtual keyboard summoned by this widget */
+		SLATE_ARGUMENT( FVirtualKeyboardOptions, VirtualKeyboardOptions  )
+
 		/** The type of event that will trigger the display of the virtual keyboard */
 		SLATE_ATTRIBUTE( EVirtualKeyboardTrigger, VirtualKeyboardTrigger )
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SNumericEntryBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SNumericEntryBox.h
index ba64f04ccdf3..01573c035092 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SNumericEntryBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SNumericEntryBox.h
@@ -470,7 +470,7 @@ private:
 		else
 		{
 			NumericType NumericValue;
-			if (LexicalConversion::TryParseString(NumericValue, *NewValue.ToString()))
+			if (LexTryParseString(NumericValue, *NewValue.ToString()))
 			{
 				OnValueChanged.ExecuteIfBound( NumericValue );
 			}
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualJoystick.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualJoystick.h
index 40547caa9fb3..fb67e3cd934f 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualJoystick.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualJoystick.h
@@ -33,10 +33,10 @@ public:
 		// Set by the game
 
 		/** The brush to use to draw the background for joysticks, or unclicked for buttons */
-		TSharedPtr< FSlateDynamicImageBrush > Image1;
+		TSharedPtr< ISlateBrushSource > Image1;
 
 		/** The brush to use to draw the thumb for joysticks, or clicked for buttons */
-		TSharedPtr< FSlateDynamicImageBrush > Image2;
+		TSharedPtr< ISlateBrushSource > Image2;
 
 		/** The actual center of the control */
 		FVector2D Center;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualKeyboardEntry.h b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualKeyboardEntry.h
index e8831c84b499..c8e92ff73be4 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualKeyboardEntry.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Input/SVirtualKeyboardEntry.h
@@ -31,6 +31,7 @@ public:
 		, _ClearKeyboardFocusOnCommit( true )
 		, _MinDesiredWidth( 0.0f )
 		, _KeyboardType ( EKeyboardType::Keyboard_Default )
+		, _VirtualKeyboardOptions ( FVirtualKeyboardOptions() )
 		{}
 
 		/** Sets the text content for this editable text widget */
@@ -63,6 +64,9 @@ public:
 		/** Sets the text content for this editable text widget */
 		SLATE_ATTRIBUTE( EKeyboardType, KeyboardType )
 
+		/** Sets additional arguments to be used by the virtual keyboard summoned by this widget */
+		SLATE_ARGUMENT( FVirtualKeyboardOptions, VirtualKeyboardOptions )
+
 		SLATE_END_ARGS()
 
 
@@ -118,6 +122,11 @@ public:
 		return KeyboardType.Get();
 	}
 
+	virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const override
+	{
+		return VirtualKeyboardOptions;
+	}
+
 	virtual bool IsMultilineEntry() const override
 	{
 		return false;
@@ -185,6 +194,8 @@ private:
 
 	TAttribute<EKeyboardType> KeyboardType;
 
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	bool bNeedsUpdate;
 
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/LayerManager/STooltipPresenter.h b/Engine/Source/Runtime/Slate/Public/Widgets/LayerManager/STooltipPresenter.h
index a08d303743d0..24bd09ab1207 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/LayerManager/STooltipPresenter.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/LayerManager/STooltipPresenter.h
@@ -36,15 +36,11 @@ public:
 	void SetContent(const TSharedRef<SWidget>& InWidget);
 
 private:
-
-	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override;
-
 	virtual void OnArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const override;
 
 	virtual FVector2D ComputeDesiredSize(float) const override;
 
 	virtual FChildren* GetChildren() override;
 
-	FVector2D LocalCursorPosition;
 	TWeakChild<SWidget> ChildSlot;
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/Anchors.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/Anchors.h
index 500cb4b609c1..822537f97f74 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/Anchors.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/Anchors.h
@@ -52,6 +52,28 @@ public:
 		, Maximum(MaxX, MaxY)
 	{ }
 
+	/**
+	* Compares this set of FAnchors with another for equality.
+	*
+	* @param Other The other FAnchors.
+	* @return true if the two FAnchors are equal, false otherwise.
+	*/
+	bool operator==(const FAnchors& Other) const
+	{
+		return Minimum == Other.Minimum && Maximum == Other.Maximum;
+	}
+
+	/**
+	* Compares this set of FAnchors with another for inequality.
+	*
+	* @param Other The other FAnchors.
+	* @return true if the two FAnchors are not equal, false otherwise.
+	*/
+	bool operator!=(const FAnchors& Other) const
+	{
+		return !(*this == Other);
+	}
+
 	/** Returns true if the anchors represent a stretch along the vertical axis */
 	bool IsStretchedVertical() const { return Minimum.Y != Maximum.Y; }
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBorder.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBorder.h
index e6abf6826452..971230eaf740 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBorder.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBorder.h
@@ -130,7 +130,6 @@ protected:
 	// End SWidget overrides.
 
  protected:
-	
 	TAttribute<const FSlateBrush*> BorderImage;
 	TAttribute<FSlateColor> BorderBackgroundColor;
 	TAttribute<FVector2D> DesiredSizeScale;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBox.h
index 1f9fc62d0e6b..afddf1a93424 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SBox.h
@@ -125,9 +125,7 @@ class SLATE_API SBox : public SPanel
 
 protected:
 	// Begin SWidget overrides.
-#if SLATE_LAYOUT_CHANGE
-	virtual void ChildLayoutChanged() override;
-#endif
+	virtual void ChildLayoutChanged(EInvalidateWidget InvalidateReason) override;
 	virtual FVector2D ComputeDesiredSize(float) const override;
 	float ComputeDesiredWidth() const;
 	float ComputeDesiredHeight() const;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SSafeZone.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SSafeZone.h
index 08964b35ef0e..0fa93c10c443 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SSafeZone.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SSafeZone.h
@@ -109,6 +109,7 @@ public:
 
 #if WITH_EDITOR
 	void SetOverrideScreenInformation(TOptional<FVector2D> InScreenSize, TOptional<float> InOverrideDpiScale);
+	void DebugSafeAreaUpdated(const FMargin& NewSafeZone);
 #endif
 
 	virtual void OnArrangeChildren( const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren ) const override;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScaleBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScaleBox.h
index ed9f6aa94171..3032ae2a1888 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScaleBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScaleBox.h
@@ -114,6 +114,11 @@ public:
 		 */
 		SLATE_ARGUMENT(bool, SingleLayoutPass)
 
+#if WITH_EDITOR
+		/** Force a particular screen size to be used instead of the reported device size. */
+		SLATE_ARGUMENT(TOptional<FVector2D>, OverrideScreenSize)
+#endif
+
 	SLATE_END_ARGS()
 
 	/** Constructor */
@@ -152,6 +157,10 @@ public:
 
 	/** Set IgnoreInheritedScale argument */
 	void SetIgnoreInheritedScale(bool InIgnoreInheritedScale);
+
+#if WITH_EDITOR
+	void SetOverrideScreenInformation(TOptional<FVector2D> InScreenSize);
+#endif
 	
 protected:
 	// Begin SWidget overrides.
@@ -161,6 +170,9 @@ protected:
 
 	float GetLayoutScale() const;
 	void RefreshSafeZoneScale();
+#if WITH_EDITOR
+	void DebugSafeAreaUpdated(const FMargin& NewSafeZone);
+#endif
 
 protected:
 	/** The allowed direction of stretching of the content */
@@ -206,4 +218,8 @@ protected:
 
 	/**  */
 	mutable FVector2D LastSlotWidgetDesiredSize;
+
+#if WITH_EDITOR
+	TOptional<FVector2D> OverrideScreenSize;
+#endif
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBar.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBar.h
index 3af143d2c3ef..c91acf85236d 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBar.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBar.h
@@ -153,6 +153,7 @@ protected:
 	bool bHideWhenNotInUse;
 	bool bIsScrolling;
 	double LastInteractionTime;
+	bool bAlwaysShow;
 
 	/** Image to use when the scrollbar thumb is in its normal state */
 	const FSlateBrush* NormalThumbImage;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBox.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBox.h
index fa5847f684ae..d6c062af0b77 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBox.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SScrollBox.h
@@ -163,6 +163,10 @@ public:
 
 	float GetScrollOffset() const;
 
+	float GetViewFraction() const;
+
+	float GetViewOffsetFraction() const;
+
 	void SetScrollOffset( float NewScrollOffset );
 
 	void ScrollToStart();
@@ -200,12 +204,13 @@ public:
 	virtual FReply OnMouseButtonDown( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseButtonUp( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseMove( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
+	virtual void OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual void OnMouseLeave( const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseWheel( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FCursorReply OnCursorQuery( const FGeometry& MyGeometry, const FPointerEvent& CursorEvent ) const override;
 	virtual int32 OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const override;
 	virtual FReply OnTouchEnded(const FGeometry& MyGeometry, const FPointerEvent& InTouchEvent) override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 	virtual FNavigationReply OnNavigation(const FGeometry& MyGeometry, const FNavigationEvent& InNavigationEvent) override;
 	// End of SWidget interface
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWidgetSwitcher.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWidgetSwitcher.h
index ac1a665a6eef..932be06b7077 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWidgetSwitcher.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWidgetSwitcher.h
@@ -132,6 +132,10 @@ public:
 	 */
 	void SetActiveWidgetIndex( int32 Index );
 
+#if SLATE_PARENT_POINTERS
+	virtual bool ValidatePathToChild(SWidget* InChild) override;
+#endif
+
 public:
 
 	/**
@@ -159,12 +163,14 @@ private:
 	/** Holds the desired widget index */
 	TAttribute<int32> WidgetIndex;
 
-	// Holds the collection of widgets.
+	/*
+	 * Holds the collection of all child widget, however the only one with a valid parent pointer
+	 * will be the one in the dynamic slot.
+	 */
 	TPanelChildren<FSlot> AllChildren;
 
 	/** Required to implement GetChildren() in a way that can dynamically return the currently active child. */
-	class SLATE_API FOneDynamicChild
-		: public FChildren
+	class SLATE_API FOneDynamicChild : public FChildren
 	{
 	public:
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWindowTitleBarArea.h b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWindowTitleBarArea.h
index 50da8d6c02fd..8d5b962b9ed5 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWindowTitleBarArea.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Layout/SWindowTitleBarArea.h
@@ -93,9 +93,19 @@ public:
 		RequestToggleFullscreen = InRequestToggleFullscreen;
 	}
 
+	static void SetOnCloseButtonClickedDelegate(FSimpleDelegate InOnCloseCuttonClicked)
+	{
+		OnCloseButtonClicked = InOnCloseCuttonClicked;
+	}
+
+	static void SetIsCloseButtonActive(bool bIsAcive)
+	{
+		bIsCloseButtonActive = bIsAcive;
+	}
+
 	void SetWindowButtonsVisibility(bool bIsVisible)
 	{
-		WindowButtonsBox->SetVisibility(bIsVisible ? EVisibility::Visible : EVisibility::Collapsed);
+		WindowButtonsBox->SetVisibility(bIsVisible && PLATFORM_DESKTOP ? EVisibility::Visible : EVisibility::Collapsed);
 	}
 
 	static void SetCustomStyleForWindowButtons(const FButtonStyle& InMinimizeButtonStyle, const FButtonStyle& InMaximizeButtonStyle, const FButtonStyle& InRestoreButtonStyle, const FButtonStyle& InCloseButtonStyle)
@@ -115,6 +125,9 @@ private:
 	TSharedPtr<SWindow> GameWindow;
 	FSimpleDelegate RequestToggleFullscreen;
 
+	static FSimpleDelegate OnCloseButtonClicked;
+	static bool bIsCloseButtonActive;
+
 	static FButtonStyle MinimizeButtonStyle;
 	static FButtonStyle MaximizeButtonStyle;
 	static FButtonStyle RestoreButtonStyle;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/SInvalidationPanel.h b/Engine/Source/Runtime/Slate/Public/Widgets/SInvalidationPanel.h
index c5d4a8ba31fd..6c9451e47d5b 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/SInvalidationPanel.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/SInvalidationPanel.h
@@ -17,7 +17,7 @@ class FSlateRenderDataHandle;
 class FSlateWindowElementList;
 class SWindow;
 
-class SLATE_API SInvalidationPanel : public SCompoundWidget, public ILayoutCache
+class SLATE_API SInvalidationPanel : public SCompoundWidget, public FGCObject, public ILayoutCache
 {
 public:
 	SLATE_BEGIN_ARGS( SInvalidationPanel )
@@ -42,6 +42,8 @@ public:
 	FORCEINLINE bool GetCanCache() const { return bCanCache; }
 #endif
 
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+
 	void SetCanCache(bool InCanCache);
 
 	FORCEINLINE void InvalidateCache() { bNeedsCaching = true; }
@@ -95,6 +97,7 @@ private:
 	FVector2D CachedDesiredSize;
 
 #if SLATE_VERBOSE_NAMED_EVENTS
+	FString DebugName;
 	FString DebugTickName;
 	FString DebugPaintName;
 #endif
@@ -107,7 +110,7 @@ private:
 	mutable TSharedPtr< FSlateWindowElementList > CachedWindowElements;
 	mutable TSharedPtr<FSlateRenderDataHandle, ESPMode::ThreadSafe> CachedRenderData;
 
-	mutable TSet<UObject*> CachedResources;
+	mutable TArray<UObject*> CachedResources;
 	
 	mutable FVector2D CachedAbsolutePosition;
 
@@ -119,10 +122,11 @@ private:
 	mutable int32 LastClippingIndex;
 	mutable int32 LastClippingStateOffset;
 	mutable TOptional<FSlateClippingState> LastClippingState;
-	mutable int32 LastLayerId;
+	mutable int32 MaximumLayerIdCachedAt;
 
 	mutable int32 CachedMaxChildLayer;
 	mutable bool bNeedsCaching;
+	mutable bool bNeedsCachePrepass;
 	mutable bool bIsInvalidating;
 	bool bCanCache;
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/SViewport.h b/Engine/Source/Runtime/Slate/Public/Widgets/SViewport.h
index dc9895c55e7f..ac10c47a435a 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/SViewport.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/SViewport.h
@@ -36,6 +36,7 @@ public:
 		, _IgnoreTextureAlpha(true)
 		, _ViewportSize(FVector2D(320.0f, 240.0f))
 	{
+		_Clipping = EWidgetClipping::ClipToBoundsAlways;
 	}
 
 		SLATE_DEFAULT_SLOT( FArguments, Content )
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Text/ISlateEditableTextWidget.h b/Engine/Source/Runtime/Slate/Public/Widgets/Text/ISlateEditableTextWidget.h
index 624eca9aaa39..af24d5205607 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Text/ISlateEditableTextWidget.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Text/ISlateEditableTextWidget.h
@@ -240,6 +240,9 @@ public:
 	/** Get the type of virtual keyboard to use for this widget */
 	virtual EKeyboardType GetVirtualKeyboardType() const = 0;
 
+	/** Get the options for the virtual keyboard used for this widget */
+	virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const = 0;
+
 	/** Get the type of event that will trigger the display of the virtual keyboard */
 	virtual EVirtualKeyboardTrigger GetVirtualKeyboardTrigger() const = 0;
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h b/Engine/Source/Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h
index 49e518bd1bd7..734c52febed9 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Text/SMultiLineEditableText.h
@@ -69,6 +69,7 @@ public:
 		, _OnCursorMoved()
 		, _ContextMenuExtender()
 		, _ModiferKeyForNewLine(EModifierKey::None)
+		, _VirtualKeyboardOptions( FVirtualKeyboardOptions() )
 		, _VirtualKeyboardTrigger(EVirtualKeyboardTrigger::OnFocusByPointer)
 		, _VirtualKeyboardDismissAction(EVirtualKeyboardDismissAction::TextChangeOnDismiss)
 		, _TextShapingMethod()
@@ -183,6 +184,9 @@ public:
 		/** The optional modifier key necessary to create a newline when typing into the editor. */
 		SLATE_ARGUMENT(EModifierKey::Type, ModiferKeyForNewLine)
 
+		/** Additional options for the virtual keyboard used by this widget */
+		SLATE_ARGUMENT(FVirtualKeyboardOptions, VirtualKeyboardOptions)
+
 		/** The type of event that will trigger the display of the virtual keyboard */
 		SLATE_ATTRIBUTE(EVirtualKeyboardTrigger, VirtualKeyboardTrigger)
 
@@ -428,6 +432,7 @@ protected:
 	virtual bool CanTypeCharacter(const TCHAR InChar) const override;
 	virtual void EnsureActiveTick() override;
 	virtual EKeyboardType GetVirtualKeyboardType() const override;
+	virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const override;
 	virtual EVirtualKeyboardTrigger GetVirtualKeyboardTrigger() const override;
 	virtual EVirtualKeyboardDismissAction GetVirtualKeyboardDismissAction() const override;
 	virtual TSharedRef<SWidget> GetSlateWidget() override;
@@ -516,6 +521,9 @@ protected:
 	/** Callback delegate to have first chance handling of the OnKeyDown event */
 	FOnKeyDown OnKeyDownHandler;
 
+	/** Options to use for the virtual keyboard summoned by this widget */
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** The type of event that will trigger the display of the virtual keyboard */
 	TAttribute<EVirtualKeyboardTrigger> VirtualKeyboardTrigger;
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Text/SlateEditableTextLayout.h b/Engine/Source/Runtime/Slate/Public/Widgets/Text/SlateEditableTextLayout.h
index 3c3b2b8f5772..79eeeb4617d1 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Text/SlateEditableTextLayout.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Text/SlateEditableTextLayout.h
@@ -393,6 +393,7 @@ private:
 		virtual FText GetText() const override;
 		virtual FText GetHintText() const override;
 		virtual EKeyboardType GetVirtualKeyboardType() const override;
+		virtual FVirtualKeyboardOptions GetVirtualKeyboardOptions() const override;
 		virtual bool IsMultilineEntry() const override;
 
 	private:
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Views/SListView.h b/Engine/Source/Runtime/Slate/Public/Widgets/Views/SListView.h
index adcca2e43e9d..32a01c681e64 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Views/SListView.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Views/SListView.h
@@ -80,6 +80,7 @@ public:
 		, _WheelScrollMultiplier(GetGlobalScrollAmount())
 		, _HandleGamepadEvents( true )
 		, _HandleDirectionalNavigation( true )
+		, _IsFocusable(true)
 		, _OnItemToString_Debug()
 		, _OnEnteredBadState()
 		{
@@ -127,6 +128,8 @@ public:
 
 		SLATE_ARGUMENT( bool, HandleDirectionalNavigation );
 
+		SLATE_ATTRIBUTE( bool, IsFocusable )
+
 		/** Assign this to get more diagnostics from the list view. */
 		SLATE_EVENT(FOnItemToString_Debug, OnItemToString_Debug)
 
@@ -160,6 +163,7 @@ public:
 		this->WheelScrollMultiplier = InArgs._WheelScrollMultiplier;
 		this->bHandleGamepadEvents = InArgs._HandleGamepadEvents;
 		this->bHandleDirectionalNavigation = InArgs._HandleDirectionalNavigation;
+		this->IsFocusable = InArgs._IsFocusable;
 
 		this->OnItemToString_Debug =
 			InArgs._OnItemToString_Debug.IsBound()
@@ -214,12 +218,18 @@ public:
 		, ItemToScrollIntoView( NullableItemType(nullptr) )
 		, UserRequestingScrollIntoView( 0 )
 		, ItemToNotifyWhenInView( NullableItemType(nullptr) ) 
+		, IsFocusable(true)
 	{ }
 
 public:
 
 	// SWidget overrides
 
+	virtual bool SupportsKeyboardFocus() const override
+	{
+		return IsFocusable.Get();
+	}
+
 	virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent ) override
 	{
 		const TArray<ItemType>& ItemsSourceRef = (*this->ItemsSource);
@@ -464,17 +474,10 @@ private:
 		 * @param Item  The item for which to find the widget.
 		 * @return A pointer to the corresponding widget if it exists; otherwise nullptr.
 		 */
-		TSharedPtr<ITableRow> GetWidgetForItem( const ItemType& Item )
+		TSharedPtr<ITableRow> GetWidgetForItem( const ItemType& Item ) const
 		{
-			TSharedRef<ITableRow>* LookupResult = ItemToWidgetMap.Find( Item );
-			if ( LookupResult != nullptr )
-			{
-				return *LookupResult;
-			}
-			else
-			{
-				return TSharedPtr<ITableRow>(nullptr);
-			}
+			const TSharedRef<ITableRow>* LookupResult = ItemToWidgetMap.Find(Item);
+			return LookupResult ? TSharedPtr<ITableRow>(*LookupResult) : TSharedPtr<ITableRow>(nullptr);
 		}
 
 		/**
@@ -491,7 +494,10 @@ private:
 			{
 				// It's a newly generated item!
 				ItemToWidgetMap.Add( InItem, InGeneratedWidget );
-				WidgetMapToItem.Add( &InGeneratedWidget.Get(), InItem );		
+				WidgetMapToItem.Add( &InGeneratedWidget.Get(), InItem );
+
+				// Now that the item-widget association is established, the generated row can fully initialize itself
+				InGeneratedWidget->InitializeRow();
 			}
 
 			// We should not clean up this item's widgets because it is in view.
@@ -518,50 +524,37 @@ private:
 		 */
 		void OnEndGenerationPass()
 		{
-			ensureMsgf( OwnerList, TEXT( "OwnerList is null, something is wrong." ) );
-
-			for( int32 ItemIndex = 0; ItemIndex < ItemsToBeCleanedUp.Num(); ++ItemIndex )
-			{
-				ItemType ItemToBeCleanedUp = ItemsToBeCleanedUp[ItemIndex];
-				const TSharedRef<ITableRow>* FindResult = ItemToWidgetMap.Find( ItemToBeCleanedUp );
-				if ( FindResult != nullptr )
-				{
-					const TSharedRef<ITableRow> WidgetToCleanUp = *FindResult;
-					ItemToWidgetMap.Remove( ItemToBeCleanedUp );
-					WidgetMapToItem.Remove( &WidgetToCleanUp.Get() );
-
-					// broadcast here
-					if ( OwnerList )
-					{
-						OwnerList->OnRowReleased.ExecuteIfBound( WidgetToCleanUp );
-					}
-				}				
-			}
-
+			ProcessItemCleanUp();
 			ValidateWidgetGeneration();
-
-			ItemsToBeCleanedUp.Reset();
 		}
 
-		/**
-		 * Clear everything so widgets will be regenerated
-		*/
+		/** Clear everything so widgets will be regenerated */
 		void Clear()
 		{
-			// Clean up all the previously generated items			
 			ItemsToBeCleanedUp = ItemsWithGeneratedWidgets;
 			ItemsWithGeneratedWidgets.Empty();
+			ProcessItemCleanUp();
+		}
 
-			for( int32 ItemIndex = 0; ItemIndex < ItemsToBeCleanedUp.Num(); ++ItemIndex )
+		void ProcessItemCleanUp()
+		{
+			
+			for (int32 ItemIndex = 0; ItemIndex < ItemsToBeCleanedUp.Num(); ++ItemIndex)
 			{
 				ItemType ItemToBeCleanedUp = ItemsToBeCleanedUp[ItemIndex];
-				const TSharedRef<ITableRow>* FindResult = ItemToWidgetMap.Find( ItemToBeCleanedUp );
-				if ( FindResult != nullptr )
+				const TSharedRef<ITableRow>* FindResult = ItemToWidgetMap.Find(ItemToBeCleanedUp);
+				if (FindResult != nullptr)
 				{
 					const TSharedRef<ITableRow> WidgetToCleanUp = *FindResult;
-					ItemToWidgetMap.Remove( ItemToBeCleanedUp );
-					WidgetMapToItem.Remove( &WidgetToCleanUp.Get() );
-				}				
+					ItemToWidgetMap.Remove(ItemToBeCleanedUp);
+					WidgetMapToItem.Remove(&WidgetToCleanUp.Get());
+
+					if (ensureMsgf(OwnerList, TEXT("OwnerList is null, something is wrong.")))
+					{
+						WidgetToCleanUp->ResetRow();
+						OwnerList->OnRowReleased.ExecuteIfBound(WidgetToCleanUp);
+					}
+				}
 			}
 
 			ItemsToBeCleanedUp.Reset();
@@ -1081,6 +1074,22 @@ public:
 
 	}
 
+	/**
+	 * Establishes a wholly new list of items being observed by the list.
+	 * Wipes all existing state and requests and will fully rebuild on the next tick.
+	 */
+	void SetListItemsSource(const TArray<ItemType>& InListItemsSource)
+	{
+		if (ItemsSource != &InListItemsSource)
+		{
+			Private_ClearSelection();
+			CancelScrollIntoView();
+			ClearWidgets();
+			RebuildList();
+			ItemsSource = &InListItemsSource;
+		}
+	}
+
 	/**
 	 * Given a Widget, find the corresponding data item.
 	 * 
@@ -1157,8 +1166,7 @@ public:
 		return SelectedItems.Num();
 	}
 
-	/** Deletes all items and rebuilds the list */
-	void RebuildList()
+	virtual void RebuildList() override
 	{
 		WidgetGenerator.Clear();
 		RequestListRefresh();
@@ -1197,7 +1205,7 @@ public:
 	 *
 	 * @return true if the item is visible, false otherwise.
 	 */
-	bool IsItemVisible( ItemType Item )
+	bool IsItemVisible( ItemType Item ) const
 	{
 		return WidgetGenerator.GetWidgetForItem(Item).IsValid();
 	}
@@ -1207,20 +1215,44 @@ public:
 	 *
 	 * @param ItemToView  The item to scroll into view on next tick.
 	 */
-	void RequestScrollIntoView( ItemType ItemToView, const uint32 UserIndex = 0, const bool NavigateOnScrollIntoView = false)
+	void RequestScrollIntoView( ItemType ItemToView, const uint32 UserIndex = 0)
 	{
 		ItemToScrollIntoView = ItemToView; 
 		UserRequestingScrollIntoView = UserIndex;
-		bNavigateOnScrollIntoView = NavigateOnScrollIntoView;
-		RequestListRefresh();
+		RequestLayoutRefresh();
+	}
+
+	DEPRECATED(4.20, "RequestScrollIntoView no longer takes parameter bNavigateOnScrollIntoView. Call RequestNavigateToItem instead of RequestScrollIntoView if navigation is required.")
+	void RequestScrollIntoView(ItemType ItemToView, const uint32 UserIndex, const bool NavigateOnScrollIntoView)
+	{
+		if (bNavigateOnScrollIntoView)
+		{
+			RequestNavigateToItem(ItemToView, UserIndex);
+		}
+		else
+		{
+			RequestScrollIntoView(ItemToView, UserIndex);
+		}
 	}
 
 	/**
-	 * Cancels a previous request to scroll and item into view.
+	 * Navigate to a specific item, scrolling it into view if needed. If the item is not found, fails silently.
+	 *
+	 * @param Item The item to navigate to on the next tick.
+	 */
+	void RequestNavigateToItem(ItemType Item, const uint32 UserIndex = 0)
+	{
+		bNavigateOnScrollIntoView = true;
+		RequestScrollIntoView(Item, UserIndex);
+	}
+
+	/**
+	 * Cancels a previous request to scroll an item into view (cancels navigation requests as well).
 	 */
 	void CancelScrollIntoView()
 	{
 		UserRequestingScrollIntoView = 0;
+		bNavigateOnScrollIntoView = false;
 		TListTypeTraits<ItemType>::ResetPtr(ItemToScrollIntoView);
 	}
 
@@ -1348,7 +1380,7 @@ protected:
 					SetScrollOffset( NewScrollOffset );
 				}
 
-				RequestListRefresh();
+				RequestLayoutRefresh();
 
 				ItemToNotifyWhenInView = ItemToScrollIntoView;
 			}
@@ -1408,7 +1440,7 @@ protected:
 			const float ActuallyScrolledBy = Overscroll.ScrollBy(MyGeometry, UnclampedScrollDelta);
 			if (ActuallyScrolledBy != 0.0f)
 			{
-				this->RequestListRefresh();
+				this->RequestLayoutRefresh();
 			}
 			return ActuallyScrolledBy;
 		}
@@ -1564,7 +1596,7 @@ protected:
 
 			// Always request scroll into view, otherwise partially visible items will be selected.
 			TSharedPtr<ITableRow> WidgetForItem = this->WidgetGenerator.GetWidgetForItem(ItemToSelect);
-			this->RequestScrollIntoView(ItemToSelect, InInputEvent.GetUserIndex(), true); 
+			RequestNavigateToItem(ItemToSelect, InInputEvent.GetUserIndex()); 
 		}
 	}
 
@@ -1618,6 +1650,9 @@ protected:
 	/** Called when the user double-clicks on an element in the list view with the left mouse button */
 	FOnMouseButtonDoubleClick OnDoubleClick;
 
+	/** True when the list view supports keyboard focus */
+	TAttribute<bool> IsFocusable;
+
 	/** If true, the selection will be cleared if the user clicks in empty space (not on an item) */
 	bool bClearSelectionOnClick;
 
@@ -1629,7 +1664,7 @@ protected:
 
 private:
 
-	bool bNavigateOnScrollIntoView;
+	bool bNavigateOnScrollIntoView = false;
 
 	struct FGenerationPassGuard
 	{
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableRow.h b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableRow.h
index a90c30005026..f56f4a4a4531 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableRow.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableRow.h
@@ -35,6 +35,19 @@ template <typename ItemType> class SListView;
 class SLATE_API ITableRow
 {
 	public:
+
+		/**
+		 * Called when the row has been generated and associated with an item in the owning table.
+		 * Any attempts to access the item associated with the row prior to this (i.e. in Construct()) will fail, as the association is not yet established in the owning table.
+		 */
+		virtual void InitializeRow() = 0;
+
+		/**
+		 * Called when the row has been released from the owning table and is no longer associated with any items therein.
+		 * Only relevant if the row widgets are pooled or otherwise referenced/kept alive outside the owning table. Otherwise, the row is destroyed.
+		 */
+		virtual void ResetRow() = 0;
+
 		/**
 		 * @param InIndexInList  The index of the item for which this widget was generated
 		 */
@@ -46,6 +59,9 @@ class SLATE_API ITableRow
 		/** Toggle the expansion of the item associated with this row */
 		virtual void ToggleExpansion() = 0;
 
+		/** @return True if the corresponding item is selected; false otherwise */
+		virtual bool IsItemSelected() const = 0;
+
 		/** @return how nested the item associated with this row when it is in a TreeView */
 		virtual int32 GetIndentLevel() const = 0;
 
@@ -312,83 +328,43 @@ public:
 	virtual FReply OnMouseButtonDown( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override
 	{
 		TSharedPtr< ITypedTableView<ItemType> > OwnerWidget = OwnerTablePtr.Pin();
-		ChangedSelectionOnMouseDown = false;
+		bChangedSelectionOnMouseDown = false;
 
 		check(OwnerWidget.IsValid());
 
 		if ( MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
 		{
-			switch( GetSelectionMode() )
+			const ESelectionMode::Type SelectionMode = GetSelectionMode();
+			if (SelectionMode != ESelectionMode::None)
 			{
-			case ESelectionMode::Single:
+				const ItemType& MyItem = *OwnerWidget->Private_ItemFromWidget(this);
+				const bool bIsSelected = OwnerWidget->Private_IsItemSelected(MyItem);
+
+				if (SelectionMode == ESelectionMode::Multi)
 				{
-					const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
-					const bool bIsSelected = OwnerWidget->Private_IsItemSelected( *MyItem );
-
-					// Select the item under the cursor
-					if( !bIsSelected )
+					if (MouseEvent.IsControlDown())
 					{
-						OwnerWidget->Private_ClearSelection();
-						OwnerWidget->Private_SetItemSelection( *MyItem, true, true );
-						ChangedSelectionOnMouseDown = true;
+						OwnerWidget->Private_SetItemSelection(MyItem, !bIsSelected, true);
+						bChangedSelectionOnMouseDown = true;
+					}
+					else if (MouseEvent.IsShiftDown())
+					{
+						OwnerWidget->Private_SelectRangeFromCurrentTo(MyItem);
+						bChangedSelectionOnMouseDown = true;
 					}
-					
-					return FReply::Handled()
-						.DetectDrag( SharedThis(this), EKeys::LeftMouseButton )
-						.SetUserFocus(OwnerWidget->AsWidget(), EFocusCause::Mouse)
-						.CaptureMouse( SharedThis(this) );
 				}
-				break;
-
-			case ESelectionMode::SingleToggle:
+				
+				if (!bIsSelected && !bChangedSelectionOnMouseDown)
 				{
-					const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
-					const bool bIsSelected = OwnerWidget->Private_IsItemSelected( *MyItem );
-
-					if( !bIsSelected )
-					{
-						OwnerWidget->Private_ClearSelection();
-						OwnerWidget->Private_SetItemSelection( *MyItem, true, true );
-						ChangedSelectionOnMouseDown = true;
-					}
-
-					return FReply::Handled()
-						.DetectDrag( SharedThis(this), EKeys::LeftMouseButton )
-						.SetUserFocus(OwnerWidget->AsWidget(), EFocusCause::Mouse)
-						.CaptureMouse( SharedThis(this) );
+					OwnerWidget->Private_ClearSelection();
+					OwnerWidget->Private_SetItemSelection(MyItem, true, true);
+					bChangedSelectionOnMouseDown = true;
 				}
-				break;
 
-			case ESelectionMode::Multi:
-				{
-					const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
-					const bool bIsSelected = OwnerWidget->Private_IsItemSelected( *MyItem );
-
-					check(MyItem != nullptr);
-
-					if ( MouseEvent.IsControlDown() )
-					{
-						OwnerWidget->Private_SetItemSelection( *MyItem, !bIsSelected, true );
-						ChangedSelectionOnMouseDown = true;
-					}
-					else if ( MouseEvent.IsShiftDown() )
-					{
-						OwnerWidget->Private_SelectRangeFromCurrentTo( *MyItem );
-						ChangedSelectionOnMouseDown = true;
-					}
-					else if ( !bIsSelected )
-					{
-						OwnerWidget->Private_ClearSelection();
-						OwnerWidget->Private_SetItemSelection( *MyItem, true, true );
-						ChangedSelectionOnMouseDown = true;
-					}
-
-					return FReply::Handled()
-						.DetectDrag( SharedThis(this), EKeys::LeftMouseButton )
-						.SetUserFocus(OwnerWidget->AsWidget(), EFocusCause::Mouse)
-						.CaptureMouse( SharedThis(this) );
-				}
-				break;
+				return FReply::Handled()
+					.DetectDrag(SharedThis(this), EKeys::LeftMouseButton)
+					.SetUserFocus(OwnerWidget->AsWidget(), EFocusCause::Mouse)
+					.CaptureMouse(SharedThis(this));
 			}
 		}
 
@@ -414,7 +390,7 @@ public:
 		{
 			FReply Reply = FReply::Unhandled().ReleaseMouseCapture();
 
-			if ( ChangedSelectionOnMouseDown )
+			if ( bChangedSelectionOnMouseDown )
 			{
 				Reply = FReply::Handled().ReleaseMouseCapture();
 			}
@@ -428,11 +404,8 @@ public:
 					{
 					case ESelectionMode::SingleToggle:
 						{
-							if ( !ChangedSelectionOnMouseDown )
+							if ( !bChangedSelectionOnMouseDown )
 							{
-								const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
-								const bool bIsSelected = OwnerWidget->Private_IsItemSelected( *MyItem );
-
 								OwnerWidget->Private_ClearSelection();
 								OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
 							}
@@ -443,7 +416,7 @@ public:
 
 					case ESelectionMode::Multi:
 						{
-							if ( !ChangedSelectionOnMouseDown && !MouseEvent.IsControlDown() && !MouseEvent.IsShiftDown() )
+							if ( !bChangedSelectionOnMouseDown && !MouseEvent.IsControlDown() && !MouseEvent.IsShiftDown() )
 							{
 								const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
 								check(MyItem != nullptr);
@@ -472,7 +445,7 @@ public:
 					Reply = FReply::Handled().ReleaseMouseCapture();
 				}
 
-				if ( ChangedSelectionOnMouseDown )
+				if ( bChangedSelectionOnMouseDown )
 				{
 					OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
 				}
@@ -527,52 +500,46 @@ public:
 
 	virtual FReply OnTouchEnded( const FGeometry& MyGeometry, const FPointerEvent& InTouchEvent ) override
 	{
-		if ( bProcessingSelectionTouch )
+		FReply Reply = FReply::Unhandled();
+
+		if (bProcessingSelectionTouch)
 		{
 			bProcessingSelectionTouch = false;
-			const TSharedPtr< ITypedTableView<ItemType> > OwnerWidget = OwnerTablePtr.Pin();
-			const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget( this );
-
-			switch( GetSelectionMode() )
+			const TSharedPtr<ITypedTableView<ItemType>> OwnerWidget = OwnerTablePtr.Pin();
+			if (const ItemType* MyItem = OwnerWidget->Private_ItemFromWidget(this))
 			{
-				default:
-				case ESelectionMode::None:
-					return FReply::Unhandled();
-				break;
-
-				case ESelectionMode::Single:
+				ESelectionMode::Type SelectionMode = GetSelectionMode();
+				if (SelectionMode != ESelectionMode::None)
 				{
-					OwnerWidget->Private_ClearSelection();
-					OwnerWidget->Private_SetItemSelection( *MyItem, true, true );
-					OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
-					return FReply::Handled();
-				}
-				break;
+					const bool bIsSelected = OwnerWidget->Private_IsItemSelected(*MyItem);
+					if (!bIsSelected)
+					{
+						if (SelectionMode != ESelectionMode::Multi)
+						{
+							OwnerWidget->Private_ClearSelection();
+						}
+						OwnerWidget->Private_SetItemSelection(*MyItem, true, true);
+						OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
 
-				case ESelectionMode::SingleToggle:
-				{
-					const bool bShouldBecomeSelected = !OwnerWidget->Private_IsItemSelected(*MyItem);
-					OwnerWidget->Private_ClearSelection();
-					OwnerWidget->Private_SetItemSelection( *MyItem, bShouldBecomeSelected, true );
-					OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
-				}
-				break;
+						Reply = FReply::Handled();
+					}
+					else if (SelectionMode == ESelectionMode::SingleToggle || SelectionMode == ESelectionMode::Multi)
+					{
+						OwnerWidget->Private_SetItemSelection(*MyItem, true, true);
+						OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
 
-				case ESelectionMode::Multi:
-				{
-					const bool bShouldBecomeSelected = !OwnerWidget->Private_IsItemSelected(*MyItem);
-					OwnerWidget->Private_SetItemSelection( *MyItem, bShouldBecomeSelected, true );
-					OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+						Reply = FReply::Handled();
+					}
+				}
+
+				if (OwnerWidget->Private_OnItemClicked(*MyItem))
+				{
+					Reply = FReply::Handled();
 				}
-				break;
 			}
-			
-			return FReply::Handled();
-		}
-		else
-		{
-			return FReply::Unhandled();
 		}
+
+		return Reply;
 	}
 
 	virtual FReply OnDragDetected( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override
@@ -584,7 +551,7 @@ public:
 			bProcessingSelectionTouch = false;
 			return FReply::Handled().CaptureMouse( OwnerTablePtr.Pin()->AsWidget() );
 		}
-		else if ( HasMouseCapture() && ChangedSelectionOnMouseDown )
+		else if ( HasMouseCapture() && bChangedSelectionOnMouseDown )
 		{
 			TSharedPtr< ITypedTableView<ItemType> > OwnerWidget = OwnerTablePtr.Pin();
 			OwnerWidget->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
@@ -707,6 +674,9 @@ public:
 		return Reply;
 	}
 
+	virtual void InitializeRow() override {}
+	virtual void ResetRow() override {}
+
 	virtual void SetIndexInList( int32 InIndexInList ) override
 	{
 		IndexInList = InIndexInList;
@@ -729,11 +699,18 @@ public:
 		if( bItemHasChildren )
 		{
 			ItemType MyItem = *(OwnerWidget->Private_ItemFromWidget( this ));
-			const bool IsItemExpanded = bItemHasChildren && OwnerWidget->Private_IsItemExpanded( MyItem );
-			OwnerWidget->Private_SetItemExpansion( MyItem, !IsItemExpanded );
+			const bool bIsItemExpanded = bItemHasChildren && OwnerWidget->Private_IsItemExpanded( MyItem );
+			OwnerWidget->Private_SetItemExpansion( MyItem, !bIsItemExpanded);
 		}
 	}
 
+	virtual bool IsItemSelected() const override
+	{
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+		return OwnerTable->Private_IsItemSelected(MyItem);
+	}
+
 	virtual int32 GetIndentLevel() const override
 	{
 		return OwnerTablePtr.Pin()->Private_GetNestingDepth( IndexInList );
@@ -1021,7 +998,7 @@ protected:
 	/** The widget in the content slot for this row */
 	TWeakPtr<SWidget> Content;
 
-	bool ChangedSelectionOnMouseDown;
+	bool bChangedSelectionOnMouseDown;
 
 	/** Did the current a touch interaction start in this item?*/
 	bool bProcessingSelectionTouch;
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableViewBase.h b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableViewBase.h
index c63d7902cc7e..762e5cec1787 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableViewBase.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STableViewBase.h
@@ -94,8 +94,14 @@ public:
 		        either mouse button and dragging. */
 	bool IsUserScrolling() const;
 
-	/** Mark the list as dirty, so that it will regenerate its widgets on next tick. */
-	void RequestListRefresh();
+	/**
+	 * Mark the list as dirty so that it will refresh its widgets on next tick.
+	 * Note that refreshing will only generate/release widgets as needed from any deltas in the list items source.
+	 */
+	virtual void RequestListRefresh();
+
+	/** Completely wipe existing widgets and fully regenerate them on next tick. */
+	virtual void RebuildList() = 0;
 
 	/** Return true if there is currently a refresh pending, false otherwise */
 	bool IsPendingRefresh() const;
@@ -126,13 +132,14 @@ public:
 	// SWidget interface
 
 	virtual void OnFocusLost( const FFocusEvent& InFocusEvent ) override;
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 	virtual bool SupportsKeyboardFocus() const override;
 	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
 	virtual FReply OnPreviewMouseButtonDown( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseButtonDown( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent ) override;
 	virtual FReply OnMouseButtonUp( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
+	virtual void OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual void OnMouseLeave( const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseMove( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
 	virtual FReply OnMouseWheel( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override;
@@ -225,6 +232,8 @@ protected:
 	 */
 	virtual void UpdateSelectionSet() = 0;
 
+	/** Internal request for a layout update on the next tick (i.e. a refresh without implication that the source items have changed) */
+	void RequestLayoutRefresh();
 
 	/** Information about the outcome of the WidgetRegeneratePass */
 	struct SLATE_API FReGenerateResults
@@ -358,9 +367,8 @@ protected:
 	EConsumeMouseWheel ConsumeMouseWheel;
 
 private:
-	
 	/** When true, a refresh should occur the next tick */
-	bool bItemsNeedRefresh;
+	bool bItemsNeedRefresh = false;
 };
 
 
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STileView.h b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STileView.h
index 4b1b7c11e151..972ec3a5737c 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STileView.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STileView.h
@@ -58,9 +58,10 @@ public:
 		, _WheelScrollMultiplier(GetGlobalScrollAmount())
 		, _HandleGamepadEvents(true)
 		, _HandleDirectionalNavigation(true)
+		, _IsFocusable(true)
 		, _OnItemToString_Debug()
 		, _OnEnteredBadState()
-		, _HandleLeftRightBoundsAsWrap(true)
+		, _WrapHorizontalNavigation(true)
 		{
 		}
 
@@ -108,12 +109,14 @@ public:
 
 		SLATE_ARGUMENT( bool, HandleDirectionalNavigation );
 
+		SLATE_ATTRIBUTE(bool, IsFocusable)
+
 		/** Assign this to get more diagnostics from the list view. */
 		SLATE_EVENT(FOnItemToString_Debug, OnItemToString_Debug)
 
 		SLATE_EVENT(FOnTableViewBadState, OnEnteredBadState);
 		
-		SLATE_ARGUMENT(bool, HandleLeftRightBoundsAsWrap);
+		SLATE_ARGUMENT(bool, WrapHorizontalNavigation);
 
 	SLATE_END_ARGS()
 
@@ -144,13 +147,14 @@ public:
 
 		this->bHandleGamepadEvents = InArgs._HandleGamepadEvents;
 		this->bHandleDirectionalNavigation = InArgs._HandleDirectionalNavigation;
+		this->IsFocusable = InArgs._IsFocusable;
 
 		this->OnItemToString_Debug = InArgs._OnItemToString_Debug.IsBound()
 			? InArgs._OnItemToString_Debug
 			: SListView< ItemType >::GetDefaultDebugDelegate();
 		this->OnEnteredBadState = InArgs._OnEnteredBadState;
 
-		this->bHandleLeftRightBoundsAsWrap = InArgs._HandleLeftRightBoundsAsWrap;
+		this->bWrapHorizontalNavigation = InArgs._WrapHorizontalNavigation;
 
 		// Check for any parameters that the coder forgot to specify.
 		FString ErrorString;
@@ -212,14 +216,14 @@ public:
 			switch (NavType)
 			{
 			case EUINavigation::Left:
-				if (bHandleLeftRightBoundsAsWrap || (CurSelectionIndex % NumItemsWide) > 0)
+				if (bWrapHorizontalNavigation || (CurSelectionIndex % NumItemsWide) > 0)
 				{
 					AttemptSelectIndex = CurSelectionIndex - 1;
 				}
 				break;
 
 			case EUINavigation::Right:
-				if (bHandleLeftRightBoundsAsWrap || (CurSelectionIndex % NumItemsWide) < (NumItemsWide - 1))
+				if (bWrapHorizontalNavigation || (CurSelectionIndex % NumItemsWide) < (NumItemsWide - 1))
 				{
 					AttemptSelectIndex = CurSelectionIndex + 1;
 				}
@@ -450,5 +454,5 @@ protected:
 	}
 
 	/** Should the left and right navigations be handled as a wrap when hitting the bounds. (you'll move to the previous / next row when appropriate) */
-	bool bHandleLeftRightBoundsAsWrap;
+	bool bWrapHorizontalNavigation = true;
 };
diff --git a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STreeView.h b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STreeView.h
index 4e1a4e5efaa1..52bd80297d5c 100644
--- a/Engine/Source/Runtime/Slate/Public/Widgets/Views/STreeView.h
+++ b/Engine/Source/Runtime/Slate/Public/Widgets/Views/STreeView.h
@@ -611,9 +611,14 @@ public:
 	}
 		
 	/** Queue up a regeneration of the linearized items on the next tick. */
-	void RequestTreeRefresh()
+	virtual void RequestListRefresh() override
 	{
 		bTreeItemsAreDirty = true;
+		SListView<ItemType>::RequestListRefresh();
+	}
+
+	void RequestTreeRefresh()
+	{
 		RequestListRefresh();
 	}
 		
@@ -686,15 +691,6 @@ public:
 		RequestTreeRefresh();
 	}
 
-private:
-
-	/** Hide RequestListRefresh() for the tree widget's interface.  You should always call RequestTreeRefresh()
-		for trees, not RequestListRefresh() */
-	void RequestListRefresh()
-	{
-		SListView< ItemType >::RequestListRefresh();
-	}
-
 protected:
 	
 	/** The delegate that is invoked whenever we need to gather an item's children. */
@@ -724,8 +720,8 @@ protected:
 private:		
 
 	/** true when the LinearizedItems need to be regenerated. */
-	bool bTreeItemsAreDirty;
+	bool bTreeItemsAreDirty = false;
 
 	/** true if we allow invisible items to stay selected. */
-	bool bAllowInvisibleItemSelection;
+	bool bAllowInvisibleItemSelection = false;
 };
diff --git a/Engine/Source/Runtime/SlateCore/Private/Application/SlateApplicationBase.cpp b/Engine/Source/Runtime/SlateCore/Private/Application/SlateApplicationBase.cpp
index d6b3f285c950..4f7bf38ad846 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Application/SlateApplicationBase.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Application/SlateApplicationBase.cpp
@@ -35,6 +35,51 @@ void FSlateApplicationBase::GetDisplayMetrics(FDisplayMetrics& OutDisplayMetrics
 	FDisplayMetrics::GetDisplayMetrics(OutDisplayMetrics); 
 }
 
+void FSlateApplicationBase::GetSafeZoneSize(FMargin& SafeZone, const FVector2D& OverrideSize)
+{
+	FVector2D ContainerSize = FVector2D::ZeroVector;
+
+#if WITH_EDITOR
+	ContainerSize = OverrideSize;
+#endif
+
+	if (ContainerSize.IsZero())
+	{
+		FDisplayMetrics Metrics;
+		FDisplayMetrics::GetDisplayMetrics(Metrics);
+		ContainerSize = FVector2D(Metrics.PrimaryDisplayWidth, Metrics.PrimaryDisplayHeight);
+	}
+
+	FMargin SafeZoneRatio;
+	GetSafeZoneRatio(SafeZoneRatio);
+	SafeZone.Left = SafeZoneRatio.Left * ContainerSize.X / 2.0f;
+	SafeZone.Right = SafeZoneRatio.Right * ContainerSize.X / 2.0f;
+	SafeZone.Top = SafeZoneRatio.Top * ContainerSize.Y / 2.0f;
+	SafeZone.Bottom = SafeZoneRatio.Bottom * ContainerSize.Y / 2.0f;
+}
+
+void FSlateApplicationBase::GetSafeZoneRatio(FMargin& SafeZoneRatio)
+{
+#if WITH_EDITOR
+	if (CustomSafeZoneRatio != FMargin())
+	{
+		SafeZoneRatio = CustomSafeZoneRatio;
+	}
+	else
+#endif
+	{
+		FDisplayMetrics Metrics;
+		FDisplayMetrics::GetDisplayMetrics(Metrics);
+		float HalfWidth = (Metrics.PrimaryDisplayWidth * 0.5f);
+		float HalfHeight = (Metrics.PrimaryDisplayHeight * 0.5f);
+		SafeZoneRatio = Metrics.TitleSafePaddingSize;
+		SafeZoneRatio.Left /= HalfWidth;
+		SafeZoneRatio.Top /= HalfHeight;
+		SafeZoneRatio.Right /= HalfWidth;
+		SafeZoneRatio.Bottom /= HalfHeight;
+	}
+}
+
 const FHitTesting& FSlateApplicationBase::GetHitTesting() const
 {
 	return HitTesting;
diff --git a/Engine/Source/Runtime/SlateCore/Private/Application/SlateWindowHelper.cpp b/Engine/Source/Runtime/SlateCore/Private/Application/SlateWindowHelper.cpp
index 1e34bb49b523..f9f84a832d3d 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Application/SlateWindowHelper.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Application/SlateWindowHelper.cpp
@@ -97,76 +97,88 @@ bool FSlateWindowHelper::FindPathToWidget( const TArray<TSharedRef<SWindow>>& Wi
 {
 	SCOPE_CYCLE_COUNTER(STAT_FindPathToWidget);
 
-#if SLATE_FAST_WIDGET_PATH
-	// We have to internally cast this anyway - because the constructed widget path will be of non-const widgets, so if you'll end up with
-	// a mutable copy anyway.
-	TSharedPtr<SWidget> CurWidget = ConstCastSharedRef<SWidget>(InWidget);
-	OutWidgetPath.Widgets.SetFilter(VisibilityFilter);
-	while (true)
+	if (SLATE_PARENT_POINTERS && GSlateFastWidgetPath)
 	{
-		EVisibility CurWidgetVisibility = CurWidget->GetVisibility();
-		if (OutWidgetPath.Widgets.Accepts(CurWidgetVisibility))
+		// We have to internally cast this anyway - because the constructed widget path will be of non-const widgets, so if you'll end up with
+		// a mutable copy anyway.
+		TSharedPtr<SWidget> CurWidget = ConstCastSharedRef<SWidget>(InWidget);
+		OutWidgetPath.Widgets.SetFilter(VisibilityFilter);
+		while (true)
 		{
-			FArrangedWidget ArrangedWidget(CurWidget.ToSharedRef(), CurWidget->GetCachedGeometry());
-			OutWidgetPath.Widgets.AddWidget(CurWidgetVisibility, ArrangedWidget);
-
-			TSharedPtr<SWidget> CurWidgetParent = CurWidget->GetParentWidget();
-			if (!CurWidgetParent.IsValid())
+			EVisibility CurWidgetVisibility = CurWidget->GetVisibility();
+			if (OutWidgetPath.Widgets.Accepts(CurWidgetVisibility))
 			{
-				if (CurWidget->Advanced_IsWindow())
+				FArrangedWidget ArrangedWidget(CurWidget.ToSharedRef(), CurWidget->GetCachedGeometry());
+				OutWidgetPath.Widgets.AddWidget(CurWidgetVisibility, ArrangedWidget);
+
+				TSharedPtr<SWidget> CurWidgetParent = CurWidget->GetParentWidget();
+				if (!CurWidgetParent.IsValid())
 				{
-					OutWidgetPath.TopLevelWindow = StaticCastSharedPtr<SWindow>(CurWidget);
-					OutWidgetPath.Widgets.Reverse();
-					// The path is complete, we found the top window.
-					return true;
+					if (CurWidget->Advanced_IsWindow())
+					{
+						OutWidgetPath.TopLevelWindow = StaticCastSharedPtr<SWindow>(CurWidget);
+						OutWidgetPath.Widgets.Reverse();
+						// The path is complete, we found the top window.
+						return true;
+					}
+
+					// This widget doesn't have a parent, abandon the tree.
+					OutWidgetPath.Widgets.Empty();
+					return false;
 				}
 
-				// This widget doesn't have a parent, abandon the tree.
+				// Even if the parent pointer is valid, and even if the visibility is visible,
+				// it's possible a widget shows and hides children without ever removing them
+				// this is the case with widgets like SWidgetSwitcher.
+				if (!CurWidgetParent->ValidatePathToChild(CurWidget.Get()))
+				{
+					OutWidgetPath.Widgets.Empty();
+					return false;
+				}
+
+				CurWidget = CurWidgetParent;
+			}
+			else
+			{
+				// We ran into a widget that isn't accepted.
 				OutWidgetPath.Widgets.Empty();
 				return false;
 			}
-
-			CurWidget = CurWidgetParent;
-		}
-		else
-		{
-			// We ran into a widget that isn't accepted.
-			OutWidgetPath.Widgets.Empty();
-			return false;
 		}
 	}
-#else
-	// Iterate over our top level windows
-	bool bFoundWidget = false;
-
-	for (int32 WindowIndex = 0; !bFoundWidget && WindowIndex < WindowsToSearch.Num(); ++WindowIndex)
+	else
 	{
-		// Make a widget path that contains just the top-level window
-		TSharedRef<SWindow> CurWindow = WindowsToSearch[WindowIndex];
-		
-		FArrangedChildren JustWindow(VisibilityFilter);
+		// Iterate over our top level windows
+		bool bFoundWidget = false;
+
+		for (int32 WindowIndex = 0; !bFoundWidget && WindowIndex < WindowsToSearch.Num(); ++WindowIndex)
 		{
-			JustWindow.AddWidget(FArrangedWidget(CurWindow, CurWindow->GetWindowGeometryInScreen()));
-		}
-		
-		FWidgetPath PathToWidget(CurWindow, JustWindow);
-		
-		// Attempt to extend it to the desired child widget; essentially a full-window search for 'InWidget
-		if ((CurWindow == InWidget) || PathToWidget.ExtendPathTo(FWidgetMatcher(InWidget), VisibilityFilter))
-		{
-			OutWidgetPath = PathToWidget;
-			bFoundWidget = true;
+			// Make a widget path that contains just the top-level window
+			TSharedRef<SWindow> CurWindow = WindowsToSearch[WindowIndex];
+
+			FArrangedChildren JustWindow(VisibilityFilter);
+			{
+				JustWindow.AddWidget(FArrangedWidget(CurWindow, CurWindow->GetWindowGeometryInScreen()));
+			}
+
+			FWidgetPath PathToWidget(CurWindow, JustWindow);
+
+			// Attempt to extend it to the desired child widget; essentially a full-window search for 'InWidget
+			if ((CurWindow == InWidget) || PathToWidget.ExtendPathTo(FWidgetMatcher(InWidget), VisibilityFilter))
+			{
+				OutWidgetPath = PathToWidget;
+				bFoundWidget = true;
+			}
+
+			if (!bFoundWidget)
+			{
+				// Search this window's children
+				bFoundWidget = FindPathToWidget(CurWindow->GetChildWindows(), InWidget, OutWidgetPath, VisibilityFilter);
+			}
 		}
 
-		if (!bFoundWidget)
-		{
-			// Search this window's children
-			bFoundWidget = FindPathToWidget(CurWindow->GetChildWindows(), InWidget, OutWidgetPath, VisibilityFilter);
-		}
+		return bFoundWidget;
 	}
-
-	return bFoundWidget;
-#endif
 }
 
 
diff --git a/Engine/Source/Runtime/SlateCore/Private/Brushes/SlateDynamicImageBrush.cpp b/Engine/Source/Runtime/SlateCore/Private/Brushes/SlateDynamicImageBrush.cpp
index 9db1b2d1b6ac..642f276aab9b 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Brushes/SlateDynamicImageBrush.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Brushes/SlateDynamicImageBrush.cpp
@@ -42,16 +42,18 @@ void FSlateDynamicImageBrush::ReleaseResourceInternal()
 		bIsInitalized = false;
 		if (FSlateApplicationBase::IsInitialized())
 		{
+			UObject* Object = GetResourceObject();
 			// Brush resource is no longer referenced by this object
-			if (ResourceObject && bRemoveResourceFromRootSet)
+			if (Object && bRemoveResourceFromRootSet)
 			{
-				ResourceObject->RemoveFromRoot();
+				Object->RemoveFromRoot();
 			}
 
 			if (FSlateRenderer* Renderer = FSlateApplicationBase::Get().GetRenderer())
 			{
 				Renderer->ReleaseDynamicResource(*this);
 			}
+			ResourceHandle = FSlateResourceHandle();
 		}
 	}
 }
diff --git a/Engine/Source/Runtime/SlateCore/Private/Fonts/FontCache.cpp b/Engine/Source/Runtime/SlateCore/Private/Fonts/FontCache.cpp
index cf6f7341858c..15a7861c5fae 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Fonts/FontCache.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Fonts/FontCache.cpp
@@ -333,6 +333,12 @@ FShapedGlyphSequencePtr FShapedGlyphSequence::GetSubSequence(const int32 InStart
 	return nullptr;
 }
 
+void FShapedGlyphSequence::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	Collector.AddReferencedObject(FontMaterial);
+	Collector.AddReferencedObject(OutlineSettings.OutlineMaterial);
+}
+
 FShapedGlyphSequence::EEnumerateGlyphsResult FShapedGlyphSequence::EnumerateLogicalGlyphsInSourceRange(const int32 InStartIndex, const int32 InEndIndex, const FForEachShapedGlyphEntryCallback& InGlyphCallback) const
 {
 	if (InStartIndex == InEndIndex)
@@ -1108,7 +1114,10 @@ void FSlateFontCache::FlushCache()
 			FontObjectsToFlush.Empty();
 		}
 
-		UE_LOG(LogSlate, Verbose, TEXT("Slate font cache was flushed"));
+#if !WITH_EDITOR
+		UE_LOG(LogSlate, Log, TEXT("Slate font cache was flushed"));
+#endif
+
 	}
 	else
 	{
diff --git a/Engine/Source/Runtime/SlateCore/Private/Fonts/SlateFontInfo.cpp b/Engine/Source/Runtime/SlateCore/Private/Fonts/SlateFontInfo.cpp
index e0a5bb7ce2ae..502fbe46a0bf 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Fonts/SlateFontInfo.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Fonts/SlateFontInfo.cpp
@@ -183,6 +183,12 @@ void FSlateFontInfo::PostSerialize(const FArchive& Ar)
 }
 #endif
 
+void FSlateFontInfo::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	Collector.AddReferencedObject(FontObject);
+	Collector.AddReferencedObject(FontMaterial);
+	Collector.AddReferencedObject(OutlineSettings.OutlineMaterial);
+}
 
 void FSlateFontInfo::UpgradeLegacyFontInfo(FName LegacyFontName, EFontHinting LegacyHinting)
 {
diff --git a/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp b/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp
index 0bf3d6ac2c75..ab1b7816d0b7 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Input/HittestGrid.cpp
@@ -217,7 +217,7 @@ TArray<FWidgetAndPointer> FHittestGrid::GetBubblePath(FVector2D DesktopSpaceCoor
 void FHittestGrid::ClearGridForNewFrame(const FSlateRect& HittestArea)
 {
 #if SLATE_VERBOSE_NAMED_EVENTS
-	FScopedNamedEvent ClearHTGEvent(FColor::Magenta, "FHittestGrid::ClearGridForNewFrame");
+	SCOPED_NAMED_EVENT_TEXT("FHittestGrid::ClearGridForNewFrame", FColor::Magenta);
 #endif
 	//LogGrid();
 
diff --git a/Engine/Source/Runtime/SlateCore/Private/Layout/Clipping.cpp b/Engine/Source/Runtime/SlateCore/Private/Layout/Clipping.cpp
index 5bd7cf8b8347..8e967ef9e8c6 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Layout/Clipping.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Layout/Clipping.cpp
@@ -183,8 +183,11 @@ bool FSlateClippingZone::IsPointInside(const FVector2D& Point) const
 //-------------------------------------------------------------------
 
 FSlateClippingState::FSlateClippingState(EClippingFlags InFlags /*= EClippingFlags::None*/)
-	: StateIndex(INDEX_NONE)
-	, Flags(InFlags)
+	: Flags(InFlags)
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	, Debugging_StateIndex(INDEX_NONE)
+	, Debugging_StateIndexFromFrame(INDEX_NONE)
+#endif
 {
 }
 
@@ -215,8 +218,6 @@ FSlateClippingManager::FSlateClippingManager()
 
 int32 FSlateClippingManager::PushClip(const FSlateClippingZone& InClipRect)
 {
-	FSlateClippingState NewClippingState(InClipRect.GetAlwaysClip() ? EClippingFlags::AlwaysClip : EClippingFlags::None);
-
 	const FSlateClippingState* PreviousClippingState = nullptr;
 
 	if (!InClipRect.GetShouldIntersectParent())
@@ -237,6 +238,9 @@ int32 FSlateClippingManager::PushClip(const FSlateClippingZone& InClipRect)
 		PreviousClippingState = &ClippingStates[ClippingStack.Top()];
 	}
 
+	// Initialize the new clipping state
+	FSlateClippingState NewClippingState(InClipRect.GetAlwaysClip() ? EClippingFlags::AlwaysClip : EClippingFlags::None);
+
 	if (PreviousClippingState == nullptr)
 	{
 		if (InClipRect.IsAxisAligned())
@@ -250,10 +254,11 @@ int32 FSlateClippingManager::PushClip(const FSlateClippingZone& InClipRect)
 	}
 	else
 	{
-		if (PreviousClippingState->ScissorRect.IsSet())
+		if (PreviousClippingState->GetClippingMethod() == EClippingMethod::Scissor)
 		{
 			if (InClipRect.IsAxisAligned())
 			{
+				ensure(PreviousClippingState->ScissorRect.IsSet());
 				NewClippingState.ScissorRect = PreviousClippingState->ScissorRect->Intersect(InClipRect);
 			}
 			else
@@ -275,12 +280,16 @@ int32 FSlateClippingManager::PushClip(const FSlateClippingZone& InClipRect)
 
 int32 FSlateClippingManager::PushClippingState(FSlateClippingState& NewClippingState)
 {
-	NewClippingState.SetStateIndex(ClippingStates.Num());
+	int32 NewClippingStateIndex = ClippingStates.Num();
 
-	ClippingStack.Add(NewClippingState.GetStateIndex());
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	NewClippingState.SetDebuggingStateIndex(NewClippingStateIndex);
+#endif
+
+	ClippingStack.Add(NewClippingStateIndex);
 	ClippingStates.Add(NewClippingState);
 
-	return NewClippingState.GetStateIndex();
+	return NewClippingStateIndex;
 }
 
 int32 FSlateClippingManager::GetClippingIndex() const
diff --git a/Engine/Source/Runtime/SlateCore/Private/Layout/SlateRect.cpp b/Engine/Source/Runtime/SlateCore/Private/Layout/SlateRect.cpp
index 43717f5d6923..a1c3e9e9f40d 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Layout/SlateRect.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Layout/SlateRect.cpp
@@ -1,23 +1,19 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Layout/SlateRect.h"
-#include "Layout/Margin.h"
 
-
-/* FSlateRect interface
- *****************************************************************************/
-
-FSlateRect FSlateRect::InsetBy( const FMargin& InsetAmount ) const
+FString FSlateRect::ToString() const
 {
-	return FSlateRect(Left + InsetAmount.Left, Top + InsetAmount.Top, Right - InsetAmount.Right, Bottom - InsetAmount.Bottom);
+	return FString::Printf(TEXT("Left=%3.3f Top=%3.3f Right=%3.3f Bottom=%3.3f"), Left, Top, Right, Bottom);
 }
 
-FSlateRect FSlateRect::ExtendBy(const FMargin& InsetAmount) const
+bool FSlateRect::InitFromString(const FString& InSourceString)
 {
-	return FSlateRect(Left - InsetAmount.Left, Top - InsetAmount.Top, Right + InsetAmount.Right, Bottom + InsetAmount.Bottom);
-}
+	// The initialization is only successful if the values can all be parsed from the string
+	const bool bSuccessful = FParse::Value(*InSourceString, TEXT("Left="), Left) &&
+		FParse::Value(*InSourceString, TEXT("Top="), Top) &&
+		FParse::Value(*InSourceString, TEXT("Right="), Right) &&
+		FParse::Value(*InSourceString, TEXT("Bottom="), Bottom);
 
-FSlateRect FSlateRect::OffsetBy(const FVector2D& OffsetAmount) const
-{
-	return FSlateRect(GetTopLeft() + OffsetAmount, GetBottomRight() + OffsetAmount);
+	return bSuccessful;
 }
diff --git a/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetCaching.cpp b/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetCaching.cpp
index 7afbc5503473..1cea969b3e79 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetCaching.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetCaching.cpp
@@ -28,7 +28,7 @@ void FCachedWidgetNode::RecordHittestGeometry(FHittestGrid& Grid, int32 LastHitt
 	if ( RecordedVisibility.AreChildrenHitTestVisible() )
 	{
 #if SLATE_VERBOSE_NAMED_EVENTS
-		FScopedNamedEvent RecordHitTestEvent(FColor::Yellow, TEXT("Slate::RecordHitTestGeometry"));
+		SCOPED_NAMED_EVENT_TEXT("Slate::RecordHitTestGeometry", FColor::Yellow);
 #endif
 		TSharedPtr<SWidget> SafeWidget = Widget.Pin();
 		if ( SafeWidget.IsValid() )
diff --git a/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetPath.cpp b/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetPath.cpp
index 37e50e05a324..4f553c84e253 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetPath.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Layout/WidgetPath.cpp
@@ -6,6 +6,7 @@
 DECLARE_CYCLE_STAT(TEXT("Weak-To-Strong WidgetPath"), STAT_WeakToStrong_WidgetPath, STATGROUP_Slate);
 
 
+
 FWidgetPath::FWidgetPath()
 : Widgets( EVisibility::Visible )
 , TopLevelWindow()
@@ -254,140 +255,143 @@ FWeakWidgetPath::EPathResolutionResult::Result FWeakWidgetPath::ToWidgetPath( FW
 {
 	SCOPE_CYCLE_COUNTER(STAT_WeakToStrong_WidgetPath);
 
-#if SLATE_FAST_WIDGET_PATH
-	TArray<FWidgetAndPointer> PathWithGeometries;
-	TArray< TSharedPtr<SWidget> > WidgetPtrs;
-	
-	// Convert the weak pointers into shared pointers because we are about to do something with this path instead of just observe it.
-	TSharedPtr<SWindow> TopLevelWindowPtr = Window.Pin();
-	for( TArray< TWeakPtr<SWidget> >::TConstIterator SomeWeakWidgetPtr( Widgets ); SomeWeakWidgetPtr; ++SomeWeakWidgetPtr )
+	if (SLATE_PARENT_POINTERS && GSlateFastWidgetPath)
 	{
-		WidgetPtrs.Add( SomeWeakWidgetPtr->Pin() );
-	}	
-	
-	// The path can get interrupted if some subtree of widgets disappeared, but we still maintain weak references to it.
-	bool bPathUninterrupted = false;
+		TArray<FWidgetAndPointer> PathWithGeometries;
+		TArray< TSharedPtr<SWidget> > WidgetPtrs;
 
-	// For each widget in the path compute the geometry. We are able to do this starting with the top-level window because it knows its own geometry.
-	if ( TopLevelWindowPtr.IsValid() )
-	{
-		bPathUninterrupted = true;
-
-		FGeometry ParentGeometry = TopLevelWindowPtr->GetWindowGeometryInScreen();
-		PathWithGeometries.Add( FWidgetAndPointer(
-			FArrangedWidget( TopLevelWindowPtr.ToSharedRef(), ParentGeometry ),
-			// @todo slate: this should be the cursor's virtual position in window space.
-			TSharedPtr<FVirtualPointerPosition>() ) );
-		
-		TSharedPtr<FVirtualPointerPosition> VirtualPointerPos;
-		// For every widget in the vertical slice...
-		for( int32 WidgetIndex = 0; bPathUninterrupted && WidgetIndex < WidgetPtrs.Num()-1; ++WidgetIndex )
+		// Convert the weak pointers into shared pointers because we are about to do something with this path instead of just observe it.
+		TSharedPtr<SWindow> TopLevelWindowPtr = Window.Pin();
+		for (TArray< TWeakPtr<SWidget> >::TConstIterator SomeWeakWidgetPtr(Widgets); SomeWeakWidgetPtr; ++SomeWeakWidgetPtr)
 		{
-			TSharedPtr<SWidget> CurWidget = WidgetPtrs[WidgetIndex];
+			WidgetPtrs.Add(SomeWeakWidgetPtr->Pin());
+		}
 
-			bool bFoundChild = false;
-			if ( CurWidget.IsValid() && EVisibility::DoesVisibilityPassFilter(CurWidget->GetVisibility(), VisibilityFilter))
+		// The path can get interrupted if some subtree of widgets disappeared, but we still maintain weak references to it.
+		bool bPathUninterrupted = false;
+
+		// For each widget in the path compute the geometry. We are able to do this starting with the top-level window because it knows its own geometry.
+		if (TopLevelWindowPtr.IsValid())
+		{
+			bPathUninterrupted = true;
+
+			FGeometry ParentGeometry = TopLevelWindowPtr->GetWindowGeometryInScreen();
+			PathWithGeometries.Add(FWidgetAndPointer(
+				FArrangedWidget(TopLevelWindowPtr.ToSharedRef(), ParentGeometry),
+				// @todo slate: this should be the cursor's virtual position in window space.
+				TSharedPtr<FVirtualPointerPosition>()));
+
+			TSharedPtr<FVirtualPointerPosition> VirtualPointerPos;
+			// For every widget in the vertical slice...
+			for (int32 WidgetIndex = 0; bPathUninterrupted && WidgetIndex < WidgetPtrs.Num() - 1; ++WidgetIndex)
 			{
-				TSharedRef<SWidget> CurWidgetRef = CurWidget.ToSharedRef();
-				const TSharedPtr<SWidget>& ChildWidgetPtr = WidgetPtrs[WidgetIndex + 1];
+				TSharedPtr<SWidget> CurWidget = WidgetPtrs[WidgetIndex];
 
-				if (ChildWidgetPtr.IsValid() && ChildWidgetPtr->GetParentWidget() == CurWidgetRef)
+				bool bFoundChild = false;
+				if (CurWidget.IsValid() && EVisibility::DoesVisibilityPassFilter(CurWidget->GetVisibility(), VisibilityFilter))
 				{
-					if( PointerEvent && !VirtualPointerPos.IsValid() )
+					TSharedRef<SWidget> CurWidgetRef = CurWidget.ToSharedRef();
+					const TSharedPtr<SWidget>& ChildWidgetPtr = WidgetPtrs[WidgetIndex + 1];
+
+					if (ChildWidgetPtr.IsValid() && ChildWidgetPtr->GetParentWidget() == CurWidgetRef)
 					{
-						VirtualPointerPos = CurWidget->TranslateMouseCoordinateFor3DChild(CurWidgetRef, ParentGeometry, PointerEvent->GetScreenSpacePosition(), PointerEvent->GetLastScreenSpacePosition() );
-					}
-
-					bFoundChild = true;
-					// Remember the widget, the associated geometry, and the pointer position in a transformed space.
-					PathWithGeometries.Add( FWidgetAndPointer(FArrangedWidget(ChildWidgetPtr.ToSharedRef(), ChildWidgetPtr->GetCachedGeometry()), VirtualPointerPos) );
-					// The next child in the vertical slice will be arranged with respect to its parent's geometry.
-					ParentGeometry = CurWidgetRef->GetCachedGeometry();
-				}
-			}
-
-			bPathUninterrupted = bFoundChild;
-			if (!bFoundChild && InterruptedPathHandling == EInterruptedPathHandling::ReturnInvalid )
-			{
-				return EPathResolutionResult::Truncated;
-			}
-		}			
-	}
-	
-	WidgetPath = FWidgetPath( PathWithGeometries );
-	return bPathUninterrupted ? EPathResolutionResult::Live : EPathResolutionResult::Truncated;
-#else
-	TArray<FWidgetAndPointer> PathWithGeometries;
-	TArray< TSharedPtr<SWidget> > WidgetPtrs;
-		
-	// Convert the weak pointers into shared pointers because we are about to do something with this path instead of just observe it.
-	TSharedPtr<SWindow> TopLevelWindowPtr = Window.Pin();
-	for( TArray< TWeakPtr<SWidget> >::TConstIterator SomeWeakWidgetPtr( Widgets ); SomeWeakWidgetPtr; ++SomeWeakWidgetPtr )
-	{
-		WidgetPtrs.Add( SomeWeakWidgetPtr->Pin() );
-	}	
-	
-	// The path can get interrupted if some subtree of widgets disappeared, but we still maintain weak references to it.
-	bool bPathUninterrupted = false;
-
-	// For each widget in the path compute the geometry. We are able to do this starting with the top-level window because it knows its own geometry.
-	if ( TopLevelWindowPtr.IsValid() )
-	{
-		bPathUninterrupted = true;
-
-		FGeometry ParentGeometry = TopLevelWindowPtr->GetWindowGeometryInScreen();
-		PathWithGeometries.Add( FWidgetAndPointer(
-			FArrangedWidget( TopLevelWindowPtr.ToSharedRef(), ParentGeometry ),
-			// @todo slate: this should be the cursor's virtual position in window space.
-			TSharedPtr<FVirtualPointerPosition>() ) );
-		
-		FArrangedChildren ArrangedChildren(VisibilityFilter, true);
-		
-		TSharedPtr<FVirtualPointerPosition> VirtualPointerPos;
-		// For every widget in the vertical slice...
-		for( int32 WidgetIndex = 0; bPathUninterrupted && WidgetIndex < WidgetPtrs.Num()-1; ++WidgetIndex )
-		{
-			TSharedPtr<SWidget> CurWidget = WidgetPtrs[WidgetIndex];
-
-			bool bFoundChild = false;
-			if ( CurWidget.IsValid() )
-			{
-				// Arrange the widget's children to find their geometries.
-				ArrangedChildren.Empty();
-				CurWidget->ArrangeChildren(ParentGeometry, ArrangedChildren);
-				
-				// Find the next widget in the path among the arranged children.
-				for( int32 SearchIndex = 0; !bFoundChild && SearchIndex < ArrangedChildren.Num(); ++SearchIndex )
-				{					
-					FArrangedWidget& ArrangedWidget = ArrangedChildren[SearchIndex];
-
-					if ( ArrangedWidget.Widget == WidgetPtrs[WidgetIndex + 1] )
-					{
-						if( PointerEvent && !VirtualPointerPos.IsValid() )
+						if (PointerEvent && !VirtualPointerPos.IsValid())
 						{
-							VirtualPointerPos = CurWidget->TranslateMouseCoordinateFor3DChild( ArrangedWidget.Widget, ParentGeometry, PointerEvent->GetScreenSpacePosition(), PointerEvent->GetLastScreenSpacePosition() );
+							VirtualPointerPos = CurWidget->TranslateMouseCoordinateFor3DChild(CurWidgetRef, ParentGeometry, PointerEvent->GetScreenSpacePosition(), PointerEvent->GetLastScreenSpacePosition());
 						}
 
 						bFoundChild = true;
 						// Remember the widget, the associated geometry, and the pointer position in a transformed space.
-						PathWithGeometries.Add( FWidgetAndPointer(ArrangedChildren[SearchIndex], VirtualPointerPos) );
+						PathWithGeometries.Add(FWidgetAndPointer(FArrangedWidget(ChildWidgetPtr.ToSharedRef(), ChildWidgetPtr->GetCachedGeometry()), VirtualPointerPos));
 						// The next child in the vertical slice will be arranged with respect to its parent's geometry.
-						ParentGeometry = ArrangedChildren[SearchIndex].Geometry;
+						ParentGeometry = CurWidgetRef->GetCachedGeometry();
 					}
 				}
-			}
 
-			bPathUninterrupted = bFoundChild;
-			if (!bFoundChild && InterruptedPathHandling == EInterruptedPathHandling::ReturnInvalid )
-			{
-				return EPathResolutionResult::Truncated;
+				bPathUninterrupted = bFoundChild;
+				if (!bFoundChild && InterruptedPathHandling == EInterruptedPathHandling::ReturnInvalid)
+				{
+					return EPathResolutionResult::Truncated;
+				}
 			}
-		}			
+		}
+
+		WidgetPath = FWidgetPath(PathWithGeometries);
+		return bPathUninterrupted ? EPathResolutionResult::Live : EPathResolutionResult::Truncated;
+	}
+	else
+	{
+		TArray<FWidgetAndPointer> PathWithGeometries;
+		TArray< TSharedPtr<SWidget> > WidgetPtrs;
+
+		// Convert the weak pointers into shared pointers because we are about to do something with this path instead of just observe it.
+		TSharedPtr<SWindow> TopLevelWindowPtr = Window.Pin();
+		for (TArray< TWeakPtr<SWidget> >::TConstIterator SomeWeakWidgetPtr(Widgets); SomeWeakWidgetPtr; ++SomeWeakWidgetPtr)
+		{
+			WidgetPtrs.Add(SomeWeakWidgetPtr->Pin());
+		}
+
+		// The path can get interrupted if some subtree of widgets disappeared, but we still maintain weak references to it.
+		bool bPathUninterrupted = false;
+
+		// For each widget in the path compute the geometry. We are able to do this starting with the top-level window because it knows its own geometry.
+		if (TopLevelWindowPtr.IsValid())
+		{
+			bPathUninterrupted = true;
+
+			FGeometry ParentGeometry = TopLevelWindowPtr->GetWindowGeometryInScreen();
+			PathWithGeometries.Add(FWidgetAndPointer(
+				FArrangedWidget(TopLevelWindowPtr.ToSharedRef(), ParentGeometry),
+				// @todo slate: this should be the cursor's virtual position in window space.
+				TSharedPtr<FVirtualPointerPosition>()));
+
+			FArrangedChildren ArrangedChildren(VisibilityFilter, true);
+
+			TSharedPtr<FVirtualPointerPosition> VirtualPointerPos;
+			// For every widget in the vertical slice...
+			for (int32 WidgetIndex = 0; bPathUninterrupted && WidgetIndex < WidgetPtrs.Num() - 1; ++WidgetIndex)
+			{
+				TSharedPtr<SWidget> CurWidget = WidgetPtrs[WidgetIndex];
+
+				bool bFoundChild = false;
+				if (CurWidget.IsValid())
+				{
+					// Arrange the widget's children to find their geometries.
+					ArrangedChildren.Empty();
+					CurWidget->ArrangeChildren(ParentGeometry, ArrangedChildren);
+
+					// Find the next widget in the path among the arranged children.
+					for (int32 SearchIndex = 0; !bFoundChild && SearchIndex < ArrangedChildren.Num(); ++SearchIndex)
+					{
+						FArrangedWidget& ArrangedWidget = ArrangedChildren[SearchIndex];
+
+						if (ArrangedWidget.Widget == WidgetPtrs[WidgetIndex + 1])
+						{
+							if (PointerEvent && !VirtualPointerPos.IsValid())
+							{
+								VirtualPointerPos = CurWidget->TranslateMouseCoordinateFor3DChild(ArrangedWidget.Widget, ParentGeometry, PointerEvent->GetScreenSpacePosition(), PointerEvent->GetLastScreenSpacePosition());
+							}
+
+							bFoundChild = true;
+							// Remember the widget, the associated geometry, and the pointer position in a transformed space.
+							PathWithGeometries.Add(FWidgetAndPointer(ArrangedChildren[SearchIndex], VirtualPointerPos));
+							// The next child in the vertical slice will be arranged with respect to its parent's geometry.
+							ParentGeometry = ArrangedChildren[SearchIndex].Geometry;
+						}
+					}
+				}
+
+				bPathUninterrupted = bFoundChild;
+				if (!bFoundChild && InterruptedPathHandling == EInterruptedPathHandling::ReturnInvalid)
+				{
+					return EPathResolutionResult::Truncated;
+				}
+			}
+		}
+
+		WidgetPath = FWidgetPath(PathWithGeometries);
+		return bPathUninterrupted ? EPathResolutionResult::Live : EPathResolutionResult::Truncated;
 	}
-	
-	WidgetPath = FWidgetPath( PathWithGeometries );
-	return bPathUninterrupted ? EPathResolutionResult::Live : EPathResolutionResult::Truncated;
-#endif
 }
 
 bool FWeakWidgetPath::ContainsWidget( const TSharedRef< const SWidget >& SomeWidget ) const
diff --git a/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp b/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp
index 9cc17335aa38..9575393d8ff0 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Rendering/DrawElements.cpp
@@ -6,14 +6,28 @@
 #include "Widgets/SWindow.h"
 #include "HAL/IConsoleManager.h"
 #include "Types/ReflectionMetadata.h"
+#include "Fonts/ShapedTextFwd.h"
+#include "Fonts/FontCache.h"
+#include "Rendering/SlateObjectReferenceCollector.h"
 
 DECLARE_CYCLE_STAT(TEXT("FSlateDrawElement::Make Time"), STAT_SlateDrawElementMakeTime, STATGROUP_SlateVerbose);
 DECLARE_CYCLE_STAT(TEXT("FSlateDrawElement::MakeCustomVerts Time"), STAT_SlateDrawElementMakeCustomVertsTime, STATGROUP_Slate);
+DECLARE_CYCLE_STAT(TEXT("FSlateDrawElement::Prebatch Time"), STAT_SlateDrawElementPrebatchTime, STATGROUP_Slate);
 
 DEFINE_STAT(STAT_SlateBufferPoolMemory);
 
 FSlateShaderResourceManager* FSlateDataPayload::ResourceManager;
 
+static bool IsResourceObjectValid(UObject*& InObject)
+{
+	if (InObject != nullptr && (InObject->IsPendingKillOrUnreachable() || InObject->HasAnyFlags(RF_BeginDestroyed)))
+	{
+		UE_LOG(LogSlate, Warning, TEXT("Attempted to access resource for %s which is pending kill, unreachable or pending destroy"), *InObject->GetName());
+		return false;
+	}
+
+	return true;
+}
 
 FSlateWindowElementList::FSlateWindowElementList(TSharedPtr<SWindow> InPaintWindow)
 	: PaintWindow(InPaintWindow)
@@ -33,7 +47,15 @@ FSlateWindowElementList::FSlateWindowElementList(TSharedPtr<SWindow> InPaintWind
 	// Only keep UObject resources alive if this window element list is born on the game thread.
 	if (IsInGameThread())
 	{
-		ResourceGCRoot = MakeShared<FWindowElementGCObject>(this);
+		ResourceGCRoot = MakeUnique<FWindowElementGCObject>(this);
+	}
+}
+
+FSlateWindowElementList::~FSlateWindowElementList()
+{
+	if (ResourceGCRoot.IsValid())
+	{
+		ResourceGCRoot->ClearOwner();
 	}
 }
 
@@ -193,8 +215,6 @@ void FSlateDrawElement::ApplyPositionOffset(FSlateDrawElement& Element, const FV
 	Element.LayoutToRenderTransform = Concatenate(InverseLayoutTransform, Element.RenderTransform);
 }
 
-#if SLATE_EXCESSIVE_CULLING
-
 bool FSlateDrawElement::ShouldCull(const FSlateWindowElementList& ElementList)
 {
 	const FSlateClippingManager& ClippingManager = ElementList.GetClippingManager();
@@ -208,7 +228,26 @@ bool FSlateDrawElement::ShouldCull(const FSlateWindowElementList& ElementList)
 	return false;
 }
 
-#endif
+bool FSlateDrawElement::ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FSlateBrush* InBrush)
+{
+	if (ShouldCull(ElementList, PaintGeometry))
+	{
+		return true;
+	}
+
+	if (InBrush->GetDrawType() == ESlateBrushDrawType::NoDrawType)
+	{
+		return true;
+	}
+
+	UObject* ResourceObject = InBrush->GetResourceObject();
+	if (!IsResourceObjectValid(ResourceObject))
+	{
+		return true;
+	}
+
+	return false;
+}
 
 void FSlateDrawElement::MakeDebugQuad( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry)
 {
@@ -238,20 +277,15 @@ void FSlateDrawElement::MakeBox(
 	{
 		return;
 	}
-	
-	if (InBrush->DrawAs == ESlateBrushDrawType::Border)
+
+	FSlateDrawBox& Element = (InBrush->DrawAs == ESlateBrushDrawType::Border) ? ElementList.AddBorder() : ElementList.AddBox();
+	Element.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
+	Element.SetTint(InTint);
+	Element.SetBrush(InBrush);
+
+	if (UObject* ResourceObject = InBrush->GetResourceObject())
 	{
-		FSlateDrawBox& Box = ElementList.AddBorder();
-		Box.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
-		Box.SetTint(InTint);
-		Box.SetBrush(InBrush, FSlateDataPayload::ResourceManager);
-	}
-	else
-	{
-		FSlateDrawBox& Box = ElementList.AddBox();
-		Box.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
-		Box.SetTint(InTint);
-		Box.SetBrush(InBrush, FSlateDataPayload::ResourceManager);
+		ElementList.ResourcesToReport.Add(InBrush->GetResourceObject());
 	}
 }
 
@@ -264,66 +298,43 @@ void FSlateDrawElement::MakeBox(
 	ESlateDrawEffect InDrawEffects, 
 	const FLinearColor& InTint )
 {
-	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
+	MakeBox(ElementList, InLayer, PaintGeometry, InBrush, InDrawEffects, InTint);
+}
 
-	// Ignore invalid rendering handles.
-	if ( !InRenderingHandle.IsValid() )
-	{
-		return;
-	}
+void FSlateDrawElement::MakeRotatedBox(
+	FSlateWindowElementList& ElementList,
+	uint32 InLayer,
+	const FPaintGeometry& PaintGeometry,
+	const FSlateBrush* InBrush,
+	ESlateDrawEffect InDrawEffects,
+	float Angle2D,
+	TOptional<FVector2D> InRotationPoint,
+	ERotationSpace RotationSpace,
+	const FLinearColor& InTint)
+{
+	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
 
 	if (ShouldCull(ElementList, PaintGeometry, InBrush, InTint))
 	{
 		return;
 	}
 
-	FSlateShaderResourceProxy* RenderingProxy = InRenderingHandle.Data->Proxy;
+	FSlateDrawBox& Element = (InBrush->DrawAs == ESlateBrushDrawType::Border) ? ElementList.AddBorder() : ElementList.AddBox();
+	Element.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
+	Element.SetTint(InTint);
+	Element.SetBrush(InBrush);
 
-	if (InBrush->DrawAs == ESlateBrushDrawType::Border)
-	{
-		FSlateDrawBox& Box = ElementList.AddBorder();
-		Box.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
-		Box.SetTint(InTint);
-		Box.SetBrush(InBrush, RenderingProxy);
-	}
-	else
-	{
-		FSlateDrawBox& Box = ElementList.AddBox();
-		Box.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
-		Box.SetTint(InTint);
-		Box.SetBrush(InBrush, RenderingProxy);
-	}
-}
-
-void FSlateDrawElement::MakeRotatedBox( 
-	FSlateWindowElementList& ElementList,
-	uint32 InLayer, 
-	const FPaintGeometry& PaintGeometry,
-	const FSlateBrush* InBrush,
-	ESlateDrawEffect InDrawEffects, 
-	float Angle2D,
-	TOptional<FVector2D> InRotationPoint,
-	ERotationSpace RotationSpace,
-	const FLinearColor& InTint )
-{
-	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
-
-	FPaintGeometry RotatedPaintGeometry = PaintGeometry;
-	
 	if (Angle2D != 0.0f)
 	{
-		FVector2D RotationPoint = GetRotationPoint(PaintGeometry, InRotationPoint, RotationSpace);
+		const FVector2D RotationPoint = GetRotationPoint(PaintGeometry, InRotationPoint, RotationSpace);
 		const FSlateRenderTransform RotationTransform = Concatenate(Inverse(RotationPoint), FQuat2D(Angle2D), RotationPoint);
-		RotatedPaintGeometry.SetRenderTransform(Concatenate(RotationTransform, RotatedPaintGeometry.GetAccumulatedRenderTransform()));
+		Element.SetRenderTransform(Concatenate(RotationTransform, Element.GetRenderTransform()));
 	}
 
-	MakeBox(
-		ElementList,
-		InLayer,
-		RotatedPaintGeometry,
-		InBrush,
-		InDrawEffects,
-		InTint);
+	if (UObject* ResourceObject = InBrush->GetResourceObject())
+	{
+		ElementList.ResourcesToReport.Add(InBrush->GetResourceObject());
+	}
 }
 
 
@@ -332,7 +343,7 @@ void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 I
 	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeTime)
 	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
 
-	if (ShouldCull(ElementList, PaintGeometry, InTint))
+	if (ShouldCull(ElementList, PaintGeometry, InTint, InText))
 	{
 		return;
 	}
@@ -341,6 +352,9 @@ void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 I
 	Element.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
 	Element.SetTint(InTint);
 	Element.SetText(ElementList, InText, InFontInfo, StartIndex, EndIndex);
+
+	FSlateObjectReferenceCollector Collector(ElementList.ResourcesToReport);
+	Element.AddReferencedObjects(Collector);
 }
 
 void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FString& InText, const FSlateFontInfo& InFontInfo, ESlateDrawEffect InDrawEffects, const FLinearColor& InTint )
@@ -348,23 +362,19 @@ void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 I
 	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeTime)
 	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
 
-	if (ShouldCull(ElementList, PaintGeometry, InTint))
+	// Don't try and render empty text
+	if (InText.Len() == 0)
 	{
 		return;
 	}
 
-	FSlateDrawText& Box = ElementList.AddText();
-	Box.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
-	Box.SetTint(InTint);
-	Box.SetText(ElementList, InText, InFontInfo);
-}
+	if (ShouldCull(ElementList, PaintGeometry, InTint, InText))
+	{
+		return;
+	}
 
-void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FText& InText, const FSlateFontInfo& InFontInfo, ESlateDrawEffect InDrawEffects, const FLinearColor& InTint )
-{
-	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeTime)
-	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
-
-	if (ShouldCull(ElementList, PaintGeometry, InTint))
+	// Don't do anything if there the font would be completely transparent 
+	if (InTint.A == 0 && !InFontInfo.OutlineSettings.IsVisible())
 	{
 		return;
 	}
@@ -372,7 +382,10 @@ void FSlateDrawElement::MakeText( FSlateWindowElementList& ElementList, uint32 I
 	FSlateDrawText& Element = ElementList.AddText();
 	Element.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
 	Element.SetTint(InTint);
-	Element.SetText(ElementList, InText.ToString(), InFontInfo);
+	Element.SetText(ElementList, InText, InFontInfo);
+
+	FSlateObjectReferenceCollector Collector(ElementList.ResourcesToReport);
+	Element.AddReferencedObjects(Collector);
 }
 
 void FSlateDrawElement::MakeShapedText( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FShapedGlyphSequenceRef& InShapedGlyphSequence, ESlateDrawEffect InDrawEffects, const FLinearColor& BaseTint, const FLinearColor& OutlineTint )
@@ -380,15 +393,30 @@ void FSlateDrawElement::MakeShapedText( FSlateWindowElementList& ElementList, ui
 	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeTime)
 	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
 
+	if (InShapedGlyphSequence->GetGlyphsToRender().Num() == 0)
+	{
+		return;
+	}
+
 	if (ShouldCull(ElementList, PaintGeometry))
 	{
 		return;
 	}
 
+	// Don't do anything if there the font would be completely transparent 
+	if ((BaseTint.A == 0 && InShapedGlyphSequence->GetFontOutlineSettings().OutlineSize == 0) || 
+		(BaseTint.A == 0 && OutlineTint.A == 0))
+	{
+		return;
+	}
+
 	FSlateDrawShapedText& Element = ElementList.AddShapedText();
 	Element.Setup(ElementList, InLayer, PaintGeometry, InDrawEffects);
 	Element.SetTint(BaseTint);
 	Element.SetShapedText(InShapedGlyphSequence, OutlineTint);
+
+	FSlateObjectReferenceCollector Collector(ElementList.ResourcesToReport);
+	Element.AddReferencedObjects(Collector);
 }
 
 void FSlateDrawElement::MakeGradient( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, TArray<FSlateGradientStop> InGradientStops, EOrientation InGradientType, ESlateDrawEffect InDrawEffects )
@@ -406,7 +434,6 @@ void FSlateDrawElement::MakeGradient( FSlateWindowElementList& ElementList, uint
 	DrawElt.DataPayload.SetGradientPayloadProperties( InGradientStops, InGradientType );
 }
 
-
 void FSlateDrawElement::MakeSpline( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FVector2D& InStart, const FVector2D& InStartDir, const FVector2D& InEnd, const FVector2D& InEndDir, float InThickness, ESlateDrawEffect InDrawEffects, const FLinearColor& InTint )
 {
 	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
@@ -435,7 +462,6 @@ void FSlateDrawElement::MakeCubicBezierSpline(FSlateWindowElementList & ElementL
 	DrawElt.DataPayload.SetCubicBezierPayloadProperties(P0, P1, P2, P3, InThickness, InTint);
 }
 
-
 void FSlateDrawElement::MakeDrawSpaceSpline( FSlateWindowElementList& ElementList, uint32 InLayer, const FVector2D& InStart, const FVector2D& InStartDir, const FVector2D& InEnd, const FVector2D& InEndDir, float InThickness, ESlateDrawEffect InDrawEffects, const FLinearColor& InTint )
 {
 	MakeSpline( ElementList, InLayer, FPaintGeometry(), InStart, InStartDir, InEnd, InEndDir, InThickness, InDrawEffects, InTint );
@@ -473,7 +499,6 @@ void FSlateDrawElement::MakeDrawSpaceGradientSpline(FSlateWindowElementList& Ele
 	DrawElt.DataPayload.SetGradientHermiteSplinePayloadProperties(InStart, InStartDir, InEnd, InEndDir, InThickness, InGradientStops);
 }
 
-
 void FSlateDrawElement::MakeLines(FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const TArray<FVector2D>& Points, ESlateDrawEffect InDrawEffects, const FLinearColor& InTint, bool bAntialias, float Thickness)
 {
 	PaintGeometry.CommitTransformsIfUsingLegacyConstructor();
@@ -539,8 +564,8 @@ void FSlateDrawElement::MakeCustom( FSlateWindowElementList& ElementList, uint32
 
 void FSlateDrawElement::MakeCustomVerts(FSlateWindowElementList& ElementList, uint32 InLayer, const FSlateResourceHandle& InRenderResourceHandle, const TArray<FSlateVertex>& InVerts, const TArray<SlateIndex>& InIndexes, ISlateUpdatableInstanceBuffer* InInstanceData, uint32 InInstanceOffset, uint32 InNumInstances, ESlateDrawEffect InDrawEffects)
 {
-	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeCustomVertsTime)
-
+	SCOPE_CYCLE_COUNTER(STAT_SlateDrawElementMakeCustomVertsTime);
+	
 	if (ShouldCull(ElementList))
 	{
 		return;
@@ -551,7 +576,7 @@ void FSlateDrawElement::MakeCustomVerts(FSlateWindowElementList& ElementList, ui
 	DrawElt.RenderTransform = FSlateRenderTransform();
 	DrawElt.ElementType = ET_CustomVerts;
 
-	FSlateShaderResourceProxy* RenderingProxy = InRenderResourceHandle.Data->Proxy;
+	const FSlateShaderResourceProxy* RenderingProxy = InRenderResourceHandle.GetResourceProxy();
 
 	DrawElt.DataPayload.SetCustomVertsPayloadProperties(RenderingProxy, InVerts, InIndexes, InInstanceData, InInstanceOffset, InNumInstances);
 }
@@ -563,12 +588,17 @@ void FSlateDrawElement::MakeCachedBuffer(FSlateWindowElementList& ElementList, u
 		return;
 	}
 
-	FSlateDrawElement& DrawElt = ElementList.AddUninitialized();
-	DrawElt.Init(ElementList, InLayer, FPaintGeometry(), ESlateDrawEffect::None);
-	DrawElt.RenderTransform = FSlateRenderTransform();
-	DrawElt.ElementType = ET_CachedBuffer;
-	DrawElt.DataPayload.SetCachedBufferPayloadProperties(CachedRenderDataHandle.Get(), Offset);
+	// Don't draw invalid render data handles.
+	if (!CachedRenderDataHandle.IsValid())
+	{
+		return;
+	}
 
+	FSlateDrawCachedBuffer& Element = ElementList.AddCachedBuffer();
+	Element.Setup(ElementList, InLayer, FPaintGeometry(), ESlateDrawEffect::None);
+	Element.SetCachedBuffer(CachedRenderDataHandle.Get(), Offset);
+
+	// Note that the buffer is currently in use, this avoid releasing it back into a pool.
 	ElementList.BeginUsingCachedBuffer(CachedRenderDataHandle);
 }
 
@@ -901,9 +931,14 @@ void FSlateBatchData::Merge(FElementBatchMap& InLayerToElementBatches, uint32& V
 	InLayerToElementBatches.Reset();
 }
 
-void FSlateWindowElementList::MergeResources(const TSet<UObject*>& AssociatedResources)
+void FSlateWindowElementList::MergeResources(const TArray<UObject*>& AssociatedResources)
 {
-	ExtraResources.Append(AssociatedResources);
+	for (UObject* AssociatedResource : AssociatedResources)
+	{
+		IsResourceObjectValid(AssociatedResource);
+	}
+
+	ResourcesToReport.Append(AssociatedResources);
 }
 
 void FSlateWindowElementList::MergeElementList(FSlateWindowElementList* ElementList, FVector2D AbsoluteOffset)
@@ -1048,7 +1083,7 @@ int32 FSlateWindowElementList::FVolatilePaint::ExecutePaint(FSlateWindowElementL
 	if ( WidgetToPaint.IsValid() )
 	{
 #if SLATE_VERBOSE_NAMED_EVENTS
-		FScopedNamedEvent Event(FColor::Orange, *FReflectionMetaData::GetWidgetDebugInfo(WidgetToPaint.Get()));
+		SCOPED_NAMED_EVENT_FSTRING(FReflectionMetaData::GetWidgetDebugInfo(WidgetToPaint.Get()), FColor::Orange);
 #endif
 
 		// Have to run a slate pre-pass for all volatile elements, some widgets cache information like 
@@ -1244,6 +1279,11 @@ void FSlateWindowElementList::PostDraw_ParallelThread()
 {
 	check(IsInParallelRenderingThread());
 
+	PostDraw_NonParallelRenderer();
+}
+
+void FSlateWindowElementList::PostDraw_NonParallelRenderer()
+{
 	for ( auto& Entry : DrawLayers )
 	{
 		Entry.Key->BatchMap = nullptr;
@@ -1273,10 +1313,8 @@ void FSlateWindowElementList::ResetElementBuffers()
 	checkSlow(!IsCachedRenderDataInUse());
 	check(IsThreadSafeForSlateRendering());
 
-	bReportReferences = true;
-
 	// Reset the Main Thread Resources, because we no longer need to keep these referenced objects alive.
-	ExtraResources.Reset();
+	ResourcesToReport.Reset();
 
 	DeferredPaintList.Reset();
 	VolatilePaintList.Reset();
@@ -1305,6 +1343,18 @@ void FSlateWindowElementList::ResetElementBuffers()
 	MemManager.Flush();
 
 	RenderTargetWindow = nullptr;
+
+	bReportReferences = true;
+}
+
+void FSlateWindowElementList::SetShouldReportReferencesToGC(bool bInReportReferences)
+{
+	bReportReferences = bInReportReferences;
+}
+
+bool FSlateWindowElementList::ShouldReportUObjectReferences() const
+{
+	return bReportReferences || IsCachedRenderDataInUse();
 }
 
 FSlateWindowElementList::FWindowElementGCObject::FWindowElementGCObject(FSlateWindowElementList* InOwner)
@@ -1312,41 +1362,35 @@ FSlateWindowElementList::FWindowElementGCObject::FWindowElementGCObject(FSlateWi
 {
 }
 
+void FSlateWindowElementList::FWindowElementGCObject::ClearOwner()
+{
+	Owner = nullptr;
+}
+
 void FSlateWindowElementList::FWindowElementGCObject::AddReferencedObjects(FReferenceCollector& Collector)
 {
-	if (GGameThreadId == FPlatformTLS::GetCurrentThreadId() && Owner->bReportReferences)
+	if (Owner && Owner->ShouldReportUObjectReferences())
 	{
-		AddReferencedObjectsForLayer(Collector, Owner->RootDrawLayer);
-
-		for (auto& DrawLayerEntry : Owner->DrawLayers)
-		{
-			AddReferencedObjectsForLayer(Collector, *DrawLayerEntry.Value.Get());
-		}
-
-		Collector.AddReferencedObjects(Owner->ExtraResources);
+		Owner->AddReferencedObjects(Collector);
 	}
 }
 
-void FSlateWindowElementList::FWindowElementGCObject::AddReferencedObjectsForLayer(FReferenceCollector& Collector, FSlateDrawLayer& DrawLayer)
+void FSlateWindowElementList::AddReferencedObjects(FReferenceCollector& Collector)
 {
-	for (FSlateDrawElement& DrawElement : DrawLayer.DrawElements)
+	Collector.AddReferencedObjects(ResourcesToReport);
+}
+
+int32 FSlateWindowElementList::GetElementCount() const
+{
+	int32 ElementTotal = RootDrawLayer.GetElementCount();
+
+	for (auto& DrawLayerEntry : DrawLayers)
 	{
-		if (const FSlateBrush* BrushResource = DrawElement.GetDataPayload().BrushResource)
+		if (FSlateDrawLayer* DrawLayer = DrawLayerEntry.Value.Get())
 		{
-			if (UObject* ResourceObject = BrushResource->GetResourceObject())
-			{
-				Collector.AddReferencedObject(ResourceObject);
-			}
+			ElementTotal += DrawLayer->GetElementCount();
 		}
 	}
 
-	for (FSlateDrawBox& BoxElement : DrawLayer.BoxElements)
-	{
-		BoxElement.AddReferencedObjects(Collector);
-	}
-
-	for (FSlateDrawBox& BorderElement : DrawLayer.BorderElements)
-	{
-		BorderElement.AddReferencedObjects(Collector);
-	}
+	return ElementTotal;
 }
diff --git a/Engine/Source/Runtime/SlateCore/Private/Rendering/ElementBatcher.cpp b/Engine/Source/Runtime/SlateCore/Private/Rendering/ElementBatcher.cpp
index 7ae48e0f984b..1014d7c734d8 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Rendering/ElementBatcher.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Rendering/ElementBatcher.cpp
@@ -10,7 +10,6 @@
 #include "HAL/IConsoleManager.h"
 
 DECLARE_CYCLE_STAT(TEXT("Find Batch For Element Time"), STAT_SlateFindBatchForElement, STATGROUP_SlateVerbose);
-DECLARE_DWORD_COUNTER_STAT(TEXT("Num Elements (Prebatch)"), STAT_SlateNumPrebatchElements, STATGROUP_Slate);
 
 DECLARE_CYCLE_STAT(TEXT("Add Elements Time"), STAT_SlateAddElements, STATGROUP_Slate);
 
@@ -18,14 +17,23 @@ SLATE_DECLARE_CYCLE_COUNTER(GSlateAddElements, "Add Elements");
 SLATE_DECLARE_CYCLE_COUNTER(GSlateFindBatchTime, "FindElementForBatch");
 SLATE_DECLARE_CYCLE_COUNTER(GSlateFillBatchBuffers, "FillBatchBuffers");
 
-DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Box)"), STAT_SlateNumBoxElements, STATGROUP_Slate);
-DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Text)"), STAT_SlateNumTextElements, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements"), STAT_SlateElements, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Box)"), STAT_SlateElements_Box, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Border)"), STAT_SlateElements_Border, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Text)"), STAT_SlateElements_Text, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (ShapedText)"), STAT_SlateElements_ShapedText, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Line)"), STAT_SlateElements_Line, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Cached Buffer)"), STAT_SlateElements_CachedBuffer, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Elements (Other)"), STAT_SlateElements_Other, STATGROUP_Slate);
+
+int32 GSlateFeathering = 0;
+static FAutoConsoleVariableRef CVarSlateFeathering(TEXT("Slate.Feathering"), GSlateFeathering, TEXT("Provides a means of doing Anti-Aliasing around the edges by feathering boxes."), ECVF_Default);
 
 FSlateElementBatcher::FSlateElementBatcher( TSharedRef<FSlateRenderingPolicy> InRenderingPolicy )
 	: BatchData( nullptr )
 	, DrawLayer( nullptr )
 	, RenderingPolicy( &InRenderingPolicy.Get() )
-	, NumDrawnBatchesStat(0)
+	, ElmementStat_Other(0)
 	, NumPostProcessPasses(0)
 	, PixelCenterOffset( InRenderingPolicy->GetPixelCenterOffset() )
 	, bSRGBVertexColor( !InRenderingPolicy->IsVertexColorInLinearSpace() )
@@ -44,7 +52,13 @@ void FSlateElementBatcher::AddElements(FSlateWindowElementList& WindowElementLis
 
 	SCOPE_CYCLE_COUNTER(STAT_SlateAddElements);
 
-	NumDrawnBatchesStat = NumDrawnBoxesStat = NumDrawnTextsStat = 0;
+	ElmementStat_Other = 0;
+	ElmementStat_Boxes = 0;
+	ElmementStat_Borders = 0;
+	ElmementStat_Text = 0;
+	ElmementStat_ShapedText = 0;
+	ElmementStat_Line = 0;
+	ElmementStat_CachedBuffer = 0;
 
 	BatchData = &WindowElementList.GetBatchData();
 	DrawLayer = &WindowElementList.GetRootDrawLayer();
@@ -69,9 +83,23 @@ void FSlateElementBatcher::AddElements(FSlateWindowElementList& WindowElementLis
 	DrawLayer = nullptr;
 	ClippingStates = nullptr;
 
-	SET_DWORD_STAT(STAT_SlateNumPrebatchElements, NumDrawnBatchesStat);
-	SET_DWORD_STAT(STAT_SlateNumBoxElements, NumDrawnBoxesStat);
-	SET_DWORD_STAT(STAT_SlateNumTextElements, NumDrawnTextsStat);
+	const int32 ElmementStat_All =
+		ElmementStat_Boxes +
+		ElmementStat_Borders +
+		ElmementStat_Text +
+		ElmementStat_ShapedText +
+		ElmementStat_Line +
+		ElmementStat_CachedBuffer +
+		ElmementStat_Other;
+
+	INC_DWORD_STAT_BY(STAT_SlateElements, ElmementStat_All);
+	INC_DWORD_STAT_BY(STAT_SlateElements_Box, ElmementStat_Boxes);
+	INC_DWORD_STAT_BY(STAT_SlateElements_Border, ElmementStat_Borders);
+	INC_DWORD_STAT_BY(STAT_SlateElements_Text, ElmementStat_Text);
+	INC_DWORD_STAT_BY(STAT_SlateElements_ShapedText, ElmementStat_ShapedText);
+	INC_DWORD_STAT_BY(STAT_SlateElements_Line, ElmementStat_Line);
+	INC_DWORD_STAT_BY(STAT_SlateElements_CachedBuffer, ElmementStat_CachedBuffer);
+	INC_DWORD_STAT_BY(STAT_SlateElements_Other, ElmementStat_Other);
 }
 
 void FSlateElementBatcher::AddElementsInternal(const TArray<FSlateDrawElement>& DrawElements, const FVector2D& ViewportSize)
@@ -83,17 +111,16 @@ void FSlateElementBatcher::AddElementsInternal(const TArray<FSlateDrawElement>&
 	BatchTextElements();
 	BatchShapedTextElements();
 	BatchLineElements();
+	BatchCachedBuffers();
 
 	for ( int32 DrawElementIndex = 0; DrawElementIndex < DrawElements.Num(); ++DrawElementIndex )
 	{
 		const FSlateDrawElement& DrawElement = DrawElements[DrawElementIndex];
 
-		++NumDrawnBatchesStat;
+		ElmementStat_Other++;
 
 		const bool EnablePixelSnapping = !EnumHasAllFlags(DrawElement.GetDrawEffects(), ESlateDrawEffect::NoPixelSnapping);
 
-		// time just the adding of the element. The clipping stuff will be counted in exclusive time for the non-typed timer.
-		//SLATE_CYCLE_COUNTER_SCOPE_CUSTOM_DETAILED(SLATE_STATS_DETAIL_LEVEL_MED, GSlateAddElements, ElementFNames[DrawElement.GetElementType()]);
 		// Determine what type of element to add
 		switch ( DrawElement.GetElementType() )
 		{
@@ -116,9 +143,6 @@ void FSlateElementBatcher::AddElementsInternal(const TArray<FSlateDrawElement>&
 		case FSlateDrawElement::ET_CustomVerts:
 			AddCustomVerts(DrawElement);
 			break;
-		case FSlateDrawElement::ET_CachedBuffer:
-			AddCachedBuffer(DrawElement);
-			break;
 		case FSlateDrawElement::ET_Layer:
 			AddLayer(DrawElement);
 			break;
@@ -137,6 +161,7 @@ FName Elements_Borders(TEXT("Borders"));
 FName Elements_Text(TEXT("Text"));
 FName Elements_ShapedText(TEXT("ShapedText"));
 FName Elements_Lines(TEXT("Lines"));
+FName Elements_CachedBuffer(TEXT("CachedBuffer"));
 
 void FSlateElementBatcher::BatchBoxElements()
 {
@@ -146,6 +171,8 @@ void FSlateElementBatcher::BatchBoxElements()
 		const FSlateDrawBox& Element = Elements[ElementIndex];
 		Element.IsPixelSnapped() ? AddBoxElement<ESlateVertexRounding::Enabled>(Element) : AddBoxElement<ESlateVertexRounding::Disabled>(Element);
 	}
+
+	ElmementStat_Boxes += Elements.Num();
 }
 
 void FSlateElementBatcher::BatchBorderElements()
@@ -158,6 +185,8 @@ void FSlateElementBatcher::BatchBorderElements()
 		const FSlateDrawBox& Element = Elements[ElementIndex];
 		Element.IsPixelSnapped() ? AddBorderElement<ESlateVertexRounding::Enabled>(Element) : AddBorderElement<ESlateVertexRounding::Disabled>(Element);
 	}
+
+	ElmementStat_Borders += Elements.Num();
 }
 
 void FSlateElementBatcher::BatchTextElements()
@@ -170,6 +199,8 @@ void FSlateElementBatcher::BatchTextElements()
 		const FSlateDrawText& Element = Elements[ElementIndex];
 		Element.IsPixelSnapped() ? AddTextElement<ESlateVertexRounding::Enabled>(Element) : AddTextElement<ESlateVertexRounding::Disabled>(Element);
 	}
+
+	ElmementStat_Text += Elements.Num();
 }
 
 void FSlateElementBatcher::BatchShapedTextElements()
@@ -182,6 +213,8 @@ void FSlateElementBatcher::BatchShapedTextElements()
 		const FSlateDrawShapedText& Element = Elements[ElementIndex];
 		Element.IsPixelSnapped() ? AddShapedTextElement<ESlateVertexRounding::Enabled>(Element) : AddShapedTextElement<ESlateVertexRounding::Disabled>(Element);
 	}
+
+	ElmementStat_ShapedText += Elements.Num();
 }
 
 void FSlateElementBatcher::BatchLineElements()
@@ -194,6 +227,22 @@ void FSlateElementBatcher::BatchLineElements()
 		const FSlateDrawLines& Element = Elements[ElementIndex];
 		Element.IsPixelSnapped() ? AddLineElement<ESlateVertexRounding::Enabled>(Element) : AddLineElement<ESlateVertexRounding::Disabled>(Element);
 	}
+
+	ElmementStat_Line += Elements.Num();
+}
+
+void FSlateElementBatcher::BatchCachedBuffers()
+{
+	SLATE_CYCLE_COUNTER_SCOPE_CUSTOM_DETAILED(SLATE_STATS_DETAIL_LEVEL_MED, GSlateAddElements, Elements_CachedBuffer);
+
+	const TArray<FSlateDrawCachedBuffer>& Elements = DrawLayer->CachedElementBuffers;
+	for (int32 ElementIndex = 0; ElementIndex < Elements.Num(); ++ElementIndex)
+	{
+		const FSlateDrawCachedBuffer& Element = Elements[ElementIndex];
+		AddCachedBuffer(Element);
+	}
+
+	ElmementStat_CachedBuffer += Elements.Num();
 }
 
 template<ESlateVertexRounding Rounding>
@@ -235,9 +284,6 @@ void FSlateElementBatcher::AddQuadElement( const FSlateDrawElement& DrawElement,
 	BatchIndices.Add( IndexStart + 3 );
 }
 
-int32 SlateFeathering = 0;
-static FAutoConsoleVariableRef CVarSlateFeathering(TEXT("Slate.Feathering"), SlateFeathering, TEXT(""), ECVF_Default);
-
 FORCEINLINE void IndexQuad(FSlateIndexArray& BatchIndices, int32 TopLeft, int32 TopRight, int32 BottomRight, int32 BottomLeft)
 {
 	BatchIndices.Add(TopLeft);
@@ -252,13 +298,6 @@ FORCEINLINE void IndexQuad(FSlateIndexArray& BatchIndices, int32 TopLeft, int32
 template<ESlateVertexRounding Rounding>
 void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 {
-	NumDrawnBoxesStat++;
-
-	check(DrawElement.GetBrushResource());
-	const FSlateBrush* BrushResource = DrawElement.GetBrushResource();
-
-	ensureMsgf(BrushResource->DrawAs != ESlateBrushDrawType::NoDrawType, TEXT("This should have been filtered out earlier in the Make... call."));
-
 	const FColor Tint = PackVertexColor(DrawElement.GetTint());
 	const FSlateRenderTransform& ElementRenderTransform = DrawElement.GetRenderTransform();
 	const FSlateRenderTransform RenderTransform = DrawElement.GetRenderTransform();// GetBoxRenderTransform(DrawElement);
@@ -296,7 +335,7 @@ void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 		// Texel offset
 		HalfTexel = FVector2D( PixelCenterOffset/TextureWidth, PixelCenterOffset/TextureHeight );
 
-		FBox2D BrushUV = BrushResource->GetUVRegion();
+		const FBox2D& BrushUV = DrawElement.GetBrushUVRegion();
 		//In case brush has valid UV region - use it instead of proxy UV
 		if (BrushUV.bIsValid)
 		{
@@ -319,11 +358,11 @@ void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 	}
 
 
-	const ESlateBrushTileType::Type TilingRule = BrushResource->Tiling;
+	const ESlateBrushTileType::Type TilingRule = DrawElement.GetBrushTiling();
 	const bool bTileHorizontal = (TilingRule == ESlateBrushTileType::Both || TilingRule == ESlateBrushTileType::Horizontal);
 	const bool bTileVertical = (TilingRule == ESlateBrushTileType::Both || TilingRule == ESlateBrushTileType::Vertical);
 
-	const ESlateBrushMirrorType::Type MirroringRule = BrushResource->Mirroring;
+	const ESlateBrushMirrorType::Type MirroringRule = DrawElement.GetBrushMirroring();
 	const bool bMirrorHorizontal = (MirroringRule == ESlateBrushMirrorType::Both || MirroringRule == ESlateBrushMirrorType::Horizontal);
 	const bool bMirrorVertical = (MirroringRule == ESlateBrushMirrorType::Both || MirroringRule == ESlateBrushMirrorType::Vertical);
 
@@ -345,14 +384,14 @@ void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 	// The offset into the index buffer where this elements indices start
 	uint32 IndexOffsetStart = BatchIndices.Num();
 
-	const FMargin& Margin = BrushResource->Margin;
+	const FMargin& Margin = DrawElement.GetBrushMargin();
 
 	const FVector2D TopRight = FVector2D(BotRight.X, TopLeft.Y);
 	const FVector2D BotLeft = FVector2D(TopLeft.X, BotRight.Y);
 
 	const FColor FeatherColor(0, 0, 0, 0);
 
-	if ( BrushResource->DrawAs != ESlateBrushDrawType::Image &&
+	if ( DrawElement.GetBrushDrawType() != ESlateBrushDrawType::Image &&
 		( Margin.Left != 0.0f || Margin.Top != 0.0f || Margin.Right != 0.0f || Margin.Bottom != 0.0f ) )
 	{
 		// Create 9 quads for the box element based on the following diagram
@@ -512,7 +551,7 @@ void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 		BatchIndices.Add( IndexStart + 14 );
 		BatchIndices.Add( IndexStart + 15 );
 
-		if ( SlateFeathering && Rounding == ESlateVertexRounding::Disabled )
+		if ( GSlateFeathering && Rounding == ESlateVertexRounding::Disabled )
 		{
 			const int32 FeatherStart = BatchVertices.Num();
 
@@ -609,7 +648,7 @@ void FSlateElementBatcher::AddBoxElement(const FSlateDrawBox& DrawElement)
 		int32 BottomLeftIndex = IndexStart + 2;
 		int32 BottomRightIndex = IndexStart + 3;
 
-		if ( SlateFeathering && Rounding == ESlateVertexRounding::Disabled )
+		if ( GSlateFeathering && Rounding == ESlateVertexRounding::Disabled )
 		{
 			const int32 FeatherStart = BatchVertices.Num();
 
@@ -668,20 +707,8 @@ void FSlateElementBatcher::AddTextElement(const FSlateDrawText& DrawElement)
 
 	const FFontOutlineSettings& OutlineSettings = DrawElement.GetFontInfo().OutlineSettings;
 
-	// Don't do anything if there the font would be completely transparent 
-	if ((BaseTint.A == 0 && OutlineSettings.OutlineSize == 0) || (BaseTint.A == 0 && OutlineSettings.OutlineColor.A == 0))
-	{
-		return;
-	}
-
 	int32 Len = DrawElement.GetTextLength();
-	// Nothing to do if no text
-	if (Len == 0)
-	{
-		return;
-	}
-
-	NumDrawnTextsStat++;
+	ensure(Len > 0);
 
 	ESlateDrawEffect InDrawEffects = DrawElement.GetDrawEffects();
 	uint32 Layer = DrawElement.GetLayer();
@@ -895,27 +922,16 @@ void FSlateElementBatcher::AddShapedTextElement( const FSlateDrawShapedText& Dra
 	const FFontOutlineSettings& OutlineSettings = ShapedGlyphSequence->GetFontOutlineSettings();
 
 	const TArray<FShapedGlyphEntry>& GlyphsToRender = ShapedGlyphSequence->GetGlyphsToRender();
-	if (GlyphsToRender.Num() == 0)
-	{
-		return;
-	}
+	ensure(GlyphsToRender.Num() > 0);
 
 	FColor BaseTint = PackVertexColor(DrawElement.GetTint());
 
-	// Don't do anything if there the font would be completely transparent 
-	if ((BaseTint.A == 0 && OutlineSettings.OutlineSize == 0) || (BaseTint.A == 0 && DrawElement.GetOutlineTint().A == 0))
-	{
-		return;
-	}
-
 	FSlateFontCache& FontCache = *RenderingPolicy->GetFontCache();
 	FSlateShaderResourceManager& ResourceManager = *RenderingPolicy->GetResourceManager();
 
 	const int16 TextBaseline = ShapedGlyphSequence->GetTextBaseline();
 	const uint16 MaxHeight = ShapedGlyphSequence->GetMaxTextHeight();
 
-	NumDrawnTextsStat++;
-
 	ESlateDrawEffect InDrawEffects = DrawElement.GetDrawEffects();
 	uint32 Layer = DrawElement.GetLayer();
 
@@ -1910,8 +1926,6 @@ void FSlateElementBatcher::AddBorderElement( const FSlateDrawBox& DrawElement )
 
 	const float DrawScale = DrawElement.GetScale();
 
-	check(DrawElement.GetBrushResource() );
-
 	uint32 TextureWidth = 1;
 	uint32 TextureHeight = 1;
 
@@ -1931,7 +1945,7 @@ void FSlateElementBatcher::AddBorderElement( const FSlateDrawBox& DrawElement )
 	const FVector2D StartUV = HalfTexel;
 	const FVector2D EndUV = FVector2D( 1.0f, 1.0f ) + HalfTexel;
 
-	const FMargin& Margin = DrawElement.GetBrushResource()->Margin;
+	const FMargin& Margin = DrawElement.GetBrushMargin();
 
 	// Do pixel snapping
 	FVector2D TopLeft(0,0);
@@ -2177,15 +2191,12 @@ void FSlateElementBatcher::AddCustomVerts(const FSlateDrawElement& DrawElement)
 	}
 }
 
-void FSlateElementBatcher::AddCachedBuffer(const FSlateDrawElement& DrawElement)
+void FSlateElementBatcher::AddCachedBuffer(const FSlateDrawCachedBuffer& DrawElement)
 {
 	FElementBatchMap& LayerToElementBatches = DrawLayer->GetElementBatchMap();
 
-	const FSlateDataPayload& InPayload = DrawElement.GetDataPayload();
 	uint32 Layer = DrawElement.GetLayer();
 
-	if ( InPayload.CachedRenderData )
-	{
 		// See if the layer already exists.
 		TUniqueObj<FElementBatchArray>* ElementBatches = LayerToElementBatches.Find(Layer);
 		if ( !ElementBatches )
@@ -2196,9 +2207,8 @@ void FSlateElementBatcher::AddCachedBuffer(const FSlateDrawElement& DrawElement)
 		check(ElementBatches);
 
 		// Custom elements are not batched together
-		TSharedPtr< FSlateRenderDataHandle, ESPMode::ThreadSafe > RenderData = InPayload.CachedRenderData->AsShared();
-		(*ElementBatches)->Add(FSlateElementBatch(RenderData, InPayload.CachedRenderDataOffset, DrawElement.GetClippingIndex(), *ClippingStates));
-	}
+	TSharedPtr< FSlateRenderDataHandle, ESPMode::ThreadSafe > RenderData = DrawElement.GetRenderDataHandle()->AsShared();
+	(*ElementBatches)->Add(FSlateElementBatch(RenderData, DrawElement.GetRenderOffset(), DrawElement.GetClippingIndex(), *ClippingStates));
 }
 
 void FSlateElementBatcher::AddLayer(const FSlateDrawElement& DrawElement)
diff --git a/Engine/Source/Runtime/SlateCore/Private/Rendering/ShaderResourceManager.cpp b/Engine/Source/Runtime/SlateCore/Private/Rendering/ShaderResourceManager.cpp
index c0d86f336933..4eee4a1f7643 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Rendering/ShaderResourceManager.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Rendering/ShaderResourceManager.cpp
@@ -2,8 +2,12 @@
 
 #include "Rendering/ShaderResourceManager.h"
 
+DECLARE_CYCLE_STAT(TEXT("GetResourceHandle Time"), STAT_SlateGetResourceHandle, STATGROUP_Slate);
+
 FSlateResourceHandle FSlateShaderResourceManager::GetResourceHandle( const FSlateBrush& InBrush )
 {
+	SCOPE_CYCLE_COUNTER(STAT_SlateGetResourceHandle);
+
 	FSlateShaderResourceProxy* Proxy = GetShaderResource( InBrush );
 
 	FSlateResourceHandle NewHandle;
diff --git a/Engine/Source/Runtime/SlateCore/Private/SlateCoreClasses.cpp b/Engine/Source/Runtime/SlateCore/Private/SlateCoreClasses.cpp
index 25ec165ae092..49fe319f1acb 100644
--- a/Engine/Source/Runtime/SlateCore/Private/SlateCoreClasses.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/SlateCoreClasses.cpp
@@ -1,6 +1,7 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "CoreMinimal.h"
+#include "SlateGlobals.h"
 #include "Types/SlateConstants.h"
 #include "Styling/SlateWidgetStyle.h"
 
@@ -10,5 +11,26 @@ TAutoConsoleVariable<float> GlobalScrollAmount(
 	32.0f,
 	TEXT("How much to scroll for each click of the mouse wheel (in Slate Screen Units)."));
 
-FSlateWidgetStyle::FSlateWidgetStyle( )
+
+
+int32 GSlateLayoutCaching = 0;
+
+FAutoConsoleVariableRef CVarSlateLayoutCaching(
+	TEXT("Slate.EnableLayoutCaching"),
+	GSlateLayoutCaching,
+	TEXT("Whether or not dynamic prepass and layout caching is enabled")
+);
+
+
+// Enable fast widget paths outside the editor by default.  Only reason we don't enable them everywhere
+// is that the editor is more complex than a game, and there are likely a larger swath of edge cases.
+int32 GSlateFastWidgetPath = 0;
+
+FAutoConsoleVariableRef CVarSlateFastWidgetPath(
+	TEXT("Slate.EnableFastWidgetPath"),
+	GSlateFastWidgetPath,
+	TEXT("Whether or not we enable fast widget pathing.  This mode relies on parent pointers to work correctly.")
+);
+
+FSlateWidgetStyle::FSlateWidgetStyle()
 { }
diff --git a/Engine/Source/Runtime/SlateCore/Private/SlotBase.cpp b/Engine/Source/Runtime/SlateCore/Private/SlotBase.cpp
index f27f31fe4cd7..ae67586fe1e3 100644
--- a/Engine/Source/Runtime/SlateCore/Private/SlotBase.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/SlotBase.cpp
@@ -23,9 +23,11 @@ const TSharedPtr<SWidget> FSlotBase::DetachWidget()
 	if (Widget != SNullWidget::NullWidget)
 	{
 #if SLATE_PARENT_POINTERS
-		Widget->AssignParentWidget(TSharedPtr<SWidget>());
+		Widget->ConditionallyDetatchParentWidget(RawParentPtr);
 #endif
 
+		// Invalidate Prepass?
+
 		const TSharedRef<SWidget> MyExWidget = Widget;
 		Widget = SNullWidget::NullWidget;	
 		return MyExWidget;
@@ -37,20 +39,32 @@ const TSharedPtr<SWidget> FSlotBase::DetachWidget()
 	}
 }
 
-void FSlotBase::AfterContentOrOwnerChanges()
+void FSlotBase::DetatchParentFromContent()
 {
-#if SLATE_DYNAMIC_PREPASS
-	if (RawParentPtr)
+#if SLATE_PARENT_POINTERS
+	if (Widget != SNullWidget::NullWidget)
+	{
+		Widget->ConditionallyDetatchParentWidget(RawParentPtr);
+	}
+#endif
+}
+
+void FSlotBase::AfterContentOrOwnerAssigned()
+{
+	if (GSlateLayoutCaching && RawParentPtr)
 	{
 		RawParentPtr->InvalidatePrepass();
 	}
-#endif
 
 #if SLATE_PARENT_POINTERS
 	if (RawParentPtr)
 	{
 		if (Widget != SNullWidget::NullWidget)
 		{
+			// TODO NDarnell I want to enable this, but too many places in the codebase
+			// have made assumptions about being able to freely reparent widgets, while they're
+			// still connected to an existing hierarchy.
+			//ensure(!Widget->IsParentValid());
 			Widget->AssignParentWidget(RawParentPtr->AsShared());
 		}
 	}
@@ -59,10 +73,5 @@ void FSlotBase::AfterContentOrOwnerChanges()
 
 FSlotBase::~FSlotBase()
 {
-#if SLATE_PARENT_POINTERS
-	if (Widget != SNullWidget::NullWidget)
-	{
-		Widget->AssignParentWidget(TSharedPtr<SWidget>());
-	}
-#endif
+	DetatchParentFromContent();
 }
diff --git a/Engine/Source/Runtime/SlateCore/Private/Styling/SlateBrush.cpp b/Engine/Source/Runtime/SlateCore/Private/Styling/SlateBrush.cpp
index 413a595365e4..3e88b3d0d2fe 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Styling/SlateBrush.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Styling/SlateBrush.cpp
@@ -1,14 +1,15 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Styling/SlateBrush.h"
-
-
-/* FSlateBrush constructors
- *****************************************************************************/
+#include "SlateGlobals.h"
+#include "Application/SlateApplicationBase.h"
 
 FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InResourceName, const FMargin& InMargin, ESlateBrushTileType::Type InTiling, ESlateBrushImageType::Type InImageType, const FVector2D& InImageSize, const FLinearColor& InTint, UObject* InObjectResource, bool bInDynamicallyLoaded )
 	: ImageSize( InImageSize )
 	, Margin( InMargin )
+#if WITH_EDITORONLY_DATA
+	, Tint_DEPRECATED(FLinearColor::White)
+#endif
 	, TintColor( InTint )
 	, ResourceObject( InObjectResource )
 	, ResourceName( InResourceName )
@@ -28,10 +29,12 @@ FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InRe
 	//}
 }
 
-
 FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InResourceName, const FMargin& InMargin, ESlateBrushTileType::Type InTiling, ESlateBrushImageType::Type InImageType, const FVector2D& InImageSize, const TSharedRef< FLinearColor >& InTint, UObject* InObjectResource, bool bInDynamicallyLoaded )
 	: ImageSize( InImageSize )
 	, Margin( InMargin )
+#if WITH_EDITORONLY_DATA
+	, Tint_DEPRECATED(FLinearColor::White)
+#endif
 	, TintColor( InTint )
 	, ResourceObject( InObjectResource )
 	, ResourceName( InResourceName )
@@ -51,10 +54,12 @@ FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InRe
 	//}
 }
 
-
 FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InResourceName, const FMargin& InMargin, ESlateBrushTileType::Type InTiling, ESlateBrushImageType::Type InImageType, const FVector2D& InImageSize, const FSlateColor& InTint, UObject* InObjectResource, bool bInDynamicallyLoaded )
 	: ImageSize(InImageSize)
 	, Margin(InMargin)
+#if WITH_EDITORONLY_DATA
+	, Tint_DEPRECATED(FLinearColor::White)
+#endif
 	, TintColor(InTint)
 	, ResourceObject(InObjectResource)
 	, ResourceName(InResourceName)
@@ -74,17 +79,28 @@ FSlateBrush::FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InRe
 	//}
 }
 
-
-void FSlateBrush::AddReferencedObjects( FReferenceCollector& Collector )
-{
-	Collector.AddReferencedObject(ResourceObject);
-}
-
-
-/* FSlateBrush static functions
- *****************************************************************************/
-
-const FString FSlateBrush::UTextureIdentifier( )
+const FString FSlateBrush::UTextureIdentifier()
 {
 	return FString(TEXT("texture:/"));
 }
+
+void FSlateBrush::UpdateRenderingResource() const
+{
+	if (DrawAs != ESlateBrushDrawType::NoDrawType && (ResourceName != NAME_None || ResourceObject != nullptr))
+	{
+		ResourceHandle = FSlateApplicationBase::Get().GetRenderer()->GetResourceHandle(*this);
+	}
+}
+
+bool FSlateBrush::CanRenderResourceObject(UObject* InResourceObject) const
+{
+	if (InResourceObject)
+	{
+		if (FSlateApplicationBase::IsInitialized())
+		{
+			return FSlateApplicationBase::Get().GetRenderer()->CanRenderResource(*InResourceObject);
+		}
+	}
+
+	return true;
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/SlateCore/Private/Widgets/SBoxPanel.cpp b/Engine/Source/Runtime/SlateCore/Private/Widgets/SBoxPanel.cpp
index 716f937f93fd..5848d8e08f8e 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Widgets/SBoxPanel.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Widgets/SBoxPanel.cpp
@@ -45,6 +45,7 @@ static void ArrangeChildrenAlong( const TPanelChildren<SBoxPanel::FSlot>& Childr
 		float StretchCoefficientTotal = 0;
 		float FixedTotal = 0;
 
+		bool bAnyChildVisible = false;
 		// Compute the sum of stretch coefficients (SizeRule_Stretch) and space required by fixed-size widgets
 		// (SizeRule_Auto).
 		for( int32 ChildIndex=0; ChildIndex < Children.Num(); ++ChildIndex )
@@ -53,6 +54,7 @@ static void ArrangeChildrenAlong( const TPanelChildren<SBoxPanel::FSlot>& Childr
 
 			if ( CurChild.GetWidget()->GetVisibility() != EVisibility::Collapsed )
 			{
+				bAnyChildVisible = true;
 				// All widgets contribute their margin to the fixed space requirement
 				FixedTotal += CurChild.SlotPadding.Get().GetTotalSpaceAlong<Orientation>();
 
@@ -77,6 +79,11 @@ static void ArrangeChildrenAlong( const TPanelChildren<SBoxPanel::FSlot>& Childr
 			}
 		}
 
+		if (!bAnyChildVisible)
+		{
+			return;
+		}
+
 		// The space available for SizeRule_Stretch widgets is any space that wasn't taken up by fixed-sized widgets.
 		const float NonFixedSpace = FMath::Max( 0.0f, (Orientation == Orient_Vertical)
 			? AllottedGeometry.GetLocalSize().Y - FixedTotal
diff --git a/Engine/Source/Runtime/SlateCore/Private/Widgets/SWidget.cpp b/Engine/Source/Runtime/SlateCore/Private/Widgets/SWidget.cpp
index 7fa39fba9480..8fd4a811ce81 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Widgets/SWidget.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Widgets/SWidget.cpp
@@ -16,11 +16,14 @@
 #include "Stats/SlateStats.h"
 #include "Input/HittestGrid.h"
 
-DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Total Created Widgets"), STAT_SlateTotalWidgets, STATGROUP_Slate);
-DECLARE_DWORD_COUNTER_STAT(TEXT("Num Painted Widgets"), STAT_SlateNumPaintedWidgets, STATGROUP_Slate);
-DECLARE_DWORD_COUNTER_STAT(TEXT("Num Ticked Widgets"), STAT_SlateNumTickedWidgets, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("Widgets Created (Per Frame)"), STAT_SlateTotalWidgetsPerFrame, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("SWidget::Paint (Count)"), STAT_SlateNumPaintedWidgets, STATGROUP_Slate);
+DECLARE_DWORD_COUNTER_STAT(TEXT("SWidget::Tick (Count)"), STAT_SlateNumTickedWidgets, STATGROUP_Slate);
 DECLARE_CYCLE_STAT(TEXT("TickWidgets"), STAT_SlateTickWidgets, STATGROUP_Slate);
 
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Total Widgets"), STAT_SlateTotalWidgets, STATGROUP_SlateMemory);
+DECLARE_MEMORY_STAT(TEXT("SWidget Total Allocated Size"), STAT_SlateSWidgetAllocSize, STATGROUP_SlateMemory);
+
 SLATE_DECLARE_CYCLE_COUNTER(GSlateWidgetTick, "SWidget Tick");
 SLATE_DECLARE_CYCLE_COUNTER(GSlateOnPaint, "OnPaint");
 SLATE_DECLARE_CYCLE_COUNTER(GSlatePrepass, "SlatePrepass");
@@ -30,6 +33,13 @@ SLATE_DECLARE_CYCLE_COUNTER(GSlateGetVisibility, "GetVisibility");
 int32 GTickInvisibleWidgets = 0;
 static FAutoConsoleVariableRef CVarTickInvisibleWidgets(TEXT("Slate.TickInvisibleWidgets"), GTickInvisibleWidgets, TEXT("Controls whether invisible widgets are ticked."), ECVF_Default);
 
+#if SLATE_CULL_WIDGETS
+
+float GCullingSlackFillPercent = 0.25f;
+static FAutoConsoleVariableRef CVarCullingSlackFillPercent(TEXT("Slate.CullingSlackFillPercent"), GCullingSlackFillPercent, TEXT("Scales the culling rect by the amount to provide extra slack/wiggle room for widgets that have a true bounds larger than the root child widget in a container."), ECVF_Default);
+
+#endif
+
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 
 int32 GShowClipping = 0;
@@ -102,10 +112,6 @@ SWidget::SWidget()
 	, bCanSupportFocus(true)
 	, bCanHaveChildren(true)
 	, bClippingProxy(false)
-#if SLATE_DYNAMIC_PREPASS
-	, bNeedsPrepass(true)
-	, bUpdatingDesiredSize(false)
-#endif
 	, bIsWindow(false)
 	, bToolTipForceFieldEnabled(false)
 	, bForceVolatile(false)
@@ -113,12 +119,12 @@ SWidget::SWidget()
 	, bInheritedVolatility(false)
 	, Clipping(EWidgetClipping::Inherit)
 	, CullingBoundsExtension()
-#if SLATE_DYNAMIC_PREPASS
-	, PrepassLayoutScaleMultiplier(1.0f)
 	, DesiredSize()
-#else
-	, DesiredSize(FVector2D::ZeroVector)
-#endif
+	, PrepassLayoutScaleMultiplier(1.0f)
+	, bNeedsPrepass(true)
+	, bNeedsDesiredSize(true)
+	, bNeedsVolatileDesiredSize(true)
+	, bUpdatingDesiredSize(false)
 	, EnabledState(true)
 	, Visibility(EVisibility::Visible)
 	, RenderOpacity(1.0f)
@@ -131,6 +137,7 @@ SWidget::SWidget()
 	if (GIsRunning)
 	{
 		INC_DWORD_STAT(STAT_SlateTotalWidgets);
+		INC_DWORD_STAT(STAT_SlateTotalWidgetsPerFrame);
 	}
 }
 
@@ -146,6 +153,7 @@ SWidget::~SWidget()
 	}
 
 	DEC_DWORD_STAT(STAT_SlateTotalWidgets);
+	DEC_MEMORY_STAT_BY(STAT_SlateSWidgetAllocSize, AllocSize);
 }
 
 void SWidget::Construct(
@@ -458,6 +466,7 @@ void SWidget::Tick( const FGeometry& AllottedGeometry, const double InCurrentTim
 {
 }
 
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
 void SWidget::TickWidgetsRecursively( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
 {
 	INC_DWORD_STAT(STAT_SlateNumTickedWidgets);
@@ -482,26 +491,34 @@ void SWidget::TickWidgetsRecursively( const FGeometry& AllottedGeometry, const d
 		SomeChild.Widget->TickWidgetsRecursively( SomeChild.Geometry, InCurrentTime, InDeltaTime );
 	}
 }
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
 
 void SWidget::SlatePrepass()
 {
-#if !SLATE_DYNAMIC_PREPASS
-	SlatePrepass( FSlateApplicationBase::Get().GetApplicationScale() );
-#endif
+	if (!GSlateLayoutCaching)
+	{
+		SlatePrepass(FSlateApplicationBase::Get().GetApplicationScale());
+	}
 }
 
 void SWidget::SlatePrepass(float InLayoutScaleMultiplier)
 {
-#if SLATE_DYNAMIC_PREPASS
-	if (!bNeedsPrepass && PrepassLayoutScaleMultiplier == InLayoutScaleMultiplier)
-	{
-		return;
-	}
-
-	PrepassLayoutScaleMultiplier = InLayoutScaleMultiplier;
-	bNeedsPrepass = false;
+#if SLATE_VERBOSE_NAMED_EVENTS
+	SCOPED_NAMED_EVENT(SWidget_Prepass, FColor::Silver);
 #endif
 
+	if(GSlateLayoutCaching)
+	{
+		if (!bNeedsPrepass && PrepassLayoutScaleMultiplier == InLayoutScaleMultiplier)
+		{
+			return;
+		}
+
+		PrepassLayoutScaleMultiplier = InLayoutScaleMultiplier;
+		bNeedsPrepass = false;
+	}
+
 	if ( bCanHaveChildren )
 	{
 		// Cache child desired sizes first. This widget's desired size is
@@ -512,9 +529,7 @@ void SWidget::SlatePrepass(float InLayoutScaleMultiplier)
 		{
 			const TSharedRef<SWidget>& Child = MyChildren->GetChildAt(ChildIndex);
 
-#if !SLATE_DYNAMIC_PREPASS
-			if ( Child->Visibility.Get() != EVisibility::Collapsed )
-#endif
+			if ( GSlateLayoutCaching || Child->Visibility.Get() != EVisibility::Collapsed )
 			{
 				const float ChildLayoutScaleMultiplier = GetRelativeLayoutScale(MyChildren->GetSlotAt(ChildIndex), InLayoutScaleMultiplier);
 				// Recur: Descend down the widget tree.
@@ -523,40 +538,58 @@ void SWidget::SlatePrepass(float InLayoutScaleMultiplier)
 		}
 	}
 
-#if !SLATE_DYNAMIC_PREPASS
-	// Cache this widget's desired size.
-	CacheDesiredSize(InLayoutScaleMultiplier);
-#endif
+	if(!GSlateLayoutCaching)
+	{
+		// Cache this widget's desired size.
+		CacheDesiredSize(InLayoutScaleMultiplier);
+	}
 }
 
-#if SLATE_DYNAMIC_PREPASS
 void SWidget::InvalidatePrepass()
 {
-	bNeedsPrepass = true;
-	LayoutChanged();
-}
+	SCOPED_NAMED_EVENT(SWidget_InvalidatePrepass, FColor::Orange);
 
-#if SLATE_LAYOUT_CHANGE
+	bNeedsPrepass = true;
+	LayoutChanged(EInvalidateWidget::LayoutAndVolatility);
+}
 
 FVector2D SWidget::GetDesiredSize() const
 {
-	if (IsVolatile())
+	if(GSlateLayoutCaching)
 	{
-		if (!VolatileDesiredSize.IsSet() && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
+		if (IsVolatile())
 		{
-			bUpdatingDesiredSize = true;
+			if (bNeedsVolatileDesiredSize && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
+			{
+				bUpdatingDesiredSize = true;
 
-			// Cache this widget's desired size.
-			const_cast<SWidget*>(this)->CacheDesiredSize(PrepassLayoutScaleMultiplier);
+				// Cache this widget's desired size.
+				const_cast<SWidget*>(this)->CacheDesiredSize(PrepassLayoutScaleMultiplier);
 
-			bUpdatingDesiredSize = false;
+				bUpdatingDesiredSize = false;
+			}
+
+			return VolatileDesiredSize.GetValue();
 		}
+		else
+		{
+			if (bNeedsDesiredSize && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
+			{
+				bUpdatingDesiredSize = true;
 
-		return VolatileDesiredSize.GetValue();
+				// Cache this widget's desired size.
+				const_cast<SWidget*>(this)->CacheDesiredSize(PrepassLayoutScaleMultiplier);
+
+				bUpdatingDesiredSize = false;
+			}
+
+			return DesiredSize.GetValue();
+		}
 	}
 	else
 	{
-		if (!DesiredSize.IsSet() && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
+		return DesiredSize.Get(FVector2D::ZeroVector);
+		/*if (!DesiredSize.IsSet() && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
 		{
 			bUpdatingDesiredSize = true;
 
@@ -566,65 +599,81 @@ FVector2D SWidget::GetDesiredSize() const
 			bUpdatingDesiredSize = false;
 		}
 
-		return DesiredSize.GetValue();
+		return DesiredSize.GetValue();*/
 	}
 }
 
-#else
-
-FVector2D SWidget::GetDesiredSize() const
-{
-	if (!DesiredSize.IsSet() && ensureMsgf(!bUpdatingDesiredSize, TEXT("The layout is cyclically dependent.  A child widget can not ask the desired size of a parent while the parent is asking the desired size of its children.")))
-	{
-		bUpdatingDesiredSize = true;
-
-		// Cache this widget's desired size.
-		const_cast<SWidget*>(this)->CacheDesiredSize(PrepassLayoutScaleMultiplier);
-
-		bUpdatingDesiredSize = false;
-	}
-
-	return DesiredSize.GetValue();
-}
-
-#endif
-
-#endif
-
 #if SLATE_PARENT_POINTERS
 
 void SWidget::AssignParentWidget(TSharedPtr<SWidget> InParent)
 {
+#if !UE_BUILD_SHIPPING
+	ensureMsgf(InParent != SNullWidget::NullWidget, TEXT("The Null Widget can't be anyone's parent."));
+	ensureMsgf(this != &SNullWidget::NullWidget.Get(), TEXT("The Null Widget can't have a parent, because a single instance is shared everywhere."));
+	ensureMsgf(InParent.IsValid(), TEXT("Are you trying to detatch the parent of a widget?  Use ConditionallyDetatchParentWidget()."));
+#endif
+
 	ParentWidgetPtr = InParent;
+	if (InParent.IsValid())
+	{
+		InParent->Invalidate(EInvalidateWidget::Layout);
+	}
+}
+
+bool SWidget::ConditionallyDetatchParentWidget(SWidget* InExpectedParent)
+{
+#if !UE_BUILD_SHIPPING
+	ensureMsgf(this != &SNullWidget::NullWidget.Get(), TEXT("The Null Widget can't have a parent, because a single instance is shared everywhere."));
+#endif
+
+	TSharedPtr<SWidget> Parent = ParentWidgetPtr.Pin();
+	if (Parent.Get() == InExpectedParent)
+	{
+		ParentWidgetPtr.Reset();
+
+		if (Parent.IsValid())
+		{
+			Parent->Invalidate(EInvalidateWidget::Layout);
+		}
+
+		return true;
+	}
+
+	return false;
 }
 
 #endif
 
-#if SLATE_LAYOUT_CHANGE
-void SWidget::LayoutChanged()
+void SWidget::LayoutChanged(EInvalidateWidget InvalidateReason)
 {
-	DesiredSize.Reset();
+	if(EnumHasAnyFlags(InvalidateReason, EInvalidateWidget::Layout))
+	{
+		bNeedsDesiredSize = true;
+		bNeedsVolatileDesiredSize = true;
 
 #if SLATE_PARENT_POINTERS
-	TSharedPtr<SWidget> ParentWidget = ParentWidgetPtr.Pin();
-	if (ParentWidget.IsValid())
-	{
-		ParentWidget->ChildLayoutChanged();
-	}
+		TSharedPtr<SWidget> ParentWidget = ParentWidgetPtr.Pin();
+		if (ParentWidget.IsValid())
+		{
+			ParentWidget->ChildLayoutChanged(InvalidateReason);
+		}
 #endif
+	}
 }
 
-void SWidget::ChildLayoutChanged()
+void SWidget::ChildLayoutChanged(EInvalidateWidget InvalidateReason)
 {
-	if (DesiredSize.IsSet())
+	if (!bNeedsDesiredSize || EnumHasAllFlags(InvalidateReason, EInvalidateWidget::Visibility) )
 	{
-		LayoutChanged();
+		LayoutChanged(InvalidateReason);
 	}
 }
-#endif
 
 void SWidget::CacheDesiredSize(float InLayoutScaleMultiplier)
 {
+#if SLATE_VERBOSE_NAMED_EVENTS
+	SCOPED_NAMED_EVENT(SWidget_CacheDesiredSize, FColor::Red);
+#endif
 	// Cache this widget's desired size.
 	Advanced_SetDesiredSize(ComputeDesiredSize(InLayoutScaleMultiplier));
 }
@@ -700,9 +749,8 @@ bool SWidget::HasMouseCaptureByUser(int32 UserIndex, TOptional<int32> PointerInd
 	return FSlateApplicationBase::Get().DoesWidgetHaveMouseCaptureByUser(SharedThis(this), UserIndex, PointerIndex);
 }
 
-void SWidget::OnMouseCaptureLost()
+void SWidget::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
-	
 }
 
 bool SWidget::FindChildGeometries( const FGeometry& MyGeometry, const TSet< TSharedRef<SWidget> >& WidgetsToFind, TMap<TSharedRef<SWidget>, FArrangedWidget>& OutResult ) const
@@ -861,15 +909,34 @@ bool SWidget::IsDirectlyHovered() const
 	return FSlateApplicationBase::Get().IsWidgetDirectlyHovered(SharedThis(this));
 }
 
+void SWidget::Invalidate(EInvalidateWidget InvalidateReason)
+{
+	SCOPED_NAMED_EVENT_TEXT("SWidget::Invalidate", FColor::Orange);
+
+	const bool bWasVolatile = IsVolatileIndirectly() || IsVolatile();
+	const bool bVolatilityChanged = EnumHasAnyFlags(InvalidateReason, EInvalidateWidget::Volatility) ? Advanced_InvalidateVolatility() : false;
+
+	if (bWasVolatile == false || bVolatilityChanged)
+	{
+		Advanced_ForceInvalidateLayout();
+	}
+
+	LayoutChanged(InvalidateReason);
+
+}
+
 void SWidget::SetCursor( const TAttribute< TOptional<EMouseCursor::Type> >& InCursor )
 {
 	Cursor = InCursor;
 }
 
-void SWidget::SetDebugInfo( const ANSICHAR* InType, const ANSICHAR* InFile, int32 OnLine )
+void SWidget::SetDebugInfo( const ANSICHAR* InType, const ANSICHAR* InFile, int32 OnLine, size_t InAllocSize )
 {
 	TypeOfWidget = InType;
 
+	STAT(AllocSize = InAllocSize);
+	INC_MEMORY_STAT_BY(STAT_SlateSWidgetAllocSize, AllocSize);
+
 #if !UE_BUILD_SHIPPING
 	CreatedInLocation = FName( InFile );
 	CreatedInLocation.SetNumber(OnLine);
@@ -936,14 +1003,14 @@ int32 SWidget::Paint(const FPaintArgs& Args, const FGeometry& AllottedGeometry,
 #endif
 
 	INC_DWORD_STAT(STAT_SlateNumPaintedWidgets);
-	SLATE_CYCLE_COUNTER_SCOPE_CUSTOM_DETAILED(SLATE_STATS_DETAIL_LEVEL_MED, GSlateOnPaint, GetType());
 
 	// TODO, Maybe we should just make Paint non-const and keep OnPaint const.
 	SWidget* MutableThis = const_cast<SWidget*>(this);
 
-#if SLATE_DYNAMIC_PREPASS
-	MutableThis->SlatePrepass(AllottedGeometry.Scale);
-#endif
+	if (GSlateLayoutCaching)
+	{
+		MutableThis->SlatePrepass(AllottedGeometry.Scale);
+	}
 
 	// Save the current layout cache we're associated with (if any)
 	LayoutCache = Args.GetLayoutCache();
@@ -982,6 +1049,8 @@ int32 SWidget::Paint(const FPaintArgs& Args, const FGeometry& AllottedGeometry,
 	CachedGeometry = AllottedGeometry;
 	CachedGeometry.AppendTransform(FSlateLayoutTransform(Args.GetWindowToDesktopTransform()));
 
+	MutableThis->ExecuteActiveTimers(Args.GetCurrentTime(), Args.GetDeltaTime());
+
 	if ( bCanTick )
 	{
 		INC_DWORD_STAT(STAT_SlateNumTickedWidgets);
@@ -1077,7 +1146,7 @@ int32 SWidget::Paint(const FPaintArgs& Args, const FGeometry& AllottedGeometry,
 
 	if ( OutDrawElements.ShouldResolveDeferred() )
 	{
-		NewLayerID = OutDrawElements.PaintDeferred(NewLayerID, MyCullingRect);
+	NewLayerID = OutDrawElements.PaintDeferred(NewLayerID, MyCullingRect);
 	}
 
 	return NewLayerID;
@@ -1110,7 +1179,7 @@ void SWidget::ExecuteActiveTimers(double CurrentTime, float DeltaTime)
 	// loop over the registered tick handles and execute them, removing them if necessary.
 	for (int32 i = 0; i < ActiveTimers.Num();)
 	{
-		EActiveTimerReturnType Result = ActiveTimers[i]->ExecuteIfPending( CurrentTime, DeltaTime );
+		EActiveTimerReturnType Result = ActiveTimers[i]->ExecuteIfPending(CurrentTime, DeltaTime);
 		if (Result == EActiveTimerReturnType::Continue)
 		{
 			++i;
@@ -1160,26 +1229,45 @@ void SWidget::SetOnMouseLeave(FSimpleNoReplyPointerEventHandler EventHandler)
 	MouseLeaveHandler = EventHandler;
 }
 
+#if SLATE_CULL_WIDGETS
+
 bool SWidget::IsChildWidgetCulled(const FSlateRect& MyCullingRect, const FArrangedWidget& ArrangedChild) const
 {
+	// We add some slack fill to the culling rect to deal with the common occurrence
+	// of widgets being larger than their root level widget is.  Happens when nested child widgets
+	// inflate their rendering bounds to render beyond their parent (the child of this panel doing the culling), 
+	// or using render transforms.  In either case, it introduces offsets to a bounding volume we don't 
+	// actually know about or track in slate, so we have have two choices.
+	//    1) Don't cull, set SLATE_CULL_WIDGETS to 0.
+	//    2) Cull with a slack fill amount users can adjust.
+	const FSlateRect CullingRectWithSlack = MyCullingRect.ScaleBy(GCullingSlackFillPercent);
+
 	// 1) We check if the rendered bounding box overlaps with the culling rect.  Which is so that
 	//    a render transformed element is never culled if it would have been visible to the user.
+	if (FSlateRect::DoRectanglesIntersect(CullingRectWithSlack, ArrangedChild.Geometry.GetRenderBoundingRect()))
+	{
+		return false;
+	}
+
 	// 2) We also check the layout bounding box to see if it overlaps with the culling rect.  The
 	//    reason for this is a bit more nuanced.  Suppose you dock a widget on the screen on the side
 	//    and you want have it animate in and out of the screen.  Even though the layout transform 
 	//    keeps the widget on the screen, the render transform alone would have caused it to be culled
 	//    and therefore not ticked or painted.  The best way around this for now seems to be to simply
 	//    check both rects to see if either one is overlapping the culling volume.
-	const bool bAreOverlapping =
-		FSlateRect::DoRectanglesIntersect(MyCullingRect, ArrangedChild.Geometry.GetRenderBoundingRect()) ||
-		FSlateRect::DoRectanglesIntersect(MyCullingRect, ArrangedChild.Geometry.GetLayoutBoundingRect());
-
-	// There's a special condition if the widget's clipping state is set does not intersect with clipping bounds, they in effect
-	// will be setting a new culling rect, so let them pass being culling from this step.
-	if (bAreOverlapping == false && ArrangedChild.Widget->GetClipping() == EWidgetClipping::ClipToBoundsWithoutIntersecting)
+	if (FSlateRect::DoRectanglesIntersect(CullingRectWithSlack, ArrangedChild.Geometry.GetLayoutBoundingRect()))
 	{
 		return false;
 	}
 
-	return !bAreOverlapping;
-}
\ No newline at end of file
+	// There's a special condition if the widget's clipping state is set does not intersect with clipping bounds, they in effect
+	// will be setting a new culling rect, so let them pass being culling from this step.
+	if (ArrangedChild.Widget->GetClipping() == EWidgetClipping::ClipToBoundsWithoutIntersecting)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+#endif
\ No newline at end of file
diff --git a/Engine/Source/Runtime/SlateCore/Private/Widgets/SWindow.cpp b/Engine/Source/Runtime/SlateCore/Private/Widgets/SWindow.cpp
index c89ed57e22c0..3be603616cfc 100644
--- a/Engine/Source/Runtime/SlateCore/Private/Widgets/SWindow.cpp
+++ b/Engine/Source/Runtime/SlateCore/Private/Widgets/SWindow.cpp
@@ -53,6 +53,8 @@ public:
 
 	void Construct( const FArguments& InArgs, const TSharedRef<SWindow>& InWindow )
 	{
+		bCanTick = false;
+
 		OwnerWindow = InWindow;
 
 		const int32 NumSlots = InArgs.Slots.Num();
@@ -247,6 +249,7 @@ void SWindow::Construct(const FArguments& InArgs)
 		.SetMinHeight(InArgs._MinHeight)
 		.SetMaxWidth(InArgs._MaxWidth)
 		.SetMaxHeight(InArgs._MaxHeight);
+	bCanTick = false;
 
 	// calculate window size from client size
 	bCreateTitleBar = InArgs._CreateTitleBar && !bIsPopupWindow && Type != EWindowType::CursorDecorator && !bHasOSWindowBorder;
@@ -704,6 +707,7 @@ void SWindow::Tick( const FGeometry& AllottedGeometry, const double InCurrentTim
 
 			this->SetOpacity( Morpher.TargetOpacity );
 			Morpher.bIsActive = false;
+			bCanTick = false;
 		}
 	}
 }
@@ -999,7 +1003,7 @@ void SWindow::StartMorph()
 	Morpher.StartingMorphShape = FSlateRect( this->ScreenPosition.X, this->ScreenPosition.Y, this->ScreenPosition.X + this->Size.X, this->ScreenPosition.Y + this->Size.Y );
 	Morpher.bIsActive = true;
 	Morpher.Sequence.JumpToStart();
-
+	bCanTick = true;
 	if ( !ActiveTimerHandle.IsValid() )
 	{
 		ActiveTimerHandle = RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SWindow::TriggerPlayMorphSequence ) );
@@ -1135,6 +1139,7 @@ void SWindow::SetContent( TSharedRef<SWidget> InContent )
 	{
 		this->ContentSlot->operator[]( InContent );
 	}
+	Invalidate(EInvalidateWidget::LayoutAndVolatility);
 }
 
 TSharedRef<const SWidget> SWindow::GetContent() const
diff --git a/Engine/Source/Runtime/SlateCore/Public/Application/SlateApplicationBase.h b/Engine/Source/Runtime/SlateCore/Public/Application/SlateApplicationBase.h
index 507278a15384..cbedf411c5cd 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Application/SlateApplicationBase.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Application/SlateApplicationBase.h
@@ -8,6 +8,9 @@
 #include "Layout/Visibility.h"
 #include "Layout/SlateRect.h"
 #include "Rendering/SlateRenderer.h"
+#include "Misc/CoreDelegates.h"
+
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnDebugSafeZoneChanged, const FMargin&);
 
 class FActiveTimerHandle;
 class FSlateApplicationBase;
@@ -196,6 +199,8 @@ public:
 	 */
 	void GetDisplayMetrics(FDisplayMetrics& OutDisplayMetrics) const;
 
+	void GetSafeZoneSize(FMargin& SafeZone, const FVector2D& OverrideSize);
+
 	/**
 	 * Get the highest level of window transparency support currently enabled by this application
 	 *
@@ -223,6 +228,8 @@ protected:
 	 */
 	virtual TSharedPtr< SWidget > GetMouseCaptorImpl() const = 0;
 
+	void GetSafeZoneRatio(FMargin& SafeZoneRatio);
+
 public:
 	/**
 	 * Gets whether or not a widget has captured the mouse.
@@ -486,6 +493,13 @@ protected:
 	/** Given a window, locate a widget under the cursor in it; returns an invalid path if cursor is not over this window. */
 	virtual FWidgetPath LocateWidgetInWindow(FVector2D ScreenspaceMouseCoordinate, const TSharedRef<SWindow>& Window, bool bIgnoreEnabledStatus) const = 0;
 
+#if WITH_EDITOR
+	void UpdateCustomSafeZone(const FMargin& NewSafeZoneRatio) 
+	{
+		CustomSafeZoneRatio = NewSafeZoneRatio; 
+	}
+#endif
+
 protected:
 
 	// Holds the Slate renderer used to render this application.
@@ -520,6 +534,13 @@ public:
 	{
 		return PlatformApplication;
 	}
+#if WITH_EDITOR
+	void ResetCustomSafeZone() { CustomSafeZoneRatio = FMargin(); }
+#endif
+
+#if WITH_EDITORONLY_DATA
+	FOnDebugSafeZoneChanged OnDebugSafeZoneChanged;
+#endif
 
 protected:
 	/** multicast delegate to broadcast when a global invalidate is requested */
@@ -530,5 +551,9 @@ protected:
 
 	// Gets set when Slate goes to sleep and cleared when active.
 	bool bIsSlateAsleep;
+
+#if WITH_EDITORONLY_DATA
+	FMargin CustomSafeZoneRatio;
+#endif
 };
 
diff --git a/Engine/Source/Runtime/SlateCore/Public/Brushes/SlateDynamicImageBrush.h b/Engine/Source/Runtime/SlateCore/Public/Brushes/SlateDynamicImageBrush.h
index 213aed1a2d22..53c46d857cc4 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Brushes/SlateDynamicImageBrush.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Brushes/SlateDynamicImageBrush.h
@@ -99,7 +99,7 @@ struct SLATECORE_API FSlateDynamicImageBrush
 	 */
 	void ReleaseResource();
 
-		/** Destructor. */
+	/** Destructor. */
 	virtual ~FSlateDynamicImageBrush();
 
 private:
@@ -107,15 +107,18 @@ private:
 
 	void InitFromTextureObject(FName InTextureName)
 	{
+		UObject* Object = GetResourceObject();
 		// if we have a texture, make a unique name
-		if (ResourceObject != nullptr)
+		if (Object != nullptr)
 		{
 			// @todo Slate - Hack:  This is to address an issue where the brush created and a GC occurs before the brush resource object becomes referenced
 			// by the Slate resource manager. Don't add objects that are already in root set (and mark them as such) to avoid incorrect removing objects
 			// from root set in destructor.
-			if (!ResourceObject->IsRooted())
+			if (!Object->IsRooted())
 			{
-				ResourceObject->AddToRoot();
+				ensureMsgf(false, TEXT("This hack usually results in a crash during loading screens in slate.  Please change any code that arrives here to not use FSlateDynamicImageBrush.  In the case of loading screens, you can use FDeferredCleanupSlateBrush.  Which correctly accounts for both GC lifetime, and the lifetime of the object through the slate rendering pipeline which may be several frames after you stop using it."));
+
+				Object->AddToRoot();
 				bRemoveResourceFromRootSet = true;
 			}
 
diff --git a/Engine/Source/Runtime/SlateCore/Public/Fonts/FontCache.h b/Engine/Source/Runtime/SlateCore/Public/Fonts/FontCache.h
index 4ef94423207b..0b80fe1e4dde 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Fonts/FontCache.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Fonts/FontCache.h
@@ -339,6 +339,8 @@ public:
 	 */
 	FShapedGlyphSequencePtr GetSubSequence(const int32 InStartIndex, const int32 InEndIndex) const;
 
+	void AddReferencedObjects(FReferenceCollector& Collector);
+
 private:
 	/** Non-copyable */
 	FShapedGlyphSequence(const FShapedGlyphSequence&);
diff --git a/Engine/Source/Runtime/SlateCore/Public/Fonts/SlateFontInfo.h b/Engine/Source/Runtime/SlateCore/Public/Fonts/SlateFontInfo.h
index f25b4c90d980..7f19fda49821 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Fonts/SlateFontInfo.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Fonts/SlateFontInfo.h
@@ -39,6 +39,13 @@ struct SLATECORE_API FFontOutlineSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=OutlineSettings, meta=(ClampMin="0"))
 	int32 OutlineSize;
 
+	/** 
+	 * If checked, the outline will be completely translucent where the filled area will be.  This allows for a separate fill alpha value
+	 * The trade off when enabling this is slightly worse quality for completely opaque fills where the inner outline border meets the fill area
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=OutlineSettings)
+	bool bSeparateFillAlpha;
+
 	/** Optional material to apply to the outline */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SlateStyleRules, meta=(AllowedClasses="MaterialInterface"))
 	UObject* OutlineMaterial;
@@ -47,25 +54,18 @@ struct SLATECORE_API FFontOutlineSettings
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=OutlineSettings)
 	FLinearColor OutlineColor;
 
-	/** 
-	 * If checked, the outline will be completely translucent where the filled area will be.  This allows for a separate fill alpha value
-	 * The trade off when enabling this is slightly worse quality for completely opaque fills where the inner outline border meets the fill area
-	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=OutlineSettings)
-	bool bSeparateFillAlpha;
-
 	FFontOutlineSettings()
 		: OutlineSize(0)
+		, bSeparateFillAlpha(false)
 		, OutlineMaterial(nullptr)
 		, OutlineColor(FLinearColor::Black)
-		, bSeparateFillAlpha(false)
 	{}
 
 	FFontOutlineSettings(int32 InOutlineSize, FLinearColor InColor = FLinearColor::Black)
 		: OutlineSize(InOutlineSize)
+		, bSeparateFillAlpha(false)
 		, OutlineMaterial(nullptr)
 		, OutlineColor(InColor)
-		, bSeparateFillAlpha(false)
 	{}
 
 	bool operator==(const FFontOutlineSettings& Other) const
@@ -82,6 +82,11 @@ struct SLATECORE_API FFontOutlineSettings
 		return Hash;
 	}
 
+	bool IsVisible() const
+	{
+		return OutlineSize > 0 && OutlineColor.A > 0;
+	}
+
 	static FFontOutlineSettings NoOutline;
 };
 
@@ -262,6 +267,8 @@ public:
 	void PostSerialize(const FArchive& Ar);
 #endif
 
+	void AddReferencedObjects(FReferenceCollector& Collector);
+
 private:
 
 	/**
diff --git a/Engine/Source/Runtime/SlateCore/Public/Input/Events.h b/Engine/Source/Runtime/SlateCore/Public/Input/Events.h
index a95af316e278..81933996d812 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Input/Events.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Input/Events.h
@@ -102,6 +102,33 @@ private:
 };
 
 
+USTRUCT(BlueprintType)
+struct FCaptureLostEvent
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	/**
+	* UStruct Constructor.  Not meant for normal usage.
+	*/
+	FCaptureLostEvent()
+		: UserIndex(0)
+		, PointerIndex(0)
+	{ }
+
+	FCaptureLostEvent(int32 InUserIndex, int32 InPointerIndex)
+		: UserIndex(InUserIndex)
+		, PointerIndex(InPointerIndex)
+	{ }
+
+	/** User that is losing capture */
+	int32 UserIndex;
+	
+	/** Pointer (Finger) that lost capture. */
+	int32 PointerIndex;
+};
+
+
 /**
  * Represents the current and last cursor position in a "virtual window" for events that are routed to widgets transformed in a 3D scene.
  */
@@ -617,6 +644,7 @@ public:
 		, EffectingButton()
 		, PointerIndex(0)
 		, TouchpadIndex(0)
+		, Force(1.0f)
 		, bIsTouchEvent(false)
 		, GestureType(EGestureEvent::None)
 		, WheelOrGestureDelta(0.0f, 0)
@@ -641,6 +669,7 @@ public:
 		, EffectingButton(InEffectingButton)
 		, PointerIndex(InPointerIndex)
 		, TouchpadIndex(0)
+		, Force(1.0f)
 		, bIsTouchEvent(false)
 		, GestureType(EGestureEvent::None)
 		, WheelOrGestureDelta(0.0f, InWheelDelta)
@@ -665,6 +694,7 @@ public:
 		, EffectingButton(InEffectingButton)
 		, PointerIndex(InPointerIndex)
 		, TouchpadIndex(0)
+		, Force(1.0f)
 		, bIsTouchEvent(false)
 		, GestureType(EGestureEvent::None)
 		, WheelOrGestureDelta(0.0f, InWheelDelta)
@@ -687,6 +717,7 @@ public:
 		, PressedButtons(InPressedButtons)
 		, PointerIndex(InPointerIndex)
 		, TouchpadIndex(0)
+		, Force(1.0f)
 		, bIsTouchEvent(false)
 		, GestureType(EGestureEvent::None)
 		, WheelOrGestureDelta(0.0f, 0.0f)
@@ -694,6 +725,7 @@ public:
 	{ }
 
 	/** A constructor for touch events */
+	DEPRECATED(4.20, "FPointerEvent constructor now takes a Force parameter")
 	FPointerEvent(
 		uint32 InUserIndex,
 		uint32 InPointerIndex,
@@ -703,6 +735,19 @@ public:
 		const FModifierKeysState& InModifierKeys = FModifierKeysState(),
 		uint32 InTouchpadIndex=0
 	)
+	: FPointerEvent(InUserIndex, InPointerIndex, InScreenSpacePosition, InLastScreenSpacePosition, 1.0f, bPressLeftMouseButton, InModifierKeys, InTouchpadIndex)
+	{ }
+
+	FPointerEvent(
+		uint32 InUserIndex,
+		uint32 InPointerIndex,
+		const FVector2D& InScreenSpacePosition,
+		const FVector2D& InLastScreenSpacePosition,
+		float InForce,
+		bool bPressLeftMouseButton,
+		const FModifierKeysState& InModifierKeys = FModifierKeysState(),
+		uint32 InTouchpadIndex=0
+		)
 	: FInputEvent(InModifierKeys, InUserIndex, false)
 		, ScreenSpacePosition(InScreenSpacePosition)
 		, LastScreenSpacePosition(InLastScreenSpacePosition)
@@ -711,6 +756,7 @@ public:
 		, EffectingButton(EKeys::LeftMouseButton)
 		, PointerIndex(InPointerIndex)
 		, TouchpadIndex(InTouchpadIndex)
+		, Force(InForce)
 		, bIsTouchEvent(true)
 		, GestureType(EGestureEvent::None)
 		, WheelOrGestureDelta(0.0f, 0.0f)
@@ -733,6 +779,7 @@ public:
 		, CursorDelta(LastScreenSpacePosition - ScreenSpacePosition)
 		, PressedButtons(InPressedButtons)
 		, PointerIndex(0)
+		, Force(1.0f)
 		, bIsTouchEvent(false)
 		, GestureType(InGestureType)
 		, WheelOrGestureDelta(InGestureDelta)
@@ -768,6 +815,9 @@ public:
 	/** @return The index of the touch pad that generated this event (for platforms with multiple touch pads per user) */
 	uint32 GetTouchpadIndex() const { return TouchpadIndex; }
 
+	/** @return the force of a touch (1.0f is mapped to an general touch force, < 1 is "light", > 1 is "heavy", and 10 is the max force possible) */
+	float GetTouchForce() const { return Force; }
+
 	/** @return Is this event a result from a touch (as opposed to a mouse) */
 	bool IsTouchEvent() const { return bIsTouchEvent; }
 
@@ -780,6 +830,7 @@ public:
 	/** @return Is the gesture delta inverted */
 	bool IsDirectionInvertedFromDevice() const { return bIsDirectionInvertedFromDevice; }
 
+
 	/** We override the assignment operator to allow generated code to compile with the const ref member. */
 	void operator=( const FPointerEvent& Other )
 	{
@@ -794,6 +845,7 @@ public:
 		UserIndex = Other.UserIndex;
 		PointerIndex = Other.PointerIndex;
 		TouchpadIndex = Other.TouchpadIndex;
+		Force = Other.Force;
 		bIsTouchEvent = Other.bIsTouchEvent;
 		GestureType = Other.GestureType;
 		WheelOrGestureDelta = Other.WheelOrGestureDelta;
@@ -823,6 +875,7 @@ private:
 	FKey EffectingButton;
 	uint32 PointerIndex;
 	uint32 TouchpadIndex;
+	float Force;
 	bool bIsTouchEvent;
 	EGestureEvent GestureType;
 	FVector2D WheelOrGestureDelta;
diff --git a/Engine/Source/Runtime/SlateCore/Public/Layout/ArrangedChildren.h b/Engine/Source/Runtime/SlateCore/Public/Layout/ArrangedChildren.h
index ad45640b4883..eb7cf7c00bbb 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Layout/ArrangedChildren.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Layout/ArrangedChildren.h
@@ -19,7 +19,7 @@ class SLATECORE_API FArrangedChildren
 	
 	public:
 
-	typedef TArray<FArrangedWidget, TInlineAllocator<16>> FArrangedWidgetArray;
+	typedef TArray<FArrangedWidget, TInlineAllocator<4>> FArrangedWidgetArray;
 
 	/**
 	 * Construct a new container for arranged children that only accepts children that match the VisibilityFilter.
diff --git a/Engine/Source/Runtime/SlateCore/Public/Layout/Children.h b/Engine/Source/Runtime/SlateCore/Public/Layout/Children.h
index 1709ed270e5b..077b7c1ddb61 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Layout/Children.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Layout/Children.h
@@ -132,9 +132,10 @@ public:
 	void AttachWidget(const TSharedPtr<SWidget>& InWidget)
 	{
 		WidgetPtr = InWidget;
-#if SLATE_DYNAMIC_PREPASS
-		if (Owner) { Owner->InvalidatePrepass(); }
-#endif
+		if (Owner) 
+		{ 
+			Owner->InvalidatePrepass();
+		}
 #if SLATE_PARENT_POINTERS
 		if (Owner)
 		{
@@ -269,7 +270,10 @@ public:
 			return INDEX_NONE;
 		}
 
-		Slot->AttachWidgetParent(Owner);
+		if (Owner)
+		{
+			Slot->AttachWidgetParent(Owner);
+		}
 
 		return TIndirectArray< SlotType >::Add(Slot);
 	}
@@ -293,9 +297,14 @@ public:
 
 	void Insert(SlotType* Slot, int32 Index)
 	{
-		if(!bEmptying)
+		if (!bEmptying)
 		{
-			Slot->AttachWidgetParent(Owner);
+			// Don't do parent manipulation if this panel has no owner.
+			if (Owner)
+			{
+				Slot->AttachWidgetParent(Owner);
+			}
+
 			TIndirectArray< SlotType >::Insert(Slot, Index);
 		}
 	}
@@ -328,8 +337,7 @@ public:
 	}
 
 	const SlotType& operator[](int32 Index) const { return TIndirectArray< SlotType >::operator[](Index); }
-
-	SlotType& operator[](int32 Index) { return TIndirectArray< SlotType >::operator[](Index ); }
+	SlotType& operator[](int32 Index) { return TIndirectArray< SlotType >::operator[](Index); }
 
 	template <class PREDICATE_CLASS>
 	void Sort( const PREDICATE_CLASS& Predicate )
@@ -388,9 +396,11 @@ public:
 
 	int32 Add( const TSharedRef<ChildType>& Child )
 	{
-#if SLATE_DYNAMIC_PREPASS
-		if (Owner && bChangesInvalidatePrepass) { Owner->InvalidatePrepass(); }
-#endif
+		if (Owner && bChangesInvalidatePrepass)
+		{ 
+			Owner->InvalidatePrepass(); 
+		}
+
 #if SLATE_PARENT_POINTERS
 		if (Owner)
 		{
@@ -411,7 +421,7 @@ public:
 			TSharedRef<SWidget> Child = GetChildAt(ChildIndex);
 			if (Child != SNullWidget::NullWidget)
 			{
-				Child->AssignParentWidget(TSharedPtr<SWidget>());
+				Child->ConditionallyDetatchParentWidget(Owner);
 			}
 		}
 #endif
@@ -421,9 +431,10 @@ public:
 
 	void Insert(const TSharedRef<ChildType>& Child, int32 Index)
 	{
-#if SLATE_DYNAMIC_PREPASS
-		if (Owner && bChangesInvalidatePrepass) { Owner->InvalidatePrepass(); }
-#endif
+		if (Owner && bChangesInvalidatePrepass) 
+		{ 
+			Owner->InvalidatePrepass();
+		}
 #if SLATE_PARENT_POINTERS
 		if (Owner)
 		{
@@ -441,7 +452,7 @@ public:
 #if SLATE_PARENT_POINTERS
 		if (Child != SNullWidget::NullWidget)
 		{
-			Child->AssignParentWidget(TSharedPtr<SWidget>());
+			Child->ConditionallyDetatchParentWidget(Owner);
 		}
 #endif
 		const int32 NumFoundAndRemoved = TArray< TSharedRef<ChildType> >::Remove( Child );
@@ -454,7 +465,7 @@ public:
 		TSharedRef<SWidget> Child = GetChildAt(Index);
 		if (Child != SNullWidget::NullWidget)
 		{
-			Child->AssignParentWidget(TSharedPtr<SWidget>());
+			Child->ConditionallyDetatchParentWidget(Owner);
 		}
 #endif
 
diff --git a/Engine/Source/Runtime/SlateCore/Public/Layout/Clipping.h b/Engine/Source/Runtime/SlateCore/Public/Layout/Clipping.h
index 6b868f32c1b5..15c6df80a921 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Layout/Clipping.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Layout/Clipping.h
@@ -188,8 +188,14 @@ public:
 	/** Is a point inside the clipping state? */
 	bool IsPointInside(const FVector2D& Point) const;
 
-	FORCEINLINE void SetStateIndex(int32 InStateIndex) { StateIndex = InStateIndex; }
-	FORCEINLINE int32 GetStateIndex() const { return StateIndex; }
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	/** Set the state index that this clipping state originated from.  We just do this for debugging purposes. */
+	FORCEINLINE void SetDebuggingStateIndex(int32 InStateIndex)
+	{
+		Debugging_StateIndex = InStateIndex;
+		Debugging_StateIndexFromFrame = GFrameNumber;
+	}
+#endif
 
 	FORCEINLINE bool GetAlwaysClip() const { return EnumHasAllFlags(Flags, EClippingFlags::AlwaysClip); }
 
@@ -213,23 +219,28 @@ public:
 			return ScissorRect->HasZeroArea();
 		}
 
+		// Assume that stenciled clipping state has some area, don't bother computing it.
 		return false;
 	}
 
 	bool operator==(const FSlateClippingState& Other) const
 	{
-		return StateIndex == Other.StateIndex &&
-			Flags == Other.Flags &&
+		return Flags == Other.Flags &&
 			ScissorRect == Other.ScissorRect &&
 			StencilQuads == Other.StencilQuads;
 	}
 
 private:
-	/** For a given frame, this is a unique index into a state array of clipping zones that have been registered for a window being drawn. */
-	int32 StateIndex;
+
 	/** The specialized flags needed for this clipping state. */
 	EClippingFlags Flags;
 
+#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
+	/** For a given frame, this is a unique index into a state array of clipping zones that have been registered for a window being drawn. */
+	int32 Debugging_StateIndex;
+	int32 Debugging_StateIndexFromFrame;
+#endif
+
 public:
 	/** If this is an axis aligned clipping state, this will be filled. */
 	TOptional<FSlateClippingZone> ScissorRect;
diff --git a/Engine/Source/Runtime/SlateCore/Public/Layout/Margin.h b/Engine/Source/Runtime/SlateCore/Public/Layout/Margin.h
index dd9e044aa7cc..afb612623986 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Layout/Margin.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Layout/Margin.h
@@ -61,6 +61,14 @@ public:
 		, Right(Horizontal)
 		, Bottom(Vertical)
 	{ }
+
+	/** Construct a Margin where Horizontal describes Left and Right spacing while Vertical describes Top and Bottom spacing */
+	FMargin(const FVector2D& InVector)
+		: Left(InVector.X)
+		, Top(InVector.Y)
+		, Right(InVector.X)
+		, Bottom(InVector.Y)
+	{ }
 	
 	/** Construct a Margin where the spacing on each side is individually specified. */
 	FMargin( float InLeft, float InTop, float InRight, float InBottom )
diff --git a/Engine/Source/Runtime/SlateCore/Public/Layout/SlateRect.h b/Engine/Source/Runtime/SlateCore/Public/Layout/SlateRect.h
index 321b57d8378d..76666968560b 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Layout/SlateRect.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Layout/SlateRect.h
@@ -3,9 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-
-struct FMargin;
-struct Rect;
+#include "Layout/Margin.h"
 
 /** 
  * A rectangle defined by upper-left and lower-right corners.
@@ -140,7 +138,10 @@ public:
 	 *
 	 * @return An inset rectangle.
 	 */
-	FSlateRect InsetBy( const struct FMargin& InsetAmount ) const;
+	FORCEINLINE FSlateRect InsetBy(const struct FMargin& InsetAmount) const
+	{
+		return FSlateRect(Left + InsetAmount.Left, Top + InsetAmount.Top, Right - InsetAmount.Right, Bottom - InsetAmount.Bottom);
+	}
 
 	/**
 	 * Return a rectangle that is extended on each side by the amount specified in each margin.
@@ -149,7 +150,10 @@ public:
 	 *
 	 * @return An extended rectangle.
 	 */
-	FSlateRect ExtendBy(const FMargin& ExtendAmount) const;
+	FORCEINLINE FSlateRect ExtendBy(const FMargin& ExtendAmount) const
+	{
+		return FSlateRect(Left - ExtendAmount.Left, Top - ExtendAmount.Top, Right + ExtendAmount.Right, Bottom + ExtendAmount.Bottom);
+	}
 
 	/**
 	 * Return a rectangle that is offset by the amount specified .
@@ -158,7 +162,23 @@ public:
 	 *
 	 * @return An offset rectangle.
 	 */
-	FSlateRect OffsetBy( const FVector2D& OffsetAmount ) const;
+	FORCEINLINE FSlateRect OffsetBy( const FVector2D& OffsetAmount ) const
+	{
+		return FSlateRect(GetTopLeft() + OffsetAmount, GetBottomRight() + OffsetAmount);
+	}
+
+	/**
+	 * Return a rectangle that is scaled by the amount specified.
+	 *
+	 * @param ScaleBy The amount to scale the geometry.
+	 *
+	 * @return An scaled rectangle.
+	 */
+	FORCEINLINE FSlateRect ScaleBy(float ScaleBy) const
+	{
+		const FVector2D Delta = GetSize() * 0.5f * ScaleBy;
+		return ExtendBy(FMargin(Delta));
+	}
 
 	/**
 	 * Returns the rect that encompasses both rectangles
@@ -167,7 +187,7 @@ public:
 	 *
 	 * @return	Rectangle that is big enough to fit both rectangles
 	 */
-	FSlateRect Expand( const FSlateRect& Other ) const
+	FORCEINLINE FSlateRect Expand( const FSlateRect& Other ) const
 	{
 		return FSlateRect( FMath::Min( Left, Other.Left ), FMath::Min( Top, Other.Top ), FMath::Max( Right, Other.Right ), FMath::Max( Bottom, Other.Bottom ) );
 	}
@@ -175,7 +195,7 @@ public:
 	/**
 	 * Rounds the Left, Top, Right and Bottom fields and returns a new FSlateRect with rounded components.
 	 */
-	FSlateRect Round() const
+	FORCEINLINE FSlateRect Round() const
 	{
 		return FSlateRect(
 			FMath::RoundToFloat(Left),
@@ -282,7 +302,7 @@ public:
 	}
 
 	/** Is rectangle B contained within rectangle A? */
-	static bool IsRectangleContained( const FSlateRect& A, const FSlateRect& B )
+	FORCEINLINE static bool IsRectangleContained( const FSlateRect& A, const FSlateRect& B )
 	{
 		return (A.Left <= B.Left) && (A.Right >= B.Right) && (A.Top <= B.Top) && (A.Bottom >= B.Bottom);
 	}
@@ -292,10 +312,7 @@ public:
 	*
 	* @return	A string of the rect coordinates 
 	*/
-	FString ToString() const
-	{
-		return FString::Printf(TEXT("Left=%3.3f Top=%3.3f Right=%3.3f Bottom=%3.3f"), Left, Top, Right, Bottom);
-	}
+	FString ToString() const;
 
 	/**
 	* Returns a string of containing the coordinates of the rect
@@ -304,16 +321,7 @@ public:
 	*
 	* @return	True if initialized successfully
 	*/
-	bool InitFromString(const FString& InSourceString)
-	{
-		// The initialization is only successful if the values can all be parsed from the string
-		const bool bSuccessful = FParse::Value(*InSourceString, TEXT("Left="), Left) && 
-								FParse::Value(*InSourceString, TEXT("Top="), Top) && 
-								FParse::Value(*InSourceString, TEXT("Right="), Right) && 
-								FParse::Value(*InSourceString, TEXT("Bottom="), Bottom);
-
-		return bSuccessful;
-	}
+	bool InitFromString(const FString& InSourceString);
 };
 
 /**
diff --git a/Engine/Source/Runtime/SlateCore/Public/Rendering/DrawElements.h b/Engine/Source/Runtime/SlateCore/Public/Rendering/DrawElements.h
index 37b7e6aee220..19225914d11e 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Rendering/DrawElements.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Rendering/DrawElements.h
@@ -9,6 +9,7 @@
 #include "Misc/MemStack.h"
 #include "Styling/WidgetStyle.h"
 #include "Fonts/SlateFontInfo.h"
+#include "Fonts/FontCache.h"
 #include "Layout/SlateRect.h"
 #include "Layout/Clipping.h"
 #include "Types/PaintArgs.h"
@@ -46,8 +47,6 @@ template <> struct TIsPODType<FSlateGradientStop> { enum { Value = true }; };
 
 class FSlateDrawLayerHandle;
 
-#define SLATE_EXCESSIVE_CULLING 0
-
 
 class FSlateDataPayload
 {
@@ -68,7 +67,6 @@ public:
 	FVector2D P3;
 
 	// Brush data
-	const FSlateBrush* BrushResource;
 	const FSlateShaderResourceProxy* ResourceProxy;
 	FSlateShaderResource* RenderTargetResource;
 
@@ -79,26 +77,18 @@ public:
 	TArray<FSlateGradientStop> GradientStops;
 	EOrientation GradientType;
 
-	// Line data - allocated with FSlateWindowElementList::Alloc
-	int32 NumPoints;
-	FVector2D* Points;
-	FLinearColor* PointColors;
-
 	// Viewport data
 	bool bAllowViewportScaling:1;
 	bool bViewportTextureAlphaOnly:1;
 	bool bRequiresVSync:1;
 	
-	// Whether or not to anti-alias lines
-	bool bAntialias:1;
-
 	// Misc data
 	ESlateBatchDrawFlag BatchFlags;
 
 	// Custom drawer data
 	TWeakPtr<ICustomSlateElement, ESPMode::ThreadSafe> CustomDrawer;
 
-	// Custom verts data
+	// Custom verts data, TODO FSlateWindowElementList::Alloc)?
 	TArray<FSlateVertex> CustomVertsData;
 	TArray<SlateIndex> CustomVertsIndexData;
 
@@ -107,10 +97,6 @@ public:
 	uint32 InstanceOffset;
 	uint32 NumInstances;
 
-	// Cached render data
-	class FSlateRenderDataHandle* CachedRenderData;
-	FVector2D CachedRenderDataOffset;
-
 	// Layer handle
 	FSlateDrawLayerHandle* LayerHandle;
 
@@ -123,12 +109,8 @@ public:
 
 	FSlateDataPayload()
 		: Tint(FLinearColor::White)
-		, BrushResource(nullptr)
 		, ResourceProxy(nullptr)
 		, RenderTargetResource(nullptr)
-		, NumPoints(0)
-		, Points(nullptr)
-		, PointColors(nullptr)
 		, bViewportTextureAlphaOnly(false)
 		, bRequiresVSync(false)
 		, BatchFlags(ESlateBatchDrawFlag::None)
@@ -151,7 +133,6 @@ public:
 		P1 = InP1;
 		P2 = InP2;
 		P3 = InP3;
-		BrushResource = nullptr;
 		Thickness = InThickness;
 	}
 	
@@ -163,7 +144,6 @@ public:
 		P1 = InStart + InStartDir / 3.0f;
 		P2 = InEnd - InEndDir / 3.0f;
 		P3 = InEnd;
-		BrushResource = nullptr;
 		Thickness = InThickness;
 	}
 
@@ -173,7 +153,6 @@ public:
 		P1 = InStart + InStartDir / 3.0f;
 		P2 = InEnd - InEndDir / 3.0f;
 		P3 = InEnd;
-		BrushResource = nullptr;
 		Thickness = InThickness;
 		GradientStops = InGradientStops;
 	}
@@ -202,13 +181,6 @@ public:
 		NumInstances = InNumInstances;
 	}
 
-	void SetCachedBufferPayloadProperties(FSlateRenderDataHandle* InRenderDataHandle, const FVector2D& Offset)
-	{
-		CachedRenderData = InRenderDataHandle;
-		CachedRenderDataOffset = Offset;
-		checkSlow(CachedRenderData);
-	}
-
 	void SetLayerPayloadProperties(FSlateDrawLayerHandle* InLayerHandle)
 	{
 		LayerHandle = InLayerHandle;
@@ -280,37 +252,34 @@ protected:
 class FSupportsBrushMixin
 {
 public:
-	FORCEINLINE void SetBrush(const FSlateBrush* InBrush, FSlateShaderResourceProxy* InResourceProxy)
+	void SetBrush(const FSlateBrush* InBrush)
 	{
-		BrushResource = InBrush;
-		ResourceProxy = InResourceProxy;
+		check(InBrush);
+		ensureMsgf(InBrush->GetDrawType() != ESlateBrushDrawType::NoDrawType, TEXT("This should have been filtered out earlier in the Make... call."));
+
+		// The slate brush ptr can't be trusted after batch elements.
+		SlateBrush = InBrush;
+		const FSlateResourceHandle& ResourceHandle = InBrush->GetRenderingResource();
+		ResourceProxy = ResourceHandle.GetResourceProxy();
 	}
 
-	FORCEINLINE void SetBrush(const FSlateBrush* InBrush, FSlateShaderResourceManager* InResourceManager)
-	{
-		BrushResource = InBrush;
-		ResourceProxy = InResourceManager->GetShaderResource(*InBrush);
-	}
-
-	FORCEINLINE const FSlateBrush* GetBrushResource() const { return BrushResource; }
+	FORCEINLINE const FMargin& GetBrushMargin() const { return SlateBrush->GetMargin(); }
+	FORCEINLINE const FBox2D& GetBrushUVRegion() const { return SlateBrush->GetUVRegion(); }
+	FORCEINLINE ESlateBrushTileType::Type GetBrushTiling() const { return SlateBrush->GetTiling(); }
+	FORCEINLINE ESlateBrushMirrorType::Type GetBrushMirroring() const { return SlateBrush->GetMirroring(); }
+	FORCEINLINE ESlateBrushDrawType::Type GetBrushDrawType() const { return SlateBrush->GetDrawType(); }
 	FORCEINLINE const FSlateShaderResourceProxy* GetResourceProxy() const { return ResourceProxy; }
 
 protected:
-	// Brush data
-	const FSlateBrush* BrushResource;
+	// The slate brush ptr can't be trusted after batch elements.
+	const FSlateBrush* SlateBrush;
+
+	// The resource proxy that we actually render with
 	const FSlateShaderResourceProxy* ResourceProxy;
 };
 
 class FSlateDrawBox : public FSlateDrawBase, public FSupportsTintMixin, public FSupportsBrushMixin
 {
-public:
-	FORCEINLINE void AddReferencedObjects(FReferenceCollector& Collector)
-	{
-		if(UObject* ResourceObject = BrushResource->GetResourceObject())
-		{
-			Collector.AddReferencedObject(ResourceObject);
-		}
-	}
 };
 
 template<> struct TIsPODType<FSlateDrawBox> { enum { Value = true }; };
@@ -324,6 +293,11 @@ public:
 	FORCEINLINE const TCHAR* GetText() const { return ImmutableText; }
 	FORCEINLINE int32 GetTextLength() const { return TextLength; }
 
+	FORCEINLINE void AddReferencedObjects(FReferenceCollector& Collector)
+	{
+		FontInfo.AddReferencedObjects(Collector);
+	}
+
 protected:
 	// The font to use when rendering
 	FSlateFontInfo FontInfo;
@@ -341,13 +315,18 @@ class FSlateDrawShapedText : public FSlateDrawBase, public FSupportsTintMixin
 public:
 	void SetShapedText(const FShapedGlyphSequencePtr& InShapedGlyphSequence, FLinearColor InOutlineTint)
 	{
-		OutlineTint = InOutlineTint;
 		ShapedGlyphSequence = InShapedGlyphSequence;
+		OutlineTint = InOutlineTint;
 	}
 
 	FORCEINLINE FShapedGlyphSequencePtr GetShapedGlyphSequence() const { return ShapedGlyphSequence; }
 	FORCEINLINE FLinearColor GetOutlineTint() const { return OutlineTint; }
 
+	FORCEINLINE void AddReferencedObjects(FReferenceCollector& Collector)
+	{
+		const_cast<FShapedGlyphSequence*>(ShapedGlyphSequence.Get())->AddReferencedObjects(Collector);
+	}
+
 protected:
 	// Shaped text data
 	FShapedGlyphSequencePtr ShapedGlyphSequence;
@@ -390,6 +369,34 @@ protected:
 
 template<> struct TIsPODType<FSlateDrawLines> { enum { Value = true }; };
 
+/**
+ * Used for Invalidation, these buffers represent a complete cached buffer of what we normally send to the GPU to be
+ * drawn for a series of widgets.  They're used to reduce draw overhead in situations where the UI is largely static.
+ */
+class FSlateDrawCachedBuffer : public FSlateDrawBase
+{
+public:
+
+	void SetCachedBuffer(FSlateRenderDataHandle* InRenderDataHandle, const FVector2D& Offset)
+	{
+		check(InRenderDataHandle);
+
+		CachedRenderData = InRenderDataHandle;
+		CachedRenderDataOffset = Offset;
+	}
+
+	FORCEINLINE class FSlateRenderDataHandle* GetRenderDataHandle() const { return CachedRenderData; }
+	FORCEINLINE FVector2D GetRenderOffset() const { return CachedRenderDataOffset; }
+
+protected:
+	// Cached render data
+	class FSlateRenderDataHandle* CachedRenderData;
+	FVector2D CachedRenderDataOffset;
+};
+
+template<> struct TIsPODType<FSlateDrawCachedBuffer> { enum { Value = true }; };
+
+
 
 /**
  * FSlateDrawElement is the building block for Slate's rendering interface.
@@ -406,11 +413,6 @@ public:
 		ET_Viewport,
 		ET_Custom,
 		ET_CustomVerts,
-		/**
-		 * Used for Invalidation, these buffers represent a complete cached buffer of what we normally send to the GPU to be
-		 * drawn for a series of widgets.  They're used to reduce draw overhead in situations where the UI is largely static.
-		 */
-		ET_CachedBuffer,
 		/**
 		 * These layers are different from "layerId", they're symbolic layers, used when building up cached geometry.  They allow
 		 * Slate to semantically differentiate between Layer A and Layer B, which may have completely different layerIds, which perhaps
@@ -492,6 +494,7 @@ public:
 		MakeBox(ElementList, InLayer, PaintGeometry, InBrush, InDrawEffects, InTint);
 	}
 
+	DEPRECATED(4.20, "Storing and passing in a FSlateResourceHandle to MakeBox is no longer necessary.")
 	SLATECORE_API static void MakeBox(
 		FSlateWindowElementList& ElementList,
 		uint32 InLayer, 
@@ -512,7 +515,7 @@ public:
 		ESlateDrawEffect InDrawEffects = ESlateDrawEffect::None, 
 		const FLinearColor& InTint = FLinearColor::White )
 	{
-		MakeBox(ElementList, InLayer, PaintGeometry, InBrush, InRenderingHandle, InDrawEffects, InTint);
+		MakeBox(ElementList, InLayer, PaintGeometry, InBrush, InDrawEffects, InTint);
 	}
 	
 	//DEPRECATED(4.17, "Use Render Transforms instead.")
@@ -545,7 +548,10 @@ public:
 	
 	SLATECORE_API static void MakeText( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FString& InText, const FSlateFontInfo& InFontInfo, ESlateDrawEffect InDrawEffects = ESlateDrawEffect::None, const FLinearColor& InTint = FLinearColor::White );
 
-	SLATECORE_API static void MakeText( FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FText& InText, const FSlateFontInfo& InFontInfo, ESlateDrawEffect InDrawEffects = ESlateDrawEffect::None, const FLinearColor& InTint = FLinearColor::White );
+	FORCEINLINE static void MakeText(FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FText& InText, const FSlateFontInfo& InFontInfo, ESlateDrawEffect InDrawEffects = ESlateDrawEffect::None, const FLinearColor& InTint = FLinearColor::White)
+	{
+		MakeText(ElementList, InLayer, PaintGeometry, InText.ToString(), InFontInfo, InDrawEffects, InTint);
+	}
 
 	DEPRECATED(4.17, "ClippingRects are no longer supplied for individual draw element calls.  If you require a specialized clipping rect, use PushClip / PopClip on the WindowElementList, otherwise, just remove the parameter.")
 	static void MakeText(FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, const FString& InText, const int32 StartIndex, const int32 EndIndex, const FSlateFontInfo& InFontInfo, const FSlateRect& InClippingRect, ESlateDrawEffect InDrawEffects = ESlateDrawEffect::None, const FLinearColor& InTint = FLinearColor::White)
@@ -756,7 +762,6 @@ public:
 private:
 	void Init(FSlateWindowElementList& ElementList, uint32 InLayer, const FPaintGeometry& PaintGeometry, ESlateDrawEffect InDrawEffects);
 
-#if SLATE_EXCESSIVE_CULLING
 	static bool ShouldCull(const FSlateWindowElementList& ElementList);
 
 	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry)
@@ -769,21 +774,12 @@ private:
 
 		return ShouldCull(ElementList);
 	}
-#else
-	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList)
-	{
-		return false;
-	}
 
-	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry)
-	{
-		return false;
-	}
-#endif
+	static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FSlateBrush* InBrush);
 
-	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FSlateBrush* InBrush)
+	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FLinearColor& InTint)
 	{
-		if ((InBrush && InBrush->DrawAs == ESlateBrushDrawType::NoDrawType) || ShouldCull(ElementList, PaintGeometry))
+		if (InTint.A == 0 || ShouldCull(ElementList, PaintGeometry))
 		{
 			return true;
 		}
@@ -791,9 +787,9 @@ private:
 		return false;
 	}
 
-	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FLinearColor& InTint)
+	FORCEINLINE static bool ShouldCull(const FSlateWindowElementList& ElementList, const FPaintGeometry& PaintGeometry, const FLinearColor& InTint, const FString& InText)
 	{
-		if (InTint.A == 0 || ShouldCull(ElementList, PaintGeometry))
+		if (InTint.A == 0 || InText.Len() == 0 || ShouldCull(ElementList, PaintGeometry))
 		{
 			return true;
 		}
@@ -1540,6 +1536,18 @@ public:
 		TextElements.Reset();
 		ShapedTextElements.Reset();
 		LineElements.Reset();
+		CachedElementBuffers.Reset();
+	}
+
+	FORCEINLINE int32 GetElementCount() const
+	{
+		return DrawElements.Num() +
+			BoxElements.Num() +
+			BorderElements.Num() +
+			TextElements.Num() +
+			ShapedTextElements.Num() +
+			LineElements.Num() +
+			CachedElementBuffers.Num();
 	}
 
 public:
@@ -1563,6 +1571,9 @@ public:
 
 	/** Drawable Line Elements */
 	TArray<FSlateDrawLines> LineElements;
+
+	/** Drawable Cached Element Buffers */
+	TArray<FSlateDrawCachedBuffer> CachedElementBuffers;
 };
 
 /**
@@ -1586,6 +1597,7 @@ public:
 class FSlateWindowElementList
 {
 	friend class FSlateElementBatcher;
+	friend class FSlateDrawElement;
 
 public:
 	/** 
@@ -1596,6 +1608,8 @@ public:
 	 */
 	SLATECORE_API explicit FSlateWindowElementList(TSharedPtr<SWindow> InPaintWindow = nullptr);
 
+	SLATECORE_API ~FSlateWindowElementList();
+
 	/** @return Get the window that we will be painting */
 	FORCEINLINE TSharedPtr<SWindow> GetWindow() const
 	{
@@ -1623,6 +1637,9 @@ public:
 		return RootDrawLayer.DrawElements;
 	}
 
+	/** @return the total number of elements that have been registered to be drawn. */
+	SLATECORE_API int32 GetElementCount() const;
+
 	/**
 	 * Add a draw element to the list
 	 *
@@ -1703,9 +1720,19 @@ public:
 		return Elements[InsertIdx];
 	}
 
+	/**
+	 * Creates a new lines draw element
+	 */
+	FORCEINLINE FSlateDrawCachedBuffer& AddCachedBuffer()
+	{
+		TArray<FSlateDrawCachedBuffer>& Elements = DrawStack.Last()->CachedElementBuffers;
+		const int32 InsertIdx = Elements.AddDefaulted();
+		return Elements[InsertIdx];
+	}
+
 	SLATECORE_API void MergeElementList(FSlateWindowElementList* ElementList, FVector2D AbsoluteOffset);
 
-	SLATECORE_API void MergeResources(const TSet<UObject*>& AssociatedResources);
+	SLATECORE_API void MergeResources(const TArray<UObject*>& AssociatedResources);
 
 	//--------------------------------------------------------------------------
 	// CLIPPING
@@ -1806,6 +1833,12 @@ public:
 	 */
 	SLATECORE_API void ResetElementBuffers();
 
+	/** Allows manual hinting of reporting of references. */
+	SLATECORE_API void SetShouldReportReferencesToGC(bool bInReportReferences);
+
+	/** Will UObject references be reported to the GC? */
+	SLATECORE_API bool ShouldReportUObjectReferences() const;
+
 	/**
 	 * Allocate memory that remains valid until ResetBuffers is called.
 	 */
@@ -1855,13 +1888,15 @@ public:
 
 	SLATECORE_API void PostDraw_ParallelThread();
 
+	SLATECORE_API void PostDraw_NonParallelRenderer();
+
 	SLATECORE_API void SetRenderTargetWindow(SWindow* InRenderTargetWindow);
 
-	void AddReferencedObjectsForLayer(FReferenceCollector& Collector, FSlateDrawLayer& DrawLayer);
+	SLATECORE_API void AddReferencedObjects(FReferenceCollector& Collector);
 
 private:
-	/** Extra Resources. */
-	TSet<UObject*> ExtraResources;
+	/** Resources to report to the garbage collector */
+	TArray<UObject*> ResourcesToReport;
 
 	/** 
 	 * Window which owns the widgets that are being painted but not necessarily rendered to
@@ -1931,15 +1966,14 @@ private:
 	public:
 		FWindowElementGCObject(FSlateWindowElementList* InOwner);
 
-		SLATECORE_API virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+		void ClearOwner();
 
-	private:
-		void AddReferencedObjectsForLayer(FReferenceCollector& Collector, FSlateDrawLayer& DrawLayer);
+		SLATECORE_API virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
 
 	private:
 		FSlateWindowElementList* Owner;
 	};
 
 	/** This keeps drawn elements alive in case the UObject stops being referenced elsewhere that we need. */
-	TSharedPtr<FWindowElementGCObject> ResourceGCRoot;
+	TUniquePtr<FWindowElementGCObject> ResourceGCRoot;
 };
diff --git a/Engine/Source/Runtime/SlateCore/Public/Rendering/ElementBatcher.h b/Engine/Source/Runtime/SlateCore/Public/Rendering/ElementBatcher.h
index bcda7348f8b9..6602e48c55e7 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Rendering/ElementBatcher.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Rendering/ElementBatcher.h
@@ -19,6 +19,7 @@ class FSlateDrawBox;
 class FSlateDrawText;
 class FSlateDrawShapedText;
 class FSlateDrawLines;
+class FSlateDrawCachedBuffer;
 
 /**
  * A class which batches Slate elements for rendering
@@ -60,6 +61,7 @@ private:
 	void BatchTextElements();
 	void BatchShapedTextElements();
 	void BatchLineElements();
+	void BatchCachedBuffers();
 	
 	FORCEINLINE FColor PackVertexColor(const FLinearColor& InLinearColor) const
 	{
@@ -135,7 +137,7 @@ private:
 
 	void AddCustomVerts( const FSlateDrawElement& DrawElement );
 
-	void AddCachedBuffer( const FSlateDrawElement& DrawElement );
+	void AddCachedBuffer( const FSlateDrawCachedBuffer& DrawElement );
 
 	void AddLayer(const FSlateDrawElement& DrawElement);
 
@@ -176,14 +178,26 @@ private:
 	/** Rendering policy we were created from */
 	FSlateRenderingPolicy* RenderingPolicy;
 
-	/** Track the number of drawn batches from the previous frame to report to stats. */
-	int32 NumDrawnBatchesStat;
-
 	/** Track the number of drawn boxes from the previous frame to report to stats. */
-	int32 NumDrawnBoxesStat;
+	int32 ElmementStat_Boxes;
 
-	/** Track the number of drawn texts from the previous frame to report to stats. */
-	int32 NumDrawnTextsStat;
+	/** Track the number of drawn borders from the previous frame to report to stats. */
+	int32 ElmementStat_Borders;
+
+	/** Track the number of drawn text from the previous frame to report to stats. */
+	int32 ElmementStat_Text;
+
+	/** Track the number of drawn shaped text from the previous frame to report to stats. */
+	int32 ElmementStat_ShapedText;
+
+	/** Track the number of drawn lines from the previous frame to report to stats. */
+	int32 ElmementStat_Line;
+
+	/** Track the number of drawn cached buffers from the previous frame to report to stats. */
+	int32 ElmementStat_CachedBuffer;
+
+	/** Track the number of drawn batches from the previous frame to report to stats. */
+	int32 ElmementStat_Other;
 
 	/** How many post process passes are needed */
 	int32 NumPostProcessPasses;
diff --git a/Engine/Source/Runtime/SlateCore/Public/Rendering/RenderingCommon.h b/Engine/Source/Runtime/SlateCore/Public/Rendering/RenderingCommon.h
index fb254791fb22..9962f34d6b57 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Rendering/RenderingCommon.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Rendering/RenderingCommon.h
@@ -9,6 +9,7 @@
 #include "Input/Reply.h"
 #include "Input/NavigationReply.h"
 #include "Input/PopupMethodReply.h"
+#include "RenderingCommon.generated.h"
 
 class FSlateInstanceBufferUpdate;
 class FWidgetStyle;
@@ -125,6 +126,18 @@ enum class ESlateLineJoinType : uint8
 };
 
 
+/**
+ * Enumerates color vision deficiency types.
+ */
+UENUM()
+enum class EColorVisionDeficiency : uint8
+{
+	NormalVision UMETA(DisplayName="Normal Vision"),
+	Deuteranope UMETA(DisplayName="Deuteranope (green weak/blind) (7% of males, 0.4% of females)"),
+	Protanope UMETA(DisplayName="Protanope (red weak/blind) (2% of males, 0.01% of females)"),
+	Tritanope UMETA(DisplayName="Tritanope (blue weak/bind) (0.0003% of males)"),
+};
+
 
 enum class ESlateVertexRounding : uint8
 {
diff --git a/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateObjectReferenceCollector.h b/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateObjectReferenceCollector.h
new file mode 100644
index 000000000000..34fc27bf0fa1
--- /dev/null
+++ b/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateObjectReferenceCollector.h
@@ -0,0 +1,40 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+/**
+ * Used to gather all the referenced UObjects used by Slate when rendering a frame.
+ * We're forced to do this because several draw calls only use resources for a frame
+ * and then allow them to be garbage collected, so Slate needs to keep those objects
+ * alive for the duration that they are used.
+ */
+class FSlateObjectReferenceCollector : public FReferenceCollector
+{
+public:
+	FSlateObjectReferenceCollector(TArray<UObject*>& InReferencedSet)
+		: ReferencedObjects(InReferencedSet)
+	{
+	}
+
+	virtual bool IsIgnoringArchetypeRef() const override
+	{
+		return true;
+	}
+
+	virtual bool IsIgnoringTransient() const override
+	{
+		return false;
+	}
+
+	virtual void HandleObjectReference(UObject*& InObject, const UObject* InReferencingObject, const UProperty* InReferencingProperty) override
+	{
+		if (InObject)
+		{
+			ReferencedObjects.Add(InObject);
+		}
+	}
+
+	TArray<UObject*>& ReferencedObjects;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateRenderer.h b/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateRenderer.h
index 5fd9ce00c7b9..8aa0c7067bd5 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateRenderer.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Rendering/SlateRenderer.h
@@ -20,6 +20,16 @@ struct FSlateBrush;
 
 typedef FRHITexture2D* FTexture2DRHIParamRef;
 
+/**
+ * Update context for deferred drawing of widgets to render targets
+ */
+struct FRenderThreadUpdateContext
+{
+	class FSlateDrawBuffer* DrawBuffer;
+	void* RenderTargetResource;
+	void* Renderer;
+	bool bClearTarget;
+};
 
 /**
  * Provides access to the game and render thread font caches that Slate should use
@@ -235,7 +245,7 @@ public:
 	/** 
 	 * Sets which color vision filter to use
 	 */
-	virtual void SetColorVisionDeficiencyType( uint32 Type ) {} 
+	virtual void SetColorVisionDeficiencyType(EColorVisionDeficiency Type, int32 Severity, bool bCorrectDeficiency, bool bShowCorrectionWithDeficiency) { }
 
 	/** 
 	 * Creates a dynamic image resource and returns its size
@@ -269,6 +279,9 @@ public:
 	 */
 	virtual FSlateResourceHandle GetResourceHandle( const FSlateBrush& Brush ) = 0;
 
+	/** The default implementation assumes all things are renderable. */
+	virtual bool CanRenderResource(UObject& InResourceObject) const { return true; }
+
 	/**
 	 * Queues a dynamic brush for removal when it is safe.  The brush is not immediately released but you should consider the brush destroyed and no longer usable
 	 *
@@ -436,7 +449,7 @@ public:
 	 * Necessary to grab before flushing the resource pool, as it may be being 
 	 * accessed by multiple threads when loading.
 	 */
-	FCriticalSection* GetResourceCriticalSection() { return &ResourceCriticalSection; }
+	virtual FCriticalSection* GetResourceCriticalSection() = 0;
 
 	/** Register the active scene pointer with the renderer. This will return the scene internal index that will be used for all subsequent elements drawn. */
 	virtual int32 RegisterCurrentScene(FSceneInterface* Scene) = 0;
@@ -449,6 +462,15 @@ public:
 
 	virtual bool HasLostDevice() const { return false; }
 
+	/**
+	 * Lets the renderer know that we need to render some widgets to a render target.
+	 * 
+	 * @param Context						The context that describes what we're rendering to
+	 * @param bDeferredRenderTargetUpdate	Whether or not the update is deferred until the end of the frame when it is potentially less expensive to update the render target. 
+											See GDeferRetainedRenderingRenderThread for more info.
+											Care must be taken to destroy anything referenced in the context when it is safe to do so.
+	 */
+	virtual void AddWidgetRendererUpdate(const struct FRenderThreadUpdateContext& Context, bool bDeferredRenderTargetUpdate) {}
 private:
 
 	// Non-copyable
diff --git a/Engine/Source/Runtime/SlateCore/Public/SlateGlobals.h b/Engine/Source/Runtime/SlateCore/Public/SlateGlobals.h
index 599d2a038ee8..c46a91788425 100644
--- a/Engine/Source/Runtime/SlateCore/Public/SlateGlobals.h
+++ b/Engine/Source/Runtime/SlateCore/Public/SlateGlobals.h
@@ -5,32 +5,14 @@
 #include "CoreMinimal.h"
 #include "Stats/Stats.h"
 
-#ifndef SLATE_DYNAMIC_PREPASS
-	#define SLATE_DYNAMIC_PREPASS 0
-#endif
-
-#ifndef SLATE_CHECK_UOBJECT_RENDER_RESOURCES
-	#define SLATE_CHECK_UOBJECT_RENDER_RESOURCES 0
-#endif
+#define SLATE_CHECK_UOBJECT_RENDER_RESOURCES !UE_BUILD_SHIPPING
 
 #ifndef SLATE_PARENT_POINTERS
 	#define SLATE_PARENT_POINTERS 0
 #endif
 
-#ifndef SLATE_FAST_WIDGET_PATH
-	#define SLATE_FAST_WIDGET_PATH 0
-#else
-	#ifndef SLATE_PARENT_POINTERS
-		COMPILE_ERROR("SLATE_FAST_WIDGET_PATH Requires SLATE_PARENT_POINTERS")
-	#endif
-#endif
-
-#ifndef SLATE_LAYOUT_CHANGE
-	#define SLATE_LAYOUT_CHANGE 0
-#else
-	#ifndef SLATE_PARENT_POINTERS
-		COMPILE_ERROR("SLATE_LAYOUT_CHANGE Requires SLATE_PARENT_POINTERS")
-	#endif
+#ifndef SLATE_CULL_WIDGETS
+	#define SLATE_CULL_WIDGETS 1
 #endif
 
 /* Globals
@@ -70,6 +52,12 @@ DECLARE_STATS_GROUP(TEXT("Slate"), STATGROUP_Slate, STATCAT_Advanced);
 DECLARE_STATS_GROUP_VERBOSE(TEXT("SlateVerbose"), STATGROUP_SlateVerbose, STATCAT_Advanced);
 DECLARE_STATS_GROUP_MAYBE_COMPILED_OUT(TEXT("SlateVeryVerbose"), STATGROUP_SlateVeryVerbose, STATCAT_Advanced, WITH_VERY_VERBOSE_SLATE_STATS);
 
+/** Whether or not dynamic prepass and layout caching is enabled */
+extern SLATECORE_API int32 GSlateLayoutCaching;
+
+/** Whether or not we've enabled fast widget pathing which validates paths to widgets without arranging children. */
+extern SLATECORE_API int32 GSlateFastWidgetPath;
+
 /* Forward declarations
 *****************************************************************************/
 class FActiveTimerHandle;
diff --git a/Engine/Source/Runtime/SlateCore/Public/SlotBase.h b/Engine/Source/Runtime/SlateCore/Public/SlotBase.h
index 063af4f0b0d2..07c6ab3d59a7 100644
--- a/Engine/Source/Runtime/SlateCore/Public/SlotBase.h
+++ b/Engine/Source/Runtime/SlateCore/Public/SlotBase.h
@@ -18,8 +18,13 @@ public:
 
 	FORCEINLINE_DEBUGGABLE void AttachWidgetParent(SWidget* InParent)
 	{
-		RawParentPtr = InParent;
-		AfterContentOrOwnerChanges();
+		if (RawParentPtr != InParent)
+		{
+			ensureMsgf(RawParentPtr == nullptr, TEXT("Slots should not be reassigned to different parents."));
+
+			RawParentPtr = InParent;
+			AfterContentOrOwnerAssigned();
+		}
 	}
 
 	FORCEINLINE_DEBUGGABLE void AttachWidget( const TSharedRef<SWidget>& InWidget )
@@ -27,8 +32,9 @@ public:
 		// TODO: If we don't hold a reference here, ~SWidget() could called on the old widget before the assignment takes place
 		// The behavior of TShareRef is going to change in the near future to avoid this issue and this should then be reverted.
 		TSharedRef<SWidget> LocalWidget = Widget;
+		DetatchParentFromContent();
 		Widget = InWidget;
-		AfterContentOrOwnerChanges();
+		AfterContentOrOwnerAssigned();
 	}
 
 	/**
@@ -53,7 +59,8 @@ protected:
 	SWidget* RawParentPtr;
 
 private:
-	void AfterContentOrOwnerChanges();
+	void DetatchParentFromContent();
+	void AfterContentOrOwnerAssigned();
 
 private:
 	// non-copyable
diff --git a/Engine/Source/Runtime/SlateCore/Public/Styling/SlateBrush.h b/Engine/Source/Runtime/SlateCore/Public/Styling/SlateBrush.h
index 2a99cdd29602..af94e57b6687 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Styling/SlateBrush.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Styling/SlateBrush.h
@@ -6,7 +6,7 @@
 #include "UObject/ObjectMacros.h"
 #include "Styling/SlateColor.h"
 #include "Layout/Margin.h"
-
+#include "Textures/SlateShaderResource.h"
 #include "SlateBrush.generated.h"
 
 /**
@@ -105,11 +105,12 @@ namespace SlateBrushDefs
 /**
  * An brush which contains information about how to draw a Slate element
  */
-USTRUCT(BlueprintType)
+USTRUCT(BlueprintType) //, meta = (HasNativeMake = ""))
 struct SLATECORE_API FSlateBrush
 {
 	GENERATED_USTRUCT_BODY()
 
+public:
 	/** Size of the resource in Slate Units */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Brush)
 	FVector2D ImageSize;
@@ -155,6 +156,18 @@ public:
 
 public:
 
+	FVector2D GetImageSize() const { return ImageSize; }
+
+	const FMargin& GetMargin() const { return Margin; }
+
+	ESlateBrushTileType::Type GetTiling() const { return Tiling; }
+
+	ESlateBrushMirrorType::Type GetMirroring() const { return Mirroring; }
+
+	ESlateBrushImageType::Type GetImageType() const { return ImageType; }
+
+	ESlateBrushDrawType::Type GetDrawType() const { return DrawAs; }
+
 	/**
 	 * Gets the name of the resource object, if any.
 	 *
@@ -184,7 +197,20 @@ public:
 	 */
 	void SetResourceObject(class UObject* InResourceObject)
 	{
-		ResourceObject = InResourceObject;
+#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+		if (!ensure(CanRenderResourceObject(InResourceObject)))
+		{
+			// If we can't render the resource return, don't let people use them as brushes, we'll just crash later.
+			return;
+		}
+#endif
+
+		if (ResourceObject != InResourceObject)
+		{
+			ResourceObject = InResourceObject;
+			// Invalidate resource handle
+			ResourceHandle = FSlateResourceHandle();
+		}
 	}
 
 	/**
@@ -223,7 +249,7 @@ public:
 	 *
 	 * @return UV region
 	 */
-	FBox2D GetUVRegion() const
+	const FBox2D& GetUVRegion() const
 	{
 		return UVRegion;
 	}
@@ -271,9 +297,11 @@ public:
 		return !(*this == Other);
 	}
 
-	void PostSerialize(const FArchive& Ar);
-
-	void AddReferencedObjects(FReferenceCollector& Collector);
+	/** Report any references to UObjects to the reference collector. */
+	void AddReferencedObjects(FReferenceCollector& Collector)
+	{
+		Collector.AddReferencedObject(ResourceObject);
+	}
 
 	/**
 	 * Gets the identifier for UObject based texture paths.
@@ -281,16 +309,31 @@ public:
 	 * @return Texture identifier string.
 	 */
 	static const FString UTextureIdentifier( );
+	
+	const FSlateResourceHandle& GetRenderingResource() const
+	{
+		if (!ResourceHandle.IsValid())
+		{
+			UpdateRenderingResource();
+		}
 
-protected:
+		return ResourceHandle;
+	}
+
+private:
+	void UpdateRenderingResource() const;
+	bool CanRenderResourceObject(UObject* InResourceObject) const;
+
+private:
 
 	/**
 	 * The image to render for this brush, can be a UTexture or UMaterialInterface or an object implementing 
 	 * the AtlasedTextureInterface. 
 	 */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Brush, meta=( DisplayThumbnail="true", DisplayName="Image", AllowedClasses="Texture,MaterialInterface,SlateTextureAtlasInterface" ))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Brush, meta=( AllowPrivateAccess="true", DisplayThumbnail="true", DisplayName="Image", AllowedClasses="Texture,MaterialInterface,SlateTextureAtlasInterface" ))
 	UObject* ResourceObject;
 
+protected:
 	/** The name of the rendering resource to use */
 	UPROPERTY()
 	FName ResourceName;
@@ -320,6 +363,8 @@ public:
 	UPROPERTY()
 	TEnumAsByte<enum ESlateBrushImageType::Type> ImageType;
 
+	/** Rendering resource for this brush */
+	mutable FSlateResourceHandle ResourceHandle;
 protected:
 
 	/** Whether or not the brush path is a path to a UObject */
@@ -346,3 +391,10 @@ protected:
 
 	 FORCENOINLINE FSlateBrush( ESlateBrushDrawType::Type InDrawType, const FName InResourceName, const FMargin& InMargin, ESlateBrushTileType::Type InTiling, ESlateBrushImageType::Type InImageType, const FVector2D& InImageSize, const FSlateColor& InTint, UObject* InObjectResource = nullptr, bool bInDynamicallyLoaded = false );
 };
+
+/** Provides a means to hold onto the source of a slate brush. */
+class ISlateBrushSource
+{
+public:
+	virtual const FSlateBrush* GetSlateBrush() const = 0;
+};
diff --git a/Engine/Source/Runtime/SlateCore/Public/Textures/SlateShaderResource.h b/Engine/Source/Runtime/SlateCore/Public/Textures/SlateShaderResource.h
index 1a38b787b5c8..d46edda617fb 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Textures/SlateShaderResource.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Textures/SlateShaderResource.h
@@ -63,6 +63,12 @@ public:
 	 */
 	virtual ESlateShaderResource::Type GetType() const = 0;
 
+#if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
+	virtual void CheckForStaleResources() const { }
+#else
+	FORCEINLINE void CheckForStaleResources() const { }
+#endif
+
 public:
 
 	/** Virtual destructor. */
@@ -194,7 +200,6 @@ class FSlateResourceHandle
 {
 	friend class FSlateShaderResourceManager;
 	friend class FSlateNullShaderResourceManager;
-	friend class FSlateDrawElement;
 public:
 	FSlateResourceHandle() {}
 
@@ -202,6 +207,15 @@ public:
 	 * @return true if the handle still points to a valid rendering resource
 	 */
 	bool IsValid() const { return Data.IsValid() && Data->Proxy; }
+
+	/**
+	 * @return the resource proxy used to render.
+	 */
+	const FSlateShaderResourceProxy* GetResourceProxy() const
+	{
+		return Data.IsValid() ? Data->Proxy : nullptr;
+	}
+
 private:
 	FSlateResourceHandle(const TSharedPtr<FSlateSharedHandleData>& InData)
 		: Data(InData)
diff --git a/Engine/Source/Runtime/SlateCore/Public/Widgets/DeclarativeSyntaxSupport.h b/Engine/Source/Runtime/SlateCore/Public/Widgets/DeclarativeSyntaxSupport.h
index 435acf27eb87..e4ff3d420790 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Widgets/DeclarativeSyntaxSupport.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Widgets/DeclarativeSyntaxSupport.h
@@ -1031,7 +1031,7 @@ struct TDecl
 		: _Widget( TWidgetAllocator<WidgetType, TIsDerivedFrom<WidgetType, SUserWidget>::IsDerived >::PrivateAllocateWidget() )
 		, _RequiredArgs(InRequiredArgs)
 	{
-		_Widget->SetDebugInfo( InType, InFile, OnLine );
+		_Widget->SetDebugInfo( InType, InFile, OnLine, sizeof(WidgetType) );
 	}
 
 	/**
diff --git a/Engine/Source/Runtime/SlateCore/Public/Widgets/SWidget.h b/Engine/Source/Runtime/SlateCore/Public/Widgets/SWidget.h
index 6519d01323f2..8e18280290e4 100644
--- a/Engine/Source/Runtime/SlateCore/Public/Widgets/SWidget.h
+++ b/Engine/Source/Runtime/SlateCore/Public/Widgets/SWidget.h
@@ -21,6 +21,7 @@
 #include "Input/PopupMethodReply.h"
 #include "Types/ISlateMetaData.h"
 #include "Types/WidgetActiveTimerDelegate.h"
+#include "Textures/SlateShaderResource.h"
 #include "SlateGlobals.h"
 
 class FActiveTimerHandle;
@@ -112,18 +113,22 @@ enum class EInvalidateWidget : uint8
 {
 	/** Not actually used, but defining it. */
 	None = 0,
+
 	/**
 	 * Use Layout invalidation sizing.
 	 */
 	Layout = 1 << 0,
+
 	/**
 	 * Use when the painting of widget has been altered, but nothing affecting sizing.
 	 */
 	Paint = 1 << 1,
+
 	/**
 	 * Use if just the volatility of the widget has been adjusted.
 	 */
 	Volatility = 1 << 2,
+
 	/**
 	 * Use Paint invalidation if you're changing a normal property involving painting or sizing.
 	 * Additionally if the property that was changed affects Volatility in anyway, it's important
@@ -136,6 +141,12 @@ enum class EInvalidateWidget : uint8
 	 * that you invalidate volatility so that it can be recalculated and cached.
 	 */
 	LayoutAndVolatility = Layout | Volatility,
+
+	/**
+	 * Changing visibility affects layout, paint, and volatility
+	 */
+	Visibility = Layout | Paint | Volatility,
+
 	All = Layout | Paint | Volatility
 };
 
@@ -650,60 +661,57 @@ public:
 	 */
 	void SlatePrepass(float LayoutScaleMultiplier);
 
-#if SLATE_DYNAMIC_PREPASS
-	public:
+	void LayoutChanged(EInvalidateWidget InvalidateReason);
+	virtual void ChildLayoutChanged(EInvalidateWidget InvalidateReason);
+
+public:
 	void InvalidatePrepass();
 
 	/** @return the DesiredSize that was computed the last time CacheDesiredSize() was called. */
 	FVector2D GetDesiredSize() const;
 
-#else
-	public:
-	FORCEINLINE void InvalidatePrepass() { }
-	FORCEINLINE FVector2D GetDesiredSize() const { return DesiredSize; }
-#endif
-
 #if SLATE_PARENT_POINTERS
-	public:
+public:
 	void AssignParentWidget(TSharedPtr<SWidget> InParent);
+	bool ConditionallyDetatchParentWidget(SWidget* InExpectedParent);
+	/**  */
+	virtual bool ValidatePathToChild(SWidget* InChild) { return true; }
 
+	FORCEINLINE bool IsParentValid() const { return ParentWidgetPtr.IsValid(); }
 	FORCEINLINE TSharedPtr<SWidget> GetParentWidget() const { return ParentWidgetPtr.Pin(); }
 #endif
 
-#if SLATE_LAYOUT_CHANGE
-	public:
-		void LayoutChanged();
-		virtual void ChildLayoutChanged();
-#else
-	public:
-		FORCEINLINE void LayoutChanged() { }
-		FORCEINLINE void ChildLayoutChanged() { }
-#endif
-
+protected:
 	/**
 	 * The system calls this method. It performs a breadth-first traversal of every visible widget and asks
 	 * each widget to cache how big it needs to be in order to present all of its content.
 	 */
-	protected: virtual void CacheDesiredSize(float InLayoutScaleMultiplier);
+	virtual void CacheDesiredSize(float InLayoutScaleMultiplier);
 	
 	/**
 	 * Explicitly set the desired size. This is highly advanced functionality that is meant
 	 * to be used in conjunction with overriding CacheDesiredSize. Use ComputeDesiredSize() instead.
 	 */
-	protected: void Advanced_SetDesiredSize(const FVector2D& InDesiredSize)
+	void Advanced_SetDesiredSize(const FVector2D& InDesiredSize)
 	{
-#if SLATE_LAYOUT_CHANGE
-		if (IsVolatile())
+		if (GSlateLayoutCaching)
 		{
-			VolatileDesiredSize = InDesiredSize;
+			if (IsVolatile())
+			{
+				VolatileDesiredSize = InDesiredSize;
+			}
+			else
+			{
+				DesiredSize = InDesiredSize;
+			}
+			bNeedsVolatileDesiredSize = false;
+			bNeedsDesiredSize = false;
 		}
 		else
 		{
 			DesiredSize = InDesiredSize;
+			//ensure(DesiredSize.GetValue().Y >= 0);
 		}
-#else
-		DesiredSize = InDesiredSize;
-#endif
 	}
 
 	/**
@@ -766,8 +774,11 @@ public:
 	 * @param AllottedGeometry    The geometry allotted for this widget by its parent.
 	 * @param ArrangedChildren    The array to which to add the WidgetGeometries that represent the arranged children.
 	 */
-	FORCEINLINE void ArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const
+	void ArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const
 	{
+#if SLATE_VERBOSE_NAMED_EVENTS
+		SCOPED_NAMED_EVENT(SWidget_ArrangeChildren, FColor::Black);
+#endif
 		OnArrangeChildren(AllottedGeometry, ArrangedChildren);
 	}
 
@@ -837,8 +848,14 @@ public:
 	 */
 	bool HasMouseCaptureByUser(int32 UserIndex, TOptional<int32> PointerIndex = TOptional<int32>()) const;
 
+protected:
 	/** Called when this widget had captured the mouse, but that capture has been revoked for some reason. */
-	virtual void OnMouseCaptureLost();
+	DEPRECATED(4.20, "Please use OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)")
+	void OnMouseCaptureLost() { }
+
+public:
+	/** Called when this widget had captured the mouse, but that capture has been revoked for some reason. */
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent);
 
 	/**
 	 * Ticks this widget and all of it's child widgets.  Should not be called directly.
@@ -847,6 +864,7 @@ public:
 	 * @param  InCurrentTime  Current absolute real time
 	 * @param  InDeltaTime  Real time passed since last tick
 	 */
+	DEPRECATED(4.20, "SWidget::TickWidgetsRecursively is no longer used")
 	void TickWidgetsRecursively( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime );
 
 	/**
@@ -913,7 +931,7 @@ public:
 		if ( !Visibility.IdenticalTo(InVisibility) )
 		{
 			Visibility = InVisibility;
-			Invalidate(EInvalidateWidget::LayoutAndVolatility);
+			Invalidate(EInvalidateWidget::Visibility);
 		}
 	}
 
@@ -947,18 +965,7 @@ public:
 	 * Invalidates the widget from the view of a layout caching widget that may own this widget.
 	 * will force the owning widget to redraw and cache children on the next paint pass.
 	 */
-	FORCEINLINE void Invalidate(EInvalidateWidget Invalidate)
-	{
-		const bool bWasVolatile = IsVolatileIndirectly() || IsVolatile();
-		const bool bVolatilityChanged = EnumHasAnyFlags(Invalidate, EInvalidateWidget::Volatility) ? Advanced_InvalidateVolatility() : false;
-
-		if ( bWasVolatile == false || bVolatilityChanged )
-		{
-			Advanced_ForceInvalidateLayout();
-		}
-
-		LayoutChanged();
-	}
+	void Invalidate(EInvalidateWidget InvalidateReason);
 
 	/**
 	 * Recalculates volatility of the widget and caches the result.  Should be called any time 
@@ -971,12 +978,16 @@ public:
 
 protected:
 
+#if SLATE_CULL_WIDGETS
 	/**
 	 * Tests if an arranged widget should be culled.
 	 * @param MyCullingRect the culling rect of the widget currently doing the culling.
 	 * @param ArrangedChild the arranged widget in the widget currently attempting to cull children.
 	 */
 	bool IsChildWidgetCulled(const FSlateRect& MyCullingRect, const FArrangedWidget& ArrangedChild) const;
+#else
+	FORCEINLINE bool IsChildWidgetCulled(const FSlateRect&, const FArrangedWidget&) const { return false; }
+#endif
 
 protected:
 
@@ -1017,6 +1028,11 @@ public:
 		Invalidate(EInvalidateWidget::Layout);
 	}
 
+	FORCEINLINE void SetTag(FName InTag)
+	{
+		Tag = InTag;
+	}
+
 	/** @return the render transform of the widget. */
 	FORCEINLINE const TOptional<FSlateRenderTransform>& GetRenderTransform() const
 	{
@@ -1104,7 +1120,7 @@ public:
 	/**
 	 * Used by Slate to set the runtime debug info about this widget.
 	 */
-	void SetDebugInfo( const ANSICHAR* InType, const ANSICHAR* InFile, int32 OnLine );
+	void SetDebugInfo( const ANSICHAR* InType, const ANSICHAR* InFile, int32 OnLine, size_t InAllocSize );
 	
 	/**
 	 * Get the metadata of the type provided.
@@ -1372,19 +1388,19 @@ protected:
 
 protected:
 	/** Is this widget hovered? */
-	uint8 bIsHovered : 1;
+	bool bIsHovered : 1;
 
 	/** Can the widget ever be ticked. */
-	uint8 bCanTick : 1;
+	bool bCanTick : 1;
 
 	/** Can the widget ever support keyboard focus */
-	uint8 bCanSupportFocus : 1;
+	bool bCanSupportFocus : 1;
 
 	/**
 	 * Can the widget ever support children?  This will be false on SLeafWidgets, 
 	 * rather than setting this directly, you should probably inherit from SLeafWidget.
 	 */
-	uint8 bCanHaveChildren : 1;
+	bool bCanHaveChildren : 1;
 
 	/**
 	  * Some widgets might be a complex hierarchy of child widgets you never see.  Some of those widgets
@@ -1392,20 +1408,12 @@ protected:
 	  * so even though it may be set to clip, this flag is used to inform painting that this widget doesn't
 	  * really do the clipping.
 	  */
-	uint8 bClippingProxy : 1;
-
-#if SLATE_DYNAMIC_PREPASS
-	/** Are we currently updating the desired size? */
-	uint8 bNeedsPrepass : 1;
-
-	/** Are we currently updating the desired size? */
-	mutable uint8 bUpdatingDesiredSize : 1;
-#endif
+	bool bClippingProxy : 1;
 
 	/**
 	* Is this widget a Window?  This should only be used by SWindow derived widgets.
 	*/
-	uint8 bIsWindow : 1;
+	bool bIsWindow : 1;
 
 private:
 
@@ -1413,13 +1421,13 @@ private:
 	 * Whether this widget is a "tool tip force field".  That is, tool-tips should never spawn over the area
 	 * occupied by this widget, and will instead be repelled to an outside edge
 	 */
-	uint8 bToolTipForceFieldEnabled : 1;
+	bool bToolTipForceFieldEnabled : 1;
 
 	/** Should we be forcing this widget to be volatile at all times and redrawn every frame? */
-	uint8 bForceVolatile : 1;
+	bool bForceVolatile : 1;
 
 	/** The last cached volatility of this widget.  Cached so that we don't need to recompute volatility every frame. */
-	uint8 bCachedVolatile : 1;
+	bool bCachedVolatile : 1;
 
 	/** If we're owned by a volatile widget, we need inherit that volatility and use as part of our volatility, but don't cache it. */
 	mutable uint8 bInheritedVolatility : 1;
@@ -1440,30 +1448,21 @@ protected:
 
 private:
 
-#if SLATE_DYNAMIC_PREPASS
-	float PrepassLayoutScaleMultiplier;
-
-#if SLATE_LAYOUT_CHANGE
 	/** Stores the ideal size this widget wants to be. */
 	TOptional<FVector2D> DesiredSize;
-	TFrameValue<FVector2D> VolatileDesiredSize;
-#else
-	/**
-	* Stores the ideal size this widget wants to be.
-	* This member is intentionally private, because only the very base class (Widget) can write DesiredSize.
-	* See CacheDesiredSize(), ComputeDesiredSize()
-	*/
-	TFrameValue<FVector2D> DesiredSize;
-#endif
+	TOptional<FVector2D> VolatileDesiredSize;
 
-#else
-	/**
-	 * Stores the ideal size this widget wants to be.
-	 * This member is intentionally private, because only the very base class (Widget) can write DesiredSize.
-	 * See CacheDesiredSize(), ComputeDesiredSize()
-	 */
-	FVector2D DesiredSize;
-#endif
+	float PrepassLayoutScaleMultiplier;
+
+	/** Are we currently updating the desired size? */
+	bool bNeedsPrepass : 1;
+
+	bool bNeedsDesiredSize : 1;
+
+	bool bNeedsVolatileDesiredSize : 1;
+
+	/** Are we currently updating the desired size? */
+	mutable bool bUpdatingDesiredSize : 1;
 
 	/**
 	 * Stores the cached Tick Geometry of the widget.  This information can and will be outdated, that's the
@@ -1494,7 +1493,6 @@ protected:
 	TAttribute< FVector2D > RenderTransformPivot;
 
 protected:
-
 	/** Debugging information on the type of widget we're creating for the Widget Reflector. */
 	FName TypeOfWidget;
 
@@ -1534,7 +1532,8 @@ private:
 	FSimpleNoReplyPointerEventHandler MouseLeaveHandler;
 
 private:
-	STAT(mutable TStatId				StatID;)
+	STAT(mutable TStatId StatID;)
+	STAT(size_t AllocSize;)
 };
 
 //=================================================================
diff --git a/Engine/Source/Runtime/SlateCore/SlateCore.Build.cs b/Engine/Source/Runtime/SlateCore/SlateCore.Build.cs
index cf88a5425b86..95ac7d0faeb6 100644
--- a/Engine/Source/Runtime/SlateCore/SlateCore.Build.cs
+++ b/Engine/Source/Runtime/SlateCore/SlateCore.Build.cs
@@ -34,9 +34,6 @@ public class SlateCore : ModuleRules
 			});
 
         PublicDefinitions.Add("SLATE_PARENT_POINTERS=1");
-        //PublicDefinitions.Add("SLATE_FAST_WIDGET_PATH=1");
-        //PublicDefinitions.Add("SLATE_DYNAMIC_PREPASS=1");
-        //PublicDefinitions.Add("SLATE_LAYOUT_CHANGE=1");
 
         if (Target.Type != TargetType.Server)
 		{
diff --git a/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.cpp b/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.cpp
index 8385cfa79493..17295002ed42 100644
--- a/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.cpp
+++ b/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.cpp
@@ -43,6 +43,11 @@ void FSlateNullRenderer::OnWindowDestroyed( const TSharedRef<SWindow>& InWindow
 
 void FSlateNullRenderer::DrawWindows( FSlateDrawBuffer& WindowDrawBuffer )
 {
+	// Must call PostDraw to clean up resources built in FSlateWindowElementList.
+	for (const TSharedRef<FSlateWindowElementList>& ElementList : WindowDrawBuffer.GetWindowElementLists())
+	{
+		ElementList->PostDraw_NonParallelRenderer();
+	}
 }
 
 FIntPoint FSlateNullRenderer::GenerateDynamicImageResource(const FName InTextureName)
@@ -91,6 +96,11 @@ void FSlateNullRenderer::RequestResize( const TSharedPtr<SWindow>& Window, uint3
 {
 }
 
+FCriticalSection* FSlateNullRenderer::GetResourceCriticalSection()
+{
+	return &ResourceCriticalSection;
+}
+
 int32 FSlateNullRenderer::RegisterCurrentScene(FSceneInterface* Scene) 
 {
 	// This is a no-op
diff --git a/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.h b/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.h
index 47a85b332790..612df046f010 100644
--- a/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.h
+++ b/Engine/Source/Runtime/SlateNullRenderer/Private/SlateNullRenderer.h
@@ -36,10 +36,12 @@ public:
 	virtual FSlateResourceHandle GetResourceHandle( const FSlateBrush& Brush ) override;
 	virtual FSlateUpdatableTexture* CreateUpdatableTexture(uint32 Width, uint32 Height) override;
 	virtual void ReleaseUpdatableTexture(FSlateUpdatableTexture* Texture) override;
+	virtual FCriticalSection* GetResourceCriticalSection() override;
 	virtual int32 RegisterCurrentScene(FSceneInterface* Scene) override;
 	virtual int32 GetCurrentSceneIndex() const override;
 	virtual void ClearScenes() override;
 
 private:
 	TSharedPtr<FSlateShaderResourceManager> ResourceManager;
+	FCriticalSection ResourceCriticalSection;
 };
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/Slate3DRenderer.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/Slate3DRenderer.cpp
index 85b5a1bac48b..6cfc2168e88d 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/Slate3DRenderer.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/Slate3DRenderer.cpp
@@ -114,6 +114,8 @@ struct TKeepAliveCommand final : public FRHICommand < TKeepAliveCommand<TKeepAli
 
 void FSlate3DRenderer::DrawWindowToTarget_RenderThread( FRHICommandListImmediate& InRHICmdList, FTextureRenderTarget2DResource* RenderTargetResource, FSlateDrawBuffer& WindowDrawBuffer, bool bInClearTarget)
 {
+	check(IsInRenderingThread());
+	QUICK_SCOPE_CYCLE_COUNTER(Stat_Slate_WidgetRendererRenderThread);
 	SCOPED_DRAW_EVENT( InRHICmdList, SlateRenderToTarget );
 	SCOPED_GPU_STAT(InRHICmdList, Slate3D);
 
@@ -122,11 +124,8 @@ void FSlate3DRenderer::DrawWindowToTarget_RenderThread( FRHICommandListImmediate
 	const TArray<TSharedRef<FSlateWindowElementList>>& WindowsToDraw = WindowDrawBuffer.GetWindowElementLists();
 
 	// Enqueue a command to unlock the draw buffer after all windows have been drawn
-	ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(SlateBeginDrawingWindowsCommand,
-		FSlateRHIRenderingPolicy&, Policy, *RenderTargetPolicy,
-		{
-			Policy.BeginDrawingWindows();
-		});
+	RenderTargetPolicy->BeginDrawingWindows();
+
 
 	// Set render target and clear.
 	FTexture2DRHIRef RTResource = RenderTargetResource->GetTextureRHI();
@@ -149,16 +148,16 @@ void FSlate3DRenderer::DrawWindowToTarget_RenderThread( FRHICommandListImmediate
 
 		BatchData.CreateRenderBatches(RootBatchMap);
 
-		RenderTargetPolicy->UpdateVertexAndIndexBuffers(InRHICmdList, BatchData);
-		
-		FVector2D DrawOffset = WindowDrawBuffer.ViewOffset;
-
-		FMatrix ProjectionMatrix = FSlateRHIRenderer::CreateProjectionMatrix(RTResource->GetSizeX(), RTResource->GetSizeY());
-		FMatrix ViewOffset = FTranslationMatrix::Make(FVector(DrawOffset, 0));
-		ProjectionMatrix = ViewOffset * ProjectionMatrix;
-
 		if ( BatchData.GetRenderBatches().Num() > 0 )
 		{
+			RenderTargetPolicy->UpdateVertexAndIndexBuffers(InRHICmdList, BatchData);
+		
+			FVector2D DrawOffset = WindowDrawBuffer.ViewOffset;
+
+			FMatrix ProjectionMatrix = FSlateRHIRenderer::CreateProjectionMatrix(RTResource->GetSizeX(), RTResource->GetSizeY());
+			FMatrix ViewOffset = FTranslationMatrix::Make(FVector(DrawOffset, 0));
+			ProjectionMatrix = ViewOffset * ProjectionMatrix;
+		
 			FSlateBackBuffer BackBufferTarget(RenderTargetResource->GetTextureRHI(), FIntPoint(RTResource->GetSizeX(), RTResource->GetSizeY()));
 
 			FSlateRenderingOptions DrawOptions(ProjectionMatrix);
@@ -192,20 +191,11 @@ void FSlate3DRenderer::DrawWindowToTarget_RenderThread( FRHICommandListImmediate
 		}
 	}
 
-	ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER(SlateEndDrawingWindowsCommand,
-		FSlateDrawBuffer*, DrawBuffer, &WindowDrawBuffer,
-		FSlateRHIRenderingPolicy&, Policy, *RenderTargetPolicy,
-		{
-			FSlateEndDrawingWindowsCommand::EndDrawingWindows(RHICmdList, DrawBuffer, Policy);
-		});
 
+	FSlateEndDrawingWindowsCommand::EndDrawingWindows(InRHICmdList, &WindowDrawBuffer, *RenderTargetPolicy);
 	InRHICmdList.CopyToResolveTarget(RenderTargetResource->GetTextureRHI(), RTResource, FResolveParams());
 
 	ISlate3DRendererPtr Self = SharedThis(this);
 
-	ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(SlateDrawWindows_ResourceRetainer,
-		ISlate3DRendererPtr, Renderer, Self,
-		{
-			new ( RHICmdList.AllocCommand<TKeepAliveCommand<ISlate3DRendererPtr>>() ) TKeepAliveCommand<ISlate3DRendererPtr>(Renderer);
-		});
+	new ( InRHICmdList.AllocCommand<TKeepAliveCommand<ISlate3DRendererPtr>>() ) TKeepAliveCommand<ISlate3DRendererPtr>(Self);
 }
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.cpp
index 833c03b08e41..7556f212d498 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.cpp
@@ -2,6 +2,7 @@
 
 #include "SlateMaterialResource.h"
 #include "Materials/MaterialInstanceDynamic.h"
+#include "Styling/SlateBrush.h"
 
 
 FSlateMaterialResource::FSlateMaterialResource(const UMaterialInterface& InMaterial, const FVector2D& InImageSize, FSlateShaderResource* InTextureMask )
@@ -77,24 +78,28 @@ void FSlateMaterialResource::UpdateMaterialName()
 	if(MID && MID->Parent)
 	{
 		// MID's don't have nice names. Get the name of the parent instead for tracking
-		MaterialName = MID->Parent->GetFName();
+		DebugName = MID->Parent->GetFName();
 	}
 	else if(MaterialObject)
 	{
-		MaterialName = MaterialObject->GetFName();
+		DebugName = MaterialObject->GetFName();
 	}
 	else
 	{
-		MaterialName = NAME_None;
+		DebugName = NAME_None;
 	}
 }
 
-void FSlateMaterialResource::CheckIfValid() const
+void FSlateMaterialResource::CheckForStaleResources() const
 {
-	// pending kill objects may still be rendered for a frame so it is valid for the check to pass
-	const bool bEvenIfPendingKill = true;
-	// This test needs to be thread safe.  It doesnt give us as many chances to trap bugs here but it is still useful
-	const bool bThreadSafe = true;
-	checkf(MaterialObjectWeakPtr.IsValid(bEvenIfPendingKill, bThreadSafe), TEXT("Material %s has become invalid.  This means the resource was garbage collected while slate was using it"), *MaterialName.ToString());
+	if (DebugName != NAME_None)
+	{
+		// pending kill objects may still be rendered for a frame so it is valid for the check to pass
+		const bool bEvenIfPendingKill = true;
+		// This test needs to be thread safe.  It doesn't give us as many chances to trap bugs here but it is still useful
+		const bool bThreadSafe = true;
+		checkf(MaterialObjectWeakPtr.IsValid(bEvenIfPendingKill, bThreadSafe), TEXT("Material %s has become invalid.  This means the resource was garbage collected while slate was using it"), *DebugName.ToString());
+	}
 }
+
 #endif
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.h
index 97d6765b60a3..7b8b02291dea 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateMaterialResource.h
@@ -30,21 +30,22 @@ public:
 	/** @return the material object */
 	const UMaterialInterface* GetMaterialObject() const { return MaterialObject; }
 
+	/** Slate proxy used for batching the material */
+	FSlateShaderResourceProxy* GetResourceProxy() const { return SlateProxy; }
+
 	FSlateShaderResource* GetTextureMaskResource() const { return TextureMaskResource; }
 
 #if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
-	void CheckIfValid() const;
-#else
-	FORCEINLINE void CheckIfValid() const { }
+	virtual void CheckForStaleResources() const override;
 #endif
 
-public:
+private:
 	const class UMaterialInterface* MaterialObject;
 
 #if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
 	// Used to guard against crashes when the material object is deleted.  This is expensive so we do not do it in shipping
 	TWeakObjectPtr<const UMaterialInterface> MaterialObjectWeakPtr;
-	FName MaterialName;
+	FName DebugName;
 #endif
 
 	/** Slate proxy used for batching the material */
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.cpp
index 07d873c6b42d..a6bc808baec9 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.cpp
@@ -10,6 +10,7 @@
 #include "PipelineStateCache.h"
 
 DECLARE_CYCLE_STAT(TEXT("Slate PostProcessing RT"), STAT_SlatePostProcessingRTTime, STATGROUP_Slate);
+DECLARE_CYCLE_STAT(TEXT("Slate ColorDeficiency RT"), STAT_SlateColorDeficiencyRTTime, STATGROUP_Slate);
 
 FSlatePostProcessor::FSlatePostProcessor()
 {
@@ -22,7 +23,6 @@ FSlatePostProcessor::~FSlatePostProcessor()
 {
 	// Note this is deleted automatically because it implements FDeferredCleanupInterface.
 	IntermediateTargets->CleanUp();
-
 }
 
 void FSlatePostProcessor::BlurRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FBlurRectParams& Params, const FPostProcessRectParams& RectParams)
@@ -56,9 +56,9 @@ void FSlatePostProcessor::BlurRect(FRHICommandListImmediate& RHICmdList, IRender
 		DownsampleRect(RHICmdList, RendererModule, RectParams, DownsampleSize);
 	}
 
-#if 1
 	FSamplerStateRHIRef BilinearClamp = TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
 
+#if 1
 	TShaderMap<FGlobalShaderType>* ShaderMap = GetGlobalShaderMap(GMaxRHIFeatureLevel);
 	check(ShaderMap);
 
@@ -190,7 +190,85 @@ void FSlatePostProcessor::BlurRect(FRHICommandListImmediate& RHICmdList, IRender
 	}
 
 #endif
-	UpsampleRect(RHICmdList, RendererModule, RectParams, DownsampleSize);
+
+	UpsampleRect(RHICmdList, RendererModule, RectParams, DownsampleSize, BilinearClamp);
+}
+
+void FSlatePostProcessor::ColorDeficiency(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& RectParams)
+{
+	SCOPE_CYCLE_COUNTER(STAT_SlateColorDeficiencyRTTime);
+
+	FIntPoint DestRectSize = RectParams.DestRect.GetSize().IntPoint();
+	FIntPoint RequiredSize = DestRectSize;
+
+	IntermediateTargets->Update(RequiredSize);
+
+#if 1
+	FSamplerStateRHIRef PointClamp = TStaticSamplerState<SF_Point, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
+
+	TShaderMap<FGlobalShaderType>* ShaderMap = GetGlobalShaderMap(GMaxRHIFeatureLevel);
+	check(ShaderMap);
+
+	TShaderMapRef<FScreenVS> VertexShader(ShaderMap);
+	TShaderMapRef<FSlatePostProcessColorDeficiencyPS> PixelShader(ShaderMap);
+
+	const int32 SrcTextureWidth = RectParams.SourceTextureSize.X;
+	const int32 SrcTextureHeight = RectParams.SourceTextureSize.Y;
+
+	const int32 DestTextureWidth = IntermediateTargets->GetWidth();
+	const int32 DestTextureHeight = IntermediateTargets->GetHeight();
+
+	const FSlateRect& SourceRect = RectParams.SourceRect;
+	const FSlateRect& DestRect = RectParams.DestRect;
+
+	FVertexDeclarationRHIRef VertexDecl = RendererModule.GetFilterVertexDeclaration().VertexDeclarationRHI;
+	check(IsValidRef(VertexDecl));
+
+	FGraphicsPipelineStateInitializer GraphicsPSOInit;
+	GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
+	GraphicsPSOInit.RasterizerState = TStaticRasterizerState<>::GetRHI();
+	GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
+
+	RHICmdList.SetScissorRect(false, 0, 0, 0, 0);
+	RHICmdList.SetViewport(0, 0, 0, DestTextureWidth, DestTextureHeight, 0.0f);
+
+	// 
+	{
+		FTexture2DRHIRef SourceTexture = RectParams.SourceTexture;
+		FTexture2DRHIRef DestTexture = IntermediateTargets->GetRenderTarget(0);
+
+		RHICmdList.TransitionResource(EResourceTransitionAccess::EReadable, SourceTexture);
+		RHICmdList.TransitionResource(EResourceTransitionAccess::EWritable, DestTexture);
+
+		SetRenderTarget(RHICmdList, DestTexture, FTextureRHIRef());
+		RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
+
+		GraphicsPSOInit.BoundShaderState.VertexDeclarationRHI = VertexDecl;
+		GraphicsPSOInit.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*VertexShader);
+		GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader);
+		GraphicsPSOInit.PrimitiveType = PT_TriangleList;
+		SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
+
+		PixelShader->SetColorRules(RHICmdList, GSlateColorDeficiencyCorrection, GSlateColorDeficiencyType, GSlateColorDeficiencySeverity);
+		PixelShader->SetShowCorrectionWithDeficiency(RHICmdList, GSlateShowColorDeficiencyCorrectionWithDeficiency);
+		PixelShader->SetTexture(RHICmdList, SourceTexture, PointClamp);
+
+		RendererModule.DrawRectangle(
+			RHICmdList,
+			0, 0,
+			RequiredSize.X, RequiredSize.Y,
+			0, 0,
+			1, 1,
+			FIntPoint(DestTextureWidth, DestTextureHeight),
+			FIntPoint(1, 1),
+			*VertexShader,
+			EDRF_Default);
+	}
+
+	const FIntPoint DownsampleSize = RequiredSize;
+	UpsampleRect(RHICmdList, RendererModule, RectParams, DownsampleSize, PointClamp);
+
+#endif
 }
 
 void FSlatePostProcessor::ReleaseRenderTargets()
@@ -277,7 +355,7 @@ void FSlatePostProcessor::DownsampleRect(FRHICommandListImmediate& RHICmdList, I
 #endif
 }
 
-void FSlatePostProcessor::UpsampleRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& Params, const FIntPoint& DownsampleSize)
+void FSlatePostProcessor::UpsampleRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& Params, const FIntPoint& DownsampleSize, FSamplerStateRHIRef& Sampler)
 {
 	SCOPED_DRAW_EVENT(RHICmdList, SlatePostProcessUpsample);
 
@@ -305,8 +383,6 @@ void FSlatePostProcessor::UpsampleRect(FRHICommandListImmediate& RHICmdList, IRe
 	TShaderMap<FGlobalShaderType>* ShaderMap = GetGlobalShaderMap(GMaxRHIFeatureLevel);
 	TShaderMapRef<FScreenVS> VertexShader(ShaderMap);
 
-	FSamplerStateRHIRef BilinearClamp = TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
-
 	RHICmdList.SetViewport(0, 0, 0, DestTextureWidth, DestTextureHeight, 0.0f);
 
 	// Perform Writable transitions first
@@ -316,7 +392,10 @@ void FSlatePostProcessor::UpsampleRect(FRHICommandListImmediate& RHICmdList, IRe
 	SetRenderTarget(RHICmdList, DestTexture, FTextureRHIRef());
 	RHICmdList.ApplyCachedRenderTargets(GraphicsPSOInit);
 
-	Params.RestoreStateFunc(RHICmdList, GraphicsPSOInit);
+	if (Params.RestoreStateFunc)
+	{
+		Params.RestoreStateFunc(RHICmdList, GraphicsPSOInit);
+	}
 
 	TShaderMapRef<FScreenPS> PixelShader(ShaderMap);
 
@@ -326,15 +405,21 @@ void FSlatePostProcessor::UpsampleRect(FRHICommandListImmediate& RHICmdList, IRe
 	GraphicsPSOInit.PrimitiveType = PT_TriangleList;
 	SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
 
-	Params.RestoreStateFuncPostPipelineState();
+	if (Params.RestoreStateFuncPostPipelineState)
+	{
+		Params.RestoreStateFuncPostPipelineState();
+	}
 
-	PixelShader->SetParameters(RHICmdList, BilinearClamp, SrcTexture);
+	PixelShader->SetParameters(RHICmdList, Sampler, SrcTexture);
+
+	const float SizeU = (DownsampledWidth == SrcTextureWidth) ? 1.0f : (DownsampledWidth / (float)SrcTextureWidth) - (1.0f / (float)SrcTextureWidth);
+	const float SizeV = (DownsampledHeight == SrcTextureHeight) ? 1.0f : (DownsampledHeight / (float)SrcTextureHeight) - (1.0f / (float)SrcTextureHeight);
 
 	RendererModule.DrawRectangle(RHICmdList,
 		DestRect.Left, DestRect.Top,
 		DestRect.Right - DestRect.Left, DestRect.Bottom - DestRect.Top,
 		0, 0,
-		(float)DownsampledWidth/SrcTextureWidth-1.0/ SrcTextureWidth, (float)DownsampledHeight/SrcTextureHeight-1.0 / SrcTextureHeight,
+		SizeU, SizeV,
 		Params.SourceTextureSize,
 		FIntPoint(1, 1),
 		*VertexShader,
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.h
index 2718da0509b1..36e06358983e 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlatePostProcessor.h
@@ -33,10 +33,14 @@ public:
 	~FSlatePostProcessor();
 
 	void BlurRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FBlurRectParams& Params, const FPostProcessRectParams& RectParams);
+	
+	void ColorDeficiency(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& RectParams);
+	
 	void ReleaseRenderTargets();
+
 private:
 	void DownsampleRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& Params, const FIntPoint& DownsampleSize);
-	void UpsampleRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& Params, const FIntPoint& DownsampleSize);
+	void UpsampleRect(FRHICommandListImmediate& RHICmdList, IRendererModule& RendererModule, const FPostProcessRectParams& Params, const FIntPoint& DownsampleSize, FSamplerStateRHIRef& Sampler);
 	int32 ComputeBlurWeights(int32 KernelSize, float StdDev, TArray<FVector4>& OutWeightsAndOffsets);
 private:
 	FSlatePostProcessResource* IntermediateTargets;
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.cpp
index ed5d2979c6b7..8fd9392ce757 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.cpp
@@ -24,7 +24,9 @@
 #include "Runtime/Renderer/Public/VolumeRendering.h"
 #include "ShaderCompiler.h"
 #include "PipelineStateCache.h"
-
+#include "EngineModule.h"
+#include "Interfaces/ISlate3DRenderer.h"
+#include "Slate/SlateTextureAtlasInterface.h"
 
 DECLARE_CYCLE_STAT(TEXT("Slate RT: Rendering"), STAT_SlateRenderingRTTime, STATGROUP_Slate);
 DECLARE_CYCLE_STAT(TEXT("Slate RT: Create Batches"), STAT_SlateRTCreateBatches, STATGROUP_Slate);
@@ -64,14 +66,14 @@ TAutoConsoleVariable<int32> CVarShowSlateOverdraw(
 	0,
 	TEXT("0: Don't show overdraw, 1: Show Overdraw"),
 	ECVF_Default
-		);
+);
 
 TAutoConsoleVariable<int32> CVarShowSlateBatching(
 	TEXT("Slate.ShowBatching"),
 	0,
 	TEXT("0: Don't show batching, 1: Show Batching"),
 	ECVF_Default
-			);
+);
 #endif
 
 void FSlateRHIRenderer::FViewportInfo::InitRHI()
@@ -84,7 +86,7 @@ void FSlateRHIRenderer::FViewportInfo::InitRHI()
 void FSlateRHIRenderer::FViewportInfo::ReleaseRHI()
 {
 	DepthStencil.SafeRelease();
-	ViewportRHI.SafeRelease();	
+	ViewportRHI.SafeRelease();
 }
 
 void FSlateRHIRenderer::FViewportInfo::ConditionallyUpdateDepthBuffer(bool bInRequiresStencilTest, uint32 InWidth, uint32 InHeight)
@@ -92,20 +94,20 @@ void FSlateRHIRenderer::FViewportInfo::ConditionallyUpdateDepthBuffer(bool bInRe
 	FViewportInfo* ViewportInfo = this;
 	ENQUEUE_RENDER_COMMAND(UpdateDepthBufferCommand)(
 		[ViewportInfo, bInRequiresStencilTest, InWidth, InHeight](FRHICommandListImmediate& RHICmdList)
-		{
-			bool bDepthStencilStale =
-				bInRequiresStencilTest &&
-				(!ViewportInfo->bRequiresStencilTest ||
-				 ( ViewportInfo->DepthStencil.IsValid() && ( ViewportInfo->DepthStencil->GetSizeX() != InWidth || ViewportInfo->DepthStencil->GetSizeY() != InHeight ) )
+	{
+		bool bDepthStencilStale =
+			bInRequiresStencilTest &&
+			(!ViewportInfo->bRequiresStencilTest ||
+			(ViewportInfo->DepthStencil.IsValid() && (ViewportInfo->DepthStencil->GetSizeX() != InWidth || ViewportInfo->DepthStencil->GetSizeY() != InHeight))
 				);
 
-			// Allocate a stencil buffer if needed and not already allocated
-			if ( bDepthStencilStale )
-			{
-				ViewportInfo->bRequiresStencilTest = bInRequiresStencilTest;
-				ViewportInfo->RecreateDepthBuffer_RenderThread();
-			}
+		// Allocate a stencil buffer if needed and not already allocated
+		if (bDepthStencilStale)
+		{
+			ViewportInfo->bRequiresStencilTest = bInRequiresStencilTest;
+			ViewportInfo->RecreateDepthBuffer_RenderThread();
 		}
+	}
 	);
 }
 
@@ -114,17 +116,17 @@ void FSlateRHIRenderer::FViewportInfo::RecreateDepthBuffer_RenderThread()
 	check(IsInRenderingThread());
 	DepthStencil.SafeRelease();
 	if (bRequiresStencilTest)
-	{		
+	{
 		FTexture2DRHIRef ShaderResourceUnused;
 		FRHIResourceCreateInfo CreateInfo(FClearValueBinding::DepthZero);
-		RHICreateTargetableShaderResource2D( Width, Height, PF_DepthStencil, 1, TexCreate_None, TexCreate_DepthStencilTargetable, false, CreateInfo, DepthStencil, ShaderResourceUnused );
-		check( IsValidRef(DepthStencil) );
+		RHICreateTargetableShaderResource2D(Width, Height, PF_DepthStencil, 1, TexCreate_None, TexCreate_DepthStencilTargetable, false, CreateInfo, DepthStencil, ShaderResourceUnused);
+		check(IsValidRef(DepthStencil));
 	}
 }
 
 
 
-FSlateRHIRenderer::FSlateRHIRenderer( TSharedRef<FSlateFontServices> InSlateFontServices, TSharedRef<FSlateRHIResourceManager> InResourceManager )
+FSlateRHIRenderer::FSlateRHIRenderer(TSharedRef<FSlateFontServices> InSlateFontServices, TSharedRef<FSlateRHIResourceManager> InResourceManager)
 	: FSlateRenderer(InSlateFontServices)
 	, EnqueuedWindowDrawBuffer(NULL)
 	, FreeBufferIndex(0)
@@ -133,10 +135,10 @@ FSlateRHIRenderer::FSlateRHIRenderer( TSharedRef<FSlateFontServices> InSlateFont
 {
 	ResourceManager = InResourceManager;
 
-	ViewMatrix = FMatrix(	FPlane(1,	0,	0,	0),
-							FPlane(0,	1,	0,	0),
-							FPlane(0,	0,	1,  0),
-							FPlane(0,	0,	0,	1));
+	ViewMatrix = FMatrix(FPlane(1, 0, 0, 0),
+		FPlane(0, 1, 0, 0),
+		FPlane(0, 0, 1, 0),
+		FPlane(0, 0, 0, 1));
 
 	bTakingAScreenShot = false;
 	OutScreenshotData = NULL;
@@ -157,21 +159,21 @@ FMatrix FSlateRHIRenderer::CreateProjectionMatrix(uint32 Width, uint32 Height)
 	const float ZFar = 100.0f;
 	return AdjustProjectionMatrixForRHI(
 		FMatrix(
-		FPlane(2.0f / (Right - Left), 0, 0, 0),
-		FPlane(0, 2.0f / (Top - Bottom), 0, 0),
-		FPlane(0, 0, 1 / (ZNear - ZFar), 0),
-		FPlane((Left + Right) / (Left - Right), (Top + Bottom) / (Bottom - Top), ZNear / (ZNear - ZFar), 1)
+			FPlane(2.0f / (Right - Left), 0, 0, 0),
+			FPlane(0, 2.0f / (Top - Bottom), 0, 0),
+			FPlane(0, 0, 1 / (ZNear - ZFar), 0),
+			FPlane((Left + Right) / (Left - Right), (Top + Bottom) / (Bottom - Top), ZNear / (ZNear - ZFar), 1)
 		)
-		);
+	);
 }
 
 bool FSlateRHIRenderer::Initialize()
 {
 	LoadUsedTextures();
 
-	RenderingPolicy = MakeShareable( new FSlateRHIRenderingPolicy( SlateFontServices.ToSharedRef(), ResourceManager.ToSharedRef() ) );
+	RenderingPolicy = MakeShareable(new FSlateRHIRenderingPolicy(SlateFontServices.ToSharedRef(), ResourceManager.ToSharedRef()));
 
-	ElementBatcher = MakeShareable( new FSlateElementBatcher( RenderingPolicy.ToSharedRef() ) );
+	ElementBatcher = MakeShareable(new FSlateElementBatcher(RenderingPolicy.ToSharedRef()));
 
 	CurrentSceneIndex = -1;
 	ActiveScenes.Empty();
@@ -184,26 +186,29 @@ void FSlateRHIRenderer::Destroy()
 	ResourceManager->ReleaseResources();
 	SlateFontServices->ReleaseResources();
 
-	for( TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It )
+	for (TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It)
 	{
-		BeginReleaseResource( It.Value() );
+		BeginReleaseResource(It.Value());
 	}
-	
+
 
 	FlushRenderingCommands();
-	
-	check( ElementBatcher.IsUnique() );
+
+
+	check(ElementBatcher.IsUnique());
 	ElementBatcher.Reset();
 	RenderingPolicy.Reset();
 	ResourceManager.Reset();
 	SlateFontServices.Reset();
 
-	for( TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It )
+	DeferredUpdateContexts.Empty();
+
+	for (TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It)
 	{
 		FViewportInfo* ViewportInfo = It.Value();
 		delete ViewportInfo;
 	}
-	
+
 	WindowToViewportInfo.Empty();
 	CurrentSceneIndex = -1;
 	ActiveScenes.Empty();
@@ -213,10 +218,10 @@ void FSlateRHIRenderer::Destroy()
 FSlateDrawBuffer& FSlateRHIRenderer::GetDrawBuffer()
 {
 	FreeBufferIndex = (FreeBufferIndex + 1) % NumDrawBuffers;
-	
+
 	FSlateDrawBuffer* Buffer = &DrawBuffers[FreeBufferIndex];
-	
-	while( !Buffer->Lock() )
+
+	while (!Buffer->Lock())
 	{
 		// If the buffer cannot be locked then the buffer is still in use.  If we are here all buffers are in use
 		// so wait until one is free.
@@ -233,7 +238,7 @@ FSlateDrawBuffer& FSlateRHIRenderer::GetDrawBuffer()
 			UE_LOG(LogSlate, Warning, TEXT("Slate: Had to block on waiting for a draw buffer"));
 			FreeBufferIndex = (FreeBufferIndex + 1) % NumDrawBuffers;
 		}
-	
+
 
 		Buffer = &DrawBuffers[FreeBufferIndex];
 	}
@@ -246,11 +251,11 @@ FSlateDrawBuffer& FSlateRHIRenderer::GetDrawBuffer()
 	return *Buffer;
 }
 
-void FSlateRHIRenderer::CreateViewport( const TSharedRef<SWindow> Window )
+void FSlateRHIRenderer::CreateViewport(const TSharedRef<SWindow> Window)
 {
 	FlushRenderingCommands();
 
-	if( !WindowToViewportInfo.Contains( &Window.Get() ) )
+	if (!WindowToViewportInfo.Contains(&Window.Get()))
 	{
 		const FVector2D WindowSize = Window->GetViewportSize();
 
@@ -281,7 +286,7 @@ void FSlateRHIRenderer::CreateViewport( const TSharedRef<SWindow> Window )
 			NewInfo->PixelFormat = PF_B8G8R8A8;
 		}
 #if ALPHA_BLENDED_WINDOWS		
-		if( Window->GetTransparencySupport() == EWindowTransparency::PerPixel )
+		if (Window->GetTransparencySupport() == EWindowTransparency::PerPixel)
 		{
 			NewInfo->PixelFormat = PF_B8G8R8A8;
 		}
@@ -289,7 +294,7 @@ void FSlateRHIRenderer::CreateViewport( const TSharedRef<SWindow> Window )
 
 		// SDR format holds the requested format in non HDR mode
 		NewInfo->SDRPixelFormat = NewInfo->PixelFormat;
-		if ( IsHDREnabled() )
+		if (IsHDREnabled())
 		{
 			NewInfo->PixelFormat = GRHIHDRDisplayOutputFormat;
 		}
@@ -301,15 +306,15 @@ void FSlateRHIRenderer::CreateViewport( const TSharedRef<SWindow> Window )
 		NewInfo->ViewportRHI = RHICreateViewport( NewInfo->OSWindow, Width, Height, bFullscreen, NewInfo->PixelFormat );
 		NewInfo->bFullscreen = bFullscreen;
 
-		WindowToViewportInfo.Add( &Window.Get(), NewInfo );
+		WindowToViewportInfo.Add(&Window.Get(), NewInfo);
 
-		BeginInitResource( NewInfo );
+		BeginInitResource(NewInfo);
 	}
 }
 
-void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint32 Width, uint32 Height, bool bFullscreen )
+void FSlateRHIRenderer::ConditionalResizeViewport(FViewportInfo* ViewInfo, uint32 Width, uint32 Height, bool bFullscreen)
 {
-	checkSlow( IsThreadSafeForSlateRendering() );
+	checkSlow(IsThreadSafeForSlateRendering());
 
 	// Force update if HDR output state changes
 	static const auto CVarHDRColorGamut = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.HDR.Display.ColorGamut"));
@@ -323,12 +328,12 @@ void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint
 		((ViewInfo->PixelFormat == GRHIHDRDisplayOutputFormat) != bHDREnabled)	// HDR toggled
 #if PLATFORM_WINDOWS
 		|| ((IsRHIDeviceNVIDIA() || IsRHIDeviceAMD()) &&						// Vendor-specific mastering data updates
-			((bHDREnabled && ViewInfo->HDRColorGamut != HDRColorGamut)			// Color gamut changed
+		((bHDREnabled && ViewInfo->HDRColorGamut != HDRColorGamut)			// Color gamut changed
 			|| (bHDREnabled && ViewInfo->HDROutputDevice != HDROutputDevice)))	// Output device changed
 #endif
 		);
 
-	if( IsInGameThread() && !IsInSlateThread() && ViewInfo && ( bHDRStale || ViewInfo->Height != Height || ViewInfo->Width != Width ||  ViewInfo->bFullscreen != bFullscreen || !IsValidRef(ViewInfo->ViewportRHI) ) )
+	if (IsInGameThread() && !IsInSlateThread() && ViewInfo && (bHDRStale || ViewInfo->Height != Height || ViewInfo->Width != Width || ViewInfo->bFullscreen != bFullscreen || !IsValidRef(ViewInfo->ViewportRHI)))
 	{
 		// The viewport size we have doesn't match the requested size of the viewport.
 		// Resize it now.
@@ -342,8 +347,8 @@ void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint
 
 		// Windows are allowed to be zero sized ( sometimes they are animating to/from zero for example)
 		// but viewports cannot be zero sized.  Use 8x8 as a reasonably sized viewport in this case.
-		uint32 NewWidth = FMath::Max<uint32>( 8, Width );
-		uint32 NewHeight = FMath::Max<uint32>( 8, Height );
+		uint32 NewWidth = FMath::Max<uint32>(8, Width);
+		uint32 NewHeight = FMath::Max<uint32>(8, Height);
 
 		// Sanity check dimensions
 		if (NewWidth > MAX_VIEWPORT_SIZE)
@@ -362,7 +367,7 @@ void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint
 		ViewInfo->Height = NewHeight;
 		ViewInfo->DesiredWidth = NewWidth;
 		ViewInfo->DesiredHeight = NewHeight;
-		ViewInfo->ProjectionMatrix = CreateProjectionMatrix( NewWidth, NewHeight );
+		ViewInfo->ProjectionMatrix = CreateProjectionMatrix(NewWidth, NewHeight);
 		ViewInfo->bFullscreen = bFullscreen;
 
 		ViewInfo->PixelFormat = bHDREnabled ? GRHIHDRDisplayOutputFormat : ViewInfo->SDRPixelFormat;
@@ -370,7 +375,7 @@ void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint
 		ViewInfo->HDROutputDevice = HDROutputDevice;
 
 		PreResizeBackBufferDelegate.Broadcast(&ViewInfo->ViewportRHI);
-		if( IsValidRef( ViewInfo->ViewportRHI ) )
+		if (IsValidRef(ViewInfo->ViewportRHI))
 		{
 			ensureMsgf(ViewInfo->ViewportRHI->GetRefCount() == 1, TEXT("Viewport backbuffer was not properly released"));
 			RHIResizeViewport(ViewInfo->ViewportRHI, NewWidth, NewHeight, bFullscreen, ViewInfo->PixelFormat);
@@ -381,37 +386,37 @@ void FSlateRHIRenderer::ConditionalResizeViewport( FViewportInfo* ViewInfo, uint
 		}
 
 		PostResizeBackBufferDelegate.Broadcast(&ViewInfo->ViewportRHI);
-		
+
 		// Reset texture streaming texture updates.
 		ResumeTextureStreamingRenderTasks();
 	}
 }
 
-void FSlateRHIRenderer::UpdateFullscreenState( const TSharedRef<SWindow> Window, uint32 OverrideResX, uint32 OverrideResY )
+void FSlateRHIRenderer::UpdateFullscreenState(const TSharedRef<SWindow> Window, uint32 OverrideResX, uint32 OverrideResY)
 {
-	FViewportInfo* ViewInfo = WindowToViewportInfo.FindRef( &Window.Get() );
+	FViewportInfo* ViewInfo = WindowToViewportInfo.FindRef(&Window.Get());
 
-	if( !ViewInfo )
+	if (!ViewInfo)
 	{
-		CreateViewport( Window );
+		CreateViewport(Window);
 	}
 
-	ViewInfo = WindowToViewportInfo.FindRef( &Window.Get() );
+	ViewInfo = WindowToViewportInfo.FindRef(&Window.Get());
 
-	if( ViewInfo )
+	if (ViewInfo)
 	{
-		const bool bFullscreen = IsViewportFullscreen( *Window );
-		
+		const bool bFullscreen = IsViewportFullscreen(*Window);
+
 		uint32 ResX = OverrideResX ? OverrideResX : GSystemResolution.ResX;
 		uint32 ResY = OverrideResY ? OverrideResY : GSystemResolution.ResY;
 
-		if( (GIsEditor && Window->IsViewportSizeDrivenByWindow()) || (Window->GetWindowMode() == EWindowMode::WindowedFullscreen))
+		if ((GIsEditor && Window->IsViewportSizeDrivenByWindow()) || (Window->GetWindowMode() == EWindowMode::WindowedFullscreen))
 		{
 			ResX = ViewInfo->DesiredWidth;
 			ResY = ViewInfo->DesiredHeight;
 		}
 
-		ConditionalResizeViewport( ViewInfo, ResX, ResY, bFullscreen );
+		ConditionalResizeViewport(ViewInfo, ResX, ResY, bFullscreen);
 	}
 }
 
@@ -436,35 +441,35 @@ void FSlateRHIRenderer::RestoreSystemResolution(const TSharedRef<SWindow> InWind
 }
 
 /** Called when a window is destroyed to give the renderer a chance to free resources */
-void FSlateRHIRenderer::OnWindowDestroyed( const TSharedRef<SWindow>& InWindow )
+void FSlateRHIRenderer::OnWindowDestroyed(const TSharedRef<SWindow>& InWindow)
 {
 	checkSlow(IsThreadSafeForSlateRendering());
 
-	FViewportInfo** ViewportInfoPtr = WindowToViewportInfo.Find( &InWindow.Get() );
-	if( ViewportInfoPtr )
+	FViewportInfo** ViewportInfoPtr = WindowToViewportInfo.Find(&InWindow.Get());
+	if (ViewportInfoPtr)
 	{
 		OnSlateWindowDestroyedDelegate.Broadcast(&(*ViewportInfoPtr)->ViewportRHI);
 
 		// Need to flush rendering commands as the viewport may be in use by the render thread
 		// and the rendering resources must be released on the render thread before the viewport can be deleted
 		FlushRenderingCommands();
-		
+
 		BeginReleaseResource(*ViewportInfoPtr);
 
 		// Need to flush rendering commands as the viewport may be in use by the render thread
 		// and the rendering resources must be released on the render thread before the viewport can be deleted
 		FlushRenderingCommands(true /* bFlushDeferredDeletes */);
-	
+
 		delete *ViewportInfoPtr;
 	}
 
-	WindowToViewportInfo.Remove( &InWindow.Get() );
+	WindowToViewportInfo.Remove(&InWindow.Get());
 }
 
 // Limited platform support for HDR UI composition
 bool SupportsUICompositionRendering(const EShaderPlatform Platform)
 {
-	return IsFeatureLevelSupported(Platform,ERHIFeatureLevel::SM5) && (RHISupportsGeometryShaders(Platform) || RHISupportsVertexShaderLayer(Platform));
+	return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::SM5) && (RHISupportsGeometryShaders(Platform) || RHISupportsVertexShaderLayer(Platform));
 }
 
 // Pixel shader to generate LUT for HDR UI composition
@@ -500,7 +505,7 @@ public:
 		{
 			Gamma = 2.2f;
 		}
-	
+
 		if (Gamma > 0.0f)
 		{
 			// Enforce user-controlled ramp over sRGB or Rec709
@@ -534,7 +539,7 @@ private:
 	FShaderParameter OutputGamut;
 };
 
-IMPLEMENT_SHADER_TYPE(,FCompositeLUTGenerationPS,TEXT("/Engine/Private/CompositeUIPixelShader.usf"),TEXT("GenerateLUTPS"),SF_Pixel);
+IMPLEMENT_SHADER_TYPE(, FCompositeLUTGenerationPS, TEXT("/Engine/Private/CompositeUIPixelShader.usf"), TEXT("GenerateLUTPS"), SF_Pixel);
 
 // Pixel shader to composite UI over HDR buffer
 template<uint32 EncodingType>
@@ -584,7 +589,7 @@ public:
 		bool bShaderHasOutdatedParameters = FGlobalShader::Serialize(Ar);
 		Ar << UITexture << UISampler;
 		Ar << SceneTexture << SceneSampler;
-		Ar << ColorSpaceLUT <<  ColorSpaceLUTSampler;
+		Ar << ColorSpaceLUT << ColorSpaceLUTSampler;
 		Ar << UILevel << OutputDevice;
 		return bShaderHasOutdatedParameters;
 	}
@@ -629,7 +634,11 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 		// Should only be called by the rendering thread
 		check(IsInRenderingThread());
 
+		// Any window that draws should be reporting referenced UObjects for the duration of the frame.
+		check(WindowElementList.ShouldReportUObjectReferences());
+
 		FMaterialRenderProxy::UpdateDeferredCachedUniformExpressions();
+		GetRendererModule().InitializeSystemTextures(RHICmdList);
 
 		// Optional off-screen UI composition during HDR rendering
 		static const auto CVarCompositeMode = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.HDR.UI.CompositeMode"));
@@ -652,7 +661,7 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 
 		ViewportInfo.ColorSpaceLUTOutputDevice = HDROutputDevice;
 		ViewportInfo.ColorSpaceLUTOutputGamut = HDROutputGamut;
-	
+
 		bool bRenderedStereo = false;
 		if (CVarDrawToVRRenderTarget->GetInt() == 0 && GEngine && IsValidRef(ViewportInfo.GetRenderTargetTexture()) && GEngine->StereoRenderingDevice.IsValid())
 		{
@@ -663,7 +672,7 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 
 		{
 			SCOPED_GPU_STAT(RHICmdList, SlateUI);
-			SCOPE_CYCLE_COUNTER( STAT_SlateRenderingRTTime );
+			SCOPE_CYCLE_COUNTER(STAT_SlateRenderingRTTime);
 
 			FSlateBatchData& BatchData = WindowElementList.GetBatchData();
 			FElementBatchMap& RootBatchMap = WindowElementList.GetRootDrawLayer().GetElementBatchMap();
@@ -684,14 +693,14 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 			}
 
 			// should have been created by the game thread
-			check( IsValidRef(ViewportInfo.ViewportRHI) );
+			check(IsValidRef(ViewportInfo.ViewportRHI));
 
 			FTexture2DRHIRef ViewportRT = bRenderedStereo ? nullptr : ViewportInfo.GetRenderTargetTexture();
 			FTexture2DRHIRef BackBuffer = (ViewportRT) ? ViewportRT : RHICmdList.GetViewportBackBuffer(ViewportInfo.ViewportRHI);
-		
+
 			const uint32 ViewportWidth = (ViewportRT) ? ViewportRT->GetSizeX() : ViewportInfo.Width;
 			const uint32 ViewportHeight = (ViewportRT) ? ViewportRT->GetSizeY() : ViewportInfo.Height;
-		
+
 			// Check to see that targets are up-to-date
 			if (bCompositeUI && (!ViewportInfo.UITargetRT || ViewportInfo.UITargetRT->GetSizeX() != ViewportWidth || ViewportInfo.UITargetRT->GetSizeY() != ViewportHeight))
 			{
@@ -720,65 +729,64 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 				FResolveParams ResolveParams;
 				bClear = true; // Force a clear of the UI buffer to black
 
-				// Grab HDR backbuffer
+							   // Grab HDR backbuffer
 				RHICmdList.CopyToResolveTarget(FinalBuffer, ViewportInfo.HDRSourceRT, ResolveParams);
 
 				// UI backbuffer is temp target
 				BackBuffer = ViewportInfo.UITargetRT;
 			}
 
-			if (SlateWireFrame)
-			{
-				bClear = true;
-			}
+		if (SlateWireFrame)
+		{
+			bClear = true;
+		}
 
-			RHICmdList.BeginDrawingViewport( ViewportInfo.ViewportRHI, FTextureRHIRef() );
-			RHICmdList.SetViewport(0, 0, 0, ViewportWidth, ViewportHeight, 0.0f);
-			RHICmdList.TransitionResource(EResourceTransitionAccess::EWritable, BackBuffer);
+		RHICmdList.BeginDrawingViewport( ViewportInfo.ViewportRHI, FTextureRHIRef() );
+		RHICmdList.SetViewport(0, 0, 0, ViewportWidth, ViewportHeight, 0.0f);
+		RHICmdList.TransitionResource(EResourceTransitionAccess::EWritable, BackBuffer);
 	
-			if( ViewportInfo.bRequiresStencilTest )
+		if (ViewportInfo.bRequiresStencilTest)
+		{
+			check(IsValidRef(ViewportInfo.DepthStencil));
+	
+			// Reset the backbuffer as our color render target and also set a depth stencil buffer
+			FRHIRenderTargetView ColorView(BackBuffer, 0, -1, bClear ? ERenderTargetLoadAction::EClear : ERenderTargetLoadAction::ELoad, ERenderTargetStoreAction::EStore);
+			FRHIDepthRenderTargetView DepthStencilView(ViewportInfo.DepthStencil, ERenderTargetLoadAction::ENoAction, ERenderTargetStoreAction::ENoAction, ERenderTargetLoadAction::ENoAction, ERenderTargetStoreAction::EStore);
+			FRHISetRenderTargetsInfo Info(1, &ColorView, DepthStencilView);
+	
+			// Clear the stencil buffer
+			RHICmdList.SetRenderTargetsAndClear(Info);
+		}
+		else
+		{
+			SetRenderTarget(RHICmdList, BackBuffer, FTextureRHIRef(), bClear ? ESimpleRenderTargetMode::EClearColorAndDepth : ESimpleRenderTargetMode::EExistingColorAndDepth);
+		}
+
+#if WITH_SLATE_VISUALIZERS
+		if (CVarShowSlateBatching.GetValueOnRenderThread() != 0 || CVarShowSlateOverdraw.GetValueOnRenderThread() != 0)
+		{
+			if (ViewportInfo.bRequiresStencilTest)
 			{
-				check(IsValidRef( ViewportInfo.DepthStencil ));
-	
 				// Reset the backbuffer as our color render target and also set a depth stencil buffer
-				FRHIRenderTargetView ColorView(BackBuffer, 0, -1, bClear ? ERenderTargetLoadAction::EClear : ERenderTargetLoadAction::ELoad, ERenderTargetStoreAction::EStore);
-					FRHIDepthRenderTargetView DepthStencilView(ViewportInfo.DepthStencil, ERenderTargetLoadAction::ENoAction, ERenderTargetStoreAction::ENoAction, ERenderTargetLoadAction::ENoAction, ERenderTargetStoreAction::EStore);
-					FRHISetRenderTargetsInfo Info(1, &ColorView, DepthStencilView);
-	
-				// Clear the stencil buffer
+				FRHIRenderTargetView ColorView(BackBuffer, 0, -1, ERenderTargetLoadAction::EClear, ERenderTargetStoreAction::EStore);
+				FRHISetRenderTargetsInfo Info(1, &ColorView, FRHIDepthRenderTargetView(ViewportInfo.DepthStencil, ERenderTargetLoadAction::ELoad, ERenderTargetStoreAction::EStore, ERenderTargetLoadAction::EClear, ERenderTargetStoreAction::EStore));
 				RHICmdList.SetRenderTargetsAndClear(Info);
 			}
 			else
 			{
-				SetRenderTarget(RHICmdList, BackBuffer, FTextureRHIRef(), bClear ? ESimpleRenderTargetMode::EClearColorAndDepth : ESimpleRenderTargetMode::EExistingColorAndDepth);
-			}
-
-
-#if WITH_SLATE_VISUALIZERS
-			if (CVarShowSlateBatching.GetValueOnRenderThread() != 0 || CVarShowSlateOverdraw.GetValueOnRenderThread() != 0)
-			{
-				if (ViewportInfo.bRequiresStencilTest)
-				{
-					// Reset the backbuffer as our color render target and also set a depth stencil buffer
-					FRHIRenderTargetView ColorView(BackBuffer, 0, -1, ERenderTargetLoadAction::EClear, ERenderTargetStoreAction::EStore);
-					FRHISetRenderTargetsInfo Info(1, &ColorView, FRHIDepthRenderTargetView(ViewportInfo.DepthStencil, ERenderTargetLoadAction::ELoad, ERenderTargetStoreAction::EStore, ERenderTargetLoadAction::EClear, ERenderTargetStoreAction::EStore));
-					RHICmdList.SetRenderTargetsAndClear(Info);
-				}
-				else
-				{
-					SetRenderTarget(RHICmdList, BackBuffer, FTextureRHIRef(), ESimpleRenderTargetMode::EClearColorAndDepth);
-				}
+				SetRenderTarget(RHICmdList, BackBuffer, FTextureRHIRef(), ESimpleRenderTargetMode::EClearColorAndDepth);
 			}
+		}
 #endif
 
-		if( BatchData.GetRenderBatches().Num() > 0 )
+			if (BatchData.GetRenderBatches().Num() > 0)
 			{
 				SCOPE_CYCLE_COUNTER(STAT_SlateRTDrawBatches);
 
-			FSlateBackBuffer BackBufferTarget( BackBuffer, FIntPoint( ViewportWidth, ViewportHeight ) );
+				FSlateBackBuffer BackBufferTarget(BackBuffer, FIntPoint(ViewportWidth, ViewportHeight));
 
-			FSlateRenderingOptions DrawOptions(ViewMatrix * ViewportInfo.ProjectionMatrix);
-			DrawOptions.bWireFrame = !!SlateWireFrame;
+				FSlateRenderingOptions DrawOptions(ViewMatrix * ViewportInfo.ProjectionMatrix);
+				DrawOptions.bWireFrame = !!SlateWireFrame;
 
 				RenderingPolicy->DrawElements
 				(
@@ -825,7 +833,7 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 					SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit);
 
 					VertexShader->SetParameters(RHICmdList, VolumeBounds, FIntVector(VolumeBounds.MaxX - VolumeBounds.MinX));
-					if(GeometryShader.IsValid())
+					if (GeometryShader.IsValid())
 					{
 						GeometryShader->SetParameters(RHICmdList, VolumeBounds.MinZ);
 					}
@@ -902,20 +910,30 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 			RHICmdList.TransitionResource(EResourceTransitionAccess::EReadable, BackBuffer);
 		}
 	}
+
+	if (bTakingAScreenShot)
+	{
+		// take screenshot before swapbuffer
+		FTexture2DRHIRef BackBuffer = RHICmdList.GetViewportBackBuffer(ViewportInfo.ViewportRHI);
+		RHICmdList.ReadSurfaceData(BackBuffer, ScreenshotRect, *OutScreenshotData, FReadSurfaceDataFlags());
+		bTakingAScreenShot = false;
+		OutScreenshotData = NULL;
+	}
+
 	// Calculate renderthread time (excluding idle time).	
-	uint32 StartTime		= FPlatformTime::Cycles();
+	uint32 StartTime = FPlatformTime::Cycles();
 
 	RHICmdList.EndDrawingViewport(ViewportInfo.ViewportRHI, true, bLockToVsync);
 
-	uint32 EndTime		= FPlatformTime::Cycles();
+	uint32 EndTime = FPlatformTime::Cycles();
 
-	GSwapBufferTime		= EndTime - StartTime;
+	GSwapBufferTime = EndTime - StartTime;
 	SET_CYCLE_COUNTER(STAT_PresentTime, GSwapBufferTime);
 
-	uint32 ThreadTime	= EndTime - LastTimestamp;
-	LastTimestamp		= EndTime;
+	uint32 ThreadTime = EndTime - LastTimestamp;
+	LastTimestamp = EndTime;
 
-	uint32 RenderThreadIdle = 0;	
+	uint32 RenderThreadIdle = 0;
 
 	FThreadIdleStats& RenderThread = FThreadIdleStats::Get();
 	GRenderThreadIdle[ERenderThreadIdleTypes::WaitingForAllOtherSleep] = RenderThread.Waits;
@@ -934,11 +952,22 @@ void FSlateRHIRenderer::DrawWindow_RenderThread(FRHICommandListImmediate& RHICmd
 		GRenderThreadNumIdle[Index] = 0;
 	}
 
-	SET_CYCLE_COUNTER(STAT_RenderingIdleTime, RenderThreadIdle);	
-	GRenderThreadTime	= (ThreadTime > RenderThreadIdle) ? (ThreadTime - RenderThreadIdle) : ThreadTime;
+	SET_CYCLE_COUNTER(STAT_RenderingIdleTime, RenderThreadIdle);
+	GRenderThreadTime = (ThreadTime > RenderThreadIdle) ? (ThreadTime - RenderThreadIdle) : ThreadTime;
+
+	RHICmdList.EnqueueLambda([](FRHICommandListImmediate&)
+	{
+		uint32 NewVal = GWorkingRHIThreadTime - GWorkingRHIThreadStallTime;
+		FPlatformAtomics::AtomicStore((int32*)&GRHIThreadTime, (int32)NewVal);
+		GWorkingRHIThreadTime = 0;
+		GWorkingRHIThreadStallTime = 0;
+	});
+
+	// Any window that draws should be reporting referenced UObjects for the duration of the frame.
+	check(WindowElementList.ShouldReportUObjectReferences());
 }
 
-void FSlateRHIRenderer::DrawWindows( FSlateDrawBuffer& WindowDrawBuffer )
+void FSlateRHIRenderer::DrawWindows(FSlateDrawBuffer& WindowDrawBuffer)
 {
 	DrawWindows_Private(WindowDrawBuffer);
 }
@@ -953,22 +982,22 @@ void FSlateRHIRenderer::PrepareToTakeScreenshot(const FIntRect& Rect, TArray<FCo
 	OutScreenshotData = OutColorData;
 }
 
-/** 
- * Creates necessary resources to render a window and sends draw commands to the rendering thread
- *
- * @param WindowDrawBuffer	The buffer containing elements to draw 
- */
-void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer )
+/**
+* Creates necessary resources to render a window and sends draw commands to the rendering thread
+*
+* @param WindowDrawBuffer	The buffer containing elements to draw
+*/
+void FSlateRHIRenderer::DrawWindows_Private(FSlateDrawBuffer& WindowDrawBuffer)
 {
-	checkSlow( IsThreadSafeForSlateRendering() );
+	checkSlow(IsThreadSafeForSlateRendering());
 
 
 	FSlateRHIRenderingPolicy* Policy = RenderingPolicy.Get();
 	ENQUEUE_RENDER_COMMAND(SlateBeginDrawingWindowsCommand)(
 		[Policy](FRHICommandListImmediate& RHICmdList)
-		{
-			Policy->BeginDrawingWindows();
-		}
+	{
+		Policy->BeginDrawingWindows();
+	}
 	);
 
 	// Update texture atlases if needed and safe
@@ -981,19 +1010,19 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 
 	// Iterate through each element list and set up an RHI window for it if needed
 	const TArray<TSharedRef<FSlateWindowElementList>>& WindowElementLists = WindowDrawBuffer.GetWindowElementLists();
-	for( int32 ListIndex = 0; ListIndex < WindowElementLists.Num(); ++ListIndex )
+	for (int32 ListIndex = 0; ListIndex < WindowElementLists.Num(); ++ListIndex)
 	{
 		FSlateWindowElementList& ElementList = *WindowElementLists[ListIndex];
 
 		SWindow* Window = ElementList.GetRenderWindow();
 
-		if( Window )
+		if (Window)
 		{
 			const FVector2D WindowSize = Window->GetViewportSize();
-			if ( WindowSize.X > 0 && WindowSize.Y > 0 )
+			if (WindowSize.X > 0 && WindowSize.Y > 0)
 			{
 				// Add all elements for this window to the element batcher
-				ElementBatcher->AddElements( ElementList );
+				ElementBatcher->AddElements(ElementList);
 
 				// Update the font cache with new text after elements are batched
 				FontCache->UpdateCache();
@@ -1002,7 +1031,7 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 				bool bRequiresStencilTest = ElementList.GetBatchData().IsStencilClippingRequired();
 
 				bool bForceVsyncFromCVar = false;
-				if(GIsEditor)
+				if (GIsEditor)
 				{
 					static IConsoleVariable* CVar = IConsoleManager::Get().FindConsoleVariable(TEXT("r.VSyncEditor"));
 					bForceVsyncFromCVar = (CVar->GetInt() != 0);
@@ -1019,7 +1048,7 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 				ElementBatcher->ResetBatches();
 
 				// The viewport had better exist at this point  
-				FViewportInfo* ViewInfo = WindowToViewportInfo.FindChecked( Window );
+				FViewportInfo* ViewInfo = WindowToViewportInfo.FindChecked(Window);
 
 				if (Window->IsViewportSizeDrivenByWindow())
 				{
@@ -1027,8 +1056,8 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 					ConditionalResizeViewport(ViewInfo, ViewInfo->DesiredWidth, ViewInfo->DesiredHeight, IsViewportFullscreen(*Window));
 				}
 
-				if( bRequiresStencilTest )
-				{	
+				if (bRequiresStencilTest)
+				{
 					ViewInfo->ConditionallyUpdateDepthBuffer(bRequiresStencilTest, ViewInfo->DesiredWidth, ViewInfo->DesiredHeight);
 				}
 
@@ -1054,52 +1083,58 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 					Params.bClear = false;
 #endif
 					// Skip the actual draw if we're in a headless execution environment
+					bool bLocalTakingAScreenShot = bTakingAScreenShot;
 					if (GIsClient && !IsRunningCommandlet() && !GUsingNullRHI)
 					{
 						ENQUEUE_RENDER_COMMAND(SlateDrawWindowsCommand)(
 							[Params](FRHICommandListImmediate& RHICmdList)
-							{
-								Params.Renderer->DrawWindow_RenderThread(RHICmdList, *Params.ViewportInfo, *Params.WindowElementList, Params.bLockToVsync, Params.bClear);
-							}
+						{
+							Params.Renderer->DrawWindow_RenderThread(RHICmdList, *Params.ViewportInfo, *Params.WindowElementList, Params.bLockToVsync, Params.bClear);
+						}
 						);
 					}
 
-					SlateWindowRendered.Broadcast( *Window, &ViewInfo->ViewportRHI );
+					SlateWindowRendered.Broadcast(*Window, &ViewInfo->ViewportRHI);
 
-					if ( bTakingAScreenShot )
+					if (bLocalTakingAScreenShot)
 					{
-						FIntRect LocalScreenshotRect = ScreenshotRect;
-						TArray<FColor>* LocalOutScreenshotData = OutScreenshotData;
-						ENQUEUE_RENDER_COMMAND(SlateCaptureScreenshotCommand)(
-							[Params, LocalScreenshotRect, LocalOutScreenshotData](FRHICommandListImmediate& RHICmdList)
-							{
-								FTexture2DRHIRef BackBuffer = RHICmdList.GetViewportBackBuffer(Params.ViewportInfo->ViewportRHI);
-								RHICmdList.ReadSurfaceData(BackBuffer, LocalScreenshotRect, *LocalOutScreenshotData, FReadSurfaceDataFlags());
-							}
-						);
-
+						// immediately flush the RHI command list
 						FlushRenderingCommands();
-
-						bTakingAScreenShot = false;
-						OutScreenshotData = NULL;
 					}
 				}
 			}
 		}
 		else
 		{
-			ensureMsgf( false, TEXT("Window isnt valid but being drawn!") );
+			ensureMsgf(false, TEXT("Window isnt valid but being drawn!"));
 		}
 	}
 
 	FSlateDrawBuffer* DrawBuffer = &WindowDrawBuffer;
 	ENQUEUE_RENDER_COMMAND(SlateEndDrawingWindowsCommand)(
 		[DrawBuffer, Policy](FRHICommandListImmediate& RHICmdList)
-		{
-			FSlateEndDrawingWindowsCommand::EndDrawingWindows(RHICmdList, DrawBuffer, *Policy);
-		}
+	{
+		FSlateEndDrawingWindowsCommand::EndDrawingWindows(RHICmdList, DrawBuffer, *Policy);
+	}
 	);
 
+	if (DeferredUpdateContexts.Num() > 0)
+	{
+		// Intentionally copy the contexts to avoid contention with the game thread
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(DrawWidgetRendererImmediate,
+			FDeferredUpdateContextList, Contexts, DeferredUpdateContexts,
+			{
+
+				for (const FRenderThreadUpdateContext& Context : Contexts)
+				{
+					static_cast<ISlate3DRenderer*>(Context.Renderer)->DrawWindowToTarget_RenderThread(RHICmdList, static_cast<FTextureRenderTarget2DResource*>(Context.RenderTargetResource), *Context.DrawBuffer, Context.bClearTarget);
+				}
+			}
+		);
+
+		DeferredUpdateContexts.Empty();
+	}
+
 	// flush the cache if needed
 	FontCache->ConditionalFlushCache();
 }
@@ -1107,14 +1142,14 @@ void FSlateRHIRenderer::DrawWindows_Private( FSlateDrawBuffer& WindowDrawBuffer
 
 FIntPoint FSlateRHIRenderer::GenerateDynamicImageResource(const FName InTextureName)
 {
-	check( IsInGameThread() );
+	check(IsInGameThread());
 
 	uint32 Width = 0;
 	uint32 Height = 0;
 	TArray<uint8> RawData;
 
-	TSharedPtr<FSlateDynamicTextureResource> TextureResource = ResourceManager->GetDynamicTextureResourceByName( InTextureName );
-	if( !TextureResource.IsValid() )
+	TSharedPtr<FSlateDynamicTextureResource> TextureResource = ResourceManager->GetDynamicTextureResourceByName(InTextureName);
+	if (!TextureResource.IsValid())
 	{
 		// Load the image from disk
 		bool bSucceeded = ResourceManager->LoadTexture(InTextureName, InTextureName.ToString(), Width, Height, RawData);
@@ -1124,17 +1159,17 @@ FIntPoint FSlateRHIRenderer::GenerateDynamicImageResource(const FName InTextureN
 		}
 	}
 
-	return TextureResource.IsValid() ? TextureResource->Proxy->ActualSize : FIntPoint( 0, 0 );
+	return TextureResource.IsValid() ? TextureResource->Proxy->ActualSize : FIntPoint(0, 0);
 }
 
-bool FSlateRHIRenderer::GenerateDynamicImageResource( FName ResourceName, uint32 Width, uint32 Height, const TArray< uint8 >& Bytes )
+bool FSlateRHIRenderer::GenerateDynamicImageResource(FName ResourceName, uint32 Width, uint32 Height, const TArray< uint8 >& Bytes)
 {
-	check( IsInGameThread() );
+	check(IsInGameThread());
 
-	TSharedPtr<FSlateDynamicTextureResource> TextureResource = ResourceManager->GetDynamicTextureResourceByName( ResourceName );
-	if( !TextureResource.IsValid() )
+	TSharedPtr<FSlateDynamicTextureResource> TextureResource = ResourceManager->GetDynamicTextureResourceByName(ResourceName);
+	if (!TextureResource.IsValid())
 	{
-		TextureResource = ResourceManager->MakeDynamicTextureResource( ResourceName, Width, Height, Bytes );
+		TextureResource = ResourceManager->MakeDynamicTextureResource(ResourceName, Width, Height, Bytes);
 	}
 	return TextureResource.IsValid();
 }
@@ -1144,7 +1179,7 @@ bool FSlateRHIRenderer::GenerateDynamicImageResource(FName ResourceName, FSlateT
 	check(IsInGameThread());
 
 	TSharedPtr<FSlateDynamicTextureResource> TextureResource = ResourceManager->GetDynamicTextureResourceByName(ResourceName);
-	if ( !TextureResource.IsValid() )
+	if (!TextureResource.IsValid())
 	{
 		TextureResource = ResourceManager->MakeDynamicTextureResource(ResourceName, TextureData);
 	}
@@ -1156,35 +1191,40 @@ FSlateResourceHandle FSlateRHIRenderer::GetResourceHandle( const FSlateBrush& Br
 	return ResourceManager->GetResourceHandle( Brush );
 }
 
+bool FSlateRHIRenderer::CanRenderResource(UObject& InResourceObject) const
+{
+	return Cast<UTexture>(&InResourceObject) || Cast<ISlateTextureAtlasInterface>(&InResourceObject) || Cast<UMaterialInterface>(&InResourceObject);
+}
+
 void FSlateRHIRenderer::RemoveDynamicBrushResource( TSharedPtr<FSlateDynamicImageBrush> BrushToRemove )
 {
-	if( BrushToRemove.IsValid() )
+	if (BrushToRemove.IsValid())
 	{
-		DynamicBrushesToRemove[FreeBufferIndex].Add( BrushToRemove );
+		DynamicBrushesToRemove[FreeBufferIndex].Add(BrushToRemove);
 	}
 }
 
 /**
- * Gives the renderer a chance to wait for any render commands to be completed before returning/
- */
+* Gives the renderer a chance to wait for any render commands to be completed before returning/
+*/
 void FSlateRHIRenderer::FlushCommands() const
 {
-	if( IsInGameThread() || IsInSlateThread() )
+	if (IsInGameThread() || IsInSlateThread())
 	{
 		FlushRenderingCommands();
 	}
 }
 
 /**
- * Gives the renderer a chance to synchronize with another thread in the event that the renderer runs 
- * in a multi-threaded environment.  This function does not return until the sync is complete
- */
+* Gives the renderer a chance to synchronize with another thread in the event that the renderer runs
+* in a multi-threaded environment.  This function does not return until the sync is complete
+*/
 void FSlateRHIRenderer::Sync() const
 {
 	// Sync game and render thread. Either total sync or allowing one frame lag.
 	static FFrameEndSync FrameEndSync;
 	static auto CVarAllowOneFrameThreadLag = IConsoleManager::Get().FindTConsoleVariableDataInt(TEXT("r.OneFrameThreadLag"));
-	FrameEndSync.Sync( CVarAllowOneFrameThreadLag->GetValueOnAnyThread() != 0 );
+	FrameEndSync.Sync(CVarAllowOneFrameThreadLag->GetValueOnAnyThread() != 0);
 }
 
 void FSlateRHIRenderer::ReloadTextureResources()
@@ -1194,45 +1234,45 @@ void FSlateRHIRenderer::ReloadTextureResources()
 
 void FSlateRHIRenderer::LoadUsedTextures()
 {
-	if ( ResourceManager.IsValid() )
+	if (ResourceManager.IsValid())
 	{
 		ResourceManager->LoadUsedTextures();
 	}
 }
 
-void FSlateRHIRenderer::LoadStyleResources( const ISlateStyle& Style )
+void FSlateRHIRenderer::LoadStyleResources(const ISlateStyle& Style)
 {
-	if ( ResourceManager.IsValid() )
+	if (ResourceManager.IsValid())
 	{
-		ResourceManager->LoadStyleResources( Style );
+		ResourceManager->LoadStyleResources(Style);
 	}
 }
 
-void FSlateRHIRenderer::ReleaseDynamicResource( const FSlateBrush& InBrush )
+void FSlateRHIRenderer::ReleaseDynamicResource(const FSlateBrush& InBrush)
 {
-	ensure( IsInGameThread() );
-	ResourceManager->ReleaseDynamicResource( InBrush );
+	ensure(IsInGameThread());
+	ResourceManager->ReleaseDynamicResource(InBrush);
 }
 
-void* FSlateRHIRenderer::GetViewportResource( const SWindow& Window )
+void* FSlateRHIRenderer::GetViewportResource(const SWindow& Window)
 {
 	checkSlow(IsThreadSafeForSlateRendering());
 
-	FViewportInfo** InfoPtr = WindowToViewportInfo.Find( &Window );
+	FViewportInfo** InfoPtr = WindowToViewportInfo.Find(&Window);
 
-	if( InfoPtr )
+	if (InfoPtr)
 	{
 		FViewportInfo* ViewportInfo = *InfoPtr;
 
 		// Create the viewport if it doesnt exist
-		if( !IsValidRef(ViewportInfo->ViewportRHI) )
+		if (!IsValidRef(ViewportInfo->ViewportRHI))
 		{
 			// Sanity check dimensions
 			checkf(ViewportInfo->Width <= MAX_VIEWPORT_SIZE && ViewportInfo->Height <= MAX_VIEWPORT_SIZE, TEXT("Invalid window with Width=%u and Height=%u"), ViewportInfo->Width, ViewportInfo->Height);
 
-			const bool bFullscreen = IsViewportFullscreen( Window );
+			const bool bFullscreen = IsViewportFullscreen(Window);
 
-			ViewportInfo->ViewportRHI = RHICreateViewport( ViewportInfo->OSWindow, ViewportInfo->Width, ViewportInfo->Height, bFullscreen, ViewportInfo->PixelFormat );
+			ViewportInfo->ViewportRHI = RHICreateViewport(ViewportInfo->OSWindow, ViewportInfo->Width, ViewportInfo->Height, bFullscreen, ViewportInfo->PixelFormat);
 		}
 
 		return &ViewportInfo->ViewportRHI;
@@ -1243,9 +1283,12 @@ void* FSlateRHIRenderer::GetViewportResource( const SWindow& Window )
 	}
 }
 
-void FSlateRHIRenderer::SetColorVisionDeficiencyType( uint32 Type )
+void FSlateRHIRenderer::SetColorVisionDeficiencyType(EColorVisionDeficiency Type, int32 Severity, bool bCorrectDeficiency, bool bShowCorrectionWithDeficiency)
 {
-	GSlateShaderColorVisionDeficiencyType = Type;
+	GSlateColorDeficiencyType = Type;
+	GSlateColorDeficiencySeverity = FMath::Clamp(Severity, 0, 10);
+	GSlateColorDeficiencyCorrection = bCorrectDeficiency;
+	GSlateShowColorDeficiencyCorrectionWithDeficiency = bShowCorrectionWithDeficiency;
 }
 
 FSlateUpdatableTexture* FSlateRHIRenderer::CreateUpdatableTexture(uint32 Width, uint32 Height)
@@ -1278,7 +1321,7 @@ void FSlateRHIRenderer::ReleaseUpdatableTexture(FSlateUpdatableTexture* Texture)
 
 ISlateAtlasProvider* FSlateRHIRenderer::GetTextureAtlasProvider()
 {
-	if( ResourceManager.IsValid() )
+	if (ResourceManager.IsValid())
 	{
 		return ResourceManager->GetTextureAtlasProvider();
 	}
@@ -1306,12 +1349,12 @@ int32 FSlateRHIRenderer::RegisterCurrentScene(FSceneInterface* Scene)
 	int32 LocalCurrentSceneIndex = CurrentSceneIndex;
 	ENQUEUE_RENDER_COMMAND(RegisterCurrentSceneOnPolicy)(
 		[InRenderPolicy, Scene, LocalCurrentSceneIndex](FRHICommandListImmediate& RHICmdList)
+	{
+		if (LocalCurrentSceneIndex != -1)
 		{
-			if (LocalCurrentSceneIndex != -1)
-			{
-				InRenderPolicy->AddSceneAt(Scene, LocalCurrentSceneIndex);
-			}
+			InRenderPolicy->AddSceneAt(Scene, LocalCurrentSceneIndex);
 		}
+	}
 	);
 	return CurrentSceneIndex;
 }
@@ -1323,7 +1366,7 @@ int32 FSlateRHIRenderer::GetCurrentSceneIndex() const
 
 void FSlateRHIRenderer::ClearScenes()
 {
-	if(!IsInSlateThread())
+	if (!IsInSlateThread())
 	{
 		CurrentSceneIndex = -1;
 		ActiveScenes.Empty();
@@ -1333,9 +1376,9 @@ void FSlateRHIRenderer::ClearScenes()
 		FSlateRenderingPolicy* InRenderPolicy = RenderingPolicy.Get();
 		ENQUEUE_RENDER_COMMAND(ClearScenesOnPolicy)(
 			[InRenderPolicy](FRHICommandListImmediate& RHICmdList)
-			{
-				InRenderPolicy->ClearScenes();
-			}
+		{
+			InRenderPolicy->ClearScenes();
+		}
 		);
 	}
 }
@@ -1351,39 +1394,40 @@ bool FSlateRHIRenderer::AreShadersInitialized() const
 
 void FSlateRHIRenderer::InvalidateAllViewports()
 {
-	for( TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It )
+	for (TMap< const SWindow*, FViewportInfo*>::TIterator It(WindowToViewportInfo); It; ++It)
 	{
 		It.Value()->ViewportRHI = nullptr;
 	}
 }
 
+FCriticalSection* FSlateRHIRenderer::GetResourceCriticalSection()
+{
+	return ResourceManager->GetResourceCriticalSection();
+}
+
 void FSlateRHIRenderer::ReleaseAccessedResources(bool bImmediatelyFlush)
 {
-	FScopeLock ScopeLock(GetResourceCriticalSection());
-
-	// Clear accessed UTexture and Material objects from the previous frame
-	ResourceManager->BeginReleasingAccessedResources(bImmediatelyFlush);
-
 	// We keep track of the Scene objects from SceneViewports on the SlateRenderer. Make sure that this gets refreshed every frame.
 	ClearScenes();
 
-	if ( bImmediatelyFlush )
+	if (bImmediatelyFlush)
 	{
 		// Increment resource version to allow buffers to shrink or cached structures to clean up.
 		ResourceVersion++;
 
-		// Release resources generated specifically by the rendering policy if we are flushing.  This should NOT be done unless flushing
+		// Release resources generated specifically by the rendering policy if we are flushing.
+		// This should NOT be done unless flushing
 		RenderingPolicy->FlushGeneratedResources();
 
 		FlushCommands();
 	}
 }
 
-void FSlateRHIRenderer::RequestResize( const TSharedPtr<SWindow>& Window, uint32 NewWidth, uint32 NewHeight )
+void FSlateRHIRenderer::RequestResize(const TSharedPtr<SWindow>& Window, uint32 NewWidth, uint32 NewHeight)
 {
-	checkSlow( IsThreadSafeForSlateRendering() );
+	checkSlow(IsThreadSafeForSlateRendering());
 
-	FViewportInfo* ViewInfo = WindowToViewportInfo.FindRef( Window.Get() );
+	FViewportInfo* ViewInfo = WindowToViewportInfo.FindRef(Window.Get());
 
 	if (ViewInfo)
 	{
@@ -1393,7 +1437,7 @@ void FSlateRHIRenderer::RequestResize( const TSharedPtr<SWindow>& Window, uint32
 }
 
 void FSlateRHIRenderer::SetWindowRenderTarget(const SWindow& Window, IViewportRenderTargetProvider* Provider)
-{	
+{
 	FViewportInfo* ViewInfo = WindowToViewportInfo.FindRef(&Window);
 	if (ViewInfo)
 	{
@@ -1401,6 +1445,24 @@ void FSlateRHIRenderer::SetWindowRenderTarget(const SWindow& Window, IViewportRe
 	}
 }
 
+void FSlateRHIRenderer::AddWidgetRendererUpdate(const struct FRenderThreadUpdateContext& Context, bool bDeferredRenderTargetUpdate)
+{
+	if (bDeferredRenderTargetUpdate)
+	{
+		DeferredUpdateContexts.Add(Context);
+	}
+	else
+	{
+		// Enqueue a command to unlock the draw buffer after all windows have been drawn
+		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(DrawWidgetRendererImmediate,
+			FRenderThreadUpdateContext, InContext, Context,
+			{
+				static_cast<ISlate3DRenderer*>(InContext.Renderer)->DrawWindowToTarget_RenderThread(RHICmdList, static_cast<FTextureRenderTarget2DResource*>(InContext.RenderTargetResource), *InContext.DrawBuffer, InContext.bClearTarget);
+			});
+	}
+}
+
+
 TSharedRef<FSlateRenderDataHandle, ESPMode::ThreadSafe> FSlateRHIRenderer::CacheElementRenderData(const ILayoutCache* Cacher, FSlateWindowElementList& ElementList)
 {
 	TSharedRef<FSlateRenderDataHandle, ESPMode::ThreadSafe> RenderDataHandle = MakeShareable(new FSlateRenderDataHandle(Cacher, ResourceManager.Get()));
@@ -1429,16 +1491,16 @@ TSharedRef<FSlateRenderDataHandle, ESPMode::ThreadSafe> FSlateRHIRenderer::Cache
 	};
 	ENQUEUE_RENDER_COMMAND(CacheElementBatches)(
 		[CacheElementBatchesContext](FRHICommandListImmediate& RHICmdList)
-		{
-			FSlateBatchData& BatchData = CacheElementBatchesContext.SlateElementList->GetBatchData();
-			FElementBatchMap& RootBatchMap = CacheElementBatchesContext.SlateElementList->GetRootDrawLayer().GetElementBatchMap();
+	{
+		FSlateBatchData& BatchData = CacheElementBatchesContext.SlateElementList->GetBatchData();
+		FElementBatchMap& RootBatchMap = CacheElementBatchesContext.SlateElementList->GetRootDrawLayer().GetElementBatchMap();
 
-			BatchData.SetRenderDataHandle(CacheElementBatchesContext.RenderDataHandle);
-			BatchData.CreateRenderBatches(RootBatchMap);
-			CacheElementBatchesContext.RenderPolicy->UpdateVertexAndIndexBuffers(RHICmdList, BatchData, CacheElementBatchesContext.RenderDataHandle);
-			
-			RootBatchMap.UpdateResourceVersion(CacheElementBatchesContext.ResourceVersion);
-		}
+		BatchData.SetRenderDataHandle(CacheElementBatchesContext.RenderDataHandle);
+		BatchData.CreateRenderBatches(RootBatchMap);
+		CacheElementBatchesContext.RenderPolicy->UpdateVertexAndIndexBuffers(RHICmdList, BatchData, CacheElementBatchesContext.RenderDataHandle);
+
+		RootBatchMap.UpdateResourceVersion(CacheElementBatchesContext.ResourceVersion);
+	}
 	);
 
 	return RenderDataHandle;
@@ -1458,9 +1520,9 @@ void FSlateRHIRenderer::ReleaseCachingResourcesFor(const ILayoutCache* Cacher)
 	};
 	ENQUEUE_RENDER_COMMAND(ReleaseCachingResourcesFor)(
 		[MarshalContext](FRHICommandListImmediate& RHICmdList)
-		{
-			MarshalContext.RenderPolicy->ReleaseCachingResourcesFor(RHICmdList, MarshalContext.Cacher);
-		}
+	{
+		MarshalContext.RenderPolicy->ReleaseCachingResourcesFor(RHICmdList, MarshalContext.Cacher);
+	}
 	);
 }
 
@@ -1471,7 +1533,7 @@ FSlateEndDrawingWindowsCommand::FSlateEndDrawingWindowsCommand(FSlateRHIRenderin
 
 void FSlateEndDrawingWindowsCommand::Execute(FRHICommandListBase& CmdList)
 {
-	for ( auto& ElementList : DrawBuffer->GetWindowElementLists() )
+	for (auto& ElementList : DrawBuffer->GetWindowElementLists())
 	{
 		ElementList->PostDraw_ParallelThread();
 	}
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.h
index 84c0026a2667..d38b727e07da 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderer.h
@@ -21,6 +21,8 @@ struct Rect;
 
 template<typename TCmd> struct FRHICommand;
 
+typedef TArray<FRenderThreadUpdateContext, TInlineAllocator<2>> FDeferredUpdateContextList;
+
 // Number of draw buffers that can be active at any given time
 const uint32 NumDrawBuffers = 3;
 
@@ -186,17 +188,20 @@ public:
 	virtual bool GenerateDynamicImageResource( FName ResourceName, uint32 Width, uint32 Height, const TArray< uint8 >& Bytes ) override;
 	virtual bool GenerateDynamicImageResource( FName ResourceName, FSlateTextureDataRef TextureData ) override;
 	virtual FSlateResourceHandle GetResourceHandle( const FSlateBrush& Brush ) override;
+	virtual bool CanRenderResource(UObject& InResourceObject) const override;
 	virtual void* GetViewportResource( const SWindow& Window ) override;
-	virtual void SetColorVisionDeficiencyType( uint32 Type ) override;
+	virtual void SetColorVisionDeficiencyType(EColorVisionDeficiency Type, int32 Severity, bool bCorrectDeficiency, bool bShowCorrectionWithDeficiency) override;
 	virtual FSlateUpdatableTexture* CreateUpdatableTexture(uint32 Width, uint32 Height) override;
 	virtual void ReleaseUpdatableTexture(FSlateUpdatableTexture* Texture) override;
 	virtual ISlateAtlasProvider* GetTextureAtlasProvider() override;
+	virtual FCriticalSection* GetResourceCriticalSection() override;
 	virtual void ReleaseAccessedResources(bool bImmediatelyFlush) override;
 	virtual TSharedRef<FSlateRenderDataHandle, ESPMode::ThreadSafe> CacheElementRenderData(const ILayoutCache* Cacher, FSlateWindowElementList& ElementList) override;
 	virtual void ReleaseCachingResourcesFor(const ILayoutCache* Cacher) override;
 	virtual int32 RegisterCurrentScene(FSceneInterface* Scene) override;
 	virtual int32 GetCurrentSceneIndex() const override;
 	virtual void ClearScenes() override;
+	virtual void AddWidgetRendererUpdate(const struct FRenderThreadUpdateContext& Context, bool bDeferredRenderTargetUpdate) override;
 
 	/** Draws windows from a FSlateDrawBuffer on the render thread */
 	void DrawWindow_RenderThread(FRHICommandListImmediate& RHICmdList, FSlateRHIRenderer::FViewportInfo& ViewportInfo, FSlateWindowElementList& WindowElementList, bool bLockToVsync, bool bClear);
@@ -222,6 +227,7 @@ public:
 
 	virtual void SetWindowRenderTarget(const SWindow& Window, class IViewportRenderTargetProvider* Provider) override;
 
+
 private:
 	/** Loads all known textures from Slate styles */
 	void LoadUsedTextures();
@@ -276,6 +282,8 @@ private:
 
 	TArray< TSharedPtr<FSlateDynamicImageBrush> > DynamicBrushesToRemove[NumDrawBuffers];
 
+	FDeferredUpdateContextList DeferredUpdateContexts;
+
 	bool bTakingAScreenShot;
 	FIntRect ScreenshotRect;
 	TArray<FColor>* OutScreenshotData;
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderingPolicy.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderingPolicy.cpp
index cc3ffd6a9f1b..b813e3b80fc8 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderingPolicy.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIRenderingPolicy.cpp
@@ -304,12 +304,20 @@ static void UpdateScissorRect(
 		if (RenderBatch.ClippingState.IsSet())
 		{
 			const FSlateClippingState& ClipState = RenderBatch.ClippingState.GetValue();
-			if (ClipState.ScissorRect.IsSet())
+			if (ClipState.GetClippingMethod() == EClippingMethod::Scissor)
 			{
 #if STATS
 				ScissorClips++;
 #endif
 
+				if (bForceStateChange && MaskingID > 0)
+				{
+					FRHIRenderTargetView ColorView(ColorTarget, ERenderTargetLoadAction::ELoad);
+					FRHIDepthRenderTargetView DepthStencilView(DepthStencilTarget, ERenderTargetLoadAction::ENoAction, ERenderTargetStoreAction::ENoAction, ERenderTargetLoadAction::ELoad, ERenderTargetStoreAction::EStore);
+					FRHISetRenderTargetsInfo CurrentRTInfo(1, &ColorView, DepthStencilView);
+					RHICmdList.SetRenderTargetsAndClear(CurrentRTInfo);
+				}
+
 				const FSlateClippingZone& ScissorRect = ClipState.ScissorRect.GetValue();
 
 				const FVector2D TopLeft = ScissorRect.TopLeft + ViewTranslation2D;
@@ -547,7 +555,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 	FSlateBackBuffer& BackBuffer,
 	FTexture2DRHIRef& ColorTarget,
 	FTexture2DRHIRef& DepthStencilTarget,
-	const TArray<FSlateRenderBatch>& RenderBatches, 
+	const TArray<FSlateRenderBatch>& RenderBatches,
 	const FSlateRenderingOptions& Options)
 {
 	// Should only be called by the rendering thread
@@ -609,7 +617,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 			SceneViews[i] = CreateSceneView(SceneViewFamilyContexts[i], BackBuffer, Options.ViewProjectionMatrix);
 		}
 
-		SceneViewFamilyContexts[NumScenes-1] = new FSceneViewFamilyContext
+		SceneViewFamilyContexts[NumScenes - 1] = new FSceneViewFamilyContext
 		(
 			FSceneViewFamily::ConstructionValues
 			(
@@ -621,12 +629,12 @@ void FSlateRHIRenderingPolicy::DrawElements(
 			.SetGammaCorrection(DisplayGamma)
 			.SetRealtimeUpdate(true)
 		);
-		SceneViews[NumScenes-1] = CreateSceneView(SceneViewFamilyContexts[NumScenes-1], BackBuffer, Options.ViewProjectionMatrix);
+		SceneViews[NumScenes - 1] = CreateSceneView(SceneViewFamilyContexts[NumScenes - 1], BackBuffer, Options.ViewProjectionMatrix);
 	}
 
 	TShaderMapRef<FSlateElementVS> GlobalVertexShader(GetGlobalShaderMap(GMaxRHIFeatureLevel));
 
-	FSamplerStateRHIRef BilinearClamp = TStaticSamplerState<SF_Bilinear,AM_Clamp,AM_Clamp,AM_Clamp>::GetRHI();
+	FSamplerStateRHIRef BilinearClamp = TStaticSamplerState<SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp>::GetRHI();
 
 	TSlateElementVertexBuffer<FSlateVertex>* VertexBuffer = &VertexBuffers;
 	FSlateElementIndexBuffer* IndexBuffer = &IndexBuffers;
@@ -661,7 +669,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 	FVector2D ViewTranslation2D = Options.ViewOffset;
 
 	// Draw each element
-	for( int32 BatchIndex = 0; BatchIndex < RenderBatches.Num(); ++BatchIndex )
+	for (int32 BatchIndex = 0; BatchIndex < RenderBatches.Num(); ++BatchIndex)
 	{
 #if WITH_SLATE_VISUALIZERS
 		FLinearColor BatchColor = FLinearColor(BatchColors.GetUnitVector());
@@ -671,7 +679,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 		const FSlateRenderDataHandle* RenderHandle = RenderBatch.CachedRenderHandle.Get();
 
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-		if(BatchIndex != RenderBatches.Num() - 1)
+		if (BatchIndex != RenderBatches.Num() - 1)
 		{
 			if (BatchToDraw != -1 && BatchToDraw != BatchIndex)
 			{
@@ -680,16 +688,16 @@ void FSlateRHIRenderingPolicy::DrawElements(
 		}
 #endif
 
-		if ( RenderHandle != LastHandle )
+		if (RenderHandle != LastHandle)
 		{
 			SLATE_DRAW_EVENT(RHICmdList, ChangingRenderBuffers);
 
 			LastHandle = RenderHandle;
 
-			if ( RenderHandle )
+			if (RenderHandle)
 			{
 				FCachedRenderBuffers* Buffers = ResourceManager->FindCachedBuffersForHandle(RenderHandle);
-				if ( Buffers != nullptr )
+				if (Buffers != nullptr)
 				{
 					VertexBuffer = &Buffers->VertexBuffer;
 					IndexBuffer = &Buffers->IndexBuffer;
@@ -711,7 +719,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 		const ESlateShader::Type ShaderType = RenderBatch.ShaderType;
 		const FShaderParams& ShaderParams = RenderBatch.ShaderParams;
 
-		if ( EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::Wireframe) )
+		if (EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::Wireframe))
 		{
 			GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Wireframe, CM_None, false>::GetRHI();
 		}
@@ -720,15 +728,15 @@ void FSlateRHIRenderingPolicy::DrawElements(
 			GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None, false>::GetRHI();
 		}
 
-		if( !RenderBatch.CustomDrawer.IsValid() )
+		if (!RenderBatch.CustomDrawer.IsValid())
 		{
 			FMatrix DynamicOffset = FTranslationMatrix::Make(FVector(RenderBatch.DynamicOffset.X, RenderBatch.DynamicOffset.Y, 0));
 			const FMatrix ViewProjection = DynamicOffset * Options.ViewProjectionMatrix;
 
 			UpdateScissorRect(
-				RHICmdList, 
+				RHICmdList,
 #if STATS
-				ScissorClips, 
+				ScissorClips,
 				StencilClips,
 #endif
 				StencilRef,
@@ -740,14 +748,14 @@ void FSlateRHIRenderingPolicy::DrawElements(
 				LastClippingState,
 				ViewTranslation2D,
 				bSwitchVerticalAxis,
-				GraphicsPSOInit, 
+				GraphicsPSOInit,
 				ViewProjection,
 				false);
 
-			const uint32 PrimitiveCount = RenderBatch.DrawPrimitiveType == ESlateDrawPrimitive::LineList ? RenderBatch.NumIndices / 2 : RenderBatch.NumIndices / 3; 
+			const uint32 PrimitiveCount = RenderBatch.DrawPrimitiveType == ESlateDrawPrimitive::LineList ? RenderBatch.NumIndices / 2 : RenderBatch.NumIndices / 3;
 
 			ESlateShaderResource::Type ResourceType = ShaderResource ? ShaderResource->GetType() : ESlateShaderResource::Invalid;
-			if( ResourceType != ESlateShaderResource::Material && ShaderType != ESlateShader::PostProcess ) 
+			if (ResourceType != ESlateShaderResource::Material && ShaderType != ESlateShader::PostProcess)
 			{
 				check(RenderBatch.NumIndices > 0);
 				FSlateElementPS* PixelShader = nullptr;
@@ -757,7 +765,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 
 #if WITH_SLATE_VISUALIZERS
 				FSlateDebugBatchingPS* BatchingPixelShader = nullptr;
-				if ( CVarShowSlateBatching.GetValueOnRenderThread() != 0 )
+				if (CVarShowSlateBatching.GetValueOnRenderThread() != 0)
 				{
 					BatchingPixelShader = *TShaderMapRef<FSlateDebugBatchingPS>(ShaderMap);
 					PixelShader = BatchingPixelShader;
@@ -769,11 +777,11 @@ void FSlateRHIRenderingPolicy::DrawElements(
 				}
 
 #if WITH_SLATE_VISUALIZERS
-				if ( CVarShowSlateBatching.GetValueOnRenderThread() != 0 )
+				if (CVarShowSlateBatching.GetValueOnRenderThread() != 0)
 				{
 					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGBA, BO_Add, BF_SourceAlpha, BF_InverseSourceAlpha, BO_Add, BF_One, BF_InverseSourceAlpha>::GetRHI();
 				}
-				else if ( CVarShowSlateOverdraw.GetValueOnRenderThread() != 0 )
+				else if (CVarShowSlateOverdraw.GetValueOnRenderThread() != 0)
 				{
 					GraphicsPSOInit.BlendState = TStaticBlendState<CW_RGB, BO_Add, BF_One, BF_One, BO_Add, BF_Zero, BF_InverseSourceAlpha>::GetRHI();
 				}
@@ -781,19 +789,19 @@ void FSlateRHIRenderingPolicy::DrawElements(
 #endif
 				{
 					GraphicsPSOInit.BlendState =
-						EnumHasAllFlags( DrawFlags, ESlateBatchDrawFlag::NoBlending )
+						EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::NoBlending)
 						? TStaticBlendState<>::GetRHI()
-						: ( EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::PreMultipliedAlpha )
+						: (EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::PreMultipliedAlpha)
 							? TStaticBlendState<CW_RGBA, BO_Add, BF_One, BF_InverseSourceAlpha, BO_Add, BF_One, BF_InverseSourceAlpha>::GetRHI()
-							: TStaticBlendState<CW_RGBA, BO_Add, BF_SourceAlpha, BF_InverseSourceAlpha, BO_Add, BF_One, BF_InverseSourceAlpha>::GetRHI() )
+							: TStaticBlendState<CW_RGBA, BO_Add, BF_SourceAlpha, BF_InverseSourceAlpha, BO_Add, BF_One, BF_InverseSourceAlpha>::GetRHI())
 						;
 				}
 
-				if ( EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::Wireframe) || Options.bWireFrame )
+				if (EnumHasAllFlags(DrawFlags, ESlateBatchDrawFlag::Wireframe) || Options.bWireFrame)
 				{
 					GraphicsPSOInit.RasterizerState = TStaticRasterizerState<FM_Wireframe, CM_None, false>::GetRHI();
 
-					if ( Options.bWireFrame )
+					if (Options.bWireFrame)
 					{
 						GraphicsPSOInit.BlendState = TStaticBlendState<>::GetRHI();
 					}
@@ -828,13 +836,12 @@ void FSlateRHIRenderingPolicy::DrawElements(
 					if (ResourceType == ESlateShaderResource::TextureObject)
 					{
 						FSlateBaseUTextureResource* TextureObjectResource = (FSlateBaseUTextureResource*)ShaderResource;
-
-						TextureObjectResource->CheckIfValid();
-
-						TextureRHI = TextureObjectResource->AccessRHIResource();
-
-						if (UTexture* TextureObj = TextureObjectResource->TextureObject)
+						if (const UTexture* TextureObj = TextureObjectResource->GetTextureObject())
 						{
+							TextureObjectResource->CheckForStaleResources();
+
+							TextureRHI = TextureObjectResource->AccessRHIResource();
+
 							Filter = GetSamplerFilter(TextureObj);
 						}
 					}
@@ -930,7 +937,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 						}
 					}
 				}
-				
+
 				{
 					QUICK_SCOPE_CYCLE_COUNTER(Slate_SetTextureShaderParams);
 
@@ -982,9 +989,9 @@ void FSlateRHIRenderingPolicy::DrawElements(
 					// used.
 					ActiveSceneIndex = NumScenes - 1;
 #if UE_BUILD_DEBUG
-	#if WITH_EDITOR
+#if WITH_EDITOR
 					UE_LOG(LogSlate, Error, TEXT("Invalid scene index in batch: %d of %d known scenes!"), RenderBatch.SceneIndex, ResourceManager->GetSceneCount());
-	#endif
+#endif
 #endif
 				}
 
@@ -999,7 +1006,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 				FSlateMaterialResource* MaterialShaderResource = (FSlateMaterialResource*)ShaderResource;
 				if (MaterialShaderResource->GetMaterialObject() != nullptr)
 				{
-					MaterialShaderResource->CheckIfValid();
+					MaterialShaderResource->CheckForStaleResources();
 
 					FMaterialRenderProxy* MaterialRenderProxy = MaterialShaderResource->GetRenderProxy();
 
@@ -1071,7 +1078,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 								}
 							}
 						}
-						
+
 						{
 							SCOPE_CYCLE_COUNTER(STAT_SlateRTMaterialDrawCall);
 							if (bUseInstancing)
@@ -1118,7 +1125,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 					}
 				}
 			}
-			else if(ShaderType == ESlateShader::PostProcess)
+			else if (ShaderType == ESlateShader::PostProcess)
 			{
 				SLATE_DRAW_EVENT(RHICmdList, PostProcess);
 
@@ -1126,7 +1133,7 @@ void FSlateRHIRenderingPolicy::DrawElements(
 
 				FPostProcessRectParams RectParams;
 				RectParams.SourceTexture = BackBuffer.GetRenderTargetTexture();
-				RectParams.SourceRect = FSlateRect(0,0,BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y);
+				RectParams.SourceRect = FSlateRect(0, 0, BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y);
 				RectParams.DestRect = FSlateRect(QuadPositionData.X, QuadPositionData.Y, QuadPositionData.Z, QuadPositionData.W);
 				RectParams.SourceTextureSize = BackBuffer.GetSizeXY();
 
@@ -1177,18 +1184,37 @@ void FSlateRHIRenderingPolicy::DrawElements(
 
 				// This element is custom and has no Slate geometry.  Tell it to render itself now
 				CustomDrawer->DrawRenderThread(RHICmdList, &BackBuffer.GetRenderTargetTexture());
-				
+
 
 				//We reset the maskingID here because otherwise the RT might not get re-set in the lines above see: if (bClearStencil || bForceStateChange)
 				MaskingID = 0;
-			
+
 				// Something may have messed with the viewport size so set it back to the full target.
-				RHICmdList.SetViewport( 0,0,0,BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y, 0.0f ); 
+				RHICmdList.SetViewport(0, 0, 0, BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y, 0.0f);
 				RHICmdList.SetStreamSource(0, VertexBuffer->VertexBufferRHI, 0);
 			}
 		}
 	}
 
+	// Don't do color correction on iOS or Android, we don't have the GPU overhead for it.
+#if !(PLATFORM_IOS || PLATFORM_ANDROID)
+	if (GSlateColorDeficiencyType != EColorVisionDeficiency::NormalVision && GSlateColorDeficiencySeverity > 0)
+	{
+		FPostProcessRectParams RectParams;
+		RectParams.SourceTexture = BackBuffer.GetRenderTargetTexture();
+		RectParams.SourceRect = FSlateRect(0, 0, BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y);
+		RectParams.DestRect = FSlateRect(0, 0, BackBuffer.GetSizeXY().X, BackBuffer.GetSizeXY().Y);
+		RectParams.SourceTextureSize = BackBuffer.GetSizeXY();
+
+		PostProcessor->ColorDeficiency(RHICmdList, RendererModule, RectParams);
+	}
+#endif
+
+	// Disable scissor rect we no longer need this.
+	RHICmdList.SetScissorRect(false, 0, 0, 0, 0);
+	// Disable depth/stencil testing once we're done also.
+	GraphicsPSOInit.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
+
 	for (int i = 0; i < NumScenes; i++)
 	{
 		// Don't need to delete SceneViews b/c the SceneViewFamily will delete it when it goes away.
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.cpp
index 852d25d73fcf..2ffe0ae479f3 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.cpp
@@ -25,16 +25,15 @@
 #include "SlateAtlasedTextureResource.h"
 #include "ImageUtils.h"
 
+#define LOCTEXT_NAMESPACE "Slate"
+
 DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Num Texture Atlases"), STAT_SlateNumTextureAtlases, STATGROUP_SlateMemory);
 DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Num Non-Atlased Textures"), STAT_SlateNumNonAtlasedTextures, STATGROUP_SlateMemory);
 DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Num Dynamic Textures"), STAT_SlateNumDynamicTextures, STATGROUP_SlateMemory);
 DECLARE_CYCLE_STAT(TEXT("GetResource Time"), STAT_SlateGetResourceTime, STATGROUP_Slate);
 
 FDynamicResourceMap::FDynamicResourceMap()
-	: TextureMemorySincePurge(0)
-	, LastExpiredMaterialNumMarker(0)
 {
-
 }
 
 TSharedPtr<FSlateDynamicTextureResource> FDynamicResourceMap::GetDynamicTextureResource( FName ResourceName ) const
@@ -77,10 +76,8 @@ void FDynamicResourceMap::AddUTextureResource( UTexture* TextureObject, TSharedR
 {
 	if ( TextureObject )
 	{
-		check(TextureObject == InResource->TextureObject);
+		check(TextureObject == InResource->GetTextureObject());
 		TextureMap.Add(TextureObject, InResource);
-
-		TextureMemorySincePurge += TextureObject->GetResourceSizeBytes(EResourceSizeMode::Exclusive);
 	}
 }
 
@@ -95,12 +92,11 @@ void FDynamicResourceMap::RemoveDynamicTextureResource(FName ResourceName)
 	NativeTextureMap.Remove(ResourceName);
 }
 
-void FDynamicResourceMap::RemoveUTextureResource( UTexture* TextureObject )
+void FDynamicResourceMap::RemoveUTextureResource(UTexture* TextureObject)
 {
-	if(TextureObject)
+	if (TextureObject)
 	{
 		TextureMap.Remove(TextureObject);
-		TextureMemorySincePurge -= TextureObject->GetResourceSizeBytes(EResourceSizeMode::Exclusive);
 	}
 }
 
@@ -137,7 +133,6 @@ void FDynamicResourceMap::EmptyDynamicTextureResources()
 void FDynamicResourceMap::EmptyUTextureResources()
 {
 	TextureMap.Empty();
-	TextureMemorySincePurge = 0;
 }
 
 void FDynamicResourceMap::EmptyMaterialResources()
@@ -154,80 +149,71 @@ void FDynamicResourceMap::ReleaseResources()
 	
 	for ( FTextureResourceMap::TIterator It(TextureMap); It; ++It )
 	{
-		It.Value()->UpdateRenderResource(nullptr);
+		It.Value()->ResetTexture();
 	}
 }
 
 void FDynamicResourceMap::RemoveExpiredTextureResources(TArray< TSharedPtr<FSlateUTextureResource> >& RemovedTextures)
 {
-	// We attempt to purge every 10Mb of accumulated textures.
-	static const uint64 PurgeAfterAddingNewBytes = 1024 * 1024 * 10; // 10Mb
-
-	if ( TextureMemorySincePurge >= PurgeAfterAddingNewBytes )
+	for (FTextureResourceMap::TIterator It(TextureMap); It; ++It)
 	{
-		for ( FTextureResourceMap::TIterator It(TextureMap); It; ++It )
+		TWeakObjectPtr<UTexture>& Key = It.Key();
+		if (!Key.IsValid())
 		{
-			TWeakObjectPtr<UTexture>& Key = It.Key();
-			if ( !Key.IsValid() )
-			{
-				RemovedTextures.Push(It.Value());
-
-				It.RemoveCurrent();
-			}
+			RemovedTextures.Push(It.Value());
+			It.Value()->ResetTexture();
+			It.RemoveCurrent();
 		}
-
-		TextureMemorySincePurge = 0;
 	}
 }
 
 void FDynamicResourceMap::RemoveExpiredMaterialResources(TArray< TSharedPtr<FSlateMaterialResource> >& RemovedMaterials)
 {
-	static const int32 CheckingIncrement = 20;
-
-	if ( MaterialMap.Num() > ( LastExpiredMaterialNumMarker + CheckingIncrement ) )
+	for (FMaterialResourceMap::TIterator It(MaterialMap); It; ++It)
 	{
-		for ( FMaterialResourceMap::TIterator It(MaterialMap); It; ++It )
+		FMaterialKey& Key = It.Key();
+		if (!Key.Material.IsValid())
 		{
-			FMaterialKey& Key = It.Key();
-			if ( !Key.Material.IsValid() )
-			{
-				RemovedMaterials.Push(It.Value());
-
-				It.RemoveCurrent();
-			}
+			RemovedMaterials.Push(It.Value());
+			It.Value()->ResetMaterial();
+			It.RemoveCurrent();
 		}
-
-		LastExpiredMaterialNumMarker = MaterialMap.Num();
 	}
 }
 
 FSlateRHIResourceManager::FSlateRHIResourceManager()
-	: BadResourceTexture(nullptr)
+	: bExpiredResourcesNeedCleanup(false)
+	, BadResourceTexture(nullptr)
+	, DeleteResourcesCommand(
+		TEXT("Slate.DeleteResources"),
+		*LOCTEXT("CommandText_DeleteResources", "Flushes and deletes all resources created by Slate's RHI Resource Manager.").ToString(),
+		FConsoleCommandDelegate::CreateRaw(this, &FSlateRHIResourceManager::DeleteBrushResourcesCommand))
 {
-	FCoreDelegates::OnPreExit.AddRaw( this, &FSlateRHIResourceManager::OnAppExit );
+	FCoreDelegates::OnPreExit.AddRaw(this, &FSlateRHIResourceManager::OnAppExit);
+	FCoreUObjectDelegates::GetPostGarbageCollect().AddRaw(this, &FSlateRHIResourceManager::OnPostGarbageCollect);
 
-	MaxAltasedTextureSize = FIntPoint(256,256);
-	if( GIsEditor )
+	MaxAltasedTextureSize = FIntPoint(256, 256);
+	if (GIsEditor)
 	{
 		AtlasSize = 2048;
 	}
 	else
 	{
 		AtlasSize = 1024;
-		if( GConfig )
+		if (GConfig)
 		{
 			int32 RequestedSize = 1024;
-			GConfig->GetInt( TEXT("SlateRenderer"), TEXT("TextureAtlasSize"), RequestedSize, GEngineIni );
-			AtlasSize = FMath::Clamp<uint32>( RequestedSize, 0, 2048 );
+			GConfig->GetInt(TEXT("SlateRenderer"), TEXT("TextureAtlasSize"), RequestedSize, GEngineIni);
+			AtlasSize = FMath::Clamp<uint32>(RequestedSize, 0, 2048);
 
 			int32 MaxAtlasedTextureWidth = 256;
 			int32 MaxAtlasedTextureHeight = 256;
-			GConfig->GetInt( TEXT("SlateRenderer"), TEXT("MaxAtlasedTextureWidth"), MaxAtlasedTextureWidth, GEngineIni );
-			GConfig->GetInt( TEXT("SlateRenderer"), TEXT("MaxAtlasedTextureHeight"),MaxAtlasedTextureHeight, GEngineIni );
+			GConfig->GetInt(TEXT("SlateRenderer"), TEXT("MaxAtlasedTextureWidth"), MaxAtlasedTextureWidth, GEngineIni);
+			GConfig->GetInt(TEXT("SlateRenderer"), TEXT("MaxAtlasedTextureHeight"), MaxAtlasedTextureHeight, GEngineIni);
 
 			// Max texture size cannot be larger than the max size of the atlas
-			MaxAltasedTextureSize.X = FMath::Clamp<int32>( MaxAtlasedTextureWidth, 0, AtlasSize );
-			MaxAltasedTextureSize.Y = FMath::Clamp<int32>( MaxAtlasedTextureHeight, 0, AtlasSize );
+			MaxAltasedTextureSize.X = FMath::Clamp<int32>(MaxAtlasedTextureWidth, 0, AtlasSize);
+			MaxAltasedTextureSize.Y = FMath::Clamp<int32>(MaxAtlasedTextureHeight, 0, AtlasSize);
 		}
 	}
 }
@@ -235,8 +221,9 @@ FSlateRHIResourceManager::FSlateRHIResourceManager()
 FSlateRHIResourceManager::~FSlateRHIResourceManager()
 {
 	FCoreDelegates::OnPreExit.RemoveAll( this );
+	FCoreUObjectDelegates::GetPostGarbageCollect().RemoveAll(this);
 
-	if ( GIsRHIInitialized )
+	if (GIsRHIInitialized)
 	{
 		FlushRenderingCommands();
 
@@ -244,6 +231,42 @@ FSlateRHIResourceManager::~FSlateRHIResourceManager()
 	}
 }
 
+void FSlateRHIResourceManager::OnPostGarbageCollect()
+{
+	TryToCleanupExpiredResources(true);
+}
+
+void FSlateRHIResourceManager::TryToCleanupExpiredResources(bool bForceCleanup)
+{
+	if (!(IsInGameThread() && !IsInSlateThread()))
+	{
+		return;
+	}
+
+	if (bForceCleanup || bExpiredResourcesNeedCleanup)
+	{
+		if (ResourceCriticalSection.TryLock())
+		{
+			bExpiredResourcesNeedCleanup = false;
+
+			DynamicResourceMap.RemoveExpiredTextureResources(UTextureFreeList);
+			DynamicResourceMap.RemoveExpiredMaterialResources(MaterialResourceFreeList);
+
+			ResourceCriticalSection.Unlock();
+		}
+		else
+		{
+			// It's possible that during a slate loading thread we might both need to load something, be doing garbage collection,
+			// and be midway rendering the loading screen.  Composite font loads being an example, being loaded for subtitles on
+			// a movie.
+			//
+			// When this happens - to avoid a potential deadlock, we just queue up attempting to cleanup expired resources until the
+			// next time we tick the resource manager when we fail to acquire the lock on the resource manager.
+			bExpiredResourcesNeedCleanup = true;
+		}
+	}
+}
+
 int32 FSlateRHIResourceManager::GetNumAtlasPages() const
 {
 	return TextureAtlases.Num();
@@ -266,6 +289,8 @@ bool FSlateRHIResourceManager::IsAtlasPageResourceAlphaOnly() const
 
 void FSlateRHIResourceManager::Tick(float DeltaSeconds)
 {
+	TryToCleanupExpiredResources(false);
+
 	// Don't need to do this if there's no RHI thread.
 	if (IsRunningRHIInSeparateThread())
 	{
@@ -382,8 +407,16 @@ bool FSlateRHIResourceManager::LoadTexture( const FName& TextureName, const FStr
 	if( FFileHelper::LoadFileToArray( RawFileData, *ResourcePath ) )
 	{
 		IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>( FName("ImageWrapper") );
-		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper( EImageFormat::PNG );
-		if ( ImageWrapper.IsValid() && ImageWrapper->SetCompressed( RawFileData.GetData(), RawFileData.Num() ) )
+
+		//Try and determine format, if that fails assume PNG
+		EImageFormat ImageFormat = ImageWrapperModule.DetectImageFormat(RawFileData.GetData(), RawFileData.Num());
+		if (ImageFormat == EImageFormat::Invalid)
+		{
+			ImageFormat = EImageFormat::PNG;
+		}
+		TSharedPtr<IImageWrapper> ImageWrapper = ImageWrapperModule.CreateImageWrapper(ImageFormat);
+
+		if ( ImageWrapper.IsValid() && ImageWrapper->SetCompressed( RawFileData.GetData(), RawFileData.Num()) )
 		{
 			Width = ImageWrapper->GetWidth();
 			Height = ImageWrapper->GetHeight();
@@ -514,7 +547,7 @@ FSlateShaderResourceProxy* FSlateRHIResourceManager::GetShaderResource( const FS
 	UObject* ResourceObject = InBrush.GetResourceObject();
 	FSlateShaderResourceProxy* Resource = nullptr;
 
-	if(ResourceObject != nullptr && (ResourceObject->IsPendingKill() || ResourceObject->IsUnreachable() || ResourceObject->HasAnyFlags(RF_BeginDestroyed)))
+	if (ResourceObject != nullptr && (ResourceObject->IsPendingKillOrUnreachable() || ResourceObject->HasAnyFlags(RF_BeginDestroyed)))
 	{
 		UE_LOG(LogSlate, Warning, TEXT("Attempted to access resource for %s which is pending kill, unreachable or pending destroy"), *ResourceObject->GetName());
 	}
@@ -527,7 +560,7 @@ FSlateShaderResourceProxy* FSlateRHIResourceManager::GetShaderResource( const FS
 		else if(ResourceObject && ResourceObject->IsA<UMaterialInterface>())
 		{
 			FSlateMaterialResource* MaterialResource = GetMaterialResource(ResourceObject, &InBrush, nullptr, 0);
-			Resource = MaterialResource->SlateProxy;
+			Resource = MaterialResource->GetResourceProxy();
 		}
 		else if(InBrush.IsDynamicallyLoaded() || (InBrush.HasUObject()))
 		{
@@ -641,7 +674,7 @@ TSharedPtr<FSlateUTextureResource> FSlateRHIResourceManager::MakeDynamicUTexture
 		if (UTextureFreeList.Num() > 0)
 		{
 			TextureResource = UTextureFreeList.Pop(/*bAllowShrinking=*/ false);
-			TextureResource->TextureObject = InTextureObject;
+			TextureResource->UpdateTexture(InTextureObject);
 		}
 		else
 		{
@@ -685,9 +718,9 @@ FSlateShaderResourceProxy* FSlateRHIResourceManager::FindOrCreateDynamicTextureR
 					}
 				}
 
-				if ( TextureResource.IsValid() && TextureResource->TextureObject && TextureResource->TextureObject->Resource )
+				if ( TextureResource.IsValid() && TextureResource->GetTextureObject() && TextureResource->GetTextureObject()->Resource )
 				{
-					TextureResource->UpdateRenderResource(TextureObject->Resource);
+					TextureResource->UpdateTexture(TextureObject);
 					return TextureResource->Proxy;
 				}
 			}
@@ -771,7 +804,7 @@ FSlateMaterialResource* FSlateRHIResourceManager::GetMaterialResource(const UObj
 		if(MaterialResourceFreeList.Num() > 0)
 		{
 			MaterialResource = MaterialResourceFreeList.Pop();
-		
+			ensure(MaterialResource->GetResourceProxy() == nullptr);
 			MaterialResource->UpdateMaterial( *Material, ImageSize, TextureMask );
 		}
 		else
@@ -807,7 +840,7 @@ bool FSlateRHIResourceManager::ContainsTexture( const FName& ResourceName ) cons
 
 void FSlateRHIResourceManager::ReleaseDynamicResource( const FSlateBrush& InBrush )
 {
-	checkSlow( IsThreadSafeForSlateRendering() )
+	checkSlow(IsThreadSafeForSlateRendering());
 
 	// Note: Only dynamically loaded or utexture brushes can be dynamically released
 	if( InBrush.HasUObject() || InBrush.IsDynamicallyLoaded() )
@@ -823,8 +856,8 @@ void FSlateRHIResourceManager::ReleaseDynamicResource( const FSlateBrush& InBrus
 			if(TextureResource.IsValid())
 			{
 				//remove it from the accessed textures
-				DynamicResourceMap.RemoveUTextureResource(TextureResource->TextureObject);
-
+				DynamicResourceMap.RemoveUTextureResource(TextureResource->GetTextureObject());
+				TextureResource->ResetTexture();
 				UTextureFreeList.Add(TextureResource);
 
 				DEC_DWORD_STAT_BY(STAT_SlateNumDynamicTextures, 1);
@@ -882,16 +915,6 @@ void FSlateRHIResourceManager::LoadStyleResources( const ISlateStyle& Style )
 	CreateTextures( Resources );
 }
 
-void FSlateRHIResourceManager::BeginReleasingAccessedResources(bool bImmediatelyFlush)
-{
-	// IsInGameThread returns true when you're in the slate loading thread
-	if ( IsInGameThread() && !IsInSlateThread() )
-	{
-		DynamicResourceMap.RemoveExpiredTextureResources(UTextureFreeList);
-		DynamicResourceMap.RemoveExpiredMaterialResources(MaterialResourceFreeList);
-	}
-}
-
 void FSlateRHIResourceManager::UpdateTextureAtlases()
 {
 	for( int32 AtlasIndex = 0; AtlasIndex < TextureAtlases.Num(); ++AtlasIndex )
@@ -1052,8 +1075,19 @@ void FSlateRHIResourceManager::ReleaseResources()
 	// Note the base class has texture proxies only which do not need to be released
 }
 
+void FSlateRHIResourceManager::DeleteBrushResourcesCommand()
+{
+	FlushRenderingCommands();
+
+	FScopeLock ScopeLock(&ResourceCriticalSection);
+
+	DeleteUObjectBrushResources();
+}
+
 void FSlateRHIResourceManager::DeleteResources()
 {
+	FScopeLock ScopeLock(&ResourceCriticalSection);
+
 	for( int32 AtlasIndex = 0; AtlasIndex < TextureAtlases.Num(); ++AtlasIndex )
 	{
 		delete TextureAtlases[AtlasIndex];
@@ -1068,17 +1102,28 @@ void FSlateRHIResourceManager::DeleteResources()
 	SET_DWORD_STAT(STAT_SlateNumTextureAtlases, 0);
 	SET_DWORD_STAT(STAT_SlateNumDynamicTextures, 0);
 
-	DynamicResourceMap.Empty();
 	TextureAtlases.Empty();
 	NonAtlasedTextures.Empty();
 	DynamicTextureFreeList.Empty();
-	MaterialResourceFreeList.Empty();
-	UTextureFreeList.Empty();
 
 	// Clean up mapping to texture
 	ClearTextureMap();
 
-	for ( TCachedBufferMap::TIterator BufferIt(CachedBuffers); BufferIt; ++BufferIt )
+	DeleteUObjectBrushResources();
+
+	DeleteCachedBuffers();
+}
+
+void FSlateRHIResourceManager::DeleteUObjectBrushResources()
+{
+	DynamicResourceMap.Empty();
+	MaterialResourceFreeList.Empty();
+	UTextureFreeList.Empty();
+}
+
+void FSlateRHIResourceManager::DeleteCachedBuffers()
+{
+	for (TCachedBufferMap::TIterator BufferIt(CachedBuffers); BufferIt; ++BufferIt)
 	{
 		FCachedRenderBuffers* Buffer = BufferIt.Value();
 		delete Buffer;
@@ -1086,10 +1131,10 @@ void FSlateRHIResourceManager::DeleteResources()
 
 	CachedBuffers.Empty();
 
-	for ( TCachedBufferPoolMap::TIterator BufferIt(CachedBufferPool); BufferIt; ++BufferIt )
+	for (TCachedBufferPoolMap::TIterator BufferIt(CachedBufferPool); BufferIt; ++BufferIt)
 	{
 		TArray< FCachedRenderBuffers* >& Pool = BufferIt.Value();
-		for ( FCachedRenderBuffers* PooledBuffer : Pool )
+		for (FCachedRenderBuffers* PooledBuffer : Pool)
 		{
 			delete PooledBuffer;
 		}
@@ -1111,7 +1156,7 @@ void FSlateRHIResourceManager::ReloadTextures()
 	// Delete allocated resources (cpu)
 	DeleteResources();
 
-	// Reload everythng
+	// Reload everything
 	LoadUsedTextures();
 }
 
@@ -1154,3 +1199,5 @@ void FSlateRHIResourceManager::ClearScenes()
 	checkSlow(IsInRenderingThread());
 	ActiveScenes.Empty();
 }
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.h
index 20bb60375504..35b2d5ae2eb4 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateRHIResourceManager.h
@@ -106,10 +106,6 @@ private:
 	/** Map of all object resources */
 	typedef TMap<TWeakObjectPtr<UObject>, TSharedPtr<FSlateAtlasedTextureResource> > FObjectResourceMap;
 	FObjectResourceMap ObjectMap;
-
-	uint64 TextureMemorySincePurge;
-
-	int32 LastExpiredMaterialNumMarker;
 };
 
 
@@ -155,13 +151,6 @@ public:
 
 	void LoadStyleResources( const ISlateStyle& Style );
 
-	/**
-	 * Clears accessed UTexture and Material resources from the previous frame
-	 * The accessed textures is used to determine which textures need be updated on the render thread
-	 * so they can be used by slate
-	 */
-	void BeginReleasingAccessedResources(bool bImmediatelyFlush);
-
 	/**
 	 * Updates texture atlases if needed
 	 */
@@ -249,7 +238,13 @@ public:
 	void AddSceneAt(FSceneInterface* Scene, int32 Index);
 	void ClearScenes();
 
+	FCriticalSection* GetResourceCriticalSection() { return &ResourceCriticalSection; }
+
 private:
+	void OnPostGarbageCollect();
+
+	void TryToCleanupExpiredResources(bool bForceCleanup);
+
 	void ReleaseCachedBuffer(FRHICommandListImmediate& RHICmdList, FCachedRenderBuffers* PooledBuffer);
 
 	/**
@@ -265,6 +260,21 @@ private:
 	 */
 	void DeleteResources();
 
+	/**
+	 * Deletes re-creatable brush resources - a soft reset.
+	 */
+	void DeleteUObjectBrushResources();
+
+	/**
+	 * Deletes cached buffers
+	 */
+	void DeleteCachedBuffers();
+
+	/**
+	 * Debugging command to try forcing a refresh of UObject brushes.
+	 */
+	void DeleteBrushResourcesCommand();
+
 	/** 
 	 * Creates textures from files on disk and atlases them if possible
 	 *
@@ -305,6 +315,15 @@ private:
 	UTexture* GetBadResourceTexture();
 
 private:
+	/**
+	 * Necessary to grab before flushing the resource pool, as it may be being 
+	 * accessed by multiple threads when loading.
+	 */
+	FCriticalSection ResourceCriticalSection;
+
+	/** Attempt to cleanup */
+	bool bExpiredResourcesNeedCleanup;
+
 	/** Map of all active dynamic resources being used by brushes */
 	FDynamicResourceMap DynamicResourceMap;
 	/** List of old utexture resources that are free to use as new resources */
@@ -336,7 +355,10 @@ private:
 	 */
 	TArray<FCachedRenderBuffers*> PooledBuffersPendingRelease;
 
-
+	/**  */
 	TArray<FSceneInterface*> ActiveScenes;
+
+	/** Debugging Commands */
+	FAutoConsoleCommand DeleteResourcesCommand;
 };
 
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.cpp
index af5badfed3db..a5f341eae2ca 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.cpp
@@ -4,7 +4,10 @@
 #include "Rendering/RenderingCommon.h"
 
 /** Flag to determine if we are running with a color vision deficiency shader on */
-uint32 GSlateShaderColorVisionDeficiencyType = 0;
+EColorVisionDeficiency GSlateColorDeficiencyType = EColorVisionDeficiency::NormalVision;
+int32 GSlateColorDeficiencySeverity = 0;
+bool GSlateColorDeficiencyCorrection = false;
+bool GSlateShowColorDeficiencyCorrectionWithDeficiency = false;
 
 IMPLEMENT_SHADER_TYPE(, FSlateElementVS, TEXT("/Engine/Private/SlateVertexShader.usf"), TEXT("Main"), SF_Vertex);
 
@@ -12,6 +15,7 @@ IMPLEMENT_SHADER_TYPE(, FSlateDebugOverdrawPS, TEXT("/Engine/Private/SlateElemen
 
 IMPLEMENT_SHADER_TYPE(, FSlatePostProcessBlurPS, TEXT("/Engine/Private/SlatePostProcessPixelShader.usf"), TEXT("GaussianBlurMain"), SF_Pixel);
 IMPLEMENT_SHADER_TYPE(, FSlatePostProcessDownsamplePS, TEXT("/Engine/Private/SlatePostProcessPixelShader.usf"), TEXT("DownsampleMain"), SF_Pixel);
+IMPLEMENT_SHADER_TYPE(, FSlatePostProcessColorDeficiencyPS, TEXT("/Engine/Private/SlatePostProcessColorDeficiencyPixelShader.usf"), TEXT("ColorDeficiencyMain"), SF_Pixel);
 
 IMPLEMENT_SHADER_TYPE(, FSlateMaskingVS, TEXT("/Engine/Private/SlateMaskingShader.usf"), TEXT("MainVS"), SF_Vertex);
 IMPLEMENT_SHADER_TYPE(, FSlateMaskingPS, TEXT("/Engine/Private/SlateMaskingShader.usf"), TEXT("MainPS"), SF_Pixel);
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.h
index 21147843c23c..f02d45da8971 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateShaders.h
@@ -11,7 +11,10 @@
 #include "ShaderParameterUtils.h"
 #include "Rendering/RenderingCommon.h"
 
-extern uint32 GSlateShaderColorVisionDeficiencyType;
+extern EColorVisionDeficiency GSlateColorDeficiencyType;
+extern int32 GSlateColorDeficiencySeverity;
+extern bool GSlateColorDeficiencyCorrection;
+extern bool GSlateShowColorDeficiencyCorrectionWithDeficiency;
 
 /**
  * The vertex declaration for the slate vertex shader
@@ -209,7 +212,6 @@ public:
 		OutEnvironment.SetDefine(TEXT("SHADER_TYPE"), (uint32)ShaderType);
 		OutEnvironment.SetDefine(TEXT("DRAW_DISABLED_EFFECT"), (uint32)( bDrawDisabledEffect ? 1 : 0 ));
 		OutEnvironment.SetDefine(TEXT("USE_TEXTURE_ALPHA"), (uint32)( bUseTextureAlpha ? 1 : 0 ));
-		OutEnvironment.SetDefine(TEXT("COLOR_VISION_DEFICIENCY_TYPE"), GSlateShaderColorVisionDeficiencyType);
 		OutEnvironment.SetDefine(TEXT("USE_MATERIALS"), (uint32)0);
 
 		FSlateElementPS::ModifyCompilationEnvironment( Parameters, OutEnvironment );
@@ -398,6 +400,57 @@ private:
 };
 
 
+class FSlatePostProcessColorDeficiencyPS : public FSlateElementPS
+{
+	DECLARE_SHADER_TYPE(FSlatePostProcessColorDeficiencyPS, Global);
+public:
+	/** Indicates that this shader should be cached */
+	static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& Parameters)
+	{
+		return true;
+	}
+
+	FSlatePostProcessColorDeficiencyPS()
+	{
+	}
+
+	/** Constructor.  Binds all parameters used by the shader */
+	FSlatePostProcessColorDeficiencyPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
+		: FSlateElementPS(Initializer)
+	{
+		ColorVisionDeficiencyType.Bind(Initializer.ParameterMap, TEXT("ColorVisionDeficiencyType"));
+		ColorVisionDeficiencySeverity.Bind(Initializer.ParameterMap, TEXT("ColorVisionDeficiencySeverity"));
+		bCorrectDeficiency.Bind(Initializer.ParameterMap, TEXT("bCorrectDeficiency"));
+		bSimulateCorrectionWithDeficiency.Bind(Initializer.ParameterMap, TEXT("bSimulateCorrectionWithDeficiency"));
+	}
+
+	void SetColorRules(FRHICommandList& RHICmdList, bool bCorrect, EColorVisionDeficiency DeficiencyType, int32 Severity)
+	{
+		SetShaderValue(RHICmdList, GetPixelShader(), ColorVisionDeficiencyType, (float)DeficiencyType);
+		SetShaderValue(RHICmdList, GetPixelShader(), ColorVisionDeficiencySeverity, (float)Severity);
+		SetShaderValue(RHICmdList, GetPixelShader(), bCorrectDeficiency, bCorrect ? 1.0f : 0.0f);
+	}
+
+	void SetShowCorrectionWithDeficiency(FRHICommandList& RHICmdList, bool bShowCorrectionWithDeficiency)
+	{
+		SetShaderValue(RHICmdList, GetPixelShader(), bSimulateCorrectionWithDeficiency, bShowCorrectionWithDeficiency ? 1.0f : 0.0f);
+	}
+
+	virtual bool Serialize(FArchive& Ar) override
+	{
+		Ar << ColorVisionDeficiencyType;
+		Ar << ColorVisionDeficiencySeverity;
+		Ar << bCorrectDeficiency;
+		Ar << bSimulateCorrectionWithDeficiency;
+		return FSlateElementPS::Serialize(Ar);
+	}
+private:
+	FShaderParameter ColorVisionDeficiencyType;
+	FShaderParameter ColorVisionDeficiencySeverity;
+	FShaderParameter bCorrectDeficiency;
+	FShaderParameter bSimulateCorrectionWithDeficiency;
+};
+
 
 class FSlateMaskingVS : public FGlobalShader
 {
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.cpp b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.cpp
index 123eb1a7a5d3..e19246196e1b 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.cpp
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.cpp
@@ -43,13 +43,16 @@ void FSlateBaseUTextureResource::UpdateDebugName()
 	}
 }
 
-void FSlateBaseUTextureResource::CheckIfValid() const
+void FSlateBaseUTextureResource::CheckForStaleResources() const
 {
-	// pending kill objects may still be rendered for a frame so it is valid for the check to pass
-	const bool bEvenIfPendingKill = true;
-	// This test needs to be thread safe.  It doesnt give us as many chances to trap bugs here but it is still useful
-	const bool bThreadSafe = true;
-	checkf(ObjectWeakPtr.IsValid(bEvenIfPendingKill, bThreadSafe), TEXT("Texture %s has become invalid.  This means the resource was garbage collected while slate was using it"), *DebugName.ToString());
+	if (DebugName != NAME_None)
+	{
+		// pending kill objects may still be rendered for a frame so it is valid for the check to pass
+		const bool bEvenIfPendingKill = true;
+		// This test needs to be thread safe.  It doesn't give us as many chances to trap bugs here but it is still useful
+		const bool bThreadSafe = true;
+		checkf(ObjectWeakPtr.IsValid(bEvenIfPendingKill, bThreadSafe), TEXT("Texture %s has become invalid.  This means the resource was garbage collected while slate was using it"), *DebugName.ToString());
+	}
 }
 #endif
 
@@ -75,13 +78,42 @@ FSlateUTextureResource::~FSlateUTextureResource()
 	}
 }
 
-void FSlateUTextureResource::UpdateRenderResource(FTexture* InFTexture)
+void FSlateUTextureResource::UpdateTexture(UTexture* InTexture)
 {
-	if ( InFTexture )
+	TextureObject = InTexture;
+
+#if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
+	ObjectWeakPtr = TextureObject;
+	UpdateDebugName();
+#endif
+
+	if (!Proxy)
 	{
-		// If the RHI data has changed, it's possible the underlying size of the texture has changed,
-		// if that's true we need to update the actual size recorded on the proxy as well, otherwise 
-		// the texture will continue to render using the wrong size.
-		Proxy->ActualSize = FIntPoint(InFTexture->GetSizeX(), InFTexture->GetSizeY());
+		Proxy = new FSlateShaderResourceProxy;
 	}
+
+	FTexture* TextureResource = InTexture->Resource;
+
+	Proxy->Resource = this;
+	// If the RHI data has changed, it's possible the underlying size of the texture has changed,
+	// if that's true we need to update the actual size recorded on the proxy as well, otherwise 
+	// the texture will continue to render using the wrong size.
+	Proxy->ActualSize = FIntPoint(TextureResource->GetSizeX(), TextureResource->GetSizeY());
 }
+
+void FSlateUTextureResource::ResetTexture()
+{
+	TextureObject = nullptr;
+
+#if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
+	ObjectWeakPtr = nullptr;
+	UpdateDebugName();
+#endif
+
+	if (Proxy)
+	{
+		delete Proxy;
+	}
+	Proxy = nullptr;
+}
+
diff --git a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.h b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.h
index 41a8667d5fc6..a51590f603cb 100644
--- a/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.h
+++ b/Engine/Source/Runtime/SlateRHIRenderer/Private/SlateUTextureResource.h
@@ -36,18 +36,18 @@ public:
 		return FTextureRHIRef();
 	}
 
+	UTexture* GetTextureObject() const { return TextureObject; }
+
+
 #if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
-	void CheckIfValid() const;
-#else
-	FORCEINLINE void CheckIfValid() const { }
+	virtual void CheckForStaleResources() const override;
 #endif
 
-private:
+protected:
 #if SLATE_CHECK_UOBJECT_RENDER_RESOURCES
 	void UpdateDebugName();
 #endif
 
-public:
 	/** Texture UObject.  Note: lifetime is managed externally */
 	UTexture* TextureObject;
 
@@ -71,8 +71,8 @@ public:
 	/**
 	 * Updates the rendering resource with a potentially new texture
 	 */
-	void UpdateRenderResource(FTexture* InFTexture);
-
+	void UpdateTexture(UTexture* InTexture);
+	void ResetTexture();
 public:
 	/** Slate rendering proxy */
 	FSlateShaderResourceProxy* Proxy;
diff --git a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/IPAddressBSDIPv6.h b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/IPAddressBSDIPv6.h
index eb0866fcbbf8..ccbd9934c145 100644
--- a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/IPAddressBSDIPv6.h
+++ b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/IPAddressBSDIPv6.h
@@ -46,7 +46,7 @@ public:
 		{
 			// hack: if it's the hardcoded IPv4 multicasting address then translate into an IPv6 multicast address
 			bool isValid;
-			SetIp(L"ff02::2", isValid);
+			SetIp(TEXT("ff02::2"), isValid);
 			check(isValid);
 		}
 		else
@@ -100,12 +100,11 @@ public:
 			// IPv4 address will only have a port when a colon is present.
 			// IPv6 address will only have a port when surrounded by brackets.
 			const bool bHasPort = (INDEX_NONE != LastColonIndex) && (!bIsIPv6 || (bHasCloseBracket && LastColonIndex > CloseBracketIndex));
-
+			FString Port;
 			if (bHasPort)
 			{
-				FString Port = AddressString.RightChop(LastColonIndex + 1);
+				Port = AddressString.RightChop(LastColonIndex + 1);
 				AddressString = AddressString.Left(LastColonIndex);
-				SetPort(FCString::Atoi(*Port));
 			}
 
 			if (bIsIPv6)
@@ -115,6 +114,14 @@ public:
 
 				// Check for valid IPv6 address
 				const auto InAddrAnsi = StringCast<ANSICHAR>(*AddressString);
+#if PLATFORM_IOS
+				ISocketSubsystem* SocketSubsystem = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM);
+				if (SocketSubsystem && SocketSubsystem->GetHostByName(InAddrAnsi.Get(), *this) == SE_NO_ERROR)
+				{
+					bIsValid = true;
+				}
+				else
+#endif
 				if (inet_pton(AF_INET6, InAddrAnsi.Get(), &Addr.sin6_addr))
 				{
 					bIsValid = true;
@@ -124,12 +131,25 @@ public:
 			{
 				const auto InAddrAnsi = StringCast<ANSICHAR>(*AddressString);
 				in_addr IPv4Addr;
+#if PLATFORM_IOS
+				ISocketSubsystem* SocketSubsystem = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM);
+				if (SocketSubsystem && SocketSubsystem->GetHostByName(InAddrAnsi.Get(), *this) == SE_NO_ERROR)
+				{
+					bIsValid = true;
+				}
+				else
+#endif
 				if (inet_pton(AF_INET, InAddrAnsi.Get(), &IPv4Addr))
 				{
 					bIsValid = true;
 					SetIp(IPv4Addr);
 				}
 			}
+
+			if (bHasPort)
+			{
+				SetPort(FCString::Atoi(*Port));
+			}
 		}
 	}
 
@@ -173,6 +193,13 @@ public:
 	{
 		Addr.sin6_addr = IpAddr;
 	}
+	
+#if PLATFORM_IOS
+	void SetIp(const sockaddr_in6& IpAddr)
+	{
+		Addr = IpAddr;
+	}
+#endif
 
 	/**
 	* Sets the ip address using a generic sockaddr_storage
@@ -328,6 +355,13 @@ public:
 	{
 		return (const sockaddr*)&Addr;
 	}
+	
+#if PLATFORM_IOS
+	virtual void Copy(const FInternetAddr& Other) override
+	{
+		Addr = static_cast<const FInternetAddrBSDIPv6&>(Other).Addr;
+	}
+#endif
 };
 
 
diff --git a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.cpp b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.cpp
index 394c107c35a0..eedddd092503 100644
--- a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.cpp
+++ b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.cpp
@@ -58,19 +58,9 @@ ESocketErrors FSocketSubsystemBSDIPv6::GetHostByName(const ANSICHAR* HostName, F
 	// We are only interested in IPv6 addresses.
 	addrinfo HintAddrInfo;
 	FMemory::Memzero(&HintAddrInfo, sizeof(HintAddrInfo));
-	HintAddrInfo.ai_family = AF_INET6;
+	HintAddrInfo.ai_family = AF_UNSPEC;
 
-	// Handle both IPv4 and IPv6 addrs
-	FString HostNameIpV6(HostName);
-	FInternetAddrBSDIPv6 IPv6Addr;
-	bool bValidIPv6Addr = false;
-	IPv6Addr.SetIp(ANSI_TO_TCHAR(HostName), bValidIPv6Addr);
-	if (bValidIPv6Addr)
-	{
-		HostNameIpV6 = IPv6Addr.ToString(false);
-	}
-
-	int32 ErrorCode = getaddrinfo(TCHAR_TO_ANSI(*HostNameIpV6), NULL, &HintAddrInfo, &AddrInfo);
+	int32 ErrorCode = getaddrinfo(HostName, NULL, &HintAddrInfo, &AddrInfo);
 	ESocketErrors SocketError = TranslateGAIErrorCode(ErrorCode);
 	if (SocketError == SE_NO_ERROR)
 	{
@@ -81,7 +71,21 @@ ESocketErrors FSocketSubsystemBSDIPv6::GetHostByName(const ANSICHAR* HostName, F
 				sockaddr_in6* IPv6SockAddr = reinterpret_cast<sockaddr_in6*>(AddrInfo->ai_addr);
 				if (IPv6SockAddr != nullptr)
 				{
+#if PLATFORM_IOS
+					static_cast<FInternetAddrBSDIPv6&>(OutAddr).SetIp(*IPv6SockAddr);
+#else
 					static_cast<FInternetAddrBSDIPv6&>(OutAddr).SetIp(IPv6SockAddr->sin6_addr);
+#endif
+					freeaddrinfo(AddrInfo);
+					return SE_NO_ERROR;
+				}
+			}
+			else if (AddrInfo->ai_family == AF_INET)
+			{
+				sockaddr_in* IPv4SockAddr = reinterpret_cast<sockaddr_in*>(AddrInfo->ai_addr);
+				if (IPv4SockAddr != nullptr)
+				{
+					static_cast<FInternetAddrBSDIPv6&>(OutAddr).SetIp(IPv4SockAddr->sin_addr);
 					freeaddrinfo(AddrInfo);
 					return SE_NO_ERROR;
 				}
@@ -183,7 +187,7 @@ ESocketErrors FSocketSubsystemBSDIPv6::TranslateErrorCode(int32 Code)
 #if !PLATFORM_HAS_NO_EPROCLIM
 	case EPROCLIM: return SE_EPROCLIM;
 #endif
-    case EPIPE: return SE_ECONNRESET; // for when backgrounding with an open pipe to a server
+	case EPIPE: return SE_ECONNRESET; // for when backgrounding with an open pipe to a server
 	case HOST_NOT_FOUND: return SE_HOST_NOT_FOUND;
 	case TRY_AGAIN: return SE_TRY_AGAIN;
 	case NO_RECOVERY: return SE_NO_RECOVERY;
@@ -192,9 +196,9 @@ ESocketErrors FSocketSubsystemBSDIPv6::TranslateErrorCode(int32 Code)
 	}
 #endif
 
-    UE_LOG(LogSockets, Warning, TEXT("Unhandled socket error! Error Code: %d. Returning SE_EINVAL!"), Code);
-    ensure(0);
-    return SE_EINVAL;
+	UE_LOG(LogSockets, Warning, TEXT("Unhandled socket error! Error Code: %d. Returning SE_EINVAL!"), Code);
+	ensure(0);
+	return SE_EINVAL;
 }
 
 #endif
diff --git a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.h b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.h
index be0b162fbbdc..449d569e2205 100644
--- a/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.h
+++ b/Engine/Source/Runtime/Sockets/Private/BSDIPv6Sockets/SocketSubsystemBSDIPv6.h
@@ -73,8 +73,6 @@ protected:
 	// allow BSD sockets to use this when creating new sockets from accept() etc
 	friend FSocketBSDIPv6;
 
-private:
-
 	// Used to prevent multiple threads accessing the shared data.
 	FCriticalSection HostByNameSynch;
 };
diff --git a/Engine/Source/Runtime/Sockets/Private/IOS/SocketSubsystemIOS.cpp b/Engine/Source/Runtime/Sockets/Private/IOS/SocketSubsystemIOS.cpp
index 72f8983e0f7f..7ce5b328bf30 100644
--- a/Engine/Source/Runtime/Sockets/Private/IOS/SocketSubsystemIOS.cpp
+++ b/Engine/Source/Runtime/Sockets/Private/IOS/SocketSubsystemIOS.cpp
@@ -1,4 +1,4 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+	// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "SocketSubsystemIOS.h"
 #include "SocketSubsystemModule.h"
@@ -91,48 +91,58 @@ FSocket* FSocketSubsystemIOS::CreateSocket(const FName& SocketType, const FStrin
 
 TSharedRef<FInternetAddr> FSocketSubsystemIOS::GetLocalHostAddr(FOutputDevice& Out, bool& bCanBindAll)
 {
-	TSharedRef<FInternetAddr> HostAddr = CreateInternetAddr();
+	TSharedRef<FInternetAddrBSDIPv6IOS> HostAddr = MakeShareable(new FInternetAddrBSDIPv6IOS);
 	HostAddr->SetAnyAddress();
 
 	ifaddrs* Interfaces = NULL;
-	int32 WifiAddress;
 	bool bWasWifiSet = false;
-	int32 CellAddress;
 	bool bWasCellSet = false;
+	bool bWasIPv6Set = false;
 
 	// get all of the addresses
-	if (getifaddrs(&Interfaces) == 0) 
+	if (getifaddrs(&Interfaces) == 0)
 	{
 		// Loop through linked list of interfaces
 		for (ifaddrs* Travel = Interfaces; Travel != NULL; Travel = Travel->ifa_next)
 		{
-			if (Travel->ifa_addr->sa_family == AF_INET)
+			if (Travel->ifa_addr->sa_family == AF_INET6)
 			{
 				if (strcmp(Travel->ifa_name, "en0") == 0)
 				{
-					WifiAddress = ntohl(((sockaddr_in*)Travel->ifa_addr)->sin_addr.s_addr);
+					HostAddr->SetIp(*((sockaddr_in6*)Travel->ifa_addr));
 					bWasWifiSet = true;
-					// this is the best, no need to go on
-					break;
+					bWasIPv6Set = true;
 				}
-				else if (strcmp(Travel->ifa_name, "pdp_ip0") == 0)
+				else if (!bWasWifiSet && strcmp(Travel->ifa_name, "pdp_ip0") == 0)
 				{
-					CellAddress = ((sockaddr_in*)Travel->ifa_addr)->sin_addr.s_addr;
+					HostAddr->SetIp(*((sockaddr_in6*)Travel->ifa_addr));
+					bWasCellSet = true;
+				}
+			}
+			else if (!bWasIPv6Set && Travel->ifa_addr->sa_family == AF_INET)
+			{
+				if (strcmp(Travel->ifa_name, "en0") == 0)
+				{
+					HostAddr->SetIp(ntohl(((sockaddr_in*)Travel->ifa_addr)->sin_addr.s_addr));
+					bWasWifiSet = true;
+				}
+				else if (!bWasWifiSet && strcmp(Travel->ifa_name, "pdp_ip0") == 0)
+				{
+					HostAddr->SetIp(((sockaddr_in*)Travel->ifa_addr)->sin_addr.s_addr);
 					bWasCellSet = true;
 				}
 			}
 		}
+		
 		// Free memory
 		freeifaddrs(Interfaces);
 
 		if (bWasWifiSet)
 		{
-			HostAddr->SetIp(WifiAddress);
 			UE_LOG(LogIOS, Log, TEXT("Host addr is WIFI: %s"), *HostAddr->ToString(false));
 		}
 		else if (bWasCellSet)
 		{
-			HostAddr->SetIp(CellAddress);
 			UE_LOG(LogIOS, Log, TEXT("Host addr is CELL: %s"), *HostAddr->ToString(false));
 		}
 		else
diff --git a/Engine/Source/Runtime/Sockets/Public/IPAddress.h b/Engine/Source/Runtime/Sockets/Public/IPAddress.h
index f961a849c315..536634a6f78e 100644
--- a/Engine/Source/Runtime/Sockets/Public/IPAddress.h
+++ b/Engine/Source/Runtime/Sockets/Public/IPAddress.h
@@ -111,6 +111,10 @@ public:
 	 * @return true if a valid IP, false otherwise
 	 */
 	virtual bool IsValid() const = 0;
+	
+#if PLATFORM_IOS
+	virtual void Copy(const FInternetAddr& Other) { check(false); }
+#endif
 
 	/**
 	 * Determines if the string is in IP address form or needs host resolution
diff --git a/Engine/Source/Runtime/UMG/Private/Animation/MovieScene2DTransformTemplate.h b/Engine/Source/Runtime/UMG/Private/Animation/MovieScene2DTransformTemplate.h
index 2b04cfe94859..4a5fcb1ea9ed 100644
--- a/Engine/Source/Runtime/UMG/Private/Animation/MovieScene2DTransformTemplate.h
+++ b/Engine/Source/Runtime/UMG/Private/Animation/MovieScene2DTransformTemplate.h
@@ -22,7 +22,7 @@ struct FMovieScene2DTransformSectionTemplate : public FMovieScenePropertySection
 {
 	GENERATED_BODY()
 	
-	FMovieScene2DTransformSectionTemplate(){}
+	FMovieScene2DTransformSectionTemplate() : BlendType((EMovieSceneBlendType)0) {}
 	FMovieScene2DTransformSectionTemplate(const UMovieScene2DTransformSection& Section, const UMovieScenePropertyTrack& Track);
 
 private:
diff --git a/Engine/Source/Runtime/UMG/Private/Animation/MovieSceneMarginTemplate.h b/Engine/Source/Runtime/UMG/Private/Animation/MovieSceneMarginTemplate.h
index 8c9c3183a2e0..667dcc3ea2a8 100644
--- a/Engine/Source/Runtime/UMG/Private/Animation/MovieSceneMarginTemplate.h
+++ b/Engine/Source/Runtime/UMG/Private/Animation/MovieSceneMarginTemplate.h
@@ -21,7 +21,7 @@ struct FMovieSceneMarginSectionTemplate : public FMovieScenePropertySectionTempl
 {
 	GENERATED_BODY()
 	
-	FMovieSceneMarginSectionTemplate(){}
+	FMovieSceneMarginSectionTemplate() : BlendType((EMovieSceneBlendType)0) {}
 	FMovieSceneMarginSectionTemplate(const UMovieSceneMarginSection& Section, const UMovieScenePropertyTrack& Track);
 
 	const FMovieSceneFloatChannel& GetTopCurve() const    { return TopCurve; }
diff --git a/Engine/Source/Runtime/UMG/Private/Animation/UMGSequencePlayer.cpp b/Engine/Source/Runtime/UMG/Private/Animation/UMGSequencePlayer.cpp
index 536da9e11ec4..fd1f1590842f 100644
--- a/Engine/Source/Runtime/UMG/Private/Animation/UMGSequencePlayer.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Animation/UMGSequencePlayer.cpp
@@ -122,12 +122,6 @@ void UUMGSequencePlayer::Tick(float DeltaTime)
 
 		if ( bCompleted )
 		{
-			// There was a bug where Finish wasn't called, assets were created expecting this behavior. At the time of fixing this bug, the object version was incremented so that newly created assets would finish evaluation.
-			if (RootTemplateInstance.IsValid() && Animation->GetLegacyFinishOnStop())
-			{
-				RootTemplateInstance.Finish(*this);
-			}
-			
 			PlayerStatus = EMovieScenePlayerStatus::Stopped;
 			OnSequenceFinishedPlayingEvent.Broadcast(*this);
 			Animation->OnAnimationFinished.Broadcast();
diff --git a/Engine/Source/Runtime/UMG/Private/Animation/WidgetAnimation.cpp b/Engine/Source/Runtime/UMG/Private/Animation/WidgetAnimation.cpp
index af2825c547ae..20524b0a2ff2 100644
--- a/Engine/Source/Runtime/UMG/Private/Animation/WidgetAnimation.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Animation/WidgetAnimation.cpp
@@ -206,5 +206,9 @@ void UWidgetAnimation::UnbindPossessableObjects(const FGuid& ObjectId)
 	});
 }
 
+bool UWidgetAnimation::IsPostLoadThreadSafe() const
+{
+	return true;
+}
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/UMG/Private/Animation/WidgetMaterialTrackUtilities.cpp b/Engine/Source/Runtime/UMG/Private/Animation/WidgetMaterialTrackUtilities.cpp
index 02c5275fcf0e..701eb1131539 100644
--- a/Engine/Source/Runtime/UMG/Private/Animation/WidgetMaterialTrackUtilities.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Animation/WidgetMaterialTrackUtilities.cpp
@@ -122,6 +122,7 @@ void FWidgetMaterialHandle::SetMaterial(UMaterialInterface* InMaterial, UWidget*
 	if (RawWidget.IsValid())
 	{
 		RawWidget->Invalidate(EInvalidateWidget::LayoutAndVolatility);
+		OwnerWidget->SynchronizeProperties();
 	}
 }
 
diff --git a/Engine/Source/Runtime/UMG/Private/Blueprint/IUserListEntry.cpp b/Engine/Source/Runtime/UMG/Private/Blueprint/IUserListEntry.cpp
new file mode 100644
index 000000000000..0c7c07d863e7
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Blueprint/IUserListEntry.cpp
@@ -0,0 +1,88 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Blueprint/IUserListEntry.h"
+#include "Slate/SObjectTableRow.h"
+#include "Blueprint/UserWidget.h"
+
+TMap<TWeakObjectPtr<const UUserWidget>, TWeakPtr<const IObjectTableRow>> IObjectTableRow::ObjectRowsByUserWidget;
+
+UNativeUserListEntry::UNativeUserListEntry(const FObjectInitializer& Initializer)
+	: Super(Initializer)
+{
+}
+
+UUserListEntry::UUserListEntry(const FObjectInitializer& Initializer)
+	: Super(Initializer)
+{
+}
+
+void IUserListEntry::ReleaseEntry(UUserWidget& ListEntryWidget)
+{
+	if (IUserListEntry* NativeImplementation = Cast<IUserListEntry>(&ListEntryWidget))
+	{
+		NativeImplementation->NativeOnEntryReleased();
+	}
+	else if (ListEntryWidget.Implements<UUserListEntry>())
+	{
+		Execute_BP_OnEntryReleased(&ListEntryWidget);
+	}
+}
+
+void IUserListEntry::UpdateItemSelection(UUserWidget& ListEntryWidget, bool bIsSelected)
+{
+	if (IUserListEntry* NativeImplementation = Cast<IUserListEntry>(&ListEntryWidget))
+	{
+		NativeImplementation->NativeOnItemSelectionChanged(bIsSelected);
+	}
+	else if (ListEntryWidget.Implements<UUserListEntry>())
+	{
+		Execute_BP_OnItemSelectionChanged(&ListEntryWidget, bIsSelected);
+	}
+}
+
+void IUserListEntry::UpdateItemExpansion(UUserWidget& ListEntryWidget, bool bIsExpanded)
+{
+	if (IUserListEntry* NativeImplementation = Cast<IUserListEntry>(&ListEntryWidget))
+	{
+		NativeImplementation->NativeOnItemExpansionChanged(bIsExpanded);
+	}
+	else if (ListEntryWidget.Implements<UUserListEntry>())
+	{
+		Execute_BP_OnItemExpansionChanged(&ListEntryWidget, bIsExpanded);
+	}
+}
+
+bool IUserListEntry::IsListItemSelected() const
+{
+	TSharedPtr<const IObjectTableRow> SlateRow = IObjectTableRow::ObjectRowFromUserWidget(CastChecked<const UUserWidget>(this, ECastCheckedType::NullAllowed));
+	if (SlateRow.IsValid())
+	{
+		return SlateRow->IsItemSelected();
+	}
+	return false;
+}
+
+bool IUserListEntry::IsListItemExpanded() const
+{
+	TSharedPtr<const IObjectTableRow> SlateRow = IObjectTableRow::ObjectRowFromUserWidget(CastChecked<const UUserWidget>(this, ECastCheckedType::NullAllowed));
+	if (SlateRow.IsValid())
+	{
+		return SlateRow->IsItemExpanded();
+	}
+	return false;
+}
+
+void IUserListEntry::NativeOnEntryReleased()
+{
+	Execute_BP_OnEntryReleased(Cast<UObject>(this));
+}
+
+void IUserListEntry::NativeOnItemSelectionChanged(bool bIsSelected)
+{
+	Execute_BP_OnItemSelectionChanged(Cast<UObject>(this), bIsSelected);
+}
+
+void IUserListEntry::NativeOnItemExpansionChanged(bool bIsExpanded)
+{
+	Execute_BP_OnItemExpansionChanged(Cast<UObject>(this), bIsExpanded);
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Blueprint/IUserObjectListEntry.cpp b/Engine/Source/Runtime/UMG/Private/Blueprint/IUserObjectListEntry.cpp
new file mode 100644
index 000000000000..d1f190137f3e
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Blueprint/IUserObjectListEntry.cpp
@@ -0,0 +1,31 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Blueprint/IUserObjectListEntry.h"
+#include "Blueprint/UserWidget.h"
+
+UUserObjectListEntry::UUserObjectListEntry(const FObjectInitializer& Initializer)
+	: Super(Initializer)
+{
+}
+
+UObject* IUserObjectListEntry::GetListItem(UUserWidget& EntryWidget)
+{
+	if (EntryWidget.Implements<UUserObjectListEntry>())
+	{
+		return Execute_GetListItemObject(&EntryWidget);
+	}
+	return nullptr;
+}
+
+void IUserObjectListEntry::SetListItemObject(UUserWidget& ListEntryWidget, UObject* ListItemObject)
+{
+	if (IUserObjectListEntry* NativeImplementation = Cast<IUserObjectListEntry>(&ListEntryWidget))
+	{
+		NativeImplementation->SetListItemObjectInternal(ListItemObject);
+		Execute_OnListItemObjectSet(&ListEntryWidget, ListItemObject);
+	}
+	else if (ListEntryWidget.Implements<UUserObjectListEntry>())
+	{
+		Execute_OnListItemObjectSet(&ListEntryWidget, ListItemObject);
+	}
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Blueprint/ListViewDesignerPreviewItem.h b/Engine/Source/Runtime/UMG/Private/Blueprint/ListViewDesignerPreviewItem.h
new file mode 100644
index 000000000000..1a6b35603207
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Blueprint/ListViewDesignerPreviewItem.h
@@ -0,0 +1,14 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "ListViewDesignerPreviewItem.generated.h"
+
+// Empty dummy UObject used as the table view item during design time
+// Allows rough design-time previewing of how list contents will lay out
+UCLASS(Transient, Within = ListView)
+class UListViewDesignerPreviewItem : public UObject
+{
+	GENERATED_BODY()
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Blueprint/UserWidgetPool.cpp b/Engine/Source/Runtime/UMG/Private/Blueprint/UserWidgetPool.cpp
new file mode 100644
index 000000000000..75f0e4e6c3b5
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Blueprint/UserWidgetPool.cpp
@@ -0,0 +1,65 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Blueprint/UserWidgetPool.h"
+
+FUserWidgetPool::FUserWidgetPool(UWidget& InOwningWidget)
+	: OwningWidget(&InOwningWidget)
+{}
+
+FUserWidgetPool& FUserWidgetPool::operator=(FUserWidgetPool&& Other)
+{
+	OwningWidget = Other.OwningWidget;
+
+	ActiveWidgets = MoveTemp(Other.ActiveWidgets);
+	InactiveWidgets = MoveTemp(Other.InactiveWidgets);
+	CachedSlateByWidgetObject = MoveTemp(Other.CachedSlateByWidgetObject);
+
+	Other.OwningWidget.Reset();
+	Other.ResetPool();
+
+	return *this;
+}
+
+FUserWidgetPool::~FUserWidgetPool()
+{
+	ResetPool();
+}
+
+void FUserWidgetPool::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	Collector.AddReferencedObjects<UUserWidget>(ActiveWidgets, OwningWidget.Get());
+	Collector.AddReferencedObjects<UUserWidget>(InactiveWidgets, OwningWidget.Get());
+}
+
+void FUserWidgetPool::Release(UUserWidget* Widget, bool bReleaseSlate)
+{
+	const int32 ActiveWidgetIdx = ActiveWidgets.Find(Widget);
+	if (ActiveWidgetIdx != INDEX_NONE)
+	{
+		InactiveWidgets.Push(Widget);
+		ActiveWidgets.RemoveAt(ActiveWidgetIdx);
+
+		if (bReleaseSlate)
+		{
+			CachedSlateByWidgetObject.Remove(Widget);
+		}
+	}
+}
+
+void FUserWidgetPool::ReleaseAll(bool bReleaseSlate)
+{
+	InactiveWidgets.Append(ActiveWidgets);
+	ActiveWidgets.Empty();
+
+	if (bReleaseSlate)
+	{
+		CachedSlateByWidgetObject.Reset();
+	}
+}
+
+void FUserWidgetPool::ResetPool()
+{
+	InactiveWidgets.Reset();
+	ActiveWidgets.Reset();
+	CachedSlateByWidgetObject.Reset();
+}
diff --git a/Engine/Source/Runtime/UMG/Private/Components/Border.cpp b/Engine/Source/Runtime/UMG/Private/Components/Border.cpp
index 8c68561fe274..4e49ff31c3a2 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/Border.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/Border.cpp
@@ -224,6 +224,11 @@ void UBorder::SetBrushFromTexture(UTexture2D* Texture)
 
 void UBorder::SetBrushFromMaterial(UMaterialInterface* Material)
 {
+	if (!Material)
+	{
+		UE_LOG(LogSlate, Log, TEXT("UBorder::SetBrushFromMaterial.  Incoming material is null"));
+	}
+
 	Background.SetResourceObject(Material);
 
 	//TODO UMG Check if the material can be used with the UI
@@ -236,7 +241,7 @@ void UBorder::SetBrushFromMaterial(UMaterialInterface* Material)
 
 UMaterialInstanceDynamic* UBorder::GetDynamicMaterial()
 {
-	UMaterialInterface* Material = NULL;
+	UMaterialInterface* Material = nullptr;
 
 	UObject* Resource = Background.GetResourceObject();
 	Material = Cast<UMaterialInterface>(Resource);
@@ -260,8 +265,7 @@ UMaterialInstanceDynamic* UBorder::GetDynamicMaterial()
 	}
 
 	//TODO UMG can we do something for textures?  General purpose dynamic material for them?
-
-	return NULL;
+	return nullptr;
 }
 
 void UBorder::SetDesiredSizeScale(FVector2D InScale)
diff --git a/Engine/Source/Runtime/UMG/Private/Components/Button.cpp b/Engine/Source/Runtime/UMG/Private/Components/Button.cpp
index d4b57130fa8a..2e43c1381691 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/Button.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/Button.cpp
@@ -141,14 +141,14 @@ void UButton::SetTouchMethod(EButtonTouchMethod::Type InTouchMethod)
 	}
 }
 
-//void UButton::SetPressMethod(EButtonPressMethod::Type InPressMethod)
-//{
-//	PressMethod = InPressMethod;
-//	if ( MyButton.IsValid() )
-//	{
-//		MyButton->SetPressMethod(PressMethod);
-//	}
-//}
+void UButton::SetPressMethod(EButtonPressMethod::Type InPressMethod)
+{
+	PressMethod = InPressMethod;
+	if ( MyButton.IsValid() )
+	{
+		MyButton->SetPressMethod(PressMethod);
+	}
+}
 
 void UButton::PostLoad()
 {
diff --git a/Engine/Source/Runtime/UMG/Private/Components/DynamicEntryBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/DynamicEntryBox.cpp
new file mode 100644
index 000000000000..4d011a19d8af
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Components/DynamicEntryBox.cpp
@@ -0,0 +1,360 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Components/DynamicEntryBox.h"
+#include "UMGPrivate.h"
+#include "Widgets/Layout/SWrapBox.h"
+#include "Widgets/SBoxPanel.h"
+
+#define LOCTEXT_NAMESPACE "UMG"
+
+//////////////////////////////////////////////////////////////////////////
+// UDynamicEntryBox
+//////////////////////////////////////////////////////////////////////////
+
+UDynamicEntryBox::UDynamicEntryBox(const FObjectInitializer& Initializer)
+	: Super(Initializer)
+	, EntryWidgetPool(*this)
+{
+	bIsVariable = true;
+
+	Visibility = ESlateVisibility::SelfHitTestInvisible;
+	EntrySizeRule.SizeRule = ESlateSizeRule::Automatic;
+}
+
+void UDynamicEntryBox::ReleaseSlateResources(bool bReleaseChildren)
+{
+	Super::ReleaseSlateResources(bReleaseChildren);
+
+	EntryWidgetPool.ResetPool();
+	MyPanelWidget.Reset();
+}
+
+void UDynamicEntryBox::Reset(bool bDeleteWidgets)
+{
+	EntryWidgetPool.ReleaseAll(bDeleteWidgets);
+
+	if (MyPanelWidget.IsValid())
+	{
+		switch (EntryBoxType)
+		{
+		case EDynamicBoxType::Horizontal:
+		case EDynamicBoxType::Vertical:
+			StaticCastSharedPtr<SBoxPanel>(MyPanelWidget)->ClearChildren();
+			break;
+		case EDynamicBoxType::Wrap:
+			StaticCastSharedPtr<SWrapBox>(MyPanelWidget)->ClearChildren();
+			break;
+		case EDynamicBoxType::Overlay:
+			StaticCastSharedPtr<SOverlay>(MyPanelWidget)->ClearChildren();
+			break;
+		}
+	}
+}
+
+const TArray<UUserWidget*>& UDynamicEntryBox::GetAllEntries() const
+{
+	return EntryWidgetPool.GetActiveWidgets();
+}
+
+int32 UDynamicEntryBox::GetNumEntries() const
+{
+	return MyPanelWidget.IsValid() ? MyPanelWidget->GetChildren()->Num() : 0;
+}
+
+void UDynamicEntryBox::RemoveEntry(UUserWidget* EntryWidget)
+{
+	if (EntryWidget)
+	{
+		if (MyPanelWidget.IsValid())
+		{
+			TSharedPtr<SWidget> CachedEntryWidget = EntryWidget->GetCachedWidget();
+			if (CachedEntryWidget.IsValid())
+			{
+				switch (EntryBoxType)
+				{
+				case EDynamicBoxType::Horizontal:
+				case EDynamicBoxType::Vertical:
+					StaticCastSharedPtr<SBoxPanel>(MyPanelWidget)->RemoveSlot(CachedEntryWidget.ToSharedRef());
+					break;
+				case EDynamicBoxType::Wrap:
+					StaticCastSharedPtr<SWrapBox>(MyPanelWidget)->RemoveSlot(CachedEntryWidget.ToSharedRef());
+					break;
+				case EDynamicBoxType::Overlay:
+					StaticCastSharedPtr<SOverlay>(MyPanelWidget)->RemoveSlot(CachedEntryWidget.ToSharedRef());
+					break;
+				}
+			}
+		}
+		EntryWidgetPool.Release(EntryWidget);
+	}
+}
+
+void UDynamicEntryBox::SetEntrySpacing(const FVector2D& InEntrySpacing)
+{
+	EntrySpacing = InEntrySpacing;
+
+	if (MyPanelWidget.IsValid())
+	{
+		if (EntryBoxType == EDynamicBoxType::Wrap)
+		{
+			// Wrap boxes can change their widget spacing on the fly
+			StaticCastSharedPtr<SWrapBox>(MyPanelWidget)->SetInnerSlotPadding(EntrySpacing);
+		}
+		else if (EntryBoxType == EDynamicBoxType::Overlay)
+		{
+			TPanelChildren<SOverlay::FOverlaySlot>* OverlayChildren = static_cast<TPanelChildren<SOverlay::FOverlaySlot>*>(MyPanelWidget->GetChildren());
+			for (int32 ChildIdx = 0; ChildIdx < OverlayChildren->Num(); ++ChildIdx)
+			{
+				FMargin Padding;
+				if (SpacingPattern.Num() > 0)
+				{
+					FVector2D Spacing(0.f, 0.f);
+
+					// First establish the starting location
+					for (int32 CountIdx = 0; CountIdx < ChildIdx; ++CountIdx)
+					{
+						int32 PatternIdx = CountIdx % SpacingPattern.Num();
+						Spacing += SpacingPattern[PatternIdx];
+					}
+					
+					// Negative padding is no good, so negative spacing is expressed as positive spacing on the opposite side
+					if (Spacing.X >= 0.f)
+					{
+						Padding.Left = Spacing.X;
+					}
+					else
+					{
+						Padding.Right = -Spacing.X;
+					}
+					if (Spacing.Y >= 0.f)
+					{
+						Padding.Top = Spacing.Y;
+					}
+					else
+					{
+						Padding.Bottom = -Spacing.Y;
+					}
+				}
+				else
+				{
+					if (EntrySpacing.X >= 0.f)
+					{
+						Padding.Left = ChildIdx * EntrySpacing.X;
+					}
+					else
+					{
+						Padding.Right = ChildIdx * -EntrySpacing.X;
+					}
+
+					if (EntrySpacing.Y >= 0.f)
+					{
+						Padding.Top = ChildIdx * EntrySpacing.Y;
+					}
+					else
+					{
+						Padding.Bottom = ChildIdx * -EntrySpacing.Y;
+					}
+				}
+				SOverlay::FOverlaySlot& OverlaySlot = (*OverlayChildren)[ChildIdx];
+				OverlaySlot.SlotPadding = Padding;
+			}
+		}
+		else
+		{
+			// Vertical & Horizontal have to manually update the padding on each slot
+			const bool bIsHBox = EntryBoxType == EDynamicBoxType::Horizontal;
+			TPanelChildren<SBoxPanel::FSlot>* BoxChildren = static_cast<TPanelChildren<SBoxPanel::FSlot>*>(MyPanelWidget->GetChildren());
+			for (int32 ChildIdx = 0; ChildIdx < BoxChildren->Num(); ++ChildIdx)
+			{
+				const bool bIsFirstChild = ChildIdx == 0;
+
+				FMargin Padding;
+				Padding.Top = bIsHBox || bIsFirstChild ? 0.f : EntrySpacing.Y;
+				Padding.Left = bIsHBox && !bIsFirstChild ? EntrySpacing.X : 0.f;
+
+				SBoxPanel::FSlot& BoxSlot = (*BoxChildren)[ChildIdx];
+				BoxSlot.SlotPadding = Padding;
+			}
+		}
+	}
+}
+
+#if WITH_EDITOR
+void UDynamicEntryBox::ValidateCompiledDefaults(class FCompilerResultsLog& CompileLog) const
+{
+	if (!EntryWidgetClass)
+	{
+		CompileLog.Error(*FText::Format(LOCTEXT("Error_MissingEntryClass", "{0} has no EntryWidgetClass specified - required for any Dynamic Entry Box to function."), FText::FromString(GetName())).ToString());
+	}
+}
+#endif
+
+TSharedRef<SWidget> UDynamicEntryBox::RebuildWidget()
+{
+	TSharedPtr<SWidget> EntryBoxWidget;
+	switch (EntryBoxType)
+	{
+	case EDynamicBoxType::Horizontal:
+		EntryBoxWidget = SAssignNew(MyPanelWidget, SHorizontalBox);
+		break;
+	case EDynamicBoxType::Vertical:
+		EntryBoxWidget = SAssignNew(MyPanelWidget, SVerticalBox);
+		break;
+	case EDynamicBoxType::Wrap:
+		EntryBoxWidget = SAssignNew(MyPanelWidget, SWrapBox)
+			.UseAllottedWidth(true)
+			.InnerSlotPadding(EntrySpacing);
+		break;
+	case EDynamicBoxType::Overlay:
+		EntryBoxWidget = SAssignNew(MyPanelWidget, SOverlay)
+			.Clipping(EWidgetClipping::ClipToBounds);
+		break;
+	}
+
+	return EntryBoxWidget.ToSharedRef();
+}
+
+void UDynamicEntryBox::SynchronizeProperties()
+{
+	Super::SynchronizeProperties();
+
+	// At design-time, preview the desired number of entries
+#if WITH_EDITORONLY_DATA
+	if (IsDesignTime() && MyPanelWidget.IsValid())
+	{
+		if (!EntryWidgetClass)
+		{
+			// We have no entry class, so clear everything out
+			Reset(true);
+		}
+		else if (MyPanelWidget->GetChildren()->Num() != NumDesignerPreviewEntries)
+		{
+			// When the number of entries to preview changes, the easiest thing to do is just soft-rebuild
+			Reset();
+			while (MyPanelWidget->GetChildren()->Num() < NumDesignerPreviewEntries)
+			{
+				UUserWidget* PreviewEntry = CreateEntryInternal();
+				if (IsDesignTime() && OnPreviewEntryCreatedFunc)
+				{
+					OnPreviewEntryCreatedFunc(PreviewEntry);
+				}
+			}
+		}
+		else
+		{
+			// If we don't need to rebuild, update existing entries
+			SetEntrySpacing(EntrySpacing);
+			
+			//@todo DanH: update alignment, spacing pattern, clipping, size rule, max element size
+		}
+	}
+#endif
+}
+
+UUserWidget* UDynamicEntryBox::BP_CreateEntry()
+{
+	return CreateEntry();
+}
+
+UUserWidget* UDynamicEntryBox::CreateEntryInternal()
+{
+	if (MyPanelWidget.IsValid())
+	{
+		UUserWidget* NewEntryWidget = EntryWidgetPool.GetOrCreateInstance(EntryWidgetClass);
+		AddEntryChild(*NewEntryWidget);
+		return NewEntryWidget;
+	}
+
+	UE_LOG(LogUMG, Warning, TEXT("UDynamicEntryBox::CreateEntryInternal(): Failed to create an entry."));
+	return nullptr;
+}
+
+FMargin UDynamicEntryBox::BuildEntryPadding(const FVector2D& DesiredSpacing)
+{
+	FMargin EntryPadding;
+	if (DesiredSpacing.X >= 0.f)
+	{
+		EntryPadding.Left = DesiredSpacing.X;
+	}
+	else
+	{
+		EntryPadding.Right = -DesiredSpacing.X;
+	}
+
+	if (DesiredSpacing.Y >= 0.f)
+	{
+		EntryPadding.Top = DesiredSpacing.Y;
+	}
+	else
+	{
+		EntryPadding.Bottom = -DesiredSpacing.Y;
+	}
+
+	return EntryPadding;
+}
+
+void UDynamicEntryBox::AddEntryChild(UUserWidget& ChildWidget)
+{
+	FSlotBase* NewSlot = nullptr;
+	if (EntryBoxType == EDynamicBoxType::Wrap)
+	{
+		NewSlot = &StaticCastSharedPtr<SWrapBox>(MyPanelWidget)->AddSlot()
+			.FillEmptySpace(false)
+			.HAlign(EntryHorizontalAlignment)
+			.VAlign(EntryVerticalAlignment);
+	}
+	else if (EntryBoxType == EDynamicBoxType::Overlay)
+	{
+		const int32 ChildIdx = MyPanelWidget->GetChildren()->Num();
+		SOverlay::FOverlaySlot& OverlaySlot = (SOverlay::FOverlaySlot&)StaticCastSharedPtr<SOverlay>(MyPanelWidget)->AddSlot();
+
+		EHorizontalAlignment HAlign = EntryHorizontalAlignment;
+		EVerticalAlignment VAlign = EntryVerticalAlignment;
+
+		FVector2D TargetSpacing = FVector2D::ZeroVector;
+		if (SpacingPattern.Num() > 0)
+		{
+			for (int32 CountIdx = 0; CountIdx < ChildIdx; ++CountIdx)
+			{
+				const int32 PatternIdx = CountIdx % SpacingPattern.Num();
+				TargetSpacing += SpacingPattern[PatternIdx];
+			}
+		}
+		else
+		{
+			TargetSpacing = EntrySpacing * ChildIdx;
+			HAlign = EntrySpacing.X >= 0.f ? EHorizontalAlignment::HAlign_Left : EHorizontalAlignment::HAlign_Right;
+			VAlign = EntrySpacing.Y >= 0.f ? EVerticalAlignment::VAlign_Top : EVerticalAlignment::VAlign_Bottom;
+		}
+		
+		OverlaySlot.HAlignment = HAlign;
+		OverlaySlot.VAlignment = VAlign;
+		OverlaySlot.SlotPadding = BuildEntryPadding(TargetSpacing);
+
+		NewSlot = &OverlaySlot;
+	}
+	else
+	{
+		const bool bIsHBox = EntryBoxType == EDynamicBoxType::Horizontal;
+		const bool bIsFirstChild = MyPanelWidget->GetChildren()->Num() == 0;
+
+		SBoxPanel::FSlot& BoxPanelSlot = bIsHBox ? (SBoxPanel::FSlot&)StaticCastSharedPtr<SHorizontalBox>(MyPanelWidget)->AddSlot().MaxWidth(MaxElementSize) : (SBoxPanel::FSlot&)StaticCastSharedPtr<SVerticalBox>(MyPanelWidget)->AddSlot().MaxHeight(MaxElementSize);
+		BoxPanelSlot.HAlignment = EntryHorizontalAlignment;
+		BoxPanelSlot.VAlignment = EntryVerticalAlignment;
+		BoxPanelSlot.SizeParam = UWidget::ConvertSerializedSizeParamToRuntime(EntrySizeRule);
+
+		FMargin Padding;
+		Padding.Top = bIsHBox || bIsFirstChild ? 0.f : EntrySpacing.Y;
+		Padding.Left = bIsHBox && !bIsFirstChild ? EntrySpacing.X : 0.f;
+		BoxPanelSlot.SlotPadding = Padding;
+
+		NewSlot = &BoxPanelSlot;
+	}
+
+	if (ensure(NewSlot))
+	{
+		NewSlot->AttachWidget(ChildWidget.TakeWidget());
+	}
+}
+
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Components/EditableText.cpp b/Engine/Source/Runtime/UMG/Private/Components/EditableText.cpp
index d3cfebe52ce3..e2958e29cdbf 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/EditableText.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/EditableText.cpp
@@ -60,6 +60,7 @@ TSharedRef<SWidget> UEditableText::RebuildWidget()
 		.OnTextChanged( BIND_UOBJECT_DELEGATE( FOnTextChanged, HandleOnTextChanged ) )
 		.OnTextCommitted( BIND_UOBJECT_DELEGATE( FOnTextCommitted, HandleOnTextCommitted ) )
 		.VirtualKeyboardType( EVirtualKeyboardType::AsKeyboardType( KeyboardType.GetValue() ) )
+		.VirtualKeyboardOptions(VirtualKeyboardOptions)
 		.VirtualKeyboardDismissAction(VirtualKeyboardDismissAction)
 		.Justification( Justification );
 	
diff --git a/Engine/Source/Runtime/UMG/Private/Components/EditableTextBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/EditableTextBox.cpp
index 64749238e721..f4d0514ae958 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/EditableTextBox.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/EditableTextBox.cpp
@@ -62,6 +62,7 @@ TSharedRef<SWidget> UEditableTextBox::RebuildWidget()
 		.OnTextChanged(BIND_UOBJECT_DELEGATE(FOnTextChanged, HandleOnTextChanged))
 		.OnTextCommitted(BIND_UOBJECT_DELEGATE(FOnTextCommitted, HandleOnTextCommitted))
 		.VirtualKeyboardType(EVirtualKeyboardType::AsKeyboardType(KeyboardType.GetValue()))
+		.VirtualKeyboardOptions(VirtualKeyboardOptions)
 		.VirtualKeyboardDismissAction(VirtualKeyboardDismissAction)
 		.Justification(Justification);
 
diff --git a/Engine/Source/Runtime/UMG/Private/Components/Image.cpp b/Engine/Source/Runtime/UMG/Private/Components/Image.cpp
index 99ff4f466d32..698b7f42d516 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/Image.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/Image.cpp
@@ -98,6 +98,28 @@ void UImage::SetBrush(const FSlateBrush& InBrush)
 	}
 }
 
+void UImage::SetBrushSize(FVector2D DesiredSize)
+{
+	Brush.ImageSize = DesiredSize;
+
+	if (MyImage.IsValid())
+	{
+		MyImage->SetImage(&Brush);
+		MyImage->Invalidate(EInvalidateWidget::LayoutAndVolatility);
+	}
+}
+
+void UImage::SetBrushTintColor(FSlateColor TintColor)
+{
+	Brush.TintColor = TintColor;
+
+	if (MyImage.IsValid())
+	{
+		MyImage->SetImage(&Brush);
+		MyImage->Invalidate(EInvalidateWidget::PaintAndVolatility);
+	}
+}
+
 void UImage::SetBrushFromAsset(USlateBrushAsset* Asset)
 {
 	Brush = Asset ? Asset->Brush : FSlateBrush();
@@ -211,6 +233,7 @@ UMaterialInstanceDynamic* UImage::GetDynamicMaterial()
 			if ( MyImage.IsValid() )
 			{
 				MyImage->SetImage(&Brush);
+				MyImage->Invalidate(EInvalidateWidget::LayoutAndVolatility);
 			}
 		}
 		
diff --git a/Engine/Source/Runtime/UMG/Private/Components/ListView.cpp b/Engine/Source/Runtime/UMG/Private/Components/ListView.cpp
index 9a613cbc6388..16dcdf3afd80 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/ListView.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/ListView.cpp
@@ -1,8 +1,11 @@
 // Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
 #include "Components/ListView.h"
-#include "Widgets/Text/STextBlock.h"
 #include "Widgets/Views/SListView.h"
+#include "Engine/World.h"
+#include "TimerManager.h"
+#include "Blueprint/ListViewDesignerPreviewItem.h"
+#include "UMGPrivate.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
@@ -12,65 +15,8 @@
 UListView::UListView(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	bIsVariable = true;
-
-	ItemHeight = 16.0f;
-	SelectionMode = ESelectionMode::Single;
 }
 
-TSharedRef<SWidget> UListView::RebuildWidget()
-{
-	MyListView = SNew(SListView< UObject* >)
-		.SelectionMode(SelectionMode)
-		.ListItemsSource(&Items)
-		.ItemHeight(ItemHeight)
-		.OnGenerateRow(BIND_UOBJECT_DELEGATE(SListView< UObject* >::FOnGenerateRow, HandleOnGenerateRow))
-		//.OnSelectionChanged(this, &SSocketManager::SocketSelectionChanged_Execute)
-		//.OnContextMenuOpening(this, &SSocketManager::OnContextMenuOpening)
-		//.OnItemScrolledIntoView(this, &SSocketManager::OnItemScrolledIntoView)
-		//	.HeaderRow
-		//	(
-		//		SNew(SHeaderRow)
-		//		.Visibility(EVisibility::Collapsed)
-		//		+ SHeaderRow::Column(TEXT("Socket"))
-		//	);
-		;
-
-	return MyListView.ToSharedRef();
-}
-
-TSharedRef<ITableRow> UListView::HandleOnGenerateRow(UObject* Item, const TSharedRef< STableViewBase >& OwnerTable) const
-{
-	// Call the user's delegate to see if they want to generate a custom widget bound to the data source.
-	if ( OnGenerateRowEvent.IsBound() )
-	{
-		UWidget* Widget = OnGenerateRowEvent.Execute(Item);
-		if ( Widget != NULL )
-		{
-			return SNew(STableRow< UObject* >, OwnerTable)
-			[
-				Widget->TakeWidget()
-			];
-		}
-	}
-
-	// If a row wasn't generated just create the default one, a simple text block of the item's name.
-	return SNew(STableRow< UObject* >, OwnerTable)
-		[
-			SNew(STextBlock).Text(Item ? FText::FromString(Item->GetName()) : LOCTEXT("null", "null"))
-		];
-}
-
-
-#if WITH_EDITOR
-
-const FText UListView::GetPaletteCategory()
-{
-	return LOCTEXT("Misc", "Misc");
-}
-
-#endif
-
 void UListView::ReleaseSlateResources(bool bReleaseChildren)
 {
 	Super::ReleaseSlateResources(bReleaseChildren);
@@ -78,6 +24,222 @@ void UListView::ReleaseSlateResources(bool bReleaseChildren)
 	MyListView.Reset();
 }
 
+#if WITH_EDITORONLY_DATA
+void UListView::OnRefreshDesignerItems()
+{
+	RefreshDesignerItems<UObject*>(ListItems, [this] () {return NewObject<UListViewDesignerPreviewItem>(this); });
+}
+#endif
+
+void UListView::AddItem(UObject* Item)
+{
+	ListItems.Add(Item);
+	RequestRefresh();
+}
+
+UObject* UListView::GetItemAt(int32 Index) const
+{
+	return ListItems.IsValidIndex(Index) ? ListItems[Index] : nullptr;
+}
+
+int32 UListView::GetNumItems() const
+{
+	return ListItems.Num();
+}
+
+int32 UListView::GetIndexForItem(UObject* Item) const
+{
+	return ListItems.Find(Item);
+}
+
+void UListView::ClearListItems()
+{
+	ListItems.Reset();
+	RequestRefresh();
+}
+
+void UListView::SetSelectionMode(TEnumAsByte<ESelectionMode::Type> InSelectionMode)
+{
+	if (InSelectionMode != SelectionMode)
+	{
+		SelectionMode = InSelectionMode;
+
+		if (InSelectionMode == ESelectionMode::None)
+		{
+			ClearSelection();
+		}
+		else if (InSelectionMode == ESelectionMode::Single || InSelectionMode == ESelectionMode::SingleToggle)
+		{
+			// Try to preserve the last selected item.
+			TArray<UObject*> CurrentlySelectedItems;
+			GetSelectedItems(CurrentlySelectedItems);
+			UObject* const LastSelectedItem = CurrentlySelectedItems.Num() > 0 ? CurrentlySelectedItems.Last(0) : nullptr;
+			if (LastSelectedItem)
+			{
+				SetSelectedItem(LastSelectedItem);
+			}
+		}
+	}
+}
+
+int32 UListView::BP_GetNumItemsSelected() const
+{
+	return GetNumItemsSelected();
+}
+
+void UListView::BP_SetListItems(const TArray<UObject*>& InListItems)
+{
+	SetListItems(InListItems);
+}
+
+UObject* UListView::BP_GetSelectedItem() const
+{
+	return GetSelectedItem();
+}
+
+bool UListView::BP_GetSelectedItems(TArray<UObject*>& Items) const
+{
+	return GetSelectedItems(Items) > 0;
+}
+
+bool UListView::BP_IsItemVisible(UObject* Item) const
+{
+	return IsItemVisible(Item);
+}
+
+void UListView::BP_NavigateToItem(UObject* Item)
+{
+	const ULocalPlayer* LocalPlayer = GetOwningLocalPlayer();
+	if (Item && LocalPlayer)
+	{
+		RequestNavigateToItem(Item, LocalPlayer->GetControllerId());
+	}
+}
+
+void UListView::NavigateToIndex(int32 Index)
+{
+	RequestNavigateToItem(GetItemAt(Index));
+}
+
+void UListView::BP_ScrollItemIntoView(UObject* Item)
+{
+	if (Item && MyListView.IsValid())
+	{
+		if (const ULocalPlayer* LocalPlayer = GetOwningLocalPlayer())
+		{
+			RequestScrollItemIntoView(Item, LocalPlayer->GetControllerId());
+		}
+	}
+}
+
+void UListView::ScrollIndexIntoView(int32 Index)
+{
+	BP_ScrollItemIntoView(GetItemAt(Index));
+}
+
+void UListView::BP_CancelScrollIntoView()
+{
+	if (MyListView.IsValid())
+	{
+		MyListView->CancelScrollIntoView();
+	}
+}
+
+bool UListView::IsRefreshPending() const
+{
+	if (MyListView.IsValid())
+	{
+		return MyListView->IsPendingRefresh();
+	}
+	return false;
+}
+
+void UListView::BP_SetSelectedItem(UObject* Item)
+{
+	if (MyListView.IsValid() && ListItems.Contains(Item))
+	{
+		MyListView->SetSelection(Item, ESelectInfo::Direct);
+	}
+}
+
+void UListView::SetSelectedItem(const UObject* Item)
+{
+	ITypedUMGListView<UObject*>::SetSelectedItem(const_cast<UObject*>(Item));
+}
+
+void UListView::SetSelectedIndex(int32 Index)
+{
+	SetSelectedItem(GetItemAt(Index));
+}
+
+void UListView::BP_SetItemSelection(UObject* Item, bool bSelected)
+{
+	SetItemSelection(Item, bSelected);
+}
+
+void UListView::BP_ClearSelection()
+{
+	ClearSelection();
+}
+
+TSharedRef<STableViewBase> UListView::RebuildListWidget()
+{
+	return ConstructListView<SListView>();
+}
+
+void UListView::HandleListEntryHovered(UUserWidget& EntryWidget)
+{
+	if (UObject* ListItem = IUserObjectListEntry::GetListItem(EntryWidget))
+	{
+		OnItemIsHoveredChanged().Broadcast(ListItem, true);
+		BP_OnItemIsHoveredChanged.Broadcast(ListItem, true);
+	}
+}
+
+void UListView::HandleListEntryUnhovered(UUserWidget& EntryWidget)
+{
+	if (UObject* ListItem = IUserObjectListEntry::GetListItem(EntryWidget))
+	{
+		OnItemIsHoveredChanged().Broadcast(ListItem, false);
+		BP_OnItemIsHoveredChanged.Broadcast(ListItem, false);
+	}
+}
+
+FMargin UListView::GetDesiredEntryPadding(UObject* Item) const
+{
+	if (ListItems.Num() > 0 && ListItems[0] != Item)
+	{
+		// For all entries after the first one, add the spacing as top padding
+		return FMargin(0.f, EntrySpacing, 0.f, 0.f);
+	}
+	return FMargin(0.f);
+}
+
+UUserWidget& UListView::OnGenerateEntryWidgetInternal(UObject* Item, const TSharedRef<STableViewBase>& OwnerTable)
+{
+	return GenerateTypedEntry(OwnerTable);
+}
+
+void UListView::OnItemClickedInternal(UObject* ListItem)
+{
+	BP_OnItemClicked.Broadcast(ListItem);
+}
+
+void UListView::OnItemDoubleClickedInternal(UObject* ListItem)
+{
+	BP_OnItemDoubleClicked.Broadcast(ListItem);
+}
+
+void UListView::OnSelectionChangedInternal(UObject* FirstSelectedItem)
+{
+	BP_OnItemSelectionChanged.Broadcast(FirstSelectedItem, FirstSelectedItem != nullptr);
+}
+
+void UListView::OnItemScrolledIntoViewInternal(UObject* ListItem, UUserWidget& EntryWidget)
+{
+	BP_OnItemScrolledIntoView.Broadcast(ListItem, &EntryWidget);
+}
+
 /////////////////////////////////////////////////////
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Components/ListViewBase.cpp b/Engine/Source/Runtime/UMG/Private/Components/ListViewBase.cpp
new file mode 100644
index 000000000000..a6e1f945e99d
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Components/ListViewBase.cpp
@@ -0,0 +1,164 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Components/ListViewBase.h"
+#include "UMGPrivate.h"
+#include "Widgets/Text/STextBlock.h"
+#include "TimerManager.h"
+
+#define LOCTEXT_NAMESPACE "UMG"
+
+UListViewBase::UListViewBase(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+	, EntryWidgetPool(*this)
+{
+	bIsVariable = true;
+}
+
+#if WITH_EDITOR
+const FText UListViewBase::GetPaletteCategory()
+{
+	return LOCTEXT("Lists", "Lists");
+}
+
+void UListViewBase::ValidateCompiledDefaults(FCompilerResultsLog& CompileLog) const
+{
+	if (!EntryWidgetClass)
+	{
+		CompileLog.Error(*FText::Format(LOCTEXT("Error_MissingEntryClass", "{0} has no EntryWidgetClass specified - required for any UListViewBase to function."), FText::FromString(GetName())).ToString());
+	}
+}
+#endif
+
+void UListViewBase::RegenerateAllEntries()
+{
+	EntryWidgetPool.ReleaseAll();
+	GeneratedEntriesToAnnounce.Reset();
+
+	if (MyTableViewBase.IsValid())
+	{
+		MyTableViewBase->RebuildList();
+	}
+}
+
+void UListViewBase::ScrollToTop()
+{
+	if (MyTableViewBase.IsValid())
+	{
+		MyTableViewBase->ScrollToTop();
+	}
+}
+
+void UListViewBase::ScrollToBottom()
+{
+	if (MyTableViewBase.IsValid())
+	{
+		MyTableViewBase->ScrollToBottom();
+	}
+}
+
+const TArray<UUserWidget*>& UListViewBase::GetDisplayedEntryWidgets() const
+{ 
+	return EntryWidgetPool.GetActiveWidgets(); 
+}
+
+TSharedRef<SWidget> UListViewBase::RebuildWidget()
+{
+	if (!EntryWidgetClass)
+	{
+		return SNew(STextBlock)
+			.Text(LOCTEXT("Error_MissingEntryWidgetClass", "No EntryWidgetClass specified on this list"));
+	}
+
+	MyTableViewBase = RebuildListWidget();
+	return MyTableViewBase.ToSharedRef();
+}
+
+void UListViewBase::ReleaseSlateResources(bool bReleaseChildren)
+{
+	Super::ReleaseSlateResources(bReleaseChildren);
+
+	MyTableViewBase.Reset();
+	EntryWidgetPool.ResetPool();
+	GeneratedEntriesToAnnounce.Reset();
+}
+
+void UListViewBase::SynchronizeProperties()
+{
+	Super::SynchronizeProperties();
+
+#if WITH_EDITORONLY_DATA
+	if (IsDesignTime())
+	{
+		bNeedsToCallRefreshDesignerItems = true;
+		OnRefreshDesignerItems();
+
+		if (!ensureMsgf(!bNeedsToCallRefreshDesignerItems, TEXT("[%s] does not call RefreshDesignerItems<T> from within OnRefreshDesignerItems. Please do so to support design-time previewing of list entries."), *GetClass()->GetName()))
+		{
+			bNeedsToCallRefreshDesignerItems = false;
+		}
+	}
+#endif
+}
+
+TSharedRef<STableViewBase> UListViewBase::RebuildListWidget()
+{
+	ensureMsgf(false, TEXT("All children of UListViewBase must implement RebuildListWidget using one of the static ITypedUMGListView<T>::ConstructX functions"));
+	return SNew(SListView<TSharedPtr<FString>>);
+}
+
+void UListViewBase::RequestRefresh()
+{
+	if (MyTableViewBase.IsValid())
+	{
+		MyTableViewBase->RequestListRefresh();
+	}
+}
+
+void UListViewBase::HandleRowReleased(const TSharedRef<ITableRow>& Row)
+{
+	UUserWidget* EntryWidget = StaticCastSharedRef<IObjectTableRow>(Row)->GetUserWidget();
+	if (ensure(EntryWidget))
+	{
+		EntryWidgetPool.Release(EntryWidget);
+
+		if (!IsDesignTime())
+		{
+			GeneratedEntriesToAnnounce.Remove(EntryWidget);
+			OnEntryWidgetReleased().Broadcast(*EntryWidget);
+			BP_OnEntryReleased.Broadcast(EntryWidget);
+		}
+	}
+}
+
+void UListViewBase::FinishGeneratingEntry(UUserWidget& GeneratedEntry)
+{
+	if (!IsDesignTime())
+	{
+		// Announcing the row generation now is just a bit too soon, as we haven't finished generating the row as far as the underlying list is concerned. 
+		// So we cache the row/item pair here and announce their generation on the next tick
+		GeneratedEntriesToAnnounce.AddUnique(&GeneratedEntry);
+		if (!EntryGenAnnouncementTimerHandle.IsValid())
+		{
+			if (UWorld* World = GetWorld())
+			{
+				World->GetTimerManager().SetTimerForNextTick(this, &UListViewBase::HandleAnnounceGeneratedEntries);
+			}
+		}
+	}
+}
+
+void UListViewBase::HandleAnnounceGeneratedEntries()
+{
+	EntryGenAnnouncementTimerHandle.Invalidate();
+	for (TWeakObjectPtr<UUserWidget> EntryWidget : GeneratedEntriesToAnnounce)
+	{
+		if (EntryWidget.IsValid())
+		{
+			OnEntryWidgetGenerated().Broadcast(*EntryWidget);
+			BP_OnEntryGenerated.Broadcast(EntryWidget.Get());
+		}
+	}
+	GeneratedEntriesToAnnounce.Empty();
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/UMG/Private/Components/MenuAnchor.cpp b/Engine/Source/Runtime/UMG/Private/Components/MenuAnchor.cpp
index 12532199c87a..b4878ffec8ff 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/MenuAnchor.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/MenuAnchor.cpp
@@ -84,7 +84,7 @@ TSharedRef<SWidget> UMenuAnchor::HandleGetMenuContent()
 		{
 			if ( UWorld* World = GetWorld() )
 			{
-				if ( UUserWidget* MenuWidget = CreateWidget<UUserWidget>(World, MenuClass) )
+				if ( UUserWidget* MenuWidget = CreateWidget(World, MenuClass) )
 				{
 					SlateMenuWidget = MenuWidget->TakeWidget();
 				}
diff --git a/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableText.cpp b/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableText.cpp
index 2f7c53cc90e9..1cad1d10168f 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableText.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableText.cpp
@@ -59,6 +59,7 @@ TSharedRef<SWidget> UMultiLineEditableText::RebuildWidget()
 //	.BackgroundImageSelectionTarget(BackgroundImageSelectionTarget ? TAttribute<const FSlateBrush*>(&BackgroundImageSelectionTarget->Brush) : TAttribute<const FSlateBrush*>())
 //	.BackgroundImageComposing(BackgroundImageComposing ? TAttribute<const FSlateBrush*>(&BackgroundImageComposing->Brush) : TAttribute<const FSlateBrush*>())
 //	.CaretImage(CaretImage ? TAttribute<const FSlateBrush*>(&CaretImage->Brush) : TAttribute<const FSlateBrush*>())
+	.VirtualKeyboardOptions(VirtualKeyboardOptions)
 	.VirtualKeyboardDismissAction(VirtualKeyboardDismissAction)
 	.OnTextChanged(BIND_UOBJECT_DELEGATE(FOnTextChanged, HandleOnTextChanged))
 	.OnTextCommitted(BIND_UOBJECT_DELEGATE(FOnTextCommitted, HandleOnTextCommitted))
diff --git a/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableTextBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableTextBox.cpp
index bd8ad5154158..0b873409bc8d 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableTextBox.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/MultiLineEditableTextBox.cpp
@@ -59,6 +59,7 @@ TSharedRef<SWidget> UMultiLineEditableTextBox::RebuildWidget()
 //		.RevertTextOnEscape(RevertTextOnEscape)
 //		.ClearKeyboardFocusOnCommit(ClearKeyboardFocusOnCommit)
 //		.SelectAllTextOnCommit(SelectAllTextOnCommit)
+		.VirtualKeyboardOptions(VirtualKeyboardOptions)
 		.VirtualKeyboardDismissAction(VirtualKeyboardDismissAction)
 		.OnTextChanged(BIND_UOBJECT_DELEGATE(FOnTextChanged, HandleOnTextChanged))
 		.OnTextCommitted(BIND_UOBJECT_DELEGATE(FOnTextCommitted, HandleOnTextCommitted))
diff --git a/Engine/Source/Runtime/UMG/Private/Components/RetainerBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/RetainerBox.cpp
index 3f5a3086aae6..1ffec347eef2 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/RetainerBox.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/RetainerBox.cpp
@@ -24,6 +24,17 @@ URetainerBox::URetainerBox(const FObjectInitializer& ObjectInitializer)
 	TextureParameter = DefaultTextureParameterName;
 }
 
+void URetainerBox::SetRenderingPhase(int PhaseToRenderOn, int32 TotalRenderingPhases)
+{
+	Phase = PhaseToRenderOn;
+	PhaseCount = TotalRenderingPhases;
+
+	if (MyRetainerWidget.IsValid())
+	{
+		MyRetainerWidget->SetRenderingPhase(Phase, PhaseCount);
+	}
+}
+
 void URetainerBox::RequestRender()
 {
 	if ( MyRetainerWidget.IsValid() )
@@ -130,7 +141,7 @@ const FGeometry& URetainerBox::GetCachedAllottedGeometry() const
 {
 	if (MyRetainerWidget.IsValid())
 	{
-		return MyRetainerWidget->GetCachedAllottedGeometry();
+		return MyRetainerWidget->GetCachedGeometry();
 	}
 
 	static const FGeometry TempGeo;
diff --git a/Engine/Source/Runtime/UMG/Private/Components/RichTextBlock.cpp b/Engine/Source/Runtime/UMG/Private/Components/RichTextBlock.cpp
index 739a3afe5ef0..2c0ac846d056 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/RichTextBlock.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/RichTextBlock.cpp
@@ -8,6 +8,9 @@
 #include "Components/RichTextBlockDecorator.h"
 #include "Styling/SlateStyle.h"
 #include "Framework/Text/RichTextLayoutMarshaller.h"
+#include "Framework/Text/RichTextMarkupProcessing.h"
+#include "Framework/Text/IRichTextMarkupParser.h"
+#include "Framework/Text/IRichTextMarkupWriter.h"
 
 #define LOCTEXT_NAMESPACE "UMG"
 
@@ -32,20 +35,9 @@ TSharedRef<SWidget> URichTextBlock::RebuildWidget()
 	UpdateStyleData();
 
 	TArray< TSharedRef< class ITextDecorator > > CreatedDecorators;
+	CreateDecorators(CreatedDecorators);
 
-	for ( URichTextBlockDecorator* Decorator : Decorators )
-	{
-		if ( Decorator )
-		{
-			TSharedPtr<ITextDecorator> TextDecorator = Decorator->CreateDecorator(this);
-			if (TextDecorator.IsValid())
-			{
-				CreatedDecorators.Add(TextDecorator.ToSharedRef());
-			}
-		}
-	}
-
-	TSharedRef<FRichTextLayoutMarshaller> Marshaller = FRichTextLayoutMarshaller::Create(CreatedDecorators, StyleInstance.Get());
+	TSharedRef<FRichTextLayoutMarshaller> Marshaller = FRichTextLayoutMarshaller::Create(CreateMarkupParser(), CreateMarkupWriter(), CreatedDecorators, StyleInstance.Get());
 
 	MyRichTextBlock =
 		SNew(SRichTextBlock)
@@ -66,7 +58,12 @@ void URichTextBlock::SynchronizeProperties()
 
 void URichTextBlock::UpdateStyleData()
 {
-	if (!StyleInstance.IsValid() || IsDesignTime())
+	if (IsDesignTime())
+	{
+		InstanceDecorators.Reset();
+	}
+
+	if (!StyleInstance.IsValid())
 	{
 		StyleInstance = MakeShareable(new FSlateStyleSet(TEXT("RichTextStyle")));
 
@@ -86,15 +83,14 @@ void URichTextBlock::UpdateStyleData()
 			}
 		}
 
-		//Decorators.Reset();
-		//for (TSubclassOf<URichTextBlockDecorator> DecoratorClass : DecoratorClasses)
-		//{
-		//	if (UClass* ResolvedClass = DecoratorClass.Get())
-		//	{
-		//		URichTextBlockDecorator* Decorator = NewObject<URichTextBlockDecorator>(this, ResolvedClass);
-		//		Decorators.Add(Decorator);
-		//	}
-		//}
+		for (TSubclassOf<URichTextBlockDecorator> DecoratorClass : DecoratorClasses)
+		{
+			if (UClass* ResolvedClass = DecoratorClass.Get())
+			{
+				URichTextBlockDecorator* Decorator = NewObject<URichTextBlockDecorator>(this, ResolvedClass);
+				InstanceDecorators.Add(Decorator);
+			}
+		}
 	}
 }
 
@@ -113,6 +109,44 @@ const FTextBlockStyle& URichTextBlock::GetDefaultTextStyle() const
 	return DefaultTextStyle;
 }
 
+URichTextBlockDecorator* URichTextBlock::GetDecoratorByClass(TSubclassOf<URichTextBlockDecorator> DecoratorClass)
+{
+	for (URichTextBlockDecorator* Decorator : InstanceDecorators)
+	{
+		if (Decorator->IsA(DecoratorClass))
+		{
+			return Decorator;
+		}
+	}
+
+	return nullptr;
+}
+
+void URichTextBlock::CreateDecorators(TArray< TSharedRef< class ITextDecorator > >& OutDecorators)
+{
+	for (URichTextBlockDecorator* Decorator : InstanceDecorators)
+	{
+		if (Decorator)
+		{
+			TSharedPtr<ITextDecorator> TextDecorator = Decorator->CreateDecorator(this);
+			if (TextDecorator.IsValid())
+			{
+				OutDecorators.Add(TextDecorator.ToSharedRef());
+			}
+		}
+	}
+}
+
+TSharedPtr< IRichTextMarkupParser > URichTextBlock::CreateMarkupParser()
+{
+	return FDefaultRichTextMarkupParser::Create();
+}
+
+TSharedPtr< IRichTextMarkupWriter > URichTextBlock::CreateMarkupWriter()
+{
+	return FDefaultRichTextMarkupWriter::Create();
+}
+
 #if WITH_EDITOR
 
 const FText URichTextBlock::GetPaletteCategory()
diff --git a/Engine/Source/Runtime/UMG/Private/Components/ScaleBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/ScaleBox.cpp
index d6c0f20008e4..851126c06e4b 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/ScaleBox.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/ScaleBox.cpp
@@ -31,8 +31,11 @@ void UScaleBox::ReleaseSlateResources(bool bReleaseChildren)
 TSharedRef<SWidget> UScaleBox::RebuildWidget()
 {
 	MyScaleBox = SNew(SScaleBox)
-		.SingleLayoutPass(bSingleLayoutPass);
-	
+#if WITH_EDITOR
+		.OverrideScreenSize(DesignerSize)
+#endif
+	.SingleLayoutPass(bSingleLayoutPass);
+
 	if ( GetChildrenCount() > 0 )
 	{
 		CastChecked<UScaleBoxSlot>(GetContentSlot())->BuildSlot(MyScaleBox.ToSharedRef());
@@ -145,6 +148,24 @@ bool UScaleBox::CanEditChange(const UProperty* InProperty) const
 	return bIsEditable;
 }
 
+
+void UScaleBox::OnDesignerChanged(const FDesignerChangedEventArgs& EventArgs)
+{
+	if (EventArgs.bScreenPreview)
+	{
+		DesignerSize = EventArgs.Size;
+	}
+	else
+	{
+		DesignerSize = FVector2D(0, 0);
+	}
+
+	if (MyScaleBox.IsValid())
+	{
+		MyScaleBox->SetOverrideScreenInformation(DesignerSize);
+	}
+}
+
 #endif
 
 /////////////////////////////////////////////////////
diff --git a/Engine/Source/Runtime/UMG/Private/Components/ScrollBox.cpp b/Engine/Source/Runtime/UMG/Private/Components/ScrollBox.cpp
index 3222c6ff658a..c69caf7705e2 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/ScrollBox.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/ScrollBox.cpp
@@ -111,6 +111,16 @@ float UScrollBox::GetScrollOffset() const
 	return 0;
 }
 
+float UScrollBox::GetViewOffsetFraction() const
+{
+	if ( MyScrollBox.IsValid() )
+	{
+		return MyScrollBox->GetViewOffsetFraction();
+	}
+
+	return 0;
+}
+
 void UScrollBox::SetScrollOffset(float NewScrollOffset)
 {
 	DesiredScrollOffset = NewScrollOffset;
@@ -278,6 +288,7 @@ void UScrollBox::OnDescendantDeselectedByDesigner( UWidget* DescendantWidget )
 	// because we get a deselect before we get a select, we need to delay this call until we're sure we didn't scroll to another widget.
 	TickHandle = FTicker::GetCoreTicker().AddTicker( FTickerDelegate::CreateLambda( [=]( float ) -> bool
 	                                                                                {
+                                                                                        QUICK_SCOPE_CYCLE_COUNTER(STAT_UScrollBox_ScrollToStart_LambdaTick);
 		                                                                                this->ScrollToStart();
 		                                                                                return false;
 		                                                                            } ) );
diff --git a/Engine/Source/Runtime/UMG/Private/Components/ScrollBoxSlot.cpp b/Engine/Source/Runtime/UMG/Private/Components/ScrollBoxSlot.cpp
index c9fda4a8a677..5fe23a2c4223 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/ScrollBoxSlot.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/ScrollBoxSlot.cpp
@@ -11,6 +11,7 @@ UScrollBoxSlot::UScrollBoxSlot(const FObjectInitializer& ObjectInitializer)
 	, Slot(nullptr)
 {
 	HorizontalAlignment = HAlign_Fill;
+	VerticalAlignment = VAlign_Fill;
 }
 
 void UScrollBoxSlot::BuildSlot(TSharedRef<SScrollBox> ScrollBox)
@@ -18,6 +19,7 @@ void UScrollBoxSlot::BuildSlot(TSharedRef<SScrollBox> ScrollBox)
 	Slot = &ScrollBox->AddSlot()
 		.Padding(Padding)
 		.HAlign(HorizontalAlignment)
+		.VAlign(VerticalAlignment)
 		[
 			Content == nullptr ? SNullWidget::NullWidget : Content->TakeWidget()
 		];
@@ -41,10 +43,20 @@ void UScrollBoxSlot::SetHorizontalAlignment(EHorizontalAlignment InHorizontalAli
 	}
 }
 
+void UScrollBoxSlot::SetVerticalAlignment(EVerticalAlignment InVerticalAlignment)
+{
+	VerticalAlignment = InVerticalAlignment;
+	if (Slot)
+	{
+		Slot->VAlign(InVerticalAlignment);
+	}
+}
+
 void UScrollBoxSlot::SynchronizeProperties()
 {
 	SetPadding(Padding);
 	SetHorizontalAlignment(HorizontalAlignment);
+	SetVerticalAlignment(VerticalAlignment);
 }
 
 void UScrollBoxSlot::ReleaseSlateResources(bool bReleaseChildren)
diff --git a/Engine/Source/Runtime/UMG/Private/Components/TableViewBase.cpp b/Engine/Source/Runtime/UMG/Private/Components/TableViewBase.cpp
deleted file mode 100644
index bfcc168144d1..000000000000
--- a/Engine/Source/Runtime/UMG/Private/Components/TableViewBase.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-#include "Components/TableViewBase.h"
-
-#define LOCTEXT_NAMESPACE "UMG"
-
-/////////////////////////////////////////////////////
-// UTableViewBase
-
-UTableViewBase::UTableViewBase(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-{
-	bIsVariable = true;
-}
-
-/////////////////////////////////////////////////////
-
-#undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/UMG/Private/Components/TextBlock.cpp b/Engine/Source/Runtime/UMG/Private/Components/TextBlock.cpp
index f23c9d09bea7..6bb84b435de9 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/TextBlock.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/TextBlock.cpp
@@ -78,7 +78,6 @@ void UTextBlock::SetFont(FSlateFontInfo InFontInfo)
 	if (MyTextBlock.IsValid())
 	{
 		MyTextBlock->SetFont(Font);
-		MyTextBlock->Invalidate(EInvalidateWidget::LayoutAndVolatility);
 	}
 }
 
diff --git a/Engine/Source/Runtime/UMG/Private/Components/TileView.cpp b/Engine/Source/Runtime/UMG/Private/Components/TileView.cpp
index a54404f8f13f..d465ef1951a4 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/TileView.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/TileView.cpp
@@ -2,8 +2,6 @@
 
 #include "Components/TileView.h"
 
-#define LOCTEXT_NAMESPACE "UMG"
-
 /////////////////////////////////////////////////////
 // UTileView
 
@@ -11,69 +9,45 @@ UTileView::UTileView(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
 	bIsVariable = true;
-
-	ItemWidth = 128.0f;
-	ItemHeight = 128.0f;
-	SelectionMode = ESelectionMode::Single;
+	EntryHeight = 128.f;
 }
 
-TSharedRef<SWidget> UTileView::RebuildWidget()
+TSharedRef<STableViewBase> UTileView::RebuildListWidget()
 {
-	MyTileView = SNew(STileView< UObject* >)
-		.SelectionMode(SelectionMode)
-		.ListItemsSource(&Items)
-		.ItemWidth(ItemWidth)
-		.ItemHeight(ItemHeight)
-		.OnGenerateTile(BIND_UOBJECT_DELEGATE(STileView< UObject* >::FOnGenerateRow, HandleOnGenerateTile))
-		//.OnSelectionChanged(this, &SSocketManager::SocketSelectionChanged_Execute)
-		//.OnContextMenuOpening(this, &SSocketManager::OnContextMenuOpening)
-		//.OnItemScrolledIntoView(this, &SSocketManager::OnItemScrolledIntoView)
-		//	.HeaderRow
-		//	(
-		//		SNew(SHeaderRow)
-		//		.Visibility(EVisibility::Collapsed)
-		//		+ SHeaderRow::Column(TEXT("Socket"))
-		//	);
-		;
-
-	return MyTileView.ToSharedRef();
+	return ConstructTileView<STileView>();
 }
 
-TSharedRef<ITableRow> UTileView::HandleOnGenerateTile(UObject* Item, const TSharedRef< STableViewBase >& OwnerTable) const
+FMargin UTileView::GetDesiredEntryPadding(UObject* Item) const
 {
-	// Call the user's delegate to see if they want to generate a custom widget bound to the data source.
-	if ( OnGenerateTileEvent.IsBound() )
+	return FMargin(EntrySpacing * 0.5f);
+}
+
+float UTileView::GetTotalEntryHeight() const
+{
+	return EntryHeight + (EntrySpacing * 0.5f);
+}
+
+float UTileView::GetTotalEntryWidth() const
+{
+	return EntryWidth + (EntrySpacing * 0.5f);
+}
+
+void UTileView::SetEntryHeight(float NewHeight)
+{
+	EntryHeight = NewHeight;
+	if (MyTileView.IsValid())
 	{
-		UWidget* Widget = OnGenerateTileEvent.Execute(Item);
-		if ( Widget != NULL )
-		{
-			return SNew(STableRow< UObject* >, OwnerTable)
-			[
-				Widget->TakeWidget()
-			];
-		}
+		MyTileView->SetItemHeight(GetTotalEntryHeight());
 	}
-
-	// If a row wasn't generated just create the default one, a simple text block of the item's name.
-	return SNew(STableRow< UObject* >, OwnerTable)
-		[
-			SNew(STextBlock).Text(Item ? FText::FromString(Item->GetName()) : LOCTEXT("null", "null"))
-		];
 }
 
-void UTileView::SetItemWidth(float Width)
+void UTileView::SetEntryWidth(float NewWidth)
 {
-	MyTileView->SetItemWidth(Width);
-}
-
-void UTileView::SetItemHeight(float Height)
-{
-	MyTileView->SetItemHeight(Height);
-}
-
-void UTileView::RequestListRefresh()
-{
-	MyTileView->RequestListRefresh();
+	EntryWidth = NewWidth;
+	if (MyTileView.IsValid())
+	{
+		MyTileView->SetItemWidth(GetTotalEntryWidth());
+	}
 }
 
 void UTileView::ReleaseSlateResources(bool bReleaseChildren)
@@ -83,15 +57,5 @@ void UTileView::ReleaseSlateResources(bool bReleaseChildren)
 	MyTileView.Reset();
 }
 
-#if WITH_EDITOR
 
-const FText UTileView::GetPaletteCategory()
-{
-	return LOCTEXT("Misc", "Misc");
-}
-
-#endif
-
-/////////////////////////////////////////////////////
-
-#undef LOCTEXT_NAMESPACE
+/////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Components/TreeView.cpp b/Engine/Source/Runtime/UMG/Private/Components/TreeView.cpp
new file mode 100644
index 000000000000..9ff27d177ff1
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Private/Components/TreeView.cpp
@@ -0,0 +1,89 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "Components/TreeView.h"
+
+/////////////////////////////////////////////////////
+// UTreeView
+
+UTreeView::UTreeView(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+TSharedRef<STableViewBase> UTreeView::RebuildListWidget()
+{
+	return ConstructTreeView<STreeView>();
+}
+
+void UTreeView::OnItemExpansionChangedInternal(UObject* Item, bool bIsExpanded)
+{
+	BP_OnItemExpansionChanged.Broadcast(Item, bIsExpanded);
+}
+
+void UTreeView::OnGetChildrenInternal(UObject* Item, TArray<UObject*>& OutChildren) const
+{
+#if WITH_EDITORONLY_DATA
+	//@todo DanH TreeView: Ideally it'd be nice to support previewing children/nesting in some way
+	if (!IsDesignTime())
+#endif
+	{
+		if (OnGetItemChildren.IsBound())
+		{
+			OnGetItemChildren.Execute(Item, OutChildren);
+		}
+		else if (BP_OnGetItemChildren.IsBound())
+		{
+			BP_OnGetItemChildren.Execute(Item, OutChildren);
+		}
+	}
+}
+
+void UTreeView::ReleaseSlateResources(bool bReleaseChildren)
+{
+	Super::ReleaseSlateResources(bReleaseChildren);
+
+	MyTreeView.Reset();
+}
+
+void UTreeView::SetItemExpansion(UObject* Item, bool bExpandItem)
+{
+	if (MyTreeView.IsValid())
+	{
+		MyTreeView->SetItemExpansion(Item, bExpandItem);
+	}
+}
+
+void UTreeView::ExpandAll()
+{
+	//@todo DanH TreeView: Recursive expansion - as written this will only expand the root items
+	for (UObject* ListItem : GetListItems())
+	{
+		MyTreeView->SetItemExpansion(ListItem, true);
+	}
+}
+
+void UTreeView::CollapseAll()
+{
+	if (MyTreeView.IsValid())
+	{
+		MyTreeView->ClearExpandedItems();
+	}
+}
+
+void UTreeView::OnItemClickedInternal(UObject* ListItem)
+{
+	// If the clicked item has children, expand it now as part of the click
+	if (ensure(MyTreeView.IsValid()))
+	{
+		// The item was clicked, implying that there should certainly be a widget representing this item right now
+		TSharedPtr<ITableRow> RowWidget = MyTreeView->WidgetFromItem(ListItem);
+		if (ensure(RowWidget.IsValid()) && RowWidget->DoesItemHaveChildren() > 0)
+		{
+			const bool bNewExpansionState = !MyTreeView->IsItemExpanded(ListItem);
+			MyTreeView->SetItemExpansion(ListItem, bNewExpansionState);
+		}
+	}
+	Super::OnItemClickedInternal(ListItem);
+}
+
+/////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Components/Widget.cpp b/Engine/Source/Runtime/UMG/Private/Components/Widget.cpp
index 112a18016a63..4c2c7abf6746 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/Widget.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/Widget.cpp
@@ -28,6 +28,8 @@
 
 #define LOCTEXT_NAMESPACE "UMG"
 
+DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Total Created UWidgets"), STAT_SlateUTotalWidgets, STATGROUP_SlateMemory);
+
 /**
 * Interface for tool tips.
 */
@@ -162,6 +164,8 @@ UWidget::UWidget(const FObjectInitializer& ObjectInitializer)
 #if WITH_EDITORONLY_DATA
 	{ static const FAutoRegisterLocalizationDataGatheringCallback AutomaticRegistrationOfLocalizationGatherer(UWidget::StaticClass(), &GatherWidgetForLocalization); }
 #endif
+
+	INC_DWORD_STAT(STAT_SlateUTotalWidgets);
 }
 
 void UWidget::SetRenderTransform(FWidgetTransform Transform)
@@ -418,6 +422,17 @@ bool UWidget::HasMouseCapture() const
 	return false;
 }
 
+bool UWidget::HasMouseCaptureByUser(int32 UserIndex, int32 PointerIndex) const
+{
+	TSharedPtr<SWidget> SafeWidget = GetCachedWidget();
+	if (SafeWidget.IsValid())
+	{
+		return SafeWidget->HasMouseCaptureByUser(UserIndex, PointerIndex >= 0 ? PointerIndex : TOptional<int32>());
+	}
+
+	return false;
+}
+
 void UWidget::SetKeyboardFocus()
 {
 	TSharedPtr<SWidget> SafeWidget = GetCachedWidget();
@@ -653,7 +668,7 @@ void UWidget::RemoveFromParent()
 		else
 		{
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
-			if (GetCachedWidget().IsValid())
+			if (GetCachedWidget().IsValid() && !IsDesignTime())
 			{
 				FText WarningMessage = FText::Format(LOCTEXT("RemoveFromParentWithNoParent", "UWidget::RemoveFromParent() called on '{0}' which has no UMG parent (if it was added directly to a native Slate widget via TakeWidget() then it must be removed explicitly rather than via RemoveFromParent())"), FText::AsCultureInvariant(GetPathName()));
 				// @todo: nickd - we need to switch this back to a warning in engine, but info for games
@@ -788,6 +803,12 @@ TSharedPtr<SWidget> UWidget::GetCachedWidget() const
 	return MyWidget.Pin();
 }
 
+bool UWidget::IsConstructed() const
+{
+	const TSharedPtr<SWidget>& SafeWidget = GetCachedWidget();
+	return SafeWidget.IsValid();
+}
+
 #if WITH_EDITOR
 
 TSharedRef<SWidget> UWidget::RebuildDesignWidget(TSharedRef<SWidget> Content)
@@ -820,14 +841,21 @@ TSharedRef<SWidget> UWidget::CreateDesignerOutline(TSharedRef<SWidget> Content)
 
 APlayerController* UWidget::GetOwningPlayer() const
 {
-	if ( UWidgetTree* WidgetTree = Cast<UWidgetTree>(GetOuter()) )
+	UWidgetTree* WidgetTree = Cast<UWidgetTree>(GetOuter());
+	if (UUserWidget* UserWidget = WidgetTree ? Cast<UUserWidget>(WidgetTree->GetOuter()) : nullptr)
 	{
-		if ( UUserWidget* UserWidget = Cast<UUserWidget>(WidgetTree->GetOuter()) )
-		{
-			return UserWidget->GetOwningPlayer();
-		}
+		return UserWidget->GetOwningPlayer();
 	}
+	return nullptr;
+}
 
+ULocalPlayer* UWidget::GetOwningLocalPlayer() const
+{
+	UWidgetTree* WidgetTree = Cast<UWidgetTree>(GetOuter());
+	if (UUserWidget* UserWidget = WidgetTree ? Cast<UUserWidget>(WidgetTree->GetOuter()) : nullptr)
+	{
+		return UserWidget->GetOwningLocalPlayer();
+	}
 	return nullptr;
 }
 
@@ -1049,6 +1077,10 @@ void UWidget::SynchronizeProperties()
 
 	SafeWidget->SetRenderOpacity(RenderOpacity);
 
+#if !UE_BUILD_SHIPPING
+	SafeWidget->SetTag(GetFName());
+#endif
+
 	UpdateRenderTransform();
 	SafeWidget->SetRenderTransformPivot(RenderTransformPivot);
 
@@ -1119,6 +1151,12 @@ UWorld* UWidget::GetWorld() const
 	return nullptr;
 }
 
+void UWidget::FinishDestroy()
+{
+	Super::FinishDestroy();
+	DEC_DWORD_STAT(STAT_SlateUTotalWidgets);
+}
+
 EVisibility UWidget::ConvertSerializedVisibilityToRuntime(ESlateVisibility Input)
 {
 	switch ( Input )
diff --git a/Engine/Source/Runtime/UMG/Private/Components/WidgetComponent.cpp b/Engine/Source/Runtime/UMG/Private/Components/WidgetComponent.cpp
index 2ccfab657287..84e1b2653f38 100644
--- a/Engine/Source/Runtime/UMG/Private/Components/WidgetComponent.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Components/WidgetComponent.cpp
@@ -627,7 +627,7 @@ FPrimitiveSceneProxy* UWidgetComponent::CreateSceneProxy()
 		return nullptr;
 	}
 
-	if (WidgetRenderer.IsValid() && CurrentSlateWidget.IsValid())
+	if (WidgetRenderer && CurrentSlateWidget.IsValid())
 	{
 		// Create a new MID for the current base material
 		{
@@ -774,9 +774,9 @@ void UWidgetComponent::OnRegister()
 				RegisterHitTesterWithViewport(GameViewportWidget);
 			}
 
-			if ( !WidgetRenderer.IsValid() && !GUsingNullRHI )
+			if ( !WidgetRenderer && !GUsingNullRHI )
 			{
-				WidgetRenderer = MakeShareable(new FWidgetRenderer(bApplyGammaCorrection));
+				WidgetRenderer = new FWidgetRenderer(bApplyGammaCorrection);
 			}
 		}
 
@@ -873,7 +873,11 @@ void UWidgetComponent::ReleaseResources()
 		Widget = nullptr;
 	}
 
-	WidgetRenderer.Reset();
+	if (WidgetRenderer)
+	{
+		BeginCleanup(WidgetRenderer);
+		WidgetRenderer = nullptr;
+	}
 
 	UnregisterWindow();
 }
@@ -1274,7 +1278,7 @@ void UWidgetComponent::InitWidget()
 	{
 		if ( WidgetClass && Widget == nullptr && GetWorld() )
 		{
-			Widget = CreateWidget<UUserWidget>(GetWorld(), WidgetClass);
+			Widget = CreateWidget(GetWorld(), WidgetClass);
 		}
 		
 #if WITH_EDITOR
@@ -1852,7 +1856,7 @@ void UWidgetComponent::SetWidgetClass(TSubclassOf<UUserWidget> InWidgetClass)
 		{
 			if (WidgetClass)
 			{
-				UUserWidget* NewWidget = CreateWidget<UUserWidget>(GetWorld(), WidgetClass);
+				UUserWidget* NewWidget = CreateWidget(GetWorld(), WidgetClass);
 				SetWidget(NewWidget);
 			}
 			else
diff --git a/Engine/Source/Runtime/UMG/Private/Slate/SObjectWidget.cpp b/Engine/Source/Runtime/UMG/Private/Slate/SObjectWidget.cpp
index e9af07cdc965..47514538ec15 100644
--- a/Engine/Source/Runtime/UMG/Private/Slate/SObjectWidget.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Slate/SObjectWidget.cpp
@@ -2,6 +2,7 @@
 
 #include "Slate/SObjectWidget.h"
 
+#include "UMGPrivate.h"
 #include "Blueprint/WidgetLayoutLibrary.h"
 #include "Slate/UMGDragDropOp.h"
 #include "SlateGlobals.h"
@@ -15,17 +16,32 @@ void SObjectWidget::Construct(const FArguments& InArgs, UUserWidget* InWidgetObj
 		InArgs._Content.Widget
 	];
 
-#if SLATE_VERBOSE_NAMED_EVENTS
+	// The user widget will tell us if we can tick but default to false for now
+	bCanTick = false;
+
 	if (WidgetObject)
 	{
-		DebugPaintEventName = WidgetObject->GetFullName() + TEXT("_Paint");
-		DebugTickEventName = WidgetObject->GetFullName() + TEXT("_Tick");
-	}
+#if SLATE_VERBOSE_NAMED_EVENTS
+		DebugName = WidgetObject->GetFullName();
+		DebugPaintEventName = DebugName + TEXT("_Paint");
+		DebugTickEventName = DebugName + TEXT("_Tick");
 #endif
+		WidgetObject->UpdateCanTick();
+	}
+
 }
 
 SObjectWidget::~SObjectWidget(void)
 {
+#if SLATE_VERBOSE_NAMED_EVENTS
+	// This can happen during blueprint compiling, so just ignore it if it happens then, this is really only a concern
+	// in a running game.
+	if (!GCompilingBlueprint)
+	{
+		ensureMsgf(!IsGarbageCollecting(), TEXT("SObjectWidget for '%s' destroyed while collecting garbage.  This can lead to multiple GCs being required to cleanup the object.  Possible causes might be,\n1) ReleaseSlateResources not being implemented for the owner of this pointer.\n2) You may just be holding onto some slate pointers on an actor that don't get reset until the actor is Garbage Collected.  You should avoid doing this, and instead reset those references when the actor is Destroyed."), *DebugName);
+	}
+#endif
+
 	ResetWidget();
 }
 
@@ -60,6 +76,11 @@ void SObjectWidget::ResetWidget()
 	];
 }
 
+FString SObjectWidget::GetReferencerName() const
+{
+	return FString("SObjectWidget( ") + WidgetObject->GetName() + FString(" )");
+}
+
 void SObjectWidget::AddReferencedObjects(FReferenceCollector& Collector)
 {
 	Collector.AddReferencedObject(WidgetObject);
@@ -73,7 +94,7 @@ void SObjectWidget::SetPadding(const TAttribute<FMargin>& InMargin)
 void SObjectWidget::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
 {
 #if SLATE_VERBOSE_NAMED_EVENTS
-	FScopedNamedEvent TickEvent(FColor::Turquoise, *DebugTickEventName);
+	SCOPED_NAMED_EVENT_FSTRING(DebugTickEventName, FColor::Turquoise);
 #endif
 
 #if WITH_VERY_VERBOSE_SLATE_STATS
@@ -89,7 +110,7 @@ void SObjectWidget::Tick( const FGeometry& AllottedGeometry, const double InCurr
 int32 SObjectWidget::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
 {
 #if SLATE_VERBOSE_NAMED_EVENTS
-	FScopedNamedEvent PaintEvent(FColor::Silver, *DebugPaintEventName);
+	SCOPED_NAMED_EVENT_FSTRING(DebugPaintEventName, FColor::Silver);
 #endif
 
 #if WITH_VERY_VERBOSE_SLATE_STATS
@@ -336,7 +357,7 @@ FReply SObjectWidget::OnDragDetected(const FGeometry& MyGeometry, const FPointer
 
 			float DPIScale = UWidgetLayoutLibrary::GetViewportScale(WidgetObject);
 
-			TSharedRef<FUMGDragDropOp> DragDropOp = FUMGDragDropOp::New(Operation, ScreenCursorPos, ScreenDrageePosition, DPIScale, SharedThis(this));
+			TSharedRef<FUMGDragDropOp> DragDropOp = FUMGDragDropOp::New(Operation, PointerEvent.GetPointerIndex(), ScreenCursorPos, ScreenDrageePosition, DPIScale, SharedThis(this));
 
 			return FReply::Handled().BeginDragDrop(DragDropOp);
 		}
@@ -481,12 +502,12 @@ FNavigationReply SObjectWidget::OnNavigation(const FGeometry& MyGeometry, const
 	return Reply;
 }
 
-void SObjectWidget::OnMouseCaptureLost()
+void SObjectWidget::OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
-	SCompoundWidget::OnMouseCaptureLost();
+	SCompoundWidget::OnMouseCaptureLost(CaptureLostEvent);
 
 	if ( CanRouteEvent() )
 	{
-		return WidgetObject->NativeOnMouseCaptureLost();
+		return WidgetObject->NativeOnMouseCaptureLost(CaptureLostEvent);
 	}
 }
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/Slate/SRetainerWidget.cpp b/Engine/Source/Runtime/UMG/Private/Slate/SRetainerWidget.cpp
index 1ab7ce66e3a3..1137cc670fe5 100644
--- a/Engine/Source/Runtime/UMG/Private/Slate/SRetainerWidget.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Slate/SRetainerWidget.cpp
@@ -36,20 +36,58 @@ static bool IsRetainedRenderingEnabled()
 
 #endif
 
-//---------------------------------------------------
+/** Whether or not the platform should have deferred retainer widget render target updating enabled by default */
+#define PLATFORM_REQUIRES_DEFERRED_RETAINER_UPDATE PLATFORM_IOS || PLATFORM_ANDROID;
 
+/**
+ * If this is true the retained rendering render thread work will happen during normal slate render thread rendering after the back buffer has been presented
+ * in order to avoid extra render target switching in the middle of the frame. The downside is that the UI update will be a frame late
+ */
+int32 GDeferRetainedRenderingRenderThread = PLATFORM_REQUIRES_DEFERRED_RETAINER_UPDATE;
+FAutoConsoleVariableRef DeferRetainedRenderingRT(
+	TEXT("Slate.DeferRetainedRenderingRenderThread"),
+	GDeferRetainedRenderingRenderThread,
+	TEXT("Whether or not to defer retained rendering to happen at the same time as the rest of slate render thread work"));
+
+
+class FRetainerWidgetRenderingResources : public FDeferredCleanupInterface, public FGCObject
+{
+public:
+	FRetainerWidgetRenderingResources()
+		: WidgetRenderer(nullptr)
+		, RenderTarget(nullptr)
+		, DynamicEffect(nullptr)
+	{}
+
+	~FRetainerWidgetRenderingResources()
+	{
+		// Note not using deferred cleanup for widget renderer here as it is already in deferred cleanup
+		if (WidgetRenderer)
+		{
+			delete WidgetRenderer;
+		}
+	}
+
+	/** FGCObject interface */
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override
+	{
+		Collector.AddReferencedObject(RenderTarget);
+		Collector.AddReferencedObject(DynamicEffect);
+	}
+public:
+	FWidgetRenderer* WidgetRenderer;
+	UTextureRenderTarget2D* RenderTarget;
+	UMaterialInstanceDynamic* DynamicEffect;
+};
 
 TArray<SRetainerWidget*, TInlineAllocator<3>> SRetainerWidget::Shared_WaitingToRender;
 int32 SRetainerWidget::Shared_MaxRetainerWorkPerFrame(0);
 TFrameValue<int32> SRetainerWidget::Shared_RetainerWorkThisFrame(0);
 
 
-//---------------------------------------------------
-
 SRetainerWidget::SRetainerWidget()
-	: CachedWindowToDesktopTransform(0, 0)
-	, EmptyChildSlot(this)
-	, DynamicEffect(nullptr)
+	: EmptyChildSlot(this)
+	, RenderingResources(new FRetainerWidgetRenderingResources)
 {
 }
 
@@ -62,6 +100,9 @@ SRetainerWidget::~SRetainerWidget()
 #endif
 	}
 
+	// Begin deferred cleanup of rendering resources.  DO NOT delete here.  Will be deleted when safe
+	BeginCleanup(RenderingResources);
+
 	Shared_WaitingToRender.Remove(this);
 }
 
@@ -72,11 +113,14 @@ void SRetainerWidget::UpdateWidgetRenderer()
 	// since the rest of slate does blending in gamma space.
 	const bool bWriteContentInGammaSpace = true;
 
-	if (!WidgetRenderer.IsValid())
+	if (!RenderingResources->WidgetRenderer)
 	{
-		WidgetRenderer = MakeShareable(new FWidgetRenderer(bWriteContentInGammaSpace));
+		RenderingResources->WidgetRenderer = new FWidgetRenderer(bWriteContentInGammaSpace);
 	}
 
+	UTextureRenderTarget2D* RenderTarget = RenderingResources->RenderTarget;
+	FWidgetRenderer* WidgetRenderer = RenderingResources->WidgetRenderer;
+
 	WidgetRenderer->SetUseGammaCorrection(bWriteContentInGammaSpace);
 	WidgetRenderer->SetIsPrepassNeeded(false);
 	WidgetRenderer->SetClearHitTestGrid(false);
@@ -95,11 +139,16 @@ void SRetainerWidget::UpdateWidgetRenderer()
 
 void SRetainerWidget::Construct(const FArguments& InArgs)
 {
+	FSlateApplicationBase::Get().OnGlobalInvalidate().AddSP(this, &SRetainerWidget::OnGlobalInvalidate);
+
 	STAT(MyStatId = FDynamicStats::CreateStatId<FStatGroup_STATGROUP_Slate>(InArgs._StatId);)
 
-	RenderTarget = NewObject<UTextureRenderTarget2D>();
+	UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>();
 	RenderTarget->ClearColor = FLinearColor::Transparent;
+	RenderTarget->OverrideFormat = PF_B8G8R8A8;
+	RenderTarget->bForceLinearGamma = false;
 
+	RenderingResources->RenderTarget = RenderTarget;
 	SurfaceBrush.SetResourceObject(RenderTarget);
 
 	Window = SNew(SVirtualWindow)
@@ -167,6 +216,11 @@ void SRetainerWidget::OnRetainerModeChanged()
 	Invalidate(EInvalidateWidget::Layout);
 }
 
+void SRetainerWidget::OnGlobalInvalidate()
+{
+	RequestRender();
+}
+
 #if !UE_BUILD_SHIPPING
 
 void SRetainerWidget::OnRetainerModeCVarChanged( IConsoleVariable* CVar )
@@ -201,25 +255,26 @@ void SRetainerWidget::SetContent(const TSharedRef< SWidget >& InContent)
 
 UMaterialInstanceDynamic* SRetainerWidget::GetEffectMaterial() const
 {
-	return DynamicEffect;
+	return RenderingResources->DynamicEffect;
 }
 
 void SRetainerWidget::SetEffectMaterial(UMaterialInterface* EffectMaterial)
 {
 	if ( EffectMaterial )
 	{
-		DynamicEffect = Cast<UMaterialInstanceDynamic>(EffectMaterial);
+		UMaterialInstanceDynamic* DynamicEffect = Cast<UMaterialInstanceDynamic>(EffectMaterial);
 		if ( !DynamicEffect )
 		{
 			DynamicEffect = UMaterialInstanceDynamic::Create(EffectMaterial, GetTransientPackage());
 		}
+		RenderingResources->DynamicEffect = DynamicEffect;
 
-		SurfaceBrush.SetResourceObject(DynamicEffect);
+		SurfaceBrush.SetResourceObject(RenderingResources->DynamicEffect);
 	}
 	else
 	{
-		DynamicEffect = nullptr;
-		SurfaceBrush.SetResourceObject(RenderTarget);
+		RenderingResources->DynamicEffect = nullptr;
+		SurfaceBrush.SetResourceObject(RenderingResources->RenderTarget);
 	}
 
 	UpdateWidgetRenderer();
@@ -235,12 +290,6 @@ void SRetainerWidget::SetWorld(UWorld* World)
 	OuterWorld = World;
 }
 
-void SRetainerWidget::AddReferencedObjects(FReferenceCollector& Collector)
-{
-	Collector.AddReferencedObject(RenderTarget);
-	Collector.AddReferencedObject(DynamicEffect);
-}
-
 FChildren* SRetainerWidget::GetChildren()
 {
 	if ( bEnableRetainedRendering )
@@ -284,12 +333,18 @@ void SRetainerWidget::InvalidateWidget(SWidget* InvalidateWidget)
 	}
 }
 
+void SRetainerWidget::SetRenderingPhase(int32 InPhase, int32 InPhaseCount)
+{
+	Phase = InPhase;
+	PhaseCount = InPhaseCount;
+}
+
 void SRetainerWidget::RequestRender()
 {
 	bRenderRequested = true;
 }
 
-bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
+bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args, const FGeometry& AllottedGeometry)
 {
 	if (RenderOnPhase)
 	{
@@ -307,8 +362,16 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 			return false;
 		}
 	}
+	
+	const FPaintGeometry PaintGeometry = AllottedGeometry.ToPaintGeometry();
+	const FVector2D RenderSize = PaintGeometry.GetLocalSize() * PaintGeometry.GetAccumulatedRenderTransform().GetMatrix().GetScale().GetVector();
+
+	if (RenderSize != PreviousRenderSize)
+	{
+		PreviousRenderSize = RenderSize;
+		bRenderRequested = true;
+	}
 
-	SCOPE_CYCLE_COUNTER( STAT_SlateRetainerWidgetTick );
 	if ( bRenderRequested )
 	{
 		// In order to get material parameter collections to function properly, we need the current world's Scene
@@ -331,9 +394,6 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 		LastTickedFrame = GFrameCounter;
 		const double TimeSinceLastDraw = FApp::GetCurrentTime() - LastDrawTime;
 
-		FPaintGeometry PaintGeometry = CachedAllottedGeometry.ToPaintGeometry();
-		FVector2D RenderSize = PaintGeometry.GetLocalSize() * PaintGeometry.GetAccumulatedRenderTransform().GetMatrix().GetScale().GetVector();
-
 		const uint32 RenderTargetWidth  = FMath::RoundToInt(RenderSize.X);
 		const uint32 RenderTargetHeight = FMath::RoundToInt(RenderSize.Y);
 
@@ -343,12 +403,15 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 		Window->SetVisibility(GetVisibility());
 
 		// Need to prepass.
-		Window->SlatePrepass(CachedAllottedGeometry.Scale);
+		Window->SlatePrepass(AllottedGeometry.Scale);
 
 		// Reset the cached node pool index so that we effectively reset the pool.
 		LastUsedCachedNodeIndex = 0;
 		RootCacheNode = nullptr;
 
+		UTextureRenderTarget2D* RenderTarget = RenderingResources->RenderTarget;
+		FWidgetRenderer* WidgetRenderer = RenderingResources->WidgetRenderer;
+
 		if ( RenderTargetWidth != 0 && RenderTargetHeight != 0 )
 		{
 			if ( MyWidget->GetVisibility().IsVisible() )
@@ -356,12 +419,21 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 				if ( RenderTarget->GetSurfaceWidth() != RenderTargetWidth ||
 					 RenderTarget->GetSurfaceHeight() != RenderTargetHeight )
 				{
-					const bool bForceLinearGamma = false;
-					RenderTarget->InitCustomFormat(RenderTargetWidth, RenderTargetHeight, PF_B8G8R8A8, bForceLinearGamma);
-					RenderTarget->UpdateResourceImmediate();
+					
+					// If the render target resource already exists just resize it.  Calling InitCustomFormat flushes render commands which could result in a huge hitch
+					if(RenderTarget->GameThread_GetRenderTargetResource() && RenderTarget->OverrideFormat == PF_B8G8R8A8)
+					{
+						RenderTarget->ResizeTarget(RenderTargetWidth, RenderTargetHeight);
+					}
+					else
+					{
+						const bool bForceLinearGamma = false;
+						RenderTarget->InitCustomFormat(RenderTargetWidth, RenderTargetHeight, PF_B8G8R8A8, bForceLinearGamma);
+						RenderTarget->UpdateResourceImmediate();
+					}
 				}
 
-				const float Scale = CachedAllottedGeometry.Scale;
+				const float Scale = AllottedGeometry.Scale;
 
 				const FVector2D DrawSize = FVector2D(RenderTargetWidth, RenderTargetHeight);
 				const FGeometry WindowGeometry = FGeometry::MakeRoot(DrawSize * ( 1 / Scale ), FSlateLayoutTransform(Scale, PaintGeometry.DrawPosition));
@@ -374,7 +446,6 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 				SRetainerWidget* MutableThis = const_cast<SRetainerWidget*>(this);
 				TSharedRef<SRetainerWidget> SharedMutableThis = SharedThis(MutableThis);
 				
-				//FPaintArgs PaintArgs(Window.ToSharedRef().Get(), Args.GetGrid(), Args.GetWindowToDesktopTransform(), FApp::GetCurrentTime(), Args.GetDeltaTime());
 				FPaintArgs PaintArgs(*this, Args.GetGrid(), Args.GetWindowToDesktopTransform(), FApp::GetCurrentTime(), Args.GetDeltaTime());
 
 				RootCacheNode = CreateCacheNode();
@@ -386,7 +457,8 @@ bool SRetainerWidget::PaintRetainedContent(const FPaintArgs& Args)
 					Window.ToSharedRef(),
 					WindowGeometry,
 					WindowGeometry.GetLayoutBoundingRect(),
-					TimeSinceLastDraw);
+					TimeSinceLastDraw,
+					GDeferRetainedRenderingRenderThread!=0);
 
 				bRenderRequested = false;
 				Shared_WaitingToRender.Remove(this);
@@ -412,12 +484,12 @@ int32 SRetainerWidget::OnPaint(const FPaintArgs& Args, const FGeometry& Allotted
 	if ( bEnableRetainedRendering && IsAnythingVisibleToRender() )
 	{
 		SCOPE_CYCLE_COUNTER( STAT_SlateRetainerWidgetPaint );
-		CachedAllottedGeometry = AllottedGeometry;
-		CachedWindowToDesktopTransform = Args.GetWindowToDesktopTransform();
 
 		TSharedRef<SRetainerWidget> SharedMutableThis = SharedThis(MutableThis);
 
-		const bool bNewFramePainted = MutableThis->PaintRetainedContent(Args);
+		const bool bNewFramePainted = MutableThis->PaintRetainedContent(Args, AllottedGeometry);
+
+		UTextureRenderTarget2D* RenderTarget = RenderingResources->RenderTarget;
 
 		if ( RenderTarget->GetSurfaceWidth() >= 1 && RenderTarget->GetSurfaceHeight() >= 1 )
 		{
@@ -425,6 +497,9 @@ int32 SRetainerWidget::OnPaint(const FPaintArgs& Args, const FGeometry& Allotted
 			// Retainer widget uses pre-multiplied alpha, so pre-multiply the color by the alpha to respect opacity.
 			const FLinearColor PremultipliedColorAndOpacity(ComputedColorAndOpacity * ComputedColorAndOpacity.A);
 
+			FWidgetRenderer* WidgetRenderer = RenderingResources->WidgetRenderer;
+			UMaterialInstanceDynamic* DynamicEffect = RenderingResources->DynamicEffect;
+	
 			const bool bDynamicMaterialInUse = (DynamicEffect != nullptr);
 			if (bDynamicMaterialInUse)
 			{
diff --git a/Engine/Source/Runtime/UMG/Private/Slate/SlateDataSheet.cpp b/Engine/Source/Runtime/UMG/Private/Slate/SlateDataSheet.cpp
deleted file mode 100644
index 4c9260e207d6..000000000000
--- a/Engine/Source/Runtime/UMG/Private/Slate/SlateDataSheet.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-#include "Slate/SlateDataSheet.h"
-#include "Engine/Texture2D.h"
-#include "RenderUtils.h"
-
-
-const FUpdateTextureRegion2D USlateDataSheet::DataSheetUpdateRegion(
-	0,
-	0,
-	0,
-	0,
-	USlateDataSheet::Data_Width,
-	USlateDataSheet::Data_Height);
-
-USlateDataSheet::USlateDataSheet(const FObjectInitializer& ObjectInitializer)
-	:Super(ObjectInitializer)
-{
-}
-
-
-void USlateDataSheet::Init()
-{
-	// Ensure that we have a texture resource
-	static const EPixelFormat DataFormat = EPixelFormat::PF_B8G8R8A8;
-	ensure(GPixelFormats[DataFormat].BlockBytes == Data_PixelSize);
-
-	DataTexture = UTexture2D::CreateTransient(Data_Width, Data_Height, DataFormat);
-#if WITH_EDITORONLY_DATA
-	DataTexture->MipGenSettings = TMGS_NoMipmaps;
-#endif
-	DataTexture->SRGB = false;
-	DataTexture->AddressX = TA_Clamp;
-	DataTexture->AddressY = TA_Clamp;
-	DataTexture->Filter = TF_Nearest;
-	DataTexture->CompressionSettings = TC_EditorIcon;
-	DataTexture->NeverStream = true;
-	DataTexture->UpdateResource();
-
-}
-
-void USlateDataSheet::EnqueueUpdateToGPU()
-{
-	if (ensureMsgf(DataTexture != nullptr, TEXT("Make sure to call Init()")))
-	{
-		const uint32 DataPitch = Data_Width * Data_PixelSize;
-		const uint32 DataSize = DataPitch*Data_Height;
-		uint8* SrcData = (uint8*)FMemory::Malloc(DataSize);
-		FMemory::Memcpy(SrcData, Data, DataSize);
-
-		auto DataCleanup = [](uint8* InSrcData, const FUpdateTextureRegion2D* Regions)
-		{
-			FMemory::Free(InSrcData);
-		};
-		DataTexture->UpdateTextureRegions(0, 1, &DataSheetUpdateRegion, DataPitch, Data_PixelSize, SrcData, DataCleanup);
-	}
-}
-
-
-UTexture2D* USlateDataSheet::GetTexture() const
-{
-	return DataTexture;
-}
diff --git a/Engine/Source/Runtime/UMG/Private/Slate/UMGDragDropOp.cpp b/Engine/Source/Runtime/UMG/Private/Slate/UMGDragDropOp.cpp
index 65690491e964..a1887c75fd86 100644
--- a/Engine/Source/Runtime/UMG/Private/Slate/UMGDragDropOp.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Slate/UMGDragDropOp.cpp
@@ -34,7 +34,7 @@ void FUMGDragDropOp::Construct()
 
 void FUMGDragDropOp::OnDrop( bool bDropWasHandled, const FPointerEvent& MouseEvent )
 {
-	if ( DragOperation )
+	if ( DragOperation && MouseEvent.GetPointerIndex() == PointerIndex)
 	{
 		if ( bDropWasHandled )
 		{
@@ -56,7 +56,7 @@ void FUMGDragDropOp::OnDrop( bool bDropWasHandled, const FPointerEvent& MouseEve
 
 void FUMGDragDropOp::OnDragged( const class FDragDropEvent& DragDropEvent )
 {
-	if ( DragOperation )
+	if ( DragOperation && DragDropEvent.GetPointerIndex() == PointerIndex)
 	{
 		DragOperation->Dragged(DragDropEvent);
 
@@ -146,12 +146,13 @@ FCursorReply FUMGDragDropOp::OnCursorQuery()
 	return CursorReply;
 }
 
-TSharedRef<FUMGDragDropOp> FUMGDragDropOp::New(UDragDropOperation* InOperation, const FVector2D &CursorPosition, const FVector2D &ScreenPositionOfDragee, float DPIScale, TSharedPtr<SObjectWidget> SourceUserWidget)
+TSharedRef<FUMGDragDropOp> FUMGDragDropOp::New(UDragDropOperation* InOperation, const int32 PointerIndex, const FVector2D &PointerPosition, const FVector2D &ScreenPositionOfDragee, float DPIScale, TSharedPtr<SObjectWidget> SourceUserWidget)
 {
 	check(InOperation);
 
 	TSharedRef<FUMGDragDropOp> Operation = MakeShareable(new FUMGDragDropOp());
-	Operation->MouseDownOffset = ScreenPositionOfDragee - CursorPosition;
+	Operation->PointerIndex = PointerIndex;
+	Operation->MouseDownOffset = ScreenPositionOfDragee - PointerPosition;
 	Operation->StartingScreenPos = ScreenPositionOfDragee;
 	Operation->SourceUserWidget = SourceUserWidget;
 	Operation->GameViewport = SourceUserWidget->GetWidgetObject()->GetWorld()->GetGameViewport();
diff --git a/Engine/Source/Runtime/UMG/Private/Slate/WidgetRenderer.cpp b/Engine/Source/Runtime/UMG/Private/Slate/WidgetRenderer.cpp
index 6ed3c3c8f0df..a8ba24a4f565 100644
--- a/Engine/Source/Runtime/UMG/Private/Slate/WidgetRenderer.cpp
+++ b/Engine/Source/Runtime/UMG/Private/Slate/WidgetRenderer.cpp
@@ -14,6 +14,7 @@
 
 #include "Widgets/LayerManager/STooltipPresenter.h"
 #include "Widgets/Layout/SPopup.h"
+#include "Framework/Application/SlateApplication.h"
 
 FWidgetRenderer::FWidgetRenderer(bool bUseGammaCorrection, bool bInClearTarget)
 	: bPrepassNeeded(true)
@@ -85,7 +86,7 @@ UTextureRenderTarget2D* FWidgetRenderer::CreateTargetFor(FVector2D DrawSize, Tex
 	return nullptr;
 }
 
-void FWidgetRenderer::DrawWidget(UTextureRenderTarget2D* RenderTarget, const TSharedRef<SWidget>& Widget, FVector2D DrawSize, float DeltaTime)
+void FWidgetRenderer::DrawWidget(UTextureRenderTarget2D* RenderTarget, const TSharedRef<SWidget>& Widget, FVector2D DrawSize, float DeltaTime, bool bDeferRenderTargetUpdate)
 {
 	TSharedRef<SVirtualWindow> Window = SNew(SVirtualWindow).Size(DrawSize);
 	TSharedRef<FHittestGrid> HitTestGrid = MakeShareable(new FHittestGrid());
@@ -93,7 +94,7 @@ void FWidgetRenderer::DrawWidget(UTextureRenderTarget2D* RenderTarget, const TSh
 	Window->SetContent(Widget);
 	Window->Resize(DrawSize);
 
-	DrawWindow(RenderTarget, HitTestGrid, Window, 1, DrawSize, DeltaTime);
+	DrawWindow(RenderTarget, HitTestGrid, Window, 1, DrawSize, DeltaTime, bDeferRenderTargetUpdate);
 }
 
 void FWidgetRenderer::DrawWindow(
@@ -102,18 +103,21 @@ void FWidgetRenderer::DrawWindow(
 	TSharedRef<SWindow> Window,
 	float Scale,
 	FVector2D DrawSize,
-	float DeltaTime)
+	float DeltaTime,
+	bool bDeferRenderTargetUpdate)
 {
 	FGeometry WindowGeometry = FGeometry::MakeRoot(DrawSize * ( 1 / Scale ), FSlateLayoutTransform(Scale));
 
-	DrawWindow(
+	DrawWindow
+	(
 		RenderTarget,
 		HitTestGrid,
 		Window,
 		WindowGeometry,
 		WindowGeometry.GetLayoutBoundingRect(),
-		DeltaTime
-		);
+		DeltaTime,
+		bDeferRenderTargetUpdate
+	);
 }
 
 void FWidgetRenderer::DrawWindow(
@@ -122,10 +126,11 @@ void FWidgetRenderer::DrawWindow(
 	TSharedRef<SWindow> Window,
 	FGeometry WindowGeometry,
 	FSlateRect WindowClipRect,
-	float DeltaTime)
+	float DeltaTime,
+	bool bDeferRenderTargetUpdate)
 {
 	FPaintArgs PaintArgs(Window.Get(), HitTestGrid.Get(), FVector2D::ZeroVector, FApp::GetCurrentTime(), DeltaTime);
-	DrawWindow(PaintArgs, RenderTarget, Window, WindowGeometry, WindowClipRect, DeltaTime);
+	DrawWindow(PaintArgs, RenderTarget, Window, WindowGeometry, WindowClipRect, DeltaTime, bDeferRenderTargetUpdate);
 }
 
 void FWidgetRenderer::DrawWindow(
@@ -134,9 +139,13 @@ void FWidgetRenderer::DrawWindow(
 	TSharedRef<SWindow> Window,
 	FGeometry WindowGeometry,
 	FSlateRect WindowClipRect,
-	float DeltaTime)
+	float DeltaTime,
+	bool bDeferRenderTargetUpdate)
 {
 #if !UE_SERVER
+	FSlateRenderer* MainSlateRenderer = FSlateApplication::Get().GetRenderer();
+	FScopeLock ScopeLock(MainSlateRenderer->GetResourceCriticalSection());
+
 	if ( LIKELY(FApp::CanEverRender()) )
 	{
 	    if ( bPrepassNeeded )
@@ -174,28 +183,20 @@ void FWidgetRenderer::DrawWindow(
 
 		DrawBuffer.ViewOffset = ViewOffset;
 
-		struct FRenderThreadContext
-		{
-			FSlateDrawBuffer* DrawBuffer;
-			FTextureRenderTarget2DResource* RenderTargetResource;
-			TSharedPtr<ISlate3DRenderer, ESPMode::ThreadSafe> Renderer;
-			bool bClearTarget;
-		}
-		Context =		
+		FRenderThreadUpdateContext Context =
 		{
 			&DrawBuffer,
-			static_cast<FTextureRenderTarget2DResource*>(RenderTarget->GameThread_GetRenderTargetResource()),
-			Renderer,
+			RenderTarget->GameThread_GetRenderTargetResource(),
+			Renderer.Get(),
 			bClearTarget
 		};
 
-		// Enqueue a command to unlock the draw buffer after all windows have been drawn
-		ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(FWidgetRenderer_DrawWindow,
-			FRenderThreadContext, InContext, Context,
-			{
-				QUICK_SCOPE_CYCLE_COUNTER(Stat_Slate_WidgetRendererRenderThread);
-				InContext.Renderer->DrawWindowToTarget_RenderThread(RHICmdList, InContext.RenderTargetResource, *InContext.DrawBuffer, InContext.bClearTarget);
-			});
+		FSlateApplication::Get().GetRenderer()->AddWidgetRendererUpdate(Context, bDeferRenderTargetUpdate);
 	}
 #endif // !UE_SERVER
 }
+
+void FWidgetRenderer::FinishCleanup()
+{
+	delete this;
+}
diff --git a/Engine/Source/Runtime/UMG/Private/UserWidget.cpp b/Engine/Source/Runtime/UMG/Private/UserWidget.cpp
index de1c0ebcdedb..873e7ee26547 100644
--- a/Engine/Source/Runtime/UMG/Private/UserWidget.cpp
+++ b/Engine/Source/Runtime/UMG/Private/UserWidget.cpp
@@ -26,8 +26,6 @@
 #include "Compilation/MovieSceneCompiler.h"
 #include "TimerManager.h"
 
-DECLARE_CYCLE_STAT(TEXT("UserWidget Create"), STAT_CreateWidget, STATGROUP_Slate);
-
 #define LOCTEXT_NAMESPACE "UMG"
 
 bool UUserWidget::bTemplateInitializing = false;
@@ -58,10 +56,11 @@ FPaintContext::FPaintContext()
 // UUserWidget
 UUserWidget::UUserWidget(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
-	, bCanEverTick(true)
-	, bCanEverPaint(true)
+	, bHasScriptImplementedTick(true)
+	, bHasScriptImplementedPaint(true)
 	, bInitialized(false)
 	, bStoppingAllAnimations(false)
+	, TickFrequency(EWidgetTickFrequency::Auto)
 {
 	ViewportAnchors = FAnchors(0, 0, 1, 1);
 	Visibility = ESlateVisibility::SelfHitTestInvisible;
@@ -76,6 +75,13 @@ UUserWidget::UUserWidget(const FObjectInitializer& ObjectInitializer)
 	PaletteCategory = LOCTEXT("UserCreated", "User Created");
 	DesignSizeMode = EDesignPreviewSizeMode::FillScreen;
 #endif
+
+	static bool bStaticInit = false;
+	if (!bStaticInit)
+	{
+		bStaticInit = true;
+		FLatentActionManager::OnLatentActionsChanged().AddStatic(&UUserWidget::OnLatentActionsChanged);
+	}
 }
 
 UWidgetBlueprintGeneratedClass* UUserWidget::GetWidgetTreeOwningClass()
@@ -89,7 +95,7 @@ UWidgetBlueprintGeneratedClass* UUserWidget::GetWidgetTreeOwningClass()
 		// Force post load on the generated class so all subobjects are done (specifically the widget tree).
 		BGClass->ConditionalPostLoad();
 
-		const bool bNoRootWidget = !BGClass->HasTemplate() && ( ( nullptr == BGClass->WidgetTree ) || ( nullptr == BGClass->WidgetTree->RootWidget ) );
+		const bool bNoRootWidget = ( nullptr == BGClass->WidgetTree ) || ( nullptr == BGClass->WidgetTree->RootWidget );
 
 		if ( bNoRootWidget )
 		{
@@ -250,7 +256,9 @@ bool UUserWidget::VerifyTemplateIntegrity(TArray<FText>& OutErrors)
 	// See if a matching name appeared
 	if ( UWidgetBlueprintGeneratedClass* TemplateClass = GetWidgetTreeOwningClass() )
 	{
-
+		// This code is only functional in the editor, because we don't always have a widget tree on the class
+		// in non-editor builds that tree is going to be transient for fast template code, so there won't be
+		// a tree available in cooked builds.
 		if (TemplateClass->WidgetTree != nullptr)
 		{
 			TemplateClass->WidgetTree->ForEachWidgetAndDescendants([&OutErrors, &QuickLookup, &bIsTemplateSafe, TemplateClass] (UWidget* Widget) {
@@ -351,8 +359,14 @@ bool UUserWidget::Initialize()
 	{
 		bInitialized = true;
 
+		UWidgetBlueprintGeneratedClass* BGClass = Cast<UWidgetBlueprintGeneratedClass>(GetClass());
+		if (BGClass && !BGClass->HasTemplate())
+		{
+			BGClass = GetWidgetTreeOwningClass();
+		}
+
 		// Only do this if this widget is of a blueprint class
-		if ( UWidgetBlueprintGeneratedClass* BGClass = GetWidgetTreeOwningClass() )
+		if (BGClass)
 		{
 			BGClass->InitializeWidget(this);
 		}
@@ -639,6 +653,8 @@ void UUserWidget::PlayAnimation( UWidgetAnimation* InAnimation, float StartAtTim
 		Invalidate();
 
 		OnAnimationStarted(InAnimation);
+
+		UpdateCanTick();
 	}
 
 	//return Player;
@@ -656,8 +672,9 @@ void UUserWidget::PlayAnimationTo(UWidgetAnimation* InAnimation, float StartAtTi
 		Invalidate();
 
 		OnAnimationStarted(InAnimation);
-	}
 
+		UpdateCanTick();
+	}
 	//return Player;
 }
 
@@ -672,6 +689,8 @@ void UUserWidget::StopAnimation(const UWidgetAnimation* InAnimation)
 		{
 			(*FoundPlayer)->Stop();
 		}
+
+		UpdateCanTick();
 	}
 }
 
@@ -683,6 +702,8 @@ void UUserWidget::StopAllAnimations()
 		FoundPlayer->Stop();
 	}
 	bStoppingAllAnimations = false;
+
+	UpdateCanTick();
 }
 
 float UUserWidget::PauseAnimation(const UWidgetAnimation* InAnimation)
@@ -802,6 +823,8 @@ void UUserWidget::OnAnimationFinishedPlaying(UUMGSequencePlayer& Player)
 	{
 		StoppedSequencePlayers.Add(&Player);
 	}
+
+	UpdateCanTick();
 }
 
 void UUserWidget::PlaySound(USoundBase* SoundToPlay)
@@ -1120,6 +1143,13 @@ bool UUserWidget::IsInViewport() const
 void UUserWidget::SetPlayerContext(const FLocalPlayerContext& InPlayerContext)
 {
 	PlayerContext = InPlayerContext;
+
+	WidgetTree->ForEachWidget([&InPlayerContext](UWidget* Widget) {
+		if (UUserWidget* UserWidget = Cast<UUserWidget>(Widget))
+		{
+			UserWidget->SetPlayerContext(InPlayerContext);
+		}
+	});
 }
 
 const FLocalPlayerContext& UUserWidget::GetPlayerContext() const
@@ -1274,6 +1304,17 @@ void UUserWidget::OnDesignerChanged(const FDesignerChangedEventArgs& EventArgs)
 	}
 }
 
+void UUserWidget::ValidateBlueprint(const UWidgetTree& BlueprintWidgetTree, FCompilerResultsLog& CompileLog) const
+{
+	ValidateCompiledDefaults(CompileLog);
+	ValidateCompiledWidgetTree(BlueprintWidgetTree, CompileLog);
+	BlueprintWidgetTree.ForEachWidget(
+		[&CompileLog] (UWidget* Widget)
+		{
+			Widget->ValidateCompiledDefaults(CompileLog);
+		});
+}
+
 void UUserWidget::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
 	Super::PostEditChangeProperty(PropertyChangedEvent);
@@ -1312,6 +1353,7 @@ void UUserWidget::NativePreConstruct()
 void UUserWidget::NativeConstruct()
 {
 	Construct();
+	UpdateCanTick();
 }
 
 void UUserWidget::NativeDestruct()
@@ -1321,14 +1363,18 @@ void UUserWidget::NativeDestruct()
 }
 
 void UUserWidget::NativeTick(const FGeometry& MyGeometry, float InDeltaTime)
-{
-	GInitRunaway();
-
-	TickActionsAndAnimation(MyGeometry, InDeltaTime);
-
-	if ( bCanEverTick )
+{ 
+	// If this ensure is hit it is likely UpdateCanTick as not called somewhere
+	if(ensureMsgf(TickFrequency != EWidgetTickFrequency::Never, TEXT("SObjectWidget and UUserWidget have mismatching tick states or UUserWidget::NativeTick was called manually (Never do this)")))
 	{
-		Tick(MyGeometry, InDeltaTime);
+		GInitRunaway();
+
+		TickActionsAndAnimation(MyGeometry, InDeltaTime);
+
+		if (bHasScriptImplementedTick)
+		{
+			Tick(MyGeometry, InDeltaTime);
+		}
 	}
 }
 
@@ -1521,9 +1567,31 @@ void UUserWidget::InitializeInputComponent()
 	}
 }
 
+void UUserWidget::UpdateCanTick() 
+{
+	TSharedPtr<SObjectWidget> SafeGCWidget = MyGCWidget.Pin();
+	UWorld* World = GetWorld();
+
+	if(SafeGCWidget.IsValid() && World)
+	{
+		// Default to never tick, only recompute for auto
+		bool bCanTick = false;
+		if (TickFrequency == EWidgetTickFrequency::Auto)
+		{
+			UWidgetBlueprintGeneratedClass* WidgetBPClass = Cast<UWidgetBlueprintGeneratedClass>(GetClass());
+			bCanTick |= WidgetBPClass->ClassRequiresNativeTick();
+			bCanTick |= bHasScriptImplementedTick;
+			bCanTick |= World->GetLatentActionManager().GetNumActionsForObject(this) != 0;
+			bCanTick |= ActiveSequencePlayers.Num() > 0;
+		}
+
+		SafeGCWidget->SetCanTick(bCanTick);
+	}
+}
+
 int32 UUserWidget::NativePaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const
 {
-	if ( bCanEverPaint )
+	if ( bHasScriptImplementedPaint )
 	{
 		FPaintContext Context(AllottedGeometry, MyCullingRect, OutDrawElements, LayerId, InWidgetStyle, bParentEnabled);
 		OnPaint( Context );
@@ -1722,7 +1790,7 @@ FNavigationReply UUserWidget::NativeOnNavigation(const FGeometry& InGeometry, co
 	return FNavigationReply::Escape();
 }
 	
-void UUserWidget::NativeOnMouseCaptureLost()
+void UUserWidget::NativeOnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)
 {
 	OnMouseCaptureLost();
 }
@@ -1812,9 +1880,9 @@ void UUserWidget::PostLoad()
 #if WITH_EDITOR
 	if (!HasAnyFlags(RF_ClassDefaultObject))
 	{
-		UUserWidget* DefeaultWidget = Cast<UUserWidget>(GetClass()->GetDefaultObject());
-		bCanEverTick = DefeaultWidget->bCanEverTick;
-		bCanEverPaint = DefeaultWidget->bCanEverPaint;
+		UUserWidget* DefaultWidget = Cast<UUserWidget>(GetClass()->GetDefaultObject());
+		bHasScriptImplementedTick = DefaultWidget->bHasScriptImplementedTick;
+		bHasScriptImplementedPaint = DefaultWidget->bHasScriptImplementedPaint;
 	}
 #else
 	if ( HasAnyFlags(RF_ArchetypeObject) && !HasAllFlags(RF_ClassDefaultObject) )
@@ -1861,46 +1929,84 @@ void UUserWidget::Serialize(FArchive& Ar)
 
 /////////////////////////////////////////////////////
 
-UUserWidget* UUserWidget::NewWidgetObject(UObject* Outer, UClass* UserWidgetClass, FName WidgetName, EObjectFlags Flags)
+UUserWidget* UUserWidget::CreateWidgetInstance(UWidget& OwningWidget, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName)
 {
-	UWidgetBlueprintGeneratedClass* WBGC = Cast<UWidgetBlueprintGeneratedClass>(UserWidgetClass);
-	if ( WBGC && WBGC->HasTemplate() )
+	UUserWidget* ParentUserWidget = Cast<UUserWidget>(&OwningWidget);
+	if (!ParentUserWidget && OwningWidget.GetOuter())
 	{
-		if ( UUserWidget* Template = WBGC->GetTemplate() )
-		{
-#if UE_BUILD_DEBUG
-			UE_LOG(LogUMG, Log, TEXT("Widget Class %s - Using Fast CreateWidget Path."), *UserWidgetClass->GetName());
-#endif
-
-			FObjectInstancingGraph ObjectInstancingGraph;
-			UUserWidget* NewUserWidget = NewObject<UUserWidget>(Outer, UserWidgetClass, WidgetName, Flags, Template, false, &ObjectInstancingGraph);
-
-			return NewUserWidget;
-		}
-		else
-		{
-#if !WITH_EDITOR && (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT)
-			UE_LOG(LogUMG, Error, TEXT("Widget Class %s - Using Slow CreateWidget path because no template found."), *UserWidgetClass->GetName());
-#endif
-		}
-	}
-	else
-	{
-#if !WITH_EDITOR && (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT)
-		UE_LOG(LogUMG, Warning, TEXT("Widget Class %s - Using Slow CreateWidget path because this class could not be templated."), *UserWidgetClass->GetName());
-#endif
+		// If we were given a UWidget, the nearest parent UserWidget is the outer of the UWidget's WidgetTree outer
+		ParentUserWidget = Cast<UUserWidget>(OwningWidget.GetOuter()->GetOuter());
 	}
 
-	return NewObject<UUserWidget>(Outer, UserWidgetClass, WidgetName, Flags);
+	if (ensure(ParentUserWidget && ParentUserWidget->WidgetTree))
+	{
+		UUserWidget* NewWidget = CreateInstanceInternal(ParentUserWidget->WidgetTree, UserWidgetClass, WidgetName, ParentUserWidget->GetWorld(), ParentUserWidget->GetOwningLocalPlayer());
+#if WITH_EDITOR
+		if (NewWidget)
+		{
+			NewWidget->SetDesignerFlags(OwningWidget.GetDesignerFlags());
+		}
+#endif
+		return NewWidget;
+	}
+
+	return nullptr;
 }
 
-UUserWidget* UUserWidget::CreateWidgetOfClass(UClass* UserWidgetClass, UGameInstance* InGameInstance, UWorld* InWorld, APlayerController* InOwningPlayer)
+UUserWidget* UUserWidget::CreateWidgetInstance(UWidgetTree& OwningWidgetTree, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName)
 {
-	SCOPE_CYCLE_COUNTER(STAT_CreateWidget);
+	if (UUserWidget* OwningUserWidget = Cast<UUserWidget>(OwningWidgetTree.GetOuter()))
+	{
+		return CreateWidgetInstance(*OwningUserWidget, UserWidgetClass, WidgetName);
+	}
 
+	return CreateInstanceInternal(&OwningWidgetTree, UserWidgetClass, WidgetName, nullptr, nullptr);
+}
+
+UUserWidget* UUserWidget::CreateWidgetInstance(APlayerController& OwnerPC, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName)
+{
+	if (!OwnerPC.IsLocalPlayerController())
+	{
+		const FText FormatPattern = LOCTEXT("NotLocalPlayer", "Only Local Player Controllers can be assigned to widgets. {PlayerController} is not a Local Player Controller.");
+		FFormatNamedArguments FormatPatternArgs;
+		FormatPatternArgs.Add(TEXT("PlayerController"), FText::FromName(OwnerPC.GetFName()));
+		FMessageLog("PIE").Error(FText::Format(FormatPattern, FormatPatternArgs));
+	}
+	else if (!OwnerPC.Player)
+	{
+		const FText FormatPattern = LOCTEXT("NoPlayer", "CreateWidget cannot be used on Player Controller with no attached player. {PlayerController} has no Player attached.");
+		FFormatNamedArguments FormatPatternArgs;
+		FormatPatternArgs.Add(TEXT("PlayerController"), FText::FromName(OwnerPC.GetFName()));
+		FMessageLog("PIE").Error(FText::Format(FormatPattern, FormatPatternArgs));
+	}
+	else if (UWorld* World = OwnerPC.GetWorld())
+	{
+		UGameInstance* GameInstance = World->GetGameInstance();
+		UObject* Outer = GameInstance ? StaticCast<UObject*>(GameInstance) : StaticCast<UObject*>(World);
+		return CreateInstanceInternal(Outer, UserWidgetClass, WidgetName, World, CastChecked<ULocalPlayer>(OwnerPC.Player));
+	}
+	return nullptr;
+}
+
+UUserWidget* UUserWidget::CreateWidgetInstance(UGameInstance& GameInstance, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName)
+{
+	return CreateInstanceInternal(&GameInstance, UserWidgetClass, WidgetName, GameInstance.GetWorld(), GameInstance.GetFirstGamePlayer());
+}
+
+UUserWidget* UUserWidget::CreateWidgetInstance(UWorld& World, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName)
+{
+	if (UGameInstance* GameInstance = World.GetGameInstance())
+	{
+		return CreateWidgetInstance(*GameInstance, UserWidgetClass, WidgetName);
+	}
+	return CreateInstanceInternal(&World, UserWidgetClass, WidgetName, &World, World.GetFirstLocalPlayerFromController());
+}
+
+UUserWidget* UUserWidget::CreateInstanceInternal(UObject* Outer, TSubclassOf<UUserWidget> UserWidgetClass, FName InstanceName, UWorld* World, ULocalPlayer* LocalPlayer)
+{
 #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST)
 	// Only do this on a non-shipping or test build.
-	if ( !CreateWidgetHelpers::ValidateUserWidgetClass(UserWidgetClass) )
+	if (!CreateWidgetHelpers::ValidateUserWidgetClass(UserWidgetClass))
 	{
 		return nullptr;
 	}
@@ -1910,70 +2016,72 @@ UUserWidget* UUserWidget::CreateWidgetOfClass(UClass* UserWidgetClass, UGameInst
 	// In non-shipping builds, ensure that users are allowed to dynamic construct this widget.
 	if (UWidgetBlueprintGeneratedClass* BPClass = Cast<UWidgetBlueprintGeneratedClass>(UserWidgetClass))
 	{
-		ensure(BPClass->bAllowDynamicCreation);
+		if (World && World->IsGameWorld())
+		{
+			ensureMsgf(BPClass->bAllowDynamicCreation, TEXT("This Widget Blueprint's 'Support Dynamic Creation' option either defaults to Off or was explictly turned off.  If you need to create this widget at runtime, turn this option on."));
+		}
 	}
 #endif
 
-	UObject* Outer = nullptr;
-	ULocalPlayer* PlayerContext = nullptr;
-	UWorld* World = InWorld;
-
-	if ( InOwningPlayer )
-	{
-		if ( !InOwningPlayer->IsLocalPlayerController() )
-		{
-			const FText FormatPattern = LOCTEXT("NotLocalPlayer", "Only Local Player Controllers can be assigned to widgets. {PlayerController} is not a Local Player Controller.");
-			FFormatNamedArguments FormatPatternArgs;
-			FormatPatternArgs.Add(TEXT("PlayerController"), FText::FromName(InOwningPlayer->GetFName()));
-			FMessageLog("PIE").Error(FText::Format(FormatPattern, FormatPatternArgs));
-			return nullptr;
-		}
-
-		if ( !InOwningPlayer->Player )
-		{
-			const FText FormatPattern = LOCTEXT("NoPlayer", "CreateWidget cannot be used on Player Controller with no attached player. {PlayerController} has no Player attached.");
-			FFormatNamedArguments FormatPatternArgs;
-			FormatPatternArgs.Add(TEXT("PlayerController"), FText::FromName(InOwningPlayer->GetFName()));
-			FMessageLog("PIE").Error(FText::Format(FormatPattern, FormatPatternArgs));
-			return nullptr;
-		}
-
-		// Assign the outer to the game instance if it exists, otherwise use the player controller's world
-		World = InOwningPlayer->GetWorld();
-
-		Outer = World->GetGameInstance() ? StaticCast<UObject*>(World->GetGameInstance()) : StaticCast<UObject*>(World);
-		PlayerContext = CastChecked<ULocalPlayer>(InOwningPlayer->Player);
-	}
-	else if ( InWorld )
-	{
-		// Assign the outer to the game instance if it exists, otherwise use the world
-		Outer = InWorld->GetGameInstance() ? StaticCast<UObject*>(InWorld->GetGameInstance()) : StaticCast<UObject*>(InWorld);
-		PlayerContext = InWorld->GetFirstLocalPlayerFromController();
-	}
-	else if ( InGameInstance )
-	{
-		Outer = InGameInstance;
-		PlayerContext = InGameInstance->GetFirstGamePlayer();
-	}
-
-	if ( Outer == nullptr )
+	if (!Outer)
 	{
 		FMessageLog("PIE").Error(FText::Format(LOCTEXT("OuterNull", "Unable to create the widget {0}, no outer provided."), FText::FromName(UserWidgetClass->GetFName())));
 		return nullptr;
 	}
 
-	UUserWidget* NewWidget = UUserWidget::NewWidgetObject(Outer, UserWidgetClass);
-
-	if ( PlayerContext )
+	UUserWidget* NewWidget = nullptr;
+	UWidgetBlueprintGeneratedClass* WBGC = Cast<UWidgetBlueprintGeneratedClass>(UserWidgetClass);
+	if (WBGC && WBGC->HasTemplate())
 	{
-		NewWidget->SetPlayerContext(FLocalPlayerContext(PlayerContext, World));
-	}
+		if (UUserWidget* Template = WBGC->GetTemplate())
+		{
+#if UE_BUILD_DEBUG
+			UE_LOG(LogUMG, Log, TEXT("Widget Class %s - Using Fast CreateWidget Path."), *UserWidgetClass->GetName());
+#endif
 
+			FObjectInstancingGraph ObjectInstancingGraph;
+			NewWidget = NewObject<UUserWidget>(Outer, UserWidgetClass, InstanceName, RF_NoFlags, Template, false, &ObjectInstancingGraph);
+		}
+#if !WITH_EDITOR && (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT)
+		else
+		{
+
+			UE_LOG(LogUMG, Error, TEXT("Widget Class %s - Using Slow CreateWidget path because no template found."), *UserWidgetClass->GetName());
+		}
+#endif
+	}
+#if !WITH_EDITOR && (UE_BUILD_DEBUG || UE_BUILD_DEVELOPMENT)
+	else
+	{
+		UE_LOG(LogUMG, Warning, TEXT("Widget Class %s - Using Slow CreateWidget path because this class could not be templated."), *UserWidgetClass->GetName());
+	}
+#endif
+
+	if (!NewWidget)
+	{
+		NewWidget = NewObject<UUserWidget>(Outer, UserWidgetClass, InstanceName, RF_NoFlags);
+	}
+	
 	NewWidget->Initialize();
+	
+	if (LocalPlayer)
+	{
+		NewWidget->SetPlayerContext(FLocalPlayerContext(LocalPlayer, World));
+	}
 
 	return NewWidget;
 }
 
+
+void UUserWidget::OnLatentActionsChanged(UObject* ObjectWhichChanged, ELatentActionChangeType ChangeType)
+{
+	if (UUserWidget* WidgetThatChanged = Cast<UUserWidget>(ObjectWhichChanged))
+	{
+		WidgetThatChanged->UpdateCanTick();
+	}
+}
+
+
 /////////////////////////////////////////////////////
 
 bool CreateWidgetHelpers::ValidateUserWidgetClass(const UClass* UserWidgetClass)
@@ -2005,4 +2113,4 @@ bool CreateWidgetHelpers::ValidateUserWidgetClass(const UClass* UserWidgetClass)
 	return true;
 }
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Private/WidgetBlueprintGeneratedClass.cpp b/Engine/Source/Runtime/UMG/Private/WidgetBlueprintGeneratedClass.cpp
index b1747eee4a98..21bd0e9b6e7c 100644
--- a/Engine/Source/Runtime/UMG/Private/WidgetBlueprintGeneratedClass.cpp
+++ b/Engine/Source/Runtime/UMG/Private/WidgetBlueprintGeneratedClass.cpp
@@ -241,6 +241,13 @@ void UWidgetBlueprintGeneratedClass::InitializeWidgetStatic(UUserWidget* UserWid
 	}
 }
 
+#if WITH_EDITOR
+void UWidgetBlueprintGeneratedClass::SetClassRequiresNativeTick(bool InClassRequiresNativeTick)
+{
+	bClassRequiresNativeTick = InClassRequiresNativeTick;
+}
+#endif
+
 void UWidgetBlueprintGeneratedClass::InitializeWidget(UUserWidget* UserWidget) const
 {
 	InitializeWidgetStatic(UserWidget, this, HasTemplate(), bAllowDynamicCreation, WidgetTree, Animations, Bindings);
@@ -343,7 +350,6 @@ UUserWidget* UWidgetBlueprintGeneratedClass::GetTemplate()
 
 	if ( TemplatePreviewInEditor )
 	{
-
 		if ( EditorTemplate == nullptr && HasTemplate() )
 		{
 			EditorTemplate = NewObject<UUserWidget>(this, this, NAME_None, EObjectFlags(RF_ArchetypeObject | RF_Transient));
diff --git a/Engine/Source/Runtime/UMG/Private/WidgetBlueprintLibrary.cpp b/Engine/Source/Runtime/UMG/Private/WidgetBlueprintLibrary.cpp
index d2b817955254..d40d015134c2 100644
--- a/Engine/Source/Runtime/UMG/Private/WidgetBlueprintLibrary.cpp
+++ b/Engine/Source/Runtime/UMG/Private/WidgetBlueprintLibrary.cpp
@@ -20,6 +20,7 @@
 #include "Blueprint/WidgetLayoutLibrary.h"
 #include "Engine/Engine.h"
 #include "Engine/GameEngine.h"
+#include "Widgets/Layout/SWindowTitleBarArea.h"
 
 //For PIE error messages
 
@@ -41,15 +42,15 @@ UUserWidget* UWidgetBlueprintLibrary::Create(UObject* WorldContextObject, TSubcl
 	}
 
 	UUserWidget* UserWidget = nullptr;
-	if ( OwningPlayer == nullptr )
+	if (OwningPlayer)
 	{
-		UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-		UserWidget = CreateWidget<UUserWidget>(World, WidgetType);
+		UserWidget = CreateWidget(OwningPlayer, WidgetType);
 	}
-	else
+	else if (UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull))
 	{
-		UserWidget = CreateWidget<UUserWidget>(OwningPlayer, WidgetType);
+		UserWidget = CreateWidget(World, WidgetType);
 	}
+
 	return UserWidget;
 }
 
@@ -596,13 +597,15 @@ void UWidgetBlueprintLibrary::GetSafeZonePadding(UObject* WorldContextObject, FV
 {
 	FVector2D ViewportSize = UWidgetLayoutLibrary::GetViewportSize(WorldContextObject);
 
-	FDisplayMetrics Metrics;
-	FSlateApplication::Get().GetDisplayMetrics(Metrics);
-
-	SafePadding = Metrics.TitleSafePaddingSize;
+	FMargin PaddingSize;
+	FSlateApplication::Get().GetSafeZoneSize(PaddingSize, ViewportSize);
+	SafePadding.X = PaddingSize.Left;
+	SafePadding.Y = PaddingSize.Top;
+	SafePadding.Z = PaddingSize.Right;
+	SafePadding.W = PaddingSize.Bottom;
 	FVector2D padding(FMath::Max(SafePadding.Z, SafePadding.X), FMath::Max(SafePadding.W, SafePadding.Y));
 	SafePaddingScale = padding / ViewportSize;
-	SpillOverPadding = Metrics.ActionSafePaddingSize;
+	SpillOverPadding = SafePadding;
 }
 
 bool UWidgetBlueprintLibrary::SetHardwareCursor(UObject* WorldContextObject, EMouseCursor::Type CursorShape, FName CursorName, FVector2D HotSpot)
@@ -645,4 +648,34 @@ void UWidgetBlueprintLibrary::RestorePreviousWindowTitleBarState()
 	}
 }
 
+static UWidgetBlueprintLibrary::FOnGameWindowCloseButtonClickedDelegate OnGameWindowCloseButtonClicked;
+
+static void OnGameWindowCloseButtonClickedSimpleDelegate()
+{
+	if (OnGameWindowCloseButtonClicked.IsBound())
+	{
+		OnGameWindowCloseButtonClicked.Execute();
+	}
+	else
+	{
+		UGameEngine* GameEngine = Cast<UGameEngine>(GEngine);
+		TSharedPtr<SWindow> GameViewportWindow = GameEngine->GameViewportWindow.Pin();
+		if (GameViewportWindow.IsValid())
+		{
+			GameViewportWindow->RequestDestroyWindow();
+		}
+	}
+}
+
+void UWidgetBlueprintLibrary::SetWindowTitleBarOnCloseClickedDelegate(UWidgetBlueprintLibrary::FOnGameWindowCloseButtonClickedDelegate Delegate)
+{
+	OnGameWindowCloseButtonClicked = Delegate;
+	SWindowTitleBarArea::SetOnCloseButtonClickedDelegate(FSimpleDelegate::CreateStatic(&OnGameWindowCloseButtonClickedSimpleDelegate));
+}
+
+void UWidgetBlueprintLibrary::SetWindowTitleBarCloseButtonActive(bool bActive)
+{
+	SWindowTitleBarArea::SetIsCloseButtonActive(bActive);
+}
+
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/UMG/Private/WidgetTree.cpp b/Engine/Source/Runtime/UMG/Private/WidgetTree.cpp
index 8b564b54459c..49e1d2505052 100644
--- a/Engine/Source/Runtime/UMG/Private/WidgetTree.cpp
+++ b/Engine/Source/Runtime/UMG/Private/WidgetTree.cpp
@@ -186,9 +186,11 @@ void UWidgetTree::ForWidgetAndChildren(UWidget* Widget, TFunctionRef<void(UWidge
 
 void UWidgetTree::PreSave(const class ITargetPlatform* TargetPlatform)
 {
+#if WITH_EDITORONLY_DATA
 	AllWidgets.Empty();
 
 	GetAllWidgets(AllWidgets);
+#endif
 
 	Super::PreSave( TargetPlatform);
 }
@@ -196,5 +198,7 @@ void UWidgetTree::PreSave(const class ITargetPlatform* TargetPlatform)
 void UWidgetTree::PostLoad()
 {
 	Super::PostLoad();
+#if WITH_EDITORONLY_DATA
 	AllWidgets.Empty();
+#endif
 }
diff --git a/Engine/Source/Runtime/UMG/Public/Animation/WidgetAnimation.h b/Engine/Source/Runtime/UMG/Public/Animation/WidgetAnimation.h
index 4beb24dcbebb..e2ac0b913c96 100644
--- a/Engine/Source/Runtime/UMG/Public/Animation/WidgetAnimation.h
+++ b/Engine/Source/Runtime/UMG/Public/Animation/WidgetAnimation.h
@@ -69,6 +69,10 @@ public:
 	virtual void LocateBoundObjects(const FGuid& ObjectId, UObject* Context, TArray<UObject*, TInlineAllocator<1>>& OutObjects) const override;
 	// ~UMovieSceneAnimation overrides
 
+	//~ Begin UObject Interface. 
+	virtual bool IsPostLoadThreadSafe() const override;
+	//~ End UObject Interface
+
 	/** Get Animation bindings of the animation */
 	const TArray<FWidgetAnimationBinding>& GetBindings() const { return AnimationBindings; }
 
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/IUserListEntry.h b/Engine/Source/Runtime/UMG/Public/Blueprint/IUserListEntry.h
new file mode 100644
index 000000000000..a9b8218dce4a
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/IUserListEntry.h
@@ -0,0 +1,73 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/Interface.h"
+#include "IUserListEntry.generated.h"
+
+class UUserWidget;
+class IObjectTableRow;
+
+UINTERFACE(meta = (CannotImplementInterfaceInBlueprint))
+class UMG_API UNativeUserListEntry : public UInterface
+{
+	GENERATED_UINTERFACE_BODY()
+};
+
+class UMG_API INativeUserListEntry : public IInterface
+{
+	GENERATED_IINTERFACE_BODY()
+
+public:
+	/** @return True if the item represented by this entry is currently selected. */
+	UFUNCTION(BlueprintCallable, Category = UserListEntry)
+	virtual bool IsListItemSelected() const = 0;
+
+	/** @return True if the item represented by this entry is currently expanded and showing its children. Tree view entries only. */
+	UFUNCTION(BlueprintCallable, Category = UserListEntry)
+	virtual bool IsListItemExpanded() const = 0;
+
+	/** 
+	 * Advanced native-only option for specific rows to preclude themselves from any kind of selection. 
+	 * Intended primarily for category separators and the like.
+	 * Note that this is only relevant when the row is in a list that allows selection in the first place.
+	 */
+	virtual bool IsListItemSelectable() const { return true; }
+};
+
+UINTERFACE()
+class UMG_API UUserListEntry : public UNativeUserListEntry
+{
+	GENERATED_UINTERFACE_BODY()
+};
+
+class UMG_API IUserListEntry : public INativeUserListEntry
+{
+	GENERATED_IINTERFACE_BODY()
+
+public:
+	static void ReleaseEntry(UUserWidget& ListEntryWidget);
+	static void UpdateItemSelection(UUserWidget& ListEntryWidget, bool bIsSelected);
+	static void UpdateItemExpansion(UUserWidget& ListEntryWidget, bool bIsExpanded);
+	
+	virtual bool IsListItemSelected() const override final;
+	virtual bool IsListItemExpanded() const override final;
+
+protected:
+	/** These follow the same pattern as the NativeOn[X] methods in UUserWidget - super calls are expected in order to route the event to BP. */
+	virtual void NativeOnItemSelectionChanged(bool bIsSelected);
+	virtual void NativeOnItemExpansionChanged(bool bIsExpanded);
+	virtual void NativeOnEntryReleased();
+
+	/** Called when the selection state of the item represented by this entry changes. */
+	UFUNCTION(BlueprintImplementableEvent, Category = UserListEntry, meta = (DisplayName = "On Item Selection Changed"))
+	void BP_OnItemSelectionChanged(bool bIsSelected);
+
+	/** Called when the expansion state of the item represented by this entry changes. Tree view entries only. */
+	UFUNCTION(BlueprintImplementableEvent, Category = UserListEntry, meta = (DisplayName = "On Item Expansion Changed"))
+	void BP_OnItemExpansionChanged(bool bIsExpanded);
+
+	/** Called when this entry is released from the owning table and no longer represents any list item */
+	UFUNCTION(BlueprintImplementableEvent, Category = UserListEntry, meta = (DisplayName = "On Entry Released"))
+	void BP_OnEntryReleased();
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/IUserObjectListEntry.h b/Engine/Source/Runtime/UMG/Public/Blueprint/IUserObjectListEntry.h
new file mode 100644
index 000000000000..6050acb580a7
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/IUserObjectListEntry.h
@@ -0,0 +1,46 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "IUserListEntry.h"
+#include "IUserObjectListEntry.generated.h"
+
+/**
+ * Implement for list entry widgets that represent UObject items.
+ * Required for a widget to be usable as an entry in UMG lists (ListView, TileView, and TreeView)
+ */
+UINTERFACE()
+class UMG_API UUserObjectListEntry : public UUserListEntry
+{
+	GENERATED_UINTERFACE_BODY()
+};
+
+class UMG_API IUserObjectListEntry : public IUserListEntry
+{
+	GENERATED_IINTERFACE_BODY()
+
+public:
+	static UObject* GetListItem(UUserWidget& EntryWidget);
+
+	template <typename ItemObjectT = UObject>
+	ItemObjectT* GetListItem() const
+	{
+		static_assert(TIsDerivedFrom<ItemObjectT, UObject>::IsDerived, "Items represented by an ObjectListEntry are always expected to be UObjects.");
+		return Cast<ItemObjectT>(Execute_GetListItemObject(Cast<UObject>(this)));
+	}
+
+protected:
+	virtual void SetListItemObjectInternal(UObject* InObject) {}
+	
+	/** Returns the item object that this entry currently represents */
+	UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category = ObjectListEntry, meta = (AllowPrivateAccess = true))
+	UObject* GetListItemObject() const;
+
+	/** Called when the item object represented by this entry is established */
+	UFUNCTION(BlueprintImplementableEvent, Category = ObjectListEntry)
+	void OnListItemObjectSet(UObject* ListItemObject);
+
+private:
+	template <typename> friend class SObjectTableRow;
+	static void SetListItemObject(UUserWidget& ListEntryWidget, UObject* ListItemObject);
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidget.h b/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidget.h
index eedc20df79e4..682c84ca113e 100644
--- a/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidget.h
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidget.h
@@ -36,6 +36,21 @@ class UWidgetAnimation;
 class UWidgetTree;
 class UNamedSlot;
 
+UENUM()
+enum class EWidgetTickFrequency : uint8
+{
+	/** This widget never ticks */
+	Never = 0,
+
+	/** 
+	 * This widget will tick if a blueprint tick function is implemented, any latent actions are found or animations need to play
+	 * If the widget inherits from something other than UserWidget it will also tick so that native C++ or inherited ticks function
+	 * To disable native ticking use add the class metadata flag "DisableNativeTick".  I.E: meta=(DisableNativeTick) 
+	 */
+	Auto,
+};
+
+
 
 /**
  * The state passed into OnPaint that we can expose as a single painting structure to blueprints to
@@ -146,11 +161,12 @@ DECLARE_DYNAMIC_DELEGATE( FOnInputAction );
 /**
  * The user widget is extensible by users through the WidgetBlueprint.
  */
-UCLASS(Abstract, editinlinenew, BlueprintType, Blueprintable, meta=( DontUseGenericSpawnObject="True" ) )
+UCLASS(Abstract, editinlinenew, BlueprintType, Blueprintable, meta=( DontUseGenericSpawnObject="True", DisableNativeTick) )
 class UMG_API UUserWidget : public UWidget, public INamedSlotInterface
 {
 	GENERATED_BODY()
 
+	friend class SObjectWidget;
 public:
 	UUserWidget(const FObjectInitializer& ObjectInitializer);
 
@@ -171,6 +187,8 @@ public:
 	bool CanInitialize() const;
 	virtual bool Initialize();
 
+	EWidgetTickFrequency GetDesiredTickFrequency() const { return TickFrequency; }
+
 protected:
 	UWidgetBlueprintGeneratedClass* GetWidgetTreeOwningClass();
 	virtual void TemplateInitInner();
@@ -275,21 +293,19 @@ public:
 	 * Gets the local player associated with this UI.
 	 * @return The owning local player.
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintCosmetic, Category="Player")
-	ULocalPlayer* GetOwningLocalPlayer() const;
+	virtual ULocalPlayer* GetOwningLocalPlayer() const override;
 
 	/**
 	 * Sets the player associated with this UI via LocalPlayer reference.
 	 * @param LocalPlayer The local player you want to be the conceptual owner of this UI.
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintCosmetic, Category="Player")
 	void SetOwningLocalPlayer(ULocalPlayer* LocalPlayer);
 
 	/**
 	 * Gets the player controller associated with this UI.
 	 * @return The player controller that owns the UI.
 	 */
-	class APlayerController* GetOwningPlayer() const override;
+	virtual APlayerController* GetOwningPlayer() const override;
 
 	/**
 	 * Sets the local player associated with this UI via PlayerController reference.
@@ -699,8 +715,6 @@ public:
 
 	virtual void OnAnimationFinished_Implementation(const UWidgetAnimation* Animation);
 
-public:
-
 	/**
 	 * Sets the tint of the widget, this affects all child widgets.
 	 * 
@@ -866,16 +880,36 @@ public:
 	virtual const FText GetPaletteCategory() override;
 	//~ End UWidget Interface
 
-	void SetDesignerFlags(EWidgetDesignFlags::Type NewFlags);
-
-	void OnDesignerChanged(const FDesignerChangedEventArgs& EventArgs) override;
-
+	virtual void SetDesignerFlags(EWidgetDesignFlags::Type NewFlags) override;
+	virtual void OnDesignerChanged(const FDesignerChangedEventArgs& EventArgs) override;
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+
+	/**
+	 * Final step of Widget Blueprint compilation. Allows widgets to perform custom validation and trigger compiler outputs as needed.
+	 * @see ValidateCompiledDefaults
+	 * @see ValidateCompiledWidgetTree
+	 */
+	void ValidateBlueprint(const UWidgetTree& BlueprintWidgetTree, FCompilerResultsLog& OutErrors) const;
+
+	/**
+	 * Override to perform any custom inspections of the default widget tree at the end of compilation.
+	 *
+	 * Note: The WidgetTree and BindWidget properties of this user widget will not be established at this point,
+	 * so be sure to inspect only the given BlueprintWidgetTree.
+	 *
+	 * Tip: If you need to validate properties of BindWidget members, you can search for them by property name within the widget tree.
+	 */
+	virtual void ValidateCompiledWidgetTree(const UWidgetTree& BlueprintWidgetTree, FCompilerResultsLog& OutErrors) const {};
 #endif
 
-	static UUserWidget* NewWidgetObject(UObject* Outer, UClass* UserWidgetClass, FName WidgetName = NAME_None, EObjectFlags Flags = RF_NoFlags);
-	
-	static UUserWidget* CreateWidgetOfClass(UClass* UserWidgetClass, UGameInstance* InGameInstance, UWorld* InWorld, APlayerController* InOwningPlayer);
+	static UUserWidget* CreateWidgetInstance(UWidget& OwningWidget, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName);
+	static UUserWidget* CreateWidgetInstance(UWidgetTree& OwningWidgetTree, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName);
+	static UUserWidget* CreateWidgetInstance(APlayerController& OwnerPC, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName);
+	static UUserWidget* CreateWidgetInstance(UGameInstance& GameInstance, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName);
+	static UUserWidget* CreateWidgetInstance(UWorld& World, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName);
+
+private:
+	static UUserWidget* CreateInstanceInternal(UObject* Outer, TSubclassOf<UUserWidget> UserWidgetClass, FName WidgetName, UWorld* World, ULocalPlayer* LocalPlayer);
 
 public:
 	/** The color and opacity of this widget.  Tints all child widgets. */
@@ -954,14 +988,13 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Input")
 	uint8 bStopAction : 1;
 
-	/** If a widget doesn't ever need to tick the blueprint, setting this to false is an optimization. */
+	/** If a widget has an implemented tick blueprint function */
 	UPROPERTY()
-	uint8 bCanEverTick : 1;
+	uint8 bHasScriptImplementedTick : 1;
 
-	/** If a widget doesn't ever need to do custom painting in the blueprint, setting this to false is an optimization. */
+	/** If a widget has an implemented paint blueprint function */
 	UPROPERTY()
-	uint8 bCanEverPaint : 1;
-
+	uint8 bHasScriptImplementedPaint : 1;
 protected:
 
 	/** Has this widget been initialized by its class yet? */
@@ -1048,9 +1081,27 @@ protected:
 	virtual FReply NativeOnMotionDetected( const FGeometry& InGeometry, const FMotionEvent& InMotionEvent );
 	virtual FCursorReply NativeOnCursorQuery( const FGeometry& InGeometry, const FPointerEvent& InCursorEvent );
 	virtual FNavigationReply NativeOnNavigation(const FGeometry& InGeometry, const FNavigationEvent& InNavigationEvent);
-	virtual void NativeOnMouseCaptureLost();
+	DEPRECATED(4.20, "Please use NativeOnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent)")
+	void NativeOnMouseCaptureLost() {}
+	virtual void NativeOnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent);
 
 protected:
+	/**
+	*  Helper function to get the game instance
+	*
+	*  @return a pointer to the owning game instance
+	*/
+	template <class TGameInstance = UGameInstance>
+	TGameInstance* GetGameInstance() const
+	{
+		if (UWorld* World = GetWorld())
+		{
+			return Cast<TGameInstance>(World->GetGameInstance());
+		}
+
+		return nullptr;
+	}
+
 	bool ShouldSerializeWidgetTree(const class ITargetPlatform* TargetPlatform) const;
 
 	/**
@@ -1114,10 +1165,21 @@ protected:
 
 	virtual void InitializeInputComponent();
 
-	UPROPERTY( Transient, DuplicateTransient )
+private:
+	/**
+	 * This widget is allowed to tick. If this is unchecked tick will never be called, animations will not play correctly, and latent actions will not execute.
+	 * Uncheck this for performance reasons only
+	 */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Performance", meta=(AllowPrivateAccess="true"))
+	EWidgetTickFrequency TickFrequency;
+
+protected:
+	UPROPERTY(Transient, DuplicateTransient)
 	class UInputComponent* InputComponent;
 
 private:
+	static void OnLatentActionsChanged(UObject* ObjectWhichChanged, ELatentActionChangeType ChangeType);
+
 	FAnchors ViewportAnchors;
 	FMargin ViewportOffsets;
 	FVector2D ViewportAlignment;
@@ -1132,6 +1194,8 @@ private:
 	static bool bTemplateInitializing;
 	static uint32 bInitializingFromWidgetTree;
 
+	void UpdateCanTick();
+
 protected:
 
 	PROPERTY_BINDING_IMPLEMENTATION(FLinearColor, ColorAndOpacity);
@@ -1145,22 +1209,26 @@ namespace CreateWidgetHelpers
 	UMG_API bool ValidateUserWidgetClass(const UClass* UserWidgetClass);
 }
 
-template< class T >
-T* CreateWidget(APlayerController* OwningPlayer, UClass* UserWidgetClass = T::StaticClass())
-{
-	return Cast<T>(UUserWidget::CreateWidgetOfClass(UserWidgetClass, nullptr, nullptr, OwningPlayer));
-}
+DECLARE_CYCLE_STAT(TEXT("UserWidget Create"), STAT_CreateWidget, STATGROUP_Slate);
 
-template< class T >
-T* CreateWidget(UWorld* World, UClass* UserWidgetClass = T::StaticClass() )
+template <typename WidgetT = UUserWidget, typename OwnerT = UObject>
+WidgetT* CreateWidget(OwnerT* OwningObject, TSubclassOf<UUserWidget> UserWidgetClass = WidgetT::StaticClass(), FName WidgetName = NAME_None)
 {
-	return Cast<T>(UUserWidget::CreateWidgetOfClass(UserWidgetClass, nullptr, World, nullptr));
-}
+	static_assert(TIsDerivedFrom<WidgetT, UUserWidget>::IsDerived, "CreateWidget can only be used to create UserWidget instances. If creating a UWidget, use WidgetTree::ConstructWidget.");
+	
+	static_assert(TIsDerivedFrom<OwnerT, UWidget>::IsDerived
+		|| TIsDerivedFrom<OwnerT, UWidgetTree>::IsDerived
+		|| TIsDerivedFrom<OwnerT, APlayerController>::IsDerived
+		|| TIsDerivedFrom<OwnerT, UGameInstance>::IsDerived
+		|| TIsDerivedFrom<OwnerT, UWorld>::IsDerived, "The given OwningObject is not of a supported type for use with CreateWidget.");
 
-template< class T >
-T* CreateWidget(UGameInstance* OwningGame, UClass* UserWidgetClass = T::StaticClass() )
-{
-	return Cast<T>(UUserWidget::CreateWidgetOfClass(UserWidgetClass, OwningGame, nullptr, nullptr));
+	SCOPE_CYCLE_COUNTER(STAT_CreateWidget);
+
+	if (OwningObject)
+	{
+		return Cast<WidgetT>(UUserWidget::CreateWidgetInstance(*OwningObject, UserWidgetClass, WidgetName));
+	}
+	return nullptr;
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidgetPool.h b/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidgetPool.h
new file mode 100644
index 000000000000..6b5c6c61341c
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/UserWidgetPool.h
@@ -0,0 +1,109 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "UserWidget.h"
+#include "WidgetTree.h"
+#include "Slate/SObjectWidget.h"
+
+/** 
+ * Pools UUserWidget instances to minimize UObject allocations for UMG elements with dynamic entries. Optionally retains the underlying slate instances of each UUserWidget as well.
+ * 
+ * Note that if underlying Slate instances are released when a UserWidget instance becomes inactive, NativeConstruct & NativeDestruct will be called when UUserWidget 
+ * instances are made active or inactive, respectively, provided the widget isn't actively referenced in the Slate hierarchy (i.e. if the shared reference count on the widget goes from/to 0).
+ *
+ * WARNING: Be sure to fully reset the pool within the owning widget's ReleaseSlateResources call to prevent leaking due to circular references (since the pool caches hard references to both the UUserWidget and SObjectWidget instances)
+ *
+ * @see UListView
+ * @see UDynamicEntryBox
+ */
+class UMG_API FUserWidgetPool : public FGCObject
+{
+public:
+	FUserWidgetPool() = default;
+	FUserWidgetPool(UWidget& InOwningWidget);
+	FUserWidgetPool& operator=(FUserWidgetPool&& Other);
+	~FUserWidgetPool();
+
+	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
+
+	bool IsInitialized() const { return OwningWidget.IsValid(); }
+	const TArray<UUserWidget*>& GetActiveWidgets() const { return ActiveWidgets; }
+
+	/**
+	 * Gets an instance of a widget of the given class.
+	 * The underlying slate is stored automatically as well, so the returned widget is fully constructed and GetCachedWidget will return a valid SWidget.
+	 */
+	template <typename UserWidgetT = UUserWidget>
+	UserWidgetT* GetOrCreateInstance(TSubclassOf<UserWidgetT> WidgetClass)
+	{
+		// Just make a normal SObjectWidget, same as would happen in TakeWidget
+		return AddActiveWidgetInternal(WidgetClass,
+			[] (UUserWidget* Widget, TSharedRef<SWidget> Content)
+			{
+				return SNew(SObjectWidget, Widget)[Content];
+			});
+	}
+
+	using WidgetConstructFunc = TFunctionRef<TSharedPtr<SObjectWidget>(UUserWidget*, TSharedRef<SWidget>)>;
+
+	/** Gets an instance of the widget this factory is for with a custom underlying SObjectWidget type */
+	template <typename UserWidgetT = UUserWidget>
+	UserWidgetT* GetOrCreateInstance(TSubclassOf<UserWidgetT> WidgetClass, WidgetConstructFunc ConstructWidgetFunc)
+	{
+		return AddActiveWidgetInternal(WidgetClass, ConstructWidgetFunc);
+	}
+
+	/** Return a widget object to the pool, allowing it to be reused in the future */
+	void Release(UUserWidget* Widget, bool bReleaseSlate = false);
+
+	/** Returns all active widget objects to the inactive pool and optionally destroys all cached underlying slate widgets. */
+	void ReleaseAll(bool bReleaseSlate = false);
+
+	/** Full reset of all created widget objects (and any cached underlying slate) */
+	void ResetPool();
+
+private:
+	template <typename UserWidgetT = UUserWidget>
+	UserWidgetT* AddActiveWidgetInternal(TSubclassOf<UserWidgetT> WidgetClass, WidgetConstructFunc ConstructWidgetFunc)
+	{
+		if (!IsInitialized())
+		{
+			return nullptr;
+		}
+
+		UUserWidget* WidgetInstance = nullptr;
+		for (UUserWidget* InactiveWidget : InactiveWidgets)
+		{
+			if (InactiveWidget->GetClass() == WidgetClass)
+			{
+				WidgetInstance = InactiveWidget;
+				InactiveWidgets.RemoveSingleSwap(InactiveWidget);
+				break;
+			}
+		}
+
+		if (!WidgetInstance)
+		{
+			WidgetInstance = CreateWidget(OwningWidget.Get(), WidgetClass);
+		}
+
+		if (WidgetInstance)
+		{
+			TSharedPtr<SWidget>& CachedSlateWidget = CachedSlateByWidgetObject.FindOrAdd(WidgetInstance);
+			if (!CachedSlateWidget.IsValid())
+			{
+				CachedSlateWidget = WidgetInstance->TakeDerivedWidget(ConstructWidgetFunc);
+			}
+			ActiveWidgets.Add(WidgetInstance);
+		}
+
+		return Cast<UserWidgetT>(WidgetInstance);
+	}
+
+	TWeakObjectPtr<UWidget> OwningWidget;
+	
+	TArray<UUserWidget*> ActiveWidgets;
+	TArray<UUserWidget*> InactiveWidgets;
+	TMap<UUserWidget*, TSharedPtr<SWidget>> CachedSlateByWidgetObject;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintGeneratedClass.h b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintGeneratedClass.h
index 84152bbf3d31..7609eaefb751 100644
--- a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintGeneratedClass.h
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintGeneratedClass.h
@@ -88,6 +88,10 @@ private:
 	UPROPERTY(Transient)
 	uint8 bCookedTemplate:1;
 
+	/** The classes native parent requires a native tick */
+	UPROPERTY()
+	uint8 bClassRequiresNativeTick:1;
+
 public:
 	UPROPERTY()
 	TArray< FDelegateRuntimeBinding > Bindings;
@@ -133,6 +137,10 @@ public:
 		, const TArray< UWidgetAnimation* >& InAnimations
 		, const TArray< FDelegateRuntimeBinding >& InBindings);
 
+	bool ClassRequiresNativeTick() const { return bClassRequiresNativeTick; }
+#if WITH_EDITOR
+	void SetClassRequiresNativeTick(bool InClassRequiresNativeTick);
+#endif
 private:
 	void InitializeTemplate(const ITargetPlatform* TargetPlatform);
 
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintLibrary.h b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintLibrary.h
index 91d946b262d4..12e821ed8ecb 100644
--- a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintLibrary.h
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetBlueprintLibrary.h
@@ -329,4 +329,12 @@ public:
 
 	UFUNCTION(BlueprintCallable, Category = "Widget|Window Title Bar")
 	static void RestorePreviousWindowTitleBarState();
+
+	DECLARE_DYNAMIC_DELEGATE(FOnGameWindowCloseButtonClickedDelegate);
+
+	UFUNCTION(BlueprintCallable, Category = "Widget|Window Title Bar")
+	static void SetWindowTitleBarOnCloseClickedDelegate(FOnGameWindowCloseButtonClickedDelegate Delegate);
+
+	UFUNCTION(BlueprintCallable, Category = "Widget|Window Title Bar")
+	static void SetWindowTitleBarCloseButtonActive(bool bActive);
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetTree.h b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetTree.h
index b4d28a984690..08adb00270d6 100644
--- a/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetTree.h
+++ b/Engine/Source/Runtime/UMG/Public/Blueprint/WidgetTree.h
@@ -33,10 +33,10 @@ public:
 	UWidget* FindWidget(TSharedRef<SWidget> InWidget) const;
 
 	/** Finds the widget in the tree by name and casts the return to the desired type. */
-	template<class WidgetClass>
-	FORCEINLINE WidgetClass* FindWidget(const FName& Name) const
+	template <typename WidgetT>
+	FORCEINLINE WidgetT* FindWidget(const FName& Name) const
 	{
-		return Cast<WidgetClass>(FindWidget(Name));
+		return Cast<WidgetT>(FindWidget(Name));
 	}
 
 	/** Removes the widget from the hierarchy and all sub widgets. */
@@ -75,26 +75,17 @@ public:
 	static void ForWidgetAndChildren(UWidget* Widget, TFunctionRef<void(UWidget*)> Predicate);
 
 	/** Constructs the widget, and adds it to the tree. */
-	template< class T >
-	FORCEINLINE T* ConstructWidget(TSubclassOf<UWidget> WidgetType = T::StaticClass(), FName WidgetName = NAME_None)
+	template <typename WidgetT>
+	FORCEINLINE_DEBUGGABLE WidgetT* ConstructWidget(TSubclassOf<UWidget> WidgetClass = WidgetT::StaticClass(), FName WidgetName = NAME_None)
 	{
-		EObjectFlags NewObjectFlags = RF_Transactional;
-		if (HasAnyFlags(RF_Transient))
+		static_assert(TIsDerivedFrom<WidgetT, UWidget>::IsDerived, "WidgetTree::ConstructWidget can only create UWidget objects.");
+
+		if (WidgetClass->IsChildOf<UUserWidget>())
 		{
-			NewObjectFlags |= RF_Transient;
+			return Cast<WidgetT>(CreateWidget(this, *WidgetClass, WidgetName));
 		}
 
-		if ( WidgetType->IsChildOf(UUserWidget::StaticClass()) )
-		{
-			UUserWidget* Widget = UUserWidget::NewWidgetObject(this, WidgetType, WidgetName);
-			Widget->Initialize();
-			return (T*)Widget;
-		}
-		else
-		{
-			UWidget* Widget = (UWidget*)NewObject<UWidget>(this, WidgetType, WidgetName, NewObjectFlags);
-			return (T*)Widget;
-		}
+		return NewObject<WidgetT>(this, WidgetClass, WidgetName, RF_Transactional);
 	}
 
 	// UObject interface
@@ -109,6 +100,8 @@ public:
 
 protected:
 
+#if WITH_EDITORONLY_DATA
 	UPROPERTY(Instanced)
 	TArray< UWidget* > AllWidgets;
+#endif
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Components/Button.h b/Engine/Source/Runtime/UMG/Public/Components/Button.h
index bc79858940e5..fc92b2711227 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/Button.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/Button.h
@@ -57,6 +57,10 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Interaction", AdvancedDisplay)
 	TEnumAsByte<EButtonTouchMethod::Type> TouchMethod;
 
+	/** The type of keyboard/gamepad button press action required by the user to trigger the buttons 'Click' */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Interaction", AdvancedDisplay)
+	TEnumAsByte<EButtonPressMethod::Type> PressMethod;
+
 	/** Sometimes a button should only be mouse-clickable and never keyboard focusable. */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Interaction")
 	bool IsFocusable;
@@ -109,8 +113,8 @@ public:
 	UFUNCTION(BlueprintCallable, Category="Button")
 	void SetTouchMethod(EButtonTouchMethod::Type InTouchMethod);
 
-	//UFUNCTION(BlueprintCallable, Category="Button")
-	//void SetPressMethod(EButtonPressMethod::Type InPressMethod);
+	UFUNCTION(BlueprintCallable, Category="Button")
+	void SetPressMethod(EButtonPressMethod::Type InPressMethod);
 
 public:
 
diff --git a/Engine/Source/Runtime/UMG/Public/Components/CanvasPanelSlot.h b/Engine/Source/Runtime/UMG/Public/Components/CanvasPanelSlot.h
index b25b6967d00a..013d9c573f92 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/CanvasPanelSlot.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/CanvasPanelSlot.h
@@ -36,6 +36,30 @@ public:
 	 */
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=AnchorData)
 	FVector2D Alignment;
+
+	/**
+	* Compares this set of FAnchorData with another for equality.
+	*
+	* @param Other The other FAnchorData.
+	* @return true if the two FAnchors are equal, false otherwise.
+	*/
+	bool operator==(const FAnchorData& Other) const
+	{
+		return Offsets == Other.Offsets && 
+			   Anchors == Other.Anchors && 
+			   Alignment == Other.Alignment;
+	}
+
+	/**
+	* Compares this set of FAnchorData with another for inequality.
+	*
+	* @param Other The other FAnchorData.
+	* @return true if the two FAnchors are not equal, false otherwise.
+	*/
+	bool operator!=(const FAnchorData& Other) const
+	{
+		return !(*this == Other);
+	}
 };
 
 UCLASS()
diff --git a/Engine/Source/Runtime/UMG/Public/Components/DynamicEntryBox.h b/Engine/Source/Runtime/UMG/Public/Components/DynamicEntryBox.h
new file mode 100644
index 000000000000..e7233279f204
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Components/DynamicEntryBox.h
@@ -0,0 +1,143 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Components/Widget.h"
+#include "Blueprint/UserWidgetPool.h"
+
+#include "DynamicEntryBox.generated.h"
+
+class UUserWidget;
+
+UENUM(BlueprintType)
+enum class EDynamicBoxType : uint8
+{
+	Horizontal,
+	Vertical,
+	Wrap,
+	Overlay
+};
+
+/**
+ * A special box panel that auto-generates its entries at both design-time and runtime.
+ * Useful for cases where you can have a varying number of entries, but it isn't worth the effort or conceptual overhead to set up a list/tile view.
+ * Note that entries here are *not* virtualized as they are in the list views, so generally this should be avoided if you intend to scroll through lots of items.
+ *
+ * No children can be manually added in the designer - all are auto-generated based on the given entry class.
+ */
+UCLASS()
+class UMG_API UDynamicEntryBox : public UWidget
+{
+	GENERATED_BODY()
+
+public:
+	UDynamicEntryBox(const FObjectInitializer& Initializer);
+	virtual void ReleaseSlateResources(bool bReleaseChildren) override;
+
+	EDynamicBoxType GetBoxType() const { return EntryBoxType; }
+	TSubclassOf<UUserWidget> GetEntryWidgetClass() const { return EntryWidgetClass; }
+	const FVector2D& GetEntrySpacing() const { return EntrySpacing; }
+	
+	template <typename WidgetT = UUserWidget>
+	WidgetT* CreateEntry()
+	{
+		if (EntryWidgetClass && EntryWidgetClass->IsChildOf<WidgetT>())
+		{
+			return Cast<WidgetT>(CreateEntryInternal());
+		}
+		return nullptr;
+	}
+	
+	/** Clear out the box entries, optionally deleting the underlying Slate widgets entirely as well. */
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox)
+	void Reset(bool bDeleteWidgets = false);
+
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox)
+	const TArray<UUserWidget*>& GetAllEntries() const;
+
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox)
+	int32 GetNumEntries() const;
+
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox)
+	void RemoveEntry(UUserWidget* EntryWidget);
+
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox)
+	void SetEntrySpacing(const FVector2D& InEntrySpacing);
+
+#if WITH_EDITOR
+	virtual void ValidateCompiledDefaults(class FCompilerResultsLog& CompileLog) const override;
+#endif
+
+#if WITH_EDITORONLY_DATA
+	UPROPERTY(EditAnywhere, Category = DynamicEntryBox, meta = (ClampMin = 0, ClampMax = 20))
+	int32 NumDesignerPreviewEntries = 3;
+
+	/** 
+	 * Called whenever a preview entry is made for this widget in the designer. 
+	 * Intended to allow a containing widget to do any additional modifications needed in the interest of maintaining an accurate designer preview.
+	 */
+	TFunction<void(UUserWidget*)> OnPreviewEntryCreatedFunc;
+#endif
+
+protected:
+	virtual TSharedRef<SWidget> RebuildWidget() override;
+	virtual void SynchronizeProperties() override;
+
+	virtual void AddEntryChild(UUserWidget& ChildWidget);
+
+protected:
+	/** The type of box panel into which created entries are added. Some differences in functionality exist between each type. */
+	UPROPERTY(EditAnywhere, Category = DynamicEntryBox)
+	EDynamicBoxType EntryBoxType;
+
+	/** 
+	 * The padding to apply between entries in the box.
+	 * Note horizontal boxes only use the X and vertical boxes only use Y. Value is also ignored for the first entry in the box.
+	 * Wrap and Overlay types use both X and Y for spacing.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	FVector2D EntrySpacing;
+
+	//@todo DanH EntryBox: Consider giving a callback option as well/instead. Then this thing could actually create circular or pinwheel layouts...
+	/** The looping sequence of entry paddings to apply as entries are created. Overlay boxes only. Ignores EntrySpacing if not empty. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	TArray<FVector2D> SpacingPattern;
+
+	/** Sizing rule to apply to generated entries. Horizontal/Vertical boxes only. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	FSlateChildSize EntrySizeRule;
+
+	/** Horizontal alignment of generated entries. Horizontal/Vertical/Wrap boxes only. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	TEnumAsByte<EHorizontalAlignment> EntryHorizontalAlignment;
+
+	/** Vertical alignment of generated entries. Horizontal/Vertical/Wrap boxes only. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	TEnumAsByte<EVerticalAlignment> EntryVerticalAlignment;
+
+	/** The maximum size of each entry in the dominant axis of the box. Vertical/Horizontal boxes only. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout)
+	int32 MaxElementSize = 0;
+
+	// Can be a horizontal, vertical, or wrap box
+	TSharedPtr<SPanel> MyPanelWidget;
+
+private:
+	/** Creates and establishes a new dynamic entry in the box */
+	UFUNCTION(BlueprintCallable, Category = DynamicEntryBox, meta = (DisplayName = "Create Entry", AllowPrivateAccess = true))
+	UUserWidget* BP_CreateEntry();
+
+	UUserWidget* CreateEntryInternal();
+	FMargin BuildEntryPadding(const FVector2D& DesiredSpacing);
+	
+	/**
+	 * The class of widget to create entries of.
+	 * If natively binding this widget, use the EntryClass UPROPERTY metadata to specify the desired entry widget base class.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = EntryLayout, meta = (AllowPrivateAccess = true))
+	TSubclassOf<UUserWidget> EntryWidgetClass;
+	FUserWidgetPool EntryWidgetPool;
+
+	// Let the details customization manipulate us directly
+	friend class FDynamicEntryBoxDetails;
+};
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Components/EditableText.h b/Engine/Source/Runtime/UMG/Public/Components/EditableText.h
index 71cba5a60d54..0072d8444d61 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/EditableText.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/EditableText.h
@@ -117,6 +117,10 @@ public:
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	TEnumAsByte<EVirtualKeyboardType::Type> KeyboardType;
 
+	/** Additional options for the virtual keyboard */
+	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** What action should be taken when the virtual keyboard is dismissed? */
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	EVirtualKeyboardDismissAction VirtualKeyboardDismissAction;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/EditableTextBox.h b/Engine/Source/Runtime/UMG/Public/Components/EditableTextBox.h
index f5e73e466a26..fefd7c75137a 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/EditableTextBox.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/EditableTextBox.h
@@ -119,6 +119,10 @@ public:
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	TEnumAsByte<EVirtualKeyboardType::Type> KeyboardType;
 
+	/** Additional options to use for the virtual keyboard summoned by this widget */
+	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** What action should be taken when the virtual keyboard is dismissed? */
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	EVirtualKeyboardDismissAction VirtualKeyboardDismissAction;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/Image.h b/Engine/Source/Runtime/UMG/Public/Components/Image.h
index 2cb0b29d801f..096903838f53 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/Image.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/Image.h
@@ -72,6 +72,14 @@ public:
 	UFUNCTION(BlueprintCallable, Category="Appearance")
 	void SetBrush(const FSlateBrush& InBrush);
 
+	/**  */
+	UFUNCTION(BlueprintCallable, Category = "Appearance")
+	void SetBrushSize(FVector2D DesiredSize);
+
+	/**  */
+	UFUNCTION(BlueprintCallable, Category = "Appearance")
+	void SetBrushTintColor(FSlateColor TintColor);
+
 	/**  */
 	UFUNCTION(BlueprintCallable, Category="Appearance")
 	void SetBrushFromAsset(USlateBrushAsset* Asset);
diff --git a/Engine/Source/Runtime/UMG/Public/Components/ListView.h b/Engine/Source/Runtime/UMG/Public/Components/ListView.h
index 43baf6438efc..a644f7a47826 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/ListView.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/ListView.h
@@ -2,54 +2,212 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "Widgets/SWidget.h"
-#include "Widgets/Views/STableViewBase.h"
-#include "Widgets/Views/STableRow.h"
-#include "Components/TableViewBase.h"
+#include "Components/ListViewBase.h"
+#include "Widgets/Views/SListView.h"
+
 #include "ListView.generated.h"
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FSimpleListItemEventDynamic, UObject*, Item);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnListItemSelectionChangedDynamic, UObject*, Item, bool, bIsSelected);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnItemIsHoveredChangedDynamic, UObject*, Item, bool, bIsHovered);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnListItemScrolledIntoViewDynamic, UObject*, Item, UUserWidget*, Widget);
+
 /**
- * Allows thousands of items to be displayed in a list.  Generates widgets dynamically for each item.
+ * A virtualized list that allows up to thousands of items to be displayed.
+ * 
+ * An important distinction to keep in mind here is "Item" vs. "Entry"
+ * The list itself is based on a list of n items, but only creates as many entry widgets as can fit on screen.
+ * For example, a scrolling ListView of 200 items with 5 currently visible will only have created 5 entry widgets.
+ *
+ * To make a widget usable an an entry in a ListView, it must inherit from the IUserObjectListEntry interface.
  */
-UCLASS(Experimental)
-class UMG_API UListView : public UTableViewBase
+UCLASS(meta = (EntryInterface = UserObjectListEntry))
+class UMG_API UListView : public UListViewBase, public ITypedUMGListView<UObject*>
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
+
+	IMPLEMENT_TYPED_UMG_LIST(UObject*, MyListView)
 
 public:
+	UListView(const FObjectInitializer& Initializer);
 
-	/** The height of each widget */
-	UPROPERTY(EditAnywhere, Category=Content)
-	float ItemHeight;
-
-	/** The list of items to generate widgets for */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Content)
-	TArray<UObject*> Items;
-
-	/** The selection method for the list */
-	UPROPERTY(EditAnywhere, Category=Content)
-	TEnumAsByte<ESelectionMode::Type> SelectionMode;
-
-	/** Called when a widget needs to be generated */
-	UPROPERTY(EditAnywhere, Category=Events, meta=( IsBindableEvent="True" ))
-	FOnGenerateRowUObject OnGenerateRowEvent;
-
-#if WITH_EDITOR
-	virtual const FText GetPaletteCategory() override;
-#endif
-
-	//~ Begin UVisual Interface
 	virtual void ReleaseSlateResources(bool bReleaseChildren) override;
-	//~ End UVisual Interface
+	
+	/** Set the list of items to display within this listview */
+	template <typename ItemObjectT, typename AllocatorType = FDefaultAllocator>
+	void SetListItems(const TArray<ItemObjectT, AllocatorType>& InListItems)
+	{
+		ClearListItems();
+		ListItems.Append(InListItems);
+		RequestRefresh();
+	}
+
+	ESelectionMode::Type GetSelectionMode() const { return SelectionMode; }
+
+	template <typename RowWidgetT = UUserWidget>
+	RowWidgetT* GetEntryWidgetFromItem(const UObject* Item) const
+	{
+		return Item ? ITypedUMGListView<UObject*>::GetEntryWidgetFromItem<RowWidgetT>(const_cast<UObject*>(Item)) : nullptr;
+	}
+	void SetSelectedItem(const UObject* Item);
+
+	/** Gets the first selected item, if any; recommended that you only use this for single selection lists. */
+	template <typename ObjectT = UObject>
+	ObjectT* GetSelectedItem() const
+	{
+		return Cast<ObjectT>(ITypedUMGListView<UObject*>::GetSelectedItem());
+	}
+
+	/**
+	 * Gets the list of all items in the list.
+	 * Note that each of these items only has a corresponding entry widget when visible. Use GetDisplayedEntryWidgets to get the currently displayed widgets.
+	 */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	const TArray<UObject*>& GetListItems() const { return ListItems; }
+	
+	/** Adds an the item to the list */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void AddItem(UObject* Item);
+
+	/** Returns the item at the given index */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	UObject* GetItemAt(int32 Index) const;
+
+	/** Returns the total number of items */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	int32 GetNumItems() const;
+
+	/** Returns the index that the specified item is at. Will return the first found, or -1 for not found */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	int32 GetIndexForItem(UObject* Item) const;
+
+	/** Removes all items from the list */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void ClearListItems();
+
+	/** Sets the new selection mode, preserving the current selection where possible. */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void SetSelectionMode(TEnumAsByte<ESelectionMode::Type> SelectionMode);
+
+	/** @return True if a refresh is pending and the list will be rebuilt on the next tick */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	bool IsRefreshPending() const;
+
+	/** Requests that the item at the given index is scrolled into view */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void ScrollIndexIntoView(int32 Index);
+
+	/** Sets the item at the given index as the sole selected item. */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void SetSelectedIndex(int32 Index);
+
+	/** Requests that the item at the given index navigated to, scrolling it into view if needed. */
+	UFUNCTION(BlueprintCallable, Category = ListView)
+	void NavigateToIndex(int32 Index);
 
 protected:
-	TSharedPtr< SListView<UObject*> > MyListView;
+	virtual TSharedRef<STableViewBase> RebuildListWidget() override;
+	virtual void HandleListEntryHovered(UUserWidget& EntryWidget) override;
+	virtual void HandleListEntryUnhovered(UUserWidget& EntryWidget) override;
+	
+#if WITH_EDITORONLY_DATA
+	virtual void OnRefreshDesignerItems() override;
+#endif
 
-	TSharedRef<ITableRow> HandleOnGenerateRow(UObject* Item, const TSharedRef< STableViewBase >& OwnerTable) const;
+	virtual UUserWidget& OnGenerateEntryWidgetInternal(UObject* Item, const TSharedRef<STableViewBase>& OwnerTable) override;
+	virtual FMargin GetDesiredEntryPadding(UObject* Item) const override;
 
-	// UWidget interface
-	virtual TSharedRef<SWidget> RebuildWidget() override;
-	// End of UWidget interface
+	virtual void OnItemClickedInternal(UObject* Item) override;
+	virtual void OnItemDoubleClickedInternal(UObject* Item) override;
+	virtual void OnSelectionChangedInternal(UObject* FirstSelectedItem) override;
+	virtual void OnItemScrolledIntoViewInternal(UObject* Item, UUserWidget& EntryWidget) override;
+
+	/** SListView construction helper - useful if using a custom STreeView subclass */
+	template <template<typename> class ListViewT = SListView>
+	TSharedRef<ListViewT<UObject*>> ConstructListView()
+	{
+		MyListView = ITypedUMGListView<UObject*>::ConstructListView<ListViewT>(this, ListItems, SelectionMode, bClearSelectionOnClick, ConsumeMouseWheel);
+		return StaticCastSharedRef<ListViewT<UObject*>>(MyListView.ToSharedRef());
+	}
+
+protected:
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = ListView)
+	TEnumAsByte<ESelectionMode::Type> SelectionMode = ESelectionMode::Single;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = ListView)
+	EConsumeMouseWheel ConsumeMouseWheel = EConsumeMouseWheel::WhenScrollingPossible;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = ListView)
+	bool bClearSelectionOnClick = false;
+
+	UPROPERTY(EditAnywhere, Category = ListEntries, meta = (ClampMin = 0))
+	float EntrySpacing = 0.f;
+
+	UPROPERTY(Transient)
+	TArray<UObject*> ListItems;
+
+	TSharedPtr<SListView<UObject*>> MyListView;
+
+private:
+	// BP exposure of ITypedUMGListView API
+
+	/** Sets the given item as the sole selected item. */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Set Selected Item"))
+	void BP_SetSelectedItem(UObject* Item);
+
+	/** Sets whether the given item is selected. */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Set Item Selection"))
+	void BP_SetItemSelection(UObject* Item, bool bSelected);
+
+	/** Clear selection */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Clear Selection"))
+	void BP_ClearSelection();
+
+	/** Gets the number of items currently selected in the list */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Get Num Items Selected"))
+	int32 BP_GetNumItemsSelected() const;
+
+	/** Gets a list of all the currently selected items */
+	UFUNCTION(BlueprintCallable, BlueprintPure = false, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "GetSelectedItems"))
+	bool BP_GetSelectedItems(TArray<UObject*>& Items) const;
+
+	/** Gets whether the entry for the given object is currently visible in the list */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Is Item Visible"))
+	bool BP_IsItemVisible(UObject* Item) const;
+
+	/** Requests that the given item is navigated to, scrolling it into view if needed. */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Navigate To Item"))
+	void BP_NavigateToItem(UObject* Item);
+
+	/** Requests that the given item is scrolled into view */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Scroll Item Into View"))
+	void BP_ScrollItemIntoView(UObject* Item);
+
+	/** Cancels a previous request to scroll and item into view. */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Cancel Scroll Into View"))
+	void BP_CancelScrollIntoView();
+
+	/** Sets the array of objects to display rows for in the list */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (AllowPrivateAccess = true, DisplayName = "Set List Items"))
+	void BP_SetListItems(const TArray<UObject*>& InListItems);
+
+	/** Gets the first selected item, if any; recommended that you only use this for single selection lists. */
+	UFUNCTION(BlueprintCallable, Category = ListView, meta = (DisplayName = "Get Selected Item", AllowPrivateAccess = true))
+	UObject* BP_GetSelectedItem() const;
+
+private:
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Item Clicked"))
+	FSimpleListItemEventDynamic BP_OnItemClicked;
+
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Item Double Clicked"))
+	FSimpleListItemEventDynamic BP_OnItemDoubleClicked;
+
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Item Is Hovered Changed"))
+	FOnItemIsHoveredChangedDynamic BP_OnItemIsHoveredChanged;
+
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Item Selection Changed"))
+	FOnListItemSelectionChangedDynamic BP_OnItemSelectionChanged;
+
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Item Scrolled Into View"))
+	FOnListItemScrolledIntoViewDynamic BP_OnItemScrolledIntoView;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Components/ListViewBase.h b/Engine/Source/Runtime/UMG/Public/Components/ListViewBase.h
new file mode 100644
index 000000000000..3a36ee98fcee
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Components/ListViewBase.h
@@ -0,0 +1,558 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Components/Widget.h"
+#include "Slate/SObjectTableRow.h"
+#include "Blueprint/UserWidgetPool.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "Widgets/Views/STileView.h"
+#include "Widgets/Views/STreeView.h"
+
+#include "ListViewBase.generated.h"
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnListEntryGeneratedDynamic, UUserWidget*, Widget);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnListEntryReleasedDynamic, UUserWidget*, Widget);
+
+//////////////////////////////////////////////////////////////////////////
+// ITypedUMGListView<T>
+//////////////////////////////////////////////////////////////////////////
+
+/**
+ * Mirrored SListView<T> API for easier interaction with a bound UListViewBase widget that isn't based on UObject* items
+ * See declarations on SListView for more info on each function and event
+ *
+ * Note that, being a template class, this is not a UClass and therefore cannot be exposed to Blueprint.
+ * If you are using UObject* items, just use (or inherit from) UListView directly
+ * Otherwise, it is up to the child class to propagate events and/or expose functions to BP as needed
+ *
+ * Use the IMPLEMENT_TYPED_UMG_LIST() for the implementation boilerplate in your implementing class.
+ */
+template <typename ItemType>
+class ITypedUMGListView
+{
+public:
+	using NullableItemType = typename SListView<ItemType>::NullableItemType;
+
+	DECLARE_EVENT_OneParam(UListView, FSimpleListItemEvent, ItemType);
+	virtual FSimpleListItemEvent& OnItemClicked() const = 0;
+	virtual FSimpleListItemEvent& OnItemDoubleClicked() const = 0;
+
+	DECLARE_EVENT_TwoParams(UListView, FOnItemIsHoveredChanged, ItemType, bool);
+	virtual FOnItemIsHoveredChanged& OnItemIsHoveredChanged() const = 0;
+
+	DECLARE_EVENT_OneParam(UListView, FOnItemSelectionChanged, NullableItemType);
+	virtual FOnItemSelectionChanged& OnItemSelectionChanged() const = 0;
+
+	DECLARE_EVENT_TwoParams(UListView, FOnItemScrolledIntoView, ItemType, UUserWidget&);
+	virtual FOnItemScrolledIntoView& OnItemScrolledIntoView() const = 0;
+
+	DECLARE_EVENT_TwoParams(UTreeView, FOnItemExpansionChanged, ItemType, bool);
+	virtual FOnItemExpansionChanged& OnItemExpansionChanged() const = 0;
+
+protected:
+	/** Override and return a ptr to the SListView owned by the implementing UListViewBase */
+	virtual SListView<ItemType>* GetMyListView() const = 0;
+
+public:
+	// Public API to match that of SListView
+	NullableItemType GetSelectedItem() const
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			TArray<ItemType> SelectedItems = MyListView->GetSelectedItems();
+			if (SelectedItems.Num() > 0)
+			{
+				return SelectedItems[0];
+			}
+		}
+		return nullptr;
+	}
+
+	const ItemType* ItemFromEntryWidget(const UUserWidget& EntryWidget) const
+	{
+		SListView<ItemType>* MyListView = GetMyListView();
+		if (ensure(EntryWidget.Implements<UUserListEntry>()) && MyListView)
+		{
+			TSharedPtr<SObjectTableRow<ItemType>> ObjectTableRow = StaticCastSharedPtr<SObjectTableRow<ItemType>>(EntryWidget.GetCachedWidget());
+			if (ObjectTableRow.IsValid())
+			{
+				return MyListView->ItemFromWidget(ObjectTableRow.Get());
+			}
+		}
+		return nullptr;
+	}
+
+	template <typename RowWidgetT = UUserWidget>
+	RowWidgetT* GetEntryWidgetFromItem(const ItemType& Item) const
+	{
+		TSharedPtr<SObjectTableRow<ItemType>> ObjectRow = GetObjectRowFromItem(Item);
+		if (ObjectRow.IsValid())
+		{
+			return Cast<RowWidgetT>(ObjectRow->GetWidgetObject());
+		}
+		return nullptr;
+	}
+
+	int32 GetSelectedItems(TArray<ItemType>& OutSelectedItems) const
+	{
+		SListView<ItemType>* MyListView = GetMyListView();
+		return MyListView ? MyListView->GetSelectedItems(OutSelectedItems) : 0;
+	}
+
+	int32 GetNumItemsSelected() const
+	{
+		SListView<ItemType>* MyListView = GetMyListView();
+		return MyListView ? MyListView->GetNumItemsSelected() : 0;
+	}
+
+	void SetSelectedItem(const ItemType& SoleSelectedItem, ESelectInfo::Type SelectInfo = ESelectInfo::Direct) 
+	{ 
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->SetSelection(SoleSelectedItem, SelectInfo);
+		}
+	}
+
+	void SetItemSelection(const ItemType& Item, bool bIsSelected, ESelectInfo::Type SelectInfo = ESelectInfo::Direct)
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->SetItemSelection(Item, bIsSelected, SelectInfo);
+		}
+	}
+
+	void ClearSelection()
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->ClearSelection();
+		}
+	}
+
+	bool IsItemVisible(const ItemType& Item) const
+	{
+		SListView<ItemType>* MyListView = GetMyListView();
+		return MyListView ? MyListView->IsItemVisible(Item) : false;
+	}
+
+	bool IsItemSelected(const ItemType& Item) const
+	{
+		SListView<ItemType>* MyListView = GetMyListView();
+		return MyListView ? MyListView->IsItemSelected(Item) : false;
+	}
+
+	void RequestNavigateToItem(const ItemType& Item, uint32 UserIndex = 0)
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->RequestNavigateToItem(Item, UserIndex);
+		}
+	}
+
+	void RequestScrollItemIntoView(const ItemType& Item, const uint32 UserIndex = 0)
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->RequestScrollIntoView(Item, UserIndex);
+		}
+	}
+
+	void CancelScrollIntoView()
+	{
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			MyListView->CancelScrollIntoView();
+		}
+	}
+
+protected:
+	/**
+	 * ListView construction helpers
+	 * Use these instead of SNew-ing your owned ListView directly to get exposed events for free
+	 */
+
+	template <template<typename> class ListViewT = SListView, typename UListViewBaseT>
+	static TSharedRef<ListViewT<ItemType>> ConstructListView(UListViewBaseT* Implementer,
+		TArray<ItemType>& ListItems,
+		ESelectionMode::Type SelectionMode = ESelectionMode::Single,
+		bool bClearSelectionOnClick = false,
+		EConsumeMouseWheel ConsumeMouseWheel = EConsumeMouseWheel::WhenScrollingPossible)
+	{
+		static_assert(TIsDerivedFrom<ListViewT<ItemType>, SListView<ItemType>>::IsDerived, "ConstructListView can only construct instances of SListView classes");
+		return SNew(ListViewT<ItemType>)
+			.HandleGamepadEvents(true)
+			.ListItemsSource(&ListItems)
+			.ClearSelectionOnClick(bClearSelectionOnClick)
+			.ConsumeMouseWheel(ConsumeMouseWheel)
+			.SelectionMode(SelectionMode)
+			.OnGenerateRow_UObject(Implementer, &UListViewBaseT::HandleGenerateRow)
+			.OnSelectionChanged_UObject(Implementer, &UListViewBaseT::HandleSelectionChanged)
+			.OnRowReleased_UObject(Implementer, &UListViewBaseT::HandleRowReleased)
+			.OnItemScrolledIntoView_UObject(Implementer, &UListViewBaseT::HandleItemScrolledIntoView)
+			.OnMouseButtonClick_UObject(Implementer, &UListViewBaseT::HandleItemClicked)
+			.OnMouseButtonDoubleClick_UObject(Implementer, &UListViewBaseT::HandleItemDoubleClicked);
+	}
+
+	template <template<typename> class TileViewT = STileView, typename UListViewBaseT>
+	static TSharedRef<TileViewT<ItemType>> ConstructTileView(UListViewBaseT* Implementer,
+		TArray<ItemType>& ListItems,
+		EListItemAlignment TileAlignment,
+		TAttribute<float> TileHeight,
+		TAttribute<float> TileWidth,
+		ESelectionMode::Type SelectionMode = ESelectionMode::Single,
+		bool bClearSelectionOnClick = false,
+		bool bWrapHorizontalNavigation = false,
+		EConsumeMouseWheel ConsumeMouseWheel = EConsumeMouseWheel::WhenScrollingPossible)
+	{
+		static_assert(TIsDerivedFrom<TileViewT<ItemType>, STileView<ItemType>>::IsDerived, "ConstructTileView can only construct instances of STileView classes");
+		return SNew(TileViewT<ItemType>)
+			.HandleGamepadEvents(true)
+			.ListItemsSource(&ListItems)
+			.ClearSelectionOnClick(bClearSelectionOnClick)
+			.WrapHorizontalNavigation(bWrapHorizontalNavigation)
+			.ConsumeMouseWheel(ConsumeMouseWheel)
+			.SelectionMode(SelectionMode)
+			.ItemHeight(TileHeight)
+			.ItemWidth(TileWidth)
+			.ItemAlignment(TileAlignment)
+			.OnGenerateTile_UObject(Implementer, &UListViewBaseT::HandleGenerateRow)
+			.OnTileReleased_UObject(Implementer, &UListViewBaseT::HandleRowReleased)
+			.OnSelectionChanged_UObject(Implementer, &UListViewBaseT::HandleSelectionChanged)
+			.OnItemScrolledIntoView_UObject(Implementer, &UListViewBaseT::HandleItemScrolledIntoView)
+			.OnMouseButtonClick_UObject(Implementer, &UListViewBaseT::HandleItemClicked)
+			.OnMouseButtonDoubleClick_UObject(Implementer, &UListViewBaseT::HandleItemDoubleClicked);
+	}
+
+	template <template<typename> class TreeViewT = STreeView, typename UListViewBaseT>
+	static TSharedRef<TreeViewT<ItemType>> ConstructTreeView(UListViewBaseT* Implementer,
+		TArray<ItemType>& ListItems,
+		ESelectionMode::Type SelectionMode = ESelectionMode::Single,
+		bool bClearSelectionOnClick = false,
+		EConsumeMouseWheel ConsumeMouseWheel = EConsumeMouseWheel::WhenScrollingPossible)
+	{
+		static_assert(TIsDerivedFrom<TreeViewT<ItemType>, STreeView<ItemType>>::IsDerived, "ConstructTreeView can only construct instances of STreeView classes");
+		return SNew(TreeViewT<ItemType>)
+			.HandleGamepadEvents(true)
+			.TreeItemsSource(&ListItems)
+			.ClearSelectionOnClick(bClearSelectionOnClick)
+			.ConsumeMouseWheel(ConsumeMouseWheel)
+			.SelectionMode(SelectionMode)
+			.OnGenerateRow_UObject(Implementer, &UListViewBaseT::HandleGenerateRow)
+			.OnSelectionChanged_UObject(Implementer, &UListViewBaseT::HandleSelectionChanged)
+			.OnRowReleased_UObject(Implementer, &UListViewBaseT::HandleRowReleased)
+			.OnItemScrolledIntoView_UObject(Implementer, &UListViewBaseT::HandleItemScrolledIntoView)
+			.OnMouseButtonClick_UObject(Implementer, &UListViewBaseT::HandleItemClicked)
+			.OnMouseButtonDoubleClick_UObject(Implementer, &UListViewBaseT::HandleItemDoubleClicked)
+			.OnGetChildren_UObject(Implementer, &UListViewBaseT::HandleGetChildren)
+			.OnExpansionChanged_UObject(Implementer, &UListViewBaseT::HandleExpansionChanged);
+	}
+
+	/** Gets the SObjectTableRow underlying the UMG EntryWidget that represents the given item (if one exists) */
+	template <template<typename> class ObjectRowT = SObjectTableRow>
+	TSharedPtr<ObjectRowT<ItemType>> GetObjectRowFromItem(const ItemType& Item) const
+	{
+		static_assert(TIsDerivedFrom<ObjectRowT<ItemType>, SObjectTableRow<ItemType>>::IsDerived, "All UMG table rows must be or derive from SObjectTableRow.");
+
+		if (SListView<ItemType>* MyListView = GetMyListView())
+		{
+			TSharedPtr<ITableRow> RowWidget = MyListView->WidgetFromItem(Item);
+			return StaticCastSharedPtr<ObjectRowT<ItemType>>(RowWidget);
+		}
+		return nullptr;
+	}
+
+	/**
+	 * Generates the actual entry widget that represents the given item.
+	 *Expected to be used in concert with UListViewBase::GenerateTypedEntry().
+	 */
+	virtual UUserWidget& OnGenerateEntryWidgetInternal(ItemType Item, const TSharedRef<STableViewBase>& OwnerTable) = 0;
+
+	/** Gets the desired padding for the entry representing the given item */
+	virtual FMargin GetDesiredEntryPadding(ItemType Item) const { return FMargin(0.f); }
+
+	/** TreeViews only. Gets the items to consider children of the given item when generating child entries. */
+	virtual void OnGetChildrenInternal(ItemType Item, TArray<ItemType>& OutChildren) const {}
+
+	/** ListView events - implement these instead of binding handlers directly to a list */
+	virtual void OnItemClickedInternal(ItemType Item) {}
+	virtual void OnItemDoubleClickedInternal(ItemType Item) {}
+	virtual void OnSelectionChangedInternal(NullableItemType FirstSelectedItem) {}
+	virtual void OnItemScrolledIntoViewInternal(ItemType Item, UUserWidget& EntryWidget) {}
+	virtual void OnItemExpansionChangedInternal(ItemType Item, bool bIsExpanded) {}
+
+private:
+	TSharedRef<ITableRow> HandleGenerateRow(ItemType Item, const TSharedRef<STableViewBase>& OwnerTable)
+	{
+		UUserWidget& EntryWidget = OnGenerateEntryWidgetInternal(Item, OwnerTable);
+		EntryWidget.SetPadding(GetDesiredEntryPadding(Item));
+		return StaticCastSharedPtr<SObjectTableRow<ItemType>>(EntryWidget.GetCachedWidget()).ToSharedRef();
+	}
+
+	void HandleItemClicked(ItemType Item)
+	{
+		OnItemClickedInternal(Item);
+		OnItemClicked().Broadcast(Item);
+	}
+
+	void HandleItemDoubleClicked(ItemType Item)
+	{
+		OnItemDoubleClickedInternal(Item);
+		OnItemDoubleClicked().Broadcast(Item);
+	}
+
+	void HandleSelectionChanged(NullableItemType Item, ESelectInfo::Type SelectInfo)
+	{
+		//@todo DanH ListView: This really isn't the event that many will expect it to be - is it worth having at all? 
+		//		It only works for single selection lists, and even then only broadcasts at the end - you don't get anything for de-selection
+		OnSelectionChangedInternal(Item);
+		OnItemSelectionChanged().Broadcast(Item);
+	}
+
+	void HandleItemScrolledIntoView(ItemType Item, const TSharedPtr<ITableRow>& InWidget)
+	{
+		UUserWidget* RowWidget = GetEntryWidgetFromItem(Item);
+		if (ensure(RowWidget))
+		{
+			OnItemScrolledIntoViewInternal(Item, *RowWidget);
+			OnItemScrolledIntoView().Broadcast(Item, *RowWidget);
+		}
+	}
+
+	void HandleExpansionChanged(ItemType Item, bool bIsExpanded)
+	{
+		// If this item is currently visible (i.e. has a widget representing it), notify the widget of the expansion change
+		auto ObjectRow = GetObjectRowFromItem(Item);
+		if (ObjectRow.IsValid())
+		{
+			ObjectRow->NotifyItemExpansionChanged(bIsExpanded);
+		}
+
+		OnItemExpansionChangedInternal(Item, bIsExpanded);
+		OnItemExpansionChanged().Broadcast(Item, bIsExpanded);
+	}
+
+	void HandleGetChildren(ItemType Item, TArray<ItemType>& OutChildren) const
+	{
+		OnGetChildrenInternal(Item, OutChildren);
+	}
+};
+
+//////////////////////////////////////////////////////////////////////////
+// UListViewBase
+//////////////////////////////////////////////////////////////////////////
+
+/**
+ * Bare-bones base class to make creating custom UListView widgets easier.
+ * Child classes should also inherit from ITypedUMGListView<T> to get a basic public ListView API for free.
+ *
+ * Child classes will own the actual SListView<T> widgets, but this provides some boilerplate functionality for generating entries.
+ * To generate a row for the child list, use GenerateTypedRow with the appropriate SObjectTableRow<T> type for your list
+ *
+ * Additionally, the entry widget class can be filtered for a particular class and interface with the EntryClass and EntryInterface metadata arguments
+ * This can be specified either on the class directly (see below) or on any BindWidget UProperty
+ *
+ * Example:
+ * class UMyUserWidget : public UUserWidget
+ * {
+ *		UPROPERTY(BindWidget, meta = (EntryClass = MyListEntryWidget))
+ *		UListView* ListView_InventoryItems;
+ * }
+ *
+ */
+UCLASS(Abstract, NotBlueprintable, hidedropdown, meta = (EntryInterface = UserListEntry))
+class UMG_API UListViewBase : public UWidget
+{
+	GENERATED_BODY()
+
+public:
+	UListViewBase(const FObjectInitializer& ObjectInitializer);
+
+#if WITH_EDITOR
+	virtual const FText GetPaletteCategory() override;
+	virtual void ValidateCompiledDefaults(FCompilerResultsLog& CompileLog) const override;
+#endif
+
+	TSubclassOf<UUserWidget> GetEntryWidgetClass() const { return EntryWidgetClass; }
+
+	/** Gets all of the list entry widgets currently being displayed by the list */
+	UFUNCTION(BlueprintCallable, Category = ListViewBase)
+	const TArray<UUserWidget*>& GetDisplayedEntryWidgets() const;
+
+	/**
+	 * Full regeneration of all entries in the list. Note that the entry UWidget instances will not be destroyed, but they will be released and re-generated.
+	 * In other words, entry widgets will not receive Destruct/Construct events. They will receive OnEntryReleased and IUserObjectListEntry implementations will receive OnListItemObjectSet.
+	 */
+	UFUNCTION(BlueprintCallable, Category = ListViewBase)
+	void RegenerateAllEntries();
+
+	/** Scroll the entire list up to the first item */
+	UFUNCTION(BlueprintCallable, Category = ListViewBase)
+	void ScrollToTop();
+
+	/** Scroll the entire list down to the bottom-most item */
+	UFUNCTION(BlueprintCallable, Category = ListViewBase)
+	void ScrollToBottom();
+
+	DECLARE_EVENT_OneParam(UListView, FOnListEntryGenerated, UUserWidget&);
+	FOnListEntryGenerated& OnEntryWidgetGenerated() { return OnListEntryGeneratedEvent; }
+
+	DECLARE_EVENT_OneParam(UListView, FOnEntryWidgetReleased, UUserWidget&);
+	FOnEntryWidgetReleased& OnEntryWidgetReleased() { return OnEntryWidgetReleasedEvent; }
+
+protected:
+	virtual TSharedRef<SWidget> RebuildWidget() override final;
+	virtual void ReleaseSlateResources(bool bReleaseChildren) override;
+	virtual void SynchronizeProperties() override;
+
+	/** Implement in child classes to construct the actual ListView Slate widget */
+	virtual TSharedRef<STableViewBase> RebuildListWidget();
+
+	//@todo DanH: Should probably have the events for native & BP built in up here - need to update existing binds to UListView's version
+	virtual void HandleListEntryHovered(UUserWidget& EntryWidget) {}
+	virtual void HandleListEntryUnhovered(UUserWidget& EntryWidget) {}
+
+	/** Expected to be bound to the actual ListView widget created by a child class */
+	void HandleRowReleased(const TSharedRef<ITableRow>& Row);
+
+	/**
+	 * Sets the list to refresh on the next tick.
+	 *
+	 * Note that refreshing, from a list perspective, is limited to accounting for discrepancies between items and entries.
+	 * In other words, it will only release entries that no longer have items and create entries for new items (or newly visible items).
+	 *
+	 * It does NOT account for changes within existing items - that is up to the item to announce for an entry to listen to as needed.
+	 * This can be onerous to set up for simple cases, so it's also reasonable to call RegenerateAllEntries when changes within N list items need to be reflected.
+	 */
+	void RequestRefresh();
+
+	template <typename WidgetEntryT = UUserWidget, typename ObjectTableRowT = SObjectTableRow<UObject*>>
+	WidgetEntryT& GenerateTypedEntry(const TSharedRef<STableViewBase>& OwnerTable)
+	{
+		static_assert(TIsDerivedFrom<ObjectTableRowT, ITableRow>::IsDerived && TIsDerivedFrom<ObjectTableRowT, SObjectWidget>::IsDerived,
+			"GenerateObjectTableRow can only be used to create SObjectWidget types that also inherit from ITableRow. See SObjectTableRow.");
+
+		WidgetEntryT* ListEntryWidget = EntryWidgetPool.GetOrCreateInstance<WidgetEntryT>(*EntryWidgetClass,
+			[this, &OwnerTable] (UUserWidget* WidgetObject, TSharedRef<SWidget> Content)
+			{
+				return SNew(ObjectTableRowT, OwnerTable, *WidgetObject)
+					.OnHovered_UObject(this, &UListViewBase::HandleListEntryHovered)
+					.OnUnhovered_UObject(this, &UListViewBase::HandleListEntryUnhovered)
+					[
+						Content
+					];
+			});
+		check(ListEntryWidget);
+
+		FinishGeneratingEntry(*ListEntryWidget);
+
+		return *ListEntryWidget;
+	}
+
+#if WITH_EDITORONLY_DATA
+	/**
+	 * Called during design time to allow lists to generate preview entries via dummy data.
+	 * Since that data could be of any type, the child has to be the one to generate them.
+	 * 
+	 * Expected to call RefreshDesignerItems<T> with the appropriate T for your underlying list
+	 * @see UListView::OnRefreshDesignerItems for a usage example
+	 */
+	virtual void OnRefreshDesignerItems() {}
+
+	/**
+	 * Helper intended to be called by overrides of OnRefreshDesignerItems.
+	 * @see UListView::OnRefreshDesignerItems for a usage example
+	 */
+	template <typename PlaceholderItemT>
+	void RefreshDesignerItems(TArray<PlaceholderItemT>& ListItems, TFunctionRef<PlaceholderItemT()> CreateItemFunc)
+	{
+		bNeedsToCallRefreshDesignerItems = false;
+		bool bRefresh = false;
+		if (EntryWidgetClass && NumDesignerPreviewEntries > 0)
+		{
+			if (ListItems.Num() < NumDesignerPreviewEntries)
+			{
+				while (ListItems.Num() < NumDesignerPreviewEntries)
+				{
+					ListItems.Add(CreateItemFunc());
+				}
+				bRefresh = true;
+			}
+			else if (ListItems.Num() > NumDesignerPreviewEntries)
+			{
+				const int32 NumExtras = ListItems.Num() - NumDesignerPreviewEntries;
+				ListItems.RemoveAtSwap(ListItems.Num() - (NumExtras + 1), NumExtras);
+				bRefresh = true;
+			}
+		}
+		else
+		{
+			ListItems.Reset();
+			bRefresh = true;
+		}
+
+		if (bRefresh)
+		{
+			RequestRefresh();
+		}
+	}
+#endif
+
+private:
+	void FinishGeneratingEntry(UUserWidget& GeneratedEntry);
+	void HandleAnnounceGeneratedEntries();
+
+private:
+
+	// Note: Options for this property can be configured via class and property metadata. See class declaration comment above.
+	/** The type of widget to create for each entry displayed in the list. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = ListEntries, meta = (DesignerRebuild, AllowPrivateAccess = true))
+	TSubclassOf<UUserWidget> EntryWidgetClass;
+	
+	/** Called when a row widget is generated for a list item */
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Entry Generated"))
+	FOnListEntryGeneratedDynamic BP_OnEntryGenerated;
+
+	/** Called when a row widget is released by the list (i.e. when it no longer represents a list item) */
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (DisplayName = "On Entry Released"))
+	FOnListEntryReleasedDynamic BP_OnEntryReleased;
+
+#if WITH_EDITORONLY_DATA
+	bool bNeedsToCallRefreshDesignerItems = false;;
+
+	/** The number of dummy item entry widgets to preview in the widget designer */
+	UPROPERTY(EditAnywhere, Category = ListEntries, meta = (ClampMin = 0, ClampMax = 20))
+	int32 NumDesignerPreviewEntries = 5;
+#endif
+
+	FUserWidgetPool EntryWidgetPool;
+	FTimerHandle EntryGenAnnouncementTimerHandle;
+	TArray<TWeakObjectPtr<UUserWidget>> GeneratedEntriesToAnnounce;
+
+	FOnListEntryGenerated OnListEntryGeneratedEvent;
+	FOnEntryWidgetReleased OnEntryWidgetReleasedEvent;
+
+	TSharedPtr<STableViewBase> MyTableViewBase;
+
+	friend class FListViewBaseDetails;
+};
+
+
+#define IMPLEMENT_TYPED_UMG_LIST(ItemType, ListPropertyName)	\
+protected:	\
+	virtual SListView<ItemType>* GetMyListView() const override { return ListPropertyName.Get(); }	\
+private:	\
+	friend class ITypedUMGListView<ItemType>;	\
+	mutable FSimpleListItemEvent OnItemClickedEvent;	\
+	mutable FSimpleListItemEvent OnItemDoubleClickedEvent;	\
+	mutable FOnItemSelectionChanged OnItemSelectionChangedEvent;	\
+	mutable FOnItemIsHoveredChanged OnItemIsHoveredChangedEvent;	\
+	mutable FOnItemScrolledIntoView OnItemScrolledIntoViewEvent;	\
+	mutable FOnItemExpansionChanged OnItemExpansionChangedEvent;	\
+public:	\
+	virtual FSimpleListItemEvent& OnItemClicked() const override { return OnItemClickedEvent; }	\
+	virtual FSimpleListItemEvent& OnItemDoubleClicked() const override { return OnItemDoubleClickedEvent; }	\
+	virtual FOnItemIsHoveredChanged& OnItemIsHoveredChanged() const override { return OnItemIsHoveredChangedEvent; }	\
+	virtual FOnItemSelectionChanged& OnItemSelectionChanged() const override { return OnItemSelectionChangedEvent; }	\
+	virtual FOnItemScrolledIntoView& OnItemScrolledIntoView() const override { return OnItemScrolledIntoViewEvent; }	\
+	virtual FOnItemExpansionChanged& OnItemExpansionChanged() const override { return OnItemExpansionChangedEvent; }	
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableText.h b/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableText.h
index 9a14c931db60..fb29aa765ad4 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableText.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableText.h
@@ -72,6 +72,10 @@ public:
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	bool AllowContextMenu;
 	
+	/** Additional options for the virtual keyboard */
+	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** What action should be taken when the virtual keyboard is dismissed? */
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	EVirtualKeyboardDismissAction VirtualKeyboardDismissAction;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableTextBox.h b/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableTextBox.h
index 16b7a0a78558..4e21e1d82673 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableTextBox.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/MultiLineEditableTextBox.h
@@ -58,6 +58,10 @@ public:
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	bool AllowContextMenu;
 	
+	/** Additional options to be used by the virtual keyboard summoned from this widget */
+	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
+	FVirtualKeyboardOptions VirtualKeyboardOptions;
+
 	/** What action should be taken when the virtual keyboard is dismissed? */
 	UPROPERTY(EditAnywhere, Category=Behavior, AdvancedDisplay)
 	EVirtualKeyboardDismissAction VirtualKeyboardDismissAction;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/RetainerBox.h b/Engine/Source/Runtime/UMG/Public/Components/RetainerBox.h
index c12497bf4a4b..05d8dd90e738 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/RetainerBox.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/RetainerBox.h
@@ -32,13 +32,13 @@ public:
 	 * Should this widget redraw the contents it has every time it receives an invalidation request
 	 * from it's children, similar to the invalidation panel.
 	 */
-	UPROPERTY(EditAnywhere, Category=RenderRules)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=RenderRules)
 	bool RenderOnInvalidation;
 
 	/**
 	 * Should this widget redraw the contents it has every time the phase occurs.
 	 */
-	UPROPERTY(EditAnywhere, Category=RenderRules)
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=RenderRules)
 	bool RenderOnPhase;
 
 	/**
@@ -48,7 +48,7 @@ public:
 	 * If the Phase were 0, and the PhaseCount were 2, this retainer would draw a fresh frame every
 	 * other frame.  So in a 60Hz game, the UI would render at 30Hz.
 	 */
-	UPROPERTY(EditAnywhere, Category=RenderRules, meta = (UIMin = 0, ClampMin = 0))
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=RenderRules, meta = (UIMin = 0, ClampMin = 0))
 	int32 Phase;
 
 	/**
@@ -59,11 +59,17 @@ public:
 	 * If the Phase were 0, and the PhaseCount were 2, this retainer would draw a fresh frame every 
 	 * other frame.  So in a 60Hz game, the UI would render at 30Hz.
 	 */
-	UPROPERTY(EditAnywhere, Category=RenderRules, meta=( UIMin=1, ClampMin=1 ))
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=RenderRules, meta=( UIMin=1, ClampMin=1 ))
 	int32 PhaseCount;
 
 public:
 
+	/**
+	 * Requests the retainer redrawn the contents it has.
+	 */
+	UFUNCTION(BlueprintCallable, Category="Retainer")
+	void SetRenderingPhase(int RenderPhase, int32 TotalPhases);
+
 	/**
 	 * Requests the retainer redrawn the contents it has.
 	 */
diff --git a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlock.h b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlock.h
index 299683f70299..e5ab33b5bade 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlock.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlock.h
@@ -55,27 +55,37 @@ public:
 	// End UWidget interface
 #endif
 
+	/**  */
 	UFUNCTION(BlueprintCallable, Category = "Widget")
 	void SetText(const FText& InText);
 
 	const FTextBlockStyle& GetDefaultTextStyle() const;
 
+	/**  */
+	UFUNCTION(BlueprintCallable, Category = "Widget")
+	URichTextBlockDecorator* GetDecoratorByClass(TSubclassOf<URichTextBlockDecorator> DecoratorClass);
+
 protected:
 	/** The text to display */
 	UPROPERTY(EditAnywhere, Category=Content, meta=( MultiLine="true" ))
 	FText Text;
 
-	UPROPERTY(EditAnywhere, Category = Appearance, meta=(RowType="RichTextStyleRow"))
+	/**  */
+	UPROPERTY(EditAnywhere, Category=Appearance, meta=(RowType="RichTextStyleRow"))
 	class UDataTable* TextStyleSet;
-	
-	UPROPERTY(EditAnywhere, Instanced, Category = Appearance)
-	TArray<URichTextBlockDecorator*> Decorators;
+
+	/**  */
+	UPROPERTY(EditAnywhere, Category=Appearance)
+	TArray<TSubclassOf<URichTextBlockDecorator>> DecoratorClasses;
 
 protected:
 	FTextBlockStyle DefaultTextStyle;
 
 	TSharedPtr<class FSlateStyleSet> StyleInstance;
 
+	UPROPERTY(Transient)
+	TArray<URichTextBlockDecorator*> InstanceDecorators;
+
 	/** Native Slate Widget */
 	TSharedPtr<SRichTextBlock> MyRichTextBlock;
 
@@ -83,5 +93,8 @@ protected:
 	virtual TSharedRef<SWidget> RebuildWidget() override;
 	// End of UWidget interface
 
-	void UpdateStyleData();
+	virtual void UpdateStyleData();
+	virtual void CreateDecorators(TArray< TSharedRef< class ITextDecorator > >& OutDecorators);
+	virtual TSharedPtr< class IRichTextMarkupParser > CreateMarkupParser();
+	virtual TSharedPtr< class IRichTextMarkupWriter > CreateMarkupWriter();
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockDecorator.h b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockDecorator.h
index dcb988fbe87c..30ad174b8562 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockDecorator.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockDecorator.h
@@ -36,7 +36,7 @@ protected:
 	URichTextBlock* Owner;
 };
 
-UCLASS(Abstract, BlueprintType, EditInlineNew)
+UCLASS(Abstract, BlueprintType)
 class UMG_API URichTextBlockDecorator : public UObject
 {
 	GENERATED_BODY()
diff --git a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockImageDecorator.h b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockImageDecorator.h
index cd31b2593caf..f0e93c31e08d 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockImageDecorator.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/RichTextBlockImageDecorator.h
@@ -28,6 +28,11 @@ public:
 	FSlateBrush Brush;
 };
 
+/**
+ * Allows you to setup an image decorator that can be configured
+ * to map certain keys to certain images.  We recommend you subclass this
+ * as a blueprint to configure the instance.
+ */
 UCLASS()
 class UMG_API URichTextBlockImageDecorator : public URichTextBlockDecorator
 {
@@ -41,6 +46,6 @@ public:
 	FRichImageRow* FindImageRow(FName TagOrId, bool bWarnIfMissing);
 
 protected:
-	UPROPERTY(EditAnywhere, Category = Appearance, meta=(RowType="RichImageRow"))
+	UPROPERTY(EditAnywhere, Category=Appearance, meta=(RowType="RichImageRow"))
 	class UDataTable* ImageSet;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Components/ScaleBox.h b/Engine/Source/Runtime/UMG/Public/Components/ScaleBox.h
index ebe57f99e9ac..003ea1402d53 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/ScaleBox.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/ScaleBox.h
@@ -73,6 +73,7 @@ public:
 #if WITH_EDITOR
 	virtual const FText GetPaletteCategory() override;
 	virtual bool CanEditChange(const UProperty* InProperty) const override;
+	virtual void OnDesignerChanged(const FDesignerChangedEventArgs& EventArgs) override;
 #endif
 
 	virtual void Serialize(FArchive& Ar) override;
@@ -88,6 +89,10 @@ protected:
 protected:
 	TSharedPtr<SScaleBox> MyScaleBox;
 
+#if WITH_EDITOR
+	TOptional<FVector2D> DesignerSize;
+#endif
+
 protected:
 	// UWidget interface
 	virtual TSharedRef<SWidget> RebuildWidget() override;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/ScrollBox.h b/Engine/Source/Runtime/UMG/Public/Components/ScrollBox.h
index 41a67590a616..27a588f98d7a 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/ScrollBox.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/ScrollBox.h
@@ -108,6 +108,9 @@ public:
 	UFUNCTION(BlueprintCallable, Category="Widget")
 	float GetScrollOffset() const;
 
+	UFUNCTION(BlueprintCallable, Category="Widget")
+	float GetViewOffsetFraction() const;
+
 	/** Scrolls the ScrollBox to the top instantly */
 	UFUNCTION(BlueprintCallable, Category="Widget")
 	void ScrollToStart();
diff --git a/Engine/Source/Runtime/UMG/Public/Components/ScrollBoxSlot.h b/Engine/Source/Runtime/UMG/Public/Components/ScrollBoxSlot.h
index d9175be49219..ed9aa45ea4ea 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/ScrollBoxSlot.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/ScrollBoxSlot.h
@@ -27,6 +27,10 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="Layout|ScrollBox Slot")
 	TEnumAsByte<EHorizontalAlignment> HorizontalAlignment;
 
+	/** The alignment of the object vertically. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Layout|ScrollBox Slot")
+	TEnumAsByte<EVerticalAlignment> VerticalAlignment;
+
 public:
 
 	UFUNCTION(BlueprintCallable, Category="Layout|ScrollBox Slot")
@@ -35,6 +39,9 @@ public:
 	UFUNCTION(BlueprintCallable, Category="Layout|ScrollBox Slot")
 	void SetHorizontalAlignment(EHorizontalAlignment InHorizontalAlignment);
 
+	UFUNCTION(BlueprintCallable, Category = "Layout|ScrollBox Slot")
+	void SetVerticalAlignment(EVerticalAlignment InVerticalAlignment);
+
 public:
 
 	// UPanelSlot interface
diff --git a/Engine/Source/Runtime/UMG/Public/Components/TableViewBase.h b/Engine/Source/Runtime/UMG/Public/Components/TableViewBase.h
deleted file mode 100644
index ceea0b7f1e37..000000000000
--- a/Engine/Source/Runtime/UMG/Public/Components/TableViewBase.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "Components/Widget.h"
-#include "TableViewBase.generated.h"
-
-/** The base class for all wrapped table views */
-UCLASS(Abstract)
-class UMG_API UTableViewBase : public UWidget
-{
-	GENERATED_UCLASS_BODY()
-
-	/** Delegate for constructing a UWidget based on a UObject */
-	DECLARE_DYNAMIC_DELEGATE_RetVal_OneParam(UWidget*, FOnGenerateRowUObject, UObject*, Item);
-};
diff --git a/Engine/Source/Runtime/UMG/Public/Components/TextWidgetTypes.h b/Engine/Source/Runtime/UMG/Public/Components/TextWidgetTypes.h
index a3cf1ce2abca..c79b34992cc8 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/TextWidgetTypes.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/TextWidgetTypes.h
@@ -33,11 +33,11 @@ struct UMG_API FShapedTextOptions
 
 	/**  */
 	UPROPERTY(EditAnywhere, Category=Localization, meta=(InlineEditConditionToggle))
-	uint32 bOverride_TextShapingMethod : 1;
+	uint8 bOverride_TextShapingMethod : 1;
 
 	/**  */
 	UPROPERTY(EditAnywhere, Category=Localization, meta=(InlineEditConditionToggle))
-	uint32 bOverride_TextFlowDirection : 1;
+	uint8 bOverride_TextFlowDirection : 1;
 
 	/** Which text shaping method should the text within this widget use? (unset to use the default returned by GetDefaultTextShapingMethod) */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Localization, AdvancedDisplay, meta=(EditCondition="bOverride_TextShapingMethod"))
@@ -66,7 +66,7 @@ protected:
 		ShapedTextOptions.SynchronizeShapedTextProperties(InWidget);
 
 		InWidget.SetJustification(Justification);
-		InWidget.SetAutoWrapText(AutoWrapText);
+		InWidget.SetAutoWrapText(!!AutoWrapText);
 		InWidget.SetWrapTextAt(WrapTextAt != 0 ? WrapTextAt : TAttribute<float>());
 		InWidget.SetWrappingPolicy(WrappingPolicy);
 		InWidget.SetMargin(Margin);
@@ -81,18 +81,18 @@ protected:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Appearance)
 	TEnumAsByte<ETextJustify::Type> Justification;
 
+	/** The wrapping policy to use. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Wrapping, AdvancedDisplay)
+	ETextWrappingPolicy WrappingPolicy;
+
 	/** True if we're wrapping text automatically based on the computed horizontal space for this widget. */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Wrapping)
-	bool AutoWrapText;
+	uint8 AutoWrapText:1;
 
 	/** Whether text wraps onto a new line when it's length exceeds this width; if this value is zero or negative, no wrapping occurs. */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Wrapping)
 	float WrapTextAt;
 
-	/** The wrapping policy to use. */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Wrapping, AdvancedDisplay)
-	ETextWrappingPolicy WrappingPolicy;
-
 	/** The amount of blank space left around the edges of text area. */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Appearance, AdvancedDisplay)
 	FMargin Margin;
diff --git a/Engine/Source/Runtime/UMG/Public/Components/TileView.h b/Engine/Source/Runtime/UMG/Public/Components/TileView.h
index 326a97325168..b9ddf2935fbd 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/TileView.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/TileView.h
@@ -2,74 +2,62 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "Widgets/SWidget.h"
-#include "Widgets/Views/STableViewBase.h"
-#include "Widgets/Views/STableRow.h"
+#include "ListView.h"
 #include "Widgets/Views/STileView.h"
-#include "Components/TableViewBase.h"
 #include "TileView.generated.h"
 
 /**
- * A flow panel that presents the contents as a set of tiles all uniformly sized.
+ * A ListView that presents the contents as a set of tiles all uniformly sized.
  */
-UCLASS(Experimental)
-class UMG_API UTileView : public UTableViewBase
+UCLASS()
+class UMG_API UTileView : public UListView
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
 
 public:
+	UTileView(const FObjectInitializer& ObjectInitializer);
 
-	/**  */
-	UPROPERTY(EditAnywhere, Category=Appearance)
-	float ItemWidth;
-
-	/**  */
-	UPROPERTY(EditAnywhere, Category=Appearance)
-	float ItemHeight;
-
-	/**  */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=Content)
-	TArray<UObject*> Items;
-
-	/**  */
-	UPROPERTY(EditAnywhere, Category=Content)
-	TEnumAsByte<ESelectionMode::Type> SelectionMode;
-
-	/**  */
-	UPROPERTY(EditAnywhere, Category=Events, meta=( IsBindableEvent="True" ))
-	FOnGenerateRowUObject OnGenerateTileEvent;
-
-public:
-
-	/** Set item width */
-	UFUNCTION(BlueprintCallable, Category="Appearance")
-	void SetItemWidth(float Width);
-
-	/** Set item height */
-	UFUNCTION(BlueprintCallable, Category="Appearance")
-	void SetItemHeight(float Height);
-
-	/** Refreshes the list */
-	UFUNCTION(BlueprintCallable, Category="Behavior")
-	void RequestListRefresh();
-
-	// UVisual interface
 	virtual void ReleaseSlateResources(bool bReleaseChildren) override;
-	// End of UVisual interface
 
-#if WITH_EDITOR
-	virtual const FText GetPaletteCategory() override;
-#endif
+	/** Sets the height of every tile entry */
+	UFUNCTION(BlueprintCallable, Category = TileView)
+	void SetEntryHeight(float NewHeight);
+
+	/** Sets the width if every tile entry */
+	UFUNCTION(BlueprintCallable, Category = TileView)
+	void SetEntryWidth(float NewWidth);
 
 protected:
-	TSharedRef<ITableRow> HandleOnGenerateTile(UObject* Item, const TSharedRef< STableViewBase >& OwnerTable) const;
+	virtual TSharedRef<STableViewBase> RebuildListWidget() override;
+	virtual FMargin GetDesiredEntryPadding(UObject* Item) const override;
 
-	// UWidget interface
-	virtual TSharedRef<SWidget> RebuildWidget() override;
-	// End of UWidget interface
+	float GetTotalEntryHeight() const;
+	float GetTotalEntryWidth() const;
+
+	/** STileView construction helper - useful if using a custom STileView subclass */
+	template <template<typename> class TileViewT = STileView>
+	TSharedRef<TileViewT<UObject*>> ConstructTileView()
+	{
+		MyListView = MyTileView = ITypedUMGListView<UObject*>::ConstructTileView<TileViewT>(this, ListItems, TileAlignment, EntryHeight, EntryWidth, SelectionMode, bClearSelectionOnClick, bWrapHorizontalNavigation, ConsumeMouseWheel);
+		return StaticCastSharedRef<TileViewT<UObject*>>(MyTileView.ToSharedRef());
+	}
 
 protected:
-	TSharedPtr< STileView< UObject* > > MyTileView;
+	/** The height of each tile */
+	UPROPERTY(EditAnywhere, Category = ListEntries)
+	float EntryHeight = 128.f;
+
+	/** The width of each tile */
+	UPROPERTY(EditAnywhere, Category = ListEntries)
+	float EntryWidth = 128.f;
+
+	/** The method by which to align the tile entries in the available space for the tile view */
+	UPROPERTY(EditAnywhere, Category = ListEntries)
+	EListItemAlignment TileAlignment;
+
+	/** True to allow left/right navigation to wrap back to the tile on the opposite edge */
+	UPROPERTY(EditAnywhere, Category = Navigation)
+	bool bWrapHorizontalNavigation = false;
+
+	TSharedPtr<STileView<UObject*>> MyTileView;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Components/TreeView.h b/Engine/Source/Runtime/UMG/Public/Components/TreeView.h
new file mode 100644
index 000000000000..7da485a08ed0
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Components/TreeView.h
@@ -0,0 +1,78 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "ListView.h"
+#include "Widgets/Views/STreeView.h"
+#include "TreeView.generated.h"
+
+DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetItemChildrenDynamic, UObject*, Item, TArray<UObject*>&, Children);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnItemExpansionChangedDynamic, UObject*, Item, bool, bIsExpanded);
+
+/**
+ * Similar to ListView, but can display a hierarchical tree of elements.
+ * The base items source for the tree identifies the root items, each of which can have n associated child items.
+ * There is no hard limit to the nesting - child items can have children and so on
+ */
+UCLASS()
+class UMG_API UTreeView : public UListView
+{
+	GENERATED_BODY()
+
+public:
+	UTreeView(const FObjectInitializer& ObjectInitializer);
+	virtual void ReleaseSlateResources(bool bReleaseChildren) override;
+	
+	/** Attempts to expand/collapse the given item (only relevant if the item has children) */
+	UFUNCTION(BlueprintCallable, Category = TreeView)
+	void SetItemExpansion(UObject* Item, bool bExpandItem);
+
+	/** Expands all items with children */
+	UFUNCTION(BlueprintCallable, Category = TreeView)
+	void ExpandAll();
+
+	/** Collapses all currently expanded items */
+	UFUNCTION(BlueprintCallable, Category = TreeView)
+	void CollapseAll();
+
+	template <typename ObjectT>
+	void SetOnGetItemChildren(ObjectT* InUserObject, typename TSlateDelegates<UObject*>::FOnGetChildren::TUObjectMethodDelegate<ObjectT>::FMethodPtr InMethodPtr)
+	{
+		static_assert(TIsDerivedFrom<ObjectT, UObject>::IsDerived, "Only UObject ptrs can be passed directly when binding to SetOnGetItemChildren. Pass a shared ref for non-UObject binders.");
+		OnGetItemChildren = TSlateDelegates<UObject*>::FOnGetChildren::CreateUObject(InUserObject, InMethodPtr);
+	}
+	template <typename ObjectT>
+	void SetOnGetItemChildren(TSharedRef<ObjectT> InUserObject, typename TSlateDelegates<UObject*>::FOnGetChildren::TUObjectMethodDelegate<ObjectT>::FMethodPtr InMethodPtr)
+	{
+		OnGetItemChildren = TSlateDelegates<UObject*>::FOnGetChildren::CreateSP(InUserObject, InMethodPtr);
+	}
+
+protected:
+	virtual TSharedRef<STableViewBase> RebuildListWidget() override;
+	virtual void OnItemClickedInternal(UObject* ListItem) override;
+
+	virtual void OnItemExpansionChangedInternal(UObject* Item, bool bIsExpanded) override;
+	virtual void OnGetChildrenInternal(UObject* Item, TArray<UObject*>& OutChildren) const override;
+
+	/** STreeView construction helper - useful if using a custom STreeView subclass */
+	template <template<typename> class TreeViewT = STreeView>
+	TSharedRef<TreeViewT<UObject*>> ConstructTreeView()
+	{
+		MyListView = MyTreeView = ITypedUMGListView<UObject*>::ConstructTreeView<TreeViewT>(this, ListItems, SelectionMode, bClearSelectionOnClick, ConsumeMouseWheel);
+		return StaticCastSharedRef<TreeViewT<UObject*>>(MyTreeView.ToSharedRef());
+	}
+
+
+	TSharedPtr<STreeView<UObject*>> MyTreeView;
+
+private:
+	/** Called to get the list of children (if any) that correspond to the given item. Only called if the native C++ version of the event is not bound. */
+	UPROPERTY(EditAnywhere, Category = Events, meta = (IsBindableEvent, AllowPrivateAccess = true, DisplayName = "On Get Item Children"))
+	FOnGetItemChildrenDynamic BP_OnGetItemChildren;
+
+	UPROPERTY(BlueprintAssignable, Category = Events, meta = (AllowPrivateAccess = true, DisplayName = "On Item Expansion Changed"))
+	FOnItemExpansionChangedDynamic BP_OnItemExpansionChanged;
+
+	TSlateDelegates<UObject*>::FOnGetChildren OnGetItemChildren;
+	FOnItemExpansionChanged OnItemExpansionChangedEvent;
+};
diff --git a/Engine/Source/Runtime/UMG/Public/Components/Widget.h b/Engine/Source/Runtime/UMG/Public/Components/Widget.h
index 724ea72a9291..194176400979 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/Widget.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/Widget.h
@@ -19,9 +19,15 @@
 #include "Slate/WidgetTransform.h"
 #include "UObject/UObjectThreadContext.h"
 
+#if WITH_EDITOR
+// This violates IWYU, but the alternative is .cpp includes that are invariably not within #if WITH_EDITOR and cause non-editor build failures
+#include "Kismet2/CompilerResultsLog.h"
+#endif
+
 #include "Widget.generated.h"
 
 class APlayerController;
+class ULocalPlayer;
 class SObjectWidget;
 class UPanelSlot;
 class UPropertyBinding;
@@ -31,22 +37,45 @@ enum class ECheckBoxState : uint8;
 
 namespace UMWidget
 {
-	// valid keywords for the UPROPERTY macro
+	// valid keywords for the UCLASS macro
 	enum
 	{
-		/// [PropertyMetadata] This property if changed will rebuild the widget designer preview.  Use sparingly, try to update most properties by
-		/// setting them in the SynchronizeProperties function.
-		/// UPROPERTY(meta=(DesignerRebuild))
+		// [ClassMetadata] [PropertyMetadata] Specifies the base class by which to filter available entry classes within DynamicEntryBox and any ListViewBase.
+		EntryClass,
+
+		// [ClassMetadata] [PropertyMetadata] Specifies the base class by which to filter available entry classes within DynamicEntryBox and any ListViewBase.
+		EntryInterface,
+	};
+
+	// valid metadata keywords for the UPROPERTY macro
+	enum
+	{
+		// [PropertyMetadata] This property if changed will rebuild the widget designer preview.  Use sparingly, try to update most properties by
+		// setting them in the SynchronizeProperties function.
+		// UPROPERTY(meta=(DesignerRebuild))
 		DesignerRebuild,
-		/// [PropertyMetadata] This property requires a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
-		/// UPROPERTY(meta=(BindWidget))
+
+		// [PropertyMetadata] This property requires a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
+		// UPROPERTY(meta=(BindWidget))
 		BindWidget,
-		/// [PropertyMetadata] This property optionally allows a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
-		/// UPROPERTY(meta=(BindWidgetOptional))
+
+		// [PropertyMetadata] This property optionally allows a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
+		// UPROPERTY(meta=(BindWidgetOptional))
 		BindWidgetOptional,
-		/// [PropertyMetadata] This property optionally allows a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
-		/// UPROPERTY(meta=(BindWidget, OptionalWidget=true))
-		OptionalWidget
+
+		// [PropertyMetadata] This property optionally allows a widget be bound to it in the designer.  Allows easy native access to designer defined controls.
+		// UPROPERTY(meta=(BindWidget, OptionalWidget=true))
+		OptionalWidget,
+
+		// [PropertyMetadata] Exposes a dynamic delegate property in the details panel for the widget.
+		// UPROPERTY(meta=(IsBindableEvent))
+		IsBindableEvent,
+
+		// [ClassMetadata] [PropertyMetadata] Specifies the base class by which to filter available entry classes within DynamicEntryBox and any ListViewBase.
+		// EntryClass, (Commented out so as to avoid duplicate name with version in the Class section, but still show in the property section)
+
+		// [ClassMetadata] [PropertyMetadata] Specifies the base class by which to filter available entry classes within DynamicEntryBox and any ListViewBase.
+		//EntryInterface, (Commented out so as to avoid duplicate name with version in the Class section, but still show in the property section)
 	};
 }
 
@@ -463,6 +492,15 @@ public:
 	UFUNCTION(BlueprintCallable, Category="Widget")
 	bool HasMouseCapture() const;
 
+	/**
+	 * Checks to see if this widget is the current mouse captor
+	 *	@param User index to check for capture
+	 *	@param Optional pointer index to check for capture
+	 *	@return  True if this widget has captured the mouse with given user and pointer
+	 */
+	UFUNCTION(BlueprintCallable, Category = "Widget")
+	bool HasMouseCaptureByUser(int32 UserIndex, int32 PointerIndex = -1) const;
+
 	/** Sets the focus to this widget. */
 	UFUNCTION(BlueprintCallable, Category="Widget")
 	void SetKeyboardFocus();
@@ -580,10 +618,11 @@ public:
 	 *		});
 	 * 
 	 */
-	template <class WidgetType, class = typename TEnableIf<TIsDerivedFrom<WidgetType, SObjectWidget>::IsDerived, WidgetType>::Type>
-	TSharedRef<WidgetType> TakeDerivedWidget( ConstructMethodType ConstructMethod )
+	template <class WidgetType = SObjectWidget>
+	TSharedRef<WidgetType> TakeDerivedWidget(ConstructMethodType ConstructMethod)
 	{
-		return StaticCastSharedRef<WidgetType>( TakeWidget_Private( ConstructMethod ) );
+		static_assert(TIsDerivedFrom<WidgetType, SObjectWidget>::IsDerived, "TakeDerivedWidget can only be used to create SObjectWidget instances");
+		return StaticCastSharedRef<WidgetType>(TakeWidget_Private(ConstructMethod));
 	}
 	
 private:
@@ -594,12 +633,22 @@ public:
 	/** Gets the last created widget does not recreate the gc container for the widget if one is needed. */
 	TSharedPtr<SWidget> GetCachedWidget() const;
 
+	/** Gets the last created widget does not recreate the gc container for the widget if one is needed. */
+	bool IsConstructed() const;
+
 	/**
 	 * Gets the player controller associated with this UI.
 	 * @return The player controller that owns the UI.
 	 */
-	UFUNCTION(BlueprintCallable, Category="Player")
-	virtual class APlayerController* GetOwningPlayer() const;
+	UFUNCTION(BlueprintCallable, BlueprintCosmetic, Category = Player)
+	virtual APlayerController* GetOwningPlayer() const;
+
+	/**
+	 * Gets the local player associated with this UI.
+	 * @return The owning local player.
+	 */
+	UFUNCTION(BlueprintCallable, BlueprintCosmetic, Category = Player)
+	virtual ULocalPlayer* GetOwningLocalPlayer() const;
 
 	/**
 	 * Applies all properties to the native widget if possible.  This is called after a widget is constructed.
@@ -646,6 +695,12 @@ public:
 	/** Sets the friendly name of the widget to display in the editor */
 	void SetDisplayLabel(const FString& DisplayLabel);
 
+	/**
+	 * Called at the end of Widget Blueprint compilation.
+	 * Allows UMG elements to evaluate their default states and determine whether they are acceptable.
+	 * To trigger compilation failure, add an error to the log. Warnings and notes will be visible, but will not cause compiles to fail.
+	 */
+	virtual void ValidateCompiledDefaults(class FCompilerResultsLog& CompileLog) const {}
 #else
 	FORCEINLINE bool IsDesignTime() const { return false; }
 #endif
@@ -666,6 +721,7 @@ public:
 
 	// Begin UObject
 	virtual UWorld* GetWorld() const override;
+	virtual void FinishDestroy() override;
 	// End UObject
 
 #if WITH_EDITOR
diff --git a/Engine/Source/Runtime/UMG/Public/Components/WidgetComponent.h b/Engine/Source/Runtime/UMG/Public/Components/WidgetComponent.h
index 139a599b671c..c7c0080494fa 100644
--- a/Engine/Source/Runtime/UMG/Public/Components/WidgetComponent.h
+++ b/Engine/Source/Runtime/UMG/Public/Components/WidgetComponent.h
@@ -485,5 +485,5 @@ protected:
 	static TSharedPtr<class FWidget3DHitTester> WidgetHitTester;
 
 	/** Helper class for drawing widgets to a render target. */
-	TSharedPtr<class FWidgetRenderer> WidgetRenderer;
+	class FWidgetRenderer* WidgetRenderer;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/SObjectTableRow.h b/Engine/Source/Runtime/UMG/Public/Slate/SObjectTableRow.h
new file mode 100644
index 000000000000..9a6f07bad97b
--- /dev/null
+++ b/Engine/Source/Runtime/UMG/Public/Slate/SObjectTableRow.h
@@ -0,0 +1,449 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "Slate/SObjectWidget.h"
+#include "Blueprint/IUserObjectListEntry.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Views/SListView.h"
+
+class IObjectTableRow : public ITableRow
+{
+public:
+	virtual UUserWidget* GetUserWidget() const = 0;
+
+	UMG_API static TSharedPtr<const IObjectTableRow> ObjectRowFromUserWidget(const UUserWidget* RowUserWidget)
+	{
+		TWeakPtr<const IObjectTableRow>* ObjectRow = ObjectRowsByUserWidget.Find(RowUserWidget);
+		if (ObjectRow && ObjectRow->IsValid())
+		{
+			return ObjectRow->Pin();
+		}
+		return nullptr;
+	}
+
+protected:
+	// Intentionally being a bit nontraditional here - we track associations between UserWidget rows and their underlying IObjectTableRow.
+	// This allows us to mirror the ITableRow API very easily on IUserListEntry without requiring rote setting/getting of row states on every UMG subclass.
+	UMG_API static TMap<TWeakObjectPtr<const UUserWidget>, TWeakPtr<const IObjectTableRow>> ObjectRowsByUserWidget;
+};
+
+DECLARE_DELEGATE_OneParam(FOnRowHovered, UUserWidget&);
+
+/** 
+ * It's an SObjectWidget! It's an ITableRow! It does it all!
+ *
+ * By using UUserWidget::TakeDerivedWidget<T>(), this class allows UMG to fully leverage the robust Slate list view widgets.
+ * The major gain from this is item virtualization, which is an even bigger deal when unnecessary widgets come with a boatload of additional UObject allocations.
+ * 
+ * The owning UUserWidget is expected to implement the IUserListItem UInterface, which allows the row widget to respond to various list-related events.
+ *
+ * Note: Much of the implementation here matches STableRow<T> exactly, so refer there if looking for additional information.
+ */
+template <typename ItemType>
+class SObjectTableRow : public SObjectWidget, public IObjectTableRow
+{
+public:
+	SLATE_BEGIN_ARGS(SObjectTableRow<ItemType>) {}
+		SLATE_DEFAULT_SLOT(FArguments, Content)
+		SLATE_EVENT(FOnRowHovered, OnHovered)
+		SLATE_EVENT(FOnRowHovered, OnUnhovered)
+	SLATE_END_ARGS()
+
+public:
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView, UUserWidget& InWidgetObject)
+	{
+		WidgetObject = &InWidgetObject;
+		if (ensureMsgf(InWidgetObject.Implements<UUserListEntry>(), TEXT("Any UserWidget generated as a table row must implement the IUserListEntry interface")))
+		{
+			ObjectRowsByUserWidget.Add(&InWidgetObject, SharedThis(this));
+
+			OwnerTablePtr = StaticCastSharedRef<SListView<ItemType>>(InOwnerTableView);
+
+			OnHovered = InArgs._OnHovered;
+			OnUnhovered = InArgs._OnUnhovered;
+
+			ChildSlot
+			[
+				InArgs._Content.Widget
+			];
+		}
+		else
+		{
+			ChildSlot [ SNew(STextBlock).Text(NSLOCTEXT("SObjectTableRow", "InvalidWidgetClass", "Any UserWidget generated as a table row must implement the IUserListEntry interface")) ];
+		}
+	}
+
+	virtual ~SObjectTableRow()
+	{
+		// Remove the association between this widget and its user widget
+		ObjectRowsByUserWidget.Remove(WidgetObject);
+	}
+
+	virtual UUserWidget* GetUserWidget() const
+	{
+		return WidgetObject;
+	}
+
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override
+	{
+		SObjectWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+
+		// List views were built assuming the use of attributes on rows to check on selection status, so there is no
+		// clean way to inform individual rows of changes to the selection state of their current items.
+		// Since event-based selection changes are only really needed in a game scenario, we (crudely) monitor it here to generate events.
+		// If desired, per-item selection events could be added as a longer-term todo
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+		if (bIsAppearingSelected != OwnerTable->Private_IsItemSelected(MyItem))
+		{
+			bIsAppearingSelected = !bIsAppearingSelected;
+			OnItemSelectionChanged(bIsAppearingSelected);
+		}
+	}
+
+	virtual void NotifyItemExpansionChanged(bool bIsExpanded)
+	{
+		if (WidgetObject)
+		{
+			IUserListEntry::UpdateItemExpansion(*WidgetObject, bIsExpanded);
+		}
+	}
+
+	// ITableRow interface
+	virtual void InitializeRow() override final
+	{
+		// ObjectRows can be generated in the widget designer with dummy data, which we want to ignore
+		if (WidgetObject && !WidgetObject->IsDesignTime())
+		{
+			InitializeObjectRow();
+		}
+	}
+
+	virtual void ResetRow() override final
+	{
+		if (WidgetObject && !WidgetObject->IsDesignTime())
+		{
+			ResetObjectRow();
+		}
+	}
+
+	virtual TSharedRef<SWidget> AsWidget() override { return SharedThis(this); }
+	virtual void SetIndexInList(int32 InIndexInList) override { IndexInList = InIndexInList; }
+	virtual TSharedPtr<SWidget> GetContent() override { return ChildSlot.GetChildAt(0); }
+	virtual int32 GetIndentLevel() const override { return OwnerTablePtr.Pin()->Private_GetNestingDepth(IndexInList); }
+	virtual int32 DoesItemHaveChildren() const override { return OwnerTablePtr.Pin()->Private_DoesItemHaveChildren(IndexInList); }
+	virtual void Private_OnExpanderArrowShiftClicked() override { /* Intentionally blank - far too specific to be a valid game UI interaction */ }
+	virtual ESelectionMode::Type GetSelectionMode() const override { return OwnerTablePtr.Pin()->Private_GetSelectionMode(); }
+	virtual FVector2D GetRowSizeForColumn(const FName& InColumnName) const override { return FVector2D::ZeroVector; }
+
+	virtual bool IsItemExpanded() const override
+	{
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+		return OwnerTable->Private_IsItemExpanded(MyItem);
+	}
+
+	virtual void ToggleExpansion() override
+	{
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		if (OwnerTable->Private_DoesItemHaveChildren(IndexInList))
+		{
+			const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+			OwnerTable->Private_SetItemExpansion(MyItem, !OwnerTable->Private_IsItemExpanded(MyItem));
+		}
+	}
+
+	virtual bool IsItemSelected() const override
+	{
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+		return OwnerTable->Private_IsItemSelected(MyItem);
+	}
+
+	virtual TBitArray<> GetWiresNeededByDepth() const override
+	{
+		return OwnerTablePtr.Pin()->Private_GetWiresNeededByDepth(IndexInList);
+	}
+
+	virtual bool IsLastChild() const override
+	{
+		return OwnerTablePtr.Pin()->Private_IsLastChild(IndexInList);
+	}
+
+	// ~ITableRow interface
+
+	// SWidget interface
+	virtual bool SupportsKeyboardFocus() const override { return true; }
+
+	virtual void OnMouseEnter(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		SObjectWidget::OnMouseEnter(MyGeometry, MouseEvent);
+		if (WidgetObject && OnHovered.IsBound())
+		{
+			OnHovered.ExecuteIfBound(*WidgetObject);
+		}
+	}
+
+	virtual void OnMouseLeave(const FPointerEvent& MouseEvent) override
+	{
+		SObjectWidget::OnMouseLeave(MouseEvent);
+		if (WidgetObject && OnUnhovered.IsBound())
+		{
+			OnUnhovered.ExecuteIfBound(*WidgetObject);
+		}
+	}
+
+	virtual FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent) override
+	{
+		if (InMouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+		{
+			TSharedRef<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin().ToSharedRef();
+			OwnerTable->Private_OnItemDoubleClicked(*OwnerTable->Private_ItemFromWidget(this));
+			
+			return FReply::Handled();
+		}
+		return FReply::Unhandled();
+	}
+
+	virtual FReply OnTouchStarted(const FGeometry& MyGeometry, const FPointerEvent& InTouchEvent) override
+	{
+		//TODO: FReply Reply = SObjectWidget::OnTouchStarted(MyGeometry, InTouchEvent);
+		bProcessingSelectionTouch = true;
+
+		return FReply::Handled()
+			.DetectDrag(SharedThis(this), EKeys::LeftMouseButton);
+	}
+
+	virtual FReply OnTouchEnded(const FGeometry& MyGeometry, const FPointerEvent& InTouchEvent) override
+	{
+		FReply Reply = SObjectWidget::OnTouchEnded(MyGeometry, InTouchEvent);
+
+		if (bProcessingSelectionTouch)
+		{
+			bProcessingSelectionTouch = false;
+			TSharedRef<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin().ToSharedRef();
+			if (const ItemType* MyItem = OwnerTable->Private_ItemFromWidget(this))
+			{
+				ESelectionMode::Type SelectionMode = GetSelectionMode();
+				if (SelectionMode != ESelectionMode::None)
+				{
+					const bool bIsSelected = OwnerTable->Private_IsItemSelected(*MyItem);
+					if (!bIsSelected)
+					{
+						if (SelectionMode != ESelectionMode::Multi)
+						{
+							OwnerTable->Private_ClearSelection();
+						}
+						OwnerTable->Private_SetItemSelection(*MyItem, true, true);
+						OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+
+						Reply = FReply::Handled();
+					}
+					else if (SelectionMode == ESelectionMode::SingleToggle || SelectionMode == ESelectionMode::Multi)
+					{
+						OwnerTable->Private_SetItemSelection(*MyItem, true, true);
+						OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+
+						Reply = FReply::Handled();
+					}
+				}
+
+				if (OwnerTable->Private_OnItemClicked(*MyItem))
+				{
+					Reply = FReply::Handled();
+				}
+			}
+		}
+
+		return Reply;
+	}
+
+	virtual FReply OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		if (bProcessingSelectionTouch)
+		{
+			bProcessingSelectionTouch = false;
+			return FReply::Handled().CaptureMouse(OwnerTablePtr.Pin()->AsWidget());
+		}
+		//@todo DanH TableRow: does this potentially trigger twice? If not, why does an unhandled drag detection result in not calling mouse up?
+		else if (HasMouseCapture() && bChangedSelectionOnMouseDown)
+		{
+			TSharedRef<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin().ToSharedRef();
+			OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+		}
+
+		return SObjectWidget::OnDragDetected(MyGeometry, MouseEvent);
+	}
+
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		bChangedSelectionOnMouseDown = false;
+
+		FReply Reply = SObjectWidget::OnMouseButtonDown(MyGeometry, MouseEvent);
+		if (!Reply.IsEventHandled())
+		{
+			TSharedRef<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin().ToSharedRef();
+
+			const ESelectionMode::Type SelectionMode = GetSelectionMode();
+			if (MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton && SelectionMode != ESelectionMode::None)
+			{
+				if (IsItemSelectable())
+				{
+					// New selections are handled on mouse down, deselection is handled on mouse up
+					const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+					if (!OwnerTable->Private_IsItemSelected(MyItem))
+					{
+						if (SelectionMode != ESelectionMode::Multi)
+						{
+							OwnerTable->Private_ClearSelection();
+						}
+						OwnerTable->Private_SetItemSelection(MyItem, true, true);
+						bChangedSelectionOnMouseDown = true;
+					}
+				}
+
+				Reply = FReply::Handled()
+					.DetectDrag(SharedThis(this), EKeys::LeftMouseButton)
+					.SetUserFocus(OwnerTable->AsWidget(), EFocusCause::Mouse)
+					.CaptureMouse(SharedThis(this));
+			}
+		}
+		
+		return Reply;
+	}
+
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		FReply Reply = SObjectWidget::OnMouseButtonUp(MyGeometry, MouseEvent);
+
+		TSharedRef<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin().ToSharedRef();
+		const ItemType* MyItem = OwnerTable->Private_ItemFromWidget(this);
+		if (!Reply.IsEventHandled() && MyItem)
+		{
+			const ESelectionMode::Type SelectionMode = GetSelectionMode();
+			if (MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton && HasMouseCapture())
+			{
+				if (IsItemSelectable() && MyGeometry.IsUnderLocation(MouseEvent.GetScreenSpacePosition()))
+				{
+					if (SelectionMode == ESelectionMode::SingleToggle)
+					{
+						OwnerTable->Private_ClearSelection();
+						OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+
+						Reply = FReply::Handled();
+					}
+					else if (SelectionMode == ESelectionMode::Multi &&
+						OwnerTable->Private_GetNumSelectedItems() > 1 &&
+						OwnerTable->Private_IsItemSelected(*MyItem))
+					{
+						// Releasing mouse over one of the multiple selected items - leave this one as the sole selected item
+						OwnerTable->Private_ClearSelection();
+						OwnerTable->Private_SetItemSelection(*MyItem, true, true);
+						OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+
+						Reply = FReply::Handled();
+					}
+				}
+
+				if (OwnerTable->Private_OnItemClicked(*MyItem))
+				{
+					Reply = FReply::Handled();
+				}
+
+				if (bChangedSelectionOnMouseDown)
+				{
+					Reply = FReply::Handled();
+					OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+				}
+
+				Reply = Reply.ReleaseMouseCapture();
+			}
+			else if (SelectionMode != ESelectionMode::None && MouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+			{
+				// Ignore the right click release if it was being used for scrolling
+				TSharedRef<STableViewBase> OwnerTableViewBase = StaticCastSharedRef<SListView<ItemType>>(OwnerTable);
+				if (!OwnerTableViewBase->IsRightClickScrolling())
+				{
+					if (IsItemSelectable() && !OwnerTable->Private_IsItemSelected(*MyItem))
+					{
+						// If this item isn't selected, it becomes the sole selected item. Otherwise we leave selection untouched.
+						OwnerTable->Private_ClearSelection();
+						OwnerTable->Private_SetItemSelection(*MyItem, true, true);
+						OwnerTable->Private_SignalSelectionChanged(ESelectInfo::OnMouseClick);
+					}
+
+					OwnerTable->Private_OnItemRightClicked(*MyItem, MouseEvent);
+
+					Reply = FReply::Handled();
+				}
+			}
+		}
+
+		return Reply;
+	}
+	// ~SWidget interface
+
+protected:
+	virtual void InitializeObjectRow()
+	{
+		TSharedPtr<ITypedTableView<ItemType>> OwnerTable = OwnerTablePtr.Pin();
+		const ItemType& MyItem = *OwnerTable->Private_ItemFromWidget(this);
+		
+		InitObjectRowInternal(*WidgetObject, MyItem);
+
+		// Unselectable items should never be selected
+		if (!ensure(!OwnerTable->Private_IsItemSelected(MyItem) || IsItemSelectable()))
+		{
+			OwnerTable->Private_SetItemSelection(MyItem, false, false);
+		}
+	}
+
+	virtual void ResetObjectRow()
+	{
+		bIsAppearingSelected = false;
+		if (WidgetObject)
+		{
+			IUserListEntry::ReleaseEntry(*WidgetObject);
+		}
+	}
+
+	virtual void OnItemSelectionChanged(bool bIsItemSelected)
+	{
+		if (WidgetObject)
+		{
+			IUserListEntry::UpdateItemSelection(*WidgetObject, bIsItemSelected);
+		}
+	}
+
+	bool IsItemSelectable() const 
+	{
+		IUserListEntry* NativeListEntryImpl = Cast<IUserListEntry>(WidgetObject);
+		return NativeListEntryImpl ? NativeListEntryImpl->IsListItemSelectable() : true;
+	}
+
+	FOnRowHovered OnHovered;
+	FOnRowHovered OnUnhovered;
+
+	TWeakPtr<ITypedTableView<ItemType>> OwnerTablePtr;
+
+private:
+	void InitObjectRowInternal(UUserWidget& ListEntryWidget, ItemType ListItemObject) {}
+	
+	int32 IndexInList = INDEX_NONE;
+	bool bChangedSelectionOnMouseDown = false;
+	bool bIsAppearingSelected = false;
+
+	bool bProcessingSelectionTouch = false;
+};
+
+template <>
+inline void SObjectTableRow<UObject*>::InitObjectRowInternal(UUserWidget& ListEntryWidget, UObject* ListItemObject)
+{
+	if (ListEntryWidget.Implements<UUserObjectListEntry>())
+	{
+		IUserObjectListEntry::SetListItemObject(*WidgetObject, ListItemObject);
+	}
+}
\ No newline at end of file
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/SObjectWidget.h b/Engine/Source/Runtime/UMG/Public/Slate/SObjectWidget.h
index 58dfad8863a2..3b42a9c181f6 100644
--- a/Engine/Source/Runtime/UMG/Public/Slate/SObjectWidget.h
+++ b/Engine/Source/Runtime/UMG/Public/Slate/SObjectWidget.h
@@ -44,6 +44,7 @@ class UMG_API SObjectWidget : public SCompoundWidget, public FGCObject
 	void ResetWidget();
 
 	// FGCObject interface
+	virtual FString GetReferencerName() const override;
 	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
 	// End of FGCObject interface
 
@@ -51,6 +52,7 @@ class UMG_API SObjectWidget : public SCompoundWidget, public FGCObject
 
 	void SetPadding(const TAttribute<FMargin>& InMargin);
 
+	/** SWidget Tick override.  Note this will not be called if bCanTick is set to false by the UserWidget */
 	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
 	virtual int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const override;
 
@@ -95,8 +97,10 @@ class UMG_API SObjectWidget : public SCompoundWidget, public FGCObject
 
 	virtual FNavigationReply OnNavigation(const FGeometry& MyGeometry, const FNavigationEvent& InNavigationEvent) override;
 
-	virtual void OnMouseCaptureLost() override;
+	virtual void OnMouseCaptureLost(const FCaptureLostEvent& CaptureLostEvent) override;
 
+	void SetCanTick(bool bInCanTick) { bCanTick = bInCanTick; }
+	bool GetCanTick() { return bCanTick; }
 protected:
 
 	/** The UWidget that created this SObjectWidget who needs to be kept alive. */
@@ -109,6 +113,7 @@ private:
 	}
 
 #if SLATE_VERBOSE_NAMED_EVENTS
+	FString DebugName;
 	FString DebugTickEventName;
 	FString DebugPaintEventName;
 #endif
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/SRetainerWidget.h b/Engine/Source/Runtime/UMG/Public/Slate/SRetainerWidget.h
index 8c443c60272e..7f25c2700cf1 100644
--- a/Engine/Source/Runtime/UMG/Public/Slate/SRetainerWidget.h
+++ b/Engine/Source/Runtime/UMG/Public/Slate/SRetainerWidget.h
@@ -22,9 +22,13 @@
 class FArrangedChildren;
 class UMaterialInstanceDynamic;
 class UMaterialInterface;
+class UTextureRenderTarget2D;
+class FRetainerWidgetRenderingResources;
 
 DECLARE_MULTICAST_DELEGATE( FOnRetainedModeChanged );
 
+
+
 /**
  * The SRetainerWidget renders children widgets to a render target first before
  * later rendering that render target to the screen.  This allows both frequency
@@ -32,7 +36,7 @@ DECLARE_MULTICAST_DELEGATE( FOnRetainedModeChanged );
  * frequency of the main game render.  It also has the side benefit of allow materials
  * to be applied to the render target after drawing the widgets to apply a simple post process.
  */
-class UMG_API SRetainerWidget : public SCompoundWidget, public FGCObject, public ILayoutCache
+class UMG_API SRetainerWidget : public SCompoundWidget,  public ILayoutCache
 {
 public:
 	static int32 Shared_MaxRetainerWorkPerFrame;
@@ -60,6 +64,8 @@ public:
 	/** Constructor */
 	void Construct(const FArguments& Args);
 
+	void SetRenderingPhase(int32 Phase, int32 PhaseCount);
+
 	/** Requests that the retainer redraw the hosted content next time it's painted. */
 	void RequestRender();
 
@@ -78,21 +84,12 @@ public:
 	virtual FCachedWidgetNode* CreateCacheNode() const override;
 	// End ILayoutCache
 
-	// FGCObject
-	virtual void AddReferencedObjects(FReferenceCollector& Collector) override;
-	// FGCObject
-
 	// SWidget
 	virtual FChildren* GetChildren() override;
 	virtual bool ComputeVolatility() const override;
 	// SWidget
 
-	virtual bool PaintRetainedContent(const FPaintArgs& Args);
-
-	FORCEINLINE const FGeometry& GetCachedAllottedGeometry() const
-	{
-		return CachedAllottedGeometry;
-	}
+	virtual bool PaintRetainedContent(const FPaintArgs& Args, const FGeometry& AllottedGeometry);
 
 	void SetWorld(UWorld* World);
 
@@ -106,23 +103,20 @@ protected:
 	bool ShouldBeRenderingOffscreen() const;
 	bool IsAnythingVisibleToRender() const;
 	void OnRetainerModeChanged();
-
+	void OnGlobalInvalidate();
 private:
 #if !UE_BUILD_SHIPPING
 	static void OnRetainerModeCVarChanged( IConsoleVariable* CVar );
 	static FOnRetainedModeChanged OnRetainerModeChangedDelegate;
 #endif
-
-	mutable FGeometry CachedAllottedGeometry;
-	mutable FVector2D CachedWindowToDesktopTransform;
-
 	FSimpleSlot EmptyChildSlot;
 
 	mutable FSlateBrush SurfaceBrush;
 
+	mutable FVector2D PreviousRenderSize;
+
 	void UpdateWidgetRenderer();
-	mutable TSharedPtr<class FWidgetRenderer> WidgetRenderer;
-	mutable class UTextureRenderTarget2D* RenderTarget;
+
 	mutable TSharedPtr<SWidget> MyWidget;
 
 	bool bEnableRetainedRenderingDesire;
@@ -142,10 +136,12 @@ private:
 	TSharedPtr<SVirtualWindow> Window;
 	TWeakObjectPtr<UWorld> OuterWorld;
 
+	FRetainerWidgetRenderingResources* RenderingResources;
+
 	STAT(TStatId MyStatId;)
 
-	FSlateBrush DynaicBrush;
-	UMaterialInstanceDynamic* DynamicEffect;
+	FSlateBrush DynamicBrush;
+
 	FName DynamicEffectTextureParameter;
 
 	static TArray<SRetainerWidget*, TInlineAllocator<3>> Shared_WaitingToRender;
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/SlateDataSheet.h b/Engine/Source/Runtime/UMG/Public/Slate/SlateDataSheet.h
deleted file mode 100644
index 07adc0dcaebf..000000000000
--- a/Engine/Source/Runtime/UMG/Public/Slate/SlateDataSheet.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-
-#include "CoreMinimal.h"
-#include "UObject/ObjectMacros.h"
-#include "UObject/Object.h"
-#include "RHI.h"
-#include "SlateDataSheet.generated.h"
-
-class UTexture2D;
-
-/**
- * A texture used for communicating data to the GPU.
- * Used in combination with SlateVectorArtData and SlateVectorArtInstanceData to
- * pass data to UI materials.
- */
-UCLASS()
-class UMG_API USlateDataSheet : public UObject
-{
-	GENERATED_UCLASS_BODY()
-
-public:
-	void Init();
-
-	void SetUnitFloat(uint32 Address, int32 Value);
-	
-	FORCEINLINE_DEBUGGABLE void SetUnitFloat(uint32 Address, float Value)
-	{
-		SetUINT24(Address, FMath::RoundToInt(Value * (256 * 256 * 256 - 1)));
-	}
-
-	FORCEINLINE_DEBUGGABLE void SetUINT24(uint32 Address, int32 Value)
-	{
-		FColor& Texel = (Data[Address]);
-		Texel.R = (uint8)(Value & 0x000000FF);
-		Texel.G = (uint8)((Value & 0x0000FF00) >> 8);
-		Texel.B = (uint8)((Value & 0x00FF0000) >> 16);
-		Texel.A = (uint8)((Value & 0x00000000));
-	}
-	
-	void SetUINT24(uint32 Address, float Value);
-
-	void EnqueueUpdateToGPU();
-
-	UTexture2D* GetTexture() const;
-
-protected:
-
-	static const uint32 Data_Width = 256;
-	static const uint32 Data_Height = 1;
-	static const uint32 Data_PixelSize = sizeof(FColor);
-	static const FUpdateTextureRegion2D DataSheetUpdateRegion;
-
-	UPROPERTY(Transient)
-	UTexture2D* DataTexture;
-
-	FColor Data[Data_Width * Data_Height];
-
-
-	
-
-	
-
-
-
-};
-
-
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/UMGDragDropOp.h b/Engine/Source/Runtime/UMG/Public/Slate/UMGDragDropOp.h
index 49b9d25a2af0..e25a58e61870 100644
--- a/Engine/Source/Runtime/UMG/Public/Slate/UMGDragDropOp.h
+++ b/Engine/Source/Runtime/UMG/Public/Slate/UMGDragDropOp.h
@@ -21,7 +21,7 @@ class FUMGDragDropOp : public FGameDragDropOperation, public FGCObject
 public:
 	DRAG_DROP_OPERATOR_TYPE(FUMGDragDropOp, FGameDragDropOperation)
 	
-	static TSharedRef<FUMGDragDropOp> New(UDragDropOperation* Operation, const FVector2D &CursorPosition, const FVector2D &ScreenPositionOfNode, float DPIScale, TSharedPtr<SObjectWidget> SourceUserWidget);
+	static TSharedRef<FUMGDragDropOp> New(UDragDropOperation* Operation, const int32 PointerIndex, const FVector2D &CursorPosition, const FVector2D &ScreenPositionOfNode, float DPIScale, TSharedPtr<SObjectWidget> SourceUserWidget);
 
 	FUMGDragDropOp();
 
@@ -59,6 +59,8 @@ private:
 	/** The starting screen location where the drag operation started. */
 	FVector2D StartingScreenPos;
 
+	int32 PointerIndex;
+
 	/** Allows smooth interpolation of the dragged visual over a few frames. */
 	double StartTime;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/Slate/WidgetRenderer.h b/Engine/Source/Runtime/UMG/Public/Slate/WidgetRenderer.h
index 915d2e17461b..9714e91464a6 100644
--- a/Engine/Source/Runtime/UMG/Public/Slate/WidgetRenderer.h
+++ b/Engine/Source/Runtime/UMG/Public/Slate/WidgetRenderer.h
@@ -23,7 +23,7 @@ class UTextureRenderTarget2D;
 /**
  * 
  */
-class UMG_API FWidgetRenderer
+class UMG_API FWidgetRenderer : public FDeferredCleanupInterface
 {
 public:
 	FWidgetRenderer(bool bUseGammaCorrection = false, bool bInClearTarget = true);
@@ -50,7 +50,8 @@ public:
 		UTextureRenderTarget2D* RenderTarget,
 		const TSharedRef<SWidget>& Widget,
 		FVector2D DrawSize,
-		float DeltaTime);
+		float DeltaTime,
+		bool bDeferRenderTargetUpdate = false);
 
 	void DrawWindow(
 		UTextureRenderTarget2D* RenderTarget,
@@ -58,7 +59,8 @@ public:
 		TSharedRef<SWindow> Window,
 		float Scale,
 		FVector2D DrawSize,
-		float DeltaTime);
+		float DeltaTime,
+		bool bDeferRenderTargetUpdate = false);
 
 	void DrawWindow(
 		UTextureRenderTarget2D* RenderTarget,
@@ -66,7 +68,8 @@ public:
 		TSharedRef<SWindow> Window,
 		FGeometry WindowGeometry,
 		FSlateRect WindowClipRect,
-		float DeltaTime);
+		float DeltaTime,
+		bool bDeferRenderTargetUpdate = false);
 
 	void DrawWindow(
 		const FPaintArgs& PaintArgs,
@@ -74,10 +77,13 @@ public:
 		TSharedRef<SWindow> Window,
 		FGeometry WindowGeometry,
 		FSlateRect WindowClipRect,
-		float DeltaTime);
+		float DeltaTime,
+		bool bDeferRenderTargetUpdate = false);
 
 	TArray< TSharedPtr<FSlateWindowElementList::FDeferredPaint> > DeferredPaints;
 
+	/** FDeferredCleanup interface */
+	virtual void FinishCleanup();
 private:
 	/** The slate 3D renderer used to render the user slate widget */
 	TSharedPtr<ISlate3DRenderer, ESPMode::ThreadSafe> Renderer;
@@ -89,7 +95,6 @@ private:
 	bool bUseGammaSpace;
 	/** Should we clear the render target before rendering. */
 	bool bClearTarget;
-
 public:
 	FVector2D ViewOffset;
 };
diff --git a/Engine/Source/Runtime/UMG/Public/UMG.h b/Engine/Source/Runtime/UMG/Public/UMG.h
index 7ce4cec21b09..db3f8cfa8e79 100644
--- a/Engine/Source/Runtime/UMG/Public/UMG.h
+++ b/Engine/Source/Runtime/UMG/Public/UMG.h
@@ -124,9 +124,9 @@ MONOLITHIC_HEADER_BOILERPLATE()
 #include "Components/Throbber.h"
 #include "Components/CircularThrobber.h"
 
-#include "Components/TableViewBase.h"
 #include "Components/ListView.h"
 #include "Components/TileView.h"
+#include "Components/TreeView.h"
 
 #include "Components/Viewport.h"
 
diff --git a/Engine/Source/Runtime/UMG/UMG.Build.cs b/Engine/Source/Runtime/UMG/UMG.Build.cs
index e320c2a188ea..3964cf0c09f4 100644
--- a/Engine/Source/Runtime/UMG/UMG.Build.cs
+++ b/Engine/Source/Runtime/UMG/UMG.Build.cs
@@ -57,6 +57,15 @@ public class UMG : ModuleRules
 				    "SlateRHIRenderer",
 			    }
             );
-		};
+		}
+
+		if (Target.Type == TargetType.Editor)
+		{
+			PublicDependencyModuleNames.AddRange(
+				new string[] {
+					"UnrealEd",
+				}
+			);
+		}
 	}
 }
diff --git a/Engine/Source/Runtime/VulkanRHI/Public/VulkanDynamicRHI.h b/Engine/Source/Runtime/VulkanRHI/Public/VulkanDynamicRHI.h
index 82ffe11892ea..bec771660b80 100644
--- a/Engine/Source/Runtime/VulkanRHI/Public/VulkanDynamicRHI.h
+++ b/Engine/Source/Runtime/VulkanRHI/Public/VulkanDynamicRHI.h
@@ -131,7 +131,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef Viewport, uint32 SizeX, uint32 SizeY, bool bIsFullscreen) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets, const FVertexBufferRHIParamRef* VertexBuffers, const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask) final override {}
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual void RHISubmitCommandsAndFlushGPU() final override;
 	virtual void RHISuspendRendering() final override;
diff --git a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.cpp b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.cpp
new file mode 100644
index 000000000000..289b8757df9e
--- /dev/null
+++ b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.cpp
@@ -0,0 +1,57 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#include "IOSCookieManager.h"
+
+#if PLATFORM_IOS
+#import <Foundation/Foundation.h>
+#include "IOS/IOSAsyncTask.h"
+
+FIOSCookieManager::FIOSCookieManager()
+{
+}
+
+FIOSCookieManager::~FIOSCookieManager()
+{
+}
+
+void FIOSCookieManager::SetCookie(const FString& URL, const FCookie& Cookie, TFunction<void(bool)> Completed)
+{
+	// not implemented
+	if (Completed)
+	{
+		Completed(false);
+	}
+}
+
+void FIOSCookieManager::DeleteCookies(const FString& URL, const FString& CookieName, TFunction<void(int)> Completed)
+{
+	dispatch_async(dispatch_get_main_queue(), ^
+	{
+		// Delete matching cookies
+		NSHTTPCookie* Cookie;
+		NSHTTPCookieStorage* Storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+		for (Cookie in[Storage cookies])
+		{
+			FString Domain([Cookie domain]);
+			FString Path([Cookie path]);
+			FString CookieUrl = Domain + Path;
+			
+			if (CookieUrl.Contains(URL) || URL.IsEmpty())
+			{
+				[Storage deleteCookie:Cookie];
+			}
+		}
+		
+		// Notify on the game thread
+		[FIOSAsyncTask CreateTaskWithBlock:^bool(void)
+		 {
+			 if (Completed)
+			 {
+				 Completed(true);
+			 }
+			 return true;
+		 }];
+	});
+}
+
+#endif
diff --git a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.h b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.h
new file mode 100644
index 000000000000..1e350b90db5a
--- /dev/null
+++ b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSCookieManager.h
@@ -0,0 +1,29 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+#if PLATFORM_IOS
+#include "IWebBrowserCookieManager.h"
+
+/**
+ * Implementation of interface for dealing with a Web Browser cookies for iOS.
+ */
+class FIOSCookieManager
+	: public IWebBrowserCookieManager
+	, public TSharedFromThis<FIOSCookieManager>
+{
+public:
+
+	// IWebBrowserCookieManager interface
+
+	virtual void SetCookie(const FString& URL, const FCookie& Cookie, TFunction<void(bool)> Completed = nullptr) override;
+	virtual void DeleteCookies(const FString& URL = TEXT(""), const FString& CookieName = TEXT(""), TFunction<void(int)> Completed = nullptr) override;
+
+	// FIOSCookieManager
+
+	FIOSCookieManager();
+	virtual ~FIOSCookieManager();
+};
+#endif
diff --git a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.cpp b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.cpp
index 9608da5c6485..b674df42d4af 100644
--- a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.cpp
+++ b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.cpp
@@ -12,6 +12,277 @@
 #include <OpenGLES/ES2/glext.h>
 #include "ExternalTexture.h"
 
+class SIOSWebBrowserWidget : public SLeafWidget
+{
+	SLATE_BEGIN_ARGS(SIOSWebBrowserWidget)
+		: _InitialURL("about:blank")
+		, _UseTransparency(false)
+	{ }
+
+	SLATE_ARGUMENT(FString, InitialURL);
+	SLATE_ARGUMENT(bool, UseTransparency);
+	SLATE_ARGUMENT(TSharedPtr<FWebBrowserWindow>, WebBrowserWindow);
+
+	SLATE_END_ARGS()
+
+		SIOSWebBrowserWidget()
+		: WebViewWrapper(nil)
+	{}
+
+	void Construct(const FArguments& Args)
+	{
+		bool bSupportsMetalMRT = false;
+		GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bSupportsMetalMRT"), bSupportsMetalMRT, GEngineIni);
+
+		bool bSupportsMetal = false;
+		GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bSupportsMetal"), bSupportsMetal, GEngineIni);
+
+		WebViewWrapper = [IOSWebViewWrapper alloc];
+		[WebViewWrapper create : TSharedPtr<SIOSWebBrowserWidget>(this) useTransparency : Args._UseTransparency supportsMetal : bSupportsMetal supportsMetalMRT : bSupportsMetalMRT];
+
+		WebBrowserWindowPtr = Args._WebBrowserWindow;
+		IsIOS3DBrowser = false;
+
+#if !PLATFORM_TVOS
+		TextureSamplePool = new FWebBrowserTextureSamplePool();
+		WebBrowserTextureSamplesQueue = MakeShared<FWebBrowserTextureSampleQueue, ESPMode::ThreadSafe>();
+		WebBrowserTexture = nullptr;
+		WebBrowserMaterial = nullptr;
+		WebBrowserBrush = nullptr;
+
+		// create external texture
+		WebBrowserTexture = NewObject<UWebBrowserTexture>((UObject*)GetTransientPackage(), NAME_None, RF_Transient | RF_Public);
+
+		if (WebBrowserTexture != nullptr)
+		{
+			WebBrowserTexture->UpdateResource();
+			WebBrowserTexture->AddToRoot();
+		}
+
+		// create wrapper material
+		UMaterial* Material = LoadObject<UMaterial>(nullptr, TEXT("/WebBrowserWidget/WebTexture_M"), nullptr, LOAD_None, nullptr);
+		if (Material)
+		{
+			// create wrapper material
+			WebBrowserMaterial = UMaterialInstanceDynamic::Create(Material, nullptr);
+
+			if (WebBrowserMaterial)
+			{
+				WebBrowserMaterial->SetTextureParameterValue("SlateUI", WebBrowserTexture);
+				WebBrowserMaterial->AddToRoot();
+
+				// create Slate brush
+				WebBrowserBrush = MakeShareable(new FSlateBrush());
+				{
+					WebBrowserBrush->SetResourceObject(WebBrowserMaterial);
+				}
+			}
+		}
+#endif
+		LoadURL(Args._InitialURL);
+	}
+
+
+	void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+	{
+		if (WebViewWrapper != nil)
+		{
+			if (WebBrowserWindowPtr.IsValid() && WebBrowserWindowPtr.Pin()->GetParentWindow().IsValid())
+			{
+				bool ShouldSet3DBrowser = WebBrowserWindowPtr.Pin()->GetParentWindow().Get()->IsVirtualWindow();
+				if (IsIOS3DBrowser != ShouldSet3DBrowser)
+				{
+					IsIOS3DBrowser = ShouldSet3DBrowser;
+					[WebViewWrapper set3D : IsIOS3DBrowser];
+				}
+			}
+
+			UIView* View = [IOSAppDelegate GetDelegate].IOSView;
+			CGFloat contentScaleFactor = View.contentScaleFactor;
+			FVector2D Position = AllottedGeometry.GetAccumulatedRenderTransform().GetTranslation() / contentScaleFactor;
+			FVector2D Size = TransformVector(AllottedGeometry.GetAccumulatedRenderTransform(), AllottedGeometry.GetLocalSize()) / contentScaleFactor;
+			CGRect NewFrame;
+			NewFrame.origin.x = FMath::RoundToInt(Position.X);
+			NewFrame.origin.y = FMath::RoundToInt(Position.Y);
+			NewFrame.size.width = FMath::RoundToInt(Size.X);
+			NewFrame.size.height = FMath::RoundToInt(Size.Y);
+
+			[WebViewWrapper updateframe : NewFrame];
+
+#if !PLATFORM_TVOS
+			if (IsIOS3DBrowser)
+			{
+				if (WebBrowserTexture)
+				{
+					TSharedPtr<FWebBrowserTextureSample, ESPMode::ThreadSafe> WebBrowserTextureSample;
+					WebBrowserTextureSamplesQueue->Peek(WebBrowserTextureSample);
+
+					WebBrowserTexture->TickResource(WebBrowserTextureSample);
+				}
+
+				if (WebBrowserTexture != nullptr)
+				{
+					struct FWriteWebBrowserParams
+					{
+						IOSWebViewWrapper* NativeWebBrowserPtr;
+						FGuid PlayerGuid;
+						FIntPoint Size;
+					};
+
+					FIntPoint viewportSize = WebBrowserWindowPtr.Pin()->GetViewportSize();
+
+					FWriteWebBrowserParams WriteWebBrowserParams = { WebViewWrapper, WebBrowserTexture->GetExternalTextureGuid(), viewportSize };
+
+					ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(WriteWebBrowser, FWriteWebBrowserParams, Params, WriteWebBrowserParams,
+					{
+						IOSWebViewWrapper* NativeWebBrowser = Params.NativeWebBrowserPtr;
+
+					if (NativeWebBrowser == nil)
+					{
+						return;
+					}
+
+					FTextureRHIRef VideoTexture = [NativeWebBrowser GetVideoTexture];
+					if (VideoTexture == nullptr)
+					{
+						FRHIResourceCreateInfo CreateInfo;
+						FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
+						FIntPoint Size = Params.Size;
+						VideoTexture = RHICmdList.CreateTextureExternal2D(Size.X, Size.Y, PF_R8G8B8A8, 1, 1, 0, CreateInfo);
+						[NativeWebBrowser SetVideoTexture : VideoTexture];
+						//UE_LOG(LogIOS, Log, TEXT("NativeWebBrowser SetVideoTexture:VideoTexture!"));
+
+						if (VideoTexture == nullptr)
+						{
+							UE_LOG(LogIOS, Warning, TEXT("CreateTextureExternal2D failed!"));
+							return;
+						}
+
+						[NativeWebBrowser SetVideoTextureValid : false];
+
+					}
+
+					if ([NativeWebBrowser UpdateVideoFrame : VideoTexture->GetNativeResource()])
+					{
+						// if region changed, need to reregister UV scale/offset
+						//UE_LOG(LogIOS, Log, TEXT("UpdateVideoFrame RT: %s"), *Params.PlayerGuid.ToString());
+					}
+
+					if (![NativeWebBrowser IsVideoTextureValid])
+					{
+						FSamplerStateInitializerRHI SamplerStateInitializer(SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp);
+						FSamplerStateRHIRef SamplerStateRHI = RHICreateSamplerState(SamplerStateInitializer);
+						FExternalTextureRegistry::Get().RegisterExternalTexture(Params.PlayerGuid, VideoTexture, SamplerStateRHI);
+						//UE_LOG(LogIOS, Log, TEXT("Fetch RT: Register Guid: %s"), *Params.PlayerGuid.ToString());
+
+						[NativeWebBrowser SetVideoTextureValid : true];
+					}
+					});
+				}
+			}
+#endif
+		}
+
+	}
+
+	int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
+	{
+#if !PLATFORM_TVOS
+		if (IsIOS3DBrowser && WebBrowserBrush.IsValid())
+		{
+			FSlateDrawElement::MakeBox(OutDrawElements, LayerId, AllottedGeometry.ToPaintGeometry(), WebBrowserBrush.Get(), ESlateDrawEffect::None);
+		}
+#endif
+		return LayerId;
+	}
+
+	virtual FVector2D ComputeDesiredSize(float) const override
+	{
+		return FVector2D(640, 480);
+	}
+
+	void LoadURL(const FString& InNewURL)
+	{
+		if (WebViewWrapper != nil)
+		{
+			[WebViewWrapper loadurl : [NSURL URLWithString : [NSString stringWithUTF8String : TCHAR_TO_UTF8(*InNewURL)]]];
+		}
+	}
+
+	void LoadString(const FString& InContents, const FString& InDummyURL)
+	{
+		if (WebViewWrapper != nil)
+		{
+			[WebViewWrapper loadstring : [NSString stringWithUTF8String : TCHAR_TO_UTF8(*InContents)] dummyurl : [NSURL URLWithString : [NSString stringWithUTF8String : TCHAR_TO_UTF8(*InDummyURL)]]];
+		}
+	}
+
+	bool OnBeforeBrowse(const FString& Url, const FWebNavigationRequest& RequestDetails)
+	{
+		bool Retval = false;
+		if (WebBrowserWindowPtr.IsValid())
+		{
+			TSharedPtr<FWebBrowserWindow> BrowserWindow = WebBrowserWindowPtr.Pin();
+			if (BrowserWindow.IsValid())
+			{
+				if (BrowserWindow->OnBeforeBrowse().IsBound())
+				{
+					Retval = BrowserWindow->OnBeforeBrowse().Execute(Url, RequestDetails);
+				}
+			}
+		}
+		return Retval;
+	}
+
+	void ExecuteJavascript(const FString& Script)
+	{
+		if (WebViewWrapper != nil)
+		{
+			[WebViewWrapper executejavascript : [NSString stringWithUTF8String : TCHAR_TO_UTF8(*Script)]];
+		}
+	}
+
+	void Close()
+	{
+		if (WebViewWrapper != nil)
+		{
+			[WebViewWrapper close];
+			WebViewWrapper = nil;
+		}
+		WebBrowserWindowPtr.Reset();
+	}
+
+	~SIOSWebBrowserWidget()
+	{
+		Close();
+	}
+
+protected:
+	mutable __strong IOSWebViewWrapper* WebViewWrapper;
+private:
+	TWeakPtr<FWebBrowserWindow> WebBrowserWindowPtr;
+
+	/** Enable 3D appearance */
+	bool IsIOS3DBrowser;
+
+#if !PLATFORM_TVOS
+	/** The external texture to render the webbrowser output. */
+	UWebBrowserTexture* WebBrowserTexture;
+
+	/** The material for the external texture. */
+	UMaterialInstanceDynamic* WebBrowserMaterial;
+
+	/** The Slate brush that renders the material. */
+	TSharedPtr<FSlateBrush> WebBrowserBrush;
+
+	/** The sample queue. */
+	TSharedPtr<FWebBrowserTextureSampleQueue, ESPMode::ThreadSafe> WebBrowserTextureSamplesQueue;
+
+	/** Texture sample object pool. */
+	FWebBrowserTextureSamplePool* TextureSamplePool;
+#endif
+};
+
 @implementation IOSWebViewWrapper
 
 #if !PLATFORM_TVOS
@@ -21,8 +292,8 @@
 @synthesize NextURL;
 @synthesize NextContent;
 
--(void)create:(TSharedPtr<SIOSWebBrowserWidget>)InWebBrowserWidget useTransparency:(bool)InUseTransparency 
-		supportsMetal:(bool)InSupportsMetal supportsMetalMRT:(bool)InSupportsMetalMRT;
+-(void)create:(TSharedPtr<SIOSWebBrowserWidget>)InWebBrowserWidget useTransparency : (bool)InUseTransparency
+supportsMetal : (bool)InSupportsMetal supportsMetalMRT : (bool)InSupportsMetalMRT;
 {
 	WebBrowserWidget = InWebBrowserWidget;
 	NextURL = nil;
@@ -44,15 +315,16 @@
 
 		WebView = [[WKWebView alloc]initWithFrame:CGRectMake(1, 1, 100, 100)];
 		WebView.navigationDelegate = self;
+		WebView.scrollView.bounces = NO;
 
 		if (InUseTransparency)
 		{
-			[self.WebView setOpaque:NO];
-			[self.WebView setBackgroundColor:[UIColor clearColor]];
+			[self.WebView setOpaque : NO];
+			[self.WebView setBackgroundColor : [UIColor clearColor]];
 		}
 		else
 		{
-			[self.WebView setOpaque:YES];
+			[self.WebView setOpaque : YES];
 		}
 
 		[self.WebViewContainer addSubview : WebView];
@@ -69,9 +341,9 @@
 	dispatch_async(dispatch_get_main_queue(), ^
 	{
 		[self.WebViewContainer removeFromSuperview];
-		[self.WebView removeFromSuperview];
-		WebView = nil;
-		WebViewContainer = nil;
+	[self.WebView removeFromSuperview];
+	WebView = nil;
+	WebViewContainer = nil;
 	});
 #endif
 }
@@ -83,31 +355,31 @@
 #if !PLATFORM_TVOS
 	dispatch_async(dispatch_get_main_queue(), ^
 	{
-		if(WebView != nil)
+		if (WebView != nil)
 		{
 			WebView.frame = self.DesiredFrame;
-			if(bNeedsAddToView)
+			if (bNeedsAddToView)
 			{
 				bNeedsAddToView = false;
-				[[IOSAppDelegate GetDelegate].IOSView addSubview: WebViewContainer];
+				[[IOSAppDelegate GetDelegate].IOSView addSubview : WebViewContainer];
 			}
 			else
 			{
-				if(NextContent != nil)
+				if (NextContent != nil)
 				{
 					// Load web content from string
-					[self.WebView loadHTMLString:NextContent baseURL:NextURL];
+					[self.WebView loadHTMLString : NextContent baseURL : NextURL];
 					NextContent = nil;
 					NextURL = nil;
 				}
 				else
-				if(NextURL != nil)
-				{
-					// Load web content from URL
-					NSURLRequest *nsrequest = [NSURLRequest requestWithURL:NextURL];
-					[self.WebView loadRequest : nsrequest];
-					NextURL = nil;
-				}
+					if (NextURL != nil)
+					{
+						// Load web content from URL
+						NSURLRequest *nsrequest = [NSURLRequest requestWithURL : NextURL];
+						[self.WebView loadRequest : nsrequest];
+						NextURL = nil;
+					}
 			}
 		}
 	});
@@ -119,7 +391,7 @@
 #if !PLATFORM_TVOS
 	dispatch_async(dispatch_get_main_queue(), ^
 	{
-		[self.WebView evaluateJavaScript : InJavaScript completionHandler:nil];
+		[self.WebView evaluateJavaScript : InJavaScript completionHandler : nil];
 	});
 #endif
 }
@@ -132,12 +404,12 @@
 	});
 }
 
--(void)loadstring:(NSString*)InString dummyurl:(NSURL*)InURL;
+-(void)loadstring:(NSString*)InString dummyurl : (NSURL*)InURL;
 {
 	dispatch_async(dispatch_get_main_queue(), ^
 	{
 		self.NextContent = InString;
-		self.NextURL = InURL;
+	self.NextURL = InURL;
 	});
 }
 
@@ -190,22 +462,22 @@
 -(bool)UpdateVideoFrame:(void*)ptr;
 {
 #if !PLATFORM_TVOS
-		@synchronized(self) // Briefly block render thread
+	@synchronized(self) // Briefly block render thread
 		{
-			if (bSupportsMetal)
-			{
-				id<MTLTexture> ptrToMetalTexture = (id<MTLTexture>)ptr;
-				NSUInteger width = [ptrToMetalTexture width];
-				NSUInteger height = [ptrToMetalTexture height];
+		if (bSupportsMetal)
+		{
+			id<MTLTexture> ptrToMetalTexture = (id<MTLTexture>)ptr;
+			NSUInteger width = [ptrToMetalTexture width];
+			NSUInteger height = [ptrToMetalTexture height];
 
-				[self updateWebViewMetalTexture : ptrToMetalTexture];
-			}
-			else
-			{
-				GLuint glTexture = (GLuint)*reinterpret_cast<int32*>(ptr);
-				glBindTexture(GL_TEXTURE_2D, glTexture);
-				[self updateWebViewGLESTexture : glTexture];
-			}
+			[self updateWebViewMetalTexture : ptrToMetalTexture];
+		}
+		else
+		{
+			GLuint glTexture = (GLuint)*reinterpret_cast<int32*>(ptr);
+			glBindTexture(GL_TEXTURE_2D, glTexture);
+			[self updateWebViewGLESTexture : glTexture];
+		}
 		}
 #endif
 	return true;
@@ -251,268 +523,40 @@
 	}
 #endif
 }
-@end
 
-class SIOSWebBrowserWidget : public SLeafWidget
+#if !PLATFORM_TVOS
+- (BOOL)webView:(UIWebView*)InWebView
+shouldStartLoadWithRequest : (NSURLRequest*)InRequest
+	navigationType : (UIWebViewNavigationType)InNavigationType;
 {
-	SLATE_BEGIN_ARGS(SIOSWebBrowserWidget)
-		: _InitialURL("about:blank")
-		, _UseTransparency(false)
-	{ }
-	
-		SLATE_ARGUMENT(FString, InitialURL);
-		SLATE_ARGUMENT(bool, UseTransparency);
-		SLATE_ARGUMENT(TSharedPtr<FWebBrowserWindow>, WebBrowserWindow);
-	
-	SLATE_END_ARGS()
+	FString UrlStr([[InRequest URL]absoluteString]);
 
-	SIOSWebBrowserWidget()
-	: WebViewWrapper(nil)
-	{}
-
-	void Construct(const FArguments& Args)
+	// Notify on the game thread
+	[FIOSAsyncTask CreateTaskWithBlock : ^ bool(void)
 	{
-		bool bSupportsMetalMRT = false;
-		GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bSupportsMetalMRT"), bSupportsMetalMRT, GEngineIni);
+		FWebNavigationRequest RequestDetails;
+		//@todo sz - not sure how to detect redirects here .. InNavigationType == UIWebViewNavigationTypeOther?
+		RequestDetails.bIsRedirect = true;
+		RequestDetails.bIsMainFrame = true;
+		WebBrowserWidget->OnBeforeBrowse(UrlStr, RequestDetails);
+		return true;
+	}];
 
-		bool bSupportsMetal = false;
-		GConfig->GetBool(TEXT("/Script/IOSRuntimeSettings.IOSRuntimeSettings"), TEXT("bSupportsMetal"), bSupportsMetal, GEngineIni);
+	return YES;
+}
 
-		WebViewWrapper = [IOSWebViewWrapper alloc];
-		[WebViewWrapper create: TSharedPtr<SIOSWebBrowserWidget>(this) useTransparency:Args._UseTransparency supportsMetal:bSupportsMetal supportsMetalMRT: bSupportsMetalMRT];
+-(void)webView:(UIWebView*)InWebView didFailLoadWithError : (NSError*)InError;
+{
 
-		WebBrowserWindowPtr = Args._WebBrowserWindow;
-		IsIOS3DBrowser = false;
-
-#if !PLATFORM_TVOS
-		TextureSamplePool = new FWebBrowserTextureSamplePool();
-		WebBrowserTextureSamplesQueue = MakeShared<FWebBrowserTextureSampleQueue, ESPMode::ThreadSafe>();
-		WebBrowserTexture = nullptr;
-		WebBrowserMaterial = nullptr;
-		WebBrowserBrush = nullptr;
-
-		// create external texture
-		WebBrowserTexture = NewObject<UWebBrowserTexture>((UObject*)GetTransientPackage(), NAME_None, RF_Transient | RF_Public);
-
-		if (WebBrowserTexture != nullptr)
-		{
-			WebBrowserTexture->UpdateResource();
-			WebBrowserTexture->AddToRoot();
-		}
-
-		// create wrapper material
-		UMaterial* Material = LoadObject<UMaterial>(nullptr, TEXT("/WebBrowserWidget/WebTexture_M"), nullptr, LOAD_None, nullptr);
-		if (Material)
-		{
-			// create wrapper material
-			WebBrowserMaterial = UMaterialInstanceDynamic::Create(Material, nullptr);
-
-			if (WebBrowserMaterial)
-			{
-				WebBrowserMaterial->SetTextureParameterValue("SlateUI", WebBrowserTexture);
-				WebBrowserMaterial->AddToRoot();
-
-				// create Slate brush
-				WebBrowserBrush = MakeShareable(new FSlateBrush());
-				{
-					WebBrowserBrush->SetResourceObject(WebBrowserMaterial);
-				}
-			}
-		}
+}
 #endif
-		LoadURL(Args._InitialURL);
-	}
-
-
-	void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
-	{
-		if(WebViewWrapper != nil)
-		{
-			if (WebBrowserWindowPtr.IsValid() && WebBrowserWindowPtr.Pin()->GetParentWindow().IsValid())
-			{
-				bool ShouldSet3DBrowser = WebBrowserWindowPtr.Pin()->GetParentWindow().Get()->IsVirtualWindow();
-				if (IsIOS3DBrowser != ShouldSet3DBrowser)
-				{
-					IsIOS3DBrowser = ShouldSet3DBrowser;
-					[WebViewWrapper set3D : IsIOS3DBrowser];
-				}
-			}
-
-			UIView* View = [IOSAppDelegate GetDelegate].IOSView;
-			CGFloat contentScaleFactor = View.contentScaleFactor;
-			FVector2D Position = AllottedGeometry.GetAccumulatedRenderTransform().GetTranslation() / contentScaleFactor;
-			FVector2D Size = TransformVector(AllottedGeometry.GetAccumulatedRenderTransform(), AllottedGeometry.GetLocalSize()) / contentScaleFactor;
-			CGRect NewFrame;
-			NewFrame.origin.x = FMath::RoundToInt(Position.X);
-			NewFrame.origin.y = FMath::RoundToInt(Position.Y);
-			NewFrame.size.width = FMath::RoundToInt(Size.X);
-			NewFrame.size.height = FMath::RoundToInt(Size.Y);
-
-			[WebViewWrapper updateframe:NewFrame];
-
-#if !PLATFORM_TVOS
-			if (IsIOS3DBrowser)
-			{
-				if (WebBrowserTexture)
-				{
-					TSharedPtr<FWebBrowserTextureSample, ESPMode::ThreadSafe> WebBrowserTextureSample;
-					WebBrowserTextureSamplesQueue->Peek(WebBrowserTextureSample);
-
-					WebBrowserTexture->TickResource(WebBrowserTextureSample);
-				}
-					
-				if ( WebBrowserTexture != nullptr)
-				{
-					struct FWriteWebBrowserParams
-					{
-						IOSWebViewWrapper* NativeWebBrowserPtr;
-						FGuid PlayerGuid;
-						FIntPoint Size;
-					};
-
-					FIntPoint viewportSize = WebBrowserWindowPtr.Pin()->GetViewportSize();
-
-					FWriteWebBrowserParams WriteWebBrowserParams = { WebViewWrapper, WebBrowserTexture->GetExternalTextureGuid(), viewportSize };
-
-					ENQUEUE_UNIQUE_RENDER_COMMAND_ONEPARAMETER(WriteWebBrowser, FWriteWebBrowserParams, Params, WriteWebBrowserParams,
-					{
-						IOSWebViewWrapper* NativeWebBrowser = Params.NativeWebBrowserPtr;
-
-						if (NativeWebBrowser == nil)
-						{
-							return;
-						}
-
-						FTextureRHIRef VideoTexture = [NativeWebBrowser GetVideoTexture];
-						if (VideoTexture == nullptr)
-						{
-							FRHIResourceCreateInfo CreateInfo;
-							FRHICommandListImmediate& RHICmdList = FRHICommandListExecutor::GetImmediateCommandList();
-							FIntPoint Size = Params.Size;
-							VideoTexture = RHICmdList.CreateTextureExternal2D(Size.X, Size.Y, PF_R8G8B8A8, 1, 1, 0, CreateInfo);
-							[NativeWebBrowser SetVideoTexture:VideoTexture];
-							//UE_LOG(LogIOS, Log, TEXT("NativeWebBrowser SetVideoTexture:VideoTexture!"));
-
-							if (VideoTexture == nullptr)
-							{
-								UE_LOG(LogIOS, Warning, TEXT("CreateTextureExternal2D failed!"));
-								return;
-							}
-
-							[NativeWebBrowser SetVideoTextureValid:false];
-					
-						}
-
-						if ([NativeWebBrowser UpdateVideoFrame: VideoTexture->GetNativeResource()])
-						{
-							// if region changed, need to reregister UV scale/offset
-							//UE_LOG(LogIOS, Log, TEXT("UpdateVideoFrame RT: %s"), *Params.PlayerGuid.ToString());
-						}
-
-						if (![NativeWebBrowser IsVideoTextureValid])
-						{
-							FSamplerStateInitializerRHI SamplerStateInitializer(SF_Bilinear, AM_Clamp, AM_Clamp, AM_Clamp);
-							FSamplerStateRHIRef SamplerStateRHI = RHICreateSamplerState(SamplerStateInitializer);
-							FExternalTextureRegistry::Get().RegisterExternalTexture(Params.PlayerGuid, VideoTexture, SamplerStateRHI);
-							//UE_LOG(LogIOS, Log, TEXT("Fetch RT: Register Guid: %s"), *Params.PlayerGuid.ToString());
-
-							[NativeWebBrowser SetVideoTextureValid:true];
-						}
-					});
-				}
-			}
-#endif
-		}
-
-	}
-
-	int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
-	{
-#if !PLATFORM_TVOS
-		if (IsIOS3DBrowser && WebBrowserBrush.IsValid())
-		{
-			FSlateDrawElement::MakeBox(OutDrawElements, LayerId, AllottedGeometry.ToPaintGeometry(), WebBrowserBrush.Get(), ESlateDrawEffect::None);
-		}
-#endif
-		return LayerId;
-	}
-
-	virtual FVector2D ComputeDesiredSize(float) const override
-	{
-		return FVector2D(640, 480);
-	}
-
-	void LoadURL(const FString& InNewURL)
-	{
-		if( WebViewWrapper != nil)
-		{
-			[WebViewWrapper loadurl:[NSURL URLWithString:[NSString stringWithUTF8String:TCHAR_TO_UTF8(*InNewURL)]]];
-		}
-	}
-
-	void LoadString(const FString& InContents, const FString& InDummyURL)
-	{
-		if( WebViewWrapper != nil)
-		{
-			[WebViewWrapper loadstring:[NSString stringWithUTF8String:TCHAR_TO_UTF8(*InContents)] dummyurl:[NSURL URLWithString:[NSString stringWithUTF8String:TCHAR_TO_UTF8(*InDummyURL)]]];
-		}
-	}
-	
-	void ExecuteJavascript(const FString& Script)
-	{
-		if (WebViewWrapper != nil)
-		{
-			[WebViewWrapper executejavascript:[NSString stringWithUTF8String:TCHAR_TO_UTF8(*Script)]];
-		}
-	}
-
-	void Close()
-	{
-		if( WebViewWrapper != nil)
-		{
-			[WebViewWrapper close];
-			WebViewWrapper = nil;
-		}
-		WebBrowserWindowPtr.Reset();
-	}
-
-	~SIOSWebBrowserWidget()
-	{
-		Close();
-	}
-	
-protected:
-	mutable __strong IOSWebViewWrapper* WebViewWrapper;
-private:
-	TWeakPtr<FWebBrowserWindow> WebBrowserWindowPtr;
-
-	/** Enable 3D appearance */
-	bool IsIOS3DBrowser;
-
-#if !PLATFORM_TVOS
-	/** The external texture to render the webbrowser output. */
-	UWebBrowserTexture* WebBrowserTexture;
-
-	/** The material for the external texture. */
-	UMaterialInstanceDynamic* WebBrowserMaterial;
-
-	/** The Slate brush that renders the material. */
-	TSharedPtr<FSlateBrush> WebBrowserBrush;
-
-	/** The sample queue. */
-	TSharedPtr<FWebBrowserTextureSampleQueue, ESPMode::ThreadSafe> WebBrowserTextureSamplesQueue;
-
-	/** Texture sample object pool. */
-	FWebBrowserTextureSamplePool* TextureSamplePool;
-#endif
-};
-
+@end
 
 FWebBrowserWindow::FWebBrowserWindow(FString InUrl, TOptional<FString> InContentsToLoad, bool InShowErrorMessage, bool InThumbMouseButtonNavigation, bool InUseTransparency)
 	: CurrentUrl(MoveTemp(InUrl))
 	, ContentsToLoad(MoveTemp(InContentsToLoad))
 	, bUseTransparency(InUseTransparency)
-	, IOSWindowSize(FIntPoint(500,500))
+	, IOSWindowSize(FIntPoint(500, 500))
 {
 }
 
@@ -671,7 +715,7 @@ void FWebBrowserWindow::StopLoad()
 {
 }
 
-void FWebBrowserWindow::GetSource(TFunction<void (const FString&)> Callback) const
+void FWebBrowserWindow::GetSource(TFunction<void(const FString&)> Callback) const
 {
 	Callback(FString());
 }
diff --git a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.h b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.h
index 66e46d1b6ead..b4fc88f3f62d 100644
--- a/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.h
+++ b/Engine/Source/Runtime/WebBrowser/Private/IOS/IOSPlatformWebBrowser.h
@@ -63,6 +63,10 @@ supportsMetal : (bool)InSupportsMetal supportsMetalMRT : (bool)InSupportsMetalMR
 -(bool)UpdateVideoFrame:(void*)ptr;
 -(void)updateWebViewGLESTexture:(GLuint)gltexture;
 - (void)updateWebViewMetalTexture : (id<MTLTexture>)texture;
+#if !PLATFORM_TVOS
+-(BOOL)webView:(UIWebView*)InWebView shouldStartLoadWithRequest:(NSURLRequest*)InRequest navigationType:(UIWebViewNavigationType)InNavigationType;
+-(void)webView:(UIWebView*)InWebView didFailLoadWithError:(NSError*)InError;
+#endif
 @end
 
 /**
diff --git a/Engine/Source/Runtime/WebBrowser/Private/SWebBrowserView.cpp b/Engine/Source/Runtime/WebBrowser/Private/SWebBrowserView.cpp
index c3ceb35f0044..8844e3abf1d3 100644
--- a/Engine/Source/Runtime/WebBrowser/Private/SWebBrowserView.cpp
+++ b/Engine/Source/Runtime/WebBrowser/Private/SWebBrowserView.cpp
@@ -188,6 +188,7 @@ void SWebBrowserView::Construct(const FArguments& InArgs, const TSharedPtr<IWebB
 		{
 			SlateParentWindowSetupTickHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda([this](float) -> bool
 			{
+                QUICK_SCOPE_CYCLE_COUNTER(STAT_SWebBrowserView_SetupParentWindowHandlers_LambdaTick);
 				this->SetupParentWindowHandlers();
 				bool ContinueTick = !SlateParentWindowPtr.IsValid();
 				return ContinueTick;
diff --git a/Engine/Source/Runtime/WebBrowser/Private/WebBrowserSingleton.cpp b/Engine/Source/Runtime/WebBrowser/Private/WebBrowserSingleton.cpp
index b2044312eeab..fc702d143502 100644
--- a/Engine/Source/Runtime/WebBrowser/Private/WebBrowserSingleton.cpp
+++ b/Engine/Source/Runtime/WebBrowser/Private/WebBrowserSingleton.cpp
@@ -46,6 +46,7 @@ THIRD_PARTY_INCLUDES_END
 #	include "Android/AndroidWebBrowserWindow.h"
 #elif PLATFORM_IOS
 #	include <IOS/IOSPlatformWebBrowser.h>
+#	include <IOS/IOSCookieManager.h>
 #elif PLATFORM_PS4
 #	include <PS4/PS4PlatformWebBrowser.h>
 #endif
@@ -303,6 +304,8 @@ FWebBrowserSingleton::FWebBrowserSingleton(const FWebBrowserInitSettings& WebBro
 	SetCurrentThreadName(TCHAR_TO_ANSI( *(FName( NAME_GameThread ).GetPlainNameString()) ));
 
 	DefaultCookieManager = FCefWebBrowserCookieManagerFactory::Create(CefCookieManager::GetGlobalManager(nullptr));
+#elif PLATFORM_IOS
+	DefaultCookieManager = MakeShareable(new FIOSCookieManager());
 #endif
 }
 
@@ -328,18 +331,21 @@ void FWebBrowserSingleton::HandleRenderProcessCreated(CefRefPtr<CefListValue> Ex
 FWebBrowserSingleton::~FWebBrowserSingleton()
 {
 #if WITH_CEF3
-	// Force all existing browsers to close in case any haven't been deleted
-	for (int32 Index = 0; Index < WindowInterfaces.Num(); ++Index)
 	{
-		auto BrowserWindow = WindowInterfaces[Index].Pin();
-		if (BrowserWindow.IsValid() && BrowserWindow->IsValid())
+		FScopeLock Lock(&WindowInterfacesCS);
+		// Force all existing browsers to close in case any haven't been deleted
+		for (int32 Index = 0; Index < WindowInterfaces.Num(); ++Index)
 		{
-			// Call CloseBrowser directly on the Host object as FWebBrowserWindow::CloseBrowser is delayed
-			BrowserWindow->InternalCefBrowser->GetHost()->CloseBrowser(true);
+			auto BrowserWindow = WindowInterfaces[Index].Pin();
+			if (BrowserWindow.IsValid() && BrowserWindow->IsValid())
+			{
+				// Call CloseBrowser directly on the Host object as FWebBrowserWindow::CloseBrowser is delayed
+				BrowserWindow->InternalCefBrowser->GetHost()->CloseBrowser(true);
+			}
 		}
+		// Clear this before CefShutdown() below
+		WindowInterfaces.Reset();
 	}
-	// Clear this before CefShutdown() below
-	WindowInterfaces.Reset();
 
 	// Remove references to the scheme handler factories
 	CefClearSchemeHandlerFactories();
@@ -379,7 +385,10 @@ TSharedPtr<IWebBrowserWindow> FWebBrowserSingleton::CreateBrowserWindow(
 	TSharedPtr<FCEFWebBrowserWindow> NewBrowserWindow(new FCEFWebBrowserWindow(BrowserWindowInfo->Browser, BrowserWindowInfo->Handler, InitialURL, ContentsToLoad, bShowErrorMessage, bThumbMouseButtonNavigation, bUseTransparency, bJSBindingsToLoweringEnabled));
 	BrowserWindowInfo->Handler->SetBrowserWindow(NewBrowserWindow);
 
-	WindowInterfaces.Add(NewBrowserWindow);
+	{
+		FScopeLock Lock(&WindowInterfacesCS);
+		WindowInterfaces.Add(NewBrowserWindow);
+	}
 	return NewBrowserWindow;
 #endif
 	return nullptr;
@@ -491,7 +500,10 @@ TSharedPtr<IWebBrowserWindow> FWebBrowserSingleton::CreateBrowserWindow(const FC
 				bJSBindingsToLoweringEnabled));
 			NewHandler->SetBrowserWindow(NewBrowserWindow);
 
-			WindowInterfaces.Add(NewBrowserWindow);
+			{
+				FScopeLock Lock(&WindowInterfacesCS);
+				WindowInterfaces.Add(NewBrowserWindow);
+			}
 			return NewBrowserWindow;
 		}
 	}
@@ -524,6 +536,8 @@ TSharedPtr<IWebBrowserWindow> FWebBrowserSingleton::CreateBrowserWindow(const FC
 
 bool FWebBrowserSingleton::Tick(float DeltaTime)
 {
+    QUICK_SCOPE_CYCLE_COUNTER(STAT_FWebBrowserSingleton_Tick);
+
 #if WITH_CEF3
 	FScopeLock Lock(&WindowInterfacesCS);
 	bool bIsSlateAwake = FSlateApplication::IsInitialized() && !FSlateApplication::Get().IsSlateAsleep();
@@ -586,22 +600,24 @@ PRAGMA_ENABLE_DEPRECATION_WARNINGS
 
 TSharedPtr<IWebBrowserCookieManager> FWebBrowserSingleton::GetCookieManager(TOptional<FString> ContextId) const
 {
-	if (!ContextId.IsSet())
+	if (ContextId.IsSet())
 	{
-		return DefaultCookieManager;
-	}
-
 #if WITH_CEF3
-	const CefRefPtr<CefRequestContext>* ExistingContext = RequestContexts.Find(ContextId.GetValue());
+		const CefRefPtr<CefRequestContext>* ExistingContext = RequestContexts.Find(ContextId.GetValue());
 
-	if (ExistingContext)
-	{
-		// Cache these cookie managers?
-		return FCefWebBrowserCookieManagerFactory::Create((*ExistingContext)->GetDefaultCookieManager(nullptr));
-	}
+		if (ExistingContext)
+		{
+			// Cache these cookie managers?
+			return FCefWebBrowserCookieManagerFactory::Create((*ExistingContext)->GetDefaultCookieManager(nullptr));
+		}
+		else
+		{
+			UE_LOG(LogWebBrowser, Log, TEXT("No cookie manager for ContextId=%s.  Using default cookie manager"), *ContextId.GetValue());
+		}
 #endif
-
-	return nullptr;
+	}
+	// No ContextId or cookie manager instance associated with it.  Use default
+	return DefaultCookieManager;
 }
 
 bool FWebBrowserSingleton::RegisterContext(const FBrowserContextSettings& Settings)
diff --git a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformWindows.cpp b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformWindows.cpp
index ba5d947368c8..e8f8a9ae8897 100644
--- a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformWindows.cpp
+++ b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformWindows.cpp
@@ -204,12 +204,16 @@ namespace Audio
 
 	void FMixerPlatformXAudio2::OnDefaultRenderDeviceChanged(const EAudioDeviceRole InAudioDeviceRole, const FString& DeviceId)
 	{
+		FScopeLock Lock(&AudioDeviceSwapCriticalSection);
+
 		NewAudioDeviceId = "";
 		bMoveAudioStreamToNewAudioDevice = true;
 	}
 
 	void FMixerPlatformXAudio2::OnDeviceAdded(const FString& DeviceId)
 	{
+		FScopeLock Lock(&AudioDeviceSwapCriticalSection);
+
 		// If the device that was added is our original device and our current device is NOT our original device, 
 		// move our audio stream to this newly added device.
 		if (AudioStreamInfo.DeviceInfo.DeviceId != OriginalAudioDeviceId && DeviceId == OriginalAudioDeviceId)
@@ -221,6 +225,8 @@ namespace Audio
 
 	void FMixerPlatformXAudio2::OnDeviceRemoved(const FString& DeviceId)
 	{
+		FScopeLock Lock(&AudioDeviceSwapCriticalSection);
+
 		// If the device we're currently using was removed... then switch to the new default audio device.
 		if (AudioStreamInfo.DeviceInfo.DeviceId == DeviceId)
 		{
diff --git a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.cpp b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.cpp
index c928ede37a56..2649dad0c97e 100644
--- a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.cpp
+++ b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.cpp
@@ -213,7 +213,7 @@ namespace Audio
 		// Get the wave format to parse there rest of the device details
 		const WAVEFORMATEX& WaveFormatEx = DeviceDetails.OutputFormat.Format;
 		OutInfo.SampleRate = WaveFormatEx.nSamplesPerSec;
-		
+
 		bool bIsMono = (WaveFormatEx.nChannels == 1);
 		// We are going to default to stereo for mono devices, then mix to mono on buffer submission (automatically done by xaudio2)
 		if (bIsMono == 1)
@@ -476,9 +476,10 @@ namespace Audio
 		return true;
 	}
 
-
 	bool FMixerPlatformXAudio2::CheckAudioDeviceChange()
 	{
+		FScopeLock Lock(&AudioDeviceSwapCriticalSection);
+
 		if (bMoveAudioStreamToNewAudioDevice)
 		{
 			bMoveAudioStreamToNewAudioDevice = false;
diff --git a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.h b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.h
index 9ffb5dcc57e7..599882bbcdc7 100644
--- a/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.h
+++ b/Engine/Source/Runtime/Windows/AudioMixerXAudio2/Private/AudioMixerPlatformXAudio2.h
@@ -96,6 +96,7 @@ namespace Audio
 		IXAudio2MasteringVoice* OutputAudioStreamMasteringVoice;
 		IXAudio2SourceVoice* OutputAudioStreamSourceVoice;
 		FXAudio2VoiceCallback OutputVoiceCallback;
+		FCriticalSection AudioDeviceSwapCriticalSection;
 		FString OriginalAudioDeviceId;
 		FString NewAudioDeviceId;
 		FThreadSafeBool bMoveAudioStreamToNewAudioDevice;
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Commands.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Commands.cpp
index 830a1e84ffe0..a436d5141f09 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Commands.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Commands.cpp
@@ -1153,11 +1153,6 @@ void FD3D11DynamicRHI::RHISetRenderTargets(
 	}
 }
 
-void FD3D11DynamicRHI::RHIDiscardRenderTargets(bool Depth, bool Stencil, uint32 ColorBitMask)
-{
-	// Could support in DX11.1 via ID3D11DeviceContext1::Discard*() functions.
-}
-
 void FD3D11DynamicRHI::RHISetRenderTargetsAndClear(const FRHISetRenderTargetsInfo& RenderTargetsInfo)
 {
 	// Here convert to FUnorderedAccessViewRHIParamRef* in order to call RHISetRenderTargets
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Query.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Query.cpp
index 970befaad36d..1b1c2cd16ffc 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Query.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Query.cpp
@@ -117,12 +117,6 @@ bool FD3D11DynamicRHI::GetQueryData(ID3D11Query* Query,void* Data,SIZE_T DataSiz
 		double StartTime = FPlatformTime::Seconds();
 		do 
 		{
-			bool bGPUAlive = GDynamicRHI->CheckGpuHeartbeat();
-			if (!bGPUAlive)
-			{
-				UE_LOG(LogD3D11RHI, Fatal, TEXT("GPU has crashed"));
-				return false;
-			}
 			Result = Direct3DDeviceIMContext->GetData(Query,Data,DataSize,0);
 
 			// timer queries are used for Benchmarks which can stall a bit more
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHI.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHI.cpp
index 748465d1ec24..92e00b6fa8cd 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHI.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHI.cpp
@@ -575,6 +575,8 @@ extern CORE_API bool GIsGPUCrashed;
 bool FD3DGPUProfiler::CheckGpuHeartbeat() const
 {
 #if NV_AFTERMATH
+#define NVAFTERMATH_ON_ERROR() do { if (D3D11RHI) { D3D11RHI->StopNVAftermath(); GDX11NVAfterMathEnabled = false; } } while (false)
+
 	if (GDX11NVAfterMathEnabled && bTrackingGPUCrashData)
 	{
 		GFSDK_Aftermath_Device_Status Status;
@@ -611,11 +613,13 @@ bool FD3DGPUProfiler::CheckGpuHeartbeat() const
 					else
 					{
 						UE_LOG(LogRHI, Error, TEXT("[Aftermath] GFSDK_Aftermath_GetData failed with result: 0x%08X"), (uint32)Result);
+						NVAFTERMATH_ON_ERROR();
 					}
 				}
 				else
 				{
 					UE_LOG(LogRHI, Error, TEXT("[Aftermath] Invalid context handle"));
+					NVAFTERMATH_ON_ERROR();
 				}
 
 				return false;
@@ -624,8 +628,10 @@ bool FD3DGPUProfiler::CheckGpuHeartbeat() const
 		else
 		{
 			UE_LOG(LogRHI, Error, TEXT("[Aftermath] GFSDK_Aftermath_GetDeviceStatus failed with result: 0x%08X"), (uint32)Result);
+			NVAFTERMATH_ON_ERROR();
 		}
 	}
+#undef NVAFTERMATH_ON_ERROR
 #endif
 	return true;
 }
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHIPrivate.h b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHIPrivate.h
index 491aa9c29e3a..ad75e0d59054 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHIPrivate.h
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11RHIPrivate.h
@@ -434,7 +434,6 @@ public:
 	virtual void RHIResizeViewport(FViewportRHIParamRef Viewport, uint32 SizeX, uint32 SizeY, bool bIsFullscreen, EPixelFormat PreferredPixelFormat) final override;
 	virtual void RHITick(float DeltaTime) final override;
 	virtual void RHISetStreamOutTargets(uint32 NumTargets,const FVertexBufferRHIParamRef* VertexBuffers,const uint32* Offsets) final override;
-	virtual void RHIDiscardRenderTargets(bool Depth,bool Stencil,uint32 ColorBitMask) final override;
 	virtual void RHIBlockUntilGPUIdle() final override;
 	virtual bool RHIGetAvailableResolutions(FScreenResolutionArray& Resolutions, bool bIgnoreRefreshRate) final override;
 	virtual void RHIGetSupportedResolution(uint32& Width, uint32& Height) final override;
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Util.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Util.cpp
index 9ecc04292298..3478d5d01487 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Util.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Util.cpp
@@ -161,6 +161,24 @@ static void TerminateOnDeviceRemoved(HRESULT D3DResult, ID3D11Device* Direct3DDe
 
 	if (D3DResult == DXGI_ERROR_DEVICE_REMOVED)
 	{
+#if NV_AFTERMATH
+		uint32 Result = 0xffffffff;
+		uint32 bDeviceActive = 0;
+		if (GDX11NVAfterMathEnabled)
+		{
+			GFSDK_Aftermath_Device_Status Status;
+			auto Res = GFSDK_Aftermath_GetDeviceStatus(&Status);
+			Result = uint32(Res);
+			if (Res == GFSDK_Aftermath_Result_Success)
+			{
+				bDeviceActive = Status == GFSDK_Aftermath_Device_Status_Active ? 1 : 0;
+			}
+		}
+		UE_LOG(LogD3D11RHI, Log, TEXT("[Aftermath] GDynamicRHI=%p, GDX11NVAfterMathEnabled=%d, Result=0x%08X, bDeviceActive=%d"), GDynamicRHI, GDX11NVAfterMathEnabled, Result, bDeviceActive);
+#else
+		UE_LOG(LogD3D11RHI, Log, TEXT("[Aftermath] NV_AFTERMATH is not set"));
+#endif
+
 		GIsGPUCrashed = true;		
 		if (Direct3DDevice)
 		{
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11VertexDeclaration.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11VertexDeclaration.cpp
index aaabf00e33a0..86f19f693e0d 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11VertexDeclaration.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11VertexDeclaration.cpp
@@ -98,7 +98,8 @@ uint32 GetTypeHash(const FD3D11VertexDeclarationKey& Key)
 /** Compare two vertex declaration keys. */
 bool operator==(const FD3D11VertexDeclarationKey& A, const FD3D11VertexDeclarationKey& B)
 {
-	return A.VertexElements == B.VertexElements;
+	return A.VertexElements == B.VertexElements
+		&& !FMemory::Memcmp(A.StreamStrides, B.StreamStrides, sizeof(A.StreamStrides));
 }
 
 /** Global cache of vertex declarations. */
diff --git a/Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp b/Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp
index d2bc252f0544..80b24d36c07f 100644
--- a/Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp
+++ b/Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp
@@ -3,7 +3,7 @@
 /*=============================================================================
 	WindowsD3D11Device.cpp: Windows D3D device RHI implementation.
 =============================================================================*/
-
+#include "Misc/EngineVersion.h"
 #include "D3D11RHIPrivate.h"
 #include "Misc/CommandLine.h"
 #include "Misc/EngineVersion.h"
@@ -48,6 +48,16 @@ int D3D11RHI_PreferAdaperVendor()
 	return -1;
 }
 
+bool D3D11RHI_AllowSoftwareFallback()
+{
+	if (FParse::Param(FCommandLine::Get(), TEXT("AllowSoftwareRendering")))
+	{
+		return true;
+	}
+
+	return false;
+}
+
 // Filled in during InitD3DDevice if IsRHIDeviceAMD
 struct AmdAgsInfo
 {
@@ -713,6 +723,8 @@ void FD3D11DynamicRHIModule::FindAdapter()
 	UE_LOG(LogD3D11RHI, Log, TEXT("D3D11 adapters:"));
 
 	int PreferredVendor = D3D11RHI_PreferAdaperVendor();
+	bool bAllowSoftwareFallback = D3D11RHI_AllowSoftwareFallback();
+
 	// Enumerate the DXGIFactory's adapters.
 	for(uint32 AdapterIndex = 0; DXGIFactory1->EnumAdapters(AdapterIndex,TempAdapter.GetInitReference()) != DXGI_ERROR_NOT_FOUND; ++AdapterIndex)
 	{
@@ -764,7 +776,7 @@ void FD3D11DynamicRHIModule::FindAdapter()
 				// To reject the software emulation, unless the cvar wants it.
 				// https://msdn.microsoft.com/en-us/library/windows/desktop/bb205075(v=vs.85).aspx#WARP_new_for_Win8
 				// Before we tested for no output devices but that failed where a laptop had a Intel (with output) and NVidia (with no output)
-				const bool bSkipSoftwareAdapter = bIsMicrosoft && CVarExplicitAdapterValue < 0 && HmdGraphicsAdapterLuid == 0;
+				const bool bSkipSoftwareAdapter = bIsMicrosoft && !bAllowSoftwareFallback && CVarExplicitAdapterValue < 0 && HmdGraphicsAdapterLuid == 0;
 				
 				// we don't allow the PerfHUD adapter
 				const bool bSkipPerfHUDAdapter = bIsPerfHUD && !bAllowPerfHUD;
@@ -1155,7 +1167,8 @@ void FD3D11DynamicRHI::InitD3DDevice()
 			check(!"Internal error, EnumAdapters() failed but before it worked")
 		}
 
-		if (IsRHIDeviceAMD())
+		const bool bAllowVendorDevice = !FParse::Param(FCommandLine::Get(), TEXT("novendordevice"));
+		if (IsRHIDeviceAMD() && bAllowVendorDevice)
 		{
 			check(AmdAgsContext == NULL);
 
@@ -1199,6 +1212,7 @@ void FD3D11DynamicRHI::InitD3DDevice()
 		}
 
 		uint32 AmdSupportedExtensionFlags = 0;
+		bool bDeviceCreated = false;
 		if (IsRHIDeviceAMD() && AmdAgsContext)
 		{
 			AGSDX11DeviceCreationParams DeviceCreationParams = 
@@ -1237,18 +1251,32 @@ void FD3D11DynamicRHI::InitD3DDevice()
 			AmdExtensionParams.appVersion = AGS_UNSPECIFIED_VERSION;
 
 			AGSDX11ReturnedParams DeviceCreationReturnedParams;
-			VERIFYD3D11RESULT(agsDriverExtensionsDX11_CreateDevice(
-				AmdAgsContext,
-				&DeviceCreationParams,
-				&AmdExtensionParams,
-				&DeviceCreationReturnedParams) == AGS_SUCCESS ? S_OK : E_FAIL
-			);
-			Direct3DDevice = DeviceCreationReturnedParams.pDevice;
-			ActualFeatureLevel = DeviceCreationReturnedParams.FeatureLevel;
-			Direct3DDeviceIMContext = DeviceCreationReturnedParams.pImmediateContext;
-			AmdSupportedExtensionFlags = DeviceCreationReturnedParams.extensionsSupported;
+			AGSReturnCode DeviceCreation =
+				agsDriverExtensionsDX11_CreateDevice(
+					AmdAgsContext,
+					&DeviceCreationParams,
+					&AmdExtensionParams,
+					&DeviceCreationReturnedParams);
+
+			if (DeviceCreation == AGS_SUCCESS)
+			{
+				Direct3DDevice = DeviceCreationReturnedParams.pDevice;
+				ActualFeatureLevel = DeviceCreationReturnedParams.FeatureLevel;
+				Direct3DDeviceIMContext = DeviceCreationReturnedParams.pImmediateContext;
+				AmdSupportedExtensionFlags = DeviceCreationReturnedParams.extensionsSupported;
+				bDeviceCreated = true;
+			}
+			else
+			{
+				agsDeInit(AmdAgsContext);
+				AmdAgsContext = NULL;
+				AmdSupportedExtensionFlags = 0;
+				FMemory::Memzero(&AmdInfo, sizeof(AmdInfo));
+				GRHIDeviceIsAMDPreGCNArchitecture = false;				
+			}
 		}
-		else
+		
+		if (!bDeviceCreated)
 		{
 			// Creating the Direct3D device.
 			VERIFYD3D11RESULT(D3D11CreateDevice(
diff --git a/Engine/Source/Runtime/Windows/XAudio2/Private/XAudio2Buffer.cpp b/Engine/Source/Runtime/Windows/XAudio2/Private/XAudio2Buffer.cpp
index e05db27b92a4..421fb851f9b5 100644
--- a/Engine/Source/Runtime/Windows/XAudio2/Private/XAudio2Buffer.cpp
+++ b/Engine/Source/Runtime/Windows/XAudio2/Private/XAudio2Buffer.cpp
@@ -361,7 +361,7 @@ FXAudio2SoundBuffer* FXAudio2SoundBuffer::CreateQueuedBuffer( FXAudio2Device* XA
 	check(XAudio2Device);
 	check(Wave);
 
-	check(Wave->bIsPrecacheDone);
+	check(Wave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 	// Always create a new buffer for real time decompressed sounds
 	FXAudio2SoundBuffer* Buffer = new FXAudio2SoundBuffer( XAudio2Device, SoundFormat_PCMRT );
 
@@ -449,7 +449,7 @@ FXAudio2SoundBuffer* FXAudio2SoundBuffer::CreatePreviewBuffer( FXAudio2Device* X
 
 FXAudio2SoundBuffer* FXAudio2SoundBuffer::CreateNativeBuffer( FXAudio2Device* XAudio2Device, USoundWave* Wave )
 {
-	check(Wave->bIsPrecacheDone);
+	check(Wave->GetPrecacheState() == ESoundWavePrecacheState::Done);
 
 	// Create new buffer.
 	FXAudio2SoundBuffer* Buffer = new FXAudio2SoundBuffer( XAudio2Device, SoundFormat_PCM );
diff --git a/Engine/Source/ThirdParty/Expat/Expat.Build.cs b/Engine/Source/ThirdParty/Expat/Expat.Build.cs
index 624059953e2b..adbb07a66f59 100644
--- a/Engine/Source/ThirdParty/Expat/Expat.Build.cs
+++ b/Engine/Source/ThirdParty/Expat/Expat.Build.cs
@@ -13,7 +13,12 @@ public class Expat : ModuleRules
 
 		if (Target.Platform != UnrealTargetPlatform.XboxOne &&
 			Target.Platform != UnrealTargetPlatform.Android &&
-			Target.Platform != UnrealTargetPlatform.IOS)
+			Target.Platform != UnrealTargetPlatform.IOS &&
+			Target.Platform != UnrealTargetPlatform.Win64 &&
+			Target.Platform != UnrealTargetPlatform.Win32 &&
+			Target.Platform != UnrealTargetPlatform.PS4 &&
+			Target.Platform != UnrealTargetPlatform.Mac &&
+			Target.Platform != UnrealTargetPlatform.Switch)
 		{
 			throw new BuildException("Unexpectedly pulled in Expat module. You may need to update Expat.build.cs for platform support");
 		}
@@ -50,5 +55,22 @@ public class Expat : ModuleRules
 			PublicAdditionalLibraries.Add(Path.Combine(ExpatPackagePath, "IOS", ConfigName, "libexpat.a"));
 			PublicAdditionalShadowFiles.Add(Path.Combine(ExpatPackagePath, "IOS", ConfigName, "libexpat.a"));
 		}
+		else if (Target.Platform == UnrealTargetPlatform.Win32 || Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			if (Target.Configuration == UnrealTargetConfiguration.Debug && Target.bDebugBuildsActuallyUseDebugCRT)
+			{
+				PublicLibraryPaths.Add(Path.Combine(ExpatPackagePath, Target.Platform.ToString(), "VS" + Target.WindowsPlatform.GetVisualStudioCompilerVersionName(), "Debug"));
+				PublicAdditionalLibraries.Add("expatd.lib");
+			}
+			else
+			{
+				PublicLibraryPaths.Add(Path.Combine(ExpatPackagePath, Target.Platform.ToString(), "VS" + Target.WindowsPlatform.GetVisualStudioCompilerVersionName(), "Release"));
+				PublicAdditionalLibraries.Add("expat.lib");
+			}
+		}
+		else if (Target.Platform == UnrealTargetPlatform.PS4 || Target.Platform == UnrealTargetPlatform.Mac || Target.Platform == UnrealTargetPlatform.Switch)
+		{
+			PublicAdditionalLibraries.Add(Path.Combine(ExpatPackagePath, Target.Platform.ToString(), ConfigName, "libexpat.a"));
+		}
 	}
 }
diff --git a/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/IOS/BuildForIOS.sh b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/IOS/BuildForIOS.sh
index 26553ec45301..c347fe33d9c4 100755
--- a/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/IOS/BuildForIOS.sh
+++ b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/IOS/BuildForIOS.sh
@@ -1,13 +1,28 @@
 #!/bin/sh
 
-# Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+# Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
-../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G Xcode -DSOCKET_IMPL=../../src/sock.c -DCMAKE_CXX_FLAGS_DEBUG="-O0 -DXML_STATIC" -DCMAKE_CXX_FLAGS_RELEASE="-O3 -DXML_STATIC" ../..
+SCRIPT_DIR=$(cd $(dirname $0) && pwd)
 
+BUILD_DIR="${SCRIPT_DIR}/../../IOS/Build"
 
-echo
-echo
-echo You will now need to convert the Xcode project to use iOS SDK instead of Mac, then build it!
-echo
-echo
+if [ -d "${BUILD_DIR}" ]; then
+	rm -rf "${BUILD_DIR}"
+fi
+mkdir -pv "${BUILD_DIR}"
 
+cd "${BUILD_DIR}"
+../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G "Xcode" -DBUILD_tools=0 -DBUILD_examples=0 -DBUILD_tests=0 -DBUILD_shared=0 -DSKIP_PRE_BUILD_COMMAND=1 -DCMAKE_XCODE_ATTRIBUTE_SDKROOT=iphoneos -DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=8.0 -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO -DCMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY=1,2 "${SCRIPT_DIR}/../.."
+
+function build()
+{
+	CONFIGURATION=$1
+	xcodebuild -project expat.xcodeproj -configuration $CONFIGURATION -destination generic/platform=iOS
+	mkdir -p ../${CONFIGURATION}/
+	cp -v ${CONFIGURATION}-iphoneos/* ../${CONFIGURATION}/
+}
+
+build Release
+build Debug
+cd "${SCRIPT_DIR}"
+rm -rf "${BUILD_DIR}"
diff --git a/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Mac/BuildForMac.sh b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Mac/BuildForMac.sh
new file mode 100755
index 000000000000..d66ebb2ec046
--- /dev/null
+++ b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Mac/BuildForMac.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+SCRIPT_DIR=$(cd $(dirname $0) && pwd)
+
+BUILD_DIR="${SCRIPT_DIR}/../../Mac/Build"
+
+if [ -d "${BUILD_DIR}" ]; then
+	rm -rf "${BUILD_DIR}"
+fi
+mkdir -pv "${BUILD_DIR}"
+
+cd "${BUILD_DIR}"
+../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G "Xcode" -DBUILD_tools=0 -DBUILD_examples=0 -DBUILD_tests=0 -DBUILD_shared=0 -DSKIP_PRE_BUILD_COMMAND=1 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.9" "${SCRIPT_DIR}/../.."
+
+function build()
+{
+	CONFIGURATION=$1
+	xcodebuild -project expat.xcodeproj -configuration $CONFIGURATION
+	mkdir -p ../${CONFIGURATION}/
+	cp -v ${CONFIGURATION}/* ../${CONFIGURATION}/
+}
+
+build Release
+build Debug
+cd "${SCRIPT_DIR}"
+rm -rf "${BUILD_DIR}"
diff --git a/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Windows/BuildForWindows.bat b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Windows/BuildForWindows.bat
new file mode 100644
index 000000000000..755d5eb42ab3
--- /dev/null
+++ b/Engine/Source/ThirdParty/Expat/expat-2.2.0/BuildForUE/Windows/BuildForWindows.bat
@@ -0,0 +1,54 @@
+REM ECHO OFF
+
+REM Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+setlocal
+
+set PATH_TO_CMAKE_FILE=%CD%\..\..
+
+REM Temporary build directories (used as working directories when running CMake)
+set VS2015_X86_PATH="%PATH_TO_CMAKE_FILE%\Win32\VS2015\Build"
+set VS2015_X64_PATH="%PATH_TO_CMAKE_FILE%\Win64\VS2015\Build"
+
+REM MSBuild Directory
+for /f "skip=2 tokens=2,*" %%R in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath') do SET _msbuild=%%S
+if not exist "%_msbuild%msbuild.exe" goto MSBuildMissing
+
+
+REM Build for VS2015 (32-bit)
+echo Generating Expat solution for VS2015 (32-bit)...
+if exist "%VS2015_X86_PATH%" (rmdir "%VS2015_X86_PATH%" /s/q)
+mkdir "%VS2015_X86_PATH%"
+cd "%VS2015_X86_PATH%"
+cmake -G "Visual Studio 14 2015" -DCMAKE_SUPPRESS_REGENERATION=1 -DBUILD_tools=0 -DBUILD_examples=0 -DBUILD_tests=0 -DBUILD_shared=0 -DSKIP_PRE_BUILD_COMMAND=1 %PATH_TO_CMAKE_FILE%
+echo Building Expat solution for VS2015 (32-bit, Debug)...
+"%_msbuild%msbuild.exe" expat.vcxproj /t:build /p:Configuration=Debug
+echo Building Expat solution for VS2015 (32-bit, Release)...
+"%_msbuild%msbuild.exe" expat.vcxproj /t:build /p:Configuration=Release
+cd "%PATH_TO_CMAKE_FILE%"
+xcopy /y/s/i "%VS2015_X86_PATH%\Debug" "%VS2015_X86_PATH%\..\Debug"
+xcopy /y/s/i "%VS2015_X86_PATH%\Release" "%VS2015_X86_PATH%\..\Release"
+rmdir "%VS2015_X86_PATH%" /s/q
+
+REM Build for VS2015 (64-bit)
+echo Generating Expat solution for VS2015 (64-bit)...
+if exist "%VS2015_X64_PATH%" (rmdir "%VS2015_X64_PATH%" /s/q)
+mkdir "%VS2015_X64_PATH%"
+cd "%VS2015_X64_PATH%"
+cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_SUPPRESS_REGENERATION=1 -DBUILD_tools=0 -DBUILD_examples=0 -DBUILD_tests=0 -DBUILD_shared=0 -DSKIP_PRE_BUILD_COMMAND=1 %PATH_TO_CMAKE_FILE%
+echo Building Expat solution for VS2015 (64-bit, Debug)...
+"%_msbuild%msbuild.exe" expat.vcxproj /t:build /p:Configuration=Debug
+echo Building Expat solution for VS2015 (64-bit, Release)...
+"%_msbuild%msbuild.exe" expat.vcxproj /t:build /p:Configuration=Release
+cd "%PATH_TO_CMAKE_FILE%"
+xcopy /y/s/i "%VS2015_X64_PATH%\Debug" "%VS2015_X64_PATH%\..\Debug"
+xcopy /y/s/i "%VS2015_X64_PATH%\Release" "%VS2015_X64_PATH%\..\Release"
+rmdir "%VS2015_X64_PATH%" /s/q
+goto Exit
+
+:MSBuildMissing
+echo MSBuild not found. Please check your Visual Studio install and try again.
+goto Exit
+
+:Exit
+endlocal
diff --git a/Engine/Source/ThirdParty/Facebook/Facebook.Build.cs b/Engine/Source/ThirdParty/Facebook/Facebook.Build.cs
index 58b9bfd40108..788915824a4a 100644
--- a/Engine/Source/ThirdParty/Facebook/Facebook.Build.cs
+++ b/Engine/Source/ThirdParty/Facebook/Facebook.Build.cs
@@ -27,14 +27,6 @@ public class Facebook : ModuleRules
                 "xml2"
             });
 
-            PublicAdditionalFrameworks.Add(
-				new UEBuildFramework(
-					"AccountKit",
-					"IOS/FacebookSDK/AccountKit.embeddedframework.zip",
-					"AccountKit.framework/AccountKitAdditionalStrings.bundle"
-				)
-			);
-
 			PublicAdditionalFrameworks.Add(
 				new UEBuildFramework(
 					"AccountKit",
@@ -50,14 +42,6 @@ public class Facebook : ModuleRules
 				)
 			);
 
-			// Add the FBAudienceNetwork framework
-			PublicAdditionalFrameworks.Add(
-				new UEBuildFramework(
-					"FBAudienceNetwork",
-					"IOS/FacebookSDK/FBAudienceNetwork.embeddedframework.zip"
-				)
-			);
-
 			// Access to Facebook notifications
 			PublicAdditionalFrameworks.Add(
 				new UEBuildFramework(
@@ -83,8 +67,18 @@ public class Facebook : ModuleRules
 				)
 			);
 
-			// Access to Facebook messenger sharing
-			PublicAdditionalFrameworks.Add(
+
+            // commenting out over if(false) for #jira FORT-77943 per Peter.Sauerbrei prior change with CL 3960071
+            //// Access to Facebook places
+            //PublicAdditionalFrameworks.Add(
+            //	new UEBuildFramework(
+            //		"FBSDKPlacesKit",
+            //		"IOS/FacebookSDK/FBSDKPlacesKit.embeddedframework.zip"
+            //	)
+            //);
+
+            // Access to Facebook messenger sharing
+            PublicAdditionalFrameworks.Add(
 				new UEBuildFramework(
 					"FBSDKMessengerShareKit",
 					"IOS/FacebookSDK/FBSDKMessengerShareKit.embeddedframework.zip"
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdChoicesView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdChoicesView.html
deleted file mode 100644
index 888a9eac5a2a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdChoicesView.html
+++ /dev/null
@@ -1,968 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdChoicesView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdChoicesView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/backgroundShown">&nbsp;&nbsp;&nbsp;&nbsp;backgroundShown</option>
-	
-	<option value="//api/name/corner">&nbsp;&nbsp;&nbsp;&nbsp;corner</option>
-	
-	<option value="//api/name/expandable">&nbsp;&nbsp;&nbsp;&nbsp;expandable</option>
-	
-	<option value="//api/name/label">&nbsp;&nbsp;&nbsp;&nbsp;label</option>
-	
-	<option value="//api/name/nativeAd">&nbsp;&nbsp;&nbsp;&nbsp;nativeAd</option>
-	
-	<option value="//api/name/viewController">&nbsp;&nbsp;&nbsp;&nbsp;viewController</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithNativeAd:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAd:</option>
-	
-	<option value="//api/name/initWithNativeAd:expandable:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAd:expandable:</option>
-	
-	<option value="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:</option>
-	
-	<option value="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:</option>
-	
-	<option value="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:</option>
-	
-	<option value="//api/name/updateFrameFromSuperview">&nbsp;&nbsp;&nbsp;&nbsp;- updateFrameFromSuperview</option>
-	
-	<option value="//api/name/updateFrameFromSuperview:">&nbsp;&nbsp;&nbsp;&nbsp;- updateFrameFromSuperview:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/backgroundShown">backgroundShown</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/corner">corner</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/expandable">expandable</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/label">label</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAd">nativeAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/viewController">viewController</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAd:">initWithNativeAd:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAd:expandable:">initWithNativeAd:expandable:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:">initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:">initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:">initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/updateFrameFromSuperview">updateFrameFromSuperview</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/updateFrameFromSuperview:">updateFrameFromSuperview:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdChoicesView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdChoicesView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBAdChoicesView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBAdChoicesView</p>
-
-<p>@abstract
-FBAdChoicesView offers a simple way to display a sponsored or AdChoices icon.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/label">&nbsp;&nbsp;label</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/backgroundShown">&nbsp;&nbsp;backgroundShown</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/expandable">&nbsp;&nbsp;expandable</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAd">&nbsp;&nbsp;nativeAd</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/corner">&nbsp;&nbsp;corner</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/viewController">&nbsp;&nbsp;viewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAd:">&ndash;&nbsp;initWithNativeAd:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAd:expandable:">&ndash;&nbsp;initWithNativeAd:expandable:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:">&ndash;&nbsp;initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:">&ndash;&nbsp;initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:">&ndash;&nbsp;initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/updateFrameFromSuperview">&ndash;&nbsp;updateFrameFromSuperview</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/updateFrameFromSuperview:">&ndash;&nbsp;updateFrameFromSuperview:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/backgroundShown" title="backgroundShown"></a>
-	<h3 class="subsubtitle method-title">backgroundShown</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Determines whether the background mask is shown, or a transparent mask is used.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isBackgroundShown) BOOL backgroundShown</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/corner" title="corner"></a>
-	<h3 class="subsubtitle method-title">corner</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readwrite) UIRectCorner corner</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/expandable" title="expandable"></a>
-	<h3 class="subsubtitle method-title">expandable</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Determines whether the view can be expanded upon being tapped, or defaults to fullsize. Defaults to NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly, getter=isExpandable) BOOL expandable</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/label" title="label"></a>
-	<h3 class="subsubtitle method-title">label</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Access to the text label contained in this view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, readonly, nullable) UILabel *label</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAd" title="nativeAd"></a>
-	<h3 class="subsubtitle method-title">nativeAd</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, readwrite, nullable) FBNativeAd *nativeAd</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/viewController" title="viewController"></a>
-	<h3 class="subsubtitle method-title">viewController</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, readwrite, nullable) UIViewController *viewController</code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAd:" title="initWithNativeAd:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAd:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithNativeAd:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>The native ad to initialize with.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initialize this view with a given native ad. Configuration is pulled from the native ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAd:expandable:" title="initWithNativeAd:expandable:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAd:expandable:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithNativeAd:(FBNativeAd *)<em>nativeAd</em> expandable:(BOOL)<em>expandable</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>The native ad to initialize with.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>expandable</em></dt>
-			<dd><p>Controls whether view defaults to expanded or not, see property documentation</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initialize this view with a given native ad. Configuration is pulled from the native ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:" title="initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:"></a>
-	<h3 class="subsubtitle method-title">initWithViewController:adChoicesIcon:adChoicesLinkURL:adChoicesText:attributes:expandable:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithViewController:(nullable UIViewController *)<em>viewController</em> adChoicesIcon:(FBAdImage *)<em>adChoicesIcon</em> adChoicesLinkURL:(NSURL *)<em>adChoicesLinkURL</em> adChoicesText:(nullable NSString *)<em>adChoicesText</em> attributes:(nullable FBNativeAdViewAttributes *)<em>attributes</em> expandable:(BOOL)<em>expandable</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>View controller to present the AdChoices webview from.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesIcon</em></dt>
-			<dd><p>Native ad AdChoices icon.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesLinkURL</em></dt>
-			<dd><p>Native ad AdChoices link URL.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesText</em></dt>
-			<dd><p>Native ad AdChoices label.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>Attributes to configure look and feel.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>expandable</em></dt>
-			<dd><p>Controls whether view defaults to expanded or not, see property documentation</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initialize this view with explicit parameters.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:" title="initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:"></a>
-	<h3 class="subsubtitle method-title">initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithViewController:(nullable UIViewController *)<em>viewController</em> adChoicesIcon:(FBAdImage *)<em>adChoicesIcon</em> adChoicesLinkURL:(NSURL *)<em>adChoicesLinkURL</em> attributes:(nullable FBNativeAdViewAttributes *)<em>attributes</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>View controller to present the AdChoices webview from.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesIcon</em></dt>
-			<dd><p>Native ad AdChoices icon.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesLinkURL</em></dt>
-			<dd><p>Native ad AdChoices link URL.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>Attributes to configure look and feel.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initialize this view with explicit parameters.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:" title="initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:"></a>
-	<h3 class="subsubtitle method-title">initWithViewController:adChoicesIcon:adChoicesLinkURL:attributes:expandable:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithViewController:(nullable UIViewController *)<em>viewController</em> adChoicesIcon:(FBAdImage *)<em>adChoicesIcon</em> adChoicesLinkURL:(NSURL *)<em>adChoicesLinkURL</em> attributes:(nullable FBNativeAdViewAttributes *)<em>attributes</em> expandable:(BOOL)<em>expandable</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>View controller to present the AdChoices webview from.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesIcon</em></dt>
-			<dd><p>Native ad AdChoices icon.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adChoicesLinkURL</em></dt>
-			<dd><p>Native ad AdChoices link URL.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>Attributes to configure look and feel.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>expandable</em></dt>
-			<dd><p>Controls whether view defaults to expanded or not, see property documentation</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initialize this view with explicit parameters.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/updateFrameFromSuperview" title="updateFrameFromSuperview"></a>
-	<h3 class="subsubtitle method-title">updateFrameFromSuperview</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)updateFrameFromSuperview</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Using the superview, this updates the frame of this view, positioning the icon in the top right corner by default.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/updateFrameFromSuperview:" title="updateFrameFromSuperview:"></a>
-	<h3 class="subsubtitle method-title">updateFrameFromSuperview:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)updateFrameFromSuperview:(UIRectCorner)<em>corner</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>corner</em></dt>
-			<dd><p>The corner to display this view from.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Using the superview, this updates the frame of this view, positioning the icon in the corner specified. UIRectCornerAllCorners not supported.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdChoicesView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdImage.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdImage.html
deleted file mode 100644
index cceb2b90f04d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdImage.html
+++ /dev/null
@@ -1,547 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdImage Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdImage Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/height">&nbsp;&nbsp;&nbsp;&nbsp;height</option>
-	
-	<option value="//api/name/url">&nbsp;&nbsp;&nbsp;&nbsp;url</option>
-	
-	<option value="//api/name/width">&nbsp;&nbsp;&nbsp;&nbsp;width</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithURL:width:height:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithURL:width:height:</option>
-	
-	<option value="//api/name/loadImageAsyncWithBlock:">&nbsp;&nbsp;&nbsp;&nbsp;- loadImageAsyncWithBlock:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/height">height</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/url">url</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/width">width</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithURL:width:height:">initWithURL:width:height:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadImageAsyncWithBlock:">loadImageAsyncWithBlock:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdImage Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdImage Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBAdImage</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/url">&nbsp;&nbsp;url</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/width">&nbsp;&nbsp;width</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/height">&nbsp;&nbsp;height</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithURL:width:height:">&ndash;&nbsp;initWithURL:width:height:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadImageAsyncWithBlock:">&ndash;&nbsp;loadImageAsyncWithBlock:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/height" title="height"></a>
-	<h3 class="subsubtitle method-title">height</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the image height.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) NSInteger height</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/url" title="url"></a>
-	<h3 class="subsubtitle method-title">url</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the image url.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nonnull) NSURL *url</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/width" title="width"></a>
-	<h3 class="subsubtitle method-title">width</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the image width.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) NSInteger width</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithURL:width:height:" title="initWithURL:width:height:"></a>
-	<h3 class="subsubtitle method-title">initWithURL:width:height:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithURL:(NSURL *)<em>url</em> width:(NSInteger)<em>width</em> height:(NSInteger)<em>height</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>url</em></dt>
-			<dd><p>the image url.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>width</em></dt>
-			<dd><p>the image width.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>height</em></dt>
-			<dd><p>the image height.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBAdImage.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadImageAsyncWithBlock:" title="loadImageAsyncWithBlock:"></a>
-	<h3 class="subsubtitle method-title">loadImageAsyncWithBlock:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadImageAsyncWithBlock:(nullable void ( ^ ) ( UIImage *__nullable image ))<em>block</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>block</em></dt>
-			<dd><p>Block to handle the loaded image.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Loads an image from self.url over the network, or returns the cached image immediately.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdSettings.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdSettings.html
deleted file mode 100644
index b5384fb1da0a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdSettings.html
+++ /dev/null
@@ -1,950 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdSettings Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdSettings Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/addTestDevice:">&nbsp;&nbsp;&nbsp;&nbsp;+ addTestDevice:</option>
-	
-	<option value="//api/name/addTestDevices:">&nbsp;&nbsp;&nbsp;&nbsp;+ addTestDevices:</option>
-	
-	<option value="//api/name/clearTestDevice:">&nbsp;&nbsp;&nbsp;&nbsp;+ clearTestDevice:</option>
-	
-	<option value="//api/name/clearTestDevices">&nbsp;&nbsp;&nbsp;&nbsp;+ clearTestDevices</option>
-	
-	<option value="//api/name/getLogLevel">&nbsp;&nbsp;&nbsp;&nbsp;+ getLogLevel</option>
-	
-	<option value="//api/name/isTestMode">&nbsp;&nbsp;&nbsp;&nbsp;+ isTestMode</option>
-	
-	<option value="//api/name/setIsChildDirected:">&nbsp;&nbsp;&nbsp;&nbsp;+ setIsChildDirected:</option>
-	
-	<option value="//api/name/setLogLevel:">&nbsp;&nbsp;&nbsp;&nbsp;+ setLogLevel:</option>
-	
-	<option value="//api/name/setMediationService:">&nbsp;&nbsp;&nbsp;&nbsp;+ setMediationService:</option>
-	
-	<option value="//api/name/setUrlPrefix:">&nbsp;&nbsp;&nbsp;&nbsp;+ setUrlPrefix:</option>
-	
-	<option value="//api/name/testDeviceHash">&nbsp;&nbsp;&nbsp;&nbsp;+ testDeviceHash</option>
-	
-	<option value="//api/name/urlPrefix">&nbsp;&nbsp;&nbsp;&nbsp;+ urlPrefix</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addTestDevice:">addTestDevice:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addTestDevices:">addTestDevices:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/clearTestDevice:">clearTestDevice:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/clearTestDevices">clearTestDevices</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/getLogLevel">getLogLevel</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isTestMode">isTestMode</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setIsChildDirected:">setIsChildDirected:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setLogLevel:">setLogLevel:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setMediationService:">setMediationService:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setUrlPrefix:">setUrlPrefix:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/testDeviceHash">testDeviceHash</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/urlPrefix">urlPrefix</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdSettings Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdSettings Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBAdSettings.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBAdSettings</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isTestMode">+&nbsp;isTestMode</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/testDeviceHash">+&nbsp;testDeviceHash</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addTestDevice:">+&nbsp;addTestDevice:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addTestDevices:">+&nbsp;addTestDevices:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/clearTestDevices">+&nbsp;clearTestDevices</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/clearTestDevice:">+&nbsp;clearTestDevice:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setIsChildDirected:">+&nbsp;setIsChildDirected:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setMediationService:">+&nbsp;setMediationService:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/urlPrefix">+&nbsp;urlPrefix</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setUrlPrefix:">+&nbsp;setUrlPrefix:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/getLogLevel">+&nbsp;getLogLevel</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setLogLevel:">+&nbsp;setLogLevel:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/addTestDevice:" title="addTestDevice:"></a>
-	<h3 class="subsubtitle method-title">addTestDevice:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)addTestDevice:(NSString *)<em>deviceHash</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>deviceHash</em></dt>
-			<dd><p>The id of the device to use test mode, can be obtained from debug log or testDeviceHash</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Adds a test device.</p>
-
-<p>@discussion
-Copy the current device Id from debug log and add it as a test device to get test ads. Apps
-running on emulator will automatically get test ads. Test devices should be added before loadAd is called.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/addTestDevices:" title="addTestDevices:"></a>
-	<h3 class="subsubtitle method-title">addTestDevices:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)addTestDevices:(FB_NSArrayOf ( NSString *) *)<em>devicesHash</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>devicesHash</em></dt>
-			<dd><p>The array of the device id to use test mode, can be obtained from debug log or testDeviceHash</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Add a collection of test devices. See <code>+addTestDevices:</code> for details.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/clearTestDevice:" title="clearTestDevice:"></a>
-	<h3 class="subsubtitle method-title">clearTestDevice:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)clearTestDevice:(NSString *)<em>deviceHash</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>deviceHash</em></dt>
-			<dd><p>The id of the device using test mode, can be obtained from debug log or testDeviceHash</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Clears the added test device</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/clearTestDevices" title="clearTestDevices"></a>
-	<h3 class="subsubtitle method-title">clearTestDevices</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)clearTestDevices</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Clear all the added test devices</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/getLogLevel" title="getLogLevel"></a>
-	<h3 class="subsubtitle method-title">getLogLevel</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBAdLogLevel)getLogLevel</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Gets the current SDK logging level</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isTestMode" title="isTestMode"></a>
-	<h3 class="subsubtitle method-title">isTestMode</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (BOOL)isTestMode</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Returns test mode on/off.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setIsChildDirected:" title="setIsChildDirected:"></a>
-	<h3 class="subsubtitle method-title">setIsChildDirected:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setIsChildDirected:(BOOL)<em>isChildDirected</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>isChildDirected</em></dt>
-			<dd><p>Indicates whether you would like your ad control to be treated as child-directed</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Configures the ad control for treatment as child-directed.</p>
-
-<p>@discussion
-Note that you may have other legal obligations under the Children&rsquo;s Online Privacy Protection Act (COPPA).
-Please review the FTC&rsquo;s guidance and consult with your own legal counsel.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setLogLevel:" title="setLogLevel:"></a>
-	<h3 class="subsubtitle method-title">setLogLevel:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setLogLevel:(FBAdLogLevel)<em>level</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sets the current SDK logging level</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setMediationService:" title="setMediationService:"></a>
-	<h3 class="subsubtitle method-title">setMediationService:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setMediationService:(NSString *)<em>service</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>service</em></dt>
-			<dd><p>Representing the name of the mediation that is mediation Audience Network</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-If an ad provided service is mediating Audience Network in their sdk, it is required to set the name of the mediation service</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setUrlPrefix:" title="setUrlPrefix:"></a>
-	<h3 class="subsubtitle method-title">setUrlPrefix:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setUrlPrefix:(NSString *)<em>urlPrefix</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sets the url prefix to use when making ad requests.</p>
-
-<p>@discussion
-This method should never be used in production.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/testDeviceHash" title="testDeviceHash"></a>
-	<h3 class="subsubtitle method-title">testDeviceHash</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)testDeviceHash</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Returns the hashid of the device to use test mode on.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/urlPrefix" title="urlPrefix"></a>
-	<h3 class="subsubtitle method-title">urlPrefix</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)urlPrefix</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Gets the url prefix to use when making ad requests.</p>
-
-<p>@discussion
-This method should never be used in production.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdStarRatingView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdStarRatingView.html
deleted file mode 100644
index 419ea995dcee..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdStarRatingView.html
+++ /dev/null
@@ -1,391 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdStarRatingView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdStarRatingView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/FB_DEPRECATED">&nbsp;&nbsp;&nbsp;&nbsp;FB_DEPRECATED</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithFrame:withStarRating:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithFrame:withStarRating:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/FB_DEPRECATED">FB_DEPRECATED</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithFrame:withStarRating:">initWithFrame:withStarRating:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdStarRatingView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdStarRatingView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBAdStarRatingView</p>
-
-<p>@abstract
-Helper view that draws a star rating based off a native ad.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/FB_DEPRECATED">&nbsp;&nbsp;FB_DEPRECATED</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithFrame:withStarRating:">&ndash;&nbsp;initWithFrame:withStarRating:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/FB_DEPRECATED" title="FB_DEPRECATED"></a>
-	<h3 class="subsubtitle method-title">FB_DEPRECATED</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>The current rating from an FBNativeAd. When set, updates the view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) struct FBAdStarRating rating FB_DEPRECATED</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithFrame:withStarRating:" title="initWithFrame:withStarRating:"></a>
-	<h3 class="subsubtitle method-title">initWithFrame:withStarRating:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithFrame:(CGRect)<em>frame</em> withStarRating:(struct FBAdStarRating)<em>starRating</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>frame</em></dt>
-			<dd><p>Frame of this view.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>starRating</em></dt>
-			<dd><p>Star rating from a native ad.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Initializes a star rating view with a given frame and star rating.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdView.html
deleted file mode 100644
index a4e196768918..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBAdView.html
+++ /dev/null
@@ -1,596 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/placementID">&nbsp;&nbsp;&nbsp;&nbsp;placementID</option>
-	
-	<option value="//api/name/rootViewController">&nbsp;&nbsp;&nbsp;&nbsp;rootViewController</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/disableAutoRefresh">&nbsp;&nbsp;&nbsp;&nbsp;- disableAutoRefresh</option>
-	
-	<option value="//api/name/initWithPlacementID:adSize:rootViewController:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:adSize:rootViewController:</option>
-	
-	<option value="//api/name/loadAd">&nbsp;&nbsp;&nbsp;&nbsp;- loadAd</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placementID">placementID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rootViewController">rootViewController</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/disableAutoRefresh">disableAutoRefresh</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:adSize:rootViewController:">initWithPlacementID:adSize:rootViewController:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAd">loadAd</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBAdView</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:adSize:rootViewController:">&ndash;&nbsp;initWithPlacementID:adSize:rootViewController:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAd">&ndash;&nbsp;loadAd</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/disableAutoRefresh">&ndash;&nbsp;disableAutoRefresh</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placementID">&nbsp;&nbsp;placementID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rootViewController">&nbsp;&nbsp;rootViewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBAdViewDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placementID" title="placementID"></a>
-	<h3 class="subsubtitle method-title">placementID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the id of the ad placement.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *placementID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rootViewController" title="rootViewController"></a>
-	<h3 class="subsubtitle method-title">rootViewController</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the app&rsquo;s root view controller.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, readonly, nullable) UIViewController *rootViewController</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/disableAutoRefresh" title="disableAutoRefresh"></a>
-	<h3 class="subsubtitle method-title">disableAutoRefresh</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)disableAutoRefresh</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to disable auto refresh for the FBAdView instance</p><p>By default, we read the refresh interval from the placement setting in your Facebook
-developers page. Once you call this method, the auto refresh will be disabled for this FBAdView
-instance, and you cannot re-enable the refresh for this instance. A new created FBAdView will still
-use the default behavior.</p>
-
-<p>This method is designed for ad network mediation. We still recommend you to set the placement
-refresh interval as &lsquo;None&rsquo; if you&rsquo;re using one of the ad network mediation.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:adSize:rootViewController:" title="initWithPlacementID:adSize:rootViewController:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:adSize:rootViewController:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em> adSize:(FBAdSize)<em>adSize</em> rootViewController:(nullable UIViewController *)<em>viewController</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adSize</em></dt>
-			<dd><p>The size of the ad; for example, kFBAdSizeHeight50Banner or kFBAdSizeHeight90Banner.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>The view controller that will be used to present the ad and the app store view.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBAdView matching the given placement id.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAd" title="loadAd"></a>
-	<h3 class="subsubtitle method-title">loadAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAd</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Begins loading the FBAdView content.</p><p>You can implement <code>adViewDidLoad:</code> and <code>adView:didFailWithError:</code> methods
-of <code>FBAdViewDelegate</code> if you would like to be notified as loading succeeds or fails.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInstreamAdView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInstreamAdView.html
deleted file mode 100644
index 951c98544d70..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInstreamAdView.html
+++ /dev/null
@@ -1,389 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBInstreamAdView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBInstreamAdView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/adValid">&nbsp;&nbsp;&nbsp;&nbsp;adValid</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/placementID">&nbsp;&nbsp;&nbsp;&nbsp;placementID</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithPlacementID:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:</option>
-	
-	<option value="//api/name/loadAd">&nbsp;&nbsp;&nbsp;&nbsp;- loadAd</option>
-	
-	<option value="//api/name/showAdFromRootViewController:">&nbsp;&nbsp;&nbsp;&nbsp;- showAdFromRootViewController:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adValid">adValid</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placementID">placementID</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:">initWithPlacementID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAd">loadAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showAdFromRootViewController:">showAdFromRootViewController:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBInstreamAdView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBInstreamAdView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBInstreamAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adValid">&nbsp;&nbsp;adValid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placementID">&nbsp;&nbsp;placementID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:">&ndash;&nbsp;initWithPlacementID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAd">&ndash;&nbsp;loadAd</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showAdFromRootViewController:">&ndash;&nbsp;showAdFromRootViewController:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adValid" title="adValid"></a>
-	<h3 class="subsubtitle method-title">adValid</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, getter=isAdValid, readonly) BOOL adValid</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBInstreamAdViewDelegate&gt; delegate</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placementID" title="placementID"></a>
-	<h3 class="subsubtitle method-title">placementID</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nonnull) NSString *placementID</code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:" title="initWithPlacementID:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (nullable instancetype)initWithPlacementID:(nonnull NSString *)<em>placementID</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAd" title="loadAd"></a>
-	<h3 class="subsubtitle method-title">loadAd</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAd</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/showAdFromRootViewController:" title="showAdFromRootViewController:"></a>
-	<h3 class="subsubtitle method-title">showAdFromRootViewController:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)showAdFromRootViewController:(nullable UIViewController *)<em>rootViewController</em></code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInterstitialAd.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInterstitialAd.html
deleted file mode 100644
index 8c4eb067c50c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBInterstitialAd.html
+++ /dev/null
@@ -1,597 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBInterstitialAd Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBInterstitialAd Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/adValid">&nbsp;&nbsp;&nbsp;&nbsp;adValid</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/placementID">&nbsp;&nbsp;&nbsp;&nbsp;placementID</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithPlacementID:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:</option>
-	
-	<option value="//api/name/loadAd">&nbsp;&nbsp;&nbsp;&nbsp;- loadAd</option>
-	
-	<option value="//api/name/showAdFromRootViewController:">&nbsp;&nbsp;&nbsp;&nbsp;- showAdFromRootViewController:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adValid">adValid</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placementID">placementID</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:">initWithPlacementID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAd">loadAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showAdFromRootViewController:">showAdFromRootViewController:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBInterstitialAd Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBInterstitialAd Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBInterstitialAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBInterstitialAd</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placementID">&nbsp;&nbsp;placementID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:">&ndash;&nbsp;initWithPlacementID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adValid">&nbsp;&nbsp;adValid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAd">&ndash;&nbsp;loadAd</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showAdFromRootViewController:">&ndash;&nbsp;showAdFromRootViewController:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adValid" title="adValid"></a>
-	<h3 class="subsubtitle method-title">adValid</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, getter=isAdValid, readonly) BOOL adValid</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Returns true if the interstitial ad has been successfully loaded.</p><p>You should check <code>isAdValid</code> before trying to show the ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBInterstitialAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placementID" title="placementID"></a>
-	<h3 class="subsubtitle method-title">placementID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the id of the ad placement.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nonnull) NSString *placementID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:" title="initWithPlacementID:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBInterstitialAd matching the given placement id.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAd" title="loadAd"></a>
-	<h3 class="subsubtitle method-title">loadAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAd</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Begins loading the FBInterstitialAd content.</p><p>You can implement <code>interstitialAdDidLoad:</code> and <code>interstitialAd:didFailWithError:</code> methods
-of <code>FBInterstitialAdDelegate</code> if you would like to be notified as loading succeeds or fails.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/showAdFromRootViewController:" title="showAdFromRootViewController:"></a>
-	<h3 class="subsubtitle method-title">showAdFromRootViewController:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)showAdFromRootViewController:(nullable UIViewController *)<em>rootViewController</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rootViewController</em></dt>
-			<dd><p>The view controller that will be used to present the interstitial ad.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Presents the interstitial ad modally from the specified view controller.</p><p>You can implement <code>interstitialAdDidClick:</code>, <code>interstitialAdWillClose:</code> and <code>interstitialAdWillClose</code>
-methods of <code>FBInterstitialAdDelegate</code> if you would like to stay informed for thoses events</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBMediaView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBMediaView.html
deleted file mode 100644
index a0b4824a825e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBMediaView.html
+++ /dev/null
@@ -1,541 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBMediaView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBMediaView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/autoplayEnabled">&nbsp;&nbsp;&nbsp;&nbsp;autoplayEnabled</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/nativeAd">&nbsp;&nbsp;&nbsp;&nbsp;nativeAd</option>
-	
-	<option value="//api/name/volume">&nbsp;&nbsp;&nbsp;&nbsp;volume</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithNativeAd:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAd:</option>
-	
-	<option value="//api/name/setAutoplayEnabled:">&nbsp;&nbsp;&nbsp;&nbsp;- setAutoplayEnabled:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/autoplayEnabled">autoplayEnabled</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAd">nativeAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/volume">volume</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAd:">initWithNativeAd:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setAutoplayEnabled:">setAutoplayEnabled:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBMediaView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBMediaView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBMediaView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAd</p>
-
-<p>@abstract
-The FBMediaView loads media content from a given FBNativeAd. This view takes the place of manually loading a cover image.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAd:">&ndash;&nbsp;initWithNativeAd:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAd">&nbsp;&nbsp;nativeAd</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/volume">&nbsp;&nbsp;volume</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/autoplayEnabled">&nbsp;&nbsp;autoplayEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setAutoplayEnabled:">&ndash;&nbsp;setAutoplayEnabled:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/autoplayEnabled" title="autoplayEnabled"></a>
-	<h3 class="subsubtitle method-title">autoplayEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Enables or disables autoplay for some types of media. Defaults to YES.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isAutoplayEnabled) BOOL autoplayEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBMediaViewDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAd" title="nativeAd"></a>
-	<h3 class="subsubtitle method-title">nativeAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the native ad, can be set again to reuse this view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, nonnull) FBNativeAd *nativeAd</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/volume" title="volume"></a>
-	<h3 class="subsubtitle method-title">volume</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>The current volume of the media view, ranging from 0.0 through 1.0.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) float volume</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAd:" title="initWithNativeAd:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAd:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method
-@abstract
-This is a method to create a media view using the given native ad.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithNativeAd:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>The native ad to load media content from.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setAutoplayEnabled:" title="setAutoplayEnabled:"></a>
-	<h3 class="subsubtitle method-title">setAutoplayEnabled:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)setAutoplayEnabled:(BOOL)<em>autoplayEnabled</em></code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAd.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAd.html
deleted file mode 100644
index 5fbb5962fb55..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAd.html
+++ /dev/null
@@ -1,1169 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAd Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAd Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/FB_DEPRECATED">&nbsp;&nbsp;&nbsp;&nbsp;FB_DEPRECATED</option>
-	
-	<option value="//api/name/adNetwork">&nbsp;&nbsp;&nbsp;&nbsp;adNetwork</option>
-	
-	<option value="//api/name/adValid">&nbsp;&nbsp;&nbsp;&nbsp;adValid</option>
-	
-	<option value="//api/name/body">&nbsp;&nbsp;&nbsp;&nbsp;body</option>
-	
-	<option value="//api/name/callToAction">&nbsp;&nbsp;&nbsp;&nbsp;callToAction</option>
-	
-	<option value="//api/name/coverImage">&nbsp;&nbsp;&nbsp;&nbsp;coverImage</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/icon">&nbsp;&nbsp;&nbsp;&nbsp;icon</option>
-	
-	<option value="//api/name/mediaCachePolicy">&nbsp;&nbsp;&nbsp;&nbsp;mediaCachePolicy</option>
-	
-	<option value="//api/name/placementID">&nbsp;&nbsp;&nbsp;&nbsp;placementID</option>
-	
-	<option value="//api/name/socialContext">&nbsp;&nbsp;&nbsp;&nbsp;socialContext</option>
-	
-	<option value="//api/name/subtitle">&nbsp;&nbsp;&nbsp;&nbsp;subtitle</option>
-	
-	<option value="//api/name/title">&nbsp;&nbsp;&nbsp;&nbsp;title</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithPlacementID:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:</option>
-	
-	<option value="//api/name/loadAd">&nbsp;&nbsp;&nbsp;&nbsp;- loadAd</option>
-	
-	<option value="//api/name/registerViewForInteraction:withViewController:">&nbsp;&nbsp;&nbsp;&nbsp;- registerViewForInteraction:withViewController:</option>
-	
-	<option value="//api/name/registerViewForInteraction:withViewController:withClickableViews:">&nbsp;&nbsp;&nbsp;&nbsp;- registerViewForInteraction:withViewController:withClickableViews:</option>
-	
-	<option value="//api/name/unregisterView">&nbsp;&nbsp;&nbsp;&nbsp;- unregisterView</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/FB_DEPRECATED">FB_DEPRECATED</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adNetwork">adNetwork</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adValid">adValid</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/body">body</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/callToAction">callToAction</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/coverImage">coverImage</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/icon">icon</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaCachePolicy">mediaCachePolicy</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placementID">placementID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/socialContext">socialContext</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/subtitle">subtitle</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/title">title</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:">initWithPlacementID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAd">loadAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/registerViewForInteraction:withViewController:">registerViewForInteraction:withViewController:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/registerViewForInteraction:withViewController:withClickableViews:">registerViewForInteraction:withViewController:withClickableViews:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/unregisterView">unregisterView</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAd Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAd Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAd</p>
-
-<p>@abstract
-The FBNativeAd represents ad metadata to allow you to construct custom ad views.
-See the NativeAdSample in the sample apps section of the Audience Network framework.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placementID">&nbsp;&nbsp;placementID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/FB_DEPRECATED">&nbsp;&nbsp;FB_DEPRECATED</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/title">&nbsp;&nbsp;title</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/subtitle">&nbsp;&nbsp;subtitle</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/socialContext">&nbsp;&nbsp;socialContext</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/callToAction">&nbsp;&nbsp;callToAction</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/icon">&nbsp;&nbsp;icon</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/coverImage">&nbsp;&nbsp;coverImage</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/body">&nbsp;&nbsp;body</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaCachePolicy">&nbsp;&nbsp;mediaCachePolicy</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:">&ndash;&nbsp;initWithPlacementID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/registerViewForInteraction:withViewController:">&ndash;&nbsp;registerViewForInteraction:withViewController:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/registerViewForInteraction:withViewController:withClickableViews:">&ndash;&nbsp;registerViewForInteraction:withViewController:withClickableViews:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/unregisterView">&ndash;&nbsp;unregisterView</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAd">&ndash;&nbsp;loadAd</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adValid">&nbsp;&nbsp;adValid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adNetwork">&nbsp;&nbsp;adNetwork</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/FB_DEPRECATED" title="FB_DEPRECATED"></a>
-	<h3 class="subsubtitle method-title">FB_DEPRECATED</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad star rating. See <code>FBAdStarRating</code> for details.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) struct FBAdStarRating starRating FB_DEPRECATED</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adNetwork" title="adNetwork"></a>
-	<h3 class="subsubtitle method-title">adNetwork</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable, getter=getAdNetwork) NSString *adNetwork</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adValid" title="adValid"></a>
-	<h3 class="subsubtitle method-title">adValid</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, getter=isAdValid, readonly) BOOL adValid</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Call isAdValid to check whether native ad is valid &amp; internal consistent prior rendering using its properties. If
-rendering is done as part of the loadAd callback, it is guarantee to be consistent</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/body" title="body"></a>
-	<h3 class="subsubtitle method-title">body</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the body text, usually a longer description of the ad.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable) NSString *body</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/callToAction" title="callToAction"></a>
-	<h3 class="subsubtitle method-title">callToAction</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the call to action phrase of the ad, for example &ldquo;Install Now&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable) NSString *callToAction</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/coverImage" title="coverImage"></a>
-	<h3 class="subsubtitle method-title">coverImage</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad cover image creative. See <code>FBAdImage</code> for details.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly, nullable) FBAdImage *coverImage</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBNativeAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/icon" title="icon"></a>
-	<h3 class="subsubtitle method-title">icon</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad icon. See <code>FBAdImage</code> for details.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly, nullable) FBAdImage *icon</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaCachePolicy" title="mediaCachePolicy"></a>
-	<h3 class="subsubtitle method-title">mediaCachePolicy</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Set the native ad caching policy. This controls which media (images, video, etc) from the native ad are cached before the native ad calls nativeAdLoaded on its delegate. The default is to not block on caching. Ensure that media is loaded through FBMediaView or through [FBAdImage loadImageAsyncWithBlock:] to take full advantage of caching.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBNativeAdsCachePolicy mediaCachePolicy</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placementID" title="placementID"></a>
-	<h3 class="subsubtitle method-title">placementID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the id of the ad placement.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nonnull) NSString *placementID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/socialContext" title="socialContext"></a>
-	<h3 class="subsubtitle method-title">socialContext</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad social context, for example &ldquo;Over half a million users&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable) NSString *socialContext</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/subtitle" title="subtitle"></a>
-	<h3 class="subsubtitle method-title">subtitle</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad subtitle.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable) NSString *subtitle</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/title" title="title"></a>
-	<h3 class="subsubtitle method-title">title</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the ad title.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly, nullable) NSString *title</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:" title="initWithPlacementID:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize a FBNativeAd object matching the given placement id.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAd" title="loadAd"></a>
-	<h3 class="subsubtitle method-title">loadAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAd</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Begins loading the FBNativeAd content.</p><p>You can implement <code>nativeAdDidLoad:</code> and <code>nativeAd:didFailWithError:</code> methods
-of <code>FBNativeAdDelegate</code> if you would like to be notified as loading succeeds or fails.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/registerViewForInteraction:withViewController:" title="registerViewForInteraction:withViewController:"></a>
-	<h3 class="subsubtitle method-title">registerViewForInteraction:withViewController:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)registerViewForInteraction:(UIView *)<em>view</em> withViewController:(nullable UIViewController *)<em>viewController</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>view</em></dt>
-			<dd><p>The UIView you created to render all the native ads data elements.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>The UIViewController that will be used to present SKStoreProductViewController
-(iTunes Store product information) or the in-app browser. If nil is passed, the top view controller currently shown will be used.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to associate a FBNativeAd with the UIView you will use to display the native ads.</p><p>The whole area of the UIView will be clickable.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/registerViewForInteraction:withViewController:withClickableViews:" title="registerViewForInteraction:withViewController:withClickableViews:"></a>
-	<h3 class="subsubtitle method-title">registerViewForInteraction:withViewController:withClickableViews:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)registerViewForInteraction:(UIView *)<em>view</em> withViewController:(nullable UIViewController *)<em>viewController</em> withClickableViews:(FB_NSArrayOf ( UIView *) *)<em>clickableViews</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>view</em></dt>
-			<dd><p>The UIView you created to render all the native ads data elements.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>viewController</em></dt>
-			<dd><p>The UIViewController that will be used to present SKStoreProductViewController
-(iTunes Store product information). If nil is passed, the top view controller currently shown will be used.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>clickableViews</em></dt>
-			<dd><p>An array of UIView you created to render the native ads data element, e.g.
-CallToAction button, Icon image, which you want to specify as clickable.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to associate FBNativeAd with the UIView you will use to display the native ads
-and set clickable areas.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/unregisterView" title="unregisterView"></a>
-	<h3 class="subsubtitle method-title">unregisterView</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)unregisterView</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to disconnect a FBNativeAd with the UIView you used to display the native ads.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewAdProvider.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewAdProvider.html
deleted file mode 100644
index 45b6cbf976ec..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewAdProvider.html
+++ /dev/null
@@ -1,641 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdCollectionViewAdProvider Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdCollectionViewAdProvider Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/adjustCount:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- adjustCount:forStride:</option>
-	
-	<option value="//api/name/adjustNonAdCellIndexPath:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- adjustNonAdCellIndexPath:forStride:</option>
-	
-	<option value="//api/name/collectionView:nativeAdForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- collectionView:nativeAdForRowAtIndexPath:</option>
-	
-	<option value="//api/name/initWithManager:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:</option>
-	
-	<option value="//api/name/isAdCellAtIndexPath:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- isAdCellAtIndexPath:forStride:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adjustCount:forStride:">adjustCount:forStride:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adjustNonAdCellIndexPath:forStride:">adjustNonAdCellIndexPath:forStride:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/collectionView:nativeAdForRowAtIndexPath:">collectionView:nativeAdForRowAtIndexPath:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:">initWithManager:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isAdCellAtIndexPath:forStride:">isAdCellAtIndexPath:forStride:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdCollectionViewAdProvider Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdCollectionViewAdProvider Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdCollectionViewAdProvider.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdCollectionViewAdProvider</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:">&ndash;&nbsp;initWithManager:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/collectionView:nativeAdForRowAtIndexPath:">&ndash;&nbsp;collectionView:nativeAdForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isAdCellAtIndexPath:forStride:">&ndash;&nbsp;isAdCellAtIndexPath:forStride:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adjustNonAdCellIndexPath:forStride:">&ndash;&nbsp;adjustNonAdCellIndexPath:forStride:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adjustCount:forStride:">&ndash;&nbsp;adjustCount:forStride:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Passes delegate methods from FBNativeAd. Separate delegate calls will be made for each native ad contained.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBNativeAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adjustCount:forStride:" title="adjustCount:forStride:"></a>
-	<h3 class="subsubtitle method-title">adjustCount:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a collection view. Adjusts the total count of cells within the collection view to account for the ad cells.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSUInteger)adjustCount:(NSUInteger)<em>count</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>count</em></dt>
-			<dd><p>The count of cells in the collection view not including ads</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the collection view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>The total count of cells within the collection view including both ad and non-ad cells</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adjustNonAdCellIndexPath:forStride:" title="adjustNonAdCellIndexPath:forStride:"></a>
-	<h3 class="subsubtitle method-title">adjustNonAdCellIndexPath:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a collection view. Adjusts a non-ad cell indexPath to the indexPath it would be in a collection with no ads.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSIndexPath *)adjustNonAdCellIndexPath:(NSIndexPath *)<em>indexPath</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath to of the non-ad cell</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the collection view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>An indexPath adjusted to what it would be in a collection view with no ads</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/collectionView:nativeAdForRowAtIndexPath:" title="collectionView:nativeAdForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">collectionView:nativeAdForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Retrieve a native ad for an indexPath, will return the same ad for a given indexPath until the native ads manager is refreshed. This method is intended for usage with a collection view and specifically the caller is recommended to wait until  collectionView:cellForRowAtIndexPath: to ensure getting the best native ad for the given collection cell.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (FBNativeAd *)collectionView:(UICollectionView *)<em>collectionView</em> nativeAdForRowAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>collectionView</em></dt>
-			<dd><p>The collectionView where native ad will be used</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath to use as a key for this native ad</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>A FBNativeAd which is loaded and ready to be used.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:" title="initWithManager:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Create a FBNativeAdCollectionViewAdProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The FBNativeAdsManager which is consumed by this class.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isAdCellAtIndexPath:forStride:" title="isAdCellAtIndexPath:forStride:"></a>
-	<h3 class="subsubtitle method-title">isAdCellAtIndexPath:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a collection view. Computes whether this cell is an ad or not.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isAdCellAtIndexPath:(NSIndexPath *)<em>indexPath</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath of the cell within the collection view</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the collection view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>Boolean indicating whether the cell at the path is an ad</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewCellProvider.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewCellProvider.html
deleted file mode 100644
index d2d3bccec399..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdCollectionViewCellProvider.html
+++ /dev/null
@@ -1,481 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdCollectionViewCellProvider Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdCollectionViewCellProvider Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/collectionView:cellForItemAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- collectionView:cellForItemAtIndexPath:</option>
-	
-	<option value="//api/name/collectionView:heightForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- collectionView:heightForRowAtIndexPath:</option>
-	
-	<option value="//api/name/initWithManager:forType:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:forType:</option>
-	
-	<option value="//api/name/initWithManager:forType:forAttributes:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:forType:forAttributes:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/collectionView:cellForItemAtIndexPath:">collectionView:cellForItemAtIndexPath:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/collectionView:heightForRowAtIndexPath:">collectionView:heightForRowAtIndexPath:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:forType:">initWithManager:forType:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:forType:forAttributes:">initWithManager:forType:forAttributes:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdCollectionViewCellProvider Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdCollectionViewCellProvider Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBNativeAdCollectionViewAdProvider.html">FBNativeAdCollectionViewAdProvider</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdCollectionViewCellProvider.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdCollectionViewCellProvider</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:forType:">&ndash;&nbsp;initWithManager:forType:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:forType:forAttributes:">&ndash;&nbsp;initWithManager:forType:forAttributes:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/collectionView:cellForItemAtIndexPath:">&ndash;&nbsp;collectionView:cellForItemAtIndexPath:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/collectionView:heightForRowAtIndexPath:">&ndash;&nbsp;collectionView:heightForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/collectionView:cellForItemAtIndexPath:" title="collectionView:cellForItemAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">collectionView:cellForItemAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Helper method for implementors of UICollectionViewDataSource who would like to host native ad UICollectionViewCells in their collection view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (UICollectionViewCell *)collectionView:(UICollectionView *)<em>collectionView</em> cellForItemAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/collectionView:heightForRowAtIndexPath:" title="collectionView:heightForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">collectionView:heightForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Helper method for implementors of UICollectionViewDelegate who would like to host native ad UICollectionViewCells in their collection view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (CGFloat)collectionView:(nonnull UICollectionView *)<em>collectionView</em> heightForRowAtIndexPath:(nonnull NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:forType:" title="initWithManager:forType:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:forType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Method to create a FBNativeAdCollectionViewCellProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em> forType:(FBNativeAdViewType)<em>type</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The naitve ad manager consumed by this provider</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:forType:forAttributes:" title="initWithManager:forType:forAttributes:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:forType:forAttributes:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Method to create a FBNativeAdCollectionViewCellProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em> forType:(FBNativeAdViewType)<em>type</em> forAttributes:(FBNativeAdViewAttributes *)<em>attributes</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The naitve ad manager consumed by this provider</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>The layout of this native ad template. For more information, consult FBNativeAdViewLayout.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdCollectionViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdScrollView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdScrollView.html
deleted file mode 100644
index 6c78652f6b9a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdScrollView.html
+++ /dev/null
@@ -1,876 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdScrollView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdScrollView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/adPersistenceEnabled">&nbsp;&nbsp;&nbsp;&nbsp;adPersistenceEnabled</option>
-	
-	<option value="//api/name/animationEnabled">&nbsp;&nbsp;&nbsp;&nbsp;animationEnabled</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/maximumNativeAdCount">&nbsp;&nbsp;&nbsp;&nbsp;maximumNativeAdCount</option>
-	
-	<option value="//api/name/viewController">&nbsp;&nbsp;&nbsp;&nbsp;viewController</option>
-	
-	<option value="//api/name/xInset">&nbsp;&nbsp;&nbsp;&nbsp;xInset</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithNativeAdsManager:withType:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAdsManager:withType:</option>
-	
-	<option value="//api/name/initWithNativeAdsManager:withType:withAttributes:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAdsManager:withType:withAttributes:</option>
-	
-	<option value="//api/name/initWithNativeAdsManager:withType:withAttributes:withMaximum:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAdsManager:withType:withAttributes:withMaximum:</option>
-	
-	<option value="//api/name/initWithNativeAdsManager:withViewProvider:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAdsManager:withViewProvider:</option>
-	
-	<option value="//api/name/initWithNativeAdsManager:withViewProvider:withMaximum:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithNativeAdsManager:withViewProvider:withMaximum:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adPersistenceEnabled">adPersistenceEnabled</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/animationEnabled">animationEnabled</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/maximumNativeAdCount">maximumNativeAdCount</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/viewController">viewController</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/xInset">xInset</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAdsManager:withType:">initWithNativeAdsManager:withType:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAdsManager:withType:withAttributes:">initWithNativeAdsManager:withType:withAttributes:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAdsManager:withType:withAttributes:withMaximum:">initWithNativeAdsManager:withType:withAttributes:withMaximum:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAdsManager:withViewProvider:">initWithNativeAdsManager:withViewProvider:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithNativeAdsManager:withViewProvider:withMaximum:">initWithNativeAdsManager:withViewProvider:withMaximum:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdScrollView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdScrollView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdScrollView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdScrollView</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/maximumNativeAdCount">&nbsp;&nbsp;maximumNativeAdCount</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/animationEnabled">&nbsp;&nbsp;animationEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/xInset">&nbsp;&nbsp;xInset</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adPersistenceEnabled">&nbsp;&nbsp;adPersistenceEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/viewController">&nbsp;&nbsp;viewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAdsManager:withType:">&ndash;&nbsp;initWithNativeAdsManager:withType:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAdsManager:withType:withAttributes:">&ndash;&nbsp;initWithNativeAdsManager:withType:withAttributes:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAdsManager:withType:withAttributes:withMaximum:">&ndash;&nbsp;initWithNativeAdsManager:withType:withAttributes:withMaximum:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAdsManager:withViewProvider:">&ndash;&nbsp;initWithNativeAdsManager:withViewProvider:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithNativeAdsManager:withViewProvider:withMaximum:">&ndash;&nbsp;initWithNativeAdsManager:withViewProvider:withMaximum:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adPersistenceEnabled" title="adPersistenceEnabled"></a>
-	<h3 class="subsubtitle method-title">adPersistenceEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Reloads the same ads for the same manager. Default is NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isAdPersistenceEnabled) BOOL adPersistenceEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/animationEnabled" title="animationEnabled"></a>
-	<h3 class="subsubtitle method-title">animationEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Toggles animating the loaded views. Default is YES.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isAnimationEnabled) BOOL animationEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Passes delegate methods from FBNativeAd. Separate delegate calls will be made for each native ad contained.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBNativeAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/maximumNativeAdCount" title="maximumNativeAdCount"></a>
-	<h3 class="subsubtitle method-title">maximumNativeAdCount</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Maximum native ads that this scroll view will load. Defaults to 10. If changed after calling loadAds, all current ads will be discarded and loadAds must be called again.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) NSUInteger maximumNativeAdCount</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/viewController" title="viewController"></a>
-	<h3 class="subsubtitle method-title">viewController</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>A view controller that is used to present modal content. If nil, the view searches for a view controller.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) UIViewController *viewController</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/xInset" title="xInset"></a>
-	<h3 class="subsubtitle method-title">xInset</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Horizontal inset for views in the scroll view. Defaults to 8 points.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) CGFloat xInset</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAdsManager:withType:" title="initWithNativeAdsManager:withType:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAdsManager:withType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Creates a native ad horizontal scroll view for a given native ads manager and native ad template. The manager can be preloaded with ads, and loadAds will use the preloaded ads from the manager. Otherwise, the scroll view uses the manager to load ads normally.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithNativeAdsManager:(nonnull FBNativeAdsManager *)<em>manager</em> withType:(FBNativeAdViewType)<em>type</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>An instance of FBNativeAdManager. Can be preloaded with ads.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAdsManager:withType:withAttributes:" title="initWithNativeAdsManager:withType:withAttributes:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAdsManager:withType:withAttributes:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Creates a native ad horizontal scroll view for a given native ads manager and native ad template. The manager can be preloaded with ads, and loadAds will use the preloaded ads from the manager. Otherwise, the scroll view uses the manager to load ads normally.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithNativeAdsManager:(nonnull FBNativeAdsManager *)<em>manager</em> withType:(FBNativeAdViewType)<em>type</em> withAttributes:(nonnull FBNativeAdViewAttributes *)<em>attributes</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>An instance of FBNativeAdManager. Can be preloaded with ads.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>The layout of this native ad template. For more information, consult FBNativeAdViewLayout.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAdsManager:withType:withAttributes:withMaximum:" title="initWithNativeAdsManager:withType:withAttributes:withMaximum:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAdsManager:withType:withAttributes:withMaximum:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Creates a native ad horizontal scroll view for a given native ads manager and native ad template. The manager can be preloaded with ads, and loadAds will use the preloaded ads from the manager. Otherwise, the scroll view uses the manager to load ads normally.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithNativeAdsManager:(nonnull FBNativeAdsManager *)<em>manager</em> withType:(FBNativeAdViewType)<em>type</em> withAttributes:(nonnull FBNativeAdViewAttributes *)<em>attributes</em> withMaximum:(NSUInteger)<em>maximumNativeAdCount</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>An instance of FBNativeAdManager. Can be preloaded with ads.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>The layout of this native ad template. For more information, consult FBNativeAdViewLayout.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>maximumNativeAdCount</em></dt>
-			<dd><p>Maximum native ads to show at once.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAdsManager:withViewProvider:" title="initWithNativeAdsManager:withViewProvider:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAdsManager:withViewProvider:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>This is a method to create a native ad horizontal scroll view from a user provided view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithNativeAdsManager:(nonnull FBNativeAdsManager *)<em>manager</em> withViewProvider:(nonnull UIView *__nonnull ( ^ ) ( FBNativeAd *__nonnull nativeAd , NSUInteger position ))<em>childViewProvider</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>An instance of FBNativeAdManager. Can be preloaded with ads.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>childViewProvider</em></dt>
-			<dd><p>Block that creates new views for each loaded native ad. Must not reuse the same instance, but return a new view for each call. Views may be arbitrarily resized and should support resizing their content through Auto Layout constraints, autoresizing masks, or manual resizing.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithNativeAdsManager:withViewProvider:withMaximum:" title="initWithNativeAdsManager:withViewProvider:withMaximum:"></a>
-	<h3 class="subsubtitle method-title">initWithNativeAdsManager:withViewProvider:withMaximum:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>This is a method to create a native ad horizontal scroll view from a user provided view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithNativeAdsManager:(nonnull FBNativeAdsManager *)<em>manager</em> withViewProvider:(nonnull UIView *__nonnull ( ^ ) ( FBNativeAd *__nonnull nativeAd , NSUInteger position ))<em>childViewProvider</em> withMaximum:(NSUInteger)<em>maximumNativeAdCount</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>An instance of FBNativeAdManager. Can be preloaded with ads.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>childViewProvider</em></dt>
-			<dd><p>Block that creates new views for each loaded native ad. Must not reuse the same instance, but return a new view for each call. Views may be arbitrarily resized and should support resizing their content through Auto Layout constraints, autoresizing masks, or manual resizing.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>maximumNativeAdCount</em></dt>
-			<dd><p>Maximum native ads to show at once.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdScrollView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewAdProvider.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewAdProvider.html
deleted file mode 100644
index 9d7e66a7a602..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewAdProvider.html
+++ /dev/null
@@ -1,641 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdTableViewAdProvider Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdTableViewAdProvider Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/adjustCount:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- adjustCount:forStride:</option>
-	
-	<option value="//api/name/adjustNonAdCellIndexPath:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- adjustNonAdCellIndexPath:forStride:</option>
-	
-	<option value="//api/name/initWithManager:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:</option>
-	
-	<option value="//api/name/isAdCellAtIndexPath:forStride:">&nbsp;&nbsp;&nbsp;&nbsp;- isAdCellAtIndexPath:forStride:</option>
-	
-	<option value="//api/name/tableView:nativeAdForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- tableView:nativeAdForRowAtIndexPath:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adjustCount:forStride:">adjustCount:forStride:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adjustNonAdCellIndexPath:forStride:">adjustNonAdCellIndexPath:forStride:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:">initWithManager:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isAdCellAtIndexPath:forStride:">isAdCellAtIndexPath:forStride:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tableView:nativeAdForRowAtIndexPath:">tableView:nativeAdForRowAtIndexPath:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdTableViewAdProvider Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdTableViewAdProvider Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdTableViewAdProvider.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdTableViewAdProvider</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:">&ndash;&nbsp;initWithManager:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tableView:nativeAdForRowAtIndexPath:">&ndash;&nbsp;tableView:nativeAdForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isAdCellAtIndexPath:forStride:">&ndash;&nbsp;isAdCellAtIndexPath:forStride:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adjustNonAdCellIndexPath:forStride:">&ndash;&nbsp;adjustNonAdCellIndexPath:forStride:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adjustCount:forStride:">&ndash;&nbsp;adjustCount:forStride:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Passes delegate methods from FBNativeAd. Separate delegate calls will be made for each native ad contained.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBNativeAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adjustCount:forStride:" title="adjustCount:forStride:"></a>
-	<h3 class="subsubtitle method-title">adjustCount:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a table view. Adjusts the total count of cells within the table view to account for the ad cells.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSUInteger)adjustCount:(NSUInteger)<em>count</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>count</em></dt>
-			<dd><p>The count of cells in the table view not including ads</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the table view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>The total count of cells within the table view including both ad and non-ad cells</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adjustNonAdCellIndexPath:forStride:" title="adjustNonAdCellIndexPath:forStride:"></a>
-	<h3 class="subsubtitle method-title">adjustNonAdCellIndexPath:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a table view. Adjusts a non-ad cell indexPath to the indexPath it would be in a collection with no ads.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSIndexPath *)adjustNonAdCellIndexPath:(NSIndexPath *)<em>indexPath</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath to of the non-ad cell</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the table view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>An indexPath adjusted to what it would be in a table view with no ads</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:" title="initWithManager:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Create a FBNativeAdTableViewAdProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The FBNativeAdsManager which is consumed by this class.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isAdCellAtIndexPath:forStride:" title="isAdCellAtIndexPath:forStride:"></a>
-	<h3 class="subsubtitle method-title">isAdCellAtIndexPath:forStride:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Support for evenly distributed native ads within a table view. Computes whether this cell is an ad or not.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isAdCellAtIndexPath:(NSIndexPath *)<em>indexPath</em> forStride:(NSUInteger)<em>stride</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath of the cell within the table view</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>stride</em></dt>
-			<dd><p>The frequency that native ads are to appear within the table view</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>Boolean indicating whether the cell at the path is an ad</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tableView:nativeAdForRowAtIndexPath:" title="tableView:nativeAdForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">tableView:nativeAdForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Retrieve a native ad for an indexPath, will return the same ad for a given indexPath until the native ads manager is refreshed. This method is intended for usage with a table view and specifically the caller is recommended to wait until  tableView:cellForRowAtIndexPath: to ensure getting the best native ad for the given table cell.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (FBNativeAd *)tableView:(UITableView *)<em>tableView</em> nativeAdForRowAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>tableView</em></dt>
-			<dd><p>The tableView where native ad will be used</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>indexPath</em></dt>
-			<dd><p>The indexPath to use as a key for this native ad</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>A FBNativeAd which is loaded and ready to be used.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewAdProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewCellProvider.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewCellProvider.html
deleted file mode 100644
index 14606fa07430..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdTableViewCellProvider.html
+++ /dev/null
@@ -1,530 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdTableViewCellProvider Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdTableViewCellProvider Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithManager:forType:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:forType:</option>
-	
-	<option value="//api/name/initWithManager:forType:forAttributes:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithManager:forType:forAttributes:</option>
-	
-	<option value="//api/name/tableView:cellForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- tableView:cellForRowAtIndexPath:</option>
-	
-	<option value="//api/name/tableView:estimatedHeightForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- tableView:estimatedHeightForRowAtIndexPath:</option>
-	
-	<option value="//api/name/tableView:heightForRowAtIndexPath:">&nbsp;&nbsp;&nbsp;&nbsp;- tableView:heightForRowAtIndexPath:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:forType:">initWithManager:forType:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithManager:forType:forAttributes:">initWithManager:forType:forAttributes:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tableView:cellForRowAtIndexPath:">tableView:cellForRowAtIndexPath:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tableView:estimatedHeightForRowAtIndexPath:">tableView:estimatedHeightForRowAtIndexPath:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tableView:heightForRowAtIndexPath:">tableView:heightForRowAtIndexPath:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdTableViewCellProvider Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdTableViewCellProvider Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBNativeAdTableViewAdProvider.html">FBNativeAdTableViewAdProvider</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">UITableViewDataSource</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdTableViewCellProvider.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdTableViewCellProvider</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:forType:">&ndash;&nbsp;initWithManager:forType:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithManager:forType:forAttributes:">&ndash;&nbsp;initWithManager:forType:forAttributes:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tableView:cellForRowAtIndexPath:">&ndash;&nbsp;tableView:cellForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tableView:heightForRowAtIndexPath:">&ndash;&nbsp;tableView:heightForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tableView:estimatedHeightForRowAtIndexPath:">&ndash;&nbsp;tableView:estimatedHeightForRowAtIndexPath:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:forType:" title="initWithManager:forType:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:forType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Method to create a FBNativeAdTableViewCellProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em> forType:(FBNativeAdViewType)<em>type</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The naitve ad manager consumed by this provider</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithManager:forType:forAttributes:" title="initWithManager:forType:forAttributes:"></a>
-	<h3 class="subsubtitle method-title">initWithManager:forType:forAttributes:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Method to create a FBNativeAdTableViewCellProvider.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithManager:(FBNativeAdsManager *)<em>manager</em> forType:(FBNativeAdViewType)<em>type</em> forAttributes:(FBNativeAdViewAttributes *)<em>attributes</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>manager</em></dt>
-			<dd><p>The naitve ad manager consumed by this provider</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>The layout of this native ad template. For more information, consult FBNativeAdViewLayout.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tableView:cellForRowAtIndexPath:" title="tableView:cellForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">tableView:cellForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Helper method for implementors of UITableViewDataSource who would like to host native ad UITableViewCells in their table view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (UITableViewCell *)tableView:(UITableView *)<em>tableView</em> cellForRowAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tableView:estimatedHeightForRowAtIndexPath:" title="tableView:estimatedHeightForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">tableView:estimatedHeightForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Helper method for implementors of UITableViewDelegate who would like to host native ad UITableViewCells in their table view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (CGFloat)tableView:(UITableView *)<em>tableView</em> estimatedHeightForRowAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tableView:heightForRowAtIndexPath:" title="tableView:heightForRowAtIndexPath:"></a>
-	<h3 class="subsubtitle method-title">tableView:heightForRowAtIndexPath:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Helper method for implementors of UITableViewDelegate who would like to host native ad UITableViewCells in their table view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (CGFloat)tableView:(UITableView *)<em>tableView</em> heightForRowAtIndexPath:(NSIndexPath *)<em>indexPath</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdTableViewCellProvider.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdView.html
deleted file mode 100644
index 5cd7577cccd0..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdView.html
+++ /dev/null
@@ -1,501 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/type">&nbsp;&nbsp;&nbsp;&nbsp;type</option>
-	
-	<option value="//api/name/viewController">&nbsp;&nbsp;&nbsp;&nbsp;viewController</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/nativeAdViewWithNativeAd:withType:">&nbsp;&nbsp;&nbsp;&nbsp;+ nativeAdViewWithNativeAd:withType:</option>
-	
-	<option value="//api/name/nativeAdViewWithNativeAd:withType:withAttributes:">&nbsp;&nbsp;&nbsp;&nbsp;+ nativeAdViewWithNativeAd:withType:withAttributes:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/type">type</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/viewController">viewController</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdViewWithNativeAd:withType:">nativeAdViewWithNativeAd:withType:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdViewWithNativeAd:withType:withAttributes:">nativeAdViewWithNativeAd:withType:withAttributes:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdView</p>
-
-<p>@abstract
-The FBNativeAdView creates prebuilt native ad template views and manages native ads.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/type">&nbsp;&nbsp;type</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdViewWithNativeAd:withType:">+&nbsp;nativeAdViewWithNativeAd:withType:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/viewController">&nbsp;&nbsp;viewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdViewWithNativeAd:withType:withAttributes:">+&nbsp;nativeAdViewWithNativeAd:withType:withAttributes:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/type" title="type"></a>
-	<h3 class="subsubtitle method-title">type</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>The type of the view, specifies which template to use</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) FBNativeAdViewType type</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/viewController" title="viewController"></a>
-	<h3 class="subsubtitle method-title">viewController</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>A view controller that is used to present modal content. If nil, the view searches for a view controller.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) UIViewController *viewController</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdViewWithNativeAd:withType:" title="nativeAdViewWithNativeAd:withType:"></a>
-	<h3 class="subsubtitle method-title">nativeAdViewWithNativeAd:withType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method
-@abstract
-This is a method to create a native ad template using the given placement id and type.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (nonnull instancetype)nativeAdViewWithNativeAd:(nonnull FBNativeAd *)<em>nativeAd</em> withType:(FBNativeAdViewType)<em>type</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>The native ad to use to create this view.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdViewWithNativeAd:withType:withAttributes:" title="nativeAdViewWithNativeAd:withType:withAttributes:"></a>
-	<h3 class="subsubtitle method-title">nativeAdViewWithNativeAd:withType:withAttributes:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method
-@abstract
-This is a method to create a native ad template using the given placement id and type.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (nonnull instancetype)nativeAdViewWithNativeAd:(nonnull FBNativeAd *)<em>nativeAd</em> withType:(FBNativeAdViewType)<em>type</em> withAttributes:(nonnull FBNativeAdViewAttributes *)<em>attributes</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>The native ad to use to create this view.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type of this native ad template. For more information, consult FBNativeAdViewType.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>attributes</em></dt>
-			<dd><p>The attributes to render this native ad template with.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdViewAttributes.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdViewAttributes.html
deleted file mode 100644
index 3b3dd3518fe5..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdViewAttributes.html
+++ /dev/null
@@ -1,879 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdViewAttributes Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdViewAttributes Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/autoplayEnabled">&nbsp;&nbsp;&nbsp;&nbsp;autoplayEnabled</option>
-	
-	<option value="//api/name/backgroundColor">&nbsp;&nbsp;&nbsp;&nbsp;backgroundColor</option>
-	
-	<option value="//api/name/buttonBorderColor">&nbsp;&nbsp;&nbsp;&nbsp;buttonBorderColor</option>
-	
-	<option value="//api/name/buttonColor">&nbsp;&nbsp;&nbsp;&nbsp;buttonColor</option>
-	
-	<option value="//api/name/buttonTitleColor">&nbsp;&nbsp;&nbsp;&nbsp;buttonTitleColor</option>
-	
-	<option value="//api/name/buttonTitleFont">&nbsp;&nbsp;&nbsp;&nbsp;buttonTitleFont</option>
-	
-	<option value="//api/name/descriptionColor">&nbsp;&nbsp;&nbsp;&nbsp;descriptionColor</option>
-	
-	<option value="//api/name/descriptionFont">&nbsp;&nbsp;&nbsp;&nbsp;descriptionFont</option>
-	
-	<option value="//api/name/titleColor">&nbsp;&nbsp;&nbsp;&nbsp;titleColor</option>
-	
-	<option value="//api/name/titleFont">&nbsp;&nbsp;&nbsp;&nbsp;titleFont</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/defaultAttributesForType:">&nbsp;&nbsp;&nbsp;&nbsp;+ defaultAttributesForType:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithDictionary:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithDictionary:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/autoplayEnabled">autoplayEnabled</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/backgroundColor">backgroundColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/buttonBorderColor">buttonBorderColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/buttonColor">buttonColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/buttonTitleColor">buttonTitleColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/buttonTitleFont">buttonTitleFont</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/descriptionColor">descriptionColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/descriptionFont">descriptionFont</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/titleColor">titleColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/titleFont">titleFont</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/defaultAttributesForType:">defaultAttributesForType:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithDictionary:">initWithDictionary:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdViewAttributes Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdViewAttributes Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSCopying</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdViewLayout
-@abstract
-Describes the look and feel of a native ad view.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithDictionary:">&ndash;&nbsp;initWithDictionary:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/backgroundColor">&nbsp;&nbsp;backgroundColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/titleColor">&nbsp;&nbsp;titleColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/titleFont">&nbsp;&nbsp;titleFont</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/descriptionColor">&nbsp;&nbsp;descriptionColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/descriptionFont">&nbsp;&nbsp;descriptionFont</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/buttonColor">&nbsp;&nbsp;buttonColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/buttonTitleColor">&nbsp;&nbsp;buttonTitleColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/buttonTitleFont">&nbsp;&nbsp;buttonTitleFont</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/buttonBorderColor">&nbsp;&nbsp;buttonBorderColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/autoplayEnabled">&nbsp;&nbsp;autoplayEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/defaultAttributesForType:">+&nbsp;defaultAttributesForType:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/autoplayEnabled" title="autoplayEnabled"></a>
-	<h3 class="subsubtitle method-title">autoplayEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Enables or disables autoplay for some types of media. Defaults to YES.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isAutoplayEnabled) BOOL autoplayEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/backgroundColor" title="backgroundColor"></a>
-	<h3 class="subsubtitle method-title">backgroundColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Background color of the native ad view.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *backgroundColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/buttonBorderColor" title="buttonBorderColor"></a>
-	<h3 class="subsubtitle method-title">buttonBorderColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Border color of the call to action button. If nil, no border is shown.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *buttonBorderColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/buttonColor" title="buttonColor"></a>
-	<h3 class="subsubtitle method-title">buttonColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Background color of the call to action button.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *buttonColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/buttonTitleColor" title="buttonTitleColor"></a>
-	<h3 class="subsubtitle method-title">buttonTitleColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Color of the call to action button&rsquo;s title label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *buttonTitleColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/buttonTitleFont" title="buttonTitleFont"></a>
-	<h3 class="subsubtitle method-title">buttonTitleFont</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Font of the call to action button&rsquo;s title label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIFont *buttonTitleFont</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/descriptionColor" title="descriptionColor"></a>
-	<h3 class="subsubtitle method-title">descriptionColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Color of the description label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *descriptionColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/descriptionFont" title="descriptionFont"></a>
-	<h3 class="subsubtitle method-title">descriptionFont</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Font of the description label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIFont *descriptionFont</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/titleColor" title="titleColor"></a>
-	<h3 class="subsubtitle method-title">titleColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Color of the title label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIColor *titleColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/titleFont" title="titleFont"></a>
-	<h3 class="subsubtitle method-title">titleFont</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property
-@abstract
-Font of the title label.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, nullable) UIFont *titleFont</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/defaultAttributesForType:" title="defaultAttributesForType:"></a>
-	<h3 class="subsubtitle method-title">defaultAttributesForType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method
-@abstract
-Returns default attributes for a given type.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (nonnull instancetype)defaultAttributesForType:(FBNativeAdViewType)<em>type</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>type</em></dt>
-			<dd><p>The type for this layout.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithDictionary:" title="initWithDictionary:"></a>
-	<h3 class="subsubtitle method-title">initWithDictionary:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method
-@abstract
-This is a method to create native ad view attributes with a dictionary</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (nonnull instancetype)initWithDictionary:(nonnull NSDictionary *)<em>dict</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdsManager.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdsManager.html
deleted file mode 100644
index 2b5d9915f790..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBNativeAdsManager.html
+++ /dev/null
@@ -1,663 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdsManager Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdsManager Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/mediaCachePolicy">&nbsp;&nbsp;&nbsp;&nbsp;mediaCachePolicy</option>
-	
-	<option value="//api/name/nextNativeAd">&nbsp;&nbsp;&nbsp;&nbsp;nextNativeAd</option>
-	
-	<option value="//api/name/uniqueNativeAdCount">&nbsp;&nbsp;&nbsp;&nbsp;uniqueNativeAdCount</option>
-	
-	<option value="//api/name/valid">&nbsp;&nbsp;&nbsp;&nbsp;valid</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/disableAutoRefresh">&nbsp;&nbsp;&nbsp;&nbsp;- disableAutoRefresh</option>
-	
-	<option value="//api/name/initWithPlacementID:forNumAdsRequested:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:forNumAdsRequested:</option>
-	
-	<option value="//api/name/loadAds">&nbsp;&nbsp;&nbsp;&nbsp;- loadAds</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaCachePolicy">mediaCachePolicy</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nextNativeAd">nextNativeAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/uniqueNativeAdCount">uniqueNativeAdCount</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/valid">valid</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/disableAutoRefresh">disableAutoRefresh</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:forNumAdsRequested:">initWithPlacementID:forNumAdsRequested:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAds">loadAds</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdsManager Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdsManager Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdsManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBNativeAdsManager</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaCachePolicy">&nbsp;&nbsp;mediaCachePolicy</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/uniqueNativeAdCount">&nbsp;&nbsp;uniqueNativeAdCount</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/valid">&nbsp;&nbsp;valid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:forNumAdsRequested:">&ndash;&nbsp;initWithPlacementID:forNumAdsRequested:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAds">&ndash;&nbsp;loadAds</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/disableAutoRefresh">&ndash;&nbsp;disableAutoRefresh</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nextNativeAd">&nbsp;&nbsp;nextNativeAd</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>The delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBNativeAdsManagerDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaCachePolicy" title="mediaCachePolicy"></a>
-	<h3 class="subsubtitle method-title">mediaCachePolicy</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Set the native ads manager caching policy. This controls which media from the native ads are cached before the native ads manager calls nativeAdsLoaded on its delegate. The default is to not block on caching.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBNativeAdsCachePolicy mediaCachePolicy</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nextNativeAd" title="nextNativeAd"></a>
-	<h3 class="subsubtitle method-title">nextNativeAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Retrieve the next native ad to be used from the batch. It is highly recommended that the caller wait until immediately before rendering the ad content to call this method to ensure the best ad for the given context is used. If more than uniqueNativeAdCount ads are requested cloned ads will be returned. Periodically the native ads manager will refresh and new ads will be returned.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly, strong, nullable) FBNativeAd *nextNativeAd</code></div>
-
-    
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>A FBNativeAd which is loaded and ready to be used.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/uniqueNativeAdCount" title="uniqueNativeAdCount"></a>
-	<h3 class="subsubtitle method-title">uniqueNativeAdCount</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Number of unique native ads that can be accessed through nextNativeAd:. This is not valid until the nativeAdsLoaded: message has been sent.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) NSUInteger uniqueNativeAdCount</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/valid" title="valid"></a>
-	<h3 class="subsubtitle method-title">valid</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Returns YES after nativeAdsLoaded: message has been sent.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isValid, readonly) BOOL valid</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/disableAutoRefresh" title="disableAutoRefresh"></a>
-	<h3 class="subsubtitle method-title">disableAutoRefresh</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>By default the native ads manager will refresh its ads periodically. This does not mean that any ads which are shown in the application&rsquo;s UI will be refreshed but simply that calling nextNativeAd: may return different ads at different times. This method disables that functionality.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)disableAutoRefresh</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:forNumAdsRequested:" title="initWithPlacementID:forNumAdsRequested:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:forNumAdsRequested:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Initialize the native ads manager.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em> forNumAdsRequested:(NSUInteger)<em>numAdsRequested</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>numAdsRequested</em></dt>
-			<dd><p>The number of ads you would like the native ads manager to retrieve.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAds" title="loadAds"></a>
-	<h3 class="subsubtitle method-title">loadAds</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>The method that kicks off the loading of ads. It may be called again in the future to refresh the ads manually.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAds</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBRewardedVideoAd.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBRewardedVideoAd.html
deleted file mode 100644
index ac1bff9d901d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Classes/FBRewardedVideoAd.html
+++ /dev/null
@@ -1,816 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBRewardedVideoAd Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBRewardedVideoAd Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/adValid">&nbsp;&nbsp;&nbsp;&nbsp;adValid</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/placementID">&nbsp;&nbsp;&nbsp;&nbsp;placementID</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithPlacementID:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:</option>
-	
-	<option value="//api/name/initWithPlacementID:withUserID:withCurrency:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:withUserID:withCurrency:</option>
-	
-	<option value="//api/name/initWithPlacementID:withUserID:withCurrency:withAmount:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithPlacementID:withUserID:withCurrency:withAmount:</option>
-	
-	<option value="//api/name/loadAd">&nbsp;&nbsp;&nbsp;&nbsp;- loadAd</option>
-	
-	<option value="//api/name/showAdFromRootViewController:">&nbsp;&nbsp;&nbsp;&nbsp;- showAdFromRootViewController:</option>
-	
-	<option value="//api/name/showAdFromRootViewController:animated:">&nbsp;&nbsp;&nbsp;&nbsp;- showAdFromRootViewController:animated:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adValid">adValid</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placementID">placementID</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:">initWithPlacementID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:withUserID:withCurrency:">initWithPlacementID:withUserID:withCurrency:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithPlacementID:withUserID:withCurrency:withAmount:">initWithPlacementID:withUserID:withCurrency:withAmount:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadAd">loadAd</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showAdFromRootViewController:">showAdFromRootViewController:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showAdFromRootViewController:animated:">showAdFromRootViewController:animated:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBRewardedVideoAd Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBRewardedVideoAd Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBRewardedVideoAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@class FBRewardedVideoAd</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placementID">&nbsp;&nbsp;placementID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adValid">&nbsp;&nbsp;adValid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:">&ndash;&nbsp;initWithPlacementID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:withUserID:withCurrency:">&ndash;&nbsp;initWithPlacementID:withUserID:withCurrency:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithPlacementID:withUserID:withCurrency:withAmount:">&ndash;&nbsp;initWithPlacementID:withUserID:withCurrency:withAmount:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadAd">&ndash;&nbsp;loadAd</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showAdFromRootViewController:">&ndash;&nbsp;showAdFromRootViewController:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showAdFromRootViewController:animated:">&ndash;&nbsp;showAdFromRootViewController:animated:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adValid" title="adValid"></a>
-	<h3 class="subsubtitle method-title">adValid</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, getter=isAdValid, readonly) BOOL adValid</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Returns true if the rewarded video ad has been successfully loaded.</p><p>You should check <code>isAdValid</code> before trying to show the ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak, nullable) id&lt;FBRewardedVideoAdDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placementID" title="placementID"></a>
-	<h3 class="subsubtitle method-title">placementID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Typed access to the id of the ad placement.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *placementID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:" title="initWithPlacementID:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBRewardedVideoAd matching the given placement id.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:withUserID:withCurrency:" title="initWithPlacementID:withUserID:withCurrency:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:withUserID:withCurrency:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em> withUserID:(nullable NSString *)<em>userID</em> withCurrency:(nullable NSString *)<em>currency</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>userID</em></dt>
-			<dd><p>the id of the user</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>currency</em></dt>
-			<dd><p>reward currency type</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBRewardedVideoAd matching the given placement id and allows the publisher to set
-the reward to give to a user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithPlacementID:withUserID:withCurrency:withAmount:" title="initWithPlacementID:withUserID:withCurrency:withAmount:"></a>
-	<h3 class="subsubtitle method-title">initWithPlacementID:withUserID:withCurrency:withAmount:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithPlacementID:(NSString *)<em>placementID</em> withUserID:(nullable NSString *)<em>userID</em> withCurrency:(nullable NSString *)<em>currency</em> withAmount:(NSInteger)<em>amount</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>placementID</em></dt>
-			<dd><p>The id of the ad placement. You can create your placement id from Facebook developers page.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>userID</em></dt>
-			<dd><p>the id of the user</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>currency</em></dt>
-			<dd><p>reward currency type</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>amount</em></dt>
-			<dd><p>reward amount</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-This is a method to initialize an FBRewardedVideoAd matching the given placement id and allows the publisher to set
-the reward to give to a user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadAd" title="loadAd"></a>
-	<h3 class="subsubtitle method-title">loadAd</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loadAd</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Begins loading the FBRewardedVideoAd content.</p><p>You can implement <code>rewardedVideoAdDidLoad:</code> and <code>rewardedVideoAd:didFailWithError:</code> methods
-of <code>FBRewardedVideoAdDelegate</code> if you would like to be notified as loading succeeds or fails.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/showAdFromRootViewController:" title="showAdFromRootViewController:"></a>
-	<h3 class="subsubtitle method-title">showAdFromRootViewController:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)showAdFromRootViewController:(UIViewController *)<em>rootViewController</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rootViewController</em></dt>
-			<dd><p>The view controller that will be used to present the rewarded video ad.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Presents the rewarded video ad modally from the specified view controller.</p><p>You can implement <code>rewardedVideoAdDidClick:</code> and <code>rewardedVideoAdWillClose:</code>
-methods of <code>FBRewardedVideoAdDelegate</code> if you would like to stay informed for those events.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/showAdFromRootViewController:animated:" title="showAdFromRootViewController:animated:"></a>
-	<h3 class="subsubtitle method-title">showAdFromRootViewController:animated:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)showAdFromRootViewController:(UIViewController *)<em>rootViewController</em> animated:(BOOL)<em>flag</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rootViewController</em></dt>
-			<dd><p>The view controller that will be used to present the rewarded video ad.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>flag</em></dt>
-			<dd><p>Pass YES to animate the presentation; otherwise, pass NO.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Presents the rewarded video ad modally from the specified view controller.</p><p>You can implement <code>rewardedVideoAdDidClick:</code> and <code>rewardedVideoAdWillClose:</code>
-methods of <code>FBRewardedVideoAdDelegate</code> if you would like to stay informed for those events.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBAdLogLevel.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBAdLogLevel.html
deleted file mode 100644
index 278e32acf79c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBAdLogLevel.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdLogLevel Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdLogLevel Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdLogLevel Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdLogLevel Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBAdSettings.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBAdLogLevel</h3>
-                    
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSInteger, FBAdLogLevel ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelNone</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelNotification</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelError</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelWarning</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelLog</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelDebug</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBAdLogLevelVerbose</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBAdLogLevelNone"></a><code>FBAdLogLevelNone</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelNotification"></a><code>FBAdLogLevelNotification</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelError"></a><code>FBAdLogLevelError</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelWarning"></a><code>FBAdLogLevelWarning</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelLog"></a><code>FBAdLogLevelLog</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelDebug"></a><code>FBAdLogLevelDebug</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBAdLogLevelVerbose"></a><code>FBAdLogLevelVerbose</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBAdSettings.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdViewType.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdViewType.html
deleted file mode 100644
index 7bef09895544..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdViewType.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdViewType Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdViewType Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdViewType Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdViewType Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBNativeAdViewType</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>@enum FBNativeAdViewType enum</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSInteger, FBNativeAdViewType ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdViewTypeGenericHeight100</a> = 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdViewTypeGenericHeight120</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdViewTypeGenericHeight300</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdViewTypeGenericHeight400</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBNativeAdViewTypeGenericHeight100"></a><code>FBNativeAdViewTypeGenericHeight100</code></dt>
-<dd>
-
-
-<p>Determines the type of native ad template. Different views are created
-for different values of FBNativeAdViewType</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAdView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdViewTypeGenericHeight120"></a><code>FBNativeAdViewTypeGenericHeight120</code></dt>
-<dd>
-
-
-<p>Determines the type of native ad template. Different views are created
-for different values of FBNativeAdViewType</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAdView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdViewTypeGenericHeight300"></a><code>FBNativeAdViewTypeGenericHeight300</code></dt>
-<dd>
-
-
-<p>Determines the type of native ad template. Different views are created
-for different values of FBNativeAdViewType</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAdView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdViewTypeGenericHeight400"></a><code>FBNativeAdViewTypeGenericHeight400</code></dt>
-<dd>
-
-
-<p>Determines the type of native ad template. Different views are created
-for different values of FBNativeAdViewType</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAdView.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBNativeAdView.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdsCachePolicy.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdsCachePolicy.html
deleted file mode 100644
index aecf281fa4a4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Constants/FBNativeAdsCachePolicy.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdsCachePolicy Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdsCachePolicy Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdsCachePolicy Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdsCachePolicy Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBNativeAdsCachePolicy</h3>
-                    
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_OPTIONS(NSInteger, FBNativeAdsCachePolicy ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdsCachePolicyNone</a> = 1 &lt; &lt; 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdsCachePolicyIcon</a> = 1 &lt; &lt; 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdsCachePolicyCoverImage</a> = 1 &lt; &lt; 2,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdsCachePolicyVideo</a> = 1 &lt; &lt; 3,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBNativeAdsCachePolicyAll</a> = FBNativeAdsCachePolicyCoverImage | FBNativeAdsCachePolicyIcon | FBNativeAdsCachePolicyVideo,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBNativeAdsCachePolicyNone"></a><code>FBNativeAdsCachePolicyNone</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAd.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdsCachePolicyIcon"></a><code>FBNativeAdsCachePolicyIcon</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAd.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdsCachePolicyCoverImage"></a><code>FBNativeAdsCachePolicyCoverImage</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAd.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdsCachePolicyVideo"></a><code>FBNativeAdsCachePolicyVideo</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAd.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBNativeAdsCachePolicyAll"></a><code>FBNativeAdsCachePolicyAll</code></dt>
-<dd>
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBNativeAd.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBAdViewDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBAdViewDelegate.html
deleted file mode 100644
index 9b0732304ef9..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBAdViewDelegate.html	
+++ /dev/null
@@ -1,655 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBAdViewDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBAdViewDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/viewControllerForPresentingModalView">&nbsp;&nbsp;&nbsp;&nbsp;viewControllerForPresentingModalView</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/adView:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- adView:didFailWithError:</option>
-	
-	<option value="//api/name/adViewDidClick:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidClick:</option>
-	
-	<option value="//api/name/adViewDidFinishHandlingClick:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidFinishHandlingClick:</option>
-	
-	<option value="//api/name/adViewDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidLoad:</option>
-	
-	<option value="//api/name/adViewWillLogImpression:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewWillLogImpression:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/viewControllerForPresentingModalView">viewControllerForPresentingModalView</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adView:didFailWithError:">adView:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidClick:">adViewDidClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidFinishHandlingClick:">adViewDidFinishHandlingClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidLoad:">adViewDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewWillLogImpression:">adViewWillLogImpression:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBAdViewDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBAdViewDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>@abstract
-The methods declared by the FBAdViewDelegate protocol allow the adopting delegate to respond
-to messages from the FBAdView class and thus respond to operations such as whether the ad has
-been loaded, the person has clicked the ad.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidClick:">&ndash;&nbsp;adViewDidClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidFinishHandlingClick:">&ndash;&nbsp;adViewDidFinishHandlingClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidLoad:">&ndash;&nbsp;adViewDidLoad:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adView:didFailWithError:">&ndash;&nbsp;adView:didFailWithError:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewWillLogImpression:">&ndash;&nbsp;adViewWillLogImpression:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/viewControllerForPresentingModalView">&nbsp;&nbsp;viewControllerForPresentingModalView</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/viewControllerForPresentingModalView" title="viewControllerForPresentingModalView"></a>
-	<h3 class="subsubtitle method-title">viewControllerForPresentingModalView</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@property</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly, strong, nonnull) UIViewController *viewControllerForPresentingModalView</code></div>
-
-    
-	
-	
-	
-	<div class="method-subsection return">
-		<h4 class="method-subtitle parameter-title">Return Value</h4>
-		<p>A view controller that is used to present modal content.</p>
-	</div>
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Asks the delegate for a view controller to present modal content, such as the in-app
-browser that can appear when an ad is clicked.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adView:didFailWithError:" title="adView:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">adView:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)adView:(FBAdView *)<em>adView</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adView</em></dt>
-			<dd><p>An FBAdView object sending the message.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>error</em></dt>
-			<dd><p>An error object containing details of the error.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an FBAdView fails to load the ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidClick:" title="adViewDidClick:"></a>
-	<h3 class="subsubtitle method-title">adViewDidClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidClick:(FBAdView *)<em>adView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adView</em></dt>
-			<dd><p>An FBAdView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an ad has been clicked by the person.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidFinishHandlingClick:" title="adViewDidFinishHandlingClick:"></a>
-	<h3 class="subsubtitle method-title">adViewDidFinishHandlingClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidFinishHandlingClick:(FBAdView *)<em>adView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adView</em></dt>
-			<dd><p>An FBAdView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-When an ad is clicked, the modal view will be presented. And when the user finishes the
-interaction with the modal view and dismiss it, this message will be sent, returning control
-to the application.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidLoad:" title="adViewDidLoad:"></a>
-	<h3 class="subsubtitle method-title">adViewDidLoad:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidLoad:(FBAdView *)<em>adView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adView</em></dt>
-			<dd><p>An FBAdView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an ad has been successfully loaded.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewWillLogImpression:" title="adViewWillLogImpression:"></a>
-	<h3 class="subsubtitle method-title">adViewWillLogImpression:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewWillLogImpression:(FBAdView *)<em>adView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>adView</em></dt>
-			<dd><p>An FBAdView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before the impression of an FBAdView object will be logged.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBAdView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInstreamAdViewDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInstreamAdViewDelegate.html
deleted file mode 100644
index 863a469b1463..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInstreamAdViewDelegate.html	
+++ /dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBInstreamAdViewDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBInstreamAdViewDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/adView:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- adView:didFailWithError:</option>
-	
-	<option value="//api/name/adViewDidClick:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidClick:</option>
-	
-	<option value="//api/name/adViewDidEnd:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidEnd:</option>
-	
-	<option value="//api/name/adViewDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewDidLoad:</option>
-	
-	<option value="//api/name/adViewWillLogImpression:">&nbsp;&nbsp;&nbsp;&nbsp;- adViewWillLogImpression:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adView:didFailWithError:">adView:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidClick:">adViewDidClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidEnd:">adViewDidEnd:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewDidLoad:">adViewDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/adViewWillLogImpression:">adViewWillLogImpression:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBInstreamAdViewDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBInstreamAdViewDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBInstreamAdView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidLoad:">&ndash;&nbsp;adViewDidLoad:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidEnd:">&ndash;&nbsp;adViewDidEnd:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adView:didFailWithError:">&ndash;&nbsp;adView:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewDidClick:">&ndash;&nbsp;adViewDidClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/adViewWillLogImpression:">&ndash;&nbsp;adViewWillLogImpression:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/adView:didFailWithError:" title="adView:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">adView:didFailWithError:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)adView:(nonnull FBInstreamAdView *)<em>adView</em> didFailWithError:(nonnull NSError *)<em>error</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidClick:" title="adViewDidClick:"></a>
-	<h3 class="subsubtitle method-title">adViewDidClick:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidClick:(nonnull FBInstreamAdView *)<em>adView</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidEnd:" title="adViewDidEnd:"></a>
-	<h3 class="subsubtitle method-title">adViewDidEnd:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidEnd:(nonnull FBInstreamAdView *)<em>adView</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewDidLoad:" title="adViewDidLoad:"></a>
-	<h3 class="subsubtitle method-title">adViewDidLoad:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewDidLoad:(nonnull FBInstreamAdView *)<em>adView</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/adViewWillLogImpression:" title="adViewWillLogImpression:"></a>
-	<h3 class="subsubtitle method-title">adViewWillLogImpression:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (void)adViewWillLogImpression:(nonnull FBInstreamAdView *)<em>adView</em></code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInterstitialAdDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInterstitialAdDelegate.html
deleted file mode 100644
index eb6b4ab60cdd..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBInterstitialAdDelegate.html	
+++ /dev/null
@@ -1,646 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBInterstitialAdDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBInterstitialAdDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/interstitialAd:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAd:didFailWithError:</option>
-	
-	<option value="//api/name/interstitialAdDidClick:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAdDidClick:</option>
-	
-	<option value="//api/name/interstitialAdDidClose:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAdDidClose:</option>
-	
-	<option value="//api/name/interstitialAdDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAdDidLoad:</option>
-	
-	<option value="//api/name/interstitialAdWillClose:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAdWillClose:</option>
-	
-	<option value="//api/name/interstitialAdWillLogImpression:">&nbsp;&nbsp;&nbsp;&nbsp;- interstitialAdWillLogImpression:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAd:didFailWithError:">interstitialAd:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAdDidClick:">interstitialAdDidClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAdDidClose:">interstitialAdDidClose:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAdDidLoad:">interstitialAdDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAdWillClose:">interstitialAdWillClose:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/interstitialAdWillLogImpression:">interstitialAdWillLogImpression:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBInterstitialAdDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBInterstitialAdDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBInterstitialAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>@abstract
-The methods declared by the FBInterstitialAdDelegate protocol allow the adopting delegate to respond
-to messages from the FBInterstitialAd class and thus respond to operations such as whether the
-interstitial ad has been loaded, user has clicked or closed the interstitial.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAdDidClick:">&ndash;&nbsp;interstitialAdDidClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAdDidClose:">&ndash;&nbsp;interstitialAdDidClose:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAdWillClose:">&ndash;&nbsp;interstitialAdWillClose:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAdDidLoad:">&ndash;&nbsp;interstitialAdDidLoad:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAd:didFailWithError:">&ndash;&nbsp;interstitialAd:didFailWithError:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/interstitialAdWillLogImpression:">&ndash;&nbsp;interstitialAdWillLogImpression:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAd:didFailWithError:" title="interstitialAd:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">interstitialAd:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAd:(FBInterstitialAd *)<em>interstitialAd</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>error</em></dt>
-			<dd><p>An error object containing details of the error.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBInterstitialAd failes to load an ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAdDidClick:" title="interstitialAdDidClick:"></a>
-	<h3 class="subsubtitle method-title">interstitialAdDidClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAdDidClick:(FBInterstitialAd *)<em>interstitialAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an ad in the FBInterstitialAd object is clicked. The appropriate app store view or
-app browser will be launched.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAdDidClose:" title="interstitialAdDidClose:"></a>
-	<h3 class="subsubtitle method-title">interstitialAdDidClose:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAdDidClose:(FBInterstitialAd *)<em>interstitialAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an FBInterstitialAd object has been dismissed from the screen, returning control
-to your application.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAdDidLoad:" title="interstitialAdDidLoad:"></a>
-	<h3 class="subsubtitle method-title">interstitialAdDidLoad:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAdDidLoad:(FBInterstitialAd *)<em>interstitialAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBInterstitialAd successfully loads an ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAdWillClose:" title="interstitialAdWillClose:"></a>
-	<h3 class="subsubtitle method-title">interstitialAdWillClose:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAdWillClose:(FBInterstitialAd *)<em>interstitialAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before an FBInterstitialAd object will be dismissed from the screen.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/interstitialAdWillLogImpression:" title="interstitialAdWillLogImpression:"></a>
-	<h3 class="subsubtitle method-title">interstitialAdWillLogImpression:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)interstitialAdWillLogImpression:(FBInterstitialAd *)<em>interstitialAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>interstitialAd</em></dt>
-			<dd><p>An FBInterstitialAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before the impression of an FBInterstitialAd object will be logged.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBInterstitialAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBMediaViewDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBMediaViewDelegate.html
deleted file mode 100644
index 9e680394f239..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBMediaViewDelegate.html	
+++ /dev/null
@@ -1,704 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBMediaViewDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBMediaViewDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/mediaView:videoVolumeDidChange:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaView:videoVolumeDidChange:</option>
-	
-	<option value="//api/name/mediaViewDidExitFullscreen:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewDidExitFullscreen:</option>
-	
-	<option value="//api/name/mediaViewDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewDidLoad:</option>
-	
-	<option value="//api/name/mediaViewVideoDidComplete:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewVideoDidComplete:</option>
-	
-	<option value="//api/name/mediaViewVideoDidPause:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewVideoDidPause:</option>
-	
-	<option value="//api/name/mediaViewVideoDidPlay:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewVideoDidPlay:</option>
-	
-	<option value="//api/name/mediaViewWillEnterFullscreen:">&nbsp;&nbsp;&nbsp;&nbsp;- mediaViewWillEnterFullscreen:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaView:videoVolumeDidChange:">mediaView:videoVolumeDidChange:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewDidExitFullscreen:">mediaViewDidExitFullscreen:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewDidLoad:">mediaViewDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewVideoDidComplete:">mediaViewVideoDidComplete:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewVideoDidPause:">mediaViewVideoDidPause:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewVideoDidPlay:">mediaViewVideoDidPlay:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mediaViewWillEnterFullscreen:">mediaViewWillEnterFullscreen:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBMediaViewDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBMediaViewDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBMediaView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>@abstract
-The methods declared by the FBMediaViewDelegate protocol allow the adopting delegate to respond to messages from the FBMediaView class and thus respond to operations such as whether the media content has been loaded.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewDidLoad:">&ndash;&nbsp;mediaViewDidLoad:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewWillEnterFullscreen:">&ndash;&nbsp;mediaViewWillEnterFullscreen:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewDidExitFullscreen:">&ndash;&nbsp;mediaViewDidExitFullscreen:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaView:videoVolumeDidChange:">&ndash;&nbsp;mediaView:videoVolumeDidChange:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewVideoDidPause:">&ndash;&nbsp;mediaViewVideoDidPause:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewVideoDidPlay:">&ndash;&nbsp;mediaViewVideoDidPlay:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mediaViewVideoDidComplete:">&ndash;&nbsp;mediaViewVideoDidComplete:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaView:videoVolumeDidChange:" title="mediaView:videoVolumeDidChange:"></a>
-	<h3 class="subsubtitle method-title">mediaView:videoVolumeDidChange:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaView:(FBMediaView *)<em>mediaView</em> videoVolumeDidChange:(float)<em>volume</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>volume</em></dt>
-			<dd><p>The current ad video volume (after the volume change).</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBMediaView has changed the playback volume of a video ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewDidExitFullscreen:" title="mediaViewDidExitFullscreen:"></a>
-	<h3 class="subsubtitle method-title">mediaViewDidExitFullscreen:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewDidExitFullscreen:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an FBMediaView has exited the fullscreen layout.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewDidLoad:" title="mediaViewDidLoad:"></a>
-	<h3 class="subsubtitle method-title">mediaViewDidLoad:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewDidLoad:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBMediaView has been successfully loaded.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewVideoDidComplete:" title="mediaViewVideoDidComplete:"></a>
-	<h3 class="subsubtitle method-title">mediaViewVideoDidComplete:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewVideoDidComplete:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when a video ad in an FBMediaView reaches the end of playback.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewVideoDidPause:" title="mediaViewVideoDidPause:"></a>
-	<h3 class="subsubtitle method-title">mediaViewVideoDidPause:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewVideoDidPause:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after a video ad in an FBMediaView enters a paused state.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewVideoDidPlay:" title="mediaViewVideoDidPlay:"></a>
-	<h3 class="subsubtitle method-title">mediaViewVideoDidPlay:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewVideoDidPlay:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after a video ad in an FBMediaView enters a playing state.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mediaViewWillEnterFullscreen:" title="mediaViewWillEnterFullscreen:"></a>
-	<h3 class="subsubtitle method-title">mediaViewWillEnterFullscreen:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)mediaViewWillEnterFullscreen:(FBMediaView *)<em>mediaView</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>mediaView</em></dt>
-			<dd><p>An FBMediaView object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent just before an FBMediaView will enter the fullscreen layout.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBMediaView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdDelegate.html
deleted file mode 100644
index fec8cf46a9c2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdDelegate.html	
+++ /dev/null
@@ -1,583 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/nativeAd:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAd:didFailWithError:</option>
-	
-	<option value="//api/name/nativeAdDidClick:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdDidClick:</option>
-	
-	<option value="//api/name/nativeAdDidFinishHandlingClick:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdDidFinishHandlingClick:</option>
-	
-	<option value="//api/name/nativeAdDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdDidLoad:</option>
-	
-	<option value="//api/name/nativeAdWillLogImpression:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdWillLogImpression:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAd:didFailWithError:">nativeAd:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdDidClick:">nativeAdDidClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdDidFinishHandlingClick:">nativeAdDidFinishHandlingClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdDidLoad:">nativeAdDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdWillLogImpression:">nativeAdWillLogImpression:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>@abstract
-The methods declared by the FBNativeAdDelegate protocol allow the adopting delegate to respond to messages
-from the FBNativeAd class and thus respond to operations such as whether the native ad has been loaded.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdDidLoad:">&ndash;&nbsp;nativeAdDidLoad:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdWillLogImpression:">&ndash;&nbsp;nativeAdWillLogImpression:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAd:didFailWithError:">&ndash;&nbsp;nativeAd:didFailWithError:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdDidClick:">&ndash;&nbsp;nativeAdDidClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdDidFinishHandlingClick:">&ndash;&nbsp;nativeAdDidFinishHandlingClick:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAd:didFailWithError:" title="nativeAd:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">nativeAd:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAd:(FBNativeAd *)<em>nativeAd</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>An FBNativeAd object sending the message.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>error</em></dt>
-			<dd><p>An error object containing details of the error.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBNativeAd is failed to load.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdDidClick:" title="nativeAdDidClick:"></a>
-	<h3 class="subsubtitle method-title">nativeAdDidClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdDidClick:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>An FBNativeAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an ad has been clicked by the person.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdDidFinishHandlingClick:" title="nativeAdDidFinishHandlingClick:"></a>
-	<h3 class="subsubtitle method-title">nativeAdDidFinishHandlingClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>An FBNativeAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-When an ad is clicked, the modal view will be presented. And when the user finishes the
-interaction with the modal view and dismiss it, this message will be sent, returning control
-to the application.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdDidLoad:" title="nativeAdDidLoad:"></a>
-	<h3 class="subsubtitle method-title">nativeAdDidLoad:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdDidLoad:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>An FBNativeAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an FBNativeAd has been successfully loaded.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdWillLogImpression:" title="nativeAdWillLogImpression:"></a>
-	<h3 class="subsubtitle method-title">nativeAdWillLogImpression:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdWillLogImpression:(FBNativeAd *)<em>nativeAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>nativeAd</em></dt>
-			<dd><p>An FBNativeAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before the impression of an FBNativeAd object will be logged.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdsManagerDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdsManagerDelegate.html
deleted file mode 100644
index be78f6b55541..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBNativeAdsManagerDelegate.html	
+++ /dev/null
@@ -1,364 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBNativeAdsManagerDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBNativeAdsManagerDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/nativeAdsFailedToLoadWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdsFailedToLoadWithError:</option>
-	
-	<option value="//api/name/nativeAdsLoaded">&nbsp;&nbsp;&nbsp;&nbsp;- nativeAdsLoaded</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdsFailedToLoadWithError:">nativeAdsFailedToLoadWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/nativeAdsLoaded">nativeAdsLoaded</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBNativeAdsManagerDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBNativeAdsManagerDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBNativeAdsManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol FBNativeAdsManagerDelegate</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdsLoaded">&ndash;&nbsp;nativeAdsLoaded</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/nativeAdsFailedToLoadWithError:">&ndash;&nbsp;nativeAdsFailedToLoadWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdsFailedToLoadWithError:" title="nativeAdsFailedToLoadWithError:"></a>
-	<h3 class="subsubtitle method-title">nativeAdsFailedToLoadWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>When the FBNativeAdsManager has reached a failure while attempting to load a batch of ads this message will be sent to the application.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdsFailedToLoadWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>error</em></dt>
-			<dd><p>An NSError object with information about the failure.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/nativeAdsLoaded" title="nativeAdsLoaded"></a>
-	<h3 class="subsubtitle method-title">nativeAdsLoaded</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>When the FBNativeAdsManager has finished loading a batch of ads this message will be sent. A batch of ads may be loaded in response to calling loadAds or due to an automatic refresh by the FBNativeAdsManager. At the point this message is fired all of the native ads will already be loaded and will not hence send their own nativeAdLoad: or nativeAd:didFailWithError: message.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)nativeAdsLoaded</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBNativeAdsManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBRewardedVideoAdDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBRewardedVideoAdDelegate.html
deleted file mode 100644
index 34467f32f0ea..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/Protocols (1)/FBRewardedVideoAdDelegate.html	
+++ /dev/null
@@ -1,833 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBRewardedVideoAdDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBRewardedVideoAdDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/rewardedVideoAd:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAd:didFailWithError:</option>
-	
-	<option value="//api/name/rewardedVideoAdComplete:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdComplete:</option>
-	
-	<option value="//api/name/rewardedVideoAdDidClick:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdDidClick:</option>
-	
-	<option value="//api/name/rewardedVideoAdDidClose:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdDidClose:</option>
-	
-	<option value="//api/name/rewardedVideoAdDidLoad:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdDidLoad:</option>
-	
-	<option value="//api/name/rewardedVideoAdServerFailed:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdServerFailed:</option>
-	
-	<option value="//api/name/rewardedVideoAdServerSuccess:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdServerSuccess:</option>
-	
-	<option value="//api/name/rewardedVideoAdWillClose:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdWillClose:</option>
-	
-	<option value="//api/name/rewardedVideoAdWillLogImpression:">&nbsp;&nbsp;&nbsp;&nbsp;- rewardedVideoAdWillLogImpression:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAd:didFailWithError:">rewardedVideoAd:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdComplete:">rewardedVideoAdComplete:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdDidClick:">rewardedVideoAdDidClick:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdDidClose:">rewardedVideoAdDidClose:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdDidLoad:">rewardedVideoAdDidLoad:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdServerFailed:">rewardedVideoAdServerFailed:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdServerSuccess:">rewardedVideoAdServerSuccess:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdWillClose:">rewardedVideoAdWillClose:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rewardedVideoAdWillLogImpression:">rewardedVideoAdWillLogImpression:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBRewardedVideoAdDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBRewardedVideoAdDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBRewardedVideoAd.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>@abstract
-The methods declared by the FBRewardedVideoAdDelegate protocol allow the adopting delegate to respond
-to messages from the FBRewardedVideoAd class and thus respond to operations such as whether the ad has
-been loaded, the person has clicked the ad or closed video/end card.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdDidClick:">&ndash;&nbsp;rewardedVideoAdDidClick:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdDidLoad:">&ndash;&nbsp;rewardedVideoAdDidLoad:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdDidClose:">&ndash;&nbsp;rewardedVideoAdDidClose:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdWillClose:">&ndash;&nbsp;rewardedVideoAdWillClose:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAd:didFailWithError:">&ndash;&nbsp;rewardedVideoAd:didFailWithError:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdComplete:">&ndash;&nbsp;rewardedVideoAdComplete:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdWillLogImpression:">&ndash;&nbsp;rewardedVideoAdWillLogImpression:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdServerSuccess:">&ndash;&nbsp;rewardedVideoAdServerSuccess:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rewardedVideoAdServerFailed:">&ndash;&nbsp;rewardedVideoAdServerFailed:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAd:didFailWithError:" title="rewardedVideoAd:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAd:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAd:(FBRewardedVideoAd *)<em>rewardedVideoAd</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>error</em></dt>
-			<dd><p>An error object containing details of the error.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an FBRewardedVideoAd fails to load the ad.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdComplete:" title="rewardedVideoAdComplete:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdComplete:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdComplete:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after the FBRewardedVideoAd object has finished playing the video successfully.
-Reward the user on this callback.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdDidClick:" title="rewardedVideoAdDidClick:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdDidClick:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdDidClick:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an ad has been clicked by the person.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdDidClose:" title="rewardedVideoAdDidClose:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdDidClose:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdDidClose:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent after an FBRewardedVideoAd object has been dismissed from the screen, returning control
-to your application.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdDidLoad:" title="rewardedVideoAdDidLoad:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdDidLoad:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdDidLoad:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent when an ad has been successfully loaded.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdServerFailed:" title="rewardedVideoAdServerFailed:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdServerFailed:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdServerFailed:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent if server call to publisher&rsquo;s reward endpoint did not return HTTP status code 200
-or if the endpoint timed out.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdServerSuccess:" title="rewardedVideoAdServerSuccess:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdServerSuccess:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdServerSuccess:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent if server call to publisher&rsquo;s reward endpoint returned HTTP status code 200.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdWillClose:" title="rewardedVideoAdWillClose:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdWillClose:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdWillClose:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before an FBRewardedVideoAd object will be dismissed from the screen.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rewardedVideoAdWillLogImpression:" title="rewardedVideoAdWillLogImpression:"></a>
-	<h3 class="subsubtitle method-title">rewardedVideoAdWillLogImpression:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)rewardedVideoAdWillLogImpression:(FBRewardedVideoAd *)<em>rewardedVideoAd</em></code></div>
-
-    
-	
-	<div class="method-subsection arguments-section parameters">
-		<h4 class="method-subtitle parameter-title">Parameters</h4>
-		
-		<dl class="argument-def parameter-def">
-			<dt><em>rewardedVideoAd</em></dt>
-			<dd><p>An FBRewardedVideoAd object sending the message.</p></dd>
-		</dl>
-		
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@abstract
-Sent immediately before the impression of an FBRewardedVideoAd object will be logged.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBRewardedVideoAd.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/styles.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/styles.css
deleted file mode 100644
index 33081897dc83..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/styles.css	
+++ /dev/null
@@ -1,615 +0,0 @@
-body {
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	font-size: 13px;
-}
-
-code {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	color: #666;
-}
-
-pre {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	line-height: 18px;
-	tab-interval: 0.5em;
-	border: 1px solid #C7CFD5;
-	background-color: #F1F5F9;
-	color: #666;
-	padding: 0.3em 1em;
-}
-
-ul {
-	list-style-type: square;
-}
-
-li {
-	margin-bottom: 10px;
-}
-
-a, a code {
-	text-decoration: none;
-	color: #36C;
-}
-
-a:hover, a:hover code {
-	text-decoration: underline;
-	color: #36C;
-}
-
-h2 {
-	border-bottom: 1px solid #8391A8;
-	color: #3C4C6C;
-	font-size: 187%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-bottom: 2px;	
-}
-
-table {
-    margin-bottom: 4em;
-    border-collapse:collapse;
-    vertical-align: middle;
-}
-
-td {
-    border: 1px solid #9BB3CD;
-    padding: .667em;
-    font-size: 100%;
-}
-
-th {
-    border: 1px solid #9BB3CD;
-    padding: .3em .667em .3em .667em;
-    background: #93A5BB;
-    font-size: 103%;
-    font-weight: bold;
-    color: white;
-    text-align: left;
-}
-
-/* @group Common page elements */
-
-#top_header {
-	height: 91px;
-	left: 0;
-	min-width: 598px;
-	position: absolute;
-	right: 0;
-	top: 0;
-	z-index: 900;
-}
-
-#footer {
-	clear: both;
-	padding-top: 20px;
-	text-align: center;
-}
-
-#contents, #overview_contents {
-	-webkit-overflow-scrolling: touch;
-	border-top: 1px solid #A9A9A9;
-	position: absolute;
-	top: 90px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding-left: 2em;
-	padding-right: 2em;
-	padding-top: 1em;
-	min-width: 550px;
-}
-
-#contents.isShowingTOC {
-	left: 230px;
-	min-width: 320px;
-}
-
-.copyright {
-	font-size: 12px;
-}
-
-.generator {
-	font-size: 11px;
-}
-
-.main-navigation ul li {
-	display: inline;
-	margin-left: 15px;
-	list-style: none;
-}
-
-.navigation-top {
-	clear: both;
-	float: right;
-}
-
-.navigation-bottom {
-	clear: both;
-	float: right;
-	margin-top: 20px;
-	margin-bottom: -10px;
-}
-
-.open > .disclosure {
-	background-image: url("../img/disclosure_open.png");
-}
-
-.disclosure {
-	background: url("../img/disclosure.png") no-repeat scroll 0 0;
-}
-
-.disclosure, .nodisclosure {
-	display: inline-block;
-	height: 8px;
-	margin-right: 5px;
-	position: relative;
-	width: 9px;
-}
-
-/* @end */
-
-/* @group Header */
-
-#top_header #library {
-	background: url("../img/library_background.png") repeat-x 0 0 #485E78;
-	background-color: #ccc;
-	height: 35px;
-	font-size: 115%;
-}
-
-#top_header #library #libraryTitle {
-	color: #FFFFFF;
-	margin-left: 15px;
-	text-shadow: 0 -1px 0 #485E78;
-	top: 8px;
-	position: absolute;
-}
-
-#libraryTitle {
-        left: 0;
-}
-
-#top_header #library #developerHome {
-	color: #92979E;
-	right: 15px;
-	top: 8px;
-	position: absolute;
-}
-
-#top_header #library a:hover {
-	text-decoration: none;
-}
-
-#top_header #title {
-	background: url("../img/title_background.png") repeat-x 0 0 #8A98A9;
-	border-bottom: 1px solid #757575;
-	height: 25px;
-	overflow: hidden;
-}
-
-#top_header h1 {
-	font-size: 105%;
-	font-weight: normal;
-	margin: 0;
-	padding: 3px 0 2px;
-	text-align: center;
-	/*text-shadow: 0 1px 0 #D5D5D5;*/
-	white-space: nowrap;
-}
-
-#headerButtons {
-	background-color: #D8D8D8;
-	background-image: url("../img/button_bar_background.png");
-	border-bottom: 0px solid #EDEDED;
-	border-top: 0px solid #a8a8a8;
-	font-size: 8pt;
-	height: 28px;
-	left: 0;
-	list-style: none outside none;
-	margin: 0;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	right: 0;
-	top: 61px;
-}
-
-#headerButtons li {
-	background-repeat: no-repeat;
-	display: inline;
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 0;
-}
-
-#toc_button button {
-    background-color: #EBEEF1;
-	border-color: #ACACAC;
-	border-style: none solid none none;
-	border-width: 0 1px 0 0;
-	height: 28px;
-	margin: 0;
-	padding-left: 30px;
-	text-align: left;
-	width: 230px;
-}
-
-li#jumpto_button {
-	left: 230px;
-	margin-left: 0;
-	position: absolute;
-}
-
-li#jumpto_button select {
-	height: 22px;
-	margin: 5px 2px 0 10px;
-	max-width: 300px;
-}
-
-/* @end */
-
-/* @group Table of contents */
-
-#tocContainer.isShowingTOC {
-	border-right: 1px solid #ACACAC;
-	display: block;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding: 0;
-}
-
-#tocContainer {
-	background-color: #EBEEF1;
-	border-top: 1px solid #ACACAC;
-	bottom: 0;
-	display: none;
-	left: 0;
-	overflow: hidden;
-	position: absolute;
-	top: 90px;
-	width: 229px;
-}
-
-#tocContainer > ul#toc {
-	font-size: 11px;
-	margin: 0;
-	padding: 12px 0 18px;
-	width: 209px;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
-}
-
-#tocContainer > ul#toc > li {
-	margin: 0;
-	padding: 0 0 7px 30px;
-	text-indent: -15px;
-}
-
-#tocContainer > ul#toc > li > .sectionName a {
-	color: #000000;
-	font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > .sectionName a:hover {
-	text-decoration: none;
-}
-
-#tocContainer > ul#toc li.children > ul {
-    display: none;
-    height: 0;
-}
-
-#tocContainer > ul#toc > li > ul {
-    margin: 0;
-    padding: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    margin-bottom: 0;
-    padding-left: 15px;
-}
-
-#tocContainer > ul#toc > li ul {
-    list-style: none;
-    margin-right: 0;
-    padding-right: 0;
-}
-
-#tocContainer > ul#toc li.children.open > ul {
-    display: block;
-    height: auto;
-    margin-left: -15px;
-    padding-left: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    padding-left: 15px;
-}
-
-#tocContainer li ul li {
-    margin-top: 0.583em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-#tocContainer li ul li span.sectionName {
-    white-space: normal;
-}
-
-#tocContainer > ul#toc > li > ul > li > .sectionName a {
-    font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > ul a {
-    color: #4F4F4F;
-}
-
-/* @end */
-
-/* @group Index formatting */
-
-.index-title {
-	font-size: 13px;
-	font-weight: normal;
-}
-
-.index-column {
-	float: left;
-	width: 30%;
-	min-width: 200px;
-	font-size: 11px;
-}
-
-.index-column ul {
-	margin: 8px 0 0 0;
-	padding: 0;
-	list-style: none;
-}
-
-.index-column ul li {
-	margin: 0 0 3px 0;
-	padding: 0;
-}
-
-.hierarchy-column {
-	min-width: 400px;
-}
-
-.hierarchy-column ul {
-	margin: 3px 0 0 15px;
-}
-
-.hierarchy-column ul li {
-	list-style-type: square;
-}
-
-/* @end */
-
-/* @group Common formatting elements */
-
-.title {
-	font-weight: normal;
-	font-size: 215%;
-	margin-top:0;
-}
-
-.subtitle {
-	font-weight: normal;
-	font-size: 180%;
-	color: #3C4C6C;
-	border-bottom: 1px solid #5088C5;
-}
-
-.subsubtitle {
-	font-weight: normal;
-	font-size: 145%;
-	height: 0.7em;
-}
-
-.note {
-	border: 1px solid #5088C5;
-	background-color: white;
-	margin: 1.667em 0 1.75em 0;
-	padding: 0 .667em .083em .750em;
-}
-
-.warning {
-	border: 1px solid #5088C5;
-	background-color: #F0F3F7;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.bug {
-	border: 1px solid #000;
-	background-color: #ffffcc;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.deprecated {
-	color: #F60425;
-}
-
-/* @end */
-
-/* @group Common layout */
-
-.section {
-	margin-top: 3em;
-}
-
-/* @end */
-
-/* @group Object specification section */
-
-.section-specification {
-	margin-left: 2.5em;
-	margin-right: 2.5em;
-	font-size: 12px;
-}
-
-.section-specification table {
-    margin-bottom: 0em;
-	border-top: 1px solid #d6e0e5;
-}
-
-.section-specification td {
-	vertical-align: top;
-	border-bottom: 1px solid #d6e0e5;
-	border-left-width: 0px;
-	border-right-width: 0px;
-	border-top-width: 0px;
-	padding: .6em;
-}
-
-.section-specification .specification-title {
-	font-weight: bold;
-}
-
-/* @end */
-
-/* @group Tasks section */
-
-.task-list {
-	list-style-type: none;
-	padding-left: 0px;
-}
-
-.task-list li {
-	margin-bottom: 3px;
-}
-
-.task-item-suffix {
-	color: #996;
-	font-size: 12px;
-	font-style: italic;
-	margin-left: 0.5em;
-}
-
-span.tooltip span.tooltip {
-	font-size: 1.0em;
-	display: none;
-	padding: 0.3em;
-	border: 1px solid #aaa;
-	background-color: #fdfec8;
-	color: #000;
-	text-align: left;
-}
-
-span.tooltip:hover span.tooltip {
-	display: block;
-	position: absolute;
-	margin-left: 2em;
-}
-
-/* @end */
-
-/* @group Method section */
-
-.section-method {
-	margin-top: 2.3em;
-}
-
-.method-title {
-	margin-bottom: 1.5em;
-}
-
-.method-subtitle {
-	margin-top: 0.7em;
-	margin-bottom: 0.2em;
-}
-
-.method-subsection p {
-	margin-top: 0.4em;
-	margin-bottom: 0.8em;
-}
-
-.method-declaration {
-	margin-top:1.182em;
-	margin-bottom:.909em;
-}
-
-.method-declaration code {
-	font:14px Courier, Consolas, monospace;
-	color:#000;
-}
-
-.declaration {
-	color: #000;
-}
-
-.termdef {
-    margin-bottom: 10px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: 0px;
-}
-
-.termdef dt {
-    margin: 0;
-    padding: 0;
-}
-
-.termdef dd {
-    margin-bottom: 6px;
-    margin-left: 16px;
-    margin-right: 0px;
-    margin-top: 1px;
-}
-
-.termdef dd p  {
-    margin-bottom: 6px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: -1px;
-}
-
-.argument-def {
-	margin-top: 0.3em;
-	margin-bottom: 0.3em;
-}
-
-.argument-def dd {
-	margin-left: 1.25em;
-}
-
-.see-also-section ul {
-	list-style-type: none;
-	padding-left: 0px;
-	margin-top: 0;
-}
-
-.see-also-section li {
-	margin-bottom: 3px;
-}
-
-.declared-in-ref {
-	color: #666;
-}
-
-#tocContainer.hideInXcode {
-	display: none;
-	border: 0px solid black;
-}
-
-#top_header.hideInXcode {
-	display: none;
-}
-
-#contents.hideInXcode {
-	border: 0px solid black;
-	top: 0px;
-	left: 0px;
-}
-
-/* @end */
-
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/stylesPrint.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/stylesPrint.css
deleted file mode 100644
index dc54cd2ffbe7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/css (1)/stylesPrint.css	
+++ /dev/null
@@ -1,22 +0,0 @@
-
-header {
-	display: none;
-}
-
-div.main-navigation, div.navigation-top {
-	display: none;
-}
-
-div#overview_contents, div#contents.isShowingTOC, div#contents {
-	overflow: visible;
-	position: relative;
-	top: 0px;
-	border: none;
-	left: 0;
-}
-#tocContainer.isShowingTOC {
-	display: none;
-}
-nav {
-	display: none;
-}
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/hierarchy.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/hierarchy.html
deleted file mode 100644
index 6df43876928c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/hierarchy.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook Audience Network SDK 4.18 for iOS Hierarchy</title>
-			<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-			<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook Audience Network SDK 4.18 for iOS Hierarchy</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook Audience Network SDK 4.18 for iOS Hierarchy</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-					<div class="index-column hierarchy-column">
-						<h2 class="index-title">Class Hierarchy</h2>
-						
-	<ul>
-	
-		<li>NSObject
-	<ul>
-	
-		<li><a href="Classes/FBAdImage.html">FBAdImage</a></li>
-	
-		<li><a href="Classes/FBAdSettings.html">FBAdSettings</a></li>
-	
-		<li><a href="Classes/FBInterstitialAd.html">FBInterstitialAd</a></li>
-	
-		<li><a href="Classes/FBNativeAd.html">FBNativeAd</a></li>
-	
-		<li><a href="Classes/FBNativeAdCollectionViewAdProvider.html">FBNativeAdCollectionViewAdProvider</a>
-	<ul>
-	
-		<li><a href="Classes/FBNativeAdCollectionViewCellProvider.html">FBNativeAdCollectionViewCellProvider</a></li>
-	
-	</ul>
-</li>
-	
-		<li><a href="Classes/FBNativeAdTableViewAdProvider.html">FBNativeAdTableViewAdProvider</a>
-	<ul>
-	
-		<li><a href="Classes/FBNativeAdTableViewCellProvider.html">FBNativeAdTableViewCellProvider</a></li>
-	
-	</ul>
-</li>
-	
-		<li><a href="Classes/FBNativeAdViewAttributes.html">FBNativeAdViewAttributes</a></li>
-	
-		<li><a href="Classes/FBNativeAdsManager.html">FBNativeAdsManager</a></li>
-	
-		<li><a href="Classes/FBRewardedVideoAd.html">FBRewardedVideoAd</a></li>
-	
-	</ul>
-</li>
-	
-		<li>UIView
-	<ul>
-	
-		<li><a href="Classes/FBAdChoicesView.html">FBAdChoicesView</a></li>
-	
-		<li><a href="Classes/FBAdStarRatingView.html">FBAdStarRatingView</a></li>
-	
-		<li><a href="Classes/FBAdView.html">FBAdView</a></li>
-	
-		<li><a href="Classes/FBInstreamAdView.html">FBInstreamAdView</a></li>
-	
-		<li><a href="Classes/FBMediaView.html">FBMediaView</a></li>
-	
-		<li><a href="Classes/FBNativeAdScrollView.html">FBNativeAdScrollView</a></li>
-	
-		<li><a href="Classes/FBNativeAdView.html">FBNativeAdView</a></li>
-	
-	</ul>
-</li>
-	
-	</ul>
-
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/FBAdViewDelegate.html">FBAdViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBInstreamAdViewDelegate.html">FBInstreamAdViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBInterstitialAdDelegate.html">FBInterstitialAdDelegate</a></li>
-							
-							<li><a href="Protocols/FBMediaViewDelegate.html">FBMediaViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBNativeAdDelegate.html">FBNativeAdDelegate</a></li>
-							
-							<li><a href="Protocols/FBNativeAdsManagerDelegate.html">FBNativeAdsManagerDelegate</a></li>
-							
-							<li><a href="Protocols/FBRewardedVideoAdDelegate.html">FBRewardedVideoAdDelegate</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                            
-                            <li><a href="Constants/FBAdLogLevel.html">FBAdLogLevel</a></li>
-                            
-                            <li><a href="Constants/FBNativeAdViewType.html">FBNativeAdViewType</a></li>
-                            
-                            <li><a href="Constants/FBNativeAdsCachePolicy.html">FBNativeAdsCachePolicy</a></li>
-                            
-						</ul>
-						
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/index.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/index.html
deleted file mode 100644
index 01a4e43c6944..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookAudienceNetworkSDK-4_18-for-iOS.docset/Contents/Resources/Documents/index.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook Audience Network SDK 4.18 for iOS Reference</title>
-		<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook Audience Network SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook Audience Network SDK 4.18 for iOS Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook Audience Network SDK 4.18 for iOS Reference</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-                        
-                    
-					
-					
-					<div class="index-column">
-						<h2 class="index-title">Class References</h2>
-						<ul>
-							
-							<li><a href="Classes/FBAdChoicesView.html">FBAdChoicesView</a></li>
-							
-							<li><a href="Classes/FBAdImage.html">FBAdImage</a></li>
-							
-							<li><a href="Classes/FBAdSettings.html">FBAdSettings</a></li>
-							
-							<li><a href="Classes/FBAdStarRatingView.html">FBAdStarRatingView</a></li>
-							
-							<li><a href="Classes/FBAdView.html">FBAdView</a></li>
-							
-							<li><a href="Classes/FBInstreamAdView.html">FBInstreamAdView</a></li>
-							
-							<li><a href="Classes/FBInterstitialAd.html">FBInterstitialAd</a></li>
-							
-							<li><a href="Classes/FBMediaView.html">FBMediaView</a></li>
-							
-							<li><a href="Classes/FBNativeAd.html">FBNativeAd</a></li>
-							
-							<li><a href="Classes/FBNativeAdCollectionViewAdProvider.html">FBNativeAdCollectionViewAdProvider</a></li>
-							
-							<li><a href="Classes/FBNativeAdCollectionViewCellProvider.html">FBNativeAdCollectionViewCellProvider</a></li>
-							
-							<li><a href="Classes/FBNativeAdScrollView.html">FBNativeAdScrollView</a></li>
-							
-							<li><a href="Classes/FBNativeAdTableViewAdProvider.html">FBNativeAdTableViewAdProvider</a></li>
-							
-							<li><a href="Classes/FBNativeAdTableViewCellProvider.html">FBNativeAdTableViewCellProvider</a></li>
-							
-							<li><a href="Classes/FBNativeAdView.html">FBNativeAdView</a></li>
-							
-							<li><a href="Classes/FBNativeAdViewAttributes.html">FBNativeAdViewAttributes</a></li>
-							
-							<li><a href="Classes/FBNativeAdsManager.html">FBNativeAdsManager</a></li>
-							
-							<li><a href="Classes/FBRewardedVideoAd.html">FBRewardedVideoAd</a></li>
-							
-						</ul>
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/FBAdViewDelegate.html">FBAdViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBInstreamAdViewDelegate.html">FBInstreamAdViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBInterstitialAdDelegate.html">FBInterstitialAdDelegate</a></li>
-							
-							<li><a href="Protocols/FBMediaViewDelegate.html">FBMediaViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBNativeAdDelegate.html">FBNativeAdDelegate</a></li>
-							
-							<li><a href="Protocols/FBNativeAdsManagerDelegate.html">FBNativeAdsManagerDelegate</a></li>
-							
-							<li><a href="Protocols/FBRewardedVideoAdDelegate.html">FBRewardedVideoAdDelegate</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                        
-                        <li><a href="Constants/FBAdLogLevel.html">FBAdLogLevel</a></li>
-                        
-                        <li><a href="Constants/FBNativeAdViewType.html">FBNativeAdViewType</a></li>
-                        
-                        <li><a href="Constants/FBNativeAdsCachePolicy.html">FBNativeAdsCachePolicy</a></li>
-                        
-						</ul>
-						
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerBroadcastContext.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerBroadcastContext.html
deleted file mode 100644
index 466a7b0a4806..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerBroadcastContext.html	
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerBroadcastContext Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerBroadcastContext Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerBroadcastContext Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerBroadcastContext Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerBroadcastContext.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  This object is used as an override in FBSDKMessengerShareOptions to ensure
-the broadcast flow in Messenger is triggered, even if your app was entered from
-a flow that normally triggers the Messenger reply flow</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerContext.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerContext.html
deleted file mode 100644
index e65705d3135a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerContext.html	
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerContext Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerContext Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerContext Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerContext Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerContext.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  This represents the way that content is shared between Messenger and partner apps.</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareButton.html
deleted file mode 100644
index 7bf1775323ef..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareButton.html	
+++ /dev/null
@@ -1,435 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerShareButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerShareButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/circularButtonWithStyle:">&nbsp;&nbsp;&nbsp;&nbsp;+ circularButtonWithStyle:</option>
-	
-	<option value="//api/name/circularButtonWithStyle:width:">&nbsp;&nbsp;&nbsp;&nbsp;+ circularButtonWithStyle:width:</option>
-	
-	<option value="//api/name/rectangularButtonWithStyle:">&nbsp;&nbsp;&nbsp;&nbsp;+ rectangularButtonWithStyle:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/circularButtonWithStyle:">circularButtonWithStyle:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/circularButtonWithStyle:width:">circularButtonWithStyle:width:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/rectangularButtonWithStyle:">rectangularButtonWithStyle:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerShareButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerShareButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Provides a helper method to return a UIButton intended for sharing to Messenger</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/rectangularButtonWithStyle:">+&nbsp;rectangularButtonWithStyle:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/circularButtonWithStyle:width:">+&nbsp;circularButtonWithStyle:width:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/circularButtonWithStyle:">+&nbsp;circularButtonWithStyle:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/circularButtonWithStyle:" title="circularButtonWithStyle:"></a>
-	<h3 class="subsubtitle method-title">circularButtonWithStyle:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns a circular UIButton customized for sharing to Messenger of default size</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (UIButton *)circularButtonWithStyle:(FBSDKMessengerShareButtonStyle)<em>style</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter style: Specifies how the button should look</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/circularButtonWithStyle:width:" title="circularButtonWithStyle:width:"></a>
-	<h3 class="subsubtitle method-title">circularButtonWithStyle:width:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns a circular UIButton customized for sharing to Messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (UIButton *)circularButtonWithStyle:(FBSDKMessengerShareButtonStyle)<em>style</em> width:(CGFloat)<em>width</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter style: Specifies how the button should look</li>
-<li>Parameter width: The desired frame width (and height) of this button.</li>
-</ul>
-
-
-<p>This button&rsquo;s asset is drawn as a vector such that it scales appropriately
-using the width parameter as a hint. This hint is to prevent button resizing artifacts.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/rectangularButtonWithStyle:" title="rectangularButtonWithStyle:"></a>
-	<h3 class="subsubtitle method-title">rectangularButtonWithStyle:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns a rounded rectangular UIButton customized for sharing to Messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (UIButton *)rectangularButtonWithStyle:(FBSDKMessengerShareButtonStyle)<em>style</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter style: Specifies how the button should look</li>
-</ul>
-
-
-<p>This button can be resized after creation</p>
-
-<p>There is 1 string in the implemention of this button which needs to be translated
-by your app:</p>
-
-<p>NSLocalizedString(@&ldquo;Send&rdquo;, @&ldquo;Button label for sending a message&rdquo;)</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareOptions.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareOptions.html
deleted file mode 100644
index 5744a8379555..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerShareOptions.html	
+++ /dev/null
@@ -1,470 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerShareOptions Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerShareOptions Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/contextOverride">&nbsp;&nbsp;&nbsp;&nbsp;contextOverride</option>
-	
-	<option value="//api/name/metadata">&nbsp;&nbsp;&nbsp;&nbsp;metadata</option>
-	
-	<option value="//api/name/renderAsSticker">&nbsp;&nbsp;&nbsp;&nbsp;renderAsSticker</option>
-	
-	<option value="//api/name/sourceURL">&nbsp;&nbsp;&nbsp;&nbsp;sourceURL</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/contextOverride">contextOverride</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/metadata">metadata</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/renderAsSticker">renderAsSticker</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sourceURL">sourceURL</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerShareOptions Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerShareOptions Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerShareOptions.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Optional parameters that change the way content is shared into Messenger</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/metadata">&nbsp;&nbsp;metadata</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sourceURL">&nbsp;&nbsp;sourceURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/renderAsSticker">&nbsp;&nbsp;renderAsSticker</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/contextOverride">&nbsp;&nbsp;contextOverride</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/contextOverride" title="contextOverride"></a>
-	<h3 class="subsubtitle method-title">contextOverride</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Optional property that overrides the default way the content will be shared to messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readwrite, strong) FBSDKMessengerContext *contextOverride</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>By default, if a user enters your app via a replyable context in Messenger
-(for instance, tapping Reply on a message or opening your app from composer), the next share
-out of your app will trigger the reply flow in Messenger by default. If you&rsquo;d prefer to not
-trigger the reply flow, then overriding this with FBSDKMessengerBroadcastContext will trigger the
-broadcast flow in messenger.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerShareOptions.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/metadata" title="metadata"></a>
-	<h3 class="subsubtitle method-title">metadata</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Pass additional information to be sent to Messenger which is sent back to
-the user&rsquo;s app when they reply to an attributed message.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readwrite, copy) NSString *metadata</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerShareOptions.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/renderAsSticker" title="renderAsSticker"></a>
-	<h3 class="subsubtitle method-title">renderAsSticker</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Optional property describing whether the content should be rendered like a sticker</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readwrite, assign) BOOL renderAsSticker</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Setting this property informs Messenger that the media content should be rendered
-as a sticker.
-This option is only used for static images.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerShareOptions.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/sourceURL" title="sourceURL"></a>
-	<h3 class="subsubtitle method-title">sourceURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Optional property describing the www source URL of the content</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readwrite, copy) NSURL *sourceURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Setting this property improves performance by allowing Messenger to download
-the content directly rather than uploading the content from your app.
-This option is only used for animated GIFs and WebPs.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerShareOptions.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerSharer.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerSharer.html
deleted file mode 100644
index 3bfe4c02980e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerSharer.html	
+++ /dev/null
@@ -1,986 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerSharer Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerSharer Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/messengerPlatformCapabilities">&nbsp;&nbsp;&nbsp;&nbsp;+ messengerPlatformCapabilities</option>
-	
-	<option value="//api/name/openMessenger">&nbsp;&nbsp;&nbsp;&nbsp;+ openMessenger</option>
-	
-	<option value="//api/name/shareAnimatedGIF:withMetadata:withContext:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAnimatedGIF:withMetadata:withContext:</option>
-	
-	<option value="//api/name/shareAnimatedGIF:withOptions:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAnimatedGIF:withOptions:</option>
-	
-	<option value="//api/name/shareAnimatedWebP:withMetadata:withContext:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAnimatedWebP:withMetadata:withContext:</option>
-	
-	<option value="//api/name/shareAnimatedWebP:withOptions:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAnimatedWebP:withOptions:</option>
-	
-	<option value="//api/name/shareAudio:withMetadata:withContext:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAudio:withMetadata:withContext:</option>
-	
-	<option value="//api/name/shareAudio:withOptions:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareAudio:withOptions:</option>
-	
-	<option value="//api/name/shareImage:withMetadata:withContext:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareImage:withMetadata:withContext:</option>
-	
-	<option value="//api/name/shareImage:withOptions:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareImage:withOptions:</option>
-	
-	<option value="//api/name/shareVideo:withMetadata:withContext:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareVideo:withMetadata:withContext:</option>
-	
-	<option value="//api/name/shareVideo:withOptions:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareVideo:withOptions:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/messengerPlatformCapabilities">messengerPlatformCapabilities</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/openMessenger">openMessenger</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAnimatedGIF:withMetadata:withContext:">shareAnimatedGIF:withMetadata:withContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAnimatedGIF:withOptions:">shareAnimatedGIF:withOptions:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAnimatedWebP:withMetadata:withContext:">shareAnimatedWebP:withMetadata:withContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAnimatedWebP:withOptions:">shareAnimatedWebP:withOptions:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAudio:withMetadata:withContext:">shareAudio:withMetadata:withContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareAudio:withOptions:">shareAudio:withOptions:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareImage:withMetadata:withContext:">shareImage:withMetadata:withContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareImage:withOptions:">shareImage:withOptions:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareVideo:withMetadata:withContext:">shareVideo:withMetadata:withContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareVideo:withOptions:">shareVideo:withOptions:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerSharer Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerSharer Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerSharer.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The FBSDKMessengerSharer is used to share media from apps into Messenger. The underlying
-mechanism used to share data between apps is UIPasteboard</p>
-
-<ul>
-<li>FacebookAppID must be set in the your app&rsquo;s Info.plist with the Facebook App Id</li>
-<li>Any existing data in the system&rsquo;s public pasteboard will get overwritten with the shared media</li>
-<li>Once the data is shared in Messenger, the pasteboard with be cleared</li>
-<li>The following strings need to be translated in your app:
-  NSLocalizedString(@&ldquo;Get Messenger&rdquo;, @&ldquo;Alert title telling a user they need to install Messenger&rdquo;)
-  NSLocalizedString(@&ldquo;You are using an older version of Messenger that does not support this feature.&rdquo;, @&ldquo;Alert message when an old version of messenger is installed&rdquo;)
-  NSLocalizedString(@&ldquo;Not Now&rdquo;, @&ldquo;Button label when user doesn&rsquo;t want to install Messenger&rdquo;)
-  NSLocalizedString(@&ldquo;Install&rdquo;, @&ldquo;Button label to install Messenger&rdquo;)
-  NSLocalizedString(@&ldquo;Send&rdquo;, @&ldquo;Button label for sending a message&rdquo;)</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/messengerPlatformCapabilities">+&nbsp;messengerPlatformCapabilities</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/openMessenger">+&nbsp;openMessenger</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareImage:withMetadata:withContext:">+&nbsp;shareImage:withMetadata:withContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareImage:withOptions:">+&nbsp;shareImage:withOptions:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAnimatedGIF:withMetadata:withContext:">+&nbsp;shareAnimatedGIF:withMetadata:withContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAnimatedGIF:withOptions:">+&nbsp;shareAnimatedGIF:withOptions:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAnimatedWebP:withMetadata:withContext:">+&nbsp;shareAnimatedWebP:withMetadata:withContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAnimatedWebP:withOptions:">+&nbsp;shareAnimatedWebP:withOptions:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareVideo:withMetadata:withContext:">+&nbsp;shareVideo:withMetadata:withContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareVideo:withOptions:">+&nbsp;shareVideo:withOptions:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAudio:withMetadata:withContext:">+&nbsp;shareAudio:withMetadata:withContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareAudio:withOptions:">+&nbsp;shareAudio:withOptions:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/messengerPlatformCapabilities" title="messengerPlatformCapabilities"></a>
-	<h3 class="subsubtitle method-title">messengerPlatformCapabilities</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  This method checks the currently installed version of Messenger to see what SDK capabilities it has</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBSDKMessengerPlatformCapability)messengerPlatformCapabilities</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Before sharing any media, first use this bitmask to check to see if it can be shared to Messenger</p>
-
-<ul>
-<li><p>Warning: This method is deprecated as of iOS 9</p></li>
-<li><p>Returns: bitmask of the Messenger capabilities</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/openMessenger" title="openMessenger"></a>
-	<h3 class="subsubtitle method-title">openMessenger</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)openMessenger</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAnimatedGIF:withMetadata:withContext:" title="shareAnimatedGIF:withMetadata:withContext:"></a>
-	<h3 class="subsubtitle method-title">shareAnimatedGIF:withMetadata:withContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an animated GIF.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAnimatedGIF:(NSData *)<em>animatedGIFData</em> withMetadata:(NSString *)<em>metadata</em> withContext:(FBSDKMessengerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Warning: use shareAnimatedGIF:withOptions: instead</p></li>
-<li><p>Parameter animatedGIFData: The animated GIF to be shared in Messenger</p></li>
-<li>Parameter metadata: Additional optional information to be sent to Messenger which is sent back to
-the user&rsquo;s app when they reply to an attributed message. This may be nil.</li>
-<li>Parameter context: The way the content is to be shared in Messenger. If nil, a standard share will take place.</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAnimatedGIF:withOptions:" title="shareAnimatedGIF:withOptions:"></a>
-	<h3 class="subsubtitle method-title">shareAnimatedGIF:withOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an animated GIF.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAnimatedGIF:(NSData *)<em>animatedGIFData</em> withOptions:(FBSDKMessengerShareOptions *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter animatedGIFData: The animated GIF to be shared in Messenger</li>
-<li>Parameter options: Additional optional parameters that affect the way the content is shared</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAnimatedWebP:withMetadata:withContext:" title="shareAnimatedWebP:withMetadata:withContext:"></a>
-	<h3 class="subsubtitle method-title">shareAnimatedWebP:withMetadata:withContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an animated GIF.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAnimatedWebP:(NSData *)<em>animatedWebPData</em> withMetadata:(NSString *)<em>metadata</em> withContext:(FBSDKMessengerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Warning: use shareAnimatedWebP:withOptions: instead</p></li>
-<li><p>Parameter animatedWebPData: The animated WebP image to be shared in Messenger</p></li>
-<li>Parameter metadata: Additional optional information to be sent to Messenger which is sent back to
-the user&rsquo;s app when they reply to an attributed message. This may be nil.</li>
-<li>Parameter context: The way the content is to be shared in Messenger. If nil, a standard share will take place.</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAnimatedWebP:withOptions:" title="shareAnimatedWebP:withOptions:"></a>
-	<h3 class="subsubtitle method-title">shareAnimatedWebP:withOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an animated GIF.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAnimatedWebP:(NSData *)<em>animatedWebPData</em> withOptions:(FBSDKMessengerShareOptions *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter animatedWebPData: The animated WebP image to be shared in Messenger</li>
-<li>Parameter options: Additional optional parameters that affect the way the content is shared</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAudio:withMetadata:withContext:" title="shareAudio:withMetadata:withContext:"></a>
-	<h3 class="subsubtitle method-title">shareAudio:withMetadata:withContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an audio file.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAudio:(NSData *)<em>audioData</em> withMetadata:(NSString *)<em>metadata</em> withContext:(FBSDKMessengerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Warning: use shareAudio:withOptions: instead</li>
-</ul>
-
-
-<p>Note that there&rsquo;s no way to send an AVAsset between apps, so you may need to
-serialize your AVAsset to a file, and get an NSData representation of the video via
-[NSData dataWithContentsOfFile:filepath];</p>
-
-<ul>
-<li>Parameter audioData: The audio to be shared in Messenger</li>
-<li>Parameter metadata: Additional optional information to be sent to Messenger</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareAudio:withOptions:" title="shareAudio:withOptions:"></a>
-	<h3 class="subsubtitle method-title">shareAudio:withOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an audio file.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareAudio:(NSData *)<em>audioData</em> withOptions:(FBSDKMessengerShareOptions *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Note that there&rsquo;s no way to send an AVAsset between apps, so you may need to
-serialize your AVAsset to a file, and get an NSData representation of the video via
-[NSData dataWithContentsOfFile:filepath];</p>
-
-<ul>
-<li>Parameter audioData: The audio to be shared in Messenger</li>
-<li>Parameter options: Additional optional parameters that affect the way the content is shared</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareImage:withMetadata:withContext:" title="shareImage:withMetadata:withContext:"></a>
-	<h3 class="subsubtitle method-title">shareImage:withMetadata:withContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an image.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareImage:(UIImage *)<em>image</em> withMetadata:(NSString *)<em>metadata</em> withContext:(FBSDKMessengerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Warning: use shareImage:withOptions: instead</p></li>
-<li><p>Parameter image: The image to be shared in Messenger</p></li>
-<li>Parameter metadata: Additional optional information to be sent to Messenger which is sent back to
-the user&rsquo;s app when they reply to an attributed message. This may be nil.</li>
-<li>Parameter context: The way the content is to be shared in Messenger. If nil, a standard share will take place.</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareImage:withOptions:" title="shareImage:withOptions:"></a>
-	<h3 class="subsubtitle method-title">shareImage:withOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share an image.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareImage:(UIImage *)<em>image</em> withOptions:(FBSDKMessengerShareOptions *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter image: The image to be shared in Messenger</li>
-<li>Parameter options: Additional optional parameters that affect the way the content is shared</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareVideo:withMetadata:withContext:" title="shareVideo:withMetadata:withContext:"></a>
-	<h3 class="subsubtitle method-title">shareVideo:withMetadata:withContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share a video.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareVideo:(NSData *)<em>videoData</em> withMetadata:(NSString *)<em>metadata</em> withContext:(FBSDKMessengerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Warning: use shareVideo:withOptions: instead</li>
-</ul>
-
-
-<p>Note that there&rsquo;s no way to send an AVAsset between apps, so you may need to
-serialize your AVAsset to a file, and get an NSData representation of the video via
-[NSData dataWithContentsOfFile:filepath];</p>
-
-<ul>
-<li>Parameter videoData: The image to be shared in Messenger</li>
-<li>Parameter metadata: Additional optional information to be sent to Messenger which is sent back to
-the user&rsquo;s app when they reply to an attributed message. This may be nil.</li>
-<li>Parameter context: The way the content is to be shared in Messenger. If nil, a standard share will take place.</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareVideo:withOptions:" title="shareVideo:withOptions:"></a>
-	<h3 class="subsubtitle method-title">shareVideo:withOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method to open Messenger and share a video.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)shareVideo:(NSData *)<em>videoData</em> withOptions:(FBSDKMessengerShareOptions *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Note that there&rsquo;s no way to send an AVAsset between apps, so you may need to
-serialize your AVAsset to a file, and get an NSData representation of the video via
-[NSData dataWithContentsOfFile:filepath];</p>
-
-<ul>
-<li>Parameter videoData: The image to be shared in Messenger</li>
-<li>Parameter options: Additional optional parameters that affect the way the content is shared</li>
-</ul>
-
-
-<p>If there is not an installed version of Messenger on the device that supports the share, an alert will be presented to notify the user.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandler.html
deleted file mode 100644
index 4cb452e39754..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandler.html	
+++ /dev/null
@@ -1,412 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerURLHandler Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerURLHandler Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canOpenURL:sourceApplication:">&nbsp;&nbsp;&nbsp;&nbsp;- canOpenURL:sourceApplication:</option>
-	
-	<option value="//api/name/openURL:sourceApplication:">&nbsp;&nbsp;&nbsp;&nbsp;- openURL:sourceApplication:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canOpenURL:sourceApplication:">canOpenURL:sourceApplication:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/openURL:sourceApplication:">openURL:sourceApplication:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerURLHandler Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerURLHandler Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerURLHandler.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  FBSDKMessengerURLHandler is used to handle incoming URLs from Messenger.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canOpenURL:sourceApplication:">&ndash;&nbsp;canOpenURL:sourceApplication:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/openURL:sourceApplication:">&ndash;&nbsp;openURL:sourceApplication:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKMessengerURLHandlerDelegate&gt; delegate</code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canOpenURL:sourceApplication:" title="canOpenURL:sourceApplication:"></a>
-	<h3 class="subsubtitle method-title">canOpenURL:sourceApplication:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<pre><code>Determines whether an incoming URL can be handled by this class
-</code></pre>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canOpenURL:(NSURL *)<em>url</em> sourceApplication:(NSString *)<em>sourceApplication</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter url: The URL passed in from the source application</li>
-<li><p>Parameter sourceApplication: The bundle id representing the source application</p></li>
-<li><p>Returns: YES if this URL can be handled</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandler.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/openURL:sourceApplication:" title="openURL:sourceApplication:"></a>
-	<h3 class="subsubtitle method-title">openURL:sourceApplication:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<pre><code>Attempts to handle the Messenger URL and returns YES if and only if successful.
-</code></pre>
-
-<p>  This should be called from the AppDelegate&rsquo;s -openURL: method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)openURL:(NSURL *)<em>url</em> sourceApplication:(NSString *)<em>sourceApplication</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter url: The URL passed in from the source application</li>
-<li><p>Parameter sourceApplication: The bundle id representing the source application</p></li>
-<li><p> Returns: YES if this successfully handled the URL</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandler.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerCancelContext.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerCancelContext.html
deleted file mode 100644
index 404ea2da1d47..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerCancelContext.html	
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerURLHandlerCancelContext Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerURLHandlerCancelContext Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerURLHandlerCancelContext Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerURLHandlerCancelContext Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerURLHandlerCancelContext.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  This object represents a user canceling out of a share flow in Messenger</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerOpenFromComposerContext.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerOpenFromComposerContext.html
deleted file mode 100644
index a59d0b519b66..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerOpenFromComposerContext.html	
+++ /dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerURLHandlerOpenFromComposerContext Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerURLHandlerOpenFromComposerContext Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/metadata">&nbsp;&nbsp;&nbsp;&nbsp;metadata</option>
-	
-	<option value="//api/name/userIDs">&nbsp;&nbsp;&nbsp;&nbsp;userIDs</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/metadata">metadata</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userIDs">userIDs</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerURLHandlerOpenFromComposerContext Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerURLHandlerOpenFromComposerContext Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerURLHandlerOpenFromComposerContext.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  This object represents a user selecting this app from the composer in Messenger
-Passing this context into a share method will trigger a the reply flow</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/metadata">&nbsp;&nbsp;metadata</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userIDs">&nbsp;&nbsp;userIDs</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/metadata" title="metadata"></a>
-	<h3 class="subsubtitle method-title">metadata</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Additional information that was passed along with the original media</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *metadata</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Note that when opening your app from Messenger composer, the metadata is pulled from
-the most recent attributed message on the thread.
-If the most recent attributed message with metadata is not cached on the device, metadata will be nil</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandlerOpenFromComposerContext.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userIDs" title="userIDs"></a>
-	<h3 class="subsubtitle method-title">userIDs</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user IDs of the other participants on the thread.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSSet *userIDs</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>User IDs can be used with the Facebook SDK and Graph API (https://developers.facebook.com/docs/graph-api)
-to query names, photos, and other data. This will only contain IDs of users that
-have also logged into your app via their Facebook account.</p>
-
-<p>Note that when opening your app from Messenger composer, the userIDs are pulled from
-the most recent attributed message on the thread.
-If the most recent attributed message is not cached on the device, userIDs will be nil</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandlerOpenFromComposerContext.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerReplyContext.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerReplyContext.html
deleted file mode 100644
index 6497ed16135c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessengerURLHandlerReplyContext.html	
+++ /dev/null
@@ -1,369 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerURLHandlerReplyContext Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerURLHandlerReplyContext Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/metadata">&nbsp;&nbsp;&nbsp;&nbsp;metadata</option>
-	
-	<option value="//api/name/userIDs">&nbsp;&nbsp;&nbsp;&nbsp;userIDs</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/metadata">metadata</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userIDs">userIDs</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerURLHandlerReplyContext Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerURLHandlerReplyContext Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerURLHandlerReplyContext.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  This object represents a user tapping reply from a message in Messenger. Passing
-this context into a share method will trigger the reply flow</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/metadata">&nbsp;&nbsp;metadata</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userIDs">&nbsp;&nbsp;userIDs</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/metadata" title="metadata"></a>
-	<h3 class="subsubtitle method-title">metadata</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Additional information that was passed along with the original media that was replied to</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *metadata</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If content shared to Messenger incuded metadata and the user replied to that message,
-that metadata is passed along with the reply back to the app. If no metadata was included
-this is nil</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandlerReplyContext.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userIDs" title="userIDs"></a>
-	<h3 class="subsubtitle method-title">userIDs</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user IDs of the other participants on the thread.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSSet *userIDs</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>User IDs can be used with the Facebook SDK and Graph API (https://developers.facebook.com/docs/graph-api)
-to query names, photos, and other data. This will only contain IDs of users that
-have also logged into your app via their Facebook account.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandlerReplyContext.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerPlatformCapability.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerPlatformCapability.html
deleted file mode 100644
index c605961c2876..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerPlatformCapability.html	
+++ /dev/null
@@ -1,390 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerPlatformCapability Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerPlatformCapability Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerPlatformCapability Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerPlatformCapability Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerSharer.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKMessengerPlatformCapability</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_OPTIONS(NSUInteger, FBSDKMessengerPlatformCapability ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityNone</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityOpen</a> = 1 &lt; &lt; 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityImage</a> = 1 &lt; &lt; 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityAnimatedGIF</a> = 1 &lt; &lt; 2,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityAnimatedWebP</a> = 1 &lt; &lt; 3,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityVideo</a> = 1 &lt; &lt; 4,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityAudio</a> = 1 &lt; &lt; 5,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerPlatformCapabilityRenderAsSticker</a> = 1 &lt; &lt; 6,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityNone"></a><code>FBSDKMessengerPlatformCapabilityNone</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityOpen"></a><code>FBSDKMessengerPlatformCapabilityOpen</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityImage"></a><code>FBSDKMessengerPlatformCapabilityImage</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityAnimatedGIF"></a><code>FBSDKMessengerPlatformCapabilityAnimatedGIF</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityAnimatedWebP"></a><code>FBSDKMessengerPlatformCapabilityAnimatedWebP</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityVideo"></a><code>FBSDKMessengerPlatformCapabilityVideo</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityAudio"></a><code>FBSDKMessengerPlatformCapabilityAudio</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerPlatformCapabilityRenderAsSticker"></a><code>FBSDKMessengerPlatformCapabilityRenderAsSticker</code></dt>
-<dd>
-
-
-<p>NS_OPTION(NSUInteger, FBSDKMessengerPlatformCapability)
-  Used to test the platform capabilities the currently installed Messenger version has</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerSharer.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKMessengerSharer.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerShareButtonStyle.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerShareButtonStyle.html
deleted file mode 100644
index 9e4aca9d3f5b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKMessengerShareButtonStyle.html	
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerShareButtonStyle Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerShareButtonStyle Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerShareButtonStyle Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerShareButtonStyle Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKMessengerShareButtonStyle</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>  Defines what visual style a UIButton should have</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKMessengerShareButtonStyle ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerShareButtonStyleBlue</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerShareButtonStyleWhite</a> = 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKMessengerShareButtonStyleWhiteBordered</a> = 2,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKMessengerShareButtonStyleBlue"></a><code>FBSDKMessengerShareButtonStyleBlue</code></dt>
-<dd>
-
-
-<p>  Defines what visual style a UIButton should have</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerShareButtonStyleWhite"></a><code>FBSDKMessengerShareButtonStyleWhite</code></dt>
-<dd>
-
-
-<p>  Defines what visual style a UIButton should have</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKMessengerShareButtonStyleWhiteBordered"></a><code>FBSDKMessengerShareButtonStyleWhiteBordered</code></dt>
-<dd>
-
-
-<p>  Defines what visual style a UIButton should have</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKMessengerButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKMessengerButton.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMessengerURLHandlerDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMessengerURLHandlerDelegate.html
deleted file mode 100644
index d9ad2b56b6aa..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMessengerURLHandlerDelegate.html	
+++ /dev/null
@@ -1,415 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessengerURLHandlerDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessengerURLHandlerDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/messengerURLHandler:didHandleCancelWithContext:">&nbsp;&nbsp;&nbsp;&nbsp;- messengerURLHandler:didHandleCancelWithContext:</option>
-	
-	<option value="//api/name/messengerURLHandler:didHandleOpenFromComposerWithContext:">&nbsp;&nbsp;&nbsp;&nbsp;- messengerURLHandler:didHandleOpenFromComposerWithContext:</option>
-	
-	<option value="//api/name/messengerURLHandler:didHandleReplyWithContext:">&nbsp;&nbsp;&nbsp;&nbsp;- messengerURLHandler:didHandleReplyWithContext:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/messengerURLHandler:didHandleCancelWithContext:">messengerURLHandler:didHandleCancelWithContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/messengerURLHandler:didHandleOpenFromComposerWithContext:">messengerURLHandler:didHandleOpenFromComposerWithContext:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/messengerURLHandler:didHandleReplyWithContext:">messengerURLHandler:didHandleReplyWithContext:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessengerURLHandlerDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessengerURLHandlerDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessengerURLHandler.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/messengerURLHandler:didHandleReplyWithContext:">&ndash;&nbsp;messengerURLHandler:didHandleReplyWithContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/messengerURLHandler:didHandleOpenFromComposerWithContext:">&ndash;&nbsp;messengerURLHandler:didHandleOpenFromComposerWithContext:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/messengerURLHandler:didHandleCancelWithContext:">&ndash;&nbsp;messengerURLHandler:didHandleCancelWithContext:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/messengerURLHandler:didHandleCancelWithContext:" title="messengerURLHandler:didHandleCancelWithContext:"></a>
-	<h3 class="subsubtitle method-title">messengerURLHandler:didHandleCancelWithContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  This is called after a user canceled a share and Messenger redirected here</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)messengerURLHandler:(FBSDKMessengerURLHandler *)<em>messengerURLHandler</em> didHandleCancelWithContext:(FBSDKMessengerURLHandlerCancelContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter messengerURLHandler: The handler that handled the URL</li>
-<li>Parameter context: The data passed from Messenger</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandler.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/messengerURLHandler:didHandleOpenFromComposerWithContext:" title="messengerURLHandler:didHandleOpenFromComposerWithContext:"></a>
-	<h3 class="subsubtitle method-title">messengerURLHandler:didHandleOpenFromComposerWithContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  This is called after a user tapped this app from the composer in Messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)messengerURLHandler:(FBSDKMessengerURLHandler *)<em>messengerURLHandler</em> didHandleOpenFromComposerWithContext:(FBSDKMessengerURLHandlerOpenFromComposerContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter messengerURLHandler: The handler that handled the URL</li>
-<li>Parameter context: The data passed from Messenger</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandler.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/messengerURLHandler:didHandleReplyWithContext:" title="messengerURLHandler:didHandleReplyWithContext:"></a>
-	<h3 class="subsubtitle method-title">messengerURLHandler:didHandleReplyWithContext:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  This is called after FBSDKMessengerURLHandler has received a reply from messenger</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)messengerURLHandler:(FBSDKMessengerURLHandler *)<em>messengerURLHandler</em> didHandleReplyWithContext:(FBSDKMessengerURLHandlerReplyContext *)<em>context</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter messengerURLHandler: The handler that handled the URL</li>
-<li>Parameter context: The data passed from Messenger</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessengerURLHandler.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css
deleted file mode 100644
index 33081897dc83..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css	
+++ /dev/null
@@ -1,615 +0,0 @@
-body {
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	font-size: 13px;
-}
-
-code {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	color: #666;
-}
-
-pre {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	line-height: 18px;
-	tab-interval: 0.5em;
-	border: 1px solid #C7CFD5;
-	background-color: #F1F5F9;
-	color: #666;
-	padding: 0.3em 1em;
-}
-
-ul {
-	list-style-type: square;
-}
-
-li {
-	margin-bottom: 10px;
-}
-
-a, a code {
-	text-decoration: none;
-	color: #36C;
-}
-
-a:hover, a:hover code {
-	text-decoration: underline;
-	color: #36C;
-}
-
-h2 {
-	border-bottom: 1px solid #8391A8;
-	color: #3C4C6C;
-	font-size: 187%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-bottom: 2px;	
-}
-
-table {
-    margin-bottom: 4em;
-    border-collapse:collapse;
-    vertical-align: middle;
-}
-
-td {
-    border: 1px solid #9BB3CD;
-    padding: .667em;
-    font-size: 100%;
-}
-
-th {
-    border: 1px solid #9BB3CD;
-    padding: .3em .667em .3em .667em;
-    background: #93A5BB;
-    font-size: 103%;
-    font-weight: bold;
-    color: white;
-    text-align: left;
-}
-
-/* @group Common page elements */
-
-#top_header {
-	height: 91px;
-	left: 0;
-	min-width: 598px;
-	position: absolute;
-	right: 0;
-	top: 0;
-	z-index: 900;
-}
-
-#footer {
-	clear: both;
-	padding-top: 20px;
-	text-align: center;
-}
-
-#contents, #overview_contents {
-	-webkit-overflow-scrolling: touch;
-	border-top: 1px solid #A9A9A9;
-	position: absolute;
-	top: 90px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding-left: 2em;
-	padding-right: 2em;
-	padding-top: 1em;
-	min-width: 550px;
-}
-
-#contents.isShowingTOC {
-	left: 230px;
-	min-width: 320px;
-}
-
-.copyright {
-	font-size: 12px;
-}
-
-.generator {
-	font-size: 11px;
-}
-
-.main-navigation ul li {
-	display: inline;
-	margin-left: 15px;
-	list-style: none;
-}
-
-.navigation-top {
-	clear: both;
-	float: right;
-}
-
-.navigation-bottom {
-	clear: both;
-	float: right;
-	margin-top: 20px;
-	margin-bottom: -10px;
-}
-
-.open > .disclosure {
-	background-image: url("../img/disclosure_open.png");
-}
-
-.disclosure {
-	background: url("../img/disclosure.png") no-repeat scroll 0 0;
-}
-
-.disclosure, .nodisclosure {
-	display: inline-block;
-	height: 8px;
-	margin-right: 5px;
-	position: relative;
-	width: 9px;
-}
-
-/* @end */
-
-/* @group Header */
-
-#top_header #library {
-	background: url("../img/library_background.png") repeat-x 0 0 #485E78;
-	background-color: #ccc;
-	height: 35px;
-	font-size: 115%;
-}
-
-#top_header #library #libraryTitle {
-	color: #FFFFFF;
-	margin-left: 15px;
-	text-shadow: 0 -1px 0 #485E78;
-	top: 8px;
-	position: absolute;
-}
-
-#libraryTitle {
-        left: 0;
-}
-
-#top_header #library #developerHome {
-	color: #92979E;
-	right: 15px;
-	top: 8px;
-	position: absolute;
-}
-
-#top_header #library a:hover {
-	text-decoration: none;
-}
-
-#top_header #title {
-	background: url("../img/title_background.png") repeat-x 0 0 #8A98A9;
-	border-bottom: 1px solid #757575;
-	height: 25px;
-	overflow: hidden;
-}
-
-#top_header h1 {
-	font-size: 105%;
-	font-weight: normal;
-	margin: 0;
-	padding: 3px 0 2px;
-	text-align: center;
-	/*text-shadow: 0 1px 0 #D5D5D5;*/
-	white-space: nowrap;
-}
-
-#headerButtons {
-	background-color: #D8D8D8;
-	background-image: url("../img/button_bar_background.png");
-	border-bottom: 0px solid #EDEDED;
-	border-top: 0px solid #a8a8a8;
-	font-size: 8pt;
-	height: 28px;
-	left: 0;
-	list-style: none outside none;
-	margin: 0;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	right: 0;
-	top: 61px;
-}
-
-#headerButtons li {
-	background-repeat: no-repeat;
-	display: inline;
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 0;
-}
-
-#toc_button button {
-    background-color: #EBEEF1;
-	border-color: #ACACAC;
-	border-style: none solid none none;
-	border-width: 0 1px 0 0;
-	height: 28px;
-	margin: 0;
-	padding-left: 30px;
-	text-align: left;
-	width: 230px;
-}
-
-li#jumpto_button {
-	left: 230px;
-	margin-left: 0;
-	position: absolute;
-}
-
-li#jumpto_button select {
-	height: 22px;
-	margin: 5px 2px 0 10px;
-	max-width: 300px;
-}
-
-/* @end */
-
-/* @group Table of contents */
-
-#tocContainer.isShowingTOC {
-	border-right: 1px solid #ACACAC;
-	display: block;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding: 0;
-}
-
-#tocContainer {
-	background-color: #EBEEF1;
-	border-top: 1px solid #ACACAC;
-	bottom: 0;
-	display: none;
-	left: 0;
-	overflow: hidden;
-	position: absolute;
-	top: 90px;
-	width: 229px;
-}
-
-#tocContainer > ul#toc {
-	font-size: 11px;
-	margin: 0;
-	padding: 12px 0 18px;
-	width: 209px;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
-}
-
-#tocContainer > ul#toc > li {
-	margin: 0;
-	padding: 0 0 7px 30px;
-	text-indent: -15px;
-}
-
-#tocContainer > ul#toc > li > .sectionName a {
-	color: #000000;
-	font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > .sectionName a:hover {
-	text-decoration: none;
-}
-
-#tocContainer > ul#toc li.children > ul {
-    display: none;
-    height: 0;
-}
-
-#tocContainer > ul#toc > li > ul {
-    margin: 0;
-    padding: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    margin-bottom: 0;
-    padding-left: 15px;
-}
-
-#tocContainer > ul#toc > li ul {
-    list-style: none;
-    margin-right: 0;
-    padding-right: 0;
-}
-
-#tocContainer > ul#toc li.children.open > ul {
-    display: block;
-    height: auto;
-    margin-left: -15px;
-    padding-left: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    padding-left: 15px;
-}
-
-#tocContainer li ul li {
-    margin-top: 0.583em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-#tocContainer li ul li span.sectionName {
-    white-space: normal;
-}
-
-#tocContainer > ul#toc > li > ul > li > .sectionName a {
-    font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > ul a {
-    color: #4F4F4F;
-}
-
-/* @end */
-
-/* @group Index formatting */
-
-.index-title {
-	font-size: 13px;
-	font-weight: normal;
-}
-
-.index-column {
-	float: left;
-	width: 30%;
-	min-width: 200px;
-	font-size: 11px;
-}
-
-.index-column ul {
-	margin: 8px 0 0 0;
-	padding: 0;
-	list-style: none;
-}
-
-.index-column ul li {
-	margin: 0 0 3px 0;
-	padding: 0;
-}
-
-.hierarchy-column {
-	min-width: 400px;
-}
-
-.hierarchy-column ul {
-	margin: 3px 0 0 15px;
-}
-
-.hierarchy-column ul li {
-	list-style-type: square;
-}
-
-/* @end */
-
-/* @group Common formatting elements */
-
-.title {
-	font-weight: normal;
-	font-size: 215%;
-	margin-top:0;
-}
-
-.subtitle {
-	font-weight: normal;
-	font-size: 180%;
-	color: #3C4C6C;
-	border-bottom: 1px solid #5088C5;
-}
-
-.subsubtitle {
-	font-weight: normal;
-	font-size: 145%;
-	height: 0.7em;
-}
-
-.note {
-	border: 1px solid #5088C5;
-	background-color: white;
-	margin: 1.667em 0 1.75em 0;
-	padding: 0 .667em .083em .750em;
-}
-
-.warning {
-	border: 1px solid #5088C5;
-	background-color: #F0F3F7;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.bug {
-	border: 1px solid #000;
-	background-color: #ffffcc;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.deprecated {
-	color: #F60425;
-}
-
-/* @end */
-
-/* @group Common layout */
-
-.section {
-	margin-top: 3em;
-}
-
-/* @end */
-
-/* @group Object specification section */
-
-.section-specification {
-	margin-left: 2.5em;
-	margin-right: 2.5em;
-	font-size: 12px;
-}
-
-.section-specification table {
-    margin-bottom: 0em;
-	border-top: 1px solid #d6e0e5;
-}
-
-.section-specification td {
-	vertical-align: top;
-	border-bottom: 1px solid #d6e0e5;
-	border-left-width: 0px;
-	border-right-width: 0px;
-	border-top-width: 0px;
-	padding: .6em;
-}
-
-.section-specification .specification-title {
-	font-weight: bold;
-}
-
-/* @end */
-
-/* @group Tasks section */
-
-.task-list {
-	list-style-type: none;
-	padding-left: 0px;
-}
-
-.task-list li {
-	margin-bottom: 3px;
-}
-
-.task-item-suffix {
-	color: #996;
-	font-size: 12px;
-	font-style: italic;
-	margin-left: 0.5em;
-}
-
-span.tooltip span.tooltip {
-	font-size: 1.0em;
-	display: none;
-	padding: 0.3em;
-	border: 1px solid #aaa;
-	background-color: #fdfec8;
-	color: #000;
-	text-align: left;
-}
-
-span.tooltip:hover span.tooltip {
-	display: block;
-	position: absolute;
-	margin-left: 2em;
-}
-
-/* @end */
-
-/* @group Method section */
-
-.section-method {
-	margin-top: 2.3em;
-}
-
-.method-title {
-	margin-bottom: 1.5em;
-}
-
-.method-subtitle {
-	margin-top: 0.7em;
-	margin-bottom: 0.2em;
-}
-
-.method-subsection p {
-	margin-top: 0.4em;
-	margin-bottom: 0.8em;
-}
-
-.method-declaration {
-	margin-top:1.182em;
-	margin-bottom:.909em;
-}
-
-.method-declaration code {
-	font:14px Courier, Consolas, monospace;
-	color:#000;
-}
-
-.declaration {
-	color: #000;
-}
-
-.termdef {
-    margin-bottom: 10px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: 0px;
-}
-
-.termdef dt {
-    margin: 0;
-    padding: 0;
-}
-
-.termdef dd {
-    margin-bottom: 6px;
-    margin-left: 16px;
-    margin-right: 0px;
-    margin-top: 1px;
-}
-
-.termdef dd p  {
-    margin-bottom: 6px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: -1px;
-}
-
-.argument-def {
-	margin-top: 0.3em;
-	margin-bottom: 0.3em;
-}
-
-.argument-def dd {
-	margin-left: 1.25em;
-}
-
-.see-also-section ul {
-	list-style-type: none;
-	padding-left: 0px;
-	margin-top: 0;
-}
-
-.see-also-section li {
-	margin-bottom: 3px;
-}
-
-.declared-in-ref {
-	color: #666;
-}
-
-#tocContainer.hideInXcode {
-	display: none;
-	border: 0px solid black;
-}
-
-#top_header.hideInXcode {
-	display: none;
-}
-
-#contents.hideInXcode {
-	border: 0px solid black;
-	top: 0px;
-	left: 0px;
-}
-
-/* @end */
-
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css
deleted file mode 100644
index dc54cd2ffbe7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css	
+++ /dev/null
@@ -1,22 +0,0 @@
-
-header {
-	display: none;
-}
-
-div.main-navigation, div.navigation-top {
-	display: none;
-}
-
-div#overview_contents, div#contents.isShowingTOC, div#contents {
-	overflow: visible;
-	position: relative;
-	top: 0px;
-	border: none;
-	left: 0;
-}
-#tocContainer.isShowingTOC {
-	display: none;
-}
-nav {
-	display: none;
-}
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html
deleted file mode 100644
index 1c040b7b9b7e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html	
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook Messenger Share Kit SDK 1.3.2 for iOS Hierarchy</title>
-			<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-			<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook Messenger Share Kit SDK 1.3.2 for iOS Hierarchy</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook Messenger Share Kit SDK 1.3.2 for iOS Hierarchy</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-					<div class="index-column hierarchy-column">
-						<h2 class="index-title">Class Hierarchy</h2>
-						
-	<ul>
-	
-		<li>NSObject
-	<ul>
-	
-		<li><a href="Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a>
-	<ul>
-	
-		<li><a href="Classes/FBSDKMessengerBroadcastContext.html">FBSDKMessengerBroadcastContext</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerURLHandlerCancelContext.html">FBSDKMessengerURLHandlerCancelContext</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerURLHandlerOpenFromComposerContext.html">FBSDKMessengerURLHandlerOpenFromComposerContext</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerURLHandlerReplyContext.html">FBSDKMessengerURLHandlerReplyContext</a></li>
-	
-	</ul>
-</li>
-	
-		<li><a href="Classes/FBSDKMessengerShareButton.html">FBSDKMessengerShareButton</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerShareOptions.html">FBSDKMessengerShareOptions</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerSharer.html">FBSDKMessengerSharer</a></li>
-	
-		<li><a href="Classes/FBSDKMessengerURLHandler.html">FBSDKMessengerURLHandler</a></li>
-	
-	</ul>
-</li>
-	
-	</ul>
-
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/FBSDKMessengerURLHandlerDelegate.html">FBSDKMessengerURLHandlerDelegate</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                            
-                            <li><a href="Constants/FBSDKMessengerPlatformCapability.html">FBSDKMessengerPlatformCapability</a></li>
-                            
-                            <li><a href="Constants/FBSDKMessengerShareButtonStyle.html">FBSDKMessengerShareButtonStyle</a></li>
-                            
-						</ul>
-						
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/index.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/index.html
deleted file mode 100644
index 6f7326884f99..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookMessengerShareKitSDK-1_3-for-iOS (1).docset/Contents/Resources/Documents/index.html	
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook Messenger Share Kit SDK 1.3.2 for iOS Reference</title>
-		<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook Messenger Share Kit SDK 1.3.2 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook Messenger Share Kit SDK 1.3.2 for iOS Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook Messenger Share Kit SDK 1.3.2 for iOS Reference</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-                        
-                    
-					
-					
-					<div class="index-column">
-						<h2 class="index-title">Class References</h2>
-						<ul>
-							
-							<li><a href="Classes/FBSDKMessengerBroadcastContext.html">FBSDKMessengerBroadcastContext</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerContext.html">FBSDKMessengerContext</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerShareButton.html">FBSDKMessengerShareButton</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerShareOptions.html">FBSDKMessengerShareOptions</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerSharer.html">FBSDKMessengerSharer</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerURLHandler.html">FBSDKMessengerURLHandler</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerURLHandlerCancelContext.html">FBSDKMessengerURLHandlerCancelContext</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerURLHandlerOpenFromComposerContext.html">FBSDKMessengerURLHandlerOpenFromComposerContext</a></li>
-							
-							<li><a href="Classes/FBSDKMessengerURLHandlerReplyContext.html">FBSDKMessengerURLHandlerReplyContext</a></li>
-							
-						</ul>
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/FBSDKMessengerURLHandlerDelegate.html">FBSDKMessengerURLHandlerDelegate</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                        
-                        <li><a href="Constants/FBSDKMessengerPlatformCapability.html">FBSDKMessengerPlatformCapability</a></li>
-                        
-                        <li><a href="Constants/FBSDKMessengerShareButtonStyle.html">FBSDKMessengerShareButtonStyle</a></li>
-                        
-						</ul>
-						
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppInviteHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppInviteHandler.html
deleted file mode 100644
index 6daad886b0e2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppInviteHandler.html	
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKDeferredAppInviteHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKDeferredAppInviteHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKDeferredAppInviteHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKDeferredAppInviteHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppLinkUtility.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKDeferredAppInviteHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>  Describes the callback for fetchOrganicDeferredAppLink.
-- Parameter url: the url representing the deferred App Link</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKDeferredAppInviteHandler) (NSURL *url)</code>
-
-
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKAppLinkUtility.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppLinkHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppLinkHandler.html
deleted file mode 100644
index b23c9591e574..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKDeferredAppLinkHandler.html	
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKDeferredAppLinkHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKDeferredAppLinkHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKDeferredAppLinkHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKDeferredAppLinkHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppLinkUtility.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKDeferredAppLinkHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>  Describes the callback for fetchDeferredAppLink.
-- Parameter url: the url representing the deferred App Link
-- Parameter error: the error during the request, if any</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKDeferredAppLinkHandler) (NSURL *url, NSError *error)</code>
-
-
-
-<div class="method-subsection discussion-section">
-    <h4 class="method-subtitle">Discussion</h4>
-    <p>The url may also have a fb_click_time_utc query parameter that
-represents when the click occurred that caused the deferred App Link to be created.</p>
-</div>
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKAppLinkUtility.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKGraphRequestHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKGraphRequestHandler.html
deleted file mode 100644
index 6fa1121b4d7f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKGraphRequestHandler.html	
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequestHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequestHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequestHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequestHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphRequestConnection.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKGraphRequestHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>FBSDKGraphRequestHandler</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKGraphRequestHandler) (FBSDKGraphRequestConnection *connection, id result, NSError *error)</code>
-
-
-
-<div class="method-subsection discussion-section">
-    <h4 class="method-subtitle">Discussion</h4>
-    <p>  A block that is passed to addRequest to register for a callback with the results of that
-request once the connection completes.</p>
-
-<p>Pass a block of this type when calling addRequest.  This will be called once
-the request completes.  The call occurs on the UI thread.</p>
-
-<ul>
-<li><p>Parameter connection:      The <code>FBSDKGraphRequestConnection</code> that sent the request.</p></li>
-<li><p>Parameter result:          The result of the request.  This is a translation of
-JSON data to <code>NSDictionary</code> and <code>NSArray</code> objects.  This
-is nil if there was an error.</p></li>
-<li><p>Parameter error:           The <code>NSError</code> representing any error that occurred.</p></li>
-</ul>
-
-</div>
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKLoginManagerRequestTokenHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKLoginManagerRequestTokenHandler.html
deleted file mode 100644
index 33a9d2576ef1..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKLoginManagerRequestTokenHandler.html	
+++ /dev/null
@@ -1,222 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginManagerRequestTokenHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginManagerRequestTokenHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginManagerRequestTokenHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginManagerRequestTokenHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKLoginManagerRequestTokenHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>  Describes the call back to the FBSDKLoginManager
-- Parameter result: the result of the authorization
-- Parameter error: the authorization error, if any.</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKLoginManagerRequestTokenHandler) (FBSDKLoginManagerLoginResult *result, NSError *error)</code>
-
-
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRemoveTestAccountHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRemoveTestAccountHandler.html
deleted file mode 100644
index 9af04318bee8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRemoveTestAccountHandler.html	
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTestUsersManagerRemoveTestAccountHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTestUsersManagerRemoveTestAccountHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTestUsersManagerRemoveTestAccountHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTestUsersManagerRemoveTestAccountHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTestUsersManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKTestUsersManagerRemoveTestAccountHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>  Callback block for removing a test user.</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKTestUsersManagerRemoveTestAccountHandler) (NSError *error)</code>
-
-
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRetrieveTestAccountTokensHandler.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRetrieveTestAccountTokensHandler.html
deleted file mode 100644
index 14f5416ae280..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Blocks/FBSDKTestUsersManagerRetrieveTestAccountTokensHandler.html	
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTestUsersManagerRetrieveTestAccountTokensHandler Block Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTestUsersManagerRetrieveTestAccountTokensHandler Block Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTestUsersManagerRetrieveTestAccountTokensHandler Block Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTestUsersManagerRetrieveTestAccountTokensHandler Block Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTestUsersManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-                    <a title="Block Definition" name="instance_methods"></a>
-                    <h2 class="subtitle subtitle-methods">Block Definition</h2>
-                    <h3 class="subsubtitle method-title">FBSDKTestUsersManagerRetrieveTestAccountTokensHandler</h3>
-
-
-<div class="method-subsection brief-description">
-    <p>  Callback block for returning an array of FBSDKAccessToken instances (and possibly <code>NSNull</code> instances); or an error.</p>
-</div>
-
-
-
-<code>typedef void (^FBSDKTestUsersManagerRetrieveTestAccountTokensHandler) (NSArray *tokens, NSError *error)</code>
-
-
-
-
-
-
-
-
-
-
-
-<div class="method-subsection declared-in-section">
-    <h4 class="method-subtitle">Declared In</h4>
-    <code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-</div>
-
-
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAccessToken.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAccessToken.html
deleted file mode 100644
index 4f100d6aed0c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAccessToken.html	
+++ /dev/null
@@ -1,972 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAccessToken Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAccessToken Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/appID">&nbsp;&nbsp;&nbsp;&nbsp;appID</option>
-	
-	<option value="//api/name/declinedPermissions">&nbsp;&nbsp;&nbsp;&nbsp;declinedPermissions</option>
-	
-	<option value="//api/name/expirationDate">&nbsp;&nbsp;&nbsp;&nbsp;expirationDate</option>
-	
-	<option value="//api/name/permissions">&nbsp;&nbsp;&nbsp;&nbsp;permissions</option>
-	
-	<option value="//api/name/refreshDate">&nbsp;&nbsp;&nbsp;&nbsp;refreshDate</option>
-	
-	<option value="//api/name/tokenString">&nbsp;&nbsp;&nbsp;&nbsp;tokenString</option>
-	
-	<option value="//api/name/userID">&nbsp;&nbsp;&nbsp;&nbsp;userID</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/currentAccessToken">&nbsp;&nbsp;&nbsp;&nbsp;+ currentAccessToken</option>
-	
-	<option value="//api/name/new">&nbsp;&nbsp;&nbsp;&nbsp;+ new</option>
-	
-	<option value="//api/name/refreshCurrentAccessToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ refreshCurrentAccessToken:</option>
-	
-	<option value="//api/name/setCurrentAccessToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ setCurrentAccessToken:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/hasGranted:">&nbsp;&nbsp;&nbsp;&nbsp;- hasGranted:</option>
-	
-	<option value="//api/name/init">&nbsp;&nbsp;&nbsp;&nbsp;- init</option>
-	
-	<option value="//api/name/initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:</option>
-	
-	<option value="//api/name/isEqualToAccessToken:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToAccessToken:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appID">appID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/declinedPermissions">declinedPermissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/expirationDate">expirationDate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/permissions">permissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/refreshDate">refreshDate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tokenString">tokenString</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userID">userID</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/currentAccessToken">currentAccessToken</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/new">new</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/refreshCurrentAccessToken:">refreshCurrentAccessToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setCurrentAccessToken:">setCurrentAccessToken:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/hasGranted:">hasGranted:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/init">init</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:">initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToAccessToken:">isEqualToAccessToken:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAccessToken Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAccessToken Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAccessToken.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Represents an immutable access token for using Facebook services.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appID">&nbsp;&nbsp;appID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/declinedPermissions">&nbsp;&nbsp;declinedPermissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/expirationDate">&nbsp;&nbsp;expirationDate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/permissions">&nbsp;&nbsp;permissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/refreshDate">&nbsp;&nbsp;refreshDate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tokenString">&nbsp;&nbsp;tokenString</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userID">&nbsp;&nbsp;userID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/init">&ndash;&nbsp;init</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/new">+&nbsp;new</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:">&ndash;&nbsp;initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/hasGranted:">&ndash;&nbsp;hasGranted:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToAccessToken:">&ndash;&nbsp;isEqualToAccessToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/currentAccessToken">+&nbsp;currentAccessToken</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setCurrentAccessToken:">+&nbsp;setCurrentAccessToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/refreshCurrentAccessToken:">+&nbsp;refreshCurrentAccessToken:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appID" title="appID"></a>
-	<h3 class="subsubtitle method-title">appID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the app ID.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSString *appID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/declinedPermissions" title="declinedPermissions"></a>
-	<h3 class="subsubtitle method-title">declinedPermissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the known declined permissions.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSSet *declinedPermissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/expirationDate" title="expirationDate"></a>
-	<h3 class="subsubtitle method-title">expirationDate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the expiration date.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSDate *expirationDate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/permissions" title="permissions"></a>
-	<h3 class="subsubtitle method-title">permissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the known granted permissions.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSSet *permissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/refreshDate" title="refreshDate"></a>
-	<h3 class="subsubtitle method-title">refreshDate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the date the token was last refreshed.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSDate *refreshDate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tokenString" title="tokenString"></a>
-	<h3 class="subsubtitle method-title">tokenString</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the opaque token string.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSString *tokenString</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userID" title="userID"></a>
-	<h3 class="subsubtitle method-title">userID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the user ID.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, copy, nonatomic) NSString *userID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/currentAccessToken" title="currentAccessToken"></a>
-	<h3 class="subsubtitle method-title">currentAccessToken</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the &ldquo;global&rdquo; access token that represents the currently logged in user.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBSDKAccessToken *)currentAccessToken</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>The <code>currentAccessToken</code> is a convenient representation of the token of the
-current user and is used by other SDK components (like <code>FBSDKLoginManager</code>).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/new" title="new"></a>
-	<h3 class="subsubtitle method-title">new</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)new</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/refreshCurrentAccessToken:" title="refreshCurrentAccessToken:"></a>
-	<h3 class="subsubtitle method-title">refreshCurrentAccessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Refresh the current access token&rsquo;s permission state and extend the token&rsquo;s expiration date,
-  if possible.
-- Parameter completionHandler: an optional callback handler that can surface any errors related to permission refreshing.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)refreshCurrentAccessToken:(FBSDKGraphRequestHandler)<em>completionHandler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>On a successful refresh, the currentAccessToken will be updated so you typically only need to
-  observe the <code>FBSDKAccessTokenDidChangeNotification</code> notification.</p>
-
-<p>If a token is already expired, it cannot be refreshed.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setCurrentAccessToken:" title="setCurrentAccessToken:"></a>
-	<h3 class="subsubtitle method-title">setCurrentAccessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets the &ldquo;global&rdquo; access token that represents the currently logged in user.
-- Parameter token: The access token to set.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setCurrentAccessToken:(FBSDKAccessToken *)<em>token</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This will broadcast a notification and save the token to the app keychain.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/hasGranted:" title="hasGranted:"></a>
-	<h3 class="subsubtitle method-title">hasGranted:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience getter to determine if a permission has been granted
-- Parameter permission:  The permission to check.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)hasGranted:(NSString *)<em>permission</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/init" title="init"></a>
-	<h3 class="subsubtitle method-title">init</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)init</code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:" title="initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:"></a>
-	<h3 class="subsubtitle method-title">initWithTokenString:permissions:declinedPermissions:appID:userID:expirationDate:refreshDate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes a new instance.
-- Parameter tokenString: the opaque token string.
-- Parameter permissions: the granted permissions. Note this is converted to NSSet and is only
-an NSArray for the convenience of literal syntax.
-- Parameter declinedPermissions: the declined permissions. Note this is converted to NSSet and is only
-an NSArray for the convenience of literal syntax.
-- Parameter appID: the app ID.
-- Parameter userID: the user ID.
-- Parameter expirationDate: the optional expiration date (defaults to distantFuture).
-- Parameter refreshDate: the optional date the token was last refreshed (defaults to today).</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithTokenString:(NSString *)<em>tokenString</em> permissions:(NSArray *)<em>permissions</em> declinedPermissions:(NSArray *)<em>declinedPermissions</em> appID:(NSString *)<em>appID</em> userID:(NSString *)<em>userID</em> expirationDate:(NSDate *)<em>expirationDate</em> refreshDate:(NSDate *)<em>refreshDate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This initializer should only be used for advanced apps that
-manage tokens explicitly. Typical login flows only need to use <code>FBSDKLoginManager</code>
-along with <code>+currentAccessToken</code>.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToAccessToken:" title="isEqualToAccessToken:"></a>
-	<h3 class="subsubtitle method-title">isEqualToAccessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another FBSDKAccessToken
-- Parameter token: The other token
-- Returns: YES if the receiver&rsquo;s values are equal to the other token&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToAccessToken:(FBSDKAccessToken *)<em>token</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAccessToken.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppEvents.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppEvents.html
deleted file mode 100644
index ee37f68b5ae1..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppEvents.html	
+++ /dev/null
@@ -1,1422 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppEvents Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppEvents Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/activateApp">&nbsp;&nbsp;&nbsp;&nbsp;+ activateApp</option>
-	
-	<option value="//api/name/flush">&nbsp;&nbsp;&nbsp;&nbsp;+ flush</option>
-	
-	<option value="//api/name/flushBehavior">&nbsp;&nbsp;&nbsp;&nbsp;+ flushBehavior</option>
-	
-	<option value="//api/name/logEvent:">&nbsp;&nbsp;&nbsp;&nbsp;+ logEvent:</option>
-	
-	<option value="//api/name/logEvent:parameters:">&nbsp;&nbsp;&nbsp;&nbsp;+ logEvent:parameters:</option>
-	
-	<option value="//api/name/logEvent:valueToSum:">&nbsp;&nbsp;&nbsp;&nbsp;+ logEvent:valueToSum:</option>
-	
-	<option value="//api/name/logEvent:valueToSum:parameters:">&nbsp;&nbsp;&nbsp;&nbsp;+ logEvent:valueToSum:parameters:</option>
-	
-	<option value="//api/name/logEvent:valueToSum:parameters:accessToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ logEvent:valueToSum:parameters:accessToken:</option>
-	
-	<option value="//api/name/logPurchase:currency:">&nbsp;&nbsp;&nbsp;&nbsp;+ logPurchase:currency:</option>
-	
-	<option value="//api/name/logPurchase:currency:parameters:">&nbsp;&nbsp;&nbsp;&nbsp;+ logPurchase:currency:parameters:</option>
-	
-	<option value="//api/name/logPurchase:currency:parameters:accessToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ logPurchase:currency:parameters:accessToken:</option>
-	
-	<option value="//api/name/logPushNotificationOpen:">&nbsp;&nbsp;&nbsp;&nbsp;+ logPushNotificationOpen:</option>
-	
-	<option value="//api/name/logPushNotificationOpen:action:">&nbsp;&nbsp;&nbsp;&nbsp;+ logPushNotificationOpen:action:</option>
-	
-	<option value="//api/name/loggingOverrideAppID">&nbsp;&nbsp;&nbsp;&nbsp;+ loggingOverrideAppID</option>
-	
-	<option value="//api/name/requestForCustomAudienceThirdPartyIDWithAccessToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ requestForCustomAudienceThirdPartyIDWithAccessToken:</option>
-	
-	<option value="//api/name/setFlushBehavior:">&nbsp;&nbsp;&nbsp;&nbsp;+ setFlushBehavior:</option>
-	
-	<option value="//api/name/setLoggingOverrideAppID:">&nbsp;&nbsp;&nbsp;&nbsp;+ setLoggingOverrideAppID:</option>
-	
-	<option value="//api/name/setPushNotificationsDeviceToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ setPushNotificationsDeviceToken:</option>
-	
-	<option value="//api/name/setUserID:">&nbsp;&nbsp;&nbsp;&nbsp;+ setUserID:</option>
-	
-	<option value="//api/name/updateUserProperties:handler:">&nbsp;&nbsp;&nbsp;&nbsp;+ updateUserProperties:handler:</option>
-	
-	<option value="//api/name/userID">&nbsp;&nbsp;&nbsp;&nbsp;+ userID</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/activateApp">activateApp</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/flush">flush</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/flushBehavior">flushBehavior</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logEvent:">logEvent:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logEvent:parameters:">logEvent:parameters:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logEvent:valueToSum:">logEvent:valueToSum:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logEvent:valueToSum:parameters:">logEvent:valueToSum:parameters:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logEvent:valueToSum:parameters:accessToken:">logEvent:valueToSum:parameters:accessToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logPurchase:currency:">logPurchase:currency:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logPurchase:currency:parameters:">logPurchase:currency:parameters:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logPurchase:currency:parameters:accessToken:">logPurchase:currency:parameters:accessToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logPushNotificationOpen:">logPushNotificationOpen:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logPushNotificationOpen:action:">logPushNotificationOpen:action:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loggingOverrideAppID">loggingOverrideAppID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestForCustomAudienceThirdPartyIDWithAccessToken:">requestForCustomAudienceThirdPartyIDWithAccessToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setFlushBehavior:">setFlushBehavior:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setLoggingOverrideAppID:">setLoggingOverrideAppID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setPushNotificationsDeviceToken:">setPushNotificationsDeviceToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setUserID:">setUserID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/updateUserProperties:handler:">updateUserProperties:handler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userID">userID</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppEvents Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppEvents Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppEvents.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Client-side event logging for specialized application analytics available through Facebook App Insights
-and for use with Facebook Ads conversion tracking and optimization.</p>
-
-<p>The <code>FBSDKAppEvents</code> static class has a few related roles:</p>
-
-<ul>
-<li><p>Logging predefined and application-defined events to Facebook App Insights with a
-numeric value to sum across a large number of events, and an optional set of key/value
-parameters that define &ldquo;segments&rdquo; for this event (e.g., &lsquo;purchaserStatus&rsquo; : &lsquo;frequent&rsquo;, or
-&lsquo;gamerLevel&rsquo; : &lsquo;intermediate&rsquo;)</p></li>
-<li><p>Logging events to later be used for ads optimization around lifetime value.</p></li>
-<li><p>Methods that control the way in which events are flushed out to the Facebook servers.</p></li>
-</ul>
-
-
-<p>Here are some important characteristics of the logging mechanism provided by <code>FBSDKAppEvents</code>:</p>
-
-<ul>
-<li>Events are not sent immediately when logged.  They&rsquo;re cached and flushed out to the Facebook servers
-in a number of situations:</li>
-<li>when an event count threshold is passed (currently 100 logged events).</li>
-<li>when a time threshold is passed (currently 15 seconds).</li>
-<li><p>when an app has gone to background and is then brought back to the foreground.</p></li>
-<li><p>Events will be accumulated when the app is in a disconnected state, and sent when the connection is
-restored and one of the above &lsquo;flush&rsquo; conditions are met.</p></li>
-<li><p>The <code>FBSDKAppEvents</code> class is thread-safe in that events may be logged from any of the app&rsquo;s threads.</p></li>
-<li><p>The developer can set the <code>flushBehavior</code> on <code>FBSDKAppEvents</code> to force the flushing of events to only
-occur on an explicit call to the <code>flush</code> method.</p></li>
-<li><p>The developer can turn on console debug output for event logging and flushing to the server by using
-the <code>FBSDKLoggingBehaviorAppEvents</code> value in <code>[FBSettings setLoggingBehavior:]</code>.</p></li>
-</ul>
-
-
-<p>Some things to note when logging events:</p>
-
-<ul>
-<li>There is a limit on the number of unique event names an app can use, on the order of 1000.</li>
-<li>There is a limit to the number of unique parameter names in the provided parameters that can
-be used per event, on the order of 25.  This is not just for an individual call, but for all
-invocations for that eventName.</li>
-<li>Event names and parameter names (the keys in the NSDictionary) must be between 2 and 40 characters, and
-must consist of alphanumeric characters, _, -, or spaces.</li>
-<li>The length of each parameter value can be no more than on the order of 100 characters.</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logEvent:">+&nbsp;logEvent:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logEvent:valueToSum:">+&nbsp;logEvent:valueToSum:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logEvent:parameters:">+&nbsp;logEvent:parameters:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logEvent:valueToSum:parameters:">+&nbsp;logEvent:valueToSum:parameters:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logEvent:valueToSum:parameters:accessToken:">+&nbsp;logEvent:valueToSum:parameters:accessToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logPurchase:currency:">+&nbsp;logPurchase:currency:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logPurchase:currency:parameters:">+&nbsp;logPurchase:currency:parameters:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logPurchase:currency:parameters:accessToken:">+&nbsp;logPurchase:currency:parameters:accessToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logPushNotificationOpen:">+&nbsp;logPushNotificationOpen:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logPushNotificationOpen:action:">+&nbsp;logPushNotificationOpen:action:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/activateApp">+&nbsp;activateApp</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setPushNotificationsDeviceToken:">+&nbsp;setPushNotificationsDeviceToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/flushBehavior">+&nbsp;flushBehavior</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setFlushBehavior:">+&nbsp;setFlushBehavior:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setLoggingOverrideAppID:">+&nbsp;setLoggingOverrideAppID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loggingOverrideAppID">+&nbsp;loggingOverrideAppID</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/flush">+&nbsp;flush</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestForCustomAudienceThirdPartyIDWithAccessToken:">+&nbsp;requestForCustomAudienceThirdPartyIDWithAccessToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setUserID:">+&nbsp;setUserID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userID">+&nbsp;userID</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/updateUserProperties:handler:">+&nbsp;updateUserProperties:handler:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/activateApp" title="activateApp"></a>
-	<h3 class="subsubtitle method-title">activateApp</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Notifies the events system that the app has launched and, when appropriate, logs an &ldquo;activated app&rdquo; event.  Should typically be placed in the
-app delegates' <code>applicationDidBecomeActive:</code> method.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)activateApp</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This method also takes care of logging the event indicating the first time this app has been launched, which, among other things, is used to
-track user acquisition and app install ads conversions.</p>
-
-<p><code>activateApp</code> will not log an event on every app launch, since launches happen every time the app is backgrounded and then foregrounded.
-&ldquo;activated app&rdquo; events will be logged when the app has not been active for more than 60 seconds.  This method also causes a &ldquo;deactivated app&rdquo;
-event to be logged when sessions are &ldquo;completed&rdquo;, and these events are logged with the session length, with an indication of how much
-time has elapsed between sessions, and with the number of background/foreground interruptions that session had.  This data
-is all visible in your app&rsquo;s App Events Insights.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/flush" title="flush"></a>
-	<h3 class="subsubtitle method-title">flush</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Explicitly kick off flushing of events to Facebook.  This is an asynchronous method, but it does initiate an immediate
-kick off.  Server failures will be reported through the NotificationCenter with notification ID <code>FBSDKAppEventsLoggingResultNotification</code>.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)flush</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/flushBehavior" title="flushBehavior"></a>
-	<h3 class="subsubtitle method-title">flushBehavior</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the current event flushing behavior specifying when events are sent back to Facebook servers.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBSDKAppEventsFlushBehavior)flushBehavior</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logEvent:" title="logEvent:"></a>
-	<h3 class="subsubtitle method-title">logEvent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an event with just an eventName.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logEvent:(NSString *)<em>eventName</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter eventName:   The name of the event to record.  Limitations on number of events and name length
-are given in the <code>FBSDKAppEvents</code> documentation.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logEvent:parameters:" title="logEvent:parameters:"></a>
-	<h3 class="subsubtitle method-title">logEvent:parameters:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an event with an eventName and a set of key/value pairs in the parameters dictionary.
-Parameter limitations are described above.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logEvent:(NSString *)<em>eventName</em> parameters:(NSDictionary *)<em>parameters</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter eventName:   The name of the event to record.  Limitations on number of events and name construction
-are given in the <code>FBSDKAppEvents</code> documentation.  Common event names are provided in <code>FBAppEventName*</code> constants.</p></li>
-<li><p>Parameter parameters:  Arbitrary parameter dictionary of characteristics. The keys to this dictionary must
-be NSString&rsquo;s, and the values are expected to be NSString or NSNumber.  Limitations on the number of
-parameters and name construction are given in the <code>FBSDKAppEvents</code> documentation.  Commonly used parameter names
-are provided in <code>FBSDKAppEventParameterName*</code> constants.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logEvent:valueToSum:" title="logEvent:valueToSum:"></a>
-	<h3 class="subsubtitle method-title">logEvent:valueToSum:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an event with an eventName and a numeric value to be aggregated with other events of this name.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logEvent:(NSString *)<em>eventName</em> valueToSum:(double)<em>valueToSum</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter eventName:   The name of the event to record.  Limitations on number of events and name length
-are given in the <code>FBSDKAppEvents</code> documentation.  Common event names are provided in <code>FBAppEventName*</code> constants.</p></li>
-<li><p>Parameter valueToSum:  Amount to be aggregated into all events of this eventName, and App Insights will report
-the cumulative and average value of this amount.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logEvent:valueToSum:parameters:" title="logEvent:valueToSum:parameters:"></a>
-	<h3 class="subsubtitle method-title">logEvent:valueToSum:parameters:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an event with an eventName, a numeric value to be aggregated with other events of this name,
-and a set of key/value pairs in the parameters dictionary.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logEvent:(NSString *)<em>eventName</em> valueToSum:(double)<em>valueToSum</em> parameters:(NSDictionary *)<em>parameters</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter eventName:   The name of the event to record.  Limitations on number of events and name construction
-are given in the <code>FBSDKAppEvents</code> documentation.  Common event names are provided in <code>FBAppEventName*</code> constants.</p></li>
-<li><p>Parameter valueToSum:  Amount to be aggregated into all events of this eventName, and App Insights will report
-the cumulative and average value of this amount.</p></li>
-<li><p>Parameter parameters:  Arbitrary parameter dictionary of characteristics. The keys to this dictionary must
-be NSString&rsquo;s, and the values are expected to be NSString or NSNumber.  Limitations on the number of
-parameters and name construction are given in the <code>FBSDKAppEvents</code> documentation.  Commonly used parameter names
-are provided in <code>FBSDKAppEventParameterName*</code> constants.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logEvent:valueToSum:parameters:accessToken:" title="logEvent:valueToSum:parameters:accessToken:"></a>
-	<h3 class="subsubtitle method-title">logEvent:valueToSum:parameters:accessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an event with an eventName, a numeric value to be aggregated with other events of this name,
-and a set of key/value pairs in the parameters dictionary.  Providing session lets the developer
-target a particular <FBSession>.  If nil is provided, then <code>[FBSession activeSession]</code> will be used.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logEvent:(NSString *)<em>eventName</em> valueToSum:(NSNumber *)<em>valueToSum</em> parameters:(NSDictionary *)<em>parameters</em> accessToken:(FBSDKAccessToken *)<em>accessToken</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter eventName:   The name of the event to record.  Limitations on number of events and name construction
-are given in the <code>FBSDKAppEvents</code> documentation.  Common event names are provided in <code>FBAppEventName*</code> constants.</p></li>
-<li><p>Parameter valueToSum:  Amount to be aggregated into all events of this eventName, and App Insights will report
-the cumulative and average value of this amount.  Note that this is an NSNumber, and a value of <code>nil</code> denotes
-that this event doesn&rsquo;t have a value associated with it for summation.</p></li>
-<li><p>Parameter parameters:  Arbitrary parameter dictionary of characteristics. The keys to this dictionary must
-be NSString&rsquo;s, and the values are expected to be NSString or NSNumber.  Limitations on the number of
-parameters and name construction are given in the <code>FBSDKAppEvents</code> documentation.  Commonly used parameter names
-are provided in <code>FBSDKAppEventParameterName*</code> constants.</p></li>
-<li><p>Parameter accessToken:  The optional access token to log the event as.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logPurchase:currency:" title="logPurchase:currency:"></a>
-	<h3 class="subsubtitle method-title">logPurchase:currency:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log a purchase of the specified amount, in the specified currency.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logPurchase:(double)<em>purchaseAmount</em> currency:(NSString *)<em>currency</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter purchaseAmount:    Purchase amount to be logged, as expressed in the specified currency.  This value
-will be rounded to the thousandths place (e.g., 12.34567 becomes 12.346).</p></li>
-<li><p>Parameter currency:          Currency, is denoted as, e.g. &ldquo;USD&rdquo;, &ldquo;EUR&rdquo;, &ldquo;GBP&rdquo;.  See ISO-4217 for
-specific values.  One reference for these is <a href="http://en.wikipedia.org/wiki/ISO_4217">http://en.wikipedia.org/wiki/ISO_4217</a>.</p>
-
-<pre><code>        This event immediately triggers a flush of the `FBSDKAppEvents` event queue, unless the `flushBehavior` is set
-</code></pre>
-
-<p>to <code>FBSDKAppEventsFlushBehaviorExplicitOnly</code>.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logPurchase:currency:parameters:" title="logPurchase:currency:parameters:"></a>
-	<h3 class="subsubtitle method-title">logPurchase:currency:parameters:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log a purchase of the specified amount, in the specified currency, also providing a set of
-additional characteristics describing the purchase.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logPurchase:(double)<em>purchaseAmount</em> currency:(NSString *)<em>currency</em> parameters:(NSDictionary *)<em>parameters</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter purchaseAmount:  Purchase amount to be logged, as expressed in the specified currency.This value
-will be rounded to the thousandths place (e.g., 12.34567 becomes 12.346).</p></li>
-<li><p>Parameter currency:        Currency, is denoted as, e.g. &ldquo;USD&rdquo;, &ldquo;EUR&rdquo;, &ldquo;GBP&rdquo;.  See ISO-4217 for
-specific values.  One reference for these is <a href="http://en.wikipedia.org/wiki/ISO_4217">http://en.wikipedia.org/wiki/ISO_4217</a>.</p></li>
-<li><p>Parameter parameters:      Arbitrary parameter dictionary of characteristics. The keys to this dictionary must
-be NSString&rsquo;s, and the values are expected to be NSString or NSNumber.  Limitations on the number of
-parameters and name construction are given in the <code>FBSDKAppEvents</code> documentation.  Commonly used parameter names
-are provided in <code>FBSDKAppEventParameterName*</code> constants.</p>
-
-<pre><code>        This event immediately triggers a flush of the `FBSDKAppEvents` event queue, unless the `flushBehavior` is set
-</code></pre>
-
-<p>to <code>FBSDKAppEventsFlushBehaviorExplicitOnly</code>.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logPurchase:currency:parameters:accessToken:" title="logPurchase:currency:parameters:accessToken:"></a>
-	<h3 class="subsubtitle method-title">logPurchase:currency:parameters:accessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log a purchase of the specified amount, in the specified currency, also providing a set of
-additional characteristics describing the purchase, as well as an <FBSession> to log to.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logPurchase:(double)<em>purchaseAmount</em> currency:(NSString *)<em>currency</em> parameters:(NSDictionary *)<em>parameters</em> accessToken:(FBSDKAccessToken *)<em>accessToken</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter purchaseAmount:  Purchase amount to be logged, as expressed in the specified currency.This value
-will be rounded to the thousandths place (e.g., 12.34567 becomes 12.346).</p></li>
-<li><p>Parameter currency:        Currency, is denoted as, e.g. &ldquo;USD&rdquo;, &ldquo;EUR&rdquo;, &ldquo;GBP&rdquo;.  See ISO-4217 for
-specific values.  One reference for these is <a href="http://en.wikipedia.org/wiki/ISO_4217">http://en.wikipedia.org/wiki/ISO_4217</a>.</p></li>
-<li><p>Parameter parameters:      Arbitrary parameter dictionary of characteristics. The keys to this dictionary must
-be NSString&rsquo;s, and the values are expected to be NSString or NSNumber.  Limitations on the number of
-parameters and name construction are given in the <code>FBSDKAppEvents</code> documentation.  Commonly used parameter names
-are provided in <code>FBSDKAppEventParameterName*</code> constants.</p></li>
-<li><p>Parameter accessToken:  The optional access token to log the event as.</p>
-
-<pre><code>      This event immediately triggers a flush of the `FBSDKAppEvents` event queue, unless the `flushBehavior` is set
-</code></pre>
-
-<p>to <code>FBSDKAppEventsFlushBehaviorExplicitOnly</code>.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logPushNotificationOpen:" title="logPushNotificationOpen:"></a>
-	<h3 class="subsubtitle method-title">logPushNotificationOpen:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an app event that tracks that the application was open via Push Notification.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logPushNotificationOpen:(NSDictionary *)<em>payload</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter payload: Notification payload received via <code>UIApplicationDelegate</code>.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logPushNotificationOpen:action:" title="logPushNotificationOpen:action:"></a>
-	<h3 class="subsubtitle method-title">logPushNotificationOpen:action:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Log an app event that tracks that a custom action was taken from a push notification.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)logPushNotificationOpen:(NSDictionary *)<em>payload</em> action:(NSString *)<em>action</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter payload: Notification payload received via <code>UIApplicationDelegate</code>.</li>
-<li>Parameter action:  Name of the action that was taken.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loggingOverrideAppID" title="loggingOverrideAppID"></a>
-	<h3 class="subsubtitle method-title">loggingOverrideAppID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the &lsquo;override&rsquo; App ID for App Event logging.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)loggingOverrideAppID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>See:setLoggingOverrideAppID:</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/requestForCustomAudienceThirdPartyIDWithAccessToken:" title="requestForCustomAudienceThirdPartyIDWithAccessToken:"></a>
-	<h3 class="subsubtitle method-title">requestForCustomAudienceThirdPartyIDWithAccessToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Creates a request representing the Graph API call to retrieve a Custom Audience &ldquo;third party ID&rdquo; for the app&rsquo;s Facebook user.
-Callers will send this ID back to their own servers, collect up a set to create a Facebook Custom Audience with,
-and then use the resultant Custom Audience to target ads.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBSDKGraphRequest *)requestForCustomAudienceThirdPartyIDWithAccessToken:(FBSDKAccessToken *)<em>accessToken</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter accessToken: The access token to use to establish the user&rsquo;s identity for users logged into Facebook through this app.
-If <code>nil</code>, then the <code>[FBSDKAccessToken currentAccessToken]</code> is used.</li>
-</ul>
-
-
-<p>The JSON in the request&rsquo;s response will include an &ldquo;custom_audience_third_party_id&rdquo; key/value pair, with the value being the ID retrieved.
-This ID is an encrypted encoding of the Facebook user&rsquo;s ID and the invoking Facebook app ID.
-Multiple calls with the same user will return different IDs, thus these IDs cannot be used to correlate behavior
-across devices or applications, and are only meaningful when sent back to Facebook for creating Custom Audiences.</p>
-
-<p>The ID retrieved represents the Facebook user identified in the following way: if the specified access token is valid,
-the ID will represent the user associated with that token; otherwise the ID will represent the user logged into the
-native Facebook app on the device.  If there is no native Facebook app, no one is logged into it, or the user has opted out
-at the iOS level from ad tracking, then a <code>nil</code> ID will be returned.</p>
-
-<p>This method returns <code>nil</code> if either the user has opted-out (via iOS) from Ad Tracking, the app itself has limited event usage
-via the <code>[FBSDKSettings limitEventAndDataUsage]</code> flag, or a specific Facebook user cannot be identified.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setFlushBehavior:" title="setFlushBehavior:"></a>
-	<h3 class="subsubtitle method-title">setFlushBehavior:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the current event flushing behavior specifying when events are sent back to Facebook servers.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setFlushBehavior:(FBSDKAppEventsFlushBehavior)<em>flushBehavior</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter flushBehavior:   The desired <code>FBSDKAppEventsFlushBehavior</code> to be used.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setLoggingOverrideAppID:" title="setLoggingOverrideAppID:"></a>
-	<h3 class="subsubtitle method-title">setLoggingOverrideAppID:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the &lsquo;override&rsquo; App ID for App Event logging.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setLoggingOverrideAppID:(NSString *)<em>appID</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>In some cases, apps want to use one Facebook App ID for login and social presence and another
-for App Event logging.  (An example is if multiple apps from the same company share an app ID for login, but
-want distinct logging.)  By default, this value is <code>nil</code>, and defers to the <code>FBSDKAppEventsOverrideAppIDBundleKey</code>
-plist value.  If that&rsquo;s not set, it defaults to <code>[FBSDKSettings appID]</code>.</p>
-
-<p>This should be set before any other calls are made to <code>FBSDKAppEvents</code>.  Thus, you should set it in your application
-delegate&rsquo;s <code>application:didFinishLaunchingWithOptions:</code> delegate.</p>
-
-<ul>
-<li>Parameter appID: The Facebook App ID to be used for App Event logging.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setPushNotificationsDeviceToken:" title="setPushNotificationsDeviceToken:"></a>
-	<h3 class="subsubtitle method-title">setPushNotificationsDeviceToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets a device token to register the current application installation for push notifications.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setPushNotificationsDeviceToken:(NSData *)<em>deviceToken</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Sets a device token from <code>NSData</code> representation that you get from <code>UIApplicationDelegate.-application:didRegisterForRemoteNotificationsWithDeviceToken:</code>.</p>
-
-<ul>
-<li>Parameter deviceToken: Device token data.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setUserID:" title="setUserID:"></a>
-	<h3 class="subsubtitle method-title">setUserID:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>+ (void)setUserID:(NSString *)<em>userID</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/updateUserProperties:handler:" title="updateUserProperties:handler:"></a>
-	<h3 class="subsubtitle method-title">updateUserProperties:handler:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>+ (void)updateUserProperties:(NSDictionary *)<em>properties</em> handler:(FBSDKGraphRequestHandler)<em>handler</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userID" title="userID"></a>
-	<h3 class="subsubtitle method-title">userID</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)userID</code></div>
-
-    
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupAddDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupAddDialog.html
deleted file mode 100644
index 2131be3e4359..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupAddDialog.html	
+++ /dev/null
@@ -1,585 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupAddDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupAddDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/content">&nbsp;&nbsp;&nbsp;&nbsp;content</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showWithContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showWithContent:delegate:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShow">&nbsp;&nbsp;&nbsp;&nbsp;- canShow</option>
-	
-	<option value="//api/name/show">&nbsp;&nbsp;&nbsp;&nbsp;- show</option>
-	
-	<option value="//api/name/validateWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- validateWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/content">content</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showWithContent:delegate:">showWithContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShow">canShow</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/show">show</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/validateWithError:">validateWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupAddDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupAddDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupAddDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showWithContent:delegate:">+&nbsp;showWithContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/content">&nbsp;&nbsp;content</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShow">&ndash;&nbsp;canShow</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/show">&ndash;&nbsp;show</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/validateWithError:">&ndash;&nbsp;validateWithError:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/content" title="content"></a>
-	<h3 class="subsubtitle method-title">content</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKAppGroupContent *content</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKAppGroupAddDialogDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showWithContent:delegate:" title="showWithContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showWithContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showWithContent:(FBSDKAppGroupContent *)<em>content</em> delegate:(id&lt;FBSDKAppGroupAddDialogDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShow" title="canShow"></a>
-	<h3 class="subsubtitle method-title">canShow</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShow</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/show" title="show"></a>
-	<h3 class="subsubtitle method-title">show</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)show</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/validateWithError:" title="validateWithError:"></a>
-	<h3 class="subsubtitle method-title">validateWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)validateWithError:(NSError *__autoreleasing *)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupContent.html
deleted file mode 100644
index c799057b6537..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupContent.html	
+++ /dev/null
@@ -1,464 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/groupDescription">&nbsp;&nbsp;&nbsp;&nbsp;groupDescription</option>
-	
-	<option value="//api/name/name">&nbsp;&nbsp;&nbsp;&nbsp;name</option>
-	
-	<option value="//api/name/privacy">&nbsp;&nbsp;&nbsp;&nbsp;privacy</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToAppGroupContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToAppGroupContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/groupDescription">groupDescription</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/name">name</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/privacy">privacy</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToAppGroupContent:">isEqualToAppGroupContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for creating an app group.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/groupDescription">&nbsp;&nbsp;groupDescription</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/name">&nbsp;&nbsp;name</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/privacy">&nbsp;&nbsp;privacy</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToAppGroupContent:">&ndash;&nbsp;isEqualToAppGroupContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/groupDescription" title="groupDescription"></a>
-	<h3 class="subsubtitle method-title">groupDescription</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The description of the group.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *groupDescription</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/name" title="name"></a>
-	<h3 class="subsubtitle method-title">name</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The name of the group.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *name</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/privacy" title="privacy"></a>
-	<h3 class="subsubtitle method-title">privacy</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The privacy for the group.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKAppGroupPrivacy privacy</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToAppGroupContent:" title="isEqualToAppGroupContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToAppGroupContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another app group content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToAppGroupContent:(FBSDKAppGroupContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupJoinDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupJoinDialog.html
deleted file mode 100644
index d1911e31d77b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppGroupJoinDialog.html	
+++ /dev/null
@@ -1,585 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupJoinDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupJoinDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/groupID">&nbsp;&nbsp;&nbsp;&nbsp;groupID</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showWithGroupID:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showWithGroupID:delegate:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShow">&nbsp;&nbsp;&nbsp;&nbsp;- canShow</option>
-	
-	<option value="//api/name/show">&nbsp;&nbsp;&nbsp;&nbsp;- show</option>
-	
-	<option value="//api/name/validateWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- validateWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/groupID">groupID</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showWithGroupID:delegate:">showWithGroupID:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShow">canShow</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/show">show</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/validateWithError:">validateWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupJoinDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupJoinDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupJoinDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showWithGroupID:delegate:">+&nbsp;showWithGroupID:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/groupID">&nbsp;&nbsp;groupID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShow">&ndash;&nbsp;canShow</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/show">&ndash;&nbsp;show</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/validateWithError:">&ndash;&nbsp;validateWithError:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKAppGroupJoinDialogDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/groupID" title="groupID"></a>
-	<h3 class="subsubtitle method-title">groupID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *groupID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showWithGroupID:delegate:" title="showWithGroupID:delegate:"></a>
-	<h3 class="subsubtitle method-title">showWithGroupID:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showWithGroupID:(NSString *)<em>groupID</em> delegate:(id&lt;FBSDKAppGroupJoinDialogDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShow" title="canShow"></a>
-	<h3 class="subsubtitle method-title">canShow</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShow</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/show" title="show"></a>
-	<h3 class="subsubtitle method-title">show</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)show</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/validateWithError:" title="validateWithError:"></a>
-	<h3 class="subsubtitle method-title">validateWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)validateWithError:(NSError *__autoreleasing *)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteContent.html
deleted file mode 100644
index 06a12dcd94df..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteContent.html	
+++ /dev/null
@@ -1,632 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppInviteContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppInviteContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/appInvitePreviewImageURL">&nbsp;&nbsp;&nbsp;&nbsp;appInvitePreviewImageURL</option>
-	
-	<option value="//api/name/appLinkURL">&nbsp;&nbsp;&nbsp;&nbsp;appLinkURL</option>
-	
-	<option value="//api/name/destination">&nbsp;&nbsp;&nbsp;&nbsp;destination</option>
-	
-	<option value="//api/name/previewImageURL">&nbsp;&nbsp;&nbsp;&nbsp;previewImageURL</option>
-	
-	<option value="//api/name/promotionCode">&nbsp;&nbsp;&nbsp;&nbsp;promotionCode</option>
-	
-	<option value="//api/name/promotionText">&nbsp;&nbsp;&nbsp;&nbsp;promotionText</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToAppInviteContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToAppInviteContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appInvitePreviewImageURL">appInvitePreviewImageURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appLinkURL">appLinkURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/destination">destination</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/previewImageURL">previewImageURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/promotionCode">promotionCode</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/promotionText">promotionText</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToAppInviteContent:">isEqualToAppInviteContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppInviteContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppInviteContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppInviteContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for app invite.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appInvitePreviewImageURL">&nbsp;&nbsp;appInvitePreviewImageURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appLinkURL">&nbsp;&nbsp;appLinkURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/previewImageURL">&nbsp;&nbsp;previewImageURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/promotionCode">&nbsp;&nbsp;promotionCode</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/promotionText">&nbsp;&nbsp;promotionText</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/destination">&nbsp;&nbsp;destination</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToAppInviteContent:">&ndash;&nbsp;isEqualToAppInviteContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appInvitePreviewImageURL" title="appInvitePreviewImageURL"></a>
-	<h3 class="subsubtitle method-title">appInvitePreviewImageURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A URL to a preview image that will be displayed with the app invite</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *appInvitePreviewImageURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is optional.  If you don&rsquo;t include it a fallback image will be used.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appLinkURL" title="appLinkURL"></a>
-	<h3 class="subsubtitle method-title">appLinkURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  An app link target that will be used as a target when the user accept the invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *appLinkURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is a requirement.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/destination" title="destination"></a>
-	<h3 class="subsubtitle method-title">destination</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Destination for the app invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property FBSDKAppInviteDestination destination</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is optional and for declaring destination of the invite.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/previewImageURL" title="previewImageURL"></a>
-	<h3 class="subsubtitle method-title">previewImageURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:Use <code>appInvitePreviewImageURL</code> instead.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *previewImageURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/promotionCode" title="promotionCode"></a>
-	<h3 class="subsubtitle method-title">promotionCode</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Promotional code to be displayed while sending and receiving the invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *promotionCode</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is optional. This can be between 0 and 10 characters long and can contain
-alphanumeric characters only. To set a promo code, you need to set promo text.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/promotionText" title="promotionText"></a>
-	<h3 class="subsubtitle method-title">promotionText</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Promotional text to be displayed while sending and receiving the invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *promotionText</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is optional. This can be between 0 and 80 characters long and can contain
-alphanumeric and spaces only.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToAppInviteContent:" title="isEqualToAppInviteContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToAppInviteContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another app invite content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToAppInviteContent:(FBSDKAppInviteContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteDialog.html
deleted file mode 100644
index c2fbcf0d6582..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppInviteDialog.html	
+++ /dev/null
@@ -1,683 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppInviteDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppInviteDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/content">&nbsp;&nbsp;&nbsp;&nbsp;content</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/fromViewController">&nbsp;&nbsp;&nbsp;&nbsp;fromViewController</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showFromViewController:withContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showFromViewController:withContent:delegate:</option>
-	
-	<option value="//api/name/showWithContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showWithContent:delegate:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShow">&nbsp;&nbsp;&nbsp;&nbsp;- canShow</option>
-	
-	<option value="//api/name/show">&nbsp;&nbsp;&nbsp;&nbsp;- show</option>
-	
-	<option value="//api/name/validateWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- validateWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/content">content</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/fromViewController">fromViewController</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showFromViewController:withContent:delegate:">showFromViewController:withContent:delegate:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showWithContent:delegate:">showWithContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShow">canShow</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/show">show</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/validateWithError:">validateWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppInviteDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppInviteDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppInviteDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A dialog for sending App Invites.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showFromViewController:withContent:delegate:">+&nbsp;showFromViewController:withContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showWithContent:delegate:">+&nbsp;showWithContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/fromViewController">&nbsp;&nbsp;fromViewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/content">&nbsp;&nbsp;content</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShow">&ndash;&nbsp;canShow</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/show">&ndash;&nbsp;show</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/validateWithError:">&ndash;&nbsp;validateWithError:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/content" title="content"></a>
-	<h3 class="subsubtitle method-title">content</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The content for app invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKAppInviteContent *content</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The receiver&rsquo;s delegate or nil if it doesn&rsquo;t have a delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKAppInviteDialogDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/fromViewController" title="fromViewController"></a>
-	<h3 class="subsubtitle method-title">fromViewController</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A UIViewController to present the dialog from.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) UIViewController *fromViewController</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not specified, the top most view controller will be automatically determined as best as possible.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showFromViewController:withContent:delegate:" title="showFromViewController:withContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showFromViewController:withContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to show a FBSDKAppInviteDialog
-- Parameter viewController: A UIViewController to present the dialog from.
-- Parameter content: The content for the app invite.
-- Parameter delegate: The receiver&rsquo;s delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showFromViewController:(UIViewController *)<em>viewController</em> withContent:(FBSDKAppInviteContent *)<em>content</em> delegate:(id&lt;FBSDKAppInviteDialogDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/showWithContent:delegate:" title="showWithContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showWithContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:use showFromViewController:withContent:delegate: instead</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showWithContent:(FBSDKAppInviteContent *)<em>content</em> delegate:(id&lt;FBSDKAppInviteDialogDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShow" title="canShow"></a>
-	<h3 class="subsubtitle method-title">canShow</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A Boolean value that indicates whether the receiver can initiate an app invite.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShow</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>May return NO if the appropriate Facebook app is not installed and is required or an access token is
-required but not available.  This method does not validate the content on the receiver, so this can be checked before
-building up the content.</p>
-
-<ul>
-<li>See:validateWithError:</li>
-<li>Returns: YES if the receiver can show the dialog, otherwise NO.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/show" title="show"></a>
-	<h3 class="subsubtitle method-title">show</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Begins the app invite from the receiver.
-- Returns: YES if the receiver was able to show the dialog, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)show</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/validateWithError:" title="validateWithError:"></a>
-	<h3 class="subsubtitle method-title">validateWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Validates the content on the receiver.
-- Parameter errorRef: If an error occurs, upon return contains an NSError object that describes the problem.
-- Returns: YES if the content is valid, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)validateWithError:(NSError *__autoreleasing *)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkResolver.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkResolver.html
deleted file mode 100644
index 9ac68180c571..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkResolver.html	
+++ /dev/null
@@ -1,387 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppLinkResolver Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppLinkResolver Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/resolver">&nbsp;&nbsp;&nbsp;&nbsp;+ resolver</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/appLinksFromURLsInBackground:">&nbsp;&nbsp;&nbsp;&nbsp;- appLinksFromURLsInBackground:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/resolver">resolver</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appLinksFromURLsInBackground:">appLinksFromURLsInBackground:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppLinkResolver Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppLinkResolver Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/BFAppLinkResolving.html">BFAppLinkResolving</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppLinkResolver.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Provides an implementation of the BFAppLinkResolving protocol that uses the Facebook App Link
-Index API to resolve App Links given a URL. It also provides an additional helper method that can resolve
-multiple App Links in a single call.</p>
-
-<p>Usage of this type requires a client token. See <code>[FBSDKSettings setClientToken:]</code> and linking
-Bolts.framework</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appLinksFromURLsInBackground:">&ndash;&nbsp;appLinksFromURLsInBackground:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/resolver">+&nbsp;resolver</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/resolver" title="resolver"></a>
-	<h3 class="subsubtitle method-title">resolver</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Allocates and initializes a new instance of FBSDKAppLinkResolver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)resolver</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppLinkResolver.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appLinksFromURLsInBackground:" title="appLinksFromURLsInBackground:"></a>
-	<h3 class="subsubtitle method-title">appLinksFromURLsInBackground:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Asynchronously resolves App Link data for multiple URLs.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BFTask *)appLinksFromURLsInBackground:(NSArray *)<em>urls</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter urls: An array of NSURLs to resolve into App Links.</li>
-<li>Returns: A BFTask that will return dictionary mapping input NSURLs to their
-corresponding BFAppLink.</li>
-</ul>
-
-
-<p>You should set the client token before making this call. See <code>[FBSDKSettings setClientToken:]</code></p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppLinkResolver.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkUtility.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkUtility.html
deleted file mode 100644
index b0092622f104..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKAppLinkUtility.html	
+++ /dev/null
@@ -1,397 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppLinkUtility Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppLinkUtility Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/appInvitePromotionCodeFromURL:">&nbsp;&nbsp;&nbsp;&nbsp;+ appInvitePromotionCodeFromURL:</option>
-	
-	<option value="//api/name/fetchDeferredAppInvite:">&nbsp;&nbsp;&nbsp;&nbsp;+ fetchDeferredAppInvite:</option>
-	
-	<option value="//api/name/fetchDeferredAppLink:">&nbsp;&nbsp;&nbsp;&nbsp;+ fetchDeferredAppLink:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appInvitePromotionCodeFromURL:">appInvitePromotionCodeFromURL:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/fetchDeferredAppInvite:">fetchDeferredAppInvite:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/fetchDeferredAppLink:">fetchDeferredAppLink:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppLinkUtility Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppLinkUtility Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppLinkUtility.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Class containing App Links related utility methods.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/fetchDeferredAppLink:">+&nbsp;fetchDeferredAppLink:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/fetchDeferredAppInvite:">+&nbsp;fetchDeferredAppInvite:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appInvitePromotionCodeFromURL:">+&nbsp;appInvitePromotionCodeFromURL:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appInvitePromotionCodeFromURL:" title="appInvitePromotionCodeFromURL:"></a>
-	<h3 class="subsubtitle method-title">appInvitePromotionCodeFromURL:</h3>
-	
-	
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)appInvitePromotionCodeFromURL:(NSURL *)<em>url</em></code></div>
-
-    
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/fetchDeferredAppInvite:" title="fetchDeferredAppInvite:"></a>
-	<h3 class="subsubtitle method-title">fetchDeferredAppInvite:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:This method is no longer available and will always return NO.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (BOOL)fetchDeferredAppInvite:(FBSDKDeferredAppInviteHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppLinkUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/fetchDeferredAppLink:" title="fetchDeferredAppLink:"></a>
-	<h3 class="subsubtitle method-title">fetchDeferredAppLink:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method from the main thread to fetch deferred applink data if you use Mobile App
-Engagement Ads (https://developers.facebook.com/docs/ads-for-apps/mobile-app-ads-engagement).
-This may require a network round trip. If successful, the handler is invoked  with the link
-data (this will only return a valid URL once, and future calls will result in a nil URL
-value in the callback).</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)fetchDeferredAppLink:(FBSDKDeferredAppLinkHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter handler: the handler to be invoked if there is deferred App Link data</li>
-</ul>
-
-
-<p>The handler may contain an NSError instance to capture any errors. In the
-common case where there simply was no app link data, the NSError instance will be nil.</p>
-
-<p>This method should only be called from a location that occurs after any launching URL has
-been processed (e.g., you should call this method from your application delegate&rsquo;s
-applicationDidBecomeActive:).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppLinkUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKApplicationDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKApplicationDelegate.html
deleted file mode 100644
index ea74121d7d9c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKApplicationDelegate.html	
+++ /dev/null
@@ -1,502 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKApplicationDelegate Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKApplicationDelegate Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/sharedInstance">&nbsp;&nbsp;&nbsp;&nbsp;+ sharedInstance</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/application:didFinishLaunchingWithOptions:">&nbsp;&nbsp;&nbsp;&nbsp;- application:didFinishLaunchingWithOptions:</option>
-	
-	<option value="//api/name/application:openURL:options:">&nbsp;&nbsp;&nbsp;&nbsp;- application:openURL:options:</option>
-	
-	<option value="//api/name/application:openURL:sourceApplication:annotation:">&nbsp;&nbsp;&nbsp;&nbsp;- application:openURL:sourceApplication:annotation:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sharedInstance">sharedInstance</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/application:didFinishLaunchingWithOptions:">application:didFinishLaunchingWithOptions:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/application:openURL:options:">application:openURL:options:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/application:openURL:sourceApplication:annotation:">application:openURL:sourceApplication:annotation:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKApplicationDelegate Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKApplicationDelegate Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKApplicationDelegate.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The FBSDKApplicationDelegate is designed to post process the results from Facebook Login
-or Facebook Dialogs (or any action that requires switching over to the native Facebook
-app or Safari).</p>
-
-<p>The methods in this class are designed to mirror those in UIApplicationDelegate, and you
-should call them in the respective methods in your AppDelegate implementation.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sharedInstance">+&nbsp;sharedInstance</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/application:openURL:sourceApplication:annotation:">&ndash;&nbsp;application:openURL:sourceApplication:annotation:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/application:openURL:options:">&ndash;&nbsp;application:openURL:options:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/application:didFinishLaunchingWithOptions:">&ndash;&nbsp;application:didFinishLaunchingWithOptions:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/sharedInstance" title="sharedInstance"></a>
-	<h3 class="subsubtitle method-title">sharedInstance</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets the singleton instance.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)sharedInstance</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKApplicationDelegate.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/application:didFinishLaunchingWithOptions:" title="application:didFinishLaunchingWithOptions:"></a>
-	<h3 class="subsubtitle method-title">application:didFinishLaunchingWithOptions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method from the [UIApplicationDelegate application:didFinishLaunchingWithOptions:] method
-of the AppDelegate for your app. It should be invoked for the proper use of the Facebook SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)application:(UIApplication *)<em>application</em> didFinishLaunchingWithOptions:(NSDictionary *)<em>launchOptions</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter application: The application as passed to [UIApplicationDelegate application:didFinishLaunchingWithOptions:].</p></li>
-<li><p>Parameter launchOptions: The launchOptions as passed to [UIApplicationDelegate application:didFinishLaunchingWithOptions:].</p></li>
-<li><p>Returns: YES if the url was intended for the Facebook SDK, NO if not.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKApplicationDelegate.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/application:openURL:options:" title="application:openURL:options:"></a>
-	<h3 class="subsubtitle method-title">application:openURL:options:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method from the [UIApplicationDelegate application:openURL:options:] method
-of the AppDelegate for your app. It should be invoked for the proper processing of responses during interaction
-with the native Facebook app or Safari as part of SSO authorization flow or Facebook dialogs.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)application:(UIApplication *)<em>application</em> openURL:(NSURL *)<em>url</em> options:(NSDictionary&lt;UIApplicationOpenURLOptionsKey,id&gt; *)<em>options</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter application: The application as passed to [UIApplicationDelegate application:openURL:options:].</p></li>
-<li><p>Parameter url: The URL as passed to [UIApplicationDelegate application:openURL:options:].</p></li>
-<li><p>Parameter options: The options dictionary as passed to [UIApplicationDelegate application:openURL:options:].</p></li>
-<li><p>Returns: YES if the url was intended for the Facebook SDK, NO if not.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKApplicationDelegate.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/application:openURL:sourceApplication:annotation:" title="application:openURL:sourceApplication:annotation:"></a>
-	<h3 class="subsubtitle method-title">application:openURL:sourceApplication:annotation:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Call this method from the [UIApplicationDelegate application:openURL:sourceApplication:annotation:] method
-of the AppDelegate for your app. It should be invoked for the proper processing of responses during interaction
-with the native Facebook app or Safari as part of SSO authorization flow or Facebook dialogs.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)application:(UIApplication *)<em>application</em> openURL:(NSURL *)<em>url</em> sourceApplication:(NSString *)<em>sourceApplication</em> annotation:(id)<em>annotation</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter application: The application as passed to [UIApplicationDelegate application:openURL:sourceApplication:annotation:].</p></li>
-<li><p>Parameter url: The URL as passed to [UIApplicationDelegate application:openURL:sourceApplication:annotation:].</p></li>
-<li><p>Parameter sourceApplication: The sourceApplication as passed to [UIApplicationDelegate application:openURL:sourceApplication:annotation:].</p></li>
-<li><p>Parameter annotation: The annotation as passed to [UIApplicationDelegate application:openURL:sourceApplication:annotation:].</p></li>
-<li><p>Returns: YES if the url was intended for the Facebook SDK, NO if not.</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKApplicationDelegate.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKButton.html
deleted file mode 100644
index 0eb08c1b56cf..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKButton.html	
+++ /dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIButton</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A base class for common SDK buttons.</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestContent.html
deleted file mode 100644
index bf7715e354ac..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestContent.html	
+++ /dev/null
@@ -1,835 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGameRequestContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGameRequestContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/actionType">&nbsp;&nbsp;&nbsp;&nbsp;actionType</option>
-	
-	<option value="//api/name/data">&nbsp;&nbsp;&nbsp;&nbsp;data</option>
-	
-	<option value="//api/name/filters">&nbsp;&nbsp;&nbsp;&nbsp;filters</option>
-	
-	<option value="//api/name/message">&nbsp;&nbsp;&nbsp;&nbsp;message</option>
-	
-	<option value="//api/name/objectID">&nbsp;&nbsp;&nbsp;&nbsp;objectID</option>
-	
-	<option value="//api/name/recipientSuggestions">&nbsp;&nbsp;&nbsp;&nbsp;recipientSuggestions</option>
-	
-	<option value="//api/name/recipients">&nbsp;&nbsp;&nbsp;&nbsp;recipients</option>
-	
-	<option value="//api/name/suggestions">&nbsp;&nbsp;&nbsp;&nbsp;suggestions</option>
-	
-	<option value="//api/name/title">&nbsp;&nbsp;&nbsp;&nbsp;title</option>
-	
-	<option value="//api/name/to">&nbsp;&nbsp;&nbsp;&nbsp;to</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToGameRequestContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToGameRequestContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/actionType">actionType</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/data">data</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/filters">filters</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/message">message</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectID">objectID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/recipientSuggestions">recipientSuggestions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/recipients">recipients</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/suggestions">suggestions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/title">title</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/to">to</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToGameRequestContent:">isEqualToGameRequestContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGameRequestContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGameRequestContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGameRequestContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for a game request.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/actionType">&nbsp;&nbsp;actionType</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToGameRequestContent:">&ndash;&nbsp;isEqualToGameRequestContent:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/data">&nbsp;&nbsp;data</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/filters">&nbsp;&nbsp;filters</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/message">&nbsp;&nbsp;message</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectID">&nbsp;&nbsp;objectID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/recipients">&nbsp;&nbsp;recipients</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/recipientSuggestions">&nbsp;&nbsp;recipientSuggestions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/suggestions">&nbsp;&nbsp;suggestions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/title">&nbsp;&nbsp;title</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/to">&nbsp;&nbsp;to</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/actionType" title="actionType"></a>
-	<h3 class="subsubtitle method-title">actionType</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Used when defining additional context about the nature of the request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKGameRequestActionType actionType</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>The parameter &lsquo;objectID&rsquo; is required if the action type is either
-&lsquo;FBSDKGameRequestSendActionType&rsquo; or &lsquo;FBSDKGameRequestAskForActionType&rsquo;.</p>
-
-<ul>
-<li>SeeAlso:objectID</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/data" title="data"></a>
-	<h3 class="subsubtitle method-title">data</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Additional freeform data you may pass for tracking. This will be stored as part of
-the request objects created. The maximum length is 255 characters.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *data</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/filters" title="filters"></a>
-	<h3 class="subsubtitle method-title">filters</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  This controls the set of friends someone sees if a multi-friend selector is shown.
-It is FBSDKGameRequestNoFilter by default, meaning that all friends can be shown.
-If specify as FBSDKGameRequestAppUsersFilter, only friends who use the app will be shown.
-On the other hands, use FBSDKGameRequestAppNonUsersFilter to filter only friends who do not use the app.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKGameRequestFilter filters</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>The parameter name is preserved to be consistent with the counter part on desktop.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/message" title="message"></a>
-	<h3 class="subsubtitle method-title">message</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A plain-text message to be sent as part of the request. This text will surface in the App Center view
-of the request, but not on the notification jewel. Required parameter.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *message</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/objectID" title="objectID"></a>
-	<h3 class="subsubtitle method-title">objectID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The Open Graph object ID of the object being sent.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *objectID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>SeeAlso:actionType</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/recipientSuggestions" title="recipientSuggestions"></a>
-	<h3 class="subsubtitle method-title">recipientSuggestions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  An array of user IDs that will be included in the dialog as the first suggested friends.
-Cannot be used together with filters.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *recipientSuggestions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is equivalent to the &ldquo;suggestions&rdquo; parameter when using the web game request dialog.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/recipients" title="recipients"></a>
-	<h3 class="subsubtitle method-title">recipients</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  An array of user IDs, usernames or invite tokens (NSString) of people to send request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *recipients</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>These may or may not be a friend of the sender. If this is specified by the app,
-the sender will not have a choice of recipients. If not, the sender will see a multi-friend selector</p>
-
-<p>This is equivalent to the &ldquo;to&rdquo; parameter when using the web game request dialog.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/suggestions" title="suggestions"></a>
-	<h3 class="subsubtitle method-title">suggestions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:Use <code>recipientSuggestions</code> instead.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *suggestions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/title" title="title"></a>
-	<h3 class="subsubtitle method-title">title</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The title for the dialog.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *title</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/to" title="to"></a>
-	<h3 class="subsubtitle method-title">to</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:Use <code>recipients</code> instead.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *to</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToGameRequestContent:" title="isEqualToGameRequestContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToGameRequestContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another game request content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToGameRequestContent:(FBSDKGameRequestContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestDialog.html
deleted file mode 100644
index bac2485d4efd..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGameRequestDialog.html	
+++ /dev/null
@@ -1,628 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGameRequestDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGameRequestDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/content">&nbsp;&nbsp;&nbsp;&nbsp;content</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/frictionlessRequestsEnabled">&nbsp;&nbsp;&nbsp;&nbsp;frictionlessRequestsEnabled</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showWithContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showWithContent:delegate:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShow">&nbsp;&nbsp;&nbsp;&nbsp;- canShow</option>
-	
-	<option value="//api/name/show">&nbsp;&nbsp;&nbsp;&nbsp;- show</option>
-	
-	<option value="//api/name/validateWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- validateWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/content">content</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/frictionlessRequestsEnabled">frictionlessRequestsEnabled</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showWithContent:delegate:">showWithContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShow">canShow</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/show">show</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/validateWithError:">validateWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGameRequestDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGameRequestDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGameRequestDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A dialog for sending game requests.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showWithContent:delegate:">+&nbsp;showWithContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/content">&nbsp;&nbsp;content</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/frictionlessRequestsEnabled">&nbsp;&nbsp;frictionlessRequestsEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShow">&ndash;&nbsp;canShow</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/show">&ndash;&nbsp;show</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/validateWithError:">&ndash;&nbsp;validateWithError:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/content" title="content"></a>
-	<h3 class="subsubtitle method-title">content</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The content for game request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKGameRequestContent *content</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The receiver&rsquo;s delegate or nil if it doesn&rsquo;t have a delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKGameRequestDialogDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/frictionlessRequestsEnabled" title="frictionlessRequestsEnabled"></a>
-	<h3 class="subsubtitle method-title">frictionlessRequestsEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Specifies whether frictionless requests are enabled.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) BOOL frictionlessRequestsEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showWithContent:delegate:" title="showWithContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showWithContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build up a game request with content and a delegate.
-- Parameter content: The content for the game request.
-- Parameter delegate: The receiver&rsquo;s delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showWithContent:(FBSDKGameRequestContent *)<em>content</em> delegate:(id&lt;FBSDKGameRequestDialogDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShow" title="canShow"></a>
-	<h3 class="subsubtitle method-title">canShow</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A Boolean value that indicates whether the receiver can initiate a game request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShow</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>May return NO if the appropriate Facebook app is not installed and is required or an access token is
-required but not available.  This method does not validate the content on the receiver, so this can be checked before
-building up the content.</p>
-
-<ul>
-<li>See:validateWithError:</li>
-<li>Returns: YES if the receiver can share, otherwise NO.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/show" title="show"></a>
-	<h3 class="subsubtitle method-title">show</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Begins the game request from the receiver.
-- Returns: YES if the receiver was able to show the dialog, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)show</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/validateWithError:" title="validateWithError:"></a>
-	<h3 class="subsubtitle method-title">validateWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Validates the content on the receiver.
-- Parameter errorRef: If an error occurs, upon return contains an NSError object that describes the problem.
-- Returns: YES if the content is valid, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)validateWithError:(NSError *__autoreleasing *)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphErrorRecoveryProcessor.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphErrorRecoveryProcessor.html
deleted file mode 100644
index 469b716fdd33..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphErrorRecoveryProcessor.html	
+++ /dev/null
@@ -1,442 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphErrorRecoveryProcessor Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphErrorRecoveryProcessor Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/didPresentErrorWithRecovery:contextInfo:">&nbsp;&nbsp;&nbsp;&nbsp;- didPresentErrorWithRecovery:contextInfo:</option>
-	
-	<option value="//api/name/processError:request:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;- processError:request:delegate:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/didPresentErrorWithRecovery:contextInfo:">didPresentErrorWithRecovery:contextInfo:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/processError:request:delegate:">processError:request:delegate:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphErrorRecoveryProcessor Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphErrorRecoveryProcessor Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphErrorRecoveryProcessor.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Defines a type that can process Facebook NSErrors with best practices.</p>
-
-<p>Facebook NSErrors can contain FBSDKErrorRecoveryAttempting instances to recover from errors, or
-localized messages to present to the user. This class will process the instances as follows:</p>
-
-<ol>
-<li>If the error is temporary as indicated by FBSDKGraphRequestErrorCategoryKey, assume the recovery succeeded and
-notify the delegate.</li>
-<li>If a FBSDKErrorRecoveryAttempting instance is available, display an alert (dispatched to main thread)
-with the recovery options and call the instance&rsquo;s [ attemptRecoveryFromError:optionIndex:&hellip;].</li>
-<li>If a FBSDKErrorRecoveryAttempting is not available, check the userInfo for FBSDKLocalizedErrorDescriptionKey
-and present that in an alert (dispatched to main thread).</li>
-</ol>
-
-
-<p>By default, FBSDKGraphRequests use this type to process errors and retry the request upon a successful
-recovery.</p>
-
-<p>Note that Facebook recovery attempters can present UI or even cause app switches (such as to login). Any such
-work is dispatched to the main thread (therefore your request handlers may then run on the main thread).</p>
-
-<p>Login recovery requires FBSDKLoginKit. Login will use FBSDKLoginBehaviorNative and will prompt the user
-for all permissions last granted. If any are declined on the new request, the recovery is not successful but
-the <code>[FBSDKAccessToken currentAccessToken]</code> might still have been updated.
-.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/processError:request:delegate:">&ndash;&nbsp;processError:request:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/didPresentErrorWithRecovery:contextInfo:">&ndash;&nbsp;didPresentErrorWithRecovery:contextInfo:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets the delegate. Note this is a strong reference, and is nil'ed out after recovery is complete.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly) id&lt;FBSDKGraphErrorRecoveryProcessorDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphErrorRecoveryProcessor.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/didPresentErrorWithRecovery:contextInfo:" title="didPresentErrorWithRecovery:contextInfo:"></a>
-	<h3 class="subsubtitle method-title">didPresentErrorWithRecovery:contextInfo:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The callback for FBSDKErrorRecoveryAttempting
-- Parameter didRecover: if the recovery succeeded
-- Parameter contextInfo: unused</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)didPresentErrorWithRecovery:(BOOL)<em>didRecover</em> contextInfo:(void *)<em>contextInfo</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphErrorRecoveryProcessor.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/processError:request:delegate:" title="processError:request:delegate:"></a>
-	<h3 class="subsubtitle method-title">processError:request:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Attempts to process the error, return YES if the error can be processed.
-- Parameter error: the error to process.
-- Parameter request: the related request that may be reissued.
-- Parameter delegate: the delegate that will be retained until recovery is complete.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)processError:(NSError *)<em>error</em> request:(FBSDKGraphRequest *)<em>request</em> delegate:(id&lt;FBSDKGraphErrorRecoveryProcessorDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphErrorRecoveryProcessor.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequest.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequest.html
deleted file mode 100644
index 5309e88f3a47..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequest.html	
+++ /dev/null
@@ -1,775 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequest Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequest Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/HTTPMethod">&nbsp;&nbsp;&nbsp;&nbsp;HTTPMethod</option>
-	
-	<option value="//api/name/graphPath">&nbsp;&nbsp;&nbsp;&nbsp;graphPath</option>
-	
-	<option value="//api/name/parameters">&nbsp;&nbsp;&nbsp;&nbsp;parameters</option>
-	
-	<option value="//api/name/tokenString">&nbsp;&nbsp;&nbsp;&nbsp;tokenString</option>
-	
-	<option value="//api/name/version">&nbsp;&nbsp;&nbsp;&nbsp;version</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithGraphPath:parameters:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithGraphPath:parameters:</option>
-	
-	<option value="//api/name/initWithGraphPath:parameters:HTTPMethod:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithGraphPath:parameters:HTTPMethod:</option>
-	
-	<option value="//api/name/initWithGraphPath:parameters:tokenString:version:HTTPMethod:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithGraphPath:parameters:tokenString:version:HTTPMethod:</option>
-	
-	<option value="//api/name/setGraphErrorRecoveryDisabled:">&nbsp;&nbsp;&nbsp;&nbsp;- setGraphErrorRecoveryDisabled:</option>
-	
-	<option value="//api/name/startWithCompletionHandler:">&nbsp;&nbsp;&nbsp;&nbsp;- startWithCompletionHandler:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/HTTPMethod">HTTPMethod</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/graphPath">graphPath</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/parameters">parameters</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tokenString">tokenString</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/version">version</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithGraphPath:parameters:">initWithGraphPath:parameters:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithGraphPath:parameters:HTTPMethod:">initWithGraphPath:parameters:HTTPMethod:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithGraphPath:parameters:tokenString:version:HTTPMethod:">initWithGraphPath:parameters:tokenString:version:HTTPMethod:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setGraphErrorRecoveryDisabled:">setGraphErrorRecoveryDisabled:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/startWithCompletionHandler:">startWithCompletionHandler:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequest Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequest Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphRequest.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Represents a request to the Facebook Graph API.</p>
-
-<p><code>FBSDKGraphRequest</code> encapsulates the components of a request (the
-Graph API path, the parameters, error recovery behavior) and should be
-used in conjunction with <code>FBSDKGraphRequestConnection</code> to issue the request.</p>
-
-<p>Nearly all Graph APIs require an access token. Unless specified, the
-<code>[FBSDKAccessToken currentAccessToken]</code> is used. Therefore, most requests
-will require login first (see <code>FBSDKLoginManager</code> in FBSDKLoginKit.framework).</p>
-
-<p>A <code>- start</code> method is provided for convenience for single requests.</p>
-
-<p>By default, FBSDKGraphRequest will attempt to recover any errors returned from
-Facebook. You can disable this via <code>disableErrorRecovery:</code>.</p>
-
-<ul>
-<li>See:FBSDKGraphErrorRecoveryProcessor</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithGraphPath:parameters:">&ndash;&nbsp;initWithGraphPath:parameters:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithGraphPath:parameters:HTTPMethod:">&ndash;&nbsp;initWithGraphPath:parameters:HTTPMethod:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithGraphPath:parameters:tokenString:version:HTTPMethod:">&ndash;&nbsp;initWithGraphPath:parameters:tokenString:version:HTTPMethod:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/parameters">&nbsp;&nbsp;parameters</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tokenString">&nbsp;&nbsp;tokenString</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/graphPath">&nbsp;&nbsp;graphPath</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/HTTPMethod">&nbsp;&nbsp;HTTPMethod</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/version">&nbsp;&nbsp;version</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setGraphErrorRecoveryDisabled:">&ndash;&nbsp;setGraphErrorRecoveryDisabled:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/startWithCompletionHandler:">&ndash;&nbsp;startWithCompletionHandler:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/HTTPMethod" title="HTTPMethod"></a>
-	<h3 class="subsubtitle method-title">HTTPMethod</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The HTTPMethod to use for the request, for example &ldquo;GET&rdquo; or &ldquo;POST&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *HTTPMethod</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/graphPath" title="graphPath"></a>
-	<h3 class="subsubtitle method-title">graphPath</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The Graph API endpoint to use for the request, for example &ldquo;me&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *graphPath</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/parameters" title="parameters"></a>
-	<h3 class="subsubtitle method-title">parameters</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The request parameters.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly) NSMutableDictionary *parameters</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tokenString" title="tokenString"></a>
-	<h3 class="subsubtitle method-title">tokenString</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The access token string used by the request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *tokenString</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/version" title="version"></a>
-	<h3 class="subsubtitle method-title">version</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The Graph API version to use (e.g., &ldquo;v2.0&rdquo;)</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *version</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithGraphPath:parameters:" title="initWithGraphPath:parameters:"></a>
-	<h3 class="subsubtitle method-title">initWithGraphPath:parameters:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes a new instance that use use <code>[FBSDKAccessToken currentAccessToken]</code>.
-- Parameter graphPath: the graph path (e.g., @&ldquo;me&rdquo;).
-- Parameter parameters: the optional parameters dictionary.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithGraphPath:(NSString *)<em>graphPath</em> parameters:(NSDictionary *)<em>parameters</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithGraphPath:parameters:HTTPMethod:" title="initWithGraphPath:parameters:HTTPMethod:"></a>
-	<h3 class="subsubtitle method-title">initWithGraphPath:parameters:HTTPMethod:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes a new instance that use use <code>[FBSDKAccessToken currentAccessToken]</code>.
-- Parameter graphPath: the graph path (e.g., @&ldquo;me&rdquo;).
-- Parameter parameters: the optional parameters dictionary.
-- Parameter HTTPMethod: the optional HTTP method. nil defaults to @&ldquo;GET&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithGraphPath:(NSString *)<em>graphPath</em> parameters:(NSDictionary *)<em>parameters</em> HTTPMethod:(NSString *)<em>HTTPMethod</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithGraphPath:parameters:tokenString:version:HTTPMethod:" title="initWithGraphPath:parameters:tokenString:version:HTTPMethod:"></a>
-	<h3 class="subsubtitle method-title">initWithGraphPath:parameters:tokenString:version:HTTPMethod:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes a new instance.
-- Parameter graphPath: the graph path (e.g., @&ldquo;me&rdquo;).
-- Parameter parameters: the optional parameters dictionary.
-- Parameter tokenString: the token string to use. Specifying nil will cause no token to be used.
-- Parameter version: the optional Graph API version (e.g., @&ldquo;v2.0&rdquo;). nil defaults to <code>[FBSDKSettings graphAPIVersion]</code>.
-- Parameter HTTPMethod: the optional HTTP method (e.g., @&ldquo;POST&rdquo;). nil defaults to @&ldquo;GET&rdquo;.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithGraphPath:(NSString *)<em>graphPath</em> parameters:(NSDictionary *)<em>parameters</em> tokenString:(NSString *)<em>tokenString</em> version:(NSString *)<em>version</em> HTTPMethod:(NSString *)<em>HTTPMethod</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setGraphErrorRecoveryDisabled:" title="setGraphErrorRecoveryDisabled:"></a>
-	<h3 class="subsubtitle method-title">setGraphErrorRecoveryDisabled:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  If set, disables the automatic error recovery mechanism.
-- Parameter disable: whether to disable the automatic error recovery mechanism</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setGraphErrorRecoveryDisabled:(BOOL)<em>disable</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>By default, non-batched FBSDKGraphRequest instances will automatically try to recover
-from errors by constructing a <code>FBSDKGraphErrorRecoveryProcessor</code> instance that
-re-issues the request on successful recoveries. The re-issued request will call the same
-handler as the receiver but may occur with a different <code>FBSDKGraphRequestConnection</code> instance.</p>
-
-<p>This will override [FBSDKSettings setGraphErrorRecoveryDisabled:].</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/startWithCompletionHandler:" title="startWithCompletionHandler:"></a>
-	<h3 class="subsubtitle method-title">startWithCompletionHandler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Starts a connection to the Graph API.
-- Parameter handler: The handler block to call when the request completes.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (FBSDKGraphRequestConnection *)startWithCompletionHandler:(FBSDKGraphRequestHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequest.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestConnection.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestConnection.html
deleted file mode 100644
index e1c724e8e23b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestConnection.html	
+++ /dev/null
@@ -1,945 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequestConnection Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequestConnection Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/URLResponse">&nbsp;&nbsp;&nbsp;&nbsp;URLResponse</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/timeout">&nbsp;&nbsp;&nbsp;&nbsp;timeout</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/setDefaultConnectionTimeout:">&nbsp;&nbsp;&nbsp;&nbsp;+ setDefaultConnectionTimeout:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/addRequest:completionHandler:">&nbsp;&nbsp;&nbsp;&nbsp;- addRequest:completionHandler:</option>
-	
-	<option value="//api/name/addRequest:completionHandler:batchEntryName:">&nbsp;&nbsp;&nbsp;&nbsp;- addRequest:completionHandler:batchEntryName:</option>
-	
-	<option value="//api/name/addRequest:completionHandler:batchParameters:">&nbsp;&nbsp;&nbsp;&nbsp;- addRequest:completionHandler:batchParameters:</option>
-	
-	<option value="//api/name/cancel">&nbsp;&nbsp;&nbsp;&nbsp;- cancel</option>
-	
-	<option value="//api/name/overrideVersionPartWith:">&nbsp;&nbsp;&nbsp;&nbsp;- overrideVersionPartWith:</option>
-	
-	<option value="//api/name/setDelegateQueue:">&nbsp;&nbsp;&nbsp;&nbsp;- setDelegateQueue:</option>
-	
-	<option value="//api/name/start">&nbsp;&nbsp;&nbsp;&nbsp;- start</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#task_Class methods">Class methods</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#task_Adding requests">Adding requests</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#task_Instance methods">Instance methods</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/URLResponse">URLResponse</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/timeout">timeout</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setDefaultConnectionTimeout:">setDefaultConnectionTimeout:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addRequest:completionHandler:">addRequest:completionHandler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addRequest:completionHandler:batchEntryName:">addRequest:completionHandler:batchEntryName:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addRequest:completionHandler:batchParameters:">addRequest:completionHandler:batchParameters:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/cancel">cancel</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/overrideVersionPartWith:">overrideVersionPartWith:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setDelegateQueue:">setDelegateQueue:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/start">start</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequestConnection Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequestConnection Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphRequestConnection.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The <code>FBSDKGraphRequestConnection</code> represents a single connection to Facebook to service a request.</p>
-
-<p>The request settings are encapsulated in a reusable <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> object. The
-<code>FBSDKGraphRequestConnection</code> object encapsulates the concerns of a single communication
-e.g. starting a connection, canceling a connection, or batching requests.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						<h3 class="subsubtitle task-title">Other Methods</h3>
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/timeout">&nbsp;&nbsp;timeout</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/URLResponse">&nbsp;&nbsp;URLResponse</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-						
-						<a title="Class methods" name="task_Class methods"></a>
-						<h3 class="subsubtitle task-title">Class methods</h3>
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setDefaultConnectionTimeout:">+&nbsp;setDefaultConnectionTimeout:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-						
-						<a title="Adding requests" name="task_Adding requests"></a>
-						<h3 class="subsubtitle task-title">Adding requests</h3>
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addRequest:completionHandler:">&ndash;&nbsp;addRequest:completionHandler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addRequest:completionHandler:batchEntryName:">&ndash;&nbsp;addRequest:completionHandler:batchEntryName:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addRequest:completionHandler:batchParameters:">&ndash;&nbsp;addRequest:completionHandler:batchParameters:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-						
-						<a title="Instance methods" name="task_Instance methods"></a>
-						<h3 class="subsubtitle task-title">Instance methods</h3>
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/cancel">&ndash;&nbsp;cancel</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/start">&ndash;&nbsp;start</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setDelegateQueue:">&ndash;&nbsp;setDelegateQueue:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/overrideVersionPartWith:">&ndash;&nbsp;overrideVersionPartWith:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/URLResponse" title="URLResponse"></a>
-	<h3 class="subsubtitle method-title">URLResponse</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The raw response that was returned from the server.  (readonly)</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, retain, readonly) NSHTTPURLResponse *URLResponse</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This property can be used to inspect HTTP headers that were returned from
-the server.</p>
-
-<p>The property is nil until the request completes.  If there was a response
-then this property will be non-nil during the FBSDKGraphRequestHandler callback.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The delegate object that receives updates.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKGraphRequestConnectionDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/timeout" title="timeout"></a>
-	<h3 class="subsubtitle method-title">timeout</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the timeout interval to wait for a response before giving up.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic) NSTimeInterval timeout</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/setDefaultConnectionTimeout:" title="setDefaultConnectionTimeout:"></a>
-	<h3 class="subsubtitle method-title">setDefaultConnectionTimeout:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setDefaultConnectionTimeout:(NSTimeInterval)<em>defaultConnectionTimeout</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This method sets the default timeout on all FBSDKGraphRequestConnection instances. Defaults to 60 seconds.</p>
-
-<ul>
-<li>Parameter defaultConnectionTimeout:     The timeout interval.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/addRequest:completionHandler:" title="addRequest:completionHandler:"></a>
-	<h3 class="subsubtitle method-title">addRequest:completionHandler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)addRequest:(FBSDKGraphRequest *)<em>request</em> completionHandler:(FBSDKGraphRequestHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This method adds an <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> object to this connection.</p>
-
-<ul>
-<li>Parameter request:       A request to be included in the round-trip when start is called.</li>
-<li>Parameter handler:       A handler to call back when the round-trip completes or times out.</li>
-</ul>
-
-
-<p>The completion handler is retained until the block is called upon the
-completion or cancellation of the connection.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/addRequest:completionHandler:batchEntryName:" title="addRequest:completionHandler:batchEntryName:"></a>
-	<h3 class="subsubtitle method-title">addRequest:completionHandler:batchEntryName:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)addRequest:(FBSDKGraphRequest *)<em>request</em> completionHandler:(FBSDKGraphRequestHandler)<em>handler</em> batchEntryName:(NSString *)<em>name</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This method adds an <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> object to this connection.</p>
-
-<ul>
-<li><p>Parameter request:         A request to be included in the round-trip when start is called.</p></li>
-<li><p>Parameter handler:         A handler to call back when the round-trip completes or times out.
-The handler will be invoked on the main thread.</p></li>
-<li><p>Parameter name:            An optional name for this request.  This can be used to feed
-the results of one request to the input of another <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> in the same
-<code>FBSDKGraphRequestConnection</code> as described in
-<a href="https://developers.facebook.com/docs/reference/api/batch/">Graph API Batch Requests</a>.</p></li>
-</ul>
-
-
-<p>The completion handler is retained until the block is called upon the
-completion or cancellation of the connection. This request can be named
-to allow for using the request&rsquo;s response in a subsequent request.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/addRequest:completionHandler:batchParameters:" title="addRequest:completionHandler:batchParameters:"></a>
-	<h3 class="subsubtitle method-title">addRequest:completionHandler:batchParameters:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)addRequest:(FBSDKGraphRequest *)<em>request</em> completionHandler:(FBSDKGraphRequestHandler)<em>handler</em> batchParameters:(NSDictionary *)<em>batchParameters</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This method adds an <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> object to this connection.</p>
-
-<ul>
-<li><p>Parameter request:         A request to be included in the round-trip when start is called.</p></li>
-<li><p>Parameter handler:         A handler to call back when the round-trip completes or times out.</p></li>
-<li><p>Parameter batchParameters: The optional dictionary of parameters to include for this request
-as described in <a href="https://developers.facebook.com/docs/reference/api/batch/">Graph API Batch Requests</a>.
-Examples include &ldquo;depends_on&rdquo;, &ldquo;name&rdquo;, or &ldquo;omit_response_on_success&rdquo;.</p></li>
-</ul>
-
-
-<p>The completion handler is retained until the block is called upon the
-completion or cancellation of the connection. This request can be named
-to allow for using the request&rsquo;s response in a subsequent request.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/cancel" title="cancel"></a>
-	<h3 class="subsubtitle method-title">cancel</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)cancel</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Signals that a connection should be logically terminated as the
-application is no longer interested in a response.</p>
-
-<p>Synchronously calls any handlers indicating the request was cancelled. Cancel
-does not guarantee that the request-related processing will cease. It
-does promise that  all handlers will complete before the cancel returns. A call to
-cancel prior to a start implies a cancellation of all requests associated
-with the connection.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/overrideVersionPartWith:" title="overrideVersionPartWith:"></a>
-	<h3 class="subsubtitle method-title">overrideVersionPartWith:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)overrideVersionPartWith:(NSString *)<em>version</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Overrides the default version for a batch request</p>
-
-<p>The SDK automatically prepends a version part, such as &ldquo;v2.0&rdquo; to API paths in order to simplify API versioning
-for applications. If you want to override the version part while using batch requests on the connection, call
-this method to set the version for the batch request.</p>
-
-<ul>
-<li>Parameter version:   This is a string in the form @&ldquo;v2.0&rdquo; which will be used for the version part of an API path</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setDelegateQueue:" title="setDelegateQueue:"></a>
-	<h3 class="subsubtitle method-title">setDelegateQueue:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Determines the operation queue that is used to call methods on the connection&rsquo;s delegate.
-- Parameter queue: The operation queue to use when calling delegate methods.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setDelegateQueue:(NSOperationQueue *)<em>queue</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>By default, a connection is scheduled on the current thread in the default mode when it is created.
-You cannot reschedule a connection after it has started.</p>
-
-<p>This is very similar to <code>[NSURLConnection setDelegateQueue:]</code>.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/start" title="start"></a>
-	<h3 class="subsubtitle method-title">start</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)start</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This method starts a connection with the server and is capable of handling all of the
-requests that were added to the connection.</p>
-
-<p>By default, a connection is scheduled on the current thread in the default mode when it is created.
-See <code>setDelegateQueue:</code> for other options.</p>
-
-<p>This method cannot be called twice for an <code>FBSDKGraphRequestConnection</code> instance.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestDataAttachment.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestDataAttachment.html
deleted file mode 100644
index 0c12a92267d7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKGraphRequestDataAttachment.html	
+++ /dev/null
@@ -1,462 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequestDataAttachment Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequestDataAttachment Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/contentType">&nbsp;&nbsp;&nbsp;&nbsp;contentType</option>
-	
-	<option value="//api/name/data">&nbsp;&nbsp;&nbsp;&nbsp;data</option>
-	
-	<option value="//api/name/filename">&nbsp;&nbsp;&nbsp;&nbsp;filename</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithData:filename:contentType:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithData:filename:contentType:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/contentType">contentType</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/data">data</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/filename">filename</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithData:filename:contentType:">initWithData:filename:contentType:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequestDataAttachment Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequestDataAttachment Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphRequestDataAttachment.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A container class for data attachments so that additional metadata can be provided about the attachment.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithData:filename:contentType:">&ndash;&nbsp;initWithData:filename:contentType:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/contentType">&nbsp;&nbsp;contentType</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/data">&nbsp;&nbsp;data</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/filename">&nbsp;&nbsp;filename</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/contentType" title="contentType"></a>
-	<h3 class="subsubtitle method-title">contentType</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The content type for the attachment.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *contentType</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestDataAttachment.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/data" title="data"></a>
-	<h3 class="subsubtitle method-title">data</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The attachment data.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly) NSData *data</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestDataAttachment.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/filename" title="filename"></a>
-	<h3 class="subsubtitle method-title">filename</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The filename for the attachment.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *filename</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestDataAttachment.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithData:filename:contentType:" title="initWithData:filename:contentType:"></a>
-	<h3 class="subsubtitle method-title">initWithData:filename:contentType:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes the receiver with the attachment data and metadata.
-- Parameter data: The attachment data (retained, not copied)
-- Parameter filename: The filename for the attachment
-- Parameter contentType: The content type for the attachment</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithData:(NSData *)<em>data</em> filename:(NSString *)<em>filename</em> contentType:(NSString *)<em>contentType</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestDataAttachment.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKHashtag.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKHashtag.html
deleted file mode 100644
index aee6c834795a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKHashtag.html	
+++ /dev/null
@@ -1,494 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKHashtag Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKHashtag Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/stringRepresentation">&nbsp;&nbsp;&nbsp;&nbsp;stringRepresentation</option>
-	
-	<option value="//api/name/valid">&nbsp;&nbsp;&nbsp;&nbsp;valid</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/hashtagWithString:">&nbsp;&nbsp;&nbsp;&nbsp;+ hashtagWithString:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToHashtag:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToHashtag:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/stringRepresentation">stringRepresentation</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/valid">valid</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/hashtagWithString:">hashtagWithString:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToHashtag:">isEqualToHashtag:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKHashtag Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKHashtag Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKHashtag.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Represents a single hashtag that can be used with the share dialog.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/hashtagWithString:">+&nbsp;hashtagWithString:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/stringRepresentation">&nbsp;&nbsp;stringRepresentation</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/valid">&nbsp;&nbsp;valid</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToHashtag:">&ndash;&nbsp;isEqualToHashtag:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/stringRepresentation" title="stringRepresentation"></a>
-	<h3 class="subsubtitle method-title">stringRepresentation</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The hashtag string.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readwrite, copy) NSString *stringRepresentation</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>You are responsible for making sure that <code>stringRepresentation</code> is a valid hashtag (a single &lsquo;#&rsquo; followed
-   by one or more word characters). Invalid hashtags are ignored when sharing content. You can check validity with the
-   <code>valid</code> property.
-- Returns: The hashtag string.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKHashtag.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/valid" title="valid"></a>
-	<h3 class="subsubtitle method-title">valid</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Tests if a hashtag is valid.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly, assign, getter=isValid) BOOL valid</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>A valid hashtag matches the regular expression &ldquo;#\w+&rdquo;: A single &lsquo;#&rsquo; followed by one or more
-   word characters.
-- Returns: YES if the hashtag is valid, NO otherwise.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKHashtag.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/hashtagWithString:" title="hashtagWithString:"></a>
-	<h3 class="subsubtitle method-title">hashtagWithString:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new hashtag with a string identifier. Equivalent to setting the
-   <code>stringRepresentation</code> property.
-- Parameter hashtagString: The hashtag string.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)hashtagWithString:(NSString *)<em>hashtagString</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKHashtag.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToHashtag:" title="isEqualToHashtag:"></a>
-	<h3 class="subsubtitle method-title">isEqualToHashtag:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another hashtag.
-- Parameter hashtag: The other hashtag
-- Returns: YES if the receiver is equal to the other hashtag; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToHashtag:(FBSDKHashtag *)<em>hashtag</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKHashtag.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeButton.html
deleted file mode 100644
index fa3e8d92645f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeButton.html	
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/soundEnabled">&nbsp;&nbsp;&nbsp;&nbsp;soundEnabled</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/soundEnabled">soundEnabled</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKButton.html">FBSDKButton</a> : UIButton</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKLiking.html">FBSDKLiking</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A button to like an object.</p>
-
-<p>Tapping the receiver will invoke an API call to the Facebook app through a fast-app-switch that allows
-the object to be liked.  Upon return to the calling app, the view will update with the new state.  If the
-currentAccessToken has &ldquo;publish_actions&rdquo; permission and the object is an Open Graph object, then the like can happen
-seamlessly without the fast-app-switch.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/soundEnabled">&nbsp;&nbsp;soundEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/soundEnabled" title="soundEnabled"></a>
-	<h3 class="subsubtitle method-title">soundEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  If YES, a sound is played when the receiver is toggled.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isSoundEnabled) BOOL soundEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@default YES</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeControl.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeControl.html
deleted file mode 100644
index ab5010f96cb6..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLikeControl.html	
+++ /dev/null
@@ -1,579 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeControl Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeControl Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/foregroundColor">&nbsp;&nbsp;&nbsp;&nbsp;foregroundColor</option>
-	
-	<option value="//api/name/likeControlAuxiliaryPosition">&nbsp;&nbsp;&nbsp;&nbsp;likeControlAuxiliaryPosition</option>
-	
-	<option value="//api/name/likeControlHorizontalAlignment">&nbsp;&nbsp;&nbsp;&nbsp;likeControlHorizontalAlignment</option>
-	
-	<option value="//api/name/likeControlStyle">&nbsp;&nbsp;&nbsp;&nbsp;likeControlStyle</option>
-	
-	<option value="//api/name/preferredMaxLayoutWidth">&nbsp;&nbsp;&nbsp;&nbsp;preferredMaxLayoutWidth</option>
-	
-	<option value="//api/name/soundEnabled">&nbsp;&nbsp;&nbsp;&nbsp;soundEnabled</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/foregroundColor">foregroundColor</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/likeControlAuxiliaryPosition">likeControlAuxiliaryPosition</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/likeControlHorizontalAlignment">likeControlHorizontalAlignment</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/likeControlStyle">likeControlStyle</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/preferredMaxLayoutWidth">preferredMaxLayoutWidth</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/soundEnabled">soundEnabled</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeControl Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeControl Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIControl</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKLiking.html">FBSDKLiking</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeControl.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  UI control to like an object in the Facebook graph.</p>
-
-<p>Taps on the like button within this control will invoke an API call to the Facebook app through a
-fast-app-switch that allows the user to like the object.  Upon return to the calling app, the view will update
-with the new state and send actions for the UIControlEventValueChanged event.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/foregroundColor">&nbsp;&nbsp;foregroundColor</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/likeControlAuxiliaryPosition">&nbsp;&nbsp;likeControlAuxiliaryPosition</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/likeControlHorizontalAlignment">&nbsp;&nbsp;likeControlHorizontalAlignment</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/likeControlStyle">&nbsp;&nbsp;likeControlStyle</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/preferredMaxLayoutWidth">&nbsp;&nbsp;preferredMaxLayoutWidth</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/soundEnabled">&nbsp;&nbsp;soundEnabled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/foregroundColor" title="foregroundColor"></a>
-	<h3 class="subsubtitle method-title">foregroundColor</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The foreground color to use for the content of the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) UIColor *foregroundColor</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/likeControlAuxiliaryPosition" title="likeControlAuxiliaryPosition"></a>
-	<h3 class="subsubtitle method-title">likeControlAuxiliaryPosition</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The position for the auxiliary view for the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKLikeControlAuxiliaryPosition likeControlAuxiliaryPosition</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>See:FBSDKLikeControlAuxiliaryPosition</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/likeControlHorizontalAlignment" title="likeControlHorizontalAlignment"></a>
-	<h3 class="subsubtitle method-title">likeControlHorizontalAlignment</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The text alignment of the social sentence.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKLikeControlHorizontalAlignment likeControlHorizontalAlignment</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This value is only valid for FBSDKLikeControlStyleStandard with
-FBSDKLikeControlAuxiliaryPositionTop|Bottom.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/likeControlStyle" title="likeControlStyle"></a>
-	<h3 class="subsubtitle method-title">likeControlStyle</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The style to use for the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKLikeControlStyle likeControlStyle</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>See:FBSDKLikeControlStyle</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/preferredMaxLayoutWidth" title="preferredMaxLayoutWidth"></a>
-	<h3 class="subsubtitle method-title">preferredMaxLayoutWidth</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The preferred maximum width (in points) for autolayout.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) CGFloat preferredMaxLayoutWidth</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This property affects the size of the receiver when layout constraints are applied to it. During layout,
-if the text extends beyond the width specified by this property, the additional text is flowed to one or more new
-lines, thereby increasing the height of the receiver.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/soundEnabled" title="soundEnabled"></a>
-	<h3 class="subsubtitle method-title">soundEnabled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  If YES, a sound is played when the receiver is toggled.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isSoundEnabled) BOOL soundEnabled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>@default YES</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginButton.html
deleted file mode 100644
index 367a7842e071..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginButton.html	
+++ /dev/null
@@ -1,607 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/defaultAudience">&nbsp;&nbsp;&nbsp;&nbsp;defaultAudience</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/loginBehavior">&nbsp;&nbsp;&nbsp;&nbsp;loginBehavior</option>
-	
-	<option value="//api/name/publishPermissions">&nbsp;&nbsp;&nbsp;&nbsp;publishPermissions</option>
-	
-	<option value="//api/name/readPermissions">&nbsp;&nbsp;&nbsp;&nbsp;readPermissions</option>
-	
-	<option value="//api/name/tooltipBehavior">&nbsp;&nbsp;&nbsp;&nbsp;tooltipBehavior</option>
-	
-	<option value="//api/name/tooltipColorStyle">&nbsp;&nbsp;&nbsp;&nbsp;tooltipColorStyle</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/defaultAudience">defaultAudience</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginBehavior">loginBehavior</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/publishPermissions">publishPermissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/readPermissions">readPermissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tooltipBehavior">tooltipBehavior</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tooltipColorStyle">tooltipColorStyle</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKButton.html">FBSDKButton</a> : UIButton</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A button that initiates a log in or log out flow upon tapping.</p>
-
-<p><code>FBSDKLoginButton</code> works with <code>[FBSDKAccessToken currentAccessToken]</code> to
-  determine what to display, and automatically starts authentication when tapped (i.e.,
-  you do not need to manually subscribe action targets).</p>
-
-<p>  Like <code>FBSDKLoginManager</code>, you should make sure your app delegate is connected to
-  <code>FBSDKApplicationDelegate</code> in order for the button&rsquo;s delegate to receive messages.</p>
-
-<p><code>FBSDKLoginButton</code> has a fixed height of @c 30 pixels, but you may change the width. <code>initWithFrame:CGRectZero</code>
-will size the button to its minimum frame.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/defaultAudience">&nbsp;&nbsp;defaultAudience</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginBehavior">&nbsp;&nbsp;loginBehavior</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/publishPermissions">&nbsp;&nbsp;publishPermissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/readPermissions">&nbsp;&nbsp;readPermissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tooltipBehavior">&nbsp;&nbsp;tooltipBehavior</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tooltipColorStyle">&nbsp;&nbsp;tooltipColorStyle</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/defaultAudience" title="defaultAudience"></a>
-	<h3 class="subsubtitle method-title">defaultAudience</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The default audience to use, if publish permissions are requested at login time.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKDefaultAudience defaultAudience</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (weak, nonatomic) IBOutlet id&lt;FBSDKLoginButtonDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginBehavior" title="loginBehavior"></a>
-	<h3 class="subsubtitle method-title">loginBehavior</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the login behavior to use</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKLoginBehavior loginBehavior</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/publishPermissions" title="publishPermissions"></a>
-	<h3 class="subsubtitle method-title">publishPermissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The publish permissions to request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) NSArray *publishPermissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Use <code>defaultAudience</code> to specify the default audience to publish to.
-Note this is converted to NSSet and is only
-an NSArray for the convenience of literal syntax.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/readPermissions" title="readPermissions"></a>
-	<h3 class="subsubtitle method-title">readPermissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The read permissions to request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) NSArray *readPermissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Note, that if read permissions are specified, then publish permissions should not be specified. This is converted to NSSet and is only
-an NSArray for the convenience of literal syntax.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tooltipBehavior" title="tooltipBehavior"></a>
-	<h3 class="subsubtitle method-title">tooltipBehavior</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the desired tooltip behavior.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKLoginButtonTooltipBehavior tooltipBehavior</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tooltipColorStyle" title="tooltipColorStyle"></a>
-	<h3 class="subsubtitle method-title">tooltipColorStyle</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the desired tooltip color style.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKTooltipColorStyle tooltipColorStyle</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManager.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManager.html
deleted file mode 100644
index 5e3108cb9e56..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManager.html	
+++ /dev/null
@@ -1,735 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginManager Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginManager Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/defaultAudience">&nbsp;&nbsp;&nbsp;&nbsp;defaultAudience</option>
-	
-	<option value="//api/name/loginBehavior">&nbsp;&nbsp;&nbsp;&nbsp;loginBehavior</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/renewSystemCredentials:">&nbsp;&nbsp;&nbsp;&nbsp;+ renewSystemCredentials:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/logInWithPublishPermissions:fromViewController:handler:">&nbsp;&nbsp;&nbsp;&nbsp;- logInWithPublishPermissions:fromViewController:handler:</option>
-	
-	<option value="//api/name/logInWithPublishPermissions:handler:">&nbsp;&nbsp;&nbsp;&nbsp;- logInWithPublishPermissions:handler:</option>
-	
-	<option value="//api/name/logInWithReadPermissions:fromViewController:handler:">&nbsp;&nbsp;&nbsp;&nbsp;- logInWithReadPermissions:fromViewController:handler:</option>
-	
-	<option value="//api/name/logInWithReadPermissions:handler:">&nbsp;&nbsp;&nbsp;&nbsp;- logInWithReadPermissions:handler:</option>
-	
-	<option value="//api/name/logOut">&nbsp;&nbsp;&nbsp;&nbsp;- logOut</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/defaultAudience">defaultAudience</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginBehavior">loginBehavior</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/renewSystemCredentials:">renewSystemCredentials:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logInWithPublishPermissions:fromViewController:handler:">logInWithPublishPermissions:fromViewController:handler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logInWithPublishPermissions:handler:">logInWithPublishPermissions:handler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logInWithReadPermissions:fromViewController:handler:">logInWithReadPermissions:fromViewController:handler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logInWithReadPermissions:handler:">logInWithReadPermissions:handler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/logOut">logOut</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginManager Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginManager Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  <code>FBSDKLoginManager</code> provides methods for logging the user in and out.</p>
-
-<p><code>FBSDKLoginManager</code> works directly with <code>[FBSDKAccessToken currentAccessToken]</code> and
-  sets the &ldquo;currentAccessToken&rdquo; upon successful authorizations (or sets <code>nil</code> in case of <code>logOut</code>).</p>
-
-<p>You should check <code>[FBSDKAccessToken currentAccessToken]</code> before calling logIn* to see if there is
-a cached token available (typically in your viewDidLoad).</p>
-
-<p>If you are managing your own token instances outside of &ldquo;currentAccessToken&rdquo;, you will need to set
-&ldquo;currentAccessToken&rdquo; before calling logIn* to authorize further permissions on your tokens.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/defaultAudience">&nbsp;&nbsp;defaultAudience</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginBehavior">&nbsp;&nbsp;loginBehavior</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logInWithReadPermissions:handler:">&ndash;&nbsp;logInWithReadPermissions:handler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logInWithPublishPermissions:handler:">&ndash;&nbsp;logInWithPublishPermissions:handler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logInWithReadPermissions:fromViewController:handler:">&ndash;&nbsp;logInWithReadPermissions:fromViewController:handler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logInWithPublishPermissions:fromViewController:handler:">&ndash;&nbsp;logInWithPublishPermissions:fromViewController:handler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/logOut">&ndash;&nbsp;logOut</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/renewSystemCredentials:">+&nbsp;renewSystemCredentials:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/defaultAudience" title="defaultAudience"></a>
-	<h3 class="subsubtitle method-title">defaultAudience</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the default audience.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKDefaultAudience defaultAudience</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>you should set this if you intend to ask for publish permissions.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginBehavior" title="loginBehavior"></a>
-	<h3 class="subsubtitle method-title">loginBehavior</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the login behavior</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (assign, nonatomic) FBSDKLoginBehavior loginBehavior</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/renewSystemCredentials:" title="renewSystemCredentials:"></a>
-	<h3 class="subsubtitle method-title">renewSystemCredentials:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)renewSystemCredentials:(void ( ^ ) ( ACAccountCredentialRenewResult result , NSError *error ))<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Issues an asynchronous renewCredentialsForAccount call to the device&rsquo;s Facebook account store.</p>
-
-<ul>
-<li>Parameter handler: The completion handler to call when the renewal is completed. This can be invoked on an arbitrary thread.</li>
-</ul>
-
-
-<p>This can be used to explicitly renew account credentials and is provided as a convenience wrapper around
-<code>[ACAccountStore renewCredentialsForAccount:completion]</code>. Note the method will not issue the renewal call if the the
-Facebook account has not been set on the device, or if access had not been granted to the account (though the handler
-wil receive an error).</p>
-
-<p>If the <code>[FBSDKAccessToken currentAccessToken]</code> was from the account store, a succesful renewal will also set
-a new &ldquo;currentAccessToken&rdquo;.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/logInWithPublishPermissions:fromViewController:handler:" title="logInWithPublishPermissions:fromViewController:handler:"></a>
-	<h3 class="subsubtitle method-title">logInWithPublishPermissions:fromViewController:handler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Logs the user in or authorizes additional permissions.
-- Parameter permissions: the optional array of permissions. Note this is converted to NSSet and is only
-an NSArray for the convenience of literal syntax.
-- Parameter fromViewController: the view controller to present from. If nil, the topmost view controller will be
-automatically determined as best as possible.
-- Parameter handler: the callback.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)logInWithPublishPermissions:(NSArray *)<em>permissions</em> fromViewController:(UIViewController *)<em>fromViewController</em> handler:(FBSDKLoginManagerRequestTokenHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Use this method when asking for publish permissions. You should only ask for permissions when they
-are needed and explain the value to the user. You can inspect the result.declinedPermissions to also
-provide more information to the user if they decline permissions.</p>
-
-<p>This method will present UI the user. You typically should check if <code>[FBSDKAccessToken currentAccessToken]</code>
-already contains the permissions you need before asking to reduce unnecessary app switching. For example,
-you could make that check at viewDidLoad.
-You can only do one login call at a time. Calling a login method before the completion handler is called
-on a previous login will return an error.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logInWithPublishPermissions:handler:" title="logInWithPublishPermissions:handler:"></a>
-	<h3 class="subsubtitle method-title">logInWithPublishPermissions:handler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:use logInWithPublishPermissions:fromViewController:handler: instead</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)logInWithPublishPermissions:(NSArray *)<em>permissions</em> handler:(FBSDKLoginManagerRequestTokenHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logInWithReadPermissions:fromViewController:handler:" title="logInWithReadPermissions:fromViewController:handler:"></a>
-	<h3 class="subsubtitle method-title">logInWithReadPermissions:fromViewController:handler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Logs the user in or authorizes additional permissions.
-- Parameter permissions: the optional array of permissions. Note this is converted to NSSet and is only
-  an NSArray for the convenience of literal syntax.
-- Parameter fromViewController: the view controller to present from. If nil, the topmost view controller will be
-  automatically determined as best as possible.
-- Parameter handler: the callback.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)logInWithReadPermissions:(NSArray *)<em>permissions</em> fromViewController:(UIViewController *)<em>fromViewController</em> handler:(FBSDKLoginManagerRequestTokenHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Use this method when asking for read permissions. You should only ask for permissions when they
-  are needed and explain the value to the user. You can inspect the result.declinedPermissions to also
-  provide more information to the user if they decline permissions.</p>
-
-<p>This method will present UI the user. You typically should check if <code>[FBSDKAccessToken currentAccessToken]</code>
-already contains the permissions you need before asking to reduce unnecessary app switching. For example,
-you could make that check at viewDidLoad.
-You can only do one login call at a time. Calling a login method before the completion handler is called
-on a previous login will return an error.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logInWithReadPermissions:handler:" title="logInWithReadPermissions:handler:"></a>
-	<h3 class="subsubtitle method-title">logInWithReadPermissions:handler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:use logInWithReadPermissions:fromViewController:handler: instead</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)logInWithReadPermissions:(NSArray *)<em>permissions</em> handler:(FBSDKLoginManagerRequestTokenHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/logOut" title="logOut"></a>
-	<h3 class="subsubtitle method-title">logOut</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Logs the user out</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)logOut</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This calls [FBSDKAccessToken setCurrentAccessToken:nil] and [FBSDKProfile setCurrentProfile:nil].</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManagerLoginResult.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManagerLoginResult.html
deleted file mode 100644
index d23c5aca4e1d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginManagerLoginResult.html	
+++ /dev/null
@@ -1,519 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginManagerLoginResult Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginManagerLoginResult Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/declinedPermissions">&nbsp;&nbsp;&nbsp;&nbsp;declinedPermissions</option>
-	
-	<option value="//api/name/grantedPermissions">&nbsp;&nbsp;&nbsp;&nbsp;grantedPermissions</option>
-	
-	<option value="//api/name/isCancelled">&nbsp;&nbsp;&nbsp;&nbsp;isCancelled</option>
-	
-	<option value="//api/name/token">&nbsp;&nbsp;&nbsp;&nbsp;token</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/initWithToken:isCancelled:grantedPermissions:declinedPermissions:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithToken:isCancelled:grantedPermissions:declinedPermissions:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/declinedPermissions">declinedPermissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/grantedPermissions">grantedPermissions</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isCancelled">isCancelled</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/token">token</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithToken:isCancelled:grantedPermissions:declinedPermissions:">initWithToken:isCancelled:grantedPermissions:declinedPermissions:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginManagerLoginResult Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginManagerLoginResult Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginManagerLoginResult.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Describes the result of a login attempt.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/token">&nbsp;&nbsp;token</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isCancelled">&nbsp;&nbsp;isCancelled</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/grantedPermissions">&nbsp;&nbsp;grantedPermissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/declinedPermissions">&nbsp;&nbsp;declinedPermissions</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithToken:isCancelled:grantedPermissions:declinedPermissions:">&ndash;&nbsp;initWithToken:isCancelled:grantedPermissions:declinedPermissions:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/declinedPermissions" title="declinedPermissions"></a>
-	<h3 class="subsubtitle method-title">declinedPermissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the set of permissions declined by the user in the associated request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) NSSet *declinedPermissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>inspect the token&rsquo;s permissions set for a complete list.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManagerLoginResult.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/grantedPermissions" title="grantedPermissions"></a>
-	<h3 class="subsubtitle method-title">grantedPermissions</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the set of permissions granted by the user in the associated request.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) NSSet *grantedPermissions</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>inspect the token&rsquo;s permissions set for a complete list.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManagerLoginResult.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isCancelled" title="isCancelled"></a>
-	<h3 class="subsubtitle method-title">isCancelled</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  whether the login was cancelled by the user.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (readonly, nonatomic) BOOL isCancelled</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManagerLoginResult.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/token" title="token"></a>
-	<h3 class="subsubtitle method-title">token</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the access token.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) FBSDKAccessToken *token</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManagerLoginResult.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithToken:isCancelled:grantedPermissions:declinedPermissions:" title="initWithToken:isCancelled:grantedPermissions:declinedPermissions:"></a>
-	<h3 class="subsubtitle method-title">initWithToken:isCancelled:grantedPermissions:declinedPermissions:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Initializes a new instance.
-- Parameter token: the access token
-- Parameter isCancelled: whether the login was cancelled by the user
-- Parameter grantedPermissions: the set of granted permissions
-- Parameter declinedPermissions: the set of declined permissions</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithToken:(FBSDKAccessToken *)<em>token</em> isCancelled:(BOOL)<em>isCancelled</em> grantedPermissions:(NSSet *)<em>grantedPermissions</em> declinedPermissions:(NSSet *)<em>declinedPermissions</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginManagerLoginResult.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginTooltipView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginTooltipView.html
deleted file mode 100644
index 407a84fcbbfa..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKLoginTooltipView.html	
+++ /dev/null
@@ -1,364 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginTooltipView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginTooltipView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/forceDisplay">&nbsp;&nbsp;&nbsp;&nbsp;forceDisplay</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/forceDisplay">forceDisplay</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginTooltipView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginTooltipView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKTooltipView.html">FBSDKTooltipView</a> : UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginTooltipView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Represents a tooltip to be displayed next to a Facebook login button
-  to highlight features for new users.</p>
-
-<p>The <code>FBSDKLoginButton</code> may display this view automatically. If you do
-  not use the <code>FBSDKLoginButton</code>, you can manually call one of the <code>present*</code> methods
-  as appropriate and customize behavior via <code>FBSDKLoginTooltipViewDelegate</code> delegate.</p>
-
-<p>  By default, the <code>FBSDKLoginTooltipView</code> is not added to the superview until it is
-  determined the app has migrated to the new login experience. You can override this
-  (e.g., to test the UI layout) by implementing the delegate or setting <code>forceDisplay</code> to YES.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/forceDisplay">&nbsp;&nbsp;forceDisplay</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  the delegate</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKLoginTooltipViewDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/forceDisplay" title="forceDisplay"></a>
-	<h3 class="subsubtitle method-title">forceDisplay</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  if set to YES, the view will always be displayed and the delegate&rsquo;s
-  <code>loginTooltipView:shouldAppear:</code> will NOT be called.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) BOOL forceDisplay</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessageDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessageDialog.html
deleted file mode 100644
index 7a3745d06c64..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKMessageDialog.html	
+++ /dev/null
@@ -1,313 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMessageDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMessageDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showWithContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showWithContent:delegate:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showWithContent:delegate:">showWithContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMessageDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMessageDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingDialog.html">FBSDKSharingDialog</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMessageDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A dialog for sharing content through Messenger.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showWithContent:delegate:">+&nbsp;showWithContent:delegate:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showWithContent:delegate:" title="showWithContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showWithContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to show a Message Share Dialog with content and a delegate.
-- Parameter content: The content to be shared.
-- Parameter delegate: The receiver&rsquo;s delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showWithContent:(id&lt;FBSDKSharingContent&gt;)<em>content</em> delegate:(id&lt;FBSDKSharingDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMessageDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfile.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfile.html
deleted file mode 100644
index 63ec75724e32..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfile.html	
+++ /dev/null
@@ -1,1042 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKProfile Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKProfile Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/firstName">&nbsp;&nbsp;&nbsp;&nbsp;firstName</option>
-	
-	<option value="//api/name/lastName">&nbsp;&nbsp;&nbsp;&nbsp;lastName</option>
-	
-	<option value="//api/name/linkURL">&nbsp;&nbsp;&nbsp;&nbsp;linkURL</option>
-	
-	<option value="//api/name/middleName">&nbsp;&nbsp;&nbsp;&nbsp;middleName</option>
-	
-	<option value="//api/name/name">&nbsp;&nbsp;&nbsp;&nbsp;name</option>
-	
-	<option value="//api/name/refreshDate">&nbsp;&nbsp;&nbsp;&nbsp;refreshDate</option>
-	
-	<option value="//api/name/userID">&nbsp;&nbsp;&nbsp;&nbsp;userID</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/currentProfile">&nbsp;&nbsp;&nbsp;&nbsp;+ currentProfile</option>
-	
-	<option value="//api/name/enableUpdatesOnAccessTokenChange:">&nbsp;&nbsp;&nbsp;&nbsp;+ enableUpdatesOnAccessTokenChange:</option>
-	
-	<option value="//api/name/loadCurrentProfileWithCompletion:">&nbsp;&nbsp;&nbsp;&nbsp;+ loadCurrentProfileWithCompletion:</option>
-	
-	<option value="//api/name/setCurrentProfile:">&nbsp;&nbsp;&nbsp;&nbsp;+ setCurrentProfile:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/imagePathForPictureMode:size:">&nbsp;&nbsp;&nbsp;&nbsp;- imagePathForPictureMode:size:</option>
-	
-	<option value="//api/name/imageURLForPictureMode:size:">&nbsp;&nbsp;&nbsp;&nbsp;- imageURLForPictureMode:size:</option>
-	
-	<option value="//api/name/initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:</option>
-	
-	<option value="//api/name/isEqualToProfile:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToProfile:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/firstName">firstName</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/lastName">lastName</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/linkURL">linkURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/middleName">middleName</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/name">name</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/refreshDate">refreshDate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userID">userID</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/currentProfile">currentProfile</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/enableUpdatesOnAccessTokenChange:">enableUpdatesOnAccessTokenChange:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loadCurrentProfileWithCompletion:">loadCurrentProfileWithCompletion:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setCurrentProfile:">setCurrentProfile:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/imagePathForPictureMode:size:">imagePathForPictureMode:size:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/imageURLForPictureMode:size:">imageURLForPictureMode:size:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:">initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToProfile:">isEqualToProfile:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKProfile Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKProfile Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSCopying<br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKProfile.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Represents an immutable Facebook profile</p>
-
-<p>This class provides a global &ldquo;currentProfile&rdquo; instance to more easily
-add social context to your application. When the profile changes, a notification is
-posted so that you can update relevant parts of your UI and is persisted to NSUserDefaults.</p>
-
-<p>Typically, you will want to call <code>enableUpdatesOnAccessTokenChange:YES</code> so that
-it automatically observes changes to the <code>[FBSDKAccessToken currentAccessToken]</code>.</p>
-
-<p>You can use this class to build your own <code>FBSDKProfilePictureView</code> or in place of typical requests to &ldquo;/me&rdquo;.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:">&ndash;&nbsp;initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userID">&nbsp;&nbsp;userID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/firstName">&nbsp;&nbsp;firstName</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/middleName">&nbsp;&nbsp;middleName</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/lastName">&nbsp;&nbsp;lastName</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/name">&nbsp;&nbsp;name</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/linkURL">&nbsp;&nbsp;linkURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/refreshDate">&nbsp;&nbsp;refreshDate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/currentProfile">+&nbsp;currentProfile</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setCurrentProfile:">+&nbsp;setCurrentProfile:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/enableUpdatesOnAccessTokenChange:">+&nbsp;enableUpdatesOnAccessTokenChange:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loadCurrentProfileWithCompletion:">+&nbsp;loadCurrentProfileWithCompletion:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/imageURLForPictureMode:size:">&ndash;&nbsp;imageURLForPictureMode:size:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/imagePathForPictureMode:size:">&ndash;&nbsp;imagePathForPictureMode:size:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToProfile:">&ndash;&nbsp;isEqualToProfile:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/firstName" title="firstName"></a>
-	<h3 class="subsubtitle method-title">firstName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user&rsquo;s first name</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *firstName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/lastName" title="lastName"></a>
-	<h3 class="subsubtitle method-title">lastName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user&rsquo;s last name</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *lastName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/linkURL" title="linkURL"></a>
-	<h3 class="subsubtitle method-title">linkURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A URL to the user&rsquo;s profile.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSURL *linkURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Consider using Bolts and <code>FBSDKAppLinkResolver</code> to resolve this
-to an app link to link directly to the user&rsquo;s profile in the Facebook app.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/middleName" title="middleName"></a>
-	<h3 class="subsubtitle method-title">middleName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user&rsquo;s middle name</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *middleName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/name" title="name"></a>
-	<h3 class="subsubtitle method-title">name</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user&rsquo;s complete name</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *name</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/refreshDate" title="refreshDate"></a>
-	<h3 class="subsubtitle method-title">refreshDate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The last time the profile data was fetched.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSDate *refreshDate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userID" title="userID"></a>
-	<h3 class="subsubtitle method-title">userID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user id</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *userID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/currentProfile" title="currentProfile"></a>
-	<h3 class="subsubtitle method-title">currentProfile</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets the current FBSDKProfile instance.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (FBSDKProfile *)currentProfile</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/enableUpdatesOnAccessTokenChange:" title="enableUpdatesOnAccessTokenChange:"></a>
-	<h3 class="subsubtitle method-title">enableUpdatesOnAccessTokenChange:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Indicates if <code>currentProfile</code> will automatically observe <code>FBSDKAccessTokenDidChangeNotification</code> notifications
-- Parameter enable: YES is observing</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)enableUpdatesOnAccessTokenChange:(BOOL)<em>enable</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If observing, this class will issue a graph request for public profile data when the current token&rsquo;s userID
-differs from the current profile. You can observe <code>FBSDKProfileDidChangeNotification</code> for when the profile is updated.</p>
-
-<p>Note that if <code>[FBSDKAccessToken currentAccessToken]</code> is unset, the <code>currentProfile</code> instance remains. It&rsquo;s also possible
-for <code>currentProfile</code> to return nil until the data is fetched.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loadCurrentProfileWithCompletion:" title="loadCurrentProfileWithCompletion:"></a>
-	<h3 class="subsubtitle method-title">loadCurrentProfileWithCompletion:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Loads the current profile and passes it to the completion block.
-- Parameter completion: The block to be executed once the profile is loaded</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)loadCurrentProfileWithCompletion:(void ( ^ ) ( FBSDKProfile *profile , NSError *error ))<em>completion</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If the profile is already loaded, this method will call the completion block synchronously, otherwise it
-will begin a graph request to update <code>currentProfile</code> and then call the completion block when finished.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setCurrentProfile:" title="setCurrentProfile:"></a>
-	<h3 class="subsubtitle method-title">setCurrentProfile:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets the current instance and posts the appropriate notification if the profile parameter is different
-than the receiver.
-- Parameter profile: the profile to set</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setCurrentProfile:(FBSDKProfile *)<em>profile</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This persists the profile to NSUserDefaults.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/imagePathForPictureMode:size:" title="imagePathForPictureMode:size:"></a>
-	<h3 class="subsubtitle method-title">imagePathForPictureMode:size:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A convenience method for returning a Graph API path for retrieving the user&rsquo;s profile image.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSString *)imagePathForPictureMode:(FBSDKProfilePictureMode)<em>mode</em> size:(CGSize)<em>size</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Warning:use <code>imageURLForPictureMode:size:</code> instead</li>
-</ul>
-
-
-<p>You can pass this to a <code>FBSDKGraphRequest</code> instance to download the image.
-- Parameter mode: The picture mode
-- Parameter size: The height and width. This will be rounded to integer precision.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/imageURLForPictureMode:size:" title="imageURLForPictureMode:size:"></a>
-	<h3 class="subsubtitle method-title">imageURLForPictureMode:size:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A convenience method for returning a complete <code>NSURL</code> for retrieving the user&rsquo;s profile image.
-- Parameter mode: The picture mode
-- Parameter size: The height and width. This will be rounded to integer precision.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSURL *)imageURLForPictureMode:(FBSDKProfilePictureMode)<em>mode</em> size:(CGSize)<em>size</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:" title="initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:"></a>
-	<h3 class="subsubtitle method-title">initWithUserID:firstName:middleName:lastName:name:linkURL:refreshDate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  initializes a new instance.
-- Parameter userID: the user ID
-- Parameter firstName: the user&rsquo;s first name
-- Parameter middleName: the user&rsquo;s middle name
-- Parameter lastName: the user&rsquo;s last name
-- Parameter name: the user&rsquo;s complete name
-- Parameter linkURL: the link for this profile
-- Parameter refreshDate: the optional date this profile was fetched. Defaults to [NSDate date].</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithUserID:(NSString *)<em>userID</em> firstName:(NSString *)<em>firstName</em> middleName:(NSString *)<em>middleName</em> lastName:(NSString *)<em>lastName</em> name:(NSString *)<em>name</em> linkURL:(NSURL *)<em>linkURL</em> refreshDate:(NSDate *)<em>refreshDate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToProfile:" title="isEqualToProfile:"></a>
-	<h3 class="subsubtitle method-title">isEqualToProfile:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns YES if the profile is equivalent to the receiver.
-- Parameter profile: the profile to compare to.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToProfile:(FBSDKProfile *)<em>profile</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfile.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfilePictureView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfilePictureView.html
deleted file mode 100644
index 048d1e10803a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKProfilePictureView.html	
+++ /dev/null
@@ -1,419 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKProfilePictureView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKProfilePictureView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/pictureMode">&nbsp;&nbsp;&nbsp;&nbsp;pictureMode</option>
-	
-	<option value="//api/name/profileID">&nbsp;&nbsp;&nbsp;&nbsp;profileID</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/setNeedsImageUpdate">&nbsp;&nbsp;&nbsp;&nbsp;- setNeedsImageUpdate</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/pictureMode">pictureMode</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/profileID">profileID</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setNeedsImageUpdate">setNeedsImageUpdate</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKProfilePictureView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKProfilePictureView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKProfilePictureView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A view to display a profile picture.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/pictureMode">&nbsp;&nbsp;pictureMode</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/profileID">&nbsp;&nbsp;profileID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setNeedsImageUpdate">&ndash;&nbsp;setNeedsImageUpdate</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/pictureMode" title="pictureMode"></a>
-	<h3 class="subsubtitle method-title">pictureMode</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The mode for the receiver to determine the aspect ratio of the source image.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKProfilePictureMode pictureMode</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfilePictureView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/profileID" title="profileID"></a>
-	<h3 class="subsubtitle method-title">profileID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The profile ID to show the picture for.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *profileID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfilePictureView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/setNeedsImageUpdate" title="setNeedsImageUpdate"></a>
-	<h3 class="subsubtitle method-title">setNeedsImageUpdate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Explicitly marks the receiver as needing to update the image.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setNeedsImageUpdate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This method is called whenever any properties that affect the source image are modified, but this can also
-be used to trigger a manual update of the image if it needs to be re-downloaded.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKProfilePictureView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSendButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSendButton.html
deleted file mode 100644
index 8d6a316cf4fb..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSendButton.html	
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSendButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSendButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSendButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSendButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKButton.html">FBSDKButton</a> : UIButton</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingButton.html">FBSDKSharingButton</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSendButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A button to send content through Messenger.</p>
-
-<p>Tapping the receiver will invoke the FBSDKShareDialog with the attached shareContent.  If the dialog cannot
-be shown, the button will be disable.</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSettings.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSettings.html
deleted file mode 100644
index 88283e47da01..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSettings.html	
+++ /dev/null
@@ -1,1486 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSettings Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSettings Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/JPEGCompressionQuality">&nbsp;&nbsp;&nbsp;&nbsp;+ JPEGCompressionQuality</option>
-	
-	<option value="//api/name/appID">&nbsp;&nbsp;&nbsp;&nbsp;+ appID</option>
-	
-	<option value="//api/name/appURLSchemeSuffix">&nbsp;&nbsp;&nbsp;&nbsp;+ appURLSchemeSuffix</option>
-	
-	<option value="//api/name/clientToken">&nbsp;&nbsp;&nbsp;&nbsp;+ clientToken</option>
-	
-	<option value="//api/name/disableLoggingBehavior:">&nbsp;&nbsp;&nbsp;&nbsp;+ disableLoggingBehavior:</option>
-	
-	<option value="//api/name/displayName">&nbsp;&nbsp;&nbsp;&nbsp;+ displayName</option>
-	
-	<option value="//api/name/enableLoggingBehavior:">&nbsp;&nbsp;&nbsp;&nbsp;+ enableLoggingBehavior:</option>
-	
-	<option value="//api/name/facebookDomainPart">&nbsp;&nbsp;&nbsp;&nbsp;+ facebookDomainPart</option>
-	
-	<option value="//api/name/graphAPIVersion">&nbsp;&nbsp;&nbsp;&nbsp;+ graphAPIVersion</option>
-	
-	<option value="//api/name/legacyUserDefaultTokenInformationKeyName">&nbsp;&nbsp;&nbsp;&nbsp;+ legacyUserDefaultTokenInformationKeyName</option>
-	
-	<option value="//api/name/limitEventAndDataUsage">&nbsp;&nbsp;&nbsp;&nbsp;+ limitEventAndDataUsage</option>
-	
-	<option value="//api/name/loggingBehavior">&nbsp;&nbsp;&nbsp;&nbsp;+ loggingBehavior</option>
-	
-	<option value="//api/name/sdkVersion">&nbsp;&nbsp;&nbsp;&nbsp;+ sdkVersion</option>
-	
-	<option value="//api/name/setAppID:">&nbsp;&nbsp;&nbsp;&nbsp;+ setAppID:</option>
-	
-	<option value="//api/name/setAppURLSchemeSuffix:">&nbsp;&nbsp;&nbsp;&nbsp;+ setAppURLSchemeSuffix:</option>
-	
-	<option value="//api/name/setClientToken:">&nbsp;&nbsp;&nbsp;&nbsp;+ setClientToken:</option>
-	
-	<option value="//api/name/setDisplayName:">&nbsp;&nbsp;&nbsp;&nbsp;+ setDisplayName:</option>
-	
-	<option value="//api/name/setFacebookDomainPart:">&nbsp;&nbsp;&nbsp;&nbsp;+ setFacebookDomainPart:</option>
-	
-	<option value="//api/name/setGraphAPIVersion:">&nbsp;&nbsp;&nbsp;&nbsp;+ setGraphAPIVersion:</option>
-	
-	<option value="//api/name/setGraphErrorRecoveryDisabled:">&nbsp;&nbsp;&nbsp;&nbsp;+ setGraphErrorRecoveryDisabled:</option>
-	
-	<option value="//api/name/setJPEGCompressionQuality:">&nbsp;&nbsp;&nbsp;&nbsp;+ setJPEGCompressionQuality:</option>
-	
-	<option value="//api/name/setLegacyUserDefaultTokenInformationKeyName:">&nbsp;&nbsp;&nbsp;&nbsp;+ setLegacyUserDefaultTokenInformationKeyName:</option>
-	
-	<option value="//api/name/setLimitEventAndDataUsage:">&nbsp;&nbsp;&nbsp;&nbsp;+ setLimitEventAndDataUsage:</option>
-	
-	<option value="//api/name/setLoggingBehavior:">&nbsp;&nbsp;&nbsp;&nbsp;+ setLoggingBehavior:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/JPEGCompressionQuality">JPEGCompressionQuality</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appID">appID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appURLSchemeSuffix">appURLSchemeSuffix</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/clientToken">clientToken</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/disableLoggingBehavior:">disableLoggingBehavior:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/displayName">displayName</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/enableLoggingBehavior:">enableLoggingBehavior:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/facebookDomainPart">facebookDomainPart</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/graphAPIVersion">graphAPIVersion</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/legacyUserDefaultTokenInformationKeyName">legacyUserDefaultTokenInformationKeyName</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/limitEventAndDataUsage">limitEventAndDataUsage</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loggingBehavior">loggingBehavior</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sdkVersion">sdkVersion</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setAppID:">setAppID:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setAppURLSchemeSuffix:">setAppURLSchemeSuffix:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setClientToken:">setClientToken:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setDisplayName:">setDisplayName:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setFacebookDomainPart:">setFacebookDomainPart:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setGraphAPIVersion:">setGraphAPIVersion:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setGraphErrorRecoveryDisabled:">setGraphErrorRecoveryDisabled:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setJPEGCompressionQuality:">setJPEGCompressionQuality:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setLegacyUserDefaultTokenInformationKeyName:">setLegacyUserDefaultTokenInformationKeyName:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setLimitEventAndDataUsage:">setLimitEventAndDataUsage:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setLoggingBehavior:">setLoggingBehavior:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSettings Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSettings Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSettings.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Log errors likely to be preventable by the developer. This is in the default set of enabled logging behaviors.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appID">+&nbsp;appID</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setAppID:">+&nbsp;setAppID:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appURLSchemeSuffix">+&nbsp;appURLSchemeSuffix</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setAppURLSchemeSuffix:">+&nbsp;setAppURLSchemeSuffix:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/clientToken">+&nbsp;clientToken</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setClientToken:">+&nbsp;setClientToken:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setGraphErrorRecoveryDisabled:">+&nbsp;setGraphErrorRecoveryDisabled:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/displayName">+&nbsp;displayName</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setDisplayName:">+&nbsp;setDisplayName:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/facebookDomainPart">+&nbsp;facebookDomainPart</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setFacebookDomainPart:">+&nbsp;setFacebookDomainPart:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/JPEGCompressionQuality">+&nbsp;JPEGCompressionQuality</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setJPEGCompressionQuality:">+&nbsp;setJPEGCompressionQuality:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/limitEventAndDataUsage">+&nbsp;limitEventAndDataUsage</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setLimitEventAndDataUsage:">+&nbsp;setLimitEventAndDataUsage:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sdkVersion">+&nbsp;sdkVersion</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loggingBehavior">+&nbsp;loggingBehavior</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setLoggingBehavior:">+&nbsp;setLoggingBehavior:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/enableLoggingBehavior:">+&nbsp;enableLoggingBehavior:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/disableLoggingBehavior:">+&nbsp;disableLoggingBehavior:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setLegacyUserDefaultTokenInformationKeyName:">+&nbsp;setLegacyUserDefaultTokenInformationKeyName:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/legacyUserDefaultTokenInformationKeyName">+&nbsp;legacyUserDefaultTokenInformationKeyName</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setGraphAPIVersion:">+&nbsp;setGraphAPIVersion:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/graphAPIVersion">+&nbsp;graphAPIVersion</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/JPEGCompressionQuality" title="JPEGCompressionQuality"></a>
-	<h3 class="subsubtitle method-title">JPEGCompressionQuality</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The quality of JPEG images sent to Facebook from the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (CGFloat)JPEGCompressionQuality</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default is 0.9.</p>
-
-<ul>
-<li>See:<a href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIKitFunctionReference/#//apple_ref/c/func/UIImageJPEGRepresentation">UIImageJPEGRepresentation</a></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appID" title="appID"></a>
-	<h3 class="subsubtitle method-title">appID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the Facebook App ID used by the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)appID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default will be read from the application&rsquo;s plist (FacebookAppID).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appURLSchemeSuffix" title="appURLSchemeSuffix"></a>
-	<h3 class="subsubtitle method-title">appURLSchemeSuffix</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the default url scheme suffix used for sessions.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)appURLSchemeSuffix</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default will be read from the application&rsquo;s plist (FacebookUrlSchemeSuffix).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/clientToken" title="clientToken"></a>
-	<h3 class="subsubtitle method-title">clientToken</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Retrieve the Client Token that has been set via [FBSDKSettings setClientToken].</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)clientToken</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default will be read from the application&rsquo;s plist (FacebookClientToken).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/disableLoggingBehavior:" title="disableLoggingBehavior:"></a>
-	<h3 class="subsubtitle method-title">disableLoggingBehavior:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Disable a particular Facebook SDK logging behavior.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)disableLoggingBehavior:(NSString *)<em>loggingBehavior</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter loggingBehavior: The LoggingBehavior to disable. This should be a string defined as a constant with FBSDKLoggingBehavior*.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/displayName" title="displayName"></a>
-	<h3 class="subsubtitle method-title">displayName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the Facebook Display Name used by the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)displayName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default will be read from the application&rsquo;s plist (FacebookDisplayName).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/enableLoggingBehavior:" title="enableLoggingBehavior:"></a>
-	<h3 class="subsubtitle method-title">enableLoggingBehavior:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Enable a particular Facebook SDK logging behavior.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)enableLoggingBehavior:(NSString *)<em>loggingBehavior</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter loggingBehavior: The LoggingBehavior to enable. This should be a string defined as a constant with FBSDKLoggingBehavior*.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/facebookDomainPart" title="facebookDomainPart"></a>
-	<h3 class="subsubtitle method-title">facebookDomainPart</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the Facebook domain part.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)facebookDomainPart</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not explicitly set, the default will be read from the application&rsquo;s plist (FacebookDomainPart).</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/graphAPIVersion" title="graphAPIVersion"></a>
-	<h3 class="subsubtitle method-title">graphAPIVersion</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns the default Graph API version. Defaults to <code>FBSDK_TARGET_PLATFORM_VERSION</code></p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)graphAPIVersion</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/legacyUserDefaultTokenInformationKeyName" title="legacyUserDefaultTokenInformationKeyName"></a>
-	<h3 class="subsubtitle method-title">legacyUserDefaultTokenInformationKeyName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Get the user defaults key used by legacy token caches.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)legacyUserDefaultTokenInformationKeyName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/limitEventAndDataUsage" title="limitEventAndDataUsage"></a>
-	<h3 class="subsubtitle method-title">limitEventAndDataUsage</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets whether data such as that generated through FBSDKAppEvents and sent to Facebook should be restricted from being used for other than analytics and conversions.  Defaults to NO.  This value is stored on the device and persists across app launches.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (BOOL)limitEventAndDataUsage</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loggingBehavior" title="loggingBehavior"></a>
-	<h3 class="subsubtitle method-title">loggingBehavior</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Retrieve the current Facebook SDK logging behavior.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSSet *)loggingBehavior</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/sdkVersion" title="sdkVersion"></a>
-	<h3 class="subsubtitle method-title">sdkVersion</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Retrieve the current iOS SDK version.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)sdkVersion</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setAppID:" title="setAppID:"></a>
-	<h3 class="subsubtitle method-title">setAppID:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the Facebook App ID to be used by the SDK.
-- Parameter appID: The Facebook App ID to be used by the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setAppID:(NSString *)<em>appID</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setAppURLSchemeSuffix:" title="setAppURLSchemeSuffix:"></a>
-	<h3 class="subsubtitle method-title">setAppURLSchemeSuffix:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the app url scheme suffix used by the SDK.
-- Parameter appURLSchemeSuffix: The url scheme suffix to be used by the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setAppURLSchemeSuffix:(NSString *)<em>appURLSchemeSuffix</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setClientToken:" title="setClientToken:"></a>
-	<h3 class="subsubtitle method-title">setClientToken:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets the Client Token for the Facebook App.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setClientToken:(NSString *)<em>clientToken</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This is needed for certain API calls when made anonymously, without a user-based access token.
-- Parameter clientToken: The Facebook App&rsquo;s &ldquo;client token&rdquo;, which, for a given appid can be found in the Security
-section of the Advanced tab of the Facebook App settings found at <a href="https://developers.facebook.com/apps/[your-app-id]">https://developers.facebook.com/apps/[your-app-id]</a></p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setDisplayName:" title="setDisplayName:"></a>
-	<h3 class="subsubtitle method-title">setDisplayName:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the default Facebook Display Name to be used by the SDK.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setDisplayName:(NSString *)<em>displayName</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  This should match the Display Name that has been set for the app with the corresponding Facebook App ID,
-in the Facebook App Dashboard.
-- Parameter displayName: The Facebook Display Name to be used by the SDK.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setFacebookDomainPart:" title="setFacebookDomainPart:"></a>
-	<h3 class="subsubtitle method-title">setFacebookDomainPart:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the subpart of the Facebook domain.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setFacebookDomainPart:(NSString *)<em>facebookDomainPart</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This can be used to change the Facebook domain (e.g. @&ldquo;beta&rdquo;) so that requests will be sent to
-graph.beta.facebook.com
-- Parameter facebookDomainPart: The domain part to be inserted into facebook.com.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setGraphAPIVersion:" title="setGraphAPIVersion:"></a>
-	<h3 class="subsubtitle method-title">setGraphAPIVersion:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Overrides the default Graph API version to use with <code>FBSDKGraphRequests</code>. This overrides <code>FBSDK_TARGET_PLATFORM_VERSION</code>.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setGraphAPIVersion:(NSString *)<em>version</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>The string should be of the form <code>@"v2.7"</code>.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setGraphErrorRecoveryDisabled:" title="setGraphErrorRecoveryDisabled:"></a>
-	<h3 class="subsubtitle method-title">setGraphErrorRecoveryDisabled:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A convenient way to toggle error recovery for all FBSDKGraphRequest instances created after this is set.
-- Parameter disableGraphErrorRecovery: YES or NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setGraphErrorRecoveryDisabled:(BOOL)<em>disableGraphErrorRecovery</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setJPEGCompressionQuality:" title="setJPEGCompressionQuality:"></a>
-	<h3 class="subsubtitle method-title">setJPEGCompressionQuality:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the quality of JPEG images sent to Facebook from the SDK.
-- Parameter JPEGCompressionQuality: The quality for JPEG images, expressed as a value from 0.0 to 1.0.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setJPEGCompressionQuality:(CGFloat)<em>JPEGCompressionQuality</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>See:<a href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIKitFunctionReference/#//apple_ref/c/func/UIImageJPEGRepresentation">UIImageJPEGRepresentation</a></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setLegacyUserDefaultTokenInformationKeyName:" title="setLegacyUserDefaultTokenInformationKeyName:"></a>
-	<h3 class="subsubtitle method-title">setLegacyUserDefaultTokenInformationKeyName:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the user defaults key used by legacy token caches.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setLegacyUserDefaultTokenInformationKeyName:(NSString *)<em>tokenInformationKeyName</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter tokenInformationKeyName: the key used by legacy token caches.</li>
-</ul>
-
-
-<p>Use this only if you customized FBSessionTokenCachingStrategy in v3.x of
-  the Facebook SDK for iOS.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setLimitEventAndDataUsage:" title="setLimitEventAndDataUsage:"></a>
-	<h3 class="subsubtitle method-title">setLimitEventAndDataUsage:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets whether data such as that generated through FBSDKAppEvents and sent to Facebook should be restricted from being used for other than analytics and conversions.  Defaults to NO.  This value is stored on the device and persists across app launches.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setLimitEventAndDataUsage:(BOOL)<em>limitEventAndDataUsage</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter limitEventAndDataUsage:   The desired value.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setLoggingBehavior:" title="setLoggingBehavior:"></a>
-	<h3 class="subsubtitle method-title">setLoggingBehavior:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Set the current Facebook SDK logging behavior.  This should consist of strings defined as
-constants with FBSDKLoggingBehavior*.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (void)setLoggingBehavior:(NSSet *)<em>loggingBehavior</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter loggingBehavior: A set of strings indicating what information should be logged.  If nil is provided, the logging
-behavior is reset to the default set of enabled behaviors.  Set to an empty set in order to disable all logging.</li>
-</ul>
-
-
-<p>You can also define this via an array in your app plist with key &ldquo;FacebookLoggingBehavior&rdquo; or add and remove individual values via enableLoggingBehavior: or disableLogginBehavior:</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSettings.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareAPI.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareAPI.html
deleted file mode 100644
index a98d6c957bef..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareAPI.html	
+++ /dev/null
@@ -1,656 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareAPI Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareAPI Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/accessToken">&nbsp;&nbsp;&nbsp;&nbsp;accessToken</option>
-	
-	<option value="//api/name/graphNode">&nbsp;&nbsp;&nbsp;&nbsp;graphNode</option>
-	
-	<option value="//api/name/message">&nbsp;&nbsp;&nbsp;&nbsp;message</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/shareWithContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ shareWithContent:delegate:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShare">&nbsp;&nbsp;&nbsp;&nbsp;- canShare</option>
-	
-	<option value="//api/name/createOpenGraphObject:">&nbsp;&nbsp;&nbsp;&nbsp;- createOpenGraphObject:</option>
-	
-	<option value="//api/name/share">&nbsp;&nbsp;&nbsp;&nbsp;- share</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/accessToken">accessToken</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/graphNode">graphNode</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/message">message</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareWithContent:delegate:">shareWithContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShare">canShare</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/createOpenGraphObject:">createOpenGraphObject:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/share">share</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareAPI Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareAPI Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharing.html">FBSDKSharing</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareAPI.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A utility class for sharing through the graph API.  Using this class requires an access token that
-has been granted the &ldquo;publish_actions&rdquo; permission.</p>
-
-<p>FBSDKShareAPI network requests are scheduled on the current run loop in the default run loop mode
-(like NSURLConnection). If you want to use FBSDKShareAPI in a background thread, you must manage the run loop
-yourself.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareWithContent:delegate:">+&nbsp;shareWithContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/message">&nbsp;&nbsp;message</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/graphNode">&nbsp;&nbsp;graphNode</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/accessToken">&nbsp;&nbsp;accessToken</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShare">&ndash;&nbsp;canShare</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/createOpenGraphObject:">&ndash;&nbsp;createOpenGraphObject:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/share">&ndash;&nbsp;share</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/accessToken" title="accessToken"></a>
-	<h3 class="subsubtitle method-title">accessToken</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The access token used when performing a share. The access token must have the &ldquo;publish_actions&rdquo;
-permission granted.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) FBSDKAccessToken *accessToken</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Defaults to [FBSDKAccessToken currentAccessToken]. Setting this to nil will revert the access token to
-[FBSDKAccessToken currentAccessToken].</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/graphNode" title="graphNode"></a>
-	<h3 class="subsubtitle method-title">graphNode</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The graph node to which content should be shared.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *graphNode</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/message" title="message"></a>
-	<h3 class="subsubtitle method-title">message</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The message the person has provided through the custom dialog that will accompany the share content.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *message</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/shareWithContent:delegate:" title="shareWithContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">shareWithContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build up a share API with content and a delegate.
-- Parameter content: The content to be shared.
-- Parameter delegate: The receiver&rsquo;s delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)shareWithContent:(id&lt;FBSDKSharingContent&gt;)<em>content</em> delegate:(id&lt;FBSDKSharingDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShare" title="canShare"></a>
-	<h3 class="subsubtitle method-title">canShare</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A Boolean value that indicates whether the receiver can send the share.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShare</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>May return NO if the appropriate Facebook app is not installed and is required or an access token is
-required but not available.  This method does not validate the content on the receiver, so this can be checked before
-building up the content.</p>
-
-<ul>
-<li>See:[FBSDKSharing validateWithError:]</li>
-<li>Returns: YES if the receiver can send, otherwise NO.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/createOpenGraphObject:" title="createOpenGraphObject:"></a>
-	<h3 class="subsubtitle method-title">createOpenGraphObject:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Creates an User Owned Open Graph object without an action.
-- Parameter openGraphObject: The open graph object to create.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)createOpenGraphObject:(FBSDKShareOpenGraphObject *)<em>openGraphObject</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Use this method to create an object alone, when an action is not going to be posted with the object.  If
-the object will be used within an action, just put the object in the action and share that as the shareContent and the
-object will be created in the process.  The delegate will be messaged with the results.</p>
-
-<p>Also see https://developers.facebook.com/docs/sharing/opengraph/object-api#objectapi-creatinguser</p>
-
-<ul>
-<li>Returns: YES if the receiver was able to send the request to create the object, otherwise NO.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/share" title="share"></a>
-	<h3 class="subsubtitle method-title">share</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Begins the send from the receiver.
-- Returns: YES if the receiver was able to send the share, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)share</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareAPI.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareButton.html
deleted file mode 100644
index bfa0fbc6d546..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareButton.html	
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareButton Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareButton Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareButton Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareButton Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKButton.html">FBSDKButton</a> : UIButton</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingButton.html">FBSDKSharingButton</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A button to share content.</p>
-
-<p>Tapping the receiver will invoke the FBSDKShareDialog with the attached shareContent.  If the dialog cannot
-be shown, the button will be disabled.</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareDialog.html
deleted file mode 100644
index 0ad1014f4221..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareDialog.html	
+++ /dev/null
@@ -1,429 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareDialog Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareDialog Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/fromViewController">&nbsp;&nbsp;&nbsp;&nbsp;fromViewController</option>
-	
-	<option value="//api/name/mode">&nbsp;&nbsp;&nbsp;&nbsp;mode</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/showFromViewController:withContent:delegate:">&nbsp;&nbsp;&nbsp;&nbsp;+ showFromViewController:withContent:delegate:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/fromViewController">fromViewController</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mode">mode</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/showFromViewController:withContent:delegate:">showFromViewController:withContent:delegate:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareDialog Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareDialog Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingDialog.html">FBSDKSharingDialog</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A dialog for sharing content on Facebook.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/showFromViewController:withContent:delegate:">+&nbsp;showFromViewController:withContent:delegate:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/fromViewController">&nbsp;&nbsp;fromViewController</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mode">&nbsp;&nbsp;mode</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/fromViewController" title="fromViewController"></a>
-	<h3 class="subsubtitle method-title">fromViewController</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A UIViewController to present the dialog from.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) UIViewController *fromViewController</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not specified, the top most view controller will be automatically determined as best as possible.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/mode" title="mode"></a>
-	<h3 class="subsubtitle method-title">mode</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The mode with which to display the dialog.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKShareDialogMode mode</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Defaults to FBSDKShareDialogModeAutomatic, which will automatically choose the best available mode.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/showFromViewController:withContent:delegate:" title="showFromViewController:withContent:delegate:"></a>
-	<h3 class="subsubtitle method-title">showFromViewController:withContent:delegate:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to show an FBSDKShareDialog with a fromViewController, content and a delegate.
-- Parameter viewController: A UIViewController to present the dialog from, if appropriate.
-- Parameter content: The content to be shared.
-- Parameter delegate: The receiver&rsquo;s delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)showFromViewController:(UIViewController *)<em>viewController</em> withContent:(id&lt;FBSDKSharingContent&gt;)<em>content</em> delegate:(id&lt;FBSDKSharingDelegate&gt;)<em>delegate</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareLinkContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareLinkContent.html
deleted file mode 100644
index 3be2cdfd494a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareLinkContent.html	
+++ /dev/null
@@ -1,530 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareLinkContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareLinkContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/contentDescription">&nbsp;&nbsp;&nbsp;&nbsp;contentDescription</option>
-	
-	<option value="//api/name/contentTitle">&nbsp;&nbsp;&nbsp;&nbsp;contentTitle</option>
-	
-	<option value="//api/name/imageURL">&nbsp;&nbsp;&nbsp;&nbsp;imageURL</option>
-	
-	<option value="//api/name/quote">&nbsp;&nbsp;&nbsp;&nbsp;quote</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareLinkContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareLinkContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/contentDescription">contentDescription</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/contentTitle">contentTitle</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/imageURL">imageURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/quote">quote</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareLinkContent:">isEqualToShareLinkContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareLinkContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareLinkContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareLinkContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for status and link content to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/contentDescription">&nbsp;&nbsp;contentDescription</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/contentTitle">&nbsp;&nbsp;contentTitle</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/imageURL">&nbsp;&nbsp;imageURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/quote">&nbsp;&nbsp;quote</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareLinkContent:">&ndash;&nbsp;isEqualToShareLinkContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/contentDescription" title="contentDescription"></a>
-	<h3 class="subsubtitle method-title">contentDescription</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The description of the link.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *contentDescription</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If not specified, this field is automatically populated by information scraped from the contentURL,
-typically the title of the page.  This value may be discarded for specially handled links (ex: iTunes URLs).
-- Returns: The description of the link</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareLinkContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/contentTitle" title="contentTitle"></a>
-	<h3 class="subsubtitle method-title">contentTitle</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The title to display for this link.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *contentTitle</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This value may be discarded for specially handled links (ex: iTunes URLs).
-- Returns: The link title</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareLinkContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/imageURL" title="imageURL"></a>
-	<h3 class="subsubtitle method-title">imageURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The URL of a picture to attach to this content.
-- Returns: The network URL of an image</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *imageURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareLinkContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/quote" title="quote"></a>
-	<h3 class="subsubtitle method-title">quote</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Some quote text of the link.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *quote</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If specified, the quote text will render with custom styling on top of the link.
-- Returns: The quote text of a link</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareLinkContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareLinkContent:" title="isEqualToShareLinkContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareLinkContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another link content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareLinkContent:(FBSDKShareLinkContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareLinkContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareMediaContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareMediaContent.html
deleted file mode 100644
index b1d6f58771fd..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareMediaContent.html	
+++ /dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareMediaContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareMediaContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/media">&nbsp;&nbsp;&nbsp;&nbsp;media</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareMediaContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareMediaContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/media">media</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareMediaContent:">isEqualToShareMediaContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareMediaContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareMediaContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareMediaContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for media content (photo or video) to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/media">&nbsp;&nbsp;media</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareMediaContent:">&ndash;&nbsp;isEqualToShareMediaContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/media" title="media"></a>
-	<h3 class="subsubtitle method-title">media</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Media to be shared.
-- Returns: Array of the media (FBSDKSharePhoto or FBSDKShareVideo)</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *media</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareMediaContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareMediaContent:" title="isEqualToShareMediaContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareMediaContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another media content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareMediaContent:(FBSDKShareMediaContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareMediaContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphAction.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphAction.html
deleted file mode 100644
index 915713ae931c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphAction.html	
+++ /dev/null
@@ -1,535 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareOpenGraphAction Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareOpenGraphAction Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/actionType">&nbsp;&nbsp;&nbsp;&nbsp;actionType</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/actionWithType:object:key:">&nbsp;&nbsp;&nbsp;&nbsp;+ actionWithType:object:key:</option>
-	
-	<option value="//api/name/actionWithType:objectID:key:">&nbsp;&nbsp;&nbsp;&nbsp;+ actionWithType:objectID:key:</option>
-	
-	<option value="//api/name/actionWithType:objectURL:key:">&nbsp;&nbsp;&nbsp;&nbsp;+ actionWithType:objectURL:key:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareOpenGraphAction:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareOpenGraphAction:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/actionType">actionType</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/actionWithType:object:key:">actionWithType:object:key:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/actionWithType:objectID:key:">actionWithType:objectID:key:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/actionWithType:objectURL:key:">actionWithType:objectURL:key:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareOpenGraphAction:">isEqualToShareOpenGraphAction:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareOpenGraphAction Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareOpenGraphAction Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKShareOpenGraphValueContainer.html">FBSDKShareOpenGraphValueContainer</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareOpenGraphAction.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  An Open Graph Action for sharing.</p>
-
-<p>The property keys MUST have namespaces specified on them, such as <code>og:image</code>.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/actionWithType:object:key:">+&nbsp;actionWithType:object:key:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/actionWithType:objectID:key:">+&nbsp;actionWithType:objectID:key:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/actionWithType:objectURL:key:">+&nbsp;actionWithType:objectURL:key:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/actionType">&nbsp;&nbsp;actionType</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareOpenGraphAction:">&ndash;&nbsp;isEqualToShareOpenGraphAction:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/actionType" title="actionType"></a>
-	<h3 class="subsubtitle method-title">actionType</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets the action type.
-- Returns: The action type</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *actionType</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphAction.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/actionWithType:object:key:" title="actionWithType:object:key:"></a>
-	<h3 class="subsubtitle method-title">actionWithType:object:key:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new action and set the object for the specified key.
-- Parameter actionType: The action type of the receiver
-- Parameter object: The Open Graph object represented by this action
-- Parameter key: The key for the object</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)actionWithType:(NSString *)<em>actionType</em> object:(FBSDKShareOpenGraphObject *)<em>object</em> key:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphAction.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/actionWithType:objectID:key:" title="actionWithType:objectID:key:"></a>
-	<h3 class="subsubtitle method-title">actionWithType:objectID:key:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new action and set the object for the specified key.
-- Parameter actionType: The action type of the receiver
-- Parameter objectID: The ID of an existing Open Graph object
-- Parameter key: The key for the object</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)actionWithType:(NSString *)<em>actionType</em> objectID:(NSString *)<em>objectID</em> key:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphAction.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/actionWithType:objectURL:key:" title="actionWithType:objectURL:key:"></a>
-	<h3 class="subsubtitle method-title">actionWithType:objectURL:key:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new action and set the object for the specified key.
-- Parameter actionType: The action type of the receiver
-- Parameter objectURL: The URL to a page that defines the Open Graph object with meta tags
-- Parameter key: The key for the object</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)actionWithType:(NSString *)<em>actionType</em> objectURL:(NSURL *)<em>objectURL</em> key:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphAction.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareOpenGraphAction:" title="isEqualToShareOpenGraphAction:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareOpenGraphAction:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another Open Graph Action.
-- Parameter action: The other action
-- Returns: YES if the receiver&rsquo;s values are equal to the other action&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareOpenGraphAction:(FBSDKShareOpenGraphAction *)<em>action</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphAction.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphContent.html
deleted file mode 100644
index 38ecbc7d28fb..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphContent.html	
+++ /dev/null
@@ -1,425 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareOpenGraphContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareOpenGraphContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/action">&nbsp;&nbsp;&nbsp;&nbsp;action</option>
-	
-	<option value="//api/name/previewPropertyName">&nbsp;&nbsp;&nbsp;&nbsp;previewPropertyName</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareOpenGraphContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareOpenGraphContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/action">action</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/previewPropertyName">previewPropertyName</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareOpenGraphContent:">isEqualToShareOpenGraphContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareOpenGraphContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareOpenGraphContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareOpenGraphContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for Open Graph content to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/action">&nbsp;&nbsp;action</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/previewPropertyName">&nbsp;&nbsp;previewPropertyName</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareOpenGraphContent:">&ndash;&nbsp;isEqualToShareOpenGraphContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/action" title="action"></a>
-	<h3 class="subsubtitle method-title">action</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Open Graph Action to be shared.
-- Returns: The action</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKShareOpenGraphAction *action</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/previewPropertyName" title="previewPropertyName"></a>
-	<h3 class="subsubtitle method-title">previewPropertyName</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Property name that points to the primary Open Graph Object in the action.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *previewPropertyName</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>The value that this action points to will be use for rendering the preview for the share.
-- Returns: The property name for the Open Graph Object in the action</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareOpenGraphContent:" title="isEqualToShareOpenGraphContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareOpenGraphContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another Open Graph content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareOpenGraphContent:(FBSDKShareOpenGraphContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphObject.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphObject.html
deleted file mode 100644
index 6c9fd3880ebe..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphObject.html	
+++ /dev/null
@@ -1,389 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareOpenGraphObject Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareOpenGraphObject Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/objectWithProperties:">&nbsp;&nbsp;&nbsp;&nbsp;+ objectWithProperties:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareOpenGraphObject:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareOpenGraphObject:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectWithProperties:">objectWithProperties:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareOpenGraphObject:">isEqualToShareOpenGraphObject:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareOpenGraphObject Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareOpenGraphObject Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value"><a href="../Classes/FBSDKShareOpenGraphValueContainer.html">FBSDKShareOpenGraphValueContainer</a> : NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareOpenGraphObject.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  An Open Graph Object for sharing.</p>
-
-<p>The property keys MUST have namespaces specified on them, such as <code>og:image</code>,
-  and <code>og:type</code> is required.</p>
-
-<p>See https://developers.facebook.com/docs/sharing/opengraph/object-properties for other properties.</p>
-
-<p>You can specify nested namespaces inline to define complex properties. For example, the following
-code will generate a fitness.course object with a location:</p>
-
-<p>FBSDKShareOpenGraphObject *course = [FBSDKShareOpenGraphObject objectWithProperties:
-  @{
-    @&ldquo;og:type&rdquo;: @&ldquo;fitness.course&rdquo;,
-    @&ldquo;og:title&rdquo;: @&ldquo;Sample course&rdquo;,
-    @&ldquo;fitness:metrics:location:latitude&rdquo;: @&ldquo;41.40338&rdquo;,
-    @&ldquo;fitness:metrics:location:longitude&rdquo;: @&ldquo;2.17403&rdquo;,
-}];</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectWithProperties:">+&nbsp;objectWithProperties:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareOpenGraphObject:">&ndash;&nbsp;isEqualToShareOpenGraphObject:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/objectWithProperties:" title="objectWithProperties:"></a>
-	<h3 class="subsubtitle method-title">objectWithProperties:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new action and set the object for the specified key.
-- Parameter properties: Properties for the Open Graph object, which will be parsed into the proper models</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)objectWithProperties:(NSDictionary *)<em>properties</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphObject.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareOpenGraphObject:" title="isEqualToShareOpenGraphObject:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareOpenGraphObject:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another Open Graph Object.
-- Parameter object: The other object
-- Returns: YES if the receiver&rsquo;s values are equal to the other object&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareOpenGraphObject:(FBSDKShareOpenGraphObject *)<em>object</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphObject.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphValueContainer.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphValueContainer.html
deleted file mode 100644
index 371d76661440..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareOpenGraphValueContainer.html	
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareOpenGraphValueContainer Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareOpenGraphValueContainer Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-
-
-
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareOpenGraphValueContainer Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareOpenGraphValueContainer Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKShareOpenGraphValueContaining.html">FBSDKShareOpenGraphValueContaining</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareOpenGraphValueContainer.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A base class to container Open Graph values.</p>
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhoto.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhoto.html
deleted file mode 100644
index bff91549b8c0..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhoto.html	
+++ /dev/null
@@ -1,633 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharePhoto Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharePhoto Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/caption">&nbsp;&nbsp;&nbsp;&nbsp;caption</option>
-	
-	<option value="//api/name/image">&nbsp;&nbsp;&nbsp;&nbsp;image</option>
-	
-	<option value="//api/name/imageURL">&nbsp;&nbsp;&nbsp;&nbsp;imageURL</option>
-	
-	<option value="//api/name/userGenerated">&nbsp;&nbsp;&nbsp;&nbsp;userGenerated</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/photoWithImage:userGenerated:">&nbsp;&nbsp;&nbsp;&nbsp;+ photoWithImage:userGenerated:</option>
-	
-	<option value="//api/name/photoWithImageURL:userGenerated:">&nbsp;&nbsp;&nbsp;&nbsp;+ photoWithImageURL:userGenerated:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToSharePhoto:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToSharePhoto:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/caption">caption</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/image">image</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/imageURL">imageURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/userGenerated">userGenerated</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/photoWithImage:userGenerated:">photoWithImage:userGenerated:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/photoWithImageURL:userGenerated:">photoWithImageURL:userGenerated:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToSharePhoto:">isEqualToSharePhoto:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharePhoto Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharePhoto Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharePhoto.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A photo for sharing.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/photoWithImage:userGenerated:">+&nbsp;photoWithImage:userGenerated:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/photoWithImageURL:userGenerated:">+&nbsp;photoWithImageURL:userGenerated:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/image">&nbsp;&nbsp;image</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/imageURL">&nbsp;&nbsp;imageURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/userGenerated">&nbsp;&nbsp;userGenerated</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToSharePhoto:">&ndash;&nbsp;isEqualToSharePhoto:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/caption">&nbsp;&nbsp;caption</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/caption" title="caption"></a>
-	<h3 class="subsubtitle method-title">caption</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The user generated caption for the photo. Note that the &lsquo;caption&rsquo; must come from
-* the user, as pre-filled content is forbidden by the Platform Policies (2.3).
-- Returns: the Photo&rsquo;s caption if exists else returns null.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *caption</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/image" title="image"></a>
-	<h3 class="subsubtitle method-title">image</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  If the photo is resident in memory, this method supplies the data.
-- Returns: UIImage representation of the photo</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) UIImage *image</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/imageURL" title="imageURL"></a>
-	<h3 class="subsubtitle method-title">imageURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The URL to the photo.
-- Returns: URL that points to a network location or the location of the photo on disk</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *imageURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/userGenerated" title="userGenerated"></a>
-	<h3 class="subsubtitle method-title">userGenerated</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Specifies whether the photo represented by the receiver was generated by the user or by the application.
-- Returns: YES if the photo is user-generated, otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, getter=isUserGenerated) BOOL userGenerated</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/photoWithImage:userGenerated:" title="photoWithImage:userGenerated:"></a>
-	<h3 class="subsubtitle method-title">photoWithImage:userGenerated:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new photo object with an image.
-- Parameter image: If the photo is resident in memory, this method supplies the data
-- Parameter userGenerated: Specifies whether the photo represented by the receiver was generated by the user or by the
-application</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)photoWithImage:(UIImage *)<em>image</em> userGenerated:(BOOL)<em>userGenerated</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/photoWithImageURL:userGenerated:" title="photoWithImageURL:userGenerated:"></a>
-	<h3 class="subsubtitle method-title">photoWithImageURL:userGenerated:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new photo object with an imageURL.
-- Parameter imageURL: The URL to the photo
-- Parameter userGenerated: Specifies whether the photo represented by the receiver was generated by the user or by the
-application</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)photoWithImageURL:(NSURL *)<em>imageURL</em> userGenerated:(BOOL)<em>userGenerated</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This method should only be used when adding photo content to open graph stories.
-  For example, if you&rsquo;re trying to share a photo from the web by itself, download the image and use
-  <code>photoWithImage:userGenerated:</code> instead.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToSharePhoto:" title="isEqualToSharePhoto:"></a>
-	<h3 class="subsubtitle method-title">isEqualToSharePhoto:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another photo.
-- Parameter photo: The other photo
-- Returns: YES if the receiver&rsquo;s values are equal to the other photo&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToSharePhoto:(FBSDKSharePhoto *)<em>photo</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhoto.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhotoContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhotoContent.html
deleted file mode 100644
index 8496421c0f4b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKSharePhotoContent.html	
+++ /dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharePhotoContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharePhotoContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/photos">&nbsp;&nbsp;&nbsp;&nbsp;photos</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToSharePhotoContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToSharePhotoContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/photos">photos</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToSharePhotoContent:">isEqualToSharePhotoContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharePhotoContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharePhotoContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharePhotoContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for photo content to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/photos">&nbsp;&nbsp;photos</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToSharePhotoContent:">&ndash;&nbsp;isEqualToSharePhotoContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/photos" title="photos"></a>
-	<h3 class="subsubtitle method-title">photos</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Photos to be shared.
-- Returns: Array of the photos (FBSDKSharePhoto)</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *photos</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhotoContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToSharePhotoContent:" title="isEqualToSharePhotoContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToSharePhotoContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another photo content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToSharePhotoContent:(FBSDKSharePhotoContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharePhotoContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideo.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideo.html
deleted file mode 100644
index e88e6e371cbf..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideo.html	
+++ /dev/null
@@ -1,528 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareVideo Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareVideo Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/previewPhoto">&nbsp;&nbsp;&nbsp;&nbsp;previewPhoto</option>
-	
-	<option value="//api/name/videoURL">&nbsp;&nbsp;&nbsp;&nbsp;videoURL</option>
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/videoWithVideoURL:">&nbsp;&nbsp;&nbsp;&nbsp;+ videoWithVideoURL:</option>
-	
-	<option value="//api/name/videoWithVideoURL:previewPhoto:">&nbsp;&nbsp;&nbsp;&nbsp;+ videoWithVideoURL:previewPhoto:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareVideo:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareVideo:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/previewPhoto">previewPhoto</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/videoURL">videoURL</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/videoWithVideoURL:">videoWithVideoURL:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/videoWithVideoURL:previewPhoto:">videoWithVideoURL:previewPhoto:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareVideo:">isEqualToShareVideo:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareVideo Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareVideo Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareVideo.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A video for sharing.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/videoWithVideoURL:">+&nbsp;videoWithVideoURL:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/videoWithVideoURL:previewPhoto:">+&nbsp;videoWithVideoURL:previewPhoto:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/videoURL">&nbsp;&nbsp;videoURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/previewPhoto">&nbsp;&nbsp;previewPhoto</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareVideo:">&ndash;&nbsp;isEqualToShareVideo:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/previewPhoto" title="previewPhoto"></a>
-	<h3 class="subsubtitle method-title">previewPhoto</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The photo that represents the video.
-- Returns: The photo</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKSharePhoto *previewPhoto</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideo.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/videoURL" title="videoURL"></a>
-	<h3 class="subsubtitle method-title">videoURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The file URL to the video.
-- Returns: URL that points to the location of the video on disk</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *videoURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideo.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/videoWithVideoURL:" title="videoWithVideoURL:"></a>
-	<h3 class="subsubtitle method-title">videoWithVideoURL:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new video object with a videoURL.
-- Parameter videoURL: The URL to the video</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)videoWithVideoURL:(NSURL *)<em>videoURL</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideo.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/videoWithVideoURL:previewPhoto:" title="videoWithVideoURL:previewPhoto:"></a>
-	<h3 class="subsubtitle method-title">videoWithVideoURL:previewPhoto:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Convenience method to build a new video object with a videoURL and a previewPhoto
-- Parameter videoURL: The URL to the video
-- Parameter previewPhoto: The photo that represents the video</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)videoWithVideoURL:(NSURL *)<em>videoURL</em> previewPhoto:(FBSDKSharePhoto *)<em>previewPhoto</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideo.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareVideo:" title="isEqualToShareVideo:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareVideo:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another video.
-- Parameter video: The other video
-- Returns: YES if the receiver&rsquo;s values are equal to the other video&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareVideo:(FBSDKShareVideo *)<em>video</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideo.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideoContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideoContent.html
deleted file mode 100644
index 73301fd3eacc..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKShareVideoContent.html	
+++ /dev/null
@@ -1,420 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareVideoContent Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareVideoContent Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/previewPhoto">&nbsp;&nbsp;&nbsp;&nbsp;previewPhoto</option>
-	
-	<option value="//api/name/video">&nbsp;&nbsp;&nbsp;&nbsp;video</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/isEqualToShareVideoContent:">&nbsp;&nbsp;&nbsp;&nbsp;- isEqualToShareVideoContent:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/previewPhoto">previewPhoto</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/video">video</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/isEqualToShareVideoContent:">isEqualToShareVideoContent:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareVideoContent Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareVideoContent Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareVideoContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A model for video content to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/previewPhoto">&nbsp;&nbsp;previewPhoto</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/video">&nbsp;&nbsp;video</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/isEqualToShareVideoContent:">&ndash;&nbsp;isEqualToShareVideoContent:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/previewPhoto" title="previewPhoto"></a>
-	<h3 class="subsubtitle method-title">previewPhoto</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The photo that represents the video.
-- Returns: The photo</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKSharePhoto *previewPhoto</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideoContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/video" title="video"></a>
-	<h3 class="subsubtitle method-title">video</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The video to be shared.
-- Returns: The video</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKShareVideo *video</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideoContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/isEqualToShareVideoContent:" title="isEqualToShareVideoContent:"></a>
-	<h3 class="subsubtitle method-title">isEqualToShareVideoContent:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Compares the receiver to another video content.
-- Parameter content: The other content
-- Returns: YES if the receiver&rsquo;s values are equal to the other content&rsquo;s values; otherwise NO</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)isEqualToShareVideoContent:(FBSDKShareVideoContent *)<em>content</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareVideoContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTestUsersManager.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTestUsersManager.html
deleted file mode 100644
index fcc21974d9c4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTestUsersManager.html	
+++ /dev/null
@@ -1,538 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTestUsersManager Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTestUsersManager Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/sharedInstanceForAppID:appSecret:">&nbsp;&nbsp;&nbsp;&nbsp;+ sharedInstanceForAppID:appSecret:</option>
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/addTestAccountWithPermissions:completionHandler:">&nbsp;&nbsp;&nbsp;&nbsp;- addTestAccountWithPermissions:completionHandler:</option>
-	
-	<option value="//api/name/makeFriendsWithFirst:second:callback:">&nbsp;&nbsp;&nbsp;&nbsp;- makeFriendsWithFirst:second:callback:</option>
-	
-	<option value="//api/name/removeTestAccount:completionHandler:">&nbsp;&nbsp;&nbsp;&nbsp;- removeTestAccount:completionHandler:</option>
-	
-	<option value="//api/name/requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:">&nbsp;&nbsp;&nbsp;&nbsp;- requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sharedInstanceForAppID:appSecret:">sharedInstanceForAppID:appSecret:</a></span></li>
-	
-</ul></li>
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/addTestAccountWithPermissions:completionHandler:">addTestAccountWithPermissions:completionHandler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/makeFriendsWithFirst:second:callback:">makeFriendsWithFirst:second:callback:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/removeTestAccount:completionHandler:">removeTestAccount:completionHandler:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:">requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTestUsersManager Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTestUsersManager Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTestUsersManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Provides methods for managing test accounts for testing Facebook integration.</p>
-
-<p>Facebook allows developers to create test accounts for testing their applications'
-Facebook integration (see https://developers.facebook.com/docs/test_users/). This class
-simplifies use of these accounts for writing tests. It is not designed for use in
-production application code.</p>
-
-<p>This class will make Graph API calls on behalf of your app to manage test accounts and requires
-an app id and app secret. You will typically use this class to write unit or integration tests.
-Make sure you NEVER include your app secret in your production app.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sharedInstanceForAppID:appSecret:">+&nbsp;sharedInstanceForAppID:appSecret:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:">&ndash;&nbsp;requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/addTestAccountWithPermissions:completionHandler:">&ndash;&nbsp;addTestAccountWithPermissions:completionHandler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/removeTestAccount:completionHandler:">&ndash;&nbsp;removeTestAccount:completionHandler:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/makeFriendsWithFirst:second:callback:">&ndash;&nbsp;makeFriendsWithFirst:second:callback:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/sharedInstanceForAppID:appSecret:" title="sharedInstanceForAppID:appSecret:"></a>
-	<h3 class="subsubtitle method-title">sharedInstanceForAppID:appSecret:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  construct or return the shared instance
-- Parameter appID: the Facebook app id
-- Parameter appSecret: the Facebook app secret</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (instancetype)sharedInstanceForAppID:(NSString *)<em>appID</em> appSecret:(NSString *)<em>appSecret</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/addTestAccountWithPermissions:completionHandler:" title="addTestAccountWithPermissions:completionHandler:"></a>
-	<h3 class="subsubtitle method-title">addTestAccountWithPermissions:completionHandler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  add a test account with the specified permissions
-- Parameter permissions: the set of permissions, e.g., [NSSet setWithObjects:@&ldquo;email&rdquo;, @&ldquo;user_friends&rdquo;]
-- Parameter handler: the callback handler</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)addTestAccountWithPermissions:(NSSet *)<em>permissions</em> completionHandler:(FBSDKTestUsersManagerRetrieveTestAccountTokensHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/makeFriendsWithFirst:second:callback:" title="makeFriendsWithFirst:second:callback:"></a>
-	<h3 class="subsubtitle method-title">makeFriendsWithFirst:second:callback:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Make two test users friends with each other.
-- Parameter first: the token of the first user
-- Parameter second: the token of the second user
-- Parameter callback: the callback handler</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)makeFriendsWithFirst:(FBSDKAccessToken *)<em>first</em> second:(FBSDKAccessToken *)<em>second</em> callback:(void ( ^ ) ( NSError *))<em>callback</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/removeTestAccount:completionHandler:" title="removeTestAccount:completionHandler:"></a>
-	<h3 class="subsubtitle method-title">removeTestAccount:completionHandler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  remove a test account for the given user id
-- Parameter userId: the user id
-- Parameter handler: the callback handler</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)removeTestAccount:(NSString *)<em>userId</em> completionHandler:(FBSDKTestUsersManagerRemoveTestAccountHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:" title="requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:"></a>
-	<h3 class="subsubtitle method-title">requestTestAccountTokensWithArraysOfPermissions:createIfNotFound:completionHandler:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  retrieve FBSDKAccessToken instances for test accounts with the specific permissions.
-- Parameter arraysOfPermissions: an array of permissions sets, such as @[ [NSSet setWithObject:@&ldquo;email&rdquo;], [NSSet setWithObject:@&ldquo;user_birthday&rdquo;]]
-if you needed two test accounts with email and birthday permissions, respectively. You can pass in empty nested sets
-if you need two arbitrary test accounts. For convenience, passing nil is treated as @[ [NSSet set] ]
-for fetching a single test user.
-- Parameter createIfNotFound: if YES, new test accounts are created if no test accounts existed that fit the permissions
-requirement
-- Parameter handler: the callback to invoke which will return an array of <code>FBAccessTokenData</code> instances or an <code>NSError</code>.
-If param <code>createIfNotFound</code> is NO, the array may contain <code>[NSNull null]</code> instances.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)requestTestAccountTokensWithArraysOfPermissions:(NSArray *)<em>arraysOfPermissions</em> createIfNotFound:(BOOL)<em>createIfNotFound</em> completionHandler:(FBSDKTestUsersManagerRetrieveTestAccountTokensHandler)<em>handler</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If you are requesting test accounts with differing number of permissions, try to order
-<code>arrayOfPermissionsArrays</code> so that the most number of permissions come first to minimize creation of new
-test accounts.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTestUsersManager.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTooltipView.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTooltipView.html
deleted file mode 100644
index 86abe6ad2963..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKTooltipView.html	
+++ /dev/null
@@ -1,697 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTooltipView Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTooltipView Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/colorStyle">&nbsp;&nbsp;&nbsp;&nbsp;colorStyle</option>
-	
-	<option value="//api/name/displayDuration">&nbsp;&nbsp;&nbsp;&nbsp;displayDuration</option>
-	
-	<option value="//api/name/message">&nbsp;&nbsp;&nbsp;&nbsp;message</option>
-	
-	<option value="//api/name/tagline">&nbsp;&nbsp;&nbsp;&nbsp;tagline</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/dismiss">&nbsp;&nbsp;&nbsp;&nbsp;- dismiss</option>
-	
-	<option value="//api/name/initWithTagline:message:colorStyle:">&nbsp;&nbsp;&nbsp;&nbsp;- initWithTagline:message:colorStyle:</option>
-	
-	<option value="//api/name/presentFromView:">&nbsp;&nbsp;&nbsp;&nbsp;- presentFromView:</option>
-	
-	<option value="//api/name/presentInView:withArrowPosition:direction:">&nbsp;&nbsp;&nbsp;&nbsp;- presentInView:withArrowPosition:direction:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/colorStyle">colorStyle</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/displayDuration">displayDuration</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/message">message</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/tagline">tagline</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/dismiss">dismiss</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/initWithTagline:message:colorStyle:">initWithTagline:message:colorStyle:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/presentFromView:">presentFromView:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/presentInView:withArrowPosition:direction:">presentInView:withArrowPosition:direction:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTooltipView Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTooltipView Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">UIView</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTooltipView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Tooltip bubble with text in it used to display tips for UI elements,
-with a pointed arrow (to refer to the UI element).</p>
-
-<p>The tooltip fades in and will automatically fade out. See <code>displayDuration</code>.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/displayDuration">&nbsp;&nbsp;displayDuration</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/colorStyle">&nbsp;&nbsp;colorStyle</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/message">&nbsp;&nbsp;message</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/tagline">&nbsp;&nbsp;tagline</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/initWithTagline:message:colorStyle:">&ndash;&nbsp;initWithTagline:message:colorStyle:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/presentFromView:">&ndash;&nbsp;presentFromView:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/presentInView:withArrowPosition:direction:">&ndash;&nbsp;presentInView:withArrowPosition:direction:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/dismiss">&ndash;&nbsp;dismiss</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/colorStyle" title="colorStyle"></a>
-	<h3 class="subsubtitle method-title">colorStyle</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the color style after initialization.
-Defaults to value passed to -initWithTagline:message:colorStyle:.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKTooltipColorStyle colorStyle</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/displayDuration" title="displayDuration"></a>
-	<h3 class="subsubtitle method-title">displayDuration</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the amount of time in seconds the tooltip should be displayed.
-Set this to zero to make the display permanent until explicitly dismissed.
-Defaults to six seconds.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) CFTimeInterval displayDuration</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/message" title="message"></a>
-	<h3 class="subsubtitle method-title">message</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the message.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *message</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/tagline" title="tagline"></a>
-	<h3 class="subsubtitle method-title">tagline</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets or sets the optional phrase that comprises the first part of the label (and is highlighted differently).</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *tagline</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/dismiss" title="dismiss"></a>
-	<h3 class="subsubtitle method-title">dismiss</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Remove tooltip manually.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)dismiss</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Calling this method isn&rsquo;t necessary - tooltip will dismiss itself automatically after the <code>displayDuration</code>.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/initWithTagline:message:colorStyle:" title="initWithTagline:message:colorStyle:"></a>
-	<h3 class="subsubtitle method-title">initWithTagline:message:colorStyle:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Designated initializer.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (instancetype)initWithTagline:(NSString *)<em>tagline</em> message:(NSString *)<em>message</em> colorStyle:(FBSDKTooltipColorStyle)<em>colorStyle</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter tagline: First part of the label, that will be highlighted with different color. Can be nil.</p></li>
-<li><p>Parameter message: Main message to display.</p></li>
-<li><p>Parameter colorStyle: Color style to use for tooltip.</p></li>
-</ul>
-
-
-<p>If you need to show a tooltip for login, consider using the <code>FBSDKLoginTooltipView</code> view.</p>
-
-<ul>
-<li>See:FBSDKLoginTooltipView</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/presentFromView:" title="presentFromView:"></a>
-	<h3 class="subsubtitle method-title">presentFromView:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Show tooltip at the top or at the bottom of given view.
-Tooltip will be added to anchorView.window.rootViewController.view</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)presentFromView:(UIView *)<em>anchorView</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter anchorView: view to show at, must be already added to window view hierarchy, in order to decide
-where tooltip will be shown. (If there&rsquo;s not enough space at the top of the anchorView in window bounds -
-tooltip will be shown at the bottom of it)</li>
-</ul>
-
-
-<p>Use this method to present the tooltip with automatic positioning or
-use -presentInView:withArrowPosition:direction: for manual positioning
-If anchorView is nil or has no window - this method does nothing.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/presentInView:withArrowPosition:direction:" title="presentInView:withArrowPosition:direction:"></a>
-	<h3 class="subsubtitle method-title">presentInView:withArrowPosition:direction:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Adds tooltip to given view, with given position and arrow direction.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)presentInView:(UIView *)<em>view</em> withArrowPosition:(CGPoint)<em>arrowPosition</em> direction:(FBSDKTooltipViewArrowDirection)<em>arrowDirection</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li><p>Parameter view: View to be used as superview.</p></li>
-<li><p>Parameter arrowPosition: Point in view&rsquo;s cordinates, where arrow will be pointing</p></li>
-<li><p>Parameter arrowDirection: whenever arrow should be pointing up (message bubble is below the arrow) or
-down (message bubble is above the arrow).</p></li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKUtility.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKUtility.html
deleted file mode 100644
index 9e7bbe23631f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Classes/FBSDKUtility.html	
+++ /dev/null
@@ -1,455 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKUtility Class Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKUtility Class Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	<option value="class_methods">Class Methods</option>
-	
-	<option value="//api/name/URLDecode:">&nbsp;&nbsp;&nbsp;&nbsp;+ URLDecode:</option>
-	
-	<option value="//api/name/URLEncode:">&nbsp;&nbsp;&nbsp;&nbsp;+ URLEncode:</option>
-	
-	<option value="//api/name/dictionaryWithQueryString:">&nbsp;&nbsp;&nbsp;&nbsp;+ dictionaryWithQueryString:</option>
-	
-	<option value="//api/name/queryStringWithDictionary:error:">&nbsp;&nbsp;&nbsp;&nbsp;+ queryStringWithDictionary:error:</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#class_methods">Class Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/URLDecode:">URLDecode:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/URLEncode:">URLEncode:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/dictionaryWithQueryString:">dictionaryWithQueryString:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/queryStringWithDictionary:error:">queryStringWithDictionary:error:</a></span></li>
-	
-</ul></li>
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKUtility Class Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKUtility Class Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Inherits from</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKUtility.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Class to contain common utility methods.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/dictionaryWithQueryString:">+&nbsp;dictionaryWithQueryString:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/queryStringWithDictionary:error:">+&nbsp;queryStringWithDictionary:error:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/URLDecode:">+&nbsp;URLDecode:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/URLEncode:">+&nbsp;URLEncode:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Class Methods" name="class_methods"></a>
-						<h2 class="subtitle subtitle-methods">Class Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/URLDecode:" title="URLDecode:"></a>
-	<h3 class="subsubtitle method-title">URLDecode:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Decodes a value from an URL.
-- Parameter value: The value to decode.
-- Returns: The decoded value.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)URLDecode:(NSString *)<em>value</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/URLEncode:" title="URLEncode:"></a>
-	<h3 class="subsubtitle method-title">URLEncode:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Encodes a value for an URL.
-- Parameter value: The value to encode.
-- Returns: The encoded value.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)URLEncode:(NSString *)<em>value</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/dictionaryWithQueryString:" title="dictionaryWithQueryString:"></a>
-	<h3 class="subsubtitle method-title">dictionaryWithQueryString:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Parses a query string into a dictionary.
-- Parameter queryString: The query string value.
-- Returns: A dictionary with the key/value pairs.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSDictionary *)dictionaryWithQueryString:(NSString *)<em>queryString</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/queryStringWithDictionary:error:" title="queryStringWithDictionary:error:"></a>
-	<h3 class="subsubtitle method-title">queryStringWithDictionary:error:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Constructs a query string from a dictionary.
-- Parameter dictionary: The dictionary with key/value pairs for the query string.
-- Parameter errorRef: If an error occurs, upon return contains an NSError object that describes the problem.
-- Returns: Query string representation of the parameters.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>+ (NSString *)queryStringWithDictionary:(NSDictionary *)<em>dictionary</em> error:(NSError *__autoreleasing *)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKUtility.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppEventsFlushBehavior.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppEventsFlushBehavior.html
deleted file mode 100644
index 7e4ef5f57b8e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppEventsFlushBehavior.html	
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppEventsFlushBehavior Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppEventsFlushBehavior Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppEventsFlushBehavior Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppEventsFlushBehavior Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppEvents.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKAppEventsFlushBehavior</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM (NSUInteger, FBSDKAppEventsFlushBehavior)</p>
-
-<p>  Specifies when <code>FBSDKAppEvents</code> sends log events to the server.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKAppEventsFlushBehavior ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppEventsFlushBehaviorAuto</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppEventsFlushBehaviorExplicitOnly</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKAppEventsFlushBehaviorAuto"></a><code>FBSDKAppEventsFlushBehaviorAuto</code></dt>
-<dd>
-
-
-<p>Flush automatically: periodically (once a minute or every 100 logged events) and always at app reactivation.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppEvents.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAppEventsFlushBehaviorExplicitOnly"></a><code>FBSDKAppEventsFlushBehaviorExplicitOnly</code></dt>
-<dd>
-
-
-<p>Only flush when the <code>flush</code> method is called. When an app is moved to background/terminated, the
-   events are persisted and re-established at activation, but they will only be written with an
-   explicit call to <code>flush</code>.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppEvents.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKAppEvents.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppGroupPrivacy.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppGroupPrivacy.html
deleted file mode 100644
index fbc495a3a8bd..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppGroupPrivacy.html	
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupPrivacy Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupPrivacy Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupPrivacy Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupPrivacy Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKAppGroupPrivacy</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKAppGroupPrivacy)
-  Specifies the privacy of a group.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKAppGroupPrivacy ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppGroupPrivacyOpen</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppGroupPrivacyClosed</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKAppGroupPrivacyOpen"></a><code>FBSDKAppGroupPrivacyOpen</code></dt>
-<dd>
-
-
-<p>Anyone can see the group, who&rsquo;s in it and what members post.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppGroupContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAppGroupPrivacyClosed"></a><code>FBSDKAppGroupPrivacyClosed</code></dt>
-<dd>
-
-
-<p>Anyone can see the group and who&rsquo;s in it, but only members can see posts.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppGroupContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKAppGroupContent.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppInviteDestination.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppInviteDestination.html
deleted file mode 100644
index db18da7f0d22..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKAppInviteDestination.html	
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppInviteDestination Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppInviteDestination Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppInviteDestination Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppInviteDestination Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppInviteContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKAppInviteDestination</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKAppInviteDestination)
-  Specifies the privacy of a group.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKAppInviteDestination ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppInviteDestinationFacebook</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppInviteDestinationMessenger</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKAppInviteDestinationFacebook"></a><code>FBSDKAppInviteDestinationFacebook</code></dt>
-<dd>
-
-
-<p>Deliver to Facebook.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppInviteContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAppInviteDestinationMessenger"></a><code>FBSDKAppInviteDestinationMessenger</code></dt>
-<dd>
-
-
-<p>Deliver to Messenger.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKAppInviteContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKAppInviteContent.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKDefaultAudience.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKDefaultAudience.html
deleted file mode 100644
index 2e1fc72592d7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKDefaultAudience.html	
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKDefaultAudience Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKDefaultAudience Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKDefaultAudience Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKDefaultAudience Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKDefaultAudience</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>FBSDKDefaultAudience enum</p>
-
-<p>  Passed to open to indicate which default audience to use for sessions that post data to Facebook.</p>
-
-<p>Certain operations such as publishing a status or publishing a photo require an audience. When the user
-grants an application permission to perform a publish operation, a default audience is selected as the
-publication ceiling for the application. This enumerated value allows the application to select which
-audience to ask the user to grant publish permission for.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKDefaultAudience ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKDefaultAudienceFriends</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKDefaultAudienceOnlyMe</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKDefaultAudienceEveryone</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKDefaultAudienceFriends"></a><code>FBSDKDefaultAudienceFriends</code></dt>
-<dd>
-
-
-<p>Indicates that the user&rsquo;s friends are able to see posts made by the application</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKDefaultAudienceOnlyMe"></a><code>FBSDKDefaultAudienceOnlyMe</code></dt>
-<dd>
-
-
-<p>Indicates that only the user is able to see posts made by the application</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKDefaultAudienceEveryone"></a><code>FBSDKDefaultAudienceEveryone</code></dt>
-<dd>
-
-
-<p>Indicates that all Facebook users are able to see posts made by the application</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKErrorCode.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKErrorCode.html
deleted file mode 100644
index 7d1c440c945f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKErrorCode.html	
+++ /dev/null
@@ -1,694 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKErrorCode Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKErrorCode Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKErrorCode Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKErrorCode Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKConstants.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKErrorCode</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSInteger, FBSDKErrorCode ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKReservedErrorCode</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKEncryptionErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKInvalidArgumentErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKUnknownErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKNetworkErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppEventsFlushErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestNonTextMimeTypeReturnedErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestProtocolMismatchErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestGraphAPIErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKDialogUnavailableErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAccessTokenRequiredErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKAppVersionUnsupportedErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKBrowserUnavailableErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKBrowswerUnavailableErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">__attribute__</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">(</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">(</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">deprecated</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">(</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">&quot;use FBSDKBrowserUnavailableErrorCode instead&quot;</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">)</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">)</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">)</a> = FBSDKBrowserUnavailableErrorCode,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKReservedErrorCode"></a><code>FBSDKReservedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Reserved.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKEncryptionErrorCode"></a><code>FBSDKEncryptionErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for errors from invalid encryption on incoming encryption URLs.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKInvalidArgumentErrorCode"></a><code>FBSDKInvalidArgumentErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for errors from invalid arguments to SDK methods.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKUnknownErrorCode"></a><code>FBSDKUnknownErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for unknown errors.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKNetworkErrorCode"></a><code>FBSDKNetworkErrorCode</code></dt>
-<dd>
-
-
-<pre><code>A request failed due to a network error. Use NSUnderlyingErrorKey to retrieve
-</code></pre>
-
-<p>   the error object from the NSURLConnection for more information.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAppEventsFlushErrorCode"></a><code>FBSDKAppEventsFlushErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for errors encountered during an App Events flush.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGraphRequestNonTextMimeTypeReturnedErrorCode"></a><code>FBSDKGraphRequestNonTextMimeTypeReturnedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>An endpoint that returns a binary response was used with FBSDKGraphRequestConnection.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGraphRequestProtocolMismatchErrorCode"></a><code>FBSDKGraphRequestProtocolMismatchErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The operation failed because the server returned an unexpected response.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGraphRequestGraphAPIErrorCode"></a><code>FBSDKGraphRequestGraphAPIErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The Graph API returned an error.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKDialogUnavailableErrorCode"></a><code>FBSDKDialogUnavailableErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The specified dialog configuration is not available.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAccessTokenRequiredErrorCode"></a><code>FBSDKAccessTokenRequiredErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Indicates an operation failed because a required access token was not found.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKAppVersionUnsupportedErrorCode"></a><code>FBSDKAppVersionUnsupportedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Indicates an app switch (typically for a dialog) failed because the destination app is out of date.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKBrowserUnavailableErrorCode"></a><code>FBSDKBrowserUnavailableErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Indicates an app switch to the browser (typically for a dialog) failed.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKBrowswerUnavailableErrorCode"></a><code>FBSDKBrowswerUnavailableErrorCode</code></dt>
-<dd>
-
-
-<ul>
-<li>Warning:use FBSDKBrowserUnavailableErrorCode instead</li>
-</ul>
-
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="__attribute__"></a><code>__attribute__</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="("></a><code>(</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="("></a><code>(</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="deprecated"></a><code>deprecated</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="("></a><code>(</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="&quot;use FBSDKBrowserUnavailableErrorCode instead&quot;"></a><code>&quot;use FBSDKBrowserUnavailableErrorCode instead&quot;</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title=")"></a><code>)</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title=")"></a><code>)</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title=")"></a><code>)</code></dt>
-<dd>
-
-
-<p>NS_ENUM(NSInteger, FBSDKErrorCode)
-  Error codes for FBSDKErrorDomain.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKConstants.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestActionType.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestActionType.html
deleted file mode 100644
index 7ba9ad5088f3..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestActionType.html	
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGameRequestActionType Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGameRequestActionType Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGameRequestActionType Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGameRequestActionType Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGameRequestContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKGameRequestActionType</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKGameRequestActionType)
-  Additional context about the nature of the request.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKGameRequestActionType ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestActionTypeNone</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestActionTypeSend</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestActionTypeAskFor</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestActionTypeTurn</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKGameRequestActionTypeNone"></a><code>FBSDKGameRequestActionTypeNone</code></dt>
-<dd>
-
-
-<p>No action type</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGameRequestActionTypeSend"></a><code>FBSDKGameRequestActionTypeSend</code></dt>
-<dd>
-
-
-<p>Send action type: The user is sending an object to the friends.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGameRequestActionTypeAskFor"></a><code>FBSDKGameRequestActionTypeAskFor</code></dt>
-<dd>
-
-
-<p>Ask For action type: The user is asking for an object from friends.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGameRequestActionTypeTurn"></a><code>FBSDKGameRequestActionTypeTurn</code></dt>
-<dd>
-
-
-<p>Turn action type: It is the turn of the friends to play against the user in a match. (no object)</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestFilter.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestFilter.html
deleted file mode 100644
index eaf0283fa2fa..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGameRequestFilter.html	
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGameRequestFilter Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGameRequestFilter Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGameRequestFilter Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGameRequestFilter Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGameRequestContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKGameRequestFilter</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKGameRequestFilters)
-  Filter for who can be displayed in the multi-friend selector.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKGameRequestFilter ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestFilterNone</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestFilterAppUsers</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGameRequestFilterAppNonUsers</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKGameRequestFilterNone"></a><code>FBSDKGameRequestFilterNone</code></dt>
-<dd>
-
-
-<p>No filter, all friends can be displayed.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGameRequestFilterAppUsers"></a><code>FBSDKGameRequestFilterAppUsers</code></dt>
-<dd>
-
-
-<p>Friends using the app can be displayed.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGameRequestFilterAppNonUsers"></a><code>FBSDKGameRequestFilterAppNonUsers</code></dt>
-<dd>
-
-
-<p>Friends not using the app can be displayed.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKGameRequestContent.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKGameRequestContent.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGraphRequestErrorCategory.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGraphRequestErrorCategory.html
deleted file mode 100644
index 0d3776eb6adb..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKGraphRequestErrorCategory.html	
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequestErrorCategory Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequestErrorCategory Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequestErrorCategory Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequestErrorCategory Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKConstants.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKGraphRequestErrorCategory</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKGraphRequestErrorCategory)
-  Describes the category of Facebook error. See <code>FBSDKGraphRequestErrorCategoryKey</code>.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKGraphRequestErrorCategory ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestErrorCategoryOther</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestErrorCategoryTransient</a> = 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKGraphRequestErrorCategoryRecoverable</a> = 2,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKGraphRequestErrorCategoryOther"></a><code>FBSDKGraphRequestErrorCategoryOther</code></dt>
-<dd>
-
-
-<p>The default error category that is not known to be recoverable. Check <code>FBSDKLocalizedErrorDescriptionKey</code> for a user facing message.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGraphRequestErrorCategoryTransient"></a><code>FBSDKGraphRequestErrorCategoryTransient</code></dt>
-<dd>
-
-
-<p>Indicates the error is temporary (such as server throttling). While a recoveryAttempter will be provided with the error instance, the attempt is guaranteed to succeed so you can simply retry the operation if you do not want to present an alert.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKGraphRequestErrorCategoryRecoverable"></a><code>FBSDKGraphRequestErrorCategoryRecoverable</code></dt>
-<dd>
-
-
-<p>Indicates the error can be recovered (such as requiring a login). A recoveryAttempter will be provided with the error instance that can take UI action.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKConstants.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlAuxiliaryPosition.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlAuxiliaryPosition.html
deleted file mode 100644
index c4d9efcac409..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlAuxiliaryPosition.html	
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeControlAuxiliaryPosition Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeControlAuxiliaryPosition Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeControlAuxiliaryPosition Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeControlAuxiliaryPosition Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeControl.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLikeControlAuxiliaryPosition</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM (NSUInteger, FBSDKLikeControlAuxiliaryPosition)</p>
-
-<p>  Specifies the position of the auxiliary view relative to the like button.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLikeControlAuxiliaryPosition ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlAuxiliaryPositionInline</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlAuxiliaryPositionTop</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlAuxiliaryPositionBottom</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLikeControlAuxiliaryPositionInline"></a><code>FBSDKLikeControlAuxiliaryPositionInline</code></dt>
-<dd>
-
-
-<p>The auxiliary view is inline with the like button.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeControlAuxiliaryPositionTop"></a><code>FBSDKLikeControlAuxiliaryPositionTop</code></dt>
-<dd>
-
-
-<p>The auxiliary view is above the like button.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeControlAuxiliaryPositionBottom"></a><code>FBSDKLikeControlAuxiliaryPositionBottom</code></dt>
-<dd>
-
-
-<p>The auxiliary view is below the like button.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlHorizontalAlignment.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlHorizontalAlignment.html
deleted file mode 100644
index 3906e04d140c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlHorizontalAlignment.html	
+++ /dev/null
@@ -1,289 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeControlHorizontalAlignment Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeControlHorizontalAlignment Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeControlHorizontalAlignment Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeControlHorizontalAlignment Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeControl.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLikeControlHorizontalAlignment</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKLikeControlHorizontalAlignment)</p>
-
-<p>  Specifies the horizontal alignment for FBSDKLikeControlStyleStandard with
-FBSDKLikeControlAuxiliaryPositionTop or FBSDKLikeControlAuxiliaryPositionBottom.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLikeControlHorizontalAlignment ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlHorizontalAlignmentLeft</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlHorizontalAlignmentCenter</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlHorizontalAlignmentRight</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLikeControlHorizontalAlignmentLeft"></a><code>FBSDKLikeControlHorizontalAlignmentLeft</code></dt>
-<dd>
-
-
-<p>The subviews are left aligned.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeControlHorizontalAlignmentCenter"></a><code>FBSDKLikeControlHorizontalAlignmentCenter</code></dt>
-<dd>
-
-
-<p>The subviews are center aligned.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeControlHorizontalAlignmentRight"></a><code>FBSDKLikeControlHorizontalAlignmentRight</code></dt>
-<dd>
-
-
-<p>The subviews are right aligned.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlStyle.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlStyle.html
deleted file mode 100644
index 2209b442d97e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeControlStyle.html	
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeControlStyle Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeControlStyle Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeControlStyle Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeControlStyle Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeControl.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLikeControlStyle</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM (NSUInteger, FBSDKLikeControlStyle)</p>
-
-<p>  Specifies the style of a like control.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLikeControlStyle ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlStyleStandard</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeControlStyleBoxCount</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLikeControlStyleStandard"></a><code>FBSDKLikeControlStyleStandard</code></dt>
-<dd>
-
-
-<p>Displays the button and the social sentence.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeControlStyleBoxCount"></a><code>FBSDKLikeControlStyleBoxCount</code></dt>
-<dd>
-
-
-<p>Displays the button and a box that contains the like count.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeControl.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLikeControl.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeObjectType.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeObjectType.html
deleted file mode 100644
index 89adf79bf288..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLikeObjectType.html	
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLikeObjectType Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLikeObjectType Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLikeObjectType Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLikeObjectType Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLikeObjectType.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLikeObjectType</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM (NSUInteger, FBSDKLikeObjectType)
-  Specifies the type of object referenced by the objectID for likes.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLikeObjectType ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeObjectTypeUnknown</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeObjectTypeOpenGraph</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLikeObjectTypePage</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLikeObjectTypeUnknown"></a><code>FBSDKLikeObjectTypeUnknown</code></dt>
-<dd>
-
-
-<p>The objectID refers to an unknown object type.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeObjectType.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeObjectTypeOpenGraph"></a><code>FBSDKLikeObjectTypeOpenGraph</code></dt>
-<dd>
-
-
-<p>The objectID refers to an Open Graph object.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeObjectType.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLikeObjectTypePage"></a><code>FBSDKLikeObjectTypePage</code></dt>
-<dd>
-
-
-<p>The objectID refers to an Page object.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLikeObjectType.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLikeObjectType.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginBehavior.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginBehavior.html
deleted file mode 100644
index d4a0d10adc14..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginBehavior.html	
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginBehavior Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginBehavior Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginBehavior Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginBehavior Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginManager.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLoginBehavior</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>FBSDKLoginBehavior enum</p>
-
-<p>  Passed to the \c FBSDKLoginManager to indicate how Facebook Login should be attempted.</p>
-
-<p>Facebook Login authorizes the application to act on behalf of the user, using the user&rsquo;s
-Facebook account. Usually a Facebook Login will rely on an account maintained outside of
-the application, by the native Facebook application, the browser, or perhaps the device
-itself. This avoids the need for a user to enter their username and password directly, and
-provides the most secure and lowest friction way for a user to authorize the application to
-interact with Facebook.</p>
-
-<p>The \c FBSDKLoginBehavior enum specifies which log-in methods may be used. The SDK
-  will determine the best behavior based on the current device (such as iOS version).</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLoginBehavior ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginBehaviorNative</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginBehaviorBrowser</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginBehaviorSystemAccount</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginBehaviorWeb</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLoginBehaviorNative"></a><code>FBSDKLoginBehaviorNative</code></dt>
-<dd>
-
-
-<pre><code>This is the default behavior, and indicates logging in through the native
-</code></pre>
-
-<p>   Facebook app may be used. The SDK may still use Safari instead.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginBehaviorBrowser"></a><code>FBSDKLoginBehaviorBrowser</code></dt>
-<dd>
-
-
-<pre><code>Attempts log in through the Safari or SFSafariViewController, if available.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginBehaviorSystemAccount"></a><code>FBSDKLoginBehaviorSystemAccount</code></dt>
-<dd>
-
-
-<pre><code>Attempts log in through the Facebook account currently signed in through
-</code></pre>
-
-<p>   the device Settings.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginBehaviorWeb"></a><code>FBSDKLoginBehaviorWeb</code></dt>
-<dd>
-
-
-<pre><code>Attempts log in through a modal \c UIWebView pop up
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginManager.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLoginManager.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginButtonTooltipBehavior.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginButtonTooltipBehavior.html
deleted file mode 100644
index 17bb5298f6d2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginButtonTooltipBehavior.html	
+++ /dev/null
@@ -1,289 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginButtonTooltipBehavior Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginButtonTooltipBehavior Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginButtonTooltipBehavior Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginButtonTooltipBehavior Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLoginButtonTooltipBehavior</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKLoginButtonTooltipBehavior)
-  Indicates the desired login tooltip behavior.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKLoginButtonTooltipBehavior ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginButtonTooltipBehaviorAutomatic</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginButtonTooltipBehaviorForceDisplay</a> = 1,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginButtonTooltipBehaviorDisable</a> = 2,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLoginButtonTooltipBehaviorAutomatic"></a><code>FBSDKLoginButtonTooltipBehaviorAutomatic</code></dt>
-<dd>
-
-
-<p>The default behavior. The tooltip will only be displayed if
-   the app is eligible (determined by possible server round trip)</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginButtonTooltipBehaviorForceDisplay"></a><code>FBSDKLoginButtonTooltipBehaviorForceDisplay</code></dt>
-<dd>
-
-
-<p>Force display of the tooltip (typically for UI testing)</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginButtonTooltipBehaviorDisable"></a><code>FBSDKLoginButtonTooltipBehaviorDisable</code></dt>
-<dd>
-
-
-<p>Force disable. In this case you can still exert more refined
-   control by manually constructing a <code>FBSDKLoginTooltipView</code> instance.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginButton.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginErrorCode.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginErrorCode.html
deleted file mode 100644
index 06b81ff2e3dd..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKLoginErrorCode.html	
+++ /dev/null
@@ -1,413 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginErrorCode Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginErrorCode Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginErrorCode Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginErrorCode Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginConstants.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKLoginErrorCode</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSInteger, FBSDKLoginErrorCode)
-  Error codes for FBSDKLoginErrorDomain.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSInteger, FBSDKLoginErrorCode ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginReservedErrorCode</a> = 300,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginUnknownErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginPasswordChangedErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginUserCheckpointedErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginUserMismatchErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginUnconfirmedUserErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginSystemAccountAppDisabledErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginSystemAccountUnavailableErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKLoginBadChallengeString</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKLoginReservedErrorCode"></a><code>FBSDKLoginReservedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Reserved.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginUnknownErrorCode"></a><code>FBSDKLoginUnknownErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for unknown errors.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginPasswordChangedErrorCode"></a><code>FBSDKLoginPasswordChangedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The user's password has changed and must log in again
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginUserCheckpointedErrorCode"></a><code>FBSDKLoginUserCheckpointedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The user must log in to their account on www.facebook.com to restore access
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginUserMismatchErrorCode"></a><code>FBSDKLoginUserMismatchErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Indicates a failure to request new permissions because the user has changed.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginUnconfirmedUserErrorCode"></a><code>FBSDKLoginUnconfirmedUserErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The user must confirm their account with Facebook before logging in
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginSystemAccountAppDisabledErrorCode"></a><code>FBSDKLoginSystemAccountAppDisabledErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The Accounts framework failed without returning an error, indicating the
-</code></pre>
-
-<p>   app&rsquo;s slider in the iOS Facebook Settings (device Settings -> Facebook -> App Name) has
-   been disabled.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginSystemAccountUnavailableErrorCode"></a><code>FBSDKLoginSystemAccountUnavailableErrorCode</code></dt>
-<dd>
-
-
-<pre><code>An error occurred related to Facebook system Account store
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKLoginBadChallengeString"></a><code>FBSDKLoginBadChallengeString</code></dt>
-<dd>
-
-
-<pre><code>The login response was missing a valid challenge string.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKLoginConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKLoginConstants.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKProfilePictureMode.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKProfilePictureMode.html
deleted file mode 100644
index e6b6bcab0c2c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKProfilePictureMode.html	
+++ /dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKProfilePictureMode Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKProfilePictureMode Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKProfilePictureMode Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKProfilePictureMode Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKProfilePictureView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKProfilePictureMode</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>FBSDKProfilePictureMode enum
-  Defines the aspect ratio mode for the source image of the profile picture.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKProfilePictureMode ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKProfilePictureModeSquare</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKProfilePictureModeNormal</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKProfilePictureModeSquare"></a><code>FBSDKProfilePictureModeSquare</code></dt>
-<dd>
-
-
-<pre><code>A square cropped version of the image will be included in the view.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKProfilePictureView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKProfilePictureModeNormal"></a><code>FBSDKProfilePictureModeNormal</code></dt>
-<dd>
-
-
-<pre><code>The original picture's aspect ratio will be used for the source image in the view.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKProfilePictureView.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKProfilePictureView.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareDialogMode.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareDialogMode.html
deleted file mode 100644
index 9126ecf81349..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareDialogMode.html	
+++ /dev/null
@@ -1,367 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareDialogMode Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareDialogMode Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareDialogMode Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareDialogMode Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareDialogMode.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKShareDialogMode</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSUInteger, FBSDKShareDialogMode)
-  Modes for the FBSDKShareDialog.</p>
-
-<p>The automatic mode will progressively check the availability of different modes and open the most
-appropriate mode for the dialog that is available.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKShareDialogMode ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeAutomatic</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeNative</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeShareSheet</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeBrowser</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeWeb</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeFeedBrowser</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogModeFeedWeb</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeAutomatic"></a><code>FBSDKShareDialogModeAutomatic</code></dt>
-<dd>
-
-
-<pre><code>Acts with the most appropriate mode that is available.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeNative"></a><code>FBSDKShareDialogModeNative</code></dt>
-<dd>
-
-
-<p>   @Displays the dialog in the main native Facebook app.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeShareSheet"></a><code>FBSDKShareDialogModeShareSheet</code></dt>
-<dd>
-
-
-<p>   @Displays the dialog in the iOS integrated share sheet.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeBrowser"></a><code>FBSDKShareDialogModeBrowser</code></dt>
-<dd>
-
-
-<p>   @Displays the dialog in Safari.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeWeb"></a><code>FBSDKShareDialogModeWeb</code></dt>
-<dd>
-
-
-<p>   @Displays the dialog in a UIWebView within the app.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeFeedBrowser"></a><code>FBSDKShareDialogModeFeedBrowser</code></dt>
-<dd>
-
-
-<p>   @Displays the feed dialog in Safari.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogModeFeedWeb"></a><code>FBSDKShareDialogModeFeedWeb</code></dt>
-<dd>
-
-
-<p>   @Displays the feed dialog in a UIWebView within the app.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareDialogMode.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKShareDialogMode.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareErrorCode.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareErrorCode.html
deleted file mode 100644
index 73917413c01a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKShareErrorCode.html	
+++ /dev/null
@@ -1,309 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareErrorCode Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareErrorCode Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareErrorCode Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareErrorCode Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareConstants.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKShareErrorCode</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>NS_ENUM(NSInteger, FBSDKShareErrorCode)
-  Error codes for FBSDKShareErrorDomain.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSInteger, FBSDKShareErrorCode ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareReservedErrorCode</a> = 200,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareOpenGraphErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareDialogNotAvailableErrorCode</a>,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKShareUnknownErrorCode</a>,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKShareReservedErrorCode"></a><code>FBSDKShareReservedErrorCode</code></dt>
-<dd>
-
-
-<pre><code>Reserved.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareOpenGraphErrorCode"></a><code>FBSDKShareOpenGraphErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for errors from uploading open graph objects.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareDialogNotAvailableErrorCode"></a><code>FBSDKShareDialogNotAvailableErrorCode</code></dt>
-<dd>
-
-
-<pre><code>The error code for when a sharing dialog is not available.
-</code></pre>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKShareUnknownErrorCode"></a><code>FBSDKShareUnknownErrorCode</code></dt>
-<dd>
-
-
-<p>   @The error code for unknown errors.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKShareConstants.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKShareConstants.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipColorStyle.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipColorStyle.html
deleted file mode 100644
index 636a7147f210..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipColorStyle.html	
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTooltipColorStyle Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTooltipColorStyle Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTooltipColorStyle Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTooltipColorStyle Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTooltipView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKTooltipColorStyle</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>FBSDKTooltipColorStyle enum</p>
-
-<p>  Passed on construction to determine color styling.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKTooltipColorStyle ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKTooltipColorStyleFriendlyBlue</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKTooltipColorStyleNeutralGray</a> = 1,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKTooltipColorStyleFriendlyBlue"></a><code>FBSDKTooltipColorStyleFriendlyBlue</code></dt>
-<dd>
-
-
-<p>Light blue background, white text, faded blue close button.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKTooltipView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKTooltipColorStyleNeutralGray"></a><code>FBSDKTooltipColorStyleNeutralGray</code></dt>
-<dd>
-
-
-<p>Dark gray background, white text, light gray close button.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKTooltipView.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipViewArrowDirection.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipViewArrowDirection.html
deleted file mode 100644
index efb81887633d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Constants/FBSDKTooltipViewArrowDirection.html	
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKTooltipViewArrowDirection Constants Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKTooltipViewArrowDirection Constants Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKTooltipViewArrowDirection Constants Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKTooltipViewArrowDirection Constants Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKTooltipView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					
-					
-					
-                    
-                    
-                    <h3 class="subsubtitle method-title">FBSDKTooltipViewArrowDirection</h3>
-                    
-					
-					<div class="section section-overview">
-                        <p>FBSDKTooltipViewArrowDirection enum</p>
-
-<p>  Passed on construction to determine arrow orientation.</p>
-					</div>
-					
-					
-                    <div class="section">
-                        <!-- display enum values -->
-                        
-                        <h4 class="method-subtitle">Definition</h4>
-                        <code>typedef NS_ENUM(NSUInteger, FBSDKTooltipViewArrowDirection ) {<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKTooltipViewArrowDirectionDown</a> = 0,<br/>
-                            
-                            &nbsp;&nbsp; <a href="">FBSDKTooltipViewArrowDirectionUp</a> = 1,<br/>
-                            
-                            };</code>
-                    
-                    </div>
-                    
-                    <div class="section section-methods">
-                        <h4 class="method-subtitle">Constants</h4>
-                        <dl class="termdef">
-                            
-                            <dt><a name="" title="FBSDKTooltipViewArrowDirectionDown"></a><code>FBSDKTooltipViewArrowDirectionDown</code></dt>
-<dd>
-
-
-<p>View is located above given point, arrow is pointing down.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKTooltipView.h</code>.
-	</p>
-	
-</dd>
-                            
-                            <dt><a name="" title="FBSDKTooltipViewArrowDirectionUp"></a><code>FBSDKTooltipViewArrowDirectionUp</code></dt>
-<dd>
-
-
-<p>View is located below given point, arrow is pointing up.</p>
-
-
-
-
-
-    
-	<p>
-		Declared In <code class="declared-in-ref">FBSDKTooltipView.h</code>.
-	</p>
-	
-</dd>
-                            
-                        </dl>
-                    </div>
-                    
-                    
-                    
-                    
-
-                    
-                    
-                    
-                    <div class="method-subsection declared-in-section">
-                        <h4 class="method-subtitle">Declared In</h4>
-                        <code class="declared-in-ref">FBSDKTooltipView.h</code><br />
-                    </div>				
-                    
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/BFAppLinkResolving.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/BFAppLinkResolving.html
deleted file mode 100644
index e2feea92a8a6..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/BFAppLinkResolving.html	
+++ /dev/null
@@ -1,319 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>BFAppLinkResolving Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">BFAppLinkResolving Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/appLinkFromURLInBackground:">&nbsp;&nbsp;&nbsp;&nbsp;- appLinkFromURLInBackground:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appLinkFromURLInBackground:">appLinkFromURLInBackground:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="BFAppLinkResolving Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">BFAppLinkResolving Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppLinkResolver.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Implement this protocol to provide an alternate strategy for resolving
-App Links that may include pre-fetching, caching, or querying for App Link
-data from an index provided by a service provider.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appLinkFromURLInBackground:">&ndash;&nbsp;appLinkFromURLInBackground:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appLinkFromURLInBackground:" title="appLinkFromURLInBackground:"></a>
-	<h3 class="subsubtitle method-title">appLinkFromURLInBackground:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>Asynchronously resolves App Link data for a given URL.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BFTask *)appLinkFromURLInBackground:(NSURL *)<em>url</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter url: The URL to resolve into an App Link.</li>
-<li>Returns: A BFTask that will return a BFAppLink for the given URL.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppLinkResolver.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupAddDialogDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupAddDialogDelegate.html
deleted file mode 100644
index c1bba7cf2cf8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupAddDialogDelegate.html	
+++ /dev/null
@@ -1,412 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupAddDialogDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupAddDialogDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/appGroupAddDialog:didCompleteWithResults:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupAddDialog:didCompleteWithResults:</option>
-	
-	<option value="//api/name/appGroupAddDialog:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupAddDialog:didFailWithError:</option>
-	
-	<option value="//api/name/appGroupAddDialogDidCancel:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupAddDialogDidCancel:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupAddDialog:didCompleteWithResults:">appGroupAddDialog:didCompleteWithResults:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupAddDialog:didFailWithError:">appGroupAddDialog:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupAddDialogDidCancel:">appGroupAddDialogDidCancel:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupAddDialogDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupAddDialogDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupAddDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupAddDialog:didCompleteWithResults:">&ndash;&nbsp;appGroupAddDialog:didCompleteWithResults:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupAddDialog:didFailWithError:">&ndash;&nbsp;appGroupAddDialog:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupAddDialogDidCancel:">&ndash;&nbsp;appGroupAddDialogDidCancel:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupAddDialog:didCompleteWithResults:" title="appGroupAddDialog:didCompleteWithResults:"></a>
-	<h3 class="subsubtitle method-title">appGroupAddDialog:didCompleteWithResults:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupAddDialog:(FBSDKAppGroupAddDialog *)<em>appGroupAddDialog</em> didCompleteWithResults:(NSDictionary *)<em>results</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupAddDialog:didFailWithError:" title="appGroupAddDialog:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">appGroupAddDialog:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupAddDialog:(FBSDKAppGroupAddDialog *)<em>appGroupAddDialog</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupAddDialogDidCancel:" title="appGroupAddDialogDidCancel:"></a>
-	<h3 class="subsubtitle method-title">appGroupAddDialogDidCancel:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupAddDialogDidCancel:(FBSDKAppGroupAddDialog *)<em>appGroupAddDialog</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupAddDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupJoinDialogDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupJoinDialogDelegate.html
deleted file mode 100644
index c141933fc630..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppGroupJoinDialogDelegate.html	
+++ /dev/null
@@ -1,412 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppGroupJoinDialogDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppGroupJoinDialogDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/appGroupJoinDialog:didCompleteWithResults:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupJoinDialog:didCompleteWithResults:</option>
-	
-	<option value="//api/name/appGroupJoinDialog:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupJoinDialog:didFailWithError:</option>
-	
-	<option value="//api/name/appGroupJoinDialogDidCancel:">&nbsp;&nbsp;&nbsp;&nbsp;- appGroupJoinDialogDidCancel:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupJoinDialog:didCompleteWithResults:">appGroupJoinDialog:didCompleteWithResults:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupJoinDialog:didFailWithError:">appGroupJoinDialog:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appGroupJoinDialogDidCancel:">appGroupJoinDialogDidCancel:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppGroupJoinDialogDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppGroupJoinDialogDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppGroupJoinDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupJoinDialog:didCompleteWithResults:">&ndash;&nbsp;appGroupJoinDialog:didCompleteWithResults:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupJoinDialog:didFailWithError:">&ndash;&nbsp;appGroupJoinDialog:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appGroupJoinDialogDidCancel:">&ndash;&nbsp;appGroupJoinDialogDidCancel:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupJoinDialog:didCompleteWithResults:" title="appGroupJoinDialog:didCompleteWithResults:"></a>
-	<h3 class="subsubtitle method-title">appGroupJoinDialog:didCompleteWithResults:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupJoinDialog:(FBSDKAppGroupJoinDialog *)<em>appGroupJoinDialog</em> didCompleteWithResults:(NSDictionary *)<em>results</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupJoinDialog:didFailWithError:" title="appGroupJoinDialog:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">appGroupJoinDialog:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupJoinDialog:(FBSDKAppGroupJoinDialog *)<em>appGroupJoinDialog</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appGroupJoinDialogDidCancel:" title="appGroupJoinDialogDidCancel:"></a>
-	<h3 class="subsubtitle method-title">appGroupJoinDialogDidCancel:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<ul>
-<li>Warning:App and game groups are being deprecated. See https://developers.facebook.com/docs/games/services/game-groups for more information.</li>
-</ul>
-
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appGroupJoinDialogDidCancel:(FBSDKAppGroupJoinDialog *)<em>appGroupJoinDialog</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppGroupJoinDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppInviteDialogDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppInviteDialogDelegate.html
deleted file mode 100644
index f78759eb9635..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKAppInviteDialogDelegate.html	
+++ /dev/null
@@ -1,362 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKAppInviteDialogDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKAppInviteDialogDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/appInviteDialog:didCompleteWithResults:">&nbsp;&nbsp;&nbsp;&nbsp;- appInviteDialog:didCompleteWithResults:</option>
-	
-	<option value="//api/name/appInviteDialog:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- appInviteDialog:didFailWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appInviteDialog:didCompleteWithResults:">appInviteDialog:didCompleteWithResults:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/appInviteDialog:didFailWithError:">appInviteDialog:didFailWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKAppInviteDialogDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKAppInviteDialogDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKAppInviteDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A delegate for FBSDKAppInviteDialog.</p>
-
-<p>The delegate is notified with the results of the app invite as long as the application has permissions to
-receive the information.  For example, if the person is not signed into the containing app, the shower may not be able
-to distinguish between completion of an app invite and cancellation.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appInviteDialog:didCompleteWithResults:">&ndash;&nbsp;appInviteDialog:didCompleteWithResults:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/appInviteDialog:didFailWithError:">&ndash;&nbsp;appInviteDialog:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/appInviteDialog:didCompleteWithResults:" title="appInviteDialog:didCompleteWithResults:"></a>
-	<h3 class="subsubtitle method-title">appInviteDialog:didCompleteWithResults:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the app invite completes without error.
-- Parameter appInviteDialog: The FBSDKAppInviteDialog that completed.
-- Parameter results: The results from the dialog.  This may be nil or empty.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appInviteDialog:(FBSDKAppInviteDialog *)<em>appInviteDialog</em> didCompleteWithResults:(NSDictionary *)<em>results</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/appInviteDialog:didFailWithError:" title="appInviteDialog:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">appInviteDialog:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the app invite encounters an error.
-- Parameter appInviteDialog: The FBSDKAppInviteDialog that completed.
-- Parameter error: The error.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)appInviteDialog:(FBSDKAppInviteDialog *)<em>appInviteDialog</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKAppInviteDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKCopying.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKCopying.html
deleted file mode 100644
index 561f443db0d2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKCopying.html	
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKCopying Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKCopying Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/copy">&nbsp;&nbsp;&nbsp;&nbsp;- copy</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/copy">copy</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKCopying Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKCopying Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSCopying<br />NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKCopying.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Extension protocol for NSCopying that adds the copy method, which is implemented on NSObject.</p>
-
-<p>NSObject<NSCopying> implicitly conforms to this protocol.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/copy">&ndash;&nbsp;copy</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/copy" title="copy"></a>
-	<h3 class="subsubtitle method-title">copy</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Implemented by NSObject as a convenience to copyWithZone:.
-- Returns: A copy of the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (id)copy</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKCopying.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKErrorRecoveryAttempting.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKErrorRecoveryAttempting.html
deleted file mode 100644
index be4077afc8fa..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKErrorRecoveryAttempting.html	
+++ /dev/null
@@ -1,325 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKErrorRecoveryAttempting Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKErrorRecoveryAttempting Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:">&nbsp;&nbsp;&nbsp;&nbsp;- attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:">attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKErrorRecoveryAttempting Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKErrorRecoveryAttempting Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKConstants.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  a formal protocol very similar to the informal protocol NSErrorRecoveryAttempting</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:">&ndash;&nbsp;attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:" title="attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:"></a>
-	<h3 class="subsubtitle method-title">attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  attempt the recovery
-- Parameter error: the error
-- Parameter recoveryOptionIndex: the selected option index
-- Parameter delegate: the delegate
-- Parameter didRecoverSelector: the callback selector, see discussion.
-- Parameter contextInfo: context info to pass back to callback selector, see discussion.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)attemptRecoveryFromError:(NSError *)<em>error</em> optionIndex:(NSUInteger)<em>recoveryOptionIndex</em> delegate:(id)<em>delegate</em> didRecoverSelector:(SEL)<em>didRecoverSelector</em> contextInfo:(void *)<em>contextInfo</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>Given that an error alert has been presented document-modally to the user, and the user has chosen one of the error&rsquo;s recovery options, attempt recovery from the error, and send the selected message to the specified delegate. The option index is an index into the error&rsquo;s array of localized recovery options. The method selected by didRecoverSelector must have the same signature as:</p>
-
-<ul>
-<li>(void)didPresentErrorWithRecovery:(BOOL)didRecover contextInfo:(void *)contextInfo;</li>
-</ul>
-
-
-<p>The value passed for didRecover must be YES if error recovery was completely successful, NO otherwise.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKConstants.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGameRequestDialogDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGameRequestDialogDelegate.html
deleted file mode 100644
index 03c85bcc741d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGameRequestDialogDelegate.html	
+++ /dev/null
@@ -1,409 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGameRequestDialogDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGameRequestDialogDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/gameRequestDialog:didCompleteWithResults:">&nbsp;&nbsp;&nbsp;&nbsp;- gameRequestDialog:didCompleteWithResults:</option>
-	
-	<option value="//api/name/gameRequestDialog:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- gameRequestDialog:didFailWithError:</option>
-	
-	<option value="//api/name/gameRequestDialogDidCancel:">&nbsp;&nbsp;&nbsp;&nbsp;- gameRequestDialogDidCancel:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/gameRequestDialog:didCompleteWithResults:">gameRequestDialog:didCompleteWithResults:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/gameRequestDialog:didFailWithError:">gameRequestDialog:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/gameRequestDialogDidCancel:">gameRequestDialogDidCancel:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGameRequestDialogDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGameRequestDialogDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGameRequestDialog.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A delegate for FBSDKGameRequestDialog.</p>
-
-<p>The delegate is notified with the results of the game request as long as the application has permissions to
-receive the information.  For example, if the person is not signed into the containing app, the shower may not be able
-to distinguish between completion of a game request and cancellation.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/gameRequestDialog:didCompleteWithResults:">&ndash;&nbsp;gameRequestDialog:didCompleteWithResults:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/gameRequestDialog:didFailWithError:">&ndash;&nbsp;gameRequestDialog:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/gameRequestDialogDidCancel:">&ndash;&nbsp;gameRequestDialogDidCancel:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/gameRequestDialog:didCompleteWithResults:" title="gameRequestDialog:didCompleteWithResults:"></a>
-	<h3 class="subsubtitle method-title">gameRequestDialog:didCompleteWithResults:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the game request completes without error.
-- Parameter gameRequestDialog: The FBSDKGameRequestDialog that completed.
-- Parameter results: The results from the dialog.  This may be nil or empty.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)gameRequestDialog:(FBSDKGameRequestDialog *)<em>gameRequestDialog</em> didCompleteWithResults:(NSDictionary *)<em>results</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/gameRequestDialog:didFailWithError:" title="gameRequestDialog:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">gameRequestDialog:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the game request encounters an error.
-- Parameter gameRequestDialog: The FBSDKGameRequestDialog that completed.
-- Parameter error: The error.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)gameRequestDialog:(FBSDKGameRequestDialog *)<em>gameRequestDialog</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/gameRequestDialogDidCancel:" title="gameRequestDialogDidCancel:"></a>
-	<h3 class="subsubtitle method-title">gameRequestDialogDidCancel:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the game request dialog is cancelled.
-- Parameter gameRequestDialog: The FBSDKGameRequestDialog that completed.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)gameRequestDialogDidCancel:(FBSDKGameRequestDialog *)<em>gameRequestDialog</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGameRequestDialog.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphErrorRecoveryProcessorDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphErrorRecoveryProcessorDelegate.html
deleted file mode 100644
index 650bc663bb2d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphErrorRecoveryProcessorDelegate.html	
+++ /dev/null
@@ -1,366 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphErrorRecoveryProcessorDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphErrorRecoveryProcessorDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/processorDidAttemptRecovery:didRecover:error:">&nbsp;&nbsp;&nbsp;&nbsp;- processorDidAttemptRecovery:didRecover:error:</option>
-	
-	<option value="//api/name/processorWillProcessError:error:">&nbsp;&nbsp;&nbsp;&nbsp;- processorWillProcessError:error:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/processorDidAttemptRecovery:didRecover:error:">processorDidAttemptRecovery:didRecover:error:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/processorWillProcessError:error:">processorWillProcessError:error:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphErrorRecoveryProcessorDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphErrorRecoveryProcessorDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphErrorRecoveryProcessor.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Defines a delegate for <code>FBSDKGraphErrorRecoveryProcessor</code>.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/processorDidAttemptRecovery:didRecover:error:">&ndash;&nbsp;processorDidAttemptRecovery:didRecover:error:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/processorWillProcessError:error:">&ndash;&nbsp;processorWillProcessError:error:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/processorDidAttemptRecovery:didRecover:error:" title="processorDidAttemptRecovery:didRecover:error:"></a>
-	<h3 class="subsubtitle method-title">processorDidAttemptRecovery:didRecover:error:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Indicates the error recovery has been attempted.
-- Parameter processor: the processor instance.
-- Parameter didRecover: YES if the recovery was successful.
-- Parameter error: the error that that was attempted to be recovered from.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)processorDidAttemptRecovery:(FBSDKGraphErrorRecoveryProcessor *)<em>processor</em> didRecover:(BOOL)<em>didRecover</em> error:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphErrorRecoveryProcessor.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/processorWillProcessError:error:" title="processorWillProcessError:error:"></a>
-	<h3 class="subsubtitle method-title">processorWillProcessError:error:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Indicates the processor is about to process the error.
-- Parameter processor: the processor instance.
-- Parameter error: the error is about to be processed.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)processorWillProcessError:(FBSDKGraphErrorRecoveryProcessor *)<em>processor</em> error:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>return NO if the processor should not process the error. For example,
-if you want to prevent alerts of localized messages but otherwise perform retries and recoveries,
-you could return NO for errors where userInfo[FBSDKGraphRequestErrorCategoryKey] equal to FBSDKGraphRequestErrorCategoryOther</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphErrorRecoveryProcessor.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphRequestConnectionDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphRequestConnectionDelegate.html
deleted file mode 100644
index 8b2f2a379c3e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKGraphRequestConnectionDelegate.html	
+++ /dev/null
@@ -1,514 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKGraphRequestConnectionDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKGraphRequestConnectionDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/requestConnection:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- requestConnection:didFailWithError:</option>
-	
-	<option value="//api/name/requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:">&nbsp;&nbsp;&nbsp;&nbsp;- requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:</option>
-	
-	<option value="//api/name/requestConnectionDidFinishLoading:">&nbsp;&nbsp;&nbsp;&nbsp;- requestConnectionDidFinishLoading:</option>
-	
-	<option value="//api/name/requestConnectionWillBeginLoading:">&nbsp;&nbsp;&nbsp;&nbsp;- requestConnectionWillBeginLoading:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestConnection:didFailWithError:">requestConnection:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:">requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestConnectionDidFinishLoading:">requestConnectionDidFinishLoading:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/requestConnectionWillBeginLoading:">requestConnectionWillBeginLoading:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKGraphRequestConnectionDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKGraphRequestConnectionDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKGraphRequestConnection.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>  The <code>FBSDKGraphRequestConnectionDelegate</code> protocol defines the methods used to receive network
-activity progress information from a <a href="../Classes/FBSDKGraphRequestConnection.html">FBSDKGraphRequestConnection</a>.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestConnectionWillBeginLoading:">&ndash;&nbsp;requestConnectionWillBeginLoading:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestConnectionDidFinishLoading:">&ndash;&nbsp;requestConnectionDidFinishLoading:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestConnection:didFailWithError:">&ndash;&nbsp;requestConnection:didFailWithError:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:">&ndash;&nbsp;requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/requestConnection:didFailWithError:" title="requestConnection:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">requestConnection:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)requestConnection:(FBSDKGraphRequestConnection *)<em>connection</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Tells the delegate the request connection failed with an error</p>
-
-<p>If the request connection fails with a network error then this method is called. The <code>error</code>
-argument specifies why the network connection failed. The <code>NSError</code> object passed to the
-FBSDKGraphRequestHandler block may contain additional information.</p>
-
-<ul>
-<li>Parameter connection:    The request connection that successfully completed a network request</li>
-<li>Parameter error:         The <code>NSError</code> representing the network error that occurred, if any. May be nil
-in some circumstances. Consult the <code>NSError</code> for the <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> for reliable
-failure information.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:" title="requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:"></a>
-	<h3 class="subsubtitle method-title">requestConnection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)requestConnection:(FBSDKGraphRequestConnection *)<em>connection</em> didSendBodyData:(NSInteger)<em>bytesWritten</em> totalBytesWritten:(NSInteger)<em>totalBytesWritten</em> totalBytesExpectedToWrite:(NSInteger)<em>totalBytesExpectedToWrite</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Tells the delegate how much data has been sent and is planned to send to the remote host</p>
-
-<p>The byte count arguments refer to the aggregated <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> objects, not a particular <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a>.</p>
-
-<p>Like <code>NSURLConnection</code>, the values may change in unexpected ways if data needs to be resent.</p>
-
-<ul>
-<li>Parameter connection:                The request connection transmitting data to a remote host</li>
-<li>Parameter bytesWritten:              The number of bytes sent in the last transmission</li>
-<li>Parameter totalBytesWritten:         The total number of bytes sent to the remote host</li>
-<li>Parameter totalBytesExpectedToWrite: The total number of bytes expected to send to the remote host</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/requestConnectionDidFinishLoading:" title="requestConnectionDidFinishLoading:"></a>
-	<h3 class="subsubtitle method-title">requestConnectionDidFinishLoading:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)requestConnectionDidFinishLoading:(FBSDKGraphRequestConnection *)<em>connection</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Tells the delegate the request connection finished loading</p>
-
-<p>If the request connection completes without a network error occurring then this method is called.
-Invocation of this method does not indicate success of every <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a> made, only that the
-request connection has no further activity. Use the error argument passed to the FBSDKGraphRequestHandler
-block to determine success or failure of each <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a>.</p>
-
-<p>This method is invoked after the completion handler for each <a href="../Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a>.</p>
-
-<ul>
-<li>Parameter connection:    The request connection that successfully completed a network request</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/requestConnectionWillBeginLoading:" title="requestConnectionWillBeginLoading:"></a>
-	<h3 class="subsubtitle method-title">requestConnectionWillBeginLoading:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>@method</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)requestConnectionWillBeginLoading:(FBSDKGraphRequestConnection *)<em>connection</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>  Tells the delegate the request connection will begin loading</p>
-
-<p>If the <a href="../Classes/FBSDKGraphRequestConnection.html">FBSDKGraphRequestConnection</a> is created using one of the convenience factory methods prefixed with
-start, the object returned from the convenience method has already begun loading and this method
-will not be called when the delegate is set.</p>
-
-<ul>
-<li>Parameter connection:    The request connection that is starting a network request</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKGraphRequestConnection.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLiking.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLiking.html
deleted file mode 100644
index 722ab14ef0f0..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLiking.html	
+++ /dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLiking Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLiking Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/objectID">&nbsp;&nbsp;&nbsp;&nbsp;objectID</option>
-	
-	<option value="//api/name/objectType">&nbsp;&nbsp;&nbsp;&nbsp;objectType</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectID">objectID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectType">objectType</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLiking Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLiking Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLiking.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The common interface for components that initiate liking.</p>
-
-<ul>
-<li><p>See:FBSDKLikeButton</p></li>
-<li><p>See:FBSDKLikeControl</p></li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectID">&nbsp;&nbsp;objectID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectType">&nbsp;&nbsp;objectType</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/objectID" title="objectID"></a>
-	<h3 class="subsubtitle method-title">objectID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The objectID for the object to like.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *objectID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This value may be an Open Graph object ID or a string representation of an URL that describes an
-Open Graph object.  The objects may be public objects, like pages, or objects that are defined by your application.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLiking.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/objectType" title="objectType"></a>
-	<h3 class="subsubtitle method-title">objectType</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The type of object referenced by the objectID.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) FBSDKLikeObjectType objectType</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If the objectType is unknown, the control will determine the objectType by querying the server with the
-objectID.  Specifying a value for the objectType is an optimization that should be used if the type is known by the
-consumer.  Consider setting the objectType if it is known when setting the objectID.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLiking.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginButtonDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginButtonDelegate.html
deleted file mode 100644
index c9abbfed2049..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginButtonDelegate.html	
+++ /dev/null
@@ -1,407 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginButtonDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginButtonDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/loginButton:didCompleteWithResult:error:">&nbsp;&nbsp;&nbsp;&nbsp;- loginButton:didCompleteWithResult:error:</option>
-	
-	<option value="//api/name/loginButtonDidLogOut:">&nbsp;&nbsp;&nbsp;&nbsp;- loginButtonDidLogOut:</option>
-	
-	<option value="//api/name/loginButtonWillLogin:">&nbsp;&nbsp;&nbsp;&nbsp;- loginButtonWillLogin:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginButton:didCompleteWithResult:error:">loginButton:didCompleteWithResult:error:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginButtonDidLogOut:">loginButtonDidLogOut:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginButtonWillLogin:">loginButtonWillLogin:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginButtonDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginButtonDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol
-  A delegate for <code>FBSDKLoginButton</code></p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginButton:didCompleteWithResult:error:">&ndash;&nbsp;loginButton:didCompleteWithResult:error:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginButtonDidLogOut:">&ndash;&nbsp;loginButtonDidLogOut:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginButtonWillLogin:">&ndash;&nbsp;loginButtonWillLogin:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/loginButton:didCompleteWithResult:error:" title="loginButton:didCompleteWithResult:error:"></a>
-	<h3 class="subsubtitle method-title">loginButton:didCompleteWithResult:error:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the button was used to login.
-- Parameter loginButton: the sender
-- Parameter result: The results of the login
-- Parameter error: The error (if any) from the login</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loginButton:(FBSDKLoginButton *)<em>loginButton</em> didCompleteWithResult:(FBSDKLoginManagerLoginResult *)<em>result</em> error:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginButtonDidLogOut:" title="loginButtonDidLogOut:"></a>
-	<h3 class="subsubtitle method-title">loginButtonDidLogOut:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the button was used to logout.
-- Parameter loginButton: The button that was clicked.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loginButtonDidLogOut:(FBSDKLoginButton *)<em>loginButton</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginButtonWillLogin:" title="loginButtonWillLogin:"></a>
-	<h3 class="subsubtitle method-title">loginButtonWillLogin:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the button is about to login.
-- Parameter loginButton: the sender
-- Returns: YES if the login should be allowed to proceed, NO otherwise</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)loginButtonWillLogin:(FBSDKLoginButton *)<em>loginButton</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginTooltipViewDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginTooltipViewDelegate.html
deleted file mode 100644
index 18efc37cd3d4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKLoginTooltipViewDelegate.html	
+++ /dev/null
@@ -1,433 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKLoginTooltipViewDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKLoginTooltipViewDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/loginTooltipView:shouldAppear:">&nbsp;&nbsp;&nbsp;&nbsp;- loginTooltipView:shouldAppear:</option>
-	
-	<option value="//api/name/loginTooltipViewWillAppear:">&nbsp;&nbsp;&nbsp;&nbsp;- loginTooltipViewWillAppear:</option>
-	
-	<option value="//api/name/loginTooltipViewWillNotAppear:">&nbsp;&nbsp;&nbsp;&nbsp;- loginTooltipViewWillNotAppear:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginTooltipView:shouldAppear:">loginTooltipView:shouldAppear:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginTooltipViewWillAppear:">loginTooltipViewWillAppear:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/loginTooltipViewWillNotAppear:">loginTooltipViewWillNotAppear:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKLoginTooltipViewDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKLoginTooltipViewDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKLoginTooltipView.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@protocol</p>
-
-<p>  The <code>FBSDKLoginTooltipViewDelegate</code> protocol defines the methods used to receive event
-notifications from <code>FBSDKLoginTooltipView</code> objects.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginTooltipView:shouldAppear:">&ndash;&nbsp;loginTooltipView:shouldAppear:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginTooltipViewWillAppear:">&ndash;&nbsp;loginTooltipViewWillAppear:</a></code>
-	</span>
-	
-	
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/loginTooltipViewWillNotAppear:">&ndash;&nbsp;loginTooltipViewWillNotAppear:</a></code>
-	</span>
-	
-	
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/loginTooltipView:shouldAppear:" title="loginTooltipView:shouldAppear:"></a>
-	<h3 class="subsubtitle method-title">loginTooltipView:shouldAppear:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Asks the delegate if the tooltip view should appear</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)loginTooltipView:(FBSDKLoginTooltipView *)<em>view</em> shouldAppear:(BOOL)<em>appIsEligible</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter view: The tooltip view.</li>
-<li>Parameter appIsEligible: The value fetched from the server identifying if the app
-is eligible for the new login experience.</li>
-</ul>
-
-
-<p>Use this method to customize display behavior.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginTooltipViewWillAppear:" title="loginTooltipViewWillAppear:"></a>
-	<h3 class="subsubtitle method-title">loginTooltipViewWillAppear:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Tells the delegate the tooltip view will appear, specifically after it&rsquo;s been
-added to the super view but before the fade in animation.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loginTooltipViewWillAppear:(FBSDKLoginTooltipView *)<em>view</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter view: The tooltip view.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/loginTooltipViewWillNotAppear:" title="loginTooltipViewWillNotAppear:"></a>
-	<h3 class="subsubtitle method-title">loginTooltipViewWillNotAppear:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Tells the delegate the tooltip view will not appear (i.e., was not
-added to the super view).</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)loginTooltipViewWillNotAppear:(FBSDKLoginTooltipView *)<em>view</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<ul>
-<li>Parameter view: The tooltip view.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKLoginTooltipView.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMutableCopying.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMutableCopying.html
deleted file mode 100644
index 1b8bbcf9db07..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKMutableCopying.html	
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKMutableCopying Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKMutableCopying Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/mutableCopy">&nbsp;&nbsp;&nbsp;&nbsp;- mutableCopy</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/mutableCopy">mutableCopy</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKMutableCopying Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKMutableCopying Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSMutableCopying</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKMutableCopying.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Extension protocol for NSMutableCopying that adds the mutableCopy method, which is implemented on NSObject.</p>
-
-<p>NSObject&lt;NSCopying, NSMutableCopying> implicitly conforms to this protocol.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/mutableCopy">&ndash;&nbsp;mutableCopy</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/mutableCopy" title="mutableCopy"></a>
-	<h3 class="subsubtitle method-title">mutableCopy</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Implemented by NSObject as a convenience to mutableCopyWithZone:.
-- Returns: A mutable copy of the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (id)mutableCopy</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKMutableCopying.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKShareOpenGraphValueContaining.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKShareOpenGraphValueContaining.html
deleted file mode 100644
index 30635e7e0605..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKShareOpenGraphValueContaining.html	
+++ /dev/null
@@ -1,1129 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKShareOpenGraphValueContaining Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKShareOpenGraphValueContaining Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/URLForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- URLForKey:</option>
-	
-	<option value="//api/name/arrayForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- arrayForKey:</option>
-	
-	<option value="//api/name/enumerateKeysAndObjectsUsingBlock:">&nbsp;&nbsp;&nbsp;&nbsp;- enumerateKeysAndObjectsUsingBlock:</option>
-	
-	<option value="//api/name/keyEnumerator">&nbsp;&nbsp;&nbsp;&nbsp;- keyEnumerator</option>
-	
-	<option value="//api/name/numberForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- numberForKey:</option>
-	
-	<option value="//api/name/objectEnumerator">&nbsp;&nbsp;&nbsp;&nbsp;- objectEnumerator</option>
-	
-	<option value="//api/name/objectForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- objectForKey:</option>
-	
-	<option value="//api/name/objectForKeyedSubscript:">&nbsp;&nbsp;&nbsp;&nbsp;- objectForKeyedSubscript:</option>
-	
-	<option value="//api/name/parseProperties:">&nbsp;&nbsp;&nbsp;&nbsp;- parseProperties:</option>
-	
-	<option value="//api/name/photoForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- photoForKey:</option>
-	
-	<option value="//api/name/removeObjectForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- removeObjectForKey:</option>
-	
-	<option value="//api/name/setArray:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setArray:forKey:</option>
-	
-	<option value="//api/name/setNumber:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setNumber:forKey:</option>
-	
-	<option value="//api/name/setObject:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setObject:forKey:</option>
-	
-	<option value="//api/name/setPhoto:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setPhoto:forKey:</option>
-	
-	<option value="//api/name/setString:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setString:forKey:</option>
-	
-	<option value="//api/name/setURL:forKey:">&nbsp;&nbsp;&nbsp;&nbsp;- setURL:forKey:</option>
-	
-	<option value="//api/name/stringForKey:">&nbsp;&nbsp;&nbsp;&nbsp;- stringForKey:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/URLForKey:">URLForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/arrayForKey:">arrayForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/enumerateKeysAndObjectsUsingBlock:">enumerateKeysAndObjectsUsingBlock:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/keyEnumerator">keyEnumerator</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/numberForKey:">numberForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectEnumerator">objectEnumerator</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectForKey:">objectForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/objectForKeyedSubscript:">objectForKeyedSubscript:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/parseProperties:">parseProperties:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/photoForKey:">photoForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/removeObjectForKey:">removeObjectForKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setArray:forKey:">setArray:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setNumber:forKey:">setNumber:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setObject:forKey:">setObject:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setPhoto:forKey:">setPhoto:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setString:forKey:">setString:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/setURL:forKey:">setURL:forKey:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/stringForKey:">stringForKey:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKShareOpenGraphValueContaining Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKShareOpenGraphValueContaining Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject<br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKShareOpenGraphValueContainer.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  Protocol defining operations on open graph actions and objects.</p>
-
-<p>The property keys MUST have namespaces specified on them, such as <code>og:image</code>.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/arrayForKey:">&ndash;&nbsp;arrayForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/enumerateKeysAndObjectsUsingBlock:">&ndash;&nbsp;enumerateKeysAndObjectsUsingBlock:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/keyEnumerator">&ndash;&nbsp;keyEnumerator</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/numberForKey:">&ndash;&nbsp;numberForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectEnumerator">&ndash;&nbsp;objectEnumerator</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectForKey:">&ndash;&nbsp;objectForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/objectForKeyedSubscript:">&ndash;&nbsp;objectForKeyedSubscript:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/parseProperties:">&ndash;&nbsp;parseProperties:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/photoForKey:">&ndash;&nbsp;photoForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/removeObjectForKey:">&ndash;&nbsp;removeObjectForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setArray:forKey:">&ndash;&nbsp;setArray:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setNumber:forKey:">&ndash;&nbsp;setNumber:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setObject:forKey:">&ndash;&nbsp;setObject:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setPhoto:forKey:">&ndash;&nbsp;setPhoto:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setString:forKey:">&ndash;&nbsp;setString:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/setURL:forKey:">&ndash;&nbsp;setURL:forKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/stringForKey:">&ndash;&nbsp;stringForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/URLForKey:">&ndash;&nbsp;URLForKey:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/URLForKey:" title="URLForKey:"></a>
-	<h3 class="subsubtitle method-title">URLForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an NSURL out of the receiver.
-- Parameter key: The key for the value
-- Returns: The NSURL value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSURL *)URLForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/arrayForKey:" title="arrayForKey:"></a>
-	<h3 class="subsubtitle method-title">arrayForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an NSArray out of the receiver.
-- Parameter key: The key for the value
-- Returns: The NSArray value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSArray *)arrayForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/enumerateKeysAndObjectsUsingBlock:" title="enumerateKeysAndObjectsUsingBlock:"></a>
-	<h3 class="subsubtitle method-title">enumerateKeysAndObjectsUsingBlock:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Applies a given block object to the entries of the receiver.
-- Parameter block: A block object to operate on entries in the receiver</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)enumerateKeysAndObjectsUsingBlock:(void ( ^ ) ( NSString *key , id object , BOOL *stop ))<em>block</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/keyEnumerator" title="keyEnumerator"></a>
-	<h3 class="subsubtitle method-title">keyEnumerator</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns an enumerator object that lets you access each key in the receiver.
-- Returns: An enumerator object that lets you access each key in the receiver</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSEnumerator *)keyEnumerator</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/numberForKey:" title="numberForKey:"></a>
-	<h3 class="subsubtitle method-title">numberForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an NSNumber out of the receiver.
-- Parameter key: The key for the value
-- Returns: The NSNumber value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSNumber *)numberForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/objectEnumerator" title="objectEnumerator"></a>
-	<h3 class="subsubtitle method-title">objectEnumerator</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Returns an enumerator object that lets you access each value in the receiver.
-- Returns: An enumerator object that lets you access each value in the receiver</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSEnumerator *)objectEnumerator</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/objectForKey:" title="objectForKey:"></a>
-	<h3 class="subsubtitle method-title">objectForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an FBSDKShareOpenGraphObject out of the receiver.
-- Parameter key: The key for the value
-- Returns: The FBSDKShareOpenGraphObject value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (FBSDKShareOpenGraphObject *)objectForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/objectForKeyedSubscript:" title="objectForKeyedSubscript:"></a>
-	<h3 class="subsubtitle method-title">objectForKeyedSubscript:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Enables subscript access to the values in the receiver.
-- Parameter key: The key for the value
-- Returns: The value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (id)objectForKeyedSubscript:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/parseProperties:" title="parseProperties:"></a>
-	<h3 class="subsubtitle method-title">parseProperties:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Parses properties out of a dictionary into the receiver.
-- Parameter properties: The properties to parse.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)parseProperties:(NSDictionary *)<em>properties</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/photoForKey:" title="photoForKey:"></a>
-	<h3 class="subsubtitle method-title">photoForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an FBSDKSharePhoto out of the receiver.
-- Parameter key: The key for the value
-- Returns: The FBSDKSharePhoto value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (FBSDKSharePhoto *)photoForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/removeObjectForKey:" title="removeObjectForKey:"></a>
-	<h3 class="subsubtitle method-title">removeObjectForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Removes a value from the receiver for the specified key.
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)removeObjectForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setArray:forKey:" title="setArray:forKey:"></a>
-	<h3 class="subsubtitle method-title">setArray:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an NSArray on the receiver.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setArray:(NSArray *)<em>array</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This method will throw if the array contains any values that is not an NSNumber, NSString, NSURL,
-FBSDKSharePhoto or FBSDKShareOpenGraphObject.
-- Parameter array: The NSArray value
-- Parameter key: The key for the value</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setNumber:forKey:" title="setNumber:forKey:"></a>
-	<h3 class="subsubtitle method-title">setNumber:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an NSNumber on the receiver.
-- Parameter number: The NSNumber value
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setNumber:(NSNumber *)<em>number</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setObject:forKey:" title="setObject:forKey:"></a>
-	<h3 class="subsubtitle method-title">setObject:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an FBSDKShareOpenGraphObject on the receiver.
-- Parameter object: The FBSDKShareOpenGraphObject value
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setObject:(FBSDKShareOpenGraphObject *)<em>object</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setPhoto:forKey:" title="setPhoto:forKey:"></a>
-	<h3 class="subsubtitle method-title">setPhoto:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an FBSDKSharePhoto on the receiver.
-- Parameter photo: The FBSDKSharePhoto value
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setPhoto:(FBSDKSharePhoto *)<em>photo</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setString:forKey:" title="setString:forKey:"></a>
-	<h3 class="subsubtitle method-title">setString:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an NSString on the receiver.
-- Parameter string: The NSString value
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setString:(NSString *)<em>string</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/setURL:forKey:" title="setURL:forKey:"></a>
-	<h3 class="subsubtitle method-title">setURL:forKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sets an NSURL on the receiver.
-- Parameter URL: The NSURL value
-- Parameter key: The key for the value</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)setURL:(NSURL *)<em>URL</em> forKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/stringForKey:" title="stringForKey:"></a>
-	<h3 class="subsubtitle method-title">stringForKey:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Gets an NSString out of the receiver.
-- Parameter key: The key for the value
-- Returns: The NSString value or nil</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (NSString *)stringForKey:(NSString *)<em>key</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKShareOpenGraphValueContainer.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharing.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharing.html
deleted file mode 100644
index 64c78b0ede4a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharing.html	
+++ /dev/null
@@ -1,474 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharing Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharing Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/delegate">&nbsp;&nbsp;&nbsp;&nbsp;delegate</option>
-	
-	<option value="//api/name/shareContent">&nbsp;&nbsp;&nbsp;&nbsp;shareContent</option>
-	
-	<option value="//api/name/shouldFailOnDataError">&nbsp;&nbsp;&nbsp;&nbsp;shouldFailOnDataError</option>
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/validateWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- validateWithError:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/delegate">delegate</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareContent">shareContent</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shouldFailOnDataError">shouldFailOnDataError</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/validateWithError:">validateWithError:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharing Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharing Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharing.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The common interface for components that initiate sharing.</p>
-
-<ul>
-<li><p>See:FBSDKShareDialog</p></li>
-<li><p>See:FBSDKMessageDialog</p></li>
-<li><p>See:FBSDKShareAPI</p></li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/delegate">&nbsp;&nbsp;delegate</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareContent">&nbsp;&nbsp;shareContent</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shouldFailOnDataError">&nbsp;&nbsp;shouldFailOnDataError</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/validateWithError:">&ndash;&nbsp;validateWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/delegate" title="delegate"></a>
-	<h3 class="subsubtitle method-title">delegate</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The receiver&rsquo;s delegate or nil if it doesn&rsquo;t have a delegate.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, weak) id&lt;FBSDKSharingDelegate&gt; delegate</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shareContent" title="shareContent"></a>
-	<h3 class="subsubtitle method-title">shareContent</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The content to be shared.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) id&lt;FBSDKSharingContent&gt; shareContent</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/shouldFailOnDataError" title="shouldFailOnDataError"></a>
-	<h3 class="subsubtitle method-title">shouldFailOnDataError</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A Boolean value that indicates whether the receiver should fail if it finds an error with the share content.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) BOOL shouldFailOnDataError</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>If NO, the sharer will still be displayed without the data that was mis-configured.  For example, an
-invalid placeID specified on the shareContent would produce a data error.</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/validateWithError:" title="validateWithError:"></a>
-	<h3 class="subsubtitle method-title">validateWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Validates the content on the receiver.
-- Parameter errorRef: If an error occurs, upon return contains an NSError object that describes the problem.
-- Returns: YES if the content is valid, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)validateWithError:(NSError **)<em>errorRef</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingButton.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingButton.html
deleted file mode 100644
index 63beb0eaf109..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingButton.html	
+++ /dev/null
@@ -1,314 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharingButton Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharingButton Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/shareContent">&nbsp;&nbsp;&nbsp;&nbsp;shareContent</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/shareContent">shareContent</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharingButton Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharingButton Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharingButton.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The common interface for sharing buttons.</p>
-
-<ul>
-<li><p>See:FBSDKSendButton</p></li>
-<li><p>See:FBSDKShareButton</p></li>
-</ul>
-
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/shareContent">&nbsp;&nbsp;shareContent</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/shareContent" title="shareContent"></a>
-	<h3 class="subsubtitle method-title">shareContent</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The content to be shared.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) id&lt;FBSDKSharingContent&gt; shareContent</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingButton.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingContent.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingContent.html
deleted file mode 100644
index 5d7003d45534..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingContent.html	
+++ /dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharingContent Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharingContent Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	<option value="properties">Properties</option>
-	
-	<option value="//api/name/contentURL">&nbsp;&nbsp;&nbsp;&nbsp;contentURL</option>
-	
-	<option value="//api/name/hashtag">&nbsp;&nbsp;&nbsp;&nbsp;hashtag</option>
-	
-	<option value="//api/name/peopleIDs">&nbsp;&nbsp;&nbsp;&nbsp;peopleIDs</option>
-	
-	<option value="//api/name/placeID">&nbsp;&nbsp;&nbsp;&nbsp;placeID</option>
-	
-	<option value="//api/name/ref">&nbsp;&nbsp;&nbsp;&nbsp;ref</option>
-	
-	
-	
-	
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#properties">Properties</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/contentURL">contentURL</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/hashtag">hashtag</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/peopleIDs">peopleIDs</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/placeID">placeID</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/ref">ref</a></span></li>
-	
-</ul></li>
-
-
-
-
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharingContent Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharingContent Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKCopying.html">FBSDKCopying</a><br />NSSecureCoding</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharingContent.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A base interface for content to be shared.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/contentURL">&nbsp;&nbsp;contentURL</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/hashtag">&nbsp;&nbsp;hashtag</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/peopleIDs">&nbsp;&nbsp;peopleIDs</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/placeID">&nbsp;&nbsp;placeID</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/ref">&nbsp;&nbsp;ref</a></code>
-	</span>
-	<span class="task-item-suffix">property</span>
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Properties" name="properties"></a>
-						<h2 class="subtitle subtitle-methods">Properties</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/contentURL" title="contentURL"></a>
-	<h3 class="subsubtitle method-title">contentURL</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  URL for the content being shared.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSURL *contentURL</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>This URL will be checked for all link meta tags for linking in platform specific ways.  See documentation
-for App Links (https://developers.facebook.com/docs/applinks/)
-- Returns: URL representation of the content link</p>
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/hashtag" title="hashtag"></a>
-	<h3 class="subsubtitle method-title">hashtag</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Hashtag for the content being shared.
-- Returns: The hashtag for the content being shared.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) FBSDKHashtag *hashtag</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/peopleIDs" title="peopleIDs"></a>
-	<h3 class="subsubtitle method-title">peopleIDs</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  List of IDs for taggable people to tag with this content.
-  See documentation for Taggable Friends
-(https://developers.facebook.com/docs/graph-api/reference/user/taggable_friends)
-- Returns: Array of IDs for people to tag (NSString)</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSArray *peopleIDs</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/placeID" title="placeID"></a>
-	<h3 class="subsubtitle method-title">placeID</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  The ID for a place to tag with this content.
-- Returns: The ID for the place to tag</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *placeID</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/ref" title="ref"></a>
-	<h3 class="subsubtitle method-title">ref</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A value to be added to the referrer URL when a person follows a link from this shared content on feed.
-- Returns: The ref for the content.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *ref</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharingContent.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDelegate.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDelegate.html
deleted file mode 100644
index b3a9a9573f1f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDelegate.html	
+++ /dev/null
@@ -1,409 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharingDelegate Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharingDelegate Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/sharer:didCompleteWithResults:">&nbsp;&nbsp;&nbsp;&nbsp;- sharer:didCompleteWithResults:</option>
-	
-	<option value="//api/name/sharer:didFailWithError:">&nbsp;&nbsp;&nbsp;&nbsp;- sharer:didFailWithError:</option>
-	
-	<option value="//api/name/sharerDidCancel:">&nbsp;&nbsp;&nbsp;&nbsp;- sharerDidCancel:</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sharer:didCompleteWithResults:">sharer:didCompleteWithResults:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sharer:didFailWithError:">sharer:didFailWithError:</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/sharerDidCancel:">sharerDidCancel:</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharingDelegate Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharingDelegate Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value">NSObject</td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharing.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  A delegate for FBSDKSharing.</p>
-
-<p>The delegate is notified with the results of the sharer as long as the application has permissions to
-receive the information.  For example, if the person is not signed into the containing app, the sharer may not be able
-to distinguish between completion of a share and cancellation.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sharer:didCompleteWithResults:">&ndash;&nbsp;sharer:didCompleteWithResults:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sharer:didFailWithError:">&ndash;&nbsp;sharer:didFailWithError:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/sharerDidCancel:">&ndash;&nbsp;sharerDidCancel:</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/sharer:didCompleteWithResults:" title="sharer:didCompleteWithResults:"></a>
-	<h3 class="subsubtitle method-title">sharer:didCompleteWithResults:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the share completes without error or cancellation.
-- Parameter sharer: The FBSDKSharing that completed.
-- Parameter results: The results from the sharer.  This may be nil or empty.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)sharer:(id&lt;FBSDKSharing&gt;)<em>sharer</em> didCompleteWithResults:(NSDictionary *)<em>results</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/sharer:didFailWithError:" title="sharer:didFailWithError:"></a>
-	<h3 class="subsubtitle method-title">sharer:didFailWithError:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the sharer encounters an error.
-- Parameter sharer: The FBSDKSharing that completed.
-- Parameter error: The error.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)sharer:(id&lt;FBSDKSharing&gt;)<em>sharer</em> didFailWithError:(NSError *)<em>error</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/sharerDidCancel:" title="sharerDidCancel:"></a>
-	<h3 class="subsubtitle method-title">sharerDidCancel:</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Sent to the delegate when the sharer is cancelled.
-- Parameter sharer: The FBSDKSharing that completed.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (void)sharerDidCancel:(id&lt;FBSDKSharing&gt;)<em>sharer</em></code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDialog.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDialog.html
deleted file mode 100644
index ebe91af438e0..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/Protocols/FBSDKSharingDialog.html	
+++ /dev/null
@@ -1,368 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="html/html; charset=utf-8" />
-		<title>FBSDKSharingDialog Protocol Reference</title>
-		<meta id="xcode-display" name="xcode-display" content="render"/>
-		<link rel="stylesheet" type="text/css" href="../css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="../css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="../index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="../index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">FBSDKSharingDialog Protocol Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar">
-				<li id="toc_button">
-					<button aria-label="Show Table of Contents" role="checkbox" class="open" id="table_of_contents"><span class="disclosure"></span>Table of Contents</button>
-				</li>
-				<li id="jumpto_button" role="navigation">
-					<select id="jumpTo">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-	
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<option value="instance_methods">Instance Methods</option>
-	
-	<option value="//api/name/canShow">&nbsp;&nbsp;&nbsp;&nbsp;- canShow</option>
-	
-	<option value="//api/name/show">&nbsp;&nbsp;&nbsp;&nbsp;- show</option>
-	
-	
-	
-</select>
-				</li>
-			</ul>
-		</header>
-		<nav id="tocContainer" class="isShowingTOC">
-			<ul id="toc" role="tree">
-				
-<li role="treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#overview">Overview</a></span></li>
-
-
-
-
-<li role="treeitem" id="task_treeitem"><span class="nodisclosure"></span><span class="sectionName"><a href="#tasks">Tasks</a></span><ul>
-	
-</ul></li>
-
-
-
-
-
-
-
-
-
-<li role="treeitem" class="children"><span class="disclosure"></span><span class="sectionName"><a href="#instance_methods">Instance Methods</a></span><ul>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/canShow">canShow</a></span></li>
-	
-	<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/show">show</a></span></li>
-	
-</ul></li>
-
-
-			</ul>
-		</nav>
-		<article>
-			<div id="contents" class="isShowingTOC" role="main">
-				<a title="FBSDKSharingDialog Protocol Reference" name="top"></a>
-				<div class="main-navigation navigation-top">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">FBSDKSharingDialog Protocol Reference</h1>
-					</div>		
-				</div>
-				<div id="container">	
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<td class="specification-title">Conforms to</td>
-	<td class="specification-value"><a href="../Protocols/FBSDKSharing.html">FBSDKSharing</a></td>
-</tr><tr>
-	<td class="specification-title">Declared in</td>
-	<td class="specification-value">FBSDKSharing.h</td>
-</tr>
-						</tbody></table></div>
-					
-                    
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>  The common interface for dialogs that initiate sharing.</p>
-					</div>
-					
-					
-					
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						<h2 class="subtitle subtitle-tasks">Tasks</h2>
-						
-						
-						
-						
-
-						<ul class="task-list">
-							<li>
-	<span class="tooltip">
-		<code><a href="#//api/name/canShow">&ndash;&nbsp;canShow</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li><li>
-	<span class="tooltip">
-		<code><a href="#//api/name/show">&ndash;&nbsp;show</a></code>
-	</span>
-	
-	<span class="task-item-suffix">required method</span>
-</li>
-						</ul>
-						
-					</div>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					<div class="section section-methods">
-						<a title="Instance Methods" name="instance_methods"></a>
-						<h2 class="subtitle subtitle-methods">Instance Methods</h2>
-						
-						<div class="section-method">
-	<a name="//api/name/canShow" title="canShow"></a>
-	<h3 class="subsubtitle method-title">canShow</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  A Boolean value that indicates whether the receiver can initiate a share.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)canShow</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection discussion-section">
-		<h4 class="method-subtitle">Discussion</h4>
-		<p>May return NO if the appropriate Facebook app is not installed and is required or an access token is
-required but not available.  This method does not validate the content on the receiver, so this can be checked before
-building up the content.</p>
-
-<ul>
-<li>See:[FBSDKSharing validateWithError:]</li>
-<li>Returns: YES if the receiver can share, otherwise NO.</li>
-</ul>
-
-	</div>
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-						<div class="section-method">
-	<a name="//api/name/show" title="show"></a>
-	<h3 class="subsubtitle method-title">show</h3>
-	
-	
-	
-	<div class="method-subsection brief-description">
-		<p>  Shows the dialog.
-- Returns: YES if the receiver was able to begin sharing, otherwise NO.</p>
-	</div>		
-	
-    
-
-	<div class="method-subsection method-declaration"><code>- (BOOL)show</code></div>
-
-    
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<div class="method-subsection declared-in-section">
-		<h4 class="method-subtitle">Declared In</h4>
-		<code class="declared-in-ref">FBSDKSharing.h</code><br />
-	</div>				
-	
-	
-</div>
-						
-					</div>
-					
-					
-                    
-                    
-                    
-                    
-
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<ul>
-	<li><a href="../index.html">Index</a></li>
-	<li><a href="../hierarchy.html">Hierarchy</a></li>
-</ul>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-					</div>
-				</div>
-			</div>
-		</article>
-		<script type="text/javascript">
-			function jumpToChange()
-			{
-				window.location.hash = this.options[this.selectedIndex].value;
-			}
-			
-			function toggleTOC()
-			{
-				var contents = document.getElementById('contents');
-				var tocContainer = document.getElementById('tocContainer');
-				
-				if (this.getAttribute('class') == 'open')
-				{
-					this.setAttribute('class', '');
-					contents.setAttribute('class', '');
-					tocContainer.setAttribute('class', '');
-					
-					window.name = "hideTOC";
-				}
-				else
-				{
-					this.setAttribute('class', 'open');
-					contents.setAttribute('class', 'isShowingTOC');
-					tocContainer.setAttribute('class', 'isShowingTOC');
-					
-					window.name = "";
-				}
-				return false;
-			}
-			
-			function toggleTOCEntryChildren(e)
-			{
-				e.stopPropagation();
-				var currentClass = this.getAttribute('class');
-				if (currentClass == 'children') {
-					this.setAttribute('class', 'children open');
-				}
-				else if (currentClass == 'children open') {
-					this.setAttribute('class', 'children');
-				}
-				return false;
-			}
-			
-			function tocEntryClick(e)
-			{
-				e.stopPropagation();
-				return true;
-			}
-			
-			function init()
-			{
-				var selectElement = document.getElementById('jumpTo');
-				selectElement.addEventListener('change', jumpToChange, false);
-				
-				var tocButton = document.getElementById('table_of_contents');
-				tocButton.addEventListener('click', toggleTOC, false);
-				
-				var taskTreeItem = document.getElementById('task_treeitem');
-				if (taskTreeItem.getElementsByTagName('li').length > 0)
-				{
-					taskTreeItem.setAttribute('class', 'children');
-					taskTreeItem.firstChild.setAttribute('class', 'disclosure');
-				}
-				
-				var tocList = document.getElementById('toc');
-				
-				var tocEntries = tocList.getElementsByTagName('li');
-				for (var i = 0; i < tocEntries.length; i++) {
-					tocEntries[i].addEventListener('click', toggleTOCEntryChildren, false);
-				}
-				
-				var tocLinks = tocList.getElementsByTagName('a');
-				for (var i = 0; i < tocLinks.length; i++) {
-					tocLinks[i].addEventListener('click', tocEntryClick, false);
-				}
-				
-				if (window.name == "hideTOC") {
-					toggleTOC.call(tocButton);
-				}
-			}
-			
-			window.onload = init;
-			
-			// If showing in Xcode, hide the TOC and Header
-			if (navigator.userAgent.match(/xcode/i)) {
-				document.getElementById("contents").className = "hideInXcode"
-				document.getElementById("tocContainer").className = "hideInXcode"
-				document.getElementById("top_header").className = "hideInXcode"
-			}
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css
deleted file mode 100644
index 33081897dc83..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/styles.css	
+++ /dev/null
@@ -1,615 +0,0 @@
-body {
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	font-size: 13px;
-}
-
-code {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	color: #666;
-}
-
-pre {
-	font-family: Courier, Consolas, monospace;
-	font-size: 13px;
-	line-height: 18px;
-	tab-interval: 0.5em;
-	border: 1px solid #C7CFD5;
-	background-color: #F1F5F9;
-	color: #666;
-	padding: 0.3em 1em;
-}
-
-ul {
-	list-style-type: square;
-}
-
-li {
-	margin-bottom: 10px;
-}
-
-a, a code {
-	text-decoration: none;
-	color: #36C;
-}
-
-a:hover, a:hover code {
-	text-decoration: underline;
-	color: #36C;
-}
-
-h2 {
-	border-bottom: 1px solid #8391A8;
-	color: #3C4C6C;
-	font-size: 187%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-bottom: 2px;	
-}
-
-table {
-    margin-bottom: 4em;
-    border-collapse:collapse;
-    vertical-align: middle;
-}
-
-td {
-    border: 1px solid #9BB3CD;
-    padding: .667em;
-    font-size: 100%;
-}
-
-th {
-    border: 1px solid #9BB3CD;
-    padding: .3em .667em .3em .667em;
-    background: #93A5BB;
-    font-size: 103%;
-    font-weight: bold;
-    color: white;
-    text-align: left;
-}
-
-/* @group Common page elements */
-
-#top_header {
-	height: 91px;
-	left: 0;
-	min-width: 598px;
-	position: absolute;
-	right: 0;
-	top: 0;
-	z-index: 900;
-}
-
-#footer {
-	clear: both;
-	padding-top: 20px;
-	text-align: center;
-}
-
-#contents, #overview_contents {
-	-webkit-overflow-scrolling: touch;
-	border-top: 1px solid #A9A9A9;
-	position: absolute;
-	top: 90px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding-left: 2em;
-	padding-right: 2em;
-	padding-top: 1em;
-	min-width: 550px;
-}
-
-#contents.isShowingTOC {
-	left: 230px;
-	min-width: 320px;
-}
-
-.copyright {
-	font-size: 12px;
-}
-
-.generator {
-	font-size: 11px;
-}
-
-.main-navigation ul li {
-	display: inline;
-	margin-left: 15px;
-	list-style: none;
-}
-
-.navigation-top {
-	clear: both;
-	float: right;
-}
-
-.navigation-bottom {
-	clear: both;
-	float: right;
-	margin-top: 20px;
-	margin-bottom: -10px;
-}
-
-.open > .disclosure {
-	background-image: url("../img/disclosure_open.png");
-}
-
-.disclosure {
-	background: url("../img/disclosure.png") no-repeat scroll 0 0;
-}
-
-.disclosure, .nodisclosure {
-	display: inline-block;
-	height: 8px;
-	margin-right: 5px;
-	position: relative;
-	width: 9px;
-}
-
-/* @end */
-
-/* @group Header */
-
-#top_header #library {
-	background: url("../img/library_background.png") repeat-x 0 0 #485E78;
-	background-color: #ccc;
-	height: 35px;
-	font-size: 115%;
-}
-
-#top_header #library #libraryTitle {
-	color: #FFFFFF;
-	margin-left: 15px;
-	text-shadow: 0 -1px 0 #485E78;
-	top: 8px;
-	position: absolute;
-}
-
-#libraryTitle {
-        left: 0;
-}
-
-#top_header #library #developerHome {
-	color: #92979E;
-	right: 15px;
-	top: 8px;
-	position: absolute;
-}
-
-#top_header #library a:hover {
-	text-decoration: none;
-}
-
-#top_header #title {
-	background: url("../img/title_background.png") repeat-x 0 0 #8A98A9;
-	border-bottom: 1px solid #757575;
-	height: 25px;
-	overflow: hidden;
-}
-
-#top_header h1 {
-	font-size: 105%;
-	font-weight: normal;
-	margin: 0;
-	padding: 3px 0 2px;
-	text-align: center;
-	/*text-shadow: 0 1px 0 #D5D5D5;*/
-	white-space: nowrap;
-}
-
-#headerButtons {
-	background-color: #D8D8D8;
-	background-image: url("../img/button_bar_background.png");
-	border-bottom: 0px solid #EDEDED;
-	border-top: 0px solid #a8a8a8;
-	font-size: 8pt;
-	height: 28px;
-	left: 0;
-	list-style: none outside none;
-	margin: 0;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	right: 0;
-	top: 61px;
-}
-
-#headerButtons li {
-	background-repeat: no-repeat;
-	display: inline;
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 0;
-}
-
-#toc_button button {
-    background-color: #EBEEF1;
-	border-color: #ACACAC;
-	border-style: none solid none none;
-	border-width: 0 1px 0 0;
-	height: 28px;
-	margin: 0;
-	padding-left: 30px;
-	text-align: left;
-	width: 230px;
-}
-
-li#jumpto_button {
-	left: 230px;
-	margin-left: 0;
-	position: absolute;
-}
-
-li#jumpto_button select {
-	height: 22px;
-	margin: 5px 2px 0 10px;
-	max-width: 300px;
-}
-
-/* @end */
-
-/* @group Table of contents */
-
-#tocContainer.isShowingTOC {
-	border-right: 1px solid #ACACAC;
-	display: block;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding: 0;
-}
-
-#tocContainer {
-	background-color: #EBEEF1;
-	border-top: 1px solid #ACACAC;
-	bottom: 0;
-	display: none;
-	left: 0;
-	overflow: hidden;
-	position: absolute;
-	top: 90px;
-	width: 229px;
-}
-
-#tocContainer > ul#toc {
-	font-size: 11px;
-	margin: 0;
-	padding: 12px 0 18px;
-	width: 209px;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
-}
-
-#tocContainer > ul#toc > li {
-	margin: 0;
-	padding: 0 0 7px 30px;
-	text-indent: -15px;
-}
-
-#tocContainer > ul#toc > li > .sectionName a {
-	color: #000000;
-	font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > .sectionName a:hover {
-	text-decoration: none;
-}
-
-#tocContainer > ul#toc li.children > ul {
-    display: none;
-    height: 0;
-}
-
-#tocContainer > ul#toc > li > ul {
-    margin: 0;
-    padding: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    margin-bottom: 0;
-    padding-left: 15px;
-}
-
-#tocContainer > ul#toc > li ul {
-    list-style: none;
-    margin-right: 0;
-    padding-right: 0;
-}
-
-#tocContainer > ul#toc li.children.open > ul {
-    display: block;
-    height: auto;
-    margin-left: -15px;
-    padding-left: 0;
-}
-
-#tocContainer > ul#toc > li > ul, ul#toc > li > ul > li {
-    margin-left: 0;
-    padding-left: 15px;
-}
-
-#tocContainer li ul li {
-    margin-top: 0.583em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-#tocContainer li ul li span.sectionName {
-    white-space: normal;
-}
-
-#tocContainer > ul#toc > li > ul > li > .sectionName a {
-    font-weight: bold;
-}
-
-#tocContainer > ul#toc > li > ul a {
-    color: #4F4F4F;
-}
-
-/* @end */
-
-/* @group Index formatting */
-
-.index-title {
-	font-size: 13px;
-	font-weight: normal;
-}
-
-.index-column {
-	float: left;
-	width: 30%;
-	min-width: 200px;
-	font-size: 11px;
-}
-
-.index-column ul {
-	margin: 8px 0 0 0;
-	padding: 0;
-	list-style: none;
-}
-
-.index-column ul li {
-	margin: 0 0 3px 0;
-	padding: 0;
-}
-
-.hierarchy-column {
-	min-width: 400px;
-}
-
-.hierarchy-column ul {
-	margin: 3px 0 0 15px;
-}
-
-.hierarchy-column ul li {
-	list-style-type: square;
-}
-
-/* @end */
-
-/* @group Common formatting elements */
-
-.title {
-	font-weight: normal;
-	font-size: 215%;
-	margin-top:0;
-}
-
-.subtitle {
-	font-weight: normal;
-	font-size: 180%;
-	color: #3C4C6C;
-	border-bottom: 1px solid #5088C5;
-}
-
-.subsubtitle {
-	font-weight: normal;
-	font-size: 145%;
-	height: 0.7em;
-}
-
-.note {
-	border: 1px solid #5088C5;
-	background-color: white;
-	margin: 1.667em 0 1.75em 0;
-	padding: 0 .667em .083em .750em;
-}
-
-.warning {
-	border: 1px solid #5088C5;
-	background-color: #F0F3F7;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.bug {
-	border: 1px solid #000;
-	background-color: #ffffcc;
-	margin-bottom: 0.5em;
-	padding: 0.3em 0.8em;
-}
-
-.deprecated {
-	color: #F60425;
-}
-
-/* @end */
-
-/* @group Common layout */
-
-.section {
-	margin-top: 3em;
-}
-
-/* @end */
-
-/* @group Object specification section */
-
-.section-specification {
-	margin-left: 2.5em;
-	margin-right: 2.5em;
-	font-size: 12px;
-}
-
-.section-specification table {
-    margin-bottom: 0em;
-	border-top: 1px solid #d6e0e5;
-}
-
-.section-specification td {
-	vertical-align: top;
-	border-bottom: 1px solid #d6e0e5;
-	border-left-width: 0px;
-	border-right-width: 0px;
-	border-top-width: 0px;
-	padding: .6em;
-}
-
-.section-specification .specification-title {
-	font-weight: bold;
-}
-
-/* @end */
-
-/* @group Tasks section */
-
-.task-list {
-	list-style-type: none;
-	padding-left: 0px;
-}
-
-.task-list li {
-	margin-bottom: 3px;
-}
-
-.task-item-suffix {
-	color: #996;
-	font-size: 12px;
-	font-style: italic;
-	margin-left: 0.5em;
-}
-
-span.tooltip span.tooltip {
-	font-size: 1.0em;
-	display: none;
-	padding: 0.3em;
-	border: 1px solid #aaa;
-	background-color: #fdfec8;
-	color: #000;
-	text-align: left;
-}
-
-span.tooltip:hover span.tooltip {
-	display: block;
-	position: absolute;
-	margin-left: 2em;
-}
-
-/* @end */
-
-/* @group Method section */
-
-.section-method {
-	margin-top: 2.3em;
-}
-
-.method-title {
-	margin-bottom: 1.5em;
-}
-
-.method-subtitle {
-	margin-top: 0.7em;
-	margin-bottom: 0.2em;
-}
-
-.method-subsection p {
-	margin-top: 0.4em;
-	margin-bottom: 0.8em;
-}
-
-.method-declaration {
-	margin-top:1.182em;
-	margin-bottom:.909em;
-}
-
-.method-declaration code {
-	font:14px Courier, Consolas, monospace;
-	color:#000;
-}
-
-.declaration {
-	color: #000;
-}
-
-.termdef {
-    margin-bottom: 10px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: 0px;
-}
-
-.termdef dt {
-    margin: 0;
-    padding: 0;
-}
-
-.termdef dd {
-    margin-bottom: 6px;
-    margin-left: 16px;
-    margin-right: 0px;
-    margin-top: 1px;
-}
-
-.termdef dd p  {
-    margin-bottom: 6px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: -1px;
-}
-
-.argument-def {
-	margin-top: 0.3em;
-	margin-bottom: 0.3em;
-}
-
-.argument-def dd {
-	margin-left: 1.25em;
-}
-
-.see-also-section ul {
-	list-style-type: none;
-	padding-left: 0px;
-	margin-top: 0;
-}
-
-.see-also-section li {
-	margin-bottom: 3px;
-}
-
-.declared-in-ref {
-	color: #666;
-}
-
-#tocContainer.hideInXcode {
-	display: none;
-	border: 0px solid black;
-}
-
-#top_header.hideInXcode {
-	display: none;
-}
-
-#contents.hideInXcode {
-	border: 0px solid black;
-	top: 0px;
-	left: 0px;
-}
-
-/* @end */
-
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css
deleted file mode 100644
index dc54cd2ffbe7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/css/stylesPrint.css	
+++ /dev/null
@@ -1,22 +0,0 @@
-
-header {
-	display: none;
-}
-
-div.main-navigation, div.navigation-top {
-	display: none;
-}
-
-div#overview_contents, div#contents.isShowingTOC, div#contents {
-	overflow: visible;
-	position: relative;
-	top: 0px;
-	border: none;
-	left: 0;
-}
-#tocContainer.isShowingTOC {
-	display: none;
-}
-nav {
-	display: none;
-}
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html
deleted file mode 100644
index c231026909d7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/hierarchy.html	
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook SDK 4.18 for iOS Hierarchy</title>
-			<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-			<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook SDK 4.18 for iOS Hierarchy</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook SDK 4.18 for iOS Hierarchy</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-					<div class="index-column hierarchy-column">
-						<h2 class="index-title">Class Hierarchy</h2>
-						
-	<ul>
-	
-		<li>NSObject
-	<ul>
-	
-		<li><a href="Classes/FBSDKAccessToken.html">FBSDKAccessToken</a></li>
-	
-		<li><a href="Classes/FBSDKAppEvents.html">FBSDKAppEvents</a></li>
-	
-		<li><a href="Classes/FBSDKAppGroupAddDialog.html">FBSDKAppGroupAddDialog</a></li>
-	
-		<li><a href="Classes/FBSDKAppGroupContent.html">FBSDKAppGroupContent</a></li>
-	
-		<li><a href="Classes/FBSDKAppGroupJoinDialog.html">FBSDKAppGroupJoinDialog</a></li>
-	
-		<li><a href="Classes/FBSDKAppInviteContent.html">FBSDKAppInviteContent</a></li>
-	
-		<li><a href="Classes/FBSDKAppInviteDialog.html">FBSDKAppInviteDialog</a></li>
-	
-		<li><a href="Classes/FBSDKAppLinkResolver.html">FBSDKAppLinkResolver</a></li>
-	
-		<li><a href="Classes/FBSDKAppLinkUtility.html">FBSDKAppLinkUtility</a></li>
-	
-		<li><a href="Classes/FBSDKApplicationDelegate.html">FBSDKApplicationDelegate</a></li>
-	
-		<li><a href="Classes/FBSDKGameRequestContent.html">FBSDKGameRequestContent</a></li>
-	
-		<li><a href="Classes/FBSDKGameRequestDialog.html">FBSDKGameRequestDialog</a></li>
-	
-		<li><a href="Classes/FBSDKGraphErrorRecoveryProcessor.html">FBSDKGraphErrorRecoveryProcessor</a></li>
-	
-		<li><a href="Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a></li>
-	
-		<li><a href="Classes/FBSDKGraphRequestConnection.html">FBSDKGraphRequestConnection</a></li>
-	
-		<li><a href="Classes/FBSDKGraphRequestDataAttachment.html">FBSDKGraphRequestDataAttachment</a></li>
-	
-		<li><a href="Classes/FBSDKHashtag.html">FBSDKHashtag</a></li>
-	
-		<li><a href="Classes/FBSDKLoginManager.html">FBSDKLoginManager</a></li>
-	
-		<li><a href="Classes/FBSDKLoginManagerLoginResult.html">FBSDKLoginManagerLoginResult</a></li>
-	
-		<li><a href="Classes/FBSDKMessageDialog.html">FBSDKMessageDialog</a></li>
-	
-		<li><a href="Classes/FBSDKProfile.html">FBSDKProfile</a></li>
-	
-		<li><a href="Classes/FBSDKSettings.html">FBSDKSettings</a></li>
-	
-		<li><a href="Classes/FBSDKShareAPI.html">FBSDKShareAPI</a></li>
-	
-		<li><a href="Classes/FBSDKShareDialog.html">FBSDKShareDialog</a></li>
-	
-		<li><a href="Classes/FBSDKShareLinkContent.html">FBSDKShareLinkContent</a></li>
-	
-		<li><a href="Classes/FBSDKShareMediaContent.html">FBSDKShareMediaContent</a></li>
-	
-		<li><a href="Classes/FBSDKShareOpenGraphContent.html">FBSDKShareOpenGraphContent</a></li>
-	
-		<li><a href="Classes/FBSDKShareOpenGraphValueContainer.html">FBSDKShareOpenGraphValueContainer</a>
-	<ul>
-	
-		<li><a href="Classes/FBSDKShareOpenGraphAction.html">FBSDKShareOpenGraphAction</a></li>
-	
-		<li><a href="Classes/FBSDKShareOpenGraphObject.html">FBSDKShareOpenGraphObject</a></li>
-	
-	</ul>
-</li>
-	
-		<li><a href="Classes/FBSDKSharePhoto.html">FBSDKSharePhoto</a></li>
-	
-		<li><a href="Classes/FBSDKSharePhotoContent.html">FBSDKSharePhotoContent</a></li>
-	
-		<li><a href="Classes/FBSDKShareVideo.html">FBSDKShareVideo</a></li>
-	
-		<li><a href="Classes/FBSDKShareVideoContent.html">FBSDKShareVideoContent</a></li>
-	
-		<li><a href="Classes/FBSDKTestUsersManager.html">FBSDKTestUsersManager</a></li>
-	
-		<li><a href="Classes/FBSDKUtility.html">FBSDKUtility</a></li>
-	
-	</ul>
-</li>
-	
-		<li>UIButton
-	<ul>
-	
-		<li><a href="Classes/FBSDKButton.html">FBSDKButton</a>
-	<ul>
-	
-		<li><a href="Classes/FBSDKLikeButton.html">FBSDKLikeButton</a></li>
-	
-		<li><a href="Classes/FBSDKLoginButton.html">FBSDKLoginButton</a></li>
-	
-		<li><a href="Classes/FBSDKSendButton.html">FBSDKSendButton</a></li>
-	
-		<li><a href="Classes/FBSDKShareButton.html">FBSDKShareButton</a></li>
-	
-	</ul>
-</li>
-	
-	</ul>
-</li>
-	
-		<li>UIControl
-	<ul>
-	
-		<li><a href="Classes/FBSDKLikeControl.html">FBSDKLikeControl</a></li>
-	
-	</ul>
-</li>
-	
-		<li>UIView
-	<ul>
-	
-		<li><a href="Classes/FBSDKProfilePictureView.html">FBSDKProfilePictureView</a></li>
-	
-		<li><a href="Classes/FBSDKTooltipView.html">FBSDKTooltipView</a>
-	<ul>
-	
-		<li><a href="Classes/FBSDKLoginTooltipView.html">FBSDKLoginTooltipView</a></li>
-	
-	</ul>
-</li>
-	
-	</ul>
-</li>
-	
-	</ul>
-
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/BFAppLinkResolving.html">BFAppLinkResolving</a></li>
-							
-							<li><a href="Protocols/FBSDKAppGroupAddDialogDelegate.html">FBSDKAppGroupAddDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKAppGroupJoinDialogDelegate.html">FBSDKAppGroupJoinDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKAppInviteDialogDelegate.html">FBSDKAppInviteDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKCopying.html">FBSDKCopying</a></li>
-							
-							<li><a href="Protocols/FBSDKErrorRecoveryAttempting.html">FBSDKErrorRecoveryAttempting</a></li>
-							
-							<li><a href="Protocols/FBSDKGameRequestDialogDelegate.html">FBSDKGameRequestDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKGraphErrorRecoveryProcessorDelegate.html">FBSDKGraphErrorRecoveryProcessorDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKGraphRequestConnectionDelegate.html">FBSDKGraphRequestConnectionDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKLiking.html">FBSDKLiking</a></li>
-							
-							<li><a href="Protocols/FBSDKLoginButtonDelegate.html">FBSDKLoginButtonDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKLoginTooltipViewDelegate.html">FBSDKLoginTooltipViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKMutableCopying.html">FBSDKMutableCopying</a></li>
-							
-							<li><a href="Protocols/FBSDKShareOpenGraphValueContaining.html">FBSDKShareOpenGraphValueContaining</a></li>
-							
-							<li><a href="Protocols/FBSDKSharing.html">FBSDKSharing</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingButton.html">FBSDKSharingButton</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingDelegate.html">FBSDKSharingDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingDialog.html">FBSDKSharingDialog</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                            
-                            <li><a href="Constants/FBSDKAppEventsFlushBehavior.html">FBSDKAppEventsFlushBehavior</a></li>
-                            
-                            <li><a href="Constants/FBSDKAppGroupPrivacy.html">FBSDKAppGroupPrivacy</a></li>
-                            
-                            <li><a href="Constants/FBSDKAppInviteDestination.html">FBSDKAppInviteDestination</a></li>
-                            
-                            <li><a href="Constants/FBSDKDefaultAudience.html">FBSDKDefaultAudience</a></li>
-                            
-                            <li><a href="Constants/FBSDKErrorCode.html">FBSDKErrorCode</a></li>
-                            
-                            <li><a href="Constants/FBSDKGameRequestActionType.html">FBSDKGameRequestActionType</a></li>
-                            
-                            <li><a href="Constants/FBSDKGameRequestFilter.html">FBSDKGameRequestFilter</a></li>
-                            
-                            <li><a href="Constants/FBSDKGraphRequestErrorCategory.html">FBSDKGraphRequestErrorCategory</a></li>
-                            
-                            <li><a href="Constants/FBSDKLikeControlAuxiliaryPosition.html">FBSDKLikeControlAuxiliaryPosition</a></li>
-                            
-                            <li><a href="Constants/FBSDKLikeControlHorizontalAlignment.html">FBSDKLikeControlHorizontalAlignment</a></li>
-                            
-                            <li><a href="Constants/FBSDKLikeControlStyle.html">FBSDKLikeControlStyle</a></li>
-                            
-                            <li><a href="Constants/FBSDKLikeObjectType.html">FBSDKLikeObjectType</a></li>
-                            
-                            <li><a href="Constants/FBSDKLoginBehavior.html">FBSDKLoginBehavior</a></li>
-                            
-                            <li><a href="Constants/FBSDKLoginButtonTooltipBehavior.html">FBSDKLoginButtonTooltipBehavior</a></li>
-                            
-                            <li><a href="Constants/FBSDKLoginErrorCode.html">FBSDKLoginErrorCode</a></li>
-                            
-                            <li><a href="Constants/FBSDKProfilePictureMode.html">FBSDKProfilePictureMode</a></li>
-                            
-                            <li><a href="Constants/FBSDKShareDialogMode.html">FBSDKShareDialogMode</a></li>
-                            
-                            <li><a href="Constants/FBSDKShareErrorCode.html">FBSDKShareErrorCode</a></li>
-                            
-                            <li><a href="Constants/FBSDKTooltipColorStyle.html">FBSDKTooltipColorStyle</a></li>
-                            
-                            <li><a href="Constants/FBSDKTooltipViewArrowDirection.html">FBSDKTooltipViewArrowDirection</a></li>
-                            
-						</ul>
-						
-                        
-                        <h2 class="index-title">Block References</h2>
-                        <ul>
-                            
-                            <li><a href="Blocks/FBSDKDeferredAppInviteHandler.html">FBSDKDeferredAppInviteHandler</a></li>
-                            
-                            <li><a href="Blocks/FBSDKDeferredAppLinkHandler.html">FBSDKDeferredAppLinkHandler</a></li>
-                            
-                            <li><a href="Blocks/FBSDKGraphRequestHandler.html">FBSDKGraphRequestHandler</a></li>
-                            
-                            <li><a href="Blocks/FBSDKLoginManagerRequestTokenHandler.html">FBSDKLoginManagerRequestTokenHandler</a></li>
-                            
-                            <li><a href="Blocks/FBSDKTestUsersManagerRemoveTestAccountHandler.html">FBSDKTestUsersManagerRemoveTestAccountHandler</a></li>
-                            
-                            <li><a href="Blocks/FBSDKTestUsersManagerRetrieveTestAccountTokensHandler.html">FBSDKTestUsersManagerRetrieveTestAccountTokensHandler</a></li>
-                            
-                        </ul>
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="index.html">Previous</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/index.html b/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/index.html
deleted file mode 100644
index 6b63bdda4fd9..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/DocSets/FacebookSDK-4_18-for-iOS (1).docset/Contents/Resources/Documents/index.html	
+++ /dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Facebook SDK 4.18 for iOS Reference</title>
-		<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
-		<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
-		<meta name="generator" content="appledoc 2.2.1 (build 1333)" />
-	</head>
-	<body>
-		<header id="top_header">
-			<div id="library" class="hideInXcode">
-				<h1><a id="libraryTitle" href="index.html">Facebook SDK 4.18 for iOS </a></h1>
-				<a id="developerHome" href="index.html">Facebook</a>
-			</div>
-			
-			<div id="title" role="banner">
-				<h1 class="hideInXcode">Facebook SDK 4.18 for iOS Reference</h1>
-			</div>
-			<ul id="headerButtons" role="toolbar"></ul>
-		</header>
-		<article>
-			<div id="overview_contents" role="main">
-				<div class="main-navigation navigation-top">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="header">
-					<div class="section-header">
-						<h1 class="title title-header">Facebook SDK 4.18 for iOS Reference</h1>
-					</div>		
-				</div>
-				<div id="container">
-					
-                        
-                    
-					
-					
-					<div class="index-column">
-						<h2 class="index-title">Class References</h2>
-						<ul>
-							
-							<li><a href="Classes/FBSDKAccessToken.html">FBSDKAccessToken</a></li>
-							
-							<li><a href="Classes/FBSDKAppEvents.html">FBSDKAppEvents</a></li>
-							
-							<li><a href="Classes/FBSDKAppGroupAddDialog.html">FBSDKAppGroupAddDialog</a></li>
-							
-							<li><a href="Classes/FBSDKAppGroupContent.html">FBSDKAppGroupContent</a></li>
-							
-							<li><a href="Classes/FBSDKAppGroupJoinDialog.html">FBSDKAppGroupJoinDialog</a></li>
-							
-							<li><a href="Classes/FBSDKAppInviteContent.html">FBSDKAppInviteContent</a></li>
-							
-							<li><a href="Classes/FBSDKAppInviteDialog.html">FBSDKAppInviteDialog</a></li>
-							
-							<li><a href="Classes/FBSDKAppLinkResolver.html">FBSDKAppLinkResolver</a></li>
-							
-							<li><a href="Classes/FBSDKAppLinkUtility.html">FBSDKAppLinkUtility</a></li>
-							
-							<li><a href="Classes/FBSDKApplicationDelegate.html">FBSDKApplicationDelegate</a></li>
-							
-							<li><a href="Classes/FBSDKButton.html">FBSDKButton</a></li>
-							
-							<li><a href="Classes/FBSDKGameRequestContent.html">FBSDKGameRequestContent</a></li>
-							
-							<li><a href="Classes/FBSDKGameRequestDialog.html">FBSDKGameRequestDialog</a></li>
-							
-							<li><a href="Classes/FBSDKGraphErrorRecoveryProcessor.html">FBSDKGraphErrorRecoveryProcessor</a></li>
-							
-							<li><a href="Classes/FBSDKGraphRequest.html">FBSDKGraphRequest</a></li>
-							
-							<li><a href="Classes/FBSDKGraphRequestConnection.html">FBSDKGraphRequestConnection</a></li>
-							
-							<li><a href="Classes/FBSDKGraphRequestDataAttachment.html">FBSDKGraphRequestDataAttachment</a></li>
-							
-							<li><a href="Classes/FBSDKHashtag.html">FBSDKHashtag</a></li>
-							
-							<li><a href="Classes/FBSDKLikeButton.html">FBSDKLikeButton</a></li>
-							
-							<li><a href="Classes/FBSDKLikeControl.html">FBSDKLikeControl</a></li>
-							
-							<li><a href="Classes/FBSDKLoginButton.html">FBSDKLoginButton</a></li>
-							
-							<li><a href="Classes/FBSDKLoginManager.html">FBSDKLoginManager</a></li>
-							
-							<li><a href="Classes/FBSDKLoginManagerLoginResult.html">FBSDKLoginManagerLoginResult</a></li>
-							
-							<li><a href="Classes/FBSDKLoginTooltipView.html">FBSDKLoginTooltipView</a></li>
-							
-							<li><a href="Classes/FBSDKMessageDialog.html">FBSDKMessageDialog</a></li>
-							
-							<li><a href="Classes/FBSDKProfile.html">FBSDKProfile</a></li>
-							
-							<li><a href="Classes/FBSDKProfilePictureView.html">FBSDKProfilePictureView</a></li>
-							
-							<li><a href="Classes/FBSDKSendButton.html">FBSDKSendButton</a></li>
-							
-							<li><a href="Classes/FBSDKSettings.html">FBSDKSettings</a></li>
-							
-							<li><a href="Classes/FBSDKShareAPI.html">FBSDKShareAPI</a></li>
-							
-							<li><a href="Classes/FBSDKShareButton.html">FBSDKShareButton</a></li>
-							
-							<li><a href="Classes/FBSDKShareDialog.html">FBSDKShareDialog</a></li>
-							
-							<li><a href="Classes/FBSDKShareLinkContent.html">FBSDKShareLinkContent</a></li>
-							
-							<li><a href="Classes/FBSDKShareMediaContent.html">FBSDKShareMediaContent</a></li>
-							
-							<li><a href="Classes/FBSDKShareOpenGraphAction.html">FBSDKShareOpenGraphAction</a></li>
-							
-							<li><a href="Classes/FBSDKShareOpenGraphContent.html">FBSDKShareOpenGraphContent</a></li>
-							
-							<li><a href="Classes/FBSDKShareOpenGraphObject.html">FBSDKShareOpenGraphObject</a></li>
-							
-							<li><a href="Classes/FBSDKShareOpenGraphValueContainer.html">FBSDKShareOpenGraphValueContainer</a></li>
-							
-							<li><a href="Classes/FBSDKSharePhoto.html">FBSDKSharePhoto</a></li>
-							
-							<li><a href="Classes/FBSDKSharePhotoContent.html">FBSDKSharePhotoContent</a></li>
-							
-							<li><a href="Classes/FBSDKShareVideo.html">FBSDKShareVideo</a></li>
-							
-							<li><a href="Classes/FBSDKShareVideoContent.html">FBSDKShareVideoContent</a></li>
-							
-							<li><a href="Classes/FBSDKTestUsersManager.html">FBSDKTestUsersManager</a></li>
-							
-							<li><a href="Classes/FBSDKTooltipView.html">FBSDKTooltipView</a></li>
-							
-							<li><a href="Classes/FBSDKUtility.html">FBSDKUtility</a></li>
-							
-						</ul>
-					</div>
-					
-					
-						
-					<div class="index-column">
-						
-						<h2 class="index-title">Protocol References</h2>
-						<ul>
-							
-							<li><a href="Protocols/BFAppLinkResolving.html">BFAppLinkResolving</a></li>
-							
-							<li><a href="Protocols/FBSDKAppGroupAddDialogDelegate.html">FBSDKAppGroupAddDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKAppGroupJoinDialogDelegate.html">FBSDKAppGroupJoinDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKAppInviteDialogDelegate.html">FBSDKAppInviteDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKCopying.html">FBSDKCopying</a></li>
-							
-							<li><a href="Protocols/FBSDKErrorRecoveryAttempting.html">FBSDKErrorRecoveryAttempting</a></li>
-							
-							<li><a href="Protocols/FBSDKGameRequestDialogDelegate.html">FBSDKGameRequestDialogDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKGraphErrorRecoveryProcessorDelegate.html">FBSDKGraphErrorRecoveryProcessorDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKGraphRequestConnectionDelegate.html">FBSDKGraphRequestConnectionDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKLiking.html">FBSDKLiking</a></li>
-							
-							<li><a href="Protocols/FBSDKLoginButtonDelegate.html">FBSDKLoginButtonDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKLoginTooltipViewDelegate.html">FBSDKLoginTooltipViewDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKMutableCopying.html">FBSDKMutableCopying</a></li>
-							
-							<li><a href="Protocols/FBSDKShareOpenGraphValueContaining.html">FBSDKShareOpenGraphValueContaining</a></li>
-							
-							<li><a href="Protocols/FBSDKSharing.html">FBSDKSharing</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingButton.html">FBSDKSharingButton</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingContent.html">FBSDKSharingContent</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingDelegate.html">FBSDKSharingDelegate</a></li>
-							
-							<li><a href="Protocols/FBSDKSharingDialog.html">FBSDKSharingDialog</a></li>
-							
-						</ul>
-						
-                        
-						<h2 class="index-title">Constant References</h2>
-						<ul>
-                        
-                        <li><a href="Constants/FBSDKAppEventsFlushBehavior.html">FBSDKAppEventsFlushBehavior</a></li>
-                        
-                        <li><a href="Constants/FBSDKAppGroupPrivacy.html">FBSDKAppGroupPrivacy</a></li>
-                        
-                        <li><a href="Constants/FBSDKAppInviteDestination.html">FBSDKAppInviteDestination</a></li>
-                        
-                        <li><a href="Constants/FBSDKDefaultAudience.html">FBSDKDefaultAudience</a></li>
-                        
-                        <li><a href="Constants/FBSDKErrorCode.html">FBSDKErrorCode</a></li>
-                        
-                        <li><a href="Constants/FBSDKGameRequestActionType.html">FBSDKGameRequestActionType</a></li>
-                        
-                        <li><a href="Constants/FBSDKGameRequestFilter.html">FBSDKGameRequestFilter</a></li>
-                        
-                        <li><a href="Constants/FBSDKGraphRequestErrorCategory.html">FBSDKGraphRequestErrorCategory</a></li>
-                        
-                        <li><a href="Constants/FBSDKLikeControlAuxiliaryPosition.html">FBSDKLikeControlAuxiliaryPosition</a></li>
-                        
-                        <li><a href="Constants/FBSDKLikeControlHorizontalAlignment.html">FBSDKLikeControlHorizontalAlignment</a></li>
-                        
-                        <li><a href="Constants/FBSDKLikeControlStyle.html">FBSDKLikeControlStyle</a></li>
-                        
-                        <li><a href="Constants/FBSDKLikeObjectType.html">FBSDKLikeObjectType</a></li>
-                        
-                        <li><a href="Constants/FBSDKLoginBehavior.html">FBSDKLoginBehavior</a></li>
-                        
-                        <li><a href="Constants/FBSDKLoginButtonTooltipBehavior.html">FBSDKLoginButtonTooltipBehavior</a></li>
-                        
-                        <li><a href="Constants/FBSDKLoginErrorCode.html">FBSDKLoginErrorCode</a></li>
-                        
-                        <li><a href="Constants/FBSDKProfilePictureMode.html">FBSDKProfilePictureMode</a></li>
-                        
-                        <li><a href="Constants/FBSDKShareDialogMode.html">FBSDKShareDialogMode</a></li>
-                        
-                        <li><a href="Constants/FBSDKShareErrorCode.html">FBSDKShareErrorCode</a></li>
-                        
-                        <li><a href="Constants/FBSDKTooltipColorStyle.html">FBSDKTooltipColorStyle</a></li>
-                        
-                        <li><a href="Constants/FBSDKTooltipViewArrowDirection.html">FBSDKTooltipViewArrowDirection</a></li>
-                        
-						</ul>
-						
-                        
-                        <h2 class="index-title">Block References</h2>
-                        <ul>
-                        
-                        <li><a href="Blocks/FBSDKDeferredAppInviteHandler.html">FBSDKDeferredAppInviteHandler</a></li>
-                        
-                        <li><a href="Blocks/FBSDKDeferredAppLinkHandler.html">FBSDKDeferredAppLinkHandler</a></li>
-                        
-                        <li><a href="Blocks/FBSDKGraphRequestHandler.html">FBSDKGraphRequestHandler</a></li>
-                        
-                        <li><a href="Blocks/FBSDKLoginManagerRequestTokenHandler.html">FBSDKLoginManagerRequestTokenHandler</a></li>
-                        
-                        <li><a href="Blocks/FBSDKTestUsersManagerRemoveTestAccountHandler.html">FBSDKTestUsersManagerRemoveTestAccountHandler</a></li>
-                        
-                        <li><a href="Blocks/FBSDKTestUsersManagerRetrieveTestAccountTokensHandler.html">FBSDKTestUsersManagerRetrieveTestAccountTokensHandler</a></li>
-                        
-                        </ul>
-                        
-						
-					</div>
-					
-				</div>
-				<div class="main-navigation navigation-bottom">
-					<a href="hierarchy.html">Next</a>
-				</div>
-				<div id="footer">
-					<hr />
-					<div class="footer-copyright">
-						<p><span class="copyright">&copy; 2016 Facebook. All rights reserved. (Last updated: 2016-11-23)</span><br />
-						
-						<span class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1333)</a>.</span></p>
-						
-	
-					</div>
-				</div>
-			</div>
-		</article>		
-	</body>
-</html>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/README.txt b/Engine/Source/ThirdParty/Facebook/IOS/README.txt
index 57256322efd5..12038f4f0097 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/README.txt
+++ b/Engine/Source/ThirdParty/Facebook/IOS/README.txt
@@ -20,7 +20,7 @@ FEATURES
 * Sharing - https://developers.facebook.com/docs/sharing
 * App Links - https://developers.facebook.com/docs/applinks
 * Graph API - https://developers.facebook.com/docs/ios/graph
-* Analytics for Apps - https://developers.facebook.com/docs/analytics
+* Analytics - https://developers.facebook.com/docs/analytics
 
 GIVE FEEDBACK
 -------------
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.h
deleted file mode 100644
index 14c64fe7422d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) UIViewController *viewController;
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.m
deleted file mode 100644
index da1802fc2604..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/AppDelegate.m
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "AppDelegate.h"
-
-
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    // Override point for customization after application launch.
-  self.viewController = [[UIStoryboard storyboardWithName:@"MainStoryboard" bundle:nil] instantiateInitialViewController];
-  self.window.rootViewController = self.viewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-  // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-  // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-  // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-  // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-  // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-  // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-  // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.h
deleted file mode 100644
index f7f8aad4804c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface BannerViewController : UIViewController <FBAdViewDelegate>
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.m
deleted file mode 100644
index 3765dcddda40..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/BannerViewController.m
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "BannerViewController.h"
-
-@interface BannerViewController ()
-
-@property (nonatomic, weak) IBOutlet UILabel *adStatusLabel;
-@property (nonatomic, strong) FBAdView *adView;
-
-@end
-
-@implementation BannerViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-
-  // Create a banner's ad view with a unique placement ID (generate your own on the Facebook app settings).
-  // Use different ID for each ad placement in your app.
-  BOOL isIPAD = ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad);
-  FBAdSize adSize = isIPAD ? kFBAdSizeHeight90Banner : kFBAdSizeHeight50Banner;
-  self.adView = [[FBAdView alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"
-                                               adSize:adSize
-                                   rootViewController:self];
-
-  // Set a delegate to get notified on changes or when the user interact with the ad.
-  self.adView.delegate = self;
-
-  // When testing on a device, add its hashed ID to force test ads.
-  // The hash ID is printed to console when running on a device.
-  // [FBAdSettings addTestDevice:@"THE HASHED ID AS PRINTED TO CONSOLE"];
-
-  // Reposition the adView to the bottom of the screen
-  CGSize viewSize = self.view.bounds.size;
-  CGSize tabBarSize = self.tabBarController.tabBar.frame.size;
-  viewSize = CGSizeMake(viewSize.width, viewSize.height - tabBarSize.height);
-  CGFloat bottomAlignedY = viewSize.height - adSize.size.height;
-  self.adView.frame = CGRectMake(0, bottomAlignedY, viewSize.width, adSize.size.height);
-
-  // Set autoresizingMask so the rotation is automatically handled
-  self.adView.autoresizingMask =
-    UIViewAutoresizingFlexibleRightMargin |
-    UIViewAutoresizingFlexibleLeftMargin|
-    UIViewAutoresizingFlexibleWidth |
-    UIViewAutoresizingFlexibleTopMargin;
-
-  // Add adView to the view hierarchy.
-  [self.view addSubview:self.adView];
-
-  self.adStatusLabel.text = @"Load an ad";
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-  // Dispose of any resources that can be recreated.
-}
-
-- (IBAction)refreshNowTapped:(UIButton *)sender {
-  self.adView.hidden = YES;
-  [self.adView loadAd];
-}
-
-#pragma mark - FBAdViewDelegate implementation
-
-// Implement this function if you want to change the viewController after the FBAdView
-// is created. The viewController will be used to present the modal view (such as the
-// in-app browser that can appear when an ad is clicked).
-// - (UIViewController *)viewControllerForPresentingModalView
-// {
-//   return self;
-// }
-
-- (void)adViewDidClick:(FBAdView *)adView
-{
-  NSLog(@"Ad was clicked.");
-}
-
-- (void)adViewDidFinishHandlingClick:(FBAdView *)adView
-{
-  NSLog(@"Ad did finish click handling.");
-}
-
-- (void)adViewDidLoad:(FBAdView *)adView
-{
-  self.adStatusLabel.text = @"Ad loaded.";
-  NSLog(@"Ad was loaded.");
-  // Now that the ad was loaded, show the view in case it was hidden before.
-  self.adView.hidden = NO;
-}
-
-- (void)adView:(FBAdView *)adView didFailWithError:(NSError *)error
-{
-  self.adStatusLabel.text = @"Ad failed to load. Check console for details.";
-  NSLog(@"Ad failed to load with error: %@", error);
-
-  // Hide the unit since no ad is shown.
-  self.adView.hidden = YES;
-}
-
-- (void)adViewWillLogImpression:(FBAdView *)adView
-{
-  NSLog(@"Ad impression is being captured.");
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 95e37c9d1938..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1.5x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-Small@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "44x44",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
-    },
-    {
-      "idiom" : "car",
-      "size" : "120x120",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Contents.json
deleted file mode 100644
index 2d92bd53fdb2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Contents.json
deleted file mode 100644
index 96396ff0d292..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/Gear.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Gear.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/Contents.json
deleted file mode 100644
index 1d0197f899a5..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabBanner.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "TabBanner.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "TabBanner@2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "TabBanner@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/Contents.json
deleted file mode 100644
index a9b071cc80ec..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabInterstitial.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "TabInterstitial.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "TabInterstitial@2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "TabInterstitial@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/Contents.json
deleted file mode 100644
index b6cb55ee5bb4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/Images.xcassets/TabMediumRect.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "TabMediumRect.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "TabMediumRect@2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "TabMediumRect@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.h
deleted file mode 100644
index 039ec2cab86b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface InterstitialViewController : UIViewController <FBInterstitialAdDelegate>
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.m
deleted file mode 100644
index 50066a27d858..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/InterstitialViewController.m
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "InterstitialViewController.h"
-
-@interface InterstitialViewController ()
-
-@property (weak, nonatomic) IBOutlet UILabel *adStatusLabel;
-@property (nonatomic, strong) FBInterstitialAd *interstitialAd;
-
-@end
-
-@implementation InterstitialViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-  // Dispose of any resources that can be recreated.
-}
-
-- (IBAction)loadInterstitalTapped:(id)sender
-{
-  self.adStatusLabel.text = @"Loading interstitial ad...";
-
-  // Create the interstitial unit with a placement ID (generate your own on the Facebook app settings).
-  // Use different ID for each ad placement in your app.
-  self.interstitialAd = [[FBInterstitialAd alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"];
-
-  // Set a delegate to get notified on changes or when the user interact with the ad.
-  self.interstitialAd.delegate = self;
-
-  // Initiate the request to load the ad.
-  [self.interstitialAd loadAd];
-}
-
-- (IBAction)showInterstitialTapped:(id)sender
-{
-  if (!self.interstitialAd || !self.interstitialAd.isAdValid)
-  {
-    // Ad not ready to present.
-    self.adStatusLabel.text = @"Ad not loaded. Click load to request an ad.";
-  } else {
-    self.adStatusLabel.text = nil;
-
-    // Ad is ready, present it!
-    [self.interstitialAd showAdFromRootViewController:self];
-  }
-}
-
-#pragma mark - FBInterstitialAdDelegate implementation
-
-- (void)interstitialAdDidLoad:(FBInterstitialAd *)interstitialAd
-{
-  NSLog(@"Interstitial ad was loaded. Can present now.");
-  self.adStatusLabel.text = @"Ad loaded. Click show to present!";
-}
-
-- (void)interstitialAd:(FBInterstitialAd *)interstitialAd didFailWithError:(NSError *)error
-{
-  NSLog(@"Interstitial failed to load with error: %@", error.description);
-  self.adStatusLabel.text = @"Interstitial ad failed to load. Check console for details.";
-}
-
-- (void)interstitialAdDidClick:(FBInterstitialAd *)interstitialAd
-{
-  NSLog(@"Interstitial was clicked.");
-}
-
-- (void)interstitialAdDidClose:(FBInterstitialAd *)interstitialAd
-{
-  NSLog(@"Interstitial closed.");
-
-  // Optional, Cleaning up.
-  self.interstitialAd = nil;
-}
-
-- (void)interstitialAdWillClose:(FBInterstitialAd *)interstitialAd
-{
-  NSLog(@"Interstitial will close.");
-}
-
-- (void)interstitialAdWillLogImpression:(FBInterstitialAd *)interstitialAd
-{
-  NSLog(@"Interstitial impression is being captured.");
-}
-
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.h
deleted file mode 100644
index 491d30844ec2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface MediumRectViewController : UIViewController <FBAdViewDelegate>
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.m
deleted file mode 100644
index 81ae81c6502b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/MediumRectViewController.m
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "MediumRectViewController.h"
-
-@interface MediumRectViewController ()
-
-@property (nonatomic, weak) IBOutlet UIView *adContainer;
-@property (nonatomic, weak) IBOutlet UILabel *adStatusLabel;
-@property (nonatomic, strong) FBAdView *mediumRectAdView;
-
-@end
-
-@implementation MediumRectViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-
-  // Create the medium rectangle unit with a placement ID (generate your own on the Facebook app settings).
-  // Use different ID for each ad placement in your app.
-  FBAdSize adSize = kFBAdSizeHeight250Rectangle;
-  self.mediumRectAdView = [[FBAdView alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"
-                                                         adSize:adSize
-                                             rootViewController:self];
-  self.mediumRectAdView.hidden = YES;
-
-  // Set a delegate to get notified on changes or when the user interact with the ad.
-  self.mediumRectAdView.delegate = self;
-
-  // Reposition the adView
-  self.mediumRectAdView.frame = CGRectMake(0, 0, 300, 250);
-
-  [self.adContainer addSubview:self.mediumRectAdView];
-
-  self.adStatusLabel.text = @"Load an ad";
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-  // Dispose of any resources that can be recreated.
-}
-
-- (IBAction)refreshNowTapped:(UIButton *)sender {
-  self.mediumRectAdView.hidden = YES;
-  [self.mediumRectAdView loadAd];
-}
-
-#pragma mark - FBAdViewDelegate implementation
-
-// Implement this function if you want to change the viewController after the FBAdView
-// is created. The viewController will be used to present the modal view (such as the
-// in-app browser that can appear when an ad is clicked).
-// - (UIViewController *)viewControllerForPresentingModalView
-// {
-//   return self;
-// }
-
-- (void)adViewDidClick:(FBAdView *)adView
-{
-  NSLog(@"Ad was clicked.");
-}
-
-- (void)adViewDidFinishHandlingClick:(FBAdView *)adView
-{
-  NSLog(@"Ad did finish click handling.");
-}
-
-- (void)adViewDidLoad:(FBAdView *)adView
-{
-  self.adStatusLabel.text = @"Ad loaded.";
-  NSLog(@"Ad was loaded.");
-  // Now that the ad was loaded, show the view in case it was hidden before.
-  self.mediumRectAdView.hidden = NO;
-}
-
-- (void)adView:(FBAdView *)adView didFailWithError:(NSError *)error
-{
-  self.adStatusLabel.text = @"Ad failed to load. Check console for details.";
-  NSLog(@"Ad failed to load with error: %@", error);
-
-  // Hide the unit since no ad is shown.
-  self.mediumRectAdView.hidden = YES;
-}
-
-- (void)adViewWillLogImpression:(FBAdView *)adView
-{
-  NSLog(@"Ad impression is being captured.");
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.h
deleted file mode 100644
index f978ad21be9a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface RewardedVideoViewController : UIViewController <FBRewardedVideoAdDelegate>
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.m
deleted file mode 100644
index 13adff930138..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/RewardedVideoViewController.m
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "RewardedVideoViewController.h"
-
-@interface RewardedVideoViewController ()
-
-@property (weak, nonatomic) IBOutlet UILabel *adStatusLabel;
-@property (nonatomic, strong) FBRewardedVideoAd *rewardedVideoAd;
-
-@end
-
-@implementation RewardedVideoViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-  // Dispose of any resources that can be recreated.
-}
-
-- (IBAction)loadRewardedVideoTapped:(id)sender
-{
-  self.adStatusLabel.text = @"Loading rewarded video ad...";
-
-  // Create the rewarded video unit with a placement ID (generate your own on the Facebook app settings).
-  // Use different ID for each ad placement in your app.
-  self.rewardedVideoAd = [[FBRewardedVideoAd alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID" withUserID:@"user123"  withCurrency:@"gold" withAmount:1];
-  // Set a delegate to get notified on changes or when the user interact with the ad.
-  self.rewardedVideoAd.delegate = self;
-
-  // Initiate the request to load the ad.
-  [self.rewardedVideoAd loadAd];
-}
-
-- (IBAction)showRewardedVideoTapped:(id)sender
-{
-  if (!self.rewardedVideoAd || !self.rewardedVideoAd.isAdValid)
-  {
-    // Ad not ready to present.
-    self.adStatusLabel.text = @"Ad not loaded. Click load to request an ad.";
-  } else {
-    self.adStatusLabel.text = nil;
-
-    // Ad is ready, present it!
-    [self.rewardedVideoAd showAdFromRootViewController:self animated:NO];
-  }
-}
-
-#pragma mark - FBRewardedVideoAdDelegate implementation
-
-- (void)rewardedVideoAdDidLoad:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video ad was loaded. Can present now.");
-  self.adStatusLabel.text = @"Ad loaded. Click show to present!";
-}
-
-- (void)rewardedVideoAd:(FBRewardedVideoAd *)rewardedVideoAd didFailWithError:(NSError *)error
-{
-  NSLog(@"Rewarded video failed to load with error: %@", error.description);
-  self.adStatusLabel.text = [NSString stringWithFormat:@"Rewarded Video ad failed to load. %@", error.localizedDescription];
-}
-
-- (void)rewardedVideoAdDidClick:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video was clicked.");
-}
-
-- (void)rewardedVideoAdDidClose:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video closed.");
-
-  // Optional, Cleaning up.
-  self.rewardedVideoAd = nil;
-}
-
-- (void)rewardedVideoAdWillClose:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video will close.");
-}
-
-- (void)rewardedVideoAdWillLogImpression:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video impression is being captured.");
-}
-
-- (void)rewardedVideoAdComplete:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video was completed successfully.");
-}
-
-- (void)rewardedVideoAdServerSuccess:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video server side reward succeeded.");
-}
-
-- (void)rewardedVideoAdServerFailed:(FBRewardedVideoAd *)rewardedVideoAd
-{
-  NSLog(@"Rewarded video server side reward failed.");
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.h
deleted file mode 100644
index 1217be831aa8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface SettingsViewController : UIViewController
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.m
deleted file mode 100644
index 466761d3823e..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/SettingsViewController.m
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "SettingsViewController.h"
-
-
-
-@interface SettingsViewController () <UITextFieldDelegate>
-
-@property (weak, nonatomic) IBOutlet UIStepper *debugLevelStepper;
-@property (weak, nonatomic) IBOutlet UILabel *debugLevelLabel;
-@property (weak, nonatomic) IBOutlet UITextField *sandboxTextField;
-@property (weak, nonatomic) IBOutlet UISwitch *testModeSwitch;
-@property (weak, nonatomic) IBOutlet UILabel *versionLabel;
-
-
-@end
-
-@implementation SettingsViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  self.sandboxTextField.delegate = self;
-
-  UIImage *whiteImage = [self imageWithSolidColor:[UIColor whiteColor]];
-  UIImage *greyImage = [self imageWithSolidColor:[UIColor lightGrayColor]];
-  [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateNormal];
-  [self.debugLevelStepper setBackgroundImage:greyImage forState:UIControlStateHighlighted];
-  [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateDisabled];
-  [self.testModeSwitch addTarget:self action:@selector(stateChanged:) forControlEvents:UIControlEventValueChanged];
-  [self.testModeSwitch setOn:[FBAdSettings isTestMode] animated:NO];
-
-
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-  [super viewDidAppear:animated];
-
-  self.sandboxTextField.text = [FBAdSettings urlPrefix];
-  self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-  self.debugLevelStepper.value = [FBAdSettings getLogLevel];
-  self.versionLabel.text = FB_AD_SDK_VERSION;
-}
-
-- (UIImage *)imageWithSolidColor:(UIColor *)color {
-  CGRect rect = CGRectMake(0.0f, 0.0f, 1.0f, 1.0f);
-  UIGraphicsBeginImageContext(rect.size);
-  CGContextRef context = UIGraphicsGetCurrentContext();
-
-  CGContextSetFillColorWithColor(context, [color CGColor]);
-  CGContextFillRect(context, rect);
-
-  UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-
-  return image;
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-}
-
-- (void)stateChanged:(id)sender
-{
-  if(sender == self.testModeSwitch) {
-    if ([sender isOn]) {
-      [FBAdSettings addTestDevice:[FBAdSettings testDeviceHash]];
-    } else {
-      [FBAdSettings clearTestDevice:[FBAdSettings testDeviceHash]];
-    }
-  }
-}
-
-- (IBAction)debugLevelStepperDidChange:(UIStepper *)sender
-{
-  if (sender == self.debugLevelStepper) {
-    [FBAdSettings setLogLevel:sender.value];
-    self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-  }
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-  if (textField == self.sandboxTextField) {
-    [FBAdSettings setUrlPrefix:textField.text];
-  }
-
-  [textField resignFirstResponder];
-
-  return YES;
-}
-
-- (NSString *)logLevelToString:(FBAdLogLevel)logLevel
-{
-  NSString *logLevelString = nil;
-  switch (logLevel) {
-    case FBAdLogLevelNone:
-      logLevelString = @"None";
-      break;
-    case FBAdLogLevelNotification:
-      logLevelString = @"Notification";
-      break;
-    case FBAdLogLevelError:
-      logLevelString = @"Error";
-      break;
-    case FBAdLogLevelWarning:
-      logLevelString = @"Warning";
-      break;
-    case FBAdLogLevelLog:
-      logLevelString = @"Log";
-      break;
-    case FBAdLogLevelDebug:
-      logLevelString = @"Debug";
-      break;
-    case FBAdLogLevelVerbose:
-      logLevelString = @"Verbose";
-      break;
-    default:
-      logLevelString = @"Unknown";
-      break;
-  }
-
-  return logLevelString;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/main.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/main.m
deleted file mode 100644
index 75692c05dd58..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/AdUnitsSample/main.m
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char *argv[])
-{
-  @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/ReadMe.txt b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/ReadMe.txt
deleted file mode 100644
index a00882702fc4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/AdUnitsSample/ReadMe.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-AdUnitsSample
-
-In this sample we demonstrate how to add a banner ad unit (FBAdView) and an interstitial unit (FBInterstitialAd) to an app. We also
-show how to wire up delegates to get notified when the ad status changes over time or when the user interacts with the ad.
-
-When running the sample on the simulator, test ads are served by default. On a device however, real ads will be served unless you specify otherwise. If you test your app on a device, please make sure to call the following API to enable test ads: [FBAdSettings addTestDevice:@"<your device hash printed out on console>"]. 
-
-How to use the sample?
-
-Install the Facebook SDK for iOS.
-1/ Launch the AdUnitsSample project using Xcode from the <Facebook SDK>/samples/AdUnitsSample directory.
-2/ Open the file ViewController.m and replace "YOUR_PLACEMENT_ID" with the Placement ID you created through developer.facebook.com. 
-3/ Run the sample on the simulator or on a device.
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.h
deleted file mode 100644
index 524822439b5d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.m
deleted file mode 100644
index d31c1a9f4f87..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/AppDelegate.m
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "AppDelegate.h"
-
-@interface AppDelegate ()
-
-@end
-
-@implementation AppDelegate
-
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Override point for customization after application launch.
-    return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index ce6eaf8183d8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1.5x.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-Small@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "44x44",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Contents.json
deleted file mode 100644
index 96396ff0d292..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/Gear.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Gear.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/first.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/first.imageset/Contents.json
deleted file mode 100644
index a748328cd8ea..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/first.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "first.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/second.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/second.imageset/Contents.json
deleted file mode 100644
index 06f1f35e9664..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/Assets.xcassets/second.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "second.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.h
deleted file mode 100644
index 4231f91ce40b..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-#import <FBAudienceNetwork/FBAudienceNetwork.h>
-
-@interface InstreamAdRendererController : UIViewController
-
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.m
deleted file mode 100644
index 34731d5d14c5..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdRendererController.m
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "InstreamAdRendererController.h"
-
-#import "VASTAdRequest.h"
-#import "VASTAdResponse.h"
-
-@interface InstreamAdRendererController () <FBInstreamAdRendererViewDelegate,VASTAdRequestDelegate,UITextFieldDelegate>
-
-@property (nonatomic, strong) VASTAdRequest *adRequest;
-@property (weak, nonatomic) IBOutlet UILabel *adStatusLabel;
-@property (nonatomic, strong) FBInstreamAdRendererView *rendererView;
-@property (weak, nonatomic) IBOutlet UITextField *vastUrlField;
-
-@end
-
-@implementation InstreamAdRendererController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.vastUrlField.delegate = self;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
-    [super viewDidDisappear:animated];
-    if (self.tabBarController.selectedViewController != self) {
-        [self.rendererView removeFromSuperview];
-        self.rendererView = nil;
-        self.adStatusLabel.text = @"";
-    }
-}
-
-- (IBAction)showAdTapped:(id)sender
-{
-    [self makeAdRequest];
-}
-
-- (void)resizeInstreamAdRendererViewToSize:(CGSize)size
-{
-    if (self.rendererView) {
-        // Resize with 16:9 ratio
-        CGFloat width = size.width;
-        CGFloat height = width * (9.0 / 16.0);
-        self.rendererView.frame = CGRectMake(0.0, 80.0, width, height);
-    }
-}
-
-- (void)makeAdRequest
-{
-    if (self.adRequest) {
-        return;
-    }
-    NSURL *vastUrl = [NSURL URLWithString:self.vastUrlField.text];
-    if (!vastUrl) {
-        self.adStatusLabel.text = @"Invalid VAST request URL";
-        return;
-    }
-    self.adStatusLabel.text = @"Loading ad from VAST...";
-    self.adRequest = [[VASTAdRequest alloc] initWithURL:vastUrl];
-    self.adRequest.delegate = self;
-    [self.adRequest makeRequest];
-}
-
-- (void)renderAdWithAdParameters:(NSString *)adParameters
-{
-    if (self.rendererView) {
-        [self.rendererView removeFromSuperview];
-    }
-    self.rendererView = [FBInstreamAdRendererView new];
-    self.rendererView.delegate = self;
-    self.rendererView.backgroundColor = [UIColor grayColor];
-    [self resizeInstreamAdRendererViewToSize:self.view.bounds.size];
-    [self.view addSubview:self.rendererView];
-    self.adStatusLabel.text = @"Loading ad...";
-    [self.rendererView loadAdFromAdParameters:adParameters];
-}
-
-- (void)removeAdRendererView
-{
-    [self.rendererView removeFromSuperview];
-    self.rendererView = nil;
-}
-
-#pragma mark - VASTAdRequestDelete implementation
-
-- (void)adRequest:(VASTAdRequest *)adRequest didCompleteWithAdResponse:(VASTAdResponse *)adResponse
-{
-    self.adRequest = nil;
-    if (adResponse.adParameters) {
-        [self renderAdWithAdParameters:adResponse.adParameters];
-    } else {
-        self.adStatusLabel.text = @"VAST AdParameters missing";
-    }
-}
-
-- (void)adRequest:(VASTAdRequest *)adRequest didFailWithError:(NSError *)error
-{
-    self.adRequest =  nil;
-    self.adStatusLabel.text = [NSString stringWithFormat:@"VAST request failed: %@", error.localizedDescription];
-}
-
-#pragma mark - FBInstreamAdRendererViewDelegate implementation
-
-- (void)adRendererViewDidClick:(FBInstreamAdRendererView *)adRendererView
-{
-    self.adStatusLabel.text = @"Ad clicked";
-}
-
-- (void)adRendererViewDidFinishHandlingClick:(FBInstreamAdRendererView *)adRendererView
-{
-    self.adStatusLabel.text = @"Ad finished handling click";
-}
-
-- (void)adRendererViewDidLoad:(FBInstreamAdRendererView *)adRendererView
-{
-    self.adStatusLabel.text = @"Ad loaded";
-    [self.rendererView showAdFromRootViewController:self];
-}
-
-- (void)adRendererViewDidEnd:(FBInstreamAdRendererView *)adRendererView
-{
-    self.adStatusLabel.text = @"Ad ended";
-    [self removeAdRendererView];
-}
-
-- (void)adRendererView:(FBInstreamAdRendererView *)adRendererView didFailWithError:(NSError *)error
-{
-    self.adStatusLabel.text = [NSString stringWithFormat:@"Ad failed: %@", error.localizedDescription];
-    [self removeAdRendererView];
-}
-
-- (void)adRendererViewWillLogImpression:(FBInstreamAdRendererView *)adRendererView
-{
-    self.adStatusLabel.text = @"Ad impression";
-}
-
-#pragma mark - UITextFieldDelegate
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-    [textField resignFirstResponder];
-    textField.text = [textField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-    return YES;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.h
deleted file mode 100644
index 526c2f0f3b51..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface InstreamAdViewController : UIViewController <FBInstreamAdViewDelegate>
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.m
deleted file mode 100644
index ba8c424fbda7..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/InstreamAdViewController.m
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "InstreamAdViewController.h"
-
-@interface InstreamAdViewController ()
-
-@property (weak, nonatomic) IBOutlet UILabel *adStatusLabel;
-@property (weak, nonatomic) IBOutlet UIView *mediaView;
-
-@property (nonatomic, strong) FBInstreamAdView *adView;
-
-@end
-
-@implementation InstreamAdViewController
-
-- (void)viewDidDisappear:(BOOL)animated
-{
-    [super viewDidDisappear:animated];
-    // Reset when tab is un-selected
-    if (self.tabBarController.selectedViewController != self) {
-        [self.adView removeFromSuperview];
-        self.adView = nil;
-        self.adStatusLabel.text = @"";
-    }
-}
-
-- (IBAction)loadAdTapped:(id)sender
-{
-    // Create an instream ad view with a unique placement ID (generate your own on the Facebook app settings).
-    // Use different ID for each ad placement in your app.
-    [self.adView removeFromSuperview];
-    self.adView = [[FBInstreamAdView alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"];
-
-    // Set a delegate to get notified on changes or when the user interacts with the ad.
-    self.adView.delegate = self;
-
-    // Initiate a request to load an ad.
-    [self.adView loadAd];
-    self.adStatusLabel.text = @"Loading instream ad...";
-}
-
-- (IBAction)showAdTapped:(id)sender
-{
-    if (!self.adView || !self.adView.adValid) {
-        // Ad not ready to present.
-        self.adStatusLabel.text = @"Ad not loaded. Click load to request an ad.";
-    } else {
-        // Ad is ready, present it!
-        self.adStatusLabel.text = nil;
-        self.adView.frame = self.mediaView.bounds;
-        self.adView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-        [self.mediaView addSubview:self.adView];
-        [self.adView showAdFromRootViewController:self];
-    }
-}
-
-#pragma mark - FBInstreamAdViewDelegate implementation
-
-- (void)adViewDidLoad:(FBInstreamAdView *)adView
-{
-    self.adStatusLabel.text = @"Ad loaded";
-}
-
-- (void)adViewDidEnd:(FBInstreamAdView *)adView
-{
-    self.adStatusLabel.text = @"Ad ended";
-    [self.adView removeFromSuperview];
-    self.adView = nil;
-}
-
-- (void)adView:(FBInstreamAdView *)adView didFailWithError:(NSError *)error
-{
-    self.adStatusLabel.text = [NSString stringWithFormat:@"Ad failed: %@", error.localizedDescription];
-    [self.adView removeFromSuperview];
-    self.adView = nil;
-}
-
-- (void)adViewDidClick:(FBInstreamAdView *)adView
-{
-    self.adStatusLabel.text = @"Ad clicked";
-}
-
-- (void)adViewWillLogImpression:(FBInstreamAdView *)adView
-{
-    self.adStatusLabel.text = @"Ad impression";
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.h
deleted file mode 100644
index 1217be831aa8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface SettingsViewController : UIViewController
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.m
deleted file mode 100644
index 9c79668dae8a..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/SettingsViewController.m
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "SettingsViewController.h"
-
-@interface SettingsViewController () <UITextFieldDelegate>
-
-@property (weak, nonatomic) IBOutlet UIStepper *debugLevelStepper;
-@property (weak, nonatomic) IBOutlet UILabel *debugLevelLabel;
-@property (weak, nonatomic) IBOutlet UITextField *sandboxTextField;
-@property (weak, nonatomic) IBOutlet UISwitch *testModeSwitch;
-
-@end
-
-@implementation SettingsViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.sandboxTextField.delegate = self;
-
-    UIImage *whiteImage = [self imageWithSolidColor:[UIColor whiteColor]];
-    UIImage *greyImage = [self imageWithSolidColor:[UIColor lightGrayColor]];
-    [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateNormal];
-    [self.debugLevelStepper setBackgroundImage:greyImage forState:UIControlStateHighlighted];
-    [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateDisabled];
-    [self.testModeSwitch addTarget:self action:@selector(stateChanged:) forControlEvents:UIControlEventValueChanged];
-    [self.testModeSwitch setOn:[FBAdSettings isTestMode] animated:NO];
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-
-    self.sandboxTextField.text = [FBAdSettings urlPrefix];
-    self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-    self.debugLevelStepper.value = [FBAdSettings getLogLevel];
-}
-
-- (UIImage *)imageWithSolidColor:(UIColor *)color {
-    CGRect rect = CGRectMake(0.0f, 0.0f, 1.0f, 1.0f);
-    UIGraphicsBeginImageContext(rect.size);
-    CGContextRef context = UIGraphicsGetCurrentContext();
-
-    CGContextSetFillColorWithColor(context, [color CGColor]);
-    CGContextFillRect(context, rect);
-
-    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-
-    return image;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
-
-- (void)stateChanged:(id)sender
-{
-    if(sender == self.testModeSwitch) {
-        if ([sender isOn]) {
-            [FBAdSettings addTestDevice:[FBAdSettings testDeviceHash]];
-        } else {
-            [FBAdSettings clearTestDevice:[FBAdSettings testDeviceHash]];
-        }
-    }
-}
-
-- (IBAction)debugLevelStepperDidChange:(UIStepper *)sender
-{
-    if (sender == self.debugLevelStepper) {
-        [FBAdSettings setLogLevel:sender.value];
-        self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-    }
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-    if (textField == self.sandboxTextField) {
-        [FBAdSettings setUrlPrefix:textField.text];
-    }
-
-    [textField resignFirstResponder];
-
-    return YES;
-}
-
-- (NSString *)logLevelToString:(FBAdLogLevel)logLevel
-{
-    NSString *logLevelString = nil;
-    switch (logLevel) {
-        case FBAdLogLevelNone:
-            logLevelString = @"None";
-            break;
-        case FBAdLogLevelNotification:
-            logLevelString = @"Notification";
-            break;
-        case FBAdLogLevelError:
-            logLevelString = @"Error";
-            break;
-        case FBAdLogLevelWarning:
-            logLevelString = @"Warning";
-            break;
-        case FBAdLogLevelLog:
-            logLevelString = @"Log";
-            break;
-        case FBAdLogLevelDebug:
-            logLevelString = @"Debug";
-            break;
-        case FBAdLogLevelVerbose:
-            logLevelString = @"Verbose";
-            break;
-        default:
-            logLevelString = @"Unknown";
-            break;
-    }
-
-    return logLevelString;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/main.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/main.m
deleted file mode 100644
index 1e552fde870d..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/InstreamAdSample/InstreamAdSample/main.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.h
deleted file mode 100644
index 5265361932be..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import <UIKit/UIKit.h>
-
-#import "ViewController.h"
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) ViewController *viewController;
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.m
deleted file mode 100644
index 94a9929739a8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/AppDelegate.m
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "AppDelegate.h"
-
-
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-
-
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-  // Override point for customization after application launch.
-  self.viewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil];
-  self.window.rootViewController = self.viewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-  // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-  // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-  // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-  // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-  // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-  // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-  // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.h
deleted file mode 100644
index 2cac27523192..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-@import FBAudienceNetwork;
-
-
-@interface CollectionViewController : UIViewController
-@property (strong, nonatomic) IBOutlet UICollectionView *collectionView;
-@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
-
-- (IBAction)dismissViewController:(id)sender;
-- (IBAction)refresh:(id)sender;
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.m
deleted file mode 100644
index 6cc6f125062f..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/CollectionViewController.m
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "CollectionViewController.h"
-
-static NSInteger const kRowStrideForAdCell = 3;
-static NSString *const kDefaultCellIdentifier = @"kDefaultCellIdentifier";
-
-@interface CollectionViewCell : UICollectionViewCell
-
-@property (nonatomic, strong, nullable) UILabel *textLabel;
-
-@end
-
-@implementation CollectionViewCell
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  self = [super initWithFrame:frame];
-  if (self) {
-    UILabel *label = [UILabel new];
-    label.textColor = [UIColor blackColor];
-    label.numberOfLines = 2;
-    self.textLabel = label;
-    [self.contentView addSubview:label];
-  }
-  return self;
-}
-
-@end
-
-@interface CollectionViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, FBNativeAdsManagerDelegate, FBNativeAdDelegate>
-@property (strong, nonatomic) FBNativeAdsManager *_adsManager;
-@property (strong, nonatomic) FBNativeAdCollectionViewCellProvider *_ads;
-@property (strong, nonatomic) NSMutableArray *_collectionViewContentArray;
-@property (assign, nonatomic) BOOL adCellsCreated;
-@end
-
-@implementation CollectionViewController
-
-#pragma mark - Lazy Loading
-- (NSMutableArray *)collectionViewContentArray
-{
-  if (!self._collectionViewContentArray) {
-    self._collectionViewContentArray = [NSMutableArray array];
-    for (NSUInteger i = 0; i < 10; i++) {
-      [self._collectionViewContentArray addObject:[NSString stringWithFormat:@"CollectionView\n Cell #%lu", (unsigned long)(i + 1)]];
-    }
-  }
-
-  return self._collectionViewContentArray;
-}
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  self.collectionView.delegate = self;
-  self.collectionView.dataSource = self;
-
-  [self.collectionView registerClass:[CollectionViewCell class] forCellWithReuseIdentifier:kDefaultCellIdentifier];
-
-  [self loadNativeAd];
-}
-
-- (IBAction)dismissViewController:(id)sender
-{
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (IBAction)refresh:(id)sender
-{
-  [self loadNativeAd];
-}
-
-- (void)loadNativeAd
-{
-  [self.activityIndicator startAnimating];
-
-  if (!self._adsManager) {
-    // Create a native ad manager with a unique placement ID (generate your own on the Facebook app settings)
-    // and how many ads you would like to create. Note that you may get fewer ads than you ask for.
-    // Use different ID for each ad placement in your app.
-    self._adsManager = [[FBNativeAdsManager alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"
-                                                    forNumAdsRequested:5];
-    // Set a delegate to get notified when the ads are loaded.
-    self._adsManager.delegate = self;
-
-    // Configure native ad manager to wait to call nativeAdsLoaded until all ad assets are loaded
-    self._adsManager.mediaCachePolicy = FBNativeAdsCachePolicyAll;
-
-    // When testing on a device, add its hashed ID to force test ads.
-    // The hash ID is printed to console when running on a device.
-    // [FBAdSettings addTestDevice:@"THE HASHED ID AS PRINTED TO CONSOLE"];
-  }
-
-  // Load some ads
-  [self._adsManager loadAds];
-}
-
-#pragma mark FBNativeAdsManagerDelegate implementation
-
-- (void)nativeAdsLoaded
-{
-  NSLog(@"Native ad was loaded, constructing native UI...");
-
-  // After the native ads have loaded we create the native ad cell provider and let it take over
-  FBNativeAdsManager *manager = self._adsManager;
-  self._adsManager.delegate = nil;
-  self._adsManager = nil;
-
-  // The native ad cell provider operates over a loaded ads manager and can create table cells with native
-  // ad templates in them as well as help with the math to have a consistent distribution of ads within a table.
-  FBNativeAdCollectionViewCellProvider *cellProvider = [[FBNativeAdCollectionViewCellProvider alloc] initWithManager:manager forType:FBNativeAdViewTypeGenericHeight300];
-  self._ads = cellProvider;
-  self._ads.delegate = self;
-
-  [self.collectionView reloadData];
-  [self.activityIndicator stopAnimating];
-}
-
-- (void)nativeAdsFailedToLoadWithError:(NSError *)error
-{
-  NSLog(@"Native ad failed to load with error: %@", error);
-  [self.activityIndicator stopAnimating];
-
-  UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Native ad failed to load"
-                                                  message:@"Check console for more details"
-                                                 delegate:nil
-                                        cancelButtonTitle:@"OK"
-                                        otherButtonTitles:nil];
-  [alert show];
-}
-
-#pragma mark FBNativeAdDelegate
-
-- (void)nativeAdDidClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad was clicked.");
-}
-
-- (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad did finish click handling.");
-}
-
-- (void)nativeAdWillLogImpression:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad impression is being captured.");
-}
-
-#pragma mark <UICollectionViewDataSource>
-
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
-  return 1;
-}
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-  // In this example the ads are evenly distributed within the table every kRowStrideForAdCell-th cell.
-  NSUInteger count = [self.collectionViewContentArray count];
-  count = [self._ads adjustCount:count forStride:kRowStrideForAdCell] ?: count;
-  return count;
-}
-
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-  if ([self._ads isAdCellAtIndexPath:indexPath forStride:kRowStrideForAdCell]) {
-    return [self._ads collectionView:collectionView cellForItemAtIndexPath:indexPath];
-  } else {
-    indexPath = [self._ads adjustNonAdCellIndexPath:indexPath forStride:kRowStrideForAdCell] ?: indexPath;
-    CollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kDefaultCellIdentifier forIndexPath:indexPath];
-    cell.textLabel.text = [self.collectionViewContentArray objectAtIndex:indexPath.row];
-    [cell.textLabel sizeToFit];
-    cell.textLabel.center = cell.contentView.center;
-    return cell;
-  }
-}
-
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-  if ([self._ads isAdCellAtIndexPath:indexPath forStride:kRowStrideForAdCell]) {
-    return (CGSize){300.0, [self._ads collectionView:collectionView heightForRowAtIndexPath:indexPath]};
-  } else {
-    return (CGSize){300.0, 100.0};
-  }
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
-  return 20.0;
-}
-
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 6613afc7f70c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Sample App Icon @1.5x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "Icon-Small-50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon-72@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "car",
-      "filename" : "Icon-60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "Icon-Small@2x.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "44x44",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "longLook",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Contents.json
deleted file mode 100644
index 2d92bd53fdb2..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Contents.json b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Contents.json
deleted file mode 100644
index 96396ff0d292..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/Images.xcassets/Gear.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Gear.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Gear@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.h
deleted file mode 100644
index cfa9de204ad3..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface ScrollViewController : UIViewController
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.m
deleted file mode 100644
index f5c34dc1ced4..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ScrollViewController.m
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "ScrollViewController.h"
-
-@interface ScrollViewController () <FBNativeAdDelegate, FBNativeAdsManagerDelegate>
-
-@property (nonatomic, strong) FBNativeAdsManager *manager;
-@property (nonatomic, weak) FBNativeAdScrollView *scrollView;
-@property (nonatomic, weak) IBOutlet UIView *containerView;
-
-@end
-
-@implementation ScrollViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-
-  FBNativeAdsManager *manager = [[FBNativeAdsManager alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID" forNumAdsRequested:5];
-  manager.delegate = self;
-  manager.mediaCachePolicy = FBNativeAdsCachePolicyAll;
-  [manager loadAds];
-  self.manager = manager;
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-  [super viewDidAppear:animated];
-  self.scrollView.frame = self.containerView.bounds;
-}
-
-- (IBAction)dismissViewController:(id)sender
-{
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (IBAction)refresh:(id)sender
-{
-  [self.manager loadAds];
-}
-
-#pragma mark FBNativeAdDelegate
-
-- (void)nativeAdDidClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad was clicked.");
-}
-
-- (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad did finish click handling.");
-}
-
-- (void)nativeAdWillLogImpression:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad impression is being captured.");
-}
-
-#pragma mark FBNativeAdsManagerDelegate
-
-- (void)nativeAdsLoaded
-{
-  NSLog(@"Native ads loaded, constructing native UI...");
-  if (self.scrollView) {
-    [self.scrollView removeFromSuperview];
-    self.scrollView = nil;
-  }
-  FBNativeAdScrollView *scrollView = [[FBNativeAdScrollView alloc] initWithNativeAdsManager:self.manager withType:FBNativeAdViewTypeGenericHeight300];
-  scrollView.delegate = self;
-  scrollView.frame = self.containerView.bounds;
-  [self.containerView addSubview:scrollView];
-  self.scrollView = scrollView;
-}
-
-- (void)nativeAdsFailedToLoadWithError:(NSError *)error
-{
-  NSLog(@"Native ads failed to load with error: %@", error);
-  UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Native ad failed to load"
-                                                  message:@"Check console for more details"
-                                                 delegate:nil
-                                        cancelButtonTitle:@"OK"
-                                        otherButtonTitles:nil];
-  [alert show];
-}
-
-#pragma mark - Orientation
-
-- (FBInterfaceOrientationMask)supportedInterfaceOrientations
-{
-  return UIInterfaceOrientationMaskPortrait;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.h
deleted file mode 100644
index 1217be831aa8..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface SettingsViewController : UIViewController
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.m
deleted file mode 100644
index 1e4d853fe889..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/SettingsViewController.m
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "SettingsViewController.h"
-
-
-
-@interface SettingsViewController () <UITextFieldDelegate>
-
-@property (weak, nonatomic) IBOutlet UIStepper *debugLevelStepper;
-@property (weak, nonatomic) IBOutlet UILabel *debugLevelLabel;
-@property (weak, nonatomic) IBOutlet UITextField *sandboxTextField;
-@property (weak, nonatomic) IBOutlet UISwitch *testModeSwitch;
-@property (weak, nonatomic) IBOutlet UILabel *sdkVersionLabel;
-
-
-@end
-
-@implementation SettingsViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  self.sandboxTextField.delegate = self;
-
-  UIImage *whiteImage = [self imageWithSolidColor:[UIColor whiteColor]];
-  UIImage *greyImage = [self imageWithSolidColor:[UIColor lightGrayColor]];
-  [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateNormal];
-  [self.debugLevelStepper setBackgroundImage:greyImage forState:UIControlStateHighlighted];
-  [self.debugLevelStepper setBackgroundImage:whiteImage forState:UIControlStateDisabled];
-  [self.testModeSwitch setOn:[FBAdSettings isTestMode] animated:NO];
-  self.sdkVersionLabel.text = FB_AD_SDK_VERSION;
-
-
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-  [super viewDidAppear:animated];
-
-  self.sandboxTextField.text = [FBAdSettings urlPrefix];
-  self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-  self.debugLevelStepper.value = [FBAdSettings getLogLevel];
-}
-
-- (UIImage *)imageWithSolidColor:(UIColor *)color {
-  CGRect rect = CGRectMake(0.0f, 0.0f, 1.0f, 1.0f);
-  UIGraphicsBeginImageContext(rect.size);
-  CGContextRef context = UIGraphicsGetCurrentContext();
-
-  CGContextSetFillColorWithColor(context, [color CGColor]);
-  CGContextFillRect(context, rect);
-
-  UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-
-  return image;
-}
-
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-}
-
-- (IBAction)debugLevelStepperDidChange:(UIStepper *)sender
-{
-  if (sender == self.debugLevelStepper) {
-    [FBAdSettings setLogLevel:sender.value];
-    self.debugLevelLabel.text = [self logLevelToString:[FBAdSettings getLogLevel]];
-  }
-}
-
-- (IBAction)testModeStateChanged:(id)sender {
-  UISwitch *testModeSwitch = (UISwitch *)sender;
-
-  if (testModeSwitch.on) {
-    [FBAdSettings addTestDevice:[FBAdSettings testDeviceHash]];
-  } else {
-    [FBAdSettings clearTestDevice:[FBAdSettings testDeviceHash]];
-  }
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-  if (textField == self.sandboxTextField) {
-    [FBAdSettings setUrlPrefix:textField.text];
-  }
-
-  [textField resignFirstResponder];
-
-  return YES;
-}
-
-- (NSString *)logLevelToString:(FBAdLogLevel)logLevel
-{
-  NSString *logLevelString = nil;
-  switch (logLevel) {
-    case FBAdLogLevelNone:
-      logLevelString = @"None";
-      break;
-    case FBAdLogLevelNotification:
-      logLevelString = @"Notification";
-      break;
-    case FBAdLogLevelError:
-      logLevelString = @"Error";
-      break;
-    case FBAdLogLevelWarning:
-      logLevelString = @"Warning";
-      break;
-    case FBAdLogLevelLog:
-      logLevelString = @"Log";
-      break;
-    case FBAdLogLevelDebug:
-      logLevelString = @"Debug";
-      break;
-    case FBAdLogLevelVerbose:
-      logLevelString = @"Verbose";
-      break;
-    default:
-      logLevelString = @"Unknown";
-      break;
-  }
-
-  return logLevelString;
-}
-
-- (IBAction)donePresssed:(UIButton *)sender
-{
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.h
deleted file mode 100644
index 367bdb106f06..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-@import FBAudienceNetwork;
-
-@interface TableViewController : UIViewController
-
-@property (strong, nonatomic) IBOutlet UITableView *tableView;
-@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
-
-- (IBAction)dismissViewController:(id)sender;
-- (IBAction)refresh:(id)sender;
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.m
deleted file mode 100644
index 3ba330aaeec5..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/TableViewController.m
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "TableViewController.h"
-
-static NSInteger const kRowStrideForAdCell = 3;
-static NSString *const kDefaultCellIdentifier = @"kDefaultCellIdentifier";
-
-@interface TableViewController () <UITableViewDataSource, UITableViewDelegate, FBNativeAdsManagerDelegate, FBNativeAdDelegate>
-
-@property (strong, nonatomic) FBNativeAdsManager *_adsManager;
-@property (strong, nonatomic) FBNativeAdTableViewCellProvider *_ads;
-@property (strong, nonatomic) NSMutableArray *_tableViewContentArray;
-@property (assign, nonatomic) BOOL adCellsCreated;
-
-@end
-
-@implementation TableViewController
-
-#pragma mark - Lazy Loading
-
-- (NSMutableArray *)tableViewContentArray
-{
-  if (!self._tableViewContentArray) {
-    self._tableViewContentArray = [NSMutableArray array];
-    for (NSUInteger i = 0; i < 10; i++) {
-      [self._tableViewContentArray addObject:[NSString stringWithFormat:@"TableView Cell #%lu", (unsigned long)(i + 1)]];
-    }
-  }
-
-  return self._tableViewContentArray;
-}
-
-
-- (void)viewDidLoad
-{
-  [super viewDidLoad];
-  // Do any additional setup after loading the view from its nib.
-  self.tableView.delegate = self;
-  self.tableView.dataSource = self;
-
-  [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kDefaultCellIdentifier];
-
-  [self loadNativeAd];
-}
-
-- (IBAction)dismissViewController:(id)sender
-{
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (IBAction)refresh:(id)sender
-{
-  [self loadNativeAd];
-}
-
-- (void)loadNativeAd
-{
-  [self.activityIndicator startAnimating];
-
-  if (!self._adsManager) {
-    // Create a native ad manager with a unique placement ID (generate your own on the Facebook app settings)
-    // and how many ads you would like to create. Note that you may get fewer ads than you ask for.
-    // Use different ID for each ad placement in your app.
-    self._adsManager = [[FBNativeAdsManager alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"
-                                                   forNumAdsRequested:5];
-    // Set a delegate to get notified when the ads are loaded.
-    self._adsManager.delegate = self;
-
-    // Configure native ad manager to wait to call nativeAdsLoaded until all ad assets are loaded
-    self._adsManager.mediaCachePolicy = FBNativeAdsCachePolicyAll;
-
-    // When testing on a device, add its hashed ID to force test ads.
-    // The hash ID is printed to console when running on a device.
-    // [FBAdSettings addTestDevice:@"THE HASHED ID AS PRINTED TO CONSOLE"];
-  }
-
-  // Load some ads
-  [self._adsManager loadAds];
-}
-
-#pragma mark FBNativeAdsManagerDelegate implementation
-
-- (void)nativeAdsLoaded
-{
-  NSLog(@"Native ad was loaded, constructing native UI...");
-
-  // After the native ads have loaded we create the native ad cell provider and let it take over
-  FBNativeAdsManager *manager = self._adsManager;
-  self._adsManager.delegate = nil;
-  self._adsManager = nil;
-
-  // The native ad cell provider operates over a loaded ads manager and can create table cells with native
-  // ad templates in them as well as help with the math to have a consistent distribution of ads within a table.
-  FBNativeAdTableViewCellProvider *cellProvider = [[FBNativeAdTableViewCellProvider alloc] initWithManager:manager forType:FBNativeAdViewTypeGenericHeight300];
-  self._ads = cellProvider;
-  self._ads.delegate = self;
-
-
-  [self.tableView reloadData];
-  [self.activityIndicator stopAnimating];
-}
-
-- (void)nativeAdsFailedToLoadWithError:(NSError *)error
-{
-  NSLog(@"Native ad failed to load with error: %@", error);
-  [self.activityIndicator stopAnimating];
-
-  UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Native ad failed to load"
-                                                  message:@"Check console for more details"
-                                                 delegate:nil
-                                        cancelButtonTitle:@"OK"
-                                        otherButtonTitles:nil];
-  [alert show];
-}
-
-#pragma mark FBNativeAdDelegate
-
-- (void)nativeAdDidClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad was clicked.");
-}
-
-- (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad did finish click handling.");
-}
-
-- (void)nativeAdWillLogImpression:(FBNativeAd *)nativeAd
-{
-  NSLog(@"Native ad impression is being captured.");
-}
-
-#pragma mark - UITableViewDataSource
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-  // In this example the ads are evenly distributed within the table every kRowStrideForAdCell-th cell.
-  NSUInteger count = [self.tableViewContentArray count];
-  count = [self._ads adjustCount:count forStride:kRowStrideForAdCell] ?: count;
-  return count;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  // For ad cells just as the ad cell provider, for normal cells do whatever you would do.
-  if ([self._ads isAdCellAtIndexPath:indexPath forStride:kRowStrideForAdCell]) {
-    return [self._ads tableView:tableView cellForRowAtIndexPath:indexPath];
-  } else {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kDefaultCellIdentifier forIndexPath:indexPath];
-    // In this example we need to adjust the index back to the domain of the data.
-    indexPath = [self._ads adjustNonAdCellIndexPath:indexPath forStride:kRowStrideForAdCell] ?: indexPath;
-    cell.textLabel.text = [self.tableViewContentArray objectAtIndex:indexPath.row];
-    return cell;
-  }
-}
-
-#pragma mark - UITableViewDelegate
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  // The ad cell provider knows the height of ad cells based on its configuration
-  if ([self._ads isAdCellAtIndexPath:indexPath forStride:kRowStrideForAdCell]) {
-    return [self._ads tableView:tableView heightForRowAtIndexPath:indexPath];
-  } else {
-    return 80;
-  }
-}
-
-#pragma mark - Orientation
-
-- (FBInterfaceOrientationMask)supportedInterfaceOrientations
-{
-  return UIInterfaceOrientationMaskPortrait;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.h
deleted file mode 100644
index c23b501e396c..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-
-@import FBAudienceNetwork;
-
-@interface ViewController : UIViewController <FBNativeAdDelegate>
-
-@property (strong, nonatomic) IBOutlet UILabel *adStatusLabel;
-
-@property (strong, nonatomic) IBOutlet UIImageView *adIconImageView;
-@property (weak, nonatomic) IBOutlet FBMediaView *adCoverMediaView;
-@property (strong, nonatomic) IBOutlet UILabel *adTitleLabel;
-@property (strong, nonatomic) IBOutlet UILabel *adBodyLabel;
-@property (strong, nonatomic) IBOutlet UIButton *adCallToActionButton;
-@property (strong, nonatomic) IBOutlet UILabel *adSocialContextLabel;
-@property (strong, nonatomic) IBOutlet UILabel *sponsoredLabel;
-@property (weak, nonatomic) IBOutlet FBAdChoicesView *adChoicesView;
-
-@property (strong, nonatomic) IBOutlet UIView *adUIView;
-
-- (IBAction)loadNativeAdTapped:(id)sender;
-- (IBAction)loadNativeAdInTableViewTapped:(id)sender;
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.m
deleted file mode 100644
index 86e49c731d95..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/ViewController.m
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#import "ViewController.h"
-
-#import "CollectionViewController.h"
-#import "ScrollViewController.h"
-#import "SettingsViewController.h"
-#import "TableViewController.h"
-
-@interface ViewController ()
-
-@property (strong, nonatomic) FBNativeAd *_nativeAd;
-
-@end
-
-@implementation ViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    // Used in xib must be referenced here so linker won't eliminate it.
-    [FBMediaView class];
-
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    self.adChoicesView.hidden = YES;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-#pragma mark - IB Actions
-
-- (IBAction)loadNativeAdTapped:(id)sender
-{
-    self.adStatusLabel.text = @"Requesting an ad...";
-
-    // Create a native ad request with a unique placement ID (generate your own on the Facebook app settings).
-    // Use different ID for each ad placement in your app.
-    FBNativeAd *nativeAd = [[FBNativeAd alloc] initWithPlacementID:@"YOUR_PLACEMENT_ID"];
-
-    // Set a delegate to get notified when the ad was loaded.
-    nativeAd.delegate = self;
-
-    // Configure native ad to wait to call nativeAdDidLoad: until all ad assets are loaded
-    nativeAd.mediaCachePolicy = FBNativeAdsCachePolicyAll;
-
-    // When testing on a device, add its hashed ID to force test ads.
-    // The hash ID is printed to console when running on a device.
-    // [FBAdSettings addTestDevice:@"THE HASHED ID AS PRINTED TO CONSOLE"];
-
-    // Initiate a request to load an ad.
-    [nativeAd loadAd];
-}
-
-#pragma mark - FBNativeAdDelegate implementation
-
-- (void)nativeAdDidLoad:(FBNativeAd *)nativeAd
-{
-    NSLog(@"Native ad was loaded, constructing native UI...");
-
-    if (self._nativeAd) {
-        [self._nativeAd unregisterView];
-    }
-
-    self._nativeAd = nativeAd;
-
-    // Create native UI using the ad metadata.
-    [self.adCoverMediaView setNativeAd:nativeAd];
-
-    __weak typeof(self) weakSelf = self;
-    [self._nativeAd.icon loadImageAsyncWithBlock:^(UIImage *image) {
-        __strong typeof(self) strongSelf = weakSelf;
-        strongSelf.adIconImageView.image = image;
-    }];
-    self.adStatusLabel.text = @"";
-
-    // Render native ads onto UIView
-    self.adTitleLabel.text = self._nativeAd.title;
-    self.adBodyLabel.text = self._nativeAd.body;
-    self.adSocialContextLabel.text = self._nativeAd.socialContext;
-    self.sponsoredLabel.text = @"Sponsored";
-
-    [self setCallToActionButton:self._nativeAd.callToAction];
-
-    NSLog(@"Register UIView for impression and click...");
-
-    // Wire up UIView with the native ad; the whole UIView will be clickable.
-    [nativeAd registerViewForInteraction:self.adUIView
-                      withViewController:self];
-
-    // Or you can replace above call with following function, so you can specify the clickable areas.
-    // NSArray *clickableViews = @[self.adCallToActionButton, self.adCoverMediaView];
-    // [nativeAd registerViewForInteraction:self.adUIView
-    //                   withViewController:self
-    //                   withClickableViews:clickableViews];
-
-    // Update AdChoices view
-    self.adChoicesView.nativeAd = nativeAd;
-    self.adChoicesView.corner = UIRectCornerTopRight;
-    self.adChoicesView.hidden = NO;
-}
-
-- (void)nativeAd:(FBNativeAd *)nativeAd didFailWithError:(NSError *)error
-{
-    self.adStatusLabel.text = @"Ad failed to load. Check console for details.";
-    NSLog(@"Native ad failed to load with error: %@", error);
-}
-
-- (void)nativeAdDidClick:(FBNativeAd *)nativeAd
-{
-    NSLog(@"Native ad was clicked.");
-}
-
-- (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)nativeAd
-{
-    NSLog(@"Native ad did finish click handling.");
-}
-
-- (void)nativeAdWillLogImpression:(FBNativeAd *)nativeAd
-{
-    NSLog(@"Native ad impression is being captured.");
-}
-
-#pragma mark - Private Methods
-
-- (void)setCallToActionButton:(NSString *)callToAction
-{
-    [self.adCallToActionButton setHidden:NO];
-    [self.adCallToActionButton setTitle:callToAction
-                               forState:UIControlStateNormal];
-}
-
-#pragma mark - IB Actions
-
-- (IBAction)loadNativeAdInTableViewTapped:(id)sender
-{
-    TableViewController *tableViewController = [TableViewController new];
-    [self presentViewController:tableViewController animated:YES completion:nil];
-}
-
-- (IBAction)loadNativeAdInScrollViewTapped:(id)sender
-{
-    ScrollViewController *tableViewController = [ScrollViewController new];
-    [self presentViewController:tableViewController animated:YES completion:nil];
-}
-
-- (IBAction)showSettingsViewController:(id)sender
-{
-    SettingsViewController *settingsViewController = [SettingsViewController new];
-    [self presentViewController:settingsViewController animated:YES completion:nil];
-}
-
-- (IBAction)showCollectionViewController:(id)sender
-{
-  CollectionViewController *collectionViewController = [CollectionViewController new];
-  [self presentViewController:collectionViewController animated:YES completion:nil];
-}
-
-#pragma mark - Orientation
-
-- (FBInterfaceOrientationMask)supportedInterfaceOrientations
-{
-  return UIInterfaceOrientationMaskPortrait;
-}
-
-@end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/main.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/main.m
deleted file mode 100644
index 9459254b85d5..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/NativeAdSample/main.m
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
-//
-// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-// copy, modify, and distribute this software in source code or binary form for use
-// in connection with the web services and APIs provided by Facebook.
-//
-// As with any software that integrates with the Facebook platform, your use of
-// this software is subject to the Facebook Developer Principles and Policies
-// [http://developers.facebook.com/policy/]. This copyright notice shall be
-// included in all copies or substantial portions of the software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[])
-{
-  @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/ReadMe.txt b/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/ReadMe.txt
deleted file mode 100644
index 6acf5a5d2664..000000000000
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/FBAudienceNetwork/NativeAdSample/ReadMe.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-NativeAdSample
-
-In this sample we demonstrate how to use the Native Ad API (FBNativeAd) from the Facebook Ads SDK for iOS. FBNativeAd gives the flexibility to the to allow developer to render the ad in a more native format that blends into their app. We also show how to wire up the delegate to get notified when the ad status changes over time or when the user interacts with the ad.
-
-When running the sample on the simulator, test ads are served by default. On a device however, real ads will be served unless you specify otherwise. If you test your app on a device, please make sure to call the following API to enable test ads: [FBAdSettings addTestDevice:@"<your device hash printed out on console>"]. 
-
-How to use the sample?
-
-1/ Launch the NativeAdSample project using Xcode from the <Facebook SDK>/samples/NativeAdSample directory.
-2/ Open the file ViewController.m and replace "YOUR_PLACEMENT_ID" with the Placement ID you created through developer.facebook.com. 
-3/ Run the sample on the simulator or on a device.
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus/GameViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus/GameViewController.m
index 1517e0bf4462..06d929e859ad 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus/GameViewController.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Iconicus/Iconicus/GameViewController.m
@@ -206,8 +206,6 @@
 {
   FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
   content.contentURL = [self _gameURL];
-  content.contentTitle = @"Play this game!";
-  content.contentDescription = @"Check out this game of Iconicus that I was playing. Can you finish it?";
   self.shareButton.shareContent = content;
   self.sendButton.shareContent = content;
 }
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSAppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSAppDelegate.m
index 7ea031c82fb6..32fade591c40 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSAppDelegate.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSAppDelegate.m
@@ -19,9 +19,7 @@
 #import "RPSAppDelegate.h"
 
 #import <Bolts/Bolts.h>
-
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
-
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 
 #import "RPSAppLinkedViewController.h"
@@ -108,9 +106,4 @@
     return YES;
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-    [FBSDKAppEvents activateApp];
-}
-
 @end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSFriendsViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSFriendsViewController.m
index 7a13b212dee9..d47afbd5abe1 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSFriendsViewController.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSFriendsViewController.m
@@ -32,11 +32,13 @@
 
 @implementation RPSFriendsViewController {
     NSMutableArray *_tableData;
+    BOOL _isPerformingLogin;
 }
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
+        _isPerformingLogin = NO;
         self.title = NSLocalizedString(@"Rock w/Friends", @"Rock w/Friends");
     }
 
@@ -48,36 +50,38 @@
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
 
-    // Login with read permssions
-    FBSDKAccessToken *accessToken = [FBSDKAccessToken currentAccessToken];
-    if (![accessToken.permissions containsObject:@"user_friends"]) {
-        FBSDKLoginManager *loginManager = [[FBSDKLoginManager alloc] init];
-        [loginManager logInWithReadPermissions:@[@"user_friends"]
-                            fromViewController:self
-                                       handler:^(FBSDKLoginManagerLoginResult *result, NSError *error) {
-                                           if (error) {
-                                               NSLog(@"Failed to login:%@", error);
-                                               return;
-                                           }
+    if (!_isPerformingLogin) {
+        // Login with read permssions
+        FBSDKAccessToken *accessToken = [FBSDKAccessToken currentAccessToken];
+        if (![accessToken.permissions containsObject:@"user_friends"]) {
+            FBSDKLoginManager *loginManager = [[FBSDKLoginManager alloc] init];
+            _isPerformingLogin = YES;
+            [loginManager logInWithReadPermissions:@[@"user_friends"]
+                                fromViewController:self
+                                           handler:^(FBSDKLoginManagerLoginResult *result, NSError *error) {
+                                               _isPerformingLogin = NO;
+                                               if (error) {
+                                                   NSLog(@"Failed to login:%@", error);
+                                                   return;
+                                               }
 
-                                           FBSDKAccessToken *newToken = [FBSDKAccessToken currentAccessToken];
-                                           if (![newToken.permissions containsObject:@"user_friends"]) {
-                                               // Show alert
-                                               UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Login Failed"
-                                                                                                   message:@"You must login and grant access to your friends list to use this feature"
-                                                                                                  delegate:self
-                                                                                         cancelButtonTitle:@"OK"
-                                                                                         otherButtonTitles:nil];
-                                               [alertView show];
-                                               [self.navigationController popToRootViewControllerAnimated:YES];
-                                               return;
-                                           }
-
-                                           [self updateFriendsTable];
-                                       }];
-
-    } else {
-        [self updateFriendsTable];
+                                               FBSDKAccessToken *newToken = [FBSDKAccessToken currentAccessToken];
+                                               if (![newToken.permissions containsObject:@"user_friends"]) {
+                                                   // Show alert
+                                                   UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Login Failed"
+                                                                                                       message:@"You must login and grant access to your friends list to use this feature"
+                                                                                                      delegate:self
+                                                                                             cancelButtonTitle:@"OK"
+                                                                                             otherButtonTitles:nil];
+                                                   [alertView show];
+                                                   [self.navigationController popToRootViewControllerAnimated:YES];
+                                                   return;
+                                               }
+                                               [self updateFriendsTable];
+                                           }];
+        } else {
+            [self updateFriendsTable];
+        }
     }
 }
 
@@ -130,8 +134,6 @@
     [tableView cellForRowAtIndexPath:indexPath].accessoryType = UITableViewCellAccessoryNone;
 }
 
-
-
 #pragma mark - private methods
 
 - (void)updateFriendsTable {
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSGameViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSGameViewController.m
index 79b3b7530c18..c1ca023a8cc5 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSGameViewController.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/RPSSample/RPSSample/RPSGameViewController.m
@@ -54,7 +54,7 @@ static NSString *photoURLs[] = {
 
 typedef void (^RPSBlock)(void);
 
-@interface RPSGameViewController () <UIActionSheetDelegate, UIAlertViewDelegate, FBSDKSharingDelegate, FBSDKAppInviteDialogDelegate>
+@interface RPSGameViewController () <UIActionSheetDelegate, UIAlertViewDelegate, FBSDKSharingDelegate>
 @end
 
 @implementation RPSGameViewController {
@@ -346,7 +346,6 @@ typedef void (^RPSBlock)(void);
                                          destructiveButtonTitle:nil
                                               otherButtonTitles:@"Share on Facebook",
                             @"Share on Messenger",
-                            @"Invite Friends",
                             @"Friends' Activity",
                             [FBSDKAccessToken currentAccessToken] ? @"Log out" : @"Log in",
                             nil];
@@ -368,27 +367,18 @@ typedef void (^RPSBlock)(void);
         case 0: { // Share on Facebook
             FBSDKShareDialog *shareDialog = [[FBSDKShareDialog alloc] init];
             shareDialog.fromViewController = self;
-            if (![self shareWith:shareDialog content:[self getGameShareContent]]) {
+            if (![self shareWith:shareDialog content:[self getGameShareContent:NO]]) {
                 [self displayInstallAppWithAppName:@"Facebook"];
             }
             break;
         }
         case 1: { // Share on Messenger
-            if (![self shareWith:[[FBSDKMessageDialog alloc] init] content:[self getGameShareContent]]) {
+            if (![self shareWith:[[FBSDKMessageDialog alloc] init] content:[self getGameShareContent:YES]]) {
                 [self displayInstallAppWithAppName:@"Messenger"];
             }
             break;
         }
-        case 2: { // Invite Friends"
-            // app link corresponds to rps-sample-applink-example://
-            FBSDKAppInviteContent *content = [[FBSDKAppInviteContent alloc] init];
-            content.appLinkURL = [NSURL URLWithString:@"https://fb.me/319673994858989"];
-            [FBSDKAppInviteDialog showFromViewController:self
-                                             withContent:content
-                                                delegate:self];
-            break;
-        }
-        case 3: { // See Friends
+        case 2: { // See Friends
             UIViewController *friends;
             if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
                 friends = [[RPSFriendsViewController alloc] initWithNibName:@"RPSFriendsViewController_iPhone" bundle:nil];
@@ -399,7 +389,7 @@ typedef void (^RPSBlock)(void);
                                                  animated:YES];
             break;
         }
-        case 4: { // Login and logout
+        case 3: { // Login and logout
             if ([FBSDKAccessToken currentAccessToken]) {
                 FBSDKLoginManager *login = [[FBSDKLoginManager alloc] init];
                 [login logOut];
@@ -429,8 +419,8 @@ typedef void (^RPSBlock)(void);
     return _lastPlayerCall != RPSCallNone && _lastComputerCall != RPSCallNone;
 }
 
-- (id<FBSDKSharingContent>) getGameShareContent {
-    return self.hasPlayedAtLeastOnce ? [self getGameActivityShareContent] : [self getGameLinkShareContent];
+- (id<FBSDKSharingContent>) getGameShareContent:(BOOL)isShareForMessenger {
+    return (self.hasPlayedAtLeastOnce && !isShareForMessenger) ? [self getGameActivityShareContent] : [self getGameLinkShareContent];
 }
 
 - (FBSDKShareOpenGraphContent *) getGameActivityShareContent {
@@ -470,7 +460,6 @@ typedef void (^RPSBlock)(void);
 - (FBSDKShareLinkContent *)getGameLinkShareContent {
     FBSDKShareLinkContent *content = [[FBSDKShareLinkContent alloc] init];
     content.contentURL = [NSURL URLWithString:@"https://developers.facebook.com/"];
-    content.contentTitle = @"Rock, Papers, Scissors Sample Application";
     return content;
 }
 
@@ -657,22 +646,4 @@ typedef void (^RPSBlock)(void);
                   valueToSum:timeTaken
                   parameters:@{@"Time Taken" : timeTakenStr}];
 }
-
-#pragma mark - FBSDKAppInviteDialogDelegate
-
-- (void)appInviteDialog:(FBSDKAppInviteDialog *)appInviteDialog didCompleteWithResults:(NSDictionary *)results
-{
-    // Intentionally no-op.
-}
-
-- (void)appInviteDialog:(FBSDKAppInviteDialog *)appInviteDialog didFailWithError:(NSError *)error
-{
-    NSLog(@"app invite error:%@", error);
-    NSString *message = error.userInfo[FBSDKErrorLocalizedDescriptionKey] ?:
-    @"There was a problem sending the invite, please try again later.";
-    NSString *title = error.userInfo[FBSDKErrorLocalizedTitleKey] ?: @"Oops!";
-
-    [[[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] show];
-}
-
 @end
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCAppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCAppDelegate.m
index 66d5cbfb3bd2..ccb663ebeeff 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCAppDelegate.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCAppDelegate.m
@@ -19,9 +19,7 @@
 #import "SCAppDelegate.h"
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
-
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
-
 #import <FBSDKShareKit/FBSDKShareKit.h>
 
 #import "SCSettings.h"
@@ -70,8 +68,6 @@
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-    [FBSDKAppEvents activateApp];
-
     // Do the following if you use Mobile App Engagement Ads to get the deferred
     // app link after your app is installed.
     [FBSDKAppLinkUtility fetchDeferredAppLink:^(NSURL *url, NSError *error) {
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCShareUtility.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCShareUtility.m
index bb60057785ef..c9351d4f0e50 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCShareUtility.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/Scrumptious/scrumptious/SCShareUtility.m
@@ -139,21 +139,21 @@
     // These OG object URLs were created using the edit open graph feature of the graph tool
     // at https://www.developers.facebook.com/apps/
     if ([title isEqualToString:@"Cheeseburger"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/cheeseburger";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/cheeseburger.html";
     } else if ([title isEqualToString:@"Pizza"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/pizza";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/pizza.html";
     } else if ([title isEqualToString:@"Hotdog"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/hotdog";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/hotdog.html";
     } else if ([title isEqualToString:@"Italian"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/italian";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/italian.html";
     } else if ([title isEqualToString:@"French"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/french";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/french.html";
     } else if ([title isEqualToString:@"Chinese"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/chinese";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/chinese.html";
     } else if ([title isEqualToString:@"Thai"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/thai";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/thai.html";
     } else if ([title isEqualToString:@"Indian"]) {
-        return @"https://scrumptious-facebook.parseapp.com/meals/indian";
+        return @"https://d3uu10x6fsg06w.cloudfront.net/scrumptious-facebook/indian.html";
     } else {
         return nil;
     }
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIAppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIAppDelegate.m
index 3590f1db63ad..4abfb976dd53 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIAppDelegate.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIAppDelegate.m
@@ -28,7 +28,6 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  [FBSDKLikeControl class];
   [FBSDKLoginButton class];
 
   [[FBSDKApplicationDelegate sharedInstance] application:application
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.h b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.h
index dc92c36acc2b..0fd81dafad14 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.h
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.h
@@ -24,7 +24,6 @@
 
 @interface SIMainViewController : UIViewController <UIScrollViewDelegate>
 
-@property (nonatomic, strong) IBOutlet FBSDKLikeControl *pageLikeControl;
 @property (nonatomic, strong) IBOutlet FBSDKLoginButton *loginButton;
 @property (nonatomic, strong) IBOutlet UIPageControl *pageControl;
 @property (nonatomic, strong) IBOutlet UIScrollView *scrollView;
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.m
index 13ba5c09357f..93e2d15c1e25 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/ShareIt/ShareIt/SIMainViewController.m
@@ -37,7 +37,6 @@
 
 @implementation SIMainViewController
 {
-  FBSDKLikeButton *_photoLikeButton;
   NSArray *_photos;
 }
 
@@ -46,15 +45,15 @@
 + (NSArray *)demoPhotos
 {
   return @[
-           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"http://shareitexampleapp.parseapp.com/goofy/"]
+           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"https://d3uu10x6fsg06w.cloudfront.net/shareitexampleapp/goofy/index.html"]
                                  title:@"Make a Goofy Face"
                                 rating:5
                                  image:[UIImage imageNamed:@"Goofy"]],
-           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"http://shareitexampleapp.parseapp.com/viking/"]
+           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"https://d3uu10x6fsg06w.cloudfront.net/shareitexampleapp/viking/index.html"]
                                  title:@"Happy Viking, Happy Liking"
                                 rating:3
                                  image:[UIImage imageNamed:@"Viking"]],
-           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"http://shareitexampleapp.parseapp.com/liking/"]
+           [SIPhoto photoWithObjectURL:[NSURL URLWithString:@"https://d3uu10x6fsg06w.cloudfront.net/shareitexampleapp/liking/index.html"]
                                  title:@"Happy Liking, Happy Viking"
                                 rating:4
                                  image:[UIImage imageNamed:@"Liking"]],
@@ -73,15 +72,6 @@
   [super viewDidLoad];
   self.loginButton.publishPermissions = @[@"publish_actions"];
 
-  _photoLikeButton = [[FBSDKLikeButton alloc] init];
-  _photoLikeButton.objectType = FBSDKLikeObjectTypeOpenGraph;
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:_photoLikeButton];
-
-  self.pageLikeControl.likeControlAuxiliaryPosition = FBSDKLikeControlAuxiliaryPositionBottom;
-  self.pageLikeControl.likeControlHorizontalAlignment = FBSDKLikeControlHorizontalAlignmentCenter;
-  self.pageLikeControl.foregroundColor = [UIColor whiteColor];
-  self.pageLikeControl.objectID = @"shareitexampleapp";
-
   [self _configurePhotos];
 }
 
@@ -241,7 +231,6 @@
 {
   SIPhoto *photo = [self _currentPhoto];
   [self _mainView].photo = photo;
-  _photoLikeButton.objectID = photo.objectURL.absoluteString;
 }
 
 #pragma mark - FBSDKSharingDelegate
diff --git a/Engine/Source/ThirdParty/Facebook/IOS/Samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m b/Engine/Source/ThirdParty/Facebook/IOS/Samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
index 15e4b817870a..42d447dd6b2a 100644
--- a/Engine/Source/ThirdParty/Facebook/IOS/Samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
+++ b/Engine/Source/ThirdParty/Facebook/IOS/Samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
@@ -55,8 +55,4 @@
     return YES;
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-    [FBSDKAppEvents activateApp];
-}
-
 @end
diff --git a/Engine/Source/ThirdParty/Licenses/MarketplacePlugins/OpenCV 2.1_License.txt b/Engine/Source/ThirdParty/Licenses/MarketplacePlugins/OpenCV 2.1_License.txt
new file mode 100644
index 000000000000..97f26005156e
--- /dev/null
+++ b/Engine/Source/ThirdParty/Licenses/MarketplacePlugins/OpenCV 2.1_License.txt	
@@ -0,0 +1,12 @@
+License
+By downloading, copying, installing or using the software you agree to this license. If you do not agree to this license, do not download, install, copy or use the software.
+
+License Agreement
+For Open Source Computer Vision Library
+(3-clause BSD License)
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the names of the copyright holders nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall copyright holders or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/PhysX3/APEX.Build.cs b/Engine/Source/ThirdParty/PhysX3/APEX.Build.cs
index 43eb295378ab..6ee76b1cf92b 100644
--- a/Engine/Source/ThirdParty/PhysX3/APEX.Build.cs
+++ b/Engine/Source/ThirdParty/PhysX3/APEX.Build.cs
@@ -29,8 +29,9 @@ public class APEX : ModuleRules
                     return APEXLibraryMode.Checked;
                 }
 			case UnrealTargetConfiguration.Shipping:
-			case UnrealTargetConfiguration.Test:
 				return APEXLibraryMode.Shipping;
+			case UnrealTargetConfiguration.Test:
+				return APEXLibraryMode.Profile;
 			case UnrealTargetConfiguration.Development:
 			case UnrealTargetConfiguration.DebugGame:
 			case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/linux/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/linux/CMakeLists.txt
index 3e1d4d4d5eb8..ba6448f09f06 100644
--- a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/linux/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/linux/CMakeLists.txt
@@ -21,10 +21,10 @@ ELSE(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAK
 	MESSAGE(FATAL_ERROR "Unknown CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE}")
 ENDIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
 
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g3 -gdwarf-3")
 
 SET(APEX_LINUX_DEBUG_COMPILE_DEFS _DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE)
 SET(APEX_LINUX_CHECKED_COMPILE_DEFS NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS)
diff --git a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/mac/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/mac/CMakeLists.txt
index bf330dcf2ed1..dcff1cea715d 100644
--- a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/mac/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/compiler/cmake/mac/CMakeLists.txt
@@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 ENDIF()
 
 # TODO: Get real flags
-SET(CMAKE_CXX_FLAGS "-fdiagnostics-show-option -Wall -Wextra -Werror -fno-rtti -fno-exceptions -ffast-math -fno-strict-aliasing -ffunction-sections -fdata-sections -Wno-unknown-pragmas -Wno-dynamic-class-memaccess -Wno-reorder -Wno-logical-not-parentheses -Wno-unused-parameter -Wno-unused-variable -Wno-unused-const-variable -Werror -Wno-unused-function -Wno-unknown-pragmas -Wno-overloaded-virtual  -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-local-type-template-args -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-fdiagnostics-show-option -Wall -Wextra -Werror -fno-rtti -fno-exceptions -ffast-math -fno-strict-aliasing -ffunction-sections -fdata-sections -Wno-unknown-pragmas -Wno-dynamic-class-memaccess -Wno-reorder -Wno-logical-not-parentheses -Wno-unused-parameter -Wno-unused-variable -Wno-unused-const-variable -Werror -Wno-unused-function -Wno-unknown-pragmas -Wno-overloaded-virtual  -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-local-type-template-args -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
diff --git a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwCollision.cpp b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwCollision.cpp
index 8689750905c8..cfa3d83e49e2 100644
--- a/Engine/Source/ThirdParty/PhysX3/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwCollision.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwCollision.cpp
@@ -32,7 +32,7 @@ const Simd4i cloth::Gather<Simd4i>::sIntSignBit = simd4i(_sign);
 const Simd4i cloth::Gather<Simd4i>::sSignedMask = sIntSignBit | simd4i(0x7);
 #elif NVMATH_NEON
 const Simd4i cloth::Gather<Simd4i>::sPack = simd4i(0x00000000, 0x04040404, 0x08080808, 0x0c0c0c0c);
-const Simd4i cloth::Gather<Simd4i>::sOffset = simd4i(0x03020100);
+const Simd4i cloth::Gather<Simd4i>::sOffset = simd4i(0x03020100, 0x03020100, 0x03020100, 0x03020100);
 const Simd4i cloth::Gather<Simd4i>::sShift = simd4i(detail::IntType<2>());
 const Simd4i cloth::Gather<Simd4i>::sMask = simd4i(detail::IntType<7>());
 #endif
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth.Build.cs b/Engine/Source/ThirdParty/PhysX3/NvCloth.Build.cs
index 9294bd5e8ef8..aa3d75db3232 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth.Build.cs
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth.Build.cs
@@ -29,8 +29,9 @@ public class NvCloth : ModuleRules
                     return NvClothLibraryMode.Checked;
                 }
 			case UnrealTargetConfiguration.Shipping:
-			case UnrealTargetConfiguration.Test:
 				return NvClothLibraryMode.Shipping;
+			case UnrealTargetConfiguration.Test:
+				return NvClothLibraryMode.Profile;
 			case UnrealTargetConfiguration.Development:
 			case UnrealTargetConfiguration.DebugGame:
 			case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/linux/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/linux/CMakeLists.txt
index 5bd8323f5eb0..cac7e9acde5c 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/linux/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/linux/CMakeLists.txt
@@ -22,10 +22,10 @@ ENDIF()
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
 # Build debug info for all configurations
-SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -O0 -g3 -gdwarf-2")
-SET(CMAKE_CXX_FLAGS_CHECKED "-std=c++11 -g3 -gdwarf-2 -O3")
-SET(CMAKE_CXX_FLAGS_PROFILE "-std=c++11 -O3 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -O3 -g")
+SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -O0 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_CHECKED "-std=c++11 -g3 -gdwarf-3 -O3")
+SET(CMAKE_CXX_FLAGS_PROFILE "-std=c++11 -O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -O3 -g3 -gdwarf-3")
 
 
 #set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym")
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/mac/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/mac/CMakeLists.txt
index b99d60e96cbd..c9aba9f628ef 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/mac/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/compiler/cmake/mac/CMakeLists.txt
@@ -14,9 +14,9 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 ENDIF()
 
 IF (DEFINED PX_32BIT)
-SET(CMAKE_CXX_FLAGS "-arch i386 -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef")
+SET(CMAKE_CXX_FLAGS "-arch i386 -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral -Wno-undef -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template")
 ELSEIF()
-SET(CMAKE_CXX_FLAGS "-arch x86_64 -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral  -Wno-undef")
+SET(CMAKE_CXX_FLAGS "-arch x86_64 -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2 -Wno-unused-value -Wno-format-nonliteral  -Wno-undef -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template")
 ENDIF()
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/include/NvCloth/Cloth.h b/Engine/Source/ThirdParty/PhysX3/NvCloth/include/NvCloth/Cloth.h
index ac957f72005c..8bfc3828f3dc 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/include/NvCloth/Cloth.h
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/include/NvCloth/Cloth.h
@@ -168,6 +168,32 @@ class Cloth : public UserAllocated
 	/** \brief Adjust the position of the cloth without affecting the dynamics (to call after a world origin shift, for example). */
 	virtual void teleport(const physx::PxVec3& delta) = 0;
 
+	/** \brief Adjust the position and rotation of the cloth without affecting the dynamics (to call after a world origin shift, for example). 
+		The velocity will be set to zero this frame, unless setTranslation/setRotation is called with a different value after this function is called.
+		The correct order to use this is:
+		\code
+		cloth->teleportToLocation(pos, rot);
+		pos += velocity * dt;
+		rot += 0.5 * angularVelocity * rot * dt;
+		cloth->setTranslation(pos);
+		cloth->setRotation(rot);
+		\endcode
+		*/
+	virtual void teleportToLocation(const physx::PxVec3& translation, const physx::PxQuat& rotation) = 0;
+
+	/** \brief Don't recalculate the velocity based on the values provided by setTranslation and setRotation for one frame (so it acts as if the velocity was the same as last frame).
+		This is useful when the cloth is moving while teleported, but the integration of the cloth position for that frame is already included in the teleport.
+		Example:
+		\code
+		pos += velocity * dt;
+		rot += 0.5 * angularVelocity * rot * dt;
+		cloth->teleportToLocation(pos, rot);
+		cloth->ignoreVelocityDiscontinuity();
+		\endcode
+		*/
+	virtual void ignoreVelocityDiscontinuity() = 0;
+
+
 	/* solver parameters */
 
 	/** \brief Returns the delta time used for previous iteration.*/
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothBase.h b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothBase.h
index ec1ee4020aad..faca6c93b766 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothBase.h
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothBase.h
@@ -64,6 +64,7 @@ void initialize(Cloth& cloth, const physx::PxVec4* pIt, const physx::PxVec4* pEn
 	cloth.mCurrentMotion = physx::PxTransform(physx::PxIdentity);
 	cloth.mLinearVelocity = physx::PxVec3(0.0f);
 	cloth.mAngularVelocity = physx::PxVec3(0.0f);
+	cloth.mIgnoreVelocityDiscontinuityNextFrame = false;
 	cloth.mPrevIterDt = 0.0f;
 	cloth.mIterDtAvg = MovingAverage(30);
 	cloth.mTetherConstraintLogStiffness = float(-FLT_MAX_EXP);
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothImpl.h b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothImpl.h
index 4d7b28d1d9cf..e55e3e43b77e 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothImpl.h
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/ClothImpl.h
@@ -77,6 +77,9 @@ class ClothImpl : public Cloth
 	virtual void clearInertia();
 
 	virtual void teleport(const physx::PxVec3& delta);
+	virtual void teleportToLocation(const physx::PxVec3& translation, const physx::PxQuat& rotation);
+
+	virtual void ignoreVelocityDiscontinuity();
 
 	virtual float getPreviousIterationDt() const;
 	virtual void setGravity(const physx::PxVec3& gravity);
@@ -210,6 +213,7 @@ public: //Fields shared between all cloth classes
 	physx::PxTransform mCurrentMotion;
 	physx::PxVec3 mLinearVelocity;
 	physx::PxVec3 mAngularVelocity;
+	bool mIgnoreVelocityDiscontinuityNextFrame;
 
 	float mPrevIterDt;
 	MovingAverage mIterDtAvg;
@@ -291,6 +295,21 @@ inline void ClothImpl<T>::teleport(const physx::PxVec3& delta)
 	mTargetMotion.p += delta;
 }
 
+template <typename T>
+inline void ClothImpl<T>::teleportToLocation(const physx::PxVec3& translation, const physx::PxQuat& rotation)
+{
+	mCurrentMotion.p = translation;
+	mCurrentMotion.q = rotation;
+	mTargetMotion.p = translation;
+	mTargetMotion.q = rotation;
+}
+
+template <typename T>
+inline void ClothImpl<T>::ignoreVelocityDiscontinuity()
+{
+	mIgnoreVelocityDiscontinuityNextFrame = true;
+}
+
 template <typename T>
 inline float ClothImpl<T>::getPreviousIterationDt() const
 {
diff --git a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/IterationState.h b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/IterationState.h
index 224e87e26a83..7351b63122ca 100644
--- a/Engine/Source/ThirdParty/PhysX3/NvCloth/src/IterationState.h
+++ b/Engine/Source/ThirdParty/PhysX3/NvCloth/src/IterationState.h
@@ -183,11 +183,15 @@ cloth::IterationStateFactory::IterationStateFactory(MyCloth& cloth, float frameD
 	mPrevLinearVelocity = cloth.mLinearVelocity;
 	mPrevAngularVelocity = cloth.mAngularVelocity;
 
-	// update cloth
-	float invFrameDt = 1.0f / frameDt;
-	cloth.mLinearVelocity = invFrameDt * (cloth.mTargetMotion.p - cloth.mCurrentMotion.p);
-	physx::PxQuat dq = cloth.mTargetMotion.q * cloth.mCurrentMotion.q.getConjugate();
-	cloth.mAngularVelocity = log(dq) * invFrameDt;
+	if(!cloth.mIgnoreVelocityDiscontinuityNextFrame)
+	{
+		// update cloth
+		float invFrameDt = 1.0f / frameDt;
+		cloth.mLinearVelocity = invFrameDt * (cloth.mTargetMotion.p - cloth.mCurrentMotion.p);
+		physx::PxQuat dq = cloth.mTargetMotion.q * cloth.mCurrentMotion.q.getConjugate();
+		cloth.mAngularVelocity = log(dq) * invFrameDt;
+	}
+	cloth.mIgnoreVelocityDiscontinuityNextFrame = false;
 
 	cloth.mPrevIterDt = mIterDt;
 	cloth.mIterDtAvg.push(static_cast<uint32_t>(mNumIterations), mIterDt);
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX.Build.cs b/Engine/Source/ThirdParty/PhysX3/PhysX.Build.cs
index 9d0f96521580..129d6c0de908 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX.Build.cs
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX.Build.cs
@@ -28,8 +28,9 @@ public class PhysX : ModuleRules
 					return PhysXLibraryMode.Checked;
 				}
 			case UnrealTargetConfiguration.Shipping:
-			case UnrealTargetConfiguration.Test:
 				return PhysXLibraryMode.Shipping;
+			case UnrealTargetConfiguration.Test:
+				return PhysXLibraryMode.Profile;
 			case UnrealTargetConfiguration.Development:
 			case UnrealTargetConfiguration.DebugGame:
 			case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysXCookingLib.Build.cs b/Engine/Source/ThirdParty/PhysX3/PhysXCookingLib.Build.cs
index 3b392a2d12fa..a0bbfb5cc916 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysXCookingLib.Build.cs
+++ b/Engine/Source/ThirdParty/PhysX3/PhysXCookingLib.Build.cs
@@ -28,8 +28,9 @@ public class PhysXCookingLib : ModuleRules
 					return PhysXLibraryMode.Checked;
 				}
 			case UnrealTargetConfiguration.Shipping:
-			case UnrealTargetConfiguration.Test:
 				return PhysXLibraryMode.Shipping;
+			case UnrealTargetConfiguration.Test:
+				return PhysXLibraryMode.Profile;
 			case UnrealTargetConfiguration.Development:
 			case UnrealTargetConfiguration.DebugGame:
 			case UnrealTargetConfiguration.Unknown:
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxScene.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxScene.h
index 13c9d2fe81f9..195c5fbbfec5 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxScene.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxScene.h
@@ -1410,6 +1410,67 @@ class PxScene
 	*/
 	virtual void				forceDynamicTreeRebuild(bool rebuildStaticStructure, bool rebuildDynamicStructure)	= 0;
 
+	/**
+	\brief Sets scene query update mode	
+
+	\param[in] updateMode	Scene query update mode.
+
+	@see PxSceneQueryUpdateMode::Enum
+	*/
+	virtual void				setSceneQueryUpdateMode(PxSceneQueryUpdateMode::Enum updateMode) = 0;
+
+	/**
+	\brief Gets scene query update mode	
+
+	\return Current scene query update mode.
+
+	@see PxSceneQueryUpdateMode::Enum
+	*/
+	virtual PxSceneQueryUpdateMode::Enum getSceneQueryUpdateMode() const = 0;
+
+	/**
+	\brief Executes scene queries update tasks.
+	This function will refit dirty shapes within the pruner and will execute a task to build a new AABB tree, which is
+	build on a different thread. The new AABB tree is built based on the dynamic tree rebuild hint rate. Once
+	the new tree is ready it will be commited in next fetchQueries call, which must be called after.
+
+	\note If PxSceneQueryUpdateMode::eBUILD_DISABLED_COMMIT_DISABLED is used, it is required to update the scene queries
+	using this function.
+
+	\param[in] completionTask if non-NULL, this task will have its refcount incremented in sceneQueryUpdate(), then
+	decremented when the scene is ready to have fetchQueries called. So the task will not run until the
+	application also calls removeReference().
+	\param[in] controlSimulation if true, the scene controls its PxTaskManager simulation state. Leave
+    true unless the application is calling the PxTaskManager start/stopSimulation() methods itself.
+
+	@see PxSceneQueryUpdateMode::eBUILD_DISABLED_COMMIT_DISABLED
+	*/
+	virtual void				sceneQueriesUpdate(physx::PxBaseTask* completionTask = NULL, bool controlSimulation = true)	= 0;
+
+	/**
+	\brief This checks to see if the scene queries update has completed.
+
+	This does not cause the data available for reading to be updated with the results of the scene queries update, it is simply a status check.
+	The bool will allow it to either return immediately or block waiting for the condition to be met so that it can return true
+	
+	\param[in] block When set to true will block until the condition is met.
+	\return True if the results are available.
+
+	@see sceneQueriesUpdate() fetchResults()
+	*/
+	virtual	bool				checkQueries(bool block = false) = 0;
+
+	/**
+	This method must be called after sceneQueriesUpdate. It will wait for the scene queries update to finish. If the user makes an illegal scene queries update call, 
+	the SDK will issue an error	message.
+
+	If a new AABB tree build finished, then during fetchQueries the current tree within the pruning structure is swapped with the new tree. 
+
+	\param[in] block When set to true will block until the condition is met, which is tree built task must finish running.
+	*/
+
+	virtual	bool				fetchQueries(bool block = false)	= 0;	
+
 	/**
 	\brief Performs a raycast against objects in the scene, returns results in a PxRaycastBuffer object
 	or via a custom user callback implementation inheriting from PxRaycastCallback.
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxSceneDesc.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxSceneDesc.h
index 5742827e44a9..22ed83824cc2 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxSceneDesc.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Include/PxSceneDesc.h
@@ -76,6 +76,35 @@ struct PxPruningStructureType
 	};
 };
 
+/**
+\brief Scene query update mode
+
+When PxScene::fetchResults is called it does scene query related work, with this enum it is possible to 
+set what work is done during the fetchResults. 
+
+FetchResults will sync changed bounds during simulation and update the scene query bounds in pruners, this work is mandatory.
+
+eCOMMIT_ENABLED_BUILD_ENABLED does allow to execute the new AABB tree build step during fetchResults, additionally the pruner commit is
+called where any changes are applied. During commit PhysX refits the dynamic scene query tree and if a new tree was built and 
+the build finished the tree is swapped with current AABB tree. 
+
+eCOMMIT_DISABLED_BUILD_ENABLED does allow to execute the new AABB tree build step during fetchResults. Pruner commit is not called,
+this means that refit will then occur during the first scene query following fetchResults, or may be forced by the method PxScene::flushSceneQueryUpdates().
+
+eCOMMIT_DISABLED_BUILD_DISABLED no further scene query work is executed. The scene queries update needs to be called manually, see PxScene::sceneQueriesUpdate.
+It is recommended to call PxScene::sceneQueriesUpdate right after fetchResults as the pruning structures are not updated. 
+
+*/
+struct PxSceneQueryUpdateMode
+{
+	enum Enum
+	{
+		eBUILD_ENABLED_COMMIT_ENABLED,		//!< Both scene query build and commit are executed.
+		eBUILD_ENABLED_COMMIT_DISABLED,		//!< Scene query build only is executed.
+		eBUILD_DISABLED_COMMIT_DISABLED		//!< No work is done, no update of scene queries
+	};
+};
+
 
 /**
 \brief Enum for selecting the friction algorithm used for simulation.
@@ -317,6 +346,10 @@ struct PxSceneFlag
 		creation suppresses this behavior. Refit will then occur during the first scene query following fetchResults,
 		or may be forced by the method PxScene::flushSceneQueryUpdates()
 
+		\note Deprecated, will be replaced with an enum in next releases.
+		\note This flag will be ignored if PxSceneDesc::sceneQueryUpdateMode is set.
+		\note This flag is not used anymore, please use PxSceneQueryUpdateMode::Enum instead
+
 		@see PxScene::flushSceneQueryUpdates()
 
 		<b>Default:</b> true
@@ -697,6 +730,15 @@ public:
 	*/
 	PxU32					dynamicTreeRebuildRateHint;
 
+	/**
+	\brief Defines the scene query update mode.
+
+	\note Setting a value other than the default will result in ignoring the deprecated PxSceneFlag::eSUPPRESS_EAGER_SCENE_QUERY_REFIT
+
+	<b>Default:</b> PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED
+	*/
+	PxSceneQueryUpdateMode::Enum sceneQueryUpdateMode;
+
 	/**
 	\brief Will be copied to PxScene::userData.
 
@@ -915,6 +957,7 @@ PX_INLINE PxSceneDesc::PxSceneDesc(const PxTolerancesScale& scale):
 	staticStructure						(PxPruningStructureType::eDYNAMIC_AABB_TREE),
 	dynamicStructure					(PxPruningStructureType::eDYNAMIC_AABB_TREE),
 	dynamicTreeRebuildRateHint			(100),
+	sceneQueryUpdateMode				(PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED),
 
 	userData							(NULL),
 
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.cpp
index ad0f38bb25ca..4dfd3040b96d 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.cpp
@@ -99,12 +99,17 @@ NpSceneQueries::NpSceneQueries(const PxSceneDesc& desc) :
 	mSQManager				(mScene, desc.staticStructure, desc.dynamicStructure, desc.dynamicTreeRebuildRateHint, desc.limits),
 	mCachedRaycastFuncs		(Gu::getRaycastFuncTable()),
 	mCachedSweepFuncs		(Gu::getSweepFuncTable()),
-	mCachedOverlapFuncs		(Gu::getOverlapFuncTable())
+	mCachedOverlapFuncs		(Gu::getOverlapFuncTable()),
+	mSceneQueriesStaticPrunerUpdate		(getContextId(), 0, "NpSceneQueries.sceneQueriesStaticPrunerUpdate"),
+	mSceneQueriesDynamicPrunerUpdate(getContextId(), 0, "NpSceneQueries.sceneQueriesDynamicPrunerUpdate"),
+	mSceneQueryUpdateMode	(desc.sceneQueryUpdateMode)
 #if PX_SUPPORT_PVD
 	, mSingleSqCollector	(mScene, false),
 	mBatchedSqCollector		(mScene, true)
 #endif
 {
+	mSceneQueriesStaticPrunerUpdate.setObject(this);
+	mSceneQueriesDynamicPrunerUpdate.setObject(this);
 }
 
 NpScene::NpScene(const PxSceneDesc& desc) :
@@ -124,6 +129,7 @@ NpScene::NpScene(const PxSceneDesc& desc) :
 	mClientBehaviorFlags	(PX_DEBUG_EXP("sceneBehaviorFlags")),
 	mSceneCompletion		(getContextId(), mPhysicsDone),
 	mCollisionCompletion	(getContextId(), mCollisionDone),
+	mSceneQueriesCompletion	(getContextId(), mSceneQueriesDone),
 	mSceneExecution			(getContextId(), 0, "NpScene.execution"),
 	mSceneCollide			(getContextId(), 0, "NpScene.collide"),
 	mSceneAdvance			(getContextId(), 0, "NpScene.solve"),
@@ -133,6 +139,7 @@ NpScene::NpScene(const PxSceneDesc& desc) :
 	mConcurrentReadCount	(0),
 	mConcurrentErrorCount	(0),	
 	mCurrentWriter			(0),
+	mSceneQueriesUpdateRunning	(false),
 	mHasSimulatedOnce		(false),
 	mBetweenFetchResults	(false)
 {
@@ -2236,7 +2243,11 @@ void NpScene::fetchResultsPostContactCallbacks()
 	SqRefFinder sqRefFinder;
 	mScene.getScScene().syncSceneQueryBounds(mSQManager.getDynamicBoundsSync(), sqRefFinder);
 
-	mSQManager.afterSync(!(getFlagsFast()&PxSceneFlag::eSUPPRESS_EAGER_SCENE_QUERY_REFIT));
+	// A.B. temp check if eSUPPRESS_EAGER_SCENE_QUERY_REFIT was set and update mode not, then replicate the flag to the enum
+	PxSceneQueryUpdateMode::Enum updateMode = getSceneQueryUpdateModeFast();
+	if((getFlagsFast() & PxSceneFlag::eSUPPRESS_EAGER_SCENE_QUERY_REFIT) && updateMode == PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED)
+		updateMode = PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_DISABLED;
+	mSQManager.afterSync(updateMode);
 
 #if PX_DEBUG && 0
 	mSQManager.validateSimUpdates();
@@ -2673,6 +2684,18 @@ void NpScene::releaseVolumeCache(NpVolumeCache* volumeCache)
 	PX_DELETE(static_cast<NpVolumeCache*>(volumeCache));
 }
 
+void NpScene::setSceneQueryUpdateMode(PxSceneQueryUpdateMode::Enum updateMode)
+{
+	NP_WRITE_CHECK(this);
+	mSceneQueryUpdateMode = updateMode;
+}
+
+PxSceneQueryUpdateMode::Enum NpScene::getSceneQueryUpdateMode() const
+{
+	NP_READ_CHECK(this);
+	return mSceneQueryUpdateMode;
+}
+
 void NpScene::setDynamicTreeRebuildRateHint(PxU32 dynamicTreeRebuildRateHint)
 {
 	PX_CHECK_AND_RETURN((dynamicTreeRebuildRateHint >= 4), "PxScene::setDynamicTreeRebuildRateHint(): Param has to be >= 4!");
@@ -3171,6 +3194,108 @@ PxPvdSceneClient* NpScene::getScenePvdClient()
 }
 #endif
 
+void NpScene::sceneQueriesUpdate(physx::PxBaseTask* completionTask, bool controlSimulation)
+{
+	PX_SIMD_GUARD;
+
+	bool runUpdateTasks[PruningIndex::eCOUNT] = {true, true};
+	{
+		// write guard must end before scene queries tasks kicks off worker threads
+		NP_WRITE_CHECK(this);
+
+		PX_PROFILE_START_CROSSTHREAD("Basic.sceneQueriesUpdate", getContextId());
+
+		if(mSceneQueriesUpdateRunning)
+		{
+			//fetchSceneQueries doesn't get called
+			Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, "PxScene::fetchSceneQueries was not called!");
+			return;
+		}
+	
+		// flush scene queries updates
+		mSQManager.flushUpdates();
+
+		// prepare scene queries for build - copy bounds
+		runUpdateTasks[PruningIndex::eSTATIC] = mSQManager.prepareSceneQueriesUpdate(PruningIndex::eSTATIC);
+		runUpdateTasks[PruningIndex::eDYNAMIC] = mSQManager.prepareSceneQueriesUpdate(PruningIndex::eDYNAMIC);
+
+		mSceneQueriesUpdateRunning = true;
+	}
+
+	{
+		PX_PROFILE_ZONE("Sim.sceneQueriesTaskSetup", getContextId());
+
+		if (controlSimulation)
+		{
+			{
+				PX_PROFILE_ZONE("Sim.resetDependencies", getContextId());
+				// Only reset dependencies, etc if we own the TaskManager. Will be false
+				// when an NpScene is controlled by an APEX scene.
+				mTaskManager->resetDependencies();
+			}
+			mTaskManager->startSimulation();
+		}
+
+		mSceneQueriesCompletion.setContinuation(*mTaskManager, completionTask);
+		if(runUpdateTasks[PruningIndex::eSTATIC])
+			mSceneQueriesStaticPrunerUpdate.setContinuation(&mSceneQueriesCompletion);
+		if(runUpdateTasks[PruningIndex::eDYNAMIC])
+			mSceneQueriesDynamicPrunerUpdate.setContinuation(&mSceneQueriesCompletion);
+
+		mSceneQueriesCompletion.removeReference();
+		if(runUpdateTasks[PruningIndex::eSTATIC])
+			mSceneQueriesStaticPrunerUpdate.removeReference();
+		if(runUpdateTasks[PruningIndex::eDYNAMIC])
+			mSceneQueriesDynamicPrunerUpdate.removeReference();
+	}
+}
+
+bool NpScene::checkSceneQueriesInternal(bool block)
+{
+	PX_PROFILE_ZONE("Basic.checkSceneQueries", getContextId());
+	return mSceneQueriesDone.wait(block ? Ps::Sync::waitForever : 0);
+}
+
+bool NpScene::checkQueries(bool block)
+{
+	return checkSceneQueriesInternal(block);
+}
+
+bool NpScene::fetchQueries(bool block)
+{
+	if(!mSceneQueriesUpdateRunning)
+	{
+		//fetchSceneQueries doesn't get called
+		Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, 
+			"PxScene::fetchQueries: fetchQueries() called illegally! It must be called after sceneQueriesUpdate()");
+		return false;
+	}
+
+	if(!checkSceneQueriesInternal(block))
+		return false;
+
+	{
+		PX_SIMD_GUARD;
+
+		NP_WRITE_CHECK(this);
+
+		// we use cross thread profile here, to show the event in cross thread view
+		// PT: TODO: why do we want to show it in the cross thread view?
+		PX_PROFILE_START_CROSSTHREAD("Basic.fetchQueries", getContextId());
+
+		// flush updates and commit if work is done
+		mSQManager.flushUpdates();
+	
+		PX_PROFILE_STOP_CROSSTHREAD("Basic.fetchQueries", getContextId());
+		PX_PROFILE_STOP_CROSSTHREAD("Basic.sceneQueriesUpdate", getContextId());
+
+		mSceneQueriesDone.reset();
+		mSceneQueriesUpdateRunning = false;
+	}
+	return true;
+}
+
+
 PxBatchQuery* NpScene::createBatchQuery(const PxBatchQueryDesc& desc)
 {
 	PX_PROFILE_ZONE("API.createBatchQuery", getContextId());
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.h
index 4c07f38ec168..a5e9ca658dca 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpScene.h
@@ -237,6 +237,11 @@ class NpScene : public NpSceneQueries, public Ps::UserAllocated
 	virtual			void							setDynamicTreeRebuildRateHint(PxU32 dynamicTreeRebuildRateHint);
 	virtual			PxU32							getDynamicTreeRebuildRateHint() const;
 	virtual			void							forceDynamicTreeRebuild(bool rebuildStaticStructure, bool rebuildDynamicStructure);
+	virtual			void							sceneQueriesUpdate(physx::PxBaseTask* completionTask, bool controlSimulation);
+	virtual			bool							checkQueries(bool block);
+	virtual			bool							fetchQueries(bool block);
+	virtual			void							setSceneQueryUpdateMode(PxSceneQueryUpdateMode::Enum updateMode);
+	virtual			PxSceneQueryUpdateMode::Enum	getSceneQueryUpdateMode() const;
 
 	virtual			void							setSolverBatchSize(PxU32 solverBatchSize);
 	virtual			PxU32							getSolverBatchSize(void) const;
@@ -365,6 +370,7 @@ class NpScene : public NpSceneQueries, public Ps::UserAllocated
 private:
 					bool							checkResultsInternal(bool block);
 					bool							checkCollisionInternal(bool block);
+					bool							checkSceneQueriesInternal(bool block);
 					void							simulateOrCollide(PxReal elapsedTime, physx::PxBaseTask* completionTask, void* scratchBlock, PxU32 scratchBlockSize, bool controlSimulation, const char* invalidCallMsg, Sc::SimulationStage::Enum simStage);
 
 					void							addRigidStatic(NpRigidStatic& , bool hasPrunerStructure = false);
@@ -422,6 +428,7 @@ private:
 
 					Ps::Sync						mPhysicsDone;		// physics thread signals this when update ready
 					Ps::Sync						mCollisionDone;		// physics thread signals this when all collisions ready
+					Ps::Sync						mSceneQueriesDone;	// physics thread signals this when all scene queries update ready
 
 
 		//legacy timing settings:
@@ -469,6 +476,7 @@ private:
 					PxTaskManager*					mTaskManager;
 					SceneCompletion					mSceneCompletion;
 					SceneCompletion					mCollisionCompletion;
+					SceneCompletion					mSceneQueriesCompletion;
 					SceneExecution					mSceneExecution;
 					SceneCollide					mSceneCollide;
 					SceneAdvance					mSceneAdvance;
@@ -485,6 +493,8 @@ private:
 					Ps::Thread::Id					mCurrentWriter;
 					Ps::ReadWriteLock				mRWLock;
 
+					bool							mSceneQueriesUpdateRunning;
+
 					bool							mHasSimulatedOnce;
 					bool							mBetweenFetchResults;
 };
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
index 45202c2d977e..a50844c69861 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
@@ -819,6 +819,20 @@ bool NpSceneQueries::multiQuery(
 	}
 }
 
+void NpSceneQueries::sceneQueriesStaticPrunerUpdate(PxBaseTask* )
+{
+	PX_PROFILE_ZONE("SceneQuery.sceneQueriesStaticPrunerUpdate", getContextId());
+	// run pruner build only, this will build the new tree only, no commit happens
+	mSQManager.sceneQueryBuildStep(PruningIndex::eSTATIC);
+}
+
+void NpSceneQueries::sceneQueriesDynamicPrunerUpdate(PxBaseTask*)
+{
+	PX_PROFILE_ZONE("SceneQuery.sceneQueriesDynamicPrunerUpdate", getContextId());
+	// run pruner build only, this will build the new tree only, no commit happens
+	mSQManager.sceneQueryBuildStep(PruningIndex::eDYNAMIC);
+}
+
 //explicit template instantiation
 template bool NpSceneQueries::multiQuery<PxRaycastHit>(const MultiQueryInput&, PxHitCallback<PxRaycastHit>&, PxHitFlags, const PxQueryCache*, const PxQueryFilterData&, PxQueryFilterCallback*, BatchQueryFilterData*) const; 
 template bool NpSceneQueries::multiQuery<PxOverlapHit>(const MultiQueryInput&, PxHitCallback<PxOverlapHit>&, PxHitFlags, const PxQueryCache*, const PxQueryFilterData&, PxQueryFilterCallback*, BatchQueryFilterData*) const;
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
index e2ceaf8304d4..b30b7b51c0a5 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
@@ -176,6 +176,10 @@ public:
 	PX_FORCE_INLINE	const Scb::Scene&				getScene()					const	{ return mScene;								}
 	PX_FORCE_INLINE	PxU32							getFlagsFast()				const	{ return mScene.getFlags();						}
 	PX_FORCE_INLINE	Sq::SceneQueryManager&			getSceneQueryManagerFast()			{ return mSQManager;							}
+	PX_FORCE_INLINE	PxSceneQueryUpdateMode::Enum	getSceneQueryUpdateModeFast() const	{ return mSceneQueryUpdateMode;					}
+
+					void							sceneQueriesStaticPrunerUpdate(PxBaseTask* continuation);
+					void							sceneQueriesDynamicPrunerUpdate(PxBaseTask* continuation);
 
 					Scb::Scene						mScene;
 					Sq::SceneQueryManager			mSQManager;
@@ -184,6 +188,13 @@ public:
 					const Gu::GeomSweepFuncs&		mCachedSweepFuncs;
 					const Gu::GeomOverlapTable*		mCachedOverlapFuncs;
 
+					typedef Cm::DelegateTask<NpSceneQueries, &NpSceneQueries::sceneQueriesStaticPrunerUpdate> SceneQueriesStaticPrunerUpdate;
+					typedef Cm::DelegateTask<NpSceneQueries, &NpSceneQueries::sceneQueriesDynamicPrunerUpdate> SceneQueriesDynamicPrunerUpdate;
+					SceneQueriesStaticPrunerUpdate	mSceneQueriesStaticPrunerUpdate;
+					SceneQueriesDynamicPrunerUpdate	mSceneQueriesDynamicPrunerUpdate;
+
+					PxSceneQueryUpdateMode::Enum    mSceneQueryUpdateMode;
+
 #if PX_SUPPORT_PVD
 public:
 					//Scene query and hits for pvd, collected in current frame
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
index c1422e3e0dfc..f00008e7bf2d 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
@@ -325,6 +325,7 @@ PxScene_VisualizationCullingBox,
 PxScene_StaticStructure,
 PxScene_DynamicStructure,
 PxScene_DynamicTreeRebuildRateHint,
+PxScene_SceneQueryUpdateMode,
 PxScene_SceneQueryStaticTimestamp,
 PxScene_BroadPhaseType,
 PxScene_BroadPhaseRegions,
@@ -390,6 +391,7 @@ PxSceneDesc_GpuDispatcher,
 PxSceneDesc_StaticStructure,
 PxSceneDesc_DynamicStructure,
 PxSceneDesc_DynamicTreeRebuildRateHint,
+PxSceneDesc_SceneQueryUpdateMode,
 PxSceneDesc_UserData,
 PxSceneDesc_SolverBatchSize,
 PxSceneDesc_NbContactDataBlocks,
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
index e92b96aafc22..83746b3cf9bb 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
@@ -2491,6 +2491,14 @@ template<> struct PxEnumTraits< physx::PxVisualizationParameter::Enum > { PxEnum
 	};
 
 template<> struct PxEnumTraits< physx::PxPruningStructureType::Enum > { PxEnumTraits() : NameConversion( g_physx__PxPruningStructureType__EnumConversion ) {} const PxU32ToName* NameConversion; }; 
+	static PxU32ToName g_physx__PxSceneQueryUpdateMode__EnumConversion[] = {
+		{ "eBUILD_ENABLED_COMMIT_ENABLED", static_cast<PxU32>( physx::PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED ) },
+		{ "eBUILD_ENABLED_COMMIT_DISABLED", static_cast<PxU32>( physx::PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_DISABLED ) },
+		{ "eBUILD_DISABLED_COMMIT_DISABLED", static_cast<PxU32>( physx::PxSceneQueryUpdateMode::eBUILD_DISABLED_COMMIT_DISABLED ) },
+		{ NULL, 0 }
+	};
+
+template<> struct PxEnumTraits< physx::PxSceneQueryUpdateMode::Enum > { PxEnumTraits() : NameConversion( g_physx__PxSceneQueryUpdateMode__EnumConversion ) {} const PxU32ToName* NameConversion; }; 
 	static PxU32ToName g_physx__PxHitFlag__EnumConversion[] = {
 		{ "ePOSITION", static_cast<PxU32>( physx::PxHitFlag::ePOSITION ) },
 		{ "eNORMAL", static_cast<PxU32>( physx::PxHitFlag::eNORMAL ) },
@@ -2543,6 +2551,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 		PxPruningStructureType::Enum StaticStructure;
 		PxPruningStructureType::Enum DynamicStructure;
 		PxU32 DynamicTreeRebuildRateHint;
+		PxSceneQueryUpdateMode::Enum SceneQueryUpdateMode;
 		PxU32 SceneQueryStaticTimestamp;
 		PxBroadPhaseType::Enum BroadPhaseType;
 		PxTaskManager * TaskManager;
@@ -2576,6 +2585,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, StaticStructure, PxSceneGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, DynamicStructure, PxSceneGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, DynamicTreeRebuildRateHint, PxSceneGeneratedValues)
+	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, SceneQueryUpdateMode, PxSceneGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, SceneQueryStaticTimestamp, PxSceneGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, BroadPhaseType, PxSceneGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxScene, TaskManager, PxSceneGeneratedValues)
@@ -2615,6 +2625,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_StaticStructure, PxScene, PxPruningStructureType::Enum > StaticStructure;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_DynamicStructure, PxScene, PxPruningStructureType::Enum > DynamicStructure;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_DynamicTreeRebuildRateHint, PxScene, PxU32, PxU32 > DynamicTreeRebuildRateHint;
+		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_SceneQueryUpdateMode, PxScene, PxSceneQueryUpdateMode::Enum, PxSceneQueryUpdateMode::Enum > SceneQueryUpdateMode;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_SceneQueryStaticTimestamp, PxScene, PxU32 > SceneQueryStaticTimestamp;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_BroadPhaseType, PxScene, PxBroadPhaseType::Enum > BroadPhaseType;
 		PxReadOnlyCollectionPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_BroadPhaseRegions, PxScene, PxBroadPhaseRegionInfo > BroadPhaseRegions;
@@ -2645,7 +2656,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 			PX_UNUSED(inStartIndex);
 			return inStartIndex;
 		}
-		static PxU32 instancePropertyCount() { return 37; }
+		static PxU32 instancePropertyCount() { return 38; }
 		static PxU32 totalPropertyCount() { return instancePropertyCount(); }
 		template<typename TOperator>
 		PxU32 visitInstanceProperties( TOperator inOperator, PxU32 inStartIndex = 0 ) const
@@ -2678,18 +2689,19 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 			inOperator( StaticStructure, inStartIndex + 23 );; 
 			inOperator( DynamicStructure, inStartIndex + 24 );; 
 			inOperator( DynamicTreeRebuildRateHint, inStartIndex + 25 );; 
-			inOperator( SceneQueryStaticTimestamp, inStartIndex + 26 );; 
-			inOperator( BroadPhaseType, inStartIndex + 27 );; 
-			inOperator( BroadPhaseRegions, inStartIndex + 28 );; 
-			inOperator( TaskManager, inStartIndex + 29 );; 
-			inOperator( NbContactDataBlocks, inStartIndex + 30 );; 
-			inOperator( MaxNbContactDataBlocksUsed, inStartIndex + 31 );; 
-			inOperator( ContactReportStreamBufferSize, inStartIndex + 32 );; 
-			inOperator( SolverBatchSize, inStartIndex + 33 );; 
-			inOperator( WakeCounterResetValue, inStartIndex + 34 );; 
-			inOperator( UserData, inStartIndex + 35 );; 
-			inOperator( SimulationStatistics, inStartIndex + 36 );; 
-			return 37 + inStartIndex;
+			inOperator( SceneQueryUpdateMode, inStartIndex + 26 );; 
+			inOperator( SceneQueryStaticTimestamp, inStartIndex + 27 );; 
+			inOperator( BroadPhaseType, inStartIndex + 28 );; 
+			inOperator( BroadPhaseRegions, inStartIndex + 29 );; 
+			inOperator( TaskManager, inStartIndex + 30 );; 
+			inOperator( NbContactDataBlocks, inStartIndex + 31 );; 
+			inOperator( MaxNbContactDataBlocksUsed, inStartIndex + 32 );; 
+			inOperator( ContactReportStreamBufferSize, inStartIndex + 33 );; 
+			inOperator( SolverBatchSize, inStartIndex + 34 );; 
+			inOperator( WakeCounterResetValue, inStartIndex + 35 );; 
+			inOperator( UserData, inStartIndex + 36 );; 
+			inOperator( SimulationStatistics, inStartIndex + 37 );; 
+			return 38 + inStartIndex;
 		}
 	};
 	template<> struct PxClassInfoTraits<PxScene>
@@ -2983,6 +2995,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 		PxPruningStructureType::Enum StaticStructure;
 		PxPruningStructureType::Enum DynamicStructure;
 		PxU32 DynamicTreeRebuildRateHint;
+		PxSceneQueryUpdateMode::Enum SceneQueryUpdateMode;
 		void * UserData;
 		PxU32 SolverBatchSize;
 		PxU32 NbContactDataBlocks;
@@ -3019,6 +3032,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, StaticStructure, PxSceneDescGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, DynamicStructure, PxSceneDescGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, DynamicTreeRebuildRateHint, PxSceneDescGeneratedValues)
+	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, SceneQueryUpdateMode, PxSceneDescGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, UserData, PxSceneDescGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, SolverBatchSize, PxSceneDescGeneratedValues)
 	DEFINE_PROPERTY_TO_VALUE_STRUCT_MAP( PxSceneDesc, NbContactDataBlocks, PxSceneDescGeneratedValues)
@@ -3058,6 +3072,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_StaticStructure, PxSceneDesc, PxPruningStructureType::Enum, PxPruningStructureType::Enum > StaticStructure;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_DynamicStructure, PxSceneDesc, PxPruningStructureType::Enum, PxPruningStructureType::Enum > DynamicStructure;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_DynamicTreeRebuildRateHint, PxSceneDesc, PxU32, PxU32 > DynamicTreeRebuildRateHint;
+		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_SceneQueryUpdateMode, PxSceneDesc, PxSceneQueryUpdateMode::Enum, PxSceneQueryUpdateMode::Enum > SceneQueryUpdateMode;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_UserData, PxSceneDesc, void *, void * > UserData;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_SolverBatchSize, PxSceneDesc, PxU32, PxU32 > SolverBatchSize;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxSceneDesc_NbContactDataBlocks, PxSceneDesc, PxU32, PxU32 > NbContactDataBlocks;
@@ -3089,7 +3104,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 			PX_UNUSED(inStartIndex);
 			return inStartIndex;
 		}
-		static PxU32 instancePropertyCount() { return 35; }
+		static PxU32 instancePropertyCount() { return 36; }
 		static PxU32 totalPropertyCount() { return instancePropertyCount(); }
 		template<typename TOperator>
 		PxU32 visitInstanceProperties( TOperator inOperator, PxU32 inStartIndex = 0 ) const
@@ -3119,19 +3134,20 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 			inOperator( StaticStructure, inStartIndex + 20 );; 
 			inOperator( DynamicStructure, inStartIndex + 21 );; 
 			inOperator( DynamicTreeRebuildRateHint, inStartIndex + 22 );; 
-			inOperator( UserData, inStartIndex + 23 );; 
-			inOperator( SolverBatchSize, inStartIndex + 24 );; 
-			inOperator( NbContactDataBlocks, inStartIndex + 25 );; 
-			inOperator( MaxNbContactDataBlocks, inStartIndex + 26 );; 
-			inOperator( MaxBiasCoefficient, inStartIndex + 27 );; 
-			inOperator( ContactReportStreamBufferSize, inStartIndex + 28 );; 
-			inOperator( CcdMaxPasses, inStartIndex + 29 );; 
-			inOperator( WakeCounterResetValue, inStartIndex + 30 );; 
-			inOperator( SanityBounds, inStartIndex + 31 );; 
-			inOperator( GpuDynamicsConfig, inStartIndex + 32 );; 
-			inOperator( GpuMaxNumPartitions, inStartIndex + 33 );; 
-			inOperator( GpuComputeVersion, inStartIndex + 34 );; 
-			return 35 + inStartIndex;
+			inOperator( SceneQueryUpdateMode, inStartIndex + 23 );; 
+			inOperator( UserData, inStartIndex + 24 );; 
+			inOperator( SolverBatchSize, inStartIndex + 25 );; 
+			inOperator( NbContactDataBlocks, inStartIndex + 26 );; 
+			inOperator( MaxNbContactDataBlocks, inStartIndex + 27 );; 
+			inOperator( MaxBiasCoefficient, inStartIndex + 28 );; 
+			inOperator( ContactReportStreamBufferSize, inStartIndex + 29 );; 
+			inOperator( CcdMaxPasses, inStartIndex + 30 );; 
+			inOperator( WakeCounterResetValue, inStartIndex + 31 );; 
+			inOperator( SanityBounds, inStartIndex + 32 );; 
+			inOperator( GpuDynamicsConfig, inStartIndex + 33 );; 
+			inOperator( GpuMaxNumPartitions, inStartIndex + 34 );; 
+			inOperator( GpuComputeVersion, inStartIndex + 35 );; 
+			return 36 + inStartIndex;
 		}
 	};
 	template<> struct PxClassInfoTraits<PxSceneDesc>
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
index 9c52483f7a88..c02aa42ffbce 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
@@ -1022,6 +1022,8 @@ PxPruningStructureType::Enum getPxScene_StaticStructure( const PxScene* inObj )
 PxPruningStructureType::Enum getPxScene_DynamicStructure( const PxScene* inObj ) { return inObj->getDynamicStructure(); }
 void setPxScene_DynamicTreeRebuildRateHint( PxScene* inObj, PxU32 inArg){ inObj->setDynamicTreeRebuildRateHint( inArg ); }
 PxU32 getPxScene_DynamicTreeRebuildRateHint( const PxScene* inObj ) { return inObj->getDynamicTreeRebuildRateHint(); }
+void setPxScene_SceneQueryUpdateMode( PxScene* inObj, PxSceneQueryUpdateMode::Enum inArg){ inObj->setSceneQueryUpdateMode( inArg ); }
+PxSceneQueryUpdateMode::Enum getPxScene_SceneQueryUpdateMode( const PxScene* inObj ) { return inObj->getSceneQueryUpdateMode(); }
 PxU32 getPxScene_SceneQueryStaticTimestamp( const PxScene* inObj ) { return inObj->getSceneQueryStaticTimestamp(); }
 PxBroadPhaseType::Enum getPxScene_BroadPhaseType( const PxScene* inObj ) { return inObj->getBroadPhaseType(); }
 PxU32 getPxScene_BroadPhaseRegions( const PxScene* inObj, PxBroadPhaseRegionInfo* outBuffer, PxU32 inBufSize ) { return inObj->getBroadPhaseRegions( outBuffer, inBufSize ); }
@@ -1062,6 +1064,7 @@ PX_PHYSX_CORE_API PxSceneGeneratedInfo::PxSceneGeneratedInfo()
 	, StaticStructure( "StaticStructure", getPxScene_StaticStructure)
 	, DynamicStructure( "DynamicStructure", getPxScene_DynamicStructure)
 	, DynamicTreeRebuildRateHint( "DynamicTreeRebuildRateHint", setPxScene_DynamicTreeRebuildRateHint, getPxScene_DynamicTreeRebuildRateHint)
+	, SceneQueryUpdateMode( "SceneQueryUpdateMode", setPxScene_SceneQueryUpdateMode, getPxScene_SceneQueryUpdateMode)
 	, SceneQueryStaticTimestamp( "SceneQueryStaticTimestamp", getPxScene_SceneQueryStaticTimestamp)
 	, BroadPhaseType( "BroadPhaseType", getPxScene_BroadPhaseType)
 	, BroadPhaseRegions( "BroadPhaseRegions", getPxScene_BroadPhaseRegions, getNbPxScene_BroadPhaseRegions )
@@ -1096,6 +1099,7 @@ PX_PHYSX_CORE_API PxSceneGeneratedValues::PxSceneGeneratedValues( const PxScene*
 		,StaticStructure( getPxScene_StaticStructure( inSource ) )
 		,DynamicStructure( getPxScene_DynamicStructure( inSource ) )
 		,DynamicTreeRebuildRateHint( getPxScene_DynamicTreeRebuildRateHint( inSource ) )
+		,SceneQueryUpdateMode( getPxScene_SceneQueryUpdateMode( inSource ) )
 		,SceneQueryStaticTimestamp( getPxScene_SceneQueryStaticTimestamp( inSource ) )
 		,BroadPhaseType( getPxScene_BroadPhaseType( inSource ) )
 		,TaskManager( getPxScene_TaskManager( inSource ) )
@@ -1260,6 +1264,8 @@ inline PxPruningStructureType::Enum getPxSceneDescDynamicStructure( const PxScen
 inline void setPxSceneDescDynamicStructure( PxSceneDesc* inOwner, PxPruningStructureType::Enum inData) { inOwner->dynamicStructure = inData; }
 inline PxU32 getPxSceneDescDynamicTreeRebuildRateHint( const PxSceneDesc* inOwner ) { return inOwner->dynamicTreeRebuildRateHint; }
 inline void setPxSceneDescDynamicTreeRebuildRateHint( PxSceneDesc* inOwner, PxU32 inData) { inOwner->dynamicTreeRebuildRateHint = inData; }
+inline PxSceneQueryUpdateMode::Enum getPxSceneDescSceneQueryUpdateMode( const PxSceneDesc* inOwner ) { return inOwner->sceneQueryUpdateMode; }
+inline void setPxSceneDescSceneQueryUpdateMode( PxSceneDesc* inOwner, PxSceneQueryUpdateMode::Enum inData) { inOwner->sceneQueryUpdateMode = inData; }
 inline void * getPxSceneDescUserData( const PxSceneDesc* inOwner ) { return inOwner->userData; }
 inline void setPxSceneDescUserData( PxSceneDesc* inOwner, void * inData) { inOwner->userData = inData; }
 inline PxU32 getPxSceneDescSolverBatchSize( const PxSceneDesc* inOwner ) { return inOwner->solverBatchSize; }
@@ -1308,6 +1314,7 @@ PX_PHYSX_CORE_API PxSceneDescGeneratedInfo::PxSceneDescGeneratedInfo()
 	, StaticStructure( "StaticStructure", setPxSceneDescStaticStructure, getPxSceneDescStaticStructure )
 	, DynamicStructure( "DynamicStructure", setPxSceneDescDynamicStructure, getPxSceneDescDynamicStructure )
 	, DynamicTreeRebuildRateHint( "DynamicTreeRebuildRateHint", setPxSceneDescDynamicTreeRebuildRateHint, getPxSceneDescDynamicTreeRebuildRateHint )
+	, SceneQueryUpdateMode( "SceneQueryUpdateMode", setPxSceneDescSceneQueryUpdateMode, getPxSceneDescSceneQueryUpdateMode )
 	, UserData( "UserData", setPxSceneDescUserData, getPxSceneDescUserData )
 	, SolverBatchSize( "SolverBatchSize", setPxSceneDescSolverBatchSize, getPxSceneDescSolverBatchSize )
 	, NbContactDataBlocks( "NbContactDataBlocks", setPxSceneDescNbContactDataBlocks, getPxSceneDescNbContactDataBlocks )
@@ -1344,6 +1351,7 @@ PX_PHYSX_CORE_API PxSceneDescGeneratedValues::PxSceneDescGeneratedValues( const
 		,StaticStructure( inSource->staticStructure )
 		,DynamicStructure( inSource->dynamicStructure )
 		,DynamicTreeRebuildRateHint( inSource->dynamicTreeRebuildRateHint )
+		,SceneQueryUpdateMode( inSource->sceneQueryUpdateMode )
 		,UserData( inSource->userData )
 		,SolverBatchSize( inSource->solverBatchSize )
 		,NbContactDataBlocks( inSource->nbContactDataBlocks )
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqPruner.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqPruner.h
index 871962dfa2e0..9c77b1b51135 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqPruner.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqPruner.h
@@ -227,10 +227,19 @@ public:
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	/** 
 	 * Steps the accel structure build.
+	 * canDoInit specifies if initialization can happen. It should not initialize build when called from a different thread
 	 * returns true if finished
 	 */
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	virtual bool						buildStep() = 0;	
+	virtual bool						buildStep(bool canDoInit = true) = 0;
+
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	/** 
+	 * Prepares new tree build
+	 * returns true if new tree is needed
+	 */
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	virtual bool						prepareBuild() = 0;	
 };
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h
index 598336f821f4..3a24174177b2 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h
@@ -148,13 +148,15 @@ namespace Sq
 						
 						void							flushUpdates();
 						void							forceDynamicTreeRebuild(bool rebuildStaticStructure, bool rebuildDynamicStructure);
+						void							sceneQueryBuildStep(PruningIndex::Enum index);
 
 						DynamicBoundsSync&				getDynamicBoundsSync()					{ return mDynamicBoundsSync; }
 
+						bool							prepareSceneQueriesUpdate(PruningIndex::Enum index);
+
 		// Force a rebuild of the aabb/loose octree etc to allow raycasting on multiple threads.
-						void							processSimUpdates();
 						void							validateSimUpdates();
-						void							afterSync(bool commit);
+						void							afterSync(PxSceneQueryUpdateMode::Enum updateMode);
 						void							shiftOrigin(const PxVec3& shift);
 
 						void							flushMemory();
@@ -170,7 +172,10 @@ namespace Sq
 
 						DynamicBoundsSync				mDynamicBoundsSync;
 
+						volatile bool					mPrunerNeedsUpdating;
+
 						void							flushShapes();
+
 	};
 
 	///////////////////////////////////////////////////////////////////////////////
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.cpp
index 435328831d9f..4b148a537bc1 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.cpp
@@ -118,7 +118,15 @@ bool AABBPruner::addObjects(PrunerHandle* results, const PxBounds3* bounds, cons
 		if(!hasPruningStructure)
 		{
 			for(PxU32 i=0;i<valid;i++)
-				mBucketPruner.addObject(payload[i], bounds[i], mTimeStamp);
+			{
+#if USE_INCREMENTAL_PRUNER
+				const PrunerHandle& handle = results[i];
+				const PoolIndex poolIndex = mPool.getIndex(handle);
+				mBucketPruner.addObject(payload[i], bounds[i], mTimeStamp, poolIndex);
+#else
+				mBucketPruner.addObject(payload[i], bounds[i], mTimeStamp, INVALID_NODE_ID);
+#endif
+			}
 		}
 	}
 	return valid==count;
@@ -146,7 +154,7 @@ void AABBPruner::updateObjectsAfterManualBoundsUpdates(const PrunerHandle* handl
 				mAABBTree->markNodeForRefit(treeNodeIndex);
 			else // otherwise it means it should be in the bucket pruner
 			{
-				bool found = mBucketPruner.updateObject(newBounds[poolIndex], payloads[poolIndex]);
+				bool found = mBucketPruner.updateObject(newBounds[poolIndex], payloads[poolIndex], poolIndex);
 				PX_UNUSED(found); PX_ASSERT(found);
 			}
 
@@ -183,7 +191,7 @@ void AABBPruner::updateObjectsAndInflateBounds(const PrunerHandle* handles, cons
 //				bool found = mBucketPruner.updateObject(newBounds[indices[i]], mPool.getPayload(handles[i]));
 				PX_ASSERT(&payloads[poolIndex]==&mPool.getPayload(handles[i]));
 				// PT: TODO: don't we need to read the pool's array here, to pass the inflated bounds?
-				bool found = mBucketPruner.updateObject(newBounds[indices[i]], payloads[poolIndex]);
+				bool found = mBucketPruner.updateObject(newBounds[indices[i]], payloads[poolIndex], poolIndex);
 				PX_UNUSED(found); PX_ASSERT(found);
 			}
 
@@ -268,12 +276,12 @@ PxAgain AABBPruner::overlap(const ShapeData& queryVolume, PrunerCallback& pcb) c
 				if(queryVolume.isOBB())
 				{	
 					const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
-					again = AABBTreeOverlap<Gu::OBBAABBTest>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
+					again = AABBTreeOverlap<Gu::OBBAABBTest, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
 				}
 				else
 				{
 					const Gu::AABBAABBTest test(queryVolume.getPrunerInflatedWorldAABB());
-					again = AABBTreeOverlap<Gu::AABBAABBTest>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
+					again = AABBTreeOverlap<Gu::AABBAABBTest, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
 				}
 			}
 			break;
@@ -282,20 +290,20 @@ PxAgain AABBPruner::overlap(const ShapeData& queryVolume, PrunerCallback& pcb) c
 				const Gu::Capsule& capsule = queryVolume.getGuCapsule();
 				const Gu::CapsuleAABBTest test(	capsule.p1, queryVolume.getPrunerWorldRot33().column0,
 												queryVolume.getCapsuleHalfHeight()*2.0f, PxVec3(capsule.radius*SQ_PRUNER_INFLATION));
-				again = AABBTreeOverlap<Gu::CapsuleAABBTest>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
+				again = AABBTreeOverlap<Gu::CapsuleAABBTest, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
 			}
 			break;
 		case PxGeometryType::eSPHERE:
 			{
 				const Gu::Sphere& sphere = queryVolume.getGuSphere();
 				Gu::SphereAABBTest test(sphere.center, sphere.radius);
-				again = AABBTreeOverlap<Gu::SphereAABBTest>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
+				again = AABBTreeOverlap<Gu::SphereAABBTest, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);
 			}
 			break;
 		case PxGeometryType::eCONVEXMESH:
 			{
 				const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
-				again = AABBTreeOverlap<Gu::OBBAABBTest>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);			
+				again = AABBTreeOverlap<Gu::OBBAABBTest, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, test, pcb);			
 			}
 			break;
 		case PxGeometryType::ePLANE:
@@ -323,7 +331,7 @@ PxAgain AABBPruner::sweep(const ShapeData& queryVolume, const PxVec3& unitDir, P
 	{
 		const PxBounds3& aabb = queryVolume.getPrunerInflatedWorldAABB();
 		const PxVec3 extents = aabb.getExtents();
-		again = AABBTreeRaycast<true>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, aabb.getCenter(), unitDir, inOutDistance, extents, pcb);
+		again = AABBTreeRaycast<true, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, aabb.getCenter(), unitDir, inOutDistance, extents, pcb);
 	}
 
 	if(again && mIncrementalRebuild && mBucketPruner.getNbObjects())
@@ -339,7 +347,7 @@ PxAgain AABBPruner::raycast(const PxVec3& origin, const PxVec3& unitDir, PxReal&
 	PxAgain again = true;
 
 	if(mAABBTree)
-		again = AABBTreeRaycast<false>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, origin, unitDir, inOutDistance, PxVec3(0.0f), pcb);
+		again = AABBTreeRaycast<false, AABBTree, AABBTreeRuntimeNode>()(mPool.getObjects(), mPool.getCurrentWorldBoxes(), *mAABBTree, origin, unitDir, inOutDistance, PxVec3(0.0f), pcb);
 		
 	if(again && mIncrementalRebuild && mBucketPruner.getNbObjects())
 		again = mBucketPruner.raycast(origin, unitDir, inOutDistance, pcb);
@@ -376,7 +384,7 @@ void AABBPruner::commit()
 {
 	PX_PROFILE_ZONE("SceneQuery.prunerCommit", mContextID);
 
-	if(!mUncommittedChanges)
+	if(!mUncommittedChanges && (mProgress != BUILD_FINISHED))
 		// Q: seems like this is both for refit and finalization so is this is correct?
 		// i.e. in a situation when we started rebuilding a tree and didn't add anything since
 		// who is going to set mUncommittedChanges to true?
@@ -550,7 +558,7 @@ void AABBPruner::visualize(Cm::RenderOutput& out, PxU32 color) const
  */
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool AABBPruner::buildStep()
+bool AABBPruner::buildStep(bool synchronousCall)
 {
 	PX_PROFILE_ZONE("SceneQuery.prunerBuildStep", mContextID);
 
@@ -559,36 +567,8 @@ bool AABBPruner::buildStep()
 	{
 		if(mProgress==BUILD_NOT_STARTED)
 		{
-			const PxU32 nbObjects = mPool.getNbActiveObjects();
-			if(!nbObjects)
-				return true;
-
-			PX_DELETE(mNewTree);
-			mNewTree = PX_NEW(AABBTree);
-
-			mNbCachedBoxes = nbObjects;
-			// PT: we always allocate one extra box, to make sure we can safely use V4 loads on the array
-			mCachedBoxes = reinterpret_cast<PxBounds3*>(PX_ALLOC(sizeof(PxBounds3)*(nbObjects+1), "PxBound3"));
-
-			PxMemCopy(mCachedBoxes, mPool.getCurrentWorldBoxes(), nbObjects*sizeof(PxBounds3));
-
-			// PT: objects currently in the bucket pruner will be in the new tree. They are marked with the
-			// current timestamp (mTimeStamp). However more objects can get added while we compute the new tree,
-			// and those ones will not be part of it. These new objects will be marked with the new timestamp
-			// value (mTimeStamp+1), and we can use these different values to remove the proper objects from
-			// the bucket pruner (when switching to the new tree).
-			mTimeStamp++;
-			mBuilder.reset();
-			mBuilder.mNbPrimitives	= mNbCachedBoxes;
-			mBuilder.mAABBArray		= mCachedBoxes;
-			mBuilder.mLimit			= NB_OBJECTS_PER_NODE;
-
-			mBuildStats.reset();
-
-			// start recording modifications to the tree made during rebuild to reapply (fix the new tree) eventually
-			PX_ASSERT(mNewTreeFixups.size()==0);
-
-			mProgress = BUILD_INIT;
+			if(!synchronousCall || !prepareBuild())
+				return false;
 		}
 		else if(mProgress==BUILD_INIT)
 		{
@@ -684,16 +664,66 @@ bool AABBPruner::buildStep()
 		// This is required to be set because commit handles both refit and a portion of build finalization (why?)
 		// This is overly conservative also only necessary in case there were no updates at all to the tree since the last tree swap
 		// It also overly conservative in a sense that it could be set only if mProgress was just set to BUILD_FINISHED
+		// If run asynchronously from a different thread, we touched just the new AABB build phase, we should not mark the main tree as dirty
+		if(synchronousCall)
 		mUncommittedChanges = true;
 
 		return mProgress==BUILD_FINISHED;
 	}
 
-	return true;
+	return false;
 }
 
+bool AABBPruner::prepareBuild()
+{
+	PX_PROFILE_ZONE("SceneQuery.prepareBuild", mContextID);
 
+	PX_ASSERT(mIncrementalRebuild);
+	if(mNeedsNewTree)
+	{
+		if(mProgress==BUILD_NOT_STARTED)
+		{
+			const PxU32 nbObjects = mPool.getNbActiveObjects();
+			if(!nbObjects)
+				return false;
 
+			PX_DELETE(mNewTree);
+			mNewTree = PX_NEW(AABBTree);
+
+			mNbCachedBoxes = nbObjects;
+			// PT: we always allocate one extra box, to make sure we can safely use V4 loads on the array
+			mCachedBoxes = reinterpret_cast<PxBounds3*>(PX_ALLOC(sizeof(PxBounds3)*(nbObjects+1), "PxBound3"));
+
+			PxMemCopy(mCachedBoxes, mPool.getCurrentWorldBoxes(), nbObjects*sizeof(PxBounds3));
+
+			// PT: objects currently in the bucket pruner will be in the new tree. They are marked with the
+			// current timestamp (mTimeStamp). However more objects can get added while we compute the new tree,
+			// and those ones will not be part of it. These new objects will be marked with the new timestamp
+			// value (mTimeStamp+1), and we can use these different values to remove the proper objects from
+			// the bucket pruner (when switching to the new tree).
+			mTimeStamp++;
+#if USE_INCREMENTAL_PRUNER
+			// notify the incremental pruner to swap trees
+			mBucketPruner.timeStampChange();
+#endif
+			mBuilder.reset();
+			mBuilder.mNbPrimitives	= mNbCachedBoxes;
+			mBuilder.mAABBArray		= mCachedBoxes;
+			mBuilder.mLimit			= NB_OBJECTS_PER_NODE;
+
+			mBuildStats.reset();
+
+			// start recording modifications to the tree made during rebuild to reapply (fix the new tree) eventually
+			PX_ASSERT(mNewTreeFixups.size()==0);
+
+			mProgress = BUILD_INIT;
+		}
+	}
+	else
+		return false;
+
+	return true;
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.h
index a644781ccf1a..2b66cad4ae0b 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBPruner.h
@@ -147,7 +147,8 @@ namespace Sq
 		// IncrementalPruner
 		virtual			void					purge();		// gets rid of internal accel struct
 		virtual			void					setRebuildRateHint(PxU32 nbStepsForRebuild);	// Besides the actual rebuild steps, 3 additional steps are needed.
-		virtual			bool					buildStep();	// returns true if finished
+		virtual			bool					buildStep(bool synchronousCall = true);	// returns true if finished
+		virtual			bool					prepareBuild();	// returns true if new tree is needed
 		//~IncrementalPruner
 
 		// direct access for test code
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.cpp
index bb628010b0f7..bcb0e0ef60e8 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.cpp
@@ -42,105 +42,42 @@ using namespace Sq;
 // Progressive building
 class Sq::FIFOStack : public Ps::UserAllocated
 {
-	public:
-										FIFOStack() : mStack(PX_DEBUG_EXP("SQFIFOStack")), mCurIndex(0) {}
-										~FIFOStack() {}
+public:
+	FIFOStack() : mStack(PX_DEBUG_EXP("SQFIFOStack")), mCurIndex(0) {}
+	~FIFOStack() {}
 
 	PX_FORCE_INLINE	PxU32				getNbEntries() const { return mStack.size(); }
-	PX_FORCE_INLINE	void				push(AABBTreeBuildNode* entry)	{ mStack.pushBack(entry); }
-					bool				pop(AABBTreeBuildNode*& entry);
-	private:
-		Ps::Array<AABBTreeBuildNode*>	mStack;
-		PxU32							mCurIndex;			//!< Current index within the container
+	PX_FORCE_INLINE	void				push(AABBTreeBuildNode* entry) { mStack.pushBack(entry); }
+	bool				pop(AABBTreeBuildNode*& entry);
+private:
+	Ps::Array<AABBTreeBuildNode*>	mStack;
+	PxU32							mCurIndex;			//!< Current index within the container
 };
 
 bool Sq::FIFOStack::pop(AABBTreeBuildNode*& entry)
 {
 	const PxU32 NbEntries = mStack.size(); // Get current number of entries
-	if(!NbEntries)
+	if (!NbEntries)
 		return false; // Can be NULL when no value has been pushed. This is an invalid pop call.
 	entry = mStack[mCurIndex++]; // Get oldest entry, move to next one
-	if(mCurIndex==NbEntries)
+	if (mCurIndex == NbEntries)
 	{
 		// All values have been poped
 		mStack.clear();
-		mCurIndex=0;
+		mCurIndex = 0;
 	}
 	return true;
 }
 //~Progressive building
 
-NodeAllocator::NodeAllocator() : mPool(NULL), mCurrentSlabIndex(0), mTotalNbNodes(0)
-{
-}
-
-NodeAllocator::~NodeAllocator()
-{
-	release();
-}
-
-void NodeAllocator::release()
-{
-	const PxU32 nbSlabs = mSlabs.size();
-	for(PxU32 i=0;i<nbSlabs;i++)
-	{
-		Slab& s = mSlabs[i];
-		PX_DELETE_ARRAY(s.mPool);
-	}
-
-	mSlabs.reset();
-	mCurrentSlabIndex = 0;
-	mTotalNbNodes = 0;
-}
-
-void NodeAllocator::init(PxU32 nbPrimitives, PxU32 limit)
-{
-	const PxU32 maxSize = nbPrimitives*2 - 1;	// PT: max possible #nodes for a complete tree
-	const PxU32 estimatedFinalSize = maxSize<=1024 ? maxSize : maxSize/limit;
-	mPool = PX_NEW(AABBTreeBuildNode)[estimatedFinalSize];
-	PxMemZero(mPool, sizeof(AABBTreeBuildNode)*estimatedFinalSize);
-
-	// Setup initial node. Here we have a complete permutation of the app's primitives.
-	mPool->mNodeIndex		= 0;
-	mPool->mNbPrimitives	= nbPrimitives;
-
-	mSlabs.pushBack(Slab(mPool, 1, estimatedFinalSize));
-	mCurrentSlabIndex = 0;
-	mTotalNbNodes = 1;
-}
-
-// PT: TODO: inline this?
-AABBTreeBuildNode* NodeAllocator::getBiNode()
-{
-	mTotalNbNodes += 2;
-	Slab& currentSlab = mSlabs[mCurrentSlabIndex];
-	if(currentSlab.mNbUsedNodes+2<=currentSlab.mMaxNbNodes)
-	{
-		AABBTreeBuildNode* biNode = currentSlab.mPool + currentSlab.mNbUsedNodes;
-		currentSlab.mNbUsedNodes += 2;
-		return biNode;
-	}
-	else
-	{
-		// Allocate new slab
-		const PxU32 size = 1024;
-		AABBTreeBuildNode* pool = PX_NEW(AABBTreeBuildNode)[size];
-		PxMemZero(pool, sizeof(AABBTreeBuildNode)*size);
-
-		mSlabs.pushBack(Slab(pool, 2, size));
-		mCurrentSlabIndex++;
-		return pool;
-	}
-}
-
-void NodeAllocator::flatten(AABBTreeRuntimeNode* dest)
+void flatten(const NodeAllocator& nodeAllocator, AABBTreeRuntimeNode* dest)
 {
 	// PT: gathers all build nodes allocated so far and flatten them to a linear destination array of smaller runtime nodes
 	PxU32 offset = 0;
-	const PxU32 nbSlabs = mSlabs.size();
+	const PxU32 nbSlabs = nodeAllocator.mSlabs.size();
 	for(PxU32 s=0;s<nbSlabs;s++)
 	{
-		const Slab& currentSlab = mSlabs[s];
+		const NodeAllocator::Slab& currentSlab = nodeAllocator.mSlabs[s];
 
 		AABBTreeBuildNode* pool = currentSlab.mPool;
 		for(PxU32 i=0;i<currentSlab.mNbUsedNodes;i++)
@@ -162,177 +99,19 @@ void NodeAllocator::flatten(AABBTreeRuntimeNode* dest)
 				PxU32 nodeBase = 0;
 				for(PxU32 j=0;j<nbSlabs;j++)
 				{
-					if(pool[i].mPos>=mSlabs[j].mPool && pool[i].mPos<mSlabs[j].mPool+mSlabs[j].mNbUsedNodes)
+					if(pool[i].mPos>= nodeAllocator.mSlabs[j].mPool && pool[i].mPos < nodeAllocator.mSlabs[j].mPool + nodeAllocator.mSlabs[j].mNbUsedNodes)
 					{
-						localNodeIndex = PxU32(pool[i].mPos - mSlabs[j].mPool);
+						localNodeIndex = PxU32(pool[i].mPos - nodeAllocator.mSlabs[j].mPool);
 						break;
 					}
-					nodeBase += mSlabs[j].mNbUsedNodes;
+					nodeBase += nodeAllocator.mSlabs[j].mNbUsedNodes;
 				}
 				const PxU32 nodeIndex = nodeBase + localNodeIndex;
-				PX_ASSERT(nodeIndex<mTotalNbNodes);
 				dest[offset].mData = nodeIndex<<1;
 			}
 			offset++;
 		}
 	}
-	PX_ASSERT(offset==mTotalNbNodes);
-	release();
-}
-
-static PX_FORCE_INLINE float getSplittingValue(const PxBounds3& global_box, PxU32 axis)
-{
-	// Default split value = middle of the axis (using only the box)
-	return global_box.getCenter(axis);
-}
-
-static PxU32 split(const PxBounds3& box, PxU32 nb, PxU32* const PX_RESTRICT prims, PxU32 axis, const AABBTreeBuildParams& params)
-{
-	// Get node split value
-	const float splitValue = getSplittingValue(box, axis);
-
-	PxU32 nbPos = 0;
-	// Loop through all node-related primitives. Their indices range from "mNodePrimitives[0]" to "mNodePrimitives[mNbPrimitives-1]",
-	// with mNodePrimitives = mIndices + mNodeIndex (i.e. those indices map the global list in the tree params).
-
-	// PT: to avoid calling the unsafe [] operator
-	const size_t ptrValue = size_t(params.mCache) + axis*sizeof(float);
-	const PxVec3* /*PX_RESTRICT*/ cache = reinterpret_cast<const PxVec3*>(ptrValue);
-
-	for(PxU32 i=0;i<nb;i++)
-	{
-		// Get index in global list
-		const PxU32 index = prims[i];
-
-		// Test against the splitting value. The primitive value is tested against the enclosing-box center.
-		// [We only need an approximate partition of the enclosing box here.]
-		const float primitiveValue = cache[index].x;
-		PX_ASSERT(primitiveValue==params.mCache[index][axis]);
-
-		// Reorganize the list of indices in this order: positive - negative.
-		if(primitiveValue > splitValue)
-		{
-			// Swap entries
-			prims[i] = prims[nbPos];
-			prims[nbPos] = index;
-			// Count primitives assigned to positive space
-			nbPos++;
-		}
-	}
-	return nbPos;
-}
-
-void AABBTreeBuildNode::subdivide(const AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices)
-{
-	PxU32* const PX_RESTRICT primitives = indices + mNodeIndex;
-	const PxU32 nbPrims = mNbPrimitives;
-
-	// Compute global box & means for current node. The box is stored in mBV.
-	Vec4V meansV;
-	{
-		const PxBounds3* PX_RESTRICT boxes = params.mAABBArray;
-		PX_ASSERT(boxes);
-		PX_ASSERT(primitives);
-		PX_ASSERT(nbPrims);
-
-		Vec4V minV = V4LoadU(&boxes[primitives[0]].minimum.x);
-		Vec4V maxV = V4LoadU(&boxes[primitives[0]].maximum.x);
-
-		meansV = V4LoadU(&params.mCache[primitives[0]].x);
-
-		for(PxU32 i=1;i<nbPrims;i++)
-		{
-			const PxU32 index = primitives[i];
-			const Vec4V curMinV = V4LoadU(&boxes[index].minimum.x);
-			const Vec4V curMaxV = V4LoadU(&boxes[index].maximum.x);
-			meansV = V4Add(meansV, V4LoadU(&params.mCache[index].x));
-			minV = V4Min(minV, curMinV);
-			maxV = V4Max(maxV, curMaxV);
-		}
-
-		StoreBounds(mBV, minV, maxV);
-
-		const float coeff = 1.0f/float(nbPrims);
-		meansV = V4Scale(meansV, FLoad(coeff));
-	}
-
-	// Check the user-defined limit. Also ensures we stop subdividing if we reach a leaf node.
-	if(nbPrims<=params.mLimit)
-		return;
-
-	bool validSplit = true;
-	PxU32 nbPos;
-	{
-		// Compute variances
-		Vec4V varsV = V4Zero();
-		for(PxU32 i=0;i<nbPrims;i++)
-		{
-			const PxU32 index = primitives[i];
-			Vec4V centerV = V4LoadU(&params.mCache[index].x);
-			centerV = V4Sub(centerV, meansV);
-			centerV = V4Mul(centerV, centerV);
-			varsV = V4Add(varsV, centerV);
-		}
-		const float coeffNb1 = 1.0f/float(nbPrims-1);
-		varsV = V4Scale(varsV, FLoad(coeffNb1));
-		PX_ALIGN(16, PxVec4) vars;
-		V4StoreA(varsV, &vars.x);
-
-		// Choose axis with greatest variance
-		const PxU32 axis = Ps::largestAxis(PxVec3(vars.x, vars.y, vars.z));
-
-		// Split along the axis
-		nbPos = split(mBV, nbPrims, primitives, axis, params);
-
-		// Check split validity
-		if(!nbPos || nbPos==nbPrims)
-			validSplit = false;
-	}
-
-	// Check the subdivision has been successful
-	if(!validSplit)
-	{
-		// Here, all boxes lie in the same sub-space. Two strategies:
-		// - if we are over the split limit, make an arbitrary 50-50 split
-		// - else stop subdividing
-		if(nbPrims>params.mLimit)
-		{
-			nbPos = nbPrims>>1;
-		}
-		else return;
-	}
-
-	// Now create children and assign their pointers.
-	mPos = allocator.getBiNode();
-
-	stats.increaseCount(2);
-
-	// Assign children
-	PX_ASSERT(!isLeaf());
-	AABBTreeBuildNode* Pos = const_cast<AABBTreeBuildNode*>(mPos);
-	AABBTreeBuildNode* Neg = Pos + 1;
-	Pos->mNodeIndex		= mNodeIndex;
-	Pos->mNbPrimitives	= nbPos;
-	Neg->mNodeIndex		= mNodeIndex + nbPos;
-	Neg->mNbPrimitives	= mNbPrimitives - nbPos;
-}
-
-void AABBTreeBuildNode::_buildHierarchy(AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& nodeBase, PxU32* const indices)
-{
-	// Subdivide current node
-	subdivide(params, stats, nodeBase, indices);
-
-	// Recurse
-	if(!isLeaf())
-	{
-		AABBTreeBuildNode* Pos = const_cast<AABBTreeBuildNode*>(getPos());
-		PX_ASSERT(Pos);
-		AABBTreeBuildNode* Neg = Pos + 1;
-		Pos->_buildHierarchy(params, stats, nodeBase, indices);
-		Neg->_buildHierarchy(params, stats, nodeBase, indices);
-	}
-
-	stats.mTotalPrims += mNbPrimitives;
 }
 
 AABBTree::AABBTree() :
@@ -449,7 +228,8 @@ void AABBTree::buildEnd(AABBTreeBuildParams& params, BuildStats& stats)
 
 	mRuntimePool = PX_NEW(AABBTreeRuntimeNode)[mTotalNbNodes];
 	PX_ASSERT(mTotalNbNodes==mNodeAllocator.mTotalNbNodes);
-	mNodeAllocator.flatten(mRuntimePool);
+	flatten(mNodeAllocator, mRuntimePool);
+	mNodeAllocator.release();
 }
 
 bool AABBTree::build(AABBTreeBuildParams& params)
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.h
index 376de64ac389..7444299ec007 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTree.h
@@ -35,6 +35,7 @@
 #include "PsUserAllocated.h"
 #include "PsVecMath.h"
 #include "SqTypedef.h"
+#include "SqAABBTreeBuild.h"
 #include "PsArray.h"
 
 namespace physx
@@ -91,80 +92,6 @@ namespace Sq
 						PxU32			mSize;		//!< Size of the array in dwords
 	};
 
-	//! Contains AABB-tree build statistics
-	struct BuildStats
-	{
-								BuildStats() : mCount(0), mTotalPrims(0)	{}
-
-						PxU32	mCount;			//!< Number of nodes created
-						PxU32	mTotalPrims;	//!< Total accumulated number of primitives. Should be much higher than the source
-												//!< number of prims, since it accumulates all prims covered by each node (i.e. internal
-												//!< nodes too, not just leaf ones)
-
-		PX_FORCE_INLINE	void	reset()							{ mCount = mTotalPrims = 0;	}
-
-		PX_FORCE_INLINE	void	setCount(PxU32 nb)				{ mCount=nb;				}
-		PX_FORCE_INLINE	void	increaseCount(PxU32 nb)			{ mCount+=nb;				}
-		PX_FORCE_INLINE	PxU32	getCount()				const	{ return mCount;			}
-	};
-
-	//! Contains AABB-tree build parameters
-	class AABBTreeBuildParams : public Ps::UserAllocated
-	{
-		public:
-								AABBTreeBuildParams(PxU32 limit=1, PxU32 nb_prims=0, const PxBounds3* boxes=NULL) :
-									mLimit(limit), mNbPrimitives(nb_prims), mAABBArray(boxes), mCache(NULL)	{}
-								~AABBTreeBuildParams()
-								{
-									reset();
-								}
-
-		PX_FORCE_INLINE	void	reset()
-								{
-									mLimit = mNbPrimitives = 0;
-									mAABBArray = NULL;
-									PX_FREE_AND_RESET(mCache);
-								}
-
-								PxU32			mLimit;			//!< Limit number of primitives / node. If limit is 1, build a complete tree (2*N-1 nodes)
-								PxU32			mNbPrimitives;	//!< Number of (source) primitives.
-						const	PxBounds3*		mAABBArray;		//!< Shortcut to an app-controlled array of AABBs.
-								PxVec3*			mCache;			//!< Cache for AABB centers - managed by build code.
-	};
-
-	class NodeAllocator;
-
-	//! AABB tree node used for building
-	class AABBTreeBuildNode : public Ps::UserAllocated
-	{
-		public:
-		PX_FORCE_INLINE								AABBTreeBuildNode()			{}
-		PX_FORCE_INLINE								~AABBTreeBuildNode()		{}
-
-		PX_FORCE_INLINE	const PxBounds3&			getAABB()							const	{ return mBV;												}
-		PX_FORCE_INLINE	const AABBTreeBuildNode*	getPos()							const	{ return mPos;												}
-		PX_FORCE_INLINE	const AABBTreeBuildNode*	getNeg()							const	{ const AABBTreeBuildNode* P = mPos; return P ? P+1 : NULL;	}
-
-		PX_FORCE_INLINE	bool						isLeaf()							const	{ return !getPos();			}
-
-						PxBounds3					mBV;	//!< Global bounding-volume enclosing all the node-related primitives
-						const AABBTreeBuildNode*	mPos;	//!< "Positive" & "Negative" children
-
-						PxU32						mNodeIndex;			//!< Index of node-related primitives (in the tree's mIndices array)
-						PxU32						mNbPrimitives;		//!< Number of primitives for this node
-
-		// Data access
-		PX_FORCE_INLINE	PxU32						getNbPrimitives()					const	{ return mNbPrimitives;		}
-
-		PX_FORCE_INLINE	PxU32						getNbRuntimePrimitives()			const	{ return mNbPrimitives;		}
-		PX_FORCE_INLINE void						setNbRunTimePrimitives(PxU32 val)			{ mNbPrimitives = val;		}
-		PX_FORCE_INLINE	const PxU32*				getPrimitives(const PxU32* base)	const	{ return base+mNodeIndex;	}
-		PX_FORCE_INLINE	PxU32*						getPrimitives(PxU32* base)					{ return base+mNodeIndex;	}
-
-		// Internal methods
-						void						subdivide(const AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices);
-						void						_buildHierarchy(AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices);
-	};
 
 	//! AABB tree node used for runtime (smaller than for build)
 	class AABBTreeRuntimeNode : public Ps::UserAllocated
@@ -254,38 +181,6 @@ namespace Sq
 	class FIFOStack;
 	//~Progressive building
 
-	//! For complete trees we can predict the final number of nodes and preallocate them. For incomplete trees we can't.
-	//! But we don't want to allocate nodes one by one (which would be quite slow), so we use this helper class to
-	//! allocate N nodes at once, while minimizing the amount of nodes allocated for nothing. An initial amount of
-	//! nodes is estimated using the max number for a complete tree, and the user-defined number of primitives per leaf.
-	//! In ideal cases this estimated number will be quite close to the final number of nodes. When that number is not
-	//! enough though, slabs of N=1024 extra nodes are allocated until the build is complete.
-	class NodeAllocator : public Ps::UserAllocated
-	{
-		public:
-													NodeAllocator();
-													~NodeAllocator();
-
-						void						release();
-						void						init(PxU32 nbPrimitives, PxU32 limit);
-						void						flatten(AABBTreeRuntimeNode* dest);
-						AABBTreeBuildNode*			getBiNode();
-
-						AABBTreeBuildNode*			mPool;
-
-						struct Slab
-						{
-							PX_FORCE_INLINE	Slab()	{}
-							PX_FORCE_INLINE	Slab(AABBTreeBuildNode* pool, PxU32 nbUsedNodes, PxU32 maxNbNodes) : mPool(pool), mNbUsedNodes(nbUsedNodes), mMaxNbNodes(maxNbNodes)	{}
-							AABBTreeBuildNode*		mPool;
-							PxU32					mNbUsedNodes;
-							PxU32					mMaxNbNodes;
-						};
-						Ps::Array<Slab>				mSlabs;
-						PxU32						mCurrentSlabIndex;
-						PxU32						mTotalNbNodes;
-	};
-
 	//! AABB-tree, N primitives/leaf
 	class AABBTree : public Ps::UserAllocated
 	{
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.cpp
new file mode 100644
index 000000000000..3a8fb9ab68db
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.cpp
@@ -0,0 +1,256 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#include "SqAABBTreeBuild.h"
+#include "SqBounds.h"
+
+#include "PsMathUtils.h"
+#include "PsFoundation.h"
+#include "GuInternal.h"
+
+using namespace physx;
+using namespace Sq;
+
+NodeAllocator::NodeAllocator() : mPool(NULL), mCurrentSlabIndex(0), mTotalNbNodes(0)
+{
+}
+
+NodeAllocator::~NodeAllocator()
+{
+	release();
+}
+
+void NodeAllocator::release()
+{
+	const PxU32 nbSlabs = mSlabs.size();
+	for (PxU32 i = 0; i<nbSlabs; i++)
+	{
+		Slab& s = mSlabs[i];
+		PX_DELETE_ARRAY(s.mPool);
+	}
+
+	mSlabs.reset();
+	mCurrentSlabIndex = 0;
+	mTotalNbNodes = 0;
+}
+
+void NodeAllocator::init(PxU32 nbPrimitives, PxU32 limit)
+{
+	const PxU32 maxSize = nbPrimitives * 2 - 1;	// PT: max possible #nodes for a complete tree
+	const PxU32 estimatedFinalSize = maxSize <= 1024 ? maxSize : maxSize / limit;
+	mPool = PX_NEW(AABBTreeBuildNode)[estimatedFinalSize];
+	PxMemZero(mPool, sizeof(AABBTreeBuildNode)*estimatedFinalSize);
+
+	// Setup initial node. Here we have a complete permutation of the app's primitives.
+	mPool->mNodeIndex = 0;
+	mPool->mNbPrimitives = nbPrimitives;
+
+	mSlabs.pushBack(Slab(mPool, 1, estimatedFinalSize));
+	mCurrentSlabIndex = 0;
+	mTotalNbNodes = 1;
+}
+
+// PT: TODO: inline this?
+AABBTreeBuildNode* NodeAllocator::getBiNode()
+{
+	mTotalNbNodes += 2;
+	Slab& currentSlab = mSlabs[mCurrentSlabIndex];
+	if (currentSlab.mNbUsedNodes + 2 <= currentSlab.mMaxNbNodes)
+	{
+		AABBTreeBuildNode* biNode = currentSlab.mPool + currentSlab.mNbUsedNodes;
+		currentSlab.mNbUsedNodes += 2;
+		return biNode;
+	}
+	else
+	{
+		// Allocate new slab
+		const PxU32 size = 1024;
+		AABBTreeBuildNode* pool = PX_NEW(AABBTreeBuildNode)[size];
+		PxMemZero(pool, sizeof(AABBTreeBuildNode)*size);
+
+		mSlabs.pushBack(Slab(pool, 2, size));
+		mCurrentSlabIndex++;
+		return pool;
+	}
+}
+
+static PX_FORCE_INLINE float getSplittingValue(const PxBounds3& global_box, PxU32 axis)
+{
+	// Default split value = middle of the axis (using only the box)
+	return global_box.getCenter(axis);
+}
+
+static PxU32 split(const PxBounds3& box, PxU32 nb, PxU32* const PX_RESTRICT prims, PxU32 axis, const AABBTreeBuildParams& params)
+{
+	// Get node split value
+	const float splitValue = getSplittingValue(box, axis);
+
+	PxU32 nbPos = 0;
+	// Loop through all node-related primitives. Their indices range from "mNodePrimitives[0]" to "mNodePrimitives[mNbPrimitives-1]",
+	// with mNodePrimitives = mIndices + mNodeIndex (i.e. those indices map the global list in the tree params).
+
+	// PT: to avoid calling the unsafe [] operator
+	const size_t ptrValue = size_t(params.mCache) + axis * sizeof(float);
+	const PxVec3* /*PX_RESTRICT*/ cache = reinterpret_cast<const PxVec3*>(ptrValue);
+
+	for (PxU32 i = 0; i<nb; i++)
+	{
+		// Get index in global list
+		const PxU32 index = prims[i];
+
+		// Test against the splitting value. The primitive value is tested against the enclosing-box center.
+		// [We only need an approximate partition of the enclosing box here.]
+		const float primitiveValue = cache[index].x;
+		PX_ASSERT(primitiveValue == params.mCache[index][axis]);
+
+		// Reorganize the list of indices in this order: positive - negative.
+		if (primitiveValue > splitValue)
+		{
+			// Swap entries
+			prims[i] = prims[nbPos];
+			prims[nbPos] = index;
+			// Count primitives assigned to positive space
+			nbPos++;
+		}
+	}
+	return nbPos;
+}
+
+void AABBTreeBuildNode::subdivide(const AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices)
+{
+	PxU32* const PX_RESTRICT primitives = indices + mNodeIndex;
+	const PxU32 nbPrims = mNbPrimitives;
+
+	// Compute global box & means for current node. The box is stored in mBV.
+	Vec4V meansV;
+	{
+		const PxBounds3* PX_RESTRICT boxes = params.mAABBArray;
+		PX_ASSERT(boxes);
+		PX_ASSERT(primitives);
+		PX_ASSERT(nbPrims);
+
+		Vec4V minV = V4LoadU(&boxes[primitives[0]].minimum.x);
+		Vec4V maxV = V4LoadU(&boxes[primitives[0]].maximum.x);
+
+		meansV = V4LoadU(&params.mCache[primitives[0]].x);
+
+		for (PxU32 i = 1; i<nbPrims; i++)
+		{
+			const PxU32 index = primitives[i];
+			const Vec4V curMinV = V4LoadU(&boxes[index].minimum.x);
+			const Vec4V curMaxV = V4LoadU(&boxes[index].maximum.x);
+			meansV = V4Add(meansV, V4LoadU(&params.mCache[index].x));
+			minV = V4Min(minV, curMinV);
+			maxV = V4Max(maxV, curMaxV);
+		}
+
+		StoreBounds(mBV, minV, maxV);
+
+		const float coeff = 1.0f / float(nbPrims);
+		meansV = V4Scale(meansV, FLoad(coeff));
+	}
+
+	// Check the user-defined limit. Also ensures we stop subdividing if we reach a leaf node.
+	if (nbPrims <= params.mLimit)
+		return;
+
+	bool validSplit = true;
+	PxU32 nbPos;
+	{
+		// Compute variances
+		Vec4V varsV = V4Zero();
+		for (PxU32 i = 0; i<nbPrims; i++)
+		{
+			const PxU32 index = primitives[i];
+			Vec4V centerV = V4LoadU(&params.mCache[index].x);
+			centerV = V4Sub(centerV, meansV);
+			centerV = V4Mul(centerV, centerV);
+			varsV = V4Add(varsV, centerV);
+		}
+		const float coeffNb1 = 1.0f / float(nbPrims - 1);
+		varsV = V4Scale(varsV, FLoad(coeffNb1));
+		PX_ALIGN(16, PxVec4) vars;
+		V4StoreA(varsV, &vars.x);
+
+		// Choose axis with greatest variance
+		const PxU32 axis = Ps::largestAxis(PxVec3(vars.x, vars.y, vars.z));
+
+		// Split along the axis
+		nbPos = split(mBV, nbPrims, primitives, axis, params);
+
+		// Check split validity
+		if (!nbPos || nbPos == nbPrims)
+			validSplit = false;
+	}
+
+	// Check the subdivision has been successful
+	if (!validSplit)
+	{
+		// Here, all boxes lie in the same sub-space. Two strategies:
+		// - if we are over the split limit, make an arbitrary 50-50 split
+		// - else stop subdividing
+		if (nbPrims>params.mLimit)
+		{
+			nbPos = nbPrims >> 1;
+		}
+		else return;
+	}
+
+	// Now create children and assign their pointers.
+	mPos = allocator.getBiNode();
+
+	stats.increaseCount(2);
+
+	// Assign children
+	PX_ASSERT(!isLeaf());
+	AABBTreeBuildNode* Pos = const_cast<AABBTreeBuildNode*>(mPos);
+	AABBTreeBuildNode* Neg = Pos + 1;
+	Pos->mNodeIndex = mNodeIndex;
+	Pos->mNbPrimitives = nbPos;
+	Neg->mNodeIndex = mNodeIndex + nbPos;
+	Neg->mNbPrimitives = mNbPrimitives - nbPos;
+}
+
+void AABBTreeBuildNode::_buildHierarchy(AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& nodeBase, PxU32* const indices)
+{
+	// Subdivide current node
+	subdivide(params, stats, nodeBase, indices);
+
+	// Recurse
+	if (!isLeaf())
+	{
+		AABBTreeBuildNode* Pos = const_cast<AABBTreeBuildNode*>(getPos());
+		PX_ASSERT(Pos);
+		AABBTreeBuildNode* Neg = Pos + 1;
+		Pos->_buildHierarchy(params, stats, nodeBase, indices);
+		Neg->_buildHierarchy(params, stats, nodeBase, indices);
+	}
+
+	stats.mTotalPrims += mNbPrimitives;
+}
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.h
new file mode 100644
index 000000000000..a8ab94f3d5fa
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeBuild.h
@@ -0,0 +1,162 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#ifndef SQ_AABBTREE_BUILD_H
+#define SQ_AABBTREE_BUILD_H
+
+#include "foundation/PxMemory.h"
+#include "foundation/PxBounds3.h"
+#include "PsUserAllocated.h"
+#include "PsVecMath.h"
+#include "SqTypedef.h"
+#include "PsArray.h"
+
+namespace physx
+{
+
+	using namespace shdfnd::aos;
+
+	namespace Sq
+	{
+		//! Contains AABB-tree build statistics
+		struct BuildStats
+		{
+			BuildStats() : mCount(0), mTotalPrims(0) {}
+
+			PxU32	mCount;			//!< Number of nodes created
+			PxU32	mTotalPrims;	//!< Total accumulated number of primitives. Should be much higher than the source
+									//!< number of prims, since it accumulates all prims covered by each node (i.e. internal
+									//!< nodes too, not just leaf ones)
+
+			PX_FORCE_INLINE	void	reset() { mCount = mTotalPrims = 0; }
+
+			PX_FORCE_INLINE	void	setCount(PxU32 nb) { mCount = nb; }
+			PX_FORCE_INLINE	void	increaseCount(PxU32 nb) { mCount += nb; }
+			PX_FORCE_INLINE	PxU32	getCount()				const { return mCount; }
+		};
+
+		//! Contains AABB-tree build parameters
+		class AABBTreeBuildParams : public Ps::UserAllocated
+		{
+		public:
+			AABBTreeBuildParams(PxU32 limit = 1, PxU32 nb_prims = 0, const PxBounds3* boxes = NULL) :
+				mLimit(limit), mNbPrimitives(nb_prims), mAABBArray(boxes), mCache(NULL) {}
+			~AABBTreeBuildParams()
+			{
+				reset();
+			}
+
+			PX_FORCE_INLINE	void	reset()
+			{
+				mLimit = mNbPrimitives = 0;
+				mAABBArray = NULL;
+				PX_FREE_AND_RESET(mCache);
+			}
+
+			PxU32			mLimit;			//!< Limit number of primitives / node. If limit is 1, build a complete tree (2*N-1 nodes)
+			PxU32			mNbPrimitives;	//!< Number of (source) primitives.
+			const	PxBounds3*		mAABBArray;		//!< Shortcut to an app-controlled array of AABBs.
+			PxVec3*			mCache;			//!< Cache for AABB centers - managed by build code.
+		};
+
+		class NodeAllocator;
+
+		//! AABB tree node used for building
+		class AABBTreeBuildNode : public Ps::UserAllocated
+		{
+		public:
+			PX_FORCE_INLINE								AABBTreeBuildNode() {}
+			PX_FORCE_INLINE								~AABBTreeBuildNode() {}
+
+			PX_FORCE_INLINE	const PxBounds3&			getAABB()							const { return mBV; }
+			PX_FORCE_INLINE	const AABBTreeBuildNode*	getPos()							const { return mPos; }
+			PX_FORCE_INLINE	const AABBTreeBuildNode*	getNeg()							const { const AABBTreeBuildNode* P = mPos; return P ? P + 1 : NULL; }
+
+			PX_FORCE_INLINE	bool						isLeaf()							const { return !getPos(); }
+
+			PxBounds3					mBV;	//!< Global bounding-volume enclosing all the node-related primitives
+			const AABBTreeBuildNode*	mPos;	//!< "Positive" & "Negative" children
+
+			PxU32						mNodeIndex;			//!< Index of node-related primitives (in the tree's mIndices array)
+			PxU32						mNbPrimitives;		//!< Number of primitives for this node
+
+															// Data access
+			PX_FORCE_INLINE	PxU32						getNbPrimitives()					const { return mNbPrimitives; }
+
+			PX_FORCE_INLINE	PxU32						getNbRuntimePrimitives()			const { return mNbPrimitives; }
+			PX_FORCE_INLINE void						setNbRunTimePrimitives(PxU32 val) { mNbPrimitives = val; }
+			PX_FORCE_INLINE	const PxU32*				getPrimitives(const PxU32* base)	const { return base + mNodeIndex; }
+			PX_FORCE_INLINE	PxU32*						getPrimitives(PxU32* base) { return base + mNodeIndex; }
+
+			// Internal methods
+			void						subdivide(const AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices);
+			void						_buildHierarchy(AABBTreeBuildParams& params, BuildStats& stats, NodeAllocator& allocator, PxU32* const indices);
+		};
+
+		// Progressive building
+		class FIFOStack;
+		//~Progressive building
+
+		//! For complete trees we can predict the final number of nodes and preallocate them. For incomplete trees we can't.
+		//! But we don't want to allocate nodes one by one (which would be quite slow), so we use this helper class to
+		//! allocate N nodes at once, while minimizing the amount of nodes allocated for nothing. An initial amount of
+		//! nodes is estimated using the max number for a complete tree, and the user-defined number of primitives per leaf.
+		//! In ideal cases this estimated number will be quite close to the final number of nodes. When that number is not
+		//! enough though, slabs of N=1024 extra nodes are allocated until the build is complete.
+		class NodeAllocator : public Ps::UserAllocated
+		{
+		public:
+			NodeAllocator();
+			~NodeAllocator();
+
+			void						release();
+			void						init(PxU32 nbPrimitives, PxU32 limit);
+			AABBTreeBuildNode*			getBiNode();
+
+			AABBTreeBuildNode*			mPool;
+
+			struct Slab
+			{
+				PX_FORCE_INLINE	Slab() {}
+				PX_FORCE_INLINE	Slab(AABBTreeBuildNode* pool, PxU32 nbUsedNodes, PxU32 maxNbNodes) : mPool(pool), mNbUsedNodes(nbUsedNodes), mMaxNbNodes(maxNbNodes) {}
+				AABBTreeBuildNode*		mPool;
+				PxU32					mNbUsedNodes;
+				PxU32					mMaxNbNodes;
+			};
+			Ps::Array<Slab>				mSlabs;
+			PxU32						mCurrentSlabIndex;
+			PxU32						mTotalNbNodes;
+		};
+
+
+	} // namespace Sq
+
+}
+
+#endif // SQ_AABBTREE_H
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeQuery.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeQuery.h
index 062212a290ef..ec1ccb4687e0 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeQuery.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqAABBTreeQuery.h
@@ -54,22 +54,22 @@ namespace physx
 
 		//////////////////////////////////////////////////////////////////////////
 
-		template<typename Test>
+		template<typename Test, typename Tree, typename Node>
 		class AABBTreeOverlap
 		{
 		public:
-			bool operator()(const PrunerPayload* objects, const PxBounds3* boxes, const AABBTree& tree, const Test& test, PrunerCallback& visitor)
+			bool operator()(const PrunerPayload* objects, const PxBounds3* boxes, const Tree& tree, const Test& test, PrunerCallback& visitor)
 			{
 				using namespace Cm;
 
-				const AABBTreeRuntimeNode* stack[RAW_TRAVERSAL_STACK_SIZE];
-				const AABBTreeRuntimeNode* const nodeBase = tree.getNodes();
+				const Node* stack[RAW_TRAVERSAL_STACK_SIZE];
+				const Node* const nodeBase = tree.getNodes();
 				stack[0] = nodeBase;
 				PxU32 stackIndex = 1;
 
 				while (stackIndex > 0)
 				{
-					const AABBTreeRuntimeNode* node = stack[--stackIndex];
+					const Node* node = stack[--stackIndex];
 					Vec3V center, extents;
 					node->getAABBCenterExtentsV(&center, &extents);
 					while (test(center, extents))
@@ -107,7 +107,7 @@ namespace physx
 							break;
 						}
 
-						const AABBTreeRuntimeNode* children = node->getPos(nodeBase);
+						const Node* children = node->getPos(nodeBase);
 
 						node = children;
 						stack[stackIndex++] = children + 1;
@@ -121,9 +121,9 @@ namespace physx
 
 		//////////////////////////////////////////////////////////////////////////
 
-		template <bool tInflate> // use inflate=true for sweeps, inflate=false for raycasts
-		static PX_FORCE_INLINE bool doLeafTest(const AABBTreeRuntimeNode* node, Gu::RayAABBTest& test, PxReal& md, PxReal oldMaxDist,
-			const PrunerPayload* objects, const PxBounds3* boxes, const AABBTree& tree,
+		template <bool tInflate, typename Tree, typename Node> // use inflate=true for sweeps, inflate=false for raycasts
+		static PX_FORCE_INLINE bool doLeafTest(const Node* node, Gu::RayAABBTest& test, PxReal& md, PxReal oldMaxDist,
+			const PrunerPayload* objects, const PxBounds3* boxes, const Tree& tree,
 			PxReal& maxDist, PrunerCallback& pcb)
 		{
 			PxU32 nbPrims = node->getNbPrimitives();
@@ -158,12 +158,12 @@ namespace physx
 
 		//////////////////////////////////////////////////////////////////////////
 
-		template <bool tInflate> // use inflate=true for sweeps, inflate=false for raycasts
+		template <bool tInflate, typename Tree, typename Node> // use inflate=true for sweeps, inflate=false for raycasts
 		class AABBTreeRaycast
 		{
 		public:
 			bool operator()(
-				const PrunerPayload* objects, const PxBounds3* boxes, const AABBTree& tree,
+				const PrunerPayload* objects, const PxBounds3* boxes, const Tree& tree,
 				const PxVec3& origin, const PxVec3& unitDir, PxReal& maxDist, const PxVec3& inflation,
 				PrunerCallback& pcb)
 			{
@@ -173,15 +173,15 @@ namespace physx
 				// So we initialize the test with values multiplied by 2 as well, to get correct results
 				Gu::RayAABBTest test(origin*2.0f, unitDir*2.0f, maxDist, inflation*2.0f);
 
-				const AABBTreeRuntimeNode* stack[RAW_TRAVERSAL_STACK_SIZE]; // stack always contains PPU addresses
-				const AABBTreeRuntimeNode* const nodeBase = tree.getNodes();
+				const Node* stack[RAW_TRAVERSAL_STACK_SIZE]; // stack always contains PPU addresses
+				const Node* const nodeBase = tree.getNodes();
 				stack[0] = nodeBase;
 				PxU32 stackIndex = 1;
 
 				PxReal oldMaxDist;
 				while (stackIndex--)
 				{
-					const AABBTreeRuntimeNode* node = stack[stackIndex];
+					const Node* node = stack[stackIndex];
 					Vec3V center, extents;
 					node->getAABBCenterExtentsV2(&center, &extents);
 					if (test.check<tInflate>(center, extents))	// TODO: try timestamp ray shortening to skip this
@@ -189,7 +189,7 @@ namespace physx
 						PxReal md = maxDist; // has to be before the goto below to avoid compile error
 						while (!node->isLeaf())
 						{
-							const AABBTreeRuntimeNode* children = node->getPos(nodeBase);
+							const Node* children = node->getPos(nodeBase);
 
 							Vec3V c0, e0;
 							children[0].getAABBCenterExtentsV2(&c0, &e0);
@@ -217,7 +217,7 @@ namespace physx
 
 						oldMaxDist = maxDist; // we copy since maxDist can be updated in the callback and md<maxDist test below can fail
 
-						if (!doLeafTest<tInflate>(node, test, md, oldMaxDist,
+						if (!doLeafTest<tInflate, Tree, Node>(node, test, md, oldMaxDist,
 							objects, boxes, tree,
 							maxDist,
 							pcb))
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.cpp
index a9a7b2ef3b62..beaa6e0190a8 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.cpp
@@ -45,7 +45,13 @@ using namespace Ps;
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Constructor, preallocate trees, bounds
 ExtendedBucketPruner::ExtendedBucketPruner(const PruningPool* pool)
-	: mBucketCore(false), mPruningPool(pool), mMainTree(NULL), mBounds(NULL), mMergedTrees(NULL), 
+	: 
+#if USE_INCREMENTAL_PRUNER
+	mPrunerCore(pool),
+#else
+	mPrunerCore(false), 
+#endif
+	mPruningPool(pool), mMainTree(NULL), mBounds(NULL), mMergedTrees(NULL), 
 	mCurrentTreeIndex(0), mTreesDirty(false)
 {
 	// preallocated size for bounds, trees
@@ -92,7 +98,7 @@ ExtendedBucketPruner::~ExtendedBucketPruner()
 void ExtendedBucketPruner::release()
 {	
 	// release core bucket pruner
-	mBucketCore.release();
+	mPrunerCore.release();
 
 	mMainTreeUpdateMap.release();
 	mMergeTreeUpdateMap.release();
@@ -216,14 +222,20 @@ void ExtendedBucketPruner::resize(PxU32 size)
 
 //////////////////////////////////////////////////////////////////////////
 // Update object
-bool ExtendedBucketPruner::updateObject(const PxBounds3& worldAABB, const PrunerPayload& object)
+bool ExtendedBucketPruner::updateObject(const PxBounds3& worldAABB, const PrunerPayload& object, const PoolIndex poolIndex)
 {	
 	const ExtendedBucketPrunerMap::Entry* extendedPrunerEntry = mExtendedBucketPrunerMap.find(object);
 
 	// if object is not in tree of trees, it is in bucket pruner core
 	if(!extendedPrunerEntry)
 	{		
-		return mBucketCore.updateObject(worldAABB, object);
+#if USE_INCREMENTAL_PRUNER
+		PX_UNUSED(worldAABB);
+		return mPrunerCore.updateObject(poolIndex);
+#else
+		PX_UNUSED(poolIndex);
+		return mPrunerCore.updateObject(worldAABB, object);
+#endif 
 	}
 	else
 	{
@@ -352,8 +364,13 @@ bool ExtendedBucketPruner::removeObject(const PrunerPayload& object, PxU32 objec
 		// we need to call invalidateObjects, it might happen that the swapped object
 		// does belong to the extended bucket pruner, in that case the objects index
 		// needs to be swapped.
-		swapIndex(objectIndex, swapObject, swapObjectIndex);		
-		return mBucketCore.removeObject(object, timeStamp);
+		// do not call additional bucket pruner swap, that does happen during remove
+		swapIndex(objectIndex, swapObject, swapObjectIndex, false);
+#if USE_INCREMENTAL_PRUNER
+		return mPrunerCore.removeObject(objectIndex, swapObjectIndex, timeStamp);
+#else
+		return mPrunerCore.removeObject(object, timeStamp);
+#endif
 	}
 	else
 	{	
@@ -424,8 +441,9 @@ void ExtendedBucketPruner::invalidateObject(const ExtendedBucketPrunerData& data
 
 // Swap object index
 // if swapObject is in a merged tree its index needs to be swapped with objectIndex
-void ExtendedBucketPruner::swapIndex(PxU32 objectIndex, const PrunerPayload& swapObject, PxU32 swapObjectIndex)
+void ExtendedBucketPruner::swapIndex(PxU32 objectIndex, const PrunerPayload& swapObject, PxU32 swapObjectIndex, bool corePrunerIncluded)
 {
+	PX_UNUSED(corePrunerIncluded);
 	if (objectIndex == swapObjectIndex)
 		return;
 
@@ -463,6 +481,13 @@ void ExtendedBucketPruner::swapIndex(PxU32 objectIndex, const PrunerPayload& swa
 		PX_ASSERT(foundIt);
 		PX_UNUSED(foundIt);
 	}
+#if USE_INCREMENTAL_PRUNER
+	else
+	{
+		if(corePrunerIncluded)
+			mPrunerCore.swapIndex(objectIndex, swapObjectIndex);
+	}
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -470,7 +495,7 @@ void ExtendedBucketPruner::swapIndex(PxU32 objectIndex, const PrunerPayload& swa
 PxU32 ExtendedBucketPruner::removeMarkedObjects(PxU32 timeStamp)
 {
 	// remove objects from the core bucket pruner
-	PxU32 retVal = mBucketCore.removeMarkedObjects(timeStamp);
+	PxU32 retVal = mPrunerCore.removeMarkedObjects(timeStamp);
 
 	// nothing to be removed
 	if(!mCurrentTreeIndex)
@@ -591,7 +616,7 @@ void ExtendedBucketPruner::shiftOrigin(const PxVec3& shift)
 		mMergedTrees[i].mTree->shiftOrigin(shift);
 	}
 
-	mBucketCore.shiftOrigin(shift);
+	mPrunerCore.shiftOrigin(shift);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -611,7 +636,7 @@ struct MainTreeRaycastPrunerCallback: public PrunerCallback
 		// payload data match merged tree data MergedTree, we can cast it
 		const AABBTree* aabbTree = reinterpret_cast<const AABBTree*> (payload.data[0]);
 		// raycast the merged tree
-		return AABBTreeRaycast<tInflate>()(mPruningPool->getObjects(), mPruningPool->getCurrentWorldBoxes(), *aabbTree, mOrigin, mUnitDir, distance, mExtent, mPrunerCallback);
+		return AABBTreeRaycast<tInflate, AABBTree, AABBTreeRuntimeNode>()(mPruningPool->getObjects(), mPruningPool->getCurrentWorldBoxes(), *aabbTree, mOrigin, mUnitDir, distance, mExtent, mPrunerCallback);
 	}
 
 	PX_NOCOPY(MainTreeRaycastPrunerCallback)
@@ -631,8 +656,8 @@ PxAgain ExtendedBucketPruner::raycast(const PxVec3& origin, const PxVec3& unitDi
 	PxAgain again = true;	
 
 	// searc the bucket pruner first
-	if (mBucketCore.getNbObjects())
-		again = mBucketCore.raycast(origin, unitDir, inOutDistance, prunerCallback);
+	if (mPrunerCore.getNbObjects())
+		again = mPrunerCore.raycast(origin, unitDir, inOutDistance, prunerCallback);
 
 	if (again && mExtendedBucketPrunerMap.size())
 	{
@@ -640,7 +665,7 @@ PxAgain ExtendedBucketPruner::raycast(const PxVec3& origin, const PxVec3& unitDi
 		// main tree callback
 		MainTreeRaycastPrunerCallback<false> pcb(origin, unitDir, extent, prunerCallback, mPruningPool);
 		// traverse the main tree
-		again = AABBTreeRaycast<false>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, origin, unitDir, inOutDistance, extent, pcb);
+		again = AABBTreeRaycast<false, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, origin, unitDir, inOutDistance, extent, pcb);
 	}
 
 	return again;
@@ -661,7 +686,7 @@ struct MainTreeOverlapPrunerCallback : public PrunerCallback
 		// payload data match merged tree data MergedTree, we can cast it
 		const AABBTree* aabbTree = reinterpret_cast<const AABBTree*> (payload.data[0]);
 		// overlap the merged tree
-		return AABBTreeOverlap<Test>()(mPruningPool->getObjects(), mPruningPool->getCurrentWorldBoxes(), *aabbTree, mTest, mPrunerCallback);
+		return AABBTreeOverlap<Test, AABBTree, AABBTreeRuntimeNode>()(mPruningPool->getObjects(), mPruningPool->getCurrentWorldBoxes(), *aabbTree, mTest, mPrunerCallback);
 	}
 
 	PX_NOCOPY(MainTreeOverlapPrunerCallback)
@@ -679,8 +704,8 @@ PxAgain ExtendedBucketPruner::overlap(const Gu::ShapeData& queryVolume, PrunerCa
 	PxAgain again = true;
 
 	// core bucket pruner overlap
-	if (mBucketCore.getNbObjects())
-		again = mBucketCore.overlap(queryVolume, prunerCallback);
+	if (mPrunerCore.getNbObjects())
+		again = mPrunerCore.overlap(queryVolume, prunerCallback);
 
 	if(again && mExtendedBucketPrunerMap.size())
 	{
@@ -692,13 +717,13 @@ PxAgain ExtendedBucketPruner::overlap(const Gu::ShapeData& queryVolume, PrunerCa
 			{
 				const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
 				MainTreeOverlapPrunerCallback<Gu::OBBAABBTest> pcb(test, prunerCallback, mPruningPool);
-				again = AABBTreeOverlap<Gu::OBBAABBTest>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);
+				again = AABBTreeOverlap<Gu::OBBAABBTest, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);
 			}
 			else
 			{
 				const Gu::AABBAABBTest test(queryVolume.getPrunerInflatedWorldAABB());
 				MainTreeOverlapPrunerCallback<Gu::AABBAABBTest> pcb(test, prunerCallback, mPruningPool);
-				again = AABBTreeOverlap<Gu::AABBAABBTest>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
+				again = AABBTreeOverlap<Gu::AABBAABBTest, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
 			}
 		}
 		break;
@@ -708,7 +733,7 @@ PxAgain ExtendedBucketPruner::overlap(const Gu::ShapeData& queryVolume, PrunerCa
 			const Gu::CapsuleAABBTest test(capsule.p1, queryVolume.getPrunerWorldRot33().column0,
 				queryVolume.getCapsuleHalfHeight()*2.0f, PxVec3(capsule.radius*SQ_PRUNER_INFLATION));
 			MainTreeOverlapPrunerCallback<Gu::CapsuleAABBTest> pcb(test, prunerCallback, mPruningPool);			
-			again = AABBTreeOverlap<Gu::CapsuleAABBTest>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
+			again = AABBTreeOverlap<Gu::CapsuleAABBTest, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
 		}
 		break;
 		case PxGeometryType::eSPHERE:
@@ -716,14 +741,14 @@ PxAgain ExtendedBucketPruner::overlap(const Gu::ShapeData& queryVolume, PrunerCa
 			const Gu::Sphere& sphere = queryVolume.getGuSphere();
 			Gu::SphereAABBTest test(sphere.center, sphere.radius);
 			MainTreeOverlapPrunerCallback<Gu::SphereAABBTest> pcb(test, prunerCallback, mPruningPool);
-			again = AABBTreeOverlap<Gu::SphereAABBTest>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
+			again = AABBTreeOverlap<Gu::SphereAABBTest, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
 		}
 		break;
 		case PxGeometryType::eCONVEXMESH:
 		{
 			const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
 			MainTreeOverlapPrunerCallback<Gu::OBBAABBTest> pcb(test, prunerCallback, mPruningPool);			
-			again = AABBTreeOverlap<Gu::OBBAABBTest>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
+			again = AABBTreeOverlap<Gu::OBBAABBTest, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, test, pcb);				
 		}
 		break;
 		case PxGeometryType::ePLANE:
@@ -745,8 +770,8 @@ PxAgain ExtendedBucketPruner::sweep(const Gu::ShapeData& queryVolume, const PxVe
 	PxAgain again = true;
 
 	// core bucket pruner sweep
-	if (mBucketCore.getNbObjects())
-		again = mBucketCore.sweep(queryVolume, unitDir, inOutDistance, prunerCallback);
+	if (mPrunerCore.getNbObjects())
+		again = mPrunerCore.sweep(queryVolume, unitDir, inOutDistance, prunerCallback);
 
 	if(again && mExtendedBucketPrunerMap.size())
 	{
@@ -754,7 +779,7 @@ PxAgain ExtendedBucketPruner::sweep(const Gu::ShapeData& queryVolume, const PxVe
 		const PxVec3 extents = aabb.getExtents();
 		const PxVec3 center = aabb.getCenter();
 		MainTreeRaycastPrunerCallback<true> pcb(center, unitDir, extents, prunerCallback, mPruningPool);
-		again = AABBTreeRaycast<true>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, center, unitDir, inOutDistance, extents, pcb);
+		again = AABBTreeRaycast<true, AABBTree, AABBTreeRuntimeNode>()(reinterpret_cast<const PrunerPayload*>(mMergedTrees), mBounds, *mMainTree, center, unitDir, inOutDistance, extents, pcb);
 	}
 	return again;
 }
@@ -794,7 +819,7 @@ void ExtendedBucketPruner::visualize(Cm::RenderOutput& out, PxU32 color) const
 		visualizeTree(out, color, mMergedTrees[i].mTree);
 	}
 
-	mBucketCore.visualize(out, color);
+	mPrunerCore.visualize(out, color);
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.h
index 923501a03bf3..62e27d7e43b5 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.h
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqExtendedBucketPruner.h
@@ -32,9 +32,12 @@
 
 #include "SqTypedef.h"
 #include "SqBucketPruner.h"
+#include "SqIncrementalAABBPrunerCore.h"
 #include "SqAABBTreeUpdateMap.h"
 #include "PsHashMap.h"
 
+#define USE_INCREMENTAL_PRUNER 1
+
 namespace physx
 {
 namespace Sq
@@ -42,6 +45,12 @@ namespace Sq
 	struct AABBPrunerMergeData;
 	class AABBTreeMergeData;
 
+#if USE_INCREMENTAL_PRUNER
+	typedef IncrementalAABBPrunerCore PrunerCore;
+#else
+	typedef BucketPrunerCore		PrunerCore;
+#endif
+
 	// Extended bucket pruner data, if an object belongs to the tree of trees, we need to
 	// remember node for the sub tree, the tree it belongs to and the main tree node
 	struct ExtendedBucketPrunerData
@@ -99,32 +108,40 @@ namespace Sq
 		void							release();
 
 		// add single object into a bucket pruner directly
-		PX_FORCE_INLINE bool			addObject(const PrunerPayload& object, const PxBounds3& worldAABB, PxU32 timeStamp)
+		PX_FORCE_INLINE bool			addObject(const PrunerPayload& object, const PxBounds3& worldAABB, PxU32 timeStamp, const PoolIndex poolIndex)
 		{
-			return mBucketCore.addObject(object, worldAABB, timeStamp);
+#if USE_INCREMENTAL_PRUNER
+			PX_UNUSED(worldAABB);
+			PX_UNUSED(object);
+			return mPrunerCore.addObject(poolIndex, timeStamp);
+#else
+			PX_UNUSED(poolIndex);
+			return mPrunerCore.addObject(object, worldAABB, timeStamp);
+#endif
 		}
 
 		// add AABB tree from pruning structure - adds new primitive into main AABB tree
 		void							addTree(const AABBTreeMergeData& mergeData, PxU32 timeStamp);
 
 		// update object
-		bool							updateObject(const PxBounds3& worldAABB, const PrunerPayload& object);
+		bool							updateObject(const PxBounds3& worldAABB, const PrunerPayload& object, const PoolIndex poolIndex);
 
 		// remove object, removed object is replaced in pruning pool by swapped object, indices needs to be updated
 		bool							removeObject(const PrunerPayload& object, PxU32 objectIndex, const PrunerPayload& swapObject,
 											PxU32 swapObjectIndex, PxU32& timeStamp);
 
-		// separate call for indices invalidation, object can be either in AABBPruner or Bucket pruner, but the swapped object can be 
-		// in the tree of trees
-		void							invalidateObject(const ExtendedBucketPrunerData& object, PxU32 objectIndex, const PrunerPayload& swapObject,
-			PxU32 swapObjectIndex);
 
-		// swap object index, the object index can be in bucket pruner or tree of trees
-		void							swapIndex(PxU32 objectIndex, const PrunerPayload& swapObject, PxU32 swapObjectIndex);
+		// swap object index, the object index can be in core pruner or tree of trees
+		void							swapIndex(PxU32 objectIndex, const PrunerPayload& swapObject, PxU32 swapObjectIndex, bool corePrunerIncluded = true);
 
 		// refit marked nodes in tree of trees
 		void							refitMarkedNodes(const PxBounds3* boxes);
 
+#if USE_INCREMENTAL_PRUNER
+		// notify timestampChange - swap trees in incremental pruner
+		void							timeStampChange()	 { mPrunerCore.timeStampChange(); }
+#endif
+
 
 		// look for objects marked with input timestamp everywhere in the structure, and remove them. This is the same
 		// as calling 'removeObject' individually for all these objects, but much more efficient. Returns number of removed objects.
@@ -141,11 +158,17 @@ namespace Sq
 		// debug visualize
 		void							visualize(Cm::RenderOutput& out, PxU32 color) const;
 
-		PX_FORCE_INLINE	void			build()					{ mBucketCore.build();	}
+		PX_FORCE_INLINE	void			build()					{ mPrunerCore.build();	}
 
-		PX_FORCE_INLINE PxU32			getNbObjects()	const	{ return mBucketCore.getNbObjects() + mExtendedBucketPrunerMap.size(); }
+		PX_FORCE_INLINE PxU32			getNbObjects()	const	{ return mPrunerCore.getNbObjects() + mExtendedBucketPrunerMap.size(); }
 
 	private:
+
+		// separate call for indices invalidation, object can be either in AABBPruner or Bucket pruner, but the swapped object can be 
+		// in the tree of trees
+		void							invalidateObject(const ExtendedBucketPrunerData& object, PxU32 objectIndex, const PrunerPayload& swapObject,
+			PxU32 swapObjectIndex);
+
 		void							resize(PxU32 size);
 		void							buildMainAABBTree();
 		void							copyTree(AABBTree& destTree, const AABBPrunerMergeData& inputData);
@@ -156,7 +179,7 @@ namespace Sq
 		bool							checkValidity();
 #endif
 	private:
-				BucketPrunerCore		mBucketCore;					// Bucket pruner for single objects
+				PrunerCore				mPrunerCore;					// pruner for single objects
 				const PruningPool*		mPruningPool;					// Pruning pool from AABB pruner
 				ExtendedBucketPrunerMap	mExtendedBucketPrunerMap;		// Map holding objects from tree merge - objects in tree of trees
 				AABBTree*				mMainTree;						// Main tree holding merged trees
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.cpp
new file mode 100644
index 000000000000..bf2f9b411de5
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.cpp
@@ -0,0 +1,436 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#include "SqIncrementalAABBPrunerCore.h"
+#include "SqIncrementalAABBTree.h"
+#include "SqPruningPool.h"
+#include "SqAABBTree.h"
+#include "SqAABBTreeQuery.h"
+#include "GuSphere.h"
+#include "GuBox.h"
+#include "GuCapsule.h"
+#include "GuBounds.h"
+
+using namespace physx;
+using namespace Gu;
+using namespace Sq;
+using namespace Cm;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define PARANOIA_CHECKS 0
+
+IncrementalAABBPrunerCore::IncrementalAABBPrunerCore(const PruningPool* pool) :
+	mCurrentTree		(1),
+	mLastTree			(0),
+	mPool				(pool)
+{
+	mAABBTree[0].mapping.reserve(256);
+	mAABBTree[1].mapping.reserve(256);
+}
+
+IncrementalAABBPrunerCore::~IncrementalAABBPrunerCore()
+{
+	release();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void IncrementalAABBPrunerCore::release() // this can be called from purge()
+{
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		if(mAABBTree[i].tree)
+		{
+			PX_DELETE(mAABBTree[i].tree);
+			mAABBTree[i].tree = NULL;
+		}
+		mAABBTree[i].mapping.clear();
+		mAABBTree[i].timeStamp = 0;
+	}
+	mCurrentTree = 1;
+	mLastTree = 0;
+}
+
+bool IncrementalAABBPrunerCore::addObject(const PoolIndex poolIndex, PxU32 timeStamp)
+{
+	CoreTree& tree = mAABBTree[mCurrentTree];
+	if(!tree.tree || !tree.tree->getNodes())
+	{
+		if(!tree.tree)
+			tree.tree = PX_NEW(IncrementalAABBTree)();
+		tree.timeStamp = timeStamp;
+	}
+	PX_ASSERT(tree.timeStamp == timeStamp);
+
+	bool split = false;
+	IncrementalAABBTreeNode* node = tree.tree->insert(poolIndex, mPool->getCurrentWorldBoxes(), split);
+	updateMapping(split, tree.mapping, poolIndex, node);
+
+#if PARANOIA_CHECKS
+	test();
+#endif
+
+	return true;
+}
+
+void IncrementalAABBPrunerCore::updateMapping(bool split, IncrementalPrunerMap& mapping, const PoolIndex poolIndex, IncrementalAABBTreeNode* node)
+{
+	// if a node was split we need to update the node indices and also the sibling indices
+	if(split)
+	{
+		for(PxU32 j = 0; j < node->getNbPrimitives(); j++)
+		{
+			const PoolIndex index = node->getPrimitives(NULL)[j];
+			mapping[index] = node;
+		}
+		// sibling
+		if(node->mParent)
+		{
+			IncrementalAABBTreeNode* sibling = (node->mParent->mChilds[0] == node) ? node->mParent->mChilds[1] : node->mParent->mChilds[0];
+			if(sibling->isLeaf())
+			{
+				for(PxU32 j = 0; j < sibling->getNbPrimitives(); j++)
+				{
+					const PoolIndex index = sibling->getPrimitives(NULL)[j];
+					mapping[index] = sibling;
+				}
+			}
+		}
+	}
+	else
+	{
+		mapping[poolIndex] = node;
+	}
+}
+
+bool IncrementalAABBPrunerCore::removeObject(const PoolIndex poolIndex, const PoolIndex poolRelocatedLastIndex, PxU32& timeStamp)
+{
+	// erase the entry and get the data
+	IncrementalPrunerMap::Entry entry;
+	bool foundEntry = true;
+	const PxU32 treeIndex = mAABBTree[mLastTree].mapping.erase(poolIndex, entry) ? mLastTree : mCurrentTree;
+	// if it was not found in the last tree look at the current tree
+	if(treeIndex == mCurrentTree)
+		foundEntry = mAABBTree[mCurrentTree].mapping.erase(poolIndex, entry);
+
+	// exit somethings is wrong here, entry was not found here
+	PX_ASSERT(foundEntry);
+	if(!foundEntry)
+		return false;
+
+	// tree must exist
+	PX_ASSERT(mAABBTree[treeIndex].tree);
+	CoreTree& tree = mAABBTree[treeIndex];
+	timeStamp = tree.timeStamp;
+
+	// remove the poolIndex from the tree, update the tree bounds immediatelly
+	IncrementalAABBTreeNode* node = tree.tree->remove(entry.second, poolIndex, mPool->getCurrentWorldBoxes());
+	if(node && node->isLeaf())
+	{
+		for(PxU32 j = 0; j < node->getNbPrimitives(); j++)
+		{
+			const PoolIndex index = node->getPrimitives(NULL)[j];
+			tree.mapping[index] = node;
+		}
+	}
+
+	// nothing to swap, last object, early exit
+	if(poolIndex == poolRelocatedLastIndex)
+	{
+#if PARANOIA_CHECKS
+	test();
+#endif
+		return true;
+	}
+
+	// fix the indices, we need to swap the index with last index
+	// erase the relocated index from the tre it is
+	IncrementalPrunerMap::Entry relocatedEntry;
+	const PxU32 treeRelocatedIndex = mAABBTree[mCurrentTree].mapping.erase(poolRelocatedLastIndex, relocatedEntry) ? mCurrentTree : mLastTree;
+	foundEntry = true;
+	if(treeRelocatedIndex == mLastTree)
+		foundEntry = mAABBTree[mLastTree].mapping.erase(poolRelocatedLastIndex, relocatedEntry);
+
+	if(foundEntry)
+	{
+		CoreTree& relocatedTree = mAABBTree[treeRelocatedIndex];
+
+		// set the new mapping
+		relocatedTree.mapping[poolIndex] = relocatedEntry.second;
+		// update the tree indices - swap 
+		relocatedTree.tree->fixupTreeIndices(relocatedEntry.second, poolRelocatedLastIndex, poolIndex);
+	}
+
+#if PARANOIA_CHECKS
+	test();
+#endif
+	return true;
+}
+
+void IncrementalAABBPrunerCore::swapIndex(const PoolIndex poolIndex, const PoolIndex poolRelocatedLastIndex)
+{
+	// fix the indices, we need to swap the index with last index
+	// erase the relocated index from the tre it is
+	IncrementalPrunerMap::Entry relocatedEntry;
+	const PxU32 treeRelocatedIndex = mAABBTree[mCurrentTree].mapping.erase(poolRelocatedLastIndex, relocatedEntry) ? mCurrentTree : mLastTree;
+	bool foundEntry = true;
+	if(treeRelocatedIndex == mLastTree)
+		foundEntry = mAABBTree[mLastTree].mapping.erase(poolRelocatedLastIndex, relocatedEntry);
+
+	// relocated index is not here
+	if(!foundEntry)
+		return;
+
+	CoreTree& relocatedTree = mAABBTree[treeRelocatedIndex];
+
+	// set the new mapping
+	relocatedTree.mapping[poolIndex] = relocatedEntry.second;
+	// update the tree indices - swap 
+	relocatedTree.tree->fixupTreeIndices(relocatedEntry.second, poolRelocatedLastIndex, poolIndex);
+}
+
+bool IncrementalAABBPrunerCore::updateObject(const PoolIndex poolIndex)
+{
+	const IncrementalPrunerMap::Entry* entry = mAABBTree[mLastTree].mapping.find(poolIndex);
+	const PxU32 treeIndex = entry ? mLastTree : mCurrentTree;
+	if(!entry)
+		entry = mAABBTree[mCurrentTree].mapping.find(poolIndex);
+
+	// we have not found it
+	PX_ASSERT(entry);
+	if(!entry)
+		return false;
+
+	CoreTree& tree = mAABBTree[treeIndex];
+	bool split;
+	IncrementalAABBTreeNode* removedNode = NULL;
+	IncrementalAABBTreeNode* node = tree.tree->updateFast(entry->second, poolIndex, mPool->getCurrentWorldBoxes(), split, removedNode);
+	// we removed node during update, need to update the mapping
+	if(removedNode && removedNode->isLeaf())
+	{
+		for(PxU32 j = 0; j < removedNode->getNbPrimitives(); j++)
+		{
+			const PoolIndex index = removedNode->getPrimitives(NULL)[j];
+			tree.mapping[index] = removedNode;
+		}
+	}
+	if(split || node != entry->second)
+		updateMapping(split, tree.mapping, poolIndex, node);
+
+#if PARANOIA_CHECKS
+	test();
+#endif
+
+	return true;
+}
+
+PxU32 IncrementalAABBPrunerCore::removeMarkedObjects(PxU32 timeStamp)
+{
+	// early exit is no tree exists
+	if(!mAABBTree[mLastTree].tree || !mAABBTree[mLastTree].tree->getNodes())
+	{
+		PX_ASSERT(mAABBTree[mLastTree].mapping.size() == 0);
+		PX_ASSERT(!mAABBTree[mCurrentTree].tree || mAABBTree[mCurrentTree].timeStamp != timeStamp);
+		return 0;
+	}
+
+	PX_UNUSED(timeStamp);
+	PX_ASSERT(timeStamp == mAABBTree[mLastTree].timeStamp);
+
+	// release the last tree
+	CoreTree& tree = mAABBTree[mLastTree];
+	PxU32 nbObjects = tree.mapping.size();
+	tree.mapping.clear();
+	tree.timeStamp = 0;
+
+	tree.tree->release();
+
+	return nbObjects;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ *	Query Implementation
+ */
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+PxAgain IncrementalAABBPrunerCore::overlap(const ShapeData& queryVolume, PrunerCallback& pcb) const
+{
+	PxAgain again = true;
+
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		const CoreTree& tree = mAABBTree[i];
+		if(tree.tree && tree.tree->getNodes() && again)
+		{
+			switch(queryVolume.getType())
+			{
+			case PxGeometryType::eBOX:
+				{
+					if(queryVolume.isOBB())
+					{	
+						const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
+						again = AABBTreeOverlap<Gu::OBBAABBTest, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, test, pcb);
+					}
+					else
+					{
+						const Gu::AABBAABBTest test(queryVolume.getPrunerInflatedWorldAABB());
+						again = AABBTreeOverlap<Gu::AABBAABBTest, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, test, pcb);
+					}
+				}
+				break;
+			case PxGeometryType::eCAPSULE:
+				{
+					const Gu::Capsule& capsule = queryVolume.getGuCapsule();
+					const Gu::CapsuleAABBTest test(	capsule.p1, queryVolume.getPrunerWorldRot33().column0,
+													queryVolume.getCapsuleHalfHeight()*2.0f, PxVec3(capsule.radius*SQ_PRUNER_INFLATION));
+					again = AABBTreeOverlap<Gu::CapsuleAABBTest, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, test, pcb);
+				}
+				break;
+			case PxGeometryType::eSPHERE:
+				{
+					const Gu::Sphere& sphere = queryVolume.getGuSphere();
+					Gu::SphereAABBTest test(sphere.center, sphere.radius);
+					again = AABBTreeOverlap<Gu::SphereAABBTest, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, test, pcb);
+				}
+				break;
+			case PxGeometryType::eCONVEXMESH:
+				{
+					const Gu::OBBAABBTest test(queryVolume.getPrunerWorldPos(), queryVolume.getPrunerWorldRot33(), queryVolume.getPrunerBoxGeomExtentsInflated());
+					again = AABBTreeOverlap<Gu::OBBAABBTest, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, test, pcb);			
+				}
+				break;
+			case PxGeometryType::ePLANE:
+			case PxGeometryType::eTRIANGLEMESH:
+			case PxGeometryType::eHEIGHTFIELD:
+			case PxGeometryType::eGEOMETRY_COUNT:
+			case PxGeometryType::eINVALID:
+				PX_ALWAYS_ASSERT_MESSAGE("unsupported overlap query volume geometry type");
+			}
+		}
+	}
+
+	return again;
+}
+
+PxAgain IncrementalAABBPrunerCore::sweep(const ShapeData& queryVolume, const PxVec3& unitDir, PxReal& inOutDistance, PrunerCallback& pcb) const
+{
+	PxAgain again = true;
+
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		const CoreTree& tree = mAABBTree[i];
+		if(tree.tree && tree.tree->getNodes() && again)
+		{
+			const PxBounds3& aabb = queryVolume.getPrunerInflatedWorldAABB();
+			const PxVec3 extents = aabb.getExtents();
+			again = AABBTreeRaycast<true, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, aabb.getCenter(), unitDir, inOutDistance, extents, pcb);
+		}
+	}
+
+	return again;
+}
+
+PxAgain IncrementalAABBPrunerCore::raycast(const PxVec3& origin, const PxVec3& unitDir, PxReal& inOutDistance, PrunerCallback& pcb) const
+{
+	PxAgain again = true;
+
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		const CoreTree& tree = mAABBTree[i];
+		if(tree.tree && tree.tree->getNodes() && again)
+		{
+			again = AABBTreeRaycast<false, IncrementalAABBTree, IncrementalAABBTreeNode>()(mPool->getObjects(), mPool->getCurrentWorldBoxes(), *tree.tree, origin, unitDir, inOutDistance, PxVec3(0.0f), pcb);
+		}
+	}
+	return again;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void IncrementalAABBPrunerCore::shiftOrigin(const PxVec3& shift)
+{
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		if(mAABBTree[i].tree)
+		{
+			mAABBTree[i].tree->shiftOrigin(shift);
+		}
+	}
+}
+
+
+#include "CmRenderOutput.h"
+void IncrementalAABBPrunerCore::visualize(Cm::RenderOutput& out, PxU32 color) const
+{
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		if(mAABBTree[i].tree && mAABBTree[i].tree->getNodes())
+		{
+			struct Local
+			{
+				static void _Draw(const IncrementalAABBTreeNode* root, const IncrementalAABBTreeNode* node, Cm::RenderOutput& out_)
+				{
+					PxBounds3 bounds;
+					V4StoreU(node->mBVMin, &bounds.minimum.x);
+					V4StoreU(node->mBVMax, &bounds.maximum.x);
+					out_ << Cm::DebugBox(bounds, true);
+					if (node->isLeaf())
+						return;
+					_Draw(root, node->getPos(root), out_);
+					_Draw(root, node->getNeg(root), out_);
+				}
+			};
+			out << PxTransform(PxIdentity);
+			out << color;
+			Local::_Draw(mAABBTree[i].tree->getNodes(), mAABBTree[i].tree->getNodes(), out);
+			
+
+			// Render added objects not yet in the tree
+			out << PxTransform(PxIdentity);
+			out << PxU32(PxDebugColor::eARGB_WHITE);
+		}
+	}
+}
+
+void IncrementalAABBPrunerCore::test()
+{
+	for(PxU32 i = 0; i < NUM_TREES; i++)
+	{
+		if(mAABBTree[i].tree)
+		{
+			//mAABBTree[i].tree->hierarchyCheck(mPool->getNbActiveObjects(), mPool->getCurrentWorldBoxes());
+			for (IncrementalPrunerMap::Iterator iter = mAABBTree[i].mapping.getIterator(); !iter.done(); ++iter)
+			{
+				mAABBTree[i].tree->checkTreeLeaf(iter->second, iter->first);
+			}
+		}
+	}
+}
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.h
new file mode 100644
index 000000000000..bd2b72192c33
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBPrunerCore.h
@@ -0,0 +1,114 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#ifndef SQ_INCREMENTAL_AABB_PRUNER_CORE_H
+#define SQ_INCREMENTAL_AABB_PRUNER_CORE_H
+
+#include "SqPruner.h"
+#include "SqPruningPool.h"
+#include "SqIncrementalAABBTree.h"
+#include "SqAABBTreeUpdateMap.h"
+#include "PsHashMap.h"
+
+namespace physx
+{
+
+namespace Sq
+{
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	typedef Ps::HashMap<PoolIndex, IncrementalAABBTreeNode*>			IncrementalPrunerMap;
+
+	struct CoreTree
+	{
+		CoreTree():
+			timeStamp(0),
+			tree(NULL)
+		{
+		}
+
+		PxU32					timeStamp;
+		IncrementalAABBTree*	tree;
+		IncrementalPrunerMap	mapping;
+	};
+
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class IncrementalAABBPrunerCore : public Ps::UserAllocated
+	{
+	public:
+		IncrementalAABBPrunerCore(const PruningPool* pool);
+		~IncrementalAABBPrunerCore();
+
+		void				release();
+
+		bool				addObject(const PoolIndex poolIndex, PxU32 timeStamp);
+		bool				removeObject(const PoolIndex poolIndex, const PoolIndex poolRelocatedLastIndex, PxU32& timeStamp);
+
+		// if we swap object from bucket pruner index with an index in the regular AABB pruner
+		void				swapIndex(const PoolIndex poolIndex, const PoolIndex poolRelocatedLastIndex);
+
+		bool				updateObject(const PoolIndex poolIndex);
+
+		PxU32				removeMarkedObjects(PxU32 timeStamp);
+
+		PxAgain				raycast(const PxVec3& origin, const PxVec3& unitDir, PxReal& inOutDistance, PrunerCallback&) const;
+		PxAgain				overlap(const Gu::ShapeData& queryVolume, PrunerCallback&) const;
+		PxAgain				sweep(const Gu::ShapeData& queryVolume, const PxVec3& unitDir, PxReal& inOutDistance, PrunerCallback&) const;
+
+		void				shiftOrigin(const PxVec3& shift);
+
+		void				visualize(Cm::RenderOutput& out, PxU32 color) const;
+
+		PX_FORCE_INLINE void				timeStampChange()
+		{
+			// swap current and last tree
+			mLastTree = (mLastTree + 1) % 2;
+			mCurrentTree = (mCurrentTree + 1) % 2;
+		}
+
+		void				build() {}
+
+		PX_FORCE_INLINE	PxU32				getNbObjects()	const { return mAABBTree[0].mapping.size() + mAABBTree[1].mapping.size(); }
+
+	private:
+		void				updateMapping(bool split, IncrementalPrunerMap& mapping, const PoolIndex poolIndex, IncrementalAABBTreeNode* node);
+		void				test();			
+
+	private:
+		static const PxU32		NUM_TREES = 2;
+
+		PxU32					mCurrentTree;
+		PxU32					mLastTree;
+		CoreTree				mAABBTree[NUM_TREES];
+		const PruningPool*		mPool;					// Pruning pool from AABB pruner
+	};
+
+}}
+
+#endif
+
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp
new file mode 100644
index 000000000000..10c371a0164e
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp
@@ -0,0 +1,764 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#include "foundation/PxMemory.h"
+#include "SqIncrementalAABBTree.h"
+#include "SqAABBTree.h"
+#include "SqAABBTreeUpdateMap.h"
+#include "SqBounds.h"
+#include "PsVecMath.h"
+#include "PsFPU.h"
+
+using namespace physx;
+using namespace Sq;
+using namespace shdfnd::aos;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+IncrementalAABBTree::IncrementalAABBTree():
+	mIndicesPool("AABBTreeIndicesPool", 256),
+	mNodesPool("AABBTreeNodesPool", 256	),
+	mRoot(NULL)
+{
+	
+}
+
+IncrementalAABBTree::~IncrementalAABBTree()
+{
+	release();
+}
+
+void IncrementalAABBTree::release()
+{
+	if(mRoot)
+	{
+		releaseNode(mRoot);
+		mRoot = NULL;
+	}
+}
+
+void IncrementalAABBTree::releaseNode(IncrementalAABBTreeNode* node)
+{
+	PX_ASSERT(node);
+	if(node->isLeaf())
+	{
+		mIndicesPool.deallocate(node->mIndices);
+	}
+	else
+	{
+		releaseNode(node->mChilds[0]);
+		releaseNode(node->mChilds[1]);
+	}
+	if(!node->mParent)
+	{
+		mNodesPool.deallocate(reinterpret_cast<IncrementalAABBTreeNodePair*>(node));
+		return;
+	}
+	if(node->mParent->mChilds[1] == node)
+	{
+		mNodesPool.deallocate(reinterpret_cast<IncrementalAABBTreeNodePair*>(node->mParent->mChilds[0]));
+	}
+}
+
+
+// check if node is inside the given bounds
+PX_FORCE_INLINE static bool nodeInsideBounds(const Vec4V& nodeMin, const Vec4V& nodeMax, const Vec4V& parentMin, const Vec4V& parentMax)
+{
+	return !(Ps::IntBool(V4AnyGrtr3(parentMin, nodeMin)) || Ps::IntBool(V4AnyGrtr3(nodeMax, parentMax)));
+}
+
+// update the node parent hierarchy, when insert happen, we can early exit when the node is inside its parent
+// no further update is needed
+PX_FORCE_INLINE static void updateHierarchyAfterInsert(IncrementalAABBTreeNode* node)
+{
+	IncrementalAABBTreeNode* parent = node->mParent;
+	IncrementalAABBTreeNode* testNode = node;
+	while(parent)
+	{
+		// check if we can early exit
+		if(!nodeInsideBounds(testNode->mBVMin, testNode->mBVMax, parent->mBVMin, parent->mBVMax))
+		{
+			parent->mBVMin = V4Min(parent->mChilds[0]->mBVMin, parent->mChilds[1]->mBVMin);
+			parent->mBVMax = V4Max(parent->mChilds[0]->mBVMax, parent->mChilds[1]->mBVMax);
+		}
+		else
+			break;
+		testNode = parent;
+		parent = parent->mParent;
+	}
+}
+
+// add an index into the leaf indices list and update the node bounds
+PX_FORCE_INLINE static void addPrimitiveIntoNode(IncrementalAABBTreeNode* node, const PoolIndex index,  const Vec4V& minV,  const Vec4V& maxV)
+{
+	PX_ASSERT(node->isLeaf());
+	AABBTreeIndices& nodeIndices = *node->mIndices;
+	PX_ASSERT(nodeIndices.nbIndices < NB_OBJECTS_PER_NODE);
+
+	// store the new handle
+	nodeIndices.indices[nodeIndices.nbIndices++] = index;
+
+	// increase the node bounds
+	node->mBVMin = V4Min(node->mBVMin, minV);
+	node->mBVMax = V4Max(node->mBVMax, maxV);
+
+	updateHierarchyAfterInsert(node);
+}
+
+// check if node does intersect with given bounds
+PX_FORCE_INLINE static bool nodeIntersection(IncrementalAABBTreeNode& node, const Vec4V& minV,  const Vec4V& maxV)
+{
+	return !(Ps::IntBool(V4AnyGrtr3(node.mBVMin, maxV)) || Ps::IntBool(V4AnyGrtr3(minV, node.mBVMax)));
+}
+
+// traversal strategy
+PX_FORCE_INLINE static PxU32 traversalDirection(IncrementalAABBTreeNode& child0, IncrementalAABBTreeNode& child1, const Vec4V& testCenterV)
+{
+	// traverse in the direction of a node which is closer
+	// we compare the node and object centers
+	const Vec4V centerCh0V = V4Add(child0.mBVMax, child0.mBVMin);
+	const Vec4V centerCh1V = V4Add(child1.mBVMax, child1.mBVMin);
+
+	const Vec4V ch0D = V4Sub(testCenterV, centerCh0V);
+	const Vec4V ch1D = V4Sub(testCenterV, centerCh1V);
+
+	const BoolV con = FIsGrtr(V4Dot3(ch0D, ch0D), V4Dot3(ch1D, ch1D));
+	return (BAllEqTTTT(con) == 1) ? PxU32(1) : PxU32(0);
+}
+
+// remove an index from the leaf
+PX_FORCE_INLINE static void removePrimitiveFromNode(IncrementalAABBTreeNode* node, const PoolIndex index)
+{
+	AABBTreeIndices& indices = *node->mIndices;
+	PX_ASSERT(indices.nbIndices > 1);
+
+	for (PxU32 i = indices.nbIndices; i--; )
+	{
+		if(node->mIndices->indices[i] == index)
+		{
+			node->mIndices->indices[i] = node->mIndices->indices[--indices.nbIndices];
+			return;
+		}
+	}
+	// if handle was not found something is wrong here
+	PX_ASSERT(0);
+}
+
+// check if bounds are equal with given node min/max
+PX_FORCE_INLINE static bool boundsEqual(const Vec4V& testMin, const Vec4V& testMax, const Vec4V& nodeMin, const Vec4V& nodeMax)
+{
+	return (Ps::IntBool(V4AllEq(nodeMin, testMin)) && Ps::IntBool(V4AllEq(testMax, nodeMax)));
+}
+
+// update the node hierarchy bounds when remove happen, we can early exit if the bounds are equal and no bounds update
+// did happen
+PX_FORCE_INLINE static void updateHierarchyAfterRemove(IncrementalAABBTreeNode* node, const PxBounds3* bounds)
+{	
+	if(node->isLeaf())
+	{		
+		const AABBTreeIndices& indices = *node->mIndices;
+		PX_ASSERT(indices.nbIndices > 0);
+
+		Vec4V bvMin = V4LoadU(&bounds[indices.indices[0]].minimum.x);
+		Vec4V bvMax = V4LoadU(&bounds[indices.indices[0]].maximum.x);
+		for(PxU32 i = 1; i < indices.nbIndices; i++)
+		{
+			const Vec4V minV = V4LoadU(&bounds[indices.indices[i]].minimum.x);
+			const Vec4V maxV = V4LoadU(&bounds[indices.indices[i]].maximum.x);
+
+			bvMin = V4Min(bvMin, minV);
+			bvMax = V4Max(bvMax, maxV);
+		}
+
+		node->mBVMin = V4ClearW(bvMin);
+		node->mBVMax = V4ClearW(bvMax);
+	}
+	else
+	{
+		node->mBVMin = V4Min(node->mChilds[0]->mBVMin, node->mChilds[1]->mBVMin);
+		node->mBVMax = V4Max(node->mChilds[0]->mBVMax, node->mChilds[1]->mBVMax);
+	}
+
+	IncrementalAABBTreeNode* parent = node->mParent;
+	while(parent)
+	{
+		const Vec4V newMinV = V4Min(parent->mChilds[0]->mBVMin, parent->mChilds[1]->mBVMin);
+		const Vec4V newMaxV = V4Max(parent->mChilds[0]->mBVMax, parent->mChilds[1]->mBVMax);
+
+		const bool earlyExit = boundsEqual(newMinV, newMaxV, parent->mBVMin, parent->mBVMax);
+		if(earlyExit)
+			break;
+
+		parent->mBVMin = newMinV;
+		parent->mBVMax = newMaxV;
+
+		parent = parent->mParent;
+	}
+}
+
+// split the leaf node along the most significant axis
+IncrementalAABBTreeNode* IncrementalAABBTree::splitLeafNode(IncrementalAABBTreeNode* node, const PoolIndex index,  const Vec4V& minV,  const Vec4V& maxV, const PxBounds3* bounds)
+{
+	PX_ASSERT(node->isLeaf());
+
+	IncrementalAABBTreeNode* returnNode = NULL;
+
+	// create new pairs of nodes, parent will remain the node (the one we split_
+	IncrementalAABBTreeNode* child0 = reinterpret_cast<IncrementalAABBTreeNode*>(mNodesPool.allocate());
+	IncrementalAABBTreeNode* child1 = child0 + 1;	
+	AABBTreeIndices* newIndices = mIndicesPool.allocate();
+
+	// get the split axis
+	PX_ALIGN(16, PxVec4) vars;
+	PX_ALIGN(16, PxVec4) center;
+	const float half = 0.5f;
+	const FloatV halfV = FLoad(half);
+	const Vec4V newMinV = V4Min(node->mBVMin, minV);
+	const Vec4V newMaxV = V4Max(node->mBVMax, maxV);
+	const Vec4V centerV = V4Scale(V4Add(newMaxV, newMinV), halfV);
+	const Vec4V varsV = V4Sub(newMaxV, newMinV);
+	V4StoreA(varsV, &vars.x);
+	V4StoreA(centerV, &center.x);
+	const PxU32 axis = Ps::largestAxis(PxVec3(vars.x, vars.y, vars.z));
+
+	// setup parent
+	child0->mParent = node;
+	child1->mParent = node;
+	child0->mIndices = node->mIndices;
+	child0->mChilds[1] = NULL;
+	child1->mIndices = newIndices;
+	child1->mChilds[1] = NULL;
+
+	AABBTreeIndices& child0Indices = *child0->mIndices;	// the original node indices
+	AABBTreeIndices& child1Indices = *child1->mIndices; // new empty indices
+	child1Indices.nbIndices = 0;
+
+	// split the node
+	for(PxU32 i = child0Indices.nbIndices; i--;)
+	{
+		const PxBounds3& primitiveBounds = bounds[child0Indices.indices[i]];
+		const float pCenter = primitiveBounds.getCenter(axis);
+		if(center[axis] > pCenter)
+		{
+			// move to new node
+			child1Indices.indices[child1Indices.nbIndices++] = child0Indices.indices[i];						
+			child0Indices.nbIndices--;
+			child0Indices.indices[i] = child0Indices.indices[child0Indices.nbIndices];
+		}
+	}
+
+	// check where to put the new node, if there is still a free space
+	if(child0Indices.nbIndices == 0 || child1Indices.nbIndices == NB_OBJECTS_PER_NODE)
+	{
+		child0Indices.nbIndices = 1;
+		child0Indices.indices[0] = index;
+		returnNode = child0;
+	}
+	else
+	{
+		if(child0Indices.nbIndices == NB_OBJECTS_PER_NODE)
+		{
+			child1Indices.nbIndices = 1;
+			child1Indices.indices[0] = index;
+			returnNode = child1;
+		}
+		else
+		{
+			const PxBounds3& primitiveBounds = bounds[index];
+			const float pCenter = primitiveBounds.getCenter(axis);
+			if(center[axis] > pCenter)
+			{
+				// move to new node
+				child1Indices.indices[child1Indices.nbIndices++] = index;
+				returnNode = child1;
+			}
+			else
+			{
+				// move to old node
+				child0Indices.indices[child0Indices.nbIndices++] = index;	
+				returnNode = child0;
+			}
+		}
+	}
+
+	// update bounds for the new nodes
+	Vec4V bvMin = V4LoadU(&bounds[child0Indices.indices[0]].minimum.x);
+	Vec4V bvMax = V4LoadU(&bounds[child0Indices.indices[0]].maximum.x);	
+	for(PxU32 i = 1; i < child0Indices.nbIndices; i++)
+	{
+		const Vec4V nodeMinV = V4LoadU(&bounds[child0Indices.indices[i]].minimum.x);
+		const Vec4V nodeMaxV = V4LoadU(&bounds[child0Indices.indices[i]].maximum.x);	
+
+		bvMin = V4Min(bvMin, nodeMinV);
+		bvMax = V4Max(bvMax, nodeMaxV);
+	}
+	child0->mBVMin = V4ClearW(bvMin);
+	child0->mBVMax = V4ClearW(bvMax);	
+
+	bvMin = V4LoadU(&bounds[child1Indices.indices[0]].minimum.x);
+	bvMax = V4LoadU(&bounds[child1Indices.indices[0]].maximum.x);	
+	for(PxU32 i = 1; i < child1Indices.nbIndices; i++)
+	{
+		const Vec4V nodeMinV = V4LoadU(&bounds[child1Indices.indices[i]].minimum.x);
+		const Vec4V nodeMaxV = V4LoadU(&bounds[child1Indices.indices[i]].maximum.x);	
+
+		bvMin = V4Min(bvMin, nodeMinV);
+		bvMax = V4Max(bvMax, nodeMaxV);
+	}
+	child1->mBVMin = V4ClearW(bvMin);
+	child1->mBVMax = V4ClearW(bvMax);
+
+	// node parent is the same, setup the new childs
+	node->mChilds[0] = child0;
+	node->mChilds[1] = child1;
+	node->mBVMin = newMinV;
+	node->mBVMax = newMaxV;
+
+	updateHierarchyAfterInsert(node);
+
+	PX_ASSERT(returnNode);
+	return returnNode;
+}
+
+
+// insert new bounds into tree
+IncrementalAABBTreeNode* IncrementalAABBTree::insert(const PoolIndex index, const PxBounds3* bounds, bool& split)
+{	
+	PX_SIMD_GUARD;
+
+	// get the bounds, reset the W value
+	const Vec4V minV = V4ClearW(V4LoadU(&bounds[index].minimum.x));
+	const Vec4V maxV = V4ClearW(V4LoadU(&bounds[index].maximum.x));	
+
+	split = false;
+
+	// check if tree is empty
+	if(!mRoot)
+	{
+		// make it a leaf
+		AABBTreeIndices* indices = mIndicesPool.construct(index);
+		mRoot = reinterpret_cast<IncrementalAABBTreeNode*> (mNodesPool.allocate());
+		mRoot->mBVMin = minV;
+		mRoot->mBVMax = maxV;
+		mRoot->mIndices = indices;
+		mRoot->mChilds[1] = NULL;
+		mRoot->mParent = NULL;
+		
+		return mRoot;
+	}
+	else
+	{
+		// check if root is a leaf
+		if(mRoot->isLeaf())
+		{
+			// if we still can insert the primitive into the leaf, or we need to split			
+			if(mRoot->getNbPrimitives() < NB_OBJECTS_PER_NODE)
+			{
+				// simply add the primitive into the current leaf
+				addPrimitiveIntoNode(mRoot, index, minV, maxV);
+				return mRoot;
+			}
+			else
+			{
+				// need to split the node
+				IncrementalAABBTreeNode* retNode = splitLeafNode(mRoot, index, minV, maxV, bounds);
+				mRoot = retNode->mParent;
+				split = true;
+				return retNode;
+			}
+		}
+		else
+		{
+			const Vec4V testCenterV = V4Add(maxV, minV);
+			// we dont need to modify root, lets traverse the tree to find the right spot
+			PxU32 traversalIndex = traversalDirection(*mRoot->mChilds[0], *mRoot->mChilds[1], testCenterV);
+			IncrementalAABBTreeNode* baseNode = mRoot->mChilds[traversalIndex];
+			while(!baseNode->isLeaf())
+			{
+				Ps::prefetchLine(baseNode->mChilds[0]->mChilds[0]);
+				Ps::prefetchLine(baseNode->mChilds[1]->mChilds[0]);
+
+				traversalIndex = traversalDirection(*baseNode->mChilds[0], *baseNode->mChilds[1], testCenterV);
+				baseNode = baseNode->mChilds[traversalIndex];
+			}
+			
+			// if we still can insert the primitive into the leaf, or we need to split			
+			if(baseNode->getNbPrimitives() < NB_OBJECTS_PER_NODE)
+			{
+				// simply add the primitive into the current leaf
+				addPrimitiveIntoNode(baseNode, index, minV, maxV);
+				return baseNode;
+			}
+			else
+			{
+				// split
+				IncrementalAABBTreeNode* retNode = splitLeafNode(baseNode, index, minV, maxV, bounds);				
+				split = true;
+				return retNode;
+			}
+		}
+	}
+}
+
+// update the index, do a full remove/insert update
+IncrementalAABBTreeNode* IncrementalAABBTree::update(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds, bool& split, IncrementalAABBTreeNode*& removedNode)
+{
+	PX_SIMD_GUARD;
+
+	removedNode = remove(node, index, bounds);
+	return insert(index, bounds, split);	
+}
+
+// update the index, faster version with a lazy update of objects that moved just a bit
+IncrementalAABBTreeNode* IncrementalAABBTree::updateFast(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds, bool& split, IncrementalAABBTreeNode*& removedNode)
+{
+	PX_SIMD_GUARD;
+
+	const Vec4V minV = V4ClearW(V4LoadU(&bounds[index].minimum.x));
+	const Vec4V maxV = V4ClearW(V4LoadU(&bounds[index].maximum.x));
+
+	// for update fast, we dont care if the tree gets slowly unbalanced, we are building a new tree already
+	if(nodeIntersection(*node, minV, maxV))
+	{
+		updateHierarchyAfterRemove(node, bounds);
+		return node;
+	}
+	else
+	{
+		removedNode = remove(node, index, bounds);	
+		return insert(index, bounds, split);	
+	}
+}
+
+// remove primitive from the tree, return a node if it moved to its parent
+IncrementalAABBTreeNode* IncrementalAABBTree::remove(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds)
+{
+	PX_SIMD_GUARD;
+	PX_ASSERT(node->isLeaf());
+	// if we just remove the primitive from the list
+	if(node->getNbPrimitives() > 1)
+	{
+		removePrimitiveFromNode(node, index);
+
+		// update the hierarchy		
+		updateHierarchyAfterRemove(node, bounds);
+		return NULL;
+	}
+	else
+	{
+		// if root node and the last primitive remove root
+		if(node == mRoot)
+		{
+			mNodesPool.deallocate(reinterpret_cast<IncrementalAABBTreeNodePair*>(node));
+			mRoot = NULL;
+			return NULL;
+		}
+		else
+		{
+			// create new parent and remove the current leaf
+			IncrementalAABBTreeNode* parent = node->mParent;
+			IncrementalAABBTreeNodePair* removedPair = reinterpret_cast<IncrementalAABBTreeNodePair*>(parent->mChilds[0]);
+			PX_ASSERT(!parent->isLeaf());
+
+			// copy the remaining child into parent
+			IncrementalAABBTreeNode* remainingChild = (parent->mChilds[0] == node) ? parent->mChilds[1] : parent->mChilds[0];
+			parent->mBVMax = remainingChild->mBVMax;
+			parent->mBVMin = remainingChild->mBVMin;
+			if(remainingChild->isLeaf())
+			{
+				parent->mIndices = remainingChild->mIndices;
+				parent->mChilds[1] = NULL;
+			}
+			else
+			{
+				parent->mChilds[0] = remainingChild->mChilds[0];
+				parent->mChilds[0]->mParent = parent;
+				parent->mChilds[1] = remainingChild->mChilds[1];
+				parent->mChilds[1]->mParent = parent;
+			}
+
+			if(parent->mParent)
+			{
+				updateHierarchyAfterRemove(parent->mParent, bounds);
+			}
+
+			mIndicesPool.deallocate(node->mIndices);
+			mNodesPool.deallocate(removedPair);	
+			return parent;
+		}
+	}
+}
+
+// fixup the indices
+void IncrementalAABBTree::fixupTreeIndices(IncrementalAABBTreeNode* node, const PoolIndex index, const PoolIndex newIndex)
+{
+	PX_ASSERT(node->isLeaf());
+
+	AABBTreeIndices& indices = *node->mIndices;
+	for(PxU32 i = 0; i < indices.nbIndices; i++)
+	{
+		if(indices.indices[i] == index)			
+		{
+			indices.indices[i] = newIndex;
+			return;
+		}
+	}	
+	PX_ASSERT(0);
+}
+
+// shift node
+static void shiftNode(IncrementalAABBTreeNode* node, const Vec4V& shiftV)
+{
+	node->mBVMax = V4Sub(node->mBVMax, shiftV);
+	node->mBVMin = V4Sub(node->mBVMin, shiftV);
+
+	if(!node->isLeaf())
+	{
+		shiftNode(node->mChilds[0], shiftV);
+		shiftNode(node->mChilds[1], shiftV);
+	}
+}
+
+// shift origin
+void IncrementalAABBTree::shiftOrigin(const PxVec3& shift)
+{
+	if(mRoot)
+	{
+		const Vec4V shiftV = V4ClearW(V4LoadU(&shift.x));
+
+		shiftNode(mRoot, shiftV);
+	}
+}
+
+static void checkNode(IncrementalAABBTreeNode* node, IncrementalAABBTreeNode* parent, const PxBounds3* bounds, PoolIndex maxIndex, PxU32& numIndices)
+{
+	PX_ASSERT(node->mParent == parent);
+	PX_ASSERT(!parent->isLeaf());
+	PX_ASSERT(parent->mChilds[0] == node || parent->mChilds[1] == node);
+
+	//ASSERT_ISVALIDVEC3V(node->mBVMin);
+	//ASSERT_ISVALIDVEC3V(node->mBVMax);
+
+	if(!node->isLeaf())
+	{
+		PX_ASSERT(nodeInsideBounds(node->mChilds[0]->mBVMin, node->mChilds[0]->mBVMax, node->mBVMin, node->mBVMax));
+		PX_ASSERT(nodeInsideBounds(node->mChilds[1]->mBVMin, node->mChilds[1]->mBVMax, node->mBVMin, node->mBVMax));
+
+		const Vec4V testMinV = V4Min(parent->mChilds[0]->mBVMin, parent->mChilds[1]->mBVMin);
+		const Vec4V testMaxV = V4Max(parent->mChilds[0]->mBVMax, parent->mChilds[1]->mBVMax);
+
+		PX_UNUSED(testMinV);
+		PX_UNUSED(testMaxV);
+		PX_ASSERT(boundsEqual(testMinV, testMaxV, node->mBVMin, node->mBVMax));
+
+		checkNode(node->mChilds[0], node, bounds, maxIndex, numIndices);
+		checkNode(node->mChilds[1], node, bounds, maxIndex, numIndices);
+	}
+	else
+	{
+		const AABBTreeIndices& indices = *node->mIndices;
+		PX_ASSERT(indices.nbIndices);
+		Vec4V testMinV = V4ClearW(V4LoadU(&bounds[indices.indices[0]].minimum.x));
+		Vec4V testMaxV = V4ClearW(V4LoadU(&bounds[indices.indices[0]].maximum.x));
+		for(PxU32 i = 0; i < indices.nbIndices; i++)
+		{
+			PX_ASSERT(indices.indices[i] < maxIndex);
+			numIndices++;
+
+			const Vec4V minV = V4ClearW(V4LoadU(&bounds[indices.indices[i]].minimum.x));
+			const Vec4V maxV = V4ClearW(V4LoadU(&bounds[indices.indices[i]].maximum.x));
+
+			testMinV = V4Min(testMinV, minV);
+			testMaxV = V4Max(testMaxV, maxV);
+
+			PX_ASSERT(nodeInsideBounds(minV, maxV, node->mBVMin, node->mBVMax));
+		}
+
+		PX_ASSERT(boundsEqual(testMinV, testMaxV, node->mBVMin, node->mBVMax));
+	}
+}
+
+void IncrementalAABBTree::hierarchyCheck(PoolIndex maxIndex, const PxBounds3* bounds)
+{
+	PxU32 numHandles = 0;
+	if(mRoot && !mRoot->isLeaf())
+	{
+		checkNode(mRoot->mChilds[0], mRoot, bounds, maxIndex, numHandles);
+		checkNode(mRoot->mChilds[1], mRoot, bounds, maxIndex, numHandles);
+
+		PX_ASSERT(numHandles == maxIndex);
+	}	
+}
+
+void IncrementalAABBTree::checkTreeLeaf(IncrementalAABBTreeNode* leaf, PoolIndex h)
+{
+	PX_ASSERT(leaf->isLeaf());
+
+	const AABBTreeIndices& indices = *leaf->mIndices;
+	bool found = false;
+	for(PxU32 i = 0; i < indices.nbIndices; i++)
+	{
+		if(indices.indices[i] == h)
+		{
+			found = true;
+			break;
+		}
+	}
+	PX_UNUSED(found);
+	PX_ASSERT(found);
+}
+
+// build the tree from given bounds
+bool IncrementalAABBTree::build(AABBTreeBuildParams& params, Ps::Array<IncrementalAABBTreeNode*>& mapping)
+{
+	// Init stats
+	BuildStats stats;
+	const PxU32 nbPrimitives = params.mNbPrimitives;
+	if (!nbPrimitives)
+		return false;
+
+	// Init stats
+	stats.setCount(1);
+
+	// Initialize indices. This list will be modified during build.
+	PxU32* indices = reinterpret_cast<PxU32*>(PX_ALLOC(sizeof(PxU32)*nbPrimitives, "AABB tree indices"));
+	// Identity permutation
+	for (PxU32 i = 0; i<nbPrimitives; i++)
+		indices[i] = i;
+
+	// Allocate a pool of nodes
+	mNodeAllocator.init(nbPrimitives, params.mLimit);
+
+	// Compute box centers only once and cache them
+	params.mCache = reinterpret_cast<PxVec3*>(PX_ALLOC(sizeof(PxVec3)*(nbPrimitives + 1), "cache"));
+	const float half = 0.5f;
+	const FloatV halfV = FLoad(half);
+	for (PxU32 i = 0; i<nbPrimitives; i++)
+	{
+		const Vec4V curMinV = V4LoadU(&params.mAABBArray[i].minimum.x);
+		const Vec4V curMaxV = V4LoadU(&params.mAABBArray[i].maximum.x);
+		const Vec4V centerV = V4Scale(V4Add(curMaxV, curMinV), halfV);
+		V4StoreU(centerV, &params.mCache[i].x);
+	}
+
+	// Build the hierarchy
+	mNodeAllocator.mPool->_buildHierarchy(params, stats, mNodeAllocator, indices);
+
+	PX_FREE_AND_RESET(params.mCache);
+
+	IncrementalAABBTreeNode** treeNodes = reinterpret_cast<IncrementalAABBTreeNode**>(PX_ALLOC(sizeof(IncrementalAABBTreeNode*)*(stats.getCount()), "temp node helper array"));
+	PxMemSet(treeNodes, 0, sizeof(IncrementalAABBTreeNode*)*(stats.getCount()));
+
+	clone(mapping, indices, treeNodes);
+	mRoot = treeNodes[0];
+	mRoot->mParent = NULL;
+	
+	PX_FREE_AND_RESET(indices);
+	PX_FREE_AND_RESET(treeNodes);
+
+	mNodeAllocator.release();
+	return true;
+}
+
+// clone the tree, the tree is computed in the NodeAllocator, similar to AABBTree flatten
+void IncrementalAABBTree::clone(Ps::Array<IncrementalAABBTreeNode*>& mapping, const PxU32* _indices, IncrementalAABBTreeNode** treeNodes)
+{		
+	PxU32 offset = 0;
+	const PxU32 nbSlabs = mNodeAllocator.mSlabs.size();
+	for (PxU32 s = 0; s<nbSlabs; s++)
+	{
+		const NodeAllocator::Slab& currentSlab = mNodeAllocator.mSlabs[s];
+
+		AABBTreeBuildNode* pool = currentSlab.mPool;
+		for (PxU32 i = 0; i < currentSlab.mNbUsedNodes; i++)
+		{
+			IncrementalAABBTreeNode* destNode = treeNodes[offset];
+			if(!destNode)
+			{
+				destNode = reinterpret_cast<IncrementalAABBTreeNode*>(mNodesPool.allocate());
+				treeNodes[offset] = destNode;
+			}
+
+			destNode->mBVMin = V4ClearW(V4LoadU(&pool[i].mBV.minimum.x));
+			destNode->mBVMax = V4ClearW(V4LoadU(&pool[i].mBV.maximum.x));
+
+			if (pool[i].isLeaf())
+			{
+				AABBTreeIndices* indices = mIndicesPool.allocate();
+				destNode->mIndices = indices;
+				destNode->mChilds[1] = NULL;
+				indices->nbIndices = pool[i].getNbPrimitives();
+				PX_ASSERT(indices->nbIndices <= 16);
+				const PxU32* sourceIndices = _indices + pool[i].mNodeIndex;
+				for (PxU32 iIndices = 0; iIndices < indices->nbIndices; iIndices++)
+				{
+					const PxU32 sourceIndex = sourceIndices[iIndices];
+					indices->indices[iIndices] = sourceIndex;
+					PX_ASSERT(sourceIndex < mapping.size());
+					mapping[sourceIndex] = destNode;
+				}
+			}
+			else
+			{
+				PX_ASSERT(pool[i].mPos);
+				PxU32 localNodeIndex = 0xffffffff;
+				PxU32 nodeBase = 0;
+				for (PxU32 j = 0; j<nbSlabs; j++)
+				{
+					if (pool[i].mPos >= mNodeAllocator.mSlabs[j].mPool && pool[i].mPos < mNodeAllocator.mSlabs[j].mPool + mNodeAllocator.mSlabs[j].mNbUsedNodes)
+					{
+						localNodeIndex = PxU32(pool[i].mPos - mNodeAllocator.mSlabs[j].mPool);
+						break;
+					}
+					nodeBase += mNodeAllocator.mSlabs[j].mNbUsedNodes;
+				}
+				const PxU32 nodeIndex = nodeBase + localNodeIndex;
+
+				IncrementalAABBTreeNode* child0 = treeNodes[nodeIndex];
+				IncrementalAABBTreeNode* child1 = treeNodes[nodeIndex + 1];
+				if(!child0)
+				{
+					PX_ASSERT(!child1);
+					child0 = reinterpret_cast<IncrementalAABBTreeNode*>(mNodesPool.allocate());
+					child1 = child0 + 1;
+					treeNodes[nodeIndex] = child0;
+					treeNodes[nodeIndex + 1] = child1;
+				}
+
+				destNode->mChilds[0] = child0;
+				destNode->mChilds[1] = child1;
+				child0->mParent = destNode;
+				child1->mParent = destNode;
+			}
+			offset++;
+		}
+	}
+}
+
+
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h
new file mode 100644
index 000000000000..6a8f9e74ad5d
--- /dev/null
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h
@@ -0,0 +1,195 @@
+// This code contains NVIDIA Confidential Information and is disclosed to you
+// under a form of NVIDIA software license agreement provided separately to you.
+//
+// Notice
+// NVIDIA Corporation and its licensors retain all intellectual property and
+// proprietary rights in and to this software and related documentation and
+// any modifications thereto. Any use, reproduction, disclosure, or
+// distribution of this software and related documentation without an express
+// license agreement from NVIDIA Corporation is strictly prohibited.
+//
+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// Information and code furnished is believed to be accurate and reliable.
+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
+// information or for any infringement of patents or other rights of third parties that may
+// result from its use. No license is granted by implication or otherwise under any patent
+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
+// This code supersedes and replaces all information previously supplied.
+// NVIDIA Corporation products are not authorized for use as critical
+// components in life support devices or systems without express written approval of
+// NVIDIA Corporation.
+//
+// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
+// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+
+#ifndef SQ_INCREMENTAL_AABB_TREE_H
+#define SQ_INCREMENTAL_AABB_TREE_H
+
+#include "foundation/PxBounds3.h"
+#include "PsUserAllocated.h"
+#include "PsVecMath.h"
+#include "SqPruner.h"
+#include "SqAABBTreeBuild.h"
+#include "PsPool.h"
+
+namespace physx
+{
+	using namespace shdfnd::aos;
+
+	namespace Sq
+	{
+		class AABBTree;
+
+		#define NB_OBJECTS_PER_NODE	4
+
+		///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// tree indices, can change in runtime
+		struct AABBTreeIndices
+		{
+			PX_FORCE_INLINE AABBTreeIndices(PoolIndex index) :
+				nbIndices(1)
+			{
+				indices[0] = index;
+				for(PxU32 i = 1; i < NB_OBJECTS_PER_NODE; i++)
+				{
+					indices[i] = 0;
+				}
+			}
+
+			PxU32			nbIndices;
+			PoolIndex		indices[NB_OBJECTS_PER_NODE];
+		};
+
+		///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// tree node, has parent information
+		class IncrementalAABBTreeNode : public Ps::UserAllocated
+		{
+		public:
+			PX_FORCE_INLINE								IncrementalAABBTreeNode():
+				mParent(NULL)
+			{
+				mChilds[0] = NULL;
+				mChilds[1] = NULL;
+			}
+			PX_FORCE_INLINE								IncrementalAABBTreeNode(AABBTreeIndices* indices):
+				mParent(NULL)
+			{
+				mIndices = indices;
+				mChilds[1] = NULL;
+			}
+			PX_FORCE_INLINE								~IncrementalAABBTreeNode() {}
+
+			PX_FORCE_INLINE	PxU32						isLeaf()								const { return PxU32(mChilds[1]==0); }
+
+			PX_FORCE_INLINE	const PxU32*				getPrimitives(const PxU32* )			const { return &mIndices->indices[0]; }
+			PX_FORCE_INLINE	PxU32*						getPrimitives(PxU32* )					{ return &mIndices->indices[0]; }
+			PX_FORCE_INLINE	PxU32						getNbPrimitives()						const { return mIndices->nbIndices; }
+
+			PX_FORCE_INLINE	const IncrementalAABBTreeNode*	getPos(const IncrementalAABBTreeNode* )	const { return mChilds[0]; }
+			PX_FORCE_INLINE	const IncrementalAABBTreeNode*	getNeg(const IncrementalAABBTreeNode* )	const { return mChilds[1]; }
+
+			PX_FORCE_INLINE	IncrementalAABBTreeNode*		getPos(IncrementalAABBTreeNode* ) { return mChilds[0]; }
+			PX_FORCE_INLINE	IncrementalAABBTreeNode*		getNeg(IncrementalAABBTreeNode* ) { return mChilds[1]; }
+
+			PX_FORCE_INLINE	void						getAABBCenterExtentsV(physx::shdfnd::aos::Vec3V* center, physx::shdfnd::aos::Vec3V* extents) const
+			{
+				const float half = 0.5f;
+				const FloatV halfV = FLoad(half);
+
+				*extents = Vec3V_From_Vec4V((V4Scale(V4Sub(mBVMax, mBVMin), halfV)));
+				*center = Vec3V_From_Vec4V((V4Scale(V4Add(mBVMax, mBVMin), halfV)));
+			}
+
+			PX_FORCE_INLINE	void						getAABBCenterExtentsV2(physx::shdfnd::aos::Vec3V* center, physx::shdfnd::aos::Vec3V* extents) const
+			{
+				*extents = Vec3V_From_Vec4V((V4Sub(mBVMax, mBVMin)));
+				*center = Vec3V_From_Vec4V((V4Add(mBVMax, mBVMin)));
+			}
+
+			PX_FORCE_INLINE	void						getAABBMinMaxV(physx::shdfnd::aos::Vec4V* minV, physx::shdfnd::aos::Vec4V* maxV) const
+			{
+				*minV = mBVMin;
+				*maxV = mBVMax;
+			}
+
+			Vec4V						mBVMin;		// Global bounding-volume min enclosing all the node-related primitives
+			Vec4V						mBVMax;		// Global bounding-volume max enclosing all the node-related primitives			
+			IncrementalAABBTreeNode*	mParent;	// node parent
+			union
+			{
+				IncrementalAABBTreeNode*	mChilds[2];		// childs of node if not a leaf
+				AABBTreeIndices*			mIndices;		// if leaf, indices information 
+			};			
+		};
+
+		struct IncrementalAABBTreeNodePair
+		{
+			IncrementalAABBTreeNode	mNode0;
+			IncrementalAABBTreeNode	mNode1;
+		};
+
+		///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// incremental AABB tree, all changes are immediatelly reflected to the tree
+		class IncrementalAABBTree : public Ps::UserAllocated
+		{
+		public:
+			IncrementalAABBTree();
+			~IncrementalAABBTree();
+
+			// Build the tree for the first time 
+			bool						build(AABBTreeBuildParams& params, Ps::Array<IncrementalAABBTreeNode*>& mapping);
+
+			// insert a new index into the tre
+			IncrementalAABBTreeNode*	insert(const PoolIndex index,  const PxBounds3* bounds, bool& split);
+
+			// update the object in the tree - full update insert/remove
+			IncrementalAABBTreeNode*	update(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds, bool& split, IncrementalAABBTreeNode*& removedNode);
+			// update the object in the tree, faster method, that may unballance the tree
+			IncrementalAABBTreeNode*	updateFast(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds, bool& split, IncrementalAABBTreeNode*& removedNode);
+
+			// remove object from the tree
+			IncrementalAABBTreeNode*	remove(IncrementalAABBTreeNode* node, const PoolIndex index, const PxBounds3* bounds);
+
+			// fixup the tree indices, if we swapped the objects in the pruning pool
+			void						fixupTreeIndices(IncrementalAABBTreeNode* node, const PoolIndex index, const PoolIndex newIndex);
+
+			// origin shift
+			void						shiftOrigin(const PxVec3& shift);
+			
+			// get the tree root node
+			const IncrementalAABBTreeNode*	getNodes() const { return mRoot; }
+
+			// define this function so we can share the scene query code with regular AABBTree
+			const PxU32*				getIndices() const { return NULL; }
+
+			// paranoia checks
+			void						hierarchyCheck(PoolIndex maxIndex, const PxBounds3* bounds);
+			void						checkTreeLeaf(IncrementalAABBTreeNode* leaf, PoolIndex h);
+
+			void						release();
+			
+		private:
+
+			// clone the tree from the generic AABB tree that was built
+			void						clone(Ps::Array<IncrementalAABBTreeNode*>& mapping, const PxU32* indices, IncrementalAABBTreeNode** treeNodes);
+
+			// split leaf node, the newly added object does not fit in
+			IncrementalAABBTreeNode*	splitLeafNode(IncrementalAABBTreeNode* node,  const PoolIndex index,  const Vec4V& minV,  const Vec4V& maxV, const PxBounds3* bounds);
+
+			void						releaseNode(IncrementalAABBTreeNode* node);
+		private:
+			Ps::Pool<AABBTreeIndices>				mIndicesPool;
+			Ps::Pool<IncrementalAABBTreeNodePair>	mNodesPool;
+			IncrementalAABBTreeNode*			mRoot;
+
+			NodeAllocator						mNodeAllocator;
+		};
+	}
+}
+
+#endif
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqSceneQueryManager.cpp b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqSceneQueryManager.cpp
index 0c9850dcc92b..3de22a640f4b 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqSceneQueryManager.cpp
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/SceneQuery/src/SqSceneQueryManager.cpp
@@ -189,6 +189,8 @@ SceneQueryManager::SceneQueryManager(	Scb::Scene& scene, PxPruningStructureType:
 
 	mDynamicBoundsSync.mPruner = mPrunerExt[PruningIndex::eDYNAMIC].pruner();
 	mDynamicBoundsSync.mTimestamp = &mPrunerExt[PruningIndex::eDYNAMIC].mTimestamp;
+
+	mPrunerNeedsUpdating = false;
 }
 
 SceneQueryManager::~SceneQueryManager()
@@ -203,6 +205,8 @@ void SceneQueryManager::flushMemory()
 
 void SceneQueryManager::markForUpdate(PrunerData data)
 { 
+	mPrunerNeedsUpdating = true;
+
 	const PxU32 index = getPrunerIndex(data);
 	const PrunerHandle handle = getPrunerHandle(data);
 
@@ -217,6 +221,8 @@ void SceneQueryManager::preallocate(PxU32 staticShapes, PxU32 dynamicShapes)
 
 PrunerData SceneQueryManager::addPrunerShape(const NpShape& shape, const PxRigidActor& actor, bool dynamic, const PxBounds3* bounds, bool hasPrunerStructure)
 {
+	mPrunerNeedsUpdating = true;
+
 	PrunerPayload pp;
 	const Scb::Shape& scbShape = shape.getScbShape();
 	const Scb::Actor& scbActor = gOffsetTable.convertPxActor2Scb(actor);
@@ -249,6 +255,8 @@ const PrunerPayload& SceneQueryManager::getPayload(PrunerData data) const
 
 void SceneQueryManager::removePrunerShape(PrunerData data)
 {
+	mPrunerNeedsUpdating = true;
+
 	const PxU32 index = getPrunerIndex(data);
 	const PrunerHandle handle = getPrunerHandle(data);
 
@@ -334,110 +342,33 @@ void SceneQueryManager::validateSimUpdates()
 	}
 }
 
-void SceneQueryManager::processSimUpdates()
-{
-	PX_PROFILE_ZONE("Sim.updatePruningTrees", mScene.getContextId());
-
-	{
-		PX_PROFILE_ZONE("SceneQuery.processActiveShapes", mScene.getContextId());
-
-		// update all active objects
-		BodyCore*const* activeBodies = mScene.getScScene().getActiveBodiesArray();
-		PxU32 nbActiveBodies = mScene.getScScene().getNumActiveBodies();
-
-#define NB_BATCHED_OBJECTS	128
-		PrunerHandle batchedHandles[NB_BATCHED_OBJECTS];
-		PxU32 nbBatchedObjects = 0;
-		Pruner* pruner = mPrunerExt[PruningIndex::eDYNAMIC].pruner();
-
-		while(nbActiveBodies--)
-		{
-			// PT: TODO: don't put frozen objects in "active bodies" array? After all they
-			// are also not included in the 'active transforms' or 'active actors' arrays.
-			BodyCore* currentBody = *activeBodies++;
-			if(currentBody->isFrozen())
-				continue;
-
-			PxActorType::Enum type;
-			PxRigidBody* pxBody = static_cast<PxRigidBody*>(getPxActorFromBodyCore(currentBody, type));
-			PX_ASSERT(pxBody->getConcreteType()==PxConcreteType::eRIGID_DYNAMIC || pxBody->getConcreteType()==PxConcreteType::eARTICULATION_LINK);
-
-			NpShapeManager* shapeManager;
-			if(type==PxActorType::eRIGID_DYNAMIC)
-			{
-				NpRigidDynamic* rigidDynamic = static_cast<NpRigidDynamic*>(pxBody);
-				shapeManager = &rigidDynamic->getShapeManager();
-			}
-			else
-			{
-				NpArticulationLink* articulationLink = static_cast<NpArticulationLink*>(pxBody);
-				shapeManager = &articulationLink->getShapeManager();
-			}
-
-			const PxU32 nbShapes = shapeManager->getNbShapes();
-			for(PxU32 i=0; i<nbShapes; i++)
-			{
-				const PrunerData data = shapeManager->getPrunerData(i);
-				if(data!=SQ_INVALID_PRUNER_DATA)
-				{
-					// PT: index can't be zero here!
-					PX_ASSERT(getPrunerIndex(data)==PruningIndex::eDYNAMIC);
-
-					const PrunerHandle handle = getPrunerHandle(data);
-
-					if(!mPrunerExt[PruningIndex::eDYNAMIC].isDirty(handle))	// PT: if dirty, will be updated in "flushShapes"
-					{
-						batchedHandles[nbBatchedObjects] = handle;
-
-						PxBounds3* bounds;
-						const PrunerPayload& pp = pruner->getPayload(handle, bounds);
-						computeDynamicWorldAABB(*bounds, *(reinterpret_cast<Scb::Shape*>(pp.data[0])), *(reinterpret_cast<Scb::Actor*>(pp.data[1])));
-						nbBatchedObjects++;
-
-						if(nbBatchedObjects==NB_BATCHED_OBJECTS)
-						{
-							mPrunerExt[PruningIndex::eDYNAMIC].invalidateTimestamp();
-							pruner->updateObjectsAfterManualBoundsUpdates(batchedHandles, nbBatchedObjects);
-							nbBatchedObjects = 0;
-						}
-					}
-				}
-			}
-		}
-		if(nbBatchedObjects)
-		{
-			mPrunerExt[PruningIndex::eDYNAMIC].invalidateTimestamp();
-			pruner->updateObjectsAfterManualBoundsUpdates(batchedHandles, nbBatchedObjects);
-		}
-	}
-
-	// flush user modified objects
-	flushShapes();
-
-	for(PxU32 i=0;i<PruningIndex::eCOUNT;i++)
-	{
-		if(mPrunerExt[i].pruner() && mPrunerExt[i].type() == PxPruningStructureType::eDYNAMIC_AABB_TREE)
-			static_cast<AABBPruner*>(mPrunerExt[i].pruner())->buildStep();
-
-		mPrunerExt[i].pruner()->commit();
-	}
-}
-
-void SceneQueryManager::afterSync(bool commit)
+void SceneQueryManager::afterSync(PxSceneQueryUpdateMode::Enum updateMode)
 {
 	PX_PROFILE_ZONE("Sim.sceneQueryBuildStep", mScene.getContextId());
 
+	if(updateMode == PxSceneQueryUpdateMode::eBUILD_DISABLED_COMMIT_DISABLED)
+	{
+		mPrunerNeedsUpdating = true;
+		return;
+	}
+
 	// flush user modified objects
 	flushShapes();
 
-	for (PxU32 i = 0; i<2; i++)
-	{
-		if (mPrunerExt[i].pruner() && mPrunerExt[i].type() == PxPruningStructureType::eDYNAMIC_AABB_TREE)
-			static_cast<AABBPruner*>(mPrunerExt[i].pruner())->buildStep();
+	bool commit = updateMode == PxSceneQueryUpdateMode::eBUILD_ENABLED_COMMIT_ENABLED;
 
-		if (commit)
+	for(PxU32 i = 0; i<2; i++)
+	{
+		if(mPrunerExt[i].pruner() && mPrunerExt[i].type() == PxPruningStructureType::eDYNAMIC_AABB_TREE)
+			static_cast<AABBPruner*>(mPrunerExt[i].pruner())->buildStep(true);
+
+		if(commit)
 			mPrunerExt[i].pruner()->commit();
 	}
+
+	//If we didn't commit changes, then the next query must perform that operation so this bool must be set to true, otherwise there should be 
+	//no outstanding work required by queries at this time
+	mPrunerNeedsUpdating = !commit;
 }
 
 void SceneQueryManager::flushShapes()
@@ -456,15 +387,29 @@ void SceneQueryManager::flushUpdates()
 
 	// no need to take lock if manual sq update is enabled
 	// as flushUpdates will only be called from NpScene::flushQueryUpdates()
-	mSceneQueryLock.lock();
+	if (mPrunerNeedsUpdating)
+	{
+		mSceneQueryLock.lock();
 
-	flushShapes();
+		//Check again because another thread may have already performed all pending updated (this secondary check might be unnecessary)
+		if (mPrunerNeedsUpdating)
+		{
 
-	for(PxU32 i=0;i<PruningIndex::eCOUNT;i++)
-		if(mPrunerExt[i].pruner())
-			mPrunerExt[i].pruner()->commit();
+			flushShapes();
 
-	mSceneQueryLock.unlock();
+			for (PxU32 i = 0; i < PruningIndex::eCOUNT; i++)
+				if (mPrunerExt[i].pruner())
+					mPrunerExt[i].pruner()->commit();
+
+			//KS - force memory writes to have completed before updating the volatile mPrunerNeedsUpdating member. This should ensure that, if another thread
+			//reads this value and finds it is false, that all the modifications we made to the pruner are visible in memory.
+			physx::shdfnd::memoryBarrier();
+
+			mPrunerNeedsUpdating = false;
+		}
+
+		mSceneQueryLock.unlock();
+	}
 }
 
 void SceneQueryManager::forceDynamicTreeRebuild(bool rebuildStaticStructure, bool rebuildDynamicStructure)
@@ -484,6 +429,30 @@ void SceneQueryManager::forceDynamicTreeRebuild(bool rebuildStaticStructure, boo
 	}
 }
 
+void SceneQueryManager::sceneQueryBuildStep(PruningIndex::Enum index)
+{
+	PX_PROFILE_ZONE("SceneQuery.sceneQueryBuildStep", mScene.getContextId());
+
+	if (mPrunerExt[index].pruner() && mPrunerExt[index].type() == PxPruningStructureType::eDYNAMIC_AABB_TREE)
+	{
+		const bool buildFinished = static_cast<AABBPruner*>(mPrunerExt[index].pruner())->buildStep(false);
+		if(buildFinished)
+		{
+			mPrunerNeedsUpdating = true;
+		}
+	}
+}
+
+bool SceneQueryManager::prepareSceneQueriesUpdate(PruningIndex::Enum index)
+{
+	bool retVal = false;
+	if (mPrunerExt[index].pruner() && mPrunerExt[index].type() == PxPruningStructureType::eDYNAMIC_AABB_TREE)
+	{
+		retVal = static_cast<AABBPruner*>(mPrunerExt[index].pruner())->prepareBuild();
+	}
+	return retVal;
+}
+
 void SceneQueryManager::shiftOrigin(const PxVec3& shift)
 {
 	for(PxU32 i=0; i<PruningIndex::eCOUNT; i++)
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/common/SceneQuery.cmake b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/common/SceneQuery.cmake
index 76a8c7d8881b..d51d38d5d879 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/common/SceneQuery.cmake
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/common/SceneQuery.cmake
@@ -14,8 +14,14 @@ SOURCE_GROUP(include FILES ${SCENEQUERY_HEADERS})
 SET(SCENEQUERY_SOURCE			
 	${SCENEQUERY_BASE_DIR}/src/SqAABBPruner.cpp
 	${SCENEQUERY_BASE_DIR}/src/SqAABBPruner.h
+	${SCENEQUERY_BASE_DIR}/src/SqIncrementalAABBPrunerCore.cpp
+	${SCENEQUERY_BASE_DIR}/src/SqIncrementalAABBPrunerCore.h
 	${SCENEQUERY_BASE_DIR}/src/SqAABBTree.cpp
 	${SCENEQUERY_BASE_DIR}/src/SqAABBTree.h
+	${SCENEQUERY_BASE_DIR}/src/SqAABBTreeBuild.cpp
+	${SCENEQUERY_BASE_DIR}/src/SqAABBTreeBuild.h
+	${SCENEQUERY_BASE_DIR}/src/SqIncrementalAABBTree.cpp
+	${SCENEQUERY_BASE_DIR}/src/SqIncrementalAABBTree.h
 	${SCENEQUERY_BASE_DIR}/src/SqAABBTreeQuery.h
 	${SCENEQUERY_BASE_DIR}/src/SqAABBTreeUpdateMap.cpp
 	${SCENEQUERY_BASE_DIR}/src/SqAABBTreeUpdateMap.h
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/ios/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/ios/CMakeLists.txt
index dcbdc39b5dd3..e9562fe0a55c 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/ios/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/ios/CMakeLists.txt
@@ -14,7 +14,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/linux/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/linux/CMakeLists.txt
index a214d6e63174..48093cf9df39 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/linux/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/linux/CMakeLists.txt
@@ -34,10 +34,10 @@ ENDIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMA
 
 
 # Build debug info for all configurations
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2")
-SET(CMAKE_CXX_FLAGS_CHECKED "-g3 -gdwarf-2 -O3")
-SET(CMAKE_CXX_FLAGS_PROFILE "-O3")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g3 -gdwarf-3")
 
 # Controls PX_NVTX for all projects on linux
 SET(PHYSX_LINUX_ENABLE_NVTX 0)
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/mac/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/mac/CMakeLists.txt
index 0f0886138bc7..f20a43cda594 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/mac/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/mac/CMakeLists.txt
@@ -12,7 +12,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 IF (DEFINED PX_32BIT)
 SET(CMAKE_CXX_FLAGS "-arch i386 ${CMAKE_CXX_FLAGS}")
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/tvos/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/tvos/CMakeLists.txt
index 899008a197c6..8cecaf297820 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/tvos/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/Source/compiler/cmake/tvos/CMakeLists.txt
@@ -14,7 +14,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
diff --git a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/release_notes.html b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/release_notes.html
index 11d304c440af..aecb900a2046 100644
--- a/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/release_notes.html
+++ b/Engine/Source/ThirdParty/PhysX3/PhysX_3.4/release_notes.html
@@ -40,6 +40,40 @@
 
 	</blockquote>
 
+    <h3>Scene query</h3>
+    <ul>
+        <li>Changed:</li>
+        <ul>
+            <li>PxSceneFlag::eSUPPRESS_EAGER_SCENE_QUERY_REFIT has been marked as deprecated. Was replaced with PxSceneQueryUpdateMode enum, if this new enum is set the flag gets ignored.</li>
+        </ul>
+        <li>Added:</li>
+        <ul>
+            <li>PxSceneQueryUpdateMode was added to control work done during fetchResults.</li>
+            <li>PxScene::sceneQueriesUpdate, PxScene::checkQueries and PxScene::fetchQueries were added to run separate scene query update, see manual for more details.</li>
+        </ul>
+    </ul>
+
+    <!-- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <h1 style="TEXT-ALIGN: center">Release Notes - NVIDIA<sup>&reg;</sup> PhysX<sup>&reg;</sup> SDK 3.4.1.23584284</h1>
+    <h2 style="TEXT-ALIGN: center">February 2018</h2>
+
+    <h3>General</h3>
+    <ul>
+        <li>Fixed:</li>
+        <ul>
+            <li>PhysX sometimes froze in a spinlock after certain sequences of read & write locks. This has been fixed.</li>
+        </ul>
+    </ul>
+
+    <h3>Scene queries</h3>
+    <ul>
+        <li>Fixed:</li>
+        <ul>
+            <li>Raycasts against heightfields were sometimes missing hits for vertical rays were located exactly at the heightfield's boundaries. This has been fixed.</li>
+        </ul>
+    </ul>
+
     <h3>Rigid Bodies</h3>
     <ul>
         <li>Fixed:</li>
diff --git a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/ios/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/ios/CMakeLists.txt
index 4e2f814148e6..eb23635306a7 100644
--- a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/ios/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/ios/CMakeLists.txt
@@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
diff --git a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/linux/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/linux/CMakeLists.txt
index fc3b7d870a4e..380b9d005827 100644
--- a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/linux/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/linux/CMakeLists.txt
@@ -34,10 +34,10 @@ ELSE(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAK
 ENDIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
 
 
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g -gdwarf-3")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -g3 -gdwarf-3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g3 -gdwarf-3")
 
 IF(DEFINED GENERATE_GPU_PROJECTS)
 SET(PXSHARED_LINUX_COMPILE_DEFS _LIB)
diff --git a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/mac/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/mac/CMakeLists.txt
index 3242b46228e3..aeac4cd34852 100644
--- a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/mac/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/mac/CMakeLists.txt
@@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-msse2 -std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 IF (DEFINED PX_32BIT)
 SET(CMAKE_CXX_FLAGS "-arch i386 ${CMAKE_CXX_FLAGS}")
diff --git a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/tvos/CMakeLists.txt b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/tvos/CMakeLists.txt
index 46ad371cbe23..a05d84f16a22 100644
--- a/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/tvos/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/PhysX3/PxShared/src/compiler/cmake/tvos/CMakeLists.txt
@@ -13,7 +13,7 @@ IF (NOT ${TARGET_BUILD_PLATFORM} IN_LIST PLATFORM_LIST)
 	MESSAGE(FATAL_ERROR "Invalid platform:" ${TARGET_BUILD_PLATFORM})
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-unused-local-typedef -Wno-implicit-fallthrough -gdwarf-2")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-rtti -fno-exceptions -ffast-math -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-old-style-cast -Wno-return-type-c-linkage -Wno-format-nonliteral -Wno-unused-local-typedef -Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant -Wno-shadow-field -Wno-unused-template -gdwarf-2")
 
 SET(CMAKE_SHARED_LINKER_FLAGS "")
 
diff --git a/Engine/Source/ThirdParty/libSampleRate/LibSampleRate-0.1.9.tps b/Engine/Source/ThirdParty/libSampleRate/LibSampleRate-0.1.9.tps
deleted file mode 100644
index a8622531e998..000000000000
--- a/Engine/Source/ThirdParty/libSampleRate/LibSampleRate-0.1.9.tps
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Name>libSampleRate v0.1.9</Name>
-  <Location>/Engine/Source/ThirdParty/libSampleRate/libsamplerate-0.1.9/</Location>
-  <Date>2018-01-08T14:20:32.44059345-04:00</Date>
-  <Function>For sample rate conversion </Function>
-  <Eula>http://www.libpng.org/pub/png/src/libpng-LICENSE.txt</Eula>
-  <RedistributeTo>
-    <EndUserGroup>Licensees</EndUserGroup>
-    <EndUserGroup>Git</EndUserGroup>
-    <EndUserGroup>P4</EndUserGroup>
-  </RedistributeTo>
-  <LicenseFolder>/Engine/Source/ThirdParty/Licenses/libSampleRate_v0.1.9_License.txt</LicenseFolder>
-</TpsData>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/libSampleRate/Private/samplerate.cpp b/Engine/Source/ThirdParty/libSampleRate/Private/samplerate.cpp
index 0ae0c28c9f67..304f12f71bf0 100644
--- a/Engine/Source/ThirdParty/libSampleRate/Private/samplerate.cpp
+++ b/Engine/Source/ThirdParty/libSampleRate/Private/samplerate.cpp
@@ -31,26 +31,29 @@ src_new (int converter_type, int channels, int *error)
 		return NULL ;
 		} ;
 
-	if ((psrc = new SRC_PRIVATE()) == nullptr) //originally: (SRC_PRIVATE *) FMemory::Malloc(sizeof (*psrc))) == NULL)
+	if ((psrc = (SRC_PRIVATE*) FMemory::Malloc(sizeof(SRC_PRIVATE))) == nullptr) //originally: (SRC_PRIVATE *) FMemory::Malloc(sizeof (*psrc))) == NULL)
 	{	
 		if (error)
 			*error = SRC_ERR_MALLOC_FAILED ;
 		return NULL ;
 	}
 
+	FMemory::Memset(psrc, 0, sizeof(SRC_PRIVATE));
+
 	psrc->channels = channels ;
 	psrc->mode = SRC_MODE_PROCESS ;
 
 	if (psrc_set_converter (psrc, converter_type) != SRC_ERR_NO_ERROR)
-	{
+	{	
 		if (error)
 		{
-			*error = SRC_ERR_BAD_CONVERTER;
+			*error = SRC_ERR_BAD_CONVERTER ;
 		}
+		
+		FMemory::Free(psrc) ;
+		psrc = NULL ;
+	}
 
-		delete psrc;
-		psrc = NULL;
-	};
 
 	src_reset ((SRC_STATE*) psrc) ;
 
@@ -84,18 +87,20 @@ src_callback_new (src_callback_t func, int converter_type, int channels, int *er
 
 SRC_STATE *
 src_delete (SRC_STATE *state)
-{	SRC_PRIVATE *psrc ;
+{
+	SRC_PRIVATE *psrc ;
 
 	psrc = (SRC_PRIVATE*) state ;
 	if (psrc)
-	{	
-		if (psrc->private_data)
+	{
+		if (psrc->private_data != nullptr)
 		{
 			FMemory::Free(psrc->private_data);
 		}
-		FMemory::Memset(psrc, 0, sizeof (SRC_PRIVATE)) ;
-		delete psrc;
-	};
+
+		FMemory::Memset(psrc, 0, sizeof(SRC_PRIVATE)) ;
+		FMemory::Free(psrc) ;
+	}
 
 	return NULL ;
 } /* src_state */
diff --git a/Engine/Source/ThirdParty/libSampleRate/Private/src_linear.cpp b/Engine/Source/ThirdParty/libSampleRate/Private/src_linear.cpp
index fd6b918336b8..8e01bf27b8b4 100644
--- a/Engine/Source/ThirdParty/libSampleRate/Private/src_linear.cpp
+++ b/Engine/Source/ThirdParty/libSampleRate/Private/src_linear.cpp
@@ -160,9 +160,7 @@ linear_set_converter (SRC_PRIVATE *psrc, int src_enum)
 {	LINEAR_DATA *priv = NULL ;
 
 	if (src_enum != SRC_LINEAR)
-	{
-		return SRC_ERR_BAD_CONVERTER;
-	}
+		return SRC_ERR_BAD_CONVERTER ;
 
 	if (psrc->private_data != NULL)
 	{	
@@ -172,7 +170,7 @@ linear_set_converter (SRC_PRIVATE *psrc, int src_enum)
 
 	if (psrc->private_data == NULL)
 	{	
-		priv = (LINEAR_DATA *) FMemory::Malloc(sizeof(LINEAR_DATA) + psrc->channels * sizeof (float));
+		priv = (LINEAR_DATA *)FMemory::Malloc(sizeof(LINEAR_DATA) + psrc->channels * sizeof(float));
 		*priv = LINEAR_DATA();
 		void* BufferPtr = ((uint8*)priv) + sizeof(LINEAR_DATA);
 		FMemory::Memset(BufferPtr, 0, psrc->channels * sizeof(float));
@@ -180,9 +178,7 @@ linear_set_converter (SRC_PRIVATE *psrc, int src_enum)
 	}
 
 	if (priv == NULL)
-	{
-		return SRC_ERR_MALLOC_FAILED;
-	}
+		return SRC_ERR_MALLOC_FAILED ;
 
 	priv->linear_magic_marker = LINEAR_MAGIC_MARKER ;
 	priv->channels = psrc->channels ;
@@ -191,7 +187,7 @@ linear_set_converter (SRC_PRIVATE *psrc, int src_enum)
 	psrc->vari_process = linear_vari_process ;
 	psrc->reset = linear_reset ;
 
-	linear_reset(psrc) ;
+	linear_reset (psrc) ;
 
 	return SRC_ERR_NO_ERROR ;
 } /* linear_set_converter */
@@ -209,7 +205,7 @@ linear_reset (SRC_PRIVATE *psrc)
 
 	priv->channels = psrc->channels ;
 	priv->reset = 1 ;
-	FMemory::Memset(priv->last_value, 0, sizeof(priv->last_value [0]) * priv->channels) ;
+	FMemory::Memset(priv->last_value, 0, sizeof (priv->last_value [0]) * priv->channels) ;
 
 	return ;
 } /* linear_reset */
diff --git a/Engine/Source/ThirdParty/libSampleRate/Private/src_sinc.cpp b/Engine/Source/ThirdParty/libSampleRate/Private/src_sinc.cpp
index dc5be6e6a2f2..d4d08cb14387 100644
--- a/Engine/Source/ThirdParty/libSampleRate/Private/src_sinc.cpp
+++ b/Engine/Source/ThirdParty/libSampleRate/Private/src_sinc.cpp
@@ -24,7 +24,7 @@
 #define	FP_ONE					((double) (((increment_t) 1) << SHIFT_BITS))
 #define	INV_FP_ONE				(1.0 / FP_ONE)
 
-#define MAX_CHANNELS 128
+#define MAX_SINC_CHANNELS 128
 #define SINC_MIN_BUFFERSIZE 1
 
 /*========================================================================================
@@ -54,7 +54,7 @@ typedef struct
 	int b_current, b_end, b_real_end, b_len ;
 
 	/* Sure hope noone does more than 128 channels at once. */
-	double left_calc [MAX_CHANNELS], right_calc [MAX_CHANNELS] ;
+	double left_calc [MAX_SINC_CHANNELS], right_calc [MAX_SINC_CHANNELS] ;
 
 	/* This will start as minimum buffer size, but will be dynamically sized at runtime. */
 	float buffer[SINC_MIN_BUFFERSIZE];
diff --git a/Engine/Source/ThirdParty/libSampleRate/Private/src_zoh.cpp b/Engine/Source/ThirdParty/libSampleRate/Private/src_zoh.cpp
index 01c17accca06..a23f5392de2c 100644
--- a/Engine/Source/ThirdParty/libSampleRate/Private/src_zoh.cpp
+++ b/Engine/Source/ThirdParty/libSampleRate/Private/src_zoh.cpp
@@ -164,15 +164,14 @@ zoh_set_converter (SRC_PRIVATE *psrc, int src_enum)
 	if (psrc->private_data == NULL)
 	{	
 		priv = (ZOH_DATA*) FMemory::Malloc(sizeof(ZOH_DATA) + psrc->channels * sizeof (float));
-
 		// Initialize ZOH_DATA at the beginning:
 		*priv = ZOH_DATA();
 
-		// Initialize samples to 0:
+		// zero out buffer:
 		void* BufferSize = ((uint8*)priv) + sizeof(ZOH_DATA);
 		FMemory::Memset(BufferSize, 0, psrc->channels * sizeof(float));
 		psrc->private_data = priv ;
-	}
+	} ;
 
 	if (priv == NULL)
 		return SRC_ERR_MALLOC_FAILED ;
@@ -202,7 +201,7 @@ zoh_reset (SRC_PRIVATE *psrc)
 
 	priv->channels = psrc->channels ;
 	priv->reset = 1 ;
-	FMemory::Memset(priv->last_value, 0, sizeof(priv->last_value[0]) * priv->channels) ;
+	FMemory::Memset(priv->last_value, 0, sizeof (priv->last_value [0]) * priv->channels) ;
 
 	return ;
 } /* zoh_reset */
diff --git a/Engine/Source/ThirdParty/libSampleRate/libsamplerate.tps b/Engine/Source/ThirdParty/libSampleRate/libsamplerate.tps
new file mode 100644
index 000000000000..6a3ce656d364
--- /dev/null
+++ b/Engine/Source/ThirdParty/libSampleRate/libsamplerate.tps
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>libsamplerate (Secret Rabbit Code)</Name>
+  <Location>/Engine/Source/ThirdParty/libSampleRate</Location>
+  <Function>Used to downsample audio assets.</Function>
+  <Eula>https://github.com/erikd/libsamplerate/blob/master/COPYING; http://www.mega-nerd.com/SRC/license.html</Eula>
+  <RedistributeTo>
+	<EndUserGroup>Licensees</EndUserGroup>
+    <EndUserGroup>Git</EndUserGroup>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>/Engine/Source/ThirdParty/Licenses/Libsamplerate_License.txt</LicenseFolder>
+</TpsData>
\ No newline at end of file
diff --git a/Engine/Source/ThirdParty/libWebSockets/libWebSockets.Build.cs b/Engine/Source/ThirdParty/libWebSockets/libWebSockets.Build.cs
index f5fd38bed86a..55900d9e6d97 100644
--- a/Engine/Source/ThirdParty/libWebSockets/libWebSockets.Build.cs
+++ b/Engine/Source/ThirdParty/libWebSockets/libWebSockets.Build.cs
@@ -33,6 +33,10 @@ public class libWebSockets : ModuleRules
 			PublicAdditionalLibraries.Add(Path.Combine(WebsocketPath, "lib", Target.Platform.ToString(), ConfigurationSubdir, "libwebsockets.a"));
 			break;
 
+		case UnrealTargetPlatform.Switch:
+			PublicAdditionalLibraries.Add(Path.Combine(WebsocketPath, "lib", Target.Platform.ToString(), ConfigurationSubdir, "libwebsockets.a"));
+			break;
+
 		case UnrealTargetPlatform.Android:
 		    PublicIncludePaths.Add(Path.Combine(WebsocketPath, "include", PlatformSubdir, "ARMv7"));
 			PublicLibraryPaths.Add(Path.Combine(WebsocketPath, "lib", Target.Platform.ToString(), "ARMv7", ConfigurationSubdir));
@@ -60,6 +64,9 @@ public class libWebSockets : ModuleRules
 		}
 		PublicIncludePaths.Add(Path.Combine(WebsocketPath, "include", PlatformSubdir));
 
-		PublicDependencyModuleNames.Add("OpenSSL");
+		if (Target.Platform != UnrealTargetPlatform.Switch)
+		{
+			PublicDependencyModuleNames.Add("OpenSSL");
+		}
 	}
 }
diff --git a/Engine/Source/ThirdParty/libWebSockets/libwebsockets/include/IOS/lws_config.h b/Engine/Source/ThirdParty/libWebSockets/libwebsockets/include/IOS/lws_config.h
index 724f7aa403d8..93aea073b8aa 100644
--- a/Engine/Source/ThirdParty/libWebSockets/libwebsockets/include/IOS/lws_config.h
+++ b/Engine/Source/ThirdParty/libWebSockets/libwebsockets/include/IOS/lws_config.h
@@ -56,7 +56,7 @@
 /* #undef LWS_USE_LIBUV */
 
 /* Build with support for ipv6 */
-/* #undef LWS_USE_IPV6 */
+#define LWS_USE_IPV6
 
 /* Build with support for UNIX domain socket */
 /* #undef LWS_USE_UNIX_SOCK */
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/CMakeLists.txt b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/CMakeLists.txt
index 265ae5b87aa4..280da9ab193c 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/CMakeLists.txt
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/CMakeLists.txt
@@ -8,15 +8,39 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/../")
 
 set(SOCKET_IMPL ../src/sock.c CACHE STRING "Socket implementation")
 option(DISABLE_TLS "Disable TLS support" ON)
+option(DISABLE_SRV_LOOKUP "Disable SRV lookup" OFF)
 
 set(EXPAT_PATH ../../../Expat/expat-2.2.0/lib CACHE STRING "Path to expat headers")
 set(OPENSSL_PATH "" CACHE STRING "Path to openssl headers")
+set(UNREALSSL_PATH "" CACHE STRING "Path to unreal ssl headers")
+set(SOCKETAPI_PATH "" CACHE STRING "Path to socket api headers")
 
 if(${DISABLE_TLS})
 	set(TLS_IMPL "../src/tls_dummy.c")
+else()
+if(${USE_UNREAL_SSL})
+	set(TLS_IMPL "../src/tls_unreal.c")
+	include_directories(${UNREALSSL_PATH})
+	add_definitions(-DUSE_UNREAL_SSL)
 else()
 	set(TLS_IMPL "../src/tls_openssl.c")
-    include_directories(${OPENSSL_PATH})
+endif()
+	include_directories(${OPENSSL_PATH})
+endif()
+
+if (${DISABLE_SRV_LOOKUP})
+	add_definitions(-DDISABLE_SRV_LOOKUP)
+endif()
+
+if (${USE_SOCKETAPI_DISPATCH})
+	include_directories(${SOCKETAPI_PATH})
+	add_definitions(-DUSE_SOCKETAPI_DISPATCH)
+endif()
+
+add_definitions(-DXML_STATIC=1)
+
+if(WIN32)
+	add_definitions(/D_CRT_SECURE_NO_WARNINGS=1)
 endif()
 
 include_directories(../src .. ${EXPAT_PATH})
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/IOS/BuildForIOS.sh b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/IOS/BuildForIOS.sh
index 0b28a91392dc..df2b353f3145 100755
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/IOS/BuildForIOS.sh
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/IOS/BuildForIOS.sh
@@ -1,12 +1,26 @@
 #!/bin/sh
 
-# Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
+# Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
 
-../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G Xcode -DSOCKET_IMPL=../../src/sock.c -DDISABLE_TLS=0 -DOPENSSL_PATH=../../../OpenSSL/1_0_1s/include/IOS -DCMAKE_CXX_FLAGS_DEBUG="-O0 -DXML_STATIC" -DCMAKE_CXX_FLAGS_RELEASE="-O3 -DXML_STATIC" ..
+SCRIPT_DIR=$(cd $(dirname $0) && pwd)
 
-echo
-echo
-echo You will now need to convert the Xcode project to use iOS SDK instead of Mac, then build it!
-echo
-echo
+BUILD_DIR="${SCRIPT_DIR}/../../IOS/Build"
 
+if [ -d "${BUILD_DIR}" ]; then
+	rm -rf "${BUILD_DIR}"
+fi
+mkdir -pv "${BUILD_DIR}"
+
+cd "${BUILD_DIR}"
+../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G "Xcode" -DSOCKET_IMPL=../../src/sock.c -DDISABLE_TLS=0 -DOPENSSL_PATH=../../../OpenSSL/1_0_1s/include/IOS -DCMAKE_XCODE_ATTRIBUTE_SDKROOT=iphoneos -DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=8.0 -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO -DCMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY=1,2 "${SCRIPT_DIR}/../../BuildForUE"
+
+function build()
+{
+	CONFIGURATION=$1
+	xcodebuild -project libstrophe.xcodeproj -configuration $CONFIGURATION -destination generic/platform=iOS
+}
+
+build Release
+build Debug
+cd "${SCRIPT_DIR}"
+rm -rf "${BUILD_DIR}"
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Mac/BuildForMac.sh b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Mac/BuildForMac.sh
new file mode 100755
index 000000000000..af182b195fa9
--- /dev/null
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Mac/BuildForMac.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+SCRIPT_DIR=$(cd $(dirname $0) && pwd)
+
+BUILD_DIR="${SCRIPT_DIR}/../../Mac/Build"
+
+if [ -d "${BUILD_DIR}" ]; then
+	rm -rf "${BUILD_DIR}"
+fi
+mkdir -pv "${BUILD_DIR}"
+
+cd "${BUILD_DIR}"
+../../../../../../Extras/ThirdPartyNotUE/CMake/bin/cmake -G "Xcode" -DSOCKET_IMPL=../../src/sock.c -DDISABLE_TLS=0 -DOPENSSL_PATH=../../../OpenSSL/1.0.2g/include/Mac -DCMAKE_OSX_DEPLOYMENT_TARGET="10.9" "${SCRIPT_DIR}/../../BuildForUE"
+
+function build()
+{
+	CONFIGURATION=$1
+	xcodebuild -project libstrophe.xcodeproj -configuration $CONFIGURATION
+}
+
+build Release
+build Debug
+cd "${SCRIPT_DIR}"
+rm -rf "${BUILD_DIR}"
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Windows/BuildForWindows.bat b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Windows/BuildForWindows.bat
new file mode 100644
index 000000000000..8602c4941aa0
--- /dev/null
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/BuildForUE/Windows/BuildForWindows.bat
@@ -0,0 +1,49 @@
+REM ECHO OFF
+
+REM Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+
+setlocal
+
+set PATH_TO_CMAKE_FILE=%CD%\..\
+
+REM Temporary build directories (used as working directories when running CMake)
+set VS2015_X86_PATH="%PATH_TO_CMAKE_FILE%..\Win32\VS2015\Build"
+set VS2015_X64_PATH="%PATH_TO_CMAKE_FILE%..\Win64\VS2015\Build"
+
+REM MSBuild Directory
+for /f "skip=2 tokens=2,*" %%R in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath') do SET _msbuild=%%S
+if not exist "%_msbuild%msbuild.exe" goto MSBuildMissing
+
+REM Build for VS2015 (32-bit)
+echo Generating libstrophe solution for VS2015 (32-bit)...
+if exist "%VS2015_X86_PATH%" (rmdir "%VS2015_X86_PATH%" /s/q)
+mkdir "%VS2015_X86_PATH%"
+cd "%VS2015_X86_PATH%"
+cmake -G "Visual Studio 14 2015" -DCMAKE_SUPPRESS_REGENERATION=1 -DSOCKET_IMPL=../../../src/sock.c -DOPENSSL_PATH=../../../OpenSSL/1.0.2g/include/Win32/VS2015 -DDISABLE_TLS=0 %PATH_TO_CMAKE_FILE%
+echo Building libstrophe solution for VS2015 (32-bit, Debug)...
+"%_msbuild%msbuild.exe" libstrophe.sln /t:build /p:Configuration=Debug
+echo Building libstrophe solution for VS2015 (32-bit, Release)...
+"%_msbuild%msbuild.exe" libstrophe.sln /t:build /p:Configuration=Release
+cd "%PATH_TO_CMAKE_FILE%"
+rmdir "%VS2015_X86_PATH%" /s/q
+
+REM Build for VS2015 (64-bit)
+echo Generating libstrophe solution for VS2015 (64-bit)...
+if exist "%VS2015_X64_PATH%" (rmdir "%VS2015_X64_PATH%" /s/q)
+mkdir "%VS2015_X64_PATH%"
+cd "%VS2015_X64_PATH%"
+cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_SUPPRESS_REGENERATION=1 -DSOCKET_IMPL=../../../src/sock.c -DOPENSSL_PATH=../../../OpenSSL/1.0.2g/include/Win64/VS2015 -DDISABLE_TLS=0 %PATH_TO_CMAKE_FILE%
+echo Building libstrophe solution for VS2015 (64-bit, Debug)...
+"%_msbuild%msbuild.exe" libstrophe.sln /t:build /p:Configuration=Debug
+echo Building libstrophe solution for VS2015 (64-bit, Release)...
+"%_msbuild%msbuild.exe" libstrophe.sln /t:build /p:Configuration=Release
+cd "%PATH_TO_CMAKE_FILE%"
+rmdir "%VS2015_X64_PATH%" /s/q
+goto Exit
+
+:MSBuildMissing
+echo MSBuild not found. Please check your Visual Studio install and try again.
+goto Exit
+
+:Exit
+endlocal
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/auth.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/auth.c
index ffc3af40b270..a5451dfcaa7c 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/auth.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/auth.c
@@ -230,7 +230,7 @@ static int _handle_features(xmpp_conn_t * const conn,
 
     /* check for TLS */
     if (!conn->secured) {
-        if (!conn->tls_disabled) {
+        if (!conn->tls_disabled && !(conn->extsock && conn->extsock->is_websocket)) { /* websocket xmpp uses ssl at the http layer */
             child = xmpp_stanza_get_child_by_name(stanza, "starttls");
             if (child && (strcmp(xmpp_stanza_get_ns(child), XMPP_NS_TLS) == 0))
                 conn->tls_support = 1;
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/common.h b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/common.h
index 184b97a598f2..493efbe23da0 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/common.h
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/common.h
@@ -212,6 +212,9 @@ struct _xmpp_conn_t {
     xmpp_handlist_t *timed_handlers;
     hash_t *id_handlers;
     xmpp_handlist_t *handlers;
+
+	/* external event driven socket */
+	xmpp_conn_extsock_t *extsock;
 };
 
 void conn_disconnect(xmpp_conn_t * const conn);
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/conn.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/conn.c
index fc24a8031131..a3cd64c0d117 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/conn.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/conn.c
@@ -171,6 +171,9 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
             if (tail) tail->next = item;
             else conn->ctx->connlist = item;
         }
+
+        /* default is to use built in sockets */
+        conn->extsock = NULL;
     }
     
     return conn;
@@ -221,17 +224,17 @@ void xmpp_conn_set_keepalive(xmpp_conn_t * const conn, int timeout, int interval
 
 int xmpp_conn_is_connecting(xmpp_conn_t * const conn)
 {
-	return conn->state == XMPP_STATE_CONNECTING ? 1 : 0;
+    return conn->state == XMPP_STATE_CONNECTING ? 1 : 0;
 }
 
 int xmpp_conn_is_connected(xmpp_conn_t * const conn)
 {
-	return conn->state == XMPP_STATE_CONNECTED ? 1 : 0;
+    return conn->state == XMPP_STATE_CONNECTED ? 1 : 0;
 }
 
 int xmpp_conn_is_disconnected(xmpp_conn_t * const conn)
 {
-	return conn->state == XMPP_STATE_DISCONNECTED ? 1 : 0;
+    return conn->state == XMPP_STATE_DISCONNECTED ? 1 : 0;
 }
 
 /** Release a Strophe connection object.
@@ -258,6 +261,12 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
     else {
         ctx = conn->ctx;
 
+        if (conn->state == XMPP_STATE_CONNECTING ||
+            conn->state == XMPP_STATE_CONNECTED)
+        {
+            conn_disconnect(conn);
+        }
+
         /* remove connection from context's connlist */
         if (ctx->connlist->conn == conn) {
             item = ctx->connlist;
@@ -325,6 +334,7 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
         if (conn->jid) xmpp_free(ctx, conn->jid);
         if (conn->pass) xmpp_free(ctx, conn->pass);
         if (conn->lang) xmpp_free(ctx, conn->lang);
+        if (conn->extsock) xmpp_free(ctx, conn->extsock);
         xmpp_free(ctx, conn);
         released = 1;
     }
@@ -467,8 +477,8 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
     /* SSL tunneled connection on 5223 port is legacy and doesn't
      * have an SRV record. */
     } else if (!conn->tls_legacy_ssl) {
-#if !defined(USE_WEBSOCKETS)
-		found = resolver_srv_lookup(conn->ctx, "xmpp-client", "tcp", domain,
+#if !defined(USE_WEBSOCKETS) && !defined(DISABLE_SRV_LOOKUP)
+        found = resolver_srv_lookup(conn->ctx, "xmpp-client", "tcp", domain,
                                     &srv_rr_list);
 #endif
     }
@@ -494,7 +504,7 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
 
     xmpp_free(conn->ctx, domain);
 
-#if !defined(USE_WEBSOCKETS)
+#if !defined(USE_WEBSOCKETS) && !defined(DISABLE_SRV_LOOKUP)
     resolver_srv_free(conn->ctx, srv_rr_list);
 #endif
 
@@ -697,7 +707,14 @@ void conn_disconnect(xmpp_conn_t * const conn)
         tls_free(conn->tls);
         conn->tls = NULL;
     }
-    sock_close(conn->sock);
+    if (conn->extsock)
+    {
+        conn->extsock->close_handler(conn->extsock->userdata);
+    }
+    else
+    {
+        sock_close(conn->sock);
+    }
 
     /* fire off connection handler */
     conn->conn_handler(conn, XMPP_CONN_DISCONNECT, conn->error,
@@ -716,7 +733,7 @@ void conn_prepare_reset(xmpp_conn_t * const conn, xmpp_open_handler handler)
 void conn_parser_reset(xmpp_conn_t * const conn)
 {
     conn->reset_parser = 0;
-    parser_reset(conn->parser);
+    parser_reset(conn->parser, 0);
 }
 
 /** Initiate termination of the connection to the XMPP server.
@@ -736,10 +753,17 @@ void xmpp_disconnect(xmpp_conn_t * const conn)
 
     /* close the stream */
 #ifdef USE_WEBSOCKETS
-	xmpp_send_raw_string(conn, "<close xmlns=\"%s\" />", XMPP_NS_WEBSOCKETS_IETF);
+    if (1)
 #else
-    xmpp_send_raw_string(conn, "</stream:stream>");
+    if (conn->extsock && conn->extsock->is_websocket)
 #endif
+    {
+        xmpp_send_raw_string(conn, "<close xmlns=\"%s\" />", XMPP_NS_WEBSOCKETS_IETF);
+    }
+    else
+    {
+        xmpp_send_raw_string(conn, "</stream:stream>");
+    }
 
     /* setup timed handler in case disconnect takes too long */
     handler_add_timed(conn, _disconnect_cleanup,
@@ -816,6 +840,13 @@ void xmpp_send_raw(xmpp_conn_t * const conn,
 
     if (conn->state != XMPP_STATE_CONNECTED) return;
 
+    /* if there is an external socket, send directly to it */
+    if (conn->extsock)
+    {
+        conn->extsock->send_handler(data, len, conn->extsock->userdata);
+        return;
+    }
+
     /* create send queue item for queue */
     item = xmpp_alloc(conn->ctx, sizeof(xmpp_send_queue_t));
     if (!item) return;
@@ -877,27 +908,34 @@ void xmpp_send(xmpp_conn_t * const conn,
 void conn_open_stream(xmpp_conn_t * const conn)
 {
 #ifdef USE_WEBSOCKETS
-	xmpp_send_raw_string(conn,
-                         "<open "                                      \
-                         "xmlns=\"%s\" "                               \
-                         "to=\"%s\" "                                  \
-                         "version=\"1.0\" />",
-                         XMPP_NS_WEBSOCKETS_IETF,
-                         conn->domain);
+    if (1)
 #else
-    xmpp_send_raw_string(conn,
-                         "<?xml version=\"1.0\"?>"                     \
-                         "<stream:stream to=\"%s\" "                   \
-                         "xml:lang=\"%s\" "                            \
-                         "version=\"1.0\" "                            \
-                         "xmlns=\"%s\" "                               \
-                         "xmlns:stream=\"%s\">",
-                         conn->domain,
-                         conn->lang,
-                         conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT :
-                                                     XMPP_NS_COMPONENT,
-                         XMPP_NS_STREAMS);
+    if (conn->extsock && conn->extsock->is_websocket)
 #endif
+    {
+        xmpp_send_raw_string(conn,
+            "<open "                                      \
+            "xmlns=\"%s\" "                               \
+            "to=\"%s\" "                                  \
+            "version=\"1.0\" />",
+            XMPP_NS_WEBSOCKETS_IETF,
+            conn->domain);
+
+    }
+    else
+    {
+        xmpp_send_raw_string(conn,
+            "<?xml version=\"1.0\"?>"                     \
+            "<stream:stream to=\"%s\" "                   \
+            "xml:lang=\"%s\" "                            \
+            "version=\"1.0\" "                            \
+            "xmlns=\"%s\" "                               \
+            "xmlns:stream=\"%s\">",
+            conn->domain,
+            conn->lang,
+            conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT : XMPP_NS_COMPONENT,
+            XMPP_NS_STREAMS);
+    }
 }
 
 int conn_tls_start(xmpp_conn_t * const conn)
@@ -913,6 +951,9 @@ int conn_tls_start(xmpp_conn_t * const conn)
     }
 
     if (conn->tls != NULL) {
+#if defined(USE_UNREAL_SSL)
+	tls_set_hostname(conn->tls, conn->domain);
+#endif
         if (tls_start(conn->tls)) {
             conn->secured = 1;
         } else {
@@ -1019,6 +1060,104 @@ int xmpp_conn_is_secured(xmpp_conn_t * const conn)
     return conn->secured && !conn->tls_failed && conn->tls != NULL ? 1 : 0;
 }
 
+void xmpp_conn_set_extsock_handlers(xmpp_conn_t * const conn, const xmpp_conn_extsock_t * const handlers)
+{
+    if (conn->extsock)
+    {
+        xmpp_free(conn->ctx, conn->extsock);
+        conn->extsock = NULL;
+    }
+
+    if (!handlers)
+    {
+        return;
+    }
+    
+    conn->extsock = xmpp_alloc(conn->ctx, sizeof(xmpp_conn_extsock_t));
+
+    conn->extsock->connect_handler = handlers->connect_handler;
+    conn->extsock->close_handler = handlers->close_handler;
+    conn->extsock->send_handler = handlers->send_handler;
+    conn->extsock->is_websocket = handlers->is_websocket;
+    conn->extsock->userdata = handlers->userdata;
+}
+
+int xmpp_extsock_connect_client(xmpp_conn_t * const conn, xmpp_conn_handler callback, void * const userdata)
+{
+    if (!conn->extsock)
+    {
+        return XMPP_EINVOP;
+    }
+
+    if (conn->state != XMPP_STATE_DISCONNECTED)
+    {
+        return XMPP_EINVOP;
+    }
+
+    char* domain = xmpp_jid_domain(conn->ctx, conn->jid);
+    if (!domain)
+    {
+        return XMPP_EMEM;
+    }
+
+    _conn_reset(conn);
+
+    conn->type = XMPP_CLIENT;
+    conn->domain = domain;
+
+    /* setup handler */
+    conn->conn_handler = callback;
+    conn->userdata = userdata;
+
+    conn_prepare_reset(conn, auth_handle_open);
+
+    conn->extsock->connect_handler(conn->extsock->userdata);
+
+    conn->state = XMPP_STATE_CONNECTING;
+    conn->timeout_stamp = time_stamp();
+    xmpp_debug(conn->ctx, "xmpp", "Attempting to connect using external socket");
+
+    return XMPP_EOK;
+}
+
+void xmpp_extsock_connected(xmpp_conn_t * const conn)
+{
+    conn->state = XMPP_STATE_CONNECTED;
+    xmpp_debug(conn->ctx, "xmpp", "connection successful");
+
+    if (conn->extsock->is_websocket)
+    {
+        // go straight to opening the stream because ssl is handled at the websocket layer
+        conn_open_stream(conn);
+    }
+    else
+    {
+        conn_established(conn);
+    }
+}
+
+void xmpp_extsock_connection_error(xmpp_conn_t * const conn, const char * const reason)
+{
+	conn->error = ENOTCONN;
+	xmpp_debug(conn->ctx, "xmpp", "connection failed, error %s", reason);
+	conn_disconnect(conn);
+}
+
+void xmpp_extsock_receive(xmpp_conn_t * const conn, const char * const data, const size_t len)
+{
+    if (conn->reset_parser)
+    {
+        conn_parser_reset(conn);
+    }
+
+    parser_feed(conn->parser, (char*)data, len);
+}
+
+void xmpp_extsock_parser_reset(xmpp_conn_t * const conn)
+{
+    parser_reset(conn->parser, 1);
+}
+
 /* timed handler for cleanup if normal disconnect procedure takes too long */
 static int _disconnect_cleanup(xmpp_conn_t * const conn,
                                void * const userdata)
@@ -1042,8 +1181,8 @@ static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
     static const char *tag_head = "<open";
     static const char *tag_tail = " />";
 #else
-	static const char *tag_head = "<stream:stream";
-	static const char *tag_tail = ">";
+    static const char *tag_head = "<stream:stream";
+    static const char *tag_tail = ">";
 #endif
 
     /* ignore the last element unless number is even */
@@ -1154,7 +1293,7 @@ static void _handle_stream_start(char *name, char **attrs,
     if (conn->stream_id) xmpp_free(conn->ctx, conn->stream_id);
     conn->stream_id = NULL;
 
-    if (strcmp(name, "stream") == 0) {
+    if (strcmp(name, "stream") == 0 || (conn->extsock && conn->extsock->is_websocket && strcmp(name, "open") == 0)) {
         _log_open_tag(conn, attrs);
         id = _get_stream_attribute(attrs, "id");
         if (id)
@@ -1183,9 +1322,16 @@ static void _handle_stream_end(char *name,
 {
     xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
 
-    /* stream is over */
-    xmpp_debug(conn->ctx, "xmpp", "RECV: </stream:stream>");
-    conn_disconnect_clean(conn);
+    if (conn->extsock && conn->extsock->is_websocket)
+    {
+        /* websocket based xmpp connection has each stanza as its own document */
+    }
+    else
+    {
+        /* stream is over */
+        xmpp_debug(conn->ctx, "xmpp", "RECV: </stream:stream>");
+        conn_disconnect_clean(conn);
+    }
 }
 
 static void _handle_stream_stanza(xmpp_stanza_t *stanza,
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/event.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/event.c
index f7fd756bb5c2..8920cc620df3 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/event.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/event.c
@@ -51,6 +51,13 @@
 #include "common.h"
 #include "parser.h"
 
+#if defined(USE_SOCKETAPI_DISPATCH)
+#include <sys/socket.h>
+#include <netdb.h>
+#include <poll.h>
+#include "unreal_socketapi.h"
+#endif
+
 #ifndef DEFAULT_TIMEOUT
 /** @def DEFAULT_TIMEOUT
  *  The default timeout in milliseconds for the event loop.
@@ -81,7 +88,7 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     xmpp_conn_t *conn;
     fd_set rfds, wfds;
     sock_t max = 0;
-    int ret;
+    int ret = 0;
     struct timeval tv;
     xmpp_send_queue_t *sq, *tsq;
     int towrite;
@@ -96,7 +103,7 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     connitem = ctx->connlist;
     while (connitem) {
         conn = connitem->conn;
-        if (conn->state != XMPP_STATE_CONNECTED) {
+        if (conn->state != XMPP_STATE_CONNECTED || conn->extsock) {
             connitem = connitem->next;
             continue;
         }
@@ -202,8 +209,12 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
             /* make sure the timeout hasn't expired */
             if (time_elapsed(conn->timeout_stamp, time_stamp()) <=
-                conn->connect_timeout)
-                FD_SET(conn->sock, &wfds);
+                conn->connect_timeout) {
+                if (!conn->extsock)
+                {
+                    FD_SET(conn->sock, &wfds);
+                }
+            }
             else {
                 conn->error = ETIMEDOUT;
                 xmpp_info(ctx, "xmpp", "Connection attempt timed out.");
@@ -211,7 +222,10 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
             }
             break;
         case XMPP_STATE_CONNECTED:
-            FD_SET(conn->sock, &rfds);
+            if (!conn->extsock)
+            {
+                FD_SET(conn->sock, &rfds);
+            }
             break;
         case XMPP_STATE_DISCONNECTED:
             /* do nothing */
@@ -224,18 +238,18 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
             tls_read_bytes += tls_pending(conn->tls);
         }
 
-        if (conn->state != XMPP_STATE_DISCONNECTED && conn->sock > max)
+        if (conn->state != XMPP_STATE_DISCONNECTED && conn->sock > max && !conn->extsock)
             max = conn->sock;
 
         connitem = connitem->next;
     }
 
     /* check for events */
-	if (max > 0)
+    if (max > 0)
 #if defined(USE_WEBSOCKETS)
-		ret = sockets_ready(&rfds, &wfds);
+        ret = sockets_ready(&rfds, &wfds);
 #else
-		ret = select(max + 1, &rfds,  &wfds, NULL, &tv);
+        ret = select(max + 1, &rfds,  &wfds, NULL, &tv);
 #endif
     else {
         if (timeout > 0)
@@ -289,23 +303,23 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
                 if (ret > 0) {
 #ifdef USE_WEBSOCKETS
-					// Translate WebSocket open/close tags into <stream:stream> and </stream:stream> tags. All other stanzas remain unchanged, but the open
-					// and close tags make a connection as a whole not parse as XML (each stanza would have to be independently interpreted).
-					static const char SocketOpenTag[] = "<open";
-					static const int SocketOpenTagSize = sizeof(SocketOpenTag) - sizeof(char); // Subtract null char
-					static const char SocketCloseTag[] = "<close";
-					static const int SocketCloseTagSize = sizeof(SocketCloseTag) - sizeof(char); // Subtract null char
+                    // Translate WebSocket open/close tags into <stream:stream> and </stream:stream> tags. All other stanzas remain unchanged, but the open
+                    // and close tags make a connection as a whole not parse as XML (each stanza would have to be independently interpreted).
+                    static const char SocketOpenTag[] = "<open";
+                    static const int SocketOpenTagSize = sizeof(SocketOpenTag) - sizeof(char); // Subtract null char
+                    static const char SocketCloseTag[] = "<close";
+                    static const int SocketCloseTagSize = sizeof(SocketCloseTag) - sizeof(char); // Subtract null char
 
-					if (memcmp(buf, SocketOpenTag, SocketOpenTagSize) == 0)
-					{
-						sprintf_s(buf, STROPE_MESSAGE_BUFFER_SIZE, "<?xml version=\"1.0\" encoding=\"utf-8\"?><stream:stream from=\"%s\" xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", conn->domain);
-						ret = strlen(buf);
-					}
-					if (memcmp(buf, SocketCloseTag, SocketCloseTagSize) == 0)
-					{
-						sprintf_s(buf, STROPE_MESSAGE_BUFFER_SIZE, "</stream:stream>");
-						ret = strlen(buf);
-					}
+                    if (memcmp(buf, SocketOpenTag, SocketOpenTagSize) == 0)
+                    {
+                        sprintf_s(buf, STROPE_MESSAGE_BUFFER_SIZE, "<?xml version=\"1.0\" encoding=\"utf-8\"?><stream:stream from=\"%s\" xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", conn->domain);
+                        ret = strlen(buf);
+                    }
+                    if (memcmp(buf, SocketCloseTag, SocketCloseTagSize) == 0)
+                    {
+                        sprintf_s(buf, STROPE_MESSAGE_BUFFER_SIZE, "</stream:stream>");
+                        ret = strlen(buf);
+                    }
 #endif
                     ret = parser_feed(conn->parser, buf, ret);
                     if (!ret) {
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser.h b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser.h
index 1bbb71ea0dce..55bcf7fbd94f 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser.h
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser.h
@@ -35,7 +35,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
                      void *userdata);
 void parser_free(parser_t *parser);
 char* parser_attr_name(xmpp_ctx_t *ctx, char *nsname);
-int parser_reset(parser_t *parser);
+int parser_reset(parser_t *parser, int depth);
 int parser_feed(parser_t *parser, char *chunk, int len);
 
 #endif /* __LIBSTROPHE_PARSER_H__ */
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser_expat.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser_expat.c
index 39c1dc44dd36..533b84364c93 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser_expat.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/parser_expat.c
@@ -52,8 +52,8 @@ static char *_xml_name(xmpp_ctx_t *ctx, const char *nsname)
     len = strlen(c);
     result = xmpp_alloc(ctx, len + 1);
     if (result != NULL) {
-	memcpy(result, c, len);
-	result[len] = '\0';
+    memcpy(result, c, len);
+    result[len] = '\0';
     }
 
     return result;
@@ -67,11 +67,11 @@ static char *_xml_namespace(xmpp_ctx_t *ctx, const char *nsname)
 
     c = strchr(nsname, NAMESPACE_SEP);
     if (c != NULL) {
-	result = xmpp_alloc(ctx, (c-nsname) + 1);
-	if (result != NULL) {
-	    memcpy(result, nsname, (c-nsname));
-	    result[c-nsname] = '\0';
-	}
+    result = xmpp_alloc(ctx, (c-nsname) + 1);
+    if (result != NULL) {
+        memcpy(result, nsname, (c-nsname));
+        result[c-nsname] = '\0';
+    }
     }
 
     return result;
@@ -149,16 +149,16 @@ static void _end_element(void *userdata, const XML_Char *name)
         if (parser->endcb)
             parser->endcb((char *)name, parser->userdata);
     } else {
-	if (parser->stanza->parent) {
-	    /* we're finishing a child stanza, so set current to the parent */
-	    parser->stanza = parser->stanza->parent;
-	} else {
+    if (parser->stanza->parent) {
+        /* we're finishing a child stanza, so set current to the parent */
+        parser->stanza = parser->stanza->parent;
+    } else {
             if (parser->stanzacb)
                 parser->stanzacb(parser->stanza,
                                  parser->userdata);
-	    xmpp_stanza_release(parser->stanza);
-	    parser->stanza = NULL;
-	}
+        xmpp_stanza_release(parser->stanza);
+        parser->stanza = NULL;
+    }
     }
 }
 
@@ -172,8 +172,8 @@ static void _characters(void *userdata, const XML_Char *s, int len)
     /* create and populate stanza */
     stanza = xmpp_stanza_new(parser->ctx);
     if (!stanza) {
-	/* FIXME: allocation error, disconnect */
-	return;
+    /* FIXME: allocation error, disconnect */
+    return;
     }
     xmpp_stanza_set_text_with_size(stanza, s, len);
 
@@ -200,7 +200,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
         parser->depth = 0;
         parser->stanza = NULL;
 
-        parser_reset(parser);
+        parser_reset(parser, 0);
     }
 
     return parser;
@@ -221,18 +221,19 @@ void parser_free(parser_t *parser)
 }
 
 /* shuts down and restarts XML parser.  true on success */
-int parser_reset(parser_t *parser)
+int parser_reset(parser_t *parser, int depth)
 {
     if (parser->expat)
-	XML_ParserFree(parser->expat);
+        XML_ParserReset(parser->expat, NULL);
+    else
+        parser->expat = XML_ParserCreateNS(NULL, NAMESPACE_SEP);
 
     if (parser->stanza) 
-	xmpp_stanza_release(parser->stanza);
+    xmpp_stanza_release(parser->stanza);
 
-    parser->expat = XML_ParserCreateNS(NULL, NAMESPACE_SEP);
     if (!parser->expat) return 0;
 
-    parser->depth = 0;
+    parser->depth = depth;
     parser->stanza = NULL;
 
     XML_SetUserData(parser->expat, parser);
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/resolver.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/resolver.c
index 5e6ce88acca4..762e86f38835 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/resolver.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/resolver.c
@@ -13,7 +13,7 @@
  *  DNS resolver.
  */
 
-#if !defined(USE_WEBSOCKETS)
+#if !defined(USE_WEBSOCKETS) && !defined(DISABLE_SRV_LOOKUP)
 
 #ifndef _WIN32
 #include <netinet/in.h>
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/sock.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/sock.c
index 78a3d1f358c5..3cd7ab262709 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/sock.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/sock.c
@@ -35,6 +35,10 @@
 
 #include "sock.h"
 #include "snprintf.h"
+#if defined(USE_SOCKETAPI_DISPATCH)
+#include <poll.h>
+#include "unreal_socketapi.h"
+#endif
 
 void sock_initialize(void)
 {
@@ -80,9 +84,13 @@ sock_t sock_connect(const char * const host, const unsigned short port)
 
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_UNSPEC;
+#if defined(USE_SOCKETAPI_DISPATCH)
+    hints.ai_flags = AI_CANONNAME;
+#else
 #ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
 #endif /* AI_ADDRCONFIG */
+#endif
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_socktype = SOCK_STREAM;
 
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/stanza.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/stanza.c
index 462ac376c146..fb47e6b0b291 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/stanza.c
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/stanza.c
@@ -227,15 +227,16 @@ int xmpp_stanza_is_tag(xmpp_stanza_t * const stanza)
     return (stanza && stanza->type == XMPP_STANZA_TAG);
 }
 
-/* Escape a string with for use in a XML text node or attribute. Assumes that
+/* Escape and quote a string for use in a XML attribute. Assumes that
  * the input string is encoded in UTF-8. On success, returns a pointer to a
  * buffer with the resulting data which must be xmpp_free()'d by the caller.
  * On failure, returns NULL.
  */
 
-static char *_escape_xml(xmpp_ctx_t * const ctx, char *text)
+static char *_escape_xml_attribute(xmpp_ctx_t * const ctx, char *text)
 {
-    size_t len = 0;
+    size_t len_quot = 0;
+    size_t len_apos = 0;
     char *src;
     char *dst;
     char *buf;
@@ -243,23 +244,34 @@ static char *_escape_xml(xmpp_ctx_t * const ctx, char *text)
         switch (*src) {
             case '<':   /* "&lt;" */
             case '>':   /* "&gt;" */
-                len += 4;
+                len_quot += 4;
+                len_apos += 4;
                 break;
             case '&':   /* "&amp;" */
-                len += 5;
+                len_quot += 5;
+                len_apos += 5;
                 break;
             case '"':
-                len += 6; /*"&quot;" */
+                len_quot += 6; /*"&quot;" */
+                break;
+            case '\'':
+                len_apos += 6; /*"&apos;" */
                 break;
             default:
-                len++;
+                len_quot++;
+                len_apos++;
         }
     }
-    if ((buf = xmpp_alloc(ctx, (len+1) * sizeof(char))) == NULL)
+    size_t len = len_quot <= len_apos ? len_quot : len_apos;
+    if ((buf = xmpp_alloc(ctx, (len+1+2) * sizeof(char))) == NULL)// length + \0 + quotes
         return NULL;    /* Error */
     dst = buf;
-    for (src = text; *src != '\0'; src++) {
-        switch (*src) {
+    if (len_quot <= len_apos)
+    {
+        *dst = '"';
+        dst++;
+        for (src = text; *src != '\0'; src++) {
+            switch (*src) {
             case '<':
                 strcpy(dst, "&lt;");
                 dst += 4;
@@ -279,6 +291,91 @@ static char *_escape_xml(xmpp_ctx_t * const ctx, char *text)
             default:
                 *dst = *src;
                 dst++;
+            }
+        }
+        *dst = '"';
+        dst++;
+    }
+    else
+    {
+        *dst = '\'';
+        dst++;
+        for (src = text; *src != '\0'; src++) {
+            switch (*src) {
+            case '<':
+                strcpy(dst, "&lt;");
+                dst += 4;
+                break;
+            case '>':
+                strcpy(dst, "&gt;");
+                dst += 4;
+                break;
+            case '&':
+                strcpy(dst, "&amp;");
+                dst += 5;
+                break;
+            case '\'':
+                strcpy(dst, "&apos;");
+                dst += 6;
+                break;
+            default:
+                *dst = *src;
+                dst++;
+            }
+        }
+        *dst = '\'';
+        dst++;
+    }
+    *dst = '\0';
+    return buf;
+}
+
+
+/* Escape a string with for use in a XML text node. Assumes that
+* the input string is encoded in UTF-8. On success, returns a pointer to a
+* buffer with the resulting data which must be xmpp_free()'d by the caller.
+* On failure, returns NULL.
+*/
+
+static char *_escape_xml_text(xmpp_ctx_t * const ctx, char *text)
+{
+    size_t len = 0;
+    char *src;
+    char *dst;
+    char *buf;
+    for (src = text; *src != '\0'; src++) {
+        switch (*src) {
+        case '<':   /* "&lt;" */
+        case '>':   /* "&gt;" */
+            len += 4;
+            break;
+        case '&':   /* "&amp;" */
+            len += 5;
+            break;
+        default:
+            len++;
+        }
+    }
+    if ((buf = xmpp_alloc(ctx, (len + 1) * sizeof(char))) == NULL)
+        return NULL;    /* Error */
+    dst = buf;
+    for (src = text; *src != '\0'; src++) {
+        switch (*src) {
+        case '<':
+            strcpy(dst, "&lt;");
+            dst += 4;
+            break;
+        case '>':
+            strcpy(dst, "&gt;");
+            dst += 4;
+            break;
+        case '&':
+            strcpy(dst, "&amp;");
+            dst += 5;
+            break;
+        default:
+            *dst = *src;
+            dst++;
         }
     }
     *dst = '\0';
@@ -286,7 +383,7 @@ static char *_escape_xml(xmpp_ctx_t * const ctx, char *text)
 }
 
 /* small helper function */
-static void _render_update(int *written, const int length,
+static void _render_update(int *written, const size_t length,
 			   const int lastwrite,
 			   size_t *left, char **ptr)
 {
@@ -324,7 +421,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
     if (stanza->type == XMPP_STANZA_TEXT) {
 	if (!stanza->data) return XMPP_EINVOP;
 
-	tmp = _escape_xml(stanza->ctx, stanza->data);
+    tmp = _escape_xml_text(stanza->ctx, stanza->data);
 	if (tmp == NULL) return XMPP_EMEM;
 	ret = xmpp_snprintf(ptr, left, "%s", tmp);
 	xmpp_free(stanza->ctx, tmp);
@@ -355,10 +452,10 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 			    XMPP_NS_CLIENT))
 			continue;
 		}
-		tmp = _escape_xml(stanza->ctx,
+		tmp = _escape_xml_attribute(stanza->ctx,
 		    (char *)hash_get(stanza->attributes, key));
 		if (tmp == NULL) return XMPP_EMEM;
-		ret = xmpp_snprintf(ptr, left, " %s=\"%s\"", key, tmp);
+		ret = xmpp_snprintf(ptr, left, " %s=%s", key, tmp);
 		xmpp_free(stanza->ctx, tmp);
 		if (ret < 0) return XMPP_EMEM;
 		_render_update(&written, buflen, ret, &left, &ptr);
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls.h b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls.h
index efe5ff7df90d..8e3af0fa60a1 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls.h
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls.h
@@ -28,6 +28,9 @@ tls_t *tls_new(xmpp_ctx_t *ctx, sock_t sock);
 void tls_free(tls_t *tls);
 
 int tls_set_credentials(tls_t *tls, const char *cafilename);
+#if defined(USE_UNREAL_SSL)
+int tls_set_hostname(tls_t *tls, const char *hostname);
+#endif
 
 int tls_start(tls_t *tls);
 int tls_stop(tls_t *tls);
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls_unreal.c b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls_unreal.c
new file mode 100644
index 000000000000..a42ddd7ab87a
--- /dev/null
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/src/tls_unreal.c
@@ -0,0 +1,233 @@
+// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
+/* tls_unreal.c
+** strophe XMPP client library -- TLS abstraction unreal ssl impl.
+**
+** Copyright (C) 2005-008 Collecta, Inc. 
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+/** @file
+ *  TLS implementation with Unreal SSL.
+ */
+
+#include <errno.h>   /* EINTR */
+#include <string.h>
+
+#include "common.h"
+#include "tls.h"
+#include "sock.h"
+#include "unreal_ssl.h"
+
+#if defined(USE_SOCKETAPI_DISPATCH)
+#include <sys/types.h>
+#include <sys/select.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <poll.h>
+#include "unreal_socketapi.h"
+#endif
+
+struct _tls {
+    xmpp_ctx_t *ctx;
+    sock_t sock;
+    void *ssl_ctx;
+    void *ssl;
+    int lasterror;
+};
+
+enum {
+    TLS_SHUTDOWN_MAX_RETRIES = 10,
+    TLS_TIMEOUT_SEC = 0,
+    TLS_TIMEOUT_USEC = 100000,
+};
+
+static void _tls_sock_wait(tls_t *tls);
+static void _tls_set_error(tls_t *tls, int error);
+static void _tls_log_error(xmpp_ctx_t *ctx);
+
+void tls_initialize(void)
+{
+}
+
+void tls_shutdown(void)
+{
+    return;
+}
+
+int tls_error(tls_t *tls)
+{
+    return tls->lasterror;
+}
+
+tls_t *tls_new(xmpp_ctx_t *ctx, sock_t sock)
+{
+    tls_t *tls = xmpp_alloc(ctx, sizeof(*tls));
+
+    if (tls) {
+        int ret;
+        memset(tls, 0, sizeof(*tls));
+
+        tls->ctx = ctx;
+        tls->sock = sock;
+        tls->ssl_ctx = SSL_CTX_new(NULL);
+        if (tls->ssl_ctx == NULL)
+            goto err;
+
+        tls->ssl = SSL_new(tls->ssl_ctx);
+        if (tls->ssl == NULL)
+            goto err_free_ctx;
+
+        ret = SSL_set_socketfd(tls->ssl, sock);
+        if (ret < 0)
+            goto err_free_ssl;
+    }
+
+    return tls;
+
+err_free_ssl:
+    SSL_shutdown(tls->ssl);
+    SSL_free(tls->ssl);
+err_free_ctx:
+    SSL_CTX_free(tls->ssl_ctx);
+err:
+    xmpp_free(ctx, tls);
+    _tls_log_error(ctx);
+    return NULL;
+}
+
+void tls_free(tls_t *tls)
+{
+    SSL_shutdown(tls->ssl);
+    SSL_free(tls->ssl);
+    SSL_CTX_free(tls->ssl_ctx);
+    xmpp_free(tls->ctx, tls);
+}
+
+int tls_set_credentials(tls_t *tls, const char *cafilename)
+{
+    return -1;
+}
+
+int tls_set_hostname(tls_t *tls, const char *hostname)
+{
+    int ret;
+    ret = SSL_set_hostname(tls->ssl, hostname, strlen(hostname));
+    return ret < 0 ? 0 : 1;
+}
+
+int tls_start(tls_t *tls)
+{
+    int ret;
+
+    /* Since we're non-blocking, loop the connect call until it
+       succeeds or fails */
+    while (1) {
+        ret = SSL_connect(tls->ssl);
+
+        if (ret == UNREAL_SSL_ERROR_WOULDBLOCK) {
+            /* wait for something to happen on the sock before looping back */
+            _tls_sock_wait(tls);
+            continue;
+        }
+
+        /* success or fatal error */
+        break;
+    }
+
+	_tls_set_error(tls, ret);
+	
+    return ret <= 0 ? 0 : 1;
+}
+
+int tls_stop(tls_t *tls)
+{
+    int retries = 0;
+    int error;
+    int ret;
+
+    while (1) {
+        ++retries;
+        ret = SSL_shutdown(tls->ssl);
+        if (ret == 0 || retries >= TLS_SHUTDOWN_MAX_RETRIES) {
+            break;
+        }
+        _tls_sock_wait(tls);
+    }
+	
+	_tls_set_error(tls, ret);
+
+    return ret < 0 ? 0 : 1;
+}
+
+int tls_is_recoverable(int error)
+{
+    return (error == 0 || error == UNREAL_SSL_ERROR_WOULDBLOCK);
+}
+
+int tls_pending(tls_t *tls)
+{
+    return SSL_pending(tls->ssl);
+}
+
+int tls_read(tls_t *tls, void * const buff, const size_t len)
+{
+    int ret;
+
+    ret = SSL_read(tls->ssl, buff, len);
+    _tls_set_error(tls, ret <= 0 ? SSL_get_error(tls->ssl, ret) : 0);
+
+    return ret;
+}
+
+int tls_write(tls_t *tls, const void * const buff, const size_t len)
+{
+    int ret;
+
+    ret = SSL_write(tls->ssl, buff, len);
+    _tls_set_error(tls, ret <= 0 ? SSL_get_error(tls->ssl, ret) : 0);
+
+    return ret;
+}
+
+int tls_clear_pending_write(tls_t *tls)
+{
+    return 0;
+}
+
+static void _tls_sock_wait(tls_t *tls)
+{
+	// TODO - It might be better to just set the socket to blocking as per the gnutls implementation.
+    struct timeval tv;
+    fd_set rfds;
+    fd_set wfds;
+    int ret;
+
+    FD_ZERO(&rfds);
+    FD_ZERO(&wfds);
+    FD_SET(tls->sock, &rfds);
+    FD_SET(tls->sock, &wfds);
+	
+    do {
+        tv.tv_sec = TLS_TIMEOUT_SEC;
+        tv.tv_usec = TLS_TIMEOUT_USEC;
+        ret = select(tls->sock + 1, &rfds, &wfds, NULL, &tv);
+    } while (ret == -1 && errno == EINTR);
+}
+
+static void _tls_set_error(tls_t *tls, int error)
+{
+    if (error != 0 && !tls_is_recoverable(error)) {
+        _tls_log_error(tls->ctx);
+    }
+    tls->lasterror = error;
+}
+
+static void _tls_log_error(xmpp_ctx_t *ctx)
+{
+}
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/strophe.h b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/strophe.h
index ab36b8106d17..e1fff85d99c5 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/strophe.h
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe-0.9.1/strophe.h
@@ -266,6 +266,25 @@ void xmpp_send_raw_string(xmpp_conn_t * const conn,
 void xmpp_send_raw(xmpp_conn_t * const conn, 
 		   const char * const data, const size_t len);
 
+/* externally managed, event driven socket */
+typedef void(*xmpp_extsock_connect_handler)(void * const userdata);
+typedef void(*xmpp_extsock_close_handler)(void * const userdata);
+typedef void(*xmpp_extsock_send_handler)(const char * const data, const size_t len, void * const userdata);
+
+typedef struct {
+	xmpp_extsock_connect_handler connect_handler;
+	xmpp_extsock_close_handler close_handler;
+	xmpp_extsock_send_handler send_handler;
+	int is_websocket;
+	void* userdata;
+} xmpp_conn_extsock_t;
+
+void xmpp_conn_set_extsock_handlers(xmpp_conn_t * const conn, const xmpp_conn_extsock_t * const handlers);
+int xmpp_extsock_connect_client(xmpp_conn_t * const conn, xmpp_conn_handler callbask, void * const userdata);
+void xmpp_extsock_connected(xmpp_conn_t * const conn);
+void xmpp_extsock_connection_error(xmpp_conn_t * const conn, const char * const reason);
+void xmpp_extsock_receive(xmpp_conn_t * const conn, const char * const data, const size_t len);
+void xmpp_extsock_parser_reset(xmpp_conn_t * const conn); /* call at websocket message boundaries */
 
 /* handlers */
 
diff --git a/Engine/Source/ThirdParty/libstrophe/libstrophe.Build.cs b/Engine/Source/ThirdParty/libstrophe/libstrophe.Build.cs
index f4b582f427a9..9bffb3060112 100644
--- a/Engine/Source/ThirdParty/libstrophe/libstrophe.Build.cs
+++ b/Engine/Source/ThirdParty/libstrophe/libstrophe.Build.cs
@@ -14,12 +14,16 @@ public class libstrophe : ModuleRules
 		bool bIsSupported =
 			Target.Platform == UnrealTargetPlatform.XboxOne ||
 			Target.Platform == UnrealTargetPlatform.Android ||
-			Target.Platform == UnrealTargetPlatform.IOS;
+			Target.Platform == UnrealTargetPlatform.IOS ||
+			Target.Platform == UnrealTargetPlatform.Win32 ||
+			Target.Platform == UnrealTargetPlatform.Win64 ||
+			Target.Platform == UnrealTargetPlatform.PS4 ||
+			Target.Platform == UnrealTargetPlatform.Mac ||
+			Target.Platform == UnrealTargetPlatform.Switch;
 
 		if (bIsSupported)
 		{
-			PublicDefinitions.Add("WITH_XMPP_STROPHE=1");
-			PublicDefinitions.Add("XML_STATIC");
+			PrivateDefinitions.Add("XML_STATIC");
 
 			PublicSystemIncludePaths.Add(StrophePackagePath);
 
@@ -29,7 +33,6 @@ public class libstrophe : ModuleRules
 
 			if (Target.Platform == UnrealTargetPlatform.XboxOne)
 			{
-
 				// Use reflection to allow type not to exist if console code is not present
 				string ToolchainName = "VS";
 				System.Type XboxOnePlatformType = System.Type.GetType("UnrealBuildTool.XboxOnePlatform,UnrealBuildTool");
@@ -50,17 +53,21 @@ public class libstrophe : ModuleRules
 
 				PublicAdditionalLibraries.Add("strophe");
 			}
-			else if (Target.Platform == UnrealTargetPlatform.IOS)
+			else if (Target.Platform == UnrealTargetPlatform.IOS || Target.Platform == UnrealTargetPlatform.Mac)
 			{
-				// add IOS library dir
-				PublicLibraryPaths.Add(Path.Combine(StrophePackagePath, "IOS", ConfigName));
-				PublicAdditionalLibraries.Add("strophe");
+				PublicAdditionalLibraries.Add(Path.Combine(StrophePackagePath, Target.Platform.ToString(), ConfigName, "libstrophe.a"));
 				PublicAdditionalLibraries.Add("resolv");
 			}
+			else if (Target.Platform == UnrealTargetPlatform.Win32 || Target.Platform == UnrealTargetPlatform.Win64)
+			{
+				PublicLibraryPaths.Add(Path.Combine(StrophePackagePath, Target.Platform.ToString(), "VS" + Target.WindowsPlatform.GetVisualStudioCompilerVersionName(), ConfigName));
+				PublicAdditionalLibraries.Add("strophe.lib");
+			}
+			else if (Target.Platform == UnrealTargetPlatform.PS4 || Target.Platform == UnrealTargetPlatform.Switch)
+			{
+				PublicLibraryPaths.Add(Path.Combine(StrophePackagePath, Target.Platform.ToString(), ConfigName));
+				PublicAdditionalLibraries.Add("strophe");
+			}
 		}
-		else
-		{
-			PublicDefinitions.Add("WITH_XMPP_STROPHE=0");
-		}
-    }
+	}
 }